From 2072201029bdd799396b37de23410bab71cc653e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 21 Jun 2013 16:58:18 +0000 Subject: minor code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@5083 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/modern_clcopts.cpp | 2 +- plugins/Clist_modern/src/modern_clcpaint.cpp | 2 +- plugins/Clist_modern/src/modern_clui.cpp | 18 ++++----- plugins/Clist_modern/src/modern_cluiframes.cpp | 50 ++++++++++++------------- plugins/Clist_modern/src/modern_skinengine.cpp | 4 +- plugins/Clist_modern/src/modern_statusbar.cpp | 2 +- plugins/Clist_modern/src/modern_viewmodebar.cpp | 2 +- 7 files changed, 40 insertions(+), 40 deletions(-) (limited to 'plugins/Clist_modern/src') diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp index f2b2f7f7ec..8866f1f071 100644 --- a/plugins/Clist_modern/src/modern_clcopts.cpp +++ b/plugins/Clist_modern/src/modern_clcopts.cpp @@ -220,7 +220,7 @@ void GetFontSetting(int i,LOGFONT *lf,COLORREF *colour,BYTE *effect, COLORREF *e _tcsncpy( fontid.group, fontOptionsList[index].szGroup, SIZEOF( fontid.group )); _tcsncpy( fontid.name, fontOptionsList[index].szDescr, SIZEOF( fontid.name )); - COLORREF col = CallService( MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)lf ); + COLORREF col = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)lf ); if ( colour ) *colour = col; diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp index cb56dfbee8..7ae0f488bc 100644 --- a/plugins/Clist_modern/src/modern_clcpaint.cpp +++ b/plugins/Clist_modern/src/modern_clcpaint.cpp @@ -1421,7 +1421,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact adr.radius = round_radius; adr.alpha = blendmode; - CallService( MS_AV_DRAWAVATAR, 0, (LPARAM) &adr ); + CallService(MS_AV_DRAWAVATAR, 0, (LPARAM) &adr ); } else */ diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index ee9ce018ed..51574a5b66 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -457,13 +457,13 @@ HRESULT CLUI::CreateCLC() nLastRequiredHeight = 0; if (g_CluiData.current_viewmode[0] == '\0') { if (bOldHideOffline != (BYTE)-1) - CallService( MS_CLIST_SETHIDEOFFLINE,(WPARAM)bOldHideOffline, 0); + CallService(MS_CLIST_SETHIDEOFFLINE,(WPARAM)bOldHideOffline, 0); else - CallService( MS_CLIST_SETHIDEOFFLINE, 0, 0); + CallService(MS_CLIST_SETHIDEOFFLINE, 0, 0); if (bOldUseGroups != (BYTE)-1) - CallService( MS_CLIST_SETUSEGROUPS ,(WPARAM)bOldUseGroups, 0); + CallService(MS_CLIST_SETUSEGROUPS ,(WPARAM)bOldUseGroups, 0); else - CallService( MS_CLIST_SETUSEGROUPS ,(WPARAM)bOldUseGroups, 0); + CallService(MS_CLIST_SETUSEGROUPS ,(WPARAM)bOldUseGroups, 0); } nLastRequiredHeight = 0; mutex_bDisableAutoUpdate = 0; @@ -1710,8 +1710,8 @@ LRESULT CLUI::PreProcessWndProc(UINT msg, WPARAM wParam, LPARAM lParam, BOOL& bH if (hView) { char szFilePath[MAX_PATH], szProfile[MAX_PATH]; - CallService( MS_DB_GETPROFILEPATH,MAX_PATH,(LPARAM)&szFilePath ); - CallService( MS_DB_GETPROFILENAME,MAX_PATH,(LPARAM)&szProfile ); + CallService(MS_DB_GETPROFILEPATH,MAX_PATH,(LPARAM)&szFilePath ); + CallService(MS_DB_GETPROFILENAME,MAX_PATH,(LPARAM)&szProfile ); _snprintf((char*)hView, MAX_PATH, "%s\\%s", szFilePath, szProfile ); UnmapViewOfFile( hView ); rc = 1; @@ -1975,7 +1975,7 @@ LRESULT CLUI::OnInitMenu(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/ ) { if ( !CLUI::IsMainMenuInited()) { if ( ServiceExists( MS_CLIST_MENUBUILDMAIN )) - CallService( MS_CLIST_MENUBUILDMAIN, 0, 0 ); + CallService(MS_CLIST_MENUBUILDMAIN, 0, 0 ); CLUI::m_fMainMenuInited = TRUE; } return FALSE; @@ -2139,7 +2139,7 @@ LRESULT CLUI::OnParentNotify(UINT msg, WPARAM wParam, LPARAM lParam) LRESULT CLUI::OnSetFocus(UINT msg, WPARAM wParam, LPARAM lParam) { - if ( hFrameContactTree && ( !CallService( MS_CLIST_FRAMES_GETFRAMEOPTIONS, MAKEWPARAM( FO_FLOATING, hFrameContactTree ), 0 ))) + if ( hFrameContactTree && ( !CallService(MS_CLIST_FRAMES_GETFRAMEOPTIONS, MAKEWPARAM( FO_FLOATING, hFrameContactTree ), 0 ))) SetFocus(pcli->hwndContactTree); return FALSE; @@ -2635,7 +2635,7 @@ LRESULT CLUI::OnMeasureItem(UINT msg, WPARAM wParam, LPARAM lParam) ReleaseDC( m_hWnd, hdc ); return TRUE; } - return CallService( MS_CLIST_MENUMEASUREITEM, wParam, lParam); + return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam); } LRESULT CLUI::OnDrawItem(UINT msg, WPARAM wParam, LPARAM lParam) diff --git a/plugins/Clist_modern/src/modern_cluiframes.cpp b/plugins/Clist_modern/src/modern_cluiframes.cpp index 093a075e0a..bbf1f7af69 100644 --- a/plugins/Clist_modern/src/modern_cluiframes.cpp +++ b/plugins/Clist_modern/src/modern_cluiframes.cpp @@ -3890,31 +3890,31 @@ int CLUIFrameOnModulesUnload(WPARAM wParam,LPARAM lParam) if ( !_hmiVisible) return 0; - CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiVisible, 1 ); - CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiTBVisible, 1 ); - CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiLock, 1 ); - CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiColl, 1 ); - CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiFloating, 1 ); - CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignTop, 1 ); - CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignClient, 1 ); - CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignBottom, 1 ); - CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiBorder, 1 ); - CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignRoot, 1 ); - - - CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiPosUp, 1 ); - CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiPosDown, 1 ); - CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiPosRoot, 1 ); - - - CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiVisible, 1 ); - CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiTBVisible, 1 ); - CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiLock, 1 ); - CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiColl, 1 ); - CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiFloating, 1 ); - CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiBorder, 1 ); - CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiAlignRoot, 1 ); - CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiPosRoot, 1 ); + CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiVisible, 1 ); + CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiTBVisible, 1 ); + CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiLock, 1 ); + CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiColl, 1 ); + CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiFloating, 1 ); + CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignTop, 1 ); + CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignClient, 1 ); + CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignBottom, 1 ); + CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiBorder, 1 ); + CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignRoot, 1 ); + + + CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiPosUp, 1 ); + CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiPosDown, 1 ); + CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiPosRoot, 1 ); + + + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiVisible, 1 ); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiTBVisible, 1 ); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiLock, 1 ); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiColl, 1 ); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiFloating, 1 ); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiBorder, 1 ); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiAlignRoot, 1 ); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiPosRoot, 1 ); _hmiVisible = 0; return 0; diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp index 303df1c769..74b39ef932 100644 --- a/plugins/Clist_modern/src/modern_skinengine.cpp +++ b/plugins/Clist_modern/src/modern_skinengine.cpp @@ -1903,7 +1903,7 @@ static HBITMAP ske_LoadGlyphImage_Png2Dib(const TCHAR *tszFilename) param.pSource = ppMap; param.cbSourceSize = cbFileSize; param.pResult = &pDib; - if ( CallService( MS_PNG2DIB, 0, (LPARAM)¶m )) + if ( CallService(MS_PNG2DIB, 0, (LPARAM)¶m )) pDibBits = ( BYTE* )( pDib+1 ); else cbFileSize = 0; @@ -2388,7 +2388,7 @@ BOOL ske_TextOutA(HDC hdc, int x, int y, char * lpString, int nCount) { TCHAR *buf = (TCHAR *)mir_alloc((2+nCount)*sizeof(TCHAR)); BOOL res; - MultiByteToWideChar(CallService( MS_LANGPACK_GETCODEPAGE, 0, 0 ), 0, lpString, -1, buf, (2+nCount)*sizeof(TCHAR)); + MultiByteToWideChar(CallService(MS_LANGPACK_GETCODEPAGE, 0, 0 ), 0, lpString, -1, buf, (2+nCount)*sizeof(TCHAR)); res = ske_TextOut(hdc,x,y,buf,nCount); mir_free(buf); return res; diff --git a/plugins/Clist_modern/src/modern_statusbar.cpp b/plugins/Clist_modern/src/modern_statusbar.cpp index 7f4033bfe7..a1bf2e2b43 100644 --- a/plugins/Clist_modern/src/modern_statusbar.cpp +++ b/plugins/Clist_modern/src/modern_statusbar.cpp @@ -618,7 +618,7 @@ static BOOL _ModernStatus_OnExtraIconClick(int protoIndex) return FALSE; POINT pt; GetCursorPos( &pt ); - HWND hWnd = (HWND) CallService( MS_CLUI_GETHWND, 0 ,0 ); + HWND hWnd = (HWND) CallService(MS_CLUI_GETHWND, 0 ,0 ); TrackPopupMenu( hExtraStatusMenu, TPM_TOPALIGN|TPM_LEFTALIGN|TPM_LEFTBUTTON, pt.x, pt.y, 0, hWnd, NULL ); return TRUE; } diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp index b9d9a5748c..a0a34b313f 100644 --- a/plugins/Clist_modern/src/modern_viewmodebar.cpp +++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp @@ -1333,7 +1333,7 @@ void ApplyViewMode(const char *Name, bool onlySelector ) db_unset(NULL,CLVM_MODULE,szSetting); } if ( g_CluiData.bOldUseGroups != (BYTE) -1 ) - CallService( MS_CLIST_SETUSEGROUPS, (WPARAM)g_CluiData.bOldUseGroups, 0 ); + CallService(MS_CLIST_SETUSEGROUPS, (WPARAM)g_CluiData.bOldUseGroups, 0 ); pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0); KillTimer(g_hwndViewModeFrame, TIMERID_VIEWMODEEXPIRE); -- cgit v1.2.3