From b560294050e662a32b6b885ccf0e0f3b492cf5c4 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Mon, 16 Mar 2015 10:19:13 +0100 Subject: [PATCH] Rename packethandler/{client,server}.cpp to {client,server}packethandler.cpp * Requested by @Zeno- * Approved by @nerzhul --- build/android/jni/Android.mk | 4 ++-- src/network/CMakeLists.txt | 6 +++--- .../{packethandlers/client.cpp => clientpackethandler.cpp} | 0 .../{packethandlers/server.cpp => serverpackethandler.cpp} | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename src/network/{packethandlers/client.cpp => clientpackethandler.cpp} (100%) rename src/network/{packethandlers/server.cpp => serverpackethandler.cpp} (100%) diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index a35084433..24367a2aa 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -221,9 +221,9 @@ LOCAL_SRC_FILES += \ jni/src/network/connection.cpp \ jni/src/network/networkpacket.cpp \ jni/src/network/clientopcodes.cpp \ + jni/src/network/clientpackethandler.cpp \ jni/src/network/serveropcodes.cpp \ - jni/src/network/packethandlers/server.cpp \ - jni/src/network/packethandlers/client.cpp + jni/src/network/serverpackethandler.cpp \ # lua api LOCAL_SRC_FILES += \ diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 3162469c8..4095ace26 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -1,7 +1,7 @@ set(common_network_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/connection.cpp ${CMAKE_CURRENT_SOURCE_DIR}/networkpacket.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/packethandlers/server.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/serverpackethandler.cpp ${CMAKE_CURRENT_SOURCE_DIR}/serveropcodes.cpp PARENT_SCOPE ) @@ -9,7 +9,7 @@ set(common_network_SRCS if (BUILD_CLIENT) set(client_network_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/clientopcodes.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/packethandlers/client.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/clientpackethandler.cpp PARENT_SCOPE ) -endif(BUILD_CLIENT) \ No newline at end of file +endif(BUILD_CLIENT) diff --git a/src/network/packethandlers/client.cpp b/src/network/clientpackethandler.cpp similarity index 100% rename from src/network/packethandlers/client.cpp rename to src/network/clientpackethandler.cpp diff --git a/src/network/packethandlers/server.cpp b/src/network/serverpackethandler.cpp similarity index 100% rename from src/network/packethandlers/server.cpp rename to src/network/serverpackethandler.cpp -- 2.25.1