summaryrefslogtreecommitdiffstats
path: root/src/webenginewidgets/api
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-05-18 16:29:40 +0200
committerLiang Qi <liang.qi@qt.io>2016-05-19 18:47:26 +0000
commit3206e85c0f7ee3de9953977ffbb0137de0ee01f3 (patch)
treebf6aef148f8ad041b4183d248adda585d48aaab5 /src/webenginewidgets/api
parentf4b806ffbc2f11a5a64fab2856dfe68ae7d603c8 (diff)
Silence zero-as-null-pointer=constant warnings
This appears to have been added to headerclean and is now preventing us from integrating. Change-Id: I7c25a85c0d62c945d4f4a68f559000fab8c880cc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/webenginewidgets/api')
-rw-r--r--src/webenginewidgets/api/qwebenginedownloaditem.h2
-rw-r--r--src/webenginewidgets/api/qwebenginepage.h8
-rw-r--r--src/webenginewidgets/api/qwebengineprofile.h6
-rw-r--r--src/webenginewidgets/api/qwebenginesettings.h2
-rw-r--r--src/webenginewidgets/api/qwebengineview.h6
5 files changed, 12 insertions, 12 deletions
diff --git a/src/webenginewidgets/api/qwebenginedownloaditem.h b/src/webenginewidgets/api/qwebenginedownloaditem.h
index 886d9ab9a..648b91ec9 100644
--- a/src/webenginewidgets/api/qwebenginedownloaditem.h
+++ b/src/webenginewidgets/api/qwebenginedownloaditem.h
@@ -86,7 +86,7 @@ private:
friend class QWebEngineProfilePrivate;
- QWebEngineDownloadItem(QWebEngineDownloadItemPrivate*, QObject *parent = 0);
+ QWebEngineDownloadItem(QWebEngineDownloadItemPrivate*, QObject *parent = Q_NULLPTR);
QScopedPointer<QWebEngineDownloadItemPrivate> d_ptr;
};
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index 811003dd0..911bfe917 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -175,8 +175,8 @@ public:
KilledTerminationStatus
};
- explicit QWebEnginePage(QObject *parent = 0);
- QWebEnginePage(QWebEngineProfile *profile, QObject *parent = 0);
+ explicit QWebEnginePage(QObject *parent = Q_NULLPTR);
+ QWebEnginePage(QWebEngineProfile *profile, QObject *parent = Q_NULLPTR);
~QWebEnginePage();
QWebEngineHistory *history() const;
@@ -195,10 +195,10 @@ public:
virtual bool event(QEvent*);
#ifdef Q_QDOC
- void findText(const QString &subString, FindFlags options = 0);
+ void findText(const QString &subString, FindFlags options = FindFlags());
void findText(const QString &subString, FindFlags options, FunctorOrLambda resultCallback);
#else
- void findText(const QString &subString, FindFlags options = 0, const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>());
+ void findText(const QString &subString, FindFlags options = FindFlags(), const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>());
#endif
QMenu *createStandardContextMenu();
diff --git a/src/webenginewidgets/api/qwebengineprofile.h b/src/webenginewidgets/api/qwebengineprofile.h
index 416ef23db..be420c62f 100644
--- a/src/webenginewidgets/api/qwebengineprofile.h
+++ b/src/webenginewidgets/api/qwebengineprofile.h
@@ -60,8 +60,8 @@ class QWebEngineUrlSchemeHandler;
class QWEBENGINEWIDGETS_EXPORT QWebEngineProfile : public QObject {
Q_OBJECT
public:
- explicit QWebEngineProfile(QObject *parent = 0);
- explicit QWebEngineProfile(const QString &name, QObject *parent = 0);
+ explicit QWebEngineProfile(QObject *parent = Q_NULLPTR);
+ explicit QWebEngineProfile(const QString &name, QObject *parent = Q_NULLPTR);
virtual ~QWebEngineProfile();
enum HttpCacheType {
@@ -126,7 +126,7 @@ private Q_SLOTS:
private:
Q_DISABLE_COPY(QWebEngineProfile)
Q_DECLARE_PRIVATE(QWebEngineProfile)
- QWebEngineProfile(QWebEngineProfilePrivate *, QObject *parent = 0);
+ QWebEngineProfile(QWebEngineProfilePrivate *, QObject *parent = Q_NULLPTR);
friend class QWebEnginePagePrivate;
friend class QWebEngineUrlSchemeHandler;
diff --git a/src/webenginewidgets/api/qwebenginesettings.h b/src/webenginewidgets/api/qwebenginesettings.h
index 327fd447b..53c38ef2b 100644
--- a/src/webenginewidgets/api/qwebenginesettings.h
+++ b/src/webenginewidgets/api/qwebenginesettings.h
@@ -100,7 +100,7 @@ private:
friend class QWebEngineProfilePrivate;
~QWebEngineSettings();
- explicit QWebEngineSettings(QWebEngineSettings *parentSettings = 0);
+ explicit QWebEngineSettings(QWebEngineSettings *parentSettings = Q_NULLPTR);
};
QT_END_NAMESPACE
diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h
index e16bbf4af..34eb6177c 100644
--- a/src/webenginewidgets/api/qwebengineview.h
+++ b/src/webenginewidgets/api/qwebengineview.h
@@ -61,7 +61,7 @@ class QWEBENGINEWIDGETS_EXPORT QWebEngineView : public QWidget {
Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor)
public:
- explicit QWebEngineView(QWidget* parent = 0);
+ explicit QWebEngineView(QWidget* parent = Q_NULLPTR);
virtual ~QWebEngineView();
QWebEnginePage* page() const;
@@ -90,10 +90,10 @@ public:
void setZoomFactor(qreal factor);
#ifdef Q_QDOC
- void findText(const QString &subString, QWebEnginePage::FindFlags options = 0);
+ void findText(const QString &subString, QWebEnginePage::FindFlags options = QWebEnginePage::FindFlags());
void findText(const QString &subString, QWebEnginePage::FindFlags options, FunctorOrLambda resultCallback);
#else
- void findText(const QString &subString, QWebEnginePage::FindFlags options = 0, const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>());
+ void findText(const QString &subString, QWebEnginePage::FindFlags options = QWebEnginePage::FindFlags(), const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>());
#endif
virtual QSize sizeHint() const Q_DECL_OVERRIDE;