refactor: move lib/gui/Constants.h => lib/common/UrlConstants.h

src/apps/deskflow-gui/MainWindow.cpp

@@ -18,7 +18,7 @@
 
 #include "base/String.h"
 #include "common/Settings.h"
-#include "gui/Constants.h"
+#include "common/UrlConstants.h"
 #include "gui/Diagnostic.h"
 #include "gui/Logger.h"
 #include "gui/Messages.h"

src/apps/deskflow-gui/main.cpp

@@ -9,7 +9,7 @@
 #include "MainWindow.h"
 #include "StyleUtils.h"
 #include "common/Constants.h"
-#include "gui/Constants.h"
+#include "common/UrlConstants.h"
 #include "gui/Diagnostic.h"
 #include "gui/DotEnv.h"
 #include "gui/Logger.h"

src/lib/common/CMakeLists.txt

@@ -10,6 +10,7 @@ add_library(common STATIC
   Settings.cpp
   QSettingsProxy.cpp
   QSettingsProxy.h
+  UrlConstants.h
   ${CMAKE_CURRENT_BINARY_DIR}/Constants.h
 )
 

src/lib/common/UrlConstants.h

@@ -16,7 +16,7 @@ namespace deskflow::gui {
 const auto kOrgDomain = QStringLiteral("deskflow.org");
 
 const auto kUrlSourceQuery = QStringLiteral("source=gui");
-const auto kUrlApp = QStringLiteral("https://deskflow.org");
+const auto kUrlApp = QStringLiteral("https://%1").arg(kOrgDomain);
 const auto kUrlHelp = QStringLiteral("%1/help?%2").arg(kUrlApp, kUrlSourceQuery);
 const auto kUrlDownload = QStringLiteral("%1/download?%2").arg(kUrlApp, kUrlSourceQuery);
 

src/lib/gui/CMakeLists.txt

@@ -15,7 +15,6 @@ endif()
 
 add_library(${target} STATIC
   ${platform_sources}
-  Constants.h
   Diagnostic.cpp
   Diagnostic.h
   DotEnv.cpp

src/lib/gui/Messages.cpp

@@ -6,11 +6,18 @@
 
 #include "Messages.h"
 
+<<<<<<< HEAD
 #include "Constants.h"
 #include "EnvVars.h"
 #include "Logger.h"
 #include "Styles.h"
 #include "common/Constants.h"
+=======
+#include "Logger.h"
+#include "Styles.h"
+#include "common/Settings.h"
+#include "common/UrlConstants.h"
+>>>>>>> 25c5bfa2b (refactor: move lib/gui/Constants.h => lib/common/UrlConstants.h)
 
 #include <QAction>
 #include <QDateTime>