From fd5e0a14863b77fdcbf91e89a8be4c66c13609fd Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 23 Feb 2017 11:00:35 +0100 Subject: [PATCH] ProjectExplorer: Remove Node::asSessionNode() The only remaining uses could be removed or replaced by a check for no parent node. Change-Id: I13eba8ae418cf3d404bb3df7d389d72091af38d7 Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/projectmodels.cpp | 2 -- src/plugins/projectexplorer/projectnodes.cpp | 2 +- src/plugins/projectexplorer/projectnodes.h | 5 ----- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index 2940b4cc575..5a48bba669c 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -173,8 +173,6 @@ Qt::ItemFlags FlatModel::flags(const QModelIndex &index) const // We control the only view, and that one does the checks Qt::ItemFlags f = Qt::ItemIsSelectable|Qt::ItemIsEnabled|Qt::ItemIsDragEnabled; if (Node *node = nodeForIndex(index)) { - if (node->asSessionNode()) - return 0; // no flags for session node... if (!node->asProjectNode()) { // either folder or file node if (node->supportedActions(node).contains(Rename)) diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp index 55c6481e0c4..338a279498d 100644 --- a/src/plugins/projectexplorer/projectnodes.cpp +++ b/src/plugins/projectexplorer/projectnodes.cpp @@ -119,7 +119,7 @@ FolderNode *Node::parentFolderNode() const ProjectNode *Node::managingProject() { - if (asSessionNode()) + if (!m_parentFolderNode) return nullptr; ProjectNode *pn = parentProjectNode(); return pn ? pn : asProjectNode(); // projects manage themselves... diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h index a69e874fd5b..e613a35da48 100644 --- a/src/plugins/projectexplorer/projectnodes.h +++ b/src/plugins/projectexplorer/projectnodes.h @@ -142,8 +142,6 @@ public: virtual const FolderNode *asFolderNode() const { return nullptr; } virtual ProjectNode *asProjectNode() { return nullptr; } virtual const ProjectNode *asProjectNode() const { return nullptr; } - virtual SessionNode *asSessionNode() { return nullptr; } - virtual const SessionNode *asSessionNode() const { return nullptr; } static bool sortByPath(const Node *a, const Node *b); void setParentFolderNode(FolderNode *parentFolder); @@ -316,9 +314,6 @@ private: bool showInSimpleTree() const final; void projectDisplayNameChanged(Node *node); - - SessionNode *asSessionNode() final { return this; } - const SessionNode *asSessionNode() const final { return this; } }; } // namespace ProjectExplorer