diff options
Diffstat (limited to 'Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory.cpp b/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory.cpp index 95f40498f..fa8982c4f 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory.cpp @@ -26,7 +26,7 @@ #include "config.h" #include "qwebnavigationhistory_p.h" -#include "WKBackForwardList.h" +#include "WKBackForwardListRef.h" #include "WKStringQt.h" #include "WKURL.h" #include "WKURLQt.h" @@ -35,12 +35,11 @@ #include <QString> #include <QUrl> #include <QtQml/QQmlEngine> -#include <WebKit2/WKArray.h> -#include <WebKit2/WKBackForwardListItem.h> -#include <WebKit2/WKBase.h> -#include <WebKit2/WKPage.h> -#include <WebKit2/WKRetainPtr.h> -#include <wtf/PassOwnPtr.h> +#include <WebKit/WKArray.h> +#include <WebKit/WKBackForwardListItemRef.h> +#include <WebKit/WKBase.h> +#include <WebKit/WKPage.h> +#include <WebKit/WKRetainPtr.h> using namespace WebKit; @@ -61,8 +60,8 @@ QWebNavigationListModel* QWebNavigationListModelPrivate::createWebNavigationMode QWebNavigationHistoryPrivate::QWebNavigationHistoryPrivate(WKPageRef page) : m_page(page) , m_backForwardList(WKPageGetBackForwardList(page)) - , m_backNavigationModel(adoptPtr(QWebNavigationListModelPrivate::createWebNavigationModel(m_backForwardList.get()))) - , m_forwardNavigationModel(adoptPtr(QWebNavigationListModelPrivate::createWebNavigationModel(m_backForwardList.get()))) + , m_backNavigationModel(QWebNavigationListModelPrivate::createWebNavigationModel(m_backForwardList.get())) + , m_forwardNavigationModel(QWebNavigationListModelPrivate::createWebNavigationModel(m_backForwardList.get())) { m_backNavigationModel->d->count = &WKBackForwardListGetBackListCount; m_backNavigationModel->d->indexSign = -1; |