From 3a5a74ce023eab65926c99fa80bcffad696fd528 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 24 Nov 2011 15:39:31 +0100
Subject: [PATCH] wince: style fixes
Change-Id: If1df106677a575a646c8ff2c4860cd366882077a
Reviewed-by: Steve King <steve_king_1974@yahoo.co.uk>
Reviewed-by: hjk <qthjk@ovi.com>
---
src/plugins/projectexplorer/wincetoolchain.cpp | 7 +++----
src/plugins/projectexplorer/wincetoolchain.h | 11 +----------
src/plugins/qt4projectmanager/winceqtversion.cpp | 13 +++++++------
src/plugins/qt4projectmanager/winceqtversion.h | 7 ++++---
.../qt4projectmanager/winceqtversionfactory.h | 4 +++-
5 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/src/plugins/projectexplorer/wincetoolchain.cpp b/src/plugins/projectexplorer/wincetoolchain.cpp
index d3913524cf8..a480e03181c 100644
--- a/src/plugins/projectexplorer/wincetoolchain.cpp
+++ b/src/plugins/projectexplorer/wincetoolchain.cpp
@@ -71,11 +71,10 @@ namespace Internal {
// Just decodes from the integer version to the string used in Qt mkspecs
static QString findMsvcVer(int version)
{
- if (10 == version)
+ if (version == 10)
return QLatin1String("msvc2010");
- else if (9 == version)
+ if (version == 9)
return QLatin1String("msvc2008");;
-
return QLatin1String("msvc2005");
}
@@ -122,7 +121,7 @@ static QString winExpandDelayedEnvReferences(QString in, const Utils::Environmen
// This is pretty much the same as the ReadEnvironmentSetting in the msvctoolchain.cpp, but
// this takes account of the library, binary and include paths to replace the vcvars versions
// with the ones for this toolchain.
-Utils::Environment WinCEToolChain::readEnvironmentSetting(Utils::Environment& env) const
+Utils::Environment WinCEToolChain::readEnvironmentSetting(Utils::Environment &env) const
{
Utils::Environment result = env;
if (!QFileInfo(m_vcvarsBat).exists())
diff --git a/src/plugins/projectexplorer/wincetoolchain.h b/src/plugins/projectexplorer/wincetoolchain.h
index 2bc28932acc..431cfd30124 100644
--- a/src/plugins/projectexplorer/wincetoolchain.h
+++ b/src/plugins/projectexplorer/wincetoolchain.h
@@ -44,14 +44,9 @@
namespace ProjectExplorer {
namespace Internal {
-// --------------------------------------------------------------------------
-// WinCEToolChain
-// --------------------------------------------------------------------------
-
class WinCEToolChain : public AbstractMsvcToolChain
{
public:
-
WinCEToolChain(const QString &name,
const Abi &abi,
const QString &vcvarsBat,
@@ -109,10 +104,6 @@ public:
};
-// --------------------------------------------------------------------------
-// WinCEToolChainFactory
-// --------------------------------------------------------------------------
-
class WinCEToolChainFactory : public ToolChainFactory
{
Q_OBJECT
@@ -129,7 +120,7 @@ public:
ToolChainConfigWidget *configurationWidget(ToolChain *);
private:
- QList<ToolChain *> detectCEToolKits(const QString& msvcPath, const QString& vcvarsbat);
+ QList<ToolChain *> detectCEToolKits(const QString &msvcPath, const QString &vcvarsbat);
};
diff --git a/src/plugins/qt4projectmanager/winceqtversion.cpp b/src/plugins/qt4projectmanager/winceqtversion.cpp
index d0c99bb920c..c86852f1825 100644
--- a/src/plugins/qt4projectmanager/winceqtversion.cpp
+++ b/src/plugins/qt4projectmanager/winceqtversion.cpp
@@ -44,8 +44,10 @@ WinCeQtVersion::WinCeQtVersion()
{
}
-WinCeQtVersion::WinCeQtVersion(const QString &path, const QString& archType, bool isAutodetected, const QString &autodetectionSource)
- : QtSupport::BaseQtVersion(path, isAutodetected, autodetectionSource), m_archType(ProjectExplorer::Abi::ArmArchitecture)
+WinCeQtVersion::WinCeQtVersion(const QString &path, const QString &archType,
+ bool isAutodetected, const QString &autodetectionSource)
+ : QtSupport::BaseQtVersion(path, isAutodetected, autodetectionSource),
+ m_archType(ProjectExplorer::Abi::ArmArchitecture)
{
if (0 == archType.compare("x86", Qt::CaseInsensitive))
m_archType = ProjectExplorer::Abi::X86Architecture;
@@ -89,7 +91,8 @@ QSet<QString> WinCeQtVersion::supportedTargetIds() const
QString WinCeQtVersion::description() const
{
- return QCoreApplication::translate("QtVersion", "Qt for WinCE", "Qt Version is meant for WinCE");
+ return QCoreApplication::translate("QtVersion",
+ "Qt for WinCE", "Qt Version is meant for WinCE");
}
void WinCeQtVersion::fromMap(const QVariantMap &map)
@@ -113,7 +116,5 @@ void WinCeQtVersion::fromMap(const QVariantMap &map)
QVariantMap WinCeQtVersion::toMap() const
{
- QVariantMap result = BaseQtVersion::toMap();
-
- return result;
+ return BaseQtVersion::toMap();
}
diff --git a/src/plugins/qt4projectmanager/winceqtversion.h b/src/plugins/qt4projectmanager/winceqtversion.h
index 03d2ff8385c..60f37ff39a2 100644
--- a/src/plugins/qt4projectmanager/winceqtversion.h
+++ b/src/plugins/qt4projectmanager/winceqtversion.h
@@ -42,7 +42,8 @@ class WinCeQtVersion : public QtSupport::BaseQtVersion
{
public:
WinCeQtVersion();
- WinCeQtVersion(const QString &path, const QString& archType, bool isAutodetected = false, const QString &autodetectionSource = QString());
+ WinCeQtVersion(const QString &path, const QString &archType,
+ bool isAutodetected = false, const QString &autodetectionSource = QString());
~WinCeQtVersion();
WinCeQtVersion *clone() const;
@@ -62,7 +63,7 @@ private:
ProjectExplorer::Abi::Architecture m_archType;
};
-}
-}
+} // namespace Internal
+} // namespace Qt4ProjectManager
#endif // WINCEQTVERSION_H
diff --git a/src/plugins/qt4projectmanager/winceqtversionfactory.h b/src/plugins/qt4projectmanager/winceqtversionfactory.h
index ba3e53752cf..f0a9ac3253b 100644
--- a/src/plugins/qt4projectmanager/winceqtversionfactory.h
+++ b/src/plugins/qt4projectmanager/winceqtversionfactory.h
@@ -29,6 +29,7 @@
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
+
#ifndef WINCEQTVERSIONFACTORY_H
#define WINCEQTVERSIONFACTORY_H
@@ -48,7 +49,8 @@ public:
virtual int priority() const;
- virtual QtSupport::BaseQtVersion *create(const QString &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected = false, const QString &autoDetectionSource = QString());
+ virtual QtSupport::BaseQtVersion *create(const QString &qmakePath, ProFileEvaluator *evaluator,
+ bool isAutoDetected = false, const QString &autoDetectionSource = QString());
};
} // Internal
--
GitLab