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

remove unused pmKey function

Browse source 
upstream commits:
62c8144782

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-01-13 16:50:53 +02:00
parent 97249447e9
commit b2b09ad769
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
View file

@ -87,11 +87,6 @@ public:
QAtomicInt QSvgIconEnginePrivate::lastSerialNum;
static inline int pmKey(const QSize &size, QIcon::Mode mode, QIcon::State state)
{
return ((((((size.width()<<11)|size.height())<<11)|mode)<<4)|state);
}
QSvgIconEngine::QSvgIconEngine()
: d(new QSvgIconEnginePrivate)
{
@ -310,10 +305,6 @@ bool QSvgIconEngine::read(QDataStream &in)
bool QSvgIconEngine::write(QDataStream &out) const
{
if (out.version() >= QDataStream::Qt_4_4) {
int isCompressed = 0;
#ifndef QT_NO_COMPRESS
isCompressed = 1;
#endif
QHash<int, QByteArray> svgBuffers;
if (d->svgBuffers)
svgBuffers = *d->svgBuffers;
@ -327,7 +318,11 @@ bool QSvgIconEngine::write(QDataStream &out) const
#endif
svgBuffers.insert(key, buf);
}
out << d->svgFiles << isCompressed << svgBuffers;
#ifndef QT_NO_COMPRESS
out << d->svgFiles << 1 << svgBuffers;
#else
out << d->svgFiles << 0 << svgBuffers;
#endif
if (d->addedPixmaps)
out << (int)1 << *d->addedPixmaps;
else