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

---
 kooka/CHANGES             |  2 +-
 kooka/imageselectline.cpp |  2 +-
 kooka/img_saver.cpp       | 10 +++++-----
 kooka/imgnamecombo.cpp    |  2 +-
 kooka/kocrbase.cpp        |  8 ++++----
 kooka/kocrbase.h          |  2 +-
 kooka/kocrgocr.cpp        |  2 +-
 kooka/kocrkadmos.cpp      |  2 +-
 kooka/kocrocrad.cpp       |  2 +-
 kooka/kooka.cpp           |  6 +++---
 kooka/kookaimage.cpp      |  2 +-
 kooka/kookaimage.h        |  2 +-
 kooka/kookapref.cpp       |  2 +-
 kooka/kookaview.cpp       |  2 +-
 kooka/ksaneocr.cpp        |  2 +-
 kooka/ocrresedit.cpp      |  2 +-
 kooka/scanpackager.cpp    | 24 ++++++++++++------------
 kooka/scanpackager.h      |  8 ++++----
 kooka/thumbview.cpp       |  8 ++++----
 kooka/thumbview.h         |  6 +++---
 kooka/thumbviewitem.cpp   |  4 ++--
 kooka/thumbviewitem.h     |  6 +++---
 22 files changed, 53 insertions(+), 53 deletions(-)

(limited to 'kooka')

diff --git a/kooka/CHANGES b/kooka/CHANGES
index 45997a77..3d87017b 100644
--- a/kooka/CHANGES
+++ b/kooka/CHANGES
@@ -82,7 +82,7 @@ the preview page.
 
 Nov 2001:
 Replaced the old ScanPackager object by a new one based on the new KFileTreeView
-Widget in tdelibs/kfile. Hopefully soon full KURL support and more than one image
+Widget in tdelibs/tdefile. Hopefully soon full KURL support and more than one image
 repository.
 
 Nov 2001:
diff --git a/kooka/imageselectline.cpp b/kooka/imageselectline.cpp
index a21b56c0..c037a958 100644
--- a/kooka/imageselectline.cpp
+++ b/kooka/imageselectline.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kurlcombobox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 
 #include "imageselectline.h"
diff --git a/kooka/img_saver.cpp b/kooka/img_saver.cpp
index 5c61cd31..162cf3a2 100644
--- a/kooka/img_saver.cpp
+++ b/kooka/img_saver.cpp
@@ -31,17 +31,17 @@
 
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kimageio.h>
 #include <kseparator.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kio/jobclasses.h>
-#include <kio/file.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/file.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <ktempfile.h>
 #include <kinputdialog.h>
 
diff --git a/kooka/imgnamecombo.cpp b/kooka/imgnamecombo.cpp
index 9364bef3..3b954f79 100644
--- a/kooka/imgnamecombo.cpp
+++ b/kooka/imgnamecombo.cpp
@@ -33,7 +33,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kfiletreebranch.h>
+#include <tdefiletreebranch.h>
 
 #include "imgnamecombo.h"
 #include "img_saver.h"
diff --git a/kooka/kocrbase.cpp b/kooka/kocrbase.cpp
index 168e9e63..ae1800b2 100644
--- a/kooka/kocrbase.cpp
+++ b/kooka/kocrbase.cpp
@@ -28,11 +28,11 @@
 #include <tqlabel.h>
 #include <tqfileinfo.h>
 #include <tqtooltip.h>
-#include <kio/job.h>
-#include <kio/previewjob.h>
+#include <tdeio/job.h>
+#include <tdeio/previewjob.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
@@ -50,7 +50,7 @@
 
 #include <kscanslider.h>
 #include <kstandarddirs.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <ksconfig.h>
 #include <tqstringlist.h>
 #include <tqcolor.h>
