Skip to content

Commit ec914d9

Browse files
authored
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
1 parent 4129c1f commit ec914d9

4 files changed

Lines changed: 26 additions & 22 deletions

File tree

src/main.cpp

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "courtroom.h"
55
#include "datatypes.h"
66
#include "lobby.h"
7-
#include "networkmanager.h"
87

98
#include <QDebug>
109
#include <QDirIterator>
@@ -29,24 +28,23 @@ int main(int argc, char *argv[])
2928
#endif
3029

3130
AOApplication main_app;
32-
app.setApplicationVersion(AOApplication::get_version_string());
33-
app.setApplicationDisplayName(QObject::tr("Attorney Online %1").arg(app.applicationVersion()));
31+
QApplication::setApplicationVersion(AOApplication::get_version_string());
32+
QApplication::setApplicationDisplayName(QObject::tr("Attorney Online %1").arg(QApplication::applicationVersion()));
3433

3534
QResource::registerResource(main_app.get_asset("themes/" + Options::getInstance().theme() + ".rcc"));
3635

37-
QFont main_font = app.font();
36+
QFont main_font = QApplication::font();
3837
main_app.default_font = main_font;
3938

4039
QFont new_font = main_font;
4140
int new_font_size = main_app.default_font.pointSize() * Options::getInstance().themeScalingFactor();
4241
new_font.setPointSize(new_font_size);
43-
app.setFont(new_font);
42+
QApplication::setFont(new_font);
4443

45-
QFontDatabase fontDatabase;
4644
QDirIterator it(get_base_path() + "fonts", QDirIterator::Subdirectories);
4745
while (it.hasNext())
4846
{
49-
fontDatabase.addApplicationFont(it.next());
47+
QFontDatabase::addApplicationFont(it.next());
5048
}
5149

5250
QStringList expected_formats{"webp", "apng", "gif"};
@@ -70,18 +68,30 @@ int main(int argc, char *argv[])
7068
}
7169

7270
QTranslator qtTranslator;
73-
qtTranslator.load("qt_" + p_language, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
74-
app.installTranslator(&qtTranslator);
71+
if (!qtTranslator.load("qt_" + p_language, QLibraryInfo::path(QLibraryInfo::TranslationsPath)))
72+
{
73+
qDebug() << "Failed to load translation qt_" + p_language;
74+
}
75+
else
76+
{
77+
QApplication::installTranslator(&qtTranslator);
78+
}
7579

7680
QTranslator appTranslator;
77-
qDebug() << ":/data/translations/ao_" + p_language;
78-
appTranslator.load("ao_" + p_language, ":/data/translations/");
79-
app.installTranslator(&appTranslator);
81+
if (!appTranslator.load("ao_" + p_language, ":/data/translations/"))
82+
{
83+
qDebug() << "Failed to load translation ao_" + p_language;
84+
}
85+
else
86+
{
87+
QApplication::installTranslator(&appTranslator);
88+
qDebug() << ":/data/translations/ao_" + p_language;
89+
}
8090

8191
main_app.construct_lobby();
8292
main_app.net_manager->get_server_list();
8393
main_app.net_manager->send_heartbeat();
8494
main_app.w_lobby->show();
8595

86-
return app.exec();
96+
return QApplication::exec();
8797
}

src/network/websocketconnection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ WebSocketConnection::WebSocketConnection(AOApplication *ao_app, QObject *parent)
1111
, m_socket(new QWebSocket(QString(), QWebSocketProtocol::VersionLatest, this))
1212
, m_last_state(QAbstractSocket::UnconnectedState)
1313
{
14-
connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error), this, &WebSocketConnection::onError);
14+
connect(m_socket, &QWebSocket::errorOccurred, this, &WebSocketConnection::onError);
1515
connect(m_socket, &QWebSocket::stateChanged, this, &WebSocketConnection::onStateChanged);
1616
connect(m_socket, &QWebSocket::textMessageReceived, this, &WebSocketConnection::onTextMessageReceived);
1717
}

src/path_functions.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,11 +273,8 @@ QString AOApplication::get_config_value(QString p_identifier, QString p_config,
273273
if (!path.isEmpty())
274274
{
275275
QSettings settings(path, QSettings::IniFormat);
276-
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
277-
settings.setIniCodec("UTF-8");
278-
#endif
279276
QVariant value = settings.value(p_identifier);
280-
if (value.type() == QVariant::StringList)
277+
if (value.typeId() == QMetaType::QStringList)
281278
{
282279
return value.toStringList().join(",");
283280
}

src/text_file_functions.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,8 @@ QString AOApplication::read_design_ini(QString p_identifier, VPath p_design_path
160160
QString AOApplication::read_design_ini(QString p_identifier, QString p_design_path)
161161
{
162162
QSettings settings(p_design_path, QSettings::IniFormat);
163-
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
164-
settings.setIniCodec("UTF-8");
165-
#endif
166163
QVariant value = settings.value(p_identifier);
167-
if (value.type() == QVariant::StringList)
164+
if (value.typeId() == QMetaType::QStringList)
168165
{
169166
return value.toStringList().join(",");
170167
}

0 commit comments

Comments
 (0)