KUrl -> QUrl
This commit is contained in:
parent
0eb716bda0
commit
d7fec181e2
11 changed files with 66 additions and 63 deletions
|
@ -33,13 +33,14 @@
|
|||
|
||||
namespace Danbooru {
|
||||
|
||||
KUrl requestUrl(KUrl& url, const QString& path,
|
||||
QUrl requestUrl(QUrl& url, const QString& path,
|
||||
const QString& username, const QString& password,
|
||||
const dictMap& parameters, const QStringList& tags)
|
||||
{
|
||||
|
||||
KUrl danbooruUrl = KUrl(url);
|
||||
danbooruUrl.addPath(path);
|
||||
QUrl danbooruUrl = QUrl(url);
|
||||
danbooruUrl = danbooruUrl.adjusted(QUrl::StripTrailingSlash);
|
||||
danbooruUrl.setPath(danbooruUrl.path() + '/' + path);
|
||||
|
||||
// If we have parameters, add them
|
||||
|
||||
|
@ -66,12 +67,13 @@ namespace Danbooru {
|
|||
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)
|
||||
{
|
||||
|
||||
KUrl danbooruUrl = KUrl(url);
|
||||
danbooruUrl.addPath(path);
|
||||
QUrl danbooruUrl = QUrl(url);
|
||||
danbooruUrl = danbooruUrl.adjusted(QUrl::StripTrailingSlash);
|
||||
danbooruUrl.setPath(danbooruUrl.path() + '/' + path);
|
||||
|
||||
// If we have parameters, add them
|
||||
|
||||
|
@ -91,11 +93,12 @@ namespace Danbooru {
|
|||
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)
|
||||
{
|
||||
KUrl danbooruUrl = KUrl(url);
|
||||
danbooruUrl.addPath(path);
|
||||
QUrl danbooruUrl = QUrl(url);
|
||||
danbooruUrl = danbooruUrl.adjusted(QUrl::StripTrailingSlash);
|
||||
danbooruUrl.setPath(danbooruUrl.path() + '/' + path);
|
||||
|
||||
if (!username.isEmpty() && !password.isEmpty()) {
|
||||
danbooruUrl.setUserName(username);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue