remove the header src/app/util/common.h (#32320)

* remove `src/app/util/common.h * Fix some typos * Remove some references of util/common.h * Fix up comment * Fix lint - a file got removed * Make the paths to the files full-paths
project-chip · May 3, 2024 · 2410924 · 2410924
1 parent f5b4f92
commit 2410924
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 41 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -114,7 +114,6 @@ jobs:
                      --known-failure app/util/attribute-table.h \
                      --known-failure app/util/binding-table.cpp \
                      --known-failure app/util/binding-table.h \
-                     --known-failure app/util/common.h \
                      --known-failure app/util/config.h \
                      --known-failure app/util/DataModelHandler.cpp \
                      --known-failure app/util/DataModelHandler.h \

diff --git a/examples/thermostat/qpg/src/ThermostaticRadiatorValveManager.cpp b/examples/thermostat/qpg/src/ThermostaticRadiatorValveManager.cpp
@@ -23,7 +23,7 @@
 
 #include "AppConfig.h"
 #include "AppTask.h"
-#include "app/util/common.h"
+
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <lib/support/logging/CHIPLogging.h>
 

diff --git a/src/app/clusters/identify-server/identify-server.cpp b/src/app/clusters/identify-server/identify-server.cpp
@@ -24,10 +24,7 @@
 #include <app-common/zap-generated/ids/Commands.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
-
 #include <app/util/af.h>
-#include <app/util/common.h>
-#include <array>
 #include <lib/support/CodeUtils.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <tracing/macros.h>

diff --git a/src/app/util/attribute-storage.cpp b/src/app/util/attribute-storage.cpp
@@ -15,12 +15,12 @@
  *    limitations under the License.
  */
 
-#include "app/util/common.h"
+#include <app/util/attribute-storage.h>
+
 #include <app/AttributePersistenceProvider.h>
 #include <app/InteractionModelEngine.h>
 #include <app/reporting/reporting.h>
 #include <app/util/af.h>
-#include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <app/util/generic-callbacks.h>
 #include <lib/core/CHIPConfig.h>
@@ -36,10 +36,7 @@ using chip::Protocols::InteractionModel::Status;
 //   - zap-generated/callback.h is needed because endpoint_config will call the
 //     corresponding callbacks (via GENERATED_FUNCTION_ARRAYS) and the include
 //     for it is:
-//       util/common.h
-//           -> util/af.h
-//           -> util/config.h
-//           -> zap-generated/endpoint_config.h
+//     util/config.h -> zap-generated/endpoint_config.h
 #include <app-common/zap-generated/callback.h>
 
 using namespace chip;

diff --git a/src/app/util/attribute-table.cpp b/src/app/util/attribute-table.cpp
@@ -14,13 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
-// this file contains all the common includes for clusters in the zcl-util
+#include <app/util/attribute-table.h>
 
 #include <app/util/attribute-storage.h>
-
-// for pulling in defines dealing with EITHER server or client
-#include "app/util/common.h"
 #include <app/util/config.h>
 #include <app/util/generic-callbacks.h>
 #include <app/util/odd-sized-integers.h>

diff --git a/src/app/util/common.h b/src/app/util/common.h
diff --git a/src/app/util/util.cpp b/src/app/util/util.cpp
@@ -15,12 +15,14 @@
  *    limitations under the License.
  */
 
-#include "app/util/common.h"
+#include <app/util/util.h>
+
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app-common/zap-generated/print-cluster.h>
 #include <app/util/af.h>
+#include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <app/util/generic-callbacks.h>
 #include <lib/core/CHIPConfig.h>