Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

0 to Q_NULLPTR

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2016-11-04 14:10:28 +00:00
parent 6026db1f7b
commit 7fdf28f1b9
46 changed files with 199 additions and 202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/3rdparty/javascriptcore/runtime/ArgList.h vendored
View file

@ -45,7 +45,7 @@ namespace JSC {
// FIXME: Remove all clients of this API, then remove this API.
MarkedArgumentBuffer()
: m_isUsingInlineBuffer(true)
, m_markSet(0)
, m_markSet(Q_NULLPTR)
#ifndef NDEBUG
, m_isReadOnly(false)
#endif
@ -59,7 +59,7 @@ namespace JSC {
: m_buffer(buffer)
, m_size(size)
, m_isUsingInlineBuffer(true)
, m_markSet(0)
, m_markSet(Q_NULLPTR)
#ifndef NDEBUG
, m_isReadOnly(true)
#endif
@ -97,7 +97,7 @@ namespace JSC {
void clear()
{
m_vector.clear();
m_buffer = 0;
m_buffer = Q_NULLPTR;
m_size = 0;
}

2
src/3rdparty/javascriptcore/wtf/Assertions.h vendored
View file

@ -55,7 +55,7 @@
#ifndef CRASH
#define CRASH() do { \
*(int *)(uintptr_t)0xbbadbeef = 0; \
((void(*)())0)(); /* More reliable, but doesn't say BBADBEEF */ \
((void(*)())Q_NULLPTR)(); /* More reliable, but doesn't say BBADBEEF */ \
} while(false)
#endif

12
src/3rdparty/javascriptcore/wtf/HashTable.h vendored
View file

@ -477,7 +477,7 @@ namespace WTF {
int i = h & sizeMask;
if (!table)
return 0;
return Q_NULLPTR;
#if DUMP_HASHTABLE_STATS
atomicIncrement(&HashTableStats::numAccesses);
@ -493,10 +493,10 @@ namespace WTF {
return entry;
if (isEmptyBucket(*entry))
return 0;
return Q_NULLPTR;
} else {
if (isEmptyBucket(*entry))
return 0;
return Q_NULLPTR;
if (!isDeletedBucket(*entry) && HashTranslator::equal(Extractor::extract(*entry), key))
return entry;
@ -529,7 +529,7 @@ namespace WTF {
int probeCount = 0;
#endif
ValueType* deletedEntry = 0;
ValueType* deletedEntry = Q_NULLPTR;
while (1) {
ValueType* entry = table + i;
@ -581,7 +581,7 @@ namespace WTF {
int probeCount = 0;
#endif
ValueType* deletedEntry = 0;
ValueType* deletedEntry = Q_NULLPTR;
while (1) {
ValueType* entry = table + i;
@ -641,7 +641,7 @@ namespace WTF {
int probeCount = 0;
#endif
ValueType* deletedEntry = 0;
ValueType* deletedEntry = Q_NULLPTR;
ValueType* entry;
while (1) {
entry = table + i;

6
src/3rdparty/javascriptcore/wtf/Vector.h vendored
View file

@ -296,7 +296,7 @@ namespace WTF {
void deallocateBuffer(T* bufferToDeallocate)
{
if (m_buffer == bufferToDeallocate) {
m_buffer = 0;
m_buffer = Q_NULLPTR;
m_capacity = 0;
}
fastFree(bufferToDeallocate);
@ -310,14 +310,14 @@ namespace WTF {
T* releaseBuffer()
{
T* buffer = m_buffer;
m_buffer = 0;
m_buffer = Q_NULLPTR;
m_capacity = 0;
return buffer;
}
protected:
VectorBufferBase()
: m_buffer(0)
: m_buffer(Q_NULLPTR)
, m_capacity(0)
{
}

2
src/core/thread/qthreadstorage.h
View file

@ -70,7 +70,7 @@ inline
T *&qThreadStorage_localData(QThreadStorageData &d, T **)
{
void **v = d.get();
if (!v) v = d.set(0);
if (!v) v = d.set(Q_NULLPTR);
return *(reinterpret_cast<T**>(v));
}

4
src/gui/dialogs/qcolordialog.cpp
View file

@ -77,7 +77,7 @@ class QWellArray : public QWidget
Q_PROPERTY(int selectedRow READ selectedRow)
public:
QWellArray(int rows, int cols, QWidget* parent=0);
QWellArray(int rows, int cols, QWidget* parent = Q_NULLPTR);
~QWellArray() {}
QString cellContent(int row, int col) const;
@ -649,7 +649,7 @@ class QColorLuminancePicker : public QWidget
{
Q_OBJECT
public:
QColorLuminancePicker(QWidget* parent=0);
QColorLuminancePicker(QWidget* parent = Q_NULLPTR);
~QColorLuminancePicker();
public slots:

2
src/gui/dialogs/qerrormessage.h
View file

@ -58,7 +58,7 @@ class Q_GUI_EXPORT QErrorMessage: public QDialog
Q_OBJECT
Q_DECLARE_PRIVATE(QErrorMessage)
public:
explicit QErrorMessage(QWidget* parent = 0);
explicit QErrorMessage(QWidget* parent = Q_NULLPTR);
~QErrorMessage();
static QErrorMessage * qtHandler();

2
src/gui/dialogs/qprintpreviewdialog.cpp
View file

@ -107,7 +107,7 @@ class LineEdit : public QLineEdit
{
Q_OBJECT
public:
LineEdit(QWidget* parent = 0)
LineEdit(QWidget* parent = Q_NULLPTR)
: QLineEdit(parent)
{
setContextMenuPolicy(Qt::NoContextMenu);

18
src/gui/image/qimage.h
View file

@ -127,9 +127,9 @@ public:
#ifndef QT_NO_IMAGEFORMAT_XPM
explicit QImage(const char * const xpm[]);
#endif
explicit QImage(const QString &fileName, const char *format = 0);
explicit QImage(const QString &fileName, const char *format = Q_NULLPTR);
#ifndef QT_NO_CAST_FROM_ASCII
explicit QImage(const char *fileName, const char *format = 0);
explicit QImage(const char *fileName, const char *format = Q_NULLPTR);
#endif
QImage(const QImage &);
@ -238,16 +238,16 @@ public:
bool load(QIODevice *device, const char* format);
bool load(const QString &fileName, const char* format=0);
bool loadFromData(const char *buf, int len, const char *format = 0);
inline bool loadFromData(const QByteArray &data, const char* aformat=0)
bool load(const QString &fileName, const char* format = Q_NULLPTR);
bool loadFromData(const char *buf, int len, const char *format = Q_NULLPTR);
inline bool loadFromData(const QByteArray &data, const char* aformat = Q_NULLPTR)
{ return loadFromData(data.constData(), data.size(), aformat); }
bool save(const QString &fileName, const char* format=0, int quality=-1) const;
bool save(QIODevice *device, const char* format=0, int quality=-1) const;
bool save(const QString &fileName, const char* format = Q_NULLPTR, int quality=-1) const;
bool save(QIODevice *device, const char* format = Q_NULLPTR, int quality=-1) const;
static QImage fromData(const char *data, int size, const char *format = 0);
inline static QImage fromData(const QByteArray &data, const char *format = 0)
static QImage fromData(const char *data, int size, const char *format = Q_NULLPTR);
inline static QImage fromData(const QByteArray &data, const char *format = Q_NULLPTR)
{ return fromData(data.constData(), data.size(), format); }
qint64 cacheKey() const;

16
src/gui/image/qpixmap.h
View file

@ -70,7 +70,7 @@ public:
explicit QPixmap(QPixmapData *data);
QPixmap(int w, int h);
QPixmap(const QSize &);
QPixmap(const QString& fileName, const char *format = 0, Qt::ImageConversionFlags flags = Qt::AutoColor);
QPixmap(const QString& fileName, const char *format = Q_NULLPTR, Qt::ImageConversionFlags flags = Qt::AutoColor);
#ifndef QT_NO_IMAGEFORMAT_XPM
QPixmap(const char * const xpm[]);
#endif
@ -138,19 +138,19 @@ public:
static QPixmap fromImage(const QImage &image, Qt::ImageConversionFlags flags = Qt::AutoColor);
static QPixmap fromImageReader(QImageReader *imageReader, Qt::ImageConversionFlags flags = Qt::AutoColor);
bool load(const QString& fileName, const char *format = 0, Qt::ImageConversionFlags flags = Qt::AutoColor);
bool loadFromData(const uchar *buf, uint len, const char* format = 0, Qt::ImageConversionFlags flags = Qt::AutoColor);
inline bool loadFromData(const QByteArray &data, const char* format = 0, Qt::ImageConversionFlags flags = Qt::AutoColor);
bool save(const QString& fileName, const char* format = 0, int quality = -1) const;
bool save(QIODevice* device, const char* format = 0, int quality = -1) const;
bool load(const QString& fileName, const char *format = Q_NULLPTR, Qt::ImageConversionFlags flags = Qt::AutoColor);
bool loadFromData(const uchar *buf, uint len, const char* format = Q_NULLPTR, Qt::ImageConversionFlags flags = Qt::AutoColor);
inline bool loadFromData(const QByteArray &data, const char* format = Q_NULLPTR, Qt::ImageConversionFlags flags = Qt::AutoColor);
bool save(const QString& fileName, const char* format = Q_NULLPTR, int quality = -1) const;
bool save(QIODevice* device, const char* format = Q_NULLPTR, int quality = -1) const;
bool convertFromImage(const QImage &img, Qt::ImageConversionFlags flags = Qt::AutoColor);
inline QPixmap copy(int x, int y, int width, int height) const;
QPixmap copy(const QRect &rect = QRect()) const;
inline void scroll(int dx, int dy, int x, int y, int width, int height, QRegion *exposed = 0);
void scroll(int dx, int dy, const QRect &rect, QRegion *exposed = 0);
inline void scroll(int dx, int dy, int x, int y, int width, int height, QRegion *exposed = Q_NULLPTR);
void scroll(int dx, int dy, const QRect &rect, QRegion *exposed = Q_NULLPTR);
qint64 cacheKey() const;

2
src/gui/kernel/qdesktopwidget.h
View file

@ -67,7 +67,7 @@ public:
int screenCount() const;
int primaryScreen() const;
int screenNumber(const QWidget *widget = 0) const;
int screenNumber(const QWidget *widget = Q_NULLPTR) const;
int screenNumber(const QPoint &) const;
QWidget *screen(int screen = -1);

2
src/gui/kernel/qwidget.h
View file

@ -200,7 +200,7 @@ public:
};
Q_DECLARE_FLAGS(RenderFlags, RenderFlag)
explicit QWidget(QWidget* parent = 0, Qt::WindowFlags f = 0);
explicit QWidget(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = 0);
~QWidget();
int devType() const;

18
src/gui/kernel/qwidget_p.h
View file

@ -334,7 +334,7 @@ public:
void render(QPaintDevice *target, const QPoint &targetOffset, const QRegion &sourceRegion,
QWidget::RenderFlags renderFlags, bool readyToRender);
void drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QPoint &offset, int flags,
QPainter *sharedPainter = 0, QWidgetBackingStore *backingStore = 0);
QPainter *sharedPainter = Q_NULLPTR, QWidgetBackingStore *backingStore = Q_NULLPTR);
void paintSiblingsRecursive(QPaintDevice *pdev, const QObjectList& children, int index,
@ -357,7 +357,7 @@ public:
QRect clipRect() const;
QRegion clipRegion() const;
void subtractOpaqueChildren(QRegion &rgn, const QRect &clipRect) const;
void subtractOpaqueSiblings(QRegion &source, bool *hasDirtySiblingsAbove = 0,
void subtractOpaqueSiblings(QRegion &source, bool *hasDirtySiblingsAbove = Q_NULLPTR,
bool alsoNonOpaque = false) const;
void clipToEffectiveMask(QRegion &region) const;
void updateIsOpaque();
@ -411,7 +411,7 @@ public:
void _q_showIfNotHidden();
void setEnabled_helper(bool);
static void adjustFlags(Qt::WindowFlags &flags, QWidget *w = 0);
static void adjustFlags(Qt::WindowFlags &flags, QWidget *w = Q_NULLPTR);
void updateFrameStrut();
QRect frameStrut() const;
@ -446,7 +446,7 @@ public:
void getLayoutItemMargins(int *left, int *top, int *right, int *bottom) const;
void setLayoutItemMargins(int left, int top, int right, int bottom);
void setLayoutItemMargins(QStyle::SubElement element, const QStyleOption *opt = 0);
void setLayoutItemMargins(QStyle::SubElement element, const QStyleOption *opt = Q_NULLPTR);
// aboutToDestroy() is called just before the contents of
// QWidget::destroy() is executed. It's used to signal QWidget
@ -504,7 +504,7 @@ public:
}
inline void restoreRedirected()
{ redirectDev = 0; }
{ redirectDev = Q_NULLPTR; }
inline void enforceNativeChildren()
{
@ -721,7 +721,7 @@ public:
}
inline const QStyleOption *styleOption() const
{ return 0; }
{ return Q_NULLPTR; }
inline QRect deviceRect() const
{ return m_widget->window()->rect(); }
@ -751,14 +751,14 @@ inline QTLWExtra *QWidgetPrivate::topData() const
inline QTLWExtra *QWidgetPrivate::maybeTopData() const
{
return extra ? extra->topextra : 0;
return extra ? extra->topextra : Q_NULLPTR;
}
inline QPainter *QWidgetPrivate::sharedPainter() const
{
Q_Q(const QWidget);
QTLWExtra *x = q->window()->d_func()->maybeTopData();
return x ? x->sharedPainter : 0;
return x ? x->sharedPainter : Q_NULLPTR;
}
inline void QWidgetPrivate::setSharedPainter(QPainter *painter)
@ -779,7 +779,7 @@ inline QWidgetBackingStore *QWidgetPrivate::maybeBackingStore() const
{
Q_Q(const QWidget);
QTLWExtra *x = q->window()->d_func()->maybeTopData();
return x ? x->backingStore.data() : 0;
return x ? x->backingStore.data() : Q_NULLPTR;
}
QT_END_NAMESPACE

16
src/gui/painting/qcolor.h
View file

@ -98,10 +98,10 @@ public:
void setGreenF(qreal green);
void setBlueF(qreal blue);
void getRgb(int *r, int *g, int *b, int *a = 0) const;
void getRgb(int *r, int *g, int *b, int *a = Q_NULLPTR) const;
void setRgb(int r, int g, int b, int a = 255);
void getRgbF(qreal *r, qreal *g, qreal *b, qreal *a = 0) const;
void getRgbF(qreal *r, qreal *g, qreal *b, qreal *a = Q_NULLPTR) const;
void setRgbF(qreal r, qreal g, qreal b, qreal a = 1.0);
QRgb rgba() const;
@ -122,10 +122,10 @@ public:
qreal hsvSaturationF() const;
qreal valueF() const;
void getHsv(int *h, int *s, int *v, int *a = 0) const;
void getHsv(int *h, int *s, int *v, int *a = Q_NULLPTR) const;
void setHsv(int h, int s, int v, int a = 255);
void getHsvF(qreal *h, qreal *s, qreal *v, qreal *a = 0) const;
void getHsvF(qreal *h, qreal *s, qreal *v, qreal *a = Q_NULLPTR) const;
void setHsvF(qreal h, qreal s, qreal v, qreal a = 1.0);
int cyan() const;
@ -138,10 +138,10 @@ public:
qreal yellowF() const;
qreal blackF() const;
void getCmyk(int *c, int *m, int *y, int *k, int *a = 0);
void getCmyk(int *c, int *m, int *y, int *k, int *a = Q_NULLPTR);
void setCmyk(int c, int m, int y, int k, int a = 255);
void getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a = 0);
void getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a = Q_NULLPTR);
void setCmykF(qreal c, qreal m, qreal y, qreal k, qreal a = 1.0);
int hslHue() const; // 0 <= hue < 360
@ -152,10 +152,10 @@ public:
qreal hslSaturationF() const;
qreal lightnessF() const;
void getHsl(int *h, int *s, int *l, int *a = 0) const;
void getHsl(int *h, int *s, int *l, int *a = Q_NULLPTR) const;
void setHsl(int h, int s, int l, int a = 255);
void getHslF(qreal *h, qreal *s, qreal *l, qreal *a = 0) const;
void getHslF(qreal *h, qreal *s, qreal *l, qreal *a = Q_NULLPTR) const;
void setHslF(qreal h, qreal s, qreal l, qreal a = 1.0);
QColor toRgb() const;

20
src/gui/painting/qdrawutil.h
View file

@ -77,12 +77,12 @@ inline void qDrawShadeLine(QPainter *p, const QPoint &p1, const QPoint &p2,
Q_GUI_EXPORT void qDrawShadeRect(QPainter *p, int x, int y, int w, int h,
const QPalette &pal, bool sunken = false,
int lineWidth = 1, int midLineWidth = 0,
const QBrush *fill = 0);
const QBrush *fill = Q_NULLPTR);
inline void qDrawShadeRect(QPainter *p, const QRect &r,
const QPalette &pal, bool sunken = false,
int lineWidth = 1, int midLineWidth = 0,
const QBrush *fill = 0)
const QBrush *fill = Q_NULLPTR)
{
qDrawShadeRect(p, r.x(), r.y(), r.width(), r.height(), pal, sunken,
lineWidth, midLineWidth, fill);
@ -90,11 +90,11 @@ inline void qDrawShadeRect(QPainter *p, const QRect &r,
Q_GUI_EXPORT void qDrawShadePanel(QPainter *p, int x, int y, int w, int h,
const QPalette &pal, bool sunken = false,
int lineWidth = 1, const QBrush *fill = 0);
int lineWidth = 1, const QBrush *fill = Q_NULLPTR);
inline void qDrawShadePanel(QPainter *p, const QRect &r,
const QPalette &pal, bool sunken = false,
int lineWidth = 1, const QBrush *fill = 0)
int lineWidth = 1, const QBrush *fill = Q_NULLPTR)
{
qDrawShadePanel(p, r.x(), r.y(), r.width(), r.height(), pal, sunken,
lineWidth, fill);
@ -102,32 +102,32 @@ inline void qDrawShadePanel(QPainter *p, const QRect &r,
Q_GUI_EXPORT void qDrawWinButton(QPainter *p, int x, int y, int w, int h,
const QPalette &pal, bool sunken = false,
const QBrush *fill = 0);
const QBrush *fill = Q_NULLPTR);
inline void qDrawWinButton(QPainter *p, const QRect &r,
const QPalette &pal, bool sunken = false,
const QBrush *fill = 0)
const QBrush *fill = Q_NULLPTR)
{
qDrawWinButton(p, r.x(), r.y(), r.width(), r.height(), pal, sunken, fill);
}
Q_GUI_EXPORT void qDrawWinPanel(QPainter *p, int x, int y, int w, int h,
const QPalette &pal, bool sunken = false,
const QBrush *fill = 0);
const QBrush *fill = Q_NULLPTR);
inline void qDrawWinPanel(QPainter *p, const QRect &r,
const QPalette &pal, bool sunken = false,
const QBrush *fill = 0)
const QBrush *fill = Q_NULLPTR)
{
qDrawWinPanel(p, r.x(), r.y(), r.width(), r.height(), pal, sunken, fill);
}
Q_GUI_EXPORT void qDrawPlainRect(QPainter *p, int x, int y, int w, int h,
const QColor &c,
int lineWidth = 1, const QBrush *fill = 0);
int lineWidth = 1, const QBrush *fill = Q_NULLPTR);
inline void qDrawPlainRect(QPainter *p, const QRect &r, const QColor &c,
int lineWidth = 1, const QBrush *fill = 0)
int lineWidth = 1, const QBrush *fill = Q_NULLPTR)
{
qDrawPlainRect(p, r.x(), r.y(), r.width(), r.height(), c, lineWidth, fill);
}

8
src/gui/styles/qcdestyle.h
View file

@ -58,12 +58,12 @@ public:
explicit QCDEStyle(bool useHighlightCols = false);
virtual ~QCDEStyle();
int pixelMetric(PixelMetric metric, const QStyleOption *option = 0,
const QWidget *widget = 0) const;
int pixelMetric(PixelMetric metric, const QStyleOption *option = Q_NULLPTR,
const QWidget *widget = Q_NULLPTR) const;
void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p,
const QWidget *w = 0) const;
const QWidget *w = Q_NULLPTR) const;
void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p,
const QWidget *w = 0) const;
const QWidget *w = Q_NULLPTR) const;
QPalette standardPalette() const;
};

14
src/gui/styles/qcleanlooksstyle.h
View file

@ -64,26 +64,26 @@ public:
QPalette standardPalette () const;
void drawPrimitive(PrimitiveElement elem,
const QStyleOption *option,
QPainter *painter, const QWidget *widget = 0) const;
QPainter *painter, const QWidget *widget = Q_NULLPTR) const;
void drawControl(ControlElement ce, const QStyleOption *option, QPainter *painter,
const QWidget *widget) const;
int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const;
int pixelMetric(PixelMetric metric, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const;
void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option,
QPainter *painter, const QWidget *widget) const;
QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const;
QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = Q_NULLPTR) const;
QSize sizeFromContents(ContentsType type, const QStyleOption *option,
const QSize &size, const QWidget *widget) const;
SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt,
const QPoint &pt, const QWidget *w = 0) const;
const QPoint &pt, const QWidget *w = Q_NULLPTR) const;
QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
SubControl sc, const QWidget *widget) const;
QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
const QStyleOption *opt) const;
int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0,
QStyleHintReturn *returnData = 0) const;
int styleHint(StyleHint hint, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR,
QStyleHintReturn *returnData = Q_NULLPTR) const;
QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const;
QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt,
const QWidget *widget = 0) const;
const QWidget *widget = Q_NULLPTR) const;
void drawItemPixmap(QPainter *painter, const QRect &rect,
int alignment, const QPixmap &pixmap) const;
void drawItemText(QPainter *painter, const QRect &rect,

2
src/gui/styles/qcommonstyle.cpp
View file

@ -684,7 +684,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
#ifndef QT_NO_TOOLBUTTON
static void drawArrow(const QStyle *style, const QStyleOptionToolButton *toolbutton,
const QRect &rect, QPainter *painter, const QWidget *widget = 0)
const QRect &rect, QPainter *painter, const QWidget *widget = Q_NULLPTR)
{
QStyle::PrimitiveElement pe;
switch (toolbutton->arrowType) {

28
src/gui/styles/qcommonstyle.h
View file

@ -59,26 +59,26 @@ public:
~QCommonStyle();
void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p,
const QWidget *w = 0) const;
const QWidget *w = Q_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 = Q_NULLPTR) const;
QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = Q_NULLPTR) const;
void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p,
const QWidget *w = 0) const;
const QWidget *w = Q_NULLPTR) const;
SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt,
const QPoint &pt, const QWidget *w = 0) const;
const QPoint &pt, const QWidget *w = Q_NULLPTR) const;
QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc,
const QWidget *w = 0) const;
const QWidget *w = Q_NULLPTR) const;
QSize sizeFromContents(ContentsType ct, const QStyleOption *opt,
const QSize &contentsSize, const QWidget *widget = 0) const;
const QSize &contentsSize, const QWidget *widget = Q_NULLPTR) const;
int pixelMetric(PixelMetric m, const QStyleOption *opt = 0, const QWidget *widget = 0) const;
int pixelMetric(PixelMetric m, const QStyleOption *opt = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const;
int styleHint(StyleHint sh, const QStyleOption *opt = 0, const QWidget *w = 0,
QStyleHintReturn *shret = 0) const;
int styleHint(StyleHint sh, const QStyleOption *opt = Q_NULLPTR, const QWidget *w = Q_NULLPTR,
QStyleHintReturn *shret = Q_NULLPTR) const;
QPixmap standardPixmap(StandardPixmap sp, const QStyleOption *opt = 0,
const QWidget *widget = 0) const;
QPixmap standardPixmap(StandardPixmap sp, const QStyleOption *opt = Q_NULLPTR,
const QWidget *widget = Q_NULLPTR) const;
QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
const QStyleOption *opt) const;
@ -89,8 +89,8 @@ public:
void unpolish(QWidget *widget);
void unpolish(QApplication *application);
virtual QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0,
const QWidget *widget = 0) const;
virtual QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = Q_NULLPTR,
const QWidget *widget = Q_NULLPTR) const;
protected:
QCommonStyle(QCommonStylePrivate &dd);

8
src/gui/styles/qgtkstyle.h
View file

@ -77,8 +77,8 @@ public:
void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option,
QPainter *painter, const QWidget *widget) const;
int pixelMetric(PixelMetric metric, const QStyleOption *option = 0,
const QWidget *widget = 0) const;
int pixelMetric(PixelMetric metric, const QStyleOption *option = Q_NULLPTR,
const QWidget *widget = Q_NULLPTR) const;
int styleHint(StyleHint hint, const QStyleOption *option,
const QWidget *widget, QStyleHintReturn *returnData) const;
@ -98,11 +98,11 @@ public:
void unpolish(QWidget *widget);
void unpolish(QApplication *app);
static bool getGConfBool(const QString &key, bool fallback = 0);
static bool getGConfBool(const QString &key, bool fallback = false);
static QString getGConfString(const QString &key, const QString &fallback = QString());
QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option,
const QWidget *widget = 0) const;
const QWidget *widget = Q_NULLPTR) const;
};
#endif //!defined(QT_NO_STYLE_QGTK)

22
src/gui/styles/qmotifstyle.h
View file

@ -73,30 +73,30 @@ public:
void unpolish(QApplication*);
void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p,
const QWidget *w = 0) const;
const QWidget *w = Q_NULLPTR) const;
void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p,
const QWidget *w = 0) const;
const QWidget *w = Q_NULLPTR) const;
void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p,
const QWidget *w = 0) const;
const QWidget *w = Q_NULLPTR) const;
QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
SubControl sc, const QWidget *widget = 0) const;
SubControl sc, const QWidget *widget = Q_NULLPTR) const;
int pixelMetric(PixelMetric metric, const QStyleOption *option = 0,
const QWidget *widget = 0) const;
int pixelMetric(PixelMetric metric, const QStyleOption *option = Q_NULLPTR,
const QWidget *widget = Q_NULLPTR) const;
QSize sizeFromContents(ContentsType ct, const QStyleOption *opt,
const QSize &contentsSize, const QWidget *widget = 0) const;
const QSize &contentsSize, const QWidget *widget = Q_NULLPTR) const;
QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const;
QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = Q_NULLPTR) const;
QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt,
const QWidget *widget = 0) const;
const QWidget *widget = Q_NULLPTR) const;
int styleHint(StyleHint hint, const QStyleOption *opt = 0, const QWidget *widget = 0,
QStyleHintReturn *returnData = 0) const;
int styleHint(StyleHint hint, const QStyleOption *opt = Q_NULLPTR, const QWidget *widget = Q_NULLPTR,
QStyleHintReturn *returnData = Q_NULLPTR) const;
bool event(QEvent *);
QPalette standardPalette() const;

14
src/gui/styles/qplastiquestyle.h
View file

@ -61,7 +61,7 @@ public:
~QPlastiqueStyle();
void drawPrimitive(PrimitiveElement element, const QStyleOption *option,
QPainter *painter, const QWidget *widget = 0) const;
QPainter *painter, const QWidget *widget = Q_NULLPTR) const;
void drawControl(ControlElement element, const QStyleOption *option,
QPainter *painter, const QWidget *widget) const;
void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option,
@ -73,12 +73,12 @@ public:
QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
SubControl sc, const QWidget *widget) const;
int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0,
QStyleHintReturn *returnData = 0) const;
int styleHint(StyleHint hint, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR,
QStyleHintReturn *returnData = Q_NULLPTR) const;
SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option,
const QPoint &pos, const QWidget *widget = 0) const;
const QPoint &pos, const QWidget *widget = Q_NULLPTR) const;
int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const;
int pixelMetric(PixelMetric metric, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const;
void polish(QWidget *widget);
void unpolish(QWidget *widget);
@ -88,8 +88,8 @@ public:
int layoutSpacing(QSizePolicy::ControlType control1,
QSizePolicy::ControlType control2,
Qt::Orientation orientation,
const QStyleOption *option = 0,
const QWidget *widget = 0) const;
const QStyleOption *option = Q_NULLPTR,
const QWidget *widget = Q_NULLPTR) const;
protected:
bool eventFilter(QObject *watched, QEvent *event);

18
src/gui/styles/qproxystyle.h
View file

@ -57,15 +57,15 @@ class Q_GUI_EXPORT QProxyStyle : public QCommonStyle
Q_OBJECT
public:
QProxyStyle(QStyle *baseStyle = 0);
QProxyStyle(QStyle *baseStyle = Q_NULLPTR);
~QProxyStyle();
QStyle *baseStyle() const;
void setBaseStyle(QStyle *style);
void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = 0) const;
void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = 0) const;
void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget = 0) const;
void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = Q_NULLPTR) const;
void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = Q_NULLPTR) const;
void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget = Q_NULLPTR) const;
void drawItemText(QPainter *painter, const QRect &rect, int flags, const QPalette &pal, bool enabled,
const QString &text, QPalette::ColorRole textRole = QPalette::NoRole) const;
virtual void drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, const QPixmap &pixmap) const;
@ -77,11 +77,11 @@ public:
QRect itemTextRect(const QFontMetrics &fm, const QRect &r, int flags, bool enabled, const QString &text) const;
QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const;
SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option, const QPoint &pos, const QWidget *widget = 0) const;
int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0, QStyleHintReturn *returnData = 0) const;
int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const;
SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option, const QPoint &pos, const QWidget *widget = Q_NULLPTR) const;
int styleHint(StyleHint hint, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR, QStyleHintReturn *returnData = Q_NULLPTR) const;
int pixelMetric(PixelMetric metric, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const;
QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget = 0) const;
QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget = Q_NULLPTR) const;
QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const;
QPalette standardPalette() const;
@ -97,7 +97,7 @@ protected:
QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) 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 = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const;
private:
Q_DISABLE_COPY(QProxyStyle)
Q_DECLARE_PRIVATE(QProxyStyle)

