diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
| commit | f7e71d47719ab6094cf4a9fafffa5ea351973522 (patch) | |
| tree | 30834aa632d442019e14f88685001d94657d060b /kio/misc/kpac | |
| parent | b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff) | |
| download | tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip | |
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase. If it does then it needs to be fixed!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kio/misc/kpac')
| -rw-r--r-- | kio/misc/kpac/discovery.cpp | 2 | ||||
| -rw-r--r-- | kio/misc/kpac/downloader.h | 2 | ||||
| -rw-r--r-- | kio/misc/kpac/proxyscout.cpp | 4 | ||||
| -rw-r--r-- | kio/misc/kpac/script.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kio/misc/kpac/discovery.cpp b/kio/misc/kpac/discovery.cpp index 7a84958f7..671c2a941 100644 --- a/kio/misc/kpac/discovery.cpp +++ b/kio/misc/kpac/discovery.cpp @@ -126,7 +126,7 @@ namespace KPAC return; } - int dot = m_hostname.find( '.' ); + int dot = m_hostname.tqfind( '.' ); if ( dot >= 0 ) { m_hostname.remove( 0, dot + 1 ); // remove one domain level diff --git a/kio/misc/kpac/downloader.h b/kio/misc/kpac/downloader.h index 05d8569cc..82418882f 100644 --- a/kio/misc/kpac/downloader.h +++ b/kio/misc/kpac/downloader.h @@ -29,7 +29,7 @@ namespace KIO { class Job; } namespace KPAC { - class Downloader : public QObject + class Downloader : public TQObject { Q_OBJECT public: diff --git a/kio/misc/kpac/proxyscout.cpp b/kio/misc/kpac/proxyscout.cpp index 6cba79db6..f843dc045 100644 --- a/kio/misc/kpac/proxyscout.cpp +++ b/kio/misc/kpac/proxyscout.cpp @@ -162,9 +162,9 @@ namespace KPAC // this particular case, simply calling setProtocol() on // it trashes the whole URL. int len = proxyURL.protocol().length(); - if ( !proxyURL.isValid() || proxy.find( ":/", len ) != len ) + if ( !proxyURL.isValid() || proxy.tqfind( ":/", len ) != len ) proxy.prepend("http://"); - BlackList::Iterator it = m_blackList.find( proxy ); + BlackList::Iterator it = m_blackList.tqfind( proxy ); if ( it == m_blackList.end() ) return proxy; else if ( std::time( 0 ) - *it > 1800 ) // 30 minutes { diff --git a/kio/misc/kpac/script.cpp b/kio/misc/kpac/script.cpp index 55faef8a1..243f5f9c2 100644 --- a/kio/misc/kpac/script.cpp +++ b/kio/misc/kpac/script.cpp @@ -49,7 +49,7 @@ TQString UString::qstring() const UString::UString( const TQString &s ) { UChar* data = new UChar[ s.length() ]; - std::memcpy( data, s.unicode(), s.length() * sizeof( UChar ) ); + std::memcpy( data, s.tqunicode(), s.length() * sizeof( UChar ) ); rep = Rep::create( data, s.length() ); } |