Rename many classes and header files to avoid conflicts with KDE4

9 files changed, 9 insertions, 9 deletions

diff --git a/kig/modes/construct_mode.cc b/kig/modes/construct_mode.cc
index eddac9e1..e9c13364 100644
--- a/kig/modes/construct_mode.cc
+++ b/kig/modes/construct_mode.cc
@@ -36,7 +36,7 @@
 #include "popup.h"
 
 #include <kcursor.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <algorithm>
 #include <functional>
diff --git a/kig/modes/dragrectmode.cc b/kig/modes/dragrectmode.cc
index 8091f8cb..29b00886 100644
--- a/kig/modes/dragrectmode.cc
+++ b/kig/modes/dragrectmode.cc
@@ -24,7 +24,7 @@
 
 #include <tqevent.h>
 #include <tqglobal.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 DragRectMode::DragRectMode( const TQPoint& start, KigPart& d, KigWidget& w )
   : KigMode( d ), mstart( start ), mnc( true ), mstartselected( true ),
diff --git a/kig/modes/label.cc b/kig/modes/label.cc
index c92dccf8..f8c82dfa 100644
--- a/kig/modes/label.cc
+++ b/kig/modes/label.cc
@@ -36,7 +36,7 @@
 
 #include <kcursor.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <tqtextedit.h>
 #include <kdebug.h>
diff --git a/kig/modes/mode.cc b/kig/modes/mode.cc
index 76edc4f1..dbc6f7d6 100644
--- a/kig/modes/mode.cc
+++ b/kig/modes/mode.cc
@@ -22,7 +22,7 @@
 
 #include "../kig/kig_part.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 void KigMode::enableActions()
 {
diff --git a/kig/modes/normal.cc b/kig/modes/normal.cc
index c4dd7f4f..70123996 100644
--- a/kig/modes/normal.cc
+++ b/kig/modes/normal.cc
@@ -32,7 +32,7 @@
 #include "typesdialog.h"
 
 #include <kcursor.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <klocale.h>
 
diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc
index b55adafb..042e379a 100644
--- a/kig/modes/popup.cc
+++ b/kig/modes/popup.cc
@@ -52,7 +52,7 @@
 #include <tqregexp.h>
 #include <tqvalidator.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcolordialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/kig/modes/popup.h b/kig/modes/popup.h
index d1fb89d5..16078c15 100644
--- a/kig/modes/popup.h
+++ b/kig/modes/popup.h
@@ -21,7 +21,7 @@
 #ifndef KIG_MODES_POPUP_H
 #define KIG_MODES_POPUP_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <vector>
 
diff --git a/kig/modes/typesdialog.h b/kig/modes/typesdialog.h
index c0333ecb..6e06bb79 100644
--- a/kig/modes/typesdialog.h
+++ b/kig/modes/typesdialog.h
@@ -27,7 +27,7 @@
 
 #include <tqpopupmenu.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 
 class KigPart;
diff --git a/kig/modes/typesdialogbase.ui b/kig/modes/typesdialogbase.ui
index 0a74d56d..cc5cec92 100644
--- a/kig/modes/typesdialogbase.ui
+++ b/kig/modes/typesdialogbase.ui
@@ -328,7 +328,7 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>