Apply cmake-format and clang-format

This commit is contained in:
Martchus 2019-05-04 21:03:32 +02:00
parent 1691b9daa2
commit f4143a6eb1
4 changed files with 19 additions and 11 deletions

View File

@ -169,7 +169,8 @@ set(REQUIRED_ICONS
view-media-lyrics)
# find c++utilities
set(CONFIGURATION_PACKAGE_SUFFIX "" CACHE STRING "sets the suffix for find_package() calls to packages configured via c++utilities")
set(CONFIGURATION_PACKAGE_SUFFIX ""
CACHE STRING "sets the suffix for find_package() calls to packages configured via c++utilities")
find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED)
use_cpp_utilities()
include(BasicConfig)
@ -230,10 +231,17 @@ include(ConfigHeader)
add_desktop_file()
# create custom desktop file for launching the renaming utility separately
add_custom_desktop_file(FILE_NAME "${META_ID}-renamingutility"
DESKTOP_FILE_APP_NAME "Renaming utility (${META_APP_NAME})"
DESKTOP_FILE_GENERIC_NAME "Renaming utility (${META_APP_NAME})"
DESKTOP_FILE_DESCRIPTION "Tool to rename files using its tag information"
DESKTOP_FILE_CATEGORIES "${META_APP_CATEGORIES}"
DESKTOP_FILE_CMD "${META_TARGET_NAME} qt-gui --renaming-utility"
DESKTOP_FILE_ICON "${META_PROJECT_NAME}")
add_custom_desktop_file(FILE_NAME
"${META_ID}-renamingutility"
DESKTOP_FILE_APP_NAME
"Renaming utility (${META_APP_NAME})"
DESKTOP_FILE_GENERIC_NAME
"Renaming utility (${META_APP_NAME})"
DESKTOP_FILE_DESCRIPTION
"Tool to rename files using its tag information"
DESKTOP_FILE_CATEGORIES
"${META_APP_CATEGORIES}"
DESKTOP_FILE_CMD
"${META_TARGET_NAME} qt-gui --renaming-utility"
DESKTOP_FILE_ICON
"${META_PROJECT_NAME}")

View File

@ -228,7 +228,7 @@ template <> struct hash<FieldScope> {
using std::hash;
return (hash<FieldId>()(scope.field) ^ (hash<TagType>()(scope.tagType) << 1) >> 1)
^ (hash<TagTarget>()(scope.tagTarget) ^ (static_cast<unsigned long>(scope.allTracks) << 4)
^ (hash<vector<std::uint64_t>>()(scope.trackIds) << 1) >> 1);
^ (hash<vector<std::uint64_t>>()(scope.trackIds) << 1) >> 1);
}
};

View File

@ -89,7 +89,7 @@ public:
}
}
template<typename IntegralType, Traits::EnableIf<std::is_integral<IntegralType>> * = nullptr>
template <typename IntegralType, Traits::EnableIf<std::is_integral<IntegralType>> * = nullptr>
void appendRow(const QString &label, IntegralType number)
{
if (number) {

View File

@ -359,7 +359,7 @@ void PicturePreviewSelection::addOfSelectedType(const QString &path)
if ((fileInfo.size() >= 10485760)
&& (QMessageBox::warning(this, QCoreApplication::applicationName(),
tr("The selected file is very large (for a cover). Do you want to continue?"), QMessageBox::Yes, QMessageBox::No)
== QMessageBox::No)) {
== QMessageBox::No)) {
return;
}