diff --git a/.gitignore b/.gitignore index 4779056d..b57e9a60 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ Makefile* .qmake.stash /.project *_autogen/ +*.app /bin/templates/Player.exe /bin/*.app /bin/*.dll @@ -27,6 +28,7 @@ Makefile* /bin/*.res /bin/platforms *.cbp +Testing # flatpak /.flatpak-builder diff --git a/README.adoc b/README.adoc index c9ce60d1..cc18ebac 100644 --- a/README.adoc +++ b/README.adoc @@ -61,7 +61,7 @@ Step-by-step instructions: [source,shell] --------------------------------------- cmake . # generate Makefile -cmake --build # compile the executable +cmake --build . # compile the executable --------------------------------------- diff --git a/src/common/dbstring.h b/src/common/dbstring.h index f579637e..75c22d8a 100644 --- a/src/common/dbstring.h +++ b/src/common/dbstring.h @@ -25,7 +25,7 @@ inline QString ToQString(const std::string& s) { return QString::fromStdString(s); } -inline QString ToQString(lcf::StringView s) { +inline QString ToQString(std::string_view s) { return QString::fromUtf8(s.data(), s.size()); } diff --git a/src/model/event_command_list.cpp b/src/model/event_command_list.cpp index 74256b2e..41e46e0f 100644 --- a/src/model/event_command_list.cpp +++ b/src/model/event_command_list.cpp @@ -15,6 +15,7 @@ * along with EasyRPG Editor. If not, see . */ +#include #include "event_command_list.h" EventCommandList::EventCommandList(std::vector& commands, int current_index) : diff --git a/src/model/project.cpp b/src/model/project.cpp index af4c89e1..ac61f27c 100644 --- a/src/model/project.cpp +++ b/src/model/project.cpp @@ -67,13 +67,15 @@ std::shared_ptr Project::load(const QDir& dir) { cfg = FileFinder::Find(dir, RM_INI); } + std::string title; + std::string enc; if (!cfg.isNull()) { - lcf::INIReader ini(cfg.toStdString()); - std::string title = ini.GetString("RPG_RT", GAMETITLE, tr("Untitled").toStdString()); + const lcf::INIReader ini(cfg.toStdString()); + title = ini.GetString("RPG_RT", GAMETITLE, tr("Untitled").toStdString()); if (project_type == FileFinder::ProjectType::Legacy) { // Check for game encoding - std::string enc = ini.GetString("EasyRPG", "Encoding", ""); + enc = ini.GetString("EasyRPG", "Encoding", ""); if (enc.empty()) { // Only use the title for encoding detection // This is called for all games in the "Open Project" list diff --git a/translations/editor_de.qm b/translations/editor_de.qm new file mode 100644 index 00000000..77feb2c1 Binary files /dev/null and b/translations/editor_de.qm differ