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

---
 src/gvcore/archive.cpp                 | 2 +-
 src/gvcore/cache.cpp                   | 4 ++--
 src/gvcore/deletedialog.cpp            | 4 ++--
 src/gvcore/document.cpp                | 4 ++--
 src/gvcore/documentjpegloadedimpl.cpp  | 2 +-
 src/gvcore/documentloadedimpl.cpp      | 2 +-
 src/gvcore/documentotherloadedimpl.cpp | 2 +-
 src/gvcore/externaltoolmanager.h       | 2 +-
 src/gvcore/filedetailview.cpp          | 4 ++--
 src/gvcore/filedetailview.h            | 2 +-
 src/gvcore/filedetailviewitem.cpp      | 2 +-
 src/gvcore/filedetailviewitem.h        | 4 ++--
 src/gvcore/fileoperation.cpp           | 2 +-
 src/gvcore/fileoperation.h             | 2 +-
 src/gvcore/fileopobject.cpp            | 4 ++--
 src/gvcore/fileopobject.h              | 2 +-
 src/gvcore/filethumbnailview.cpp       | 2 +-
 src/gvcore/fileviewbase.h              | 2 +-
 src/gvcore/fileviewcontroller.cpp      | 4 ++--
 src/gvcore/fileviewcontroller.h        | 4 ++--
 src/gvcore/imageloader.h               | 2 +-
 src/gvcore/imagesavedialog.cpp         | 2 +-
 src/gvcore/imagesavedialog.h           | 2 +-
 src/gvcore/imageview.cpp               | 2 +-
 src/gvcore/mimetypeutils.cpp           | 4 ++--
 src/gvcore/slideshow.cpp               | 2 +-
 src/gvcore/thumbnailloadjob.cpp        | 4 ++--
 src/gvcore/thumbnailloadjob.h          | 2 +-
 src/gvcore/timeutils.cpp               | 4 ++--
 29 files changed, 40 insertions(+), 40 deletions(-)

(limited to 'src/gvcore')

diff --git a/src/gvcore/archive.cpp b/src/gvcore/archive.cpp
index aa5edb7..798fb77 100644
--- a/src/gvcore/archive.cpp
+++ b/src/gvcore/archive.cpp
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 // KDE includes
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 // Our includes
 #include "archive.h"
diff --git a/src/gvcore/cache.cpp b/src/gvcore/cache.cpp
index 7f074c2..046c105 100644
--- a/src/gvcore/cache.cpp
+++ b/src/gvcore/cache.cpp
@@ -24,12 +24,12 @@ Copyright 2000-2004 Aur
 // TQt
 
 // KDE
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <ksharedptr.h>
 #include <kstaticdeleter.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include "cache.moc"
 
diff --git a/src/gvcore/deletedialog.cpp b/src/gvcore/deletedialog.cpp
index 0507cb3..f2faca6 100644
--- a/src/gvcore/deletedialog.cpp
+++ b/src/gvcore/deletedialog.cpp
@@ -14,12 +14,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kdialogbase.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kstdguiitem.h>
 #include <kurl.h>
diff --git a/src/gvcore/document.cpp b/src/gvcore/document.cpp
index b7d3ca8..5fc5070 100644
--- a/src/gvcore/document.cpp
+++ b/src/gvcore/document.cpp
@@ -31,10 +31,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kglobalsettings.h>
 #include <kimageio.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprinter.h>
diff --git a/src/gvcore/documentjpegloadedimpl.cpp b/src/gvcore/documentjpegloadedimpl.cpp
index f40c6da..1fed17a 100644
--- a/src/gvcore/documentjpegloadedimpl.cpp
+++ b/src/gvcore/documentjpegloadedimpl.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 
 // Local
diff --git a/src/gvcore/documentloadedimpl.cpp b/src/gvcore/documentloadedimpl.cpp
index f3f7611..a8eaac5 100644
--- a/src/gvcore/documentloadedimpl.cpp
+++ b/src/gvcore/documentloadedimpl.cpp
@@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klargefile.h>
 #include <klocale.h>
 #include <ktempfile.h>
diff --git a/src/gvcore/documentotherloadedimpl.cpp b/src/gvcore/documentotherloadedimpl.cpp
index e7afc40..c6b9177 100644
--- a/src/gvcore/documentotherloadedimpl.cpp
+++ b/src/gvcore/documentotherloadedimpl.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kdebug.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 #undef ENABLE_LOG
 #undef LOG
