From cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 15 Feb 2011 19:15:16 +0000 Subject: 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 --- kioslave/ldap/kio_ldap.cpp | 2 +- kioslave/man/kio_man.cpp | 10 +++++----- kioslave/man/man2html.cpp | 2 +- kioslave/pop3/pop3.cc | 6 +++--- kioslave/settings/kio_settings.cc | 4 ++-- kioslave/smb/kio_smb_auth.cpp | 2 +- kioslave/smb/kio_smb_browse.cpp | 4 ++-- kioslave/smb/kio_smb_mount.cpp | 4 ++-- kioslave/thumbnail/textcreator.cpp | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) (limited to 'kioslave') diff --git a/kioslave/ldap/kio_ldap.cpp b/kioslave/ldap/kio_ldap.cpp index 872950a9b..92299b7a6 100644 --- a/kioslave/ldap/kio_ldap.cpp +++ b/kioslave/ldap/kio_ldap.cpp @@ -197,7 +197,7 @@ int LDAPProtocol::asyncSearch( LDAPUrl &usrc ) if ( count > 0 ) { attrs = static_cast( malloc((count+1) * sizeof(char*)) ); for (int i=0; i= 2048) + if (!insert || m_outputBuffer.tqat() >= 2048) { m_outputBuffer.close(); data(m_outputBuffer.buffer()); diff --git a/kioslave/man/man2html.cpp b/kioslave/man/man2html.cpp index e9e0c1f19..b83fba0a0 100644 --- a/kioslave/man/man2html.cpp +++ b/kioslave/man/man2html.cpp @@ -1905,7 +1905,7 @@ public: return (index >= 0) && (index < (int)items.count()); } TABLEITEM &at(int index) { - return *items.at(index); + return *items.tqat(index); } TABLEROW *copyLayout() const; diff --git a/kioslave/pop3/pop3.cc b/kioslave/pop3/pop3.cc index ed0664919..84744eb33 100644 --- a/kioslave/pop3/pop3.cc +++ b/kioslave/pop3/pop3.cc @@ -857,7 +857,7 @@ void POP3Protocol::get(const KURL & url) TQString cmd, path = url.path(); int maxCommands = (metaData("pipelining") == "on") ? MAX_COMMANDS : 1; - if (path.at(0) == '/') + if (path.tqat(0) == '/') path.remove(0, 1); if (path.isEmpty()) { POP3_DEBUG << "We should be a dir!!" << endl; @@ -1207,7 +1207,7 @@ void POP3Protocol::stat(const KURL & url) { TQString _path = url.path(); - if (_path.at(0) == '/') + if (_path.tqat(0) == '/') _path.remove(0, 1); UDSEntry entry; @@ -1244,7 +1244,7 @@ void POP3Protocol::del(const KURL & url, bool /*isfile */ ) } TQString _path = url.path(); - if (_path.at(0) == '/') { + if (_path.tqat(0) == '/') { _path.remove(0, 1); } diff --git a/kioslave/settings/kio_settings.cc b/kioslave/settings/kio_settings.cc index 28aaba846..a525b028f 100644 --- a/kioslave/settings/kio_settings.cc +++ b/kioslave/settings/kio_settings.cc @@ -127,7 +127,7 @@ KServiceGroup::Ptr SettingsProtocol::findGroup(const TQString &relPath) kdDebug() << "Trying harder to find group " << relPath << endl; for (unsigned int i=0; iname().at(0) == '.')) + if ((g->name().tqat(0) == '.')) continue; TQString relPath = g->relPath(); 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 <<"-"<