X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=5fae925886155a900394cb64d6861e6e3fb37b82;hp=03f4f0ebabdfc4cae68af572163d1b5345e49a98;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=c4dd1e4ee295c4fc6bc3db0feaf826df4807cc91

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index 03f4f0e..5fae925 100644
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -14,8 +14,7 @@
  * 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 <cassert>
@@ -25,7 +24,7 @@
 
 #include "decoder.hpp"
 
-#include <pv/view/logicsignal.hpp>
+#include <pv/data/signalbase.hpp>
 
 using std::set;
 using std::map;
@@ -44,8 +43,8 @@ Decoder::Decoder(const srd_decoder *const dec) :
 
 Decoder::~Decoder()
 {
-	for (auto i = options_.begin(); i != options_.end(); i++)
-		g_variant_unref((*i).second);
+	for (auto& option : options_)
+		g_variant_unref(option.second);
 }
 
 const srd_decoder* Decoder::decoder() const
@@ -63,14 +62,14 @@ void Decoder::show(bool show)
 	shown_ = show;
 }
 
-const map<const srd_channel*, shared_ptr<view::LogicSignal> >&
+const map<const srd_channel*, shared_ptr<data::SignalBase> >&
 Decoder::channels() const
 {
 	return channels_;
 }
 
 void Decoder::set_channels(std::map<const srd_channel*,
-	std::shared_ptr<view::LogicSignal> > channels)
+	std::shared_ptr<data::SignalBase> > channels)
 {
 	channels_ = channels;
 }
@@ -102,10 +101,10 @@ bool Decoder::have_required_channels() const
 set< shared_ptr<pv::data::Logic> > Decoder::get_data()
 {
 	set< shared_ptr<pv::data::Logic> > data;
-	for (auto i = channels_.cbegin(); i != channels_.cend(); i++) {
-		shared_ptr<view::LogicSignal> signal((*i).second);
-		assert(signal);
-		data.insert(signal->logic_data());
+	for (const auto& channel : channels_) {
+		shared_ptr<data::SignalBase> b(channel.second);
+		assert(b);
+		data.insert(b->logic_data());
 	}
 
 	return data;
@@ -116,12 +115,11 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
 	GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
 		g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
-	for (auto i = options_.cbegin(); i != options_.cend(); i++)
-	{
-		GVariant *const value = (*i).second;
+	for (const auto& option : options_) {
+		GVariant *const value = option.second;
 		g_variant_ref(value);
 		g_hash_table_replace(opt_hash, (void*)g_strdup(
-			(*i).first.c_str()), value);
+			option.first.c_str()), value);
 	}
 
 	srd_decoder_inst *const decoder_inst = srd_inst_new(
@@ -135,13 +133,11 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
 	GHashTable *const channels = g_hash_table_new_full(g_str_hash,
 		g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
-	for (auto i = channels_.cbegin(); i != channels_.cend(); i++)
-	{
-		shared_ptr<view::LogicSignal> signal((*i).second);
-		GVariant *const gvar = g_variant_new_int32(
-			signal->channel()->index());
+	for (const auto& channel : channels_) {
+		shared_ptr<data::SignalBase> b(channel.second);
+		GVariant *const gvar = g_variant_new_int32(b->index());
 		g_variant_ref_sink(gvar);
-		g_hash_table_insert(channels, (*i).first->id, gvar);
+		g_hash_table_insert(channels, channel.first->id, gvar);
 	}
 
 	srd_inst_channel_set_all(decoder_inst, channels);