diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-15 19:15:16 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-15 19:15:16 +0000 |
| commit | cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9 (patch) | |
| tree | 2a29ccab4d3cea34b87bfcbc38e64a8e25d25bb0 /kioslave/smb | |
| parent | 107dd1f98367d07df7cbe2042786511e44706d3a (diff) | |
| download | tdebase-cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9.tar.gz tdebase-cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9.zip | |
Allow kdebase to (mostly) function correctly with TQt for Qt4
Fix kicker tackbar handling under Classic mode (thanks to Ilya Chernykh for the patch)
Fix a newly invalidated section of code under GCC 4.5.2 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47723#c6)
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1220927 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kioslave/smb')
| -rw-r--r-- | kioslave/smb/kio_smb_auth.cpp | 2 | ||||
| -rw-r--r-- | kioslave/smb/kio_smb_browse.cpp | 4 | ||||
| -rw-r--r-- | kioslave/smb/kio_smb_mount.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kioslave/smb/kio_smb_auth.cpp b/kioslave/smb/kio_smb_auth.cpp index d82301e94..12b8a1366 100644 --- a/kioslave/smb/kio_smb_auth.cpp +++ b/kioslave/smb/kio_smb_auth.cpp @@ -121,7 +121,7 @@ bool SMBSlave::checkPassword(SMBUrl &url) int index = share.tqfind('/', 1); if (index > 1) share = share.left(index); - if (share.at(0) == '/') + if (share.tqat(0) == '/') share = share.mid(1); info.url.setPath("/" + share); info.verifyPath = true; diff --git a/kioslave/smb/kio_smb_browse.cpp b/kioslave/smb/kio_smb_browse.cpp index cab3fe9be..81f08a94a 100644 --- a/kioslave/smb/kio_smb_browse.cpp +++ b/kioslave/smb/kio_smb_browse.cpp @@ -199,7 +199,7 @@ KURL SMBSlave::checkURL(const KURL& kurl) const if (surl.length() == 5) // just the above return kurl; // unchanged - if (surl.at(5) != '/') { + if (surl.tqat(5) != '/') { surl = "smb://" + surl.mid(5); kdDebug(KIO_SMB) << "checkURL return1 " << surl << " " << KURL(surl) << endl; return KURL(surl); @@ -349,7 +349,7 @@ void SMBSlave::listDir( const KURL& kurl ) TQString comment = TQString::fromUtf8( dirp->comment ); if ( dirp->smbc_type == SMBC_SERVER || dirp->smbc_type == SMBC_WORKGROUP ) { atom.m_str = dirpName.lower(); - atom.m_str.at( 0 ) = dirpName.at( 0 ).upper(); + atom.m_str.tqat( 0 ) = dirpName.tqat( 0 ).upper(); if ( !comment.isEmpty() && dirp->smbc_type == SMBC_SERVER ) atom.m_str += " (" + comment + ")"; } else diff --git a/kioslave/smb/kio_smb_mount.cpp b/kioslave/smb/kio_smb_mount.cpp index 04d4f56fd..97fcd3d0d 100644 --- a/kioslave/smb/kio_smb_mount.cpp +++ b/kioslave/smb/kio_smb_mount.cpp @@ -54,8 +54,8 @@ void SMBSlave::special( const TQByteArray & data) TQString share,host; if (sl.count()>=2) { - host=(*sl.at(0)).mid(2); - share=(*sl.at(1)); + host=(*sl.tqat(0)).mid(2); + share=(*sl.tqat(1)); kdDebug(KIO_SMB)<<"special() host -"<< host <<"- share -" << share <<"-"<<endl; } |