Skip to content

Commit 0fa893d

Browse files
committed
Update static variables naming and scope for consistency
1 parent 64fcace commit 0fa893d

File tree

12 files changed

+13
-13
lines changed

12 files changed

+13
-13
lines changed

examples/tv-app/android/include/content-control/ContentController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ class ContentController : public ContentControlDelegate
5858
protected:
5959
private:
6060
// TODO: set this based upon meta data from app
61-
uint32_t mDynamicEndpointFeatureMap = 3;
61+
static constexpr uint32_t kEndpointFeatureMap = 3;
6262
chip::EndpointId mEndpointId;
6363
};

examples/tv-app/android/include/content-launcher/AppContentLauncherManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class AppContentLauncherManager : public ContentLauncherDelegate
6262
EndpointId mEndpointId;
6363

6464
// TODO: set this based upon meta data from app
65-
uint32_t mDynamicEndpointFeatureMap = 3;
65+
static constexpr uint32_t kEndpointFeatureMap = 3;
6666
static constexpr uint16_t kClusterRevision = 2;
6767
ContentAppAttributeDelegate * mAttributeDelegate;
6868
};

examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class AppMediaPlaybackManager : public MediaPlaybackDelegate
114114
EndpointId mEndpointId;
115115

116116
// TODO: set this based upon meta data from app
117-
uint32_t mDynamicEndpointFeatureMap = 3;
117+
static constexpr uint32_t kEndpointFeatureMap = 3;
118118
static constexpr uint16_t kClusterRevision = 2;
119119

120120
ContentAppAttributeDelegate * mAttributeDelegate;

examples/tv-app/android/java/ChannelManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,6 @@ class ChannelManager : public ChannelDelegate
8181
jmethodID mCancelRecordProgramMethod = nullptr;
8282

8383
// TODO: set this based upon meta data from app
84-
uint32_t mDynamicEndpointFeatureMap = 3;
84+
static constexpr uint32_t kEndpointFeatureMap = 3;
8585
static constexpr uint16_t kClusterRevision = 2;
8686
};

examples/tv-app/android/java/ContentLauncherManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ class ContentLauncherManager : public ContentLauncherDelegate
5858
jmethodID mLaunchUrlMethod = nullptr;
5959

6060
// TODO: set this based upon meta data from app
61-
uint16_t kClusterRevision = 2;
61+
static constexpr uint16_t kClusterRevision = 2;
6262
};

examples/tv-app/android/java/KeypadInputManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ class KeypadInputManager : public KeypadInputDelegate
4141
jmethodID mSendKeyMethod = nullptr;
4242

4343
// TODO: set this based upon meta data from app
44-
uint32_t mDynamicEndpointFeatureMap = 7;
44+
static constexpr uint32_t kEndpointFeatureMap = 7;
4545
};

examples/tv-app/android/java/MediaPlaybackManager.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,6 @@ class MediaPlaybackManager : public MediaPlaybackDelegate
121121
HandleMediaRequest(MediaPlaybackRequest mediaPlaybackRequest, uint64_t deltaPositionMilliseconds);
122122

123123
// TODO: set this based upon meta data from app
124-
uint32_t mDynamicEndpointFeatureMap = 3;
125-
uint16_t kClusterRevision = 2;
124+
static constexpr uint32_t kEndpointFeatureMap = 3;
125+
static constexpr uint16_t kClusterRevision = 2;
126126
};

examples/tv-app/tv-common/clusters/channel/ChannelManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,6 @@ class ChannelManager : public ChannelDelegate
7373

7474
private:
7575
// TODO: set this based upon meta data from app
76-
uint32_t mDynamicEndpointFeatureMap = 3;
76+
static constexpr uint32_t kEndpointFeatureMap = 3;
7777
static constexpr uint16_t kClusterRevision = 2;
7878
};

examples/tv-app/tv-common/clusters/content-control/ContentController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ class ContentControlManager : public ContentControlDelegate
5757
protected:
5858
private:
5959
// TODO: set this based upon meta data from app
60-
uint32_t mDynamicEndpointFeatureMap = 3;
60+
static constexpr uint32_t kEndpointFeatureMap = 3;
6161
};

examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,6 @@ class ContentLauncherManager : public ContentLauncherDelegate
6363

6464
private:
6565
// TODO: set this based upon meta data from app
66-
uint32_t mDynamicEndpointFeatureMap = 3;
66+
static constexpr uint32_t kEndpointFeatureMap = 3;
6767
static constexpr uint16_t kClusterRevision = 2;
6868
};

examples/tv-app/tv-common/clusters/keypad-input/KeypadInputManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ class KeypadInputManager : public KeypadInputDelegate
3434

3535
private:
3636
// TODO: set this based upon meta data from app
37-
uint32_t mDynamicEndpointFeatureMap = 7;
37+
static constexpr uint32_t kEndpointFeatureMap = 7;
3838
};

examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,6 @@ class MediaPlaybackManager : public MediaPlaybackDelegate
113113

114114
private:
115115
// TODO: set this based upon meta data from app
116-
uint32_t mDynamicEndpointFeatureMap = 3;
116+
static constexpr uint32_t kEndpointFeatureMap = 3;
117117
static constexpr uint16_t kClusterRevision = 2;
118118
};

0 commit comments

Comments
 (0)