From 386159c74e8ac2d87c87cded872400f352ece0d7 Mon Sep 17 00:00:00 2001 From: James Cowgill Date: Sat, 14 Nov 2015 00:52:41 +0000 Subject: [PATCH] Remove uses of __DATE__ and __TIME__ --- Source/Core/Common/Assert.h | 4 ++-- Source/Core/DolphinQt/AboutDialog.cpp | 3 +-- Source/Core/DolphinQt/AboutDialog.ui | 3 +-- Source/Core/DolphinQt/SystemInfo.cpp | 1 - Source/Core/DolphinWX/AboutDolphin.cpp | 3 +-- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Source/Core/Common/Assert.h b/Source/Core/Common/Assert.h index bedcbdee48..0b359433ff 100644 --- a/Source/Core/Common/Assert.h +++ b/Source/Core/Common/Assert.h @@ -37,8 +37,8 @@ #endif #define _assert_(_a_) \ - _assert_msg_(MASTER_LOG, _a_, "Error...\n\n Line: %d\n File: %s\n Time: %s\n\nIgnore and continue?", \ - __LINE__, __FILE__, __TIME__) + _assert_msg_(MASTER_LOG, _a_, "Error...\n\n Line: %d\n File: %s\n\nIgnore and continue?", \ + __LINE__, __FILE__) #define _dbg_assert_(_t_, _a_) \ if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG) \ diff --git a/Source/Core/DolphinQt/AboutDialog.cpp b/Source/Core/DolphinQt/AboutDialog.cpp index 6059e0db1a..560a4815cc 100644 --- a/Source/Core/DolphinQt/AboutDialog.cpp +++ b/Source/Core/DolphinQt/AboutDialog.cpp @@ -24,8 +24,7 @@ DAboutDialog::DAboutDialog(QWidget* parent_widget) m_ui = std::make_unique(); m_ui->setupUi(this); m_ui->lblGitRev->setText(SC(scm_desc_str)); - m_ui->lblGitInfo->setText(m_ui->lblGitInfo->text().arg(SC(scm_branch_str), SC(scm_rev_git_str), - SL(__DATE__), SL(__TIME__))); + m_ui->lblGitInfo->setText(m_ui->lblGitInfo->text().arg(SC(scm_branch_str), SC(scm_rev_git_str))); m_ui->lblFinePrint->setText(m_ui->lblFinePrint->text().arg(SL("2015"))); m_ui->lblLicenseAuthorsSupport->setText(m_ui->lblLicenseAuthorsSupport->text() .arg(SL("https://github.com/dolphin-emu/dolphin/blob/master/license.txt")) diff --git a/Source/Core/DolphinQt/AboutDialog.ui b/Source/Core/DolphinQt/AboutDialog.ui index d2fad473bc..5cce02c2b0 100644 --- a/Source/Core/DolphinQt/AboutDialog.ui +++ b/Source/Core/DolphinQt/AboutDialog.ui @@ -43,8 +43,7 @@ Branch: %1 -Revision: %2 -Compiled: %3 @ %4 +Revision: %2 Qt::PlainText diff --git a/Source/Core/DolphinQt/SystemInfo.cpp b/Source/Core/DolphinQt/SystemInfo.cpp index e8c6a04859..0693ea9189 100644 --- a/Source/Core/DolphinQt/SystemInfo.cpp +++ b/Source/Core/DolphinQt/SystemInfo.cpp @@ -51,7 +51,6 @@ void DSystemInfo::UpdateSystemInfo() sysinfo += SL("\nDolphin\n===========================\n"); sysinfo += SL("SCM: branch %1, rev %2\n").arg(SC(scm_branch_str)).arg(SC(scm_rev_git_str)); - sysinfo += SL("Compiled: %1, %2\n").arg(SL(__DATE__)).arg(SL(__TIME__)); sysinfo += SL("\nGUI\n===========================\n"); sysinfo += SL("Compiled for Qt: %1\n").arg(SL(QT_VERSION_STR)); diff --git a/Source/Core/DolphinWX/AboutDolphin.cpp b/Source/Core/DolphinWX/AboutDolphin.cpp index f708f60716..a7abdaa7ea 100644 --- a/Source/Core/DolphinWX/AboutDolphin.cpp +++ b/Source/Core/DolphinWX/AboutDolphin.cpp @@ -51,7 +51,6 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, const wxString CopyrightText = _("(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of Nintendo. Dolphin is not affiliated with Nintendo in any way."); const wxString BranchText = wxString::Format(_("Branch: %s"), scm_branch_str); const wxString BranchRevText = wxString::Format(_("Revision: %s"), scm_rev_git_str); - const wxString CompiledText = wxString::Format(_("Compiled: %s @ %s"), __DATE__, __TIME__); const wxString CheckUpdateText = _("Check for updates: "); const wxString Text = _("\n" "Dolphin is a free and open-source GameCube and Wii emulator.\n" @@ -65,7 +64,7 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, wxStaticText* const Revision = new wxStaticText(this, wxID_ANY, RevisionText); wxStaticText* const Copyright = new wxStaticText(this, wxID_ANY, CopyrightText); - wxStaticText* const Branch = new wxStaticText(this, wxID_ANY, BranchText + "\n" + BranchRevText + "\n" + CompiledText+"\n"); + wxStaticText* const Branch = new wxStaticText(this, wxID_ANY, BranchText + "\n" + BranchRevText + "\n"); wxStaticText* const Message = new wxStaticText(this, wxID_ANY, Text); wxStaticText* const UpdateText = new wxStaticText(this, wxID_ANY, CheckUpdateText); wxStaticText* const FirstSpacer = new wxStaticText(this, wxID_ANY, " | ");