From 4117c5e487cd98cd262022e1b80509ce7a592278 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 00:51:33 -0600
Subject: [PATCH] Rename a number of libraries and executables to avoid
 conflicts with KDE4

---
 acinclude.m4                | 8 ++++----
 src/README                  | 2 +-
 src/dolphin.cpp             | 8 ++++----
 src/dolphincontextmenu.cpp  | 2 +-
 src/dolphindetailsview.h    | 2 +-
 src/dolphindirlister.cpp    | 2 +-
 src/dolphiniconsview.cpp    | 2 +-
 src/dolphiniconsview.h      | 2 +-
 src/dolphinview.cpp         | 4 ++--
 src/dolphinview.h           | 6 +++---
 src/editbookmarkdialog.cpp  | 2 +-
 src/generalsettingspage.cpp | 2 +-
 src/infosidebarpage.cpp     | 6 +++---
 src/sidebarssettings.cpp    | 2 +-
 src/statusbarspaceinfo.cpp  | 2 +-
 src/undomanager.cpp         | 2 +-
 src/undomanager.h           | 2 +-
 src/urlnavigator.cpp        | 2 +-
 src/urlnavigatorbutton.cpp  | 2 +-
 src/urlnavigatorbutton.h    | 2 +-
 20 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index f455fac..0a2f3e3 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$trinity2ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$trinity3ornewer"; then
@@ -1812,7 +1812,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libtdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2118,7 +2118,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2128,7 +2128,7 @@ else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
diff --git a/src/README b/src/README
index f7d3506..39de8b2 100644
--- a/src/README
+++ b/src/README
@@ -46,7 +46,7 @@ http://developer.kde.org/documentation/tutorials/xmlui/preface.html
 them more maintainable.
 
 For more details, consult :
-http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html
+http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html
 
 * With KParts, you can embed other kde components in your program, or make your program
 embeddable in other apps. For example, the kmplayer kpart can be called to play videos
diff --git a/src/dolphin.cpp b/src/dolphin.cpp
index 53cee90..bd9a46a 100644
--- a/src/dolphin.cpp
+++ b/src/dolphin.cpp
@@ -31,9 +31,9 @@
 #include <tdeversion.h>
 #include <kstatusbar.h>
 #include <kaccel.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
-#include <kconfig.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kstdaccel.h>
@@ -41,7 +41,7 @@
 #include <kstdaction.h>
 #include <kactionclasses.h>
 #include <kpopupmenu.h>
-#include <kio/renamedlg.h>
+#include <tdeio/renamedlg.h>
 #include <kinputdialog.h>
 #include <kshell.h>
 #include <kdesktopfile.h>
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 43ac5ea..468499a 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -35,7 +35,7 @@
 #include <kdesktopfile.h>
 #include <assert.h>
 #include <ksortablevaluelist.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <konq_operations.h>
 
 #include "dolphin.h"
diff --git a/src/dolphindetailsview.h b/src/dolphindetailsview.h
index f039557..3b7e783 100644
--- a/src/dolphindetailsview.h
+++ b/src/dolphindetailsview.h
@@ -21,7 +21,7 @@
 #ifndef DOLPHINDETAILSVIEW_H
 #define DOLPHINDETAILSVIEW_H
 
-#include <kfiledetailview.h>
+#include <tdefiledetailview.h>
 #include <itemeffectsmanager.h>
 
 class TQRect;
diff --git a/src/dolphindirlister.cpp b/src/dolphindirlister.cpp
index cf870e6..9968bda 100644
--- a/src/dolphindirlister.cpp
+++ b/src/dolphindirlister.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "dolphindirlister.h"
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 // TODO:
 #include <stdio.h>
diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index e363890..66acb5f 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -29,7 +29,7 @@
 #include <assert.h>
 #include <kaction.h>
 #include <kstdaction.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include "dolphinview.h"
 #include "viewproperties.h"
diff --git a/src/dolphiniconsview.h b/src/dolphiniconsview.h
index 00fc0cc..6d029dd 100644
--- a/src/dolphiniconsview.h
+++ b/src/dolphiniconsview.h
@@ -21,7 +21,7 @@
 #ifndef DOLPHINICONSVIEW_H
 #define DOLPHINICONSVIEW_H
 
