From 151a3ae9e5368b79b8c4b938afb3026ae8d1f4b5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 4 May 2019 20:58:23 +0200 Subject: [PATCH] Apply clang-format --- application/argumentparser.cpp | 4 ++-- application/argumentparser.h | 2 +- application/fakeqtconfigarguments.cpp | 2 +- tests/testutils.cpp | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/application/argumentparser.cpp b/application/argumentparser.cpp index efc2dff..ae72595 100644 --- a/application/argumentparser.cpp +++ b/application/argumentparser.cpp @@ -1721,7 +1721,7 @@ void ValueConversion::Helper::ArgumentValueConversionError::throwFailure(const s throw Failure(argumentPath.empty() ? argsToString("Conversion of top-level value \"", valueToConvert, "\" to type \"", targetTypeName, "\" failed: ", errorMessage) : argsToString("Conversion of value \"", valueToConvert, "\" (for argument --", argumentPath.back()->name(), ") to type \"", - targetTypeName, "\" failed: ", errorMessage)); + targetTypeName, "\" failed: ", errorMessage)); } /*! @@ -1732,7 +1732,7 @@ void ArgumentOccurrence::throwNumberOfValuesNotSufficient(unsigned long valuesTo throw Failure(path.empty() ? argsToString("Expected ", valuesToConvert, " top-level values to be present but only ", values.size(), " have been specified.") : argsToString("Expected ", valuesToConvert, " values for argument --", path.back()->name(), " to be present but only ", values.size(), - " have been specified.")); + " have been specified.")); } } // namespace ApplicationUtilities diff --git a/application/argumentparser.h b/application/argumentparser.h index 59510c7..488ea02 100644 --- a/application/argumentparser.h +++ b/application/argumentparser.h @@ -831,7 +831,7 @@ inline void Argument::setFlags(Argument::Flags flags, bool add) { m_flags = add ? (m_flags | flags) : static_cast(static_cast::type>(m_flags) - & ~static_cast::type>(flags)); + & ~static_cast::type>(flags)); } /*! diff --git a/application/fakeqtconfigarguments.cpp b/application/fakeqtconfigarguments.cpp index 9decfa7..03b415c 100644 --- a/application/fakeqtconfigarguments.cpp +++ b/application/fakeqtconfigarguments.cpp @@ -14,7 +14,7 @@ namespace ApplicationUtilities { */ FakeQtConfigArguments::FakeQtConfigArguments() : m_qtWidgetsGuiArg( - "qt-widgets-gui", 'g', "shows a Qt widgets based graphical user interface (the application has not been built with Qt widgets support)") + "qt-widgets-gui", 'g', "shows a Qt widgets based graphical user interface (the application has not been built with Qt widgets support)") , m_qtQuickGuiArg( "qt-quick-gui", 'q', "shows a Qt quick based graphical user interface (the application has not been built with Qt quick support)") { diff --git a/tests/testutils.cpp b/tests/testutils.cpp index d48021a..66057bc 100644 --- a/tests/testutils.cpp +++ b/tests/testutils.cpp @@ -261,9 +261,9 @@ string TestApplication::testFilePath(const string &relativeTestFilePath) const // file still not found -> return default path if (!fileExists(path = "./testfiles/" + relativeTestFilePath)) { - throw runtime_error("The testfile \"" % relativeTestFilePath % "\" can not be located. Was looking under: \"" - % m_testFilesPath % relativeTestFilePath % "\", \"" % m_fallbackTestFilesPath % relativeTestFilePath - % "\" and \"./testfiles/" % relativeTestFilePath + "\""); + throw runtime_error("The testfile \"" % relativeTestFilePath % "\" can not be located. Was looking under: \"" % m_testFilesPath + % relativeTestFilePath % "\", \"" % m_fallbackTestFilesPath % relativeTestFilePath % "\" and \"./testfiles/" % relativeTestFilePath + + "\""); } return path; }