[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/kxkb
From:       Andy Rysin <arysin () yahoo ! com>
Date:       2006-06-30 22:17:27
Message-ID: 1151705847.173052.9856.nullmailer () svn ! kde ! org
[Download RAW message or body]

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 <unistd.h>
 #include <stdlib.h>
 #include <assert.h>
 
-#include <qregexp.h>
-#include <qfile.h>
-#include <qstringlist.h>
-#include <qimage.h>
+#include <QRegExp>
+#include <QFile>
+#include <QStringList>
+#include <QImage>
 #include <QDesktopWidget>
 
 #include <kaboutdata.h>
@@ -50,6 +49,8 @@
 #include <kconfig.h>
 #include <ktoolinvocation.h>
 
+#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 <qstring.h>
-#include <qstringlist.h>
-#include <qhash.h>
-#include <qqueue.h>
+#include <QString>
+#include <QStringList>
+#include <QHash>
+#include <QQueue>
 
 #include <kuniqueapplication.h>
 
@@ -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(); }
[prev in list] [next in list] [prev in thread] [next in thread]