diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:07:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:07:22 -0600 |
| commit | bfd3620cd83f108b5f82d034ffb250748755dfd5 (patch) | |
| tree | d14f8bc2abaa71dc9216b85dcf323cc3df62f845 /src/fileaccess.h | |
| parent | 672c9c39de40e4da2849acbacf0b943dd26a31ac (diff) | |
| download | kdiff3-bfd3620cd83f108b5f82d034ffb250748755dfd5.tar.gz kdiff3-bfd3620cd83f108b5f82d034ffb250748755dfd5.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'src/fileaccess.h')
| -rw-r--r-- | src/fileaccess.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/fileaccess.h b/src/fileaccess.h index 2a5deeb..1103f46 100644 --- a/src/fileaccess.h +++ b/src/fileaccess.h @@ -82,7 +82,7 @@ public: void addPath( const TQString& txt ); TQString getStatusText(); private: - void setUdsEntry( const KIO::UDSEntry& e ); + void setUdsEntry( const TDEIO::UDSEntry& e ); KURL m_url; bool m_bLocal; bool m_bValidData; @@ -157,17 +157,17 @@ private: bool scanLocalDirectory( const TQString& dirName, t_DirectoryList* dirList ); private slots: - void slotStatResult( KIO::Job* ); - void slotSimpleJobResult( KIO::Job* pJob ); - void slotPutJobResult( KIO::Job* pJob ); + void slotStatResult( TDEIO::Job* ); + void slotSimpleJobResult( TDEIO::Job* pJob ); + void slotPutJobResult( TDEIO::Job* pJob ); - void slotGetData(KIO::Job*,const TQByteArray&); - void slotPutData(KIO::Job*, TQByteArray&); + void slotGetData(TDEIO::Job*,const TQByteArray&); + void slotPutData(TDEIO::Job*, TQByteArray&); - void slotListDirInfoMessage( KIO::Job*, const TQString& msg ); - void slotListDirProcessNewEntries( KIO::Job *, const KIO::UDSEntryList& l ); + void slotListDirInfoMessage( TDEIO::Job*, const TQString& msg ); + void slotListDirProcessNewEntries( TDEIO::Job *, const TDEIO::UDSEntryList& l ); - void slotPercent( KIO::Job* pJob, unsigned long percent ); + void slotPercent( TDEIO::Job* pJob, unsigned long percent ); }; class ProgressDialog : public TQDialog @@ -194,7 +194,7 @@ public: void setSubRangeTransformation( double dMin, double dMax ); void exitEventLoop(); - void enterEventLoop( KIO::Job* pJob, const TQString& jobInfo ); + void enterEventLoop( TDEIO::Job* pJob, const TQString& jobInfo ); bool wasCancelled(); void show(); @@ -231,7 +231,7 @@ private: TQTime m_t1; TQTime m_t2; bool m_bWasCancelled; - KIO::Job* m_pJob; + TDEIO::Job* m_pJob; TQString m_currentJobInfo; // Needed if the job doesn't stop after a reasonable time. bool m_bStayHidden; protected: |