Improved loplugin:stringconstant (now that GCC 7 supports it): vcl

Change-Id: I0bd1d26f6fc4052b812fde33ebd1d63111426942
Reviewed-on: https://gerrit.libreoffice.org/76627
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

4 files changed, 17 insertions, 17 deletions

diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index d100d1bbf125..7860364da9d9 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -223,7 +223,7 @@ namespace {
 OUString StringMapToOUString(const std::map<OUString, OUString>& rParameters)
 {
     if (rParameters.empty())
-        return OUString("");
+        return "";
 
     OUStringBuffer aParameterString = " {";
 
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index b8932913cf53..aa69bd0d60b6 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -49,7 +49,7 @@ void UIObject::execute(const OUString& /*rAction*/,
 
 OUString UIObject::get_type() const
 {
-    return OUString("Generic UIObject");
+    return "Generic UIObject";
 }
 
 std::unique_ptr<UIObject> UIObject::get_child(const OUString&)
@@ -450,7 +450,7 @@ std::set<OUString> WindowUIObject::get_children() const
 
 OUString WindowUIObject::get_name() const
 {
-    return OUString("WindowUIObject");
+    return "WindowUIObject";
 }
 
 namespace {
@@ -577,7 +577,7 @@ void ButtonUIObject::execute(const OUString& rAction,
 
 OUString ButtonUIObject::get_name() const
 {
-    return OUString("ButtonUIObject");
+    return "ButtonUIObject";
 }
 
 OUString ButtonUIObject::get_action(VclEventId nEvent) const
@@ -618,7 +618,7 @@ StringMap DialogUIObject::get_state()
 
 OUString DialogUIObject::get_name() const
 {
-    return OUString("DialogUIObject");
+    return "DialogUIObject";
 }
 
 std::unique_ptr<UIObject> DialogUIObject::create(vcl::Window* pWindow)
@@ -720,7 +720,7 @@ OUString EditUIObject::get_action(VclEventId nEvent) const
 
 OUString EditUIObject::get_name() const
 {
-    return OUString("EditUIObject");
+    return "EditUIObject";
 }
 
 std::unique_ptr<UIObject> EditUIObject::create(vcl::Window* pWindow)
@@ -781,7 +781,7 @@ StringMap MultiLineEditUIObject::get_state()
 
 OUString MultiLineEditUIObject::get_name() const
 {
-    return OUString("MultiLineEditUIObject");
+    return "MultiLineEditUIObject";
 }
 
 std::unique_ptr<UIObject> MultiLineEditUIObject::create(vcl::Window* pWindow)
@@ -821,7 +821,7 @@ StringMap CheckBoxUIObject::get_state()
 
 OUString CheckBoxUIObject::get_name() const
 {
-    return OUString("CheckBoxUIObject");
+    return "CheckBoxUIObject";
 }
 
 OUString CheckBoxUIObject::get_action(VclEventId nEvent) const
@@ -871,7 +871,7 @@ StringMap RadioButtonUIObject::get_state()
 
 OUString RadioButtonUIObject::get_name() const
 {
-    return OUString("RadioButtonUIObject");
+    return "RadioButtonUIObject";
 }
 
 OUString RadioButtonUIObject::get_action(VclEventId nEvent) const
@@ -920,7 +920,7 @@ StringMap TabPageUIObject::get_state()
 
 OUString TabPageUIObject::get_name() const
 {
-    return OUString("TabPageUIObject");
+    return "TabPageUIObject";
 }
 
 ListBoxUIObject::ListBoxUIObject(const VclPtr<ListBox>& xListBox):
@@ -976,7 +976,7 @@ StringMap ListBoxUIObject::get_state()
 
 OUString ListBoxUIObject::get_name() const
 {
-    return OUString("ListBoxUIObject");
+    return "ListBoxUIObject";
 }
 
 OUString ListBoxUIObject::get_action(VclEventId nEvent) const
@@ -1052,7 +1052,7 @@ StringMap ComboBoxUIObject::get_state()
 
 OUString ComboBoxUIObject::get_name() const
 {
-    return OUString("ComboBoxUIObject");
+    return "ComboBoxUIObject";
 }
 
 OUString ComboBoxUIObject::get_action(VclEventId nEvent) const
@@ -1128,7 +1128,7 @@ OUString SpinUIObject::get_action(VclEventId nEvent) const
 
 OUString SpinUIObject::get_name() const
 {
-    return OUString("SpinUIObject");
+    return "SpinUIObject";
 }
 
 SpinFieldUIObject::SpinFieldUIObject(const VclPtr<SpinField>& xSpinField):
@@ -1190,7 +1190,7 @@ OUString SpinFieldUIObject::get_action(VclEventId nEvent) const
 
 OUString SpinFieldUIObject::get_name() const
 {
-    return OUString("SpinFieldUIObject");
+    return "SpinFieldUIObject";
 }
 
 std::unique_ptr<UIObject> SpinFieldUIObject::create(vcl::Window* pWindow)
@@ -1254,7 +1254,7 @@ OUString TabControlUIObject::get_action(VclEventId nEvent) const
 
 OUString TabControlUIObject::get_name() const
 {
-    return OUString("TabControlUIObject");
+    return "TabControlUIObject";
 }
 
 std::unique_ptr<UIObject> TabControlUIObject::create(vcl::Window* pWindow)
diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx b/vcl/source/uitest/uno/uiobject_uno.cxx
index 283970569a0e..d4a88f7513f6 100644
--- a/vcl/source/uitest/uno/uiobject_uno.cxx
+++ b/vcl/source/uitest/uno/uiobject_uno.cxx
@@ -187,7 +187,7 @@ OUString SAL_CALL UIObjectUnoObj::getType()
 
 OUString SAL_CALL UIObjectUnoObj::getImplementationName()
 {
-    return OUString("org.libreoffice.uitest.UIObject");
+    return "org.libreoffice.uitest.UIObject";
 }
 
 sal_Bool UIObjectUnoObj::supportsService(OUString const & ServiceName)
diff --git a/vcl/source/uitest/uno/uitest_uno.cxx b/vcl/source/uitest/uno/uitest_uno.cxx
index 69d0c717a9bb..354b30585c69 100644
--- a/vcl/source/uitest/uno/uitest_uno.cxx
+++ b/vcl/source/uitest/uno/uitest_uno.cxx
@@ -97,7 +97,7 @@ css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UITestUnoObj::getFloatWin
 
 OUString SAL_CALL UITestUnoObj::getImplementationName()
 {
-    return OUString("org.libreoffice.uitest.UITest");
+    return "org.libreoffice.uitest.UITest";
 }
 
 sal_Bool UITestUnoObj::supportsService(OUString const & ServiceName)