From 70430aafa50d548554f2c3cd0cb81a26dbe9ce1b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 20 Aug 2013 11:54:34 +0000 Subject: various junk removed git-svn-id: http://svn.miranda-ng.org/main/trunk@5758 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TabSRMM/src/hotkeyhandler.cpp | 2 -- plugins/TabSRMM/src/msgdlgutils.cpp | 13 ++++++------- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'plugins') diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp index 081ea47669..84694eeae6 100644 --- a/plugins/TabSRMM/src/hotkeyhandler.cpp +++ b/plugins/TabSRMM/src/hotkeyhandler.cpp @@ -71,8 +71,6 @@ static HOTKEYDESC _hotkeydescs[] = { { 0, "tabsrmm_close_other", LPGEN("Close Other Tabs"), TABSRMM_HK_SECTION_GENERIC, 0, HOTKEYCODE(HOTKEYF_ALT|HOTKEYF_CONTROL, 'W'), TABSRMM_HK_CLOSE_OTHER }, }; -static SendLaterJobIterator g_jobs; - LRESULT ProcessHotkeysByMsgFilter(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, UINT_PTR ctrlId) { MSGFILTER mf; diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index c9e2dc7234..b2928e20e8 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -2367,7 +2367,7 @@ LONG TSAPI GetDefaultMinimumInputHeight(const TWindowData *dat) } #endif -static std::vector vTempFilenames; +static LIST vTempFilenames(5); /** * send a pasted bitmap by file transfer. @@ -2463,7 +2463,7 @@ void TSAPI SendHBitmapAsFile(const TWindowData *dat, HBITMAP hbmp) Utils::AddToFileList(&ppFiles, &totalCount, filename); wchar_t* _t = mir_tstrdup(filename); - vTempFilenames.push_back(_t); + vTempFilenames.insert(_t); CallService(MS_FILE_SENDSPECIFICFILEST, (WPARAM)dat->cache->getActiveContact(), (LPARAM)ppFiles); @@ -2476,10 +2476,9 @@ void TSAPI SendHBitmapAsFile(const TWindowData *dat, HBITMAP hbmp) */ void TSAPI CleanTempFiles() { - std::vector::iterator it = vTempFilenames.begin(); - - while(it != vTempFilenames.end()) { - DeleteFileW(*it); - mir_free(*it++); + for (int i=0; i < vTempFilenames.getCount(); i++) { + wchar_t* _t = vTempFilenames[i]; + DeleteFileW(_t); + mir_free(_t); } } -- cgit v1.2.3