feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

De-noise some ProjectExplorer/Utils qualifications

Browse Source 
Change-Id: Iaec01ca0e7a43592528bcaf4252540561e109919
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-02-01 18:44:47 +02:00
committed by Orgad Shaneh
parent 74ce6e409d
commit 98723e4557
8 changed files with 181 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/qmldesigner/components/integration/designdocument.cpp
View File

@@ -57,6 +57,8 @@
#include <QPlainTextEdit>
#include <QApplication>
using namespace ProjectExplorer;
enum {
debug = false
};
@@ -212,7 +214,7 @@ QString DesignDocument::fileName() const
return editor()->document()->filePath().toString();
}
ProjectExplorer::Kit *DesignDocument::currentKit() const
Kit *DesignDocument::currentKit() const
{
return m_currentKit;
}
@@ -626,9 +628,9 @@ void DesignDocument::redo()
viewManager().resetPropertyEditorView();
}
static bool isFileInProject(DesignDocument *designDocument, ProjectExplorer::Project *project)
static bool isFileInProject(DesignDocument *designDocument, Project *project)
{
foreach (const QString &fileNameInProject, project->files(ProjectExplorer::Project::ExcludeGeneratedFiles)) {
foreach (const QString &fileNameInProject, project->files(Project::ExcludeGeneratedFiles)) {
if (designDocument->fileName() == fileNameInProject)
return true;
}
@@ -636,12 +638,12 @@ static bool isFileInProject(DesignDocument *designDocument, ProjectExplorer::Pro
return false;
}
static inline ProjectExplorer::Kit *getActiveKit(DesignDocument *designDocument)
static inline Kit *getActiveKit(DesignDocument *designDocument)
{
ProjectExplorer::Project *currentProject = ProjectExplorer::ProjectTree::currentProject();
Project *currentProject = ProjectTree::currentProject();
if (!currentProject)
currentProject = ProjectExplorer::SessionManager::projectForFile(designDocument->fileName());
currentProject = SessionManager::projectForFile(designDocument->fileName());
if (!currentProject)
return 0;
@@ -649,18 +651,20 @@ static inline ProjectExplorer::Kit *getActiveKit(DesignDocument *designDocument)
if (!isFileInProject(designDocument, currentProject))
return 0;
QObject::connect(ProjectExplorer::ProjectTree::instance(), &ProjectExplorer::ProjectTree::currentProjectChanged,
QObject::connect(ProjectTree::instance(), &ProjectTree::currentProjectChanged,
designDocument, &DesignDocument::updateActiveQtVersion, Qt::UniqueConnection);
designDocument->connect(currentProject, SIGNAL(activeTargetChanged(ProjectExplorer::Target*)), designDocument, SLOT(updateActiveQtVersion()), Qt::UniqueConnection);
QObject::connect(currentProject, &Project::activeTargetChanged,
designDocument, &DesignDocument::updateActiveQtVersion, Qt::UniqueConnection);
ProjectExplorer::Target *target = currentProject->activeTarget();
Target *target = currentProject->activeTarget();
if (!target)
return 0;
designDocument->connect(target, SIGNAL(kitChanged()), designDocument, SLOT(updateActiveQtVersion()), Qt::UniqueConnection);
QObject::connect(target, &Target::kitChanged,
designDocument, &DesignDocument::updateActiveQtVersion, Qt::UniqueConnection);
return target->kit();
}