From 7b75564b99a28b6288015fddc6b987dbcc61bc0a Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Fri, 2 Feb 2024 10:27:33 +0000 Subject: [PATCH] Restyled by clang-format --- .../android/include/account-login/AccountLoginManager.cpp | 2 +- .../android/include/media-playback/AppMediaPlaybackManager.h | 2 +- .../include/target-navigator/TargetNavigatorManager.cpp | 2 +- examples/tv-app/android/java/ChannelManager.h | 2 +- examples/tv-app/android/java/MediaPlaybackManager.h | 2 +- .../tv-common/clusters/account-login/AccountLoginManager.cpp | 2 +- examples/tv-app/tv-common/clusters/channel/ChannelManager.h | 2 +- .../tv-common/clusters/media-playback/MediaPlaybackManager.h | 2 +- .../clusters/target-navigator/TargetNavigatorManager.cpp | 1 - .../clusters/target-navigator/TargetNavigatorManager.h | 1 + .../clusters/account-login-server/account-login-server.cpp | 3 +-- src/app/clusters/channel-server/channel-delegate.h | 2 +- src/app/clusters/channel-server/channel-server.cpp | 4 +--- .../clusters/media-playback-server/media-playback-delegate.h | 2 +- .../clusters/media-playback-server/media-playback-server.cpp | 2 +- .../target-navigator-server/target-navigator-delegate.h | 2 +- .../target-navigator-server/target-navigator-server.cpp | 2 +- 17 files changed, 16 insertions(+), 19 deletions(-) diff --git a/examples/tv-app/android/include/account-login/AccountLoginManager.cpp b/examples/tv-app/android/include/account-login/AccountLoginManager.cpp index 2d1ae7d1a1368d..2f6025b7037cbf 100644 --- a/examples/tv-app/android/include/account-login/AccountLoginManager.cpp +++ b/examples/tv-app/android/include/account-login/AccountLoginManager.cpp @@ -17,9 +17,9 @@ */ #include "AccountLoginManager.h" +#include #include #include -#include #include #include diff --git a/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.h b/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.h index cc1dcfed286028..44f3afa3c4c834 100644 --- a/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.h +++ b/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.h @@ -115,7 +115,7 @@ class AppMediaPlaybackManager : public MediaPlaybackDelegate // TODO: set this based upon meta data from app uint32_t mDynamicEndpointFeatureMap = 3; - uint16_t mDynamicClusterRevision = 2; + uint16_t mDynamicClusterRevision = 2; ContentAppAttributeDelegate * mAttributeDelegate; }; diff --git a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp index c0d18ee84110ac..355e991e4c1bc0 100644 --- a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp +++ b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp @@ -15,8 +15,8 @@ * limitations under the License. */ -#include #include "TargetNavigatorManager.h" +#include #include using namespace std; diff --git a/examples/tv-app/android/java/ChannelManager.h b/examples/tv-app/android/java/ChannelManager.h index 76e0ee6cd7fd1a..344db483d67de8 100644 --- a/examples/tv-app/android/java/ChannelManager.h +++ b/examples/tv-app/android/java/ChannelManager.h @@ -82,5 +82,5 @@ class ChannelManager : public ChannelDelegate // TODO: set this based upon meta data from app uint32_t mDynamicEndpointFeatureMap = 3; - uint16_t mDynamicClusterRevision = 2; + uint16_t mDynamicClusterRevision = 2; }; diff --git a/examples/tv-app/android/java/MediaPlaybackManager.h b/examples/tv-app/android/java/MediaPlaybackManager.h index 6bef9f1b3fd51f..5057420cd168fa 100644 --- a/examples/tv-app/android/java/MediaPlaybackManager.h +++ b/examples/tv-app/android/java/MediaPlaybackManager.h @@ -122,5 +122,5 @@ class MediaPlaybackManager : public MediaPlaybackDelegate // TODO: set this based upon meta data from app uint32_t mDynamicEndpointFeatureMap = 3; - uint16_t mDynamicClusterRevision = 2; + uint16_t mDynamicClusterRevision = 2; }; diff --git a/examples/tv-app/tv-common/clusters/account-login/AccountLoginManager.cpp b/examples/tv-app/tv-common/clusters/account-login/AccountLoginManager.cpp index b44f4d5f87f09a..7a6729f78488cf 100644 --- a/examples/tv-app/tv-common/clusters/account-login/AccountLoginManager.cpp +++ b/examples/tv-app/tv-common/clusters/account-login/AccountLoginManager.cpp @@ -17,8 +17,8 @@ */ #include "AccountLoginManager.h" -#include #include +#include #include using namespace std; diff --git a/examples/tv-app/tv-common/clusters/channel/ChannelManager.h b/examples/tv-app/tv-common/clusters/channel/ChannelManager.h index 07ef07b9d1ba05..ddce6252bff077 100644 --- a/examples/tv-app/tv-common/clusters/channel/ChannelManager.h +++ b/examples/tv-app/tv-common/clusters/channel/ChannelManager.h @@ -74,5 +74,5 @@ class ChannelManager : public ChannelDelegate private: // TODO: set this based upon meta data from app uint32_t mDynamicEndpointFeatureMap = 3; - uint16_t mDynamicClusterRevision = 2; + uint16_t mDynamicClusterRevision = 2; }; diff --git a/examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.h b/examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.h index ea980711a54bf0..f3922999d40301 100644 --- a/examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.h +++ b/examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.h @@ -114,5 +114,5 @@ class MediaPlaybackManager : public MediaPlaybackDelegate private: // TODO: set this based upon meta data from app uint32_t mDynamicEndpointFeatureMap = 3; - uint16_t mDynamicClusterRevision = 2; + uint16_t mDynamicClusterRevision = 2; }; diff --git a/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.cpp b/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.cpp index 2376e41afe352e..fc4e6306ccd0ef 100644 --- a/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.cpp +++ b/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.cpp @@ -68,7 +68,6 @@ void TargetNavigatorManager::HandleNavigateTarget(CommandResponseHelper= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) diff --git a/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.h b/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.h index da6ceddff957db..609597cad139f4 100644 --- a/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.h +++ b/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.h @@ -43,6 +43,7 @@ class TargetNavigatorManager : public TargetNavigatorDelegate static const uint8_t kNoCurrentTarget = 0; std::list mTargets; uint8_t mCurrentTarget; + private: // TODO: set this based upon meta data from app uint16_t mDynamicClusterRevision = 2; diff --git a/src/app/clusters/account-login-server/account-login-server.cpp b/src/app/clusters/account-login-server/account-login-server.cpp index 8efd23c104b79e..a2a2eeda93fe89 100644 --- a/src/app/clusters/account-login-server/account-login-server.cpp +++ b/src/app/clusters/account-login-server/account-login-server.cpp @@ -24,8 +24,8 @@ #include #include -#include #include +#include #include #include #include @@ -162,7 +162,6 @@ CHIP_ERROR AccountLoginAttrAccess::ReadRevisionAttribute(EndpointId endpoint, ap } // anonymous namespace - // ----------------------------------------------------------------------------- // Matter Framework Callbacks Implementation diff --git a/src/app/clusters/channel-server/channel-delegate.h b/src/app/clusters/channel-server/channel-delegate.h index 71ea2c25788fa3..c92ada4adda08a 100644 --- a/src/app/clusters/channel-server/channel-delegate.h +++ b/src/app/clusters/channel-server/channel-delegate.h @@ -64,7 +64,7 @@ class Delegate const chip::ByteSpan & data) = 0; bool HasFeature(chip::EndpointId endpoint, Feature feature); - virtual uint32_t GetFeatureMap(chip::EndpointId endpoint) = 0; + virtual uint32_t GetFeatureMap(chip::EndpointId endpoint) = 0; virtual uint16_t GetClusterRevision(chip::EndpointId endpoint) = 0; virtual ~Delegate() = default; diff --git a/src/app/clusters/channel-server/channel-server.cpp b/src/app/clusters/channel-server/channel-server.cpp index 46df1fb125468d..724a7e7f4e08c6 100644 --- a/src/app/clusters/channel-server/channel-server.cpp +++ b/src/app/clusters/channel-server/channel-server.cpp @@ -206,9 +206,7 @@ CHIP_ERROR ChannelAttrAccess::ReadCurrentChannelAttribute(app::AttributeValueEnc return delegate->HandleGetCurrentChannel(aEncoder); } - -CHIP_ERROR ChannelAttrAccess::ReadRevisionAttribute(EndpointId endpoint, app::AttributeValueEncoder & aEncoder, - Delegate * delegate) +CHIP_ERROR ChannelAttrAccess::ReadRevisionAttribute(EndpointId endpoint, app::AttributeValueEncoder & aEncoder, Delegate * delegate) { uint16_t clusterRevision = delegate->GetClusterRevision(endpoint); return aEncoder.Encode(clusterRevision); diff --git a/src/app/clusters/media-playback-server/media-playback-delegate.h b/src/app/clusters/media-playback-server/media-playback-delegate.h index 11dde6fd91fc08..12e89b25efecdc 100644 --- a/src/app/clusters/media-playback-server/media-playback-delegate.h +++ b/src/app/clusters/media-playback-server/media-playback-delegate.h @@ -70,7 +70,7 @@ class Delegate virtual bool HandleActivateTextTrack(const chip::CharSpan & trackId) = 0; virtual bool HandleDeactivateTextTrack() = 0; - virtual uint32_t GetFeatureMap(chip::EndpointId endpoint) = 0; + virtual uint32_t GetFeatureMap(chip::EndpointId endpoint) = 0; virtual uint16_t GetClusterRevision(chip::EndpointId endpoint) = 0; virtual ~Delegate() = default; diff --git a/src/app/clusters/media-playback-server/media-playback-server.cpp b/src/app/clusters/media-playback-server/media-playback-server.cpp index 087f150405d251..cd702eefb263e8 100644 --- a/src/app/clusters/media-playback-server/media-playback-server.cpp +++ b/src/app/clusters/media-playback-server/media-playback-server.cpp @@ -225,7 +225,7 @@ CHIP_ERROR MediaPlaybackAttrAccess::ReadFeatureFlagAttribute(EndpointId endpoint } CHIP_ERROR MediaPlaybackAttrAccess::ReadRevisionAttribute(EndpointId endpoint, app::AttributeValueEncoder & aEncoder, - Delegate * delegate) + Delegate * delegate) { uint16_t clusterRevision = delegate->GetClusterRevision(endpoint); return aEncoder.Encode(clusterRevision); diff --git a/src/app/clusters/target-navigator-server/target-navigator-delegate.h b/src/app/clusters/target-navigator-server/target-navigator-delegate.h index 4d10a720a7c020..f3be65c818fbdd 100644 --- a/src/app/clusters/target-navigator-server/target-navigator-delegate.h +++ b/src/app/clusters/target-navigator-server/target-navigator-delegate.h @@ -40,7 +40,7 @@ class Delegate virtual uint8_t HandleGetCurrentTarget() = 0; virtual void HandleNavigateTarget(CommandResponseHelper & helper, const uint64_t & target, const CharSpan & data) = 0; - virtual uint16_t GetClusterRevision(chip::EndpointId endpoint) = 0; + virtual uint16_t GetClusterRevision(chip::EndpointId endpoint) = 0; virtual ~Delegate() = default; }; diff --git a/src/app/clusters/target-navigator-server/target-navigator-server.cpp b/src/app/clusters/target-navigator-server/target-navigator-server.cpp index c9d64f26dffc82..c7181ee042cf81 100644 --- a/src/app/clusters/target-navigator-server/target-navigator-server.cpp +++ b/src/app/clusters/target-navigator-server/target-navigator-server.cpp @@ -184,7 +184,7 @@ CHIP_ERROR TargetNavigatorAttrAccess::ReadCurrentTargetAttribute(app::AttributeV } CHIP_ERROR TargetNavigatorAttrAccess::ReadRevisionAttribute(EndpointId endpoint, app::AttributeValueEncoder & aEncoder, - Delegate * delegate) + Delegate * delegate) { uint16_t clusterRevision = delegate->GetClusterRevision(endpoint); return aEncoder.Encode(clusterRevision);