mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-14 14:32:15 -07:00
Lint again.
Took 4 minutes
This commit is contained in:
Lukas Brübach
parent
7b07326775
commit
a094af27a3
15 changed files with 92 additions and 141 deletions
|
|
@ -355,13 +355,13 @@ if(Qt5_FOUND)
|
|||
libcockatrice_card
|
||||
libcockatrice_deck_list
|
||||
libcockatrice_utility
|
||||
libcockatrice_network
|
||||
libcockatrice_network
|
||||
libcockatrice_rng
|
||||
${COCKATRICE_QT_MODULES}
|
||||
)
|
||||
else()
|
||||
target_link_libraries(
|
||||
cockatrice PUBLIC libcockatrice_card libcockatrice_deck_list libcockatrice_utility libcockatrice_network
|
||||
cockatrice PUBLIC libcockatrice_card libcockatrice_deck_list libcockatrice_utility libcockatrice_network
|
||||
libcockatrice_rng ${COCKATRICE_QT_MODULES}
|
||||
)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ void ZoneViewZone::zoneDumpReceived(const Response &r)
|
|||
|
||||
qobject_cast<ZoneViewZoneLogic *>(getLogic())->updateCardIds(ZoneViewZoneLogic::INITIALIZE);
|
||||
reorganizeCards();
|
||||
emit getLogic() -> cardCountChanged();
|
||||
emit getLogic()->cardCountChanged();
|
||||
}
|
||||
|
||||
// Because of boundingRect(), this function must not be called before the zone was added to a scene.
|
||||
|
|
|
|||
|
|
@ -26,5 +26,5 @@ add_dependencies(libcockatrice_deck_list libcockatrice_protocol)
|
|||
target_include_directories(libcockatrice_deck_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
target_link_libraries(
|
||||
libcockatrice_deck_list PUBLIC libcockatrice_protocol libcockatrice_utility ${COCKATRICE_QT_MODULES}
|
||||
libcockatrice_deck_list PUBLIC libcockatrice_protocol libcockatrice_utility ${COCKATRICE_QT_MODULES}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -5,13 +5,10 @@ set(CMAKE_AUTORCC ON)
|
|||
add_subdirectory(libcockatrice/network/client)
|
||||
add_subdirectory(libcockatrice/network/server)
|
||||
|
||||
add_library(
|
||||
libcockatrice_network INTERFACE
|
||||
)
|
||||
|
||||
add_library(libcockatrice_network INTERFACE)
|
||||
|
||||
target_include_directories(libcockatrice_network INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
target_link_libraries(
|
||||
libcockatrice_network INTERFACE ${COCKATRICE_QT_MODULES} libcockatrice_network_client libcockatrice_network_server
|
||||
libcockatrice_network INTERFACE ${COCKATRICE_QT_MODULES} libcockatrice_network_client libcockatrice_network_server
|
||||
)
|
||||
|
|
|
|||
|
|
@ -6,12 +6,11 @@ add_subdirectory(abstract)
|
|||
add_subdirectory(local)
|
||||
add_subdirectory(remote)
|
||||
|
||||
add_library(
|
||||
libcockatrice_network_client INTERFACE
|
||||
)
|
||||
add_library(libcockatrice_network_client INTERFACE)
|
||||
|
||||
target_include_directories(libcockatrice_network_client INTERFACE .)
|
||||
|
||||
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
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,30 +2,23 @@ set(CMAKE_AUTOMOC ON)
|
|||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(HEADERS
|
||||
abstract_client.h
|
||||
)
|
||||
set(HEADERS abstract_client.h)
|
||||
|
||||
set(SOURCES
|
||||
abstract_client.cpp
|
||||
)
|
||||
set(SOURCES abstract_client.cpp)
|
||||
|
||||
if (Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif (Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif ()
|
||||
if(Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif(Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif()
|
||||
|
||||
add_library(
|
||||
libcockatrice_network_client_abstract STATIC
|
||||
${MOC_SOURCES}
|
||||
${SOURCES}
|
||||
)
|
||||
add_library(libcockatrice_network_client_abstract STATIC ${MOC_SOURCES} ${SOURCES})
|
||||
|
||||
add_dependencies(libcockatrice_network_client_abstract libcockatrice_protocol libcockatrice_network_server_remote)
|
||||
|
||||
target_include_directories(libcockatrice_network_client_abstract PUBLIC .)
|
||||
|
||||
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
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,30 +2,22 @@ set(CMAKE_AUTOMOC ON)
|
|||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(HEADERS
|
||||
local_client.h
|
||||
)
|
||||
set(HEADERS local_client.h)
|
||||
|
||||
set(SOURCES
|
||||
local_client.cpp
|
||||
)
|
||||
set(SOURCES local_client.cpp)
|
||||
|
||||
if (Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif (Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif ()
|
||||
if(Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif(Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif()
|
||||
|
||||
add_library(
|
||||
libcockatrice_network_client_local STATIC
|
||||
${MOC_SOURCES}
|
||||
${SOURCES}
|
||||
)
|
||||
add_library(libcockatrice_network_client_local STATIC ${MOC_SOURCES} ${SOURCES})
|
||||
|
||||
add_dependencies(libcockatrice_network_client_local libcockatrice_network_client_abstract)
|
||||
|
||||
target_include_directories(libcockatrice_network_client_local PUBLIC .)
|
||||
|
||||
target_link_libraries(
|
||||
libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract
|
||||
libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,30 +2,23 @@ set(CMAKE_AUTOMOC ON)
|
|||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(HEADERS
|
||||
remote_client.h
|
||||
)
|
||||
set(HEADERS remote_client.h)
|
||||
|
||||
set(SOURCES
|
||||
remote_client.cpp
|
||||
)
|
||||
set(SOURCES remote_client.cpp)
|
||||
|
||||
if (Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif (Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif ()
|
||||
if(Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif(Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif()
|
||||
|
||||
add_library(
|
||||
libcockatrice_network_client_remote STATIC
|
||||
${MOC_SOURCES}
|
||||
${SOURCES}
|
||||
)
|
||||
add_library(libcockatrice_network_client_remote STATIC ${MOC_SOURCES} ${SOURCES})
|
||||
|
||||
add_dependencies(libcockatrice_network_client_remote libcockatrice_network_client_abstract libcockatrice_protocol)
|
||||
|
||||
target_include_directories(libcockatrice_network_client_remote PUBLIC .)
|
||||
|
||||
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
|
||||
)
|
||||
|
|
|
|||
|
|
@ -5,12 +5,11 @@ set(CMAKE_AUTORCC ON)
|
|||
add_subdirectory(local)
|
||||
add_subdirectory(remote)
|
||||
|
||||
add_library(
|
||||
libcockatrice_network_server INTERFACE
|
||||
)
|
||||
add_library(libcockatrice_network_server INTERFACE)
|
||||
|
||||
target_include_directories(libcockatrice_network_server INTERFACE .)
|
||||
|
||||
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
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,32 +2,20 @@ set(CMAKE_AUTOMOC ON)
|
|||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(HEADERS
|
||||
local_server.h
|
||||
local_server_interface.h
|
||||
)
|
||||
set(HEADERS local_server.h local_server_interface.h)
|
||||
|
||||
set(SOURCES
|
||||
local_server.cpp
|
||||
local_server_interface.cpp
|
||||
)
|
||||
set(SOURCES local_server.cpp local_server_interface.cpp)
|
||||
|
||||
if (Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif (Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif ()
|
||||
if(Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif(Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif()
|
||||
|
||||
add_library(
|
||||
libcockatrice_network_server_local STATIC
|
||||
${MOC_SOURCES}
|
||||
${SOURCES}
|
||||
)
|
||||
add_library(libcockatrice_network_server_local STATIC ${MOC_SOURCES} ${SOURCES})
|
||||
|
||||
add_dependencies(libcockatrice_network_server_local libcockatrice_protocol)
|
||||
|
||||
target_include_directories(libcockatrice_network_server_local PUBLIC .)
|
||||
|
||||
target_link_libraries(
|
||||
libcockatrice_network_server_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol
|
||||
)
|
||||
target_link_libraries(libcockatrice_network_server_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol)
|
||||
|
|
|
|||
|
|
@ -23,33 +23,33 @@ set(HEADERS
|
|||
serverinfo_user_container.h
|
||||
)
|
||||
|
||||
if (Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif (Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif ()
|
||||
if(Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif(Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif()
|
||||
|
||||
add_library(
|
||||
libcockatrice_network_server_remote STATIC
|
||||
${MOC_SOURCES}
|
||||
game/server_abstract_participant.cpp
|
||||
game/server_abstract_player.cpp
|
||||
game/server_arrow.cpp
|
||||
game/server_arrowtarget.cpp
|
||||
game/server_card.cpp
|
||||
game/server_cardzone.cpp
|
||||
game/server_counter.cpp
|
||||
game/server_game.cpp
|
||||
game/server_player.cpp
|
||||
game/server_spectator.cpp
|
||||
server.cpp
|
||||
server_abstractuserinterface.cpp
|
||||
server_database_interface.cpp
|
||||
server_protocolhandler.cpp
|
||||
server_remoteuserinterface.cpp
|
||||
server_response_containers.cpp
|
||||
server_room.cpp
|
||||
serverinfo_user_container.cpp
|
||||
libcockatrice_network_server_remote STATIC
|
||||
${MOC_SOURCES}
|
||||
game/server_abstract_participant.cpp
|
||||
game/server_abstract_player.cpp
|
||||
game/server_arrow.cpp
|
||||
game/server_arrowtarget.cpp
|
||||
game/server_card.cpp
|
||||
game/server_cardzone.cpp
|
||||
game/server_counter.cpp
|
||||
game/server_game.cpp
|
||||
game/server_player.cpp
|
||||
game/server_spectator.cpp
|
||||
server.cpp
|
||||
server_abstractuserinterface.cpp
|
||||
server_database_interface.cpp
|
||||
server_protocolhandler.cpp
|
||||
server_remoteuserinterface.cpp
|
||||
server_response_containers.cpp
|
||||
server_room.cpp
|
||||
serverinfo_user_container.cpp
|
||||
)
|
||||
|
||||
add_dependencies(libcockatrice_network_server_remote libcockatrice_protocol)
|
||||
|
|
@ -58,6 +58,6 @@ target_include_directories(libcockatrice_network_server_remote PUBLIC .)
|
|||
|
||||
# Make cockatrice_server depend on cockatrice_protocol
|
||||
target_link_libraries(
|
||||
libcockatrice_network_server_remote PUBLIC libcockatrice_protocol libcockatrice_utility libcockatrice_rng
|
||||
libcockatrice_deck_list ${COCKATRICE_QT_MODULES}
|
||||
libcockatrice_network_server_remote PUBLIC libcockatrice_protocol libcockatrice_utility libcockatrice_rng
|
||||
libcockatrice_deck_list ${COCKATRICE_QT_MODULES}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -4,35 +4,25 @@ add_subdirectory(libcockatrice/protocol/pb)
|
|||
|
||||
add_library(libcockatrice_protocol STATIC)
|
||||
|
||||
set(SOURCES
|
||||
libcockatrice/protocol/debug_pb_message.cpp
|
||||
libcockatrice/protocol/featureset.cpp
|
||||
libcockatrice/protocol/get_pb_extension.cpp
|
||||
libcockatrice/protocol/pending_command.cpp
|
||||
set(SOURCES libcockatrice/protocol/debug_pb_message.cpp libcockatrice/protocol/featureset.cpp
|
||||
libcockatrice/protocol/get_pb_extension.cpp libcockatrice/protocol/pending_command.cpp
|
||||
)
|
||||
|
||||
set(HEADERS
|
||||
libcockatrice/protocol/debug_pb_message.h
|
||||
libcockatrice/protocol/featureset.h
|
||||
libcockatrice/protocol/get_pb_extension.h
|
||||
libcockatrice/protocol/pending_command.h
|
||||
set(HEADERS libcockatrice/protocol/debug_pb_message.h libcockatrice/protocol/featureset.h
|
||||
libcockatrice/protocol/get_pb_extension.h libcockatrice/protocol/pending_command.h
|
||||
)
|
||||
|
||||
target_sources(libcockatrice_protocol
|
||||
PRIVATE
|
||||
${SOURCES}
|
||||
${HEADERS}
|
||||
)
|
||||
target_sources(libcockatrice_protocol PRIVATE ${SOURCES} ${HEADERS})
|
||||
|
||||
add_dependencies(libcockatrice_protocol libcockatrice_protocol_pb)
|
||||
|
||||
# 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
|
||||
target_include_directories(
|
||||
libcockatrice_protocol
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_CURRENT_BINARY_DIR} # points to the generated headers
|
||||
libcockatrice_protocol PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_CURRENT_BINARY_DIR} # points to the generated headers
|
||||
)
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ set(CMAKE_AUTOUIC ON)
|
|||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(UTILITY_SOURCES
|
||||
libcockatrice/utility/expression.cpp libcockatrice/utility/key_signals.cpp
|
||||
libcockatrice/utility/levenshtein.cpp libcockatrice/utility/logger.cpp libcockatrice/utility/passwordhasher.cpp
|
||||
libcockatrice/utility/expression.cpp libcockatrice/utility/key_signals.cpp libcockatrice/utility/levenshtein.cpp
|
||||
libcockatrice/utility/logger.cpp libcockatrice/utility/passwordhasher.cpp
|
||||
)
|
||||
|
||||
set(UTILITY_HEADERS
|
||||
|
|
|
|||
|
|
@ -107,12 +107,12 @@ add_executable(servatrice MACOSX_BUNDLE ${servatrice_MOC_SRCS} ${servatrice_RESO
|
|||
|
||||
if(CMAKE_HOST_SYSTEM MATCHES "FreeBSD")
|
||||
target_link_libraries(
|
||||
servatrice libcockatrice_deck_list libcockatrice_network_server_remote Threads::Threads ${SERVATRICE_QT_MODULES}
|
||||
servatrice libcockatrice_deck_list libcockatrice_network_server_remote Threads::Threads ${SERVATRICE_QT_MODULES}
|
||||
${LIBEXECINFO_LIBRARY}
|
||||
)
|
||||
else()
|
||||
target_link_libraries(
|
||||
servatrice libcockatrice_deck_list libcockatrice_network_server_remote Threads::Threads ${SERVATRICE_QT_MODULES}
|
||||
servatrice libcockatrice_deck_list libcockatrice_network_server_remote Threads::Threads ${SERVATRICE_QT_MODULES}
|
||||
)
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ public:
|
|||
AbstractServerSocketInterface(Servatrice *_server,
|
||||
Servatrice_DatabaseInterface *_databaseInterface,
|
||||
QObject *parent = 0);
|
||||
~AbstractServerSocketInterface() {};
|
||||
~AbstractServerSocketInterface(){};
|
||||
bool initSession();
|
||||
|
||||
virtual QHostAddress getPeerAddress() const = 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue