Turn utility_* into stand-alone files

5 files changed, 61 insertions, 58 deletions

diff --git a/src/common/common.cmake b/src/common/common.cmake
index ebe69f565..eafbd1a38 100644
--- a/src/common/common.cmake
+++ b/src/common/common.cmake
@@ -16,4 +16,18 @@ set(common_SOURCES
     ${CMAKE_CURRENT_LIST_DIR}/syncfilestatus.cpp
 )
 
+if(WIN32)
+    list(APPEND common_SOURCES
+        ${CMAKE_CURRENT_LIST_DIR}/utility_win.cpp
+    )
+elseif(APPLE)
+    list(APPEND common_SOURCES
+        ${CMAKE_CURRENT_LIST_DIR}/utility_mac.mm
+    )
+elseif(UNIX AND NOT APPLE)
+    list(APPEND common_SOURCES
+        ${CMAKE_CURRENT_LIST_DIR}/utility_unix.cpp
+    )
+endif()
+
 configure_file(${CMAKE_CURRENT_LIST_DIR}/vfspluginmetadata.json.in ${CMAKE_CURRENT_BINARY_DIR}/vfspluginmetadata.json)
diff --git a/src/common/utility.cpp b/src/common/utility.cpp
index 18ae8aba3..ab22a60e4 100644
--- a/src/common/utility.cpp
+++ b/src/common/utility.cpp
@@ -49,14 +49,6 @@
 #include <stdarg.h>
 #include <cstring>
 
-#if defined(Q_OS_WIN)
-#include "utility_win.cpp"
-#elif defined(Q_OS_MAC)
-#include "utility_mac.cpp"
-#else
-#include "utility_unix.cpp"
-#endif
-
 namespace OCC {
 
 Q_LOGGING_CATEGORY(lcUtility, "sync.utility", QtInfoMsg)
@@ -104,11 +96,6 @@ QString Utility::formatFingerprint(const QByteArray &fmhash, bool colonSeparated
     return fp;
 }
 
-void Utility::setupFavLink(const QString &folder)
-{
-    setupFavLink_private(folder);
-}
-
 QString Utility::octetsToString(qint64 octets)
 {
 #define THE_FACTOR 1024
@@ -190,26 +177,6 @@ QByteArray Utility::userAgentString()
         .toLatin1();
 }
 
-bool Utility::hasSystemLaunchOnStartup(const QString &appName)
-{
-#if defined(Q_OS_WIN)
-    return hasSystemLaunchOnStartup_private(appName);
-#else
-    Q_UNUSED(appName)
-    return false;
-#endif
-}
-
-bool Utility::hasLaunchOnStartup(const QString &appName)
-{
-    return hasLaunchOnStartup_private(appName);
-}
-
-void Utility::setLaunchOnStartup(const QString &appName, const QString &guiName, bool enable)
-{
-    setLaunchOnStartup_private(appName, guiName, enable);
-}
-
 qint64 Utility::freeDiskSpace(const QString &path)
 {
 #if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD)
@@ -391,14 +358,6 @@ QByteArray Utility::normalizeEtag(QByteArray etag)
     return etag;
 }
 
-#ifndef TOKEN_AUTH_ONLY
-bool Utility::hasDarkSystray()
-{
-    return hasDarkSystray_private();
-}
-#endif
-
-
 QString Utility::platformName()
 {
     return QSysInfo::prettyProductName();
diff --git a/src/common/utility_mac.cpp b/src/common/utility_mac.mm
index 662a21311..9d1ba4a60 100644
--- a/src/common/utility_mac.cpp
+++ b/src/common/utility_mac.mm
@@ -18,12 +18,15 @@
 
 #include "utility.h"
 
-#include <CoreServices/CoreServices.h>
+#include <QCoreApplication>
+#include <QDir>
+
 #include <CoreFoundation/CoreFoundation.h>
+#include <CoreServices/CoreServices.h>
 
 namespace OCC {
 
-static void setupFavLink_private(const QString &folder)
+void Utility::setupFavLink(const QString &folder)
 {
     // Finder: Place under "Places"/"Favorites" on the left sidebar
     CFStringRef folderCFStr = CFStringCreateWithCString(0, folder.toUtf8().data(), kCFStringEncodingUTF8);
@@ -43,7 +46,13 @@ static void setupFavLink_private(const QString &folder)
     CFRelease(urlRef);
 }
 
-bool hasLaunchOnStartup_private(const QString &)
+bool Utility::hasSystemLaunchOnStartup(const QString &appName)
+{
+    Q_UNUSED(appName)
+    return false;
+}
+
+bool Utility::hasLaunchOnStartup(const QString &appName)
 {
     // this is quite some duplicate code with setLaunchOnStartup, at some point we should fix this FIXME.
     bool returnValue = false;
@@ -76,7 +85,7 @@ bool hasLaunchOnStartup_private(const QString &)
     return returnValue;
 }
 
-void setLaunchOnStartup_private(const QString &appName, const QString &guiName, bool enable)
+void Utility::setLaunchOnStartup(const QString &appName, const QString &guiName, bool enable)
 {
     Q_UNUSED(appName)
     Q_UNUSED(guiName)
@@ -123,7 +132,8 @@ void setLaunchOnStartup_private(const QString &appName, const QString &guiName,
     CFRelease(urlRef);
 }
 
-static bool hasDarkSystray_private()
+#ifndef TOKEN_AUTH_ONLY
+bool Utility::hasDarkSystray()
 {
     bool returnValue = false;
     CFStringRef interfaceStyleKey = CFSTR("AppleInterfaceStyle");
@@ -137,5 +147,6 @@ static bool hasDarkSystray_private()
     }
     return returnValue;
 }
+#endif
 
 } // namespace OCC
diff --git a/src/common/utility_unix.cpp b/src/common/utility_unix.cpp
index 0dc74bed8..7770465cd 100644
--- a/src/common/utility_unix.cpp
+++ b/src/common/utility_unix.cpp
@@ -17,11 +17,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "utility.h"
+
+#include <QCoreApplication>
+#include <QDir>
+#include <QFile>
 #include <QStandardPaths>
+#include <QString>
+#include <QTextStream>
 
 namespace OCC {
 
-static void setupFavLink_private(const QString &folder)
+void Utility::setupFavLink(const QString &folder)
 {
     // Nautilus: add to ~/.gtk-bookmarks
     QFile gtkBookmarks(QDir::homePath() + QLatin1String("/.gtk-bookmarks"));
@@ -38,22 +45,28 @@ static void setupFavLink_private(const QString &folder)
 
 // returns the autostart directory the linux way
 // and respects the XDG_CONFIG_HOME env variable
-QString getUserAutostartDir_private()
+static QString getUserAutostartDir()
 {
     QString config = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
     config += QLatin1String("/autostart/");
     return config;
 }
 
-bool hasLaunchOnStartup_private(const QString &appName)
+bool Utility::hasSystemLaunchOnStartup(const QString &appName)
+{
+    Q_UNUSED(appName)
+    return false;
+}
+
+bool Utility::hasLaunchOnStartup(const QString &appName)
 {
-    QString desktopFileLocation = getUserAutostartDir_private() + appName + QLatin1String(".desktop");
+    QString desktopFileLocation = getUserAutostartDir() + appName + QLatin1String(".desktop");
     return QFile::exists(desktopFileLocation);
 }
 
-void setLaunchOnStartup_private(const QString &appName, const QString &guiName, bool enable)
+void Utility::setLaunchOnStartup(const QString &appName, const QString &guiName, bool enable)
 {
-    QString userAutoStartPath = getUserAutostartDir_private();
+    QString userAutoStartPath = getUserAutostartDir();
     QString desktopFileLocation = userAutoStartPath + appName + QLatin1String(".desktop");
     if (enable) {
         if (!QDir().exists(userAutoStartPath) && !QDir().mkpath(userAutoStartPath)) {
@@ -85,9 +98,11 @@ void setLaunchOnStartup_private(const QString &appName, const QString &guiName,
     }
 }
 
-static inline bool hasDarkSystray_private()
+#ifndef TOKEN_AUTH_ONLY
+bool Utility::hasDarkSystray()
 {
     return true;
 }
+#endif
 
 } // namespace OCC
diff --git a/src/common/utility_win.cpp b/src/common/utility_win.cpp
index a76bf97ef..ad3dfc19d 100644
--- a/src/common/utility_win.cpp
+++ b/src/common/utility_win.cpp
@@ -28,8 +28,10 @@
 #include <winerror.h>
 
 #include <QCoreApplication>
+#include <QDir>
 #include <QFileInfo>
 #include <QLibrary>
+#include <QSettings>
 
 extern Q_CORE_EXPORT int qt_ntfs_permission_lookup;
 
@@ -51,7 +53,7 @@ const QString systemThemesC()
 
 namespace OCC {
 
-static void setupFavLink_private(const QString &folder)
+void Utility::setupFavLink(const QString &folder)
 {
     // First create a Desktop.ini so that the folder and favorite link show our application's icon.
     QFile desktopIni(folder + QLatin1String("/Desktop.ini"));
@@ -89,19 +91,19 @@ static void setupFavLink_private(const QString &folder)
         qCWarning(lcUtility) << "linking" << folder << "to" << linkName << "failed!";
 }
 
-bool hasSystemLaunchOnStartup_private(const QString &appName)
+bool Utility::hasSystemLaunchOnStartup(const QString &appName)
 {
     QSettings settings(systemRunPathC(), QSettings::NativeFormat);
     return settings.contains(appName);
 }
 
-bool hasLaunchOnStartup_private(const QString &appName)
+bool Utility::hasLaunchOnStartup(const QString &appName)
 {
     QSettings settings(runPathC(), QSettings::NativeFormat);
     return settings.contains(appName);
 }
 
-void setLaunchOnStartup_private(const QString &appName, const QString &guiName, bool enable)
+void Utility::setLaunchOnStartup(const QString &appName, const QString &guiName, bool enable)
 {
     Q_UNUSED(guiName);
     QSettings settings(runPathC(), QSettings::NativeFormat);
@@ -112,11 +114,13 @@ void setLaunchOnStartup_private(const QString &appName, const QString &guiName,
     }
 }
 
-static inline bool hasDarkSystray_private()
+#ifndef TOKEN_AUTH_ONLY
+bool Utility::hasDarkSystray()
 {
     const QSettings settings(systemThemesC(), QSettings::NativeFormat);
     return !settings.value(QStringLiteral("SystemUsesLightTheme"), false).toBool();
 }
+#endif
 
 QVariant Utility::registryGetKeyValue(HKEY hRootKey, const QString &subKey, const QString &valueName)
 {