0 to Q_NULLPTR

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

View file

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

View file

@ -55,7 +55,7 @@
#ifndef CRASH #ifndef CRASH
#define CRASH() do { \ #define CRASH() do { \
*(int *)(uintptr_t)0xbbadbeef = 0; \ *(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) } while(false)
#endif #endif

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -200,7 +200,7 @@ public:
}; };
Q_DECLARE_FLAGS(RenderFlags, RenderFlag) 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(); ~QWidget();
int devType() const; int devType() const;

View file

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

View file

@ -98,10 +98,10 @@ public:
void setGreenF(qreal green); void setGreenF(qreal green);
void setBlueF(qreal blue); 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 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); void setRgbF(qreal r, qreal g, qreal b, qreal a = 1.0);
QRgb rgba() const; QRgb rgba() const;
@ -122,10 +122,10 @@ public:
qreal hsvSaturationF() const; qreal hsvSaturationF() const;
qreal valueF() 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 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); void setHsvF(qreal h, qreal s, qreal v, qreal a = 1.0);
int cyan() const; int cyan() const;
@ -138,10 +138,10 @@ public:
qreal yellowF() const; qreal yellowF() const;
qreal blackF() 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 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); void setCmykF(qreal c, qreal m, qreal y, qreal k, qreal a = 1.0);
int hslHue() const; // 0 <= hue < 360 int hslHue() const; // 0 <= hue < 360
@ -152,10 +152,10 @@ public:
qreal hslSaturationF() const; qreal hslSaturationF() const;
qreal lightnessF() 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 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); void setHslF(qreal h, qreal s, qreal l, qreal a = 1.0);
QColor toRgb() const; QColor toRgb() const;

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, Q_GUI_EXPORT void qDrawShadeRect(QPainter *p, int x, int y, int w, int h,
const QPalette &pal, bool sunken = false, const QPalette &pal, bool sunken = false,
int lineWidth = 1, int midLineWidth = 0, int lineWidth = 1, int midLineWidth = 0,
const QBrush *fill = 0); const QBrush *fill = Q_NULLPTR);
inline void qDrawShadeRect(QPainter *p, const QRect &r, inline void qDrawShadeRect(QPainter *p, const QRect &r,
const QPalette &pal, bool sunken = false, const QPalette &pal, bool sunken = false,
int lineWidth = 1, int midLineWidth = 0, 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, qDrawShadeRect(p, r.x(), r.y(), r.width(), r.height(), pal, sunken,
lineWidth, midLineWidth, fill); 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, Q_GUI_EXPORT void qDrawShadePanel(QPainter *p, int x, int y, int w, int h,
const QPalette &pal, bool sunken = false, 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, inline void qDrawShadePanel(QPainter *p, const QRect &r,
const QPalette &pal, bool sunken = false, 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, qDrawShadePanel(p, r.x(), r.y(), r.width(), r.height(), pal, sunken,
lineWidth, fill); 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, Q_GUI_EXPORT void qDrawWinButton(QPainter *p, int x, int y, int w, int h,
const QPalette &pal, bool sunken = false, const QPalette &pal, bool sunken = false,
const QBrush *fill = 0); const QBrush *fill = Q_NULLPTR);
inline void qDrawWinButton(QPainter *p, const QRect &r, inline void qDrawWinButton(QPainter *p, const QRect &r,
const QPalette &pal, bool sunken = false, 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); 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, Q_GUI_EXPORT void qDrawWinPanel(QPainter *p, int x, int y, int w, int h,
const QPalette &pal, bool sunken = false, const QPalette &pal, bool sunken = false,
const QBrush *fill = 0); const QBrush *fill = Q_NULLPTR);
inline void qDrawWinPanel(QPainter *p, const QRect &r, inline void qDrawWinPanel(QPainter *p, const QRect &r,
const QPalette &pal, bool sunken = false, 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); 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, Q_GUI_EXPORT void qDrawPlainRect(QPainter *p, int x, int y, int w, int h,
const QColor &c, 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, 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); qDrawPlainRect(p, r.x(), r.y(), r.width(), r.height(), c, lineWidth, fill);
} }

View file

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

View file

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

View file

@ -684,7 +684,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
#ifndef QT_NO_TOOLBUTTON #ifndef QT_NO_TOOLBUTTON
static void drawArrow(const QStyle *style, const QStyleOptionToolButton *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; QStyle::PrimitiveElement pe;
switch (toolbutton->arrowType) { switch (toolbutton->arrowType) {

View file

@ -59,26 +59,26 @@ public:
~QCommonStyle(); ~QCommonStyle();
void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, 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, void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p,
const QWidget *w = 0) const; const QWidget *w = 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;
void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, 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, 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, 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, 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, int styleHint(StyleHint sh, const QStyleOption *opt = Q_NULLPTR, const QWidget *w = Q_NULLPTR,
QStyleHintReturn *shret = 0) const; QStyleHintReturn *shret = Q_NULLPTR) const;
QPixmap standardPixmap(StandardPixmap sp, const QStyleOption *opt = 0, QPixmap standardPixmap(StandardPixmap sp, const QStyleOption *opt = Q_NULLPTR,
const QWidget *widget = 0) const; const QWidget *widget = Q_NULLPTR) const;
QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
const QStyleOption *opt) const; const QStyleOption *opt) const;
@ -89,8 +89,8 @@ public:
void unpolish(QWidget *widget); void unpolish(QWidget *widget);
void unpolish(QApplication *application); void unpolish(QApplication *application);
virtual QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0, virtual QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = Q_NULLPTR,
const QWidget *widget = 0) const; const QWidget *widget = Q_NULLPTR) const;
protected: protected:
QCommonStyle(QCommonStylePrivate &dd); QCommonStyle(QCommonStylePrivate &dd);

