Rename many classes and header files to avoid conflicts with KDE4

8 files changed, 11 insertions, 11 deletions

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;