GenericProject: Use new setup pattern for ProjectFilesFactory

Change-Id: If5d64a8d6b09fbd3ceaea1736ce74ba2c837a456
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/genericprojectmanager/genericprojectfileseditor.cpp

@@ -6,22 +6,20 @@
 
 #include <coreplugin/coreplugintr.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <texteditor/textdocument.h>
-#include <texteditor/texteditoractionhandler.h>
 
-#include <QCoreApplication>
+#include <texteditor/textdocument.h>
+#include <texteditor/texteditor.h>
+#include <texteditor/texteditoractionhandler.h>
 
 using namespace TextEditor;
 
-namespace GenericProjectManager {
+namespace GenericProjectManager::Internal {
-namespace Internal {
 
-//
+class ProjectFilesFactory : public TextEditorFactory
-// ProjectFilesFactory
-//
-
-ProjectFilesFactory::ProjectFilesFactory()
 {
+public:
+    ProjectFilesFactory()
+    {
         setId(Constants::FILES_EDITOR_ID);
         setDisplayName(::Core::Tr::tr(".files Editor"));
         addMimeType("application/vnd.qtcreator.generic.files");
@@ -32,7 +30,12 @@ ProjectFilesFactory::ProjectFilesFactory()
 
         setDocumentCreator([]() { return new TextDocument(Constants::FILES_EDITOR_ID); });
         setEditorActionHandlers(TextEditorActionHandler::None);
+    }
+};
+
+void setupGenericProjectFiles()
+{
+    static ProjectFilesFactory theProjectFilesFactory;
 }
 
-} // namespace Internal
+} // GenericProjectManager::Internal
-} // namespace GenericProjectManager

src/plugins/genericprojectmanager/genericprojectfileseditor.h

@@ -3,16 +3,8 @@
 
 #pragma once
 
-#include <texteditor/texteditor.h>
+namespace GenericProjectManager::Internal {
 
-namespace GenericProjectManager {
+void setupGenericProjectFiles();
-namespace Internal {
 
-class ProjectFilesFactory : public TextEditor::TextEditorFactory
+} // GenericProjectManager::Internal
-{
-public:
-    ProjectFilesFactory();
-};
-
-} // namespace Internal
-} // namespace GenericProjectManager

src/plugins/genericprojectmanager/genericprojectplugin.cpp

@@ -35,7 +35,6 @@ class GenericProjectPluginPrivate : public QObject
 public:
     GenericProjectPluginPrivate();
 
-    ProjectFilesFactory projectFilesFactory;
     GenericMakeStepFactory makeStepFactory;
     GenericBuildConfigurationFactory buildConfigFactory;
 };
@@ -45,6 +44,7 @@ GenericProjectPluginPrivate::GenericProjectPluginPrivate()
     ProjectManager::registerProjectType<GenericProject>(Constants::GENERICMIMETYPE);
 
     setupGenericProjectWizard();
+    setupGenericProjectFiles();
 
     ActionBuilder editAction(this, "GenericProjectManager.EditFiles");
     editAction.setContext(Constants::GENERICPROJECT_ID);