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

10 files changed, 11 insertions, 15 deletions

diff --git a/lib/cppparser/CMakeLists.txt b/lib/cppparser/CMakeLists.txt
index e9da8af2..3b53e900 100644
--- a/lib/cppparser/CMakeLists.txt
+++ b/lib/cppparser/CMakeLists.txt
@@ -38,6 +38,6 @@ tde_add_library( kdevcppparser SHARED AUTOMOC
     ast.cpp cachemanager.cpp driver.cpp errors.cpp lexer.cpp
     lexercache.cpp lookup.cpp parser.cpp tree_parser.cpp
   VERSION 0.0.0
-  LINK kdevinterfaces-static kio-shared
+  LINK kdevinterfaces-static tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/lib/interfaces/external/CMakeLists.txt b/lib/interfaces/external/CMakeLists.txt
index 46e2bfa7..353721fd 100644
--- a/lib/interfaces/external/CMakeLists.txt
+++ b/lib/interfaces/external/CMakeLists.txt
@@ -15,10 +15,6 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
 )
 
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-)
-
 
 ##### headers ###################################
 
diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp
index f7895145..0b05d445 100644
--- a/lib/util/settings.cpp
+++ b/lib/util/settings.cpp
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 
diff --git a/lib/widgets/CMakeLists.txt b/lib/widgets/CMakeLists.txt
index d7e92092..d9003dbd 100644
--- a/lib/widgets/CMakeLists.txt
+++ b/lib/widgets/CMakeLists.txt
@@ -47,6 +47,6 @@ tde_add_library( kdevwidgets SHARED AUTOMOC
     processlinemaker.cpp processwidget.cpp ksavealldialog.cpp
     fancylistviewitem.cpp
   VERSION 0.0.0
-  LINK kio-shared tdehtml-shared
+  LINK tdeio-shared tdehtml-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/lib/widgets/flagboxes.h b/lib/widgets/flagboxes.h
index ce5c6205..60b9d850 100644
--- a/lib/widgets/flagboxes.h
+++ b/lib/widgets/flagboxes.h
@@ -21,7 +21,7 @@
 #ifndef _FLAGBOXES_H_
 #define _FLAGBOXES_H_
 
-#include <kfile.h>
+#include <tdefile.h>
 
 /**
 @file flagboxes.h
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp
index 85990989..49ac87d2 100644
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@@ -12,7 +12,7 @@
 #include <kmainwindow.h>
 #include <tdehtmlview.h>
 #include <tdehtml_settings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kdevmainwindow.h>
 
@@ -169,7 +169,7 @@ TQString KDevHTMLPart::context() const
 }
 
 
-// Note: this function is a copy of code in tdecore/kconfigbase.cpp ;)
+// Note: this function is a copy of code in tdecore/tdeconfigbase.cpp ;)
 static bool isUtf8(const char *buf) {
   int i, n;
   register unsigned char c;
@@ -256,7 +256,7 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
   TQString path = url;
   int nDollarPos = path.find( '$' );
 
-  // Note: the while loop below is a copy of code in tdecore/kconfigbase.cpp ;)
+  // Note: the while loop below is a copy of code in tdecore/tdeconfigbase.cpp ;)
   while( nDollarPos != -1 && nDollarPos+1 < static_cast<int>(path.length())) {
     // there is at least one $
     if( (path)[nDollarPos+1] == '(' ) {
diff --git a/lib/widgets/klistviewaction.cpp b/lib/widgets/klistviewaction.cpp
index b4110375..631ad9d1 100644
--- a/lib/widgets/klistviewaction.cpp
+++ b/lib/widgets/klistviewaction.cpp
@@ -23,7 +23,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 KListViewAction::~KListViewAction()
diff --git a/lib/widgets/propeditor/CMakeLists.txt b/lib/widgets/propeditor/CMakeLists.txt
index 08a1b665..2620aaa0 100644
--- a/lib/widgets/propeditor/CMakeLists.txt
+++ b/lib/widgets/propeditor/CMakeLists.txt
@@ -54,6 +54,6 @@ tde_add_library( kdevpropertyeditor SHARED AUTOMOC
     pspinbox.cpp propertywidgetproxy.cpp plinestyleedit.cpp
     qeditlistbox.cpp
   VERSION 0.0.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp
index bd8af048..e7980d66 100644
--- a/lib/widgets/propeditor/ppixmapedit.cpp
+++ b/lib/widgets/propeditor/ppixmapedit.cpp
@@ -33,7 +33,7 @@
 #endif
 
 #ifndef PURE_QT
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #else
 #include <tqfiledialog.h>
 #endif
diff --git a/lib/widgets/propeditor/purledit.h b/lib/widgets/propeditor/purledit.h
index 88435a40..bed86853 100644
--- a/lib/widgets/propeditor/purledit.h
+++ b/lib/widgets/propeditor/purledit.h
@@ -23,7 +23,7 @@
 #include "propertywidget.h"
 
 #ifndef PURE_QT
-#include <kfile.h>
+#include <tdefile.h>
 class KURLRequester;
 #else
 #include <klineedit.h>