From 74291017e5244f69123b5e983885e71334457e9e Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 26 Nov 2014 15:40:38 -0500 Subject: [PATCH] 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 --- Source/Core/DolphinQt/SystemInfo.cpp | 6 ++---- Source/Core/DolphinQt/SystemInfo.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/Core/DolphinQt/SystemInfo.cpp b/Source/Core/DolphinQt/SystemInfo.cpp index 5494886706..28445eded3 100644 --- a/Source/Core/DolphinQt/SystemInfo.cpp +++ b/Source/Core/DolphinQt/SystemInfo.cpp @@ -27,14 +27,14 @@ DSystemInfo::DSystemInfo(QWidget* parent_widget) : UpdateSystemInfo(); 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() { } -void DSystemInfo::btnCopy_pressed() +void DSystemInfo::CopyPressed() { QClipboard* clipboard = QApplication::clipboard(); clipboard->setText(m_ui->txtSysInfo->toPlainText()); @@ -75,8 +75,6 @@ QString DSystemInfo::GetOS() const #elif defined(Q_OS_MAC) ret += SL("Mac OS X "); 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; default: ret += SL("(unknown)"); break; } diff --git a/Source/Core/DolphinQt/SystemInfo.h b/Source/Core/DolphinQt/SystemInfo.h index cdc1a93ce9..028d258eb5 100644 --- a/Source/Core/DolphinQt/SystemInfo.h +++ b/Source/Core/DolphinQt/SystemInfo.h @@ -21,7 +21,7 @@ public: ~DSystemInfo(); private slots: - void btnCopy_pressed(); + void CopyPressed(); private: std::unique_ptr m_ui;