summaryrefslogtreecommitdiff
path: root/ui/progress_indicator.h
diff options
context:
space:
mode:
Diffstat (limited to 'ui/progress_indicator.h')
-rw-r--r--ui/progress_indicator.h10
1 files changed, 3 insertions, 7 deletions
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 <zen/error_log.h>
#include <zen/zstring.h>
#include <wx/toplevel.h>
#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:
bgstack15