Refactor include directives for improved organization and clarity

- Rearranged include directives following best practices: - Placed related headers first, followed by standard libraries, external libraries, and project headers. - Replaced quotes with angle brackets <> for external library includes. - Removed some redundant and unnecessary includes. - Sorted include directives alphabetically within each group for consistency.
inet-framework · Nov 11, 2024 · 4e8a602 · 4e8a602
1 parent ec3de4a
commit 4e8a602
Show file tree

Hide file tree

Showing 98 changed files with 439 additions and 438 deletions.
diff --git a/src/apps/d2dMultihop/MultihopD2D.cc b/src/apps/d2dMultihop/MultihopD2D.cc
@@ -12,12 +12,13 @@
 #include <cmath>
 #include <fstream>
 
-#include <inet/common/packet/chunk/ByteCountChunk.h>
+#include <inet/common/ModuleAccess.h>  // for multicast support
 #include <inet/common/TimeTag_m.h>
+#include <inet/common/packet/chunk/ByteCountChunk.h>
+
 #include "apps/d2dMultihop/MultihopD2D.h"
 #include "apps/d2dMultihop/TrickleTimerMsg_m.h"
 #include "stack/mac/layer/LteMacBase.h"
-#include "inet/common/ModuleAccess.h"  // for multicast support
 
 namespace simu5g {
 

diff --git a/src/apps/mec/DeviceApp/DeviceApp.cc b/src/apps/mec/DeviceApp/DeviceApp.cc
@@ -10,19 +10,20 @@
 //
 
 #include "apps/mec/DeviceApp/DeviceApp.h"
-#include "inet/networklayer/common/L3AddressResolver.h"
 
 #include <string>
+
+#include <inet/common/TimeTag_m.h>
+#include <inet/common/packet/chunk/BytesChunk.h>
+#include <inet/networklayer/common/L3AddressResolver.h>
+#include <inet/networklayer/common/L3AddressTag_m.h>
+#include <inet/transportlayer/common/L4PortTag_m.h>
+
 #include "DeviceAppMessages/DeviceAppPacket_Types.h"
 #include "nodes/mec/MECPlatform/MECServices/packets/HttpRequestMessage/HttpRequestMessage.h"
 #include "nodes/mec/MECPlatform/MECServices/packets/HttpResponseMessage/HttpResponseMessage.h"
-#include "inet/common/TimeTag_m.h"
-#include "inet/networklayer/common/L3AddressTag_m.h"
-#include "inet/transportlayer/common/L4PortTag_m.h"
-
-#include "inet/common/packet/chunk/BytesChunk.h"
-#include "nodes/mec/utils/httpUtils/json.hpp"
 #include "nodes/mec/utils/httpUtils/httpUtils.h"
+#include "nodes/mec/utils/httpUtils/json.hpp"
 
 namespace simu5g {
 

diff --git a/src/apps/mec/DeviceApp/DeviceApp.h b/src/apps/mec/DeviceApp/DeviceApp.h
@@ -13,8 +13,10 @@
 #define APPS_MEC_MEAPPS_DEVICEAPP_H_
 
 #include <omnetpp.h>
-#include "inet/transportlayer/contract/udp/UdpSocket.h"
-#include "inet/transportlayer/contract/tcp/TcpSocket.h"
+
+#include <inet/transportlayer/contract/tcp/TcpSocket.h>
+#include <inet/transportlayer/contract/udp/UdpSocket.h>
+
 #include "DeviceAppMessages/DeviceAppPacket_m.h"
 
 namespace simu5g {

diff --git a/src/apps/mec/DeviceApp/DeviceAppMessages/Serializers/DeviceAppPacketSerializer.cc b/src/apps/mec/DeviceApp/DeviceAppMessages/Serializers/DeviceAppPacketSerializer.cc
@@ -11,9 +11,10 @@
 
 #include "apps/mec/DeviceApp/DeviceAppMessages/Serializers/DeviceAppPacketSerializer.h"
 
-#include "inet/common/packet/serializer/ChunkSerializerRegistry.h"
 #include <string>
 
+#include <inet/common/packet/serializer/ChunkSerializerRegistry.h>
+
 #include "apps/mec/DeviceApp/DeviceAppMessages/DeviceAppPacket_m.h"
 #include "apps/mec/DeviceApp/DeviceAppMessages/DeviceAppPacket_Types.h"
 

diff --git a/src/apps/mec/DeviceApp/DeviceAppMessages/Serializers/DeviceAppPacketSerializer.h b/src/apps/mec/DeviceApp/DeviceAppMessages/Serializers/DeviceAppPacketSerializer.h
@@ -12,7 +12,7 @@
 #ifndef _DEVAPPPACKETSERIALIZER_H_
 #define _DEVAPPPACKETSERIALIZER_H_
 
-#include "inet/common/packet/serializer/FieldsChunkSerializer.h"
+#include <inet/common/packet/serializer/FieldsChunkSerializer.h>
 
 namespace simu5g {
 

diff --git a/src/apps/mec/MecApps/MecAppBase.cc b/src/apps/mec/MecApps/MecAppBase.cc
@@ -10,13 +10,14 @@
 //
 
 #include "apps/mec/MecApps/MecAppBase.h"
-#include "nodes/mec/utils/httpUtils/httpUtils.h"
-#include "nodes/mec/utils/MecCommon.h"
-#include "apps/mec/MecApps/packets/ProcessingTimeMessage_m.h"
 
-#include "inet/common/ProtocolTag_m.h"
-#include "inet/common/ProtocolGroup.h"
-#include "inet/common/Protocol.h"
+#include <inet/common/ProtocolTag_m.h>
+#include <inet/common/ProtocolGroup.h>
+#include <inet/common/Protocol.h>
+
+#include "apps/mec/MecApps/packets/ProcessingTimeMessage_m.h"
+#include "nodes/mec/utils/MecCommon.h"
+#include "nodes/mec/utils/httpUtils/httpUtils.h"
 
 namespace simu5g {
 

diff --git a/src/apps/mec/MecApps/MecAppBase.h b/src/apps/mec/MecApps/MecAppBase.h
@@ -13,17 +13,18 @@
 #define APPS_MEC_MEAPPS_MECAPPBASE_H_
 
 #include <omnetpp.h>
-#include "inet/networklayer/common/L3AddressResolver.h"
-#include "inet/transportlayer/contract/tcp/TcpSocket.h"
-#include "inet/transportlayer/contract/udp/UdpSocket.h"
-#include "inet/common/ModuleRefByPar.h"
-#include "inet/common/socket/SocketMap.h"
+
+#include <inet/common/ModuleRefByPar.h>
+#include <inet/common/socket/SocketMap.h>
+#include <inet/networklayer/common/L3AddressResolver.h>
+#include <inet/transportlayer/contract/tcp/TcpSocket.h>
+#include <inet/transportlayer/contract/udp/UdpSocket.h>
 
 #include "nodes/mec/MECPlatform/MECServices/packets/HttpRequestMessage/HttpRequestMessage.h"
 #include "nodes/mec/MECPlatform/MECServices/packets/HttpResponseMessage/HttpResponseMessage.h"
 #include "nodes/mec/MECPlatform/MECServices/packets/HttpMessages_m.h"
-#include "nodes/mec/VirtualisationInfrastructureManager/VirtualisationInfrastructureManager.h"
 #include "nodes/mec/MECPlatform/ServiceRegistry/ServiceRegistry.h"
+#include "nodes/mec/VirtualisationInfrastructureManager/VirtualisationInfrastructureManager.h"
 
 namespace simu5g {
 

diff --git a/src/apps/mec/MecApps/MecRequestBackgroundApp/MecRequestBackgroundApp.cc b/src/apps/mec/MecApps/MecRequestBackgroundApp/MecRequestBackgroundApp.cc
@@ -9,13 +9,16 @@
 // and cannot be removed from it.
 //
 
-#include <string>
 #include "apps/mec/MecApps/MecRequestBackgroundApp/MecRequestBackgroundApp.h"
-#include "nodes/mec/utils/httpUtils/httpUtils.h"
+
+#include <string>
+
+#include <inet/common/TimeTag_m.h>
+#include <inet/common/packet/chunk/BytesChunk.h>
+
 #include "nodes/mec/MECPlatform/MECServices/packets/HttpRequestMessage/HttpRequestMessage.h"
 #include "nodes/mec/MECPlatform/MECServices/packets/HttpResponseMessage/HttpResponseMessage.h"
-#include "inet/common/TimeTag_m.h"
-#include "inet/common/packet/chunk/BytesChunk.h"
+#include "nodes/mec/utils/httpUtils/httpUtils.h"
 
 namespace simu5g {
 

diff --git a/src/apps/mec/MecApps/MecRequestBackgroundApp/MecRequestBackgroundApp.h b/src/apps/mec/MecApps/MecRequestBackgroundApp/MecRequestBackgroundApp.h
@@ -13,7 +13,6 @@
 #define APPS_MEC_MEAPPS_MEBG_APP_H_
 
 #include "apps/mec/MecApps/MecAppBase.h"
-#include "inet/common/lifecycle/NodeStatus.h"
 
 namespace simu5g {
 

diff --git a/src/apps/mec/MecApps/MecRequestBackgroundGeneratorApp/MecRequestBackgroundGeneratorApp.cc b/src/apps/mec/MecApps/MecRequestBackgroundGeneratorApp/MecRequestBackgroundGeneratorApp.cc
@@ -7,19 +7,22 @@
 // and cannot be removed from it.
 //
 
-#include <string>
 #include "apps/mec/MecApps/MecRequestBackgroundGeneratorApp/MecRequestBackgroundGeneratorApp.h"
-#include "nodes/mec/utils/httpUtils/httpUtils.h"
+
+#include <string>
+
+#include <inet/common/TimeTag_m.h>
+#include <inet/common/packet/chunk/BytesChunk.h>
+
 #include "nodes/mec/MECPlatform/MECServices/packets/HttpRequestMessage/HttpRequestMessage.h"
 #include "nodes/mec/MECPlatform/MECServices/packets/HttpResponseMessage/HttpResponseMessage.h"
-#include "inet/common/TimeTag_m.h"
-#include "inet/common/packet/chunk/BytesChunk.h"
+#include "nodes/mec/utils/httpUtils/httpUtils.h"
 
 namespace simu5g {
 
 using namespace inet;
-Define_Module(MecRequestBackgroundGeneratorApp);
 
+Define_Module(MecRequestBackgroundGeneratorApp);
 
 MecRequestBackgroundGeneratorApp::~MecRequestBackgroundGeneratorApp()
 {

diff --git a/src/apps/mec/MecApps/MecRequestBackgroundGeneratorApp/MecRequestBackgroundGeneratorApp.h b/src/apps/mec/MecApps/MecRequestBackgroundGeneratorApp/MecRequestBackgroundGeneratorApp.h
@@ -12,8 +12,9 @@
 #ifndef APPS_MEC_MEAPPS_MEBGAPP_H_
 #define APPS_MEC_MEAPPS_MEBGAPP_H_
 
+#include <inet/common/lifecycle/NodeStatus.h>
+
 #include "apps/mec/MecApps/MecAppBase.h"
-#include "inet/common/lifecycle/NodeStatus.h"
 
 namespace simu5g {
 

diff --git a/src/apps/mec/MecApps/MecRequestForegroundApp/MecRequestForegroundApp.cc b/src/apps/mec/MecApps/MecRequestForegroundApp/MecRequestForegroundApp.cc
@@ -9,13 +9,16 @@
 // and cannot be removed from it.
 //
 
-#include <string>
 #include "apps/mec/MecApps/MecRequestForegroundApp/MecRequestForegroundApp.h"
-#include "nodes/mec/utils/httpUtils/httpUtils.h"
+
+#include <string>
+
+#include <inet/common/TimeTag_m.h>
+#include <inet/common/packet/chunk/BytesChunk.h>
+
 #include "nodes/mec/MECPlatform/MECServices/packets/HttpRequestMessage/HttpRequestMessage.h"
 #include "nodes/mec/MECPlatform/MECServices/packets/HttpResponseMessage/HttpResponseMessage.h"
-#include "inet/common/TimeTag_m.h"
-#include "inet/common/packet/chunk/BytesChunk.h"
+#include "nodes/mec/utils/httpUtils/httpUtils.h"
 
 namespace simu5g {
 

diff --git a/src/apps/mec/MecApps/MecRequestForegroundApp/MecRequestForegroundApp.h b/src/apps/mec/MecApps/MecRequestForegroundApp/MecRequestForegroundApp.h
@@ -12,8 +12,9 @@
 #ifndef APPS_MEC_MEAPPS_MEFGAPP_H_
 #define APPS_MEC_MEAPPS_MEFGAPP_H_
 
+#include <inet/common/lifecycle/NodeStatus.h>
+
 #include "apps/mec/MecApps/MecAppBase.h"
-#include "inet/common/lifecycle/NodeStatus.h"
 
 namespace simu5g {
 

diff --git a/src/apps/mec/MecRequestResponseApp/MECResponseApp.cc b/src/apps/mec/MecRequestResponseApp/MECResponseApp.cc
@@ -11,28 +11,25 @@
 
 #include "apps/mec/MecRequestResponseApp/MECResponseApp.h"
 
+#include <fstream>
+
+#include <inet/common/TimeTag_m.h>
+#include <inet/common/packet/Packet_m.h>
+#include <inet/networklayer/common/L3AddressTag_m.h>
+#include <inet/transportlayer/common/L4PortTag_m.h>
+
+#include "apps/mec/MecRequestResponseApp/packets/RequestResponsePacket_m.h"
 #include "nodes/mec/utils/httpUtils/httpUtils.h"
 #include "nodes/mec/utils/httpUtils/json.hpp"
 #include "nodes/mec/MECPlatform/MECServices/packets/HttpResponseMessage/HttpResponseMessage.h"
 
-#include "apps/mec/MecRequestResponseApp/packets/RequestResponsePacket_m.h"
-
-#include "inet/common/TimeTag_m.h"
-#include "inet/common/packet/Packet_m.h"
-#include "inet/networklayer/common/L3AddressTag_m.h"
-#include "inet/transportlayer/common/L4PortTag_m.h"
-
-#include <fstream>
-#include "MECResponseApp.h"
-
 namespace simu5g {
 
 Define_Module(MECResponseApp);
 
 using namespace inet;
 using namespace omnetpp;
 
-
 MECResponseApp::~MECResponseApp()
 {
     delete currentRequestfMsg_;

diff --git a/src/apps/mec/MecRequestResponseApp/MECResponseApp.h b/src/apps/mec/MecRequestResponseApp/MECResponseApp.h
@@ -12,12 +12,10 @@
 #ifndef __MECRESPONSEAPP_H_
 #define __MECRESPONSEAPP_H_
 
-#include "omnetpp.h"
-
 #include <queue>
 
-#include "inet/networklayer/common/L3Address.h"
-#include "inet/networklayer/common/L3AddressResolver.h"
+#include <inet/networklayer/common/L3Address.h>
+#include <inet/networklayer/common/L3AddressResolver.h>
 
 #include "apps/mec/MecApps/MecAppBase.h"
 #include "nodes/mec/MECPlatform/ServiceRegistry/ServiceRegistry.h"

diff --git a/src/apps/mec/MecRequestResponseApp/UERequestApp.cc b/src/apps/mec/MecRequestResponseApp/UERequestApp.cc
@@ -10,21 +10,20 @@
 //
 
 #include "apps/mec/MecRequestResponseApp/UERequestApp.h"
-#include "apps/mec/DeviceApp/DeviceAppMessages/DeviceAppPacket_m.h"
-#include "apps/mec/DeviceApp/DeviceAppMessages/DeviceAppPacket_Types.h"
-#include "nodes/mec/MECPlatform/MEAppPacket_Types.h"
-
-#include "apps/mec/MecRequestResponseApp/packets/RequestResponsePacket_m.h"
-
-#include "inet/common/TimeTag_m.h"
-#include "inet/common/packet/chunk/BytesChunk.h"
-#include "inet/networklayer/common/L3AddressTag_m.h"
-#include "inet/transportlayer/common/L4PortTag_m.h"
 
 #include <fstream>
-
 #include <math.h>
 
+#include <inet/common/TimeTag_m.h>
+#include <inet/common/packet/chunk/BytesChunk.h>
+#include <inet/networklayer/common/L3AddressTag_m.h>
+#include <inet/transportlayer/common/L4PortTag_m.h>
+
+#include "apps/mec/DeviceApp/DeviceAppMessages/DeviceAppPacket_m.h"
+#include "apps/mec/DeviceApp/DeviceAppMessages/DeviceAppPacket_Types.h"
+#include "apps/mec/MecRequestResponseApp/packets/RequestResponsePacket_m.h"
+#include "nodes/mec/MECPlatform/MEAppPacket_Types.h"
+
 namespace simu5g {
 
 using namespace inet;

diff --git a/src/apps/mec/MecRequestResponseApp/UERequestApp.h b/src/apps/mec/MecRequestResponseApp/UERequestApp.h
@@ -12,9 +12,9 @@
 #ifndef __UEREQUESTAPP_H_
 #define __UEREQUESTAPP_H_
 
-#include "inet/transportlayer/contract/udp/UdpSocket.h"
-#include "inet/networklayer/common/L3Address.h"
-#include "inet/networklayer/common/L3AddressResolver.h"
+#include <inet/networklayer/common/L3Address.h>
+#include <inet/networklayer/common/L3AddressResolver.h>
+#include <inet/transportlayer/contract/udp/UdpSocket.h>
 
 #include "common/binder/Binder.h"
 

diff --git a/src/apps/mec/RealTimeVideoStreamingApp/MecRTVideoStreamingReceiver.cc b/src/apps/mec/RealTimeVideoStreamingApp/MecRTVideoStreamingReceiver.cc
@@ -9,20 +9,21 @@
 // and cannot be removed from it.
 //
 
-#include "inet/common/TimeTag_m.h"
-#include "inet/common/packet/Packet_m.h"
-#include "inet/networklayer/common/L3AddressTag_m.h"
-#include "inet/transportlayer/common/L4PortTag_m.h"
-
 #include "apps/mec/RealTimeVideoStreamingApp/MecRTVideoStreamingReceiver.h"
+
+#include <fstream>
+
+#include <inet/common/TimeTag_m.h>
+#include <inet/common/packet/Packet_m.h>
+#include <inet/networklayer/common/L3AddressTag_m.h>
+#include <inet/transportlayer/common/L4PortTag_m.h>
+
 #include "apps/mec/DeviceApp/DeviceAppMessages/DeviceAppPacket_Types.h"
 #include "apps/mec/WarningAlert/packets/WarningAlertPacket_Types.h"
 #include "nodes/mec/utils/httpUtils/httpUtils.h"
 #include "nodes/mec/utils/httpUtils/json.hpp"
 #include "nodes/mec/MECPlatform/MECServices/packets/HttpResponseMessage/HttpResponseMessage.h"
 
-#include <fstream>
-
 namespace simu5g {
 
 Define_Module(MecRTVideoStreamingReceiver);

diff --git a/src/apps/mec/RealTimeVideoStreamingApp/MecRTVideoStreamingReceiver.h b/src/apps/mec/RealTimeVideoStreamingApp/MecRTVideoStreamingReceiver.h
@@ -12,17 +12,15 @@
 #ifndef APPS_MEC_MECRTVIDEOSTREAMINGRECEIVER_H_
 #define APPS_MEC_MECRTVIDEOSTREAMINGRECEIVER_H_
 
-#include "omnetpp.h"
-
-#include "inet/networklayer/common/L3Address.h"
-#include "inet/networklayer/common/L3AddressResolver.h"
+#include <inet/networklayer/common/L3Address.h>
+#include <inet/networklayer/common/L3AddressResolver.h>
 
 #include "nodes/mec/MECPlatform/MEAppPacket_Types.h"
 #include "nodes/mec/MECPlatform/ServiceRegistry/ServiceRegistry.h"
 
+#include "apps/mec/MecApps/MecAppBase.h"
 #include "apps/mec/RealTimeVideoStreamingApp/packets/RTVideoStreamingPacket_Types.h"
 #include "apps/mec/RealTimeVideoStreamingApp/packets/RTVideoStreamingPackets_m.h"
-#include "apps/mec/MecApps/MecAppBase.h"
 
 namespace simu5g {
 

diff --git a/src/apps/mec/RealTimeVideoStreamingApp/RTVideoStreamingSender.cc b/src/apps/mec/RealTimeVideoStreamingApp/RTVideoStreamingSender.cc
@@ -10,19 +10,19 @@
 //
 
 #include "apps/mec/RealTimeVideoStreamingApp/RTVideoStreamingSender.h"
+
+#include <fstream>
+
+#include <inet/common/TimeTag_m.h>
+#include <inet/common/packet/chunk/BytesChunk.h>
+#include <inet/networklayer/common/L3AddressTag_m.h>
+#include <inet/transportlayer/common/L4PortTag_m.h>
+
 #include "apps/mec/DeviceApp/DeviceAppMessages/DeviceAppPacket_m.h"
 #include "apps/mec/DeviceApp/DeviceAppMessages/DeviceAppPacket_Types.h"
-#include "nodes/mec/MECPlatform/MEAppPacket_Types.h"
 #include "apps/mec/RealTimeVideoStreamingApp/packets/RTVideoStreamingPacket_Types.h"
 #include "apps/mec/RealTimeVideoStreamingApp/packets/RTVideoStreamingPackets_m.h"
-
-#include "inet/common/TimeTag_m.h"
-#include "inet/common/packet/chunk/BytesChunk.h"
-
-#include "inet/networklayer/common/L3AddressTag_m.h"
-#include "inet/transportlayer/common/L4PortTag_m.h"
-
-#include <fstream>
+#include "nodes/mec/MECPlatform/MEAppPacket_Types.h"
 
 namespace simu5g {