Skip to content

Commit 9a54488

Browse files
camilasancamilasan
committed
chore: make settings keys const static member of ConfigFile class.
Signed-off-by: Camila Ayres <[email protected]>
1 parent afe6efe commit 9a54488

File tree

3 files changed

+34
-33
lines changed

3 files changed

+34
-33
lines changed

‎src/gui/accountmanager.cpp‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,6 @@ constexpr auto maxAccountVersion = 13;
8484
constexpr auto serverHasValidSubscriptionC = "serverHasValidSubscription";
8585

8686
constexpr auto generalC = "General";
87-
constexpr auto isVfsEnabledC = "isVfsEnabled";
88-
constexpr auto launchOnSystemStartupC = "launchOnSystemStartup";
89-
constexpr auto optionalServerNotificationsC = "optionalServerNotifications";
90-
constexpr auto promptDeleteC = "promptDeleteAllFiles";
91-
constexpr auto showCallNotificationsC = "showCallNotifications";
92-
constexpr auto showChatNotificationsC = "showChatNotifications";
93-
constexpr auto showInExplorerNavigationPaneC = "showInExplorerNavigationPane";
9487
}
9588

9689

@@ -261,13 +254,13 @@ bool AccountManager::restoreFromLegacySettings()
261254
}
262255

263256
ConfigFile configFile;
264-
configFile.setVfsEnabled(settings->value(QLatin1String(isVfsEnabledC)).toBool());
265-
configFile.setLaunchOnSystemStartup(settings->value(QLatin1String(launchOnSystemStartupC)).toBool());
266-
configFile.setOptionalServerNotifications(settings->value(QLatin1String(optionalServerNotificationsC)).toBool());
267-
configFile.setPromptDeleteFiles(settings->value(QLatin1String(promptDeleteC)).toBool());
268-
configFile.setShowCallNotifications(settings->value(QLatin1String(showCallNotificationsC)).toBool());
269-
configFile.setShowChatNotifications(settings->value(QLatin1String(showChatNotificationsC)).toBool());
270-
configFile.setShowInExplorerNavigationPane(settings->value(QLatin1String(showInExplorerNavigationPaneC)).toBool());
257+
configFile.setVfsEnabled(settings->value(configFile.isVfsEnabledC).toBool());
258+
configFile.setLaunchOnSystemStartup(settings->value(configFile.launchOnSystemStartupC).toBool());
259+
configFile.setOptionalServerNotifications(settings->value(configFile.optionalServerNotificationsC).toBool());
260+
configFile.setPromptDeleteFiles(settings->value(configFile.promptDeleteC).toBool());
261+
configFile.setShowCallNotifications(settings->value(configFile.showCallNotificationsC).toBool());
262+
configFile.setShowChatNotifications(settings->value(configFile.showChatNotificationsC).toBool());
263+
configFile.setShowInExplorerNavigationPane(settings->value(configFile.showInExplorerNavigationPaneC).toBool());
271264
ClientProxy().saveProxyConfigurationFromSettings(*settings);
272265

273266
// Try to load the single account.

