Deprecate constructing QFlags from a pointer

This was used to support QFlags f = 0 initialization, but with 0 used
as a pointer literal now considered bad form, it had been changed many
places to QFlags f = nullptr, which is meaningless and confusing.

Change-Id: I4bc592151c255dc5cab1a232615caecc520f02e8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Allan Sandfeld Jensen 2019-11-18 17:01:26 +01:00
parent 8bc4ea1e97
commit af2daafde7
141 changed files with 249 additions and 237 deletions

View File

@ -320,7 +320,7 @@ QGroupBox* MainWindow::createAlbumGroupBox()
this, &MainWindow::showAlbumDetails); this, &MainWindow::showAlbumDetails);
QVBoxLayout *layout = new QVBoxLayout; QVBoxLayout *layout = new QVBoxLayout;
layout->addWidget(albumView, 0, 0); layout->addWidget(albumView, 0, { });
box->setLayout(layout); box->setLayout(layout);
return box; return box;

View File

@ -492,7 +492,7 @@ void Dialog::questionMessage()
void Dialog::warningMessage() void Dialog::warningMessage()
{ {
QMessageBox msgBox(QMessageBox::Warning, tr("QMessageBox::warning()"), QMessageBox msgBox(QMessageBox::Warning, tr("QMessageBox::warning()"),
MESSAGE, nullptr, this); MESSAGE, { }, this);
msgBox.setDetailedText(MESSAGE_DETAILS); msgBox.setDetailedText(MESSAGE_DETAILS);
msgBox.addButton(tr("Save &Again"), QMessageBox::AcceptRole); msgBox.addButton(tr("Save &Again"), QMessageBox::AcceptRole);
msgBox.addButton(tr("&Continue"), QMessageBox::RejectRole); msgBox.addButton(tr("&Continue"), QMessageBox::RejectRole);

View File

@ -59,7 +59,7 @@ class CustomProxy : public QGraphicsProxyWidget
Q_OBJECT Q_OBJECT
public: public:
explicit CustomProxy(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = nullptr); explicit CustomProxy(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = { });
QRectF boundingRect() const override; QRectF boundingRect() const override;
void paintWindowFrame(QPainter *painter, const QStyleOptionGraphicsItem *option, void paintWindowFrame(QPainter *painter, const QStyleOptionGraphicsItem *option,

View File

@ -123,7 +123,7 @@ QLayoutItem *FlowLayout::takeAt(int index)
//! [6] //! [6]
Qt::Orientations FlowLayout::expandingDirections() const Qt::Orientations FlowLayout::expandingDirections() const
{ {
return 0; return { };
} }
//! [6] //! [6]

View File

@ -62,7 +62,7 @@ class ColorSwatch : public QDockWidget
Q_OBJECT Q_OBJECT
public: public:
explicit ColorSwatch(const QString &colorName, QMainWindow *parent = nullptr, Qt::WindowFlags flags = 0); explicit ColorSwatch(const QString &colorName, QMainWindow *parent = nullptr, Qt::WindowFlags flags = { });
void setCustomSizeHint(const QSize &size); void setCustomSizeHint(const QSize &size);
QMenu *colorSwatchMenu() const { return menu; } QMenu *colorSwatchMenu() const { return menu; }

View File

@ -65,7 +65,7 @@ public:
explicit MainWindow(const CustomSizeHintMap &customSizeHints, explicit MainWindow(const CustomSizeHintMap &customSizeHints,
QWidget *parent = nullptr, QWidget *parent = nullptr,
Qt::WindowFlags flags = 0); Qt::WindowFlags flags = { });
public slots: public slots:
void actionTriggered(QAction *action); void actionTriggered(QAction *action);

View File

@ -50,6 +50,7 @@
//! [0] //! [0]
label->setAlignment(Qt::AlignLeft | Qt::AlignTop); label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
label->setAlignment({ });
//! [0] //! [0]

View File

@ -93,8 +93,10 @@ class QFlags
"long long will overflow."); "long long will overflow.");
Q_STATIC_ASSERT_X((std::is_enum<Enum>::value), "QFlags is only usable on enumeration types."); Q_STATIC_ASSERT_X((std::is_enum<Enum>::value), "QFlags is only usable on enumeration types.");
#if QT_DEPRECATED_SINCE(5,15)
struct Private; struct Private;
typedef int (Private::*Zero); typedef int (Private::*Zero);
#endif
template <typename E> friend QDataStream &operator>>(QDataStream &, QFlags<E> &); template <typename E> friend QDataStream &operator>>(QDataStream &, QFlags<E> &);
template <typename E> friend QDataStream &operator<<(QDataStream &, QFlags<E>); template <typename E> friend QDataStream &operator<<(QDataStream &, QFlags<E>);
public: public:
@ -115,8 +117,11 @@ public:
Q_DECL_CONSTEXPR inline QFlags(const QFlags &other); Q_DECL_CONSTEXPR inline QFlags(const QFlags &other);
Q_DECL_CONSTEXPR inline QFlags &operator=(const QFlags &other); Q_DECL_CONSTEXPR inline QFlags &operator=(const QFlags &other);
#endif #endif
Q_DECL_CONSTEXPR inline QFlags() noexcept : i(0) {}
Q_DECL_CONSTEXPR inline QFlags(Enum flags) noexcept : i(Int(flags)) {} Q_DECL_CONSTEXPR inline QFlags(Enum flags) noexcept : i(Int(flags)) {}
Q_DECL_CONSTEXPR inline QFlags(Zero = nullptr) noexcept : i(0) {} #if QT_DEPRECATED_SINCE(5,15)
QT_DEPRECATED_X("Use default constructor instead") Q_DECL_CONSTEXPR inline QFlags(Zero) noexcept : i(0) {}
#endif
Q_DECL_CONSTEXPR inline QFlags(QFlag flag) noexcept : i(flag) {} Q_DECL_CONSTEXPR inline QFlags(QFlag flag) noexcept : i(flag) {}
Q_DECL_CONSTEXPR inline QFlags(std::initializer_list<Enum> flags) noexcept Q_DECL_CONSTEXPR inline QFlags(std::initializer_list<Enum> flags) noexcept

View File

@ -250,7 +250,7 @@ Q_STATIC_ASSERT((std::is_same<qsizetype, qptrdiff>::value));
Qt::Alignment type is simply a typedef for Qt::Alignment type is simply a typedef for
QFlags<Qt::AlignmentFlag>. QLabel::setAlignment() takes a QFlags<Qt::AlignmentFlag>. QLabel::setAlignment() takes a
Qt::Alignment parameter, which means that any combination of Qt::Alignment parameter, which means that any combination of
Qt::AlignmentFlag values, or 0, is legal: Qt::AlignmentFlag values, or \c{{ }}, is legal:
\snippet code/src_corelib_global_qglobal.cpp 0 \snippet code/src_corelib_global_qglobal.cpp 0
@ -317,11 +317,21 @@ Q_STATIC_ASSERT((std::is_same<qsizetype, qptrdiff>::value));
Constructs a QFlags object storing the \a flags. Constructs a QFlags object storing the \a flags.
*/ */
/*!
\fn template <typename Enum> QFlags<Enum>::QFlags()
\since 5.15
Constructs a QFlags object with no flags set.
*/
/*! /*!
\fn template <typename Enum> QFlags<Enum>::QFlags(Zero) \fn template <typename Enum> QFlags<Enum>::QFlags(Zero)
\deprecated
Constructs a QFlags object with no flags set. The parameter must be a Constructs a QFlags object with no flags set. The parameter must be a
literal 0 value. literal 0 value.
Deprecated, use default constructor instead.
*/ */
/*! /*!

View File

@ -658,7 +658,7 @@ QStringList QAbstractFileEngine::entryList(QDir::Filters filters, const QStringL
QAbstractFileEngine::FileFlags QAbstractFileEngine::fileFlags(FileFlags type) const QAbstractFileEngine::FileFlags QAbstractFileEngine::fileFlags(FileFlags type) const
{ {
Q_UNUSED(type); Q_UNUSED(type);
return nullptr; return {};
} }
/*! /*!

View File

@ -134,7 +134,7 @@ uint QFileInfoPrivate::getFileFlags(QAbstractFileEngine::FileFlags request) cons
// extra syscall. Bundle detecton on Mac can be slow, expecially on network // extra syscall. Bundle detecton on Mac can be slow, expecially on network
// paths, so we separate out that as well. // paths, so we separate out that as well.
QAbstractFileEngine::FileFlags req = nullptr; QAbstractFileEngine::FileFlags req;
uint cachedFlags = 0; uint cachedFlags = 0;
if (request & (QAbstractFileEngine::FlagsMask | QAbstractFileEngine::TypesMask)) { if (request & (QAbstractFileEngine::FlagsMask | QAbstractFileEngine::TypesMask)) {

View File

@ -76,8 +76,7 @@ class Q_AUTOTEST_EXPORT QFileSystemMetaData
{ {
public: public:
QFileSystemMetaData() QFileSystemMetaData()
: knownFlagsMask(nullptr), : size_(-1)
size_(-1)
{ {
} }
@ -186,7 +185,7 @@ public:
void clear() void clear()
{ {
knownFlagsMask = nullptr; knownFlagsMask = {};
} }
void clearFlags(MetaDataFlags flags = AllMetaDataFlags) void clearFlags(MetaDataFlags flags = AllMetaDataFlags)

View File

@ -591,14 +591,14 @@ QAbstractFileEngine::FileFlags QFSFileEngine::fileFlags(QAbstractFileEngine::Fil
if (type & Refresh) if (type & Refresh)
d->metaData.clear(); d->metaData.clear();
QAbstractFileEngine::FileFlags ret = 0; QAbstractFileEngine::FileFlags ret;
if (type & FlagsMask) if (type & FlagsMask)
ret |= LocalDiskFlag; ret |= LocalDiskFlag;
bool exists; bool exists;
{ {
QFileSystemMetaData::MetaDataFlags queryFlags = 0; QFileSystemMetaData::MetaDataFlags queryFlags;
queryFlags |= QFileSystemMetaData::MetaDataFlags(uint(type)) queryFlags |= QFileSystemMetaData::MetaDataFlags(uint(type))
& QFileSystemMetaData::Permissions; & QFileSystemMetaData::Permissions;

View File

@ -1492,7 +1492,7 @@ bool QResourceFileEngine::isSequential() const
QAbstractFileEngine::FileFlags QResourceFileEngine::fileFlags(QAbstractFileEngine::FileFlags type) const QAbstractFileEngine::FileFlags QResourceFileEngine::fileFlags(QAbstractFileEngine::FileFlags type) const
{ {
Q_D(const QResourceFileEngine); Q_D(const QResourceFileEngine);
QAbstractFileEngine::FileFlags ret = 0; QAbstractFileEngine::FileFlags ret;
if(!d->resource.isValid()) if(!d->resource.isValid())
return ret; return ret;

View File

@ -823,7 +823,7 @@ recodeFromUser(const QString &input, const ushort *actions, int from, int to)
QString output; QString output;
const QChar *begin = input.constData() + from; const QChar *begin = input.constData() + from;
const QChar *end = input.constData() + to; const QChar *end = input.constData() + to;
if (qt_urlRecode(output, begin, end, nullptr, actions)) if (qt_urlRecode(output, begin, end, {}, actions))
return output; return output;
return input.mid(from, to - from); return input.mid(from, to - from);

View File

@ -432,7 +432,7 @@ Qt::ItemFlags QPersistentModelIndex::flags() const
{ {
if (d) if (d)
return d->index.flags(); return d->index.flags();
return 0; return { };
} }
/*! /*!
@ -2296,7 +2296,7 @@ Qt::ItemFlags QAbstractItemModel::flags(const QModelIndex &index) const
{ {
Q_D(const QAbstractItemModel); Q_D(const QAbstractItemModel);
if (!d->indexValid(index)) if (!d->indexValid(index))
return 0; return { };
return Qt::ItemIsSelectable|Qt::ItemIsEnabled; return Qt::ItemIsSelectable|Qt::ItemIsEnabled;
} }

View File

@ -96,7 +96,7 @@ public:
void setLoadHints(QLibrary::LoadHints lh); void setLoadHints(QLibrary::LoadHints lh);
static QLibraryPrivate *findOrCreate(const QString &fileName, const QString &version = QString(), static QLibraryPrivate *findOrCreate(const QString &fileName, const QString &version = QString(),
QLibrary::LoadHints loadHints = nullptr); QLibrary::LoadHints loadHints = { });
static QStringList suffixes_sys(const QString &fullVersion); static QStringList suffixes_sys(const QString &fullVersion);
static QStringList prefixes_sys(); static QStringList prefixes_sys();

View File

@ -912,7 +912,7 @@ QRegularExpression::QRegularExpression(QRegularExpressionPrivate &dd)
*/ */
QRegularExpressionPrivate::QRegularExpressionPrivate() QRegularExpressionPrivate::QRegularExpressionPrivate()
: QSharedData(), : QSharedData(),
patternOptions(0), patternOptions(),
pattern(), pattern(),
mutex(), mutex(),
compiledPattern(nullptr), compiledPattern(nullptr),

View File

@ -71,7 +71,7 @@ static void init(QTextBoundaryFinder::BoundaryType type, const QChar *chars, int
} }
} }
QUnicodeTools::CharAttributeOptions options = 0; QUnicodeTools::CharAttributeOptions options;
switch (type) { switch (type) {
case QTextBoundaryFinder::Grapheme: options |= QUnicodeTools::GraphemeBreaks; break; case QTextBoundaryFinder::Grapheme: options |= QUnicodeTools::GraphemeBreaks; break;
case QTextBoundaryFinder::Word: options |= QUnicodeTools::WordBreaks; break; case QTextBoundaryFinder::Word: options |= QUnicodeTools::WordBreaks; break;

View File

@ -3266,7 +3266,7 @@ inline QDateTime::Data::Data(Qt::TimeSpec spec)
// the structure is too small, we need to detach // the structure is too small, we need to detach
d = new QDateTimePrivate; d = new QDateTimePrivate;
d->ref.ref(); d->ref.ref();
d->m_status = mergeSpec(nullptr, spec); d->m_status = mergeSpec({}, spec);
} }
} }