diff --git a/kooka/kocrbase.h b/kooka/kocrbase.h
index f56d08c7..615ef05f 100644
--- a/kooka/kocrbase.h
+++ b/kooka/kocrbase.h
@@ -28,7 +28,7 @@
 #define KOCRBASE_H
 
 #include <kdialogbase.h>
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 #include <tqimage.h>
 #include <tqstring.h>
 
diff --git a/kooka/kocrgocr.cpp b/kooka/kocrgocr.cpp
index c4c34d4a..d5e9cad0 100644
--- a/kooka/kocrgocr.cpp
+++ b/kooka/kocrgocr.cpp
@@ -32,7 +32,7 @@
 #include <tqtooltip.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp
index 013b5e1a..de0e520e 100644
--- a/kooka/kocrkadmos.cpp
+++ b/kooka/kocrkadmos.cpp
@@ -36,7 +36,7 @@
 #include <tqradiobutton.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kooka/kocrocrad.cpp b/kooka/kocrocrad.cpp
index f037e4b2..394548bc 100644
--- a/kooka/kocrocrad.cpp
+++ b/kooka/kocrocrad.cpp
@@ -33,7 +33,7 @@
 #include <tqregexp.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp
index 30186479..70ff9b21 100644
--- a/kooka/kooka.cpp
+++ b/kooka/kooka.cpp
@@ -42,9 +42,9 @@
 #include <kiconloader.h>
 #include <kmenubar.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 <kprinter.h>
 #include <kstatusbar.h>
 #include <kurl.h>
diff --git a/kooka/kookaimage.cpp b/kooka/kookaimage.cpp
index ab491429..14e6ef83 100644
--- a/kooka/kookaimage.cpp
+++ b/kooka/kookaimage.cpp
@@ -26,7 +26,7 @@
 
 #include <kdebug.h>
 #include <kurl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include "kookaimage.h"
 #include "config.h"
diff --git a/kooka/kookaimage.h b/kooka/kookaimage.h
index b56c086b..14be4f86 100644
--- a/kooka/kookaimage.h
+++ b/kooka/kookaimage.h
@@ -34,7 +34,7 @@
 #include <tqvaluevector.h>
 #include <tqrect.h>
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class KFileItem;
 
diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp
index e0996966..13db5c95 100644
--- a/kooka/kookapref.cpp
+++ b/kooka/kookapref.cpp
@@ -30,7 +30,7 @@
 
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <knuminput.h>
 #include <kcolorbutton.h>
diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp
index cc1c3af1..bdc2a075 100644
--- a/kooka/kookaview.cpp
+++ b/kooka/kookaview.cpp
@@ -59,7 +59,7 @@
 #include <krun.h>
 #include <kapplication.h>
 #include <kstatusbar.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <ktrader.h>
 #include <klibloader.h>
diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp
index f35d1057..5ae8f1ba 100644
--- a/kooka/ksaneocr.cpp
+++ b/kooka/ksaneocr.cpp
@@ -28,7 +28,7 @@
 
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <ktempfile.h>
 #include <kprocess.h>
diff --git a/kooka/ocrresedit.cpp b/kooka/ocrresedit.cpp
index f8e8f2c2..3ea563cc 100644
--- a/kooka/ocrresedit.cpp
+++ b/kooka/ocrresedit.cpp
@@ -28,7 +28,7 @@
 #include "ocrresedit.h"
 #include "ocrword.h"
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 
 #include <tqfile.h>
diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp
index 24b815cb..ec9ad987 100644
--- a/kooka/scanpackager.cpp
+++ b/kooka/scanpackager.cpp
@@ -45,26 +45,26 @@
 #include <tqstringlist.h>
 #include <tqheader.h>
 
-#include <kfiletreeview.h>
-#include <kfiletreeviewitem.h>
-#include <kfiletreebranch.h>
+#include <tdefiletreeview.h>
+#include <tdefiletreeviewitem.h>
+#include <tdefiletreebranch.h>
 
 #include <kurldrag.h>
 #include <kpopupmenu.h>
 #include <kaction.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kio/global.h>
