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

---
 nsplugins/plugin_part.cpp       | 2 +-
 nsplugins/test/testnsplugin.cpp | 2 +-
 nsplugins/test/testnsplugin.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'nsplugins')

diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index ef189d9ea..a7033d852 100644
--- a/nsplugins/plugin_part.cpp
+++ b/nsplugins/plugin_part.cpp
@@ -22,7 +22,7 @@
 
 #include <dcopclient.h>
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
diff --git a/nsplugins/test/testnsplugin.cpp b/nsplugins/test/testnsplugin.cpp
index 986595816..6e029e87b 100644
--- a/nsplugins/test/testnsplugin.cpp
+++ b/nsplugins/test/testnsplugin.cpp
@@ -26,7 +26,7 @@
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "testnsplugin.h"
 #include "../NSPluginClassIface_stub.h"
diff --git a/nsplugins/test/testnsplugin.h b/nsplugins/test/testnsplugin.h
index 0b007aba2..252cea2c8 100644
--- a/nsplugins/test/testnsplugin.h
+++ b/nsplugins/test/testnsplugin.h
@@ -25,7 +25,7 @@
 
 #include <tqstring.h>
 #include <tqwidget.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqlayout.h>
 #include <tqptrlist.h>
 
-- 
cgit v1.2.1