SVN commit 556617 by rysin: Put back include for D-BUS adaptor M +9 -5 kxkb.cpp M +5 -4 kxkb.h --- trunk/KDE/kdebase/workspace/kcontrol/kxkb/kxkb.cpp #556616:556617 @@ -22,15 +22,14 @@ KDE Keyboard Tool. Manages XKB keyboard mappings. */ - #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -50,6 +49,8 @@ #include #include +#include "kxkb_adaptor.h" + #include "x11helper.h" #include "kxkb.h" #include "extension.h" @@ -84,6 +85,9 @@ connect( this, SIGNAL(settingsChanged(int)), SLOT(slotSettingsChanged(int)) ); addKipcEventMask( KIPC::SettingsChanged ); + + //TODO: don't do this if kxkb does not become a daemon + new KXKBAdaptor( this ); } --- trunk/KDE/kdebase/workspace/kcontrol/kxkb/kxkb.h #556616:556617 @@ -26,10 +26,10 @@ #define __K_XKB_H__ -#include -#include -#include -#include +#include +#include +#include +#include #include @@ -60,6 +60,7 @@ bool setLayout(const LayoutUnit& layoutUnit, int group=-1); // k_dcop: +public slots: bool setLayout(const QString& layoutPair); QString getCurrentLayout() { return m_currentLayout.toPair(); } QStringList getLayoutsList() { return kxkbConfig.getLayoutStringList(); }