From 11fcecff7c310c2cc10bda2ab2fa2daf525be571 Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Wed, 13 Mar 2013 08:00:41 +0000
Subject: - another portion of '#ifdef UNICODE' clean up

git-svn-id: http://svn.miranda-ng.org/main/trunk@3993 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/SendScreenshotPlus/src/CSend.cpp     |  4 +---
 plugins/SendScreenshotPlus/src/UMainForm.cpp |  7 ++-----
 plugins/SendScreenshotPlus/src/Utils.cpp     | 11 ++---------
 plugins/SendScreenshotPlus/src/global.h      |  8 +++-----
 plugins/SendScreenshotPlus/src/mir_string.h  | 18 ++----------------
 5 files changed, 10 insertions(+), 38 deletions(-)

(limited to 'plugins/SendScreenshotPlus')

diff --git a/plugins/SendScreenshotPlus/src/CSend.cpp b/plugins/SendScreenshotPlus/src/CSend.cpp
index cd874e152e..7251cde058 100644
--- a/plugins/SendScreenshotPlus/src/CSend.cpp
+++ b/plugins/SendScreenshotPlus/src/CSend.cpp
@@ -295,9 +295,7 @@ void	CSend::DB_EventAdd(WORD EventType) {
 	dbei.eventType = EventType;
 	dbei.flags = DBEF_SENT;
 	dbei.timestamp = time(NULL);
-	#if defined( _UNICODE )
-		dbei.flags |= DBEF_UTF;
-	#endif
+	dbei.flags |= DBEF_UTF;
 	dbei.cbBlob= m_cbEventMsg;
 	dbei.pBlob=(PBYTE)m_szEventMsg;
 
diff --git a/plugins/SendScreenshotPlus/src/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp
index ecfb61b2e2..229f19ac37 100644
--- a/plugins/SendScreenshotPlus/src/UMainForm.cpp
+++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp
@@ -1085,13 +1085,10 @@ INT_PTR TfrmMain::SaveScreenshot(FIBITMAP* dib) {
 	TCHAR pszFormat[6];
 	ComboBox_GetText(hwndCombo, pszFormat, 6);
 	if(ret && (_tcsicmp (pszFormat,_T("png")) != 0)) {
-		#if defined(_UNICODE)
+		
 			fif = FIP->FI_GetFIFFromFilenameU(ret);
 			dib_new = FIP->FI_LoadU(fif, ret,0);
-		#else
-			fif = FIP->FI_GetFIFFromFilenameU(ret);
-			dib_new = FIP->FI_Load(fif, ret,0);
-		#endif
+		
 		
 		if(dib_new) {
 			DeleteFile(ret);
diff --git a/plugins/SendScreenshotPlus/src/Utils.cpp b/plugins/SendScreenshotPlus/src/Utils.cpp
index ab74f569a1..3758c1e18e 100644
--- a/plugins/SendScreenshotPlus/src/Utils.cpp
+++ b/plugins/SendScreenshotPlus/src/Utils.cpp
@@ -338,21 +338,14 @@ LPTSTR SaveImage(FREE_IMAGE_FORMAT fif, FIBITMAP* dib, LPTSTR pszFilename, LPTST
 	}
 
 	if(fif==FIF_UNKNOWN) {
-	#if defined(_UNICODE)
 		fif = FIP->FI_GetFIFFromFilenameU(pszFile);
-	#else
-		fif = FIP->FI_GetFIFFromFilename(pszFile);
-	#endif
 	}
 	if(FIP->FI_FIFSupportsICCProfiles(fif)) {
 		bool bDummy = true;
 	}
 
-	#if defined(_UNICODE)
-		ret = FIP->FI_SaveU(fif, dib, pszFile, flag);
-	#else
-		ret = FIP->FI_Save(fif, dib, pszFile, flag);
-	#endif
+	ret = FIP->FI_SaveU(fif, dib, pszFile, flag);
+	
 
 	mir_free(FileExt);
 
diff --git a/plugins/SendScreenshotPlus/src/global.h b/plugins/SendScreenshotPlus/src/global.h
index 4d773e4258..b6301a8caf 100644
--- a/plugins/SendScreenshotPlus/src/global.h
+++ b/plugins/SendScreenshotPlus/src/global.h
@@ -153,11 +153,9 @@ std::basic_string<_Elem> replace(const std::basic_string<_Elem> & Origninal, con
 #define MBS_DOWNARROW		0x00008000L			// has arrow on the right
 
 #define MBF_UNICODE			1
-#ifdef _UNICODE
- #define MBF_TCHAR			MBF_UNICODE
-#else
- #define MBF_TCHAR			0
-#endif
+
+#define MBF_TCHAR			MBF_UNICODE
+
 
 // BUTTONADDTOOLTIP
 // use lParam=MBF_UNICODE to set unicode tooltips
diff --git a/plugins/SendScreenshotPlus/src/mir_string.h b/plugins/SendScreenshotPlus/src/mir_string.h
index a9d485f3cc..00f4088056 100644
--- a/plugins/SendScreenshotPlus/src/mir_string.h
+++ b/plugins/SendScreenshotPlus/src/mir_string.h
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #define mir_wcsdup		mir_wstrdup
 
-#ifdef _UNICODE
+
  #define mir_tcslen		mir_wcslen
  #define mir_tcscpy		mir_wcscpy
  #define mir_tcsncpy	mir_wcsncpy
@@ -43,21 +43,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  #define mir_tcsrchr	mir_wcsrchr
  #define mir_tcsncat_c	mir_wcsncat_c
  #define mir_tcsadd		mir_wcsadd
-#else
- #define mir_tcslen		mir_strlen
- #define mir_tcscpy		mir_strcpy
- #define mir_tcsncpy	mir_strncpy
- #define mir_tcsncat	mir_strncat
- #define mir_tcsdup		mir_strdup
- #define mir_tcscmp		mir_strcmp
- #define mir_tcsncmp	mir_strncmp
- #define mir_tcsicmp	mir_stricmp
- #define mir_tcsnicmp	mir_strnicmp
- #define mir_tcschr		mir_strchr
- #define mir_tcsrchr	mir_strrchr
- #define mir_tcsncat_c	mir_strncat_c
- #define mir_tcsadd		mir_stradd
-#endif
+
 
 
 #define mir_strlen(s)			(((s)!=0)?strlen(s):0)
-- 
cgit v1.2.3