official
/
OpenLCP
1
0
Fork 0
Code Releases 1 Activity

consistency across ternary returns

This commit is contained in:
Kevin Matz 2022-12-04 10:36:37 -05:00
parent 501167c8ee
commit 302cf63ca6
3 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
platform/qt/multiverseitem.cpp
View File

@ -101,9 +101,7 @@ void MultiverseItem::createChildren()
*/
MultiverseItem* MultiverseItem::child(int row) const
{
if (row < 0 || row >= childItems_.size())
return nullptr;
return childItems_.at(row);
return (row < 0 || row >= childItems_.size()) ? nullptr : childItems_.at(row);
}
@ -323,10 +321,10 @@ Qt::ItemFlags MultiverseItem::flags(int column, Qt::ItemFlags base) const
case MultiverseModel::SourceName:
return base;
case MultiverseModel::Priority:
if (universe_ && universe_->isEditable())
return base | Qt::ItemIsEditable;
else
return base;
if (universe_ && universe_->isEditable())
return base | Qt::ItemIsEditable;
else
return base;
default:
return Qt::NoItemFlags;
}

4
platform/qt/qsacnnode.cpp
View File

@ -220,6 +220,7 @@ void QSacnNode::terminate(const uint16_t num)
}
}
/**
* @brief QSacnNode::UdpPayloadReceiver
*/
@ -280,8 +281,7 @@ void QSacnNode::sendUDP(const ACN::PDU::Stream stream,
return;
}
writeDatagram(reinterpret_cast<char*>(stream->base()), stream->size(),
addr, ip.port);
writeDatagram(reinterpret_cast<char*>(stream->base()), stream->size(), addr, ip.port);
}

22
platform/qt/qsacnuniverse.cpp
View File

@ -48,9 +48,7 @@ QSacnUniverse::~QSacnUniverse()
const QString QSacnUniverse::sourceName() const
{
auto metadata = universe_->provenance();
if (!metadata)
return QString();
return QString::fromUtf8(metadata->source_name.c_str());
return metadata ? QString::fromUtf8(metadata->source_name.c_str()) : QString();
}
@ -61,9 +59,7 @@ const QString QSacnUniverse::sourceName() const
uint16_t QSacnUniverse::number() const
{
auto metadata = universe_->provenance();
if (!metadata)
return 0;
return metadata->universe;
return metadata ? metadata->universe : 0;
}
@ -74,9 +70,7 @@ uint16_t QSacnUniverse::number() const
uint8_t QSacnUniverse::priority() const
{
auto metadata = universe_->provenance();
if (!metadata)
return 0;
return metadata->priority;
return metadata ? metadata->priority : 0;
}
@ -86,7 +80,7 @@ uint8_t QSacnUniverse::priority() const
*/
double QSacnUniverse::rxRate() const
{
return (universe_) ? universe_->rxRate() : -1;
return universe_ ? universe_->rxRate() : -1;
}
@ -96,7 +90,7 @@ double QSacnUniverse::rxRate() const
*/
uint8_t QSacnUniverse::status() const
{
return (universe_) ? universe_->status() : sACN::Universe::DMX_NULL;
return universe_ ? universe_->status() : sACN::Universe::DMX_NULL;
}
@ -107,7 +101,7 @@ uint8_t QSacnUniverse::status() const
*/
uint8_t QSacnUniverse::slot(const uint16_t slot) const
{
return (universe_) ? universe_->slot(slot) : 0;
return universe_ ? universe_->slot(slot) : 0;
}
@ -117,7 +111,7 @@ uint8_t QSacnUniverse::slot(const uint16_t slot) const
*/
bool QSacnUniverse::isEditable() const
{
return (universe_) ? universe_->isEditable() : false;
return universe_ ? universe_->isEditable() : false;
}
@ -162,7 +156,7 @@ QSacnUniverse* QSacnUniverse::sourceUniverse(const sACN::DATA::data_header& meta
*/
uint16_t QSacnUniverse::activeSlots() const
{
return (universe_) ? universe_->activeSlots() : 0;
return universe_ ? universe_->activeSlots() : 0;
}