add guards around string constants

Signed-off-by: tnixeu <4436784+tnixeu@users.noreply.github.com>
nextcloud · Oct 29, 2022 · dd3f74d · dd3f74d
1 parent 8deb009
commit dd3f74d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
@@ -46,8 +46,10 @@
 #include <QPushButton>
 #include <QApplication>
 
+#ifndef VERSION_C
+#define VERSION_C
 static const char versionC[] = "version";
-
+#endif
 namespace OCC {
 
 Q_LOGGING_CATEGORY(lcFolder, "nextcloud.gui.folder", QtInfoMsg)

diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
@@ -39,7 +39,10 @@
 #include <QDesktopServices>
 #include <QtConcurrent>
 
+#ifndef VERSION_C
+#define VERSION_C
 static const char versionC[] = "version";
+#endif
 static const int maxFoldersVersion = 1;
 
 namespace OCC {

diff --git a/src/gui/sharelinkwidget.cpp b/src/gui/sharelinkwidget.cpp
@@ -34,7 +34,10 @@
 #include <QPropertyAnimation>
 
 namespace {
+#ifndef PASSWORD_IS_SET_PLACEHOLDER
+#define PASSWORD_IS_SET_PLACEHOLDER
     const char *passwordIsSetPlaceholder = "●●●●●●●●";
+#endif
 }
 
 namespace OCC {

diff --git a/src/gui/shareusergroupwidget.cpp b/src/gui/shareusergroupwidget.cpp
@@ -58,8 +58,10 @@
 #include <cstring>
 
 namespace {
-const char *passwordIsSetPlaceholder = "●●●●●●●●";
-
+#ifndef PASSWORD_IS_SET_PLACEHOLDER
+#define PASSWORD_IS_SET_PLACEHOLDER
+    const char *passwordIsSetPlaceholder = "●●●●●●●●";
+#endif
 }
 
 namespace OCC {