summaryrefslogtreecommitdiff
path: root/src/plugins/cmakeprojectmanager
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@theqtcompany.com>2015-01-09 15:50:06 +0100
committerDaniel Teske <daniel.teske@theqtcompany.com>2015-01-14 11:48:12 +0100
commit70c9c51e5e4c6f70c950c959757a2e597a646c56 (patch)
tree17c26446ef9827e2675cac334af29fad59ee99cf /src/plugins/cmakeprojectmanager
parent44a7db5091c41bcdc89799a978994edbbf82e7e2 (diff)
downloadqt-creator-70c9c51e5e4c6f70c950c959757a2e597a646c56.tar.gz
Refactor ProjectExplorer::Node and remove NodesWatcher
The idea behind NodesWatcher was that it was the central place to catch node related signals, so that users didn't need to connect to each individual node and the nodes didn't need to be QObjects. Somehow Nodes ended up being QObjects anyway. Both the recently added ProjectTree and the FlatModels consume the signals the NodesWatcher sends. Unfortunately there's a ordering dependency between the ProjectTree and the FlatModels. This patch removes all NodesWatcher and instead makes the ProjectTree singleton the emitter of various project tree related signals. The ProjectTree also ensures that the ordering between the FlatModel and itself is taken into account. And it makes Node not derive from QObject, saving some memory in that process. Task-number: QTCREATORBUG-13756 Change-Id: I8b0d357863f1dc1d2d440ce8172502594138b9fb Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/cmakeprojectmanager')
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectnodes.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h
index dc72311fdc..4e5625d09f 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h
@@ -38,7 +38,6 @@ namespace Internal {
class CMakeProjectNode : public ProjectExplorer::ProjectNode
{
- Q_OBJECT
friend class CMakeProject;
public:
CMakeProjectNode(const QString &fileName);