Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split out AttributeAccessInterface.h into separate headers/cpp for each underlying class #32984

Merged
merged 11 commits into from
Apr 15, 2024
Merged

Split out AttributeAccessInterface.h into separate headers/cpp for each underlying class #32984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1ffb8f9
Switch out AttributeReportBuilder
andy31415 Apr 15, 2024
422c578
Restyle
andy31415 Apr 15, 2024
256a9d8
Moved things around
andy31415 Apr 15, 2024
df26798
Split out the decoder as well
andy31415 Apr 15, 2024
65ece9c
Fix lists to be working
andy31415 Apr 15, 2024
721c860
Restyle
andy31415 Apr 15, 2024
7f80e63
Fix up some headers
andy31415 Apr 15, 2024
24cda36
Fix includes
andy31415 Apr 15, 2024
27a24df
Fix copyrights
andy31415 Apr 15, 2024
e0f4409
Fix another include
andy31415 Apr 15, 2024
ab509f7
Restyle
andy31415 Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/chef/common/clusters/media-input/MediaInputManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#pragma once

#include <app/AttributeAccessInterface.h>
#include <app/AttributeValueEncoder.h>
#include <app/clusters/media-input-server/media-input-server.h>

#include <string>
Expand Down
1 change: 0 additions & 1 deletion examples/common/tracing/decoder/interaction_model/DecoderCustomLog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

#include "../logging/Log.h"

#include <app/AttributeAccessInterface.h>
#include <app/MessageDef/InvokeRequestMessage.h>
#include <app/MessageDef/InvokeResponseMessage.h>
#include <app/MessageDef/ReportDataMessage.h>
Expand Down
1 change: 0 additions & 1 deletion examples/tv-app/android/include/cluster-init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <app-common/zap-generated/cluster-objects.h>
#include <app-common/zap-generated/ids/Attributes.h>
#include <app-common/zap-generated/ids/Clusters.h>
#include <app/AttributeAccessInterface.h>
#include <app/util/attribute-storage.h>

using namespace chip;
Expand Down
2 changes: 0 additions & 2 deletions examples/tv-app/android/include/content-app-observer/ContentAppObserver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@

#pragma once

#include <app/AttributeAccessInterface.h>
#include <app/clusters/content-app-observer/content-app-observer.h>
#include <vector>

using ContentAppObserverDelegate = chip::app::Clusters::ContentAppObserver::Delegate;
using ContentAppMessageResponse = chip::app::Clusters::ContentAppObserver::Commands::ContentAppMessageResponse::Type;
Expand Down
3 changes: 1 addition & 2 deletions examples/tv-app/android/include/content-control/ContentController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@

#pragma once

#include <app/AttributeAccessInterface.h>
#include <app/AttributeValueEncoder.h>
#include <app/clusters/content-control-server/content-control-server.h>
#include <vector>

using ContentControlDelegate = chip::app::Clusters::ContentControl::Delegate;
using ResetPINResponseType = chip::app::Clusters::ContentControl::Commands::ResetPINResponse::Type;
Expand Down
1 change: 0 additions & 1 deletion examples/tv-app/android/java/ContentAppAttributeDelegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

#include "ContentAppAttributeDelegate.h"
#include <app-common/zap-generated/cluster-objects.h>
#include <app/AttributeAccessInterface.h>
#include <app/util/config.h>
#include <jni.h>
#include <lib/support/CHIPJNIError.h>
Expand Down
2 changes: 1 addition & 1 deletion examples/tv-app/android/java/ContentAppAttributeDelegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#pragma once

#include <app-common/zap-generated/ids/Clusters.h>
#include <app/AttributeAccessInterface.h>
#include <app/ConcreteAttributePath.h>
#include <jni.h>
#include <lib/core/DataModelTypes.h>
#include <lib/support/JniReferences.h>
Expand Down
2 changes: 0 additions & 2 deletions examples/tv-app/android/java/ContentLauncherManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
#include <lib/support/JniReferences.h>
#include <lib/support/JniTypeWrappers.h>

#include <string>

using namespace std;
using namespace chip;
using namespace chip::app::DataModel;
Expand Down
2 changes: 1 addition & 1 deletion examples/tv-app/android/java/ContentLauncherManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#pragma once

#include <app/AttributeAccessInterface.h>
#include <app/AttributeValueEncoder.h>
#include <app/clusters/content-launch-server/content-launch-server.h>
#include <jni.h>
#include <lib/core/CHIPError.h>
Expand Down
2 changes: 1 addition & 1 deletion examples/tv-app/android/java/MediaInputManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#pragma once

#include <app/AttributeAccessInterface.h>
#include <app/AttributeValueEncoder.h>
#include <app/clusters/media-input-server/media-input-server.h>
#include <jni.h>
#include <lib/support/JniReferences.h>
Expand Down
4 changes: 0 additions & 4 deletions examples/tv-app/tv-common/clusters/content-app-observer/ContentAppObserver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@

#pragma once

#include <app/AttributeAccessInterface.h>
#include <app/clusters/content-app-observer/content-app-observer.h>
#include <vector>

using ContentAppObserverDelegate = chip::app::Clusters::ContentAppObserver::Delegate;
using ContentAppMessageResponse = chip::app::Clusters::ContentAppObserver::Commands::ContentAppMessageResponse::Type;
Expand All @@ -32,6 +30,4 @@ class ContentAppObserverManager : public ContentAppObserverDelegate

void HandleContentAppMessage(chip::app::CommandResponseHelper<ContentAppMessageResponse> & helper,
const chip::Optional<chip::CharSpan> & data, const chip::CharSpan & encodingHint) override;

protected:
};
3 changes: 1 addition & 2 deletions examples/tv-app/tv-common/clusters/content-control/ContentController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@

#pragma once

#include <app/AttributeAccessInterface.h>
#include <app/AttributeValueEncoder.h>
#include <app/clusters/content-control-server/content-control-server.h>
#include <vector>

using ContentControlDelegate = chip::app::Clusters::ContentControl::Delegate;
using ResetPINResponseType = chip::app::Clusters::ContentControl::Commands::ResetPINResponse::Type;
Expand Down
4 changes: 2 additions & 2 deletions examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/*
*
* Copyright (c) 2021 Project CHIP Authors
* All rights reserved.
*
Expand All @@ -15,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#pragma once

#include <app/clusters/content-launch-server/content-launch-server.h>

#include <list>
#include <string>
#include <vector>

Expand Down
2 changes: 1 addition & 1 deletion examples/tv-app/tv-common/clusters/media-input/MediaInputManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#pragma once

#include <app/AttributeAccessInterface.h>
#include <app/AttributeValueEncoder.h>
#include <app/clusters/media-input-server/media-input-server.h>
#include <vector>

Expand Down
2 changes: 0 additions & 2 deletions examples/tv-casting-app/tv-casting-common/clusters/content-app-observer/ContentAppObserver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@

#pragma once

#include <app/AttributeAccessInterface.h>
#include <app/clusters/content-app-observer/content-app-observer.h>
#include <vector>

using ContentAppObserverDelegate = chip::app::Clusters::ContentAppObserver::Delegate;
using ContentAppMessageResponse = chip::app::Clusters::ContentAppObserver::Commands::ContentAppMessageResponse::Type;
Expand Down
Loading
Loading