diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-07 13:05:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-07 23:02:47 +0200 |
| commit | 564b59d903683b14c75b72a3e93367717f201def (patch) | |
| tree | 03ffe749d83dce84429a7db484bf92795047036f | |
| parent | b5fc1e4e2643e73d3b44c483d159529f8deb8af1 (diff) | |
Another round of replacing 0 with nullptr
This time based on grepping to also include documentation, tests and
examples previously missed by the automatic tool.
Change-Id: Ied1703f4bcc470fbc275f759ed5b7c588a5c4e9f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
351 files changed, 740 insertions, 736 deletions
diff --git a/examples/dbus/chat/chat.h b/examples/dbus/chat/chat.h index 7faebe63fd..444d6c9d80 100644 --- a/examples/dbus/chat/chat.h +++ b/examples/dbus/chat/chat.h @@ -85,7 +85,7 @@ class NicknameDialog: public QDialog, public Ui::NicknameDialog { Q_OBJECT public: - NicknameDialog(QWidget *parent = 0); + NicknameDialog(QWidget *parent = nullptr); }; #endif // CHAT_H diff --git a/examples/dbus/remotecontrolledcar/car/car.h b/examples/dbus/remotecontrolledcar/car/car.h index 92fc1ccdcb..e843786e5b 100644 --- a/examples/dbus/remotecontrolledcar/car/car.h +++ b/examples/dbus/remotecontrolledcar/car/car.h @@ -71,7 +71,7 @@ Q_SIGNALS: void crashed(); protected: - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr); void timerEvent(QTimerEvent *event); private: diff --git a/examples/dbus/remotecontrolledcar/controller/controller.h b/examples/dbus/remotecontrolledcar/controller/controller.h index 74776f2638..87359661ba 100644 --- a/examples/dbus/remotecontrolledcar/controller/controller.h +++ b/examples/dbus/remotecontrolledcar/controller/controller.h @@ -59,7 +59,7 @@ class Controller : public QWidget Q_OBJECT public: - Controller(QWidget *parent = 0); + Controller(QWidget *parent = nullptr); protected: void timerEvent(QTimerEvent *event); diff --git a/examples/embedded/digiflip/digiflip.cpp b/examples/embedded/digiflip/digiflip.cpp index 9bbc85ea03..729337e5d1 100644 --- a/examples/embedded/digiflip/digiflip.cpp +++ b/examples/embedded/digiflip/digiflip.cpp @@ -298,7 +298,7 @@ class DigiFlip : public QMainWindow Q_OBJECT public: - DigiFlip(QWidget *parent = 0) + DigiFlip(QWidget *parent = nullptr) : QMainWindow(parent) { m_hour = new Digits(this); diff --git a/examples/embedded/flickable/main.cpp b/examples/embedded/flickable/main.cpp index d3b314fcd0..fd30d15e49 100644 --- a/examples/embedded/flickable/main.cpp +++ b/examples/embedded/flickable/main.cpp @@ -87,7 +87,7 @@ class ColorList : public QWidget, public Flickable Q_OBJECT public: - ColorList(QWidget *parent = 0) + ColorList(QWidget *parent = nullptr) : QWidget(parent) { m_offset = 0; m_height = QFontMetrics(font()).height() + 5; diff --git a/examples/embedded/flightinfo/flightinfo.cpp b/examples/embedded/flightinfo/flightinfo.cpp index 0f8dfb5b6a..32f0cd4401 100644 --- a/examples/embedded/flightinfo/flightinfo.cpp +++ b/examples/embedded/flightinfo/flightinfo.cpp @@ -110,7 +110,7 @@ private: public: - FlightInfo(QMainWindow *parent = 0): QMainWindow(parent) { + FlightInfo(QMainWindow *parent = nullptr): QMainWindow(parent) { QWidget *w = new QWidget(this); ui.setupUi(w); diff --git a/examples/embedded/lightmaps/lightmaps.h b/examples/embedded/lightmaps/lightmaps.h index a171065b2f..25b5785edf 100644 --- a/examples/embedded/lightmaps/lightmaps.h +++ b/examples/embedded/lightmaps/lightmaps.h @@ -61,7 +61,7 @@ class LightMaps: public QWidget Q_OBJECT public: - LightMaps(QWidget *parent = 0); + LightMaps(QWidget *parent = nullptr); void setCenter(qreal lat, qreal lng); public slots: @@ -94,4 +94,4 @@ private: bool invert; }; -#endif
\ No newline at end of file +#endif diff --git a/examples/embedded/lightmaps/slippymap.h b/examples/embedded/lightmaps/slippymap.h index 202d00c7e4..f20945445b 100644 --- a/examples/embedded/lightmaps/slippymap.h +++ b/examples/embedded/lightmaps/slippymap.h @@ -65,7 +65,7 @@ class SlippyMap: public QObject Q_OBJECT public: - SlippyMap(QObject *parent = 0); + SlippyMap(QObject *parent = nullptr); void invalidate(); void render(QPainter *p, const QRect &rect); void pan(const QPoint &delta); diff --git a/examples/embedded/raycasting/raycasting.cpp b/examples/embedded/raycasting/raycasting.cpp index 19e3c8b271..4930dbe9f2 100644 --- a/examples/embedded/raycasting/raycasting.cpp +++ b/examples/embedded/raycasting/raycasting.cpp @@ -70,7 +70,7 @@ int world_map[WORLD_SIZE][WORLD_SIZE] = { class Raycasting: public QWidget { public: - Raycasting(QWidget *parent = 0) + Raycasting(QWidget *parent = nullptr) : QWidget(parent) , angle(0.5) , playerPos(1.5, 1.5) diff --git a/examples/embedded/styleexample/stylewidget.h b/examples/embedded/styleexample/stylewidget.h index 6b109bbbce..c0ff33e297 100644 --- a/examples/embedded/styleexample/stylewidget.h +++ b/examples/embedded/styleexample/stylewidget.h @@ -58,7 +58,7 @@ class StyleWidget : public QFrame { Q_OBJECT public: - StyleWidget(QWidget *parent = 0); + StyleWidget(QWidget *parent = nullptr); private: Ui_StyleWidget m_ui; diff --git a/examples/gui/rasterwindow/rasterwindow.h b/examples/gui/rasterwindow/rasterwindow.h index 2ccecbf704..58c3ab89b2 100644 --- a/examples/gui/rasterwindow/rasterwindow.h +++ b/examples/gui/rasterwindow/rasterwindow.h @@ -58,7 +58,7 @@ class RasterWindow : public QWindow { Q_OBJECT public: - explicit RasterWindow(QWindow *parent = 0); + explicit RasterWindow(QWindow *parent = nullptr); virtual void render(QPainter *painter); diff --git a/examples/qmake/precompile/mydialog.h b/examples/qmake/precompile/mydialog.h index 92bf956e57..ed4028fe53 100644 --- a/examples/qmake/precompile/mydialog.h +++ b/examples/qmake/precompile/mydialog.h @@ -58,7 +58,7 @@ class MyDialog : public QDialog, public Ui::MyDialog Q_OBJECT public: - MyDialog(QWidget *parent = 0); + MyDialog(QWidget *parent = nullptr); }; #endif diff --git a/examples/qpa/windows/window.h b/examples/qpa/windows/window.h index 5647688fbc..438be413b8 100644 --- a/examples/qpa/windows/window.h +++ b/examples/qpa/windows/window.h @@ -54,7 +54,7 @@ class Window : public QWindow { public: - Window(QWindow *parent = 0); + Window(QWindow *parent = nullptr); Window(QScreen *screen); protected: diff --git a/examples/widgets/itemviews/combowidgetmapper/window.h b/examples/widgets/itemviews/combowidgetmapper/window.h index 35142d6818..78bd373c13 100644 --- a/examples/widgets/itemviews/combowidgetmapper/window.h +++ b/examples/widgets/itemviews/combowidgetmapper/window.h @@ -70,7 +70,7 @@ class Window : public QWidget Q_OBJECT public: - Window(QWidget *parent = 0); + Window(QWidget *parent = nullptr); private slots: void updateButtons(int row); diff --git a/examples/widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.h b/examples/widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.h index 5fdabbd5df..909949df8e 100644 --- a/examples/widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.h +++ b/examples/widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.h @@ -60,7 +60,7 @@ class MySortFilterProxyModel : public QSortFilterProxyModel Q_OBJECT public: - MySortFilterProxyModel(QObject *parent = 0); + MySortFilterProxyModel(QObject *parent = nullptr); QDate filterMinimumDate() const { return minDate; } void setFilterMinimumDate(QDate date); diff --git a/examples/widgets/itemviews/pixelator/imagemodel.h b/examples/widgets/itemviews/pixelator/imagemodel.h index c6c510dcac..04ebd705b7 100644 --- a/examples/widgets/itemviews/pixelator/imagemodel.h +++ b/examples/widgets/itemviews/pixelator/imagemodel.h @@ -60,7 +60,7 @@ class ImageModel : public QAbstractTableModel Q_OBJECT public: - ImageModel(QObject *parent = 0); + ImageModel(QObject *parent = nullptr); void setImage(const QImage &image); diff --git a/examples/widgets/layouts/dynamiclayouts/dialog.h b/examples/widgets/layouts/dynamiclayouts/dialog.h index 923a6fe01b..b582c1c018 100644 --- a/examples/widgets/layouts/dynamiclayouts/dialog.h +++ b/examples/widgets/layouts/dynamiclayouts/dialog.h @@ -68,7 +68,7 @@ class Dialog : public QDialog Q_OBJECT public: - Dialog(QWidget *parent = 0); + Dialog(QWidget *parent = nullptr); private slots: void buttonsOrientationChanged(int index); diff --git a/examples/widgets/painting/concentriccircles/circlewidget.h b/examples/widgets/painting/concentriccircles/circlewidget.h index 79fd5c71da..a83ea0637e 100644 --- a/examples/widgets/painting/concentriccircles/circlewidget.h +++ b/examples/widgets/painting/concentriccircles/circlewidget.h @@ -59,7 +59,7 @@ class CircleWidget : public QWidget Q_OBJECT public: - CircleWidget(QWidget *parent = 0); + CircleWidget(QWidget *parent = nullptr); void setFloatBased(bool floatBased); void setAntialiased(bool antialiased); diff --git a/examples/widgets/richtext/syntaxhighlighter/highlighter.h b/examples/widgets/richtext/syntaxhighlighter/highlighter.h index 163b01cda6..a60da038b3 100644 --- a/examples/widgets/richtext/syntaxhighlighter/highlighter.h +++ b/examples/widgets/richtext/syntaxhighlighter/highlighter.h @@ -65,7 +65,7 @@ class Highlighter : public QSyntaxHighlighter Q_OBJECT public: - Highlighter(QTextDocument *parent = 0); + Highlighter(QTextDocument *parent = nullptr); protected: void highlightBlock(const QString &text) override; diff --git a/examples/widgets/richtext/syntaxhighlighter/mainwindow.h b/examples/widgets/richtext/syntaxhighlighter/mainwindow.h index b4b58a17e7..a54b810e16 100644 --- a/examples/widgets/richtext/syntaxhighlighter/mainwindow.h +++ b/examples/widgets/richtext/syntaxhighlighter/mainwindow.h @@ -65,7 +65,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - MainWindow(QWidget *parent = 0); + MainWindow(QWidget *parent = nullptr); public slots: void about(); diff --git a/examples/widgets/richtext/textedit/textedit.h b/examples/widgets/richtext/textedit/textedit.h index 9e50166c6f..07a307f83d 100644 --- a/examples/widgets/richtext/textedit/textedit.h +++ b/examples/widgets/richtext/textedit/textedit.h @@ -70,7 +70,7 @@ class TextEdit : public QMainWindow Q_OBJECT public: - TextEdit(QWidget *parent = 0); + TextEdit(QWidget *parent = nullptr); bool load(const QString &f); diff --git a/examples/xml/dombookmarks/xbeltree.h b/examples/xml/dombookmarks/xbeltree.h index c58e1148ff..989841d339 100644 --- a/examples/xml/dombookmarks/xbeltree.h +++ b/examples/xml/dombookmarks/xbeltree.h @@ -60,7 +60,7 @@ class XbelTree : public QTreeWidget Q_OBJECT public: - XbelTree(QWidget *parent = 0); + XbelTree(QWidget *parent = nullptr); bool read(QIODevice *device); bool write(QIODevice *device) const; @@ -75,9 +75,9 @@ private slots: private: void parseFolderElement(const QDomElement &element, - QTreeWidgetItem *parentItem = 0); + QTreeWidgetItem *parentItem = nullptr); QTreeWidgetItem *createItem(const QDomElement &element, - QTreeWidgetItem *parentItem = 0); + QTreeWidgetItem *parentItem = nullptr); QDomDocument domDocument; QIcon folderIcon; diff --git a/examples/xml/rsslisting/rsslisting.h b/examples/xml/rsslisting/rsslisting.h index ae428af751..9f4fb2e7df 100644 --- a/examples/xml/rsslisting/rsslisting.h +++ b/examples/xml/rsslisting/rsslisting.h @@ -70,7 +70,7 @@ class RSSListing : public QWidget { Q_OBJECT public: - RSSListing(QWidget *widget = 0); + RSSListing(QWidget *widget = nullptr); public slots: void fetch(); diff --git a/src/corelib/doc/snippets/code/doc_src_properties.cpp b/src/corelib/doc/snippets/code/doc_src_properties.cpp index 47dff630f8..5a5627abfd 100644 --- a/src/corelib/doc/snippets/code/doc_src_properties.cpp +++ b/src/corelib/doc/snippets/code/doc_src_properties.cpp @@ -106,7 +106,7 @@ class MyClass : public QObject Q_PROPERTY(Priority priority READ priority WRITE setPriority NOTIFY priorityChanged) public: - MyClass(QObject *parent = 0); + MyClass(QObject *parent = nullptr); ~MyClass(); enum Priority { High, Low, VeryHigh, VeryLow }; diff --git a/src/corelib/doc/snippets/eventfilters/filterobject.h b/src/corelib/doc/snippets/eventfilters/filterobject.h index 354aa4ff5c..d249743a15 100644 --- a/src/corelib/doc/snippets/eventfilters/filterobject.h +++ b/src/corelib/doc/snippets/eventfilters/filterobject.h @@ -58,7 +58,7 @@ class FilterObject : public QObject Q_OBJECT public: - FilterObject(QObject *parent = 0); + FilterObject(QObject *parent = nullptr); bool eventFilter(QObject *object, QEvent *event) override; void setFilteredObject(QObject *object); diff --git a/src/corelib/doc/snippets/qsortfilterproxymodel-details/main.cpp b/src/corelib/doc/snippets/qsortfilterproxymodel-details/main.cpp index 2a7b310716..a79f07c3ae 100644 --- a/src/corelib/doc/snippets/qsortfilterproxymodel-details/main.cpp +++ b/src/corelib/doc/snippets/qsortfilterproxymodel-details/main.cpp @@ -55,7 +55,7 @@ class MyItemModel : public QStandardItemModel { public: - MyItemModel(QWidget *parent = 0); + MyItemModel(QWidget *parent = nullptr); }; MyItemModel::MyItemModel(QWidget *parent) @@ -65,7 +65,7 @@ MyItemModel::MyItemModel(QWidget *parent) class Widget : public QWidget { public: - Widget(QWidget *parent = 0); + Widget(QWidget *parent = nullptr); }; Widget::Widget(QWidget *parent) diff --git a/src/corelib/doc/snippets/qstring/main.cpp b/src/corelib/doc/snippets/qstring/main.cpp index cb557ac023..419b98366d 100644 --- a/src/corelib/doc/snippets/qstring/main.cpp +++ b/src/corelib/doc/snippets/qstring/main.cpp @@ -55,7 +55,7 @@ class Widget : public QWidget { public: - Widget(QWidget *parent = 0); + Widget(QWidget *parent = nullptr); void constCharPointer(); void constCharArray(); diff --git a/src/corelib/doc/snippets/qstringlist/main.cpp b/src/corelib/doc/snippets/qstringlist/main.cpp index 5284a5fb78..fceadc4e99 100644 --- a/src/corelib/doc/snippets/qstringlist/main.cpp +++ b/src/corelib/doc/snippets/qstringlist/main.cpp @@ -55,7 +55,7 @@ using namespace std; class Widget : public QWidget { public: - Widget(QWidget *parent = 0); + Widget(QWidget *parent = nullptr); }; Widget::Widget(QWidget *parent) diff --git a/src/corelib/doc/snippets/qstringlistmodel/main.cpp b/src/corelib/doc/snippets/qstringlistmodel/main.cpp index 4c9519d2b2..fa7f414526 100644 --- a/src/corelib/doc/snippets/qstringlistmodel/main.cpp +++ b/src/corelib/doc/snippets/qstringlistmodel/main.cpp @@ -53,7 +53,7 @@ class Widget : public QWidget { public: - Widget(QWidget *parent = 0); + Widget(QWidget *parent = nullptr); }; Widget::Widget(QWidget *parent) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 25c31e4067..deb3dfe454 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1184,7 +1184,7 @@ Q_CORE_EXPORT QString qtTrId(const char *id, int n = -1); # define dynamic_cast QT_PREPEND_NAMESPACE(qt_dynamic_cast_check) template<typename T, typename X> - T qt_dynamic_cast_check(X, T* = 0) + T qt_dynamic_cast_check(X, T* = nullptr) { return T::dynamic_cast_will_always_fail_because_rtti_is_disabled; } #endif diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp index b3d7ecfed8..d876fdf4ae 100644 --- a/src/corelib/io/qfilesystemengine_win.cpp +++ b/src/corelib/io/qfilesystemengine_win.cpp @@ -567,7 +567,7 @@ QString QFileSystemEngine::nativeAbsoluteFilePath(const QString &path) // can be //server or //server/share QString absPath; QVarLengthArray<wchar_t, MAX_PATH> buf(qMax(MAX_PATH, path.size() + 1)); - wchar_t *fileName = 0; + wchar_t *fileName = nullptr; DWORD retLen = GetFullPathName((wchar_t*)path.utf16(), buf.size(), buf.data(), &fileName); if (retLen > (DWORD)buf.size()) { buf.resize(retLen); diff --git a/src/corelib/io/qfilesystemwatcher_win.cpp b/src/corelib/io/qfilesystemwatcher_win.cpp index b131524614..29dd78030b 100644 --- a/src/corelib/io/qfilesystemwatcher_win.cpp +++ b/src/corelib/io/qfilesystemwatcher_win.cpp @@ -406,7 +406,7 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths, pathInfo = fileInfo; // Look for a thread - QWindowsFileSystemWatcherEngineThread *thread = 0; + QWindowsFileSystemWatcherEngineThread *thread = nullptr; QWindowsFileSystemWatcherEngine::Handle handle; QList<QWindowsFileSystemWatcherEngineThread *>::const_iterator jt, end; end = threads.constEnd(); diff --git a/src/corelib/io/qstandardpaths_android.cpp b/src/corelib/io/qstandardpaths_android.cpp index 1f4e0de1e7..f4a2a8f121 100644 --- a/src/corelib/io/qstandardpaths_android.cpp +++ b/src/corelib/io/qstandardpaths_android.cpp @@ -134,7 +134,7 @@ static QString getExternalStoragePublicDirectory(const char *directoryField) * Locations where applications can place persistent files it owns. * E.g., /storage/org.app/Music */ -static QString getExternalFilesDir(const char *directoryField = 0) +static QString getExternalFilesDir(const char *directoryField = nullptr) { QString &path = (*androidDirCache)[QLatin1String("APPNAME_%1").arg(QLatin1String(directoryField))]; if (!path.isEmpty()) diff --git a/src/corelib/io/qwindowspipereader_p.h b/src/corelib/io/qwindowspipereader_p.h index 5ec9dc379c..2842343597 100644 --- a/src/corelib/io/qwindowspipereader_p.h +++ b/src/corelib/io/qwindowspipereader_p.h @@ -62,7 +62,7 @@ class Q_CORE_EXPORT QWindowsPipeReader : public QObject { Q_OBJECT public: - explicit QWindowsPipeReader(QObject *parent = 0); + explicit QWindowsPipeReader(QObject *parent = nullptr); ~QWindowsPipeReader(); void setHandle(HANDLE hPipeReadEnd); diff --git a/src/corelib/io/qwindowspipewriter_p.h b/src/corelib/io/qwindowspipewriter_p.h index f7f68b688c..39e8ffe40a 100644 --- a/src/corelib/io/qwindowspipewriter_p.h +++ b/src/corelib/io/qwindowspipewriter_p.h @@ -111,7 +111,7 @@ class Q_CORE_EXPORT QWindowsPipeWriter : public QObject { Q_OBJECT public: - explicit QWindowsPipeWriter(HANDLE pipeWriteEnd, QObject *parent = 0); + explicit QWindowsPipeWriter(HANDLE pipeWriteEnd, QObject *parent = nullptr); ~QWindowsPipeWriter(); bool write(const QByteArray &ba); diff --git a/src/corelib/kernel/qeventdispatcher_cf_p.h b/src/corelib/kernel/qeventdispatcher_cf_p.h index eb84b0a64c..2d76bf53da 100644 --- a/src/corelib/kernel/qeventdispatcher_cf_p.h +++ b/src/corelib/kernel/qeventdispatcher_cf_p.h @@ -209,7 +209,7 @@ class Q_CORE_EXPORT QEventDispatcherCoreFoundation : public QAbstractEventDispat Q_OBJECT public: - explicit QEventDispatcherCoreFoundation(QObject *parent = 0); + explicit QEventDispatcherCoreFoundation(QObject *parent = nullptr); void startingUp() override; ~QEventDispatcherCoreFoundation(); diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index 03d003bb0f..44487d57e2 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -162,8 +162,8 @@ LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPA #else auto q = reinterpret_cast<QEventDispatcherWin32 *>(GetWindowLong(hwnd, GWL_USERDATA)); #endif - QEventDispatcherWin32Private *d = 0; - if (q != 0) + QEventDispatcherWin32Private *d = nullptr; + if (q != nullptr) d = q->d_func(); switch (message) { @@ -187,7 +187,7 @@ LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPA break; } if (type >= 0) { - Q_ASSERT(d != 0); + Q_ASSERT(d != nullptr); QSNDict *sn_vec[4] = { &d->sn_read, &d->sn_write, &d->sn_except, &d->sn_read }; QSNDict *dict = sn_vec[type]; @@ -217,7 +217,7 @@ LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPA return 0; } case WM_QT_ACTIVATENOTIFIERS: { - Q_ASSERT(d != 0); + Q_ASSERT(d != nullptr); // Postpone activation if we have unhandled socket notifier messages // in the queue. WM_QT_ACTIVATENOTIFIERS will be posted again as a result of @@ -242,7 +242,7 @@ LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPA return 0; } case WM_TIMER: - Q_ASSERT(d != 0); + Q_ASSERT(d != nullptr); if (wp == d->sendPostedEventsTimerId) q->sendPostedEvents(); @@ -250,7 +250,7 @@ LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPA d->sendTimerEvent(wp); return 0; case WM_QT_SENDPOSTEDEVENTS: - Q_ASSERT(d != 0); + Q_ASSERT(d != nullptr); // We send posted events manually, if the window procedure was invoked // by the foreign event loop (e.g. from the native modal dialog). @@ -268,7 +268,7 @@ LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPA LRESULT QT_WIN_CALLBACK qt_GetMessageHook(int code, WPARAM wp, LPARAM lp) { QEventDispatcherWin32 *q = qobject_cast<QEventDispatcherWin32 *>(QAbstractEventDispatcher::instance()); - Q_ASSERT(q != 0); + Q_ASSERT(q != nullptr); QEventDispatcherWin32Private *d = q->d_func(); MSG *msg = reinterpret_cast<MSG *>(lp); // Windows unexpectedly passes PM_NOYIELD flag to the hook procedure, diff --git a/src/corelib/kernel/qeventdispatcher_win_p.h b/src/corelib/kernel/qeventdispatcher_win_p.h index 9ee4eb725d..a5c063e062 100644 --- a/src/corelib/kernel/qeventdispatcher_win_p.h +++ b/src/corelib/kernel/qeventdispatcher_win_p.h @@ -73,7 +73,7 @@ class Q_CORE_EXPORT QEventDispatcherWin32 : public QAbstractEventDispatcher Q_DECLARE_PRIVATE(QEventDispatcherWin32) public: - explicit QEventDispatcherWin32(QObject *parent = 0); + explicit QEventDispatcherWin32(QObject *parent = nullptr); ~QEventDispatcherWin32(); bool QT_ENSURE_STACK_ALIGNED_FOR_SSE processEvents(QEventLoop::ProcessEventsFlags flags) override; @@ -103,7 +103,7 @@ public: HWND internalHwnd(); protected: - QEventDispatcherWin32(QEventDispatcherWin32Private &dd, QObject *parent = 0); + QEventDispatcherWin32(QEventDispatcherWin32Private &dd, QObject *parent = nullptr); virtual void sendPostedEvents(); void doUnregisterSocketNotifier(QSocketNotifier *notifier); void doUnregisterEventNotifier(QWinEventNotifier *notifier); diff --git a/src/corelib/kernel/qjni.cpp b/src/corelib/kernel/qjni.cpp index 5f652d70e3..b593483e59 100644 --- a/src/corelib/kernel/qjni.cpp +++ b/src/corelib/kernel/qjni.cpp @@ -81,7 +81,7 @@ static QByteArray toBinaryEncClassName(const QByteArray &className) return QByteArray(className).replace('/', '.'); } -static jclass getCachedClass(const QByteArray &classBinEnc, bool *isCached = 0) +static jclass getCachedClass(const QByteArray &classBinEnc, bool *isCached = nullptr) { QReadLocker locker(cachedClassesLock); const QHash<QString, jclass>::const_iterator &it = cachedClasses->constFind(QString::fromLatin1(classBinEnc)); diff --git a/src/corelib/kernel/qjni_p.h b/src/corelib/kernel/qjni_p.h index ec8525e6e1..b5139d404b 100644 --- a/src/corelib/kernel/qjni_p.h +++ b/src/corelib/kernel/qjni_p.h @@ -72,7 +72,7 @@ public: ~QJNIEnvironmentPrivate(); JNIEnv *operator->(); operator JNIEnv*() const; - static jclass findClass(const char *className, JNIEnv *env = 0); + static jclass findClass(const char *className, JNIEnv *env = nullptr); private: friend class QAndroidJniEnvironment; diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index b3807b145d..60588e9329 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -579,7 +579,7 @@ const QMetaObject *QMetaType::metaObject() const } /*! - \fn void *QMetaType::create(const void *copy = 0) const + \fn void *QMetaType::create(const void *copy = nullptr) const \since 5.0 Returns a copy of \a copy, assuming it is of the type that this @@ -624,7 +624,7 @@ void QMetaType::destroy(void *data) const } /*! - \fn void *QMetaType::construct(void *where, const void *copy = 0) const + \fn void *QMetaType::construct(void *where, const void *copy = nullptr) const \since 5.0 Constructs a value of the type that this QMetaType instance diff --git a/src/corelib/kernel/qpoll.cpp b/src/corelib/kernel/qpoll.cpp index 8b87bfe79d..f41c413db6 100644 --- a/src/corelib/kernel/qpoll.cpp +++ b/src/corelib/kernel/qpoll.cpp @@ -177,7 +177,7 @@ int qt_poll(struct pollfd *fds, nfds_t nfds, const struct timespec *timeout_ts) } fd_set read_fds, write_fds, except_fds; - struct timeval tv, *ptv = 0; + struct timeval tv, *ptv = nullptr; if (timeout_ts) { tv = timespecToTimeval(*timeout_ts); diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h index 156696dace..ab93cdccc6 100644 --- a/src/corelib/kernel/qproperty.h +++ b/src/corelib/kernel/qproperty.h @@ -207,7 +207,7 @@ public: namespace Qt { template <typename Functor> auto makePropertyBinding(Functor &&f, const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION, - std::enable_if_t<std::is_invocable_v<Functor>> * = 0) + std::enable_if_t<std::is_invocable_v<Functor>> * = nullptr) { return QPropertyBinding<std::invoke_result_t<Functor>>(std::forward<Functor>(f), location); } @@ -321,7 +321,7 @@ public: #ifndef Q_CLANG_QDOC template <typename Functor> explicit QProperty(Functor &&f, const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION, - typename std::enable_if_t<std::is_invocable_r_v<T, Functor&>> * = 0) + typename std::enable_if_t<std::is_invocable_r_v<T, Functor&>> * = nullptr) : QProperty(QPropertyBinding<T>(std::forward<Functor>(f), location)) {} #else @@ -821,7 +821,7 @@ public: #ifndef Q_CLANG_QDOC template <typename Functor> explicit QObjectBindableProperty(Functor &&f, const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION, - typename std::enable_if_t<std::is_invocable_r_v<T, Functor&>> * = 0) + typename std::enable_if_t<std::is_invocable_r_v<T, Functor&>> * = nullptr) : QObjectBindableProperty(QPropertyBinding<T>(std::forward<Functor>(f), location)) {} #else diff --git a/src/corelib/kernel/qsystemerror.cpp b/src/corelib/kernel/qsystemerror.cpp index a2df9dee93..030c38e045 100644 --- a/src/corelib/kernel/qsystemerror.cpp +++ b/src/corelib/kernel/qsystemerror.cpp @@ -76,7 +76,7 @@ namespace { static QString windowsErrorString(int errorCode) { QString ret; - wchar_t *string = 0; + wchar_t *string = nullptr; FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM, NULL, errorCode, diff --git a/src/corelib/plugin/qmachparser.cpp b/src/corelib/plugin/qmachparser.cpp index 11670cafe9..9d0b4de4f5 100644 --- a/src/corelib/plugin/qmachparser.cpp +++ b/src/corelib/plugin/qmachparser.cpp @@ -103,7 +103,7 @@ int QMachOParser::parse(const char *m_s, ulong fdlen, const QString &library, QS return ns(QLibrary::tr("file too small"), library, errorString); // find out if this is a fat Mach-O binary first - const my_mach_header *header = 0; + const my_mach_header *header = nullptr; const fat_header *fat = reinterpret_cast<const fat_header *>(m_s); if (fat->magic == qToBigEndian(FAT_MAGIC)) { // find our architecture in the binary diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index e0d252b8ee..2f6a7a18ba 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -895,7 +895,7 @@ bool QThread::isRunning() const } // No threads: so we can just use static variables -static QThreadData *data = 0; +static QThreadData *data = nullptr; QThreadData *QThreadData::current(bool createIfNecessary) { diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h index c853bd1de4..0a73bf8a36 100644 --- a/src/corelib/thread/qthread_p.h +++ b/src/corelib/thread/qthread_p.h @@ -208,7 +208,7 @@ public: class QThreadPrivate : public QObjectPrivate { public: - QThreadPrivate(QThreadData *d = 0); + QThreadPrivate(QThreadData *d = nullptr); ~QThreadPrivate(); mutable QMutex mutex; diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp index eb08bdba62..7647916e99 100644 --- a/src/corelib/tools/qscopedpointer.cpp +++ b/src/corelib/tools/qscopedpointer.cpp @@ -126,7 +126,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn template <typename T, typename Cleanup> QScopedPointer<T, Cleanup>::QScopedPointer(T *p = 0) + \fn template <typename T, typename Cleanup> QScopedPointer<T, Cleanup>::QScopedPointer(T *p = nullptr) Constructs this QScopedPointer instance and sets its pointer to \a p. */ @@ -242,7 +242,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn template <typename T, typename Cleanup> void QScopedPointer<T, Cleanup>::reset(T *other = 0) + \fn template <typename T, typename Cleanup> void QScopedPointer<T, Cleanup>::reset(T *other = nullptr) Deletes the existing object it is pointing to (if any), and sets its pointer to \a other. QScopedPointer now owns \a other and will delete it in its diff --git a/src/corelib/tools/qscopedpointer_p.h b/src/corelib/tools/qscopedpointer_p.h index c1c44e7695..233c2201dc 100644 --- a/src/corelib/tools/qscopedpointer_p.h +++ b/src/corelib/tools/qscopedpointer_p.h @@ -64,7 +64,7 @@ template <typename T, typename Cleanup = QScopedPointerDeleter<T> > class QCustomScopedPointer : public QScopedPointer<T, Cleanup> { public: - explicit inline QCustomScopedPointer(T *p = 0) + explicit inline QCustomScopedPointer(T *p = nullptr) : QScopedPointer<T, Cleanup>(p) { } @@ -107,7 +107,7 @@ template <typename T> class QScopedSharedPointer : public QCustomScopedPointer<T, QScopedPointerSharedDeleter<T> > { public: - explicit inline QScopedSharedPointer(T *p = 0) + explicit inline QScopedSharedPointer(T *p = nullptr) : QCustomScopedPointer<T, QScopedPointerSharedDeleter<T> >(p) { } diff --git a/src/dbus/qdbus_symbols.cpp b/src/dbus/qdbus_symbols.cpp index dd74307fda..bd4299809b 100644 --- a/src/dbus/qdbus_symbols.cpp +++ b/src/dbus/qdbus_symbols.cpp @@ -56,7 +56,7 @@ void (*qdbus_resolve_me(const char *name))(); #if !defined QT_LINKED_LIBDBUS #if QT_CONFIG(library) -static QLibrary *qdbus_libdbus = 0; +static QLibrary *qdbus_libdbus = nullptr; void qdbus_unloadLibDBus() { @@ -66,7 +66,7 @@ void qdbus_unloadLibDBus() qdbus_libdbus->unload(); } delete qdbus_libdbus; - qdbus_libdbus = 0; + qdbus_libdbus = nullptr; } #endif @@ -118,7 +118,7 @@ bool qdbus_loadLibDBus() } delete lib; - lib = 0; + lib = nullptr; return false; #else return true; diff --git a/src/gui/doc/snippets/textdocument-listitems/mainwindow.cpp b/src/gui/doc/snippets/textdocument-listitems/mainwindow.cpp index 7daf4f46c3..5179208f61 100644 --- a/src/gui/doc/snippets/textdocument-listitems/mainwindow.cpp +++ b/src/gui/doc/snippets/textdocument-listitems/mainwindow.cpp @@ -130,9 +130,9 @@ void MainWindow::showList() headerLabels << tr("Lists"); treeWidget->setHeaderLabels(headerLabels); - QTreeWidgetItem *parentItem = 0; + QTreeWidgetItem *parentItem = nullptr; QTreeWidgetItem *item; - QTreeWidgetItem *lastItem = 0; + QTreeWidgetItem *lastItem = nullptr; parentItems.clear(); previousItems.clear(); diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 2f9349bb55..1499c4b57e 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1752,7 +1752,7 @@ void restoreOverrideCursor(); static QFont font(); static QFont font(const QWidget*); static QFont font(const char *className); -static void setFont(const QFont &, const char* className = 0); +static void setFont(const QFont &, const char *className = nullptr); static QFontMetrics fontMetrics(); #ifndef QT_NO_CLIPBOARD diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h index 76552cdd0e..c288df53b5 100644 --- a/src/gui/opengl/qopenglfunctions.h +++ b/src/gui/opengl/qopenglfunctions.h @@ -68,7 +68,7 @@ typedef double GLdouble; unsigned clamped = qMin(unsigned(error - GL_INVALID_ENUM), 4U); \ const char *errors[] = { "GL_INVALID_ENUM", "GL_INVALID_VALUE", "GL_INVALID_OPERATION", "Unknown" }; \ printf("GL error at %s:%d: %s\n", __FILE__, __LINE__, errors[clamped]); \ - int *value = 0; \ + int *value = nullptr; \ *value = 0; \ } #else diff --git a/src/gui/painting/qcoregraphics.mm b/src/gui/painting/qcoregraphics.mm index 302fa1b049..ef29f4a490 100644 --- a/src/gui/painting/qcoregraphics.mm +++ b/src/gui/painting/qcoregraphics.mm @@ -510,7 +510,7 @@ void QMacCGContext::initialize(const QImage *image, QPainter *painter) clip &= painterClip; } - qt_mac_clip_cg(context, clip, 0); + qt_mac_clip_cg(context, clip, nullptr); CGContextTranslateCTM(context, deviceTransform.dx(), deviceTransform.dy()); } diff --git a/src/gui/platform/windows/qwindowsguieventdispatcher_p.h b/src/gui/platform/windows/qwindowsguieventdispatcher_p.h index c6506f2dc9..804c7e936d 100644 --- a/src/gui/platform/windows/qwindowsguieventdispatcher_p.h +++ b/src/gui/platform/windows/qwindowsguieventdispatcher_p.h @@ -60,7 +60,7 @@ class Q_GUI_EXPORT QWindowsGuiEventDispatcher : public QEventDispatcherWin32 { Q_OBJECT public: - explicit QWindowsGuiEventDispatcher(QObject *parent = 0); + explicit QWindowsGuiEventDispatcher(QObject *parent = nullptr); static const char *windowsMessageName(UINT msg); diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index 2d4fd5594d..b702764688 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -84,7 +84,7 @@ QStaticTextUserData::~QStaticTextUserData() class MyWidget: public QWidget { public: - MyWidget(QWidget *parent = 0) : QWidget(parent), m_staticText("This is static text") + MyWidget(QWidget *parent = nullptr) : QWidget(parent), m_staticText("This is static text") protected: void paintEvent(QPaintEvent *) diff --git a/src/gui/text/windows/qwindowsfontdatabase.cpp b/src/gui/text/windows/qwindowsfontdatabase.cpp index 36d8da0ce8..9ee1c5aba6 100644 --- a/src/gui/text/windows/qwindowsfontdatabase.cpp +++ b/src/gui/text/windows/qwindowsfontdatabase.cpp @@ -1139,7 +1139,7 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request, const Q int dpi, const QSharedPointer<QWindowsFontEngineData> &data) { - QFontEngine *fe = 0; + QFontEngine *fe = nullptr; LOGFONT lf = fontDefToLOGFONT(request, faceName); const bool preferClearTypeAA = lf.lfQuality == CLEARTYPE_QUALITY; diff --git a/src/gui/text/windows/qwindowsfontengine.cpp b/src/gui/text/windows/qwindowsfontengine.cpp index cbf50f65da..dd0fbbf262 100644 --- a/src/gui/text/windows/qwindowsfontengine.cpp +++ b/src/gui/text/windows/qwindowsfontengine.cpp @@ -642,7 +642,7 @@ qreal QWindowsFontEngine::minRightBearing() const HDC hdc = m_fontEngineData->hdc; SelectObject(hdc, hfont); if (ttf) { - ABC *abc = 0; + ABC *abc = nullptr; int n = tm.tmLastChar - tm.tmFirstChar; if (n <= max_font_count) { abc = new ABC[n+1]; @@ -706,7 +706,7 @@ static inline QPointF qt_to_qpointf(const POINTFX &pt, qreal scale, qreal stretc #endif static bool addGlyphToPath(glyph_t glyph, const QFixedPoint &position, HDC hdc, - QPainterPath *path, bool ttf, glyph_metrics_t *metric = 0, + QPainterPath *path, bool ttf, glyph_metrics_t *metric = nullptr, qreal scale = 1.0, qreal stretch = 1.0) { MAT2 mat; diff --git a/src/gui/text/windows/qwindowsfontengine_p.h b/src/gui/text/windows/qwindowsfontengine_p.h index 8a676affcd..22130924ad 100644 --- a/src/gui/text/windows/qwindowsfontengine_p.h +++ b/src/gui/text/windows/qwindowsfontengine_p.h @@ -115,7 +115,7 @@ public: bool supportsTransformation(const QTransform &transform) const override; #ifndef Q_CC_MINGW - void getGlyphBearings(glyph_t glyph, qreal *leftBearing = 0, qreal *rightBearing = 0) override; + void getGlyphBearings(glyph_t glyph, qreal *leftBearing = nullptr, qreal *rightBearing = nullptr) override; #endif bool hasUnreliableGlyphOutline() const override; diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp index 4b8c58cb40..5b34b99caa 100644 --- a/src/network/kernel/qnetworkinterface_unix.cpp +++ b/src/network/kernel/qnetworkinterface_unix.cpp @@ -209,7 +209,7 @@ static QSet<QByteArray> interfaceNames(int socket) static QNetworkInterfacePrivate *findInterface(int socket, QList<QNetworkInterfacePrivate *> &interfaces, struct ifreq &req) { - QNetworkInterfacePrivate *iface = 0; + QNetworkInterfacePrivate *iface = nullptr; int ifindex = 0; #if !defined(QT_NO_IPV6IFNAME) || defined(SIOCGIFINDEX) @@ -618,7 +618,7 @@ static QList<QNetworkInterfacePrivate *> interfaceListing() for (ifaddrs *ptr = interfaceListing; ptr; ptr = ptr->ifa_next) { // Find the interface QLatin1String name(ptr->ifa_name); - QNetworkInterfacePrivate *iface = 0; + QNetworkInterfacePrivate *iface = nullptr; QList<QNetworkInterfacePrivate *>::Iterator if_it = interfaces.begin(); for ( ; if_it != interfaces.end(); ++if_it) if ((*if_it)->name == name) { diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_dummy_p.h b/src/platformsupport/devicediscovery/qdevicediscovery_dummy_p.h index fe669c8dec..92a9351f2e 100644 --- a/src/platformsupport/devicediscovery/qdevicediscovery_dummy_p.h +++ b/src/platformsupport/devicediscovery/qdevicediscovery_dummy_p.h @@ -60,7 +60,7 @@ class QDeviceDiscoveryDummy : public QDeviceDiscovery Q_OBJECT public: - QDeviceDiscoveryDummy(QDeviceTypes types, QObject *parent = 0); + QDeviceDiscoveryDummy(QDeviceTypes types, QObject *parent = nullptr); QStringList scanConnectedDevices() override; }; diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_static_p.h b/src/platformsupport/devicediscovery/qdevicediscovery_static_p.h index 93110c3c55..0cf70a32a8 100644 --- a/src/platformsupport/devicediscovery/qdevicediscovery_static_p.h +++ b/src/platformsupport/devicediscovery/qdevicediscovery_static_p.h @@ -60,7 +60,7 @@ class QDeviceDiscoveryStatic : public QDeviceDiscovery Q_OBJECT public: - QDeviceDiscoveryStatic(QDeviceTypes types, QObject *parent = 0); + QDeviceDiscoveryStatic(QDeviceTypes types, QObject *parent = nullptr); QStringList scanConnectedDevices() override; private: diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp b/src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp index 96af9a2b47..1853c2260a 100644 --- a/src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp +++ b/src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp @@ -60,7 +60,7 @@ QDeviceDiscovery *QDeviceDiscovery::create(QDeviceTypes types, QObject *parent) { qCDebug(lcDD) << "udev device discovery for type" << types; - QDeviceDiscovery *helper = 0; + QDeviceDiscovery *helper = nullptr; struct udev *udev; udev = udev_new(); diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp index d951688b4f..788a135f9e 100644 --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp @@ -250,8 +250,8 @@ QEvdevKeyboardHandler::KeycodeAction QEvdevKeyboardHandler::processKeycode(quint KeycodeAction result = None; bool first_press = pressed && !autorepeat; - const QEvdevKeyboardMap::Mapping *map_plain = 0; - const QEvdevKeyboardMap::Mapping *map_withmod = 0; + const QEvdevKeyboardMap::Mapping *map_plain = nullptr; + const QEvdevKeyboardMap::Mapping *map_withmod = nullptr; quint8 modifiers = m_modifiers; diff --git a/src/platformsupport/input/tslib/qtslib_p.h b/src/platformsupport/input/tslib/qtslib_p.h index ffd60cd0e3..b49531ebd3 100644 --- a/src/platformsupport/input/tslib/qtslib_p.h +++ b/src/platformsupport/input/tslib/qtslib_p.h @@ -64,7 +64,7 @@ class QTsLibMouseHandler : public QObject Q_OBJECT public: - QTsLibMouseHandler(const QString &key, const QString &specification, QObject *parent = 0); + QTsLibMouseHandler(const QString &key, const QString &specification, QObject *parent = nullptr); ~QTsLibMouseHandler(); private slots: diff --git a/src/plugins/platforms/android/androidjniaccessibility.cpp b/src/plugins/platforms/android/androidjniaccessibility.cpp index 4d263831e1..8d9a968b4f 100644 --- a/src/plugins/platforms/android/androidjniaccessibility.cpp +++ b/src/plugins/platforms/android/androidjniaccessibility.cpp @@ -98,7 +98,7 @@ namespace QtAndroidAccessibility QAccessibleInterface *interfaceFromId(jint objectId) { - QAccessibleInterface *iface = 0; + QAccessibleInterface *iface = nullptr; if (objectId == -1) { QWindow *win = qApp->focusWindow(); if (win) @@ -164,7 +164,7 @@ namespace QtAndroidAccessibility QPoint pos = QHighDpi::fromNativePixels(QPoint(int(x), int(y)), root->window()); QAccessibleInterface *child = root->childAt(pos.x(), pos.y()); - QAccessibleInterface *lastChild = 0; + QAccessibleInterface *lastChild = nullptr; while (child && (child != lastChild)) { lastChild = child; child = child->childAt(pos.x(), pos.y()); diff --git a/src/plugins/platforms/android/androidjnimain.h b/src/plugins/platforms/android/androidjnimain.h index 63be5910f9..6902f89341 100644 --- a/src/plugins/platforms/android/androidjnimain.h +++ b/src/plugins/platforms/android/androidjnimain.h @@ -96,9 +96,9 @@ namespace QtAndroid }; void setSystemUiVisibility(SystemUiVisibility uiVisibility); - jobject createBitmap(QImage img, JNIEnv *env = 0); + jobject createBitmap(QImage img, JNIEnv *env = nullptr); jobject createBitmap(int width, int height, QImage::Format format, JNIEnv *env); - jobject createBitmapDrawable(jobject bitmap, JNIEnv *env = 0); + jobject createBitmapDrawable(jobject bitmap, JNIEnv *env = nullptr); const char *classErrorMsgFmt(); const char *methodErrorMsgFmt(); diff --git a/src/plugins/platforms/android/androidjnimenu.cpp b/src/plugins/platforms/android/androidjnimenu.cpp index de2fdaa0e2..fe5de1f882 100644 --- a/src/plugins/platforms/android/androidjnimenu.cpp +++ b/src/plugins/platforms/android/androidjnimenu.cpp @@ -59,12 +59,12 @@ using namespace QtAndroid; namespace QtAndroidMenu { static QList<QAndroidPlatformMenu *> pendingContextMenus; - static QAndroidPlatformMenu *visibleMenu = 0; + static QAndroidPlatformMenu *visibleMenu = nullptr; static QRecursiveMutex visibleMenuMutex; static QSet<QAndroidPlatformMenuBar *> menuBars; - static QAndroidPlatformMenuBar *visibleMenuBar = 0; - static QWindow *activeTopLevelWindow = 0; + static QAndroidPlatformMenuBar *visibleMenuBar = nullptr; + static QWindow *activeTopLevelWindow = nullptr; static QRecursiveMutex menuBarMutex; static jmethodID openContextMenuMethodID = 0; diff --git a/src/plugins/platforms/android/qandroideventdispatcher.h b/src/plugins/platforms/android/qandroideventdispatcher.h index 85d4cee6cb..8a29ed7e7e 100644 --- a/src/plugins/platforms/android/qandroideventdispatcher.h +++ b/src/plugins/platforms/android/qandroideventdispatcher.h @@ -48,7 +48,7 @@ class QAndroidEventDispatcher : public QUnixEventDispatcherQPA { Q_OBJECT public: - explicit QAndroidEventDispatcher(QObject *parent = 0); + explicit QAndroidEventDispatcher(QObject *parent = nullptr); ~QAndroidEventDispatcher(); void start(); void stop(); diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp index 5add7b0746..fc71b391c0 100644 --- a/src/plugins/platforms/android/qandroidinputcontext.cpp +++ b/src/plugins/platforms/android/qandroidinputcontext.cpp @@ -91,7 +91,7 @@ private: } // namespace anonymous -static QAndroidInputContext *m_androidInputContext = 0; +static QAndroidInputContext *m_androidInputContext = nullptr; static char const *const QtNativeInputConnectionClassName = "org/qtproject/qt/android/QtNativeInputConnection"; static char const *const QtExtractedTextClassName = "org/qtproject/qt/android/QtExtractedText"; static jclass m_extractedTextClass = 0; diff --git a/src/plugins/platforms/directfb/main.cpp b/src/plugins/platforms/directfb/main.cpp index de84827777..85e7f08917 100644 --- a/src/plugins/platforms/directfb/main.cpp +++ b/src/plugins/platforms/directfb/main.cpp @@ -64,7 +64,7 @@ public: QPlatformIntegration * QDirectFbIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); - QDirectFbIntegration *integration = 0; + QDirectFbIntegration *integration = nullptr; if (!system.compare(QLatin1String("directfb"), Qt::CaseInsensitive)) integration = new QDirectFbIntegration; diff --git a/src/plugins/platforms/directfb/qdirectfb_egl.cpp b/src/plugins/platforms/directfb/qdirectfb_egl.cpp index 95e6093fab..f38ad8f306 100644 --- a/src/plugins/platforms/directfb/qdirectfb_egl.cpp +++ b/src/plugins/platforms/directfb/qdirectfb_egl.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE extern QDirectFBEGLHooks platform_hook; static QDirectFBEGLHooks *hooks = &platform_hook; #else -static QDirectFBEGLHooks *hooks = 0; +static QDirectFBEGLHooks *hooks = nullptr; #endif /** diff --git a/src/plugins/platforms/directfb/qdirectfbconvenience.cpp b/src/plugins/platforms/directfb/qdirectfbconvenience.cpp index c67a76f989..460596a18c 100644 --- a/src/plugins/platforms/directfb/qdirectfbconvenience.cpp +++ b/src/plugins/platforms/directfb/qdirectfbconvenience.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE IDirectFB *QDirectFbConvenience::dfbInterface() { - static IDirectFB *dfb = 0; + static IDirectFB *dfb = nullptr; if (!dfb) { DFBResult result = DirectFBCreate(&dfb); if (result != DFB_OK) { @@ -247,7 +247,7 @@ QEvent::Type QDirectFbConvenience::eventType(DFBWindowEventType type) return QEvent::None; } } -QDirectFbKeyMap *QDirectFbConvenience::dfbKeymap = 0; +QDirectFbKeyMap *QDirectFbConvenience::dfbKeymap = nullptr; QDirectFbKeyMap *QDirectFbConvenience::keyMap() { if (!dfbKeymap) diff --git a/src/plugins/platforms/directfb/qdirectfbconvenience.h b/src/plugins/platforms/directfb/qdirectfbconvenience.h index 19fc068307..dd10f6bc85 100644 --- a/src/plugins/platforms/directfb/qdirectfbconvenience.h +++ b/src/plugins/platforms/directfb/qdirectfbconvenience.h @@ -98,13 +98,13 @@ template <typename T> class QDirectFBPointer : public QScopedPointer<T, QDirectFBInterfaceCleanupHandler<T> > { public: - QDirectFBPointer(T *t = 0) + QDirectFBPointer(T *t = nullptr) : QScopedPointer<T, QDirectFBInterfaceCleanupHandler<T> >(t) {} T** outPtr() { - this->reset(0); + this->reset(nullptr); return &this->d; } }; diff --git a/src/plugins/platforms/integrity/qintegrityhidmanager.h b/src/plugins/platforms/integrity/qintegrityhidmanager.h index c8780b2dc2..1e421328c2 100644 --- a/src/plugins/platforms/integrity/qintegrityhidmanager.h +++ b/src/plugins/platforms/integrity/qintegrityhidmanager.h @@ -52,7 +52,7 @@ class QIntegrityHIDManager : public QThread { Q_OBJECT public: - QIntegrityHIDManager(const QString &key, const QString &specification, QObject *parent = 0); + QIntegrityHIDManager(const QString &key, const QString &specification, QObject *parent = nullptr); ~QIntegrityHIDManager(); void run(void); diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/plugin.mm b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/plugin.mm index 8b372b8749..2a3d8c603e 100644 --- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/plugin.mm +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/plugin.mm @@ -52,7 +52,7 @@ class QIosOptionalPlugin_NSPhotoLibrary : public QObject, QIosOptionalPluginInte Q_INTERFACES(QIosOptionalPluginInterface) public: - explicit QIosOptionalPlugin_NSPhotoLibrary(QObject* = 0) {}; + explicit QIosOptionalPlugin_NSPhotoLibrary(QObject * = nullptr) {}; ~QIosOptionalPlugin_NSPhotoLibrary() {} UIViewController* createImagePickerController(QIOSFileDialog *fileDialog) const override diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm index c5244a51ad..01524a00e8 100644 --- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm @@ -54,7 +54,7 @@ static QThreadStorage<QString> g_iteratorCurrentUrl; static QThreadStorage<QPointer<QIOSAssetData> > g_assetDataCache; static const int kBufferSize = 10; -static ALAsset *kNoAsset = 0; +static ALAsset *kNoAsset = nullptr; static bool ensureAuthorizationDialogNotBlocked() { @@ -366,7 +366,7 @@ bool QIOSFileEngineAssetsLibrary::close() // Delete later, so that we can reuse the asset if a QFile is // opened with the same path during the same event loop cycle. m_data->deleteLater(); - m_data = 0; + m_data = nullptr; } return true; } @@ -410,7 +410,7 @@ qint64 QIOSFileEngineAssetsLibrary::read(char *data, qint64 maxlen) if (!bytesRead) return 0; - NSError *error = 0; + NSError *error = nullptr; [[asset defaultRepresentation] getBytes:(uint8_t *)data fromOffset:m_offset length:bytesRead error:&error]; if (error) { diff --git a/src/plugins/platforms/ios/qioseventdispatcher.h b/src/plugins/platforms/ios/qioseventdispatcher.h index 1f4c78dc74..cdbaa0931d 100644 --- a/src/plugins/platforms/ios/qioseventdispatcher.h +++ b/src/plugins/platforms/ios/qioseventdispatcher.h @@ -53,7 +53,7 @@ public: bool processPostedEvents() override; protected: - explicit QIOSEventDispatcher(QObject *parent = 0); + explicit QIOSEventDispatcher(QObject *parent = nullptr); }; class QIOSJumpingEventDispatcher : public QIOSEventDispatcher @@ -61,7 +61,7 @@ class QIOSJumpingEventDispatcher : public QIOSEventDispatcher Q_OBJECT public: - QIOSJumpingEventDispatcher(QObject *parent = 0); + QIOSJumpingEventDispatcher(QObject *parent = nullptr); bool processEvents(QEventLoop::ProcessEventsFlags flags) override; // Public since we can't friend Objective-C methods @@ -76,4 +76,4 @@ private: QT_END_NAMESPACE -#endif // QIOSEVENTDISPATCHER_H
\ No newline at end of file +#endif // QIOSEVENTDISPATCHER_H diff --git a/src/plugins/platforms/ios/qiosglobal.mm b/src/plugins/platforms/ios/qiosglobal.mm index a523d1be45..c0428dacb9 100644 --- a/src/plugins/platforms/ios/qiosglobal.mm +++ b/src/plugins/platforms/ios/qiosglobal.mm @@ -185,7 +185,7 @@ FirstResponderCandidate::FirstResponderCandidate(UIResponder *responder) { } -UIResponder *FirstResponderCandidate::s_firstResponderCandidate = 0; +UIResponder *FirstResponderCandidate::s_firstResponderCandidate = nullptr; QT_END_NAMESPACE diff --git a/src/plugins/platforms/ios/qiosinputcontext.h b/src/plugins/platforms/ios/qiosinputcontext.h index c59c5328af..36421a57c3 100644 --- a/src/plugins/platforms/ios/qiosinputcontext.h +++ b/src/plugins/platforms/ios/qiosinputcontext.h @@ -111,7 +111,7 @@ public: void scrollToCursor(); void scroll(int y); - void updateKeyboardState(NSNotification *notification = 0); + void updateKeyboardState(NSNotification *notification = nullptr); const ImeState &imeState() { return m_imeState; } const KeyboardState &keyboardState() { return m_keyboardState; } diff --git a/src/plugins/platforms/ios/qiosmenu.mm b/src/plugins/platforms/ios/qiosmenu.mm index 74a77de757..737d7798ab 100644 --- a/src/plugins/platforms/ios/qiosmenu.mm +++ b/src/plugins/platforms/ios/qiosmenu.mm @@ -54,7 +54,7 @@ // m_currentMenu points to the currently visible menu. // Only one menu will be visible at a time, and if a second menu // is shown on top of a first, the first one will be told to hide. -QIOSMenu *QIOSMenu::m_currentMenu = 0; +QIOSMenu *QIOSMenu::m_currentMenu = nullptr; // ------------------------------------------------------------------------- @@ -441,7 +441,7 @@ void QIOSMenu::dismiss() break; } - m_currentMenu = 0; + m_currentMenu = nullptr; m_visible = false; } @@ -458,13 +458,13 @@ void QIOSMenu::toggleShowUsingUIMenuController(bool show) Q_ASSERT(m_menuController); [[UIMenuController sharedMenuController] setMenuVisible:NO animated:YES]; [m_menuController release]; - m_menuController = 0; + m_menuController = nullptr; } } void QIOSMenu::toggleShowUsingUIPickerView(bool show) { - static QObject *focusObjectWithPickerView = 0; + static QObject *focusObjectWithPickerView = nullptr; if (show) { Q_ASSERT(!m_pickerView); @@ -477,12 +477,12 @@ void QIOSMenu::toggleShowUsingUIPickerView(bool show) } else { Q_ASSERT(focusObjectWithPickerView); focusObjectWithPickerView->removeEventFilter(this); - focusObjectWithPickerView = 0; + focusObjectWithPickerView = nullptr; Q_ASSERT(m_pickerView); [m_pickerView listenForKeyboardWillHideNotification:NO]; [m_pickerView release]; - m_pickerView = 0; + m_pickerView = nullptr; qApp->inputMethod()->update(Qt::ImEnabled | Qt::ImPlatformData); } diff --git a/src/plugins/platforms/qnx/qqnxabstractnavigator.h b/src/plugins/platforms/qnx/qqnxabstractnavigator.h index 24e28dae96..abacf80f54 100644 --- a/src/plugins/platforms/qnx/qqnxabstractnavigator.h +++ b/src/plugins/platforms/qnx/qqnxabstractnavigator.h @@ -50,7 +50,7 @@ class QQnxAbstractNavigator : public QObject { Q_OBJECT public: - explicit QQnxAbstractNavigator(QObject *parent = 0); + explicit QQnxAbstractNavigator(QObject *parent = nullptr); ~QQnxAbstractNavigator(); bool invokeUrl(const QUrl &url); diff --git a/src/plugins/platforms/qnx/qqnxabstractvirtualkeyboard.h b/src/plugins/platforms/qnx/qqnxabstractvirtualkeyboard.h index 24be03b46c..92f6308487 100644 --- a/src/plugins/platforms/qnx/qqnxabstractvirtualkeyboard.h +++ b/src/plugins/platforms/qnx/qqnxabstractvirtualkeyboard.h @@ -64,7 +64,7 @@ public: enum KeyboardMode { Default, Url, Email, Web, NumPunc, Number, Symbol, Phone, Pin, Password, Alphanumeric }; enum EnterKeyType { DefaultReturn, Connect, Done, Go, Join, Next, Search, Send, Submit }; - explicit QQnxAbstractVirtualKeyboard(QObject *parent = 0); + explicit QQnxAbstractVirtualKeyboard(QObject *parent = nullptr); virtual bool showKeyboard() = 0; virtual bool hideKeyboard() = 0; diff --git a/src/plugins/platforms/qnx/qqnxbuffer.cpp b/src/plugins/platforms/qnx/qqnxbuffer.cpp index cd05a679b1..b02a989ea8 100644 --- a/src/plugins/platforms/qnx/qqnxbuffer.cpp +++ b/src/plugins/platforms/qnx/qqnxbuffer.cpp @@ -77,7 +77,7 @@ QQnxBuffer::QQnxBuffer(screen_buffer_t buffer) // Get access to buffer's data errno = 0; - uchar *dataPtr = 0; + uchar *dataPtr = nullptr; Q_SCREEN_CRITICALERROR( screen_get_buffer_property_pv(buffer, SCREEN_PROPERTY_POINTER, (void **)&dataPtr), "Failed to query buffer pointer"); diff --git a/src/plugins/platforms/qnx/qqnxbuffer.h b/src/plugins/platforms/qnx/qqnxbuffer.h index 9ee0d5d60c..4b8adb20db 100644 --- a/src/plugins/platforms/qnx/qqnxbuffer.h +++ b/src/plugins/platforms/qnx/qqnxbuffer.h @@ -55,8 +55,8 @@ public: virtual ~QQnxBuffer(); screen_buffer_t nativeBuffer() const { return m_buffer; } - const QImage *image() const { return (m_buffer != 0) ? &m_image : 0; } - QImage *image() { return (m_buffer != 0) ? &m_image : 0; } + const QImage *image() const { return (m_buffer != nullptr) ? &m_image : nullptr; } + QImage *image() { return (m_buffer != nullptr) ? &m_image : nullptr; } QRect rect() const { return m_image.rect(); } diff --git a/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.h b/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.h index aa2c118b3a..7cc67f2459 100644 --- a/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.h +++ b/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.h @@ -64,7 +64,7 @@ public: ButtonDown }; - explicit QQnxButtonEventNotifier(QObject *parent = 0); + explicit QQnxButtonEventNotifier(QObject *parent = nullptr); ~QQnxButtonEventNotifier(); public Q_SLOTS: diff --git a/src/plugins/platforms/qnx/qqnxinputcontext_imf.cpp b/src/plugins/platforms/qnx/qqnxinputcontext_imf.cpp index ce3a445d7c..79f6273e9f 100644 --- a/src/plugins/platforms/qnx/qqnxinputcontext_imf.cpp +++ b/src/plugins/platforms/qnx/qqnxinputcontext_imf.cpp @@ -76,8 +76,8 @@ static QQnxInputContext *sInputContextInstance; static QColor sSelectedColor(0,0xb8,0,85); -static const input_session_t *sSpellCheckSession = 0; -static const input_session_t *sInputSession = 0; +static const input_session_t *sSpellCheckSession = nullptr; +static const input_session_t *sInputSession = nullptr; static bool isSessionOkay(input_session_t *ic) { return ic !=0 && sInputSession != 0 && ic->component_id == sInputSession->component_id; @@ -515,13 +515,13 @@ static spannable_string_t *toSpannableString(const QString &text) } -static const input_session_t *(*p_ictrl_open_session)(connection_interface_t *) = 0; -static void (*p_ictrl_close_session)(input_session_t *) = 0; -static int32_t (*p_ictrl_dispatch_event)(event_t*) = 0; -static int32_t (*p_imf_client_init)() = 0; -static void (*p_imf_client_disconnect)() = 0; -static int32_t (*p_vkb_init_selection_service)() = 0; -static int32_t (*p_ictrl_get_num_active_sessions)() = 0; +static const input_session_t *(*p_ictrl_open_session)(connection_interface_t *) = nullptr; +static void (*p_ictrl_close_session)(input_session_t *) = nullptr; +static int32_t (*p_ictrl_dispatch_event)(event_t*) = nullptr; +static int32_t (*p_imf_client_init)() = nullptr; +static void (*p_imf_client_disconnect)() = nullptr; +static int32_t (*p_vkb_init_selection_service)() = nullptr; +static int32_t (*p_ictrl_get_num_active_sessions)() = nullptr; static bool s_imfInitFailed = false; static bool imfAvailable() @@ -602,7 +602,7 @@ QQnxInputContext::~QQnxInputContext() qInputContextDebug(); Q_ASSERT(sInputContextInstance == this); - sInputContextInstance = 0; + sInputContextInstance = nullptr; if (!imfAvailable()) return; @@ -735,7 +735,7 @@ void QQnxInputContext::closeSession() if (sInputSession) { p_ictrl_close_session((input_session_t *)sInputSession); - sInputSession = 0; + sInputSession = nullptr; } // These are likely already in the right state but this depends on the text control // having called reset or commit. So, just in case, set them to proper values. diff --git a/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.h b/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.h index 3e10052459..6bedfaf963 100644 --- a/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.h +++ b/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.h @@ -48,7 +48,7 @@ class QQnxNavigatorEventHandler : public QObject { Q_OBJECT public: - explicit QQnxNavigatorEventHandler(QObject *parent = 0); + explicit QQnxNavigatorEventHandler(QObject *parent = nullptr); bool handleOrientationCheck(int angle); void handleOrientationChange(int angle); diff --git a/src/plugins/platforms/qnx/qqnxnavigatoreventnotifier.h b/src/plugins/platforms/qnx/qqnxnavigatoreventnotifier.h index 17c31c096c..a761faea1c 100644 --- a/src/plugins/platforms/qnx/qqnxnavigatoreventnotifier.h +++ b/src/plugins/platforms/qnx/qqnxnavigatoreventnotifier.h @@ -51,7 +51,7 @@ class QQnxNavigatorEventNotifier : public QObject { Q_OBJECT public: - explicit QQnxNavigatorEventNotifier(QQnxNavigatorEventHandler *eventHandler, QObject *parent = 0); + explicit QQnxNavigatorEventNotifier(QQnxNavigatorEventHandler *eventHandler, QObject *parent = nullptr); ~QQnxNavigatorEventNotifier(); public Q_SLOTS: diff --git a/src/plugins/platforms/qnx/qqnxnavigatorpps.h b/src/plugins/platforms/qnx/qqnxnavigatorpps.h index 3c818f51a6..c58903b6b6 100644 --- a/src/plugins/platforms/qnx/qqnxnavigatorpps.h +++ b/src/plugins/platforms/qnx/qqnxnavigatorpps.h @@ -50,7 +50,7 @@ class QQnxNavigatorPps : public QQnxAbstractNavigator { Q_OBJECT public: - explicit QQnxNavigatorPps(QObject *parent = 0); + explicit QQnxNavigatorPps(QObject *parent = nullptr); ~QQnxNavigatorPps(); protected: diff --git a/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp b/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp index e70092b97e..fe68927fda 100644 --- a/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp +++ b/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp @@ -89,7 +89,7 @@ void QQnxRasterBackingStore::flush(QWindow *window, const QRegion ®ion, const if (!m_needsPosting) return; - QQnxWindow *targetWindow = 0; + QQnxWindow *targetWindow = nullptr; if (window) targetWindow = static_cast<QQnxWindow *>(window->handle()); diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp index 22a00d3d40..9d3b921c44 100644 --- a/src/plugins/platforms/qnx/qqnxwindow.cpp +++ b/src/plugins/platforms/qnx/qqnxwindow.cpp @@ -566,7 +566,7 @@ void QQnxWindow::removeFromParent() if (Q_UNLIKELY(!m_parentWindow->m_childWindows.removeAll(this))) qFatal("QQnxWindow: Window Hierarchy broken; window has parent, but parent hasn't got child."); else - m_parentWindow = 0; + m_parentWindow = nullptr; } else if (m_screen) { m_screen->removeWindow(this); } @@ -634,7 +634,7 @@ void QQnxWindow::lower() void QQnxWindow::requestActivateWindow() { - QQnxWindow *focusWindow = 0; + QQnxWindow *focusWindow = nullptr; if (QGuiApplication::focusWindow()) focusWindow = static_cast<QQnxWindow*>(QGuiApplication::focusWindow()->handle()); @@ -664,7 +664,7 @@ void QQnxWindow::requestActivateWindow() platformScreen->rootWindow()->m_windowGroupName == currentWindow->m_parentGroupName) { currentWindow = platformScreen->rootWindow(); } else { - currentWindow = 0; + currentWindow = nullptr; } } diff --git a/src/plugins/platforms/wasm/qwasmcompositor.cpp b/src/plugins/platforms/wasm/qwasmcompositor.cpp index 72fccd4a2b..9a16ae7719 100644 --- a/src/plugins/platforms/wasm/qwasmcompositor.cpp +++ b/src/plugins/platforms/wasm/qwasmcompositor.cpp @@ -454,7 +454,7 @@ void QWasmCompositor::drawFrameWindow(QWasmFrameOptions options, QPainter *paint const QColor &c2 = options.palette.shadow().color(); const QColor &c3 = options.palette.midlight().color(); const QColor &c4 = options.palette.dark().color(); - const QBrush *fill = 0; + const QBrush *fill = nullptr; const qreal devicePixelRatio = painter->device()->devicePixelRatio(); if (!qFuzzyCompare(devicePixelRatio, qreal(1))) { diff --git a/src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp b/src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp index b4a9d64eb8..0eb522e1ed 100644 --- a/src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp +++ b/src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp @@ -320,7 +320,7 @@ static void init_direct(QXcbColormapPrivate *d, bool ownColormap) XStoreColors(X11->display, d->colormap, colorTable.data(), colorTable.count()); } -static QXcbColormap **cmaps = 0; +static QXcbColormap **cmaps = nullptr; void QXcbColormap::initialize() { @@ -343,7 +343,7 @@ void QXcbColormap::initialize() d->visual = DefaultVisual(display, i); d->defaultVisual = true; - Visual *argbVisual = 0; + Visual *argbVisual = nullptr; if (X11->visual && i == DefaultScreen(display)) { // only use the outside colormap on the default screen @@ -356,7 +356,7 @@ void QXcbColormap::initialize() d->visual = find_visual(display, i, X11->visual_class, X11->visual_id, &d->depth, &d->defaultVisual); } else if (!X11->custom_cmap) { - XStandardColormap *stdcmap = 0; + XStandardColormap *stdcmap = nullptr; int ncmaps = 0; #if QT_CONFIG(xrender) diff --git a/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp b/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp index d55a49768c..bf45b409c5 100644 --- a/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp +++ b/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp @@ -282,9 +282,9 @@ static uint n_bits(uint v) return i; } -static uint *red_scale_table = 0; -static uint *green_scale_table = 0; -static uint *blue_scale_table = 0; +static uint *red_scale_table = nullptr; +static uint *green_scale_table = nullptr; +static uint *blue_scale_table = nullptr; static void cleanup_scale_tables() { @@ -546,10 +546,10 @@ void QX11PlatformPixmap::fromImage(const QImage &img, Qt::ImageConversionFlags f Display *dpy = xinfo.display(); Visual *visual = (Visual *)xinfo.visual(); - XImage *xi = 0; + XImage *xi = nullptr; bool trucol = (visual->c_class >= TrueColor); size_t nbytes = image.sizeInBytes(); - uchar *newbits= 0; + uchar *newbits= nullptr; #if QT_CONFIG(xrender) if (alphaCheck.hasXRenderAndAlpha()) { diff --git a/src/plugins/platforms/xcb/nativepainting/qtessellator.cpp b/src/plugins/platforms/xcb/nativepainting/qtessellator.cpp index 1afa00cfc9..388f5aba76 100644 --- a/src/plugins/platforms/xcb/nativepainting/qtessellator.cpp +++ b/src/plugins/platforms/xcb/nativepainting/qtessellator.cpp @@ -725,7 +725,7 @@ void QTessellatorPrivate::cancelCoincidingEdges() { Vertex **vv = vertices.sorted; - QCoincidingEdge *tl = 0; + QCoincidingEdge *tl = nullptr; int tlSize = 0; for (int i = 0; i < vertices.nPoints - 1; ++i) { diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp index 401863790c..d2143ce953 100644 --- a/src/plugins/platforms/xcb/qxcbdrag.cpp +++ b/src/plugins/platforms/xcb/qxcbdrag.cpp @@ -95,9 +95,9 @@ static xcb_window_t xdndProxy(QXcbConnection *c, xcb_window_t w) if (reply && reply->type == XCB_ATOM_WINDOW) { xcb_window_t p = *((xcb_window_t *)xcb_get_property_value(reply.get())); if (proxy != p) - proxy = 0; + proxy = XCB_NONE; } else { - proxy = 0; + proxy = XCB_NONE; } return proxy; @@ -690,7 +690,7 @@ int QXcbDrag::findTransactionByTime(xcb_timestamp_t timestamp) #if 0 // for embedding only -static QWidget* current_embedding_widget = 0; +static QWidget* current_embedding_widget = nullptr; static xcb_client_message_event_t last_enter_event; diff --git a/src/plugins/sqldrivers/db2/qsql_db2.cpp b/src/plugins/sqldrivers/db2/qsql_db2.cpp index e644a556e6..e3cfa0ae15 100644 --- a/src/plugins/sqldrivers/db2/qsql_db2.cpp +++ b/src/plugins/sqldrivers/db2/qsql_db2.cpp @@ -1052,7 +1052,7 @@ QVariant QDB2Result::data(int field) return *d->valueCache[field]; - QVariant* v = 0; + QVariant *v = nullptr; switch (info.metaType().id()) { case QVariant::LongLong: v = new QVariant((qint64) qGetBigIntData(d->hStmt, field, isNull)); diff --git a/src/plugins/sqldrivers/db2/qsql_db2_p.h b/src/plugins/sqldrivers/db2/qsql_db2_p.h index 79ae54ab2d..abe65c4208 100644 --- a/src/plugins/sqldrivers/db2/qsql_db2_p.h +++ b/src/plugins/sqldrivers/db2/qsql_db2_p.h @@ -72,8 +72,8 @@ class Q_EXPORT_SQLDRIVER_DB2 QDB2Driver : public QSqlDriver friend class QDB2ResultPrivate; public: - explicit QDB2Driver(QObject* parent = 0); - QDB2Driver(Qt::HANDLE env, Qt::HANDLE con, QObject* parent = 0); + explicit QDB2Driver(QObject *parent = nullptr); + QDB2Driver(Qt::HANDLE env, Qt::HANDLE con, QObject *parent = nullptr); ~QDB2Driver(); bool hasFeature(DriverFeature) const override; void close() override; diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp index 6b7ee8f133..7be2df6dd9 100644 --- a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp +++ b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp @@ -487,7 +487,7 @@ QVariant QIBaseResultPrivate::fetchBlob(ISC_QUAD *bId) } template<typename T> -static QList<QVariant> toList(char** buf, int count, T* = 0) +static QList<QVariant> toList(char** buf, int count, T* = nullptr) { QList<QVariant> res; for (int i = 0; i < count; ++i) { @@ -624,7 +624,7 @@ QVariant QIBaseResultPrivate::fetchArray(int pos, ISC_QUAD *arr) } template<typename T> -static char* fillList(char *buffer, const QList<QVariant> &list, T* = 0) +static char* fillList(char *buffer, const QList<QVariant> &list, T* = nullptr) { for (int i = 0; i < list.size(); ++i) { T val; diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h index e7c908cf2b..9109c2b40f 100644 --- a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h +++ b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h @@ -73,8 +73,8 @@ class Q_EXPORT_SQLDRIVER_IBASE QIBaseDriver : public QSqlDriver Q_DECLARE_PRIVATE(QIBaseDriver) Q_OBJECT public: - explicit QIBaseDriver(QObject *parent = 0); - explicit QIBaseDriver(isc_db_handle connection, QObject *parent = 0); + explicit QIBaseDriver(QObject *parent = nullptr); + explicit QIBaseDriver(isc_db_handle connection, QObject *parent = nullptr); virtual ~QIBaseDriver(); bool hasFeature(DriverFeature f) const override; bool open(const QString &db, diff --git a/src/plugins/sqldrivers/oci/qsql_oci.cpp b/src/plugins/sqldrivers/oci/qsql_oci.cpp index 4edafd1029..5bf9400180 100644 --- a/src/plugins/sqldrivers/oci/qsql_oci.cpp +++ b/src/plugins/sqldrivers/oci/qsql_oci.cpp @@ -511,7 +511,7 @@ int QOCIResultPrivate::bindValues(QVariantList &values, IndicatorArray &indicato values[i].detach(); const QVariant &val = values.at(i); - OCIBind * hbnd = 0; // Oracle handles these automatically + OCIBind * hbnd = nullptr; // Oracle handles these automatically sb2 *indPtr = &indicators[i]; *indPtr = val.isNull() ? -1 : 0; @@ -897,10 +897,10 @@ QOCICols::QOCICols(int size, QOCIResultPrivate* dp) : fieldInf(size), d(dp) { ub4 dataSize = 0; - OCIDefine* dfn = 0; + OCIDefine *dfn = nullptr; int r; - OCIParam* param = 0; + OCIParam *param = nullptr; sb4 parmStatus = 0; ub4 count = 1; int idx = 0; @@ -1184,7 +1184,7 @@ OraFieldInfo QOCICols::qMakeOraField(const QOCIResultPrivate* p, OCIParam* param { OraFieldInfo ofi; ub2 colType(0); - text *colName = 0; + text *colName = nullptr; ub4 colNameLen(0); sb1 colScale(0); ub2 colLength(0); diff --git a/src/plugins/sqldrivers/oci/qsql_oci_p.h b/src/plugins/sqldrivers/oci/qsql_oci_p.h index 295c131f1a..a3366abb77 100644 --- a/src/plugins/sqldrivers/oci/qsql_oci_p.h +++ b/src/plugins/sqldrivers/oci/qsql_oci_p.h @@ -75,8 +75,8 @@ class Q_EXPORT_SQLDRIVER_OCI QOCIDriver : public QSqlDriver friend class QOCIResultPrivate; public: - explicit QOCIDriver(QObject* parent = 0); - QOCIDriver(OCIEnv* env, OCISvcCtx* ctx, QObject* parent = 0); + explicit QOCIDriver(QObject *parent = nullptr); + QOCIDriver(OCIEnv *env, OCISvcCtx *ctx, QObject *parent = nullptr); ~QOCIDriver(); bool hasFeature(DriverFeature f) const; bool open(const QString &db, diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp index a58c782b60..5a00a000f7 100644 --- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp +++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp @@ -227,7 +227,7 @@ void QODBCResultPrivate::updateStmtHandleState() disconnectCount = drv_d_func() ? drv_d_func()->disconnectCount : 0; } -static QString qWarnODBCHandle(int handleType, SQLHANDLE handle, int *nativeCode = 0) +static QString qWarnODBCHandle(int handleType, SQLHANDLE handle, int *nativeCode = nullptr) { SQLINTEGER nativeCode_ = 0; SQLSMALLINT msgLen = 0; @@ -275,7 +275,7 @@ static QString qWarnODBCHandle(int handleType, SQLHANDLE handle, int *nativeCode } static QString qODBCWarn(const SQLHANDLE hStmt, const SQLHANDLE envHandle = 0, - const SQLHANDLE pDbC = 0, int *nativeCode = 0) + const SQLHANDLE pDbC = 0, int *nativeCode = nullptr) { QString result; if (envHandle) @@ -299,12 +299,12 @@ static QString qODBCWarn(const SQLHANDLE hStmt, const SQLHANDLE envHandle = 0, return result; } -static QString qODBCWarn(const QODBCResultPrivate* odbc, int *nativeCode = 0) +static QString qODBCWarn(const QODBCResultPrivate* odbc, int *nativeCode = nullptr) { return qODBCWarn(odbc->hStmt, odbc->dpEnv(), odbc->dpDbc(), nativeCode); } -static QString qODBCWarn(const QODBCDriverPrivate* odbc, int *nativeCode = 0) +static QString qODBCWarn(const QODBCDriverPrivate* odbc, int *nativeCode = nullptr) { return qODBCWarn(0, odbc->hEnv, odbc->hDbc, nativeCode); } diff --git a/src/plugins/styles/android/qandroidstyle.cpp b/src/plugins/styles/android/qandroidstyle.cpp index 8036655b04..d19e249cb4 100644 --- a/src/plugins/styles/android/qandroidstyle.cpp +++ b/src/plugins/styles/android/qandroidstyle.cpp @@ -1193,7 +1193,7 @@ QSize QAndroidStyle::AndroidStateDrawable::sizeImage(const QStyleOption *opt) co const QAndroidStyle::AndroidDrawable * QAndroidStyle::AndroidStateDrawable::bestAndroidStateMatch(const QStyleOption *opt) const { - const AndroidDrawable *bestMatch = 0; + const AndroidDrawable *bestMatch = nullptr; if (!opt) { if (m_states.size()) return m_states[0].second; diff --git a/src/plugins/styles/android/qandroidstyle_p.h b/src/plugins/styles/android/qandroidstyle_p.h index 5730bdfe2c..ca4b435046 100644 --- a/src/plugins/styles/android/qandroidstyle_p.h +++ b/src/plugins/styles/android/qandroidstyle_p.h @@ -257,10 +257,10 @@ public: virtual void drawControl(const QStyleOption *opt, QPainter *p, const QWidget *w); virtual QRect subElementRect(SubElement subElement, const QStyleOption *option, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; virtual QRect subControlRect(const QStyleOptionComplex *option, SubControl sc, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; virtual QSize sizeFromContents(const QStyleOption *opt, const QSize &contentsSize, const QWidget *w) const; @@ -294,7 +294,7 @@ public: virtual void drawControl(const QStyleOption *option, QPainter *p, const QWidget *w); virtual QRect subElementRect(SubElement subElement, const QStyleOption *option, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; QSize sizeFromContents(const QStyleOption *opt, const QSize &contentsSize, @@ -315,7 +315,7 @@ public: QSize sizeFromContents(const QStyleOption *opt, const QSize &contentsSize, const QWidget *w) const; QRect subControlRect(const QStyleOptionComplex *option, SubControl sc, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; private: AndroidDrawable *m_seekBarThumb; }; @@ -327,7 +327,7 @@ public: virtual ~AndroidSpinnerControl(){} virtual QRect subControlRect(const QStyleOptionComplex *option, SubControl sc, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; }; typedef QList<AndroidItemStateInfo *> AndroidItemStateInfoList; @@ -337,34 +337,34 @@ public: ~QAndroidStyle(); virtual void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const; + const QWidget *w = nullptr) const; virtual void drawControl(QStyle::ControlElement element, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const; + const QWidget *w = nullptr) const; virtual QRect subElementRect(SubElement subElement, const QStyleOption *option, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; virtual void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; virtual SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, - const QPoint &pt, const QWidget *widget = 0) const; + const QPoint &pt, const QWidget *widget = nullptr) const; virtual QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, - SubControl sc, const QWidget *widget = 0) const; + SubControl sc, const QWidget *widget = nullptr) const; - virtual int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, - const QWidget *widget = 0) const; + virtual int pixelMetric(PixelMetric metric, const QStyleOption *option = nullptr, + const QWidget *widget = nullptr) const; virtual QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, - const QSize &contentsSize, const QWidget *w = 0) const; + const QSize &contentsSize, const QWidget *w = nullptr) const; - virtual QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt = 0, - const QWidget *widget = 0) const; + virtual QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt = nullptr, + const QWidget *widget = nullptr) const; virtual QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const; - int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0, - QStyleHintReturn *returnData = 0) const; + int styleHint(StyleHint hint, const QStyleOption *option = nullptr, const QWidget *widget = nullptr, + QStyleHintReturn *returnData = nullptr) const; virtual QPalette standardPalette() const; void polish(QWidget *widget); diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index 904f94fc95..c0862001f4 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -1469,7 +1469,7 @@ QStyleHelper::WidgetSizePolicy QMacStylePrivate::aquaSizeConstrain(const QStyleO if (guess_size) ret = qt_aqua_guess_size(widg, large, small, mini); - QSize *sz = 0; + QSize *sz = nullptr; if (ret == QStyleHelper::SizeSmall) sz = &small; else if (ret == QStyleHelper::SizeLarge) @@ -6489,7 +6489,7 @@ bool QMacStyle::event(QEvent *e) { Q_D(QMacStyle); if(e->type() == QEvent::FocusIn) { - QWidget *f = 0; + QWidget *f = nullptr; QWidget *focusWidget = QApplication::focusWidget(); #if QT_CONFIG(graphicsview) if (QGraphicsView *graphicsView = qobject_cast<QGraphicsView *>(focusWidget)) { diff --git a/src/plugins/styles/mac/qmacstyle_mac_p.h b/src/plugins/styles/mac/qmacstyle_mac_p.h index 88f104cccf..d1d6bc6339 100644 --- a/src/plugins/styles/mac/qmacstyle_mac_p.h +++ b/src/plugins/styles/mac/qmacstyle_mac_p.h @@ -77,28 +77,28 @@ public: void polish(QPalette &pal); void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const; + const QWidget *w = nullptr) const; void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const; - QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const; + const QWidget *w = nullptr) const; + QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = nullptr) const; void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, - const QWidget *w = 0) const; + const QWidget *w = nullptr) const; SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, - const QPoint &pt, const QWidget *w = 0) const; + const QPoint &pt, const QWidget *w = nullptr) const; QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, - const QWidget *w = 0) const; + const QWidget *w = nullptr) const; QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, - const QSize &contentsSize, const QWidget *w = 0) const; + const QSize &contentsSize, const QWidget *w = nullptr) const; - int pixelMetric(PixelMetric pm, const QStyleOption *opt = 0, const QWidget *widget = 0) const; + int pixelMetric(PixelMetric pm, const QStyleOption *opt = 0, const QWidget *widget = nullptr) const; QPalette standardPalette() const; - virtual int styleHint(StyleHint sh, const QStyleOption *opt = 0, const QWidget *w = 0, - QStyleHintReturn *shret = 0) const; + virtual int styleHint(StyleHint sh, const QStyleOption *opt = 0, const QWidget *w = nullptr, + QStyleHintReturn *shret = nullptr) const; QPixmap standardPixmap(StandardPixmap sp, const QStyleOption *opt, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const; @@ -108,11 +108,11 @@ public: bool event(QEvent *e); - QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0, - const QWidget *widget = 0) const; + QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = nullptr, + const QWidget *widget = nullptr) const; int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, - Qt::Orientation orientation, const QStyleOption *option = 0, - const QWidget *widget = 0) const; + Qt::Orientation orientation, const QStyleOption *option = nullptr, + const QWidget *widget = nullptr) const; private: Q_DISABLE_COPY_MOVE(QMacStyle) diff --git a/src/testlib/qappletestlogger_p.h b/src/testlib/qappletestlogger_p.h index 62c6d95c5a..6075f9fccb 100644 --- a/src/testlib/qappletestlogger_p.h +++ b/src/testlib/qappletestlogger_p.h @@ -69,11 +69,11 @@ public: void leaveTestFunction() override; void addIncident(IncidentTypes type, const char *description, - const char *file = 0, int line = 0) override; + const char *file = nullptr, int line = 0) override; void addMessage(QtMsgType, const QMessageLogContext &, const QString &) override; void addMessage(MessageTypes type, const QString &message, - const char *file = 0, int line = 0) override; + const char *file = nullptr, int line = 0) override; void addBenchmarkResult(const QBenchmarkResult &result) override { Q_UNUSED(result); } diff --git a/src/testlib/qxctestlogger.mm b/src/testlib/qxctestlogger.mm index d9e56cf542..a40ee5e643 100644 --- a/src/testlib/qxctestlogger.mm +++ b/src/testlib/qxctestlogger.mm @@ -214,7 +214,7 @@ private: // --------------------------------------------------------- -static XCTestSuiteRun *s_qtTestSuiteRun = 0; +static XCTestSuiteRun *s_qtTestSuiteRun = nullptr; @implementation QtTestLibTests diff --git a/src/testlib/qxctestlogger_p.h b/src/testlib/qxctestlogger_p.h index 8baa5aa27f..bd844e28e4 100644 --- a/src/testlib/qxctestlogger_p.h +++ b/src/testlib/qxctestlogger_p.h @@ -74,10 +74,10 @@ public: void leaveTestFunction() override; void addIncident(IncidentTypes type, const char *description, - const char *file = 0, int line = 0) override; + const char *file = nullptr, int line = 0) override; void addMessage(MessageTypes type, const QString &message, - const char *file = 0, int line = 0) override; + const char *file = nullptr, int line = 0) override; void addBenchmarkResult(const QBenchmarkResult &result) override; diff --git a/src/tools/moc/util/generate_keywords.cpp b/src/tools/moc/util/generate_keywords.cpp index c2cfe37fab..28c5eeff38 100644 --- a/src/tools/moc/util/generate_keywords.cpp +++ b/src/tools/moc/util/generate_keywords.cpp @@ -301,7 +301,7 @@ struct State void newState(QList<State> &states, const char *token, const char *lexem, bool pre) { - const char * ident = 0; + const char *ident = nullptr; if (is_ident_start(*lexem)) ident = pre?"PP_CHARACTER" : "CHARACTER"; else if (*lexem == '#') @@ -311,7 +311,7 @@ void newState(QList<State> &states, const char *token, const char *lexem, bool p while (*lexem) { int next = states[state].next[(int)*lexem]; if (!next) { - const char * t = 0; + const char *t = nullptr; if (ident) t = ident; else @@ -324,7 +324,7 @@ void newState(QList<State> &states, const char *token, const char *lexem, bool p state = next; ++lexem; if (ident && !is_ident_char(*lexem)) - ident = 0; + ident = nullptr; } states[state].token = token; } diff --git a/src/tools/qlalr/examples/glsl/glsl-lex.l b/src/tools/qlalr/examples/glsl/glsl-lex.l index 2a9618edf8..c92aad296b 100644 --- a/src/tools/qlalr/examples/glsl/glsl-lex.l +++ b/src/tools/qlalr/examples/glsl/glsl-lex.l @@ -142,7 +142,7 @@ icst ({dec}|0{oct}*|0[xX]{hex}+) "lowp" { return LOW_PRECISION; } #[ \t]+[0-9]+.* { - char *eptr = 0; + char *eptr = nullptr; context.line = (int) strtod(&yytext[1], &eptr); QString fn = QString::fromUtf8(eptr).trimmed(); if (fn.length() > 2) diff --git a/src/widgets/doc/snippets/code/doc_src_qt4-styles.cpp b/src/widgets/doc/snippets/code/doc_src_qt4-styles.cpp index f550ee36ce..e288b66b86 100644 --- a/src/widgets/doc/snippets/code/doc_src_qt4-styles.cpp +++ b/src/widgets/doc/snippets/code/doc_src_qt4-styles.cpp @@ -88,5 +88,5 @@ void drawControl(ControlElement element, void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; //! [3] diff --git a/src/widgets/doc/snippets/graphicssceneadditem/graphicssceneadditemsnippet.cpp b/src/widgets/doc/snippets/graphicssceneadditem/graphicssceneadditemsnippet.cpp index 3d5c172dca..f928142e05 100644 --- a/src/widgets/doc/snippets/graphicssceneadditem/graphicssceneadditemsnippet.cpp +++ b/src/widgets/doc/snippets/graphicssceneadditem/graphicssceneadditemsnippet.cpp @@ -61,7 +61,7 @@ public: void drawItems(QPainter *painter, int numItems, QGraphicsItem *items[], const QStyleOptionGraphicsItem options[], - QWidget *widget = 0) override; + QWidget *widget = nullptr) override; }; //! [0] diff --git a/src/widgets/doc/snippets/qlistview-dnd/model.h b/src/widgets/doc/snippets/qlistview-dnd/model.h index 3d418dca14..3d723f9540 100644 --- a/src/widgets/doc/snippets/qlistview-dnd/model.h +++ b/src/widgets/doc/snippets/qlistview-dnd/model.h @@ -59,7 +59,7 @@ class DragDropListModel : public QStringListModel Q_OBJECT public: - DragDropListModel(const QStringList &strings, QObject *parent = 0); + DragDropListModel(const QStringList &strings, QObject *parent = nullptr); Qt::ItemFlags flags(const QModelIndex &index) const override; diff --git a/src/widgets/doc/snippets/qstackedwidget/main.cpp b/src/widgets/doc/snippets/qstackedwidget/main.cpp index c68a992332..6a0e78a40a 100644 --- a/src/widgets/doc/snippets/qstackedwidget/main.cpp +++ b/src/widgets/doc/snippets/qstackedwidget/main.cpp @@ -53,7 +53,7 @@ class Widget : public QWidget { public: - Widget(QWidget *parent = 0); + Widget(QWidget *parent = nullptr); }; Widget::Widget(QWidget *parent) diff --git a/src/widgets/doc/snippets/qstyleoption/main.cpp b/src/widgets/doc/snippets/qstyleoption/main.cpp index 529f88f1d9..7606efa1ae 100644 --- a/src/widgets/doc/snippets/qstyleoption/main.cpp +++ b/src/widgets/doc/snippets/qstyleoption/main.cpp @@ -54,7 +54,7 @@ class MyPushButton : public QPushButton { public: - MyPushButton(QWidget *parent = 0); + MyPushButton(QWidget *parent = nullptr); void paintEvent(QPaintEvent *) override; }; diff --git a/src/widgets/doc/snippets/qstyleplugin/main.cpp b/src/widgets/doc/snippets/qstyleplugin/main.cpp index 1c61581572..3a3a42be16 100644 --- a/src/widgets/doc/snippets/qstyleplugin/main.cpp +++ b/src/widgets/doc/snippets/qstyleplugin/main.cpp @@ -57,7 +57,7 @@ class MyStylePlugin : public QStylePlugin Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QStyleFactoryInterface" FILE "mystyleplugin.json") public: - MyStylePlugin(QObject *parent = 0); + MyStylePlugin(QObject *parent = nullptr); QStyle *create(const QString &key) override; }; diff --git a/src/widgets/doc/snippets/reading-selections/window.h b/src/widgets/doc/snippets/reading-selections/window.h index a3e6cd42b3..25bfac5e29 100644 --- a/src/widgets/doc/snippets/reading-selections/window.h +++ b/src/widgets/doc/snippets/reading-selections/window.h @@ -61,7 +61,7 @@ class MainWindow : public QMainWindow { Q_OBJECT public: - MainWindow(QWidget *parent = 0); + MainWindow(QWidget *parent = nullptr); private slots: void fillSelection(); diff --git a/src/widgets/doc/snippets/splitter/splitter.cpp b/src/widgets/doc/snippets/splitter/splitter.cpp index 0a86f5f759..e77eaf90d5 100644 --- a/src/widgets/doc/snippets/splitter/splitter.cpp +++ b/src/widgets/doc/snippets/splitter/splitter.cpp @@ -56,7 +56,7 @@ void processSize(int) int main() { - QWidget *parent = 0; + QWidget *parent = nullptr; //! [0] QSplitter *splitter = new QSplitter(parent); diff --git a/src/widgets/doc/snippets/splitterhandle/splitter.h b/src/widgets/doc/snippets/splitterhandle/splitter.h index 8df7bc14a2..5788871c95 100644 --- a/src/widgets/doc/snippets/splitterhandle/splitter.h +++ b/src/widgets/doc/snippets/splitterhandle/splitter.h @@ -61,7 +61,7 @@ class QPaintEvent; class Splitter : public QSplitter { public: - Splitter(Qt::Orientation orientation, QWidget *parent = 0); + Splitter(Qt::Orientation orientation, QWidget *parent = nullptr); protected: QSplitterHandle *createHandle() override; diff --git a/src/widgets/doc/snippets/updating-selections/window.h b/src/widgets/doc/snippets/updating-selections/window.h index 0fb9c7eba8..26d11a659e 100644 --- a/src/widgets/doc/snippets/updating-selections/window.h +++ b/src/widgets/doc/snippets/updating-selections/window.h @@ -61,7 +61,7 @@ class MainWindow : public QMainWindow { Q_OBJECT public: - MainWindow(QWidget *parent = 0); + MainWindow(QWidget *parent = nullptr); public slots: void updateSelection(const QItemSelection &selected, diff --git a/src/widgets/doc/src/modelview.qdoc b/src/widgets/doc/src/modelview.qdoc index d60a68c8da..d95e49d6cc 100644 --- a/src/widgets/doc/src/modelview.qdoc +++ b/src/widgets/doc/src/modelview.qdoc @@ -535,7 +535,7 @@ { Q_OBJECT public: - StarDelegate(QWidget *parent = 0); + StarDelegate(QWidget *parent = nullptr); void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; QSize sizeHint(const QStyleOptionViewItem &option, diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp index d8d0b61f43..43da7b7ade 100644 --- a/src/widgets/graphicsview/qgraphicsitem.cpp +++ b/src/widgets/graphicsview/qgraphicsitem.cpp @@ -5294,7 +5294,7 @@ void QGraphicsItem::setBoundingRegionGranularity(qreal granularity) /*! \fn virtual void QGraphicsItem::paint(QPainter *painter, const - QStyleOptionGraphicsItem *option, QWidget *widget = 0) = 0 + QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) = 0 This function, which is usually called by QGraphicsView, paints the contents of an item in local coordinates. diff --git a/src/widgets/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h index fe8be8eae7..7264c62b3c 100644 --- a/src/widgets/graphicsview/qgraphicsitem_p.h +++ b/src/widgets/graphicsview/qgraphicsitem_p.h @@ -82,8 +82,8 @@ public: QDeclarativeListProperty(QObject *o, QList<T *> &list) : object(o), data(&list), append(qlist_append), count(qlist_count), at(qlist_at), clear(qlist_clear), dummy1(nullptr), dummy2(nullptr) {} - QDeclarativeListProperty(QObject *o, void *d, AppendFunction a, CountFunction c = 0, AtFunction t = 0, - ClearFunction r = 0) + QDeclarativeListProperty(QObject *o, void *d, AppendFunction a, CountFunction c = nullptr, AtFunction t = nullptr, + ClearFunction r = nullptr) : object(o), data(d), append(a), count(c), at(t), clear(r), dummy1(nullptr), dummy2(nullptr) {} bool operator==(const QDeclarativeListProperty &o) const { diff --git a/src/widgets/graphicsview/qgraphicsscenelinearindex.cpp b/src/widgets/graphicsview/qgraphicsscenelinearindex.cpp index 06f9125612..85e524096c 100644 --- a/src/widgets/graphicsview/qgraphicsscenelinearindex.cpp +++ b/src/widgets/graphicsview/qgraphicsscenelinearindex.cpp @@ -54,7 +54,7 @@ #include <private/qgraphicsscenelinearindex_p.h> /*! - \fn QGraphicsSceneLinearIndex::QGraphicsSceneLinearIndex(QGraphicsScene *scene = 0): + \fn QGraphicsSceneLinearIndex::QGraphicsSceneLinearIndex(QGraphicsScene *scene = nullptr): Construct a linear index for the given \a scene. */ diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index fdfb54881a..87bca40468 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -358,7 +358,7 @@ int QApplicationPrivate::enabledAnimations = QPlatformTheme::GeneralUiEffect; bool QApplicationPrivate::widgetCount = false; #ifdef QT_KEYPAD_NAVIGATION Qt::NavigationMode QApplicationPrivate::navigationMode = Qt::NavigationModeKeypadTabOrder; -QWidget *QApplicationPrivate::oldEditFocus = 0; +QWidget *QApplicationPrivate::oldEditFocus = nullptr; #endif inline bool QApplicationPrivate::isAlien(QWidget *widget) diff --git a/src/widgets/kernel/qboxlayout.cpp b/src/widgets/kernel/qboxlayout.cpp index a23b89a8a5..b01227b8d5 100644 --- a/src/widgets/kernel/qboxlayout.cpp +++ b/src/widgets/kernel/qboxlayout.cpp @@ -149,8 +149,8 @@ void QBoxLayoutPrivate::effectiveMargins(int *left, int *top, int *right, int *b #ifdef Q_OS_MAC Q_Q(const QBoxLayout); if (horz(dir)) { - QBoxLayoutItem *leftBox = 0; - QBoxLayoutItem *rightBox = 0; + QBoxLayoutItem *leftBox = nullptr; + QBoxLayoutItem *rightBox = nullptr; if (left || right) { leftBox = list.value(0); @@ -194,8 +194,8 @@ void QBoxLayoutPrivate::effectiveMargins(int *left, int *top, int *right, int *b } } } else { // vertical layout - QBoxLayoutItem *topBox = 0; - QBoxLayoutItem *bottomBox = 0; + QBoxLayoutItem *topBox = nullptr; + QBoxLayoutItem *bottomBox = nullptr; if (top || bottom) { topBox = list.value(0); diff --git a/src/widgets/kernel/qgridlayout.cpp b/src/widgets/kernel/qgridlayout.cpp index 51797b0cf1..339677378f 100644 --- a/src/widgets/kernel/qgridlayout.cpp +++ b/src/widgets/kernel/qgridlayout.cpp @@ -253,7 +253,7 @@ void QGridLayoutPrivate::effectiveMargins(int *left, int *top, int *right, int * int rightMost = 0; int bottomMost = 0; - QWidget *w = 0; + QWidget *w = nullptr; const int n = things.count(); for (int i = 0; i < n; ++i) { QGridBox *box = things.at(i); diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp index d327bca5fe..239d873649 100644 --- a/src/widgets/styles/qstyle.cpp +++ b/src/widgets/styles/qstyle.cpp @@ -2317,8 +2317,8 @@ QPalette QStyle::standardPalette() const /*! \since 4.1 - \fn QIcon QStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0, - const QWidget *widget = 0) const = 0; + \fn QIcon QStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option = nullptr, + const QWidget *widget = nullptr) const = 0; Returns an icon for the given \a standardIcon. diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index a03de6e7f2..7f7bcefb7a 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -2516,7 +2516,7 @@ bool QComboBoxPrivate::showNativePopup() int itemsCount = q->count(); m_platformMenu->setTag(quintptr(itemsCount)); - QPlatformMenuItem *currentItem = 0; + QPlatformMenuItem *currentItem = nullptr; int currentIndex = q->currentIndex(); for (int i = 0; i < itemsCount; ++i) { diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index 6f5f345a40..548078098c 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -295,7 +295,7 @@ bool QDockWidgetLayout::wmSupportsNativeWindowDeco() */ bool QDockWidgetLayout::nativeWindowDeco(bool floating) const { - return wmSupportsNativeWindowDeco() && floating && item_list.at(QDockWidgetLayout::TitleBar) == 0; + return wmSupportsNativeWindowDeco() && floating && item_list.at(QDockWidgetLayout::TitleBar) == nullptr; } @@ -919,7 +919,7 @@ bool QDockWidgetPrivate::mousePressEvent(QMouseEvent *event) // check if the tool window is movable... do nothing if it // is not (but allow moving if the window is floating) (!hasFeature(this, QDockWidget::DockWidgetMovable) && !q->isFloating()) || - (qobject_cast<QMainWindow*>(parent) == 0 && !floatingTab) || + (qobject_cast<QMainWindow*>(parent) == nullptr && !floatingTab) || isAnimating() || state != nullptr) { return false; } @@ -1032,7 +1032,7 @@ void QDockWidgetPrivate::nonClientAreaMouseEvent(QMouseEvent *event) break; if (state != nullptr) break; - if (qobject_cast<QMainWindow*>(parent) == 0 && qobject_cast<QDockWidgetGroupWindow*>(parent) == 0) + if (qobject_cast<QMainWindow*>(parent) == nullptr && qobject_cast<QDockWidgetGroupWindow*>(parent) == nullptr) break; if (isAnimating()) break; @@ -1083,7 +1083,7 @@ void QDockWidgetPrivate::moveEvent(QMoveEvent *event) if (state == nullptr || !state->dragging || !state->nca) return; - if (!q->isWindow() && qobject_cast<QDockWidgetGroupWindow*>(parent) == 0) + if (!q->isWindow() && qobject_cast<QDockWidgetGroupWindow*>(parent) == nullptr) return; // When the native window frame is being dragged, all we get is these mouse diff --git a/src/widgets/widgets/qlcdnumber.cpp b/src/widgets/widgets/qlcdnumber.cpp index 4d299d8739..929b57a1e1 100644 --- a/src/widgets/widgets/qlcdnumber.cpp +++ b/src/widgets/widgets/qlcdnumber.cpp @@ -52,7 +52,7 @@ public: void init(); void internalSetString(const QString& s); void drawString(const QString& s, QPainter &, QBitArray * = nullptr, bool = true); - //void drawString(const QString &, QPainter &, QBitArray * = 0) const; + //void drawString(const QString &, QPainter &, QBitArray * = nullptr) const; void drawDigit(const QPoint &, QPainter &, int, char, char = ' '); void drawSegment(const QPoint &, char, QPainter &, int, bool = false); diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index 76d9a33e06..95ee90eb31 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -646,7 +646,7 @@ QSize QMainWindowLayoutState::sizeHint() const #if QT_CONFIG(dockwidget) result = dockAreaLayout.sizeHint(); #else - if (centralWidgetItem != 0) + if (centralWidgetItem) result = centralWidgetItem->sizeHint(); #endif @@ -664,7 +664,7 @@ QSize QMainWindowLayoutState::minimumSize() const #if QT_CONFIG(dockwidget) result = dockAreaLayout.minimumSize(); #else - if (centralWidgetItem != 0) + if (centralWidgetItem) result = centralWidgetItem->minimumSize(); #endif @@ -685,9 +685,9 @@ void QMainWindowLayoutState::apply(bool animated) // dumpLayout(dockAreaLayout, QString()); dockAreaLayout.apply(animated); #else - if (centralWidgetItem != 0) { + if (centralWidgetItem) { QMainWindowLayout *layout = qt_mainwindow_layout(mainWindow); - Q_ASSERT(layout != 0); + Q_ASSERT(layout); layout->widgetAnimator.animate(centralWidgetItem->widget(), centralWidgetRect, animated); } #endif @@ -744,7 +744,7 @@ QLayoutItem *QMainWindowLayoutState::itemAt(int index, int *x) const if (QLayoutItem *ret = dockAreaLayout.itemAt(x, index)) return ret; #else - if (centralWidgetItem != 0 && (*x)++ == index) + if (centralWidgetItem && (*x)++ == index) return centralWidgetItem; #endif @@ -762,9 +762,9 @@ QLayoutItem *QMainWindowLayoutState::takeAt(int index, int *x) if (QLayoutItem *ret = dockAreaLayout.takeAt(x, index)) return ret; #else - if (centralWidgetItem != 0 && (*x)++ == index) { + if (centralWidgetItem && (*x)++ == index) { QLayoutItem *ret = centralWidgetItem; - centralWidgetItem = 0; + centralWidgetItem = nullptr; return ret; } #endif @@ -807,7 +807,7 @@ bool QMainWindowLayoutState::contains(QWidget *widget) const if (!dockAreaLayout.indexOf(widget).isEmpty()) return true; #else - if (centralWidgetItem != 0 && centralWidgetItem->widget() == widget) + if (centralWidgetItem && centralWidgetItem->widget() == widget) return true; #endif @@ -856,7 +856,7 @@ QList<int> QMainWindowLayoutState::gapIndex(QWidget *widget, #if QT_CONFIG(toolbar) // is it a toolbar? - if (qobject_cast<QToolBar*>(widget) != 0) { + if (qobject_cast<QToolBar*>(widget) != nullptr) { result = toolBarAreaLayout.gapIndex(pos); if (!result.isEmpty()) result.prepend(0); @@ -866,7 +866,7 @@ QList<int> QMainWindowLayoutState::gapIndex(QWidget *widget, #if QT_CONFIG(dockwidget) // is it a dock widget? - if (qobject_cast<QDockWidget *>(widget) != 0 + if (qobject_cast<QDockWidget *>(widget) != nullptr || qobject_cast<QDockWidgetGroupWindow *>(widget)) { bool disallowTabs = false; #if QT_CONFIG(tabbar) @@ -894,7 +894,7 @@ bool QMainWindowLayoutState::insertGap(const QList<int> &path, QLayoutItem *item #if QT_CONFIG(toolbar) if (i == 0) { - Q_ASSERT(qobject_cast<QToolBar*>(item->widget()) != 0); + Q_ASSERT(qobject_cast<QToolBar*>(item->widget()) != nullptr); return toolBarAreaLayout.insertGap(path.mid(1), item); } #endif @@ -2155,7 +2155,7 @@ bool QMainWindowLayout::plug(QLayoutItem *widgetItem) QRect globalRect = currentGapRect; globalRect.moveTopLeft(parentWidget()->mapToGlobal(globalRect.topLeft())); #if QT_CONFIG(dockwidget) - if (qobject_cast<QDockWidget*>(widget) != 0) { + if (qobject_cast<QDockWidget*>(widget) != nullptr) { QDockWidgetLayout *layout = qobject_cast<QDockWidgetLayout*>(widget->layout()); if (layout->nativeWindowDeco()) { globalRect.adjust(0, layout->titleHeight(), 0, 0); @@ -2262,7 +2262,7 @@ void QMainWindowLayout::animationFinished(QWidget *widget) #if QT_CONFIG(dockwidget) #if QT_CONFIG(tabbar) - if (qobject_cast<QDockWidget*>(widget) != 0) { + if (qobject_cast<QDockWidget*>(widget) != nullptr) { // info() might return null if the widget is destroyed while // animating but before the animationFinished signal is received. if (QDockAreaLayoutInfo *info = dockInfo(widget)) diff --git a/tests/auto/cmake/test(needsquoting)dirname/mywidget.h b/tests/auto/cmake/test(needsquoting)dirname/mywidget.h index 5f3d59b7c0..dfa65a8503 100644 --- a/tests/auto/cmake/test(needsquoting)dirname/mywidget.h +++ b/tests/auto/cmake/test(needsquoting)dirname/mywidget.h @@ -40,7 +40,7 @@ class MyWidget : public QWidget { Q_OBJECT public: - MyWidget(QWidget *parent = 0); + MyWidget(QWidget *parent = nullptr); signals: void someSignal(); diff --git a/tests/auto/cmake/test_QFINDTESTDATA/tests/main.cpp b/tests/auto/cmake/test_QFINDTESTDATA/tests/main.cpp index 4e73598200..56996814c2 100644 --- a/tests/auto/cmake/test_QFINDTESTDATA/tests/main.cpp +++ b/tests/auto/cmake/test_QFINDTESTDATA/tests/main.cpp @@ -33,7 +33,7 @@ class TestClass : public QObject { Q_OBJECT public: - TestClass(QObject* parent = 0) {} + TestClass(QObject* parent = nullptr) {} private slots: void doTest(); diff --git a/tests/auto/cmake/test_add_big_resource/myobject.h b/tests/auto/cmake/test_add_big_resource/myobject.h index b6fbce32cd..c5b32c680d 100644 --- a/tests/auto/cmake/test_add_big_resource/myobject.h +++ b/tests/auto/cmake/test_add_big_resource/myobject.h @@ -35,7 +35,7 @@ class MyObject : public QObject { Q_OBJECT public: - MyObject(QObject *parent = 0); + MyObject(QObject *parent = nullptr); signals: void someSignal(); diff --git a/tests/auto/cmake/test_add_resource_options/myobject.h b/tests/auto/cmake/test_add_resource_options/myobject.h index b6fbce32cd..c5b32c680d 100644 --- a/tests/auto/cmake/test_add_resource_options/myobject.h +++ b/tests/auto/cmake/test_add_resource_options/myobject.h @@ -35,7 +35,7 @@ class MyObject : public QObject { Q_OBJECT public: - MyObject(QObject *parent = 0); + MyObject(QObject *parent = nullptr); signals: void someSignal(); diff --git a/tests/auto/cmake/test_dbus_module/mydbusobject.h b/tests/auto/cmake/test_dbus_module/mydbusobject.h index cc6b5626de..5a2c69cdae 100644 --- a/tests/auto/cmake/test_dbus_module/mydbusobject.h +++ b/tests/auto/cmake/test_dbus_module/mydbusobject.h @@ -36,7 +36,7 @@ class MyDBusObject : public QObject Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.qtProject.Tests.MyDBusObject") public: - MyDBusObject(QObject *parent = 0); + MyDBusObject(QObject *parent = nullptr); signals: void someSignal(); diff --git a/tests/auto/cmake/test_dependent_modules/mywidget.h b/tests/auto/cmake/test_dependent_modules/mywidget.h index 5f3d59b7c0..dfa65a8503 100644 --- a/tests/auto/cmake/test_dependent_modules/mywidget.h +++ b/tests/auto/cmake/test_dependent_modules/mywidget.h @@ -40,7 +40,7 @@ class MyWidget : public QWidget { Q_OBJECT public: - MyWidget(QWidget *parent = 0); + MyWidget(QWidget *parent = nullptr); signals: void someSignal(); diff --git a/tests/auto/cmake/test_interface/mainwindow.h b/tests/auto/cmake/test_interface/mainwindow.h index 246ab47d16..2dd52efd01 100644 --- a/tests/auto/cmake/test_interface/mainwindow.h +++ b/tests/auto/cmake/test_interface/mainwindow.h @@ -35,7 +35,7 @@ class MainWindow : public QWidget { Q_OBJECT public: - MainWindow(QWidget *parent = 0); + MainWindow(QWidget *parent = nullptr); signals: void somethingHappened(); diff --git a/tests/auto/cmake/test_interface_link_libraries/somelib.h b/tests/auto/cmake/test_interface_link_libraries/somelib.h index 0a9d6a8394..9cad2931af 100644 --- a/tests/auto/cmake/test_interface_link_libraries/somelib.h +++ b/tests/auto/cmake/test_interface_link_libraries/somelib.h @@ -37,7 +37,7 @@ class SOMELIB_EXPORT SomeObject : QTextDocument { Q_OBJECT public: - explicit SomeObject(QObject *parent = 0); + explicit SomeObject(QObject *parent = nullptr); int value(); }; diff --git a/tests/auto/cmake/test_json_plugin_includes/plugin.h b/tests/auto/cmake/test_json_plugin_includes/plugin.h index 3fdb5aeb64..79ec252734 100644 --- a/tests/auto/cmake/test_json_plugin_includes/plugin.h +++ b/tests/auto/cmake/test_json_plugin_includes/plugin.h @@ -36,7 +36,7 @@ class JsonTestPlugin : public QObject Q_OBJECT Q_PLUGIN_METADATA(IID "JsonTestPlugin" FILE "jsontestplugin.json") public: - JsonTestPlugin(QObject *parent = 0); + JsonTestPlugin(QObject *parent = nullptr); }; #endif diff --git a/tests/auto/cmake/test_moc_macro_target/main_gen_test.cpp b/tests/auto/cmake/test_moc_macro_target/main_gen_test.cpp index ca4134608a..3e6c4acd4e 100644 --- a/tests/auto/cmake/test_moc_macro_target/main_gen_test.cpp +++ b/tests/auto/cmake/test_moc_macro_target/main_gen_test.cpp @@ -35,7 +35,7 @@ class MyObject : public QObject, MyInterface Q_OBJECT Q_INTERFACES(MyInterface) public: - explicit MyObject(QObject *parent = 0) : QObject(parent) { } + explicit MyObject(QObject *parent = nullptr) : QObject(parent) { } }; int main(int argc, char **argv) diff --git a/tests/auto/cmake/test_moc_macro_target/mywrapobject.h b/tests/auto/cmake/test_moc_macro_target/mywrapobject.h index adc7551120..a4be007110 100644 --- a/tests/auto/cmake/test_moc_macro_target/mywrapobject.h +++ b/tests/auto/cmake/test_moc_macro_target/mywrapobject.h @@ -38,7 +38,7 @@ class MyWrapObject : public QObject, MyInterface Q_OBJECT Q_INTERFACES(MyInterface) public: - explicit MyWrapObject(QObject *parent = 0) : QObject(parent) { } + explicit MyWrapObject(QObject *parent = nullptr) : QObject(parent) { } }; #endif diff --git a/tests/auto/cmake/test_qtmainwin_library/myobject.h b/tests/auto/cmake/test_qtmainwin_library/myobject.h index f916675817..df0e377a60 100644 --- a/tests/auto/cmake/test_qtmainwin_library/myobject.h +++ b/tests/auto/cmake/test_qtmainwin_library/myobject.h @@ -35,7 +35,7 @@ class MyObject : public QObject { Q_OBJECT public: - MyObject(QObject *parent = 0); + MyObject(QObject *parent = nullptr); signals: void someSignal(); diff --git a/tests/auto/cmake/test_testlib_definitions/main.cpp b/tests/auto/cmake/test_testlib_definitions/main.cpp index 1ba9f2fc3b..45dd97f3c5 100644 --- a/tests/auto/cmake/test_testlib_definitions/main.cpp +++ b/tests/auto/cmake/test_testlib_definitions/main.cpp @@ -33,7 +33,7 @@ class TestObject : public QObject { Q_OBJECT public: - TestObject(QObject *parent = 0) + TestObject(QObject *parent = nullptr) : QObject(parent) { diff --git a/tests/auto/cmake/test_wrap_cpp_and_resources/myobject.h b/tests/auto/cmake/test_wrap_cpp_and_resources/myobject.h index b6fbce32cd..c5b32c680d 100644 --- a/tests/auto/cmake/test_wrap_cpp_and_resources/myobject.h +++ b/tests/auto/cmake/test_wrap_cpp_and_resources/myobject.h @@ -35,7 +35,7 @@ class MyObject : public QObject { Q_OBJECT public: - MyObject(QObject *parent = 0); + MyObject(QObject *parent = nullptr); signals: void someSignal(); diff --git a/tests/auto/cmake/test_wrap_cpp_options/myobject.h b/tests/auto/cmake/test_wrap_cpp_options/myobject.h index b6fbce32cd..c5b32c680d 100644 --- a/tests/auto/cmake/test_wrap_cpp_options/myobject.h +++ b/tests/auto/cmake/test_wrap_cpp_options/myobject.h @@ -35,7 +35,7 @@ class MyObject : public QObject { Q_OBJECT public: - MyObject(QObject *parent = 0); + MyObject(QObject *parent = nullptr); signals: void someSignal(); diff --git a/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp b/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp index a39488fd62..6825be19e6 100644 --- a/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp +++ b/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp @@ -415,7 +415,7 @@ void tst_QtConcurrentThreadEngine::cancelQueuedSlowUser() class QtConcurrentExceptionThrower : public ThreadEngine<void> { public: - QtConcurrentExceptionThrower(QThread *blockThread = 0) + QtConcurrentExceptionThrower(QThread *blockThread = nullptr) : ThreadEngine(QThreadPool::globalInstance()) { this->blockThread = blockThread; @@ -433,7 +433,7 @@ public: class UnrelatedExceptionThrower : public ThreadEngine<void> { public: - UnrelatedExceptionThrower(QThread *blockThread = 0) + UnrelatedExceptionThrower(QThread *blockThread = nullptr) : ThreadEngine(QThreadPool::globalInstance()) { this->blockThread = blockThread; diff --git a/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp index cf46d5c14e..fd1e288b4d 100644 --- a/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp +++ b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp @@ -92,7 +92,7 @@ class UncontrolledAnimation : public QPropertyAnimation { Q_OBJECT public: - UncontrolledAnimation(QObject *target, const QByteArray &propertyName, QObject *parent = 0) + UncontrolledAnimation(QObject *target, const QByteArray &propertyName, QObject *parent = nullptr) : QPropertyAnimation(target, propertyName, parent), id(0) { setDuration(250); diff --git a/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp b/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp index fa30659d89..dab7a8cd6f 100644 --- a/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp +++ b/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp @@ -127,7 +127,7 @@ class UncontrolledAnimation : public QPropertyAnimation { Q_OBJECT public: - UncontrolledAnimation(QObject *target, const QByteArray &propertyName, QObject *parent = 0) + UncontrolledAnimation(QObject *target, const QByteArray &propertyName, QObject *parent = nullptr) : QPropertyAnimation(target, propertyName, parent), id(0) { setDuration(250); diff --git a/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp b/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp index a38f3d221d..5f2923f498 100644 --- a/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp +++ b/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp @@ -56,7 +56,7 @@ class TestablePauseAnimation : public QPauseAnimation { Q_OBJECT public: - TestablePauseAnimation(QObject *parent = 0) + TestablePauseAnimation(QObject *parent = nullptr) : QPauseAnimation(parent), m_updateCurrentTimeCount(0) { diff --git a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp index 8a4d05ed96..f5cff8a2e0 100644 --- a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp +++ b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp @@ -65,7 +65,7 @@ private: class DummyPropertyAnimation : public QPropertyAnimation { public: - DummyPropertyAnimation(QObject *parent = 0) : QPropertyAnimation(parent) + DummyPropertyAnimation(QObject *parent = nullptr) : QPropertyAnimation(parent) { setTargetObject(&o); this->setPropertyName("x"); diff --git a/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp index 008ac696fc..1a03254e0b 100644 --- a/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp +++ b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp @@ -108,7 +108,7 @@ public: class DummyPropertyAnimation : public QPropertyAnimation { public: - DummyPropertyAnimation(QObject *parent = 0) : QPropertyAnimation(parent) + DummyPropertyAnimation(QObject *parent = nullptr) : QPropertyAnimation(parent) { setTargetObject(&o); this->setPropertyName("value"); @@ -122,7 +122,7 @@ class UncontrolledAnimation : public QPropertyAnimation { Q_OBJECT public: - UncontrolledAnimation(QObject *target, QObject *parent = 0) + UncontrolledAnimation(QObject *target, QObject *parent = nullptr) : QPropertyAnimation(target, "value", parent) { setDuration(250); diff --git a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp index 4f07581587..72d0960473 100644 --- a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp +++ b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp @@ -722,7 +722,7 @@ public: SignalReceiver(const QDir &moveSrcDir, const QString &moveDestination, QFileSystemWatcher *watcher, - QObject *parent = 0) + QObject *parent = nullptr) : QObject(parent), added(false), moveSrcDir(moveSrcDir), diff --git a/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp b/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp index cc73eac9c8..e45c13b9b9 100644 --- a/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp +++ b/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp @@ -820,7 +820,7 @@ private slots: { _config->clear(); _config->addKey("LoggingCategoryObject", true); - QLoggingCategory *pcategorybject = 0; + QLoggingCategory *pcategorybject = nullptr; QLoggingCategory::setFilterRules(_config->array()); { QLoggingCategory mycategoryobject("LoggingCategoryObject"); diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp index 5d384de2b2..bf44cf5fa0 100644 --- a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp +++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp @@ -132,8 +132,8 @@ private: class QtTestModel: public QAbstractItemModel { public: - QtTestModel(int rows, int columns, QObject *parent = 0); - QtTestModel(const QList<QList<QString> > tbl, QObject *parent = 0); + QtTestModel(int rows, int columns, QObject *parent = nullptr); + QtTestModel(const QList<QList<QString> > tbl, QObject *parent = nullptr); QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; QModelIndex parent(const QModelIndex &) const override; int rowCount(const QModelIndex &parent) const override; @@ -1940,7 +1940,7 @@ public: UserRole }; - CustomRoleModel(QObject *parent = 0) + CustomRoleModel(QObject *parent = nullptr) : QStringListModel(QStringList() << "a" << "b" << "c", parent) { } @@ -1991,7 +1991,7 @@ class SignalArgumentChecker : public QObject { Q_OBJECT public: - SignalArgumentChecker(const QModelIndex &p1, const QModelIndex &p2, QObject *parent = 0) + SignalArgumentChecker(const QModelIndex &p1, const QModelIndex &p2, QObject *parent = nullptr) : QObject(parent), m_p1(p1), m_p2(p2), m_p1Persistent(p1), m_p2Persistent(p2) { connect(p1.model(), SIGNAL(layoutAboutToBeChanged(QList<QPersistentModelIndex>)), SLOT(layoutAboutToBeChanged(QList<QPersistentModelIndex>))); @@ -2165,7 +2165,7 @@ class OverrideRoleNamesAndDragActions : public QStringListModel { Q_OBJECT public: - OverrideRoleNamesAndDragActions(QObject *parent = 0) + OverrideRoleNamesAndDragActions(QObject *parent = nullptr) : QStringListModel(parent) { @@ -2204,7 +2204,7 @@ class OverrideDropActions : public QStringListModel { Q_OBJECT public: - OverrideDropActions(QObject *parent = 0) + OverrideDropActions(QObject *parent = nullptr) : QStringListModel(parent) { } @@ -2225,7 +2225,7 @@ class SignalConnectionTester : public QObject { Q_OBJECT public: - SignalConnectionTester(QObject *parent = 0) + SignalConnectionTester(QObject *parent = nullptr) : QObject(parent), testPassed(false) { diff --git a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp index 313facac81..92f9c87b9f 100644 --- a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp +++ b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp @@ -2092,7 +2092,7 @@ class QtTestTableModel: public QAbstractTableModel { Q_OBJECT public: - QtTestTableModel(int rows = 0, int columns = 0, QObject *parent = 0) + QtTestTableModel(int rows = 0, int columns = 0, QObject *parent = nullptr) : QAbstractTableModel(parent) , row_count(rows) , column_count(columns) @@ -2624,7 +2624,7 @@ class SelectionObserver : public QObject { Q_OBJECT public: - SelectionObserver(QAbstractItemModel *model, QObject *parent = 0) + SelectionObserver(QAbstractItemModel *model, QObject *parent = nullptr) : QObject(parent), m_model(model), m_selectionModel(0) { connect(model, SIGNAL(modelReset()), SLOT(modelReset())); @@ -2688,7 +2688,7 @@ class DuplicateItemSelectionModel : public QItemSelectionModel { Q_OBJECT public: - DuplicateItemSelectionModel(QItemSelectionModel *target, QAbstractItemModel *model, QObject *parent = 0) + DuplicateItemSelectionModel(QItemSelectionModel *target, QAbstractItemModel *model, QObject *parent = nullptr) : QItemSelectionModel(model, parent), m_target(target) { } diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/tst_qsortfilterproxymodel_recursive.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/tst_qsortfilterproxymodel_recursive.cpp index 35ae7f4a7f..d6a09056ae 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/tst_qsortfilterproxymodel_recursive.cpp +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/tst_qsortfilterproxymodel_recursive.cpp @@ -142,7 +142,7 @@ static QString treeAsString(const QAbstractItemModel &model, const QModelIndex & static void fillModel(QStandardItemModel &model, const QString &str) { QCOMPARE(str.count('['), str.count(']')); - QStandardItem *item = 0; + QStandardItem *item = nullptr; QString data; for ( int i = 0 ; i < str.length() ; ++i ) { const QChar ch = str.at(i); diff --git a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp index 8b3d0503df..3b87f8fabf 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp +++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp @@ -824,13 +824,13 @@ class JobObject : public QObject Q_OBJECT public: - explicit JobObject(QEventLoop *loop, QObject *parent = 0) + explicit JobObject(QEventLoop *loop, QObject *parent = nullptr) : QObject(parent), locker(loop) { QTimer::singleShot(1000, this, SLOT(timeout())); } - explicit JobObject(QObject *parent = 0) + explicit JobObject(QObject *parent = nullptr) : QObject(parent) { QTimer::singleShot(1000, this, SLOT(timeout())); @@ -860,7 +860,7 @@ class QuitTester : public QObject { Q_OBJECT public: - QuitTester(QObject *parent = 0) + QuitTester(QObject *parent = nullptr) : QObject(parent) { QTimer::singleShot(0, this, SLOT(doTest())); diff --git a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp index 3765b6fbf8..9d1153fe47 100644 --- a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp +++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp @@ -86,7 +86,7 @@ void EventLoopThread::run() emit checkPoint(); (void) eventLoop->exec(); delete eventLoop; - eventLoop = 0; + eventLoop = nullptr; } class MultipleExecThread : public QThread @@ -126,7 +126,7 @@ public: class StartStopEvent: public QEvent { public: - explicit StartStopEvent(int type, QEventLoop *loop = 0) + explicit StartStopEvent(int type, QEventLoop *loop = nullptr) : QEvent(Type(type)), el(loop) { } @@ -602,12 +602,12 @@ class JobObject : public QObject Q_OBJECT public: - explicit JobObject(QEventLoop *loop, QObject *parent = 0) + explicit JobObject(QEventLoop *loop, QObject *parent = nullptr) : QObject(parent), locker(loop) { } - explicit JobObject(QObject *parent = 0) + explicit JobObject(QObject *parent = nullptr) : QObject(parent) { } diff --git a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp index fde1255443..c073e2d77f 100644 --- a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp +++ b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp @@ -90,7 +90,7 @@ namespace MyNamespace { MyFlags myFlags() const { return m_flags; } void setMyFlags(MyFlags val) { m_flags = val; } - MyClass(QObject *parent = 0) + MyClass(QObject *parent = nullptr) : QObject(parent), m_enum(MyEnum1), m_flags(MyFlag1|MyFlag2) @@ -139,7 +139,7 @@ namespace MyNamespace { MyFlags myFlags() const { return m_flags; } void setMyFlags(MyFlags val) { m_flags = val; } - MyClass2(QObject *parent = 0) + MyClass2(QObject *parent = nullptr) : QObject(parent), m_enum(MyEnum1), m_flags(MyFlag1|MyFlag2) @@ -699,24 +699,24 @@ void tst_QMetaObject::invokeMetaMember() QCOMPARE(exp, QString("yessir")); QCOMPARE(obj.slotResult, QString("sl1:bubu")); - QObject *ptr = 0; + QObject *ptr = nullptr; QVERIFY(QMetaObject::invokeMethod(&obj, "sl11", Q_RETURN_ARG(QObject*,ptr))); QCOMPARE(ptr, (QObject *)&obj); QCOMPARE(obj.slotResult, QString("sl11")); // try again with a space: - ptr = 0; + ptr = nullptr; QVERIFY(QMetaObject::invokeMethod(&obj, "sl11", Q_RETURN_ARG(QObject * , ptr))); QCOMPARE(ptr, (QObject *)&obj); QCOMPARE(obj.slotResult, QString("sl11")); - const char *ptr2 = 0; + const char *ptr2 = nullptr; QVERIFY(QMetaObject::invokeMethod(&obj, "sl12", Q_RETURN_ARG(const char*, ptr2))); - QVERIFY(ptr2 != 0); + QVERIFY(ptr2 != nullptr); QCOMPARE(obj.slotResult, QString("sl12")); // try again with a space: - ptr2 = 0; + ptr2 = nullptr; QVERIFY(QMetaObject::invokeMethod(&obj, "sl12", Q_RETURN_ARG(char const * , ptr2))); - QVERIFY(ptr2 != 0); + QVERIFY(ptr2 != nullptr); QCOMPARE(obj.slotResult, QString("sl12")); // test w/ template args @@ -1022,12 +1022,12 @@ void tst_QMetaObject::invokeBlockingQueuedMetaMember() QCOMPARE(exp, QString("yessir")); QCOMPARE(obj.slotResult, QString("sl1:bubu")); - QObject *ptr = 0; + QObject *ptr = nullptr; QVERIFY(QMetaObject::invokeMethod(&obj, "sl11", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QObject*,ptr))); QCOMPARE(ptr, (QObject *)&obj); QCOMPARE(obj.slotResult, QString("sl11")); // try again with a space: - ptr = 0; + ptr = nullptr; QVERIFY(QMetaObject::invokeMethod(&obj, "sl11", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QObject * , ptr))); QCOMPARE(ptr, (QObject *)&obj); QCOMPARE(obj.slotResult, QString("sl11")); @@ -1218,7 +1218,7 @@ class ConstructibleClass : public QObject { Q_OBJECT public: - Q_INVOKABLE ConstructibleClass(QObject *parent = 0) + Q_INVOKABLE ConstructibleClass(QObject *parent = nullptr) : QObject(parent) {} }; diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp index 333c7931d9..2a26f5c4c2 100644 --- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp +++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp @@ -1350,7 +1350,7 @@ private: //Q_PROPERTY(int intProp READ intProp WRITE setIntProp NOTIFY intPropChanged) public: - TestObject(QObject *parent = 0); // Q_INVOKABLE + TestObject(QObject *parent = nullptr); // Q_INVOKABLE ~TestObject(); // Property accessors diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp index ca215386fb..f116684f5b 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -367,7 +367,7 @@ class CustomQObject : public QObject { Q_OBJECT public: - CustomQObject(QObject *parent = 0) + CustomQObject(QObject *parent = nullptr) : QObject(parent) { } @@ -1017,7 +1017,7 @@ class CustomObject : public QObject { Q_OBJECT public: - CustomObject(QObject *parent = 0) + CustomObject(QObject *parent = nullptr) : QObject(parent) { @@ -1031,7 +1031,7 @@ class CustomMultiInheritanceObject : public QObject, SecondBase { Q_OBJECT public: - CustomMultiInheritanceObject(QObject *parent = 0) + CustomMultiInheritanceObject(QObject *parent = nullptr) : QObject(parent) { @@ -1605,7 +1605,7 @@ class AutoMetaTypeObject : public QObject Q_PROPERTY(IntIntHash someHash READ someHash CONSTANT) Q_PROPERTY(NaturalNumber someInt READ someInt CONSTANT) public: - AutoMetaTypeObject(QObject *parent = 0) + AutoMetaTypeObject(QObject *parent = nullptr) : QObject(parent), m_int(42) { m_hash.insert(4, 2); @@ -1630,7 +1630,7 @@ class MyObject : public QObject { Q_OBJECT public: - MyObject(QObject *parent = 0) + MyObject(QObject *parent = nullptr) : QObject(parent) { } @@ -1781,7 +1781,7 @@ void tst_QMetaType::automaticTemplateRegistration() { typedef std::map<int, CustomObject*> StdMapIntCustomObject ; StdMapIntCustomObject intComparableMap; - CustomObject *o = 0; + CustomObject *o = nullptr; intComparableMap[4] = o; QCOMPARE(QVariant::fromValue(intComparableMap).value<StdMapIntCustomObject >()[4], o); } @@ -1822,7 +1822,7 @@ void tst_QMetaType::automaticTemplateRegistration() } { typedef std::pair<int, CustomQObject*> StdIntComparablePair; - CustomQObject* o = 0; + CustomQObject *o = nullptr; StdIntComparablePair intComparablePair = std::make_pair(4, o); QCOMPARE(QVariant::fromValue(intComparablePair).value<StdIntComparablePair>().first, 4); QCOMPARE(QVariant::fromValue(intComparablePair).value<StdIntComparablePair>().second, o); @@ -2099,7 +2099,7 @@ class MyQObjectFromGadget : public QObject, public MyGadget { Q_OBJECT public: - MyQObjectFromGadget(QObject *parent = 0) + MyQObjectFromGadget(QObject *parent = nullptr) : QObject(parent) {} }; diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp index 51df41f5ac..f4c028c83e 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp @@ -537,7 +537,7 @@ void tst_QObject::findChildren() Q_SET_OBJECT_NAME(t121); emptyname.setObjectName(""); - QObject *op = 0; + QObject *op = nullptr; op = o.findChild<QObject*>("o1"); QCOMPARE(op, &o1); @@ -1430,7 +1430,7 @@ class QCustomTypeChecker: public QObject Q_OBJECT public: - QCustomTypeChecker(QObject *parent = 0): QObject(parent) {} + QCustomTypeChecker(QObject *parent = nullptr): QObject(parent) {} void doEmit(CustomType ct) { emit signal1(ct); } @@ -1638,8 +1638,8 @@ void tst_QObject::thread() QCOMPARE(child.thread(), object.thread()); } - QObject *object = 0; - QObject *child = 0; + QObject *object = nullptr; + QObject *child = nullptr; { TestThread thr; @@ -1681,12 +1681,12 @@ class MoveToThreadObject : public QObject { Q_OBJECT public: - QThread *timerEventThread; - QThread *customEventThread; - QThread *slotThread; + QThread *timerEventThread = nullptr; + QThread *customEventThread = nullptr; + QThread *slotThread = nullptr; - MoveToThreadObject(QObject *parent = 0) - : QObject(parent), timerEventThread(0), customEventThread(0), slotThread(0) + MoveToThreadObject(QObject *parent = nullptr) + : QObject(parent) { } void customEvent(QEvent *) override @@ -1969,7 +1969,7 @@ void tst_QObject::property() QCOMPARE(property.type(), QVariant::UserType); QCOMPARE(property.userType(), qMetaTypeId<CustomType*>()); - CustomType *customPointer = 0; + CustomType *customPointer = nullptr; QVariant customVariant = object.property("custom"); customPointer = qvariant_cast<CustomType *>(customVariant); QCOMPARE(customPointer, object.custom()); @@ -2166,7 +2166,7 @@ public: SuperObject() { - theSender = 0; + theSender = nullptr; theSignalId = 0; } @@ -2230,7 +2230,7 @@ void tst_QObject::senderTest() QCOMPARE(receiver->sender(), (QObject *)0); QCOMPARE(receiver->senderSignalIndex(), -1); - receiver->theSender = 0; + receiver->theSender = nullptr; receiver->theSignalId = -1; thread.start(); emit sender->theSignal(); @@ -3046,7 +3046,7 @@ class EventSpy : public QObject public: typedef QList<QPair<QObject *, QEvent::Type> > EventList; - EventSpy(QObject *parent = 0) + EventSpy(QObject *parent = nullptr) : QObject(parent) { } @@ -3582,9 +3582,9 @@ class OverloadObject : public QObject signals: void sig(int i, char c, qreal m = 12); void sig(int i, int j = 12); - void sig(QObject *o, QObject *p, QObject *q = 0, QObject *r = 0) const; + void sig(QObject *o, QObject *p, QObject *q = nullptr, QObject *r = nullptr) const; void other(int a = 0); - void sig(QObject *o, OverloadObject *p = 0, QObject *q = 0, QObject *r = nullptr); + void sig(QObject *o, OverloadObject *p = nullptr, QObject *q = nullptr, QObject *r = nullptr); void sig(double r = 0.5); public slots: void slo(int i, int j = 43) @@ -6160,7 +6160,7 @@ public slots: { if (abouttoblock) { abouttoblock->deleteLater(); - abouttoblock = 0; + abouttoblock = nullptr; } ++m_aboutToBlocks; } @@ -6168,7 +6168,7 @@ public slots: { if (awake) { awake->deleteLater(); - awake = 0; + awake = nullptr; } ++m_awakes; diff --git a/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp b/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp index ba973910a7..63e2f25d1d 100644 --- a/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp +++ b/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp @@ -98,7 +98,7 @@ void tst_QPointer::assignment_operators() QCOMPARE(p1, QPointer<QObject>(p2)); // Test assignment with a null pointer - p1 = 0; + p1 = nullptr; p2 = p1; QCOMPARE(p1, QPointer<QObject>(0)); QCOMPARE(p2, QPointer<QObject>(0)); @@ -131,9 +131,9 @@ void tst_QPointer::equality_operators() QVERIFY(p1 == p2); - QObject *object = 0; + QObject *object = nullptr; #ifndef QT_NO_WIDGETS - QWidget *widget = 0; + QWidget *widget = nullptr; #endif p1 = object; @@ -149,11 +149,15 @@ void tst_QPointer::equality_operators() QVERIFY(p1 == p2); // compare to zero - p1 = 0; + p1 = nullptr; QVERIFY(p1 == 0); QVERIFY(0 == p1); QVERIFY(p2 != 0); QVERIFY(0 != p2); + QVERIFY(p1 == nullptr); + QVERIFY(nullptr == p1); + QVERIFY(p2 != nullptr); + QVERIFY(nullptr != p2); QVERIFY(p1 == object); QVERIFY(object == p1); QVERIFY(p2 != object); @@ -188,7 +192,7 @@ void tst_QPointer::isNull() QVERIFY(p1.isNull()); p1 = this; QVERIFY(!p1.isNull()); - p1 = 0; + p1 = nullptr; QVERIFY(p1.isNull()); } diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index ea8f26ae20..251bb803b4 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -64,7 +64,7 @@ class tst_QVariant : public QObject Q_OBJECT public: - tst_QVariant(QObject *parent = 0) + tst_QVariant(QObject *parent = nullptr) : QObject(parent), customNonQObjectPointer(0) { @@ -2288,7 +2288,7 @@ void tst_QVariant::variantHash() class CustomQObject : public QObject { Q_OBJECT public: - CustomQObject(QObject *parent = 0) : QObject(parent) {} + CustomQObject(QObject *parent = nullptr) : QObject(parent) {} }; Q_DECLARE_METATYPE(CustomQObject*) @@ -2346,7 +2346,7 @@ void tst_QVariant::qvariant_cast_QObject() QVERIFY(data.canConvert<QObject*>()); QVERIFY(data.canConvert(QMetaType::QObjectStar)); QVERIFY(data.canConvert(::qMetaTypeId<QObject*>())); - QCOMPARE(data.value<QObject*>() == 0, isNull); + QCOMPARE(data.value<QObject*>() == nullptr, isNull); QVERIFY(data.convert(QMetaType::QObjectStar)); QCOMPARE(data.userType(), int(QMetaType::QObjectStar)); } else { @@ -2362,14 +2362,14 @@ void tst_QVariant::qvariant_cast_QObject() class CustomQObjectDerived : public CustomQObject { Q_OBJECT public: - CustomQObjectDerived(QObject *parent = 0) : CustomQObject(parent) {} + CustomQObjectDerived(QObject *parent = nullptr) : CustomQObject(parent) {} }; Q_DECLARE_METATYPE(CustomQObjectDerived*) class CustomQObjectDerivedNoMetaType : public CustomQObject { Q_OBJECT public: - CustomQObjectDerivedNoMetaType(QObject *parent = 0) : CustomQObject(parent) {} + CustomQObjectDerivedNoMetaType(QObject *parent = nullptr) : CustomQObject(parent) {} }; void tst_QVariant::qvariant_cast_QObject_derived() @@ -2404,7 +2404,7 @@ void tst_QVariant::qvariant_cast_QObject_derived() struct QObjectWrapper { - explicit QObjectWrapper(QObject *o = 0) : obj(o) {} + explicit QObjectWrapper(QObject *o = nullptr) : obj(o) {} QObject* getObject() const { return obj; @@ -2433,7 +2433,7 @@ class SmartPointer T* pointer; public: typedef T element_type; - explicit SmartPointer(T *t = 0) + explicit SmartPointer(T *t = nullptr) : pointer(t) { } @@ -2667,7 +2667,7 @@ void tst_QVariant::voidStar() const v2 = QVariant::fromValue(p2); QCOMPARE(v1, v2); - p2 = 0; + p2 = nullptr; v2 = QVariant::fromValue(p2); QVERIFY(v1 != v2); } @@ -3705,7 +3705,7 @@ Q_DECLARE_METATYPE(Forward*) void tst_QVariant::forwardDeclare() { - Forward *f = 0; + Forward *f = nullptr; QVariant v = QVariant::fromValue(f); QCOMPARE(qvariant_cast<Forward*>(v), f); } diff --git a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp index 1a2a2a5324..0710e257b8 100644 --- a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp @@ -2526,7 +2526,7 @@ void tst_QDataStream::skipRawData() QFETCH(char, expect); qint8 dummy; - QIODevice *dev = 0; + QIODevice *dev = nullptr; if (deviceType == "sequential") { dev = new SequentialBuffer(&data); } else if (deviceType == "random-access") { diff --git a/tests/auto/corelib/serialization/qxmlstream/qc14n.h b/tests/auto/corelib/serialization/qxmlstream/qc14n.h index e4056fb0db..7fb27382aa 100644 --- a/tests/auto/corelib/serialization/qxmlstream/qc14n.h +++ b/tests/auto/corelib/serialization/qxmlstream/qc14n.h @@ -36,7 +36,7 @@ class QC14N public: static bool isEqual(QIODevice *const firstDocument, QIODevice *const secondDocument, - QString *const message = 0); + QString *const message = nullptr); private: static bool isDifferent(const QXmlStreamReader &r1, diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp index 7d4cbbbcdd..7b69e2b8af 100644 --- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp @@ -1265,7 +1265,7 @@ void tst_QLocale::strtod() QFETCH(bool, ok); QByteArray numData = num_str.toLatin1(); - const char *end = 0; + const char *end = nullptr; bool actualOk = false; double result = qstrtod(numData.constData(), &end, &actualOk); diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp index 31f362888c..e63270bfe4 100644 --- a/tests/auto/corelib/text/qstring/tst_qstring.cpp +++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp @@ -4486,7 +4486,7 @@ void tst_QString::fromLatin1() void tst_QString::fromUcs4() { - const char32_t *null = 0; + const char32_t *null = nullptr; QString s; s = QString::fromUcs4( null ); QVERIFY( s.isNull() ); diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp index c1a208bc62..66dfe3ce58 100644 --- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp +++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp @@ -261,7 +261,7 @@ void runScenario() r = string P ba; QCOMPARE(r, string); - const char *zero = 0; + const char *zero = nullptr; r = string P zero; QCOMPARE(r, string); r = zero P string; @@ -300,7 +300,7 @@ void runScenario() r2 = QByteArray("hello\0") P UTF8_LITERAL; QCOMPARE(r, r2); - const char *zero = 0; + const char *zero = nullptr; r = ba P zero; QCOMPARE(r, ba); r = zero P ba; diff --git a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp index ef00be31c5..260dbc30e8 100644 --- a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp +++ b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp @@ -85,7 +85,7 @@ private: }; template <int I> -static inline void assemblyMarker(void *ptr = 0) +static inline void assemblyMarker(void *ptr = nullptr) { puts((char *)ptr + I); } diff --git a/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp b/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp index bcc34a7d96..4361609442 100644 --- a/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp +++ b/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp @@ -77,8 +77,8 @@ void tst_QAtomicPointer::warningFreeHelper() p.loadRelaxed()->bar(); - WFHC *expectedValue = 0; - WFHC *newValue = 0; + WFHC *expectedValue = nullptr; + WFHC *newValue = nullptr; qptrdiff valueToAdd = 0; p.testAndSetRelaxed(expectedValue, newValue); @@ -585,7 +585,7 @@ void tst_QAtomicPointer::fetchAndAdd() template <typename T> void constAndVolatile_helper() { - T *one = 0; + T *one = nullptr; T *two = &one; T *three = &two; diff --git a/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp index f984aec0e8..76e50eee1b 100644 --- a/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp +++ b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp @@ -864,7 +864,7 @@ private: void tst_QReadWriteLock::deleteOnUnlock() { - QReadWriteLock *lock = 0; + QReadWriteLock *lock = nullptr; QWaitCondition startup; QMutex waitMutex; diff --git a/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp b/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp index cf27c23591..f556e402e3 100644 --- a/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp +++ b/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp @@ -49,7 +49,7 @@ private slots: void raii(); }; -static QSemaphore *semaphore = 0; +static QSemaphore *semaphore = nullptr; class ThreadOne : public QThread { diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp index 235fb093b5..1e8380fbba 100644 --- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp +++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp @@ -429,7 +429,7 @@ void tst_QThread::exit() delete thread.object; Exit_Thread thread2; - thread2.object = 0; + thread2.object = nullptr; thread2.code = 53; thread2.result = 0; QMutexLocker locker2(&thread2.mutex); @@ -505,7 +505,7 @@ void tst_QThread::quit() delete thread.object; Quit_Thread thread2; - thread2.object = 0; + thread2.object = nullptr; thread2.result = -1; QMutexLocker locker2(&thread2.mutex); thread2.start(); @@ -647,8 +647,8 @@ class NativeThreadWrapper { public: NativeThreadWrapper() : qthread(0), waitForStop(false) {} - void start(FunctionPointer functionPointer = noop, void *data = 0); - void startAndWait(FunctionPointer functionPointer = noop, void *data = 0); + void start(FunctionPointer functionPointer = noop, void *data = nullptr); + void startAndWait(FunctionPointer functionPointer = noop, void *data = nullptr); void join(); void setWaitForStop() { waitForStop = true; } void stop(); @@ -1289,7 +1289,7 @@ class Job : public QObject { Q_OBJECT public: - Job(QThread *thread, int deleteDelay, bool *flag, QObject *parent = 0) + Job(QThread *thread, int deleteDelay, bool *flag, QObject *parent = nullptr) : QObject(parent), quitLocker(thread), exitThreadCalled(*flag) { exitThreadCalled = false; diff --git a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp index 3054e3c5a4..e6db963c7b 100644 --- a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp +++ b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp @@ -107,7 +107,7 @@ private: }; -QMutex *tst_QThreadPool::functionTestMutex = 0; +QMutex *tst_QThreadPool::functionTestMutex = nullptr; tst_QThreadPool::tst_QThreadPool() { @@ -116,7 +116,7 @@ tst_QThreadPool::tst_QThreadPool() tst_QThreadPool::~tst_QThreadPool() { - tst_QThreadPool::functionTestMutex = 0; + tst_QThreadPool::functionTestMutex = nullptr; } int testFunctionCount; @@ -282,7 +282,7 @@ void tst_QThreadPool::destruction() } QSemaphore threadRecyclingSemaphore; -QThread *recycledThread = 0; +QThread *recycledThread = nullptr; class ThreadRecorderTask : public QRunnable { diff --git a/tests/auto/corelib/tools/collections/tst_collections.cpp b/tests/auto/corelib/tools/collections/tst_collections.cpp index e5cfb0fbad..1e01c5a484 100644 --- a/tests/auto/corelib/tools/collections/tst_collections.cpp +++ b/tests/auto/corelib/tools/collections/tst_collections.cpp @@ -812,7 +812,7 @@ void tst_Collections::vector() QVERIFY(LargeStatic::count == originalLargeStaticCount); { QVector<LargeStatic> vector; - LargeStatic *dummy = 0; + LargeStatic *dummy = nullptr; for (int i = 0; i < 10000; ++i) { delete dummy; dummy = new LargeStatic; @@ -834,7 +834,7 @@ void tst_Collections::vector() QVERIFY(Movable::count == originalMovableCount); { QVector<Movable> vector; - Movable *dummy = 0; + Movable *dummy = nullptr; for (int i = 0; i < 10000; ++i) { delete dummy; dummy = new Movable; @@ -2583,7 +2583,7 @@ void tst_Collections::list_stl() } template <typename T> -T qtInit(T * = 0) +T qtInit(T * = nullptr) { return T(); } @@ -2593,9 +2593,9 @@ void tst_Collections::q_init() QCOMPARE(qtInit<int>(), 0); QCOMPARE(qtInit<double>(), 0.0); QCOMPARE(qtInit<QString>(), QString()); - QCOMPARE(qtInit<int *>(), static_cast<int *>(0)); - QCOMPARE(qtInit<double *>(), static_cast<double *>(0)); - QCOMPARE(qtInit<QString *>(), static_cast<QString *>(0)); + QCOMPARE(qtInit<int *>(), static_cast<int *>(nullptr)); + QCOMPARE(qtInit<double *>(), static_cast<double *>(nullptr)); + QCOMPARE(qtInit<QString *>(), static_cast<QString *>(nullptr)); QCOMPARE(qtInit<Pod>().i1, 0); QCOMPARE(qtInit<Pod>().i2, 0); } diff --git a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp index e0062b9118..76ae592011 100644 --- a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp +++ b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp @@ -167,42 +167,42 @@ void tst_QAlgorithms::swap() } { - void *a = 0, *b = 0; + void *a = nullptr, *b = nullptr; qSwap(a, b); } { - const void *a = 0, *b = 0; + const void *a = nullptr, *b = nullptr; qSwap(a, b); } { - QString *a = 0, *b = 0; + QString *a = nullptr, *b = nullptr; qSwap(a, b); } { - const QString *a = 0, *b = 0; + const QString *a = nullptr, *b = nullptr; qSwap(a, b); } { - QString **a = 0, **b = 0; + QString **a = nullptr, **b = nullptr; qSwap(a, b); } { - const QString **a = 0, **b = 0; + const QString **a = nullptr, **b = nullptr; qSwap(a, b); } { - QString * const *a = 0, * const *b = 0; + QString * const *a = nullptr, * const *b = nullptr; qSwap(a, b); } { - const QString * const *a = 0, * const *b = 0; + const QString * const *a = nullptr, * const *b = nullptr; qSwap(a, b); } } diff --git a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp index 90fadbb628..069f990e2c 100644 --- a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp +++ b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp @@ -501,7 +501,7 @@ class tst_QEasingProperties : public QObject Q_OBJECT Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing) public: - tst_QEasingProperties(QObject *parent = 0) : QObject(parent) {} + tst_QEasingProperties(QObject *parent = nullptr) : QObject(parent) {} QEasingCurve easing() const { return e; } void setEasing(const QEasingCurve& value) { e = value; } diff --git a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp index 4ca7940556..06c4091232 100644 --- a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp +++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp @@ -2251,12 +2251,12 @@ void tst_QSharedPointer::invalidConstructs_data() QTest::newRow("weak-pointer-from-regular-pointer") << &QTest::QExternalTest::tryCompileFail - << "Data *ptr = 0;\n" + << "Data *ptr = nullptr;\n" "QWeakPointer<Data> weakptr(ptr);\n"; QTest::newRow("shared-pointer-implicit-from-uninitialized") << &QTest::QExternalTest::tryCompileFail - << "Data *ptr = 0;\n" + << "Data *ptr = nullptr;\n" "QSharedPointer<Data> weakptr = Qt::Uninitialized;\n"; QTest::newRow("incompatible-custom-deleter1") diff --git a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.cpp b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.cpp index 1ea476e580..3e79fb77f4 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.cpp +++ b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.cpp @@ -46,7 +46,7 @@ class MyServer : public QDBusServer, protected QDBusContext Q_CLASSINFO("D-Bus Interface", "org.qtproject.autotests.qmyserver") public: - MyServer(QObject* parent = 0) + MyServer(QObject* parent = nullptr) : QDBusServer(parent), m_conn("none"), obj(NULL) diff --git a/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp b/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp index e92f173fae..7f098aeb36 100644 --- a/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp +++ b/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp @@ -39,7 +39,7 @@ class PingerServer : public QDBusServer, protected QDBusContext Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.qtproject.autotests.qpinger") public: - PingerServer(QObject* parent = 0) + PingerServer(QObject *parent = nullptr) : QDBusServer(parent), m_conn("none") { diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h index af42224b79..14a7243cf0 100644 --- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h +++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h @@ -39,7 +39,7 @@ class BaseObject: public QObject Q_OBJECT Q_CLASSINFO("D-Bus Interface", "local.BaseObject") public: - BaseObject(QObject *parent = 0) : QObject(parent) { } + BaseObject(QObject *parent = nullptr) : QObject(parent) { } public slots: void anotherMethod() { } }; @@ -53,7 +53,7 @@ public slots: public: static QString path; int callCount; - MyObject(QObject *parent = 0) : BaseObject(parent), callCount(0) {} + MyObject(QObject *parent = nullptr) : BaseObject(parent), callCount(0) {} }; class MyObjectWithoutInterface: public QObject @@ -66,7 +66,7 @@ public: static QString path; static QString interface; int callCount; - MyObjectWithoutInterface(QObject *parent = 0) : QObject(parent), callCount(0) {} + MyObjectWithoutInterface(QObject *parent = nullptr) : QObject(parent), callCount(0) {} }; class SignalReceiver : public QObject @@ -238,7 +238,7 @@ class TestObject : public QObject { Q_OBJECT public: - TestObject(QObject *parent = 0) : QObject(parent) {} + TestObject(QObject *parent = nullptr) : QObject(parent) {} ~TestObject() {} QString func; diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp index 535d2f756b..53eb9585f8 100644 --- a/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp +++ b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp @@ -44,7 +44,7 @@ class MyServer : public QDBusServer, protected QDBusContext Q_CLASSINFO("D-Bus Interface", "org.qtproject.autotests.qmyserver") public: - MyServer(QObject* parent = 0) + MyServer(QObject *parent = nullptr) : QDBusServer(parent), m_conn("none") { diff --git a/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp b/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp index b55cc2b007..18d4b4cff6 100644 --- a/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp +++ b/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp @@ -3305,7 +3305,7 @@ class tst_QMatrixNxN4x4Properties : public QObject Q_OBJECT Q_PROPERTY(QMatrix4x4 matrix READ matrix WRITE setMatrix) public: - tst_QMatrixNxN4x4Properties(QObject *parent = 0) : QObject(parent) {} + tst_QMatrixNxN4x4Properties(QObject *parent = nullptr) : QObject(parent) {} QMatrix4x4 matrix() const { return m; } void setMatrix(const QMatrix4x4& value) { m = value; } diff --git a/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp b/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp index 3db53be2ab..b4b24548db 100644 --- a/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp +++ b/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp @@ -1286,7 +1286,7 @@ class tst_QQuaternionProperties : public QObject Q_OBJECT Q_PROPERTY(QQuaternion quaternion READ quaternion WRITE setQuaternion) public: - tst_QQuaternionProperties(QObject *parent = 0) : QObject(parent) {} + tst_QQuaternionProperties(QObject *parent = nullptr) : QObject(parent) {} QQuaternion quaternion() const { return q; } void setQuaternion(const QQuaternion& value) { q = value; } diff --git a/tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp b/tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp index 2085b62cdf..3aa54a4af2 100644 --- a/tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp +++ b/tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp @@ -2596,7 +2596,7 @@ class tst_QVectorNDProperties : public QObject Q_PROPERTY(QVector3D vector3D READ vector3D WRITE setVector3D) Q_PROPERTY(QVector4D vector4D READ vector4D WRITE setVector4D) public: - tst_QVectorNDProperties(QObject *parent = 0) : QObject(parent) {} + tst_QVectorNDProperties(QObject *parent = nullptr) : QObject(parent) {} QVector2D vector2D() const { return v2; } void setVector2D(const QVector2D& value) { v2 = value; } diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp index 7b64e3dddb..6b58994daf 100644 --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp @@ -2697,7 +2697,7 @@ void tst_QPainter::drawhelper_blend_color() class ViewportTestWidget : public QWidget { public: - ViewportTestWidget(QWidget *parent = 0) : QWidget(parent), hasPainted(false) {} + ViewportTestWidget(QWidget *parent = nullptr) : QWidget(parent), hasPainted(false) {} QSize sizeHint() const override { return QSize(100, 100); diff --git a/tests/auto/gui/util/qundogroup/tst_qundogroup.cpp b/tests/auto/gui/util/qundogroup/tst_qundogroup.cpp index e915fd7e24..514890d50b 100644 --- a/tests/auto/gui/util/qundogroup/tst_qundogroup.cpp +++ b/tests/auto/gui/util/qundogroup/tst_qundogroup.cpp @@ -38,7 +38,7 @@ class InsertCommand : public QUndoCommand { public: InsertCommand(QString *str, int idx, const QString &text, - QUndoCommand *parent = 0); + QUndoCommand *parent = nullptr); virtual void undo() override; virtual void redo() override; @@ -52,7 +52,7 @@ private: class RemoveCommand : public QUndoCommand { public: - RemoveCommand(QString *str, int idx, int len, QUndoCommand *parent = 0); + RemoveCommand(QString *str, int idx, int len, QUndoCommand *parent = nullptr); virtual void undo() override; virtual void redo() override; @@ -66,7 +66,7 @@ private: class AppendCommand : public QUndoCommand { public: - AppendCommand(QString *str, const QString &text, QUndoCommand *parent = 0); + AppendCommand(QString *str, const QString &text, QUndoCommand *parent = nullptr); virtual void undo() override; virtual void redo() override; diff --git a/tests/auto/gui/util/qundostack/tst_qundostack.cpp b/tests/auto/gui/util/qundostack/tst_qundostack.cpp index 4c201ba4f9..aa3f3c6aa4 100644 --- a/tests/auto/gui/util/qundostack/tst_qundostack.cpp +++ b/tests/auto/gui/util/qundostack/tst_qundostack.cpp @@ -39,7 +39,7 @@ class InsertCommand : public QUndoCommand { public: InsertCommand(QString *str, int idx, const QString &text, - QUndoCommand *parent = 0); + QUndoCommand *parent = nullptr); virtual void undo() override; virtual void redo() override; @@ -53,7 +53,7 @@ private: class RemoveCommand : public QUndoCommand { public: - RemoveCommand(QString *str, int idx, int len, QUndoCommand *parent = 0); + RemoveCommand(QString *str, int idx, int len, QUndoCommand *parent = nullptr); virtual void undo() override; virtual void redo() override; @@ -68,7 +68,7 @@ class AppendCommand : public QUndoCommand { public: AppendCommand(QString *str, const QString &text, bool _fail_merge = false, - QUndoCommand *parent = 0); + QUndoCommand *parent = nullptr); ~AppendCommand(); virtual void undo() override; @@ -88,7 +88,7 @@ private: class IdleCommand : public QUndoCommand { public: - IdleCommand(QUndoCommand *parent = 0); + IdleCommand(QUndoCommand *parent = nullptr); ~IdleCommand(); virtual void undo() override; @@ -98,7 +98,7 @@ public: class MoveMouseCommand : public QUndoCommand { public: - MoveMouseCommand(QPoint *mouse, QPoint oldPoint, QPoint newPoint, QUndoCommand *parent = 0); + MoveMouseCommand(QPoint *mouse, QPoint oldPoint, QPoint newPoint, QUndoCommand *parent = nullptr); ~MoveMouseCommand(); virtual void undo() override; @@ -2636,8 +2636,8 @@ void tst_QUndoStack::obsolete() QSignalSpy redoTextChangedSpy(&stack, &QUndoStack::redoTextChanged); QPoint mouse(0, 0); QString str; - MoveMouseCommand *cmd1 = 0; - MoveMouseCommand *cmd2 = 0; + MoveMouseCommand *cmd1 = nullptr; + MoveMouseCommand *cmd2 = nullptr; stack.resetClean(); checkState(redoTextChangedSpy, diff --git a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp index 4b392d867c..84a9787493 100644 --- a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp +++ b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp @@ -77,7 +77,7 @@ class NetworkDiskCache : public QNetworkDiskCache { Q_OBJECT public: - NetworkDiskCache(QObject *parent = 0) + NetworkDiskCache(QObject *parent = nullptr) : QNetworkDiskCache(parent) , tempDir(QDir::tempPath() + QLatin1String("/tst_qabstractnetworkcache.XXXXXX")) , gotData(false) diff --git a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp index 00afdd8177..2204e9f2f4 100644 --- a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp +++ b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp @@ -734,7 +734,7 @@ void tst_QHttpNetworkConnection::getMultipleWithPipeliningAndMultiplePriorities( QList<QHttpNetworkReply*> replies; for (int i = 0; i < requestCount; i++) { - QHttpNetworkRequest *request = 0; + QHttpNetworkRequest *request = nullptr; if (i % 3) request = new QHttpNetworkRequest("http://" + httpServerName() + "/qtest/rfc3252.txt", QHttpNetworkRequest::Get); else @@ -812,7 +812,7 @@ void tst_QHttpNetworkConnection::getMultipleWithPriorities() QList<QHttpNetworkReply*> replies; for (int i = 0; i < requestCount; i++) { - QHttpNetworkRequest *request = 0; + QHttpNetworkRequest *request = nullptr; if (i % 3) request = new QHttpNetworkRequest(url, QHttpNetworkRequest::Get); else @@ -867,7 +867,7 @@ void tst_QHttpNetworkConnection::getEmptyWithPipelining() QList<QHttpNetworkReply*> replies; for (int i = 0; i < requestCount; i++) { - QHttpNetworkRequest *request = 0; + QHttpNetworkRequest *request = nullptr; request = new QHttpNetworkRequest(url, QHttpNetworkRequest::Get); request->setPipeliningAllowed(true); @@ -914,7 +914,7 @@ void tst_QHttpNetworkConnection::getAndEverythingShouldBePipelined() GetAndEverythingShouldBePipelinedReceiver receiver(requestCount); for (int i = 0; i < requestCount; i++) { - QHttpNetworkRequest *request = 0; + QHttpNetworkRequest *request = nullptr; request = new QHttpNetworkRequest(url, QHttpNetworkRequest::Get); request->setPipeliningAllowed(true); requests.append(request); diff --git a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp index 50f118a89f..cb94900660 100644 --- a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp +++ b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp @@ -129,7 +129,7 @@ public slots: if (doClose) { client->disconnectFromHost(); disconnect(client, 0, this, 0); - client = 0; + client = nullptr; } } } @@ -155,7 +155,7 @@ public: { setCacheDirectory(path); - QIODevice *d = 0; + QIODevice *d = nullptr; if (metaData.isValid()) { d = prepare(metaData); } else { diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 365de831ab..08e9dd581d 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -939,10 +939,10 @@ class SocketPair: public QObject public: QIODevice *endPoints[2]; - SocketPair(QObject *parent = 0) + SocketPair(QObject *parent = nullptr) : QObject(parent) { - endPoints[0] = endPoints[1] = 0; + endPoints[0] = endPoints[1] = nullptr; } bool create() @@ -976,7 +976,7 @@ class BlockingTcpServer : public QTcpServer { Q_OBJECT public: - BlockingTcpServer(bool ssl) : doSsl(ssl), sslSocket(0) {} + BlockingTcpServer(bool ssl) : doSsl(ssl), sslSocket(nullptr) {} QTcpSocket* waitForNextConnectionSocket() { diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp index e172c255a7..fee44601cf 100644 --- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp @@ -168,7 +168,7 @@ class LocalSocket : public QLocalSocket Q_OBJECT public: - LocalSocket(QObject *parent = 0) : QLocalSocket(parent) + LocalSocket(QObject *parent = nullptr) : QLocalSocket(parent) { connect(this, SIGNAL(connected()), this, SLOT(slotConnected())); @@ -935,7 +935,7 @@ void tst_QLocalSocket::processConnection_data() class ProcessOutputDumper { public: - ProcessOutputDumper(QProcess *p = 0) + ProcessOutputDumper(QProcess *p = nullptr) : process(p) {} @@ -947,7 +947,7 @@ public: void clear() { - process = 0; + process = nullptr; } private: diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/Test.h b/tests/auto/network/socket/qtcpsocket/stressTest/Test.h index 3e61456f75..5e6b2b9467 100644 --- a/tests/auto/network/socket/qtcpsocket/stressTest/Test.h +++ b/tests/auto/network/socket/qtcpsocket/stressTest/Test.h @@ -53,7 +53,7 @@ class My4Server : public QTcpServer { Q_OBJECT public: - My4Server(QObject *parent = 0); + My4Server(QObject *parent = nullptr); protected: void incomingConnection(qintptr socket) override; diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index b9108932f7..00fcf4afa4 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -271,7 +271,7 @@ class SocketPair: public QObject public: QTcpSocket *endPoints[2]; - SocketPair(QObject *parent = 0) + SocketPair(QObject *parent = nullptr) : QObject(parent) { endPoints[0] = endPoints[1] = 0; @@ -2163,7 +2163,7 @@ public: bool networkTimeout; int count; - inline Foo(QObject *parent = 0) : QObject(parent) + inline Foo(QObject *parent = nullptr) : QObject(parent) { attemptedToConnect = false; networkTimeout = false; diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index e968f5b0f1..e6fea87011 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -3566,7 +3566,7 @@ public: QByteArray m_identity; QByteArray m_psk; - explicit PskProvider(QObject *parent = 0) + explicit PskProvider(QObject *parent = nullptr) : QObject(parent), m_server(false) { } diff --git a/tests/auto/other/gestures/tst_gestures.cpp b/tests/auto/other/gestures/tst_gestures.cpp index fe95120656..1dfd1f977b 100644 --- a/tests/auto/other/gestures/tst_gestures.cpp +++ b/tests/auto/other/gestures/tst_gestures.cpp @@ -54,7 +54,7 @@ class CustomGesture : public QGesture public: static Qt::GestureType GestureType; - CustomGesture(QObject *parent = 0) + CustomGesture(QObject *parent = nullptr) : QGesture(parent), serial(0) { } @@ -183,7 +183,7 @@ class GestureWidget : public QWidget { Q_OBJECT public: - GestureWidget(const char *name = 0, QWidget *parent = 0) + GestureWidget(const char *name = nullptr, QWidget *parent = nullptr) : QWidget(parent) { if (name) @@ -1395,7 +1395,7 @@ void tst_Gestures::ungrabGesture() // a method on QWidget { class MockGestureWidget : public GestureWidget { public: - MockGestureWidget(const char *name = 0, QWidget *parent = 0) + MockGestureWidget(const char *name = nullptr, QWidget *parent = nullptr) : GestureWidget(name, parent) { } @@ -1924,7 +1924,7 @@ void tst_Gestures::deleteGestureTargetItem() class GraphicsView : public QGraphicsView { public: - GraphicsView(QGraphicsScene *scene, QWidget *parent = 0) + GraphicsView(QGraphicsScene *scene, QWidget *parent = nullptr) : QGraphicsView(scene, parent) { } @@ -2124,7 +2124,7 @@ private: class ReuseCanceledGesturesWidget : public QGraphicsWidget { public: - ReuseCanceledGesturesWidget(Qt::GestureType gestureType = Qt::TapGesture, QGraphicsItem *parent = 0) + ReuseCanceledGesturesWidget(Qt::GestureType gestureType = Qt::TapGesture, QGraphicsItem *parent = nullptr) : QGraphicsWidget(parent), m_gestureType(gestureType), m_started(0), m_updated(0), m_canceled(0), m_finished(0) diff --git a/tests/auto/other/macgui/guitest.h b/tests/auto/other/macgui/guitest.h index e2bbcf5900..74f4292a6b 100644 --- a/tests/auto/other/macgui/guitest.h +++ b/tests/auto/other/macgui/guitest.h @@ -82,7 +82,7 @@ namespace NativeEvents { class ColorWidget : public QWidget { public: - ColorWidget(QWidget *parent = 0, QColor color = QColor(Qt::red)) + ColorWidget(QWidget *parent = nullptr, QColor color = QColor(Qt::red)) : QWidget(parent), color(color) {} QColor color; diff --git a/tests/auto/other/macnativeevents/nativeeventlist.h b/tests/auto/other/macnativeevents/nativeeventlist.h index 8f823becf3..7425414da7 100644 --- a/tests/auto/other/macnativeevents/nativeeventlist.h +++ b/tests/auto/other/macnativeevents/nativeeventlist.h @@ -43,7 +43,7 @@ class NativeEventList : public QObject ~NativeEventList(); void append(QNativeEvent *event); - void append(int waitMs, QNativeEvent *event = 0); + void append(int waitMs, QNativeEvent *event = nullptr); void play(Playback playback = WaitUntilFinished); void stop(); diff --git a/tests/auto/other/qabstractitemmodelutils/dynamictreemodel.h b/tests/auto/other/qabstractitemmodelutils/dynamictreemodel.h index e28575e50b..ba566cbbac 100644 --- a/tests/auto/other/qabstractitemmodelutils/dynamictreemodel.h +++ b/tests/auto/other/qabstractitemmodelutils/dynamictreemodel.h @@ -39,7 +39,7 @@ class DynamicTreeModel : public QAbstractItemModel Q_OBJECT public: - DynamicTreeModel(QObject *parent = 0); + DynamicTreeModel(QObject *parent = nullptr); QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; QModelIndex parent(const QModelIndex &index) const override; @@ -86,7 +86,7 @@ class ModelChangeCommand : public QObject Q_OBJECT public: - ModelChangeCommand(DynamicTreeModel *model, QObject *parent = 0); + ModelChangeCommand(DynamicTreeModel *model, QObject *parent = nullptr); virtual ~ModelChangeCommand() { @@ -132,7 +132,7 @@ class ModelInsertCommand : public ModelChangeCommand public: - ModelInsertCommand(DynamicTreeModel *model, QObject *parent = 0); + ModelInsertCommand(DynamicTreeModel *model, QObject *parent = nullptr); virtual ~ModelInsertCommand() { } @@ -179,7 +179,7 @@ class ModelResetCommand : public ModelMoveCommand { Q_OBJECT public: - ModelResetCommand(DynamicTreeModel *model, QObject *parent = 0); + ModelResetCommand(DynamicTreeModel *model, QObject *parent = nullptr); virtual ~ModelResetCommand(); @@ -195,7 +195,7 @@ class ModelResetCommandFixed : public ModelMoveCommand { Q_OBJECT public: - ModelResetCommandFixed(DynamicTreeModel *model, QObject *parent = 0); + ModelResetCommandFixed(DynamicTreeModel *model, QObject *parent = nullptr); virtual ~ModelResetCommandFixed(); diff --git a/tests/auto/other/qaccessibility/accessiblewidgets.h b/tests/auto/other/qaccessibility/accessiblewidgets.h index d436f81d17..13ca687dd9 100644 --- a/tests/auto/other/qaccessibility/accessiblewidgets.h +++ b/tests/auto/other/qaccessibility/accessiblewidgets.h @@ -74,7 +74,7 @@ class KFooButton: public QPushButton { Q_OBJECT public: - KFooButton(const QString &text, QWidget* parent = 0) + KFooButton(const QString &text, QWidget *parent = nullptr) : QPushButton(text, parent) {} }; diff --git a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp index 5c025c8c4e..b9777c6114 100644 --- a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp +++ b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp @@ -46,7 +46,7 @@ QT_FORWARD_DECLARE_CLASS(QWidget) class FocusLineEdit : public QLineEdit { public: - FocusLineEdit( QWidget* parent = 0, const char* name = 0 ) : QLineEdit(name, parent) {} + FocusLineEdit(QWidget *parent = nullptr, const char *name = nullptr ) : QLineEdit(name, parent) {} int focusInEventReason; int focusOutEventReason; bool focusInEventRecieved; @@ -107,7 +107,7 @@ void tst_QFocusEvent::initTestCase() if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation)) QSKIP("QWindow::requestActivate() is not supported on this platform."); - testFocusWidget = new QWidget( 0 ); + testFocusWidget = new QWidget( nullptr ); childFocusWidgetOne = new FocusLineEdit( testFocusWidget ); childFocusWidgetOne->setGeometry( 10, 10, 180, 20 ); childFocusWidgetTwo = new FocusLineEdit( testFocusWidget ); @@ -322,8 +322,8 @@ void tst_QFocusEvent::checkReason_focusWidget() QTRY_VERIFY(edit1.hasFocus()); edit2.setFocus(); - QVERIFY(frame1.focusWidget() != 0); - QVERIFY(frame2.focusWidget() != 0); + QVERIFY(frame1.focusWidget() != nullptr); + QVERIFY(frame2.focusWidget() != nullptr); } void tst_QFocusEvent::checkReason_ActiveWindow() diff --git a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp index 3f18bad5cf..ed365dfcdc 100644 --- a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp +++ b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp @@ -54,7 +54,7 @@ class DownloadCheckWidget : public QWidget { Q_OBJECT public: - DownloadCheckWidget(QWidget *parent = 0) : + DownloadCheckWidget(QWidget *parent = nullptr) : QWidget(parent), lateReadyRead(true), zeroCopy(false), progressDlg(this), netmanager(this) { diff --git a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp index fc65df108a..9629bb5c7f 100644 --- a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp +++ b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp @@ -232,7 +232,7 @@ void tst_QPrinter::testPageRectAndPaperRect() QFETCH(int, resolution); QFETCH(bool, doPaperRect); - QPainter *painter = 0; + QPainter *painter = nullptr; printer->setPageOrientation(orientation); printer->setOutputFileName(testFileName(QLatin1String("silly"), QString())); @@ -246,7 +246,7 @@ void tst_QPrinter::testPageRectAndPaperRect() QRect otherRect = (doPaperRect ? printer->paperRect(QPrinter::DevicePixel) : printer->pageRect(QPrinter::DevicePixel)).toRect(); float otherInchesX = float(otherRect.width()) / float(printer->resolution()); float otherInchesY = float(otherRect.height()) / float(printer->resolution()); - if (painter != 0) + if (painter != nullptr) delete painter; QVERIFY(qAbs(otherInchesX - inchesX) < 0.01); @@ -282,7 +282,7 @@ void tst_QPrinter::testMargins() QFETCH(QPageLayout::Orientation, orientation); QFETCH(QPageSize::PageSizeId, pagesize); QFETCH(bool, fullpage); - QPainter *painter = 0; + QPainter *painter = nullptr; printer->setOutputFileName(testFileName(QLatin1String("silly"), QString())); printer->setPageOrientation(orientation); printer->setFullPage(fullpage); diff --git a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp index 6d1062d881..a8a0a453e2 100644 --- a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp +++ b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp @@ -93,7 +93,7 @@ class QtTestSqlThread : public QThread { Q_OBJECT public: - QtTestSqlThread(const QSqlDatabase &aDb, QObject *parent = 0) + QtTestSqlThread(const QSqlDatabase &aDb, QObject *parent = nullptr) : QThread(parent), sourceDb(aDb) {} void runHelper(const QString &dbName) @@ -129,7 +129,7 @@ class SqlProducer: public QThread { Q_OBJECT public: - SqlProducer(const QSqlDatabase &aDb, QObject *parent = 0) + SqlProducer(const QSqlDatabase &aDb, QObject *parent = nullptr) : QThread(parent), sourceDb(aDb) {} void runHelper(const QString &dbName) @@ -164,7 +164,7 @@ class SqlConsumer: public QThread Q_OBJECT public: - SqlConsumer(const QSqlDatabase &aDb, QObject *parent = 0) + SqlConsumer(const QSqlDatabase &aDb, QObject *parent = nullptr) : QThread(parent), sourceDb(aDb) {} void runHelper(const QString &dbName) @@ -203,7 +203,7 @@ class SqlThread: public QThread public: enum Mode { SimpleReading, PreparedReading, SimpleWriting, PreparedWriting }; - SqlThread(Mode m, const QSqlDatabase &db, QObject *parent = 0) + SqlThread(Mode m, const QSqlDatabase &db, QObject *parent = nullptr) : QThread(parent), sourceDb(db), mode(m) {} void run() override diff --git a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp index 88e052cd18..343bd88338 100644 --- a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp +++ b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp @@ -97,7 +97,7 @@ private: class DBTestModel: public QSqlQueryModel { public: - DBTestModel(QObject *parent = 0): QSqlQueryModel(parent) {} + DBTestModel(QObject *parent = nullptr): QSqlQueryModel(parent) {} QModelIndex indexInQuery(const QModelIndex &item) const { return QSqlQueryModel::indexInQuery(item); } }; @@ -582,7 +582,7 @@ class NestedResetsTest: public QSqlQueryModel Q_OBJECT public: - NestedResetsTest(QObject* parent = 0) : QSqlQueryModel(parent), gotAboutToBeReset(false), gotReset(false) + NestedResetsTest(QObject *parent = nullptr) : QSqlQueryModel(parent), gotAboutToBeReset(false), gotReset(false) { connect(this, SIGNAL(modelAboutToBeReset()), this, SLOT(modelAboutToBeResetSlot())); connect(this, SIGNAL(modelReset()), this, SLOT(modelResetSlot())); diff --git a/tests/auto/testlib/qabstractitemmodeltester/tst_qabstractitemmodeltester.cpp b/tests/auto/testlib/qabstractitemmodeltester/tst_qabstractitemmodeltester.cpp index b305eee0ec..0aff8f8c1b 100644 --- a/tests/auto/testlib/qabstractitemmodeltester/tst_qabstractitemmodeltester.cpp +++ b/tests/auto/testlib/qabstractitemmodeltester/tst_qabstractitemmodeltester.cpp @@ -143,7 +143,7 @@ class AccessibleProxyModel : public QSortFilterProxyModel { Q_OBJECT public: - AccessibleProxyModel(QObject *parent = 0) : QSortFilterProxyModel(parent) + AccessibleProxyModel(QObject *parent = nullptr) : QSortFilterProxyModel(parent) { } @@ -157,7 +157,7 @@ class ObservingObject : public QObject { Q_OBJECT public: - ObservingObject(AccessibleProxyModel *proxy, QObject *parent = 0) : + ObservingObject(AccessibleProxyModel *proxy, QObject *parent = nullptr) : QObject(parent), m_proxy(proxy), storePersistentFailureCount(0), diff --git a/tests/auto/tools/moc/cxx11-explicit-override-control.h b/tests/auto/tools/moc/cxx11-explicit-override-control.h index 2211112717..961d7c47c2 100644 --- a/tests/auto/tools/moc/cxx11-explicit-override-control.h +++ b/tests/auto/tools/moc/cxx11-explicit-override-control.h @@ -40,7 +40,7 @@ class ExplicitOverrideControlBase : public QObject { Q_OBJECT public: - explicit ExplicitOverrideControlBase(QObject *parent = 0) + explicit ExplicitOverrideControlBase(QObject *parent = nullptr) : QObject(parent) {} private Q_SLOTS: @@ -62,7 +62,7 @@ class ExplicitOverrideControlFinalQt : public ExplicitOverrideControlBase { Q_OBJECT public: - explicit ExplicitOverrideControlFinalQt(QObject *parent = 0) + explicit ExplicitOverrideControlFinalQt(QObject *parent = nullptr) : ExplicitOverrideControlBase(parent) {} private Q_SLOTS: @@ -84,7 +84,7 @@ class ExplicitOverrideControlFinalCxx11 : public ExplicitOverrideControlBase { Q_OBJECT public: - explicit ExplicitOverrideControlFinalCxx11(QObject *parent = 0) + explicit ExplicitOverrideControlFinalCxx11(QObject *parent = nullptr) : ExplicitOverrideControlBase(parent) {} private Q_SLOTS: @@ -106,7 +106,7 @@ class ExplicitOverrideControlSealed : public ExplicitOverrideControlBase { Q_OBJECT public: - explicit ExplicitOverrideControlSealed(QObject *parent = 0) + explicit ExplicitOverrideControlSealed(QObject *parent = nullptr) : ExplicitOverrideControlBase(parent) {} private Q_SLOTS: @@ -128,7 +128,7 @@ class ExplicitOverrideControlOverrideQt : public ExplicitOverrideControlBase { Q_OBJECT public: - explicit ExplicitOverrideControlOverrideQt(QObject *parent = 0) + explicit ExplicitOverrideControlOverrideQt(QObject *parent = nullptr) : ExplicitOverrideControlBase(parent) {} private Q_SLOTS: @@ -150,7 +150,7 @@ class ExplicitOverrideControlOverrideCxx11 : public ExplicitOverrideControlBase { Q_OBJECT public: - explicit ExplicitOverrideControlOverrideCxx11(QObject *parent = 0) + explicit ExplicitOverrideControlOverrideCxx11(QObject *parent = nullptr) : ExplicitOverrideControlBase(parent) {} private Q_SLOTS: @@ -172,7 +172,7 @@ class ExplicitOverrideControlFinalQtOverrideQt : public ExplicitOverrideControlB { Q_OBJECT public: - explicit ExplicitOverrideControlFinalQtOverrideQt(QObject *parent = 0) + explicit ExplicitOverrideControlFinalQtOverrideQt(QObject *parent = nullptr) : ExplicitOverrideControlBase(parent) {} private Q_SLOTS: @@ -194,7 +194,7 @@ class ExplicitOverrideControlFinalCxx11OverrideCxx11 : public ExplicitOverrideCo { Q_OBJECT public: - explicit ExplicitOverrideControlFinalCxx11OverrideCxx11(QObject *parent = 0) + explicit ExplicitOverrideControlFinalCxx11OverrideCxx11(QObject *parent = nullptr) : ExplicitOverrideControlBase(parent) {} private Q_SLOTS: @@ -216,7 +216,7 @@ class ExplicitOverrideControlSealedOverride : public ExplicitOverrideControlBase { Q_OBJECT public: - explicit ExplicitOverrideControlSealedOverride(QObject *parent = 0) + explicit ExplicitOverrideControlSealedOverride(QObject *parent = nullptr) : ExplicitOverrideControlBase(parent) {} private Q_SLOTS: diff --git a/tests/auto/tools/moc/cxx11-final-classes.h b/tests/auto/tools/moc/cxx11-final-classes.h index 0e1d8a7787..4bb5181eae 100644 --- a/tests/auto/tools/moc/cxx11-final-classes.h +++ b/tests/auto/tools/moc/cxx11-final-classes.h @@ -41,7 +41,7 @@ class FinalTestClassQt Q_DECL_FINAL : public QObject { Q_OBJECT public: - explicit FinalTestClassQt(QObject *parent = 0) + explicit FinalTestClassQt(QObject *parent = nullptr) : QObject(parent) {} }; @@ -50,7 +50,7 @@ class EXPORT_MACRO ExportedFinalTestClassQt Q_DECL_FINAL : public QObject { Q_OBJECT public: - explicit ExportedFinalTestClassQt(QObject *parent = 0) + explicit ExportedFinalTestClassQt(QObject *parent = nullptr) : QObject(parent) {} }; @@ -58,7 +58,7 @@ class EXPORT_MACRO2(X,Y,Z) ExportedFinalTestClassQtX Q_DECL_FINAL : public QObje { Q_OBJECT public: - explicit ExportedFinalTestClassQtX(QObject *parent = 0) + explicit ExportedFinalTestClassQtX(QObject *parent = nullptr) : QObject(parent) {} }; @@ -66,7 +66,7 @@ class FinalTestClassCpp11 final : public QObject { Q_OBJECT public: - explicit FinalTestClassCpp11(QObject *parent = 0) + explicit FinalTestClassCpp11(QObject *parent = nullptr) : QObject(parent) {} }; @@ -74,7 +74,7 @@ class EXPORT_MACRO ExportedFinalTestClassCpp11 final : public QObject { Q_OBJECT public: - explicit ExportedFinalTestClassCpp11(QObject *parent = 0) + explicit ExportedFinalTestClassCpp11(QObject *parent = nullptr) : QObject(parent) {} }; @@ -82,7 +82,7 @@ class EXPORT_MACRO2(X,Y,Z) ExportedFinalTestClassCpp11X final : public QObject { Q_OBJECT public: - explicit ExportedFinalTestClassCpp11X(QObject *parent = 0) + explicit ExportedFinalTestClassCpp11X(QObject *parent = nullptr) : QObject(parent) {} }; @@ -90,7 +90,7 @@ class SealedTestClass sealed : public QObject { Q_OBJECT public: - explicit SealedTestClass(QObject *parent = 0) + explicit SealedTestClass(QObject *parent = nullptr) : QObject(parent) {} }; @@ -98,7 +98,7 @@ class EXPORT_MACRO ExportedSealedTestClass sealed : public QObject { Q_OBJECT public: - explicit ExportedSealedTestClass(QObject *parent = 0) + explicit ExportedSealedTestClass(QObject *parent = nullptr) : QObject(parent) {} }; @@ -106,7 +106,7 @@ class EXPORT_MACRO2(X,Y,Z) ExportedSealedTestClassX sealed : public QObject { Q_OBJECT public: - explicit ExportedSealedTestClassX(QObject *parent = 0) + explicit ExportedSealedTestClassX(QObject *parent = nullptr) : QObject(parent) {} }; diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp index 39712c6d22..d3af266e74 100644 --- a/tests/auto/tools/moc/tst_moc.cpp +++ b/tests/auto/tools/moc/tst_moc.cpp @@ -598,7 +598,7 @@ class CtorTestClass : public QObject { Q_OBJECT public: - Q_INVOKABLE CtorTestClass(QObject *parent = 0); + Q_INVOKABLE CtorTestClass(QObject *parent = nullptr); CtorTestClass(int foo); @@ -1562,7 +1562,7 @@ class PrivatePropertyTest : public QObject int mBaz; }; public: - PrivatePropertyTest(QObject *parent = 0) : QObject(parent), mFoo(0), d (new MyDPointer) {} + PrivatePropertyTest(QObject *parent = nullptr) : QObject(parent), mFoo(0), d (new MyDPointer) {} int foo() { return mFoo ; } void setFoo(int value) { mFoo = value; } MyDPointer *d_func() {return d.data();} @@ -2466,7 +2466,7 @@ class SignalConnectionTester : public QObject { Q_OBJECT public: - SignalConnectionTester(QObject *parent = 0) + SignalConnectionTester(QObject *parent = nullptr) : QObject(parent), testPassed(false) { @@ -2494,7 +2494,7 @@ class ClassWithPrivateSignals : public QObject { Q_OBJECT public: - ClassWithPrivateSignals(QObject *parent = 0) + ClassWithPrivateSignals(QObject *parent = nullptr) : QObject(parent) { @@ -2530,7 +2530,7 @@ class SubClassFromPrivateSignals : public ClassWithPrivateSignals { Q_OBJECT public: - SubClassFromPrivateSignals(QObject *parent = 0) + SubClassFromPrivateSignals(QObject *parent = nullptr) : ClassWithPrivateSignals(parent) { @@ -3031,7 +3031,7 @@ public: One, Two }; - explicit CustomQObject(QObject *parent = 0) + explicit CustomQObject(QObject *parent = nullptr) : QObject(parent) { } @@ -3048,7 +3048,7 @@ class NamespacedQObject : public QObject { Q_OBJECT public: - explicit NamespacedQObject(QObject *parent = 0) + explicit NamespacedQObject(QObject *parent = nullptr) : QObject(parent) { @@ -3072,7 +3072,7 @@ public: One, Two }; - explicit CustomQObject2(QObject *parent = 0) + explicit CustomQObject2(QObject *parent = nullptr) : QObject(parent) { } @@ -3089,7 +3089,7 @@ class NamespacedQObject2 : public QObject { Q_OBJECT public: - explicit NamespacedQObject2(QObject *parent = 0) + explicit NamespacedQObject2(QObject *parent = nullptr) : QObject(parent) { @@ -3141,7 +3141,7 @@ class AutoRegistrationObject : public QObject Q_PROPERTY(SomeNamespace::NamespacedQObject* customObjectNamespaced READ customObjectNamespaced CONSTANT) Q_PROPERTY(SomeNamespace::NamespacedNonQObject customNonQObjectNamespaced READ customNonQObjectNamespaced CONSTANT) public: - AutoRegistrationObject(QObject *parent = 0) + AutoRegistrationObject(QObject *parent = nullptr) : QObject(parent) { } diff --git a/tests/auto/tools/qdbuscpp2xml/test1.h b/tests/auto/tools/qdbuscpp2xml/test1.h index 337fada86d..69f3a2cadc 100644 --- a/tests/auto/tools/qdbuscpp2xml/test1.h +++ b/tests/auto/tools/qdbuscpp2xml/test1.h @@ -54,7 +54,7 @@ public: #endif }; - Test1(QObject *parent = 0) : QObject(parent) {} + Test1(QObject *parent = nullptr) : QObject(parent) {} int numProperty1() { return 42; } diff --git a/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp index 413b865f04..c329ca9f3e 100644 --- a/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp +++ b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp @@ -58,7 +58,7 @@ class TestNativeDialog : public QColorDialog public: QWidget *m_activeModalWidget; - TestNativeDialog(QWidget *parent = 0) + TestNativeDialog(QWidget *parent = nullptr) : QColorDialog(parent), m_activeModalWidget(0) { QTimer::singleShot(1, this, SLOT(test_activeModalWidgetSignal())); diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp index 266ed0de05..cc613b8218 100644 --- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp +++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp @@ -98,7 +98,7 @@ void tst_QDialog::getSetCheck() class ToolDialog : public QDialog { public: - ToolDialog(QWidget *parent = 0) + ToolDialog(QWidget *parent = nullptr) : QDialog(parent, Qt::Tool), mWasActive(false), mWasModalWindow(false), tId(-1) {} bool wasActive() const { return mWasActive; } diff --git a/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp b/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp index a4204da20e..49ecc7305d 100644 --- a/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp +++ b/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp @@ -44,7 +44,7 @@ void tst_QErrorMessage::dontShowAgain() { QString plainString = QLatin1String("foo"); QString htmlString = QLatin1String("foo<br>bar"); - QCheckBox *checkBox = 0; + QCheckBox *checkBox = nullptr; QErrorMessage errorMessageDialog(0); @@ -92,7 +92,7 @@ void tst_QErrorMessage::dontShowCategoryAgain() { QString htmlString = QLatin1String("foo<br>bar"); QString htmlString2 = QLatin1String("foo2<br>bar2"); - QCheckBox *checkBox = 0; + QCheckBox *checkBox = nullptr; QErrorMessage errorMessageDialog(0); diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index 4b9466d3b6..e070f74ae5 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -365,7 +365,7 @@ void tst_QFiledialog::filterSelectedSignal() void tst_QFiledialog::args() { - QWidget *parent = 0; + QWidget *parent = nullptr; QString caption = "caption"; QString directory = QDir::tempPath(); QString filter = "*.mp3"; diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp index 45ed5d7d21..92ca7f005c 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp @@ -918,7 +918,7 @@ void tst_QFileDialog2::task239706_editableFilterCombo() QVERIFY(QTest::qWaitForWindowExposed(&d)); QList<QComboBox *> comboList = d.findChildren<QComboBox *>(); - QComboBox *filterCombo = 0; + QComboBox *filterCombo = nullptr; foreach (QComboBox *combo, comboList) { if (combo->objectName() == QString("fileTypeCombo")) { filterCombo = combo; @@ -991,7 +991,7 @@ void tst_QFileDialog2::task251321_sideBarHiddenEntries() class MyQSideBar : public QSidebar { public : - MyQSideBar(QWidget *parent = 0) : QSidebar(parent) + MyQSideBar(QWidget *parent = nullptr) : QSidebar(parent) {} void removeSelection() { diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp index 3e8a81c33c..b8d2a4617c 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp @@ -372,11 +372,11 @@ void tst_QWizard::setButton() QVERIFY(qobject_cast<QCheckBox *>(wizard.button(QWizard::CustomButton2))); QVERIFY(qobject_cast<QPushButton *>(wizard.button(QWizard::CustomButton1))); - QVERIFY(toolButton != 0); + QVERIFY(toolButton != nullptr); // resetting the same button does nothing wizard.setButton(QWizard::NextButton, toolButton); - QVERIFY(toolButton != 0); + QVERIFY(toolButton != nullptr); // revert to default button wizard.setButton(QWizard::NextButton, 0); @@ -470,8 +470,8 @@ public: } void registerField(const QString &name, QWidget *widget, - const char *property = 0, - const char *changedSignal = 0) + const char *property = nullptr, + const char *changedSignal = nullptr) { QWizardPage::registerField(name, widget, property, changedSignal); } QLineEdit *edit1; @@ -2409,7 +2409,7 @@ void tst_QWizard::sideWidget() { QWizard wizard; - wizard.setSideWidget(0); + wizard.setSideWidget(nullptr); QVERIFY(!wizard.sideWidget()); QScopedPointer<QWidget> w1(new QWidget(&wizard)); wizard.setSideWidget(w1.data()); @@ -2417,11 +2417,11 @@ void tst_QWizard::sideWidget() QWidget *w2 = new QWidget(&wizard); wizard.setSideWidget(w2); QCOMPARE(wizard.sideWidget(), w2); - QVERIFY(w1->parent() != 0); + QVERIFY(w1->parent() != nullptr); QCOMPARE(w1->window(), static_cast<QWidget *>(&wizard)); QCOMPARE(w2->window(), static_cast<QWidget *>(&wizard)); - w1->setParent(0); - wizard.setSideWidget(0); + w1->setParent(nullptr); + wizard.setSideWidget(nullptr); QVERIFY(!wizard.sideWidget()); } @@ -2498,7 +2498,7 @@ void tst_QWizard::task177716_disableCommitButton() class WizardPage_task183550 : public QWizardPage { public: - WizardPage_task183550(QWidget *parent = 0) + WizardPage_task183550(QWidget *parent = nullptr) : QWizardPage(parent) , treeWidget(new QTreeWidget) , verticalPolicy(QSizePolicy::MinimumExpanding) {} diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp index cc48543a76..e090c0d851 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp @@ -41,7 +41,7 @@ class taskQTBUG_25691 : public QWizard { Q_OBJECT public: - taskQTBUG_25691( QWidget * parent = 0 ); + taskQTBUG_25691( QWidget * parent = nullptr ); ~taskQTBUG_25691(void); }; @@ -50,7 +50,7 @@ class taskQTBUG_25691Page1 : public QWizardPage { Q_OBJECT public: - taskQTBUG_25691Page1( QWidget * parent = 0 ); + taskQTBUG_25691Page1( QWidget * parent = nullptr ); ~taskQTBUG_25691Page1(void); }; @@ -59,7 +59,7 @@ class taskQTBUG_25691Page2 : public QWizardPage { Q_OBJECT public: - taskQTBUG_25691Page2( QWidget * parent = 0 ); + taskQTBUG_25691Page2( QWidget * parent = nullptr ); virtual void initializePage(void) override; diff --git a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp index bd1b56ebc1..0aead57d11 100644 --- a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp +++ b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp @@ -68,9 +68,9 @@ void tst_QGraphicsEffect::initTestCase() class CustomItem : public QGraphicsRectItem { public: - CustomItem(qreal x, qreal y, qreal width, qreal height, QGraphicsItem *parent = 0) + CustomItem(qreal x, qreal y, qreal width, qreal height, QGraphicsItem *parent = nullptr) : QGraphicsRectItem(x, y, width, height, parent), numRepaints(0), - m_painter(0), m_styleOption(0) + m_painter(nullptr), m_styleOption(nullptr) {} void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override @@ -84,8 +84,8 @@ public: void reset() { numRepaints = 0; - m_painter = 0; - m_styleOption = 0; + m_painter = nullptr; + m_styleOption = nullptr; } int numRepaints; @@ -98,7 +98,8 @@ class CustomEffect : public QGraphicsEffect public: CustomEffect() : QGraphicsEffect(), numRepaints(0), m_margin(10), - doNothingInDraw(false), m_painter(0), m_styleOption(0), m_source(0), m_opacity(1.0) + doNothingInDraw(false), m_painter(nullptr), m_styleOption(nullptr), + m_source(nullptr), m_opacity(1.0) {} QRectF boundingRectFor(const QRectF &rect) const override @@ -108,9 +109,9 @@ public: { numRepaints = 0; m_sourceChangedFlags = QGraphicsEffect::ChangeFlags(); - m_painter = 0; - m_styleOption = 0; - m_source = 0; + m_painter = nullptr; + m_styleOption = nullptr; + m_source = nullptr; m_opacity = 1.0; } @@ -645,7 +646,7 @@ void tst_QGraphicsEffect::dropShadowClipping() class MyGraphicsItem : public QGraphicsWidget { public: - MyGraphicsItem(QGraphicsItem *parent = 0) : + MyGraphicsItem(QGraphicsItem *parent = nullptr) : QGraphicsWidget(parent), nbPaint(0) {} void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp index 934505034e..f755b4eb76 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp @@ -85,7 +85,7 @@ private slots: class RectWidget : public QGraphicsWidget { public: - RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent){} + RectWidget(QGraphicsItem *parent = nullptr) : QGraphicsWidget(parent){} void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override { @@ -1112,8 +1112,8 @@ public: vspacing = 10; } - virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0, - const QWidget * widget = 0 ) const override; + virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = nullptr, + const QWidget * widget = nullptr) const override; int hspacing; int vspacing; @@ -1121,8 +1121,8 @@ public: int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, - const QStyleOption *option = 0, - const QWidget *widget = 0) const override; + const QStyleOption *option = nullptr, + const QWidget *widget = nullptr) const override; }; @@ -1132,8 +1132,8 @@ public: int CustomLayoutStyle::layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, - const QStyleOption * /*option = 0*/, - const QWidget * /*widget = 0*/) const + const QStyleOption * /*option = nullptr*/, + const QWidget * /*widget = nullptr*/) const { if (orientation == Qt::Horizontal) { switch (CT2(control1, control2)) { @@ -1153,8 +1153,8 @@ int CustomLayoutStyle::layoutSpacing(QSizePolicy::ControlType control1, } } -int CustomLayoutStyle::pixelMetric(PixelMetric metric, const QStyleOption * option /*= 0*/, - const QWidget * widget /*= 0*/ ) const +int CustomLayoutStyle::pixelMetric(PixelMetric metric, const QStyleOption * option /*= nullptr*/, + const QWidget * widget /*= nullptr*/ ) const { switch (metric) { case PM_LayoutLeftMargin: diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp index d1f8954ab9..840db1c364 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp @@ -149,7 +149,7 @@ Q_DECLARE_METATYPE(AnchorItemSizeHintList) class TestWidget : public QGraphicsWidget { public: - inline TestWidget(QGraphicsItem *parent = 0, const QString &name = QString()) + inline TestWidget(QGraphicsItem *parent = nullptr, const QString &name = QString()) : QGraphicsWidget(parent) { setContentsMargins( 0,0,0,0 ); diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp index 7e7536a94c..986ef2a126 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp @@ -119,7 +119,7 @@ private slots: class RectWidget : public QGraphicsWidget { public: - RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent), m_fnConstraint(0) {} + RectWidget(QGraphicsItem *parent = nullptr) : QGraphicsWidget(parent), m_fnConstraint(0) {} void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override { diff --git a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp index cc416f76b2..7143dec0a1 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp @@ -90,7 +90,7 @@ enum FunctionType { class TestGraphicsWidget : public QGraphicsWidget { public: - TestGraphicsWidget(QGraphicsWidget *parent = 0) : QGraphicsWidget(parent) + TestGraphicsWidget(QGraphicsWidget *parent = nullptr) : QGraphicsWidget(parent) { } bool event(QEvent *e) override @@ -229,7 +229,7 @@ void tst_QGraphicsLayout::automaticReparenting() class TestLayout : public QGraphicsLinearLayout { public: - TestLayout(QGraphicsLayoutItem *parent = 0) + TestLayout(QGraphicsLayoutItem *parent = nullptr) : QGraphicsLinearLayout(parent) { setContentsMargins(0,0,0,0); diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp index 0851b20927..4371347475 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp @@ -143,7 +143,7 @@ void tst_QGraphicsLinearLayout::initTestCase() class RectWidget : public QGraphicsWidget { public: - RectWidget(QGraphicsItem *parent = 0, const QBrush &brush = QBrush()) : QGraphicsWidget(parent){ m_brush = brush;} + RectWidget(QGraphicsItem *parent = nullptr, const QBrush &brush = QBrush()) : QGraphicsWidget(parent){ m_brush = brush;} void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override { @@ -514,7 +514,7 @@ void tst_QGraphicsLinearLayout::insertItem() for (int i = 0; i < layoutCount; ++i) layout.addItem(new SubQGraphicsLinearLayout); - QGraphicsLayoutItem *item = 0; + QGraphicsLayoutItem *item = nullptr; if (isWidget) item = new QGraphicsWidget; else @@ -571,7 +571,7 @@ void tst_QGraphicsLinearLayout::insertStretch() scene.addItem(widget); QList<QGraphicsWidget *>items; - QGraphicsWidget *item = 0; + QGraphicsWidget *item = nullptr; for (int i = 0; i < itemCount; ++i) { item = new RectWidget; item->setMinimumSize(10, 10); @@ -792,7 +792,7 @@ void tst_QGraphicsLinearLayout::removeAt() layout.addItem(new SubQGraphicsLinearLayout); QSizeF oldSizeHint = layout.sizeHint(Qt::PreferredSize, QSizeF()); - QGraphicsLayoutItem *w = 0; + QGraphicsLayoutItem *w = nullptr; if (removeItemAt >= 0 && removeItemAt < layout.count()) w = layout.itemAt(removeItemAt); if (w) { @@ -842,7 +842,7 @@ void tst_QGraphicsLinearLayout::removeItem() for (int i = 0; i < layoutCount; ++i) layout.addItem(new SubQGraphicsLinearLayout); - QGraphicsLayoutItem *w = 0; + QGraphicsLayoutItem *w = nullptr; if (removeItemAt >= 0 && removeItemAt < layout.count()) w = layout.itemAt(removeItemAt); QSizeF oldSizeHint = layout.sizeHint(Qt::PreferredSize, QSizeF()); diff --git a/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp b/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp index ddcdc809d9..482ce7d244 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp @@ -210,7 +210,7 @@ void tst_QGraphicsObject::visible() class DeleteTester : public QGraphicsObject { public: - DeleteTester(bool *w, bool *pw, QGraphicsItem *parent = 0) + DeleteTester(bool *w, bool *pw, QGraphicsItem *parent = nullptr) : QGraphicsObject(parent), wasDeleted(w), parentWasDeleted(pw) { } @@ -223,7 +223,7 @@ public: } } - void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0) override + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override { } QRectF boundingRect() const override { return QRectF(); } diff --git a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp index e7bba010d9..a8f5e396e8 100644 --- a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp @@ -74,11 +74,11 @@ public: enum Extension { UserExtension = QGraphicsItem::UserExtension }; - SubQGraphicsPixmapItem(QGraphicsItem *parent = 0) : QGraphicsPixmapItem(parent) + SubQGraphicsPixmapItem(QGraphicsItem *parent = nullptr) : QGraphicsPixmapItem(parent) { } - SubQGraphicsPixmapItem(const QPixmap &pixmap, QGraphicsItem *parent = 0) : QGraphicsPixmapItem(pixmap, parent) + SubQGraphicsPixmapItem(const QPixmap &pixmap, QGraphicsItem *parent = nullptr) : QGraphicsPixmapItem(pixmap, parent) { } diff --git a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp index 5380dd0daf..9f0d47223b 100644 --- a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp @@ -70,11 +70,11 @@ public: UserExtension = QGraphicsItem::UserExtension }; - SubQGraphicsPolygonItem(QGraphicsItem *parent = 0) : QGraphicsPolygonItem(parent) + SubQGraphicsPolygonItem(QGraphicsItem *parent = nullptr) : QGraphicsPolygonItem(parent) { } - SubQGraphicsPolygonItem(const QPolygonF &polygon, QGraphicsItem *parent = 0) : QGraphicsPolygonItem(polygon, parent) + SubQGraphicsPolygonItem(const QPolygonF &polygon, QGraphicsItem *parent = nullptr) : QGraphicsPolygonItem(polygon, parent) { } diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index 34f27dbfcf..7cb441a925 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -170,7 +170,7 @@ class SubQGraphicsProxyWidget : public QGraphicsProxyWidget { public: - SubQGraphicsProxyWidget(QGraphicsItem *parent = 0) : QGraphicsProxyWidget(parent), + SubQGraphicsProxyWidget(QGraphicsItem *parent = nullptr) : QGraphicsProxyWidget(parent), paintCount(0), keyPress(0), focusOut(0) {} @@ -225,7 +225,7 @@ public: void call_showEvent(QShowEvent* event) { return SubQGraphicsProxyWidget::showEvent(event); } - void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) { + void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) { paintCount++; QGraphicsProxyWidget::paint(painter, option, widget); } @@ -1482,7 +1482,7 @@ void tst_QGraphicsProxyWidget::maximumSize() class View : public QGraphicsView { public: - View(QGraphicsScene *scene, QWidget *parent = 0) + View(QGraphicsScene *scene, QWidget *parent = nullptr) : QGraphicsView(scene, parent), npaints(0) { } QRegion paintEventRegion; @@ -2758,7 +2758,7 @@ void tst_QGraphicsProxyWidget::childPos() QApplication::processEvents(); QApplication::processEvents(); - QWidget *menu = 0; + QWidget *menu = nullptr; foreach (QObject *child, box->children()) { if ((menu = qobject_cast<QWidget *>(child))) break; @@ -3670,7 +3670,7 @@ void tst_QGraphicsProxyWidget::windowFrameMargins() class HoverButton : public QPushButton { public: - HoverButton(QWidget *parent = 0) : QPushButton(parent), hoverLeaveReceived(false) + HoverButton(QWidget *parent = nullptr) : QPushButton(parent), hoverLeaveReceived(false) {} bool hoverLeaveReceived; @@ -3830,7 +3830,7 @@ void tst_QGraphicsProxyWidget::QTBUG_43780_visibility() class TouchWidget : public QWidget { public: - TouchWidget(QWidget *parent = 0) : QWidget(parent) {} + TouchWidget(QWidget *parent = nullptr) : QWidget(parent) {} bool event(QEvent *event) { diff --git a/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp index d875eb1db4..640e0418e5 100644 --- a/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp @@ -73,7 +73,7 @@ void tst_QGraphicsSceneIndex::common_data() QGraphicsSceneIndex *tst_QGraphicsSceneIndex::createIndex(const QString &indexMethod) { - QGraphicsSceneIndex *index = 0; + QGraphicsSceneIndex *index = nullptr; QGraphicsScene *scene = new QGraphicsScene(); if (indexMethod == "bsp") index = new QGraphicsSceneBspTreeIndex(scene); @@ -277,7 +277,7 @@ class RectWidget : public QGraphicsWidget { Q_OBJECT public: - RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent) + RectWidget(QGraphicsItem *parent = nullptr) : QGraphicsWidget(parent) { } @@ -333,7 +333,7 @@ void tst_QGraphicsSceneIndex::clear() class MyItem : public QGraphicsItem { public: - MyItem(QGraphicsItem *parent = 0) : QGraphicsItem(parent), numPaints(0) {} + MyItem(QGraphicsItem *parent = nullptr) : QGraphicsItem(parent), numPaints(0) {} int numPaints; protected: QRectF boundingRect() const override { return QRectF(0, 0, 10, 10); } diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 42a16dc1f4..41d29e9b7b 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -1593,7 +1593,7 @@ public: : QGraphicsRectItem(rect), numPaints(0) { } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override { ++numPaints; QGraphicsRectItem::paint(painter, option, widget); @@ -2422,7 +2422,7 @@ class CustomView : public QGraphicsView { Q_OBJECT public: - CustomView(QGraphicsScene *s = 0) : QGraphicsView(s) {} + CustomView(QGraphicsScene *s = nullptr) : QGraphicsView(s) {} CustomView(QGraphicsScene *s, QWidget *parent) : QGraphicsView(s, parent) {} QList<QRegion> lastUpdateRegions; @@ -3152,7 +3152,7 @@ void tst_QGraphicsView::itemsUnderMouse() class QGraphicsTextItem_task172231 : public QGraphicsTextItem { public: - QGraphicsTextItem_task172231(const QString & text, QGraphicsItem * parent = 0) + QGraphicsTextItem_task172231(const QString & text, QGraphicsItem * parent = nullptr) : QGraphicsTextItem(text, parent) {} QRectF exposedRect; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override @@ -3397,7 +3397,7 @@ void tst_QGraphicsView::task239729_noViewUpdate() // The scene's changed signal is connected to something that isn't a view. QGraphicsScene scene; ChangedListener cl; - QGraphicsView *view = 0; + QGraphicsView *view = nullptr; if (a) { view = new QGraphicsView(&scene); @@ -4835,7 +4835,7 @@ void tst_QGraphicsView::hoverLeave() class IMItem : public QGraphicsRectItem { public: - IMItem(QGraphicsItem *parent = 0): + IMItem(QGraphicsItem *parent = nullptr): QGraphicsRectItem(QRectF(0, 0, 20, 20), parent) { setFlag(QGraphicsItem::ItemIsFocusable, true); diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index 4298cc3da7..f31b82b2bb 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -174,7 +174,7 @@ private slots: // Subclass that exposes the protected functions. class SubQGraphicsWidget : public QGraphicsWidget { public: - SubQGraphicsWidget(QGraphicsItem *parent = 0, Qt::WindowFlags windowFlags = { }) + SubQGraphicsWidget(QGraphicsItem *parent = nullptr, Qt::WindowFlags windowFlags = { }) : QGraphicsWidget(parent, windowFlags), eventCount(0) { } @@ -254,7 +254,7 @@ protected: class SizeHinter : public QGraphicsWidget { public: - SizeHinter(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = { }, + SizeHinter(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = { }, const QSizeF &min = QSizeF(5,5), const QSizeF &pref = QSizeF(50, 50), const QSizeF &max = QSizeF(500, 500)) @@ -382,7 +382,7 @@ void tst_QGraphicsWidget::dumpFocusChain() // ### this test is very strange... QFETCH(bool, scene); SubQGraphicsWidget *parent = new SubQGraphicsWidget; - QGraphicsScene *theScene = 0; + QGraphicsScene *theScene = nullptr; if (scene) { theScene = new QGraphicsScene(this); theScene->addItem(parent); @@ -518,7 +518,7 @@ void tst_QGraphicsWidget::focusWidget2() class FocusWatchWidget : public QGraphicsWidget { public: - FocusWatchWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent) { gotFocusInCount = 0; gotFocusOutCount = 0; } + FocusWatchWidget(QGraphicsItem *parent = nullptr) : QGraphicsWidget(parent) { gotFocusInCount = 0; gotFocusOutCount = 0; } int gotFocusInCount, gotFocusOutCount; protected: void focusInEvent(QFocusEvent *fe) { gotFocusInCount++; QGraphicsWidget::focusInEvent(fe); } @@ -1396,7 +1396,7 @@ void tst_QGraphicsWidget::setTabOrder() QApplication::setActiveWindow(&view); QVERIFY(QTest::qWaitForWindowActive(&view)); - QGraphicsWidget *lastItem = 0; + QGraphicsWidget *lastItem = nullptr; QTest::ignoreMessage(QtWarningMsg, "QGraphicsWidget::setTabOrder(0, 0) is undefined"); QGraphicsWidget::setTabOrder(0, 0); @@ -2587,7 +2587,7 @@ void tst_QGraphicsWidget::shortcutsDeletion() class MessUpPainterWidget : public QGraphicsWidget { public: - MessUpPainterWidget(QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = { }) + MessUpPainterWidget(QGraphicsItem * parent = nullptr, Qt::WindowFlags wFlags = { }) : QGraphicsWidget(parent, wFlags) {} @@ -3278,8 +3278,7 @@ void tst_QGraphicsWidget::itemSendGeometryPosChangesDeactivated() item->setGeometry(QRectF(0, 0, 60, 60)); QCOMPARE(item->geometry(), QRectF(0, 0, 60, 60)); QCOMPARE(item->pos(), QPointF(0, 0)); - item->setPos(QPointF(10, 10)); - QCOMPARE(item->pos(), QPointF(10, 10)); + item->setPos(QPointF(10, 10)); QCOMPARE(item->pos(), QPointF(10, 10)); QCOMPARE(item->geometry(), QRectF(10, 10, 60, 60)); } @@ -3287,7 +3286,7 @@ class TabFocusWidget : public QGraphicsWidget { Q_OBJECT public: - TabFocusWidget(const QString &name, QGraphicsItem *parent = 0) + TabFocusWidget(const QString &name, QGraphicsItem *parent = nullptr) : QGraphicsWidget(parent) { setFocusPolicy(Qt::TabFocus); setData(0, name); } }; diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp index 16f8b97d49..a8a39b7113 100644 --- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp +++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp @@ -72,7 +72,7 @@ Q_DECLARE_METATYPE(QAbstractItemDelegate::EndEditHint) class TestItemDelegate : public QItemDelegate { public: - TestItemDelegate(QObject *parent = 0) : QItemDelegate(parent) {} + TestItemDelegate(QObject *parent = nullptr) : QItemDelegate(parent) {} ~TestItemDelegate() {} void drawDisplay(QPainter *painter, @@ -829,7 +829,7 @@ public: m_editor = 0; // but clear the variable } - ChooseEditorDelegate(QObject *parent = 0) : QItemDelegate(parent) { } + ChooseEditorDelegate(QObject *parent = nullptr) : QItemDelegate(parent) { } void setNextOpenEditor(QWidget *w) { m_editor = w; } QWidget* currentEditor() const { return m_editor; } private: diff --git a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp index 00e82248d4..c63a3c6a52 100644 --- a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp +++ b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp @@ -70,15 +70,15 @@ public: vspacing = 10; } - virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0, - const QWidget * widget = 0 ) const override; + virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = nullptr, + const QWidget * widget = nullptr ) const override; int hspacing; int vspacing; }; -int CustomLayoutStyle::pixelMetric(PixelMetric metric, const QStyleOption * option /*= 0*/, - const QWidget * widget /*= 0*/ ) const +int CustomLayoutStyle::pixelMetric(PixelMetric metric, const QStyleOption * option /*= nullptr*/, + const QWidget * widget /*= nullptr*/ ) const { switch (metric) { case PM_LayoutLeftMargin: diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp index 06e82ecac8..d718a6c7d7 100644 --- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp +++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp @@ -297,15 +297,15 @@ public: vspacing = 10; } - virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0, - const QWidget * widget = 0 ) const override; + virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = nullptr, + const QWidget * widget = nullptr) const override; int hspacing; int vspacing; }; -int CustomLayoutStyle::pixelMetric(PixelMetric metric, const QStyleOption * option /*= 0*/, - const QWidget * widget /*= 0*/ ) const +int CustomLayoutStyle::pixelMetric(PixelMetric metric, const QStyleOption * option /*= nullptr*/, + const QWidget * widget /*= nullptr*/ ) const { switch (metric) { case PM_LayoutHorizontalSpacing: @@ -391,7 +391,7 @@ void tst_QFormLayout::contentsRect() class DummyMacStyle : public QCommonStyle { public: - virtual int styleHint ( StyleHint hint, const QStyleOption * option = 0, const QWidget * widget = 0, QStyleHintReturn * returnData = 0 ) const override + virtual int styleHint ( StyleHint hint, const QStyleOption * option = 0, const QWidget * widget = nullptr, QStyleHintReturn * returnData = 0 ) const override { switch(hint) { case SH_FormLayoutFormAlignment: @@ -411,7 +411,7 @@ public: class DummyQtopiaStyle : public QCommonStyle { public: - virtual int styleHint ( StyleHint hint, const QStyleOption * option = 0, const QWidget * widget = 0, QStyleHintReturn * returnData = 0 ) const override + virtual int styleHint ( StyleHint hint, const QStyleOption * option = 0, const QWidget * widget = nullptr, QStyleHintReturn * returnData = 0 ) const override { switch(hint) { case SH_FormLayoutFormAlignment: diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp index 69d85df597..411ca7120e 100644 --- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp +++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp @@ -381,9 +381,9 @@ void tst_QGridLayout::setMinAndMaxSize() class SizeHinter : public QWidget { public: - SizeHinter(const QSize &s, QWidget *parent = 0) + SizeHinter(const QSize &s, QWidget *parent = nullptr) : QWidget(parent), sh(s) { } - SizeHinter(int w, int h, QWidget *parent = 0) + SizeHinter(int w, int h, QWidget *parent = nullptr) : QWidget(parent), sh(QSize(w,h)) {} void setSizeHint(QSize s) { sh = s; } QSize sizeHint() const override { return sh; } @@ -489,7 +489,7 @@ typedef QList<QPoint> PointList; class SizeHinterFrame : public QLabel { public: - SizeHinterFrame(QWidget *parent = 0) + SizeHinterFrame(QWidget *parent = nullptr) : QLabel(parent) { init(-1); @@ -900,8 +900,8 @@ public: reimplementSubelementRect = false; } - virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0, - const QWidget * widget = 0 ) const override; + virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = nullptr, + const QWidget * widget = nullptr ) const override; virtual QRect subElementRect(SubElement sr, const QStyleOption *opt, const QWidget *widget) const override; @@ -912,8 +912,8 @@ public: int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, - const QStyleOption *option = 0, - const QWidget *widget = 0) const override; + const QStyleOption *option = nullptr, + const QWidget *widget = nullptr) const override; }; @@ -945,8 +945,8 @@ QRect CustomLayoutStyle::subElementRect(SubElement sr, const QStyleOption *opt, int CustomLayoutStyle::layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, - const QStyleOption * /*option = 0*/, - const QWidget * /*widget = 0*/) const + const QStyleOption * /*option = nullptr*/, + const QWidget * /*widget = nullptr*/) const { if (orientation == Qt::Horizontal) { switch (CT2(control1, control2)) { @@ -966,8 +966,8 @@ int CustomLayoutStyle::layoutSpacing(QSizePolicy::ControlType control1, } } -int CustomLayoutStyle::pixelMetric(PixelMetric metric, const QStyleOption * option /*= 0*/, - const QWidget * widget /*= 0*/ ) const +int CustomLayoutStyle::pixelMetric(PixelMetric metric, const QStyleOption * option /*= nullptr*/, + const QWidget * widget /*= nullptr*/ ) const { switch (metric) { case PM_LayoutLeftMargin: diff --git a/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp index 053f4948a7..1b492d9a0f 100644 --- a/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp +++ b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp @@ -64,7 +64,7 @@ class Widget_task183679 : public QWidget { Q_OBJECT public: - Widget_task183679(QWidget *parent = 0) : QWidget(parent) {} + Widget_task183679(QWidget *parent = nullptr) : QWidget(parent) {} void showDelayedToolTip(int msecs) { diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp index 17b119410f..72e6c2ce32 100644 --- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp +++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp @@ -966,7 +966,7 @@ class ResizeWidget : public QWidget { Q_OBJECT public: - ResizeWidget(QWidget *parent = 0) + ResizeWidget(QWidget *parent = nullptr) : QWidget(parent) , resizeCount(0) { } @@ -1110,7 +1110,7 @@ class MoveWidget : public QWidget { Q_OBJECT public: - MoveWidget(QWidget *parent = 0) + MoveWidget(QWidget *parent = nullptr) : QWidget(parent) , moveCount(0) { } diff --git a/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp b/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp index 300320ca5d..1a6eb435a7 100644 --- a/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp +++ b/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp @@ -49,7 +49,7 @@ class CustomWidget : public QWidget { Q_OBJECT public: - CustomWidget(QWidget *parent = 0) + CustomWidget(QWidget *parent = nullptr) : QWidget(parent) { diff --git a/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp b/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp index 95bad0e903..18f07bbc42 100644 --- a/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp +++ b/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp @@ -149,7 +149,7 @@ void tst_QWidgetsVariant::writeToReadFromDataStream() class CustomQWidget : public QWidget { Q_OBJECT public: - CustomQWidget(QWidget *parent = 0) : QWidget(parent) {} + CustomQWidget(QWidget *parent = nullptr) : QWidget(parent) {} }; void tst_QWidgetsVariant::qvariant_cast_QObject_data() diff --git a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp index 4a5702b709..16fe57f330 100644 --- a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp +++ b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp @@ -75,7 +75,7 @@ private: static int vgap(QWidget *widget1, QWidget *widget2) { return gap(widget1, widget2).height(); } static void setSize(QWidget *widget, QStyleHelper::WidgetSizePolicy size); static int spacing(ControlType control1, ControlType control2, Qt::Orientation orientation, - QStyleOption *option = 0, QWidget *widget = 0); + QStyleOption *option = nullptr, QWidget *widget = nullptr); static int hspacing(ControlType control1, ControlType control2, QStyleHelper::WidgetSizePolicy size = QStyleHelper::SizeLarge); static int vspacing(ControlType control1, ControlType control2, QStyleHelper::WidgetSizePolicy size = QStyleHelper::SizeLarge); }; diff --git a/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp b/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp index 1d46886d1c..0bf7b73906 100644 --- a/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp +++ b/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp @@ -45,16 +45,16 @@ struct StyleOptionPointerBase { QStyleOption *pointer; - StyleOptionPointerBase(QStyleOption *p = 0) : pointer(p) { } + StyleOptionPointerBase(QStyleOption *p = nullptr) : pointer(p) { } - virtual ~StyleOptionPointerBase() { pointer = 0; } + virtual ~StyleOptionPointerBase() { pointer = nullptr; } }; template <typename T> struct StyleOptionPointer: public StyleOptionPointerBase { - StyleOptionPointer(T *p = 0): StyleOptionPointerBase(p) {} - ~StyleOptionPointer() { delete static_cast<T *>(pointer); pointer = 0; } + StyleOptionPointer(T *p = nullptr): StyleOptionPointerBase(p) {} + ~StyleOptionPointer() { delete static_cast<T *>(pointer); pointer = nullptr; } }; Q_DECLARE_METATYPE(StyleOptionPointerBase*) @@ -94,25 +94,25 @@ void tst_QStyleOption::qstyleoptioncast() QFETCH(bool, canCastToComplex); QFETCH(int, type); - QVERIFY(testOption->pointer != 0); + QVERIFY(testOption->pointer != nullptr); QCOMPARE(testOption->pointer->type, type); // Cast to common base class QStyleOption *castOption = qstyleoption_cast<QStyleOption*>(testOption->pointer); - QVERIFY(castOption != 0); + QVERIFY(castOption != nullptr); // Cast to complex base class castOption = qstyleoption_cast<QStyleOptionComplex*>(testOption->pointer); - QCOMPARE(canCastToComplex, (castOption != 0)); + QCOMPARE(canCastToComplex, (castOption != nullptr)); // Cast to combo box castOption = qstyleoption_cast<QStyleOptionComboBox*>(testOption->pointer); - QCOMPARE((castOption != 0),(testOption->pointer->type == QStyleOption::SO_ComboBox)); + QCOMPARE((castOption != nullptr),(testOption->pointer->type == QStyleOption::SO_ComboBox)); // Cast to button castOption = qstyleoption_cast<QStyleOptionButton*>(testOption->pointer); - QCOMPARE((castOption != 0),(testOption->pointer->type == QStyleOption::SO_Button)); + QCOMPARE((castOption != nullptr),(testOption->pointer->type == QStyleOption::SO_Button)); // Cast to lower version testOption->pointer->version += 1; diff --git a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp index 3b2bc1d126..26198c9aff 100644 --- a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp +++ b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp @@ -102,7 +102,7 @@ private: class MyButton : public QAbstractButton { public: - MyButton(QWidget *p = 0) : QAbstractButton(p) {} + MyButton(QWidget *p = nullptr) : QAbstractButton(p) {} void paintEvent(QPaintEvent *) override { QPainter p(this); diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index c7d918fa6a..30f51e1d42 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -1822,7 +1822,7 @@ class ReturnClass : public QWidget { Q_OBJECT public: - ReturnClass(QWidget *parent = 0) + ReturnClass(QWidget *parent = nullptr) : QWidget(parent), received(false) { QComboBox *box = new QComboBox(this); @@ -2303,7 +2303,7 @@ class task166349_ComboBox : public QComboBox { Q_OBJECT public: - task166349_ComboBox(QWidget *parent = 0) : QComboBox(parent) + task166349_ComboBox(QWidget *parent = nullptr) : QComboBox(parent) { QStringList list; list << "one" << "two"; diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp index ef813c3021..e8aafa9c03 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp @@ -89,7 +89,7 @@ class EditorDateEdit : public QDateTimeEdit { Q_OBJECT public: - EditorDateEdit(QWidget *parent = 0) : QDateTimeEdit(parent) {} + EditorDateEdit(QWidget *parent = nullptr) : QDateTimeEdit(parent) {} QLineEdit *lineEdit() { return QDateTimeEdit::lineEdit(); } friend class tst_QDateTimeEdit; }; diff --git a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp index 04a68dd80f..66a4dff584 100644 --- a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp +++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp @@ -49,7 +49,7 @@ class DoubleSpinBox : public QDoubleSpinBox { Q_OBJECT public: - DoubleSpinBox(QWidget *parent = 0) + DoubleSpinBox(QWidget *parent = nullptr) : QDoubleSpinBox(parent) { /*connect(this, SIGNAL(valueChanged(double)), this, SLOT(foo(double)));*/ } QString textFromValue(double v) const override @@ -1081,7 +1081,7 @@ void tst_QDoubleSpinBox::undoRedo() struct task199226_DoubleSpinBox : public QDoubleSpinBox { - task199226_DoubleSpinBox(QWidget *parent = 0) : QDoubleSpinBox(parent) {} + task199226_DoubleSpinBox(QWidget *parent = nullptr) : QDoubleSpinBox(parent) {} QLineEdit *lineEdit() { return QAbstractSpinBox::lineEdit(); } }; diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 9851e9edbd..e4bf36efaa 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -904,7 +904,7 @@ static const int chars = 8; class ValidatorWithFixup : public QValidator { public: - ValidatorWithFixup(QWidget *parent = 0) + ValidatorWithFixup(QWidget *parent = nullptr) : QValidator(parent) {} @@ -3151,7 +3151,7 @@ void tst_QLineEdit::cutWithoutSelection() class InputMaskValidator : public QValidator { public: - InputMaskValidator(QObject *parent, const char *name = 0) : QValidator(parent) { setObjectName(name); } + InputMaskValidator(QObject *parent, const char *name = nullptr) : QValidator(parent) { setObjectName(name); } State validate(QString &text, int &pos) const override { InputMaskValidator *that = (InputMaskValidator *)this; @@ -3671,7 +3671,7 @@ void tst_QLineEdit::cursor() class task180999_Widget : public QWidget { public: - task180999_Widget(QWidget *parent = 0) : QWidget(parent) + task180999_Widget(QWidget *parent = nullptr) : QWidget(parent) { QHBoxLayout *layout = new QHBoxLayout(this); lineEdit1.setText("some text 1 ..."); @@ -3776,7 +3776,7 @@ class task198789_Widget : public QWidget { Q_OBJECT public: - task198789_Widget(QWidget *parent = 0) : QWidget(parent) + task198789_Widget(QWidget *parent = nullptr) : QWidget(parent) { QStringList wordList; wordList << "alpha" << "omega" << "omicron" << "zeta"; diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp index b0fc8a3bfa..75721bf7a7 100644 --- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp @@ -1456,7 +1456,7 @@ void tst_QMainWindow::createPopupMenu() class MyDockWidget : public QDockWidget { public: - MyDockWidget(QWidget * = 0) { + MyDockWidget(QWidget * = nullptr) { create(); // otherwise hide() doesn't result in a hide event } }; @@ -1464,7 +1464,7 @@ public: class MyWidget : public QWidget { public: - MyWidget(QWidget *parent = 0) : QWidget(parent) + MyWidget(QWidget *parent = nullptr) : QWidget(parent) { } @@ -1522,10 +1522,10 @@ void AddDockWidget::apply(QMainWindow *mw) const dw->setObjectName(name); dw->setWindowTitle(name); - QDockWidget *other = 0; + QDockWidget *other = nullptr; if (mode == SplitMode || mode == TabMode) { other = mw->findChild<QDockWidget*>(this->other); - QVERIFY(other != 0); + QVERIFY(other != nullptr); } switch (mode) { diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index 53dbf2012f..12593298e8 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -791,7 +791,7 @@ void tst_QMdiArea::changeModified() class MyChild : public QWidget { public: - MyChild(QWidget *parent = 0) : QWidget(parent) {} + MyChild(QWidget *parent = nullptr) : QWidget(parent) {} QSize sizeHint() const override { return QSize(234, 123); } }; @@ -865,7 +865,7 @@ void tst_QMdiArea::fixedSize() class LargeWidget : public QWidget { public: - LargeWidget(QWidget *parent = 0) : QWidget(parent) {} + LargeWidget(QWidget *parent = nullptr) : QWidget(parent) {} QSize sizeHint() const override { return QSize(1280, 1024); } QSize minimumSizeHint() const override { return QSize(300, 300); } }; diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index 9a6cf3bfcf..e0f3381b8d 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -534,7 +534,7 @@ void tst_QMenu::statusTip() QRect rect1 = tb.actionGeometry(&a); QToolButton *btn = qobject_cast<QToolButton*>(tb.childAt(rect1.center())); - QVERIFY(btn != NULL); + QVERIFY(btn != nullptr); //because showMenu calls QMenu::exec, we need to use a singleshot //to continue the test @@ -1035,7 +1035,7 @@ void tst_QMenu::deleteActionInTriggered() class PopulateOnAboutToShowTestMenu : public QMenu { Q_OBJECT public: - explicit PopulateOnAboutToShowTestMenu(QWidget *parent = 0); + explicit PopulateOnAboutToShowTestMenu(QWidget *parent = nullptr); public slots: void populateMenu(); diff --git a/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp b/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp index c14b3aa9d8..668d301205 100644 --- a/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp +++ b/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp @@ -80,7 +80,7 @@ void tst_QScrollArea::getSetCheck() class WidgetWithMicroFocus : public QWidget { public: - WidgetWithMicroFocus(QWidget *parent = 0) : QWidget(parent) + WidgetWithMicroFocus(QWidget *parent = nullptr) : QWidget(parent) { setBackgroundRole(QPalette::Dark); } diff --git a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp index 92771db764..a40ce538b2 100644 --- a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp +++ b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp @@ -52,7 +52,7 @@ private slots: class SingleStepTestScrollBar : public QScrollBar { Q_OBJECT public: - explicit SingleStepTestScrollBar(Qt::Orientation o, QWidget *parent = 0) : QScrollBar(o, parent) {} + explicit SingleStepTestScrollBar(Qt::Orientation o, QWidget *parent = nullptr) : QScrollBar(o, parent) {} public slots: void hideAndShow() @@ -99,7 +99,7 @@ void tst_QScrollBar::task_209492() { public: int scrollCount; - MyScrollArea(QWidget *parent = 0) : QScrollArea(parent), scrollCount(0) {} + MyScrollArea(QWidget *parent = nullptr) : QScrollArea(parent), scrollCount(0) {} protected: void paintEvent(QPaintEvent *) override { QTest::qSleep(600); } void scrollContentsBy(int, int) override { ++scrollCount; viewport()->update(); } diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp index 35f796a37f..832635cc32 100644 --- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp +++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp @@ -61,7 +61,7 @@ class SpinBox : public QSpinBox { public: - SpinBox(QWidget *parent = 0) + SpinBox(QWidget *parent = nullptr) : QSpinBox(parent) {} QString textFromValue(int v) const override @@ -508,7 +508,7 @@ void tst_QSpinBox::valueChangedHelper(int value) class ReadOnlyChangeTracker: public QSpinBox { public: - ReadOnlyChangeTracker(QWidget *parent = 0) : QSpinBox(parent) {} + ReadOnlyChangeTracker(QWidget *parent = nullptr) : QSpinBox(parent) {} void changeEvent(QEvent *ev) override { diff --git a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp index b63e917e5c..36cb15fa1f 100644 --- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp +++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp @@ -147,7 +147,7 @@ void tst_QSplitter::init() void tst_QSplitter::removeThirdWidget() { delete w3; - w3 = 0; + w3 = nullptr; int handleWidth = splitter->style()->pixelMetric(QStyle::PM_SplitterWidth); splitter->setFixedSize(400 + handleWidth, 400); } @@ -302,7 +302,7 @@ class TestSplitterStyle : public QProxyStyle { public: TestSplitterStyle() : handleWidth(5) {} - int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const override + int pixelMetric(PixelMetric metric, const QStyleOption *option = nullptr, const QWidget *widget = nullptr) const override { if (metric == QStyle::PM_SplitterWidth) return handleWidth; @@ -652,7 +652,7 @@ void tst_QSplitter::testRemoval() class MyFriendlySplitter : public QSplitter { public: - MyFriendlySplitter(QWidget *parent = 0) : QSplitter(parent) {} + MyFriendlySplitter(QWidget *parent = nullptr) : QSplitter(parent) {} void setRubberBand(int pos) { QSplitter::setRubberBand(pos); } void moveSplitter(int pos, int index) { QSplitter::moveSplitter(pos, index); } diff --git a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp index 2afbd44c03..c8e399f0f8 100644 --- a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp +++ b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp @@ -671,7 +671,7 @@ class TitleChangeTabBar : public QTabBar int count; public: - TitleChangeTabBar(QWidget * parent = 0) : QTabBar(parent), count(0) + TitleChangeTabBar(QWidget * parent = nullptr) : QTabBar(parent), count(0) { setMovable(true); addTab("0"); diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp index 4054e35e8d..a90ae9a55b 100644 --- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp @@ -2642,7 +2642,7 @@ void tst_QTextEdit::findWithRegularExpressionReturnsFalseIfNoMoreResults() class TextEdit : public QTextEdit { public: - TextEdit(QWidget *parent = 0) + TextEdit(QWidget *parent = nullptr) : QTextEdit(parent) {} void wheelEvent(QWheelEvent *event) override diff --git a/tests/baselineserver/shared/baselineprotocol.h b/tests/baselineserver/shared/baselineprotocol.h index 4eda649c40..510762e304 100644 --- a/tests/baselineserver/shared/baselineprotocol.h +++ b/tests/baselineserver/shared/baselineprotocol.h @@ -128,7 +128,7 @@ public: BaselineProtocol(); ~BaselineProtocol(); - static BaselineProtocol *instance(QObject *parent = 0); + static BaselineProtocol *instance(QObject *parent = nullptr); // **************************************************** // Important constants here @@ -157,12 +157,12 @@ public: // For client: // For advanced client: - bool connect(const QString &testCase, bool *dryrun = 0, const PlatformInfo& clientInfo = PlatformInfo()); + bool connect(const QString &testCase, bool *dryrun = nullptr, const PlatformInfo& clientInfo = PlatformInfo()); bool disconnect(); bool requestBaselineChecksums(const QString &testFunction, ImageItemList *itemList); bool submitMatch(const ImageItem &item, QByteArray *serverMsg); bool submitNewBaseline(const ImageItem &item, QByteArray *serverMsg); - bool submitMismatch(const ImageItem &item, QByteArray *serverMsg, bool *fuzzyMatch = 0); + bool submitMismatch(const ImageItem &item, QByteArray *serverMsg, bool *fuzzyMatch = nullptr); // For server: bool acceptConnection(PlatformInfo *pi); diff --git a/tests/baselineserver/shared/qbaselinetest.h b/tests/baselineserver/shared/qbaselinetest.h index 60c50da9d9..ede0fe42e3 100644 --- a/tests/baselineserver/shared/qbaselinetest.h +++ b/tests/baselineserver/shared/qbaselinetest.h @@ -36,7 +36,7 @@ void setAutoMode(bool mode); void setSimFail(bool fail); void handleCmdLineArgs(int *argcp, char ***argvp); void addClientProperty(const QString& key, const QString& value); -bool connectToBaselineServer(QByteArray *msg = 0, const QString &testProject = QString(), const QString &testCase = QString()); +bool connectToBaselineServer(QByteArray *msg = nullptr, const QString &testProject = QString(), const QString &testCase = QString()); bool checkImage(const QImage& img, const char *name, quint16 checksum, QByteArray *msg, bool *error, int manualdatatag = 0); bool testImage(const QImage& img, QByteArray *msg, bool *error); QTestData &newRow(const char *dataTag, quint16 checksum = 0); diff --git a/tests/baselineserver/src/baselineserver.h b/tests/baselineserver/src/baselineserver.h index f2336497f6..25ef17f023 100644 --- a/tests/baselineserver/src/baselineserver.h +++ b/tests/baselineserver/src/baselineserver.h @@ -54,7 +54,7 @@ class BaselineServer : public QTcpServer Q_OBJECT public: - BaselineServer(QObject *parent = 0); + BaselineServer(QObject *parent = nullptr); static QString storagePath(); static QString baseUrl(); @@ -117,7 +117,7 @@ private slots: void idleClientTimeout(); private: - bool checkClient(QByteArray *errMsg, bool *dryRunMode = 0); + bool checkClient(QByteArray *errMsg, bool *dryRunMode = nullptr); bool establishConnection(); void provideBaselineChecksums(const QByteArray &itemListBlock); void recordMatch(const QByteArray &itemBlock); diff --git a/tests/benchmarks/corelib/json/tst_bench_qtjson.cpp b/tests/benchmarks/corelib/json/tst_bench_qtjson.cpp index 3a7996f4e7..fe0d2ef4d4 100644 --- a/tests/benchmarks/corelib/json/tst_bench_qtjson.cpp +++ b/tests/benchmarks/corelib/json/tst_bench_qtjson.cpp @@ -34,7 +34,7 @@ class BenchmarkQtJson: public QObject { Q_OBJECT public: - BenchmarkQtJson(QObject *parent = 0); + BenchmarkQtJson(QObject *parent = nullptr); private Q_SLOTS: void initTestCase(); diff --git a/tests/benchmarks/dbus/qdbusperformance/serverobject.h b/tests/benchmarks/dbus/qdbusperformance/serverobject.h index 24f1465f6b..f3c2d96f02 100644 --- a/tests/benchmarks/dbus/qdbusperformance/serverobject.h +++ b/tests/benchmarks/dbus/qdbusperformance/serverobject.h @@ -38,7 +38,7 @@ class ServerObject: public QObject Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.qtproject.autotests.Performance") public: - ServerObject(const QString &objectPath, QDBusConnection conn, QObject *parent = 0) + ServerObject(const QString &objectPath, QDBusConnection conn, QObject *parent = nullptr) : QObject(parent) { conn.registerObject(objectPath, this, QDBusConnection::ExportAllSlots); diff --git a/tests/benchmarks/network/access/qnetworkreply_from_cache/tst_qnetworkreply_from_cache.cpp b/tests/benchmarks/network/access/qnetworkreply_from_cache/tst_qnetworkreply_from_cache.cpp index ff8e49a9a8..00670f8838 100644 --- a/tests/benchmarks/network/access/qnetworkreply_from_cache/tst_qnetworkreply_from_cache.cpp +++ b/tests/benchmarks/network/access/qnetworkreply_from_cache/tst_qnetworkreply_from_cache.cpp @@ -38,7 +38,7 @@ class NetworkDiskCache : public QNetworkDiskCache { public: - NetworkDiskCache(QObject *parent = 0) + NetworkDiskCache(QObject *parent = nullptr) : QNetworkDiskCache(parent) { } diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.h index 8cd295ba89..80c3b3b943 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.h @@ -44,7 +44,7 @@ class AbstractItemView : public AbstractScrollArea { Q_OBJECT public: - AbstractItemView(QGraphicsWidget *parent = 0); + AbstractItemView(QGraphicsWidget *parent = nullptr); virtual ~AbstractItemView(); virtual void setContainer(AbstractItemContainer *container); virtual void setModel(QAbstractItemModel *model, AbstractViewItem *prototype); diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.h index f681ca9fce..4c530b2059 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.h @@ -40,7 +40,7 @@ class AbstractScrollArea : public GvbWidget public: - AbstractScrollArea(QGraphicsWidget *parent = 0); + AbstractScrollArea(QGraphicsWidget *parent = nullptr); ~AbstractScrollArea(); public: diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.h index 4f9fbf4623..423ed4f654 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.h @@ -41,7 +41,7 @@ class AbstractViewItem : public GvbWidget { Q_OBJECT public: - AbstractViewItem(QGraphicsWidget *parent = 0); + AbstractViewItem(QGraphicsWidget *parent = nullptr); virtual ~AbstractViewItem(); virtual AbstractViewItem *newItemInstance() = 0; diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h index 1212703ddb..f9f0a9a2cd 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h @@ -37,7 +37,7 @@ class GvbWidget : public QGraphicsWidget public: - GvbWidget(QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = { }); + GvbWidget(QGraphicsItem * parent = nullptr, Qt::WindowFlags wFlags = { }); ~GvbWidget(); virtual void keyPressEvent(QKeyEvent *event); }; diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h index 48d1bafe9f..a2dc81e4f5 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h @@ -42,7 +42,7 @@ class IconItem : public GvbWidget public: - IconItem(const QString &filename = "", QGraphicsItem *parent = 0); + IconItem(const QString &filename = "", QGraphicsItem *parent = nullptr); virtual ~IconItem(); diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.h index a69b60c9e2..15969a6e09 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.h @@ -42,7 +42,7 @@ class ItemRecyclingList : public ItemRecyclingListView Q_OBJECT public: - ItemRecyclingList(const int itemBuffer = 4, QGraphicsWidget * parent = 0); + ItemRecyclingList(const int itemBuffer = 4, QGraphicsWidget * parent = nullptr); virtual ~ItemRecyclingList(); virtual void insertItem(int index, RecycledListItem *item); diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.h index 467f193604..28c5c0acb0 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.h @@ -34,7 +34,7 @@ class ItemRecyclingListView : public AbstractItemView { public: - ItemRecyclingListView(QGraphicsWidget * parent = 0); + ItemRecyclingListView(QGraphicsWidget * parent = nullptr); virtual ~ItemRecyclingListView(); void setCurrentRow(const int row); int rows() const; diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/label.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/label.h index 2c1f14b20e..1ecbe8ae49 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/label.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/label.h @@ -41,7 +41,7 @@ class Label : public GvbWidget public: - Label(const QString& text, QGraphicsItem *parent = 0); + Label(const QString& text, QGraphicsItem *parent = nullptr); ~Label(); public: diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.h index 4f033803ac..db08e948b0 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.h @@ -57,7 +57,7 @@ public: RightIcon = 1 }; - ListItem(QGraphicsWidget *parent = 0); + ListItem(QGraphicsWidget *parent = nullptr); virtual ~ListItem(); void setIcon(IconItem *iconItem, const IconItemPos iconPos); diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.h index 623c90dedc..d58db8de41 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.h @@ -40,7 +40,7 @@ class ListModel : public QAbstractListModel public: - ListModel(QObject *parent = 0); + ListModel(QObject *parent = nullptr); ~ListModel(); public: diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.h index 0dfd41a1c3..a1120d1871 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.h @@ -44,7 +44,7 @@ class ListWidget : public GvbWidget Q_OBJECT public: - ListWidget(QGraphicsWidget * parent = 0); + ListWidget(QGraphicsWidget * parent = nullptr); virtual ~ListWidget(); void addItem(QGraphicsWidget *item); void insertItem(int index, QGraphicsWidget *item); diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h index e92f46a53b..23043136f3 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h @@ -49,7 +49,7 @@ class MainView : public QGraphicsView { Q_OBJECT public: - MainView(const bool enableOpenGL, const bool outputFps, const bool imageBasedRendering = false, QWidget *parent = 0); + MainView(const bool enableOpenGL, const bool outputFps, const bool imageBasedRendering = false, QWidget *parent = nullptr); ~MainView(); void setTestWidget(QGraphicsWidget *testWidget); diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.h index 8f40dcfd16..d81db64d5e 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.h @@ -40,7 +40,7 @@ class Scroller : public QObject public: - Scroller(QObject *parent = 0); + Scroller(QObject *parent = nullptr); virtual ~Scroller(); public: diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h index ad606cda8f..34eb7594ad 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h @@ -41,7 +41,7 @@ class SimpleListView : public AbstractScrollArea public: - SimpleListView(QGraphicsWidget *parent = 0); + SimpleListView(QGraphicsWidget *parent = nullptr); virtual ~SimpleListView(); public: diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.h index 4aafd0c288..1e5cd8ad3b 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.h @@ -89,7 +89,7 @@ signals: void themeChanged(); private: - Theme(QObject *parent = 0); + Theme(QObject *parent = nullptr); void setBlueTheme(); void setLimeTheme(); diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.h index a18df35957..d5d32f146f 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.h @@ -40,7 +40,7 @@ class WebView : public AbstractScrollArea public: - WebView(QGraphicsWidget *parent = 0); + WebView(QGraphicsWidget *parent = nullptr); ~WebView(); public: diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp index e0c5a7f683..3531ae2263 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp @@ -54,7 +54,7 @@ private slots: class RectWidget : public QGraphicsWidget { public: - RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent){} + RectWidget(QGraphicsItem *parent = nullptr) : QGraphicsWidget(parent){} void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/benchmarks/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp index bd7899e671..6cb3140e58 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp +++ b/tests/benchmarks/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp @@ -47,7 +47,7 @@ private slots: class RectWidget : public QGraphicsWidget { public: - RectWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = { }) : QGraphicsWidget(parent, wFlags), setGeometryCalls(0) {} + RectWidget(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = { }) : QGraphicsWidget(parent, wFlags), setGeometryCalls(0) {} void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.h b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.h index b0e12b448a..dd3cc2a2ad 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.h +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.h @@ -41,7 +41,7 @@ class MainWindow : public QWidget { Q_OBJECT public: - MainWindow(QWidget *parent = 0); + MainWindow(QWidget *parent = nullptr); private: void setupMatrix(); diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/view.h b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/view.h index e20543858b..a31b07f3f7 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/view.h +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/view.h @@ -40,7 +40,7 @@ class View : public QFrame { Q_OBJECT public: - View(const QString &name, QWidget *parent = 0); + View(const QString &name, QWidget *parent = nullptr); QGraphicsView *view() const; diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h index 467c3fb293..c615635ad4 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h @@ -47,7 +47,7 @@ public: ZoomInOut, Translate }; - ChipTester(QWidget *parent = 0); + ChipTester(QWidget *parent = nullptr); void setAntialias(bool enabled); void runBenchmark(); diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 27f5a90bab..54bc3a0115 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -469,7 +469,7 @@ void tst_QGraphicsView::deepNesting() class AnimatedPixmapItem : public QGraphicsPixmapItem { public: - AnimatedPixmapItem(int x, int y, bool rot, bool scal, QGraphicsItem *parent = 0) + AnimatedPixmapItem(int x, int y, bool rot, bool scal, QGraphicsItem *parent = nullptr) : QGraphicsPixmapItem(parent), rotateFactor(0), scaleFactor(0) { rotate = rot; @@ -576,7 +576,7 @@ void tst_QGraphicsView::imageRiver() class AnimatedTextItem : public QGraphicsSimpleTextItem { public: - AnimatedTextItem(int x, int y, bool rot, bool scal, QGraphicsItem *parent = 0) + AnimatedTextItem(int x, int y, bool rot, bool scal, QGraphicsItem *parent = nullptr) : QGraphicsSimpleTextItem(parent), rotateFactor(0), scaleFactor(25) { setText("River of text"); @@ -686,7 +686,7 @@ void tst_QGraphicsView::textRiver() class AnimatedPixmapCacheItem : public QGraphicsPixmapItem { public: - AnimatedPixmapCacheItem(int x, int y, QGraphicsItem *parent = 0) + AnimatedPixmapCacheItem(int x, int y, QGraphicsItem *parent = nullptr) : QGraphicsPixmapItem(parent) { xspeed = x; @@ -787,7 +787,7 @@ void tst_QGraphicsView::moveItemCache() class UpdatedPixmapCacheItem : public QGraphicsPixmapItem { public: - UpdatedPixmapCacheItem(bool partial, QGraphicsItem *parent = 0) + UpdatedPixmapCacheItem(bool partial, QGraphicsItem *parent = nullptr) : QGraphicsPixmapItem(parent), partial(partial) { } diff --git a/tests/benchmarks/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/benchmarks/widgets/itemviews/qtableview/tst_qtableview.cpp index 858d8a4ff8..007f12516f 100644 --- a/tests/benchmarks/widgets/itemviews/qtableview/tst_qtableview.cpp +++ b/tests/benchmarks/widgets/itemviews/qtableview/tst_qtableview.cpp @@ -40,7 +40,7 @@ class QtTestTableModel: public QAbstractTableModel public: - QtTestTableModel(int rows = 0, int columns = 0, QObject *parent = 0) + QtTestTableModel(int rows = 0, int columns = 0, QObject *parent = nullptr) : QAbstractTableModel(parent), row_count(rows), column_count(columns) {} diff --git a/tests/benchmarks/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/benchmarks/widgets/kernel/qwidget/tst_qwidget.cpp index b9af7a55cd..4e000ef88e 100644 --- a/tests/benchmarks/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/benchmarks/widgets/kernel/qwidget/tst_qwidget.cpp @@ -46,7 +46,7 @@ public: fill(rows, columns); } - UpdateWidget(QWidget *parent = 0) + UpdateWidget(QWidget *parent = nullptr) : QWidget(parent), rowCount(0), columnCount(0), opaqueChildren(false) {} void fill(int rows, int columns) diff --git a/tests/manual/cocoa/appicon/main.cpp b/tests/manual/cocoa/appicon/main.cpp index e22d70988d..ba398703b7 100644 --- a/tests/manual/cocoa/appicon/main.cpp +++ b/tests/manual/cocoa/appicon/main.cpp @@ -34,7 +34,7 @@ class TopWidget : public QWidget { Q_OBJECT public: - TopWidget(QWidget *parent = 0) : QWidget(parent) + TopWidget(QWidget *parent = nullptr) : QWidget(parent) { QVBoxLayout *layout = new QVBoxLayout; QPushButton *button = new QPushButton("Change app icon"); diff --git a/tests/manual/cocoa/menurama/mainwindow.h b/tests/manual/cocoa/menurama/mainwindow.h index 3ca90dad8f..e2af43e04e 100644 --- a/tests/manual/cocoa/menurama/mainwindow.h +++ b/tests/manual/cocoa/menurama/mainwindow.h @@ -40,7 +40,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - explicit MainWindow(QWidget *parent = 0); + explicit MainWindow(QWidget *parent = nullptr); ~MainWindow(); protected: diff --git a/tests/manual/cocoa/qt_on_cocoa/rasterwindow.h b/tests/manual/cocoa/qt_on_cocoa/rasterwindow.h index 5262300b12..b8ef674994 100644 --- a/tests/manual/cocoa/qt_on_cocoa/rasterwindow.h +++ b/tests/manual/cocoa/qt_on_cocoa/rasterwindow.h @@ -32,7 +32,7 @@ class RasterWindow : public QRasterWindow { public: - RasterWindow(QRasterWindow *parent = 0); + RasterWindow(QRasterWindow *parent = nullptr); protected: void mousePressEvent(QMouseEvent *); diff --git a/tests/manual/cocoa/wheelevent/window.h b/tests/manual/cocoa/wheelevent/window.h index 122b40de69..42a6b4a1aa 100644 --- a/tests/manual/cocoa/wheelevent/window.h +++ b/tests/manual/cocoa/wheelevent/window.h @@ -32,7 +32,7 @@ class Window : public QWindow { public: - Window(QWindow *parent = 0); + Window(QWindow *parent = nullptr); Window(QScreen *screen); protected: diff --git a/tests/manual/dialogs/colordialogpanel.cpp b/tests/manual/dialogs/colordialogpanel.cpp index e2e0fbcdee..f47e4ea8f1 100644 --- a/tests/manual/dialogs/colordialogpanel.cpp +++ b/tests/manual/dialogs/colordialogpanel.cpp @@ -81,7 +81,7 @@ static inline QPushButton *addButton(const QString &description, QVBoxLayout *la class ColorProxyModel : public QSortFilterProxyModel { public: - ColorProxyModel(QObject *parent = 0) : QSortFilterProxyModel(parent) + ColorProxyModel(QObject *parent = nullptr) : QSortFilterProxyModel(parent) { } diff --git a/tests/manual/dialogs/colordialogpanel.h b/tests/manual/dialogs/colordialogpanel.h index 988518a1c8..a299337f43 100644 --- a/tests/manual/dialogs/colordialogpanel.h +++ b/tests/manual/dialogs/colordialogpanel.h @@ -42,7 +42,7 @@ class ColorDialogPanel : public QWidget { Q_OBJECT public: - explicit ColorDialogPanel(QWidget *parent = 0); + explicit ColorDialogPanel(QWidget *parent = nullptr); public slots: void execModal(); diff --git a/tests/manual/dialogs/filedialogpanel.cpp b/tests/manual/dialogs/filedialogpanel.cpp index 56a1502313..9f2ae559d7 100644 --- a/tests/manual/dialogs/filedialogpanel.cpp +++ b/tests/manual/dialogs/filedialogpanel.cpp @@ -84,7 +84,7 @@ class LabelLineEdit : public QLineEdit { Q_OBJECT public: - explicit LabelLineEdit(QFileDialog::DialogLabel label, QWidget *parent = 0) : QLineEdit(parent), m_label(label), m_dirty(false) + explicit LabelLineEdit(QFileDialog::DialogLabel label, QWidget *parent = nullptr) : QLineEdit(parent), m_label(label), m_dirty(false) { connect(this, SIGNAL(textEdited(QString)), this, SLOT(setDirty())); } diff --git a/tests/manual/dialogs/filedialogpanel.h b/tests/manual/dialogs/filedialogpanel.h index 0bad3e7456..28dded3891 100644 --- a/tests/manual/dialogs/filedialogpanel.h +++ b/tests/manual/dialogs/filedialogpanel.h @@ -47,7 +47,7 @@ class FileDialogPanel : public QWidget { Q_OBJECT public: - explicit FileDialogPanel(QWidget *parent = 0); + explicit FileDialogPanel(QWidget *parent = nullptr); public slots: void execModal(); diff --git a/tests/manual/dialogs/fontdialogpanel.h b/tests/manual/dialogs/fontdialogpanel.h index dd7fb1413a..2bcd68c74c 100644 --- a/tests/manual/dialogs/fontdialogpanel.h +++ b/tests/manual/dialogs/fontdialogpanel.h @@ -43,7 +43,7 @@ class FontDialogPanel : public QWidget { Q_OBJECT public: - explicit FontDialogPanel(QWidget *parent = 0); + explicit FontDialogPanel(QWidget *parent = nullptr); public slots: void execModal(); diff --git a/tests/manual/dialogs/main.cpp b/tests/manual/dialogs/main.cpp index 2676ceeb52..da9daab942 100644 --- a/tests/manual/dialogs/main.cpp +++ b/tests/manual/dialogs/main.cpp @@ -52,7 +52,7 @@ static bool optNoPrinter = false; class AboutDialog : public QDialog { public: - explicit AboutDialog(QWidget *parent = 0); + explicit AboutDialog(QWidget *parent = nullptr); }; AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent) @@ -79,7 +79,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent) class MainWindow : public QMainWindow { Q_OBJECT public: - explicit MainWindow(QWidget *parent = 0); + explicit MainWindow(QWidget *parent = nullptr); public slots: void aboutDialog(); diff --git a/tests/manual/dialogs/messageboxpanel.h b/tests/manual/dialogs/messageboxpanel.h index 1e37b5c6df..d5ca6057d1 100644 --- a/tests/manual/dialogs/messageboxpanel.h +++ b/tests/manual/dialogs/messageboxpanel.h @@ -47,7 +47,7 @@ class MessageBoxPanel : public QWidget { Q_OBJECT public: - explicit MessageBoxPanel(QWidget *parent = 0); + explicit MessageBoxPanel(QWidget *parent = nullptr); ~MessageBoxPanel(); public slots: diff --git a/tests/manual/dialogs/printdialogpanel.cpp b/tests/manual/dialogs/printdialogpanel.cpp index 338064e9be..d36715e9dd 100644 --- a/tests/manual/dialogs/printdialogpanel.cpp +++ b/tests/manual/dialogs/printdialogpanel.cpp @@ -291,7 +291,7 @@ static bool print(QPrinter *printer, QWidget *dialogParent) class PrintPreviewDialog : public QPrintPreviewDialog { Q_OBJECT public: - explicit PrintPreviewDialog(QPrinter *printer, QWidget *parent = 0) : QPrintPreviewDialog(printer, parent) + explicit PrintPreviewDialog(QPrinter *printer, QWidget *parent = nullptr) : QPrintPreviewDialog(printer, parent) { connect(this, SIGNAL(paintRequested(QPrinter*)), this, SLOT(slotPaintRequested(QPrinter*))); } diff --git a/tests/manual/dialogs/printdialogpanel.h b/tests/manual/dialogs/printdialogpanel.h index 6bf465f527..618e34d596 100644 --- a/tests/manual/dialogs/printdialogpanel.h +++ b/tests/manual/dialogs/printdialogpanel.h @@ -79,7 +79,7 @@ class PrintDialogPanel : public QWidget { Q_OBJECT public: - explicit PrintDialogPanel(QWidget *parent = 0); + explicit PrintDialogPanel(QWidget *parent = nullptr); ~PrintDialogPanel(); private slots: diff --git a/tests/manual/dialogs/wizardpanel.cpp b/tests/manual/dialogs/wizardpanel.cpp index e5624e6248..4edb10afb8 100644 --- a/tests/manual/dialogs/wizardpanel.cpp +++ b/tests/manual/dialogs/wizardpanel.cpp @@ -73,7 +73,7 @@ class WizardStyleControl : public QGroupBox { Q_OBJECT public: - WizardStyleControl(QWidget *parent = 0); + WizardStyleControl(QWidget *parent = nullptr); void setWizardStyle(int style); QWizard::WizardStyle wizardStyle() const; @@ -132,7 +132,7 @@ void WizardStyleControl::setWizardStyle(int wizardStyle) class WizardOptionsControl : public QGroupBox { public: - explicit WizardOptionsControl(QWidget *parent = 0); + explicit WizardOptionsControl(QWidget *parent = nullptr); QWizard::WizardOption wizardOptions() const; void setWizardOptions(int options); @@ -214,7 +214,7 @@ void Wizard::changeWizardStyle(int newStyle) class WizardPage : public QWizardPage { public: - explicit WizardPage(const QString &title, QWidget *parent = 0); + explicit WizardPage(const QString &title, QWidget *parent = nullptr); void initializePage(); @@ -257,7 +257,7 @@ Wizard::Wizard(QWidget *parent, Qt::WindowFlags flags) // A dialog using a Wizard as child widget (emulating Qt Designer). class WizardEmbeddingDialog : public QDialog { public: - explicit WizardEmbeddingDialog(QWidget *parent = 0); + explicit WizardEmbeddingDialog(QWidget *parent = nullptr); Wizard *wizard() const { return m_wizard; } diff --git a/tests/manual/dialogs/wizardpanel.h b/tests/manual/dialogs/wizardpanel.h index 0a937f7d31..8d9ee79274 100644 --- a/tests/manual/dialogs/wizardpanel.h +++ b/tests/manual/dialogs/wizardpanel.h @@ -41,7 +41,7 @@ class WizardPanel : public QWidget { Q_OBJECT public: - explicit WizardPanel(QWidget *parent = 0); + explicit WizardPanel(QWidget *parent = nullptr); public slots: void showModal(); diff --git a/tests/manual/gestures/graphicsview/gestures.h b/tests/manual/gestures/graphicsview/gestures.h index 4cfabc35df..20a850e67e 100644 --- a/tests/manual/gestures/graphicsview/gestures.h +++ b/tests/manual/gestures/graphicsview/gestures.h @@ -38,7 +38,7 @@ class ThreeFingerSlideGesture : public QGesture public: static Qt::GestureType Type; - ThreeFingerSlideGesture(QObject *parent = 0) : QGesture(parent) { } + ThreeFingerSlideGesture(QObject *parent = nullptr) : QGesture(parent) { } bool gestureFired; }; diff --git a/tests/manual/gestures/graphicsview/main.cpp b/tests/manual/gestures/graphicsview/main.cpp index f08b2c3549..b05d104d99 100644 --- a/tests/manual/gestures/graphicsview/main.cpp +++ b/tests/manual/gestures/graphicsview/main.cpp @@ -44,7 +44,7 @@ class GraphicsView : public QGraphicsView { public: - GraphicsView(QGraphicsScene *scene, QWidget *parent = 0) + GraphicsView(QGraphicsScene *scene, QWidget *parent = nullptr) : QGraphicsView(scene, parent) { } @@ -78,7 +78,7 @@ protected: class StandardGestures : public QWidget { public: - StandardGestures(QWidget *parent = 0) + StandardGestures(QWidget *parent = nullptr) : QWidget(parent) { scene = new QGraphicsScene(this); @@ -96,7 +96,7 @@ class GlobalViewGestures : public QWidget { Q_OBJECT public: - GlobalViewGestures(QWidget *parent = 0) + GlobalViewGestures(QWidget *parent = nullptr) : QWidget(parent) { scene = new QGraphicsScene(this); @@ -116,7 +116,7 @@ class GraphicsItemGestures : public QWidget { Q_OBJECT public: - GraphicsItemGestures(QWidget *parent = 0) + GraphicsItemGestures(QWidget *parent = nullptr) : QWidget(parent) { scene = new QGraphicsScene(this); diff --git a/tests/manual/gestures/scrollarea/main.cpp b/tests/manual/gestures/scrollarea/main.cpp index 517054eeb9..5378f48de9 100644 --- a/tests/manual/gestures/scrollarea/main.cpp +++ b/tests/manual/gestures/scrollarea/main.cpp @@ -44,7 +44,7 @@ class ScrollArea : public QScrollArea { Q_OBJECT public: - ScrollArea(QWidget *parent = 0) + ScrollArea(QWidget *parent = nullptr) : QScrollArea(parent), outside(false) { viewport()->grabGesture(Qt::PanGesture, Qt::ReceivePartialGestures); @@ -112,7 +112,7 @@ private: class Slider : public QSlider { public: - Slider(Qt::Orientation orientation, QWidget *parent = 0) + Slider(Qt::Orientation orientation, QWidget *parent = nullptr) : QSlider(orientation, parent) { grabGesture(Qt::PanGesture); diff --git a/tests/manual/inputmethodhints/inputmethodhints.h b/tests/manual/inputmethodhints/inputmethodhints.h index e128c5271e..ca8025e3ec 100644 --- a/tests/manual/inputmethodhints/inputmethodhints.h +++ b/tests/manual/inputmethodhints/inputmethodhints.h @@ -37,7 +37,7 @@ class inputmethodhints : public QMainWindow Q_OBJECT public: - inputmethodhints(QWidget *parent = 0); + inputmethodhints(QWidget *parent = nullptr); ~inputmethodhints(); public slots: diff --git a/tests/manual/keypadnavigation/main.cpp b/tests/manual/keypadnavigation/main.cpp index dad4376514..52d0dacd07 100644 --- a/tests/manual/keypadnavigation/main.cpp +++ b/tests/manual/keypadnavigation/main.cpp @@ -40,7 +40,7 @@ class KeypadNavigation : public QMainWindow Q_OBJECT public: - KeypadNavigation(QWidget *parent = 0) + KeypadNavigation(QWidget *parent = nullptr) : QMainWindow(parent) , ui(new Ui_KeypadNavigation) { diff --git a/tests/manual/network_stresstest/minihttpserver.h b/tests/manual/network_stresstest/minihttpserver.h index fcce9cd480..e17f1266a4 100644 --- a/tests/manual/network_stresstest/minihttpserver.h +++ b/tests/manual/network_stresstest/minihttpserver.h @@ -43,7 +43,7 @@ class MiniHttpServer : public QThread { Q_OBJECT public: - explicit MiniHttpServer(QObject *parent = 0); + explicit MiniHttpServer(QObject *parent = nullptr); ~MiniHttpServer(); int port() { return portnum; } diff --git a/tests/manual/qcursor/allcursors/mainwindow.h b/tests/manual/qcursor/allcursors/mainwindow.h index 9ae6f0483e..73a023afbb 100644 --- a/tests/manual/qcursor/allcursors/mainwindow.h +++ b/tests/manual/qcursor/allcursors/mainwindow.h @@ -43,7 +43,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - MainWindow(QWidget *parent = 0); + MainWindow(QWidget *parent = nullptr); ~MainWindow(); private: diff --git a/tests/manual/qcursor/grab_override/mainwindow.h b/tests/manual/qcursor/grab_override/mainwindow.h index ce753fa114..5275d80184 100644 --- a/tests/manual/qcursor/grab_override/mainwindow.h +++ b/tests/manual/qcursor/grab_override/mainwindow.h @@ -43,7 +43,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - MainWindow(QWidget *parent = 0); + MainWindow(QWidget *parent = nullptr); ~MainWindow(); private slots: diff --git a/tests/manual/qgraphicsitem/main.cpp b/tests/manual/qgraphicsitem/main.cpp index 284a4c877c..d32c3c6dec 100644 --- a/tests/manual/qgraphicsitem/main.cpp +++ b/tests/manual/qgraphicsitem/main.cpp @@ -35,7 +35,7 @@ class MyObject : public QObject { public: - MyObject(QGraphicsItem *i, QObject *parent = 0) : QObject(parent), itemToToggle(i) + MyObject(QGraphicsItem *i, QObject *parent = nullptr) : QObject(parent), itemToToggle(i) { startTimer(500); } diff --git a/tests/manual/qgraphicsitemgroup/widget.h b/tests/manual/qgraphicsitemgroup/widget.h index 0da34babdd..d778adb068 100644 --- a/tests/manual/qgraphicsitemgroup/widget.h +++ b/tests/manual/qgraphicsitemgroup/widget.h @@ -46,7 +46,7 @@ class Widget : public QWidget { Q_OBJECT public: - Widget(QWidget *parent = 0); + Widget(QWidget *parent = nullptr); ~Widget(); protected Q_SLOTS: diff --git a/tests/manual/qlayout/gridwidget.h b/tests/manual/qlayout/gridwidget.h index a3792b03c4..2d1800d64d 100644 --- a/tests/manual/qlayout/gridwidget.h +++ b/tests/manual/qlayout/gridwidget.h @@ -35,7 +35,7 @@ class GridWidget : public QWidget { Q_OBJECT public: - explicit GridWidget(QWidget *parent = 0); + explicit GridWidget(QWidget *parent = nullptr); signals: diff --git a/tests/manual/qlayout/hbwidget.h b/tests/manual/qlayout/hbwidget.h index 03642db395..4f106a9ce3 100644 --- a/tests/manual/qlayout/hbwidget.h +++ b/tests/manual/qlayout/hbwidget.h @@ -35,7 +35,7 @@ class HbWidget : public QWidget { Q_OBJECT public: - explicit HbWidget(QWidget *parent = 0); + explicit HbWidget(QWidget *parent = nullptr); signals: diff --git a/tests/manual/qlayout/mainwindow.h b/tests/manual/qlayout/mainwindow.h index fdeb80f150..1f19047b74 100644 --- a/tests/manual/qlayout/mainwindow.h +++ b/tests/manual/qlayout/mainwindow.h @@ -38,7 +38,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - MainWindow(QWidget *parent = 0); + MainWindow(QWidget *parent = nullptr); ~MainWindow(); private slots: diff --git a/tests/manual/qlayout/vbwidget.h b/tests/manual/qlayout/vbwidget.h index b722f9f95a..b5f2073faf 100644 --- a/tests/manual/qlayout/vbwidget.h +++ b/tests/manual/qlayout/vbwidget.h @@ -35,7 +35,7 @@ class VbWidget : public QWidget { Q_OBJECT public: - explicit VbWidget(QWidget *parent = 0); + explicit VbWidget(QWidget *parent = nullptr); signals: diff --git a/tests/manual/qopenglwidget/openglwidget/openglwidget.h b/tests/manual/qopenglwidget/openglwidget/openglwidget.h index 32fb4e2660..06ec5b1a40 100644 --- a/tests/manual/qopenglwidget/openglwidget/openglwidget.h +++ b/tests/manual/qopenglwidget/openglwidget/openglwidget.h @@ -37,7 +37,7 @@ class OpenGLWidget : public QOpenGLWidget { Q_OBJECT public: - OpenGLWidget(int interval = 30, const QVector3D &rotAxis = QVector3D(0, 1, 0), QWidget *parent = 0); + OpenGLWidget(int interval = 30, const QVector3D &rotAxis = QVector3D(0, 1, 0), QWidget *parent = nullptr); ~OpenGLWidget(); void initializeGL(); diff --git a/tests/manual/qscreen/propertyfield.h b/tests/manual/qscreen/propertyfield.h index 4d7074f913..364eef2f6c 100644 --- a/tests/manual/qscreen/propertyfield.h +++ b/tests/manual/qscreen/propertyfield.h @@ -42,7 +42,7 @@ class PropertyField : public QLineEdit { Q_OBJECT public: - explicit PropertyField(QObject* subject, const QMetaProperty& prop, QWidget *parent = 0); + explicit PropertyField(QObject* subject, const QMetaProperty& prop, QWidget *parent = nullptr); signals: diff --git a/tests/manual/qtabbar/tabbarform.h b/tests/manual/qtabbar/tabbarform.h index 7db3f71fa5..ac101d6402 100644 --- a/tests/manual/qtabbar/tabbarform.h +++ b/tests/manual/qtabbar/tabbarform.h @@ -13,7 +13,7 @@ class TabBarForm : public QWidget Q_OBJECT public: - explicit TabBarForm(QWidget *parent = 0); + explicit TabBarForm(QWidget *parent = nullptr); ~TabBarForm(); Ui::TabBarForm *ui; diff --git a/tests/manual/qtbug-8933/widget.h b/tests/manual/qtbug-8933/widget.h index aac6134d09..bc26971a9c 100644 --- a/tests/manual/qtbug-8933/widget.h +++ b/tests/manual/qtbug-8933/widget.h @@ -40,7 +40,7 @@ namespace Ui { class Widget : public QWidget { Q_OBJECT public: - Widget(QWidget *parent = 0); + Widget(QWidget *parent = nullptr); ~Widget(); public slots: diff --git a/tests/manual/qtexteditlist/widget.h b/tests/manual/qtexteditlist/widget.h index ffece6a6db..f22dae6add 100644 --- a/tests/manual/qtexteditlist/widget.h +++ b/tests/manual/qtexteditlist/widget.h @@ -41,7 +41,7 @@ class Widget : public QWidget Q_OBJECT public: - explicit Widget(QWidget *parent = 0); + explicit Widget(QWidget *parent = nullptr); ~Widget(); public slots: void setFontPointSize(int value); diff --git a/tests/manual/qtouchevent/main.cpp b/tests/manual/qtouchevent/main.cpp index 099aff22c4..b71fe503aa 100644 --- a/tests/manual/qtouchevent/main.cpp +++ b/tests/manual/qtouchevent/main.cpp @@ -37,7 +37,7 @@ class MultitouchTestWidget : public QWidget, public Ui::Form Q_OBJECT public: - MultitouchTestWidget(QWidget *parent = 0) + MultitouchTestWidget(QWidget *parent = nullptr) : QWidget(parent) { setAttribute(Qt::WA_QuitOnClose, false); diff --git a/tests/manual/qtouchevent/touchwidget.h b/tests/manual/qtouchevent/touchwidget.h index 792c14e765..4036693169 100644 --- a/tests/manual/qtouchevent/touchwidget.h +++ b/tests/manual/qtouchevent/touchwidget.h @@ -45,7 +45,7 @@ public: bool seenMousePress, seenMouseMove, seenMouseRelease; bool closeWindowOnMouseRelease; - inline TouchWidget(QWidget *parent = 0) + inline TouchWidget(QWidget *parent = nullptr) : QWidget(parent) { reset(); diff --git a/tests/manual/repaint/shared/shared.h b/tests/manual/repaint/shared/shared.h index 9ca5cbe2be..d6bef849f5 100644 --- a/tests/manual/repaint/shared/shared.h +++ b/tests/manual/repaint/shared/shared.h @@ -37,7 +37,7 @@ Q_OBJECT public: int hue; bool pressed; - StaticWidget(QWidget *parent = 0) + StaticWidget(QWidget *parent = nullptr) :QWidget(parent) { setAttribute(Qt::WA_StaticContents); diff --git a/tests/manual/repaint/tableview/main.cpp b/tests/manual/repaint/tableview/main.cpp index 8fd4f3b424..07d1529d1d 100644 --- a/tests/manual/repaint/tableview/main.cpp +++ b/tests/manual/repaint/tableview/main.cpp @@ -36,7 +36,7 @@ class CellWidget : public QWidget { public: - CellWidget(QWidget *parent = 0) : QWidget(parent) {} + CellWidget(QWidget *parent = nullptr) : QWidget(parent) {} void paintEvent(QPaintEvent * event) { static int value = 200; diff --git a/tests/manual/textrendering/textperformance/main.cpp b/tests/manual/textrendering/textperformance/main.cpp index 9d238ad420..8cbef84119 100644 --- a/tests/manual/textrendering/textperformance/main.cpp +++ b/tests/manual/textrendering/textperformance/main.cpp @@ -41,7 +41,7 @@ class FontBlaster: public QWidget Q_OBJECT public: - FontBlaster(QWidget *parent = 0) + FontBlaster(QWidget *parent = nullptr) : QWidget(parent) , m_currentMode(0) { diff --git a/tests/manual/transientwindow/mainwindow.h b/tests/manual/transientwindow/mainwindow.h index 253bf1726e..d822442b15 100644 --- a/tests/manual/transientwindow/mainwindow.h +++ b/tests/manual/transientwindow/mainwindow.h @@ -37,7 +37,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - MainWindow(QWidget *parent = 0); + MainWindow(QWidget *parent = nullptr); ~MainWindow(); public slots: diff --git a/tests/manual/widgetgrab/main.cpp b/tests/manual/widgetgrab/main.cpp index 6430386ee0..45c3feeefe 100644 --- a/tests/manual/widgetgrab/main.cpp +++ b/tests/manual/widgetgrab/main.cpp @@ -84,7 +84,7 @@ class ClickableLabel : public QLabel { Q_OBJECT public: - explicit ClickableLabel(const QString &text, QWidget *parent = 0) : QLabel(text, parent) {} + explicit ClickableLabel(const QString &text, QWidget *parent = nullptr) : QLabel(text, parent) {} signals: void pressed(); diff --git a/tests/manual/widgets/itemviews/delegate/example.cpp b/tests/manual/widgets/itemviews/delegate/example.cpp index cd3784332a..3108c65654 100644 --- a/tests/manual/widgets/itemviews/delegate/example.cpp +++ b/tests/manual/widgets/itemviews/delegate/example.cpp @@ -37,7 +37,7 @@ class ExampleEditor : public QLineEdit { public: - ExampleEditor(QWidget *parent = 0):QLineEdit(parent) { qDebug() << "ctor"; } + ExampleEditor(QWidget *parent = nullptr):QLineEdit(parent) { qDebug() << "ctor"; } ~ExampleEditor() { QApplication::instance()->quit(); } }; diff --git a/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp b/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp index 85f79bedfc..e78f4a5e37 100644 --- a/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp +++ b/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp @@ -74,7 +74,7 @@ class Window : public QWidget { Q_OBJECT public: - Window(QWidget *parent = 0): QWidget(parent), ckMovable(0), tableView(0), cbSelectionMode(0), m_taskInstructions(0) + Window(QWidget *parent = nullptr): QWidget(parent), ckMovable(0), tableView(0), cbSelectionMode(0), m_taskInstructions(0) { m_taskInstructions = new QLabel(); if (sizeof(tasks) > 0) diff --git a/tests/manual/widgets/widgets/bigmenucreator/mainwindow.h b/tests/manual/widgets/widgets/bigmenucreator/mainwindow.h index 2990f592e9..6d19d0e649 100644 --- a/tests/manual/widgets/widgets/bigmenucreator/mainwindow.h +++ b/tests/manual/widgets/widgets/bigmenucreator/mainwindow.h @@ -40,7 +40,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - explicit MainWindow(QWidget *parent = 0); + explicit MainWindow(QWidget *parent = nullptr); ~MainWindow(); void doAPS(QWidget *menu, int level); diff --git a/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp b/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp index 2a78f9d0f0..a6b9ca218f 100644 --- a/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp +++ b/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp @@ -60,7 +60,7 @@ class MainWindow : public QMainWindow { public: - MainWindow(QWidget *parent = 0) : QMainWindow(parent) + MainWindow(QWidget *parent = nullptr) : QMainWindow(parent) { auto *menu1Act1 = new QAction("Action 1"); auto *menu1Act2 = new QAction("Action 2"); diff --git a/tests/manual/widgets/widgets/multiscreen-menus/mainwindow.h b/tests/manual/widgets/widgets/multiscreen-menus/mainwindow.h index 7689062221..9500d501ef 100644 --- a/tests/manual/widgets/widgets/multiscreen-menus/mainwindow.h +++ b/tests/manual/widgets/widgets/multiscreen-menus/mainwindow.h @@ -40,7 +40,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - explicit MainWindow(QWidget *parent = 0); + explicit MainWindow(QWidget *parent = nullptr); ~MainWindow(); void contextMenuEvent(QContextMenuEvent *e) override; diff --git a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/main.cpp b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/main.cpp index d55f507717..c048cd3609 100644 --- a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/main.cpp +++ b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/main.cpp @@ -40,7 +40,7 @@ class MyMainWindow : public QMainWindow { public: - MyMainWindow(QWidget *parent = 0) : QMainWindow(parent) + MyMainWindow(QWidget *parent = nullptr) : QMainWindow(parent) { auto *toolBar = new QToolBar; QPixmap pix(16, 16); diff --git a/tests/manual/windowchildgeometry/controllerwidget.cpp b/tests/manual/windowchildgeometry/controllerwidget.cpp index 7a0a29fc61..1ceb785e9e 100644 --- a/tests/manual/windowchildgeometry/controllerwidget.cpp +++ b/tests/manual/windowchildgeometry/controllerwidget.cpp @@ -273,7 +273,7 @@ void WidgetWindowControl::statesChanged() class Window : public QWindow { public: - explicit Window(QWindow *parent = 0) + explicit Window(QWindow *parent = nullptr) : QWindow(parent) , m_backingStore(new QBackingStore(this)) , m_color(Qt::GlobalColor(QRandomGenerator::global()->bounded(18))) diff --git a/tests/manual/windowchildgeometry/controllerwidget.h b/tests/manual/windowchildgeometry/controllerwidget.h index 4744bfc905..d255953dd7 100644 --- a/tests/manual/windowchildgeometry/controllerwidget.h +++ b/tests/manual/windowchildgeometry/controllerwidget.h @@ -136,7 +136,7 @@ class ControllerWidget : public QMainWindow { Q_OBJECT public: - explicit ControllerWidget(QWidget *parent = 0); + explicit ControllerWidget(QWidget *parent = nullptr); ~ControllerWidget(); private: QScopedPointer<QWindow> m_testWindow; diff --git a/tests/manual/windowflags/controllerwindow.cpp b/tests/manual/windowflags/controllerwindow.cpp index bde24b00d1..7477e21d46 100644 --- a/tests/manual/windowflags/controllerwindow.cpp +++ b/tests/manual/windowflags/controllerwindow.cpp @@ -247,7 +247,7 @@ static Qt::WindowStates windowState(const QObject *o) class EventFilter : public QObject { public: - explicit EventFilter(QObject *parent = 0) : QObject(parent) {} + explicit EventFilter(QObject *parent = nullptr) : QObject(parent) {} bool eventFilter(QObject *o, QEvent *e) { diff --git a/tests/manual/windowflags/controllerwindow.h b/tests/manual/windowflags/controllerwindow.h index c623256112..e4d8f2df0c 100644 --- a/tests/manual/windowflags/controllerwindow.h +++ b/tests/manual/windowflags/controllerwindow.h @@ -51,7 +51,7 @@ class ControllerWidget : public QWidget Q_OBJECT public: - explicit ControllerWidget(QWidget *parent = 0); + explicit ControllerWidget(QWidget *parent = nullptr); virtual bool eventFilter(QObject *o, QEvent *e); @@ -91,7 +91,7 @@ class LogWidget : public QPlainTextEdit { Q_OBJECT public: - explicit LogWidget(QWidget *parent = 0); + explicit LogWidget(QWidget *parent = nullptr); ~LogWidget(); static LogWidget *instance() { return m_instance; } diff --git a/tests/manual/windowflags/previewwindow.h b/tests/manual/windowflags/previewwindow.h index 8f8fc39211..ab309a0139 100644 --- a/tests/manual/windowflags/previewwindow.h +++ b/tests/manual/windowflags/previewwindow.h @@ -46,7 +46,7 @@ class PreviewWidget : public QWidget Q_OBJECT public: - PreviewWidget(QWidget *parent = 0); + PreviewWidget(QWidget *parent = nullptr); void setWindowFlags(Qt::WindowFlags flags); @@ -65,7 +65,7 @@ class PreviewDialog : public QDialog Q_OBJECT public: - PreviewDialog(QWidget *parent = 0); + PreviewDialog(QWidget *parent = nullptr); void setWindowFlags(Qt::WindowFlags flags); diff --git a/tests/manual/windowgeometry/controllerwidget.cpp b/tests/manual/windowgeometry/controllerwidget.cpp index b188ea58e3..0bf089e934 100644 --- a/tests/manual/windowgeometry/controllerwidget.cpp +++ b/tests/manual/windowgeometry/controllerwidget.cpp @@ -297,7 +297,7 @@ void WidgetWindowControl::statesChanged() class Window : public QWindow { public: - explicit Window(QWindow *parent = 0) + explicit Window(QWindow *parent = nullptr) : QWindow(parent) , m_backingStore(new QBackingStore(this)) { diff --git a/tests/manual/windowgeometry/controllerwidget.h b/tests/manual/windowgeometry/controllerwidget.h index 4d8bb2d717..4b5dfac348 100644 --- a/tests/manual/windowgeometry/controllerwidget.h +++ b/tests/manual/windowgeometry/controllerwidget.h @@ -142,7 +142,7 @@ class ControllerWidget : public QMainWindow { Q_OBJECT public: - explicit ControllerWidget(QWidget *parent = 0); + explicit ControllerWidget(QWidget *parent = nullptr); ~ControllerWidget(); private: diff --git a/tests/manual/windowmodality/main.cpp b/tests/manual/windowmodality/main.cpp index 46693cdddd..3b79b5c798 100644 --- a/tests/manual/windowmodality/main.cpp +++ b/tests/manual/windowmodality/main.cpp @@ -51,7 +51,7 @@ class CustomDialog : public QDialog, public Ui::Dialog { Q_OBJECT public: - CustomDialog(QWidget *parent = 0) + CustomDialog(QWidget *parent = nullptr) : QDialog(parent) { setupUi(this); @@ -101,7 +101,7 @@ private slots: private: void newDialog(DialogType dialogType, Qt::WindowModality windowModality) { - QWidget *parent = 0; + QWidget *parent = nullptr; if (useThisAsParentCheckBox->isChecked()) parent = this; else if (createSiblingDialogCheckBox->isChecked()) @@ -166,7 +166,7 @@ class Widget : public QWidget, public Ui::Widget { Q_OBJECT public: - Widget(QWidget *parent = 0) + Widget(QWidget *parent = nullptr) : QWidget(parent) { setupUi(this); @@ -218,7 +218,7 @@ private slots: private: void newDialog(DialogType dialogType, Qt::WindowModality windowModality) { - QWidget *parent = 0; + QWidget *parent = nullptr; if (useThisAsParentCheckBox->isChecked()) parent = this; diff --git a/tests/manual/xembed-raster/rasterwindow.h b/tests/manual/xembed-raster/rasterwindow.h index b1a556023b..faa44f49cc 100644 --- a/tests/manual/xembed-raster/rasterwindow.h +++ b/tests/manual/xembed-raster/rasterwindow.h @@ -35,7 +35,7 @@ class RasterWindow : public QWindow { Q_OBJECT public: - explicit RasterWindow(QWindow *parent = 0); + explicit RasterWindow(QWindow *parent = nullptr); virtual void render(QPainter *painter); diff --git a/util/accessibilityinspector/accessibilityinspector.h b/util/accessibilityinspector/accessibilityinspector.h index 6111a45c50..2ae9bb0e51 100644 --- a/util/accessibilityinspector/accessibilityinspector.h +++ b/util/accessibilityinspector/accessibilityinspector.h @@ -45,7 +45,7 @@ class AccessibilityInspector : public QObject { Q_OBJECT public: - explicit AccessibilityInspector(QObject *parent = 0); + explicit AccessibilityInspector(QObject *parent = nullptr); ~AccessibilityInspector(); void inspectWindow(QWindow *window); void saveWindowGeometry(); diff --git a/util/accessibilityinspector/screenreader.h b/util/accessibilityinspector/screenreader.h index e8d572abe3..8a0b2322f3 100644 --- a/util/accessibilityinspector/screenreader.h +++ b/util/accessibilityinspector/screenreader.h @@ -45,7 +45,7 @@ class ScreenReader : public QObject { Q_OBJECT public: - explicit ScreenReader(QObject *parent = 0); + explicit ScreenReader(QObject *parent = nullptr); ~ScreenReader(); void setRootObject(QObject *rootObject); diff --git a/util/locale_database/testlocales/localemodel.h b/util/locale_database/testlocales/localemodel.h index b24fc5f4c6..f35b984b4c 100644 --- a/util/locale_database/testlocales/localemodel.h +++ b/util/locale_database/testlocales/localemodel.h @@ -36,7 +36,7 @@ class LocaleModel : public QAbstractItemModel { Q_OBJECT public: - LocaleModel(QObject *parent = 0); + LocaleModel(QObject *parent = nullptr); virtual int columnCount(const QModelIndex &parent = QModelIndex()) const; virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; diff --git a/util/locale_database/testlocales/localewidget.h b/util/locale_database/testlocales/localewidget.h index 896a6e5229..c562da119b 100644 --- a/util/locale_database/testlocales/localewidget.h +++ b/util/locale_database/testlocales/localewidget.h @@ -37,7 +37,7 @@ class LocaleWidget : public QWidget { Q_OBJECT public: - LocaleWidget(QWidget *parent = 0); + LocaleWidget(QWidget *parent = nullptr); private: LocaleModel *m_model; QTableView *m_view; |