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

---
 src/devices/pic/gui/pic_group_ui.cpp      | 2 +-
 src/devices/pic/gui/pic_memory_editor.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/devices/pic')

diff --git a/src/devices/pic/gui/pic_group_ui.cpp b/src/devices/pic/gui/pic_group_ui.cpp
index 912423c..2dd5f00 100644
--- a/src/devices/pic/gui/pic_group_ui.cpp
+++ b/src/devices/pic/gui/pic_group_ui.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "pic_group_ui.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "libgui/main_global.h"
 #include "pic_hex_view.h"
diff --git a/src/devices/pic/gui/pic_memory_editor.cpp b/src/devices/pic/gui/pic_memory_editor.cpp
index 219519f..e1fb50b 100644
--- a/src/devices/pic/gui/pic_memory_editor.cpp
+++ b/src/devices/pic/gui/pic_memory_editor.cpp
@@ -23,7 +23,7 @@
 
 #include <klocale.h>
 #include <kpushbutton.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "common/common/misc.h"
 #include "pic_config_editor.h"
-- 
cgit v1.2.1