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 /khtml/kmultipart | |
| 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 'khtml/kmultipart')
| -rw-r--r-- | khtml/kmultipart/kmultipart.cpp | 14 | ||||
| -rw-r--r-- | khtml/kmultipart/kmultipart.h | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp index 65be07e83..32c514f1b 100644 --- a/khtml/kmultipart/kmultipart.cpp +++ b/khtml/kmultipart/kmultipart.cpp @@ -163,14 +163,14 @@ bool KMultiPart::openURL( const KURL &url ) // Hmm, args.reload is set to true when reloading, but this doesn't seem to be enough... // I get "HOLD: Reusing held slave for <url>", and the old data - m_job = KIO::get( url, args.reload, false ); + m_job = TDEIO::get( url, args.reload, false ); emit started( 0 /*m_job*/ ); // don't pass the job, it would interfer with our own infoMessage - connect( m_job, TQT_SIGNAL( result( KIO::Job * ) ), - this, TQT_SLOT( slotJobFinished( KIO::Job * ) ) ); - connect( m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) ); + connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), + this, TQT_SLOT( slotJobFinished( TDEIO::Job * ) ) ); + connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); m_numberOfFrames = 0; m_numberOfFramesSkipped = 0; @@ -184,7 +184,7 @@ bool KMultiPart::openURL( const KURL &url ) // Yes, libtdenetwork's has such a parser already (MultiPart), // but it works on the complete string, expecting the whole data to be available.... // The version here is asynchronous. -void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data ) +void KMultiPart::slotData( TDEIO::Job *job, const TQByteArray &data ) { if (m_boundary.isNull()) { @@ -533,7 +533,7 @@ void KMultiPart::guiActivateEvent( KParts::GUIActivateEvent * ) // m_part->guiActivateEvent( e ); } -void KMultiPart::slotJobFinished( KIO::Job *job ) +void KMultiPart::slotJobFinished( TDEIO::Job *job ) { if ( job->error() ) { diff --git a/khtml/kmultipart/kmultipart.h b/khtml/kmultipart/kmultipart.h index 7ba5ba2fe..1e6f83620 100644 --- a/khtml/kmultipart/kmultipart.h +++ b/khtml/kmultipart/kmultipart.h @@ -62,8 +62,8 @@ protected: private slots: void reallySendData( const TQByteArray& line ); //void slotPopupMenu( KXMLGUIClient *cl, const TQPoint &pos, const KURL &u, const TQString &mime, mode_t mode ); - void slotJobFinished( KIO::Job *job ); - void slotData( KIO::Job *, const TQByteArray & ); + void slotJobFinished( TDEIO::Job *job ); + void slotData( TDEIO::Job *, const TQByteArray & ); //void updateWindowCaption(); void slotPartCompleted(); @@ -77,7 +77,7 @@ private: TQGuardedPtr<KParts::ReadOnlyPart> m_part; bool m_isHTMLPart; bool m_partIsLoading; - KIO::Job* m_job; + TDEIO::Job* m_job; TQCString m_boundary; int m_boundaryLength; TQString m_mimeType; // the one handled by m_part - store the kservice instead? |