diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 21:46:38 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 21:46:38 -0600 |
commit | 46850422d6f857317455a6f7682bda9af4ba77f8 (patch) | |
tree | e7ccd19a8665415f634e26279d998173f7aa764f /kio | |
parent | d4396ecfa2ba4c7cf44c028ea02b5de76878d6b8 (diff) | |
download | tdelibs-46850422d6f857317455a6f7682bda9af4ba77f8.tar.gz tdelibs-46850422d6f857317455a6f7682bda9af4ba77f8.zip |
Rename additional instances of KDE to TDE
Diffstat (limited to 'kio')
-rw-r--r-- | kio/Makefile.am | 2 | ||||
-rw-r--r-- | kio/kio/kprotocolinfo.cpp | 4 | ||||
-rw-r--r-- | kio/kio/kprotocolinfo.h | 6 | ||||
-rw-r--r-- | kio/kioexec/Makefile.am | 2 | ||||
-rw-r--r-- | kio/kpasswdserver/Makefile.am | 2 | ||||
-rw-r--r-- | kio/misc/Makefile.am | 10 | ||||
-rw-r--r-- | kio/misc/kfile/Makefile.am | 2 | ||||
-rw-r--r-- | kio/misc/kntlm/Makefile.am | 2 | ||||
-rw-r--r-- | kio/misc/kpac/Makefile.am | 2 | ||||
-rw-r--r-- | kio/misc/ksendbugmail/Makefile.am | 2 | ||||
-rw-r--r-- | kio/misc/kssld/Makefile.am | 2 | ||||
-rw-r--r-- | kio/misc/kwalletd/Makefile.am | 2 | ||||
-rw-r--r-- | kio/misc/tdesasl/Makefile.am | 2 | ||||
-rw-r--r-- | kio/misc/tdesasl/tdesasl.h | 4 | ||||
-rw-r--r-- | kio/tests/Makefile.am | 2 |
15 files changed, 23 insertions, 23 deletions
diff --git a/kio/Makefile.am b/kio/Makefile.am index c2792330a..4a28986ef 100644 --- a/kio/Makefile.am +++ b/kio/Makefile.am @@ -32,7 +32,7 @@ libkio_la_LIBADD = kssl/libkssl.la kio/libkiocore.la \ kio/libksycoca.la bookmarks/libkbookmarks.la kfile/libkfile.la \ ../tdeui/libtdeui.la ../tdesu/libtdesu.la \ ../kwallet/client/libkwalletclient.la \ - $(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) + $(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) kde_mime_DATA = magic kde_servicetypes_DATA = application.desktop kurifilterplugin.desktop \ diff --git a/kio/kio/kprotocolinfo.cpp b/kio/kio/kprotocolinfo.cpp index 73a960ea0..f297907e0 100644 --- a/kio/kio/kprotocolinfo.cpp +++ b/kio/kio/kprotocolinfo.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#ifdef MAKE_KDECORE_LIB //needed for proper linkage (win32) +#ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32) #undef KIO_EXPORT #define KIO_EXPORT KDE_EXPORT #endif @@ -32,7 +32,7 @@ KProtocolInfo* KProtocolInfo::findProtocol(const KURL &url) { -#ifdef MAKE_KDECORE_LIB +#ifdef MAKE_TDECORE_LIB return 0; #else TQString protocol = url.protocol(); diff --git a/kio/kio/kprotocolinfo.h b/kio/kio/kprotocolinfo.h index 1dad7915f..a3c579034 100644 --- a/kio/kio/kprotocolinfo.h +++ b/kio/kio/kprotocolinfo.h @@ -97,7 +97,7 @@ public: * the whole URL. */ static bool isKnownProtocol( const TQString& protocol ) -#ifdef KPROTOCOLINFO_KDECORE +#ifdef KPROTOCOLINFO_TDECORE KDE_WEAK_SYMBOL #endif ; @@ -226,7 +226,7 @@ public: * the whole URL. */ static bool isHelperProtocol( const TQString& protocol ) -#ifdef KPROTOCOLINFO_KDECORE +#ifdef KPROTOCOLINFO_TDECORE KDE_WEAK_SYMBOL #endif ; @@ -254,7 +254,7 @@ public: * the whole URL. */ static bool isFilterProtocol( const TQString& protocol ) -#ifdef KPROTOCOLINFO_KDECORE +#ifdef KPROTOCOLINFO_TDECORE KDE_WEAK_SYMBOL #endif ; diff --git a/kio/kioexec/Makefile.am b/kio/kioexec/Makefile.am index 98fc1987d..277a62974 100644 --- a/kio/kioexec/Makefile.am +++ b/kio/kioexec/Makefile.am @@ -3,7 +3,7 @@ AM_CPPFLAGS = $(all_includes) bin_PROGRAMS = kioexec kioexec_SOURCES = main.cpp -kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kioexec_LDADD = $(LIB_KIO) noinst_HEADERS = main.h diff --git a/kio/kpasswdserver/Makefile.am b/kio/kpasswdserver/Makefile.am index eb2ee3bc4..863055f61 100644 --- a/kio/kpasswdserver/Makefile.am +++ b/kio/kpasswdserver/Makefile.am @@ -10,6 +10,6 @@ kde_module_LTLIBRARIES = kded_kpasswdserver.la kded_kpasswdserver_la_SOURCES = kpasswdserver.cpp kpasswdserver.skel kded_kpasswdserver_la_METASOURCES = AUTO kded_kpasswdserver_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_kpasswdserver_la_LIBADD = $(top_builddir)/kwallet/client/libkwalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) +kded_kpasswdserver_la_LIBADD = $(top_builddir)/kwallet/client/libkwalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) include $(top_srcdir)/admin/Doxyfile.am diff --git a/kio/misc/Makefile.am b/kio/misc/Makefile.am index 3d05c0003..cfa5a4c3e 100644 --- a/kio/misc/Makefile.am +++ b/kio/misc/Makefile.am @@ -29,7 +29,7 @@ bin_PROGRAMS = kmailservice ktelnetservice observer_DIR = $(top_srcdir)/kio/kio kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub -kio_uiserver_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) +kio_uiserver_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version METASOURCES = AUTO @@ -37,12 +37,12 @@ METASOURCES = AUTO kde_services_DATA = kio_uiserver.desktop kmailservice_SOURCES = kmailservice.cpp -kmailservice_LDADD = $(LIB_KDECORE) -kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kmailservice_LDADD = $(LIB_TDECORE) +kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor ktelnetservice_SOURCES = ktelnetservice.cpp -ktelnetservice_LDADD = $(LIB_KDEUI) -ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ktelnetservice_LDADD = $(LIB_TDEUI) +ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor protocol_DATA = kmailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol \ mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol diff --git a/kio/misc/kfile/Makefile.am b/kio/misc/kfile/Makefile.am index c0ede6f62..ad5a377a2 100644 --- a/kio/misc/kfile/Makefile.am +++ b/kio/misc/kfile/Makefile.am @@ -5,6 +5,6 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio/kio $(all_includes) bin_PROGRAMS = kfile kfile_SOURCES = fileprops.cpp -kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kfile_LDADD = $(LIB_KIO) diff --git a/kio/misc/kntlm/Makefile.am b/kio/misc/kntlm/Makefile.am index 7136310d9..91efaf40f 100644 --- a/kio/misc/kntlm/Makefile.am +++ b/kio/misc/kntlm/Makefile.am @@ -8,5 +8,5 @@ kntlminclude_HEADERS = kntlm.h libkntlm_la_SOURCES = kntlm.cpp des.cpp libkntlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined -libkntlm_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) +libkntlm_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) diff --git a/kio/misc/kpac/Makefile.am b/kio/misc/kpac/Makefile.am index 65047f343..beb6a4b86 100644 --- a/kio/misc/kpac/Makefile.am +++ b/kio/misc/kpac/Makefile.am @@ -11,7 +11,7 @@ kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \ downloader.cpp discovery.cpp kded_proxyscout_la_LDFLAGS = $(all_libraries) -module -avoid-version kded_proxyscout_la_LIBADD = $(LIB_KIO) $(top_builddir)/kjs/libkjs.la $(LIB_KDED) $(LIB_QT) \ - $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIBRESOLV) + $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIBRESOLV) kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE) diff --git a/kio/misc/ksendbugmail/Makefile.am b/kio/misc/ksendbugmail/Makefile.am index a9b461159..f3efb2b2c 100644 --- a/kio/misc/ksendbugmail/Makefile.am +++ b/kio/misc/ksendbugmail/Makefile.am @@ -20,7 +20,7 @@ bin_PROGRAMS = ksendbugmail INCLUDES= -I$(srcdir)/.. $(all_includes) ksendbugmail_SOURCES = main.cpp smtp.cpp -ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor ksendbugmail_LDADD = ../../libkio.la METASOURCES = AUTO diff --git a/kio/misc/kssld/Makefile.am b/kio/misc/kssld/Makefile.am index a87478d65..18193018e 100644 --- a/kio/misc/kssld/Makefile.am +++ b/kio/misc/kssld/Makefile.am @@ -21,7 +21,7 @@ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(SSL_INCLUDES) -I$(top_srcdir)/kio/kss kde_module_LTLIBRARIES = kded_kssld.la kded_kssld_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_kssld_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) +kded_kssld_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) kded_kssld_la_SOURCES = kssld.cpp kssld.skel METASOURCES = AUTO diff --git a/kio/misc/kwalletd/Makefile.am b/kio/misc/kwalletd/Makefile.am index 6876ba596..1d5b1313c 100644 --- a/kio/misc/kwalletd/Makefile.am +++ b/kio/misc/kwalletd/Makefile.am @@ -21,7 +21,7 @@ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(top_srcdir)/kwallet/backend -I$(top kde_module_LTLIBRARIES = kded_kwalletd.la kded_kwalletd_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_kwalletd_la_LIBADD = $(LIB_KIO) ../../../kwallet/backend/libkwalletbackend.la ../../../kwallet/client/libkwalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KDEUI) +kded_kwalletd_la_LIBADD = $(LIB_KIO) ../../../kwallet/backend/libkwalletbackend.la ../../../kwallet/client/libkwalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEUI) kded_kwalletd_la_SOURCES = kwalletd.cpp kwalletd.skel ktimeout.cpp kwalletwizard.ui kbetterthankdialogbase.ui METASOURCES = AUTO diff --git a/kio/misc/tdesasl/Makefile.am b/kio/misc/tdesasl/Makefile.am index d308e6770..4dd36a6d7 100644 --- a/kio/misc/tdesasl/Makefile.am +++ b/kio/misc/tdesasl/Makefile.am @@ -8,5 +8,5 @@ tdesaslinclude_HEADERS = tdesasl.h libtdesasl_la_SOURCES = tdesasl.cpp libtdesasl_la_LDFLAGS = $(all_libraries) -version-info 3:0:2 -no-undefined -libtdesasl_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) +libtdesasl_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) diff --git a/kio/misc/tdesasl/tdesasl.h b/kio/misc/tdesasl/tdesasl.h index 5f0279f34..824b49863 100644 --- a/kio/misc/tdesasl/tdesasl.h +++ b/kio/misc/tdesasl/tdesasl.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KDESASL_H -#define KDESASL_H +#ifndef TDESASL_H +#define TDESASL_H #include <tqstring.h> diff --git a/kio/tests/Makefile.am b/kio/tests/Makefile.am index 34acd24f6..fe0b6d7ca 100644 --- a/kio/tests/Makefile.am +++ b/kio/tests/Makefile.am @@ -18,7 +18,7 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes) LDADD = $(LIB_KIO) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor check_PROGRAMS = ksycocatest getalltest kruntest ktartest kziptest\ kioslavetest kdirwatchtest kshredtest speed kurifiltertest \ |