From e58823d961a630eb62e60d2ccb443761ba5f1704 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 14 Jun 2012 15:51:34 +0000 Subject: - all MS_CLIST_ADD*ITEM services replaced with Menu_Add*Item stubs. - massive cleanup of the menu-related code git-svn-id: http://svn.miranda-ng.org/main/trunk@410 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/langpack/langpack.cpp | 30 +++++++++++++++--------------- src/modules/langpack/lpservices.cpp | 32 ++++++++++++++++---------------- 2 files changed, 31 insertions(+), 31 deletions(-) (limited to 'src/modules/langpack') diff --git a/src/modules/langpack/langpack.cpp b/src/modules/langpack/langpack.cpp index 5013361393..71b0dddaf9 100644 --- a/src/modules/langpack/langpack.cpp +++ b/src/modules/langpack/langpack.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-2009 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -11,7 +11,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. -This program is distributed in the hope that it will be useful, +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -153,7 +153,7 @@ unsigned int __fastcall hashstrW(const char * key) return hash(buf, len); } -static int SortLangPackHashesProc(LangPackEntry *arg1,LangPackEntry *arg2) +static int SortLangPackHashesProc(LangPackEntry *arg1, LangPackEntry *arg2) { if (arg1->englishHash < arg2->englishHash) return -1; if (arg1->englishHash > arg2->englishHash) return 1; @@ -333,7 +333,7 @@ static int LoadLangPack(const TCHAR *szLangPack) if ( p ) p[1] = 0; - FILE *fp = _tfopen(szLangPack,_T("rt")); + FILE *fp = _tfopen(szLangPack, _T("rt")); if ( fp == NULL ) return 1; @@ -367,17 +367,17 @@ static int LoadLangPack(const TCHAR *szLangPack) if ( line[0] == '[' || line[0] == '#' ) break; - char* pszColon = strchr( line,':' ); + char* pszColon = strchr( line, ':' ); if ( pszColon == NULL ) { fclose( fp ); return 3; } *pszColon++ = 0; - if (!lstrcmpA(line,"Language")) {mir_snprintf(langPack.language,sizeof(langPack.language),"%s",pszColon); lrtrim(langPack.language);} - else if (!lstrcmpA(line,"Last-Modified-Using")) {mir_snprintf(langPack.lastModifiedUsing,sizeof(langPack.lastModifiedUsing),"%s",pszColon); lrtrim(langPack.lastModifiedUsing);} - else if (!lstrcmpA(line,"Authors")) {mir_snprintf(langPack.authors,sizeof(langPack.authors),"%s",pszColon); lrtrim(langPack.authors);} - else if (!lstrcmpA(line,"Author-email")) {mir_snprintf(langPack.authorEmail,sizeof(langPack.authorEmail),"%s",pszColon); lrtrim(langPack.authorEmail);} + if (!lstrcmpA(line, "Language")) {mir_snprintf(langPack.language, sizeof(langPack.language), "%s", pszColon); lrtrim(langPack.language);} + else if (!lstrcmpA(line, "Last-Modified-Using")) {mir_snprintf(langPack.lastModifiedUsing, sizeof(langPack.lastModifiedUsing), "%s", pszColon); lrtrim(langPack.lastModifiedUsing);} + else if (!lstrcmpA(line, "Authors")) {mir_snprintf(langPack.authors, sizeof(langPack.authors), "%s", pszColon); lrtrim(langPack.authors);} + else if (!lstrcmpA(line, "Author-email")) {mir_snprintf(langPack.authorEmail, sizeof(langPack.authorEmail), "%s", pszColon); lrtrim(langPack.authorEmail);} else if (!lstrcmpA(line, "Locale")) { char szBuf[20], *stopped; @@ -399,13 +399,13 @@ static int LoadLangPack(const TCHAR *szLangPack) LoadLangPackFile( fp, line, fileCp ); fclose(fp); - qsort(langPack.entry,langPack.entryCount,sizeof(LangPackEntry),(int(*)(const void*,const void*))SortLangPackHashesProc); + qsort(langPack.entry, langPack.entryCount, sizeof(LangPackEntry), (int(*)(const void*, const void*))SortLangPackHashesProc); return 0; } ///////////////////////////////////////////////////////////////////////////////////////// -static int SortLangPackHashesProc2(LangPackEntry *arg1,LangPackEntry *arg2) +static int SortLangPackHashesProc2(LangPackEntry *arg1, LangPackEntry *arg2) { if (arg1->englishHash < arg2->englishHash) return -1; if (arg1->englishHash > arg2->englishHash) return 1; @@ -417,9 +417,9 @@ char *LangPackTranslateString(LangPackMuuid* pUuid, const char *szEnglish, const if ( langPack.entryCount == 0 || szEnglish == NULL ) return (char*)szEnglish; - LangPackEntry key,*entry; + LangPackEntry key, *entry; key.englishHash = W ? hashstrW(szEnglish) : hashstr(szEnglish); - entry = (LangPackEntry*)bsearch(&key, langPack.entry, langPack.entryCount, sizeof(LangPackEntry), (int(*)(const void*,const void*))SortLangPackHashesProc2 ); + entry = (LangPackEntry*)bsearch(&key, langPack.entry, langPack.entryCount, sizeof(LangPackEntry), (int(*)(const void*, const void*))SortLangPackHashesProc2 ); if ( entry == NULL ) return (char*)szEnglish; @@ -511,7 +511,7 @@ void LangPackDropUnusedItems( void ) if ( bSortNeeded ) { langPack.entryCount = ( int )( d - langPack.entry ); - qsort(langPack.entry,langPack.entryCount,sizeof(LangPackEntry),(int(*)(const void*,const void*))SortLangPackHashesProc); + qsort(langPack.entry, langPack.entryCount, sizeof(LangPackEntry), (int(*)(const void*, const void*))SortLangPackHashesProc); } } @@ -525,7 +525,7 @@ int LoadLangPackModule(void) bModuleInitialized = TRUE; - ZeroMemory(&langPack,sizeof(langPack)); + ZeroMemory(&langPack, sizeof(langPack)); LoadLangPackServices(); pathToAbsoluteT(_T("langpack_*.txt"), szSearch, NULL); hFind = FindFirstFile( szSearch, &fd ); diff --git a/src/modules/langpack/lpservices.cpp b/src/modules/langpack/lpservices.cpp index 69d416330b..0de43ecb6a 100644 --- a/src/modules/langpack/lpservices.cpp +++ b/src/modules/langpack/lpservices.cpp @@ -11,7 +11,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. -This program is distributed in the hope that it will be useful, +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -33,7 +33,7 @@ int LangPackMarkPluginLoaded( PLUGININFOEX* pInfo ); ///////////////////////////////////////////////////////////////////////////////////////// -static INT_PTR TranslateString(WPARAM wParam,LPARAM lParam) +static INT_PTR TranslateString(WPARAM wParam, LPARAM lParam) { return (INT_PTR)LangPackTranslateString( LangPackLookupUuid(wParam), (const char *)lParam, (wParam & LANG_UNICODE) ? 1 : 0); } @@ -80,11 +80,11 @@ static void TranslateWindow( LangPackMuuid* pUuid, HWND hwnd ) SetWindowText(hwnd, result ); } } -static BOOL CALLBACK TranslateDialogEnumProc(HWND hwnd,LPARAM lParam) +static BOOL CALLBACK TranslateDialogEnumProc(HWND hwnd, LPARAM lParam) { LANGPACKTRANSLATEDIALOG *lptd = (LANGPACKTRANSLATEDIALOG*)lParam; TCHAR szClass[32]; - int i,id = GetDlgCtrlID( hwnd ); + int i, id = GetDlgCtrlID( hwnd ); if ( lptd->ignoreControls != NULL ) for ( i=0; lptd->ignoreControls[i]; i++ ) @@ -94,10 +94,10 @@ static BOOL CALLBACK TranslateDialogEnumProc(HWND hwnd,LPARAM lParam) LangPackMuuid* uuid = LangPackLookupUuid( lptd->flags ); GetClassName( hwnd, szClass, SIZEOF(szClass)); - if (!lstrcmpi(szClass,_T("static")) || !lstrcmpi(szClass,_T("hyperlink")) || !lstrcmpi(szClass,_T("button")) || !lstrcmpi(szClass,_T("MButtonClass")) || !lstrcmpi(szClass,_T("MHeaderbarCtrl"))) + if (!lstrcmpi(szClass, _T("static")) || !lstrcmpi(szClass, _T("hyperlink")) || !lstrcmpi(szClass, _T("button")) || !lstrcmpi(szClass, _T("MButtonClass")) || !lstrcmpi(szClass, _T("MHeaderbarCtrl"))) TranslateWindow( uuid, hwnd ); - else if ( !lstrcmpi( szClass,_T("edit"))) { - if ( lptd->flags & LPTDF_NOIGNOREEDIT || GetWindowLongPtr(hwnd,GWL_STYLE) & ES_READONLY ) + else if ( !lstrcmpi( szClass, _T("edit"))) { + if ( lptd->flags & LPTDF_NOIGNOREEDIT || GetWindowLongPtr(hwnd, GWL_STYLE) & ES_READONLY ) TranslateWindow( uuid, hwnd ); } return TRUE; @@ -126,7 +126,7 @@ static INT_PTR LPRegister(WPARAM wParam, LPARAM lParam) ///////////////////////////////////////////////////////////////////////////////////////// -static INT_PTR GetDefaultCodePage(WPARAM,LPARAM) +static INT_PTR GetDefaultCodePage(WPARAM, LPARAM) { return LangPackGetDefaultCodePage(); } @@ -166,14 +166,14 @@ INT_PTR ReloadLangpack(WPARAM wParam, LPARAM lParam); int LoadLangPackServices(void) { - CreateServiceFunction(MS_LANGPACK_TRANSLATESTRING,TranslateString); - CreateServiceFunction(MS_LANGPACK_TRANSLATEMENU,TranslateMenu); - CreateServiceFunction(MS_LANGPACK_TRANSLATEDIALOG,TranslateDialog); - CreateServiceFunction(MS_LANGPACK_GETCODEPAGE,GetDefaultCodePage); - CreateServiceFunction(MS_LANGPACK_GETLOCALE,GetDefaultLocale); - CreateServiceFunction(MS_LANGPACK_PCHARTOTCHAR,PcharToTchar); - CreateServiceFunction(MS_LANGPACK_REGISTER,LPRegister); - CreateServiceFunction(MS_LANGPACK_RELOAD,ReloadLangpack); + CreateServiceFunction(MS_LANGPACK_TRANSLATESTRING, TranslateString); + CreateServiceFunction(MS_LANGPACK_TRANSLATEMENU, TranslateMenu); + CreateServiceFunction(MS_LANGPACK_TRANSLATEDIALOG, TranslateDialog); + CreateServiceFunction(MS_LANGPACK_GETCODEPAGE, GetDefaultCodePage); + CreateServiceFunction(MS_LANGPACK_GETLOCALE, GetDefaultLocale); + CreateServiceFunction(MS_LANGPACK_PCHARTOTCHAR, PcharToTchar); + CreateServiceFunction(MS_LANGPACK_REGISTER, LPRegister); + CreateServiceFunction(MS_LANGPACK_RELOAD, ReloadLangpack); return 0; } -- cgit v1.2.3