merge develop

This commit is contained in:
Luis Ángel San Martín
2018-03-25 13:16:27 +02:00
161 changed files with 5927 additions and 2895 deletions

View File

@ -16,7 +16,7 @@ ComicDB::ComicDB(const ComicDB &comicDB)
operator=(comicDB);
}
bool ComicDB::isDir()
bool ComicDB::isDir() const
{
return false;
}
@ -235,6 +235,11 @@ ComicInfo & ComicInfo::operator=(const ComicInfo & comicInfo)
notes = comicInfo.notes;
comicVineID = comicInfo.comicVineID;
lastTimeOpened = comicInfo.lastTimeOpened;
coverSizeRatio = comicInfo.coverSizeRatio;
originalCoverSize = comicInfo.originalCoverSize;
return *this;
}
@ -547,6 +552,11 @@ QDataStream &operator<<(QDataStream & stream, const ComicInfo & comicInfo)
stream << comicInfo.comicVineID;
stream << comicInfo.lastTimeOpened;
stream << comicInfo.coverSizeRatio;
stream << comicInfo.originalCoverSize;
return stream;
}
@ -602,6 +612,11 @@ QDataStream &operator>>(QDataStream & stream, ComicInfo & comicInfo)
stream >> comicInfo.notes;
stream >> comicInfo.comicVineID;
stream >> comicInfo.lastTimeOpened;
stream >> comicInfo.coverSizeRatio;
stream >> comicInfo.originalCoverSize;
return stream;
}