Additional k => tde renaming and fixes

14 files changed, 16 insertions, 16 deletions

diff --git a/konqueror/Makefile.am b/konqueror/Makefile.am
index aa9e0d7ae..e84ddffcf 100644
--- a/konqueror/Makefile.am
+++ b/konqueror/Makefile.am
@@ -49,7 +49,7 @@ noinst_HEADERS = KonqMainWindowIface.h KonqViewIface.h delayedinitializer.h \
 	konq_view.h konq_viewmgr.h konq_extensionmanager.h version.h
 
 konqueror_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lconnectionmanager -lnetworkstatus
-konqueror_la_LIBADD = ../libkonq/libkonq.la libkonqueror_intern.la $(LIBMALLOC) $(LIB_KUTILS) -lconnectionmanager -lnetworkstatus
+konqueror_la_LIBADD = ../libkonq/libkonq.la libkonqueror_intern.la $(LIBMALLOC) $(LIB_TDEUTILS) -lconnectionmanager -lnetworkstatus
 
 # Hmm, this experiment of a static konq failed, don't trust it...
 # (but feel free to fix it :)
diff --git a/konqueror/client/Makefile.am b/konqueror/client/Makefile.am
index 059bfa8ec..feef3b720 100644
--- a/konqueror/client/Makefile.am
+++ b/konqueror/client/Makefile.am
@@ -6,7 +6,7 @@ tdeinit_LTLIBRARIES = kfmclient.la
 
 INCLUDES= -I.. $(all_includes)
 kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kfmclient_la_LIBADD =  $(LIB_KIO)
