Skip to content

Commit 941cb71

Browse files
author
Andy Ford
authored
Merge pull request #8 from ECFMP/namespace-rename
Namespace rename
2 parents 8fa4b09 + a3cfbe8 commit 941cb71

145 files changed

Lines changed: 1117 additions & 1115 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

include/ECFMP/ECFMP.h

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#pragma once
2+
3+
#include "ECFMP/api/ApiElementCollection.h"
4+
#include "ECFMP/api/EventCollection.h"
5+
#include "ECFMP/event/Event.h"
6+
#include "ECFMP/event/EventParticipant.h"
7+
#include "ECFMP/flightinformationregion/FlightInformationRegion.h"
8+
#include "ECFMP/flowmeasure/AirportFilter.h"
9+
#include "ECFMP/flowmeasure/EventFilter.h"
10+
#include "ECFMP/flowmeasure/FlowMeasure.h"
11+
#include "ECFMP/flowmeasure/FlowMeasureFilters.h"
12+
#include "ECFMP/flowmeasure/LevelRangeFilter.h"
13+
#include "ECFMP/flowmeasure/Measure.h"
14+
#include "ECFMP/flowmeasure/MultipleLevelFilter.h"
15+
#include "ECFMP/flowmeasure/RouteFilter.h"
16+
#include "ECFMP/http/HttpClient.h"
17+
#include "ECFMP/log/Logger.h"
18+
#include "EventListener.h"
19+
#include "EventListenerFilter.h"
20+
#include "EventListeners.h"
21+
#include "Sdk.h"
22+
#include "SdkEvents.h"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
namespace FlowSdk::Plugin {
3+
namespace ECFMP::Plugin {
44
/**
55
* A listener that listens for a particular type of event from the SDK.
66
*/
@@ -11,4 +11,4 @@ namespace FlowSdk::Plugin {
1111
virtual ~EventListener() = default;
1212
virtual void OnEvent(const Types&...) = 0;
1313
};
14-
}// namespace FlowSdk::Plugin
14+
}// namespace ECFMP::Plugin
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
namespace FlowSdk::Plugin {
3+
namespace ECFMP::Plugin {
44
/**
55
* A filter for events that can be paired with a listener to determine if
66
* it should be called.
@@ -12,4 +12,4 @@ namespace FlowSdk::Plugin {
1212
virtual ~EventListenerFilter() = default;
1313
[[nodiscard]] virtual auto Passes(const Types&...) -> bool = 0;
1414
};
15-
}// namespace FlowSdk::Plugin
15+
}// namespace ECFMP::Plugin
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
2-
#include "FlowMeasure.h"
2+
#include "ECFMP/flowmeasure/FlowMeasure.h"
33

4-
namespace FlowSdk::Plugin {
4+
namespace ECFMP::Plugin {
55
template<typename... Types>
66
class EventListener;
77
template<typename... Types>
@@ -24,12 +24,13 @@ namespace FlowSdk::Plugin {
2424
/**
2525
* Adds a listener, with a filter. Duplicates will be ignored.
2626
*/
27-
virtual void Add(std::shared_ptr<EventListener<Types...>> listener,
28-
std::shared_ptr<EventListenerFilter<Types...>> filter) noexcept = 0;
27+
virtual void
28+
Add(std::shared_ptr<EventListener<Types...>> listener,
29+
std::shared_ptr<EventListenerFilter<Types...>> filter) noexcept = 0;
2930

3031
/**
3132
* Removes a listener
3233
*/
3334
virtual void Remove(std::shared_ptr<EventListener<Types...>> listener) noexcept = 0;
3435
};
35-
}// namespace FlowSdk::Plugin
36+
}// namespace ECFMP::Plugin
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#pragma once
22

3-
namespace FlowSdk {
3+
namespace ECFMP {
44
namespace EventBus {
55
class EventBus;
66
}// namespace EventBus
77
namespace FlowMeasure {
88
class FlowMeasure;
99
}// namespace FlowMeasure
10-
}// namespace FlowSdk
10+
}// namespace ECFMP
1111

12-
namespace FlowSdk::Plugin {
12+
namespace ECFMP::Plugin {
1313

1414
/**
1515
* Represents the public-facing facade of the SDK.
@@ -35,4 +35,4 @@ namespace FlowSdk::Plugin {
3535
*/
3636
virtual void Destroy() = 0;
3737
};
38-
}// namespace FlowSdk::Plugin
38+
}// namespace ECFMP::Plugin
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#pragma once
22

3-
namespace FlowSdk::FlowMeasure {
3+
namespace ECFMP::FlowMeasure {
44
class FlowMeasure;
5-
}// namespace FlowSdk::FlowMeasure
5+
}// namespace ECFMP::FlowMeasure
66

7-
namespace FlowSdk::Plugin {
7+
namespace ECFMP::Plugin {
88
using FlowMeasureNotifiedEvent = struct FlowMeasureNotifiedEvent {
99
const FlowMeasure::FlowMeasure& measure;
1010
};
@@ -25,4 +25,4 @@ namespace FlowSdk::Plugin {
2525
const FlowMeasure::FlowMeasure& original;
2626
const FlowMeasure::FlowMeasure& reissued;
2727
};
28-
}// namespace FlowSdk::Plugin
28+
}// namespace ECFMP::Plugin
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#pragma once
22
#include "Sdk.h"
33

4-
namespace FlowSdk {
4+
namespace ECFMP {
55
namespace Http {
66
class HttpClient;
77
}// namespace Http
88
namespace Log {
99
class Logger;
1010
}
11-
}// namespace FlowSdk
11+
}// namespace ECFMP
1212

13-
namespace FlowSdk::Plugin {
13+
namespace ECFMP::Plugin {
1414

1515
class SdkConfigurationException : public std::logic_error
1616
{
@@ -63,4 +63,4 @@ namespace FlowSdk::Plugin {
6363
struct SdkFactoryImpl;
6464
std::unique_ptr<SdkFactoryImpl> impl;
6565
};
66-
}// namespace FlowSdk::Plugin
66+
}// namespace ECFMP::Plugin
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
namespace FlowSdk::Api {
3+
namespace ECFMP::Api {
44
/**
55
* An element that comes from the API.
66
*/
@@ -25,4 +25,4 @@ namespace FlowSdk::Api {
2525
*/
2626
[[nodiscard]] virtual auto Identifier() const noexcept -> const std::string& = 0;
2727
};
28-
}// namespace FlowSdk::Api
28+
}// namespace ECFMP::Api
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
2-
#include "flow-sdk/ApiElementIterator.h"
3-
#include "flow-sdk/Iterable.h"
2+
#include "ApiElementIterator.h"
3+
#include "Iterable.h"
44

5-
namespace FlowSdk::Api {
5+
namespace ECFMP::Api {
66

77
/**
88
* A collection of elements from the API.
@@ -34,7 +34,7 @@ namespace FlowSdk::Api {
3434
/**
3535
* Gets an item from the collection by its identifier, e.g. for London FIR, "EGTT"
3636
*/
37-
[[nodiscard]] virtual auto GetByIdentifier(const std::string& identifier) const noexcept ->
38-
std::shared_ptr<const T> = 0;
37+
[[nodiscard]] virtual auto GetByIdentifier(const std::string& identifier) const noexcept
38+
-> std::shared_ptr<const T> = 0;
3939
};
40-
}// namespace FlowSdk::Api
40+
}// namespace ECFMP::Api
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include <iterator>
33
#include <memory>
44

5-
namespace FlowSdk::Api {
5+
namespace ECFMP::Api {
66
template<typename T>
77
class ApiElementIterator
88
{
@@ -30,4 +30,4 @@ namespace FlowSdk::Api {
3030
struct Impl;
3131
std::shared_ptr<Impl> impl;
3232
};
33-
}// namespace FlowSdk::Api
33+
}// namespace ECFMP::Api

0 commit comments

Comments
 (0)