diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-14 16:22:13 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-14 16:22:13 +0000 |
| commit | d5d023f683b23fe26ddea93738cb721d532804f0 (patch) | |
| tree | 21e7398686c7a5d1604d58bfb71ca4329c84be66 /protocols/IRCG/windows.cpp | |
| parent | e58823d961a630eb62e60d2ccb443761ba5f1704 (diff) | |
another portion of "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@411 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/IRCG/windows.cpp')
| -rw-r--r-- | protocols/IRCG/windows.cpp | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/protocols/IRCG/windows.cpp b/protocols/IRCG/windows.cpp index 79a1b8011f..6eef163d34 100644 --- a/protocols/IRCG/windows.cpp +++ b/protocols/IRCG/windows.cpp @@ -928,13 +928,9 @@ void CManagerDlg::OnClose() if ( !S.IsEmpty() && m_proto->IsConnected() ) {
mir_sntprintf( temp, SIZEOF(temp), _T("Topic%s%s"), window, m_proto->m_info.sNetwork.c_str());
- #if defined( _UNICODE )
- char* p = mir_t2a(temp);
- m_proto->setTString(p, S.c_str());
- mir_free(p);
- #else
- m_proto->setString(temp, S.c_str());
- #endif
+ char* p = mir_t2a(temp);
+ m_proto->setTString(p, S.c_str());
+ mir_free(p);
}
DestroyWindow( m_hwnd);
}
@@ -1280,11 +1276,8 @@ void CManagerDlg::InitManager( int mode, const TCHAR* window ) TCHAR temp[1000];
mir_sntprintf(temp, SIZEOF(temp), _T("Topic%s%s"), window, m_proto->m_info.sNetwork.c_str());
- #if defined( _UNICODE )
- char* p = mir_t2a(temp);
- #else
- char* p = temp;
- #endif
+ char* p = mir_t2a(temp);
+
DBVARIANT dbv;
if ( !m_proto->getTString( p, &dbv )) {
for ( int i = 0; i<5; i++ ) {
@@ -1298,9 +1291,7 @@ void CManagerDlg::InitManager( int mode, const TCHAR* window ) } }
DBFreeVariant(&dbv);
}
- #if defined( _UNICODE )
- mir_free(p);
- #endif
+ mir_free(p);
}
if ( wi->pszTopic )
|