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

17 files changed, 34 insertions, 34 deletions

diff --git a/kget/CMakeLists.txt b/kget/CMakeLists.txt
index 95fc2d67..de86db18 100644
--- a/kget/CMakeLists.txt
+++ b/kget/CMakeLists.txt
@@ -39,13 +39,13 @@ install( FILES kgetui.rc eventsrc DESTINATION ${DATA_INSTALL_DIR}/kget )
 tde_add_executable( kget AUTOMOC
   SOURCES
     getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp
-    transfer.cpp settings.cpp logwindow.cpp kmainwidget.cpp kfileio.cpp
+    transfer.cpp settings.cpp logwindow.cpp kmainwidget.cpp tdefileio.cpp
     droptarget.cpp docking.cpp dlgconnectionbase.ui dlgautomationbase.ui
     dlglimitsbase.ui dlgadvancedbase.ui dlgdirectoriesbase.ui
     dlgsystembase.ui dlgSystem.cpp dlgPreferences.cpp dlgLimits.cpp
     dlgIndividual.cpp dlgDirectories.cpp dlgConnection.cpp
     dlgAutomation.cpp dlgAdvanced.cpp main.cpp dockindividual.cpp
     kget_iface.skel safedelete.cpp
-  LINK kio-shared Xext
+  LINK tdeio-shared Xext
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kget/Makefile.am b/kget/Makefile.am
index 90f8a364..25adb7aa 100644
--- a/kget/Makefile.am
+++ b/kget/Makefile.am
@@ -8,7 +8,7 @@ kget_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_QT)
 kget_LDADD   = $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIBSOCKET)
 kget_SOURCES = getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp \
                transfer.cpp settings.cpp logwindow.cpp \
-               kmainwidget.cpp kfileio.cpp droptarget.cpp docking.cpp \
+               kmainwidget.cpp tdefileio.cpp droptarget.cpp docking.cpp \
                dlgconnectionbase.ui dlgautomationbase.ui dlglimitsbase.ui \
                dlgadvancedbase.ui dlgdirectoriesbase.ui dlgsystembase.ui \
                dlgSystem.cpp dlgPreferences.cpp dlgLimits.cpp \
@@ -20,7 +20,7 @@ noinst_HEADERS = common.h \
                  dlgAdvanced.h dlgAutomation.h dlgConnection.h \
                  dlgDirectories.h dlgIndividual.h dlgLimits.h \
                  dlgPreferences.h dlgSystem.h docking.h droptarget.h \
-                 kfileio.h kmainwidget.h logwindow.h settings.h \
+                 tdefileio.h kmainwidget.h logwindow.h settings.h \
                  transfer.h transferlist.h version.h slave.h \
                  slaveevent.h http_defaults.h getfilejob.h dockindividual.h
 
diff --git a/kget/dlgAdvanced.cpp b/kget/dlgAdvanced.cpp
index 9a1f7efe..45cbe5c5 100644
--- a/kget/dlgAdvanced.cpp
+++ b/kget/dlgAdvanced.cpp
@@ -30,7 +30,7 @@
 #include <kprotocolmanager.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "settings.h"
 #include "kmainwidget.h"
diff --git a/kget/dlgDirectories.cpp b/kget/dlgDirectories.cpp
index a373cc67..61688190 100644
--- a/kget/dlgDirectories.cpp
+++ b/kget/dlgDirectories.cpp
@@ -31,7 +31,7 @@
 
 #include <tqdir.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/kget/dlgIndividual.cpp b/kget/dlgIndividual.cpp
index a22bccea..5acd3b7a 100644
--- a/kget/dlgIndividual.cpp
+++ b/kget/dlgIndividual.cpp
@@ -43,7 +43,7 @@
 #include <klocale.h>
 #include <ktoolbar.h>
 #include <krun.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include "common.h"
 
 #include "transfer.h"
diff --git a/kget/dlgIndividual.h b/kget/dlgIndividual.h
index 91d7f8e3..399e548b 100644
--- a/kget/dlgIndividual.h
+++ b/kget/dlgIndividual.h
@@ -31,7 +31,7 @@
 
 #include <tqwidget.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class Transfer;
 
diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp
index ee0c05f5..c731938a 100644
--- a/kget/droptarget.cpp
+++ b/kget/droptarget.cpp
@@ -28,7 +28,7 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kglobalsettings.h>
 #include <kmainwindow.h>
diff --git a/kget/getfilejob.h b/kget/getfilejob.h
index fbfd2dca..ab42ca4b 100644
--- a/kget/getfilejob.h
+++ b/kget/getfilejob.h
@@ -18,7 +18,7 @@
 #ifndef GETFILEJOB_H
 #define GETFILEJOB_H
 
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 
 namespace TDEIO
diff --git a/kget/kmainwidget.cpp b/kget/kmainwidget.cpp
index 1865e6f9..382faa20 100644
--- a/kget/kmainwidget.cpp
+++ b/kget/kmainwidget.cpp
@@ -50,7 +50,7 @@
 #include <kinputdialog.h>
 
 #include <kprotocolinfo.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
@@ -64,19 +64,19 @@
 #include <khelpmenu.h>
 #include <kedittoolbar.h>
 #include <kstatusbar.h>
