mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2024-11-15 13:15:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix 'zero as null pointer constant' warning (#598)

Browse Source
This commit is contained in:
Stefan Gerlach 2024-01-16 14:05:42 +01:00 committed by GitHub
parent 9bdefd6055
commit 1a543e946d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DockAreaTitleBar_p.h
View File

@ -52,7 +52,7 @@ class CSpacerWidget : public QWidget
Q_OBJECT Q_OBJECT
public: public:
using Super = QWidget; using Super = QWidget;
CSpacerWidget(QWidget* Parent = 0); CSpacerWidget(QWidget* Parent = nullptr);
virtual QSize sizeHint() const override {return QSize(0, 0);} virtual QSize sizeHint() const override {return QSize(0, 0);}
virtual QSize minimumSizeHint() const override {return QSize(0, 0);} virtual QSize minimumSizeHint() const override {return QSize(0, 0);}
}; };

2
src/DockManager.cpp
View File

@ -1149,7 +1149,7 @@ QAction* CDockManager::addToggleViewActionToMenu(QAction* ToggleViewAction,
bool AlphabeticallySorted = (MenuAlphabeticallySorted == d->MenuInsertionOrder); bool AlphabeticallySorted = (MenuAlphabeticallySorted == d->MenuInsertionOrder);
if (!Group.isEmpty()) if (!Group.isEmpty())
{ {
QMenu* GroupMenu = d->ViewMenuGroups.value(Group, 0); QMenu* GroupMenu = d->ViewMenuGroups.value(Group, nullptr);
if (!GroupMenu) if (!GroupMenu)
{ {
GroupMenu = new QMenu(Group, this); GroupMenu = new QMenu(Group, this);

2
src/DockWidget.cpp
View File

@ -566,7 +566,7 @@ CDockContainerWidget* CDockWidget::dockContainer() const
} }
else else
{ {
return 0; return nullptr;
} }
} }

2
src/DockWidget.h
View File

@ -256,7 +256,7 @@ public:
* by calling setObjectName() after construction. * by calling setObjectName() after construction.
* Use the layoutFlags to configure the layout of the dock widget. * Use the layoutFlags to configure the layout of the dock widget.
*/ */
CDockWidget(const QString &title, QWidget* parent = 0); CDockWidget(const QString &title, QWidget* parent = nullptr);
/** /**
* Virtual Destructor * Virtual Destructor

2
src/DockWidgetTab.h
View File

@ -84,7 +84,7 @@ public:
* param[in] DockWidget The dock widget this title bar belongs to * param[in] DockWidget The dock widget this title bar belongs to
* param[in] parent The parent widget of this title bar * param[in] parent The parent widget of this title bar
*/ */
CDockWidgetTab(CDockWidget* DockWidget, QWidget* parent = 0); CDockWidgetTab(CDockWidget* DockWidget, QWidget* parent = nullptr);
/** /**
* Virtual Destructor * Virtual Destructor

4
src/ElidingLabel.h
View File

@ -58,8 +58,8 @@ protected:
public: public:
using Super = QLabel; using Super = QLabel;
CElidingLabel(QWidget* parent = 0, Qt::WindowFlags f = Qt::WindowFlags ()); CElidingLabel(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags ());
CElidingLabel(const QString& text, QWidget* parent = 0, Qt::WindowFlags f = Qt::WindowFlags ()); CElidingLabel(const QString& text, QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags ());
virtual ~CElidingLabel(); virtual ~CElidingLabel();
/** /**

2
src/ads_globals.cpp
View File

@ -92,7 +92,7 @@ xcb_atom_t xcb_get_atom(const char *name)
} }
xcb_connection_t *connection = x11_connection(); xcb_connection_t *connection = x11_connection();
xcb_intern_atom_cookie_t request = xcb_intern_atom(connection, 1, strlen(name), name); xcb_intern_atom_cookie_t request = xcb_intern_atom(connection, 1, strlen(name), name);
xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(connection, request, NULL); xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(connection, request, nullptr);
if (!reply) if (!reply)
{ {
return XCB_ATOM_NONE; return XCB_ATOM_NONE;

4
src/linux/FloatingWidgetTitleBar.cpp
View File

@ -137,11 +137,11 @@ CFloatingWidgetTitleBar::CFloatingWidgetTitleBar(CFloatingDockContainer *parent)
d->FloatingWidget = parent; d->FloatingWidget = parent;
d->createLayout(); d->createLayout();
auto normalPixmap = this->style()->standardPixmap(QStyle::SP_TitleBarNormalButton, 0, d->MaximizeButton); auto normalPixmap = this->style()->standardPixmap(QStyle::SP_TitleBarNormalButton, nullptr, d->MaximizeButton);
d->NormalIcon.addPixmap(normalPixmap, QIcon::Normal); d->NormalIcon.addPixmap(normalPixmap, QIcon::Normal);
d->NormalIcon.addPixmap(internal::createTransparentPixmap(normalPixmap, 0.25), QIcon::Disabled); d->NormalIcon.addPixmap(internal::createTransparentPixmap(normalPixmap, 0.25), QIcon::Disabled);
auto maxPixmap = this->style()->standardPixmap(QStyle::SP_TitleBarMaxButton, 0, d->MaximizeButton); auto maxPixmap = this->style()->standardPixmap(QStyle::SP_TitleBarMaxButton, nullptr, d->MaximizeButton);
d->MaximizeIcon.addPixmap(maxPixmap, QIcon::Normal); d->MaximizeIcon.addPixmap(maxPixmap, QIcon::Normal);
d->MaximizeIcon.addPixmap(internal::createTransparentPixmap(maxPixmap, 0.25), QIcon::Disabled); d->MaximizeIcon.addPixmap(internal::createTransparentPixmap(maxPixmap, 0.25), QIcon::Disabled);
setMaximizedIcon(d->Maximized); setMaximizedIcon(d->Maximized);