From 1392eaebcff5e22ef04a24aeb7b2edb0c3b9863c Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 14 Mar 2019 18:15:03 +0100 Subject: [PATCH] Adapt to c++utilities v5 --- CMakeLists.txt | 2 ++ cli/CMakeLists.txt | 4 ++-- gui/CMakeLists.txt | 4 ++-- lib/CMakeLists.txt | 4 ++-- lib/alpm/alpmdatabase.cpp | 2 +- lib/alpm/alpmdatabase.h | 2 +- lib/alpm/manager.cpp | 9 +++------ lib/alpm/package.h | 31 ++++++++++++++++--------------- lib/alpm/repository.cpp | 2 +- lib/alpm/repository.h | 12 ++++++------ 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 21e2776..d373501 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,8 @@ set(META_NO_TIDY ON) project(${META_PROJECT_NAME}) +set(CONFIGURATION_PACKAGE_SUFFIX "" CACHE STRING "sets the suffix for find_package() calls to packages configured via c++utilities") + # add subdirectories add_subdirectory(web) add_subdirectory(lib) diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index c40eaaf..150c7e1 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -10,11 +10,11 @@ set(SRC_FILES set(META_PROJECT_TYPE application) # find c++utilities -find_package(c++utilities 4.0.0 REQUIRED) +find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) use_cpp_utilities() # find qtutilities -find_package(qtutilities 5.0.0 REQUIRED) +find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_MODULE_DIRS}) # find repoindex diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 7330d38..7689e03 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -20,11 +20,11 @@ set(ICON_FILES ) # find c++utilities -find_package(c++utilities 4.0.0 REQUIRED) +find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) use_cpp_utilities() # find qtutilities -find_package(qtutilities 5.0.0 REQUIRED) +find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) use_qt_utilities() # find repoindex diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 36489ec..231f3a7 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -55,11 +55,11 @@ list(APPEND ADDITIONAL_QT_MODULES ${META_PUBLIC_QT_MODULES} ${META_PRIVATE_QT_MO list(APPEND ADDITIONAL_KF_MODULES ${META_PRIVATE_KF_MODULES}) # find c++utilities -find_package(c++utilities 4.0.0 REQUIRED) +find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) use_cpp_utilities() # find qtutilities -find_package(qtutilities 5.0.0 REQUIRED) +find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) use_qt_utilities() # include modules to apply configuration diff --git a/lib/alpm/alpmdatabase.cpp b/lib/alpm/alpmdatabase.cpp index cd85a4c..cd53c15 100644 --- a/lib/alpm/alpmdatabase.cpp +++ b/lib/alpm/alpmdatabase.cpp @@ -146,7 +146,7 @@ AlpmPackageLoader::AlpmPackageLoader(AlpmDatabase *repository, PackageOrigin ori /*! * \brief Creates a new instance wrapping the specified database struct. */ -AlpmDatabase::AlpmDatabase(const QString &name, const QString &dbPath, RepositoryUsage usage, SignatureLevel sigLevel, uint32 index, QObject *parent) : +AlpmDatabase::AlpmDatabase(const QString &name, const QString &dbPath, RepositoryUsage usage, SignatureLevel sigLevel, std::uint32_t index, QObject *parent) : Repository(name, index, parent), m_dbPath(dbPath) { diff --git a/lib/alpm/alpmdatabase.h b/lib/alpm/alpmdatabase.h index a01461c..61afaa4 100644 --- a/lib/alpm/alpmdatabase.h +++ b/lib/alpm/alpmdatabase.h @@ -63,7 +63,7 @@ Q_OBJECT friend class AlpmPackageLoader; public: - explicit AlpmDatabase(const QString &name, const QString &dbPath, RepositoryUsage usage, SignatureLevel sigLevel, uint32 index = invalidIndex, QObject *parent = nullptr); + explicit AlpmDatabase(const QString &name, const QString &dbPath, RepositoryUsage usage, SignatureLevel sigLevel, std::uint32_t index = invalidIndex, QObject *parent = nullptr); AlpmPackageLoader *internalInit(); RepositoryType type() const; diff --git a/lib/alpm/manager.cpp b/lib/alpm/manager.cpp index 216ca4f..6b489bf 100644 --- a/lib/alpm/manager.cpp +++ b/lib/alpm/manager.cpp @@ -6,7 +6,6 @@ #include "../network/userrepository.h" #include -#include #include #include @@ -353,8 +352,7 @@ void Manager::addDataBasesFromPacmanConfig() includedFile.exceptions(ios_base::failbit | ios_base::badbit); includedFile.open(path, ios_base::in); includedIni.parse(includedFile); - } catch(...) { - catchIoFailure(); + } catch(const std::ios_base::failure &) { cerr << shchar << "Error: An IO exception occured when parsing the included file \"" << path << "\"." << endl; } } @@ -379,9 +377,8 @@ void Manager::addDataBasesFromPacmanConfig() } } } - } catch(...) { - catchIoFailure(); - throwIoFailure("Error: An IO exception occured when parsing the config file."); + } catch(const std::ios_base::failure &) { + throw std::ios_base::failure("Error: An IO exception occured when parsing the config file."); } } diff --git a/lib/alpm/package.h b/lib/alpm/package.h index a00ded7..c8bc0fd 100644 --- a/lib/alpm/package.h +++ b/lib/alpm/package.h @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -270,14 +271,14 @@ public: const QString &md5() const; const QString &sha256() const; const QString &buildArchitecture() const; - uint32 packageSize() const; + std::uint32_t packageSize() const; const QList &makeDependencies() const; const QList &checkDependencies() const; // installation related meta data bool hasInstallRelatedMetaData() const; ChronoUtilities::DateTime installDate() const; - uint32 installedSize() const; + std::uint32_t installedSize() const; const QStringList &backupFiles() const; PackageValidation validationMethods() const; InstallStatus installReason() const; @@ -286,9 +287,9 @@ public: bool hasSourceRelatedMetaData() const; const QString &baseName() const; const QStringList &architectures() const; - int32 id() const; - int32 categoryId() const; - int32 votes() const; + std::int32_t id() const; + std::int32_t categoryId() const; + std::int32_t votes() const; ChronoUtilities::DateTime outOfDate() const; const QString &maintainer() const; ChronoUtilities::DateTime firstSubmitted() const; @@ -356,14 +357,14 @@ protected: QString m_sha256; QString m_pgpSignature; QString m_buildArchitecture; - uint32 m_packageSize; + std::uint32_t m_packageSize; QList m_makeDependencies; QList m_checkDependencies; // installation related meta data bool m_hasInstallRelatedMetaData; ChronoUtilities::DateTime m_installDate; - uint32 m_installedSize; + std::uint32_t m_installedSize; QStringList m_backupFiles; PackageValidation m_validationMethods; InstallStatus m_installReason; @@ -372,9 +373,9 @@ protected: bool m_hasSourceRelatedMetaData; QString m_baseName; QStringList m_architectures; - int32 m_id; - int32 m_categoryId; - int32 m_votes; + std::int32_t m_id; + std::int32_t m_categoryId; + std::int32_t m_votes; ChronoUtilities::DateTime m_outOfDate; QString m_maintainer; ChronoUtilities::DateTime m_firstSubmitted; @@ -676,7 +677,7 @@ inline const QString &Package::buildArchitecture() const /*! * \brief Returns the size of the package file. */ -inline uint32 Package::packageSize() const +inline std::uint32_t Package::packageSize() const { return m_packageSize; } @@ -722,7 +723,7 @@ inline ChronoUtilities::DateTime Package::installDate() const /*! * \brief Returns the installed size. */ -inline uint32 Package::installedSize() const +inline std::uint32_t Package::installedSize() const { return m_installedSize; } @@ -783,7 +784,7 @@ inline const QStringList &Package::architectures() const /*! * \brief Returns the ID. */ -inline int32 Package::id() const +inline std::int32_t Package::id() const { return m_id; } @@ -791,7 +792,7 @@ inline int32 Package::id() const /*! * \brief Returns the category ID. */ -inline int32 Package::categoryId() const +inline std::int32_t Package::categoryId() const { return m_categoryId; } @@ -799,7 +800,7 @@ inline int32 Package::categoryId() const /*! * \brief Returns the votes of the package. */ -inline int32 Package::votes() const +inline std::int32_t Package::votes() const { return m_votes; } diff --git a/lib/alpm/repository.cpp b/lib/alpm/repository.cpp index 1721aea..4219a51 100644 --- a/lib/alpm/repository.cpp +++ b/lib/alpm/repository.cpp @@ -180,7 +180,7 @@ SuggestionsReply *Repository::requestSuggestions(const QString &) /*! * \brief Constructs a new repository (protected since this is a pure virtual class). */ -Repository::Repository(const QString &name, uint32 index, QObject *parent) : +Repository::Repository(const QString &name, std::uint32_t index, QObject *parent) : QObject(parent), m_index(index), m_name(name), diff --git a/lib/alpm/repository.h b/lib/alpm/repository.h index b2fd8d6..8910056 100644 --- a/lib/alpm/repository.h +++ b/lib/alpm/repository.h @@ -201,7 +201,7 @@ public: // general meta data bool isBusy() const; - uint32 index() const; + std::uint32_t index() const; const QString &name() const; const QString &description() const; const std::map > &packages() const; @@ -279,7 +279,7 @@ public: // thread synchronization QReadWriteLock *lock() const; - static const uint32 invalidIndex = static_cast(-1); + static const std::uint32_t invalidIndex = static_cast(-1); signals: /*! @@ -305,9 +305,9 @@ private slots: void discardPackageLoader(); protected: - explicit Repository(const QString &name, uint32 index = invalidIndex, QObject *parent = nullptr); + explicit Repository(const QString &name, std::uint32_t index = invalidIndex, QObject *parent = nullptr); - uint32 m_index; + std::uint32_t m_index; QString m_name; QString m_description; std::map > m_packages; @@ -319,7 +319,7 @@ protected: QList m_upgradeSources; QString m_srcDir; QString m_pkgDir; - QAtomicInteger m_isBusy; + QAtomicInteger m_isBusy; std::unique_ptr m_loader; private: @@ -351,7 +351,7 @@ inline bool Repository::isBusy() const * * The index is used to sort the repositories by their occurrence the configuration files. */ -inline uint32 Repository::index() const +inline std::uint32_t Repository::index() const { return m_index; }