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

7 files changed, 8 insertions, 8 deletions

diff --git a/kio/kfile/ChangeLog b/kio/kfile/ChangeLog
index ac05c86d0..2c9651390 100644
--- a/kio/kfile/ChangeLog
+++ b/kio/kfile/ChangeLog
@@ -622,7 +622,7 @@ Mon Mar 16 11:36:07 1998 Daniel Grana <grana@ie.iwi.unibe.ch>
         a mkdir method to kdir in near future
 
 Mon Mar 16 20:04:00 1998  Martin Jones <mjones@kde.org>
-	* Added booktoken.* to remove dependancy on khtmlw and jscript
+	* Added booktoken.* to remove dependancy on tdehtmlw and jscript
 
 Thu Mar 12 09:32:06 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 	* worked on the dir and file completion, should do both now,
diff --git a/kio/kfile/kfiledetailview.cpp b/kio/kfile/kfiledetailview.cpp
index 099a7cee5..da61d0a9f 100644
--- a/kio/kfile/kfiledetailview.cpp
+++ b/kio/kfile/kfiledetailview.cpp
@@ -543,7 +543,7 @@ TQDragObject *KFileDetailView::dragObject()
     }
     TQPixmap pixmap;
     if( urls.count() > 1 )
-        pixmap = DesktopIcon( "kmultiple", KIcon::SizeSmall );
+        pixmap = DesktopIcon( "tdemultiple", KIcon::SizeSmall );
     if( pixmap.isNull() )
         pixmap = currentFileItem()->pixmap( KIcon::SizeSmall );
 
diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp
index 5d9977de6..f0ef11bfe 100644
--- a/kio/kfile/kfileiconview.cpp
+++ b/kio/kfile/kfileiconview.cpp
@@ -817,7 +817,7 @@ TQDragObject *KFileIconView::dragObject()
     }
     TQPixmap pixmap;
     if( urls.count() > 1 )
-        pixmap = DesktopIcon( "kmultiple", iconSize() );
+        pixmap = DesktopIcon( "tdemultiple", iconSize() );
     if( pixmap.isNull() )
         pixmap = currentFileItem()->pixmap( iconSize() );
 
diff --git a/kio/kfile/kfiletreeview.cpp b/kio/kfile/kfiletreeview.cpp
index e8451077d..0b8504fd6 100644
--- a/kio/kfile/kfiletreeview.cpp
+++ b/kio/kfile/kfiletreeview.cpp
@@ -262,7 +262,7 @@ TQDragObject * KFileTreeView::dragObject()
    TQPoint hotspot;
    TQPixmap pixmap;
    if( urls.count() > 1 ){
-      pixmap = DesktopIcon( "kmultiple", 16 );
+      pixmap = DesktopIcon( "tdemultiple", 16 );
    }
    if( pixmap.isNull() )
       pixmap = currentKFileTreeViewItem()->fileItem()->pixmap( 16 );
diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp
index efeaa1f02..691487730 100644
--- a/kio/kfile/kopenwith.cpp
+++ b/kio/kfile/kopenwith.cpp
@@ -54,7 +54,7 @@
 #include <kmimetype.h>
 #include <kservicegroup.h>
 #include <klistview.h>
-#include <ksycoca.h>
+#include <tdesycoca.h>
 #include <kstdguiitem.h>
 
 #include "kopenwith.h"
diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp
index e9296ca90..0b1f6c05b 100644
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
@@ -117,7 +117,7 @@ extern "C" {
 #include <ksqueezedtextlabel.h>
 #include <klibloader.h>
 #include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kmetaprops.h>
 #include <kpreviewprops.h>
 #include <kprocess.h>
@@ -818,7 +818,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
       if ( (*it)->mode() != mode )
         mode = (mode_t)0;
       if ( KMimeType::iconForURL(url, mode) != iconStr )
-        iconStr = "kmultiple";
+        iconStr = "tdemultiple";
       if ( url.directory() != directory )
         directory = TQString::null;
       if ( url.protocol() != protocol )
diff --git a/kio/kfile/kurlrequester.cpp b/kio/kfile/kurlrequester.cpp
index 5d1495127..99e6e96f0 100644
--- a/kio/kfile/kurlrequester.cpp
+++ b/kio/kfile/kurlrequester.cpp
@@ -389,7 +389,7 @@ bool KURLRequester::eventFilter( TQObject *obj, TQEvent *ev )
     if ( ( TQT_BASE_OBJECT(d->edit) == TQT_BASE_OBJECT(obj) ) || ( TQT_BASE_OBJECT(d->combo) == TQT_BASE_OBJECT(obj) ) )
     {
         if (( ev->type() == TQEvent::FocusIn ) || ( ev->type() == TQEvent::FocusOut ))
-            // Forward focusin/focusout events to the urlrequester; needed by file form element in khtml
+            // Forward focusin/focusout events to the urlrequester; needed by file form element in tdehtml
             TQApplication::sendEvent( this, ev );
     }
     return TQWidget::eventFilter( obj, ev );