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

26 files changed, 49 insertions, 53 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ca02daae..558caeb4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_subdirectory( profiles )
 add_subdirectory( profileengine )
 add_subdirectory( newui )
-add_subdirectory( kconf_update )
+add_subdirectory( tdeconf_update )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/src/Makefile.am b/src/Makefile.am
index 4cf58098..d2d434da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,7 +34,7 @@ rc_DATA = tdevelopui.rc eventsrc
 tdevelopdatadir = $(kde_confdir)
 tdevelopdata_DATA = tdeveloprc kdevassistantrc
 
-SUBDIRS = profiles profileengine newui kconf_update
+SUBDIRS = profiles profileengine newui tdeconf_update
 kdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner
 kdevassistant_SOURCES = main_assistant.cpp kdevassistantextension.cpp
 kdevassistant_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner
diff --git a/src/core.cpp b/src/core.cpp
index d08a826e..7d937d16 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -5,7 +5,7 @@
 #include <kdebug.h>
 #include <kstatusbar.h>
 #include <kmainwindow.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp
index 55861014..c9d34e29 100644
--- a/src/editorproxy.cpp
+++ b/src/editorproxy.cpp
@@ -4,7 +4,7 @@
 
 #include <tdeversion.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 #include <tdeparts/part.h>
diff --git a/src/kconf_update/Makefile.am b/src/kconf_update/Makefile.am
deleted file mode 100644
index e7317f2b..00000000
--- a/src/kconf_update/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT $(all_includes)
-
-update_DATA = kdev-gen-settings.upd 
-updatedir = $(kde_datadir)/kconf_update
-
-# The Qt app cannot go into kde_datadir, that is not portable.
-# install to kde_bindir/kconf_update_bin instead.
-# KDE 3.2 will allow kconf_update scripts to run directly from there,
-# but for us that's too late. Use the .sh script as a workaround.
-kconf_PROGRAMS = kdev-gen-settings-kconf_update
-kconfdir = $(libdir)/kconf_update_bin
-
-kdev_gen_settings_kconf_update_SOURCES = kdev-gen-settings-kconf_update.cpp
-kdev_gen_settings_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kdev_gen_settings_kconf_update_LDADD   = $(LIB_QT)
-
-# vim: set noet:
-
diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp
index a034cc52..f56294a3 100644
--- a/src/kdevideextension.cpp
+++ b/src/kdevideextension.cpp
@@ -27,7 +27,7 @@
 #include <klineedit.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kurlrequester.h>
diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp
index 51cb3901..25f2514d 100644
--- a/src/languageselectwidget.cpp
+++ b/src/languageselectwidget.cpp
@@ -19,7 +19,7 @@
 #include <tqhbox.h>
 #include <tqregexp.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp
index d03fffed..1b9f492f 100644
--- a/src/mainwindowshare.cpp
+++ b/src/mainwindowshare.cpp
@@ -31,7 +31,7 @@
 #include <kstatusbar.h>
 #include <tdeparts/mainwindow.h>
 #include <kdialogbase.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kkeydialog.h>
 #include <kmenubar.h>
 #include <kedittoolbar.h>
diff --git a/src/newui/CMakeLists.txt b/src/newui/CMakeLists.txt
index e6f6b124..b1f89a56 100644
--- a/src/newui/CMakeLists.txt
+++ b/src/newui/CMakeLists.txt
@@ -15,10 +15,6 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
 )
 
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-)
-
 
 ##### d (shared) ################################
 
diff --git a/src/newui/button.cpp b/src/newui/button.cpp
index 4381ee2d..fc6720f9 100644
--- a/src/newui/button.cpp
+++ b/src/newui/button.cpp
@@ -33,7 +33,7 @@
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "buttonbar.h"
 
diff --git a/src/newui/buttonbar.cpp b/src/newui/buttonbar.cpp
index f64e0695..13afb6c0 100644
--- a/src/newui/buttonbar.cpp
+++ b/src/newui/buttonbar.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstringhandler.h>
 #include <klocale.h>
 
diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp
index d8abfde7..091ad1c0 100644
--- a/src/newui/ddockwindow.cpp
+++ b/src/newui/ddockwindow.cpp
@@ -29,7 +29,7 @@
 
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp
index d8b79f22..1cdd0551 100644
--- a/src/newui/dmainwindow.cpp
+++ b/src/newui/dmainwindow.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 
 #include <tqtoolbutton.h>
diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp
index 92148207..e56a83f8 100644
--- a/src/newui/dtabwidget.cpp
+++ b/src/newui/dtabwidget.cpp
@@ -22,7 +22,7 @@
 #include <tqtoolbutton.h>
 #include <tqtabbar.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 
diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp
index ab13eff5..d3e3faa5 100644
--- a/src/partcontroller.cpp
+++ b/src/partcontroller.cpp
@@ -23,14 +23,14 @@
 #include <tdeparts/factory.h>
 #include <tdeparts/partmanager.h>
 #include <tdeparts/browserextension.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmainwindow.h>
 #include <kaction.h>
 #include <kmessagebox.h>
 #include <kstatusbar.h>
 #include <tdehtml_part.h>
 #include <kpopupmenu.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kdialogbase.h>
 #include <klineedit.h>
 #include <kshortcut.h>
diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp
index 18440daa..91abe5e7 100644
--- a/src/plugincontroller.cpp
+++ b/src/plugincontroller.cpp
@@ -7,7 +7,7 @@
 #include <kservice.h>
 #include <ktrader.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmainwindow.h>
 #include <tdeparts/componentfactory.h>
diff --git a/src/profileengine/editor/CMakeLists.txt b/src/profileengine/editor/CMakeLists.txt
index ddc82809..cfd7c59c 100644
--- a/src/profileengine/editor/CMakeLists.txt
+++ b/src/profileengine/editor/CMakeLists.txt
@@ -25,7 +25,7 @@ link_directories(
 
 tde_add_executable( kdevprofileeditor
   SOURCES main.cpp
-  LINK profileeditor-static profileengine-shared kio-shared
+  LINK profileeditor-static profileengine-shared tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/src/profileengine/lib/CMakeLists.txt b/src/profileengine/lib/CMakeLists.txt
index cd36b2da..286a0e04 100644
--- a/src/profileengine/lib/CMakeLists.txt
+++ b/src/profileengine/lib/CMakeLists.txt
@@ -32,6 +32,6 @@ install( FILES
 tde_add_library( profileengine SHARED
   SOURCES profileengine.cpp profile.cpp
   VERSION 0.0.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp
index e568313f..db6cb3fc 100644
--- a/src/profileengine/lib/profile.cpp
+++ b/src/profileengine/lib/profile.cpp
@@ -23,8 +23,8 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
-#include <kio/netaccess.h>
+#include <tdeconfig.h>
+#include <tdeio/netaccess.h>
 
 Profile::Profile(Profile *parent, const TQString &name)
     :m_parent(parent), m_name(name)
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index dffe9b92..80b3670f 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -15,7 +15,7 @@ class TQDomDocument;
 #include <klocale.h>
 #include <kservice.h>
 #include <ktrader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmainwindow.h>
 #include <tdeparts/componentfactory.h>
 #include <kaction.h>
@@ -24,7 +24,7 @@ class TQDomDocument;
 #include <kprocess.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <ktempfile.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index 3f685c3c..d51bc31e 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -34,7 +34,7 @@
 #include <tdetexteditor/document.h>
 #include <kapplication.h>
 #include <kurldrag.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <ddockwindow.h>
 #include <dtabwidget.h>
@@ -99,9 +99,9 @@ void SimpleMainWindow::init()
             " properly.\nPlease make sure "
             "that TDevelop is installed in your TDE directory; otherwise, you have "
             "to add TDevelop's installation "
-            "path to the environment variable TDEDIRS and run kbuildsycoca. Restart "
+            "path to the environment variable TDEDIRS and run tdebuildsycoca. Restart "
             "TDevelop afterwards.\n"
-            "Example for BASH users:\nexport TDEDIRS=/path/to/tdevelop:$TDEDIRS && kbuildsycoca"),
+            "Example for BASH users:\nexport TDEDIRS=/path/to/tdevelop:$TDEDIRS && tdebuildsycoca"),
             i18n("Could Not Find Plugins") );
     }
 