View File

@ -407,7 +407,7 @@ bool QDateTimeParser::parseFormat(const QString &newFormat)
QDTPDEBUGN("parseFormat: %s", newFormat.toLatin1().constData()); QDTPDEBUGN("parseFormat: %s", newFormat.toLatin1().constData());
QVector<SectionNode> newSectionNodes; QVector<SectionNode> newSectionNodes;
Sections newDisplay = 0; Sections newDisplay;
QStringList newSeparators; QStringList newSeparators;
int i, index = 0; int i, index = 0;
int add = 0; int add = 0;
@ -1799,7 +1799,7 @@ int QDateTimeParser::SectionNode::maxChange() const
QDateTimeParser::FieldInfo QDateTimeParser::fieldInfo(int index) const QDateTimeParser::FieldInfo QDateTimeParser::fieldInfo(int index) const
{ {
FieldInfo ret = 0; FieldInfo ret;
const SectionNode &sn = sectionNode(index); const SectionNode &sn = sectionNode(index);
switch (sn.type) { switch (sn.type) {
case MSecSection: case MSecSection:

View File

@ -84,7 +84,7 @@ public:
DateTimeEdit DateTimeEdit
}; };
QDateTimeParser(QVariant::Type t, Context ctx, const QCalendar &cal = QCalendar()) QDateTimeParser(QVariant::Type t, Context ctx, const QCalendar &cal = QCalendar())
: currentSectionIndex(-1), display(nullptr), cachedDay(-1), parserType(t), : currentSectionIndex(-1), cachedDay(-1), parserType(t),
fixday(false), spec(Qt::LocalTime), context(ctx), calendar(cal) fixday(false), spec(Qt::LocalTime), context(ctx), calendar(cal)
{ {
defaultLocale = QLocale::system(); defaultLocale = QLocale::system();

View File

@ -1139,7 +1139,7 @@ QString QDBusConnection::name() const
*/ */
QDBusConnection::ConnectionCapabilities QDBusConnection::connectionCapabilities() const QDBusConnection::ConnectionCapabilities QDBusConnection::connectionCapabilities() const
{ {
return d ? d->capabilities : ConnectionCapabilities(0); return d ? d->capabilities : ConnectionCapabilities();
} }
/*! /*!

View File

@ -1026,7 +1026,7 @@ void QDBusConnectionPrivate::deliverCall(QObject *object, int /*flags*/, const Q
extern bool qDBusInitThreads(); extern bool qDBusInitThreads();
QDBusConnectionPrivate::QDBusConnectionPrivate(QObject *p) QDBusConnectionPrivate::QDBusConnectionPrivate(QObject *p)
: QObject(p), ref(1), capabilities(0), mode(InvalidMode), busService(0), : QObject(p), ref(1), mode(InvalidMode), busService(0),
connection(0), connection(0),
rootNode(QString(QLatin1Char('/'))), rootNode(QString(QLatin1Char('/'))),
anonymousAuthenticationAllowed(false), anonymousAuthenticationAllowed(false),
@ -1770,7 +1770,7 @@ void QDBusConnectionPrivate::setPeer(DBusConnection *c, const QDBusErrorInternal
static QDBusConnection::ConnectionCapabilities connectionCapabilies(DBusConnection *connection) static QDBusConnection::ConnectionCapabilities connectionCapabilies(DBusConnection *connection)
{ {
QDBusConnection::ConnectionCapabilities result = 0; QDBusConnection::ConnectionCapabilities result;
typedef dbus_bool_t (*can_send_type_t)(DBusConnection *, int); typedef dbus_bool_t (*can_send_type_t)(DBusConnection *, int);
static can_send_type_t can_send_type = 0; static can_send_type_t can_send_type = 0;

View File

@ -1912,10 +1912,10 @@ void QImage::invertPixels(InvertMode mode)
// Inverting premultiplied pixels would produce invalid image data. // Inverting premultiplied pixels would produce invalid image data.
if (hasAlphaChannel() && qPixelLayouts[d->format].premultiplied) { if (hasAlphaChannel() && qPixelLayouts[d->format].premultiplied) {
if (depth() > 32) { if (depth() > 32) {
if (!d->convertInPlace(QImage::Format_RGBA64, 0)) if (!d->convertInPlace(QImage::Format_RGBA64, { }))
*this = convertToFormat(QImage::Format_RGBA64); *this = convertToFormat(QImage::Format_RGBA64);
} else { } else {
if (!d->convertInPlace(QImage::Format_ARGB32, 0)) if (!d->convertInPlace(QImage::Format_ARGB32, { }))
*this = convertToFormat(QImage::Format_ARGB32); *this = convertToFormat(QImage::Format_ARGB32);
} }
} }
@ -1982,7 +1982,7 @@ void QImage::invertPixels(InvertMode mode)
} }
if (originalFormat != d->format) { if (originalFormat != d->format) {
if (!d->convertInPlace(originalFormat, 0)) if (!d->convertInPlace(originalFormat, { }))
*this = convertToFormat(originalFormat); *this = convertToFormat(originalFormat);
} }
} }

View File

@ -103,7 +103,7 @@ QT_BEGIN_NAMESPACE
QPlatformCursor::clearOverrideCursor(). QPlatformCursor::clearOverrideCursor().
*/ */
QPlatformCursor::Capabilities QPlatformCursor::m_capabilities = 0; QPlatformCursor::Capabilities QPlatformCursor::m_capabilities = { };
/*! /*!
\fn QPlatformCursor::QPlatformCursor() \fn QPlatformCursor::QPlatformCursor()

View File

@ -309,7 +309,7 @@ public:
virtual QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const; virtual QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const;
virtual QIcon fileIcon(const QFileInfo &fileInfo, virtual QIcon fileIcon(const QFileInfo &fileInfo,
QPlatformTheme::IconOptions iconOptions = nullptr) const; QPlatformTheme::IconOptions iconOptions = { }) const;
virtual QIconEngine *createIconEngine(const QString &iconName) const; virtual QIconEngine *createIconEngine(const QString &iconName) const;
#ifndef QT_NO_SHORTCUT #ifndef QT_NO_SHORTCUT

View File

@ -393,7 +393,7 @@ void QSimpleDrag::startDrag()
static void sendDragLeave(QWindow *window) static void sendDragLeave(QWindow *window)
{ {
QWindowSystemInterface::handleDrag(window, nullptr, QPoint(), Qt::IgnoreAction, 0, 0); QWindowSystemInterface::handleDrag(window, nullptr, QPoint(), Qt::IgnoreAction, { }, { });
} }
void QSimpleDrag::cancel() void QSimpleDrag::cancel()

View File

@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
class QSurfaceFormatPrivate class QSurfaceFormatPrivate
{ {
public: public:
explicit QSurfaceFormatPrivate(QSurfaceFormat::FormatOptions _opts = 0) explicit QSurfaceFormatPrivate(QSurfaceFormat::FormatOptions _opts = { })
: ref(1) : ref(1)
, opts(_opts) , opts(_opts)
, redBufferSize(-1) , redBufferSize(-1)

View File

@ -545,9 +545,9 @@ void *QOpenGLBuffer::map(QOpenGLBuffer::Access access)
qWarning("QOpenGLBuffer::map(): buffer not created"); qWarning("QOpenGLBuffer::map(): buffer not created");
#endif #endif
if (!d->guard || !d->guard->id()) if (!d->guard || !d->guard->id())
return 0; return nullptr;
if (d->funcs->hasOpenGLExtension(QOpenGLExtensions::MapBufferRange)) { if (d->funcs->hasOpenGLExtension(QOpenGLExtensions::MapBufferRange)) {
QOpenGLBuffer::RangeAccessFlags rangeAccess = 0; QOpenGLBuffer::RangeAccessFlags rangeAccess;
switch (access) { switch (access) {
case QOpenGLBuffer::ReadOnly: case QOpenGLBuffer::ReadOnly:
rangeAccess = QOpenGLBuffer::RangeRead; rangeAccess = QOpenGLBuffer::RangeRead;

View File

@ -489,7 +489,7 @@ QOpenGLFunctions::OpenGLFeatures QOpenGLFunctions::openGLFeatures() const
{ {
QOpenGLFunctionsPrivateEx *d = static_cast<QOpenGLFunctionsPrivateEx *>(d_ptr); QOpenGLFunctionsPrivateEx *d = static_cast<QOpenGLFunctionsPrivateEx *>(d_ptr);
if (!d) if (!d)
return 0; return { };
if (d->m_features == -1) if (d->m_features == -1)
d->m_features = qt_gl_resolve_features(); d->m_features = qt_gl_resolve_features();
return QOpenGLFunctions::OpenGLFeatures(d->m_features); return QOpenGLFunctions::OpenGLFeatures(d->m_features);
@ -527,7 +527,7 @@ QOpenGLExtensions::OpenGLExtensions QOpenGLExtensions::openGLExtensions()
{ {
QOpenGLFunctionsPrivateEx *d = static_cast<QOpenGLFunctionsPrivateEx *>(d_ptr); QOpenGLFunctionsPrivateEx *d = static_cast<QOpenGLFunctionsPrivateEx *>(d_ptr);
if (!d) if (!d)
return 0; return { };
if (d->m_extensions == -1) if (d->m_extensions == -1)
d->m_extensions = qt_gl_resolve_extensions(); d->m_extensions = qt_gl_resolve_extensions();
return QOpenGLExtensions::OpenGLExtensions(d->m_extensions); return QOpenGLExtensions::OpenGLExtensions(d->m_extensions);

View File

@ -1575,7 +1575,7 @@ void QOpenGL2PaintEngineEx::drawImage(const QRectF& dest, const QImage& image, c
case QImage::Format_ARGB32: case QImage::Format_ARGB32:
case QImage::Format_RGBA64: case QImage::Format_RGBA64:
d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::NonPremultipliedImageSrc); d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::NonPremultipliedImageSrc);
bindOption = 0; bindOption = { };
break; break;
case QImage::Format_Alpha8: case QImage::Format_Alpha8:
if (ctx->functions()->hasOpenGLFeature(QOpenGLFunctions::TextureRGFormats)) { if (ctx->functions()->hasOpenGLFeature(QOpenGLFunctions::TextureRGFormats)) {

View File

@ -1061,7 +1061,7 @@ void QPaintEngineEx::drawStaticTextItem(QStaticTextItem *staticTextItem)
QFontEngine *fontEngine = staticTextItem->fontEngine(); QFontEngine *fontEngine = staticTextItem->fontEngine();
fontEngine->addGlyphsToPath(staticTextItem->glyphs, staticTextItem->glyphPositions, fontEngine->addGlyphsToPath(staticTextItem->glyphs, staticTextItem->glyphPositions,
staticTextItem->numGlyphs, &path, 0); staticTextItem->numGlyphs, &path, { });
if (!path.isEmpty()) { if (!path.isEmpty()) {
QPainterState *s = state(); QPainterState *s = state();
QPainter::RenderHints oldHints = s->renderHints; QPainter::RenderHints oldHints = s->renderHints;

View File

@ -5902,7 +5902,7 @@ void QPainter::drawText(const QPointF &p, const QString &str, int tf, int justif
int numGlyphs = len; int numGlyphs = len;
QVarLengthGlyphLayoutArray glyphs(len); QVarLengthGlyphLayoutArray glyphs(len);
QFontEngine *fontEngine = d->state->font.d->engineForScript(QChar::Script_Common); QFontEngine *fontEngine = d->state->font.d->engineForScript(QChar::Script_Common);
if (!fontEngine->stringToCMap(str.data(), len, &glyphs, &numGlyphs, 0)) if (!fontEngine->stringToCMap(str.data(), len, &glyphs, &numGlyphs, { }))
Q_UNREACHABLE(); Q_UNREACHABLE();
QTextItemInt gf(glyphs, &d->state->font, str.data(), len, fontEngine); QTextItemInt gf(glyphs, &d->state->font, str.data(), len, fontEngine);
@ -6404,7 +6404,7 @@ Q_GUI_EXPORT void qt_draw_decoration_for_glyphs(QPainter *painter, const glyph_t
} }
QFixed width = rightMost - leftMost; QFixed width = rightMost - leftMost;
QTextItem::RenderFlags flags = 0; QTextItem::RenderFlags flags;
if (font.underline()) if (font.underline())
flags |= QTextItem::Underline; flags |= QTextItem::Underline;
@ -7213,7 +7213,7 @@ QPainter::RenderHints QPainter::renderHints() const
Q_D(const QPainter); Q_D(const QPainter);
if (!d->engine) if (!d->engine)
return 0; return { };
return d->state->renderHints; return d->state->renderHints;
} }
@ -7795,7 +7795,7 @@ QPainterState::QPainterState()
composition_mode(QPainter::CompositionMode_SourceOver), composition_mode(QPainter::CompositionMode_SourceOver),
emulationSpecifier(0), changeFlags(0) emulationSpecifier(0), changeFlags(0)
{ {
dirtyFlags = 0; dirtyFlags = { };
} }
QPainterState::~QPainterState() QPainterState::~QPainterState()
@ -7824,9 +7824,9 @@ void QPainterState::init(QPainter *p) {
layoutDirection = QGuiApplication::layoutDirection(); layoutDirection = QGuiApplication::layoutDirection();
composition_mode = QPainter::CompositionMode_SourceOver; composition_mode = QPainter::CompositionMode_SourceOver;
emulationSpecifier = 0; emulationSpecifier = 0;
dirtyFlags = 0; dirtyFlags = { };
changeFlags = 0; changeFlags = 0;
renderHints = 0; renderHints = { };
opacity = 1; opacity = 1;
} }
@ -7883,7 +7883,7 @@ void QPainterState::init(QPainter *p) {
/*! /*!
\fn void QPainter::drawImage(const QPointF &point, const QImage &image, const QRectF &source, \fn void QPainter::drawImage(const QPointF &point, const QImage &image, const QRectF &source,
Qt::ImageConversionFlags flags = 0) Qt::ImageConversionFlags flags = Qt::AutoColor)
\overload \overload
@ -7893,7 +7893,7 @@ void QPainterState::init(QPainter *p) {
/*! /*!
\fn void QPainter::drawImage(const QPoint &point, const QImage &image, const QRect &source, \fn void QPainter::drawImage(const QPoint &point, const QImage &image, const QRect &source,
Qt::ImageConversionFlags flags = 0) Qt::ImageConversionFlags flags = Qt::AutoColor)
\overload \overload
Draws the rectangular portion \a source of the given \a image with Draws the rectangular portion \a source of the given \a image with

View File

@ -427,7 +427,7 @@ void QPlatformBackingStore::composeAndFlush(QWindow *window, const QRegion &regi
origin = QOpenGLTextureBlitter::OriginBottomLeft; origin = QOpenGLTextureBlitter::OriginBottomLeft;
textureId = d_ptr->textureId; textureId = d_ptr->textureId;
} else { } else {
TextureFlags flags = 0; TextureFlags flags;
textureId = toTexture(deviceRegion(region, window, offset), &d_ptr->textureSize, &flags); textureId = toTexture(deviceRegion(region, window, offset), &d_ptr->textureSize, &flags);
d_ptr->needsSwizzle = (flags & TextureSwizzle) != 0; d_ptr->needsSwizzle = (flags & TextureSwizzle) != 0;
d_ptr->premultiplied = (flags & TexturePremultiplied) != 0; d_ptr->premultiplied = (flags & TexturePremultiplied) != 0;
@ -534,7 +534,7 @@ GLuint QPlatformBackingStore::toTexture(const QRegion &dirtyRegion, QSize *textu
GLuint pixelType = GL_UNSIGNED_BYTE; GLuint pixelType = GL_UNSIGNED_BYTE;
bool needsConversion = false; bool needsConversion = false;
*flags = 0; *flags = { };
switch (image.format()) { switch (image.format()) {
case QImage::Format_ARGB32_Premultiplied: case QImage::Format_ARGB32_Premultiplied:
*flags |= TexturePremultiplied; *flags |= TexturePremultiplied;

View File

@ -100,7 +100,7 @@ public:
bool isLocked() const; bool isLocked() const;
void appendTexture(void *source, GLuint textureId, const QRect &geometry, void appendTexture(void *source, GLuint textureId, const QRect &geometry,
const QRect &clipRect = QRect(), Flags flags = nullptr); const QRect &clipRect = QRect(), Flags flags = { });
void clear(); void clear();
Q_SIGNALS: Q_SIGNALS:

View File

@ -682,7 +682,7 @@ bool ValueExtractor::extractOutline(int *borders, QBrush *colors, BorderStyle *s
static Qt::Alignment parseAlignment(const QCss::Value *values, int count) static Qt::Alignment parseAlignment(const QCss::Value *values, int count)
{ {
Qt::Alignment a[2] = { 0, 0 }; Qt::Alignment a[2] = { { }, { } };
for (int i = 0; i < qMin(2, count); i++) { for (int i = 0; i < qMin(2, count); i++) {
if (values[i].type != Value::KnownIdentifier) if (values[i].type != Value::KnownIdentifier)
break; break;

View File

@ -952,7 +952,7 @@ void QDistanceField::setGlyph(QFontEngine *fontEngine, glyph_t glyph, bool doubl
{ {
QFixedPoint position; QFixedPoint position;
QPainterPath path; QPainterPath path;
fontEngine->addGlyphsToPath(&glyph, &position, 1, &path, 0); fontEngine->addGlyphsToPath(&glyph, &position, 1, &path, { });
path.translate(-path.boundingRect().topLeft()); path.translate(-path.boundingRect().topLeft());
path.setFillRule(Qt::WindingFill); path.setFillRule(Qt::WindingFill);

View File

@ -506,7 +506,7 @@ void QFontEngine::getGlyphPositions(const QGlyphLayout &glyphs, const QTransform
g.numGlyphs = 1; g.numGlyphs = 1;
g.glyphs = &kashidaGlyph; g.glyphs = &kashidaGlyph;
g.advances = &kashidaWidth; g.advances = &kashidaWidth;
recalcAdvances(&g, 0); recalcAdvances(&g, { });
for (uint k = 0; k < glyphs.justifications[i].nKashidas; ++k) { for (uint k = 0; k < glyphs.justifications[i].nKashidas; ++k) {
xpos -= kashidaWidth; xpos -= kashidaWidth;
@ -948,7 +948,7 @@ QImage QFontEngine::alphaMapForGlyph(glyph_t glyph)
im.fill(Qt::transparent); im.fill(Qt::transparent);
QPainter p(&im); QPainter p(&im);
p.setRenderHint(QPainter::Antialiasing); p.setRenderHint(QPainter::Antialiasing);
addGlyphsToPath(&glyph, &pt, 1, &path, 0); addGlyphsToPath(&glyph, &pt, 1, &path, { });
p.setPen(Qt::NoPen); p.setPen(Qt::NoPen);
p.setBrush(Qt::black); p.setBrush(Qt::black);
p.drawPath(path); p.drawPath(path);

View File

@ -562,7 +562,7 @@ int QFontMetrics::width(const QString &text, int len, int flags) const
int numGlyphs = len; int numGlyphs = len;
QVarLengthGlyphLayoutArray glyphs(numGlyphs); QVarLengthGlyphLayoutArray glyphs(numGlyphs);
QFontEngine *engine = d->engineForScript(QChar::Script_Common); QFontEngine *engine = d->engineForScript(QChar::Script_Common);
if (!engine->stringToCMap(text.data(), len, &glyphs, &numGlyphs, 0)) if (!engine->stringToCMap(text.data(), len, &glyphs, &numGlyphs, { }))
Q_UNREACHABLE(); Q_UNREACHABLE();
QFixed width; QFixed width;
@ -684,7 +684,7 @@ int QFontMetrics::horizontalAdvance(QChar ch) const
glyphs.numGlyphs = 1; glyphs.numGlyphs = 1;
glyphs.glyphs = &glyph; glyphs.glyphs = &glyph;
glyphs.advances = &advance; glyphs.advances = &advance;
engine->recalcAdvances(&glyphs, 0); engine->recalcAdvances(&glyphs, { });
return qRound(advance); return qRound(advance);
} }
@ -736,7 +736,7 @@ int QFontMetrics::charWidth(const QString &text, int pos) const
glyphs.numGlyphs = 1; glyphs.numGlyphs = 1;
glyphs.glyphs = &glyph; glyphs.glyphs = &glyph;
glyphs.advances = &advance; glyphs.advances = &advance;
engine->recalcAdvances(&glyphs, 0); engine->recalcAdvances(&glyphs, { });
width = qRound(advance); width = qRound(advance);
} }
@ -1619,7 +1619,7 @@ qreal QFontMetricsF::horizontalAdvance(QChar ch) const
glyphs.numGlyphs = 1; glyphs.numGlyphs = 1;
glyphs.glyphs = &glyph; glyphs.glyphs = &glyph;
glyphs.advances = &advance; glyphs.advances = &advance;
engine->recalcAdvances(&glyphs, 0); engine->recalcAdvances(&glyphs, { });
return advance.toReal(); return advance.toReal();
} }

View File

@ -279,7 +279,7 @@ void QGlyphRun::clear()
{ {
detach(); detach();
d->rawFont = QRawFont(); d->rawFont = QRawFont();
d->flags = 0; d->flags = { };
setPositions(QVector<QPointF>()); setPositions(QVector<QPointF>());
setGlyphIndexes(QVector<quint32>()); setGlyphIndexes(QVector<quint32>());

View File

@ -65,8 +65,7 @@ class QGlyphRunPrivate: public QSharedData
{ {
public: public:
QGlyphRunPrivate() QGlyphRunPrivate()
: flags(nullptr) : glyphIndexData(glyphIndexes.constData())
, glyphIndexData(glyphIndexes.constData())
, glyphIndexDataSize(0) , glyphIndexDataSize(0)
, glyphPositionData(glyphPositions.constData()) , glyphPositionData(glyphPositions.constData())
, glyphPositionDataSize(0) , glyphPositionDataSize(0)

View File

@ -303,7 +303,7 @@ QPainterPath QRawFont::pathForGlyph(quint32 glyphIndex) const
QFixedPoint position; QFixedPoint position;
QPainterPath path; QPainterPath path;
d->fontEngine->addGlyphsToPath(&glyphIndex, &position, 1, &path, 0); d->fontEngine->addGlyphsToPath(&glyphIndex, &position, 1, &path, { });
return path; return path;
} }

View File

@ -1720,7 +1720,7 @@ int QTextEngine::shapeTextWithHarfbuzzNG(const QScriptItem &si,
g.glyphs[i] = actualFontEngine->glyphIndex('-'); g.glyphs[i] = actualFontEngine->glyphIndex('-');
if (Q_LIKELY(g.glyphs[i] != 0)) { if (Q_LIKELY(g.glyphs[i] != 0)) {
QGlyphLayout tmp = g.mid(i, 1); QGlyphLayout tmp = g.mid(i, 1);
actualFontEngine->recalcAdvances(&tmp, 0); actualFontEngine->recalcAdvances(&tmp, { });
} }
g.attributes[i].dontPrint = true; g.attributes[i].dontPrint = true;
} }
@ -2581,7 +2581,7 @@ static void set(QJustificationPoint *point, int type, const QGlyphLayout &glyph,
g.numGlyphs = 1; g.numGlyphs = 1;
g.glyphs = &kashidaGlyph; g.glyphs = &kashidaGlyph;
g.advances = &point->kashidaWidth; g.advances = &point->kashidaWidth;
fe->recalcAdvances(&g, 0); fe->recalcAdvances(&g, { });
if (point->kashidaWidth == 0) if (point->kashidaWidth == 0)
point->type = Justification_Prohibited; point->type = Justification_Prohibited;
@ -3214,13 +3214,13 @@ QString QTextEngine::elidedText(Qt::TextElideMode mode, const QFixed &width, int
glyphs.advances = &ellipsisWidth; glyphs.advances = &ellipsisWidth;
if (glyph != 0) { if (glyph != 0) {
engine->recalcAdvances(&glyphs, 0); engine->recalcAdvances(&glyphs, { });
ellipsisText = ellipsisChar; ellipsisText = ellipsisChar;
} else { } else {
glyph = engine->glyphIndex('.'); glyph = engine->glyphIndex('.');
if (glyph != 0) { if (glyph != 0) {
engine->recalcAdvances(&glyphs, 0); engine->recalcAdvances(&glyphs, { });
ellipsisWidth *= 3; ellipsisWidth *= 3;
ellipsisText = QStringLiteral("..."); ellipsisText = QStringLiteral("...");
@ -3928,7 +3928,7 @@ void QTextItemInt::initWithScriptItem(const QScriptItem &si)
{ {
// explicitly initialize flags so that initFontAttributes can be called // explicitly initialize flags so that initFontAttributes can be called
// multiple times on the same TextItem // multiple times on the same TextItem
flags = 0; flags = { };
if (si.analysis.bidiLevel %2) if (si.analysis.bidiLevel %2)
flags |= QTextItem::RightToLeft; flags |= QTextItem::RightToLeft;
ascent = si.ascent; ascent = si.ascent;

View File

@ -1147,7 +1147,7 @@ QLayoutPolicy::ControlTypes QGridLayoutEngine::controlTypes(LayoutSide side) con
Qt::Orientation orientation = (side == Top || side == Bottom) ? Qt::Vertical : Qt::Horizontal; Qt::Orientation orientation = (side == Top || side == Bottom) ? Qt::Vertical : Qt::Horizontal;
int row = (side == Top || side == Left) ? effectiveFirstRow(orientation) int row = (side == Top || side == Left) ? effectiveFirstRow(orientation)
: effectiveLastRow(orientation); : effectiveLastRow(orientation);
QLayoutPolicy::ControlTypes result = 0; QLayoutPolicy::ControlTypes result;
for (int column = columnCount(orientation) - 1; column >= 0; --column) { for (int column = columnCount(orientation) - 1; column >= 0; --column) {
if (QGridLayoutItem *item = itemAt(row, column, orientation)) if (QGridLayoutItem *item = itemAt(row, column, orientation))

View File

@ -276,7 +276,7 @@ class Q_GUI_EXPORT QGridLayoutItem
{ {
public: public:
QGridLayoutItem(int row, int column, int rowSpan = 1, int columnSpan = 1, QGridLayoutItem(int row, int column, int rowSpan = 1, int columnSpan = 1,
Qt::Alignment alignment = nullptr); Qt::Alignment alignment = { });
virtual ~QGridLayoutItem() {} virtual ~QGridLayoutItem() {}
inline int firstRow() const { return q_firstRows[Ver]; } inline int firstRow() const { return q_firstRows[Ver]; }
@ -339,7 +339,7 @@ private:
class Q_GUI_EXPORT QGridLayoutEngine class Q_GUI_EXPORT QGridLayoutEngine
{ {
public: public:
QGridLayoutEngine(Qt::Alignment defaultAlignment = Qt::Alignment(nullptr), bool snapToPixelGrid = false); QGridLayoutEngine(Qt::Alignment defaultAlignment = { }, bool snapToPixelGrid = false);
inline ~QGridLayoutEngine() { qDeleteAll(q_items); } inline ~QGridLayoutEngine() { qDeleteAll(q_items); }
int rowCount(Qt::Orientation orientation) const; int rowCount(Qt::Orientation orientation) const;

View File

@ -97,7 +97,7 @@ public:
int physDevIndex = 0; int physDevIndex = 0;
QVector<VkPhysicalDevice> physDevs; QVector<VkPhysicalDevice> physDevs;
QVector<VkPhysicalDeviceProperties> physDevProps; QVector<VkPhysicalDeviceProperties> physDevProps;
QVulkanWindow::Flags flags = nullptr; QVulkanWindow::Flags flags;
QByteArrayList requestedDevExtensions; QByteArrayList requestedDevExtensions;
QHash<VkPhysicalDevice, QVulkanInfoVector<QVulkanExtension> > supportedDevExtensions; QHash<VkPhysicalDevice, QVulkanInfoVector<QVulkanExtension> > supportedDevExtensions;
QVector<VkFormat> requestedColorFormats; QVector<VkFormat> requestedColorFormats;

View File

@ -613,7 +613,7 @@ void QSpdyProtocolHandler::sendSYN_STREAM(const HttpMessagePair &messagePair,
QHttpNetworkRequest request = messagePair.first; QHttpNetworkRequest request = messagePair.first;
QHttpNetworkReply *reply = messagePair.second; QHttpNetworkReply *reply = messagePair.second;
ControlFrameFlags flags = 0; ControlFrameFlags flags;
if (!request.uploadByteDevice()) { if (!request.uploadByteDevice()) {
// no upload -> this is the last frame, send the FIN flag // no upload -> this is the last frame, send the FIN flag
@ -675,14 +675,14 @@ void QSpdyProtocolHandler::sendRST_STREAM(qint32 streamID, RST_STREAM_STATUS_COD
char wireData[8]; char wireData[8];
appendIntToFourBytes(wireData, streamID); appendIntToFourBytes(wireData, streamID);
appendIntToFourBytes(wireData + 4, statusCode); appendIntToFourBytes(wireData + 4, statusCode);
sendControlFrame(FrameType_RST_STREAM, /* flags = */ 0, wireData, /* length = */ 8); sendControlFrame(FrameType_RST_STREAM, /* flags = */ { }, wireData, /* length = */ 8);
} }
void QSpdyProtocolHandler::sendPING(quint32 pingID) void QSpdyProtocolHandler::sendPING(quint32 pingID)
{ {
char rawData[4]; char rawData[4];
appendIntToFourBytes(rawData, pingID); appendIntToFourBytes(rawData, pingID);
sendControlFrame(FrameType_PING, /* flags = */ 0, rawData, /* length = */ 4); sendControlFrame(FrameType_PING, /* flags = */ { }, rawData, /* length = */ 4);
} }
bool QSpdyProtocolHandler::uploadData(qint32 streamID) bool QSpdyProtocolHandler::uploadData(qint32 streamID)
@ -724,7 +724,7 @@ bool QSpdyProtocolHandler::uploadData(qint32 streamID)
// nothing to read currently, break the loop // nothing to read currently, break the loop
break; break;
} else { } else {
DataFrameFlags flags = 0; DataFrameFlags flags;
// we will send the FIN flag later if appropriate // we will send the FIN flag later if appropriate
qint64 currentWriteSize = sendDataFrame(streamID, flags, currentReadSize, readPointer); qint64 currentWriteSize = sendDataFrame(streamID, flags, currentReadSize, readPointer);
if (currentWriteSize == -1 || currentWriteSize != currentReadSize) { if (currentWriteSize == -1 || currentWriteSize != currentReadSize) {
@ -774,7 +774,7 @@ void QSpdyProtocolHandler::sendWINDOW_UPDATE(qint32 streamID, quint32 deltaWindo
appendIntToFourBytes(windowUpdateData, streamID); appendIntToFourBytes(windowUpdateData, streamID);
appendIntToFourBytes(windowUpdateData + 4, deltaWindowSize); appendIntToFourBytes(windowUpdateData + 4, deltaWindowSize);
sendControlFrame(FrameType_WINDOW_UPDATE, /* flags = */ 0, windowUpdateData, /* length = */ 8); sendControlFrame(FrameType_WINDOW_UPDATE, /* flags = */ { }, windowUpdateData, /* length = */ 8);
} }
qint64 QSpdyProtocolHandler::sendDataFrame(qint32 streamID, DataFrameFlags flags, qint64 QSpdyProtocolHandler::sendDataFrame(qint32 streamID, DataFrameFlags flags,

View File

@ -82,7 +82,7 @@ public:
class QNetworkInterfacePrivate: public QSharedData class QNetworkInterfacePrivate: public QSharedData
{ {
public: public:
QNetworkInterfacePrivate() : index(0), flags(nullptr) QNetworkInterfacePrivate() : index(0)
{ } { }
~QNetworkInterfacePrivate() ~QNetworkInterfacePrivate()
{ } { }

View File

@ -80,7 +80,7 @@ QT_BEGIN_NAMESPACE
static QNetworkInterface::InterfaceFlags convertFlags(uint rawFlags) static QNetworkInterface::InterfaceFlags convertFlags(uint rawFlags)
{ {
QNetworkInterface::InterfaceFlags flags = nullptr; QNetworkInterface::InterfaceFlags flags;
flags |= (rawFlags & IFF_UP) ? QNetworkInterface::IsUp : QNetworkInterface::InterfaceFlag(0); flags |= (rawFlags & IFF_UP) ? QNetworkInterface::IsUp : QNetworkInterface::InterfaceFlag(0);
flags |= (rawFlags & IFF_RUNNING) ? QNetworkInterface::IsRunning : QNetworkInterface::InterfaceFlag(0); flags |= (rawFlags & IFF_RUNNING) ? QNetworkInterface::IsRunning : QNetworkInterface::InterfaceFlag(0);
flags |= (rawFlags & IFF_BROADCAST) ? QNetworkInterface::CanBroadcast : QNetworkInterface::InterfaceFlag(0); flags |= (rawFlags & IFF_BROADCAST) ? QNetworkInterface::CanBroadcast : QNetworkInterface::InterfaceFlag(0);

View File

@ -341,7 +341,7 @@ void QLocalSocketPrivate::_q_connectToSocket()
} }
connectingSocket = -1; connectingSocket = -1;
connectingName.clear(); connectingName.clear();
connectingOpenMode = 0; connectingOpenMode = { };
} }
bool QLocalSocket::setSocketDescriptor(qintptr socketDescriptor, bool QLocalSocket::setSocketDescriptor(qintptr socketDescriptor,
@ -438,7 +438,7 @@ void QLocalSocket::close()
::close(d->connectingSocket); ::close(d->connectingSocket);
d->connectingSocket = -1; d->connectingSocket = -1;
d->connectingName.clear(); d->connectingName.clear();
d->connectingOpenMode = 0; d->connectingOpenMode = { };
d->serverName.clear(); d->serverName.clear();
d->fullServerName.clear(); d->fullServerName.clear();
QIODevice::close(); QIODevice::close();

View File

@ -279,7 +279,7 @@ QGLFunctions::OpenGLFeatures QGLFunctions::openGLFeatures() const
{ {
QGLFunctionsPrivateEx *d = static_cast<QGLFunctionsPrivateEx *>(d_ptr); QGLFunctionsPrivateEx *d = static_cast<QGLFunctionsPrivateEx *>(d_ptr);
if (!d) if (!d)
return 0; return { };
if (d->m_features == -1) if (d->m_features == -1)
d->m_features = qt_gl_resolve_features(); d->m_features = qt_gl_resolve_features();
return QGLFunctions::OpenGLFeatures(d->m_features); return QGLFunctions::OpenGLFeatures(d->m_features);

View File

@ -60,7 +60,7 @@ class QEGLPbuffer : public QPlatformOffscreenSurface
{ {
public: public:
QEGLPbuffer(EGLDisplay display, const QSurfaceFormat &format, QOffscreenSurface *offscreenSurface, QEGLPbuffer(EGLDisplay display, const QSurfaceFormat &format, QOffscreenSurface *offscreenSurface,
QEGLPlatformContext::Flags flags = nullptr); QEGLPlatformContext::Flags flags = { });
~QEGLPbuffer(); ~QEGLPbuffer();
QSurfaceFormat format() const override { return m_format; } QSurfaceFormat format() const override { return m_format; }

View File

@ -69,7 +69,7 @@ public:
QEGLPlatformContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display, QEGLPlatformContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display,
EGLConfig *config = nullptr, const QVariant &nativeHandle = QVariant(), EGLConfig *config = nullptr, const QVariant &nativeHandle = QVariant(),
Flags flags = nullptr); Flags flags = { });
~QEGLPlatformContext(); ~QEGLPlatformContext();
void initialize() override; void initialize() override;

View File

@ -255,7 +255,7 @@ QFbWindow *QFbScreen::windowForId(WId wid) const
QFbScreen::Flags QFbScreen::flags() const QFbScreen::Flags QFbScreen::flags() const
{ {
return 0; return { };
} }
QT_END_NAMESPACE QT_END_NAMESPACE

View File

@ -136,7 +136,7 @@ void QLibInputTouch::processTouchUp(libinput_event_touch *e)
if (tp) { if (tp) {
tp->state = Qt::TouchPointReleased; tp->state = Qt::TouchPointReleased;
// There may not be a Frame event after the last Up. Work this around. // There may not be a Frame event after the last Up. Work this around.
Qt::TouchPointStates s = 0; Qt::TouchPointStates s;
for (int i = 0; i < state->m_points.count(); ++i) for (int i = 0; i < state->m_points.count(); ++i)
s |= state->m_points.at(i).state; s |= state->m_points.at(i).state;
if (s == Qt::TouchPointReleased) if (s == Qt::TouchPointReleased)

View File

@ -873,7 +873,7 @@ void QKmsDevice::discoverPlanes()
plane.type = QKmsPlane::Type(value); plane.type = QKmsPlane::Type(value);
} else if (!strcmp(prop->name, "rotation")) { } else if (!strcmp(prop->name, "rotation")) {
plane.initialRotation = QKmsPlane::Rotations(int(value)); plane.initialRotation = QKmsPlane::Rotations(int(value));
plane.availableRotations = 0; plane.availableRotations = { };
if (propTypeIs(prop, DRM_MODE_PROP_BITMASK)) { if (propTypeIs(prop, DRM_MODE_PROP_BITMASK)) {
for (int i = 0; i < prop->count_enums; ++i) for (int i = 0; i < prop->count_enums; ++i)
plane.availableRotations |= QKmsPlane::Rotation(1 << prop->enums[i].value); plane.availableRotations |= QKmsPlane::Rotation(1 << prop->enums[i].value);

View File

@ -109,7 +109,7 @@ public:
QVariant themeHint(ThemeHint hint) const override; QVariant themeHint(ThemeHint hint) const override;
QIcon fileIcon(const QFileInfo &fileInfo, QIcon fileIcon(const QFileInfo &fileInfo,
QPlatformTheme::IconOptions iconOptions = nullptr) const override; QPlatformTheme::IconOptions iconOptions = { }) const override;
const QPalette *palette(Palette type = SystemPalette) const override; const QPalette *palette(Palette type = SystemPalette) const override;
@ -134,7 +134,7 @@ public:
QGnomeTheme(); QGnomeTheme();
QVariant themeHint(ThemeHint hint) const override; QVariant themeHint(ThemeHint hint) const override;
QIcon fileIcon(const QFileInfo &fileInfo, QIcon fileIcon(const QFileInfo &fileInfo,
QPlatformTheme::IconOptions = nullptr) const override; QPlatformTheme::IconOptions = { }) const override;
const QFont *font(Font type) const override; const QFont *font(Font type) const override;
QString standardButtonText(int button) const override; QString standardButtonText(int button) const override;

View File

@ -62,7 +62,7 @@ QImageIOPlugin::Capabilities QGifPlugin::capabilities(QIODevice *device, const Q
{ {
if (format == "gif" || (device && device->isReadable() && QGifHandler::canRead(device))) if (format == "gif" || (device && device->isReadable() && QGifHandler::canRead(device)))
return Capabilities(CanRead); return Capabilities(CanRead);
return 0; return { };
} }
QImageIOHandler *QGifPlugin::create(QIODevice *device, const QByteArray &format) const QImageIOHandler *QGifPlugin::create(QIODevice *device, const QByteArray &format) const

View File

@ -46,9 +46,9 @@ QImageIOPlugin::Capabilities QICOPlugin::capabilities(QIODevice *device, const Q
if (format == "ico" || format == "cur") if (format == "ico" || format == "cur")
return Capabilities(CanRead | CanWrite); return Capabilities(CanRead | CanWrite);
if (!format.isEmpty()) if (!format.isEmpty())
return 0; return { };
if (!device->isOpen()) if (!device->isOpen())
return 0; return { };
Capabilities cap; Capabilities cap;
if (device->isReadable() && QtIcoHandler::canRead(device)) if (device->isReadable() && QtIcoHandler::canRead(device))

View File

@ -51,9 +51,9 @@ QImageIOPlugin::Capabilities QJpegPlugin::capabilities(QIODevice *device, const
if (format == "jpeg" || format == "jpg") if (format == "jpeg" || format == "jpg")
return Capabilities(CanRead | CanWrite); return Capabilities(CanRead | CanWrite);
if (!format.isEmpty()) if (!format.isEmpty())
return 0; return { };
if (!device->isOpen()) if (!device->isOpen())
return 0; return { };
Capabilities cap; Capabilities cap;
if (device->isReadable() && QJpegHandler::canRead(device)) if (device->isReadable() && QJpegHandler::canRead(device))

View File

@ -61,7 +61,7 @@ public:
explicit QIBusFilterEventWatcher(const QDBusPendingCall &call, explicit QIBusFilterEventWatcher(const QDBusPendingCall &call,
QObject *parent = nullptr, QObject *parent = nullptr,
QWindow *window = nullptr, QWindow *window = nullptr,
const Qt::KeyboardModifiers modifiers = nullptr, const Qt::KeyboardModifiers modifiers = { },
const QVariantList arguments = QVariantList()) const QVariantList arguments = QVariantList())
: QDBusPendingCallWatcher(call, parent) : QDBusPendingCallWatcher(call, parent)
, m_window(window) , m_window(window)

View File

@ -236,7 +236,7 @@ QPlatformOffscreenSurface *QEglFSIntegration::createPlatformOffscreenSurface(QOf
EGLDisplay dpy = surface->screen() ? static_cast<QEglFSScreen *>(surface->screen()->handle())->display() : display(); EGLDisplay dpy = surface->screen() ? static_cast<QEglFSScreen *>(surface->screen()->handle())->display() : display();
QSurfaceFormat fmt = qt_egl_device_integration()->surfaceFormatFor(surface->requestedFormat()); QSurfaceFormat fmt = qt_egl_device_integration()->surfaceFormatFor(surface->requestedFormat());
if (qt_egl_device_integration()->supportsPBuffers()) { if (qt_egl_device_integration()->supportsPBuffers()) {
QEGLPlatformContext::Flags flags = 0; QEGLPlatformContext::Flags flags;
if (!qt_egl_device_integration()->supportsSurfacelessContexts()) if (!qt_egl_device_integration()->supportsSurfacelessContexts())
flags |= QEGLPlatformContext::NoSurfaceless; flags |= QEGLPlatformContext::NoSurfaceless;
return new QEGLPbuffer(dpy, fmt, surface, flags); return new QEGLPbuffer(dpy, fmt, surface, flags);

View File

@ -186,7 +186,7 @@ void QEglFSWindow::destroy()
#endif #endif
} }
m_flags = 0; m_flags = { };
} }
void QEglFSWindow::invalidateSurface() void QEglFSWindow::invalidateSurface()

View File

@ -373,7 +373,7 @@ bool QIOSFileEngineAssetsLibrary::close()
QAbstractFileEngine::FileFlags QIOSFileEngineAssetsLibrary::fileFlags(QAbstractFileEngine::FileFlags type) const QAbstractFileEngine::FileFlags QIOSFileEngineAssetsLibrary::fileFlags(QAbstractFileEngine::FileFlags type) const
{ {
QAbstractFileEngine::FileFlags flags = 0; QAbstractFileEngine::FileFlags flags;
const bool isDir = (m_assetUrl == QLatin1String("assets-library://")); const bool isDir = (m_assetUrl == QLatin1String("assets-library://"));
const bool exists = isDir || m_assetUrl == g_iteratorCurrentUrl.localData() || loadAsset(); const bool exists = isDir || m_assetUrl == g_iteratorCurrentUrl.localData() || loadAsset();

View File

@ -455,7 +455,7 @@ void QXcbConnection::printXcbError(const char *message, xcb_generic_error_t *err
static Qt::MouseButtons translateMouseButtons(int s) static Qt::MouseButtons translateMouseButtons(int s)
{ {
Qt::MouseButtons ret = 0; Qt::MouseButtons ret;
if (s & XCB_BUTTON_MASK_1) if (s & XCB_BUTTON_MASK_1)
ret |= Qt::LeftButton; ret |= Qt::LeftButton;
if (s & XCB_BUTTON_MASK_2) if (s & XCB_BUTTON_MASK_2)

View File

@ -294,7 +294,7 @@ private:
int deviceId = 0; int deviceId = 0;
QTabletEvent::PointerType pointerType = QTabletEvent::UnknownPointer; QTabletEvent::PointerType pointerType = QTabletEvent::UnknownPointer;
QTabletEvent::TabletDevice tool = QTabletEvent::Stylus; QTabletEvent::TabletDevice tool = QTabletEvent::Stylus;
Qt::MouseButtons buttons = 0; Qt::MouseButtons buttons;
qint64 serialId = 0; qint64 serialId = 0;
bool inProximity = false; bool inProximity = false;
struct ValuatorClassInfo { struct ValuatorClassInfo {
@ -318,8 +318,8 @@ private:
int horizontalIndex = 0; int horizontalIndex = 0;
double verticalIncrement = 0; double verticalIncrement = 0;
double horizontalIncrement = 0; double horizontalIncrement = 0;
Qt::Orientations orientations = 0; Qt::Orientations orientations;
Qt::Orientations legacyOrientations = 0; Qt::Orientations legacyOrientations;
QPointF lastScrollPosition; QPointF lastScrollPosition;
}; };
QHash<int, ScrollingDevice> m_scrollingDevices; QHash<int, ScrollingDevice> m_scrollingDevices;
@ -360,7 +360,7 @@ private:
WindowMapper m_mapper; WindowMapper m_mapper;
Qt::MouseButtons m_buttonState = nullptr; Qt::MouseButtons m_buttonState;
Qt::MouseButton m_button = Qt::NoButton; Qt::MouseButton m_button = Qt::NoButton;
QXcbWindow *m_focusWindow = nullptr; QXcbWindow *m_focusWindow = nullptr;

View File

@ -424,7 +424,7 @@ QXcbConnection::TouchDeviceData *QXcbConnection::touchDeviceForId(int id)
QXcbConnection::TouchDeviceData *QXcbConnection::populateTouchDevices(void *info) QXcbConnection::TouchDeviceData *QXcbConnection::populateTouchDevices(void *info)
{ {
auto *deviceinfo = reinterpret_cast<xcb_input_xi_device_info_t *>(info); auto *deviceinfo = reinterpret_cast<xcb_input_xi_device_info_t *>(info);
QTouchDevice::Capabilities caps = 0; QTouchDevice::Capabilities caps;
int type = -1; int type = -1;
int maxTouchPoints = 1; int maxTouchPoints = 1;
bool isTouchDevice = false; bool isTouchDevice = false;

View File

@ -883,7 +883,7 @@ void QXcbDrag::handleLeave(QPlatformWindow *w, const xcb_client_message_event_t
event->data.data32[0], xdnd_dragsource); event->data.data32[0], xdnd_dragsource);
} }
QWindowSystemInterface::handleDrag(w->window(), nullptr, QPoint(), Qt::IgnoreAction, 0, 0); QWindowSystemInterface::handleDrag(w->window(), nullptr, QPoint(), Qt::IgnoreAction, { }, { });
} }
void QXcbDrag::send_leave() void QXcbDrag::send_leave()

View File

@ -86,7 +86,7 @@ public:
void handlePosition(QPlatformWindow *w, const xcb_client_message_event_t *event); void handlePosition(QPlatformWindow *w, const xcb_client_message_event_t *event);
void handleLeave(QPlatformWindow *w, const xcb_client_message_event_t *event); void handleLeave(QPlatformWindow *w, const xcb_client_message_event_t *event);
void handleDrop(QPlatformWindow *, const xcb_client_message_event_t *event, void handleDrop(QPlatformWindow *, const xcb_client_message_event_t *event,
Qt::MouseButtons b = nullptr, Qt::KeyboardModifiers mods = nullptr); Qt::MouseButtons b = { }, Qt::KeyboardModifiers mods = { });
void handleStatus(const xcb_client_message_event_t *event); void handleStatus(const xcb_client_message_event_t *event);
void handleSelectionRequest(const xcb_selection_request_event_t *event); void handleSelectionRequest(const xcb_selection_request_event_t *event);
@ -109,7 +109,7 @@ private:
void init(); void init();
void handle_xdnd_position(QPlatformWindow *w, const xcb_client_message_event_t *event, void handle_xdnd_position(QPlatformWindow *w, const xcb_client_message_event_t *event,
Qt::MouseButtons b = nullptr, Qt::KeyboardModifiers mods = nullptr); Qt::MouseButtons b = { }, Qt::KeyboardModifiers mods = { });
void handle_xdnd_status(const xcb_client_message_event_t *event); void handle_xdnd_status(const xcb_client_message_event_t *event);
void send_leave(); void send_leave();

View File

@ -927,7 +927,7 @@ void QXcbWindow::setWindowFlags(Qt::WindowFlags flags)
xcb_change_window_attributes(xcb_connection(), xcb_window(), mask, values); xcb_change_window_attributes(xcb_connection(), xcb_window(), mask, values);
QXcbWindowFunctions::WmWindowTypes wmWindowTypes = 0; QXcbWindowFunctions::WmWindowTypes wmWindowTypes;
if (window()->dynamicPropertyNames().contains(wm_window_type_property_id)) { if (window()->dynamicPropertyNames().contains(wm_window_type_property_id)) {
wmWindowTypes = static_cast<QXcbWindowFunctions::WmWindowTypes>( wmWindowTypes = static_cast<QXcbWindowFunctions::WmWindowTypes>(
window()->property(wm_window_type_property_id).value<int>()); window()->property(wm_window_type_property_id).value<int>());

View File

@ -72,7 +72,7 @@ public:
QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const override; QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const override;
QIcon fileIcon(const QFileInfo &fileInfo, QIcon fileIcon(const QFileInfo &fileInfo,
QPlatformTheme::IconOptions iconOptions = nullptr) const override; QPlatformTheme::IconOptions iconOptions = { }) const override;
QIconEngine *createIconEngine(const QString &iconName) const override; QIconEngine *createIconEngine(const QString &iconName) const override;

View File

@ -81,7 +81,7 @@ public:
void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s) override; void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s) override;
protected: protected:
QAlphaPaintEngine(QAlphaPaintEnginePrivate &data, PaintEngineFeatures devcaps = 0); QAlphaPaintEngine(QAlphaPaintEnginePrivate &data, PaintEngineFeatures devcaps = { });
QRegion alphaClipping() const; QRegion alphaClipping() const;
bool continueCall() const; bool continueCall() const;
void flushAndInit(bool init = true); void flushAndInit(bool init = true);

View File

@ -1305,7 +1305,7 @@ Qt::ItemFlags QSqlTableModel::flags(const QModelIndex &index) const
Q_D(const QSqlTableModel); Q_D(const QSqlTableModel);
if (index.internalPointer() || index.column() < 0 || index.column() >= d->rec.count() if (index.internalPointer() || index.column() < 0 || index.column() >= d->rec.count()
|| index.row() < 0) || index.row() < 0)
return 0; return { };
bool editable = true; bool editable = true;

View File

@ -370,7 +370,7 @@ QFileDialog::QFileDialog(QWidget *parent,
const QString &caption, const QString &caption,
const QString &directory, const QString &directory,
const QString &filter) const QString &filter)
: QDialog(*new QFileDialogPrivate, parent, 0) : QDialog(*new QFileDialogPrivate, parent, { })
{ {
Q_D(QFileDialog); Q_D(QFileDialog);
d->init(QUrl::fromLocalFile(directory), filter, caption); d->init(QUrl::fromLocalFile(directory), filter, caption);
@ -380,7 +380,7 @@ QFileDialog::QFileDialog(QWidget *parent,
\internal \internal
*/ */
QFileDialog::QFileDialog(const QFileDialogArgs &args) QFileDialog::QFileDialog(const QFileDialogArgs &args)
: QDialog(*new QFileDialogPrivate, args.parent, 0) : QDialog(*new QFileDialogPrivate, args.parent, { })
{ {
Q_D(QFileDialog); Q_D(QFileDialog);
d->init(args.directory, args.filter, args.caption); d->init(args.directory, args.filter, args.caption);

View File

@ -116,7 +116,7 @@ public:
inline qint64 size() const { if (info && !info->isDir()) return info->size(); return 0; } inline qint64 size() const { if (info && !info->isDir()) return info->size(); return 0; }
inline QString type() const { if (info) return info->displayType; return QLatin1String(""); } inline QString type() const { if (info) return info->displayType; return QLatin1String(""); }
inline QDateTime lastModified() const { if (info) return info->lastModified(); return QDateTime(); } inline QDateTime lastModified() const { if (info) return info->lastModified(); return QDateTime(); }
inline QFile::Permissions permissions() const { if (info) return info->permissions(); return nullptr; } inline QFile::Permissions permissions() const { if (info) return info->permissions(); return { }; }
inline bool isReadable() const { return ((permissions() & QFile::ReadUser) != 0); } inline bool isReadable() const { return ((permissions() & QFile::ReadUser) != 0); }
inline bool isWritable() const { return ((permissions() & QFile::WriteUser) != 0); } inline bool isWritable() const { return ((permissions() & QFile::WriteUser) != 0); }
inline bool isExecutable() const { return ((permissions() & QFile::ExeUser) != 0); } inline bool isExecutable() const { return ((permissions() & QFile::ExeUser) != 0); }

View File

@ -391,7 +391,7 @@ QFont QFontDialog::getFont(bool *ok, const QFont &initial, QWidget *parent, cons
QFont QFontDialog::getFont(bool *ok, QWidget *parent) QFont QFontDialog::getFont(bool *ok, QWidget *parent)
{ {
QFont initial; QFont initial;
return QFontDialogPrivate::getFont(ok, initial, parent, QString(), 0); return QFontDialogPrivate::getFont(ok, initial, parent, QString(), { });
} }
QFont QFontDialogPrivate::getFont(bool *ok, const QFont &initial, QWidget *parent, QFont QFontDialogPrivate::getFont(bool *ok, const QFont &initial, QWidget *parent,

View File

@ -492,7 +492,7 @@ void QProgressDialogPrivate::adoptChildWidget(QWidget *c)
if (c->parentWidget() == q) if (c->parentWidget() == q)
c->hide(); // until after ensureSizeIsAtLeastSizeHint() c->hide(); // until after ensureSizeIsAtLeastSizeHint()
else else
c->setParent(q, 0); c->setParent(q, { });
} }
ensureSizeIsAtLeastSizeHint(); ensureSizeIsAtLeastSizeHint();
if (c) if (c)

View File

@ -3444,7 +3444,7 @@ int QWizard::nextId() const
\sa wizard() \sa wizard()
*/ */
QWizardPage::QWizardPage(QWidget *parent) QWizardPage::QWizardPage(QWidget *parent)
: QWidget(*new QWizardPagePrivate, parent, 0) : QWidget(*new QWizardPagePrivate, parent, { })
{ {
connect(this, SIGNAL(completeChanged()), this, SLOT(_q_updateCachedCompleteState())); connect(this, SIGNAL(completeChanged()), this, SLOT(_q_updateCachedCompleteState()));
} }

View File

@ -96,7 +96,7 @@ Qt::Alignment QGraphicsGridLayoutEngine::alignment(QGraphicsLayoutItem *graphics
{ {
if (QGraphicsGridLayoutEngineItem *gridEngineItem = findLayoutItem(graphicsLayoutItem)) if (QGraphicsGridLayoutEngineItem *gridEngineItem = findLayoutItem(graphicsLayoutItem))
return gridEngineItem->alignment(); return gridEngineItem->alignment();
return 0; return { };
} }

View File

@ -68,7 +68,7 @@ class QGraphicsLayoutPrivate;
class QGraphicsGridLayoutEngineItem : public QGridLayoutItem { class QGraphicsGridLayoutEngineItem : public QGridLayoutItem {
public: public:
QGraphicsGridLayoutEngineItem(QGraphicsLayoutItem *item, int row, int columns, int rowSpan = 1, int columnSpan = 1, QGraphicsGridLayoutEngineItem(QGraphicsLayoutItem *item, int row, int columns, int rowSpan = 1, int columnSpan = 1,
Qt::Alignment alignment = nullptr) Qt::Alignment alignment = { })
: QGridLayoutItem(row, columns, rowSpan, columnSpan, alignment), q_layoutItem(item) {} : QGridLayoutItem(row, columns, rowSpan, columnSpan, alignment), q_layoutItem(item) {}
virtual QLayoutPolicy::Policy sizePolicy(Qt::Orientation orientation) const override virtual QLayoutPolicy::Policy sizePolicy(Qt::Orientation orientation) const override

View File

@ -280,7 +280,7 @@ void QGraphicsLinearLayout::insertItem(int index, QGraphicsLayoutItem *item)
Q_ASSERT(item); Q_ASSERT(item);
d->fixIndex(&index); d->fixIndex(&index);
d->engine.insertRow(index, d->orientation); d->engine.insertRow(index, d->orientation);
QGraphicsGridLayoutEngineItem *gridEngineItem = new QGraphicsGridLayoutEngineItem(item, d->gridRow(index), d->gridColumn(index), 1, 1, 0); QGraphicsGridLayoutEngineItem *gridEngineItem = new QGraphicsGridLayoutEngineItem(item, d->gridRow(index), d->gridColumn(index), 1, 1, { });
d->engine.insertItem(gridEngineItem, index); d->engine.insertItem(gridEngineItem, index);
invalidate(); invalidate();
} }

View File

@ -235,7 +235,7 @@ void QGraphicsProxyWidgetPrivate::sendWidgetMouseEvent(QGraphicsSceneHoverEvent
mouseEvent.setPos(event->pos()); mouseEvent.setPos(event->pos());
mouseEvent.setScreenPos(event->screenPos()); mouseEvent.setScreenPos(event->screenPos());
mouseEvent.setButton(Qt::NoButton); mouseEvent.setButton(Qt::NoButton);
mouseEvent.setButtons(0); mouseEvent.setButtons({ });
mouseEvent.setModifiers(event->modifiers()); mouseEvent.setModifiers(event->modifiers());
sendWidgetMouseEvent(&mouseEvent); sendWidgetMouseEvent(&mouseEvent);
event->setAccepted(mouseEvent.isAccepted()); event->setAccepted(mouseEvent.isAccepted());

View File

@ -348,7 +348,7 @@ QGraphicsViewPrivate::QGraphicsViewPrivate()
hasUpdateClip(false), hasUpdateClip(false),
mousePressButton(Qt::NoButton), mousePressButton(Qt::NoButton),
leftIndent(0), topIndent(0), leftIndent(0), topIndent(0),
lastMouseEvent(QEvent::None, QPointF(), QPointF(), QPointF(), Qt::NoButton, 0, 0), lastMouseEvent(QEvent::None, QPointF(), QPointF(), QPointF(), Qt::NoButton, { }, { }),
alignment(Qt::AlignCenter), alignment(Qt::AlignCenter),
transformationAnchor(QGraphicsView::AnchorViewCenter), resizeAnchor(QGraphicsView::NoAnchor), transformationAnchor(QGraphicsView::AnchorViewCenter), resizeAnchor(QGraphicsView::NoAnchor),
viewportUpdateMode(QGraphicsView::MinimalViewportUpdate), viewportUpdateMode(QGraphicsView::MinimalViewportUpdate),
@ -1170,7 +1170,7 @@ void QGraphicsViewPrivate::updateInputMethodSensitivity()
q->viewport()->setAttribute(Qt::WA_InputMethodEnabled, enabled); q->viewport()->setAttribute(Qt::WA_InputMethodEnabled, enabled);
if (!enabled) { if (!enabled) {
q->setInputMethodHints(0); q->setInputMethodHints({ });
return; return;
} }
@ -1183,7 +1183,7 @@ void QGraphicsViewPrivate::updateInputMethodSensitivity()
widget = fw; widget = fw;
q->setInputMethodHints(widget->inputMethodHints()); q->setInputMethodHints(widget->inputMethodHints());
} else { } else {
q->setInputMethodHints(0); q->setInputMethodHints({ });
} }
} }

View File

@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
Use setModel() to set the model. Use setModel() to set the model.
*/ */
QColumnViewGrip::QColumnViewGrip(QWidget *parent) QColumnViewGrip::QColumnViewGrip(QWidget *parent)
: QWidget(*new QColumnViewGripPrivate, parent, 0) : QWidget(*new QColumnViewGripPrivate, parent, { })
{ {
#ifndef QT_NO_CURSOR #ifndef QT_NO_CURSOR
setCursor(Qt::SplitHCursor); setCursor(Qt::SplitHCursor);

View File

@ -73,7 +73,7 @@ public:
int moveGrip(int offset); int moveGrip(int offset);
protected: protected:
QColumnViewGrip(QColumnViewGripPrivate &, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); QColumnViewGrip(QColumnViewGripPrivate &, QWidget *parent = nullptr, Qt::WindowFlags f = { });
void paintEvent(QPaintEvent *event) override; void paintEvent(QPaintEvent *event) override;
void mouseDoubleClickEvent(QMouseEvent *event) override; void mouseDoubleClickEvent(QMouseEvent *event) override;
void mouseMoveEvent(QMouseEvent *event) override; void mouseMoveEvent(QMouseEvent *event) override;

View File

@ -1696,7 +1696,7 @@ Qt::Orientations QFormLayout::expandingDirections() const
QFormLayoutPrivate *e = const_cast<QFormLayoutPrivate *>(d); QFormLayoutPrivate *e = const_cast<QFormLayoutPrivate *>(d);
e->updateSizes(); e->updateSizes();
Qt::Orientations o = 0; Qt::Orientations o;
if (e->expandHorizontal) if (e->expandHorizontal)
o = Qt::Horizontal; o = Qt::Horizontal;
if (e->expandVertical) if (e->expandVertical)
@ -2326,7 +2326,7 @@ void QFormLayout::resetRowWrapPolicy()
void QFormLayout::resetFormAlignment() void QFormLayout::resetFormAlignment()
{ {
Q_D(QFormLayout); Q_D(QFormLayout);
d->formAlignment = 0; d->formAlignment = { };
} }
/*! /*!
@ -2336,7 +2336,7 @@ void QFormLayout::resetFormAlignment()
void QFormLayout::resetLabelAlignment() void QFormLayout::resetLabelAlignment()
{ {
Q_D(QFormLayout); Q_D(QFormLayout);
d->labelAlignment = 0; d->labelAlignment = { };
} }
#if 0 #if 0

View File

@ -111,8 +111,7 @@ class QPinchGesturePrivate : public QGesturePrivate
public: public:
QPinchGesturePrivate() QPinchGesturePrivate()
: totalChangeFlags(nullptr), changeFlags(nullptr), : totalScaleFactor(1), lastScaleFactor(1), scaleFactor(1),
totalScaleFactor(1), lastScaleFactor(1), scaleFactor(1),
totalRotationAngle(0), lastRotationAngle(0), rotationAngle(0), totalRotationAngle(0), lastRotationAngle(0), rotationAngle(0),
isNewSequence(true) isNewSequence(true)
{ {

View File

@ -1337,7 +1337,7 @@ QRect QLayout::alignmentRect(const QRect &r) const
returned by QLayoutItems that have an alignment. returned by QLayoutItems that have an alignment.
*/ */
QLayout *that = const_cast<QLayout *>(this); QLayout *that = const_cast<QLayout *>(this);
that->setAlignment(0); that->setAlignment({ });
QSize ms = that->maximumSize(); QSize ms = that->maximumSize();
that->setAlignment(a); that->setAlignment(a);

View File

@ -105,9 +105,9 @@ Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidgetItem *i);
Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidget *w); Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidget *w);
Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QSize &sizeHint, Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QSize &sizeHint,
const QSize &minSize, const QSize &maxSize, const QSize &minSize, const QSize &maxSize,
const QSizePolicy &sizePolicy, Qt::Alignment align = nullptr); const QSizePolicy &sizePolicy, Qt::Alignment align = { });
Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment align = nullptr); Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment align = { });
Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidget *w, Qt::Alignment align = nullptr); Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidget *w, Qt::Alignment align = { });
Q_WIDGETS_EXPORT int qSmartSpacing(const QLayout *layout, QStyle::PixelMetric pm); Q_WIDGETS_EXPORT int qSmartSpacing(const QLayout *layout, QStyle::PixelMetric pm);

View File

@ -183,7 +183,7 @@ QGestureRecognizer::Result QPinchGestureRecognizer::recognize(QGesture *state,
} }
case QEvent::TouchUpdate: { case QEvent::TouchUpdate: {
const QTouchEvent *ev = static_cast<const QTouchEvent *>(event); const QTouchEvent *ev = static_cast<const QTouchEvent *>(event);
d->changeFlags = 0; d->changeFlags = { };
if (ev->touchPoints().size() == 2) { if (ev->touchPoints().size() == 2) {
QTouchEvent::TouchPoint p1 = ev->touchPoints().at(0); QTouchEvent::TouchPoint p1 = ev->touchPoints().at(0);
QTouchEvent::TouchPoint p2 = ev->touchPoints().at(1); QTouchEvent::TouchPoint p2 = ev->touchPoints().at(1);
@ -256,7 +256,7 @@ void QPinchGestureRecognizer::reset(QGesture *state)
QPinchGesture *pinch = static_cast<QPinchGesture *>(state); QPinchGesture *pinch = static_cast<QPinchGesture *>(state);
QPinchGesturePrivate *d = pinch->d_func(); QPinchGesturePrivate *d = pinch->d_func();
d->totalChangeFlags = d->changeFlags = 0; d->totalChangeFlags = d->changeFlags = { };
d->startCenterPoint = d->lastCenterPoint = d->centerPoint = QPointF(); d->startCenterPoint = d->lastCenterPoint = d->centerPoint = QPointF();
d->totalScaleFactor = d->lastScaleFactor = d->scaleFactor = 1; d->totalScaleFactor = d->lastScaleFactor = d->scaleFactor = 1;

View File

@ -396,7 +396,7 @@ void QWidget::setAutoFillBackground(bool enabled)
If it is \nullptr (the default), the new widget will be a window. If it is \nullptr (the default), the new widget will be a window.
If not, it will be a child of \e parent, and be constrained by If not, it will be a child of \e parent, and be constrained by
\e parent's geometry (unless you specify Qt::Window as window flag). \e parent's geometry (unless you specify Qt::Window as window flag).
\li \c{Qt::WindowFlags f = 0} (where available) sets the window flags; \li \c{Qt::WindowFlags f = { }} (where available) sets the window flags;
the default is suitable for almost all widgets, but to get, for the default is suitable for almost all widgets, but to get, for
example, a window without a window system frame, you must use example, a window without a window system frame, you must use
special flags. special flags.
@ -1595,7 +1595,7 @@ void QWidgetPrivate::createTLExtra()
x->basew = x->baseh = 0; x->basew = x->baseh = 0;
x->frameStrut.setCoords(0, 0, 0, 0); x->frameStrut.setCoords(0, 0, 0, 0);
x->normalGeometry = QRect(0,0,-1,-1); x->normalGeometry = QRect(0,0,-1,-1);
x->savedFlags = 0; x->savedFlags = { };
x->opacity = 255; x->opacity = 255;
x->posIncludesFrame = 0; x->posIncludesFrame = 0;
x->sizeAdjusted = false; x->sizeAdjusted = false;

View File

@ -592,7 +592,7 @@ public:
Q_Q(QWidget); Q_Q(QWidget);
return q->testAttribute(Qt::WA_AlwaysStackOnTop) return q->testAttribute(Qt::WA_AlwaysStackOnTop)
? QPlatformTextureList::StacksOnTop ? QPlatformTextureList::StacksOnTop
: QPlatformTextureList::Flags(nullptr); : QPlatformTextureList::Flags();
} }
virtual QImage grabFramebuffer() { return QImage(); } virtual QImage grabFramebuffer() { return QImage(); }
virtual void beginBackingStorePainting() { } virtual void beginBackingStorePainting() { }

View File

@ -64,7 +64,7 @@ class Q_WIDGETS_EXPORT QWindowContainer : public QWidget
Q_DECLARE_PRIVATE(QWindowContainer) Q_DECLARE_PRIVATE(QWindowContainer)
public: public:
explicit QWindowContainer(QWindow *embeddedWindow, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); explicit QWindowContainer(QWindow *embeddedWindow, QWidget *parent = nullptr, Qt::WindowFlags f = { });
~QWindowContainer(); ~QWindowContainer();
QWindow *containedWindow() const; QWindow *containedWindow() const;

View File

@ -479,7 +479,7 @@ struct QStyleSheetGeometryData : public QSharedData
struct QStyleSheetPositionData : public QSharedData struct QStyleSheetPositionData : public QSharedData
{ {
QStyleSheetPositionData(int l, int t, int r, int b, Origin o, Qt::Alignment p, QCss::PositionMode m, Qt::Alignment a = 0) QStyleSheetPositionData(int l, int t, int r, int b, Origin o, Qt::Alignment p, QCss::PositionMode m, Qt::Alignment a = { })
: left(l), top(t), bottom(b), right(r), origin(o), position(p), mode(m), textAlignment(a) { } : left(l), top(t), bottom(b), right(r), origin(o), position(p), mode(m), textAlignment(a) { }
int left, top, bottom, right; int left, top, bottom, right;
@ -922,9 +922,9 @@ QRenderRule::QRenderRule(const QVector<Declaration> &declarations, const QObject
int left = 0, top = 0, right = 0, bottom = 0; int left = 0, top = 0, right = 0, bottom = 0;
Origin origin = Origin_Unknown; Origin origin = Origin_Unknown;
Qt::Alignment position = 0; Qt::Alignment position;
QCss::PositionMode mode = PositionMode_Unknown; QCss::PositionMode mode = PositionMode_Unknown;
Qt::Alignment textAlignment = 0; Qt::Alignment textAlignment;
if (v.extractPosition(&left, &top, &right, &bottom, &origin, &position, &mode, &textAlignment)) if (v.extractPosition(&left, &top, &right, &bottom, &origin, &position, &mode, &textAlignment))
p = new QStyleSheetPositionData(left, top, right, bottom, origin, position, mode, textAlignment); p = new QStyleSheetPositionData(left, top, right, bottom, origin, position, mode, textAlignment);
@ -2231,7 +2231,7 @@ static Qt::Alignment defaultPosition(int pe)
return Qt::AlignRight | Qt::AlignVCenter; return Qt::AlignRight | Qt::AlignVCenter;
default: default:
return 0; return { };
} }
} }
@ -3341,7 +3341,7 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC
layout = subControlLayout(QLatin1String("mNX")); layout = subControlLayout(QLatin1String("mNX"));
QStyleOptionComplex optCopy(*opt); QStyleOptionComplex optCopy(*opt);
optCopy.subControls = 0; optCopy.subControls = { };
for (int i = 0; i < layout.count(); i++) { for (int i = 0; i < layout.count(); i++) {
int layoutButton = layout[i].toInt(); int layoutButton = layout[i].toInt();
if (layoutButton < PseudoElement_MdiCloseButton if (layoutButton < PseudoElement_MdiCloseButton
@ -4242,7 +4242,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
} }
r = subRule.contentsRect(r); r = subRule.contentsRect(r);
Qt::Alignment alignment = 0; Qt::Alignment alignment;
if (subRule.hasPosition()) if (subRule.hasPosition())
alignment = subRule.position()->textAlignment; alignment = subRule.position()->textAlignment;
if (alignment == 0) if (alignment == 0)

View File

@ -468,7 +468,7 @@ void QAbstractButtonPrivate::emitToggled(bool checked)
Constructs an abstract button with a \a parent. Constructs an abstract button with a \a parent.
*/ */
QAbstractButton::QAbstractButton(QWidget *parent) QAbstractButton::QAbstractButton(QWidget *parent)
: QWidget(*new QAbstractButtonPrivate, parent, 0) : QWidget(*new QAbstractButtonPrivate, parent, { })
{ {
Q_D(QAbstractButton); Q_D(QAbstractButton);
d->init(); d->init();
@ -490,7 +490,7 @@ QAbstractButton::QAbstractButton(QWidget *parent)
/*! \internal /*! \internal
*/ */
QAbstractButton::QAbstractButton(QAbstractButtonPrivate &dd, QWidget *parent) QAbstractButton::QAbstractButton(QAbstractButtonPrivate &dd, QWidget *parent)
: QWidget(dd, parent, 0) : QWidget(dd, parent, { })
{ {
Q_D(QAbstractButton); Q_D(QAbstractButton);
d->init(); d->init();

View File

@ -273,13 +273,13 @@ void QAbstractSliderPrivate::setSteps(int single, int page)
\l value of 0. \l value of 0.
*/ */
QAbstractSlider::QAbstractSlider(QWidget *parent) QAbstractSlider::QAbstractSlider(QWidget *parent)
:QWidget(*new QAbstractSliderPrivate, parent, 0) :QWidget(*new QAbstractSliderPrivate, parent, { })
{ {
} }
/*! \internal */ /*! \internal */
QAbstractSlider::QAbstractSlider(QAbstractSliderPrivate &dd, QWidget *parent) QAbstractSlider::QAbstractSlider(QAbstractSliderPrivate &dd, QWidget *parent)
:QWidget(dd, parent, 0) :QWidget(dd, parent, { })
{ {
} }

View File

@ -147,7 +147,7 @@ QT_BEGIN_NAMESPACE
*/ */
QAbstractSpinBox::QAbstractSpinBox(QWidget *parent) QAbstractSpinBox::QAbstractSpinBox(QWidget *parent)
: QWidget(*new QAbstractSpinBoxPrivate, parent, 0) : QWidget(*new QAbstractSpinBoxPrivate, parent, { })
{ {
Q_D(QAbstractSpinBox); Q_D(QAbstractSpinBox);
d->init(); d->init();
@ -157,7 +157,7 @@ QAbstractSpinBox::QAbstractSpinBox(QWidget *parent)
\internal \internal
*/ */
QAbstractSpinBox::QAbstractSpinBox(QAbstractSpinBoxPrivate &dd, QWidget *parent) QAbstractSpinBox::QAbstractSpinBox(QAbstractSpinBoxPrivate &dd, QWidget *parent)
: QWidget(dd, parent, 0) : QWidget(dd, parent, { })
{ {
Q_D(QAbstractSpinBox); Q_D(QAbstractSpinBox);
d->init(); d->init();

View File

@ -1207,9 +1207,9 @@ Qt::ItemFlags QCalendarModel::flags(const QModelIndex &index) const
if (!date.isValid()) if (!date.isValid())
return QAbstractTableModel::flags(index); return QAbstractTableModel::flags(index);
if (date < m_minimumDate) if (date < m_minimumDate)
return 0; return { };
if (date > m_maximumDate) if (date > m_maximumDate)
return 0; return { };
return QAbstractTableModel::flags(index); return QAbstractTableModel::flags(index);
} }
@ -2135,7 +2135,7 @@ void QCalendarWidgetPrivate::_q_editingFinished()
\sa setCurrentPage() \sa setCurrentPage()
*/ */
QCalendarWidget::QCalendarWidget(QWidget *parent) QCalendarWidget::QCalendarWidget(QWidget *parent)
: QWidget(*new QCalendarWidgetPrivate, parent, 0) : QWidget(*new QCalendarWidgetPrivate, parent, { })
{ {
Q_D(QCalendarWidget); Q_D(QCalendarWidget);

View File

@ -931,7 +931,7 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
model QStandardItemModel. model QStandardItemModel.
*/ */
QComboBox::QComboBox(QWidget *parent) QComboBox::QComboBox(QWidget *parent)
: QWidget(*new QComboBoxPrivate(), parent, 0) : QWidget(*new QComboBoxPrivate(), parent, { })
{ {
Q_D(QComboBox); Q_D(QComboBox);
d->init(); d->init();
@ -941,7 +941,7 @@ QComboBox::QComboBox(QWidget *parent)
\internal \internal
*/ */
QComboBox::QComboBox(QComboBoxPrivate &dd, QWidget *parent) QComboBox::QComboBox(QComboBoxPrivate &dd, QWidget *parent)
: QWidget(dd, parent, 0) : QWidget(dd, parent, { })
{ {
Q_D(QComboBox); Q_D(QComboBox);
d->init(); d->init();

Some files were not shown because too many files have changed in this diff Show More