diff options
Diffstat (limited to 'digikam/libs/threadimageio/loadsavetask.h')
| -rw-r--r-- | digikam/libs/threadimageio/loadsavetask.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/digikam/libs/threadimageio/loadsavetask.h b/digikam/libs/threadimageio/loadsavetask.h index 833f86fa..13b2df2b 100644 --- a/digikam/libs/threadimageio/loadsavetask.h +++ b/digikam/libs/threadimageio/loadsavetask.h @@ -208,7 +208,7 @@ class LoadingTask : public LoadSaveTask, public DImgLoaderObserver { public: - enum LoadingTaskStatus + enum LoadingTasktqStatus { LoadingTaskStatusLoading, LoadingTaskStatusPreloading, @@ -216,8 +216,8 @@ public: }; LoadingTask(LoadSaveThread* thread, LoadingDescription description, - LoadingTaskStatus loadingTaskStatus = LoadingTaskStatusLoading) - : LoadSaveTask(thread), m_loadingDescription(description), m_loadingTaskStatus(loadingTaskStatus) + LoadingTasktqStatus loadingTasktqStatus = LoadingTaskStatusLoading) + : LoadSaveTask(thread), m_loadingDescription(description), m_loadingTasktqStatus(loadingTasktqStatus) {} // LoadSaveTask @@ -231,11 +231,11 @@ public: virtual bool continueQuery(const DImg *); virtual bool isShuttingDown(); - virtual void setStatus(LoadingTaskStatus status); + virtual void settqStatus(LoadingTasktqStatus status); - LoadingTaskStatus status() const + LoadingTasktqStatus status() const { - return m_loadingTaskStatus; + return m_loadingTasktqStatus; } TQString filePath() const @@ -251,7 +251,7 @@ public: protected: LoadingDescription m_loadingDescription; - LoadingTaskStatus m_loadingTaskStatus; + LoadingTasktqStatus m_loadingTasktqStatus; }; //--------------------------------------------------------------------------------------------------- @@ -262,15 +262,15 @@ public: SharedLoadingTask(LoadSaveThread* thread, LoadingDescription description, LoadSaveThread::AccessMode mode = LoadSaveThread::AccessModeReadWrite, - LoadingTaskStatus loadingTaskStatus = LoadingTaskStatusLoading) - : LoadingTask(thread, description, loadingTaskStatus), + LoadingTasktqStatus loadingTasktqStatus = LoadingTaskStatusLoading) + : LoadingTask(thread, description, loadingTasktqStatus), m_accessMode(mode), m_completed(false), m_usedProcess(0) {} virtual void execute(); virtual void progressInfo(const DImg *, float progress); virtual bool continueQuery(const DImg *); - virtual void setStatus(LoadingTaskStatus status); + virtual void settqStatus(LoadingTasktqStatus status); // LoadingProcess @@ -319,7 +319,7 @@ class SavingTask : public LoadSaveTask, public DImgLoaderObserver { public: - enum SavingTaskStatus + enum SavingTasktqStatus { SavingTaskStatusSaving, SavingTaskStatusStopping @@ -335,11 +335,11 @@ public: virtual void progressInfo(const DImg *, float progress); virtual bool continueQuery(const DImg *); - virtual void setStatus(SavingTaskStatus status); + virtual void settqStatus(SavingTasktqStatus status); - SavingTaskStatus status() const + SavingTasktqStatus status() const { - return m_savingTaskStatus; + return m_savingTasktqStatus; } TQString filePath() const @@ -352,7 +352,7 @@ private: DImg m_img; TQString m_filePath; TQString m_format; - SavingTaskStatus m_savingTaskStatus; + SavingTasktqStatus m_savingTasktqStatus; }; } // namespace Digikam |