Remove unused "using" declarations.

[pulseview.git] / pv / devices / hardwaredevice.cpp

diff --git a/pv/devices/hardwaredevice.cpp b/pv/devices/hardwaredevice.cpp
index 6374dafe6e03aaddb219a05c1fa4c3a21ab71dd5..ff52f817327d6d0d5790c91675e764d1d6091212 100644 (file)
--- a/pv/devices/hardwaredevice.cpp
+++ b/pv/devices/hardwaredevice.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 <boost/algorithm/string/join.hpp>
@@ -28,7 +27,6 @@
 
 #include "hardwaredevice.hpp"
 
-using std::dynamic_pointer_cast;
 using std::shared_ptr;
 using std::static_pointer_cast;
 using std::string;
@@ -41,19 +39,21 @@ using sigrok::HardwareDevice;
 namespace pv {
 namespace devices {
 
-HardwareDevice::HardwareDevice(const std::shared_ptr<sigrok::Context> &context,
-       std::shared_ptr<sigrok::HardwareDevice> device) :
-       context_(context) {
+HardwareDevice::HardwareDevice(const shared_ptr<sigrok::Context> &context,
+       shared_ptr<sigrok::HardwareDevice> device) :
+       context_(context),
+       device_open_(false)
+{
        device_ = device;
 }
 
-HardwareDevice::~HardwareDevice() {
-       device_->close();
-       if (session_)
-               session_->remove_devices();
+HardwareDevice::~HardwareDevice()
+{
+       close();
 }
 
-string HardwareDevice::full_name() const {
+string HardwareDevice::full_name() const
+{
        vector<string> parts = {device_->vendor(), device_->model(),
                device_->version(), device_->serial_number()};
        if (device_->connection_id().length() > 0)
@@ -61,12 +61,14 @@ string HardwareDevice::full_name() const {
        return join(parts, " ");
 }
 
-shared_ptr<sigrok::HardwareDevice> HardwareDevice::hardware_device() const {
+shared_ptr<sigrok::HardwareDevice> HardwareDevice::hardware_device() const
+{
        return static_pointer_cast<sigrok::HardwareDevice>(device_);
 }
 
 string HardwareDevice::display_name(
-       const DeviceManager &device_manager) const {
+       const DeviceManager &device_manager) const
+{
        const auto hw_dev = hardware_device();
 
        // If we can find another device with the same model/vendor then
@@ -96,17 +98,33 @@ string HardwareDevice::display_name(
        return join(parts, " ");
 }
 
-void HardwareDevice::create() {
-       // Open the device
-        try {
-                device_->open();
-        } catch(const sigrok::Error &e) {
-                throw QString(e.what());
-        }
-
-        // Set up the session
-        session_ = context_->create_session();
-        session_->add_device(device_);
+void HardwareDevice::open()
+{
+       if (device_open_)
+               close();
+
+       try {
+               device_->open();
+       } catch (const sigrok::Error &e) {
+               throw QString(e.what());
+       }
+
+       device_open_ = true;
+
+       // Set up the session
+       session_ = context_->create_session();
+       session_->add_device(device_);
+}
+
+void HardwareDevice::close()
+{
+       if (device_open_)
+               device_->close();
+
+       if (session_)
+               session_->remove_devices();
+
+       device_open_ = false;
 }
 
 } // namespace devices