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/UserInfoEx/src | |
| parent | 99893bf3aec9f4e9f0c4844c0987d129e1778c7e (diff) | |
massive warning fix
Diffstat (limited to 'plugins/UserInfoEx/src')
| -rw-r--r-- | plugins/UserInfoEx/src/dlg_propsheet.cpp | 2 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp | 4 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp index 666dbf5235..ae3378cfff 100644 --- a/plugins/UserInfoEx/src/dlg_propsheet.cpp +++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp @@ -120,7 +120,7 @@ private: // check if icq is online
if (!IsProtoOnline((*_pPd)->szModuleName))
MsgBox(_pPs->hDlg, MB_ICON_WARNING, TranslateT("Upload details"),
- CMStringW(FORMAT, TranslateT("Protocol '%s' is offline"), _A2T((*_pPd)->szModuleName)),
+ CMStringW(FORMAT, TranslateT("Protocol '%s' is offline"), _A2T((*_pPd)->szModuleName).get()),
TranslateT("You are not currently connected to the ICQ network.\nYou must be online in order to update your information on the server.\n\nYour changes will be saved to database only."));
// start uploading process
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp index 36896aa558..19dc88f493 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp @@ -294,9 +294,9 @@ void CExImContactBase::toIni(FILE* file, int modCount) ptrW pszCI(Contact_GetInfo(CNF_DISPLAY, _hContact, _pszProto)); ptrA pszUID(uid2String(FALSE)); if (_pszUIDKey && pszUID) - mir_snprintf(name, "%S *(%s)*<%s>*{%s}*", pszCI, _pszProto, _pszUIDKey, pszUID); + mir_snprintf(name, "%S *(%s)*<%s>*{%s}*", pszCI.get(), _pszProto, _pszUIDKey, pszUID.get()); else - mir_snprintf(name, "%S (%s)", pszCI, _pszProto); + mir_snprintf(name, "%S (%s)", pszCI.get(), _pszProto); } // it is not the best solution (but still works if only basic modules export) - need rework diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp index 82cefe4a85..499878340a 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp @@ -673,7 +673,7 @@ int CExImContactXML::Import(BYTE keepMetaSubContact) do {
// update progressbar and abort if user clicked cancel
int result = _pXmlFile->_progress.UpdateContact(L"Sub Contact: %s (%S)",
- ptrW(mir_utf8decodeW(xContact->Attribute("nick"))), xContact->Attribute("proto"));
+ ptrW(mir_utf8decodeW(xContact->Attribute("nick"))).get(), xContact->Attribute("proto"));
// user clicked abort button
if (!result)
|