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

SystemInfo: various cleanup. 

* Rename the copy slot to match naming convention elsewhere
 * Remove the Mac 10.7/10.8 detection as we don't support it now
This commit is contained in:
Augustin Cavalier 2014-11-26 15:40:38 -05:00
parent 59c4ccfa75
commit 74291017e5
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,14 +27,14 @@ DSystemInfo::DSystemInfo(QWidget* parent_widget) :
UpdateSystemInfo(); UpdateSystemInfo();
QPushButton* btn = m_ui->buttonBox->addButton(tr("Copy"), QDialogButtonBox::ActionRole); QPushButton* btn = m_ui->buttonBox->addButton(tr("Copy"), QDialogButtonBox::ActionRole);
connect(btn, SIGNAL(pressed()), this, SLOT(btnCopy_pressed())); connect(btn, SIGNAL(pressed()), this, SLOT(CopyPressed()));
} }
DSystemInfo::~DSystemInfo() DSystemInfo::~DSystemInfo()
{ {
} }
void DSystemInfo::btnCopy_pressed() void DSystemInfo::CopyPressed()
{ {
QClipboard* clipboard = QApplication::clipboard(); QClipboard* clipboard = QApplication::clipboard();
clipboard->setText(m_ui->txtSysInfo->toPlainText()); clipboard->setText(m_ui->txtSysInfo->toPlainText());
@ -75,8 +75,6 @@ QString DSystemInfo::GetOS() const
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC)
ret += SL("Mac OS X "); ret += SL("Mac OS X ");
switch (QSysInfo::MacintoshVersion) { switch (QSysInfo::MacintoshVersion) {
case QSysInfo::MV_10_7: ret += SL("10.7"); break;
case QSysInfo::MV_10_8: ret += SL("10.8"); break;
case QSysInfo::MV_10_9: ret += SL("10.9"); break; case QSysInfo::MV_10_9: ret += SL("10.9"); break;
default: ret += SL("(unknown)"); break; default: ret += SL("(unknown)"); break;
} }

2
Source/Core/DolphinQt/SystemInfo.h
View File

@ -21,7 +21,7 @@ public:
~DSystemInfo(); ~DSystemInfo();
private slots: private slots:
void btnCopy_pressed(); void CopyPressed();
private: private:
std::unique_ptr<Ui::DSystemInfo> m_ui; std::unique_ptr<Ui::DSystemInfo> m_ui;