From 047100f357318a249688b2b82309399ea04535bc Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:46:34 -0600
Subject: [PATCH] Rename additional header files to avoid conflicts with KDE4

---
 src/kmplayer_koffice_part.cpp | 2 +-
 src/kmplayer_part.cpp         | 2 +-
 src/kmplayerapp.cpp           | 6 +++---
 src/kmplayerbroadcast.cpp     | 6 +++---
 src/kmplayerconfig.cpp        | 6 +++---
 src/kmplayercontrolpanel.cpp  | 2 +-
 src/kmplayerpartbase.cpp      | 2 +-
 src/kmplayerprocess.cpp       | 6 +++---
 src/kmplayertvsource.cpp      | 4 ++--
 src/kmplayervdr.cpp           | 4 ++--
 src/kmplayerview.cpp          | 4 ++--
 src/main.cpp                  | 2 +-
 src/playlistview.cpp          | 2 +-
 src/pref.cpp                  | 4 ++--
 src/viewarea.cpp              | 2 +-
 15 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/kmplayer_koffice_part.cpp b/src/kmplayer_koffice_part.cpp
index b09b4fd..55faaa2 100644
--- a/src/kmplayer_koffice_part.cpp
+++ b/src/kmplayer_koffice_part.cpp
@@ -33,7 +33,7 @@
 #include <tqvaluelist.h>
 
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
diff --git a/src/kmplayer_part.cpp b/src/kmplayer_part.cpp
index e5109e6..ff8aa1d 100644
--- a/src/kmplayer_part.cpp
+++ b/src/kmplayer_part.cpp
@@ -35,7 +35,7 @@ class KXMLGUIClient; // workaround for trinity.3 on sarge with gcc4, tdeactionco
 #include <ksimpleconfig.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <tdeparts/factory.h>
 #include <kstaticdeleter.h>
diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp
index 2a7c280..6f0c523 100644
--- a/src/kmplayerapp.cpp
+++ b/src/kmplayerapp.cpp
@@ -41,13 +41,13 @@
 #include <tdeversion.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <klineeditdlg.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kurldrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstdaction.h>
 #include <kdebug.h>
diff --git a/src/kmplayerbroadcast.cpp b/src/kmplayerbroadcast.cpp
index 0733eb3..52af330 100644
--- a/src/kmplayerbroadcast.cpp
+++ b/src/kmplayerbroadcast.cpp
@@ -33,13 +33,13 @@
 #include <tqfile.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kled.h>
 #include <tdeconfig.h>
 #include <kprocess.h>
 #include <kprocctrl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kmplayerbroadcast.h"
 #include "kmplayerprocess.h"
@@ -470,7 +470,7 @@ TQFrame * KMPlayerBroadcastConfig::prefPage (TQWidget * parent) {
 KDE_NO_EXPORT bool KMPlayerBroadcastConfig::broadcasting () const {
     return m_ffserver_process && m_ffserver_process->isRunning ();
 }
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 static const char ffserverconf[] =
diff --git a/src/kmplayerconfig.cpp b/src/kmplayerconfig.cpp
index 01d8f5a..d774749 100644
--- a/src/kmplayerconfig.cpp
+++ b/src/kmplayerconfig.cpp
@@ -38,10 +38,10 @@
 #include <tdeapplication.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
 
 #include "kmplayersource.h"
 #include "kmplayerconfig.h"
diff --git a/src/kmplayercontrolpanel.cpp b/src/kmplayercontrolpanel.cpp
index 831465d..519eb74 100644
--- a/src/kmplayercontrolpanel.cpp
+++ b/src/kmplayercontrolpanel.cpp
@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kmplayerview.h"
diff --git a/src/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp
index 9f48185..6cfef43 100644
--- a/src/kmplayerpartbase.cpp
+++ b/src/kmplayerpartbase.cpp
@@ -36,7 +36,7 @@
 #include <tqregexp.h>
 #include <tqtextstream.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <kbookmarkmenu.h>
diff --git a/src/kmplayerprocess.cpp b/src/kmplayerprocess.cpp
index fe3ddeb..13959a9 100644
--- a/src/kmplayerprocess.cpp
+++ b/src/kmplayerprocess.cpp
@@ -39,10 +39,10 @@
 #include <kprocess.h>
 #include <kdebug.h>
 #include <kprocctrl.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeio/job.h>
diff --git a/src/kmplayertvsource.cpp b/src/kmplayertvsource.cpp
index fc432a7..ac6a8dd 100644
--- a/src/kmplayertvsource.cpp
+++ b/src/kmplayertvsource.cpp
@@ -33,9 +33,9 @@
 #include <tqpopupmenu.h>
 #include <tqfontmetrics.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 #include <kurlrequester.h>
 #include <kcombobox.h>
diff --git a/src/kmplayervdr.cpp b/src/kmplayervdr.cpp
index ea6a202..3fb67a6 100644
--- a/src/kmplayervdr.cpp
+++ b/src/kmplayervdr.cpp
@@ -40,9 +40,9 @@
 #include <tqsocket.h>
 #include <tqeventloop.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 #include <kurlrequester.h>
 #include <kcombobox.h>
diff --git a/src/kmplayerview.cpp b/src/kmplayerview.cpp
index 020e46f..060cb03 100644
--- a/src/kmplayerview.cpp
+++ b/src/kmplayerview.cpp
@@ -43,7 +43,7 @@
 #include <kiconloader.h>
 #include <kstatusbar.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeactioncollection.h>
 #include <kstdaction.h>
@@ -51,7 +51,7 @@
 #include <kurldrag.h>
 #include <kfinddialog.h>
 #include <dcopclient.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstaticdeleter.h>
 
 #include "kmplayerview.h"
diff --git a/src/main.cpp b/src/main.cpp
index d312f4b..73854b8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,7 +19,7 @@ email                :
 #include <config.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdemacros.h>
 #include <dcopclient.h>
 
diff --git a/src/playlistview.cpp b/src/playlistview.cpp
index 5e045a4..96aeb18 100644
--- a/src/playlistview.cpp
+++ b/src/playlistview.cpp
@@ -35,7 +35,7 @@
 #include <kfinddialog.h>
 #include <kurldrag.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "playlistview.h"
diff --git a/src/pref.cpp b/src/pref.cpp
index 7380276..ff9a943 100644
--- a/src/pref.cpp
+++ b/src/pref.cpp
@@ -42,10 +42,10 @@
 #include <tqtimer.h>
 #include <tqfont.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
diff --git a/src/viewarea.cpp b/src/viewarea.cpp
index cd1fc40..91c8163 100644
--- a/src/viewarea.cpp
+++ b/src/viewarea.cpp
@@ -34,7 +34,7 @@
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <tdeshortcut.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kmplayerview.h"