From ec914d90478490e3b9fff5bfe71dc232fff1cca1 Mon Sep 17 00:00:00 2001 From: OmniTroid Date: Sun, 21 Jul 2024 16:34:23 +0200 Subject: FIx several compiler warnings (#1025) * Do not use deprecated QAbstractSocket::SocketError * Do not use deprecated ::location * Do not discard translation load return value * Use static function calls where applicable * Remove unused include * Remove qt6 check * Remove deprecated type() * Remove qt6 check * Use typeId instead of deprecated type * clang-format fix --- src/text_file_functions.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/text_file_functions.cpp') diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp index 97e632e3..0b077b6c 100644 --- a/src/text_file_functions.cpp +++ b/src/text_file_functions.cpp @@ -160,11 +160,8 @@ QString AOApplication::read_design_ini(QString p_identifier, VPath p_design_path QString AOApplication::read_design_ini(QString p_identifier, QString p_design_path) { QSettings settings(p_design_path, QSettings::IniFormat); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - settings.setIniCodec("UTF-8"); -#endif QVariant value = settings.value(p_identifier); - if (value.type() == QVariant::StringList) + if (value.typeId() == QMetaType::QStringList) { return value.toStringList().join(","); } -- cgit