summaryrefslogtreecommitdiff
path: root/src/plugins/beautifier
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@theqtcompany.com>2014-11-19 17:58:33 +0100
committerDaniel Teske <daniel.teske@theqtcompany.com>2014-12-03 12:36:20 +0100
commit4943510b60acc320dff8f2c31af69cfbfa331203 (patch)
treedd879a4e751f005db97e5256b8f658a2ba243013 /src/plugins/beautifier
parent042ef1aec0e04d2568c30ab19c1f89720ed8da3e (diff)
downloadqt-creator-4943510b60acc320dff8f2c31af69cfbfa331203.tar.gz
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>
Diffstat (limited to 'src/plugins/beautifier')
-rw-r--r--src/plugins/beautifier/artisticstyle/artisticstyle.cpp4
-rw-r--r--src/plugins/beautifier/uncrustify/uncrustify.cpp4
2 files changed, 4 insertions, 4 deletions
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);