diff options
author | Herbert Dürr <hdu@apache.org> | 2013-01-14 14:08:03 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-10 15:44:40 +0100 |
commit | 1fd78e48caf1d0a7908dbc8ecd552c7f0d9d7b6d (patch) | |
tree | d53ce03c4fa8e3dfa0f9e51e893d3f99d0b36b52 /include/vcl | |
parent | Updated core (diff) | |
download | core-1fd78e48caf1d0a7908dbc8ecd552c7f0d9d7b6d.tar.gz core-1fd78e48caf1d0a7908dbc8ecd552c7f0d9d7b6d.zip |
make some important single-parameter constructors explicit
for symmetry also the other constructors in the same class
and mark their destructors as virtual if they are anyway
(cherry picked from commit 870349eada8c0e56d58c8d2ee40ad561a9f982fe)
Conflicts:
vcl/inc/vcl/button.hxx
vcl/inc/vcl/combobox.hxx
vcl/inc/vcl/ctrl.hxx
vcl/inc/vcl/dialog.hxx
vcl/inc/vcl/dockingarea.hxx
vcl/inc/vcl/event.hxx
vcl/inc/vcl/field.hxx
vcl/inc/vcl/fixed.hxx
vcl/inc/vcl/floatwin.hxx
vcl/inc/vcl/fontmanager.hxx
vcl/inc/vcl/group.hxx
vcl/inc/vcl/lstbox.hxx
vcl/inc/vcl/menu.hxx
vcl/inc/vcl/menubtn.hxx
vcl/inc/vcl/metaact.hxx
vcl/inc/vcl/morebtn.hxx
vcl/inc/vcl/pngread.hxx
vcl/inc/vcl/scrbar.hxx
vcl/inc/vcl/spin.hxx
vcl/inc/vcl/spinfld.hxx
vcl/inc/vcl/split.hxx
vcl/inc/vcl/syschild.hxx
vcl/inc/vcl/tabpage.hxx
vcl/inc/vcl/virdev.hxx
vcl/inc/vcl/wrkwin.hxx
Change-Id: I8c29f74208cf382a9baa01c2e2d0757688cb4641
Diffstat (limited to 'include/vcl')
-rw-r--r-- | include/vcl/button.hxx | 52 | ||||
-rw-r--r-- | include/vcl/combobox.hxx | 8 | ||||
-rw-r--r-- | include/vcl/ctrl.hxx | 6 | ||||
-rw-r--r-- | include/vcl/dialog.hxx | 18 | ||||
-rw-r--r-- | include/vcl/dockingarea.hxx | 4 | ||||
-rw-r--r-- | include/vcl/event.hxx | 18 | ||||
-rw-r--r-- | include/vcl/field.hxx | 68 | ||||
-rw-r--r-- | include/vcl/fixed.hxx | 24 | ||||
-rw-r--r-- | include/vcl/floatwin.hxx | 6 | ||||
-rw-r--r-- | include/vcl/fontmanager.hxx | 2 | ||||
-rw-r--r-- | include/vcl/group.hxx | 4 | ||||
-rw-r--r-- | include/vcl/lstbox.hxx | 12 | ||||
-rw-r--r-- | include/vcl/menu.hxx | 8 | ||||
-rw-r--r-- | include/vcl/menubtn.hxx | 6 | ||||
-rw-r--r-- | include/vcl/metaact.hxx | 44 | ||||
-rw-r--r-- | include/vcl/morebtn.hxx | 6 | ||||
-rw-r--r-- | include/vcl/pngread.hxx | 2 | ||||
-rw-r--r-- | include/vcl/scrbar.hxx | 8 | ||||
-rw-r--r-- | include/vcl/spin.hxx | 4 | ||||
-rw-r--r-- | include/vcl/spinfld.hxx | 8 | ||||
-rw-r--r-- | include/vcl/split.hxx | 6 | ||||
-rw-r--r-- | include/vcl/syschild.hxx | 6 | ||||
-rw-r--r-- | include/vcl/tabpage.hxx | 6 | ||||
-rw-r--r-- | include/vcl/virdev.hxx | 8 | ||||
-rw-r--r-- | include/vcl/wrkwin.hxx | 10 |
25 files changed, 172 insertions, 172 deletions
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 8c116b0644dd..e57ea3cbed26 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -61,10 +61,10 @@ public: SAL_DLLPRIVATE void ImplSetSeparatorX( long nX ); protected: - Button( WindowType nType ); + explicit Button( WindowType nType ); public: - ~Button(); + virtual ~Button(); virtual void Click(); @@ -136,7 +136,7 @@ public: SAL_DLLPRIVATE sal_Bool ImplIsDefButton() const; protected: - PushButton( WindowType nType ); + explicit PushButton( WindowType nType ); virtual void FillLayoutData() const; virtual const Font& @@ -144,9 +144,9 @@ protected: virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const; public: - PushButton( Window* pParent, WinBits nStyle = 0 ); - PushButton( Window* pParent, const ResId& rResId ); - ~PushButton(); + explicit PushButton( Window* pParent, WinBits nStyle = 0 ); + explicit PushButton( Window* pParent, const ResId& ); + virtual ~PushButton(); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void Tracking( const TrackingEvent& rTEvt ); @@ -219,8 +219,8 @@ private: SAL_DLLPRIVATE OKButton & operator= (const OKButton &); public: - OKButton( Window* pParent, WinBits nStyle = WB_DEFBUTTON ); - OKButton( Window* pParent, const ResId& rResId ); + explicit OKButton( Window* pParent, WinBits nStyle = WB_DEFBUTTON ); + explicit OKButton( Window* pParent, const ResId& ); virtual void Click(); }; @@ -241,8 +241,8 @@ private: SAL_DLLPRIVATE CancelButton & operator= (const CancelButton &); public: - CancelButton( Window* pParent, WinBits nStyle = 0 ); - CancelButton( Window* pParent, const ResId& rResId ); + explicit CancelButton( Window* pParent, WinBits nStyle = 0 ); + explicit CancelButton( Window* pParent, const ResId& ); virtual void Click(); }; @@ -250,7 +250,7 @@ public: class VCL_DLLPUBLIC CloseButton : public CancelButton { public: - CloseButton(Window* pParent, WinBits nStyle = 0); + explicit CloseButton(Window* pParent, WinBits nStyle = 0); }; @@ -270,8 +270,8 @@ private: SAL_DLLPRIVATE HelpButton & operator= ( const HelpButton & ); public: - HelpButton( Window* pParent, WinBits nStyle = 0 ); - HelpButton( Window* pParent, const ResId& rResId ); + explicit HelpButton( Window* pParent, WinBits nStyle = 0 ); + explicit HelpButton( Window* pParent, const ResId& ); virtual void Click(); }; @@ -342,9 +342,9 @@ protected: void DrawRadioButtonState( ); public: - RadioButton( Window* pParent, WinBits nWinStyle = 0 ); - RadioButton( Window* pParent, const ResId& rResId ); - ~RadioButton(); + explicit RadioButton( Window* pParent, WinBits nWinStyle = 0 ); + explicit RadioButton( Window* pParent, const ResId& ); + virtual ~RadioButton(); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void Tracking( const TrackingEvent& rTEvt ); @@ -460,8 +460,8 @@ public: SAL_DLLPRIVATE void ImplCheck(); SAL_DLLPRIVATE void ImplSetMinimumNWFSize(); public: - CheckBox( Window* pParent, WinBits nStyle = 0 ); - CheckBox( Window* pParent, const ResId& rResId ); + explicit CheckBox( Window* pParent, WinBits nStyle = 0 ); + explicit CheckBox( Window* pParent, const ResId& ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void Tracking( const TrackingEvent& rTEvt ); @@ -541,9 +541,9 @@ class VCL_DLLPUBLIC ImageRadioButton : public RadioButton SAL_DLLPRIVATE ImageRadioButton & operator= ( const ImageRadioButton & ); public: - ImageRadioButton( Window* pParent, WinBits nStyle = 0 ); - ImageRadioButton( Window* pParent, const ResId& rResId ); - ~ImageRadioButton(); + explicit ImageRadioButton( Window* pParent, WinBits nStyle = 0 ); + explicit ImageRadioButton( Window* pParent, const ResId& ); + virtual ~ImageRadioButton(); }; class VCL_DLLPUBLIC TriStateBox : public CheckBox @@ -553,9 +553,9 @@ class VCL_DLLPUBLIC TriStateBox : public CheckBox SAL_DLLPRIVATE TriStateBox & operator= ( const TriStateBox & ); public: - TriStateBox( Window* pParent, WinBits nStyle = 0 ); - TriStateBox( Window* pParent, const ResId& rResId ); - ~TriStateBox(); + explicit TriStateBox( Window* pParent, WinBits nStyle = 0 ); + explicit TriStateBox( Window* pParent, const ResId& ); + virtual ~TriStateBox(); }; class VCL_DLLPUBLIC DisclosureButton : public CheckBox @@ -563,8 +563,8 @@ class VCL_DLLPUBLIC DisclosureButton : public CheckBox protected: SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState(); public: - DisclosureButton( Window* pParent, WinBits nStyle = 0 ); - DisclosureButton( Window* pParent, const ResId& rResId ); + explicit DisclosureButton( Window* pParent, WinBits nStyle = 0 ); + explicit DisclosureButton( Window* pParent, const ResId& rResId ); virtual void KeyInput( const KeyEvent& rKEvt ); }; diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index f0637109716a..63518749a494 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -84,14 +84,14 @@ protected: SAL_DLLPRIVATE long getMaxWidthScrollBarAndDownButton() const; protected: - ComboBox( WindowType nType ); + explicit ComboBox( WindowType nType ); sal_Bool IsDropDownBox() const { return mpFloatWin ? sal_True : sal_False; } virtual void FillLayoutData() const; public: - ComboBox( Window* pParent, WinBits nStyle = 0 ); - ComboBox( Window* pParent, const ResId& rResId ); - ~ComboBox(); + explicit ComboBox( Window* pParent, WinBits nStyle = 0 ); + explicit ComboBox( Window* pParent, const ResId& ); + virtual ~ComboBox(); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 390f416ae142..1b3a6d153326 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -124,9 +124,9 @@ public: SAL_DLLPRIVATE void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect ); public: - Control( Window* pParent, WinBits nWinStyle = 0 ); - Control( Window* pParent, const ResId& rResId ); - ~Control(); + explicit Control( Window* pParent, WinBits nWinStyle = 0 ); + explicit Control( Window* pParent, const ResId& ); + virtual ~Control(); virtual void GetFocus(); virtual void LoseFocus(); diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index d7994c61580e..a8737d15395f 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -81,8 +81,8 @@ public: SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDefferedInit; } protected: - Dialog( WindowType nType ); - Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType ); + explicit Dialog( WindowType nType ); + explicit Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType ); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); protected: @@ -91,8 +91,8 @@ protected: void set_content_area(VclBox *pBox); public: - Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG ); - Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + explicit Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG ); + explicit Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~Dialog(); virtual long Notify( NotifyEvent& rNEvt ); @@ -152,8 +152,8 @@ class VCL_DLLPUBLIC ModelessDialog : public Dialog SAL_DLLPRIVATE ModelessDialog & operator= (const ModelessDialog &); public: - ModelessDialog( Window* pParent, const ResId& rResId ); - ModelessDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + explicit ModelessDialog( Window* pParent, const ResId& rResId ); + explicit ModelessDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); }; // --------------- @@ -163,9 +163,9 @@ public: class VCL_DLLPUBLIC ModalDialog : public Dialog { public: - ModalDialog( Window* pParent, WinBits nStyle = WB_STDMODAL ); - ModalDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); - ModalDialog( Window* pParent, const ResId& rResId ); + explicit ModalDialog( Window* pParent, WinBits nStyle = WB_STDMODAL ); + explicit ModalDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + explicit ModalDialog( Window* pParent, const ResId& rResId ); protected: using Window::Show; diff --git a/include/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx index a5778519e3ae..722cf2a3d698 100644 --- a/include/vcl/dockingarea.hxx +++ b/include/vcl/dockingarea.hxx @@ -40,8 +40,8 @@ private: SAL_DLLPRIVATE DockingAreaWindow & operator= (const DockingAreaWindow &); public: - DockingAreaWindow( Window *pParent ); - ~DockingAreaWindow(); + explicit DockingAreaWindow( Window* pParent ); + virtual ~DockingAreaWindow(); void SetAlign( WindowAlign eNewAlign ); WindowAlign GetAlign() const; diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index e89d52ad1e9a..1d3c76e0ba7b 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -118,8 +118,8 @@ private: sal_uInt16 mnCode; public: - MouseEvent(); - MouseEvent( const Point& rPos, sal_uInt16 nClicks = 1, + explicit MouseEvent(); + explicit MouseEvent( const Point& rPos, sal_uInt16 nClicks = 1, sal_uInt16 nMode = 0, sal_uInt16 nButtons = 0, sal_uInt16 nModifier = 0 ); @@ -254,9 +254,9 @@ private: sal_Bool mbKeyboardActivated; public: - HelpEvent(); - HelpEvent( sal_uInt16 nHelpMode ); - HelpEvent( const Point& rMousePos, sal_uInt16 nHelpMode ); + explicit HelpEvent(); + explicit HelpEvent( sal_uInt16 nHelpMode ); + explicit HelpEvent( const Point& rMousePos, sal_uInt16 nHelpMode ); const Point& GetMousePosPixel() const; sal_uInt16 GetMode() const { return mnMode; } @@ -347,8 +347,8 @@ private: sal_uInt16 mnFlags; public: - TrackingEvent(); - TrackingEvent( const MouseEvent& rMEvt, + explicit TrackingEvent(); + explicit TrackingEvent( const MouseEvent&, sal_uInt16 nTrackFlags = 0 ); const MouseEvent& GetMouseEvent() const { return maMEvt; } @@ -481,8 +481,8 @@ private: sal_uInt16 mnType; public: - DataChangedEvent(); - DataChangedEvent( sal_uInt16 nType, + explicit DataChangedEvent(); + explicit DataChangedEvent( sal_uInt16 nType, const void* pData = NULL, sal_uLong nFlags = 0 ); diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index babab8da29d2..97ff8f1136ad 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -60,7 +60,7 @@ protected: sal_Bool IsDefaultLocale() const { return mbDefaultLocale; } public: - FormatterBase( Edit* pField = NULL ); + explicit FormatterBase( Edit* pField = NULL ); virtual ~FormatterBase(); const LocaleDataWrapper& GetLocaleDataWrapper() const; @@ -119,7 +119,7 @@ protected: SAL_DLLPRIVATE sal_Bool& ImplGetInPattKeyInput() { return mbInPattKeyInput; } public: - ~PatternFormatter(); + virtual ~PatternFormatter(); virtual void Reformat(); @@ -175,7 +175,7 @@ protected: SAL_DLLPRIVATE void ImplSetUserValue( sal_Int64 nNewValue, Selection* pNewSelection = NULL ); public: - ~NumericFormatter(); + virtual ~NumericFormatter(); virtual void Reformat(); @@ -235,7 +235,7 @@ protected: SAL_DLLPRIVATE sal_Bool ImplMetricReformat( const OUString& rStr, double& rValue, OUString& rOutStr ); public: - ~MetricFormatter(); + virtual ~MetricFormatter(); virtual void CustomConvert() = 0; virtual void Reformat(); @@ -286,7 +286,7 @@ protected: SAL_DLLPRIVATE sal_Bool ImplCurrencyReformat( const OUString& rStr, OUString& rOutStr ); public: - ~CurrencyFormatter(); + virtual ~CurrencyFormatter(); virtual void Reformat(); @@ -336,7 +336,7 @@ protected: SAL_DLLPRIVATE sal_Bool ImplAllowMalformedInput() const; public: - ~DateFormatter(); + virtual ~DateFormatter(); virtual void Reformat(); virtual void ReformatAll(); @@ -431,7 +431,7 @@ public: HOUR_24 }; - ~TimeFormatter(); + virtual ~TimeFormatter(); virtual void Reformat(); virtual void ReformatAll(); @@ -483,8 +483,8 @@ public: class VCL_DLLPUBLIC PatternField : public SpinField, public PatternFormatter { public: - PatternField( Window* pParent, WinBits nWinStyle ); - ~PatternField(); + explicit PatternField( Window* pParent, WinBits nWinStyle ); + virtual ~PatternField(); virtual long PreNotify( NotifyEvent& rNEvt ); virtual long Notify( NotifyEvent& rNEvt ); @@ -502,9 +502,9 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - NumericField( Window* pParent, WinBits nWinStyle ); - NumericField( Window* pParent, const ResId& rResId ); - ~NumericField(); + explicit NumericField( Window* pParent, WinBits nWinStyle ); + explicit NumericField( Window* pParent, const ResId& ); + virtual ~NumericField(); virtual long PreNotify( NotifyEvent& rNEvt ); virtual long Notify( NotifyEvent& rNEvt ); @@ -532,9 +532,9 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - MetricField( Window* pParent, WinBits nWinStyle ); - MetricField( Window* pParent, const ResId& rResId ); - ~MetricField(); + explicit MetricField( Window* pParent, WinBits nWinStyle ); + explicit MetricField( Window* pParent, const ResId& ); + virtual ~MetricField(); virtual long PreNotify( NotifyEvent& rNEvt ); virtual long Notify( NotifyEvent& rNEvt ); @@ -632,9 +632,9 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - DateField( Window* pParent, WinBits nWinStyle ); - DateField( Window* pParent, const ResId& rResId ); - ~DateField(); + explicit DateField( Window* pParent, WinBits nWinStyle ); + explicit DateField( Window* pParent, const ResId& ); + virtual ~DateField(); virtual long PreNotify( NotifyEvent& rNEvt ); virtual long Notify( NotifyEvent& rNEvt ); @@ -668,9 +668,9 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - TimeField( Window* pParent, WinBits nWinStyle ); - TimeField( Window* pParent, const ResId& rResId ); - ~TimeField(); + explicit TimeField( Window* pParent, WinBits nWinStyle ); + explicit TimeField( Window* pParent, const ResId& ); + virtual ~TimeField(); virtual long PreNotify( NotifyEvent& rNEvt ); virtual long Notify( NotifyEvent& rNEvt ); @@ -718,9 +718,9 @@ public: class VCL_DLLPUBLIC NumericBox : public ComboBox, public NumericFormatter { public: - NumericBox( Window* pParent, WinBits nWinStyle ); - NumericBox( Window* pParent, const ResId& rResId ); - ~NumericBox(); + explicit NumericBox( Window* pParent, WinBits nWinStyle ); + explicit NumericBox( Window* pParent, const ResId& ); + virtual ~NumericBox(); virtual long PreNotify( NotifyEvent& rNEvt ); virtual long Notify( NotifyEvent& rNEvt ); @@ -741,9 +741,9 @@ public: class VCL_DLLPUBLIC MetricBox : public ComboBox, public MetricFormatter { public: - MetricBox( Window* pParent, WinBits nWinStyle ); - MetricBox( Window* pParent, const ResId& rResId ); - ~MetricBox(); + explicit MetricBox( Window* pParent, WinBits nWinStyle ); + explicit MetricBox( Window* pParent, const ResId& ); + virtual ~MetricBox(); virtual long PreNotify( NotifyEvent& rNEvt ); virtual long Notify( NotifyEvent& rNEvt ); @@ -773,9 +773,9 @@ public: class VCL_DLLPUBLIC CurrencyBox : public ComboBox, public CurrencyFormatter { public: - CurrencyBox( Window* pParent, WinBits nWinStyle ); - CurrencyBox( Window* pParent, const ResId& rResId ); - ~CurrencyBox(); + explicit CurrencyBox( Window* pParent, WinBits nWinStyle ); + explicit CurrencyBox( Window* pParent, const ResId& ); + virtual ~CurrencyBox(); virtual long PreNotify( NotifyEvent& rNEvt ); virtual long Notify( NotifyEvent& rNEvt ); @@ -795,8 +795,8 @@ public: class VCL_DLLPUBLIC DateBox : public ComboBox, public DateFormatter { public: - DateBox( Window* pParent, WinBits nWinStyle ); - ~DateBox(); + explicit DateBox( Window* pParent, WinBits nWinStyle ); + virtual ~DateBox(); virtual long PreNotify( NotifyEvent& rNEvt ); virtual long Notify( NotifyEvent& rNEvt ); @@ -815,8 +815,8 @@ public: class VCL_DLLPUBLIC TimeBox : public ComboBox, public TimeFormatter { public: - TimeBox( Window* pParent, WinBits nWinStyle ); - ~TimeBox(); + explicit TimeBox( Window* pParent, WinBits nWinStyle ); + virtual ~TimeBox(); virtual long PreNotify( NotifyEvent& rNEvt ); virtual long Notify( NotifyEvent& rNEvt ); diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index b592d98a48d2..d8379e5be6ca 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -59,9 +59,9 @@ protected: virtual Window* getAccessibleRelationLabelFor() const; public: - FixedText( Window* pParent, WinBits nStyle = 0 ); - FixedText( Window* pParent, const ResId& rResId ); - ~FixedText(); + explicit FixedText( Window* pParent, WinBits nStyle = 0 ); + explicit FixedText( Window* pParent, const ResId& rResId ); + virtual ~FixedText(); virtual void Paint( const Rectangle& rRect ); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); @@ -85,7 +85,7 @@ public: class VCL_DLLPUBLIC SelectableFixedText : public Edit { public: - SelectableFixedText( Window* pParent, WinBits nStyle = 0 ); + explicit SelectableFixedText( Window* pParent, WinBits nStyle = 0 ); virtual void LoseFocus(); }; @@ -112,8 +112,8 @@ protected: GetCanonicalTextColor( const StyleSettings& _rStyle ) const; public: - FixedLine( Window* pParent, WinBits nStyle = WB_HORZ ); - FixedLine( Window* pParent, const ResId& rResId ); + explicit FixedLine( Window* pParent, WinBits nStyle = WB_HORZ ); + explicit FixedLine( Window* pParent, const ResId& ); virtual void Paint( const Rectangle& rRect ); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); @@ -145,9 +145,9 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - FixedBitmap( Window* pParent, WinBits nStyle = 0 ); - FixedBitmap( Window* pParent, const ResId& rResId ); - ~FixedBitmap(); + explicit FixedBitmap( Window* pParent, WinBits nStyle = 0 ); + explicit FixedBitmap( Window* pParent, const ResId& ); + virtual ~FixedBitmap(); virtual void Paint( const Rectangle& rRect ); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); @@ -183,9 +183,9 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - FixedImage( Window* pParent, WinBits nStyle = 0 ); - FixedImage( Window* pParent, const ResId& rResId ); - ~FixedImage(); + explicit FixedImage( Window* pParent, WinBits nStyle = 0 ); + explicit FixedImage( Window* pParent, const ResId& ); + virtual ~FixedImage(); virtual void Paint( const Rectangle& rRect ); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 4f29b40e01a5..b840417892c2 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -115,9 +115,9 @@ public: SAL_DLLPRIVATE sal_Bool ImplIsInPrivatePopupMode() const { return mbInPopupMode; } public: - FloatingWindow( Window* pParent, WinBits nStyle = WB_STDFLOATWIN ); - FloatingWindow( Window* pParent, const ResId& rResId ); - ~FloatingWindow(); + explicit FloatingWindow( Window* pParent, WinBits nStyle = WB_STDFLOATWIN ); + explicit FloatingWindow( Window* pParent, const ResId& ); + virtual ~FloatingWindow(); virtual long Notify( NotifyEvent& rNEvt ); virtual void StateChanged( StateChangedType nType ); diff --git a/include/vcl/fontmanager.hxx b/include/vcl/fontmanager.hxx index 05955f984710..cfddd75d55d8 100644 --- a/include/vcl/fontmanager.hxx +++ b/include/vcl/fontmanager.hxx @@ -216,7 +216,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager std::map< sal_Unicode, sal_Int32 > m_aEncodingVector; std::map< sal_Unicode, OString > m_aNonEncoded; - PrintFont( fonttype::type eType ); + explicit PrintFont( fonttype::type eType ); virtual ~PrintFont(); virtual bool queryMetricPage( int nPage, utl::MultiAtomProvider* pProvider ) = 0; diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx index 647aabe66570..b06b5015896c 100644 --- a/include/vcl/group.hxx +++ b/include/vcl/group.hxx @@ -46,8 +46,8 @@ private: GetCanonicalTextColor( const StyleSettings& _rStyle ) const; public: - GroupBox( Window* pParent, WinBits nStyle = 0 ); - GroupBox( Window* pParent, const ResId& rResId ); + explicit GroupBox( Window* pParent, WinBits nStyle = 0 ); + explicit GroupBox( Window* pParent, const ResId& ); virtual void Paint( const Rectangle& rRect ); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index 79026116c473..b66223328cbe 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -69,14 +69,14 @@ protected: sal_Bool IsDropDownBox() const { return mpFloatWin ? sal_True : sal_False; } protected: - ListBox( WindowType nType ); + explicit ListBox( WindowType nType ); virtual void FillLayoutData() const; public: - ListBox( Window* pParent, WinBits nStyle = WB_BORDER ); - ListBox( Window* pParent, const ResId& rResId ); - ~ListBox(); + explicit ListBox( Window* pParent, WinBits nStyle = WB_BORDER ); + explicit ListBox( Window* pParent, const ResId& ); + virtual ~ListBox(); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); @@ -241,8 +241,8 @@ private: sal_uInt16 GetSavedValue(); public: - MultiListBox( Window* pParent, WinBits nStyle = 0 ); - MultiListBox( Window* pParent, const ResId& rResId ); + explicit MultiListBox( Window* pParent, WinBits nStyle = 0 ); + explicit MultiListBox( Window* pParent, const ResId& rResId ); }; #endif // _SV_LSTBOX_HXX diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index c9bc3b538711..d0f0c0c08988 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -80,7 +80,7 @@ struct ImplMenuDelData ImplMenuDelData* mpNext; const Menu* mpMenu; - ImplMenuDelData( const Menu* pMenu ); + explicit ImplMenuDelData( const Menu* ); ~ImplMenuDelData(); bool isDeleted() const { return mpMenu == 0; } @@ -181,7 +181,7 @@ public: SAL_DLLPRIVATE Menu* ImplGetStartedFrom() const { return pStartedFrom; } Menu(); - Menu( sal_Bool bMenuBar ); + explicit Menu( sal_Bool bMenuBar ); SAL_DLLPRIVATE Window* ImplGetWindow() const { return pWindow; } void ImplSelectWithStart( Menu* pStartMenu = NULL ); @@ -463,8 +463,8 @@ protected: public: PopupMenu(); PopupMenu( const PopupMenu& rMenu ); - PopupMenu( const ResId& rResId ); - ~PopupMenu(); + explicit PopupMenu( const ResId& ); + virtual ~PopupMenu(); void SetText( const OUString& rTitle ) { aTitleText = rTitle; } const OUString& GetText() const { return aTitleText; } diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index 4036ee9059b1..85dc0150b539 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -67,9 +67,9 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - MenuButton( Window* pParent, WinBits nStyle = 0 ); - MenuButton( Window* pParent, const ResId& rResId ); - ~MenuButton(); + explicit MenuButton( Window* pParent, WinBits nStyle = 0 ); + explicit MenuButton( Window* pParent, const ResId& ); + virtual ~MenuButton(); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void KeyInput( const KeyEvent& rKEvt ); diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 961baaecd1ff..40dbcdce28db 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -141,7 +141,7 @@ protected: public: MetaAction(); - MetaAction( sal_uInt16 nType ); + explicit MetaAction( sal_uInt16 nType ); virtual void Execute( OutputDevice* pOut ); @@ -193,7 +193,7 @@ private: public: DECL_META_ACTION( Point, META_POINT_ACTION ) - MetaPointAction( const Point& rPt ); + explicit MetaPointAction( const Point& ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); @@ -236,7 +236,7 @@ private: public: DECL_META_ACTION( Rect, META_RECT_ACTION ) - MetaRectAction( const Rectangle& rRect ); + explicit MetaRectAction( const Rectangle& ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); @@ -279,7 +279,7 @@ private: public: DECL_META_ACTION( Ellipse, META_ELLIPSE_ACTION ) - MetaEllipseAction( const Rectangle& rRect ); + explicit MetaEllipseAction( const Rectangle& ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); @@ -371,8 +371,8 @@ private: public: DECL_META_ACTION( PolyLine, META_POLYLINE_ACTION ) - MetaPolyLineAction( const Polygon& rPoly ); - MetaPolyLineAction( const Polygon& rPoly, const LineInfo& rLineInfo ); + explicit MetaPolyLineAction( const Polygon& ); + explicit MetaPolyLineAction( const Polygon&, const LineInfo& ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); @@ -392,7 +392,7 @@ private: public: DECL_META_ACTION( Polygon, META_POLYGON_ACTION ) - MetaPolygonAction( const Polygon& rPoly ); + explicit MetaPolygonAction( const Polygon& ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); @@ -411,7 +411,7 @@ private: public: DECL_META_ACTION( PolyPolygon, META_POLYPOLYGON_ACTION ) - MetaPolyPolygonAction( const PolyPolygon& rPolyPoly ); + explicit MetaPolyPolygonAction( const PolyPolygon& ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); @@ -915,7 +915,7 @@ private: public: DECL_META_ACTION( ISectRectClipRegion, META_ISECTRECTCLIPREGION_ACTION ) - MetaISectRectClipRegionAction( const Rectangle& rRect ); + explicit MetaISectRectClipRegionAction( const Rectangle& ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); @@ -934,7 +934,7 @@ private: public: DECL_META_ACTION( ISectRegionClipRegion, META_ISECTREGIONCLIPREGION_ACTION ) - MetaISectRegionClipRegionAction( const Region& rRegion ); + explicit MetaISectRegionClipRegionAction( const Region& ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); @@ -1009,7 +1009,7 @@ private: public: DECL_META_ACTION( TextColor, META_TEXTCOLOR_ACTION ) - MetaTextColorAction( const Color& rColor ); + explicit MetaTextColorAction( const Color& ); const Color& GetColor() const { return maColor; } }; @@ -1079,7 +1079,7 @@ private: public: DECL_META_ACTION( TextAlign, META_TEXTALIGN_ACTION ) - MetaTextAlignAction( TextAlign aAlign ); + explicit MetaTextAlignAction( TextAlign eAlign ); TextAlign GetTextAlign() const { return maAlign; } }; @@ -1095,7 +1095,7 @@ private: public: DECL_META_ACTION( MapMode, META_MAPMODE_ACTION ) - MetaMapModeAction( const MapMode& rMapMode ); + explicit MetaMapModeAction( const MapMode& ); virtual void Scale( double fScaleX, double fScaleY ); @@ -1113,7 +1113,7 @@ private: public: DECL_META_ACTION( Font, META_FONT_ACTION ) - MetaFontAction( const Font& rFont ); + explicit MetaFontAction( const Font& ); virtual void Scale( double fScaleX, double fScaleY ); @@ -1131,7 +1131,7 @@ private: public: DECL_META_ACTION( Push, META_PUSH_ACTION ) - MetaPushAction( sal_uInt16 nFlags ); + explicit MetaPushAction( sal_uInt16 nFlags ); sal_uInt16 GetFlags() const { return mnFlags; } }; @@ -1154,7 +1154,7 @@ private: public: DECL_META_ACTION( RasterOp, META_RASTEROP_ACTION ) - MetaRasterOpAction( RasterOp eRasterOp ); + explicit MetaRasterOpAction( RasterOp eRasterOp ); RasterOp GetRasterOp() const { return meRasterOp; } }; @@ -1263,12 +1263,12 @@ private: virtual sal_Bool Compare( const MetaAction& ) const; protected: - ~MetaCommentAction(); + virtual ~MetaCommentAction(); public: - MetaCommentAction( sal_Int32 nValue = 0L ); - MetaCommentAction( const MetaCommentAction& rAct ); - MetaCommentAction( const OString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = NULL, sal_uInt32 nDataSize = 0UL ); + explicit MetaCommentAction( sal_Int32 nValue = 0L ); + explicit MetaCommentAction( const MetaCommentAction& rAct ); + explicit MetaCommentAction( const OString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = NULL, sal_uInt32 nDataSize = 0UL ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); @@ -1294,7 +1294,7 @@ private: public: DECL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION ) - MetaLayoutModeAction( sal_uInt32 nLayoutMode ); + explicit MetaLayoutModeAction( sal_uInt32 nLayoutMode ); sal_uInt32 GetLayoutMode() const { return mnLayoutMode; } }; @@ -1309,7 +1309,7 @@ private: public: DECL_META_ACTION( TextLanguage, META_TEXTLANGUAGE_ACTION ) - MetaTextLanguageAction( LanguageType ); + explicit MetaTextLanguageAction( LanguageType ); LanguageType GetTextLanguage() const { return meTextLanguage; } }; diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx index a715f37357d7..7b5399f41eb1 100644 --- a/include/vcl/morebtn.hxx +++ b/include/vcl/morebtn.hxx @@ -50,9 +50,9 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - MoreButton( Window* pParent, WinBits nStyle = 0 ); - MoreButton( Window* pParent, const ResId& rResId ); - ~MoreButton(); + explicit MoreButton( Window* pParent, WinBits nStyle = 0 ); + explicit MoreButton( Window* pParent, const ResId& ); + virtual ~MoreButton(); void Click(); diff --git a/include/vcl/pngread.hxx b/include/vcl/pngread.hxx index b36a0ee6106a..cc1218702bfb 100644 --- a/include/vcl/pngread.hxx +++ b/include/vcl/pngread.hxx @@ -40,7 +40,7 @@ namespace vcl /* the PNG chunks are read within the c'tor, so the stream will be positioned at the end of the PNG */ - PNGReader( SvStream& rStm ); + explicit PNGReader( SvStream& rStm ); ~PNGReader(); /* an empty preview size hint (=default) will read the whole image diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index 4a1a164121be..78ef0c2c588b 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -90,9 +90,9 @@ private: DECL_DLLPRIVATE_LINK( ImplAutoTimerHdl, void* ); public: - ScrollBar( Window* pParent, WinBits nStyle = WB_VERT ); - ScrollBar( Window* pParent, const ResId& rResId ); - ~ScrollBar(); + explicit ScrollBar( Window* pParent, WinBits nStyle = WB_VERT ); + explicit ScrollBar( Window* pParent, const ResId& ); + virtual ~ScrollBar(); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void Tracking( const TrackingEvent& rTEvt ); @@ -155,7 +155,7 @@ private: SAL_DLLPRIVATE void ImplInitSettings(); public: - ScrollBarBox( Window* pParent, WinBits nStyle = 0 ); + explicit ScrollBarBox( Window* pParent, WinBits nStyle = 0 ); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index 3966034c0938..429230483057 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -56,8 +56,8 @@ private: DECL_DLLPRIVATE_LINK( ImplTimeout, Timer* ); public: - SpinButton( Window* pParent, WinBits nStyle = 0 ); - ~SpinButton(); + explicit SpinButton( Window* pParent, WinBits nStyle = 0 ); + virtual ~SpinButton(); virtual void Up(); virtual void Down(); diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index 4a902d17aeaa..9e4aae9fbd39 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -59,7 +59,7 @@ private: SAL_DLLPRIVATE void ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rectangle& rDDArea, Rectangle& rSpinUpArea, Rectangle& rSpinDownArea ); protected: - SpinField( WindowType nTyp ); + explicit SpinField( WindowType nTyp ); virtual long Notify( NotifyEvent& rNEvt ); virtual void Command( const CommandEvent& rCEvt ); @@ -70,9 +70,9 @@ protected: Rectangle * ImplFindPartRect( const Point& rPt ); public: - SpinField( Window* pParent, WinBits nWinStyle = 0 ); - SpinField( Window* pParent, const ResId& rResId ); - ~SpinField(); + explicit SpinField( Window* pParent, WinBits nWinStyle = 0 ); + explicit SpinField( Window* pParent, const ResId& ); + virtual ~SpinField(); virtual sal_Bool ShowDropDown( sal_Bool bShow ); diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index 1710ea62f5eb..937ef7d2ab38 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -66,9 +66,9 @@ protected: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nWinStyle ); public: - Splitter( Window* pParent, WinBits nStyle = WB_VSCROLL ); - Splitter( Window* pParent, const ResId& rResId ); - ~Splitter(); + explicit Splitter( Window* pParent, WinBits nStyle = WB_VSCROLL ); + explicit Splitter( Window* pParent, const ResId& ); + virtual ~Splitter(); virtual void StartSplit(); virtual void EndSplit(); diff --git a/include/vcl/syschild.hxx b/include/vcl/syschild.hxx index 66875e8979b5..2e1af9163860 100644 --- a/include/vcl/syschild.hxx +++ b/include/vcl/syschild.hxx @@ -43,10 +43,10 @@ private: SAL_DLLPRIVATE SystemChildWindow & operator= (const SystemChildWindow &); public: - SystemChildWindow( Window* pParent, WinBits nStyle = 0 ); + explicit SystemChildWindow( Window* pParent, WinBits nStyle = 0 ); // create a SystemChildWindow using the given SystemWindowData - SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, sal_Bool bShow = sal_True ); - ~SystemChildWindow(); + explicit SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, sal_Bool bShow = sal_True ); + virtual ~SystemChildWindow(); const SystemEnvData* GetSystemData() const; diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx index 3414ec76e834..b8fe9c5581d1 100644 --- a/include/vcl/tabpage.hxx +++ b/include/vcl/tabpage.hxx @@ -39,10 +39,10 @@ private: SAL_DLLPRIVATE void ImplInitSettings(); public: - TabPage( Window* pParent, WinBits nStyle = 0 ); - TabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription); + explicit TabPage( Window* pParent, WinBits nStyle = 0 ); + explicit TabPage( Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); - TabPage( Window* pParent, const ResId& rResId ); + explicit TabPage( Window* pParent, const ResId& rResId ); virtual void Paint( const Rectangle& rRect ); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx index 5d8a70e8f3dc..41caf3e0eef8 100644 --- a/include/vcl/virdev.hxx +++ b/include/vcl/virdev.hxx @@ -72,7 +72,7 @@ public: indicate: take default screen depth. Only 0, 1 and 8 are allowed here, with 1 denoting binary mask and 8 a graylevel mask. */ - VirtualDevice( sal_uInt16 nBitCount = 0 ); + explicit VirtualDevice( sal_uInt16 nBitCount = 0 ); /** Create a virtual device of size 1x1 @@ -84,7 +84,7 @@ public: indicate: take default screen depth. Only 0 and 1 are allowed here, with 1 denoting binary mask. */ - VirtualDevice( const OutputDevice& rCompDev, + explicit VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount = 0 ); /** Create a virtual device of size 1x1 with alpha channel @@ -102,14 +102,14 @@ public: indicate: take default screen depth. Only 0 and 1 are allowed here, with 1 denoting binary mask. */ - VirtualDevice( const OutputDevice& rCompDev, + explicit VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount, sal_uInt16 nAlphaBitCount ); /** Create a virtual device using an existing system dependent device or graphics context Any rendering will happen directly on the context and not on any intermediate bitmap. Note: This might not be suported on all platforms ! */ - VirtualDevice( const SystemGraphicsData *pData, sal_uInt16 nBitCount ); + explicit VirtualDevice( const SystemGraphicsData *pData, sal_uInt16 nBitCount ); virtual ~VirtualDevice(); diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx index d151d1f12232..feca149699e2 100644 --- a/include/vcl/wrkwin.hxx +++ b/include/vcl/wrkwin.hxx @@ -57,15 +57,15 @@ private: SAL_DLLPRIVATE WorkWindow& operator =( const WorkWindow& rWin ); protected: - WorkWindow( WindowType nType ); + explict WorkWindow( WindowType nType ); SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData = NULL ); SAL_DLLPRIVATE void ImplSetFrameState( sal_uLong aFrameState ); public: - WorkWindow( Window* pParent, WinBits nStyle = WB_STDWORK ); - WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK ); - WorkWindow( SystemParentData* pParent ); // Not in the REMOTE-Version - ~WorkWindow(); + explicit WorkWindow( Window* pParent, WinBits nStyle = WB_STDWORK ); + explicit WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK ); + explicit WorkWindow( SystemParentData* pParent ); // Not in the REMOTE-Version + virtual ~WorkWindow(); virtual sal_Bool Close(); |