license: remove FSF postal address from boiler plate license text

[pulseview.git] / pv / data / decode / row.cpp

diff --git a/pv/data/decode/row.cpp b/pv/data/decode/row.cpp
index 0eee547c220ae2c80478d492645e8c7f9fd1ebd8..43ef91e6fc4ad39736e6a555f2582acfecaf95cb 100644 (file)
--- 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