From f23c4632c45fef85b6a262ef2feca8b271e19508 Mon Sep 17 00:00:00 2001
From: Pawel Polanski <pawel.3.polanski@nokia.com>
Date: Wed, 23 Feb 2011 15:16:34 +0100
Subject: [PATCH] Fixes for the Static Checks
---
.../qt4projectmanager/addlibrarywizard.h | 33 +++++++++++++++++++
.../qt-desktop/qt4runconfiguration.cpp | 2 +-
.../qt-s60/codaruncontrol.cpp | 8 +++--
.../qt-s60/s60certificateinfo.cpp | 2 +-
.../qt-s60/s60emulatorrunconfiguration.h | 2 +-
.../qt-s60/s60symbiancertificate.cpp | 2 +-
.../wizards/mobilelibraryparameters.cpp | 2 +-
src/shared/symbianutils/codadevice.cpp | 4 +--
8 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/src/plugins/qt4projectmanager/addlibrarywizard.h b/src/plugins/qt4projectmanager/addlibrarywizard.h
index d9c8db5ef6b..e187d1956f3 100644
--- a/src/plugins/qt4projectmanager/addlibrarywizard.h
+++ b/src/plugins/qt4projectmanager/addlibrarywizard.h
@@ -1,3 +1,36 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** No Commercial Usage
+**
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**************************************************************************/
+
#ifndef ADDLIBRARYWIZARD_H
#define ADDLIBRARYWIZARD_H
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
index 11eeab2cd81..fca73a1a21a 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
@@ -606,7 +606,7 @@ Utils::Environment Qt4RunConfiguration::baseEnvironment() const
// dirs to the path
const Qt4ProFileNode *node = qt4Target()->qt4Project()->rootProjectNode()->findProFileFor(m_proFilePath);
if (node)
- foreach(const QString dir, node->variableValue(LibDirectoriesVar))
+ foreach(const QString &dir, node->variableValue(LibDirectoriesVar))
env.prependOrSetPath(dir);
#endif
return env;
diff --git a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
index 49b80552c6d..3dd0474289f 100644
--- a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
@@ -265,7 +265,7 @@ void CodaRunControl::handleContextSuspended(const CodaEvent &event)
if (me.reason() == TcfSuspendEvent::Crash)
stop();
else
- m_codaDevice->sendRunControlResumeCommand(CodaCallback(), me.id()); //TODO: Should I resume automaticly
+ m_codaDevice->sendRunControlResumeCommand(CodaCallback(), me.id()); //TODO: Should I resume automatically
break;
default:
if (debug)
@@ -307,7 +307,11 @@ void CodaRunControl::handleFindProcesses(const CodaCommandResult &result)
} else {
setProgress(maxProgress()*0.90);
m_codaDevice->sendProcessStartCommand(CodaCallback(this, &CodaRunControl::handleCreateProcess),
- executableName(), executableUid(), commandLineArguments().split(" "), QString(), true);
+ executableName(),
+ executableUid(),
+ commandLineArguments().split(' '),
+ QString(),
+ true);
appendMessage(tr("Launching: %1").arg(executableName()), NormalMessageFormat);
}
}
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp b/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp
index 46df99a9c2c..e63d1e0b1e5 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp
@@ -205,7 +205,7 @@ bool S60CertificateInfo::compareCapabilities(const QStringList &givenCaps, QStri
return true;
QStringList capabilities(createCapabilityList(capabilitiesSupported()));
- foreach (QString capability, givenCaps) {
+ foreach (const QString &capability, givenCaps) {
if (!capabilities.contains(capability, Qt::CaseInsensitive))
unsupportedCaps << capability;
}
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
index d81e7d2f178..38162aba356 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
@@ -94,7 +94,7 @@ protected:
private:
void ctor();
- void handleParserState(bool sucess);
+ void handleParserState(bool success);
void updateTarget();
QString m_proFilePath;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp
index f60288555c7..91f20bfa6af 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp
@@ -350,7 +350,7 @@ public:
/**
* Get a value for a specific subject_info parameter name.
- * @param name the name of the paramter to look up. Possible names are
+ * @param name the name of the parameter to look up. Possible names are
* "X509.Certificate.v2.key_id" or "X509v3.AuthorityKeyIdentifier".
* @return the value(s) of the specified parameter
*/
diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp b/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp
index f347d9dad44..6a269411486 100644
--- a/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp
+++ b/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp
@@ -76,7 +76,7 @@ QString generateCapabilitySet(uint capabilities)
QString capabilitySet;
for(int i = 0; i < capabilityCount; ++i)
if (capabilities&symbianCapability[i].value)
- capabilitySet += QLatin1String(symbianCapability[i].name) + " ";
+ capabilitySet += QLatin1String(symbianCapability[i].name) + ' ';
return capabilitySet;
}
diff --git a/src/shared/symbianutils/codadevice.cpp b/src/shared/symbianutils/codadevice.cpp
index a8a77d06d35..57f09a353ad 100644
--- a/src/shared/symbianutils/codadevice.cpp
+++ b/src/shared/symbianutils/codadevice.cpp
@@ -961,7 +961,7 @@ void CodaDevice::sendProcessStartCommand(const CodaCallback &callBack,
QByteArray startData;
JsonInputStream startStr(startData);
- startStr << "" //We dont really know the drive of the working dir
+ startStr << "" //We don't really know the drive of the working dir
<< '\0' << binaryFileName << '\0' << arguments << '\0'
<< QStringList() << '\0' // Env is an array ["PATH=value"] (non-standard)
<< debugControl;
@@ -1264,7 +1264,7 @@ void CodaDevice::sendRegistersGetMRangeCommand(const CodaCallback &callBack,
QVector<QByteArray> ids;
ids.reserve(count);
- for (unsigned i = start; i < end; i++)
+ for (unsigned i = start; i < end; ++i)
ids.push_back(d->m_registerNames.at(i));
sendRegistersGetMCommand(callBack, contextId, ids, QVariant(start));
}
--
GitLab