diff --git a/src/Gui/Inventor/SmSwitchboard.cpp b/src/Gui/Inventor/SmSwitchboard.cpp index de687bf0f5..2b411ce367 100644 --- a/src/Gui/Inventor/SmSwitchboard.cpp +++ b/src/Gui/Inventor/SmSwitchboard.cpp @@ -79,7 +79,7 @@ // doc in super void -SmSwitchboard::initClass(void) +SmSwitchboard::initClass() { SO_NODE_INIT_CLASS(SmSwitchboard, SoGroup, SoGroup); } @@ -89,7 +89,7 @@ SO_NODE_SOURCE(SmSwitchboard) /*! Default constructor. */ -SmSwitchboard::SmSwitchboard(void) +SmSwitchboard::SmSwitchboard() { SO_NODE_CONSTRUCTOR(SmSwitchboard); @@ -115,7 +115,7 @@ SmSwitchboard::SmSwitchboard(int numchildren) /*! Destructor. */ -SmSwitchboard::~SmSwitchboard(void) // virtual, protected +SmSwitchboard::~SmSwitchboard() // virtual, protected { } @@ -204,7 +204,7 @@ SmSwitchboard::handleEvent(SoHandleEventAction *action) void SmSwitchboard::search(SoSearchAction * action) { - SoNode::search(action); + SoNode::search(action); // clazy:exclude=skipped-base-method if (action->isFound()) return; SmSwitchboard::doAction(action); } diff --git a/src/Gui/Inventor/SmSwitchboard.h b/src/Gui/Inventor/SmSwitchboard.h index 19e6f580f9..443e7ed07d 100644 --- a/src/Gui/Inventor/SmSwitchboard.h +++ b/src/Gui/Inventor/SmSwitchboard.h @@ -45,8 +45,8 @@ class GuiExport SmSwitchboard : public SoGroup { SO_NODE_HEADER(SmSwitchboard); public: - static void initClass(void); - SmSwitchboard(void); + static void initClass(); + SmSwitchboard(); SmSwitchboard(int numchildren); SoMFBool enable; @@ -61,7 +61,7 @@ public: virtual void search(SoSearchAction * action); protected: - virtual ~SmSwitchboard(void); + virtual ~SmSwitchboard(); }; diff --git a/src/Gui/Inventor/SoAutoZoomTranslation.h b/src/Gui/Inventor/SoAutoZoomTranslation.h index 0ca9d9fc76..246e6257e4 100644 --- a/src/Gui/Inventor/SoAutoZoomTranslation.h +++ b/src/Gui/Inventor/SoAutoZoomTranslation.h @@ -42,7 +42,7 @@ public: SoSFFloat scaleFactor; protected: - virtual ~SoAutoZoomTranslation() {}; + virtual ~SoAutoZoomTranslation() {} virtual void doAction(SoAction * action); virtual void getPrimitiveCount(SoGetPrimitiveCountAction * action); virtual void getMatrix(SoGetMatrixAction * action); diff --git a/src/Gui/QSint/actionpanel/actionbox.cpp b/src/Gui/QSint/actionpanel/actionbox.cpp index 8bd92e7bb5..904cc6fdeb 100644 --- a/src/Gui/QSint/actionpanel/actionbox.cpp +++ b/src/Gui/QSint/actionpanel/actionbox.cpp @@ -132,7 +132,7 @@ QPixmap ActionBox::icon() const ActionLabel* ActionBox::createItem(QAction * action, QLayout * l) { if (!action) - return 0; + return nullptr; ActionLabel *act = createItem("", l); act->setDefaultAction(action); diff --git a/src/Gui/QSint/actionpanel/actionbox.h b/src/Gui/QSint/actionpanel/actionbox.h index 645d56175c..1327d5b0f7 100644 --- a/src/Gui/QSint/actionpanel/actionbox.h +++ b/src/Gui/QSint/actionpanel/actionbox.h @@ -169,13 +169,13 @@ class QSINT_EXPORT ActionBox : public QFrame public: /** Constructor. */ - explicit ActionBox(QWidget *parent = 0); + explicit ActionBox(QWidget *parent = nullptr); /** Constructor. */ - explicit ActionBox(const QString & headerText, QWidget *parent = 0); + explicit ActionBox(const QString & headerText, QWidget *parent = nullptr); /** Constructor. */ - explicit ActionBox(const QPixmap & icon, const QString & headerText, QWidget *parent = 0); + explicit ActionBox(const QPixmap & icon, const QString & headerText, QWidget *parent = nullptr); /** Sets icon of the ActionBox to \a icon. */ @@ -199,7 +199,7 @@ public: \since 0.2 */ - ActionLabel* createItem(QAction * action, QLayout * l = 0); + ActionLabel* createItem(QAction * action, QLayout * l = nullptr); /** Creates action items from the \a actions list and returns the list of action items. \since 0.2 @@ -208,19 +208,19 @@ public: /** Adds an action with \a text to the ActionBox and returns action item. */ - ActionLabel* createItem(const QString & text = QString(), QLayout * l = 0); + ActionLabel* createItem(const QString & text = QString(), QLayout * l = nullptr); /** Adds an action with \a icon and \a text to the ActionBox and returns action item. This function acts just like previous one. See the description above. */ - ActionLabel* createItem(const QPixmap & icon, const QString & text, QLayout * l = 0); + ActionLabel* createItem(const QPixmap & icon, const QString & text, QLayout * l = nullptr); /** Adds a spacer and returns spacer item. By default, a spacer is added to the default vertical layout. You can add a spacer to the specified layout passing it as \a l parameter. */ - QSpacerItem* createSpacer(QLayout * l = 0); + QSpacerItem* createSpacer(QLayout * l = nullptr); /** Creates empty horizontal layout. @@ -240,7 +240,7 @@ public: By default, widget is added to the default vertical layout. You can add widget to the specified layout passing it as \a l parameter. */ - void addWidget(QWidget * w, QLayout * l = 0); + void addWidget(QWidget * w, QLayout * l = nullptr); virtual QSize minimumSizeHint() const; diff --git a/src/Gui/QSint/actionpanel/actiongroup.cpp b/src/Gui/QSint/actionpanel/actiongroup.cpp index 7864f224a9..7c4d8daba2 100644 --- a/src/Gui/QSint/actionpanel/actiongroup.cpp +++ b/src/Gui/QSint/actionpanel/actiongroup.cpp @@ -79,7 +79,7 @@ QBoxLayout* ActionGroup::groupLayout() ActionLabel* ActionGroup::addAction(QAction *action, bool addToLayout, bool addStretch) { if (!action) - return 0; + return nullptr; ActionLabel* label = new ActionLabel(action, this); myGroup->addActionLabel(label, addToLayout, addStretch); @@ -90,7 +90,7 @@ ActionLabel* ActionGroup::addAction(QAction *action, bool addToLayout, bool addS ActionLabel* ActionGroup::addActionLabel(ActionLabel *label, bool addToLayout, bool addStretch) { if (!label) - return 0; + return nullptr; myGroup->addActionLabel(label, addToLayout, addStretch); diff --git a/src/Gui/QSint/actionpanel/actiongroup.h b/src/Gui/QSint/actionpanel/actiongroup.h index 36602fe3df..b5c28f71e0 100644 --- a/src/Gui/QSint/actionpanel/actiongroup.h +++ b/src/Gui/QSint/actionpanel/actiongroup.h @@ -43,7 +43,7 @@ class QSINT_EXPORT ActionGroup : public QWidget public: /** Constructor. Creates ActionGroup without header. */ - explicit ActionGroup(QWidget *parent = 0); + explicit ActionGroup(QWidget *parent = nullptr); /** Constructor. Creates ActionGroup with header's text set to \a title, but with no icon. @@ -52,7 +52,7 @@ public: */ explicit ActionGroup(const QString& title, bool expandable = true, - QWidget *parent = 0); + QWidget *parent = nullptr); /** Constructor. Creates ActionGroup with header's text set to \a title and icon set to \a icon. @@ -62,7 +62,7 @@ public: explicit ActionGroup(const QPixmap& icon, const QString& title, bool expandable = true, - QWidget *parent = 0); + QWidget *parent = nullptr); /** Creates action item from the \a action and returns it. diff --git a/src/Gui/QSint/actionpanel/actionlabel.h b/src/Gui/QSint/actionpanel/actionlabel.h index cd08ee6859..f3bca6abb7 100644 --- a/src/Gui/QSint/actionpanel/actionlabel.h +++ b/src/Gui/QSint/actionpanel/actionlabel.h @@ -72,12 +72,12 @@ class QSINT_EXPORT ActionLabel : public QToolButton public: /** Constructor. */ - explicit ActionLabel(QWidget *parent = 0); + explicit ActionLabel(QWidget *parent = nullptr); /** Constructor. Creates ActionLabel from the \a action. \since 0.2 */ - explicit ActionLabel(QAction *action, QWidget *parent = 0); + explicit ActionLabel(QAction *action, QWidget *parent = nullptr); virtual ~ActionLabel() {} diff --git a/src/Gui/QSint/actionpanel/actionpanel.cpp b/src/Gui/QSint/actionpanel/actionpanel.cpp index 76a3dd8083..37b88e7bd0 100644 --- a/src/Gui/QSint/actionpanel/actionpanel.cpp +++ b/src/Gui/QSint/actionpanel/actionpanel.cpp @@ -17,7 +17,7 @@ namespace QSint ActionPanel::ActionPanel(QWidget *parent) : - BaseClass(parent), mySpacer(0) + BaseClass(parent), mySpacer(nullptr) { setProperty("class", "panel"); @@ -85,7 +85,7 @@ void ActionPanel::removeStretch() if (mySpacer) { layout()->removeItem(mySpacer); delete mySpacer; - mySpacer = 0; + mySpacer = nullptr; } } diff --git a/src/Gui/QSint/actionpanel/actionpanel.h b/src/Gui/QSint/actionpanel/actionpanel.h index 0dc2a0860c..c563259895 100644 --- a/src/Gui/QSint/actionpanel/actionpanel.h +++ b/src/Gui/QSint/actionpanel/actionpanel.h @@ -45,7 +45,7 @@ class QSINT_EXPORT ActionPanel : public QFrame public: /** Constructor. */ - explicit ActionPanel(QWidget *parent = 0); + explicit ActionPanel(QWidget *parent = nullptr); /** Adds a widget \a w to the ActionPanel's vertical layout. */ diff --git a/src/Gui/QSint/actionpanel/taskheader_p.cpp b/src/Gui/QSint/actionpanel/taskheader_p.cpp index 38c4ab4e1e..7414f65315 100644 --- a/src/Gui/QSint/actionpanel/taskheader_p.cpp +++ b/src/Gui/QSint/actionpanel/taskheader_p.cpp @@ -31,7 +31,7 @@ TaskHeader::TaskHeader(const QIcon &icon, const QString &title, bool expandable, m_buttonOver(false), m_fold(true), m_opacity(0.1), - myButton(0) + myButton(nullptr) { setProperty("class", "header"); @@ -79,9 +79,9 @@ void TaskHeader::setExpandable(bool expandable) return; myButton->removeEventFilter(this); - myButton->setParent(0); + myButton->setParent(nullptr); delete myButton; - myButton = 0; + myButton = nullptr; changeIcons(); } } diff --git a/src/Gui/QSint/actionpanel/taskheader_p.h b/src/Gui/QSint/actionpanel/taskheader_p.h index 5cdef3b419..91707b4ed5 100644 --- a/src/Gui/QSint/actionpanel/taskheader_p.h +++ b/src/Gui/QSint/actionpanel/taskheader_p.h @@ -27,7 +27,7 @@ class TaskHeader : public QFrame friend class ActionGroup; public: - TaskHeader(const QIcon &icon, const QString &title, bool expandable, QWidget *parent = 0); + TaskHeader(const QIcon &icon, const QString &title, bool expandable, QWidget *parent = nullptr); inline bool expandable() const { return myExpandable; } void setExpandable(bool expandable); diff --git a/src/Gui/iisTaskPanel/src/iisfreecadscheme.cpp b/src/Gui/iisTaskPanel/src/iisfreecadscheme.cpp index 48f94c2493..a242614b57 100644 --- a/src/Gui/iisTaskPanel/src/iisfreecadscheme.cpp +++ b/src/Gui/iisTaskPanel/src/iisfreecadscheme.cpp @@ -26,7 +26,7 @@ #include -iisFreeCADTaskPanelScheme* iisFreeCADTaskPanelScheme::myDefaultXPScheme = 0; +iisFreeCADTaskPanelScheme* iisFreeCADTaskPanelScheme::myDefaultXPScheme = nullptr; iisFreeCADTaskPanelScheme::iisFreeCADTaskPanelScheme(QObject *parent) : iisTaskPanelScheme(parent) diff --git a/src/Gui/iisTaskPanel/src/iisfreecadscheme.h b/src/Gui/iisTaskPanel/src/iisfreecadscheme.h index 67bc10c3cd..79e062896b 100644 --- a/src/Gui/iisTaskPanel/src/iisfreecadscheme.h +++ b/src/Gui/iisTaskPanel/src/iisfreecadscheme.h @@ -32,7 +32,7 @@ class IISTASKPANEL_EXPORT iisFreeCADTaskPanelScheme : public iisTaskPanelScheme { public: - iisFreeCADTaskPanelScheme(QObject *parent=0); + iisFreeCADTaskPanelScheme(QObject *parent=nullptr); ~iisFreeCADTaskPanelScheme(); static iisTaskPanelScheme* defaultScheme(); diff --git a/src/Gui/iisTaskPanel/src/iisiconlabel.cpp b/src/Gui/iisTaskPanel/src/iisiconlabel.cpp index eaae92a108..a185db3c31 100644 --- a/src/Gui/iisTaskPanel/src/iisiconlabel.cpp +++ b/src/Gui/iisTaskPanel/src/iisiconlabel.cpp @@ -12,7 +12,7 @@ iisIconLabel::iisIconLabel(const QIcon &icon, const QString &title, QWidget *par : QWidget(parent), myPixmap(icon), myText(title), - mySchemePointer(0), + mySchemePointer(nullptr), m_over(false), m_pressed(false), m_changeCursorOver(true), diff --git a/src/Gui/iisTaskPanel/src/iisiconlabel.h b/src/Gui/iisTaskPanel/src/iisiconlabel.h index 8ce6229c93..471f494919 100644 --- a/src/Gui/iisTaskPanel/src/iisiconlabel.h +++ b/src/Gui/iisTaskPanel/src/iisiconlabel.h @@ -20,7 +20,7 @@ class IISTASKPANEL_EXPORT iisIconLabel : public QWidget Q_OBJECT public: - iisIconLabel(const QIcon &icon, const QString &title, QWidget *parent = 0); + iisIconLabel(const QIcon &icon, const QString &title, QWidget *parent = nullptr); virtual ~iisIconLabel(); void setColors(const QColor &color, const QColor &colorOver, const QColor &colorOff); diff --git a/src/Gui/iisTaskPanel/src/iistaskbox.h b/src/Gui/iisTaskPanel/src/iistaskbox.h index 09788d0d84..8f320a28e0 100644 --- a/src/Gui/iisTaskPanel/src/iistaskbox.h +++ b/src/Gui/iisTaskPanel/src/iistaskbox.h @@ -27,8 +27,8 @@ class IISTASKPANEL_EXPORT iisTaskBox : public QFrame Q_OBJECT public: - iisTaskBox(const QString &title, bool expandable = true, QWidget *parent = 0); - iisTaskBox(const QPixmap &icon, const QString &title, bool expandable = true, QWidget *parent = 0); + iisTaskBox(const QString &title, bool expandable = true, QWidget *parent = nullptr); + iisTaskBox(const QPixmap &icon, const QString &title, bool expandable = true, QWidget *parent = nullptr); virtual ~iisTaskBox(); void setScheme(iisTaskPanelScheme *pointer); diff --git a/src/Gui/iisTaskPanel/src/iistaskheader.cpp b/src/Gui/iisTaskPanel/src/iistaskheader.cpp index d037f112c7..c74995f040 100644 --- a/src/Gui/iisTaskPanel/src/iistaskheader.cpp +++ b/src/Gui/iisTaskPanel/src/iistaskheader.cpp @@ -22,7 +22,7 @@ iisTaskHeader::iisTaskHeader(const QIcon &icon, const QString &title, bool expan m_buttonOver(false), m_fold(true), m_opacity(0.1), - myButton(0) + myButton(nullptr) { myTitle = new iisIconLabel(icon, title, this); myTitle->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred); diff --git a/src/Gui/iisTaskPanel/src/iistaskheader.h b/src/Gui/iisTaskPanel/src/iistaskheader.h index cebe26b8ab..6b02754d34 100644 --- a/src/Gui/iisTaskPanel/src/iistaskheader.h +++ b/src/Gui/iisTaskPanel/src/iistaskheader.h @@ -25,7 +25,7 @@ class IISTASKPANEL_EXPORT iisTaskHeader : public QFrame Q_OBJECT public: - iisTaskHeader(const QIcon &icon, const QString &title, bool expandable, QWidget *parent = 0); + iisTaskHeader(const QIcon &icon, const QString &title, bool expandable, QWidget *parent = nullptr); void setScheme(iisTaskPanelScheme *scheme); virtual ~iisTaskHeader(); diff --git a/src/Gui/iisTaskPanel/src/iistaskpanel.cpp b/src/Gui/iisTaskPanel/src/iistaskpanel.cpp index 8605fbde87..61fb5c812d 100644 --- a/src/Gui/iisTaskPanel/src/iistaskpanel.cpp +++ b/src/Gui/iisTaskPanel/src/iistaskpanel.cpp @@ -12,7 +12,7 @@ iisTaskPanel::iisTaskPanel(QWidget *parent) : - QWidget(parent), mySpacer(0) + QWidget(parent), mySpacer(nullptr) { myScheme = iisTaskPanelScheme::defaultScheme(); @@ -85,7 +85,7 @@ void iisTaskPanel::removeStretch() { if (mySpacer) { layout()->removeItem(mySpacer); - delete mySpacer; mySpacer = 0; + delete mySpacer; mySpacer = nullptr; } } diff --git a/src/Gui/iisTaskPanel/src/iistaskpanel.h b/src/Gui/iisTaskPanel/src/iistaskpanel.h index a8277d95ff..cec59f1117 100644 --- a/src/Gui/iisTaskPanel/src/iistaskpanel.h +++ b/src/Gui/iisTaskPanel/src/iistaskpanel.h @@ -30,7 +30,7 @@ class iisTaskPanelScheme; class IISTASKPANEL_EXPORT iisTaskPanel : public QWidget { public: - iisTaskPanel(QWidget *parent = 0); + iisTaskPanel(QWidget *parent = nullptr); ~iisTaskPanel(); void addWidget(QWidget *w); diff --git a/src/Gui/iisTaskPanel/src/iistaskpanelscheme.cpp b/src/Gui/iisTaskPanel/src/iistaskpanelscheme.cpp index 882ebe9fc4..8608cdf668 100644 --- a/src/Gui/iisTaskPanel/src/iistaskpanelscheme.cpp +++ b/src/Gui/iisTaskPanel/src/iistaskpanelscheme.cpp @@ -7,7 +7,7 @@ #include "iistaskpanelscheme.h" -iisTaskPanelScheme* iisTaskPanelScheme::myDefaultScheme = 0; +iisTaskPanelScheme* iisTaskPanelScheme::myDefaultScheme = nullptr; iisTaskPanelScheme::iisTaskPanelScheme(QObject *parent) : QObject(parent) @@ -79,5 +79,5 @@ iisTaskPanelScheme* iisTaskPanelScheme::defaultScheme() myDefaultScheme = new iisTaskPanelScheme(); return myDefaultScheme; -} - +} + diff --git a/src/Gui/iisTaskPanel/src/iistaskpanelscheme.h b/src/Gui/iisTaskPanel/src/iistaskpanelscheme.h index a66ecb84d5..66f24750c1 100644 --- a/src/Gui/iisTaskPanel/src/iistaskpanelscheme.h +++ b/src/Gui/iisTaskPanel/src/iistaskpanelscheme.h @@ -28,7 +28,7 @@ struct IISTASKPANEL_EXPORT iisIconLabelScheme class IISTASKPANEL_EXPORT iisTaskPanelScheme : public QObject { public: - iisTaskPanelScheme(QObject *parent = 0); + iisTaskPanelScheme(QObject *parent = nullptr); ~iisTaskPanelScheme(); static iisTaskPanelScheme* defaultScheme(); diff --git a/src/Gui/iisTaskPanel/src/iiswinxptaskpanelscheme.cpp b/src/Gui/iisTaskPanel/src/iiswinxptaskpanelscheme.cpp index c4c9dc81b9..1a70133229 100644 --- a/src/Gui/iisTaskPanel/src/iiswinxptaskpanelscheme.cpp +++ b/src/Gui/iisTaskPanel/src/iiswinxptaskpanelscheme.cpp @@ -7,7 +7,7 @@ #include "iiswinxptaskpanelscheme.h" -iisWinXPTaskPanelScheme* iisWinXPTaskPanelScheme::myDefaultXPScheme = 0; +iisWinXPTaskPanelScheme* iisWinXPTaskPanelScheme::myDefaultXPScheme = nullptr; iisWinXPTaskPanelScheme::iisWinXPTaskPanelScheme(QObject *parent) : iisTaskPanelScheme(parent) @@ -55,7 +55,7 @@ iisTaskPanelScheme* iisWinXPTaskPanelScheme::defaultScheme() -iisWinXPTaskPanelScheme2* iisWinXPTaskPanelScheme2::myDefaultXPScheme = 0; +iisWinXPTaskPanelScheme2* iisWinXPTaskPanelScheme2::myDefaultXPScheme = nullptr; iisWinXPTaskPanelScheme2::iisWinXPTaskPanelScheme2(QObject *parent) : iisTaskPanelScheme(parent) diff --git a/src/Gui/iisTaskPanel/src/iiswinxptaskpanelscheme.h b/src/Gui/iisTaskPanel/src/iiswinxptaskpanelscheme.h index 6718a9609b..589146d320 100644 --- a/src/Gui/iisTaskPanel/src/iiswinxptaskpanelscheme.h +++ b/src/Gui/iisTaskPanel/src/iiswinxptaskpanelscheme.h @@ -15,7 +15,7 @@ class IISTASKPANEL_EXPORT iisWinXPTaskPanelScheme : public iisTaskPanelScheme { public: - iisWinXPTaskPanelScheme(QObject *parent=0); + iisWinXPTaskPanelScheme(QObject *parent=nullptr); ~iisWinXPTaskPanelScheme(); static iisTaskPanelScheme* defaultScheme(); @@ -28,7 +28,7 @@ protected: class IISTASKPANEL_EXPORT iisWinXPTaskPanelScheme2 : public iisTaskPanelScheme { public: - iisWinXPTaskPanelScheme2(QObject *parent=0); + iisWinXPTaskPanelScheme2(QObject *parent=nullptr); ~iisWinXPTaskPanelScheme2(); static iisTaskPanelScheme* defaultScheme();