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/systray/kitsystemtray.cpp | 4 ++--
 noatun/modules/systray/systray.cpp       | 2 +-
 noatun/modules/systray/systray.h         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'noatun/modules/systray')

diff --git a/noatun/modules/systray/kitsystemtray.cpp b/noatun/modules/systray/kitsystemtray.cpp
index 63a467b6..963a9c69 100644
--- a/noatun/modules/systray/kitsystemtray.cpp
+++ b/noatun/modules/systray/kitsystemtray.cpp
@@ -36,8 +36,8 @@
 #include <tqdragobject.h>
 
 #include "kitsystemtray.h"
-#include <kmainwindow.h>
-#include <kpopupmenu.h>
+#include <tdemainwindow.h>
+#include <tdepopupmenu.h>
 #include <kxmlguifactory.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index 0cfde28e..3ef8841c 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/noatun/modules/systray/systray.cpp
@@ -38,7 +38,7 @@
 #include <noatun/player.h>
 #include <noatun/stdaction.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <tqfile.h>
 #include <kglobal.h>
diff --git a/noatun/modules/systray/systray.h b/noatun/modules/systray/systray.h
index b1dd7aad..80592b07 100644
--- a/noatun/modules/systray/systray.h
+++ b/noatun/modules/systray/systray.h
@@ -32,7 +32,7 @@
 
 #include <tqtimer.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class KitSystemTray;
 class TQTimer;
-- 
cgit v1.2.1