From 428bf0cbd77813a43094cb5c984436deff251936 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 29 Jul 2016 12:36:34 +0000
Subject: no more TCHARs

git-svn-id: http://svn.miranda-ng.org/main/trunk@17143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Dropbox/src/dropbox_events.cpp  | 2 +-
 plugins/Dropbox/src/dropbox_options.cpp | 2 +-
 plugins/Dropbox/src/dropbox_utils.cpp   | 2 +-
 plugins/Dropbox/src/file_transfer.h     | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/Dropbox/src')

diff --git a/plugins/Dropbox/src/dropbox_events.cpp b/plugins/Dropbox/src/dropbox_events.cpp
index 24f4a384a7..a6454efe64 100644
--- a/plugins/Dropbox/src/dropbox_events.cpp
+++ b/plugins/Dropbox/src/dropbox_events.cpp
@@ -10,7 +10,7 @@ int CDropbox::OnModulesLoaded(WPARAM, LPARAM)
 	HookEventObj(ME_FILEDLG_CANCELED, GlobalEvent<&CDropbox::OnFileDialogCancelled>, this);
 
 	NETLIBUSER nlu = { sizeof(nlu) };
-	nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_TCHAR;
+	nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE;
 	nlu.szSettingsModule = MODULE;
 	nlu.ptszDescriptiveName = L"Dropbox";
 
diff --git a/plugins/Dropbox/src/dropbox_options.cpp b/plugins/Dropbox/src/dropbox_options.cpp
index 3bba4c0520..20f3f99474 100644
--- a/plugins/Dropbox/src/dropbox_options.cpp
+++ b/plugins/Dropbox/src/dropbox_options.cpp
@@ -153,7 +153,7 @@ int CDropbox::OnOptionsInitialized(WPARAM wParam, LPARAM)
 {
 	OPTIONSDIALOGPAGE odp = { 0 };
 	odp.pwszTitle = MODULEW;
-	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE;
+	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE;
 	odp.pwszGroup = LPGENW("Network");
 
 	odp.pwszTab = LPGENW("General");
diff --git a/plugins/Dropbox/src/dropbox_utils.cpp b/plugins/Dropbox/src/dropbox_utils.cpp
index b388117db5..c8ef7f06c8 100644
--- a/plugins/Dropbox/src/dropbox_utils.cpp
+++ b/plugins/Dropbox/src/dropbox_utils.cpp
@@ -105,7 +105,7 @@ void CDropbox::SendToContact(MCONTACT hContact, const wchar_t *data)
 
 	const char *szProto = GetContactProto(hContact);
 	if (db_get_b(hContact, szProto, "ChatRoom", 0) == TRUE) {
-		ptrW tszChatRoom(db_get_tsa(hContact, szProto, "ChatRoomID"));
+		ptrW tszChatRoom(db_get_wsa(hContact, szProto, "ChatRoomID"));
 		GCDEST gcd = { szProto, tszChatRoom, GC_EVENT_SENDMESSAGE };
 		GCEVENT gce = { sizeof(gce), &gcd };
 		gce.bIsMe = TRUE;
diff --git a/plugins/Dropbox/src/file_transfer.h b/plugins/Dropbox/src/file_transfer.h
index f5ef1e56fd..8c50542bed 100644
--- a/plugins/Dropbox/src/file_transfer.h
+++ b/plugins/Dropbox/src/file_transfer.h
@@ -15,9 +15,9 @@ private:
 	const wchar_t* folderName;
 	int relativePathStart;
 
-	CMString serverFolder;
+	CMStringW serverFolder;
 
-	CMString data;
+	CMStringW data;
 
 public:
 	FileTransferParam(MCONTACT hContact)
@@ -31,7 +31,7 @@ public:
 		relativePathStart = 0;
 
 		pfts.cbSize = sizeof(this->pfts);
-		pfts.flags = PFTS_TCHAR | PFTS_SENDING;
+		pfts.flags = PFTS_UNICODE | PFTS_SENDING;
 		pfts.hContact = hContact;
 		pfts.currentFileNumber = -1;
 		pfts.currentFileProgress = 0;
-- 
cgit v1.2.3