-#include <kfileiconview.h>
+#include <tdefileiconview.h>
 #include <tqpixmap.h>
 #include <kurl.h>
 #include <itemeffectsmanager.h>
diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index a33becd..cf8486a 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -23,8 +23,8 @@
 #include <tqlayout.h>
 #include <kurl.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
-#include <kio/renamedlg.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/renamedlg.h>
 #include <assert.h>
 
 #include "urlnavigator.h"
diff --git a/src/dolphinview.h b/src/dolphinview.h
index e402aff..1ac23d2 100644
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -24,9 +24,9 @@
 
 #include <tqwidget.h>
 #include <tdeparts/part.h>
-#include <kfileitem.h>
-#include <kfileiconview.h>
-#include <kio/job.h>
+#include <tdefileitem.h>
+#include <tdefileiconview.h>
+#include <tdeio/job.h>
 #include <urlnavigator.h>
 
 class TQPainter;
diff --git a/src/editbookmarkdialog.cpp b/src/editbookmarkdialog.cpp
index 93a518f..db04cc3 100644
--- a/src/editbookmarkdialog.cpp
+++ b/src/editbookmarkdialog.cpp
@@ -27,7 +27,7 @@
 #include <kiconloader.h>
 #include <tqpushbutton.h>
 #include <kurl.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kicondialog.h>
 #include <tqhbox.h>
 
diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index bec9ac5..546fb1e 100644
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -31,7 +31,7 @@
 #include <tqcheckbox.h>
 #include <tqbuttongroup.h>
 #include <tqpushbutton.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqradiobutton.h>
 
 #include "dolphinsettings.h"
diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 95b1b84..f16a417 100644
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -36,11 +36,11 @@
 #include <kbookmarkmanager.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kio/previewjob.h>
-#include <kfileitem.h>
+#include <tdeio/previewjob.h>
+#include <tdefileitem.h>
 #include <kdialog.h>
 #include <kglobalsettings.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 #include "dolphin.h"
 #include "pixmapviewer.h"
diff --git a/src/sidebarssettings.cpp b/src/sidebarssettings.cpp
index b80227d..f550071 100644
--- a/src/sidebarssettings.cpp
+++ b/src/sidebarssettings.cpp
@@ -20,7 +20,7 @@
 
 #include "sidebarssettings.h"
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <assert.h>
 
 leftSidebarSettings::leftSidebarSettings() :
diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index ab8b463..ccd2bdc 100644
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -25,7 +25,7 @@
 #include <kglobalsettings.h>
 #include <kdiskfreesp.h>
 #include <klocale.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 StatusBarSpaceInfo::StatusBarSpaceInfo(TQWidget* parent) :
     TQWidget(parent),
diff --git a/src/undomanager.cpp b/src/undomanager.cpp
index 93dc1b2..4d554de 100644
--- a/src/undomanager.cpp
+++ b/src/undomanager.cpp
@@ -20,7 +20,7 @@
 
 #include "undomanager.h"
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqtimer.h>
 #include <assert.h>
 
diff --git a/src/undomanager.h b/src/undomanager.h
index d6b02cf..b96d193 100644
--- a/src/undomanager.h
+++ b/src/undomanager.h
@@ -24,7 +24,7 @@
 #include <tqobject.h>
 #include <tqvaluelist.h>
 #include <kurl.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 class ProgressIndicator;
 
diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp
index ce718d8..630e033 100644
--- a/src/urlnavigator.cpp
+++ b/src/urlnavigator.cpp
@@ -35,7 +35,7 @@
 #include <tqfont.h>
 #include <tqlistbox.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
 #include <kbookmarkmanager.h>
diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp
index ea53e30..2b5f38d 100644
--- a/src/urlnavigatorbutton.cpp
+++ b/src/urlnavigatorbutton.cpp
@@ -27,7 +27,7 @@
 
 #include <kglobalsettings.h>
 #include <kiconloader.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
 #include <kurl.h>
diff --git a/src/urlnavigatorbutton.h b/src/urlnavigatorbutton.h
index 365c041..98ed26d 100644
--- a/src/urlnavigatorbutton.h
+++ b/src/urlnavigatorbutton.h
@@ -22,7 +22,7 @@
 
 #include <tqstringlist.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <urlbutton.h>