summaryrefslogtreecommitdiff
path: root/Source/WebKit/qt/WidgetApi/qwebpage.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-03 20:07:42 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-04 09:34:44 +0000
commit3ecebca8361030d0adeb65af21e77334ab91e481 (patch)
tree282b124a8f65cc8480cf3476e6f0e497e139b7a9 /Source/WebKit/qt/WidgetApi/qwebpage.h
parent4aed18cdbc79105b704a298e88af563f30e2eeb0 (diff)
downloadqtwebkit-3ecebca8361030d0adeb65af21e77334ab91e481.tar.gz
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I9e521f91abe7972843eeeb6406f8605778dabbaf Task-number: QTBUG-45291 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'Source/WebKit/qt/WidgetApi/qwebpage.h')
-rw-r--r--Source/WebKit/qt/WidgetApi/qwebpage.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.h b/Source/WebKit/qt/WidgetApi/qwebpage.h
index 24fe1383e..a9c71fd42 100644
--- a/Source/WebKit/qt/WidgetApi/qwebpage.h
+++ b/Source/WebKit/qt/WidgetApi/qwebpage.h
@@ -265,7 +265,7 @@ public:
};
- explicit QWebPage(QObject *parent = 0);
+ explicit QWebPage(QObject *parent = Q_NULLPTR);
~QWebPage();
QWebFrame *mainFrame() const;
@@ -317,7 +317,7 @@ public:
QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
- bool findText(const QString &subString, FindFlags options = 0);
+ bool findText(const QString &subString, FindFlags options = FindFlags());
void setForwardUnsupportedContent(bool forward);
bool forwardUnsupportedContent() const;
@@ -383,7 +383,7 @@ public:
};
- virtual bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0);
+ virtual bool extension(Extension extension, const ExtensionOption *option = Q_NULLPTR, ExtensionReturn *output = Q_NULLPTR);
virtual bool supportsExtension(Extension extension) const;
QWebPageAdapter* handle() const;