Rename additional instances of KDE to TDE

13 years ago · 7e1ba2df05
parent f8b6b1c3bd
commit 7e1ba2df05
24 changed files with 50 additions and 50 deletions
--- a/acinclude.m4
+++ b/acinclude.m4
@ -2092,8 +2092,8 @@ if test $kde_qtver = 3; then
               *) lib_kded="" ;;
       esac
   AC_SUBST(LIB_KDED, $lib_kded)
-   AC_SUBST(LIB_KDECORE, "-ltdecore")
-   AC_SUBST(LIB_KDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
   AC_SUBST(LIB_KIO, "-lkio")
   AC_SUBST(LIB_KJS, "-lkjs")
   AC_SUBST(LIB_SMB, "-lsmb")
@ -2102,9 +2102,9 @@ if test $kde_qtver = 3; then
   AC_SUBST(LIB_KHTML, "-lkhtml")
   AC_SUBST(LIB_KSPELL, "-lkspell")
   AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
   AC_SUBST(LIB_KUTILS, "-lkutils")
-   AC_SUBST(LIB_KDEPIM, "-ltdepim")
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
   AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@ -2113,8 +2113,8 @@ if test $kde_qtver = 3; then
   AC_SUBST(LIB_KSYCOCA, "-lkio")
   AC_SUBST(LIB_KFILE, "-lkio")
 elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-ltdecore")
-   AC_SUBST(LIB_KDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
   AC_SUBST(LIB_KIO, "-lkio")
   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
   AC_SUBST(LIB_SMB, "-lsmb")
@ -2123,13 +2123,13 @@ elif test $kde_qtver = 2; then
   AC_SUBST(LIB_KHTML, "-lkhtml")
   AC_SUBST(LIB_KSPELL, "-lkspell")
   AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
-   AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
-   AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
+   AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
+   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])

--- a/amarok/src/Makefile.am
+++ b/amarok/src/Makefile.am
@ -158,7 +158,7 @@ libamarok_la_LIBADD = \
    $(top_builddir)/amarok/src/statusbar/libstatusbar.la \
    $(top_builddir)/amarok/src/metadata/libmetadata.la \
    $(top_builddir)/amarok/src/magnatunebrowser/libmagnatunebrowser.la \
-    $(LIB_QT) $(LIB_KPARTS) -lDCOP -ltdefx $(KDE_MT_LIBS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KHTML) $(LIB_KNEWSTUFF) \
+    $(LIB_QT) $(LIB_KPARTS) -lDCOP -ltdefx $(KDE_MT_LIBS) $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KHTML) $(LIB_KNEWSTUFF) \
    $(TAGLIB_LIBS) $(gl_libs) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) \
    $(LIB_TUNEPIMP) \
    $(mysql_libs) \
@ -169,8 +169,8 @@ libamarok_la_LDFLAGS = \
    $(KDE_RPATH) \
    $(LIB_QT) \
    -lDCOP \
-    $(LIB_KDECORE) \
-    $(LIB_KDEUI)
+    $(LIB_TDECORE) \
+    $(LIB_TDEUI)

 METASOURCES = \
    AUTO
@ -188,7 +188,7 @@ bin_PROGRAMS = amarokapp
 # uncomment the lines below:
 #bin_PROGRAMS = amarokapp atomicstring_unittest
 #atomicstring_unittest_SOURCES = atomicstring_unittest.cpp atomicstring.h
-#atomicstring_unittest_LDADD = atomicstring.$(OBJEXT) $(LIB_KDECORE)
+#atomicstring_unittest_LDADD = atomicstring.$(OBJEXT) $(LIB_TDECORE)


 amarokapp_SOURCES = main.cpp
@ -200,7 +200,7 @@ amarokapp_LDADD = \
    $(top_builddir)/amarok/src/plugin/libplugin.la \
    $(top_builddir)/amarok/src/statusbar/libstatusbar.la \
    $(top_builddir)/amarok/src/metadata/libmetadata.la \
-    $(LIB_KDECORE) 
+    $(LIB_TDECORE) 
    $(EXSCALIBAR_LIBS)

 amarokapp_LDFLAGS = \
@ -208,8 +208,8 @@ amarokapp_LDFLAGS = \
    $(KDE_RPATH) \
    $(LIB_QT) \
    -lDCOP \
