diff options
author | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kioslave/media/mediamanager/halbackend.h | |
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/media/mediamanager/halbackend.h')
-rw-r--r-- | kioslave/media/mediamanager/halbackend.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kioslave/media/mediamanager/halbackend.h b/kioslave/media/mediamanager/halbackend.h index 18de7ea3c..8c8bbfce6 100644 --- a/kioslave/media/mediamanager/halbackend.h +++ b/kioslave/media/mediamanager/halbackend.h @@ -45,7 +45,7 @@ #include <libhal.h> #include <libhal-storage.h> -namespace KIO { +namespace TDEIO { class Job; } @@ -148,7 +148,7 @@ private: static TQString killUsingProcesses(const Medium *medium); private slots: - void slotResult(KIO::Job *job); + void slotResult(TDEIO::Job *job); /* Hal call-backs -- from gvm*/ public: @@ -220,13 +220,13 @@ private: const Medium* medium; // [in,out] Should be set to true when the job completes bool completed; - // [out] KIO::Error if an error occured during operation. Otherwise, 0 + // [out] TDEIO::Error if an error occured during operation. Otherwise, 0 int error; // [out] Error message to be displayed to the user TQString errorMessage; }; - TQMap<KIO::Job *, struct mount_job_data*> mount_jobs; + TQMap<TDEIO::Job *, struct mount_job_data*> mount_jobs; }; #endif /* _HALBACKEND_H_ */ |