From kde-commits  Thu Nov 30 21:33:41 2006
From: Andreas Nicolai <Andreas.Nicolai () gmx ! net>
Date: Thu, 30 Nov 2006 21:33:41 +0000
To: kde-commits
Subject: KDE/kdeedu/ktouch/src
Message-Id: <1164922421.894030.30935.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=116492243628604

SVN commit 609460 by ghorwin:

Ported remaining configuration pages to Qt4 and fixed layout. Problem
with not-handled KComboBox persists :-(


 M  +4 -4      CMakeLists.txt  
 M  +0 -2      ktouchkeyboard.cpp  
 M  +2 -2      ktouchprefcolors.h  
 D             ktouchprefcolorslayout.ui  
 M  +2 -2      ktouchprefkeyboard.h  
 D             ktouchprefkeyboardlayout.ui  
 M  +2 -2      ktouchpreftraining.h  
 D             ktouchpreftraininglayout.ui  
 A             ui/ktouchprefcolorspage.ui  
 A             ui/ktouchprefkeyboardpage.ui  
 A             ui/ktouchpreftrainingpage.ui  


--- trunk/KDE/kdeedu/ktouch/src/CMakeLists.txt #609459:609460
@@ -7,14 +7,14 @@
 kde4_add_ui_files(ktouch_UIS
    ui/ktouchcoloreditordialog.ui 
    ui/ktouchopenrequestdialog.ui 
-   ui/ktouchprefgeneralpage.ui 
    ui/ktouchstatuswidget.ui
    ui/ktouchlectureeditordialog.ui 
    ui/ktouchstatisticsdialog.ui 
    ui/ktouchusersetupdialog.ui
-   ktouchprefcolorslayout.ui 
-   ktouchprefkeyboardlayout.ui 
-   ktouchpreftraininglayout.ui 
+   ui/ktouchprefgeneralpage.ui 
+   ui/ktouchprefcolorspage.ui 
+   ui/ktouchprefkeyboardpage.ui 
+   ui/ktouchpreftrainingpage.ui 
 )
 
 # set the source code files from which KTouch is compiled
--- trunk/KDE/kdeedu/ktouch/src/ktouchkeyboard.cpp #609459:609460
@@ -21,8 +21,6 @@
 #include <kio/netaccess.h>
 #include <klocale.h>
 
-#include "prefs.h"
-
 // --------------------------------------------------------------------------
 
 // Clears the keyboard data
--- trunk/KDE/kdeedu/ktouch/src/ktouchprefcolors.h #609459:609460
@@ -14,7 +14,7 @@
 
 #include <QWidget>
 
-#include "ui_ktouchprefcolorslayout.h"
+#include "ui_ktouchprefcolorspage.h"
 
 class KTouchPrefColors : public QWidget {
 
@@ -25,7 +25,7 @@
         ui.setupUi(this);
     };
 
-    Ui_KTouchPrefColorsLayout ui;
+    Ui_KTouchPrefColorsPage ui;
 };
 
 #endif
--- trunk/KDE/kdeedu/ktouch/src/ktouchprefkeyboard.h #609459:609460
@@ -14,7 +14,7 @@
 
 #include <QWidget>
 
-#include "ui_ktouchprefkeyboardlayout.h"
+#include "ui_ktouchprefkeyboardpage.h"
 
 class KTouchPrefKeyboard : public QWidget {
 
@@ -25,7 +25,7 @@
         ui.setupUi(this);
     };
 
-    Ui_KTouchPrefKeyboardLayout ui;
+    Ui_KTouchPrefKeyboardPage ui;
 };
 
 #endif
--- trunk/KDE/kdeedu/ktouch/src/ktouchpreftraining.h #609459:609460
@@ -14,7 +14,7 @@
 
 #include <QWidget>
 
-#include "ui_ktouchpreftraininglayout.h"
+#include "ui_ktouchpreftrainingpage.h"
 
 class KTouchPrefTraining : public QWidget {
 
@@ -25,7 +25,7 @@
         ui.setupUi(this);
     };
 
-    Ui_KTouchPrefTrainingLayout ui;
+    Ui_KTouchPrefTrainingPage ui;
 };
 
 #endif