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

---
 src/app/historyAction.cpp           | 2 +-
 src/app/historyAction.h             | 2 +-
 src/app/mainWindow.cpp              | 6 +++---
 src/part/part.cpp                   | 2 +-
 src/part/radialMap/widgetEvents.cpp | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/app/historyAction.cpp b/src/app/historyAction.cpp
index 5bb1309..6729087 100644
--- a/src/app/historyAction.cpp
+++ b/src/app/historyAction.cpp
@@ -3,7 +3,7 @@
 
 #include "historyAction.h"
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 
diff --git a/src/app/historyAction.h b/src/app/historyAction.h
index 350b165..cd9b60a 100644
--- a/src/app/historyAction.h
+++ b/src/app/historyAction.h
@@ -4,7 +4,7 @@
 #ifndef HISTORYACTION_H
 #define HISTORYACTION_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurl.h>
 #include <tqstringlist.h>
 
diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp
index cb617e9..18457b7 100644
--- a/src/app/mainWindow.cpp
+++ b/src/app/mainWindow.cpp
@@ -6,8 +6,8 @@
 #include "historyAction.h"
 
 #include <cstdlib>            //std::exit()
-#include <kaccel.h>           //TDEStdAccel namespace
-#include <kaction.h>
+#include <tdeaccel.h>           //TDEStdAccel namespace
+#include <tdeaction.h>
 #include <kapplication.h>     //setupActions()
 #include <kcombobox.h>        //locationbar
 #include <tdeconfig.h>
@@ -19,7 +19,7 @@
 #include <kmessagebox.h>
 #include <kshell.h>
 #include <kstatusbar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kurl.h>
 #include <kurlcompletion.h>   //locationbar
 #include <tqobjectlist.h>
diff --git a/src/part/part.cpp b/src/part/part.cpp
index 609da9a..ab15ab2 100644
--- a/src/part/part.cpp
+++ b/src/part/part.cpp
@@ -13,7 +13,7 @@
 #include "summaryWidget.h"
 
 #include <kaboutdata.h>   //::createAboutData()
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kmessagebox.h>  //::start()
 //#include <konq_operations.h>
diff --git a/src/part/radialMap/widgetEvents.cpp b/src/part/radialMap/widgetEvents.cpp
index 8e78a70..03f6ec0 100644
--- a/src/part/radialMap/widgetEvents.cpp
+++ b/src/part/radialMap/widgetEvents.cpp
@@ -12,7 +12,7 @@
 #include <tdeio/job.h>     //::mousePressEvent()
 #include <klocale.h>
 #include <kmessagebox.h> //::mousePressEvent()
-#include <kpopupmenu.h>  //::mousePressEvent()
+#include <tdepopupmenu.h>  //::mousePressEvent()
 #include <krun.h>        //::mousePressEvent()
 #include <kurldrag.h>
 #include <tqapplication.h>//TQApplication::setOverrideCursor()
-- 
cgit v1.2.1