34
src/gui/styles/qstyle.h
View file

@ -197,7 +197,7 @@ public:
};
virtual void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p,
const QWidget *w = 0) const = 0;
const QWidget *w = Q_NULLPTR) const = 0;
enum ControlElement {
CE_PushButton,
CE_PushButtonBevel,
@ -267,7 +267,7 @@ public:
};
virtual void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p,
const QWidget *w = 0) const = 0;
const QWidget *w = Q_NULLPTR) const = 0;
enum SubElement {
SE_PushButtonContents,
@ -349,7 +349,7 @@ public:
};
virtual QRect subElementRect(SubElement subElement, const QStyleOption *option,
const QWidget *widget = 0) const = 0;
const QWidget *widget = Q_NULLPTR) const = 0;
enum ComplexControl {
@ -426,11 +426,11 @@ public:
virtual void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p,
const QWidget *widget = 0) const = 0;
const QWidget *widget = Q_NULLPTR) const = 0;
virtual SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt,
const QPoint &pt, const QWidget *widget = 0) const = 0;
const QPoint &pt, const QWidget *widget = Q_NULLPTR) const = 0;
virtual QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
SubControl sc, const QWidget *widget = 0) const = 0;
SubControl sc, const QWidget *widget = Q_NULLPTR) const = 0;
enum PixelMetric {
PM_ButtonMargin,
@ -555,8 +555,8 @@ public:
PM_CustomBase = 0xf0000000
};
virtual int pixelMetric(PixelMetric metric, const QStyleOption *option = 0,
const QWidget *widget = 0) const = 0;
virtual int pixelMetric(PixelMetric metric, const QStyleOption *option = Q_NULLPTR,
const QWidget *widget = Q_NULLPTR) const = 0;
enum ContentsType {
CT_PushButton,
@ -587,7 +587,7 @@ public:
};
virtual QSize sizeFromContents(ContentsType ct, const QStyleOption *opt,
const QSize &contentsSize, const QWidget *w = 0) const = 0;
const QSize &contentsSize, const QWidget *w = Q_NULLPTR) const = 0;
enum RequestSoftwareInputPanel {
RSIP_OnMouseClickAndAlreadyFocused,
@ -699,8 +699,8 @@ public:
SH_CustomBase = 0xf0000000
};
virtual int styleHint(StyleHint stylehint, const QStyleOption *opt = 0,
const QWidget *widget = 0, QStyleHintReturn* returnData = 0) const = 0;
virtual int styleHint(StyleHint stylehint, const QStyleOption *opt = Q_NULLPTR,
const QWidget *widget = Q_NULLPTR, QStyleHintReturn* returnData = Q_NULLPTR) const = 0;
enum StandardPixmap {
SP_TitleBarMenuButton,
@ -776,11 +776,11 @@ public:
SP_CustomBase = 0xf0000000
};
virtual QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt = 0,
const QWidget *widget = 0) const = 0;
virtual QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt = Q_NULLPTR,
const QWidget *widget = Q_NULLPTR) const = 0;
virtual QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0,
const QWidget *widget = 0) const;
virtual QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = Q_NULLPTR,
const QWidget *widget = Q_NULLPTR) const;
virtual QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
const QStyleOption *opt) const = 0;
@ -799,10 +799,10 @@ public:
virtual int layoutSpacing(QSizePolicy::ControlType control1,
QSizePolicy::ControlType control2, Qt::Orientation orientation,
const QStyleOption *option = 0, const QWidget *widget = 0) const;
const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const;
int combinedLayoutSpacing(QSizePolicy::ControlTypes controls1,
QSizePolicy::ControlTypes controls2, Qt::Orientation orientation,
QStyleOption *option = 0, QWidget *widget = 0) const;
QStyleOption *option = Q_NULLPTR, QWidget *widget = Q_NULLPTR) const;
const QStyle * proxy() const;

