1 files changed, 33 insertions, 25 deletions

diff --git a/WebKit/qt/Api/qwebview.h b/WebKit/qt/Api/qwebview.h
index 1172f39..e886144 100644
--- a/WebKit/qt/Api/qwebview.h
+++ b/WebKit/qt/Api/qwebview.h
@@ -25,6 +25,7 @@
 #include "qwebpage.h"
 #include <QtGui/qwidget.h>
 #include <QtGui/qicon.h>
+#include <QtGui/qpainter.h>
 #include <QtCore/qurl.h>
 #if QT_VERSION >= 0x040400
 #include <QtNetwork/qnetworkaccessmanager.h>
@@ -39,8 +40,7 @@ class QWebPage;
 class QWebViewPrivate;
 class QWebNetworkRequest;
 
-class QWEBKIT_EXPORT QWebView : public QWidget
-{
+class QWEBKIT_EXPORT QWebView : public QWidget {
     Q_OBJECT
     Q_PROPERTY(QString title READ title)
     Q_PROPERTY(QUrl url READ url WRITE setUrl)
@@ -50,26 +50,30 @@ class QWEBKIT_EXPORT QWebView : public QWidget
     //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)
 public:
-    explicit QWebView(QWidget *parent = 0);
+    explicit QWebView(QWidget* parent = 0);
     virtual ~QWebView();
 
-    QWebPage *page() const;
-    void setPage(QWebPage *page);
+    QWebPage* page() const;
+    void setPage(QWebPage* page);
 
-    void load(const QUrl &url);
+    static QUrl guessUrlFromString(const QString& string);
+
+    void load(const QUrl& url);
 #if QT_VERSION < 0x040400 && !defined(qdoc)
-    void load(const QWebNetworkRequest &request);
+    void load(const QWebNetworkRequest& request);
 #else
-    void load(const QNetworkRequest &request,
+    void load(const QNetworkRequest& request,
               QNetworkAccessManager::Operation operation = QNetworkAccessManager::GetOperation,
               const QByteArray &body = QByteArray());
 #endif
-    void setHtml(const QString &html, const QUrl &baseUrl = QUrl());
-    void setContent(const QByteArray &data, const QString &mimeType = QString(), const QUrl &baseUrl = QUrl());
+    void setHtml(const QString& html, const QUrl& baseUrl = QUrl());
+    void setContent(const QByteArray& data, const QString& mimeType = QString(), const QUrl& baseUrl = QUrl());
 
-    QWebHistory *history() const;
-    QWebSettings *settings() const;
+    QWebHistory* history() const;
+    QWebSettings* settings() const;
 
     QString title() const;
     void setUrl(const QUrl &url);
@@ -78,7 +82,7 @@ public:
 
     QString selectedText() const;
 
-    QAction *pageAction(QWebPage::WebAction action) const;
+    QAction* pageAction(QWebPage::WebAction action) const;
     void triggerPageAction(QWebPage::WebAction action, bool checked = false);
 
     bool isModified() const;
@@ -99,9 +103,13 @@ public:
     void setTextSizeMultiplier(qreal factor);
     qreal textSizeMultiplier() const;
 
-    bool findText(const QString &subString, QWebPage::FindFlags options = 0);
+    QPainter::RenderHints renderHints() const;
+    void setRenderHints(QPainter::RenderHints hints);
+    void setRenderHint(QPainter::RenderHint hint, bool enabled = true);
+
+    bool findText(const QString& subString, QWebPage::FindFlags options = 0);
 
-    virtual bool event(QEvent *);
+    virtual bool event(QEvent*);
 
 public Q_SLOTS:
     void stop();
@@ -109,7 +117,7 @@ public Q_SLOTS:
     void forward();
     void reload();
 
-    void print(QPrinter *printer) const;
+    void print(QPrinter*) const;
 
 Q_SIGNALS:
     void loadStarted();
@@ -117,14 +125,14 @@ Q_SIGNALS:
     void loadFinished(bool);
     void titleChanged(const QString& title);
     void statusBarMessage(const QString& text);
-    void linkClicked(const QUrl &url);
+    void linkClicked(const QUrl&);
     void selectionChanged();
     void iconChanged();
-    void urlChanged(const QUrl &url);
+    void urlChanged(const QUrl&);
 
 protected:
-    void resizeEvent(QResizeEvent *e);
-    void paintEvent(QPaintEvent *ev);
+    void resizeEvent(QResizeEvent*);
+    void paintEvent(QPaintEvent*);
 
     virtual QWebView *createWindow(QWebPage::WebWindowType type);
 
@@ -141,10 +149,10 @@ protected:
 #endif
     virtual void keyPressEvent(QKeyEvent*);
     virtual void keyReleaseEvent(QKeyEvent*);
-    virtual void dragEnterEvent(QDragEnterEvent *);
-    virtual void dragLeaveEvent(QDragLeaveEvent *);
-    virtual void dragMoveEvent(QDragMoveEvent *);
-    virtual void dropEvent(QDropEvent *);
+    virtual void dragEnterEvent(QDragEnterEvent*);
+    virtual void dragLeaveEvent(QDragLeaveEvent*);
+    virtual void dragMoveEvent(QDragMoveEvent*);
+    virtual void dropEvent(QDropEvent*);
     virtual void focusInEvent(QFocusEvent*);
     virtual void focusOutEvent(QFocusEvent*);
     virtual void inputMethodEvent(QInputMethodEvent*);
@@ -153,7 +161,7 @@ protected:
 
 private:
     friend class QWebPage;
-    QWebViewPrivate *d;
+    QWebViewPrivate* d;
 };
 
 #endif // QWEBVIEW_H