Re-organizing the headers files in order to...

- avoid hidden dependencies, by including the class header file first.
- keep a inclusion order of C headers, C++ headers, Boost headers and Project headers.
- be relative to the source directory, this keeps clear which package the source file belongs.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ad8bca9..054c3bc 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,6 @@
 # include directories where the source code is located
 include_directories(
-    config
-    dns
-    icmp
-    ping
+    ${CMAKE_CURRENT_SOURCE_DIR}
     ${Boost_INCLUDE_DIRS}
 )
 

diff --git a/src/config/configuration.cpp b/src/config/configuration.cpp
index f9a97fa..78cf351 100644 (file)
--- a/src/config/configuration.cpp
+++ b/src/config/configuration.cpp
@@ -1,6 +1,6 @@
-#include <boost/assert.hpp>
+#include "config/configuration.h"
 
-#include "configuration.h"
+#include <boost/assert.hpp>
 
 using namespace std;
 

diff --git a/src/config/configuration.h b/src/config/configuration.h
index 4aba3cc..d294b9c 100644 (file)
--- a/src/config/configuration.h
+++ b/src/config/configuration.h
@@ -2,10 +2,11 @@
 #define CONFIGURATION_H
 
 #include <stdint.h>
+
 #include <string>
 #include <vector>
 
-#include "host.h"
+#include "config/host.h"
 
 //-----------------------------------------------------------------------------
 // Configuration

diff --git a/src/config/configurationreader.cpp b/src/config/configurationreader.cpp
index 31a2529..815568b 100644 (file)
--- a/src/config/configurationreader.cpp
+++ b/src/config/configurationreader.cpp
@@ -1,9 +1,10 @@
-#include <boost/assert.hpp>
-#include <boost/foreach.hpp>
+#include "config/configurationreader.h"
+
 #include <fstream>
 #include <iostream>
 
-#include "configurationreader.h"
+#include <boost/assert.hpp>
+#include <boost/foreach.hpp>
 
 using namespace std;
 using namespace boost;

diff --git a/src/config/configurationreader.h b/src/config/configurationreader.h
index a0e9ee8..378faf6 100644 (file)
--- a/src/config/configurationreader.h
+++ b/src/config/configurationreader.h
@@ -2,9 +2,10 @@
 #define CONFIGURATIONREADER_H
 
 #include <string>
+
 #include <boost/program_options.hpp>
 
-#include "configuration.h"
+#include "config/configuration.h"
 
 //-----------------------------------------------------------------------------
 // ConfigurationReader

diff --git a/src/config/host.cpp b/src/config/host.cpp
index 4dd8e2c..dbd0fa3 100644 (file)
--- a/src/config/host.cpp
+++ b/src/config/host.cpp
@@ -1,7 +1,8 @@
-#include <boost/assert.hpp>
+#include "config/host.h"
+
 #include <limits>
 
-#include "host.h"
+#include <boost/assert.hpp>
 
 //-----------------------------------------------------------------------------
 // Host

diff --git a/src/config/host.h b/src/config/host.h
index 3eb5534..75f41bf 100644 (file)
--- a/src/config/host.h
+++ b/src/config/host.h
@@ -1,11 +1,13 @@
 #ifndef HOST_H
 #define HOST_H
 
-#include <boost/shared_ptr.hpp>
 #include <stdint.h>
+
 #include <string>
 #include <vector>
 
+#include <boost/shared_ptr.hpp>
+
 //-----------------------------------------------------------------------------
 // Host
 //-----------------------------------------------------------------------------

diff --git a/src/dns/dnsresolver.cpp b/src/dns/dnsresolver.cpp
index 9851135..849f826 100644 (file)
--- a/src/dns/dnsresolver.cpp
+++ b/src/dns/dnsresolver.cpp
@@ -1,9 +1,10 @@
-#include <boost/asio.hpp>
+#include "dns/dnsresolver.h"
+
 #include <iostream>
 
-#include "hostaddress.h"
+#include <boost/asio.hpp>
 
-#include "dnsresolver.h"
+#include "dns/hostaddress.h"
 
 using namespace std;
 using namespace boost::asio;

