razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

use nullptr instead of Q_NULLPTR (#2246)

Browse source
This commit is contained in:
otakuto 2018-10-12 16:05:14 +09:00 committed by shun-iwasawa
parent c834f180d8
commit fb35734678
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toonz/sources/include/toonzqt/glwidget_for_highdpi.h
View file

@ -11,7 +11,7 @@
class GLWidgetForHighDpi : public QOpenGLWidget, protected QOpenGLFunctions { class GLWidgetForHighDpi : public QOpenGLWidget, protected QOpenGLFunctions {
public: public:
GLWidgetForHighDpi(QWidget *parent = Q_NULLPTR, GLWidgetForHighDpi(QWidget *parent = nullptr,
Qt::WindowFlags f = Qt::WindowFlags()) Qt::WindowFlags f = Qt::WindowFlags())
: QOpenGLWidget(parent, f) {} : QOpenGLWidget(parent, f) {}

6
toonz/sources/include/toonzqt/stylenameeditor.h
View file

@ -24,7 +24,7 @@ class NewWordDialog : public QDialog {
QLineEdit *m_lineEdit; QLineEdit *m_lineEdit;
public: public:
NewWordDialog(QWidget *parent = Q_NULLPTR); NewWordDialog(QWidget *parent = nullptr);
QString getName(); QString getName();
}; };
@ -33,7 +33,7 @@ public:
class WordButton : public QPushButton { class WordButton : public QPushButton {
Q_OBJECT Q_OBJECT
public: public:
WordButton(const QString &text, QWidget *parent = Q_NULLPTR); WordButton(const QString &text, QWidget *parent = nullptr);
protected: protected:
void contextMenuEvent(QContextMenuEvent *) override; void contextMenuEvent(QContextMenuEvent *) override;
@ -54,7 +54,7 @@ class AddWordButton final : public WordButton {
int m_column; int m_column;
public: public:
AddWordButton(const int col, QWidget *parent = Q_NULLPTR); AddWordButton(const int col, QWidget *parent = nullptr);
protected slots: protected slots:
void onClicked() override; void onClicked() override;

2
toonz/sources/tnztools/tooloptionscontrols.h
View file

@ -603,7 +603,7 @@ protected:
void mouseReleaseEvent(QMouseEvent *) override; void mouseReleaseEvent(QMouseEvent *) override;
public: public:
ClickableLabel(const QString &text, QWidget *parent = Q_NULLPTR, ClickableLabel(const QString &text, QWidget *parent = nullptr,
Qt::WindowFlags f = Qt::WindowFlags()); Qt::WindowFlags f = Qt::WindowFlags());
~ClickableLabel(); ~ClickableLabel();