Browse Source

update// added backwarts compat on addresses

pull/130/head
Strider 4 years ago
parent
commit
54deb0cb26
  1. 19
      src/FileSystem/FileSystem.cpp
  2. 14
      src/Model/ContactItem.cpp
  3. 2
      src/Model/ContactItem.h

19
src/FileSystem/FileSystem.cpp

@ -118,7 +118,24 @@ QList<ContactItem> 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);
}

14
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;

2
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;

Loading…
Cancel
Save