From da1522385e5367bae56b90fac55c4355e475905b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:38:54 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- parts/documentation/protocols/chm/chm.cpp | 6 +++--- parts/documentation/protocols/chm/chm.h | 2 +- parts/documentation/protocols/chm/kchmpart.cpp | 10 +++++----- parts/documentation/protocols/chm/kchmpart.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'parts/documentation/protocols') diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp index 3f0fbc54..7c8421a8 100644 --- a/parts/documentation/protocols/chm/chm.cpp +++ b/parts/documentation/protocols/chm/chm.cpp @@ -35,7 +35,7 @@ #include "chm.h" -using namespace KIO; +using namespace TDEIO; extern "C" { @@ -100,13 +100,13 @@ void ChmProtocol::get( const KURL& url ) TQString path; if ( !checkNewFile( bigpath, path ) ) { - error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); return; } if (m_dirMap.find(path) == m_dirMap.end()) { - error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); return; } diff --git a/parts/documentation/protocols/chm/chm.h b/parts/documentation/protocols/chm/chm.h index feb075dc..333b5ca3 100644 --- a/parts/documentation/protocols/chm/chm.h +++ b/parts/documentation/protocols/chm/chm.h @@ -26,7 +26,7 @@ class TQCString; -class ChmProtocol : public KIO::SlaveBase +class ChmProtocol : public TDEIO::SlaveBase { public: ChmProtocol( const TQCString&, const TQCString& ); diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp index c9c5f58e..11e5e93e 100644 --- a/parts/documentation/protocols/chm/kchmpart.cpp +++ b/parts/documentation/protocols/chm/kchmpart.cpp @@ -100,18 +100,18 @@ bool KChmPart::openFile() m_htmlData.truncate(0); - m_job = KIO::get( TQString("chm:")+m_file+"/", true, false ); - connect( m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray &) ), TQT_SLOT( readData( KIO::Job *, const TQByteArray &) ) ); - connect( m_job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( jobDone( KIO::Job * ) ) ); + m_job = TDEIO::get( TQString("chm:")+m_file+"/", true, false ); + connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) ); + connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( jobDone( TDEIO::Job * ) ) ); return true; } -void KChmPart::readData(KIO::Job * , const TQByteArray & data) +void KChmPart::readData(TDEIO::Job * , const TQByteArray & data) { m_htmlData += data; } -void KChmPart::jobDone( KIO::Job *) +void KChmPart::jobDone( TDEIO::Job *) { m_job=0; begin(); diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h index 3ed054fe..1ec2eaf8 100644 --- a/parts/documentation/protocols/chm/kchmpart.h +++ b/parts/documentation/protocols/chm/kchmpart.h @@ -64,14 +64,14 @@ class KChmPart : public KDevHTMLPart virtual bool openURL( const KURL & ); /* protected slots: - void readData(KIO::Job * , const TQByteArray & data); - void jobDone( KIO::Job *); + void readData(TDEIO::Job * , const TQByteArray & data); + void jobDone( TDEIO::Job *); */ protected: //virtual bool openFile(); TDEInstance *m_instance; KParts::BrowserExtension *m_extension; - KIO::TransferJob *m_job; + TDEIO::TransferJob *m_job; TQCString m_htmlData; protected slots: -- cgit v1.2.1