‎src/libsync/configfile.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,15 @@ static constexpr char forceSyncIntervalC[] = "forceSyncInterval";
5353
static constexpr char fullLocalDiscoveryIntervalC[] = "fullLocalDiscoveryInterval";
5454
static constexpr char notificationRefreshIntervalC[] = "notificationRefreshInterval";
5555
static constexpr char monoIconsC[] = "monoIcons";
56-
static constexpr char promptDeleteC[] = "promptDeleteAllFiles";
5756
static constexpr char deleteFilesThresholdC[] = "deleteFilesThreshold";
5857
static constexpr char crashReporterC[] = "crashReporter";
59-
static constexpr char optionalServerNotificationsC[] = "optionalServerNotifications";
60-
static constexpr char showCallNotificationsC[] = "showCallNotifications";
61-
static constexpr char showChatNotificationsC[] = "showChatNotifications";
62-
static constexpr char showInExplorerNavigationPaneC[] = "showInExplorerNavigationPane";
6358
static constexpr char skipUpdateCheckC[] = "skipUpdateCheck";
6459
static constexpr char autoUpdateCheckC[] = "autoUpdateCheck";
6560
static constexpr char updateCheckIntervalC[] = "updateCheckInterval";
6661
static constexpr char updateSegmentC[] = "updateSegment";
6762
static constexpr char updateChannelC[] = "updateChannel";
6863
static constexpr char overrideServerUrlC[] = "overrideServerUrl";
6964
static constexpr char overrideLocalDirC[] = "overrideLocalDir";
70-
static constexpr char isVfsEnabledC[] = "isVfsEnabled";
7165
static constexpr char geometryC[] = "geometry";
7266
static constexpr char timeoutC[] = "timeout";
7367
static constexpr char chunkSizeC[] = "chunkSize";
@@ -81,7 +75,6 @@ static constexpr char logExpireC[] = "logExpire";
8175
static constexpr char logFlushC[] = "logFlush";
8276
static constexpr char showExperimentalOptionsC[] = "showExperimentalOptions";
8377
static constexpr char clientVersionC[] = "clientVersion";
84-
static constexpr char launchOnSystemStartupC[] = "launchOnSystemStartup";
8578

8679
static constexpr char proxyHostC[] = "Proxy/host";
8780
static constexpr char proxyTypeC[] = "Proxy/type";
@@ -128,6 +121,13 @@ Q_LOGGING_CATEGORY(lcConfigFile, "nextcloud.sync.configfile", QtInfoMsg)
128121

129122
QString ConfigFile::_confDir = {};
130123
QString ConfigFile::_discoveredLegacyConfigPath = {};
124+
QString const ConfigFile::isVfsEnabledC = "isVfsEnabled";
125+
QString const ConfigFile::launchOnSystemStartupC = "launchOnSystemStartup";
126+
QString const ConfigFile::optionalServerNotificationsC = "optionalServerNotifications";
127+
QString const ConfigFile::promptDeleteC = "promptDeleteAllFiles";
128+
QString const ConfigFile::showCallNotificationsC = "showCallNotifications";
129+
QString const ConfigFile::showChatNotificationsC = "showChatNotifications";
130+
QString const ConfigFile::showInExplorerNavigationPaneC = "showInExplorerNavigationPane";
131131

132132
static chrono::milliseconds millisecondsValue(const QSettings &setting, const char *key,
133133
chrono::milliseconds defaultValue)
@@ -208,32 +208,32 @@ bool ConfigFile::setConfDir(const QString &value)
208208
bool ConfigFile::optionalServerNotifications() const
209209
{
210210
QSettings settings(configFile(), QSettings::IniFormat);
211-
return settings.value(QLatin1String(optionalServerNotificationsC), true).toBool();
211+
return settings.value(optionalServerNotificationsC, true).toBool();
212212
}
213213

214214
bool ConfigFile::showChatNotifications() const
215215
{
216216
const QSettings settings(configFile(), QSettings::IniFormat);
217-
return settings.value(QLatin1String(showChatNotificationsC), true).toBool() && optionalServerNotifications();
217+
return settings.value(showChatNotificationsC, true).toBool() && optionalServerNotifications();
218218
}
219219

220220
void ConfigFile::setShowChatNotifications(const bool show)
221221
{
222222
QSettings settings(configFile(), QSettings::IniFormat);
223-
settings.setValue(QLatin1String(showChatNotificationsC), show);
223+
settings.setValue(showChatNotificationsC, show);
224224
settings.sync();
225225
}
226226

227227
bool ConfigFile::showCallNotifications() const
228228
{
229229
const QSettings settings(configFile(), QSettings::IniFormat);
230-
return settings.value(QLatin1String(showCallNotificationsC), true).toBool() && optionalServerNotifications();
230+
return settings.value(showCallNotificationsC, true).toBool() && optionalServerNotifications();
231231
}
232232

