From 79d36fe4e9a04ba333d02cd93b64e44660360055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Thu, 10 Oct 2013 09:38:25 +0200
Subject: [PATCH] [kdecorations] Drop
 KCommonDecoration::defaultButtons(Left|Right)

Just forwards to static method in KDecorationOptions, thus any user can
also just use this static method directly.
---
 libkdecorations/kcommondecoration.cpp | 14 ++------------
 libkdecorations/kcommondecoration.h   | 12 ------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/libkdecorations/kcommondecoration.cpp b/libkdecorations/kcommondecoration.cpp
index 52585f67af..e64de12553 100644
--- a/libkdecorations/kcommondecoration.cpp
+++ b/libkdecorations/kcommondecoration.cpp
@@ -99,16 +99,6 @@ KCommonDecoration::~KCommonDecoration()
 {
 }
 
-QString KCommonDecoration::defaultButtonsLeft() const
-{
-    return KDecorationOptions::defaultTitleButtonsLeft();
-}
-
-QString KCommonDecoration::defaultButtonsRight() const
-{
-    return KDecorationOptions::defaultTitleButtonsRight();
-}
-
 bool KCommonDecoration::decorationBehaviour(DecorationBehaviour behaviour) const
 {
     switch(behaviour) {
@@ -323,10 +313,10 @@ void KCommonDecoration::resetLayout()
     }
 
     addButtons(d->buttonsLeft,
-               options()->customButtonPositions() ? options()->titleButtonsLeft() : defaultButtonsLeft(),
+               options()->customButtonPositions() ? options()->titleButtonsLeft() : KDecorationOptions::defaultTitleButtonsLeft(),
                true);
     addButtons(d->buttonsRight,
-               options()->customButtonPositions() ? options()->titleButtonsRight() : defaultButtonsRight(),
+               options()->customButtonPositions() ? options()->titleButtonsRight() : KDecorationOptions::defaultTitleButtonsRight(),
                false);
 
     updateLayout();
diff --git a/libkdecorations/kcommondecoration.h b/libkdecorations/kcommondecoration.h
index 199e71f59e..2e0aad87ec 100644
--- a/libkdecorations/kcommondecoration.h
+++ b/libkdecorations/kcommondecoration.h
@@ -145,18 +145,6 @@ public:
      * The name of the decoration used in the decoration preview.
      */
     virtual QString visibleName() const = 0;
-    /**
-     * The default title button order on the left.
-     * @see KDecoration::titleButtonsLeft()
-     * @see KDecoration::titleButtonsRight()
-     */
-    virtual QString defaultButtonsLeft() const;
-    /**
-     * The default title button order on the left.
-     * @see KDecoration::titleButtonsLeft()
-     * @see KDecoration::titleButtonsRight()
-     */
-    virtual QString defaultButtonsRight() const;
 
     /**
      * This controls whether some specific behaviour should be enabled or not.