X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fdata%2Fdecode%2Frow.cpp;h=1266b8436e1e09934b92418b62e5a6ebc42e7728;hb=808d1a7e63b957cf0b873294e53d7fd76b5e41b9;hp=2aabf0f93fc0fc5dfa1237dd48d759126df28d9c;hpb=88908838c9682423c83da4cf1ab07e3aa43fc47e;p=pulseview.git
diff --git a/pv/data/decode/row.cpp b/pv/data/decode/row.cpp
index 2aabf0f..1266b84 100644
--- a/pv/data/decode/row.cpp
+++ b/pv/data/decode/row.cpp
@@ -14,11 +14,10 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
-#include "row.h"
+#include "row.hpp"
#include
@@ -27,46 +26,46 @@ namespace data {
namespace decode {
Row::Row() :
- _decoder(NULL),
- _row(NULL)
+ decoder_(nullptr),
+ row_(nullptr)
{
}
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),
+ 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
-} // data
-} // pv
+} // namespace decode
+} // namespace data
+} // namespace pv