From 1c9696b68e17af092f849717bbe8822e5f7441cf Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 21 Sep 2021 17:18:00 +0800 Subject: [PATCH 1/2] Suppress function unused warning --- src/base/preferences.cpp | 2 ++ src/base/preferences.h | 1 + 2 files changed, 3 insertions(+) diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp index 180c40dd4..d9084d361 100644 --- a/src/base/preferences.cpp +++ b/src/base/preferences.cpp @@ -61,12 +61,14 @@ namespace { +#ifdef Q_OS_WIN QString makeProfileID(const QString &profilePath, const QString &profileName) { return profilePath.isEmpty() ? profileName : profileName + QLatin1Char('@') + Utils::Fs::toValidFileSystemName(profilePath, false, {}); } +#endif } Preferences *Preferences::m_instance = nullptr; diff --git a/src/base/preferences.h b/src/base/preferences.h index ff8263ecf..c822cfb33 100644 --- a/src/base/preferences.h +++ b/src/base/preferences.h @@ -30,6 +30,7 @@ #pragma once #include +#include #include #include "base/utils/net.h" From 1c343a444b4d22dade49677429cd5040c1170d3e Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 21 Sep 2021 17:18:43 +0800 Subject: [PATCH 2/2] Remove redundant const specifier --- src/base/preferences.cpp | 2 +- src/base/preferences.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp index d9084d361..296241191 100644 --- a/src/base/preferences.cpp +++ b/src/base/preferences.cpp @@ -92,7 +92,7 @@ void Preferences::freeInstance() m_instance = nullptr; } -const QVariant Preferences::value(const QString &key, const QVariant &defaultValue) const +QVariant Preferences::value(const QString &key, const QVariant &defaultValue) const { return SettingsStorage::instance()->loadValue(key, defaultValue); } diff --git a/src/base/preferences.h b/src/base/preferences.h index c822cfb33..8769bc5e4 100644 --- a/src/base/preferences.h +++ b/src/base/preferences.h @@ -81,7 +81,7 @@ class Preferences : public QObject Preferences(); - const QVariant value(const QString &key, const QVariant &defaultValue = {}) const; + QVariant value(const QString &key, const QVariant &defaultValue = {}) const; void setValue(const QString &key, const QVariant &value); static Preferences *m_instance;