piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

DolphinQt: Get rid of unneeded abbreviation macros.

Browse Source
This commit is contained in:
waddlesplash
2015-11-25 23:05:43 -05:00
parent 662e4fcca0
commit 4acd90d570
9 changed files with 110 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,6 @@
#include "Common/CPUDetect.h"
#include "DolphinQt/SystemInfo.h"
#include "DolphinQt/Utils/Utils.h"
DSystemInfo::DSystemInfo(QWidget* parent_widget) :
QDialog(parent_widget)
@ -44,17 +43,20 @@ void DSystemInfo::UpdateSystemInfo()
{
QString sysinfo;
sysinfo += SL("System\n===========================\n");
sysinfo += SL("OS: %1\n").arg(GetOS());
sysinfo += SL("CPU: %1, %2 logical processors\n").arg(QString::fromStdString(cpu_info.Summarize()))
sysinfo += QStringLiteral("System\n===========================\n");
sysinfo += QStringLiteral("OS: %1\n").arg(GetOS());
sysinfo += QStringLiteral("CPU: %1, %2 logical processors\n")
.arg(QString::fromStdString(cpu_info.Summarize()))
.arg(QThread::idealThreadCount());
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 += QStringLiteral("\nDolphin\n===========================\n");
sysinfo += QStringLiteral("SCM: branch %1, rev %2\n")
.arg(QString::fromUtf8(scm_branch_str))
.arg(QString::fromUtf8(scm_rev_git_str));
sysinfo += SL("\nGUI\n===========================\n");
sysinfo += SL("Compiled for Qt: %1\n").arg(SL(QT_VERSION_STR));
sysinfo += SL("Running on Qt: %1").arg(SC(qVersion()));
sysinfo += QStringLiteral("\nGUI\n===========================\n");
sysinfo += QStringLiteral("Compiled for Qt: %1\n").arg(QStringLiteral(QT_VERSION_STR));
sysinfo += QStringLiteral("Running on Qt: %1").arg(QString::fromUtf8(qVersion()));
m_ui->txtSysInfo->setPlainText(sysinfo);
}
@ -64,43 +66,43 @@ QString DSystemInfo::GetOS() const
QString ret;
/* DON'T REORDER WITHOUT READING Qt DOCS! */
#if defined(Q_OS_WIN)
ret += SL("Windows ");
ret += QStringLiteral("Windows ");
switch (QSysInfo::WindowsVersion) {
case QSysInfo::WV_VISTA: ret += SL("Vista"); break;
case QSysInfo::WV_WINDOWS7: ret += SL("7"); break;
case QSysInfo::WV_WINDOWS8: ret += SL("8"); break;
case QSysInfo::WV_WINDOWS8_1: ret += SL("8.1"); break;
case QSysInfo::WV_WINDOWS10: ret += SL("10"); break;
default: ret += SL("(unknown)"); break;
case QSysInfo::WV_VISTA: ret += QStringLiteral("Vista"); break;
case QSysInfo::WV_WINDOWS7: ret += QStringLiteral("7"); break;
case QSysInfo::WV_WINDOWS8: ret += QStringLiteral("8"); break;
case QSysInfo::WV_WINDOWS8_1: ret += QStringLiteral("8.1"); break;
case QSysInfo::WV_WINDOWS10: ret += QStringLiteral("10"); break;
default: ret += QStringLiteral("(unknown)"); break;
}
#elif defined(Q_OS_MAC)
ret += SL("Mac OS X ");
ret += QStringLiteral("Mac OS X ");
switch (QSysInfo::MacintoshVersion) {
case QSysInfo::MV_10_9: ret += SL("10.9"); break;
case QSysInfo::MV_10_10: ret += SL("10.10"); break;
case QSysInfo::MV_10_11: ret += SL("10.11"); break;
default: ret += SL("(unknown)"); break;
case QSysInfo::MV_10_9: ret += QStringLiteral("10.9"); break;
case QSysInfo::MV_10_10: ret += QStringLiteral("10.10"); break;
case QSysInfo::MV_10_11: ret += QStringLiteral("10.11"); break;
default: ret += QStringLiteral("(unknown)"); break;
}
#elif defined(Q_OS_LINUX)
ret += SL("Linux");
ret += QStringLiteral("Linux");
#elif defined(Q_OS_FREEBSD)
ret += SL("FreeBSD");
ret += QStringLiteral("FreeBSD");
#elif defined(Q_OS_OPENBSD)
ret += SL("OpenBSD");
ret += QStringLiteral("OpenBSD");
#elif defined(Q_OS_NETBSD)
ret += SL("NetBSD");
ret += QStringLiteral("NetBSD");
#elif defined(Q_OS_BSD4)
ret += SL("Other BSD");
ret += QStringLiteral("Other BSD");
#elif defined(Q_OS_UNIX)
ret += SL("Unix");
ret += QStringLiteral("Unix");
#else
ret += SL("Unknown");
ret += QStringLiteral("Unknown");
#endif
#if defined(Q_WS_X11) || defined(Q_OS_X11)
ret += SL(" X11");
ret += QStringLiteral(" X11");
#elif defined(Q_WS_WAYLAND)
ret += SL(" Wayland");
ret += QStringLiteral(" Wayland");
#endif
return ret;