jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 22:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Lint again.

Browse source 
Took 4 minutes
This commit is contained in:
Lukas Brübach 2025-10-08 16:07:24 +02:00
parent 7b07326775
commit a094af27a3
15 changed files with 92 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/game/zones/view_zone.cpp
View file

@ -112,7 +112,7 @@ void ZoneViewZone::zoneDumpReceived(const Response &r)
qobject_cast<ZoneViewZoneLogic *>(getLogic())->updateCardIds(ZoneViewZoneLogic::INITIALIZE); qobject_cast<ZoneViewZoneLogic *>(getLogic())->updateCardIds(ZoneViewZoneLogic::INITIALIZE);
reorganizeCards(); reorganizeCards();
emit getLogic() -> cardCountChanged(); emit getLogic()->cardCountChanged();
} }
// Because of boundingRect(), this function must not be called before the zone was added to a scene. // Because of boundingRect(), this function must not be called before the zone was added to a scene.

5
libcockatrice_network/CMakeLists.txt
View file

@ -5,10 +5,7 @@ set(CMAKE_AUTORCC ON)
add_subdirectory(libcockatrice/network/client) add_subdirectory(libcockatrice/network/client)
add_subdirectory(libcockatrice/network/server) add_subdirectory(libcockatrice/network/server)
add_library( add_library(libcockatrice_network INTERFACE)
libcockatrice_network INTERFACE
)
target_include_directories(libcockatrice_network INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(libcockatrice_network INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})

7
libcockatrice_network/libcockatrice/network/client/CMakeLists.txt
View file

@ -6,12 +6,11 @@ add_subdirectory(abstract)
add_subdirectory(local) add_subdirectory(local)
add_subdirectory(remote) add_subdirectory(remote)
add_library( add_library(libcockatrice_network_client INTERFACE)
libcockatrice_network_client INTERFACE
)
target_include_directories(libcockatrice_network_client INTERFACE .) target_include_directories(libcockatrice_network_client INTERFACE .)
target_link_libraries( target_link_libraries(
libcockatrice_network_client INTERFACE ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract libcockatrice_network_client_local libcockatrice_network_client_remote libcockatrice_network_client INTERFACE ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract
libcockatrice_network_client_local libcockatrice_network_client_remote
) )

23
libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
View file

@ -2,30 +2,23 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(HEADERS set(HEADERS abstract_client.h)
abstract_client.h
)
set(SOURCES set(SOURCES abstract_client.cpp)
abstract_client.cpp
)
if (Qt6_FOUND) if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
elseif (Qt5_FOUND) elseif(Qt5_FOUND)
qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif () endif()
add_library( add_library(libcockatrice_network_client_abstract STATIC ${MOC_SOURCES} ${SOURCES})
libcockatrice_network_client_abstract STATIC
${MOC_SOURCES}
${SOURCES}
)
add_dependencies(libcockatrice_network_client_abstract libcockatrice_protocol libcockatrice_network_server_remote) add_dependencies(libcockatrice_network_client_abstract libcockatrice_protocol libcockatrice_network_server_remote)
target_include_directories(libcockatrice_network_client_abstract PUBLIC .) target_include_directories(libcockatrice_network_client_abstract PUBLIC .)
target_link_libraries( target_link_libraries(
libcockatrice_network_client_abstract PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol libcockatrice_network_server_remote libcockatrice_network_client_abstract PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol
libcockatrice_network_server_remote
) )

20
libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
View file

@ -2,25 +2,17 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(HEADERS set(HEADERS local_client.h)
local_client.h
)
set(SOURCES set(SOURCES local_client.cpp)
local_client.cpp
)
if (Qt6_FOUND) if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
elseif (Qt5_FOUND) elseif(Qt5_FOUND)
qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif () endif()
add_library( add_library(libcockatrice_network_client_local STATIC ${MOC_SOURCES} ${SOURCES})
libcockatrice_network_client_local STATIC
${MOC_SOURCES}
${SOURCES}
)
add_dependencies(libcockatrice_network_client_local libcockatrice_network_client_abstract) add_dependencies(libcockatrice_network_client_local libcockatrice_network_client_abstract)

23
libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
View file

@ -2,30 +2,23 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(HEADERS set(HEADERS remote_client.h)
remote_client.h
)
set(SOURCES set(SOURCES remote_client.cpp)
remote_client.cpp
)
if (Qt6_FOUND) if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
elseif (Qt5_FOUND) elseif(Qt5_FOUND)
qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif () endif()
add_library( add_library(libcockatrice_network_client_remote STATIC ${MOC_SOURCES} ${SOURCES})
libcockatrice_network_client_remote STATIC
${MOC_SOURCES}
${SOURCES}
)
add_dependencies(libcockatrice_network_client_remote libcockatrice_network_client_abstract libcockatrice_protocol) add_dependencies(libcockatrice_network_client_remote libcockatrice_network_client_abstract libcockatrice_protocol)
target_include_directories(libcockatrice_network_client_remote PUBLIC .) target_include_directories(libcockatrice_network_client_remote PUBLIC .)
target_link_libraries( target_link_libraries(
libcockatrice_network_client_remote PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract libcockatrice_settings libcockatrice_utility libcockatrice_protocol libcockatrice_network_client_remote PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract
libcockatrice_settings libcockatrice_utility libcockatrice_protocol
) )

7
libcockatrice_network/libcockatrice/network/server/CMakeLists.txt
View file

