summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorcomex <comexk@gmail.com>2014-10-27 15:04:41 -0400
committercomex <comexk@gmail.com>2014-10-27 15:04:41 -0400
commitc76b8042589352a23830df0b2f48eb77d82fd683 (patch)
tree67cb7595bd12f63b675a2025f617aede552829a5 /Source/Core
parent81dda593cd8a077093492ac04ddf84f65e301a62 (diff)
parent14c3445ad246317db9a507bb0b2e5a6e209201e3 (diff)
Merge pull request #1406 from lioncash/const
DolphinQt: Make GetOS const
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinQt/SystemInfo.cpp2
-rw-r--r--Source/Core/DolphinQt/SystemInfo.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinQt/SystemInfo.cpp b/Source/Core/DolphinQt/SystemInfo.cpp
index ca9ff2e07f..5494886706 100644
--- a/Source/Core/DolphinQt/SystemInfo.cpp
+++ b/Source/Core/DolphinQt/SystemInfo.cpp
@@ -60,7 +60,7 @@ void DSystemInfo::UpdateSystemInfo()
m_ui->txtSysInfo->setPlainText(sysinfo);
}
-QString DSystemInfo::GetOS()
+QString DSystemInfo::GetOS() const
{
QString ret;
/* DON'T REORDER WITHOUT READING Qt DOCS! */
diff --git a/Source/Core/DolphinQt/SystemInfo.h b/Source/Core/DolphinQt/SystemInfo.h
index fc34ab7517..cdc1a93ce9 100644
--- a/Source/Core/DolphinQt/SystemInfo.h
+++ b/Source/Core/DolphinQt/SystemInfo.h
@@ -27,5 +27,5 @@ private:
std::unique_ptr<Ui::DSystemInfo> m_ui;
void UpdateSystemInfo();
- QString GetOS();
+ QString GetOS() const;
};