Additional kde to tde renaming

14 files changed, 26 insertions, 26 deletions

diff --git a/konqueror/CMakeLists.txt b/konqueror/CMakeLists.txt
index b0e77858e..e257145ec 100644
--- a/konqueror/CMakeLists.txt
+++ b/konqueror/CMakeLists.txt
@@ -92,7 +92,7 @@ tde_add_library( ${target} STATIC_PIC
 )
 
 
-##### konqueror (kdeinit) #######################
+##### konqueror (tdeinit) #######################
 
 set( target konqueror )
 
@@ -106,7 +106,7 @@ set( ${target}_SRCS
   delayedinitializer.cc konq_mainwindow.cc konq_extensionmanager.cc
 )
 
-tde_add_kdeinit_executable( ${target} AUTOMOC
+tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
   LINK konqueror_intern-static konq-shared kutils-shared
 )
diff --git a/konqueror/DESIGN b/konqueror/DESIGN
index fb2628aaa..459ade9c8 100644
--- a/konqueror/DESIGN
+++ b/konqueror/DESIGN
@@ -39,7 +39,7 @@ dirtree/*  : KonqDirTree, the directory tree
 Libs used by konqueror
 ======================
 
-kdecore, kdeui, kfile, khtml, kparts - usual stuff :)
+tdecore, tdeui, kfile, khtml, kparts - usual stuff :)
 libkio - I/O stuff, mimetypes, services
 libkonq - bookmarks, properties dialog, templates ("new") menu, icon view widget
 
diff --git a/konqueror/Makefile.am b/konqueror/Makefile.am
index 6dff1eb43..502622344 100644
--- a/konqueror/Makefile.am
+++ b/konqueror/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = . client iconview listview keditbookmarks shellcmdplugin about pics si
 
 bin_PROGRAMS =
 lib_LTLIBRARIES =
-kdeinit_LTLIBRARIES = konqueror.la
+tdeinit_LTLIBRARIES = konqueror.la
 
 noinst_LTLIBRARIES = libkonqueror_intern.la
 konqdatadir = $(kde_datadir)/konqueror
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index 188971bd9..03dfad93b 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -110,9 +110,9 @@ TQString KonqAboutPageFactory::launch()
   TQString home_folder = TQDir::homeDirPath();
   TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
 
-  res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) );
+  res = res.tqarg( locate( "data", "tdeui/about/kde_infopage.css" ) );
   if ( kapp->reverseLayout() )
-    res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) );
+    res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
   else
     res = res.tqarg( "" );
 
@@ -195,9 +195,9 @@ TQString KonqAboutPageFactory::intro()
     TQString gohome_icon_path = iconloader->iconPath("gohome", KIcon::Small );
     TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
 
-    res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) );
+    res = res.tqarg( locate( "data", "tdeui/about/kde_infopage.css" ) );
     if ( kapp->reverseLayout() )
-	res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) );
+	res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
 	res = res.tqarg( "" );
 
@@ -250,9 +250,9 @@ TQString KonqAboutPageFactory::specs()
     if ( res.isEmpty() )
 	return res;
 
-    res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) );
+    res = res.tqarg( locate( "data", "tdeui/about/kde_infopage.css" ) );
     if ( kapp->reverseLayout() )
-	res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) );
+	res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
 	res = res.tqarg( "" );
 
@@ -347,9 +347,9 @@ TQString KonqAboutPageFactory::tips()
 	    iconloader->iconPath("view_left_right", KIcon::Small );
     TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
 
-    res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) );
+    res = res.tqarg( locate( "data", "tdeui/about/kde_infopage.css" ) );
     if ( kapp->reverseLayout() )
-	res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) );
+	res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
 	res = res.tqarg( "" );
 
@@ -503,7 +503,7 @@ void KonqAboutPage::urlSelected( const TQString &url, int button, int state, con
         TQStringList args = TQStringList::split( TQChar( ' ' ), url.mid( 6 ) );
         TQString executable = args[ 0 ];
         args.remove( args.begin() );
-        KApplication::kdeinitExec( executable, args );
+        KApplication::tdeinitExec( executable, args );
         return;
     }
 
diff --git a/konqueror/client/CMakeLists.txt b/konqueror/client/CMakeLists.txt
index e711e1f82..558a5d7f9 100644
--- a/konqueror/client/CMakeLists.txt
+++ b/konqueror/client/CMakeLists.txt
@@ -27,7 +27,7 @@ install( FILES kfmclient_3_2.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
 install( PROGRAMS kfmclient_3_2_update.sh DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
 
 
-##### kfmclient (kdeinit) #######################
+##### kfmclient (tdeinit) #######################
 
 set( target kfmclient )
 
@@ -37,7 +37,7 @@ set( ${target}_SRCS
   ${CMAKE_SOURCE_DIR}/kdesktop/KDesktopIface.stub
 )
 
-tde_add_kdeinit_executable( ${target} AUTOMOC
+tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
   LINK kio-shared
 )
diff --git a/konqueror/client/Makefile.am b/konqueror/client/Makefile.am
index 97a5b66e4..bef42b01c 100644
--- a/konqueror/client/Makefile.am
+++ b/konqueror/client/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -DQT_NO_CAST_ASCII
 
 bin_PROGRAMS= 
 lib_LTLIBRARIES = 
-kdeinit_LTLIBRARIES = kfmclient.la
+tdeinit_LTLIBRARIES = kfmclient.la
 
 INCLUDES= -I.. $(all_includes)
 kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version
diff --git a/konqueror/keditbookmarks/CMakeLists.txt b/konqueror/keditbookmarks/CMakeLists.txt
index 37882a447..e5954898b 100644
--- a/konqueror/keditbookmarks/CMakeLists.txt
+++ b/konqueror/keditbookmarks/CMakeLists.txt
@@ -42,7 +42,7 @@ tde_add_executable( ${target}
 )
 
 
-##### keditbookmarks (kdeinit) ##################
+##### keditbookmarks (tdeinit) ##################
 
 set( target keditbookmarks )
 
@@ -56,7 +56,7 @@ set( ${target}_SRCS AUTOMOC
 
 set( KDE3_DCOPIDL_EXECUTABLE ${KDE3_DCOPIDLNG_EXECUTABLE} )
 
-tde_add_kdeinit_executable( ${target} AUTOMOC
+tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
   LINK konq-shared
 )
diff --git a/konqueror/keditbookmarks/Makefile.am b/konqueror/keditbookmarks/Makefile.am
index bc7c785ae..e9dd03ba1 100644
--- a/konqueror/keditbookmarks/Makefile.am
+++ b/konqueror/keditbookmarks/Makefile.am
@@ -4,10 +4,10 @@ METASOURCES = AUTO
 
 bin_PROGRAMS = kbookmarkmerger
 lib_LTLIBRARIES =
-kdeinit_LTLIBRARIES = keditbookmarks.la
+tdeinit_LTLIBRARIES = keditbookmarks.la
 
 kbookmarkmerger_SOURCES = kbookmarkmerger.cpp
-kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kbookmarkmerger_LDADD = $(LIB_KIO)
 
 dcop_DCOPIDLNG = true
diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc
index 8febd505b..e08074206 100644
--- a/konqueror/konq_combo.cc
+++ b/konqueror/konq_combo.cc
@@ -448,7 +448,7 @@ void KonqCombo::selectWord(TQKeyEvent *e)
     int pos_old = pos;
     int count = 0;  
 
-    // TODO: make these a parameter when in kdelibs/kdeui...
+    // TODO: make these a parameter when in kdelibs/tdeui...
     TQValueList<TQChar> chars;
     chars << TQChar('/') << TQChar('.') << TQChar('?') << TQChar('#') << TQChar(':');    
     bool allow_space_break = true;
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 6390c2652..ea02b6f6a 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -5945,7 +5945,7 @@ static int current_memory_usage( int* limit )
 // Check malloc() usage - very imprecise, but better than nothing.
     int usage_sum = 0;
 #if defined(KDE_MALLINFO_STDLIB) || defined(KDE_MALLINFO_MALLOC)
-    // ugly hack for kdecore/malloc
+    // ugly hack for tdecore/malloc
     extern int kde_malloc_is_used;
     free( calloc( 4, 4 )); // trigger setting kde_malloc_is_used
     if( kde_malloc_is_used )
diff --git a/konqueror/preloader/CMakeLists.txt b/konqueror/preloader/CMakeLists.txt
index 5cd4c4411..d8e33ef40 100644
--- a/konqueror/preloader/CMakeLists.txt
+++ b/konqueror/preloader/CMakeLists.txt
@@ -40,6 +40,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK konqueror_intern-static kio-shared kdeinit_kded-shared
+  LINK konqueror_intern-static kio-shared tdeinit_kded-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/konqueror/preloader/preloader.cc b/konqueror/preloader/preloader.cc
index 020d7dc6b..014ee769b 100644
--- a/konqueror/preloader/preloader.cc
+++ b/konqueror/preloader/preloader.cc
@@ -109,7 +109,7 @@ void KonqyPreloader::updateCount()
 	{
 	if( !check_always_preloaded_timer.isActive())
 	    {
-	    if( kapp->kdeinitExec( TQString::tqfromLatin1( "konqueror" ),
+	    if( kapp->tdeinitExec( TQString::tqfromLatin1( "konqueror" ),
 		TQStringList() << TQString::tqfromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 )
 		{
 		kdDebug( 1202 ) << "Preloading Konqueror instance" << endl;
diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
index 121dac7ad..7af5ed2bf 100644
--- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
@@ -28,7 +28,7 @@
 
 #include <kinputdialog.h>
 #include <kglobalsettings.h>
-#include <kdesu/process.h>
+#include <tdesu/process.h>
 #include <klocale.h>
 
 KShellCommandExecutor::KShellCommandExecutor(const TQString& command, TQWidget* parent)
diff --git a/konqueror/sidebar/trees/history_module/Makefile.am b/konqueror/sidebar/trees/history_module/Makefile.am
index 5f033d662..554804648 100644
--- a/konqueror/sidebar/trees/history_module/Makefile.am
+++ b/konqueror/sidebar/trees/history_module/Makefile.am
@@ -11,6 +11,6 @@ konq_sidebartree_history_la_LIBADD =  ../../libkonqsidebarplugin.la ../libkonq_s
 
 kcm_history_la_SOURCES = kcmhistory.cpp history_dlg.ui history_settings.cpp history_settings.skel
 kcm_history_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_history_la_LIBADD = -lkdeui $(top_builddir)/libkonq/libkonq.la
+kcm_history_la_LIBADD = -ltdeui $(top_builddir)/libkonq/libkonq.la
 
 xdg_apps_DATA = kcmhistory.desktop