diff options
Diffstat (limited to 'include/vcl')
40 files changed, 269 insertions, 270 deletions
diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx index 2b31b1b1d348..8ac20a190434 100644 --- a/include/vcl/abstdlg.hxx +++ b/include/vcl/abstdlg.hxx @@ -20,11 +20,11 @@ #define INCLUDED_VCL_ABSTDLG_HXX #include <rtl/ustring.hxx> +#include <tools/link.hxx> #include <vcl/dllapi.h> namespace vcl { class Window; } class ResId; -class Link; class VCL_DLLPUBLIC VclAbstractDialog { @@ -39,7 +39,7 @@ class VCL_DLLPUBLIC VclAbstractDialog2 public: virtual ~VclAbstractDialog2(); - virtual void StartExecuteModal( const Link& rEndDialogHdl ) = 0; + virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) = 0; virtual long GetResult() = 0; }; diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx index d7d9d296ca2d..0459f04266b3 100644 --- a/include/vcl/accel.hxx +++ b/include/vcl/accel.hxx @@ -36,9 +36,9 @@ class VCL_DLLPUBLIC Accelerator : public Resource private: ImplAccelData* mpData; OUString maHelpStr; - Link maActivateHdl; - Link maDeactivateHdl; - Link maSelectHdl; + Link<> maActivateHdl; + Link<> maDeactivateHdl; + Link<> maSelectHdl; // Will be set by AcceleratorManager vcl::KeyCode maCurKeyCode; @@ -89,12 +89,12 @@ public: void SetHelpText( const OUString& rHelpText ) { maHelpStr = rHelpText; } const OUString& GetHelpText() const { return maHelpStr; } - void SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; } - const Link& GetActivateHdl() const { return maActivateHdl; } - void SetDeactivateHdl( const Link& rLink ) { maDeactivateHdl = rLink; } - const Link& GetDeactivateHdl() const { return maDeactivateHdl; } - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } + void SetActivateHdl( const Link<>& rLink ) { maActivateHdl = rLink; } + const Link<>& GetActivateHdl() const { return maActivateHdl; } + void SetDeactivateHdl( const Link<>& rLink ) { maDeactivateHdl = rLink; } + const Link<>& GetDeactivateHdl() const { return maDeactivateHdl; } + void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } + const Link<>& GetSelectHdl() const { return maSelectHdl; } Accelerator& operator=( const Accelerator& rAccel ); }; diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx index 17d62a1a3d1a..0d89bc9c4f1b 100644 --- a/include/vcl/animate.hxx +++ b/include/vcl/animate.hxx @@ -163,8 +163,8 @@ public: void SetCycleMode( CycleMode eMode ); CycleMode GetCycleMode() const { return meCycleMode; } - void SetNotifyHdl( const Link& rLink ) { maNotifyLink = rLink; } - const Link& GetNotifyHdl() const { return maNotifyLink; } + void SetNotifyHdl( const Link<>& rLink ) { maNotifyLink = rLink; } + const Link<>& GetNotifyHdl() const { return maNotifyLink; } size_t Count() const { return maList.size(); } bool Insert( const AnimationBitmap& rAnimationBitmap ); @@ -196,7 +196,7 @@ public: bool Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam = NULL, - const Link* pProgress = NULL ); + const Link<>* pProgress = NULL ); friend VCL_DLLPUBLIC SvStream& ReadAnimation( SvStream& rIStream, Animation& rAnimation ); friend VCL_DLLPUBLIC SvStream& WriteAnimation( SvStream& rOStream, const Animation& rAnimation ); @@ -216,7 +216,7 @@ private: std::vector< AnimationBitmap* > maList; std::vector< ImplAnimView* > maViewList; - Link maNotifyLink; + Link<> maNotifyLink; BitmapEx maBitmapEx; Timer maTimer; Size maGlobalSize; diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 7d71a66fdc0d..9027a643deba 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -704,7 +704,7 @@ public: bool Vectorize( tools::PolyPolygon& rPolyPoly, sal_uLong nFlags = BMP_VECTORIZE_OUTER, - const Link* pProgress = NULL ); + const Link<>* pProgress = NULL ); /** Convert the bitmap to a meta file @@ -731,7 +731,7 @@ public: GDIMetaFile& rMtf, sal_uInt8 cReduce = 0, sal_uLong nFlags = BMP_VECTORIZE_INNER, - const Link* pProgress = NULL ); + const Link<>* pProgress = NULL ); /** Change various global color characteristics @@ -789,7 +789,7 @@ public: bool Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam = NULL, - const Link* pProgress = NULL ); + const Link<>* pProgress = NULL ); public: @@ -834,15 +834,15 @@ public: SAL_DLLPRIVATE bool ImplConvolute3( const long* pMatrix, long nDivisor, const BmpFilterParam* pFilterParam, - const Link* pProgress ); - - SAL_DLLPRIVATE bool ImplMedianFilter( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE bool ImplSobelGrey( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE bool ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE bool ImplSolarize( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE bool ImplSepia( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE bool ImplMosaic( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE bool ImplPopArt( const BmpFilterParam* pFilterParam, const Link* pProgress ); + const Link<>* pProgress ); + + SAL_DLLPRIVATE bool ImplMedianFilter( const BmpFilterParam* pFilterParam, const Link<>* pProgress ); + SAL_DLLPRIVATE bool ImplSobelGrey( const BmpFilterParam* pFilterParam, const Link<>* pProgress ); + SAL_DLLPRIVATE bool ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link<>* pProgress ); + SAL_DLLPRIVATE bool ImplSolarize( const BmpFilterParam* pFilterParam, const Link<>* pProgress ); + SAL_DLLPRIVATE bool ImplSepia( const BmpFilterParam* pFilterParam, const Link<>* pProgress ); + SAL_DLLPRIVATE bool ImplMosaic( const BmpFilterParam* pFilterParam, const Link<>* pProgress ); + SAL_DLLPRIVATE bool ImplPopArt( const BmpFilterParam* pFilterParam, const Link<>* pProgress ); SAL_DLLPRIVATE bool ImplSeparableBlurFilter( const double aRadius = 0.7 ); SAL_DLLPRIVATE bool ImplSeparableUnsharpenFilter( const double aRadius = 0.7 ); diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index 1603f6f030c4..eb9e4d60a911 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -374,7 +374,7 @@ public: bool Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam = NULL, - const Link* pProgress = NULL ); + const Link<>* pProgress = NULL ); /** Get transparency at given position diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx index c7fdab639d1b..db29f241aa74 100644 --- a/include/vcl/btndlg.hxx +++ b/include/vcl/btndlg.hxx @@ -65,8 +65,8 @@ public: void SetFocusButton( sal_uInt16 nId = BUTTONDIALOG_BUTTON_NOTFOUND ) { mnFocusButtonId = nId; } sal_uInt16 GetFocusButton() const { return mnFocusButtonId; } - void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } - const Link& GetClickHdl() const { return maClickHdl; } + void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; } + const Link<>& GetClickHdl() const { return maClickHdl; } protected: ButtonDialog( WindowType nType ); @@ -84,7 +84,7 @@ private: sal_uInt16 mnCurButtonId; sal_uInt16 mnFocusButtonId; bool mbFormat; - Link maClickHdl; + Link<> maClickHdl; SAL_DLLPRIVATE void ImplInitButtonDialogData(); SAL_DLLPRIVATE PushButton* ImplCreatePushButton( sal_uInt16 nBtnFlags ); diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 8fb9dedbfe65..8ecf063e0577 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -38,7 +38,7 @@ class VCL_DLLPUBLIC Button : public Control { private: std::unique_ptr<ImplCommonButtonData> mpButtonData; - Link maClickHdl; + Link<> maClickHdl; /// Command URL (like .uno:Save) in case the button should handle it. OUString maCommand; @@ -68,8 +68,8 @@ public: virtual void Click(); - void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } - const Link& GetClickHdl() const { return maClickHdl; } + void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; } + const Link<>& GetClickHdl() const { return maClickHdl; } /// Setup handler for UNO commands so that commands like .uno:Something are handled automagically by this button. void SetCommandHandler(const OUString& aCommand); @@ -116,7 +116,7 @@ protected: sal_uInt16 mnDDStyle; bool mbPressed; bool mbInUserDraw; - Link maToggleHdl; + Link<> maToggleHdl; SAL_DLLPRIVATE void ImplInitPushButtonData(); SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); @@ -195,8 +195,8 @@ public: Size CalcMinimumSize( long nMaxWidth = 0 ) const; virtual Size GetOptimalSize() const SAL_OVERRIDE; - void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; } - const Link& GetToggleHdl() const { return maToggleHdl; } + void SetToggleHdl( const Link<>& rLink ) { maToggleHdl = rLink; } + const Link<>& GetToggleHdl() const { return maToggleHdl; } virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; @@ -282,7 +282,7 @@ private: bool mbSaveValue; bool mbRadioCheck; bool mbStateChanged; - Link maToggleHdl; + Link<> maToggleHdl; // when mbLegacyNoTextAlign is set then the old behaviour where // the WB_LEFT, WB_RIGHT & WB_CENTER affect the image placement // occurs, otherwise the image ( radiobutton circle ) is placed @@ -373,8 +373,8 @@ public: Size CalcMinimumSize( long nMaxWidth = 0 ) const; virtual Size GetOptimalSize() const SAL_OVERRIDE; - void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; } - const Link& GetToggleHdl() const { return maToggleHdl; } + void SetToggleHdl( const Link<>& rLink ) { maToggleHdl = rLink; } + const Link<>& GetToggleHdl() const { return maToggleHdl; } /** GetRadioButtonGroup returns a list of pointers to <code>RadioButton</code>s in the same group. @@ -411,7 +411,7 @@ private: TriState meState; TriState meSaveValue; bool mbTriState; - Link maToggleHdl; + Link<> maToggleHdl; // when mbLegacyNoTextAlign is set then the old behaviour where // the WB_LEFT, WB_RIGHT & WB_CENTER affect the image placement // occurs, otherwise the image ( checkbox box ) is placed @@ -485,8 +485,8 @@ public: Size CalcMinimumSize( long nMaxWidth = 0 ) const; virtual Size GetOptimalSize() const SAL_OVERRIDE; - void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; } - const Link& GetToggleHdl() const { return maToggleHdl; } + void SetToggleHdl( const Link<>& rLink ) { maToggleHdl = rLink; } + const Link<>& GetToggleHdl() const { return maToggleHdl; } bool IsLegacyNoTextAlign() { return mbLegacyNoTextAlign; } void SetLegacyNoTextAlign( bool bVal ) { mbLegacyNoTextAlign = bVal; } diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index a835a40d215f..83e4a1812d4a 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -45,8 +45,8 @@ private: bool mbSyntheticModify : 1; bool mbMatchCase : 1; sal_Int32 m_nMaxWidthChars; - Link maSelectHdl; - Link maDoubleClickHdl; + Link<> maSelectHdl; + Link<> maDoubleClickHdl; boost::signals2::scoped_connection mAutocompleteConnection; struct ComboBoxBounds @@ -163,10 +163,10 @@ public: void SetMultiSelectionSeparator( sal_Unicode cSep ) { mcMultiSep = cSep; } sal_Unicode GetMultiSelectionSeparator() const { return mcMultiSep; } - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } - void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } - const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } + void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } + const Link<>& GetSelectHdl() const { return maSelectHdl; } + void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; } + const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; } Size CalcMinimumSize() const SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index f3fd7026472b..7c3c9e69c9cc 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -41,8 +41,8 @@ protected: private: bool mbHasControlFocus; - Link maGetFocusHdl; - Link maLoseFocusHdl; + Link<> maGetFocusHdl; + Link<> maLoseFocusHdl; SAL_DLLPRIVATE void ImplInitControlData(); @@ -79,7 +79,7 @@ protected: if the Control instance has been destroyed in any of the call */ bool ImplCallEventListenersAndHandler( - sal_uLong nEvent, const Link& rHandler, void* pCaller + sal_uLong nEvent, const Link<>& rHandler, void* pCaller ); /** draws the given text onto the given device @@ -163,10 +163,10 @@ public: */ long ToRelativeLineIndex( long nIndex ) const; - void SetGetFocusHdl( const Link& rLink ) { maGetFocusHdl = rLink; } - const Link& GetGetFocusHdl() const { return maGetFocusHdl; } - void SetLoseFocusHdl( const Link& rLink ) { maLoseFocusHdl = rLink; } - const Link& GetLoseFocusHdl() const { return maLoseFocusHdl; } + void SetGetFocusHdl( const Link<>& rLink ) { maGetFocusHdl = rLink; } + const Link<>& GetGetFocusHdl() const { return maGetFocusHdl; } + void SetLoseFocusHdl( const Link<>& rLink ) { maLoseFocusHdl = rLink; } + const Link<>& GetLoseFocusHdl() const { return maLoseFocusHdl; } /** determines whether the control currently has the focus */ diff --git a/include/vcl/cvtgrf.hxx b/include/vcl/cvtgrf.hxx index 254d887b7251..a714b227c69d 100644 --- a/include/vcl/cvtgrf.hxx +++ b/include/vcl/cvtgrf.hxx @@ -35,7 +35,7 @@ class VCL_DLLPUBLIC GraphicConverter { private: - Link maFilterHdl; + Link<> maFilterHdl; ConvertData* mpConvertData; public: @@ -48,8 +48,8 @@ public: ConvertData* GetConvertData() { return mpConvertData; } - void SetFilterHdl( const Link& rLink ) { maFilterHdl = rLink; } - const Link& GetFilterHdl() const { return maFilterHdl; } + void SetFilterHdl( const Link<>& rLink ) { maFilterHdl = rLink; } + const Link<>& GetFilterHdl() const { return maFilterHdl; } }; #endif // INCLUDED_VCL_CVTGRF_HXX diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 652a06965e27..0587aefb7b3e 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -101,7 +101,7 @@ public: // Dialog::Execute replacement API public: // Link impl: DECL_LINK( MyEndDialogHdl, Dialog* ); <= param is dialog just ended - virtual void StartExecuteModal( const Link& rEndDialogHdl ); + virtual void StartExecuteModal( const Link<>& rEndDialogHdl ); long GetResult() const; private: bool ImplStartExecuteModal(); diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index dde925f47051..3eb655ccd09b 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -94,8 +94,8 @@ private: mbIsSubEdit:1, mbInMBDown:1, mbActivePopup:1; - Link maModifyHdl; - Link maUpdateDataHdl; + Link<> maModifyHdl; + Link<> maUpdateDataHdl; css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > mxISC; @@ -233,9 +233,9 @@ public: const OUString& GetSavedValue() const { return maSaveValue; } bool IsValueChangedFromSaved() const { return maSaveValue != GetText(); } - virtual void SetModifyHdl( const Link& rLink ) { maModifyHdl = rLink; } - virtual const Link& GetModifyHdl() const { return maModifyHdl; } - virtual void SetUpdateDataHdl( const Link& rLink ) { maUpdateDataHdl = rLink; } + virtual void SetModifyHdl( const Link<>& rLink ) { maModifyHdl = rLink; } + virtual const Link<>& GetModifyHdl() const { return maModifyHdl; } + virtual void SetUpdateDataHdl( const Link<>& rLink ) { maUpdateDataHdl = rLink; } void SetSubEdit( Edit* pEdit ); Edit* GetSubEdit() const { return mpSubEdit; } diff --git a/include/vcl/evntpost.hxx b/include/vcl/evntpost.hxx index 86b38f69253d..e98ec15398e8 100644 --- a/include/vcl/evntpost.hxx +++ b/include/vcl/evntpost.hxx @@ -36,12 +36,12 @@ namespace vcl class VCL_DLLPUBLIC EventPoster { ImplSVEvent * m_nId; - Link m_aLink; + Link<> m_aLink; DECL_DLLPRIVATE_LINK( DoEvent_Impl, UserEvent* ); public: - EventPoster( const Link& rLink ); + EventPoster( const Link<>& rLink ); ~EventPoster(); void Post( UserEvent* pEvent ); }; diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index cdc80d9cd31c..dc461b781771 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -43,7 +43,7 @@ class VCL_DLLPUBLIC FormatterBase private: VclPtr<Edit> mpField; LocaleDataWrapper* mpLocaleDataWrapper; - Link maErrorLink; + Link<> maErrorLink; bool mbReformat; bool mbStrictFormat; bool mbEmptyFieldValue; @@ -83,8 +83,8 @@ public: const AllSettings& GetFieldSettings() const; - void SetErrorHdl( const Link& rLink ) { maErrorLink = rLink; } - const Link& GetErrorHdl() const { return maErrorLink; } + void SetErrorHdl( const Link<>& rLink ) { maErrorLink = rLink; } + const Link<>& GetErrorHdl() const { return maErrorLink; } void SetEmptyFieldValue(); bool IsEmptyFieldValue() const; @@ -229,7 +229,7 @@ protected: OUString maCurUnitText; sal_Int64 mnBaseValue; FieldUnit meUnit; - Link maCustomConvertLink; + Link<> maCustomConvertLink; protected: MetricFormatter(); @@ -270,8 +270,8 @@ public: using NumericFormatter::GetCorrectedValue; sal_Int64 GetCorrectedValue( FieldUnit eOutUnit ) const; - void SetCustomConvertHdl( const Link& rLink ) { maCustomConvertLink = rLink; } - const Link& GetCustomConvertHdl() const { return maCustomConvertLink; } + void SetCustomConvertHdl( const Link<>& rLink ) { maCustomConvertLink = rLink; } + const Link<>& GetCustomConvertHdl() const { return maCustomConvertLink; } }; diff --git a/include/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx index 2fc8e2f95469..8af5860bcf4c 100644 --- a/include/vcl/fixedhyper.hxx +++ b/include/vcl/fixedhyper.hxx @@ -28,7 +28,7 @@ class VCL_DLLPUBLIC FixedHyperlink : public FixedText private: long m_nTextLen; Pointer m_aOldPointer; - Link m_aClickHdl; + Link<> m_aClickHdl; OUString m_sURL; /** initializes the font (link color and underline). @@ -91,14 +91,14 @@ class VCL_DLLPUBLIC FixedHyperlink : public FixedText m_aClickHdl is called if the text is clicked. */ - inline void SetClickHdl( const Link& rLink ) { m_aClickHdl = rLink; } + inline void SetClickHdl( const Link<>& rLink ) { m_aClickHdl = rLink; } /** returns m_aClickHdl. @return m_aClickHdl */ - inline const Link& GetClickHdl() const { return m_aClickHdl; } + inline const Link<>& GetClickHdl() const { return m_aClickHdl; } // ::FixedHyperbaseLink diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index a9033a22670b..fb542ddffb06 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -89,7 +89,7 @@ private: bool mbOldSaveBackMode; bool mbGrabFocus; // act as key input window, although focus is not set bool mbInCleanUp; - Link maPopupModeEndHdl; + Link<> maPopupModeEndHdl; SAL_DLLPRIVATE void ImplCallPopupModeEnd(); DECL_DLLPRIVATE_LINK( ImplEndPopupModeHdl, void* ); @@ -144,8 +144,8 @@ public: bool IsPopupModeCanceled() const { return mbPopupModeCanceled; } bool IsPopupModeTearOff() const { return mbPopupModeTearOff; } - void SetPopupModeEndHdl( const Link& rLink ) { maPopupModeEndHdl = rLink; } - const Link& GetPopupModeEndHdl() const { return maPopupModeEndHdl; } + void SetPopupModeEndHdl( const Link<>& rLink ) { maPopupModeEndHdl = rLink; } + const Link<>& GetPopupModeEndHdl() const { return maPopupModeEndHdl; } bool GrabsFocus() const { return mbGrabFocus; } diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index e860dda464b1..43bfad95a0b6 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -78,7 +78,7 @@ private: MapMode aPrefMapMode; Size aPrefSize; - Link aHookHdlLink; + Link<> aHookHdlLink; GDIMetaFile* pPrev; GDIMetaFile* pNext; VclPtr<OutputDevice> pOutDev; @@ -198,8 +198,8 @@ public: const MapMode& GetPrefMapMode() const { return aPrefMapMode; } void SetPrefMapMode( const MapMode& rMapMode ) { aPrefMapMode = rMapMode; } - void SetHookHdl( const Link& rLink ) { aHookHdlLink = rLink; } - const Link& GetHookHdl() const { return aHookHdlLink; } + void SetHookHdl( const Link<>& rLink ) { aHookHdlLink = rLink; } + const Link<>& GetHookHdl() const { return aHookHdlLink; } sal_uLong GetChecksum() const; sal_uLong GetSizeBytes() const; diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index 1111dd46d533..778c6719c4c7 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -158,8 +158,8 @@ public: void StopAnimation( OutputDevice* pOutputDevice = NULL, long nExtraData = 0L ); - void SetAnimationNotifyHdl( const Link& rLink ); - Link GetAnimationNotifyHdl() const; + void SetAnimationNotifyHdl( const Link<>& rLink ); + Link<> GetAnimationNotifyHdl() const; sal_uLong GetAnimationLoopCount() const; diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index 5249d73600e5..44511930ec0b 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -315,7 +315,7 @@ public: const FilterErrorEx& GetLastError() const { return *pErrorEx;} void ResetLastError(); - const Link GetFilterCallback() const; + const Link<> GetFilterCallback() const; static GraphicFilter& GetGraphicFilter(); static int LoadGraphic( const OUString& rPath, const OUString& rFilter, Graphic& rGraphic, diff --git a/include/vcl/idle.hxx b/include/vcl/idle.hxx index 9cb734546fb0..64cd9674f383 100644 --- a/include/vcl/idle.hxx +++ b/include/vcl/idle.hxx @@ -26,7 +26,7 @@ class VCL_DLLPUBLIC Idle : public Scheduler { protected: - Link maIdleHdl; // Callback Link + Link<> maIdleHdl; // Callback Link public: Idle(); @@ -34,8 +34,8 @@ public: /// Make it possible to associate a callback with this idle handler /// of course, you can also sub-class and override 'Invoke' - void SetIdleHdl( const Link& rLink ) { maIdleHdl = rLink; } - const Link& GetIdleHdl() const { return maIdleHdl; } + void SetIdleHdl( const Link<>& rLink ) { maIdleHdl = rLink; } + const Link<>& GetIdleHdl() const { return maIdleHdl; } virtual void Invoke() SAL_OVERRIDE; Idle& operator=( const Idle& rIdle ); }; diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index bec9976a7317..85c613919020 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -544,15 +544,15 @@ public: return m_pDisclosureButton->GetText(); } virtual void StateChanged(StateChangedType nType) SAL_OVERRIDE; - void SetExpandedHdl( const Link& rLink ) { maExpandedHdl = rLink; } - const Link& GetExpandedHdl() const { return maExpandedHdl; } + void SetExpandedHdl( const Link<>& rLink ) { maExpandedHdl = rLink; } + const Link<>& GetExpandedHdl() const { return maExpandedHdl; } protected: virtual Size calculateRequisition() const SAL_OVERRIDE; virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; private: bool m_bResizeTopLevel; VclPtr<DisclosureButton> m_pDisclosureButton; - Link maExpandedHdl; + Link<> maExpandedHdl; DECL_DLLPRIVATE_LINK(ClickHdl, DisclosureButton* pBtn); }; diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index 5647f974f396..bd13541337c3 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -44,8 +44,8 @@ private: sal_uInt16 mnDDHeight; sal_Int32 mnSaveValue; sal_Int32 m_nMaxWidthChars; - Link maSelectHdl; - Link maDoubleClickHdl; + Link<> maSelectHdl; + Link<> maDoubleClickHdl; sal_uInt16 mnLineCount; /// bitfield @@ -190,10 +190,10 @@ public: void DrawEntry( const UserDrawEvent& rEvt, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos = false ); - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } - void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } - const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } + void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } + const Link<>& GetSelectHdl() const { return maSelectHdl; } + void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; } + const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; } Size CalcSubEditSize() const; //size of area inside lstbox, i.e. no scrollbar/dropdown Size CalcMinimumSize() const; //size of lstbox area, i.e. including scrollbar/dropdown diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 32dfd5a73d28..2af6a530cb27 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -126,10 +126,10 @@ private: Menu* pStartedFrom; VclPtr<vcl::Window> pWindow; - Link aActivateHdl; // Active-Handler - Link aDeactivateHdl; // Deactivate-Handler - Link aHighlightHdl; // Highlight-Handler - Link aSelectHdl; // Highlight-Handler + Link<> aActivateHdl; // Active-Handler + Link<> aDeactivateHdl; // Deactivate-Handler + Link<> aHighlightHdl; // Highlight-Handler + Link<> aSelectHdl; // Highlight-Handler VclEventListeners maEventListeners; VclEventListeners maChildEventListeners; @@ -320,24 +320,24 @@ public: void SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ); OString GetHelpId( sal_uInt16 nItemId ) const; - void SetActivateHdl( const Link& rLink ) { aActivateHdl = rLink; } - const Link& GetActivateHdl() const { return aActivateHdl; } + void SetActivateHdl( const Link<>& rLink ) { aActivateHdl = rLink; } + const Link<>& GetActivateHdl() const { return aActivateHdl; } - void SetDeactivateHdl( const Link& rLink ) { aDeactivateHdl = rLink; } - const Link& GetDeactivateHdl() const { return aDeactivateHdl; } + void SetDeactivateHdl( const Link<>& rLink ) { aDeactivateHdl = rLink; } + const Link<>& GetDeactivateHdl() const { return aDeactivateHdl; } - void SetHighlightHdl( const Link& rLink ) { aHighlightHdl = rLink; } - const Link& GetHighlightHdl() const { return aHighlightHdl; } + void SetHighlightHdl( const Link<>& rLink ) { aHighlightHdl = rLink; } + const Link<>& GetHighlightHdl() const { return aHighlightHdl; } - void SetSelectHdl( const Link& rLink ) { aSelectHdl = rLink; } - const Link& GetSelectHdl() const { return aSelectHdl; } + void SetSelectHdl( const Link<>& rLink ) { aSelectHdl = rLink; } + const Link<>& GetSelectHdl() const { return aSelectHdl; } bool HasLogo() const { return pLogo != nullptr; } - void AddEventListener( const Link& rEventListener ); - void RemoveEventListener( const Link& rEventListener ); - void AddChildEventListener( const Link& rEventListener ); - void RemoveChildEventListener( const Link& rEventListener ); + void AddEventListener( const Link<>& rEventListener ); + void RemoveEventListener( const Link<>& rEventListener ); + void AddChildEventListener( const Link<>& rEventListener ); + void RemoveChildEventListener( const Link<>& rEventListener ); Menu& operator =( const Menu& rMenu ); @@ -393,9 +393,9 @@ namespace vcl class VCL_DLLPUBLIC MenuBar : public Menu { - Link maCloseHdl; - Link maFloatHdl; - Link maHideHdl; + Link<> maCloseHdl; + Link<> maFloatHdl; + Link<> maHideHdl; bool mbCloseBtnVisible; bool mbFloatBtnVisible; bool mbHideBtnVisible; @@ -447,12 +447,12 @@ public: bool HandleMenuCommandEvent(Menu *pMenu, sal_uInt16 nEventId) const; bool HandleMenuButtonEvent(Menu *pMenu, sal_uInt16 nEventId); - void SetCloseButtonClickHdl( const Link& rLink ) { maCloseHdl = rLink; } - const Link& GetCloseButtonClickHdl() const { return maCloseHdl; } - void SetFloatButtonClickHdl( const Link& rLink ) { maFloatHdl = rLink; } - const Link& GetFloatButtonClickHdl() const { return maFloatHdl; } - void SetHideButtonClickHdl( const Link& rLink ) { maHideHdl = rLink; } - const Link& GetHideButtonClickHdl() const { return maHideHdl; } + void SetCloseButtonClickHdl( const Link<>& rLink ) { maCloseHdl = rLink; } + const Link<>& GetCloseButtonClickHdl() const { return maCloseHdl; } + void SetFloatButtonClickHdl( const Link<>& rLink ) { maFloatHdl = rLink; } + const Link<>& GetFloatButtonClickHdl() const { return maFloatHdl; } + void SetHideButtonClickHdl( const Link<>& rLink ) { maHideHdl = rLink; } + const Link<>& GetHideButtonClickHdl() const { return maHideHdl; } // - by default a menubar is displayable // - if a menubar is not displayable, its MenuBarWindow will never be shown @@ -470,11 +470,11 @@ public: // add an arbitrary button to the menubar (will appear next to closer) // passed link will be call with a MenuBarButtonCallbackArg on press // passed string will be set as tooltip - sal_uInt16 AddMenuBarButton( const Image&, const Link&, const OUString&, sal_uInt16 nPos = 0 ); + sal_uInt16 AddMenuBarButton( const Image&, const Link<>&, const OUString&, sal_uInt16 nPos = 0 ); // set the highlight link for additional button with ID nId // highlight link will be called with a MenuBarButtonHighlightArg // the bHighlight member of that struct shall contain the new state - void SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link& ); + void SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link<>& ); // returns the rectangle occupied by the additional button named nId // coordinates are relative to the systemwindiow the menubar is attached to // if the menubar is unattached an empty rectangle is returned diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index eb2c446a4a53..ffeaa19919bc 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -41,8 +41,8 @@ private: PopupMenu* mpMenu; sal_uInt16 mnCurItemId; sal_uInt16 mnMenuMode; - Link maActivateHdl; - Link maSelectHdl; + Link<> maActivateHdl; + Link<> maSelectHdl; SAL_DLLPRIVATE void ImplInitMenuButtonData(); DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, void* ); @@ -77,10 +77,10 @@ public: OString GetCurItemIdent() const; void SetCurItemId( sal_uInt16 nItemId ) { mnCurItemId = nItemId; } - void SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; } - const Link& GetActivateHdl() const { return maActivateHdl; } - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } + void SetActivateHdl( const Link<>& rLink ) { maActivateHdl = rLink; } + const Link<>& GetActivateHdl() const { return maActivateHdl; } + void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } + const Link<>& GetSelectHdl() const { return maSelectHdl; } }; #endif // INCLUDED_VCL_MENUBTN_HXX diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index be18fd06bb6a..e6d3b28c1638 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -227,7 +227,7 @@ private: bool mbInPrintPage; bool mbNewJobSetup; bool mbIsQueuePrinter; - Link maErrorHdl; + Link<> maErrorHdl; SAL_DLLPRIVATE void ImplInitData(); SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo ); @@ -372,8 +372,8 @@ public: sal_uLong GetError() const { return ERRCODE_TOERROR(mnError); } sal_uLong GetErrorCode() const { return mnError; } - void SetErrorHdl( const Link& rLink ) { maErrorHdl = rLink; } - const Link& GetErrorHdl() const { return maErrorHdl; } + void SetErrorHdl( const Link<>& rLink ) { maErrorHdl = rLink; } + const Link<>& GetErrorHdl() const { return maErrorHdl; } /** checks the printer list and updates it necessary * @@ -552,7 +552,7 @@ public: VCL_PLUGIN_PUBLIC PageSize getFilteredPageFile( int i_nFilteredPage, GDIMetaFile& o_rMtf, bool i_bMayUseCache = false ); VCL_PLUGIN_PUBLIC void printFilteredPage( int i_nPage ); SAL_DLLPRIVATE void setPrinter( const VclPtr<Printer>& ); - SAL_DLLPRIVATE void setOptionChangeHdl( const Link& ); + SAL_DLLPRIVATE void setOptionChangeHdl( const Link<>& ); VCL_PLUGIN_PUBLIC void createProgressDialog(); VCL_PLUGIN_PUBLIC bool isProgressCanceled() const; SAL_DLLPRIVATE void setMultipage( const MultiPageSetup& ); diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index 3a16f9e4359e..71bda7168c3b 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -65,8 +65,8 @@ private: ScrollType meDDScrollType; bool mbCalcSize; bool mbFullDrag; - Link maScrollHdl; - Link maEndScrollHdl; + Link<> maScrollHdl; + Link<> maEndScrollHdl; SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); using Window::ImplInit; @@ -134,10 +134,10 @@ public: long GetDelta() const { return mnDelta; } ScrollType GetType() const { return meScrollType; } - void SetScrollHdl( const Link& rLink ) { maScrollHdl = rLink; } - const Link& GetScrollHdl() const { return maScrollHdl; } - void SetEndScrollHdl( const Link& rLink ) { maEndScrollHdl = rLink; } - const Link& GetEndScrollHdl() const { return maEndScrollHdl; } + void SetScrollHdl( const Link<>& rLink ) { maScrollHdl = rLink; } + const Link<>& GetScrollHdl() const { return maScrollHdl; } + void SetEndScrollHdl( const Link<>& rLink ) { maEndScrollHdl = rLink; } + const Link<>& GetEndScrollHdl() const { return maEndScrollHdl; } virtual Size GetOptimalSize() const SAL_OVERRIDE; }; diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx index a2900309abe6..4f3677677e3b 100644 --- a/include/vcl/slider.hxx +++ b/include/vcl/slider.hxx @@ -50,8 +50,8 @@ private: ScrollType meScrollType; bool mbCalcSize; bool mbFullDrag; - Link maSlideHdl; - Link maEndSlideHdl; + Link<> maSlideHdl; + Link<> maEndSlideHdl; using Control::ImplInitSettings; using Window::ImplInit; @@ -107,10 +107,10 @@ public: Size CalcWindowSizePixel(); - void SetSlideHdl( const Link& rLink ) { maSlideHdl = rLink; } - const Link& GetSlideHdl() const { return maSlideHdl; } - void SetEndSlideHdl( const Link& rLink ) { maEndSlideHdl = rLink; } - const Link& GetEndSlideHdl() const { return maEndSlideHdl; } + void SetSlideHdl( const Link<>& rLink ) { maSlideHdl = rLink; } + const Link<>& GetSlideHdl() const { return maSlideHdl; } + void SetEndSlideHdl( const Link<>& rLink ) { maEndSlideHdl = rLink; } + const Link<>& GetEndSlideHdl() const { return maEndSlideHdl; } }; #endif // INCLUDED_VCL_SLIDER_HXX diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index a78f3b292b1f..1e40c6d6f017 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -43,8 +43,8 @@ private: bool mbInitialDown : 1; bool mbHorz : 1; bool mbUpperIsFocused : 1; - Link maUpHdlLink; - Link maDownHdlLink; + Link<> maUpHdlLink; + Link<> maDownHdlLink; long mnMinRange; long mnMaxRange; long mnValue; @@ -84,10 +84,10 @@ public: long GetValueStep() const { return mnValueStep; } virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void SetUpHdl( const Link& rLink ) { maUpHdlLink = rLink; } - const Link& GetUpHdl() const { return maUpHdlLink; } - void SetDownHdl( const Link& rLink ) { maDownHdlLink = rLink; } - const Link& GetDownHdl() const { return maDownHdlLink; } + void SetUpHdl( const Link<>& rLink ) { maUpHdlLink = rLink; } + const Link<>& GetUpHdl() const { return maUpHdlLink; } + void SetDownHdl( const Link<>& rLink ) { maDownHdlLink = rLink; } + const Link<>& GetDownHdl() const { return maDownHdlLink; } private: // moves the focus to the upper or lower rect. Return sal_True if the focus rect actually changed. diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index 20a3a43f3745..8060271d1777 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -34,10 +34,10 @@ protected: Rectangle maUpperRect; Rectangle maLowerRect; Rectangle maDropDownRect; // noch nicht angebunden... - Link maUpHdlLink; - Link maDownHdlLink; - Link maFirstHdlLink; - Link maLastHdlLink; + Link<> maUpHdlLink; + Link<> maDownHdlLink; + Link<> maFirstHdlLink; + Link<> maLastHdlLink; bool mbRepeat:1, mbSpin:1, mbInitialUp:1, @@ -89,14 +89,14 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void SetUpHdl( const Link& rLink ) { maUpHdlLink = rLink; } - const Link& GetUpHdl() const { return maUpHdlLink; } - void SetDownHdl( const Link& rLink ) { maDownHdlLink = rLink; } - const Link& GetDownHdl() const { return maDownHdlLink; } - void SetFirstHdl( const Link& rLink ) { maFirstHdlLink = rLink; } - const Link& GetFirstHdl() const { return maFirstHdlLink; } - void SetLastHdl( const Link& rLink ) { maLastHdlLink = rLink; } - const Link& GetLastHdl() const { return maLastHdlLink; } + void SetUpHdl( const Link<>& rLink ) { maUpHdlLink = rLink; } + const Link<>& GetUpHdl() const { return maUpHdlLink; } + void SetDownHdl( const Link<>& rLink ) { maDownHdlLink = rLink; } + const Link<>& GetDownHdl() const { return maDownHdlLink; } + void SetFirstHdl( const Link<>& rLink ) { maFirstHdlLink = rLink; } + const Link<>& GetFirstHdl() const { return maFirstHdlLink; } + void SetLastHdl( const Link<>& rLink ) { maLastHdlLink = rLink; } + const Link<>& GetLastHdl() const { return maLastHdlLink; } virtual Size CalcMinimumSize() const SAL_OVERRIDE; virtual Size CalcMinimumSizeForText(const OUString &rString) const SAL_OVERRIDE; diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index 91a1c0df99c5..a9a185bb67eb 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -39,9 +39,9 @@ private: bool mbKbdSplitting; long mbInKeyEvent; long mnKeyboardStepSize; - Link maStartSplitHdl; - Link maSplitHdl; - Link maEndSplitHdl; + Link<> maStartSplitHdl; + Link<> maSplitHdl; + Link<> maEndSplitHdl; SAL_DLLPRIVATE void ImplInitSplitterData(); SAL_DLLPRIVATE void ImplDrawSplitter(); @@ -99,12 +99,12 @@ public: // the default is 10% of the reference window's width/height void SetKeyboardStepSize( long nStepSize ); - void SetStartSplitHdl( const Link& rLink ) { maStartSplitHdl = rLink; } - const Link& GetStartSplitHdl() const { return maStartSplitHdl; } - void SetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; } - void SetEndSplitHdl( const Link& rLink ) { maEndSplitHdl = rLink; } - const Link& GetEndSplitHdl() const { return maEndSplitHdl; } - const Link& GetSplitHdl() const { return maSplitHdl; } + void SetStartSplitHdl( const Link<>& rLink ) { maStartSplitHdl = rLink; } + const Link<>& GetStartSplitHdl() const { return maStartSplitHdl; } + void SetSplitHdl( const Link<>& rLink ) { maSplitHdl = rLink; } + void SetEndSplitHdl( const Link<>& rLink ) { maEndSplitHdl = rLink; } + const Link<>& GetEndSplitHdl() const { return maEndSplitHdl; } + const Link<>& GetSplitHdl() const { return maSplitHdl; } }; #endif // INCLUDED_VCL_SPLIT_HXX diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index d0ffa134a10a..08ea8f5c7871 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -78,12 +78,12 @@ private: mbFadeOutPressed:1, mbFadeNoButtonMode:1, mbNoAlign:1; - Link maStartSplitHdl; - Link maSplitHdl; - Link maSplitResizeHdl; - Link maAutoHideHdl; - Link maFadeInHdl; - Link maFadeOutHdl; + Link<> maStartSplitHdl; + Link<> maSplitHdl; + Link<> maSplitResizeHdl; + Link<> maAutoHideHdl; + Link<> maFadeInHdl; + Link<> maFadeOutHdl; using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); @@ -203,18 +203,18 @@ public: void SetAutoHideState( bool bAutoHide ); bool GetAutoHideState() const { return mbAutoHideIn; } - void SetStartSplitHdl( const Link& rLink ) { maStartSplitHdl = rLink; } - const Link& GetStartSplitHdl() const { return maStartSplitHdl; } - void SetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; } - const Link& GetSplitHdl() const { return maSplitHdl; } - void SetSplitResizeHdl( const Link& rLink ) { maSplitResizeHdl = rLink; } - const Link& GetSplitResizeHdl() const { return maSplitResizeHdl; } - void SetAutoHideHdl( const Link& rLink ) { maAutoHideHdl = rLink; } - const Link& GetAutoHideHdl() const { return maAutoHideHdl; } - void SetFadeInHdl( const Link& rLink ) { maFadeInHdl = rLink; } - const Link& GetFadeInHdl() const { return maFadeInHdl; } - void SetFadeOutHdl( const Link& rLink ) { maFadeOutHdl = rLink; } - const Link& GetFadeOutHdl() const { return maFadeOutHdl; } + void SetStartSplitHdl( const Link<>& rLink ) { maStartSplitHdl = rLink; } + const Link<>& GetStartSplitHdl() const { return maStartSplitHdl; } + void SetSplitHdl( const Link<>& rLink ) { maSplitHdl = rLink; } + const Link<>& GetSplitHdl() const { return maSplitHdl; } + void SetSplitResizeHdl( const Link<>& rLink ) { maSplitResizeHdl = rLink; } + const Link<>& GetSplitResizeHdl() const { return maSplitResizeHdl; } + void SetAutoHideHdl( const Link<>& rLink ) { maAutoHideHdl = rLink; } + const Link<>& GetAutoHideHdl() const { return maAutoHideHdl; } + void SetFadeInHdl( const Link<>& rLink ) { maFadeInHdl = rLink; } + const Link<>& GetFadeInHdl() const { return maFadeInHdl; } + void SetFadeOutHdl( const Link<>& rLink ) { maFadeOutHdl = rLink; } + const Link<>& GetFadeOutHdl() const { return maFadeOutHdl; } }; #endif // INCLUDED_VCL_SPLITWIN_HXX diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 50b52f981a91..f0fdbf653f25 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -93,8 +93,8 @@ private: bool mbProgressMode; bool mbInUserDraw; bool mbAdjustHiDPI; - Link maClickHdl; - Link maDoubleClickHdl; + Link<> maClickHdl; + Link<> maDoubleClickHdl; using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); @@ -198,10 +198,10 @@ public: Size CalcWindowSizePixel() const; - void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } - const Link& GetClickHdl() const { return maClickHdl; } - void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } - const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } + void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; } + const Link<>& GetClickHdl() const { return maClickHdl; } + void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; } + const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; } using Window::SetAccessibleName; void SetAccessibleName( sal_uInt16 nItemId, const OUString& rName ); diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 720bf7eeeecf..a576a2c479b8 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -42,7 +42,6 @@ #include <o3tl/typed_flags_set.hxx> class BitmapEx; -class Link; class AllSettings; class DataChangedEvent; class Accelerator; @@ -591,7 +590,7 @@ public: GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex, EnableNoYieldMode, DisableNoYieldMode, RemovePostYieldListener */ - static void AddPostYieldListener( const Link& i_rListener ); + static void AddPostYieldListener( const Link<>& i_rListener ); /** Remove listener for yield events @@ -601,7 +600,7 @@ public: GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex, AddPostYieldListener, EnableNoYieldMode, DisableNoYieldMode */ - static void RemovePostYieldListener( const Link& i_rListener ); + static void RemovePostYieldListener( const Link<>& i_rListener ); /** Queries whether the application is in "main", i.e. not yet in @@ -755,7 +754,7 @@ public: @see RemoveEventListener, AddKeyListener, RemoveKeyListener */ - static void AddEventListener( const Link& rEventListener ); + static void AddEventListener( const Link<>& rEventListener ); /** Remove a VCL event listener from the application. @@ -763,7 +762,7 @@ public: @see AddEventListener, AddKeyListener, RemoveKeyListener */ - static void RemoveEventListener( const Link& rEventListener ); + static void RemoveEventListener( const Link<>& rEventListener ); /** Add a keypress listener to the application. If keypress listener exists, then initialize the application's keypress event listener with a new one, then @@ -773,7 +772,7 @@ public: @see AddEventListener, RemoveEventListener, RemoveKeyListener */ - static void AddKeyListener( const Link& rKeyListener ); + static void AddKeyListener( const Link<>& rKeyListener ); /** Remove a keypress listener from the application. @@ -781,7 +780,7 @@ public: @see AddEventListener, RemoveEventListener, AddKeyListener */ - static void RemoveKeyListener( const Link& rKeyListener ); + static void RemoveKeyListener( const Link<>& rKeyListener ); /** Send event to all VCL application event listeners @@ -869,7 +868,7 @@ public: @return the event ID used to post the event. */ - static ImplSVEvent * PostUserEvent( const Link& rLink, void* pCaller = NULL ); + static ImplSVEvent * PostUserEvent( const Link<>& rLink, void* pCaller = NULL ); /** Remove user event based on event ID @@ -887,13 +886,13 @@ public: @return true if the handler was inserted successfully, false if it couldn't be inserted. */ - static bool InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ); + static bool InsertIdleHdl( const Link<>& rLink, sal_uInt16 nPriority ); /** Remove an idle handler from the application. @param rLink const reference to the idle handler to remove */ - static void RemoveIdleHdl( const Link& rLink ); + static void RemoveIdleHdl( const Link<>& rLink ); /*** Get the DisplayConnection. @@ -1359,13 +1358,13 @@ public: @see GetFilterHdl */ - static void SetFilterHdl( const Link& rLink ); + static void SetFilterHdl( const Link<>& rLink ); /*** Get a new graphics filter @return Const reference to the Link object (the filter) */ - static const Link& GetFilterHdl(); + static const Link<>& GetFilterHdl(); ///@} @@ -1504,7 +1503,7 @@ public: ///@} // For vclbootstrapprotector: - static void setDeInitHook(Link const & hook); + static void setDeInitHook(Link<> const & hook); private: @@ -1703,7 +1702,7 @@ VCL_DLLPUBLIC void JoinMainLoopThread(); inline void Application::EndYield() { - PostUserEvent( Link() ); + PostUserEvent( Link<>() ); } namespace vcl diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index f90fb16bfeea..29ed4b4225ed 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -267,8 +267,8 @@ public: void SetApplicationID( const OUString &rApplicationID ); - void SetCloseHdl(const Link& rLink); - const Link& GetCloseHdl() const; + void SetCloseHdl(const Link<>& rLink); + const Link<>& GetCloseHdl() const; SAL_DLLPRIVATE bool hasPendingLayout() const { return maLayoutIdle.IsActive(); } diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index 05fd48e9cef7..df8e6ffb6669 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -49,8 +49,8 @@ private: bool mbRestoreUnqId; bool mbSmallInvalidate; bool mbLayoutDirty; - Link maActivateHdl; - Link maDeactivateHdl; + Link<> maActivateHdl; + Link<> maDeactivateHdl; using Control::ImplInitSettings; SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); @@ -160,10 +160,10 @@ public: const OString& GetHelpId() const { return Control::GetHelpId(); } - void SetActivatePageHdl( const Link& rLink ) { maActivateHdl = rLink; } - const Link& GetActivatePageHdl() const { return maActivateHdl; } - void SetDeactivatePageHdl( const Link& rLink ) { maDeactivateHdl = rLink; } - const Link& GetDeactivatePageHdl() const { return maDeactivateHdl; } + void SetActivatePageHdl( const Link<>& rLink ) { maActivateHdl = rLink; } + const Link<>& GetActivatePageHdl() const { return maActivateHdl; } + void SetDeactivatePageHdl( const Link<>& rLink ) { maDeactivateHdl = rLink; } + const Link<>& GetDeactivatePageHdl() const { return maDeactivateHdl; } // returns (control relative) bounding rectangle for the // character at index nIndex relative to the text of page nPageId diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index 8ab238a293bd..c1779ce04294 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -26,7 +26,7 @@ class VCL_DLLPUBLIC Timer : public Scheduler { protected: - Link maTimeoutHdl; // Callback Link + Link<> maTimeoutHdl; // Callback Link sal_uInt64 mnTimeout; bool mbAuto; @@ -43,8 +43,8 @@ public: /// Make it possible to associate a callback with this timer handler /// of course, you can also sub-class and override 'Invoke' - void SetTimeoutHdl( const Link& rLink ) { maTimeoutHdl = rLink; } - const Link& GetTimeoutHdl() const { return maTimeoutHdl; } + void SetTimeoutHdl( const Link<>& rLink ) { maTimeoutHdl = rLink; } + const Link<>& GetTimeoutHdl() const { return maTimeoutHdl; } void SetTimeout( sal_uInt64 nTimeoutMs ); sal_uInt64 GetTimeout() const { return mnTimeout; } virtual void Invoke() SAL_OVERRIDE; diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index b03f05174a01..661ea918a641 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -185,15 +185,15 @@ private: PointerStyle meLastStyle; WinBits mnWinStyle; ToolBoxLayoutMode meLayoutMode; - Link maClickHdl; - Link maDoubleClickHdl; - Link maActivateHdl; - Link maDeactivateHdl; - Link maHighlightHdl; - Link maSelectHdl; - Link maCommandHandler; - Link maStateChangedHandler; - Link maDataChangedHandler; + Link<> maClickHdl; + Link<> maDoubleClickHdl; + Link<> maActivateHdl; + Link<> maDeactivateHdl; + Link<> maHighlightHdl; + Link<> maSelectHdl; + Link<> maCommandHandler; + Link<> maStateChangedHandler; + Link<> maDataChangedHandler; public: using Window::ImplInit; @@ -495,26 +495,26 @@ public: using DockingWindow::SetHelpId; using DockingWindow::GetHelpId; - void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } - const Link& GetClickHdl() const { return maClickHdl; } - void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } - const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } - void SetDropdownClickHdl( const Link& rLink ); - const Link& GetDropdownClickHdl() const; - void SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; } - const Link& GetActivateHdl() const { return maActivateHdl; } - void SetDeactivateHdl( const Link& rLink ) { maDeactivateHdl = rLink; } - const Link& GetDeactivateHdl() const { return maDeactivateHdl; } - void SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; } - const Link& GetHighlightHdl() const { return maHighlightHdl; } - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } - void SetCommandHdl( const Link& aLink ) { maCommandHandler = aLink; } - const Link& GetCommandHdl() const { return maCommandHandler; } - void SetStateChangedHdl( const Link& aLink ) { maStateChangedHandler = aLink; } - const Link& GetStateChangedHdl() const { return maStateChangedHandler; } - void SetDataChangedHdl( const Link& aLink ) { maDataChangedHandler = aLink; } - const Link& GetDataChangedHdl() { return maDataChangedHandler; } + void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; } + const Link<>& GetClickHdl() const { return maClickHdl; } + void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; } + const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; } + void SetDropdownClickHdl( const Link<>& rLink ); + const Link<>& GetDropdownClickHdl() const; + void SetActivateHdl( const Link<>& rLink ) { maActivateHdl = rLink; } + const Link<>& GetActivateHdl() const { return maActivateHdl; } + void SetDeactivateHdl( const Link<>& rLink ) { maDeactivateHdl = rLink; } + const Link<>& GetDeactivateHdl() const { return maDeactivateHdl; } + void SetHighlightHdl( const Link<>& rLink ) { maHighlightHdl = rLink; } + const Link<>& GetHighlightHdl() const { return maHighlightHdl; } + void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } + const Link<>& GetSelectHdl() const { return maSelectHdl; } + void SetCommandHdl( const Link<>& aLink ) { maCommandHandler = aLink; } + const Link<>& GetCommandHdl() const { return maCommandHandler; } + void SetStateChangedHdl( const Link<>& aLink ) { maStateChangedHandler = aLink; } + const Link<>& GetStateChangedHdl() const { return maStateChangedHandler; } + void SetDataChangedHdl( const Link<>& aLink ) { maDataChangedHandler = aLink; } + const Link<>& GetDataChangedHdl() { return maDataChangedHandler; } // support for custom menu (eg for configuration) // note: this menu will also be used to display currently @@ -528,7 +528,7 @@ public: bool IsMenuEnabled() const; PopupMenu* GetMenu() const; void UpdateCustomMenu(); - void SetMenuButtonHdl( const Link& rLink ); + void SetMenuButtonHdl( const Link<>& rLink ); // open custommenu void ExecuteCustomMenu(); diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx index 99f329e8da65..5729e1d4fcd5 100644 --- a/include/vcl/vclevent.hxx +++ b/include/vcl/vclevent.hxx @@ -261,22 +261,22 @@ public: // and returns true in that case // a handler must return true to signal that it has processed the event bool Process( VclSimpleEvent* pEvent ) const; - void addListener( const Link& rListener ); - void removeListener( const Link& rListener ); + void addListener( const Link<>& rListener ); + void removeListener( const Link<>& rListener ); private: - std::list<Link> m_aListeners; + std::list<Link<>> m_aListeners; }; class VCL_DLLPUBLIC VclEventListeners2 : public vcl::DeletionNotifier { - std::list< Link > m_aListeners; + std::list< Link<> > m_aListeners; struct ListenerIt { - std::list< Link >::iterator m_aIt; + std::list< Link<> >::iterator m_aIt; bool m_bWasInvalidated; - ListenerIt(const std::list<Link>::iterator& rIt) + ListenerIt(const std::list<Link<>>::iterator& rIt) : m_aIt(rIt) , m_bWasInvalidated( false ) {} @@ -289,8 +289,8 @@ public: VclEventListeners2(); ~VclEventListeners2(); - void addListener( const Link& ); - void removeListener( const Link& ); + void addListener( const Link<>& ); + void removeListener( const Link<>& ); void callListeners( VclSimpleEvent* ); }; diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index 034c25412969..441edcd45bf4 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -36,10 +36,10 @@ private: ImpVclMEdit* pImpVclMEdit; OUString aSaveValue; - Link aModifyHdlLink; + Link<> aModifyHdlLink; Timer* pUpdateDataTimer; - Link aUpdateDataHdlLink; + Link<> aUpdateDataHdlLink; protected: @@ -109,10 +109,10 @@ public: const OUString& GetSavedValue() const { return aSaveValue; } bool IsValueChangedFromSaved() const { return aSaveValue != GetText(); } - void SetModifyHdl( const Link& rLink ) SAL_OVERRIDE { aModifyHdlLink = rLink; } - const Link& GetModifyHdl() const SAL_OVERRIDE { return aModifyHdlLink; } + void SetModifyHdl( const Link<>& rLink ) SAL_OVERRIDE { aModifyHdlLink = rLink; } + const Link<>& GetModifyHdl() const SAL_OVERRIDE { return aModifyHdlLink; } - void SetUpdateDataHdl( const Link& rLink ) SAL_OVERRIDE { aUpdateDataHdlLink = rLink; } + void SetUpdateDataHdl( const Link<>& rLink ) SAL_OVERRIDE { aUpdateDataHdlLink = rLink; } virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index cde2c864f248..ccee88b2c20d 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -722,12 +722,12 @@ public: virtual bool Notify( NotifyEvent& rNEvt ); virtual vcl::Window* GetPreferredKeyInputWindow(); - void AddEventListener( const Link& rEventListener ); - void RemoveEventListener( const Link& rEventListener ); - void AddChildEventListener( const Link& rEventListener ); - void RemoveChildEventListener( const Link& rEventListener ); + void AddEventListener( const Link<>& rEventListener ); + void RemoveEventListener( const Link<>& rEventListener ); + void AddChildEventListener( const Link<>& rEventListener ); + void RemoveChildEventListener( const Link<>& rEventListener ); - ImplSVEvent * PostUserEvent( const Link& rLink, void* pCaller = NULL ); + ImplSVEvent * PostUserEvent( const Link<>& rLink, void* pCaller = NULL ); void RemoveUserEvent( ImplSVEvent * nUserEvent ); void IncrementLockCount(); |