Gui: modernize C++11
* remove redundant void-arg * use nullptr
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
#include <QStyle>
|
||||
|
||||
|
||||
iisFreeCADTaskPanelScheme* iisFreeCADTaskPanelScheme::myDefaultXPScheme = 0;
|
||||
iisFreeCADTaskPanelScheme* iisFreeCADTaskPanelScheme::myDefaultXPScheme = nullptr;
|
||||
|
||||
iisFreeCADTaskPanelScheme::iisFreeCADTaskPanelScheme(QObject *parent)
|
||||
: iisTaskPanelScheme(parent)
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
class IISTASKPANEL_EXPORT iisFreeCADTaskPanelScheme : public iisTaskPanelScheme
|
||||
{
|
||||
public:
|
||||
iisFreeCADTaskPanelScheme(QObject *parent=0);
|
||||
iisFreeCADTaskPanelScheme(QObject *parent=nullptr);
|
||||
~iisFreeCADTaskPanelScheme();
|
||||
|
||||
static iisTaskPanelScheme* defaultScheme();
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user