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

---
 tdemid/channelview.h    | 2 +-
 tdemid/tdemid_part.cpp  | 2 +-
 tdemid/tdemidclient.cpp | 2 +-
 tdemid/tdemidframe.cpp  | 8 ++++----
 tdemid/tdemidframe.h    | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'tdemid')

diff --git a/tdemid/channelview.h b/tdemid/channelview.h
index a7d6e32d..b54015ce 100644
--- a/tdemid/channelview.h
+++ b/tdemid/channelview.h
@@ -25,7 +25,7 @@
 #ifndef CHANNELVIEW_H
 #define CHANNELVIEW_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqscrollbar.h>
 #include "channel.h"
 
diff --git a/tdemid/tdemid_part.cpp b/tdemid/tdemid_part.cpp
index e85281e1..ee82529f 100644
--- a/tdemid/tdemid_part.cpp
+++ b/tdemid/tdemid_part.cpp
@@ -4,7 +4,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqiconset.h>
 
 #include <tdeparts/partmanager.h>
diff --git a/tdemid/tdemidclient.cpp b/tdemid/tdemidclient.cpp
index 3450dbf2..5c0ff444 100644
--- a/tdemid/tdemidclient.cpp
+++ b/tdemid/tdemidclient.cpp
@@ -45,7 +45,7 @@
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 
 #include <libtdemid/midimapper.h>
diff --git a/tdemid/tdemidframe.cpp b/tdemid/tdemidframe.cpp
index 2b340131..452e4ac2 100644
--- a/tdemid/tdemidframe.cpp
+++ b/tdemid/tdemidframe.cpp
@@ -31,20 +31,20 @@
 #include <tqkeycode.h>
 #include <tqstring.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kcmdlineargs.h>
 #include <tdefiledialog.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kurldrag.h>
 #include <kedittoolbar.h>
diff --git a/tdemid/tdemidframe.h b/tdemid/tdemidframe.h
index e181b96d..2ce5226e 100644
--- a/tdemid/tdemidframe.h
+++ b/tdemid/tdemidframe.h
@@ -24,7 +24,7 @@
 #ifndef _KMIDFRAME_H
 #define _KMIDFRAME_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmenubar.h>
 #include <libtdemid/midiout.h>
 #include <libtdemid/player.h>
-- 
cgit v1.2.1