Changeset 846 for trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h

Timestamp:

May 5, 2011, 5:36:53 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h (modified) (9 diffs)

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h

@@ -55 +55 @@
     class FrameLoaderClientQt;
     class InspectorClientQt;
+
     class ResourceHandle;
     class HitTestResult;
@@ -169 +170 @@
         AlignRight,
 
+
+
         WebActionCount
     };
@@ -209 +212 @@
 #endif
 
-#if QT_VERSION < 0x040400 && !defined(qdoc)
-    void setNetworkInterface(QWebNetworkInterface *interface);
-    QWebNetworkInterface *networkInterface() const;
-
-    // #### why is this in the page itself?
-#ifndef QT_NO_NETWORKPROXY
-    void setNetworkProxy(const QNetworkProxy& proxy);
-    QNetworkProxy networkProxy() const;
-#endif
-
-#else
     void setNetworkAccessManager(QNetworkAccessManager *manager);
     QNetworkAccessManager *networkAccessManager() const;
-#endif
 
     void setPluginFactory(QWebPluginFactory *factory);
@@ -232 +223 @@
     QString selectedText() const;
 
+
     QAction *action(WebAction action) const;
+
     virtual void triggerAction(WebAction action, bool checked = false);
 
@@ -335 +328 @@
     void menuBarVisibilityChangeRequested(bool visible);
 
-#if QT_VERSION >= 0x040400
     void unsupportedContent(QNetworkReply *reply);
     void downloadRequested(const QNetworkRequest &request);
-#endif
 
     void microFocusChanged();
@@ -351 +342 @@
     virtual QObject *createPlugin(const QString &classid, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues);
 
-#if QT_VERSION >= 0x040400
     virtual bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type);
-#else
-    virtual bool acceptNavigationRequest(QWebFrame *frame, const QWebNetworkRequest &request, NavigationType type);
-#endif
     virtual QString chooseFile(QWebFrame *originatingFrame, const QString& oldFile);
     virtual void javaScriptAlert(QWebFrame *originatingFrame, const QString& msg);
@@ -366 +353 @@
 private:
     Q_PRIVATE_SLOT(d, void _q_onLoadProgressChanged(int))
+
     Q_PRIVATE_SLOT(d, void _q_webActionTriggered(bool checked))
+
     Q_PRIVATE_SLOT(d, void _q_cleanupLeakMessages())
 
@@ -374 +363 @@
     friend class QWebPagePrivate;
     friend class QWebView;
+
     friend class QGraphicsWebView;
+
     friend class QWebInspector;
     friend class WebCore::ChromeClientQt;
@@ -380 +371 @@
     friend class WebCore::FrameLoaderClientQt;
     friend class WebCore::InspectorClientQt;
+
     friend class WebCore::ResourceHandle;
     friend class WebCore::QNetworkReplyHandler;