From f86a8fe59b6b41229cc9353d3144d0381494fed1 Mon Sep 17 00:00:00 2001
From: Osmium Sorcerer <os@sof.beauty>
Date: Wed, 25 Mar 2026 03:45:44 +0000
Subject: Drop Qt major version checks

We only support Qt 6, remove all conditional code that was dependent on
earlier versions.
---
 src/text_file_functions.cpp | 18 ------------------
 1 file changed, 18 deletions(-)

(limited to 'src/text_file_functions.cpp')

diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp
index c6bd2db..50ed1f1 100644
--- a/src/text_file_functions.cpp
+++ b/src/text_file_functions.cpp
@@ -82,9 +82,6 @@ bool AOApplication::write_to_file(QString p_text, QString p_file, bool make_dir)
   {
     QTextStream out(&f_log);
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    out.setCodec("UTF-8");
-#endif
     out << p_text;
 
     f_log.flush();
@@ -119,9 +116,6 @@ bool AOApplication::append_to_file(QString p_text, QString p_file, bool make_dir
   {
     QTextStream out(&f_log);
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    out.setCodec("UTF-8");
-#endif
     out << "\n" << p_text;
 
     f_log.flush();
@@ -409,9 +403,6 @@ QString AOApplication::get_image_suffix(VPath path_to_check, bool static_image)
 QString AOApplication::read_char_ini(QString p_char, QString p_search_line, QString target_tag)
 {
   QSettings settings(get_real_path(get_character_path(p_char, "char.ini")), QSettings::IniFormat);
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-  settings.setIniCodec("UTF-8");
-#endif
   settings.beginGroup(target_tag);
   QString value = settings.value(p_search_line).value<QString>();
   settings.endGroup();
@@ -423,9 +414,6 @@ QStringList AOApplication::read_ini_tags(VPath p_path, QString target_tag)
 {
   QStringList r_values;
   QSettings settings(get_real_path(p_path), QSettings::IniFormat);
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-  settings.setIniCodec("UTF-8");
-#endif
   if (!target_tag.isEmpty())
   {
     settings.beginGroup(target_tag);
@@ -781,9 +769,6 @@ QStringList AOApplication::get_effects(QString p_char)
     }
 
     QSettings l_effects_ini(i_filepath, QSettings::IniFormat);
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    l_effects_ini.setIniCodec("UTF-8");
-#endif
     // port legacy effects
     if (!l_effects_ini.contains("version/major") || l_effects_ini.value("version/major").toInt() < 2)
     {
@@ -867,9 +852,6 @@ QString AOApplication::get_effect_property(QString fx_name, QString p_char, QStr
     if (!path.isEmpty())
     {
       QSettings settings(path, QSettings::IniFormat);
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-      settings.setIniCodec("UTF-8");
-#endif
       QStringList char_effects = settings.childGroups();
       for (int i = 0; i < char_effects.size(); ++i)
       {
-- 
cgit