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

---
 kuickshow/src/defaultswidget.cpp  |  2 +-
 kuickshow/src/filefinder.cpp      |  2 +-
 kuickshow/src/filewidget.cpp      |  6 +++---
 kuickshow/src/filewidget.h        |  2 +-
 kuickshow/src/generalwidget.cpp   |  2 +-
 kuickshow/src/imagewindow.cpp     |  8 ++++----
 kuickshow/src/kuickconfigdlg.cpp  |  4 ++--
 kuickshow/src/kuickdata.cpp       |  2 +-
 kuickshow/src/kuickfile.cpp       |  4 ++--
 kuickshow/src/kuickshow.cpp       | 10 +++++-----
 kuickshow/src/main.cpp            |  2 +-
 kuickshow/src/printing.cpp        |  6 +++---
 kuickshow/src/slideshowwidget.cpp |  2 +-
 13 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/kuickshow/src/defaultswidget.cpp b/kuickshow/src/defaultswidget.cpp
index 7e94b1b..4746638 100644
--- a/kuickshow/src/defaultswidget.cpp
+++ b/kuickshow/src/defaultswidget.cpp
@@ -24,7 +24,7 @@
 
 #include <kcombobox.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kstandarddirs.h>
 
diff --git a/kuickshow/src/filefinder.cpp b/kuickshow/src/filefinder.cpp
index 7a7eb90..34f39db 100644
--- a/kuickshow/src/filefinder.cpp
+++ b/kuickshow/src/filefinder.cpp
@@ -20,7 +20,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdecompletionbox.h>
 #include <kurlcompletion.h>
 
diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp
index 52a054b..61c7511 100644
--- a/kuickshow/src/filewidget.cpp
+++ b/kuickshow/src/filewidget.cpp
@@ -19,9 +19,9 @@
 #include <tqkeycode.h>
 
 #include <tdeversion.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kpropertiesdialog.h>
 #include <kurlcompletion.h>
diff --git a/kuickshow/src/filewidget.h b/kuickshow/src/filewidget.h
index cb54c04..87eff31 100644
--- a/kuickshow/src/filewidget.h
+++ b/kuickshow/src/filewidget.h
@@ -21,7 +21,7 @@
 
 #include <tqevent.h>
 
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 
 class FileFinder;
 class KFileItem;
diff --git a/kuickshow/src/generalwidget.cpp b/kuickshow/src/generalwidget.cpp
index 377e6f5..d51fe7d 100644
--- a/kuickshow/src/generalwidget.cpp
+++ b/kuickshow/src/generalwidget.cpp
@@ -27,7 +27,7 @@
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kurllabel.h>
 
diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
index b5273a0..fb52289 100644
--- a/kuickshow/src/imagewindow.cpp
+++ b/kuickshow/src/imagewindow.cpp
@@ -47,15 +47,15 @@
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <kimageeffect.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprinter.h>
 #include <kpropertiesdialog.h>
 #include <tdestdaccel.h>
 #include <kstdguiitem.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
-#include <ktempfile.h>
+#include <tdeglobalsettings.h>
+#include <tdetempfile.h>
 #include <twin.h>
 #include <netwm.h>
 #include <kurldrag.h>
diff --git a/kuickshow/src/kuickconfigdlg.cpp b/kuickshow/src/kuickconfigdlg.cpp
index 908aadb..baee42b 100644
--- a/kuickshow/src/kuickconfigdlg.cpp
+++ b/kuickshow/src/kuickconfigdlg.cpp
@@ -27,8 +27,8 @@
 
 #include <tdeaccel.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "imagewindow.h"
 #include "defaultswidget.h"
diff --git a/kuickshow/src/kuickdata.cpp b/kuickshow/src/kuickdata.cpp
index 84c4ff3..1e6a591 100644
--- a/kuickshow/src/kuickdata.cpp
+++ b/kuickshow/src/kuickdata.cpp
@@ -20,7 +20,7 @@
 
 #include <tqcolor.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "kuickdata.h"
 
diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp
index 764210f..0f970f8 100644
--- a/kuickshow/src/kuickfile.cpp
+++ b/kuickshow/src/kuickfile.cpp
@@ -3,11 +3,11 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include "filecache.h"
 #include "kuickfile.h"
diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
index 31b3354..728a770 100644
--- a/kuickshow/src/kuickshow.cpp
+++ b/kuickshow/src/kuickshow.cpp
@@ -38,13 +38,13 @@
 #include <tdeversion.h>
 #include <tdefiledialog.h>
 #include <tdefilemetainfo.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kprotocolinfo.h>
 #include <kpropertiesdialog.h>
@@ -52,7 +52,7 @@
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <tdetoolbar.h>
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
diff --git a/kuickshow/src/main.cpp b/kuickshow/src/main.cpp
index 14f1bc6..f263362 100644
--- a/kuickshow/src/main.cpp
+++ b/kuickshow/src/main.cpp
@@ -21,7 +21,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kuickshow.h"
diff --git a/kuickshow/src/printing.cpp b/kuickshow/src/printing.cpp
index 7d822f9..2f1fd70 100644
--- a/kuickshow/src/printing.cpp
+++ b/kuickshow/src/printing.cpp
@@ -32,12 +32,12 @@
 
 #include <kcombobox.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <knuminput.h>
 #include <kprinter.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include "imagewindow.h"
 #include "printing.h"
diff --git a/kuickshow/src/slideshowwidget.cpp b/kuickshow/src/slideshowwidget.cpp
index 9727c20..5330daa 100644
--- a/kuickshow/src/slideshowwidget.cpp
+++ b/kuickshow/src/slideshowwidget.cpp
@@ -20,7 +20,7 @@
 #include <tqlayout.h>
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include "slideshowwidget.h"
-- 
cgit v1.2.3