CppTools: Move CppFilesSettingsPage closer to new setup

Including some drive-by cosmetics.

Change-Id: Id9cdba68545907b099a70944c83fe17ad3c0b2a0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 2 insertions, 12 deletions

diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h
index 6e82228fa7..24f981d15f 100644
--- a/src/plugins/cpptools/cpptoolsplugin.h
+++ b/src/plugins/cpptools/cpptoolsplugin.h
@@ -29,24 +29,15 @@
 
 #include <projectexplorer/projectexplorer.h>
 
-#include <QSharedPointer>
-
-QT_BEGIN_NAMESPACE
-class QFileInfo;
-class QDir;
-QT_END_NAMESPACE
-
 namespace Utils { class FilePath; }
 
 namespace CppTools {
 
-class CppToolsSettings;
 class CppCodeModelSettings;
 
 namespace Internal {
 
 struct CppFileSettings;
-class CppToolsPluginPrivate;
 
 class CppToolsPlugin final : public ExtensionSystem::IPlugin
 {
@@ -180,9 +171,8 @@ private slots:
 #endif
 
 private:
-    friend class CppToolsPluginPrivate;
-    CppToolsPluginPrivate *d = nullptr;
-    QSharedPointer<CppFileSettings> m_fileSettings;
+    CppFileSettings *fileSettings();
+    class CppToolsPluginPrivate *d = nullptr;
 };
 
 } // namespace Internal