ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/s10k/Vago/utilvago.cpp

Comparing s10k/Vago/utilvago.cpp (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 6 | Line 6 | void openLogFile(){
6		QDesktopServices::openUrl(QUrl("file:///"+getAppPath()+"/"+GlobalVars::AppLogName));
7		}
8
9	<	void showAndLogWarningPopUp(Logger *logger, const QString &message){
10	<	logger->writeString(message);
9	>	void showAndLogWarningPopUp(const QString &message){
10	>	LOG_WARNING << message;
11
12		QMessageBox msgBox;
13		msgBox.setIcon(QMessageBox::Warning);
#	Line 29 | Line 29 | void showWarningPopUpLogButton(const QSt
29		}
30
31		//Same of above but also writtes directly to the log file the error
32	<	void showAndLogWarningPopUpLogButton(Logger *logger, const QString &message){
32	>	void showAndLogWarningPopUpLogButton(const QString &message){
33
34	<	logger->writeString(message);
34	>	LOG_WARNING << message;
35
36		QMessageBox msgBox;
37		msgBox.setIcon(QMessageBox::Warning);
#	Line 44 | Line 44 | void showAndLogWarningPopUpLogButton(Log
44		}
45		}
46
47	<	void showAndLogErrorPopUp(Logger *logger, const QString &message){
47	>	void showAndLogErrorPopUp(const QString &message){
48
49	<	logger->writeString(message);
49	>	LOG_ERROR << message;
50
51		QMessageBox msgBox;
52		msgBox.setIcon(QMessageBox::Critical);
#	Line 68 | Line 68 | void showErrorPopUpLogButton(const QStri
68		}
69
70		//Same of above but also writtes directly to the log file the error
71	<	void showAndLogErrorPopUpLogButton(Logger *logger, const QString &message){
71	>	void showAndLogErrorPopUpLogButton(const QString &message){
72
73	<	logger->writeString(message);
73	>	LOG_ERROR << message;
74
75		QMessageBox msgBox;
76		msgBox.setIcon(QMessageBox::Critical);
#	Line 117 | Line 117 | QString getXmlToolsExecutableAbsolutePat
117		QString getOniSplitExecutable(){
118
119		#ifdef Q_OS_MAC
120	<	return getMonoExecutablePath() + " " + Util::insertQuotes(getOniSplitExecutableAbsolutePath());
120	>	return getMonoExecutablePath() + " " + Util::String::insertQuotes(getOniSplitExecutableAbsolutePath());
121		#else
122	<	return Util::insertQuotes(getOniSplitExecutableAbsolutePath());
122	>	return Util::String::insertQuotes(getOniSplitExecutableAbsolutePath());
123		#endif
124		}
125
126		QString getXmlToolsExecutable(){
127	<	return Util::insertQuotes(getXmlToolsExecutableAbsolutePath());
127	>	return Util::String::insertQuotes(getXmlToolsExecutableAbsolutePath());
128		}
129
130		#ifdef Q_OS_MAC
#	Line 143 | Line 143 | QString getMonoExecutablePath(){
143		}
144		#endif
145
146	+	QString getDateTimeFormatForFilename(const QDateTime &currentDateTime){
147	+	return currentDateTime.toString("yyyy-MM-dd_hh-mm-ss");
148	+	}
149	+
150		}

Diff Legend

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