diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-16 17:42:08 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-16 17:42:08 +0000 |
| commit | 5975b2d0903bd5df128d55e20cd27d7c13b4e46c (patch) | |
| tree | 6696492511c591fa8bf3b65a64864245caa3e7c2 /plugins/Svc_vi | |
| parent | 8617d7e00546f892c9084f7c382648b23d8bbb63 (diff) | |
another portion of "#ifdef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@448 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Svc_vi')
| -rw-r--r-- | plugins/Svc_vi/CPlugin.h | 6 | ||||
| -rw-r--r-- | plugins/Svc_vi/CVersionInfo.cpp | 12 | ||||
| -rw-r--r-- | plugins/Svc_vi/dlgHandlers.cpp | 6 |
3 files changed, 8 insertions, 16 deletions
diff --git a/plugins/Svc_vi/CPlugin.h b/plugins/Svc_vi/CPlugin.h index 46528b8511..5da1b1dc6b 100644 --- a/plugins/Svc_vi/CPlugin.h +++ b/plugins/Svc_vi/CPlugin.h @@ -41,11 +41,9 @@ extern TCHAR PLUGIN_UUID_MARK[]; //using namespace std;
-#if defined( _UNICODE )
+
#define tstring wstring
-#else
- #define tstring string
-#endif
+
class CPlugin {
private:
diff --git a/plugins/Svc_vi/CVersionInfo.cpp b/plugins/Svc_vi/CVersionInfo.cpp index b3b2825922..d35c0c5c01 100644 --- a/plugins/Svc_vi/CVersionInfo.cpp +++ b/plugins/Svc_vi/CVersionInfo.cpp @@ -344,11 +344,9 @@ bool CVersionInfo::GetHWSettings() { HMODULE hKernel32;
hKernel32 = LoadLibraryA("kernel32.dll");
if (hKernel32) {
- #if defined( _UNICODE )
+
MyGetDiskFreeSpaceEx = (BOOL (WINAPI *)(LPCTSTR,PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER))GetProcAddress(hKernel32, "GetDiskFreeSpaceExW");
- #else
- MyGetDiskFreeSpaceEx = (BOOL (WINAPI *)(LPCTSTR,PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER))GetProcAddress(hKernel32, "GetDiskFreeSpaceExA");
- #endif
+
MyIsWow64Process = (BOOL (WINAPI *) (HANDLE, PBOOL)) GetProcAddress(hKernel32, "IsWow64Process");
MyGetSystemInfo = (void (WINAPI *) (LPSYSTEM_INFO)) GetProcAddress(hKernel32, "GetNativeSystemInfo");
@@ -1190,11 +1188,9 @@ void CVersionInfo::PrintInformationsToClipboard(bool showLog) lptstrCopy[length] = '\0';
GlobalUnlock(hData);
//Now set the clipboard data.
- #if defined( _UNICODE )
+
SetClipboardData(CF_UNICODETEXT, hData);
- #else
- SetClipboardData(CF_TEXT, hData);
- #endif
+
//Remove the lock on the clipboard.
CloseClipboard();
if (showLog)
diff --git a/plugins/Svc_vi/dlgHandlers.cpp b/plugins/Svc_vi/dlgHandlers.cpp index 73eee44c0a..a1a81e6a51 100644 --- a/plugins/Svc_vi/dlgHandlers.cpp +++ b/plugins/Svc_vi/dlgHandlers.cpp @@ -559,11 +559,9 @@ INT_PTR CALLBACK DialogBoxProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam lptstrCopy[length] = '\0';
GlobalUnlock(hData);
//Now set the clipboard data.
- #if defined( _UNICODE )
+
SetClipboardData(CF_UNICODETEXT, hData);
- #else
- SetClipboardData(CF_TEXT, hData);
- #endif
+
//Remove the lock on the clipboard.
CloseClipboard();
}
|