diff -r 76a025db4948 -r b2b7af293c46 src/libraries.h --- a/src/libraries.h Sun Jun 26 21:32:51 2022 +0300 +++ b/src/libraries.h Mon Jun 27 01:09:18 2022 +0300 @@ -44,13 +44,7 @@ Q_DECLARE_METATYPE(Library::Role) QDataStream &operator<<(QDataStream&, const Library&); QDataStream &operator>>(QDataStream&, Library&); - -using Libraries = QList; -//QDataStream &operator<<(QDataStream&, const Libraries&); -//QDataStream &operator>>(QDataStream&, Libraries&); -//Q_DECLARE_METATYPE(Libraries) - -class Configuration; +using Libraries = QVector; class LibrariesModel : public QAbstractTableModel { @@ -61,14 +55,14 @@ auto end() const { return this->libraries.end(); } QString findFile(QString fileName) const; void addLibrary(const Library& library); - void removeLibrary(const std::size_t libraryIndex); - const Library& library(std::size_t libraryIndex) const; - void setLibraryPath(std::size_t libraryIndex, const QDir& path); - void setLibraryRole(std::size_t libraryIndex, const Library::Role role); + void removeLibrary(const qsizetype libraryIndex); + const Library& library(qsizetype libraryIndex) const; + void setLibraryPath(qsizetype libraryIndex, const QDir& path); + void setLibraryRole(qsizetype libraryIndex, const Library::Role role); void restoreFromSettings(); void storeToSettings(); - std::size_t count() const; - void moveLibrary(const std::size_t libraryFromIndex, const std::size_t libraryToIndex); + qsizetype count() const; + void moveLibrary(const qsizetype libraryFromIndex, const qsizetype libraryToIndex); // Definitions for QAbstractTableModel Qt::ItemFlags flags(const QModelIndex& index) const override; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; @@ -78,7 +72,7 @@ int role = Qt::DisplayRole) const override; int rowCount(const QModelIndex&) const override; int columnCount(const QModelIndex&) const override; - bool isValidIndex(const std::size_t libraryIndex) const; + bool isValidIndex(const qsizetype libraryIndex) const; ColorTable loadColorTable(QTextStream& errors) const; private: enum Column @@ -86,6 +80,6 @@ RoleColumn, PathColumn }; - void signalLibraryChange(std::size_t library); + void signalLibraryChange(const qsizetype library); Libraries libraries; };