feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Remove SettingsDatabase QObject base

Browse Source 
Was not really needed except for the ownership.

Change-Id: I88e32123cbb85a8217ade9450b5b578845736311
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
hjk
2023-09-14 14:50:02 +02:00
parent 680d77bc35
commit 4ecf769293
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -124,8 +124,7 @@ MainWindow::MainWindow()
, m_lowPrioAdditionalContexts(Constants::C_GLOBAL) , m_lowPrioAdditionalContexts(Constants::C_GLOBAL)
, m_settingsDatabase( , m_settingsDatabase(
new SettingsDatabase(QFileInfo(PluginManager::settings()->fileName()).path(), new SettingsDatabase(QFileInfo(PluginManager::settings()->fileName()).path(),
QCoreApplication::applicationName(), QCoreApplication::applicationName()))
this))
, m_progressManager(new ProgressManagerPrivate) , m_progressManager(new ProgressManagerPrivate)
, m_jsExpander(JsExpander::createGlobalJsExpander()) , m_jsExpander(JsExpander::createGlobalJsExpander())
, m_vcsManager(new VcsManager) , m_vcsManager(new VcsManager)
@@ -307,6 +306,9 @@ MainWindow::~MainWindow()
delete m_jsExpander; delete m_jsExpander;
m_jsExpander = nullptr; m_jsExpander = nullptr;
delete m_settingsDatabase;
m_settingsDatabase = nullptr;
} }
void MainWindow::init() void MainWindow::init()

7
src/plugins/coreplugin/settingsdatabase.cpp
View File

@@ -68,11 +68,8 @@ public:
} // namespace Internal } // namespace Internal
} // namespace Core } // namespace Core
SettingsDatabase::SettingsDatabase(const QString &path, SettingsDatabase::SettingsDatabase(const QString &path, const QString &application)
const QString &application, : d(new SettingsDatabasePrivate)
QObject *parent)
: QObject(parent)
, d(new SettingsDatabasePrivate)
{ {
const QLatin1Char slash('/'); const QLatin1Char slash('/');

6
src/plugins/coreplugin/settingsdatabase.h
View File

@@ -14,11 +14,11 @@ namespace Core {
namespace Internal { class SettingsDatabasePrivate; } namespace Internal { class SettingsDatabasePrivate; }
class CORE_EXPORT SettingsDatabase : public QObject class CORE_EXPORT SettingsDatabase final
{ {
public: public:
SettingsDatabase(const QString &path, const QString &application, QObject *parent = nullptr); SettingsDatabase(const QString &path, const QString &application);
~SettingsDatabase() override; ~SettingsDatabase();
void setValue(const QString &key, const QVariant &value); void setValue(const QString &key, const QVariant &value);
QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const; QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const;