From 81576b133797828eaca3ac819f4adca21de8d327 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:20:36 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 kuickshow/src/filewidget.cpp     | 2 +-
 kuickshow/src/imagewindow.cpp    | 2 +-
 kuickshow/src/imagewindow.h      | 2 +-
 kuickshow/src/kuickconfigdlg.cpp | 2 +-
 kuickshow/src/kuickshow.cpp      | 8 ++++----
 kuickshow/src/kuickshow.h        | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kuickshow')

diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp
index 525397e5..52a054ba 100644
--- a/kuickshow/src/filewidget.cpp
+++ b/kuickshow/src/filewidget.cpp
@@ -22,7 +22,7 @@
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kpropertiesdialog.h>
 #include <kurlcompletion.h>
 
diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
index 0fcbde11..dae0fc3c 100644
--- a/kuickshow/src/imagewindow.cpp
+++ b/kuickshow/src/imagewindow.cpp
@@ -51,7 +51,7 @@
 #include <kmessagebox.h>
 #include <kprinter.h>
 #include <kpropertiesdialog.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdguiitem.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
diff --git a/kuickshow/src/imagewindow.h b/kuickshow/src/imagewindow.h
index bf5427a8..fbc8b900 100644
--- a/kuickshow/src/imagewindow.h
+++ b/kuickshow/src/imagewindow.h
@@ -21,7 +21,7 @@
 
 #include <tqevent.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurl.h>
 
 #include "imlibwidget.h"
diff --git a/kuickshow/src/kuickconfigdlg.cpp b/kuickshow/src/kuickconfigdlg.cpp
index 09951e54..908aadb3 100644
--- a/kuickshow/src/kuickconfigdlg.cpp
+++ b/kuickshow/src/kuickconfigdlg.cpp
@@ -25,7 +25,7 @@
 #include <tqkeycode.h>
 #include <tqvbox.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
index ebd03b81..c9bffe25 100644
--- a/kuickshow/src/kuickshow.cpp
+++ b/kuickshow/src/kuickshow.cpp
@@ -29,8 +29,8 @@
 #include <tqstring.h>
 
 #include <kaboutdata.h>
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <tdeconfig.h>
@@ -45,7 +45,7 @@
 #include <klocale.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprotocolinfo.h>
 #include <kpropertiesdialog.h>
 #include <kprotocolinfo.h>
@@ -53,7 +53,7 @@
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 #include <kstartupinfo.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
 #include <kurldrag.h>
diff --git a/kuickshow/src/kuickshow.h b/kuickshow/src/kuickshow.h
index 33f5a9f5..79d05889 100644
--- a/kuickshow/src/kuickshow.h
+++ b/kuickshow/src/kuickshow.h
@@ -25,7 +25,7 @@
 #include <tqvaluelist.h>
 
 #include <tdefileitem.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 
 #include <Imlib.h>
-- 
cgit v1.2.3