Be more relaxed in the return type, some may be maps, hence return directly a QVariant.

This commit is contained in:
Luca Beltrame 2013-03-23 16:30:30 +01:00
parent d19030658c
commit 41136fb89b
2 changed files with 12 additions and 3 deletions

View file

@ -35,10 +35,16 @@ namespace Danbooru {
KUrl danbooruUrl = KUrl(url);
danbooruUrl.addPath(path);
qDebug() << "Starting step URL" << danbooruUrl.url();
qDebug() << "Tags" << tags;
// If we have parameters, add them
if (!parameters.isEmpty()) {
qDebug() << "Handling parameters";
qDebug() << "Adding" << parameters;
QMap<QString, QString>::const_iterator iter;
for (iter = parameters.constBegin(); iter!= parameters.constEnd();
@ -47,6 +53,9 @@ namespace Danbooru {
}
}
qDebug() << "First step URL" << danbooruUrl.url();
// Now, let's add tags should we have them
if (!tags.isEmpty()) {
@ -149,7 +158,7 @@ namespace Danbooru {
return postData;
}
QList< QVariant > parseDanbooruResult(QByteArray data, bool* result)
QVariant parseDanbooruResult(QByteArray data, bool* result)
{
QJson::Parser parser;
@ -164,7 +173,7 @@ namespace Danbooru {
*result = true;
return postData.toList();
return postData;
}

View file

@ -106,7 +106,7 @@ namespace Danbooru {
QList<QVariant> parseDanbooruResult(QByteArray data, QString xlmElement,
bool* result);
QList<QVariant> parseDanbooruResult(QByteArray data, bool* result);
QVariant parseDanbooruResult(QByteArray data, bool* result);
}