summaryrefslogtreecommitdiffstats
path: root/tdeioslave/sftp
diff options
context:
space:
mode:
Diffstat (limited to 'tdeioslave/sftp')
-rw-r--r--tdeioslave/sftp/CHANGELOG2
-rw-r--r--tdeioslave/sftp/CMakeLists.txt6
-rw-r--r--tdeioslave/sftp/Makefile.am10
-rw-r--r--tdeioslave/sftp/sftp.protocol2
-rw-r--r--tdeioslave/sftp/tdeio_sftp.cpp (renamed from tdeioslave/sftp/kio_sftp.cpp)14
-rw-r--r--tdeioslave/sftp/tdeio_sftp.h (renamed from tdeioslave/sftp/kio_sftp.h)4
6 files changed, 19 insertions, 19 deletions
diff --git a/tdeioslave/sftp/CHANGELOG b/tdeioslave/sftp/CHANGELOG
index b60e7f44b..c34cd9dec 100644
--- a/tdeioslave/sftp/CHANGELOG
+++ b/tdeioslave/sftp/CHANGELOG
@@ -32,7 +32,7 @@
7-22-2001 - probable solution to getting password prompt -- open with controlling
but don't connect stdin/out to terminal. duh!
8-9-2001 - Doh! I haven't kept very good logs. Look at the cvs logs for better info.
- - At this point kio_sftp is using KSshProcess which I wrote in order to make
+ - At this point tdeio_sftp is using KSshProcess which I wrote in order to make
a standard interface to the various version of ssh out there. So far it is
working fairly well. We also now report host key changes to the user and
allow them to choose whether or not to continue. This is a big improvement.
diff --git a/tdeioslave/sftp/CMakeLists.txt b/tdeioslave/sftp/CMakeLists.txt
index cf07ed2b3..0cee3a838 100644
--- a/tdeioslave/sftp/CMakeLists.txt
+++ b/tdeioslave/sftp/CMakeLists.txt
@@ -26,12 +26,12 @@ link_directories(
install( FILES sftp.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
-##### kio_sftp (module) #########################
+##### tdeio_sftp (module) #########################
-set( target kio_sftp )
+set( target tdeio_sftp )
tde_add_kpart( ${target} AUTOMOC
- SOURCES process.cpp atomicio.cpp kio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp
+ SOURCES process.cpp atomicio.cpp tdeio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp
LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/tdeioslave/sftp/Makefile.am b/tdeioslave/sftp/Makefile.am
index 4bc14c203..d64f7567c 100644
--- a/tdeioslave/sftp/Makefile.am
+++ b/tdeioslave/sftp/Makefile.am
@@ -11,12 +11,12 @@ check_PROGRAMS = ksshprocesstest
ksshprocesstest_SOURCES = ksshprocesstest.cpp
ksshprocesstest_LDADD = $(LIB_KSYCOCA) ksshprocess.lo process.lo atomicio.lo
-kde_module_LTLIBRARIES = kio_sftp.la
+kde_module_LTLIBRARIES = tdeio_sftp.la
-kio_sftp_la_SOURCES = process.cpp atomicio.cpp kio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp
-kio_sftp_la_LIBADD = $(LIB_KIO)
-kio_sftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-noinst_HEADERS = atomicio.h kio_sftp.h ksshprocess.h process.h sftpfileattr.h sftp.h
+tdeio_sftp_la_SOURCES = process.cpp atomicio.cpp tdeio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp
+tdeio_sftp_la_LIBADD = $(LIB_KIO)
+tdeio_sftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+noinst_HEADERS = atomicio.h tdeio_sftp.h ksshprocess.h process.h sftpfileattr.h sftp.h
kdelnk_DATA = sftp.protocol
kdelnkdir = $(kde_servicesdir)
diff --git a/tdeioslave/sftp/sftp.protocol b/tdeioslave/sftp/sftp.protocol
index 3b915bff8..522b23b01 100644
--- a/tdeioslave/sftp/sftp.protocol
+++ b/tdeioslave/sftp/sftp.protocol
@@ -1,5 +1,5 @@
[Protocol]
-exec=kio_sftp
+exec=tdeio_sftp
protocol=sftp
input=none
listing=Name,Type,Size,Date,Access,Owner,Group,Link
diff --git a/tdeioslave/sftp/kio_sftp.cpp b/tdeioslave/sftp/tdeio_sftp.cpp
index 719fb9136..f31ad03c6 100644
--- a/tdeioslave/sftp/kio_sftp.cpp
+++ b/tdeioslave/sftp/tdeio_sftp.cpp
@@ -68,7 +68,7 @@ So we can't connect.
#include <kremoteencoding.h>
#include "sftp.h"
-#include "kio_sftp.h"
+#include "tdeio_sftp.h"
#include "atomicio.h"
#include "sftpfileattr.h"
#include "ksshprocess.h"
@@ -79,19 +79,19 @@ extern "C"
{
int KDE_EXPORT kdemain( int argc, char **argv )
{
- TDEInstance instance( "kio_sftp" );
+ TDEInstance instance( "tdeio_sftp" );
- kdDebug(KIO_SFTP_DB) << "*** Starting kio_sftp " << endl;
+ kdDebug(KIO_SFTP_DB) << "*** Starting tdeio_sftp " << endl;
if (argc != 4) {
- kdDebug(KIO_SFTP_DB) << "Usage: kio_sftp protocol domain-socket1 domain-socket2" << endl;
+ kdDebug(KIO_SFTP_DB) << "Usage: tdeio_sftp protocol domain-socket1 domain-socket2" << endl;
exit(-1);
}
sftpProtocol slave(argv[2], argv[3]);
slave.dispatchLoop();
- kdDebug(KIO_SFTP_DB) << "*** kio_sftp Done" << endl;
+ kdDebug(KIO_SFTP_DB) << "*** tdeio_sftp Done" << endl;
return 0;
}
}
@@ -132,7 +132,7 @@ static int writeToFile (int fd, const char *buf, size_t len)
}
sftpProtocol::sftpProtocol(const TQCString &pool_socket, const TQCString &app_socket)
- : SlaveBase("kio_sftp", pool_socket, app_socket),
+ : SlaveBase("tdeio_sftp", pool_socket, app_socket),
mConnected(false), mPort(-1), mMsgId(0) {
kdDebug(KIO_SFTP_DB) << "sftpProtocol(): pid = " << getpid() << endl;
}
@@ -1899,7 +1899,7 @@ int sftpProtocol::sftpReadDir(const TQByteArray& handle, const KURL& url){
}
if( type != SSH2_FXP_NAME ) {
- kdError(KIO_SFTP_DB) << "kio_sftpProtocl::sftpReadDir(): Unexpected message" << endl;
+ kdError(KIO_SFTP_DB) << "tdeio_sftpProtocl::sftpReadDir(): Unexpected message" << endl;
return -1;
}
diff --git a/tdeioslave/sftp/kio_sftp.h b/tdeioslave/sftp/tdeio_sftp.h
index 1674221b8..23ff101b7 100644
--- a/tdeioslave/sftp/kio_sftp.h
+++ b/tdeioslave/sftp/tdeio_sftp.h
@@ -14,8 +14,8 @@
* (at your option) any later version. *
* *
***************************************************************************/
-#ifndef __kio_sftp_h__
-#define __kio_sftp_h__
+#ifndef __tdeio_sftp_h__
+#define __tdeio_sftp_h__
#include <tqstring.h>
#include <tqcstring.h>