Martchus
/
repoindex
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Adapt to c++utilities v5

This commit is contained in:
Martchus 2019-03-14 18:15:03 +01:00
parent 6a3c39f4d4
commit 1392eaebcf
10 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -14,6 +14,8 @@ set(META_NO_TIDY ON)
project(${META_PROJECT_NAME}) 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 subdirectories
add_subdirectory(web) add_subdirectory(web)
add_subdirectory(lib) add_subdirectory(lib)

4
cli/CMakeLists.txt
View File

@ -10,11 +10,11 @@ set(SRC_FILES
set(META_PROJECT_TYPE application) set(META_PROJECT_TYPE application)
# find c++utilities # 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() use_cpp_utilities()
# find qtutilities # 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}) list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_MODULE_DIRS})
# find repoindex # find repoindex

4
gui/CMakeLists.txt
View File

@ -20,11 +20,11 @@ set(ICON_FILES
) )
# find c++utilities # 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() use_cpp_utilities()
# find qtutilities # find qtutilities
find_package(qtutilities 5.0.0 REQUIRED) find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED)
use_qt_utilities() use_qt_utilities()
# find repoindex # find repoindex

4
lib/CMakeLists.txt
View File

@ -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}) list(APPEND ADDITIONAL_KF_MODULES ${META_PRIVATE_KF_MODULES})
# find c++utilities # 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() use_cpp_utilities()
# find qtutilities # find qtutilities
find_package(qtutilities 5.0.0 REQUIRED) find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED)
use_qt_utilities() use_qt_utilities()
# include modules to apply configuration # include modules to apply configuration

2
lib/alpm/alpmdatabase.cpp
View File

