diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-04-10 07:02:23 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-06-18 17:01:58 +0200 |
commit | 540a6554956bbee62b5f669d672d64e03a9d888c (patch) | |
tree | c0781d483843de3e60b28379d52a9c47331bd525 /include/vcl | |
parent | bdcb8d2197cfb98b7d96d4c7d1dd840cebc02dfd (diff) |
uitest: an enum is a bad idea for the type
Change-Id: I1efd59b2f664f0aa9be733466fa7c1057e92ef27
Diffstat (limited to 'include/vcl')
-rw-r--r-- | include/vcl/uitest/uiobject.hxx | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx index 963003e1ed3e..b9a3f484b58f 100644 --- a/include/vcl/uitest/uiobject.hxx +++ b/include/vcl/uitest/uiobject.hxx @@ -22,21 +22,6 @@ #include <vcl/dllapi.h> -enum class UIObjectType -{ - WINDOW, - DIALOG, - BUTTON, - EDIT, - CHECKBOX, - LISTBOX, - COMBOBOX, - SPINBUTTON, - TABPAGE, - SPINFIELD, - UNKNOWN -}; - typedef std::map<const OUString, OUString> StringMap; /** @@ -67,9 +52,8 @@ public: /** * Returns the type of the UIObject. Additional information might * be available through UIObject::get_state(). - * */ - virtual UIObjectType get_type() const; + virtual OUString get_type() const; /** * Returns the child of the current UIObject with the corresponding id. @@ -108,7 +92,7 @@ public: virtual void execute(const OUString& rAction, const StringMap& rParameters) override; - virtual UIObjectType get_type() const override; + virtual OUString get_type() const override; virtual std::unique_ptr<UIObject> get_child(const OUString& rID) override; @@ -138,8 +122,6 @@ public: virtual void execute(const OUString& rAction, const StringMap& rParameters) override; - virtual UIObjectType get_type() const override; - static std::unique_ptr<UIObject> create(vcl::Window* pWindow); protected: @@ -156,8 +138,6 @@ public: DialogUIObject(VclPtr<Dialog> xDialog); virtual ~DialogUIObject(); - virtual UIObjectType get_type() const override; - virtual StringMap get_state() override; static std::unique_ptr<UIObject> create(vcl::Window* pWindow); @@ -181,8 +161,6 @@ public: virtual StringMap get_state() override; - virtual UIObjectType get_type() const override; - static std::unique_ptr<UIObject> create(vcl::Window* pWindow); protected: @@ -205,8 +183,6 @@ public: virtual StringMap get_state() override; - virtual UIObjectType get_type() const override; - static std::unique_ptr<UIObject> create(vcl::Window* pWindow); protected: @@ -227,8 +203,6 @@ public: virtual StringMap get_state() override; - virtual UIObjectType get_type() const override; - static std::unique_ptr<UIObject> create(vcl::Window* pWindow); protected: @@ -251,8 +225,6 @@ public: virtual StringMap get_state() override; - virtual UIObjectType get_type() const override; - static std::unique_ptr<UIObject> create(vcl::Window* pWindow); protected: @@ -276,8 +248,6 @@ public: virtual StringMap get_state() override; - virtual UIObjectType get_type() const override; - static std::unique_ptr<UIObject> create(vcl::Window* pWindow); protected: @@ -300,8 +270,6 @@ public: virtual StringMap get_state() override; - virtual UIObjectType get_type() const override; - static std::unique_ptr<UIObject> create(vcl::Window* pWindow); protected: @@ -323,8 +291,6 @@ public: virtual StringMap get_state() override; - virtual UIObjectType get_type() const override; - static std::unique_ptr<UIObject> create(vcl::Window* pWindow); protected: |