1.18

1 files changed, 2 insertions, 85 deletions

diff --git a/Application.h b/Application.h
index 2cf69d9a..1a71b619 100644
--- a/Application.h
+++ b/Application.h
@@ -3,18 +3,15 @@
  * Purpose:   Defines Application Class
  * Author:    ZenJu (zhnmju123@gmx.de)
  * Created:   2008-07-16
- * Copyright: ZenJu ()
- * License:
  **************************************************************/
 
 #ifndef FREEFILESYNCAPP_H
 #define FREEFILESYNCAPP_H
 
 #include <wx/app.h>
-#include "ui/smallDialogs.h"
-#include "library/misc.h"
+#include "library/localization.h"
 #include "library/processXml.h"
-#include <memory>
+
 
 class Application : public wxApp
 {
@@ -34,84 +31,4 @@ private:
     xmlAccess::XmlGlobalSettings globalSettings; //settings used by GUI, batch mode or both
 };
 
-
-class BatchStatusHandler : public StatusHandler
-{
-public:
-    BatchStatusHandler() {}
-    virtual ~BatchStatusHandler() {}
-
-    enum ExitCode
-    {
-        NONE,
-        ABORTED,
-        FINISHED
-    };
-    virtual void exitAndSetStatus(const wxString& message, ExitCode code) = 0; //overwrite final status message text
-};
-
-
-class LogFile;
-class FfsTrayIcon;
-
-class BatchStatusHandlerSilent : public BatchStatusHandler
-{
-public:
-    BatchStatusHandlerSilent(const xmlAccess::OnError handleError, const wxString& logfileDirectory, int& returnVal);
-    ~BatchStatusHandlerSilent();
-
-
-    virtual void updateStatusText(const Zstring& text);
-    virtual void initNewProcess(int objectsTotal, double dataTotal, Process processID);
-    virtual void updateProcessedData(int objectsProcessed, double dataProcessed) {}
-    virtual void forceUiRefresh();
-
-    virtual ErrorHandler::Response reportError(const Zstring& errorMessage);
-    virtual void reportFatalError(const Zstring& errorMessage);
-    virtual void reportWarning(const Zstring& warningMessage, bool& dontShowAgain);
-
-    virtual void exitAndSetStatus(const wxString& message, ExitCode code); //abort externally
-
-private:
-    virtual void abortThisProcess();
-
-    xmlAccess::OnError m_handleError;
-    wxArrayString unhandledErrors; //list of non-resolved errors
-    Process currentProcess;
-    int& returnValue;
-    std::auto_ptr<FfsTrayIcon> trayIcon;
-
-    std::auto_ptr<LogFile> m_log;
-};
-
-
-class BatchStatusHandlerGui : public BatchStatusHandler
-{
-public:
-    BatchStatusHandlerGui(const xmlAccess::OnError handleError, int& returnVal);
-    ~BatchStatusHandlerGui();
-
-    virtual void updateStatusText(const Zstring& text);
-    virtual void initNewProcess(int objectsTotal, double dataTotal, Process processID);
-    virtual void updateProcessedData(int objectsProcessed, double dataProcessed);
-    virtual void forceUiRefresh();
-
-    virtual ErrorHandler::Response reportError(const Zstring& errorMessage);
-    virtual void reportFatalError(const Zstring& errorMessage);
-    virtual void reportWarning(const Zstring& warningMessage, bool& dontShowAgain);
-
-    virtual void exitAndSetStatus(const wxString& message, ExitCode code); //abort externally
-
-private:
-    virtual void abortThisProcess();
-
-    xmlAccess::OnError m_handleError;
-    wxArrayString unhandledErrors; //list of non-resolved errors
-    Process currentProcess;
-    int& returnValue;
-
-    SyncStatus* syncStatusFrame;
-    wxString additionalStatusInfo; //workaround to display "Nothing to synchronize..."
-};
-
 #endif // FREEFILESYNCAPP_H