diff --git a/CMakeLists.txt b/CMakeLists.txt index abc9226..7308335 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,7 +78,7 @@ target_link_libraries(aasdk ${WINSOCK2_LIBRARIES}) install(TARGETS aasdk DESTINATION lib) -install(DIRECTORY include/f1x DESTINATION include) +install(DIRECTORY include/aasdk DESTINATION include) if(AASDK_TEST) add_executable(aasdk_ut diff --git a/aasdk_proto/AVChannelData.proto b/aasdk_proto/AVChannelData.proto index cb8b8e6..f7be241 100644 --- a/aasdk_proto/AVChannelData.proto +++ b/aasdk_proto/AVChannelData.proto @@ -23,7 +23,7 @@ import "AudioTypeEnum.proto"; import "AudioConfigData.proto"; import "VideoConfigData.proto"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message AVChannel { diff --git a/aasdk_proto/AVChannelMessageIdsEnum.proto b/aasdk_proto/AVChannelMessageIdsEnum.proto index 67f0c06..ab7f8b2 100644 --- a/aasdk_proto/AVChannelMessageIdsEnum.proto +++ b/aasdk_proto/AVChannelMessageIdsEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.ids; +package aasdk.proto.ids; message AVChannelMessage { diff --git a/aasdk_proto/AVChannelSetupRequestMessage.proto b/aasdk_proto/AVChannelSetupRequestMessage.proto index c9d0bc3..314feda 100644 --- a/aasdk_proto/AVChannelSetupRequestMessage.proto +++ b/aasdk_proto/AVChannelSetupRequestMessage.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message AVChannelSetupRequest { diff --git a/aasdk_proto/AVChannelSetupResponseMessage.proto b/aasdk_proto/AVChannelSetupResponseMessage.proto index afa8ebb..6d33782 100644 --- a/aasdk_proto/AVChannelSetupResponseMessage.proto +++ b/aasdk_proto/AVChannelSetupResponseMessage.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "AVChannelSetupStatusEnum.proto"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message AVChannelSetupResponse { diff --git a/aasdk_proto/AVChannelSetupStatusEnum.proto b/aasdk_proto/AVChannelSetupStatusEnum.proto index 7adb240..f70a88e 100644 --- a/aasdk_proto/AVChannelSetupStatusEnum.proto +++ b/aasdk_proto/AVChannelSetupStatusEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message AVChannelSetupStatus { diff --git a/aasdk_proto/AVChannelStartIndicationMessage.proto b/aasdk_proto/AVChannelStartIndicationMessage.proto index 30ded14..3f9d39d 100644 --- a/aasdk_proto/AVChannelStartIndicationMessage.proto +++ b/aasdk_proto/AVChannelStartIndicationMessage.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message AVChannelStartIndication { diff --git a/aasdk_proto/AVChannelStopIndicationMessage.proto b/aasdk_proto/AVChannelStopIndicationMessage.proto index dccba62..0332371 100644 --- a/aasdk_proto/AVChannelStopIndicationMessage.proto +++ b/aasdk_proto/AVChannelStopIndicationMessage.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message AVChannelStopIndication { diff --git a/aasdk_proto/AVInputChannelData.proto b/aasdk_proto/AVInputChannelData.proto index 8165107..940a553 100644 --- a/aasdk_proto/AVInputChannelData.proto +++ b/aasdk_proto/AVInputChannelData.proto @@ -21,7 +21,7 @@ syntax="proto2"; import "AVStreamTypeEnum.proto"; import "AudioConfigData.proto"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message AVInputChannel { diff --git a/aasdk_proto/AVInputOpenRequestMessage.proto b/aasdk_proto/AVInputOpenRequestMessage.proto index b11f006..152ae54 100644 --- a/aasdk_proto/AVInputOpenRequestMessage.proto +++ b/aasdk_proto/AVInputOpenRequestMessage.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message AVInputOpenRequest { diff --git a/aasdk_proto/AVInputOpenResponseMessage.proto b/aasdk_proto/AVInputOpenResponseMessage.proto index aa95731..c4b0638 100644 --- a/aasdk_proto/AVInputOpenResponseMessage.proto +++ b/aasdk_proto/AVInputOpenResponseMessage.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message AVInputOpenResponse { diff --git a/aasdk_proto/AVMediaAckIndicationMessage.proto b/aasdk_proto/AVMediaAckIndicationMessage.proto index a5f5b42..58b5de4 100644 --- a/aasdk_proto/AVMediaAckIndicationMessage.proto +++ b/aasdk_proto/AVMediaAckIndicationMessage.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message AVMediaAckIndication { diff --git a/aasdk_proto/AVStreamTypeEnum.proto b/aasdk_proto/AVStreamTypeEnum.proto index 5494ce2..4202c04 100644 --- a/aasdk_proto/AVStreamTypeEnum.proto +++ b/aasdk_proto/AVStreamTypeEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message AVStreamType { diff --git a/aasdk_proto/AbsoluteInputEventData.proto b/aasdk_proto/AbsoluteInputEventData.proto index e6d6618..efc0a5b 100644 --- a/aasdk_proto/AbsoluteInputEventData.proto +++ b/aasdk_proto/AbsoluteInputEventData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message AbsoluteInputEvent { diff --git a/aasdk_proto/AbsoluteInputEventsData.proto b/aasdk_proto/AbsoluteInputEventsData.proto index e132280..a193f0d 100644 --- a/aasdk_proto/AbsoluteInputEventsData.proto +++ b/aasdk_proto/AbsoluteInputEventsData.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "AbsoluteInputEventData.proto"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message AbsoluteInputEvents { diff --git a/aasdk_proto/AccelData.proto b/aasdk_proto/AccelData.proto index f873ed7..35a7445 100644 --- a/aasdk_proto/AccelData.proto +++ b/aasdk_proto/AccelData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message Accel { diff --git a/aasdk_proto/AudioConfigData.proto b/aasdk_proto/AudioConfigData.proto index 8b4ba85..7daca1c 100644 --- a/aasdk_proto/AudioConfigData.proto +++ b/aasdk_proto/AudioConfigData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message AudioConfig { diff --git a/aasdk_proto/AudioFocusRequestMessage.proto b/aasdk_proto/AudioFocusRequestMessage.proto index 1273cfc..1bece29 100644 --- a/aasdk_proto/AudioFocusRequestMessage.proto +++ b/aasdk_proto/AudioFocusRequestMessage.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "AudioFocusTypeEnum.proto"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message AudioFocusRequest { diff --git a/aasdk_proto/AudioFocusResponseMessage.proto b/aasdk_proto/AudioFocusResponseMessage.proto index 43e7cd7..1b00ebe 100644 --- a/aasdk_proto/AudioFocusResponseMessage.proto +++ b/aasdk_proto/AudioFocusResponseMessage.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "AudioFocusStateEnum.proto"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message AudioFocusResponse { diff --git a/aasdk_proto/AudioFocusStateEnum.proto b/aasdk_proto/AudioFocusStateEnum.proto index 1200cdc..c79eddf 100644 --- a/aasdk_proto/AudioFocusStateEnum.proto +++ b/aasdk_proto/AudioFocusStateEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message AudioFocusState { diff --git a/aasdk_proto/AudioFocusTypeEnum.proto b/aasdk_proto/AudioFocusTypeEnum.proto index 73e7877..12bc057 100644 --- a/aasdk_proto/AudioFocusTypeEnum.proto +++ b/aasdk_proto/AudioFocusTypeEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message AudioFocusType { diff --git a/aasdk_proto/AudioTypeEnum.proto b/aasdk_proto/AudioTypeEnum.proto index 255bab9..c80f29f 100644 --- a/aasdk_proto/AudioTypeEnum.proto +++ b/aasdk_proto/AudioTypeEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message AudioType { diff --git a/aasdk_proto/AuthCompleteIndicationMessage.proto b/aasdk_proto/AuthCompleteIndicationMessage.proto index 99c1b1c..36d3a12 100644 --- a/aasdk_proto/AuthCompleteIndicationMessage.proto +++ b/aasdk_proto/AuthCompleteIndicationMessage.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "StatusEnum.proto"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message AuthCompleteIndication { diff --git a/aasdk_proto/BindingRequestMessage.proto b/aasdk_proto/BindingRequestMessage.proto index fd51939..9b94cee 100644 --- a/aasdk_proto/BindingRequestMessage.proto +++ b/aasdk_proto/BindingRequestMessage.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message BindingRequest { diff --git a/aasdk_proto/BindingResponseMessage.proto b/aasdk_proto/BindingResponseMessage.proto index f5b7841..8d48b25 100644 --- a/aasdk_proto/BindingResponseMessage.proto +++ b/aasdk_proto/BindingResponseMessage.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "StatusEnum.proto"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message BindingResponse { diff --git a/aasdk_proto/BluetoothChannelData.proto b/aasdk_proto/BluetoothChannelData.proto index 31fbdc4..411f796 100644 --- a/aasdk_proto/BluetoothChannelData.proto +++ b/aasdk_proto/BluetoothChannelData.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "BluetoothPairingMethodEnum.proto"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message BluetoothChannel { diff --git a/aasdk_proto/BluetoothChannelMessageIdsEnum.proto b/aasdk_proto/BluetoothChannelMessageIdsEnum.proto index 33ed3e6..ff5d640 100644 --- a/aasdk_proto/BluetoothChannelMessageIdsEnum.proto +++ b/aasdk_proto/BluetoothChannelMessageIdsEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.ids; +package aasdk.proto.ids; message BluetoothChannelMessage { diff --git a/aasdk_proto/BluetoothPairingMethodEnum.proto b/aasdk_proto/BluetoothPairingMethodEnum.proto index a7b8b9a..92beaa5 100644 --- a/aasdk_proto/BluetoothPairingMethodEnum.proto +++ b/aasdk_proto/BluetoothPairingMethodEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message BluetoothPairingMethod { diff --git a/aasdk_proto/BluetoothPairingRequestMessage.proto b/aasdk_proto/BluetoothPairingRequestMessage.proto index 7daf8fe..08cb16d 100644 --- a/aasdk_proto/BluetoothPairingRequestMessage.proto +++ b/aasdk_proto/BluetoothPairingRequestMessage.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "BluetoothPairingMethodEnum.proto"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message BluetoothPairingRequest { diff --git a/aasdk_proto/BluetoothPairingResponseMessage.proto b/aasdk_proto/BluetoothPairingResponseMessage.proto index 6045a83..5d57e05 100644 --- a/aasdk_proto/BluetoothPairingResponseMessage.proto +++ b/aasdk_proto/BluetoothPairingResponseMessage.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "BluetoothPairingStatusEnum.proto"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message BluetoothPairingResponse { diff --git a/aasdk_proto/BluetoothPairingStatusEnum.proto b/aasdk_proto/BluetoothPairingStatusEnum.proto index 128de52..b2e7ef8 100644 --- a/aasdk_proto/BluetoothPairingStatusEnum.proto +++ b/aasdk_proto/BluetoothPairingStatusEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message BluetoothPairingStatus { diff --git a/aasdk_proto/ButtonCodeEnum.proto b/aasdk_proto/ButtonCodeEnum.proto index 3459819..5d8203a 100644 --- a/aasdk_proto/ButtonCodeEnum.proto +++ b/aasdk_proto/ButtonCodeEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message ButtonCode { diff --git a/aasdk_proto/ButtonEventData.proto b/aasdk_proto/ButtonEventData.proto index ca158fb..8ae0367 100644 --- a/aasdk_proto/ButtonEventData.proto +++ b/aasdk_proto/ButtonEventData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message ButtonEvent { diff --git a/aasdk_proto/ButtonEventsData.proto b/aasdk_proto/ButtonEventsData.proto index 9cbbb7f..4e1fbbd 100644 --- a/aasdk_proto/ButtonEventsData.proto +++ b/aasdk_proto/ButtonEventsData.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "ButtonEventData.proto"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message ButtonEvents { diff --git a/aasdk_proto/ChannelDescriptorData.proto b/aasdk_proto/ChannelDescriptorData.proto index 447ed58..8270927 100644 --- a/aasdk_proto/ChannelDescriptorData.proto +++ b/aasdk_proto/ChannelDescriptorData.proto @@ -30,7 +30,7 @@ import "VendorExtensionChannelData.proto"; import "MediaChannelData.proto"; import "WifiChannelData.proto"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message ChannelDescriptor { diff --git a/aasdk_proto/ChannelOpenRequestMessage.proto b/aasdk_proto/ChannelOpenRequestMessage.proto index 18c42a3..ff350cb 100644 --- a/aasdk_proto/ChannelOpenRequestMessage.proto +++ b/aasdk_proto/ChannelOpenRequestMessage.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message ChannelOpenRequest { diff --git a/aasdk_proto/ChannelOpenResponseMessage.proto b/aasdk_proto/ChannelOpenResponseMessage.proto index 0b0ece9..d4f793c 100644 --- a/aasdk_proto/ChannelOpenResponseMessage.proto +++ b/aasdk_proto/ChannelOpenResponseMessage.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "StatusEnum.proto"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message ChannelOpenResponse { diff --git a/aasdk_proto/CompassData.proto b/aasdk_proto/CompassData.proto index 73af7fa..931b3ae 100644 --- a/aasdk_proto/CompassData.proto +++ b/aasdk_proto/CompassData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message Compass { diff --git a/aasdk_proto/ControlMessageIdsEnum.proto b/aasdk_proto/ControlMessageIdsEnum.proto index 76fe538..258ec18 100644 --- a/aasdk_proto/ControlMessageIdsEnum.proto +++ b/aasdk_proto/ControlMessageIdsEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.ids; +package aasdk.proto.ids; message ControlMessage { diff --git a/aasdk_proto/DiagnosticsData.proto b/aasdk_proto/DiagnosticsData.proto index 5b7e339..36a146a 100644 --- a/aasdk_proto/DiagnosticsData.proto +++ b/aasdk_proto/DiagnosticsData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message Diagnostics { diff --git a/aasdk_proto/DoorData.proto b/aasdk_proto/DoorData.proto index 3c138d5..7522147 100644 --- a/aasdk_proto/DoorData.proto +++ b/aasdk_proto/DoorData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message Door { diff --git a/aasdk_proto/DrivingStatusData.proto b/aasdk_proto/DrivingStatusData.proto index 57d24bb..417d6f5 100644 --- a/aasdk_proto/DrivingStatusData.proto +++ b/aasdk_proto/DrivingStatusData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message DrivingStatus { diff --git a/aasdk_proto/DrivingStatusEnum.proto b/aasdk_proto/DrivingStatusEnum.proto index 4af8e3b..12e6296 100644 --- a/aasdk_proto/DrivingStatusEnum.proto +++ b/aasdk_proto/DrivingStatusEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message DrivingStatus { diff --git a/aasdk_proto/EnvironmentData.proto b/aasdk_proto/EnvironmentData.proto index 7c49d70..27f08b8 100644 --- a/aasdk_proto/EnvironmentData.proto +++ b/aasdk_proto/EnvironmentData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message Environment { diff --git a/aasdk_proto/FuelLevelData.proto b/aasdk_proto/FuelLevelData.proto index 0eb1269..ace8c4c 100644 --- a/aasdk_proto/FuelLevelData.proto +++ b/aasdk_proto/FuelLevelData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message FuelLevel { diff --git a/aasdk_proto/GPSLocationData.proto b/aasdk_proto/GPSLocationData.proto index d1756d6..0fb1723 100644 --- a/aasdk_proto/GPSLocationData.proto +++ b/aasdk_proto/GPSLocationData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message GPSLocation { diff --git a/aasdk_proto/GearData.proto b/aasdk_proto/GearData.proto index a98463c..8804724 100644 --- a/aasdk_proto/GearData.proto +++ b/aasdk_proto/GearData.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "GearEnum.proto"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message Gear { diff --git a/aasdk_proto/GearEnum.proto b/aasdk_proto/GearEnum.proto index 6e61149..0c805fc 100644 --- a/aasdk_proto/GearEnum.proto +++ b/aasdk_proto/GearEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message Gear { diff --git a/aasdk_proto/GyroData.proto b/aasdk_proto/GyroData.proto index eb82122..1704675 100644 --- a/aasdk_proto/GyroData.proto +++ b/aasdk_proto/GyroData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message Gyro { diff --git a/aasdk_proto/HVACData.proto b/aasdk_proto/HVACData.proto index d8f7384..e193352 100644 --- a/aasdk_proto/HVACData.proto +++ b/aasdk_proto/HVACData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message HVAC { diff --git a/aasdk_proto/HeadlightStatusEnum.proto b/aasdk_proto/HeadlightStatusEnum.proto index 7130293..b2879e1 100644 --- a/aasdk_proto/HeadlightStatusEnum.proto +++ b/aasdk_proto/HeadlightStatusEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message HeadlightStatus { diff --git a/aasdk_proto/IndicatorStatusEnum.proto b/aasdk_proto/IndicatorStatusEnum.proto index 14eb37e..fe0b7f1 100644 --- a/aasdk_proto/IndicatorStatusEnum.proto +++ b/aasdk_proto/IndicatorStatusEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message IndicatorStatus { diff --git a/aasdk_proto/InputChannelData.proto b/aasdk_proto/InputChannelData.proto index e5888a5..d4cf8fd 100644 --- a/aasdk_proto/InputChannelData.proto +++ b/aasdk_proto/InputChannelData.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "TouchConfigData.proto"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message InputChannel { diff --git a/aasdk_proto/InputChannelMessageIdsEnum.proto b/aasdk_proto/InputChannelMessageIdsEnum.proto index c507f15..bb9f82a 100644 --- a/aasdk_proto/InputChannelMessageIdsEnum.proto +++ b/aasdk_proto/InputChannelMessageIdsEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.ids; +package aasdk.proto.ids; message InputChannelMessage { diff --git a/aasdk_proto/InputEventIndicationMessage.proto b/aasdk_proto/InputEventIndicationMessage.proto index 9201bb1..61fc8b1 100644 --- a/aasdk_proto/InputEventIndicationMessage.proto +++ b/aasdk_proto/InputEventIndicationMessage.proto @@ -23,7 +23,7 @@ import "ButtonEventsData.proto"; import "AbsoluteInputEventsData.proto"; import "RelativeInputEventsData.proto"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message InputEventIndication { diff --git a/aasdk_proto/LightData.proto b/aasdk_proto/LightData.proto index def2e01..29ddf87 100644 --- a/aasdk_proto/LightData.proto +++ b/aasdk_proto/LightData.proto @@ -21,7 +21,7 @@ syntax="proto2"; import "HeadlightStatusEnum.proto"; import "IndicatorStatusEnum.proto"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message Light { diff --git a/aasdk_proto/MediaChannelData.proto b/aasdk_proto/MediaChannelData.proto index a2b21b3..5680a04 100644 --- a/aasdk_proto/MediaChannelData.proto +++ b/aasdk_proto/MediaChannelData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message MediaInfoChannel { diff --git a/aasdk_proto/NavigationChannelData.proto b/aasdk_proto/NavigationChannelData.proto index fb59f7d..8aa7b72 100644 --- a/aasdk_proto/NavigationChannelData.proto +++ b/aasdk_proto/NavigationChannelData.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "NavigationImageOptionsData.proto"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message NavigationChannel { diff --git a/aasdk_proto/NavigationFocusRequestMessage.proto b/aasdk_proto/NavigationFocusRequestMessage.proto index 596506d..efa52d0 100644 --- a/aasdk_proto/NavigationFocusRequestMessage.proto +++ b/aasdk_proto/NavigationFocusRequestMessage.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message NavigationFocusRequest { diff --git a/aasdk_proto/NavigationFocusResponseMessage.proto b/aasdk_proto/NavigationFocusResponseMessage.proto index 5e5d72f..1af85ba 100644 --- a/aasdk_proto/NavigationFocusResponseMessage.proto +++ b/aasdk_proto/NavigationFocusResponseMessage.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message NavigationFocusResponse { diff --git a/aasdk_proto/NavigationImageOptionsData.proto b/aasdk_proto/NavigationImageOptionsData.proto index eb902a6..6ac76c7 100644 --- a/aasdk_proto/NavigationImageOptionsData.proto +++ b/aasdk_proto/NavigationImageOptionsData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message NavigationImageOptions { diff --git a/aasdk_proto/NightModeData.proto b/aasdk_proto/NightModeData.proto index 204c476..8270630 100644 --- a/aasdk_proto/NightModeData.proto +++ b/aasdk_proto/NightModeData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message NightMode { diff --git a/aasdk_proto/OdometerData.proto b/aasdk_proto/OdometerData.proto index 286666d..fb9ee01 100644 --- a/aasdk_proto/OdometerData.proto +++ b/aasdk_proto/OdometerData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message Odometer { diff --git a/aasdk_proto/ParkingBrakeData.proto b/aasdk_proto/ParkingBrakeData.proto index f02f7ab..154f64e 100644 --- a/aasdk_proto/ParkingBrakeData.proto +++ b/aasdk_proto/ParkingBrakeData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message ParkingBrake { diff --git a/aasdk_proto/PassengerData.proto b/aasdk_proto/PassengerData.proto index e53232b..f439563 100644 --- a/aasdk_proto/PassengerData.proto +++ b/aasdk_proto/PassengerData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message Passenger { diff --git a/aasdk_proto/PingRequestMessage.proto b/aasdk_proto/PingRequestMessage.proto index 5a9a017..ce7f0ea 100644 --- a/aasdk_proto/PingRequestMessage.proto +++ b/aasdk_proto/PingRequestMessage.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message PingRequest { diff --git a/aasdk_proto/PingResponseMessage.proto b/aasdk_proto/PingResponseMessage.proto index c511c42..3871b62 100644 --- a/aasdk_proto/PingResponseMessage.proto +++ b/aasdk_proto/PingResponseMessage.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message PingResponse { diff --git a/aasdk_proto/RPMData.proto b/aasdk_proto/RPMData.proto index c866180..b24ffdc 100644 --- a/aasdk_proto/RPMData.proto +++ b/aasdk_proto/RPMData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message RPM { diff --git a/aasdk_proto/RelativeInputEventData.proto b/aasdk_proto/RelativeInputEventData.proto index 2b751a9..5b4d8a7 100644 --- a/aasdk_proto/RelativeInputEventData.proto +++ b/aasdk_proto/RelativeInputEventData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message RelativeInputEvent { diff --git a/aasdk_proto/RelativeInputEventsData.proto b/aasdk_proto/RelativeInputEventsData.proto index faf3015..97cf67a 100644 --- a/aasdk_proto/RelativeInputEventsData.proto +++ b/aasdk_proto/RelativeInputEventsData.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "RelativeInputEventData.proto"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message RelativeInputEvents { diff --git a/aasdk_proto/SensorChannelData.proto b/aasdk_proto/SensorChannelData.proto index 837738d..7491635 100644 --- a/aasdk_proto/SensorChannelData.proto +++ b/aasdk_proto/SensorChannelData.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "SensorData.proto"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message SensorChannel { diff --git a/aasdk_proto/SensorChannelMessageIdsEnum.proto b/aasdk_proto/SensorChannelMessageIdsEnum.proto index e68d10a..71cfd69 100644 --- a/aasdk_proto/SensorChannelMessageIdsEnum.proto +++ b/aasdk_proto/SensorChannelMessageIdsEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.ids; +package aasdk.proto.ids; message SensorChannelMessage { diff --git a/aasdk_proto/SensorData.proto b/aasdk_proto/SensorData.proto index f6ac56a..943676b 100644 --- a/aasdk_proto/SensorData.proto +++ b/aasdk_proto/SensorData.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "SensorTypeEnum.proto"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message Sensor { diff --git a/aasdk_proto/SensorEventIndicationMessage.proto b/aasdk_proto/SensorEventIndicationMessage.proto index 00d4648..7fc16bf 100644 --- a/aasdk_proto/SensorEventIndicationMessage.proto +++ b/aasdk_proto/SensorEventIndicationMessage.proto @@ -38,7 +38,7 @@ import "LightData.proto"; import "AccelData.proto"; import "GyroData.proto"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message SensorEventIndication { diff --git a/aasdk_proto/SensorStartRequestMessage.proto b/aasdk_proto/SensorStartRequestMessage.proto index 5ebfdc6..d1181ff 100644 --- a/aasdk_proto/SensorStartRequestMessage.proto +++ b/aasdk_proto/SensorStartRequestMessage.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "SensorTypeEnum.proto"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message SensorStartRequestMessage { diff --git a/aasdk_proto/SensorStartResponseMessage.proto b/aasdk_proto/SensorStartResponseMessage.proto index e487d79..e841892 100644 --- a/aasdk_proto/SensorStartResponseMessage.proto +++ b/aasdk_proto/SensorStartResponseMessage.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "StatusEnum.proto"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message SensorStartResponseMessage { diff --git a/aasdk_proto/SensorTypeEnum.proto b/aasdk_proto/SensorTypeEnum.proto index 85a5e6e..93bc27e 100644 --- a/aasdk_proto/SensorTypeEnum.proto +++ b/aasdk_proto/SensorTypeEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message SensorType { diff --git a/aasdk_proto/ServiceDiscoveryRequestMessage.proto b/aasdk_proto/ServiceDiscoveryRequestMessage.proto index 05e61b9..6fde863 100644 --- a/aasdk_proto/ServiceDiscoveryRequestMessage.proto +++ b/aasdk_proto/ServiceDiscoveryRequestMessage.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message ServiceDiscoveryRequest { diff --git a/aasdk_proto/ServiceDiscoveryResponseMessage.proto b/aasdk_proto/ServiceDiscoveryResponseMessage.proto index 59e6944..a5d7689 100644 --- a/aasdk_proto/ServiceDiscoveryResponseMessage.proto +++ b/aasdk_proto/ServiceDiscoveryResponseMessage.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "ChannelDescriptorData.proto"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message ServiceDiscoveryResponse { diff --git a/aasdk_proto/ShutdownReasonEnum.proto b/aasdk_proto/ShutdownReasonEnum.proto index c309b44..adbc31c 100644 --- a/aasdk_proto/ShutdownReasonEnum.proto +++ b/aasdk_proto/ShutdownReasonEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message ShutdownReason { diff --git a/aasdk_proto/ShutdownRequestMessage.proto b/aasdk_proto/ShutdownRequestMessage.proto index a9a9484..595e303 100644 --- a/aasdk_proto/ShutdownRequestMessage.proto +++ b/aasdk_proto/ShutdownRequestMessage.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "ShutdownReasonEnum.proto"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message ShutdownRequest { diff --git a/aasdk_proto/ShutdownResponseMessage.proto b/aasdk_proto/ShutdownResponseMessage.proto index b13fb24..240f980 100644 --- a/aasdk_proto/ShutdownResponseMessage.proto +++ b/aasdk_proto/ShutdownResponseMessage.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message ShutdownResponse { diff --git a/aasdk_proto/SpeedData.proto b/aasdk_proto/SpeedData.proto index 007ee05..2bb4439 100644 --- a/aasdk_proto/SpeedData.proto +++ b/aasdk_proto/SpeedData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message Speed { diff --git a/aasdk_proto/StatusEnum.proto b/aasdk_proto/StatusEnum.proto index a19271a..1b61919 100644 --- a/aasdk_proto/StatusEnum.proto +++ b/aasdk_proto/StatusEnum.proto @@ -19,7 +19,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message Status { diff --git a/aasdk_proto/SteeringWheelData.proto b/aasdk_proto/SteeringWheelData.proto index f5572f3..e94078e 100644 --- a/aasdk_proto/SteeringWheelData.proto +++ b/aasdk_proto/SteeringWheelData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message SteeringWheel { diff --git a/aasdk_proto/TouchActionEnum.proto b/aasdk_proto/TouchActionEnum.proto index 7d889e1..ef14ccc 100644 --- a/aasdk_proto/TouchActionEnum.proto +++ b/aasdk_proto/TouchActionEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message TouchAction { diff --git a/aasdk_proto/TouchConfigData.proto b/aasdk_proto/TouchConfigData.proto index d001941..9944dde 100644 --- a/aasdk_proto/TouchConfigData.proto +++ b/aasdk_proto/TouchConfigData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message TouchConfig { diff --git a/aasdk_proto/TouchEventData.proto b/aasdk_proto/TouchEventData.proto index fb7b5a6..78b27a0 100644 --- a/aasdk_proto/TouchEventData.proto +++ b/aasdk_proto/TouchEventData.proto @@ -21,7 +21,7 @@ syntax="proto2"; import "TouchLocationData.proto"; import "TouchActionEnum.proto"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message TouchEvent { diff --git a/aasdk_proto/TouchLocationData.proto b/aasdk_proto/TouchLocationData.proto index 5be51fa..4041c39 100644 --- a/aasdk_proto/TouchLocationData.proto +++ b/aasdk_proto/TouchLocationData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message TouchLocation { diff --git a/aasdk_proto/VendorExtensionChannelData.proto b/aasdk_proto/VendorExtensionChannelData.proto index db46482..61c8c14 100644 --- a/aasdk_proto/VendorExtensionChannelData.proto +++ b/aasdk_proto/VendorExtensionChannelData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message VendorExtensionChannel { diff --git a/aasdk_proto/VersionResponseStatusEnum.proto b/aasdk_proto/VersionResponseStatusEnum.proto index 5ee8a43..fb4540c 100644 --- a/aasdk_proto/VersionResponseStatusEnum.proto +++ b/aasdk_proto/VersionResponseStatusEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message VersionResponseStatus { diff --git a/aasdk_proto/VideoConfigData.proto b/aasdk_proto/VideoConfigData.proto index ceb2bf2..c951fda 100644 --- a/aasdk_proto/VideoConfigData.proto +++ b/aasdk_proto/VideoConfigData.proto @@ -21,7 +21,7 @@ syntax="proto2"; import "VideoResolutionEnum.proto"; import "VideoFPSEnum.proto"; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message VideoConfig { diff --git a/aasdk_proto/VideoFPSEnum.proto b/aasdk_proto/VideoFPSEnum.proto index 44b0d1d..4ca91de 100644 --- a/aasdk_proto/VideoFPSEnum.proto +++ b/aasdk_proto/VideoFPSEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message VideoFPS { diff --git a/aasdk_proto/VideoFocusIndicationMessage.proto b/aasdk_proto/VideoFocusIndicationMessage.proto index 9729db9..01314bc 100644 --- a/aasdk_proto/VideoFocusIndicationMessage.proto +++ b/aasdk_proto/VideoFocusIndicationMessage.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "VideoFocusModeEnum.proto"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message VideoFocusIndication { diff --git a/aasdk_proto/VideoFocusModeEnum.proto b/aasdk_proto/VideoFocusModeEnum.proto index 211e4e7..dc6250e 100644 --- a/aasdk_proto/VideoFocusModeEnum.proto +++ b/aasdk_proto/VideoFocusModeEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message VideoFocusMode { diff --git a/aasdk_proto/VideoFocusReasonEnum.proto b/aasdk_proto/VideoFocusReasonEnum.proto index 0cfed3e..f42bab5 100644 --- a/aasdk_proto/VideoFocusReasonEnum.proto +++ b/aasdk_proto/VideoFocusReasonEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message VideoFocusReason { diff --git a/aasdk_proto/VideoFocusRequestMessage.proto b/aasdk_proto/VideoFocusRequestMessage.proto index db52a52..a8b1bc6 100644 --- a/aasdk_proto/VideoFocusRequestMessage.proto +++ b/aasdk_proto/VideoFocusRequestMessage.proto @@ -21,7 +21,7 @@ syntax="proto2"; import "VideoFocusModeEnum.proto"; import "VideoFocusReasonEnum.proto"; -package f1x.aasdk.proto.messages; +package aasdk.proto.messages; message VideoFocusRequest { diff --git a/aasdk_proto/VideoResolutionEnum.proto b/aasdk_proto/VideoResolutionEnum.proto index fde8f26..32b582c 100644 --- a/aasdk_proto/VideoResolutionEnum.proto +++ b/aasdk_proto/VideoResolutionEnum.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package f1x.aasdk.proto.enums; +package aasdk.proto.enums; message VideoResolution { diff --git a/aasdk_proto/WifiChannelData.proto b/aasdk_proto/WifiChannelData.proto index b55b730..5036d33 100644 --- a/aasdk_proto/WifiChannelData.proto +++ b/aasdk_proto/WifiChannelData.proto @@ -22,7 +22,7 @@ option optimize_for=SPEED; -package f1x.aasdk.proto.data; +package aasdk.proto.data; message WifiChannel { diff --git a/include/f1x/aasdk/Channel/AV/AVInputServiceChannel.hpp b/include/aasdk/Channel/AV/AVInputServiceChannel.hpp similarity index 92% rename from include/f1x/aasdk/Channel/AV/AVInputServiceChannel.hpp rename to include/aasdk/Channel/AV/AVInputServiceChannel.hpp index 71b9696..d4ddb40 100644 --- a/include/f1x/aasdk/Channel/AV/AVInputServiceChannel.hpp +++ b/include/aasdk/Channel/AV/AVInputServiceChannel.hpp @@ -18,13 +18,12 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -56,4 +55,3 @@ private: } } } -} diff --git a/include/f1x/aasdk/Channel/AV/AudioServiceChannel.hpp b/include/aasdk/Channel/AV/AudioServiceChannel.hpp similarity index 93% rename from include/f1x/aasdk/Channel/AV/AudioServiceChannel.hpp rename to include/aasdk/Channel/AV/AudioServiceChannel.hpp index cbba4b3..d460a0b 100644 --- a/include/f1x/aasdk/Channel/AV/AudioServiceChannel.hpp +++ b/include/aasdk/Channel/AV/AudioServiceChannel.hpp @@ -18,12 +18,11 @@ #pragma once -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -55,4 +54,3 @@ private: } } } -} diff --git a/include/f1x/aasdk/Channel/AV/IAVInputServiceChannel.hpp b/include/aasdk/Channel/AV/IAVInputServiceChannel.hpp similarity index 89% rename from include/f1x/aasdk/Channel/AV/IAVInputServiceChannel.hpp rename to include/aasdk/Channel/AV/IAVInputServiceChannel.hpp index 14319dd..189eebb 100644 --- a/include/f1x/aasdk/Channel/AV/IAVInputServiceChannel.hpp +++ b/include/aasdk/Channel/AV/IAVInputServiceChannel.hpp @@ -22,13 +22,12 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -55,4 +54,3 @@ public: } } } -} diff --git a/include/f1x/aasdk/Channel/AV/IAVInputServiceChannelEventHandler.hpp b/include/aasdk/Channel/AV/IAVInputServiceChannelEventHandler.hpp similarity index 96% rename from include/f1x/aasdk/Channel/AV/IAVInputServiceChannelEventHandler.hpp rename to include/aasdk/Channel/AV/IAVInputServiceChannelEventHandler.hpp index 8cd1b2d..7f47de0 100644 --- a/include/f1x/aasdk/Channel/AV/IAVInputServiceChannelEventHandler.hpp +++ b/include/aasdk/Channel/AV/IAVInputServiceChannelEventHandler.hpp @@ -22,10 +22,9 @@ #include #include #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -51,4 +50,3 @@ public: } } } -} diff --git a/include/f1x/aasdk/Channel/AV/IAudioServiceChannel.hpp b/include/aasdk/Channel/AV/IAudioServiceChannel.hpp similarity index 90% rename from include/f1x/aasdk/Channel/AV/IAudioServiceChannel.hpp rename to include/aasdk/Channel/AV/IAudioServiceChannel.hpp index 99ad132..7e42a32 100644 --- a/include/f1x/aasdk/Channel/AV/IAudioServiceChannel.hpp +++ b/include/aasdk/Channel/AV/IAudioServiceChannel.hpp @@ -22,12 +22,11 @@ #include #include #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -53,4 +52,3 @@ public: } } } -} diff --git a/include/f1x/aasdk/Channel/AV/IAudioServiceChannelEventHandler.hpp b/include/aasdk/Channel/AV/IAudioServiceChannelEventHandler.hpp similarity index 93% rename from include/f1x/aasdk/Channel/AV/IAudioServiceChannelEventHandler.hpp rename to include/aasdk/Channel/AV/IAudioServiceChannelEventHandler.hpp index 48cd87c..c633ff8 100644 --- a/include/f1x/aasdk/Channel/AV/IAudioServiceChannelEventHandler.hpp +++ b/include/aasdk/Channel/AV/IAudioServiceChannelEventHandler.hpp @@ -23,12 +23,11 @@ #include #include #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -56,4 +55,3 @@ public: } } } -} diff --git a/include/f1x/aasdk/Channel/AV/IVideoServiceChannel.hpp b/include/aasdk/Channel/AV/IVideoServiceChannel.hpp similarity index 91% rename from include/f1x/aasdk/Channel/AV/IVideoServiceChannel.hpp rename to include/aasdk/Channel/AV/IVideoServiceChannel.hpp index 3bc1c23..c0d6d68 100644 --- a/include/f1x/aasdk/Channel/AV/IVideoServiceChannel.hpp +++ b/include/aasdk/Channel/AV/IVideoServiceChannel.hpp @@ -23,12 +23,11 @@ #include #include #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -55,4 +54,3 @@ public: } } } -} diff --git a/include/f1x/aasdk/Channel/AV/IVideoServiceChannelEventHandler.hpp b/include/aasdk/Channel/AV/IVideoServiceChannelEventHandler.hpp similarity index 93% rename from include/f1x/aasdk/Channel/AV/IVideoServiceChannelEventHandler.hpp rename to include/aasdk/Channel/AV/IVideoServiceChannelEventHandler.hpp index 4599463..0ff91eb 100644 --- a/include/f1x/aasdk/Channel/AV/IVideoServiceChannelEventHandler.hpp +++ b/include/aasdk/Channel/AV/IVideoServiceChannelEventHandler.hpp @@ -23,12 +23,11 @@ #include #include #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -57,4 +56,3 @@ public: } } } -} diff --git a/include/f1x/aasdk/Channel/AV/MediaAudioServiceChannel.hpp b/include/aasdk/Channel/AV/MediaAudioServiceChannel.hpp similarity index 93% rename from include/f1x/aasdk/Channel/AV/MediaAudioServiceChannel.hpp rename to include/aasdk/Channel/AV/MediaAudioServiceChannel.hpp index e844143..3dd1af4 100644 --- a/include/f1x/aasdk/Channel/AV/MediaAudioServiceChannel.hpp +++ b/include/aasdk/Channel/AV/MediaAudioServiceChannel.hpp @@ -18,10 +18,9 @@ #pragma once -#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -38,4 +37,3 @@ public: } } } -} diff --git a/include/f1x/aasdk/Channel/AV/SpeechAudioServiceChannel.hpp b/include/aasdk/Channel/AV/SpeechAudioServiceChannel.hpp similarity index 93% rename from include/f1x/aasdk/Channel/AV/SpeechAudioServiceChannel.hpp rename to include/aasdk/Channel/AV/SpeechAudioServiceChannel.hpp index b786960..70b88ba 100644 --- a/include/f1x/aasdk/Channel/AV/SpeechAudioServiceChannel.hpp +++ b/include/aasdk/Channel/AV/SpeechAudioServiceChannel.hpp @@ -18,10 +18,9 @@ #pragma once -#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -38,4 +37,3 @@ public: } } } -} diff --git a/include/f1x/aasdk/Channel/AV/SystemAudioServiceChannel.hpp b/include/aasdk/Channel/AV/SystemAudioServiceChannel.hpp similarity index 93% rename from include/f1x/aasdk/Channel/AV/SystemAudioServiceChannel.hpp rename to include/aasdk/Channel/AV/SystemAudioServiceChannel.hpp index 4eca9ba..f7b98fe 100644 --- a/include/f1x/aasdk/Channel/AV/SystemAudioServiceChannel.hpp +++ b/include/aasdk/Channel/AV/SystemAudioServiceChannel.hpp @@ -18,10 +18,9 @@ #pragma once -#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -38,4 +37,3 @@ public: } } } -} diff --git a/include/f1x/aasdk/Channel/AV/VideoServiceChannel.hpp b/include/aasdk/Channel/AV/VideoServiceChannel.hpp similarity index 95% rename from include/f1x/aasdk/Channel/AV/VideoServiceChannel.hpp rename to include/aasdk/Channel/AV/VideoServiceChannel.hpp index 7afdbbb..4255705 100644 --- a/include/f1x/aasdk/Channel/AV/VideoServiceChannel.hpp +++ b/include/aasdk/Channel/AV/VideoServiceChannel.hpp @@ -18,11 +18,10 @@ #pragma once -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -56,4 +55,3 @@ private: } } } -} diff --git a/include/f1x/aasdk/Channel/Bluetooth/BluetoothServiceChannel.hpp b/include/aasdk/Channel/Bluetooth/BluetoothServiceChannel.hpp similarity index 93% rename from include/f1x/aasdk/Channel/Bluetooth/BluetoothServiceChannel.hpp rename to include/aasdk/Channel/Bluetooth/BluetoothServiceChannel.hpp index ac714f4..3f2eb24 100644 --- a/include/f1x/aasdk/Channel/Bluetooth/BluetoothServiceChannel.hpp +++ b/include/aasdk/Channel/Bluetooth/BluetoothServiceChannel.hpp @@ -18,11 +18,10 @@ #pragma once -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -50,4 +49,3 @@ private: } } } -} diff --git a/include/f1x/aasdk/Channel/Bluetooth/IBluetoothServiceChannel.hpp b/include/aasdk/Channel/Bluetooth/IBluetoothServiceChannel.hpp similarity index 89% rename from include/f1x/aasdk/Channel/Bluetooth/IBluetoothServiceChannel.hpp rename to include/aasdk/Channel/Bluetooth/IBluetoothServiceChannel.hpp index 3f64c8a..6e21fff 100644 --- a/include/f1x/aasdk/Channel/Bluetooth/IBluetoothServiceChannel.hpp +++ b/include/aasdk/Channel/Bluetooth/IBluetoothServiceChannel.hpp @@ -21,12 +21,11 @@ #include #include #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -51,4 +50,3 @@ public: } } } -} diff --git a/include/f1x/aasdk/Channel/Bluetooth/IBluetoothServiceChannelEventHandler.hpp b/include/aasdk/Channel/Bluetooth/IBluetoothServiceChannelEventHandler.hpp similarity index 96% rename from include/f1x/aasdk/Channel/Bluetooth/IBluetoothServiceChannelEventHandler.hpp rename to include/aasdk/Channel/Bluetooth/IBluetoothServiceChannelEventHandler.hpp index 207042f..956e66d 100644 --- a/include/f1x/aasdk/Channel/Bluetooth/IBluetoothServiceChannelEventHandler.hpp +++ b/include/aasdk/Channel/Bluetooth/IBluetoothServiceChannelEventHandler.hpp @@ -20,10 +20,9 @@ #include #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -47,4 +46,3 @@ public: } } } -} diff --git a/include/f1x/aasdk/Channel/Control/ControlServiceChannel.hpp b/include/aasdk/Channel/Control/ControlServiceChannel.hpp similarity index 95% rename from include/f1x/aasdk/Channel/Control/ControlServiceChannel.hpp rename to include/aasdk/Channel/Control/ControlServiceChannel.hpp index fbe7db2..434fa2d 100644 --- a/include/f1x/aasdk/Channel/Control/ControlServiceChannel.hpp +++ b/include/aasdk/Channel/Control/ControlServiceChannel.hpp @@ -19,12 +19,11 @@ #pragma once #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -65,4 +64,3 @@ private: } } } -} diff --git a/include/f1x/aasdk/Channel/Control/IControlServiceChannel.hpp b/include/aasdk/Channel/Control/IControlServiceChannel.hpp similarity index 93% rename from include/f1x/aasdk/Channel/Control/IControlServiceChannel.hpp rename to include/aasdk/Channel/Control/IControlServiceChannel.hpp index 518533b..3a93a74 100644 --- a/include/f1x/aasdk/Channel/Control/IControlServiceChannel.hpp +++ b/include/aasdk/Channel/Control/IControlServiceChannel.hpp @@ -26,12 +26,11 @@ #include #include #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -63,4 +62,3 @@ public: } } } -} diff --git a/include/f1x/aasdk/Channel/Control/IControlServiceChannelEventHandler.hpp b/include/aasdk/Channel/Control/IControlServiceChannelEventHandler.hpp similarity index 96% rename from include/f1x/aasdk/Channel/Control/IControlServiceChannelEventHandler.hpp rename to include/aasdk/Channel/Control/IControlServiceChannelEventHandler.hpp index f8b82cc..098c8e9 100644 --- a/include/f1x/aasdk/Channel/Control/IControlServiceChannelEventHandler.hpp +++ b/include/aasdk/Channel/Control/IControlServiceChannelEventHandler.hpp @@ -18,8 +18,8 @@ #pragma once -#include -#include +#include +#include #include #include #include @@ -28,8 +28,7 @@ #include #include -namespace f1x -{ + namespace aasdk { namespace channel @@ -59,4 +58,3 @@ public: } } } -} diff --git a/include/f1x/aasdk/Channel/Input/IInputServiceChannel.hpp b/include/aasdk/Channel/Input/IInputServiceChannel.hpp similarity index 90% rename from include/f1x/aasdk/Channel/Input/IInputServiceChannel.hpp rename to include/aasdk/Channel/Input/IInputServiceChannel.hpp index 8d67733..d626a88 100644 --- a/include/f1x/aasdk/Channel/Input/IInputServiceChannel.hpp +++ b/include/aasdk/Channel/Input/IInputServiceChannel.hpp @@ -23,12 +23,11 @@ #include #include #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -54,4 +53,3 @@ public: } } } -} diff --git a/include/f1x/aasdk/Channel/Input/IInputServiceChannelEventHandler.hpp b/include/aasdk/Channel/Input/IInputServiceChannelEventHandler.hpp similarity index 98% rename from include/f1x/aasdk/Channel/Input/IInputServiceChannelEventHandler.hpp rename to include/aasdk/Channel/Input/IInputServiceChannelEventHandler.hpp index acb1ecf..5a0ae7b 100644 --- a/include/f1x/aasdk/Channel/Input/IInputServiceChannelEventHandler.hpp +++ b/include/aasdk/Channel/Input/IInputServiceChannelEventHandler.hpp @@ -22,8 +22,7 @@ #include #include -namespace f1x -{ + namespace aasdk { namespace channel @@ -47,4 +46,3 @@ public: } } } -} diff --git a/include/f1x/aasdk/Channel/Input/InputServiceChannel.hpp b/include/aasdk/Channel/Input/InputServiceChannel.hpp similarity index 94% rename from include/f1x/aasdk/Channel/Input/InputServiceChannel.hpp rename to include/aasdk/Channel/Input/InputServiceChannel.hpp index dcb54c1..75706fc 100644 --- a/include/f1x/aasdk/Channel/Input/InputServiceChannel.hpp +++ b/include/aasdk/Channel/Input/InputServiceChannel.hpp @@ -18,11 +18,10 @@ #pragma once -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -51,4 +50,3 @@ private: } } } -} diff --git a/include/f1x/aasdk/Channel/Promise.hpp b/include/aasdk/Channel/Promise.hpp similarity index 89% rename from include/f1x/aasdk/Channel/Promise.hpp rename to include/aasdk/Channel/Promise.hpp index ce8a07a..dab17d4 100644 --- a/include/f1x/aasdk/Channel/Promise.hpp +++ b/include/aasdk/Channel/Promise.hpp @@ -18,11 +18,10 @@ #pragma once -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -32,4 +31,3 @@ typedef io::Promise SendPromise; } } -} diff --git a/include/f1x/aasdk/Channel/Sensor/ISensorServiceChannel.hpp b/include/aasdk/Channel/Sensor/ISensorServiceChannel.hpp similarity index 90% rename from include/f1x/aasdk/Channel/Sensor/ISensorServiceChannel.hpp rename to include/aasdk/Channel/Sensor/ISensorServiceChannel.hpp index f2ae4cb..b2a403c 100644 --- a/include/f1x/aasdk/Channel/Sensor/ISensorServiceChannel.hpp +++ b/include/aasdk/Channel/Sensor/ISensorServiceChannel.hpp @@ -19,15 +19,14 @@ #pragma once #include -#include -#include +#include +#include #include #include #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -53,4 +52,3 @@ public: } } } -} diff --git a/include/f1x/aasdk/Channel/Sensor/ISensorServiceChannelEventHandler.hpp b/include/aasdk/Channel/Sensor/ISensorServiceChannelEventHandler.hpp similarity index 96% rename from include/f1x/aasdk/Channel/Sensor/ISensorServiceChannelEventHandler.hpp rename to include/aasdk/Channel/Sensor/ISensorServiceChannelEventHandler.hpp index 4719ed3..407a1e2 100644 --- a/include/f1x/aasdk/Channel/Sensor/ISensorServiceChannelEventHandler.hpp +++ b/include/aasdk/Channel/Sensor/ISensorServiceChannelEventHandler.hpp @@ -20,10 +20,9 @@ #include #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -47,4 +46,3 @@ public: } } } -} diff --git a/include/f1x/aasdk/Channel/Sensor/SensorServiceChannel.hpp b/include/aasdk/Channel/Sensor/SensorServiceChannel.hpp similarity index 94% rename from include/f1x/aasdk/Channel/Sensor/SensorServiceChannel.hpp rename to include/aasdk/Channel/Sensor/SensorServiceChannel.hpp index 62b4f1c..c7154b3 100644 --- a/include/f1x/aasdk/Channel/Sensor/SensorServiceChannel.hpp +++ b/include/aasdk/Channel/Sensor/SensorServiceChannel.hpp @@ -18,11 +18,10 @@ #pragma once -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -51,4 +50,3 @@ private: } } } -} diff --git a/include/f1x/aasdk/Channel/ServiceChannel.hpp b/include/aasdk/Channel/ServiceChannel.hpp similarity index 92% rename from include/f1x/aasdk/Channel/ServiceChannel.hpp rename to include/aasdk/Channel/ServiceChannel.hpp index c15ea68..b24fd43 100644 --- a/include/f1x/aasdk/Channel/ServiceChannel.hpp +++ b/include/aasdk/Channel/ServiceChannel.hpp @@ -19,11 +19,10 @@ #pragma once #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -46,4 +45,3 @@ protected: } } -} diff --git a/include/f1x/aasdk/Common/Data.hpp b/include/aasdk/Common/Data.hpp similarity index 99% rename from include/f1x/aasdk/Common/Data.hpp rename to include/aasdk/Common/Data.hpp index cfe76c4..507633a 100644 --- a/include/f1x/aasdk/Common/Data.hpp +++ b/include/aasdk/Common/Data.hpp @@ -23,8 +23,7 @@ #include #include -namespace f1x -{ + namespace aasdk { namespace common @@ -84,4 +83,3 @@ std::string dump(const DataConstBuffer& buffer); } } -} diff --git a/include/f1x/aasdk/Common/Log.hpp b/include/aasdk/Common/Log.hpp similarity index 100% rename from include/f1x/aasdk/Common/Log.hpp rename to include/aasdk/Common/Log.hpp diff --git a/include/f1x/aasdk/Error/Error.hpp b/include/aasdk/Error/Error.hpp similarity index 95% rename from include/f1x/aasdk/Error/Error.hpp rename to include/aasdk/Error/Error.hpp index 22275a6..3ba441a 100644 --- a/include/f1x/aasdk/Error/Error.hpp +++ b/include/aasdk/Error/Error.hpp @@ -20,10 +20,9 @@ #include #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace error @@ -52,4 +51,3 @@ private: } } -} diff --git a/include/f1x/aasdk/Error/ErrorCode.hpp b/include/aasdk/Error/ErrorCode.hpp similarity index 99% rename from include/f1x/aasdk/Error/ErrorCode.hpp rename to include/aasdk/Error/ErrorCode.hpp index 046118c..67c5fd3 100644 --- a/include/f1x/aasdk/Error/ErrorCode.hpp +++ b/include/aasdk/Error/ErrorCode.hpp @@ -20,8 +20,7 @@ #include -namespace f1x -{ + namespace aasdk { namespace error @@ -67,4 +66,3 @@ enum class ErrorCode } } -} diff --git a/include/f1x/aasdk/IO/IOContextWrapper.hpp b/include/aasdk/IO/IOContextWrapper.hpp similarity index 98% rename from include/f1x/aasdk/IO/IOContextWrapper.hpp rename to include/aasdk/IO/IOContextWrapper.hpp index 60febfa..cf813a0 100644 --- a/include/f1x/aasdk/IO/IOContextWrapper.hpp +++ b/include/aasdk/IO/IOContextWrapper.hpp @@ -21,8 +21,7 @@ #include #include -namespace f1x -{ + namespace aasdk { namespace io @@ -70,5 +69,4 @@ private: }; } -} -} +} \ No newline at end of file diff --git a/include/f1x/aasdk/IO/Promise.hpp b/include/aasdk/IO/Promise.hpp similarity index 98% rename from include/f1x/aasdk/IO/Promise.hpp rename to include/aasdk/IO/Promise.hpp index 646b258..7ab0d94 100644 --- a/include/f1x/aasdk/IO/Promise.hpp +++ b/include/aasdk/IO/Promise.hpp @@ -21,11 +21,10 @@ #include #include #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace io @@ -358,4 +357,3 @@ private: } } -} diff --git a/include/f1x/aasdk/IO/PromiseLink.hpp b/include/aasdk/IO/PromiseLink.hpp similarity index 97% rename from include/f1x/aasdk/IO/PromiseLink.hpp rename to include/aasdk/IO/PromiseLink.hpp index 64ed03b..1bba599 100644 --- a/include/f1x/aasdk/IO/PromiseLink.hpp +++ b/include/aasdk/IO/PromiseLink.hpp @@ -20,11 +20,10 @@ #include #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace io @@ -129,4 +128,3 @@ private: } } -} diff --git a/include/f1x/aasdk/Messenger/ChannelId.hpp b/include/aasdk/Messenger/ChannelId.hpp similarity index 98% rename from include/f1x/aasdk/Messenger/ChannelId.hpp rename to include/aasdk/Messenger/ChannelId.hpp index c8fba5c..16c922f 100644 --- a/include/f1x/aasdk/Messenger/ChannelId.hpp +++ b/include/aasdk/Messenger/ChannelId.hpp @@ -20,8 +20,7 @@ #include -namespace f1x -{ + namespace aasdk { namespace messenger @@ -45,4 +44,3 @@ std::string channelIdToString(ChannelId channelId); } } -} diff --git a/include/f1x/aasdk/Messenger/ChannelReceiveMessageQueue.hpp b/include/aasdk/Messenger/ChannelReceiveMessageQueue.hpp similarity index 94% rename from include/f1x/aasdk/Messenger/ChannelReceiveMessageQueue.hpp rename to include/aasdk/Messenger/ChannelReceiveMessageQueue.hpp index a0d0ecb..3551178 100644 --- a/include/f1x/aasdk/Messenger/ChannelReceiveMessageQueue.hpp +++ b/include/aasdk/Messenger/ChannelReceiveMessageQueue.hpp @@ -20,11 +20,10 @@ #include #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -45,4 +44,3 @@ private: } } -} diff --git a/include/f1x/aasdk/Messenger/ChannelReceivePromiseQueue.hpp b/include/aasdk/Messenger/ChannelReceivePromiseQueue.hpp similarity index 95% rename from include/f1x/aasdk/Messenger/ChannelReceivePromiseQueue.hpp rename to include/aasdk/Messenger/ChannelReceivePromiseQueue.hpp index 74d3d5e..4f8df63 100644 --- a/include/f1x/aasdk/Messenger/ChannelReceivePromiseQueue.hpp +++ b/include/aasdk/Messenger/ChannelReceivePromiseQueue.hpp @@ -20,10 +20,9 @@ #include #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -46,4 +45,3 @@ private: } } -} diff --git a/include/f1x/aasdk/Messenger/Cryptor.hpp b/include/aasdk/Messenger/Cryptor.hpp similarity index 94% rename from include/f1x/aasdk/Messenger/Cryptor.hpp rename to include/aasdk/Messenger/Cryptor.hpp index 3cbf0f5..c74a135 100644 --- a/include/f1x/aasdk/Messenger/Cryptor.hpp +++ b/include/aasdk/Messenger/Cryptor.hpp @@ -19,11 +19,10 @@ #pragma once #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -64,4 +63,3 @@ private: } } -} diff --git a/include/f1x/aasdk/Messenger/EncryptionType.hpp b/include/aasdk/Messenger/EncryptionType.hpp similarity index 97% rename from include/f1x/aasdk/Messenger/EncryptionType.hpp rename to include/aasdk/Messenger/EncryptionType.hpp index 6c99c9b..2165b76 100644 --- a/include/f1x/aasdk/Messenger/EncryptionType.hpp +++ b/include/aasdk/Messenger/EncryptionType.hpp @@ -18,8 +18,7 @@ #pragma once -namespace f1x -{ + namespace aasdk { namespace messenger @@ -33,4 +32,3 @@ enum class EncryptionType } } -} diff --git a/include/f1x/aasdk/Messenger/FrameHeader.hpp b/include/aasdk/Messenger/FrameHeader.hpp similarity index 84% rename from include/f1x/aasdk/Messenger/FrameHeader.hpp rename to include/aasdk/Messenger/FrameHeader.hpp index 2e1aaac..75fe34e 100644 --- a/include/f1x/aasdk/Messenger/FrameHeader.hpp +++ b/include/aasdk/Messenger/FrameHeader.hpp @@ -18,14 +18,13 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -54,4 +53,3 @@ private: } } -} diff --git a/include/f1x/aasdk/Messenger/FrameSize.hpp b/include/aasdk/Messenger/FrameSize.hpp similarity index 91% rename from include/f1x/aasdk/Messenger/FrameSize.hpp rename to include/aasdk/Messenger/FrameSize.hpp index affa1fb..d779819 100644 --- a/include/f1x/aasdk/Messenger/FrameSize.hpp +++ b/include/aasdk/Messenger/FrameSize.hpp @@ -18,11 +18,10 @@ #pragma once -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -48,4 +47,3 @@ private: } } -} diff --git a/include/f1x/aasdk/Messenger/FrameSizeType.hpp b/include/aasdk/Messenger/FrameSizeType.hpp similarity index 97% rename from include/f1x/aasdk/Messenger/FrameSizeType.hpp rename to include/aasdk/Messenger/FrameSizeType.hpp index 1a0d85f..c74b524 100644 --- a/include/f1x/aasdk/Messenger/FrameSizeType.hpp +++ b/include/aasdk/Messenger/FrameSizeType.hpp @@ -18,8 +18,7 @@ #pragma once -namespace f1x -{ + namespace aasdk { namespace messenger @@ -33,4 +32,3 @@ enum class FrameSizeType } } -} diff --git a/include/f1x/aasdk/Messenger/FrameType.hpp b/include/aasdk/Messenger/FrameType.hpp similarity index 98% rename from include/f1x/aasdk/Messenger/FrameType.hpp rename to include/aasdk/Messenger/FrameType.hpp index fba5777..06e2d01 100644 --- a/include/f1x/aasdk/Messenger/FrameType.hpp +++ b/include/aasdk/Messenger/FrameType.hpp @@ -20,8 +20,7 @@ #include -namespace f1x -{ + namespace aasdk { namespace messenger @@ -37,4 +36,3 @@ enum class FrameType } } -} diff --git a/include/f1x/aasdk/Messenger/ICryptor.hpp b/include/aasdk/Messenger/ICryptor.hpp similarity index 96% rename from include/f1x/aasdk/Messenger/ICryptor.hpp rename to include/aasdk/Messenger/ICryptor.hpp index fc60946..eb52f79 100644 --- a/include/f1x/aasdk/Messenger/ICryptor.hpp +++ b/include/aasdk/Messenger/ICryptor.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -48,4 +47,3 @@ public: } } -} diff --git a/include/f1x/aasdk/Messenger/IMessageInStream.hpp b/include/aasdk/Messenger/IMessageInStream.hpp similarity index 94% rename from include/f1x/aasdk/Messenger/IMessageInStream.hpp rename to include/aasdk/Messenger/IMessageInStream.hpp index dc49c05..0d9e798 100644 --- a/include/f1x/aasdk/Messenger/IMessageInStream.hpp +++ b/include/aasdk/Messenger/IMessageInStream.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -41,4 +40,3 @@ public: } } -} diff --git a/include/f1x/aasdk/Messenger/IMessageOutStream.hpp b/include/aasdk/Messenger/IMessageOutStream.hpp similarity index 87% rename from include/f1x/aasdk/Messenger/IMessageOutStream.hpp rename to include/aasdk/Messenger/IMessageOutStream.hpp index 88813a7..6db1437 100644 --- a/include/f1x/aasdk/Messenger/IMessageOutStream.hpp +++ b/include/aasdk/Messenger/IMessageOutStream.hpp @@ -18,12 +18,11 @@ #pragma once -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -42,4 +41,3 @@ public: } } -} diff --git a/include/f1x/aasdk/Messenger/IMessenger.hpp b/include/aasdk/Messenger/IMessenger.hpp similarity index 88% rename from include/f1x/aasdk/Messenger/IMessenger.hpp rename to include/aasdk/Messenger/IMessenger.hpp index 856e2bd..1f1236d 100644 --- a/include/f1x/aasdk/Messenger/IMessenger.hpp +++ b/include/aasdk/Messenger/IMessenger.hpp @@ -20,12 +20,11 @@ #include #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -46,4 +45,3 @@ public: } } -} diff --git a/include/f1x/aasdk/Messenger/Message.hpp b/include/aasdk/Messenger/Message.hpp similarity index 87% rename from include/f1x/aasdk/Messenger/Message.hpp rename to include/aasdk/Messenger/Message.hpp index 55a2de5..a17b5a6 100644 --- a/include/f1x/aasdk/Messenger/Message.hpp +++ b/include/aasdk/Messenger/Message.hpp @@ -21,14 +21,13 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -63,4 +62,3 @@ private: } } -} diff --git a/include/f1x/aasdk/Messenger/MessageId.hpp b/include/aasdk/Messenger/MessageId.hpp similarity index 89% rename from include/f1x/aasdk/Messenger/MessageId.hpp rename to include/aasdk/Messenger/MessageId.hpp index b61ccda..889d2c2 100644 --- a/include/f1x/aasdk/Messenger/MessageId.hpp +++ b/include/aasdk/Messenger/MessageId.hpp @@ -18,10 +18,9 @@ #pragma once -#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -48,8 +47,7 @@ private: uint16_t id_; }; -std::ostream& operator<<(std::ostream& stream, const f1x::aasdk::messenger::MessageId& messageId); +std::ostream& operator<<(std::ostream& stream, const aasdk::messenger::MessageId& messageId); } } -} diff --git a/include/f1x/aasdk/Messenger/MessageInStream.hpp b/include/aasdk/Messenger/MessageInStream.hpp similarity index 85% rename from include/f1x/aasdk/Messenger/MessageInStream.hpp rename to include/aasdk/Messenger/MessageInStream.hpp index 2d40466..29e9c44 100644 --- a/include/f1x/aasdk/Messenger/MessageInStream.hpp +++ b/include/aasdk/Messenger/MessageInStream.hpp @@ -19,15 +19,14 @@ #pragma once #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -58,4 +57,3 @@ private: } } -} diff --git a/include/f1x/aasdk/Messenger/MessageOutStream.hpp b/include/aasdk/Messenger/MessageOutStream.hpp similarity index 87% rename from include/f1x/aasdk/Messenger/MessageOutStream.hpp rename to include/aasdk/Messenger/MessageOutStream.hpp index 028839a..755ea14 100644 --- a/include/f1x/aasdk/Messenger/MessageOutStream.hpp +++ b/include/aasdk/Messenger/MessageOutStream.hpp @@ -18,15 +18,14 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -62,4 +61,3 @@ private: } } -} diff --git a/include/f1x/aasdk/Messenger/MessageType.hpp b/include/aasdk/Messenger/MessageType.hpp similarity index 98% rename from include/f1x/aasdk/Messenger/MessageType.hpp rename to include/aasdk/Messenger/MessageType.hpp index 76d5842..73594c9 100644 --- a/include/f1x/aasdk/Messenger/MessageType.hpp +++ b/include/aasdk/Messenger/MessageType.hpp @@ -22,8 +22,7 @@ #include -namespace f1x -{ + namespace aasdk { namespace messenger @@ -37,4 +36,3 @@ enum class MessageType } } -} diff --git a/include/f1x/aasdk/Messenger/Messenger.hpp b/include/aasdk/Messenger/Messenger.hpp similarity index 87% rename from include/f1x/aasdk/Messenger/Messenger.hpp rename to include/aasdk/Messenger/Messenger.hpp index f922774..6956320 100644 --- a/include/f1x/aasdk/Messenger/Messenger.hpp +++ b/include/aasdk/Messenger/Messenger.hpp @@ -20,14 +20,13 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -62,4 +61,3 @@ private: } } -} diff --git a/include/f1x/aasdk/Messenger/Promise.hpp b/include/aasdk/Messenger/Promise.hpp similarity index 90% rename from include/f1x/aasdk/Messenger/Promise.hpp rename to include/aasdk/Messenger/Promise.hpp index 8afd9f2..79222eb 100644 --- a/include/f1x/aasdk/Messenger/Promise.hpp +++ b/include/aasdk/Messenger/Promise.hpp @@ -18,11 +18,10 @@ #pragma once -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -33,4 +32,3 @@ typedef io::Promise SendPromise; } } -} diff --git a/include/f1x/aasdk/Messenger/Timestamp.hpp b/include/aasdk/Messenger/Timestamp.hpp similarity index 94% rename from include/f1x/aasdk/Messenger/Timestamp.hpp rename to include/aasdk/Messenger/Timestamp.hpp index 046f40e..994ec16 100644 --- a/include/f1x/aasdk/Messenger/Timestamp.hpp +++ b/include/aasdk/Messenger/Timestamp.hpp @@ -18,10 +18,9 @@ #pragma once -#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -44,4 +43,3 @@ private: } } -} diff --git a/include/f1x/aasdk/TCP/ITCPEndpoint.hpp b/include/aasdk/TCP/ITCPEndpoint.hpp similarity index 93% rename from include/f1x/aasdk/TCP/ITCPEndpoint.hpp rename to include/aasdk/TCP/ITCPEndpoint.hpp index 61b47b1..b196c9d 100644 --- a/include/f1x/aasdk/TCP/ITCPEndpoint.hpp +++ b/include/aasdk/TCP/ITCPEndpoint.hpp @@ -19,11 +19,10 @@ #pragma once #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace tcp @@ -45,4 +44,3 @@ public: } } -} diff --git a/include/f1x/aasdk/TCP/ITCPWrapper.hpp b/include/aasdk/TCP/ITCPWrapper.hpp similarity index 96% rename from include/f1x/aasdk/TCP/ITCPWrapper.hpp rename to include/aasdk/TCP/ITCPWrapper.hpp index 1accba4..82d8914 100644 --- a/include/f1x/aasdk/TCP/ITCPWrapper.hpp +++ b/include/aasdk/TCP/ITCPWrapper.hpp @@ -20,10 +20,9 @@ #include #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace tcp @@ -46,4 +45,3 @@ public: } } -} diff --git a/include/f1x/aasdk/TCP/TCPEndpoint.hpp b/include/aasdk/TCP/TCPEndpoint.hpp similarity index 93% rename from include/f1x/aasdk/TCP/TCPEndpoint.hpp rename to include/aasdk/TCP/TCPEndpoint.hpp index 36f8237..f9bd27f 100644 --- a/include/f1x/aasdk/TCP/TCPEndpoint.hpp +++ b/include/aasdk/TCP/TCPEndpoint.hpp @@ -19,11 +19,10 @@ #pragma once #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace tcp @@ -49,4 +48,3 @@ private: } } -} diff --git a/include/f1x/aasdk/TCP/TCPWrapper.hpp b/include/aasdk/TCP/TCPWrapper.hpp similarity index 95% rename from include/f1x/aasdk/TCP/TCPWrapper.hpp rename to include/aasdk/TCP/TCPWrapper.hpp index 1940d51..1c453bc 100644 --- a/include/f1x/aasdk/TCP/TCPWrapper.hpp +++ b/include/aasdk/TCP/TCPWrapper.hpp @@ -18,10 +18,9 @@ #pragma once -#include +#include + -namespace f1x -{ namespace aasdk { namespace tcp @@ -39,4 +38,3 @@ public: } } -} diff --git a/include/f1x/aasdk/Transport/DataSink.hpp b/include/aasdk/Transport/DataSink.hpp similarity index 95% rename from include/f1x/aasdk/Transport/DataSink.hpp rename to include/aasdk/Transport/DataSink.hpp index 4bc764f..12d0287 100644 --- a/include/f1x/aasdk/Transport/DataSink.hpp +++ b/include/aasdk/Transport/DataSink.hpp @@ -20,11 +20,10 @@ #include #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace transport @@ -48,4 +47,3 @@ private: } } -} diff --git a/include/f1x/aasdk/Transport/ISSLWrapper.hpp b/include/aasdk/Transport/ISSLWrapper.hpp similarity index 99% rename from include/f1x/aasdk/Transport/ISSLWrapper.hpp rename to include/aasdk/Transport/ISSLWrapper.hpp index 536e124..13289a6 100644 --- a/include/f1x/aasdk/Transport/ISSLWrapper.hpp +++ b/include/aasdk/Transport/ISSLWrapper.hpp @@ -21,8 +21,7 @@ #include #include -namespace f1x -{ + namespace aasdk { namespace transport @@ -67,4 +66,3 @@ public: } } -} diff --git a/include/f1x/aasdk/Transport/ITransport.hpp b/include/aasdk/Transport/ITransport.hpp similarity index 93% rename from include/f1x/aasdk/Transport/ITransport.hpp rename to include/aasdk/Transport/ITransport.hpp index 4c73abf..e415eb9 100644 --- a/include/f1x/aasdk/Transport/ITransport.hpp +++ b/include/aasdk/Transport/ITransport.hpp @@ -19,11 +19,10 @@ #pragma once #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace transport @@ -46,4 +45,3 @@ public: } } -} diff --git a/include/f1x/aasdk/Transport/SSLWrapper.hpp b/include/aasdk/Transport/SSLWrapper.hpp similarity index 97% rename from include/f1x/aasdk/Transport/SSLWrapper.hpp rename to include/aasdk/Transport/SSLWrapper.hpp index a42c0b6..f6e0164 100644 --- a/include/f1x/aasdk/Transport/SSLWrapper.hpp +++ b/include/aasdk/Transport/SSLWrapper.hpp @@ -18,10 +18,9 @@ #pragma once -#include +#include + -namespace f1x -{ namespace aasdk { namespace transport @@ -63,4 +62,3 @@ public: } } -} diff --git a/include/f1x/aasdk/Transport/TCPTransport.hpp b/include/aasdk/Transport/TCPTransport.hpp similarity index 92% rename from include/f1x/aasdk/Transport/TCPTransport.hpp rename to include/aasdk/Transport/TCPTransport.hpp index 0159176..a1831ad 100644 --- a/include/f1x/aasdk/Transport/TCPTransport.hpp +++ b/include/aasdk/Transport/TCPTransport.hpp @@ -18,11 +18,10 @@ #pragma once -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace transport @@ -45,4 +44,3 @@ private: } } -} diff --git a/include/f1x/aasdk/Transport/Transport.hpp b/include/aasdk/Transport/Transport.hpp similarity index 94% rename from include/f1x/aasdk/Transport/Transport.hpp rename to include/aasdk/Transport/Transport.hpp index 04ccc27..ca9d197 100644 --- a/include/f1x/aasdk/Transport/Transport.hpp +++ b/include/aasdk/Transport/Transport.hpp @@ -21,11 +21,10 @@ #include #include #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace transport @@ -62,4 +61,3 @@ protected: } } -} diff --git a/include/f1x/aasdk/Transport/USBTransport.hpp b/include/aasdk/Transport/USBTransport.hpp similarity index 93% rename from include/f1x/aasdk/Transport/USBTransport.hpp rename to include/aasdk/Transport/USBTransport.hpp index 3464130..d28cd64 100644 --- a/include/f1x/aasdk/Transport/USBTransport.hpp +++ b/include/aasdk/Transport/USBTransport.hpp @@ -19,11 +19,10 @@ #pragma once #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace transport @@ -50,4 +49,3 @@ private: } } -} diff --git a/include/f1x/aasdk/USB/AOAPDevice.hpp b/include/aasdk/USB/AOAPDevice.hpp similarity index 95% rename from include/f1x/aasdk/USB/AOAPDevice.hpp rename to include/aasdk/USB/AOAPDevice.hpp index 7cbd25a..752f232 100644 --- a/include/f1x/aasdk/USB/AOAPDevice.hpp +++ b/include/aasdk/USB/AOAPDevice.hpp @@ -21,11 +21,10 @@ #include #include #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -60,4 +59,3 @@ private: } } -} diff --git a/include/f1x/aasdk/USB/AccessoryModeProtocolVersionQuery.hpp b/include/aasdk/USB/AccessoryModeProtocolVersionQuery.hpp similarity index 95% rename from include/f1x/aasdk/USB/AccessoryModeProtocolVersionQuery.hpp rename to include/aasdk/USB/AccessoryModeProtocolVersionQuery.hpp index 0a09a9d..16549ae 100644 --- a/include/f1x/aasdk/USB/AccessoryModeProtocolVersionQuery.hpp +++ b/include/aasdk/USB/AccessoryModeProtocolVersionQuery.hpp @@ -18,10 +18,9 @@ #pragma once -#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -43,4 +42,3 @@ private: } } -} diff --git a/include/f1x/aasdk/USB/AccessoryModeQuery.hpp b/include/aasdk/USB/AccessoryModeQuery.hpp similarity index 89% rename from include/f1x/aasdk/USB/AccessoryModeQuery.hpp rename to include/aasdk/USB/AccessoryModeQuery.hpp index e0258a2..0d881ff 100644 --- a/include/f1x/aasdk/USB/AccessoryModeQuery.hpp +++ b/include/aasdk/USB/AccessoryModeQuery.hpp @@ -21,12 +21,11 @@ #include #include #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -50,4 +49,3 @@ protected: } } -} diff --git a/include/f1x/aasdk/USB/AccessoryModeQueryChain.hpp b/include/aasdk/USB/AccessoryModeQueryChain.hpp similarity index 93% rename from include/f1x/aasdk/USB/AccessoryModeQueryChain.hpp rename to include/aasdk/USB/AccessoryModeQueryChain.hpp index 65d38c1..d567813 100644 --- a/include/f1x/aasdk/USB/AccessoryModeQueryChain.hpp +++ b/include/aasdk/USB/AccessoryModeQueryChain.hpp @@ -18,12 +18,11 @@ #pragma once -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -65,4 +64,3 @@ private: } } -} diff --git a/include/f1x/aasdk/USB/AccessoryModeQueryChainFactory.hpp b/include/aasdk/USB/AccessoryModeQueryChainFactory.hpp similarity index 90% rename from include/f1x/aasdk/USB/AccessoryModeQueryChainFactory.hpp rename to include/aasdk/USB/AccessoryModeQueryChainFactory.hpp index cbe2e53..84747c6 100644 --- a/include/f1x/aasdk/USB/AccessoryModeQueryChainFactory.hpp +++ b/include/aasdk/USB/AccessoryModeQueryChainFactory.hpp @@ -18,11 +18,10 @@ #pragma once -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -44,4 +43,3 @@ private: } } -} diff --git a/include/f1x/aasdk/USB/AccessoryModeQueryFactory.hpp b/include/aasdk/USB/AccessoryModeQueryFactory.hpp similarity index 94% rename from include/f1x/aasdk/USB/AccessoryModeQueryFactory.hpp rename to include/aasdk/USB/AccessoryModeQueryFactory.hpp index 2344d8d..abe2eb5 100644 --- a/include/f1x/aasdk/USB/AccessoryModeQueryFactory.hpp +++ b/include/aasdk/USB/AccessoryModeQueryFactory.hpp @@ -18,10 +18,9 @@ #pragma once -#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -41,4 +40,3 @@ private: } } -} diff --git a/include/f1x/aasdk/USB/AccessoryModeQueryType.hpp b/include/aasdk/USB/AccessoryModeQueryType.hpp similarity index 98% rename from include/f1x/aasdk/USB/AccessoryModeQueryType.hpp rename to include/aasdk/USB/AccessoryModeQueryType.hpp index bde6813..32ea1bc 100644 --- a/include/f1x/aasdk/USB/AccessoryModeQueryType.hpp +++ b/include/aasdk/USB/AccessoryModeQueryType.hpp @@ -21,8 +21,7 @@ #include #include -namespace f1x -{ + namespace aasdk { namespace usb @@ -42,4 +41,3 @@ enum class AccessoryModeQueryType } } -} diff --git a/include/f1x/aasdk/USB/AccessoryModeSendStringQuery.hpp b/include/aasdk/USB/AccessoryModeSendStringQuery.hpp similarity index 92% rename from include/f1x/aasdk/USB/AccessoryModeSendStringQuery.hpp rename to include/aasdk/USB/AccessoryModeSendStringQuery.hpp index ccdaa58..f0fb337 100644 --- a/include/f1x/aasdk/USB/AccessoryModeSendStringQuery.hpp +++ b/include/aasdk/USB/AccessoryModeSendStringQuery.hpp @@ -19,11 +19,10 @@ #pragma once #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -45,4 +44,3 @@ private: } } -} diff --git a/include/f1x/aasdk/USB/AccessoryModeSendStringType.hpp b/include/aasdk/USB/AccessoryModeSendStringType.hpp similarity index 98% rename from include/f1x/aasdk/USB/AccessoryModeSendStringType.hpp rename to include/aasdk/USB/AccessoryModeSendStringType.hpp index ec9c9fd..016af9f 100644 --- a/include/f1x/aasdk/USB/AccessoryModeSendStringType.hpp +++ b/include/aasdk/USB/AccessoryModeSendStringType.hpp @@ -21,8 +21,7 @@ #include #include -namespace f1x -{ + namespace aasdk { namespace usb @@ -40,4 +39,3 @@ enum class AccessoryModeSendStringType } } -} diff --git a/include/f1x/aasdk/USB/AccessoryModeStartQuery.hpp b/include/aasdk/USB/AccessoryModeStartQuery.hpp similarity index 94% rename from include/f1x/aasdk/USB/AccessoryModeStartQuery.hpp rename to include/aasdk/USB/AccessoryModeStartQuery.hpp index d15dba5..0904f4d 100644 --- a/include/f1x/aasdk/USB/AccessoryModeStartQuery.hpp +++ b/include/aasdk/USB/AccessoryModeStartQuery.hpp @@ -18,10 +18,9 @@ #pragma once -#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -41,4 +40,3 @@ private: } } -} diff --git a/include/f1x/aasdk/USB/ConnectedAccessoriesEnumerator.hpp b/include/aasdk/USB/ConnectedAccessoriesEnumerator.hpp similarity index 90% rename from include/f1x/aasdk/USB/ConnectedAccessoriesEnumerator.hpp rename to include/aasdk/USB/ConnectedAccessoriesEnumerator.hpp index 1a93f1c..f5fd59e 100644 --- a/include/f1x/aasdk/USB/ConnectedAccessoriesEnumerator.hpp +++ b/include/aasdk/USB/ConnectedAccessoriesEnumerator.hpp @@ -19,12 +19,11 @@ #pragma once #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -55,4 +54,3 @@ private: } } -} diff --git a/include/f1x/aasdk/USB/IAOAPDevice.hpp b/include/aasdk/USB/IAOAPDevice.hpp similarity index 94% rename from include/f1x/aasdk/USB/IAOAPDevice.hpp rename to include/aasdk/USB/IAOAPDevice.hpp index 30e1c2b..c32034b 100644 --- a/include/f1x/aasdk/USB/IAOAPDevice.hpp +++ b/include/aasdk/USB/IAOAPDevice.hpp @@ -18,10 +18,9 @@ #pragma once -#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -41,4 +40,3 @@ public: } } -} diff --git a/include/f1x/aasdk/USB/IAccessoryModeQuery.hpp b/include/aasdk/USB/IAccessoryModeQuery.hpp similarity index 92% rename from include/f1x/aasdk/USB/IAccessoryModeQuery.hpp rename to include/aasdk/USB/IAccessoryModeQuery.hpp index 1b38d89..e839d28 100644 --- a/include/f1x/aasdk/USB/IAccessoryModeQuery.hpp +++ b/include/aasdk/USB/IAccessoryModeQuery.hpp @@ -21,11 +21,10 @@ #include #include #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -46,4 +45,3 @@ public: } } -} diff --git a/include/f1x/aasdk/USB/IAccessoryModeQueryChain.hpp b/include/aasdk/USB/IAccessoryModeQueryChain.hpp similarity index 92% rename from include/f1x/aasdk/USB/IAccessoryModeQueryChain.hpp rename to include/aasdk/USB/IAccessoryModeQueryChain.hpp index 203dc2a..62937f9 100644 --- a/include/f1x/aasdk/USB/IAccessoryModeQueryChain.hpp +++ b/include/aasdk/USB/IAccessoryModeQueryChain.hpp @@ -20,11 +20,10 @@ #include #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -44,4 +43,3 @@ public: } } -} diff --git a/include/f1x/aasdk/USB/IAccessoryModeQueryChainFactory.hpp b/include/aasdk/USB/IAccessoryModeQueryChainFactory.hpp similarity index 92% rename from include/f1x/aasdk/USB/IAccessoryModeQueryChainFactory.hpp rename to include/aasdk/USB/IAccessoryModeQueryChainFactory.hpp index 41beb3a..7394af1 100644 --- a/include/f1x/aasdk/USB/IAccessoryModeQueryChainFactory.hpp +++ b/include/aasdk/USB/IAccessoryModeQueryChainFactory.hpp @@ -18,10 +18,9 @@ #pragma once -#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -37,4 +36,3 @@ public: } } -} diff --git a/include/f1x/aasdk/USB/IAccessoryModeQueryFactory.hpp b/include/aasdk/USB/IAccessoryModeQueryFactory.hpp similarity index 86% rename from include/f1x/aasdk/USB/IAccessoryModeQueryFactory.hpp rename to include/aasdk/USB/IAccessoryModeQueryFactory.hpp index af3b16e..2211438 100644 --- a/include/f1x/aasdk/USB/IAccessoryModeQueryFactory.hpp +++ b/include/aasdk/USB/IAccessoryModeQueryFactory.hpp @@ -19,12 +19,11 @@ #pragma once #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -41,4 +40,3 @@ public: } } -} diff --git a/include/f1x/aasdk/USB/IConnectedAccessoriesEnumerator.hpp b/include/aasdk/USB/IConnectedAccessoriesEnumerator.hpp similarity index 95% rename from include/f1x/aasdk/USB/IConnectedAccessoriesEnumerator.hpp rename to include/aasdk/USB/IConnectedAccessoriesEnumerator.hpp index f0a5fc9..f4a5005 100644 --- a/include/f1x/aasdk/USB/IConnectedAccessoriesEnumerator.hpp +++ b/include/aasdk/USB/IConnectedAccessoriesEnumerator.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -41,4 +40,3 @@ public: } } -} diff --git a/include/f1x/aasdk/USB/IUSBEndpoint.hpp b/include/aasdk/USB/IUSBEndpoint.hpp similarity index 91% rename from include/f1x/aasdk/USB/IUSBEndpoint.hpp rename to include/aasdk/USB/IUSBEndpoint.hpp index 659a2d3..c25d856 100644 --- a/include/f1x/aasdk/USB/IUSBEndpoint.hpp +++ b/include/aasdk/USB/IUSBEndpoint.hpp @@ -19,12 +19,11 @@ #pragma once #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -49,4 +48,3 @@ public: } } -} diff --git a/include/f1x/aasdk/USB/IUSBHub.hpp b/include/aasdk/USB/IUSBHub.hpp similarity index 89% rename from include/f1x/aasdk/USB/IUSBHub.hpp rename to include/aasdk/USB/IUSBHub.hpp index b18c9db..b5c12fe 100644 --- a/include/f1x/aasdk/USB/IUSBHub.hpp +++ b/include/aasdk/USB/IUSBHub.hpp @@ -20,12 +20,11 @@ #include #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -46,4 +45,3 @@ public: } } -} diff --git a/include/f1x/aasdk/USB/IUSBWrapper.hpp b/include/aasdk/USB/IUSBWrapper.hpp similarity index 99% rename from include/f1x/aasdk/USB/IUSBWrapper.hpp rename to include/aasdk/USB/IUSBWrapper.hpp index c941b0f..9633147 100644 --- a/include/f1x/aasdk/USB/IUSBWrapper.hpp +++ b/include/aasdk/USB/IUSBWrapper.hpp @@ -23,8 +23,7 @@ #include #include -namespace f1x -{ + namespace aasdk { namespace usb @@ -80,4 +79,3 @@ public: } } -} diff --git a/include/f1x/aasdk/USB/USBEndpoint.hpp b/include/aasdk/USB/USBEndpoint.hpp similarity index 95% rename from include/f1x/aasdk/USB/USBEndpoint.hpp rename to include/aasdk/USB/USBEndpoint.hpp index d603391..c729fe9 100644 --- a/include/f1x/aasdk/USB/USBEndpoint.hpp +++ b/include/aasdk/USB/USBEndpoint.hpp @@ -21,11 +21,10 @@ #include #include #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -62,4 +61,3 @@ private: } } -} diff --git a/include/f1x/aasdk/USB/USBHub.hpp b/include/aasdk/USB/USBHub.hpp similarity index 94% rename from include/f1x/aasdk/USB/USBHub.hpp rename to include/aasdk/USB/USBHub.hpp index ca05e84..cffcfc2 100644 --- a/include/f1x/aasdk/USB/USBHub.hpp +++ b/include/aasdk/USB/USBHub.hpp @@ -20,11 +20,10 @@ #include #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -62,4 +61,3 @@ private: } } -} diff --git a/include/f1x/aasdk/USB/USBWrapper.hpp b/include/aasdk/USB/USBWrapper.hpp similarity index 98% rename from include/f1x/aasdk/USB/USBWrapper.hpp rename to include/aasdk/USB/USBWrapper.hpp index 7a4074c..d48650e 100644 --- a/include/f1x/aasdk/USB/USBWrapper.hpp +++ b/include/aasdk/USB/USBWrapper.hpp @@ -18,10 +18,9 @@ #pragma once -#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -74,4 +73,3 @@ private: } } -} diff --git a/include/f1x/aasdk/Version.hpp b/include/aasdk/Version.hpp similarity index 100% rename from include/f1x/aasdk/Version.hpp rename to include/aasdk/Version.hpp diff --git a/src/Channel/AV/AVInputServiceChannel.cpp b/src/Channel/AV/AVInputServiceChannel.cpp index 5deaa9f..4615449 100644 --- a/src/Channel/AV/AVInputServiceChannel.cpp +++ b/src/Channel/AV/AVInputServiceChannel.cpp @@ -18,13 +18,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -172,4 +171,3 @@ void AVInputServiceChannel::handleChannelOpenRequest(const common::DataConstBuff } } } -} diff --git a/src/Channel/AV/AudioServiceChannel.cpp b/src/Channel/AV/AudioServiceChannel.cpp index f6f18dc..2b4da5d 100644 --- a/src/Channel/AV/AudioServiceChannel.cpp +++ b/src/Channel/AV/AudioServiceChannel.cpp @@ -18,12 +18,11 @@ #include #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -178,4 +177,3 @@ void AudioServiceChannel::handleAVMediaWithTimestampIndication(const common::Dat } } } -} diff --git a/src/Channel/AV/MediaAudioServiceChannel.cpp b/src/Channel/AV/MediaAudioServiceChannel.cpp index 0aab28c..07187ef 100644 --- a/src/Channel/AV/MediaAudioServiceChannel.cpp +++ b/src/Channel/AV/MediaAudioServiceChannel.cpp @@ -16,10 +16,9 @@ * along with aasdk. If not, see . */ -#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -36,4 +35,3 @@ MediaAudioServiceChannel::MediaAudioServiceChannel(boost::asio::io_service::stra } } } -} diff --git a/src/Channel/AV/SpeechAudioServiceChannel.cpp b/src/Channel/AV/SpeechAudioServiceChannel.cpp index 2ff457f..0aa2baf 100644 --- a/src/Channel/AV/SpeechAudioServiceChannel.cpp +++ b/src/Channel/AV/SpeechAudioServiceChannel.cpp @@ -16,10 +16,9 @@ * along with aasdk. If not, see . */ -#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -36,4 +35,3 @@ SpeechAudioServiceChannel::SpeechAudioServiceChannel(boost::asio::io_service::st } } } -} diff --git a/src/Channel/AV/SystemAudioServiceChannel.cpp b/src/Channel/AV/SystemAudioServiceChannel.cpp index 2a350e1..d8bc042 100644 --- a/src/Channel/AV/SystemAudioServiceChannel.cpp +++ b/src/Channel/AV/SystemAudioServiceChannel.cpp @@ -16,10 +16,9 @@ * along with aasdk. If not, see . */ -#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -36,4 +35,3 @@ SystemAudioServiceChannel::SystemAudioServiceChannel(boost::asio::io_service::st } } } -} diff --git a/src/Channel/AV/VideoServiceChannel.cpp b/src/Channel/AV/VideoServiceChannel.cpp index 3a64fe1..ee78157 100644 --- a/src/Channel/AV/VideoServiceChannel.cpp +++ b/src/Channel/AV/VideoServiceChannel.cpp @@ -18,13 +18,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -204,4 +203,3 @@ void VideoServiceChannel::handleAVMediaWithTimestampIndication(const common::Dat } } } -} diff --git a/src/Channel/Bluetooth/BluetoothServiceChannel.cpp b/src/Channel/Bluetooth/BluetoothServiceChannel.cpp index 6d0b967..6331ddd 100644 --- a/src/Channel/Bluetooth/BluetoothServiceChannel.cpp +++ b/src/Channel/Bluetooth/BluetoothServiceChannel.cpp @@ -19,12 +19,11 @@ #include #include #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -119,4 +118,3 @@ void BluetoothServiceChannel::handleBluetoothPairingRequest(const common::DataCo } } } -} diff --git a/src/Channel/Control/ControlServiceChannel.cpp b/src/Channel/Control/ControlServiceChannel.cpp index 773ef23..5d3c4ee 100644 --- a/src/Channel/Control/ControlServiceChannel.cpp +++ b/src/Channel/Control/ControlServiceChannel.cpp @@ -18,14 +18,13 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -264,4 +263,3 @@ void ControlServiceChannel::handlePingResponse(const common::DataConstBuffer& pa } } } -} diff --git a/src/Channel/Input/InputServiceChannel.cpp b/src/Channel/Input/InputServiceChannel.cpp index 05ca7b2..f60017e 100644 --- a/src/Channel/Input/InputServiceChannel.cpp +++ b/src/Channel/Input/InputServiceChannel.cpp @@ -19,12 +19,11 @@ #include #include #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -128,4 +127,3 @@ void InputServiceChannel::handleChannelOpenRequest(const common::DataConstBuffer } } } -} diff --git a/src/Channel/Sensor/SensorServiceChannel.cpp b/src/Channel/Sensor/SensorServiceChannel.cpp index 5ea151e..6fe896c 100644 --- a/src/Channel/Sensor/SensorServiceChannel.cpp +++ b/src/Channel/Sensor/SensorServiceChannel.cpp @@ -19,12 +19,11 @@ #include #include #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -128,4 +127,3 @@ void SensorServiceChannel::handleChannelOpenRequest(const common::DataConstBuffe } } } -} diff --git a/src/Channel/ServiceChannel.cpp b/src/Channel/ServiceChannel.cpp index 78a7cc1..950811b 100644 --- a/src/Channel/ServiceChannel.cpp +++ b/src/Channel/ServiceChannel.cpp @@ -16,11 +16,10 @@ * along with aasdk. If not, see . */ -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace channel @@ -50,4 +49,3 @@ void ServiceChannel::send(messenger::Message::Pointer message, SendPromise::Poin } } -} diff --git a/src/Common/Data.cpp b/src/Common/Data.cpp index 2227a6b..397752f 100644 --- a/src/Common/Data.cpp +++ b/src/Common/Data.cpp @@ -17,11 +17,10 @@ */ #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace common @@ -147,4 +146,3 @@ std::string dump(const DataConstBuffer& buffer) } } -} diff --git a/src/Error/Error.cpp b/src/Error/Error.cpp index b28c1db..22f451a 100644 --- a/src/Error/Error.cpp +++ b/src/Error/Error.cpp @@ -16,10 +16,9 @@ * along with aasdk. If not, see . */ -#include +#include + -namespace f1x -{ namespace aasdk { namespace error @@ -77,4 +76,3 @@ bool Error::operator!=(const ErrorCode& code) const } } -} diff --git a/src/IO/IOContextWrapper.cpp b/src/IO/IOContextWrapper.cpp index 8813507..0a07731 100644 --- a/src/IO/IOContextWrapper.cpp +++ b/src/IO/IOContextWrapper.cpp @@ -16,10 +16,9 @@ * along with aasdk. If not, see . */ -#include +#include + -namespace f1x -{ namespace aasdk { namespace io @@ -59,4 +58,3 @@ bool IOContextWrapper::isActive() const } } -} diff --git a/src/Messenger/ChannelId.cpp b/src/Messenger/ChannelId.cpp index ff74a8d..a54b701 100644 --- a/src/Messenger/ChannelId.cpp +++ b/src/Messenger/ChannelId.cpp @@ -16,10 +16,9 @@ * along with aasdk. If not, see . */ -#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -56,4 +55,3 @@ std::string channelIdToString(ChannelId channelId) } } -} diff --git a/src/Messenger/ChannelReceiveMessageQueue.cpp b/src/Messenger/ChannelReceiveMessageQueue.cpp index c15d7cf..4dc46f3 100644 --- a/src/Messenger/ChannelReceiveMessageQueue.cpp +++ b/src/Messenger/ChannelReceiveMessageQueue.cpp @@ -16,10 +16,9 @@ * along with aasdk. If not, see . */ -#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -64,4 +63,3 @@ void ChannelReceiveMessageQueue::clear() } } -} diff --git a/src/Messenger/ChannelReceivePromiseQueue.cpp b/src/Messenger/ChannelReceivePromiseQueue.cpp index 8aba2de..dca99f3 100644 --- a/src/Messenger/ChannelReceivePromiseQueue.cpp +++ b/src/Messenger/ChannelReceivePromiseQueue.cpp @@ -16,10 +16,9 @@ * along with aasdk. If not, see . */ -#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -71,4 +70,3 @@ ReceivePromise::Pointer ChannelReceivePromiseQueue::pop() } } -} diff --git a/src/Messenger/Cryptor.cpp b/src/Messenger/Cryptor.cpp index d431911..154e37c 100644 --- a/src/Messenger/Cryptor.cpp +++ b/src/Messenger/Cryptor.cpp @@ -18,11 +18,10 @@ #include #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -323,4 +322,3 @@ KAwp3tIHPoJOQiKNQ3/qks5km/9dujUGU2ARiU3qmxLMdgegFz8e\n\ } } -} diff --git a/src/Messenger/FrameHeader.cpp b/src/Messenger/FrameHeader.cpp index 1324c2c..f47f0b9 100644 --- a/src/Messenger/FrameHeader.cpp +++ b/src/Messenger/FrameHeader.cpp @@ -17,10 +17,9 @@ */ #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -75,4 +74,3 @@ common::Data FrameHeader::getData() const } } -} diff --git a/src/Messenger/FrameSize.cpp b/src/Messenger/FrameSize.cpp index 352de2f..6f987c3 100644 --- a/src/Messenger/FrameSize.cpp +++ b/src/Messenger/FrameSize.cpp @@ -17,10 +17,9 @@ */ #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -87,4 +86,3 @@ size_t FrameSize::getSizeOf(FrameSizeType type) } } -} diff --git a/src/Messenger/Message.cpp b/src/Messenger/Message.cpp index ab4d943..dfb5c63 100644 --- a/src/Messenger/Message.cpp +++ b/src/Messenger/Message.cpp @@ -16,10 +16,9 @@ * along with aasdk. If not, see . */ -#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -102,4 +101,3 @@ void Message::insertPayload(common::DataBuffer& buffer) } } -} diff --git a/src/Messenger/MessageId.cpp b/src/Messenger/MessageId.cpp index ddc196c..8d1377e 100644 --- a/src/Messenger/MessageId.cpp +++ b/src/Messenger/MessageId.cpp @@ -18,10 +18,9 @@ #include #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -80,7 +79,7 @@ bool MessageId::operator<=(uint16_t id) const return id <= id_; } -std::ostream& operator<<(std::ostream& stream, const f1x::aasdk::messenger::MessageId& messageId) +std::ostream& operator<<(std::ostream& stream, const aasdk::messenger::MessageId& messageId) { stream << "0x" << std::hex << messageId.getId() << std::dec; return stream; @@ -88,4 +87,3 @@ std::ostream& operator<<(std::ostream& stream, const f1x::aasdk::messenger::Mess } } -} diff --git a/src/Messenger/MessageInStream.cpp b/src/Messenger/MessageInStream.cpp index e44ce29..cd0b525 100644 --- a/src/Messenger/MessageInStream.cpp +++ b/src/Messenger/MessageInStream.cpp @@ -16,11 +16,10 @@ * along with aasdk. If not, see . */ -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -168,4 +167,3 @@ void MessageInStream::receiveFramePayloadHandler(const common::DataConstBuffer& } } -} diff --git a/src/Messenger/MessageInStream.ut.cpp b/src/Messenger/MessageInStream.ut.cpp index 1d215c3..5769c8e 100644 --- a/src/Messenger/MessageInStream.ut.cpp +++ b/src/Messenger/MessageInStream.ut.cpp @@ -17,14 +17,13 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -421,4 +420,3 @@ BOOST_FIXTURE_TEST_CASE(MessageInStream_RejectWhenInProgress, MessageInStreamUni } } } -} diff --git a/src/Messenger/MessageOutStream.cpp b/src/Messenger/MessageOutStream.cpp index 48343e2..7d2f3e4 100644 --- a/src/Messenger/MessageOutStream.cpp +++ b/src/Messenger/MessageOutStream.cpp @@ -17,11 +17,10 @@ */ #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -155,4 +154,3 @@ void MessageOutStream::reset() } } -} diff --git a/src/Messenger/MessageOutStream.ut.cpp b/src/Messenger/MessageOutStream.ut.cpp index 535e1d4..f5610fa 100644 --- a/src/Messenger/MessageOutStream.ut.cpp +++ b/src/Messenger/MessageOutStream.ut.cpp @@ -17,14 +17,13 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -226,4 +225,3 @@ BOOST_FIXTURE_TEST_CASE(MessageOutStream_SendSplittedMessage, MessageOutStreamUn } } } -} diff --git a/src/Messenger/Messenger.cpp b/src/Messenger/Messenger.cpp index 3266f21..0c8d7cb 100644 --- a/src/Messenger/Messenger.cpp +++ b/src/Messenger/Messenger.cpp @@ -17,11 +17,10 @@ */ #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -140,4 +139,3 @@ void Messenger::stop() } } -} diff --git a/src/Messenger/Messenger.ut.cpp b/src/Messenger/Messenger.ut.cpp index 4c71bb2..6dea88e 100644 --- a/src/Messenger/Messenger.ut.cpp +++ b/src/Messenger/Messenger.ut.cpp @@ -17,14 +17,13 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -229,4 +228,3 @@ BOOST_FIXTURE_TEST_CASE(Messenger_SendFailed, MessengerUnitTest) } } } -} diff --git a/src/Messenger/Timestamp.cpp b/src/Messenger/Timestamp.cpp index 5de4e44..14e00be 100644 --- a/src/Messenger/Timestamp.cpp +++ b/src/Messenger/Timestamp.cpp @@ -17,10 +17,9 @@ */ #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -52,4 +51,3 @@ Timestamp::ValueType Timestamp::getValue() const } } -} diff --git a/src/TCP/TCPEndpoint.cpp b/src/TCP/TCPEndpoint.cpp index 0ffa375..b78c2a9 100644 --- a/src/TCP/TCPEndpoint.cpp +++ b/src/TCP/TCPEndpoint.cpp @@ -16,10 +16,9 @@ * along with aasdk. If not, see . */ -#include +#include + -namespace f1x -{ namespace aasdk { namespace tcp @@ -72,4 +71,3 @@ void TCPEndpoint::asyncOperationHandler(const boost::system::error_code& ec, siz } } -} diff --git a/src/TCP/TCPEndpoint.ut.cpp b/src/TCP/TCPEndpoint.ut.cpp index 0222eda..56baf7c 100644 --- a/src/TCP/TCPEndpoint.ut.cpp +++ b/src/TCP/TCPEndpoint.ut.cpp @@ -17,12 +17,11 @@ */ #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace tcp @@ -129,4 +128,3 @@ BOOST_FIXTURE_TEST_CASE(TCPEndpoint_SendError, TCPEndpointUnitTest) } } } -} diff --git a/src/TCP/TCPWrapper.cpp b/src/TCP/TCPWrapper.cpp index 139c27b..ae35cb3 100644 --- a/src/TCP/TCPWrapper.cpp +++ b/src/TCP/TCPWrapper.cpp @@ -17,10 +17,9 @@ */ #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace tcp @@ -58,4 +57,3 @@ boost::system::error_code TCPWrapper::connect(boost::asio::ip::tcp::socket& sock } } -} diff --git a/src/Transport/DataSink.cpp b/src/Transport/DataSink.cpp index 023f0b7..f8891c7 100644 --- a/src/Transport/DataSink.cpp +++ b/src/Transport/DataSink.cpp @@ -17,11 +17,10 @@ */ #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace transport @@ -72,4 +71,3 @@ common::Data DataSink::consume(common::Data::size_type size) } } -} diff --git a/src/Transport/SSLWrapper.cpp b/src/Transport/SSLWrapper.cpp index 726972b..6aca9b4 100644 --- a/src/Transport/SSLWrapper.cpp +++ b/src/Transport/SSLWrapper.cpp @@ -21,10 +21,9 @@ #include #include #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace transport @@ -193,4 +192,3 @@ int SSLWrapper::getError(SSL* ssl, int returnCode) } } -} diff --git a/src/Transport/TCPTransport.cpp b/src/Transport/TCPTransport.cpp index c38cc5c..3a6a342 100644 --- a/src/Transport/TCPTransport.cpp +++ b/src/Transport/TCPTransport.cpp @@ -16,10 +16,9 @@ * along with aasdk. If not, see . */ -#include +#include + -namespace f1x -{ namespace aasdk { namespace transport @@ -85,4 +84,3 @@ void TCPTransport::sendHandler(SendQueue::iterator queueElement, const error::Er } } -} diff --git a/src/Transport/TCPTransport.ut.cpp b/src/Transport/TCPTransport.ut.cpp index 58d00e4..eb6b9c7 100644 --- a/src/Transport/TCPTransport.ut.cpp +++ b/src/Transport/TCPTransport.ut.cpp @@ -17,13 +17,12 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace transport @@ -276,4 +275,3 @@ BOOST_FIXTURE_TEST_CASE(TCPTransport_SendError, TCPTransportUnitTest) } } } -} diff --git a/src/Transport/Transport.cpp b/src/Transport/Transport.cpp index 9f64242..ac170c9 100644 --- a/src/Transport/Transport.cpp +++ b/src/Transport/Transport.cpp @@ -16,10 +16,9 @@ * along with aasdk. If not, see . */ -#include +#include + -namespace f1x -{ namespace aasdk { namespace transport @@ -106,4 +105,3 @@ void Transport::send(common::Data data, SendPromise::Pointer promise) } } -} diff --git a/src/Transport/USBTransport.cpp b/src/Transport/USBTransport.cpp index 7a8a1cc..922fc21 100644 --- a/src/Transport/USBTransport.cpp +++ b/src/Transport/USBTransport.cpp @@ -16,10 +16,9 @@ * along with aasdk. If not, see . */ -#include +#include + -namespace f1x -{ namespace aasdk { namespace transport @@ -93,4 +92,3 @@ void USBTransport::stop() } } -} diff --git a/src/Transport/USBTransport.ut.cpp b/src/Transport/USBTransport.ut.cpp index a6d41fa..e8a6313 100644 --- a/src/Transport/USBTransport.ut.cpp +++ b/src/Transport/USBTransport.ut.cpp @@ -17,14 +17,13 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace transport @@ -313,4 +312,3 @@ BOOST_FIXTURE_TEST_CASE(USBTransport_SendError, USBTransportUnitTest) } } } -} diff --git a/src/USB/AOAPDevice.cpp b/src/USB/AOAPDevice.cpp index f3c9412..9be389c 100644 --- a/src/USB/AOAPDevice.cpp +++ b/src/USB/AOAPDevice.cpp @@ -17,12 +17,11 @@ */ #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -124,4 +123,3 @@ const libusb_interface_descriptor* AOAPDevice::getInterfaceDescriptor(const libu } } -} diff --git a/src/USB/AOAPDevice.ut.cpp b/src/USB/AOAPDevice.ut.cpp index eea6d0b..e8f85d2 100644 --- a/src/USB/AOAPDevice.ut.cpp +++ b/src/USB/AOAPDevice.ut.cpp @@ -17,11 +17,10 @@ */ #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -76,4 +75,3 @@ BOOST_AUTO_TEST_CASE(AOAPDevice_InEndpointFirst) } } } -} diff --git a/src/USB/AccessoryModeProtocolVersionQuery.cpp b/src/USB/AccessoryModeProtocolVersionQuery.cpp index f2fabc6..bfd0ece 100644 --- a/src/USB/AccessoryModeProtocolVersionQuery.cpp +++ b/src/USB/AccessoryModeProtocolVersionQuery.cpp @@ -17,12 +17,11 @@ */ #include -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -77,4 +76,3 @@ void AccessoryModeProtocolVersionQuery::protocolVersionHandler(size_t bytesTrans } } -} diff --git a/src/USB/AccessoryModeProtocolVersionQuery.ut.cpp b/src/USB/AccessoryModeProtocolVersionQuery.ut.cpp index 6e654a4..e25ea90 100644 --- a/src/USB/AccessoryModeProtocolVersionQuery.ut.cpp +++ b/src/USB/AccessoryModeProtocolVersionQuery.ut.cpp @@ -17,13 +17,12 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -161,4 +160,3 @@ BOOST_FIXTURE_TEST_CASE(AccessoryModeProtocolVersionQuery_RejectWhenInProgress, } } } -} diff --git a/src/USB/AccessoryModeQuery.cpp b/src/USB/AccessoryModeQuery.cpp index 97cf63a..9fc9f38 100644 --- a/src/USB/AccessoryModeQuery.cpp +++ b/src/USB/AccessoryModeQuery.cpp @@ -16,11 +16,10 @@ * along with aasdk. If not, see . */ -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -40,4 +39,3 @@ void AccessoryModeQuery::cancel() } } -} diff --git a/src/USB/AccessoryModeQueryChain.cpp b/src/USB/AccessoryModeQueryChain.cpp index b594f5e..5015e0d 100644 --- a/src/USB/AccessoryModeQueryChain.cpp +++ b/src/USB/AccessoryModeQueryChain.cpp @@ -16,12 +16,11 @@ * along with aasdk. If not, see . */ -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -208,4 +207,3 @@ void AccessoryModeQueryChain::startQueryHandler(IUSBEndpoint::Pointer usbEndpoin } } -} diff --git a/src/USB/AccessoryModeQueryChain.ut.cpp b/src/USB/AccessoryModeQueryChain.ut.cpp index 2f42abd..ab0115e 100644 --- a/src/USB/AccessoryModeQueryChain.ut.cpp +++ b/src/USB/AccessoryModeQueryChain.ut.cpp @@ -17,14 +17,13 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -473,4 +472,3 @@ BOOST_FIXTURE_TEST_CASE(AccessoryModeQueryChain_RejectWhenInProgress, AccessoryM } } } -} diff --git a/src/USB/AccessoryModeQueryChainFactory.cpp b/src/USB/AccessoryModeQueryChainFactory.cpp index 7f9d3d2..6aff87e 100644 --- a/src/USB/AccessoryModeQueryChainFactory.cpp +++ b/src/USB/AccessoryModeQueryChainFactory.cpp @@ -16,11 +16,10 @@ * along with aasdk. If not, see . */ -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -43,4 +42,3 @@ IAccessoryModeQueryChain::Pointer AccessoryModeQueryChainFactory::create() } } -} diff --git a/src/USB/AccessoryModeQueryFactory.cpp b/src/USB/AccessoryModeQueryFactory.cpp index c3ea65b..3f67790 100644 --- a/src/USB/AccessoryModeQueryFactory.cpp +++ b/src/USB/AccessoryModeQueryFactory.cpp @@ -16,15 +16,14 @@ * along with aasdk. If not, see . */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -78,4 +77,3 @@ IAccessoryModeQuery::Pointer AccessoryModeQueryFactory::createQuery(AccessoryMod } } -} diff --git a/src/USB/AccessoryModeSendStringQuery.cpp b/src/USB/AccessoryModeSendStringQuery.cpp index d589261..d337291 100644 --- a/src/USB/AccessoryModeSendStringQuery.cpp +++ b/src/USB/AccessoryModeSendStringQuery.cpp @@ -17,11 +17,10 @@ */ #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -67,4 +66,3 @@ void AccessoryModeSendStringQuery::start(Promise::Pointer promise) } } -} diff --git a/src/USB/AccessoryModeSendStringQuery.ut.cpp b/src/USB/AccessoryModeSendStringQuery.ut.cpp index 3e9b800..d23cdde 100644 --- a/src/USB/AccessoryModeSendStringQuery.ut.cpp +++ b/src/USB/AccessoryModeSendStringQuery.ut.cpp @@ -17,13 +17,12 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -137,4 +136,3 @@ BOOST_FIXTURE_TEST_CASE(AccessoryModeSendStringQuery_RejectWhenInProgress, Acces } } } -} diff --git a/src/USB/AccessoryModeStartQuery.cpp b/src/USB/AccessoryModeStartQuery.cpp index dd695e8..75cd32f 100644 --- a/src/USB/AccessoryModeStartQuery.cpp +++ b/src/USB/AccessoryModeStartQuery.cpp @@ -17,11 +17,10 @@ */ #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -62,4 +61,3 @@ void AccessoryModeStartQuery::start(Promise::Pointer promise) } } -} diff --git a/src/USB/AccessoryModeStartQuery.ut.cpp b/src/USB/AccessoryModeStartQuery.ut.cpp index 6715c76..87183ae 100644 --- a/src/USB/AccessoryModeStartQuery.ut.cpp +++ b/src/USB/AccessoryModeStartQuery.ut.cpp @@ -17,13 +17,12 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -123,4 +122,3 @@ BOOST_FIXTURE_TEST_CASE(AccessoryModeStartQuery_RejectWhenInProgress, AccessoryM } } } -} diff --git a/src/USB/ConnectedAccessoriesEnumerator.cpp b/src/USB/ConnectedAccessoriesEnumerator.cpp index 1d0dc5c..062c79b 100644 --- a/src/USB/ConnectedAccessoriesEnumerator.cpp +++ b/src/USB/ConnectedAccessoriesEnumerator.cpp @@ -16,10 +16,9 @@ * along with aasdk. If not, see . */ -#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -135,4 +134,3 @@ void ConnectedAccessoriesEnumerator::reset() } } -} diff --git a/src/USB/ConnectedAccessoriesEnumerator.ut.cpp b/src/USB/ConnectedAccessoriesEnumerator.ut.cpp index d89bb20..ea20354 100644 --- a/src/USB/ConnectedAccessoriesEnumerator.ut.cpp +++ b/src/USB/ConnectedAccessoriesEnumerator.ut.cpp @@ -17,14 +17,13 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -234,4 +233,3 @@ BOOST_FIXTURE_TEST_CASE(ConnectedAccessoriesEnumerator_CancelEnumeration, Connec } } } -} diff --git a/src/USB/USBEndpoint.cpp b/src/USB/USBEndpoint.cpp index 541dfef..f4e5bf9 100644 --- a/src/USB/USBEndpoint.cpp +++ b/src/USB/USBEndpoint.cpp @@ -16,12 +16,11 @@ * along with aasdk. If not, see . */ -#include -#include -#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -175,4 +174,3 @@ void USBEndpoint::transferHandler(libusb_transfer *transfer) } } -} diff --git a/src/USB/USBEndpoint.ut.cpp b/src/USB/USBEndpoint.ut.cpp index a171ba6..b030a2c 100644 --- a/src/USB/USBEndpoint.ut.cpp +++ b/src/USB/USBEndpoint.ut.cpp @@ -17,14 +17,13 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -291,4 +290,3 @@ BOOST_FIXTURE_TEST_CASE(USBEndpoint_BulkTransferFailed, USBEndpointUnitTest) } } } -} diff --git a/src/USB/USBHub.cpp b/src/USB/USBHub.cpp index df7c2e4..cc302d9 100644 --- a/src/USB/USBHub.cpp +++ b/src/USB/USBHub.cpp @@ -17,13 +17,12 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -141,4 +140,3 @@ void USBHub::handleDevice(libusb_device* device) } } -} diff --git a/src/USB/USBHub.ut.cpp b/src/USB/USBHub.ut.cpp index 35fca4a..15ada93 100644 --- a/src/USB/USBHub.ut.cpp +++ b/src/USB/USBHub.ut.cpp @@ -17,14 +17,13 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -241,4 +240,3 @@ BOOST_FIXTURE_TEST_CASE(USBHub_CancelAllQueryChains, USBHubUnitTest) } } } -} diff --git a/src/USB/USBWrapper.cpp b/src/USB/USBWrapper.cpp index b251ec2..4a0ccd8 100644 --- a/src/USB/USBWrapper.cpp +++ b/src/USB/USBWrapper.cpp @@ -16,10 +16,9 @@ * along with aasdk. If not, see . */ -#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -170,4 +169,3 @@ libusb_transfer* USBWrapper::allocTransfer(int iso_packets) } } -} diff --git a/include_ut/f1x/aasdk/Messenger/UT/Cryptor.mock.hpp b/unit_test/Messenger/UT/Cryptor.mock.hpp similarity index 95% rename from include_ut/f1x/aasdk/Messenger/UT/Cryptor.mock.hpp rename to unit_test/Messenger/UT/Cryptor.mock.hpp index fe6e325..30baca6 100644 --- a/include_ut/f1x/aasdk/Messenger/UT/Cryptor.mock.hpp +++ b/unit_test/Messenger/UT/Cryptor.mock.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -46,4 +45,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/Messenger/UT/MessageInStream.mock.hpp b/unit_test/Messenger/UT/MessageInStream.mock.hpp similarity index 93% rename from include_ut/f1x/aasdk/Messenger/UT/MessageInStream.mock.hpp rename to unit_test/Messenger/UT/MessageInStream.mock.hpp index d024f28..ee7932c 100644 --- a/include_ut/f1x/aasdk/Messenger/UT/MessageInStream.mock.hpp +++ b/unit_test/Messenger/UT/MessageInStream.mock.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -39,4 +38,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/Messenger/UT/MessageOutStream.mock.hpp b/unit_test/Messenger/UT/MessageOutStream.mock.hpp similarity index 93% rename from include_ut/f1x/aasdk/Messenger/UT/MessageOutStream.mock.hpp rename to unit_test/Messenger/UT/MessageOutStream.mock.hpp index 10e99de..6f9e048 100644 --- a/include_ut/f1x/aasdk/Messenger/UT/MessageOutStream.mock.hpp +++ b/unit_test/Messenger/UT/MessageOutStream.mock.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -39,4 +38,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/Messenger/UT/ReceivePromiseHandler.mock.hpp b/unit_test/Messenger/UT/ReceivePromiseHandler.mock.hpp similarity index 91% rename from include_ut/f1x/aasdk/Messenger/UT/ReceivePromiseHandler.mock.hpp rename to unit_test/Messenger/UT/ReceivePromiseHandler.mock.hpp index 368d681..8719e2b 100644 --- a/include_ut/f1x/aasdk/Messenger/UT/ReceivePromiseHandler.mock.hpp +++ b/unit_test/Messenger/UT/ReceivePromiseHandler.mock.hpp @@ -19,11 +19,10 @@ #pragma once #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -41,4 +40,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/Messenger/UT/SendPromiseHandler.mock.hpp b/unit_test/Messenger/UT/SendPromiseHandler.mock.hpp similarity index 94% rename from include_ut/f1x/aasdk/Messenger/UT/SendPromiseHandler.mock.hpp rename to unit_test/Messenger/UT/SendPromiseHandler.mock.hpp index b3c354b..942b267 100644 --- a/include_ut/f1x/aasdk/Messenger/UT/SendPromiseHandler.mock.hpp +++ b/unit_test/Messenger/UT/SendPromiseHandler.mock.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace messenger @@ -40,4 +39,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/TCP/UT/TCPEndpoint.mock.hpp b/unit_test/TCP/UT/TCPEndpoint.mock.hpp similarity index 94% rename from include_ut/f1x/aasdk/TCP/UT/TCPEndpoint.mock.hpp rename to unit_test/TCP/UT/TCPEndpoint.mock.hpp index 5972406..27e7339 100644 --- a/include_ut/f1x/aasdk/TCP/UT/TCPEndpoint.mock.hpp +++ b/unit_test/TCP/UT/TCPEndpoint.mock.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace tcp @@ -41,4 +40,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/TCP/UT/TCPEndpointPromiseHandler.mock.hpp b/unit_test/TCP/UT/TCPEndpointPromiseHandler.mock.hpp similarity index 94% rename from include_ut/f1x/aasdk/TCP/UT/TCPEndpointPromiseHandler.mock.hpp rename to unit_test/TCP/UT/TCPEndpointPromiseHandler.mock.hpp index 4d7c182..4cb3ad4 100644 --- a/include_ut/f1x/aasdk/TCP/UT/TCPEndpointPromiseHandler.mock.hpp +++ b/unit_test/TCP/UT/TCPEndpointPromiseHandler.mock.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace tcp @@ -40,4 +39,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/TCP/UT/TCPWrapper.mock.hpp b/unit_test/TCP/UT/TCPWrapper.mock.hpp similarity index 96% rename from include_ut/f1x/aasdk/TCP/UT/TCPWrapper.mock.hpp rename to unit_test/TCP/UT/TCPWrapper.mock.hpp index b0f1881..f523869 100644 --- a/include_ut/f1x/aasdk/TCP/UT/TCPWrapper.mock.hpp +++ b/unit_test/TCP/UT/TCPWrapper.mock.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace tcp @@ -43,4 +42,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/Transport/UT/Transport.mock.hpp b/unit_test/Transport/UT/Transport.mock.hpp similarity index 94% rename from include_ut/f1x/aasdk/Transport/UT/Transport.mock.hpp rename to unit_test/Transport/UT/Transport.mock.hpp index a8cc75d..4b1ae80 100644 --- a/include_ut/f1x/aasdk/Transport/UT/Transport.mock.hpp +++ b/unit_test/Transport/UT/Transport.mock.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace transport @@ -41,4 +40,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/Transport/UT/TransportReceivePromiseHandler.mock.hpp b/unit_test/Transport/UT/TransportReceivePromiseHandler.mock.hpp similarity index 91% rename from include_ut/f1x/aasdk/Transport/UT/TransportReceivePromiseHandler.mock.hpp rename to unit_test/Transport/UT/TransportReceivePromiseHandler.mock.hpp index d5ed660..6a902a6 100644 --- a/include_ut/f1x/aasdk/Transport/UT/TransportReceivePromiseHandler.mock.hpp +++ b/unit_test/Transport/UT/TransportReceivePromiseHandler.mock.hpp @@ -19,11 +19,10 @@ #pragma once #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace transport @@ -41,4 +40,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/Transport/UT/TransportSendPromiseHandler.mock.hpp b/unit_test/Transport/UT/TransportSendPromiseHandler.mock.hpp similarity index 94% rename from include_ut/f1x/aasdk/Transport/UT/TransportSendPromiseHandler.mock.hpp rename to unit_test/Transport/UT/TransportSendPromiseHandler.mock.hpp index b92ae46..c9f7de1 100644 --- a/include_ut/f1x/aasdk/Transport/UT/TransportSendPromiseHandler.mock.hpp +++ b/unit_test/Transport/UT/TransportSendPromiseHandler.mock.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace transport @@ -40,4 +39,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/USB/UT/AOAPDevice.mock.hpp b/unit_test/USB/UT/AOAPDevice.mock.hpp similarity index 94% rename from include_ut/f1x/aasdk/USB/UT/AOAPDevice.mock.hpp rename to unit_test/USB/UT/AOAPDevice.mock.hpp index fca721c..4bd47b1 100644 --- a/include_ut/f1x/aasdk/USB/UT/AOAPDevice.mock.hpp +++ b/unit_test/USB/UT/AOAPDevice.mock.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -40,4 +39,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/USB/UT/AccessoryModeQuery.mock.hpp b/unit_test/USB/UT/AccessoryModeQuery.mock.hpp similarity index 93% rename from include_ut/f1x/aasdk/USB/UT/AccessoryModeQuery.mock.hpp rename to unit_test/USB/UT/AccessoryModeQuery.mock.hpp index 7383a89..3442f82 100644 --- a/include_ut/f1x/aasdk/USB/UT/AccessoryModeQuery.mock.hpp +++ b/unit_test/USB/UT/AccessoryModeQuery.mock.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -40,4 +39,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/USB/UT/AccessoryModeQueryChain.mock.hpp b/unit_test/USB/UT/AccessoryModeQueryChain.mock.hpp similarity index 93% rename from include_ut/f1x/aasdk/USB/UT/AccessoryModeQueryChain.mock.hpp rename to unit_test/USB/UT/AccessoryModeQueryChain.mock.hpp index 6f4b11d..bfa37a7 100644 --- a/include_ut/f1x/aasdk/USB/UT/AccessoryModeQueryChain.mock.hpp +++ b/unit_test/USB/UT/AccessoryModeQueryChain.mock.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -40,4 +39,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/USB/UT/AccessoryModeQueryChainFactory.mock.hpp b/unit_test/USB/UT/AccessoryModeQueryChainFactory.mock.hpp similarity index 92% rename from include_ut/f1x/aasdk/USB/UT/AccessoryModeQueryChainFactory.mock.hpp rename to unit_test/USB/UT/AccessoryModeQueryChainFactory.mock.hpp index ab03026..9e17927 100644 --- a/include_ut/f1x/aasdk/USB/UT/AccessoryModeQueryChainFactory.mock.hpp +++ b/unit_test/USB/UT/AccessoryModeQueryChainFactory.mock.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -39,4 +38,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/USB/UT/AccessoryModeQueryChainPromiseHandler.mock.hpp b/unit_test/USB/UT/AccessoryModeQueryChainPromiseHandler.mock.hpp similarity index 91% rename from include_ut/f1x/aasdk/USB/UT/AccessoryModeQueryChainPromiseHandler.mock.hpp rename to unit_test/USB/UT/AccessoryModeQueryChainPromiseHandler.mock.hpp index bbd121c..f978434 100644 --- a/include_ut/f1x/aasdk/USB/UT/AccessoryModeQueryChainPromiseHandler.mock.hpp +++ b/unit_test/USB/UT/AccessoryModeQueryChainPromiseHandler.mock.hpp @@ -19,11 +19,10 @@ #pragma once #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -41,4 +40,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/USB/UT/AccessoryModeQueryFactory.mock.hpp b/unit_test/USB/UT/AccessoryModeQueryFactory.mock.hpp similarity index 93% rename from include_ut/f1x/aasdk/USB/UT/AccessoryModeQueryFactory.mock.hpp rename to unit_test/USB/UT/AccessoryModeQueryFactory.mock.hpp index c14ad80..9c52304 100644 --- a/include_ut/f1x/aasdk/USB/UT/AccessoryModeQueryFactory.mock.hpp +++ b/unit_test/USB/UT/AccessoryModeQueryFactory.mock.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -39,4 +38,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/USB/UT/AccessoryModeQueryPromiseHandler.mock.hpp b/unit_test/USB/UT/AccessoryModeQueryPromiseHandler.mock.hpp similarity index 94% rename from include_ut/f1x/aasdk/USB/UT/AccessoryModeQueryPromiseHandler.mock.hpp rename to unit_test/USB/UT/AccessoryModeQueryPromiseHandler.mock.hpp index 516b41b..5d46e08 100644 --- a/include_ut/f1x/aasdk/USB/UT/AccessoryModeQueryPromiseHandler.mock.hpp +++ b/unit_test/USB/UT/AccessoryModeQueryPromiseHandler.mock.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -40,4 +39,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/USB/UT/ConnectedAccessoriesEnumeratorPromiseHandler.mock.hpp b/unit_test/USB/UT/ConnectedAccessoriesEnumeratorPromiseHandler.mock.hpp similarity index 91% rename from include_ut/f1x/aasdk/USB/UT/ConnectedAccessoriesEnumeratorPromiseHandler.mock.hpp rename to unit_test/USB/UT/ConnectedAccessoriesEnumeratorPromiseHandler.mock.hpp index 23c45ec..d8b0233 100644 --- a/include_ut/f1x/aasdk/USB/UT/ConnectedAccessoriesEnumeratorPromiseHandler.mock.hpp +++ b/unit_test/USB/UT/ConnectedAccessoriesEnumeratorPromiseHandler.mock.hpp @@ -19,11 +19,10 @@ #pragma once #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -41,4 +40,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/USB/UT/USBEndpoint.mock.hpp b/unit_test/USB/UT/USBEndpoint.mock.hpp similarity index 95% rename from include_ut/f1x/aasdk/USB/UT/USBEndpoint.mock.hpp rename to unit_test/USB/UT/USBEndpoint.mock.hpp index a002677..7e7d897 100644 --- a/include_ut/f1x/aasdk/USB/UT/USBEndpoint.mock.hpp +++ b/unit_test/USB/UT/USBEndpoint.mock.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -44,4 +43,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/USB/UT/USBEndpointPromiseHandler.mock.hpp b/unit_test/USB/UT/USBEndpointPromiseHandler.mock.hpp similarity index 94% rename from include_ut/f1x/aasdk/USB/UT/USBEndpointPromiseHandler.mock.hpp rename to unit_test/USB/UT/USBEndpointPromiseHandler.mock.hpp index 6759f1c..67b9518 100644 --- a/include_ut/f1x/aasdk/USB/UT/USBEndpointPromiseHandler.mock.hpp +++ b/unit_test/USB/UT/USBEndpointPromiseHandler.mock.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -40,4 +39,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/USB/UT/USBHub.mock.hpp b/unit_test/USB/UT/USBHub.mock.hpp similarity index 95% rename from include_ut/f1x/aasdk/USB/UT/USBHub.mock.hpp rename to unit_test/USB/UT/USBHub.mock.hpp index c1680a1..40da9de 100644 --- a/include_ut/f1x/aasdk/USB/UT/USBHub.mock.hpp +++ b/unit_test/USB/UT/USBHub.mock.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -42,4 +41,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/USB/UT/USBHubPromiseHandler.mock.hpp b/unit_test/USB/UT/USBHubPromiseHandler.mock.hpp similarity index 91% rename from include_ut/f1x/aasdk/USB/UT/USBHubPromiseHandler.mock.hpp rename to unit_test/USB/UT/USBHubPromiseHandler.mock.hpp index d1f31bc..67417ae 100644 --- a/include_ut/f1x/aasdk/USB/UT/USBHubPromiseHandler.mock.hpp +++ b/unit_test/USB/UT/USBHubPromiseHandler.mock.hpp @@ -19,11 +19,10 @@ #pragma once #include -#include -#include +#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -41,4 +40,3 @@ public: } } } -} diff --git a/include_ut/f1x/aasdk/USB/UT/USBWrapper.mock.hpp b/unit_test/USB/UT/USBWrapper.mock.hpp similarity index 98% rename from include_ut/f1x/aasdk/USB/UT/USBWrapper.mock.hpp rename to unit_test/USB/UT/USBWrapper.mock.hpp index f83c3e0..7c3d52c 100644 --- a/include_ut/f1x/aasdk/USB/UT/USBWrapper.mock.hpp +++ b/unit_test/USB/UT/USBWrapper.mock.hpp @@ -19,10 +19,9 @@ #pragma once #include -#include +#include + -namespace f1x -{ namespace aasdk { namespace usb @@ -75,4 +74,3 @@ public: } } } -}