[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdelibs/frameworks] kio/kio: KUrl -> QUrl
From: David Faure <faure () kde ! org>
Date: 2012-03-13 21:35:16
Message-ID: 20120313213516.61749A60BB () git ! kde ! org
[Download RAW message or body]
Git commit 4cb7af69db25d9ebae1d9f4dde6b8a02e104dd53 by David Faure.
Committed on 13/03/2012 at 21:53.
Pushed by dfaure into branch 'frameworks'.
KUrl -> QUrl
M +2 -2 kio/kio/accessmanager.cpp
M +2 -2 kio/kio/accessmanagerreply_p.cpp
M +1 -3 kio/kio/accessmanagerreply_p.h
http://commits.kde.org/kdelibs/4cb7af69db25d9ebae1d9f4dde6b8a02e104dd53
diff --git a/kio/kio/accessmanager.cpp b/kio/kio/accessmanager.cpp
index 4dc420d..3b7b6d9 100644
--- a/kio/kio/accessmanager.cpp
+++ b/kio/kio/accessmanager.cpp
@@ -94,7 +94,7 @@ class CookieJar::CookieJarPrivate
{
public:
CookieJarPrivate()
- : windowId((WId)-1),
+ : windowId((WId)-1),
isEnabled(true),
isStorageDisabled(false)
{}
@@ -225,7 +225,7 @@ QNetworkReply *AccessManager::createRequest(Operation op, const QNetworkRequest
}
KIO::SimpleJob *kioJob = 0;
- const KUrl reqUrl (req.url());
+ const QUrl reqUrl(req.url());
if (!d->externalContentAllowed &&
!KDEPrivate::AccessManagerReply::isLocalRequest(reqUrl) &&
diff --git a/kio/kio/accessmanagerreply_p.cpp b/kio/kio/accessmanagerreply_p.cpp
index 9dec6fc..17a9f96 100644
--- a/kio/kio/accessmanagerreply_p.cpp
+++ b/kio/kio/accessmanagerreply_p.cpp
@@ -154,9 +154,9 @@ void AccessManagerReply::putOnHold()
KIO::Scheduler::publishSlaveOnHold();
}
-bool AccessManagerReply::isLocalRequest (const KUrl& url)
+bool AccessManagerReply::isLocalRequest(const QUrl& url)
{
- const QString scheme (url.scheme());
+ const QString scheme(url.scheme());
return (KProtocolInfo::isKnownProtocol(scheme) &&
KProtocolInfo::protocolClass(scheme).compare(QL1S(":local"), Qt::CaseInsensitive) == 0);
}
diff --git a/kio/kio/accessmanagerreply_p.h b/kio/kio/accessmanagerreply_p.h
index 6614748..d78aa76 100644
--- a/kio/kio/accessmanagerreply_p.h
+++ b/kio/kio/accessmanagerreply_p.h
@@ -62,7 +62,7 @@ public:
void setStatus(const QString& message, QNetworkReply::NetworkError);
void putOnHold();
- static bool isLocalRequest(const KUrl& url);
+ static bool isLocalRequest(const QUrl& url);
protected:
virtual qint64 readData(char *data, qint64 maxSize);
@@ -86,8 +86,6 @@ private:
QWeakPointer<KIO::SimpleJob> m_kioJob;
};
-bool AccessManager_isLocalRequest(const KUrl&);
-
}
#endif // KIO_ACCESSMANAGERREPLY_P_H
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic