From ece35c015c54312eb13f583cc247cdd9a4051b4d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:12:56 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 kexi/main/kexifinddialog.cpp                        | 2 +-
 kexi/main/keximainwindowimpl.cpp                    | 8 ++++----
 kexi/main/kexinewstuff.cpp                          | 2 +-
 kexi/main/printing/kexisimpleprintingengine.cpp     | 2 +-
 kexi/main/printing/kexisimpleprintingpagesetup.cpp  | 2 +-
 kexi/main/printing/kexisimpleprintpreviewwindow.cpp | 2 +-
 kexi/main/printing/kexisimpleprintpreviewwindow.h   | 2 +-
 kexi/main/startup/KexiConnSelector.cpp              | 8 ++++----
 kexi/main/startup/KexiConnSelector.h                | 2 +-
 kexi/main/startup/KexiNewPrjTypeSelector.ui         | 2 +-
 kexi/main/startup/KexiNewProjectWizard.cpp          | 2 +-
 kexi/main/startup/KexiStartupDialogTemplatesPage.h  | 2 +-
 kexi/main/startup/KexiStartupFileDialog_win.cpp     | 2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'kexi/main')

diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp
index 8ca17429..255e1882 100644
--- a/kexi/main/kexifinddialog.cpp
+++ b/kexi/main/kexifinddialog.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 
 #include <tqcheckbox.h>
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 4bfaef61..2dd9ebe1 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -38,9 +38,9 @@
 
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
@@ -58,7 +58,7 @@
 #include <kimageio.h>
 #include <khelpmenu.h>
 #include <tdefiledialog.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 
 #include <kexidb/connection.h>
 #include <kexidb/utils.h>
@@ -102,7 +102,7 @@
 
 //Extreme verbose debug
 #if defined(TQ_WS_WIN)
-# include <krecentdirs.h>
+# include <tderecentdirs.h>
 # include <win32_utils.h>
 //# define KexiVDebug kdDebug()
 #endif
diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp
index 7ca0ceb4..49ebd9fd 100644
--- a/kexi/main/kexinewstuff.cpp
+++ b/kexi/main/kexinewstuff.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <ktar.h>
 #include <tqdir.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp
index 66fe0028..36560959 100644
--- a/kexi/main/printing/kexisimpleprintingengine.cpp
+++ b/kexi/main/printing/kexisimpleprintingengine.cpp
@@ -25,7 +25,7 @@
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kurllabel.h>
 #include <kdebug.h>
 
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
index de3f64e2..0388eebe 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
@@ -28,7 +28,7 @@
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kurllabel.h>
 #include <kdebug.h>
 #include <klineedit.h>
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index e587556b..0d6634ab 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -28,7 +28,7 @@
 #include <tqlabel.h>
 
 #include <kdialogbase.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.h b/kexi/main/printing/kexisimpleprintpreviewwindow.h
index c966553f..5e42bf55 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.h
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.h
@@ -22,7 +22,7 @@
 
 #include <tqpainter.h>
 #include <tqscrollview.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <KoPageLayoutDia.h>
 
 class KexiSimplePrintPreviewScrollView;
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index 22b09eef..2558b4e7 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -35,10 +35,10 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kurlcombobox.h>
-#include <ktoolbar.h>
-#include <kpopupmenu.h>
-#include <ktoolbarbutton.h>
-#include <kactionclasses.h>
+#include <tdetoolbar.h>
+#include <tdepopupmenu.h>
+#include <tdetoolbarbutton.h>
+#include <tdeactionclasses.h>
 
 #include <tqlabel.h>
 #include <tqpushbutton.h>
diff --git a/kexi/main/startup/KexiConnSelector.h b/kexi/main/startup/KexiConnSelector.h
index ab4ed10a..7bd3c8fb 100644
--- a/kexi/main/startup/KexiConnSelector.h
+++ b/kexi/main/startup/KexiConnSelector.h
@@ -25,7 +25,7 @@
 #include "KexiStartupFileDialog.h"
 
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqguardedptr.h>
 
diff --git a/kexi/main/startup/KexiNewPrjTypeSelector.ui b/kexi/main/startup/KexiNewPrjTypeSelector.ui
index 9ea3a0db..5e4e0283 100644
--- a/kexi/main/startup/KexiNewPrjTypeSelector.ui
+++ b/kexi/main/startup/KexiNewPrjTypeSelector.ui
@@ -89,6 +89,6 @@
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index 44fb7026..e7f613e6 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -38,7 +38,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurlcombobox.h>
 #include <kmessagebox.h>
 #include <klineedit.h>
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.h b/kexi/main/startup/KexiStartupDialogTemplatesPage.h
index 07b8b663..74591986 100644
--- a/kexi/main/startup/KexiStartupDialogTemplatesPage.h
+++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.h
@@ -20,7 +20,7 @@
 #ifndef KexiStartupDialogTemplatesPage_h
 #define KexiStartupDialogTemplatesPage_h
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <core/kexiprojectdata.h>
 
 /*! Helper class for displaying templates set with description. */
diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp
index 29567ce0..ff2981f7 100644
--- a/kexi/main/startup/KexiStartupFileDialog_win.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp
@@ -27,7 +27,7 @@
 
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <krecentdirs.h>
+#include <tderecentdirs.h>
 
 #include <tqobjectlist.h>
 #include <tqlineedit.h>
-- 
cgit v1.2.1