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

Utils, all: Standardize on QtcSettings

Browse Source 
Change-Id: Id222016f15b1c3bfe6710fe5d0297666d4565ef1
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2023-09-22 16:15:27 +02:00
parent 4629b0f69e
commit 342e066886
172 changed files with 955 additions and 874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/qmljseditor/qmljseditingsettingspage.cpp
View File

@@ -7,9 +7,11 @@
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
#include <qmljs/qmljscheck.h>
#include <qmljs/qmljsstaticanalysismessage.h>
#include <qmljstools/qmljstoolsconstants.h>
#include <utils/algorithm.h>
#include <utils/layoutbuilder.h>
#include <utils/macroexpander.h>
@@ -22,7 +24,6 @@
#include <QLabel>
#include <QLineEdit>
#include <QMenu>
#include <QSettings>
#include <QTextStream>
#include <QTreeView>
@@ -43,8 +44,10 @@ const char DISABLED_MESSAGES[] = "QmlJSEditor.disabledMessages";
const char DISABLED_MESSAGES_NONQUICKUI[] = "QmlJSEditor.disabledMessagesNonQuickUI";
const char DEFAULT_CUSTOM_FORMAT_COMMAND[] = "%{CurrentDocument:Project:QT_HOST_BINS}/qmlformat";
using namespace QmlJSEditor;
using namespace QmlJSEditor::Internal;
using namespace Utils;
namespace QmlJSEditor {
static QList<int> defaultDisabledMessages()
{
@@ -90,7 +93,7 @@ static QStringList defaultDisabledNonQuickUiAsString()
return result;
}
void QmlJsEditingSettings::fromSettings(QSettings *settings)
void QmlJsEditingSettings::fromSettings(QtcSettings *settings)
{
settings->beginGroup(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML);
m_enableContextPane = settings->value(QML_CONTEXTPANE_KEY, QVariant(false)).toBool();
@@ -120,7 +123,7 @@ void QmlJsEditingSettings::fromSettings(QSettings *settings)
settings->endGroup();
}
void QmlJsEditingSettings::toSettings(QSettings *settings) const
void QmlJsEditingSettings::toSettings(QtcSettings *settings) const
{
settings->beginGroup(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML);
settings->setValue(QML_CONTEXTPANE_KEY, m_enableContextPane);
@@ -590,3 +593,5 @@ QmlJsEditingSettingsPage::QmlJsEditingSettingsPage()
setCategory(Constants::SETTINGS_CATEGORY_QML);
setWidgetCreator([] { return new QmlJsEditingSettingsPageWidget; });
}
} // QmlJsEditor

10
src/plugins/qmljseditor/qmljseditingsettingspage.h
View File

@@ -4,14 +4,12 @@
#pragma once
#include "qmllssettings.h"
#include <coreplugin/dialogs/ioptionspage.h>
#include <QPointer>
#include <QWidget>
QT_BEGIN_NAMESPACE
class QSettings;
QT_END_NAMESPACE
namespace QmlJSEditor {
class QmlJsEditingSettings
@@ -22,8 +20,8 @@ public:
static QmlJsEditingSettings get();
void set();
void fromSettings(QSettings *);
void toSettings(QSettings *) const;
void fromSettings(Utils::QtcSettings *);
void toSettings(Utils::QtcSettings *) const;
bool equals(const QmlJsEditingSettings &other) const;