ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/s10k/Vago/utilvago.h

Comparing s10k/Vago/utilvago.h (file contents):
Revision 1092 by s10k, Sat Dec 30 13:43:28 2017 UTC vs.
Revision 1093 by s10k, Sat Dec 30 13:57:32 2017 UTC

#	Line 1 | Line 1
1		#ifndef UTILVAGO_H
2		#define UTILVAGO_H
3
4	<	#include "util.h"
5	<	#include "logger.h"
4	>	#include <util.h>
5	>	#include <cpp17optional/optional.hpp>
6	>	#include <plog/Log.h>
7	>	#include <plog/Converters/NativeEOLConverter.h>
8	>
9	>	#include <QDateTime>
10
11		namespace GlobalVars{
12
13	<	const QString AppVersion="1.3";
14	<	const QString LastCompatibleVersion = "1.0";
13	>	const QString AppVersion="1.4";
14	>	const QString LastCompatibleVersion = "1.4";
15		const QString ToolsFolder = "tools";
16		const QString OniSplitString="OniSplit.exe";
17		#ifdef Q_OS_WIN
#	Line 45 | Line 49 | const char OniSplitProcSeparator=';';
49		**/
50		namespace UtilVago{
51		void openLogFile();
52	<	void showAndLogWarningPopUp(Logger *logger, const QString &message);
52	>	void showAndLogWarningPopUp(const QString &message);
53		void showWarningPopUpLogButton(const QString &message);
54	<	void showAndLogWarningPopUpLogButton(Logger *logger, const QString &message);
55	<	void showAndLogErrorPopUp(Logger *logger, const QString &message);
54	>	void showAndLogWarningPopUpLogButton(const QString &message);
55	>	void showAndLogErrorPopUp(const QString &message);
56		void showErrorPopUpLogButton(const QString &message);
57	<	void showAndLogErrorPopUpLogButton(Logger *logger, const QString &message);
57	>	void showAndLogErrorPopUpLogButton(const QString &message);
58		QString getOSIndependentAppPath();
59		QString getAppPath();
60		QString getOniSplitExecutableAbsolutePath();
#	Line 60 | Line 64 | QString getXmlToolsExecutable();
64		#ifdef Q_OS_MAC
65		QString getMonoExecutablePath();
66		#endif
67	+	QString getDateTimeFormatForFilename(const QDateTime &currentDateTime);
68		}
69
70		#endif // UTILVAGO_H

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)