summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-08-14 11:50:55 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-08-14 11:50:55 +0000
commitb52e0fc9d3e21b7f4d649ace51beca9e61692818 (patch)
tree697540e856b0f8d4daf0c259ab57c6061cbe9678 /plugins
parent4d3d9100ecba8aec804b1edd2e077f8acb533b3b (diff)
slack removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@5686 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
-rw-r--r--plugins/TabSRMM/src/chat/manager.cpp19
-rw-r--r--plugins/TabSRMM/src/functions.h2
-rw-r--r--plugins/TabSRMM/src/mim.cpp6
-rw-r--r--plugins/TabSRMM/src/mim.h16
4 files changed, 3 insertions, 40 deletions
diff --git a/plugins/TabSRMM/src/chat/manager.cpp b/plugins/TabSRMM/src/chat/manager.cpp
index 3458ae87c3..13215f3f92 100644
--- a/plugins/TabSRMM/src/chat/manager.cpp
+++ b/plugins/TabSRMM/src/chat/manager.cpp
@@ -71,12 +71,6 @@ SESSION_INFO* SM_AddSession(const TCHAR* pszID, const char* pszModule)
node->ptszID = mir_tstrdup(pszID);
node->pszModule = mir_strdup(pszModule);
- {
- char *p = (char*)node;
- _DebugTraceA("SESSION_INFO allocated: crashes at %lp %lp %lp %lp",
- p + offsetof(SESSION_INFO, wStatus), p + offsetof(SESSION_INFO, wState), p + offsetof(SESSION_INFO, wCommandsNum), p + offsetof(SESSION_INFO, szSearch));
- }
-
MODULEINFO *mi = MM_FindModule(pszModule);
if (mi) {
mi->idleTimeStamp = time(0);
@@ -910,11 +904,7 @@ STATUSINFO * TM_AddStatus(STATUSINFO** ppStatusList, const TCHAR* pszStatus, int
if (!TM_FindStatus(*ppStatusList, pszStatus)) {
STATUSINFO *node = (STATUSINFO*)mir_calloc(sizeof(STATUSINFO));
- {
- char *p = (char*)node;
- _DebugTraceA("STATUSINFO allocated: crashes at %lp", p + offsetof(STATUSINFO, Status));
- }
- replaceStrT(node->pszGroup, pszStatus);
+ node->pszGroup = mir_tstrdup(pszStatus);
node->hIcon = (HICON)(*iCount);
while ((int)node->hIcon > STATUSICONCOUNT - 1)
node->hIcon--;
@@ -1102,12 +1092,7 @@ USERINFO* UM_AddUser(STATUSINFO* pStatusList, USERINFO** ppUserList, const TCHAR
}
USERINFO *node = (USERINFO*)mir_calloc(sizeof(USERINFO));
- {
- char *p = (char*)node;
- _DebugTraceA("USERINFO allocated: crashes at %lp",
- p + offsetof(USERINFO, Status), p + offsetof(USERINFO, ContactStatus));
- }
- replaceStrT(node->pszUID, pszUID);
+ node->pszUID = mir_tstrdup(pszUID);
if (*ppUserList == NULL) { // list is empty
*ppUserList = node;
diff --git a/plugins/TabSRMM/src/functions.h b/plugins/TabSRMM/src/functions.h
index e0496eaaca..88a0a852be 100644
--- a/plugins/TabSRMM/src/functions.h
+++ b/plugins/TabSRMM/src/functions.h
@@ -153,8 +153,6 @@ int TSAPI UnloadTSButtonModule();
* debugging support
*/
-int _DebugTraceW(const wchar_t *fmt, ...);
-int _DebugTraceA(const char *fmt, ...);
int _DebugPopup(HANDLE hContact, const TCHAR *fmt, ...);
int _DebugMessage(HWND hwndDlg, TWindowData *dat, const char *fmt, ...);
diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp
index 0d75bd4532..34e7af4dc2 100644
--- a/plugins/TabSRMM/src/mim.cpp
+++ b/plugins/TabSRMM/src/mim.cpp
@@ -71,12 +71,6 @@ TCHAR CMimAPI::m_userDir[] = _T("\0");
bool CMimAPI::m_haveBufferedPaint = false;
-void CMimAPI::timerMsg(const char *szMsg)
-{
- mir_snprintf(m_timerMsg, 256, "%s: %d ticks = %f msec", szMsg, (int)(m_tStop - m_tStart), 1000 * ((double)(m_tStop - m_tStart) * m_dFreq));
- _DebugTraceA(m_timerMsg);
-}
-
/**
* Case insensitive _tcsstr
*
diff --git a/plugins/TabSRMM/src/mim.h b/plugins/TabSRMM/src/mim.h
index b4bde5e57b..8c3f34828c 100644
--- a/plugins/TabSRMM/src/mim.h
+++ b/plugins/TabSRMM/src/mim.h
@@ -158,8 +158,7 @@ public:
void startTimer();
void stopTimer(const char *szMsg = 0);
- void timerMsg(const char *szMsg);
-
+
__forceinline __int64 getTimerStart() const { return m_tStart; }
__forceinline __int64 getTimerStop() const { return m_tStop; }
__forceinline __int64 getTicks() const { return m_tStop - m_tStart; }
@@ -274,19 +273,6 @@ private:
static TCHAR m_userDir[MAX_PATH + 2];
};
-inline void CMimAPI::startTimer()
-{
- ::QueryPerformanceCounter((LARGE_INTEGER *)&m_tStart);
-}
-
-inline void CMimAPI::stopTimer(const char *szMsg)
-{
- ::QueryPerformanceCounter((LARGE_INTEGER *)&m_tStop);
-
- if (szMsg)
- timerMsg(szMsg);
-}
-
extern CMimAPI M;
#endif /* __MIM_H */