Reviewed by Simon
Remove the userHandle methods from QWebnetworkJob again.
They don't really give us anything and just clutter the API.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@21621 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitQt/Api/qwebnetworkinterface.cpp b/WebKitQt/Api/qwebnetworkinterface.cpp
index fe018fb..3f6fe81 100644
--- a/WebKitQt/Api/qwebnetworkinterface.cpp
+++ b/WebKitQt/Api/qwebnetworkinterface.cpp
@@ -167,23 +167,6 @@
}
/*!
- \internal
-*/
-void QWebNetworkJob::setUserHandle(void *handle)
-{
- d->userHandle = handle;
-}
-
-/*!
- \internal
-*/
-void *QWebNetworkJob::userHandle() const
-{
- return d->userHandle;
-}
-
-
-/*!
\class QWebNetworkManager
\internal
*/
diff --git a/WebKitQt/Api/qwebnetworkinterface.h b/WebKitQt/Api/qwebnetworkinterface.h
index 75360af..c91748a 100644
--- a/WebKitQt/Api/qwebnetworkinterface.h
+++ b/WebKitQt/Api/qwebnetworkinterface.h
@@ -46,34 +46,14 @@
void ref();
bool deref();
- template <typename T>
- void setHandle(T *t);
- template <typename T>
- T *handle() const;
-
private:
QWebNetworkJob();
~QWebNetworkJob();
- void setUserHandle(void *);
- void *userHandle() const;
-
friend class QWebNetworkManager;
QWebNetworkJobPrivate *d;
};
-template <typename T>
-void QWebNetworkJob::setHandle(T *t)
-{
- setUserHandle(t);
-}
-
-template <typename T>
-T *QWebNetworkJob::handle() const
-{
- return static_cast<T *>(userHandle());
-}
-
class QWebNetworkInterfacePrivate;
class QWEBKIT_EXPORT QWebNetworkInterface : public QObject
diff --git a/WebKitQt/Api/qwebnetworkinterface_p.h b/WebKitQt/Api/qwebnetworkinterface_p.h
index 4249355..018d0dd 100644
--- a/WebKitQt/Api/qwebnetworkinterface_p.h
+++ b/WebKitQt/Api/qwebnetworkinterface_p.h
@@ -41,7 +41,6 @@
QHttpResponseHeader response;
WebCore::ResourceHandle *resourceHandle;
- void *userHandle;
bool redirected;
void setURL(const QUrl &u);
diff --git a/WebKitQt/ChangeLog b/WebKitQt/ChangeLog
index a736335..80fece5 100644
--- a/WebKitQt/ChangeLog
+++ b/WebKitQt/ChangeLog
@@ -1,3 +1,14 @@
+2007-05-21 Lars Knoll <lars@trolltech.com>
+
+ Reviewed by Simon
+
+ Remove the userHandle methods from QWebnetworkJob again.
+ They don't really give us anything and just clutter the API.
+
+ * Api/qwebnetworkinterface.cpp:
+ * Api/qwebnetworkinterface.h:
+ * Api/qwebnetworkinterface_p.h:
+
2007-05-21 Simon Hausmann <hausmann@kde.org>
Reviewed by Zack.
