Fixes hinted by clang-tidy

Barthelemy · Barthelemy · commit 8885abcd8c3d · 2017-09-05T14:31:31.000+02:00
Modernize the code
diff --git a/Framework/src/AlfaReceiverForTests.cxx b/Framework/src/AlfaReceiverForTests.cxx
@@ -34,7 +34,7 @@ bool AlfaReceiverForTests::HandleData(FairMQMessagePtr &msg, int /*index*/)
   LOG(INFO) << "Received an object of size " << msg->GetSize();
 
   TestTMessage tm(msg->GetData(), msg->GetSize());
-  MonitorObject *mo = dynamic_cast<MonitorObject *>(tm.ReadObject(tm.GetClass()));
+  auto *mo = dynamic_cast<MonitorObject *>(tm.ReadObject(tm.GetClass()));
 
   LOG(INFO) << "    Name : \"" << mo->GetName() << "\"";
 
diff --git a/Framework/src/Checker.cxx b/Framework/src/Checker.cxx
@@ -10,7 +10,7 @@
 #include <TSystem.h>
 #include <TClass.h>
 // O2
-#include "Common/Exceptions.h"
+#include <Common/Exceptions.h>
 #include <Configuration/ConfigurationFactory.h>
 // QC
 #include "QualityControl/DatabaseFactory.h"
@@ -57,7 +57,7 @@ Checker::Checker(std::string checkerName, std::string configurationSource)
 
   // monitoring
   try {
-    mCollector = std::shared_ptr<AliceO2::Monitoring::Collector>(new AliceO2::Monitoring::Collector(configurationSource));
+    mCollector = std::make_shared<AliceO2::Monitoring::Collector>(configurationSource);
     mCollector->addDerivedMetric("objects", AliceO2::Monitoring::DerivedMetricMode::RATE);
   } catch (...) {
     string diagnostic = boost::current_exception_diagnostic_information();
@@ -131,7 +131,7 @@ Checker::~Checker()
 int size_t2int(size_t val)
 {
   if (val > INT_MAX) {
-    throw new out_of_range("Conversion from size_t to int failed.");
+    throw out_of_range("Conversion from size_t to int failed.");
   }
   return (int) val;
 }
@@ -147,7 +147,7 @@ bool Checker::HandleData(FairMQMessagePtr &msg, int index)
 
   // Deserialize the object and process it
   HistoMessage tm(msg->GetData(), size_t2int(msg->GetSize()));
-  MonitorObject *mo = dynamic_cast<MonitorObject *>(tm.ReadObject(tm.GetClass()));
+  auto *mo = dynamic_cast<MonitorObject *>(tm.ReadObject(tm.GetClass()));
   if (mo) {
     mo->setIsOwner(true);
     check(mo);
@@ -162,7 +162,6 @@ bool Checker::HandleData(FairMQMessagePtr &msg, int index)
   endLastObject = system_clock::now();
   // if 10 seconds elapsed publish stats
   if (timer.isTimeout()) {
-    double current = timer.getTime();
     timer.reset(1000000); // 10 s.
     mCollector->send(mTotalNumberHistosReceived, "objects");
   }
@@ -228,7 +227,7 @@ void Checker::send(MonitorObject *mo)
 /// \param libraryName The name of the library to load.
 void Checker::loadLibrary(const string libraryName)
 {
-  if (boost::algorithm::trim_copy(libraryName) == "") {
+  if (boost::algorithm::trim_copy(libraryName).empty()) {
     mLogger << "no library name specified" << AliceO2::InfoLogger::InfoLogger::endm;
     return;
   }
@@ -255,9 +254,9 @@ CheckInterface *Checker::instantiateCheck(string checkName, string className)
     mLogger << "Loading class " << className << AliceO2::InfoLogger::InfoLogger::endm;
     cl = TClass::GetClass(className.c_str());
     if (!cl) {
-      tempString += " because no dictionary for class named \"";
+      tempString +=  R"( because no dictionary for class named ")";
       tempString += className;
-      tempString += "\" could be retrieved";
+      tempString +=  R"(" could be retrieved)";
       cerr << tempString << endl;
       BOOST_THROW_EXCEPTION(FatalException() << errinfo_details(tempString));
     }
@@ -270,9 +269,9 @@ CheckInterface *Checker::instantiateCheck(string checkName, string className)
     mLogger << "Instantiating class " << className << " (" << cl << ")" << AliceO2::InfoLogger::InfoLogger::endm;
     result = static_cast<CheckInterface *>(cl->New());
     if (!result) {
-      tempString += " because the class named \"";
+      tempString += R"( because the class named ")";
       tempString += className;
-      tempString += "\" does not follow the TaskInterface interface";
+      tempString += R"( because the class named ")";
       BOOST_THROW_EXCEPTION(FatalException() << errinfo_details(tempString));
     }
     result->configure(checkName);
diff --git a/Framework/src/Consumer.cxx b/Framework/src/Consumer.cxx
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
     std::cout << "SVN revision : " << o2::quality_control::core::Version::getRevision() << std::endl;
     return EXIT_SUCCESS;
   }
-  string configurationSource = "";
+  string configurationSource;
   if (vm.count("configuration")) {
     configurationSource = vm["configuration"].as<string>();
   } /*else {
diff --git a/Framework/src/MonitorObject.cxx b/Framework/src/MonitorObject.cxx
@@ -12,7 +12,7 @@ namespace quality_control {
 namespace core {
 
 MonitorObject::MonitorObject()
-  : TObject(), mName(""), mObject(nullptr), mQuality(Quality::Null), mTaskName(""), mIsOwner(true)
+  : TObject(), mName(""), mQuality(Quality::Null), mObject(nullptr), mTaskName(""), mIsOwner(true)
 {
 }
 
@@ -24,7 +24,7 @@ MonitorObject::~MonitorObject()
 }
 
 MonitorObject::MonitorObject(const std::string &name, TObject *object, const std::string &taskName)
-  : TObject(), mName(name), mObject(object), mQuality(Quality::Null), mTaskName(taskName), mIsOwner(true)
+  : TObject(), mName(name), mQuality(Quality::Null), mObject(object), mTaskName(taskName), mIsOwner(true)
 {
 
 }
diff --git a/Framework/src/MySqlDatabase.cxx b/Framework/src/MySqlDatabase.cxx
@@ -178,8 +178,7 @@ o2::quality_control::core::MonitorObject* MySqlDatabase::retrieve(std::string ta
   statement->SetString(0, objectName.c_str());
 
   if (!(statement->Process() && statement->StoreResult())) {
-    if (statement)
-      delete statement;
+    delete statement;
     BOOST_THROW_EXCEPTION(
         DatabaseException()
             << errinfo_details("Encountered an error when processing and storing results in MySqlDatabase")
@@ -203,8 +202,7 @@ o2::quality_control::core::MonitorObject* MySqlDatabase::retrieve(std::string ta
     mess.Reset();
     mo = (o2::quality_control::core::MonitorObject*) (mess.ReadObjectAny(mess.GetClass()));
   }
-  if (statement)
-    delete statement;
+  delete statement;
 
   return mo;
 }
diff --git a/Framework/src/SpyMainFrame.cxx b/Framework/src/SpyMainFrame.cxx
@@ -47,7 +47,7 @@ SpyMainFrame::SpyMainFrame(SpyDevice *spyDevice, string configurationSource)
       throw;
     }
   } else {
-    mDbInterface = 0;
+    mDbInterface = nullptr;
   }
   cout << "mDbInterface : " << mDbInterface << endl;
 
@@ -61,9 +61,7 @@ SpyMainFrame::SpyMainFrame(SpyDevice *spyDevice, string configurationSource)
 
 SpyMainFrame::~SpyMainFrame()
 {
-  if (mDrawnObject) {
-    delete mDrawnObject;
-  }
+  delete mDrawnObject;
   std::map<std::string, TGButton *>::iterator iter;
   for (iter = mMapButtons.begin(); iter != mMapButtons.end(); iter++) {
     delete iter->second;
@@ -105,7 +103,7 @@ void SpyMainFrame::constructWindow()
   mSourceFairmq = new TGRadioButton(mRadioButtonGroup, "FairMQ");
   mSourceDb = new TGRadioButton(mRadioButtonGroup, "Database");
   mSourceFairmq->SetOn();
-  if (mDbInterface == 0) {
+  if (mDbInterface == nullptr) {
     mSourceDb->SetEnabled(false);
     mSourceDb->SetToolTipText("Pass a config file to enable the database option.");
   }
@@ -296,10 +294,10 @@ void SpyMainFrame::dbRun()
   // Get list of objects
   string s = "data_";
   s += mTaskField->GetText();
-  vector<string> objectNames = mDbInterface->getPublishedObjectNames(s.c_str());
+  vector<string> objectNames = mDbInterface->getPublishedObjectNames(s);
 
   // UpdateList for each
-  for (auto name : objectNames) {
+  for (const auto &name : objectNames) {
     updateList(name, mTaskField->GetText());
   }
 }
diff --git a/Framework/src/TaskDevice.cxx b/Framework/src/TaskDevice.cxx
@@ -188,7 +188,7 @@ unsigned long TaskDevice::publish()
 
   for (auto &pair : *mObjectsManager) {
     auto *mo = pair.second;
-    TMessage *message = new TMessage(kMESS_OBJECT); // will be deleted by fairmq using our custom method
+    auto *message = new TMessage(kMESS_OBJECT); // will be deleted by fairmq using our custom method
     message->WriteObjectAny(mo, mo->IsA());
     FairMQMessagePtr msg(NewMessage(message->Buffer(),
                                     message->BufferSize(),
diff --git a/Framework/src/qcCheckerLauncher.cxx b/Framework/src/qcCheckerLauncher.cxx
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
   } else {
     // we don't use the "required" option of the po::value because we want to output the help and avoid
     // horrible template error to be displayed to the user.
-    std::cout << "\"name\" is required!" << "\n";
+    std::cout <<  R"("name" is required!)" << "\n";
     std::cout << desc << std::endl;
     return EXIT_FAILURE;
   }
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
   } else {
     // we don't use the "required" option of the po::value because we want to output the help and avoid
     // horrible template error to be displayed to the user.
-    std::cout << "\"configuration\" is required!" << "\n";
+    std::cout <<  R"("configuration" is required!)" << "\n";
     std::cout << desc << std::endl;
     return EXIT_FAILURE;
   }
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
         cout << "We will get data from this address : " << addressesVector[i] << endl;
       }
     }
-    for (auto address : addressesForThisChecker) {
+    for (const auto &address : addressesForThisChecker) {
       checker.createChannel("sub", "connect", address, "data-in", true);
     }
 
diff --git a/Modules/Common/src/MeanIsAbove.cxx b/Modules/Common/src/MeanIsAbove.cxx
@@ -47,7 +47,7 @@ std::string MeanIsAbove::getAcceptedType()
 
 Quality MeanIsAbove::check(const MonitorObject *mo)
 {
-  TH1 *th1 = dynamic_cast<TH1*>(mo->getObject());
+  auto *th1 = dynamic_cast<TH1*>(mo->getObject());
   if (!th1) {
     // TODO
     return Quality::Null;
@@ -68,7 +68,7 @@ void MeanIsAbove::beautify(MonitorObject *mo, Quality checkResult)
     return;
   }
 
-  TH1* th1 = dynamic_cast<TH1*>(mo->getObject());
+  auto * th1 = dynamic_cast<TH1*>(mo->getObject());
 
   Double_t xMin = th1->GetXaxis()->GetXmin();
   Double_t xMax = th1->GetXaxis()->GetXmax();
diff --git a/Modules/Daq/include/Daq/DaqTask.h b/Modules/Daq/include/Daq/DaqTask.h
@@ -41,7 +41,7 @@ class DaqTask /*final*/: public TaskInterface // todo add back the "final" when
 
     TH1F *mPayloadSize;
     TGraph *mIds;
