Rename many classes and header files to avoid conflicts with KDE4

23 files changed, 38 insertions, 38 deletions

diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index d18f59d2..b63fdca3 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -50,7 +50,7 @@
 
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcmenumngr.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
@@ -63,13 +63,13 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprogress.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <twin.h>
 
 #include <tqfileinfo.h>
diff --git a/kbabel/catalogmanager/catalogmanager.h b/kbabel/catalogmanager/catalogmanager.h
index 8a0fe6fd..971b86e8 100644
--- a/kbabel/catalogmanager/catalogmanager.h
+++ b/kbabel/catalogmanager/catalogmanager.h
@@ -42,7 +42,7 @@
 #include <tqmap.h>
 
 #include <tdeversion.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kdirwatch.h>
 #include <kprocess.h>
 #include <tqptrlist.h>
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 5543c0f6..da21075b 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -65,7 +65,7 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
 #include <kprogress.h>
@@ -434,7 +434,7 @@ void CatalogManagerView::markModifiedFiles()
 
 void CatalogManagerView::loadMarks()
 {
-    const KURL url = KFileDialog::getOpenURL( TQString(),"*.marklist", this );
+    const KURL url = KFileDialog::getOpenURL( TQString(),"*.martdelist", this );
     if( url.isEmpty() ) return;
 
     TQString filename;
@@ -510,7 +510,7 @@ void CatalogManagerView::loadMarks()
 
 void CatalogManagerView::saveMarks()
 {
-    const KURL url2 = KFileDialog::getSaveURL( TQString(), "*.marklist", this );
+    const KURL url2 = KFileDialog::getSaveURL( TQString(), "*.martdelist", this );
     if( url2.isEmpty() ) return;
 
     // ### FIXME: why is the file dialog not doing this?
diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp
index 9c321b71..f02b9302 100644
--- a/kbabel/catalogmanager/main.cpp
+++ b/kbabel/catalogmanager/main.cpp
@@ -51,7 +51,7 @@
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <twin.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp
index e01585f3..76728e04 100644
--- a/kbabel/catalogmanager/validateprogress.cpp
+++ b/kbabel/catalogmanager/validateprogress.cpp
@@ -39,7 +39,7 @@
 #include <kdatatool.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprogress.h>
 #include <ksqueezedtextlabel.h>
 
diff --git a/kbabel/commonui/CMakeLists.txt b/kbabel/commonui/CMakeLists.txt
index a53ee5f7..4738a909 100644
--- a/kbabel/commonui/CMakeLists.txt
+++ b/kbabel/commonui/CMakeLists.txt
@@ -32,7 +32,7 @@ install( FILES
 
 tde_add_library( kbabelcommonui STATIC_PIC AUTOMOC
   SOURCES
-    klisteditor.ui context.cpp kactionselector.cpp
+    tdelisteditor.ui context.cpp tdeactionselector.cpp
     toolselectionwidget.cpp toolaction.cpp finddialog.cpp
     roughtransdlg.cpp projectprefwidgets.cpp projectpref.cpp
     projectwizard.cpp projectwizardwidget.ui projectwizardwidget2.ui
diff --git a/kbabel/commonui/Makefile.am b/kbabel/commonui/Makefile.am
index 65fd166b..94c5a18d 100644
--- a/kbabel/commonui/Makefile.am
+++ b/kbabel/commonui/Makefile.am
@@ -8,7 +8,7 @@ noinst_LTLIBRARIES = libkbabelcommonui.la
 INCLUDES         = -I$(srcdir)/../common -I../common -I$(srcdir)/../kbabeldict -I../kbabeldict $(all_includes)
 
 # which sources should be compiled 
-libkbabelcommonui_la_SOURCES = klisteditor.ui context.cpp kactionselector.cpp \
+libkbabelcommonui_la_SOURCES = tdelisteditor.ui context.cpp tdeactionselector.cpp \
 			       toolselectionwidget.cpp toolaction.cpp \
 			       finddialog.cpp roughtransdlg.cpp \
 			       projectprefwidgets.cpp		\
@@ -24,7 +24,7 @@ libkbabelcommonui_la_LIBADD =  $(LIB_KIO) -ltdetexteditor ../common/libkbabelcom
 libkbabelcommonui_la_LDFLAGS = $(all_libraries)
 
 # these are the headers for your project
-noinst_HEADERS   =  context.h kactionselector.h finddialog.h \
+noinst_HEADERS   =  context.h tdeactionselector.h finddialog.h \
 		    roughtransdlg.h projectprefwidgets.h projectpref.h	\
 		    cmdedit.h projectwizard.h
 
diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp
index 1c6ded1e..0ae00003 100644
--- a/kbabel/commonui/context.cpp
+++ b/kbabel/commonui/context.cpp
@@ -31,7 +31,7 @@
       
 **************************************************************************** */
 #include "context.h"
-#include "klisteditor.h"
+#include "tdelisteditor.h"
 #include "kbprojectsettings.h"
 
 #include <tqcombobox.h>
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index 04c845c9..f07ba99f 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -32,7 +32,7 @@
   your version.
 
 **************************************************************************** */
-#include "klisteditor.h"
+#include "tdelisteditor.h"
 #include "toolselectionwidget.h"
 #include "projectprefwidgets.h"
 #include "resources.h"
@@ -50,7 +50,7 @@
 #include <kmessagebox.h>
 #include <klineedit.h> 
 #include <kurlcompletion.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kcolorbutton.h>
 #include <tdeparts/componentfactory.h>
 #include <kregexpeditorinterface.h>
diff --git a/kbabel/commonui/tdeactionselector.cpp b/kbabel/commonui/tdeactionselector.cpp
index c2638ff5..3758b2be 100644
--- a/kbabel/commonui/tdeactionselector.cpp
+++ b/kbabel/commonui/tdeactionselector.cpp
@@ -27,7 +27,7 @@
  *   your version.                                                         *
  ***************************************************************************/
 
-#include "kactionselector.h"
+#include "tdeactionselector.h"
 #include <resources.h>
 
 #include <klocale.h>
@@ -559,4 +559,4 @@ int TDEActionSelector::insertionIndex( TQListBox *lb, InsertionPolicy policy )
 }
 
 //END Private Methods
-#include "kactionselector.moc"
+#include "tdeactionselector.moc"
diff --git a/kbabel/commonui/tdelisteditor.ui b/kbabel/commonui/tdelisteditor.ui
index 5f0f8ce1..a3130a1f 100644
--- a/kbabel/commonui/tdelisteditor.ui
+++ b/kbabel/commonui/tdelisteditor.ui
@@ -240,7 +240,7 @@
     </connection>
 </connections>
 <includes>
-    <include location="local" impldecl="in implementation">klisteditor.ui.h</include>
+    <include location="local" impldecl="in implementation">tdelisteditor.ui.h</include>
 </includes>
 <Q_SIGNALS>
     <signal>itemsChanged()</signal>
diff --git a/kbabel/commonui/toolaction.h b/kbabel/commonui/toolaction.h
index 1d785309..c7135a17 100644
--- a/kbabel/commonui/toolaction.h
+++ b/kbabel/commonui/toolaction.h
@@ -33,7 +33,7 @@
 #define TOOLACTION_H
 
 #include <tqobject.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdatatool.h>
 
 class TDEShortcut;
diff --git a/kbabel/commonui/toolselectionwidget.h b/kbabel/commonui/toolselectionwidget.h
index d0c8ee3a..e718dce2 100644
--- a/kbabel/commonui/toolselectionwidget.h
+++ b/kbabel/commonui/toolselectionwidget.h
@@ -32,7 +32,7 @@
 #ifndef TOOLSELECTIONWIDGET_H
 #define TOOLSELECTIONWIDGET_H
 
-#include "kactionselector.h"
+#include "tdeactionselector.h"
 #include <kdemacros.h>
 
 class KDataToolInfo;
diff --git a/kbabel/datatools/Makefile.am b/kbabel/datatools/Makefile.am
index d0460d4c..45bd88b2 100644
--- a/kbabel/datatools/Makefile.am
+++ b/kbabel/datatools/Makefile.am
@@ -16,12 +16,12 @@ INCLUDES         = $(all_includes)
 
 
 # which sources should be compiled for kbabeldict
-#libkbabeltools_la_SOURCES = toolaction.cpp kactionselector.cpp toolselectionwidget.cpp
+#libkbabeltools_la_SOURCES = toolaction.cpp tdeactionselector.cpp toolselectionwidget.cpp
 #libkbabeltools_la_LIBADD =  $(LIB_TDECORE) $(LIB_KIO)
 #libkbabeltools_la_LDFLAGS = $(all_libraries) -module -version-info 1:0:0 -no-undefined
 
 # these are the headers for your project
-#noinst_HEADERS   =  kactionselector.h toolselectionwidget.h
+#noinst_HEADERS   =  tdeactionselector.h toolselectionwidget.h
 #pkginclude_HEADERS = toolaction.h
 
 # let automoc handle all of the meta source files (moc)
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index eea5f60b..9be4ec13 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -60,15 +60,15 @@
 
 #include <dcopclient.h>
 #include <kdatatool.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstatusbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kedittoolbar.h>
 #include <kglobal.h>
 #include <kled.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tdefiledialog.h>
 #include <tdeconfig.h>
 #include <kurl.h>
@@ -77,7 +77,7 @@
 #include <kpushbutton.h>
 #include <kmessagebox.h>
 #include <twin.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdespelldlg.h>
 #include <ksqueezedtextlabel.h>
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index 5755a3e3..49247256 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -69,13 +69,13 @@
 #include <tdeconfig.h>
 #include <kapplication.h>
 #include <kled.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tdeio/netaccess.h>
 #include <knotifyclient.h>
 #include <ktempfile.h>
 #include <tdespell.h>
 #include <twin.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kurldrag.h>
 #include <kglobalsettings.h>
 
diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp
index d05f135c..9b7d7538 100644
--- a/kbabel/kbabel/kbcataloglistview.cpp
+++ b/kbabel/kbabel/kbcataloglistview.cpp
@@ -27,7 +27,7 @@
 #include "editcmd.h"
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqcolor.h>
 #include <tqlayout.h>
 #include <kglobalsettings.h>
diff --git a/kbabel/kbabel/kbcataloglistviewitem.h b/kbabel/kbabel/kbcataloglistviewitem.h
index 89c0e859..6384360f 100644
--- a/kbabel/kbabel/kbcataloglistviewitem.h
+++ b/kbabel/kbabel/kbcataloglistviewitem.h
@@ -23,7 +23,7 @@
 #ifndef KBCATALOGLISTVIEWITEM_H
 #define KBCATALOGLISTVIEWITEM_H
 #include <memory>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqsimplerichtext.h>
 #include "mymultilineedit.h"
 
diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp
index 6edcbbc5..1e75f78b 100644
--- a/kbabel/kbabel/mymultilineedit.cpp
+++ b/kbabel/kbabel/mymultilineedit.cpp
@@ -56,7 +56,7 @@
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kmessagebox.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 
 #include "kbhighlighting.h"
 
diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp
index 0fdd8183..d1adb648 100644
--- a/kbabel/kbabel/taglistview.cpp
+++ b/kbabel/kbabel/taglistview.cpp
@@ -37,7 +37,7 @@
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 
 #include "kbcatalog.h"
diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp
index 3ac386e5..796cf51f 100644
--- a/kbabel/kbabeldict/dictchooser.cpp
+++ b/kbabel/kbabeldict/dictchooser.cpp
@@ -39,7 +39,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tdeconfig.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kdialog.h>
 #include <ktempfile.h>
diff --git a/kbabel/kbabeldict/dictionarymenu.cpp b/kbabel/kbabeldict/dictionarymenu.cpp
index 57b7d9d7..4b4f1002 100644
--- a/kbabel/kbabeldict/dictionarymenu.cpp
+++ b/kbabel/kbabeldict/dictionarymenu.cpp
@@ -31,10 +31,10 @@
 
 **************************************************************************** */
 #include "dictionarymenu.h"
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <kdebug.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 #include <tqsignalmapper.h>
 
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index d62cb176..9374e9d3 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -49,7 +49,7 @@
 #include <kcmenumngr.h>
 #include <kdialogbase.h>
 #include <klibloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>