From b76bd9c2180d8fa48af3bf68c2d104b7880ce94e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:10:27 -0600
Subject: [PATCH] Rename many classes and header files to avoid conflicts with
 KDE4

---
 k9Mplayer/k9mplayer.cpp | 2 +-
 k9author/import.cpp     | 4 ++--
 k9author/import.ui      | 2 +-
 k9author/k9import.cpp   | 2 +-
 k9author/k9menuedit.cpp | 2 +-
 src/k9copy.cpp          | 4 ++--
 src/k9main.cpp          | 2 +-
 src/k9main.h            | 2 +-
 src/k9mainw.cpp         | 4 ++--
 src/k9mainw.ui          | 2 +-
 src/k9mainwsov.ui       | 2 +-
 src/k9prefauthor.cpp    | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/k9Mplayer/k9mplayer.cpp b/k9Mplayer/k9mplayer.cpp
index ac7eabd..bcc06d4 100644
--- a/k9Mplayer/k9mplayer.cpp
+++ b/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>
diff --git a/k9author/import.cpp b/k9author/import.cpp
index 47a183d..189e46f 100644
--- a/k9author/import.cpp
+++ b/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
diff --git a/k9author/import.ui b/k9author/import.ui
index 9047514..af49e39 100644
--- a/k9author/import.ui
+++ b/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>
diff --git a/k9author/k9import.cpp b/k9author/k9import.cpp
index 6852e3b..02f2cba 100644
--- a/k9author/k9import.cpp
+++ b/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)
diff --git a/k9author/k9menuedit.cpp b/k9author/k9menuedit.cpp
index c37ad41..956c8a6 100644
--- a/k9author/k9menuedit.cpp
+++ b/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>
diff --git a/src/k9copy.cpp b/src/k9copy.cpp
index 345480e..849ae96 100644
--- a/src/k9copy.cpp
+++ b/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>
diff --git a/src/k9main.cpp b/src/k9main.cpp
index 050ae52..e0037d8 100644
--- a/src/k9main.cpp
+++ b/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>
diff --git a/src/k9main.h b/src/k9main.h
index 9c131e6..c3d504a 100644
--- a/src/k9main.h
+++ b/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>
diff --git a/src/k9mainw.cpp b/src/k9mainw.cpp
index 69aa8aa..575e1f9 100644
--- a/src/k9mainw.cpp
+++ b/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"
diff --git a/src/k9mainw.ui b/src/k9mainw.ui
index 35ed354..582604e 100644
--- a/src/k9mainw.ui
+++ b/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>
diff --git a/src/k9mainwsov.ui b/src/k9mainwsov.ui
index 896bbad..5c906ec 100644
--- a/src/k9mainwsov.ui
+++ b/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>
diff --git a/src/k9prefauthor.cpp b/src/k9prefauthor.cpp
index 83ab84a..c35f0e8 100644
--- a/src/k9prefauthor.cpp
+++ b/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)