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

---
 kdat/ArchiveInfoWidget.cpp       | 2 +-
 kdat/BackupDlg.cpp               | 4 ++--
 kdat/BackupOptDlg.cpp            | 2 +-
 kdat/BackupProfileInfoWidget.cpp | 2 +-
 kdat/BackupProfileManager.cpp    | 2 +-
 kdat/BackupProfileWidget.cpp     | 2 +-
 kdat/ErrorHandler.cpp            | 4 ++--
 kdat/FileInfoWidget.cpp          | 4 ++--
 kdat/FormatOptDlg.cpp            | 4 ++--
 kdat/ImageCache.cpp              | 2 +-
 kdat/IndexDlg.cpp                | 4 ++--
 kdat/KDatMainWindow.cpp          | 8 ++++----
 kdat/LoggerWidget.cpp            | 4 ++--
 kdat/Node.cpp                    | 2 +-
 kdat/OptionsDlg.cpp              | 4 ++--
 kdat/OptionsDlgWidget.ui         | 4 ++--
 kdat/Tape.cpp                    | 4 ++--
 kdat/TapeDrive.cpp               | 4 ++--
 kdat/TapeFileInfoWidget.cpp      | 2 +-
 kdat/TapeInfoWidget.cpp          | 4 ++--
 kdat/TapeManager.cpp             | 2 +-
 kdat/Util.cpp                    | 4 ++--
 kdat/VerifyDlg.cpp               | 2 +-
 kdat/VerifyOptDlg.cpp            | 2 +-
 kdat/main.cpp                    | 4 ++--
 25 files changed, 41 insertions(+), 41 deletions(-)

(limited to 'kdat')

diff --git a/kdat/ArchiveInfoWidget.cpp b/kdat/ArchiveInfoWidget.cpp
index 2cf2fa3..c28d49f 100644
--- a/kdat/ArchiveInfoWidget.cpp
+++ b/kdat/ArchiveInfoWidget.cpp
@@ -31,7 +31,7 @@
 #include "Options.h"
 #include "Tape.h"
 #include "Util.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ArchiveInfoWidget.moc"
 
diff --git a/kdat/BackupDlg.cpp b/kdat/BackupDlg.cpp
index abb554d..381bcf7 100644
--- a/kdat/BackupDlg.cpp
+++ b/kdat/BackupDlg.cpp
@@ -33,7 +33,7 @@
 
 #include <tdeapplication.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
@@ -45,7 +45,7 @@
 #include "TapeDrive.h"
 #include "TarParser.h"
 #include "Util.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "BackupDlg.moc"
 
diff --git a/kdat/BackupOptDlg.cpp b/kdat/BackupOptDlg.cpp
index 4bb8c72..23dc6d2 100644
--- a/kdat/BackupOptDlg.cpp
+++ b/kdat/BackupOptDlg.cpp
@@ -26,7 +26,7 @@
 
 #include "BackupOptDlg.h"
 #include "BackupProfileWidget.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "BackupOptDlg.moc"
 
diff --git a/kdat/BackupProfileInfoWidget.cpp b/kdat/BackupProfileInfoWidget.cpp
index 71b4e7c..3b347d3 100644
--- a/kdat/BackupProfileInfoWidget.cpp
+++ b/kdat/BackupProfileInfoWidget.cpp
@@ -32,7 +32,7 @@
 #include "BackupProfileWidget.h"
 #include "KDatMainWindow.h"
 #include "Options.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "BackupProfileInfoWidget.moc"
 
diff --git a/kdat/BackupProfileManager.cpp b/kdat/BackupProfileManager.cpp
index eebf88b..1432169 100644
--- a/kdat/BackupProfileManager.cpp
+++ b/kdat/BackupProfileManager.cpp
@@ -22,7 +22,7 @@
 #include <tqdir.h>
 #include <tqregexp.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "BackupProfileManager.h"
