Various minor whitespace and consistency fixes.

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

diff --git a/pv/devices/device.cpp b/pv/devices/device.cpp
index 4027a1c2d820a35ba248e312f3d066af789df620..4edc1d10e11cbb3be3e1b5ae1e79760da47fc4cb 100644 (file)
--- a/pv/devices/device.cpp
+++ b/pv/devices/device.cpp
@@ -36,19 +36,23 @@ using Glib::Variant;
 namespace pv {
 namespace devices {
 
-Device::Device() {
+Device::Device()
+{
 }
 
-Device::~Device() {
+Device::~Device()
+{
        if (session_)
                session_->remove_datafeed_callbacks();
 }
 
-std::shared_ptr<sigrok::Session> Device::session() const {
+std::shared_ptr<sigrok::Session> Device::session() const
+{
        return session_;
 }
 
-std::shared_ptr<sigrok::Device> Device::device() const {
+std::shared_ptr<sigrok::Device> Device::device() const
+{
        return device_;
 }
 
@@ -73,25 +77,28 @@ T Device::read_config(const ConfigKey *key, const T default_value)
 
        const auto iter = keys.find(key);
        if (iter == keys.end() ||
-               (*iter).second.find(sigrok::GET) != (*iter).second.end())
+               (*iter).second.find(sigrok::GET) == (*iter).second.end())
                return default_value;
 
-       return VariantBase::cast_dynamic<Variant<T>>(
+       return VariantBase::cast_dynamic<Glib::Variant<guint64>>(
                device_->config_get(ConfigKey::SAMPLERATE)).get();
 }
 
-void Device::start() {
+void Device::start()
+{
        assert(session_);
        session_->start();
 }
 
-void Device::run() {
+void Device::run()
+{
        assert(device_);
        assert(session_);
        session_->run();
 }
 
-void Device::stop() {
+void Device::stop()
+{
        assert(session_);
        session_->stop();
 }