X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.hpp;h=1b323f0b74dc0b7b8de2d1b87605b6f0d39ca851;hp=121286f17aeed8e748d90045d019f3ae63b8b0fa;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=c4dd1e4ee295c4fc6bc3db0feaf826df4807cc91

diff --git a/pv/data/decode/decoder.hpp b/pv/data/decode/decoder.hpp
index 121286f..1b323f0 100644
--- a/pv/data/decode/decoder.hpp
+++ b/pv/data/decode/decoder.hpp
@@ -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/>.
  */
 
 #ifndef PULSEVIEW_PV_DATA_DECODE_DECODER_HPP
@@ -27,6 +26,11 @@
 
 #include <glib.h>
 
+using std::map;
+using std::set;
+using std::shared_ptr;
+using std::string;
+
 struct srd_decoder;
 struct srd_decoder_inst;
 struct srd_channel;
@@ -34,20 +38,17 @@ struct srd_session;
 
 namespace pv {
 
-namespace view {
-class LogicSignal;
-}
-
 namespace data {
 
 class Logic;
+class SignalBase;
 
 namespace decode {
 
 class Decoder
 {
 public:
-	Decoder(const srd_decoder *const decoder);
+	Decoder(const srd_decoder *const dec);
 
 	virtual ~Decoder();
 
@@ -56,12 +57,12 @@ public:
 	bool shown() const;
 	void show(bool show = true);
 
-	const std::map<const srd_channel*,
-		std::shared_ptr<view::LogicSignal> >& channels() const;
-	void set_channels(std::map<const srd_channel*,
-		std::shared_ptr<view::LogicSignal> > channels);
+	const map<const srd_channel*,
+		shared_ptr<data::SignalBase> >& channels() const;
+	void set_channels(map<const srd_channel*,
+		shared_ptr<data::SignalBase> > channels);
 
-	const std::map<std::string, GVariant*>& options() const;
+	const map<string, GVariant*>& options() const;
 
 	void set_option(const char *id, GVariant *value);
 
@@ -70,16 +71,15 @@ public:
 	srd_decoder_inst* create_decoder_inst(
 		srd_session *session) const;
 
-	std::set< std::shared_ptr<pv::data::Logic> > get_data();
+	set< shared_ptr<pv::data::Logic> > get_data();
 
 private:
 	const srd_decoder *const decoder_;
 
 	bool shown_;
 
-	std::map<const srd_channel*, std::shared_ptr<pv::view::LogicSignal> >
-		channels_;
-	std::map<std::string, GVariant*> options_;
+	map<const srd_channel*, shared_ptr<pv::data::SignalBase> > channels_;
+	map<string, GVariant*> options_;
 };
 
 } // namespace decode