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

---
 konq-plugins/akregator/akregatorplugin.cpp | 4 ++--
 konq-plugins/akregator/konqfeedicon.h      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'konq-plugins/akregator')

diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp
index 72a73d1..372c2e4 100644
--- a/konq-plugins/akregator/akregatorplugin.cpp
+++ b/konq-plugins/akregator/akregatorplugin.cpp
@@ -27,11 +27,11 @@
 #include <kapplication.h>
 #include <kmimetype.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <klocale.h>
 #include <konq_popupmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 #include <kurl.h>
 #include <tdehtml_part.h>
diff --git a/konq-plugins/akregator/konqfeedicon.h b/konq-plugins/akregator/konqfeedicon.h
index 3b6b470..4f102b1 100644
--- a/konq-plugins/akregator/konqfeedicon.h
+++ b/konq-plugins/akregator/konqfeedicon.h
@@ -27,7 +27,7 @@
 
 #include <tqguardedptr.h>
 #include <tdeparts/plugin.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include "feeddetector.h"
 #include "pluginbase.h"
 
-- 
cgit v1.2.1