From d8598d6901cc4c7b58d9afdeeba868107ec0789d Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Wed, 23 Jun 2021 09:55:09 +0100
Subject: [PATCH] NOISSUE Use MiB suffix for Java memory options

---
 application/pages/global/JavaPage.cpp               | 4 ++--
 application/pages/global/JavaPage.ui                | 6 +++---
 application/pages/instance/InstanceSettingsPage.cpp | 2 +-
 application/pages/instance/InstanceSettingsPage.ui  | 6 +++---
 application/widgets/JavaSettingsWidget.cpp          | 2 +-
 libraries/systeminfo/include/sys.h                  | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/application/pages/global/JavaPage.cpp b/application/pages/global/JavaPage.cpp
index 95271c917..cde0e035b 100644
--- a/application/pages/global/JavaPage.cpp
+++ b/application/pages/global/JavaPage.cpp
@@ -37,8 +37,8 @@ JavaPage::JavaPage(QWidget *parent) : QWidget(parent), ui(new Ui::JavaPage)
     ui->setupUi(this);
     ui->tabWidget->tabBar()->hide();
 
-    auto sysMB = Sys::getSystemRam() / Sys::megabyte;
-    ui->maxMemSpinBox->setMaximum(sysMB);
+    auto sysMiB = Sys::getSystemRam() / Sys::mebibyte;
+    ui->maxMemSpinBox->setMaximum(sysMiB);
     loadSettings();
 }
 
diff --git a/application/pages/global/JavaPage.ui b/application/pages/global/JavaPage.ui
index 201b310c3..b67e9994e 100644
--- a/application/pages/global/JavaPage.ui
+++ b/application/pages/global/JavaPage.ui
@@ -51,7 +51,7 @@
              <string>The maximum amount of memory Minecraft is allowed to use.</string>
             </property>
             <property name="suffix">
-             <string notr="true"> MB</string>
+             <string notr="true"> MiB</string>
             </property>
             <property name="minimum">
              <number>128</number>
@@ -87,7 +87,7 @@
              <string>The amount of memory Minecraft is started with.</string>
             </property>
             <property name="suffix">
-             <string notr="true"> MB</string>
+             <string notr="true"> MiB</string>
             </property>
             <property name="minimum">
              <number>128</number>
@@ -116,7 +116,7 @@
              <string>The amount of memory available to store loaded Java classes.</string>
             </property>
             <property name="suffix">
-             <string notr="true"> MB</string>
+             <string notr="true"> MiB</string>
             </property>
             <property name="minimum">
              <number>64</number>
diff --git a/application/pages/instance/InstanceSettingsPage.cpp b/application/pages/instance/InstanceSettingsPage.cpp
index 00fc19afc..7bd424c05 100644
--- a/application/pages/instance/InstanceSettingsPage.cpp
+++ b/application/pages/instance/InstanceSettingsPage.cpp
@@ -19,7 +19,7 @@ InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent)
 {
     m_settings = inst->settings();
     ui->setupUi(this);
-    auto sysMB = Sys::getSystemRam() / Sys::megabyte;
+    auto sysMB = Sys::getSystemRam() / Sys::mebibyte;
     ui->maxMemSpinBox->setMaximum(sysMB);
     connect(ui->openGlobalJavaSettingsButton, &QCommandLinkButton::clicked, this, &InstanceSettingsPage::globalSettingsButtonClicked);
     connect(MMC, &MultiMC::globalSettingsAboutToOpen, this, &InstanceSettingsPage::applySettings);
diff --git a/application/pages/instance/InstanceSettingsPage.ui b/application/pages/instance/InstanceSettingsPage.ui
index 29024b654..e569ce568 100644
--- a/application/pages/instance/InstanceSettingsPage.ui
+++ b/application/pages/instance/InstanceSettingsPage.ui
@@ -116,7 +116,7 @@
              <string>The maximum amount of memory Minecraft is allowed to use.</string>
             </property>
             <property name="suffix">
-             <string notr="true"> MB</string>
+             <string notr="true"> MiB</string>
             </property>
             <property name="minimum">
              <number>128</number>
@@ -138,7 +138,7 @@
              <string>The amount of memory Minecraft is started with.</string>
             </property>
             <property name="suffix">
-             <string notr="true"> MB</string>
+             <string notr="true"> MiB</string>
             </property>
             <property name="minimum">
              <number>128</number>
@@ -160,7 +160,7 @@
              <string>The amount of memory available to store loaded Java classes.</string>
             </property>
             <property name="suffix">
-             <string notr="true"> MB</string>
+             <string notr="true"> MiB</string>
             </property>
             <property name="minimum">
              <number>64</number>
diff --git a/application/widgets/JavaSettingsWidget.cpp b/application/widgets/JavaSettingsWidget.cpp
index a11dd1aad..7f53dc230 100644
--- a/application/widgets/JavaSettingsWidget.cpp
+++ b/application/widgets/JavaSettingsWidget.cpp
@@ -19,7 +19,7 @@
 
 JavaSettingsWidget::JavaSettingsWidget(QWidget* parent) : QWidget(parent)
 {
-    m_availableMemory = Sys::getSystemRam() / Sys::megabyte;
+    m_availableMemory = Sys::getSystemRam() / Sys::mebibyte;
 
     goodIcon = MMC->getThemedIcon("status-good");
     yellowIcon = MMC->getThemedIcon("status-yellow");
diff --git a/libraries/systeminfo/include/sys.h b/libraries/systeminfo/include/sys.h
index 7980dfdf1..914d25551 100644
--- a/libraries/systeminfo/include/sys.h
+++ b/libraries/systeminfo/include/sys.h
@@ -3,7 +3,7 @@
 
 namespace Sys
 {
-const uint64_t megabyte = 1024ull * 1024ull;
+const uint64_t mebibyte = 1024ull * 1024ull;
 struct KernelInfo
 {
     QString kernelName;