From 3657acac5f0b41cabd27b367faefc23fe74e52f2 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 4 Dec 2009 19:22:12 +0100
Subject: [PATCH] move various functions from Qt4PriFileNode to Qt4ProFileNode
findProFileFor(), buildDir() and createProFileReader() make sense only
in relation with an actual pro file anyway, so move them there.
---
.../qt-maemo/maemorunconfiguration.cpp | 7 +++----
.../qt-s60/s60devicerunconfiguration.cpp | 6 +++---
.../qt-s60/s60emulatorrunconfiguration.cpp | 6 +++---
src/plugins/qt4projectmanager/qt4nodes.cpp | 12 ++++++------
src/plugins/qt4projectmanager/qt4nodes.h | 13 +++++++------
.../qt4projectmanager/qt4runconfiguration.cpp | 6 +++---
6 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
index 0a7db2ecca8..5f121819d65 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
@@ -565,15 +565,14 @@ void MaemoRunConfiguration::updateTarget()
if (Qt4Project *qt4Project = project()) {
Qt4BuildConfiguration *qt4bc = qt4Project->activeQt4BuildConfiguration();
- Qt4PriFileNode * priFileNode = qt4Project->rootProjectNode()
- ->findProFileFor(m_proFilePath);
- if (!priFileNode) {
+ Qt4ProFileNode *proFileNode = qt4Project->rootProjectNode()->findProFileFor(m_proFilePath);
+ if (!proFileNode) {
emit targetInformationChanged();
return;
}
QtVersion *qtVersion = qt4bc->qtVersion();
- ProFileReader *reader = priFileNode->createProFileReader();
+ ProFileReader *reader = proFileNode->createProFileReader();
reader->setCumulative(false);
// Find out what flags we pass on to qmake
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index fdc71b7e100..9b97d702346 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -281,15 +281,15 @@ void S60DeviceRunConfiguration::updateTarget()
if (m_cachedTargetInformationValid)
return;
Qt4BuildConfiguration *qt4bc = qt4Project()->activeQt4BuildConfiguration();
- Qt4PriFileNode * priFileNode = qt4Project()->rootProjectNode()->findProFileFor(m_proFilePath);
- if (!priFileNode) {
+ Qt4ProFileNode *proFileNode = qt4Project()->rootProjectNode()->findProFileFor(m_proFilePath);
+ if (!proFileNode) {
m_baseFileName = QString::null;
m_cachedTargetInformationValid = true;
emit targetInformationChanged();
return;
}
QtVersion *qtVersion = qt4bc->qtVersion();
- ProFileReader *reader = priFileNode->createProFileReader();
+ ProFileReader *reader = proFileNode->createProFileReader();
reader->setCumulative(false);
// Find out what flags we pass on to qmake
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
index 6cc31e211cc..82bd78e2f29 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
@@ -128,15 +128,15 @@ void S60EmulatorRunConfiguration::updateTarget()
if (m_cachedTargetInformationValid)
return;
Qt4BuildConfiguration *qt4bc = qt4Project()->activeQt4BuildConfiguration();
- Qt4PriFileNode * priFileNode = qt4Project()->rootProjectNode()->findProFileFor(m_proFilePath);
- if (!priFileNode) {
+ Qt4ProFileNode *proFileNode = qt4Project()->rootProjectNode()->findProFileFor(m_proFilePath);
+ if (!proFileNode) {
m_executable = QString::null;
m_cachedTargetInformationValid = true;
emit targetInformationChanged();
return;
}
QtVersion *qtVersion = qt4bc->qtVersion();
- ProFileReader *reader = priFileNode->createProFileReader();
+ ProFileReader *reader = proFileNode->createProFileReader();
reader->setCumulative(false);
// Find out what flags we pass on to qmake
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index a566cf45d23..4f5864b816a 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -728,13 +728,13 @@ QStringList Qt4PriFileNode::varNames(FileType type)
return vars;
}
-Qt4PriFileNode *Qt4PriFileNode::findProFileFor(const QString &fileName)
+Qt4ProFileNode *Qt4ProFileNode::findProFileFor(const QString &fileName)
{
if (fileName == path())
return this;
foreach (ProjectNode *pn, subProjectNodes())
- if (Qt4PriFileNode *qt4PriFileNode = qobject_cast<Qt4PriFileNode *>(pn))
- if (Qt4PriFileNode *result = qt4PriFileNode->findProFileFor(fileName))
+ if (Qt4ProFileNode *qt4ProFileNode = qobject_cast<Qt4ProFileNode *>(pn))
+ if (Qt4ProFileNode *result = qt4ProFileNode->findProFileFor(fileName))
return result;
return 0;
}
@@ -1084,7 +1084,7 @@ QStringList Qt4ProFileNode::updateUiFiles()
return toUpdate;
}
-ProFileReader *Qt4PriFileNode::createProFileReader() const
+ProFileReader *Qt4ProFileNode::createProFileReader() const
{
ProFileReader *reader = new ProFileReader();
connect(reader, SIGNAL(errorFound(QString)),
@@ -1096,7 +1096,7 @@ ProFileReader *Qt4PriFileNode::createProFileReader() const
if (version->isValid())
reader->setQtVersion(version);
- reader->setOutputDir(m_qt4ProFileNode->buildDir());
+ reader->setOutputDir(buildDir());
return reader;
}
@@ -1189,7 +1189,7 @@ QStringList Qt4ProFileNode::subDirsPaths(ProFileReader *reader) const
return subProjectPaths;
}
-QString Qt4PriFileNode::buildDir() const
+QString Qt4ProFileNode::buildDir() const
{
const QDir srcDirRoot = QFileInfo(m_project->rootProjectNode()->path()).absoluteDir();
const QString relativeDir = srcDirRoot.relativeFilePath(m_projectDir);
diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h
index 6c63fbc1957..f9bce3cf5a1 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.h
+++ b/src/plugins/qt4projectmanager/qt4nodes.h
@@ -128,10 +128,6 @@ public:
bool renameFile(const FileType fileType,
const QString &filePath, const QString &newFilePath);
- Qt4PriFileNode *findProFileFor(const QString &string);
-
- //internal
- ProFileReader *createProFileReader() const;
protected:
void clear();
static QStringList varNames(FileType type);
@@ -150,8 +146,6 @@ protected:
QStringList *notChanged,
ChangeType change);
- QString buildDir() const;
-
private slots:
void scheduleUpdate();
@@ -197,9 +191,16 @@ public:
void updateCodeModelSupportFromBuild(const QStringList &files);
void updateCodeModelSupportFromEditor(const QString &uiFileName, Designer::FormWindowEditor *fw);
+ QString buildDir() const;
+
QString uiDirectory() const;
static QString uiHeaderFile(const QString &uiDir, const QString &formFile);
+ Qt4ProFileNode *findProFileFor(const QString &string);
+
+ //internal
+ ProFileReader *createProFileReader() const;
+
public slots:
void scheduleUpdate();
void update();
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index 9125fdf2db2..8422e015180 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -564,15 +564,15 @@ void Qt4RunConfiguration::updateTarget()
return;
//qDebug()<<"updateTarget";
Qt4BuildConfiguration *qt4bc = qt4Project()->activeQt4BuildConfiguration();
- Qt4PriFileNode * priFileNode = qt4Project()->rootProjectNode()->findProFileFor(m_proFilePath);
- if (!priFileNode) {
+ Qt4ProFileNode *proFileNode = qt4Project()->rootProjectNode()->findProFileFor(m_proFilePath);
+ if (!proFileNode) {
m_workingDir = QString::null;
m_executable = QString::null;
m_cachedTargetInformationValid = true;
emit effectiveTargetInformationChanged();
return;
}
- ProFileReader *reader = priFileNode->createProFileReader();
+ ProFileReader *reader = proFileNode->createProFileReader();
reader->setCumulative(false);
// Find out what flags we pass on to qmake
--
GitLab