Rename many classes and header files to avoid conflicts with KDE4

40 files changed, 60 insertions, 60 deletions

diff --git a/IconThemes/mono/scalable/apps/kiostdetool.svgz b/IconThemes/mono/scalable/apps/kiosktool.svgz
index 35eac21..35eac21 100644
--- a/IconThemes/mono/scalable/apps/kiostdetool.svgz
+++ b/IconThemes/mono/scalable/apps/kiosktool.svgz
diff --git a/IconThemes/mono/scalable/apps/tdefontview.svgz b/IconThemes/mono/scalable/apps/tdefontview.svgz
index 9721193..e0ea1c2 100644
--- a/IconThemes/mono/scalable/apps/tdefontview.svgz
+++ b/IconThemes/mono/scalable/apps/tdefontview.svgz
diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp
index 1cc0e9e..2ce72d4 100644
--- a/kbstateapplet/kbstate.cpp
+++ b/kbstateapplet/kbstate.cpp
@@ -23,7 +23,7 @@
 #include <tqpopupmenu.h>
 
 #include <kaboutapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kaboutdata.h>
 #include <klocale.h>
 #include <kglobal.h>
@@ -32,7 +32,7 @@
 #include <kiconloader.h>
 #include <kiconeffect.h>
 #include <knotifyclient.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kkeynative.h>
 #include <kdemacros.h>
 #include <kprocess.h>
diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp
index 204195c..7eb6560 100644
--- a/kmag/kmag.cpp
+++ b/kmag/kmag.cpp
@@ -52,7 +52,7 @@
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 #include <ktempfile.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kedittoolbar.h>
 #include <twin.h>
 
diff --git a/kmag/kmag.h b/kmag/kmag.h
index 5be881f..2ed5da7 100644
--- a/kmag/kmag.h
+++ b/kmag/kmag.h
@@ -34,10 +34,10 @@
 
 // include files for KDE
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kdockwidget.h>
-#include <kaction.h>
-#include <kaccel.h>
+#include <tdeaction.h>
+#include <tdeaccel.h>
 #include <knuminput.h>
 
 /**
diff --git a/kmousetool/kmousetool/kmousetool.cpp b/kmousetool/kmousetool/kmousetool.cpp
index 530b04f..256e00e 100644
--- a/kmousetool/kmousetool/kmousetool.cpp
+++ b/kmousetool/kmousetool/kmousetool.cpp
@@ -47,7 +47,7 @@
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #include <knuminput.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kaboutapplication.h>
 
 //#include <arts/soundserver.h>
diff --git a/kmouth/configwizard.cpp b/kmouth/configwizard.cpp
index 9cb0b8b..ce1facf 100644
--- a/kmouth/configwizard.cpp
+++ b/kmouth/configwizard.cpp
@@ -19,7 +19,7 @@
 #include "configwizard.h"
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
diff --git a/kmouth/kmouth.cpp b/kmouth/kmouth.cpp
index 2596e58..1350125 100644
--- a/kmouth/kmouth.cpp
+++ b/kmouth/kmouth.cpp
@@ -27,7 +27,7 @@
 #include <tdeconfig.h>
 #include <kstdaction.h>
 #include <kprinter.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 // application specific includes
diff --git a/kmouth/kmouth.h b/kmouth/kmouth.h
index 0ba6557..241e4e1 100644
--- a/kmouth/kmouth.h
+++ b/kmouth/kmouth.h
@@ -28,9 +28,9 @@
 
 // include files for KDE
 #include <kapplication.h>
-#include <kmainwindow.h>
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
 #include <kurl.h>
 
 // forward declaration of the KMouth classes
diff --git a/kmouth/phrasebook/phrasebook.cpp b/kmouth/phrasebook/phrasebook.cpp
index 33dd5dc..eb166ab 100644
--- a/kmouth/phrasebook/phrasebook.cpp
+++ b/kmouth/phrasebook/phrasebook.cpp
@@ -23,9 +23,9 @@
 #include <tqptrstack.h>
 
 #include <klocale.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
-#include <ktoolbar.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
+#include <tdetoolbar.h>
 #include <ktempfile.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
diff --git a/kmouth/phrasebook/phrasebook.h b/kmouth/phrasebook/phrasebook.h
index d156be2..4fee8cc 100644
--- a/kmouth/phrasebook/phrasebook.h
+++ b/kmouth/phrasebook/phrasebook.h
@@ -22,7 +22,7 @@
 #include <tqdragobject.h>
 #include <tqxml.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kprinter.h>
 
 class KURL;
diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp
index 26f1d2d..97d5de7 100644
--- a/kmouth/phrasebook/phrasebookdialog.cpp
+++ b/kmouth/phrasebook/phrasebookdialog.cpp
@@ -30,11 +30,11 @@
 #include <tqwhatsthis.h>
 
 // include files for KDE
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
 #include <kmessagebox.h>
diff --git a/kmouth/phrasebook/phrasebookdialog.h b/kmouth/phrasebook/phrasebookdialog.h
index bacd7a9..0665281 100644
--- a/kmouth/phrasebook/phrasebookdialog.h
+++ b/kmouth/phrasebook/phrasebookdialog.h
@@ -23,7 +23,7 @@
 #include <tqbuttongroup.h>
 #include <tqlabel.h>
 #include <tqlistview.h> 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klineedit.h>
 #include <kkeybutton.h>
 #include <kurl.h>
diff --git a/kmouth/phrasebook/phrasetree.cpp b/kmouth/phrasebook/phrasetree.cpp
index 0439c5e..665750d 100644
--- a/kmouth/phrasebook/phrasetree.cpp
+++ b/kmouth/phrasebook/phrasetree.cpp
@@ -17,10 +17,10 @@
 
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kaction.h>
-#include <kstdaccel.h>
-#include <kshortcutlist.h>
-#include <kactionshortcutlist.h>
+#include <tdeaction.h>
+#include <tdestdaccel.h>
+#include <tdeshortcutlist.h>
+#include <tdeactionshortcutlist.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 
diff --git a/kmouth/phrasebook/phrasetree.h b/kmouth/phrasebook/phrasetree.h
index 4016b54..a4936f4 100644
--- a/kmouth/phrasebook/phrasetree.h
+++ b/kmouth/phrasebook/phrasetree.h
@@ -19,8 +19,8 @@
 #define PHRASETREE_H
 
 #include <tqpixmap.h>
-#include <kshortcut.h>
-#include <klistview.h>
+#include <tdeshortcut.h>
+#include <tdelistview.h>
 
 class PhraseBook;
 class PhraseShortcutRequest;
diff --git a/kmouth/phraselist.cpp b/kmouth/phraselist.cpp
index 945795b..1775c5a 100644
--- a/kmouth/phraselist.cpp
+++ b/kmouth/phraselist.cpp
@@ -24,7 +24,7 @@
 #include <tqclipboard.h>
 
 // include files for KDE
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klineedit.h>
 #include <kaudioplayer.h>
 #include <kcursor.h>
diff --git a/kmouth/phraselist.h b/kmouth/phraselist.h
index 7c95908..492082e 100644
--- a/kmouth/phraselist.h
+++ b/kmouth/phraselist.h
@@ -19,7 +19,7 @@
 #define PHRASELIST_H
 
 // include files for KDE
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klineedit.h>
 #include <kprinter.h>
 
diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp
index 7adbb72..c89c9cf 100644
--- a/kmouth/wordcompletion/dictionarycreationwizard.cpp
+++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp
@@ -24,7 +24,7 @@
 #include <tqtextcodec.h>
 #include <tqwhatsthis.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <kurlrequester.h>
 #include <klocale.h>
diff --git a/kmouth/wordcompletion/wordcompletionui.ui b/kmouth/wordcompletion/wordcompletionui.ui
index a41b3be..bc9cde5 100644
--- a/kmouth/wordcompletion/wordcompletionui.ui
+++ b/kmouth/wordcompletion/wordcompletionui.ui
@@ -287,7 +287,7 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kinputdialog.h</includehint>
 </includehints>
 </UI>
diff --git a/kmouth/wordcompletion/wordcompletionwidget.cpp b/kmouth/wordcompletion/wordcompletionwidget.cpp
index 43179ac..a5d1b8f 100644
--- a/kmouth/wordcompletion/wordcompletionwidget.cpp
+++ b/kmouth/wordcompletion/wordcompletionwidget.cpp
@@ -20,7 +20,7 @@
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <kurlrequester.h>
 #include <klocale.h>
diff --git a/ksayit/src/DocTreeView.ui b/ksayit/src/DocTreeView.ui
index bc5e2c6..166b9b6 100644
--- a/ksayit/src/DocTreeView.ui
+++ b/ksayit/src/DocTreeView.ui
@@ -156,6 +156,6 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/ksayit/src/Types.h b/ksayit/src/Types.h
index ff9ca65..81ee8b1 100644
--- a/ksayit/src/Types.h
+++ b/ksayit/src/Types.h
@@ -25,7 +25,7 @@
 #include <tqmap.h>
 
 // KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 
 typedef TQValueList<int> ParameterList_type;
 typedef TQMap<TQString, ParameterList_type> EffectConfig_type;
diff --git a/ksayit/src/contextmenuhandler.h b/ksayit/src/contextmenuhandler.h
index bd0f2f3..104b76c 100644
--- a/ksayit/src/contextmenuhandler.h
+++ b/ksayit/src/contextmenuhandler.h
@@ -18,8 +18,8 @@
 #include <tqxml.h>
 
 // KDE includes
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 
 //forward declarations
 class ContextMenuHandler;
diff --git a/ksayit/src/docbookclasses.h b/ksayit/src/docbookclasses.h
index 89d104e..82096a9 100644
--- a/ksayit/src/docbookclasses.h
+++ b/ksayit/src/docbookclasses.h
@@ -19,7 +19,7 @@
 #include <tqvaluelist.h>
 
 // KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
  
 // App specific includes
 #include "Types.h"
diff --git a/ksayit/src/doctreeviewimpl.h b/ksayit/src/doctreeviewimpl.h
index b0f7a35..1dfeea7 100644
--- a/ksayit/src/doctreeviewimpl.h
+++ b/ksayit/src/doctreeviewimpl.h
@@ -17,8 +17,8 @@
 
 // KDE includes
 #include <kurl.h>
-#include <klistview.h>
-#include <kpopupmenu.h>
+#include <tdelistview.h>
+#include <tdepopupmenu.h>
 
 // App specific includes
 #include "Types.h"
diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp
index c5be390..82ceb31 100644
--- a/ksayit/src/ksayit.cpp
+++ b/ksayit/src/ksayit.cpp
@@ -31,7 +31,7 @@
 #include <kdialogbase.h>
 #include <tdefiledialog.h>
 #include <kmenubar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstatusbar.h>
 #include <tdeconfig.h>
 #include <kstdaction.h>
diff --git a/ksayit/src/ksayit.h b/ksayit/src/ksayit.h
index 451cf36..f0e3479 100644
--- a/ksayit/src/ksayit.h
+++ b/ksayit/src/ksayit.h
@@ -30,10 +30,10 @@ using namespace std;
 
 // include files for KDE 
 #include <kapplication.h>
-#include <kmainwindow.h>
-#include <kaccel.h>
-#include <kaction.h>
-#include <kactionclasses.h>
+#include <tdemainwindow.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
 #include <kurl.h>
 #include <dcopobject.h>
 #include <kbookmarkmanager.h>
diff --git a/ksayit/src/ksayitsystemtray.h b/ksayit/src/ksayitsystemtray.h
index ebef2d6..d5dd4bc 100644
--- a/ksayit/src/ksayitsystemtray.h
+++ b/ksayit/src/ksayitsystemtray.h
@@ -25,8 +25,8 @@
 // KDE includes
 #include <kapplication.h>
 #include <ksystemtray.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <kmenubar.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
diff --git a/kttsd/app-plugins/kate/katekttsd.cpp b/kttsd/app-plugins/kate/katekttsd.cpp
index 21f2ee6..7459a6f 100644
--- a/kttsd/app-plugins/kate/katekttsd.cpp
+++ b/kttsd/app-plugins/kate/katekttsd.cpp
@@ -26,7 +26,7 @@
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/selectioninterface.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp
index 3b32764..b6c4f8e 100644
--- a/kttsd/filters/sbd/sbdconf.cpp
+++ b/kttsd/filters/sbd/sbdconf.cpp
@@ -34,7 +34,7 @@
 // KDE includes.
 #include <kglobal.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <kdialog.h>
 #include <kdialogbase.h>
diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
index b27fdb0..ba71c70 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp
+++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
@@ -35,7 +35,7 @@
 // KDE includes.
 #include <kglobal.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <kdialog.h>
 #include <kdialogbase.h>
diff --git a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
index 305cd6e..df1d519 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
+++ b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
@@ -466,7 +466,7 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
index 8b84a12..dabeb63 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
@@ -37,7 +37,7 @@
 
 // KDE includes.
 #include <dcopclient.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdeparts/componentfactory.h>
 #include <klineedit.h>
 #include <kurlrequester.h>
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
index f183ed8..ffde8a9 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
+++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
@@ -1897,18 +1897,18 @@
 <layoutdefaults spacing="6" margin="6"/>
 <includehints>
     <includehint>tdecmodule.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp
index 89341de..1e8f15c 100644
--- a/kttsd/kcmkttsmgr/selectevent.cpp
+++ b/kttsd/kcmkttsmgr/selectevent.cpp
@@ -29,7 +29,7 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 
 // KTTS includes
diff --git a/kttsd/kcmkttsmgr/selecteventwidget.ui b/kttsd/kcmkttsmgr/selecteventwidget.ui
index 01dffeb..3d4281f 100644
--- a/kttsd/kcmkttsmgr/selecteventwidget.ui
+++ b/kttsd/kcmkttsmgr/selecteventwidget.ui
@@ -57,6 +57,6 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp
index 9c8cf76..a8002ce 100644
--- a/kttsd/kttsjobmgr/kttsjobmgr.cpp
+++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp
@@ -31,7 +31,7 @@
 #include <kinstance.h>
 #include <klocale.h>
 #include <kaboutdata.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kencodingfiledialog.h>
diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp
index 257c8ee..92805dd 100644
--- a/kttsd/kttsmgr/kttsmgr.cpp
+++ b/kttsd/kttsmgr/kttsmgr.cpp
@@ -34,7 +34,7 @@
 #include <kdebug.h>
 #include <ksystemtray.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kaboutapplication.h>
 #include <dcopclient.h>
 #include <tdeversion.h>
diff --git a/kttsd/libkttsd/selecttalkerdlg.cpp b/kttsd/libkttsd/selecttalkerdlg.cpp
index af6da4c..8809331 100644
--- a/kttsd/libkttsd/selecttalkerdlg.cpp
+++ b/kttsd/libkttsd/selecttalkerdlg.cpp
@@ -34,7 +34,7 @@
 #include <kcombobox.h>
 #include <ktrader.h>
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kttsd/libkttsd/selecttalkerwidget.ui b/kttsd/libkttsd/selecttalkerwidget.ui
index 9b76283..f2b8f00 100644
--- a/kttsd/libkttsd/selecttalkerwidget.ui
+++ b/kttsd/libkttsd/selecttalkerwidget.ui
@@ -567,6 +567,6 @@
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>