summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2021-07-29 15:08:21 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-08-02 14:43:58 +0200
commit1597cc5b3e07dd24cb4cb10b35b1e93545e4b929 (patch)
treef6ed37244e41d23e8a84327b1580e37f3dc18829 /vcl
parent0e883d6dbee8d72257f77605ae0c8a1d5bfbf044 (diff)
convert #defines to OUStringLiteral
mostly by doing $ git grep -l '#define.*\"' -- *.cxx | xargs perl -pi -e 's/^#define\s+(\w+)\s+(\".*\")/constexpr OUStringLiteral \1 = u\2;/g' Change-Id: Idface893449b0ef2a3c5254865a300585d752fbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119669 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/control/wizardmachine.cxx4
-rw-r--r--vcl/source/gdi/configsettings.cxx2
-rw-r--r--vcl/unx/generic/dtrans/config.cxx4
-rw-r--r--vcl/unx/generic/printer/printerinfomanager.cxx8
-rw-r--r--vcl/unx/gtk3/salnativewidgets-gtk.cxx4
5 files changed, 11 insertions, 11 deletions
diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx
index 17e172d29736..040bf5476489 100644
--- a/vcl/source/control/wizardmachine.cxx
+++ b/vcl/source/control/wizardmachine.cxx
@@ -28,8 +28,8 @@
#include <stack>
#include "wizimpldata.hxx"
-#define HID_WIZARD_NEXT "SVT_HID_WIZARD_NEXT"
-#define HID_WIZARD_PREVIOUS "SVT_HID_WIZARD_PREVIOUS"
+constexpr OStringLiteral HID_WIZARD_NEXT = "SVT_HID_WIZARD_NEXT";
+constexpr OStringLiteral HID_WIZARD_PREVIOUS = "SVT_HID_WIZARD_PREVIOUS";
#define WIZARDDIALOG_BUTTON_OFFSET_Y 6
#define WIZARDDIALOG_BUTTON_DLGOFFSET_X 6
diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx
index 8d477ec37227..18d93b4e7fd0 100644
--- a/vcl/source/gdi/configsettings.cxx
+++ b/vcl/source/gdi/configsettings.cxx
@@ -34,7 +34,7 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::container;
-#define SETTINGS_CONFIGNODE "VCL/Settings"
+constexpr OUStringLiteral SETTINGS_CONFIGNODE = u"VCL/Settings";
SettingsConfigItem* SettingsConfigItem::get()
{
diff --git a/vcl/unx/generic/dtrans/config.cxx b/vcl/unx/generic/dtrans/config.cxx
index 6b40fc16c5ea..1d851a28de82 100644
--- a/vcl/unx/generic/dtrans/config.cxx
+++ b/vcl/unx/generic/dtrans/config.cxx
@@ -23,8 +23,8 @@
#include "X11_selection.hxx"
-#define SETTINGS_CONFIGNODE "VCL/Settings/Transfer"
-#define SELECTION_PROPERTY "SelectionTimeout"
+constexpr OUStringLiteral SETTINGS_CONFIGNODE = u"VCL/Settings/Transfer";
+constexpr OUStringLiteral SELECTION_PROPERTY = u"SelectionTimeout";
namespace x11
{
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index ddb8f93bcb74..2a1dbbfc41a4 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -35,9 +35,9 @@
#include <osl/mutex.hxx>
// filename of configuration files
-#define PRINT_FILENAME "psprint.conf"
+constexpr OUStringLiteral PRINT_FILENAME = u"psprint.conf";
// the group of the global defaults
-#define GLOBAL_DEFAULTS_GROUP "__Global_Printer_Defaults__"
+constexpr OStringLiteral GLOBAL_DEFAULTS_GROUP = "__Global_Printer_Defaults__";
#include <cstddef>
#include <unordered_set>
@@ -212,7 +212,7 @@ void PrinterInfoManager::initialize()
for (auto const& printDir : aDirList)
{
INetURLObject aFile( printDir, INetProtocol::File, INetURLObject::EncodeMechanism::All );
- aFile.Append( u"" PRINT_FILENAME );
+ aFile.Append( PRINT_FILENAME );
Config aConfig( aFile.PathToFileName() );
if( aConfig.HasGroup( GLOBAL_DEFAULTS_GROUP ) )
{
@@ -282,7 +282,7 @@ void PrinterInfoManager::initialize()
{
INetURLObject aDir( printDir, INetProtocol::File, INetURLObject::EncodeMechanism::All );
INetURLObject aFile( aDir );
- aFile.Append( u"" PRINT_FILENAME );
+ aFile.Append( PRINT_FILENAME );
// check directory validity
OUString aUniPath;
diff --git a/vcl/unx/gtk3/salnativewidgets-gtk.cxx b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
index 852aa7ed3774..637ddb031fec 100644
--- a/vcl/unx/gtk3/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
@@ -1490,10 +1490,10 @@ GtkStyleContext* GtkSalGraphics::createStyleContext(GtkControlPart ePart)
}
#ifndef GTK_STYLE_CLASS_POPUP
-#define GTK_STYLE_CLASS_POPUP "popup"
+constexpr OUStringLiteral GTK_STYLE_CLASS_POPUP = u"popup";
#endif
#ifndef GTK_STYLE_CLASS_LABEL
-#define GTK_STYLE_CLASS_LABEL "label"
+constexpr OUStringLiteral GTK_STYLE_CLASS_LABEL = u"label";
#endif
void GtkSalGraphics::PaintCheckOrRadio(cairo_t *cr, GtkStyleContext *context,