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

call QIconPrivate and QPixmapIconEngine constructors

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-06-14 02:55:43 +03:00
parent 3bb7f2db82
commit f9bdcc1731
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/gui/image/qicon.cpp
View file

@ -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<QIconEnginePlugin*>(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<QIconEnginePlugin*>(iconloader()->instance(key))) {
if (QIconEngine *engine= plugin->create()) {
icon.d = new QIconPrivate;
icon.d = new QIconPrivate();
icon.d->engine = engine;
engine->read(s);
}