From 3576b67db9fa0a3d8d5c1747cc3560504d31d125 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 5 Mar 2014 12:52:30 +0000 Subject: - adaptation for standard Windows ways of handling Unicode; - obsoleted code removed; - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@8407 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/HistoryStats/src/settings.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'plugins/HistoryStats/src/settings.h') diff --git a/plugins/HistoryStats/src/settings.h b/plugins/HistoryStats/src/settings.h index 9af8f1f30a..450ab1b8ff 100644 --- a/plugins/HistoryStats/src/settings.h +++ b/plugins/HistoryStats/src/settings.h @@ -133,21 +133,21 @@ public: : private pattern::NotCopyable { private: -#if defined(MU_WIDE) +#if defined(_UNICODE) typedef unsigned short t_uchar; -#else // MU_WIDE +#else // _UNICODE typedef unsigned char t_uchar; -#endif // MU_WIDE -#define T_NUMCHARS (1 << (sizeof(mu_text) * 8)) +#endif // _UNICODE +#define T_NUMCHARS (1 << (sizeof(TCHAR) * 8)) private: - mu_text m_CharMap[T_NUMCHARS]; + TCHAR m_CharMap[T_NUMCHARS]; #undef T_NUMCHARS public: explicit CharMapper(const Settings& settings); - mu_text mapChar(mu_text c) const { return m_CharMap[static_cast(c)]; } + TCHAR mapChar(TCHAR c) const { return m_CharMap[static_cast(c)]; } }; typedef std::set WordSet; @@ -193,15 +193,15 @@ public: typedef std::vector ColumnList; public: - static const mu_text* getDefaultWordDelimiters(); - static const mu_text* getDefaultStyleSheet(); - static const mu_text* getDefaultHideContactMenuProtos(); - static const mu_text* getDefaultProtosIgnore(); - static const mu_text* getDefaultColumns(); - static const mu_text* getDefaultSort(); - static const mu_text* getDefaultOutputFile(); - static const mu_text* getDefaultOutputExtraFolder(); - static const mu_text* getDefaultFilterWords(); + static const TCHAR* getDefaultWordDelimiters(); + static const TCHAR* getDefaultStyleSheet(); + static const TCHAR* getDefaultHideContactMenuProtos(); + static const TCHAR* getDefaultProtosIgnore(); + static const TCHAR* getDefaultColumns(); + static const TCHAR* getDefaultSort(); + static const TCHAR* getDefaultOutputFile(); + static const TCHAR* getDefaultOutputExtraFolder(); + static const TCHAR* getDefaultFilterWords(); public: const DWORD m_VersionCurrent; @@ -305,7 +305,7 @@ public: void ensureConstraints(); - void openURL(const mu_text* szURL); + void openURL(const TCHAR* szURL); }; #endif // HISTORYSTATS_GUARD_SETTINGS_H -- cgit v1.2.3