diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000000..e8ba10e5e8 --- /dev/null +++ b/.clang-format @@ -0,0 +1,87 @@ +# Copyright (C) 2016 Olivier Goffart +# +# You may use this file under the terms of the 3-clause BSD license. +# See the file LICENSE from this package for details. + +# This is the clang-format configuration style to be used by Qt, +# based on the rules from https://wiki.qt.io/Qt_Coding_Style and +# https://wiki.qt.io/Coding_Conventions + +--- +# Webkit style was loosely based on the Qt style +BasedOnStyle: WebKit + +Standard: Cpp11 + +# Column width is limited to 100 in accordance with Qt Coding Style. +# https://wiki.qt.io/Qt_Coding_Style +# Note that this may be changed at some point in the future. +ColumnLimit: 100 +# How much weight do extra characters after the line length limit have. +# PenaltyExcessCharacter: 4 + +# Disable reflow of qdoc comments: indentation rules are different. +# Translation comments are also excluded. +CommentPragmas: "^!|^:" + +# We want a space between the type and the star for pointer types. +PointerBindsToType: false + +# We use template< without space. +SpaceAfterTemplateKeyword: false + +# We want to break before the operators, but not before a '='. +BreakBeforeBinaryOperators: NonAssignment + +# Braces are usually attached, but not after functions or class declarations. +BreakBeforeBraces: Custom +BraceWrapping: + AfterClass: true + AfterControlStatement: false + AfterEnum: false + AfterFunction: true + AfterNamespace: false + AfterObjCDeclaration: false + AfterStruct: true + AfterUnion: false + BeforeCatch: false + BeforeElse: false + IndentBraces: false + +# When constructor initializers do not fit on one line, put them each on a new line. +ConstructorInitializerAllOnOneLineOrOnePerLine: true +# Indent initializers by 4 spaces +ConstructorInitializerIndentWidth: 4 + +# Indent width for line continuations. +ContinuationIndentWidth: 8 + +# No indentation for namespaces. +NamespaceIndentation: None + +# Allow indentation for preprocessing directives (if/ifdef/endif). https://reviews.llvm.org/rL312125 +#IndentPPDirectives: AfterHash +# AfterHash is broken, since it indents every single include statement not following after an ifdef +IndentPPDirectives: None + +# Horizontally align arguments after an open bracket. +# The coding style does not specify the following, but this is what gives +# results closest to the existing code. +AlignAfterOpenBracket: true +AlwaysBreakTemplateDeclarations: true + +# Ideally we should also allow less short function in a single line, but +# clang-format does not handle that. +AllowShortFunctionsOnASingleLine: Inline + +# The coding style specifies some include order categories, but also tells to +# separate categories with an empty line. It does not specify the order within +# the categories. Since the SortInclude feature of clang-format does not +# re-order includes separated by empty lines, the feature is not used. +SortIncludes: false + +# macros for which the opening brace stays attached. +ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ] + +# Break constructor initializers before the colon and after the commas. +BreakConstructorInitializers: BeforeColon diff --git a/gui/window.cpp b/gui/window.cpp index e5fbdb1a22..b6af82b2af 100644 --- a/gui/window.cpp +++ b/gui/window.cpp @@ -194,21 +194,21 @@ void Window::createTrayIcon() void Window::startMinikube() { - QStringList args = {"start", "-p", selectedCluster()}; + QStringList args = { "start", "-p", selectedCluster() }; sendMinikubeCommand(args); updateClusters(); } void Window::stopMinikube() { - QStringList args = {"stop", "-p", selectedCluster()}; + QStringList args = { "stop", "-p", selectedCluster() }; sendMinikubeCommand(args); updateClusters(); } void Window::deleteMinikube() { - QStringList args = {"delete", "-p", selectedCluster()}; + QStringList args = { "delete", "-p", selectedCluster() }; sendMinikubeCommand(args); updateClusters(); } @@ -224,7 +224,7 @@ void Window::updateClusters() ClusterList Window::getClusters() { ClusterList clusters; - QStringList args = {"profile", "list", "-o", "json"}; + QStringList args = { "profile", "list", "-o", "json" }; QString text; bool success = sendMinikubeCommand(args, text); QStringList lines; @@ -456,7 +456,7 @@ void Window::askName() int code = dialog.exec(); profile = profileField.text(); if (code == QDialog::Accepted) { - QStringList arg = {"start", "-p", profile}; + QStringList arg = { "start", "-p", profile }; sendMinikubeCommand(arg); } else if (code == QDialog::Rejected) { askCustom(); @@ -495,10 +495,21 @@ void Window::askCustom() int code = dialog.exec(); if (code == QDialog::Accepted) { driver = driverComboBox->itemText(driverComboBox->currentIndex()); - containerRuntime = containerRuntimeComboBox->itemText(containerRuntimeComboBox->currentIndex()); + containerRuntime = + containerRuntimeComboBox->itemText(containerRuntimeComboBox->currentIndex()); cpus = cpuField.text().toInt(); memory = memoryField.text().toInt(); - QStringList args = {"start", "-p", profile, "--driver", driver, "--container-runtime", containerRuntime, "--cpus", QString::number(cpus), "--memory", QString::number(memory)}; + QStringList args = { "start", + "-p", + profile, + "--driver", + driver, + "--container-runtime", + containerRuntime, + "--cpus", + QString::number(cpus), + "--memory", + QString::number(memory) }; sendMinikubeCommand(args); } } @@ -544,7 +555,7 @@ void Window::sshConsole() } } - QStringList arguments = {"-e", QString("%1 ssh -p %2").arg(program, selectedCluster())}; + QStringList arguments = { "-e", QString("%1 ssh -p %2").arg(program, selectedCluster()) }; QProcess *process = new QProcess(this); process->start(QStandardPaths::findExecutable(terminal), arguments); #endif @@ -556,7 +567,7 @@ void Window::dashboardBrowser() QString program = minikubePath(); QProcess *process = new QProcess(this); - QStringList arguments = {"dashboard", "-p", selectedCluster()}; + QStringList arguments = { "dashboard", "-p", selectedCluster() }; process->start(program, arguments); dashboardProcess = process;