feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Remove Node::asSessionNode()

Browse Source 
The only remaining uses could be removed or replaced by a
check for no parent node.

Change-Id: I13eba8ae418cf3d404bb3df7d389d72091af38d7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2017-02-23 11:00:35 +01:00
parent 4f47a8d745
commit fd5e0a1486
3 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/projectmodels.cpp
View File

@@ -173,8 +173,6 @@ Qt::ItemFlags FlatModel::flags(const QModelIndex &index) const
// We control the only view, and that one does the checks // We control the only view, and that one does the checks
Qt::ItemFlags f = Qt::ItemIsSelectable|Qt::ItemIsEnabled|Qt::ItemIsDragEnabled; Qt::ItemFlags f = Qt::ItemIsSelectable|Qt::ItemIsEnabled|Qt::ItemIsDragEnabled;
if (Node *node = nodeForIndex(index)) { if (Node *node = nodeForIndex(index)) {
if (node->asSessionNode())
return 0; // no flags for session node...
if (!node->asProjectNode()) { if (!node->asProjectNode()) {
// either folder or file node // either folder or file node
if (node->supportedActions(node).contains(Rename)) if (node->supportedActions(node).contains(Rename))

2
src/plugins/projectexplorer/projectnodes.cpp
View File

@@ -119,7 +119,7 @@ FolderNode *Node::parentFolderNode() const
ProjectNode *Node::managingProject() ProjectNode *Node::managingProject()
{ {
if (asSessionNode()) if (!m_parentFolderNode)
return nullptr; return nullptr;
ProjectNode *pn = parentProjectNode(); ProjectNode *pn = parentProjectNode();
return pn ? pn : asProjectNode(); // projects manage themselves... return pn ? pn : asProjectNode(); // projects manage themselves...

5
src/plugins/projectexplorer/projectnodes.h
View File

@@ -142,8 +142,6 @@ public:
virtual const FolderNode *asFolderNode() const { return nullptr; } virtual const FolderNode *asFolderNode() const { return nullptr; }
virtual ProjectNode *asProjectNode() { return nullptr; } virtual ProjectNode *asProjectNode() { return nullptr; }
virtual const ProjectNode *asProjectNode() const { 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); static bool sortByPath(const Node *a, const Node *b);
void setParentFolderNode(FolderNode *parentFolder); void setParentFolderNode(FolderNode *parentFolder);
@@ -316,9 +314,6 @@ private:
bool showInSimpleTree() const final; bool showInSimpleTree() const final;
void projectDisplayNameChanged(Node *node); void projectDisplayNameChanged(Node *node);
SessionNode *asSessionNode() final { return this; }
const SessionNode *asSessionNode() const final { return this; }
}; };
} // namespace ProjectExplorer } // namespace ProjectExplorer