Minor whitespace cosmetics.

diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp
index 30e4e67dcecced37fa8267b489c9364363e1223a..d43f89a9c596551ba8e06a6d6710075582993565 100644 (file)
--- a/pv/data/logicsegment.cpp
+++ b/pv/data/logicsegment.cpp
@@ -47,7 +47,7 @@ const float LogicSegment::LogMipMapScaleFactor = logf(MipMapScaleFactor);
 const uint64_t LogicSegment::MipMapDataUnit = 64*1024; // bytes
 
 LogicSegment::LogicSegment(shared_ptr<Logic> logic, uint64_t samplerate,
-                             const uint64_t expected_num_samples) :
+                               const uint64_t expected_num_samples) :
        Segment(samplerate, logic->unit_size()),
        last_append_sample_(0)
 {

diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp
index 4fcbf694279edd0a4a2527d4869e6e45aa93ed01..5baedcbcacaa1a2e06c52050419f5c77158b906d 100644 (file)
--- a/pv/dialogs/connect.cpp
+++ b/pv/dialogs/connect.cpp
@@ -108,7 +108,7 @@ void Connect::populate_drivers()
                 */
                bool supported_device = driver->config_check(
                        ConfigKey::LOGIC_ANALYZER, ConfigKey::DEVICE_OPTIONS) |
-                                       driver->config_check(
+                                       driver->config_check(
                        ConfigKey::OSCILLOSCOPE, ConfigKey::DEVICE_OPTIONS);
 
                if (supported_device)

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 8006b65d8d992296245793bcc26269fedcc7c349..ee2227d55782d957b3fb08e00f3961819759d464 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -251,9 +251,9 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format,
                const pv::util::Timestamp& end_time = view_->cursors()->second()->time();
 
                const uint64_t start_sample = start_time.convert_to<double>() * samplerate;
-           const uint64_t end_sample = end_time.convert_to<double>() * samplerate;
+               const uint64_t end_sample = end_time.convert_to<double>() * samplerate;
 
-           sample_range = std::make_pair(start_sample, end_sample);
+               sample_range = std::make_pair(start_sample, end_sample);
        } else {
                sample_range = std::make_pair(0, 0);
        }

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 309fa1b37062c8facf922bccbc5f433418cd23bb..5500292a8df777563b624a5365a241bd7e93978b 100644 (file)
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -202,7 +202,7 @@ void StoreSession::store_proc(shared_ptr<data::LogicSegment> segment)
        const int unit_size = segment->unit_size();
        assert(unit_size != 0);
 
-       // Qt needs the progress values to fit inside an int.  If they would
+       // Qt needs the progress values to fit inside an int. If they would
        // not, scale the current and max values down until they do.
        while ((sample_count_ >> progress_scale) > INT_MAX)
                progress_scale ++;

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 393af57711c699732c84cfd05c1ee9933dff0f6d..601e73b163a6ed84683ca8b3bcf9526ab3a8e048 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -35,10 +35,10 @@ using std::vector;
 namespace pv {
 namespace view {
 
-const float Ruler::RulerHeight = 2.5f;  // x Text Height
+const float Ruler::RulerHeight = 2.5f; // x Text Height
 const int Ruler::MinorTickSubdivision = 4;
 
-const float Ruler::HoverArrowSize = 0.5f;  // x Text Height
+const float Ruler::HoverArrowSize = 0.5f; // x Text Height
 
 Ruler::Ruler(View &parent) :
        MarginWidget(parent)

diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp
index 140b85187efef4f2309837db938db75a6de82dce..9c1d49ff2b6645b5ae186b900b2fccf058b6f813 100644 (file)
--- a/pv/view/tracegroup.cpp
+++ b/pv/view/tracegroup.cpp
@@ -164,7 +164,7 @@ void TraceGroup::restack_items()
                [](const shared_ptr<TraceTreeItem> &a, const shared_ptr<TraceTreeItem> &b) {
                        const auto aext = a->v_extents();
                        const auto bext = b->v_extents();
-                        return a->layout_v_offset() +
+                       return a->layout_v_offset() +
                                        (aext.first + aext.second) / 2 <
                                b->layout_v_offset() +
                                        (bext.first + bext.second) / 2;

diff --git a/pv/widgets/hidingmenubar.cpp b/pv/widgets/hidingmenubar.cpp
index dcc8fde5fcd07708cac534f3c3e664d1fd8f59f3..0da364b116c1fc59f45643feb29a8aa2d89563c2 100644 (file)
--- a/pv/widgets/hidingmenubar.cpp
+++ b/pv/widgets/hidingmenubar.cpp
@@ -52,5 +52,5 @@ void HidingMenuBar::item_triggered()
        setHidden(true);
 }
 
-}  // namespace widgets
-}  // namespace pv
+} // namespace widgets
+} // namespace pv