diff options
Diffstat (limited to 'kioslave/smb')
-rw-r--r-- | kioslave/smb/kio_smb_auth.cpp | 2 | ||||
-rw-r--r-- | kioslave/smb/kio_smb_browse.cpp | 12 | ||||
-rw-r--r-- | kioslave/smb/kio_smb_mount.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/kioslave/smb/kio_smb_auth.cpp b/kioslave/smb/kio_smb_auth.cpp index 12b8a1366..1d2ff05e4 100644 --- a/kioslave/smb/kio_smb_auth.cpp +++ b/kioslave/smb/kio_smb_auth.cpp @@ -118,7 +118,7 @@ bool SMBSlave::checkPassword(SMBUrl &url) info.url.setHost(url.host()); TQString share = url.path(); - int index = share.tqfind('/', 1); + int index = share.find('/', 1); if (index > 1) share = share.left(index); if (share.tqat(0) == '/') diff --git a/kioslave/smb/kio_smb_browse.cpp b/kioslave/smb/kio_smb_browse.cpp index 81f08a94a..d8ac6d60d 100644 --- a/kioslave/smb/kio_smb_browse.cpp +++ b/kioslave/smb/kio_smb_browse.cpp @@ -208,13 +208,13 @@ KURL SMBSlave::checkURL(const KURL& kurl) const // smb:/ normaly have no userinfo // we must redirect ourself to remove the username and password - if (surl.tqcontains('@') && !surl.tqcontains("smb://")) { + if (surl.contains('@') && !surl.contains("smb://")) { KURL url(kurl); - url.setPath("/"+kurl.url().right( kurl.url().length()-kurl.url().tqfind('@') -1)); - TQString userinfo = kurl.url().mid(5, kurl.url().tqfind('@')-5); - if(userinfo.tqcontains(':')) { - url.setUser(userinfo.left(userinfo.tqfind(':'))); - url.setPass(userinfo.right(userinfo.length()-userinfo.tqfind(':')-1)); + url.setPath("/"+kurl.url().right( kurl.url().length()-kurl.url().find('@') -1)); + TQString userinfo = kurl.url().mid(5, kurl.url().find('@')-5); + if(userinfo.contains(':')) { + url.setUser(userinfo.left(userinfo.find(':'))); + url.setPass(userinfo.right(userinfo.length()-userinfo.find(':')-1)); } else { url.setUser(userinfo); } diff --git a/kioslave/smb/kio_smb_mount.cpp b/kioslave/smb/kio_smb_mount.cpp index 97fcd3d0d..a3177b5c6 100644 --- a/kioslave/smb/kio_smb_mount.cpp +++ b/kioslave/smb/kio_smb_mount.cpp @@ -59,7 +59,7 @@ void SMBSlave::special( const TQByteArray & data) kdDebug(KIO_SMB)<<"special() host -"<< host <<"- share -" << share <<"-"<<endl; } - remotePath.tqreplace('\\', '/'); // smbmounterplugin sends \\host/share + remotePath.replace('\\', '/'); // smbmounterplugin sends \\host/share kdDebug(KIO_SMB) << "mounting: " << remotePath.local8Bit() << " to " << mountPoint.local8Bit() << endl; |