X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frow.cpp;h=8e3a6512f8b55119f38219333165a686e98d62f9;hp=2aabf0f93fc0fc5dfa1237dd48d759126df28d9c;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hpb=2a21747e9daac2a45cd9a5ceb9a351f9775c5704 diff --git a/pv/data/decode/row.cpp b/pv/data/decode/row.cpp index 2aabf0f..8e3a651 100644 --- a/pv/data/decode/row.cpp +++ b/pv/data/decode/row.cpp @@ -27,44 +27,44 @@ namespace data { namespace decode { Row::Row() : - _decoder(NULL), - _row(NULL) + decoder_(NULL), + row_(NULL) { } Row::Row(const srd_decoder *decoder, const srd_decoder_annotation_row *row) : - _decoder(decoder), - _row(row) + decoder_(decoder), + row_(row) { } const srd_decoder* Row::decoder() const { - return _decoder; + return decoder_; } const srd_decoder_annotation_row* Row::row() const { - return _row; + return row_; } const QString Row::title() const { - if (_decoder && _decoder->name && _row && _row->desc) + if (decoder_ && decoder_->name && row_ && row_->desc) return QString("%1: %2") - .arg(QString::fromUtf8(_decoder->name)) - .arg(QString::fromUtf8(_row->desc)); - if (_decoder && _decoder->name) - return QString::fromUtf8(_decoder->name); - if (_row && _row->desc) - return QString::fromUtf8(_row->desc); + .arg(QString::fromUtf8(decoder_->name)) + .arg(QString::fromUtf8(row_->desc)); + if (decoder_ && decoder_->name) + return QString::fromUtf8(decoder_->name); + if (row_ && row_->desc) + return QString::fromUtf8(row_->desc); return QString(); } bool Row::operator<(const Row &other) const { - return (_decoder < other._decoder) || - (_decoder == other._decoder && _row < other._row); + return (decoder_ < other.decoder_) || + (decoder_ == other.decoder_ && row_ < other.row_); } } // decode