Core: Use QtcSettings in NavigationWidgetFactory::restoreSettings()

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

Change-Id: I3fbf81c51197c9882b1f64ef591398b83aa0d633
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>

src/plugins/classview/classviewnavigationwidgetfactory.cpp

@@ -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);

src/plugins/classview/classviewnavigationwidgetfactory.h

@@ -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

src/plugins/coreplugin/foldernavigationwidget.cpp

@@ -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);

src/plugins/coreplugin/foldernavigationwidget.h

@@ -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;

src/plugins/coreplugin/inavigationwidgetfactory.cpp

@@ -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

src/plugins/coreplugin/inavigationwidgetfactory.h

@@ -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);

src/plugins/coreplugin/navigationsubwidget.cpp

@@ -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();

src/plugins/cppeditor/cppincludehierarchy.cpp

@@ -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);
 }

src/plugins/cppeditor/cppincludehierarchy.h

@@ -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

src/plugins/projectexplorer/projecttreewidget.cpp

@@ -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);

src/plugins/projectexplorer/projecttreewidget.h

@@ -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;
 };
 

src/plugins/texteditor/outlinefactory.cpp

@@ -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);

src/plugins/texteditor/outlinefactory.h

@@ -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();