QmlProject: Minor code cleanup

Whitespace, namespace, inline trivial functions, ....

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

src/plugins/qmlprojectmanager/qmlproject.cpp

@@ -49,9 +49,6 @@ using namespace Core;
 using namespace ProjectExplorer;
 
 namespace QmlProjectManager {
-namespace Internal {
-
-} // namespace Internal
 
 QmlProject::QmlProject(Internal::Manager *manager, const Utils::FileName &fileName) :
     m_defaultImport(UnknownImport)
@@ -66,14 +63,10 @@ QmlProject::QmlProject(Internal::Manager *manager, const Utils::FileName &fileNa
     setProjectLanguages(Context(ProjectExplorer::Constants::QMLJS_LANGUAGE_ID));
 
     m_projectName = projectFilePath().toFileInfo().completeBaseName();
-
-    projectManager()->registerProject(this);
 }
 
 QmlProject::~QmlProject()
 {
-    projectManager()->unregisterProject(this);
-
     delete m_projectItem.data();
 }
 
@@ -117,10 +110,8 @@ QDir QmlProject::projectDir() const
     return projectFilePath().toFileInfo().dir();
 }
 
-Utils::FileName QmlProject::filesFileName() const
+static QmlProject::QmlImport detectImport(const QString &qml)
-{ return projectFilePath(); }
+{
-
-static QmlProject::QmlImport detectImport(const QString &qml) {
     static QRegExp qtQuick1RegExp(QLatin1String("import\\s+QtQuick\\s+1"));
     static QRegExp qtQuick2RegExp(QLatin1String("import\\s+QtQuick\\s+2"));
 

src/plugins/qmlprojectmanager/qmlproject.h

@@ -36,14 +36,11 @@
 
 namespace ProjectExplorer { class RunConfiguration; }
 namespace QmlJS { class ModelManagerInterface; }
-namespace Utils { class FileSystemWatcher; }
 
 namespace QmlProjectManager {
 
 class QmlProjectItem;
 
-namespace Internal { class QmlProjectFile; }
-
 class QMLPROJECTMANAGER_EXPORT QmlProject : public ProjectExplorer::Project
 {
     Q_OBJECT
@@ -52,8 +49,6 @@ public:
     QmlProject(Internal::Manager *manager, const Utils::FileName &filename);
     ~QmlProject() override;
 
-    Utils::FileName filesFileName() const;
-
     QString displayName() const override;
     Internal::Manager *projectManager() const override;
 

src/plugins/qmlprojectmanager/qmlprojectmanager.cpp

@@ -55,20 +55,5 @@ ProjectExplorer::Project *Manager::openProject(const QString &fileName, QString
     return new QmlProject(this, Utils::FileName::fromString(fileName));
 }
 
-void Manager::registerProject(QmlProject *project)
-{ m_projects.append(project); }
-
-void Manager::unregisterProject(QmlProject *project)
-{ m_projects.removeAll(project); }
-
-void Manager::notifyChanged(const QString &fileName)
-{
-    const Utils::FileName file = Utils::FileName::fromString(fileName);
-    foreach (QmlProject *project, m_projects) {
-        if (file == project->filesFileName())
-            project->refresh(QmlProject::Files);
-    }
-}
-
 } // namespace Internal
 } // namespace QmlProjectManager

src/plugins/qmlprojectmanager/qmlprojectmanager.h

@@ -29,9 +29,6 @@
 #include <coreplugin/icontext.h>
 
 namespace QmlProjectManager {
-
-class QmlProject;
-
 namespace Internal {
 
 class Manager: public ProjectExplorer::IProjectManager
@@ -43,14 +40,6 @@ public:
 
     QString mimeType() const override;
     ProjectExplorer::Project *openProject(const QString &fileName, QString *errorString) override;
-
-    void notifyChanged(const QString &fileName);
-
-    void registerProject(QmlProject *project);
-    void unregisterProject(QmlProject *project);
-
-private:
-    QList<QmlProject *> m_projects;
 };
 
 } // namespace Internal

src/plugins/qmlprojectmanager/qmlprojectnodes.cpp

@@ -32,14 +32,15 @@
 
 #include <utils/algorithm.h>
 
-#include <QFileInfo>
 #include <QStyle>
 
+using namespace ProjectExplorer;
+
 namespace QmlProjectManager {
 namespace Internal {
 
 QmlProjectNode::QmlProjectNode(QmlProject *project)
-    : ProjectExplorer::ProjectNode(project->projectDirectory()),
+    : ProjectNode(project->projectDirectory()),
       m_project(project)
 {
     setDisplayName(project->projectFilePath().toFileInfo().completeBaseName());
@@ -52,26 +53,17 @@ QmlProjectNode::QmlProjectNode(QmlProject *project)
     setIcon(QIcon(projectPixmap));
 }
 
-QmlProjectNode::~QmlProjectNode()
-{ }
-
 void QmlProjectNode::refresh()
 {
-    using namespace ProjectExplorer;
-
-    FileNode *projectFilesNode = new FileNode(m_project->filesFileName(),
-                                              FileType::Project,
-                                              /* generated = */ false);
-
     QStringList files = m_project->files();
-    files.removeAll(m_project->filesFileName().toString());
+    files.removeAll(m_project->projectFilePath().toString());
 
     QList<FileNode *> fileNodes = Utils::transform(files, [](const QString &f) {
         FileType fileType = FileType::Source; // ### FIXME
         return new FileNode(Utils::FileName::fromString(f), fileType, false);
 
     });
-    fileNodes.append(projectFilesNode);
+    fileNodes.append(new FileNode(m_project->projectFilePath(), FileType::Project, false));
 
     makeEmpty();
     buildTree(fileNodes);
@@ -82,16 +74,13 @@ bool QmlProjectNode::showInSimpleTree() const
     return true;
 }
 
-QList<ProjectExplorer::ProjectAction> QmlProjectNode::supportedActions(Node *node) const
+QList<ProjectAction> QmlProjectNode::supportedActions(Node *node) const
 {
-    Q_UNUSED(node);
+    QList<ProjectAction> actions = {AddNewFile, EraseFile};
-    QList<ProjectExplorer::ProjectAction> actions;
+    if (node->nodeType() == NodeType::File) {
-    actions.append(ProjectExplorer::AddNewFile);
+        FileNode *fileNode = static_cast<FileNode *>(node);
-    actions.append(ProjectExplorer::EraseFile);
+        if (fileNode->fileType() != FileType::Project)
-    if (node->nodeType() == ProjectExplorer::NodeType::File) {
+            actions.append(Rename);
-        ProjectExplorer::FileNode *fileNode = static_cast<ProjectExplorer::FileNode *>(node);
-        if (fileNode->fileType() != ProjectExplorer::FileType::Project)
-            actions.append(ProjectExplorer::Rename);
     }
     return actions;
 }

src/plugins/qmlprojectmanager/qmlprojectnodes.h

@@ -27,11 +27,6 @@
 
 #include <projectexplorer/projectnodes.h>
 
-#include <QStringList>
-#include <QHash>
-
-namespace Core { class IDocument; }
-
 namespace QmlProjectManager {
 
 class QmlProject;
@@ -42,7 +37,6 @@ class QmlProjectNode : public ProjectExplorer::ProjectNode
 {
 public:
     QmlProjectNode(QmlProject *project);
-    ~QmlProjectNode() override;
 
     virtual bool showInSimpleTree() const override;