yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move decorations member to d-ptr class KDecorationFactoryPrivate

Browse source
This commit is contained in:
Martin Gräßlin 2013-08-24 11:04:29 +02:00
parent 9aeebb179f
commit dead386941
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libkdecorations/kdecorationfactory.cpp
View file

@ -34,6 +34,7 @@ public:
closeButtonCorner = (Qt::Corner)0; closeButtonCorner = (Qt::Corner)0;
} }
Qt::Corner closeButtonCorner; Qt::Corner closeButtonCorner;
QList< KDecoration* > decorations;
}; };
KDecorationFactory::KDecorationFactory(QObject *parent) KDecorationFactory::KDecorationFactory(QObject *parent)
@ -45,7 +46,7 @@ KDecorationFactory::KDecorationFactory(QObject *parent)
KDecorationFactory::~KDecorationFactory() KDecorationFactory::~KDecorationFactory()
{ {
delete d; delete d;
assert(_decorations.count() == 0); assert(d->decorations.count() == 0);
} }
void KDecorationFactory::checkRequirements(KDecorationProvides*) void KDecorationFactory::checkRequirements(KDecorationProvides*)
@ -59,7 +60,7 @@ QList< KDecorationDefines::BorderSize > KDecorationFactory::borderSizes() const
bool KDecorationFactory::exists(const KDecoration* deco) const bool KDecorationFactory::exists(const KDecoration* deco) const
{ {
return _decorations.contains(const_cast< KDecoration* >(deco)); return d->decorations.contains(const_cast< KDecoration* >(deco));
} }
Qt::Corner KDecorationFactory::closeButtonCorner() Qt::Corner KDecorationFactory::closeButtonCorner()
@ -76,12 +77,12 @@ void KDecorationFactory::setCloseButtonCorner(Qt::Corner cnr)
void KDecorationFactory::addDecoration(KDecoration* deco) void KDecorationFactory::addDecoration(KDecoration* deco)
{ {
_decorations.append(deco); d->decorations.append(deco);
} }
void KDecorationFactory::removeDecoration(KDecoration* deco) void KDecorationFactory::removeDecoration(KDecoration* deco)
{ {
_decorations.removeAll(deco); d->decorations.removeAll(deco);
} }
NET::WindowType KDecorationFactory::windowType(unsigned long supported_types, KDecorationBridge* bridge) const NET::WindowType KDecorationFactory::windowType(unsigned long supported_types, KDecorationBridge* bridge) const

1
libkdecorations/kdecorationfactory.h
View file

@ -120,7 +120,6 @@ protected:
*/ */
NET::WindowType windowType(unsigned long supported_types, KDecorationBridge* bridge) const; NET::WindowType windowType(unsigned long supported_types, KDecorationBridge* bridge) const;
private: private:
QList< KDecoration* > _decorations;
KDecorationFactoryPrivate* d; KDecorationFactoryPrivate* d;
}; };