Rename a number of libraries and executables to avoid conflicts with KDE4

8 files changed, 13 insertions, 13 deletions

diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index b3d36240..ce29b32e 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -41,7 +41,7 @@
 #include <kaction.h>
 #include <klocale.h>
 #include <kstdaccel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <kkeydialog.h>
@@ -57,7 +57,7 @@
 #include <ktabwidget.h>
 #include <kimageio.h>
 #include <khelpmenu.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <krecentdocument.h>
 
 #include <kexidb/connection.h>
diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp
index 99ec8a31..7ca0ceb4 100644
--- a/kexi/main/kexinewstuff.cpp
+++ b/kexi/main/kexinewstuff.cpp
@@ -24,7 +24,7 @@
 #include <tqdir.h>
 #include <kaction.h>
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <tdeversion.h>
 
@@ -33,7 +33,7 @@
 KexiNewStuff::KexiNewStuff(TQWidget *parent)
  : KNewStuff( "kexi/template"
 #if KDE_IS_VERSION(3,3,0)
-	, "http://download.kde.org/khotnewstuff/kexi-providers.xml"
+	, "http://download.kde.org/tdehotnewstuff/kexi-providers.xml"
 #endif
 	, parent)
 {
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index abbfac21..22b09eef 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -33,7 +33,7 @@
 #include <kmimetype.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurlcombobox.h>
 #include <ktoolbar.h>
 #include <kpopupmenu.h>
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index 414fcfcd..3e59d937 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -37,7 +37,7 @@
 #include <kmimetype.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <kurlcombobox.h>
 #include <kmessagebox.h>
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index f6ded39a..5c281256 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -44,13 +44,13 @@
 #include <kjanuswidget.h>
 #include <kglobalsettings.h>
 #include <ktextedit.h>
-#include <kfileiconview.h>
-#include <kfileitem.h>
+#include <tdefileiconview.h>
+#include <tdefileitem.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <kmimetype.h>
 #include <ktextbrowser.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #ifdef KEXI_SHOW_UNIMPLEMENTED
 #define KEXI_STARTUP_SHOW_TEMPLATES
diff --git a/kexi/main/startup/KexiStartupDialog.h b/kexi/main/startup/KexiStartupDialog.h
index 9ae922c6..4d1d342f 100644
--- a/kexi/main/startup/KexiStartupDialog.h
+++ b/kexi/main/startup/KexiStartupDialog.h
@@ -23,8 +23,8 @@
 #include <kdialogbase.h>
 #include <kicondialog.h>
 #include <kiconview.h>
-#include <kfileiconview.h>
-#include <kfiledialog.h>
+#include <tdefileiconview.h>
+#include <tdefiledialog.h>
 
 #include <tqlabel.h>
 #include <tqsplitter.h>
diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp
index 71e4a317..1bccbf1e 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -32,7 +32,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmimetype.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kurlcombobox.h>
 
 KexiStartupFileDialog::KexiStartupFileDialog(
diff --git a/kexi/main/startup/KexiStartupFileDialog.h b/kexi/main/startup/KexiStartupFileDialog.h
index 1b99391d..e27f200d 100644
--- a/kexi/main/startup/KexiStartupFileDialog.h
+++ b/kexi/main/startup/KexiStartupFileDialog.h
@@ -20,7 +20,7 @@
 #ifndef _KexiStartupFileDialog_h_
 #define _KexiStartupFileDialog_h_
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #ifdef TQ_WS_WIN
 # include "KexiStartupFileDialogBase_win.h"