-    int fNPoints;
+    int mNPoints;
     TH1F *mNumberSubblocks;
     TH1F *mSubPayloadSize;
     UInt_t mTimeLastRecord;
diff --git a/Modules/Daq/src/DaqTask.cxx b/Modules/Daq/src/DaqTask.cxx
@@ -22,7 +22,7 @@ DaqTask::DaqTask()
   : TaskInterface(),
     mPayloadSize(nullptr),
     mIds(nullptr),
-    fNPoints(0),
+    mNPoints(0),
     mNumberSubblocks(nullptr),
     mSubPayloadSize(nullptr)
 {
@@ -73,7 +73,7 @@ void DaqTask::startOfActivity(Activity &activity)
   mNumberSubblocks->Reset();
   mSubPayloadSize->Reset();
   mIds->Set(0);
-  fNPoints = 0;
+  mNPoints = 0;
 }
 
 void DaqTask::startOfCycle()
@@ -83,13 +83,13 @@ void DaqTask::startOfCycle()
 
 void DaqTask::monitorDataBlock(DataSetReference dataSet)
 {
-  if (dataSet->size() <= 0) {
+  if (dataSet->empty()) {
     cout << "Empty vector!" << endl;
     return;
   }
 
   uint32_t totalPayloadSize = 0;
-  for (auto b : *dataSet) {
+  for (const auto &b : *dataSet) {
     uint32_t size = b->getData()->header.dataSize / 8;
     mSubPayloadSize->Fill(size);
     totalPayloadSize += size;
@@ -104,8 +104,8 @@ void DaqTask::monitorDataBlock(DataSetReference dataSet)
   }
   TDatime now;
   if ((now.Get() - mTimeLastRecord) >= 1) {
-    mIds->SetPoint(fNPoints, now.Convert(), dataSet->at(0)->getData()->header.id);
-    fNPoints++;
+    mIds->SetPoint(mNPoints, now.Convert(), dataSet->at(0)->getData()->header.id);
+    mNPoints++;
     mTimeLastRecord = now.Get();
   }
 }
diff --git a/Modules/Daq/src/EverIncreasingGraph.cxx b/Modules/Daq/src/EverIncreasingGraph.cxx
@@ -34,7 +34,7 @@ void EverIncreasingGraph::configure(std::string name)
 Quality EverIncreasingGraph::check(const MonitorObject *mo)
 {
   Quality result = Quality::Good;
-  TGraph *g = dynamic_cast<TGraph *>(mo->getObject());
+  auto *g = dynamic_cast<TGraph *>(mo->getObject());
 
   // simplistic and inefficient way to check that points are always increasing
   int nbPoints = g->GetN();
@@ -65,13 +65,13 @@ void EverIncreasingGraph::beautify(MonitorObject *mo, Quality checkResult)
     return;
   }
 
-  TGraph *g = dynamic_cast<TGraph*>(mo->getObject());
+  auto *g = dynamic_cast<TGraph*>(mo->getObject());
   if(!g){
     cerr << "MO should be a graph" << endl;
     return;
   }
 
-  TPaveText *paveText = new TPaveText(0.3, 0.8, 0.7, 0.95, "NDC");
+  auto *paveText = new TPaveText(0.3, 0.8, 0.7, 0.95, "NDC");
   if (checkResult == Quality::Good) {
     paveText->SetFillColor(kGreen);
     paveText->AddText("No anomalies");
diff --git a/Modules/Example/src/BenchmarkTask.cxx b/Modules/Example/src/BenchmarkTask.cxx
@@ -40,7 +40,7 @@ void BenchmarkTask::initialize()
 
   // Create and publish the histos
   for (size_t i = 0; i < mNumberHistos; i++) {
-    assert(mHistos.size() == 0); // because otherwise the code below makes no sense.
+    assert(mHistos.empty()); // because otherwise the code below makes no sense.
     stringstream name;
     name << "histogram_" << getName() << "_" << i;
     mHistos.push_back(new TH1F(name.str().c_str(), name.str().c_str(), 1000, -5, 5));
diff --git a/Modules/Example/src/ExampleTask.cxx b/Modules/Example/src/ExampleTask.cxx
@@ -18,16 +18,16 @@ namespace example {
 ExampleTask::ExampleTask()
   : TaskInterface()
 {
-  for (int i = 0; i < 25; i++) {
-    mHistos[i] = nullptr;
+  for (auto &mHisto : mHistos) {
+    mHisto = nullptr;
   }
 }
 
 ExampleTask::~ExampleTask()
 {
-  for (int i = 0; i < 25; i++) {
-    if (mHistos[i]) {
-      delete mHistos[i];
+  for (auto &mHisto : mHistos) {
+    if (mHisto) {
+      delete mHisto;
     }
   }
 }
@@ -58,8 +58,8 @@ void ExampleTask::initialize()
 void ExampleTask::startOfActivity(Activity &activity)
 {
   QcInfoLogger::GetInstance() << "startOfActivity" << AliceO2::InfoLogger::InfoLogger::endm;
-  for (int i = 0; i < 25; i++) {
-    mHistos[i]->Reset();
+  for (auto &mHisto : mHistos) {
+    mHisto->Reset();
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ int main(int argc, char *argv[])`
`82`	`82`	`std::cout << "SVN revision : " << o2::quality_control::core::Version::getRevision() << std::endl;`
`83`	`83`	`return EXIT_SUCCESS;`
`84`	`84`	`}`
`85`		`- string configurationSource = "";`
	`85`	`+ string configurationSource;`
`86`	`86`	`if (vm.count("configuration")) {`
`87`	`87`	`configurationSource = vm["configuration"].as<string>();`
`88`	`88`	`} /*else {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace quality_control {`
`12`	`12`	`namespace core {`
`13`	`13`
`14`	`14`	`MonitorObject::MonitorObject()`
`15`		`- : TObject(), mName(""), mObject(nullptr), mQuality(Quality::Null), mTaskName(""), mIsOwner(true)`
	`15`	`+ : TObject(), mName(""), mQuality(Quality::Null), mObject(nullptr), mTaskName(""), mIsOwner(true)`
`16`	`16`	`{`
`17`	`17`	`}`
`18`	`18`
`@@ -24,7 +24,7 @@ MonitorObject::~MonitorObject()`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`MonitorObject::MonitorObject(const std::string &name, TObject *object, const std::string &taskName)`
`27`		`- : TObject(), mName(name), mObject(object), mQuality(Quality::Null), mTaskName(taskName), mIsOwner(true)`
	`27`	`+ : TObject(), mName(name), mQuality(Quality::Null), mObject(object), mTaskName(taskName), mIsOwner(true)`
`28`	`28`	`{`
`29`	`29`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ int main(int argc, char *argv[])`
`59`	`59`	`} else {`
`60`	`60`	`// we don't use the "required" option of the po::value because we want to output the help and avoid`
`61`	`61`	`// horrible template error to be displayed to the user.`
`62`		`- std::cout << "\"name\" is required!" << "\n";`
	`62`	`+ std::cout << R"("name" is required!)" << "\n";`
`63`	`63`	`std::cout << desc << std::endl;`
`64`	`64`	`return EXIT_FAILURE;`
`65`	`65`	`}`
`@@ -68,7 +68,7 @@ int main(int argc, char *argv[])`
`68`	`68`	`} else {`
`69`	`69`	`// we don't use the "required" option of the po::value because we want to output the help and avoid`
`70`	`70`	`// horrible template error to be displayed to the user.`
`71`		`- std::cout << "\"configuration\" is required!" << "\n";`
	`71`	`+ std::cout << R"("configuration" is required!)" << "\n";`
`72`	`72`	`std::cout << desc << std::endl;`
`73`	`73`	`return EXIT_FAILURE;`
`74`	`74`	`}`
`@@ -90,7 +90,7 @@ int main(int argc, char *argv[])`
`90`	`90`	`cout << "We will get data from this address : " << addressesVector[i] << endl;`
`91`	`91`	`}`
`92`	`92`	`}`
`93`		`- for (auto address : addressesForThisChecker) {`
	`93`	`+ for (const auto &address : addressesForThisChecker) {`
`94`	`94`	`checker.createChannel("sub", "connect", address, "data-in", true);`
`95`	`95`	`}`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ std::string MeanIsAbove::getAcceptedType()`
`47`	`47`
`48`	`48`	`Quality MeanIsAbove::check(const MonitorObject *mo)`
`49`	`49`	`{`
`50`		`- TH1 th1 = dynamic_cast<TH1>(mo->getObject());`
	`50`	`+ auto th1 = dynamic_cast<TH1>(mo->getObject());`
`51`	`51`	`if (!th1) {`
`52`	`52`	`// TODO`
`53`	`53`	`return Quality::Null;`
`@@ -68,7 +68,7 @@ void MeanIsAbove::beautify(MonitorObject *mo, Quality checkResult)`
`68`	`68`	`return;`
`69`	`69`	`}`
`70`	`70`
`71`		`- TH1* th1 = dynamic_cast<TH1*>(mo->getObject());`
	`71`	`+ auto * th1 = dynamic_cast<TH1*>(mo->getObject());`
`72`	`72`
`73`	`73`	`Double_t xMin = th1->GetXaxis()->GetXmin();`
`74`	`74`	`Double_t xMax = th1->GetXaxis()->GetXmax();`