From f5baf2606966349e067d423a596722b66c401651 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 4 Jul 2012 14:14:58 +0000 Subject: - internal langpack preparation for hLangpack-dependent resource cleaning - langpack functions' names normalization (2Awk: safe for plugins written in Delphi) git-svn-id: http://svn.miranda-ng.org/main/trunk@758 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/database/dbini.cpp | 2 +- src/modules/database/profilemanager.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/modules/database') diff --git a/src/modules/database/dbini.cpp b/src/modules/database/dbini.cpp index af15390857..70c1f965af 100644 --- a/src/modules/database/dbini.cpp +++ b/src/modules/database/dbini.cpp @@ -326,7 +326,7 @@ static void ProcessIniFile(TCHAR* szIniPath, char *szSafeSections, char *szUnsaf break; case 'e': case 'E': - ConvertBackslashes(szValue+1, LangPackGetDefaultCodePage()); + ConvertBackslashes(szValue+1, Langpack_GetDefaultCodePage()); case 's': case 'S': DBWriteContactSettingString(NULL, szSection, szName, szValue+1); diff --git a/src/modules/database/profilemanager.cpp b/src/modules/database/profilemanager.cpp index 898fc323d6..32e515efbe 100644 --- a/src/modules/database/profilemanager.cpp +++ b/src/modules/database/profilemanager.cpp @@ -123,7 +123,7 @@ static int FindDbProviders(const char*, DATABASELINK * dblink, LPARAM lParam) if (dblink->getFriendlyName(szName, SIZEOF(szName), 1) == 0) { // add to combo box - TCHAR* p = LangPackPcharToTchar(szName); + TCHAR* p = Langpack_PcharToTchar(szName); LRESULT index = SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)p); mir_free(p); SendMessage(hwndCombo, CB_SETITEMDATA, index, (LPARAM)dblink); @@ -607,7 +607,7 @@ static INT_PTR CALLBACK DlgProfileManager(HWND hwndDlg, UINT msg, WPARAM wParam, SendMessage(hwndCombo, CB_SETITEMDATA, index, (LPARAM)-1); SendMessage(hwndCombo, CB_SETCURSEL, 0, 0); while (list[i]) { - TCHAR *str = LangPackPcharToTchar(list[i]); + TCHAR *str = Langpack_PcharToTchar(list[i]); index = SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)str); mir_free(str); SendMessage(hwndCombo, CB_SETITEMDATA, index, (LPARAM)i); @@ -780,7 +780,7 @@ static int AddProfileManagerPage(struct DetailsPageInit * opi, OPTIONSDIALOGPAGE p->hInstance = odp->hInstance; p->pfnDlgProc = odp->pfnDlgProc; p->position = odp->position; - p->ptszTitle = LangPackPcharToTchar(odp->pszTitle); + p->ptszTitle = Langpack_PcharToTchar(odp->pszTitle); p->pszGroup = NULL; p->groupPosition = odp->groupPosition; p->hGroupIcon = odp->hGroupIcon; -- cgit v1.2.3