summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-11-29 08:46:47 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-11-29 09:57:15 +0100
commit933660e591211f06a1be43e83c64ad1e8529bc2f (patch)
treeadc0ede7c30c9ee5af7b75e649c806831f73da41 /desktop
parentb9c9c70157e7bc5b868437ab6bda2b21ba34c627 (diff)
loplugin:stringconstant look for unnecessary OString constructor use
and tweak the methods in check.hxx to make them more flexible when called with dc.Class(xxx ? "foo" : "bar") Change-Id: I881fe628f22121ced4d8849715d6b1c92b092da1 Reviewed-on: https://gerrit.libreoffice.org/64207 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/deployment/inc/lockfile.hxx12
-rw-r--r--desktop/source/deployment/misc/lockfile.cxx2
2 files changed, 7 insertions, 7 deletions
diff --git a/desktop/source/deployment/inc/lockfile.hxx b/desktop/source/deployment/inc/lockfile.hxx
index 07dbc3446f3d..dc1e66cc0890 100644
--- a/desktop/source/deployment/inc/lockfile.hxx
+++ b/desktop/source/deployment/inc/lockfile.hxx
@@ -41,12 +41,12 @@
#include "dp_misc_api.hxx"
-#define LOCKFILE_GROUP OString( "Lockdata" )
-#define LOCKFILE_USERKEY OString( "User" )
-#define LOCKFILE_HOSTKEY OString( "Host" )
-#define LOCKFILE_STAMPKEY OString( "Stamp" )
-#define LOCKFILE_TIMEKEY OString( "Time" )
-#define LOCKFILE_IPCKEY OString( "IPCServer" )
+#define LOCKFILE_GROUP "Lockdata"
+#define LOCKFILE_USERKEY "User"
+#define LOCKFILE_HOSTKEY "Host"
+#define LOCKFILE_STAMPKEY "Stamp"
+#define LOCKFILE_TIMEKEY "Time"
+#define LOCKFILE_IPCKEY "IPCServer"
namespace desktop {
diff --git a/desktop/source/deployment/misc/lockfile.cxx b/desktop/source/deployment/misc/lockfile.cxx
index 219ccaf10431..b46da255647b 100644
--- a/desktop/source/deployment/misc/lockfile.cxx
+++ b/desktop/source/deployment/misc/lockfile.cxx
@@ -155,7 +155,7 @@ namespace desktop {
Config aConfig(aLockname);
aConfig.SetGroup(LOCKFILE_GROUP);
OString aIPCserver = aConfig.ReadKey( LOCKFILE_IPCKEY );
- if (!aIPCserver.equalsIgnoreAsciiCase(OString("true")))
+ if (!aIPCserver.equalsIgnoreAsciiCase("true"))
return false;
OString aHost = aConfig.ReadKey( LOCKFILE_HOSTKEY );