--clang-tidy naming convention

src/esp/metadata/managers/AOAttributesManager.h

@@ -168,7 +168,7 @@ class AOAttributesManager
    */
   void postRegisterObjectHandling(CORRADE_UNUSED int objectID,
                                   const std::string& objectHandle) override {
-    if (this->_DSDiagnostics->saveRequired()) {
+    if (this->datasetDiagnostics_->saveRequired()) {
       this->saveManagedObjectToFile(objectHandle, true);
     }
   }

src/esp/metadata/managers/AbstractAttributesManager.h

@@ -66,7 +66,7 @@ class AbstractAttributesManager : public ManagedFileBasedContainer<T, Access> {
       : ManagedFileBasedContainer<T, Access>::ManagedFileBasedContainer(
             attrType,
             JSONTypeExt),
-        _DSDiagnostics(DatasetDiagnosticsTool::create_unique()) {}
+        datasetDiagnostics_(DatasetDiagnosticsTool::create_unique()) {}
   ~AbstractAttributesManager() override = default;
 
   /**
@@ -191,9 +191,9 @@ class AbstractAttributesManager : public ManagedFileBasedContainer<T, Access> {
   void setValsFromJSONDoc(AttribsPtr attribs,
                           const io::JsonGenericValue& jsonConfig) {
     // Clear diagnostic flags from previous run
-    this->_DSDiagnostics->clearSaveRequired();
+    this->datasetDiagnostics_->clearSaveRequired();
     this->setValsFromJSONDocInternal(attribs, jsonConfig);
-    if (this->_DSDiagnostics->saveRequired()) {
+    if (this->datasetDiagnostics_->saveRequired()) {
       ESP_WARNING(Mn::Debug::Flag::NoSpace)
           << "<" << this->objectType_
           << "> : Diagnostics exposed issues in loaded attributes : `"
@@ -204,7 +204,7 @@ class AbstractAttributesManager : public ManagedFileBasedContainer<T, Access> {
   }  // setValsFromJSONDoc
 
   /**
-   * @brief Configure @ref _DSDiagnostics tool based on if passsed jsonConfig
+   * @brief Configure @ref datasetDiagnostics_ tool based on if passsed jsonConfig
    * requests them.
    */
   bool setDSDiagnostics(AttribsPtr attribs,
@@ -214,19 +214,19 @@ class AbstractAttributesManager : public ManagedFileBasedContainer<T, Access> {
     if (jsonIter == jsonConfig.MemberEnd()) {
       return false;
     }
-    return this->_DSDiagnostics->setDiagnosticesFromJSON(
+    return this->datasetDiagnostics_->setDiagnosticesFromJSON(
         jsonIter->value, Cr::Utility::formatString(
                              "(setDSDiagnostics) <{}> : {}", this->objectType_,
                              attribs->getSimplifiedHandle()));
   }  // setDSDiagnostics
 
   /**
    * @brief Merge the passed DatasetDiagnosticsTool settings into
-   * @p _DSDiagnostics nondestructively (i.e. retaining this one's enabled
+   * @p datasetDiagnostics_ nondestructively (i.e. retaining this one's enabled
    * diagnostics)
    */
   void mergeDSDiagnosticsTool(const DatasetDiagnosticsTool& _tool) {
-    this->_DSDiagnostics->mergeDiagnosticsTool(_tool);
+    this->datasetDiagnostics_->mergeDiagnosticsTool(_tool);
   }
 
   /**
@@ -452,7 +452,7 @@ class AbstractAttributesManager : public ManagedFileBasedContainer<T, Access> {
    * @brief Diagnostics tool that governs whether certain diagnostic operations
    * should occur.
    */
-  DatasetDiagnosticsTool::uptr _DSDiagnostics;
+  DatasetDiagnosticsTool::uptr datasetDiagnostics_;
 
  public:
   ESP_SMART_POINTERS(AbstractAttributesManager<T, Access>)

src/esp/metadata/managers/LightLayoutAttributesManager.h

@@ -157,7 +157,7 @@ class LightLayoutAttributesManager
    */
   void postRegisterObjectHandling(CORRADE_UNUSED int objectID,
                                   const std::string& objectHandle) override {
-    if (this->_DSDiagnostics->saveRequired()) {
+    if (this->datasetDiagnostics_->saveRequired()) {
       this->saveManagedObjectToFile(objectHandle, true);
     }
   }

src/esp/metadata/managers/ObjectAttributesManager.cpp

@@ -362,7 +362,7 @@ void ObjectAttributesManager::postRegisterObjectHandling(
   if (mapToAddTo_ != nullptr) {
     mapToAddTo_->emplace(objectTemplateID, objectTemplateHandle);
   }
-  if (this->_DSDiagnostics->saveRequired()) {
+  if (this->datasetDiagnostics_->saveRequired()) {
     this->saveManagedObjectToFile(objectTemplateHandle, true);
   }
 }  // ObjectAttributesManager::postRegisterObjectHandling

src/esp/metadata/managers/PbrShaderAttributesManager.h

@@ -174,7 +174,7 @@ class PbrShaderAttributesManager
    */
   void postRegisterObjectHandling(CORRADE_UNUSED int objectID,
                                   const std::string& objectHandle) override {
-    if (this->_DSDiagnostics->saveRequired()) {
+    if (this->datasetDiagnostics_->saveRequired()) {
       this->saveManagedObjectToFile(objectHandle, true);
     }
   }

src/esp/metadata/managers/PhysicsAttributesManager.h

@@ -149,7 +149,7 @@ class PhysicsAttributesManager
    */
   void postRegisterObjectHandling(CORRADE_UNUSED int objectID,
                                   const std::string& objectHandle) override {
-    if (this->_DSDiagnostics->saveRequired()) {
+    if (this->datasetDiagnostics_->saveRequired()) {
       this->saveManagedObjectToFile(objectHandle, true);
     }
   }

src/esp/metadata/managers/SceneDatasetAttributesManager.cpp

@@ -142,7 +142,7 @@ void SceneDatasetAttributesManager::readDatasetJSONCell(
     const U& attrMgr,
     std::map<std::string, std::string>* strKeyMap) {
   // merge DatasetDiagnostics tool from this manager into passed manager
-  attrMgr->mergeDSDiagnosticsTool(*(this->_DSDiagnostics));
+  attrMgr->mergeDSDiagnosticsTool(*(this->datasetDiagnostics_));
 
   io::JsonGenericValue::ConstMemberIterator jsonIter =
       jsonConfig.FindMember(tag);

src/esp/metadata/managers/SceneInstanceAttributesManager.cpp

@@ -115,12 +115,13 @@ void SceneInstanceAttributesManager::setValsFromJSONDocInternal(
   // Set this via configuration value - should only be called when explicitly
   // filtering dataset
   // Whether uniqueness validation should be performed
-  bool validateUniqueness = this->_DSDiagnostics->testDuplicateSceneInstances();
+  bool validateUniqueness =
+      this->datasetDiagnostics_->testDuplicateSceneInstances();
 
   // Only resave if instance attributes' attempt to be added reveals duplicate
   // attributes
   bool saveValidationResults =
-      validateUniqueness && this->_DSDiagnostics->shouldSaveCorrected();
+      validateUniqueness && this->datasetDiagnostics_->shouldSaveCorrected();
 
   // Whether this scene instance should be resaved or not.
   bool resaveAttributes = false;
@@ -303,8 +304,8 @@ void SceneInstanceAttributesManager::setValsFromJSONDocInternal(
   this->parseUserDefinedJsonVals(attribs, jsonConfig);
 
   // If we want to save corrected, and we need to due to corrections happening
-  this->_DSDiagnostics->setSaveRequired(saveValidationResults &&
-                                        resaveAttributes);
+  this->datasetDiagnostics_->setSaveRequired(saveValidationResults &&
+                                             resaveAttributes);
 }  // SceneInstanceAttributesManager::setValsFromJSONDoc
 
 SceneObjectInstanceAttributes::ptr

src/esp/metadata/managers/SceneInstanceAttributesManager.h

@@ -231,7 +231,7 @@ class SceneInstanceAttributesManager
    */
   void postRegisterObjectHandling(CORRADE_UNUSED int objectID,
                                   const std::string& objectHandle) override {
-    if (this->_DSDiagnostics->saveRequired()) {
+    if (this->datasetDiagnostics_->saveRequired()) {
       this->saveManagedObjectToFile(objectHandle, true);
     }
   }

src/esp/metadata/managers/SemanticAttributesManager.cpp

@@ -204,12 +204,12 @@ void SemanticAttributesManager::setValsFromJSONDocInternal(
   // filtering dataset
   // Whether uniqueness validation should be performed
   bool validateUniqueness =
-      this->_DSDiagnostics->testDuplicateSemanticRegions();
+      this->datasetDiagnostics_->testDuplicateSemanticRegions();
 
   // Only resave if instance attributes' attempt to be added reveals duplicate
   // attributes
   bool saveValidationResults =
-      validateUniqueness && this->_DSDiagnostics->shouldSaveCorrected();
+      validateUniqueness && this->datasetDiagnostics_->shouldSaveCorrected();
 
   // Whether this scene instance should be resaved or not.
   bool resaveAttributes = false;
@@ -254,8 +254,8 @@ void SemanticAttributesManager::setValsFromJSONDocInternal(
   this->parseUserDefinedJsonVals(semanticAttribs, jsonConfig);
 
   // If we want to save corrected, and we need to due to corrections happening
-  this->_DSDiagnostics->setSaveRequired(saveValidationResults &&
-                                        resaveAttributes);
+  this->datasetDiagnostics_->setSaveRequired(saveValidationResults &&
+                                             resaveAttributes);
 
 }  // SemanticAttributesManager::setValsFromJSONDoc
 

src/esp/metadata/managers/SemanticAttributesManager.h

@@ -164,7 +164,7 @@ class SemanticAttributesManager
    */
   void postRegisterObjectHandling(CORRADE_UNUSED int objectID,
                                   const std::string& objectHandle) override {
-    if (this->_DSDiagnostics->saveRequired()) {
+    if (this->datasetDiagnostics_->saveRequired()) {
       this->saveManagedObjectToFile(objectHandle, true);
     }
   }

src/esp/metadata/managers/StageAttributesManager.h

@@ -176,7 +176,7 @@ class StageAttributesManager
    */
   void postRegisterObjectHandling(CORRADE_UNUSED int objectID,
                                   const std::string& objectHandle) override {
-    if (this->_DSDiagnostics->saveRequired()) {
+    if (this->datasetDiagnostics_->saveRequired()) {
       this->saveManagedObjectToFile(objectHandle, true);
     }
   }