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

Utils: Use a bit more Key and Store

Browse Source 
Also, separate the Key into a separate header to minimiz impact
on #include load.

Change-Id: I4f719cad4d23a71a9c228d0b7f5c2409fd6e24d5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2023-08-23 17:51:05 +02:00
parent 6e307be365
commit 2bf886ed73
42 changed files with 152 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -249,11 +249,9 @@ void NavigationWidget::setFactories(const QList<INavigationWidgetFactory *> &fac
updateToggleText();
}
QString NavigationWidget::settingsGroup() const
Key NavigationWidget::settingsGroup() const
{
const QString side(d->m_side == Side::Left ? QStringLiteral("Left")
: QStringLiteral("Right"));
return QStringLiteral("Navigation%1").arg(side);
return d->m_side == Side::Left ? Key("NavigationLeft") : Key("NavigationRight");
}
int NavigationWidget::storedWidth()
@@ -400,12 +398,12 @@ void NavigationWidget::saveSettings(QtcSettings *settings)
settings->setValue(settingsKey("VerticalPosition"), saveState());
settings->setValue(settingsKey("Width"), d->m_width);
const QString activationKey = QStringLiteral("ActivationPosition.");
const Key activationKey = "ActivationPosition.";
const auto keys = NavigationWidgetPrivate::s_activationsMap.keys();
for (const auto &factoryId : keys) {
const auto &info = NavigationWidgetPrivate::s_activationsMap[factoryId];
if (info.side == d->m_side)
settings->setValue(settingsKey(activationKey + factoryId.toString()), info.position);
settings->setValue(settingsKey(activationKey + factoryId.name()), info.position);
}
}
@@ -524,9 +522,9 @@ int NavigationWidget::factoryIndex(Id id)
return -1;
}
QString NavigationWidget::settingsKey(const QString &key) const
Key NavigationWidget::settingsKey(const Key &key) const
{
return QStringLiteral("%1/%2").arg(settingsGroup(), key);
return settingsGroup() + '/' + key;
}
QHash<Id, Command *> NavigationWidget::commandMap() const