diff --git a/kcmkwin/kwindecoration/CMakeLists.txt b/kcmkwin/kwindecoration/CMakeLists.txt index b00f1587ca..622484c96f 100644 --- a/kcmkwin/kwindecoration/CMakeLists.txt +++ b/kcmkwin/kwindecoration/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) ########### next target ############### -set(kcm_kwindecoration_PART_SRCS kwindecorationadaptor.cpp kwindecoration.cpp buttons.cpp preview.cpp ) +set(kcm_kwindecoration_PART_SRCS kwindecoration.cpp buttons.cpp preview.cpp ) kde4_automoc(${kcm_kwindecoration_PART_SRCS}) diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp index c333764623..96652480ff 100644 --- a/kcmkwin/kwindecoration/kwindecoration.cpp +++ b/kcmkwin/kwindecoration/kwindecoration.cpp @@ -62,8 +62,6 @@ #include #include #include -#include "kwindecorationadaptor.h" -#include // KCModule plugin interface // ========================= @@ -75,8 +73,6 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const QStringList &) kwinConfig("kwinrc"), pluginObject(0) { - new DecorationAdaptor(this); - QDBusConnection::sessionBus().registerObject("/KWinClientDecoration", this); kwinConfig.setGroup("Style"); plugins = new KDecorationPreviewPlugins( &kwinConfig ); diff --git a/kcmkwin/kwindecoration/kwindecorationadaptor.cpp b/kcmkwin/kwindecoration/kwindecorationadaptor.cpp deleted file mode 100644 index d7cf4ea360..0000000000 --- a/kcmkwin/kwindecoration/kwindecorationadaptor.cpp +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file was generated by dbusidl2cpp version 0.5 - * when processing input file org.kde.kwin.Decoration.xml - * - * dbusidl2cpp is Copyright (C) 2006 Trolltech AS. All rights reserved. - * - * This is an auto-generated file. - */ - -#include "kwindecorationadaptor.h" -#include -#include -#include -#include -#include -#include -#include - -/* - * Implementation of adaptor class DecorationAdaptor - */ - -DecorationAdaptor::DecorationAdaptor(QObject *parent) - : QDBusAbstractAdaptor(parent) -{ - // constructor - setAutoRelaySignals(true); -} - -DecorationAdaptor::~DecorationAdaptor() -{ - // destructor -} - -void DecorationAdaptor::dcopUpdateClientList() -{ - // handle method call org.kde.kwin.Decoration.dcopUpdateClientList - QMetaObject::invokeMethod(parent(), "dcopUpdateClientList"); - - // Alternative: - //static_cast(parent())->dcopUpdateClientList(); -} - - -#include "kwindecorationadaptor.moc" diff --git a/kcmkwin/kwindecoration/kwindecorationadaptor.h b/kcmkwin/kwindecoration/kwindecorationadaptor.h deleted file mode 100644 index fa0859871d..0000000000 --- a/kcmkwin/kwindecoration/kwindecorationadaptor.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * This file was generated by dbusidl2cpp version 0.5 - * when processing input file org.kde.kwin.Decoration.xml - * - * dbusidl2cpp is Copyright (C) 2006 Trolltech AS. All rights reserved. - * - * This is an auto-generated file. - */ - -#ifndef KWINDECORATIONADAPTOR_H_55611149668415 -#define KWINDECORATIONADAPTOR_H_55611149668415 - -#include -#include -class QByteArray; -template class QList; -template class QMap; -class QString; -class QStringList; -class QVariant; - -/* - * Adaptor class for interface org.kde.kwin.Decoration - */ -class DecorationAdaptor: public QDBusAbstractAdaptor -{ - Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "org.kde.kwin.Decoration") - Q_CLASSINFO("D-Bus Introspection", "" -" \n" -" \n" -" \n" - "") -public: - DecorationAdaptor(QObject *parent); - virtual ~DecorationAdaptor(); - -public: // PROPERTIES -public Q_SLOTS: // METHODS - void dcopUpdateClientList(); -Q_SIGNALS: // SIGNALS -}; - -#endif diff --git a/kcmkwin/kwindecoration/org.kde.kwin.Decoration.xml b/kcmkwin/kwindecoration/org.kde.kwin.Decoration.xml deleted file mode 100644 index b34ed58271..0000000000 --- a/kcmkwin/kwindecoration/org.kde.kwin.Decoration.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - -