diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kioslave/man | |
parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/man')
-rw-r--r-- | kioslave/man/kio_man.cpp | 8 | ||||
-rw-r--r-- | kioslave/man/kio_man.h | 2 | ||||
-rw-r--r-- | kioslave/man/kmanpart.cpp | 10 | ||||
-rw-r--r-- | kioslave/man/kmanpart.h | 6 |
4 files changed, 13 insertions, 13 deletions
diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp index cc7ac770b..1fd81de8d 100644 --- a/kioslave/man/kio_man.cpp +++ b/kioslave/man/kio_man.cpp @@ -46,7 +46,7 @@ #include <kfilterbase.h> #include <kfilterdev.h> -using namespace KIO; +using namespace TDEIO; MANProtocol *MANProtocol::_self = 0; @@ -649,7 +649,7 @@ void MANProtocol::stat( const KURL& url) if (!parseUrl(url.path(), title, section)) { - error(KIO::ERR_MALFORMED_URL, url.url()); + error(TDEIO::ERR_MALFORMED_URL, url.url()); return; } @@ -1485,7 +1485,7 @@ void MANProtocol::listDir(const KURL &url) TQString section; if ( !parseUrl(url.path(), title, section) ) { - error( KIO::ERR_MALFORMED_URL, url.url() ); + error( TDEIO::ERR_MALFORMED_URL, url.url() ); return; } @@ -1495,7 +1495,7 @@ void MANProtocol::listDir(const KURL &url) UDSEntry uds_entry; UDSAtom uds_atom; - uds_atom.m_uds = KIO::UDS_NAME; // we only do names... + uds_atom.m_uds = TDEIO::UDS_NAME; // we only do names... uds_entry.append( uds_atom ); TQStringList::Iterator it = list.begin(); diff --git a/kioslave/man/kio_man.h b/kioslave/man/kio_man.h index ee987ddd9..caa59ff3b 100644 --- a/kioslave/man/kio_man.h +++ b/kioslave/man/kio_man.h @@ -32,7 +32,7 @@ #include <kio/slavebase.h> -class MANProtocol : public TQObject, public KIO::SlaveBase +class MANProtocol : public TQObject, public TDEIO::SlaveBase { Q_OBJECT diff --git a/kioslave/man/kmanpart.cpp b/kioslave/man/kmanpart.cpp index 06ced93ec..01768e33d 100644 --- a/kioslave/man/kmanpart.cpp +++ b/kioslave/man/kmanpart.cpp @@ -94,18 +94,18 @@ bool KManPart::openFile() url.setProtocol( "man" ); url.setPath( m_file ); - m_job = KIO::get( url, 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( url, 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 KManPart::readData(KIO::Job * , const TQByteArray & data) +void KManPart::readData(TDEIO::Job * , const TQByteArray & data) { write(data,data.size()); } -void KManPart::jobDone( KIO::Job *) +void KManPart::jobDone( TDEIO::Job *) { m_job=0; end(); diff --git a/kioslave/man/kmanpart.h b/kioslave/man/kmanpart.h index 2f39af11f..dd290cf75 100644 --- a/kioslave/man/kmanpart.h +++ b/kioslave/man/kmanpart.h @@ -66,13 +66,13 @@ class KManPart : public KHTMLPart public slots: virtual bool openURL( const KURL &url ); 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; }; #endif |