diff --git a/kdat/BackupProfileWidget.cpp b/kdat/BackupProfileWidget.cpp
index b7600ea..2675adf 100644
--- a/kdat/BackupProfileWidget.cpp
+++ b/kdat/BackupProfileWidget.cpp
@@ -29,7 +29,7 @@
 #include "BackupProfile.h"
 #include "BackupProfileWidget.h"
 #include "Util.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "BackupProfileWidget.moc"
 
diff --git a/kdat/ErrorHandler.cpp b/kdat/ErrorHandler.cpp
index d20e347..5f31028 100644
--- a/kdat/ErrorHandler.cpp
+++ b/kdat/ErrorHandler.cpp
@@ -18,9 +18,9 @@
 #include <stdio.h>
 #include <signal.h>
 #include <stdlib.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqmessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 //#include <kstandarddirs.h>
 //#include <tdeapplication.h>
 
diff --git a/kdat/FileInfoWidget.cpp b/kdat/FileInfoWidget.cpp
index 144505b..7a6fb3a 100644
--- a/kdat/FileInfoWidget.cpp
+++ b/kdat/FileInfoWidget.cpp
@@ -28,8 +28,8 @@
 #include <tqfile.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "FileInfoWidget.h"
 #include "Util.h"
diff --git a/kdat/FormatOptDlg.cpp b/kdat/FormatOptDlg.cpp
index 8f3e06e..14be994 100644
--- a/kdat/FormatOptDlg.cpp
+++ b/kdat/FormatOptDlg.cpp
@@ -26,8 +26,8 @@
 #include <kstdguiitem.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "Options.h"
 #include "FormatOptDlg.h"
diff --git a/kdat/ImageCache.cpp b/kdat/ImageCache.cpp
index b155392..c645cb6 100644
--- a/kdat/ImageCache.cpp
+++ b/kdat/ImageCache.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <tqpixmap.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include "ImageCache.h"
diff --git a/kdat/IndexDlg.cpp b/kdat/IndexDlg.cpp
index f9fc6c7..4c9ff2f 100644
--- a/kdat/IndexDlg.cpp
+++ b/kdat/IndexDlg.cpp
@@ -27,8 +27,8 @@
 #include <kstdguiitem.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "LoggerWidget.h"
 #include "Options.h"
diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp
index cb4d6ff..2ef0f76 100644
--- a/kdat/KDatMainWindow.cpp
+++ b/kdat/KDatMainWindow.cpp
@@ -31,12 +31,12 @@
 
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdepopupmenu.h>
 #include <tdetoolbar.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstringhandler.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
@@ -67,7 +67,7 @@
 #include "VerifyOptDlg.h"
 #include "kdat.h"
 #include "ktreeview.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqsplitter.h>
 #include <kstatusbar.h>
 
diff --git a/kdat/LoggerWidget.cpp b/kdat/LoggerWidget.cpp
index 0a9e665..3df963c 100644
--- a/kdat/LoggerWidget.cpp
+++ b/kdat/LoggerWidget.cpp
@@ -24,8 +24,8 @@
 #include <tdefiledialog.h>
 
 #include "LoggerWidget.h"
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "LoggerWidget.moc"
 
diff --git a/kdat/Node.cpp b/kdat/Node.cpp
index 67de62f..e8322e2 100644
--- a/kdat/Node.cpp
+++ b/kdat/Node.cpp
@@ -36,7 +36,7 @@
 #include "Range.h"
 #include "Tape.h"
 #include "TapeManager.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "Node.moc"
 
diff --git a/kdat/OptionsDlg.cpp b/kdat/OptionsDlg.cpp
index ca6a029..3f29fae 100644
--- a/kdat/OptionsDlg.cpp
+++ b/kdat/OptionsDlg.cpp
@@ -30,8 +30,8 @@
 #include <klineedit.h>
 #include <knuminput.h>
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 #include "OptionsDlg.moc"
 OptionsDlg::OptionsDlg( TQWidget* parent, const char* name )