View file

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

View file

@ -73,30 +73,30 @@ public:
void unpolish(QApplication*); void unpolish(QApplication*);
void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, 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, 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, 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, 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, int pixelMetric(PixelMetric metric, const QStyleOption *option = Q_NULLPTR,
const QWidget *widget = 0) const; const QWidget *widget = Q_NULLPTR) const;
QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, 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, 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, int styleHint(StyleHint hint, const QStyleOption *opt = Q_NULLPTR, const QWidget *widget = Q_NULLPTR,
QStyleHintReturn *returnData = 0) const; QStyleHintReturn *returnData = Q_NULLPTR) const;
bool event(QEvent *); bool event(QEvent *);
QPalette standardPalette() const; QPalette standardPalette() const;

View file

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

View file

@ -57,15 +57,15 @@ class Q_GUI_EXPORT QProxyStyle : public QCommonStyle
Q_OBJECT Q_OBJECT
public: public:
QProxyStyle(QStyle *baseStyle = 0); QProxyStyle(QStyle *baseStyle = Q_NULLPTR);
~QProxyStyle(); ~QProxyStyle();
QStyle *baseStyle() const; QStyle *baseStyle() const;
void setBaseStyle(QStyle *style); void setBaseStyle(QStyle *style);
void drawPrimitive(PrimitiveElement element, const QStyleOption *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 = 0) 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 = 0) 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, void drawItemText(QPainter *painter, const QRect &rect, int flags, const QPalette &pal, bool enabled,
const QString &text, QPalette::ColorRole textRole = QPalette::NoRole) const; const QString &text, QPalette::ColorRole textRole = QPalette::NoRole) const;
virtual void drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, const QPixmap &pixmap) 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 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; 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; SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option, const QPoint &pos, const QWidget *widget = Q_NULLPTR) 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;
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;
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; QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const;
QPalette standardPalette() const; QPalette standardPalette() const;
@ -97,7 +97,7 @@ protected:
QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const; QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const;
int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, 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: private:
Q_DISABLE_COPY(QProxyStyle) Q_DISABLE_COPY(QProxyStyle)
Q_DECLARE_PRIVATE(QProxyStyle) Q_DECLARE_PRIVATE(QProxyStyle)

View file

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

View file

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

View file

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

View file

@ -69,22 +69,22 @@ public:
void polish(QPalette &); void polish(QPalette &);
void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, 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, void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p,
const QWidget *w = 0) const; const QWidget *w = 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;
void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, 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, 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, int styleHint(StyleHint hint, const QStyleOption *opt = Q_NULLPTR, const QWidget *widget = Q_NULLPTR,
QStyleHintReturn *returnData = 0) const; QStyleHintReturn *returnData = Q_NULLPTR) const;
QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt,
const QWidget *widget = 0) const; const QWidget *widget = Q_NULLPTR) const;
protected: protected:
bool eventFilter(QObject *o, QEvent *e); bool eventFilter(QObject *o, QEvent *e);

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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