src/WebPage.h in capybara-webkit-0.13.2 vs src/WebPage.h in capybara-webkit-0.14.0

@@ -1,11 +1,11 @@
 #ifndef _WEBPAGE_H
 #define _WEBPAGE_H
 #include <QtWebKit>
-#include <QtNetwork>
 
 class WebPageManager;
+class NetworkAccessManager;
 
 class WebPage : public QWebPage {
   Q_OBJECT
 
   public:
@@ -21,20 +21,23 @@
     int getLastStatus();
     void setCustomNetworkAccessManager();
     bool render(const QString &fileName);
     virtual bool extension (Extension extension, const ExtensionOption *option=0, ExtensionReturn *output=0);
     void setSkipImageLoading(bool skip);
-    QString consoleMessages();
-    QString alertMessages();
-    QString confirmMessages();
-    QString promptMessages();
+    QVariantList consoleMessages();
+    QVariantList alertMessages();
+    QVariantList confirmMessages();
+    QVariantList promptMessages();
     void resetWindowSize();
     QWebPage *createWindow(WebWindowType type);
     QString uuid();
     QString getWindowName();
     bool matchesWindowSelector(QString);
     void setFocus();
+    NetworkAccessManager *networkAccessManager();
+    bool unsupportedContentLoaded();
+    void unsupportedContentFinishedReply(QNetworkReply *reply);
 
   public slots:
     bool shouldInterruptJavaScript();
     void injectJavascriptHelpers();
     void loadStarted();
@@ -42,12 +45,10 @@
     bool isLoading() const;
     const QList<QNetworkReply::RawHeaderPair> &pageHeaders();
     void frameCreated(QWebFrame *);
     void handleSslErrorsForReply(QNetworkReply *reply, const QList<QSslError> &);
     void handleUnsupportedContent(QNetworkReply *reply);
-    void networkAccessManagerCreatedRequest(QByteArray &url, QNetworkReply *reply);
-    void networkAccessManagerFinishedReply(QNetworkReply *reply);
 
   signals:
     void pageFinished(bool);
     void requestCreated(QByteArray &url, QNetworkReply *reply);
     void replyFinished(QNetworkReply *reply);
@@ -63,22 +64,23 @@
   private:
     QString m_capybaraJavascript;
     QString m_userAgent;
     bool m_loading;
     bool m_failed;
-    QString getLastAttachedFileName();
+    QStringList getAttachedFileNames();
     void loadJavascript();
     void setUserStylesheet();
     bool m_confirm;
     bool m_prompt;
-    QStringList m_consoleMessages;
-    QStringList m_alertMessages;
-    QStringList m_confirmMessages;
+    QVariantList m_consoleMessages;
+    QVariantList m_alertMessages;
+    QVariantList m_confirmMessages;
     QString m_prompt_text;
-    QStringList m_promptMessages;
+    QVariantList m_promptMessages;
     QString m_uuid;
     WebPageManager *m_manager;
     QString m_errorPageMessage;
+    bool m_unsupportedContentLoaded;
 };
 
 #endif //_WEBPAGE_H