Rename additional instances of KDE to TDE

KMFSysTray/Makefile.am

@@ -7,8 +7,8 @@ bin_PROGRAMS = kmfsystray
 
 
 
-kmfsystray_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kmfsystray_LDADD = ../kmyfirewall/core/libkmfcore.la ../kmyfirewall/kmfwidgets/libkmfwidgets.la $(LIB_KDEUI) $(LIB_KPARTS)
+kmfsystray_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmfsystray_LDADD = ../kmyfirewall/core/libkmfcore.la ../kmyfirewall/kmfwidgets/libkmfwidgets.la $(LIB_TDEUI) $(LIB_KPARTS)
 
 kmfsystray_DATA = kmfsystray.desktop
 kmfsystraydir = $(kde_datadir)/kicker/applets

acinclude.m4

@@ -2068,8 +2068,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")
@@ -2078,9 +2078,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")
@@ -2089,8 +2089,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")
@@ -2099,13 +2099,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
 ])
 

config.log

@@ -189,11 +189,11 @@ LIBUTIL=''
 LIBZ=''
 LIB_KAB=''
 LIB_KABC=''
-LIB_KDECORE=''
+LIB_TDECORE=''
 LIB_KDED=''
-LIB_KDEPIM=''
-LIB_KDEPRINT=''
-LIB_KDEUI=''
+LIB_TDEPIM=''
+LIB_TDEPRINT=''
+LIB_TDEUI=''
 LIB_KDNSSD=''
 LIB_KFILE=''
 LIB_KFM=''

doc/Makefile

@@ -154,11 +154,11 @@ LIBUTIL = -lutil
 LIBZ = -lz
 LIB_KAB = -lkab
 LIB_KABC = -lkabc
-LIB_KDECORE = -ltdecore
+LIB_TDECORE = -ltdecore
 LIB_KDED = 
-LIB_KDEPIM = -ltdepim
-LIB_KDEPRINT = -ltdeprint
-LIB_KDEUI = -ltdeui
+LIB_TDEPIM = -ltdepim
+LIB_TDEPRINT = -ltdeprint
+LIB_TDEUI = -ltdeui
 LIB_KDNSSD = -lkdnssd
 LIB_KFILE = -lkio
 LIB_KFM = 

doc/kmyfirewall/Makefile

@@ -138,11 +138,11 @@ LIBUTIL = -lutil
 LIBZ = -lz
 LIB_KAB = -lkab
 LIB_KABC = -lkabc
-LIB_KDECORE = -ltdecore
+LIB_TDECORE = -ltdecore
 LIB_KDED = 
-LIB_KDEPIM = -ltdepim
-LIB_KDEPRINT = -ltdeprint
-LIB_KDEUI = -ltdeui
+LIB_TDEPIM = -ltdepim
+LIB_TDEPRINT = -ltdeprint
+LIB_TDEUI = -ltdeui
 LIB_KDNSSD = -lkdnssd
 LIB_KFILE = -lkio
 LIB_KFM = 

kmyfirewall/Makefile.am

@@ -11,7 +11,7 @@ METASOURCES = AUTO
 #########################################################################
 bin_PROGRAMS = kmyfirewall
 kmyfirewall_SOURCES = kmfconfigdialog.cpp kmyfirewall.cpp main.cpp
-kmyfirewall_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmyfirewall_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kmyfirewall_LDADD = kmfwidgets/libkmfwidgets.la \
 	core/libkmfcore.la $(LIB_KPARTS)
 

kmyfirewall/compilers/iptables/Makefile.am

@@ -2,7 +2,7 @@ INCLUDES = $(all_includes) -I../../core -I../../kmfwidgets -I../../libkmfplugins
 METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfcompiler_ipt.la
 libkmfcompiler_ipt_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) \
