From 4aa6229698b946e52ce19018aaf13f8b92fb168e Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 15 Jun 2012 14:13:45 +0000 Subject: another portion of "#ifsef Unicode" removal git-svn-id: http://svn.miranda-ng.org/main/trunk@426 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/skin/hotkeys.cpp | 24 ++++++++++-------------- src/modules/skin/sounds.cpp | 13 ++----------- 2 files changed, 12 insertions(+), 25 deletions(-) (limited to 'src/modules/skin') diff --git a/src/modules/skin/hotkeys.cpp b/src/modules/skin/hotkeys.cpp index 018411d7a1..64987b4aa4 100644 --- a/src/modules/skin/hotkeys.cpp +++ b/src/modules/skin/hotkeys.cpp @@ -170,20 +170,16 @@ static INT_PTR svcHotkeyRegister(WPARAM wParam, LPARAM lParam) return 0; THotkeyItem *item = ( THotkeyItem* )mir_alloc(sizeof(THotkeyItem)); - #if defined( _UNICODE ) - DWORD dwFlags = ( desc->cbSize >= sizeof(HOTKEYDESC)) ? desc->dwFlags : 0; - if ( dwFlags & HKD_UNICODE ) { - item->ptszSection = mir_tstrdup( desc->ptszSection ); - item->ptszDescription = mir_tstrdup( desc->ptszDescription ); - } - else { - item->ptszSection = mir_a2u( desc->pszSection ); - item->ptszDescription = mir_a2u( desc->pszDescription ); - } - #else - item->ptszSection = mir_tstrdup( desc->pszSection ); - item->ptszDescription = mir_tstrdup( desc->pszDescription ); - #endif + DWORD dwFlags = ( desc->cbSize >= sizeof(HOTKEYDESC)) ? desc->dwFlags : 0; + if ( dwFlags & HKD_UNICODE ) { + item->ptszSection = mir_tstrdup( desc->ptszSection ); + item->ptszDescription = mir_tstrdup( desc->ptszDescription ); + } + else { + item->ptszSection = mir_a2u( desc->pszSection ); + item->ptszDescription = mir_a2u( desc->pszDescription ); + } + item->ptszSection_tr = TranslateTS(item->ptszSection); item->ptszDescription_tr = TranslateTS(item->ptszDescription); item->allowSubHotkeys = TRUE; diff --git a/src/modules/skin/sounds.cpp b/src/modules/skin/sounds.cpp index d9fb7fbb8e..fad684a80a 100644 --- a/src/modules/skin/sounds.cpp +++ b/src/modules/skin/sounds.cpp @@ -57,7 +57,7 @@ static INT_PTR ServiceSkinAddNewSound(WPARAM, LPARAM lParam) SoundItem* item = &soundList[soundCount++]; item->name = mir_strdup( ssd->pszName ); item->tempFile = NULL; - #if defined( _UNICODE ) + TCHAR* ptszDefaultFile; if ( dwFlags & SSDF_UNICODE ) { item->description = mir_tstrdup( TranslateTS( ssd->ptszDescription )); @@ -77,16 +77,7 @@ static INT_PTR ServiceSkinAddNewSound(WPARAM, LPARAM lParam) DBFreeVariant(&dbv); mir_free( ptszDefaultFile ); } - #else - item->description = mir_tstrdup( TranslateTS( ssd->pszDescription )); - item->section = mir_tstrdup( TranslateTS( ssd->cbSize != SKINSOUNDDESC_SIZE_V1 && ssd->pszSection != NULL ? ssd->pszSection : "Other" )); - if ( ssd->pszDefaultFile ) { - if ( DBGetContactSettingString(NULL, "SkinSounds", item->name, &dbv)) - DBWriteContactSettingString(NULL, "SkinSounds", item->name, ssd->pszDefaultFile); - else - DBFreeVariant(&dbv); - } - #endif + return 0; } -- cgit v1.2.3