summaryrefslogtreecommitdiffstats
path: root/kioslave/smb
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a /kioslave/smb
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz
tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kioslave/smb')
-rw-r--r--kioslave/smb/kio_smb_browse.cpp8
-rw-r--r--kioslave/smb/kio_smb_file.cpp2
-rw-r--r--kioslave/smb/kio_smb_mount.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/kioslave/smb/kio_smb_browse.cpp b/kioslave/smb/kio_smb_browse.cpp
index dd60e7cbc..e9a216fd3 100644
--- a/kioslave/smb/kio_smb_browse.cpp
+++ b/kioslave/smb/kio_smb_browse.cpp
@@ -208,11 +208,11 @@ 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().find('@') -1));
TQString userinfo = kurl.url().mid(5, kurl.url().find('@')-5);
- if(userinfo.tqcontains(':')) {
+ if(userinfo.contains(':')) {
url.setUser(userinfo.left(userinfo.find(':')));
url.setPass(userinfo.right(userinfo.length()-userinfo.find(':')-1));
} else {
@@ -409,7 +409,7 @@ void SMBSlave::listDir( const KURL& kurl )
udsentry.append(atom);
atom.m_uds = KIO::UDS_MIME_TYPE;
- atom.m_str = TQString::tqfromLatin1("application/x-smb-server");
+ atom.m_str = TQString::fromLatin1("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::tqfromLatin1("application/x-smb-workgroup");
+ atom.m_str = TQString::fromLatin1("application/x-smb-workgroup");
udsentry.append(atom);
atom.m_uds = KIO::UDS_URL;
diff --git a/kioslave/smb/kio_smb_file.cpp b/kioslave/smb/kio_smb_file.cpp
index fd6331403..8c7867722 100644
--- a/kioslave/smb/kio_smb_file.cpp
+++ b/kioslave/smb/kio_smb_file.cpp
@@ -114,7 +114,7 @@ void SMBSlave::get( const KURL& kurl )
if ( !mime || mime->name() == KMimeType::defaultMimeType()
|| !accurate )
{
- KMimeType::Ptr p_mimeType = KMimeType::tqfindByContent(filedata);
+ KMimeType::Ptr p_mimeType = KMimeType::findByContent(filedata);
if ( p_mimeType && p_mimeType->name() != KMimeType::defaultMimeType() )
mime = p_mimeType;
}
diff --git a/kioslave/smb/kio_smb_mount.cpp b/kioslave/smb/kio_smb_mount.cpp
index 04d4f56fd..f9c366235 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;