Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop12

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

1 files changed, 25 insertions, 40 deletions

diff --git a/launcher/minecraft/gameoptions/GameOptions.cpp b/launcher/minecraft/gameoptions/GameOptions.cpp
index e547b32a..443525ae 100644
--- a/launcher/minecraft/gameoptions/GameOptions.cpp
+++ b/launcher/minecraft/gameoptions/GameOptions.cpp
@@ -1,59 +1,51 @@
 #include "GameOptions.h"
-#include "FileSystem.h"
 #include <QDebug>
 #include <QSaveFile>
+#include "FileSystem.h"
 
 namespace {
-bool load(const QString& path, std::vector<GameOptionItem> &contents, int & version)
+bool load(const QString& path, std::vector<GameOptionItem>& contents, int& version)
 {
     contents.clear();
     QFile file(path);
-    if (!file.open(QFile::ReadOnly))
-    {
+    if (!file.open(QFile::ReadOnly)) {
         qWarning() << "Failed to read options file.";
         return false;
     }
     version = 0;
-    while(!file.atEnd())
-    {
+    while (!file.atEnd()) {
         auto line = file.readLine();
-        if(line.endsWith('\n'))
-        {
+        if (line.endsWith('\n')) {
             line.chop(1);
         }
         auto separatorIndex = line.indexOf(':');
-        if(separatorIndex == -1)
-        {
+        if (separatorIndex == -1) {
             continue;
         }
         auto key = QString::fromUtf8(line.data(), separatorIndex);
         auto value = QString::fromUtf8(line.data() + separatorIndex + 1, line.size() - 1 - separatorIndex);
         qDebug() << "!!" << key << "!!";
-        if(key == "version")
-        {
+        if (key == "version") {
             version = value.toInt();
             continue;
         }
-        contents.emplace_back(GameOptionItem{key, value});
+        contents.emplace_back(GameOptionItem{ key, value });
     }
     qDebug() << "Loaded" << path << "with version:" << version;
     return true;
 }
-bool save(const QString& path, std::vector<GameOptionItem> &mapping, int version)
+bool save(const QString& path, std::vector<GameOptionItem>& mapping, int version)
 {
     QSaveFile out(path);
-    if(!out.open(QIODevice::WriteOnly))
-    {
+    if (!out.open(QIODevice::WriteOnly)) {
         return false;
     }
-    if(version != 0)
-    {
+    if (version != 0) {
         QString versionLine = QString("version:%1\n").arg(version);
         out.write(versionLine.toUtf8());
     }
     auto iter = mapping.begin();
-    while (iter != mapping.end())
-    {
+    while (iter != mapping.end()) {
         out.write(iter->key.toUtf8());
         out.write(":");
         out.write(iter->value.toUtf8());
@@ -62,22 +54,19 @@ bool save(const QString& path, std::vector<GameOptionItem> &mapping, int version
     }
     return out.commit();
 }
-}
+}  // namespace
 
-GameOptions::GameOptions(const QString& path):
-    path(path)
+GameOptions::GameOptions(const QString& path) : path(path)
 {
     reload();
 }
 
 QVariant GameOptions::headerData(int section, Qt::Orientation orientation, int role) const
 {
-    if(role != Qt::DisplayRole)
-    {
+    if (role != Qt::DisplayRole) {
         return QAbstractListModel::headerData(section, orientation, role);
     }
-    switch(section)
-    {
+    switch (section) {
         case 0:
             return tr("Key");
         case 1:
@@ -98,19 +87,15 @@ QVariant GameOptions::data(const QModelIndex& index, int role) const
     if (row < 0 || row >= int(contents.size()))
         return QVariant();
 
-    switch (role)
-    {
-    case Qt::DisplayRole:
-        if(column == 0)
-        {
-            return contents[row].key;
-        }
-        else
-        {
-            return contents[row].value;
-        }
-    default:
-        return QVariant();
+    switch (role) {
+        case Qt::DisplayRole:
+            if (column == 0) {
+                return contents[row].key;
+            } else {
+                return contents[row].value;
+            }
+        default:
+            return QVariant();
     }
     return QVariant();
 }