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

---
 karm/tray.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'karm/tray.cpp')

diff --git a/karm/tray.cpp b/karm/tray.cpp
index 2933b8ae8..06d08af26 100644
--- a/karm/tray.cpp
+++ b/karm/tray.cpp
@@ -16,12 +16,12 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 
-#include <kaction.h>            // actionPreferences()
+#include <tdeaction.h>            // actionPreferences()
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>        // UserIcon
 #include <klocale.h>            // i18n
-#include <kpopupmenu.h>         // plug()
+#include <tdepopupmenu.h>         // plug()
 #include <ksystemtray.h>
 
 #include "mainwindow.h"
-- 
cgit v1.2.1