diff --git a/kdat/OptionsDlgWidget.ui b/kdat/OptionsDlgWidget.ui
index e371adf..b157424 100644
--- a/kdat/OptionsDlgWidget.ui
+++ b/kdat/OptionsDlgWidget.ui
@@ -365,8 +365,8 @@ You must still specify the block size.</string>
 <includes>
     <include location="global" impldecl="in implementation">tdeapplication.h</include>
     <include location="global" impldecl="in implementation">tdefiledialog.h</include>
-    <include location="global" impldecl="in implementation">kmessagebox.h</include>
-    <include location="global" impldecl="in implementation">kglobal.h</include>
+    <include location="global" impldecl="in implementation">tdemessagebox.h</include>
+    <include location="global" impldecl="in implementation">tdeglobal.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">OptionsDlgWidget.ui.h</include>
 </includes>
diff --git a/kdat/Tape.cpp b/kdat/Tape.cpp
index 7a03c6a..e3b4b1a 100644
--- a/kdat/Tape.cpp
+++ b/kdat/Tape.cpp
@@ -24,8 +24,8 @@
 
 #include <tqfile.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 
diff --git a/kdat/TapeDrive.cpp b/kdat/TapeDrive.cpp
index e6b18ff..6fb1777 100644
--- a/kdat/TapeDrive.cpp
+++ b/kdat/TapeDrive.cpp
@@ -26,9 +26,9 @@
 
 #include <tqfile.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "KDatMainWindow.h"
 #include "Options.h"
diff --git a/kdat/TapeFileInfoWidget.cpp b/kdat/TapeFileInfoWidget.cpp
index 033edc1..36a4581 100644
--- a/kdat/TapeFileInfoWidget.cpp
+++ b/kdat/TapeFileInfoWidget.cpp
@@ -26,7 +26,7 @@
 #include "File.h"
 #include "TapeFileInfoWidget.h"
 #include "Util.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "TapeFileInfoWidget.moc"
 
diff --git a/kdat/TapeInfoWidget.cpp b/kdat/TapeInfoWidget.cpp
index 35f5050..b0e8199 100644
--- a/kdat/TapeInfoWidget.cpp
+++ b/kdat/TapeInfoWidget.cpp
@@ -25,8 +25,8 @@
 #include <tqlineedit.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/kdat/TapeManager.cpp b/kdat/TapeManager.cpp
index 386627d..b3fa058 100644
--- a/kdat/TapeManager.cpp
+++ b/kdat/TapeManager.cpp
@@ -23,7 +23,7 @@
 #include <tqregexp.h>
 #include <tqfile.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "TapeManager.h"
diff --git a/kdat/Util.cpp b/kdat/Util.cpp
index b52f984..428d714 100644
--- a/kdat/Util.cpp
+++ b/kdat/Util.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <tqstringlist.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "Util.h"
 
diff --git a/kdat/VerifyDlg.cpp b/kdat/VerifyDlg.cpp
index 5f2681e..c43fa00 100644
--- a/kdat/VerifyDlg.cpp
+++ b/kdat/VerifyDlg.cpp
@@ -30,7 +30,7 @@
 
 #include <tdeapplication.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
diff --git a/kdat/VerifyOptDlg.cpp b/kdat/VerifyOptDlg.cpp
index 795cf02..499027b 100644
--- a/kdat/VerifyOptDlg.cpp
+++ b/kdat/VerifyOptDlg.cpp
@@ -29,7 +29,7 @@
 #include <kstdguiitem.h>
 
 #include "VerifyOptDlg.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "VerifyOptDlg.moc"
 
diff --git a/kdat/main.cpp b/kdat/main.cpp
index c6c89f8..a2d55ea 100644
--- a/kdat/main.cpp
+++ b/kdat/main.cpp
@@ -26,11 +26,11 @@
 #include <tqdir.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <kcrash.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <signal.h>
 
-- 
cgit v1.2.1