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

7 files changed, 11 insertions, 11 deletions

diff --git a/src/common/global/generic_config.cpp b/src/common/global/generic_config.cpp
index 9d951aa..48c705b 100644
--- a/src/common/global/generic_config.cpp
+++ b/src/common/global/generic_config.cpp
@@ -20,7 +20,7 @@ public:
 };
 #else
 #  include <kapplication.h>
-#  include <kconfig.h>
+#  include <tdeconfig.h>
 class GenericConfigPrivate
 {
 public:
diff --git a/src/common/global/global.h b/src/common/global/global.h
index 9eb8979..0bc0b58 100644
--- a/src/common/global/global.h
+++ b/src/common/global/global.h
@@ -35,7 +35,7 @@
 #  include <kaboutdata.h>
 #  include <kcmdlineargs.h>
 #  include <ktempfile.h>
-#  include <kconfigbackend.h>
+#  include <tdeconfigbackend.h>
 #endif
 
 #if defined(Q_OS_WIN)
diff --git a/src/common/global/purl.cpp b/src/common/global/purl.cpp
index 29da212..c47fa7b 100644
--- a/src/common/global/purl.cpp
+++ b/src/common/global/purl.cpp
@@ -19,9 +19,9 @@
 #include "process.h"
 
 #if !defined(NO_KDE)
-# include <kio/netaccess.h>
-# include <kfileitem.h>
-# include <kconfigbackend.h>
+# include <tdeio/netaccess.h>
+# include <tdefileitem.h>
+# include <tdeconfigbackend.h>
 #endif
 
 //-----------------------------------------------------------------------------
diff --git a/src/common/gui/pfile_ext.cpp b/src/common/gui/pfile_ext.cpp
index f15baf8..b210643 100644
--- a/src/common/gui/pfile_ext.cpp
+++ b/src/common/gui/pfile_ext.cpp
@@ -9,7 +9,7 @@
 #include "pfile_ext.h"
 
 #include <tqfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <ktempfile.h>
 #include "common/gui/misc_gui.h"
 
diff --git a/src/common/gui/purl_ext.cpp b/src/common/gui/purl_ext.cpp
index 8e4a255..82348b5 100644
--- a/src/common/gui/purl_ext.cpp
+++ b/src/common/gui/purl_ext.cpp
@@ -10,10 +10,10 @@
 
 #include <tqfile.h>
 #include <tqapplication.h>
-#include <kio/netaccess.h>
-#include <kfileitem.h>
+#include <tdeio/netaccess.h>
+#include <tdefileitem.h>
 #include <ktempfile.h>
-#include <kconfigbackend.h>
+#include <tdeconfigbackend.h>
 
 #include "common/global/pfile.h"
 
diff --git a/src/common/gui/purl_gui.cpp b/src/common/gui/purl_gui.cpp
index 7515b99..614ef76 100644
--- a/src/common/gui/purl_gui.cpp
+++ b/src/common/gui/purl_gui.cpp
@@ -12,7 +12,7 @@
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <krun.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdirselectdialog.h>
 
 #include "misc_gui.h"
diff --git a/src/common/nokde/win32_utils.h b/src/common/nokde/win32_utils.h
index 7b50f96..d234ad2 100644
--- a/src/common/nokde/win32_utils.h
+++ b/src/common/nokde/win32_utils.h
@@ -82,7 +82,7 @@ bool showWin32FilePropertyDialog(const TQString& fileName);
 /**
  \return two-letter locale name (like "en" or "pl") taken from MS Windows native registry.
  Useful when we don't want to rely on KSyCoCa.
- Used e.g. by kbuildsycoca application.
+ Used e.g. by tdebuildsycoca application.
 */
 KDEWIN32_EXPORT
 TQCString getWin32LocaleName();