-	$(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+	$(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
 libkmfcompiler_ipt_la_SOURCES = kmfiptablescompiler.cpp kmfiptablesscriptgenerator.cpp kmfiptablesdocumentconverter.cpp
 libkmfcompiler_ipt_la_LIBADD = \
 	$(LIB_KPARTS) ../../kmfwidgets/libkmfwidgets.la ../../core/libkmfcore.la 

kmyfirewall/genericinterface/Makefile.am

@@ -6,7 +6,7 @@ partrcdir   = $(kde_datadir)/kmfgenericinterfacepart
 partrc_DATA = kmfgenericinterfacepartui.rc
 
 libkmfgenericinterfacepart_la_LDFLAGS = -module -no-undefined $(all_libraries) \
-	$(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
 libkmfgenericinterfacepart_la_LIBADD = \
 	$(LIB_KPARTS) ../kmfwidgets/libkmfwidgets.la ../core/libkmfcore.la 
 

kmyfirewall/installer/Makefile.am

@@ -11,7 +11,7 @@ partdesktopdir = $(kde_servicetypesdir)
 partdesktop_DATA = kmfinstallerplugin.desktop
 
 libkmfinstallerplugin_la_LDFLAGS = -module -no-undefined $(all_libraries) \
-	$(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
 
 libkmfinstallerplugin_la_SOURCES = kmfinstallerplugin.cpp
 noinst_HEADERS = kmfinstallerplugin.h

kmyfirewall/installer/linux/Makefile.am

@@ -1,7 +1,7 @@
 INCLUDES = $(all_includes) -I../../core -I../../kmfwidgets -I../../libkmfplugins
 METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfinstaller_linux.la
-libkmfinstaller_linux_la_LDFLAGS = -module -no-undefined $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(KDE_PLUGIN) \
+libkmfinstaller_linux_la_LDFLAGS = -module -no-undefined $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(KDE_PLUGIN) \
 	$(all_libraries)
 libkmfinstaller_linux_la_SOURCES = kmfiptinstaller.cpp
 libkmfinstaller_linux_la_LIBADD = \

kmyfirewall/installer/openbsd/Makefile

@@ -192,11 +192,11 @@ LIBUTIL = -lutil
 LIBZ = -lz
 LIB_KAB = -lkab
 LIB_KABC = -lkabc
-LIB_KDECORE = -ltdecore
+LIB_TDECORE = -ltdecore
 LIB_KDED = 
-LIB_KDEPIM = -ltdepim
-LIB_KDEPRINT = -ltdeprint
-LIB_KDEUI = -ltdeui
+LIB_TDEPIM = -ltdepim
+LIB_TDEPRINT = -ltdeprint
+LIB_TDEUI = -ltdeui
 LIB_KDNSSD = -lkdnssd
 LIB_KFILE = -lkio
 LIB_KFM = 

kmyfirewall/ipteditor/Makefile.am

@@ -21,7 +21,7 @@ libkmfipteditorpart_la_SOURCES = kmfchainedit.cpp kmfnewchaindlg.cpp kmfruleedit
 noinst_HEADERS = kmfchainedit.h kmfnewchaindlg.h kmfruleedit.h kmfipteditorpart.h
 
 libkmfipteditorpart_la_LDFLAGS = -module -no-undefined $(all_libraries) \
-	$(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
 libkmfipteditorpart_la_LIBADD = \
 	 $(LIB_KPARTS) ../kmfwidgets/libkmfwidgets.la ../core/libkmfcore.la
 

kmyfirewall/ruleoptionplugins/custom_option/Makefile.am

@@ -3,7 +3,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruleoptionedit_custom.la
 
 libkmfruleoptionedit_custom_la_LDFLAGS = -module -no-undefined $(all_libraries) \
-	$(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
 libkmfruleoptionedit_custom_la_LIBADD = \
 	$(LIB_KPARTS) ../../core/libkmfcore.la 
 noinst_HEADERS =  kmfruleoptioneditcustom.h kmfruleeditcustomopt.h 

kmyfirewall/ruleoptionplugins/interface_option/Makefile.am

@@ -3,7 +3,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruleoptionedit_interface.la
 
 libkmfruleoptionedit_interface_la_LDFLAGS = -module -no-undefined \
-	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
 libkmfruleoptionedit_interface_la_LIBADD = \
 	 $(LIB_KPARTS) ../../core/libkmfcore.la
 

kmyfirewall/ruleoptionplugins/ip_option/Makefile.am

@@ -3,7 +3,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruleoptionedit_ip.la
 
 libkmfruleoptionedit_ip_la_LDFLAGS = -module -no-undefined $(all_libraries) \
-	$(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
 libkmfruleoptionedit_ip_la_LIBADD = \
 	../../core/libkmfcore.la $(LIB_KPARTS)
 noinst_HEADERS =  kmfruleoptioneditip.h kmfruleeditip.h 

kmyfirewall/ruleoptionplugins/limit_option/Makefile.am

@@ -3,7 +3,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruleoptionedit_limit.la
 
 libkmfruleoptionedit_limit_la_LDFLAGS = -module -no-undefined $(all_libraries) \
-	$(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
 libkmfruleoptionedit_limit_la_LIBADD = \
 	../../core/libkmfcore.la $(LIB_KPARTS)
 noinst_HEADERS =  kmfruleoptioneditlimit.h kmfruleeditorlimit.h 

kmyfirewall/ruleoptionplugins/log_target_option/Makefile.am

@@ -3,7 +3,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruletargetoptionedit_log.la
 
 libkmfruletargetoptionedit_log_la_LDFLAGS = -module -no-undefined \
-	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
 libkmfruletargetoptionedit_log_la_LIBADD = \
 	../../core/libkmfcore.la $(LIB_KPARTS)
 noinst_HEADERS =  kmfruletargetoptioneditlog.h kmfruleedittargetlog.h 

kmyfirewall/ruleoptionplugins/mac_option/Makefile.am

@@ -3,7 +3,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruleoptionedit_mac.la
 
 libkmfruleoptionedit_mac_la_LDFLAGS = -module -no-undefined $(all_libraries) \
-	$(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
 libkmfruleoptionedit_mac_la_LIBADD = \
 	../../core/libkmfcore.la $(LIB_KPARTS)
 noinst_HEADERS =  kmfruleoptioneditmac.h kmfruleeditmac.h

kmyfirewall/ruleoptionplugins/mark_target_option/Makefile.am

@@ -3,7 +3,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruletargetoptionedit_mark.la
 
 libkmfruletargetoptionedit_mark_la_LDFLAGS = -module -no-undefined \
-	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
 libkmfruletargetoptionedit_mark_la_LIBADD = \
 	../../core/libkmfcore.la $(LIB_KPARTS)
 noinst_HEADERS =  kmfruletargetoptioneditmark.h kmfruleedittargetmark.h 

kmyfirewall/ruleoptionplugins/nat_target_option/Makefile.am

@@ -3,7 +3,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruletargetoptionedit_nat.la
 
 libkmfruletargetoptionedit_nat_la_LDFLAGS = -module -no-undefined \
-	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
 libkmfruletargetoptionedit_nat_la_LIBADD = \
 	../../core/libkmfcore.la $(LIB_KPARTS)
 noinst_HEADERS =  kmfruletargetoptioneditnat.h kmfruleeditortargetnat.h 

kmyfirewall/ruleoptionplugins/protocol_option/Makefile.am

@@ -3,7 +3,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruleoptionedit_protocol.la
 
 libkmfruleoptionedit_protocol_la_LDFLAGS = -module -no-undefined \
-	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
 libkmfruleoptionedit_protocol_la_LIBADD = \
 	../../kmfwidgets/libkmfwidgets.la ../../core/libkmfcore.la $(LIB_KPARTS)
 noinst_HEADERS =  kmfruleoptioneditprotocol.h kmfruleeditorprotocol.h 

kmyfirewall/ruleoptionplugins/state_option/Makefile.am

@@ -3,7 +3,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruleoptionedit_state.la
 
 libkmfruleoptionedit_state_la_LDFLAGS = -module -no-undefined $(all_libraries) \
-	$(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
 libkmfruleoptionedit_state_la_LIBADD = \
 	../../core/libkmfcore.la $(LIB_KPARTS)
 noinst_HEADERS =  kmfruleoptioneditstate.h kmfruleeditorstate.h 

kmyfirewall/ruleoptionplugins/tos_option/Makefile.am

@@ -3,7 +3,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruleoptionedit_tos.la
 
 libkmfruleoptionedit_tos_la_LDFLAGS = -module -no-undefined $(all_libraries) \
-	$(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
 libkmfruleoptionedit_tos_la_LIBADD = \
 	../../core/libkmfcore.la $(LIB_KPARTS)
 noinst_HEADERS =  kmfruleoptionedittos.h kmfruleeditortos.h 

kmyfirewall/ruleoptionplugins/tos_target_option/Makefile.am

@@ -3,7 +3,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruletargetoptionedit_tos.la
 
 libkmfruletargetoptionedit_tos_la_LDFLAGS = -module -no-undefined \
-	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
 libkmfruletargetoptionedit_tos_la_LIBADD = \
 	../../core/libkmfcore.la $(LIB_KPARTS)
 noinst_HEADERS =  kmfruletargetoptionedittos.h kmfruleeditortos.h