summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/opengl/win/WinDeviceInfo.cxx4
-rw-r--r--vcl/qa/api/XGraphicTest.cxx2
-rw-r--r--vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx2
-rw-r--r--vcl/qa/cppunit/jpeg/JpegReaderTest.cxx2
-rw-r--r--vcl/qa/cppunit/jpeg/JpegWriterTest.cxx2
-rw-r--r--vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx2
-rw-r--r--vcl/source/app/IconThemeInfo.cxx8
-rw-r--r--vcl/source/app/IconThemeSelector.cxx2
-rw-r--r--vcl/source/app/svapp.cxx16
-rw-r--r--vcl/source/filter/graphicfilter.cxx2
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx4
-rw-r--r--vcl/source/helper/driverblocklist.cxx10
-rw-r--r--vcl/source/window/mnemonic.cxx2
-rw-r--r--vcl/unx/generic/window/salframe.cxx84
14 files changed, 71 insertions, 71 deletions
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 8464b7c5fece..9d95fc0be272 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -320,7 +320,7 @@ void WinOpenGLDeviceInfo::GetData()
sizeof(value),
nullptr))
{
- OUString driverKey(OUStringLiteral("System\\CurrentControlSet\\Control\\Class\\") + o3tl::toU(value));
+ OUString driverKey(OUStringLiteral(u"System\\CurrentControlSet\\Control\\Class\\") + o3tl::toU(value));
result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, o3tl::toW(driverKey.getStr()), 0, KEY_QUERY_VALUE, &key);
if (result == ERROR_SUCCESS)
{
@@ -407,7 +407,7 @@ void WinOpenGLDeviceInfo::GetData()
sizeof(value),
nullptr))
{
- OUString driverKey2(OUStringLiteral("System\\CurrentControlSet\\Control\\Class\\") + o3tl::toU(value));
+ OUString driverKey2(OUStringLiteral(u"System\\CurrentControlSet\\Control\\Class\\") + o3tl::toU(value));
result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, o3tl::toW(driverKey2.getStr()), 0, KEY_QUERY_VALUE, &key);
if (result == ERROR_SUCCESS)
{
diff --git a/vcl/qa/api/XGraphicTest.cxx b/vcl/qa/api/XGraphicTest.cxx
index cc4af576e8c8..52374ff77070 100644
--- a/vcl/qa/api/XGraphicTest.cxx
+++ b/vcl/qa/api/XGraphicTest.cxx
@@ -22,7 +22,7 @@ namespace
{
using namespace css;
-OUStringLiteral const gaDataUrl = "/vcl/qa/api/data/";
+OUStringLiteral const gaDataUrl = u"/vcl/qa/api/data/";
class XGraphicTest : public test::BootstrapFixture
{
diff --git a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
index a26fcbcd7291..9c560459c24a 100644
--- a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
+++ b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
@@ -21,7 +21,7 @@
#include <svdata.hxx>
#include <salinst.hxx>
-OUStringLiteral const gaDataUrl = "/vcl/qa/cppunit/bitmaprender/data/";
+OUStringLiteral const gaDataUrl = u"/vcl/qa/cppunit/bitmaprender/data/";
class BitmapRenderTest : public test::BootstrapFixture
{
diff --git a/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx b/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
index 59774337b573..953a35df93b1 100644
--- a/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
+++ b/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
@@ -13,7 +13,7 @@
#include <bitmapwriteaccess.hxx>
#include <tools/stream.hxx>
-OUStringLiteral const gaDataUrl("/vcl/qa/cppunit/jpeg/data/");
+OUStringLiteral const gaDataUrl(u"/vcl/qa/cppunit/jpeg/data/");
class JpegReaderTest : public test::BootstrapFixtureBase
{
diff --git a/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx b/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx
index 13b0bbd4373d..2b89f9427395 100644
--- a/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx
+++ b/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx
@@ -13,7 +13,7 @@
#include <vcl/bitmapaccess.hxx>
#include <tools/stream.hxx>
-OUStringLiteral const gaDataUrl("/vcl/qa/cppunit/jpeg/data/");
+OUStringLiteral const gaDataUrl(u"/vcl/qa/cppunit/jpeg/data/");
class JpegWriterTest : public test::BootstrapFixtureBase
{
diff --git a/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx b/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx
index d87b129a7155..ca2eb15a5b98 100644
--- a/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx
+++ b/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx
@@ -16,7 +16,7 @@
namespace
{
-OUStringLiteral const gaDataUrl("/vcl/qa/cppunit/widgetdraw/data/");
+OUStringLiteral const gaDataUrl(u"/vcl/qa/cppunit/widgetdraw/data/");
class WidgetDefinitionReaderTest : public test::BootstrapFixtureBase
{
diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx
index ae094bbcd2b1..8968710f4a95 100644
--- a/vcl/source/app/IconThemeInfo.cxx
+++ b/vcl/source/app/IconThemeInfo.cxx
@@ -16,13 +16,13 @@
// constants for theme ids and display names. Only the theme id for high contrast is used
// outside of this class and hence made public.
-const OUStringLiteral vcl::IconThemeInfo::HIGH_CONTRAST_ID("sifr");
+const OUStringLiteral vcl::IconThemeInfo::HIGH_CONTRAST_ID(u"sifr");
namespace {
-const OUStringLiteral KARASA_JAGA_ID("karasa_jaga");
-const OUStringLiteral KARASA_JAGA_DISPLAY_NAME("Karasa Jaga");
-const OUStringLiteral HELPIMG_FAKE_THEME("helpimg");
+const OUStringLiteral KARASA_JAGA_ID(u"karasa_jaga");
+const OUStringLiteral KARASA_JAGA_DISPLAY_NAME(u"Karasa Jaga");
+const OUStringLiteral HELPIMG_FAKE_THEME(u"helpimg");
OUString
filename_from_url(const OUString& url)
diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
index e98d63657c83..eb861f96e815 100644
--- a/vcl/source/app/IconThemeSelector.cxx
+++ b/vcl/source/app/IconThemeSelector.cxx
@@ -18,7 +18,7 @@
namespace vcl {
-/*static*/ const OUStringLiteral IconThemeSelector::FALLBACK_ICON_THEME_ID("colibre");
+/*static*/ const OUStringLiteral IconThemeSelector::FALLBACK_ICON_THEME_ID(u"colibre");
namespace {
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 04f6f1670143..45f5aa655954 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1145,7 +1145,7 @@ OUString Application::GetHWOSConfInfo(const int bSelection, const bool bLocalize
};
if (bSelection != hwUI) {
- appendDetails("; ", Localize(SV_APP_CPUTHREADS, bLocalize)
+ appendDetails(u"; ", Localize(SV_APP_CPUTHREADS, bLocalize)
+ OUString::number(std::thread::hardware_concurrency()));
OUString aVersion;
@@ -1154,21 +1154,21 @@ OUString Application::GetHWOSConfInfo(const int bSelection, const bool bLocalize
else
aVersion = "-";
- appendDetails("; ", Localize(SV_APP_OSVERSION, bLocalize) + aVersion);
+ appendDetails(u"; ", Localize(SV_APP_OSVERSION, bLocalize) + aVersion);
}
if (bSelection != hwEnv) {
- appendDetails("; ", Localize(SV_APP_UIRENDER, bLocalize));
+ appendDetails(u"; ", Localize(SV_APP_UIRENDER, bLocalize));
#if HAVE_FEATURE_SKIA
if ( SkiaHelper::isVCLSkiaEnabled() )
{
switch(SkiaHelper::renderMethodToUse())
{
case SkiaHelper::RenderVulkan:
- appendDetails("", Localize(SV_APP_SKIA_VULKAN, bLocalize));
+ appendDetails(u"", Localize(SV_APP_SKIA_VULKAN, bLocalize));
break;
case SkiaHelper::RenderRaster:
- appendDetails("", Localize(SV_APP_SKIA_RASTER, bLocalize));
+ appendDetails(u"", Localize(SV_APP_SKIA_RASTER, bLocalize));
break;
}
}
@@ -1176,13 +1176,13 @@ OUString Application::GetHWOSConfInfo(const int bSelection, const bool bLocalize
#endif
#if HAVE_FEATURE_OPENGL
if ( OpenGLWrapper::isVCLOpenGLEnabled() )
- appendDetails("", Localize(SV_APP_GL, bLocalize));
+ appendDetails(u"", Localize(SV_APP_GL, bLocalize));
else
#endif
- appendDetails("", Localize(SV_APP_DEFAULT, bLocalize));
+ appendDetails(u"", Localize(SV_APP_DEFAULT, bLocalize));
#if (defined LINUX || defined _WIN32 || defined MACOSX)
- appendDetails("; ", SV_APP_VCLBACKEND + GetToolkitName());
+ appendDetails(u"; ", SV_APP_VCLBACKEND + GetToolkitName());
#endif
}
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 9593847dd276..d09e58affdd0 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1386,7 +1386,7 @@ void GraphicFilter::preload()
sal_Int32 nTokenCount = comphelper::string::getTokenCount(aFilterPath, ';');
ImpFilterLibCache& rCache = Cache::get();
static const std::initializer_list<OUStringLiteral> aFilterNames = {
- "icd", "idx", "ime", "ipb", "ipd", "ips", "ipt", "ipx", "ira", "itg", "iti",
+ u"icd", u"idx", u"ime", u"ipb", u"ipd", u"ips", u"ipt", u"ipx", u"ira", u"itg", u"iti",
};
// Load library for each filter.
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index b814d871702e..0be50512d569 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -5188,7 +5188,7 @@ sal_Int32 PDFWriterImpl::emitOutputIntent()
aLine.append( " 0 obj\n"
"<</Type/OutputIntent/S/GTS_PDFA1/OutputConditionIdentifier");
- appendLiteralStringEncrypt( OUStringLiteral("sRGB IEC61966-2.1") ,nOIObject, aLine );
+ appendLiteralStringEncrypt( OUStringLiteral(u"sRGB IEC61966-2.1") ,nOIObject, aLine );
aLine.append("/DestOutputProfile ");
aLine.append( nICCObject );
aLine.append( " 0 R>>\nendobj\n\n" );
@@ -10927,7 +10927,7 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa
rNewWidget.m_nTextStyle =
DrawTextFlags::VCenter | DrawTextFlags::MultiLine | DrawTextFlags::WordBreak;
- rNewWidget.m_aValue = rBox.Checked ? OUStringLiteral("Yes") : OUStringLiteral("Off" );
+ rNewWidget.m_aValue = rBox.Checked ? OUStringLiteral(u"Yes") : OUStringLiteral(u"Off" );
// create default appearance before m_aRect gets transformed
createDefaultCheckBoxAppearance( rNewWidget, rBox );
}
diff --git a/vcl/source/helper/driverblocklist.cxx b/vcl/source/helper/driverblocklist.cxx
index 49bc819b54d6..8b2ca1ffa0c1 100644
--- a/vcl/source/helper/driverblocklist.cxx
+++ b/vcl/source/helper/driverblocklist.cxx
@@ -162,15 +162,15 @@ OUStringLiteral GetVendorNameFromId(uint32_t id)
switch (id)
{
case 0x8086:
- return "Intel";
+ return u"Intel";
case 0x10de:
- return "Nvidia";
+ return u"Nvidia";
case 0x1002:
- return "AMD";
+ return u"AMD";
case 0x1414:
- return "Microsoft";
+ return u"Microsoft";
default:
- return "?";
+ return u"?";
}
}
diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx
index 6108621918e6..16b2f4015778 100644
--- a/vcl/source/window/mnemonic.cxx
+++ b/vcl/source/window/mnemonic.cxx
@@ -262,7 +262,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey )
if ( maMnemonics[nMnemonicIndex] )
{
maMnemonics[nMnemonicIndex] = 0;
- OUString aStr = OUStringLiteral("(") + OUStringChar(m_cMnemonic) +
+ OUString aStr = OUStringLiteral(u"(") + OUStringChar(m_cMnemonic) +
OUStringChar(sal_Unicode(rtl::toAsciiUpperCase(c))) +
")";
nIndex = rKey.getLength();
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 9e0abb81f1dd..8d6be94a77d5 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -189,56 +189,56 @@ namespace
{
const OUStringLiteral SV_ICON_SIZE48[] =
{
- MAINAPP_48_8,
- MAINAPP_48_8,
- ODT_48_8,
- OTT_48_8,
- ODS_48_8,
- OTS_48_8,
- ODG_48_8,
- MAINAPP_48_8,
- ODP_48_8,
- MAINAPP_48_8,
- ODM_48_8,
- MAINAPP_48_8,
- ODB_48_8,
- ODF_48_8
+ u"" MAINAPP_48_8,
+ u"" MAINAPP_48_8,
+ u"" ODT_48_8,
+ u"" OTT_48_8,
+ u"" ODS_48_8,
+ u"" OTS_48_8,
+ u"" ODG_48_8,
+ u"" MAINAPP_48_8,
+ u"" ODP_48_8,
+ u"" MAINAPP_48_8,
+ u"" ODM_48_8,
+ u"" MAINAPP_48_8,
+ u"" ODB_48_8,
+ u"" ODF_48_8
};
const OUStringLiteral SV_ICON_SIZE32[] =
{
- MAINAPP_32_8,
- MAINAPP_32_8,
- ODT_32_8,
- OTT_32_8,
- ODS_32_8,
- OTS_32_8,
- ODG_32_8,
- MAINAPP_32_8,
- ODP_32_8,
- MAINAPP_32_8,
- ODM_32_8,
- MAINAPP_32_8,
- ODB_32_8,
- ODF_32_8
+ u"" MAINAPP_32_8,
+ u"" MAINAPP_32_8,
+ u"" ODT_32_8,
+ u"" OTT_32_8,
+ u"" ODS_32_8,
+ u"" OTS_32_8,
+ u"" ODG_32_8,
+ u"" MAINAPP_32_8,
+ u"" ODP_32_8,
+ u"" MAINAPP_32_8,
+ u"" ODM_32_8,
+ u"" MAINAPP_32_8,
+ u"" ODB_32_8,
+ u"" ODF_32_8
};
const OUStringLiteral SV_ICON_SIZE16[] =
{
- MAINAPP_16_8,
- MAINAPP_16_8,
- ODT_16_8,
- OTT_16_8,
- ODS_16_8,
- OTS_16_8,
- ODG_16_8,
- MAINAPP_16_8,
- ODP_16_8,
- MAINAPP_16_8,
- ODM_16_8,
- MAINAPP_16_8,
- ODB_16_8,
- ODF_16_8
+ u"" MAINAPP_16_8,
+ u"" MAINAPP_16_8,
+ u"" ODT_16_8,
+ u"" OTT_16_8,
+ u"" ODS_16_8,
+ u"" OTS_16_8,
+ u"" ODG_16_8,
+ u"" MAINAPP_16_8,
+ u"" ODP_16_8,
+ u"" MAINAPP_16_8,
+ u"" ODM_16_8,
+ u"" MAINAPP_16_8,
+ u"" ODB_16_8,
+ u"" ODF_16_8
};
}
generated by cgit (git 2.34.1) at 2025-01-10 15:36:41 +0000