Backward compatibility removal

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.7.0)
 
-project(AttorneyOnline VERSION 2.11.0.0 LANGUAGES CXX C)
+project(AttorneyOnline VERSION 2.12.0.0 LANGUAGES CXX C)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -103,6 +103,7 @@ qt_add_executable(Attorney_Online
   src/screenslidetimer.h src/screenslidetimer.cpp
   src/moderation_functions.h src/moderation_functions.cpp
   src/network/serverinfo.h src/network/serverinfo.cpp
+  src/vpath.h src/vpath.cpp
 )
 
 set_target_properties(Attorney_Online PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/bin")

src/animationlayer.h

@@ -16,7 +16,6 @@
 #endif
 
 class AOApplication;
-class VPath;
 
 // "Brief" explanation of what the hell this is:
 //

src/aoapplication.h

@@ -5,6 +5,7 @@
 #include "demoserver.h"
 #include "discord_rich_presence.h"
 #include "serverdata.h"
+#include "vpath.h"
 #include "widgets/aooptionsdialog.h"
 
 #include <bass.h>
@@ -30,24 +31,6 @@ class Lobby;
 class Courtroom;
 class Options;
 
-class VPath : QString
-{
-  using QString::QString;
-
-public:
-  explicit VPath(const QString &str)
-      : QString(str)
-  {}
-  inline const QString &toQString() const { return *this; }
-  inline bool operator==(const VPath &str) const { return this->toQString() == str.toQString(); }
-  inline VPath operator+(const VPath &str) const { return VPath(this->toQString() + str.toQString()); }
-};
-
-inline size_t qHash(const VPath &key, uint seed = qGlobalQHashSeed())
-{
-  return qHash(key.toQString(), seed);
-}
-
 class AOApplication : public QObject
 {
   Q_OBJECT
@@ -103,7 +86,7 @@ class AOApplication : public QObject
   static QString get_version_string();
 
   static const int RELEASE = 2;
-  static const int MAJOR_VERSION = 11;
+  static const int MAJOR_VERSION = 12;
   static const int MINOR_VERSION = 0;
 
   void set_server_list(QVector<ServerInfo> &servers) { server_list = servers; }
@@ -201,6 +184,8 @@ class AOApplication : public QObject
   // Figure out if we can opus this or if we should fall back to wav
   QString get_sfx_suffix(VPath sound_to_check);
 
+  QList<SfxItem> get_sfx_list(QString file_name);
+
   // Can we use APNG for this? If not, WEBP? If not, GIF? If not, fall back to
   // PNG.
   QString get_image_suffix(VPath path_to_check, bool static_image = false);

src/aomusicplayer.cpp

@@ -68,7 +68,7 @@ QString AOMusicPlayer::playStream(QString song, int streamId, bool loopEnabled,
   {
     QStringList lines = ao_app->read_file(d_path).split("\n");
     bool seconds_mode = false;
-    foreach (QString line, lines)
+    for (QString line : lines)
     {
       QStringList args = line.split("=");
       if (args.size() < 2)

src/charselect.cpp

@@ -281,7 +281,7 @@ void Courtroom::character_loading_finished()
   ao_app->generated_chars = 0;
   if (ui_char_button_list.size() > 0)
   {
-    foreach (AOCharButton *item, ui_char_button_list)
+    for (AOCharButton *item : ui_char_button_list)
     {
       delete item;
     }