Rename many classes and header files to avoid conflicts with KDE4

25 files changed, 32 insertions, 32 deletions

diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index 00586a537..5ec6ed068 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -33,8 +33,8 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
-#include <klistview.h>
+#include <tdepopupmenu.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <klineedit.h>
 #include <kimageeffect.h>
diff --git a/kexi/widget/kexibrowser.h b/kexi/widget/kexibrowser.h
index d4c8033f1..3da16500d 100644
--- a/kexi/widget/kexibrowser.h
+++ b/kexi/widget/kexibrowser.h
@@ -21,7 +21,7 @@
 #ifndef KEXIBROWSER_H
 #define KEXIBROWSER_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqasciidict.h>
 #include <tqintdict.h>
 
diff --git a/kexi/widget/kexibrowser_p.h b/kexi/widget/kexibrowser_p.h
index bd9eb8f53..880e72377 100644
--- a/kexi/widget/kexibrowser_p.h
+++ b/kexi/widget/kexibrowser_p.h
@@ -21,7 +21,7 @@
 #ifndef KEXIBROWSER_P_H
 #define KEXIBROWSER_P_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 /*! @internal */
 class KexiBrowserListView : public TDEListView
diff --git a/kexi/widget/kexibrowseritem.h b/kexi/widget/kexibrowseritem.h
index 4dfa1232e..e4a35baaf 100644
--- a/kexi/widget/kexibrowseritem.h
+++ b/kexi/widget/kexibrowseritem.h
@@ -21,7 +21,7 @@
 #ifndef KEXIBROWSERITEM_H
 #define KEXIBROWSERITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqstring.h>
 
 #include <core/kexipartitem.h>
diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp
index 6dc75abb2..034b3f70f 100644
--- a/kexi/widget/kexidataawareview.cpp
+++ b/kexi/widget/kexidataawareview.cpp
@@ -25,7 +25,7 @@
 
 #include <tqlayout.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 KexiDataAwareView::KexiDataAwareView(KexiMainWindow *mainWin, TQWidget *parent, const char *name)
  : KexiViewBase(mainWin, parent, name)
diff --git a/kexi/widget/kexidatasourcecombobox.cpp b/kexi/widget/kexidatasourcecombobox.cpp
index 725a560b3..effafb388 100644
--- a/kexi/widget/kexidatasourcecombobox.cpp
+++ b/kexi/widget/kexidatasourcecombobox.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 
 #include <kexi.h>
 #include <kexiproject.h>
diff --git a/kexi/widget/kexidatatable.cpp b/kexi/widget/kexidatatable.cpp
index 0be99a4a9..797fa4406 100644
--- a/kexi/widget/kexidatatable.cpp
+++ b/kexi/widget/kexidatatable.cpp
@@ -25,8 +25,8 @@
 
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 
 #include <kexidb/cursor.h>
 
diff --git a/kexi/widget/kexifieldlistview.h b/kexi/widget/kexifieldlistview.h
index e936cc896..056ffc9b0 100644
--- a/kexi/widget/kexifieldlistview.h
+++ b/kexi/widget/kexifieldlistview.h
@@ -22,7 +22,7 @@
 
 #include <tqframe.h>
 #include <tqpixmap.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TDEListViewItem;
 
diff --git a/kexi/widget/kexismalltoolbutton.h b/kexi/widget/kexismalltoolbutton.h
index 13aad9e88..d948f5869 100644
--- a/kexi/widget/kexismalltoolbutton.h
+++ b/kexi/widget/kexismalltoolbutton.h
@@ -21,7 +21,7 @@
 #define KEXISMALLTOOLBUTTON_H
 
 #include <tqtoolbutton.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class TQIconSet;
 
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index d7e2dae11..ef94b5d23 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -32,7 +32,7 @@
 #include <klineedit.h>
 #include <kicontheme.h>
 #include <kpixmapio.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp
index d901d3738..5340691f3 100644
--- a/kexi/widget/relations/kexirelationview.cpp
+++ b/kexi/widget/relations/kexirelationview.cpp
@@ -31,8 +31,8 @@
 #include <tqpopupmenu.h>
 
 #include <klocale.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kglobalsettings.h>
 #include <kmessagebox.h>
 
diff --git a/kexi/widget/relations/kexirelationviewtable.h b/kexi/widget/relations/kexirelationviewtable.h
index 5e3ff332f..25faf8968 100644
--- a/kexi/widget/relations/kexirelationviewtable.h
+++ b/kexi/widget/relations/kexirelationviewtable.h
@@ -24,7 +24,7 @@
 #include <tqframe.h>
 #include <tqstringlist.h>
 #include <tqlabel.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <widget/kexifieldlistview.h>
 
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index 43ff7331a..91523cb77 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -52,8 +52,8 @@
 #include <tdeio/job.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
-#include <kstdaccel.h>
+#include <tdepopupmenu.h>
+#include <tdestdaccel.h>
 
 #include <kexiutils/utils.h>
 #include <widget/utils/kexidropdownbutton.h>
diff --git a/kexi/widget/tableview/kexidatatableview.cpp b/kexi/widget/tableview/kexidatatableview.cpp
index e4a6288e0..8bfc1c480 100644
--- a/kexi/widget/tableview/kexidatatableview.cpp
+++ b/kexi/widget/tableview/kexidatatableview.cpp
@@ -25,7 +25,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <kexidb/connection.h>
 #include <kexidb/cursor.h>
diff --git a/kexi/widget/tableview/kexidatetableedit.cpp b/kexi/widget/tableview/kexidatetableedit.cpp
index 49bb8a0d3..6e538fd17 100644
--- a/kexi/widget/tableview/kexidatetableedit.cpp
+++ b/kexi/widget/tableview/kexidatetableedit.cpp
@@ -42,7 +42,7 @@
 #include <kdatepicker.h>
 #include <kdatetbl.h>
 #include <klineedit.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdatewidget.h>
 
 #include <kexiutils/utils.h>
diff --git a/kexi/widget/tableview/kexidatetimetableedit.cpp b/kexi/widget/tableview/kexidatetimetableedit.cpp
index 35c599cc3..aff64f582 100644
--- a/kexi/widget/tableview/kexidatetimetableedit.cpp
+++ b/kexi/widget/tableview/kexidatetimetableedit.cpp
@@ -42,7 +42,7 @@
 #include <kdatepicker.h>
 #include <kdatetbl.h>
 #include <klineedit.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdatewidget.h>
 
 #include <kexiutils/utils.h>
diff --git a/kexi/widget/tableview/kexitableview_p.h b/kexi/widget/tableview/kexitableview_p.h
index b0679dfa4..1ba7f7911 100644
--- a/kexi/widget/tableview/kexitableview_p.h
+++ b/kexi/widget/tableview/kexitableview_p.h
@@ -38,10 +38,10 @@
 #include <tqasciidict.h>
 
 #include <kpushbutton.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <klineedit.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 
 class KexiTableItem;
 class KexiTableRM;
diff --git a/kexi/widget/tableview/kexitimetableedit.cpp b/kexi/widget/tableview/kexitimetableedit.cpp
index 8110716b5..b6dc69d43 100644
--- a/kexi/widget/tableview/kexitimetableedit.cpp
+++ b/kexi/widget/tableview/kexitimetableedit.cpp
@@ -40,7 +40,7 @@
 #include <kdatepicker.h>
 #include <kdatetbl.h>
 #include <klineedit.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdatewidget.h>
 
 #include <kexiutils/utils.h>
diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
index 4931eb195..858ea9146 100644
--- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
+++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
@@ -19,7 +19,7 @@
 
 #include "kexicomboboxdropdownbutton.h"
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 
diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp
index eb735a49c..caae10b6e 100644
--- a/kexi/widget/utils/kexicontextmenuutils.cpp
+++ b/kexi/widget/utils/kexicontextmenuutils.cpp
@@ -19,7 +19,7 @@
 
 #include "kexicontextmenuutils.h"
 
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
@@ -32,7 +32,7 @@
 
 #ifdef TQ_WS_WIN
 #include <win32_utils.h>
-#include <krecentdirs.h>
+#include <tderecentdirs.h>
 #endif
 
 //! @internal
diff --git a/kexi/widget/utils/kexicontextmenuutils.h b/kexi/widget/utils/kexicontextmenuutils.h
index 826b1ebb0..03e0881cb 100644
--- a/kexi/widget/utils/kexicontextmenuutils.h
+++ b/kexi/widget/utils/kexicontextmenuutils.h
@@ -21,7 +21,7 @@
 #define KexiContextMenuUtils_H
 
 #include <kexidb/queryschema.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurl.h>
 
 class TDEActionCollection;
diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp
index 6582b3213..21bb24ded 100644
--- a/kexi/widget/utils/kexidatetimeformatter.cpp
+++ b/kexi/widget/utils/kexidatetimeformatter.cpp
@@ -25,7 +25,7 @@
 #include <kdatepicker.h>
 #include <kdatetbl.h>
 #include <klineedit.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdatewidget.h>
 
 KexiDateFormatter::KexiDateFormatter()
diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp
index fa9b24976..c3a14dcab 100644
--- a/kexi/widget/utils/kexidropdownbutton.cpp
+++ b/kexi/widget/utils/kexidropdownbutton.cpp
@@ -19,7 +19,7 @@
 
 #include "kexidropdownbutton.h"
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 
 #include <tqstyle.h>
diff --git a/kexi/widget/utils/kexisharedactionclient.cpp b/kexi/widget/utils/kexisharedactionclient.cpp
index ec7d06302..6e38f95b9 100644
--- a/kexi/widget/utils/kexisharedactionclient.cpp
+++ b/kexi/widget/utils/kexisharedactionclient.cpp
@@ -19,7 +19,7 @@
 
 #include "kexisharedactionclient.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 KexiSharedActionClient::KexiSharedActionClient()
  : m_sharedActions(1009, false)
diff --git a/kexi/widget/utils/tdelistviewitemtemplate.h b/kexi/widget/utils/tdelistviewitemtemplate.h
index 9a4a3be4f..21430b247 100644
--- a/kexi/widget/utils/tdelistviewitemtemplate.h
+++ b/kexi/widget/utils/tdelistviewitemtemplate.h
@@ -20,7 +20,7 @@
 #ifndef KLISTVIEWITEMTEMPLATE_H
 #define KLISTVIEWITEMTEMPLATE_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 //! TQListViewItem class with ability for storing additional data member
 template<class type>