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

KUrl -> QUrl

Browse source
This commit is contained in:
Luca Beltrame 2014-10-03 23:06:43 +02:00
parent 0eb716bda0
commit d7fec181e2
11 changed files with 66 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/danbooruclientview.cpp
View file

@ -56,10 +56,10 @@ namespace Danbooru {
// signal-slot connections // signal-slot connections
connect(m_delegate, SIGNAL(postDownloadRequested(KUrl)), this, connect(m_delegate, SIGNAL(postDownloadRequested(QUrl)), this,
SLOT(slotHandleDownload(KUrl))); SLOT(slotHandleDownload(QUrl)));
connect(m_delegate, SIGNAL(postViewRequested(KUrl)), this, connect(m_delegate, SIGNAL(postViewRequested(QUrl)), this,
SLOT(slotHandleView(KUrl))); SLOT(slotHandleView(QUrl)));
// connect(m_listView, SIGNAL(clicked(const QModelIndex&)), parent(), // connect(m_listView, SIGNAL(clicked(const QModelIndex&)), parent(),
// SLOT(displayInfo(const QModelIndex&)); // SLOT(displayInfo(const QModelIndex&));
@ -71,13 +71,13 @@ namespace Danbooru {
} }
void DanbooruClientView::slotHandleDownload(KUrl url) void DanbooruClientView::slotHandleDownload(QUrl url)
{ {
// TODO // TODO
Q_UNUSED(url) Q_UNUSED(url)
} }
void DanbooruClientView::slotHandleView(KUrl url) void DanbooruClientView::slotHandleView(QUrl url)
{ {
KRun* runViewer = new KRun(url, this /*window*/, 0 /*mode*/, KRun* runViewer = new KRun(url, this /*window*/, 0 /*mode*/,
false /*isLocalFile*/, false /*isLocalFile*/,

4
src/danbooruclientview.h
View file

@ -60,8 +60,8 @@ namespace Danbooru {
virtual ~DanbooruClientView(); virtual ~DanbooruClientView();
private Q_SLOTS: private Q_SLOTS:
void slotHandleDownload(KUrl); void slotHandleDownload(QUrl);
void slotHandleView(KUrl); void slotHandleView(QUrl);
private: private:
DanbooruPostModel* m_model; DanbooruPostModel* m_model;

18
src/danbooruconnectwidget.cpp
View file

@ -32,26 +32,26 @@ using KWallet::Wallet;
namespace Danbooru { namespace Danbooru {
const QMap< KUrl, QString > initBoardSalts() const QMap< QUrl, QString > initBoardSalts()
{ {
QMap< KUrl, QString > boardSalts; QMap< QUrl, QString > boardSalts;
boardSalts.insert(KUrl("http://konachan.com"), boardSalts.insert(QUrl("http://konachan.com"),
QString("So-I-Heard-You-Like-Mupkids-?--%1--")); QString("So-I-Heard-You-Like-Mupkids-?--%1--"));
boardSalts.insert(KUrl("http://konachan.net"), boardSalts.insert(QUrl("http://konachan.net"),
QString("So-I-Heard-You-Like-Mupkids-?--%1--")); QString("So-I-Heard-You-Like-Mupkids-?--%1--"));
boardSalts.insert(KUrl("http://yande.re"), boardSalts.insert(QUrl("http://yande.re"),
QString("choujin-steiner--%1--")); QString("choujin-steiner--%1--"));
boardSalts.insert(KUrl("http://danbooru.donmai.us"), boardSalts.insert(QUrl("http://danbooru.donmai.us"),
QString("choujin-steiner--%1--")); QString("choujin-steiner--%1--"));
return boardSalts; return boardSalts;
} }
const QMap<KUrl, QString> DanbooruConnectWidget::boardSalts = initBoardSalts(); const QMap<QUrl, QString> DanbooruConnectWidget::boardSalts = initBoardSalts();
DanbooruConnectWidget::DanbooruConnectWidget(QVector< KUrl > urlList, DanbooruConnectWidget::DanbooruConnectWidget(QVector< QUrl > urlList,
QWidget* parent): QWidget* parent):
QWidget(parent), QWidget(parent),
m_wallet(0) m_wallet(0)
@ -155,7 +155,7 @@ void DanbooruConnectWidget::emitRejected()
Q_EMIT rejected(); Q_EMIT rejected();
} }
KUrl DanbooruConnectWidget::boardUrl() const QUrl DanbooruConnectWidget::boardUrl() const
{ {
return m_boardUrl; return m_boardUrl;
} }

12
src/danbooruconnectwidget.h
View file

@ -26,7 +26,7 @@
#include <QString> #include <QString>
#include <QVector> #include <QVector>
#include <KUrl> #include <QUrl>
namespace KWallet { namespace KWallet {
class Wallet; class Wallet;
@ -36,26 +36,26 @@ namespace Danbooru {
class DanbooruService; class DanbooruService;
const QMap< KUrl, QString > initBoardSalts(); const QMap< QUrl, QString > initBoardSalts();
class DanbooruConnectWidget: public QWidget, public Ui::DanbooruConnectWidget { class DanbooruConnectWidget: public QWidget, public Ui::DanbooruConnectWidget {
Q_OBJECT Q_OBJECT
public: public:
explicit DanbooruConnectWidget(QVector<KUrl> urlList, explicit DanbooruConnectWidget(QVector<QUrl> urlList,
QWidget* parent = 0); QWidget* parent = 0);
~DanbooruConnectWidget(); ~DanbooruConnectWidget();
QString username() const; QString username() const;
QString password() const; QString password() const;
KUrl boardUrl() const; QUrl boardUrl() const;
private: private:
KUrl m_boardUrl; QUrl m_boardUrl;
QString m_username; QString m_username;
QString m_password; QString m_password;
KWallet::Wallet* m_wallet; KWallet::Wallet* m_wallet;
static const QMap<KUrl, QString> boardSalts; static const QMap<QUrl, QString> boardSalts;
Q_SIGNALS: Q_SIGNALS:
void connectionEstablished(DanbooruService* service); void connectionEstablished(DanbooruService* service);

14
src/libdanbooru/danboorupost.cpp
View file

@ -27,7 +27,7 @@
// KDE // KDE
#include <kurl.h> #include <QUrl>
// Own // Own
@ -50,8 +50,8 @@ DanbooruPost::DanbooruPost(QVariantMap postData, QPixmap pixmap,
m_height = postData.value("height").toString().toInt(); m_height = postData.value("height").toString().toInt();
m_width = postData.value("width").toString().toInt(); m_width = postData.value("width").toString().toInt();
m_url = KUrl(postData.value("file_url").toUrl()); m_url = QUrl(postData.value("file_url").toUrl());
m_thumbnailUrl = KUrl(postData.value("preview_url").toUrl()); m_thumbnailUrl = QUrl(postData.value("preview_url").toUrl());
m_size = postData.value("file_size").toInt(); m_size = postData.value("file_size").toInt();
m_rating = RATING_MAP.value(postData.value("rating").toString()); m_rating = RATING_MAP.value(postData.value("rating").toString());
@ -67,8 +67,8 @@ DanbooruPost::DanbooruPost(QXmlStreamAttributes& postData, QPixmap pixmap, QObje
m_height = postData.value("height").toString().toInt(); m_height = postData.value("height").toString().toInt();
m_width = postData.value("width").toString().toInt(); m_width = postData.value("width").toString().toInt();
m_url = KUrl(postData.value("file_url").toString()); m_url = QUrl(postData.value("file_url").toString());
m_thumbnailUrl = KUrl(postData.value("preview_url").toString()); m_thumbnailUrl = QUrl(postData.value("preview_url").toString());
m_size = postData.value("file_size").toString().toInt(); m_size = postData.value("file_size").toString().toInt();
m_rating = RATING_MAP.value(postData.value("rating").toString()); m_rating = RATING_MAP.value(postData.value("rating").toString());
} }
@ -132,7 +132,7 @@ const QSet< QString > DanbooruPost::tags() const
return m_tags; return m_tags;
} }
const KUrl DanbooruPost::thumbnailUrl() const const QUrl DanbooruPost::thumbnailUrl() const
{ {
return m_thumbnailUrl; return m_thumbnailUrl;
} }
@ -147,7 +147,7 @@ int DanbooruPost::size() const
return m_size; return m_size;
} }
const KUrl DanbooruPost::fileUrl() const const QUrl DanbooruPost::fileUrl() const
{ {
return m_url; return m_url;
} }

14
src/libdanbooru/danboorupost.h
View file

@ -39,7 +39,7 @@
// KDE // KDE
#include <KUrl> #include <QUrl>
// Own // Own
@ -73,9 +73,9 @@ namespace Danbooru {
Q_PROPERTY(const QPixmap pixmap READ pixmap WRITE setPixmap) Q_PROPERTY(const QPixmap pixmap READ pixmap WRITE setPixmap)
Q_PROPERTY(int id READ id) Q_PROPERTY(int id READ id)
Q_PROPERTY(KUrl fileUrl READ fileUrl) Q_PROPERTY(QUrl fileUrl READ fileUrl)
Q_PROPERTY(QSet<QString> tags READ tags) Q_PROPERTY(QSet<QString> tags READ tags)
Q_PROPERTY(KUrl thumbnailUrl READ thumbnailUrl) Q_PROPERTY(QUrl thumbnailUrl READ thumbnailUrl)
public: public:
@ -103,8 +103,8 @@ namespace Danbooru {
int m_width; int m_width;
int m_size; int m_size;
KUrl m_url; QUrl m_url;
KUrl m_thumbnailUrl; QUrl m_thumbnailUrl;
QSet<QString> m_tags; QSet<QString> m_tags;
Ratings m_rating; Ratings m_rating;
@ -178,7 +178,7 @@ namespace Danbooru {
/** /**
* @return The URL to the post's image. * @return The URL to the post's image.
**/ **/
const KUrl fileUrl() const; const QUrl fileUrl() const;
/** /**
* @return The tags associated to the post. * @return The tags associated to the post.
@ -188,7 +188,7 @@ namespace Danbooru {
/** /**
* @return The URL to the post's thumbnail. * @return The URL to the post's thumbnail.
**/ **/
const KUrl thumbnailUrl() const; const QUrl thumbnailUrl() const;
/** /**
* @return A pointer to the thumbnail's pixmap. * @return A pointer to the thumbnail's pixmap.

12
src/libdanbooru/danbooruservice.cpp
View file

@ -53,7 +53,7 @@ const QString DanbooruService::ARTIST_URL = "artist/index.json";
const QString DanbooruService::POOL_DATA_URL = "pool/show.xml"; const QString DanbooruService::POOL_DATA_URL = "pool/show.xml";
const QString DanbooruService::RELATED_TAG_URL = "tag/related.json"; const QString DanbooruService::RELATED_TAG_URL = "tag/related.json";
DanbooruService::DanbooruService(KUrl& boardUrl, QString username, DanbooruService::DanbooruService(QUrl& boardUrl, QString username,
QString password, KImageCache* cache, QString password, KImageCache* cache,
QObject* parent): QObject* parent):
QObject(parent), QObject(parent),
@ -84,7 +84,7 @@ void DanbooruService::getPostList(int page, QStringList tags, int limit)
parameters.insert("limit", QString::number(limit)); parameters.insert("limit", QString::number(limit));
parameters.insert("page", QString::number(page)); parameters.insert("page", QString::number(page));
KUrl danbooruUrl = requestUrl(m_url, POST_URL, m_username, QUrl danbooruUrl = requestUrl(m_url, POST_URL, m_username,
m_password, parameters, tags); m_password, parameters, tags);
//qDebug() << "Final constructed post URL" << danbooruUrl.url(); //qDebug() << "Final constructed post URL" << danbooruUrl.url();
@ -110,7 +110,7 @@ void DanbooruService::getTagList(int limit, QString name)
} }
parameters.insert("order", "date"); parameters.insert("order", "date");
KUrl danbooruUrl = requestUrl(m_url, TAG_URL, m_username, m_password, QUrl danbooruUrl = requestUrl(m_url, TAG_URL, m_username, m_password,
parameters); parameters);
//qDebug() << "Final constructed tag URL" << danbooruUrl.url(); //qDebug() << "Final constructed tag URL" << danbooruUrl.url();
@ -131,7 +131,7 @@ void DanbooruService::getPool(int poolId, int page)
parameters.insert("page", QString::number(page)); parameters.insert("page", QString::number(page));
} }
KUrl danbooruUrl = requestUrl(m_url, POOL_DATA_URL, m_username, QUrl danbooruUrl = requestUrl(m_url, POOL_DATA_URL, m_username,
m_password, parameters); m_password, parameters);
//qDebug() << "Final constructed pool URL" << danbooruUrl.url(); //qDebug() << "Final constructed pool URL" << danbooruUrl.url();
@ -153,7 +153,7 @@ void DanbooruService::getPool(int poolId, int page)
void DanbooruService::getPoolList(int page) void DanbooruService::getPoolList(int page)
{ {
KUrl danbooruUrl; QUrl danbooruUrl;
if (page == 0) { if (page == 0) {
danbooruUrl = requestUrl(m_url, POOL_URL, m_username, m_password); danbooruUrl = requestUrl(m_url, POOL_URL, m_username, m_password);
@ -203,7 +203,7 @@ void DanbooruService::getRelatedTags(const QStringList& tags,
QMap<QString, QString> parameters; QMap<QString, QString> parameters;
parameters.insert("type", type); parameters.insert("type", type);
KUrl danbooruUrl = requestUrl(m_url, RELATED_TAG_URL, m_username, QUrl danbooruUrl = requestUrl(m_url, RELATED_TAG_URL, m_username,
m_password, parameters, tags); m_password, parameters, tags);
//qDebug() << "Final constructed related tag URL" << danbooruUrl.url(); //qDebug() << "Final constructed related tag URL" << danbooruUrl.url();

8
src/libdanbooru/danbooruservice.h
View file

@ -40,7 +40,7 @@
// KDE // KDE
#include <KUrl> #include <QUrl>
#include <KIO/JobClasses> #include <KIO/JobClasses>
// Own // Own
@ -48,7 +48,7 @@
#include "danbooru.h" #include "danbooru.h"
class QPixmap; class QPixmap;
class KUrl; class QUrl;
class KJob; class KJob;
class KImageCache; class KImageCache;
@ -89,7 +89,7 @@ namespace Danbooru {
// member variables // member variables
KUrl m_url; QUrl m_url;
QString m_username; QString m_username;
QString m_password; QString m_password;
QSet<QString> m_blacklist; QSet<QString> m_blacklist;
@ -112,7 +112,7 @@ namespace Danbooru {
* @param parent The parent QObject * @param parent The parent QObject
* *
**/ **/
DanbooruService(KUrl& boardUrl, QString username = QString(), DanbooruService(QUrl& boardUrl, QString username = QString(),
QString password = QString(), KImageCache* cache = 0, QString password = QString(), KImageCache* cache = 0,
QObject* parent = 0); QObject* parent = 0);

21
src/libdanbooru/utils.cpp
View file

@ -33,13 +33,14 @@
namespace Danbooru { namespace Danbooru {
KUrl requestUrl(KUrl& url, const QString& path, QUrl requestUrl(QUrl& url, const QString& path,
const QString& username, const QString& password, const QString& username, const QString& password,
const dictMap& parameters, const QStringList& tags) const dictMap& parameters, const QStringList& tags)
{ {
KUrl danbooruUrl = KUrl(url); QUrl danbooruUrl = QUrl(url);
danbooruUrl.addPath(path); danbooruUrl = danbooruUrl.adjusted(QUrl::StripTrailingSlash);
danbooruUrl.setPath(danbooruUrl.path() + '/' + path);
// If we have parameters, add them // If we have parameters, add them
@ -66,12 +67,13 @@ namespace Danbooru {
return danbooruUrl; return danbooruUrl;
} }
KUrl requestUrl(KUrl& url, const QString& path, const QString& username, QUrl requestUrl(QUrl& url, const QString& path, const QString& username,
const QString& password, const dictMap& parameters) const QString& password, const dictMap& parameters)
{ {
KUrl danbooruUrl = KUrl(url); QUrl danbooruUrl = QUrl(url);
danbooruUrl.addPath(path); danbooruUrl = danbooruUrl.adjusted(QUrl::StripTrailingSlash);
danbooruUrl.setPath(danbooruUrl.path() + '/' + path);
// If we have parameters, add them // If we have parameters, add them
@ -91,11 +93,12 @@ namespace Danbooru {
return danbooruUrl; return danbooruUrl;
} }
KUrl requestUrl(KUrl& url, const QString& path, const QString& username, QUrl requestUrl(QUrl& url, const QString& path, const QString& username,
const QString& password) const QString& password)
{ {
KUrl danbooruUrl = KUrl(url); QUrl danbooruUrl = QUrl(url);
danbooruUrl.addPath(path); danbooruUrl = danbooruUrl.adjusted(QUrl::StripTrailingSlash);
danbooruUrl.setPath(danbooruUrl.path() + '/' + path);
if (!username.isEmpty() && !password.isEmpty()) { if (!username.isEmpty() && !password.isEmpty()) {
danbooruUrl.setUserName(username); danbooruUrl.setUserName(username);

8
src/libdanbooru/utils.h
View file

@ -29,7 +29,7 @@
// KDE // KDE
#include <kurl.h> #include <QUrl>
/** /**
* @brief Commmon utilities for Danbooru classes. * @brief Commmon utilities for Danbooru classes.
@ -60,7 +60,7 @@ namespace Danbooru {
* *
* *
**/ **/
KUrl requestUrl(KUrl& url, const QString& path, const QString& username, QUrl requestUrl(QUrl& url, const QString& path, const QString& username,
const QString& password, const dictMap& parameters, const QString& password, const dictMap& parameters,
const QStringList& tags); const QStringList& tags);
@ -82,7 +82,7 @@ namespace Danbooru {
* *
* *
**/ **/
KUrl requestUrl(KUrl& url, const QString& path, const QString& username, QUrl requestUrl(QUrl& url, const QString& path, const QString& username,
const QString& password, const dictMap& parameters); const QString& password, const dictMap& parameters);
@ -100,7 +100,7 @@ namespace Danbooru {
* *
* *
**/ **/
KUrl requestUrl(KUrl& url, const QString& path, const QString& username, QUrl requestUrl(QUrl& url, const QString& path, const QString& username,
const QString& password); const QString& password);

6
src/model/danboorupostdelegate.h
View file

@ -31,7 +31,7 @@
#include <QStyledItemDelegate> #include <QStyledItemDelegate>
#include <KUrl> #include <QUrl>
class QListView; class QListView;
class QPainter; class QPainter;
@ -79,7 +79,7 @@ namespace Danbooru {
* @param postUrl the URL to the full picture. * @param postUrl the URL to the full picture.
* *
*/ */
void postViewRequested(KUrl postUrl); void postViewRequested(QUrl postUrl);
/** /**
@ -88,7 +88,7 @@ namespace Danbooru {
* @param postUrl the URL to the full picture. * @param postUrl the URL to the full picture.
* *
*/ */
void postDownloadRequested(KUrl postUrl); void postDownloadRequested(QUrl postUrl);
private Q_SLOTS: private Q_SLOTS: