Rename many classes and header files to avoid conflicts with KDE4

18 files changed, 24 insertions, 24 deletions

diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index 7eef7539c..30f2c262f 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -55,12 +55,12 @@
 #include <libkmime/kmime_message.h>
 
 #include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
 #include <kkeydialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <ktip.h>
 #include <ktempfile.h>
@@ -69,7 +69,7 @@
 #include <knotifyclient.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kcmdlineargs.h>
 
 #include <tqapplication.h>
diff --git a/korganizer/customlistviewitem.h b/korganizer/customlistviewitem.h
index 64d3dbfb8..c3e2b1862 100644
--- a/korganizer/customlistviewitem.h
+++ b/korganizer/customlistviewitem.h
@@ -26,7 +26,7 @@
 
 #include <tqmap.h>
 #include <tqstring.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 template<class T>
 class CustomListViewItem : public TDEListViewItem
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index a8a8095ea..13de8f7ea 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -52,7 +52,7 @@
 
 #ifndef NODND
 #include <tqcursor.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <X11/Xlib.h>
 #undef FocusIn
 #undef KeyPress
diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp
index ae8e15af1..f25b9c115 100644
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@@ -47,8 +47,8 @@
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <kstdaction.h>
-#include <kactioncollection.h>
-#include <kpopupmenu.h>
+#include <tdeactioncollection.h>
+#include <tdepopupmenu.h>
 #include <kprotocolinfo.h>
 #include <klineedit.h>
 #include <kseparator.h>
diff --git a/korganizer/koeditordetails.h b/korganizer/koeditordetails.h
index bb4f7b109..97fac51cc 100644
--- a/korganizer/koeditordetails.h
+++ b/korganizer/koeditordetails.h
@@ -24,7 +24,7 @@
 #ifndef _KOEDITORDETAILS_H
 #define _KOEDITORDETAILS_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include "customlistviewitem.h"
 #include "koattendeeeditor.h"
 
diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp
index 3562bc16b..3d331ed07 100644
--- a/korganizer/koeventpopupmenu.cpp
+++ b/korganizer/koeventpopupmenu.cpp
@@ -24,7 +24,7 @@
 
 #include <tqcursor.h>
 
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 89b4851e2..124c38fbe 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -33,7 +33,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqcursor.h>
 #include <tqregexp.h>
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index 55de923ac..8b6881260 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -47,7 +47,7 @@
 #include <kmessagebox.h>
 #include <knotifyclient.h>
 #include <kcombobox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <twin.h>
 #include <klockfile.h>
 
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index d20d30f9c..6c3e22564 100644
--- a/korganizer/korgac/alarmdockwindow.cpp
+++ b/korganizer/korgac/alarmdockwindow.cpp
@@ -34,9 +34,9 @@
 #include <kurl.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 #include <tqtooltip.h>
diff --git a/korganizer/korganizer.cpp b/korganizer/korganizer.cpp
index 89014c46b..6bbcdaeea 100644
--- a/korganizer/korganizer.cpp
+++ b/korganizer/korganizer.cpp
@@ -58,9 +58,9 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <tdefiledialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kedittoolbar.h>
 #include <ktempfile.h>
diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp
index 22a6e3ec3..cce2c88d1 100644
--- a/korganizer/korganizer_part.cpp
+++ b/korganizer/korganizer_part.cpp
@@ -40,11 +40,11 @@
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kinstance.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 48a3da844..662f6b136 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -28,7 +28,7 @@
 #include <tqmap.h>
 #include <tqtooltip.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <libkcal/todo.h>
 #include <korganizer/baseview.h>
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 5d277ac8d..ec53ba360 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -27,7 +27,7 @@
 #include <tqtabwidget.h>
 
 #include <libkcal/calendarresources.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index dc4dfe4ca..bacb04760 100644
--- a/korganizer/plugins/exchange/exchange.cpp
+++ b/korganizer/plugins/exchange/exchange.cpp
@@ -28,7 +28,7 @@
 
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kglobal.h>
 
 #include "korganizer/korganizer.h"
diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp
index 8177e797a..636309a93 100644
--- a/korganizer/plugins/projectview/projectview.cpp
+++ b/korganizer/plugins/projectview/projectview.cpp
@@ -24,7 +24,7 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kglobal.h>
 
 #include "koprojectview.h"
diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp
index 21b073b38..9853ac871 100644
--- a/korganizer/plugins/timespanview/timespanview.cpp
+++ b/korganizer/plugins/timespanview/timespanview.cpp
@@ -24,7 +24,7 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kglobal.h>
 
 #include "kotimespanview.h"
diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp
index bdeb116d4..2dd4953bb 100644
--- a/korganizer/resourceview.cpp
+++ b/korganizer/resourceview.cpp
@@ -30,7 +30,7 @@
 #include <dcopref.h>
 #include <kcolordialog.h>
 #include <kdialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/korganizer/template_management_dialog_base.ui b/korganizer/template_management_dialog_base.ui
index 1732a775a..3bc983433 100644
--- a/korganizer/template_management_dialog_base.ui
+++ b/korganizer/template_management_dialog_base.ui
@@ -88,6 +88,6 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>