loplugin:ostr in vcl

Change-Id: I5b6ee5bda0c5ff69d297f7f8e87d4c3f3d21791c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167470
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins

6 files changed, 9 insertions, 9 deletions

diff --git a/vcl/unx/generic/app/geninst.cxx b/vcl/unx/generic/app/geninst.cxx
index 191d87ca76b7..fe3aefe9b71a 100644
--- a/vcl/unx/generic/app/geninst.cxx
+++ b/vcl/unx/generic/app/geninst.cxx
@@ -52,7 +52,7 @@ SalGenericInstance::~SalGenericInstance()
 
 OUString SalGenericInstance::getOSVersion()
 {
-    OUString aKernelVer = "unknown";
+    OUString aKernelVer = u"unknown"_ustr;
 #if defined(LINUX)
     FILE* pVersion = fopen( "/proc/version", "r" );
     if ( pVersion )
diff --git a/vcl/unx/generic/app/gensys.cxx b/vcl/unx/generic/app/gensys.cxx
index 98371c5484d1..d22c0a4ce72d 100644
--- a/vcl/unx/generic/app/gensys.cxx
+++ b/vcl/unx/generic/app/gensys.cxx
@@ -46,7 +46,7 @@ int SalGenericSystem::ShowNativeMessageBox( const OUString& rTitle, const OUStri
 
     ImplHideSplash();
 
-    aButtons.push_back( "OK" );
+    aButtons.push_back( u"OK"_ustr );
     nButtonIds[nBut++] = SALSYSTEM_SHOWNATIVEMSGBOX_BTN_OK;
     int nResult = ShowNativeDialog( rTitle, rMessage, aButtons );
 
@@ -98,10 +98,10 @@ const char* SalGenericSystem::getFrameClassName()
     if( aClassName.isEmpty() )
     {
         OUString aIni, aProduct;
-        rtl::Bootstrap::get( "BRAND_BASE_DIR", aIni );
+        rtl::Bootstrap::get( u"BRAND_BASE_DIR"_ustr, aIni );
         aIni += "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" );
         rtl::Bootstrap aBootstrap( aIni );
-        aBootstrap.getFrom( "ProductKey", aProduct );
+        aBootstrap.getFrom( u"ProductKey"_ustr, aProduct );
 
         if( !aProduct.isEmpty() )
             aClassName.append( OUStringToOString( aProduct, osl_getThreadTextEncoding() ) );
diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx
index cc311b7be11d..e3767b175d1d 100644
--- a/vcl/unx/generic/app/i18n_im.cxx
+++ b/vcl/unx/generic/app/i18n_im.cxx
@@ -330,7 +330,7 @@ SalI18N_InputMethod::CreateMethod ( Display *pDisplay )
 
         if ((maMethod == nullptr) && (getenv("XMODIFIERS") != nullptr))
         {
-                OUString envVar("XMODIFIERS");
+                OUString envVar(u"XMODIFIERS"_ustr);
                 osl_clearEnvironment(envVar.pData);
                 XSetLocaleModifiers("");
                 maMethod = XOpenIM(pDisplay, nullptr, nullptr, nullptr);
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index 34c7c0878991..e155acc45ec6 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -388,7 +388,7 @@ static Display *OpenX11Display(OString& rDisplay)
                  * the clipboard build another connection
                  * to the xserver using $DISPLAY
                  */
-                OUString envVar("DISPLAY");
+                OUString envVar(u"DISPLAY"_ustr);
                 osl_setEnvironment(envVar.pData, aParam.pData);
             }
             break;
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index a77aca26482d..1b4b90521cc4 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -73,7 +73,7 @@ X11SalInstance::X11SalInstance(std::unique_ptr<SalYieldMutex> pMutex)
     , mpXLib(nullptr)
 {
     ImplSVData* pSVData = ImplGetSVData();
-    pSVData->maAppData.mxToolkitName = OUString("x11");
+    pSVData->maAppData.mxToolkitName = u"x11"_ustr;
     m_bSupportsOpenGL = true;
 #if HAVE_FEATURE_SKIA
     X11SkiaSalGraphicsImpl::prepareSkia();
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index 240517d7aab9..d6a95dfc8583 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -873,8 +873,8 @@ bool WMAdaptor::getWMshouldSwitchWorkspace() const
 
         pWMA->m_bWMshouldSwitchWorkspace = true;
         vcl::SettingsConfigItem* pItem = vcl::SettingsConfigItem::get();
-        OUString aSetting( pItem->getValue( "WM",
-                                                 "ShouldSwitchWorkspace" ) );
+        OUString aSetting( pItem->getValue( u"WM"_ustr,
+                                                 u"ShouldSwitchWorkspace"_ustr ) );
         if( aSetting.isEmpty() )
         {
             if( m_aWMName == "awesome" )