forked from qt-creator/qt-creator
Avoid warning on empty expressions
For some reason, Q_UNUSED includes already a semicolon, adding one on the user side creates an additional empty statement. Change-Id: I9c5e8fac381345a60792cb75e2938fd53958d3b0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -316,7 +316,7 @@ int AndroidDeviceModel::rowCount(const QModelIndex &parent) const
|
||||
|
||||
int AndroidDeviceModel::columnCount(const QModelIndex &parent) const
|
||||
{
|
||||
Q_UNUSED(parent);
|
||||
Q_UNUSED(parent)
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ namespace Internal {
|
||||
|
||||
QString AndroidErrorMessage::getMessage(ErrorCode errorCode, const QVariantList ¶meters)
|
||||
{
|
||||
Q_UNUSED(parameters);
|
||||
Q_UNUSED(parameters)
|
||||
switch (errorCode) {
|
||||
case SDKInstallationError:
|
||||
return tr("Android: SDK installation error 0x%1").arg(errorCode, 0, 16);
|
||||
|
||||
@@ -171,8 +171,8 @@ AndroidPlugin::~AndroidPlugin()
|
||||
|
||||
bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessage)
|
||||
{
|
||||
Q_UNUSED(arguments);
|
||||
Q_UNUSED(errorMessage);
|
||||
Q_UNUSED(arguments)
|
||||
Q_UNUSED(errorMessage)
|
||||
|
||||
d = new AndroidPluginPrivate;
|
||||
|
||||
|
||||
@@ -127,7 +127,7 @@ AndroidRunner::AndroidRunner(RunControl *runControl, const QString &intentName)
|
||||
qRegisterMetaType<Utils::Port>("Utils::Port"),
|
||||
qRegisterMetaType<AndroidDeviceInfo>("Android::AndroidDeviceInfo")
|
||||
};
|
||||
Q_UNUSED(metaTypes);
|
||||
Q_UNUSED(metaTypes)
|
||||
|
||||
m_checkAVDTimer.setInterval(2000);
|
||||
connect(&m_checkAVDTimer, &QTimer::timeout, this, &AndroidRunner::checkAVD);
|
||||
|
||||
@@ -127,7 +127,7 @@ void Android::Internal::AndroidSignalOperation::killProcess(qint64 pid)
|
||||
|
||||
void Android::Internal::AndroidSignalOperation::killProcess(const QString &filePath)
|
||||
{
|
||||
Q_UNUSED(filePath);
|
||||
Q_UNUSED(filePath)
|
||||
m_errorMessage = QLatin1String("The android signal operation does "
|
||||
"not support killing by filepath.");
|
||||
emit finished(m_errorMessage);
|
||||
@@ -140,7 +140,7 @@ void Android::Internal::AndroidSignalOperation::interruptProcess(qint64 pid)
|
||||
|
||||
void Android::Internal::AndroidSignalOperation::interruptProcess(const QString &filePath)
|
||||
{
|
||||
Q_UNUSED(filePath);
|
||||
Q_UNUSED(filePath)
|
||||
m_errorMessage = QLatin1String("The android signal operation does "
|
||||
"not support interrupting by filepath.");
|
||||
emit finished(m_errorMessage);
|
||||
|
||||
@@ -120,7 +120,7 @@ QStringList AndroidToolChain::suggestedMkspecList() const
|
||||
|
||||
FilePath AndroidToolChain::makeCommand(const Environment &env) const
|
||||
{
|
||||
Q_UNUSED(env);
|
||||
Q_UNUSED(env)
|
||||
FilePath makePath = AndroidConfigurations::currentConfig().makePath();
|
||||
return makePath.exists() ? makePath : FilePath::fromString("make");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user