--- Vago/trunk/Vago/utilvago.cpp 2016/10/12 21:35:13 1054 +++ s10k/Vago/utilvago.cpp 2017/12/30 13:57:32 1093 @@ -6,8 +6,8 @@ void openLogFile(){ QDesktopServices::openUrl(QUrl("file:///"+getAppPath()+"/"+GlobalVars::AppLogName)); } -void showAndLogWarningPopUp(Logger *logger, const QString &message){ - logger->writeString(message); +void showAndLogWarningPopUp(const QString &message){ + LOG_WARNING << message; QMessageBox msgBox; msgBox.setIcon(QMessageBox::Warning); @@ -29,9 +29,9 @@ void showWarningPopUpLogButton(const QSt } //Same of above but also writtes directly to the log file the error -void showAndLogWarningPopUpLogButton(Logger *logger, const QString &message){ +void showAndLogWarningPopUpLogButton(const QString &message){ - logger->writeString(message); + LOG_WARNING << message; QMessageBox msgBox; msgBox.setIcon(QMessageBox::Warning); @@ -44,9 +44,9 @@ void showAndLogWarningPopUpLogButton(Log } } -void showAndLogErrorPopUp(Logger *logger, const QString &message){ +void showAndLogErrorPopUp(const QString &message){ - logger->writeString(message); + LOG_ERROR << message; QMessageBox msgBox; msgBox.setIcon(QMessageBox::Critical); @@ -68,9 +68,9 @@ void showErrorPopUpLogButton(const QStri } //Same of above but also writtes directly to the log file the error -void showAndLogErrorPopUpLogButton(Logger *logger, const QString &message){ +void showAndLogErrorPopUpLogButton(const QString &message){ - logger->writeString(message); + LOG_ERROR << message; QMessageBox msgBox; msgBox.setIcon(QMessageBox::Critical); @@ -117,14 +117,14 @@ QString getXmlToolsExecutableAbsolutePat QString getOniSplitExecutable(){ #ifdef Q_OS_MAC - return getMonoExecutablePath() + " " + Util::insertQuotes(getOniSplitExecutableAbsolutePath()); + return getMonoExecutablePath() + " " + Util::String::insertQuotes(getOniSplitExecutableAbsolutePath()); #else - return Util::insertQuotes(getOniSplitExecutableAbsolutePath()); + return Util::String::insertQuotes(getOniSplitExecutableAbsolutePath()); #endif } QString getXmlToolsExecutable(){ - return Util::insertQuotes(getXmlToolsExecutableAbsolutePath()); + return Util::String::insertQuotes(getXmlToolsExecutableAbsolutePath()); } #ifdef Q_OS_MAC @@ -143,4 +143,8 @@ QString getMonoExecutablePath(){ } #endif +QString getDateTimeFormatForFilename(const QDateTime ¤tDateTime){ + return currentDateTime.toString("yyyy-MM-dd_hh-mm-ss"); +} + }