Skip to content

Commit

Permalink
Partial resolution of #988, #870
Browse files Browse the repository at this point in the history
  • Loading branch information
TrickyLeifa committed Nov 7, 2024
1 parent b4cf723 commit 56bb82b
Show file tree
Hide file tree
Showing 13 changed files with 315 additions and 658 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/aoapplication.h
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,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; }
Expand Down
2 changes: 1 addition & 1 deletion src/aomusicplayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/charselect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Loading

0 comments on commit 56bb82b

Please sign in to comment.