BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bindings: Remove Device::description().

This commit is contained in:
Martin Ling 2014-10-12 17:57:27 +01:00 committed by Bert Vermeulen
parent 1411f7d8e9
commit d3a401c15b
3 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
bindings/cxx/classes.cpp
View File

@ -437,29 +437,6 @@ Device::~Device()
delete entry.second; delete entry.second;
} }
string Device::description()
{
ostringstream s;
vector<string> parts =
{vendor(), model(), version(), serial_number()};
for (size_t i = 0; i < parts.size(); i++)
{
if (parts[i].length() > 0)
{
if (i != 0)
s << " ";
s << parts[i];
}
}
if (serial_number().length() == 0 && connection_id().length() > 0)
s << " " << connection_id();
return s.str();
}
string Device::vendor() string Device::vendor()
{ {
return valid_string(_structure->vendor); return valid_string(_structure->vendor);
@ -789,11 +766,6 @@ SessionDevice::~SessionDevice()
{ {
} }
string SessionDevice::description()
{
return _parent->_filename;
}
shared_ptr<Device> SessionDevice::get_shared_from_this() shared_ptr<Device> SessionDevice::get_shared_from_this()
{ {
return static_pointer_cast<Device>(shared_from_this()); return static_pointer_cast<Device>(shared_from_this());
@ -1365,11 +1337,6 @@ InputDevice::~InputDevice()
{ {
} }
string InputDevice::description()
{
return "<input data>";
}
shared_ptr<Device> InputDevice::get_shared_from_this() shared_ptr<Device> InputDevice::get_shared_from_this()
{ {
return static_pointer_cast<Device>(shared_from_this()); return static_pointer_cast<Device>(shared_from_this());

7
bindings/cxx/include/libsigrok/libsigrok.hpp
View File

@ -352,8 +352,6 @@ protected:
class SR_API Device : public Configurable class SR_API Device : public Configurable
{ {
public: public:
/** Description identifying this device. */
virtual string description();
/** Vendor name for this device. */ /** Vendor name for this device. */
string vendor(); string vendor();
/** Model name for this device. */ /** Model name for this device. */
@ -615,8 +613,6 @@ class SR_API SessionDevice :
public ParentOwned<SessionDevice, Session, struct sr_dev_inst>, public ParentOwned<SessionDevice, Session, struct sr_dev_inst>,
public Device public Device
{ {
/** Description identifying this device. */
string description();
protected: protected:
SessionDevice(struct sr_dev_inst *sdi); SessionDevice(struct sr_dev_inst *sdi);
~SessionDevice(); ~SessionDevice();
@ -863,9 +859,6 @@ class SR_API InputDevice :
public ParentOwned<InputDevice, Input, struct sr_dev_inst>, public ParentOwned<InputDevice, Input, struct sr_dev_inst>,
public Device public Device
{ {
public:
/** Description identifying this device. */
string description();
protected: protected:
InputDevice(shared_ptr<Input> input, struct sr_dev_inst *sdi); InputDevice(shared_ptr<Input> input, struct sr_dev_inst *sdi);
~InputDevice(); ~InputDevice();

1
bindings/swig/classes.i
View File

@ -208,7 +208,6 @@ typedef std::map<const sigrok::ConfigKey *, Glib::VariantBase>
%attributeval(sigrok::OutputFormat, %attributeval(sigrok::OutputFormat,
map_string_Option, options, options); map_string_Option, options, options);
%attributestring(sigrok::Device, std::string, description, description);
%attributestring(sigrok::Device, std::string, vendor, vendor); %attributestring(sigrok::Device, std::string, vendor, vendor);
%attributestring(sigrok::Device, std::string, model, model); %attributestring(sigrok::Device, std::string, model, model);
%attributestring(sigrok::Device, std::string, version, version); %attributestring(sigrok::Device, std::string, version, version);