2
src/gui/styles/qstylefactory.cpp
View file

@ -98,7 +98,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, stylesloader,
*/
QStyle *QStyleFactory::create(const QString& key)
{
QStyle *ret = 0;
QStyle *ret = Q_NULLPTR;
QString style = key.toLower();
#ifndef QT_NO_STYLE_WINDOWS
if (style == QLatin1String("windows"))

32
src/gui/styles/qstylesheetstyle_p.h
View file

@ -82,38 +82,38 @@ public:
~QStyleSheetStyle();
void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p,
const QWidget *w = 0) const;
const QWidget *w = Q_NULLPTR) const;
void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p,
const QWidget *w = 0) const;
const QWidget *w = Q_NULLPTR) const;
void drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, const QPixmap &pixmap) const;
void drawItemText(QPainter *painter, const QRect& rect, int alignment, const QPalette &pal,
bool enabled, const QString& text, QPalette::ColorRole textRole = QPalette::NoRole) const;
void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p,
const QWidget *w = 0) const;
const QWidget *w = Q_NULLPTR) const;
QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
const QStyleOption *option) const;
SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt,
const QPoint &pt, const QWidget *w = 0) const;
const QPoint &pt, const QWidget *w = Q_NULLPTR) const;
QRect itemPixmapRect(const QRect &rect, int alignment, const QPixmap &pixmap) const;
QRect itemTextRect(const QFontMetrics &metrics, const QRect &rect, int alignment, bool enabled,
const QString &text) const;
int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const;
int pixelMetric(PixelMetric metric, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const;
void polish(QWidget *widget);
void polish(QApplication *app);
void polish(QPalette &pal);
QSize sizeFromContents(ContentsType ct, const QStyleOption *opt,
const QSize &contentsSize, const QWidget *widget = 0) const;
const QSize &contentsSize, const QWidget *widget = Q_NULLPTR) const;
QPalette standardPalette() const;
QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *option = 0,
const QWidget *w = 0 ) const;
QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *option = Q_NULLPTR,
const QWidget *w = Q_NULLPTR ) const;
int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2,
Qt::Orientation orientation, const QStyleOption *option = 0,
const QWidget *widget = 0) const;
int styleHint(StyleHint sh, const QStyleOption *opt = 0, const QWidget *w = 0,
QStyleHintReturn *shret = 0) const;
QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const;
Qt::Orientation orientation, const QStyleOption *option = Q_NULLPTR,
const QWidget *widget = Q_NULLPTR) const;
int styleHint(StyleHint sh, const QStyleOption *opt = Q_NULLPTR, const QWidget *w = Q_NULLPTR,
QStyleHintReturn *shret = Q_NULLPTR) const;
QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = Q_NULLPTR) const;
QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc,
const QWidget *w = 0) const;
const QWidget *w = Q_NULLPTR) const;
// These functions are called from QApplication/QWidget. Be careful.
QStyle *baseStyle() const;
@ -133,8 +133,8 @@ public:
bool styleSheetPalette(const QWidget* w, const QStyleOption* opt, QPalette* pal);
QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0,
const QWidget *widget = 0) const;
QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = Q_NULLPTR,
const QWidget *widget = Q_NULLPTR) const;
protected:
bool event(QEvent *e);

18
src/gui/styles/qwindowsstyle.h
View file

