From 67e460ae2bf43109b9095c518cd2ede4e043e202 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 3 Oct 2013 22:25:13 +0000
Subject: ptrT/A/W is used everywhere instead of DBVARIANT to read database
 strings

git-svn-id: http://svn.miranda-ng.org/main/trunk@6322 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/JabberG/src/jabber_util.cpp | 46 +++++++++++++++--------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

(limited to 'protocols/JabberG/src/jabber_util.cpp')

diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp
index 9b56bf9c5b..07d8a18e1d 100644
--- a/protocols/JabberG/src/jabber_util.cpp
+++ b/protocols/JabberG/src/jabber_util.cpp
@@ -50,18 +50,13 @@ HANDLE CJabberProto::ChatRoomHContactFromJID(const TCHAR *jid)
 		return NULL;
 
 	for (HANDLE hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {
-		DBVARIANT dbv;
-		int result = getTString(hContact, "ChatRoomID", &dbv);
-		if (result)
-			result = getTString(hContact, "jid", &dbv);
+		ptrT dbJid( getTStringA(hContact, "ChatRoomID"));
+		if (dbJid == NULL)
+			if ((dbJid = getTStringA(hContact, "jid")) == NULL)
+				continue;
 
-		if ( !result) {
-			int result;
-			result = lstrcmpi(jid, dbv.ptszVal);
-			db_free(&dbv);
-			if ( !result && isChatRoom(hContact))
-				return hContact;
-		}
+		if (!lstrcmpi(jid, dbJid) && isChatRoom(hContact))
+			return hContact;
 	}
 
 	return NULL;
@@ -80,27 +75,26 @@ HANDLE CJabberProto::HContactFromJID(const TCHAR *jid , BOOL bStripResource)
 	for (HANDLE hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {
 		bool bIsChat = isChatRoom(hContact);
 
-		DBVARIANT dbv;
-		if ( !getTString(hContact, bIsChat ? "ChatRoomID" : "jid", &dbv)) {
+		ptrT dbJid( getTStringA(hContact, bIsChat ? "ChatRoomID" : "jid"));
+		if (dbJid != NULL) {
 			int result;
 			if (item != NULL)
-				result = lstrcmpi(jid, dbv.ptszVal);
+				result = lstrcmpi(jid, dbJid);
 			else {
 				if (bStripResource == 3) {
 					if (bIsChat)
-						result = lstrcmpi(jid, dbv.ptszVal);  // for chat room we have to have full contact matched
+						result = lstrcmpi(jid, dbJid);  // for chat room we have to have full contact matched
 					else if (TRUE)
-						result = _tcsnicmp(jid, dbv.ptszVal, _tcslen(dbv.ptszVal));
+						result = _tcsnicmp(jid, dbJid, _tcslen(dbJid));
 					else
-						result = JabberCompareJids(jid, dbv.ptszVal);
+						result = JabberCompareJids(jid, dbJid);
 				}
 				// most probably it should just look full matching contact
 				else
-					result = lstrcmpi(jid, dbv.ptszVal);
-
+					result = lstrcmpi(jid, dbJid);
 			}
-			db_free(&dbv);
-			if ( !result)
+
+			if (result == 0)
 				return hContact;
 		}
 	}
@@ -875,13 +869,13 @@ const char* TStringPairs::operator[](const char* key) const
 void CJabberProto::ComboLoadRecentStrings(HWND hwndDlg, UINT idcCombo, char *param, int recentCount)
 {
 	for (int i=0; i < recentCount; i++) {
-		DBVARIANT dbv;
 		char setting[MAXMODULELABELLENGTH];
 		mir_snprintf(setting, sizeof(setting), "%s%d", param, i);
-		if ( !getTString(setting, &dbv)) {
-			SendDlgItemMessage(hwndDlg, idcCombo, CB_ADDSTRING, 0, (LPARAM)dbv.ptszVal);
-			db_free(&dbv);
-	}	}
+		ptrT tszRecent( getTStringA(setting));
+		if (tszRecent != NULL)
+			SendDlgItemMessage(hwndDlg, idcCombo, CB_ADDSTRING, 0, tszRecent);
+	}
+
 	if ( !SendDlgItemMessage(hwndDlg, idcCombo, CB_GETCOUNT, 0, 0))
 		SendDlgItemMessage(hwndDlg, idcCombo, CB_ADDSTRING, 0, (LPARAM)_T(""));
 }
-- 
cgit v1.2.3