--- Vago/trunk/Vago/utilvago.h	2016/09/16 22:51:26	1047
+++ s10k/Vago/utilvago.h	2018/01/03 20:53:29	1098
@@ -1,13 +1,17 @@
 #ifndef UTILVAGO_H
 #define UTILVAGO_H
 
-#include "util.h"
-#include "logger.h"
+#include <util.h>
+#include <cpp17optional/optional.hpp>
+#include <plog/Log.h>
+#include <plog/Converters/NativeEOLConverter.h>
+
+#include <QDateTime>
 
 namespace GlobalVars{
 
-const QString AppVersion="1.0";
-const QString LastCompatibleVersion = "1.0";
+const QString AppVersion="1.4a";
+const QString LastCompatibleVersion = "1.4";
 const QString ToolsFolder = "tools";
 const QString OniSplitString="OniSplit.exe";
 #ifdef Q_OS_WIN
@@ -24,7 +28,7 @@ const QString OniExe="Oni.app/Contents/M
 
 const QString AppLogName="logVago.txt";
 const QString BuiltOniSplitVersion="0.9.96.0";
-const QString BuiltXmlToolsVersion="2.0b";
+const QString BuiltXmlToolsVersion="2.0c";
 const QString ModsDomain="mods.oni2.net";
 #ifdef Q_OS_WIN
 const QString VagoNode = "247";
@@ -45,16 +49,22 @@ const char OniSplitProcSeparator=';';
   **/
 namespace UtilVago{
 void openLogFile();
-void showAndLogErrorPopUp(Logger *logger, const QString &message);
+void showAndLogWarningPopUp(const QString &message);
+void showWarningPopUpLogButton(const QString &message);
+void showAndLogWarningPopUpLogButton(const QString &message);
+void showAndLogErrorPopUp(const QString &message);
 void showErrorPopUpLogButton(const QString &message);
-void showAndLogErrorPopUpLogButton(Logger *logger, const QString &message);
+void showAndLogErrorPopUpLogButton(const QString &message);
 QString getOSIndependentAppPath();
 QString getAppPath();
-QString getOniSplitExeAbsolutePath();
-QString getXmlToolsExeAbsolutePath();
+QString getOniSplitExecutableAbsolutePath();
+QString getXmlToolsExecutableAbsolutePath();
+QString getOniSplitExecutable();
+QString getXmlToolsExecutable();
 #ifdef Q_OS_MAC
 QString getMonoExecutablePath();
 #endif
+QString getDateTimeFormatForFilename(const QDateTime &currentDateTime);
 }
 
 #endif // UTILVAGO_H