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

---
 noatun/modules/htmlexport/htmlexport.cpp | 2 +-
 noatun/modules/htmlexport/htmlexport.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'noatun/modules/htmlexport')

diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp
index 27746b69..60792eea 100644
--- a/noatun/modules/htmlexport/htmlexport.cpp
+++ b/noatun/modules/htmlexport/htmlexport.cpp
@@ -1,7 +1,7 @@
 #include <klocale.h>
 #include <tqregexp.h>
 #include <tqtextcodec.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <noatun/stdaction.h>
 #include "htmlexport.h"
 
diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h
index 0c3de125..d9acd313 100644
--- a/noatun/modules/htmlexport/htmlexport.h
+++ b/noatun/modules/htmlexport/htmlexport.h
@@ -14,7 +14,7 @@
 #include <tqwhatsthis.h>
 
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdefiledialog.h>
 #include <ktempfile.h>
 #include <kcolorbutton.h>
-- 
cgit v1.2.1