diff options
Diffstat (limited to 'src/plugins/styles/mac')
| -rw-r--r-- | src/plugins/styles/mac/qmacstyle_mac.mm | 4 | ||||
| -rw-r--r-- | src/plugins/styles/mac/qmacstyle_mac_p.h | 30 |
2 files changed, 17 insertions, 17 deletions
diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index 904f94fc95..c0862001f4 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -1469,7 +1469,7 @@ QStyleHelper::WidgetSizePolicy QMacStylePrivate::aquaSizeConstrain(const QStyleO if (guess_size) ret = qt_aqua_guess_size(widg, large, small, mini); - QSize *sz = 0; + QSize *sz = nullptr; if (ret == QStyleHelper::SizeSmall) sz = &small; else if (ret == QStyleHelper::SizeLarge) @@ -6489,7 +6489,7 @@ bool QMacStyle::event(QEvent *e) { Q_D(QMacStyle); if(e->type() == QEvent::FocusIn) { - QWidget *f = 0; + QWidget *f = nullptr; QWidget *focusWidget = QApplication::focusWidget(); #if QT_CONFIG(graphicsview) if (QGraphicsView *graphicsView = qobject_cast<QGraphicsView *>(focusWidget)) { diff --git a/src/plugins/styles/mac/qmacstyle_mac_p.h b/src/plugins/styles/mac/qmacstyle_mac_p.h index 88f104cccf..d1d6bc6339 100644 --- a/src/plugins/styles/mac/qmacstyle_mac_p.h +++ b/src/plugins/styles/mac/qmacstyle_mac_p.h @@ -77,28 +77,28 @@ public: void polish(QPalette &pal); void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const; + const QWidget *w = nullptr) const; void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const; - QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const; + const QWidget *w = nullptr) const; + QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = nullptr) const; void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, - const QWidget *w = 0) const; + const QWidget *w = nullptr) const; SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, - const QPoint &pt, const QWidget *w = 0) const; + const QPoint &pt, const QWidget *w = nullptr) const; QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, - const QWidget *w = 0) const; + const QWidget *w = nullptr) const; QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, - const QSize &contentsSize, const QWidget *w = 0) const; + const QSize &contentsSize, const QWidget *w = nullptr) const; - int pixelMetric(PixelMetric pm, const QStyleOption *opt = 0, const QWidget *widget = 0) const; + int pixelMetric(PixelMetric pm, const QStyleOption *opt = 0, const QWidget *widget = nullptr) const; QPalette standardPalette() const; - virtual int styleHint(StyleHint sh, const QStyleOption *opt = 0, const QWidget *w = 0, - QStyleHintReturn *shret = 0) const; + virtual int styleHint(StyleHint sh, const QStyleOption *opt = 0, const QWidget *w = nullptr, + QStyleHintReturn *shret = nullptr) const; QPixmap standardPixmap(StandardPixmap sp, const QStyleOption *opt, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const; @@ -108,11 +108,11 @@ public: bool event(QEvent *e); - QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0, - const QWidget *widget = 0) const; + QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = nullptr, + const QWidget *widget = nullptr) const; int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, - Qt::Orientation orientation, const QStyleOption *option = 0, - const QWidget *widget = 0) const; + Qt::Orientation orientation, const QStyleOption *option = nullptr, + const QWidget *widget = nullptr) const; private: Q_DISABLE_COPY_MOVE(QMacStyle) |