diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
commit | 703fb0c89c2eee56a1e613e67a446db9d4287929 (patch) | |
tree | dd8c5ca66075cd89c2638a2b48cf78386a9870a7 /kio/misc/kpac | |
parent | 818e7abec3d5d3809b6b77293558678371c16b71 (diff) | |
download | tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kio/misc/kpac')
-rw-r--r-- | kio/misc/kpac/downloader.cpp | 14 | ||||
-rw-r--r-- | kio/misc/kpac/downloader.h | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/kio/misc/kpac/downloader.cpp b/kio/misc/kpac/downloader.cpp index 19417b1fb..c150a732c 100644 --- a/kio/misc/kpac/downloader.cpp +++ b/kio/misc/kpac/downloader.cpp @@ -43,10 +43,10 @@ namespace KPAC m_script = TQString::null; m_scriptURL = url; - KIO::TransferJob* job = KIO::get( url, false, false ); - connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), - TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( result( KIO::Job* ) ) ); + TDEIO::TransferJob* job = TDEIO::get( url, false, false ); + connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( result( TDEIO::Job* ) ) ); } void Downloader::failed() @@ -59,16 +59,16 @@ namespace KPAC m_error = error; } - void Downloader::data( KIO::Job*, const TQByteArray& data ) + void Downloader::data( TDEIO::Job*, const TQByteArray& data ) { unsigned offset = m_data.size(); m_data.resize( offset + data.size() ); std::memcpy( m_data.data() + offset, data.data(), data.size() ); } - void Downloader::result( KIO::Job* job ) + void Downloader::result( TDEIO::Job* job ) { - if ( !job->error() && !static_cast< KIO::TransferJob* >( job )->isErrorPage() ) + if ( !job->error() && !static_cast< TDEIO::TransferJob* >( job )->isErrorPage() ) { bool dummy; m_script = TDEGlobal::charsets()->codecForName( diff --git a/kio/misc/kpac/downloader.h b/kio/misc/kpac/downloader.h index 82418882f..808e09378 100644 --- a/kio/misc/kpac/downloader.h +++ b/kio/misc/kpac/downloader.h @@ -25,7 +25,7 @@ #include <kurl.h> -namespace KIO { class Job; } +namespace TDEIO { class Job; } namespace KPAC { @@ -48,8 +48,8 @@ namespace KPAC void setError( const TQString& ); private slots: - void data( KIO::Job*, const TQByteArray& ); - void result( KIO::Job* ); + void data( TDEIO::Job*, const TQByteArray& ); + void result( TDEIO::Job* ); private: TQByteArray m_data; |