233233
void ConfigFile::setShowCallNotifications(bool show)
234234
{
235235
QSettings settings(configFile(), QSettings::IniFormat);
236-
settings.setValue(QLatin1String(showCallNotificationsC), show);
236+
settings.setValue(showCallNotificationsC, show);
237237
settings.sync();
238238
}
239239

@@ -247,13 +247,13 @@ bool ConfigFile::showInExplorerNavigationPane() const
247247
#endif
248248
;
249249
QSettings settings(configFile(), QSettings::IniFormat);
250-
return settings.value(QLatin1String(showInExplorerNavigationPaneC), defaultValue).toBool();
250+
return settings.value(showInExplorerNavigationPaneC, defaultValue).toBool();
251251
}
252252

253253
void ConfigFile::setShowInExplorerNavigationPane(bool show)
254254
{
255255
QSettings settings(configFile(), QSettings::IniFormat);
256-
settings.setValue(QLatin1String(showInExplorerNavigationPaneC), show);
256+
settings.setValue(showInExplorerNavigationPaneC, show);
257257
settings.sync();
258258
}
259259

@@ -290,7 +290,7 @@ chrono::milliseconds ConfigFile::targetChunkUploadDuration() const
290290
void ConfigFile::setOptionalServerNotifications(bool show)
291291
{
292292
QSettings settings(configFile(), QSettings::IniFormat);
293-
settings.setValue(QLatin1String(optionalServerNotificationsC), show);
293+
settings.setValue(optionalServerNotificationsC, show);
294294
settings.sync();
295295
}
296296

@@ -1064,13 +1064,13 @@ bool ConfigFile::showMainDialogAsNormalWindow() const {
10641064
bool ConfigFile::promptDeleteFiles() const
10651065
{
10661066
QSettings settings(configFile(), QSettings::IniFormat);
1067-
return settings.value(QLatin1String(promptDeleteC), false).toBool();
1067+
return settings.value(promptDeleteC, false).toBool();
10681068
}
10691069

10701070
void ConfigFile::setPromptDeleteFiles(bool promptDeleteFiles)
10711071
{
10721072
QSettings settings(configFile(), QSettings::IniFormat);
1073-
settings.setValue(QLatin1String(promptDeleteC), promptDeleteFiles);
1073+
settings.setValue(promptDeleteC, promptDeleteFiles);
10741074
}
10751075

10761076
int ConfigFile::deleteFilesThreshold() const
@@ -1221,13 +1221,13 @@ void ConfigFile::setClientVersionString(const QString &version)
12211221
bool ConfigFile::launchOnSystemStartup() const
12221222
{
12231223
QSettings settings(configFile(), QSettings::IniFormat);
1224-
return settings.value(QLatin1String(launchOnSystemStartupC), true).toBool();
1224+
return settings.value(launchOnSystemStartupC, true).toBool();
12251225
}
12261226

12271227
void ConfigFile::setLaunchOnSystemStartup(const bool autostart)
12281228
{
12291229
QSettings settings(configFile(), QSettings::IniFormat);
1230-
settings.setValue(QLatin1String(launchOnSystemStartupC), autostart);
1230+
settings.setValue(launchOnSystemStartupC, autostart);
12311231
}
12321232

12331233
bool ConfigFile::serverHasValidSubscription() const

‎src/libsync/configfile.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,14 @@ class OWNCLOUDSYNC_EXPORT ConfigFile
256256
[[nodiscard]] static QString discoveredLegacyConfigPath();
257257
static void setDiscoveredLegacyConfigPath(const QString &discoveredLegacyConfigPath);
258258

259+
static const QString isVfsEnabledC;
260+
static const QString launchOnSystemStartupC;
261+
static const QString optionalServerNotificationsC;
262+
static const QString promptDeleteC;
263+
static const QString showCallNotificationsC;
264+
static const QString showChatNotificationsC;
265+
static const QString showInExplorerNavigationPaneC;
266+
259267
protected:
260268
[[nodiscard]] QVariant getPolicySetting(const QString &policy, const QVariant &defaultValue = QVariant()) const;
261269
void storeData(const QString &group, const QString &key, const QVariant &value);

0 commit comments

Comments
 (0)