Skip to content

Commit 5e8278d

Browse files
committed
Code improvements following clang-tidy
1 parent 794c1f1 commit 5e8278d

5 files changed

Lines changed: 21 additions & 17 deletions

File tree

include/QualityControl/MonitorObject.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,15 @@ class MonitorObject : public TObject
3838
/// Destructor
3939
~MonitorObject() override;
4040

41+
/// Copy constructor
42+
MonitorObject (const MonitorObject& other) = default;
43+
/// Move constructor
44+
MonitorObject (MonitorObject&& other) noexcept = default;
45+
/// Copy assignment operator
46+
MonitorObject& operator= (const MonitorObject& other) = default;
47+
/// Move assignment operator
48+
MonitorObject& operator= (MonitorObject&& other) noexcept = default;
49+
4150
const std::string &getName() const
4251
{
4352
return mName;

include/QualityControl/SpyDevice.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ class SpyDevice: public FairMQDevice
3434
{
3535
public:
3636
SpyDevice();
37-
38-
~SpyDevice() override;
37+
~SpyDevice() override = default;
3938

4039
void stopSpy();
4140
void displayObject(std::string objectName);

src/ObjectsManager.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ ObjectsManager::ObjectsManager(TaskConfig &taskConfig) : mTaskName(taskConfig.ta
2424

2525
ObjectsManager::~ObjectsManager()
2626
{
27-
for (auto obj = mMonitorObjects.begin(); obj != mMonitorObjects.end(); obj++) {
28-
delete obj->second;
27+
for (auto &mMonitorObject : mMonitorObjects) {
28+
delete mMonitorObject.second;
2929
}
3030
mMonitorObjects.clear();
3131
}
3232

3333
void ObjectsManager::startPublishing(TObject *object, std::string objectName)
3434
{
35-
std::string nonEmptyName = objectName == "" ? object->GetName() : objectName;
35+
std::string nonEmptyName = objectName.empty() ? object->GetName() : objectName;
3636
auto *newObject = new MonitorObject(nonEmptyName, object, mTaskName);
3737
newObject->setIsOwner(false);
3838
mMonitorObjects[nonEmptyName] = newObject;

src/SpyDevice.cxx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ SpyDevice::SpyDevice()
2727
SetTransport("zeromq"); // or "nanomsg", etc
2828
}
2929

30-
SpyDevice::~SpyDevice()
31-
{
32-
}
33-
3430
void SpyDevice::setFrame(SpyMainFrame *frame)
3531
{
3632
mFrame = frame;
@@ -56,13 +52,13 @@ void SpyDevice::Run()
5652
while (fChannels.at("data-in").at(0).ReceiveAsync(message) > 0) {
5753
TestTMessage tm(message->GetData(), message->GetSize());
5854
TObject *tobj = tm.ReadObject(tm.GetClass());
59-
if (tobj) {
55+
if (tobj != nullptr) {
6056
// TODO once the bug in ROOt that removes spaces in strings passed in signal slot is fixed we can use the normal name.
6157
string objectName = tobj->GetName();
62-
MonitorObject *mo = dynamic_cast<MonitorObject*>(tobj);
58+
auto *mo = dynamic_cast<MonitorObject*>(tobj);
6359
Quality q = mo ? mo->getQuality() : Quality::Null;
6460
boost::erase_all(objectName, " ");
65-
if (mCache.count(objectName) && mCache[objectName]) {
61+
if (mCache.count(objectName) > 0 && mCache[objectName] != nullptr) {
6662
delete mCache[objectName];
6763
}
6864
mCache[objectName] = tobj;

src/SpyMainFrame.cxx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ void SpyMainFrame::displayObject(TObject *obj)
204204
gPad->Clear();
205205
}
206206

207-
string drawOptions = "";
207+
string drawOptions;
208208
if (((AliceO2::QualityControl::Core::MonitorObject *) obj)->getObject()->IsA() == TGraph::Class()) {
209209
drawOptions = "ALP";
210210
}
@@ -240,7 +240,7 @@ void SpyMainFrame::updateList(string name, /*AliceO2::QualityControl::Core::Qual
240240
this->MapSubwindows();
241241
this->Resize();
242242
gSystem->ProcessEvents();
243-
} else if (mDrawnObject) { // object is known and it is the one displayed -> redraw it
243+
} else if (mDrawnObject != nullptr) { // object is known and it is the one displayed -> redraw it
244244
string noSpaceName = mDrawnObject->GetName();
245245
boost::erase_all(noSpaceName, " ");
246246
if (noSpaceName == name) {
@@ -306,10 +306,10 @@ void SpyMainFrame::dbRun()
306306

307307
void SpyMainFrame::dbDisplayObject(string objectName)
308308
{
309-
string taskName = objectName.substr(0, objectName.find("/"));
310-
string objectNameOnly = objectName.substr(objectName.find("/") + 1);
309+
string taskName = objectName.substr(0, objectName.find('/'));
310+
string objectNameOnly = objectName.substr(objectName.find('/') + 1);
311311
AliceO2::QualityControl::Core::MonitorObject *mo = mDbInterface->retrieve(taskName, objectNameOnly);
312-
if (mo) {
312+
if (mo != nullptr) {
313313
displayObject(mo->getObject());
314314
delete mo;
315315
} else {

0 commit comments

Comments
 (0)