C++17 nested namespaces (#130)

* Change nested namespaces to C++17 style

* Change nested namespaces to C++17 style

* Formatting

Author: Barthelemy

Framework/include/QualityControl/Activity.h

@@ -6,11 +6,7 @@
 #ifndef QC_CORE_ACTIVITY_H
 #define QC_CORE_ACTIVITY_H
 
-namespace o2
-{
-namespace quality_control
-{
-namespace core
+namespace o2::quality_control::core
 {
 
 /// \brief Dummy class that should be removed when there is the official one.
@@ -36,8 +32,6 @@ class Activity
   int mType{ 0 };
 };
 
-} // namespace core
-} // namespace quality_control
-} // namespace o2
+} // namespace o2::quality_control::core
 
 #endif // QC_CORE_ACTIVITY_H

Framework/include/QualityControl/CcdbDatabase.h

@@ -19,11 +19,7 @@
 #include "CCDB/CcdbApi.h"
 #include "QualityControl/DatabaseInterface.h"
 
-namespace o2
-{
-namespace quality_control
-{
-namespace repository
+namespace o2::quality_control::repository
 {
 
 /*
@@ -82,8 +78,6 @@ class CcdbDatabase : public DatabaseInterface
   std::string mUrl;
 };
 
-} // namespace repository
-} // namespace quality_control
-} // namespace o2
+} // namespace o2::quality_control::repository
 
 #endif // QC_REPOSITORY_CCDBDATABASE_H

Framework/include/QualityControl/CheckInterface.h

@@ -11,11 +11,7 @@
 
 using namespace o2::quality_control::core;
 
-namespace o2
-{
-namespace quality_control
-{
-namespace checker
+namespace o2::quality_control::checker
 {
 
 /// \brief  Skeleton of a check.
@@ -77,8 +73,6 @@ class CheckInterface
   ClassDef(CheckInterface, 1)
 };
 
-} /* namespace checker */
-} /* namespace quality_control */
-} /* namespace o2 */
+} // namespace o2::quality_control::checker
 
 #endif /* QC_CHECKER_CHECKINTERFACE_H */

Framework/include/QualityControl/Checker.h

@@ -21,11 +21,7 @@
 #include "QualityControl/MonitorObject.h"
 #include "QualityControl/QcInfoLogger.h"
 
-namespace o2
-{
-namespace quality_control
-{
-namespace checker
+namespace o2::quality_control::checker
 {
 
 /// \brief The class in charge of running the checks on a MonitorObject.
@@ -125,8 +121,6 @@ class Checker : public framework::Task
   AliceO2::Common::Timer timer;
 };
 
-} /* namespace checker */
-} /* namespace quality_control */
-} /* namespace o2 */
+} // namespace o2::quality_control::checker
 
 #endif // QC_CHECKER_CHECKER_H

Framework/include/QualityControl/CheckerFactory.h

@@ -7,11 +7,7 @@
 
 #include "Framework/DataProcessorSpec.h"
 
-namespace o2
-{
-namespace quality_control
-{
-namespace checker
+namespace o2::quality_control::checker
 {
 
 /// \brief Factory in charge of creating DataProcessorSpec of QC Checker
@@ -24,8 +20,6 @@ class CheckerFactory
   framework::DataProcessorSpec create(std::string checkerName, std::string taskName, std::string configurationSource);
 };
 
-} // namespace checker
-} // namespace quality_control
-} // namespace o2
+} // namespace o2::quality_control::checker
 
 #endif // QC_CHECKERFACTORY_H

Framework/include/QualityControl/DataDumpGui.h

@@ -19,11 +19,7 @@
 
 #include "FairMQDevice.h"
 
-namespace o2
-{
-namespace quality_control
-{
-namespace core
+namespace o2::quality_control::core
 {
 
 /**
@@ -76,8 +72,6 @@ class DataDumpGui : public FairMQDevice
  private:
   void assignDataToChunk(void* data, size_t size, Chunk& chunk);
 };
-} // namespace core
-} // namespace quality_control
-} // namespace o2
+} // namespace o2::quality_control::core
 
 #endif // QC_CORE_DATADUMP_H

Framework/include/QualityControl/DatabaseFactory.h

@@ -12,11 +12,7 @@
 // QC
 #include "QualityControl/DatabaseInterface.h"
 
-namespace o2
-{
-namespace quality_control
-{
-namespace repository
+namespace o2::quality_control::repository
 {
 
 /// \brief Factory to get a database accessor
@@ -31,8 +27,6 @@ class DatabaseFactory
   static std::unique_ptr<DatabaseInterface> create(std::string name);
 };
 
-} // namespace repository
-} // namespace quality_control
-} // namespace o2
+} // namespace o2::quality_control::repository
 
 #endif // QC_REPOSITORY_DATABASEFACTORY_H

Framework/include/QualityControl/DatabaseInterface.h

@@ -11,11 +11,7 @@
 #include <unordered_map>
 //#include <bits/unique_ptr.h>
 
-namespace o2
-{
-namespace quality_control
-{
-namespace repository
+namespace o2::quality_control::repository
 {
 
 /// \brief The interface to the MonitorObject's repository.
@@ -81,8 +77,6 @@ class DatabaseInterface
   virtual void truncate(std::string taskName, std::string objectName) = 0;
 };
 
-} /* namespace repository */
-} /* namespace quality_control */
-} /* namespace o2 */
+} // namespace o2::quality_control::repository
 
 #endif /* QC_REPOSITORY_DATABASEINTERFACE_H */

Framework/include/QualityControl/HistoMerger.h

@@ -16,11 +16,7 @@
 
 #include "QualityControl/MonitorObject.h"
 
-namespace o2
-{
-namespace quality_control
-{
-namespace core
+namespace o2::quality_control::core
 {
 
 /// \brief A crude histogram merger for development purposes.
@@ -64,8 +60,6 @@ class HistoMerger : public framework::Task
   o2::framework::OutputSpec mOutputSpec;
 };
 
-} // namespace core
-} // namespace quality_control
-} // namespace o2
+} // namespace o2::quality_control::core
 
 #endif // QC_CORE_HISTOMERGER_H

Framework/include/QualityControl/InfrastructureGenerator.h

@@ -9,9 +9,7 @@
 #include <string>
 #include <Framework/WorkflowSpec.h>
 
-namespace o2
-{
-namespace quality_control
+namespace o2::quality_control
 {
 namespace core
 {
@@ -96,7 +94,6 @@ inline void generateRemoteInfrastructure(framework::WorkflowSpec& workflow, std:
   core::InfrastructureGenerator::generateRemoteInfrastructure(workflow, configurationSource);
 }
 
-} // namespace quality_control
-} // namespace o2
+} // namespace o2::quality_control
 
 #endif //QC_CORE_INFRASTRUCTUREGENERATOR_H