refactor: misc cleanup

This commit is contained in:
tobtoht
2023-11-23 22:41:02 +01:00
parent d68fbce9e1
commit 91ff2bc7f0
12 changed files with 19 additions and 82 deletions
+2 -10
View File
@@ -11,19 +11,11 @@ AddressBookModel::AddressBookModel(QObject *parent, AddressBook *addressBook)
, m_addressBook(addressBook)
, m_showFullAddresses(false)
{
connect(m_addressBook, &AddressBook::refreshStarted, this, &AddressBookModel::startReset);
connect(m_addressBook, &AddressBook::refreshFinished, this, &AddressBookModel::endReset);
connect(m_addressBook, &AddressBook::refreshStarted, this, &AddressBookModel::beginResetModel);
connect(m_addressBook, &AddressBook::refreshFinished, this, &AddressBookModel::endResetModel);
m_contactIcon = icons()->icon("person.svg");
}
void AddressBookModel::startReset(){
beginResetModel();
}
void AddressBookModel::endReset(){
endResetModel();
}
int AddressBookModel::rowCount(const QModelIndex &) const
{
return m_addressBook->count();
+1 -5
View File
@@ -30,17 +30,13 @@ public:
Qt::ItemFlags flags(const QModelIndex &index) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role) override;
Q_INVOKABLE bool deleteRow(int row);
bool deleteRow(int row);
bool isShowFullAddresses() const;
void setShowFullAddresses(bool show);
bool writeCSV(const QString &path);
QMap<QString, QString> readCSV(const QString &path);
public slots:
void startReset();
void endReset();
private:
AddressBook * m_addressBook;
QIcon m_contactIcon;
+2 -10
View File
@@ -17,16 +17,8 @@ SubaddressModel::SubaddressModel(QObject *parent, Subaddress *subaddress)
: QAbstractTableModel(parent)
, m_subaddress(subaddress)
{
connect(m_subaddress, &Subaddress::refreshStarted, this, &SubaddressModel::startReset);
connect(m_subaddress, &Subaddress::refreshFinished, this, &SubaddressModel::endReset);
}
void SubaddressModel::startReset(){
beginResetModel();
}
void SubaddressModel::endReset(){
endResetModel();
connect(m_subaddress, &Subaddress::refreshStarted, this, &SubaddressModel::beginResetModel);
connect(m_subaddress, &Subaddress::refreshFinished, this, &SubaddressModel::endResetModel);
}
int SubaddressModel::rowCount(const QModelIndex &parent) const
-4
View File
@@ -42,10 +42,6 @@ public:
void setCurrentSubaddressAccount(quint32 accountIndex);
public slots:
void startReset();
void endReset();
private:
Subaddress *m_subaddress;
QVariant parseSubaddressRow(const SubaddressRow &subaddress, const QModelIndex &index, int role) const;