Skip to content

GitLab

F
flatpak-qt-creator
Commit 2631ffab authored by Tim Jenssen's avatar Tim Jenssen
Browse files
Options

Remove spaces in initializer lists 

Format initializer lists code style like.

Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013
Reviewed-by: default avatarhjk <hjk@qt.io>
parent 005ca71c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1714 additions and 1714 deletions
src/libs/cplusplus/MatchingText.cpp
View file @ 2631ffab
......@@ -102,7 +102,7 @@ static bool insertQuote(const QChar ch, const BackwardsScanner &tk)
return tk.text(index) == "operator";
// Insert matching quote after identifier when identifier is a known literal prefixes
static const QStringList stringLiteralPrefixes = { "L", "U", "u", "u8", "R"};
static const QStringList stringLiteralPrefixes = {"L", "U", "u", "u8", "R"};
return token.kind() == CPlusPlus::T_IDENTIFIER
&& stringLiteralPrefixes.contains(tk.text(index));
}
......
src/libs/cplusplus/pp-engine.cpp
View file @ 2631ffab
......@@ -840,7 +840,7 @@ void Preprocessor::handleDefined(PPToken *tk)
void Preprocessor::pushToken(Preprocessor::PPToken *tk)
{
const PPToken currentTokenBuffer[] = { *tk };
const PPToken currentTokenBuffer[] = {*tk};
m_state.pushTokenBuffer(currentTokenBuffer, currentTokenBuffer + 1, 0);
}
......
src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp
View file @ 2631ffab
......@@ -313,19 +313,19 @@ void DiagramSceneController::dropNewElement(const QString &newElementId, const Q
auto package = new MPackage();
newName = tr("New Package");
if (!stereotype.isEmpty())
package->setStereotypes({ stereotype });
package->setStereotypes({stereotype});
newObject = package;
} else if (newElementId == QLatin1String(ELEMENT_TYPE_COMPONENT)) {
auto component = new MComponent();
newName = tr("New Component");
if (!stereotype.isEmpty())
component->setStereotypes({ stereotype });
component->setStereotypes({stereotype});
newObject = component;
} else if (newElementId == QLatin1String(ELEMENT_TYPE_CLASS)) {
auto klass = new MClass();
newName = tr("New Class");
if (!stereotype.isEmpty())
klass->setStereotypes({ stereotype });
klass->setStereotypes({stereotype});
newObject = klass;
} else if (newElementId == QLatin1String(ELEMENT_TYPE_ITEM)) {
auto item = new MItem();
......
src/libs/qmljs/qmljscheck.cpp
View file @ 2631ffab
......@@ -492,34 +492,34 @@ private:
class IdsThatShouldNotBeUsedInDesigner : public QStringList
{
public:
IdsThatShouldNotBeUsedInDesigner() : QStringList({ "top",
"bottom",
"left",
"right",
"width",
"height",
"x",
"y",
"opacity",
"parent",
"item",
"flow",
"color",
"margin",
"padding",
"border",
"font",
"text",
"source",
"state",
"visible",
"focus",
"data",
"clip",
"layer",
"scale",
"enabled",
"anchors"})
IdsThatShouldNotBeUsedInDesigner() : QStringList({"top",
"bottom",
"left",
"right",
"width",
"height",
"x",
"y",
"opacity",
"parent",
"item",
"flow",
"color",
"margin",
"padding",
"border",
"font",
"text",
"source",
"state",
"visible",
"focus",
"data",
"clip",
"layer",
"scale",
"enabled",
"anchors"})
{
}
......@@ -550,13 +550,13 @@ class UnsupportedTypesByVisualDesigner : public QStringList
{
public:
UnsupportedTypesByVisualDesigner() : QStringList({"Transform",
"Timer",
"Rotation",
"Scale",
"Translate",
"Package",
"Particles",
"Dialog"})
"Timer",
"Rotation",
"Scale",
"Translate",
"Package",
"Particles",
"Dialog"})
{
}
......@@ -566,18 +566,18 @@ class UnsupportedTypesByQmlUi : public QStringList
{
public:
UnsupportedTypesByQmlUi() : QStringList({"Binding",
"ShaderEffect",
"ShaderEffectSource",
"Component",
"Loader",
"Transition",
"PropertyAnimation",
"SequentialAnimation",
"PropertyAnimation",
"SequentialAnimation",
"ParallelAnimation",
"NumberAnimation",
"Drawer"})
"ShaderEffect",
"ShaderEffectSource",
"Component",
"Loader",
"Transition",
"PropertyAnimation",
"SequentialAnimation",
"PropertyAnimation",
"SequentialAnimation",
"ParallelAnimation",
"NumberAnimation",
"Drawer"})
{
append(UnsupportedTypesByVisualDesigner());
}
......@@ -1627,8 +1627,8 @@ bool Check::visit(CallExpression *ast)
// We have to allow the translation functions
const QStringList translationFunctions = { "qsTr", "qsTrId", "qsTranslate",
"qsTrNoOp", "qsTrIdNoOp", "qsTranslateNoOp" };
const QStringList translationFunctions = {"qsTr", "qsTrId", "qsTranslate",
"qsTrNoOp", "qsTrIdNoOp", "qsTranslateNoOp"};
const bool isTranslationFunction = translationFunctions.contains(name);
......
src/libs/qmljs/qmljsplugindumper.cpp
View file @ 2631ffab
......@@ -647,10 +647,10 @@ QString PluginDumper::resolvePlugin(const QDir &qmldirPath, const QString &qmldi
QString prefix;
if (Utils::HostOsInfo::isWindowsHost()) {
// try a qmake-style debug build first
validSuffixList = QStringList({ "d.dll", ".dll" });
validSuffixList = QStringList({"d.dll", ".dll"});
} else if (Utils::HostOsInfo::isMacHost()) {
// try a qmake-style debug build first
validSuffixList = QStringList({ "_debug.dylib", ".dylib", ".so", ".bundle", "lib" });
validSuffixList = QStringList({"_debug.dylib", ".dylib", ".so", ".bundle", "lib"});
} else {
// Examples of valid library names:
// libfoo.so
......
src/libs/ssh/sshremoteprocess.cpp
View file @ 2631ffab
......@@ -58,13 +58,13 @@ const struct {
SshRemoteProcess::Signal signalEnum;
const char * const signalString;
} signalMap[] = {
{ SshRemoteProcess::AbrtSignal, "ABRT" }, { SshRemoteProcess::AlrmSignal, "ALRM" },
{ SshRemoteProcess::FpeSignal, "FPE" }, { SshRemoteProcess::HupSignal, "HUP" },
{ SshRemoteProcess::IllSignal, "ILL" }, { SshRemoteProcess::IntSignal, "INT" },
{ SshRemoteProcess::KillSignal, "KILL" }, { SshRemoteProcess::PipeSignal, "PIPE" },
{ SshRemoteProcess::QuitSignal, "QUIT" }, { SshRemoteProcess::SegvSignal, "SEGV" },
{ SshRemoteProcess::TermSignal, "TERM" }, { SshRemoteProcess::Usr1Signal, "USR1" },
{ SshRemoteProcess::Usr2Signal, "USR2" }
{SshRemoteProcess::AbrtSignal, "ABRT"}, {SshRemoteProcess::AlrmSignal, "ALRM"},
{SshRemoteProcess::FpeSignal, "FPE"}, {SshRemoteProcess::HupSignal, "HUP"},
{SshRemoteProcess::IllSignal, "ILL"}, {SshRemoteProcess::IntSignal, "INT"},
{SshRemoteProcess::KillSignal, "KILL"}, {SshRemoteProcess::PipeSignal, "PIPE"},
{SshRemoteProcess::QuitSignal, "QUIT"}, {SshRemoteProcess::SegvSignal, "SEGV"},
{SshRemoteProcess::TermSignal, "TERM"}, {SshRemoteProcess::Usr1Signal, "USR1"},
{SshRemoteProcess::Usr2Signal, "USR2"}
};
SshRemoteProcess::SshRemoteProcess(const QByteArray &command, quint32 channelId,
......
src/libs/timeline/timelinenotesmodel.cpp
View file @ 2631ffab
......@@ -137,7 +137,7 @@ int TimelineNotesModel::add(int modelId, int timelineIndex, const QString &text)
Q_D(TimelineNotesModel);
const TimelineModel *model = d->timelineModels.value(modelId);
int typeId = model->typeId(timelineIndex);
TimelineNotesModelPrivate::Note note = { text, modelId, timelineIndex };
TimelineNotesModelPrivate::Note note = {text, modelId, timelineIndex};
d->data << note;
d->modified = true;
emit changed(typeId, modelId, timelineIndex);
......
src/libs/utils/consoleprocess_unix.cpp
View file @ 2631ffab
......@@ -101,7 +101,7 @@ bool ConsoleProcess::start(const QString &program, const QString &args)
}
pcmd = QLatin1String("/bin/sh");
pargs = QtcProcess::Arguments::createUnixArgs(
QStringList({ "-c", (QtcProcess::quoteArg(program) + ' ' + args) }));
QStringList({"-c", (QtcProcess::quoteArg(program) + ' ' + args)}));
}
QtcProcess::SplitError qerr;
......
src/libs/utils/fileutils.cpp
View file @ 2631ffab
......@@ -475,9 +475,9 @@ FileSaver::FileSaver(const QString &filename, QIODevice::OpenMode mode)
if (HostOsInfo::isWindowsHost()) {
// Taken from: https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx
static const QStringList reservedNames
= { "CON", "PRN", "AUX", "NUL",
"COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9",
"LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9" };
= {"CON", "PRN", "AUX", "NUL",
"COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9",
"LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9"};
const QString fn = QFileInfo(filename).baseName().toUpper();
for (const QString &rn : reservedNames) {
if (fn == rn) {
......
src/libs/utils/qtcprocess.cpp
View file @ 2631ffab
......@@ -660,7 +660,7 @@ bool QtcProcess::prepareCommand(const QString &command, const QString &arguments
return false;
*outCmd = QLatin1String("/bin/sh");
*outArgs = Arguments::createUnixArgs(
QStringList({ "-c", (quoteArg(command) + ' ' + arguments) }));
QStringList({"-c", (quoteArg(command) + ' ' + arguments)}));
}
}
return true;
......@@ -1039,7 +1039,7 @@ bool QtcProcess::expandMacros(QString *cmd, AbstractMacroExpander *mx, OsType os
}
} else {
// !Windows
MxState state = { MxBasic, false };
MxState state = {MxBasic, false};
QStack<MxState> sstack;
QStack<MxSave> ostack;
......@@ -1085,7 +1085,7 @@ bool QtcProcess::expandMacros(QString *cmd, AbstractMacroExpander *mx, OsType os
if (str.unicode()[pos + 1].unicode() == '(') {
// $(( starts a math expression. This may also be a $( ( in fact,
// so we push the current string and offset on a stack so we can retry.
MxSave sav = { str, pos + 2, varPos };
MxSave sav = {str, pos + 2, varPos};
ostack.push(sav);
state.current = MxMath;
pos += 2;
......@@ -1315,7 +1315,7 @@ bool QtcProcess::ArgIterator::next()
}
}
} else {
MxState state = { MxBasic, false };
MxState state = {MxBasic, false};
QStack<MxState> sstack;
QStack<int> ostack;
bool hadWord = false;
......
src/libs/utils/synchronousprocess.cpp
View file @ 2631ffab
......@@ -700,7 +700,7 @@ static QString checkBinary(const QDir &dir, const QString &binary)
case OsTypeOther:
break;
case OsTypeWindows: {
static const char *windowsExtensions[] = {".cmd", ".bat", ".exe", ".com" };
static const char *windowsExtensions[] = {".cmd", ".bat", ".exe", ".com"};
// Check the Windows extensions using the order
const int windowsExtensionCount = sizeof(windowsExtensions)/sizeof(const char*);
for (int e = 0; e < windowsExtensionCount; e ++) {
......
src/libs/utils/theme/theme.cpp
View file @ 2631ffab
......@@ -272,44 +272,44 @@ QPalette Theme::palette() const
QPalette::ColorGroup paletteColorGroup;
bool setColorRoleAsBrush;
} mapping[] = {
{ PaletteWindow, QPalette::Window, QPalette::All, false},
{ PaletteWindowDisabled, QPalette::Window, QPalette::Disabled, false},
{ PaletteWindowText, QPalette::WindowText, QPalette::All, true},
{ PaletteWindowTextDisabled, QPalette::WindowText, QPalette::Disabled, true},
{ PaletteBase, QPalette::Base, QPalette::All, false},
{ PaletteBaseDisabled, QPalette::Base, QPalette::Disabled, false},
{ PaletteAlternateBase, QPalette::AlternateBase, QPalette::All, false},
{ PaletteAlternateBaseDisabled, QPalette::AlternateBase, QPalette::Disabled, false},
{ PaletteToolTipBase, QPalette::ToolTipBase, QPalette::All, true},
{ PaletteToolTipBaseDisabled, QPalette::ToolTipBase, QPalette::Disabled, true},
{ PaletteToolTipText, QPalette::ToolTipText, QPalette::All, false},
{ PaletteToolTipTextDisabled, QPalette::ToolTipText, QPalette::Disabled, false},
{ PaletteText, QPalette::Text, QPalette::All, true},
{ PaletteTextDisabled, QPalette::Text, QPalette::Disabled, true},
{ PaletteButton, QPalette::Button, QPalette::All, false},
{ PaletteButtonDisabled, QPalette::Button, QPalette::Disabled, false},
{ PaletteButtonText, QPalette::ButtonText, QPalette::All, true},
{ PaletteButtonTextDisabled, QPalette::ButtonText, QPalette::Disabled, true},
{ PaletteBrightText, QPalette::BrightText, QPalette::All, false},
{ PaletteBrightTextDisabled, QPalette::BrightText, QPalette::Disabled, false},
{ PaletteHighlight, QPalette::Highlight, QPalette::All, true},
{ PaletteHighlightDisabled, QPalette::Highlight, QPalette::Disabled, true},
{ PaletteHighlightedText, QPalette::HighlightedText, QPalette::All, true},
{ PaletteHighlightedTextDisabled, QPalette::HighlightedText, QPalette::Disabled, true},
{ PaletteLink, QPalette::Link, QPalette::All, false},
{ PaletteLinkDisabled, QPalette::Link, QPalette::Disabled, false},
{ PaletteLinkVisited, QPalette::LinkVisited, QPalette::All, false},
{ PaletteLinkVisitedDisabled, QPalette::LinkVisited, QPalette::Disabled, false},
{ PaletteLight, QPalette::Light, QPalette::All, false},
{ PaletteLightDisabled, QPalette::Light, QPalette::Disabled, false},
{ PaletteMidlight, QPalette::Midlight, QPalette::All, false},
{ PaletteMidlightDisabled, QPalette::Midlight, QPalette::Disabled, false},
{ PaletteDark, QPalette::Dark, QPalette::All, false},
{ PaletteDarkDisabled, QPalette::Dark, QPalette::Disabled, false},
{ PaletteMid, QPalette::Mid, QPalette::All, false},
{ PaletteMidDisabled, QPalette::Mid, QPalette::Disabled, false},
{ PaletteShadow, QPalette::Shadow, QPalette::All, false},
{ PaletteShadowDisabled, QPalette::Shadow, QPalette::Disabled, false}
{PaletteWindow, QPalette::Window, QPalette::All, false},
{PaletteWindowDisabled, QPalette::Window, QPalette::Disabled, false},
{PaletteWindowText, QPalette::WindowText, QPalette::All, true},
{PaletteWindowTextDisabled, QPalette::WindowText, QPalette::Disabled, true},
{PaletteBase, QPalette::Base, QPalette::All, false},
{PaletteBaseDisabled, QPalette::Base, QPalette::Disabled, false},
{PaletteAlternateBase, QPalette::AlternateBase, QPalette::All, false},
{PaletteAlternateBaseDisabled, QPalette::AlternateBase, QPalette::Disabled, false},
{PaletteToolTipBase, QPalette::ToolTipBase, QPalette::All, true},
{PaletteToolTipBaseDisabled, QPalette::ToolTipBase, QPalette::Disabled, true},
{PaletteToolTipText, QPalette::ToolTipText, QPalette::All, false},
{PaletteToolTipTextDisabled, QPalette::ToolTipText, QPalette::Disabled, false},
{PaletteText, QPalette::Text, QPalette::All, true},
{PaletteTextDisabled, QPalette::Text, QPalette::Disabled, true},
{PaletteButton, QPalette::Button, QPalette::All, false},
{PaletteButtonDisabled, QPalette::Button, QPalette::Disabled, false},
{PaletteButtonText, QPalette::ButtonText, QPalette::All, true},
{PaletteButtonTextDisabled, QPalette::ButtonText, QPalette::Disabled, true},
{PaletteBrightText, QPalette::BrightText, QPalette::All, false},
{PaletteBrightTextDisabled, QPalette::BrightText, QPalette::Disabled, false},
{PaletteHighlight, QPalette::Highlight, QPalette::All, true},
{PaletteHighlightDisabled, QPalette::Highlight, QPalette::Disabled, true},
{PaletteHighlightedText, QPalette::HighlightedText, QPalette::All, true},
{PaletteHighlightedTextDisabled, QPalette::HighlightedText, QPalette::Disabled, true},
{PaletteLink, QPalette::Link, QPalette::All, false},
{PaletteLinkDisabled, QPalette::Link, QPalette::Disabled, false},
{PaletteLinkVisited, QPalette::LinkVisited, QPalette::All, false},
{PaletteLinkVisitedDisabled, QPalette::LinkVisited, QPalette::Disabled, false},
{PaletteLight, QPalette::Light, QPalette::All, false},
{PaletteLightDisabled, QPalette::Light, QPalette::Disabled, false},
{PaletteMidlight, QPalette::Midlight, QPalette::All, false},
{PaletteMidlightDisabled, QPalette::Midlight, QPalette::Disabled, false},
{PaletteDark, QPalette::Dark, QPalette::All, false},
{PaletteDarkDisabled, QPalette::Dark, QPalette::Disabled, false},
{PaletteMid, QPalette::Mid, QPalette::All, false},
{PaletteMidDisabled, QPalette::Mid, QPalette::Disabled, false},
{PaletteShadow, QPalette::Shadow, QPalette::All, false},
{PaletteShadowDisabled, QPalette::Shadow, QPalette::Disabled, false}
};
for (auto entry: mapping) {
......
src/plugins/android/androidbuildapkstep.cpp
View file @ 2631ffab
......@@ -355,8 +355,8 @@ QAbstractItemModel *AndroidBuildApkStep::keystoreCertificates()
CertificatesModel *model = nullptr;
QStringList params
= { QLatin1String("-list"), QLatin1String("-v"), QLatin1String("-keystore"),
m_keystorePath.toUserOutput(), QLatin1String("-storepass") };
= {QLatin1String("-list"), QLatin1String("-v"), QLatin1String("-keystore"),
m_keystorePath.toUserOutput(), QLatin1String("-storepass")};
params << m_keystorePasswd;
params << QLatin1String("-J-Duser.language=en");
......
src/plugins/android/androidconfigurations.cpp
View file @ 2631ffab
......@@ -378,7 +378,7 @@ void AndroidConfig::updateAvailableSdkPlatforms() const
proc.setProcessEnvironment(androidToolEnvironment().toProcessEnvironment());
SynchronousProcessResponse response
= proc.runBlocking(androidToolPath().toString(),
QStringList({ "list", "target" })); // list available AVDs
QStringList({"list", "target"})); // list available AVDs
if (response.result != SynchronousProcessResponse::Finished)
return;
......@@ -668,7 +668,7 @@ bool AndroidConfig::removeAVD(const QString &name) const
proc.setTimeoutS(5);
proc.setProcessEnvironment(androidToolEnvironment().toProcessEnvironment());
SynchronousProcessResponse response
= proc.runBlocking(androidToolPath().toString(), QStringList({ "delete", "avd", "-n", name }));
= proc.runBlocking(androidToolPath().toString(), QStringList({"delete", "avd", "-n", name}));
return response.result == SynchronousProcessResponse::Finished && response.exitCode == 0;
}
......@@ -684,7 +684,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::androidVirtualDevices(const QString &a
SynchronousProcess proc;
proc.setTimeoutS(20);
proc.setProcessEnvironment(environment.toProcessEnvironment());
SynchronousProcessResponse response = proc.run(androidTool, { "list", "avd" }); // list available AVDs
SynchronousProcessResponse response = proc.run(androidTool, {"list", "avd"}); // list available AVDs
if (response.result != SynchronousProcessResponse::Finished)
return devices;
......@@ -1350,7 +1350,7 @@ QStringList AndroidDeviceInfo::adbSelector(const QString &serialNumber)
{
if (serialNumber.startsWith(QLatin1String("????")))
return QStringList("-d");
return QStringList({ "-s", serialNumber });
return QStringList({"-s", serialNumber});
}
const AndroidConfig &AndroidConfigurations::currentConfig()
......
src/plugins/android/androiddeployqtstep.cpp
View file @ 2631ffab
......@@ -83,7 +83,7 @@ QList<BuildStepInfo> AndroidDeployQtStepFactory::availableSteps(BuildStepList *p
|| parent->contains(AndroidDeployQtStep::Id))
return {};
return {{ AndroidDeployQtStep::Id, tr("Deploy to Android device or emulator") }};
return {{AndroidDeployQtStep::Id, tr("Deploy to Android device or emulator")}};
}
ProjectExplorer::BuildStep *AndroidDeployQtStepFactory::create(ProjectExplorer::BuildStepList *parent, Core::Id id)
......
src/plugins/android/androidmanager.cpp
View file @ 2631ffab
......@@ -408,8 +408,8 @@ bool AndroidManager::checkKeystorePassword(const QString &keystorePath, const QS
bool AndroidManager::checkCertificatePassword(const QString &keystorePath, const QString &keystorePasswd, const QString &alias, const QString &certificatePasswd)
{
// assumes that the keystore password is correct
QStringList arguments = { "-certreq", "-keystore", keystorePath,
"--storepass", keystorePasswd, "-alias", alias, "-keypass" };
QStringList arguments = {"-certreq", "-keystore", keystorePath,
"--storepass", keystorePasswd, "-alias", alias, "-keypass"};
if (certificatePasswd.isEmpty())
arguments << keystorePasswd;
else
......
src/plugins/android/androidmanifesteditorwidget.cpp
View file @ 2631ffab
......@@ -977,8 +977,8 @@ void AndroidManifestEditorWidget::parseApplication(QXmlStreamReader &reader, QXm
writer.writeStartElement(reader.name().toString());
QXmlStreamAttributes attributes = reader.attributes();
QStringList keys = { QLatin1String("android:label") };
QStringList values = { m_appNameLineEdit->text() };
QStringList keys = {QLatin1String("android:label")};
QStringList values = {m_appNameLineEdit->text()};
bool ensureIconAttribute = !m_lIconPath.isEmpty()
|| !m_mIconPath.isEmpty()
|| !m_hIconPath.isEmpty();
......
src/plugins/android/androidqtversion.cpp
View file @ 2631ffab
......@@ -140,5 +140,5 @@ QSet<Core::Id> AndroidQtVersion::availableFeatures() const
QSet<Core::Id> AndroidQtVersion::targetDeviceTypes() const
{
return { Constants::ANDROID_DEVICE_TYPE };
return {Constants::ANDROID_DEVICE_TYPE};
}
src/plugins/android/androidsignaloperation.cpp
View file @ 2631ffab
......@@ -68,9 +68,9 @@ void Android::Internal::AndroidSignalOperation::adbFindRunAsFinished(int exitCod
this, &AndroidSignalOperation::adbKillFinished);
m_state = Kill;
m_timeout->start();
m_adbProcess->start(m_adbPath, QStringList({ "shell", "run-as", runAs, "kill",
QString("-%1").arg(m_signal),
QString::number(m_pid) }));
m_adbProcess->start(m_adbPath, QStringList({"shell", "run-as", runAs, "kill",
QString("-%1").arg(m_signal),
QString::number(m_pid)}));
}
}
......
src/plugins/android/androidtoolchain.cpp
View file @ 2631ffab
......@@ -266,7 +266,7 @@ AndroidToolChainFactory::AndroidToolChainFactory()
QSet<Core::Id> Android::Internal::AndroidToolChainFactory::supportedLanguages() const
{
return { ProjectExplorer::Constants::CXX_LANGUAGE_ID };
return {ProjectExplorer::Constants::CXX_LANGUAGE_ID};
}
QList<ToolChain *> AndroidToolChainFactory::autoDetect(const QList<ToolChain *> &alreadyKnown)
......@@ -303,8 +303,8 @@ QList<AndroidToolChainFactory::AndroidToolChainInformation> AndroidToolChainFact
int idx = versionRegExp.indexIn(fileName);
if (idx == -1)
continue;
for (const Core::Id lang : { ProjectExplorer::Constants::CXX_LANGUAGE_ID,
ProjectExplorer::Constants::C_LANGUAGE_ID }) {
for (const Core::Id lang : {ProjectExplorer::Constants::CXX_LANGUAGE_ID,
ProjectExplorer::Constants::C_LANGUAGE_ID}) {
AndroidToolChainInformation ati;
ati.language = lang;
ati.version = fileName.mid(idx + 1);
......@@ -401,7 +401,7 @@ AndroidToolChainFactory::autodetectToolChainsForNdk(const FileName &ndkPath,
if (abi.architecture() == Abi::UnknownArchitecture) // e.g. mipsel which is not yet supported
continue;
QList<AndroidToolChain *> toolChainBundle;
for (Core::Id lang : { ProjectExplorer::Constants::CXX_LANGUAGE_ID, ProjectExplorer::Constants::C_LANGUAGE_ID }) {
for (Core::Id lang : {ProjectExplorer::Constants::CXX_LANGUAGE_ID, ProjectExplorer::Constants::C_LANGUAGE_ID}) {
FileName compilerPath = AndroidConfigurations::currentConfig().gccPath(abi, lang, version);
AndroidToolChain *tc = findToolChain(compilerPath, lang, alreadyKnown);
......
src/plugins/android/avddialog.cpp
View file @ 2631ffab
......@@ -45,7 +45,7 @@ AvdDialog::AvdDialog(int minApiLevel, const QString &targetArch, const AndroidCo
m_hideTipTimer.setSingleShot(true);
if (targetArch.isEmpty())
m_avdDialog.abiComboBox->addItems(QStringList({ "armeabi-v7a", "armeabi", "x86", "mips" }));
m_avdDialog.abiComboBox->addItems(QStringList({"armeabi-v7a", "armeabi", "x86", "mips"}));
else
m_avdDialog.abiComboBox->addItems(QStringList(targetArch));
......
src/plugins/autotest/autotestunittests.cpp
View file @ 2631ffab
......@@ -167,10 +167,10 @@ void AutoTestUnitTests::testCodeParserSwitchStartup_data()
QTest::addColumn<QList<int> >("expectedUnnamedQuickTestsCount");