From 84e8a79c814dc6e788cad9643d0e225c7a92e76d Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Mon, 3 Feb 2014 14:05:28 +0100
Subject: [PATCH] ProjectNodes: Move vcsTopic to where it belongs
It's a nonsensical operation on anything but ProjectNodes
Change-Id: Id02682e6dde99c5a08362dac0f6286282cfc15b6
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/projectexplorer/projectmodels.cpp | 5 +++--
src/plugins/projectexplorer/projectnodes.cpp | 5 -----
src/plugins/projectexplorer/projectnodes.h | 1 -
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp
index 88c59883707..e899054ec62 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 d7d50292529..e9ecf5c2308 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 a32b8a449bb..ff7d35ff8f3 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;
--
GitLab