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

Revert r741298 - this time the right fix for -Woverloaded-virtual is fixing

Browse source 
the base class.
CCMAIL: montel@kde.org


svn path=/trunk/KDE/kdebase/workspace/; revision=741860
This commit is contained in:
Luboš Luňák 2007-11-26 16:00:21 +00:00
parent a683143148
commit 74b89e491d
12 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clients/kde2/kde2.cpp
View file

@ -754,12 +754,12 @@ QString KDE2Client::visibleName() const
return i18n("KDE 2");
}
QString KDE2Client::defaultButtonsLeft()
QString KDE2Client::defaultButtonsLeft() const
{
return "MS";
}
QString KDE2Client::defaultButtonsRight()
QString KDE2Client::defaultButtonsRight() const
{
return "HIAX";
}

4
clients/kde2/kde2.h
View file

@ -73,8 +73,8 @@ class KDE2Client : public KCommonDecoration
~KDE2Client() {;}
virtual QString visibleName() const;
virtual QString defaultButtonsLeft();
virtual QString defaultButtonsRight();
virtual QString defaultButtonsLeft() const;
virtual QString defaultButtonsRight() const;
virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
virtual KCommonDecorationButton *createButton(ButtonType type);

4
clients/laptop/laptopclient.cpp
View file

@ -351,12 +351,12 @@ QString LaptopClient::visibleName() const
return i18n("Laptop");
}
QString LaptopClient::defaultButtonsLeft()
QString LaptopClient::defaultButtonsLeft() const
{
return "X";
}
QString LaptopClient::defaultButtonsRight()
QString LaptopClient::defaultButtonsRight() const
{
return "HSIA";
}

4
clients/laptop/laptopclient.h
View file

@ -36,8 +36,8 @@ public:
~LaptopClient();
virtual QString visibleName() const;
virtual QString defaultButtonsLeft();
virtual QString defaultButtonsRight();
virtual QString defaultButtonsLeft() const;
virtual QString defaultButtonsRight() const;
virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
virtual KCommonDecorationButton *createButton(ButtonType type);

4
clients/modernsystem/modernsys.cpp
View file

@ -455,12 +455,12 @@ QString ModernSys::visibleName() const
return i18n("Modern System");
}
QString ModernSys::defaultButtonsLeft()
QString ModernSys::defaultButtonsLeft() const
{
return "X";
}
QString ModernSys::defaultButtonsRight()
QString ModernSys::defaultButtonsRight() const
{
return "HSIA";
}

4
clients/modernsystem/modernsys.h
View file

@ -29,8 +29,8 @@ public:
~ModernSys(){;}
virtual QString visibleName() const;
virtual QString defaultButtonsLeft();
virtual QString defaultButtonsRight();
virtual QString defaultButtonsLeft() const;
virtual QString defaultButtonsRight() const;
virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
virtual KCommonDecorationButton *createButton(ButtonType type);

4
clients/quartz/quartz.cpp
View file

@ -537,12 +537,12 @@ QString QuartzClient::visibleName() const
return i18n("Quartz");
}
QString QuartzClient::defaultButtonsLeft()
QString QuartzClient::defaultButtonsLeft() const
{
return "M";
}
QString QuartzClient::defaultButtonsRight()
QString QuartzClient::defaultButtonsRight() const
{
return "HIAX";
}

4
clients/quartz/quartz.h
View file

@ -69,8 +69,8 @@ class QuartzClient : public KCommonDecoration
~QuartzClient() {;}
virtual QString visibleName() const;
virtual QString defaultButtonsLeft();
virtual QString defaultButtonsRight();
virtual QString defaultButtonsLeft() const;
virtual QString defaultButtonsRight() const;
virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
virtual KCommonDecorationButton *createButton(ButtonType type);

4
clients/web/Web.cpp
View file

@ -55,12 +55,12 @@ QString WebClient::visibleName() const
return i18n("Web");
}
QString WebClient::defaultButtonsLeft()
QString WebClient::defaultButtonsLeft() const
{
return "S";
}
QString WebClient::defaultButtonsRight()
QString WebClient::defaultButtonsRight() const
{
return "HIAX";
}

4
clients/web/Web.h
View file

@ -39,8 +39,8 @@ namespace Web
~WebClient();
virtual QString visibleName() const;
virtual QString defaultButtonsLeft();
virtual QString defaultButtonsRight();
virtual QString defaultButtonsLeft() const;
virtual QString defaultButtonsRight() const;
virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
virtual KCommonDecorationButton *createButton(ButtonType type);

4
lib/kcommondecoration.cpp
View file

@ -58,12 +58,12 @@ KCommonDecoration::~KCommonDecoration()
delete m_previewWidget;
}
QString KCommonDecoration::defaultButtonsLeft()
QString KCommonDecoration::defaultButtonsLeft() const
{
return KDecorationOptions::defaultTitleButtonsLeft();
}
QString KCommonDecoration::defaultButtonsRight()
QString KCommonDecoration::defaultButtonsRight() const
{
return KDecorationOptions::defaultTitleButtonsRight();
}

4
lib/kcommondecoration.h
View file

@ -138,13 +138,13 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration
* @see KDecoration::titleButtonsLeft()
* @see KDecoration::titleButtonsRight()
*/
virtual QString defaultButtonsLeft();
virtual QString defaultButtonsLeft() const;
/**
* The default title button order on the left.
* @see KDecoration::titleButtonsLeft()
* @see KDecoration::titleButtonsRight()
*/
virtual QString defaultButtonsRight();
virtual QString defaultButtonsRight() const;
/**
* This controls whether some specific behaviour should be enabled or not.