Rename many classes and header files to avoid conflicts with KDE4

11 files changed, 19 insertions, 19 deletions

diff --git a/keduca/keduca/Makefile.am b/keduca/keduca/Makefile.am
index ce6f1e89..c116f6fc 100644
--- a/keduca/keduca/Makefile.am
+++ b/keduca/keduca/Makefile.am
@@ -10,7 +10,7 @@ keduca_SOURCES = main.cpp keduca.cpp
 # Convenience library
 #noinst_LTLIBRARIES = libkeduca_common.la
 
-#libkeduca_common_la_SOURCES = kradioeduca.cpp kquestion.cpp kgroupeduca.cpp keducaview.cpp \
+#libkeduca_common_la_SOURCES = tderadioeduca.cpp kquestion.cpp kgroupeduca.cpp keducaview.cpp \
 #                              keducaprefs.cpp kcheckeduca.cpp
 #libkeduca_common_la_LDFLAGS = $(all_libraries) -no-undefined
 #libkeduca_common_la_LIBADD  = ../libkeduca/libkeduca.la
@@ -19,13 +19,13 @@ keduca_SOURCES = main.cpp keduca.cpp
 kde_module_LTLIBRARIES = libkeducapart.la
 libkeducapart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
 libkeducapart_la_LIBADD  = ../libkeduca/libkeduca.la $(LIB_KPARTS)
-libkeducapart_la_SOURCES = keduca_part.cpp kradioeduca.cpp kquestion.cpp \
+libkeducapart_la_SOURCES = keduca_part.cpp tderadioeduca.cpp kquestion.cpp \
                            kgroupeduca.cpp keducaview.cpp keducaprefs.cpp \
                            kcheckeduca.cpp settings.kcfgc configdialogbase.ui
 
 EXTRA_DIST = main.cpp keduca.cpp keduca.h kcheckeduca.cpp kcheckeduca.h keducaprefs.cpp \
 keducaprefs.h keducaui.rc keducaview.cpp keducaview.h kgroupeduca.cpp kgroupeduca.h kquestion.cpp \
-kquestion.h kradioeduca.cpp kradioeduca.h
+kquestion.h tderadioeduca.cpp tderadioeduca.h
 
 METASOURCES = AUTO
 
diff --git a/keduca/keduca/kcheckeduca.cpp b/keduca/keduca/kcheckeduca.cpp
index eae53cd5..051a8c3e 100644
--- a/keduca/keduca/kcheckeduca.cpp
+++ b/keduca/keduca/kcheckeduca.cpp
@@ -19,7 +19,7 @@
 #include "kcheckeduca.moc"
 
 #include <tqstyle.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 
 KCheckEduca::KCheckEduca(TQWidget *parent, const char *name ) : TQCheckBox(parent,name)
 {
diff --git a/keduca/keduca/keduca.h b/keduca/keduca/keduca.h
index 736dc712..130d15be 100644
--- a/keduca/keduca/keduca.h
+++ b/keduca/keduca/keduca.h
@@ -27,7 +27,7 @@
 #include <kapplication.h>
 #include <tdeparts/mainwindow.h>
 #include <tdeparts/part.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 /** The KEduca TestMaster.
     This will execute the Test/Examen as defined by the KEduca Document. */
diff --git a/keduca/keduca/kgroupeduca.cpp b/keduca/keduca/kgroupeduca.cpp
index ec77868f..3c3482fc 100644
--- a/keduca/keduca/kgroupeduca.cpp
+++ b/keduca/keduca/kgroupeduca.cpp
@@ -18,7 +18,7 @@
 #include "kgroupeduca.h"
 #include "kgroupeduca.moc"
 #include "kcheckeduca.h"
-#include "kradioeduca.h"
+#include "tderadioeduca.h"
 
 #include <klocale.h>
 
@@ -66,7 +66,7 @@ void KGroupEduca::setType(ButtonType type)
     _typeMode = type;
 }
 
