From 783715b853042d24841e3e888051f3a184e78a40 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 22:00:04 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 ark/ace.cpp               | 6 +++---
 ark/ar.cpp                | 4 ++--
 ark/arch.cpp              | 4 ++--
 ark/archiveformatdlg.cpp  | 2 +-
 ark/archiveformatinfo.cpp | 2 +-
 ark/arj.cpp               | 4 ++--
 ark/ark_part.cpp          | 2 +-
 ark/arkapp.cpp            | 2 +-
 ark/arkviewer.cpp         | 4 ++--
 ark/arkwidget.cpp         | 6 +++---
 ark/artdeutils.cpp        | 4 ++--
 ark/compressedfile.cpp    | 6 +++---
 ark/extractiondialog.cpp  | 6 +++---
 ark/filelistview.cpp      | 6 +++---
 ark/lha.cpp               | 4 ++--
 ark/mainwindow.cpp        | 4 ++--
 ark/rar.cpp               | 6 +++---
 ark/searchbar.cpp         | 2 +-
 ark/sevenzip.cpp          | 6 +++---
 ark/tar.cpp               | 6 +++---
 ark/zip.cpp               | 4 ++--
 ark/zoo.cpp               | 4 ++--
 22 files changed, 47 insertions(+), 47 deletions(-)

(limited to 'ark')

diff --git a/ark/ace.cpp b/ark/ace.cpp
index 2f29bf3..4f1d2e4 100644
--- a/ark/ace.cpp
+++ b/ark/ace.cpp
@@ -24,11 +24,11 @@
 
 #include <tqdir.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 
diff --git a/ark/ar.cpp b/ark/ar.cpp
index 8edb2dd..181b9cc 100644
--- a/ark/ar.cpp
+++ b/ark/ar.cpp
@@ -36,8 +36,8 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 
 // ark includes
diff --git a/ark/arch.cpp b/ark/arch.cpp
index cd3d186..2ca8ec5 100644
--- a/ark/arch.cpp
+++ b/ark/arch.cpp
@@ -37,9 +37,9 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassdlg.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
diff --git a/ark/archiveformatdlg.cpp b/ark/archiveformatdlg.cpp
index 5ac942c..f64bd45 100644
--- a/ark/archiveformatdlg.cpp
+++ b/ark/archiveformatdlg.cpp
@@ -23,7 +23,7 @@
 #include "archiveformatinfo.h"
 #include "arch.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqvbox.h>
diff --git a/ark/archiveformatinfo.cpp b/ark/archiveformatinfo.cpp
index 2f6fded..1cff881 100644
--- a/ark/archiveformatinfo.cpp
+++ b/ark/archiveformatinfo.cpp
@@ -24,7 +24,7 @@
 #include "archiveformatinfo.h"
 #include "settings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kfilterdev.h>
diff --git a/ark/arj.cpp b/ark/arj.cpp
index 79574b1..f081e17 100644
--- a/ark/arj.cpp
+++ b/ark/arj.cpp
@@ -33,8 +33,8 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kpassdlg.h>
 
diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp
index 6feb309..9a8cd50 100644
--- a/ark/ark_part.cpp
+++ b/ark/ark_part.cpp
@@ -30,7 +30,7 @@
 
 #include <kdebug.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaboutdata.h>
 #include <kxmlguifactory.h>
 #include <kstatusbar.h>
diff --git a/ark/arkapp.cpp b/ark/arkapp.cpp
index 269b155..4a98c94 100644
--- a/ark/arkapp.cpp
+++ b/ark/arkapp.cpp
@@ -28,7 +28,7 @@
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <unistd.h>
 #include <tqfile.h>
 #include <errno.h>
diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp
index f011e62..34f9cfd 100644
--- a/ark/arkviewer.cpp
+++ b/ark/arkviewer.cpp
@@ -21,12 +21,12 @@
 
 #include "arkviewer.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/componentfactory.h>
 #include <kmimetype.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include <tqvbox.h>
diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp
index 5f29b97..5dacb77 100644
--- a/ark/arkwidget.cpp
+++ b/ark/arkwidget.cpp
@@ -41,12 +41,12 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
 #include <kopenwith.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmimemagic.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
diff --git a/ark/artdeutils.cpp b/ark/artdeutils.cpp
index dbf5395..bdfec3f 100644
--- a/ark/artdeutils.cpp
+++ b/ark/artdeutils.cpp
@@ -65,8 +65,8 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <klargefile.h>
 
 // TQt includes
diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp
index b0dd55d..a6b0ddc 100644
--- a/ark/compressedfile.cpp
+++ b/ark/compressedfile.cpp
@@ -34,8 +34,8 @@
 // KDE includes
 #include <kdebug.h>
 #include <klargefile.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <ktempdir.h>
 #include <kprocess.h>
@@ -44,7 +44,7 @@
 #include <tdeio/global.h>
 #include <tdefileitem.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 // ark includes
 #include "arkwidget.h"
diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp
index ca82b56..0684ca1 100644
--- a/ark/extractiondialog.cpp
+++ b/ark/extractiondialog.cpp
@@ -36,13 +36,13 @@
 #include <tqradiobutton.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kurlrequester.h>
 #include <kurlcompletion.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kurlpixmapprovider.h>
diff --git a/ark/filelistview.cpp b/ark/filelistview.cpp
index 8792239..0e099d0 100644
--- a/ark/filelistview.cpp
+++ b/ark/filelistview.cpp
@@ -32,10 +32,10 @@
 #include <tqheader.h>
 
 // KDE includes
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kmimetype.h>
 
 #include "filelistview.h"
diff --git a/ark/lha.cpp b/ark/lha.cpp
index f0074aa..18a31db 100644
--- a/ark/lha.cpp
+++ b/ark/lha.cpp
@@ -40,8 +40,8 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 
 // ark includes
diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp
index f89a573..0b3872e 100644
--- a/ark/mainwindow.cpp
+++ b/ark/mainwindow.cpp
@@ -26,11 +26,11 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kedittoolbar.h>
 #include <kstatusbar.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdeparts/componentfactory.h>
 #include <tdeparts/browserextension.h>
diff --git a/ark/rar.cpp b/ark/rar.cpp
index 500b338..5878769 100644
--- a/ark/rar.cpp
+++ b/ark/rar.cpp
@@ -36,9 +36,9 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
diff --git a/ark/searchbar.cpp b/ark/searchbar.cpp
index a1fee6f..498e3e3 100644
--- a/ark/searchbar.cpp
+++ b/ark/searchbar.cpp
@@ -24,7 +24,7 @@
 #include <tdelistviewsearchline.h>
 #include <tdelistview.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdeactioncollection.h>
 
diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp
index c683f67..3f5fff2 100644
--- a/ark/sevenzip.cpp
+++ b/ark/sevenzip.cpp
@@ -27,11 +27,11 @@
 #include <tqdir.h>
 #include <tqtextcodec.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
diff --git a/ark/tar.cpp b/ark/tar.cpp
index d767e4d..10bf55f 100644
--- a/ark/tar.cpp
+++ b/ark/tar.cpp
@@ -57,9 +57,9 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <klargefile.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <ktempdir.h>
diff --git a/ark/zip.cpp b/ark/zip.cpp
index 3f48607..4227ae5 100644
--- a/ark/zip.cpp
+++ b/ark/zip.cpp
@@ -31,8 +31,8 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kpassdlg.h>
 
diff --git a/ark/zoo.cpp b/ark/zoo.cpp
index c9814b4..e173415 100644
--- a/ark/zoo.cpp
+++ b/ark/zoo.cpp
@@ -37,8 +37,8 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 
 // ark includes
-- 
cgit v1.2.1