Commit 3a5a74ce authored by hjk's avatar hjk Committed by hjk

wince: style fixes

Change-Id: If1df106677a575a646c8ff2c4860cd366882077a
Reviewed-by: default avatarSteve King <steve_king_1974@yahoo.co.uk>
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent f924f1ef
......@@ -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())
......
......@@ -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);
};
......
......@@ -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();
}
......@@ -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
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment