From 1ad2c0a6acc260927820f14f80f3840853a7a88f Mon Sep 17 00:00:00 2001
From: Fesseha <fesseha@evehome.com>
Date: Wed, 26 Apr 2023 12:56:57 +0200
Subject: [PATCH] clean up usage of namespaces

---
 .../time-synchronization-server/TimeSyncManager.cpp   |  2 ++
 .../time-synchronization-server/TimeSyncManager.h     | 11 +++++++++++
 .../time-synchronization-server.h                     | 10 ++++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/app/clusters/time-synchronization-server/TimeSyncManager.cpp b/src/app/clusters/time-synchronization-server/TimeSyncManager.cpp
index 061794df637850..c2ae1805dfb6d2 100644
--- 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
index acd818eb08b1f1..cb808a542a58ab 100644
--- 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
\ No newline at end of file
diff --git a/src/app/clusters/time-synchronization-server/time-synchronization-server.h b/src/app/clusters/time-synchronization-server/time-synchronization-server.h
index 0f7aac64c03063..a5f88b7a05f406 100644
--- 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