@ -69,22 +69,22 @@ public:
void polish(QPalette &);
void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p,
const QWidget *w = 0) const;
const QWidget *w = Q_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 = Q_NULLPTR) const;
QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = Q_NULLPTR) const;
void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p,
const QWidget *w = 0) const;
const QWidget *w = Q_NULLPTR) const;
QSize sizeFromContents(ContentsType ct, const QStyleOption *opt,
const QSize &contentsSize, const QWidget *widget = 0) const;
const QSize &contentsSize, const QWidget *widget = Q_NULLPTR) const;
int pixelMetric(PixelMetric pm, const QStyleOption *option = 0, const QWidget *widget = 0) const;
int pixelMetric(PixelMetric pm, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const;
int styleHint(StyleHint hint, const QStyleOption *opt = 0, const QWidget *widget = 0,
QStyleHintReturn *returnData = 0) const;
int styleHint(StyleHint hint, const QStyleOption *opt = Q_NULLPTR, const QWidget *widget = Q_NULLPTR,
QStyleHintReturn *returnData = Q_NULLPTR) const;
QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt,
const QWidget *widget = 0) const;
const QWidget *widget = Q_NULLPTR) const;
protected:
bool eventFilter(QObject *o, QEvent *e);

4
src/gui/widgets/qabstractbutton.h
View file

@ -73,7 +73,7 @@ class Q_GUI_EXPORT QAbstractButton : public QWidget
Q_PROPERTY(bool down READ isDown WRITE setDown DESIGNABLE false)
public:
explicit QAbstractButton(QWidget* parent=0);
explicit QAbstractButton(QWidget* parent = Q_NULLPTR);
~QAbstractButton();
void setText(const QString &text);
@ -144,7 +144,7 @@ protected:
protected:
QAbstractButton(QAbstractButtonPrivate &dd, QWidget* parent = 0);
QAbstractButton(QAbstractButtonPrivate &dd, QWidget* parent = Q_NULLPTR);
private:
Q_DECLARE_PRIVATE(QAbstractButton)

2
src/gui/widgets/qabstractscrollarea.h
View file

@ -62,7 +62,7 @@ class Q_GUI_EXPORT QAbstractScrollArea : public QFrame
Q_PROPERTY(Qt::ScrollBarPolicy horizontalScrollBarPolicy READ horizontalScrollBarPolicy WRITE setHorizontalScrollBarPolicy)
public:
explicit QAbstractScrollArea(QWidget* parent=0);
explicit QAbstractScrollArea(QWidget* parent = Q_NULLPTR);
~QAbstractScrollArea();
Qt::ScrollBarPolicy verticalScrollBarPolicy() const;

4
src/gui/widgets/qframe.h
View file

@ -64,7 +64,7 @@ class Q_GUI_EXPORT QFrame : public QWidget
Q_PROPERTY(QRect frameRect READ frameRect WRITE setFrameRect DESIGNABLE false)
public:
explicit QFrame(QWidget* parent = 0, Qt::WindowFlags f = 0);
explicit QFrame(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = 0);
~QFrame();
int frameStyle() const;
@ -117,7 +117,7 @@ protected:
protected:
QFrame(QFramePrivate &dd, QWidget* parent = 0, Qt::WindowFlags f = 0);
QFrame(QFramePrivate &dd, QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = 0);
private:
Q_DISABLE_COPY(QFrame)

4
src/gui/widgets/qgroupbox.h
View file

@ -63,8 +63,8 @@ class Q_GUI_EXPORT QGroupBox : public QWidget
Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable)
Q_PROPERTY(bool checked READ isChecked WRITE setChecked DESIGNABLE isCheckable NOTIFY toggled USER true)
public:
explicit QGroupBox(QWidget* parent=0);
explicit QGroupBox(const QString &title, QWidget* parent=0);
explicit QGroupBox(QWidget* parent = Q_NULLPTR);
explicit QGroupBox(const QString &title, QWidget* parent = Q_NULLPTR);
~QGroupBox();
QString title() const;

4
src/gui/widgets/qlcdnumber.h
View file

@ -65,8 +65,8 @@ class Q_GUI_EXPORT QLCDNumber : public QFrame // LCD number widget
Q_PROPERTY(int intValue READ intValue WRITE display)
public:
explicit QLCDNumber(QWidget* parent = 0);
explicit QLCDNumber(uint numDigits, QWidget* parent = 0);
explicit QLCDNumber(QWidget* parent = Q_NULLPTR);
explicit QLCDNumber(uint numDigits, QWidget* parent = Q_NULLPTR);
~QLCDNumber();
enum Mode {

4
src/gui/widgets/qlineedit.h
View file

@ -87,8 +87,8 @@ class Q_GUI_EXPORT QLineEdit : public QWidget
Q_PROPERTY(Qt::CursorMoveStyle cursorMoveStyle READ cursorMoveStyle WRITE setCursorMoveStyle)
public:
explicit QLineEdit(QWidget* parent=0);
explicit QLineEdit(const QString &, QWidget* parent=0);
explicit QLineEdit(QWidget* parent = Q_NULLPTR);
explicit QLineEdit(const QString &, QWidget* parent = Q_NULLPTR);
~QLineEdit();
QString text() const;

12
src/gui/widgets/qmenu.h
View file

@ -80,8 +80,8 @@ public:
#endif
QAction *addAction(const QString &text);
QAction *addAction(const QIcon &icon, const QString &text);
QAction *addAction(const QString &text, const QObject *receiver, const char* member, const QKeySequence &shortcut = 0);
QAction *addAction(const QIcon &icon, const QString &text, const QObject *receiver, const char* member, const QKeySequence &shortcut = 0);
QAction *addAction(const QString &text, const QObject *receiver, const char* member, const QKeySequence &shortcut = QKeySequence());
QAction *addAction(const QIcon &icon, const QString &text, const QObject *receiver, const char* member, const QKeySequence &shortcut = QKeySequence());
QAction *addMenu(QMenu *menu);
QMenu *addMenu(const QString &title);
@ -107,12 +107,12 @@ public:
void setActiveAction(QAction *act);
QAction *activeAction() const;
void popup(const QPoint &pos, QAction *at=0);
void popup(const QPoint &pos, QAction *at = Q_NULLPTR);
QAction *exec();
QAction *exec(const QPoint &pos, QAction *at=0);
QAction *exec(const QPoint &pos, QAction *at = Q_NULLPTR);
static QAction *exec(QList<QAction*> actions, const QPoint &pos,
QAction *at = 0, QWidget *parent = Q_NULLPTR);
QAction *at = Q_NULLPTR, QWidget *parent = Q_NULLPTR);
QSize sizeHint() const;
@ -168,7 +168,7 @@ private:
protected:
QMenu(QMenuPrivate &dd, QWidget* parent = 0);
QMenu(QMenuPrivate &dd, QWidget* parent = Q_NULLPTR);
private:
Q_DISABLE_COPY(QMenu)

