Internal decoder class handling refactoring

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

diff --git a/pv/data/decode/row.cpp b/pv/data/decode/row.cpp
index 8e3a6512f8b55119f38219333165a686e98d62f9..12951556390c15f2a0ed5e2e647365cb567fb675 100644 (file)
--- a/pv/data/decode/row.cpp
+++ b/pv/data/decode/row.cpp
@@ -14,11 +14,11 @@
  * 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 "decoder.hpp"
+#include "row.hpp"
 
 #include <libsigrokdecode/libsigrokdecode.h>
 
@@ -27,46 +27,64 @@ 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) :
+Row::Row(int index, const Decoder* decoder, const srd_decoder_annotation_row* row) :
+       index_(index),
        decoder_(decoder),
        row_(row)
 {
 }
 
-const srd_decoder* Row::decoder() const
+const Decoder* Row::decoder() const
 {
        return decoder_;
 }
 
-const srd_decoder_annotation_row* Row::row() const
+const srd_decoder_annotation_row* Row::srd_row() const
 {
        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);
+                       .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
+const QString Row::class_name() const
+{
+       if (row_ && row_->desc)
+               return QString::fromUtf8(row_->desc);
+       return QString();
+}
+
+int Row::index() const
+{
+       return index_;
+}
+
+bool Row::operator<(const Row& other) const
 {
        return (decoder_ < other.decoder_) ||
                (decoder_ == other.decoder_ && row_ < other.row_);
 }
 
-} // decode
-} // data
-} // pv
+bool Row::operator==(const Row& other) const
+{
+       return ((decoder_ == other.decoder()) && (row_ == other.srd_row()));
+}
+
+}  // namespace decode
+}  // namespace data
+}  // namespace pv