diff --git a/src/kconf_update/CMakeLists.txt b/src/tdeconf_update/CMakeLists.txt
index a374f34a..4b605615 100644
--- a/src/kconf_update/CMakeLists.txt
+++ b/src/tdeconf_update/CMakeLists.txt
@@ -23,10 +23,10 @@ link_directories(
 install( FILES kdev-gen-settings.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 
 
-##### kdev-gen-settings-kconf_update (executable)
+##### kdev-gen-settings-tdeconf_update (executable)
 
-tde_add_executable( kdev-gen-settings-kconf_update
-  SOURCES kdev-gen-settings-kconf_update.cpp
+tde_add_executable( kdev-gen-settings-tdeconf_update
+  SOURCES kdev-gen-settings-tdeconf_update.cpp
   LINK ${TQT_LIBRARIES}
-  DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
+  DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
 )
diff --git a/src/tdeconf_update/Makefile.am b/src/tdeconf_update/Makefile.am
new file mode 100644
index 00000000..d256951b
--- /dev/null
+++ b/src/tdeconf_update/Makefile.am
@@ -0,0 +1,18 @@
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT $(all_includes)
+
+update_DATA = kdev-gen-settings.upd 
+updatedir = $(kde_datadir)/tdeconf_update
+
+# The Qt app cannot go into kde_datadir, that is not portable.
+# install to kde_bindir/tdeconf_update_bin instead.
+# KDE 3.2 will allow tdeconf_update scripts to run directly from there,
+# but for us that's too late. Use the .sh script as a workaround.
+tdeconf_PROGRAMS = kdev-gen-settings-tdeconf_update
+tdeconfdir = $(libdir)/tdeconf_update_bin
+
+kdev_gen_settings_tdeconf_update_SOURCES = kdev-gen-settings-tdeconf_update.cpp
+kdev_gen_settings_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kdev_gen_settings_tdeconf_update_LDADD   = $(LIB_QT)
+
+# vim: set noet:
+
diff --git a/src/kconf_update/kdev-gen-settings-kconf_update.cpp b/src/tdeconf_update/kdev-gen-settings-tdeconf_update.cpp
index 64c0b791..63e4a834 100644
--- a/src/kconf_update/kdev-gen-settings-kconf_update.cpp
+++ b/src/tdeconf_update/kdev-gen-settings-tdeconf_update.cpp
@@ -1,5 +1,5 @@
 /*
-    kconf_update app for migrating tdevelop's ui settings to the new
+    tdeconf_update app for migrating tdevelop's ui settings to the new
     code that will be in 3.3.
 
     Copyright (c) 2005 by Matt Rogers <mattr@kde.org>
diff --git a/src/kconf_update/kdev-gen-settings.upd b/src/tdeconf_update/kdev-gen-settings.upd
index 85f2235d..1fd3803f 100644
--- a/src/kconf_update/kdev-gen-settings.upd
+++ b/src/tdeconf_update/kdev-gen-settings.upd
@@ -2,7 +2,7 @@
 #new UI file created on 20050406
 Id=kdev-gen-settings-update/5
 File=tdeveloprc
-Script=kdev-gen-settings-kconf_update
+Script=kdev-gen-settings-tdeconf_update
 Options=overwrite
 AllKeys
 
diff --git a/src/toplevel.cpp b/src/toplevel.cpp
index 048b325c..2e41e1dc 100644
--- a/src/toplevel.cpp
+++ b/src/toplevel.cpp
@@ -1,6 +1,6 @@
 #include <kxmlguiclient.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 #include "toplevel.h"