noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Clean up GenericListModel (#4661)

Browse source 
Co-authored-by: Daniel Sage <sagedanielr@gmail.com>
This commit is contained in:
pajlada 2023-05-29 16:37:55 +02:00 committed by GitHub
parent c7b22939d5
commit e9432d3b65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/widgets/listview/GenericListModel.cpp
View file

@ -2,12 +2,12 @@
namespace chatterino { namespace chatterino {
GenericListModel::GenericListModel(QWidget *parent) GenericListModel::GenericListModel(QObject *parent)
: QAbstractListModel(parent) : QAbstractListModel(parent)
{ {
} }
int GenericListModel::rowCount(const QModelIndex &parent) const int GenericListModel::rowCount(const QModelIndex & /*parent*/) const
{ {
return this->items_.size(); return this->items_.size();
} }
@ -15,12 +15,16 @@ int GenericListModel::rowCount(const QModelIndex &parent) const
QVariant GenericListModel::data(const QModelIndex &index, int /* role */) const QVariant GenericListModel::data(const QModelIndex &index, int /* role */) const
{ {
if (!index.isValid()) if (!index.isValid())
return QVariant(); {
return {};
}
if (index.row() >= this->items_.size()) if (index.row() >= this->items_.size())
return QVariant(); {
return {};
}
auto item = this->items_[index.row()].get(); auto *item = this->items_[index.row()].get();
// See https://stackoverflow.com/a/44503822 . // See https://stackoverflow.com/a/44503822 .
return QVariant::fromValue(static_cast<void *>(item)); return QVariant::fromValue(static_cast<void *>(item));
} }
@ -37,7 +41,9 @@ void GenericListModel::addItem(std::unique_ptr<GenericListItem> item)
void GenericListModel::clear() void GenericListModel::clear()
{ {
if (this->items_.empty()) if (this->items_.empty())
{
return; return;
}
// {begin,end}RemoveRows needs to be called to notify attached views // {begin,end}RemoveRows needs to be called to notify attached views
this->beginRemoveRows(QModelIndex(), 0, this->items_.size() - 1); this->beginRemoveRows(QModelIndex(), 0, this->items_.size() - 1);
@ -48,4 +54,9 @@ void GenericListModel::clear()
this->endRemoveRows(); this->endRemoveRows();
} }
void GenericListModel::reserve(size_t capacity)
{
this->items_.reserve(capacity);
}
} // namespace chatterino } // namespace chatterino

16
src/widgets/listview/GenericListModel.hpp
View file

@ -3,23 +3,24 @@
#include "widgets/listview/GenericListItem.hpp" #include "widgets/listview/GenericListItem.hpp"
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QWidget> #include <QObject>
#include <memory> #include <memory>
#include <vector>
namespace chatterino { namespace chatterino {
class GenericListModel : public QAbstractListModel class GenericListModel : public QAbstractListModel
{ {
public: public:
GenericListModel(QWidget *parent = nullptr); GenericListModel(QObject *parent = nullptr);
/** /**
* @brief Reimplements QAbstractItemModel::rowCount. * @brief Reimplements QAbstractItemModel::rowCount.
* *
* @return number of items currrently present in this model * @return number of items currently present in this model
*/ */
int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
/** /**
* @brief Reimplements QAbstractItemModel::data. Currently, the role parameter * @brief Reimplements QAbstractItemModel::data. Currently, the role parameter
@ -30,7 +31,7 @@ public:
* *
* @return GenericListItem * (wrapped as QVariant) at index * @return GenericListItem * (wrapped as QVariant) at index
*/ */
QVariant data(const QModelIndex &index, int role) const; QVariant data(const QModelIndex &index, int role) const override;
/** /**
* @brief Add an item to this QuickSwitcherModel. It will be displayed in * @brief Add an item to this QuickSwitcherModel. It will be displayed in
@ -50,6 +51,11 @@ public:
*/ */
void clear(); void clear();
/**
* @brief Increases the capacity of the list model.
*/
void reserve(size_t capacity);
private: private:
std::vector<std::unique_ptr<GenericListItem>> items_; std::vector<std::unique_ptr<GenericListItem>> items_;
}; };