ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3259 from jcowgill/reproducible 

Remove uses of __DATE__ and __TIME__
This commit is contained in:
Dolphin Bot 2015-11-14 02:59:03 +01:00
parent 19e3fba59f 386159c74e
commit aad06e8f54
5 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/Assert.h
View File

@ -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) \

3
Source/Core/DolphinQt/AboutDialog.cpp
View File

@ -24,8 +24,7 @@ DAboutDialog::DAboutDialog(QWidget* parent_widget)
m_ui = std::make_unique<Ui::DAboutDialog>();
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"))

3
Source/Core/DolphinQt/AboutDialog.ui
View File

@ -43,8 +43,7 @@
</property>
<property name="text">
<string>Branch: %1
Revision: %2
Compiled: %3 @ %4</string>
Revision: %2</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>

1
Source/Core/DolphinQt/SystemInfo.cpp
View File

@ -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));

3
Source/Core/DolphinWX/AboutDolphin.cpp
View File

@ -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, " | ");