Change KDecorationFactory::options()

* no longer inlined
* forwards to KDecorationOptions::self()
* deprecated
* protected

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();
+}

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