-    $(LIB_KDECORE) \
-    $(LIB_KDEUI)
+    $(LIB_TDECORE) \
+    $(LIB_TDEUI)

 rcdir = \
    $(kde_datadir)/amarok
--- a/amarok/src/collectionscanner/Makefile.am
+++ b/amarok/src/collectionscanner/Makefile.am
@ -20,7 +20,7 @@ amarokcollectionscanner_LDADD = \
    $(top_builddir)/amarok/src/metadata/libmetadata.la \
    $(top_builddir)/amarok/src/libamarok.la \
    $(LIB_QT) \
-    $(LIB_KDECORE) \
+    $(LIB_TDECORE) \
    $(TAGLIB_LIBS) \
    $(LIB_KIO)

@ -29,6 +29,6 @@ amarokcollectionscanner_LDFLAGS = \
    $(KDE_RPATH) \
    $(LIB_QT) \
    -lDCOP \
-    $(LIB_KDECORE) \
-    $(LIB_KDEUI) \
+    $(LIB_TDECORE) \
+    $(LIB_TDEUI) \
    $(LIB_KIO)
--- a/amarok/src/database_refactor/sqlite/_Makefile.am
+++ b/amarok/src/database_refactor/sqlite/_Makefile.am
@ -18,7 +18,7 @@ libamarok_sqlite_dbengine_plugin_la_LIBADD = \
    $(top_builddir)/amarok/src/database/sqlite/sqlite/libsqlite.la \
    $(top_builddir)/amarok/src/database/libdbengine.la \
    $(top_builddir)/amarok/src/plugin/libplugin.la \
-    $(LIB_KDECORE)
+    $(LIB_TDECORE)

 libamarok_sqlite_dbengine_plugin_la_SOURCES = \
    sqlite_dbengine.cpp
--- a/amarok/src/device/massstorage/Makefile.am
+++ b/amarok/src/device/massstorage/Makefile.am
@ -14,7 +14,7 @@ METASOURCES = AUTO

 libamarok_massstorage_device_la_LIBADD = \
    $(top_builddir)/amarok/src/libamarok.la \
-    $(LIB_KDECORE) $(LIB_QT)
+    $(LIB_TDECORE) $(LIB_QT)

 libamarok_massstorage_device_la_LDFLAGS = \
    $(KDE_PLUGIN) \
--- a/amarok/src/device/nfs/Makefile.am
+++ b/amarok/src/device/nfs/Makefile.am
@ -14,7 +14,7 @@ METASOURCES = AUTO

 libamarok_nfs_device_la_LIBADD = \
    $(top_builddir)/amarok/src/libamarok.la \
-    $(LIB_KDECORE) $(LIB_QT)
+    $(LIB_TDECORE) $(LIB_QT)

 libamarok_nfs_device_la_LDFLAGS = \
    $(KDE_PLUGIN) \
--- a/amarok/src/device/smb/Makefile.am
+++ b/amarok/src/device/smb/Makefile.am
@ -14,7 +14,7 @@ METASOURCES = AUTO

 libamarok_smb_device_la_LIBADD = \
    $(top_builddir)/amarok/src/libamarok.la \
-    $(LIB_KDECORE) $(LIB_QT)
+    $(LIB_TDECORE) $(LIB_QT)

 libamarok_smb_device_la_LDFLAGS = \
    $(KDE_PLUGIN) \
--- a/amarok/src/engine/kdemm/Makefile.am
+++ b/amarok/src/engine/kdemm/Makefile.am
@ -10,7 +10,7 @@ INCLUDES = \
 libamarok_kdemmengine_plugin_la_LIBADD = \
    $(top_builddir)/amarok/src/libamarok.la \
    $(top_builddir)/amarok/src/plugin/libplugin.la \
-    $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) \
+    $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) \
    $(LIBS_KDEMM) -lkdemm

 libamarok_kdemmengine_plugin_la_SOURCES = \
--- a/amarok/src/engine/mas/Makefile.am
+++ b/amarok/src/engine/mas/Makefile.am
@ -10,7 +10,7 @@ INCLUDES = \
 libamarok_masengine_plugin_la_LIBADD = \
    $(top_builddir)/amarok/src/engine/libengine.la \
    $(top_builddir)/amarok/src/plugin/libplugin.la \
