diff options
Diffstat (limited to 'src/widgets/styles/qstyle.h')
| -rw-r--r-- | src/widgets/styles/qstyle.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/widgets/styles/qstyle.h b/src/widgets/styles/qstyle.h index b4936a3e0a..f922aff7f1 100644 --- a/src/widgets/styles/qstyle.h +++ b/src/widgets/styles/qstyle.h @@ -202,7 +202,7 @@ public: Q_ENUM(PrimitiveElement) virtual void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, - const QWidget *w = Q_NULLPTR) const = 0; + const QWidget *w = nullptr) const = 0; enum ControlElement { CE_PushButton, CE_PushButtonBevel, @@ -273,7 +273,7 @@ public: Q_ENUM(ControlElement) virtual void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, - const QWidget *w = Q_NULLPTR) const = 0; + const QWidget *w = nullptr) const = 0; enum SubElement { SE_PushButtonContents, @@ -362,7 +362,7 @@ public: Q_ENUM(SubElement) virtual QRect subElementRect(SubElement subElement, const QStyleOption *option, - const QWidget *widget = Q_NULLPTR) const = 0; + const QWidget *widget = nullptr) const = 0; enum ComplexControl { @@ -441,11 +441,11 @@ public: virtual void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, - const QWidget *widget = Q_NULLPTR) const = 0; + const QWidget *widget = nullptr) const = 0; virtual SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, - const QPoint &pt, const QWidget *widget = Q_NULLPTR) const = 0; + const QPoint &pt, const QWidget *widget = nullptr) const = 0; virtual QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, - SubControl sc, const QWidget *widget = Q_NULLPTR) const = 0; + SubControl sc, const QWidget *widget = nullptr) const = 0; enum PixelMetric { PM_ButtonMargin, @@ -579,8 +579,8 @@ public: }; Q_ENUM(PixelMetric) - virtual int pixelMetric(PixelMetric metric, const QStyleOption *option = Q_NULLPTR, - const QWidget *widget = Q_NULLPTR) const = 0; + virtual int pixelMetric(PixelMetric metric, const QStyleOption *option = nullptr, + const QWidget *widget = nullptr) const = 0; enum ContentsType { CT_PushButton, @@ -612,7 +612,7 @@ public: Q_ENUM(ContentsType) virtual QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, - const QSize &contentsSize, const QWidget *w = Q_NULLPTR) const = 0; + const QSize &contentsSize, const QWidget *w = nullptr) const = 0; enum RequestSoftwareInputPanel { RSIP_OnMouseClickAndAlreadyFocused, @@ -745,8 +745,8 @@ public: }; Q_ENUM(StyleHint) - virtual int styleHint(StyleHint stylehint, const QStyleOption *opt = Q_NULLPTR, - const QWidget *widget = Q_NULLPTR, QStyleHintReturn* returnData = Q_NULLPTR) const = 0; + virtual int styleHint(StyleHint stylehint, const QStyleOption *opt = nullptr, + const QWidget *widget = nullptr, QStyleHintReturn* returnData = nullptr) const = 0; enum StandardPixmap { SP_TitleBarMenuButton, @@ -825,11 +825,11 @@ public: }; Q_ENUM(StandardPixmap) - virtual QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt = Q_NULLPTR, - const QWidget *widget = Q_NULLPTR) const = 0; + virtual QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt = nullptr, + const QWidget *widget = nullptr) const = 0; - virtual QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = Q_NULLPTR, - const QWidget *widget = Q_NULLPTR) const = 0; + virtual QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = nullptr, + const QWidget *widget = nullptr) const = 0; virtual QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const = 0; @@ -848,10 +848,10 @@ public: virtual int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, - const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const = 0; + const QStyleOption *option = nullptr, const QWidget *widget = nullptr) const = 0; int combinedLayoutSpacing(QSizePolicy::ControlTypes controls1, QSizePolicy::ControlTypes controls2, Qt::Orientation orientation, - QStyleOption *option = Q_NULLPTR, QWidget *widget = Q_NULLPTR) const; + QStyleOption *option = nullptr, QWidget *widget = nullptr) const; const QStyle * proxy() const; |