summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qicon.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/image/qicon.cpp')
-rw-r--r--src/gui/image/qicon.cpp18
1 files changed, 3 insertions, 15 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index e24087c3c5..7cf749fabc 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -116,7 +116,7 @@ static void qt_cleanup_icon_cache()
}
QIconPrivate::QIconPrivate()
- : engine(0), ref(1),
+ : engine(0),
serialNum(serialNumCounter.fetchAndAddRelaxed(1)),
detach_no(0),
engine_version(2),
@@ -536,10 +536,7 @@ QIcon::QIcon(const QPixmap &pixmap)
*/
QIcon::QIcon(const QIcon &other)
:d(other.d)
-{
- if (d)
- d->ref.ref();
-}
+{}
/*!
Constructs an icon from the file with the given \a fileName. The
@@ -593,10 +590,7 @@ QIcon::QIcon(QIconEngineV2 *engine)
Destroys the icon.
*/
QIcon::~QIcon()
-{
- if (d && !d->ref.deref())
- delete d;
-}
+{}
/*!
Assigns the \a other icon to this icon and returns a reference to
@@ -604,10 +598,6 @@ QIcon::~QIcon()
*/
QIcon &QIcon::operator=(const QIcon &other)
{
- if (other.d)
- other.d->ref.ref();
- if (d && !d->ref.deref())
- delete d;
d = other.d;
return *this;
}
@@ -775,8 +765,6 @@ void QIcon::detach()
x->v1RefCount->ref();
}
x->engine_version = d->engine_version;
- if (!d->ref.deref())
- delete d;
d = x;
}
++d->detach_no;