-    $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) \
+    $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) \
    $(LIBS_MAS)

 libamarok_masengine_plugin_la_SOURCES = \
--- a/amarok/src/engine/nmm/Makefile.am
+++ b/amarok/src/engine/nmm/Makefile.am
@ -15,7 +15,7 @@ INCLUDES = \
 libamarok_nmmengine_plugin_la_LIBADD = \
    $(top_builddir)/amarok/src/libamarok.la \
    $(top_builddir)/amarok/src/plugin/libplugin.la \
-    $(LIB_KDECORE) $(LIB_KFILE) \
+    $(LIB_TDECORE) $(LIB_KFILE) \
    -lnmmbase -lnmmgraphmgr -lnmmiprogress -lnmmiaudiodevice -lnmmigeneral

 libamarok_nmmengine_plugin_la_SOURCES = \
--- a/amarok/src/engine/void/Makefile.am
+++ b/amarok/src/engine/void/Makefile.am
@ -9,7 +9,7 @@ INCLUDES = \
 libamarok_void_engine_plugin_la_LIBADD = \
    $(top_builddir)/amarok/src/libamarok.la \
    $(top_builddir)/amarok/src/plugin/libplugin.la \
-    $(LIB_KDECORE) $(LIB_QT)
+    $(LIB_TDECORE) $(LIB_QT)

 libamarok_void_engine_plugin_la_SOURCES = \
    void-engine.cpp
--- a/amarok/src/engine/yauap/Makefile.am
+++ b/amarok/src/engine/yauap/Makefile.am
@ -13,7 +13,7 @@ libamarok_yauap_engine_plugin_la_LIBADD = \
    $(top_builddir)/amarok/src/libamarok.la \
    $(top_builddir)/amarok/src/plugin/libplugin.la \
    $(LIB_YAUAP)\
-    $(LIB_KDECORE) $(LIB_QT)
+    $(LIB_TDECORE) $(LIB_QT)


 libamarok_yauap_engine_plugin_la_SOURCES = \
--- a/amarok/src/konquisidebar/Makefile.am
+++ b/amarok/src/konquisidebar/Makefile.am
@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = konqsidebar_universalamarok.la

 konqsidebar_universalamarok_la_SOURCES = universalamarok.cpp amarokdcopiface.stub
 konqsidebar_universalamarok_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkonqsidebarplugin
-konqsidebar_universalamarok_la_LIBADD = $(LIB_KHTML) $(LIB_QT) $(LIB_KDECORE) -lDCOP $(LIB_KDEUI)
+konqsidebar_universalamarok_la_LIBADD = $(LIB_KHTML) $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI)


 amarokdcopiface_DIR=$(top_srcdir)/amarok/src/amarokcore
--- a/amarok/src/loader/Makefile.am
+++ b/amarok/src/loader/Makefile.am
@ -8,9 +8,9 @@ amarok_SOURCES = \

 amarok_LDADD = \
        $(LIB_QT) \
-        $(LIB_KDEUI)
+        $(LIB_TDEUI)

-amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor

 METASOURCES = AUTO

--- a/amarok/src/mediadevice/daap/Makefile.am
+++ b/amarok/src/mediadevice/daap/Makefile.am
@ -17,7 +17,7 @@ METASOURCES = AUTO
 libamarok_daap_mediadevice_la_LIBADD  = \
    $(top_builddir)/amarok/src/libamarok.la \
    $(top_builddir)/amarok/src/mediadevice/daap/daapreader/libdaapreader.la \
-    $(DNSSD_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO) $(LIB_QT)
+    $(DNSSD_LIBS) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_QT)

 libamarok_daap_mediadevice_la_LDFLAGS = \
    $(KDE_PLUGIN) \
--- a/amarok/src/mediadevice/daap/daapreader/Makefile.am
+++ b/amarok/src/mediadevice/daap/daapreader/Makefile.am
@ -8,11 +8,11 @@ libdaapreader_la_SOURCES = reader.cpp

 libdaapreader_la_LIBADD = \
        $(LIB_QT) \
-        $(LIB_KDECORE) \
-        $(LIB_KDEUI) \
+        $(LIB_TDECORE) \
+        $(LIB_TDEUI) \
        $(top_builddir)/amarok/src/mediadevice/daap/daapreader/authentication/libauthentication.la

