update// added backwarts compat on addresses

This commit is contained in:
Strider
2020-05-28 20:09:23 +02:00
parent 47d11fc5c8
commit 54deb0cb26
3 changed files with 34 additions and 1 deletions

View File

@@ -118,7 +118,24 @@ QList<ContactItem> FileSystem::readContactsOldFormat(QString file)
in >> stuff; in >> stuff;
for (int i=0; i < stuff.size(); i++) for (int i=0; i < stuff.size(); i++)
{ {
ContactItem contact = ContactItem(stuff[i][0],stuff[i][1], stuff[i][2], stuff[i][3],stuff[i][4]); qDebug() << stuff[i].size();
ContactItem contact;
if(stuff[i].size() == 2)
{
contact = ContactItem(stuff[i][0],stuff[i][1]);
}
else if(stuff[i].size() == 4)
{
contact = ContactItem(stuff[i][0],stuff[i][1]);
}
else
{
contact = ContactItem(stuff[i][0],stuff[i][1], stuff[i][2], stuff[i][3],stuff[i][4]);
}
contacts.push_back(contact); contacts.push_back(contact);
} }

View File

@@ -7,6 +7,20 @@
ContactItem::ContactItem() {} ContactItem::ContactItem() {}
ContactItem::ContactItem(QString name, QString partnerAddress)
{
_name = name;
_partnerAddress = partnerAddress;
}
ContactItem::ContactItem(QString name, QString partnerAddress, QString myAddress, QString cid)
{
_name = name;
_myAddress = myAddress;
_partnerAddress = partnerAddress;
_cid = cid;
}
ContactItem::ContactItem(QString name, QString partnerAddress, QString myAddress, QString cid, QString avatar) ContactItem::ContactItem(QString name, QString partnerAddress, QString myAddress, QString cid, QString avatar)
{ {
_name = name; _name = name;

View File

@@ -19,6 +19,8 @@ private:
public: public:
ContactItem(); ContactItem();
ContactItem(QString name, QString partnerAddress);
ContactItem(QString name, QString partnerAddress, QString myAddress, QString cid);
ContactItem(QString name, QString partnerAddress, QString myAddress, QString cid, QString avatar); ContactItem(QString name, QString partnerAddress, QString myAddress, QString cid, QString avatar);
QString getName() const; QString getName() const;
QString getMyAddress() const; QString getMyAddress() const;