@ -146,7 +146,7 @@ AlpmPackageLoader::AlpmPackageLoader(AlpmDatabase *repository, PackageOrigin ori
/*! /*!
* \brief Creates a new instance wrapping the specified database struct. * \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), Repository(name, index, parent),
m_dbPath(dbPath) m_dbPath(dbPath)
{ {

2
lib/alpm/alpmdatabase.h
View File

@ -63,7 +63,7 @@ Q_OBJECT
friend class AlpmPackageLoader; friend class AlpmPackageLoader;
public: 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(); AlpmPackageLoader *internalInit();
RepositoryType type() const; RepositoryType type() const;

9
lib/alpm/manager.cpp
View File

@ -6,7 +6,6 @@
#include "../network/userrepository.h" #include "../network/userrepository.h"
#include <c++utilities/io/inifile.h> #include <c++utilities/io/inifile.h>
#include <c++utilities/io/catchiofailure.h>
#include <c++utilities/conversion/stringconversion.h> #include <c++utilities/conversion/stringconversion.h>
#include <QList> #include <QList>
@ -353,8 +352,7 @@ void Manager::addDataBasesFromPacmanConfig()
includedFile.exceptions(ios_base::failbit | ios_base::badbit); includedFile.exceptions(ios_base::failbit | ios_base::badbit);
includedFile.open(path, ios_base::in); includedFile.open(path, ios_base::in);
includedIni.parse(includedFile); includedIni.parse(includedFile);
} catch(...) { } catch(const std::ios_base::failure &) {
catchIoFailure();
cerr << shchar << "Error: An IO exception occured when parsing the included file \"" << path << "\"." << endl; cerr << shchar << "Error: An IO exception occured when parsing the included file \"" << path << "\"." << endl;
} }
} }
@ -379,9 +377,8 @@ void Manager::addDataBasesFromPacmanConfig()
} }
} }
} }
} catch(...) { } catch(const std::ios_base::failure &) {
catchIoFailure(); throw std::ios_base::failure("Error: An IO exception occured when parsing the config file.");
throwIoFailure("Error: An IO exception occured when parsing the config file.");
} }
} }

31
lib/alpm/package.h
View File

@ -7,6 +7,7 @@
#include <QHash> #include <QHash>
#include <QJsonArray> #include <QJsonArray>
#include <cstdint>
#include <map> #include <map>
#include <functional> #include <functional>
@ -270,14 +271,14 @@ public:
const QString &md5() const; const QString &md5() const;
const QString &sha256() const; const QString &sha256() const;
const QString &buildArchitecture() const; const QString &buildArchitecture() const;
uint32 packageSize() const; std::uint32_t packageSize() const;
const QList<Dependency> &makeDependencies() const; const QList<Dependency> &makeDependencies() const;
const QList<Dependency> &checkDependencies() const; const QList<Dependency> &checkDependencies() const;
// installation related meta data // installation related meta data
bool hasInstallRelatedMetaData() const; bool hasInstallRelatedMetaData() const;
ChronoUtilities::DateTime installDate() const; ChronoUtilities::DateTime installDate() const;
uint32 installedSize() const; std::uint32_t installedSize() const;
const QStringList &backupFiles() const; const QStringList &backupFiles() const;
PackageValidation validationMethods() const; PackageValidation validationMethods() const;
InstallStatus installReason() const; InstallStatus installReason() const;
@ -286,9 +287,9 @@ public:
bool hasSourceRelatedMetaData() const; bool hasSourceRelatedMetaData() const;
const QString &baseName() const; const QString &baseName() const;
const QStringList &architectures() const; const QStringList &architectures() const;
int32 id() const; std::int32_t id() const;
int32 categoryId() const; std::int32_t categoryId() const;
int32 votes() const; std::int32_t votes() const;
ChronoUtilities::DateTime outOfDate() const; ChronoUtilities::DateTime outOfDate() const;
const QString &maintainer() const; const QString &maintainer() const;
ChronoUtilities::DateTime firstSubmitted() const; ChronoUtilities::DateTime firstSubmitted() const;
@ -356,14 +357,14 @@ protected:
QString m_sha256; QString m_sha256;
QString m_pgpSignature; QString m_pgpSignature;
QString m_buildArchitecture; QString m_buildArchitecture;
uint32 m_packageSize; std::uint32_t m_packageSize;
QList<Dependency> m_makeDependencies; QList<Dependency> m_makeDependencies;
QList<Dependency> m_checkDependencies; QList<Dependency> m_checkDependencies;
// installation related meta data // installation related meta data
bool m_hasInstallRelatedMetaData; bool m_hasInstallRelatedMetaData;
ChronoUtilities::DateTime m_installDate; ChronoUtilities::DateTime m_installDate;
uint32 m_installedSize; std::uint32_t m_installedSize;
QStringList m_backupFiles; QStringList m_backupFiles;
PackageValidation m_validationMethods; PackageValidation m_validationMethods;
InstallStatus m_installReason; InstallStatus m_installReason;
@ -372,9 +373,9 @@ protected:
bool m_hasSourceRelatedMetaData; bool m_hasSourceRelatedMetaData;
QString m_baseName; QString m_baseName;
QStringList m_architectures; QStringList m_architectures;
int32 m_id; std::int32_t m_id;
int32 m_categoryId; std::int32_t m_categoryId;
int32 m_votes; std::int32_t m_votes;
ChronoUtilities::DateTime m_outOfDate; ChronoUtilities::DateTime m_outOfDate;
QString m_maintainer; QString m_maintainer;
ChronoUtilities::DateTime m_firstSubmitted; ChronoUtilities::DateTime m_firstSubmitted;
@ -676,7 +677,7 @@ inline const QString &Package::buildArchitecture() const
/*! /*!
* \brief Returns the size of the package file. * \brief Returns the size of the package file.
*/ */
inline uint32 Package::packageSize() const inline std::uint32_t Package::packageSize() const
{ {
return m_packageSize; return m_packageSize;
} }
@ -722,7 +723,7 @@ inline ChronoUtilities::DateTime Package::installDate() const
/*! /*!
* \brief Returns the installed size. * \brief Returns the installed size.
*/ */
inline uint32 Package::installedSize() const inline std::uint32_t Package::installedSize() const
{ {
return m_installedSize; return m_installedSize;
} }
@ -783,7 +784,7 @@ inline const QStringList &Package::architectures() const
/*! /*!
* \brief Returns the ID. * \brief Returns the ID.
*/ */
inline int32 Package::id() const inline std::int32_t Package::id() const
{ {
return m_id; return m_id;
} }
@ -791,7 +792,7 @@ inline int32 Package::id() const
/*! /*!
* \brief Returns the category ID. * \brief Returns the category ID.
*/ */
inline int32 Package::categoryId() const inline std::int32_t Package::categoryId() const
{ {
return m_categoryId; return m_categoryId;
} }
@ -799,7 +800,7 @@ inline int32 Package::categoryId() const
/*! /*!
* \brief Returns the votes of the package. * \brief Returns the votes of the package.
*/ */
inline int32 Package::votes() const inline std::int32_t Package::votes() const
{ {
return m_votes; return m_votes;
} }

2
lib/alpm/repository.cpp
View File

@ -180,7 +180,7 @@ SuggestionsReply *Repository::requestSuggestions(const QString &)
/*! /*!
* \brief Constructs a new repository (protected since this is a pure virtual class). * \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), QObject(parent),
m_index(index), m_index(index),
m_name(name), m_name(name),

12
lib/alpm/repository.h
View File

@ -201,7 +201,7 @@ public:
// general meta data // general meta data
bool isBusy() const; bool isBusy() const;
uint32 index() const; std::uint32_t index() const;
const QString &name() const; const QString &name() const;
const QString &description() const; const QString &description() const;
const std::map<QString, std::unique_ptr<Package> > &packages() const; const std::map<QString, std::unique_ptr<Package> > &packages() const;
@ -279,7 +279,7 @@ public:
// thread synchronization // thread synchronization
QReadWriteLock *lock() const; QReadWriteLock *lock() const;
static const uint32 invalidIndex = static_cast<uint32>(-1); static const std::uint32_t invalidIndex = static_cast<std::uint32_t>(-1);
signals: signals:
/*! /*!
@ -305,9 +305,9 @@ private slots:
void discardPackageLoader(); void discardPackageLoader();
protected: 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_name;
QString m_description; QString m_description;
std::map<QString, std::unique_ptr<Package> > m_packages; std::map<QString, std::unique_ptr<Package> > m_packages;
@ -319,7 +319,7 @@ protected:
QList<Repository *> m_upgradeSources; QList<Repository *> m_upgradeSources;
QString m_srcDir; QString m_srcDir;
QString m_pkgDir; QString m_pkgDir;
QAtomicInteger<byte> m_isBusy; QAtomicInteger<std::uint8_t> m_isBusy;
std::unique_ptr<PackageLoader> m_loader; std::unique_ptr<PackageLoader> m_loader;
private: private:
@ -351,7 +351,7 @@ inline bool Repository::isBusy() const
* *
* The index is used to sort the repositories by their occurrence the configuration files. * 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; return m_index;
} }