-#include <kconfig.h>
-#include <kio/netaccess.h>
+#include <tdeconfig.h>
+#include <tdeio/netaccess.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
 #include <kmenubar.h>
-#include <kio/renamedlg.h>
+#include <tdeio/renamedlg.h>
 
 #include "safedelete.h"
 #include "settings.h"
 #include "transfer.h"
 #include "transferlist.h"
 #include "kmainwidget.h"
-#include "kfileio.h"
+#include "tdefileio.h"
 #include "dlgPreferences.h"
 #include "logwindow.h"
 #include "docking.h"
@@ -85,8 +85,8 @@
 
 
 
-#include <kio/authinfo.h>
-#include <kio/global.h>
+#include <tdeio/authinfo.h>
+#include <tdeio/global.h>
 #include <tqiconset.h>
 
 #include "version.h"
@@ -128,7 +128,7 @@ KMainWidget::KMainWidget(bool bStartDocked)
 #endif
 
     {
-        TDEConfig cfg( "kioslaverc", false, false);
+        TDEConfig cfg( "tdeioslaverc", false, false);
         cfg.setGroup(TQString());
         cfg.writeEntry("AutoResume", true);
         cfg.sync();
diff --git a/kget/safedelete.cpp b/kget/safedelete.cpp
index d6b2d138..53fbbbc3 100644
--- a/kget/safedelete.cpp
+++ b/kget/safedelete.cpp
@@ -1,7 +1,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqfileinfo.h>
 
diff --git a/kget/settings.cpp b/kget/settings.cpp
index efc0086c..35451760 100644
--- a/kget/settings.cpp
+++ b/kget/settings.cpp
@@ -26,7 +26,7 @@
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <twin.h>
 #include <kmessagebox.h>
diff --git a/kget/slave.cpp b/kget/slave.cpp
index df0846d4..96ba3547 100644
--- a/kget/slave.cpp
+++ b/kget/slave.cpp
@@ -26,7 +26,7 @@
 
 
 #include <kapplication.h>
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 
 #include "getfilejob.h"
 #include "slave.h"
diff --git a/kget/kfileio.cpp b/kget/tdefileio.cpp
index ac8b0f70..ee4b4096 100644
--- a/kget/kfileio.cpp
+++ b/kget/tdefileio.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-*                                kfileio.cpp
+*                                tdefileio.cpp
 *                             -------------------
 *
 *    Revision     : $Id$
@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
-#include "kfileio.h"
+#include "tdefileio.h"
 
 //-----------------------------------------------------------------------------
 TQString kFileToString(const TQString & aFileName, bool aEnsureNL, bool aVerbose)
diff --git a/kget/kfileio.h b/kget/tdefileio.h
index 84a50cd2..b8310137 100644
--- a/kget/kfileio.h
+++ b/kget/tdefileio.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-*                                kfileio.h
+*                                tdefileio.h
 *                             -------------------
 *
 *    Revision     : $Id$
@@ -17,8 +17,8 @@
  * Author: Stefan Taferner <taferner@kde.org>
  * This code is under GPL.
  */
-#ifndef kfileio_h
-#define kfileio_h
+#ifndef tdefileio_h
+#define tdefileio_h
 
 /** Load a file. Returns a pointer to the memory-block that contains
  * the loaded file. Returns a NULL string if the file could not be loaded.
@@ -41,4 +41,4 @@ bool kCStringToFile(const TQCString & buffer, const TQString & fileName, bool as
 bool kByteArrayToFile(const TQByteArray & buffer, const TQString & fileName, bool askIfExists = FALSE, bool createBackup = TRUE, bool withDialogs = TRUE);
 
 
-#endif                          /* kfileio_h */
+#endif                          /* tdefileio_h */
diff --git a/kget/transfer.cpp b/kget/transfer.cpp
index 218a5561..477183f3 100644
--- a/kget/transfer.cpp
+++ b/kget/transfer.cpp
@@ -12,7 +12,7 @@
 /***************************************************************************
  *
  *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public Lkio/global.h:icense as published by
+ *   it under the terms of the GNU General Public Ltdeio/global.h:icense as published by
  *   the Free Software Foundation; either version 2 of the License, or
  *   (at your option) any later version.
  *
@@ -45,9 +45,9 @@
 #include "transfer.h"
 
 #include <kapplication.h>
-#include <kio/passdlg.h>
-#include <kio/global.h>
-#include <kio/netaccess.h>
+#include <tdeio/passdlg.h>
+#include <tdeio/global.h>
+#include <tdeio/netaccess.h>
 
 
 extern Settings ksettings;
diff --git a/kget/transfer.h b/kget/transfer.h
index 7c8eb7f5..f147f011 100644
--- a/kget/transfer.h
+++ b/kget/transfer.h
@@ -34,7 +34,7 @@
 #include <tqmap.h>
 
 #include <kurl.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 #include "slave.h"
 
diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp
index 60d62943..768460d1 100644
--- a/kget/transferlist.cpp
+++ b/kget/transferlist.cpp
@@ -29,10 +29,10 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <ksimpleconfig.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "transfer.h"
 #include "transferlist.h"