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

23 files changed, 44 insertions, 44 deletions

diff --git a/libkonq/CMakeLists.txt b/libkonq/CMakeLists.txt
index b1b9b4a47..4da045169 100644
--- a/libkonq/CMakeLists.txt
+++ b/libkonq/CMakeLists.txt
@@ -33,7 +33,7 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    konq_popupmenu.h knewmenu.h kfileivi.h konq_drag.h
+    konq_popupmenu.h knewmenu.h tdefileivi.h konq_drag.h
     konq_iconviewwidget.h konq_defaults.h konq_settings.h
     konq_operations.h libkonq_export.h konq_dirpart.h
     konq_propsview.h konq_events.h konq_undo.h
@@ -53,7 +53,7 @@ install( FILES konqpopupmenuplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DI
 
 tde_add_library( konq SHARED AUTOMOC
   SOURCES
-    konq_popupmenu.cc knewmenu.cc konq_xmlguiclient.cc kfileivi.cc
+    konq_popupmenu.cc knewmenu.cc konq_xmlguiclient.cc tdefileivi.cc
     konq_iconviewwidget.cc konq_settings.cc konq_drag.cc konq_operations.cc
     konq_dirpart.cc konq_propsview.cc konq_events.cc konq_bgnddlg.cc konq_undo.cc
     konq_undo.skel konq_historymgr.cc konq_historycomm.cc konq_historycomm.skel
diff --git a/libkonq/DESIGN b/libkonq/DESIGN
index 0f9fa893b..b925226ba 100644
--- a/libkonq/DESIGN
+++ b/libkonq/DESIGN
@@ -1,5 +1,5 @@
 libkonq is the construction kit for a file manager 
-(together with libkio, which is at a lower level)
+(together with libtdeio, which is at a lower level)
 
 It is used by konqueror, of course, but also by kdesktop, which is 
 another file manager in fact, and by apps that want to use
@@ -23,7 +23,7 @@ konq_operations.*: common operations to all views, like deleting files, and
 konq_undo.*     : undo feature for file operations
 
 3) icons
-kfileivi.*      : icon representing a file (inherits QListViewItem and 
+tdefileivi.*      : icon representing a file (inherits QListViewItem and 
                   uses KFileItem for holding file information)
 konq_iconviewwidget.* : the specialisation of QIconView that knows about files.
                   Basic widget for icon views in konqueror and kdesktop.
diff --git a/libkonq/Makefile.am b/libkonq/Makefile.am
index e34e62e08..327c97450 100644
--- a/libkonq/Makefile.am
+++ b/libkonq/Makefile.am
@@ -25,7 +25,7 @@ libkonq_la_LIBADD = $(LIB_KPARTS)
 
 libkonq_la_SOURCES = konq_popupmenu.cc knewmenu.cc \
    konq_xmlguiclient.cc\
-   kfileivi.cc konq_iconviewwidget.cc konq_settings.cc konq_drag.cc  \
+   tdefileivi.cc konq_iconviewwidget.cc konq_settings.cc konq_drag.cc  \
    konq_operations.cc \
    konq_dirpart.cc konq_propsview.cc konq_events.cc konq_bgnddlg.cc \
    konq_undo.cc konq_undo.skel \
@@ -43,7 +43,7 @@ servicetypedir = $(kde_servicetypesdir)
 METASOURCES = AUTO
 
 include_HEADERS = konq_popupmenu.h knewmenu.h \
-    kfileivi.h konq_drag.h konq_iconviewwidget.h \
+    tdefileivi.h konq_drag.h konq_iconviewwidget.h \
     konq_defaults.h konq_settings.h \
     konq_operations.h libkonq_export.h \
     konq_dirpart.h konq_propsview.h konq_events.h \
@@ -67,6 +67,6 @@ noinst_HEADERS = konq_sound.h
 messages:
 	$(XGETTEXT) *.cc *.h -o $(podir)/libkonq.pot
 
-DOXYGEN_REFERENCES = dcop tdecore kio/bookmarks
+DOXYGEN_REFERENCES = dcop tdecore tdeio/bookmarks
 include ../admin/Doxyfile.am
 
diff --git a/libkonq/favicons/Makefile.am b/libkonq/favicons/Makefile.am
index a53c7faf1..6676fd54f 100644
--- a/libkonq/favicons/Makefile.am
+++ b/libkonq/favicons/Makefile.am
@@ -12,4 +12,4 @@ services_DATA = favicons.desktop
 
 update_DATA = favicons.upd
 update_SCRIPTS = move_favicons.sh
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp
index 1bf9feb83..7bc0bbc22 100644
--- a/libkonq/favicons/favicons.cpp
+++ b/libkonq/favicons/favicons.cpp
@@ -31,7 +31,7 @@
 #include <kimageio.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "favicons.moc"
 
diff --git a/libkonq/kivdirectoryoverlay.cc b/libkonq/kivdirectoryoverlay.cc
index cfc2a05e2..c162a4261 100644
--- a/libkonq/kivdirectoryoverlay.cc
+++ b/libkonq/kivdirectoryoverlay.cc
@@ -23,8 +23,8 @@
 #include <tqbitmap.h>
 #include <tqimage.h>
 
-#include <kfileivi.h>
-#include <kfileitem.h>
+#include <tdefileivi.h>
+#include <tdefileitem.h>
 #include <kapplication.h>
 #include <kdirlister.h>
 #include <kstandarddirs.h>
diff --git a/libkonq/kivdirectoryoverlay.h b/libkonq/kivdirectoryoverlay.h
index 209958b35..1734f8108 100644
--- a/libkonq/kivdirectoryoverlay.h
+++ b/libkonq/kivdirectoryoverlay.h
@@ -20,7 +20,7 @@
 #ifndef _KIVDIRECTORYOVERLAY_H_
 #define _KIVDIRECTORYOVERLAY_H_
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <libkonq_export.h>
 
 #include <tqdict.h>
diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc
index f962adafc..5620a650d 100644
--- a/libkonq/knewmenu.cc
+++ b/libkonq/knewmenu.cc
@@ -31,8 +31,8 @@
 #include <kpopupmenu.h>
 #include <krun.h>
 
-#include <kio/job.h>
-#include <kio/renamedlg.h>
+#include <tdeio/job.h>
+#include <tdeio/renamedlg.h>
 
 #include <kpropertiesdialog.h>
 #include "konq_operations.h"
diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc
index 59fc097b8..2257d3f56 100644
--- a/libkonq/konq_dirpart.cc
+++ b/libkonq/konq_dirpart.cc
@@ -22,7 +22,7 @@
 #include "konq_propsview.h"
 #include "konq_settings.h"
 
-#include <kio/paste.h>
+#include <tdeio/paste.h>
 #include <kapplication.h>
 #include <kaction.h>
 #include <kdatastream.h>
diff --git a/libkonq/konq_dirpart.h b/libkonq/konq_dirpart.h
index ffe176224..12e9de49d 100644
--- a/libkonq/konq_dirpart.h
+++ b/libkonq/konq_dirpart.h
@@ -23,9 +23,9 @@
 #include <tqstring.h>
 #include <tdeparts/part.h>
 #include <tdeparts/browserextension.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdatastream.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <libkonq_export.h>
 
 class KDirLister;
diff --git a/libkonq/konq_events.cc b/libkonq/konq_events.cc
index f608a8cdc..17e0f3381 100644
--- a/libkonq/konq_events.cc
+++ b/libkonq/konq_events.cc
@@ -1,5 +1,5 @@
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include "konq_events.h"
 
diff --git a/libkonq/konq_faviconmgr.cc b/libkonq/konq_faviconmgr.cc
index 37b01741f..cf7370bc5 100644
--- a/libkonq/konq_faviconmgr.cc
+++ b/libkonq/konq_faviconmgr.cc
@@ -19,7 +19,7 @@
 
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kmimetype.h>
 
diff --git a/libkonq/konq_filetip.cc b/libkonq/konq_filetip.cc
index c576a043a..6dc470d17 100644
--- a/libkonq/konq_filetip.cc
+++ b/libkonq/konq_filetip.cc
@@ -21,7 +21,7 @@
 
 #include <konq_filetip.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
diff --git a/libkonq/konq_filetip.h b/libkonq/konq_filetip.h
index 93c82780b..4bbc9d0e2 100644
--- a/libkonq/konq_filetip.h
+++ b/libkonq/konq_filetip.h
@@ -24,7 +24,7 @@
 
 #include <tqframe.h>
 #include <tqpixmap.h>
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 
 #include <libkonq_export.h>
 
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc
index b82610d33..34f5791a6 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cc
@@ -35,8 +35,8 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kio/previewjob.h>
-#include <kfileivi.h>
+#include <tdeio/previewjob.h>
+#include <tdefileivi.h>
 #include <konq_settings.h>
 #include <konq_drag.h>
 #include <kglobalsettings.h>
diff --git a/libkonq/konq_iconviewwidget.h b/libkonq/konq_iconviewwidget.h
index 1a4884db7..c7c280ca6 100644
--- a/libkonq/konq_iconviewwidget.h
+++ b/libkonq/konq_iconviewwidget.h
@@ -24,8 +24,8 @@
 #include <kiconview.h>
 #include <kurl.h>
 #include <tqguardedptr.h>
-#include <kfileitem.h>
-#include <kio/jobclasses.h>
+#include <tdefileitem.h>
+#include <tdeio/jobclasses.h>
 #include <libkonq_export.h>
 
 class KonqFMSettings;
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc
index 40a30aa10..cbd38a60a 100644
--- a/libkonq/konq_operations.cc
+++ b/libkonq/konq_operations.cc
@@ -41,16 +41,16 @@
 #include <kapplication.h>
 #include <kipc.h>
 #include <kdebug.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdesktopfile.h>
 #include <kurldrag.h>
 #include <kglobalsettings.h>
 #include <kimageio.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/paste.h>
-#include <kio/netaccess.h>
-#include <kio/renamedlg.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/paste.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/renamedlg.h>
 #include <konq_drag.h>
 #include <konq_iconviewwidget.h>
 #include <kprotocolinfo.h>
diff --git a/libkonq/konq_operations.h b/libkonq/konq_operations.h
index 1ffd14690..c6cef7431 100644
--- a/libkonq/konq_operations.h
+++ b/libkonq/konq_operations.h
@@ -192,7 +192,7 @@ private:
     KIOPasteInfo * m_pasteInfo;
 };
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 /// Restore multiple trashed files
 class KonqMultiRestoreJob : public TDEIO::Job
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index 294e43337..e11ef9046 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -37,7 +37,7 @@
 
 #include <assert.h>
 
-#include <kfileshare.h>
+#include <tdefileshare.h>
 #include <kprocess.h>
 
 #include "kpropertiesdialog.h"
@@ -1130,7 +1130,7 @@ void KonqPopupMenu::slotPopupProperties()
 
 KPropertiesDialog* KonqPopupMenu::showPropertiesDialog()
 {
-    // It may be that the kfileitem was created by hand
+    // It may be that the tdefileitem was created by hand
     // (see KonqKfmIconView::slotMouseButtonPressed)
     // In that case, we can get more precise info in the properties
     // (like permissions) if we stat the URL.
diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h
index aaa7f6f07..130e9ae6f 100644
--- a/libkonq/konq_popupmenu.h
+++ b/libkonq/konq_popupmenu.h
@@ -29,7 +29,7 @@
 
 #include <tqstringlist.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kmimetype.h> // for KDEDesktopMimeType
 #include <libkonq_export.h>
 
diff --git a/libkonq/konq_undo.cc b/libkonq/konq_undo.cc
index 4c3599816..4909a3d76 100644
--- a/libkonq/konq_undo.cc
+++ b/libkonq/konq_undo.cc
@@ -21,7 +21,7 @@
 
 #undef Always
 
-#include <kio/uiserver_stub.h>
+#include <tdeio/uiserver_stub.h>
 #include "konq_operations.h"
 
 #include <assert.h>
@@ -34,10 +34,10 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kipc.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kdirnotify_stub.h>
 
 inline const char *dcopTypeName( const KonqCommand & ) { return "KonqCommand"; }
@@ -166,7 +166,7 @@ class KonqUndoManager::KonqUndoManagerPrivate
 public:
   KonqUndoManagerPrivate()
   {
-      m_uiserver = new UIServer_stub( "kio_uiserver", "UIServer" );
+      m_uiserver = new UIServer_stub( "tdeio_uiserver", "UIServer" );
       m_undoJob = 0;
   }
   ~KonqUndoManagerPrivate()
diff --git a/libkonq/kfileivi.cc b/libkonq/tdefileivi.cc
index 84691faa5..f38fd766d 100644
--- a/libkonq/kfileivi.cc
+++ b/libkonq/tdefileivi.cc
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kfileivi.h"
+#include "tdefileivi.h"
 #include "kivdirectoryoverlay.h"
 #include "konq_iconviewwidget.h"
 #include "konq_operations.h"
@@ -27,7 +27,7 @@
 
 #include <kurldrag.h>
 #include <kiconeffect.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdebug.h>
 #include <krun.h>
 
diff --git a/libkonq/kfileivi.h b/libkonq/tdefileivi.h
index 6c16907ec..e9e0cf420 100644
--- a/libkonq/kfileivi.h
+++ b/libkonq/tdefileivi.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kfileivi_h__
-#define __kfileivi_h__
+#ifndef __tdefileivi_h__
+#define __tdefileivi_h__
 
 #include <kiconview.h>
 #include <kiconloader.h>
@@ -229,7 +229,7 @@ private:
 
     /**
      * Private data for KFileIVI
-     * Implementation in kfileivi.cc
+     * Implementation in tdefileivi.cc
      */
     struct Private;