From ffe8a83e053396df448e9413828527613ca3bd46 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:46:43 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdecore/ksocks.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'kdecore/ksocks.cpp') diff --git a/kdecore/ksocks.cpp b/kdecore/ksocks.cpp index be9331548..e596c50d9 100644 --- a/kdecore/ksocks.cpp +++ b/kdecore/ksocks.cpp @@ -22,9 +22,9 @@ #include #endif -#include -#include -#include +#include +#include +#include #include #include @@ -86,9 +86,9 @@ class KSocksTable { virtual ~KSocksTable(); // The name of each symbol and it's SOCKS replacement - QMap symbols; + TQMap symbols; // The name of this library - QString myname; + TQString myname; bool hasWorkingAsyncConnect; }; @@ -269,12 +269,12 @@ KSocks::KSocks(KConfigBase *config) : _socksLib(0L), _st(0L) { << "libsocks5_sh.so"; // NEC // Add the custom library paths here - QStringList newlibs = config->readListEntry("SOCKS_lib_path"); + TQStringList newlibs = config->readListEntry("SOCKS_lib_path"); - for (QStringList::Iterator it = newlibs.begin(); + for (TQStringList::Iterator it = newlibs.begin(); it != newlibs.end(); ++it) { - QString thisone = *it; + TQString thisone = *it; if (thisone[thisone.length()-1] != '/') thisone += "/"; _libPaths << thisone; kdDebug(171) << "KSocks added a new library path: " << thisone << endl; @@ -305,10 +305,10 @@ KSocks::KSocks(KConfigBase *config) : _socksLib(0L), _st(0L) { _socksLib = 0L; } } else // leave this here "else for {}" - for (QStringList::Iterator pit = _libPaths.begin(); + for (TQStringList::Iterator pit = _libPaths.begin(); !_hasSocks && pit != _libPaths.end(); ++pit) - for (QStringList::Iterator it = _libNames.begin(); + for (TQStringList::Iterator it = _libNames.begin(); it != _libNames.end(); ++it) { _socksLib = ll->library((*pit + *it).latin1()); @@ -336,7 +336,7 @@ KSocks::KSocks(KConfigBase *config) : _socksLib(0L), _st(0L) { // Load in all the symbols if (_st) { - for (QMap::Iterator it = _st->symbols.begin(); + for (TQMap::Iterator it = _st->symbols.begin(); it != _st->symbols.end(); ++it) { switch(it.key()) { -- cgit v1.2.1