From 661742711ecfdf83f81443e31ec6ffcb828eaf9d Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Sun, 6 Feb 2011 19:27:57 +0100
Subject: [PATCH] Rename: bool "uncommentNextLine" -> "commentOutNextLine"
---
.../qt4projectmanager/wizards/abstractmobileapp.cpp | 10 +++++-----
.../qt4projectmanager/wizards/abstractmobileapp.h | 2 +-
src/plugins/qt4projectmanager/wizards/html5app.cpp | 3 ++-
src/plugins/qt4projectmanager/wizards/html5app.h | 2 +-
src/plugins/qt4projectmanager/wizards/mobileapp.cpp | 4 ++--
src/plugins/qt4projectmanager/wizards/mobileapp.h | 2 +-
src/plugins/qt4projectmanager/wizards/qtquickapp.cpp | 6 +++---
src/plugins/qt4projectmanager/wizards/qtquickapp.h | 2 +-
8 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
index 2feb3d41442..d11d4c30147 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
@@ -249,16 +249,16 @@ QByteArray AbstractMobileApp::generateProFile(QString *errorMessage) const
QTextStream out(&proFileContent, QIODevice::WriteOnly);
QString valueOnNextLine;
- bool uncommentNextLine = false;
+ bool commentOutNextLine = false;
QString line;
while (!(line = in.readLine()).isNull()) {
if (line.contains(QLatin1String("# TARGETUID3"))) {
valueOnNextLine = symbianTargetUid();
} else if (line.contains(QLatin1String("# NETWORKACCESS"))
&& !networkEnabled()) {
- uncommentNextLine = true;
+ commentOutNextLine = true;
} else {
- handleCurrentProFileTemplateLine(line, in, out, uncommentNextLine);
+ handleCurrentProFileTemplateLine(line, in, out, commentOutNextLine);
}
// Remove all marker comments
@@ -273,9 +273,9 @@ QByteArray AbstractMobileApp::generateProFile(QString *errorMessage) const
continue;
}
- if (uncommentNextLine) {
+ if (commentOutNextLine) {
out << comment << line << endl;
- uncommentNextLine = false;
+ commentOutNextLine = false;
continue;
}
out << line << endl;
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h
index ec141eb38c7..259ce376446 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h
@@ -161,7 +161,7 @@ private:
virtual bool adaptCurrentMainCppTemplateLine(QString &line) const=0;
virtual void handleCurrentProFileTemplateLine(const QString &line,
QTextStream &proFileTemplate, QTextStream &proFile,
- bool &uncommentNextLine) const=0;
+ bool &commentOutNextLine) const = 0;
virtual QList<AbstractGeneratedFileInfo> updateableFiles(const QString &mainProFile) const = 0;
QString m_projectName;
diff --git a/src/plugins/qt4projectmanager/wizards/html5app.cpp b/src/plugins/qt4projectmanager/wizards/html5app.cpp
index d5d67474f5e..b8c9d44727e 100644
--- a/src/plugins/qt4projectmanager/wizards/html5app.cpp
+++ b/src/plugins/qt4projectmanager/wizards/html5app.cpp
@@ -121,8 +121,9 @@ bool Html5App::adaptCurrentMainCppTemplateLine(QString &line) const
void Html5App::handleCurrentProFileTemplateLine(const QString &line,
QTextStream &proFileTemplate, QTextStream &proFile,
- bool &uncommentNextLine) const
+ bool &commentOutNextLine) const
{
+ Q_UNUSED(commentOutNextLine)
if (line.contains(QLatin1String("# DEPLOYMENTFOLDERS"))) {
// Eat lines
QString nextLine;
diff --git a/src/plugins/qt4projectmanager/wizards/html5app.h b/src/plugins/qt4projectmanager/wizards/html5app.h
index 9f80bb6869d..69b0c562e89 100644
--- a/src/plugins/qt4projectmanager/wizards/html5app.h
+++ b/src/plugins/qt4projectmanager/wizards/html5app.h
@@ -99,7 +99,7 @@ private:
virtual bool adaptCurrentMainCppTemplateLine(QString &line) const;
virtual void handleCurrentProFileTemplateLine(const QString &line,
QTextStream &proFileTemplate, QTextStream &proFile,
- bool &uncommentNextLine) const;
+ bool &commentOutNextLine) const;
QList<AbstractGeneratedFileInfo> updateableFiles(const QString &mainProFile) const;
QFileInfo m_indexHtmlFile;
diff --git a/src/plugins/qt4projectmanager/wizards/mobileapp.cpp b/src/plugins/qt4projectmanager/wizards/mobileapp.cpp
index 57ec6919db7..b0b3f65694b 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/mobileapp.cpp
@@ -86,12 +86,12 @@ bool MobileApp::adaptCurrentMainCppTemplateLine(QString &line) const
void MobileApp::handleCurrentProFileTemplateLine(const QString &line,
QTextStream &proFileTemplate, QTextStream &proFile,
- bool &uncommentNextLine) const
+ bool &commentOutNextLine) const
{
Q_UNUSED(line);
Q_UNUSED(proFileTemplate);
Q_UNUSED(proFile);
- Q_UNUSED(uncommentNextLine);
+ Q_UNUSED(commentOutNextLine);
}
Core::GeneratedFiles MobileApp::generateFiles(QString *errorMessage) const
diff --git a/src/plugins/qt4projectmanager/wizards/mobileapp.h b/src/plugins/qt4projectmanager/wizards/mobileapp.h
index 40d340aa5e7..fc334bdf84d 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileapp.h
+++ b/src/plugins/qt4projectmanager/wizards/mobileapp.h
@@ -79,7 +79,7 @@ private:
virtual bool adaptCurrentMainCppTemplateLine(QString &line) const;
virtual void handleCurrentProFileTemplateLine(const QString &line,
QTextStream &proFileTemplate, QTextStream &proFile,
- bool &uncommentNextLine) const;
+ bool &commentOutNextLine) const;
QList<AbstractGeneratedFileInfo> updateableFiles(const QString &mainProFile) const;
};
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
index 5094f691a81..a8bb6666704 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
@@ -217,7 +217,7 @@ bool QtQuickApp::adaptCurrentMainCppTemplateLine(QString &line) const
void QtQuickApp::handleCurrentProFileTemplateLine(const QString &line,
QTextStream &proFileTemplate, QTextStream &proFile,
- bool &uncommentNextLine) const
+ bool &commentOutNextLine) const
{
if (line.contains(QLatin1String("# DEPLOYMENTFOLDERS"))) {
// Eat lines
@@ -245,8 +245,8 @@ void QtQuickApp::handleCurrentProFileTemplateLine(const QString &line,
proFile << "DEPLOYMENTFOLDERS = " << folders.join(QLatin1String(" ")) << endl;
} else if (line.contains(QLatin1String("# QMLJSDEBUGGER"))) {
// ### disabled for now; figure out the private headers problem first.
- //uncommentNextLine = true;
- Q_UNUSED(uncommentNextLine);
+ //commentOutNextLine = true;
+ Q_UNUSED(commentOutNextLine)
} else if (line.contains(QLatin1String("# QML_IMPORT_PATH"))) {
QString nextLine = proFileTemplate.readLine(); // eats 'QML_IMPORT_PATH ='
if (!nextLine.startsWith(QLatin1String("QML_IMPORT_PATH =")))
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.h b/src/plugins/qt4projectmanager/wizards/qtquickapp.h
index 4369dce316b..983fefa022d 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickapp.h
+++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.h
@@ -134,7 +134,7 @@ private:
virtual bool adaptCurrentMainCppTemplateLine(QString &line) const;
virtual void handleCurrentProFileTemplateLine(const QString &line,
QTextStream &proFileTemplate, QTextStream &proFile,
- bool &uncommentNextLine) const;
+ bool &commentOutNextLine) const;
QList<AbstractGeneratedFileInfo> updateableFiles(const QString &mainProFile) const;
bool addExternalModule(const QString &uri, const QFileInfo &dir,
--
GitLab