From beb4ff332ca5b8406a75e8b2146464c5b0a81abd Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Thu, 16 Jan 2014 18:20:32 +0100
Subject: Cleanup the QtWebEngineWidgets public headers and API

Headers were left intact to leave a trace of the evolution compared
to the QtWebKit API and to make it easier to work until we had a
basic subset of the API implemented.

With the upcoming release, this patch removes this convenience in the
aim of starting polishing the headers and the documentation for the
upcoming release.

Change-Id: Iae436b4ec041d771a7002575e122835802bc9f3e
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
---
 src/webenginewidgets/api/qwebengineview.h | 39 -------------------------------
 1 file changed, 39 deletions(-)

(limited to 'src/webenginewidgets/api/qwebengineview.h')

diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h
index 5e7dfa0e9..02f599d45 100644
--- a/src/webenginewidgets/api/qwebengineview.h
+++ b/src/webenginewidgets/api/qwebengineview.h
@@ -31,33 +31,18 @@
 
 QT_BEGIN_NAMESPACE
 class QContextMenuEvent;
-class QIcon;
-class QNetworkRequest;
-class QPrinter;
 class QUrl;
 class QWebEnginePage;
 class QWebEngineViewPrivate;
-class QWebEngineNetworkRequest;
 
 class QWEBENGINEWIDGETS_EXPORT QWebEngineView : public QWidget {
     Q_OBJECT
-// Hack to avoid undefined symbols with properties until we have them implemented.
-#ifndef Q_MOC_RUN
     Q_PROPERTY(QString title READ title)
     Q_PROPERTY(QUrl url READ url WRITE setUrl)
-    Q_PROPERTY(QIcon icon READ icon)
     Q_PROPERTY(QString selectedText READ selectedText)
-    Q_PROPERTY(QString selectedHtml READ selectedHtml)
     Q_PROPERTY(bool hasSelection READ hasSelection)
-    Q_PROPERTY(bool modified READ isModified)
-    //Q_PROPERTY(Qt::TextInteractionFlags textInteractionFlags READ textInteractionFlags WRITE setTextInteractionFlags)
-    Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier DESIGNABLE false)
     Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor)
 
-    Q_PROPERTY(QPainter::RenderHints renderHints READ renderHints WRITE setRenderHints)
-    Q_FLAGS(QPainter::RenderHints)
-#endif
-
 public:
     explicit QWebEngineView(QWidget* parent = 0);
     virtual ~QWebEngineView();
@@ -66,45 +51,26 @@ public:
     void setPage(QWebEnginePage* page);
 
     void load(const QUrl& url);
-    void load(const QNetworkRequest& request, QNetworkAccessManager::Operation operation = QNetworkAccessManager::GetOperation, const QByteArray &body = QByteArray());
     void setHtml(const QString& html, const QUrl& baseUrl = QUrl());
     void setContent(const QByteArray& data, const QString& mimeType = QString(), const QUrl& baseUrl = QUrl());
 
     QWebEngineHistory* history() const;
-    QWebEngineSettings* settings() const;
 
     QString title() const;
     void setUrl(const QUrl &url);
     QUrl url() const;
-    QIcon icon() const;
 
     bool hasSelection() const;
     QString selectedText() const;
-    QString selectedHtml() const;
 
 #ifndef QT_NO_ACTION
     QAction* pageAction(QWebEnginePage::WebAction action) const;
 #endif
     void triggerPageAction(QWebEnginePage::WebAction action, bool checked = false);
 
-    bool isModified() const;
-
-    /*
-    Qt::TextInteractionFlags textInteractionFlags() const;
-    void setTextInteractionFlags(Qt::TextInteractionFlags flags);
-    void setTextInteractionFlag(Qt::TextInteractionFlag flag);
-    */
-
     qreal zoomFactor() const;
     void setZoomFactor(qreal factor);
 
-    void setTextSizeMultiplier(qreal factor);
-    qreal textSizeMultiplier() const;
-
-    QPainter::RenderHints renderHints() const;
-    void setRenderHints(QPainter::RenderHints hints);
-    void setRenderHint(QPainter::RenderHint hint, bool enabled = true);
-
     void findText(const QString &subString, QWebEnginePage::FindFlags options = 0, const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>());
 
     virtual QSize sizeHint() const { return QSize(800, 600); }
@@ -115,17 +81,12 @@ public Q_SLOTS:
     void forward();
     void reload();
 
-    void print(QPrinter*) const { }
-
 Q_SIGNALS:
     void loadStarted();
     void loadProgress(int progress);
     void loadFinished(bool);
     void titleChanged(const QString& title);
-    void statusBarMessage(const QString& text);
-    void linkClicked(const QUrl&);
     void selectionChanged();
-    void iconChanged();
     void urlChanged(const QUrl&);
 
 protected:
-- 
cgit v1.2.3