diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /include/vcl/uitest/uiobject.hxx | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) |
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.
(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)
Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'include/vcl/uitest/uiobject.hxx')
-rw-r--r-- | include/vcl/uitest/uiobject.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx index a8c35be7285b..d9d683179986 100644 --- a/include/vcl/uitest/uiobject.hxx +++ b/include/vcl/uitest/uiobject.hxx @@ -129,7 +129,7 @@ class UITEST_DLLPUBLIC ButtonUIObject : public WindowUIObject public: ButtonUIObject(VclPtr<Button> xButton); - virtual ~ButtonUIObject(); + virtual ~ButtonUIObject() override; virtual StringMap get_state() override; @@ -150,7 +150,7 @@ class UITEST_DLLPUBLIC DialogUIObject : public WindowUIObject public: DialogUIObject(VclPtr<Dialog> xDialog); - virtual ~DialogUIObject(); + virtual ~DialogUIObject() override; virtual StringMap get_state() override; @@ -168,7 +168,7 @@ class UITEST_DLLPUBLIC EditUIObject : public WindowUIObject public: EditUIObject(VclPtr<Edit> xEdit); - virtual ~EditUIObject(); + virtual ~EditUIObject() override; virtual void execute(const OUString& rAction, const StringMap& rParameters) override; @@ -190,7 +190,7 @@ private: public: CheckBoxUIObject(VclPtr<CheckBox> xCheckbox); - virtual ~CheckBoxUIObject(); + virtual ~CheckBoxUIObject() override; virtual void execute(const OUString& rAction, const StringMap& rParameters) override; @@ -211,7 +211,7 @@ private: public: RadioButtonUIObject(VclPtr<RadioButton> xCheckbox); - virtual ~RadioButtonUIObject(); + virtual ~RadioButtonUIObject() override; virtual void execute(const OUString& rAction, const StringMap& rParameters) override; @@ -231,7 +231,7 @@ private: VclPtr<TabPage> mxTabPage; public: TabPageUIObject(VclPtr<TabPage> xTabPage); - virtual ~TabPageUIObject(); + virtual ~TabPageUIObject() override; virtual void execute(const OUString& rAction, const StringMap& rParameters) override; @@ -253,7 +253,7 @@ private: public: ListBoxUIObject(VclPtr<ListBox> xListBox); - virtual ~ListBoxUIObject(); + virtual ~ListBoxUIObject() override; virtual void execute(const OUString& rAction, const StringMap& rParameters) override; @@ -276,7 +276,7 @@ private: public: ComboBoxUIObject(VclPtr<ComboBox> xListBox); - virtual ~ComboBoxUIObject(); + virtual ~ComboBoxUIObject() override; virtual void execute(const OUString& rAction, const StringMap& rParameters) override; @@ -298,7 +298,7 @@ private: public: SpinUIObject(VclPtr<SpinButton> xSpinButton); - virtual ~SpinUIObject(); + virtual ~SpinUIObject() override; virtual void execute(const OUString& rAction, const StringMap& rParameters) override; @@ -319,7 +319,7 @@ class UITEST_DLLPUBLIC SpinFieldUIObject : public EditUIObject public: SpinFieldUIObject(VclPtr<SpinField> xEdit); - virtual ~SpinFieldUIObject(); + virtual ~SpinFieldUIObject() override; virtual void execute(const OUString& rAction, const StringMap& rParameters) override; @@ -341,7 +341,7 @@ private: public: TabControlUIObject(VclPtr<TabControl> mxTabControl); - virtual ~TabControlUIObject(); + virtual ~TabControlUIObject() override; virtual void execute(const OUString& rAction, const StringMap& rParameters) override; |