-#include <kio/progressbase.h>
-#include <kio/netaccess.h>
-#include <kio/jobclasses.h>
-#include <kio/file.h>
-#include <kio/job.h>
+#include <tdeio/global.h>
+#include <tdeio/progressbase.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/file.h>
+#include <tdeio/job.h>
 
 #define STARTUP_FIRST_START "firstStart"
 
@@ -630,7 +630,7 @@ void ScanPackager::loadImageForItem( KFileTreeViewItem *item )
    }
 }
 
-/* Hit this slot with a file for a kfiletreeviewitem. */
+/* Hit this slot with a file for a tdefiletreeviewitem. */
 void ScanPackager::slImageArrived( KFileTreeViewItem *item, KookaImage* image )
 {
    if( item && image )
@@ -892,7 +892,7 @@ KFileTreeViewItem *ScanPackager::spFindItem( SearchType type, const TQString nam
 {
    /* Prepare a list of branches to go through. If the parameter branch is set, search
     * only in the parameter branch. If it is zero, search all branches returned by
-    * kfiletreeview.branches()
+    * tdefiletreeview.branches()
     */
    KFileTreeBranchList branchList;
 
diff --git a/kooka/scanpackager.h b/kooka/scanpackager.h
index 0f57b7fc..4e1cee38 100644
--- a/kooka/scanpackager.h
+++ b/kooka/scanpackager.h
@@ -34,10 +34,10 @@
 #include <tqdragobject.h>
 #include <tqmap.h>
 #include <klistview.h>
-#include <kio/job.h>
-#include <kio/global.h>
-#include <kio/file.h>
-#include <kfiletreeview.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
+#include <tdeio/file.h>
+#include <tdefiletreeview.h>
 
 
 /**
diff --git a/kooka/thumbview.cpp b/kooka/thumbview.cpp
index d1b48045..e69f7b52 100644
--- a/kooka/thumbview.cpp
+++ b/kooka/thumbview.cpp
@@ -30,11 +30,11 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 #include <kdebug.h>
-#include <kfileitem.h>
-#include <kfileiconview.h>
-#include <kfiletreeviewitem.h>
+#include <tdefileitem.h>
+#include <tdefileiconview.h>
+#include <tdefiletreeviewitem.h>
 #include <kimageeffect.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/kooka/thumbview.h b/kooka/thumbview.h
index c4c58323..4dff2559 100644
--- a/kooka/thumbview.h
+++ b/kooka/thumbview.h
@@ -37,9 +37,9 @@
 
 #include <kiconview.h>
 #include <kurl.h>
-#include <kio/previewjob.h>
-#include <kfileitem.h>
-#include <kfileiconview.h>
+#include <tdeio/previewjob.h>
+#include <tdefileitem.h>
+#include <tdefileiconview.h>
 
 /* TDEConfig group definitions */
 #define MARGIN_COLOR1 "MarginColor1"
diff --git a/kooka/thumbviewitem.cpp b/kooka/thumbviewitem.cpp
index e682c34b..7479f535 100644
--- a/kooka/thumbviewitem.cpp
+++ b/kooka/thumbviewitem.cpp
@@ -26,8 +26,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kfileitem.h>
-#include <kfileiconview.h>
+#include <tdefileitem.h>
+#include <tdefileiconview.h>
 
 #include "thumbview.h"
 #include "thumbviewitem.h"
diff --git a/kooka/thumbviewitem.h b/kooka/thumbviewitem.h
index 4478df34..fd1c8b48 100644
--- a/kooka/thumbviewitem.h
+++ b/kooka/thumbviewitem.h
@@ -31,9 +31,9 @@
 
 #include <kiconview.h>
 #include <kurl.h>
-#include <kio/previewjob.h>
-#include <kfileitem.h>
-#include <kfileiconview.h>
+#include <tdeio/previewjob.h>
+#include <tdefileitem.h>
+#include <tdefileiconview.h>
 
 class KFileTreeViewItem;
 
-- 
cgit v1.2.3