From 3bb16e798cb51d5764aacbefd4edf26f52d8c4f0 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 4 Dec 2019 16:08:03 +0300
Subject: GetContactProto: useless duplicate function replaced with standard
 Proto_GetBaseAccountName

---
 plugins/Variables/src/contact.cpp            | 8 ++++----
 plugins/Variables/src/parse_metacontacts.cpp | 6 +++---
 plugins/Variables/src/parse_miranda.cpp      | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'plugins/Variables')

diff --git a/plugins/Variables/src/contact.cpp b/plugins/Variables/src/contact.cpp
index b397164a29..4a1079b437 100644
--- a/plugins/Variables/src/contact.cpp
+++ b/plugins/Variables/src/contact.cpp
@@ -113,7 +113,7 @@ wchar_t* getContactInfoT(BYTE type, MCONTACT hContact)
 	if (hContact == NULL)
 		return nullptr;
 
-	char *szProto = GetContactProto(hContact);
+	char *szProto = Proto_GetBaseAccountName(hContact);
 	if (szProto == nullptr)
 		return nullptr;
 
@@ -202,7 +202,7 @@ MCONTACT getContactFromString(const wchar_t *tszContact, DWORD dwFlags, int nMat
 		tmp.Format(L"<%s:%d>", _A2W(PROTOID_HANDLE), hContact);
 		bool bMatch = (tmp == tszContact);
 
-		char *szProto = GetContactProto(hContact);
+		char *szProto = Proto_GetBaseAccountName(hContact);
 		if (szProto == nullptr)
 			continue;
 
@@ -305,7 +305,7 @@ static int contactSettingChanged(WPARAM hContact, LPARAM lParam)
 {
 	DBCONTACTWRITESETTING *dbw = (DBCONTACTWRITESETTING*)lParam;
 
-	char *szProto = GetContactProto(hContact);
+	char *szProto = Proto_GetBaseAccountName(hContact);
 	if (szProto == nullptr)
 		return 0;
 
@@ -357,7 +357,7 @@ int deinitContactModule()
 // result must be freed
 wchar_t* encodeContactToString(MCONTACT hContact)
 {
-	char *szProto = GetContactProto(hContact);
+	char *szProto = Proto_GetBaseAccountName(hContact);
 	if (szProto == nullptr)
 		return nullptr;
 
diff --git a/plugins/Variables/src/parse_metacontacts.cpp b/plugins/Variables/src/parse_metacontacts.cpp
index 7a4d6df88c..65d53de2e1 100644
--- a/plugins/Variables/src/parse_metacontacts.cpp
+++ b/plugins/Variables/src/parse_metacontacts.cpp
@@ -33,7 +33,7 @@ static wchar_t* parseGetParent(ARGUMENTSINFO *ai)
 		return nullptr;
 
 	ptrW szUniqueID;
-	char* szProto = GetContactProto(hContact);
+	char* szProto = Proto_GetBaseAccountName(hContact);
 	if (szProto != nullptr)
 		szUniqueID = getContactInfoT(CNF_UNIQUEID, hContact);
 
@@ -61,7 +61,7 @@ static wchar_t* parseGetDefault(ARGUMENTSINFO *ai)
 		return nullptr;
 
 	ptrW szUniqueID;
-	char* szProto = GetContactProto(hContact);
+	char* szProto = Proto_GetBaseAccountName(hContact);
 	if (szProto != nullptr)
 		szUniqueID = getContactInfoT(CNF_UNIQUEID, hContact);
 
@@ -89,7 +89,7 @@ static wchar_t* parseGetMostOnline(ARGUMENTSINFO *ai)
 		return nullptr;
 
 	ptrW szUniqueID;
-	char *szProto = GetContactProto(hContact);
+	char *szProto = Proto_GetBaseAccountName(hContact);
 	if (szProto != nullptr)
 		szUniqueID = getContactInfoT(CNF_UNIQUEID, hContact);
 
diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp
index 3d51668705..0e733a79ce 100644
--- a/plugins/Variables/src/parse_miranda.cpp
+++ b/plugins/Variables/src/parse_miranda.cpp
@@ -378,7 +378,7 @@ static wchar_t* parseSpecialContact(ARGUMENTSINFO *ai)
 
 	ai->flags |= AIF_DONTPARSE;
 	ptrW szUniqueID;
-	char *szProto = GetContactProto(ai->fi->hContact);
+	char *szProto = Proto_GetBaseAccountName(ai->fi->hContact);
 	if (szProto != nullptr)
 		szUniqueID = getContactInfoT(CNF_UNIQUEID, ai->fi->hContact);
 
-- 
cgit v1.2.3