diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index 88c598837079019a45d12168a61ab5bb167f74f6..e899054ec6276877b5dc3f416f65d7a8f5ba4f57 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -265,9 +265,10 @@ QVariant FlatModel::data(const QModelIndex &index, int role) const case Qt::DisplayRole: { QString name = node->displayName(); - if (node->parentFolderNode() + if (node->nodeType() == ProjectNodeType + && node->parentFolderNode() && node->parentFolderNode()->nodeType() == SessionNodeType) { - const QString vcsTopic = node->vcsTopic(); + const QString vcsTopic = static_cast<ProjectNode *>(node)->vcsTopic(); if (!vcsTopic.isEmpty()) name += QLatin1String(" [") + vcsTopic + QLatin1Char(']'); diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp index d7d5029252976c9067f9c283a4d16b40137f663b..e9ecf5c2308e26bc2f2d0af3ae7cd20b8f96eee0 100644 --- a/src/plugins/projectexplorer/projectnodes.cpp +++ b/src/plugins/projectexplorer/projectnodes.cpp @@ -145,11 +145,6 @@ QString Node::displayName() const return QFileInfo(path()).fileName(); } -QString Node::vcsTopic() const -{ - return QString(); -} - QString Node::tooltip() const { return QDir::toNativeSeparators(path()); diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h index a32b8a449bb480f52bb2a9e066cc1f81fb3cb2d4..ff7d35ff8f3b1f46f026700e21d4066a5c178753 100644 --- a/src/plugins/projectexplorer/projectnodes.h +++ b/src/plugins/projectexplorer/projectnodes.h @@ -85,7 +85,6 @@ public: QString path() const; // file system path virtual int line() const; virtual QString displayName() const; - virtual QString vcsTopic() const; virtual QString tooltip() const; virtual bool isEnabled() const;