+kfmclient_la_LIBADD =  $(LIB_TDEIO)
 kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub
 
 noinst_HEADERS = kfmclient.h
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index eadd0efcb..6e6a6fb4a 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cc
@@ -1051,7 +1051,7 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries )
 void KonqKfmIconView::slotDeleteItem( KFileItem * _fileitem )
 {
     // new in 3.5.5
-#ifdef KPARTS_BROWSEREXTENSION_HAS_ITEMS_REMOVED
+#ifdef TDEPARTS_BROWSEREXTENSION_HAS_ITEMS_REMOVED
     KFileItemList list;
     list.append( _fileitem );
     emit m_extension->itemsRemoved( list );
diff --git a/konqueror/keditbookmarks/Makefile.am b/konqueror/keditbookmarks/Makefile.am
index 681e1ab14..a062b868f 100644
--- a/konqueror/keditbookmarks/Makefile.am
+++ b/konqueror/keditbookmarks/Makefile.am
@@ -7,8 +7,8 @@ lib_LTLIBRARIES =
 tdeinit_LTLIBRARIES = keditbookmarks.la
 
 kbookmarkmerger_SOURCES = kbookmarkmerger.cpp
-kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kbookmarkmerger_LDADD = $(LIB_KIO)
+kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kbookmarkmerger_LDADD = $(LIB_TDEIO)
 
 dcop_DCOPIDLNG = true
 keditbookmarks_la_SOURCES = main.cpp listview.cpp toplevel.cpp actionsimpl.cpp commands.cpp importers.cpp dcop.skel dcop.cpp bookmarkiterator.cpp  \
diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp
index 4cfb95a7e..f69c01ca5 100644
--- a/konqueror/keditbookmarks/commands.cpp
+++ b/konqueror/keditbookmarks/commands.cpp
@@ -333,7 +333,7 @@ TQString NodeEditCommand::setNodeText(KBookmark bk, const TQStringList &nodehier
 }
 
 void NodeEditCommand::execute() {
-    // DUPLICATED HEAVILY FROM KIO/BOOKMARKS
+    // DUPLICATED HEAVILY FROM TDEIO/BOOKMARKS
     KBookmark bk = CurrentMgr::bookmarkAt(m_address);
     Q_ASSERT(!bk.isNull());
     m_oldText = setNodeText(bk, TQStringList() << m_nodename, m_newText);
diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp
index 082102223..b3b0e2eff 100644
--- a/konqueror/keditbookmarks/updater.cpp
+++ b/konqueror/keditbookmarks/updater.cpp
@@ -147,7 +147,7 @@ FavIconWebGrabber::FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url
 
     // kdDebug() << "FavIconWebGrabber::FavIconWebGrabber starting TDEIO::get() " << url << endl;
 
-//     the use of KIO rather than directly using TDEHTML is to allow silently abort on error
+//     the use of TDEIO rather than directly using TDEHTML is to allow silently abort on error
 
     TDEIO::Job *job = TDEIO::get(m_url, false, false);
     job->addMetaData( TQString("cookies"), TQString("none") );
diff --git a/konqueror/konq_run.cc b/konqueror/konq_run.cc
index 64bb3203f..8c2a91329 100644
--- a/konqueror/konq_run.cc
+++ b/konqueror/konq_run.cc
@@ -59,7 +59,7 @@ void KonqRun::foundMimeType( const TQString & _type )
 {
   //kdDebug(1202) << "KonqRun::foundMimeType " << _type << " m_req=" << m_req.debug() << endl;
 
-  TQString mimeType = _type; // this ref comes from the job, we lose it when using KIO again
+  TQString mimeType = _type; // this ref comes from the job, we lose it when using TDEIO again
 
   m_bFoundMimeType = true;
 
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index 8f86fa0fb..d07edcbd6 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -1282,7 +1282,7 @@ void KonqBaseListViewWidget::slotNewItems( const KFileItemList & entries )
 void KonqBaseListViewWidget::slotDeleteItem( KFileItem * _fileitem )
 {
  // new in 3.5.5
-#ifdef KPARTS_BROWSEREXTENSION_HAS_ITEMS_REMOVED
+#ifdef TDEPARTS_BROWSEREXTENSION_HAS_ITEMS_REMOVED
   KFileItemList list;
   list.append( _fileitem );
   emit m_pBrowserView->extension()->itemsRemoved( list );
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index 5c9cade44..2157b6643 100644
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
@@ -235,7 +235,7 @@ protected:
    // IMO there is really no need for an advanced data structure
    //we have a fixed number of members,
    //it consumes less memory and access should be faster (Alex)
-   // This might not be the case for ever... we should introduce custom fields in kio (David)
+   // This might not be the case for ever... we should introduce custom fields in tdeio (David)
    TQValueVector<ColumnInfo> confColumns;
 
    KonqBaseListViewItem *m_dragOverItem;
diff --git a/konqueror/preloader/Makefile.am b/konqueror/preloader/Makefile.am
index f7c6ffb9f..efe0413bd 100644
--- a/konqueror/preloader/Makefile.am
+++ b/konqueror/preloader/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kded_konqy_preloader.la
 INCLUDES= -I.. $(all_includes)
 kded_konqy_preloader_la_SOURCES = preloader.cc preloader.skel
 kded_konqy_preloader_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_konqy_preloader_la_LIBADD = ../libkonqueror_intern.la $(LIB_KSYCOCA) $(LIB_TDECORE)
+kded_konqy_preloader_la_LIBADD = ../libkonqueror_intern.la $(LIB_TDESYCOCA) $(LIB_TDECORE)
 
 METASOURCES = AUTO
 
diff --git a/konqueror/profile_kde_devel.desktop b/konqueror/profile_kde_devel.desktop
index 6c30b886f..b46628663 100644
--- a/konqueror/profile_kde_devel.desktop
+++ b/konqueror/profile_kde_devel.desktop
@@ -79,7 +79,7 @@ ViewT0_PassiveMode=false
 ViewT0_ServiceName=tdehtml
 ViewT0_ServiceType=text/html
 ViewT0_ToggleView=false
-ViewT0_URL=http://www.trinitydesktop.org/docs/trinity/current/kdelibs/html/main.html
+ViewT0_URL=http://www.trinitydesktop.org/docs/trinity/current/tdelibs/html/main.html
 ViewT1_LinkedView=false
 ViewT1_LockedLocation=false
 ViewT1_PassiveMode=false
diff --git a/konqueror/sidebar/Makefile.am b/konqueror/sidebar/Makefile.am
index 1cfc7f6ac..6f4695dc8 100644
--- a/konqueror/sidebar/Makefile.am
+++ b/konqueror/sidebar/Makefile.am
@@ -22,11 +22,11 @@ kde_module_LTLIBRARIES = konq_sidebar.la
 # the Part's source, library search path, and link libraries
 konq_sidebar_la_SOURCES = konqsidebar.cpp sidebar_widget.cpp 
 konq_sidebar_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-konq_sidebar_la_LIBADD  = $(LIB_KPARTS) $(LIB_KIO) ../../libkonq/libkonq.la ./libkonqsidebarplugin.la $(LIB_KUTILS)
+konq_sidebar_la_LIBADD  = $(LIB_TDEPARTS) $(LIB_TDEIO) ../../libkonq/libkonq.la ./libkonqsidebarplugin.la $(LIB_TDEUTILS)
 
 libkonqsidebarplugin_la_SOURCES=konqsidebarplugin.cpp
 libkonqsidebarplugin_la_LDFLAGS = -version-info 3:0:2 $(all_libraries) -no-undefined
-libkonqsidebarplugin_la_LIBADD = $(LIB_KPARTS)
+libkonqsidebarplugin_la_LIBADD = $(LIB_TDEPARTS)
 
 # this is where the desktop file will go 
 partdesktopdir   = $(kde_servicesdir)
diff --git a/konqueror/sidebar/test/Makefile.am b/konqueror/sidebar/test/Makefile.am
index ebaeff299..570b60c80 100644
--- a/konqueror/sidebar/test/Makefile.am
+++ b/konqueror/sidebar/test/Makefile.am
@@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = konq_sidebartest.la
 # the Part's source, library search path, and link libraries
 konq_sidebartest_la_SOURCES = konqsidebartest.cpp
 konq_sidebartest_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-konq_sidebartest_la_LIBADD  = $(LIB_KPARTS) $(LIB_KIO) ../libkonqsidebarplugin.la
+konq_sidebartest_la_LIBADD  = $(LIB_TDEPARTS) $(LIB_TDEIO) ../libkonqsidebarplugin.la
 
 # this is where the part's XML-GUI resource file goes
 partrcdir   = $(kde_datadir)/konqsidebartng/entries
diff --git a/konqueror/sidebar/web_module/Makefile.am b/konqueror/sidebar/web_module/Makefile.am
index a55213aab..55672f13e 100644
--- a/konqueror/sidebar/web_module/Makefile.am
+++ b/konqueror/sidebar/web_module/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 
 konqsidebar_web_la_SOURCES = web_module.cpp
 konqsidebar_web_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-konqsidebar_web_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEHTML) ../libkonqsidebarplugin.la ../../../libkonq/libkonq.la
+konqsidebar_web_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEHTML) ../libkonqsidebarplugin.la ../../../libkonq/libkonq.la
 
 #plugindir=$(kde_datadir)/konqsidebartng/entries
 #plugin_DATA=websidebar.desktop