From 78c0815c4118fe24ab78cce2dc48a6232dcd824a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 2 Jun 2012 20:55:18 +0000 Subject: - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@270 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TabSRMM/chat/clist.cpp | 2 +- plugins/TabSRMM/chat/muchighlight.cpp | 24 ++++++------ plugins/TabSRMM/chat/options.cpp | 4 +- plugins/TabSRMM/chat/services.cpp | 2 +- plugins/TabSRMM/chat/tools.cpp | 14 +++---- plugins/TabSRMM/chat/window.cpp | 28 +++++++------- plugins/TabSRMM/include/msgs.h | 2 +- plugins/TabSRMM/include/themes.h | 2 +- plugins/TabSRMM/src/buttonsbar.cpp | 4 +- plugins/TabSRMM/src/contactcache.cpp | 2 +- plugins/TabSRMM/src/container.cpp | 10 ++--- plugins/TabSRMM/src/containeroptions.cpp | 6 +-- plugins/TabSRMM/src/controls.cpp | 8 ++-- plugins/TabSRMM/src/eventpopups.cpp | 12 +++--- plugins/TabSRMM/src/generic_msghandlers.cpp | 32 ++++++++-------- plugins/TabSRMM/src/globals.cpp | 8 ++-- plugins/TabSRMM/src/hotkeyhandler.cpp | 4 +- plugins/TabSRMM/src/infopanel.cpp | 58 ++++++++++++++--------------- plugins/TabSRMM/src/mim.cpp | 10 ++--- plugins/TabSRMM/src/msgdialog.cpp | 34 ++++++++--------- plugins/TabSRMM/src/msgdlgutils.cpp | 18 ++++----- plugins/TabSRMM/src/msglog.cpp | 2 +- plugins/TabSRMM/src/msgoptions.cpp | 10 ++--- plugins/TabSRMM/src/msgs.cpp | 8 ++-- plugins/TabSRMM/src/selectcontainer.cpp | 2 +- plugins/TabSRMM/src/sendlater.cpp | 42 ++++++++++----------- plugins/TabSRMM/src/sendqueue.cpp | 2 +- plugins/TabSRMM/src/sidebar.cpp | 36 +++++++++--------- plugins/TabSRMM/src/tabctrl.cpp | 4 +- plugins/TabSRMM/src/taskbar.cpp | 14 +++---- plugins/TabSRMM/src/themeio.cpp | 2 +- plugins/TabSRMM/src/themes.cpp | 24 ++++++------ plugins/TabSRMM/src/userprefs.cpp | 6 +-- plugins/TabSRMM/src/utils.cpp | 22 +++++------ plugins/TabSRMM/tabmodplus/modplus.cpp | 2 +- plugins/TabSRMM/tabsrmm_10.vcxproj | 22 +++++------ plugins/TabSRMM/tabsrmm_10.vcxproj.filters | 12 ------ 37 files changed, 241 insertions(+), 253 deletions(-) (limited to 'plugins/TabSRMM') diff --git a/plugins/TabSRMM/chat/clist.cpp b/plugins/TabSRMM/chat/clist.cpp index d321c4d017..18f1eba4e4 100644 --- a/plugins/TabSRMM/chat/clist.cpp +++ b/plugins/TabSRMM/chat/clist.cpp @@ -52,7 +52,7 @@ static HANDLE Clist_GroupExists(TCHAR *tszGroup) do { _itoa(i, str, 10); result = M->GetTString(0, "CListGroups", str, &dbv); - if(!result) { + if (!result) { match = (!_tcscmp(tszGroup, &dbv.ptszVal[1]) && (lstrlen(tszGroup) == lstrlen(&dbv.ptszVal[1]))); DBFreeVariant(&dbv); if(match) diff --git a/plugins/TabSRMM/chat/muchighlight.cpp b/plugins/TabSRMM/chat/muchighlight.cpp index d790cc1d2b..80709d863a 100644 --- a/plugins/TabSRMM/chat/muchighlight.cpp +++ b/plugins/TabSRMM/chat/muchighlight.cpp @@ -91,20 +91,20 @@ void CMUCHighlight::tokenize(TCHAR *tszString, TCHAR**& patterns, UINT& nr) TCHAR *p = tszString; - if(*p == 0) + if (*p == 0) return; nr = 0; - if(*p != ' ') + if (*p != ' ') nr++; while(*p) { - if(*p == ' ') { + if (*p == ' ') { p++; while(*p && _istspace(*p)) p++; - if(*p) + if (*p) nr++; } p++; @@ -114,15 +114,15 @@ void CMUCHighlight::tokenize(TCHAR *tszString, TCHAR**& patterns, UINT& nr) p = tszString; nr = 0; - if(*p != ' ') + if (*p != ' ') patterns[nr++] = p; while(*p) { - if(*p == ' ') { + if (*p == ' ') { *p++ = 0; while(*p && _istspace(*p)) p++; - if(*p) + if (*p) patterns[nr++] = p; } p++; @@ -137,7 +137,7 @@ int CMUCHighlight::match(const GCEVENT *pgce, const SESSION_INFO *psi, DWORD dwF return(0); __try { - if((m_dwFlags & MATCH_TEXT) && (dwFlags & MATCH_TEXT) && (m_fHighlightMe || m_iTextPatterns > 0) && psi != 0) { + if ((m_dwFlags & MATCH_TEXT) && (dwFlags & MATCH_TEXT) && (m_fHighlightMe || m_iTextPatterns > 0) && psi != 0) { #ifdef __HLT_PERFSTATS int words = 0; M->startTimer(); @@ -162,12 +162,12 @@ int CMUCHighlight::match(const GCEVENT *pgce, const SESSION_INFO *psi, DWORD dwF while(*p && (*p == ' ' || *p == ',' || *p == '.' || *p == ':' || *p == ';' || *p == '?' || *p == '!')) p++; - if(*p) { + if (*p) { p1 = p; while(*p1 && *p1 != ' ' && *p1 != ',' && *p1 != '.' && *p1 != ':' && *p1 != ';' && *p1 != '?' && *p1 != '!') p1++; - if(*p1) + if (*p1) *p1 = 0; else p1 = 0; @@ -205,11 +205,11 @@ skip_textpatterns: /* * optinally, match the nickname against the list of nicks to highlight */ - if((m_dwFlags & MATCH_NICKNAME) && (dwFlags & MATCH_NICKNAME) && pgce->ptszNick && m_iNickPatterns > 0) { + if ((m_dwFlags & MATCH_NICKNAME) && (dwFlags & MATCH_NICKNAME) && pgce->ptszNick && m_iNickPatterns > 0) { for(UINT i = 0; i < m_iNickPatterns && !nResult; i++) { if(pgce->ptszNick) nResult = wildmatch(m_NickPatterns[i], pgce->ptszNick) ? MATCH_NICKNAME : 0; - if((m_dwFlags & MATCH_UIN) && pgce->ptszUserInfo) + if ((m_dwFlags & MATCH_UIN) && pgce->ptszUserInfo) nResult = wildmatch(m_NickPatterns[i], pgce->ptszUserInfo) ? MATCH_NICKNAME : 0; } } diff --git a/plugins/TabSRMM/chat/options.cpp b/plugins/TabSRMM/chat/options.cpp index b2b6d9c63c..d50ed5ecbb 100644 --- a/plugins/TabSRMM/chat/options.cpp +++ b/plugins/TabSRMM/chat/options.cpp @@ -1023,8 +1023,8 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM while(*p && (*p == '\\' || *p == '.')) p++; - if(*p) { - if((p1 = _tcschr(p, '\\'))) + if (*p) { + if ((p1 = _tcschr(p, '\\'))) *p1 = 0; } diff --git a/plugins/TabSRMM/chat/services.cpp b/plugins/TabSRMM/chat/services.cpp index e165763861..5e241823b7 100644 --- a/plugins/TabSRMM/chat/services.cpp +++ b/plugins/TabSRMM/chat/services.cpp @@ -555,7 +555,7 @@ HWND CreateNewRoom(TContainerData *pContainer, SESSION_INFO *si, BOOL bActivateT } } if (bActivateTab) { - if (PluginConfig.m_HideOnClose && !IsWindowVisible(pContainer->hwnd)){ + if (PluginConfig.m_HideOnClose && !IsWindowVisible(pContainer->hwnd)) { WINDOWPLACEMENT wp={0}; wp.length = sizeof(wp); GetWindowPlacement(pContainer->hwnd, &wp); diff --git a/plugins/TabSRMM/chat/tools.cpp b/plugins/TabSRMM/chat/tools.cpp index 0726a01869..c7ad91cc4c 100644 --- a/plugins/TabSRMM/chat/tools.cpp +++ b/plugins/TabSRMM/chat/tools.cpp @@ -337,7 +337,7 @@ static BOOL DoPopup(SESSION_INFO* si, GCEVENT* gce, struct TWindowData* dat) } if (dat && pContainer != 0) { // message window is open, need to check the container config if we want to see a popup nonetheless if (nen_options.bWindowCheck) { // no popups at all for open windows... no exceptions - if(!PluginConfig.m_HideOnClose) + if (!PluginConfig.m_HideOnClose) return(0); if(pContainer->fHidden) goto passed; @@ -364,7 +364,7 @@ passed: int iNewEvent = iEvent; COLORREF clr = 0; - if((iNewEvent & GC_EVENT_HIGHLIGHT)) { + if ((iNewEvent & GC_EVENT_HIGHLIGHT)) { clr = aFonts[16].color; iNewEvent &= ~GC_EVENT_HIGHLIGHT; } @@ -541,7 +541,7 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO* si, GCEVENT * gce, BOOL bHighligh params->bInactive = TRUE; if(si->hWnd && si->dat) { dat = si->dat; - if((si->hWnd == si->dat->pContainer->hwndActive) && GetForegroundWindow() == si->dat->pContainer->hwnd) + if ((si->hWnd == si->dat->pContainer->hwndActive) && GetForegroundWindow() == si->dat->pContainer->hwnd) params->bInactive = FALSE; } params->bActiveTab = params->bMustFlash = params->bMustAutoswitch = FALSE; @@ -776,7 +776,7 @@ BOOL LogToFile(SESSION_INFO* si, GCEVENT * gce) /* * check whether we have to log this event */ - if(!(gce->pDest->iType & si->iDiskLogFlags)) + if (!(gce->pDest->iType & si->iDiskLogFlags)) return FALSE; szBuffer[0] = '\0'; @@ -919,7 +919,7 @@ BOOL LogToFile(SESSION_INFO* si, GCEVENT * gce) mir_sntprintf(tszNewName, _MAX_DRIVE + _MAX_DIR + _MAX_FNAME + _MAX_EXT + 20, _T("%s%s-%s%s"), tszNewPath, tszName, tszTimestamp, tszExt); fclose(hFile); hFile = 0; - if(!PathFileExists(tszNewName)) + if (!PathFileExists(tszNewName)) CopyFile(si->pszLogFileName, tszNewName, TRUE); DeleteFile(si->pszLogFileName); } @@ -1272,7 +1272,7 @@ TCHAR* GetChatLogsFilename(SESSION_INFO *si, time_t tTime) int i; bool fReparse = false; - if(!tTime) + if (!tTime) time(&tTime); /* @@ -1331,7 +1331,7 @@ TCHAR* GetChatLogsFilename(SESSION_INFO *si, time_t tTime) dat.variables = rva; tszParsedName = (TCHAR*) CallService(MS_UTILS_REPLACEVARS, (WPARAM)g_Settings.pszLogDir, (LPARAM)&dat); - if(!M->pathIsAbsolute(tszParsedName)) + if (!M->pathIsAbsolute(tszParsedName)) mir_sntprintf(si->pszLogFileName, MAX_PATH, _T("%s%s"), M->getChatLogPath(), tszParsedName); else mir_sntprintf(si->pszLogFileName, MAX_PATH, _T("%s"), tszParsedName); diff --git a/plugins/TabSRMM/chat/window.cpp b/plugins/TabSRMM/chat/window.cpp index 0c7d3c8f99..61913f04b5 100644 --- a/plugins/TabSRMM/chat/window.cpp +++ b/plugins/TabSRMM/chat/window.cpp @@ -268,7 +268,7 @@ static void Chat_UpdateWindowState(TWindowData *dat, UINT msg) GetCursorPos(&pt); GetWindowRect(si->hwndFilter, &rcFilter); - if(!PtInRect(&rcFilter, pt)) { + if (!PtInRect(&rcFilter, pt)) { SendMessage(si->hwndFilter, WM_CLOSE, 1, 1); si->hwndFilter = 0; } @@ -972,8 +972,8 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, } SendMessage(hwnd, WM_SETREDRAW, TRUE, 0); RedrawWindow(hwnd, NULL, NULL, RDW_INVALIDATE); - if(!fCompleted && !PluginConfig.m_AllowTab) { - if((GetSendButtonState(mwdat->hwnd) != PBS_DISABLED)) + if (!fCompleted && !PluginConfig.m_AllowTab) { + if ((GetSendButtonState(mwdat->hwnd) != PBS_DISABLED)) SetFocus(GetDlgItem(mwdat->hwnd, IDOK)); else SetFocus(GetDlgItem(mwdat->hwnd, IDC_CHAT_LOG)); @@ -1984,7 +1984,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar dat->fIsAutosizingInput = IsAutoSplitEnabled(dat); dat->fLimitedUpdate = false; dat->iInputAreaHeight = -1; - if(!dat->pContainer->settings->fPrivate) + if (!dat->pContainer->settings->fPrivate) psi->iSplitterY = g_Settings.iSplitterY; else { if(M->GetByte("Chat", "SyncSplitter", 0)) @@ -2198,10 +2198,10 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar //Mad: strange rare crash here... mi = MM_FindModule(si->pszModule); - if(!mi) + if (!mi) break; - if(!mi->ptszModDispName) + if (!mi->ptszModDispName) break; x += GetTextPixelSize(mi->ptszModDispName, (HFONT)SendMessage(dat->pContainer->hwndStatus, WM_GETFONT, 0, 0), TRUE); @@ -2211,7 +2211,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar time_t now = time(0); DWORD diff = (now - mi->idleTimeStamp) / 60; - if((diff >= 1 && diff != mi->lastIdleCheck) || lParam) { + if ((diff >= 1 && diff != mi->lastIdleCheck) || lParam) { mi->lastIdleCheck = diff; if(diff == 0) mi->tszIdleMsg[0] = 0; @@ -2720,7 +2720,7 @@ LABEL_SHOWWINDOW: if(msg == WM_SYSKEYUP) { if(wp == VK_MENU) { - if(!dat->fkeyProcessed && !(GetKeyState(VK_CONTROL) & 0x8000) && !(GetKeyState(VK_SHIFT) & 0x8000) && !(lp & (1 << 24))) + if (!dat->fkeyProcessed && !(GetKeyState(VK_CONTROL) & 0x8000) && !(GetKeyState(VK_SHIFT) & 0x8000) && !(lp & (1 << 24))) dat->pContainer->MenuBar->autoShow(); } return(_dlgReturn(hwndDlg, 0)); @@ -2777,7 +2777,7 @@ LABEL_SHOWWINDOW: } if(msg == WM_KEYDOWN && wp == VK_TAB) { - if(((NMHDR *)lParam)->idFrom == IDC_CHAT_LOG) { + if (((NMHDR *)lParam)->idFrom == IDC_CHAT_LOG) { SetFocus(GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE)); return(_dlgReturn(hwndDlg, 1)); } @@ -3072,7 +3072,7 @@ LABEL_SHOWWINDOW: POINT tmp; //+ Protogenes POINTS cur; //+ Protogenes GetCursorPos(&tmp); //+ Protogenes - if(!dat->Panel->isHovered()) { + if (!dat->Panel->isHovered()) { cur.x = (SHORT)tmp.x; //+ Protogenes cur.y = (SHORT)tmp.y; //+ Protogenes SendMessage(dat->pContainer->hwnd, WM_NCLBUTTONDOWN, HTCAPTION, *((LPARAM*)(&cur))); //+ Protogenes @@ -3446,7 +3446,7 @@ LABEL_SHOWWINDOW: dat->Panel->renderContent(hdcMem); - if(!CSkin::m_skinEnabled) + if (!CSkin::m_skinEnabled) CSkin::RenderToolbarBG(dat, hdcMem, rcClient); if(hbp) @@ -3457,7 +3457,7 @@ LABEL_SHOWWINDOW: DeleteObject(hbm); DeleteDC(hdcMem); } - if(!dat->fLimitedUpdate) + if (!dat->fLimitedUpdate) SetAeroMargins(dat->pContainer); return(1); } @@ -3540,7 +3540,7 @@ LABEL_SHOWWINDOW: case DM_CONTAINERSELECTED: { struct TContainerData *pNewContainer = 0; TCHAR *szNewName = (TCHAR *)lParam; - if(!_tcscmp(szNewName, CTranslator::get(CTranslator::GEN_DEFAULT_CONTAINER_NAME))) + if (!_tcscmp(szNewName, CTranslator::get(CTranslator::GEN_DEFAULT_CONTAINER_NAME))) szNewName = CGlobals::m_default_container_name; int iOldItems = TabCtrl_GetItemCount(hwndTab); if (!_tcsncmp(dat->pContainer->szName, szNewName, CONTAINER_NAMELEN)) @@ -3797,7 +3797,7 @@ LABEL_SHOWWINDOW: TABSRMM_FireEvent(dat->hContact, hwndDlg, MSG_WINDOW_EVT_CLOSING, 0); - if(!dat->fIsAutosizingInput) + if (!dat->fIsAutosizingInput) DBWriteContactSettingWord(NULL, "Chat", "SplitterX", (WORD)g_Settings.iSplitterX); if(dat->pContainer->settings->fPrivate && !IsAutoSplitEnabled(dat)) diff --git a/plugins/TabSRMM/include/msgs.h b/plugins/TabSRMM/include/msgs.h index 51c59a1561..94bca920c1 100644 --- a/plugins/TabSRMM/include/msgs.h +++ b/plugins/TabSRMM/include/msgs.h @@ -648,7 +648,7 @@ public: STDMETHOD_(ULONG, Release)(void) { --mRefCounter; - //if(--mRefCounter == 0) + //if (--mRefCounter == 0) // delete this; return (mRefCounter); } diff --git a/plugins/TabSRMM/include/themes.h b/plugins/TabSRMM/include/themes.h index d1cc15d53c..e06110c6f3 100644 --- a/plugins/TabSRMM/include/themes.h +++ b/plugins/TabSRMM/include/themes.h @@ -160,7 +160,7 @@ public: m_inner_height = m_height - m_bBottom - m_bTop; m_inner_width = m_width - m_bLeft - m_bRight; - if(!(m_dwFlags & IMAGE_FLAG_DIVIDED)) + if (!(m_dwFlags & IMAGE_FLAG_DIVIDED)) m_bStretch = IMAGE_STRETCH_B; } diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp index fb50f7b576..43115a116b 100644 --- a/plugins/TabSRMM/src/buttonsbar.cpp +++ b/plugins/TabSRMM/src/buttonsbar.cpp @@ -705,7 +705,7 @@ BOOL TSAPI BB_SetButtonsPos(TWindowData *dat) if (bNeedResort) qsort(LButtonsList->items, LButtonsList->realCount, sizeof(BBButton *), sstSortButtons); - if((dat->pContainer->dwFlags & CNT_SIDEBAR) && (dat->pContainer->SideBar->getFlags() & CSideBar::SIDEBARORIENTATION_LEFT)) { + if ((dat->pContainer->dwFlags & CNT_SIDEBAR) && (dat->pContainer->SideBar->getFlags() & CSideBar::SIDEBARORIENTATION_LEFT)) { DeferWindowPos(hdwp, hwndToggleSideBar , NULL, 4, 2 + splitterY - iOff, 0, 0, SWP_NOZORDER | SWP_NOSIZE);// | SWP_NOCOPYBITS); lwidth += 10; @@ -758,7 +758,7 @@ BOOL TSAPI BB_SetButtonsPos(TWindowData *dat) bNeedResort = FALSE; } - if((dat->pContainer->dwFlags & CNT_SIDEBAR) && (dat->pContainer->SideBar->getFlags() & CSideBar::SIDEBARORIENTATION_RIGHT)) { + if ((dat->pContainer->dwFlags & CNT_SIDEBAR) && (dat->pContainer->SideBar->getFlags() & CSideBar::SIDEBARORIENTATION_RIGHT)) { DeferWindowPos(hdwp, hwndToggleSideBar , NULL, rect.right - foravatar - 10, 2 + splitterY - iOff, 0, 0, SWP_NOZORDER | SWP_NOSIZE);// | SWP_NOCOPYBITS); rwidth += 12; diff --git a/plugins/TabSRMM/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp index b30290d447..0c743b8a81 100644 --- a/plugins/TabSRMM/src/contactcache.cpp +++ b/plugins/TabSRMM/src/contactcache.cpp @@ -489,7 +489,7 @@ void CContactCache::updateStatusMsg(const char *szKey) BYTE bStatusMsgValid = 0; INT_PTR res = 0; - if(!m_Valid) + if (!m_Valid) return; if(szKey == 0 || (szKey && !strcmp("StatusMsg", szKey))) { diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp index 2edbca9281..ac72ba55cf 100644 --- a/plugins/TabSRMM/src/container.cpp +++ b/plugins/TabSRMM/src/container.cpp @@ -100,7 +100,7 @@ void TSAPI SetAeroMargins(TContainerData *pContainer) GetWindowRect(dat->hwnd, &rcWnd); pt.x = rcWnd.left; - if(!pContainer->SideBar->isActive()) + if (!pContainer->SideBar->isActive()) pt.y = rcWnd.bottom + ((pContainer->iChilds > 1 || !(pContainer->dwFlags & CNT_HIDETABS)) ? pContainer->tBorder : 0); else { pt.y = rcWnd.bottom; @@ -844,7 +844,7 @@ static INT_PTR CALLBACK DlgProcContainer(HWND hwndDlg, UINT msg, WPARAM wParam, } pContainer->SideBar->scrollIntoView(); - if(!M->isAero()) { // aero mode uses buffered paint, no forced redraw needed + if (!M->isAero()) { // aero mode uses buffered paint, no forced redraw needed RedrawWindow(hwndTab, NULL, NULL, RDW_INVALIDATE | (pContainer->bSizingLoop ? RDW_ERASE : 0)); RedrawWindow(hwndDlg, NULL, NULL, (bSkinned ? RDW_FRAME : 0) | RDW_INVALIDATE | ((pContainer->bSizingLoop || wParam == SIZE_RESTORED ) ? RDW_ERASE : 0)); } @@ -1661,7 +1661,7 @@ buttons_done: /* * avoid flickering of the menu bar when aero is active */ - if(!pContainer) + if (!pContainer) break; HDC hdc = (HDC)wParam; @@ -1917,7 +1917,7 @@ buttons_done: Win7Taskbar->setOverlayIcon(hwndDlg, lParam); if(GetForegroundWindow() != hwndDlg) SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, lParam); - if((HICON)lParam == hIconMsg) + if ((HICON)lParam == hIconMsg) pContainer->hIconTaskbarOverlay = hIconMsg; break; } @@ -1926,7 +1926,7 @@ buttons_done: if(dat->hTaskbarIcon == 0) dat->hTaskbarIcon = ((dat->pContainer->dwFlags & CNT_AVATARSONTASKBAR) ? Utils::iconFromAvatar(dat) : 0); else { - if(!(dat->pContainer->dwFlags & CNT_AVATARSONTASKBAR)) { + if (!(dat->pContainer->dwFlags & CNT_AVATARSONTASKBAR)) { DestroyIcon(dat->hTaskbarIcon); dat->hTaskbarIcon = 0; } diff --git a/plugins/TabSRMM/src/containeroptions.cpp b/plugins/TabSRMM/src/containeroptions.cpp index dd87ef56d2..e030bcacab 100644 --- a/plugins/TabSRMM/src/containeroptions.cpp +++ b/plugins/TabSRMM/src/containeroptions.cpp @@ -72,7 +72,7 @@ void TSAPI ApplyContainerSetting(TContainerData *pContainer, DWORD flags, UINT m bool set = (mode & 0x01) ? true : false; if (!pContainer->settings->fPrivate) { - if(!isEx) + if (!isEx) pContainer->dwFlags = (set ? pContainer->dwFlags | flags : pContainer->dwFlags & ~flags); else pContainer->dwFlagsEx = (set ? pContainer->dwFlagsEx | flags : pContainer->dwFlagsEx & ~flags); @@ -93,7 +93,7 @@ void TSAPI ApplyContainerSetting(TContainerData *pContainer, DWORD flags, UINT m ReloadGlobalContainerSettings(fForceResize); } else { - if(!isEx) + if (!isEx) pContainer->dwFlags = (set ? pContainer->dwFlags | flags : pContainer->dwFlags & ~flags); else pContainer->dwFlagsEx = (set ? pContainer->dwFlagsEx | flags : pContainer->dwFlagsEx & ~flags); @@ -464,7 +464,7 @@ do_apply: SendMessage(hwndDlg, DM_SC_CONFIG, 0, 0); - if(!(dwFlagsEx & (TCF_SBARLEFT | TCF_SBARRIGHT))) + if (!(dwFlagsEx & (TCF_SBARLEFT | TCF_SBARRIGHT))) SendDlgItemMessage(hwndDlg, IDC_TABMODE, CB_SETCURSEL, dwFlags & CNT_TABSBOTTOM ? 1 : 0, 0); else SendDlgItemMessage(hwndDlg, IDC_TABMODE, CB_SETCURSEL, dwFlagsEx & TCF_SBARLEFT ? 2 : 3, 0); diff --git a/plugins/TabSRMM/src/controls.cpp b/plugins/TabSRMM/src/controls.cpp index f524de5f1a..ef6e15d35e 100644 --- a/plugins/TabSRMM/src/controls.cpp +++ b/plugins/TabSRMM/src/controls.cpp @@ -320,7 +320,7 @@ LONG_PTR CMenuBar::customDrawWorker(NMCUSTOMDRAW *nm) CSkin::ApplyAeroEffect(m_hdcDraw, &m_rcItem, CSkin::AERO_EFFECT_AREA_MENUBAR); nm->rc.bottom++; } - else if((PluginConfig.m_fillColor || M->isVSThemed()) && !CSkin::m_skinEnabled) { + else if ((PluginConfig.m_fillColor || M->isVSThemed()) && !CSkin::m_skinEnabled) { if(PluginConfig.m_fillColor && PluginConfig.m_tbBackgroundHigh && PluginConfig.m_tbBackgroundLow) { ::DrawAlpha(m_hdcDraw, &m_rcItem, PluginConfig.m_tbBackgroundHigh, 100, PluginConfig.m_tbBackgroundLow, 0, GRADIENT_TB, 0, 0, 0); @@ -660,7 +660,7 @@ LRESULT CALLBACK CMenuBar::MessageHook(int nCode, WPARAM wParam, LPARAM lParam) POINT pt; ::GetCursorPos(&pt); - if(::MenuItemFromPoint(0, m_Owner->m_activeMenu, pt) >= 0) // inside menu + if (::MenuItemFromPoint(0, m_Owner->m_activeMenu, pt) >= 0) // inside menu break; if(m_Owner->m_activeSubMenu && ::MenuItemFromPoint(0, m_Owner->m_activeSubMenu, pt) >= 0) break; @@ -1006,7 +1006,7 @@ LONG_PTR CALLBACK StatusBarSubclassProc(HWND hWnd, UINT msg, WPARAM wParam, LPAR ScreenToClient(hWnd, &pt1); SendMessage(hWnd, SB_GETRECT, 2, (LPARAM)&rcIconpart); - if(!PtInRect(&rcIconpart, pt1)) + if (!PtInRect(&rcIconpart, pt1)) return SendMessage(pContainer->hwnd, WM_SYSCOMMAND, SC_MOVE | HTCAPTION, MAKELPARAM(pt.x, pt.y)); } break; @@ -1093,7 +1093,7 @@ LONG_PTR CALLBACK StatusBarSubclassProc(HWND hWnd, UINT msg, WPARAM wParam, LPAR CallService(szTTService, (WPARAM)wBuf, (LPARAM)&ti); tooltip_active = TRUE; } - else if((int)iconNum == list_icons + 2) { + else if ((int)iconNum == list_icons + 2) { TCHAR wBuf[512]; mir_sntprintf(wBuf, safe_sizeof(wBuf), _T("%s"), CTranslator::get(CTranslator::CNT_SBAR_SLIST)); diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp index ea1df5a209..d6eac87767 100644 --- a/plugins/TabSRMM/src/eventpopups.cpp +++ b/plugins/TabSRMM/src/eventpopups.cpp @@ -57,7 +57,7 @@ static const PLUGIN_DATAT* PU_GetByContact(const HANDLE hContact) if(PopupList.size()) { PopupListIterator it = PopupList.begin(); while(it != PopupList.end()) { - if((*it)->hContact == hContact) + if ((*it)->hContact == hContact) return(*it); it++; } @@ -77,9 +77,9 @@ static void PU_CleanUp() while(it != PopupList.end()) { if(PopupList.size() == 0) break; - if((*it)->hContact == 0) { + if ((*it)->hContact == 0) { //_DebugTraceW(_T("found stale popup %s"), (*it)->eventData->szText); - if((*it)->eventData) + if ((*it)->eventData) free((*it)->eventData); free(*it); it = PopupList.erase(it); @@ -180,7 +180,7 @@ INT_PTR CALLBACK DlgProcPopupOpts(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa HIMAGELIST himl = (HIMAGELIST)SendDlgItemMessage(hWnd, IDC_EVENTOPTIONS, TVM_SETIMAGELIST, TVSIL_STATE, (LPARAM)CreateStateImageList()); ImageList_Destroy(himl); - if(!PluginConfig.g_PopupAvail) { + if (!PluginConfig.g_PopupAvail) { HWND hwndChild = FindWindowEx(hWnd, 0, 0, 0); while(hwndChild) { ShowWindow(hwndChild, SW_HIDE); @@ -563,7 +563,7 @@ static TCHAR *GetPreviewT(WORD eventType, DBEVENTINFO* dbe) break; case EVENTTYPE_FILE: if(pBlob) { - if(!nen_options.bPreview) { + if (!nen_options.bPreview) { commentFix = mir_tstrdup(CTranslator::get(CTranslator::GEN_STRING_EVENT_FILE)); break; } @@ -627,7 +627,7 @@ static int PopupUpdateT(HANDLE hContact, HANDLE hEvent) pdata = const_cast(PU_GetByContact(hContact)); - if(!pdata) + if (!pdata) return(1); ZeroMemory((void *)&dbe, sizeof(dbe)); diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp index d507076eae..54337a5df2 100644 --- a/plugins/TabSRMM/src/generic_msghandlers.cpp +++ b/plugins/TabSRMM/src/generic_msghandlers.cpp @@ -110,7 +110,7 @@ void TSAPI DM_CheckAutoHide(const TWindowData* dat, WPARAM wParam, LPARAM lParam *fResult = FALSE; return; // unread events, do not hide or close the container } - if(((GetTickCount() - dat->dwLastActivity) / 1000) <= wParam) + if (((GetTickCount() - dat->dwLastActivity) / 1000) <= wParam) *fResult = FALSE; // time since last activity did not yet reach the threshold. } } @@ -123,7 +123,7 @@ void TSAPI DM_DismissTip(TWindowData *dat, const POINT& pt) { RECT rc; - if(!IsWindowVisible(dat->hwndTip)) + if (!IsWindowVisible(dat->hwndTip)) return; GetWindowRect(dat->hwndTip, &rc); @@ -570,7 +570,7 @@ LRESULT TSAPI DM_MsgWindowCmdHandler(HWND hwndDlg, TContainerData *m_pContainer, break; } - if(!dat->fIsAutosizingInput) { + if (!dat->fIsAutosizingInput) { dat->iSplitterSaved = dat->splitterY; dat->splitterY = rc.bottom / 2; SendMessage(hwndDlg, WM_SIZE, 1, 1); @@ -591,7 +591,7 @@ LRESULT TSAPI DM_MsgWindowCmdHandler(HWND hwndDlg, TContainerData *m_pContainer, M->WriteTString(dat->hContact, "UserInfo", "MyNotes", buf); SetDlgItemText(hwndDlg, IDC_MESSAGE, _T("")); - if(!dat->fIsAutosizingInput) { + if (!dat->fIsAutosizingInput) { dat->splitterY = dat->iSplitterSaved; SendMessage(hwndDlg, WM_SIZE, 0, 0); DM_ScrollToBottom(dat, 0, 1); @@ -654,7 +654,7 @@ LRESULT TSAPI DM_MsgWindowCmdHandler(HWND hwndDlg, TContainerData *m_pContainer, LRESULT TSAPI DM_ContainerCmdHandler(TContainerData *pContainer, UINT cmd, WPARAM wParam, LPARAM lParam) { - if(!pContainer) + if (!pContainer) return(0); HWND hwndDlg = pContainer->hwnd; @@ -810,7 +810,7 @@ void TSAPI DM_InitRichEdit(TWindowData *dat) dat->inputbg = fIsChat ? M->GetDword(FONTMODULE, "inputbg", SRMSGDEFSET_BKGCOLOUR) : dat->pContainer->theme.inputbg; colour = fIsChat ? M->GetDword(FONTMODULE, SRMSGSET_BKGCOLOUR_MUC, SRMSGDEFSET_BKGCOLOUR) : dat->pContainer->theme.bg; - if(!fIsChat) { + if (!fIsChat) { if (GetWindowTextLengthA(hwndEdit) > 0) szStreamOut = Message_GetFromStream(hwndEdit, dat, (CP_UTF8 << 16) | (SF_RTFNOOBJS | SFF_PLAINRTF | SF_USECODEPAGE)); } @@ -827,7 +827,7 @@ void TSAPI DM_InitRichEdit(TWindowData *dat) /* * correct the input area text color to avoid a color from the table of usable bbcode colors */ - if(!fIsChat) { + if (!fIsChat) { for (i = 0; i < Utils::rtf_ctable_size; i++) { if (Utils::rtf_ctable[i].clr == inputcharcolor) inputcharcolor = RGB(GetRValue(inputcharcolor), GetGValue(inputcharcolor), GetBValue(inputcharcolor) == 0 ? GetBValue(inputcharcolor) + 1 : GetBValue(inputcharcolor) - 1); @@ -889,7 +889,7 @@ void TSAPI DM_InitRichEdit(TWindowData *dat) pf2.dxRightIndent = 30; } pf2.dxOffset = dat->pContainer->theme.left_indent + 30; - if(!fIsChat) { + if (!fIsChat) { SetWindowText(hwndLog, _T("")); SendMessage(hwndLog, EM_SETPARAFORMAT, 0, (LPARAM)&pf2); SendMessage(hwndLog, EM_SETLANGOPTIONS, 0, (LPARAM) SendDlgItemMessage(hwndDlg, IDC_LOG, EM_GETLANGOPTIONS, 0, 0) & ~IMF_AUTOKEYBOARD); @@ -899,7 +899,7 @@ void TSAPI DM_InitRichEdit(TWindowData *dat) * set the scrollbars etc to RTL/LTR (only for manual RTL mode) */ - if(!fIsChat) { + if (!fIsChat) { if (dat->dwFlags & MWF_LOG_RTL) { SetWindowLongPtr(hwndEdit, GWL_EXSTYLE, GetWindowLongPtr(hwndEdit, GWL_EXSTYLE) | WS_EX_RIGHT | WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR); SetWindowLongPtr(hwndLog, GWL_EXSTYLE, GetWindowLongPtr(hwndLog, GWL_EXSTYLE) | WS_EX_RIGHT | WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR); @@ -1169,7 +1169,7 @@ LRESULT TSAPI DM_LoadLocale(TWindowData *dat) DBFreeVariant(&dbv); CloseHandle((HANDLE)mir_forkthreadex(LoadKLThread, reinterpret_cast(dat->hContact), 16000, NULL)); } else { - if(!PluginConfig.m_dontUseDefaultKbd) { + if (!PluginConfig.m_dontUseDefaultKbd) { TCHAR szBuf[20]; GetLocaleInfo(LOCALE_SYSTEM_DEFAULT, LOCALE_ILANGUAGE, szBuf, 20); @@ -1312,7 +1312,7 @@ LRESULT TSAPI DM_WMCopyHandler(HWND hwnd, WNDPROC oldWndProc, WPARAM wParam, LPA HWND TSAPI DM_CreateClist(TWindowData *dat) { - if(!sendLater->isAvail()) { + if (!sendLater->isAvail()) { CWarning::show(CWarning::WARN_NO_SENDLATER, MB_OK|MB_ICONINFORMATION, CTranslator::get(CTranslator::QMGR_ERROR_NOMULTISEND)); dat->sendMode &= ~SMODE_MULTIPLE; return(0); @@ -1609,7 +1609,7 @@ void TSAPI DM_Typing(TWindowData *dat, bool fForceOff) } else { struct TWindowData *dat_active = NULL; - if(!fForceOff) { + if (!fForceOff) { dat->showTyping = 2; dat->nTypeSecs = 86400; @@ -1692,7 +1692,7 @@ int TSAPI DM_SplitterGlobalEvent(TWindowData *dat, WPARAM wParam, LPARAM lParam) GetWindowRect(dat->hwnd, &rcWin); if(wParam == 0 && lParam == 0) { - if((dat->dwFlagsEx & MWF_SHOW_SPLITTEROVERRIDE) && dat != srcDat) + if ((dat->dwFlagsEx & MWF_SHOW_SPLITTEROVERRIDE) && dat != srcDat) return(0); if(srcDat->bType == dat->bType) @@ -1725,12 +1725,12 @@ int TSAPI DM_SplitterGlobalEvent(TWindowData *dat, WPARAM wParam, LPARAM lParam) return(0); } - if(!fCntGlobal && dat->pContainer != srcCnt) + if (!fCntGlobal && dat->pContainer != srcCnt) return(0); if(srcCnt->settings->fPrivate && dat->pContainer != srcCnt) return(0); - if(!PluginConfig.lastSPlitterPos.bSync && dat->bType != srcDat->bType) + if (!PluginConfig.lastSPlitterPos.bSync && dat->bType != srcDat->bType) return(0); /* @@ -1950,7 +1950,7 @@ void TSAPI DM_HandleAutoSizeRequest(TWindowData *dat, REQRESIZE* rr) } else if (dat->si) { dat->si->iSplitterY = (rc.bottom - (rc.bottom - iNewHeight + DPISCALEY_S(3))) + DPISCALEY_S(34); - if(!(dat->pContainer->dwFlags & CNT_BOTTOMTOOLBAR)) + if (!(dat->pContainer->dwFlags & CNT_BOTTOMTOOLBAR)) dat->si->iSplitterY -= DPISCALEY_S(22); SendMessage(dat->hwnd, WM_SIZE, 0, 0); } diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index 689b4cb53b..4894e29681 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -497,13 +497,13 @@ int CGlobals::DBSettingChanged(WPARAM wParam, LPARAM lParam) hwnd = M->FindWindow((HANDLE)wParam); if (hwnd == 0 && wParam != 0) { // we are not interested in this event if there is no open message window/tab - if(!strcmp(setting, "Status") || !strcmp(setting, "MyHandle") || !strcmp(setting, "Nick") || !strcmp(cws->szModule, SRMSGMOD_T)) { + if (!strcmp(setting, "Status") || !strcmp(setting, "MyHandle") || !strcmp(setting, "Nick") || !strcmp(cws->szModule, SRMSGMOD_T)) { c = CContactCache::getContactCache((HANDLE)wParam); if(c) { fChanged = c->updateStatus(); if(strcmp(setting, "Status")) c->updateNick(); - if(!strcmp(setting, "isFavorite") || !strcmp(setting, "isRecent")) + if (!strcmp(setting, "isFavorite") || !strcmp(setting, "isRecent")) c->updateFavorite(); } } @@ -519,8 +519,8 @@ int CGlobals::DBSettingChanged(WPARAM wParam, LPARAM lParam) c = CContactCache::getContactCache((HANDLE)wParam); if(c) { szProto = c->getProto(); - if(!strcmp(cws->szModule, SRMSGMOD_T)) { // catch own relevant settings - if(!strcmp(setting, "isFavorite") || !strcmp(setting, "isRecent")) + if (!strcmp(cws->szModule, SRMSGMOD_T)) { // catch own relevant settings + if (!strcmp(setting, "isFavorite") || !strcmp(setting, "isRecent")) c->updateFavorite(); } } diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp index d203e2fd4d..ef5eeaf3af 100644 --- a/plugins/TabSRMM/src/hotkeyhandler.cpp +++ b/plugins/TabSRMM/src/hotkeyhandler.cpp @@ -654,7 +654,7 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP /* * start processing the job list */ - if(!sendLater->isJobListEmpty()) { + if (!sendLater->isJobListEmpty()) { KillTimer(hwndDlg, wParam); sendLater->startJobListProcess(); SetTimer(hwndDlg, TIMERID_SENDLATER_TICK, TIMEOUT_SENDLATER_TICK, 0); @@ -667,7 +667,7 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP * queue. */ else if(wParam == TIMERID_SENDLATER_TICK) { - if(!sendLater->haveJobs()) { + if (!sendLater->haveJobs()) { KillTimer(hwndDlg, wParam); SetTimer(hwndDlg, TIMERID_SENDLATER, TIMEOUT_SENDLATER, 0); sendLater->qMgrUpdate(true); diff --git a/plugins/TabSRMM/src/infopanel.cpp b/plugins/TabSRMM/src/infopanel.cpp index 044266b1a1..c33dd35f90 100644 --- a/plugins/TabSRMM/src/infopanel.cpp +++ b/plugins/TabSRMM/src/infopanel.cpp @@ -112,8 +112,8 @@ void CInfoPanel::saveHeight(bool fFlush) BYTE bSync = M->GetByte("syncAllPanels", 0); if (m_height < 110 && m_height >= MIN_PANELHEIGHT) { // only save valid panel splitter positions - if(!m_fPrivateHeight) { - if(!m_isChat || bSync) { + if (!m_fPrivateHeight) { + if (!m_isChat || bSync) { if(m_dat->pContainer->settings->fPrivate) m_dat->pContainer->settings->panelheight = m_height; else { @@ -155,8 +155,8 @@ void CInfoPanel::setHeight(LONG newHeight, bool fBroadcast) m_height = newHeight; if(fBroadcast) { - if(!m_fPrivateHeight) { - if(!m_dat->pContainer->settings->fPrivate) + if (!m_fPrivateHeight) { + if (!m_dat->pContainer->settings->fPrivate) M->BroadcastMessage(DM_SETINFOPANEL, (WPARAM)m_dat, (LPARAM)newHeight); else ::BroadCastContainer(m_dat->pContainer, DM_SETINFOPANEL, (WPARAM)m_dat, (LPARAM)newHeight); @@ -176,7 +176,7 @@ void CInfoPanel::showHide() const BITMAP bm; HWND hwndDlg = m_dat->hwnd; - if(!m_isChat) { + if (!m_isChat) { ::ShowWindow(m_dat->hwndPanelPicParent, m_active && (m_dat->hwndPanelPic || m_dat->hwndFlash) ? SW_SHOW : SW_HIDE); // m_dat->iRealAvatarHeight = 0; @@ -298,7 +298,7 @@ void CInfoPanel::renderBG(const HDC hdc, RECT& rc, CSkinItem *item, bool fAero, * if new (= tabsrmm 3.x) skin item is not defined, use the old info panel * field background items. That should break less skins */ - if(!item->IGNORED) + if (!item->IGNORED) CSkin::DrawItem(hdc, &rc, item); } else { rc.bottom -= 2; @@ -323,7 +323,7 @@ void CInfoPanel::renderBG(const HDC hdc, RECT& rc, CSkinItem *item, bool fAero, void CInfoPanel::renderContent(const HDC hdc) { if(m_active) { - if(!m_isChat) { + if (!m_isChat) { RECT rc; /* @@ -335,7 +335,7 @@ void CInfoPanel::renderContent(const HDC hdc) dis.rcItem = m_dat->rcPic; dis.hDC = hdc; dis.hwndItem = m_dat->hwnd; - if(::MsgWindowDrawHandler(0, (LPARAM)&dis, m_dat) == 0) { + if (::MsgWindowDrawHandler(0, (LPARAM)&dis, m_dat) == 0) { ::PostMessage(m_dat->hwnd, WM_SIZE, 0, 1); ::PostMessage(m_dat->hwnd, DM_FORCEREDRAW, 0, 0); } @@ -737,7 +737,7 @@ HMENU CInfoPanel::constructContextualMenu() const mii.fMask = MIIM_DATA | MIIM_ID | MIIM_BITMAP | MIIM_STRING; mii.hbmpItem = HBMMENU_CALLBACK; - if(!(m_hoverFlags & HOVER_NICK)) + if (!(m_hoverFlags & HOVER_NICK)) return(0); HMENU m = ::CreatePopupMenu(); @@ -747,7 +747,7 @@ HMENU CInfoPanel::constructContextualMenu() const IDC_NAME, 0); Utils::addMenuItem(m, mii, ::LoadSkinnedIcon(SKINICON_OTHER_HISTORY), CTranslator::get(CTranslator::GEN_IP_MENU_HISTORY), m_isChat ? IDC_CHAT_HISTORY : IDC_HISTORY, 0); - if(!m_isChat) + if (!m_isChat) Utils::addMenuItem(m, mii, PluginConfig.g_iconContainer, CTranslator::get(CTranslator::GEN_IP_MENU_MSGPREFS), ID_MESSAGELOGSETTINGS_FORTHISCONTACT, 1); else { @@ -806,10 +806,10 @@ LRESULT CInfoPanel::cmdHandler(UINT cmd) */ void CInfoPanel::handleClick(const POINT& pt) { - if(!m_active || m_hoverFlags == 0) + if (!m_active || m_hoverFlags == 0) return; - if(!m_isChat) { + if (!m_isChat) { ::KillTimer(m_dat->hwnd, TIMERID_AWAYMSG); m_dat->dwFlagsEx &= ~MWF_SHOW_AWAYMSGTIMER; } @@ -836,11 +836,11 @@ int CInfoPanel::hitTest(POINT pt) { ::ScreenToClient(m_dat->hwnd, &pt); - if(!m_isChat && ::PtInRect(&m_rcStatus, pt)) + if (!m_isChat && ::PtInRect(&m_rcStatus, pt)) return(HTSTATUS); - else if(::PtInRect(&m_rcNick, pt)) + else if (::PtInRect(&m_rcNick, pt)) return(HTNICK); - else if(::PtInRect(&m_rcUIN, pt)) + else if (::PtInRect(&m_rcUIN, pt)) return(HTUIN); return(HTNIRVANA); @@ -853,7 +853,7 @@ int CInfoPanel::hitTest(POINT pt) */ void CInfoPanel::trackMouse(POINT& pt) { - if(!m_active) + if (!m_active) return; int result = hitTest(pt); @@ -924,7 +924,7 @@ void CInfoPanel::showTip(UINT ctrlId, const LPARAM lParam) m_dat->cache->getStatusMsg() ? m_dat->cache->getStatusMsg() : CTranslator::get(CTranslator::GEN_NO_STATUS)); str->append(temp); - if((xStatus = m_dat->cache->getXStatusId())) { + if ((xStatus = m_dat->cache->getXStatusId())) { TCHAR *tszXStatusName = 0; if(0 == M->GetTString(m_dat->cache->getContact(), m_dat->cache->getProto(), "XStatusName", &dbv)) tszXStatusName = dbv.ptszVal; @@ -996,7 +996,7 @@ void CInfoPanel::hideTip(const HWND hwndNew) if(m_tip) { if(hwndNew == m_tip->getHwnd()) return; - if(::IsWindow(m_tip->getHwnd())) + if (::IsWindow(m_tip->getHwnd())) ::DestroyWindow(m_tip->getHwnd()); m_tip = 0; } @@ -1024,7 +1024,7 @@ INT_PTR CALLBACK CInfoPanel::avatarParentSubclass(HWND hwnd, UINT msg, WPARAM wP GetClientRect(hwnd, &rcItem); rc = rcItem; - if(!IsWindowEnabled(hwnd) || !dat->Panel->isActive() || dat->showInfoPic == 0) + if (!IsWindowEnabled(hwnd) || !dat->Panel->isActive() || dat->showInfoPic == 0) return(TRUE); HDC dcWin = (HDC)wParam; @@ -1147,7 +1147,7 @@ INT_PTR CALLBACK CInfoPanel::ConfigDlgProc(HWND hwnd, UINT msg, WPARAM wParam, L Utils::showDlgControl(hwnd, IDC_IPCONFIG_PRIVATECONTAINER, m_dat->pContainer->settings->fPrivate ? SW_SHOW : SW_HIDE); - if(!m_isChat) { + if (!m_isChat) { v = M->GetByte(m_dat->hContact, SRMSGMOD_T, "hideavatar", -1); ::SendDlgItemMessage(hwnd, IDC_PANELPICTUREVIS, CB_INSERTSTRING, -1, (LPARAM)CTranslator::getOpt(CTranslator::OPT_UPREFS_IPGLOBAL)); ::SendDlgItemMessage(hwnd, IDC_PANELPICTUREVIS, CB_INSERTSTRING, -1, (LPARAM)CTranslator::getOpt(CTranslator::OPT_UPREFS_AVON)); @@ -1257,14 +1257,14 @@ INT_PTR CALLBACK CInfoPanel::ConfigDlgProc(HWND hwnd, UINT msg, WPARAM wParam, L case IDC_NOSYNC: M->WriteByte(SRMSGMOD_T, "syncAllPanels", ::IsDlgButtonChecked(hwnd, IDC_NOSYNC) ? 0 : 1); - if(!IsDlgButtonChecked(hwnd, IDC_NOSYNC)) { + if (!IsDlgButtonChecked(hwnd, IDC_NOSYNC)) { loadHeight(); - if(!m_dat->pContainer->settings->fPrivate) + if (!m_dat->pContainer->settings->fPrivate) M->BroadcastMessage(DM_SETINFOPANEL, (WPARAM)m_dat, (LPARAM)m_defaultHeight); else ::BroadCastContainer(m_dat->pContainer, DM_SETINFOPANEL, (WPARAM)m_dat, (LPARAM)m_defaultHeight); } else { - if(!m_dat->pContainer->settings->fPrivate) + if (!m_dat->pContainer->settings->fPrivate) M->BroadcastMessage(DM_SETINFOPANEL, (WPARAM)m_dat, 0); else ::BroadCastContainer(m_dat->pContainer,DM_SETINFOPANEL, (WPARAM)m_dat, 0); @@ -1309,14 +1309,14 @@ int CInfoPanel::invokeConfigDialog(const POINT& pt) RECT rc; POINT ptTest = pt; - if(!m_active) + if (!m_active) return(0); ::GetWindowRect(m_dat->hwnd, &rc); rc.bottom = rc.top + m_height; rc.right -= m_dat->panelWidth; - if(!::PtInRect(&rc, ptTest)) + if (!::PtInRect(&rc, ptTest)) return(0); if(m_hwndConfig == 0) { @@ -1356,7 +1356,7 @@ void CInfoPanel::dismissConfig(bool fForced) POINT pt; RECT rc; - if(!m_fDialogCreated) { + if (!m_fDialogCreated) { ::GetCursorPos(&pt); ::GetWindowRect(m_hwndConfig, &rc); if(fForced || !PtInRect(&rc, pt)) { @@ -1668,7 +1668,7 @@ INT_PTR CALLBACK CTip::WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam } case WM_COMMAND: { - if((HWND)lParam == m_hRich && HIWORD(wParam) == EN_SETFOCUS) + if ((HWND)lParam == m_hRich && HIWORD(wParam) == EN_SETFOCUS) ::HideCaret(m_hRich); break; } @@ -1681,11 +1681,11 @@ INT_PTR CALLBACK CTip::WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ::KillTimer(hwnd, 1000); ::GetCursorPos(&pt); ::GetWindowRect(hwnd, &rc); - if(!PtInRect(&rc, pt)) + if (!PtInRect(&rc, pt)) ::DestroyWindow(hwnd); else break; - if(::GetActiveWindow() != hwnd) + if (::GetActiveWindow() != hwnd) ::DestroyWindow(hwnd); } break; diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp index 4dc9128a92..d473020e39 100644 --- a/plugins/TabSRMM/src/mim.cpp +++ b/plugins/TabSRMM/src/mim.cpp @@ -242,14 +242,14 @@ const TCHAR* CMimAPI::StriStr(const TCHAR *szString, const TCHAR *szSearchFor) if (0 == szSearchFor || 0 == *szSearchFor) return(szString); - for(; *szString; ++szString) { + for (; *szString; ++szString) { if(_totupper(*szString) == _totupper(*szSearchFor)) { const TCHAR *h, *n; for(h = szString, n = szSearchFor; *h && *n; ++h, ++n) { if(_totupper(*h) != _totupper(*n)) break; } - if(!*n) + if (!*n) return(szString); } } @@ -574,7 +574,7 @@ int CMimAPI::TypingMessage(WPARAM wParam, LPARAM lParam) } if(M->GetByte(SRMSGMOD, SRMSGSET_SHOWTYPINGCLIST, SRMSGDEFSET_SHOWTYPINGCLIST)) { - if(!hwnd && !M->GetByte(SRMSGMOD, SRMSGSET_SHOWTYPINGNOWINOPEN, 1)) + if (!hwnd && !M->GetByte(SRMSGMOD, SRMSGSET_SHOWTYPINGNOWINOPEN, 1)) fShowOnClist = FALSE; if(hwnd && !M->GetByte(SRMSGMOD, SRMSGSET_SHOWTYPINGWINOPEN, 1)) fShowOnClist = FALSE; @@ -582,7 +582,7 @@ int CMimAPI::TypingMessage(WPARAM wParam, LPARAM lParam) else fShowOnClist = FALSE; - if((!foundWin || !(pContainer->dwFlags&CNT_NOSOUND)) && preTyping != (lParam != 0)){ + if ((!foundWin || !(pContainer->dwFlags&CNT_NOSOUND)) && preTyping != (lParam != 0)) { if (lParam) SkinPlaySound("TNStart"); else @@ -598,7 +598,7 @@ int CMimAPI::TypingMessage(WPARAM wParam, LPARAM lParam) fShow = TRUE; break; case 1: - if(!foundWin || !(pContainer && pContainer->hwndActive == hwnd && GetForegroundWindow() == pContainer->hwnd)) + if (!foundWin || !(pContainer && pContainer->hwndActive == hwnd && GetForegroundWindow() == pContainer->hwnd)) fShow = TRUE; break; case 2: diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 33b8234ae7..306258ad61 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -300,7 +300,7 @@ LRESULT CALLBACK HPPKFSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP return(CSkin::DrawRichEditFrame(hwnd, mwdat, ID_EXTBKHISTORY, msg, wParam, lParam, mwdat->oldIEViewProc)); case WM_KEYDOWN: - if(!isCtrl && !isAlt&&!isShift) { + if (!isCtrl && !isAlt&&!isShift) { { if (wParam != VK_PRIOR&&wParam != VK_NEXT&& wParam != VK_DELETE&&wParam != VK_MENU&&wParam != VK_END&& @@ -579,7 +579,7 @@ static LRESULT CALLBACK MessageLogSubclassProc(HWND hwnd, UINT msg, WPARAM wPara break; } case WM_KEYDOWN: - if(!isCtrl && !isAlt&&!isShift) + if (!isCtrl && !isAlt&&!isShift) { if (/*wParam != VK_ESCAPE&&*/wParam != VK_PRIOR&&wParam != VK_NEXT&& wParam != VK_DELETE&&wParam != VK_MENU&&wParam != VK_END&& @@ -1167,7 +1167,7 @@ static int MessageDialogResize(HWND hwndDlg, LPARAM lParam, UTILRESIZECONTROL * } //Bolshevik: resizes avatar control _FIXED - if( dat->hwndContactPic ) //if Panel control was created? + if ( dat->hwndContactPic ) //if Panel control was created? SetWindowPos(dat->hwndContactPic, HWND_TOP, 1, ((urc->rcItem.bottom-urc->rcItem.top)-(dat->pic.cy))/2+1, //resizes it dat->pic.cx-2, dat->pic.cy-2, SWP_SHOWWINDOW); @@ -1745,7 +1745,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP * draw aero related stuff */ - if(!CSkin::m_skinEnabled) + if (!CSkin::m_skinEnabled) CSkin::RenderToolbarBG(dat, hdcMem, rcClient); /* * render info panel fields @@ -1760,7 +1760,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP DeleteObject(hbm); DeleteDC(hdcMem); } - if(!dat->fLimitedUpdate) + if (!dat->fLimitedUpdate) SetAeroMargins(dat->pContainer); return(1); } @@ -1931,7 +1931,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP UINT ctrlId = 0; if(wp == VK_MENU) { - if(!dat->fkeyProcessed && !(GetKeyState(VK_CONTROL) & 0x8000) && !(GetKeyState(VK_SHIFT) & 0x8000) && !(lp & (1 << 24))) + if (!dat->fkeyProcessed && !(GetKeyState(VK_CONTROL) & 0x8000) && !(GetKeyState(VK_SHIFT) & 0x8000) && !(lp & (1 << 24))) m_pContainer->MenuBar->autoShow(); } return(_dlgReturn(hwndDlg, 0)); @@ -1981,7 +1981,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP DWORD dwFlags = M->GetDword(dat->hContact, "mwflags", 0); dat->dwFlags ^= MWF_LOG_RTL; - if((dwGlobal & MWF_LOG_RTL) != (dat->dwFlags & MWF_LOG_RTL)) { + if ((dwGlobal & MWF_LOG_RTL) != (dat->dwFlags & MWF_LOG_RTL)) { dwMask |= MWF_LOG_RTL; dwFlags |= (dat->dwFlags & MWF_LOG_RTL); } @@ -2118,7 +2118,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP SendMessage(hwndDlg, DM_REPLAYQUEUE, 0, 0); dat->dwFlagsEx ^= MWF_SHOW_SCROLLINGDISABLED; Utils::showDlgControl(hwndDlg, IDC_LOGFROZENTEXT, (dat->bNotOnList || dat->dwFlagsEx & MWF_SHOW_SCROLLINGDISABLED) ? SW_SHOW : SW_HIDE); - if(!(dat->dwFlagsEx & MWF_SHOW_SCROLLINGDISABLED)) + if (!(dat->dwFlagsEx & MWF_SHOW_SCROLLINGDISABLED)) SetDlgItemText(hwndDlg, IDC_LOGFROZENTEXT, CTranslator::get(CTranslator::GEN_MSG_CONTACT_NOT_ON_LIST)); else SetDlgItemText(hwndDlg, IDC_LOGFROZENTEXT, CTranslator::get(CTranslator::GEN_MSG_LOGFROZENSTATIC)); @@ -2129,15 +2129,15 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP //MAD: tabulation mod if(msg == WM_KEYDOWN && wp == VK_TAB) { if(PluginConfig.m_AllowTab) { - if(((NMHDR *)lParam)->idFrom == IDC_MESSAGE) + if (((NMHDR *)lParam)->idFrom == IDC_MESSAGE) SendMessage(GetDlgItem(hwndDlg, IDC_MESSAGE), EM_REPLACESEL, (WPARAM)FALSE, (LPARAM)"\t"); _clrMsgFilter(lParam); - if(((NMHDR *)lParam)->idFrom != IDC_MESSAGE) + if (((NMHDR *)lParam)->idFrom != IDC_MESSAGE) SetFocus(GetDlgItem(hwndDlg, IDC_MESSAGE)); return(_dlgReturn(hwndDlg, 1)); } else { - if(((NMHDR *)lParam)->idFrom == IDC_MESSAGE) { + if (((NMHDR *)lParam)->idFrom == IDC_MESSAGE) { if(GetSendButtonState(hwndDlg) != PBS_DISABLED && !(dat->pContainer->dwFlags & CNT_HIDETOOLBAR)) { SetFocus(GetDlgItem(hwndDlg, IDOK)); return(_dlgReturn(hwndDlg, 1)); @@ -2147,7 +2147,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP return(_dlgReturn(hwndDlg, 1)); } } - if(((NMHDR *)lParam)->idFrom == IDC_LOG) { + if (((NMHDR *)lParam)->idFrom == IDC_LOG) { SetFocus(GetDlgItem(hwndDlg, IDC_MESSAGE)); return(_dlgReturn(hwndDlg, 1)); } @@ -2870,7 +2870,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP GetCursorPos(&tmp); //+ Protogenes cur.x = (SHORT)tmp.x; //+ Protogenes cur.y = (SHORT)tmp.y; //+ Protogenes - if(!dat->Panel->isHovered()) + if (!dat->Panel->isHovered()) SendMessage(hwndContainer, WM_NCLBUTTONDOWN, HTCAPTION, *((LPARAM*)(&cur))); //+ Protogenes break; } @@ -3211,7 +3211,7 @@ quote_from_last: if (!M->GetByte(dat->hContact, "CList", "NotOnList", 0)) { dat->bNotOnList = FALSE; ShowMultipleControls(hwndDlg, addControls, 2, SW_HIDE); - if(!(dat->dwFlagsEx & MWF_SHOW_SCROLLINGDISABLED)) + if (!(dat->dwFlagsEx & MWF_SHOW_SCROLLINGDISABLED)) Utils::showDlgControl(hwndDlg, IDC_LOGFROZENTEXT, SW_HIDE); SendMessage(hwndDlg, WM_SIZE, 0, 0); } @@ -3220,7 +3220,7 @@ quote_from_last: case IDC_CANCELADD: dat->bNotOnList = FALSE; ShowMultipleControls(hwndDlg, addControls, 2, SW_HIDE); - if(!(dat->dwFlagsEx & MWF_SHOW_SCROLLINGDISABLED)) + if (!(dat->dwFlagsEx & MWF_SHOW_SCROLLINGDISABLED)) Utils::showDlgControl(hwndDlg, IDC_LOGFROZENTEXT, SW_HIDE); SendMessage(hwndDlg, WM_SIZE, 0, 0); break; @@ -3322,7 +3322,7 @@ quote_from_last: struct TContainerData *pNewContainer = 0; TCHAR *szNewName = (TCHAR *)lParam; - if(!_tcscmp(szNewName, CTranslator::get(CTranslator::GEN_DEFAULT_CONTAINER_NAME))) + if (!_tcscmp(szNewName, CTranslator::get(CTranslator::GEN_DEFAULT_CONTAINER_NAME))) szNewName = CGlobals::m_default_container_name; int iOldItems = TabCtrl_GetItemCount(hwndTab); @@ -3731,7 +3731,7 @@ quote_from_last: LoadSkinnedProtoIcon(dat->cache->getActiveProto(), dat->cache->getActiveStatus()), 1, PluginConfig.g_hMenuRecent); if (dat->hContact) { - if(!dat->fEditNotesActive) { + if (!dat->fEditNotesActive) { char *msg = Message_GetFromStream(GetDlgItem(hwndDlg, IDC_MESSAGE), dat, (CP_UTF8 << 16) | (SF_TEXT | SF_USECODEPAGE)); if (msg) { DBWriteContactSettingString(dat->hContact, SRMSGMOD, "SavedMsg", msg); diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index caefdcffc3..3a85f830d7 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -1539,7 +1539,7 @@ void TSAPI LoadSplitter(TWindowData *dat) } #endif if (!(dat->dwFlagsEx & MWF_SHOW_SPLITTEROVERRIDE)) - if(!dat->pContainer->settings->fPrivate) + if (!dat->pContainer->settings->fPrivate) dat->splitterY = (int)M->GetDword("splitsplity", (DWORD) 60); else dat->splitterY = dat->pContainer->settings->splitterPos; @@ -1620,7 +1620,7 @@ void TSAPI GetLocaleID(TWindowData *dat, const TCHAR *szKLName) TCHAR* p; szLI[255] = 0; - if((p = _tcschr(szLI, ';')) != 0) + if ((p = _tcschr(szLI, ';')) != 0) *p = 0; } RegCloseKey(hKey); @@ -1833,7 +1833,7 @@ int TSAPI MsgWindowDrawHandler(WPARAM wParam, LPARAM lParam, TWindowData *dat) DestroyWindow(dat->hwndContactPic); dat->hwndContactPic = NULL; } - if(!PluginConfig.g_bDisableAniAvatars && fa.hWindow == 0 && dat->hwndContactPic == 0) { + if (!PluginConfig.g_bDisableAniAvatars && fa.hWindow == 0 && dat->hwndContactPic == 0) { dat->hwndContactPic =CreateWindowEx(WS_EX_TOPMOST, AVATAR_CONTROL_CLASS, _T(""), WS_VISIBLE | WS_CHILD, 1, 1, 1, 1, GetDlgItem(hwndDlg, IDC_CONTACTPIC), (HMENU)0, NULL, NULL); SendMessage(dat->hwndContactPic, AVATAR_SETCONTACT, (WPARAM)0, (LPARAM)dat->hContact); } @@ -1857,7 +1857,7 @@ int TSAPI MsgWindowDrawHandler(WPARAM wParam, LPARAM lParam, TWindowData *dat) else { if (dat->panelWidth) { dat->panelWidth = -1; - if(!CSkin::m_skinEnabled) + if (!CSkin::m_skinEnabled) SendMessage(hwndDlg, WM_SIZE, 0, 0); } return TRUE; @@ -2067,7 +2067,7 @@ int TSAPI MsgWindowDrawHandler(WPARAM wParam, LPARAM lParam, TWindowData *dat) SelectObject(hdcDraw, hPenOld); SelectObject(hdcDraw, hOldBrush); DeleteObject(hPenBorder); - if(!bPanelPic) + if (!bPanelPic) BitBlt(dis->hDC, 0, 0, cx, cy, hdcDraw, 0, 0, SRCCOPY); SelectObject(hdcDraw, hbmOld); DeleteObject(hbmDraw); @@ -2400,7 +2400,7 @@ void TSAPI DetermineMinHeight(TWindowData* dat) RECT rc; LONG height = (dat->Panel->isActive() ? dat->Panel->getHeight() + 2 : 0); - if(!(dat->pContainer->dwFlags & CNT_HIDETOOLBAR)) + if (!(dat->pContainer->dwFlags & CNT_HIDETOOLBAR)) height += DPISCALEY_S(24); // toolbar GetClientRect(GetDlgItem(dat->hwnd, dat->bType == SESSIONTYPE_IM ? IDC_MESSAGE : IDC_CHAT_MESSAGE), &rc); height += rc.bottom; // input area @@ -2461,10 +2461,10 @@ void TSAPI SendHBitmapAsFile(const TWindowData* dat, HBITMAP hbmp) * to determine whether the file can be sent. Throw a warning if any of * these checks fails. */ - if(!(protoCaps & PF1_FILESEND)) + if (!(protoCaps & PF1_FILESEND)) fSend = false; - if((ID_STATUS_OFFLINE == wMyStatus) || (ID_STATUS_OFFLINE == dat->cache->getActiveStatus() && !(typeCaps & PF4_OFFLINEFILES))) + if ((ID_STATUS_OFFLINE == wMyStatus) || (ID_STATUS_OFFLINE == dat->cache->getActiveStatus() && !(typeCaps & PF4_OFFLINEFILES))) fSend = false; if (protoCaps & PF1_VISLIST && DBGetContactSettingWord(dat->cache->getActiveContact(), szProto, "ApparentMode", 0) == ID_STATUS_OFFLINE) @@ -2473,7 +2473,7 @@ void TSAPI SendHBitmapAsFile(const TWindowData* dat, HBITMAP hbmp) if (protoCaps & PF1_INVISLIST && wMyStatus == ID_STATUS_INVISIBLE && DBGetContactSettingWord(dat->cache->getActiveContact(), szProto, "ApparentMode", 0) != ID_STATUS_ONLINE) fSend = false; - if(!fSend) { + if (!fSend) { CWarning::show(CWarning::WARN_SENDFILE, MB_OK|MB_ICONEXCLAMATION|CWarning::CWF_NOALLOWHIDE); return; } diff --git a/plugins/TabSRMM/src/msglog.cpp b/plugins/TabSRMM/src/msglog.cpp index eb030bba9d..ff5fd5a68b 100644 --- a/plugins/TabSRMM/src/msglog.cpp +++ b/plugins/TabSRMM/src/msglog.cpp @@ -993,7 +993,7 @@ static char *Template_CreateRTFFromDbEvent(struct TWindowData *dat, HANDLE hCont case 'U': // UIN if (!skipFont) AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "%s ", GetRTFFont(isSent ? MSGFONTID_MYNAME + iFontIDOffset : MSGFONTID_YOURNAME + iFontIDOffset)); - if(!isSent) + if (!isSent) AppendUnicodeToBuffer(&buffer, &bufferEnd, &bufferAlloced, (wchar_t *)dat->cache->getUIN(), MAKELONG(isSent, dat->isHistory)); else AppendUnicodeToBuffer(&buffer, &bufferEnd, &bufferAlloced, (wchar_t *)dat->myUin, MAKELONG(isSent, dat->isHistory)); diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp index 7438925df1..4e239672c1 100644 --- a/plugins/TabSRMM/src/msgoptions.cpp +++ b/plugins/TabSRMM/src/msgoptions.cpp @@ -147,13 +147,13 @@ static int TSAPI ScanSkinDir(const TCHAR* tszFolder, HWND hwndCombobox) mir_sntprintf(tszFinalName, MAX_PATH, _T("%s%s"), tszFolder, fd.cFileName); GetPrivateProfileString(_T("Global"), _T("Name"), _T("None"), szBuf, 500, tszFinalName); - if(!_tcscmp(szBuf, _T("None"))) { + if (!_tcscmp(szBuf, _T("None"))) { fd.cFileName[lstrlen(fd.cFileName) - 4] = 0; mir_sntprintf(szBuf, 255, _T("%s"), fd.cFileName); } M->pathToRelative(tszFinalName, tszRel, M->getSkinPath()); - if((lr = SendMessage(hwndCombobox, CB_INSERTSTRING, -1, (LPARAM)szBuf)) != CB_ERR) { + if ((lr = SendMessage(hwndCombobox, CB_INSERTSTRING, -1, (LPARAM)szBuf)) != CB_ERR) { TCHAR *idata = (TCHAR *)malloc((lstrlen(tszRel) + 1) * sizeof(TCHAR)); _tcscpy(idata, tszRel); @@ -208,7 +208,7 @@ static int TSAPI RescanSkins(HWND hwndCombobox) TCHAR* idata = (TCHAR *)SendMessage(hwndCombobox, CB_GETITEMDATA, i, 0); if(idata && idata != (TCHAR *)CB_ERR) { - if(!_tcsicmp(dbv.ptszVal, idata)) { + if (!_tcsicmp(dbv.ptszVal, idata)) { SendMessage(hwndCombobox, CB_SETCURSEL, i, 0); break; } @@ -259,7 +259,7 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L } case WM_CTLCOLORSTATIC: - if((HWND)lParam == GetDlgItem(hwndDlg, IDC_SKIN_WARN)) { + if ((HWND)lParam == GetDlgItem(hwndDlg, IDC_SKIN_WARN)) { SetTextColor((HDC)wParam, RGB(255, 50, 50)); return(0); } @@ -956,7 +956,7 @@ static INT_PTR CALLBACK DlgProcTypeOptions(HWND hwndDlg, UINT msg, WPARAM wParam SendDlgItemMessage(hwndDlg, IDC_MTN_POPUPMODE, CB_SETCURSEL, (WPARAM)M->GetByte("MTN_PopupMode", 0), 0); - if(!PluginConfig.g_PopupWAvail) { + if (!PluginConfig.g_PopupWAvail) { Utils::showDlgControl(hwndDlg, IDC_NOTIFYPOPUP, SW_HIDE); Utils::showDlgControl(hwndDlg, IDC_STATIC111, SW_HIDE); Utils::showDlgControl(hwndDlg, IDC_MTN_POPUPMODE, SW_HIDE); diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp index 5c67a6a797..214d65ac54 100644 --- a/plugins/TabSRMM/src/msgs.cpp +++ b/plugins/TabSRMM/src/msgs.cpp @@ -818,14 +818,14 @@ HWND TSAPI CreateNewTabForContact(struct TContainerData *pContainer, HANDLE hCon if (GetForegroundWindow() != pContainer->hwnd && bPopupContainer == TRUE) SetForegroundWindow(pContainer->hwnd); } - else if(!IsIconic(pContainer->hwnd) && IsWindowVisible(pContainer->hwnd)){ + else if (!IsIconic(pContainer->hwnd) && IsWindowVisible(pContainer->hwnd)) { SendMessage(pContainer->hwndActive, WM_SIZE, 0, 0); RedrawWindow(pContainer->hwndActive, NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN | RDW_UPDATENOW); RedrawWindow(pContainer->hwndActive, NULL, NULL, RDW_ERASENOW | RDW_UPDATENOW); } //MaD - if (PluginConfig.m_HideOnClose&&!IsWindowVisible(pContainer->hwnd)){ + if (PluginConfig.m_HideOnClose&&!IsWindowVisible(pContainer->hwnd)) { WINDOWPLACEMENT wp={0}; wp.length = sizeof(wp); GetWindowPlacement(pContainer->hwnd, &wp); @@ -902,10 +902,10 @@ void TSAPI CreateImageList(BOOL bInitial) PluginConfig.g_IconFileEvent = LoadSkinnedIcon(SKINICON_EVENT_FILE); PluginConfig.g_IconMsgEvent = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE); PluginConfig.g_IconMsgEventBig = LoadSkinnedIconBig(SKINICON_EVENT_MESSAGE); - if((HICON)CALLSERVICE_NOTFOUND == PluginConfig.g_IconMsgEventBig) + if ((HICON)CALLSERVICE_NOTFOUND == PluginConfig.g_IconMsgEventBig) PluginConfig.g_IconMsgEventBig = 0; PluginConfig.g_IconTypingEventBig = LoadSkinnedIconBig(SKINICON_OTHER_TYPING); - if((HICON)CALLSERVICE_NOTFOUND == PluginConfig.g_IconTypingEventBig) + if ((HICON)CALLSERVICE_NOTFOUND == PluginConfig.g_IconTypingEventBig) PluginConfig.g_IconTypingEventBig = 0; PluginConfig.g_IconSend = PluginConfig.g_buttonBarIcons[9]; PluginConfig.g_IconTypingEvent = PluginConfig.g_buttonBarIcons[5]; diff --git a/plugins/TabSRMM/src/selectcontainer.cpp b/plugins/TabSRMM/src/selectcontainer.cpp index 975f7496a4..eada4d1c7d 100644 --- a/plugins/TabSRMM/src/selectcontainer.cpp +++ b/plugins/TabSRMM/src/selectcontainer.cpp @@ -114,7 +114,7 @@ INT_PTR CALLBACK SelectContainerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L iLen = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_NEWCONTAINERNAME)); if (iLen) { GetWindowText(GetDlgItem(hwndDlg, IDC_NEWCONTAINERNAME), szNewName, CONTAINER_NAMELEN); - if(!_tcsncmp(szNewName, CGlobals::m_default_container_name, CONTAINER_NAMELEN) || !_tcsncmp(szNewName, CTranslator::get(CTranslator::GEN_DEFAULT_CONTAINER_NAME), CONTAINER_NAMELEN)) { + if (!_tcsncmp(szNewName, CGlobals::m_default_container_name, CONTAINER_NAMELEN) || !_tcsncmp(szNewName, CTranslator::get(CTranslator::GEN_DEFAULT_CONTAINER_NAME), CONTAINER_NAMELEN)) { MessageBox(hwndDlg, CTranslator::get(CTranslator::CNT_SELECT_RENAMEERROR), _T("Error"), MB_OK | MB_ICONERROR); break; } diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp index 2cbf0b7237..5a03e985d3 100644 --- a/plugins/TabSRMM/src/sendlater.cpp +++ b/plugins/TabSRMM/src/sendlater.cpp @@ -130,7 +130,7 @@ CSendLaterJob::~CSendLaterJob() if(fSuccess || fFailed) { POPUPDATAT_V2 ppd = {0}; - if((sendLater->haveErrorPopups() && fFailed) || (sendLater->haveSuccessPopups() && fSuccess)) { + if ((sendLater->haveErrorPopups() && fFailed) || (sendLater->haveSuccessPopups() && fSuccess)) { bool fShowPopup = true; if(fFailed && bCode == JOB_REMOVABLE) // no popups for jobs removed on user's request @@ -235,8 +235,8 @@ bool CSendLater::processCurrentJob() if(m_sendLaterJobList.empty() || m_jobIterator == m_sendLaterJobList.end()) return(false); - if((*m_jobIterator)->fSuccess || (*m_jobIterator)->fFailed) { - if((*m_jobIterator)->mustDelete()) { + if ((*m_jobIterator)->fSuccess || (*m_jobIterator)->fFailed) { + if ((*m_jobIterator)->mustDelete()) { delete *m_jobIterator; m_jobIterator = m_sendLaterJobList.erase(m_jobIterator); } @@ -313,7 +313,7 @@ int CSendLater::addJob(const char *szSetting, LPARAM lParam) DBVARIANT dbv = {0}; char *szOrig_Utf = 0; - if(!m_fAvail || !szSetting || !strcmp(szSetting, "count") || lstrlenA(szSetting) < 8) + if (!m_fAvail || !szSetting || !strcmp(szSetting, "count") || lstrlenA(szSetting) < 8) return(0); if(szSetting[0] != 'S' && szSetting[0] != 'M') @@ -325,7 +325,7 @@ int CSendLater::addJob(const char *szSetting, LPARAM lParam) * check for possible dupes */ while(it != m_sendLaterJobList.end()) { - if((*it)->hContact == hContact && !strcmp((*it)->szId, szSetting)) { + if ((*it)->hContact == hContact && !strcmp((*it)->szId, szSetting)) { return(0); } it++; @@ -339,7 +339,7 @@ int CSendLater::addJob(const char *szSetting, LPARAM lParam) } else if(szSetting[0] == 'M') { char *szSep = strchr(const_cast(szSetting), '|'); - if(!szSep) + if (!szSep) return(0); *szSep = 0; szOrig_Utf = szSep + 1; @@ -429,10 +429,10 @@ int CSendLater::sendIt(CSendLaterJob *job) } CContactCache *c = CContactCache::getContactCache(hContact); - if(!c) + if (!c) return(0); // should not happen - if(!c->isValid()) { + if (!c->isValid()) { job->fFailed = true; job->bCode = CSendLaterJob::INVALID_CONTACT; return(0); // can happen (contact has been deleted). mark the job as failed @@ -441,7 +441,7 @@ int CSendLater::sendIt(CSendLaterJob *job) hContact = c->getActiveContact(); szProto = c->getActiveProto(); - if(!hContact || szProto == 0) + if (!hContact || szProto == 0) return(0); WORD wMyStatus = (WORD)CallProtoService(szProto, PS_GETSTATUS, 0, 0); @@ -455,7 +455,7 @@ int CSendLater::sendIt(CSendLaterJob *job) return(0); } if(job->szId[0] == 'S') { - if(!(wMyStatus == ID_STATUS_ONLINE || wMyStatus == ID_STATUS_FREECHAT)) { + if (!(wMyStatus == ID_STATUS_ONLINE || wMyStatus == ID_STATUS_FREECHAT)) { job->bCode = CSendLaterJob::JOB_MYSTATUS; return(0); } @@ -489,7 +489,7 @@ int CSendLater::sendIt(CSendLaterJob *job) void CSendLater::addContact(const HANDLE hContact) { - if(!m_fAvail) + if (!m_fAvail) return; std::vector::iterator it = m_sendLaterContactList.begin(); @@ -505,7 +505,7 @@ void CSendLater::addContact(const HANDLE hContact) */ while(it != m_sendLaterContactList.end()) { - if(*it == hContact) + if (*it == hContact) return; it++; } @@ -528,10 +528,10 @@ HANDLE CSendLater::processAck(const ACKDATA *ack) SendLaterJobIterator it = m_sendLaterJobList.begin(); while(it != m_sendLaterJobList.end()) { - if((*it)->hProcess == ack->hProcess && (*it)->hTargetContact == ack->hContact && !((*it)->fSuccess || (*it)->fFailed)) { + if ((*it)->hProcess == ack->hProcess && (*it)->hTargetContact == ack->hContact && !((*it)->fSuccess || (*it)->fFailed)) { DBEVENTINFO dbei = {0}; - if(!(*it)->fSuccess) { + if (!(*it)->fSuccess) { dbei.cbSize = sizeof(dbei); dbei.eventType = EVENTTYPE_MESSAGE; dbei.flags = DBEF_SENT; @@ -648,11 +648,11 @@ void CSendLater::qMgrFillList(bool fClear) mir_free(preview); mir_free(msg); - if((*it)->fFailed) { + if ((*it)->fFailed) { tszStatusText = (*it)->bCode == CSendLaterJob::JOB_REMOVABLE ? CTranslator::get(CTranslator::QMGR_STATUS_REMOVED) : CTranslator::get(CTranslator::QMGR_STATUS_FAILED); } - else if((*it)->fSuccess) + else if ((*it)->fSuccess) tszStatusText = CTranslator::get(CTranslator::QMGR_STATUS_SENTOK); else { switch((*it)->bCode) { @@ -670,7 +670,7 @@ void CSendLater::qMgrFillList(bool fClear) break; } } - if((*it)->bCode) + if ((*it)->bCode) bCode = (*it)->bCode; mir_sntprintf(tszStatus, 20, _T("X/%s[%c] (%d)"), tszStatusText, bCode, (*it)->iSendCount); tszStatus[0] = static_cast((*it)->szId[0]); @@ -678,7 +678,7 @@ void CSendLater::qMgrFillList(bool fClear) lvItem.iSubItem = 3; ::SendMessage(m_hwndList, LVM_SETITEM, 0, reinterpret_cast(&lvItem)); - if((*it)->lastSent == 0) + if ((*it)->lastSent == 0) mir_sntprintf(tszTimestamp, 30, _T("%s"), _T("Never")); else { _tcsftime(tszTimestamp, 30, formatTime, _localtime32((__time32_t *)&(*it)->lastSent)); @@ -823,7 +823,7 @@ INT_PTR CALLBACK CSendLater::DlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM /* * copy to clipboard only allowed with a single selection */ - if(::SendMessage(m_hwndList, LVM_GETSELECTEDCOUNT, 0, 0) == 1) + if (::SendMessage(m_hwndList, LVM_GETSELECTEDCOUNT, 0, 0) == 1) ::EnableMenuItem(hSubMenu, ID_QUEUEMANAGER_COPYMESSAGETOCLIPBOARD, MF_ENABLED); m_fIsInteractive = true; @@ -831,7 +831,7 @@ INT_PTR CALLBACK CSendLater::DlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM if(selection == ID_QUEUEMANAGER_CANCELALLMULTISENDJOBS) { SendLaterJobIterator it = m_sendLaterJobList.begin(); while(it != m_sendLaterJobList.end()) { - if((*it)->szId[0] == 'M') { + if ((*it)->szId[0] == 'M') { (*it)->fFailed = true; (*it)->bCode = CSendLaterJob::JOB_REMOVABLE; } @@ -888,7 +888,7 @@ INT_PTR CALLBACK CSendLater::DlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM * exception: kill all open multisend jobs is directly handled from the context menu */ case IDC_QMGR_REMOVE: { - if(::SendMessage(m_hwndList, LVM_GETSELECTEDCOUNT, 0, 0) != 0) { + if (::SendMessage(m_hwndList, LVM_GETSELECTEDCOUNT, 0, 0) != 0) { LVITEM item = {0}; LRESULT items = ::SendMessage(m_hwndList, LVM_GETITEMCOUNT, 0, 0); item.mask = LVIF_STATE|LVIF_PARAM; diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp index b4e90359e9..a608f7006a 100644 --- a/plugins/TabSRMM/src/sendqueue.cpp +++ b/plugins/TabSRMM/src/sendqueue.cpp @@ -922,7 +922,7 @@ int SendQueue::doSendLater(int iJobIndex, TWindowData *dat, HANDLE hContact, boo dat->dwFlags &= ~MWF_SAVEBTN_SAV; mir_free(utfText); - if(!fAvail) + if (!fAvail) return(0); } diff --git a/plugins/TabSRMM/src/sidebar.cpp b/plugins/TabSRMM/src/sidebar.cpp index 85dbf3e6c3..d5e2e86cdd 100644 --- a/plugins/TabSRMM/src/sidebar.cpp +++ b/plugins/TabSRMM/src/sidebar.cpp @@ -332,13 +332,13 @@ int CSideBarButton::testCloseButton() const if(getLayout()->dwFlags & CSideBar::SIDEBARLAYOUT_VERTICALORIENTATION) { rc.bottom = rc.top + 18; rc.top += 2; rc.left += 2; rc.right -= 2; - if(::PtInRect(&rc, pt)) + if (::PtInRect(&rc, pt)) return(1); } else { rc.bottom -= 4; rc.top += 4; rc.right -= 3; rc.left = rc.right - 16; - if(::PtInRect(&rc, pt)) + if (::PtInRect(&rc, pt)) return(1); } } @@ -451,7 +451,7 @@ void CSideBar::setVisible(bool fNewVisible) * only needed on hiding. Layout() will do it when showing it */ - if(!m_isVisible) + if (!m_isVisible) showAll(SW_HIDE); else { m_up->Show(SW_SHOW); @@ -531,7 +531,7 @@ void CSideBar::populateAll() if(item.lParam && ::IsWindow((HWND)item.lParam)) { TWindowData *dat = (TWindowData *)::GetWindowLongPtr((HWND)item.lParam, GWLP_USERDATA); if(dat) { - if((b_item = findSession(dat)) == m_buttonlist.end()) + if ((b_item = findSession(dat)) == m_buttonlist.end()) addSession(dat, i); else { (*b_item)->setLayout(m_currentLayout); @@ -556,7 +556,7 @@ void CSideBar::populateAll() */ void CSideBar::addSession(const TWindowData *dat, int position) { - if(!m_isActive) + if (!m_isActive) return; CSideBarButton *item = new CSideBarButton(dat, this); @@ -620,7 +620,7 @@ void CSideBar::scrollIntoView(const CSideBarButton *item) LONG spaceUsed = 0, itemHeight; bool fNeedLayout = false; - if(!m_isActive) + if (!m_isActive) return; if(item == 0) @@ -631,7 +631,7 @@ void CSideBar::scrollIntoView(const CSideBarButton *item) while(it != m_buttonlist.end()) { itemHeight = (*it)->getHeight(); spaceUsed += (itemHeight + 1); - if(*it == item ) + if (*it == item ) break; it++; } @@ -677,7 +677,7 @@ void CSideBar::scrollIntoView(const CSideBarButton *item) */ void CSideBar::updateSession(const TWindowData *dat) { - if(!m_isVisible || !m_isActive) + if (!m_isVisible || !m_isActive) return; ButtonIterator item = findSession(dat); @@ -731,7 +731,7 @@ const CSideBarButton* CSideBar::setActiveItem(const TWindowData *dat) */ void CSideBar::Layout(const RECT *rc, bool fOnlyCalc) { - if(!m_isVisible) + if (!m_isVisible) return; RECT rcWnd; @@ -777,14 +777,14 @@ void CSideBar::Layout(const RECT *rc, bool fOnlyCalc) if ((*item)->isTopAligned()) { if(m_totalItemHeight <= m_firstVisibleOffset) { // partially visible - if(!fOnlyCalc) + if (!fOnlyCalc) hdwp = ::DeferWindowPos(hdwp, hwnd, 0, 2, -(m_firstVisibleOffset - m_totalItemHeight), m_elementWidth, height, SWP_SHOWWINDOW | dwFlags); spaceUsed += ((height + 1) - (m_firstVisibleOffset - m_totalItemHeight)); m_totalItemHeight += (height + 1); } else { - if(!fOnlyCalc) + if (!fOnlyCalc) hdwp = ::DeferWindowPos(hdwp, hwnd, 0, 2, spaceUsed, m_elementWidth, height, SWP_SHOWWINDOW | dwFlags); spaceUsed += (height + 1); @@ -800,7 +800,7 @@ void CSideBar::Layout(const RECT *rc, bool fOnlyCalc) ::EndDeferWindowPos(hdwp); //_DebugTraceA("layout: total %d, used: %d, first visible: %d", m_totalItemHeight, spaceUsed, m_firstVisibleOffset); - if(!fOnlyCalc) { + if (!fOnlyCalc) { RECT rcContainer; ::GetClientRect(m_pContainer->hwnd, &rcContainer); @@ -849,7 +849,7 @@ ButtonIterator CSideBar::findSession(const TWindowData *dat) if(m_buttonlist.size() > 0) { while(item != m_buttonlist.end()) { - if((*item)->getDat() == dat) + if ((*item)->getDat() == dat) return(item); item++; } @@ -873,7 +873,7 @@ ButtonIterator CSideBar::findSession(const HANDLE hContact) if(m_buttonlist.size() > 0) { while(item != m_buttonlist.end()) { - if((*item)->getContactHandle() == hContact) + if ((*item)->getContactHandle() == hContact) return(item); item++; } @@ -884,7 +884,7 @@ ButtonIterator CSideBar::findSession(const HANDLE hContact) void CSideBar::processScrollerButtons(UINT commandID) { - if(!m_isActive || m_down == 0) + if (!m_isActive || m_down == 0) return; if(commandID == IDC_SIDEBARDOWN && ::IsWindowEnabled(m_down->getHwnd())) @@ -897,7 +897,7 @@ void CSideBar::processScrollerButtons(UINT commandID) void CSideBar::resizeScrollWnd(LONG x, LONG y, LONG width, LONG height) const { - if(!m_isVisible || !m_isActive) { + if (!m_isVisible || !m_isActive) { ::ShowWindow(m_hwndScrollWnd, SW_HIDE); return; } @@ -1079,7 +1079,7 @@ void __fastcall CSideBar::m_DefaultBackgroundRenderer(const HDC hdc, const RECT } else { RECT *rcDraw = const_cast(rc); - if(!(id == IDC_SIDEBARUP || id == IDC_SIDEBARDOWN)) { + if (!(id == IDC_SIDEBARUP || id == IDC_SIDEBARDOWN)) { HBRUSH br = (stateId == PBS_HOT && !fIsActiveItem) ? ::GetSysColorBrush(COLOR_BTNSHADOW) : (fIsActiveItem || stateId == PBS_PRESSED ? ::GetSysColorBrush(COLOR_HOTLIGHT) : ::GetSysColorBrush(COLOR_3DFACE)); ::FillRect(hdc, rc, br); ::DrawEdge(hdc, rcDraw, (stateId == PBS_HOT && !fIsActiveItem) ? EDGE_ETCHED : (fIsActiveItem || stateId == PBS_PRESSED) ? EDGE_BUMP : EDGE_ETCHED, BF_RECT | BF_SOFT | BF_FLAT); @@ -1105,7 +1105,7 @@ void __fastcall CSideBar::m_DefaultContentRenderer(const HDC hdc, const RECT *rc if(id == IDC_SIDEBARUP || id == IDC_SIDEBARDOWN) { ::DrawIconEx(hdc, (rcBox->left + rcBox->right) / 2 - 8, (rcBox->top + rcBox->bottom) / 2 - 8, id == IDC_SIDEBARUP ? PluginConfig.g_buttonBarIcons[26] : PluginConfig.g_buttonBarIcons[16], 16, 16, 0, 0, DI_NORMAL); - if(!M->isAero() && stateID == PBS_HOT) + if (!M->isAero() && stateID == PBS_HOT) ::DrawEdge(hdc, const_cast(rcBox), BDR_INNER, BF_RECT | BF_SOFT | BF_FLAT); } else if(dat) diff --git a/plugins/TabSRMM/src/tabctrl.cpp b/plugins/TabSRMM/src/tabctrl.cpp index 2aadbd91f5..4f9827e733 100644 --- a/plugins/TabSRMM/src/tabctrl.cpp +++ b/plugins/TabSRMM/src/tabctrl.cpp @@ -1061,7 +1061,7 @@ static LRESULT CALLBACK TabControlSubclassProc(HWND hwnd, UINT msg, WPARAM wPara * option "Show tab bar only when needed". */ - if((tabdat->pContainer->dwFlags & CNT_SIDEBAR) || (nCount == 1 && tabdat->pContainer->dwFlags & CNT_HIDETABS)) { + if ((tabdat->pContainer->dwFlags & CNT_SIDEBAR) || (nCount == 1 && tabdat->pContainer->dwFlags & CNT_HIDETABS)) { if(nCount == 0) FillRect(hdcreal, &ps.rcPaint, GetSysColorBrush(COLOR_3DFACE)); // avoid flickering/ugly black background during container creation EndPaint(hwnd, &ps); @@ -1344,7 +1344,7 @@ skip_tabs: /* * finally, bitblt the contents of the memory dc to the real dc */ - //if(!tabdat->pContainer->bSkinned) + //if (!tabdat->pContainer->bSkinned) if (!tabdat->bRefreshWithoutClip) ExcludeClipRect(hdcreal, rctClip.left, rctClip.top, rctClip.right, rctClip.bottom); diff --git a/plugins/TabSRMM/src/taskbar.cpp b/plugins/TabSRMM/src/taskbar.cpp index dfe645bd4a..19d042c031 100644 --- a/plugins/TabSRMM/src/taskbar.cpp +++ b/plugins/TabSRMM/src/taskbar.cpp @@ -112,7 +112,7 @@ bool CTaskbarInteract::haveLargeIcons() * always returns S_OK, but the icon is simply ignored when using small taskbar icons. * also, figure out the button grouping mode. */ - if(::RegOpenKey(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced"), &hKey) == ERROR_SUCCESS) { + if (::RegOpenKey(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced"), &hKey) == ERROR_SUCCESS) { ::RegQueryValueEx(hKey, _T("TaskbarSmallIcons"), 0, &dwType, (LPBYTE)&val, &size); size = 4; dwType = REG_DWORD; @@ -281,7 +281,7 @@ CProxyWindow::~CProxyWindow() */ void CProxyWindow::verifyDwmState() { - if(!M->isDwmActive()) { + if (!M->isDwmActive()) { if(m_thumb) { delete m_thumb; m_thumb = 0; @@ -360,7 +360,7 @@ void CProxyWindow::sendPreview() * use the last known client area size instead. */ - if(!::IsIconic(m_dat->pContainer->hwnd)) { + if (!::IsIconic(m_dat->pContainer->hwnd)) { ::GetWindowRect(m_dat->pContainer->hwndActive, &rcLog); ::GetClientRect(m_dat->pContainer->hwnd, &rcContainer); pt.x = rcLog.left; @@ -580,7 +580,7 @@ LRESULT CALLBACK CProxyWindow::wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARA SendMessage(m_dat->hwnd, WM_CLOSE, 1, 3); else SendMessage(m_dat->hwnd, WM_CLOSE, 1, 2); - if(!IsIconic(pC->hwnd)) + if (!IsIconic(pC->hwnd)) SetForegroundWindow(pC->hwnd); return(0); } @@ -832,7 +832,7 @@ void CThumbIM::renderContent() * status message and bottom line (either UID or nick name, depending on * task bar grouping mode). For chat rooms, it is the topic. */ - if((m_rcBottom.bottom - m_rcBottom.top) < 2 * m_sz.cy) + if ((m_rcBottom.bottom - m_rcBottom.top) < 2 * m_sz.cy) m_dtFlags |= DT_SINGLELINE; m_rcBottom.bottom -= ((m_rcBottom.bottom - m_rcBottom.top) % m_sz.cy); // adjust to a multiple of line height @@ -902,7 +902,7 @@ void CThumbMUC::renderContent() wchar_t* _p = NULL; if ( m_dat->si->ptszStatusbarText ) _p = wcschr(m_dat->si->ptszStatusbarText, ']'); - if( _p ) { + if ( _p ) { _p++; wchar_t _t = *_p; *_p = 0; @@ -926,7 +926,7 @@ void CThumbMUC::renderContent() } } - if((m_rcBottom.bottom - m_rcBottom.top) < 2 * m_sz.cy) + if ((m_rcBottom.bottom - m_rcBottom.top) < 2 * m_sz.cy) m_dtFlags |= DT_SINGLELINE; m_rcBottom.bottom -= ((m_rcBottom.bottom - m_rcBottom.top) % m_sz.cy); // adjust to a multiple of line height diff --git a/plugins/TabSRMM/src/themeio.cpp b/plugins/TabSRMM/src/themeio.cpp index a331d921c1..2eb29884dd 100644 --- a/plugins/TabSRMM/src/themeio.cpp +++ b/plugins/TabSRMM/src/themeio.cpp @@ -151,7 +151,7 @@ static void TSAPI LoadLogfontFromINI(int i, char *szKey, LOGFONTA *lf, COLORREF * filter out font attributes from the message input area font * (can be disabled by db tweak) */ - if(!strcmp(szKey, "Font16") && M->GetByte(0, SRMSGMOD_T, "inputFontFix", 1) == 1) { + if (!strcmp(szKey, "Font16") && M->GetByte(0, SRMSGMOD_T, "inputFontFix", 1) == 1) { lf->lfWeight = FW_NORMAL; lf->lfItalic = 0; lf->lfUnderline = 0; diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp index 65c1ec8e2f..083c827c07 100644 --- a/plugins/TabSRMM/src/themes.cpp +++ b/plugins/TabSRMM/src/themes.cpp @@ -857,7 +857,7 @@ TCHAR* CImageItem::Read(const TCHAR *szFilename) //m_szName[sizeof(m_szName) - 1] = 0; _tsplitpath(szFilename, szDrive, szPath, NULL, NULL); mir_sntprintf(szFinalName, MAX_PATH, _T("%s\\%s%s"), szDrive, szPath, buffer); - if(!PathFileExists(szFinalName)) { + if (!PathFileExists(szFinalName)) { delete[] szFinalName; szFinalName = 0; } @@ -1647,7 +1647,7 @@ void CSkin::Load() m_fHaveGlyph = false; if(m_tszFileName[0]) { - if(::PathFileExists(m_tszFileName)) { + if (::PathFileExists(m_tszFileName)) { TCHAR *p; TCHAR *szSections = (TCHAR *)malloc(6004); int i = 1, j = 0; @@ -1962,7 +1962,7 @@ void CSkin::setupAeroSkins() HBITMAP hbm; BITMAP bm; - if(!m_fAeroSkinsValid) + if (!m_fAeroSkinsValid) return; mir_sntprintf(tszBasePath, MAX_PATH, _T("%s"), M->getDataPath()); @@ -1974,7 +1974,7 @@ void CSkin::setupAeroSkins() */ if(0 == PluginConfig.g_hbmUnknown) { mir_sntprintf(tszFilename, MAX_PATH, _T("%scustom_unknown.png"), tszBasePath); - if(!PathFileExists(tszFilename)) + if (!PathFileExists(tszFilename)) mir_sntprintf(tszFilename, MAX_PATH, _T("%sunknown.png"), tszBasePath); PluginConfig.g_hbmUnknown = (HBITMAP)CallService(MS_IMG_LOAD, (WPARAM)tszFilename, IMGL_TCHAR); if (PluginConfig.g_hbmUnknown == 0) { @@ -1985,7 +1985,7 @@ void CSkin::setupAeroSkins() } mir_sntprintf(tszFilename, MAX_PATH, _T("%scustom_tabskin_aero.png"), tszBasePath); - if(!PathFileExists(tszFilename)) + if (!PathFileExists(tszFilename)) mir_sntprintf(tszFilename, MAX_PATH, _T("%stabskin_aero.png"), tszBasePath); if(CMimAPI::m_pfnDwmGetColorizationColor && M->isAero()) @@ -2007,7 +2007,7 @@ void CSkin::setupAeroSkins() * TODO: this isn't perfect yet, for some colors, the result is a bit off... */ - if(!isOpaque && alphafactor > 150 && !(fr == fg && fg == fb)) { + if (!isOpaque && alphafactor > 150 && !(fr == fg && fg == fb)) { float fmax = max(max(fr,fg), fb); if(fmax == fr) { @@ -2072,7 +2072,7 @@ void CSkin::setupAeroSkins() mir_sntprintf(tszFilename, MAX_PATH, _T("%scustom_tabskin_aero_glow.png"), tszBasePath); - if(!PathFileExists(tszFilename)) + if (!PathFileExists(tszFilename)) mir_sntprintf(tszFilename, MAX_PATH, _T("%stabskin_aero_glow.png"), tszBasePath); fib = (FIBITMAP *)CallService(MS_IMG_LOAD, (WPARAM)tszFilename, IMGL_TCHAR | IMGL_RETURNDIB); @@ -2107,7 +2107,7 @@ void CSkin::setupAeroSkins() * background item for the button switch bar */ mir_sntprintf(tszFilename, MAX_PATH, _T("%scustom_tabskin_aero_button.png"), tszBasePath); - if(!PathFileExists(tszFilename)) + if (!PathFileExists(tszFilename)) mir_sntprintf(tszFilename, MAX_PATH, _T("%stabskin_aero_button.png"), tszBasePath); hbm = (HBITMAP)CallService(MS_IMG_LOAD, (WPARAM)tszFilename, IMGL_TCHAR); @@ -2409,7 +2409,7 @@ DWORD __fastcall CSkin::HexStringToLong(const TCHAR *szSource) int CSkin::RenderText(HDC hdc, HANDLE hTheme, const TCHAR *szText, RECT *rc, DWORD dtFlags, const int iGlowSize, COLORREF clr, bool fForceAero) { - if((PluginConfig.m_bIsVista && !CSkin::m_skinEnabled && hTheme) || fForceAero) { + if ((PluginConfig.m_bIsVista && !CSkin::m_skinEnabled && hTheme) || fForceAero) { DTTOPTS dto = {0}; dto.dwSize = sizeof(dto); if(iGlowSize && (M->isAero() || fForceAero)) { @@ -2478,7 +2478,7 @@ HBITMAP CSkin::ResizeBitmap(HBITMAP hBmpSrc, LONG width, LONG height, bool &must */ bool __fastcall CSkin::DrawItem(const HDC hdc, const RECT *rc, const CSkinItem *item) { - if(!item->IGNORED) { + if (!item->IGNORED) { ::DrawAlpha(hdc, const_cast(rc), item->COLOR, item->ALPHA, item->COLOR2, item->COLOR2_TRANSPARENT, item->GRADIENT, item->CORNER, item->BORDERSTYLE, item->imageItem); return(true); @@ -2560,7 +2560,7 @@ void CSkin::RenderToolbarBG(const TWindowData *dat, HDC hdc, const RECT &rcWindo RECT rc, rcToolbar;; POINT pt; - if(!(dat->pContainer->dwFlags & CNT_BOTTOMTOOLBAR)) { + if (!(dat->pContainer->dwFlags & CNT_BOTTOMTOOLBAR)) { ::GetWindowRect(::GetDlgItem(dat->hwnd, dat->bType == SESSIONTYPE_CHAT ? IDC_CHAT_LOG : IDC_LOG), &rc); pt.y = rc.bottom + 0; ::ScreenToClient(dat->hwnd, &pt); @@ -2616,7 +2616,7 @@ void CSkin::RenderToolbarBG(const TWindowData *dat, HDC hdc, const RECT &rcWindo dat->pContainer->szOldToolbarSize.cx = cx; dat->pContainer->szOldToolbarSize.cy = cy; - if(!fMustDrawNonThemed && M->isVSThemed()) { + if (!fMustDrawNonThemed && M->isVSThemed()) { CMimAPI::m_pfnDrawThemeBackground(dat->hThemeToolbar, dat->pContainer->cachedToolbarDC, 6, 1, &rcCachedToolbar, &rcCachedToolbar); dat->pContainer->bTBRenderingMode = 1; // tell TSButton how to render the tool bar buttons diff --git a/plugins/TabSRMM/src/userprefs.cpp b/plugins/TabSRMM/src/userprefs.cpp index 5691e71a65..8a311e98f6 100644 --- a/plugins/TabSRMM/src/userprefs.cpp +++ b/plugins/TabSRMM/src/userprefs.cpp @@ -278,7 +278,7 @@ static INT_PTR CALLBACK DlgProcUserPrefs(HWND hwndDlg, UINT msg, WPARAM wParam, M->WriteDword(hContact, SRMSGMOD_T, "maxhist", 0); //MAD - if (IsDlgButtonChecked(hwndDlg, IDC_LOADONLYACTUAL)){ + if (IsDlgButtonChecked(hwndDlg, IDC_LOADONLYACTUAL)) { M->WriteByte(hContact, SRMSGMOD_T, "ActualHistory", 1); if (hWnd && dat) dat->bActualHistory=TRUE; }else{ @@ -440,7 +440,7 @@ static INT_PTR CALLBACK DlgProcUserPrefsLogOptions(HWND hwndDlg, UINT msg, WPARA if(hwnd && dat) { if(dwMask) *dwActionToTake |= (DWORD)UPREF_ACTION_REMAKELOG; - if((dat->dwFlags & MWF_LOG_RTL) != (dwFlags & MWF_LOG_RTL)) + if ((dat->dwFlags & MWF_LOG_RTL) != (dwFlags & MWF_LOG_RTL)) *dwActionToTake |= (DWORD)UPREF_ACTION_APPLYOPTIONS; } break; @@ -562,7 +562,7 @@ INT_PTR CALLBACK DlgProcUserPrefsFrame(HWND hwndDlg, UINT msg, WPARAM wParam, LP } #endif LoadLocalFlags(hwnd, dat); - if((dat->dwFlags & MWF_LOG_ALL) != dwOldFlags) { + if ((dat->dwFlags & MWF_LOG_ALL) != dwOldFlags) { BOOL fShouldHide = TRUE; if(IsIconic(dat->pContainer->hwnd)) diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp index f4bd5ab118..66a8effe7a 100644 --- a/plugins/TabSRMM/src/utils.cpp +++ b/plugins/TabSRMM/src/utils.cpp @@ -856,7 +856,7 @@ HICON Utils::iconFromAvatar(const TWindowData *dat) HIMAGELIST hIml_c = 0; HICON hIcon = 0; - if(!ServiceExists(MS_AV_GETAVATARBITMAP)) + if (!ServiceExists(MS_AV_GETAVATARBITMAP)) return(0); if(dat) { @@ -955,7 +955,7 @@ void Utils::addMenuItem(const HMENU& m, MENUITEMINFO& mii, HICON hIcon, const TC */ int TSAPI Utils::mustPlaySound(const TWindowData *dat) { - if(!dat) + if (!dat) return(0); if(dat->pContainer->fHidden) // hidden container is treated as closed, so play the sound @@ -1043,11 +1043,11 @@ void TSAPI Utils::extractResource(const HMODULE h, const UINT uID, const TCHAR * char *pData = (char *)LockResource(hResource); DWORD dwSize = SizeofResource(g_hInst, hRes), written = 0; mir_sntprintf(szFilename, MAX_PATH, _T("%s%s"), tszPath, tszFilename); - if(!fForceOverwrite) { + if (!fForceOverwrite) { if(PathFileExists(szFilename)) return; } - if((hFile = CreateFile(szFilename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0)) != INVALID_HANDLE_VALUE) { + if ((hFile = CreateFile(szFilename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0)) != INVALID_HANDLE_VALUE) { WriteFile(hFile, (void *)pData, dwSize, &written, NULL); CloseHandle(hFile); } @@ -1194,7 +1194,7 @@ CWarning::~CWarning() LRESULT CWarning::ShowDialog() const { - if(!m_fIsModal) { + if (!m_fIsModal) { ::CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_WARNING), 0, stubDlgProc, reinterpret_cast(this)); return(0); } @@ -1266,7 +1266,7 @@ LRESULT CWarning::show(const int uId, DWORD dwFlags, const wchar_t* tszTxt) _s = const_cast(CTranslator::getUntranslatedWarning(uId)); } } - else if(-1 == uId && tszTxt) { + else if (-1 == uId && tszTxt) { dwFlags |= CWF_NOALLOWHIDE; _s = (dwFlags & CWF_UNTRANSLATED ? const_cast(tszTxt) : TranslateW(tszTxt)); } @@ -1274,7 +1274,7 @@ LRESULT CWarning::show(const int uId, DWORD dwFlags, const wchar_t* tszTxt) return(-1); } - if((wcslen(_s) > 3) && ((separator_pos = wcschr(_s, '|')) != 0)) { + if ((wcslen(_s) > 3) && ((separator_pos = wcschr(_s, '|')) != 0)) { if(uId >= 0) { mask = getMask(); @@ -1293,7 +1293,7 @@ LRESULT CWarning::show(const int uId, DWORD dwFlags, const wchar_t* tszTxt) separator_pos[0] = 0; CWarning *w = new CWarning(s, &separator_pos[1], uId, dwFlags); - if(!(dwFlags & MB_YESNO || dwFlags & MB_YESNOCANCEL)) { + if (!(dwFlags & MB_YESNO || dwFlags & MB_YESNOCANCEL)) { w->ShowDialog(); mir_free(s); } @@ -1412,7 +1412,7 @@ INT_PTR CALLBACK CWarning::dlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP hIcon = ::LoadSkinnedIconBig(SKINICON_EVENT_MESSAGE); ::SendDlgItemMessageW(hwnd, IDC_WARNICON, STM_SETICON, reinterpret_cast(hIcon), 0); - if(!(m_dwFlags & MB_YESNO || m_dwFlags & MB_YESNOCANCEL)) + if (!(m_dwFlags & MB_YESNO || m_dwFlags & MB_YESNOCANCEL)) ::ShowWindow(hwnd, SW_SHOWNORMAL); WindowList_Add(hWindowList, hwnd, hwnd); @@ -1450,7 +1450,7 @@ INT_PTR CALLBACK CWarning::dlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP case IDCANCEL: case IDYES: case IDNO: - if(!m_fIsModal && (IDOK == LOWORD(wParam) || IDCANCEL == LOWORD(wParam))) { // modeless dialogs can receive a IDCANCEL from destroyAll() + if (!m_fIsModal && (IDOK == LOWORD(wParam) || IDCANCEL == LOWORD(wParam))) { // modeless dialogs can receive a IDCANCEL from destroyAll() ::SetWindowLongPtr(hwnd, GWLP_USERDATA, 0); delete this; WindowList_Remove(hWindowList, hwnd); @@ -1469,7 +1469,7 @@ INT_PTR CALLBACK CWarning::dlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP newVal = mask | val64; - if(::IsDlgButtonChecked(hwnd, IDC_DONTSHOWAGAIN)) { + if (::IsDlgButtonChecked(hwnd, IDC_DONTSHOWAGAIN)) { DWORD val = (DWORD)(newVal & 0x00000000ffffffff); M->WriteDword(SRMSGMOD_T, "cWarningsL", val); val = (DWORD)((newVal >> 32) & 0x00000000ffffffff); diff --git a/plugins/TabSRMM/tabmodplus/modplus.cpp b/plugins/TabSRMM/tabmodplus/modplus.cpp index b20b17c99e..686e171604 100644 --- a/plugins/TabSRMM/tabmodplus/modplus.cpp +++ b/plugins/TabSRMM/tabmodplus/modplus.cpp @@ -85,7 +85,7 @@ static TCHAR* getMenuEntry(int i) { int ChangeClientIconInStatusBar(const TWindowData *dat) { - if(!ServiceExists(MS_FP_GETCLIENTICON)) + if (!ServiceExists(MS_FP_GETCLIENTICON)) return(S_FALSE); char *msg = getMirVer(dat->hContact); diff --git a/plugins/TabSRMM/tabsrmm_10.vcxproj b/plugins/TabSRMM/tabsrmm_10.vcxproj index f6f6421174..96aea9e9be 100644 --- a/plugins/TabSRMM/tabsrmm_10.vcxproj +++ b/plugins/TabSRMM/tabsrmm_10.vcxproj @@ -244,67 +244,67 @@ ../src/commonheaders.h - ../commonheaders.h + ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h - ../commonheaders.h + ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h - ../commonheaders.h + ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h - ../commonheaders.h + ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h - ../commonheaders.h + ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h - ../commonheaders.h + ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h - ../commonheaders.h + ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h - ../commonheaders.h + ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h - ../commonheaders.h + ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h - ../commonheaders.h + ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h - ../commonheaders.h + ../src/commonheaders.h ../src/commonheaders.h ../src/commonheaders.h diff --git a/plugins/TabSRMM/tabsrmm_10.vcxproj.filters b/plugins/TabSRMM/tabsrmm_10.vcxproj.filters index 76b1ec3639..6ab4275810 100644 --- a/plugins/TabSRMM/tabsrmm_10.vcxproj.filters +++ b/plugins/TabSRMM/tabsrmm_10.vcxproj.filters @@ -261,12 +261,6 @@ - - Resource Files - - - Resource Files - Docs @@ -282,12 +276,6 @@ Docs - - BuildScripts - - - Resource Files - Resource Files -- cgit v1.2.3