diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 16:02:14 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 16:02:14 +0000 |
| commit | 67f1c36da9aca19e37803110aa243280e5cf053b (patch) | |
| tree | 2ded9275bfcbcea8151a4b32deb6c14c95de0e78 /tools | |
| parent | 4aa6229698b946e52ce19018aaf13f8b92fb168e (diff) | |
another portion of "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@427 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dbtool/dbtool.h | 12 | ||||
| -rw-r--r-- | tools/dbtool/langpack.cpp | 6 | ||||
| -rw-r--r-- | tools/dbtool/modulechain.cpp | 6 |
3 files changed, 5 insertions, 19 deletions
diff --git a/tools/dbtool/dbtool.h b/tools/dbtool/dbtool.h index 7bade33d34..6bc7591392 100644 --- a/tools/dbtool/dbtool.h +++ b/tools/dbtool/dbtool.h @@ -19,9 +19,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#if defined( UNICODE ) && !defined( _UNICODE )
- #define _UNICODE
-#endif
#include <tchar.h>
@@ -117,13 +114,8 @@ __inline LPSTR Translate(LPSTR source) { return ( LPSTR )LangPackTranslateString( source, 0 );
}
-#if defined( _UNICODE )
- #define TranslateT(s) (TCHAR*)LangPackTranslateString((LPCSTR)_T(s),1)
- #define TranslateTS(s) (TCHAR*)LangPackTranslateString((LPCSTR)s,1)
-#else
- #define TranslateT(s) LangPackTranslateString(s,0)
- #define TranslateTS(s) LangPackTranslateString(s,0)
-#endif
+#define TranslateT(s) (TCHAR*)LangPackTranslateString((LPCSTR)_T(s),1)
+#define TranslateTS(s) (TCHAR*)LangPackTranslateString((LPCSTR)s,1)
char* Utf8DecodeCP(char* str, int codepage, wchar_t** ucs2);
char* Utf8EncodeUcs2(const wchar_t* src);
diff --git a/tools/dbtool/langpack.cpp b/tools/dbtool/langpack.cpp index 97d24cadf4..327561def1 100644 --- a/tools/dbtool/langpack.cpp +++ b/tools/dbtool/langpack.cpp @@ -317,11 +317,7 @@ char *LangPackTranslateString(const char *szEnglish, const int W) return W ? (char *)entry->wlocal : entry->local;
}
-#if defined( _UNICODE )
- #define FLAGS 1
-#else
- #define FLAGS 0
-#endif
+#define FLAGS 1
static void TranslateWindow( HWND hwnd )
{
diff --git a/tools/dbtool/modulechain.cpp b/tools/dbtool/modulechain.cpp index 515ec9bfbd..ffa7680dbb 100644 --- a/tools/dbtool/modulechain.cpp +++ b/tools/dbtool/modulechain.cpp @@ -98,13 +98,11 @@ int WorkModuleChain(int firstTime) }
if (n) {
TCHAR *pszModuleName;
-#ifdef UNICODE
+
TCHAR szModuleName[257];
MultiByteToWideChar(CP_ACP, 0, modChain[iCurrentModName].name, -1, szModuleName, sizeof(szModuleName) / sizeof(TCHAR));
pszModuleName = szModuleName;
-#else
- pszModuleName = modChain[iCurrentModName].name;
-#endif
+
AddToStatus(STATUS_WARNING,TranslateT("Module name '%s' is not unique: %d duplicates found)"), pszModuleName, n);
}
}
|