From 1925d3521846f4e6683d3d537cc41de9c9bd7250 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 11 Feb 2014 19:01:03 +0000 Subject: "we don't need these variables" (c) Pink Floyd git-svn-id: http://svn.miranda-ng.org/main/trunk@8101 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp | 60 +++++++++++----------- plugins/Clist_modern/src/CLUIFrames/cluiframes.h | 2 +- plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp | 2 +- plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp | 44 ++++++++-------- 4 files changed, 54 insertions(+), 54 deletions(-) (limited to 'plugins/Clist_modern/src/CLUIFrames') diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp index 935dca24d4..3b2ed38cb0 100644 --- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp @@ -52,7 +52,7 @@ enum { enum { eUnknownId = -1 }; -static int _us_DoSetFrameFloat(WPARAM wParam,LPARAM lParam); +static int _us_DoSetFrameFloat(WPARAM wParam, LPARAM lParam); static int CLUIFrameResizeFloatingFrame( int framepos ); static HWND CreateSubContainerWindow( HWND parent,int x,int y,int width,int height ); static BOOL CLUIFramesFitInSize(); @@ -979,7 +979,7 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,HGEN return 0; } -static int ModifyMItem(WPARAM wParam,LPARAM lParam) +static int ModifyMItem(WPARAM wParam, LPARAM lParam) { if ((int)wParam == -1 ) return 0; // FIXME @@ -987,7 +987,7 @@ static int ModifyMItem(WPARAM wParam,LPARAM lParam) }; -static int CLUIFramesModifyContextMenuForFrame(WPARAM wParam,LPARAM lParam) +static int CLUIFramesModifyContextMenuForFrame(WPARAM wParam, LPARAM lParam) { /* HOOK */ if (MirandaExiting()) return 0; @@ -1038,7 +1038,7 @@ static int CLUIFramesModifyContextMenuForFrame(WPARAM wParam,LPARAM lParam) return 0; } -static int CLUIFramesModifyMainMenuItems(WPARAM wParam,LPARAM lParam) +static int CLUIFramesModifyMainMenuItems(WPARAM wParam, LPARAM lParam) { //hiword(wParam) = frameid,loword(wParam) = flag if (_fCluiFramesModuleNotStarted) return -1; @@ -1092,7 +1092,7 @@ static int CLUIFramesModifyMainMenuItems(WPARAM wParam,LPARAM lParam) } -static INT_PTR _us_DoGetFrameOptions(WPARAM wParam,LPARAM lParam) +static INT_PTR _us_DoGetFrameOptions(WPARAM wParam, LPARAM lParam) { INT_PTR retval; BOOL bUnicodeText = (LOWORD(wParam) & FO_UNICODETEXT) != 0; @@ -1182,7 +1182,7 @@ static int UpdateTBToolTip(int framepos) } //hiword(wParam) = frameid,loword(wParam) = flag -static int _us_DoSetFrameOptions(WPARAM wParam,LPARAM lParam) +static int _us_DoSetFrameOptions(WPARAM wParam, LPARAM lParam) { int retval; // value to be returned BOOL bUnicodeText = (LOWORD(wParam) & FO_UNICODETEXT) != 0; @@ -1351,7 +1351,7 @@ static int _us_DoSetFrameOptions(WPARAM wParam,LPARAM lParam) } //wparam = lparam = 0 -static int _us_DoShowAllFrames(WPARAM wParam,LPARAM lParam) +static int _us_DoShowAllFrames(WPARAM wParam, LPARAM lParam) { int i; @@ -1364,7 +1364,7 @@ static int _us_DoShowAllFrames(WPARAM wParam,LPARAM lParam) } //wparam = lparam = 0 -static int _us_DoShowTitles(WPARAM wParam,LPARAM lParam) +static int _us_DoShowTitles(WPARAM wParam, LPARAM lParam) { int i; @@ -1377,7 +1377,7 @@ static int _us_DoShowTitles(WPARAM wParam,LPARAM lParam) } //wparam = lparam = 0 -static int _us_DoHideTitles(WPARAM wParam,LPARAM lParam) +static int _us_DoHideTitles(WPARAM wParam, LPARAM lParam) { int i; @@ -1390,7 +1390,7 @@ static int _us_DoHideTitles(WPARAM wParam,LPARAM lParam) } //wparam = frameid -static int _us_DoShowHideFrame(WPARAM wParam,LPARAM lParam) +static int _us_DoShowHideFrame(WPARAM wParam, LPARAM lParam) { if (_fCluiFramesModuleNotStarted) return -1; @@ -1418,7 +1418,7 @@ static int _us_DoShowHideFrame(WPARAM wParam,LPARAM lParam) } //wparam = frameid -static int _us_DoShowHideFrameTitle(WPARAM wParam,LPARAM lParam) +static int _us_DoShowHideFrameTitle(WPARAM wParam, LPARAM lParam) { if (_fCluiFramesModuleNotStarted) return -1; @@ -1433,7 +1433,7 @@ static int _us_DoShowHideFrameTitle(WPARAM wParam,LPARAM lParam) //wparam = frameid //lparam = -1 up ,1 down -static int _us_DoMoveFrame(WPARAM wParam,LPARAM lParam) +static int _us_DoMoveFrame(WPARAM wParam, LPARAM lParam) { int i,curpos,curalign,v,tmpval; @@ -1488,19 +1488,19 @@ static int _us_DoMoveFrame(WPARAM wParam,LPARAM lParam) return 0; } -static int _us_DoMoveFrameUp(WPARAM wParam,LPARAM lParam) +static int _us_DoMoveFrameUp(WPARAM wParam, LPARAM lParam) { return CLUIFrames_MoveFrame(wParam,(LPARAM)+1); } -static int _us_DoMoveFrameDown(WPARAM wParam,LPARAM lParam) +static int _us_DoMoveFrameDown(WPARAM wParam, LPARAM lParam) { return CLUIFrames_MoveFrame(wParam,(LPARAM)-1); } //wparam = frameid //lparam = alignment -static int _us_DoSetFrameAlign(WPARAM wParam,LPARAM lParam) +static int _us_DoSetFrameAlign(WPARAM wParam, LPARAM lParam) { if (_fCluiFramesModuleNotStarted) return -1; @@ -1509,21 +1509,21 @@ static int _us_DoSetFrameAlign(WPARAM wParam,LPARAM lParam) return 0; } -static int _us_DoAlignFrameTop(WPARAM wParam,LPARAM lParam) +static int _us_DoAlignFrameTop(WPARAM wParam, LPARAM lParam) { if (_fCluiFramesModuleNotStarted) return -1; return CLUIFrames_SetFrameAlign(wParam,alTop); } -static int _us_DoAlignFrameBottom(WPARAM wParam,LPARAM lParam) +static int _us_DoAlignFrameBottom(WPARAM wParam, LPARAM lParam) { if (_fCluiFramesModuleNotStarted) return -1; return CLUIFrames_SetFrameAlign(wParam,alBottom); } -static int _us_DoAlignFrameClient(WPARAM wParam,LPARAM lParam) +static int _us_DoAlignFrameClient(WPARAM wParam, LPARAM lParam) { if (_fCluiFramesModuleNotStarted) return -1; @@ -1531,7 +1531,7 @@ static int _us_DoAlignFrameClient(WPARAM wParam,LPARAM lParam) } //wparam = frameid -static int _us_DoLockFrame(WPARAM wParam,LPARAM lParam) +static int _us_DoLockFrame(WPARAM wParam, LPARAM lParam) { if (_fCluiFramesModuleNotStarted) return -1; @@ -1545,7 +1545,7 @@ static int _us_DoLockFrame(WPARAM wParam,LPARAM lParam) } //wparam = frameid -static int _us_DoSetFrameBorder(WPARAM wParam,LPARAM lParam) +static int _us_DoSetFrameBorder(WPARAM wParam, LPARAM lParam) { RECT rc; int oldflags; @@ -1571,7 +1571,7 @@ static int _us_DoSetFrameBorder(WPARAM wParam,LPARAM lParam) } //wparam = frameid -static int _us_DoCollapseFrame(WPARAM wParam,LPARAM lParam) +static int _us_DoCollapseFrame(WPARAM wParam, LPARAM lParam) { int FrameId; @@ -1776,7 +1776,7 @@ static HFONT CLUILoadTitleBarFont() //wparam = (CLISTFrame*)clfrm -static int _us_DoAddFrame(WPARAM wParam,LPARAM lParam) +static int _us_DoAddFrame(WPARAM wParam, LPARAM lParam) { int style,retval; //char * CustomName = NULL; @@ -1947,7 +1947,7 @@ static int _us_DoAddFrame(WPARAM wParam,LPARAM lParam) return retval; } -static int _us_DoRemoveFrame(WPARAM wParam,LPARAM lParam) +static int _us_DoRemoveFrame(WPARAM wParam, LPARAM lParam) { int pos; if (_fCluiFramesModuleNotStarted) return -1; @@ -2369,7 +2369,7 @@ int CLUIFrames_ApplyNewSizes(int mode) return 0; } -static int _us_DoUpdateFrame(WPARAM wParam,LPARAM lParam) +static int _us_DoUpdateFrame(WPARAM wParam, LPARAM lParam) { if (_fCluiFramesModuleNotStarted) return -1; if (wParam == -1) { CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0); return 0;} @@ -2538,7 +2538,7 @@ int CheckFramesPos(RECT *wr) return 0; } -int CLUIFramesOnClistResize(WPARAM wParam,LPARAM lParam) +int CLUIFramesOnClistResize(WPARAM wParam, LPARAM lParam) { RECT nRect; int tick; @@ -2639,7 +2639,7 @@ int CLUIFramesOnClistResize(WPARAM wParam,LPARAM lParam) return 0; } -int OnFrameTitleBarBackgroundChange(WPARAM wParam,LPARAM lParam) +int OnFrameTitleBarBackgroundChange(WPARAM wParam, LPARAM lParam) { if (MirandaExiting()) return 0; { @@ -3389,7 +3389,7 @@ static int CLUIFrameResizeFloatingFrame(int framepos) return 0; }; -static int CLUIFrameOnMainMenuBuild(WPARAM wParam,LPARAM lParam) +static int CLUIFrameOnMainMenuBuild(WPARAM wParam, LPARAM lParam) { if (MirandaExiting()) return 0; CLUIFramesLoadMainMenu(); @@ -3668,7 +3668,7 @@ static HWND CreateContainerWindow(HWND parent,int x,int y,int width,int height) }; -static int _us_DoSetFrameFloat(WPARAM wParam,LPARAM lParam) +static int _us_DoSetFrameFloat(WPARAM wParam, LPARAM lParam) { HWND hwndtmp,hwndtooltiptmp; @@ -3785,7 +3785,7 @@ static int _us_DoSetFrameFloat(WPARAM wParam,LPARAM lParam) return 0; } -int CLUIFrameOnModulesLoad(WPARAM wParam,LPARAM lParam) +int CLUIFrameOnModulesLoad(WPARAM wParam, LPARAM lParam) { /* HOOK */ CLUIFramesLoadMainMenu(); @@ -3793,7 +3793,7 @@ int CLUIFrameOnModulesLoad(WPARAM wParam,LPARAM lParam) return 0; } -int CLUIFrameOnModulesUnload(WPARAM wParam,LPARAM lParam) +int CLUIFrameOnModulesUnload(WPARAM wParam, LPARAM lParam) { g_CluiData.bSTATE = STATE_PREPEARETOEXIT; diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.h b/plugins/Clist_modern/src/CLUIFrames/cluiframes.h index 4e9f831250..d437c8ae03 100644 --- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.h +++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.h @@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. int LoadCLUIFramesModule(void); int UnLoadCLUIFramesModule(void); int CLUIFramesGetMinHeight(); -int CLUIFramesOnClistResize(WPARAM wParam,LPARAM lParam); +int CLUIFramesOnClistResize(WPARAM wParam, LPARAM lParam); int CLUIFrames_GetTotalHeight(); typedef struct tagProtocolData { diff --git a/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp b/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp index 46b17483e0..d500d29286 100644 --- a/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp +++ b/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp @@ -89,7 +89,7 @@ static INT_PTR ContextFrameMenuNotify(WPARAM wParam, LPARAM lParam) return 0; } -static INT_PTR BuildContextFrameMenu(WPARAM wParam,LPARAM lParam) +static INT_PTR BuildContextFrameMenu(WPARAM wParam, LPARAM lParam) { ListParam param = { 0 }; param.MenuObjectHandle = hFrameMenuObject; diff --git a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp index 5773392e1a..a09df84b28 100644 --- a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp +++ b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp @@ -57,14 +57,14 @@ typedef struct wparam = handle to the menu item returned by MS_CLIST_ADDCONTACTMENUITEM return 0 on success. */ -static INT_PTR RemoveGroupMenuItem(WPARAM wParam,LPARAM lParam) +static INT_PTR RemoveGroupMenuItem(WPARAM wParam, LPARAM lParam) { CallService(MO_REMOVEMENUITEM,wParam,0); return 0; } -INT_PTR BuildGroupMenu(WPARAM wParam,LPARAM lParam) +INT_PTR BuildGroupMenu(WPARAM wParam, LPARAM lParam) { ListParam param = { 0 }; param.MenuObjectHandle = hGroupMenuObject; @@ -82,7 +82,7 @@ INT_PTR BuildGroupMenu(WPARAM wParam,LPARAM lParam) return (INT_PTR)hMenu; } -static INT_PTR AddGroupMenuItem(WPARAM wParam,LPARAM lParam) +static INT_PTR AddGroupMenuItem(WPARAM wParam, LPARAM lParam) { TMO_MenuItem tmi; CLISTMENUITEM *mi = (CLISTMENUITEM*)lParam; @@ -114,12 +114,12 @@ static INT_PTR AddGroupMenuItem(WPARAM wParam,LPARAM lParam) return (INT_PTR)op.Handle; } -int GroupMenuCheckService(WPARAM wParam,LPARAM lParam) { +int GroupMenuCheckService(WPARAM wParam, LPARAM lParam) { //not used return 0; }; -INT_PTR GroupMenuonAddService(WPARAM wParam,LPARAM lParam) { +INT_PTR GroupMenuonAddService(WPARAM wParam, LPARAM lParam) { MENUITEMINFO *mii = (MENUITEMINFO* )wParam; if (mii == NULL) @@ -146,7 +146,7 @@ INT_PTR GroupMenuonAddService(WPARAM wParam,LPARAM lParam) { //called with: //wparam - ownerdata //lparam - lparam from winproc -INT_PTR GroupMenuExecService(WPARAM wParam,LPARAM lParam) +INT_PTR GroupMenuExecService(WPARAM wParam, LPARAM lParam) { if (wParam != 0) { lpGroupMenuExecParam mmep = (lpGroupMenuExecParam)wParam; @@ -160,7 +160,7 @@ INT_PTR GroupMenuExecService(WPARAM wParam,LPARAM lParam) return 1; } -INT_PTR FreeOwnerDataGroupMenu (WPARAM wParam,LPARAM lParam) +INT_PTR FreeOwnerDataGroupMenu (WPARAM wParam, LPARAM lParam) { lpGroupMenuExecParam mmep = (lpGroupMenuExecParam)lParam; if (mmep != NULL) { @@ -171,7 +171,7 @@ INT_PTR FreeOwnerDataGroupMenu (WPARAM wParam,LPARAM lParam) return 0; } -INT_PTR HideGroupsHelper(WPARAM wParam,LPARAM lParam) +INT_PTR HideGroupsHelper(WPARAM wParam, LPARAM lParam) { int newVal = !(GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_HIDEEMPTYGROUPS); db_set_b(NULL,"CList","HideEmptyGroups",(BYTE)newVal); @@ -179,7 +179,7 @@ INT_PTR HideGroupsHelper(WPARAM wParam,LPARAM lParam) return 0; } -INT_PTR UseGroupsHelper(WPARAM wParam,LPARAM lParam) +INT_PTR UseGroupsHelper(WPARAM wParam, LPARAM lParam) { int newVal = !(GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_USEGROUPS); db_set_b(NULL,"CList","UseGroups",(BYTE)newVal); @@ -187,7 +187,7 @@ INT_PTR UseGroupsHelper(WPARAM wParam,LPARAM lParam) return 0; } -INT_PTR HideOfflineRootHelper(WPARAM wParam,LPARAM lParam) +INT_PTR HideOfflineRootHelper(WPARAM wParam, LPARAM lParam) { SendMessage( (HWND)CallService(MS_CLUI_GETHWNDTREE, 0, 0), @@ -197,7 +197,7 @@ INT_PTR HideOfflineRootHelper(WPARAM wParam,LPARAM lParam) return 0; } -INT_PTR CreateGroupHelper(WPARAM wParam,LPARAM lParam) +INT_PTR CreateGroupHelper(WPARAM wParam, LPARAM lParam) { SendMessage((HWND)CallService(MS_CLUI_GETHWNDTREE, 0, 0), CLM_SETHIDEEMPTYGROUPS, 0, 0); SendMessage((HWND)CallService(MS_CLUI_GETHWNDTREE, 0, 0), CLM_SETUSEGROUPS, 1, 0); @@ -205,7 +205,7 @@ INT_PTR CreateGroupHelper(WPARAM wParam,LPARAM lParam) return 0; }; -static int OnBuildGroupMenu(WPARAM wParam,LPARAM lParam) +static int OnBuildGroupMenu(WPARAM wParam, LPARAM lParam) { if (MirandaExiting()) return 0; @@ -226,7 +226,7 @@ static int OnBuildGroupMenu(WPARAM wParam,LPARAM lParam) static IconItem iconItem = { "New Group", "NewGroup", IDI_NEWGROUP2 }; -int static OnIconLibIconChanged(WPARAM wParam,LPARAM lParam) +int static OnIconLibIconChanged(WPARAM wParam, LPARAM lParam) { if (MirandaExiting()) return 0; @@ -371,13 +371,13 @@ int Param1,Param2; wparam = handle to the menu item returned by MS_CLIST_ADDCONTACTMENUITEM return 0 on success. */ -static INT_PTR RemoveSubGroupMenuItem(WPARAM wParam,LPARAM lParam) +static INT_PTR RemoveSubGroupMenuItem(WPARAM wParam, LPARAM lParam) { CallService(MO_REMOVEMENUITEM,wParam,0); return 0; } -static int OnBuildSubGroupMenu(WPARAM wParam,LPARAM lParam) +static int OnBuildSubGroupMenu(WPARAM wParam, LPARAM lParam) { BOOL gray1 = FALSE; BOOL gray2 = FALSE; @@ -404,7 +404,7 @@ static int OnBuildSubGroupMenu(WPARAM wParam,LPARAM lParam) return 0; } -INT_PTR BuildSubGroupMenu(WPARAM wParam,LPARAM lParam) +INT_PTR BuildSubGroupMenu(WPARAM wParam, LPARAM lParam) { ListParam param = { 0 }; param.MenuObjectHandle = hSubGroupMenuObject; @@ -430,7 +430,7 @@ HMENU cliBuildGroupPopupMenu(ClcGroup *group) return (HMENU)CallService(MS_CLIST_MENUBUILDSUBGROUP,(WPARAM)group,0); } -static INT_PTR AddSubGroupMenuItem(WPARAM wParam,LPARAM lParam) +static INT_PTR AddSubGroupMenuItem(WPARAM wParam, LPARAM lParam) { TMO_MenuItem tmi; CLISTMENUITEM *mi = (CLISTMENUITEM*)lParam; @@ -462,7 +462,7 @@ static INT_PTR AddSubGroupMenuItem(WPARAM wParam,LPARAM lParam) return (INT_PTR)op.Handle; } -INT_PTR SubGroupMenuCheckService(WPARAM wParam,LPARAM lParam) +INT_PTR SubGroupMenuCheckService(WPARAM wParam, LPARAM lParam) { TCheckProcParam * CParam = (TCheckProcParam*)wParam; if (CParam) { @@ -473,7 +473,7 @@ INT_PTR SubGroupMenuCheckService(WPARAM wParam,LPARAM lParam) return 1; } -INT_PTR SubGroupMenuonAddService(WPARAM wParam,LPARAM lParam) +INT_PTR SubGroupMenuonAddService(WPARAM wParam, LPARAM lParam) { MENUITEMINFO *mii = (MENUITEMINFO* )wParam; if (mii == NULL) @@ -485,7 +485,7 @@ INT_PTR SubGroupMenuonAddService(WPARAM wParam,LPARAM lParam) //called with: //wparam - ownerdata //lparam - lparam from winproc -INT_PTR SubGroupMenuExecService(WPARAM wParam,LPARAM lParam) +INT_PTR SubGroupMenuExecService(WPARAM wParam, LPARAM lParam) { if (wParam != 0) { lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)wParam; @@ -499,7 +499,7 @@ INT_PTR SubGroupMenuExecService(WPARAM wParam,LPARAM lParam) return 1; } -INT_PTR FreeOwnerDataSubGroupMenu (WPARAM wParam,LPARAM lParam) +INT_PTR FreeOwnerDataSubGroupMenu (WPARAM wParam, LPARAM lParam) { lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)lParam; if (mmep != NULL){ @@ -512,7 +512,7 @@ INT_PTR FreeOwnerDataSubGroupMenu (WPARAM wParam,LPARAM lParam) //wparam menu handle to pass to clc.c //lparam WM_COMMAND HWND -INT_PTR GroupMenuExecProxy(WPARAM wParam,LPARAM lParam) +INT_PTR GroupMenuExecProxy(WPARAM wParam, LPARAM lParam) { SendMessage(lParam?(HWND)lParam:(HWND)pcli->hwndContactTree,WM_COMMAND,wParam,0); return 0; -- cgit v1.2.3