summaryrefslogtreecommitdiffstats
path: root/kioslave/smb
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kioslave/smb
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kioslave/smb')
-rw-r--r--kioslave/smb/kio_smb_auth.cpp2
-rw-r--r--kioslave/smb/kio_smb_browse.cpp16
-rw-r--r--kioslave/smb/kio_smb_mount.cpp2
3 files changed, 10 insertions, 10 deletions
diff --git a/kioslave/smb/kio_smb_auth.cpp b/kioslave/smb/kio_smb_auth.cpp
index d4a48239f..d82301e94 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.find('/', 1);
+ int index = share.tqfind('/', 1);
if (index > 1)
share = share.left(index);
if (share.at(0) == '/')
diff --git a/kioslave/smb/kio_smb_browse.cpp b/kioslave/smb/kio_smb_browse.cpp
index e9a216fd3..cab3fe9be 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.contains('@') && !surl.contains("smb://")) {
+ if (surl.tqcontains('@') && !surl.tqcontains("smb://")) {
KURL url(kurl);
- 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));
+ 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));
} else {
url.setUser(userinfo);
}
@@ -409,7 +409,7 @@ void SMBSlave::listDir( const KURL& kurl )
udsentry.append(atom);
atom.m_uds = KIO::UDS_MIME_TYPE;
- atom.m_str = TQString::fromLatin1("application/x-smb-server");
+ atom.m_str = TQString::tqfromLatin1("application/x-smb-server");
udsentry.append(atom);
}
@@ -429,7 +429,7 @@ void SMBSlave::listDir( const KURL& kurl )
udsentry.append(atom);
atom.m_uds = KIO::UDS_MIME_TYPE;
- atom.m_str = TQString::fromLatin1("application/x-smb-workgroup");
+ atom.m_str = TQString::tqfromLatin1("application/x-smb-workgroup");
udsentry.append(atom);
atom.m_uds = KIO::UDS_URL;
diff --git a/kioslave/smb/kio_smb_mount.cpp b/kioslave/smb/kio_smb_mount.cpp
index f9c366235..04d4f56fd 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.replace('\\', '/'); // smbmounterplugin sends \\host/share
+ remotePath.tqreplace('\\', '/'); // smbmounterplugin sends \\host/share
kdDebug(KIO_SMB) << "mounting: " << remotePath.local8Bit() << " to " << mountPoint.local8Bit() << endl;