diff --git a/libkdecorations/CMakeLists.txt b/libkdecorations/CMakeLists.txt index aae3c8bfc1..4fa03bc1de 100644 --- a/libkdecorations/CMakeLists.txt +++ b/libkdecorations/CMakeLists.txt @@ -24,5 +24,4 @@ install( FILES kdecoration.h kdecorationfactory.h kcommondecoration.h - kdecorationbridge.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel ) diff --git a/libkdecorations/kdecoration.cpp b/libkdecorations/kdecoration.cpp index 7ccbdb6c1b..780842e75b 100644 --- a/libkdecorations/kdecoration.cpp +++ b/libkdecorations/kdecoration.cpp @@ -658,4 +658,13 @@ void KDecorationOptions::setTitleButtonsRight(const QString& b) d->title_buttons_right = b; } +extern "C" { + +int decoration_bridge_version() +{ + return KWIN_DECORATION_BRIDGE_API_VERSION; +} + +} + #include "kdecoration.moc" diff --git a/libkdecorations/kdecoration.h b/libkdecorations/kdecoration.h index 15d233e162..0959e74a14 100644 --- a/libkdecorations/kdecoration.h +++ b/libkdecorations/kdecoration.h @@ -47,6 +47,11 @@ DEALINGS IN THE SOFTWARE. KWIN_EXPORT int decoration_version() { return KWIN_DECORATION_API_VERSION; } \ } +#define KWIN_DECORATION_BRIDGE_API_VERSION 1 +extern "C" { + int decoration_bridge_version(); +} + class KConfig; /** @defgroup kdecoration KWin decorations library */ diff --git a/libkdecorations/kdecorationbridge.h b/libkdecorations/kdecorationbridge.h index 7e1f2644df..a050e55acc 100644 --- a/libkdecorations/kdecorationbridge.h +++ b/libkdecorations/kdecorationbridge.h @@ -28,18 +28,12 @@ DEALINGS IN THE SOFTWARE. #include "kdecoration.h" #include -/** @addtogroup kdecoration */ -/** @{ */ - /** * @short Bridge class for communicating between decorations and KWin core. * * This class allows communication between decorations and KWin core while allowing * to keep binary compatibility. Decorations do not need to use it directly at all. */ -// This class is supposed to keep binary compatibility, just like KDecoration. -// Extending should be done the same way, i.e. inheriting KDecorationBridge2 from it -// and adding new functionality there. class KDecorationBridge : public KDecorationDefines { public: @@ -91,7 +85,7 @@ public: virtual void grabXServer(bool grab) = 0; }; -class KWIN_EXPORT KDecorationBridgeUnstable +class KDecorationBridgeUnstable : public KDecorationBridge { public: @@ -117,6 +111,4 @@ public: virtual WindowOperation buttonToWindowOperation(Qt::MouseButtons button) = 0; }; -/** @} */ - #endif