diff --git a/src/dns/hostaddress.cpp b/src/dns/hostaddress.cpp
index edb696d..253b3c2 100644 (file)
--- a/src/dns/hostaddress.cpp
+++ b/src/dns/hostaddress.cpp
@@ -1,4 +1,4 @@
-#include "hostaddress.h"
+#include "dns/hostaddress.h"
 
 using namespace std;
 

diff --git a/src/dns/hostaddress.h b/src/dns/hostaddress.h
index 9bbf3a2..63df852 100644 (file)
--- a/src/dns/hostaddress.h
+++ b/src/dns/hostaddress.h
@@ -1,9 +1,10 @@
 #ifndef HOSTADDRESS_H_
 #define HOSTADDRESS_H_
 
-#include <string>
 #include <sys/types.h>
 
+#include <string>
+
 //-----------------------------------------------------------------------------
 // HostAddress
 //-----------------------------------------------------------------------------

diff --git a/src/icmp/icmpchecksumcalculator.h b/src/icmp/icmpchecksumcalculator.h
index fe08d3e..309f01c 100644 (file)
--- a/src/icmp/icmpchecksumcalculator.h
+++ b/src/icmp/icmpchecksumcalculator.h
@@ -1,8 +1,8 @@
 #ifndef ICMPCHECKSUMCALCULATOR_H
 #define ICMPCHECKSUMCALCULATOR_H
 
-#include "checksumcalculator.h"
-#include "icmpdata.h"
+#include "icmp/checksumcalculator.h"
+#include "icmp/icmpdata.h"
 
 //-----------------------------------------------------------------------------
 // IcmpChecksumCalculator

diff --git a/src/icmp/icmpheader.cpp b/src/icmp/icmpheader.cpp
index 9ca552c..7d7e9e6 100644 (file)
--- a/src/icmp/icmpheader.cpp
+++ b/src/icmp/icmpheader.cpp
@@ -1,4 +1,4 @@
-#include "icmpheader.h"
+#include "icmp/icmpheader.h"
 
 //-----------------------------------------------------------------------------
 // IcmpHeader

diff --git a/src/icmp/icmpheader.h b/src/icmp/icmpheader.h
index 3f88983..face048 100644 (file)
--- a/src/icmp/icmpheader.h
+++ b/src/icmp/icmpheader.h
@@ -1,9 +1,10 @@
 #ifndef ICMP_HEADER_HPP
 #define ICMP_HEADER_HPP
 
+#include <stdint.h>
+
 #include <istream>
 #include <ostream>
-#include <stdint.h>
 
 //-----------------------------------------------------------------------------
 // IcmpHeader

diff --git a/src/icmp/icmppacket.cpp b/src/icmp/icmppacket.cpp
index a8ab37d..8857196 100644 (file)
--- a/src/icmp/icmppacket.cpp
+++ b/src/icmp/icmppacket.cpp
@@ -1,4 +1,4 @@
-#include "icmppacket.h"
+#include "icmp/icmppacket.h"
 
 //-----------------------------------------------------------------------------
 // IcmpPacket

diff --git a/src/icmp/icmppacket.h b/src/icmp/icmppacket.h
index 4ef7803..2a5c4b2 100644 (file)
--- a/src/icmp/icmppacket.h
+++ b/src/icmp/icmppacket.h
@@ -1,13 +1,14 @@
 #ifndef ICMPPACKET_H
 #define ICMPPACKET_H
 
+#include <stdint.h>
+
 #include <istream>
 #include <ostream>
-#include <stdint.h>
 
-#include "ipv4header.h"
-#include "icmpheader.h"
-#include "icmpdata.h"
+#include "icmp/ipv4header.h"
+#include "icmp/icmpheader.h"
+#include "icmp/icmpdata.h"
 
 //-----------------------------------------------------------------------------
 // IcmpPacket

diff --git a/src/icmp/ipv4header.cpp b/src/icmp/ipv4header.cpp
index b7df6f8..796500a 100644 (file)
--- a/src/icmp/ipv4header.cpp
+++ b/src/icmp/ipv4header.cpp
@@ -1,4 +1,4 @@
-#include "ipv4header.h"
+#include "icmp/ipv4header.h"
 
 //-----------------------------------------------------------------------------
 // Ipv4Header

