clean up usage of namespaces

project-chip · Apr 26, 2023 · 1ad2c0a · 1ad2c0a
1 parent b04ad4b
commit 1ad2c0a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/src/app/clusters/time-synchronization-server/TimeSyncManager.cpp b/src/app/clusters/time-synchronization-server/TimeSyncManager.cpp
@@ -25,6 +25,8 @@
 #include <app/util/af.h>
 #include <list>
 
+using namespace chip::app::Clusters::TimeSynchronization;
+
 void TimeSyncManager::HandleTimeZoneChanged(TimeZoneList timeZoneList)
 {
     // do nothing

diff --git a/src/app/clusters/time-synchronization-server/TimeSyncManager.h b/src/app/clusters/time-synchronization-server/TimeSyncManager.h
@@ -27,11 +27,17 @@
 #include <app/util/af.h>
 #include <list>
 
+namespace chip {
+namespace app {
+namespace Clusters {
+namespace TimeSynchronization {
+
 using namespace chip::app;
 using chip::app::Clusters::TimeSynchronization::Delegate;
 
 class TimeSyncManager : public Delegate
 {
+
 public:
     using TimeZoneList = DataModel::List<chip::app::Clusters::TimeSynchronization::Structs::TimeZoneStruct::Type>;
 
@@ -41,3 +47,8 @@ class TimeSyncManager : public Delegate
     bool HandleDstoffsetavailable(chip::CharSpan name) override;
     CHIP_ERROR HandleGetdstoffset() override;
 };
+
+} // namespace TimeSynchronization
+} // namespace Clusters
+} // namespace app
+} // namespace chip
diff --git a/src/app/clusters/time-synchronization-server/time-synchronization-server.h b/src/app/clusters/time-synchronization-server/time-synchronization-server.h
@@ -31,6 +31,11 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <lib/support/Span.h>
 
+namespace chip {
+namespace app {
+namespace Clusters {
+namespace TimeSynchronization {
+
 using namespace chip;
 using namespace chip::app;
 using namespace chip::app::Clusters;
@@ -39,8 +44,6 @@ using namespace chip::app::Clusters::TimeSynchronization::Attributes;
 using chip::TimeSyncDataProvider;
 using chip::Protocols::InteractionModel::Status;
 
-namespace chip {
-
 class TimeSynchronizationServer
 {
     struct timeZoneName
@@ -181,4 +184,7 @@ class TimeSynchronizationServer
     static TimeSynchronizationServer mTimeSyncInstance;
 };
 
+} // namespace TimeSynchronization
+} // namespace Clusters
+} // namespace app
 } // namespace chip