Merge 3560dce0d6 into 2c92e5b5b3

Flatpak: Upgrade kde runtime to 6.8

Flatpak/SDL2/SDL2.json

@@ -1,22 +0,0 @@
-{
-  "name": "SDL2",
-  "buildsystem": "autotools",
-  "config-opts": ["--disable-static"],
-  "sources": [
-    {
-      "type": "dir",
-      "path": "../../Externals/SDL/SDL"
-    }
-  ],
-  "cleanup": [ "/bin/sdl2-config",
-               "/include",
-               "/lib/libSDL2.la",
-               "/lib/libSDL2main.a",
-               "/lib/libSDL2main.la",
-               "/lib/libSDL2_test.a",
-               "/lib/libSDL2_test.la",
-               "/lib/cmake",
-               "/share/aclocal",
-               "/lib/pkgconfig"]
-}
-

Flatpak/org.DolphinEmu.dolphin-emu.yml

@@ -1,6 +1,6 @@
 app-id: org.DolphinEmu.dolphin-emu
 runtime: org.kde.Platform
-runtime-version: '6.7'
+runtime-version: '6.8'
 sdk: org.kde.Sdk
 command: dolphin-emu-wrapper
 rename-desktop-file: dolphin-emu.desktop
@@ -47,9 +47,6 @@ modules:
         url: https://github.com/Unrud/xdg-screensaver-shim/archive/0.0.2.tar.gz
         sha256: 0ed2a69fe6ee6cbffd2fe16f85116db737f17fb1e79bfb812d893cf15c728399
 
-  # build the vendored SDL2 from Externals until the runtime gets 2.30.6
-  - SDL2/SDL2.json
-
   - name: dolphin-emu
     buildsystem: cmake-ninja
     config-opts:

Source/Core/Common/IniFile.cpp

@@ -250,17 +250,9 @@ bool IniFile::Load(const std::string& filename, bool keep_current_data)
 
   Section* current_section = nullptr;
   bool first_line = true;
-  while (!in.eof())
+  std::string line_str;
+  while (std::getline(in, line_str))
   {
-    std::string line_str;
-    if (!std::getline(in, line_str))
-    {
-      if (in.eof())
-        return true;
-      else
-        return false;
-    }
-
     std::string_view line = line_str;
 
     // Skips the UTF-8 BOM at the start of files. Notepad likes to add this.

Source/Core/Core/DSP/DSPAssembler.cpp

@@ -776,14 +776,11 @@ bool DSPAssembler::AssemblePass(const std::string& text, int pass)
   m_location.line_num = 0;
   m_cur_pass = pass;
 
-#define LINEBUF_SIZE 1024
+  constexpr int LINEBUF_SIZE = 1024;
-  char line[LINEBUF_SIZE] = {0};
+  char line[LINEBUF_SIZE] = {};
-  while (!m_failed && !fsrc.fail() && !fsrc.eof())
+  while (!m_failed && fsrc.getline(line, LINEBUF_SIZE))
   {
     int opcode_size = 0;
-    fsrc.getline(line, LINEBUF_SIZE);
-    if (fsrc.fail())
-      break;
 
     m_location.line_text = line;
     m_location.line_num++;

Source/Core/VideoCommon/PostProcessing.cpp

@@ -137,43 +137,40 @@ void PostProcessingConfiguration::LoadOptions(const std::string& code)
 
   std::vector<GLSLStringOption> option_strings;
   GLSLStringOption* current_strings = nullptr;
-  while (!in.eof())
+  std::string line_str;
+  while (std::getline(in, line_str))
   {
-    std::string line_str;
+    std::string_view line = line_str;
-    if (std::getline(in, line_str))
-    {
-      std::string_view line = line_str;
 
 #ifndef _WIN32
-      // Check for CRLF eol and convert it to LF
+    // Check for CRLF eol and convert it to LF
-      if (!line.empty() && line.at(line.size() - 1) == '\r')
+    if (!line.empty() && line.at(line.size() - 1) == '\r')
-        line.remove_suffix(1);
+      line.remove_suffix(1);
 #endif
 
-      if (!line.empty())
+    if (!line.empty())
+    {
+      if (line[0] == '[')
       {
-        if (line[0] == '[')
+        size_t endpos = line.find("]");
-        {
-          size_t endpos = line.find("]");
 
-          if (endpos != std::string::npos)
+        if (endpos != std::string::npos)
-          {
+        {
-            // New section!
+          // New section!
-            std::string_view sub = line.substr(1, endpos - 1);
+          std::string_view sub = line.substr(1, endpos - 1);
-            option_strings.push_back({std::string(sub)});
+          option_strings.push_back({std::string(sub)});
-            current_strings = &option_strings.back();
+          current_strings = &option_strings.back();
-          }
         }
-        else
+      }
+      else
+      {
+        if (current_strings)
         {
-          if (current_strings)
+          std::string key, value;
-          {
+          Common::IniFile::ParseLine(line, &key, &value);
-            std::string key, value;
-            Common::IniFile::ParseLine(line, &key, &value);
 
-            if (!(key.empty() && value.empty()))
+          if (!(key.empty() && value.empty()))
-              current_strings->m_options.emplace_back(key, value);
+            current_strings->m_options.emplace_back(key, value);
-          }
         }
       }
     }