diff --git a/src/icmp/ipv4header.h b/src/icmp/ipv4header.h
index 625531d..7f23310 100644 (file)
--- a/src/icmp/ipv4header.h
+++ b/src/icmp/ipv4header.h
@@ -1,10 +1,10 @@
 #ifndef IPV4_HEADER_HPP
 #define IPV4_HEADER_HPP
 
-#include <algorithm>
-#include <boost/asio/ip/address_v4.hpp>
 #include <stdint.h>
 
+#include <boost/asio/ip/address_v4.hpp>
+
 //-----------------------------------------------------------------------------
 // Ipv4Header
 //-----------------------------------------------------------------------------

diff --git a/src/main.cpp b/src/main.cpp
index 8175c8d..f4c83fc 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,9 +2,9 @@
 #include <boost/foreach.hpp>
 #include <vector>
 
-#include "configurationreader.h"
-#include "host.h"
-#include "pingscheduler.h"
+#include "config/configurationreader.h"
+#include "config/host.h"
+#include "ping/pingscheduler.h"
 
 using namespace std;
 using namespace boost::asio;

diff --git a/src/ping/boostpinger.cpp b/src/ping/boostpinger.cpp
index f02db05..008a336 100644 (file)
--- a/src/ping/boostpinger.cpp
+++ b/src/ping/boostpinger.cpp
@@ -1,15 +1,16 @@
-#include <boost/bind.hpp>
+#include "ping/boostpinger.h"
+
 #include <iostream>
 #include <istream>
 #include <ostream>
 
-#include "icmpchecksumcalculator.h"
-#include "icmpdata.h"
-#include "icmpheader.h"
-#include "icmppacket.h"
-#include "ipv4header.h"
+#include <boost/bind.hpp>
 
-#include "boostpinger.h"
+#include "icmp/icmpchecksumcalculator.h"
+#include "icmp/icmpdata.h"
+#include "icmp/icmpheader.h"
+#include "icmp/icmppacket.h"
+#include "icmp/ipv4header.h"
 
 using namespace std;
 using namespace boost::asio;

diff --git a/src/ping/boostpinger.h b/src/ping/boostpinger.h
index c90dd46..8420acd 100644 (file)
--- a/src/ping/boostpinger.h
+++ b/src/ping/boostpinger.h
@@ -2,7 +2,8 @@
 #define BOOSTPINGER_H
 
 #include <boost/asio.hpp>
-#include "pinger.h"
+
+#include "ping/pinger.h"
 
 class IcmpPacket;
 

diff --git a/src/ping/pinger.cpp b/src/ping/pinger.cpp
index f7ad717..0dac09c 100644 (file)
--- a/src/ping/pinger.cpp
+++ b/src/ping/pinger.cpp
@@ -1,4 +1,4 @@
-#include "pinger.h"
+#include "ping/pinger.h"
 
 //-----------------------------------------------------------------------------
 // Pinger

diff --git a/src/ping/pingscheduler.cpp b/src/ping/pingscheduler.cpp
index 13dc633..600cbe0 100644 (file)
--- a/src/ping/pingscheduler.cpp
+++ b/src/ping/pingscheduler.cpp
@@ -1,10 +1,11 @@
-#include <boost/bind.hpp>
+#include "ping/pingscheduler.h"
+
 #include <iostream>
 
-#include "boostpinger.h"
-#include "dnsresolver.h"
+#include <boost/bind.hpp>
 
-#include "pingscheduler.h"
+#include "dns/dnsresolver.h"
+#include "ping/boostpinger.h"
 
 using namespace std;
 using namespace boost;

diff --git a/src/ping/pingscheduler.h b/src/ping/pingscheduler.h
index 736e2c6..c5ed595 100644 (file)
--- a/src/ping/pingscheduler.h
+++ b/src/ping/pingscheduler.h
@@ -1,11 +1,12 @@
 #ifndef PINGSCHEDULER_H
 #define PINGSCHEDULER_H
 
+#include <string>
+
 #include <boost/asio.hpp>
 #include <boost/shared_ptr.hpp>
-#include <string>
 
-#include "dnsresolver.h"
+#include "dns/dnsresolver.h"
 
 //-----------------------------------------------------------------------------
 // PingScheduler