From 54deb0cb2688528eb67a527de641bff23f1207f0 Mon Sep 17 00:00:00 2001 From: Strider <127.0.0.1@404.notfound> Date: Thu, 28 May 2020 20:09:23 +0200 Subject: [PATCH] update// added backwarts compat on addresses --- src/FileSystem/FileSystem.cpp | 19 ++++++++++++++++++- src/Model/ContactItem.cpp | 14 ++++++++++++++ src/Model/ContactItem.h | 2 ++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/FileSystem/FileSystem.cpp b/src/FileSystem/FileSystem.cpp index 07d476c..4d3f146 100644 --- a/src/FileSystem/FileSystem.cpp +++ b/src/FileSystem/FileSystem.cpp @@ -118,7 +118,24 @@ QList FileSystem::readContactsOldFormat(QString file) in >> stuff; 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); } diff --git a/src/Model/ContactItem.cpp b/src/Model/ContactItem.cpp index d2321bd..589ca9f 100644 --- a/src/Model/ContactItem.cpp +++ b/src/Model/ContactItem.cpp @@ -7,6 +7,20 @@ 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) { _name = name; diff --git a/src/Model/ContactItem.h b/src/Model/ContactItem.h index 861ad26..edb512d 100644 --- a/src/Model/ContactItem.h +++ b/src/Model/ContactItem.h @@ -19,6 +19,8 @@ private: public: 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); QString getName() const; QString getMyAddress() const;