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

Utils: Use QtcSettings

Browse Source 
Fixes compile errors with Qt 6.2.4.

Change-Id: Ia97d5fcbeb80ee1242fd4c2425bc7f325dad8953
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-09-05 09:20:31 +02:00
parent 7ad4589f5d
commit c14c021e45
15 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1152,7 +1152,7 @@ void MainWindow::aboutToShutdown()
void MainWindow::readSettings()
{
QSettings *settings = PluginManager::settings();
QtcSettings *settings = PluginManager::settings();
settings->beginGroup(QLatin1String(settingsGroup));
if (m_overrideColor.isValid()) {
@@ -1160,7 +1160,7 @@ void MainWindow::readSettings()
// Get adapted base color.
m_overrideColor = StyleHelper::baseColor();
} else {
StyleHelper::setBaseColor(settings->value(QLatin1String(colorKey),
StyleHelper::setBaseColor(settings->value(colorKey,
QColor(StyleHelper::DEFAULT_BASE_COLOR)).value<QColor>());
}

4
src/plugins/coreplugin/navigationwidget.cpp
View File

@@ -407,7 +407,7 @@ void NavigationWidget::saveSettings(QtcSettings *settings)
}
}
void NavigationWidget::restoreSettings(QSettings *settings)
void NavigationWidget::restoreSettings(QtcSettings *settings)
{
if (!d->m_factoryModel->rowCount()) {
// We have no widgets to show!
@@ -475,7 +475,7 @@ void NavigationWidget::restoreSettings(QSettings *settings)
if (!key.startsWith(activationKey))
continue;
int position = settings->value(key).toInt();
int position = settings->value(keyFromString(key)).toInt();
Id factoryId = Id::fromString(key.mid(activationKey.length()));
NavigationWidgetPrivate::updateActivationsMap(factoryId, {d->m_side, position});
}

2
src/plugins/coreplugin/navigationwidget.h
View File

@@ -72,7 +72,7 @@ public:
Utils::Key settingsGroup() const;
void saveSettings(Utils::QtcSettings *settings);
void restoreSettings(QSettings *settings);
void restoreSettings(Utils::QtcSettings *settings);
QWidget *activateSubWidget(Utils::Id factoryId, int preferredPosition);
void closeSubWidgets();