From a50cfb5969c8ebb952c78873e0ce047f7a54ee39 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 00:51:02 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 amarok/src/engine/helix/Makefile.test            | 2 +-
 amarok/src/engine/helix/config/helixconfig.kcfgc | 2 +-
 amarok/src/engine/kdemm/kdemmengine.cpp          | 4 ++--
 amarok/src/engine/mas/masengine.cpp              | 4 ++--
 amarok/src/engine/nmm/nmm_engine.cpp             | 2 +-
 amarok/src/engine/nmm/nmm_kdeconfig.kcfgc        | 2 +-
 amarok/src/engine/xine/xinecfg.kcfgc             | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'amarok/src/engine')

diff --git a/amarok/src/engine/helix/Makefile.test b/amarok/src/engine/helix/Makefile.test
index a2860f35..8f3d6d44 100644
--- a/amarok/src/engine/helix/Makefile.test
+++ b/amarok/src/engine/helix/Makefile.test
@@ -61,7 +61,7 @@ install:
 	install -p -C -m 755 $(SLIBRARY) /usr/lib/trinity/$(SLIBRARY)
 	install -p -C -m 755 $(SLIBRARY:.so=.la) /usr/lib/trinity/$(SLIBRARY:.so=.la)
 	install -p -C -m 644 amarok_helixengine_plugin.desktop /usr/share/services/amarok_helixengine_plugin.desktop
-#	kbuildsycoca
+#	tdebuildsycoca
 
 uninstall:
 	rm -f /usr/lib/trinity/$(SLIBRARY:.so=.la)
diff --git a/amarok/src/engine/helix/config/helixconfig.kcfgc b/amarok/src/engine/helix/config/helixconfig.kcfgc
index c0f6079d..ee1b279c 100644
--- a/amarok/src/engine/helix/config/helixconfig.kcfgc
+++ b/amarok/src/engine/helix/config/helixconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=helixconfig.kcfg
 ClassName=HelixConfig
 Singleton=true
diff --git a/amarok/src/engine/kdemm/kdemmengine.cpp b/amarok/src/engine/kdemm/kdemmengine.cpp
index b39033e0..3dc1aac6 100644
--- a/amarok/src/engine/kdemm/kdemmengine.cpp
+++ b/amarok/src/engine/kdemm/kdemmengine.cpp
@@ -33,9 +33,9 @@ what                 : interface to the KDE Multimedia interface (KDEMM)
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/amarok/src/engine/mas/masengine.cpp b/amarok/src/engine/mas/masengine.cpp
index 91ccffcc..9b9668bd 100644
--- a/amarok/src/engine/mas/masengine.cpp
+++ b/amarok/src/engine/mas/masengine.cpp
@@ -31,8 +31,8 @@ what                 : interface to the Media Application Server (MAS)
 #include <tqfile.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
-#include <kfileitem.h>
+#include <tdeconfig.h>
+#include <tdefileitem.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/amarok/src/engine/nmm/nmm_engine.cpp b/amarok/src/engine/nmm/nmm_engine.cpp
index 77639658..eb0c5fd9 100644
--- a/amarok/src/engine/nmm/nmm_engine.cpp
+++ b/amarok/src/engine/nmm/nmm_engine.cpp
@@ -49,7 +49,7 @@
 #include <tqapplication.h>
 #include <tqtimer.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
diff --git a/amarok/src/engine/nmm/nmm_kdeconfig.kcfgc b/amarok/src/engine/nmm/nmm_kdeconfig.kcfgc
index 8db0f8c5..6568b5cc 100644
--- a/amarok/src/engine/nmm/nmm_kdeconfig.kcfgc
+++ b/amarok/src/engine/nmm/nmm_kdeconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=nmm_kdeconfig.kcfg
 ClassName=NmmKDEConfig
 Singleton=true
diff --git a/amarok/src/engine/xine/xinecfg.kcfgc b/amarok/src/engine/xine/xinecfg.kcfgc
index 127cdf81..9bd6faa1 100644
--- a/amarok/src/engine/xine/xinecfg.kcfgc
+++ b/amarok/src/engine/xine/xinecfg.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=xinecfg.kcfg
 ClassName=XineCfg
 Singleton=true
-- 
cgit v1.2.3