vae/squawk
1
0
Fork 0
forked from blue/squawk
Code Issues Pull requests Projects Releases Wiki Activity

uploading multiple messages fix, some warnings fix

Browse source
This commit is contained in:
Blue 2019-11-17 13:24:12 +03:00
parent 0c33d81c59
commit fe27955689
14 changed files with 51 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ui/widgets/vcard/emailsmodel.cpp
View file

@ -145,7 +145,7 @@ QModelIndex UI::VCard::EMailsModel::addNewEmptyLine()
return createIndex(deque.size() - 1, 0, &(deque.back()));
}
bool UI::VCard::EMailsModel::isPreferred(int row) const
bool UI::VCard::EMailsModel::isPreferred(quint32 row) const
{
if (row < deque.size()) {
return deque[row].prefered;
@ -154,10 +154,10 @@ bool UI::VCard::EMailsModel::isPreferred(int row) const
}
}
void UI::VCard::EMailsModel::removeLines(int index, int count)
void UI::VCard::EMailsModel::removeLines(quint32 index, quint32 count)
{
if (index < deque.size()) {
int maxCount = deque.size() - index;
quint32 maxCount = deque.size() - index;
if (count > maxCount) {
count = maxCount;
}
@ -194,12 +194,12 @@ void UI::VCard::EMailsModel::setEmails(const std::deque<Shared::VCard::Email>& e
}
}
void UI::VCard::EMailsModel::revertPreferred(int row)
void UI::VCard::EMailsModel::revertPreferred(quint32 row)
{
setData(createIndex(row, 2), !isPreferred(row));
}
QString UI::VCard::EMailsModel::getEmail(int row) const
QString UI::VCard::EMailsModel::getEmail(quint32 row) const
{
return deque[row].address;
}

8
ui/widgets/vcard/emailsmodel.h
View file

@ -40,16 +40,16 @@ public:
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
Qt::ItemFlags flags(const QModelIndex &index) const override;
bool isPreferred(int row) const;
bool isPreferred(quint32 row) const;
void removeLines(int index, int count);
void removeLines(quint32 index, quint32 count);
void setEmails(const std::deque<Shared::VCard::Email>& emails);
void getEmails(std::deque<Shared::VCard::Email>& emails) const;
QString getEmail(int row) const;
QString getEmail(quint32 row) const;
public slots:
QModelIndex addNewEmptyLine();
void revertPreferred(int row);
void revertPreferred(quint32 row);
private:
bool edit;

10
ui/widgets/vcard/phonesmodel.cpp
View file

@ -129,7 +129,7 @@ void UI::VCard::PhonesModel::getPhones(std::deque<Shared::VCard::Phone>& phones)
}
}
bool UI::VCard::PhonesModel::isPreferred(int row) const
bool UI::VCard::PhonesModel::isPreferred(quint32 row) const
{
if (row < deque.size()) {
return deque[row].prefered;
@ -138,10 +138,10 @@ bool UI::VCard::PhonesModel::isPreferred(int row) const
}
}
void UI::VCard::PhonesModel::removeLines(int index, int count)
void UI::VCard::PhonesModel::removeLines(quint32 index, quint32 count)
{
if (index < deque.size()) {
int maxCount = deque.size() - index;
quint32 maxCount = deque.size() - index;
if (count > maxCount) {
count = maxCount;
}
@ -156,7 +156,7 @@ void UI::VCard::PhonesModel::removeLines(int index, int count)
}
}
void UI::VCard::PhonesModel::revertPreferred(int row)
void UI::VCard::PhonesModel::revertPreferred(quint32 row)
{
setData(createIndex(row, 3), !isPreferred(row));
}
@ -216,7 +216,7 @@ void UI::VCard::PhonesModel::setPhones(const std::deque<Shared::VCard::Phone>& p
}
}
QString UI::VCard::PhonesModel::getPhone(int row) const
QString UI::VCard::PhonesModel::getPhone(quint32 row) const
{
return deque[row].number;
}

8
ui/widgets/vcard/phonesmodel.h
View file

@ -41,16 +41,16 @@ public:
int rowCount(const QModelIndex& parent) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
Qt::ItemFlags flags(const QModelIndex &index) const override;
bool isPreferred(int row) const;
bool isPreferred(quint32 row) const;
void removeLines(int index, int count);
void removeLines(quint32 index, quint32 count);
void setPhones(const std::deque<Shared::VCard::Phone>& phones);
void getPhones(std::deque<Shared::VCard::Phone>& phones) const;
QString getPhone(int row) const;
QString getPhone(quint32 row) const;
public slots:
QModelIndex addNewEmptyLine();
void revertPreferred(int row);
void revertPreferred(quint32 row);
private:
bool edit;