From 4943510b60acc320dff8f2c31af69cfbfa331203 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@theqtcompany.com>
Date: Wed, 19 Nov 2014 17:58:33 +0100
Subject: Completely rework currentNode/currentProject handling

Centralize the handling inside a new class ProjectTree.
React to moving focus and remove most special handling.

This properly fixes the linked task.

Task-number: QTCREATORBUG-13357
Change-Id: I6b06aa32b1e4305ec8a6d432857b302585d8734b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
 src/plugins/beautifier/artisticstyle/artisticstyle.cpp | 4 ++--
 src/plugins/beautifier/uncrustify/uncrustify.cpp       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/plugins/beautifier')

diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
index ce9ef993ff..31ff9b0311 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
+++ b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
@@ -49,7 +49,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/idocument.h>
 #include <cppeditor/cppeditorconstants.h>
-#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projecttree.h>
 #include <projectexplorer/project.h>
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
@@ -108,7 +108,7 @@ void ArtisticStyle::formatFile()
 
     if (m_settings->useOtherFiles()) {
         if (const ProjectExplorer::Project *project
-                = ProjectExplorer::ProjectExplorerPlugin::currentProject()) {
+                = ProjectExplorer::ProjectTree::currentProject()) {
             const QStringList files = project->files(ProjectExplorer::Project::AllFiles);
             for (int i = 0, total = files.size(); i < total; ++i) {
                 const QString &file = files.at(i);
diff --git a/src/plugins/beautifier/uncrustify/uncrustify.cpp b/src/plugins/beautifier/uncrustify/uncrustify.cpp
index 778911862f..9a092ff7d3 100644
--- a/src/plugins/beautifier/uncrustify/uncrustify.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustify.cpp
@@ -49,7 +49,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/idocument.h>
 #include <cppeditor/cppeditorconstants.h>
-#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projecttree.h>
 #include <projectexplorer/project.h>
 #include <utils/fileutils.h>
 
@@ -107,7 +107,7 @@ void Uncrustify::formatFile()
 
     if (m_settings->useOtherFiles()) {
         if (const ProjectExplorer::Project *project
-                = ProjectExplorer::ProjectExplorerPlugin::currentProject()) {
+                = ProjectExplorer::ProjectTree::currentProject()) {
             const QStringList files = project->files(ProjectExplorer::Project::AllFiles);
             for (int i = 0, total = files.size(); i < total; ++i) {
                 const QString &file = files.at(i);
-- 
cgit v1.2.1