Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package grantleetheme for openSUSE:Factory checked in at 2021-08-16 10:06:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grantleetheme (Old) and /work/SRC/openSUSE:Factory/.grantleetheme.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grantleetheme" Mon Aug 16 10:06:09 2021 rev:66 rq:911614 version:21.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/grantleetheme/grantleetheme.changes 2021-07-09 23:58:24.808956490 +0200 +++ /work/SRC/openSUSE:Factory/.grantleetheme.new.1899/grantleetheme.changes 2021-08-16 10:06:26.903463866 +0200 @@ -1,0 +2,25 @@ +Fri Aug 6 09:34:48 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/21.08.0 +- No code change since 21.07.90 + +------------------------------------------------------------------- +Fri Jul 30 10:04:32 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.07.90 + * New feature release +- No code change since 21.07.80 + +------------------------------------------------------------------- +Sat Jul 17 20:05:36 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.07.80 + * New feature release +- Changes since 21.04.3: + * Use QStringView +- Only install the license files once + +------------------------------------------------------------------- Old: ---- grantleetheme-21.04.3.tar.xz grantleetheme-21.04.3.tar.xz.sig New: ---- grantleetheme-21.08.0.tar.xz grantleetheme-21.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grantleetheme.spec ++++++ --- /var/tmp/diff_new_pack.Pn5cAW/_old 2021-08-16 10:06:29.475460788 +0200 +++ /var/tmp/diff_new_pack.Pn5cAW/_new 2021-08-16 10:06:29.479460783 +0200 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: grantleetheme -Version: 21.04.3 +Version: 21.08.0 Release: 0 Summary: Grantlee theme support License: GPL-2.0-only @@ -44,12 +44,29 @@ BuildRequires: cmake(Qt5Widgets) %if %{with lang} %requires_eq grantlee5 -Recommends: %{name}-lang %endif %description the grantleetheme library adds Grantlee theme support for PIM applications. +%package -n libKF5GrantleeTheme5 +Summary: GrantleeTheme library for KDE PIM applications +License: LGPL-2.1-or-later +Group: System/Libraries +Requires: grantleetheme = %{version} + +%description -n libKF5GrantleeTheme5 +The GrantleeTheme library + +%package devel +Summary: Development package for grantleetheme +License: LGPL-2.1-or-later +Group: Development/Libraries/KDE +Requires: libKF5GrantleeTheme5 = %{version} + +%description devel +The development package for the grantleetheme library + %lang_package %prep @@ -66,29 +83,10 @@ %find_lang %{name} --with-man --all-name %endif -%package -n libKF5GrantleeTheme5 -Summary: GrantleeTheme library for KDE PIM applications -License: LGPL-2.1-or-later -Group: System/Libraries -Requires: grantleetheme = %{version} - -%description -n libKF5GrantleeTheme5 -The GrantleeTheme library - %post -n libKF5GrantleeTheme5 -p /sbin/ldconfig %postun -n libKF5GrantleeTheme5 -p /sbin/ldconfig -%package devel -Summary: Development package for grantleetheme -License: LGPL-2.1-or-later -Group: Development/Libraries/KDE -Requires: libKF5GrantleeTheme5 = %{version} - -%description devel -The development package for the grantleetheme library - %files devel -%license LICENSES/* %{_kf5_cmakedir}/KF5GrantleeTheme/ %{_kf5_includedir}/GrantleeTheme/ %{_kf5_includedir}/grantleetheme/ @@ -97,17 +95,16 @@ %{_kf5_mkspecsdir}/qt_GrantleeTheme.pri %files -%license LICENSES/* %{_kf5_debugdir}/grantleetheme.categories %{_kf5_debugdir}/grantleetheme.renamecategories %{_kf5_libdir}/grantlee/ %files -n libKF5GrantleeTheme5 +%license LICENSES/* %{_kf5_libdir}/libKF5GrantleeTheme.so.* %if %{with lang} %files lang -f %{name}.lang -%license LICENSES/* %endif %changelog ++++++ grantleetheme-21.04.3.tar.xz -> grantleetheme-21.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/.clang-format new/grantleetheme-21.08.0/.clang-format --- old/grantleetheme-21.04.3/.clang-format 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/.clang-format 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ ---- -# SPDX-FileCopyrightText: 2019 Christoph Cullmann <cullm...@kde.org> -# SPDX-FileCopyrightText: 2019 Gernot Gebhard <gebh...@absint.com> -# -# SPDX-License-Identifier: MIT - -# Style for C++ -Language: Cpp - -# base is WebKit coding style: https://webkit.org/code-style-guidelines/ -# below are only things set that diverge from this style! -BasedOnStyle: WebKit - -# enforce C++11 (e.g. for std::vector<std::vector<lala>> -Standard: Cpp11 - -# 4 spaces indent -TabWidth: 4 - -# 2 * 80 wide lines -ColumnLimit: 160 - -# sort includes inside line separated groups -SortIncludes: true - -# break before braces on function, namespace and class definitions. -BreakBeforeBraces: Linux - -# CrlInstruction *a; -PointerAlignment: Right - -# horizontally aligns arguments after an open bracket. -AlignAfterOpenBracket: Align - -# don't move all parameters to new line -AllowAllParametersOfDeclarationOnNextLine: false - -# no single line functions -AllowShortFunctionsOnASingleLine: None - -# always break before you encounter multi line strings -AlwaysBreakBeforeMultilineStrings: true - -# don't move arguments to own lines if they are not all on the same -BinPackArguments: false - -# don't move parameters to own lines if they are not all on the same -BinPackParameters: false - -# In case we have an if statement whith multiple lines the operator should be at the beginning of the line -# but we do not want to break assignments -BreakBeforeBinaryOperators: NonAssignment - -# format C++11 braced lists like function calls -Cpp11BracedListStyle: true - -# do not put a space before C++11 braced lists -SpaceBeforeCpp11BracedList: false - -# remove empty lines -KeepEmptyLinesAtTheStartOfBlocks: false - -# no namespace indentation to keep indent level low -NamespaceIndentation: None - -# we use template< without space. -SpaceAfterTemplateKeyword: false - -# macros for which the opening brace stays attached. -ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ] - -# keep lambda formatting multi-line if not empty -AllowShortLambdasOnASingleLine: Empty - -# We do not want clang-format to put all arguments on a new line -AllowAllArgumentsOnNextLine: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/.gitignore new/grantleetheme-21.08.0/.gitignore --- old/grantleetheme-21.04.3/.gitignore 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/.gitignore 2021-07-30 14:45:44.000000000 +0200 @@ -19,3 +19,8 @@ CMakeLists.txt.user* *.unc-backup* compile_commands.json +.clang-format +.clangd +.idea +/cmake-build* +.cache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/CMakeLists.txt new/grantleetheme-21.08.0/CMakeLists.txt --- old/grantleetheme-21.04.3/CMakeLists.txt 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/CMakeLists.txt 2021-07-30 14:45:44.000000000 +0200 @@ -1,7 +1,7 @@ -cmake_minimum_required(VERSION 3.5 FATAL_ERROR) +cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(KF5_MIN_VERSION "5.79.0") -set(PIM_VERSION "5.17.3") +set(KF5_MIN_VERSION "5.83.0") +set(PIM_VERSION "5.18.0") project(GrantleeTheme VERSION ${PIM_VERSION}) @@ -25,13 +25,10 @@ include(KPIMGrantleeMacros) -if (POLICY CMP0053) - cmake_policy(SET CMP0053 NEW) -endif() set(GRANTLEETHEME_LIB_VERSION ${PIM_VERSION}) -set(QT_REQUIRED_VERSION "5.14.0") +set(QT_REQUIRED_VERSION "5.15.0") set(GRANTLEE_VERSION "5.2") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Network) @@ -51,20 +48,16 @@ ########### Targets ########### add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055000) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055400) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" FALSE) +option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) -set(COMPILE_WITH_UNITY_CMAKE_SUPPORT false) +set(COMPILE_WITH_UNITY_CMAKE_SUPPORT OFF) if (USE_UNITY_CMAKE_SUPPORT) - if(${CMAKE_VERSION} VERSION_LESS "3.16.0") - message(STATUS "CMAKE version is less than 3.16.0 . We can't use cmake unify build support") - else() - set(COMPILE_WITH_UNITY_CMAKE_SUPPORT true) - endif() + set(COMPILE_WITH_UNITY_CMAKE_SUPPORT ON) endif() ########### CMake Config Files ########### set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5GrantleeTheme") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/CMakePresets.json new/grantleetheme-21.08.0/CMakePresets.json --- old/grantleetheme-21.04.3/CMakePresets.json 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/CMakePresets.json 2021-07-30 14:45:44.000000000 +0200 @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "configurePresets": [ { "name": "dev", @@ -23,6 +23,20 @@ } }, { + "name": "dev-clang", + "displayName": "dev-clang", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-clang", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "environment": { + "CXX": "clang++", + "CCACHE_DISABLE": "ON" + } + }, + { "name": "unity", "displayName": "Build with CMake unity support.", "generator": "Ninja", @@ -51,6 +65,64 @@ "CMAKE_BUILD_TYPE": "RelWithDebInfo", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" } + }, + { + "name": "clazy", + "displayName": "clazy", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-clazy", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug" + }, + "environment": { + "CXX": "clazy", + "CCACHE_DISABLE": "ON" + } + } + + ], + "buildPresets": [ + { + "name": "dev", + "configurePreset": "dev" + }, + { + "name": "release", + "configurePreset": "release" + }, + { + "name": "dev-clang", + "configurePreset": "dev-clang" + }, + { + "name": "asan", + "configurePreset": "asan" + }, + { + "name": "unity", + "configurePreset": "unity" + }, + { + "name": "clazy", + "configurePreset": "clazy", + "environment": { + "CLAZY_CHECKS" : "level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs,level2,detaching-member,heap-allocated-small-trivial-type,isempty-vs-count,qstring-varargs,qvariant-template-instantiation,raw-environment-function,reserve-candidates,signal-with-return-value,thread-with-slots,no-ctor-missing-parent-argument,no-missing-typeinfo", + "CCACHE_DISABLE" : "ON" + } } + ], + "testPresets": [ + { + "name": "dev", + "configurePreset": "dev", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": false} + }, + { + "name": "asan", + "configurePreset": "asan", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": true} + } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/autotest/CMakeLists.txt new/grantleetheme-21.08.0/autotest/CMakeLists.txt --- old/grantleetheme-21.04.3/autotest/CMakeLists.txt 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/autotest/CMakeLists.txt 2021-07-30 14:45:44.000000000 +0200 @@ -1,9 +1,9 @@ add_definitions( -DGRANTLEETHEME_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data" ) ecm_add_test(grantleethemetest.cpp NAME_PREFIX "grantleetheme-" - LINK_LIBRARIES Qt5::Test KF5::GrantleeTheme KF5::ConfigCore Qt5::Gui KF5::ConfigWidgets + LINK_LIBRARIES Qt::Test KF5::GrantleeTheme KF5::ConfigCore Qt::Gui KF5::ConfigWidgets ) ecm_add_test(grantleethememanagertest.cpp NAME_PREFIX "grantleetheme-" - LINK_LIBRARIES Qt5::Test KF5::GrantleeTheme KF5::ConfigCore KF5::XmlGui + LINK_LIBRARIES Qt::Test KF5::GrantleeTheme KF5::ConfigCore KF5::XmlGui ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/autotest/grantleethemetest.h new/grantleetheme-21.08.0/autotest/grantleethemetest.h --- old/grantleetheme-21.04.3/autotest/grantleethemetest.h 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/autotest/grantleethemetest.h 2021-07-30 14:45:44.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifndef GRANTLEETHEMETEST_H -#define GRANTLEETHEMETEST_H +#pragma once #include <QObject> @@ -29,4 +28,3 @@ bool compareHtml(const QString &path, const QString &name); }; -#endif // GRANTLEETHEMETEST_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/metainfo.yaml.license new/grantleetheme-21.08.0/metainfo.yaml.license --- old/grantleetheme-21.04.3/metainfo.yaml.license 1970-01-01 01:00:00.000000000 +0100 +++ new/grantleetheme-21.08.0/metainfo.yaml.license 2021-07-30 14:45:44.000000000 +0200 @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: none +SPDX-License-Identifier: CC0-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/po/hi/libgrantleetheme.po new/grantleetheme-21.08.0/po/hi/libgrantleetheme.po --- old/grantleetheme-21.04.3/po/hi/libgrantleetheme.po 2021-07-06 07:28:37.000000000 +0200 +++ new/grantleetheme-21.08.0/po/hi/libgrantleetheme.po 2021-08-06 02:24:26.000000000 +0200 @@ -1,13 +1,14 @@ # Copyright (C) YEAR This file is copyright: # This file is distributed under the same license as the grantleetheme package. # +# Sameer Singh <lumarzel...@gmail.com>, 2021. # Raghavendra Kamath <ra...@raghukamath.com>, 2021. msgid "" msgstr "" "Project-Id-Version: grantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-01-27 03:06+0100\n" -"PO-Revision-Date: 2021-06-15 14:13+0530\n" +"PO-Revision-Date: 2021-06-15 13:24+0530\n" "Last-Translator: Raghavendra Kamath <ra...@raghukamath.com>\n" "Language-Team: kde-hindi\n" "Language: hi\n" @@ -45,4 +46,4 @@ #: grantleethememanager.cpp:41 #, kde-format msgid "Download New Themes..." -msgstr "?????? ?????????????????? ????????????????????? ????????????" +msgstr "?????? ?????????????????? ????????????????????? ????????????..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/po/zh_CN/libgrantleetheme.po new/grantleetheme-21.08.0/po/zh_CN/libgrantleetheme.po --- old/grantleetheme-21.04.3/po/zh_CN/libgrantleetheme.po 2021-07-06 07:28:37.000000000 +0200 +++ new/grantleetheme-21.08.0/po/zh_CN/libgrantleetheme.po 2021-08-06 02:24:26.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-01-27 03:06+0100\n" -"PO-Revision-Date: 2021-06-20 07:37\n" +"PO-Revision-Date: 2021-07-26 13:50\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/sanitizers.supp new/grantleetheme-21.08.0/sanitizers.supp --- old/grantleetheme-21.04.3/sanitizers.supp 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/sanitizers.supp 2021-07-30 14:45:44.000000000 +0200 @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2021 Laurent Montel <mon...@kde.org> +# SPDX-License-Identifier: CC0-1.0 # Suppression file for ASAN/LSAN leak:libspeechd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/src/CMakeLists.txt new/grantleetheme-21.08.0/src/CMakeLists.txt --- old/grantleetheme-21.04.3/src/CMakeLists.txt 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/src/CMakeLists.txt 2021-07-30 14:45:44.000000000 +0200 @@ -1,8 +1,12 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libgrantleetheme\") +add_library(KF5GrantleeTheme) +add_library(KF5::GrantleeTheme ALIAS KF5GrantleeTheme) + + add_subdirectory(plugin) -set(libgrantleetheme_SRCS +target_sources(KF5GrantleeTheme PRIVATE genericformatter.cpp grantleetheme.cpp grantleethememanager.cpp @@ -13,18 +17,15 @@ configure_file(config-grantleetheme.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-grantleetheme.h) -ecm_qt_declare_logging_category(libgrantleetheme_SRCS HEADER grantleetheme_debug.h IDENTIFIER GRANTLEETHEME_LOG CATEGORY_NAME org.kde.pim.grantleetheme +ecm_qt_declare_logging_category(KF5GrantleeTheme HEADER grantleetheme_debug.h IDENTIFIER GRANTLEETHEME_LOG CATEGORY_NAME org.kde.pim.grantleetheme OLD_CATEGORY_NAMES log_grantleetheme DESCRIPTION "kdepim (grantleetheme)" EXPORT LIBGRANTLEETHEME) - -add_library(KF5GrantleeTheme ${libgrantleetheme_SRCS}) if (COMPILE_WITH_UNITY_CMAKE_SUPPORT) set_target_properties(KF5GrantleeTheme PROPERTIES UNITY_BUILD ON) endif() generate_export_header(KF5GrantleeTheme BASE_NAME grantleetheme) -add_library(KF5::GrantleeTheme ALIAS KF5GrantleeTheme) target_include_directories(KF5GrantleeTheme INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/GrantleeTheme/;${KDE_INSTALL_INCLUDEDIR_KF5}/grantleetheme>") target_include_directories(KF5GrantleeTheme PUBLIC "$<BUILD_INTERFACE:${GrantleeTheme_SOURCE_DIR}/src;${GrantleeTheme_BINARY_DIR}/src;>") @@ -38,7 +39,7 @@ ) set_target_properties(KF5GrantleeTheme PROPERTIES - VERSION ${GRANTLEETHEME_VERSION_STRING} + VERSION ${GRANTLEETHEME_VERSION} SOVERSION ${GRANTLEETHEME_SOVERSION} EXPORT_NAME GrantleeTheme ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/src/genericformatter.h new/grantleetheme-21.08.0/src/genericformatter.h --- old/grantleetheme-21.04.3/src/genericformatter.h 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/src/genericformatter.h 2021-07-30 14:45:44.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef GRANTLEETHEME_GENERICFORMATTER_H -#define GRANTLEETHEME_GENERICFORMATTER_H +#pragma once #include "grantleetheme_export.h" @@ -46,4 +45,3 @@ }; } -#endif // GRANTLEETHEME_GENERICFORMATTER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/src/grantleeki18nlocalizer.h new/grantleetheme-21.08.0/src/grantleeki18nlocalizer.h --- old/grantleetheme-21.04.3/src/grantleeki18nlocalizer.h 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/src/grantleeki18nlocalizer.h 2021-07-30 14:45:44.000000000 +0200 @@ -5,8 +5,7 @@ * */ -#ifndef GRANTLEEKI18NLOCALIZER_H -#define GRANTLEEKI18NLOCALIZER_H +#pragma once #include "grantleetheme_export.h" #include <grantlee/qtlocalizer.h> @@ -50,4 +49,3 @@ }; } -#endif // GRANTLEEKI18NLOCALIZER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/src/grantleetheme.cpp new/grantleetheme-21.08.0/src/grantleetheme.cpp --- old/grantleetheme-21.04.3/src/grantleetheme.cpp 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/src/grantleetheme.cpp 2021-07-30 14:45:44.000000000 +0200 @@ -56,7 +56,7 @@ // Get the parent dir with themes, we set the theme directory separately QStringList templatePaths; - for (const QString &absolutePath : qAsConst(absolutePaths)) { + for (const QString &absolutePath : std::as_const(absolutePaths)) { QDir dir(absolutePath); dir.cdUp(); templatePaths << dir.absolutePath(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/src/grantleetheme.h new/grantleetheme-21.08.0/src/grantleetheme.h --- old/grantleetheme-21.04.3/src/grantleetheme.h 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/src/grantleetheme.h 2021-07-30 14:45:44.000000000 +0200 @@ -3,8 +3,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifndef GRANTLEETHEME_H -#define GRANTLEETHEME_H +#pragma once #include "grantleetheme_export.h" @@ -58,4 +57,3 @@ }; } -#endif // GRANTLEETHEME_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/src/grantleetheme_p.h new/grantleetheme-21.08.0/src/grantleetheme_p.h --- old/grantleetheme-21.04.3/src/grantleetheme_p.h 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/src/grantleetheme_p.h 2021-07-30 14:45:44.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifndef GRANTLEE_THEME_P_H -#define GRANTLEE_THEME_P_H +#pragma once #include "grantleeki18nlocalizer.h" #include "grantleetheme.h" @@ -44,4 +43,3 @@ }; } -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/src/grantleethemeengine.h new/grantleetheme-21.08.0/src/grantleethemeengine.h --- old/grantleetheme-21.04.3/src/grantleethemeengine.h 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/src/grantleethemeengine.h 2021-07-30 14:45:44.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifndef GRANTLEETHEMEENGINE_H -#define GRANTLEETHEMEENGINE_H +#pragma once #include <QSharedPointer> #include <grantlee/engine.h> @@ -34,4 +33,3 @@ }; } -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/src/grantleethememanager.cpp new/grantleetheme-21.08.0/src/grantleethememanager.cpp --- old/grantleetheme-21.04.3/src/grantleethememanager.cpp 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/src/grantleethememanager.cpp 2021-07-30 14:45:44.000000000 +0200 @@ -92,7 +92,7 @@ { if (!init) { if (!themesDirectories.isEmpty()) { - for (const QString &directory : qAsConst(themesDirectories)) { + for (const QString &directory : std::as_const(themesDirectories)) { watch->removeDir(directory); } } else { @@ -103,7 +103,7 @@ // clear all previous theme information themes.clear(); - for (const QString &directory : qAsConst(themesDirectories)) { + for (const QString &directory : std::as_const(themesDirectories)) { QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot); QStringList alreadyLoadedThemeName; while (dirIt.hasNext()) { @@ -142,7 +142,7 @@ if (!actionGroup || !menu) { return; } - for (KToggleAction *action : qAsConst(themesActionList)) { + for (KToggleAction *action : std::as_const(themesActionList)) { actionGroup->removeAction(action); menu->removeAction(action); if (actionCollection) { @@ -231,7 +231,7 @@ if (themeName.isEmpty()) { return nullptr; } - for (KToggleAction *act : qAsConst(themesActionList)) { + for (KToggleAction *act : std::as_const(themesActionList)) { if (act->data().toString() == themeName) { return static_cast<KToggleAction *>(act); } @@ -340,7 +340,7 @@ themesDirectories.append(localDirectory); } } - for (const QString &directory : qAsConst(themesDirectories)) { + for (const QString &directory : std::as_const(themesDirectories)) { QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot); while (dirIt.hasNext()) { dirIt.next(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/src/grantleethememanager.h new/grantleetheme-21.08.0/src/grantleethememanager.h --- old/grantleetheme-21.04.3/src/grantleethememanager.h 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/src/grantleethememanager.h 2021-07-30 14:45:44.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifndef GRANTLEETHEMEMANAGER_H -#define GRANTLEETHEMEMANAGER_H +#pragma once #include "grantleetheme.h" #include "grantleetheme_export.h" @@ -64,4 +63,3 @@ Q_PRIVATE_SLOT(d, void directoryChanged()) }; } -#endif // GRANTLEETHEMEMANAGER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/src/plugin/color.cpp new/grantleetheme-21.08.0/src/plugin/color.cpp --- old/grantleetheme-21.04.3/src/plugin/color.cpp 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/src/plugin/color.cpp 2021-07-30 14:45:44.000000000 +0200 @@ -143,7 +143,7 @@ static QColor resolveColor(const QString &name, Grantlee::Context *c) { if (name.startsWith(QLatin1Char('"')) && name.endsWith(QLatin1Char('"'))) { - return QColor(name.midRef(1, name.size() - 2)); + return QColor(QStringView(name).mid(1, name.size() - 2)); } const auto val = Grantlee::Variable(name).resolve(c); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/src/plugin/color.h new/grantleetheme-21.08.0/src/plugin/color.h --- old/grantleetheme-21.04.3/src/plugin/color.h 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/src/plugin/color.h 2021-07-30 14:45:44.000000000 +0200 @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifndef GRANTLEETHEME_COLOR_H -#define GRANTLEETHEME_COLOR_H +#pragma once #include <grantlee/filter.h> #include <grantlee/node.h> @@ -125,4 +124,3 @@ void registerMetaType(); } -#endif // GRANTLEETHEME_COLOR_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/src/plugin/colorscheme.h new/grantleetheme-21.08.0/src/plugin/colorscheme.h --- old/grantleetheme-21.04.3/src/plugin/colorscheme.h 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/src/plugin/colorscheme.h 2021-07-30 14:45:44.000000000 +0200 @@ -4,12 +4,10 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifndef GRANTLEETHEME_COLORSCHEME_H -#define GRANTLEETHEME_COLORSCHEME_H +#pragma once namespace ColorScheme { void registerMetaType(); } -#endif // GRANTLEETHEME_COLORSCHEME_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/src/plugin/icon.h new/grantleetheme-21.08.0/src/plugin/icon.h --- old/grantleetheme-21.04.3/src/plugin/icon.h 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/src/plugin/icon.h 2021-07-30 14:45:44.000000000 +0200 @@ -5,8 +5,7 @@ * */ -#ifndef ICON_H -#define ICON_H +#pragma once #include <grantlee/node.h> @@ -63,4 +62,3 @@ int mSizeOrGroup; }; -#endif // ICON_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/src/plugin/kdegrantleeplugin.h new/grantleetheme-21.08.0/src/plugin/kdegrantleeplugin.h --- old/grantleetheme-21.04.3/src/plugin/kdegrantleeplugin.h 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/src/plugin/kdegrantleeplugin.h 2021-07-30 14:45:44.000000000 +0200 @@ -5,8 +5,7 @@ * */ -#ifndef KDEGRANTLEEPLUGIN_H -#define KDEGRANTLEEPLUGIN_H +#pragma once #include <grantlee/taglibraryinterface.h> @@ -24,4 +23,3 @@ QHash<QString, Grantlee::AbstractNodeFactory *> nodeFactories(const QString &name) override; }; -#endif // KDEGRANTLEEPLUGIN_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/src/plugin/palette.h new/grantleetheme-21.08.0/src/plugin/palette.h --- old/grantleetheme-21.04.3/src/plugin/palette.h 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/src/plugin/palette.h 2021-07-30 14:45:44.000000000 +0200 @@ -4,12 +4,10 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifndef GRANTLEETHEME_PALETTE_H -#define GRANTLEETHEME_PALETTE_H +#pragma once namespace Palette { void registerMetaType(); } -#endif // GRANTLEETHEME_PALETTE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-21.04.3/src/qtresourcetemplateloader.h new/grantleetheme-21.08.0/src/qtresourcetemplateloader.h --- old/grantleetheme-21.04.3/src/qtresourcetemplateloader.h 2021-06-08 21:06:16.000000000 +0200 +++ new/grantleetheme-21.08.0/src/qtresourcetemplateloader.h 2021-07-30 14:45:44.000000000 +0200 @@ -5,8 +5,7 @@ * */ -#ifndef QTRESOURCETEMPLATELOADER_H -#define QTRESOURCETEMPLATELOADER_H +#pragma once #include "grantlee/templateloader.h" #include "grantleetheme_export.h" namespace GrantleeTheme @@ -24,4 +23,3 @@ Q_REQUIRED_RESULT bool canLoadTemplate(const QString &name) const override; }; } -#endif // QTRESOURCETEMPLATELOADER_H
