forked from qt-creator/qt-creator
Fixes for the Static Checks
This commit is contained in:
@@ -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
|
#ifndef ADDLIBRARYWIZARD_H
|
||||||
#define ADDLIBRARYWIZARD_H
|
#define ADDLIBRARYWIZARD_H
|
||||||
|
|
||||||
|
@@ -606,7 +606,7 @@ Utils::Environment Qt4RunConfiguration::baseEnvironment() const
|
|||||||
// dirs to the path
|
// dirs to the path
|
||||||
const Qt4ProFileNode *node = qt4Target()->qt4Project()->rootProjectNode()->findProFileFor(m_proFilePath);
|
const Qt4ProFileNode *node = qt4Target()->qt4Project()->rootProjectNode()->findProFileFor(m_proFilePath);
|
||||||
if (node)
|
if (node)
|
||||||
foreach(const QString dir, node->variableValue(LibDirectoriesVar))
|
foreach(const QString &dir, node->variableValue(LibDirectoriesVar))
|
||||||
env.prependOrSetPath(dir);
|
env.prependOrSetPath(dir);
|
||||||
#endif
|
#endif
|
||||||
return env;
|
return env;
|
||||||
|
@@ -265,7 +265,7 @@ void CodaRunControl::handleContextSuspended(const CodaEvent &event)
|
|||||||
if (me.reason() == TcfSuspendEvent::Crash)
|
if (me.reason() == TcfSuspendEvent::Crash)
|
||||||
stop();
|
stop();
|
||||||
else
|
else
|
||||||
m_codaDevice->sendRunControlResumeCommand(CodaCallback(), me.id()); //TODO: Should I resume automaticly
|
m_codaDevice->sendRunControlResumeCommand(CodaCallback(), me.id()); //TODO: Should I resume automatically
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (debug)
|
if (debug)
|
||||||
@@ -307,7 +307,11 @@ void CodaRunControl::handleFindProcesses(const CodaCommandResult &result)
|
|||||||
} else {
|
} else {
|
||||||
setProgress(maxProgress()*0.90);
|
setProgress(maxProgress()*0.90);
|
||||||
m_codaDevice->sendProcessStartCommand(CodaCallback(this, &CodaRunControl::handleCreateProcess),
|
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);
|
appendMessage(tr("Launching: %1").arg(executableName()), NormalMessageFormat);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -205,7 +205,7 @@ bool S60CertificateInfo::compareCapabilities(const QStringList &givenCaps, QStri
|
|||||||
return true;
|
return true;
|
||||||
|
|
||||||
QStringList capabilities(createCapabilityList(capabilitiesSupported()));
|
QStringList capabilities(createCapabilityList(capabilitiesSupported()));
|
||||||
foreach (QString capability, givenCaps) {
|
foreach (const QString &capability, givenCaps) {
|
||||||
if (!capabilities.contains(capability, Qt::CaseInsensitive))
|
if (!capabilities.contains(capability, Qt::CaseInsensitive))
|
||||||
unsupportedCaps << capability;
|
unsupportedCaps << capability;
|
||||||
}
|
}
|
||||||
|
@@ -94,7 +94,7 @@ protected:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
void ctor();
|
void ctor();
|
||||||
void handleParserState(bool sucess);
|
void handleParserState(bool success);
|
||||||
void updateTarget();
|
void updateTarget();
|
||||||
|
|
||||||
QString m_proFilePath;
|
QString m_proFilePath;
|
||||||
|
@@ -350,7 +350,7 @@ public:
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get a value for a specific subject_info parameter name.
|
* 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".
|
* "X509.Certificate.v2.key_id" or "X509v3.AuthorityKeyIdentifier".
|
||||||
* @return the value(s) of the specified parameter
|
* @return the value(s) of the specified parameter
|
||||||
*/
|
*/
|
||||||
|
@@ -76,7 +76,7 @@ QString generateCapabilitySet(uint capabilities)
|
|||||||
QString capabilitySet;
|
QString capabilitySet;
|
||||||
for(int i = 0; i < capabilityCount; ++i)
|
for(int i = 0; i < capabilityCount; ++i)
|
||||||
if (capabilities&symbianCapability[i].value)
|
if (capabilities&symbianCapability[i].value)
|
||||||
capabilitySet += QLatin1String(symbianCapability[i].name) + " ";
|
capabilitySet += QLatin1String(symbianCapability[i].name) + ' ';
|
||||||
return capabilitySet;
|
return capabilitySet;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -961,7 +961,7 @@ void CodaDevice::sendProcessStartCommand(const CodaCallback &callBack,
|
|||||||
|
|
||||||
QByteArray startData;
|
QByteArray startData;
|
||||||
JsonInputStream startStr(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'
|
<< '\0' << binaryFileName << '\0' << arguments << '\0'
|
||||||
<< QStringList() << '\0' // Env is an array ["PATH=value"] (non-standard)
|
<< QStringList() << '\0' // Env is an array ["PATH=value"] (non-standard)
|
||||||
<< debugControl;
|
<< debugControl;
|
||||||
@@ -1264,7 +1264,7 @@ void CodaDevice::sendRegistersGetMRangeCommand(const CodaCallback &callBack,
|
|||||||
|
|
||||||
QVector<QByteArray> ids;
|
QVector<QByteArray> ids;
|
||||||
ids.reserve(count);
|
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));
|
ids.push_back(d->m_registerNames.at(i));
|
||||||
sendRegistersGetMCommand(callBack, contextId, ids, QVariant(start));
|
sendRegistersGetMCommand(callBack, contextId, ids, QVariant(start));
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user