diff options
| -rw-r--r-- | include/m_system_cpp.h | 2 | ||||
| -rw-r--r-- | plugins/ChangeKeyboardLayout/src/hook_events.cpp | 2 | ||||
| -rw-r--r-- | plugins/Sessions/Src/Utils.cpp | 2 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/contactcache.cpp | 4 | ||||
| -rw-r--r-- | protocols/WhatsApp/src/dialogs.cpp | 2 | ||||
| -rw-r--r-- | src/modules/database/dbutils.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/include/m_system_cpp.h b/include/m_system_cpp.h index 40a91df399..a0679e496b 100644 --- a/include/m_system_cpp.h +++ b/include/m_system_cpp.h @@ -52,7 +52,7 @@ public: __inline T* operator->() const { return data; }
__inline operator T*() const { return data; }
__inline operator INT_PTR() const { return (INT_PTR)data; }
- __inline T* detouch() { T *res = data; data = NULL; return res; }
+ __inline T* detach() { T *res = data; data = NULL; return res; }
};
typedef mir_ptr<char> ptrA;
diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp index 7471d02e78..dbb57e0ad3 100644 --- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp +++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp @@ -107,7 +107,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) else if (!mir_tstrcmp(tszValue, ptszEmptySting))
ptszLayStrings[i] = ptszCurrLayout;
else {
- ptszLayStrings[i] = tszValue.detouch();
+ ptszLayStrings[i] = tszValue.detach();
if (!mir_tstrcmp(ptszCurrLayout, ptszLayStrings[i]))
db_unset(NULL, ModuleName, ptszTemp);
mir_free(ptszCurrLayout);
diff --git a/plugins/Sessions/Src/Utils.cpp b/plugins/Sessions/Src/Utils.cpp index 9b15bfe40e..a5eab0ebb8 100644 --- a/plugins/Sessions/Src/Utils.cpp +++ b/plugins/Sessions/Src/Utils.cpp @@ -47,7 +47,7 @@ void AddSessionMark(MCONTACT hContact, int mode, char bit) memset(pszBuffer, 0, (g_ses_count + 1));
mir_strcpy(pszBuffer, szValue);
}
- else pszBuffer = szValue.detouch();
+ else pszBuffer = szValue.detach();
char temp_1 = pszBuffer[0];
for (size_t i = 0; i < g_ses_count; i++) {
diff --git a/plugins/TabSRMM/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp index 268826c11c..3a38cdaef3 100644 --- a/plugins/TabSRMM/src/contactcache.cpp +++ b/plugins/TabSRMM/src/contactcache.cpp @@ -471,7 +471,7 @@ void CContactCache::updateStatusMsg(const char *szKey) m_ListeningInfo = 0; ptrT szListeningTo(db_get_tsa(hContact, cc->szProto, "ListeningTo")); if (szListeningTo != 0 && *szListeningTo) - m_ListeningInfo = szListeningTo.detouch(); + m_ListeningInfo = szListeningTo.detach(); } if (szKey == 0 || (szKey && !mir_strcmp("XStatusMsg", szKey))) { if (m_xStatusMsg) @@ -479,7 +479,7 @@ void CContactCache::updateStatusMsg(const char *szKey) m_xStatusMsg = 0; ptrT szXStatusMsg(db_get_tsa(hContact, cc->szProto, "XStatusMsg")); if (szXStatusMsg != 0 && *szXStatusMsg) - m_xStatusMsg = szXStatusMsg.detouch(); + m_xStatusMsg = szXStatusMsg.detach(); } m_xStatus = db_get_b(hContact, cc->szProto, "XStatusId", 0); } diff --git a/protocols/WhatsApp/src/dialogs.cpp b/protocols/WhatsApp/src/dialogs.cpp index 67832c93ee..48d476286c 100644 --- a/protocols/WhatsApp/src/dialogs.cpp +++ b/protocols/WhatsApp/src/dialogs.cpp @@ -83,7 +83,7 @@ public: {
ptrT tszGroup(m_group.GetText());
if (mir_tstrcmp(m_proto->m_tszDefaultGroup, tszGroup))
- m_proto->m_tszDefaultGroup = tszGroup.detouch();
+ m_proto->m_tszDefaultGroup = tszGroup.detach();
if (m_proto->isOnline())
MessageBox(NULL, TranslateT("Changes will be applied after protocol restart"), m_proto->m_tszUserName, MB_OK);
diff --git a/src/modules/database/dbutils.cpp b/src/modules/database/dbutils.cpp index 2e7ef5de9e..880e8a59d8 100644 --- a/src/modules/database/dbutils.cpp +++ b/src/modules/database/dbutils.cpp @@ -168,7 +168,7 @@ static INT_PTR DbEventGetText(WPARAM wParam, LPARAM lParam) ptrT &ptszText = (mir_tstrlen(tszDescription) == 0) ? tszFileName : tszDescription;
switch (egt->datatype) {
case DBVT_WCHAR:
- return (INT_PTR)ptszText.detouch();
+ return (INT_PTR)ptszText.detach();
case DBVT_ASCIIZ:
return (INT_PTR)mir_t2a(ptszText);
}
|