Browse Source

Apply clang-format

sendfile
Martchus 3 years ago
parent
commit
151a3ae9e5
  1. 4
      application/argumentparser.cpp
  2. 2
      application/argumentparser.h
  3. 2
      application/fakeqtconfigarguments.cpp
  4. 6
      tests/testutils.cpp

4
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

2
application/argumentparser.h

@ -831,7 +831,7 @@ inline void Argument::setFlags(Argument::Flags flags, bool add)
{
m_flags = add ? (m_flags | flags)
: static_cast<Argument::Flags>(static_cast<std::underlying_type<Argument::Flags>::type>(m_flags)
& ~static_cast<std::underlying_type<Argument::Flags>::type>(flags));
& ~static_cast<std::underlying_type<Argument::Flags>::type>(flags));
}
/*!

2
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)")
{

6
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;
}

Loading…
Cancel
Save