diff --git a/src/gvcore/externaltoolmanager.h b/src/gvcore/externaltoolmanager.h
index bfc2d27..00fe169 100644
--- a/src/gvcore/externaltoolmanager.h
+++ b/src/gvcore/externaltoolmanager.h
@@ -26,7 +26,7 @@ Copyright 2000-2004 Aur
 #include <tqptrlist.h>
 
 // KDE
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 // Local
 #include "libgwenview_export.h"
diff --git a/src/gvcore/filedetailview.cpp b/src/gvcore/filedetailview.cpp
index 28ac233..1328100 100644
--- a/src/gvcore/filedetailview.cpp
+++ b/src/gvcore/filedetailview.cpp
@@ -1,5 +1,5 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab
-/* This file is based on kfiledetailview.cpp v1.43 from the KDE libs. Original
+/* This file is based on tdefiledetailview.cpp v1.43 from the KDE libs. Original
    copyright follows.
 */
 /* This file is part of the KDE libraries
@@ -33,7 +33,7 @@
 // KDE 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/src/gvcore/filedetailview.h b/src/gvcore/filedetailview.h
index 7a21f25..7b77b26 100644
--- a/src/gvcore/filedetailview.h
+++ b/src/gvcore/filedetailview.h
@@ -1,5 +1,5 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab
-/* This file is based on kfiledetailview.h v1.30 from the KDE libs. Original
+/* This file is based on tdefiledetailview.h v1.30 from the KDE libs. Original
    copyright follows.
 */
 /* This file is part of the KDE libraries
diff --git a/src/gvcore/filedetailviewitem.cpp b/src/gvcore/filedetailviewitem.cpp
index 2115386..e841459 100644
--- a/src/gvcore/filedetailviewitem.cpp
+++ b/src/gvcore/filedetailviewitem.cpp
@@ -1,5 +1,5 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab
-/* This file is based on kfiledetailview.cpp from the KDE libs. Original
+/* This file is based on tdefiledetailview.cpp from the KDE libs. Original
    copyright follows.
 */
 /* This file is part of the KDE libraries
diff --git a/src/gvcore/filedetailviewitem.h b/src/gvcore/filedetailviewitem.h
index a0ad5df..d374ae0 100644
--- a/src/gvcore/filedetailviewitem.h
+++ b/src/gvcore/filedetailviewitem.h
@@ -1,5 +1,5 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab
-/* This file is based on kfiledetailview.h from the KDE libs. Original
+/* This file is based on tdefiledetailview.h from the KDE libs. Original
    copyright follows.
 */
 /* This file is part of the KDE libraries
@@ -26,7 +26,7 @@
 
 // KDE includes
 #include <klistview.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 namespace Gwenview {
 
 #define COL_NAME 0
diff --git a/src/gvcore/fileoperation.cpp b/src/gvcore/fileoperation.cpp
index 6c0b07f..5d5ede0 100644
--- a/src/gvcore/fileoperation.cpp
+++ b/src/gvcore/fileoperation.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqobject.h>
 
 // KDE
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klocale.h>
 
diff --git a/src/gvcore/fileoperation.h b/src/gvcore/fileoperation.h
index 79f7495..7b5f78c 100644
--- a/src/gvcore/fileoperation.h
+++ b/src/gvcore/fileoperation.h
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "libgwenview_export.h"
 
diff --git a/src/gvcore/fileopobject.cpp b/src/gvcore/fileopobject.cpp
index 4eb2df8..f0881f4 100644
--- a/src/gvcore/fileopobject.cpp
+++ b/src/gvcore/fileopobject.cpp
@@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <tdeversion.h>
-#include <kfiledialog.h>
-#include <kfilefiltercombo.h>
+#include <tdefiledialog.h>
+#include <tdefilefiltercombo.h>
 #include <kglobalsettings.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/src/gvcore/fileopobject.h b/src/gvcore/fileopobject.h
index 74c0c77..584c5ff 100644
--- a/src/gvcore/fileopobject.h
+++ b/src/gvcore/fileopobject.h
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqstring.h>
 
 // KDE includes
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 
 class TQWidget;
diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp
index c9705df..387c497 100644
--- a/src/gvcore/filethumbnailview.cpp
+++ b/src/gvcore/filethumbnailview.cpp
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
diff --git a/src/gvcore/fileviewbase.h b/src/gvcore/fileviewbase.h
index 7bc4481..755e2f7 100644
--- a/src/gvcore/fileviewbase.h
+++ b/src/gvcore/fileviewbase.h
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqcolor.h>
 
 // KDE includes
-#include <kfileview.h>
+#include <tdefileview.h>
 namespace Gwenview {
 
 class FileViewBase : public KFileView {
diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp
index 47f3d5c..bf49201 100644
--- a/src/gvcore/fileviewcontroller.cpp
+++ b/src/gvcore/fileviewcontroller.cpp
@@ -47,8 +47,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <ktoolbar.h>
 #include <ktoolbarlabelaction.h>
 #include <kurldrag.h>
-#include <kio/job.h>
-#include <kio/file.h>
+#include <tdeio/job.h>
+#include <tdeio/file.h>
 
 // Local
 #include "archive.h"
diff --git a/src/gvcore/fileviewcontroller.h b/src/gvcore/fileviewcontroller.h
index 38c914e..f1ae23a 100644
--- a/src/gvcore/fileviewcontroller.h
+++ b/src/gvcore/fileviewcontroller.h
@@ -28,8 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kdirlister.h>
-#include <kfileitem.h>
-#include <kio/job.h>
+#include <tdefileitem.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 
 #include "libgwenview_export.h"
diff --git a/src/gvcore/imageloader.h b/src/gvcore/imageloader.h
index b82f79b..1d1e0f5 100644
--- a/src/gvcore/imageloader.h
+++ b/src/gvcore/imageloader.h
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqcstring.h>
 
 // KDE
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 // Local 
 #include "tsthread/tsthread.h"
diff --git a/src/gvcore/imagesavedialog.cpp b/src/gvcore/imagesavedialog.cpp
index 8d71e26..8d9027d 100644
--- a/src/gvcore/imagesavedialog.cpp
+++ b/src/gvcore/imagesavedialog.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE includes
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kfilefiltercombo.h>
+#include <tdefilefiltercombo.h>
 #include <kimageio.h>
 #include <klocale.h>
 #include <kurlcombobox.h>
diff --git a/src/gvcore/imagesavedialog.h b/src/gvcore/imagesavedialog.h
index 053a768..35114d2 100644
--- a/src/gvcore/imagesavedialog.h
+++ b/src/gvcore/imagesavedialog.h
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define IMAGESAVEDIALOG_H
 
 // KDE includes
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 class TQString;
 class TQWidget;
diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp
index 36d8db4..e61ef8c 100644
--- a/src/gvcore/imageview.cpp
+++ b/src/gvcore/imageview.cpp
@@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE 
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <klocale.h>
diff --git a/src/gvcore/mimetypeutils.cpp b/src/gvcore/mimetypeutils.cpp
index 814f599..d2514d0 100644
--- a/src/gvcore/mimetypeutils.cpp
+++ b/src/gvcore/mimetypeutils.cpp
@@ -25,9 +25,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kapplication.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kimageio.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmimetype.h>
 #include <kurl.h>
 
diff --git a/src/gvcore/slideshow.cpp b/src/gvcore/slideshow.cpp
index 06c7b25..0665733 100644
--- a/src/gvcore/slideshow.cpp
+++ b/src/gvcore/slideshow.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqtimer.h>
 
 // KDE
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 // Local
diff --git a/src/gvcore/thumbnailloadjob.cpp b/src/gvcore/thumbnailloadjob.cpp
index 4670709..54f624f 100644
--- a/src/gvcore/thumbnailloadjob.cpp
+++ b/src/gvcore/thumbnailloadjob.cpp
@@ -39,9 +39,9 @@
 // KDE 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kiconloader.h>
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 #include <klargefile.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
diff --git a/src/gvcore/thumbnailloadjob.h b/src/gvcore/thumbnailloadjob.h
index ab39085..29bb4b8 100644
--- a/src/gvcore/thumbnailloadjob.h
+++ b/src/gvcore/thumbnailloadjob.h
@@ -32,7 +32,7 @@
 #include <tqvaluevector.h>
 
 // KDE
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 // Local
 #include "tsthread/tsthread.h"
diff --git a/src/gvcore/timeutils.cpp b/src/gvcore/timeutils.cpp
index 32f3a4f..e493ed2 100644
--- a/src/gvcore/timeutils.cpp
+++ b/src/gvcore/timeutils.cpp
@@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kdebug.h>
-#include <kfileitem.h>
-#include <kfilemetainfo.h>
+#include <tdefileitem.h>
+#include <tdefilemetainfo.h>
 #include <kglobal.h>
 #include <klocale.h>
 	
-- 
cgit v1.2.1