-libdaapreader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libdaapreader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor

 METASOURCES = AUTO

--- a/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am
+++ b/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am
@ -12,10 +12,10 @@ libauthentication_la_SOURCES = contentfetcher.cpp md5.c hasher.c

 libauthentication_la_LIBADD = \
        $(LIB_QT) \
-        $(LIB_KDECORE) \
-        $(LIB_KDEUI)
+        $(LIB_TDECORE) \
+        $(LIB_TDEUI)

-libauthentication_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libauthentication_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor

 METASOURCES = AUTO

--- a/amarok/src/mediadevice/generic/Makefile.am
+++ b/amarok/src/mediadevice/generic/Makefile.am
@ -15,7 +15,7 @@ METASOURCES = AUTO

 libamarok_generic_mediadevice_la_LIBADD  = \
    $(top_builddir)/amarok/src/libamarok.la \
-    $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO) $(LIB_QT)
+    $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_QT)

 libamarok_generic_mediadevice_la_LDFLAGS = \
    $(KDE_PLUGIN) \
--- a/amarok/src/mediadevice/ifp/Makefile.am
+++ b/amarok/src/mediadevice/ifp/Makefile.am
@ -15,7 +15,7 @@ INCLUDES = \
 libamarok_ifp_mediadevice_la_LIBADD = \
    $(top_builddir)/amarok/src/libamarok.la \
    -lusb -lifp \
-    $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO) $(LIB_QT)
+    $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_QT)

 libamarok_ifp_mediadevice_la_LDFLAGS = \
    $(KDE_PLUGIN) \
--- a/amarok/src/mediadevice/ipod/Makefile.am
+++ b/amarok/src/mediadevice/ipod/Makefile.am
@ -16,7 +16,7 @@ INCLUDES = \
 METASOURCES = AUTO

 libamarok_ipod_mediadevice_la_LIBADD  = \
-    $(top_builddir)/amarok/src/libamarok.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO)
+    $(top_builddir)/amarok/src/libamarok.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO)

 libamarok_ipod_mediadevice_la_LDFLAGS = \
    $(KDE_PLUGIN) \
--- a/amarok/src/mediadevice/mtp/Makefile.am
+++ b/amarok/src/mediadevice/mtp/Makefile.am
@ -16,7 +16,7 @@ METASOURCES = AUTO

 libamarok_mtp_mediadevice_la_LIBADD  = \
    $(top_builddir)/amarok/src/libamarok.la \
-    $(LIBMTP_LIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+    $(LIBMTP_LIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)

 libamarok_mtp_mediadevice_la_LDFLAGS = \
    $(KDE_PLUGIN) \
--- a/amarok/src/mediadevice/njb/Makefile.am
+++ b/amarok/src/mediadevice/njb/Makefile.am
@ -16,7 +16,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = libamarok_njb-mediadevice.la

 libamarok_njb_mediadevice_la_LIBADD = $(top_builddir)/amarok/src/libamarok.la \
-	$(LIB_KDEUI) $(LIB_KDECORE) -lnjb $(LIB_QT) $(LIB_KIO)
+	$(LIB_TDEUI) $(LIB_TDECORE) -lnjb $(LIB_QT) $(LIB_KIO)

 libamarok_njb_mediadevice_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)

--- a/amarok/src/mediadevice/riokarma/Makefile.am
+++ b/amarok/src/mediadevice/riokarma/Makefile.am
@ -16,7 +16,7 @@ METASOURCES = AUTO

 libamarok_riokarma_mediadevice_la_LIBADD  = \
    $(top_builddir)/amarok/src/libamarok.la \
-    -lkarma $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+    -lkarma $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)

 libamarok_riokarma_mediadevice_la_LDFLAGS = \
    $(KDE_PLUGIN) \
--- a/amarok/src/scripts/graphequalizer/Makefile.am
+++ b/amarok/src/scripts/graphequalizer/Makefile.am
@ -18,10 +18,10 @@ graphequalizer_DATA = README

 graphequalizer_LDADD = \
        $(LIB_QT) \
-        $(LIB_KDEUI) \
-        $(LIB_KDECORE)
+        $(LIB_TDEUI) \
+        $(LIB_TDECORE)

-graphequalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+graphequalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor

 METASOURCES = AUTO