X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frow.cpp;h=43ef91e6fc4ad39736e6a555f2582acfecaf95cb;hp=0eee547c220ae2c80478d492645e8c7f9fd1ebd8;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=f9101a91fc942a28515872ae6c7285973bd54b91

diff --git a/pv/data/decode/row.cpp b/pv/data/decode/row.cpp
index 0eee547..43ef91e 100644
--- a/pv/data/decode/row.cpp
+++ b/pv/data/decode/row.cpp
@@ -14,42 +14,56 @@
  * 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 <http://www.gnu.org/licenses/>.
  */
 
-#include "row.h"
+#include "row.hpp"
+
+#include <libsigrokdecode/libsigrokdecode.h>
 
 namespace pv {
 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)
+		return QString("%1: %2")
+			.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