From 371e91c48d010efedcc490858f04b8d75e91a82d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 16 Nov 2011 13:48:59 -0600 Subject: Additional renaming of kde to tde --- kioslave/about/Makefile.am | 2 +- kioslave/finger/Makefile.am | 2 +- kioslave/floppy/Makefile.am | 2 +- kioslave/info/Makefile.am | 2 +- kioslave/ldap/Makefile.am | 2 +- kioslave/man/Makefile.am | 2 +- kioslave/man/kmanpart.cpp | 2 +- kioslave/man/man2html.cpp | 6 +++--- kioslave/media/configure.in.in | 8 ++++---- kioslave/nfs/Makefile.am | 2 +- kioslave/nfs/kio_nfs.cpp | 4 ++-- kioslave/sftp/Makefile.am | 2 +- kioslave/sftp/ksshprocess.cpp | 2 +- kioslave/smb/Makefile.am | 2 +- kioslave/tar/Makefile.am | 2 +- kioslave/thumbnail/Makefile.am | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) (limited to 'kioslave') diff --git a/kioslave/about/Makefile.am b/kioslave/about/Makefile.am index 4eac10f69..900596fa3 100644 --- a/kioslave/about/Makefile.am +++ b/kioslave/about/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am of kdebase/kioslave/about +## Makefile.am of tdebase/kioslave/about INCLUDES= $(all_includes) AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/kioslave/finger/Makefile.am b/kioslave/finger/Makefile.am index b6e0c75a7..2baac8d65 100644 --- a/kioslave/finger/Makefile.am +++ b/kioslave/finger/Makefile.am @@ -1,5 +1,5 @@ ## Makfile.am for kio_finger -## Edit from Makefile.am of kdebase/kioslave/man +## Edit from Makefile.am of tdebase/kioslave/man INCLUDES= $(all_includes) AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/kioslave/floppy/Makefile.am b/kioslave/floppy/Makefile.am index 5c2533fda..7d33ec865 100644 --- a/kioslave/floppy/Makefile.am +++ b/kioslave/floppy/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am of kdebase/kioslave/floppy +## Makefile.am of tdebase/kioslave/floppy INCLUDES= $(all_includes) AM_LDFLAGS = $(all_libraries) diff --git a/kioslave/info/Makefile.am b/kioslave/info/Makefile.am index 8db4a20ec..ec1976df6 100644 --- a/kioslave/info/Makefile.am +++ b/kioslave/info/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am of kdebase/kioslave/info +## Makefile.am of tdebase/kioslave/info INCLUDES = $(all_includes) diff --git a/kioslave/ldap/Makefile.am b/kioslave/ldap/Makefile.am index 49faa1e98..5e85a19cb 100644 --- a/kioslave/ldap/Makefile.am +++ b/kioslave/ldap/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am of kdebase/kioslave/ldap +## Makefile.am of tdebase/kioslave/ldap INCLUDES = $(all_includes) $(LDAP_INCS) AM_CXXFLAGS = -DLDAP_DEPRECATED diff --git a/kioslave/man/Makefile.am b/kioslave/man/Makefile.am index 949f4f04c..1904c24a6 100644 --- a/kioslave/man/Makefile.am +++ b/kioslave/man/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am of kdebase/kioslave/man +## Makefile.am of tdebase/kioslave/man INCLUDES= $(all_includes) AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/kioslave/man/kmanpart.cpp b/kioslave/man/kmanpart.cpp index b624657ab..a8d08908e 100644 --- a/kioslave/man/kmanpart.cpp +++ b/kioslave/man/kmanpart.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include extern "C" { diff --git a/kioslave/man/man2html.cpp b/kioslave/man/man2html.cpp index 20e126e4c..e31fe0fe6 100644 --- a/kioslave/man/man2html.cpp +++ b/kioslave/man/man2html.cpp @@ -146,7 +146,7 @@ #else # include # include -# include +# include #endif @@ -319,8 +319,8 @@ static void InitStringDefinitions( void ) // \*S "Change to default font size" #ifndef SIMPLE_MAN2HTML // Special KDE KIO man: - const TQCString kdeversion(TDE_VERSION_STRING); - s_stringDefinitionMap.insert( ".TDE_VERSION_STRING", StringDefinition( kdeversion.length(), kdeversion ) ); + const TQCString tdeversion(TDE_VERSION_STRING); + s_stringDefinitionMap.insert( ".TDE_VERSION_STRING", StringDefinition( tdeversion.length(), tdeversion ) ); #endif } diff --git a/kioslave/media/configure.in.in b/kioslave/media/configure.in.in index 81c8f2640..1f66f3b37 100644 --- a/kioslave/media/configure.in.in +++ b/kioslave/media/configure.in.in @@ -27,7 +27,7 @@ if test "x$hal_test" = "xyes" ; then hal_inc=FOUND fi - search_libs="$kde_libraries $kde_extra_libs /usr/lib$kdelibsuff /usr/local/lib$kdelibsuff" + search_libs="$kde_libraries $kde_extra_libs /usr/lib$tdelibsuff /usr/local/lib$tdelibsuff" AC_FIND_FILE(libhal.so libhal-storage.so, $search_libs, hal_libdir) if test -r $hal_libdir/libhal.so && test -r $hal_libdir/libhal-storage.so ; then @@ -62,7 +62,7 @@ if test "x$hal_test" = "xyes" ; then search_incs="$kde_includes $kde_extra_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0" AC_FIND_FILE(dbus/dbus.h, $search_incs, dbus_incdir) - search_incs_arch_deps="$kde_includes $kde_extra_includes /usr/lib$kdelibsuff/dbus-1.0/include /usr/local/lib$kdelibsuff/dbus-1.0/include" + search_incs_arch_deps="$kde_includes $kde_extra_includes /usr/lib$tdelibsuff/dbus-1.0/include /usr/local/lib$tdelibsuff/dbus-1.0/include" AC_FIND_FILE(dbus/dbus-arch-deps.h, $search_incs_arch_deps, dbus_incdir_arch_deps) if test -r $dbus_incdir/dbus/dbus.h && test -r $dbus_incdir_arch_deps/dbus/dbus-arch-deps.h ; then @@ -70,7 +70,7 @@ if test "x$hal_test" = "xyes" ; then dbus_inc=FOUND fi - search_libs="$kde_libraries $kde_extra_libs /usr/lib$kdelibsuff /usr/local/lib$kdelibsuff" + search_libs="$kde_libraries $kde_extra_libs /usr/lib$tdelibsuff /usr/local/lib$tdelibsuff" AC_FIND_FILE(libdbus-1.so, $search_libs, dbus_libdir) if test -r $dbus_libdir/libdbus-1.so ; then @@ -119,7 +119,7 @@ if test "x$hal_test" = "xyes" ; then fi fi - search_libs="$kde_libraries $kde_extra_libs /usr/lib$kdelibsuff /usr/local/lib$kdelibsuff" + search_libs="$kde_libraries $kde_extra_libs /usr/lib$tdelibsuff /usr/local/lib$tdelibsuff" AC_FIND_FILE(libdbus-qt-1.so, $search_libs, dbusqt_libdir) if test -r $dbusqt_libdir/libdbus-qt-1.so ; then diff --git a/kioslave/nfs/Makefile.am b/kioslave/nfs/Makefile.am index 171bf43a2..5dc730d7d 100644 --- a/kioslave/nfs/Makefile.am +++ b/kioslave/nfs/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am of kdebase/kioslave/man +## Makefile.am of tdebase/kioslave/man INCLUDES= $(all_includes) AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/kioslave/nfs/kio_nfs.cpp b/kioslave/nfs/kio_nfs.cpp index 96e51f1d3..d4a595c16 100644 --- a/kioslave/nfs/kio_nfs.cpp +++ b/kioslave/nfs/kio_nfs.cpp @@ -71,7 +71,7 @@ using namespace KIO; using namespace std; -//this is taken from kdelibs/tdecore/fakes.cpp +//this is taken from tdelibs/tdecore/fakes.cpp //#if !defined(HAVE_GETDOMAINNAME) int x_getdomainname(char *name, size_t len) @@ -425,7 +425,7 @@ void NFSProtocol::openConnection() hostName=nameBuffer; // I have the same problem here as Stefan Westerfeld, that's why I use // the getdomainname() from fakes.cpp (renamed to x_getdomainname()), this one works - // taken from kdelibs/arts/mcopy/mcoputils.cc + // taken from tdelibs/arts/mcopy/mcoputils.cc nameBuffer[0] = '\0'; if (x_getdomainname(nameBuffer, 1024)==0) { diff --git a/kioslave/sftp/Makefile.am b/kioslave/sftp/Makefile.am index 1690b5165..c59c1c210 100644 --- a/kioslave/sftp/Makefile.am +++ b/kioslave/sftp/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am of kdebase/kioslave/sftp +## Makefile.am of tdebase/kioslave/sftp INCLUDES = $(all_includes) AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/kioslave/sftp/ksshprocess.cpp b/kioslave/sftp/ksshprocess.cpp index ac425212d..e923fe69e 100644 --- a/kioslave/sftp/ksshprocess.cpp +++ b/kioslave/sftp/ksshprocess.cpp @@ -19,7 +19,7 @@ * See the KSshProcess header for examples on use. * * This class uses a hacked version of the PTYProcess - * class. This was needed because the kdelibs PTYProcess does not provide + * class. This was needed because the tdelibs PTYProcess does not provide * access to the pty file descriptor which we need, because ssh prints the * password prompt to the pty and reads the password from the pty. I don't * feel I know enough about ptys to confidently modify the orignial diff --git a/kioslave/smb/Makefile.am b/kioslave/smb/Makefile.am index a75cf6c6f..896897325 100644 --- a/kioslave/smb/Makefile.am +++ b/kioslave/smb/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am of kdebase/kioslave/man +## Makefile.am of tdebase/kioslave/man INCLUDES=$(all_includes) diff --git a/kioslave/tar/Makefile.am b/kioslave/tar/Makefile.am index dfe3016a6..d1f3cdf05 100644 --- a/kioslave/tar/Makefile.am +++ b/kioslave/tar/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am of kdebase/kioslave/tar +## Makefile.am of tdebase/kioslave/tar INCLUDES = $(all_includes) AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/kioslave/thumbnail/Makefile.am b/kioslave/thumbnail/Makefile.am index 944ba2f08..5a63c88bb 100644 --- a/kioslave/thumbnail/Makefile.am +++ b/kioslave/thumbnail/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am of kdebase/kioslave/thumbnail +## Makefile.am of tdebase/kioslave/thumbnail INCLUDES = $(all_includes) $(EXR_FLAGS) AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -- cgit v1.2.1