diff options
| author | George Hazan <ghazan@miranda.im> | 2019-07-24 20:58:51 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-07-24 20:58:58 +0300 |
| commit | ed4897b7ef69e862806a8c07f1fd475262d0c36e (patch) | |
| tree | 414efc6365f455122956eac74b754505c8efaf15 /plugins/Variables | |
| parent | 99893bf3aec9f4e9f0c4844c0987d129e1778c7e (diff) | |
massive warning fix
Diffstat (limited to 'plugins/Variables')
| -rw-r--r-- | plugins/Variables/src/contact.cpp | 2 | ||||
| -rw-r--r-- | plugins/Variables/src/parse_metacontacts.cpp | 6 | ||||
| -rw-r--r-- | plugins/Variables/src/parse_miranda.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/Variables/src/contact.cpp b/plugins/Variables/src/contact.cpp index 8c8144a665..b397164a29 100644 --- a/plugins/Variables/src/contact.cpp +++ b/plugins/Variables/src/contact.cpp @@ -210,7 +210,7 @@ MCONTACT getContactFromString(const wchar_t *tszContact, DWORD dwFlags, int nMat if ((dwFlags & CI_PROTOID) && !bMatch) {
ptrW cInfo(getContactInfoT(CNF_UNIQUEID, hContact));
if (cInfo) {
- tmp.Format(L"<%S:%s>", szProto, cInfo);
+ tmp.Format(L"<%S:%s>", szProto, cInfo.get());
if (tmp == tszContact)
bMatch = true;
}
diff --git a/plugins/Variables/src/parse_metacontacts.cpp b/plugins/Variables/src/parse_metacontacts.cpp index 0d06cafffc..7a4d6df88c 100644 --- a/plugins/Variables/src/parse_metacontacts.cpp +++ b/plugins/Variables/src/parse_metacontacts.cpp @@ -44,7 +44,7 @@ static wchar_t* parseGetParent(ARGUMENTSINFO *ai) szUniqueID = mir_wstrdup(tszID);
}
- return CMStringW(FORMAT, L"<%S:%s>", szProto, szUniqueID).Detach();
+ return CMStringW(FORMAT, L"<%S:%s>", szProto, szUniqueID.get()).Detach();
}
static wchar_t* parseGetDefault(ARGUMENTSINFO *ai)
@@ -72,7 +72,7 @@ static wchar_t* parseGetDefault(ARGUMENTSINFO *ai) szUniqueID = mir_wstrdup(tszID);
}
- return CMStringW(FORMAT, L"<%S:%s>", szProto, szUniqueID).Detach();
+ return CMStringW(FORMAT, L"<%S:%s>", szProto, szUniqueID.get()).Detach();
}
static wchar_t* parseGetMostOnline(ARGUMENTSINFO *ai)
@@ -100,7 +100,7 @@ static wchar_t* parseGetMostOnline(ARGUMENTSINFO *ai) szUniqueID = mir_wstrdup(tszID);
}
- return CMStringW(FORMAT, L"<%S:%s>", szProto, szUniqueID).Detach();
+ return CMStringW(FORMAT, L"<%S:%s>", szProto, szUniqueID.get()).Detach();
}
void registerMetaContactsTokens()
diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp index e093fce35c..3d51668705 100644 --- a/plugins/Variables/src/parse_miranda.cpp +++ b/plugins/Variables/src/parse_miranda.cpp @@ -393,7 +393,7 @@ static wchar_t* parseSpecialContact(ARGUMENTSINFO *ai) if (szUniqueID == NULL)
return nullptr;
- return CMStringW(FORMAT, L"<%S:%s>", szProto, szUniqueID).Detach();
+ return CMStringW(FORMAT, L"<%S:%s>", szProto, szUniqueID.get()).Detach();
}
static BOOL isValidDbEvent(DBEVENTINFO *dbe, int flags)
|