projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use std:: in the code directly (where possible).
[pulseview.git]
/
pv
/
data
/
decode
/
decoder.cpp
diff --git
a/pv/data/decode/decoder.cpp
b/pv/data/decode/decoder.cpp
index bd1d307fb5d00006bb4aa01d611d37467c681b82..d3ee3459255ebc1ff3246fcda2d6a61b53859e56 100644
(file)
--- 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
* 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>
*/
#include <cassert>
@@
-25,7
+24,7
@@
#include "decoder.hpp"
#include "decoder.hpp"
-#include <pv/
view/logicsignal
.hpp>
+#include <pv/
data/signalbase
.hpp>
using std::set;
using std::map;
using std::set;
using std::map;
@@
-63,19
+62,19
@@
void Decoder::show(bool show)
shown_ = 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_;
}
Decoder::channels() const
{
return channels_;
}
-void Decoder::set_channels(
std::
map<const srd_channel*,
- s
td::shared_ptr<view::LogicSignal
> > channels)
+void Decoder::set_channels(map<const srd_channel*,
+ s
hared_ptr<data::SignalBase
> > channels)
{
channels_ = channels;
}
{
channels_ = channels;
}
-const
std::map<std::
string, GVariant*>& Decoder::options() const
+const
map<
string, GVariant*>& Decoder::options() const
{
return options_;
}
{
return options_;
}
@@
-103,9
+102,9
@@
set< shared_ptr<pv::data::Logic> > Decoder::get_data()
{
set< shared_ptr<pv::data::Logic> > data;
for (const auto& channel : channels_) {
{
set< shared_ptr<pv::data::Logic> > data;
for (const auto& channel : channels_) {
- shared_ptr<
view::LogicSignal> signal
(channel.second);
- assert(
signal
);
- data.insert(
signal
->logic_data());
+ shared_ptr<
data::SignalBase> b
(channel.second);
+ assert(
b
);
+ data.insert(
b
->logic_data());
}
return data;
}
return data;
@@
-135,9
+134,8
@@
srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
for (const auto& channel : channels_) {
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
for (const auto& channel : channels_) {
- shared_ptr<view::LogicSignal> signal(channel.second);
- GVariant *const gvar = g_variant_new_int32(
- signal->base()->index());
+ 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, channel.first->id, gvar);
}
g_variant_ref_sink(gvar);
g_hash_table_insert(channels, channel.first->id, gvar);
}