From: Claudio Cambra Date: Wed, 25 Jan 2023 11:56:26 +0000 (+0100) Subject: Remove monoIcons related things from configfile X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~28^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8f2dcf4ca3122cd8f4b7d5072337e0a90890ac4f;p=nextcloud-desktop.git Remove monoIcons related things from configfile Signed-off-by: Claudio Cambra --- diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp index 08064026f..16cb45576 100644 --- a/src/libsync/configfile.cpp +++ b/src/libsync/configfile.cpp @@ -56,7 +56,6 @@ static constexpr char remotePollIntervalC[] = "remotePollInterval"; static constexpr char forceSyncIntervalC[] = "forceSyncInterval"; static constexpr char fullLocalDiscoveryIntervalC[] = "fullLocalDiscoveryInterval"; static constexpr char notificationRefreshIntervalC[] = "notificationRefreshInterval"; -static constexpr char monoIconsC[] = "monoIcons"; static constexpr char promptDeleteC[] = "promptDeleteAllFiles"; static constexpr char crashReporterC[] = "crashReporter"; static constexpr char optionalServerNotificationsC[] = "optionalServerNotifications"; @@ -947,23 +946,6 @@ void ConfigFile::setPromptDeleteFiles(bool promptDeleteFiles) settings.setValue(QLatin1String(promptDeleteC), promptDeleteFiles); } -bool ConfigFile::monoIcons() const -{ - QSettings settings(configFile(), QSettings::IniFormat); - bool monoDefault = false; // On Mac we want bw by default -#ifdef Q_OS_MAC - // OEM themes are not obliged to ship mono icons - monoDefault = QByteArrayLiteral("Nextcloud") == QByteArrayLiteral(APPLICATION_NAME); -#endif - return settings.value(QLatin1String(monoIconsC), monoDefault).toBool(); -} - -void ConfigFile::setMonoIcons(bool useMonoIcons) -{ - QSettings settings(configFile(), QSettings::IniFormat); - settings.setValue(QLatin1String(monoIconsC), useMonoIcons); -} - bool ConfigFile::crashReporter() const { QSettings settings(configFile(), QSettings::IniFormat); diff --git a/src/libsync/configfile.h b/src/libsync/configfile.h index 719cce083..d7d6f4ebe 100644 --- a/src/libsync/configfile.h +++ b/src/libsync/configfile.h @@ -83,9 +83,6 @@ public: */ [[nodiscard]] std::chrono::milliseconds fullLocalDiscoveryInterval() const; - [[nodiscard]] bool monoIcons() const; - void setMonoIcons(bool); - [[nodiscard]] bool promptDeleteFiles() const; void setPromptDeleteFiles(bool promptDeleteFiles);