Removed inline copy of QExplicitlySharedDataPointer. This is not needed anymore since...

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27963 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebpagehistory.h b/WebKit/qt/Api/qwebpagehistory.h
index ff96d96c52c2f5eece66e0ba5dc34776d929ee96..efba89a955c30d9d4e0324b374a599b48b57421d 100644 (file)
--- a/WebKit/qt/Api/qwebpagehistory.h
+++ b/WebKit/qt/Api/qwebpagehistory.h
@@ -30,66 +30,6 @@
 
 #include <qwebkitglobal.h>
 
-#if QT_VERSION < 0x040300
-template <class T> class QExplicitlySharedDataPointer
-{
-public:
-    typedef T Type;
-
-    inline T &operator*() { return *d; }
-    inline const T &operator*() const { return *d; }
-    inline T *operator->() { return d; }
-    inline const T *operator->() const { return d; }
-    inline operator T *() { return d; }
-    inline operator const T *() const { return d; }
-    inline T *data() { return d; }
-    inline const T *data() const { return d; }
-    inline const T *constData() const { return d; }
-
-    //inline operator bool () const { return d != 0; }
-
-    inline bool operator==(const QExplicitlySharedDataPointer<T> &other) const { return d == other.d; }
-    inline bool operator!=(const QExplicitlySharedDataPointer<T> &other) const { return d != other.d; }
-    inline bool operator==(const T *ptr) const { return d == ptr; }
-    inline bool operator!=(const T *ptr) const { return d != ptr; }
-
-    inline QExplicitlySharedDataPointer() { d = 0; }
-    inline ~QExplicitlySharedDataPointer() { if (d && !d->ref.deref()) delete d; }
-
-    explicit QExplicitlySharedDataPointer(T *data);
-    inline QExplicitlySharedDataPointer(const QExplicitlySharedDataPointer<T> &o) : d(o.d) { if (d) d->ref.ref(); }
-    inline QExplicitlySharedDataPointer<T> & operator=(const QExplicitlySharedDataPointer<T> &o) {
-        if (o.d != d) {
-            T *x = o.d;
-            if (x) x->ref.ref();
-            x = qAtomicSetPtr(&d, x);
-            if (x && !x->ref.deref())
-                delete x;
-        }
-        return *this;
-    }
-    inline QExplicitlySharedDataPointer &operator=(T *o) {
-        if (o != d) {
-            T *x = o;
-            if (x) x->ref.ref();
-            x = qAtomicSetPtr(&d, x);
-            if (x && !x->ref.deref())
-                delete x;
-        }
-        return *this;
-    }
-
-    inline bool operator!() const { return !d; }
-
-private:
-
-    T *d;
-};
-template <class T>
-Q_INLINE_TEMPLATE QExplicitlySharedDataPointer<T>::QExplicitlySharedDataPointer(T *adata) : d(adata)
-{ if (d) d->ref.ref(); }
-#endif
-
 class QWebPage;
 
 class QWebHistoryItemPrivate;

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 79e91afa3b9e67981e3d3d9e33cf5b0c61f9ce63..881c50b681a97d1c6f98f309f46ea94bff2a77a9 100644 (file)
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-22  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by George.
+
+        Removed inline copy of QExplicitlySharedDataPointer. This is not needed anymore since we require Qt >= 4.3.0.
+
+        * Api/qwebpagehistory.h:
+
 2007-11-22  George Staikos  <staikos@kde.org>
 
         Reviewed by Simon Hausmann <hausmann@kde.org>.