KDE/danbooru-client
1
0
Fork 0
Code Issues Pull requests Releases Activity

Move ApiType to the Danbooru namespace to prevent circular includes

Browse source 
Adjust all signatures to match for this change
This commit is contained in:
Luca Beltrame 2015-08-26 16:23:25 +02:00
commit d3da86ff28
5 changed files with 98 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/libdanbooru/danboorupost.cpp
View file

@ -35,6 +35,23 @@ namespace Danbooru
const QMap<QString, DanbooruPost::Rating> DanbooruPost::RATING_MAP = initRatingMap();
void DanbooruPost::parseDanbooruKonachan(const QVariantMap &postData) {
m_tags = QSet<QString>::fromList(postData.value("tags").toString().split(' '));
m_id = postData.value("id").toString().toInt();
m_height = postData.value("height").toString().toInt();
m_width = postData.value("width").toString().toInt();
m_url = postData.value("file_url").toUrl();
m_thumbnailUrl = postData.value("preview_url").toUrl();
m_size = postData.value("file_size").toInt();
m_rating = RATING_MAP.value(postData.value("rating").toString());
m_sampleUrl = postData.value("sample_url").toUrl();
}
void DanbooruPost::parseDanbooruDonmai(const QVariantMap &postData) {
}
DanbooruPost::DanbooruPost(QObject *parent): QObject(parent)
{
m_pixmap = QPixmap();
@ -47,25 +64,46 @@ DanbooruPost::DanbooruPost(QObject *parent): QObject(parent)
m_rating = Questionable;
}
DanbooruPost::DanbooruPost(QVariantMap postData, QPixmap pixmap,
DanbooruPost::DanbooruPost(QVariantMap postData,Danbooru::ApiType apiType, QPixmap pixmap,
QObject *parent):
QObject(parent),
m_pixmap(pixmap)
{
m_tags = QSet<QString>::fromList(postData.value("tags").toString().split(' '));
m_id = postData.value("id").toString().toInt();
m_height = postData.value("height").toString().toInt();
m_width = postData.value("width").toString().toInt();
switch(apiType) {
case ApiType::KonachanDanbooru:
parseDanbooruKonachan(postData);
break;
case ApiType::OriginalDanbooru:
parseDanbooruDonmai(postData);
break;
default:
parseDanbooruKonachan(postData);
break;
}
m_url = postData.value("file_url").toUrl();
m_thumbnailUrl = postData.value("preview_url").toUrl();
m_size = postData.value("file_size").toInt();
m_rating = RATING_MAP.value(postData.value("rating").toString());
m_sampleUrl = postData.value("sample_url").toUrl();
}
// DanbooruPost::DanbooruPost(QVariantMap postData, QPixmap pixmap,
// QObject *parent):
// QObject(parent),
// m_pixmap(pixmap)
// {
//
// m_tags = QSet<QString>::fromList(postData.value("tags").toString().split(' '));
// m_id = postData.value("id").toString().toInt();
// m_height = postData.value("height").toString().toInt();
// m_width = postData.value("width").toString().toInt();
//
// m_url = postData.value("file_url").toUrl();
// m_thumbnailUrl = postData.value("preview_url").toUrl();
// m_size = postData.value("file_size").toInt();
// m_rating = RATING_MAP.value(postData.value("rating").toString());
// m_sampleUrl = postData.value("sample_url").toUrl();
//
// }
DanbooruPost::DanbooruPost(QXmlStreamAttributes &postData, QPixmap pixmap, QObject *parent):
QObject(parent),
m_pixmap(pixmap)