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

---
 libkscan/img_canvas.cpp | 2 +-
 libkscan/previewer.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'libkscan')

diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp
index 9618b47b..5dfa43b7 100644
--- a/libkscan/img_canvas.cpp
+++ b/libkscan/img_canvas.cpp
@@ -22,7 +22,7 @@
 #include <tqstring.h>
 #include <tqmessagebox.h>
 #include <tqscrollview.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqlabel.h>
 #include <tqdict.h>
 #include <tqimage.h>
diff --git a/libkscan/previewer.cpp b/libkscan/previewer.cpp
index 5aba1b04..a8d3f6be 100644
--- a/libkscan/previewer.cpp
+++ b/libkscan/previewer.cpp
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcombobox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstandarddirs.h>
 
 #include "previewer.h"
-- 
cgit v1.2.1