From 01eb8253196672c969a39587e90b49321a182428 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:19:14 +0200 Subject: 5.1 --- ui/progress_indicator.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'ui/progress_indicator.h') diff --git a/ui/progress_indicator.h b/ui/progress_indicator.h index 3fa3f8f9..858f6ce9 100644 --- a/ui/progress_indicator.h +++ b/ui/progress_indicator.h @@ -7,16 +7,12 @@ #ifndef PROGRESSINDICATOR_H_INCLUDED #define PROGRESSINDICATOR_H_INCLUDED +#include #include #include #include "../lib/status_handler.h" #include "main_dlg.h" -namespace zen -{ -class ErrorLogging; -} - class CompareStatus { @@ -57,7 +53,7 @@ public: }; SyncStatus(AbortCallback& abortCb, - MainDialog* parentWindow, //may be NULL + MainDialog* parentWindow, //may be nullptr SyncStatusID startStatus, bool showProgress, const wxString& jobName, @@ -82,7 +78,7 @@ public: //essential to call one of these two methods in StatusUpdater derived class destructor at the LATEST(!) //to prevent access to callback to updater (e.g. request abort) - void processHasFinished(SyncStatusID id, const zen::ErrorLogging& log); + void processHasFinished(SyncStatusID id, const zen::ErrorLog& log); void closeWindowDirectly(); //don't wait for user private: -- cgit