From: Ivailo Monev Date: Mon, 13 Jun 2022 23:55:43 +0000 (+0300) Subject: call QIconPrivate and QPixmapIconEngine constructors X-Git-Tag: 4.12.0~512 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f9bdcc1731f768e3634070ad776ac79a8bc29998;p=kde%2FKatie.git call QIconPrivate and QPixmapIconEngine constructors Signed-off-by: Ivailo Monev --- diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index 64269121a..aa55a0e7f 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -660,7 +660,7 @@ void QIcon::detach() { if (d) { if (d->ref != 1) { - QIconPrivate *x = new QIconPrivate; + QIconPrivate *x = new QIconPrivate(); x->engine = d->engine->clone(); if (!d->ref.deref()) delete d; @@ -684,8 +684,8 @@ void QIcon::addPixmap(const QPixmap &pixmap, Mode mode, State state) if (pixmap.isNull()) return; if (!d) { - d = new QIconPrivate; - d->engine = new QPixmapIconEngine; + d = new QIconPrivate(); + d->engine = new QPixmapIconEngine(); } else { detach(); } @@ -728,7 +728,7 @@ void QIcon::addFile(const QString &fileName, const QSize &size, Mode mode, State if (!suffix.isEmpty()) { if (QIconEnginePlugin *plugin = qobject_cast(iconloader()->instance(suffix))) { if (QIconEngine *engine = plugin->create(fileName)) { - d = new QIconPrivate; + d = new QIconPrivate(); d->engine = engine; } } @@ -736,8 +736,8 @@ void QIcon::addFile(const QString &fileName, const QSize &size, Mode mode, State #endif // ...then fall back to the default engine if (!d) { - d = new QIconPrivate; - d->engine = new QPixmapIconEngine; + d = new QIconPrivate(); + d->engine = new QPixmapIconEngine(); } } else { detach(); @@ -945,19 +945,19 @@ QDataStream &operator>>(QDataStream &s, QIcon &icon) QString key; s >> key; if (key == QLatin1String("QPixmapIconEngine")) { - icon.d = new QIconPrivate; - QIconEngine *engine = new QPixmapIconEngine; + icon.d = new QIconPrivate(); + QIconEngine *engine = new QPixmapIconEngine(); icon.d->engine = engine; engine->read(s); } else if (key == QLatin1String("QIconLoaderEngine")) { - icon.d = new QIconPrivate; + icon.d = new QIconPrivate(); QIconEngine *engine = new QIconLoaderEngine(); icon.d->engine = engine; engine->read(s); #if !defined (QT_NO_LIBRARY) } else if (QIconEnginePlugin *plugin = qobject_cast(iconloader()->instance(key))) { if (QIconEngine *engine= plugin->create()) { - icon.d = new QIconPrivate; + icon.d = new QIconPrivate(); icon.d->engine = engine; engine->read(s); }