diff options
| -rw-r--r-- | configure.files | 2 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | subdirs | 2 | ||||
| -rw-r--r-- | tdeio_ftps/Makefile.am (renamed from kio_ftps/Makefile.am) | 10 | ||||
| -rw-r--r-- | tdeio_ftps/configure.in.in (renamed from kio_ftps/configure.in.in) | 2 | ||||
| -rw-r--r-- | tdeio_ftps/ftp.cc (renamed from kio_ftps/ftp.cc) | 10 | ||||
| -rw-r--r-- | tdeio_ftps/ftp.h (renamed from kio_ftps/ftp.h) | 8 | ||||
| -rw-r--r-- | tdeio_ftps/ftps.protocol (renamed from kio_ftps/ftps.protocol) | 2 |
8 files changed, 21 insertions, 21 deletions
diff --git a/configure.files b/configure.files index 002b8ca..c124d5d 100644 --- a/configure.files +++ b/configure.files @@ -1,3 +1,3 @@ ./admin/configure.in.min configure.in.in -./kio_ftps/configure.in.in +./tdeio_ftps/configure.in.in diff --git a/configure.in b/configure.in index eabafda..2910608 100644 --- a/configure.in +++ b/configure.in @@ -68,17 +68,17 @@ dnl ======================================================= dnl PACKAGE set before dnl ======================================================= -dnl FILE: ./kio_ftps/configure.in.in +dnl FILE: ./tdeio_ftps/configure.in.in dnl ======================================================= -dnl For kio_ftps +dnl For tdeio_ftps AC_LANG_SAVE AC_LANG_CPLUSPLUS AC_CHECK_FUNCS( setfsent ) AC_LANG_RESTORE KDE_CREATE_SUBDIRSLIST AC_CONFIG_FILES([ Makefile ]) -AC_CONFIG_FILES([ kio_ftps/Makefile ]) +AC_CONFIG_FILES([ tdeio_ftps/Makefile ]) AC_OUTPUT # Check if KDE_SET_PREFIX was called, and --prefix was passed to configure if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then @@ -1 +1 @@ -kio_ftps +tdeio_ftps diff --git a/kio_ftps/Makefile.am b/tdeio_ftps/Makefile.am index c0f74aa..651c0ed 100644 --- a/kio_ftps/Makefile.am +++ b/tdeio_ftps/Makefile.am @@ -6,20 +6,20 @@ INCLUDES= $(all_includes) # lib_ bedeutet, dass das folgende in libdir installiert werden soll # _LTLIBRARIES bedeutet, dass es sich hierbei um libtool (also shared) # Bibliotheken handelt -kde_module_LTLIBRARIES = kio_ftps.la +kde_module_LTLIBRARIES = tdeio_ftps.la -# Die Quellen fr kio_hello.la (Punkt durch _ ersetzt) -kio_ftps_la_SOURCES = ftp.cc ftp.h +# Die Quellen fr tdeio_hello.la (Punkt durch _ ersetzt) +tdeio_ftps_la_SOURCES = ftp.cc ftp.h # Die Bibliothek libtdesycoca wird fr Slaves ben�igt -kio_ftps_la_LIBADD = $(LIB_KSYCOCA) +tdeio_ftps_la_LIBADD = $(LIB_KSYCOCA) # Die Link-Pfade inklusive all_libraries (siehe oben) # -module gibt an, dass es von anderen Programmen geladen wird und # nicht wirklich als Bibliothek benutzt wird. $(KDE_PLUGIN) enth�t # Standardflags fr KDE Module, z.B. um die Versionsnummern zu unter- # drcken -kio_ftps_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) +tdeio_ftps_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) # kde_services_ installiert in kde_servicesdir ($TDEDIR/share/services) # _DATA sind einfache Dateien diff --git a/kio_ftps/configure.in.in b/tdeio_ftps/configure.in.in index 2361ee7..341ecaf 100644 --- a/kio_ftps/configure.in.in +++ b/tdeio_ftps/configure.in.in @@ -1,4 +1,4 @@ -dnl For kio_ftps +dnl For tdeio_ftps AC_LANG_SAVE AC_LANG_CPLUSPLUS AC_CHECK_FUNCS( setfsent ) diff --git a/kio_ftps/ftp.cc b/tdeio_ftps/ftp.cc index 591baf5..0859411 100644 --- a/kio_ftps/ftp.cc +++ b/tdeio_ftps/ftp.cc @@ -23,7 +23,7 @@ // fix type conversion error josswern 23.02.2011 -#define KIO_FTP_PRIVATE_INCLUDE +#define TDEIO_FTP_PRIVATE_INCLUDE #include "ftp.h" #include <sys/stat.h> @@ -140,14 +140,14 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } int kdemain( int argc, char **argv ) { TDELocale::setMainCatalogue("tdelibs"); - TDEInstance instance( "kio_ftp" ); + TDEInstance instance( "tdeio_ftp" ); ( void ) TDEGlobal::locale(); kdDebug(7102) << "Starting " << getpid() << endl; if (argc != 4) { - fprintf(stderr, "Usage: kio_ftp protocol domain-socket1 domain-socket2\n"); + fprintf(stderr, "Usage: tdeio_ftp protocol domain-socket1 domain-socket2\n"); exit(-1); } @@ -2604,7 +2604,7 @@ Ftp::StatusCode Ftp::ftpCopyGet(int& iError, int& iCopyFile, const TQString sCop sPart = TQFile::encodeName(sCopyFile); } else if(bPartExists && buff.st_size > 0) - { // must not be a folder! please fix a similar bug in kio_file!! + { // must not be a folder! please fix a similar bug in tdeio_file!! if(S_ISDIR(buff.st_mode)) { iError = ERR_DIR_ALREADY_EXIST; @@ -2621,7 +2621,7 @@ Ftp::StatusCode Ftp::ftpCopyGet(int& iError, int& iCopyFile, const TQString sCop if(bPartExists && !bResume) // get rid of an unwanted ".part" file remove(sPart.data()); - // JPF: in kio_file overwrite disables ".part" operations. I do not believe + // JPF: in tdeio_file overwrite disables ".part" operations. I do not believe // JPF: that this is a good behaviour! if(bDestExists) // must delete for overwrite remove(sDest.data()); diff --git a/kio_ftps/ftp.h b/tdeio_ftps/ftp.h index c441fde..dc5678c 100644 --- a/kio_ftps/ftp.h +++ b/tdeio_ftps/ftp.h @@ -63,7 +63,7 @@ struct FtpEntry // FtpTextReader A helper class to read text lines from a socket //=============================================================================== -#ifdef KIO_FTP_PRIVATE_INCLUDE +#ifdef TDEIO_FTP_PRIVATE_INCLUDE class FtpSocket; class FtpTextReader @@ -141,12 +141,12 @@ private: */ int m_iTextBuff; }; -#endif // KIO_FTP_PRIVATE_INCLUDE +#endif // TDEIO_FTP_PRIVATE_INCLUDE //=============================================================================== // FtpSocket Helper Class for Data or Control Connections //=============================================================================== -#ifdef KIO_FTP_PRIVATE_INCLUDE +#ifdef TDEIO_FTP_PRIVATE_INCLUDE class FtpSocket : public FtpTextReader, public KExtendedSocket { private: @@ -246,7 +246,7 @@ private: }; #else class FtpSocket; -#endif // KIO_FTP_PRIVATE_INCLUDE +#endif // TDEIO_FTP_PRIVATE_INCLUDE //=============================================================================== // Ftp diff --git a/kio_ftps/ftps.protocol b/tdeio_ftps/ftps.protocol index b54c19a..6cf8032 100644 --- a/kio_ftps/ftps.protocol +++ b/tdeio_ftps/ftps.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_ftps +exec=tdeio_ftps protocol=ftps input=none output=filesystem |