Skip to content

Commit 1a543e9

Browse files
authored
Fix 'zero as null pointer constant' warning (#598)
1 parent 9bdefd6 commit 1a543e9

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

src/DockAreaTitleBar_p.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class CSpacerWidget : public QWidget
5252
Q_OBJECT
5353
public:
5454
using Super = QWidget;
55-
CSpacerWidget(QWidget* Parent = 0);
55+
CSpacerWidget(QWidget* Parent = nullptr);
5656
virtual QSize sizeHint() const override {return QSize(0, 0);}
5757
virtual QSize minimumSizeHint() const override {return QSize(0, 0);}
5858
};

src/DockManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@ QAction* CDockManager::addToggleViewActionToMenu(QAction* ToggleViewAction,
11491149
bool AlphabeticallySorted = (MenuAlphabeticallySorted == d->MenuInsertionOrder);
11501150
if (!Group.isEmpty())
11511151
{
1152-
QMenu* GroupMenu = d->ViewMenuGroups.value(Group, 0);
1152+
QMenu* GroupMenu = d->ViewMenuGroups.value(Group, nullptr);
11531153
if (!GroupMenu)
11541154
{
11551155
GroupMenu = new QMenu(Group, this);

src/DockWidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ CDockContainerWidget* CDockWidget::dockContainer() const
566566
}
567567
else
568568
{
569-
return 0;
569+
return nullptr;
570570
}
571571
}
572572

src/DockWidget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ private Q_SLOTS:
256256
* by calling setObjectName() after construction.
257257
* Use the layoutFlags to configure the layout of the dock widget.
258258
*/
259-
CDockWidget(const QString &title, QWidget* parent = 0);
259+
CDockWidget(const QString &title, QWidget* parent = nullptr);
260260

261261
/**
262262
* Virtual Destructor

src/DockWidgetTab.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ private Q_SLOTS:
8484
* param[in] DockWidget The dock widget this title bar belongs to
8585
* param[in] parent The parent widget of this title bar
8686
*/
87-
CDockWidgetTab(CDockWidget* DockWidget, QWidget* parent = 0);
87+
CDockWidgetTab(CDockWidget* DockWidget, QWidget* parent = nullptr);
8888

8989
/**
9090
* Virtual Destructor

src/ElidingLabel.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ class ADS_EXPORT CElidingLabel : public QLabel
5858
public:
5959
using Super = QLabel;
6060

61-
CElidingLabel(QWidget* parent = 0, Qt::WindowFlags f = Qt::WindowFlags ());
62-
CElidingLabel(const QString& text, QWidget* parent = 0, Qt::WindowFlags f = Qt::WindowFlags ());
61+
CElidingLabel(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags ());
62+
CElidingLabel(const QString& text, QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags ());
6363
virtual ~CElidingLabel();
6464

6565
/**

src/ads_globals.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ xcb_atom_t xcb_get_atom(const char *name)
9292
}
9393
xcb_connection_t *connection = x11_connection();
9494
xcb_intern_atom_cookie_t request = xcb_intern_atom(connection, 1, strlen(name), name);
95-
xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(connection, request, NULL);
95+
xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(connection, request, nullptr);
9696
if (!reply)
9797
{
9898
return XCB_ATOM_NONE;

src/linux/FloatingWidgetTitleBar.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,11 @@ CFloatingWidgetTitleBar::CFloatingWidgetTitleBar(CFloatingDockContainer *parent)
137137
d->FloatingWidget = parent;
138138
d->createLayout();
139139

140-
auto normalPixmap = this->style()->standardPixmap(QStyle::SP_TitleBarNormalButton, 0, d->MaximizeButton);
140+
auto normalPixmap = this->style()->standardPixmap(QStyle::SP_TitleBarNormalButton, nullptr, d->MaximizeButton);
141141
d->NormalIcon.addPixmap(normalPixmap, QIcon::Normal);
142142
d->NormalIcon.addPixmap(internal::createTransparentPixmap(normalPixmap, 0.25), QIcon::Disabled);
143143

144-
auto maxPixmap = this->style()->standardPixmap(QStyle::SP_TitleBarMaxButton, 0, d->MaximizeButton);
144+
auto maxPixmap = this->style()->standardPixmap(QStyle::SP_TitleBarMaxButton, nullptr, d->MaximizeButton);
145145
d->MaximizeIcon.addPixmap(maxPixmap, QIcon::Normal);
146146
d->MaximizeIcon.addPixmap(internal::createTransparentPixmap(maxPixmap, 0.25), QIcon::Disabled);
147147
setMaximizedIcon(d->Maximized);

0 commit comments

Comments
 (0)