include/vcl/uitest/uitest.hxx | 14 ++++++-------- vcl/source/uitest/uno/uitest_uno.cxx | 6 +----- 2 files changed, 7 insertions(+), 13 deletions(-)
New commits: commit 450d195bb8c09866c6988a3b3ac82dbe349f7849 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Mon Feb 27 09:43:59 2023 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Mon Feb 27 11:05:42 2023 +0000 UITest does not need to be a class Change-Id: I0d9b67076abe0acc20406f594b1724a909504a1a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147866 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/include/vcl/uitest/uitest.hxx b/include/vcl/uitest/uitest.hxx index 53bdded590aa..189df1de55e8 100644 --- a/include/vcl/uitest/uitest.hxx +++ b/include/vcl/uitest/uitest.hxx @@ -19,20 +19,18 @@ namespace com::sun::star::uno { template <typename > class Sequence; } class UIObject; -class UITest +namespace UITest { -public: + bool executeCommand(const OUString& rCommand); - static bool executeCommand(const OUString& rCommand); - - static bool executeCommandWithParameters(const OUString& rCommand, + bool executeCommandWithParameters(const OUString& rCommand, const css::uno::Sequence< css::beans::PropertyValue >& rArgs); - static bool executeDialog(const OUString& rCommand); + bool executeDialog(const OUString& rCommand); - static std::unique_ptr<UIObject> getFocusTopWindow(); + std::unique_ptr<UIObject> getFocusTopWindow(); - static std::unique_ptr<UIObject> getFloatWindow(); + std::unique_ptr<UIObject> getFloatWindow(); }; #endif diff --git a/vcl/source/uitest/uno/uitest_uno.cxx b/vcl/source/uitest/uno/uitest_uno.cxx index 9efbd3c3772d..9886b049a43a 100644 --- a/vcl/source/uitest/uno/uitest_uno.cxx +++ b/vcl/source/uitest/uno/uitest_uno.cxx @@ -29,9 +29,6 @@ namespace class UITestUnoObj : public UITestBase { -private: - std::unique_ptr<UITest> mpUITest; - public: UITestUnoObj(); @@ -56,8 +53,7 @@ public: } -UITestUnoObj::UITestUnoObj(): - mpUITest(new UITest) +UITestUnoObj::UITestUnoObj() { }