From fcfcc795e6971355ec4c4e45dcd6f23586bc1d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Sat, 24 Aug 2013 11:07:04 +0200
Subject: [PATCH] Change KDecorationFactory::options()

* no longer inlined
* forwards to KDecorationOptions::self()
* deprecated
* protected
---
 libkdecorations/kdecorationfactory.cpp |  5 +++++
 libkdecorations/kdecorationfactory.h   | 17 +++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/libkdecorations/kdecorationfactory.cpp b/libkdecorations/kdecorationfactory.cpp
index 7d3637caf7..d470e8314e 100644
--- a/libkdecorations/kdecorationfactory.cpp
+++ b/libkdecorations/kdecorationfactory.cpp
@@ -89,3 +89,8 @@ NET::WindowType KDecorationFactory::windowType(unsigned long supported_types, KD
 {
     return bridge->windowType(supported_types);
 }
+
+const KDecorationOptions* KDecorationFactory::options()
+{
+    return KDecorationOptions::self();
+}
diff --git a/libkdecorations/kdecorationfactory.h b/libkdecorations/kdecorationfactory.h
index 00a7cbabb6..129bd67c45 100644
--- a/libkdecorations/kdecorationfactory.h
+++ b/libkdecorations/kdecorationfactory.h
@@ -62,11 +62,6 @@ public:
     virtual bool supports(Ability ability) const = 0;
 
     virtual void checkRequirements(KDecorationProvides* provides);
-    /**
-     * Returns the KDecorationOptions object, which is used to access
-     * configuration settings for the decoration.
-     */
-    const KDecorationOptions* options(); // convenience
     /**
      * Returns true if the given decoration object still exists. This is necessary
      * e.g. when calling KDecoration::showWindowMenu(), which may cause the decoration
@@ -119,15 +114,17 @@ protected:
      * is the one passed to createDecoration().
      */
     NET::WindowType windowType(unsigned long supported_types, KDecorationBridge* bridge) const;
+    /**
+     * Returns the KDecorationOptions object, which is used to access
+     * configuration settings for the decoration.
+     *
+     * @deprecated use KDecorationOptions::self()
+     */
+    const KDecorationOptions* options(); // convenience
 private:
     KDecorationFactoryPrivate* d;
 };
 
-inline const KDecorationOptions* KDecorationFactory::options()
-{
-    return KDecoration::options();
-}
-
 /** @} */
 
 #endif