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

---
 src/knemod/interfaceicon.cpp | 2 +-
 src/knemod/interfacetray.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/knemod/interfaceicon.cpp b/src/knemod/interfaceicon.cpp
index 3e8b3dd..8a9c35c 100644
--- a/src/knemod/interfaceicon.cpp
+++ b/src/knemod/interfaceicon.cpp
@@ -25,7 +25,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kprocess.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <knotifyclient.h>
 
diff --git a/src/knemod/interfacetray.cpp b/src/knemod/interfacetray.cpp
index e1c2b47..5a24762 100644
--- a/src/knemod/interfacetray.cpp
+++ b/src/knemod/interfacetray.cpp
@@ -24,11 +24,11 @@
 #include <klocale.h>
 #include <kbugreport.h>
 #include <kaboutdata.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 #include <kaboutapplication.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 
 #include "interfacetray.h"
 
-- 
cgit v1.2.1