summaryrefslogtreecommitdiff
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
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>
-rw-r--r--Source/WebKit/qt/Api/qwebhistoryinterface.h2
-rw-r--r--Source/WebKit/qt/Api/qwebpluginfactory.h4
-rw-r--r--Source/WebKit/qt/WidgetApi/qgraphicswebview.h6
-rw-r--r--Source/WebKit/qt/WidgetApi/qwebinspector.h2
-rw-r--r--Source/WebKit/qt/WidgetApi/qwebpage.h6
-rw-r--r--Source/WebKit/qt/WidgetApi/qwebview.h4
6 files changed, 12 insertions, 12 deletions
diff --git a/Source/WebKit/qt/Api/qwebhistoryinterface.h b/Source/WebKit/qt/Api/qwebhistoryinterface.h
index a49c58684..81186aa38 100644
--- a/Source/WebKit/qt/Api/qwebhistoryinterface.h
+++ b/Source/WebKit/qt/Api/qwebhistoryinterface.h
@@ -29,7 +29,7 @@
class QWEBKIT_EXPORT QWebHistoryInterface : public QObject {
Q_OBJECT
public:
- QWebHistoryInterface(QObject *parent = 0);
+ QWebHistoryInterface(QObject *parent = Q_NULLPTR);
~QWebHistoryInterface();
static void setDefaultInterface(QWebHistoryInterface *defaultInterface);
diff --git a/Source/WebKit/qt/Api/qwebpluginfactory.h b/Source/WebKit/qt/Api/qwebpluginfactory.h
index 24084fe18..26f855066 100644
--- a/Source/WebKit/qt/Api/qwebpluginfactory.h
+++ b/Source/WebKit/qt/Api/qwebpluginfactory.h
@@ -48,7 +48,7 @@ public:
QList<MimeType> mimeTypes;
};
- explicit QWebPluginFactory(QObject* parent = 0);
+ explicit QWebPluginFactory(QObject* parent = Q_NULLPTR);
virtual ~QWebPluginFactory();
virtual QList<Plugin> plugins() const = 0;
@@ -62,7 +62,7 @@ public:
{};
class ExtensionReturn
{};
- 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;
private:
diff --git a/Source/WebKit/qt/WidgetApi/qgraphicswebview.h b/Source/WebKit/qt/WidgetApi/qgraphicswebview.h
index c9e61f75a..0d990086f 100644
--- a/Source/WebKit/qt/WidgetApi/qgraphicswebview.h
+++ b/Source/WebKit/qt/WidgetApi/qgraphicswebview.h
@@ -54,7 +54,7 @@ class QWEBKITWIDGETS_EXPORT QGraphicsWebView : public QGraphicsWidget {
Q_FLAGS(QPainter::RenderHints)
public:
- explicit QGraphicsWebView(QGraphicsItem* parent = 0);
+ explicit QGraphicsWebView(QGraphicsItem* parent = Q_NULLPTR);
~QGraphicsWebView();
QWebPage* page() const;
@@ -84,7 +84,7 @@ public:
QAction* pageAction(QWebPage::WebAction action) const;
void triggerPageAction(QWebPage::WebAction action, bool checked = false);
- bool findText(const QString& subString, QWebPage::FindFlags options = 0);
+ bool findText(const QString& subString, QWebPage::FindFlags options = QWebPage::FindFlags());
bool resizesToContents() const;
void setResizesToContents(bool enabled);
@@ -94,7 +94,7 @@ public:
virtual void setGeometry(const QRectF& rect);
virtual void updateGeometry();
- virtual void paint(QPainter*, const QStyleOptionGraphicsItem* options, QWidget* widget = 0);
+ virtual void paint(QPainter*, const QStyleOptionGraphicsItem* options, QWidget* widget = Q_NULLPTR);
virtual QVariant itemChange(GraphicsItemChange change, const QVariant& value);
virtual bool event(QEvent*);
diff --git a/Source/WebKit/qt/WidgetApi/qwebinspector.h b/Source/WebKit/qt/WidgetApi/qwebinspector.h
index c333fa25a..3fcb853f7 100644
--- a/Source/WebKit/qt/WidgetApi/qwebinspector.h
+++ b/Source/WebKit/qt/WidgetApi/qwebinspector.h
@@ -30,7 +30,7 @@ class QWebInspectorPrivate;
class QWEBKITWIDGETS_EXPORT QWebInspector : public QWidget {
Q_OBJECT
public:
- QWebInspector(QWidget* parent = 0);
+ QWebInspector(QWidget* parent = Q_NULLPTR);
~QWebInspector();
void setPage(QWebPage* page);
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;
diff --git a/Source/WebKit/qt/WidgetApi/qwebview.h b/Source/WebKit/qt/WidgetApi/qwebview.h
index 43439dfa5..ac0946773 100644
--- a/Source/WebKit/qt/WidgetApi/qwebview.h
+++ b/Source/WebKit/qt/WidgetApi/qwebview.h
@@ -54,7 +54,7 @@ class QWEBKITWIDGETS_EXPORT QWebView : public QWidget {
Q_PROPERTY(QPainter::RenderHints renderHints READ renderHints WRITE setRenderHints)
Q_FLAGS(QPainter::RenderHints)
public:
- explicit QWebView(QWidget* parent = 0);
+ explicit QWebView(QWidget* parent = Q_NULLPTR);
virtual ~QWebView();
QWebPage* page() const;
@@ -104,7 +104,7 @@ public:
void setRenderHints(QPainter::RenderHints hints);
void setRenderHint(QPainter::RenderHint hint, bool enabled = true);
- bool findText(const QString& subString, QWebPage::FindFlags options = 0);
+ bool findText(const QString& subString, QWebPage::FindFlags options = QWebPage::FindFlags());
virtual bool event(QEvent*);