diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-03-01 18:00:32 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-03-01 18:00:32 +0100 |
commit | bd205223ec029a875c662474bb6d423d3cdd1994 (patch) | |
tree | 6531a292edb0d2a13103a4c55cbd10e7137b8a58 /vcl/source/window | |
parent | 32781c2d268ed94eb46318a0398385baf31368c4 (diff) |
New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem
...see ebe26f72e90337da2d14f3029de148904e3e30b6 "WaE: 'unused' attribute ignored when parsing type"
for the problem.
Diffstat (limited to 'vcl/source/window')
-rw-r--r-- | vcl/source/window/cursor.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/dialog.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/dockmgr.cxx | 14 | ||||
-rw-r--r-- | vcl/source/window/dockwin.cxx | 8 | ||||
-rw-r--r-- | vcl/source/window/floatwin.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/menu.cxx | 26 | ||||
-rw-r--r-- | vcl/source/window/printdlg.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/scrwnd.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/scrwnd.hxx | 2 | ||||
-rw-r--r-- | vcl/source/window/seleng.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/toolbox.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/toolbox2.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/window.cxx | 6 | ||||
-rw-r--r-- | vcl/source/window/winproc.cxx | 2 |
14 files changed, 38 insertions, 38 deletions
diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index 178aef2e67c4..5be74b972306 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -270,7 +270,7 @@ void Cursor::ImplNew() // ----------------------------------------------------------------------- -IMPL_LINK( Cursor, ImplTimerHdl, AutoTimer*, EMPTYARG ) +IMPL_LINK_NOARG(Cursor, ImplTimerHdl) { if ( mpData->mbCurVisible ) ImplRestore(); diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 22d510b63b59..6e10da618442 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -426,7 +426,7 @@ Dialog::~Dialog() // ----------------------------------------------------------------------- -IMPL_LINK( Dialog, ImplAsyncCloseHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Dialog, ImplAsyncCloseHdl) { Close(); return 0; diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index aa8b0b49d38d..2fd719393555 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -66,9 +66,9 @@ private: sal_Bool mbInMove; sal_uLong mnLastUserEvent; - DECL_LINK( DockingHdl, ImplDockFloatWin2* ); - DECL_LINK( DockTimerHdl, ImplDockFloatWin2* ); - DECL_LINK( EndDockTimerHdl, ImplDockFloatWin2* ); + DECL_LINK(DockingHdl, void *); + DECL_LINK(DockTimerHdl, void *); + DECL_LINK(EndDockTimerHdl, void *); public: ImplDockFloatWin2( Window* pParent, WinBits nWinBits, ImplDockingWindowWrapper* pDockingWin ); @@ -129,7 +129,7 @@ ImplDockFloatWin2::~ImplDockFloatWin2() // ----------------------------------------------------------------------- -IMPL_LINK( ImplDockFloatWin2, DockTimerHdl, ImplDockFloatWin2*, EMPTYARG ) +IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl) { DBG_ASSERT( mpDockWin->IsFloatingMode(), "docktimer called but not floating" ); @@ -157,7 +157,7 @@ IMPL_LINK( ImplDockFloatWin2, DockTimerHdl, ImplDockFloatWin2*, EMPTYARG ) return 0; } -IMPL_LINK( ImplDockFloatWin2, EndDockTimerHdl, ImplDockFloatWin2*, EMPTYARG ) +IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl) { DBG_ASSERT( mpDockWin->IsFloatingMode(), "enddocktimer called but not floating" ); @@ -177,7 +177,7 @@ IMPL_LINK( ImplDockFloatWin2, EndDockTimerHdl, ImplDockFloatWin2*, EMPTYARG ) } -IMPL_LINK( ImplDockFloatWin2, DockingHdl, ImplDockFloatWin2*, EMPTYARG ) +IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) { // called during move of a floating window mnLastUserEvent = 0; @@ -1264,7 +1264,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, sal_uLon } } -IMPL_LINK( ImplDockingWindowWrapper, PopupModeEnd, void*, EMPTYARG ) +IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd) { GetWindow()->Show( sal_False, SHOW_NOFOCUSCHANGE ); diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 9596bfb63acd..a98b994262de 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -84,8 +84,8 @@ private: sal_Bool mbInMove; sal_uLong mnLastUserEvent; - DECL_LINK( DockingHdl, ImplDockFloatWin* ); - DECL_LINK( DockTimerHdl, ImplDockFloatWin* ); + DECL_LINK(DockingHdl, void *); + DECL_LINK(DockTimerHdl, void *); public: ImplDockFloatWin( Window* pParent, WinBits nWinBits, DockingWindow* pDockingWin ); @@ -139,7 +139,7 @@ ImplDockFloatWin::~ImplDockFloatWin() // ----------------------------------------------------------------------- -IMPL_LINK( ImplDockFloatWin, DockTimerHdl, ImplDockFloatWin*, EMPTYARG ) +IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl) { DBG_ASSERT( mpDockWin->IsFloatingMode(), "docktimer called but not floating" ); @@ -168,7 +168,7 @@ IMPL_LINK( ImplDockFloatWin, DockTimerHdl, ImplDockFloatWin*, EMPTYARG ) return 0; } -IMPL_LINK( ImplDockFloatWin, DockingHdl, ImplDockFloatWin*, EMPTYARG ) +IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl) { PointerState aState = mpDockWin->GetParent()->GetPointerState(); diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 32d70213aae2..44f172f26259 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -550,7 +550,7 @@ sal_Bool FloatingWindow::ImplIsFloatPopupModeWindow( const Window* pWindow ) // ----------------------------------------------------------------------- -IMPL_LINK( FloatingWindow, ImplEndPopupModeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl) { mnPostId = 0; mnPopupModeFlags = 0; diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 1f104f40cd7e..73283f3ea918 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -487,10 +487,10 @@ private: sal_Bool bIgnoreFirstMove; sal_Bool bKeyInput; - DECL_LINK( PopupEnd, FloatingWindow* ); + DECL_LINK(PopupEnd, void *); DECL_LINK( HighlightChanged, Timer* ); - DECL_LINK( SubmenuClose, Timer* ); - DECL_LINK( AutoScroll, Timer* ); + DECL_LINK(SubmenuClose, void *); + DECL_LINK(AutoScroll, void *); DECL_LINK( ShowHideListener, VclWindowEvent* ); void StateChanged( StateChangedType nType ); @@ -702,9 +702,9 @@ private: void ImplInitStyleSettings(); - DECL_LINK( CloserHdl, PushButton* ); - DECL_LINK( FloatHdl, PushButton* ); - DECL_LINK( HideHdl, PushButton* ); + DECL_LINK(CloserHdl, void *); + DECL_LINK(FloatHdl, void *); + DECL_LINK(HideHdl, void *); DECL_LINK( ToolboxEventHdl, VclWindowEvent* ); DECL_LINK( ShowHideListener, VclWindowEvent* ); @@ -2990,7 +2990,7 @@ void Menu::ImplCallHighlight( sal_uInt16 nHighlightedItem ) } } -IMPL_LINK( Menu, ImplCallSelect, Menu*, EMPTYARG ) +IMPL_LINK_NOARG(Menu, ImplCallSelect) { nEventId = 0; Select(); @@ -4122,7 +4122,7 @@ void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, sal_Bool bM } } -IMPL_LINK( MenuFloatingWindow, PopupEnd, FloatingWindow*, EMPTYARG ) +IMPL_LINK_NOARG(MenuFloatingWindow, PopupEnd) { // "this" will be deleted before the end of this method! Menu* pM = pMenu; @@ -4171,7 +4171,7 @@ IMPL_LINK( MenuFloatingWindow, PopupEnd, FloatingWindow*, EMPTYARG ) return 0; } -IMPL_LINK( MenuFloatingWindow, AutoScroll, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(MenuFloatingWindow, AutoScroll) { ImplScroll( GetPointerPosPixel() ); return 1; @@ -4240,7 +4240,7 @@ IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*, pTimer ) return 0; } -IMPL_LINK( MenuFloatingWindow, SubmenuClose, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(MenuFloatingWindow, SubmenuClose) { if( pMenu && pMenu->pStartedFrom ) { @@ -5221,7 +5221,7 @@ Size MenuBarWindow::MinCloseButtonSize() return aCloser.getMinSize(); } -IMPL_LINK( MenuBarWindow, CloserHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(MenuBarWindow, CloserHdl) { if( ! pMenu ) return 0; @@ -5284,12 +5284,12 @@ IMPL_LINK( MenuBarWindow, ShowHideListener, VclWindowEvent*, pEvent ) return 0; } -IMPL_LINK( MenuBarWindow, FloatHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(MenuBarWindow, FloatHdl) { return pMenu ? ((MenuBar*)pMenu)->GetFloatButtonClickHdl().Call( pMenu ) : 0; } -IMPL_LINK( MenuBarWindow, HideHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(MenuBarWindow, HideHdl) { return pMenu ? ((MenuBar*)pMenu)->GetHideButtonClickHdl().Call( pMenu ) : 0; } diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 11fba1441ce6..ee646e81a341 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -2178,7 +2178,7 @@ IMPL_LINK( PrintDialog, ModifyHdl, Edit*, pEdit ) return 0; } -IMPL_LINK( PrintDialog, UIOptionsChanged, void*, EMPTYARG ) +IMPL_LINK_NOARG(PrintDialog, UIOptionsChanged) { checkOptionalControlDependencies(); return 0; diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 364766e80190..7c41eee622a3 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -380,7 +380,7 @@ void ImplWheelWindow::MouseButtonUp( const MouseEvent& rMEvt ) // ------------------------------------------------------------------------ -IMPL_LINK( ImplWheelWindow, ImplScrollHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ImplWheelWindow, ImplScrollHdl) { if ( mnActDeltaX || mnActDeltaY ) { diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx index ccc38c778c99..efcb7b77bc58 100644 --- a/vcl/source/window/scrwnd.hxx +++ b/vcl/source/window/scrwnd.hxx @@ -74,7 +74,7 @@ private: void ImplDrawWheel(); void ImplRecalcScrollValues(); - DECL_LINK( ImplScrollHdl, Timer* pTimer ); + DECL_LINK(ImplScrollHdl, void *); protected: diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index d065b39cc7b0..6209ee6b0877 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -82,7 +82,7 @@ SelectionEngine::~SelectionEngine() |* *************************************************************************/ -IMPL_LINK( SelectionEngine, ImpWatchDog, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(SelectionEngine, ImpWatchDog) { if ( !aArea.IsInside( aLastMove.GetPosPixel() ) ) SelMouseMove( aLastMove ); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 2cf7fe092884..ff5cb5be324d 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -2854,7 +2854,7 @@ void ToolBox::ImplFormat( sal_Bool bResize ) // ----------------------------------------------------------------------- -IMPL_LINK( ToolBox, ImplDropdownLongClickHdl, ToolBox*, EMPTYARG ) +IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl) { if( mnCurPos != TOOLBOX_ITEM_NOTFOUND && (mpData->m_aItems[ mnCurPos ].mnBits & TIB_DROPDOWN) @@ -2885,7 +2885,7 @@ IMPL_LINK( ToolBox, ImplDropdownLongClickHdl, ToolBox*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( ToolBox, ImplUpdateHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl) { DBG_CHKTHIS( Window, ImplDbgCheckWindow ); diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 0925ed6dd483..9528bdb2b1ff 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -2018,7 +2018,7 @@ IMPL_LINK( ToolBox, ImplCustomMenuListener, VclMenuEvent*, pEvent ) return 0; } -IMPL_LINK( ToolBox, ImplCallExecuteCustomMenu, void*, EMPTYARG ) +IMPL_LINK_NOARG(ToolBox, ImplCallExecuteCustomMenu) { mpData->mnEventId = 0; ImplExecuteCustomMenu(); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 0dfe4de63a44..8c3d4554bc02 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -2488,7 +2488,7 @@ void Window::ImplPostPaint() // ----------------------------------------------------------------------- -IMPL_LINK( Window, ImplHandlePaintHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Window, ImplHandlePaintHdl) { // save paint events until resizing is done if( mpWindowImpl->mbFrame && mpWindowImpl->mpFrameData->maResizeTimer.IsActive() ) @@ -2500,7 +2500,7 @@ IMPL_LINK( Window, ImplHandlePaintHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( Window, ImplHandleResizeTimerHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl) { if( mpWindowImpl->mbReallyVisible ) { @@ -3756,7 +3756,7 @@ void Window::ImplGenerateMouseMove() // ----------------------------------------------------------------------- -IMPL_LINK( Window, ImplGenerateMouseMoveHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Window, ImplGenerateMouseMoveHdl) { mpWindowImpl->mpFrameData->mnMouseMoveId = 0; Window* pCaptureWin = ImplGetSVData()->maWinData.mpCaptureWin; diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 504b75347d2f..076657ff88c2 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1732,7 +1732,7 @@ static void ImplActivateFloatingWindows( Window* pWindow, sal_Bool bActive ) // ----------------------------------------------------------------------- -IMPL_LINK( Window, ImplAsyncFocusHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) { ImplGetWindowImpl()->mpFrameData->mnFocusId = 0; |