| Index: Source/WebCore/history/HistoryItem.h
|
| diff --git a/Source/WebCore/history/HistoryItem.h b/Source/WebCore/history/HistoryItem.h
|
| index bece46381a5c36ee1d92bbed664779e5479f5267..a242d87766f293d4eaa2545dfeccc7b612db53ce 100644
|
| --- a/Source/WebCore/history/HistoryItem.h
|
| +++ b/Source/WebCore/history/HistoryItem.h
|
| @@ -40,12 +40,6 @@
|
| typedef struct objc_object* id;
|
| #endif
|
|
|
| -#if PLATFORM(QT)
|
| -#include <QVariant>
|
| -#include <QByteArray>
|
| -#include <QDataStream>
|
| -#endif
|
| -
|
| #if PLATFORM(BLACKBERRY)
|
| #include "HistoryItemViewState.h"
|
| #endif
|
| @@ -198,14 +192,6 @@ public:
|
| void setTransientProperty(const String&, id);
|
| #endif
|
|
|
| -#if PLATFORM(QT)
|
| - QVariant userData() const { return m_userData; }
|
| - void setUserData(const QVariant& userData) { m_userData = userData; }
|
| -
|
| - static PassRefPtr<HistoryItem> restoreState(QDataStream& buffer, int version);
|
| - QDataStream& saveState(QDataStream& out, int version) const;
|
| -#endif
|
| -
|
| #if PLATFORM(BLACKBERRY)
|
| HistoryItemViewState& viewState() { return m_viewState; }
|
| #endif
|
| @@ -237,10 +223,6 @@ private:
|
|
|
| void encodeBackForwardTreeNode(Encoder&) const;
|
|
|
| - /* When adding new member variables to this class, please notify the Qt team.
|
| - * qt/HistoryItemQt.cpp contains code to serialize history items.
|
| - */
|
| -
|
| String m_urlString;
|
| String m_originalURLString;
|
| String m_referrer;
|
| @@ -294,13 +276,6 @@ private:
|
| OwnPtr<HashMap<String, RetainPtr<id> > > m_transientProperties;
|
| #endif
|
|
|
| -#if PLATFORM(QT)
|
| - QVariant m_userData;
|
| -#endif
|
| -
|
| -#if PLATFORM(BLACKBERRY)
|
| - HistoryItemViewState m_viewState;
|
| -#endif
|
| }; //class HistoryItem
|
|
|
| } //namespace WebCore
|
|
|