2
src/gui/widgets/qprintpreviewwidget.cpp
View file

@ -149,7 +149,7 @@ class GraphicsView : public QGraphicsView
{
Q_OBJECT
public:
GraphicsView(QWidget* parent = 0)
GraphicsView(QWidget* parent = Q_NULLPTR)
: QGraphicsView(parent)
{
#ifdef Q_WS_MAC

8
src/gui/widgets/qpushbutton.h
View file

@ -62,9 +62,9 @@ class Q_GUI_EXPORT QPushButton : public QAbstractButton
Q_PROPERTY(bool flat READ isFlat WRITE setFlat)
public:
explicit QPushButton(QWidget *parent=0);
explicit QPushButton(const QString &text, QWidget *parent=0);
QPushButton(const QIcon& icon, const QString &text, QWidget *parent=0);
explicit QPushButton(QWidget *parent = Q_NULLPTR);
explicit QPushButton(const QString &text, QWidget *parent = Q_NULLPTR);
QPushButton(const QIcon& icon, const QString &text, QWidget *parent = Q_NULLPTR);
~QPushButton();
QSize sizeHint() const;
@ -95,7 +95,7 @@ protected:
void focusInEvent(QFocusEvent *);
void focusOutEvent(QFocusEvent *);
void initStyleOption(QStyleOptionButton *option) const;
QPushButton(QPushButtonPrivate &dd, QWidget* parent = 0);
QPushButton(QPushButtonPrivate &dd, QWidget* parent = Q_NULLPTR);
public:

2
src/gui/widgets/qscrollarea.h
View file

@ -60,7 +60,7 @@ class Q_GUI_EXPORT QScrollArea : public QAbstractScrollArea
Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
public:
explicit QScrollArea(QWidget* parent=0);
explicit QScrollArea(QWidget* parent = Q_NULLPTR);
~QScrollArea();
QWidget *widget() const;

4
src/gui/widgets/qsplitter.h
View file

@ -68,8 +68,8 @@ class Q_GUI_EXPORT QSplitter : public QFrame
Q_PROPERTY(bool childrenCollapsible READ childrenCollapsible WRITE setChildrenCollapsible)
public:
explicit QSplitter(QWidget* parent = 0);
explicit QSplitter(Qt::Orientation, QWidget* parent = 0);
explicit QSplitter(QWidget* parent = Q_NULLPTR);
explicit QSplitter(Qt::Orientation, QWidget* parent = Q_NULLPTR);
~QSplitter();
void addWidget(QWidget *widget);

2
src/gui/widgets/qstatusbar.h
View file

@ -60,7 +60,7 @@ class Q_GUI_EXPORT QStatusBar: public QWidget
Q_PROPERTY(bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled)
public:
explicit QStatusBar(QWidget* parent=0);
explicit QStatusBar(QWidget* parent = Q_NULLPTR);
virtual ~QStatusBar();
void addWidget(QWidget *widget, int stretch = 0);

2
src/gui/widgets/qtabbar.h
View file

@ -74,7 +74,7 @@ class Q_GUI_EXPORT QTabBar: public QWidget
Q_PROPERTY(bool documentMode READ documentMode WRITE setDocumentMode)
public:
explicit QTabBar(QWidget* parent=0);
explicit QTabBar(QWidget* parent = Q_NULLPTR);
~QTabBar();
enum Shape { RoundedNorth, RoundedSouth, RoundedWest, RoundedEast,

2
src/gui/widgets/qtextbrowser.h
View file

@ -67,7 +67,7 @@ class Q_GUI_EXPORT QTextBrowser : public QTextEdit
Q_PROPERTY(bool openLinks READ openLinks WRITE setOpenLinks)
public:
explicit QTextBrowser(QWidget* parent = 0);
explicit QTextBrowser(QWidget* parent = Q_NULLPTR);
virtual ~QTextBrowser();
QUrl source() const;

2
src/gui/widgets/qtoolbutton.h
View file

@ -73,7 +73,7 @@ public:
InstantPopup
};
explicit QToolButton(QWidget * parent=0);
explicit QToolButton(QWidget *parent = Q_NULLPTR);
~QToolButton();
QSize sizeHint() const;

2
src/gui/widgets/qworkspace.cpp
View file

@ -862,7 +862,7 @@ class QWorkspaceChild : public QWidget
friend class QWorkspaceTitleBar;
public:
QWorkspaceChild(QWidget* window, QWorkspace* parent=0, Qt::WindowFlags flags = 0);
QWorkspaceChild(QWidget* window, QWorkspace* parent = Q_NULLPTR, Qt::WindowFlags flags = 0);
~QWorkspaceChild();
void setActive(bool);

2
src/gui/widgets/qworkspace.h
View file

@ -63,7 +63,7 @@ class Q_GUI_EXPORT QWorkspace : public QWidget
Q_PROPERTY(QBrush background READ background WRITE setBackground)
public:
explicit QWorkspace(QWidget* parent=0);
explicit QWorkspace(QWidget *parent = Q_NULLPTR);
~QWorkspace();
enum WindowOrder { CreationOrder, StackingOrder };

7
src/scripttools/debugging/qscriptdebugoutputwidget.cpp
View file

@ -49,8 +49,6 @@
QT_BEGIN_NAMESPACE
namespace {
class QScriptDebugOutputWidgetOutputEdit : public QPlainTextEdit
{
public:
@ -75,8 +73,6 @@ public:
}
};
} // namespace
class QScriptDebugOutputWidgetPrivate
: public QScriptDebugOutputWidgetInterfacePrivate
{
@ -157,4 +153,5 @@ void QScriptDebugOutputWidget::clear()
}
QT_END_NAMESPACE
#include <moc_qscriptdebugoutputwidget_p.h>
#include "moc_qscriptdebugoutputwidget_p.h"

4
src/tools/uic/driver.h
View file

@ -68,8 +68,8 @@ public:
// tools
bool printDependencies(const QString &fileName);
bool uic(const QString &fileName, QTextStream *output = 0);
bool uic(const QString &fileName, DomUI *ui, QTextStream *output = 0);
bool uic(const QString &fileName, QTextStream *output = Q_NULLPTR);
bool uic(const QString &fileName, DomUI *ui, QTextStream *output = Q_NULLPTR);
// configuration
inline QTextStream &output() const { return *m_output; }