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 /src/plugins/platforms/xcb/nativepainting | |
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>
Diffstat (limited to 'src/plugins/platforms/xcb/nativepainting')
3 files changed, 9 insertions, 9 deletions
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) { |