diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2017-02-22 15:09:35 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2017-02-22 16:25:09 +0000 |
| commit | 2631ffabd5a7955a40b9779b0d52af64e3bd3a60 (patch) | |
| tree | a030ea11d0d561b720d0e0d352b4a0fc728a6758 /src | |
| parent | 005ca71cac65b7c766d814b97b830e2af1c7aa53 (diff) | |
Remove spaces in initializer lists
Format initializer lists code style like.
Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src')
194 files changed, 1243 insertions, 1243 deletions
diff --git a/src/libs/cplusplus/MatchingText.cpp b/src/libs/cplusplus/MatchingText.cpp index 73a3df4b5b..46dfdfb3be 100644 --- a/src/libs/cplusplus/MatchingText.cpp +++ b/src/libs/cplusplus/MatchingText.cpp @@ -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)); } diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index 13913745d9..5f2e543c52 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -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); } diff --git a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp index 0ddd93d066..d7619d7786 100644 --- a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp +++ b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp @@ -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(); diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index f8cb385efd..714d20dc04 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -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); diff --git a/src/libs/qmljs/qmljsplugindumper.cpp b/src/libs/qmljs/qmljsplugindumper.cpp index 5e1cadb095..c5ba42c13e 100644 --- a/src/libs/qmljs/qmljsplugindumper.cpp +++ b/src/libs/qmljs/qmljsplugindumper.cpp @@ -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 diff --git a/src/libs/ssh/sshremoteprocess.cpp b/src/libs/ssh/sshremoteprocess.cpp index d5980961f4..2f31b39fbc 100644 --- a/src/libs/ssh/sshremoteprocess.cpp +++ b/src/libs/ssh/sshremoteprocess.cpp @@ -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, diff --git a/src/libs/timeline/timelinenotesmodel.cpp b/src/libs/timeline/timelinenotesmodel.cpp index a1e8c89c5d..4719b6f88c 100644 --- a/src/libs/timeline/timelinenotesmodel.cpp +++ b/src/libs/timeline/timelinenotesmodel.cpp @@ -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); diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp index 7191aea04e..192f340940 100644 --- a/src/libs/utils/consoleprocess_unix.cpp +++ b/src/libs/utils/consoleprocess_unix.cpp @@ -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; diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index bf4dc5f670..000407f01f 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -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) { diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 68e9159ba7..5868e52d9c 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -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; diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp index 4596193a24..b4b2cfc2b3 100644 --- a/src/libs/utils/synchronousprocess.cpp +++ b/src/libs/utils/synchronousprocess.cpp @@ -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 ++) { diff --git a/src/libs/utils/theme/theme.cpp b/src/libs/utils/theme/theme.cpp index 27c57ea092..a0dd779f4b 100644 --- a/src/libs/utils/theme/theme.cpp +++ b/src/libs/utils/theme/theme.cpp @@ -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) { diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index 2dfc793a7b..0ff998809f 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -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"); diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index c7121307be..851b0f2350 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -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() diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 7c77633ad0..0b4ac2d1eb 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -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) diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 761af9e6b2..29791c2ae6 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -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 diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp index 8422730b70..9d7bb67662 100644 --- a/src/plugins/android/androidmanifesteditorwidget.cpp +++ b/src/plugins/android/androidmanifesteditorwidget.cpp @@ -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(); diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index 73e01c0397..eaf47f6481 100644 --- a/src/plugins/android/androidqtversion.cpp +++ b/src/plugins/android/androidqtversion.cpp @@ -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}; } diff --git a/src/plugins/android/androidsignaloperation.cpp b/src/plugins/android/androidsignaloperation.cpp index 0fa44610c6..382db6ca07 100644 --- a/src/plugins/android/androidsignaloperation.cpp +++ b/src/plugins/android/androidsignaloperation.cpp @@ -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)})); } } diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index 3ec2e0c70a..63cf260bdd 100644 --- a/src/plugins/android/androidtoolchain.cpp +++ b/src/plugins/android/androidtoolchain.cpp @@ -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); diff --git a/src/plugins/android/avddialog.cpp b/src/plugins/android/avddialog.cpp index 7fb71b23d2..9bfea8ef21 100644 --- a/src/plugins/android/avddialog.cpp +++ b/src/plugins/android/avddialog.cpp @@ -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)); diff --git a/src/plugins/autotest/autotestunittests.cpp b/src/plugins/autotest/autotestunittests.cpp index a8f06ce0ac..b0e02ca395 100644 --- a/src/plugins/autotest/autotestunittests.cpp +++ b/src/plugins/autotest/autotestunittests.cpp @@ -167,10 +167,10 @@ void AutoTestUnitTests::testCodeParserSwitchStartup_data() QTest::addColumn<QList<int> >("expectedUnnamedQuickTestsCount"); QTest::addColumn<QList<int> >("expectedDataTagsCount"); - QStringList projects = QStringList({ m_tmpDir->path() + "/plain/plain.pro", + QStringList projects = QStringList({m_tmpDir->path() + "/plain/plain.pro", m_tmpDir->path() + "/mixed_atp/mixed_atp.pro", m_tmpDir->path() + "/plain/plain.qbs", - m_tmpDir->path() + "/mixed_atp/mixed_atp.qbs" }); + m_tmpDir->path() + "/mixed_atp/mixed_atp.qbs"}); QList<int> expectedAutoTests = QList<int>() << 1 << 4 << 1 << 4; QList<int> expectedNamedQuickTests = QList<int>() << 0 << 5 << 0 << 5; diff --git a/src/plugins/autotest/gtest/gtesttreeitem.cpp b/src/plugins/autotest/gtest/gtesttreeitem.cpp index a1312033ee..eb81fd54f3 100644 --- a/src/plugins/autotest/gtest/gtesttreeitem.cpp +++ b/src/plugins/autotest/gtest/gtesttreeitem.cpp @@ -311,8 +311,8 @@ TestTreeItem *GTestTreeItem::findChildByNameStateAndFile(const QString &name, QString GTestTreeItem::nameSuffix() const { - static QString markups[] = { QCoreApplication::translate("GTestTreeItem", "parameterized"), - QCoreApplication::translate("GTestTreeItem", "typed") }; + static QString markups[] = {QCoreApplication::translate("GTestTreeItem", "parameterized"), + QCoreApplication::translate("GTestTreeItem", "typed")}; QString suffix; if (m_state & Parameterized) suffix = QString(" [") + markups[0]; diff --git a/src/plugins/autotest/qtest/qttestoutputreader.cpp b/src/plugins/autotest/qtest/qttestoutputreader.cpp index 9a20590340..015bcc179c 100644 --- a/src/plugins/autotest/qtest/qttestoutputreader.cpp +++ b/src/plugins/autotest/qtest/qttestoutputreader.cpp @@ -135,12 +135,12 @@ QtTestOutputReader::QtTestOutputReader(const QFutureInterface<TestResultPtr> &fu void QtTestOutputReader::processOutput(const QByteArray &outputLine) { - static QStringList validEndTags = { QStringLiteral("Incident"), - QStringLiteral("Message"), - QStringLiteral("BenchmarkResult"), - QStringLiteral("QtVersion"), - QStringLiteral("QtBuild"), - QStringLiteral("QTestVersion") }; + static QStringList validEndTags = {QStringLiteral("Incident"), + QStringLiteral("Message"), + QStringLiteral("BenchmarkResult"), + QStringLiteral("QtVersion"), + QStringLiteral("QtBuild"), + QStringLiteral("QTestVersion")}; if (m_className.isEmpty() && outputLine.trimmed().isEmpty()) return; diff --git a/src/plugins/autotest/qtest/qttestparser.cpp b/src/plugins/autotest/qtest/qttestparser.cpp index e7a102a18a..8371f6d614 100644 --- a/src/plugins/autotest/qtest/qttestparser.cpp +++ b/src/plugins/autotest/qtest/qttestparser.cpp @@ -55,7 +55,7 @@ static bool includesQtTest(const CPlusPlus::Document::Ptr &doc, const CPlusPlus: { static QStringList expectedHeaderPrefixes = Utils::HostOsInfo::isMacHost() - ? QStringList({ "QtTest.framework/Headers", "QtTest" }) : QStringList({ "QtTest" }); + ? QStringList({"QtTest.framework/Headers", "QtTest"}) : QStringList({"QtTest"}); const QList<CPlusPlus::Document::Include> includes = doc->resolvedIncludes(); diff --git a/src/plugins/autotest/qtest/qttestvisitors.cpp b/src/plugins/autotest/qtest/qttestvisitors.cpp index c32177d7e0..b6d6992e2d 100644 --- a/src/plugins/autotest/qtest/qttestvisitors.cpp +++ b/src/plugins/autotest/qtest/qttestvisitors.cpp @@ -35,7 +35,7 @@ namespace Autotest { namespace Internal { -static QStringList specialFunctions({ "initTestCase", "cleanupTestCase", "init", "cleanup" }); +static QStringList specialFunctions({"initTestCase", "cleanupTestCase", "init", "cleanup"}); /************************** Cpp Test Symbol Visitor ***************************/ diff --git a/src/plugins/autotest/quick/quicktestparser.cpp b/src/plugins/autotest/quick/quicktestparser.cpp index f1cf7dc100..e6b8e4df7a 100644 --- a/src/plugins/autotest/quick/quicktestparser.cpp +++ b/src/plugins/autotest/quick/quicktestparser.cpp @@ -57,8 +57,8 @@ static bool includesQtQuickTest(const CPlusPlus::Document::Ptr &doc, { static QStringList expectedHeaderPrefixes = Utils::HostOsInfo::isMacHost() - ? QStringList({ "QtQuickTest.framework/Headers", "QtQuickTest" }) - : QStringList({ "QtQuickTest" }); + ? QStringList({"QtQuickTest.framework/Headers", "QtQuickTest"}) + : QStringList({"QtQuickTest"}); const QList<CPlusPlus::Document::Include> includes = doc->resolvedIncludes(); diff --git a/src/plugins/autotest/quick/quicktestvisitors.cpp b/src/plugins/autotest/quick/quicktestvisitors.cpp index 093b7c0b63..d3cd59f318 100644 --- a/src/plugins/autotest/quick/quicktestvisitors.cpp +++ b/src/plugins/autotest/quick/quicktestvisitors.cpp @@ -30,7 +30,7 @@ namespace Autotest { namespace Internal { -static QStringList specialFunctions({ "initTestCase", "cleanupTestCase", "init", "cleanup" }); +static QStringList specialFunctions({"initTestCase", "cleanupTestCase", "init", "cleanup"}); TestQmlVisitor::TestQmlVisitor(QmlJS::Document::Ptr doc) : m_currentDoc(doc) diff --git a/src/plugins/autotest/testnavigationwidget.cpp b/src/plugins/autotest/testnavigationwidget.cpp index 2bc9421850..6323e0d9f0 100644 --- a/src/plugins/autotest/testnavigationwidget.cpp +++ b/src/plugins/autotest/testnavigationwidget.cpp @@ -317,7 +317,7 @@ void TestNavigationWidget::onRunThisTestTriggered(TestRunner::Mode runMode) if (configuration) { TestRunner *runner = TestRunner::instance(); - runner->setSelectedTests( {configuration} ); + runner->setSelectedTests({configuration}); runner->prepareToRunTests(runMode); } } diff --git a/src/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp index e6ed2df8de..48402bbb05 100644 --- a/src/plugins/autotest/testresultspane.cpp +++ b/src/plugins/autotest/testresultspane.cpp @@ -229,7 +229,7 @@ QWidget *TestResultsPane::outputWidget(QWidget *parent) QList<QWidget *> TestResultsPane::toolBarWidgets() const { - return { m_expandCollapse, m_runAll, m_runSelected, m_stopTestRun, m_filterButton }; + return {m_expandCollapse, m_runAll, m_runSelected, m_stopTestRun, m_filterButton}; } QString TestResultsPane::displayName() const diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.cpp b/src/plugins/autotoolsprojectmanager/autogenstep.cpp index d41440c91a..09e9c9a75d 100644 --- a/src/plugins/autotoolsprojectmanager/autogenstep.cpp +++ b/src/plugins/autotoolsprojectmanager/autogenstep.cpp @@ -63,7 +63,7 @@ QList<BuildStepInfo> AutogenStepFactory::availableSteps(BuildStepList *parent) c return {}; QString display = tr("Autogen", "Display name for AutotoolsProjectManager::AutogenStep id."); - return {{ AUTOGEN_STEP_ID, display }}; + return {{AUTOGEN_STEP_ID, display}}; } BuildStep *AutogenStepFactory::create(BuildStepList *parent, Core::Id id) diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp index 099e9aa1ab..5512f5ecb4 100644 --- a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp +++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp @@ -62,7 +62,7 @@ QList<BuildStepInfo> AutoreconfStepFactory::availableSteps(BuildStepList *parent return {}; QString display = tr("Autoreconf", "Display name for AutotoolsProjectManager::AutoreconfStep id."); - return {{ AUTORECONF_STEP_ID, display }}; + return {{AUTORECONF_STEP_ID, display}}; } BuildStep *AutoreconfStepFactory::create(BuildStepList *parent, Core::Id id) diff --git a/src/plugins/autotoolsprojectmanager/configurestep.cpp b/src/plugins/autotoolsprojectmanager/configurestep.cpp index cf1739b6e0..fbfd5f47e6 100644 --- a/src/plugins/autotoolsprojectmanager/configurestep.cpp +++ b/src/plugins/autotoolsprojectmanager/configurestep.cpp @@ -77,7 +77,7 @@ QList<BuildStepInfo> ConfigureStepFactory::availableSteps(BuildStepList *parent) return {}; QString display = tr("Configure", "Display name for AutotoolsProjectManager::ConfigureStep id."); - return {{ CONFIGURE_STEP_ID, display }}; + return {{CONFIGURE_STEP_ID, display}}; } BuildStep *ConfigureStepFactory::create(BuildStepList *parent, Core::Id id) diff --git a/src/plugins/autotoolsprojectmanager/makefileparser.cpp b/src/plugins/autotoolsprojectmanager/makefileparser.cpp index 54a375c67b..74e29054ec 100644 --- a/src/plugins/autotoolsprojectmanager/makefileparser.cpp +++ b/src/plugins/autotoolsprojectmanager/makefileparser.cpp @@ -400,7 +400,7 @@ QStringList MakefileParser::targetValues(bool *hasVariables) void MakefileParser::appendHeader(QStringList &list, const QDir &dir, const QString &fileName) { - const char *const headerExtensions[] = { ".h", ".hh", ".hg", ".hxx", ".hpp", 0 }; + const char *const headerExtensions[] = {".h", ".hh", ".hg", ".hxx", ".hpp", 0}; int i = 0; while (headerExtensions[i] != 0) { const QString headerFile = fileName + QLatin1String(headerExtensions[i]); diff --git a/src/plugins/autotoolsprojectmanager/makestep.cpp b/src/plugins/autotoolsprojectmanager/makestep.cpp index f3fe8ca174..99658dd714 100644 --- a/src/plugins/autotoolsprojectmanager/makestep.cpp +++ b/src/plugins/autotoolsprojectmanager/makestep.cpp @@ -67,7 +67,7 @@ QList<BuildStepInfo> MakeStepFactory::availableSteps(BuildStepList *parent) cons if (parent->target()->project()->id() != AUTOTOOLS_PROJECT_ID) return {}; - return {{ MAKE_STEP_ID, tr("Make", "Display name for AutotoolsProjectManager::MakeStep id.") }}; + return {{MAKE_STEP_ID, tr("Make", "Display name for AutotoolsProjectManager::MakeStep id.")}}; } BuildStep *MakeStepFactory::create(BuildStepList *parent, Core::Id id) diff --git a/src/plugins/baremetal/gdbserverprovider.cpp b/src/plugins/baremetal/gdbserverprovider.cpp index f7b3d5b319..3edad82f2c 100644 --- a/src/plugins/baremetal/gdbserverprovider.cpp +++ b/src/plugins/baremetal/gdbserverprovider.cpp @@ -155,11 +155,11 @@ bool GdbServerProvider::operator==(const GdbServerProvider &other) const QVariantMap GdbServerProvider::toMap() const { return { - { QLatin1String(idKeyC), m_id }, - { QLatin1String(displayNameKeyC), m_displayName }, - { QLatin1String(startupModeKeyC), m_startupMode }, - { QLatin1String(initCommandsKeyC), m_initCommands }, - { QLatin1String(resetCommandsKeyC), m_resetCommands } + {QLatin1String(idKeyC), m_id}, + {QLatin1String(displayNameKeyC), m_displayName}, + {QLatin1String(startupModeKeyC), m_startupMode}, + {QLatin1String(initCommandsKeyC), m_initCommands}, + {QLatin1String(resetCommandsKeyC), m_resetCommands} }; } diff --git a/src/plugins/baremetal/gdbserverprovidermanager.cpp b/src/plugins/baremetal/gdbserverprovidermanager.cpp index e1a5b509cc..221aa9266e 100644 --- a/src/plugins/baremetal/gdbserverprovidermanager.cpp +++ b/src/plugins/baremetal/gdbserverprovidermanager.cpp @@ -59,9 +59,9 @@ static GdbServerProviderManager *m_instance = 0; GdbServerProviderManager::GdbServerProviderManager(QObject *parent) : QObject(parent) , m_configFile(settingsFileName(QLatin1String(fileNameKeyC))) - , m_factories({ new DefaultGdbServerProviderFactory, - new OpenOcdGdbServerProviderFactory, - new StLinkUtilGdbServerProviderFactory }) + , m_factories({new DefaultGdbServerProviderFactory, + new OpenOcdGdbServerProviderFactory, + new StLinkUtilGdbServerProviderFactory}) { m_writer = new Utils::PersistentSettingsWriter( m_configFile, QLatin1String("QtCreatorGdbServerProviders")); diff --git a/src/plugins/bineditor/bineditorwidget.cpp b/src/plugins/bineditor/bineditorwidget.cpp index ae75a56135..1814614296 100644 --- a/src/plugins/bineditor/bineditorwidget.cpp +++ b/src/plugins/bineditor/bineditorwidget.cpp @@ -817,7 +817,7 @@ void BinEditorWidget::paintEvent(QPaintEvent *e) QString itemString(m_bytesPerLine*3, QLatin1Char(' ')); QChar *itemStringData = itemString.data(); - char changedString[160] = { false }; + char changedString[160] = {false}; QTC_ASSERT((size_t)m_bytesPerLine < sizeof(changedString), return); const char *hex = "0123456789abcdef"; diff --git a/src/plugins/clangcodemodel/clangdiagnosticfilter.cpp b/src/plugins/clangcodemodel/clangdiagnosticfilter.cpp index ecd1edf0e5..2a7d92b987 100644 --- a/src/plugins/clangcodemodel/clangdiagnosticfilter.cpp +++ b/src/plugins/clangcodemodel/clangdiagnosticfilter.cpp @@ -48,7 +48,7 @@ bool isWarningOrNote(ClangBackEnd::DiagnosticSeverity severity) bool isBlackListedDiagnostic(const ClangBackEnd::DiagnosticContainer &diagnostic, bool isHeaderFile) { - static const Utf8StringVector blackList { + static const Utf8StringVector blackList{ Utf8StringLiteral("warning: #pragma once in main file"), Utf8StringLiteral("warning: #include_next in primary source file") }; diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.cpp index a73b4c73e6..0362e6f204 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.cpp +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.cpp @@ -68,7 +68,7 @@ private: ClangStaticAnalyzerDiagnosticModel::ClangStaticAnalyzerDiagnosticModel(QObject *parent) : Utils::TreeModel<>(parent) { - setHeader({ tr("Issue"), tr("Location") }); + setHeader({tr("Issue"), tr("Location")}); } void ClangStaticAnalyzerDiagnosticModel::addDiagnostics(const QList<Diagnostic> &diagnostics) diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp index cc687a0af0..78579a56f4 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp @@ -140,7 +140,7 @@ ClangStaticAnalyzerTool::ClangStaticAnalyzerTool(QObject *parent) Debugger::registerPerspective(ClangStaticAnalyzerPerspectiveId, new Perspective( tr("Clang Static Analyzer"), - {{ ClangStaticAnalyzerDockId, m_diagnosticView, {}, Perspective::SplitVertical }} + {{ClangStaticAnalyzerDockId, m_diagnosticView, {}, Perspective::SplitVertical}} )); ActionDescription desc; diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index cd24249992..7da0b5bebf 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -1795,7 +1795,7 @@ static QString baseName(const QString &fileName) bool ClearCasePlugin::vcsAdd(const QString &workingDir, const QString &fileName) { return ccFileOp(workingDir, tr("ClearCase Add File %1").arg(baseName(fileName)), - QStringList({ "mkelem", "-ci" }), fileName); + QStringList({"mkelem", "-ci"}), fileName); } bool ClearCasePlugin::vcsDelete(const QString &workingDir, const QString &fileName) @@ -1806,7 +1806,7 @@ bool ClearCasePlugin::vcsDelete(const QString &workingDir, const QString &fileNa return true; return ccFileOp(workingDir, tr("ClearCase Remove File %1").arg(baseName(fileName)), - QStringList({ "rmname", "-force" }), fileName); + QStringList({"rmname", "-force"}), fileName); } bool ClearCasePlugin::vcsMove(const QString &workingDir, const QString &from, const QString &to) diff --git a/src/plugins/cmakeprojectmanager/builddirmanager.cpp b/src/plugins/cmakeprojectmanager/builddirmanager.cpp index 9b57ce0ab5..02d9de2d36 100644 --- a/src/plugins/cmakeprojectmanager/builddirmanager.cpp +++ b/src/plugins/cmakeprojectmanager/builddirmanager.cpp @@ -156,7 +156,7 @@ void BuildDirManager::maybeForceReparseOnceReaderReady() const QByteArray CMAKE_CXX_COMPILER_KEY = "CMAKE_CXX_COMPILER"; const QByteArrayList criticalKeys - = { GENERATOR_KEY, CMAKE_COMMAND_KEY, CMAKE_C_COMPILER_KEY, CMAKE_CXX_COMPILER_KEY }; + = {GENERATOR_KEY, CMAKE_COMMAND_KEY, CMAKE_C_COMPILER_KEY, CMAKE_CXX_COMPILER_KEY}; const CMakeConfig currentConfig = parsedConfiguration(); diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 960bb9c59a..062decf2d8 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -598,22 +598,22 @@ CMakeBuildInfo *CMakeBuildConfigurationFactory::createBuildInfo(const ProjectExp info->typeName = tr("Build"); break; case BuildTypeDebug: - buildTypeItem = { CMakeConfigItem("CMAKE_BUILD_TYPE", "Debug") }; + buildTypeItem = {CMakeConfigItem("CMAKE_BUILD_TYPE", "Debug")}; info->typeName = tr("Debug"); info->buildType = BuildConfiguration::Debug; break; case BuildTypeRelease: - buildTypeItem = { CMakeConfigItem("CMAKE_BUILD_TYPE", "Release") }; + buildTypeItem = {CMakeConfigItem("CMAKE_BUILD_TYPE", "Release")}; info->typeName = tr("Release"); info->buildType = BuildConfiguration::Release; break; case BuildTypeMinSizeRel: - buildTypeItem = { CMakeConfigItem("CMAKE_BUILD_TYPE", "MinSizeRel") }; + buildTypeItem = {CMakeConfigItem("CMAKE_BUILD_TYPE", "MinSizeRel")}; info->typeName = tr("Minimum Size Release"); info->buildType = BuildConfiguration::Release; break; case BuildTypeRelWithDebInfo: - buildTypeItem = { CMakeConfigItem("CMAKE_BUILD_TYPE", "RelWithDebInfo") }; + buildTypeItem = {CMakeConfigItem("CMAKE_BUILD_TYPE", "RelWithDebInfo")}; info->typeName = tr("Release with Debug Information"); info->buildType = BuildConfiguration::Profile; break; diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index 6d8dc80282..24ce40dcaa 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -526,8 +526,8 @@ QList<BuildStepInfo> CMakeBuildStepFactory::availableSteps(BuildStepList *parent if (parent->target()->project()->id() != Constants::CMAKEPROJECT_ID) return {}; - return {{ Constants::CMAKE_BUILD_STEP_ID, - tr("Build", "Display name for CMakeProjectManager::CMakeBuildStep id.") }}; + return {{Constants::CMAKE_BUILD_STEP_ID, + tr("Build", "Display name for CMakeProjectManager::CMakeBuildStep id.")}}; } BuildStep *CMakeBuildStepFactory::create(BuildStepList *parent, Core::Id id) diff --git a/src/plugins/cmakeprojectmanager/cmakecbpparser.cpp b/src/plugins/cmakeprojectmanager/cmakecbpparser.cpp index 0895bd8999..350950388f 100644 --- a/src/plugins/cmakeprojectmanager/cmakecbpparser.cpp +++ b/src/plugins/cmakeprojectmanager/cmakecbpparser.cpp @@ -47,7 +47,7 @@ namespace Internal { namespace { int distance(const FileName &targetDirectory, const FileName &fileName) { - const QString commonParent = commonPath(QStringList({ targetDirectory.toString(), fileName.toString() })); + const QString commonParent = commonPath(QStringList({targetDirectory.toString(), fileName.toString()})); return targetDirectory.toString().mid(commonParent.size()).count('/') + fileName.toString().mid(commonParent.size()).count('/'); } diff --git a/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp b/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp index c86e7f5d64..2b09a3769c 100644 --- a/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp @@ -45,7 +45,7 @@ CMakeConfigItem::CMakeConfigItem() = default; CMakeConfigItem::CMakeConfigItem(const CMakeConfigItem &other) : key(other.key), type(other.type), isAdvanced(other.isAdvanced), value(other.value), documentation(other.documentation), values(other.values) -{ } +{} CMakeConfigItem::CMakeConfigItem(const QByteArray &k, Type t, const QByteArray &d, const QByteArray &v) : @@ -372,34 +372,34 @@ void CMakeProjectPlugin::testCMakeSplitValue_data() << "" << true << QStringList(); QTest::newRow("single path") - << "C:/something" << false << QStringList({ "C:/something" }); + << "C:/something" << false << QStringList({"C:/something"}); QTest::newRow("single path, keep empty") - << "C:/something" << true << QStringList({ "C:/something" }); + << "C:/something" << true << QStringList({"C:/something"}); QTest::newRow(";single path") - << ";C:/something" << false << QStringList({ "C:/something" }); + << ";C:/something" << false << QStringList({"C:/something"}); QTest::newRow(";single path, keep empty") - << ";C:/something" << true << QStringList({ "", "C:/something" }); + << ";C:/something" << true << QStringList({"", "C:/something"}); QTest::newRow("single path;") - << "C:/something;" << false << QStringList({ "C:/something" }); + << "C:/something;" << false << QStringList({"C:/something"}); QTest::newRow("single path;, keep empty") - << "C:/something;" << true << QStringList({ "C:/something", "" }); + << "C:/something;" << true << QStringList({"C:/something", ""}); QTest::newRow("single path\\;") - << "C:/something\\;" << false << QStringList({ "C:/something;" }); + << "C:/something\\;" << false << QStringList({"C:/something;"}); QTest::newRow("single path\\;, keep empty") - << "C:/something\\;" << true << QStringList({ "C:/something;" }); + << "C:/something\\;" << true << QStringList({"C:/something;"}); QTest::newRow("single path\\;;second path") - << "C:/something\\;;/second/path" << false << QStringList({ "C:/something;", "/second/path" }); + << "C:/something\\;;/second/path" << false << QStringList({"C:/something;", "/second/path"}); QTest::newRow("single path\\;;second path, keep empty") - << "C:/something\\;;/second/path" << true << QStringList({ "C:/something;", "/second/path" }); + << "C:/something\\;;/second/path" << true << QStringList({"C:/something;", "/second/path"}); QTest::newRow("single path;;second path") - << "C:/something;;/second/path" << false << QStringList({ "C:/something", "/second/path" }); + << "C:/something;;/second/path" << false << QStringList({"C:/something", "/second/path"}); QTest::newRow("single path;;second path, keep empty") - << "C:/something;;/second/path" << true << QStringList({ "C:/something", "", "/second/path" }); + << "C:/something;;/second/path" << true << QStringList({"C:/something", "", "/second/path"}); } void CMakeProjectPlugin::testCMakeSplitValue() diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp index 79c4a9a763..25f3e2d411 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp @@ -267,7 +267,7 @@ void CMakeGeneratorKitInformation::set(Kit *k, const QString &generator, const QString &extraGenerator, const QString &platform, const QString &toolset) { - GeneratorInfo info = { generator, extraGenerator, platform, toolset }; + GeneratorInfo info = {generator, extraGenerator, platform, toolset}; setGeneratorInfo(k, info); } @@ -311,7 +311,7 @@ QVariant CMakeGeneratorKitInformation::defaultValue(const Kit *k) const k->addToEnvironment(env); const Utils::FileName ninjaExec = env.searchInPath(QLatin1String("ninja")); if (!ninjaExec.isEmpty()) - return GeneratorInfo({ QString("Ninja"), extraGenerator, QString(), QString() }).toVariant(); + return GeneratorInfo({QString("Ninja"), extraGenerator, QString(), QString()}).toVariant(); } if (Utils::HostOsInfo::isWindowsHost()) { @@ -341,7 +341,7 @@ QVariant CMakeGeneratorKitInformation::defaultValue(const Kit *k) const if (it == known.constEnd()) return QVariant(); - return GeneratorInfo({ it->name, extraGenerator, QString(), QString() }).toVariant(); + return GeneratorInfo({it->name, extraGenerator, QString(), QString()}).toVariant(); } QList<Task> CMakeGeneratorKitInformation::validate(const Kit *k) const @@ -407,9 +407,9 @@ void CMakeGeneratorKitInformation::fix(Kit *k) dv.fromVariant(defaultValue(k)); setGeneratorInfo(k, dv); } else { - const GeneratorInfo dv = { info.generator, info.extraGenerator, - it->supportsPlatform ? info.platform : QString(), - it->supportsToolset ? info.toolset : QString() }; + const GeneratorInfo dv = {info.generator, info.extraGenerator, + it->supportsPlatform ? info.platform : QString(), + it->supportsToolset ? info.toolset : QString()}; setGeneratorInfo(k, dv); } } diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index d89e4e86a0..d13304108f 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -456,8 +456,8 @@ QStringList CMakeProject::filesGeneratedFrom(const QString &sourceFile) const } else if (fi.suffix() == "scxml") { generatedFilePath += "/"; generatedFilePath += QDir::cleanPath(fi.completeBaseName()); - return QStringList({ generatedFilePath + ".h", - generatedFilePath + ".cpp" }); + return QStringList({generatedFilePath + ".h", + generatedFilePath + ".cpp"}); } else { // TODO: Other types will be added when adapters for their compilers become available. return QStringList(); diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp index 8a1d6476b5..3cc7c0fca7 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp @@ -226,7 +226,7 @@ QVector<CMakeToolChainData> extractToolChainsFromCache(const CMakeConfig &config if (!i.key.startsWith("CMAKE_") || !i.key.endsWith("_COMPILER")) continue; const QByteArray language = i.key.mid(6, i.key.count() - 6 - 9); // skip "CMAKE_" and "_COMPILER" - result.append({ language, Utils::FileName::fromUtf8(i.value) }); + result.append({language, Utils::FileName::fromUtf8(i.value)}); } return result; } @@ -278,7 +278,7 @@ QList<void *> CMakeProjectImporter::examineDirectory(const Utils::FileName &impo data->toolChains = extractToolChainsFromCache(config); qCInfo(cmInputLog()) << "Offering to import" << importPath.toUserOutput(); - return { static_cast<void *>(data.release()) }; + return {static_cast<void *>(data.release())}; } bool CMakeProjectImporter::matchKit(void *directoryData, const Kit *k) const @@ -442,7 +442,7 @@ void CMakeProjectPlugin::testCMakeProjectImporterQt_data() << QStringList() << QString(); QTest::newRow("Qt4") - << QStringList({ QString::fromLatin1("QT_QMAKE_EXECUTABLE=/usr/bin/xxx/qmake") }) + << QStringList({QString::fromLatin1("QT_QMAKE_EXECUTABLE=/usr/bin/xxx/qmake")}) << "/usr/bin/xxx/qmake"; // Everything else will require Qt installations! @@ -477,29 +477,29 @@ void CMakeProjectPlugin::testCMakeProjectImporterToolChain_data() QTest::newRow("Unrelated input") << QStringList("CMAKE_SOMETHING_ELSE=/tmp") << QByteArrayList() << QStringList(); QTest::newRow("CXX compiler") - << QStringList({ "CMAKE_CXX_COMPILER=/usr/bin/g++" }) - << QByteArrayList({ "CXX" }) - << QStringList({ "/usr/bin/g++" }); + << QStringList({"CMAKE_CXX_COMPILER=/usr/bin/g++"}) + << QByteArrayList({"CXX"}) + << QStringList({"/usr/bin/g++"}); QTest::newRow("CXX compiler, C compiler") - << QStringList({ "CMAKE_CXX_COMPILER=/usr/bin/g++", "CMAKE_C_COMPILER=/usr/bin/clang" }) - << QByteArrayList({ "CXX", "C" }) - << QStringList({ "/usr/bin/g++", "/usr/bin/clang" }); + << QStringList({"CMAKE_CXX_COMPILER=/usr/bin/g++", "CMAKE_C_COMPILER=/usr/bin/clang"}) + << QByteArrayList({"CXX", "C"}) + << QStringList({"/usr/bin/g++", "/usr/bin/clang"}); QTest::newRow("CXX compiler, C compiler, strange compiler") - << QStringList({ "CMAKE_CXX_COMPILER=/usr/bin/g++", + << QStringList({"CMAKE_CXX_COMPILER=/usr/bin/g++", "CMAKE_C_COMPILER=/usr/bin/clang", - "CMAKE_STRANGE_LANGUAGE_COMPILER=/tmp/strange/compiler" }) - << QByteArrayList({ "CXX", "C", "STRANGE_LANGUAGE" }) - << QStringList({ "/usr/bin/g++", "/usr/bin/clang", "/tmp/strange/compiler" }); + "CMAKE_STRANGE_LANGUAGE_COMPILER=/tmp/strange/compiler"}) + << QByteArrayList({"CXX", "C", "STRANGE_LANGUAGE"}) + << QStringList({"/usr/bin/g++", "/usr/bin/clang", "/tmp/strange/compiler"}); QTest::newRow("CXX compiler, C compiler, strange compiler (with junk)") - << QStringList({ "FOO=test", + << QStringList({"FOO=test", "CMAKE_CXX_COMPILER=/usr/bin/g++", "CMAKE_BUILD_TYPE=debug", "CMAKE_C_COMPILER=/usr/bin/clang", "SOMETHING_COMPILER=/usr/bin/something", "CMAKE_STRANGE_LANGUAGE_COMPILER=/tmp/strange/compiler", - "BAR=more test" }) - << QByteArrayList({ "CXX", "C", "STRANGE_LANGUAGE" }) - << QStringList({ "/usr/bin/g++", "/usr/bin/clang", "/tmp/strange/compiler" }); + "BAR=more test"}) + << QByteArrayList({"CXX", "C", "STRANGE_LANGUAGE"}) + << QStringList({"/usr/bin/g++", "/usr/bin/clang", "/tmp/strange/compiler"}); } void CMakeProjectPlugin::testCMakeProjectImporterToolChain() diff --git a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp index 1e26c462c0..e766b28aa3 100644 --- a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp +++ b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp @@ -341,7 +341,7 @@ CMakeToolItemConfigWidget::CMakeToolItemConfigWidget(CMakeToolItemModel *model) m_binaryChooser->setExpectedKind(PathChooser::ExistingCommand); m_binaryChooser->setMinimumWidth(400); m_binaryChooser->setHistoryCompleter(QLatin1String("Cmake.Command.History")); - m_binaryChooser->setCommandVersionArguments({ "--version" }); + m_binaryChooser->setCommandVersionArguments({"--version"}); m_autoRunCheckBox = new QCheckBox; m_autoRunCheckBox->setText(tr("Autorun CMake")); diff --git a/src/plugins/cmakeprojectmanager/cmaketool.cpp b/src/plugins/cmakeprojectmanager/cmaketool.cpp index e8ec8e2933..1a107ccd55 100644 --- a/src/plugins/cmakeprojectmanager/cmaketool.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketool.cpp @@ -172,19 +172,19 @@ TextEditor::Keywords CMakeTool::keywords() { if (m_functions.isEmpty()) { Utils::SynchronousProcessResponse response; - response = run({ "--help-command-list" }); + response = run({"--help-command-list"}); if (response.result == Utils::SynchronousProcessResponse::Finished) m_functions = response.stdOut().split('\n'); - response = run({ "--help-commands" }); + response = run({"--help-commands"}); if (response.result == Utils::SynchronousProcessResponse::Finished) parseFunctionDetailsOutput(response.stdOut()); - response = run({ "--help-property-list" }); + response = run({"--help-property-list"}); if (response.result == Utils::SynchronousProcessResponse::Finished) m_variables = parseVariableOutput(response.stdOut()); - response = run({ "--help-variable-list" }); + response = run({"--help-variable-list"}); if (response.result == Utils::SynchronousProcessResponse::Finished) { m_variables.append(parseVariableOutput(response.stdOut())); m_variables = Utils::filteredUnique(m_variables); @@ -354,7 +354,7 @@ QStringList CMakeTool::parseVariableOutput(const QString &output) void CMakeTool::fetchGeneratorsFromHelp() const { - Utils::SynchronousProcessResponse response = run({ "--help" }); + Utils::SynchronousProcessResponse response = run({"--help"}); if (response.result != Utils::SynchronousProcessResponse::Finished) return; @@ -406,7 +406,7 @@ void CMakeTool::fetchGeneratorsFromHelp() const void CMakeTool::fetchVersionFromVersionOutput() const { - Utils::SynchronousProcessResponse response = run({ "--version" }); + Utils::SynchronousProcessResponse response = run({"--version" }); if (response.result != Utils::SynchronousProcessResponse::Finished) return; @@ -427,7 +427,7 @@ void CMakeTool::fetchVersionFromVersionOutput() const void CMakeTool::fetchFromCapabilities() const { - Utils::SynchronousProcessResponse response = run({ "-E", "capabilities" }, true); + Utils::SynchronousProcessResponse response = run({"-E", "capabilities" }, true); if (response.result != Utils::SynchronousProcessResponse::Finished) return; diff --git a/src/plugins/cmakeprojectmanager/servermode.cpp b/src/plugins/cmakeprojectmanager/servermode.cpp index 0e29fd6d8a..473b58ed65 100644 --- a/src/plugins/cmakeprojectmanager/servermode.cpp +++ b/src/plugins/cmakeprojectmanager/servermode.cpp @@ -114,7 +114,7 @@ ServerMode::ServerMode(const Environment &env, m_socketName = QString::fromLatin1("\\\\.\\pipe\\") + QUuid::createUuid().toString(); #endif - const QStringList args = QStringList({ "-E", "server", "--pipe=" + m_socketName }); + const QStringList args = QStringList({"-E", "server", "--pipe=" + m_socketName}); connect(m_cmakeProcess.get(), &QtcProcess::started, this, [this]() { m_connectionTimer.start(); }); connect(m_cmakeProcess.get(), @@ -168,7 +168,7 @@ void ServerMode::sendRequest(const QString &type, const QVariantMap &extra, cons data.insert(TYPE_KEY, type); const QVariant realCookie = cookie.isNull() ? QVariant(m_requestCounter) : cookie; data.insert(COOKIE_KEY, realCookie); - m_expectedReplies.push_back({ type, realCookie }); + m_expectedReplies.push_back({type, realCookie}); QJsonObject object = QJsonObject::fromVariantMap(data); QJsonDocument document; diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.cpp b/src/plugins/coreplugin/actionmanager/commandmappings.cpp index 45eea3eb8f..f17c195024 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.cpp +++ b/src/plugins/coreplugin/actionmanager/commandmappings.cpp @@ -151,7 +151,7 @@ void CommandMappings::setPageTitle(const QString &s) void CommandMappings::setTargetHeader(const QString &s) { - d->commandList->setHeaderLabels({ tr("Command"), tr("Label"), s}); + d->commandList->setHeaderLabels({tr("Command"), tr("Label"), s}); } void CommandMappings::filterChanged(const QString &f) diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp index 2593026b3f..dc71e446dc 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp @@ -110,7 +110,7 @@ namespace Internal { ShortcutButton::ShortcutButton(QWidget *parent) : QPushButton(parent) - , m_key({{ 0, 0, 0, 0 }}) + , m_key({{0, 0, 0, 0}}) { // Using ShortcutButton::tr() as workaround for QTBUG-34128 setToolTip(ShortcutButton::tr("Click and type the new key sequence.")); diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp index d425dcdbfa..6cbaeea716 100644 --- a/src/plugins/coreplugin/fancyactionbar.cpp +++ b/src/plugins/coreplugin/fancyactionbar.cpp @@ -116,7 +116,7 @@ static QVector<QString> splitInTwoLines(const QString &text, const QFontMetrics if (splitPos < 0) { splitLines[0] = fontMetrics.elidedText(text, Qt::ElideRight, availableWidth); - QString common = Utils::commonPrefix(QStringList({ splitLines[0], text })); + QString common = Utils::commonPrefix(QStringList({splitLines[0], text})); splitLines[1] = text.mid(common.length()); // elide the second line even if it fits, since it is cut off in mid-word while (fontMetrics.width(QChar(0x2026) /*'...'*/ + splitLines[1]) > availableWidth diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp index bafffdb70d..08fbace981 100644 --- a/src/plugins/coreplugin/find/searchresultwindow.cpp +++ b/src/plugins/coreplugin/find/searchresultwindow.cpp @@ -340,8 +340,8 @@ QWidget *SearchResultWindow::outputWidget(QWidget *) */ QList<QWidget*> SearchResultWindow::toolBarWidgets() const { - return { d->m_expandCollapseButton, d->m_spacer, - d->m_historyLabel, d->m_spacer2, d->m_recentSearchesBox }; + return {d->m_expandCollapseButton, d->m_spacer, + d->m_historyLabel, d->m_spacer2, d->m_recentSearchesBox}; } /*! diff --git a/src/plugins/coreplugin/locator/locator_test.cpp b/src/plugins/coreplugin/locator/locator_test.cpp index b573dbd6b6..021732d213 100644 --- a/src/plugins/coreplugin/locator/locator_test.cpp +++ b/src/plugins/coreplugin/locator/locator_test.cpp @@ -94,9 +94,9 @@ void Core::Internal::CorePlugin::test_basefilefilter_data() const QChar pathSeparator = QDir::separator(); const MyTestDataDir testDir(QLatin1String("testdata_basic")); - const QStringList testFiles({ QDir::fromNativeSeparators(testDir.file("file.cpp")), - QDir::fromNativeSeparators(testDir.file("main.cpp")), - QDir::fromNativeSeparators(testDir.file("subdir/main.cpp")) }); + const QStringList testFiles({QDir::fromNativeSeparators(testDir.file("file.cpp")), + QDir::fromNativeSeparators(testDir.file("main.cpp")), + QDir::fromNativeSeparators(testDir.file("subdir/main.cpp"))}); QStringList testFilesShort; foreach (const QString &file, testFiles) testFilesShort << Utils::FileUtils::shortNativePath(Utils::FileName::fromString(file)); diff --git a/src/plugins/coreplugin/locator/locatorsettingspage.cpp b/src/plugins/coreplugin/locator/locatorsettingspage.cpp index 4f69cc2b43..d3c3826894 100644 --- a/src/plugins/coreplugin/locator/locatorsettingspage.cpp +++ b/src/plugins/coreplugin/locator/locatorsettingspage.cpp @@ -281,7 +281,7 @@ void LocatorSettingsPage::restoreFilterStates() void LocatorSettingsPage::initializeModel() { - m_model->setHeader(QStringList({ tr("Name"), tr("Prefix"), tr("Default") })); + m_model->setHeader(QStringList({tr("Name"), tr("Prefix"), tr("Default")})); m_model->setHeaderToolTip(QStringList({ QString(), ILocatorFilter::msgPrefixToolTip(), diff --git a/src/plugins/coreplugin/themechooser.cpp b/src/plugins/coreplugin/themechooser.cpp index ec6a834bcc..6f81aaa950 100644 --- a/src/plugins/coreplugin/themechooser.cpp +++ b/src/plugins/coreplugin/themechooser.cpp @@ -190,7 +190,7 @@ static void addThemesFromPath(const QString &path, QList<ThemeEntry> *themes) { static const QLatin1String extension("*.creatortheme"); QDir themeDir(path); - themeDir.setNameFilters({ extension }); + themeDir.setNameFilters({extension}); themeDir.setFilter(QDir::Files); const QStringList themeList = themeDir.entryList(); foreach (const QString &fileName, themeList) { diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp index e3e9a2cec8..ef08ee5776 100644 --- a/src/plugins/coreplugin/vcsmanager.cpp +++ b/src/plugins/coreplugin/vcsmanager.cpp @@ -550,46 +550,46 @@ void CorePlugin::testVcsManager_data() QTest::addColumn<QStringList>("results"); QTest::newRow("A and B next to each other") - << QStringList({ "a:a", "a/1:a", "a/2:a", "a/2/5:a", "a/2/5/6:a" }) - << QStringList({ "b:b", "b/3:b", "b/4:b" }) - << QStringList({ ":::-", // empty directory to look up - "c:::*", // Neither in A nor B - "a:a:A:*", // in A - "b:b:B:*", // in B - "b/3:b:B:*", // in B - "b/4:b:B:*", // in B - "a/1:a:A:*", // in A - "a/2:a:A:*", // in A - ":::-", // empty directory to look up - "a/2/5/6:a:A:*", // in A - "a/2/5:a:A:-", // in A (cached from before!) - // repeat: These need to come from the cache now: - "c:::-", // Neither in A nor B - "a:a:A:-", // in A - "b:b:B:-", // in B - "b/3:b:B:-", // in B - "b/4:b:B:-", // in B - "a/1:a:A:-", // in A - "a/2:a:A:-", // in A - "a/2/5/6:a:A:-", // in A - "a/2/5:a:A:-" // in A + << QStringList({"a:a", "a/1:a", "a/2:a", "a/2/5:a", "a/2/5/6:a"}) + << QStringList({"b:b", "b/3:b", "b/4:b"}) + << QStringList({":::-", // empty directory to look up + "c:::*", // Neither in A nor B + "a:a:A:*", // in A + "b:b:B:*", // in B + "b/3:b:B:*", // in B + "b/4:b:B:*", // in B + "a/1:a:A:*", // in A + "a/2:a:A:*", // in A + ":::-", // empty directory to look up + "a/2/5/6:a:A:*", // in A + "a/2/5:a:A:-", // in A (cached from before!) + // repeat: These need to come from the cache now: + "c:::-", // Neither in A nor B + "a:a:A:-", // in A + "b:b:B:-", // in B + "b/3:b:B:-", // in B + "b/4:b:B:-", // in B + "a/1:a:A:-", // in A + "a/2:a:A:-", // in A + "a/2/5/6:a:A:-", // in A + "a/2/5:a:A:-" // in A }); QTest::newRow("B in A") - << QStringList({ "a:a", "a/1:a", "a/2:a", "a/2/5:a", "a/2/5/6:a" }) - << QStringList({ "a/1/b:a/1/b", "a/1/b/3:a/1/b", "a/1/b/4:a/1/b", "a/1/b/3/5:a/1/b", - "a/1/b/3/5/6:a/1/b" }) - << QStringList({ "a:a:A:*", // in A - "c:::*", // Neither in A nor B - "a/3:::*", // Neither in A nor B - "a/1/b/x:::*", // Neither in A nor B - "a/1/b:a/1/b:B:*", // in B - "a/1:a:A:*", // in A - "a/1/b/../../2:a:A:*" // in A + << QStringList({"a:a", "a/1:a", "a/2:a", "a/2/5:a", "a/2/5/6:a"}) + << QStringList({"a/1/b:a/1/b", "a/1/b/3:a/1/b", "a/1/b/4:a/1/b", "a/1/b/3/5:a/1/b", + "a/1/b/3/5/6:a/1/b"}) + << QStringList({"a:a:A:*", // in A + "c:::*", // Neither in A nor B + "a/3:::*", // Neither in A nor B + "a/1/b/x:::*", // Neither in A nor B + "a/1/b:a/1/b:B:*", // in B + "a/1:a:A:*", // in A + "a/1/b/../../2:a:A:*" // in A }); QTest::newRow("A and B") // first one wins... - << QStringList({ "a:a", "a/1:a", "a/2:a" }) - << QStringList({ "a:a", "a/1:a", "a/2:a" }) - << QStringList({ "a/2:a:A:*" }); + << QStringList({"a:a", "a/1:a", "a/2:a"}) + << QStringList({"a:a", "a/1:a", "a/2:a"}) + << QStringList({"a/2:a:A:*"}); } void CorePlugin::testVcsManager() diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp index ed9360b345..a9d18b0c4f 100644 --- a/src/plugins/cpaster/cpasterplugin.cpp +++ b/src/plugins/cpaster/cpasterplugin.cpp @@ -120,11 +120,11 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *errorMe addAutoReleasedObject(settingsPage); // Create the protocols and append them to the Settings - Protocol *protos[] = { new PasteBinDotComProtocol, - new PasteBinDotCaProtocol, - new KdePasteProtocol, - new FileShareProtocol - }; + Protocol *protos[] = {new PasteBinDotComProtocol, + new PasteBinDotCaProtocol, + new KdePasteProtocol, + new FileShareProtocol + }; const int count = sizeof(protos) / sizeof(Protocol *); for (int i = 0; i < count; ++i) { connect(protos[i], &Protocol::pasteDone, this, &CodepasterPlugin::finishPost); diff --git a/src/plugins/cpaster/frontend/main.cpp b/src/plugins/cpaster/frontend/main.cpp index 86e88232ca..65c9c9e6b1 100644 --- a/src/plugins/cpaster/frontend/main.cpp +++ b/src/plugins/cpaster/frontend/main.cpp @@ -91,9 +91,9 @@ int main(int argc, char *argv[]) { QCoreApplication app(argc, argv); - const QStringList protocols = { KdePasteProtocol::protocolName().toLower(), - PasteBinDotCaProtocol::protocolName().toLower(), - PasteBinDotComProtocol::protocolName().toLower() }; + const QStringList protocols = {KdePasteProtocol::protocolName().toLower(), + PasteBinDotCaProtocol::protocolName().toLower(), + PasteBinDotComProtocol::protocolName().toLower()}; ArgumentsCollector argsCollector(protocols); QStringList arguments = QCoreApplication::arguments(); arguments.removeFirst(); diff --git a/src/plugins/cppeditor/cppdoxygen_test.cpp b/src/plugins/cppeditor/cppdoxygen_test.cpp index 4d3a9cb13a..6dde8cb4c0 100644 --- a/src/plugins/cppeditor/cppdoxygen_test.cpp +++ b/src/plugins/cppeditor/cppdoxygen_test.cpp @@ -318,7 +318,7 @@ void DoxygenTest::testWithMacroFromHeaderBeforeFunction() const TestDocument headerDocumentDefiningMacro("header.h", "#define API\n"); - runTest(given, expected, /*settings=*/ 0, { headerDocumentDefiningMacro }); + runTest(given, expected, /*settings=*/ 0, {headerDocumentDefiningMacro}); } void DoxygenTest::testNoLeadingAsterisks_data() diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index 82fcd9887d..d65b7caff6 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -343,7 +343,7 @@ static QStringList languageFeatureMacros() // Collected with: // $ CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 // $ D:\usr\llvm-3.8.0\bin\clang++.exe -fms-compatibility-version=19 -std=c++1y -dM -E D:\empty.cpp | grep __cpp_ - static QStringList macros { + static QStringList macros{ QLatin1String("__cpp_aggregate_nsdmi"), QLatin1String("__cpp_alias_templates"), QLatin1String("__cpp_attributes"), diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp index 1643550bbc..1fd80aad13 100644 --- a/src/plugins/cpptools/cppcompletion_test.cpp +++ b/src/plugins/cpptools/cppcompletion_test.cpp @@ -371,7 +371,7 @@ void CppToolsPlugin::test_global_completion_data() const QByteArray codeTemplate = "int myGlobal;\n" "<REPLACEMENT>\n" "@\n"; - const QStringList replacements = QStringList({ "// text", "// text.", "/// text", "/// text." }); + const QStringList replacements = QStringList({"// text", "// text.", "/// text", "/// text."}); foreach (const QString &replacement, replacements) { QByteArray code = codeTemplate; code.replace("<REPLACEMENT>", replacement.toUtf8()); @@ -427,14 +427,14 @@ static void enumTestCase(const QByteArray &tag, const QByteArray &source, QByteArray fullSource = source; fullSource.replace('$', "enum E { val1, val2, val3 };"); QTest::newRow(tag) << fullSource << (prefix + "val") - << QStringList({ "val1", "val2", "val3" }); + << QStringList({"val1", "val2", "val3"}); QTest::newRow(tag + "_cxx11") << fullSource << (prefix + "E::") - << QStringList({ "E", "val1", "val2", "val3" }); + << QStringList({"E", "val1", "val2", "val3"}); fullSource.replace("enum E ", "enum "); QTest::newRow(tag + "_anon") << fullSource << (prefix + "val") - << QStringList({ "val1", "val2", "val3" }); + << QStringList({"val1", "val2", "val3"}); } void CppToolsPlugin::test_completion_data() @@ -475,7 +475,7 @@ void CppToolsPlugin::test_completion_data() " if (1)\n" " @;\n" "}\n" - ) << _("((Derived *)b)->") << QStringList({ "Derived", "Base", "i_derived", "i_base" }); + ) << _("((Derived *)b)->") << QStringList({"Derived", "Base", "i_derived", "i_base"}); QTest::newRow("inside_parentheses_cast_operator_conversion") << _( "class Base\n" @@ -494,8 +494,8 @@ void CppToolsPlugin::test_completion_data() " if (1)\n" " @;\n" "}\n" - ) << _("(static_cast<Derived *>(b))->") << QStringList({ "Derived", "Base", "i_derived", - "i_base" }); + ) << _("(static_cast<Derived *>(b))->") << QStringList({"Derived", "Base", "i_derived", + "i_base"}); QTest::newRow("template_1") << _( "template <class T>\n" @@ -510,7 +510,7 @@ void CppToolsPlugin::test_completion_data() " Foo f;\n" " @\n" "}" - ) << _("Foo::") << QStringList({ "Foo", "Type", "foo", "m" }); + ) << _("Foo::") << QStringList({"Foo", "Type", "foo", "m"}); QTest::newRow("template_2") << _( "template <class T>\n" @@ -525,7 +525,7 @@ void CppToolsPlugin::test_completion_data() " List<Tupple> l;\n" " @\n" "}" - ) << _("l.at(0).") << QStringList({ "Tupple", "a", "b" }); + ) << _("l.at(0).") << QStringList({"Tupple", "a", "b"}); QTest::newRow("template_3") << _( "template <class T>\n" @@ -540,7 +540,7 @@ void CppToolsPlugin::test_completion_data() " List<Tupple> l;\n" " @\n" "}" - ) << _("l.t.") << QStringList({ "Tupple", "a", "b" }); + ) << _("l.t.") << QStringList({"Tupple", "a", "b"}); QTest::newRow("template_4") << _( "template <class T>\n" @@ -556,7 +556,7 @@ void CppToolsPlugin::test_completion_data() " List<Tupple> l;\n" " @\n" "}" - ) << _("l.u.") << QStringList({ "Tupple", "a", "b" }); + ) << _("l.u.") << QStringList({"Tupple", "a", "b"}); QTest::newRow("template_5") << _( "template <class T>\n" @@ -572,7 +572,7 @@ void CppToolsPlugin::test_completion_data() " LT l;" " @\n" "}" - ) << _("l.u.") << QStringList({ "Tupple", "a", "b" }); + ) << _("l.u.") << QStringList({"Tupple", "a", "b"}); QTest::newRow("template_6") << _( "class Item\n" @@ -592,7 +592,7 @@ void CppToolsPlugin::test_completion_data() "{};\n" "ItemContainer container;\n" "@\n" - ) << _("container.get().") << QStringList({ "Item", "i" }); + ) << _("container.get().") << QStringList({"Item", "i"}); QTest::newRow("template_7") << _( "struct Test\n" @@ -615,7 +615,7 @@ void CppToolsPlugin::test_completion_data() "\n" "TemplateClass<Test> p(new Test);\n" "@\n" - ) << _("p->") << QStringList({ "Test", "i" }); + ) << _("p->") << QStringList({"Test", "i"}); QTest::newRow("type_of_pointer_is_typedef") << _( "typedef struct Foo\n" @@ -624,7 +624,7 @@ void CppToolsPlugin::test_completion_data() "} Foo;\n" "Foo *bar;\n" "@\n" - ) << _("bar->") << QStringList({ "Foo", "foo" }); + ) << _("bar->") << QStringList({"Foo", "foo"}); QTest::newRow("instantiate_full_specialization") << _( "template<typename T>\n" @@ -641,7 +641,7 @@ void CppToolsPlugin::test_completion_data() "\n" "Template<char> templateChar;\n" "@\n" - ) << _("templateChar.") << QStringList({ "Template", "templateChar_i" }); + ) << _("templateChar.") << QStringList({"Template", "templateChar_i"}); QTest::newRow("template_as_base: base as template directly") << _( "class Data { int dataMember; };\n" @@ -651,7 +651,7 @@ void CppToolsPlugin::test_completion_data() " Other<Data> c;\n" " @\n" "}" - ) << _("c.") << QStringList({ "Data", "dataMember", "Other", "otherMember" }); + ) << _("c.") << QStringList({"Data", "dataMember", "Other", "otherMember"}); QTest::newRow("template_as_base: base as class template") << _( "class Data { int dataMember; };\n" @@ -662,8 +662,8 @@ void CppToolsPlugin::test_completion_data() " More<Data> c;\n" " @\n" "}" - ) << _("c.") << QStringList({ "Data", "dataMember", "Other", "otherMember", "More", - "moreMember" }); + ) << _("c.") << QStringList({"Data", "dataMember", "Other", "otherMember", "More", + "moreMember"}); QTest::newRow("template_as_base: base as globally qualified class template") << _( "class Data { int dataMember; };\n" @@ -674,8 +674,8 @@ void CppToolsPlugin::test_completion_data() " More<Data> c;\n" " @\n" "}" - ) << _("c.") << QStringList({ "Data", "dataMember", "Other", "otherMember", "More", - "moreMember" }); + ) << _("c.") << QStringList({"Data", "dataMember", "Other", "otherMember", "More", + "moreMember"}); QTest::newRow("template_as_base: base as namespace qualified class template") << _( "class Data { int dataMember; };\n" @@ -688,8 +688,8 @@ void CppToolsPlugin::test_completion_data() " More<Data> c;\n" " @\n" "}" - ) << _("c.") << QStringList({ "Data", "dataMember", "Other", "otherMember", "More", - "moreMember" }); + ) << _("c.") << QStringList({"Data", "dataMember", "Other", "otherMember", "More", + "moreMember"}); QTest::newRow("template_as_base: base as nested template name") << _( "class Data { int dataMember; };\n" @@ -702,7 +702,7 @@ void CppToolsPlugin::test_completion_data() " Final<Data> c;\n" " @\n" "}" - ) << _("c.") << QStringList({ "Data", "dataMember", "Final", "finalMember" }); + ) << _("c.") << QStringList({"Data", "dataMember", "Final", "finalMember"}); QTest::newRow("template_as_base: base as nested template name in non-template") << _( "class Data { int dataMember; };\n" @@ -715,7 +715,7 @@ void CppToolsPlugin::test_completion_data() " Final c;\n" " @\n" "}" - ) << _("c.") << QStringList({ "Data", "dataMember", "Final", "finalMember" }); + ) << _("c.") << QStringList({"Data", "dataMember", "Final", "finalMember"}); QTest::newRow("template_as_base: base as template name in non-template") << _( "class Data { int dataMember; };\n" @@ -728,8 +728,8 @@ void CppToolsPlugin::test_completion_data() " Final c;\n" " @\n" "}" - ) << _("c.") << QStringList({ "Data", "dataMember", "Final", "finalMember", "Other", - "otherMember" }); + ) << _("c.") << QStringList({"Data", "dataMember", "Final", "finalMember", "Other", + "otherMember"}); QTest::newRow("template_as_base: typedef not available in derived") << _( "class Data { int dataMember; };\n" @@ -755,7 +755,7 @@ void CppToolsPlugin::test_completion_data() " Derived<Data> d;\n" " @\n" "}\n" - ) << _("d.f.") << QStringList({ "Data", "dataMember" }); + ) << _("d.f.") << QStringList({"Data", "dataMember"}); QTest::newRow("use_global_identifier_as_base_class: derived as global and base as global") << _( "struct Global\n" @@ -770,7 +770,7 @@ void CppToolsPlugin::test_completion_data() "\n" "Final c;\n" "@\n" - ) << _("c.") << QStringList({ "int_global", "int_final", "Final", "Global" }); + ) << _("c.") << QStringList({"int_global", "int_final", "Final", "Global"}); QTest::newRow("use_global_identifier_as_base_class: derived is inside namespace. " "base as global") << _( @@ -789,7 +789,7 @@ void CppToolsPlugin::test_completion_data() "\n" "NS::Final c;\n" "@\n" - ) << _("c.") << QStringList({ "int_global", "int_final", "Final", "Global" }); + ) << _("c.") << QStringList({"int_global", "int_final", "Final", "Global"}); QTest::newRow("use_global_identifier_as_base_class: derived is enclosed by template. " "base as global") << _( @@ -809,7 +809,7 @@ void CppToolsPlugin::test_completion_data() "\n" "Enclosing<int>::Final c;\n" "@\n" - ) << _("c.") << QStringList({ "int_global", "int_final", "Final", "Global" }); + ) << _("c.") << QStringList({"int_global", "int_final", "Final", "Global"}); QTest::newRow("base_class_has_name_the_same_as_derived: base class is derived class") << _( "struct A : A\n" @@ -819,7 +819,7 @@ void CppToolsPlugin::test_completion_data() "\n" "A c;\n" "@\n" - ) << _("c.") << QStringList({ "int_a", "A" }); + ) << _("c.") << QStringList({"int_a", "A"}); QTest::newRow("base_class_has_name_the_same_as_derived: base class is derived class. " "class is in namespace") << _( @@ -833,7 +833,7 @@ void CppToolsPlugin::test_completion_data() "\n" "NS::A c;\n" "@\n" - ) << _("c.") << QStringList({ "int_a", "A" }); + ) << _("c.") << QStringList({"int_a", "A"}); QTest::newRow("base_class_has_name_the_same_as_derived: base class is derived class. " "class is in namespace. use scope operator for base class") << _( @@ -847,7 +847,7 @@ void CppToolsPlugin::test_completion_data() "\n" "NS::A c;\n" "@\n" - ) << _("c.") << QStringList({ "int_a", "A" }); + ) << _("c.") << QStringList({"int_a", "A"}); QTest::newRow("base_class_has_name_the_same_as_derived: base class has the same name as " "derived but in different namespace") << _( @@ -868,7 +868,7 @@ void CppToolsPlugin::test_completion_data() "\n" "NS2::A c;\n" "@\n" - ) << _("c.") << QStringList({ "int_ns1_a", "int_ns2_a", "A" }); + ) << _("c.") << QStringList({"int_ns1_a", "int_ns2_a", "A"}); QTest::newRow("base_class_has_name_the_same_as_derived: base class has the same name as " "derived (in namespace) but is nested by different class") << _( @@ -889,7 +889,7 @@ void CppToolsPlugin::test_completion_data() "\n" "NS2::A c;\n" "@\n" - ) << _("c.") << QStringList({ "int_enclosing_a", "int_ns2_a", "A" }); + ) << _("c.") << QStringList({"int_enclosing_a", "int_ns2_a", "A"}); QTest::newRow("base_class_has_name_the_same_as_derived: base class has the same name as " "derived (nested) but is nested by different class") << _( @@ -910,7 +910,7 @@ void CppToolsPlugin::test_completion_data() "\n" "EnclosingDerived::A c;\n" "@\n" - ) << _("c.") << QStringList({ "int_enclosing_base_a", "int_enclosing_derived_a", "A" }); + ) << _("c.") << QStringList({"int_enclosing_base_a", "int_enclosing_derived_a", "A"}); QTest::newRow("base_class_has_name_the_same_as_derived: base class is derived class. " "class is a template") << _( @@ -922,7 +922,7 @@ void CppToolsPlugin::test_completion_data() "\n" "A<int> c;\n" "@\n" - ) << _("c.") << QStringList({ "int_a", "A" }); + ) << _("c.") << QStringList({"int_a", "A"}); QTest::newRow("cyclic_inheritance: direct cyclic inheritance") << _( "struct B;\n" @@ -931,7 +931,7 @@ void CppToolsPlugin::test_completion_data() "\n" "A c;\n" "@\n" - ) << _("c.") << QStringList({ "A", "_a", "B", "_b" }); + ) << _("c.") << QStringList({"A", "_a", "B", "_b"}); QTest::newRow("cyclic_inheritance: indirect cyclic inheritance") << _( "struct C;\n" @@ -941,7 +941,7 @@ void CppToolsPlugin::test_completion_data() "\n" "A c;\n" "@\n" - ) << _("c.") << QStringList({ "A", "_a", "B", "_b", "C", "_c" }); + ) << _("c.") << QStringList({"A", "_a", "B", "_b", "C", "_c"}); QTest::newRow("cyclic_inheritance: indirect cyclic inheritance") << _( "struct B;\n" @@ -951,7 +951,7 @@ void CppToolsPlugin::test_completion_data() "\n" "A c;\n" "@\n" - ) << _("c.") << QStringList({ "A", "_a", "B", "_b", "C", "_c" }); + ) << _("c.") << QStringList({"A", "_a", "B", "_b", "C", "_c"}); QTest::newRow("cyclic_inheritance: direct cyclic inheritance with templates") << _( "template< typename T > struct C;\n" @@ -967,7 +967,7 @@ void CppToolsPlugin::test_completion_data() "\n" "D<int, float> c;\n" "@\n" - ) << _("c.") << QStringList({ "D", "_d_t", "_d_s", "C", "_c_t" }); + ) << _("c.") << QStringList({"D", "_d_t", "_d_s", "C", "_c_t"}); QTest::newRow("cyclic_inheritance: indirect cyclic inheritance with templates") << _( "template< typename T > struct C;\n" @@ -987,7 +987,7 @@ void CppToolsPlugin::test_completion_data() "\n" "D<int, float> c;\n" "@\n" - ) << _("c.") << QStringList({ "D", "_d_t", "_d_s", "C", "_c_t", "B", "_b_t" }); + ) << _("c.") << QStringList({"D", "_d_t", "_d_s", "C", "_c_t", "B", "_b_t"}); QTest::newRow("cyclic_inheritance: direct cyclic inheritance with templates. " "more complex situation") << _( @@ -1018,8 +1018,8 @@ void CppToolsPlugin::test_completion_data() "\n" "Class<int> c;\n" "@\n" - ) << _("c.") << QStringList({ "Class", "ClassRecurse", "class_t", "class_recurse_s", - "class_recurse_t" }); + ) << _("c.") << QStringList({"Class", "ClassRecurse", "class_t", "class_recurse_s", + "class_recurse_t"}); QTest::newRow("enclosing_template_class: nested class with enclosing template class") << _( "template<typename T>\n" @@ -1031,7 +1031,7 @@ void CppToolsPlugin::test_completion_data() "\n" "Enclosing<int>::Nested c;" "@\n" - ) << _("c.") << QStringList({ "Nested", "int_nested" }); + ) << _("c.") << QStringList({"Nested", "int_nested"}); QTest::newRow("enclosing_template_class: nested template class with enclosing template " "class") << _( @@ -1044,7 +1044,7 @@ void CppToolsPlugin::test_completion_data() "\n" "Enclosing<int>::Nested<int> c;" "@\n" - ) << _("c.") << QStringList({ "Nested", "int_nested" }); + ) << _("c.") << QStringList({"Nested", "int_nested"}); QTest::newRow("instantiate_nested_class_when_enclosing_is_template") << _( "struct Foo \n" @@ -1065,7 +1065,7 @@ void CppToolsPlugin::test_completion_data() "\n" "Enclosing<Foo> enclosing;\n" "@\n" - ) << _("enclosing.nested.nested_t.") << QStringList({ "Foo", "foo_i" }); + ) << _("enclosing.nested.nested_t.") << QStringList({"Foo", "foo_i"}); QTest::newRow("instantiate_nested_of_nested_class_when_enclosing_is_template") << _( "struct Foo \n" @@ -1090,7 +1090,7 @@ void CppToolsPlugin::test_completion_data() "\n" "Enclosing<Foo> enclosing;\n" "@\n" - ) << _("enclosing.nested.nestedNested.nestedNested_t.") << QStringList({ "Foo", "foo_i" }); + ) << _("enclosing.nested.nestedNested.nestedNested_t.") << QStringList({"Foo", "foo_i"}); QTest::newRow("instantiate_template_with_default_argument_type") << _( "struct Foo\n" @@ -1106,7 +1106,7 @@ void CppToolsPlugin::test_completion_data() "\n" "Template<> templateWithDefaultTypeOfArgument;\n" "@\n" - ) << _("templateWithDefaultTypeOfArgument.t.") << QStringList({ "Foo", "bar" }); + ) << _("templateWithDefaultTypeOfArgument.t.") << QStringList({"Foo", "bar"}); QTest::newRow("instantiate_template_with_default_argument_type_as_template") << _( "struct Foo\n" @@ -1127,7 +1127,7 @@ void CppToolsPlugin::test_completion_data() "\n" "Template<Foo> templateWithDefaultTypeOfArgument;\n" "@\n" - ) << _("templateWithDefaultTypeOfArgument.s.t.") << QStringList({ "Foo", "bar" }); + ) << _("templateWithDefaultTypeOfArgument.s.t.") << QStringList({"Foo", "bar"}); QTest::newRow("typedef_of_pointer") << _( "struct Foo { int bar; };\n" @@ -1137,7 +1137,7 @@ void CppToolsPlugin::test_completion_data() " FooPtr ptr;\n" " @\n" "}" - ) << _("ptr->") << QStringList({ "Foo", "bar" }); + ) << _("ptr->") << QStringList({"Foo", "bar"}); QTest::newRow("typedef_of_pointer_inside_function") << _( "struct Foo { int bar; };\n" @@ -1147,7 +1147,7 @@ void CppToolsPlugin::test_completion_data() " FooPtr ptr;\n" " @\n" "}" - ) << _("ptr->") << QStringList({ "Foo", "bar" }); + ) << _("ptr->") << QStringList({"Foo", "bar"}); QTest::newRow("typedef_is_inside_function_before_declaration_block") << _( "struct Foo { int bar; };\n" @@ -1159,7 +1159,7 @@ void CppToolsPlugin::test_completion_data() " @\n" " }" "}" - ) << _("ptr->") << QStringList({ "Foo", "bar" }); + ) << _("ptr->") << QStringList({"Foo", "bar"}); QTest::newRow("resolve_complex_typedef_with_template") << _( "template <typename T>\n" @@ -1182,7 +1182,7 @@ void CppToolsPlugin::test_completion_data() " Template2<Foo> template2;\n" " @\n" "}\n" - ) << _("template2.templateTypedef.") << QStringList({ "Foo", "bar", "Template1" }); + ) << _("template2.templateTypedef.") << QStringList({"Foo", "bar", "Template1"}); QTest::newRow("template_specialization_with_pointer") << _( "template <typename T>\n" @@ -1197,7 +1197,7 @@ void CppToolsPlugin::test_completion_data() "};\n" "Template<int*> templ;\n" "@\n" - ) << _("templ.") << QStringList({ "Template", "pointer" }); + ) << _("templ.") << QStringList({"Template", "pointer"}); QTest::newRow("typedef_using_templates1") << _( "namespace NS1\n" @@ -1230,7 +1230,7 @@ void CppToolsPlugin::test_completion_data() " NS2::NS2Struct<Foo> s;\n" " @\n" "}\n" - ) << _("s.p->") << QStringList({ "Foo", "bar" }); + ) << _("s.p->") << QStringList({"Foo", "bar"}); QTest::newRow("typedef_using_templates2") << _( "namespace NS1\n" @@ -1263,7 +1263,7 @@ void CppToolsPlugin::test_completion_data() " NS2::NS2Struct<Foo>::pointer p;\n" " @\n" "}\n" - ) << _("p->") << QStringList({ "Foo", "bar" }); + ) << _("p->") << QStringList({"Foo", "bar"}); QTest::newRow("namespace_alias_with_many_namespace_declarations") << _( "namespace NS1\n" @@ -1291,7 +1291,7 @@ void CppToolsPlugin::test_completion_data() "{\n" " @\n" "}\n" - ) << _("NS::") << QStringList({ "Foo1", "Foo2" }); + ) << _("NS::") << QStringList({"Foo1", "Foo2"}); QTest::newRow("QTCREATORBUG9098") << _( "template <typename T>\n" @@ -1310,7 +1310,7 @@ void CppToolsPlugin::test_completion_data() " @\n" " }\n" "};\n" - ) << _("b.") << QStringList({ "c", "B" }); + ) << _("b.") << QStringList({"c", "B"}); QTest::newRow("type_and_using_declaration: type and using declaration inside function") << _( "namespace NS\n" @@ -1323,7 +1323,7 @@ void CppToolsPlugin::test_completion_data() " C c;\n" " @\n" "}\n" - ) << _("c.") << QStringList({ "C", "m" }); + ) << _("c.") << QStringList({"C", "m"}); QTest::newRow("type_and_using_declaration: type and using declaration in global " "namespace") << _( @@ -1337,7 +1337,7 @@ void CppToolsPlugin::test_completion_data() " C c;\n" " @\n" "}\n" - ) << _("c.") << QStringList({ "C", "m" }); + ) << _("c.") << QStringList({"C", "m"}); QTest::newRow("type_and_using_declaration: type in global namespace and using declaration in " "NS namespace") << _( @@ -1351,7 +1351,7 @@ void CppToolsPlugin::test_completion_data() " @\n" " }\n" "}\n" - ) << _("c.") << QStringList({ "C", "m" }); + ) << _("c.") << QStringList({"C", "m"}); QTest::newRow("type_and_using_declaration: type in global namespace and using declaration " "inside function in NS namespace") << _( @@ -1365,7 +1365,7 @@ void CppToolsPlugin::test_completion_data() " @\n" " }\n" "}\n" - ) << _("c.") << QStringList({ "C", "m" }); + ) << _("c.") << QStringList({"C", "m"}); QTest::newRow("type_and_using_declaration: type inside namespace NS1 and using declaration in " "function inside NS2 namespace") << _( @@ -1382,7 +1382,7 @@ void CppToolsPlugin::test_completion_data() " @\n" " }\n" "}\n" - ) << _("c.") << QStringList({ "C", "m" }); + ) << _("c.") << QStringList({"C", "m"}); QTest::newRow("type_and_using_declaration: type inside namespace NS1 and using declaration " "inside NS2 namespace") << _( @@ -1399,7 +1399,7 @@ void CppToolsPlugin::test_completion_data() " @\n" " }\n" "}\n" - ) << _("c.") << QStringList({ "C", "m" }); + ) << _("c.") << QStringList({"C", "m"}); QTest::newRow("instantiate_template_with_anonymous_class") << _( "template <typename T>\n" @@ -1412,7 +1412,7 @@ void CppToolsPlugin::test_completion_data() " S<int> s;\n" " @\n" "}\n" - ) << _("s.") << QStringList({ "S", "i", "c" }); + ) << _("s.") << QStringList({"S", "i", "c"}); QTest::newRow("instantiate_template_function") << _( "template <typename T>\n" @@ -1433,7 +1433,7 @@ void CppToolsPlugin::test_completion_data() " } n;\n" " @;\n" "}\n" - ) << _("n.") << QStringList({ "Nested", "i" }); + ) << _("n.") << QStringList({"Nested", "i"}); QTest::newRow("nested_class_inside_member_function") << _( "struct User { void use(); };\n" @@ -1443,7 +1443,7 @@ void CppToolsPlugin::test_completion_data() " Foo foo;\n" " @\n" "}\n" - ) << _("foo.") << QStringList({ "Foo", "bar" }); + ) << _("foo.") << QStringList({"Foo", "bar"}); QTest::newRow("nested_typedef_inside_member_function") << _( "struct User { void use(); };\n" @@ -1461,7 +1461,7 @@ void CppToolsPlugin::test_completion_data() " MyFoo::Ptr myfoo;\n" " @\n" "}\n" - ) << _("myfoo->") << QStringList({ "Foo", "Ptr", "bar" }); + ) << _("myfoo->") << QStringList({"Foo", "Ptr", "bar"}); QTest::newRow("nested_anonymous_class_QTCREATORBUG10876_1") << _( "struct EnclosingStruct\n" @@ -1476,8 +1476,8 @@ void CppToolsPlugin::test_completion_data() " @\n" " }\n" "};\n" - ) << _("member") << QStringList({ "memberNestedAnonymousClass", - "memberOfEnclosingStruct" }); + ) << _("member") << QStringList({"memberNestedAnonymousClass", + "memberOfEnclosingStruct"}); QTest::newRow("nested_anonymous_class_QTCREATORBUG10876_2") << _( "struct EnclosingStruct\n" @@ -1496,9 +1496,9 @@ void CppToolsPlugin::test_completion_data() " @\n" " }\n" "};\n" - ) << _("member") << QStringList({ "memberOfNestedAnonymousClass", - "memberOfNestedOfNestedAnonymousClass", - "memberOfEnclosingStruct" }); + ) << _("member") << QStringList({"memberOfNestedAnonymousClass", + "memberOfNestedOfNestedAnonymousClass", + "memberOfEnclosingStruct"}); QTest::newRow("nested_anonymous_class_QTCREATORBUG10876_3") << _( "struct EnclosingStruct\n" @@ -1529,7 +1529,7 @@ void CppToolsPlugin::test_completion_data() " };\n" " @\n" "}\n" - ) << _("foo") << QStringList({ "foo1", "foo2" }); + ) << _("foo") << QStringList({"foo1", "foo2"}); QTest::newRow("crash_cloning_template_class_QTCREATORBUG9329") << _( "struct A {};\n" @@ -1542,7 +1542,7 @@ void CppToolsPlugin::test_completion_data() " @\n" " }\n" "};\n" - ) << _("this->") << QStringList({ "A", "B", "Templ", "f" }); + ) << _("this->") << QStringList({"A", "B", "Templ", "f"}); QTest::newRow("recursive_auto_declarations1_QTCREATORBUG9503") << _( "void f()\n" @@ -1658,7 +1658,7 @@ void CppToolsPlugin::test_completion_data() " C c;\n" " @\n" "}\n" - ) << _("c.") << QStringList({ "C", "m" }); + ) << _("c.") << QStringList({"C", "m"}); QTest::newRow("class_declaration_inside_function_or_block_QTCREATORBUG3620: " "class definition inside block inside function") << _( @@ -1670,7 +1670,7 @@ void CppToolsPlugin::test_completion_data() " @\n" " }\n" "}\n" - ) << _("c.") << QStringList({ "C", "m" }); + ) << _("c.") << QStringList({"C", "m"}); QTest::newRow("class_declaration_inside_function_or_block_QTCREATORBUG3620: " "class definition with the same name inside different block inside function") << _( @@ -1685,7 +1685,7 @@ void CppToolsPlugin::test_completion_data() " @\n" " }\n" "}\n" - ) << _("c.") << QStringList({ "C", "m2" }); + ) << _("c.") << QStringList({"C", "m2"}); QTest::newRow("namespace_alias_inside_function_or_block_QTCREATORBUG166: " "namespace alias inside function") << _( @@ -1705,7 +1705,7 @@ void CppToolsPlugin::test_completion_data() " NS::C c;\n" " @\n" "}\n" - ) << _("c.") << QStringList({ "C", "m" }); + ) << _("c.") << QStringList({"C", "m"}); QTest::newRow("namespace_alias_inside_function_or_block_QTCREATORBUG166: " "namespace alias inside block inside function") << _( @@ -1727,7 +1727,7 @@ void CppToolsPlugin::test_completion_data() " @\n" " }\n" "}\n" - ) << _("c.") << QStringList({ "C", "m" }); + ) << _("c.") << QStringList({"C", "m"}); QTest::newRow("class_declaration_inside_function_or_block_QTCREATORBUG3620_static_member") << _( "void foo()\n" @@ -1740,7 +1740,7 @@ void CppToolsPlugin::test_completion_data() " @\n" " }\n" "}\n" - ) << _("C::") << QStringList({ "C", "staticFun2", "m2" }); + ) << _("C::") << QStringList({"C", "staticFun2", "m2"}); enumTestCase( "enum_inside_block_inside_function", @@ -1841,7 +1841,7 @@ void CppToolsPlugin::test_completion_data() "};\n" "Enclosing e;\n" "@\n" - ) << _("e.") << QStringList({ "Enclosing", "i" }); + ) << _("e.") << QStringList({"Enclosing", "i"}); QTest::newRow("lambdaCalls_1") << _( "struct S { int bar; };\n" @@ -1849,7 +1849,7 @@ void CppToolsPlugin::test_completion_data() "{\n" " @\n" "}\n" - ) << _("[](){ return new S; } ()->") << QStringList({ "S", "bar" }); + ) << _("[](){ return new S; } ()->") << QStringList({"S", "bar"}); QTest::newRow("lambdaCalls_2") << _( "struct S { int bar; };\n" @@ -1857,7 +1857,7 @@ void CppToolsPlugin::test_completion_data() "{\n" " @\n" "}\n" - ) << _("[] { return new S; } ()->") << QStringList({ "S", "bar" }); + ) << _("[] { return new S; } ()->") << QStringList({"S", "bar"}); QTest::newRow("lambdaCalls_3") << _( "struct S { int bar; };\n" @@ -1865,7 +1865,7 @@ void CppToolsPlugin::test_completion_data() "{\n" " @\n" "}\n" - ) << _("[]() ->S* { return new S; } ()->") << QStringList({ "S", "bar" }); + ) << _("[]() ->S* { return new S; } ()->") << QStringList({"S", "bar"}); QTest::newRow("lambdaCalls_4") << _( "struct S { int bar; };\n" @@ -1873,7 +1873,7 @@ void CppToolsPlugin::test_completion_data() "{\n" " @\n" "}\n" - ) << _("[]() throw() { return new S; } ()->") << QStringList({ "S", "bar" }); + ) << _("[]() throw() { return new S; } ()->") << QStringList({"S", "bar"}); QTest::newRow("lambdaCalls_5") << _( "struct S { int bar; };\n" @@ -1881,7 +1881,7 @@ void CppToolsPlugin::test_completion_data() "{\n" " @\n" "}\n" - ) << _("[]() throw()->S* { return new S; } ()->") << QStringList({ "S", "bar" }); + ) << _("[]() throw()->S* { return new S; } ()->") << QStringList({"S", "bar"}); QTest::newRow("local_type_and_member_1") << _( "struct OtherType { int otherTypeMember; };\n" @@ -1895,7 +1895,7 @@ void CppToolsPlugin::test_completion_data() " LocalType lt;\n" " @\n" "}\n" - ) << _("lt.ot.") << QStringList({ "OtherType", "otherTypeMember" }); + ) << _("lt.ot.") << QStringList({"OtherType", "otherTypeMember"}); QTest::newRow("local_type_and_member_2") << _( "void foo()\n" @@ -1909,7 +1909,7 @@ void CppToolsPlugin::test_completion_data() " LocalType lt;\n" " @\n" "}\n" - ) << _("lt.ot.") << QStringList({ "OtherType", "otherTypeMember" }); + ) << _("lt.ot.") << QStringList({"OtherType", "otherTypeMember"}); QTest::newRow("local_type_and_member_3") << _( "void foo()\n" @@ -1925,7 +1925,7 @@ void CppToolsPlugin::test_completion_data() " @\n" " }\n" "}\n" - ) << _("lt.ot.") << QStringList({ "OtherType", "otherTypeMember" }); + ) << _("lt.ot.") << QStringList({"OtherType", "otherTypeMember"}); QTest::newRow("local_type_and_member_4") << _( "namespace NS {struct OtherType { int otherTypeMember; };}\n" @@ -1939,7 +1939,7 @@ void CppToolsPlugin::test_completion_data() " LocalType lt;\n" " @\n" "}\n" - ) << _("lt.ot.") << QStringList({ "OtherType", "otherTypeMember" }); + ) << _("lt.ot.") << QStringList({"OtherType", "otherTypeMember"}); QTest::newRow("local_type_and_member_5") << _( "namespace NS {struct OtherType { int otherTypeMember; };}\n" @@ -1954,7 +1954,7 @@ void CppToolsPlugin::test_completion_data() " LocalType lt;\n" " @\n" "}\n" - ) << _("lt.ot.") << QStringList({ "OtherType", "otherTypeMember" }); + ) << _("lt.ot.") << QStringList({"OtherType", "otherTypeMember"}); QTest::newRow("local_type_and_member_6") << _( "namespace NS {struct OtherType { int otherTypeMember; };}\n" @@ -1969,7 +1969,7 @@ void CppToolsPlugin::test_completion_data() " LocalType lt;\n" " @\n" "}\n" - ) << _("lt.ot.") << QStringList({ "OtherType", "otherTypeMember" }); + ) << _("lt.ot.") << QStringList({"OtherType", "otherTypeMember"}); QTest::newRow("template_parameter_defined_inside_scope_of_declaration_QTCREATORBUG9169_1") << _( "struct A\n" @@ -1998,7 +1998,7 @@ void CppToolsPlugin::test_completion_data() " Template<B> templ;\n" " @\n" "}\n" - ) << _("templ.get()->") << QStringList({ "B", "b" }); + ) << _("templ.get()->") << QStringList({"B", "b"}); QTest::newRow("template_parameter_defined_inside_scope_of_declaration_QTCREATORBUG9169_2") << _( "struct A\n" @@ -2027,7 +2027,7 @@ void CppToolsPlugin::test_completion_data() " Template<B> templ;\n" " @\n" "}\n" - ) << _("templ.t.") << QStringList({ "B", "b" }); + ) << _("templ.t.") << QStringList({"B", "b"}); QTest::newRow("template_parameter_defined_inside_scope_of_declaration_QTCREATORBUG8852_1") << _( "template <typename T>\n" @@ -2044,7 +2044,7 @@ void CppToolsPlugin::test_completion_data() " @\n" " }\n" "}\n" - ) << _("list.at(0).") << QStringList({ "Foo", "bar" }); + ) << _("list.at(0).") << QStringList({"Foo", "bar"}); QTest::newRow("template_parameter_defined_inside_scope_of_declaration_QTCREATORBUG8852_2") << _( "template <typename T>\n" @@ -2064,7 +2064,7 @@ void CppToolsPlugin::test_completion_data() " }\n" " }\n" "}\n" - ) << _("list.at(0).") << QStringList({ "Foo", "bar" }); + ) << _("list.at(0).") << QStringList({"Foo", "bar"}); QTest::newRow("template_parameter_defined_inside_scope_of_declaration_QTCREATORBUG8852_3") << _( "template <typename T>\n" @@ -2082,7 +2082,7 @@ void CppToolsPlugin::test_completion_data() " QList<Foo> list;\n" " @\n" "}\n" - ) << _("list.at(0).") << QStringList({ "Foo", "bar" }); + ) << _("list.at(0).") << QStringList({"Foo", "bar"}); const QByteArray commonSignalSlotCompletionTestCode = "#define SIGNAL(a) #a\n" @@ -2133,14 +2133,14 @@ void CppToolsPlugin::test_completion_data() QTest::newRow("SIGNAL(") << commonSignalSlotCompletionTestCode - << _("connect(myObject, SIGNAL(") << QStringList({ "baseSignal1()", "baseSignal2(int)", - "hiddenSignal()", "derivedSignal1()", - "derivedSignal2(int)" }); + << _("connect(myObject, SIGNAL(") << QStringList({"baseSignal1()", "baseSignal2(int)", + "hiddenSignal()", "derivedSignal1()", + "derivedSignal2(int)"}); QTest::newRow("SLOT(") << commonSignalSlotCompletionTestCode << _("connect(myObject, SIGNAL(baseSignal1()), myObject, SLOT(") - << QStringList({ "baseSlot1()", "baseSlot2(int)", "derivedSlot1()", "derivedSlot2(int)" }); + << QStringList({"baseSlot1()", "baseSlot2(int)", "derivedSlot1()", "derivedSlot2(int)"}); QTest::newRow("Qt5 signals: complete class after & at 2nd connect arg") << commonSignalSlotCompletionTestCode @@ -2153,23 +2153,23 @@ void CppToolsPlugin::test_completion_data() QTest::newRow("Qt5 signals: complete signals") << commonSignalSlotCompletionTestCode << _("connect(myObject, &N::Derived::") - << QStringList({ "baseSignal1", "baseSignal2", "hiddenSignal", "derivedSignal1", - "derivedSignal2" }); + << QStringList({"baseSignal1", "baseSignal2", "hiddenSignal", "derivedSignal1", + "derivedSignal2"}); QTest::newRow("Qt5 slots") << commonSignalSlotCompletionTestCode << _("connect(myObject, &N::Derived, myObject, &N::Derived::") - << QStringList({ "baseFunction", "baseSignal1", "baseSignal2", "baseSlot1", "baseSlot2", - "derivedFunction", "derivedSignal1", "derivedSignal2", "derivedSlot1", - "derivedSlot2", "hiddenFunction", "hiddenSignal" }); + << QStringList({"baseFunction", "baseSignal1", "baseSignal2", "baseSlot1", "baseSlot2", + "derivedFunction", "derivedSignal1", "derivedSignal2", "derivedSlot1", + "derivedSlot2", "hiddenFunction", "hiddenSignal"}); QTest::newRow("Qt5 signals: fallback to scope completion") << commonSignalSlotCompletionTestCode - << _("connect(myObject, &N::") << QStringList({ "Base", "Derived" }); + << _("connect(myObject, &N::") << QStringList({"Base", "Derived"}); QTest::newRow("Qt5 slots: fallback to scope completion") << commonSignalSlotCompletionTestCode - << _("connect(myObject, &N::Derived, myObject, &N::") << QStringList({ "Base", "Derived" }); + << _("connect(myObject, &N::Derived, myObject, &N::") << QStringList({"Base", "Derived"}); QTest::newRow("signals_hide_QPrivateSignal") << _( "#define SIGNAL(a) #a\n" @@ -2250,7 +2250,7 @@ void CppToolsPlugin::test_completion_data() " Temp<Foo>::Nested2 n2;\n" " @\n" "}\n" - ) << _("n2.n1.t.") << QStringList({ "foo", "Foo" }); + ) << _("n2.n1.t.") << QStringList({"foo", "Foo"}); QTest::newRow("infiniteLoopLocalTypedef_QTCREATORBUG-11999") << _( "template <typename T>\n" @@ -2268,7 +2268,7 @@ void CppToolsPlugin::test_completion_data() " Temp<Foo> tempFoo;\n" " @\n" "}\n" - ) << _("tempFoo.nested.t.") << QStringList({ "foo", "Foo" }); + ) << _("tempFoo.nested.t.") << QStringList({"foo", "Foo"}); QTest::newRow("lambda_parameter") << _( "auto func = [](int arg1) { return @; };\n" @@ -2282,7 +2282,7 @@ void CppToolsPlugin::test_completion_data() " Derived<> derived;\n" " @\n" "}\n" - ) << _("derived.") << QStringList({ "Derived", "foo", "Foo" }); + ) << _("derived.") << QStringList({"Derived", "foo", "Foo"}); QTest::newRow("default_arguments_for_class_templates_and_template_base_class_QTCREATORBUG-12606") << _( "struct Foo { int foo; };\n" @@ -2294,7 +2294,7 @@ void CppToolsPlugin::test_completion_data() " Derived<> derived;\n" " @\n" "}\n" - ) << _("derived.t.") << QStringList({ "foo", "Foo" }); + ) << _("derived.t.") << QStringList({"foo", "Foo"}); QTest::newRow("template_specialization_and_initialization_with_pointer1") << _( "template <typename T>\n" @@ -2306,7 +2306,7 @@ void CppToolsPlugin::test_completion_data() " S<Foo*> s;\n" " @\n" "}\n" - ) << _("s.t->") << QStringList({ "foo", "Foo" }); + ) << _("s.t->") << QStringList({"foo", "Foo"}); // this is not a valid code(is not compile) but it caused a crash QTest::newRow("template_specialization_and_initialization_with_pointer2") << _( @@ -2319,7 +2319,7 @@ void CppToolsPlugin::test_completion_data() " S<Foo*> s;\n" " @\n" "}\n" - ) << _("s.t->") << QStringList({ "foo", "Foo" }); + ) << _("s.t->") << QStringList({"foo", "Foo"}); QTest::newRow("typedef_of_pointer_of_array_QTCREATORBUG-12703") << _( "struct Foo { int foo; };\n" @@ -2328,7 +2328,7 @@ void CppToolsPlugin::test_completion_data() " FooArr arr;\n" " @\n" "}\n" - ) << _("arr[0]->") << QStringList({ "foo", "Foo" }); + ) << _("arr[0]->") << QStringList({"foo", "Foo"}); QTest::newRow("template_specialization_with_array1") << _( "template <typename T>\n" @@ -2339,7 +2339,7 @@ void CppToolsPlugin::test_completion_data() " S<int[]> s;\n" " @\n" "}\n" - ) << _("s.") << QStringList({ "foo", "S" }); + ) << _("s.") << QStringList({"foo", "S"}); QTest::newRow("template_specialization_with_array2") << _( "template <typename T>\n" @@ -2350,7 +2350,7 @@ void CppToolsPlugin::test_completion_data() " S<int[3]> s;\n" " @\n" "}\n" - ) << _("s.") << QStringList({ "foo", "S" }); + ) << _("s.") << QStringList({"foo", "S"}); QTest::newRow("template_specialization_with_array3") << _( "struct Bar {};\n" @@ -2371,7 +2371,7 @@ void CppToolsPlugin::test_completion_data() " @\n" " }\n" "}\n" - ) << _("s->") << QStringList({ "Foo", "bar" }); + ) << _("s->") << QStringList({"Foo", "bar"}); QTest::newRow("dereference_of_nested_type_opertor_*") << _( "template<typename T>\n" @@ -2389,7 +2389,7 @@ void CppToolsPlugin::test_completion_data() " QList<Foo> list;\n" " @\n" "}\n" - ) << _("(*list.begin()).") << QStringList({ "Foo", "bar" }); + ) << _("(*list.begin()).") << QStringList({"Foo", "bar"}); QTest::newRow("dereference_of_nested_type_opertor_->") << _( "template<typename T>\n" @@ -2407,7 +2407,7 @@ void CppToolsPlugin::test_completion_data() " QList<Foo> list;\n" " @\n" "}\n" - ) << _("list.begin()->") << QStringList({ "Foo", "bar" }); + ) << _("list.begin()->") << QStringList({"Foo", "bar"}); QTest::newRow("dereference_of_nested_type_opertor_*_and_auto") << _( "template<typename T>\n" @@ -2426,7 +2426,7 @@ void CppToolsPlugin::test_completion_data() " auto a = list.begin();\n" " @\n" "}\n" - ) << _("(*a).") << QStringList({ "Foo", "bar" }); + ) << _("(*a).") << QStringList({"Foo", "bar"}); QTest::newRow("dereference_of_nested_type_opertor_->_and_auto") << _( "template<typename T>\n" @@ -2445,7 +2445,7 @@ void CppToolsPlugin::test_completion_data() " auto a = list.begin();\n" " @\n" "}\n" - ) << _("a->") << QStringList({ "Foo", "bar" }); + ) << _("a->") << QStringList({"Foo", "bar"}); QTest::newRow("direct_nested_template_type_access") << _( "template<typename T>\n" @@ -2463,7 +2463,7 @@ void CppToolsPlugin::test_completion_data() " auto a = QList<Foo>::begin();\n" " @\n" "}\n" - ) << _("a.") << QStringList({ "operator ->", "t", "iterator" }); + ) << _("a.") << QStringList({"operator ->", "t", "iterator"}); QTest::newRow("pointer_indirect_specialization") << _( "template<typename T>\n" @@ -2490,7 +2490,7 @@ void CppToolsPlugin::test_completion_data() " Temp<Foo *> t;\n" " @\n" "}\n" - ) << _("t.p->") << QStringList({ "Foo", "bar" }); + ) << _("t.p->") << QStringList({"Foo", "bar"}); QTest::newRow("pointer_indirect_specialization_typedef") << _( "template<typename T>\n" @@ -2517,7 +2517,7 @@ void CppToolsPlugin::test_completion_data() " Temp t;\n" " @\n" "}\n" - ) << _("t.p->") << QStringList({ "Foo", "bar" }); + ) << _("t.p->") << QStringList({"Foo", "bar"}); QTest::newRow("pointer_indirect_specialization_double_indirection") << _( "template<typename _Tp>\n" @@ -2548,7 +2548,7 @@ void CppToolsPlugin::test_completion_data() " Temp<Foo>::indirect t;\n" " @\n" "}\n" - ) << _("t.p->") << QStringList({ "Foo", "bar" }); + ) << _("t.p->") << QStringList({"Foo", "bar"}); QTest::newRow("pointer_indirect_specialization_double_indirection_with_base") << _( "template<typename _Tp>\n" @@ -2583,7 +2583,7 @@ void CppToolsPlugin::test_completion_data() " Temp<Foo>::indirect t;\n" " @\n" "}\n" - ) << _("t.p->") << QStringList({ "Foo", "bar" }); + ) << _("t.p->") << QStringList({"Foo", "bar"}); } void CppToolsPlugin::test_completion_member_access_operator() @@ -2639,7 +2639,7 @@ void CppToolsPlugin::test_completion_member_access_operator_data() "typedef S SType;\n" "SType p;\n" "@\n" - ) << _("p.") << QStringList({ "S", "m" }) + ) << _("p.") << QStringList({"S", "m"}) << false << false; @@ -2657,7 +2657,7 @@ void CppToolsPlugin::test_completion_member_access_operator_data() "typedef S SType;\n" "SType *p;\n" "@\n" - ) << _("p.") << QStringList({ "S", "m" }) + ) << _("p.") << QStringList({"S", "m"}) << false << true; @@ -2666,7 +2666,7 @@ void CppToolsPlugin::test_completion_member_access_operator_data() "typedef S* SPtr;\n" "SPtr p;\n" "@\n" - ) << _("p.") << QStringList({ "S", "m" }) + ) << _("p.") << QStringList({"S", "m"}) << false << true; @@ -2675,7 +2675,7 @@ void CppToolsPlugin::test_completion_member_access_operator_data() "struct S { int m; };\n" "SType *p;\n" "@\n" - ) << _("p.") << QStringList({ "S", "m" }) + ) << _("p.") << QStringList({"S", "m"}) << false << true; @@ -2684,7 +2684,7 @@ void CppToolsPlugin::test_completion_member_access_operator_data() "struct S { int m; };\n" "SType p;\n" "@\n" - ) << _("p.") << QStringList({ "S", "m" }) + ) << _("p.") << QStringList({"S", "m"}) << false << false; @@ -2702,7 +2702,7 @@ void CppToolsPlugin::test_completion_member_access_operator_data() "struct S { int m; };\n" "SType p;\n" "@\n" - ) << _("p.") << QStringList({ "S", "m" }) + ) << _("p.") << QStringList({"S", "m"}) << false << true; @@ -2712,7 +2712,7 @@ void CppToolsPlugin::test_completion_member_access_operator_data() "typedef struct SType *STypePtr;\n" "STypePtr p;\n" "@\n" - ) << _("p.") << QStringList({ "S", "m" }) + ) << _("p.") << QStringList({"S", "m"}) << false << true; @@ -2722,7 +2722,7 @@ void CppToolsPlugin::test_completion_member_access_operator_data() "typedef struct SType *STypePtr;\n" "STypePtr p;\n" "@\n" - ) << _("p->") << QStringList({ "S", "m" }) + ) << _("p->") << QStringList({"S", "m"}) << false << false; } diff --git a/src/plugins/cpptools/cppcompletionassistprocessor.cpp b/src/plugins/cpptools/cppcompletionassistprocessor.cpp index 5e967455d4..17b75eb066 100644 --- a/src/plugins/cpptools/cppcompletionassistprocessor.cpp +++ b/src/plugins/cpptools/cppcompletionassistprocessor.cpp @@ -43,13 +43,13 @@ namespace CppTools { CppCompletionAssistProcessor::CppCompletionAssistProcessor(int snippetItemOrder) : m_positionForProposal(-1) , m_preprocessorCompletions( - QStringList({ "define", "error", "include", "line", "pragma", "pragma once", - "pragma omp atomic", "pragma omp parallel", "pragma omp for", - "pragma omp ordered", "pragma omp parallel for", "pragma omp section", - "pragma omp sections", "pragma omp parallel sections", "pragma omp single", - "pragma omp master", "pragma omp critical", "pragma omp barrier", - "pragma omp flush", "pragma omp threadprivate", "undef", "if", "ifdef", - "ifndef", "elif", "else", "endif" })) + QStringList({"define", "error", "include", "line", "pragma", "pragma once", + "pragma omp atomic", "pragma omp parallel", "pragma omp for", + "pragma omp ordered", "pragma omp parallel for", "pragma omp section", + "pragma omp sections", "pragma omp parallel sections", "pragma omp single", + "pragma omp master", "pragma omp critical", "pragma omp barrier", + "pragma omp flush", "pragma omp threadprivate", "undef", "if", "ifdef", + "ifndef", "elif", "else", "endif"})) , m_hintProposal(0) , m_snippetCollector(QLatin1String(CppEditor::Constants::CPP_SNIPPETS_GROUP_ID), QIcon(QLatin1String(":/texteditor/images/snippet.png")), diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index 0c73c44d8d..7560451924 100644 --- a/src/plugins/cpptools/cppfilesettingspage.cpp +++ b/src/plugins/cpptools/cppfilesettingspage.cpp @@ -88,11 +88,11 @@ void CppFileSettings::toSettings(QSettings *s) const void CppFileSettings::fromSettings(QSettings *s) { const QStringList defaultHeaderSearchPaths - = QStringList({ "include", "Include", QDir::toNativeSeparators("../include"), - QDir::toNativeSeparators("../Include") }); + = QStringList({"include", "Include", QDir::toNativeSeparators("../include"), + QDir::toNativeSeparators("../Include")}); const QStringList defaultSourceSearchPaths - = QStringList({ QDir::toNativeSeparators("../src"), QDir::toNativeSeparators("../Src"), - ".." }); + = QStringList({QDir::toNativeSeparators("../src"), QDir::toNativeSeparators("../Src"), + ".."}); s->beginGroup(QLatin1String(Constants::CPPTOOLS_SETTINGSGROUP)); headerPrefixes = s->value(QLatin1String(headerPrefixesKeyC)).toStringList(); sourcePrefixes = s->value(QLatin1String(sourcePrefixesKeyC)).toStringList(); diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp index 6ff205316a..2283a7b9b1 100644 --- a/src/plugins/cpptools/cppfindreferences.cpp +++ b/src/plugins/cpptools/cppfindreferences.cpp @@ -276,7 +276,7 @@ static void find_helper(QFutureInterface<Usage> &future, const Utils::FileName sourceFile = Utils::FileName::fromUtf8(symbol->fileName(), symbol->fileNameLength()); - Utils::FileNameList files {sourceFile}; + Utils::FileNameList files{sourceFile}; if (symbol->isClass() || symbol->isForwardClassDeclaration() @@ -578,7 +578,7 @@ static void findMacroUses_helper(QFutureInterface<Usage> &future, const Macro macro) { const Utils::FileName sourceFile = Utils::FileName::fromString(macro.fileName()); - Utils::FileNameList files {sourceFile}; + Utils::FileNameList files{sourceFile}; files = Utils::filteredUnique(files + snapshot.filesDependingOn(sourceFile)); future.setProgressRange(0, files.size()); diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp index 97858b3c63..79ce311dbc 100644 --- a/src/plugins/cpptools/cppmodelmanager_test.cpp +++ b/src/plugins/cpptools/cppmodelmanager_test.cpp @@ -188,8 +188,8 @@ void CppToolsPlugin::test_modelmanager_paths_are_clean() ProjectPart::Ptr part(new ProjectPart); part->qtVersion = ProjectPart::Qt5; part->projectDefines = QByteArray("#define OH_BEHAVE -1\n"); - part->headerPaths = { HeaderPath(testDataDir.includeDir(false), HeaderPath::IncludePath), - HeaderPath(testDataDir.frameworksDir(false), HeaderPath::FrameworkPath) }; + part->headerPaths = {HeaderPath(testDataDir.includeDir(false), HeaderPath::IncludePath), + HeaderPath(testDataDir.frameworksDir(false), HeaderPath::FrameworkPath)}; pi.appendProjectPart(part); mm->updateProjectInfo(pi); @@ -220,8 +220,8 @@ void CppToolsPlugin::test_modelmanager_framework_headers() ProjectPart::Ptr part(new ProjectPart); part->qtVersion = ProjectPart::Qt5; part->projectDefines = QByteArray("#define OH_BEHAVE -1\n"); - part->headerPaths = { HeaderPath(testDataDir.includeDir(false), HeaderPath::IncludePath), - HeaderPath(testDataDir.frameworksDir(false), HeaderPath::FrameworkPath) }; + part->headerPaths = {HeaderPath(testDataDir.includeDir(false), HeaderPath::IncludePath), + HeaderPath(testDataDir.frameworksDir(false), HeaderPath::FrameworkPath)}; const QString &source = testDataDir.fileFromSourcesDir( _("test_modelmanager_framework_headers.cpp")); part->files << ProjectFile(source, ProjectFile::CXXSource); @@ -269,7 +269,7 @@ void CppToolsPlugin::test_modelmanager_refresh_also_includes_of_project_files() ProjectPart::Ptr part(new ProjectPart); part->qtVersion = ProjectPart::Qt5; part->projectDefines = QByteArray("#define OH_BEHAVE -1\n"); - part->headerPaths = { HeaderPath(testDataDir.includeDir(false), HeaderPath::IncludePath) }; + part->headerPaths = {HeaderPath(testDataDir.includeDir(false), HeaderPath::IncludePath)}; part->files.append(ProjectFile(testCpp, ProjectFile::CXXSource)); pi.appendProjectPart(part); @@ -545,8 +545,8 @@ void CppToolsPlugin::test_modelmanager_refresh_timeStampModified_if_sourcefiles_ const QString testCpp2 = QLatin1String("source2.cpp"); const QString fileToChange = testCpp; - const QStringList projectFiles1 = { testCpp }; - const QStringList projectFiles2 = { testCpp, testCpp2 }; + const QStringList projectFiles1 = {testCpp}; + const QStringList projectFiles2 = {testCpp, testCpp2}; // Add a file QTest::newRow("case: add project file") << fileToChange << projectFiles1 << projectFiles2; @@ -568,7 +568,7 @@ void CppToolsPlugin::test_modelmanager_snapshot_after_two_projects() // Project 1 project1.create(_("test_modelmanager_snapshot_after_two_projects.1"), _("testdata_project1"), - { "foo.h", "foo.cpp", "main.cpp" }); + {"foo.h", "foo.cpp", "main.cpp"}); refreshedFiles = helper.updateProjectInfo(project1.projectInfo); QCOMPARE(refreshedFiles, project1.projectFiles.toSet()); @@ -580,7 +580,7 @@ void CppToolsPlugin::test_modelmanager_snapshot_after_two_projects() // Project 2 project2.create(_("test_modelmanager_snapshot_after_two_projects.2"), _("testdata_project2"), - { "bar.h", "bar.cpp", "main.cpp" }); + {"bar.h", "bar.cpp", "main.cpp"}); refreshedFiles = helper.updateProjectInfo(project2.projectInfo); QCOMPARE(refreshedFiles, project2.projectFiles.toSet()); @@ -762,7 +762,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_project() part1->files.append(ProjectFile(header, ProjectFile::CXXHeader)); part1->qtVersion = ProjectPart::NoQt; part1->projectDefines = QByteArray("#define SUB1\n"); - part1->headerPaths = { HeaderPath(testDataDirectory.includeDir(false), HeaderPath::IncludePath) }; + part1->headerPaths = {HeaderPath(testDataDirectory.includeDir(false), HeaderPath::IncludePath)}; ProjectPart::Ptr part2(new ProjectPart); part2->projectFile = QLatin1String("project1.projectfile"); @@ -770,7 +770,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_project() part2->files.append(ProjectFile(header, ProjectFile::CXXHeader)); part2->qtVersion = ProjectPart::NoQt; part2->projectDefines = QByteArray("#define SUB2\n"); - part2->headerPaths = { HeaderPath(testDataDirectory.includeDir(false), HeaderPath::IncludePath) }; + part2->headerPaths = {HeaderPath(testDataDirectory.includeDir(false), HeaderPath::IncludePath)}; ProjectInfo pi = ProjectInfo(project); pi.appendProjectPart(part1); @@ -786,8 +786,8 @@ void CppToolsPlugin::test_modelmanager_defines_per_project() QString firstDeclarationName; QString fileName; } d[] = { - { _("one"), main1File }, - { _("two"), main2File } + {_("one"), main1File}, + {_("two"), main2File} }; const int size = sizeof(d) / sizeof(d[0]); for (int i = 0; i < size; ++i) { @@ -828,7 +828,7 @@ void CppToolsPlugin::test_modelmanager_precompiled_headers() part1->files.append(ProjectFile(header, ProjectFile::CXXHeader)); part1->qtVersion = ProjectPart::NoQt; part1->precompiledHeaders.append(pch1File); - part1->headerPaths = { HeaderPath(testDataDirectory.includeDir(false), HeaderPath::IncludePath) }; + part1->headerPaths = {HeaderPath(testDataDirectory.includeDir(false), HeaderPath::IncludePath)}; part1->updateLanguageFeatures(); ProjectPart::Ptr part2(new ProjectPart); @@ -837,7 +837,7 @@ void CppToolsPlugin::test_modelmanager_precompiled_headers() part2->files.append(ProjectFile(header, ProjectFile::CXXHeader)); part2->qtVersion = ProjectPart::NoQt; part2->precompiledHeaders.append(pch2File); - part2->headerPaths = { HeaderPath(testDataDirectory.includeDir(false), HeaderPath::IncludePath) }; + part2->headerPaths = {HeaderPath(testDataDirectory.includeDir(false), HeaderPath::IncludePath)}; part2->updateLanguageFeatures(); ProjectInfo pi = ProjectInfo(project); @@ -855,8 +855,8 @@ void CppToolsPlugin::test_modelmanager_precompiled_headers() QString firstClassInPchFile; QString fileName; } d[] = { - { _("one"), _("ClassInPch1"), main1File }, - { _("two"), _("ClassInPch2"), main2File } + {_("one"), _("ClassInPch1"), main1File}, + {_("two"), _("ClassInPch2"), main2File} }; const int size = sizeof(d) / sizeof(d[0]); for (int i = 0; i < size; ++i) { @@ -911,13 +911,13 @@ void CppToolsPlugin::test_modelmanager_defines_per_editor() part1->files.append(ProjectFile(main1File, ProjectFile::CXXSource)); part1->files.append(ProjectFile(header, ProjectFile::CXXHeader)); part1->qtVersion = ProjectPart::NoQt; - part1->headerPaths = { HeaderPath(testDataDirectory.includeDir(false), HeaderPath::IncludePath) }; + part1->headerPaths = {HeaderPath(testDataDirectory.includeDir(false), HeaderPath::IncludePath)}; ProjectPart::Ptr part2(new ProjectPart); part2->files.append(ProjectFile(main2File, ProjectFile::CXXSource)); part2->files.append(ProjectFile(header, ProjectFile::CXXHeader)); part2->qtVersion = ProjectPart::NoQt; - part2->headerPaths = { HeaderPath(testDataDirectory.includeDir(false), HeaderPath::IncludePath) }; + part2->headerPaths = {HeaderPath(testDataDirectory.includeDir(false), HeaderPath::IncludePath)}; ProjectInfo pi = ProjectInfo(project); pi.appendProjectPart(part1); @@ -934,8 +934,8 @@ void CppToolsPlugin::test_modelmanager_defines_per_editor() QString editorDefines; QString firstDeclarationName; } d[] = { - { _("#define SUB1\n"), _("one") }, - { _("#define SUB2\n"), _("two") } + {_("#define SUB1\n"), _("one")}, + {_("#define SUB2\n"), _("two")} }; const int size = sizeof(d) / sizeof(d[0]); for (int i = 0; i < size; ++i) { @@ -1025,7 +1025,7 @@ void CppToolsPlugin::test_modelmanager_renameIncludes() QVERIFY(tmpDir.isValid()); const QDir workingDir(tmpDir.path()); - const QStringList fileNames = { "foo.h", "foo.cpp", "main.cpp" }; + const QStringList fileNames = {"foo.h", "foo.cpp", "main.cpp"}; const QString oldHeader(workingDir.filePath(_("foo.h"))); const QString newHeader(workingDir.filePath(_("bar.h"))); CppModelManager *modelManager = CppModelManager::instance(); @@ -1071,7 +1071,7 @@ void CppToolsPlugin::test_modelmanager_renameIncludesInEditor() QVERIFY(tmpDir.isValid()); const QDir workingDir(tmpDir.path()); - const QStringList fileNames = { "foo.h", "foo.cpp", "main.cpp" }; + const QStringList fileNames = {"foo.h", "foo.cpp", "main.cpp"}; const QString oldHeader(workingDir.filePath(_("foo.h"))); const QString newHeader(workingDir.filePath(_("bar.h"))); const QString mainFile(workingDir.filePath(_("main.cpp"))); diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index 9f6b59b5ee..7a08a568c0 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -902,8 +902,8 @@ BreakHandler::BreakHandler() #if USE_BREAK_MODEL_TEST new ModelTest(this, 0); #endif - setHeader(QStringList({ tr("Number"), tr("Function"), tr("File"), tr("Line"), tr("Address"), - tr("Condition"), tr("Ignore"), tr("Threads") })); + setHeader(QStringList({tr("Number"), tr("Function"), tr("File"), tr("Line"), tr("Address"), + tr("Condition"), tr("Ignore"), tr("Threads")})); } static inline bool fileNameMatch(const QString &f1, const QString &f2) @@ -1936,7 +1936,7 @@ bool BreakHandler::setData(const QModelIndex &idx, const QVariant &value, int ro if (ev.as<QMouseEvent>(QEvent::MouseButtonDblClick)) { if (Breakpoint b = findBreakpointByIndex(idx)) { if (idx.column() >= BreakpointAddressColumn) - editBreakpoints({ b }, ev.view()); + editBreakpoints({b}, ev.view()); else b.gotoLocation(); } else { diff --git a/src/plugins/debugger/console/console.cpp b/src/plugins/debugger/console/console.cpp index a15a97b219..0f2cb819fc 100644 --- a/src/plugins/debugger/console/console.cpp +++ b/src/plugins/debugger/console/console.cpp @@ -164,8 +164,8 @@ QWidget *Console::outputWidget(QWidget *) QList<QWidget *> Console::toolBarWidgets() const { - return { m_showDebugButton, m_showWarningButton, m_showErrorButton, - m_spacer, m_statusLabel }; + return {m_showDebugButton, m_showWarningButton, m_showErrorButton, + m_spacer, m_statusLabel}; } int Console::priorityInStatusBar() const diff --git a/src/plugins/debugger/debuggeritem.cpp b/src/plugins/debugger/debuggeritem.cpp index 13ba684dc5..b6811f6f7d 100644 --- a/src/plugins/debugger/debuggeritem.cpp +++ b/src/plugins/debugger/debuggeritem.cpp @@ -123,7 +123,7 @@ void DebuggerItem::reinitializeFromFile() SynchronousProcess proc; SynchronousProcessResponse response - = proc.runBlocking(m_command.toString(), QStringList({ QLatin1String(version) })); + = proc.runBlocking(m_command.toString(), QStringList({QLatin1String(version)})); if (response.result != SynchronousProcessResponse::Finished) { m_engineType = NoEngineType; return; diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index 708ba45ca6..0b473fd93e 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -220,7 +220,7 @@ const DebuggerItem *findDebugger(const Predicate &pred) DebuggerItemModel::DebuggerItemModel() { - setHeader({ tr("Name"), tr("Location"), tr("Type") }); + setHeader({tr("Name"), tr("Location"), tr("Type")}); rootItem()->appendChild(new StaticTreeItem(tr("Auto-detected"))); rootItem()->appendChild(new StaticTreeItem(tr("Manual"))); } @@ -702,8 +702,8 @@ void DebuggerItemManagerPrivate::autoDetectCdbDebuggers() void DebuggerItemManagerPrivate::autoDetectGdbOrLldbDebuggers() { - const QStringList filters = { "gdb-i686-pc-mingw32", "gdb-i686-pc-mingw32.exe", "gdb", - "gdb.exe", "lldb", "lldb.exe", "lldb-*" }; + const QStringList filters = {"gdb-i686-pc-mingw32", "gdb-i686-pc-mingw32.exe", "gdb", + "gdb.exe", "lldb", "lldb.exe", "lldb-*"}; // DebuggerItem result; // result.setAutoDetected(true); @@ -731,7 +731,7 @@ void DebuggerItemManagerPrivate::autoDetectGdbOrLldbDebuggers() SynchronousProcess lldbInfo; lldbInfo.setTimeoutS(2); SynchronousProcessResponse response - = lldbInfo.runBlocking(QLatin1String("xcrun"), { "--find", "lldb" }); + = lldbInfo.runBlocking(QLatin1String("xcrun"), {"--find", "lldb"}); if (response.result == Utils::SynchronousProcessResponse::Finished) { QString lPath = response.allOutput().trimmed(); if (!lPath.isEmpty()) { diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 144fe83ca9..b042c8feb8 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -1848,22 +1848,22 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, // qmlToolbar.addWidget(new StyledSeparator); auto createBasePerspective = [this] { return new Perspective({}, { - { DOCKWIDGET_STACK, m_stackWindow, {}, Perspective::SplitVertical }, - { DOCKWIDGET_BREAK, m_breakWindow, DOCKWIDGET_STACK, Perspective::SplitHorizontal }, - { DOCKWIDGET_THREADS, m_threadsWindow, DOCKWIDGET_BREAK, Perspective::AddToTab, false }, - { DOCKWIDGET_MODULES, m_modulesWindow, DOCKWIDGET_THREADS, Perspective::AddToTab, false }, - { DOCKWIDGET_SOURCE_FILES, m_sourceFilesWindow, DOCKWIDGET_MODULES, Perspective::AddToTab, false }, - { DOCKWIDGET_SNAPSHOTS, m_snapshotWindow, DOCKWIDGET_SOURCE_FILES, Perspective::AddToTab, false }, - { DOCKWIDGET_WATCHERS, m_localsAndExpressionsWindow, {}, Perspective::AddToTab, true, - Qt::RightDockWidgetArea }, - { DOCKWIDGET_OUTPUT, m_logWindow, {}, Perspective::AddToTab, false, Qt::TopDockWidgetArea }, - { DOCKWIDGET_BREAK, 0, {}, Perspective::Raise } + {DOCKWIDGET_STACK, m_stackWindow, {}, Perspective::SplitVertical}, + {DOCKWIDGET_BREAK, m_breakWindow, DOCKWIDGET_STACK, Perspective::SplitHorizontal}, + {DOCKWIDGET_THREADS, m_threadsWindow, DOCKWIDGET_BREAK, Perspective::AddToTab, false}, + {DOCKWIDGET_MODULES, m_modulesWindow, DOCKWIDGET_THREADS, Perspective::AddToTab, false}, + {DOCKWIDGET_SOURCE_FILES, m_sourceFilesWindow, DOCKWIDGET_MODULES, Perspective::AddToTab, false}, + {DOCKWIDGET_SNAPSHOTS, m_snapshotWindow, DOCKWIDGET_SOURCE_FILES, Perspective::AddToTab, false}, + {DOCKWIDGET_WATCHERS, m_localsAndExpressionsWindow, {}, Perspective::AddToTab, true, + Qt::RightDockWidgetArea}, + {DOCKWIDGET_OUTPUT, m_logWindow, {}, Perspective::AddToTab, false, Qt::TopDockWidgetArea}, + {DOCKWIDGET_BREAK, 0, {}, Perspective::Raise} }); }; Perspective *cppPerspective = createBasePerspective(); cppPerspective->setName(tr("Debugger")); - cppPerspective->addOperation({ DOCKWIDGET_REGISTER, m_registerWindow, DOCKWIDGET_SNAPSHOTS, - Perspective::AddToTab, false }); + cppPerspective->addOperation({DOCKWIDGET_REGISTER, m_registerWindow, DOCKWIDGET_SNAPSHOTS, + Perspective::AddToTab, false}); Debugger::registerToolbar(CppPerspectiveId, toolbar); Debugger::registerPerspective(CppPerspectiveId, cppPerspective); @@ -2142,16 +2142,16 @@ void DebuggerPlugin::getEnginesState(QByteArray *json) const { QTC_ASSERT(json, return); QVariantMap result { - { "version", 1 } + {"version", 1} }; QVariantMap states; for (int i = 0; i < dd->m_snapshotHandler->size(); ++i) { const DebuggerEngine *engine = dd->m_snapshotHandler->at(i); states[QString::number(i)] = QVariantMap({ - { "current", dd->m_snapshotHandler->currentIndex() == i }, - { "pid", engine->inferiorPid() }, - { "state", engine->state() } + {"current", dd->m_snapshotHandler->currentIndex() == i}, + {"pid", engine->inferiorPid()}, + {"state", engine->state()} }); } @@ -3873,7 +3873,7 @@ void DebuggerUnitTests::testDebuggerMatching() QList<QObject *> DebuggerPlugin::createTestObjects() const { - return { new DebuggerUnitTests }; + return {new DebuggerUnitTests}; } #else // ^-- if WITH_TESTS else --v diff --git a/src/plugins/debugger/debuggerprotocol.cpp b/src/plugins/debugger/debuggerprotocol.cpp index 7fdbc58fa4..06c7315289 100644 --- a/src/plugins/debugger/debuggerprotocol.cpp +++ b/src/plugins/debugger/debuggerprotocol.cpp @@ -646,11 +646,11 @@ QString decodeData(const QString &ba, const QString &encoding) case DebuggerEncoding::HexEncodedFloat: { const QByteArray s = QByteArray::fromHex(ba.toUtf8()); if (enc.size == 4) { - union { char c[4]; float f; } u = { { s[3], s[2], s[1], s[0] } }; + union { char c[4]; float f; } u = {{s[3], s[2], s[1], s[0]}}; return QString::number(u.f); } if (enc.size == 8) { - union { char c[8]; double d; } u = { { s[7], s[6], s[5], s[4], s[3], s[2], s[1], s[0] } }; + union { char c[8]; double d; } u = {{s[7], s[6], s[5], s[4], s[3], s[2], s[1], s[0]}}; return QString::number(u.d); } } diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp index eb60d2df75..bf5a686f58 100644 --- a/src/plugins/debugger/debuggertooltipmanager.cpp +++ b/src/plugins/debugger/debuggertooltipmanager.cpp @@ -236,9 +236,9 @@ class ToolTipModel : public TreeModel<ToolTipWatchItem> public: ToolTipModel() { - setHeader({ DebuggerToolTipManager::tr("Name"), - DebuggerToolTipManager::tr("Value"), - DebuggerToolTipManager::tr("Type") }); + setHeader({DebuggerToolTipManager::tr("Name"), + DebuggerToolTipManager::tr("Value"), + DebuggerToolTipManager::tr("Type")}); m_enabled = true; auto item = new ToolTipWatchItem; item->expandable = true; diff --git a/src/plugins/debugger/memoryagent.cpp b/src/plugins/debugger/memoryagent.cpp index fa67beb91a..0142d53d4d 100644 --- a/src/plugins/debugger/memoryagent.cpp +++ b/src/plugins/debugger/memoryagent.cpp @@ -161,8 +161,8 @@ QString registerViewTitle(const QString ®isterName, quint64 addr) QList<MemoryMarkup> registerViewMarkup(quint64 a, const QString ®Name) { - return { MemoryMarkup(a, 1, QColor(Qt::blue).lighter(), - MemoryAgent::tr("Register \"%1\"").arg(regName)) }; + return {MemoryMarkup(a, 1, QColor(Qt::blue).lighter(), + MemoryAgent::tr("Register \"%1\"").arg(regName))}; } /////////////////////////////////////////////////////////////////////// diff --git a/src/plugins/debugger/moduleshandler.cpp b/src/plugins/debugger/moduleshandler.cpp index 1262a3a827..94d558851a 100644 --- a/src/plugins/debugger/moduleshandler.cpp +++ b/src/plugins/debugger/moduleshandler.cpp @@ -196,7 +196,7 @@ bool ModulesModel::contextMenuEvent(const ItemViewEvent &ev) addAction(menu, tr("Show Dependencies of \"%1\"").arg(moduleName), tr("Show Dependencies"), moduleNameValid && !moduleName.isEmpty() && HostOsInfo::isWindowsHost(), - [this, modulePath] { QProcess::startDetached("depends", { modulePath }); }); + [this, modulePath] { QProcess::startDetached("depends", {modulePath}); }); addAction(menu, tr("Load Symbols for All Modules"), enabled && canLoadSymbols, diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp index b7e044c019..aacdf22a6c 100644 --- a/src/plugins/debugger/pdb/pdbengine.cpp +++ b/src/plugins/debugger/pdb/pdbengine.cpp @@ -136,7 +136,7 @@ void PdbEngine::setupEngine() notifyEngineSetupFailed(); } - QStringList args = { bridge, scriptFile.fileName() }; + QStringList args = {bridge, scriptFile.fileName()}; args.append(Utils::QtcProcess::splitArgs(runParameters().inferior.workingDirectory)); showMessage("STARTING " + m_interpreter + QLatin1Char(' ') + args.join(QLatin1Char(' '))); m_proc.setEnvironment(runParameters().debugger.environment.toStringList()); diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index fd2ce5bd8d..f60cbf5923 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -466,7 +466,7 @@ WatchModel::WatchModel(WatchHandler *handler, DebuggerEngine *engine) m_contentsValid = true; - setHeader({ tr("Name"), tr("Value"), tr("Type") }); + setHeader({tr("Name"), tr("Value"), tr("Type")}); m_localsRoot = new WatchItem; m_localsRoot->iname = "local"; m_localsRoot->name = tr("Locals"); @@ -2070,7 +2070,7 @@ void WatchHandler::notifyUpdateStarted(const UpdateParameters &updateParameters) { QStringList inames = updateParameters.partialVariables(); if (inames.isEmpty()) - inames = QStringList({ "local", "return" }); + inames = QStringList({"local", "return"}); auto marker = [](WatchItem *item) { item->outdated = true; }; diff --git a/src/plugins/designer/cpp/formclasswizard.cpp b/src/plugins/designer/cpp/formclasswizard.cpp index 554757a7e5..c3183b2a94 100644 --- a/src/plugins/designer/cpp/formclasswizard.cpp +++ b/src/plugins/designer/cpp/formclasswizard.cpp @@ -38,7 +38,7 @@ namespace Internal { FormClassWizard::FormClassWizard() { - setRequiredFeatures({ QtSupport::Constants::FEATURE_QWIDGETS }); + setRequiredFeatures({QtSupport::Constants::FEATURE_QWIDGETS}); } QString FormClassWizard::headerSuffix() const diff --git a/src/plugins/designer/gotoslot_test.cpp b/src/plugins/designer/gotoslot_test.cpp index 7b15d18682..5bb03dda15 100644 --- a/src/plugins/designer/gotoslot_test.cpp +++ b/src/plugins/designer/gotoslot_test.cpp @@ -165,7 +165,7 @@ public: const QString hFile = files.at(1); QCOMPARE(DocumentModel::openedDocuments().size(), files.size()); - waitForFilesInGlobalSnapshot({ cppFile, hFile }); + waitForFilesInGlobalSnapshot({cppFile, hFile}); // Execute "Go To Slot" QDesignerIntegrationInterface *integration = FormEditorW::designerEditor()->integration(); @@ -214,8 +214,8 @@ public: // Since no project is opened and the ui_*.h is not generated, // the following diagnostic messages will be ignored. - const QStringList ignoreList = QStringList({ "ui_form.h: No such file or directory", - "QWidget: No such file or directory" }); + const QStringList ignoreList = QStringList({"ui_form.h: No such file or directory", + "QWidget: No such file or directory"}); QList<Document::DiagnosticMessage> cleanedDiagnosticMessages; foreach (const Document::DiagnosticMessage &message, document->diagnosticMessages()) { if (!ignoreList.contains(message.text())) @@ -246,9 +246,9 @@ void FormEditorPlugin::test_gotoslot_data() MyTestDataDir testDataDirWithoutProject(_("gotoslot_withoutProject")); QTest::newRow("withoutProject") - << QStringList({ testDataDirWithoutProject.file(_("form.cpp")), - testDataDirWithoutProject.file(_("form.h")), - testDataDirWithoutProject.file(_("form.ui")) }); + << QStringList({testDataDirWithoutProject.file(_("form.cpp")), + testDataDirWithoutProject.file(_("form.h")), + testDataDirWithoutProject.file(_("form.ui"))}); // Finding the right class for inserting definitions/declarations is based on // finding a class with a member whose type is the class from the "ui_xxx.h" header. @@ -259,18 +259,18 @@ void FormEditorPlugin::test_gotoslot_data() testDataDir = MyTestDataDir(_("gotoslot_insertIntoCorrectClass_pointer")); QTest::newRow("insertIntoCorrectClass_pointer") - << QStringList({ testDataDir.file(_("form.cpp")), testDataDir.file(_("form.h")), - testDataDirWithoutProject.file(_("form.ui")) }); // reuse + << QStringList({testDataDir.file(_("form.cpp")), testDataDir.file(_("form.h")), + testDataDirWithoutProject.file(_("form.ui"))}); // reuse testDataDir = MyTestDataDir(_("gotoslot_insertIntoCorrectClass_non-pointer")); QTest::newRow("insertIntoCorrectClass_non-pointer") - << QStringList({ testDataDir.file(_("form.cpp")), testDataDir.file(_("form.h")), - testDataDirWithoutProject.file(_("form.ui")) }); // reuse + << QStringList({testDataDir.file(_("form.cpp")), testDataDir.file(_("form.h")), + testDataDirWithoutProject.file(_("form.ui"))}); // reuse testDataDir = MyTestDataDir(_("gotoslot_insertIntoCorrectClass_pointer_ns_using")); QTest::newRow("insertIntoCorrectClass_pointer_ns_using") - << QStringList({ testDataDir.file(_("form.cpp")), testDataDir.file(_("form.h")), - testDataDir.file(_("form.ui")) }); + << QStringList({testDataDir.file(_("form.cpp")), testDataDir.file(_("form.h")), + testDataDir.file(_("form.ui"))}); } } // namespace Internal diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp index 9a19e0b6dd..bcfa661ef3 100644 --- a/src/plugins/designer/qtcreatorintegration.cpp +++ b/src/plugins/designer/qtcreatorintegration.cpp @@ -353,9 +353,9 @@ static QString addConstRefIfNeeded(const QString &argument) return argument; // for those types we don't want to add "const &" - static const QStringList nonConstRefs = QStringList({ "bool", "int", "uint", "float", "double", - "long", "short", "char", "signed", - "unsigned", "qint64", "quint64" }); + static const QStringList nonConstRefs = QStringList({"bool", "int", "uint", "float", "double", + "long", "short", "char", "signed", + "unsigned", "qint64", "quint64"}); for (int i = 0; i < nonConstRefs.count(); i++) { const QString nonConstRef = nonConstRefs.at(i); diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index 0c5750e568..b56107d9dd 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -788,91 +788,91 @@ static const QMap<QString, int> &vimKeyNames() { static const QMap<QString, int> k = { // FIXME: Should be value of mapleader. - { "LEADER", Key_Backslash }, - - { "SPACE", Key_Space }, - { "TAB", Key_Tab }, - { "NL", Key_Return }, - { "NEWLINE", Key_Return }, - { "LINEFEED", Key_Return }, - { "LF", Key_Return }, - { "CR", Key_Return }, - { "RETURN", Key_Return }, - { "ENTER", Key_Return }, - { "BS", Key_Backspace }, - { "BACKSPACE", Key_Backspace }, - { "ESC", Key_Escape }, - { "BAR", Key_Bar }, - { "BSLASH", Key_Backslash }, - { "DEL", Key_Delete }, - { "DELETE", Key_Delete }, - { "KDEL", Key_Delete }, - { "UP", Key_Up }, - { "DOWN", Key_Down }, - { "LEFT", Key_Left }, - { "RIGHT", Key_Right }, - - { "LT", Key_Less }, - { "GT", Key_Greater }, - - { "F1", Key_F1 }, - { "F2", Key_F2 }, - { "F3", Key_F3 }, - { "F4", Key_F4 }, - { "F5", Key_F5 }, - { "F6", Key_F6 }, - { "F7", Key_F7 }, - { "F8", Key_F8 }, - { "F9", Key_F9 }, - { "F10", Key_F10 }, - - { "F11", Key_F11 }, - { "F12", Key_F12 }, - { "F13", Key_F13 }, - { "F14", Key_F14 }, - { "F15", Key_F15 }, - { "F16", Key_F16 }, - { "F17", Key_F17 }, - { "F18", Key_F18 }, - { "F19", Key_F19 }, - { "F20", Key_F20 }, - - { "F21", Key_F21 }, - { "F22", Key_F22 }, - { "F23", Key_F23 }, - { "F24", Key_F24 }, - { "F25", Key_F25 }, - { "F26", Key_F26 }, - { "F27", Key_F27 }, - { "F28", Key_F28 }, - { "F29", Key_F29 }, - { "F30", Key_F30 }, - - { "F31", Key_F31 }, - { "F32", Key_F32 }, - { "F33", Key_F33 }, - { "F34", Key_F34 }, - { "F35", Key_F35 }, - - { "INSERT", Key_Insert }, - { "INS", Key_Insert }, - { "KINSERT", Key_Insert }, - { "HOME", Key_Home }, - { "END", Key_End }, - { "PAGEUP", Key_PageUp }, - { "PAGEDOWN", Key_PageDown }, - - { "KPLUS", Key_Plus }, - { "KMINUS", Key_Minus }, - { "KDIVIDE", Key_Slash }, - { "KMULTIPLY", Key_Asterisk }, - { "KENTER", Key_Enter }, - { "KPOINT", Key_Period }, - - { "CAPS", Key_CapsLock }, - { "NUM", Key_NumLock }, - { "SCROLL", Key_ScrollLock }, - { "ALTGR", Key_AltGr } + {"LEADER", Key_Backslash}, + + {"SPACE", Key_Space}, + {"TAB", Key_Tab}, + {"NL", Key_Return}, + {"NEWLINE", Key_Return}, + {"LINEFEED", Key_Return}, + {"LF", Key_Return}, + {"CR", Key_Return}, + {"RETURN", Key_Return}, + {"ENTER", Key_Return}, + {"BS", Key_Backspace}, + {"BACKSPACE", Key_Backspace}, + {"ESC", Key_Escape}, + {"BAR", Key_Bar}, + {"BSLASH", Key_Backslash}, + {"DEL", Key_Delete}, + {"DELETE", Key_Delete}, + {"KDEL", Key_Delete}, + {"UP", Key_Up}, + {"DOWN", Key_Down}, + {"LEFT", Key_Left}, + {"RIGHT", Key_Right}, + + {"LT", Key_Less}, + {"GT", Key_Greater}, + + {"F1", Key_F1}, + {"F2", Key_F2}, + {"F3", Key_F3}, + {"F4", Key_F4}, + {"F5", Key_F5}, + {"F6", Key_F6}, + {"F7", Key_F7}, + {"F8", Key_F8}, + {"F9", Key_F9}, + {"F10", Key_F10}, + + {"F11", Key_F11}, + {"F12", Key_F12}, + {"F13", Key_F13}, + {"F14", Key_F14}, + {"F15", Key_F15}, + {"F16", Key_F16}, + {"F17", Key_F17}, + {"F18", Key_F18}, + {"F19", Key_F19}, + {"F20", Key_F20}, + + {"F21", Key_F21}, + {"F22", Key_F22}, + {"F23", Key_F23}, + {"F24", Key_F24}, + {"F25", Key_F25}, + {"F26", Key_F26}, + {"F27", Key_F27}, + {"F28", Key_F28}, + {"F29", Key_F29}, + {"F30", Key_F30}, + + {"F31", Key_F31}, + {"F32", Key_F32}, + {"F33", Key_F33}, + {"F34", Key_F34}, + {"F35", Key_F35}, + + {"INSERT", Key_Insert}, + {"INS", Key_Insert}, + {"KINSERT", Key_Insert}, + {"HOME", Key_Home}, + {"END", Key_End}, + {"PAGEUP", Key_PageUp}, + {"PAGEDOWN", Key_PageDown}, + + {"KPLUS", Key_Plus}, + {"KMINUS", Key_Minus}, + {"KDIVIDE", Key_Slash}, + {"KMULTIPLY", Key_Asterisk}, + {"KENTER", Key_Enter}, + {"KPOINT", Key_Period}, + + {"CAPS", Key_CapsLock}, + {"NUM", Key_NumLock}, + {"SCROLL", Key_ScrollLock}, + {"ALTGR", Key_AltGr} }; return k; diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp index 483039c575..4046106eee 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.cpp +++ b/src/plugins/genericprojectmanager/genericmakestep.cpp @@ -326,9 +326,9 @@ QList<BuildStepInfo> GenericMakeStepFactory::availableSteps(BuildStepList *paren if (parent->target()->project()->id() != Constants::GENERICPROJECT_ID) return {}; - return {{ GENERIC_MS_ID, - QCoreApplication::translate("GenericProjectManager::Internal::GenericMakeStep", - GENERIC_MS_DISPLAY_NAME) }}; + return {{GENERIC_MS_ID, + QCoreApplication::translate("GenericProjectManager::Internal::GenericMakeStep", + GENERIC_MS_DISPLAY_NAME)}}; } BuildStep *GenericMakeStepFactory::create(BuildStepList *parent, const Id id) diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp index 03bbcd6a8c..6db3ecce9f 100644 --- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp +++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp @@ -110,7 +110,7 @@ QString GenericProjectWizardDialog::projectName() const GenericProjectWizard::GenericProjectWizard() { - setSupportedProjectTypes({ Constants::GENERICPROJECT_ID }); + setSupportedProjectTypes({Constants::GENERICPROJECT_ID}); // TODO do something about the ugliness of standard icons in sizes different than 16, 32, 64, 128 { QPixmap icon(22, 22); diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp index a91153a20d..6f2184d507 100644 --- a/src/plugins/git/branchdialog.cpp +++ b/src/plugins/git/branchdialog.cpp @@ -336,7 +336,7 @@ void BranchDialog::log() QString branchName = m_model->fullName(selectedIndex(), true); if (branchName.isEmpty()) return; - GitPlugin::client()->log(m_repository, QString(), false, { branchName }); + GitPlugin::client()->log(m_repository, QString(), false, {branchName}); } void BranchDialog::reset() diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp index 11aa832297..9a8a4d56cc 100644 --- a/src/plugins/git/branchmodel.cpp +++ b/src/plugins/git/branchmodel.cpp @@ -174,7 +174,7 @@ public: } return names; } - return { fullName().join('/') }; + return {fullName().join('/')}; } int rowOf(BranchNode *node) @@ -318,7 +318,7 @@ bool BranchModel::setData(const QModelIndex &index, const QVariant &value, int r QString output; QString errorMessage; if (!m_client->synchronousBranchCmd(m_workingDirectory, - { "-m", oldFullName.last(), newFullName.last() }, + {"-m", oldFullName.last(), newFullName.last()}, &output, &errorMessage)) { node->name = oldFullName.last(); VcsOutputWindow::appendError(errorMessage); @@ -363,8 +363,8 @@ bool BranchModel::refresh(const QString &workingDirectory, QString *errorMessage } m_currentSha = m_client->synchronousTopRevision(workingDirectory); - const QStringList args = { "--format=%(objectname)\t%(refname)\t%(upstream:short)\t" - "%(*objectname)\t%(committerdate:raw)\t%(*committerdate:raw)" }; + const QStringList args = {"--format=%(objectname)\t%(refname)\t%(upstream:short)\t" + "%(*objectname)\t%(committerdate:raw)\t%(*committerdate:raw)"}; QString output; if (!m_client->synchronousForEachRefCmd(workingDirectory, args, &output, errorMessage)) VcsOutputWindow::appendError(*errorMessage); @@ -403,7 +403,7 @@ void BranchModel::renameBranch(const QString &oldName, const QString &newName) { QString errorMessage; QString output; - if (!m_client->synchronousBranchCmd(m_workingDirectory, { "-m", oldName, newName }, + if (!m_client->synchronousBranchCmd(m_workingDirectory, {"-m", oldName, newName}, &output, &errorMessage)) VcsOutputWindow::appendError(errorMessage); else @@ -414,9 +414,9 @@ void BranchModel::renameTag(const QString &oldName, const QString &newName) { QString errorMessage; QString output; - if (!m_client->synchronousTagCmd(m_workingDirectory, { newName, oldName }, + if (!m_client->synchronousTagCmd(m_workingDirectory, {newName, oldName}, &output, &errorMessage) - || !m_client->synchronousTagCmd(m_workingDirectory, { "-d", oldName }, + || !m_client->synchronousTagCmd(m_workingDirectory, {"-d", oldName}, &output, &errorMessage)) { VcsOutputWindow::appendError(errorMessage); } else { @@ -513,7 +513,7 @@ void BranchModel::removeBranch(const QModelIndex &idx) QString errorMessage; QString output; - if (!m_client->synchronousBranchCmd(m_workingDirectory, { "-D", branch }, &output, &errorMessage)) { + if (!m_client->synchronousBranchCmd(m_workingDirectory, {"-D", branch}, &output, &errorMessage)) { VcsOutputWindow::appendError(errorMessage); return; } @@ -529,7 +529,7 @@ void BranchModel::removeTag(const QModelIndex &idx) QString errorMessage; QString output; - if (!m_client->synchronousTagCmd(m_workingDirectory, { "-d", tag }, &output, &errorMessage)) { + if (!m_client->synchronousTagCmd(m_workingDirectory, {"-d", tag}, &output, &errorMessage)) { VcsOutputWindow::appendError(errorMessage); return; } @@ -556,7 +556,7 @@ bool BranchModel::branchIsMerged(const QModelIndex &idx) QString errorMessage; QString output; - if (!m_client->synchronousBranchCmd(m_workingDirectory, { "-a", "--contains", sha(idx) }, + if (!m_client->synchronousBranchCmd(m_workingDirectory, {"-a", "--contains", sha(idx)}, &output, &errorMessage)) { VcsOutputWindow::appendError(errorMessage); } @@ -594,7 +594,7 @@ QModelIndex BranchModel::addBranch(const QString &name, bool track, const QModel QString errorMessage; QDateTime branchDateTime; - QStringList args = { QLatin1String(track ? "--track" : "--no-track"), name }; + QStringList args = {QLatin1String(track ? "--track" : "--no-track"), name}; if (!fullTrackedBranch.isEmpty()) { args << fullTrackedBranch; startSha = sha(startPoint); diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp index a90fc281df..ec7e724f16 100644 --- a/src/plugins/git/changeselectiondialog.cpp +++ b/src/plugins/git/changeselectiondialog.cpp @@ -220,7 +220,7 @@ void ChangeSelectionDialog::recalculateCompletion() GitClient *client = GitPlugin::client(); VcsBase::VcsCommand *command = client->asyncForEachRefCmd( - workingDir, { "--format=%(refname:short)" }); + workingDir, {"--format=%(refname:short)"}); connect(this, &QObject::destroyed, command, &VcsBase::VcsCommand::abort); connect(command, &VcsBase::VcsCommand::stdOutText, [this](const QString &output) { m_changeModel->setStringList(output.split('\n')); @@ -251,7 +251,7 @@ void ChangeSelectionDialog::recalculateDetails() connect(m_process, static_cast<void (QProcess::*)(int)>(&QProcess::finished), this, &ChangeSelectionDialog::setDetails); - m_process->start(m_gitExecutable.toString(), { "show", "--stat=80", ref }); + m_process->start(m_gitExecutable.toString(), {"show", "--stat=80", ref}); m_process->closeWriteChannel(); if (!m_process->waitForStarted()) m_ui->detailsText->setPlainText(tr("Error: Could not start Git.")); diff --git a/src/plugins/git/gerrit/branchcombobox.cpp b/src/plugins/git/gerrit/branchcombobox.cpp index 5990160eed..6cc866ce3f 100644 --- a/src/plugins/git/gerrit/branchcombobox.cpp +++ b/src/plugins/git/gerrit/branchcombobox.cpp @@ -45,7 +45,7 @@ void BranchComboBox::init(const QString &repository) QString output; const QString branchPrefix("refs/heads/"); if (!GitPlugin::client()->synchronousForEachRefCmd( - m_repository, { "--format=%(refname)", branchPrefix }, &output)) { + m_repository, {"--format=%(refname)", branchPrefix}, &output)) { return; } const QStringList branches = output.trimmed().split('\n'); diff --git a/src/plugins/git/gerrit/gerritmodel.cpp b/src/plugins/git/gerrit/gerritmodel.cpp index eaada0e4bb..6ae25dbd45 100644 --- a/src/plugins/git/gerrit/gerritmodel.cpp +++ b/src/plugins/git/gerrit/gerritmodel.cpp @@ -200,7 +200,7 @@ QString GerritChange::filterString() const QStringList GerritChange::gitFetchArguments(const GerritServer &server) const { - return { "fetch", server.url() + '/' + project, currentPatchSet.ref }; + return {"fetch", server.url() + '/' + project, currentPatchSet.ref}; } QString GerritChange::fullTitle() const diff --git a/src/plugins/git/gerrit/gerritoptionspage.cpp b/src/plugins/git/gerrit/gerritoptionspage.cpp index 543e7522f4..8e714bdc82 100644 --- a/src/plugins/git/gerrit/gerritoptionspage.cpp +++ b/src/plugins/git/gerrit/gerritoptionspage.cpp @@ -93,7 +93,7 @@ GerritOptionsWidget::GerritOptionsWidget(QWidget *parent) formLayout->addRow(tr("&Host:"), m_hostLineEdit); formLayout->addRow(tr("&User:"), m_userLineEdit); m_sshChooser->setExpectedKind(Utils::PathChooser::ExistingCommand); - m_sshChooser->setCommandVersionArguments({ "-V" }); + m_sshChooser->setCommandVersionArguments({"-V"}); m_sshChooser->setHistoryCompleter("Git.SshCommand.History"); formLayout->addRow(tr("&ssh:"), m_sshChooser); m_portSpinBox->setMinimum(1); diff --git a/src/plugins/git/gerrit/gerritparameters.cpp b/src/plugins/git/gerrit/gerritparameters.cpp index df4b8557da..de545a33e0 100644 --- a/src/plugins/git/gerrit/gerritparameters.cpp +++ b/src/plugins/git/gerrit/gerritparameters.cpp @@ -91,7 +91,7 @@ void GerritParameters::setPortFlagBySshType() { bool isPlink = false; if (!ssh.isEmpty()) { - const QString version = Utils::PathChooser::toolVersion(ssh, { "-V" }); + const QString version = Utils::PathChooser::toolVersion(ssh, {"-V"}); isPlink = version.contains("plink", Qt::CaseInsensitive); } portFlag = QLatin1String(isPlink ? "-P" : defaultPortFlag); diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index cbd69fa762..2a44b2dcac 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -346,7 +346,7 @@ void GerritPlugin::push(const QString &topLevel) if (!options.isEmpty()) target += '%' + options.join(','); - GitPlugin::client()->push(topLevel, { dialog.selectedRemoteName(), target }); + GitPlugin::client()->push(topLevel, {dialog.selectedRemoteName(), target}); } // Open or raise the Gerrit dialog window. diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp index 8c1dac4290..d522bc1491 100644 --- a/src/plugins/git/gerrit/gerritpushdialog.cpp +++ b/src/plugins/git/gerrit/gerritpushdialog.cpp @@ -66,7 +66,7 @@ QString GerritPushDialog::determineRemoteBranch(const QString &localBranch) QString error; if (!GitPlugin::client()->synchronousBranchCmd( - m_workingDir, { "-r", "--contains", earliestCommit + '^' }, &output, &error)) { + m_workingDir, {"-r", "--contains", earliestCommit + '^'}, &output, &error)) { return QString(); } const QString head = "/HEAD"; @@ -99,7 +99,7 @@ void GerritPushDialog::initRemoteBranches() QString remotesPrefix("refs/remotes/"); if (!GitPlugin::client()->synchronousForEachRefCmd( - m_workingDir, { "--format=%(refname)\t%(committerdate:raw)", remotesPrefix }, &output)) { + m_workingDir, {"--format=%(refname)\t%(committerdate:raw)", remotesPrefix}, &output)) { return; } diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index b7b328d8e2..0ef6756103 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -207,7 +207,7 @@ QStringList BaseController::addHeadWhenCommandInProgress() const // instead of showing unsupported combined diff format. GitClient::CommandInProgress commandInProgress = GitPlugin::client()->checkCommandInProgress(m_directory); if (commandInProgress != GitClient::NoCommand) - return { HEAD }; + return {HEAD}; return QStringList(); } @@ -224,7 +224,7 @@ public: void RepositoryDiffController::reload() { - QStringList args = { "diff" }; + QStringList args = {"diff"}; args.append(addHeadWhenCommandInProgress()); runCommand(QList<QStringList>() << addConfigurationArguments(args)); } @@ -246,7 +246,7 @@ private: void FileDiffController::reload() { - QStringList args = { "diff" }; + QStringList args = {"diff"}; args.append(addHeadWhenCommandInProgress()); args << "--" << m_fileName; @@ -275,13 +275,13 @@ void FileListDiffController::reload() { QList<QStringList> argLists; if (!m_stagedFiles.isEmpty()) { - QStringList stagedArgs = { "diff", "--cached", "--" }; + QStringList stagedArgs = {"diff", "--cached", "--"}; stagedArgs << m_stagedFiles; argLists << addConfigurationArguments(stagedArgs); } if (!m_unstagedFiles.isEmpty()) { - QStringList unstagedArgs = { "diff" }; + QStringList unstagedArgs = {"diff"}; unstagedArgs << addHeadWhenCommandInProgress() << "--" << m_unstagedFiles; argLists << addConfigurationArguments(unstagedArgs); } @@ -308,7 +308,7 @@ private: void ProjectDiffController::reload() { - QStringList args = { "diff" }; + QStringList args = {"diff"}; args << addHeadWhenCommandInProgress() << "--" << m_projectPaths; runCommand(QList<QStringList>() << addConfigurationArguments(args)); } @@ -331,7 +331,7 @@ private: void BranchDiffController::reload() { - QStringList args = { "diff" }; + QStringList args = {"diff"}; args << addHeadWhenCommandInProgress() << m_branch; runCommand(QList<QStringList>() << addConfigurationArguments(args)); } @@ -358,7 +358,7 @@ private: void ShowController::reload() { - const QStringList args = { "show", "-s", noColorOption, decorateOption, showFormatC, m_id }; + const QStringList args = {"show", "-s", noColorOption, decorateOption, showFormatC, m_id}; m_state = GettingDescription; runCommand(QList<QStringList>() << args, GitPlugin::client()->encoding(m_directory, "i18n.commitEncoding")); } @@ -377,8 +377,8 @@ void ShowController::reloadFinished(bool success) QTC_ASSERT(m_state != Idle, return); if (m_state == GettingDescription && success) { - const QStringList args = { "show", "--format=format:", // omit header, already generated - noColorOption, decorateOption, m_id }; + const QStringList args = {"show", "--format=format:", // omit header, already generated + noColorOption, decorateOption, m_id}; m_state = GettingDiff; runCommand(QList<QStringList>() << addConfigurationArguments(args)); return; @@ -446,7 +446,7 @@ public: m_patienceButton->setVisible(diffButton->isChecked()); m_ignoreWSButton->setVisible(diffButton->isChecked()); QAction *firstParentButton = - addToggleButton({ "-m", "--first-parent" }, + addToggleButton({"-m", "--first-parent"}, tr("First Parent"), tr("Follow only the first parent on merge commits.")); mapSetting(firstParentButton, settings.boolPointer(GitSettings::firstParentKey)); @@ -631,7 +631,7 @@ QString GitClient::findGitDirForRepository(const QString &repositoryDir) const bool GitClient::managesFile(const QString &workingDirectory, const QString &fileName) const { - return vcsFullySynchronousExec(workingDirectory, { "ls-files", "--error-unmatch", fileName }).result + return vcsFullySynchronousExec(workingDirectory, {"ls-files", "--error-unmatch", fileName}).result == SynchronousProcessResponse::Finished; } @@ -699,7 +699,7 @@ void GitClient::stage(const QString &patch, bool revert) patchFile.write(patchData); patchFile.close(); - QStringList args = { "--cached" }; + QStringList args = {"--cached"}; if (revert) args << "--reverse"; QString errorMessage; @@ -767,7 +767,7 @@ void GitClient::diffProject(const QString &workingDirectory, const QString &proj workingDirectory, tr("Git Diff Project"), [this, workingDirectory, projectDirectory] (IDocument *doc) -> DiffEditorController* { - return new ProjectDiffController(doc, workingDirectory, { projectDirectory }); + return new ProjectDiffController(doc, workingDirectory, {projectDirectory}); }); } @@ -819,7 +819,7 @@ void GitClient::merge(const QString &workingDirectory, void GitClient::status(const QString &workingDirectory) { VcsOutputWindow::setRepository(workingDirectory); - VcsCommand *command = vcsExec(workingDirectory, { "status", "-u" }, nullptr, true); + VcsCommand *command = vcsExec(workingDirectory, {"status", "-u"}, nullptr, true); connect(command, &VcsCommand::finished, VcsOutputWindow::instance(), &VcsOutputWindow::clearRepository, Qt::QueuedConnection); } @@ -853,7 +853,7 @@ void GitClient::log(const QString &workingDirectory, const QString &fileName, editor->setFileLogAnnotateEnabled(enableAnnotationContextMenu); editor->setWorkingDirectory(workingDir); - QStringList arguments = { "log", noColorOption, decorateOption }; + QStringList arguments = {"log", noColorOption, decorateOption}; int logCount = settings().intValue(GitSettings::logCountKey); if (logCount > 0) arguments << "-n" << QString::number(logCount); @@ -874,7 +874,7 @@ void GitClient::reflog(const QString &workingDirectory) "reflogRepository", workingDirectory); editor->setWorkingDirectory(workingDirectory); - QStringList arguments = { "reflog", noColorOption, decorateOption }; + QStringList arguments = {"reflog", noColorOption, decorateOption}; int logCount = settings().intValue(GitSettings::logCountKey); if (logCount > 0) arguments << "-n" << QString::number(logCount); @@ -921,7 +921,7 @@ VcsBaseEditorWidget *GitClient::annotate( int lineNumber, const QStringList &extraOptions) { const Id editorId = Git::Constants::GIT_BLAME_EDITOR_ID; - const QString id = VcsBaseEditor::getTitleId(workingDir, { file }, revision); + const QString id = VcsBaseEditor::getTitleId(workingDir, {file}, revision); const QString title = tr("Git Blame \"%1\"").arg(id); const QString sourceFile = VcsBaseEditor::getSource(workingDir, file); @@ -942,7 +942,7 @@ VcsBaseEditorWidget *GitClient::annotate( } editor->setWorkingDirectory(workingDir); - QStringList arguments = { "blame", "--root" }; + QStringList arguments = {"blame", "--root"}; arguments << effectiveArgs << "--" << file; if (!revision.isEmpty()) arguments << revision; @@ -971,7 +971,7 @@ bool GitClient::synchronousCheckout(const QString &workingDirectory, QStringList GitClient::setupCheckoutArguments(const QString &workingDirectory, const QString &ref) { - QStringList arguments = { "checkout", ref }; + QStringList arguments = {"checkout", ref}; QStringList localBranches = synchronousRepositoryBranches(workingDirectory); if (localBranches.contains(ref)) @@ -996,7 +996,7 @@ QStringList GitClient::setupCheckoutArguments(const QString &workingDirectory, return arguments; QString output; - const QStringList forEachRefArgs = { "refs/remotes/", "--format=%(objectname) %(refname:short)" }; + const QStringList forEachRefArgs = {"refs/remotes/", "--format=%(objectname) %(refname:short)"}; if (!synchronousForEachRefCmd(workingDirectory, forEachRefArgs, &output)) return arguments; @@ -1033,7 +1033,7 @@ QStringList GitClient::setupCheckoutArguments(const QString &workingDirectory, void GitClient::reset(const QString &workingDirectory, const QString &argument, const QString &commit) { - QStringList arguments = { "reset", argument }; + QStringList arguments = {"reset", argument}; if (!commit.isEmpty()) arguments << commit; @@ -1055,13 +1055,13 @@ void GitClient::reset(const QString &workingDirectory, const QString &argument, void GitClient::addFile(const QString &workingDirectory, const QString &fileName) { - vcsExec(workingDirectory, { "add", fileName }); + vcsExec(workingDirectory, {"add", fileName}); } bool GitClient::synchronousLog(const QString &workingDirectory, const QStringList &arguments, QString *output, QString *errorMessageIn, unsigned flags) { - QStringList allArguments = { "log", noColorOption }; + QStringList allArguments = {"log", noColorOption}; allArguments.append(arguments); @@ -1080,7 +1080,7 @@ bool GitClient::synchronousLog(const QString &workingDirectory, const QStringLis bool GitClient::synchronousAdd(const QString &workingDirectory, const QStringList &files) { - return vcsFullySynchronousExec(workingDirectory, QStringList({ "add" }) + files).result + return vcsFullySynchronousExec(workingDirectory, QStringList({"add"}) + files).result == SynchronousProcessResponse::Finished; } @@ -1088,7 +1088,7 @@ bool GitClient::synchronousDelete(const QString &workingDirectory, bool force, const QStringList &files) { - QStringList arguments = { "rm" }; + QStringList arguments = {"rm"}; if (force) arguments << "--force"; arguments.append(files); @@ -1100,7 +1100,7 @@ bool GitClient::synchronousMove(const QString &workingDirectory, const QString &from, const QString &to) { - return vcsFullySynchronousExec(workingDirectory, { "mv", from, to }).result + return vcsFullySynchronousExec(workingDirectory, {"mv", from, to}).result == SynchronousProcessResponse::Finished; } @@ -1108,7 +1108,7 @@ bool GitClient::synchronousReset(const QString &workingDirectory, const QStringList &files, QString *errorMessage) { - QStringList arguments = { "reset" }; + QStringList arguments = {"reset"}; if (files.isEmpty()) arguments << "--hard"; else @@ -1137,7 +1137,7 @@ bool GitClient::synchronousReset(const QString &workingDirectory, // Initialize repository bool GitClient::synchronousInit(const QString &workingDirectory) { - const SynchronousProcessResponse resp = vcsFullySynchronousExec(workingDirectory, { "init" }); + const SynchronousProcessResponse resp = vcsFullySynchronousExec(workingDirectory, {"init"}); // '[Re]Initialized...' VcsOutputWindow::append(resp.stdOut()); if (resp.result == SynchronousProcessResponse::Finished) { @@ -1160,7 +1160,7 @@ bool GitClient::synchronousCheckoutFiles(const QString &workingDirectory, QStrin revision = HEAD; if (files.isEmpty()) files = QStringList("."); - QStringList arguments = { "checkout" }; + QStringList arguments = {"checkout"}; if (revertStaging) arguments << revision; arguments << "--" << files; @@ -1224,7 +1224,7 @@ static inline bool splitCommitParents(const QString &line, bool GitClient::synchronousRevListCmd(const QString &workingDirectory, const QStringList &extraArguments, QString *output, QString *errorMessage) const { - const QStringList arguments = QStringList({ "rev-list", noColorOption }) + extraArguments; + const QStringList arguments = QStringList({"rev-list", noColorOption}) + extraArguments; const SynchronousProcessResponse resp = vcsFullySynchronousExec( workingDirectory, arguments, silentFlags); if (resp.result != SynchronousProcessResponse::Finished) { @@ -1248,7 +1248,7 @@ bool GitClient::synchronousParentRevisions(const QString &workingDirectory, } QString outputText; QString errorText; - if (!synchronousRevListCmd(workingDirectory, { "--parents", "--max-count=1", revision }, + if (!synchronousRevListCmd(workingDirectory, {"--parents", "--max-count=1", revision}, &outputText, &errorText)) { *errorMessage = msgParentRevisionFailed(workingDirectory, revision, errorText); return false; @@ -1285,7 +1285,7 @@ QString GitClient::synchronousCurrentLocalBranch(const QString &workingDirectory { QString branch; const SynchronousProcessResponse resp = vcsFullySynchronousExec( - workingDirectory, { "symbolic-ref", HEAD }, silentFlags); + workingDirectory, {"symbolic-ref", HEAD}, silentFlags); if (resp.result == SynchronousProcessResponse::Finished) { branch = resp.stdOut().trimmed(); } else { @@ -1308,7 +1308,7 @@ QString GitClient::synchronousCurrentLocalBranch(const QString &workingDirectory bool GitClient::synchronousHeadRefs(const QString &workingDirectory, QStringList *output, QString *errorMessage) const { - const QStringList arguments = { "show-ref", "--head", "--abbrev=10", "--dereference" }; + const QStringList arguments = {"show-ref", "--head", "--abbrev=10", "--dereference"}; const SynchronousProcessResponse resp = vcsFullySynchronousExec( workingDirectory, arguments, silentFlags); if (resp.result != SynchronousProcessResponse::Finished) { @@ -1359,7 +1359,7 @@ QString GitClient::synchronousTopic(const QString &workingDirectory) const // No tag or remote branch - try git describe const SynchronousProcessResponse resp = - vcsFullySynchronousExec(workingDirectory, { "describe" }, VcsCommand::NoOutput); + vcsFullySynchronousExec(workingDirectory, {"describe"}, VcsCommand::NoOutput); if (resp.result == SynchronousProcessResponse::Finished) { const QString stdOut = resp.stdOut().trimmed(); if (!stdOut.isEmpty()) @@ -1371,7 +1371,7 @@ QString GitClient::synchronousTopic(const QString &workingDirectory) const bool GitClient::synchronousRevParseCmd(const QString &workingDirectory, const QString &ref, QString *output, QString *errorMessage) const { - const QStringList arguments = { "rev-parse", ref }; + const QStringList arguments = {"rev-parse", ref}; const SynchronousProcessResponse resp = vcsFullySynchronousExec( workingDirectory, arguments, silentFlags); *output = resp.stdOut().trimmed(); @@ -1397,7 +1397,7 @@ void GitClient::synchronousTagsForCommit(const QString &workingDirectory, const QString &precedes, QString &follows) const { const SynchronousProcessResponse resp1 = vcsFullySynchronousExec( - workingDirectory, { "describe", "--contains", revision }, silentFlags); + workingDirectory, {"describe", "--contains", revision}, silentFlags); precedes = resp1.stdOut(); int tilde = precedes.indexOf('~'); if (tilde != -1) @@ -1410,7 +1410,7 @@ void GitClient::synchronousTagsForCommit(const QString &workingDirectory, const synchronousParentRevisions(workingDirectory, revision, &parents, &errorMessage); for (const QString &p : Utils::asConst(parents)) { const SynchronousProcessResponse resp2 = vcsFullySynchronousExec( - workingDirectory, { "describe", "--tags", "--abbrev=0", p }, silentFlags); + workingDirectory, {"describe", "--tags", "--abbrev=0", p}, silentFlags); QString pf = resp2.stdOut(); pf.truncate(pf.lastIndexOf('\n')); if (!pf.isEmpty()) { @@ -1426,7 +1426,7 @@ void GitClient::branchesForCommit(const QString &revision) auto controller = qobject_cast<DiffEditorController *>(sender()); QString workingDirectory = controller->baseDirectory(); VcsCommand *command = vcsExec( - workingDirectory, { "branch", noColorOption, "-a", "--contains", revision}, nullptr, + workingDirectory, {"branch", noColorOption, "-a", "--contains", revision}, nullptr, false, 0, workingDirectory); connect(command, &VcsCommand::stdOutText, controller, &DiffEditorController::informationForCommitReceived); @@ -1435,13 +1435,13 @@ void GitClient::branchesForCommit(const QString &revision) bool GitClient::isRemoteCommit(const QString &workingDirectory, const QString &commit) { return !vcsFullySynchronousExec( - workingDirectory, { "branch", "-r", "--contains", commit }, silentFlags).rawStdOut.isEmpty(); + workingDirectory, {"branch", "-r", "--contains", commit}, silentFlags).rawStdOut.isEmpty(); } bool GitClient::isFastForwardMerge(const QString &workingDirectory, const QString &branch) { const SynchronousProcessResponse resp = vcsFullySynchronousExec( - workingDirectory, { "merge-base", HEAD, branch }, silentFlags); + workingDirectory, {"merge-base", HEAD, branch}, silentFlags); return resp.stdOut().trimmed() == synchronousTopRevision(workingDirectory); } @@ -1449,8 +1449,8 @@ bool GitClient::isFastForwardMerge(const QString &workingDirectory, const QStrin QString GitClient::synchronousShortDescription(const QString &workingDirectory, const QString &revision, const QString &format) const { - const QStringList arguments = { "log", noColorOption, ("--pretty=format:" + format), - "--max-count=1", revision }; + const QStringList arguments = {"log", noColorOption, ("--pretty=format:" + format), + "--max-count=1", revision}; const SynchronousProcessResponse resp = vcsFullySynchronousExec( workingDirectory, arguments, silentFlags); if (resp.result != SynchronousProcessResponse::Finished) { @@ -1524,7 +1524,7 @@ bool GitClient::executeSynchronousStash(const QString &workingDirectory, bool unstagedOnly, QString *errorMessage) const { - QStringList arguments = { "stash", "save" }; + QStringList arguments = {"stash", "save"}; if (unstagedOnly) arguments << "--keep-index"; if (!message.isEmpty()) @@ -1638,7 +1638,7 @@ QMap<QString,QString> GitClient::synchronousRemotesList(const QString &workingDi QString output; QString error; - if (!synchronousRemoteCmd(workingDirectory, { "-v" }, &output, &error, true)) { + if (!synchronousRemoteCmd(workingDirectory, {"-v"}, &output, &error, true)) { msgCannotRun(error, errorMessage); return result; } @@ -1662,7 +1662,7 @@ QStringList GitClient::synchronousSubmoduleStatus(const QString &workingDirector { // get submodule status const SynchronousProcessResponse resp = - vcsFullySynchronousExec(workingDirectory, { "submodule", "status" }, silentFlags); + vcsFullySynchronousExec(workingDirectory, {"submodule", "status"}, silentFlags); if (resp.result != SynchronousProcessResponse::Finished) { msgCannotRun(tr("Cannot retrieve submodule status of \"%1\": %2") @@ -1741,7 +1741,7 @@ bool GitClient::synchronousShow(const QString &workingDirectory, const QString & *errorMessage = msgCannotShow(id); return false; } - const QStringList arguments = { "show", decorateOption, noColorOption, id }; + const QStringList arguments = {"show", decorateOption, noColorOption, id}; const SynchronousProcessResponse resp = vcsFullySynchronousExec(workingDirectory, arguments); if (resp.result != SynchronousProcessResponse::Finished) { msgCannotRun(arguments, workingDirectory, resp.stdErr(), errorMessage); @@ -1756,7 +1756,7 @@ bool GitClient::cleanList(const QString &workingDirectory, const QString &module const QString &flag, QStringList *files, QString *errorMessage) { const QString directory = workingDirectory + '/' + modulePath; - const QStringList arguments = { "clean", "--dry-run", flag }; + const QStringList arguments = {"clean", "--dry-run", flag}; const SynchronousProcessResponse resp = vcsFullySynchronousExec(directory, arguments); if (resp.result != SynchronousProcessResponse::Finished) { @@ -1801,7 +1801,7 @@ bool GitClient::synchronousApplyPatch(const QString &workingDirectory, const QString &file, QString *errorMessage, const QStringList &extraArguments) { - QStringList arguments = { "apply", "--whitespace=fix" }; + QStringList arguments = {"apply", "--whitespace=fix"}; arguments << extraArguments << file; const SynchronousProcessResponse resp = vcsFullySynchronousExec(workingDirectory, arguments); @@ -1913,7 +1913,7 @@ void GitClient::updateSubmodulesIfNeeded(const QString &workingDirectory, bool p } } - VcsCommand *cmd = vcsExec(workingDirectory, { "submodule", "update" }, nullptr, true, + VcsCommand *cmd = vcsExec(workingDirectory, {"submodule", "update"}, nullptr, true, VcsCommand::ExpectRepoChanges); connect(cmd, &VcsCommand::finished, this, &GitClient::finishSubmoduleUpdate); } @@ -1929,7 +1929,7 @@ GitClient::StatusResult GitClient::gitStatus(const QString &workingDirectory, St QString *output, QString *errorMessage) const { // Run 'status'. Note that git returns exitcode 1 if there are no added files. - QStringList arguments = { "status" }; + QStringList arguments = {"status"}; if (mode & NoUntracked) arguments << "--untracked-files=no"; else @@ -2107,7 +2107,7 @@ QStringList GitClient::synchronousRepositoryBranches(const QString &repositoryUR | VcsCommand::SuppressStdErr | VcsCommand::SuppressFailMessage; const SynchronousProcessResponse resp = vcsSynchronousExec( - workingDirectory, { "ls-remote", repositoryURL, HEAD, "refs/heads/*" }, flags); + workingDirectory, {"ls-remote", repositoryURL, HEAD, "refs/heads/*"}, flags); QStringList branches; branches << tr("<Detached HEAD>"); QString headSha; @@ -2177,7 +2177,7 @@ void GitClient::launchRepositoryBrowser(const QString &workingDirectory) { const QString repBrowserBinary = settings().stringValue(GitSettings::repositoryBrowserCmd); if (!repBrowserBinary.isEmpty()) - QProcess::startDetached(repBrowserBinary, { workingDirectory }, workingDirectory); + QProcess::startDetached(repBrowserBinary, {workingDirectory}, workingDirectory); } bool GitClient::tryLauchingGitK(const QProcessEnvironment &env, @@ -2228,7 +2228,7 @@ bool GitClient::launchGitGui(const QString &workingDirectory) { if (gitBinary.isEmpty()) { success = false; } else { - success = QProcess::startDetached(gitBinary.toString(), { "gui" }, + success = QProcess::startDetached(gitBinary.toString(), {"gui"}, workingDirectory); } @@ -2289,7 +2289,7 @@ bool GitClient::readDataFromCommit(const QString &repoDirectory, const QString & QString *commitTemplate) { // Get commit data as "SHA1<lf>author<lf>email<lf>message". - const QStringList arguments = { "log", "--max-count=1", "--pretty=format:%h\n%an\n%ae\n%B", commit }; + const QStringList arguments = {"log", "--max-count=1", "--pretty=format:%h\n%an\n%ae\n%B", commit}; const SynchronousProcessResponse resp = vcsFullySynchronousExec(repoDirectory, arguments, silentFlags); if (resp.result != SynchronousProcessResponse::Finished) { @@ -2337,7 +2337,7 @@ bool GitClient::getCommitData(const QString &workingDirectory, // Run status. Note that it has exitcode 1 if there are no added files. QString output; if (commitData.commitType == FixupCommit) { - synchronousLog(repoDirectory, { HEAD, "--not", "--remotes", "-n1" }, &output, errorMessage); + synchronousLog(repoDirectory, {HEAD, "--not", "--remotes", "-n1"}, &output, errorMessage); if (output.isEmpty()) { *errorMessage = msgNoCommits(false); return false; @@ -2529,7 +2529,7 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory, return false; // Do the final commit - QStringList arguments = { "commit" }; + QStringList arguments = {"commit"}; if (commitType == FixupCommit) { arguments << "--fixup" << amendSHA1; } else { @@ -2668,7 +2668,7 @@ void GitClient::revert(const QStringList &files, bool revertStaging) void GitClient::fetch(const QString &workingDirectory, const QString &remote) { - QStringList const arguments = { "fetch", (remote.isEmpty() ? "--all" : remote) }; + QStringList const arguments = {"fetch", (remote.isEmpty() ? "--all" : remote)}; VcsCommand *command = vcsExec(workingDirectory, arguments, nullptr, true, VcsCommand::ShowSuccessMessage); connect(command, &VcsCommand::success, @@ -2693,7 +2693,7 @@ bool GitClient::executeAndHandleConflicts(const QString &workingDirectory, bool GitClient::synchronousPull(const QString &workingDirectory, bool rebase) { QString abortCommand; - QStringList arguments = { "pull" }; + QStringList arguments = {"pull"}; if (rebase) { arguments << "--rebase"; abortCommand = "rebase"; @@ -2720,7 +2720,7 @@ void GitClient::synchronousAbortCommand(const QString &workingDir, const QString } const SynchronousProcessResponse resp = vcsFullySynchronousExec( - workingDir, { abortCommand, "--abort" }, + workingDir, {abortCommand, "--abort"}, VcsCommand::ExpectRepoChanges | VcsCommand::ShowSuccessMessage); VcsOutputWindow::append(resp.stdOut()); } @@ -2746,7 +2746,7 @@ bool GitClient::synchronousSetTrackingBranch(const QString &workingDirectory, const QString &branch, const QString &tracking) { return vcsFullySynchronousExec( - workingDirectory, { "branch", "--set-upstream-to=" + tracking, branch }).result + workingDirectory, {"branch", "--set-upstream-to=" + tracking, branch}).result == SynchronousProcessResponse::Finished; } @@ -2787,7 +2787,7 @@ void GitClient::handleMergeConflicts(const QString &workingDir, const QString &c if (mergeOrAbort.clickedButton() == mergeToolButton) merge(workingDir); else if (!abortCommand.isEmpty()) - executeAndHandleConflicts(workingDir, { abortCommand, "--skip" }, abortCommand); + executeAndHandleConflicts(workingDir, {abortCommand, "--skip"}, abortCommand); } } @@ -2803,12 +2803,12 @@ void GitClient::synchronousSubversionFetch(const QString &workingDirectory) const unsigned flags = VcsCommand::SshPasswordPrompt | VcsCommand::ShowStdOut | VcsCommand::ShowSuccessMessage; - vcsSynchronousExec(workingDirectory, { "svn", "fetch" }, flags); + vcsSynchronousExec(workingDirectory, {"svn", "fetch"}, flags); } void GitClient::subversionLog(const QString &workingDirectory) { - QStringList arguments = { "svn", "log" }; + QStringList arguments = {"svn", "log"}; int logCount = settings().intValue(GitSettings::logCountKey); if (logCount > 0) arguments << ("--limit=" + QString::number(logCount)); @@ -2825,14 +2825,14 @@ void GitClient::subversionLog(const QString &workingDirectory) void GitClient::push(const QString &workingDirectory, const QStringList &pushArgs) { - vcsExec(workingDirectory, QStringList({ "push" }) + pushArgs, nullptr, true); + vcsExec(workingDirectory, QStringList({"push"}) + pushArgs, nullptr, true); } bool GitClient::synchronousMerge(const QString &workingDirectory, const QString &branch, bool allowFastForward) { QString command = "merge"; - QStringList arguments = { command }; + QStringList arguments = {command}; if (!allowFastForward) arguments << "--no-ff"; arguments << branch; @@ -2854,18 +2854,18 @@ bool GitClient::canRebase(const QString &workingDirectory) const void GitClient::rebase(const QString &workingDirectory, const QString &argument) { - VcsCommand *command = vcsExecAbortable(workingDirectory, { "rebase", argument }); + VcsCommand *command = vcsExecAbortable(workingDirectory, {"rebase", argument}); GitProgressParser::attachToCommand(command); } void GitClient::cherryPick(const QString &workingDirectory, const QString &argument) { - vcsExecAbortable(workingDirectory, { "cherry-pick", argument }); + vcsExecAbortable(workingDirectory, {"cherry-pick", argument}); } void GitClient::revert(const QString &workingDirectory, const QString &argument) { - vcsExecAbortable(workingDirectory, { "revert", argument }); + vcsExecAbortable(workingDirectory, {"revert", argument}); } // Executes a command asynchronously. Work tree is expected to be clean. @@ -2893,7 +2893,7 @@ bool GitClient::synchronousRevert(const QString &workingDirectory, const QString // Do not stash if --continue or --abort is given as the commit if (!commit.startsWith('-') && !beginStashScope(workingDirectory, command)) return false; - return executeAndHandleConflicts(workingDirectory, { command, "--no-edit", commit }, command); + return executeAndHandleConflicts(workingDirectory, {command, "--no-edit", commit}, command); } bool GitClient::synchronousCherryPick(const QString &workingDirectory, const QString &commit) @@ -2904,7 +2904,7 @@ bool GitClient::synchronousCherryPick(const QString &workingDirectory, const QSt if (isRealCommit && !beginStashScope(workingDirectory, command)) return false; - QStringList arguments = { command }; + QStringList arguments = {command}; if (isRealCommit && isRemoteCommit(workingDirectory, commit)) arguments << "-x"; arguments << commit; @@ -2914,7 +2914,7 @@ bool GitClient::synchronousCherryPick(const QString &workingDirectory, const QSt void GitClient::interactiveRebase(const QString &workingDirectory, const QString &commit, bool fixup) { - QStringList arguments = { "rebase", "-i" }; + QStringList arguments = {"rebase", "-i"}; if (fixup) arguments << "--autosquash"; arguments << commit + '^'; @@ -2938,7 +2938,7 @@ QString GitClient::msgNoCommits(bool includeRemote) void GitClient::stashPop(const QString &workingDirectory, const QString &stash) { - QStringList arguments = { "stash", "pop" }; + QStringList arguments = {"stash", "pop"}; if (!stash.isEmpty()) arguments << stash; VcsCommand *cmd = vcsExec(workingDirectory, arguments, nullptr, true, VcsCommand::ExpectRepoChanges); @@ -2950,7 +2950,7 @@ bool GitClient::synchronousStashRestore(const QString &workingDirectory, bool pop, const QString &branch /* = QString()*/) const { - QStringList arguments = { "stash" }; + QStringList arguments = {"stash"}; if (branch.isEmpty()) arguments << QLatin1String(pop ? "pop" : "apply") << stash; else @@ -2961,7 +2961,7 @@ bool GitClient::synchronousStashRestore(const QString &workingDirectory, bool GitClient::synchronousStashRemove(const QString &workingDirectory, const QString &stash, QString *errorMessage) const { - QStringList arguments = { "stash" }; + QStringList arguments = {"stash"}; if (stash.isEmpty()) arguments << "clear"; else @@ -2984,7 +2984,7 @@ bool GitClient::synchronousStashList(const QString &workingDirectory, QList<Stas { stashes->clear(); - const QStringList arguments = { "stash", "list", noColorOption }; + const QStringList arguments = {"stash", "list", noColorOption}; const SynchronousProcessResponse resp = vcsFullySynchronousExec(workingDirectory, arguments); if (resp.result != SynchronousProcessResponse::Finished) { msgCannotRun(arguments, workingDirectory, resp.stdErr(), errorMessage); @@ -3002,18 +3002,18 @@ bool GitClient::synchronousStashList(const QString &workingDirectory, QList<Stas // Read a single-line config value, return trimmed QString GitClient::readConfigValue(const QString &workingDirectory, const QString &configVar) const { - return readOneLine(workingDirectory, { "config", configVar }); + return readOneLine(workingDirectory, {"config", configVar}); } void GitClient::setConfigValue(const QString &workingDirectory, const QString &configVar, const QString &value) const { - readOneLine(workingDirectory, { "config", configVar, value }); + readOneLine(workingDirectory, {"config", configVar, value}); } QString GitClient::readGitVar(const QString &workingDirectory, const QString &configVar) const { - return readOneLine(workingDirectory, { "var", configVar }); + return readOneLine(workingDirectory, {"var", configVar}); } QString GitClient::readOneLine(const QString &workingDirectory, const QStringList &arguments) const @@ -3052,7 +3052,7 @@ unsigned GitClient::synchronousGitVersion(QString *errorMessage) const // run git --version const SynchronousProcessResponse resp = vcsSynchronousExec( - QString(), { "--version" }, silentFlags); + QString(), {"--version"}, silentFlags); if (resp.result != SynchronousProcessResponse::Finished) { msgCannotRun(tr("Cannot determine Git version: %1").arg(resp.stdErr()), errorMessage); return 0; diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp index 6488fd4568..2e6746cf64 100644 --- a/src/plugins/git/giteditor.cpp +++ b/src/plugins/git/giteditor.cpp @@ -213,7 +213,7 @@ void GitEditorWidget::revertChange() void GitEditorWidget::logChange() { GitPlugin::client()->log( - sourceWorkingDirectory(), QString(), false, { m_currentChange }); + sourceWorkingDirectory(), QString(), false, {m_currentChange}); } void GitEditorWidget::applyDiffChunk(const DiffChunk& chunk, bool revert) @@ -227,7 +227,7 @@ void GitEditorWidget::applyDiffChunk(const DiffChunk& chunk, bool revert) patchFile.write(chunk.chunk); patchFile.close(); - QStringList args = { "--cached" }; + QStringList args = {"--cached"}; if (revert) args << "--reverse"; QString errorMessage; diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 1987b80bb3..c542fddf6a 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -743,7 +743,7 @@ void GitPlugin::undoFileChanges(bool revertStaging) const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return); FileChangeBlocker fcb(state.currentFile()); - m_gitClient->revert({ state.currentFile() }, revertStaging); + m_gitClient->revert({state.currentFile()}, revertStaging); } class ResetItemDelegate : public LogItemDelegate @@ -858,7 +858,7 @@ void GitPlugin::unstageFile() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return); - m_gitClient->synchronousReset(state.currentFileTopLevel(), { state.relativeCurrentFile() }); + m_gitClient->synchronousReset(state.currentFileTopLevel(), {state.relativeCurrentFile()}); } void GitPlugin::gitkForCurrentFile() diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp index 564c32d3b9..aa6069e2f7 100644 --- a/src/plugins/git/gitversioncontrol.cpp +++ b/src/plugins/git/gitversioncontrol.cpp @@ -113,13 +113,13 @@ bool GitVersionControl::vcsOpen(const QString & /*fileName*/) bool GitVersionControl::vcsAdd(const QString & fileName) { const QFileInfo fi(fileName); - return m_client->synchronousAdd(fi.absolutePath(), { fi.fileName() }); + return m_client->synchronousAdd(fi.absolutePath(), {fi.fileName()}); } bool GitVersionControl::vcsDelete(const QString & fileName) { const QFileInfo fi(fileName); - return m_client->synchronousDelete(fi.absolutePath(), true, { fi.fileName() }); + return m_client->synchronousDelete(fi.absolutePath(), true, {fi.fileName()}); } bool GitVersionControl::vcsMove(const QString &from, const QString &to) @@ -148,7 +148,7 @@ Core::ShellCommand *GitVersionControl::createInitialCheckoutCommand(const QStrin const QString &localName, const QStringList &extraArgs) { - QStringList args = { "clone", "--progress" }; + QStringList args = {"clone", "--progress"}; args << extraArgs << url << localName; auto command = new VcsBase::VcsCommand(baseDirectory.toString(), m_client->processEnvironment()); diff --git a/src/plugins/git/remotedialog.cpp b/src/plugins/git/remotedialog.cpp index 73e373162a..38a6cadb76 100644 --- a/src/plugins/git/remotedialog.cpp +++ b/src/plugins/git/remotedialog.cpp @@ -164,7 +164,7 @@ void RemoteDialog::pushToRemote() const int row = indexList.at(0).row(); const QString remoteName = m_remoteModel->remoteName(row); - GitPlugin::client()->push(m_remoteModel->workingDirectory(), { remoteName }); + GitPlugin::client()->push(m_remoteModel->workingDirectory(), {remoteName}); } void RemoteDialog::fetchFromRemote() diff --git a/src/plugins/git/remotemodel.cpp b/src/plugins/git/remotemodel.cpp index f5451589ba..2ba274f983 100644 --- a/src/plugins/git/remotemodel.cpp +++ b/src/plugins/git/remotemodel.cpp @@ -49,7 +49,7 @@ bool RemoteModel::removeRemote(int row) QString output; QString error; bool success = GitPlugin::client()->synchronousRemoteCmd( - m_workingDirectory, { "rm", remoteName(row) }, &output, &error); + m_workingDirectory, {"rm", remoteName(row)}, &output, &error); if (success) success = refresh(m_workingDirectory, &error); return success; @@ -63,7 +63,7 @@ bool RemoteModel::addRemote(const QString &name, const QString &url) return false; bool success = GitPlugin::client()->synchronousRemoteCmd( - m_workingDirectory, { "add", name, url }, &output, &error); + m_workingDirectory, {"add", name, url}, &output, &error); if (success) success = refresh(m_workingDirectory, &error); return success; @@ -74,7 +74,7 @@ bool RemoteModel::renameRemote(const QString &oldName, const QString &newName) QString output; QString error; bool success = GitPlugin::client()->synchronousRemoteCmd( - m_workingDirectory, { "rename", oldName, newName }, &output, &error); + m_workingDirectory, {"rename", oldName, newName}, &output, &error); if (success) success = refresh(m_workingDirectory, &error); return success; @@ -85,7 +85,7 @@ bool RemoteModel::updateUrl(const QString &name, const QString &newUrl) QString output; QString error; bool success = GitPlugin::client()->synchronousRemoteCmd( - m_workingDirectory, { "set-url", name, newUrl }, &output, &error); + m_workingDirectory, {"set-url", name, newUrl}, &output, &error); if (success) success = refresh(m_workingDirectory, &error); return success; diff --git a/src/plugins/help/helpviewer.cpp b/src/plugins/help/helpviewer.cpp index 41af34df19..3549d9ad20 100644 --- a/src/plugins/help/helpviewer.cpp +++ b/src/plugins/help/helpviewer.cpp @@ -47,37 +47,37 @@ struct ExtensionMap { const char *extension; const char *mimeType; } extensionMap[] = { - { ".bmp", "image/bmp" }, - { ".css", "text/css" }, - { ".gif", "image/gif" }, - { ".html", "text/html" }, - { ".htm", "text/html" }, - { ".ico", "image/x-icon" }, - { ".jpeg", "image/jpeg" }, - { ".jpg", "image/jpeg" }, - { ".js", "application/x-javascript" }, - { ".mng", "video/x-mng" }, - { ".pbm", "image/x-portable-bitmap" }, - { ".pgm", "image/x-portable-graymap" }, - { ".pdf", "application/pdf" }, - { ".png", "image/png" }, - { ".ppm", "image/x-portable-pixmap" }, - { ".rss", "application/rss+xml" }, - { ".svg", "image/svg+xml" }, - { ".svgz", "image/svg+xml" }, - { ".text", "text/plain" }, - { ".tif", "image/tiff" }, - { ".tiff", "image/tiff" }, - { ".txt", "text/plain" }, - { ".xbm", "image/x-xbitmap" }, - { ".xml", "text/xml" }, - { ".xpm", "image/x-xpm" }, - { ".xsl", "text/xsl" }, - { ".xhtml", "application/xhtml+xml" }, - { ".wml", "text/vnd.wap.wml" }, - { ".wmlc", "application/vnd.wap.wmlc" }, - { "about:blank", 0 }, - { 0, 0 } + {".bmp", "image/bmp"}, + {".css", "text/css"}, + {".gif", "image/gif"}, + {".html", "text/html"}, + {".htm", "text/html"}, + {".ico", "image/x-icon"}, + {".jpeg", "image/jpeg"}, + {".jpg", "image/jpeg"}, + {".js", "application/x-javascript"}, + {".mng", "video/x-mng"}, + {".pbm", "image/x-portable-bitmap"}, + {".pgm", "image/x-portable-graymap"}, + {".pdf", "application/pdf"}, + {".png", "image/png"}, + {".ppm", "image/x-portable-pixmap"}, + {".rss", "application/rss+xml"}, + {".svg", "image/svg+xml"}, + {".svgz", "image/svg+xml"}, + {".text", "text/plain"}, + {".tif", "image/tiff"}, + {".tiff", "image/tiff"}, + {".txt", "text/plain"}, + {".xbm", "image/x-xbitmap"}, + {".xml", "text/xml"}, + {".xpm", "image/x-xpm"}, + {".xsl", "text/xsl"}, + {".xhtml", "application/xhtml+xml"}, + {".wml", "text/vnd.wap.wml"}, + {".wmlc", "application/vnd.wap.wmlc"}, + {"about:blank", 0}, + {0, 0} }; HelpViewer::HelpViewer(QWidget *parent) diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp index e59df475da..881ae11a0d 100644 --- a/src/plugins/ios/iosbuildstep.cpp +++ b/src/plugins/ios/iosbuildstep.cpp @@ -359,9 +359,9 @@ QList<BuildStepInfo> IosBuildStepFactory::availableSteps(BuildStepList *parent) && parent->id() != ProjectExplorer::Constants::BUILDSTEPS_BUILD) return {}; - return {{ IOS_BUILD_STEP_ID, - QCoreApplication::translate("GenericProjectManager::Internal::IosBuildStep", - IOS_BUILD_STEP_DISPLAY_NAME) }}; + return {{IOS_BUILD_STEP_ID, + QCoreApplication::translate("GenericProjectManager::Internal::IosBuildStep", + IOS_BUILD_STEP_DISPLAY_NAME)}}; } } // namespace Internal diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index 95f33e7574..19f6f39d63 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -430,7 +430,7 @@ static ClangToolChain *createToolChain(const Platform &platform, Core::Id l) QSet<Core::Id> IosToolChainFactory::supportedLanguages() const { - return { ProjectExplorer::Constants::CXX_LANGUAGE_ID }; + return {ProjectExplorer::Constants::CXX_LANGUAGE_ID}; } QList<ToolChain *> IosToolChainFactory::autoDetect(const QList<ToolChain *> &existingToolChains) diff --git a/src/plugins/ios/iosdeploystepfactory.cpp b/src/plugins/ios/iosdeploystepfactory.cpp index b2bc8b4a83..8c8d4cc332 100644 --- a/src/plugins/ios/iosdeploystepfactory.cpp +++ b/src/plugins/ios/iosdeploystepfactory.cpp @@ -51,7 +51,7 @@ QList<BuildStepInfo> IosDeployStepFactory::availableSteps(BuildStepList *parent) if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_DEPLOY && IosManager::supportsIos(parent->target()) && !parent->contains(IosDeployStep::Id)) - return {{ IosDeployStep::Id, tr("Deploy to iOS device or emulator") }}; + return {{IosDeployStep::Id, tr("Deploy to iOS device or emulator")}}; return {}; } diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp index c5b29a0b16..4810521524 100644 --- a/src/plugins/ios/iosdsymbuildstep.cpp +++ b/src/plugins/ios/iosdsymbuildstep.cpp @@ -369,7 +369,7 @@ QList<BuildStepInfo> IosDsymBuildStepFactory::availableSteps(BuildStepList *pare if (deviceType != Constants::IOS_DEVICE_TYPE && deviceType != Constants::IOS_SIMULATOR_TYPE) return {}; - return {{ Constants::IOS_DSYM_BUILD_STEP_ID, "dsymutil" }}; + return {{Constants::IOS_DSYM_BUILD_STEP_ID, "dsymutil"}}; } IosPresetBuildStep *IosDsymBuildStepFactory::createPresetStep(BuildStepList *parent, const Id id) const @@ -391,7 +391,7 @@ QStringList IosDsymBuildStep::defaultCleanCmdList() const QString dsymPath = runConf->bundleDirectory().toUserOutput(); dsymPath.chop(4); dsymPath.append(QLatin1String(".dSYM")); - return QStringList({ "rm", "-rf", dsymPath }); + return QStringList({"rm", "-rf", dsymPath}); } QStringList IosDsymBuildStep::defaultCmdList() const @@ -407,7 +407,7 @@ QStringList IosDsymBuildStep::defaultCmdList() const QString dsymPath = runConf->bundleDirectory().toUserOutput(); dsymPath.chop(4); dsymPath.append(QLatin1String(".dSYM")); - return QStringList({ dsymutilCmd, "-o", dsymPath, runConf->localExecutable().toUserOutput() }); + return QStringList({dsymutilCmd, "-o", dsymPath, runConf->localExecutable().toUserOutput()}); } diff --git a/src/plugins/ios/iosqtversion.cpp b/src/plugins/ios/iosqtversion.cpp index fe64fb0b7b..e6e462f534 100644 --- a/src/plugins/ios/iosqtversion.cpp +++ b/src/plugins/ios/iosqtversion.cpp @@ -117,5 +117,5 @@ QSet<Core::Id> IosQtVersion::availableFeatures() const QSet<Core::Id> IosQtVersion::targetDeviceTypes() const { // iOS Qt version supports ios devices as well as simulator. - return { Constants::IOS_DEVICE_TYPE, Constants::IOS_SIMULATOR_TYPE }; + return {Constants::IOS_DEVICE_TYPE, Constants::IOS_SIMULATOR_TYPE}; } diff --git a/src/plugins/ios/iosrunfactories.cpp b/src/plugins/ios/iosrunfactories.cpp index daa363b9f6..8b0485899a 100644 --- a/src/plugins/ios/iosrunfactories.cpp +++ b/src/plugins/ios/iosrunfactories.cpp @@ -99,9 +99,9 @@ QList<Core::Id> IosRunConfigurationFactory::availableCreationIds(Target *parent, return QList<Core::Id>(); QmakeProject *project = static_cast<QmakeProject *>(parent->project()); - QList<QmakeProFile *> files = project->allProFiles({ ProjectType::ApplicationTemplate, - ProjectType::SharedLibraryTemplate, - ProjectType::AuxTemplate }); + QList<QmakeProFile *> files = project->allProFiles({ProjectType::ApplicationTemplate, + ProjectType::SharedLibraryTemplate, + ProjectType::AuxTemplate}); if (mode == AutoCreate) files = QmakeProject::proFilesWithQtcRunnable(files); Core::Id baseId(IOS_RC_ID_PREFIX); diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp index 905a3b66f0..5330d5ce67 100644 --- a/src/plugins/ios/iostoolhandler.cpp +++ b/src/plugins/ios/iostoolhandler.cpp @@ -101,7 +101,7 @@ public: if (!fi.isCanceled()) emit logMessage(QString::fromLocal8Bit(tailProcess->readAll())); }); - tailProcess->start(QStringLiteral("tail"), { "-f", file->fileName() }); + tailProcess->start(QStringLiteral("tail"), {"-f", file->fileName()}); }; auto processDeleter = [](QProcess *process) { @@ -479,7 +479,7 @@ void IosDeviceToolHandlerPrivate::processXml() stack.append(ParserState(ParserState::AppOutput)); } else if (elName == QLatin1String("control_char")) { QXmlStreamAttributes attributes = outputParser.attributes(); - QChar c[1] = { QChar::fromLatin1(static_cast<char>(attributes.value(QLatin1String("code")).toString().toInt())) }; + QChar c[1] = {QChar::fromLatin1(static_cast<char>(attributes.value(QLatin1String("code")).toString().toInt()))}; if (stack.size() > 0 && stack.last().collectChars()) stack.last().chars.append(c[0]); stack.append(ParserState(ParserState::ControlChar)); diff --git a/src/plugins/ios/simulatorcontrol.cpp b/src/plugins/ios/simulatorcontrol.cpp index 399a3781df..2f63892025 100644 --- a/src/plugins/ios/simulatorcontrol.cpp +++ b/src/plugins/ios/simulatorcontrol.cpp @@ -518,9 +518,9 @@ void SimulatorControlPrivate::createSimulator(QFutureInterface<SimulatorControl: { SimulatorControl::ResponseData response("Invalid"); if (!name.isEmpty()) { - response.success = runSimCtlCommand({ QStringLiteral("create"), name, - deviceType.identifier, - runtime.identifier }, + response.success = runSimCtlCommand({QStringLiteral("create"), name, + deviceType.identifier, + runtime.identifier}, &response.commandOutput); response.simUdid = response.success ? QString::fromLatin1(response.commandOutput.trimmed()) : QString(); @@ -534,8 +534,8 @@ void SimulatorControlPrivate::takeSceenshot(QFutureInterface<SimulatorControl::R const QString &simUdid, const QString &filePath) { SimulatorControl::ResponseData response(simUdid); - response.success = runSimCtlCommand({ QStringLiteral("io"), simUdid, QStringLiteral("screenshot"), - filePath }, + response.success = runSimCtlCommand({QStringLiteral("io"), simUdid, QStringLiteral("screenshot"), + filePath}, &response.commandOutput); if (!fi.isCanceled()) fi.reportResult(response); diff --git a/src/plugins/nim/editor/nimindenter.cpp b/src/plugins/nim/editor/nimindenter.cpp index d08a0e35d0..8adf4a0730 100644 --- a/src/plugins/nim/editor/nimindenter.cpp +++ b/src/plugins/nim/editor/nimindenter.cpp @@ -83,7 +83,7 @@ void NimIndenter::indentBlock(QTextDocument *document, const QSet<QChar> &NimIndenter::electricCharacters() { - static QSet<QChar> result { QLatin1Char(':'), QLatin1Char('=') }; + static QSet<QChar> result{QLatin1Char(':'), QLatin1Char('=')}; return result; } diff --git a/src/plugins/nim/project/nimbuildconfigurationfactory.cpp b/src/plugins/nim/project/nimbuildconfigurationfactory.cpp index 34966392d8..2459ebd8cc 100644 --- a/src/plugins/nim/project/nimbuildconfigurationfactory.cpp +++ b/src/plugins/nim/project/nimbuildconfigurationfactory.cpp @@ -67,14 +67,14 @@ QList<BuildInfo *> NimBuildConfigurationFactory::availableBuilds(const Target *p info->displayName.clear(); // ask for a name info->buildDirectory.clear(); // This depends on the displayName - return { info }; + return {info}; } QList<BuildInfo *> NimBuildConfigurationFactory::availableSetups(const Kit *k, const QString &projectPath) const { BuildInfo *debug = createBuildInfo(k, projectPath, BuildConfiguration::Debug); BuildInfo *release = createBuildInfo(k, projectPath, BuildConfiguration::Release); - return { debug, release }; + return {debug, release}; } BuildConfiguration *NimBuildConfigurationFactory::create(Target *parent, const BuildInfo *info) const diff --git a/src/plugins/nim/project/nimcompilerbuildstep.cpp b/src/plugins/nim/project/nimcompilerbuildstep.cpp index b1634ca1df..232afc2950 100644 --- a/src/plugins/nim/project/nimcompilerbuildstep.cpp +++ b/src/plugins/nim/project/nimcompilerbuildstep.cpp @@ -323,20 +323,20 @@ void NimPlugin::testNimParser_data() << QString::fromLatin1("main.nim(23, 1) Error: undeclared identifier: 'x'") << OutputParserTester::STDERR << QString("") << QString("main.nim(23, 1) Error: undeclared identifier: 'x'\n") - << QList<Task>({ Task(Task::Error, - "Error: undeclared identifier: 'x'", - Utils::FileName::fromUserInput("main.nim"), 23, - ProjectExplorer::Constants::TASK_CATEGORY_COMPILE) }) + << QList<Task>({Task(Task::Error, + "Error: undeclared identifier: 'x'", + Utils::FileName::fromUserInput("main.nim"), 23, + ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)}) << QString(); QTest::newRow("Parse warning string") << QString::fromLatin1("lib/pure/parseopt.nim(56, 34) Warning: quoteIfContainsWhite is deprecated [Deprecated]") << OutputParserTester::STDERR << QString("") << QString("lib/pure/parseopt.nim(56, 34) Warning: quoteIfContainsWhite is deprecated [Deprecated]\n") - << QList<Task>({ Task(Task::Warning, - "Warning: quoteIfContainsWhite is deprecated [Deprecated]", - Utils::FileName::fromUserInput("lib/pure/parseopt.nim"), 56, - ProjectExplorer::Constants::TASK_CATEGORY_COMPILE) }) + << QList<Task>({Task(Task::Warning, + "Warning: quoteIfContainsWhite is deprecated [Deprecated]", + Utils::FileName::fromUserInput("lib/pure/parseopt.nim"), 56, + ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)}) << QString(); } diff --git a/src/plugins/nim/project/nimcompilerbuildstepfactory.cpp b/src/plugins/nim/project/nimcompilerbuildstepfactory.cpp index a290fcdfe5..afd2125f3f 100644 --- a/src/plugins/nim/project/nimcompilerbuildstepfactory.cpp +++ b/src/plugins/nim/project/nimcompilerbuildstepfactory.cpp @@ -51,7 +51,7 @@ QList<BuildStepInfo> NimCompilerBuildStepFactory::availableSteps(BuildStepList * if (!bc || bc->hasNimCompilerBuildStep()) return {}; - return {{ Constants::C_NIMCOMPILERBUILDSTEP_ID, tr("Nim Compiler Build Step") }}; + return {{Constants::C_NIMCOMPILERBUILDSTEP_ID, tr("Nim Compiler Build Step")}}; } BuildStep *NimCompilerBuildStepFactory::create(BuildStepList *parent, Core::Id) diff --git a/src/plugins/nim/project/nimcompilercleanstepfactory.cpp b/src/plugins/nim/project/nimcompilercleanstepfactory.cpp index 327ea7fa31..2478d33fd3 100644 --- a/src/plugins/nim/project/nimcompilercleanstepfactory.cpp +++ b/src/plugins/nim/project/nimcompilercleanstepfactory.cpp @@ -50,9 +50,9 @@ QList<BuildStepInfo> NimCompilerCleanStepFactory::availableSteps(BuildStepList * if (!bc || bc->hasNimCompilerCleanStep()) return {}; - return {{ Constants::C_NIMCOMPILERCLEANSTEP_ID, - tr(Nim::Constants::C_NIMCOMPILERCLEANSTEP_DISPLAY), - BuildStepInfo::Unclonable }}; + return {{Constants::C_NIMCOMPILERCLEANSTEP_ID, + tr(Nim::Constants::C_NIMCOMPILERCLEANSTEP_DISPLAY), + BuildStepInfo::Unclonable}}; } BuildStep *NimCompilerCleanStepFactory::create(BuildStepList *parent, Core::Id) diff --git a/src/plugins/nim/project/nimprojectnode.cpp b/src/plugins/nim/project/nimprojectnode.cpp index 096c90c63c..c4c306cdf3 100644 --- a/src/plugins/nim/project/nimprojectnode.cpp +++ b/src/plugins/nim/project/nimprojectnode.cpp @@ -39,12 +39,12 @@ NimProjectNode::NimProjectNode(NimProject &project, QList<ProjectAction> NimProjectNode::supportedActions(Node *node) const { - static const QList<ProjectAction> fileActions = { ProjectAction::Rename, - ProjectAction::RemoveFile + static const QList<ProjectAction> fileActions = {ProjectAction::Rename, + ProjectAction::RemoveFile }; - static const QList<ProjectAction> folderActions = { ProjectAction::AddNewFile, - ProjectAction::RemoveFile, - ProjectAction::AddExistingFile + static const QList<ProjectAction> folderActions = {ProjectAction::AddNewFile, + ProjectAction::RemoveFile, + ProjectAction::AddExistingFile }; switch (node->nodeType()) { case NodeType::File: diff --git a/src/plugins/nim/project/nimtoolchainfactory.cpp b/src/plugins/nim/project/nimtoolchainfactory.cpp index 3978bf0e6e..0eaae567f6 100644 --- a/src/plugins/nim/project/nimtoolchainfactory.cpp +++ b/src/plugins/nim/project/nimtoolchainfactory.cpp @@ -75,7 +75,7 @@ ToolChain *NimToolChainFactory::restore(const QVariantMap &data) QSet<Core::Id> NimToolChainFactory::supportedLanguages() const { - return { Constants::C_NIMLANGUAGE_ID }; + return {Constants::C_NIMLANGUAGE_ID}; } QList<ToolChain *> NimToolChainFactory::autoDetect(const QList<ToolChain *> &alreadyKnown) diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index 8f662ca402..8927a4499b 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -321,7 +321,7 @@ QWidget *AppOutputPane::outputWidget(QWidget *) QList<QWidget*> AppOutputPane::toolBarWidgets() const { - return { m_reRunButton, m_stopButton, m_attachButton, m_zoomInButton, m_zoomOutButton }; + return {m_reRunButton, m_stopButton, m_attachButton, m_zoomInButton, m_zoomOutButton}; } QString AppOutputPane::displayName() const diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp index 72e5a9a26c..0521570a34 100644 --- a/src/plugins/projectexplorer/compileoutputwindow.cpp +++ b/src/plugins/projectexplorer/compileoutputwindow.cpp @@ -245,7 +245,7 @@ QWidget *CompileOutputWindow::outputWidget(QWidget *) QList<QWidget *> CompileOutputWindow::toolBarWidgets() const { - return { m_cancelBuildButton, m_zoomInButton, m_zoomOutButton }; + return {m_cancelBuildButton, m_zoomInButton, m_zoomOutButton}; } void CompileOutputWindow::appendText(const QString &text, BuildStep::OutputFormat format) diff --git a/src/plugins/projectexplorer/expanddata.cpp b/src/plugins/projectexplorer/expanddata.cpp index 2322735a76..605377f50d 100644 --- a/src/plugins/projectexplorer/expanddata.cpp +++ b/src/plugins/projectexplorer/expanddata.cpp @@ -45,7 +45,7 @@ ExpandData ExpandData::fromSettings(const QVariant &v) QVariant ExpandData::toSettings() const { - return QVariant::fromValue(QStringList({ path, displayName })); + return QVariant::fromValue(QStringList({path, displayName})); } int ProjectExplorer::Internal::qHash(const ExpandData &data) diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index f1af30f2ad..30f77f739e 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -188,7 +188,7 @@ static QByteArray runGcc(const FileName &gcc, const QStringList &arguments, cons static const QStringList gccPredefinedMacrosOptions() { - return QStringList({ "-xc++", "-E", "-dM" }); + return QStringList({"-xc++", "-E", "-dM"}); } static QByteArray gccPredefinedMacros(const FileName &gcc, const QStringList &args, const QStringList &env) @@ -889,7 +889,7 @@ GccToolChainFactory::GccToolChainFactory() QSet<Core::Id> GccToolChainFactory::supportedLanguages() const { - return { Constants::C_LANGUAGE_ID, Constants::CXX_LANGUAGE_ID }; + return {Constants::C_LANGUAGE_ID, Constants::CXX_LANGUAGE_ID}; } bool GccToolChainFactory::canCreate() @@ -1208,7 +1208,7 @@ QString ClangToolChain::typeDisplayName() const QString ClangToolChain::makeCommand(const Environment &environment) const { const QStringList makes - = HostOsInfo::isWindowsHost() ? QStringList({ "mingw32-make.exe", "make.exe" }) : QStringList({ "make" }); + = HostOsInfo::isWindowsHost() ? QStringList({"mingw32-make.exe", "make.exe"}) : QStringList({"make"}); FileName tmp; for (const QString &make : makes) { @@ -1295,8 +1295,8 @@ ClangToolChainFactory::ClangToolChainFactory() QSet<Core::Id> ClangToolChainFactory::supportedLanguages() const { - return { Constants::CXX_LANGUAGE_ID, - Constants::C_LANGUAGE_ID }; + return {Constants::CXX_LANGUAGE_ID, + Constants::C_LANGUAGE_ID}; } QList<ToolChain *> ClangToolChainFactory::autoDetect(const QList<ToolChain *> &alreadyKnown) @@ -1361,7 +1361,7 @@ FileNameList MingwToolChain::suggestedMkspecList() const QString MingwToolChain::makeCommand(const Environment &environment) const { const QStringList makes - = HostOsInfo::isWindowsHost() ? QStringList({ "mingw32-make.exe", "make.exe" }) : QStringList({ "make" }); + = HostOsInfo::isWindowsHost() ? QStringList({"mingw32-make.exe", "make.exe"}) : QStringList({"make"}); FileName tmp; foreach (const QString &make, makes) { @@ -1388,8 +1388,8 @@ MingwToolChainFactory::MingwToolChainFactory() QSet<Core::Id> MingwToolChainFactory::supportedLanguages() const { - return { Constants::CXX_LANGUAGE_ID, - Constants::C_LANGUAGE_ID }; + return {Constants::CXX_LANGUAGE_ID, + Constants::C_LANGUAGE_ID}; } QList<ToolChain *> MingwToolChainFactory::autoDetect(const QList<ToolChain *> &alreadyKnown) @@ -1486,7 +1486,7 @@ LinuxIccToolChainFactory::LinuxIccToolChainFactory() QSet<Core::Id> LinuxIccToolChainFactory::supportedLanguages() const { - return { Constants::CXX_LANGUAGE_ID }; + return {Constants::CXX_LANGUAGE_ID}; } QList<ToolChain *> LinuxIccToolChainFactory::autoDetect(const QList<ToolChain *> &alreadyKnown) @@ -1579,11 +1579,11 @@ void ProjectExplorerPlugin::testGccAbiGuessing_data() QTest::newRow("broken input -- 64bit") << QString::fromLatin1("arm-none-foo-gnueabi") << QByteArray("#define __SIZEOF_SIZE_T__ 8\n#define __Something\n") - << QStringList({ "arm-unknown-unknown-unknown-64bit" }); + << QStringList({"arm-unknown-unknown-unknown-64bit"}); QTest::newRow("broken input -- 32bit") << QString::fromLatin1("arm-none-foo-gnueabi") << QByteArray("#define __SIZEOF_SIZE_T__ 4\n#define __Something\n") - << QStringList({ "arm-unknown-unknown-unknown-32bit" }); + << QStringList({"arm-unknown-unknown-unknown-32bit"}); QTest::newRow("totally broken input -- 32bit") << QString::fromLatin1("foo-bar-foo") << QByteArray("#define __SIZEOF_SIZE_T__ 4\n#define __Something\n") @@ -1592,104 +1592,104 @@ void ProjectExplorerPlugin::testGccAbiGuessing_data() QTest::newRow("Linux 1 (32bit intel)") << QString::fromLatin1("i686-linux-gnu") << QByteArray("#define __SIZEOF_SIZE_T__ 4\n") - << QStringList({ "x86-linux-generic-elf-32bit" }); + << QStringList({"x86-linux-generic-elf-32bit"}); QTest::newRow("Linux 2 (32bit intel)") << QString::fromLatin1("i486-linux-gnu") << QByteArray("#define __SIZEOF_SIZE_T__ 4\n") - << QStringList({ "x86-linux-generic-elf-32bit" }); + << QStringList({"x86-linux-generic-elf-32bit"}); QTest::newRow("Linux 3 (64bit intel)") << QString::fromLatin1("x86_64-linux-gnu") << QByteArray("#define __SIZEOF_SIZE_T__ 8\n") - << QStringList({ "x86-linux-generic-elf-64bit", "x86-linux-generic-elf-32bit" }); + << QStringList({"x86-linux-generic-elf-64bit", "x86-linux-generic-elf-32bit"}); QTest::newRow("Linux 3 (64bit intel -- non 64bit)") << QString::fromLatin1("x86_64-linux-gnu") << QByteArray("#define __SIZEOF_SIZE_T__ 4\n") - << QStringList({ "x86-linux-generic-elf-32bit" }); + << QStringList({"x86-linux-generic-elf-32bit"}); QTest::newRow("Linux 4 (32bit mips)") << QString::fromLatin1("mipsel-linux-uclibc") << QByteArray("#define __SIZEOF_SIZE_T__ 4") - << QStringList({ "mips-linux-generic-elf-32bit" }); + << QStringList({"mips-linux-generic-elf-32bit"}); QTest::newRow("Linux 5 (QTCREATORBUG-4690)") // from QTCREATORBUG-4690 << QString::fromLatin1("x86_64-redhat-linux6E") << QByteArray("#define __SIZEOF_SIZE_T__ 8\n") - << QStringList({ "x86-linux-generic-elf-64bit", "x86-linux-generic-elf-32bit" }); + << QStringList({"x86-linux-generic-elf-64bit", "x86-linux-generic-elf-32bit"}); QTest::newRow("Linux 6 (QTCREATORBUG-4690)") // from QTCREATORBUG-4690 << QString::fromLatin1("x86_64-redhat-linux") << QByteArray("#define __SIZEOF_SIZE_T__ 8\n") - << QStringList({ "x86-linux-generic-elf-64bit", "x86-linux-generic-elf-32bit" }); + << QStringList({"x86-linux-generic-elf-64bit", "x86-linux-generic-elf-32bit"}); QTest::newRow("Linux 7 (arm)") << QString::fromLatin1("armv5tl-montavista-linux-gnueabi") << QByteArray("#define __SIZEOF_SIZE_T__ 4\n") - << QStringList({ "arm-linux-generic-elf-32bit" }); + << QStringList({"arm-linux-generic-elf-32bit"}); QTest::newRow("Linux 8 (arm)") << QString::fromLatin1("arm-angstrom-linux-gnueabi") << QByteArray("#define __SIZEOF_SIZE_T__ 4\n") - << QStringList({ "arm-linux-generic-elf-32bit" }); + << QStringList({"arm-linux-generic-elf-32bit"}); QTest::newRow("Linux 9 (ppc)") << QString::fromLatin1("powerpc-nsg-linux") << QByteArray("#define __SIZEOF_SIZE_T__ 4\n") - << QStringList({ "ppc-linux-generic-elf-32bit" }); + << QStringList({"ppc-linux-generic-elf-32bit"}); QTest::newRow("Linux 10 (ppc 64bit)") << QString::fromLatin1("powerpc64-suse-linux") << QByteArray("#define __SIZEOF_SIZE_T__ 8\n") - << QStringList({ "ppc-linux-generic-elf-64bit" }); + << QStringList({"ppc-linux-generic-elf-64bit"}); QTest::newRow("Mingw 1 (32bit)") << QString::fromLatin1("i686-w64-mingw32") << QByteArray("#define __SIZEOF_SIZE_T__ 4\r\n") - << QStringList({ "x86-windows-msys-pe-32bit" }); + << QStringList({"x86-windows-msys-pe-32bit"}); QTest::newRow("Mingw 2 (64bit)") << QString::fromLatin1("i686-w64-mingw32") << QByteArray("#define __SIZEOF_SIZE_T__ 8\r\n") - << QStringList({ "x86-windows-msys-pe-64bit", "x86-windows-msys-pe-32bit" }); + << QStringList({"x86-windows-msys-pe-64bit", "x86-windows-msys-pe-32bit"}); QTest::newRow("Mingw 3 (32 bit)") << QString::fromLatin1("mingw32") << QByteArray("#define __SIZEOF_SIZE_T__ 4\r\n") - << QStringList({ "x86-windows-msys-pe-32bit" }); + << QStringList({"x86-windows-msys-pe-32bit"}); QTest::newRow("Cross Mingw 1 (64bit)") << QString::fromLatin1("amd64-mingw32msvc") << QByteArray("#define __SIZEOF_SIZE_T__ 8\r\n") - << QStringList({ "x86-windows-msys-pe-64bit", "x86-windows-msys-pe-32bit" }); + << QStringList({"x86-windows-msys-pe-64bit", "x86-windows-msys-pe-32bit"}); QTest::newRow("Cross Mingw 2 (32bit)") << QString::fromLatin1("i586-mingw32msvc") << QByteArray("#define __SIZEOF_SIZE_T__ 4\r\n") - << QStringList({ "x86-windows-msys-pe-32bit" }); + << QStringList({"x86-windows-msys-pe-32bit"}); QTest::newRow("Clang 1: windows") << QString::fromLatin1("x86_64-pc-win32") << QByteArray("#define __SIZEOF_SIZE_T__ 8\r\n") - << QStringList({ "x86-windows-msys-pe-64bit", "x86-windows-msys-pe-32bit" }); + << QStringList({"x86-windows-msys-pe-64bit", "x86-windows-msys-pe-32bit"}); QTest::newRow("Clang 1: linux") << QString::fromLatin1("x86_64-unknown-linux-gnu") << QByteArray("#define __SIZEOF_SIZE_T__ 8\n") - << QStringList({ "x86-linux-generic-elf-64bit", "x86-linux-generic-elf-32bit" }); + << QStringList({"x86-linux-generic-elf-64bit", "x86-linux-generic-elf-32bit"}); QTest::newRow("Mac 1") << QString::fromLatin1("i686-apple-darwin10") << QByteArray("#define __SIZEOF_SIZE_T__ 8\n") - << QStringList({ "x86-darwin-generic-mach_o-64bit", "x86-darwin-generic-mach_o-32bit" }); + << QStringList({"x86-darwin-generic-mach_o-64bit", "x86-darwin-generic-mach_o-32bit"}); QTest::newRow("Mac 2") << QString::fromLatin1("powerpc-apple-darwin10") << QByteArray("#define __SIZEOF_SIZE_T__ 8\n") - << QStringList({ "ppc-darwin-generic-mach_o-64bit", "ppc-darwin-generic-mach_o-32bit" }); + << QStringList({"ppc-darwin-generic-mach_o-64bit", "ppc-darwin-generic-mach_o-32bit"}); QTest::newRow("Mac 3") << QString::fromLatin1("i686-apple-darwin9") << QByteArray("#define __SIZEOF_SIZE_T__ 4\n") - << QStringList({ "x86-darwin-generic-mach_o-32bit", "x86-darwin-generic-mach_o-64bit" }); + << QStringList({"x86-darwin-generic-mach_o-32bit", "x86-darwin-generic-mach_o-64bit"}); QTest::newRow("Mac IOS") << QString::fromLatin1("arm-apple-darwin9") << QByteArray("#define __SIZEOF_SIZE_T__ 4\n") - << QStringList({ "arm-darwin-generic-mach_o-32bit", "arm-darwin-generic-mach_o-64bit" }); + << QStringList({"arm-darwin-generic-mach_o-32bit", "arm-darwin-generic-mach_o-64bit"}); QTest::newRow("Intel 1") << QString::fromLatin1("86_64 x86_64 GNU/Linux") << QByteArray("#define __SIZEOF_SIZE_T__ 8\n") - << QStringList({ "x86-linux-generic-elf-64bit", "x86-linux-generic-elf-32bit" }); + << QStringList({"x86-linux-generic-elf-64bit", "x86-linux-generic-elf-32bit"}); QTest::newRow("FreeBSD 1") << QString::fromLatin1("i386-portbld-freebsd9.0") << QByteArray("#define __SIZEOF_SIZE_T__ 4\n") - << QStringList({ "x86-bsd-freebsd-elf-32bit" }); + << QStringList({"x86-bsd-freebsd-elf-32bit"}); QTest::newRow("FreeBSD 2") << QString::fromLatin1("i386-undermydesk-freebsd") << QByteArray("#define __SIZEOF_SIZE_T__ 4\n") - << QStringList({ "x86-bsd-freebsd-elf-32bit" }); + << QStringList({"x86-bsd-freebsd-elf-32bit"}); } void ProjectExplorerPlugin::testGccAbiGuessing() diff --git a/src/plugins/projectexplorer/gnumakeparser.cpp b/src/plugins/projectexplorer/gnumakeparser.cpp index 735d349636..8ceb519e27 100644 --- a/src/plugins/projectexplorer/gnumakeparser.cpp +++ b/src/plugins/projectexplorer/gnumakeparser.cpp @@ -265,10 +265,10 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data() << QString() << QString() << QList<Task>() << QString() - << QStringList({ "/home/code/build/qt/examples/opengl/grabber", - "/home/code/build/qt/examples/opengl/grabber", "/test/dir" }); + << QStringList({"/home/code/build/qt/examples/opengl/grabber", + "/home/code/build/qt/examples/opengl/grabber", "/test/dir"}); QTest::newRow("leaving directory") - << QStringList({ "/home/code/build/qt/examples/opengl/grabber", "/test/dir" }) + << QStringList({"/home/code/build/qt/examples/opengl/grabber", "/test/dir"}) << QString::fromLatin1("make[4]: Leaving directory `/home/code/build/qt/examples/opengl/grabber'") << OutputParserTester::STDOUT << QString() << QString() diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp index c875585b45..5f4ca64d11 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/src/plugins/projectexplorer/kitinformation.cpp @@ -543,14 +543,14 @@ Kit::Predicate DeviceTypeKitInformation::deviceTypePredicate(Core::Id type) QSet<Core::Id> DeviceTypeKitInformation::supportedPlatforms(const Kit *k) const { - return { deviceTypeId(k) }; + return {deviceTypeId(k)}; } QSet<Core::Id> DeviceTypeKitInformation::availableFeatures(const Kit *k) const { Core::Id id = DeviceTypeKitInformation::deviceTypeId(k); if (id.isValid()) - return { id.withPrefix("DeviceType.") }; + return {id.withPrefix("DeviceType.")}; return QSet<Core::Id>(); } diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index 3306d896ac..1c6328ad46 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -68,15 +68,15 @@ struct MsvcPlatform { const MsvcPlatform platforms[] = { - { MsvcToolChain::x86, "x86", "/bin", "vcvars32.bat" }, - { MsvcToolChain::amd64, "amd64", "/bin/amd64", "vcvars64.bat" }, - { MsvcToolChain::x86_amd64, "x86_amd64", "/bin/x86_amd64", "vcvarsx86_amd64.bat" }, - { MsvcToolChain::ia64, "ia64", "/bin/ia64", "vcvars64.bat" }, - { MsvcToolChain::x86_ia64, "x86_ia64", "/bin/x86_ia64", "vcvarsx86_ia64.bat" }, - { MsvcToolChain::arm, "arm", "/bin/arm", "vcvarsarm.bat" }, - { MsvcToolChain::x86_arm, "x86_arm", "/bin/x86_arm", "vcvarsx86_arm.bat" }, - { MsvcToolChain::amd64_arm, "amd64_arm", "/bin/amd64_arm", "vcvarsamd64_arm.bat" }, - { MsvcToolChain::amd64_x86, "amd64_x86", "/bin/amd64_x86", "vcvarsamd64_x86.bat" } + {MsvcToolChain::x86, "x86", "/bin", "vcvars32.bat"}, + {MsvcToolChain::amd64, "amd64", "/bin/amd64", "vcvars64.bat"}, + {MsvcToolChain::x86_amd64, "x86_amd64", "/bin/x86_amd64", "vcvarsx86_amd64.bat"}, + {MsvcToolChain::ia64, "ia64", "/bin/ia64", "vcvars64.bat"}, + {MsvcToolChain::x86_ia64, "x86_ia64", "/bin/x86_ia64", "vcvarsx86_ia64.bat"}, + {MsvcToolChain::arm, "arm", "/bin/arm", "vcvarsarm.bat"}, + {MsvcToolChain::x86_arm, "x86_arm", "/bin/x86_arm", "vcvarsx86_arm.bat"}, + {MsvcToolChain::amd64_arm, "amd64_arm", "/bin/amd64_arm", "vcvarsamd64_arm.bat"}, + {MsvcToolChain::amd64_x86, "amd64_x86", "/bin/amd64_x86", "vcvarsamd64_x86.bat"} }; static const MsvcPlatform *platformEntry(MsvcToolChain::Platform t) @@ -668,7 +668,7 @@ MsvcToolChainFactory::MsvcToolChainFactory() QSet<Core::Id> MsvcToolChainFactory::supportedLanguages() const { - return { Constants::C_LANGUAGE_ID, Constants::CXX_LANGUAGE_ID }; + return {Constants::C_LANGUAGE_ID, Constants::CXX_LANGUAGE_ID}; } QString MsvcToolChainFactory::vcVarsBatFor(const QString &basePath, MsvcToolChain::Platform platform, @@ -693,7 +693,7 @@ static QList<ToolChain *> findOrCreateToolChain( ToolChain::Detection d = ToolChain::ManualDetection) { QList<ToolChain *> res; - for (auto language: { Constants::C_LANGUAGE_ID, Constants::CXX_LANGUAGE_ID }) { + for (auto language: {Constants::C_LANGUAGE_ID, Constants::CXX_LANGUAGE_ID}) { ToolChain *tc = Utils::findOrDefault( alreadyKnown, [&varsBat, &varsBatArg, &abi, &language](ToolChain *tc) -> bool { @@ -747,7 +747,7 @@ static void detectCppBuildTools(QList<ToolChain *> *list) const Entry &e = entries[i]; const Abi abi(e.architecture, Abi::WindowsOS, Abi::WindowsMsvc2015Flavor, e.format, e.wordSize); - for (auto language: { Constants::C_LANGUAGE_ID, Constants::CXX_LANGUAGE_ID }) { + for (auto language: {Constants::C_LANGUAGE_ID, Constants::CXX_LANGUAGE_ID}) { list->append(new MsvcToolChain(name + QLatin1String(e.postFix), abi, vcVarsBat, QLatin1String(e.varsBatArg), language, ToolChain::AutoDetection)); diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp index fd9ba9e9d8..2cae277a6d 100644 --- a/src/plugins/projectexplorer/processstep.cpp +++ b/src/plugins/projectexplorer/processstep.cpp @@ -157,7 +157,7 @@ bool ProcessStep::fromMap(const QVariantMap &map) QList<BuildStepInfo> ProcessStepFactory::availableSteps(BuildStepList *parent) const { Q_UNUSED(parent); - return {{ PROCESS_STEP_ID, ProcessStep::tr("Custom Process Step", "item in combobox") }}; + return {{PROCESS_STEP_ID, ProcessStep::tr("Custom Process Step", "item in combobox")}}; } BuildStep *ProcessStepFactory::create(BuildStepList *parent, Core::Id id) diff --git a/src/plugins/projectexplorer/projectimporter.cpp b/src/plugins/projectexplorer/projectimporter.cpp index 91126ba4b1..c0d29d142f 100644 --- a/src/plugins/projectexplorer/projectimporter.cpp +++ b/src/plugins/projectexplorer/projectimporter.cpp @@ -342,7 +342,7 @@ void ProjectImporter::useTemporaryKitInformation(Core::Id id, ProjectImporter::PersistFunction persist) { QTC_ASSERT(!findTemporaryHandler(id), return); - m_temporaryHandlers.append({ id, cleanup, persist }); + m_temporaryHandlers.append({id, cleanup, persist}); } void ProjectImporter::addTemporaryData(Core::Id id, const QVariant &cleanupData, Kit *k) const diff --git a/src/plugins/projectexplorer/projectwelcomepage.cpp b/src/plugins/projectexplorer/projectwelcomepage.cpp index fa20497221..ebd52104ba 100644 --- a/src/plugins/projectexplorer/projectwelcomepage.cpp +++ b/src/plugins/projectexplorer/projectwelcomepage.cpp @@ -330,7 +330,7 @@ public: m_expandedSessions.removeOne(sessionName); else m_expandedSessions.append(sessionName); - model->layoutChanged({ QPersistentModelIndex(idx) }); + model->layoutChanged({QPersistentModelIndex(idx)}); return false; } // One of the action links? @@ -347,7 +347,7 @@ public: return true; } if (ev->type() == QEvent::MouseMove) { - model->layoutChanged({ QPersistentModelIndex(idx) }); // Somewhat brutish. + model->layoutChanged({QPersistentModelIndex(idx)}); // Somewhat brutish. //update(option.rect); return true; } diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp index 6077ee7fe8..b3ae4b85f9 100644 --- a/src/plugins/projectexplorer/projectwindow.cpp +++ b/src/plugins/projectexplorer/projectwindow.cpp @@ -365,7 +365,7 @@ public: ProjectWindowPrivate(ProjectWindow *parent) : q(parent) { - m_projectsModel.setHeader({ ProjectWindow::tr("Projects") }); + m_projectsModel.setHeader({ProjectWindow::tr("Projects")}); m_selectorTree = new SelectorTree; m_selectorTree->setModel(&m_projectsModel); diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp index 0016e405c3..d8aeb334c1 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp @@ -363,7 +363,7 @@ void RunSettingsWidget::aboutToShowDeployMenu() QList<Core::Id> ids = factory->availableCreationIds(m_target); foreach (Core::Id id, ids) { QAction *action = m_addDeployMenu->addAction(factory->displayNameForId(id)); - DeployFactoryAndId data = { factory, id }; + DeployFactoryAndId data = {factory, id}; action->setData(QVariant::fromValue(data)); connect(action, &QAction::triggered, [factory, id, this]() { if (!factory->canCreate(m_target, id)) diff --git a/src/plugins/projectexplorer/task.cpp b/src/plugins/projectexplorer/task.cpp index 749a24026a..7ff3dc7ac5 100644 --- a/src/plugins/projectexplorer/task.cpp +++ b/src/plugins/projectexplorer/task.cpp @@ -35,9 +35,9 @@ namespace ProjectExplorer static QIcon taskTypeIcon(Task::TaskType t) { - static QIcon icons[3] = { QIcon(), - Utils::Icons::CRITICAL.icon(), - Utils::Icons::WARNING.icon()}; + static QIcon icons[3] = {QIcon(), + Utils::Icons::CRITICAL.icon(), + Utils::Icons::WARNING.icon()}; if (t < 0 || t > 2) t = Task::Unknown; diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index 543944f33d..8a488f684e 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -348,7 +348,7 @@ void TaskWindow::delayedInitialization() QList<QWidget*> TaskWindow::toolBarWidgets() const { - return { d->m_filterWarningsButton, d->m_categoriesButton }; + return {d->m_filterWarningsButton, d->m_categoriesButton}; } QWidget *TaskWindow::outputWidget(QWidget *) diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp index c8c6d6c3f1..bc69b89856 100644 --- a/src/plugins/projectexplorer/toolchain.cpp +++ b/src/plugins/projectexplorer/toolchain.cpp @@ -188,7 +188,7 @@ Core::Id ToolChain::typeId() const QList<Abi> ToolChain::supportedAbis() const { - return { targetAbi() }; + return {targetAbi()}; } Core::Id ToolChain::language() const diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp index ba159fc737..2e76c7f3c4 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.cpp +++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp @@ -113,7 +113,7 @@ public: m_factories = ExtensionSystem::PluginManager::getObjects<ToolChainFactory>( [](ToolChainFactory *factory) { return factory->canCreate();}); - m_model.setHeader({ ToolChainOptionsPage::tr("Name"), ToolChainOptionsPage::tr("Type") }); + m_model.setHeader({ToolChainOptionsPage::tr("Name"), ToolChainOptionsPage::tr("Type")}); auto autoRoot = new StaticTreeItem(ToolChainOptionsPage::tr("Auto-detected")); auto manualRoot = new StaticTreeItem(ToolChainOptionsPage::tr("Manual")); diff --git a/src/plugins/projectexplorer/wincetoolchain.cpp b/src/plugins/projectexplorer/wincetoolchain.cpp index 817f07cf43..b37c66e45c 100644 --- a/src/plugins/projectexplorer/wincetoolchain.cpp +++ b/src/plugins/projectexplorer/wincetoolchain.cpp @@ -341,7 +341,7 @@ WinCEToolChainFactory::WinCEToolChainFactory() QSet<Core::Id> WinCEToolChainFactory::supportedLanguages() const { - return { Constants::CXX_LANGUAGE_ID }; + return {Constants::CXX_LANGUAGE_ID}; } static ToolChain *findOrCreateToolChain(const QList<ToolChain *> &alreadyKnown, diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index b12f649c36..f5a8ddb46d 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -60,8 +60,8 @@ using namespace WinRt::Internal::Constants; static QString extractToolchainPrefix(QString *compilerName) { QString prefix; - const QStringList candidates = { QLatin1String("g++"), QLatin1String("clang++"), - QLatin1String("gcc"), QLatin1String("clang") }; + const QStringList candidates = {QLatin1String("g++"), QLatin1String("clang++"), + QLatin1String("gcc"), QLatin1String("clang")}; foreach (const QString &candidate, candidates) { const QString suffix = Utils::HostOsInfo::withExecutableSuffix(QLatin1Char('-') + candidate); diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index 4313b062f2..0c6e9af025 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp @@ -274,28 +274,28 @@ QString QbsBuildConfiguration::equivalentCommandLine(const BuildStep *buildStep) const StepProxy stepProxy(buildStep); Utils::QtcProcess::addArg(&commandLine, stepProxy.command()); const QString buildDir = buildDirectory().toUserOutput(); - Utils::QtcProcess::addArgs(&commandLine, QStringList({ "-d", buildDir })); + Utils::QtcProcess::addArgs(&commandLine, QStringList({"-d", buildDir})); Utils::QtcProcess::addArgs(&commandLine, QStringList("-f") << buildStep->project()->projectFilePath().toUserOutput()); if (QbsProjectManagerSettings::useCreatorSettingsDirForQbs()) { - Utils::QtcProcess::addArgs(&commandLine, QStringList({ "--settings-dir", - QDir::toNativeSeparators(QbsProjectManagerSettings::qbsSettingsBaseDir()) })); + Utils::QtcProcess::addArgs(&commandLine, QStringList({"--settings-dir", + QDir::toNativeSeparators(QbsProjectManagerSettings::qbsSettingsBaseDir())})); } if (stepProxy.dryRun()) Utils::QtcProcess::addArg(&commandLine, QLatin1String("--dry-run")); if (stepProxy.keepGoing()) Utils::QtcProcess::addArg(&commandLine, QLatin1String("--keep-going")); if (stepProxy.showCommandLines()) - Utils::QtcProcess::addArgs(&commandLine, QStringList({ "--command-echo-mode", - "command-line" })); + Utils::QtcProcess::addArgs(&commandLine, QStringList({"--command-echo-mode", + "command-line"})); if (stepProxy.noInstall()) Utils::QtcProcess::addArg(&commandLine, QLatin1String("--no-install")); if (stepProxy.cleanInstallRoot()) Utils::QtcProcess::addArg(&commandLine, QLatin1String("--clean-install-root")); const int jobCount = stepProxy.jobCount(); if (jobCount > 0) { - Utils::QtcProcess::addArgs(&commandLine, QStringList({ "--jobs", - QString::number(jobCount) })); + Utils::QtcProcess::addArgs(&commandLine, QStringList({"--jobs", + QString::number(jobCount)})); } const QString profileName = QbsManager::instance()->profileForKit(buildStep->target()->kit()); const QString buildVariant = qbsConfiguration() diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 0627a3b479..f070fddc40 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -849,7 +849,7 @@ QList<ProjectExplorer::BuildStepInfo> QbsBuildStepFactory::availableSteps(Projec if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_BUILD && qobject_cast<QbsBuildConfiguration *>(parent->parent()) && qobject_cast<QbsProject *>(parent->target()->project())) - return {{ Constants::QBS_BUILDSTEP_ID, tr("Qbs Build") }}; + return {{Constants::QBS_BUILDSTEP_ID, tr("Qbs Build")}}; return {}; } diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.cpp b/src/plugins/qbsprojectmanager/qbscleanstep.cpp index e693a7bcc4..6cfa438883 100644 --- a/src/plugins/qbsprojectmanager/qbscleanstep.cpp +++ b/src/plugins/qbsprojectmanager/qbscleanstep.cpp @@ -309,7 +309,7 @@ QList<ProjectExplorer::BuildStepInfo> QbsCleanStepFactory::availableSteps(Projec { if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN && qobject_cast<QbsBuildConfiguration *>(parent->parent())) - return {{ Constants::QBS_CLEANSTEP_ID, tr("Qbs Clean") }}; + return {{Constants::QBS_CLEANSTEP_ID, tr("Qbs Clean")}}; return {}; } diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp index f367c43ec1..0524696e9e 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp @@ -474,7 +474,7 @@ void QbsProjectManagerPlugin::buildFiles(QbsProject *project, const QStringList void QbsProjectManagerPlugin::buildSingleFile(QbsProject *project, const QString &file) { - buildFiles(project, QStringList(file), QStringList({ "obj", "hpp" })); + buildFiles(project, QStringList(file), QStringList({"obj", "hpp"})); } void QbsProjectManagerPlugin::buildProducts(QbsProject *project, const QStringList &products) diff --git a/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.cpp b/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.cpp index 33c984558e..7a36dbbf1b 100644 --- a/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.cpp +++ b/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.cpp @@ -50,7 +50,7 @@ QList<BuildStepInfo> AndroidPackageInstallationFactory::availableSteps(BuildStep if (parent->contains(AndroidPackageInstallationStep::Id)) return {}; - return {{ AndroidPackageInstallationStep::Id, tr("Deploy to device"), BuildStepInfo::Uncreatable }}; + return {{AndroidPackageInstallationStep::Id, tr("Deploy to device"), BuildStepInfo::Uncreatable}}; } BuildStep *AndroidPackageInstallationFactory::create(BuildStepList *parent, Core::Id id) diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp index 41b45a285b..c336329c9c 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp +++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp @@ -74,7 +74,7 @@ QList<ProjectExplorer::BuildStepInfo> QmakeAndroidBuildApkStepFactory::available || parent->contains(ANDROID_BUILD_APK_ID)) return {}; - return {{ ANDROID_BUILD_APK_ID, tr("Build Android APK") }}; + return {{ANDROID_BUILD_APK_ID, tr("Build Android APK")}}; } ProjectExplorer::BuildStep *QmakeAndroidBuildApkStepFactory::create(ProjectExplorer::BuildStepList *parent, const Core::Id id) diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp index 74d4f158e9..bcf7c39fb1 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp +++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp @@ -84,8 +84,8 @@ QList<Core::Id> QmakeAndroidRunConfigurationFactory::availableCreationIds(Target return QList<Core::Id>(); QmakeProject *project = static_cast<QmakeProject *>(parent->project()); - QList<QmakeProFile *> files = project->allProFiles({ ProjectType::ApplicationTemplate, - ProjectType::SharedLibraryTemplate }); + QList<QmakeProFile *> files = project->allProFiles({ProjectType::ApplicationTemplate, + ProjectType::SharedLibraryTemplate}); if (mode == AutoCreate) files = QmakeProject::proFilesWithQtcRunnable(files); diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp index 3027fc2499..436866146a 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp @@ -47,7 +47,7 @@ CustomWidgetWizard::CustomWidgetWizard() setDisplayName(tr("Qt Custom Designer Widget")); setDescription(tr("Creates a Qt Custom Designer Widget or a Custom Widget Collection.")); setIcon(QIcon(QLatin1String(":/wizards/images/gui.png"))); - setRequiredFeatures({ QtSupport::Constants::FEATURE_QWIDGETS }); + setRequiredFeatures({QtSupport::Constants::FEATURE_QWIDGETS}); } Core::BaseFileWizard *CustomWidgetWizard::create(QWidget *parent, const Core::WizardDialogParameters ¶meters) const diff --git a/src/plugins/qmakeprojectmanager/externaleditors.cpp b/src/plugins/qmakeprojectmanager/externaleditors.cpp index 0b067e7a09..39de1e8ac7 100644 --- a/src/plugins/qmakeprojectmanager/externaleditors.cpp +++ b/src/plugins/qmakeprojectmanager/externaleditors.cpp @@ -84,7 +84,7 @@ static ExternalQtEditor::LaunchData createMacOpenCommand(const ExternalQtEditor: const int appFolderIndex = data.binary.lastIndexOf(QLatin1String("/Contents/MacOS/")); if (appFolderIndex != -1) { openData.binary = "open"; - openData.arguments = QStringList({ QString("-a"), data.binary.left(appFolderIndex) }) + openData.arguments = QStringList({QString("-a"), data.binary.left(appFolderIndex)}) + data.arguments; } return openData; diff --git a/src/plugins/qmakeprojectmanager/makestep.cpp b/src/plugins/qmakeprojectmanager/makestep.cpp index 767d4bf236..c2a2315b51 100644 --- a/src/plugins/qmakeprojectmanager/makestep.cpp +++ b/src/plugins/qmakeprojectmanager/makestep.cpp @@ -490,7 +490,7 @@ QList<BuildStepInfo> MakeStepFactory::availableSteps(BuildStepList *parent) cons if (parent->target()->project()->id() != Constants::QMAKEPROJECT_ID) return {}; - return {{ MAKESTEP_BS_ID, tr("Make") }}; + return {{MAKESTEP_BS_ID, tr("Make")}}; } BuildStep *MakeStepFactory::create(BuildStepList *parent, Core::Id id) diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp index fa43bf0ca3..33e02dfd3a 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp @@ -1312,7 +1312,7 @@ QmakeEvalResult *QmakeProFile::evaluate(const QmakeEvalInput &input) // Convert ProFileReader::includeFiles to IncludedPriFile structure QHash<ProFile *, QVector<ProFile *>> includeFiles = input.readerExact->includeFiles(); - QList<QmakeIncludedPriFile *> toBuild = { &result->includedFiles }; + QList<QmakeIncludedPriFile *> toBuild = {&result->includedFiles}; while (!toBuild.isEmpty()) { QmakeIncludedPriFile *current = toBuild.takeFirst(); if (!current->proFile) @@ -1348,7 +1348,7 @@ QmakeEvalResult *QmakeProFile::evaluate(const QmakeEvalInput &input) // Add ProFileReader::includeFiles information from cumulative parse to IncludedPriFile structure QHash<ProFile *, QVector<ProFile *>> includeFiles = input.readerCumulative->includeFiles(); - QList<QmakeIncludedPriFile *> toBuild = { &result->includedFiles }; + QList<QmakeIncludedPriFile *> toBuild = {&result->includedFiles}; while (!toBuild.isEmpty()) { QmakeIncludedPriFile *current = toBuild.takeFirst(); if (!current->proFile) @@ -1463,7 +1463,7 @@ QmakeEvalResult *QmakeProFile::evaluate(const QmakeEvalInput &input) if (result->state == QmakeEvalResult::EvalOk || result->state == QmakeEvalResult::EvalPartial) { - QList<QmakeIncludedPriFile *> toExtract = { &result->includedFiles }; + QList<QmakeIncludedPriFile *> toExtract = {&result->includedFiles}; while (!toExtract.isEmpty()) { QmakeIncludedPriFile *current = toExtract.takeFirst(); processValues(current->result); diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index a38b386ce4..9a3aebdc5b 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -884,7 +884,7 @@ QmakeProject::collectAllProFiles(QmakeProFile *file, Parsing parse, QList<QmakeProFile *> QmakeProject::applicationProFiles(Parsing parse) const { - return allProFiles({ ProjectType::ApplicationTemplate, ProjectType::ScriptTemplate }, parse); + return allProFiles({ProjectType::ApplicationTemplate, ProjectType::ScriptTemplate}, parse); } QList<QmakeProFile *> QmakeProject::allProFiles(const QList<ProjectType> &projectTypes, Parsing parse) const diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index d8bb0ce023..d8f83e6a0e 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -870,7 +870,7 @@ QList<BuildStepInfo> QMakeStepFactory::availableSteps(BuildStepList *parent) con if (!qobject_cast<QmakeBuildConfiguration *>(parent->parent())) return {}; - return {{ QMAKE_BS_ID, tr("qmake"), BuildStepInfo::UniqueStep }}; + return {{QMAKE_BS_ID, tr("qmake"), BuildStepInfo::UniqueStep}}; } ProjectExplorer::BuildStep *QMakeStepFactory::create(BuildStepList *parent, Core::Id id) diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp index 2696886d6e..94586b3798 100644 --- a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp @@ -53,7 +53,7 @@ static const char mainWindowUiContentsC[] = static const char mainWindowMobileUiContentsC[] = "\n <widget class=\"QWidget\" name=\"centralWidget\" />"; -static const char *baseClassesC[] = { "QMainWindow", "QWidget", "QDialog" }; +static const char *baseClassesC[] = {"QMainWindow", "QWidget", "QDialog"}; static inline QStringList baseClasses() { @@ -78,7 +78,7 @@ GuiAppWizard::GuiAppWizard() "Includes a Qt Designer-based main window.\n\n" "Preselects a desktop Qt for building the application if available.")); setIcon(QIcon(QLatin1String(":/wizards/images/gui.png"))); - setRequiredFeatures({ QtSupport::Constants::FEATURE_QWIDGETS }); + setRequiredFeatures({QtSupport::Constants::FEATURE_QWIDGETS}); } Core::BaseFileWizard *GuiAppWizard::create(QWidget *parent, const Core::WizardDialogParameters ¶meters) const diff --git a/src/plugins/qmakeprojectmanager/wizards/librarywizard.cpp b/src/plugins/qmakeprojectmanager/wizards/librarywizard.cpp index 3da97b1af5..90e694af5e 100644 --- a/src/plugins/qmakeprojectmanager/wizards/librarywizard.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/librarywizard.cpp @@ -51,7 +51,7 @@ LibraryWizard::LibraryWizard() "<li>a shared C++ library for use with <tt>QPluginLoader</tt> and runtime (Plugins)</li>" "<li>a shared or static C++ library for use with another project at linktime</li></ul>")); setIcon(QIcon(QLatin1String(":/wizards/images/lib.png"))); - setRequiredFeatures({ QtSupport::Constants::FEATURE_QT_PREFIX }); + setRequiredFeatures({QtSupport::Constants::FEATURE_QT_PREFIX}); } Core::BaseFileWizard *LibraryWizard::create(QWidget *parent, const Core::WizardDialogParameters ¶meters) const diff --git a/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.cpp b/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.cpp index cb4953fbfd..ef0bd79ed0 100644 --- a/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.cpp @@ -52,16 +52,16 @@ struct PluginBaseClasses { static const PluginBaseClasses pluginBaseClasses[] = { - { "QAccessiblePlugin", "QtGui", "QtCore", "accessible", "QAccessibleFactoryInterface" }, - { "QDecorationPlugin", "QtGui", "QtCore", 0, 0 }, // Qt 4 only. - { "QGenericPlugin", "QtGui", "QtCore", "generic", "QGenericPluginFactoryInterface" }, - { "QIconEnginePluginV2", "QtGui", "QtCore", "imageformats", 0 }, // Qt 4 only. - { "QIconEnginePlugin", "QtGui", "QtCore", "imageformats", "QIconEngineFactoryInterface" }, - { "QImageIOPlugin", "QtGui", "QtCore", "imageformats", "QImageIOHandlerFactoryInterface" }, - { "QScriptExtensionPlugin", "QtScript", "QtCore", 0, "QScriptExtensionInterface" }, - { "QSqlDriverPlugin", "QtSql", "QtCore", "sqldrivers", "QSqlDriverFactoryInterface" }, - { "QStylePlugin", "QtGui", "QtCore", "styles", "QStyleFactoryInterface" }, - { "QTextCodecPlugin", "QtCore", 0, "codecs", 0 } // Qt 4 only. + {"QAccessiblePlugin", "QtGui", "QtCore", "accessible", "QAccessibleFactoryInterface"}, + {"QDecorationPlugin", "QtGui", "QtCore", 0, 0}, // Qt 4 only. + {"QGenericPlugin", "QtGui", "QtCore", "generic", "QGenericPluginFactoryInterface"}, + {"QIconEnginePluginV2", "QtGui", "QtCore", "imageformats", 0}, // Qt 4 only. + {"QIconEnginePlugin", "QtGui", "QtCore", "imageformats", "QIconEngineFactoryInterface"}, + {"QImageIOPlugin", "QtGui", "QtCore", "imageformats", "QImageIOHandlerFactoryInterface"}, + {"QScriptExtensionPlugin", "QtScript", "QtCore", 0, "QScriptExtensionInterface"}, + {"QSqlDriverPlugin", "QtSql", "QtCore", "sqldrivers", "QSqlDriverFactoryInterface"}, + {"QStylePlugin", "QtGui", "QtCore", "styles", "QStyleFactoryInterface"}, + {"QTextCodecPlugin", "QtCore", 0, "codecs", 0} // Qt 4 only. }; enum { defaultPluginBaseClass = 2 }; diff --git a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp index 174da527f7..5df6ede918 100644 --- a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp @@ -56,7 +56,7 @@ using namespace QtSupport; // -------------------- QtWizard QtWizard::QtWizard() { - setSupportedProjectTypes({ Constants::QMAKEPROJECT_ID }); + setSupportedProjectTypes({Constants::QMAKEPROJECT_ID}); } QString QtWizard::sourceSuffix() @@ -200,7 +200,7 @@ int BaseQmakeProjectWizardDialog::addTargetSetupPage(int id) { m_targetSetupPage = new ProjectExplorer::TargetSetupPage; const Core::Id platform = selectedPlatform(); - QSet<Core::Id> features = { QtSupport::Constants::FEATURE_DESKTOP }; + QSet<Core::Id> features = {QtSupport::Constants::FEATURE_DESKTOP}; if (!platform.isValid()) m_targetSetupPage->setPreferredKitPredicate(QtKitInformation::qtVersionPredicate(features)); else diff --git a/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp index 65ddaacac6..6725779e43 100644 --- a/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp @@ -129,7 +129,7 @@ void FilesSelectionWizardPage::initializePage() SimpleProjectWizard::SimpleProjectWizard() { - setSupportedProjectTypes({ Constants::PROJECT_ID }); + setSupportedProjectTypes({Constants::PROJECT_ID}); // TODO do something about the ugliness of standard icons in sizes different than 16, 32, 64, 128 { QPixmap icon(22, 22); @@ -217,7 +217,7 @@ GeneratedFiles SimpleProjectWizard::generateFiles(const QWizard *w, "#DEFINES = \n\n" ); - return GeneratedFiles { generatedProFile }; + return GeneratedFiles{generatedProFile}; } bool SimpleProjectWizard::postGenerateFiles(const QWizard *w, const GeneratedFiles &l, diff --git a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp index babf0e6e6b..b85254fd46 100644 --- a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp @@ -49,7 +49,7 @@ SubdirsProjectWizard::SubdirsProjectWizard() setDescription(tr("Creates a qmake-based subdirs project. This allows you to group " "your projects in a tree structure.")); setIcon(QIcon(QLatin1String(":/wizards/images/gui.png"))); - setRequiredFeatures({ QtSupport::Constants::FEATURE_QT_PREFIX }); + setRequiredFeatures({QtSupport::Constants::FEATURE_QT_PREFIX}); } Core::BaseFileWizard *SubdirsProjectWizard::create(QWidget *parent, diff --git a/src/plugins/qmakeprojectmanager/wizards/testwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/testwizard.cpp index 99110f4351..9ff69a790b 100644 --- a/src/plugins/qmakeprojectmanager/wizards/testwizard.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/testwizard.cpp @@ -51,7 +51,7 @@ TestWizard::TestWizard() "Unit tests allow you to verify that the code is fit for use " "and that there are no regressions.")); setIcon(QIcon(QLatin1String(":/wizards/images/console.png"))); - setRequiredFeatures({ QtSupport::Constants::FEATURE_QT_CONSOLE, QtSupport::Constants::FEATURE_QT_PREFIX }); + setRequiredFeatures({QtSupport::Constants::FEATURE_QT_CONSOLE, QtSupport::Constants::FEATURE_QT_PREFIX}); } Core::BaseFileWizard *TestWizard::create(QWidget *parent, const Core::WizardDialogParameters ¶meters) const diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp index bc388e2547..04ff1c6043 100644 --- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp +++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp @@ -577,7 +577,7 @@ QList<ModelNode> AbstractView::allModelNodes() const void AbstractView::emitDocumentMessage(const QString &error) { - emitDocumentMessage( { DocumentMessage(error) } ); + emitDocumentMessage({DocumentMessage(error)}); } void AbstractView::emitDocumentMessage(const QList<DocumentMessage> &errors, const QList<DocumentMessage> &warnings) diff --git a/src/plugins/qmlprofiler/tests/qmleventtype_test.cpp b/src/plugins/qmlprofiler/tests/qmleventtype_test.cpp index cfb3479765..889a344574 100644 --- a/src/plugins/qmlprofiler/tests/qmleventtype_test.cpp +++ b/src/plugins/qmlprofiler/tests/qmleventtype_test.cpp @@ -71,35 +71,35 @@ void QmlEventTypeTest::testFeature() { const ProfileFeature features[][MaximumEventType] = { // Event - { MaximumProfileFeature, ProfileInputEvents, ProfileInputEvents, - ProfileAnimations, MaximumProfileFeature, MaximumProfileFeature }, + {MaximumProfileFeature, ProfileInputEvents, ProfileInputEvents, + ProfileAnimations, MaximumProfileFeature, MaximumProfileFeature}, // RangeStart - { MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature, - MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature }, + {MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature, + MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature}, // RangeData - { MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature, - MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature }, + {MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature, + MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature}, // RangeLocation - { MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature, - MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature }, + {MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature, + MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature}, // RangeEnd - { MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature, - MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature }, + {MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature, + MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature}, // Complete - { MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature, - MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature }, + {MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature, + MaximumProfileFeature, MaximumProfileFeature, MaximumProfileFeature}, // PixmapCacheEvent - { ProfilePixmapCache, ProfilePixmapCache, ProfilePixmapCache, - ProfilePixmapCache, ProfilePixmapCache, ProfilePixmapCache }, + {ProfilePixmapCache, ProfilePixmapCache, ProfilePixmapCache, + ProfilePixmapCache, ProfilePixmapCache, ProfilePixmapCache}, // SceneGraphFrame - { ProfileSceneGraph, ProfileSceneGraph, ProfileSceneGraph, - ProfileSceneGraph, ProfileSceneGraph, ProfileSceneGraph }, + {ProfileSceneGraph, ProfileSceneGraph, ProfileSceneGraph, + ProfileSceneGraph, ProfileSceneGraph, ProfileSceneGraph}, // MemoryAllocation - { ProfileMemory, ProfileMemory, ProfileMemory, - ProfileMemory, ProfileMemory, ProfileMemory }, + {ProfileMemory, ProfileMemory, ProfileMemory, + ProfileMemory, ProfileMemory, ProfileMemory}, // DebugMessage - { ProfileDebugMessages, ProfileDebugMessages, ProfileDebugMessages, - ProfileDebugMessages, ProfileDebugMessages, ProfileDebugMessages } + {ProfileDebugMessages, ProfileDebugMessages, ProfileDebugMessages, + ProfileDebugMessages, ProfileDebugMessages, ProfileDebugMessages} }; for (int i = 0; i < MaximumMessage; ++i) { diff --git a/src/plugins/qnx/qnxdeploystepfactory.cpp b/src/plugins/qnx/qnxdeploystepfactory.cpp index 52f2aab492..c275481e3f 100644 --- a/src/plugins/qnx/qnxdeploystepfactory.cpp +++ b/src/plugins/qnx/qnxdeploystepfactory.cpp @@ -53,10 +53,10 @@ QList<BuildStepInfo> QnxDeployStepFactory::availableSteps(BuildStepList *parent) if (deviceType != QnxDeviceFactory::deviceType()) return {}; - return {{ RemoteLinux::GenericDirectUploadStep::stepId(), - RemoteLinux::GenericDirectUploadStep::displayName() }, - { DeviceCheckBuildStep::stepId(), - DeviceCheckBuildStep::stepDisplayName() }}; + return {{RemoteLinux::GenericDirectUploadStep::stepId(), + RemoteLinux::GenericDirectUploadStep::displayName()}, + {DeviceCheckBuildStep::stepId(), + DeviceCheckBuildStep::stepDisplayName()}}; } ProjectExplorer::BuildStep *QnxDeployStepFactory::create(ProjectExplorer::BuildStepList *parent, Core::Id id) diff --git a/src/plugins/qnx/qnxdevicefactory.cpp b/src/plugins/qnx/qnxdevicefactory.cpp index 2eb89ff51a..f489c10d74 100644 --- a/src/plugins/qnx/qnxdevicefactory.cpp +++ b/src/plugins/qnx/qnxdevicefactory.cpp @@ -49,7 +49,7 @@ QString QnxDeviceFactory::displayNameForId(Core::Id type) const QList<Core::Id> QnxDeviceFactory::availableCreationIds() const { - return { Constants::QNX_QNX_OS_TYPE }; + return {Constants::QNX_QNX_OS_TYPE}; } QIcon QnxDeviceFactory::iconForId(Core::Id type) const diff --git a/src/plugins/qnx/qnxqtversion.cpp b/src/plugins/qnx/qnxqtversion.cpp index 13376a499b..e5494b9ed2 100644 --- a/src/plugins/qnx/qnxqtversion.cpp +++ b/src/plugins/qnx/qnxqtversion.cpp @@ -82,7 +82,7 @@ QSet<Core::Id> QnxQtVersion::availableFeatures() const QSet<Core::Id> QnxQtVersion::targetDeviceTypes() const { - return { Constants::QNX_QNX_OS_TYPE }; + return {Constants::QNX_QNX_OS_TYPE}; } QString QnxQtVersion::qnxHost() const diff --git a/src/plugins/qnx/qnxtoolchain.cpp b/src/plugins/qnx/qnxtoolchain.cpp index 65ce094fb0..3c6e27a08d 100644 --- a/src/plugins/qnx/qnxtoolchain.cpp +++ b/src/plugins/qnx/qnxtoolchain.cpp @@ -198,7 +198,7 @@ QList<ProjectExplorer::ToolChain *> QnxToolChainFactory::autoDetect( QSet<Core::Id> QnxToolChainFactory::supportedLanguages() const { - return { ProjectExplorer::Constants::CXX_LANGUAGE_ID }; + return {ProjectExplorer::Constants::CXX_LANGUAGE_ID}; } bool QnxToolChainFactory::canRestore(const QVariantMap &data) diff --git a/src/plugins/qtsupport/desktopqtversion.cpp b/src/plugins/qtsupport/desktopqtversion.cpp index c111c0a228..77945bd353 100644 --- a/src/plugins/qtsupport/desktopqtversion.cpp +++ b/src/plugins/qtsupport/desktopqtversion.cpp @@ -93,7 +93,7 @@ QSet<Core::Id> DesktopQtVersion::availableFeatures() const QSet<Core::Id> DesktopQtVersion::targetDeviceTypes() const { - QSet<Core::Id> result = { ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE }; + QSet<Core::Id> result = {ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE}; if (Utils::contains(qtAbis(), [](const ProjectExplorer::Abi a) { return a.os() == ProjectExplorer::Abi::LinuxOS; })) result.insert(RemoteLinux::Constants::GenericLinuxOsType); return result; diff --git a/src/plugins/qtsupport/qscxmlcgenerator.cpp b/src/plugins/qtsupport/qscxmlcgenerator.cpp index 1bfc47448a..6920f2e076 100644 --- a/src/plugins/qtsupport/qscxmlcgenerator.cpp +++ b/src/plugins/qtsupport/qscxmlcgenerator.cpp @@ -91,8 +91,8 @@ QStringList QScxmlcGenerator::arguments() const { QTC_ASSERT(!m_header.isEmpty(), return QStringList()); - return QStringList({ QLatin1String("--header"), m_header, QLatin1String("--impl"), m_impl, - tmpFile().fileName() }); + return QStringList({QLatin1String("--header"), m_header, QLatin1String("--impl"), m_impl, + tmpFile().fileName()}); } Utils::FileName QScxmlcGenerator::workingDirectory() const diff --git a/src/plugins/qtsupport/qtprojectimporter.cpp b/src/plugins/qtsupport/qtprojectimporter.cpp index 1aff2dda8d..f2901f02c7 100644 --- a/src/plugins/qtsupport/qtprojectimporter.cpp +++ b/src/plugins/qtsupport/qtprojectimporter.cpp @@ -48,8 +48,8 @@ namespace QtSupport { QtProjectImporter::QtProjectImporter(const Utils::FileName &path) : ProjectImporter(path) { useTemporaryKitInformation(QtKitInformation::id(), - [this](Kit *k, const QVariantList &vl) { cleanupTemporaryQt(k, vl); }, - [this](Kit *k, const QVariantList &vl) { persistTemporaryQt(k, vl); }); + [this](Kit *k, const QVariantList &vl) {cleanupTemporaryQt(k, vl);}, + [this](Kit *k, const QVariantList &vl) {persistTemporaryQt(k, vl);}); } QtProjectImporter::QtVersionData @@ -175,7 +175,7 @@ public: QStringList importCandidates() override; - bool allDeleted() const { return m_deletedTestData.count() == m_testData.count(); } + bool allDeleted() const { return m_deletedTestData.count() == m_testData.count();} protected: QList<void *> examineDirectory(const Utils::FileName &importPath) const override; @@ -254,7 +254,7 @@ QList<BuildInfo *> TestQtProjectImporter::buildInfoListForKit(const Kit *k, void info->kitId = k->id(); info->buildType = BuildConfiguration::Debug; - return { info }; + return {info}; } void TestQtProjectImporter::deleteDirectoryData(void *directoryData) const @@ -293,64 +293,64 @@ void QtSupportPlugin::testQtProjectImporter_oneProject_data() << QList<bool>() << QList<bool>(); QTest::newRow("existing kit, cleanup") - << QList<int>({ 0 }) << QList<int>({ 0 }) << QList<bool>({ false }) - << QList<bool>({ true }) << QList<bool>({ true }); + << QList<int>({0}) << QList<int>({0}) << QList<bool>({false}) + << QList<bool>({true}) << QList<bool>({true}); QTest::newRow("existing kit, persist") - << QList<int>({ 0 }) << QList<int>({ 0 }) << QList<bool>({ true }) - << QList<bool>({ true }) << QList<bool>({ true }); + << QList<int>({0}) << QList<int>({0}) << QList<bool>({true}) + << QList<bool>({true}) << QList<bool>({true}); QTest::newRow("new kit, existing Qt, cleanup") - << QList<int>({ 1 }) << QList<int>({ 0 }) << QList<bool>({ false }) - << QList<bool>({ false }) << QList<bool>({ true }); + << QList<int>({1}) << QList<int>({0}) << QList<bool>({false}) + << QList<bool>({false}) << QList<bool>({true}); QTest::newRow("new kit, existing Qt, persist") - << QList<int>({ 1 }) << QList<int>({ 0 }) << QList<bool>({ true }) - << QList<bool>({ true }) << QList<bool>({ true }); + << QList<int>({1}) << QList<int>({0}) << QList<bool>({true}) + << QList<bool>({true}) << QList<bool>({true}); QTest::newRow("new kit, new Qt, cleanup") - << QList<int>({ 1 }) << QList<int>({ 1 }) << QList<bool>({ false }) - << QList<bool>({ false }) << QList<bool>({ false }); + << QList<int>({1}) << QList<int>({1}) << QList<bool>({false}) + << QList<bool>({false}) << QList<bool>({false}); QTest::newRow("new kit, new Qt, persist") - << QList<int>({ 1 }) << QList<int>({ 1 }) << QList<bool>({ true }) - << QList<bool>({ true }) << QList<bool>({ true }); + << QList<int>({1}) << QList<int>({1}) << QList<bool>({true}) + << QList<bool>({true}) << QList<bool>({true}); QTest::newRow("2 new kit, same existing Qt, cleanup-cleanup") - << QList<int>({ 1, 2 }) << QList<int>({ 0, 0 }) << QList<bool>({ false, false }) - << QList<bool>({ false, false }) << QList<bool>({ true, true }); + << QList<int>({1, 2}) << QList<int>({0, 0}) << QList<bool>({false, false}) + << QList<bool>({false, false}) << QList<bool>({true, true}); QTest::newRow("2 new kit, same existing Qt, persist-cleanup") - << QList<int>({ 1, 2 }) << QList<int>({ 0, 0 }) << QList<bool>({ true, false }) - << QList<bool>({ true, false }) << QList<bool>({ true, true }); + << QList<int>({1, 2}) << QList<int>({0, 0}) << QList<bool>({true, false}) + << QList<bool>({true, false}) << QList<bool>({true, true}); QTest::newRow("2 new kit, same existing Qt, cleanup-persist") - << QList<int>({ 1, 2 }) << QList<int>({ 0, 0 }) << QList<bool>({ false, true }) - << QList<bool>({ false, true }) << QList<bool>({ true, true }); + << QList<int>({1, 2}) << QList<int>({0, 0}) << QList<bool>({false, true}) + << QList<bool>({false, true}) << QList<bool>({true, true}); QTest::newRow("2 new kit, same existing Qt, persist-persist") - << QList<int>({ 1, 2 }) << QList<int>({ 0, 0 }) << QList<bool>({ true, true }) - << QList<bool>({ true, true }) << QList<bool>({ true, true }); + << QList<int>({1, 2}) << QList<int>({0, 0}) << QList<bool>({true, true}) + << QList<bool>({true, true}) << QList<bool>({true, true}); QTest::newRow("2 new kit, same new Qt, cleanup-cleanup") - << QList<int>({ 1, 2 }) << QList<int>({ 1, 1 }) << QList<bool>({ false, false }) - << QList<bool>({ false, false }) << QList<bool>({ true, false }); + << QList<int>({1, 2}) << QList<int>({1, 1}) << QList<bool>({false, false}) + << QList<bool>({false, false}) << QList<bool>({true, false}); QTest::newRow("2 new kit, same new Qt, persist-cleanup") - << QList<int>({ 1, 2 }) << QList<int>({ 1, 1 }) << QList<bool>({ true, false }) - << QList<bool>({ true, false }) << QList<bool>({ true, true }); + << QList<int>({1, 2}) << QList<int>({1, 1}) << QList<bool>({true, false}) + << QList<bool>({true, false}) << QList<bool>({true, true}); QTest::newRow("2 new kit, same new Qt, cleanup-persist") - << QList<int>({ 1, 2 }) << QList<int>({ 1, 1 }) << QList<bool>({ false, true }) - << QList<bool>({ false, true }) << QList<bool>({ true, true }); + << QList<int>({1, 2}) << QList<int>({1, 1}) << QList<bool>({false, true}) + << QList<bool>({false, true}) << QList<bool>({true, true}); QTest::newRow("2 new kit, same new Qt, persist-persist") - << QList<int>({ 1, 2 }) << QList<int>({ 1, 1 }) << QList<bool>({ true, true }) - << QList<bool>({ true, true }) << QList<bool>({ true, true }); + << QList<int>({1, 2}) << QList<int>({1, 1}) << QList<bool>({true, true}) + << QList<bool>({true, true}) << QList<bool>({true, true}); QTest::newRow("2 new kit, 2 new Qt, cleanup-cleanup") - << QList<int>({ 1, 2 }) << QList<int>({ 1, 2 }) << QList<bool>({ false, false }) - << QList<bool>({ false, false }) << QList<bool>({ false, false }); + << QList<int>({1, 2}) << QList<int>({1, 2}) << QList<bool>({false, false}) + << QList<bool>({false, false}) << QList<bool>({false, false}); QTest::newRow("2 new kit, 2 new Qt, persist-cleanup") - << QList<int>({ 1, 2 }) << QList<int>({ 1, 2 }) << QList<bool>({ true, false }) - << QList<bool>({ true, false }) << QList<bool>({ true, false }); + << QList<int>({1, 2}) << QList<int>({1, 2}) << QList<bool>({true, false}) + << QList<bool>({true, false}) << QList<bool>({true, false}); QTest::newRow("2 new kit, 2 new Qt, cleanup-persist") - << QList<int>({ 1, 2 }) << QList<int>({ 1, 2 }) << QList<bool>({ false, true }) - << QList<bool>({ false, true }) << QList<bool>({ false, true }); + << QList<int>({1, 2}) << QList<int>({1, 2}) << QList<bool>({false, true}) + << QList<bool>({false, true}) << QList<bool>({false, true}); QTest::newRow("2 new kit, 2 new Qt, persist-persist") - << QList<int>({ 1, 2 }) << QList<int>({ 1, 2 }) << QList<bool>({ true, true }) - << QList<bool>({ true, true }) << QList<bool>({ true, true }); + << QList<int>({1, 2}) << QList<int>({1, 2}) << QList<bool>({true, true}) + << QList<bool>({true, true}) << QList<bool>({true, true}); } void QtSupportPlugin::testQtProjectImporter_oneProject() @@ -371,16 +371,16 @@ void QtSupportPlugin::testQtProjectImporter_oneProject() const QString appDir = QCoreApplication::applicationDirPath(); // Templates referrenced by test data: - QVector<Kit *> kitTemplates = { defaultKit, defaultKit->clone(), defaultKit->clone() }; + QVector<Kit *> kitTemplates = {defaultKit, defaultKit->clone(), defaultKit->clone()}; // Customize kit numbers 1 and 2: QtKitInformation::setQtVersion(kitTemplates[1], nullptr); QtKitInformation::setQtVersion(kitTemplates[2], nullptr); SysRootKitInformation::setSysRoot(kitTemplates[1], Utils::FileName::fromString("/some/path")); SysRootKitInformation::setSysRoot(kitTemplates[2], Utils::FileName::fromString("/some/other/path")); - QVector<Utils::FileName> qmakePaths = { defaultQt->qmakeCommand(), - setupQmake(defaultQt, tempDir1.path()), - setupQmake(defaultQt, tempDir2.path()) }; + QVector<Utils::FileName> qmakePaths = {defaultQt->qmakeCommand(), + setupQmake(defaultQt, tempDir1.path()), + setupQmake(defaultQt, tempDir2.path())}; for (int i = 1; i < qmakePaths.count(); ++i) QVERIFY(!QtVersionManager::version(Utils::equal(&BaseQtVersion::qmakeCommand, qmakePaths.at(i)))); diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp index c85ec82873..321fd5895d 100644 --- a/src/plugins/qtsupport/qtversionmanager.cpp +++ b/src/plugins/qtsupport/qtversionmanager.cpp @@ -475,8 +475,8 @@ static void updateDocumentation() { QStringList files; foreach (BaseQtVersion *v, m_versions) { - const QStringList docPaths = QStringList({ v->documentationPath() + QChar('/'), - v->documentationPath() + "/qch/" }); + const QStringList docPaths = QStringList({v->documentationPath() + QChar('/'), + v->documentationPath() + "/qch/"}); foreach (const QString &docPath, docPaths) { const QDir versionHelpDir(docPath); foreach (const QString &helpFile, diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp index 98eee2dfe1..4db801e49e 100644 --- a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp +++ b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp @@ -63,7 +63,7 @@ QString EmbeddedLinuxQtVersion::description() const QSet<Core::Id> EmbeddedLinuxQtVersion::targetDeviceTypes() const { - return { Constants::GenericLinuxOsType }; + return {Constants::GenericLinuxOsType}; } } // namespace Internal diff --git a/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.cpp b/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.cpp index 58ecdc6b65..29c7170a6e 100644 --- a/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.cpp +++ b/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.cpp @@ -47,16 +47,16 @@ QList<BuildStepInfo> GenericRemoteLinuxDeployStepFactory::availableSteps(BuildSt if (!qobject_cast<RemoteLinuxDeployConfiguration *>(parent->parent())) return {}; - return {{ TarPackageCreationStep::stepId(), - TarPackageCreationStep::displayName() }, - { UploadAndInstallTarPackageStep::stepId(), - UploadAndInstallTarPackageStep::displayName() }, - { GenericDirectUploadStep::stepId(), - GenericDirectUploadStep::displayName() }, - { GenericRemoteLinuxCustomCommandDeploymentStep::stepId(), - GenericRemoteLinuxCustomCommandDeploymentStep::stepDisplayName() }, - { RemoteLinuxCheckForFreeDiskSpaceStep::stepId(), - RemoteLinuxCheckForFreeDiskSpaceStep::stepDisplayName() }}; + return {{TarPackageCreationStep::stepId(), + TarPackageCreationStep::displayName()}, + {UploadAndInstallTarPackageStep::stepId(), + UploadAndInstallTarPackageStep::displayName()}, + {GenericDirectUploadStep::stepId(), + GenericDirectUploadStep::displayName()}, + {GenericRemoteLinuxCustomCommandDeploymentStep::stepId(), + GenericRemoteLinuxCustomCommandDeploymentStep::stepDisplayName()}, + {RemoteLinuxCheckForFreeDiskSpaceStep::stepId(), + RemoteLinuxCheckForFreeDiskSpaceStep::stepDisplayName()}}; } BuildStep *GenericRemoteLinuxDeployStepFactory::create(BuildStepList *parent, Core::Id id) diff --git a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp index c12e238a59..80d728a433 100644 --- a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp +++ b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp @@ -42,32 +42,32 @@ ActionHandler::ActionHandler(QObject *parent) const char *keyseq; bool checkable; } actionInfos[] = { - { Utils::Icons::ZOOMIN_TOOLBAR, tr("Zoom In"), tr("Zoom In (Ctrl + + / Ctrl + Wheel)"), "Ctrl++", false }, - { Utils::Icons::ZOOMOUT_TOOLBAR, tr("Zoom Out"), tr("Zoom Out (Ctrl + - / Ctrl + Wheel)"), "Ctrl+-", false }, - { Utils::Icons::FITTOVIEW_TOOLBAR, tr("Fit to View"), tr("Fit to View (F11)"), "F11", false }, - { Utils::Icons::PAN_TOOLBAR, tr("Panning"), tr("Panning (Shift)"), "Shift", true }, + {Utils::Icons::ZOOMIN_TOOLBAR, tr("Zoom In"), tr("Zoom In (Ctrl + + / Ctrl + Wheel)"), "Ctrl++", false}, + {Utils::Icons::ZOOMOUT_TOOLBAR, tr("Zoom Out"), tr("Zoom Out (Ctrl + - / Ctrl + Wheel)"), "Ctrl+-", false}, + {Utils::Icons::FITTOVIEW_TOOLBAR, tr("Fit to View"), tr("Fit to View (F11)"), "F11", false}, + {Utils::Icons::PAN_TOOLBAR, tr("Panning"), tr("Panning (Shift)"), "Shift", true}, - { Utils::Icons::ZOOM_TOOLBAR, tr("Magnifier"), tr("Magnifier Tool (Alt)"), "Alt", true }, - { Utils::Icon(":/scxmleditor/images/navigator.png"), tr("Navigator"), tr("Navigator (Ctrl+E)"), "Ctrl+E", true }, + {Utils::Icons::ZOOM_TOOLBAR, tr("Magnifier"), tr("Magnifier Tool (Alt)"), "Alt", true}, + {Utils::Icon(":/scxmleditor/images/navigator.png"), tr("Navigator"), tr("Navigator (Ctrl+E)"), "Ctrl+E", true}, - { Utils::Icons::COPY_TOOLBAR, tr("Copy"), tr("Copy (Ctrl + C)"), "Ctrl+C", false }, - { Utils::Icons::CUT_TOOLBAR, tr("Cut"), tr("Cut (Ctrl + X)"), "Ctrl+X", false }, - { Utils::Icons::PASTE_TOOLBAR, tr("Paste"), tr("Paste (Ctrl + V)"), "Ctrl+V", false }, - { Utils::Icons::SNAPSHOT_TOOLBAR, tr("Screenshot"), tr("Screenshot (Ctrl + Shift + C)"), "Ctrl+Shift+C", false }, - { Utils::Icon({{":/scxmleditor/images/icon-export-canvas.png", Utils::Theme::IconsBaseColor}}), tr("Export to Image"), tr("Export to Image"), "Ctrl+Shift+E", false }, - { Utils::Icon({{":/utils/images/namespace.png", Utils::Theme::IconsBaseColor}}), tr("Toggle Full Namespace"), tr("Toggle Full Namespace"), "Ctrl+Shift+N", true }, + {Utils::Icons::COPY_TOOLBAR, tr("Copy"), tr("Copy (Ctrl + C)"), "Ctrl+C", false}, + {Utils::Icons::CUT_TOOLBAR, tr("Cut"), tr("Cut (Ctrl + X)"), "Ctrl+X", false}, + {Utils::Icons::PASTE_TOOLBAR, tr("Paste"), tr("Paste (Ctrl + V)"), "Ctrl+V", false}, + {Utils::Icons::SNAPSHOT_TOOLBAR, tr("Screenshot"), tr("Screenshot (Ctrl + Shift + C)"), "Ctrl+Shift+C", false}, + {Utils::Icon({{":/scxmleditor/images/icon-export-canvas.png", Utils::Theme::IconsBaseColor}}), tr("Export to Image"), tr("Export to Image"), "Ctrl+Shift+E", false}, + {Utils::Icon({{":/utils/images/namespace.png", Utils::Theme::IconsBaseColor}}), tr("Toggle Full Namespace"), tr("Toggle Full Namespace"), "Ctrl+Shift+N", true}, - { Utils::Icon({{":/scxmleditor/images/align_left.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Align Left"), tr("Align Left (Ctrl+L,1)"), "Ctrl+L,1", false }, - { Utils::Icon({{":/scxmleditor/images/align_right.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Align Right"), tr("Align Right (Ctrl+L,2)"), "Ctrl+L,2", false }, - { Utils::Icon({{":/scxmleditor/images/align_top.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Align Top"), tr("Align Top (Ctrl+L,3)"), "Ctrl+L,3", false }, - { Utils::Icon({{":/scxmleditor/images/align_bottom.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Align Bottom"), tr("Align Bottom (Ctrl+L,4)"), "Ctrl+L,4", false }, - { Utils::Icon({{":/scxmleditor/images/align_horizontal.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Align Horizontal"), tr("Align Horizontal (Ctrl+L,5)"), "Ctrl+L,5", false }, - { Utils::Icon({{":/scxmleditor/images/align_vertical.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Align Vertical"), tr("Align Vertical (Ctrl+L,6)"), "Ctrl+L,6", false }, - { Utils::Icon({{":/scxmleditor/images/adjust_width.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Adjust Width"), tr("Adjust Width (Ctrl+L,7)"), "Ctrl+L,7", false }, - { Utils::Icon({{":/scxmleditor/images/adjust_height.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Adjust Height"), tr("Adjust Height (Ctrl+L,8)"), "Ctrl+L,8", false }, - { Utils::Icon({{":/scxmleditor/images/adjust_size.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Adjust Size"), tr("Adjust Size (Ctrl+L,9)"), "Ctrl+L,9", false }, + {Utils::Icon({{":/scxmleditor/images/align_left.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Align Left"), tr("Align Left (Ctrl+L,1)"), "Ctrl+L,1", false}, + {Utils::Icon({{":/scxmleditor/images/align_right.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Align Right"), tr("Align Right (Ctrl+L,2)"), "Ctrl+L,2", false}, + {Utils::Icon({{":/scxmleditor/images/align_top.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Align Top"), tr("Align Top (Ctrl+L,3)"), "Ctrl+L,3", false}, + {Utils::Icon({{":/scxmleditor/images/align_bottom.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Align Bottom"), tr("Align Bottom (Ctrl+L,4)"), "Ctrl+L,4", false}, + {Utils::Icon({{":/scxmleditor/images/align_horizontal.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Align Horizontal"), tr("Align Horizontal (Ctrl+L,5)"), "Ctrl+L,5", false}, + {Utils::Icon({{":/scxmleditor/images/align_vertical.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Align Vertical"), tr("Align Vertical (Ctrl+L,6)"), "Ctrl+L,6", false}, + {Utils::Icon({{":/scxmleditor/images/adjust_width.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Adjust Width"), tr("Adjust Width (Ctrl+L,7)"), "Ctrl+L,7", false}, + {Utils::Icon({{":/scxmleditor/images/adjust_height.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Adjust Height"), tr("Adjust Height (Ctrl+L,8)"), "Ctrl+L,8", false}, + {Utils::Icon({{":/scxmleditor/images/adjust_size.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Adjust Size"), tr("Adjust Size (Ctrl+L,9)"), "Ctrl+L,9", false}, - { Utils::Icon(":/scxmleditor/images/statistics.png"), tr("Show Statistics..."), tr("Show Statistics"), "", false } + {Utils::Icon(":/scxmleditor/images/statistics.png"), tr("Show Statistics..."), tr("Show Statistics"), "", false} }; // Init actions diff --git a/src/plugins/scxmleditor/plugin_interface/scxmltypes.h b/src/plugins/scxmleditor/plugin_interface/scxmltypes.h index 5b7e4738a0..297181e362 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmltypes.h +++ b/src/plugins/scxmleditor/plugin_interface/scxmltypes.h @@ -87,119 +87,119 @@ struct scxmltag_type_t // Define tag-attributes const scxmltag_attribute_t scxml_scxml_attributes[] = { - { "initial", nullptr, false, false, QVariant::String }, - { "name", nullptr, false, true, QVariant::String }, - { "xmlns", "http://www.w3.org/2005/07/scxml", true, false, QVariant::String }, - { "version", "1.0", true, false, QVariant::String }, - { "datamodel", nullptr, false, true, QVariant::String }, - { "binding", "early;late", false, true, QVariant::StringList } + {"initial", nullptr, false, false, QVariant::String}, + {"name", nullptr, false, true, QVariant::String}, + {"xmlns", "http://www.w3.org/2005/07/scxml", true, false, QVariant::String}, + {"version", "1.0", true, false, QVariant::String}, + {"datamodel", nullptr, false, true, QVariant::String}, + {"binding", "early;late", false, true, QVariant::StringList} }; const scxmltag_attribute_t scxml_state_attributes[] = { - { "id", nullptr, false, true, QVariant::String }, - { "initial", nullptr, false, false, QVariant::String } + {"id", nullptr, false, true, QVariant::String}, + {"initial", nullptr, false, false, QVariant::String} }; const scxmltag_attribute_t scxml_parallel_attributes[] = { - { "id", nullptr, false, true, QVariant::String } + {"id", nullptr, false, true, QVariant::String} }; const scxmltag_attribute_t scxml_transition_attributes[] = { - { "event", nullptr, false, true, QVariant::String }, - { "cond", nullptr, false, true, QVariant::String }, - { "target", nullptr, false, true, QVariant::String }, - { "type", "internal;external", false, true, QVariant::StringList } + {"event", nullptr, false, true, QVariant::String}, + {"cond", nullptr, false, true, QVariant::String}, + {"target", nullptr, false, true, QVariant::String}, + {"type", "internal;external", false, true, QVariant::StringList} }; const scxmltag_attribute_t scxml_initialtransition_attributes[] = { - { "target", nullptr, false, false, QVariant::String } + {"target", nullptr, false, false, QVariant::String} }; const scxmltag_attribute_t scxml_final_attributes[] = { - { "id", nullptr, false, true, QVariant::String } + {"id", nullptr, false, true, QVariant::String} }; const scxmltag_attribute_t scxml_history_attributes[] = { - { "id", nullptr, false, true, QVariant::String }, - { "type", "shallow;deep", false, true, QVariant::StringList } + {"id", nullptr, false, true, QVariant::String}, + {"type", "shallow;deep", false, true, QVariant::StringList} }; const scxmltag_attribute_t scxml_raise_attributes[] = { - { "event", nullptr, true, true, QVariant::String } + {"event", nullptr, true, true, QVariant::String} }; const scxmltag_attribute_t scxml_if_attributes[] = { - { "cond", nullptr, true, true, QVariant::String }, + {"cond", nullptr, true, true, QVariant::String}, }; const scxmltag_attribute_t scxml_elseif_attributes[] = { - { "cond", nullptr, true, true, QVariant::String } + {"cond", nullptr, true, true, QVariant::String} }; const scxmltag_attribute_t scxml_foreach_attributes[] = { - { "array", nullptr, true, true, QVariant::String }, - { "item", nullptr, true, true, QVariant::String }, - { "index", nullptr, false, true, QVariant::String } + {"array", nullptr, true, true, QVariant::String}, + {"item", nullptr, true, true, QVariant::String}, + {"index", nullptr, false, true, QVariant::String} }; const scxmltag_attribute_t scxml_log_attributes[] = { - { "label", "", false, true, QVariant::String }, - { "expr", nullptr, false, true, QVariant::String } + {"label", "", false, true, QVariant::String}, + {"expr", nullptr, false, true, QVariant::String} }; const scxmltag_attribute_t scxml_data_attributes[] = { - { "id", nullptr, true, true, QVariant::String }, - { "src", nullptr, false, true, QVariant::String }, - { "expr", nullptr, false, true, QVariant::String } + {"id", nullptr, true, true, QVariant::String}, + {"src", nullptr, false, true, QVariant::String}, + {"expr", nullptr, false, true, QVariant::String} }; const scxmltag_attribute_t scxml_assign_attributes[] = { - { "location", nullptr, true, true, QVariant::String }, - { "expr", nullptr, false, true, QVariant::String } + {"location", nullptr, true, true, QVariant::String}, + {"expr", nullptr, false, true, QVariant::String} }; const scxmltag_attribute_t scxml_content_attributes[] = { - { "expr", nullptr, false, true, QVariant::String } + {"expr", nullptr, false, true, QVariant::String} }; const scxmltag_attribute_t scxml_param_attributes[] = { - { "name", nullptr, true, true, QVariant::String }, - { "expr", nullptr, false, true, QVariant::String }, - { "location", nullptr, false, true, QVariant::String } + {"name", nullptr, true, true, QVariant::String}, + {"expr", nullptr, false, true, QVariant::String}, + {"location", nullptr, false, true, QVariant::String} }; const scxmltag_attribute_t scxml_script_attributes[] = { - { "src", nullptr, false, true, QVariant::String } + {"src", nullptr, false, true, QVariant::String} }; const scxmltag_attribute_t scxml_send_attributes[] = { - { "event", nullptr, false, true, QVariant::String }, - { "eventexpr", nullptr, false, true, QVariant::String }, - { "target", nullptr, false, true, QVariant::String }, - { "targetexpr", nullptr, false, true, QVariant::String }, - { "type", nullptr, false, true, QVariant::String }, - { "typeexpr", nullptr, false, true, QVariant::String }, - { "id", nullptr, false, true, QVariant::String }, - { "idlocation", nullptr, false, true, QVariant::String }, - { "delay", nullptr, false, true, QVariant::String }, - { "delayexpr", nullptr, false, true, QVariant::String }, - { "namelist", nullptr, false, true, QVariant::String } + {"event", nullptr, false, true, QVariant::String}, + {"eventexpr", nullptr, false, true, QVariant::String}, + {"target", nullptr, false, true, QVariant::String}, + {"targetexpr", nullptr, false, true, QVariant::String}, + {"type", nullptr, false, true, QVariant::String}, + {"typeexpr", nullptr, false, true, QVariant::String}, + {"id", nullptr, false, true, QVariant::String}, + {"idlocation", nullptr, false, true, QVariant::String}, + {"delay", nullptr, false, true, QVariant::String}, + {"delayexpr", nullptr, false, true, QVariant::String}, + {"namelist", nullptr, false, true, QVariant::String} }; const scxmltag_attribute_t scxml_cancel_attributes[] = { - { "sendid", nullptr, false, true, QVariant::String }, - { "sendidexpr", nullptr, false, true, QVariant::String } + {"sendid", nullptr, false, true, QVariant::String}, + {"sendidexpr", nullptr, false, true, QVariant::String} }; const scxmltag_attribute_t scxml_invoke_attributes[] = { - { "type", nullptr, false, true, QVariant::String }, - { "typeexpr", nullptr, false, true, QVariant::String }, - { "src", nullptr, false, true, QVariant::String }, - { "srcexpr", nullptr, false, true, QVariant::String }, - { "id", nullptr, false, true, QVariant::String }, - { "idlocation", nullptr, false, true, QVariant::String }, - { "namelist", nullptr, false, true, QVariant::String }, - { "autoforward", ";true;false", false, true, QVariant::StringList } + {"type", nullptr, false, true, QVariant::String}, + {"typeexpr", nullptr, false, true, QVariant::String}, + {"src", nullptr, false, true, QVariant::String}, + {"srcexpr", nullptr, false, true, QVariant::String}, + {"id", nullptr, false, true, QVariant::String}, + {"idlocation", nullptr, false, true, QVariant::String}, + {"namelist", nullptr, false, true, QVariant::String}, + {"autoforward", ";true;false", false, true, QVariant::StringList} }; const scxmltag_type_t scxml_unknown = { diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index 45adf27b6c..93037d992e 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -5663,7 +5663,7 @@ void TextEditorWidgetPrivate::highlightSearchResultsInScrollBar() const QString &fileName = m_document->filePath().toString(); FileListIterator *it = - new FileListIterator( { fileName } , { const_cast<QTextCodec *>(m_document->codec()) } ); + new FileListIterator({fileName} , {const_cast<QTextCodec *>(m_document->codec())}); QMap<QString, QString> fileToContentsMap; fileToContentsMap[fileName] = m_document->plainText(); diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index 9c12058208..5558b01ccf 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -498,11 +498,11 @@ CallgrindTool::CallgrindTool(QObject *parent) Debugger::registerToolbar(CallgrindPerspectiveId, toolbar); Debugger::registerPerspective(CallgrindPerspectiveId, new Perspective(tr("Callgrind"), { - { CallgrindFlatDockId, m_flatView, {}, Perspective::SplitVertical }, - { CallgrindCalleesDockId, m_calleesView, {}, Perspective::SplitVertical }, - { CallgrindCallersDockId, m_callersView, CallgrindCalleesDockId, Perspective::SplitHorizontal }, - { CallgrindVisualizationDockId, m_visualization, {}, Perspective::SplitVertical, - false, Qt::RightDockWidgetArea } + {CallgrindFlatDockId, m_flatView, {}, Perspective::SplitVertical}, + {CallgrindCalleesDockId, m_calleesView, {}, Perspective::SplitVertical}, + {CallgrindCallersDockId, m_callersView, CallgrindCalleesDockId, Perspective::SplitHorizontal}, + {CallgrindVisualizationDockId, m_visualization, {}, Perspective::SplitVertical, + false, Qt::RightDockWidgetArea} })); connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::updateRunActions, diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index ca51ee56df..5ee597784f 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -304,17 +304,17 @@ MemcheckTool::MemcheckTool(QObject *parent) tr("These suppression files were used in the last memory analyzer run.")); QAction *a = new QAction(tr("Definite Memory Leaks"), this); - initKindFilterAction(a, { Leak_DefinitelyLost, Leak_IndirectlyLost }); + initKindFilterAction(a, {Leak_DefinitelyLost, Leak_IndirectlyLost}); m_errorFilterActions.append(a); a = new QAction(tr("Possible Memory Leaks"), this); - initKindFilterAction(a, { Leak_PossiblyLost, Leak_StillReachable }); + initKindFilterAction(a, {Leak_PossiblyLost, Leak_StillReachable}); m_errorFilterActions.append(a); a = new QAction(tr("Use of Uninitialized Memory"), this); - initKindFilterAction(a, { InvalidRead, InvalidWrite, InvalidJump, Overlap, - InvalidMemPool, UninitCondition, UninitValue, - SyscallParam, ClientCheck }); + initKindFilterAction(a, {InvalidRead, InvalidWrite, InvalidJump, Overlap, + InvalidMemPool, UninitCondition, UninitValue, + SyscallParam, ClientCheck}); m_errorFilterActions.append(a); a = new QAction(tr("Invalid Calls to \"free()\""), this); @@ -338,7 +338,7 @@ MemcheckTool::MemcheckTool(QObject *parent) m_errorView->setWindowTitle(tr("Memory Issues")); Debugger::registerPerspective(MemcheckPerspectiveId, new Perspective (tr("Memcheck"), { - { MemcheckErrorDockId, m_errorView, {}, Perspective::SplitVertical } + {MemcheckErrorDockId, m_errorView, {}, Perspective::SplitVertical} })); connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::updateRunActions, diff --git a/src/plugins/valgrind/valgrindmemcheckparsertest.cpp b/src/plugins/valgrind/valgrindmemcheckparsertest.cpp index c38be539d1..cfb685457b 100644 --- a/src/plugins/valgrind/valgrindmemcheckparsertest.cpp +++ b/src/plugins/valgrind/valgrindmemcheckparsertest.cpp @@ -133,8 +133,8 @@ void ValgrindMemcheckParserTest::initTest(const QString &testfile, const QString m_process->start( fakeValgrind, - QStringList({ QString("--xml-socket=127.0.0.1:%1").arg(m_server->serverPort()), "-i", - dataFile(testfile)}) << otherArgs); + QStringList({QString("--xml-socket=127.0.0.1:%1").arg(m_server->serverPort()), "-i", + dataFile(testfile)}) << otherArgs); QVERIFY(m_process->waitForStarted(5000)); QCOMPARE(m_process->state(), QProcess::Running); diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index d5c994ef5e..13bcb6757e 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -145,7 +145,7 @@ public: setMinimumHeight(30); const QString fileName = QString(":/welcome/images/%1.png").arg(iconSource); - const Icon icon({{ fileName, Theme::Welcome_ForegroundPrimaryColor }}, Icon::Tint); + const Icon icon({{fileName, Theme::Welcome_ForegroundPrimaryColor}}, Icon::Tint); m_icon = new QLabel; m_icon->setPixmap(icon.pixmap()); diff --git a/src/plugins/winrt/winrtdeployconfiguration.cpp b/src/plugins/winrt/winrtdeployconfiguration.cpp index a5a3108372..66b8917b1c 100644 --- a/src/plugins/winrt/winrtdeployconfiguration.cpp +++ b/src/plugins/winrt/winrtdeployconfiguration.cpp @@ -146,9 +146,9 @@ QList<BuildStepInfo> WinRtDeployStepFactory::availableSteps(BuildStepList *paren || parent->contains(Constants::WINRT_BUILD_STEP_DEPLOY)) return {}; - return {{ Constants::WINRT_BUILD_STEP_DEPLOY, - QCoreApplication::translate("WinRt::Internal::WinRtDeployStepFactory", "Run windeployqt"), - BuildStepInfo::Unclonable }}; + return {{Constants::WINRT_BUILD_STEP_DEPLOY, + QCoreApplication::translate("WinRt::Internal::WinRtDeployStepFactory", "Run windeployqt"), + BuildStepInfo::Unclonable}}; } BuildStep *WinRtDeployStepFactory::create(BuildStepList *parent, Core::Id id) diff --git a/src/plugins/winrt/winrtphoneqtversion.cpp b/src/plugins/winrt/winrtphoneqtversion.cpp index 19bd931f15..e3e2aa65e5 100644 --- a/src/plugins/winrt/winrtphoneqtversion.cpp +++ b/src/plugins/winrt/winrtphoneqtversion.cpp @@ -58,7 +58,7 @@ QString WinRtPhoneQtVersion::type() const QSet<Core::Id> WinRtPhoneQtVersion::targetDeviceTypes() const { - return { Constants::WINRT_DEVICE_TYPE_PHONE, Constants::WINRT_DEVICE_TYPE_EMULATOR }; + return {Constants::WINRT_DEVICE_TYPE_PHONE, Constants::WINRT_DEVICE_TYPE_EMULATOR}; } } // Internal diff --git a/src/plugins/winrt/winrtqtversion.cpp b/src/plugins/winrt/winrtqtversion.cpp index 50769989f7..082eafd1e9 100644 --- a/src/plugins/winrt/winrtqtversion.cpp +++ b/src/plugins/winrt/winrtqtversion.cpp @@ -72,7 +72,7 @@ QList<ProjectExplorer::Abi> WinRtQtVersion::detectQtAbis() const QSet<Core::Id> WinRtQtVersion::targetDeviceTypes() const { - return { Constants::WINRT_DEVICE_TYPE_LOCAL, Constants::WINRT_DEVICE_TYPE_EMULATOR }; + return {Constants::WINRT_DEVICE_TYPE_LOCAL, Constants::WINRT_DEVICE_TYPE_EMULATOR}; } } // Internal diff --git a/src/shared/json/json.cpp b/src/shared/json/json.cpp index 1ae076ad22..58e6beb06d 100644 --- a/src/shared/json/json.cpp +++ b/src/shared/json/json.cpp @@ -4607,8 +4607,8 @@ bool Parser::parseString() namespace Internal { -static const Base emptyArray = { sizeof(Base), { 0 }, 0 }; -static const Base emptyObject = { sizeof(Base), { 0 }, 0 }; +static const Base emptyArray = {sizeof(Base), {0}, 0}; +static const Base emptyObject = {sizeof(Base), {0}, 0}; void Data::compact() diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index 60319672a4..28a1144de4 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/src/shared/proparser/profileevaluator.cpp @@ -83,14 +83,14 @@ QVector<ProFileEvaluator::SourceFile> ProFileEvaluator::fixifiedValues( foreach (const ProString &str, d->values(ProKey(variable))) { const QString &el = d->m_option->expandEnvVars(str.toQString()); if (IoUtils::isAbsolutePath(el)) { - result << SourceFile{ QDir::cleanPath(el), str.sourceFile() }; + result << SourceFile{QDir::cleanPath(el), str.sourceFile()}; } else { QString fn = QDir::cleanPath(baseDirectory + QLatin1Char('/') + el); if (IoUtils::exists(fn)) - result << SourceFile{ fn, str.sourceFile() }; + result << SourceFile{fn, str.sourceFile()}; else - result << SourceFile{ QDir::cleanPath(buildDirectory + QLatin1Char('/') + el), - str.sourceFile() }; + result << SourceFile{QDir::cleanPath(buildDirectory + QLatin1Char('/') + el), + str.sourceFile()}; } } return result; @@ -142,7 +142,7 @@ QVector<ProFileEvaluator::SourceFile> ProFileEvaluator::absoluteFileValues( foreach (const QString &dir, searchDirs) { QString fn = QDir::cleanPath(dir + QLatin1Char('/') + el); if (m_vfs->exists(fn, flags)) { - result << SourceFile{ fn, str.sourceFile() }; + result << SourceFile{fn, str.sourceFile()}; goto next; } } @@ -166,7 +166,7 @@ QVector<ProFileEvaluator::SourceFile> ProFileEvaluator::absoluteFileValues( theDir.setFilter(theDir.filter() & ~QDir::AllDirs); foreach (const QString &fn, theDir.entryList(QStringList(wildcard))) if (fn != QLatin1String(".") && fn != QLatin1String("..")) - result << SourceFile{ absDir + QLatin1Char('/') + fn, str.sourceFile() }; + result << SourceFile{absDir + QLatin1Char('/') + fn, str.sourceFile()}; } // else if (acceptMissing) } } diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp index 852c40d55d..8808169b14 100644 --- a/src/shared/proparser/qmakebuiltins.cpp +++ b/src/shared/proparser/qmakebuiltins.cpp @@ -105,53 +105,53 @@ void QMakeEvaluator::initFunctionStatics() const char * const name; const ExpandFunc func; } expandInits[] = { - { "member", E_MEMBER }, - { "str_member", E_STR_MEMBER }, - { "first", E_FIRST }, - { "take_first", E_TAKE_FIRST }, - { "last", E_LAST }, - { "take_last", E_TAKE_LAST }, - { "size", E_SIZE }, - { "str_size", E_STR_SIZE }, - { "cat", E_CAT }, - { "fromfile", E_FROMFILE }, - { "eval", E_EVAL }, - { "list", E_LIST }, - { "sprintf", E_SPRINTF }, - { "format_number", E_FORMAT_NUMBER }, - { "num_add", E_NUM_ADD }, - { "join", E_JOIN }, - { "split", E_SPLIT }, - { "basename", E_BASENAME }, - { "dirname", E_DIRNAME }, - { "section", E_SECTION }, - { "find", E_FIND }, - { "system", E_SYSTEM }, - { "unique", E_UNIQUE }, - { "sorted", E_SORTED }, - { "reverse", E_REVERSE }, - { "quote", E_QUOTE }, - { "escape_expand", E_ESCAPE_EXPAND }, - { "upper", E_UPPER }, - { "lower", E_LOWER }, - { "title", E_TITLE }, - { "re_escape", E_RE_ESCAPE }, - { "val_escape", E_VAL_ESCAPE }, - { "files", E_FILES }, - { "prompt", E_PROMPT }, - { "replace", E_REPLACE }, - { "sort_depends", E_SORT_DEPENDS }, - { "resolve_depends", E_RESOLVE_DEPENDS }, - { "enumerate_vars", E_ENUMERATE_VARS }, - { "shadowed", E_SHADOWED }, - { "absolute_path", E_ABSOLUTE_PATH }, - { "relative_path", E_RELATIVE_PATH }, - { "clean_path", E_CLEAN_PATH }, - { "system_path", E_SYSTEM_PATH }, - { "shell_path", E_SHELL_PATH }, - { "system_quote", E_SYSTEM_QUOTE }, - { "shell_quote", E_SHELL_QUOTE }, - { "getenv", E_GETENV }, + {"member", E_MEMBER}, + {"str_member", E_STR_MEMBER}, + {"first", E_FIRST}, + {"take_first", E_TAKE_FIRST}, + {"last", E_LAST}, + {"take_last", E_TAKE_LAST}, + {"size", E_SIZE}, + {"str_size", E_STR_SIZE}, + {"cat", E_CAT}, + {"fromfile", E_FROMFILE}, + {"eval", E_EVAL}, + {"list", E_LIST}, + {"sprintf", E_SPRINTF}, + {"format_number", E_FORMAT_NUMBER}, + {"num_add", E_NUM_ADD}, + {"join", E_JOIN}, + {"split", E_SPLIT}, + {"basename", E_BASENAME}, + {"dirname", E_DIRNAME}, + {"section", E_SECTION}, + {"find", E_FIND}, + {"system", E_SYSTEM}, + {"unique", E_UNIQUE}, + {"sorted", E_SORTED}, + {"reverse", E_REVERSE}, + {"quote", E_QUOTE}, + {"escape_expand", E_ESCAPE_EXPAND}, + {"upper", E_UPPER}, + {"lower", E_LOWER}, + {"title", E_TITLE}, + {"re_escape", E_RE_ESCAPE}, + {"val_escape", E_VAL_ESCAPE}, + {"files", E_FILES}, + {"prompt", E_PROMPT}, + {"replace", E_REPLACE}, + {"sort_depends", E_SORT_DEPENDS}, + {"resolve_depends", E_RESOLVE_DEPENDS}, + {"enumerate_vars", E_ENUMERATE_VARS}, + {"shadowed", E_SHADOWED}, + {"absolute_path", E_ABSOLUTE_PATH}, + {"relative_path", E_RELATIVE_PATH}, + {"clean_path", E_CLEAN_PATH}, + {"system_path", E_SYSTEM_PATH}, + {"shell_path", E_SHELL_PATH}, + {"system_quote", E_SYSTEM_QUOTE}, + {"shell_quote", E_SHELL_QUOTE}, + {"getenv", E_GETENV}, }; statics.expands.reserve((int)(sizeof(expandInits)/sizeof(expandInits[0]))); for (unsigned i = 0; i < sizeof(expandInits)/sizeof(expandInits[0]); ++i) @@ -161,38 +161,38 @@ void QMakeEvaluator::initFunctionStatics() const char * const name; const TestFunc func; } testInits[] = { - { "requires", T_REQUIRES }, - { "greaterThan", T_GREATERTHAN }, - { "lessThan", T_LESSTHAN }, - { "equals", T_EQUALS }, - { "isEqual", T_EQUALS }, - { "exists", T_EXISTS }, - { "export", T_EXPORT }, - { "clear", T_CLEAR }, - { "unset", T_UNSET }, - { "eval", T_EVAL }, - { "CONFIG", T_CONFIG }, - { "if", T_IF }, - { "isActiveConfig", T_CONFIG }, - { "system", T_SYSTEM }, - { "discard_from", T_DISCARD_FROM }, - { "defined", T_DEFINED }, - { "contains", T_CONTAINS }, - { "infile", T_INFILE }, - { "count", T_COUNT }, - { "isEmpty", T_ISEMPTY }, - { "parseJson", T_PARSE_JSON }, - { "load", T_LOAD }, - { "include", T_INCLUDE }, - { "debug", T_DEBUG }, - { "log", T_LOG }, - { "message", T_MESSAGE }, - { "warning", T_WARNING }, - { "error", T_ERROR }, - { "mkpath", T_MKPATH }, - { "write_file", T_WRITE_FILE }, - { "touch", T_TOUCH }, - { "cache", T_CACHE }, + {"requires", T_REQUIRES}, + {"greaterThan", T_GREATERTHAN}, + {"lessThan", T_LESSTHAN}, + {"equals", T_EQUALS}, + {"isEqual", T_EQUALS}, + {"exists", T_EXISTS}, + {"export", T_EXPORT}, + {"clear", T_CLEAR}, + {"unset", T_UNSET}, + {"eval", T_EVAL}, + {"CONFIG", T_CONFIG}, + {"if", T_IF}, + {"isActiveConfig", T_CONFIG}, + {"system", T_SYSTEM}, + {"discard_from", T_DISCARD_FROM}, + {"defined", T_DEFINED}, + {"contains", T_CONTAINS}, + {"infile", T_INFILE}, + {"count", T_COUNT}, + {"isEmpty", T_ISEMPTY}, + {"parseJson", T_PARSE_JSON}, + {"load", T_LOAD}, + {"include", T_INCLUDE}, + {"debug", T_DEBUG}, + {"log", T_LOG}, + {"message", T_MESSAGE}, + {"warning", T_WARNING}, + {"error", T_ERROR}, + {"mkpath", T_MKPATH}, + {"write_file", T_WRITE_FILE}, + {"touch", T_TOUCH}, + {"cache", T_CACHE}, }; statics.functions.reserve((int)(sizeof(testInits)/sizeof(testInits[0]))); for (unsigned i = 0; i < sizeof(testInits)/sizeof(testInits[0]); ++i) @@ -594,7 +594,7 @@ ProStringList QMakeEvaluator::evaluateBuiltinExpand( int width = 0; bool zeropad = false; bool leftalign = false; - enum { DefaultSign, PadSign, AlwaysSign } sign = DefaultSign; + enum {DefaultSign, PadSign, AlwaysSign } sign = DefaultSign; if (args.count() >= 2) { const auto opts = split_value_list(args.at(1).toQStringRef()); for (const ProString &opt : opts) { @@ -956,10 +956,10 @@ ProStringList QMakeEvaluator::evaluateBuiltinExpand( struct { char in, out; } mapped_quotes[] = { - { 'n', '\n' }, - { 't', '\t' }, - { 'r', '\r' }, - { 0, 0 } + {'n', '\n' }, + {'t', '\t' }, + {'r', '\r' }, + {0, 0 } }; for (int i = 0; mapped_quotes[i].in; ++i) { if (*(i_data+x+1) == QLatin1Char(mapped_quotes[i].in)) { diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 5e318b170d..9eb14251ba 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -161,27 +161,27 @@ void QMakeEvaluator::initStatics() static const struct { const char * const oldname, * const newname; } mapInits[] = { - { "INTERFACES", "FORMS" }, - { "QMAKE_POST_BUILD", "QMAKE_POST_LINK" }, - { "TARGETDEPS", "POST_TARGETDEPS" }, - { "LIBPATH", "QMAKE_LIBDIR" }, - { "QMAKE_EXT_MOC", "QMAKE_EXT_CPP_MOC" }, - { "QMAKE_MOD_MOC", "QMAKE_H_MOD_MOC" }, - { "QMAKE_LFLAGS_SHAPP", "QMAKE_LFLAGS_APP" }, - { "PRECOMPH", "PRECOMPILED_HEADER" }, - { "PRECOMPCPP", "PRECOMPILED_SOURCE" }, - { "INCPATH", "INCLUDEPATH" }, - { "QMAKE_EXTRA_WIN_COMPILERS", "QMAKE_EXTRA_COMPILERS" }, - { "QMAKE_EXTRA_UNIX_COMPILERS", "QMAKE_EXTRA_COMPILERS" }, - { "QMAKE_EXTRA_WIN_TARGETS", "QMAKE_EXTRA_TARGETS" }, - { "QMAKE_EXTRA_UNIX_TARGETS", "QMAKE_EXTRA_TARGETS" }, - { "QMAKE_EXTRA_UNIX_INCLUDES", "QMAKE_EXTRA_INCLUDES" }, - { "QMAKE_EXTRA_UNIX_VARIABLES", "QMAKE_EXTRA_VARIABLES" }, - { "QMAKE_RPATH", "QMAKE_LFLAGS_RPATH" }, - { "QMAKE_FRAMEWORKDIR", "QMAKE_FRAMEWORKPATH" }, - { "QMAKE_FRAMEWORKDIR_FLAGS", "QMAKE_FRAMEWORKPATH_FLAGS" }, - { "IN_PWD", "PWD" }, - { "DEPLOYMENT", "INSTALLS" } + {"INTERFACES", "FORMS"}, + {"QMAKE_POST_BUILD", "QMAKE_POST_LINK"}, + {"TARGETDEPS", "POST_TARGETDEPS"}, + {"LIBPATH", "QMAKE_LIBDIR"}, + {"QMAKE_EXT_MOC", "QMAKE_EXT_CPP_MOC"}, + {"QMAKE_MOD_MOC", "QMAKE_H_MOD_MOC"}, + {"QMAKE_LFLAGS_SHAPP", "QMAKE_LFLAGS_APP"}, + {"PRECOMPH", "PRECOMPILED_HEADER"}, + {"PRECOMPCPP", "PRECOMPILED_SOURCE"}, + {"INCPATH", "INCLUDEPATH"}, + {"QMAKE_EXTRA_WIN_COMPILERS", "QMAKE_EXTRA_COMPILERS"}, + {"QMAKE_EXTRA_UNIX_COMPILERS", "QMAKE_EXTRA_COMPILERS"}, + {"QMAKE_EXTRA_WIN_TARGETS", "QMAKE_EXTRA_TARGETS"}, + {"QMAKE_EXTRA_UNIX_TARGETS", "QMAKE_EXTRA_TARGETS"}, + {"QMAKE_EXTRA_UNIX_INCLUDES", "QMAKE_EXTRA_INCLUDES"}, + {"QMAKE_EXTRA_UNIX_VARIABLES", "QMAKE_EXTRA_VARIABLES"}, + {"QMAKE_RPATH", "QMAKE_LFLAGS_RPATH"}, + {"QMAKE_FRAMEWORKDIR", "QMAKE_FRAMEWORKPATH"}, + {"QMAKE_FRAMEWORKDIR_FLAGS", "QMAKE_FRAMEWORKPATH_FLAGS"}, + {"IN_PWD", "PWD"}, + {"DEPLOYMENT", "INSTALLS"} }; statics.varMap.reserve((int)(sizeof(mapInits)/sizeof(mapInits[0]))); for (unsigned i = 0; i < sizeof(mapInits)/sizeof(mapInits[0]); ++i) diff --git a/src/shared/qtsingleapplication/qtlocalpeer.cpp b/src/shared/qtsingleapplication/qtlocalpeer.cpp index 840a5e8b75..2b3b8745ef 100644 --- a/src/shared/qtsingleapplication/qtlocalpeer.cpp +++ b/src/shared/qtsingleapplication/qtlocalpeer.cpp @@ -118,7 +118,7 @@ bool QtLocalPeer::sendMessage(const QString &message, int timeout, bool block) #if defined(Q_OS_WIN) Sleep(DWORD(ms)); #else - struct timespec ts = { ms / 1000, (ms % 1000) * 1000 * 1000 }; + struct timespec ts = {ms / 1000, (ms % 1000) * 1000 * 1000}; nanosleep(&ts, NULL); #endif } diff --git a/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp b/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp index 1c0eeedc8d..6e7fb20e62 100644 --- a/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp +++ b/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp @@ -362,7 +362,7 @@ private: static void createImageFromDot(const QString &inputFile, const QString &outputFile, bool verbose) { const QString command = CplusplusToolsUtils::portableExecutableName(QLatin1String("dot")); - const QStringList arguments = QStringList({ "-Tpng", "-o", outputFile, inputFile }); + const QStringList arguments = QStringList({"-Tpng", "-o", outputFile, inputFile}); CplusplusToolsUtils::executeCommand(command, arguments, QString(), verbose); } @@ -421,7 +421,7 @@ public: if (! m_errorString) return; - static const char *const pretty[] = { "warning", "error", "fatal" }; + static const char *const pretty[] = {"warning", "error", "fatal"}; QString str; str.sprintf("%s:%d:%d: When parsing as %s: %s: ", fileName->chars(), line, column, diff --git a/src/tools/qtcreatorcrashhandler/crashhandler.cpp b/src/tools/qtcreatorcrashhandler/crashhandler.cpp index 0bd212b561..c6df3c9ad9 100644 --- a/src/tools/qtcreatorcrashhandler/crashhandler.cpp +++ b/src/tools/qtcreatorcrashhandler/crashhandler.cpp @@ -302,7 +302,7 @@ void CrashHandler::debugApplication() QString executable = d->creatorInPath.toString(); if (executable.isEmpty() && !d->restartAppCommandLine.isEmpty()) executable = d->restartAppCommandLine.at(0); - const QStringList commandLine = QStringList({ executable, "-debug", QString::number(d->pid) }); + const QStringList commandLine = QStringList({executable, "-debug", QString::number(d->pid)}); QStringList environment; if (!d->restartAppEnvironment.isEmpty()) environment = d->restartAppEnvironment; diff --git a/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp b/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp index f31d976c19..4a95cc6068 100644 --- a/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp +++ b/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp @@ -139,7 +139,7 @@ CrashHandlerSetup::CrashHandlerSetup(const QString &appName, sa.sa_flags = SA_RESETHAND | SA_NODEFER | SA_ONSTACK; // See "man 7 signal" for an overview of signals. // Do not add SIGPIPE here, QProcess and QTcpSocket use it. - const int signalsToHandle[] = { SIGILL, SIGABRT, SIGFPE, SIGSEGV, SIGBUS, 0 }; + const int signalsToHandle[] = {SIGILL, SIGABRT, SIGFPE, SIGSEGV, SIGBUS, 0}; for (int i = 0; signalsToHandle[i]; ++i) { if (sigaction(signalsToHandle[i], &sa, 0) == -1 ) { qWarning("Warning: Failed to install signal handler for signal \"%s\" (%s).", diff --git a/src/tools/sdktool/addcmakeoperation.cpp b/src/tools/sdktool/addcmakeoperation.cpp index 33c4b2541a..d6e6146d75 100644 --- a/src/tools/sdktool/addcmakeoperation.cpp +++ b/src/tools/sdktool/addcmakeoperation.cpp @@ -210,18 +210,18 @@ QVariantMap AddCMakeOperation::addCMake(const QVariantMap &map, const QString &i nameList << GetOperation::get(map, nameKey).toString(); const QString uniqueName = makeUnique(displayName, nameList); - QVariantMap result = RmKeysOperation::rmKeys(map, { COUNT }); + QVariantMap result = RmKeysOperation::rmKeys(map, {COUNT}); const QString cm = QString::fromLatin1(PREFIX) + QString::number(count); KeyValuePairList data; - data << KeyValuePair({ cm, ID_KEY }, QVariant(id)); - data << KeyValuePair({ cm, DISPLAYNAME_KEY }, QVariant(uniqueName)); - data << KeyValuePair({ cm, AUTODETECTED_KEY }, QVariant(true)); - data << KeyValuePair({ cm, PATH_KEY }, QVariant(path)); + data << KeyValuePair({cm, ID_KEY}, QVariant(id)); + data << KeyValuePair({cm, DISPLAYNAME_KEY}, QVariant(uniqueName)); + data << KeyValuePair({cm, AUTODETECTED_KEY}, QVariant(true)); + data << KeyValuePair({cm, PATH_KEY}, QVariant(path)); KeyValuePairList extraList; foreach (const KeyValuePair &pair, extra) - extraList << KeyValuePair(QStringList({ cm }) << pair.key, pair.value); + extraList << KeyValuePair(QStringList({cm}) << pair.key, pair.value); data.append(extraList); data << KeyValuePair(COUNT, QVariant(count + 1)); diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp index ff8ad11b1a..5ae75099d7 100644 --- a/src/tools/sdktool/addkitoperation.cpp +++ b/src/tools/sdktool/addkitoperation.cpp @@ -336,7 +336,7 @@ bool AddKitOperation::test() const "uname", 1, KeyValuePairList()); - const QStringList env = { "TEST=1", "PATH" }; + const QStringList env = {"TEST=1", "PATH"}; if (map.count() != 3 || !map.contains(VERSION) || map.value(VERSION).toInt() != 1 @@ -354,7 +354,7 @@ bool AddKitOperation::test() const tcs, "{qt-id}", "unsupported/mkspec", QString(), QString(), QString(), QString(), QString(), QStringList(), QStringList(), - KeyValuePairList({ KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue")) })); + KeyValuePairList({KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))})); if (!empty.isEmpty()) return false; // Do not fail if TC is an ABI: @@ -365,7 +365,7 @@ bool AddKitOperation::test() const "/usr/bin/gdb-test", "Desktop", "{dev-id}", QString(), tcs, "{qt-id}", "unsupported/mkspec", QString(), QString(), QString(), QString(), QString(), QStringList(), env, - KeyValuePairList({ KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue")) })); + KeyValuePairList({KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))})); if (empty.isEmpty()) return false; // QTCREATORBUG-11983, mach_o was not covered by the first attempt to fix this. @@ -375,7 +375,7 @@ bool AddKitOperation::test() const "/usr/bin/gdb-test", "Desktop", "{dev-id}", QString(), tcs, "{qt-id}", "unsupported/mkspec", QString(), QString(), QString(), QString(), QString(), QStringList(), env, - KeyValuePairList({ KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue")) })); + KeyValuePairList({KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))})); if (empty.isEmpty()) return false; @@ -388,7 +388,7 @@ bool AddKitOperation::test() const "/usr/bin/gdb-test", "Desktop", "{dev-id}", QString(), tcs, "{qtXX-id}", "unsupported/mkspec", QString(), QString(), QString(), QString(), QString(), QStringList(), env, - KeyValuePairList({ KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue")) })); + KeyValuePairList({KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))})); if (!empty.isEmpty()) return false; // Fail if dev is not there: @@ -397,7 +397,7 @@ bool AddKitOperation::test() const "/usr/bin/gdb-test", "Desktop", "{devXX-id}", QString(), tcs, "{qt-id}", "unsupported/mkspec", QString(), QString(), QString(), QString(), QString(), QStringList(), env, - KeyValuePairList({ KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue")) })); + KeyValuePairList({KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))})); if (!empty.isEmpty()) return false; @@ -407,7 +407,7 @@ bool AddKitOperation::test() const "/usr/bin/gdb-test", "Desktop", QString(), QString(), tcs, "{qt-id}", "unsupported/mkspec", QString(), QString(), QString(), QString(), QString(), QStringList(), env, - KeyValuePairList({ KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue")) })); + KeyValuePairList({KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))})); if (map.count() != 4 || !map.contains(VERSION) || map.value(VERSION).toInt() != 1 @@ -446,7 +446,7 @@ bool AddKitOperation::test() const "/tmp/icon3.png", QString(), 1, "/usr/bin/gdb-test3", "Desktop", QString(), QString(), tcs, "{qt-id}", "unsupported/mkspec", QString(), QString(), QString(), QString(), QString(), QStringList(), env, - KeyValuePairList({ KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue")) })); + KeyValuePairList({KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))})); if (!result.isEmpty()) return false; @@ -456,7 +456,7 @@ bool AddKitOperation::test() const "/usr/bin/gdb-test2", "Desktop", "{dev-id}", "/sys/root\\\\", tcs, "{qt-id}", "unsupported/mkspec", QString(), QString(), QString(), QString(), QString(), QStringList(), env, - KeyValuePairList({ KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue")) })); + KeyValuePairList({KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))})); if (map.count() != 5 || !map.contains(VERSION) || map.value(VERSION).toInt() != 1 || !map.contains(COUNT) || map.value(COUNT).toInt() != 2 @@ -500,7 +500,7 @@ bool AddKitOperation::test() const "/tmp/icon2.png", "debugger Id", 0, QString(), "Desktop", QString(), QString(), tcs, "{qt-id}", "unsupported/mkspec", QString(), QString(), QString(), QString(), QString(), QStringList(), env, - KeyValuePairList({ KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue")) })); + KeyValuePairList({KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))})); if (map.count() != 6 || !map.contains(VERSION) || map.value(VERSION).toInt() != 1 || !map.contains(COUNT) || map.value(COUNT).toInt() != 3 @@ -628,7 +628,7 @@ QVariantMap AddKitOperation::addKit(const QVariantMap &map, const QVariantMap &t defaultKit = id; // remove data: - QVariantMap cleaned = RmKeysOperation::rmKeys(map, { COUNT, DEFAULT }); + QVariantMap cleaned = RmKeysOperation::rmKeys(map, {COUNT, DEFAULT}); // Sanity check: Make sure displayName is unique. QStringList nameKeys = FindKeyOperation::findKey(map, DISPLAYNAME); @@ -638,32 +638,32 @@ QVariantMap AddKitOperation::addKit(const QVariantMap &map, const QVariantMap &t const QString uniqueName = makeUnique(displayName, nameList); // insert data: - KeyValuePairList data = { KeyValuePair({ kit, ID }, QVariant(id)), - KeyValuePair({ kit, DISPLAYNAME }, QVariant(uniqueName)), - KeyValuePair({ kit, ICON }, QVariant(icon)), - KeyValuePair({ kit, AUTODETECTED }, QVariant(true)), - KeyValuePair({ kit, SDK }, QVariant(true)) }; + KeyValuePairList data = { KeyValuePair({kit, ID}, QVariant(id)), + KeyValuePair({kit, DISPLAYNAME}, QVariant(uniqueName)), + KeyValuePair({kit, ICON}, QVariant(icon)), + KeyValuePair({kit, AUTODETECTED}, QVariant(true)), + KeyValuePair({kit, SDK}, QVariant(true))}; if (!debuggerId.isEmpty() || !debugger.isEmpty()) { if (debuggerId.isEmpty()) { - data << KeyValuePair({ kit, DATA, DEBUGGER, DEBUGGER_ENGINE }, QVariant(debuggerType)); - data << KeyValuePair({ kit, DATA, DEBUGGER, DEBUGGER_BINARY }, QVariant(debugger)); + data << KeyValuePair({kit, DATA, DEBUGGER, DEBUGGER_ENGINE}, QVariant(debuggerType)); + data << KeyValuePair({kit, DATA, DEBUGGER, DEBUGGER_BINARY}, QVariant(debugger)); } else { - data << KeyValuePair({ kit, DATA, DEBUGGER }, QVariant(debuggerId)); + data << KeyValuePair({kit, DATA, DEBUGGER }, QVariant(debuggerId)); } } if (!deviceType.isNull()) - data << KeyValuePair({ kit, DATA, DEVICE_TYPE }, QVariant(deviceType)); + data << KeyValuePair({kit, DATA, DEVICE_TYPE}, QVariant(deviceType)); if (!device.isNull()) - data << KeyValuePair({ kit, DATA, DEVICE_ID }, QVariant(device)); + data << KeyValuePair({kit, DATA, DEVICE_ID}, QVariant(device)); if (!sysRoot.isNull()) - data << KeyValuePair({ kit, DATA, SYSROOT }, QVariant(sysRoot)); + data << KeyValuePair({kit, DATA, SYSROOT}, QVariant(sysRoot)); for (auto i = tcs.constBegin(); i != tcs.constEnd(); ++i) - data << KeyValuePair({ kit, DATA, TOOLCHAIN, i.key() }, QVariant(i.value())); + data << KeyValuePair({kit, DATA, TOOLCHAIN, i.key()}, QVariant(i.value())); if (!qtId.isNull()) - data << KeyValuePair({ kit, DATA, QT }, QVariant(qtId)); + data << KeyValuePair({kit, DATA, QT}, QVariant(qtId)); if (!mkspec.isNull()) - data << KeyValuePair({ kit, DATA, MKSPEC }, QVariant(mkspec)); + data << KeyValuePair({kit, DATA, MKSPEC}, QVariant(mkspec)); if (!cmakeId.isNull()) data << KeyValuePair({kit, DATA, CMAKE_ID}, QVariant(cmakeId)); if (!cmakeGenerator.isNull()) { @@ -675,12 +675,12 @@ QVariantMap AddKitOperation::addKit(const QVariantMap &map, const QVariantMap &t generatorMap.insert("Toolset", cmakeGeneratorToolset); if (!cmakeGeneratorPlatform.isNull()) generatorMap.insert("Platform", cmakeGeneratorPlatform); - data << KeyValuePair({ kit, DATA, CMAKE_GENERATOR }, generatorMap); + data << KeyValuePair({kit, DATA, CMAKE_GENERATOR}, generatorMap); } if (!cmakeConfiguration.isEmpty()) data << KeyValuePair({kit, DATA, CMAKE_CONFIGURATION}, QVariant(cmakeConfiguration)); if (!env.isEmpty()) - data << KeyValuePair({ kit, DATA, ENV }, QVariant(env)); + data << KeyValuePair({kit, DATA, ENV}, QVariant(env)); data << KeyValuePair(DEFAULT, QVariant(defaultKit)); data << KeyValuePair(COUNT, QVariant(count + 1)); diff --git a/src/tools/sdktool/addtoolchainoperation.cpp b/src/tools/sdktool/addtoolchainoperation.cpp index 8dca1282c3..ee31311dd6 100644 --- a/src/tools/sdktool/addtoolchainoperation.cpp +++ b/src/tools/sdktool/addtoolchainoperation.cpp @@ -259,25 +259,25 @@ QVariantMap AddToolChainOperation::addToolChain(const QVariantMap &map, const QS nameList << GetOperation::get(map, nameKey).toString(); const QString uniqueName = makeUnique(displayName, nameList); - QVariantMap result = RmKeysOperation::rmKeys(map, { COUNT }); + QVariantMap result = RmKeysOperation::rmKeys(map, {COUNT}); const QString tc = QString::fromLatin1(PREFIX) + QString::number(count); KeyValuePairList data; - data << KeyValuePair({ tc, ID }, QVariant(id)); - data << KeyValuePair({ tc, LANGUAGE_KEY }, QVariant(lang)); - data << KeyValuePair({ tc, DISPLAYNAME }, QVariant(uniqueName)); - data << KeyValuePair({ tc, AUTODETECTED }, QVariant(true)); - data << KeyValuePair({ tc, PATH }, QVariant(path)); - data << KeyValuePair({ tc, TARGET_ABI }, QVariant(abi)); + data << KeyValuePair({tc, ID}, QVariant(id)); + data << KeyValuePair({tc, LANGUAGE_KEY}, QVariant(lang)); + data << KeyValuePair({tc, DISPLAYNAME}, QVariant(uniqueName)); + data << KeyValuePair({tc, AUTODETECTED}, QVariant(true)); + data << KeyValuePair({tc, PATH}, QVariant(path)); + data << KeyValuePair({tc, TARGET_ABI}, QVariant(abi)); QVariantList abis; QStringList abiStrings = supportedAbis.split(','); foreach (const QString &s, abiStrings) abis << QVariant(s); - data << KeyValuePair({ tc, SUPPORTED_ABIS }, QVariant(abis)); + data << KeyValuePair({tc, SUPPORTED_ABIS}, QVariant(abis)); KeyValuePairList tcExtraList; foreach (const KeyValuePair &pair, extra) - tcExtraList << KeyValuePair(QStringList({ tc }) << pair.key, pair.value); + tcExtraList << KeyValuePair(QStringList({tc}) << pair.key, pair.value); data.append(tcExtraList); data << KeyValuePair(COUNT, QVariant(count + 1)); diff --git a/src/tools/sdktool/rmcmakeoperation.cpp b/src/tools/sdktool/rmcmakeoperation.cpp index 0da4651ad3..dc41b748c3 100644 --- a/src/tools/sdktool/rmcmakeoperation.cpp +++ b/src/tools/sdktool/rmcmakeoperation.cpp @@ -98,7 +98,7 @@ bool RmCMakeOperation::test() const // Add cmakes: QVariantMap map = AddCMakeOperation::initializeCMake(); map = AddCMakeOperation::addCMake(map, "testId", "name", "/tmp/test", - KeyValuePairList({ KeyValuePair("ExtraKey", QVariant("ExtraValue")) })); + KeyValuePairList({KeyValuePair("ExtraKey", QVariant("ExtraValue"))})); map = AddCMakeOperation::addCMake(map, "testId2", "other name", "/tmp/test2", KeyValuePairList()); QVariantMap result = rmCMake(QVariantMap(), "nonexistent"); diff --git a/src/tools/sdktool/rmkitoperation.cpp b/src/tools/sdktool/rmkitoperation.cpp index 37dc58330e..caa4c2f0e0 100644 --- a/src/tools/sdktool/rmkitoperation.cpp +++ b/src/tools/sdktool/rmkitoperation.cpp @@ -201,7 +201,7 @@ QVariantMap RmKitOperation::rmKit(const QVariantMap &map, const QString &id) defaultKit = (count > 1) ? 0 : -1; // remove data: - result = RmKeysOperation::rmKeys(result, { COUNT, DEFAULT }); + result = RmKeysOperation::rmKeys(result, {COUNT, DEFAULT}); // insert data: KeyValuePairList data; diff --git a/src/tools/sdktool/rmtoolchainoperation.cpp b/src/tools/sdktool/rmtoolchainoperation.cpp index 8bacf95703..bb1e8d1728 100644 --- a/src/tools/sdktool/rmtoolchainoperation.cpp +++ b/src/tools/sdktool/rmtoolchainoperation.cpp @@ -99,7 +99,7 @@ bool RmToolChainOperation::test() const QVariantMap map = AddToolChainOperation::initializeToolChains(); map = AddToolChainOperation::addToolChain(map, "testId", "langId", "name", "/tmp/test", "test-abi", "test-abi,test-abi2", - KeyValuePairList({ KeyValuePair("ExtraKey", QVariant("ExtraValue")) })); + KeyValuePairList({KeyValuePair("ExtraKey", QVariant("ExtraValue"))})); map = AddToolChainOperation::addToolChain(map, "testId2", "langId", "other name", "/tmp/test2", "test-abi", "test-abi,test-abi2", KeyValuePairList()); diff --git a/src/tools/valgrindfake/outputgenerator.cpp b/src/tools/valgrindfake/outputgenerator.cpp index 693d317478..d2c944dac7 100644 --- a/src/tools/valgrindfake/outputgenerator.cpp +++ b/src/tools/valgrindfake/outputgenerator.cpp @@ -44,7 +44,7 @@ void doSleep(int msec) { ::Sleep(msec); } #include <unistd.h> void doSleep(int msec) { - struct timespec ts = { msec / 1000, (msec % 1000) * 1000000 }; + struct timespec ts = {msec / 1000, (msec % 1000) * 1000000}; ::nanosleep(&ts, NULL); } #endif diff --git a/src/tools/winrtdebughelper/winrtdebughelper.cpp b/src/tools/winrtdebughelper/winrtdebughelper.cpp index 6a1ba37485..79bf3280ae 100644 --- a/src/tools/winrtdebughelper/winrtdebughelper.cpp +++ b/src/tools/winrtdebughelper/winrtdebughelper.cpp @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) { int pid = -1; const size_t maxPipeNameSize = 256; - wchar_t pipeName[maxPipeNameSize] = { 0 }; + wchar_t pipeName[maxPipeNameSize] = {0}; for (int i = 0; i < argc - 1; ++i) { if (!strcmp(argv[i], "-t")) { |