@ -5,12 +5,11 @@ set(CMAKE_AUTORCC ON)
add_subdirectory(local) add_subdirectory(local)
add_subdirectory(remote) add_subdirectory(remote)
add_library( add_library(libcockatrice_network_server INTERFACE)
libcockatrice_network_server INTERFACE
)
target_include_directories(libcockatrice_network_server INTERFACE .) target_include_directories(libcockatrice_network_server INTERFACE .)
target_link_libraries( target_link_libraries(
libcockatrice_network_server INTERFACE ${COCKATRICE_QT_MODULES} libcockatrice_network_server_local libcockatrice_network_server_remote libcockatrice_network_server INTERFACE ${COCKATRICE_QT_MODULES} libcockatrice_network_server_local
libcockatrice_network_server_remote
) )

26
libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
View file

@ -2,32 +2,20 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(HEADERS set(HEADERS local_server.h local_server_interface.h)
local_server.h
local_server_interface.h
)
set(SOURCES set(SOURCES local_server.cpp local_server_interface.cpp)
local_server.cpp
local_server_interface.cpp
)
if (Qt6_FOUND) if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
elseif (Qt5_FOUND) elseif(Qt5_FOUND)
qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif () endif()
add_library( add_library(libcockatrice_network_server_local STATIC ${MOC_SOURCES} ${SOURCES})
libcockatrice_network_server_local STATIC
${MOC_SOURCES}
${SOURCES}
)
add_dependencies(libcockatrice_network_server_local libcockatrice_protocol) add_dependencies(libcockatrice_network_server_local libcockatrice_protocol)
target_include_directories(libcockatrice_network_server_local PUBLIC .) target_include_directories(libcockatrice_network_server_local PUBLIC .)
target_link_libraries( target_link_libraries(libcockatrice_network_server_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol)
libcockatrice_network_server_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol
)

6
libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt
View file

@ -23,11 +23,11 @@ set(HEADERS
serverinfo_user_container.h serverinfo_user_container.h
) )
if (Qt6_FOUND) if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
elseif (Qt5_FOUND) elseif(Qt5_FOUND)
qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif () endif()
add_library( add_library(
libcockatrice_network_server_remote STATIC libcockatrice_network_server_remote STATIC

28
libcockatrice_protocol/CMakeLists.txt
View file

@ -4,35 +4,25 @@ add_subdirectory(libcockatrice/protocol/pb)
add_library(libcockatrice_protocol STATIC) add_library(libcockatrice_protocol STATIC)
set(SOURCES set(SOURCES libcockatrice/protocol/debug_pb_message.cpp libcockatrice/protocol/featureset.cpp
libcockatrice/protocol/debug_pb_message.cpp libcockatrice/protocol/get_pb_extension.cpp libcockatrice/protocol/pending_command.cpp
libcockatrice/protocol/featureset.cpp
libcockatrice/protocol/get_pb_extension.cpp
libcockatrice/protocol/pending_command.cpp
) )
set(HEADERS set(HEADERS libcockatrice/protocol/debug_pb_message.h libcockatrice/protocol/featureset.h
libcockatrice/protocol/debug_pb_message.h libcockatrice/protocol/get_pb_extension.h libcockatrice/protocol/pending_command.h
libcockatrice/protocol/featureset.h
libcockatrice/protocol/get_pb_extension.h
libcockatrice/protocol/pending_command.h
) )
target_sources(libcockatrice_protocol target_sources(libcockatrice_protocol PRIVATE ${SOURCES} ${HEADERS})
PRIVATE
${SOURCES}
${HEADERS}
)
add_dependencies(libcockatrice_protocol libcockatrice_protocol_pb) add_dependencies(libcockatrice_protocol libcockatrice_protocol_pb)
# Link the actual generated protobuf library # Link the actual generated protobuf library
target_link_libraries(libcockatrice_protocol PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol_pb libcockatrice_utility) target_link_libraries(
libcockatrice_protocol PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol_pb libcockatrice_utility
)
# Expose include paths # Expose include paths
target_include_directories( target_include_directories(
libcockatrice_protocol libcockatrice_protocol PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} # points to the generated headers ${CMAKE_CURRENT_BINARY_DIR} # points to the generated headers
) )

4
libcockatrice_utility/CMakeLists.txt
View file

@ -6,8 +6,8 @@ set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(UTILITY_SOURCES set(UTILITY_SOURCES
libcockatrice/utility/expression.cpp libcockatrice/utility/key_signals.cpp libcockatrice/utility/expression.cpp libcockatrice/utility/key_signals.cpp libcockatrice/utility/levenshtein.cpp
libcockatrice/utility/levenshtein.cpp libcockatrice/utility/logger.cpp libcockatrice/utility/passwordhasher.cpp libcockatrice/utility/logger.cpp libcockatrice/utility/passwordhasher.cpp
) )
set(UTILITY_HEADERS set(UTILITY_HEADERS

2
servatrice/src/serversocketinterface.h
View file

@ -146,7 +146,7 @@ public:
AbstractServerSocketInterface(Servatrice *_server, AbstractServerSocketInterface(Servatrice *_server,
Servatrice_DatabaseInterface *_databaseInterface, Servatrice_DatabaseInterface *_databaseInterface,
QObject *parent = 0); QObject *parent = 0);
~AbstractServerSocketInterface() {}; ~AbstractServerSocketInterface(){};
bool initSession(); bool initSession();
virtual QHostAddress getPeerAddress() const = 0; virtual QHostAddress getPeerAddress() const = 0;