aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

qt 6.5 compatibility (#4796)

Browse source 
* remove metatypes definitions

* deprecation of QApplication::setActiveWindow
This commit is contained in:
ebbit1q 2023-04-30 05:09:26 +02:00 committed by GitHub
parent 1a40102f71
commit 421da882d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 3 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cockatrice/src/abstractclient.cpp
View file

@ -1,6 +1,5 @@
#include "abstractclient.h" #include "abstractclient.h"
#include "client_metatypes.h"
#include "featureset.h" #include "featureset.h"
#include "get_pb_extension.h" #include "get_pb_extension.h"
#include "pb/commands.pb.h" #include "pb/commands.pb.h"

29
cockatrice/src/client_metatypes.h
View file

@ -1,29 +0,0 @@
#ifndef CLIENT_METATYPES_H
#define CLIENT_METATYPES_H
#include <QMetaType>
Q_DECLARE_METATYPE(QVariant)
Q_DECLARE_METATYPE(CommandContainer)
Q_DECLARE_METATYPE(Response)
Q_DECLARE_METATYPE(Response::ResponseCode)
Q_DECLARE_METATYPE(ClientStatus)
Q_DECLARE_METATYPE(RoomEvent)
Q_DECLARE_METATYPE(GameEventContainer)
Q_DECLARE_METATYPE(Event_ServerIdentification)
Q_DECLARE_METATYPE(Event_ConnectionClosed)
Q_DECLARE_METATYPE(Event_ServerShutdown)
Q_DECLARE_METATYPE(Event_AddToList)
Q_DECLARE_METATYPE(Event_RemoveFromList)
Q_DECLARE_METATYPE(Event_UserJoined)
Q_DECLARE_METATYPE(Event_UserLeft)
Q_DECLARE_METATYPE(Event_ServerMessage)
Q_DECLARE_METATYPE(Event_ListRooms)
Q_DECLARE_METATYPE(Event_GameJoined)
Q_DECLARE_METATYPE(Event_UserMessage)
Q_DECLARE_METATYPE(ServerInfo_User)
Q_DECLARE_METATYPE(QList<ServerInfo_User>)
Q_DECLARE_METATYPE(Event_ReplayAdded)
Q_DECLARE_METATYPE(QList<QString>)
#endif

2
cockatrice/src/tab_message.cpp
View file

@ -159,7 +159,7 @@ void TabMessage::showSystemPopup(const Event_UserMessage &event)
void TabMessage::messageClicked() void TabMessage::messageClicked()
{ {
tabSupervisor->setCurrentIndex(tabSupervisor->indexOf(this)); tabSupervisor->setCurrentIndex(tabSupervisor->indexOf(this));
QApplication::setActiveWindow(this); activateWindow();
emit maximizeClient(); emit maximizeClient();
} }

2
cockatrice/src/tab_room.cpp
View file

@ -155,7 +155,7 @@ void TabRoom::retranslateUi()
void TabRoom::focusTab() void TabRoom::focusTab()
{ {
QApplication::setActiveWindow(this); activateWindow();
tabSupervisor->setCurrentIndex(tabSupervisor->indexOf(this)); tabSupervisor->setCurrentIndex(tabSupervisor->indexOf(this));
emit maximizeClient(); emit maximizeClient();
} }

2
cockatrice/src/window_main.cpp
View file

@ -936,7 +936,7 @@ void MainWindow::iconActivated(QSystemTrayIcon::ActivationReason reason)
showMinimized(); showMinimized();
} else { } else {
showNormal(); showNormal();
QApplication::setActiveWindow(this); activateWindow();
} }
} }
} }

1
common/server.cpp
View file

@ -30,7 +30,6 @@
#include "server_counter.h" #include "server_counter.h"
#include "server_database_interface.h" #include "server_database_interface.h"
#include "server_game.h" #include "server_game.h"
#include "server_metatypes.h"
#include "server_player.h" #include "server_player.h"
#include "server_protocolhandler.h" #include "server_protocolhandler.h"
#include "server_remoteuserinterface.h" #include "server_remoteuserinterface.h"

26
common/server_metatypes.h
View file

@ -1,26 +0,0 @@
#ifndef SERVER_METATYPES_H
#define SERVER_METATYPES_H
#include "pb/commands.pb.h"
#include "pb/game_event_container.pb.h"
#include "pb/isl_message.pb.h"
#include "pb/response.pb.h"
#include "pb/room_commands.pb.h"
#include "pb/serverinfo_ban.pb.h"
#include "pb/serverinfo_game.pb.h"
#include "pb/serverinfo_room.pb.h"
#include "pb/serverinfo_user.pb.h"
#include <QMetaType>
Q_DECLARE_METATYPE(ServerInfo_Ban)
Q_DECLARE_METATYPE(ServerInfo_User)
Q_DECLARE_METATYPE(ServerInfo_Room)
Q_DECLARE_METATYPE(ServerInfo_Game)
Q_DECLARE_METATYPE(CommandContainer)
Q_DECLARE_METATYPE(Response)
Q_DECLARE_METATYPE(GameEventContainer)
Q_DECLARE_METATYPE(IslMessage)
Q_DECLARE_METATYPE(Command_JoinGame)
#endif