Rename many classes and header files to avoid conflicts with KDE4

k9Mplayer/k9mplayer.cpp

@@ -3,7 +3,7 @@
 #include "k9config.h"
 #include <tqlayout.h>
 #include <tqslider.h>
-#include <kselect.h>
+#include <tdeselect.h>
 #include "k9mplayer.h"
 #include <tqcombobox.h>
 #include <kiconloader.h>

k9author/import.cpp

@@ -16,12 +16,12 @@
 #include <tqlistview.h>
 #include <kcombobox.h>
 #include <tqcombobox.h>
-#include <kselect.h>
+#include <tdeselect.h>
 #include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include "kcombobox.h"
-#include "kselect.h"
+#include "tdeselect.h"
 
 /*
  *  Constructs a import as a child of 'parent', with the

k9author/import.ui

@@ -202,6 +202,6 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
-    <includehint>kselect.h</includehint>
+    <includehint>tdeselect.h</includehint>
 </includehints>
 </UI>

k9author/k9import.cpp

@@ -24,7 +24,7 @@
 #include <tdefiledialog.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
-#include <kselect.h>
+#include <tdeselect.h>
 #include "k9processlist.h"
 
 k9Import::k9Import(TQWidget* parent, const char* name,k9CdDrives *_drives)

k9author/k9menuedit.cpp

@@ -18,7 +18,7 @@
 #include "k9newdvd.h"
 #include <tqwmatrix.h>
 #include <tqlayout.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include "k9menubutton.h"
 #include <kurlrequester.h>
 #include <kcolorbutton.h>

src/k9copy.cpp

@@ -17,8 +17,8 @@
 #include "k9config.h"
 #include <tdeversion.h>
 #include <kstatusbar.h>
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kdockwidget.h>
 #include <tdemdidefines.h>

src/k9main.cpp

@@ -33,7 +33,7 @@
 #include "k9updatefactor.h"
 #include "k9haldevice.h"
 #include "k9titleencopt.h"
-#include <kselect.h>
+#include <tdeselect.h>
 #include <kcombobox.h>
 #include <tqtextbrowser.h>
 #include <tqapplication.h>

src/k9main.h

@@ -21,7 +21,7 @@
 #include <tqstring.h>
 #include <kmessagebox.h>
 #include <tqlistview.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kaboutdata.h>
 #include <tqevent.h>
 #include <tdefiledialog.h>

src/k9mainw.cpp

@@ -12,7 +12,7 @@
 #include <tqvariant.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
-#include <kselect.h>
+#include <tdeselect.h>
 #include <tqheader.h>
 #include <tqlistview.h>
 #include <kcombobox.h>
@@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
-#include "kselect.h"
+#include "tdeselect.h"
 #include "kcombobox.h"
 #include "klineedit.h"
 #include "kpushbutton.h"

src/k9mainw.ui

@@ -418,7 +418,7 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>kselect.h</includehint>
+    <includehint>tdeselect.h</includehint>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>

src/k9mainwsov.ui

@@ -417,7 +417,7 @@
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>kselect.h</includehint>
+    <includehint>tdeselect.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>

src/k9prefauthor.cpp

@@ -15,7 +15,7 @@
 #include <tqcombobox.h>
 #include <knuminput.h>
 #include <kcolorbutton.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 
 k9prefAuthor::k9prefAuthor(TQWidget* parent, const char* name, WFlags fl)
 : prefAuthor(parent,name,fl)