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

Core: Use QtcSettings in NavigationWidgetFactory::restoreSettings()

Browse Source 
Symmetric to saveSettings() now, and allows for central Key conversions
later.

Change-Id: I3fbf81c51197c9882b1f64ef591398b83aa0d633
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2023-08-30 08:00:49 +02:00
parent e788deb1fc
commit 7fccf02be7
13 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/classview/classviewnavigationwidgetfactory.cpp
View File

@@ -61,7 +61,7 @@ void NavigationWidgetFactory::saveSettings(Utils::QtcSettings *settings,
settings->setValue(settingsGroup, pw->flatMode());
}
void NavigationWidgetFactory::restoreSettings(QSettings *settings, int position, QWidget *widget)
void NavigationWidgetFactory::restoreSettings(Utils::QtcSettings *settings, int position, QWidget *widget)
{
auto pw = qobject_cast<NavigationWidget *>(widget);
QTC_ASSERT(pw, return);

2
src/plugins/classview/classviewnavigationwidgetfactory.h
View File

@@ -22,7 +22,7 @@ public:
void saveSettings(Utils::QtcSettings *settings, int position, QWidget *widget) override;
//! \implements Core::INavigationWidgetFactory::restoreSettings
void restoreSettings(QSettings *settings, int position, QWidget *widget) override;
void restoreSettings(Utils::QtcSettings *settings, int position, QWidget *widget) override;
};
} // namespace Internal

2
src/plugins/coreplugin/foldernavigationwidget.cpp
View File

@@ -857,7 +857,7 @@ void FolderNavigationWidgetFactory::saveSettings(Utils::QtcSettings *settings,
kShowFoldersOnTopDefault);
}
void FolderNavigationWidgetFactory::restoreSettings(QSettings *settings, int position, QWidget *widget)
void FolderNavigationWidgetFactory::restoreSettings(QtcSettings *settings, int position, QWidget *widget)
{
auto fnw = qobject_cast<FolderNavigationWidget *>(widget);
QTC_ASSERT(fnw, return);

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

@@ -56,7 +56,7 @@ public:
Core::NavigationView createWidget() override;
void saveSettings(Utils::QtcSettings *settings, int position, QWidget *widget) override;
void restoreSettings(QSettings *settings, int position, QWidget *widget) override;
void restoreSettings(Utils::QtcSettings *settings, int position, QWidget *widget) override;
void addRootPath(Utils::Id id, const QString &displayName, const QIcon &icon, const Utils::FilePath &path) override;
void removeRootPath(Utils::Id path) override;

20
src/plugins/coreplugin/inavigationwidgetfactory.cpp
View File

@@ -59,7 +59,9 @@
to the caller.
*/
using namespace Core;
using namespace Utils;
namespace Core {
static QList<INavigationWidgetFactory *> g_navigationWidgetFactories;
@@ -106,7 +108,7 @@ void INavigationWidgetFactory::setPriority(int priority)
\sa id()
*/
void INavigationWidgetFactory::setId(Utils::Id id)
void INavigationWidgetFactory::setId(Id id)
{
m_id = id;
}
@@ -135,7 +137,7 @@ QKeySequence INavigationWidgetFactory::activationSequence() const
\sa INavigationWidgetFactory::restoreSettings()
*/
void INavigationWidgetFactory::saveSettings(Utils::QtcSettings * /* settings */,
void INavigationWidgetFactory::saveSettings(QtcSettings * /* settings */,
int /* position */,
QWidget * /* widget */)
{
@@ -147,18 +149,20 @@ void INavigationWidgetFactory::saveSettings(Utils::QtcSettings * /* settings */,
\sa INavigationWidgetFactory::saveSettings()
*/
void INavigationWidgetFactory::restoreSettings(QSettings * /* settings */, int /* position */, QWidget * /* widget */)
void INavigationWidgetFactory::restoreSettings(QtcSettings * /* settings */, int /* position */,
QWidget * /* widget */)
{
}
// Registers a new root path in the factory
void INavigationWidgetFactory::addRootPath(Utils::Id /*id*/, const QString & /*displayName*/, const QIcon & /*icon*/, const Utils::FilePath & /*path*/)
void INavigationWidgetFactory::addRootPath(Id /*id*/, const QString & /*displayName*/,
const QIcon & /*icon*/, const FilePath & /*path*/)
{
}
// Removes a root path from the factory
void INavigationWidgetFactory::removeRootPath(Utils::Id /*path*/)
void INavigationWidgetFactory::removeRootPath(Id /*path*/)
{
}
} // Core

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

@@ -57,7 +57,7 @@ public:
virtual NavigationView createWidget() = 0;
virtual void saveSettings(Utils::QtcSettings *settings, int position, QWidget *widget);
virtual void restoreSettings(QSettings *settings, int position, QWidget *widget);
virtual void restoreSettings(Utils::QtcSettings *settings, int position, QWidget *widget);
virtual void addRootPath(Utils::Id id, const QString &displayName, const QIcon &icon, const Utils::FilePath &path);
virtual void removeRootPath(Utils::Id id);

2
src/plugins/coreplugin/navigationsubwidget.cpp
View File

@@ -165,7 +165,7 @@ void NavigationSubWidget::restoreSettings()
if (!m_navigationWidget || !factory())
return;
QSettings *settings = Core::ICore::settings();
QtcSettings *settings = Core::ICore::settings();
settings->beginGroup(m_parentWidget->settingsGroup());
factory()->restoreSettings(settings, position(), m_navigationWidget);
settings->endGroup();

2
src/plugins/cppeditor/cppincludehierarchy.cpp
View File

@@ -532,7 +532,7 @@ void CppIncludeHierarchyFactory::saveSettings(QtcSettings *settings, int positio
hierarchyWidget(widget)->saveSettings(settings, position);
}
void CppIncludeHierarchyFactory::restoreSettings(QSettings *settings, int position, QWidget *widget)
void CppIncludeHierarchyFactory::restoreSettings(QtcSettings *settings, int position, QWidget *widget)
{
hierarchyWidget(widget)->restoreSettings(settings, position);
}

2
src/plugins/cppeditor/cppincludehierarchy.h
View File

@@ -51,7 +51,7 @@ public:
Core::NavigationView createWidget() override;
void saveSettings(Utils::QtcSettings *settings, int position, QWidget *widget) override;
void restoreSettings(QSettings *settings, int position, QWidget *widget) override;
void restoreSettings(Utils::QtcSettings *settings, int position, QWidget *widget) override;
};
} // namespace Internal

2
src/plugins/projectexplorer/projecttreewidget.cpp
View File

@@ -657,7 +657,7 @@ void ProjectTreeWidgetFactory::saveSettings(QtcSettings *settings, int position,
settings->setValueWithDefault(baseKey + kSyncKey, ptw->autoSynchronization(), kSyncDefault);
}
void ProjectTreeWidgetFactory::restoreSettings(QSettings *settings, int position, QWidget *widget)
void ProjectTreeWidgetFactory::restoreSettings(QtcSettings *settings, int position, QWidget *widget)
{
auto ptw = qobject_cast<ProjectTreeWidget *>(widget);
Q_ASSERT(ptw);

2
src/plugins/projectexplorer/projecttreewidget.h
View File

@@ -92,7 +92,7 @@ public:
ProjectTreeWidgetFactory();
Core::NavigationView createWidget() override;
void restoreSettings(QSettings *settings, int position, QWidget *widget) override;
void restoreSettings(Utils::QtcSettings *settings, int position, QWidget *widget) override;
void saveSettings(Utils::QtcSettings *settings, int position, QWidget *widget) override;
};

2
src/plugins/texteditor/outlinefactory.cpp
View File

@@ -224,7 +224,7 @@ void OutlineFactory::saveSettings(Utils::QtcSettings *settings, int position, QW
widgetStack->saveSettings(settings, position);
}
void OutlineFactory::restoreSettings(QSettings *settings, int position, QWidget *widget)
void OutlineFactory::restoreSettings(Utils::QtcSettings *settings, int position, QWidget *widget)
{
auto widgetStack = qobject_cast<OutlineWidgetStack *>(widget);
Q_ASSERT(widgetStack);

2
src/plugins/texteditor/outlinefactory.h
View File

@@ -54,7 +54,7 @@ public:
// from INavigationWidgetFactory
Core::NavigationView createWidget() override;
void saveSettings(Utils::QtcSettings *settings, int position, QWidget *widget) override;
void restoreSettings(QSettings *settings, int position, QWidget *widget) override;
void restoreSettings(Utils::QtcSettings *settings, int position, QWidget *widget) override;
signals:
void updateOutline();