make reset abstract, add forgotten virtual...
svn path=/trunk/kdebase/kwin/; revision=397517icc-effect-5.14.5
parent
af8ea39ba9
commit
352beb9070
|
@ -744,10 +744,6 @@ ButtonType KCommonDecorationButton::type()
|
||||||
return m_type;;
|
return m_type;;
|
||||||
}
|
}
|
||||||
|
|
||||||
void KCommonDecorationButton::reset(unsigned long)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void KCommonDecorationButton::setRealizeButtons(int btns)
|
void KCommonDecorationButton::setRealizeButtons(int btns)
|
||||||
{
|
{
|
||||||
m_realizeButtons = btns;
|
m_realizeButtons = btns;
|
||||||
|
@ -755,7 +751,7 @@ void KCommonDecorationButton::setRealizeButtons(int btns)
|
||||||
|
|
||||||
void KCommonDecorationButton::setSize(const QSize &s)
|
void KCommonDecorationButton::setSize(const QSize &s)
|
||||||
{
|
{
|
||||||
if (s != size() ) {
|
if (!m_size.isValid() || s != size() ) {
|
||||||
m_size = s;
|
m_size = s;
|
||||||
|
|
||||||
setFixedSize(m_size);
|
setFixedSize(m_size);
|
||||||
|
|
|
@ -278,7 +278,7 @@ class KWIN_EXPORT KCommonDecorationButton : public QButton
|
||||||
|
|
||||||
public:
|
public:
|
||||||
KCommonDecorationButton(ButtonType type, KCommonDecoration *parent, const char *name);
|
KCommonDecorationButton(ButtonType type, KCommonDecoration *parent, const char *name);
|
||||||
~KCommonDecorationButton();
|
virtual ~KCommonDecorationButton();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* These flags specify what has changed, e.g. the reason for a reset().
|
* These flags specify what has changed, e.g. the reason for a reset().
|
||||||
|
@ -294,7 +294,7 @@ class KWIN_EXPORT KCommonDecorationButton : public QButton
|
||||||
/**
|
/**
|
||||||
* Initialize the button after size change etc.
|
* Initialize the button after size change etc.
|
||||||
*/
|
*/
|
||||||
virtual void reset(unsigned long changed);
|
virtual void reset(unsigned long changed) = 0;
|
||||||
/**
|
/**
|
||||||
* @returns the KCommonDecoration the button belongs to.
|
* @returns the KCommonDecoration the button belongs to.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue