From kde-commits  Fri Jun 30 22:18:11 2006
From: Andy Rysin <arysin () yahoo ! com>
Date: Fri, 30 Jun 2006 22:18:11 +0000
To: kde-commits
Subject: KDE/kdebase/workspace/kcontrol/kxkb
Message-Id: <1151705891.743872.10022.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=115170590217179

SVN commit 556618 by rysin:

more port to qt4/kde4

 M  +3 -3      extension.cpp  
 M  +7 -8      kcmmisc.cpp  


--- trunk/KDE/kdebase/workspace/kcontrol/kxkb/extension.cpp #556617:556618
@@ -1,9 +1,9 @@
 #include <string.h>
 #include <errno.h>
 
-#include <qstring.h>
-#include <qmap.h>
-#include <qfile.h>
+#include <QString>
+#include <QMap>
+#include <QFile>
 #include <QX11Info>
 
 #include <kdebug.h>
--- trunk/KDE/kdebase/workspace/kcontrol/kxkb/kcmmisc.cpp #556617:556618
@@ -28,13 +28,12 @@
 #include <config.h>
 #include <math.h>
 
-#include <qslider.h>
-#include <qfileinfo.h>
-#include <qcheckbox.h>
-#include <qstring.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
-#include <qradiobutton.h>
+#include <QSlider>
+#include <QFileInfo>
+#include <QCheckBox>
+#include <QString>
+#include <QLayout>
+#include <QWhatsThis>
 #include <Q3ButtonGroup>
 #include <QRadioButton>
 
@@ -507,7 +506,7 @@
 	}
 
 
-	int numlockState = config->readNumEntry( "NumLock", 2 );
+	int numlockState = config->readEntry( "NumLock", 2 );
 	if( numlockState != 2 )
 		numlockx_change_numlock_state( numlockState == 0 );