-/** Clear all kradio or kcheck answers */
+/** Clear all tderadio or kcheck answers */
 void KGroupEduca::clearAnswers()
 {
     unsigned int maxButton = count();
diff --git a/keduca/keduca/kgroupeduca.h b/keduca/keduca/kgroupeduca.h
index e551806e..05ff761b 100644
--- a/keduca/keduca/kgroupeduca.h
+++ b/keduca/keduca/kgroupeduca.h
@@ -38,7 +38,7 @@ public:
     void insertAnswer( const TQString& text);
     /** Set type */
     void setType(ButtonType Type);
-    /** Clear all kradio or kcheck answers */
+    /** Clear all tderadio or kcheck answers */
     void clearAnswers();
     /** Return if is checked radio or check buttons */
     bool isChecked(int id);
diff --git a/keduca/keduca/tderadioeduca.cpp b/keduca/keduca/tderadioeduca.cpp
index b858cb6d..4dde0d17 100644
--- a/keduca/keduca/tderadioeduca.cpp
+++ b/keduca/keduca/tderadioeduca.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kradioeduca.cpp  -  description
+                          tderadioeduca.cpp  -  description
                              -------------------
     begin                : Wed Sep 6 2000
     copyright            : (C) 2000 by Javier Campos Morales
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "kradioeduca.h"
-#include "kradioeduca.moc"
+#include "tderadioeduca.h"
+#include "tderadioeduca.moc"
 #include <tqstyle.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 
 TDERadioEduca::TDERadioEduca(TQWidget *parent, const char *name) : TQRadioButton(parent,name)
 {
diff --git a/keduca/keduca/tderadioeduca.h b/keduca/keduca/tderadioeduca.h
index 1056ff53..7ffb503f 100644
--- a/keduca/keduca/tderadioeduca.h
+++ b/keduca/keduca/tderadioeduca.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kradioeduca.h  -  description
+                          tderadioeduca.h  -  description
                              -------------------
     begin                : Wed Sep 6 2000
     copyright            : (C) 2000 by Javier Campos Morales
diff --git a/keduca/keducabuilder/kcontroladdedit.cpp b/keduca/keducabuilder/kcontroladdedit.cpp
index 832c59ac..1646e249 100644
--- a/keduca/keducabuilder/kcontroladdedit.cpp
+++ b/keduca/keducabuilder/kcontroladdedit.cpp
@@ -24,7 +24,7 @@
 #include <kurlrequester.h>
 #include <kcombobox.h>
 #include <knuminput.h>
-#include <klistview.h>
+#include <tdelistview.h>
 //#include <.h>
 
 // TQt includes
diff --git a/keduca/keducabuilder/kcontroladdeditbase.ui b/keduca/keducabuilder/kcontroladdeditbase.ui
index e0902db1..1eb9e877 100644
--- a/keduca/keducabuilder/kcontroladdeditbase.ui
+++ b/keduca/keducabuilder/kcontroladdeditbase.ui
@@ -875,6 +875,6 @@
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/keduca/keducabuilder/keducabuilder.h b/keduca/keducabuilder/keducabuilder.h
index d91efb79..11841ab8 100644
--- a/keduca/keducabuilder/keducabuilder.h
+++ b/keduca/keducabuilder/keducabuilder.h
@@ -20,10 +20,10 @@
 
 #include "../libkeduca/fileread.h"
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
-#include <klistbox.h>
-#include <kaction.h>
+#include <tdelistbox.h>
+#include <tdeaction.h>
 
 #include <tqtextview.h>
 #include <tqsplitter.h>
diff --git a/keduca/keducabuilder/keducaeditorstartdialog.cpp b/keduca/keducabuilder/keducaeditorstartdialog.cpp
index 2c69c146..34d6a82c 100644
--- a/keduca/keducabuilder/keducaeditorstartdialog.cpp
+++ b/keduca/keducabuilder/keducaeditorstartdialog.cpp
@@ -46,7 +46,7 @@ KEducaEditorStartDialog::KEducaEditorStartDialog(KEducaBuilder * parent, const c
              this, TQT_SLOT( slotChoiceChanged(int) ) );
 }
 
-/** based on code in kaction.cpp
+/** based on code in tdeaction.cpp
  */
 void KEducaEditorStartDialog::buildRecentFilesList()
 {