From 7e3b008d5cf71ec5e8e75a47a65d9ce96f53dd24 Mon Sep 17 00:00:00 2001 From: JDierkse Date: Sun, 9 Feb 2020 14:26:16 +0100 Subject: [PATCH] Fix Include order --- Network/BroadcastClient.cpp | 3 +-- Network/BroadcastClientImpl.h | 2 +- Network/BroadcastServer.cpp | 3 +-- Network/BroadcastServerImpl.h | 2 +- Network/IcmpClient.cpp | 3 +-- Network/IcmpClientImpl.cpp | 2 +- Network/IcmpClientImpl.h | 6 +++--- Network/IcmpHeader.h | 2 +- Network/Ipv4Header.h | 2 +- Network/MulticastClient.cpp | 3 +-- Network/MulticastClientImpl.h | 2 +- Network/UdpClient.cpp | 3 +-- Network/UdpClientImpl.cpp | 2 +- Network/UdpClientImpl.h | 2 +- include/UdpClient.h | 3 +-- 15 files changed, 17 insertions(+), 23 deletions(-) diff --git a/Network/BroadcastClient.cpp b/Network/BroadcastClient.cpp index 849d2a6..d591642 100644 --- a/Network/BroadcastClient.cpp +++ b/Network/BroadcastClient.cpp @@ -1,5 +1,5 @@ -#include "BroadcastClientImpl.h" #include "BroadcastClient.h" +#include "BroadcastClientImpl.h" namespace Network { @@ -27,4 +27,3 @@ void BroadcastClient::Broadcast(const std::string& data, int sourcePort) } } // namespace Network - diff --git a/Network/BroadcastClientImpl.h b/Network/BroadcastClientImpl.h index 2ca4da8..d1aa936 100644 --- a/Network/BroadcastClientImpl.h +++ b/Network/BroadcastClientImpl.h @@ -1,9 +1,9 @@ #ifndef NETWORK_BROADCASTCLIENTIMPL_H #define NETWORK_BROADCASTCLIENTIMPL_H +#include "UdpClientImpl.h" #include #include -#include "UdpClientImpl.h" namespace Network { diff --git a/Network/BroadcastServer.cpp b/Network/BroadcastServer.cpp index 0ff4e1f..28f3cf6 100644 --- a/Network/BroadcastServer.cpp +++ b/Network/BroadcastServer.cpp @@ -1,5 +1,5 @@ -#include "BroadcastServerImpl.h" #include "BroadcastServer.h" +#include "BroadcastServerImpl.h" namespace Network { @@ -27,4 +27,3 @@ void BroadcastServer::Broadcast(const std::string& data, int sourcePort) } } // namespace Network - diff --git a/Network/BroadcastServerImpl.h b/Network/BroadcastServerImpl.h index 2446ac4..a7d2f89 100644 --- a/Network/BroadcastServerImpl.h +++ b/Network/BroadcastServerImpl.h @@ -1,9 +1,9 @@ #ifndef NETWORK_BROADCASTSERVER_IMPL_H #define NETWORK_BROADCASTSERVER_IMPL_H +#include "UdpClientImpl.h" #include #include -#include "UdpClientImpl.h" namespace Network { diff --git a/Network/IcmpClient.cpp b/Network/IcmpClient.cpp index 2ff12e2..ad0b4d1 100644 --- a/Network/IcmpClient.cpp +++ b/Network/IcmpClient.cpp @@ -1,5 +1,5 @@ -#include "IcmpClientImpl.h" #include "IcmpClient.h" +#include "IcmpClientImpl.h" namespace Network { @@ -17,4 +17,3 @@ bool IcmpClient::Ping(const std::string& targetAddress) } } // namespace Network - diff --git a/Network/IcmpClientImpl.cpp b/Network/IcmpClientImpl.cpp index 7ad4d50..901ffe4 100644 --- a/Network/IcmpClientImpl.cpp +++ b/Network/IcmpClientImpl.cpp @@ -1,5 +1,5 @@ -#include #include "IcmpClientImpl.h" +#include namespace Network { diff --git a/Network/IcmpClientImpl.h b/Network/IcmpClientImpl.h index e44b1d3..da13e48 100644 --- a/Network/IcmpClientImpl.h +++ b/Network/IcmpClientImpl.h @@ -1,15 +1,15 @@ #ifndef NETWORK_ICMPCLIENTIMPL_H #define NETWORK_ICMPCLIENTIMPL_H +#include "Ipv4Header.h" +#include "IcmpHeader.h" +#include "asio.hpp" #include #include #include #include #include #include -#include "asio.hpp" -#include "Ipv4Header.h" -#include "IcmpHeader.h" namespace Network { diff --git a/Network/IcmpHeader.h b/Network/IcmpHeader.h index 819e14a..e7c783c 100644 --- a/Network/IcmpHeader.h +++ b/Network/IcmpHeader.h @@ -1,8 +1,8 @@ #ifndef ICMPHEADER_H #define ICMPHEADER_H -#include #include "asio.hpp" +#include namespace Network { diff --git a/Network/Ipv4Header.h b/Network/Ipv4Header.h index 5b7e076..9715df0 100644 --- a/Network/Ipv4Header.h +++ b/Network/Ipv4Header.h @@ -1,8 +1,8 @@ #ifndef IPV4HEADER_H #define IPV4HEADER_H -#include #include "asio.hpp" +#include namespace Network { diff --git a/Network/MulticastClient.cpp b/Network/MulticastClient.cpp index 6024bdd..e065c62 100644 --- a/Network/MulticastClient.cpp +++ b/Network/MulticastClient.cpp @@ -1,5 +1,5 @@ -#include "MulticastClientImpl.h" #include "MulticastClient.h" +#include "MulticastClientImpl.h" namespace Network { @@ -27,4 +27,3 @@ void MulticastClient::Broadcast(const std::string& data, int sourcePort) } } // namespace Network - diff --git a/Network/MulticastClientImpl.h b/Network/MulticastClientImpl.h index 6b8e23a..4513996 100644 --- a/Network/MulticastClientImpl.h +++ b/Network/MulticastClientImpl.h @@ -1,9 +1,9 @@ #ifndef NETWORK_MULTICASTCLIENTIMPL_H #define NETWORK_MULTICASTCLIENTIMPL_H +#include "UdpClientImpl.h" #include #include -#include "UdpClientImpl.h" namespace Network { diff --git a/Network/UdpClient.cpp b/Network/UdpClient.cpp index 390de1d..3fa888f 100644 --- a/Network/UdpClient.cpp +++ b/Network/UdpClient.cpp @@ -1,5 +1,5 @@ -#include "UdpClientImpl.h" #include "UdpClient.h" +#include "UdpClientImpl.h" namespace Network { @@ -27,4 +27,3 @@ void UdpClient::Broadcast(const std::string& data, int sourcePort) } } // namespace Network - diff --git a/Network/UdpClientImpl.cpp b/Network/UdpClientImpl.cpp index e21cb9f..27bf74e 100644 --- a/Network/UdpClientImpl.cpp +++ b/Network/UdpClientImpl.cpp @@ -1,5 +1,5 @@ -#include "Logging.h" #include "UdpClientImpl.h" +#include "Logging.h" namespace Network { diff --git a/Network/UdpClientImpl.h b/Network/UdpClientImpl.h index 2ff784e..bcf7191 100644 --- a/Network/UdpClientImpl.h +++ b/Network/UdpClientImpl.h @@ -1,11 +1,11 @@ #ifndef NETWORK_UDPCLIENTIMPL_H #define NETWORK_UDPCLIENTIMPL_H +#include "asio.hpp" #include #include #include #include -#include "asio.hpp" namespace Network { diff --git a/include/UdpClient.h b/include/UdpClient.h index 2c2fe18..19d432f 100644 --- a/include/UdpClient.h +++ b/include/UdpClient.h @@ -8,7 +8,7 @@ namespace Network { -class m_pUdpClientImpl; +class UdpClientImpl; class UdpClient { @@ -29,4 +29,3 @@ private: } // namespace Network #endif // UDPCLIENT_H -