From 2ad82c2e40b6865481733913a2c32735602f63c4 Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Wed, 16 Dec 2015 22:22:01 +0100
Subject: [PATCH] Various minor whitespace and consistency fixes.

---
 main.cpp                         |  2 +-
 pv/binding/binding.cpp           |  3 +--
 pv/binding/decoder.cpp           |  9 +++----
 pv/binding/device.cpp            |  3 +--
 pv/binding/inputoutput.cpp       |  3 +--
 pv/data/analogsegment.cpp        | 20 +++++---------
 pv/data/decoderstack.cpp         | 24 ++++++-----------
 pv/data/logicsegment.cpp         | 45 ++++++++++++--------------------
 pv/data/segment.cpp              |  3 +--
 pv/devicemanager.cpp             |  9 ++++---
 pv/devices/device.cpp            | 21 ++++++++++-----
 pv/devices/file.cpp              |  9 ++++---
 pv/devices/hardwaredevice.cpp    | 23 ++++++++++------
 pv/devices/inputfile.cpp         | 18 ++++++++-----
 pv/devices/sessionfile.cpp       |  9 ++++---
 pv/dialogs/connect.cpp           |  3 +--
 pv/mainwindow.cpp                | 14 +++++-----
 pv/popups/channels.cpp           | 22 ++++++----------
 pv/prop/int.cpp                  | 31 ++++++----------------
 pv/session.cpp                   | 37 +++++++++-----------------
 pv/storesession.cpp              |  3 +--
 pv/toolbars/mainbar.cpp          | 34 +++++++++---------------
 pv/util.cpp                      | 16 ++++--------
 pv/view/cursorpair.cpp           |  9 ++++---
 pv/view/decodetrace.cpp          | 28 +++++++-------------
 pv/view/header.cpp               |  3 +--
 pv/view/marginwidget.cpp         |  3 +--
 pv/view/ruler.cpp                |  3 +--
 pv/view/view.cpp                 | 12 +++------
 pv/view/viewitempaintparams.cpp  |  6 +++--
 pv/view/viewport.cpp             |  7 ++---
 pv/view/viewwidget.cpp           | 16 ++++--------
 pv/widgets/colourbutton.cpp      |  4 +--
 pv/widgets/decodermenu.cpp       |  3 +--
 pv/widgets/popup.cpp             |  7 ++---
 pv/widgets/sweeptimingwidget.cpp |  6 ++---
 pv/widgets/timestampspinbox.cpp  |  3 +--
 37 files changed, 193 insertions(+), 278 deletions(-)

diff --git a/main.cpp b/main.cpp
index daec62d2..7ac7ef36 100644
--- a/main.cpp
+++ b/main.cpp
@@ -183,7 +183,7 @@ int main(int argc, char *argv[])
 			// Run the application
 			ret = a.exec();
 
-		} catch(std::exception e) {
+		} catch (std::exception e) {
 			qDebug() << e.what();
 		}
 
diff --git a/pv/binding/binding.cpp b/pv/binding/binding.cpp
index fccb96be..f2a28d39 100644
--- a/pv/binding/binding.cpp
+++ b/pv/binding/binding.cpp
@@ -49,8 +49,7 @@ void Binding::add_properties_to_form(QFormLayout *layout,
 {
 	assert(layout);
 
-	for (shared_ptr<pv::prop::Property> p : properties_)
-	{
+	for (shared_ptr<pv::prop::Property> p : properties_) {
 		assert(p);
 
 		QWidget *const widget = p->get_widget(layout->parentWidget(),
diff --git a/pv/binding/decoder.cpp b/pv/binding/decoder.cpp
index 28cc30d6..7d29e2fd 100644
--- a/pv/binding/decoder.cpp
+++ b/pv/binding/decoder.cpp
@@ -59,8 +59,7 @@ Decoder::Decoder(
 	const srd_decoder *const dec = decoder_->decoder();
 	assert(dec);
 
-	for (GSList *l = dec->options; l; l = l->next)
-	{
+	for (GSList *l = dec->options; l; l = l->next) {
 		const srd_decoder_option *const opt =
 			(srd_decoder_option*)l->data;
 
@@ -116,13 +115,11 @@ Glib::VariantBase Decoder::getter(const char *id)
 
 	if (iter != options.end())
 		val = (*iter).second;
-	else
-	{
+	else {
 		assert(decoder_->decoder());
 
 		// Get the default value if not
-		for (GSList *l = decoder_->decoder()->options; l; l = l->next)
-		{
+		for (GSList *l = decoder_->decoder()->options; l; l = l->next) {
 			const srd_decoder_option *const opt =
 				(srd_decoder_option*)l->data;
 			if (strcmp(opt->id, id) == 0) {
diff --git a/pv/binding/device.cpp b/pv/binding/device.cpp
index 6f978893..77c772c0 100644
--- a/pv/binding/device.cpp
+++ b/pv/binding/device.cpp
@@ -88,8 +88,7 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
 			config_changed();
 		};
 
-		switch (key->id())
-		{
+		switch (key->id()) {
 		case SR_CONF_SAMPLERATE:
 			// Sample rate values are not bound because they are shown
 			// in the MainBar
diff --git a/pv/binding/inputoutput.cpp b/pv/binding/inputoutput.cpp
index 0dc0fc19..30548a82 100644
--- a/pv/binding/inputoutput.cpp
+++ b/pv/binding/inputoutput.cpp
@@ -61,8 +61,7 @@ namespace binding {
 InputOutput::InputOutput(
 	const map<string, shared_ptr<Option>> &options)
 {
-	for (pair<string, shared_ptr<Option>> o : options)
-	{
+	for (pair<string, shared_ptr<Option>> o : options) {
 		const shared_ptr<Option> &opt = o.second;
 		assert(opt);
 
diff --git a/pv/data/analogsegment.cpp b/pv/data/analogsegment.cpp
index 3703f0d0..cd4384dd 100644
--- a/pv/data/analogsegment.cpp
+++ b/pv/data/analogsegment.cpp
@@ -74,8 +74,7 @@ void AnalogSegment::append_interleaved_samples(const float *data,
 
 	float *dst = (float*)data_.data() + sample_count_;
 	const float *dst_end = dst + sample_count;
-	while (dst != dst_end)
-	{
+	while (dst != dst_end) {
 		*dst++ = *data;
 		data += stride;
 	}
@@ -131,8 +130,7 @@ void AnalogSegment::reallocate_envelope(Envelope &e)
 {
 	const uint64_t new_data_length = ((e.length + EnvelopeDataUnit - 1) /
 		EnvelopeDataUnit) * EnvelopeDataUnit;
-	if (new_data_length > e.data_length)
-	{
+	if (new_data_length > e.data_length) {
 		e.data_length = new_data_length;
 		e.samples = (EnvelopeSample*)realloc(e.samples,
 			new_data_length * sizeof(EnvelopeSample));
@@ -161,9 +159,8 @@ void AnalogSegment::append_payload_to_envelope_levels()
 	const float *const end_src_ptr = (float*)data_.data() +
 		e0.length * EnvelopeScaleFactor;
 	for (const float *src_ptr = (float*)data_.data() +
-		prev_length * EnvelopeScaleFactor;
-		src_ptr < end_src_ptr; src_ptr += EnvelopeScaleFactor)
-	{
+			prev_length * EnvelopeScaleFactor;
+			src_ptr < end_src_ptr; src_ptr += EnvelopeScaleFactor) {
 		const EnvelopeSample sub_sample = {
 			*min_element(src_ptr, src_ptr + EnvelopeScaleFactor),
 			*max_element(src_ptr, src_ptr + EnvelopeScaleFactor),
@@ -173,8 +170,7 @@ void AnalogSegment::append_payload_to_envelope_levels()
 	}
 
 	// Compute higher level mipmaps
-	for (unsigned int level = 1; level < ScaleStepCount; level++)
-	{
+	for (unsigned int level = 1; level < ScaleStepCount; level++) {
 		Envelope &e = envelope_levels_[level];
 		const Envelope &el = envelope_levels_[level-1];
 
@@ -193,14 +189,12 @@ void AnalogSegment::append_payload_to_envelope_levels()
 			el.samples + prev_length * EnvelopeScaleFactor;
 		const EnvelopeSample *const end_dest_ptr = e.samples + e.length;
 		for (dest_ptr = e.samples + prev_length;
-			dest_ptr < end_dest_ptr; dest_ptr++)
-		{
+				dest_ptr < end_dest_ptr; dest_ptr++) {
 			const EnvelopeSample *const end_src_ptr =
 				src_ptr + EnvelopeScaleFactor;
 
 			EnvelopeSample sub_sample = *src_ptr++;
-			while (src_ptr < end_src_ptr)
-			{
+			while (src_ptr < end_src_ptr) {
 				sub_sample.min = min(sub_sample.min, src_ptr->min);
 				sub_sample.max = max(sub_sample.max, src_ptr->max);
 				src_ptr++;
diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 0bb875da..2668df29 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -136,8 +136,7 @@ std::vector<Row> DecoderStack::get_visible_rows() const
 
 	vector<Row> rows;
 
-	for (const shared_ptr<decode::Decoder> &dec : stack_)
-	{
+	for (const shared_ptr<decode::Decoder> &dec : stack_) {
 		assert(dec);
 		if (!dec->shown())
 			continue;
@@ -150,8 +149,7 @@ std::vector<Row> DecoderStack::get_visible_rows() const
 			rows.push_back(Row(decc));
 
 		// Add the decoder rows
-		for (const GSList *l = decc->annotation_rows; l; l = l->next)
-		{
+		for (const GSList *l = decc->annotation_rows; l; l = l->next) {
 			const srd_decoder_annotation_row *const ann_row =
 				(srd_decoder_annotation_row *)l->data;
 			assert(ann_row);
@@ -213,8 +211,7 @@ void DecoderStack::begin_decode()
 		}
 
 	// Add classes
-	for (const shared_ptr<decode::Decoder> &dec : stack_)
-	{
+	for (const shared_ptr<decode::Decoder> &dec : stack_) {
 		assert(dec);
 		const srd_decoder *const decc = dec->decoder();
 		assert(dec->decoder());
@@ -224,8 +221,7 @@ void DecoderStack::begin_decode()
 			rows_[Row(decc)] = decode::RowData();
 
 		// Add the decoder rows
-		for (const GSList *l = decc->annotation_rows; l; l = l->next)
-		{
+		for (const GSList *l = decc->annotation_rows; l; l = l->next) {
 			const srd_decoder_annotation_row *const ann_row =
 				(srd_decoder_annotation_row *)l->data;
 			assert(ann_row);
@@ -304,8 +300,7 @@ void DecoderStack::decode_data(
 		DecodeChunkLength / segment_->unit_size();
 
 	for (int64_t i = 0; !interrupt_ && i < sample_count;
-		i += chunk_sample_count)
-	{
+			i += chunk_sample_count) {
 		lock_guard<mutex> decode_lock(global_decode_mutex_);
 
 		const int64_t chunk_end = min(
@@ -345,12 +340,10 @@ void DecoderStack::decode_proc()
 	// Create the decoders
 	const unsigned int unit_size = segment_->unit_size();
 
-	for (const shared_ptr<decode::Decoder> &dec : stack_)
-	{
+	for (const shared_ptr<decode::Decoder> &dec : stack_) {
 		srd_decoder_inst *const di = dec->create_decoder_inst(session);
 
-		if (!di)
-		{
+		if (!di) {
 			error_message_ = tr("Failed to create decoder instance");
 			srd_session_destroy(session);
 			return;
@@ -409,8 +402,7 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 	const auto r = d->class_rows_.find(make_pair(decc, a.format()));
 	if (r != d->class_rows_.end())
 		row_iter = d->rows_.find((*r).second);
-	else
-	{
+	else {
 		// Failing that, use the decoder as a key
 		row_iter = d->rows_.find(Row(decc));	
 	}
diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp
index d43f89a9..3e18b85e 100644
--- a/pv/data/logicsegment.cpp
+++ b/pv/data/logicsegment.cpp
@@ -71,7 +71,7 @@ uint64_t LogicSegment::unpack_sample(const uint8_t *ptr) const
 	return *(uint64_t*)ptr;
 #else
 	uint64_t value = 0;
-	switch(unit_size_) {
+	switch (unit_size_) {
 	default:
 		value |= ((uint64_t)ptr[7]) << 56;
 		/* FALLTHRU */
@@ -108,7 +108,7 @@ void LogicSegment::pack_sample(uint8_t *ptr, uint64_t value)
 #ifdef HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS
 	*(uint64_t*)ptr = value;
 #else
-	switch(unit_size_) {
+	switch (unit_size_) {
 	default:
 		ptr[7] = value >> 56;
 		/* FALLTHRU */
@@ -173,8 +173,7 @@ void LogicSegment::reallocate_mipmap_level(MipMapLevel &m)
 {
 	const uint64_t new_data_length = ((m.length + MipMapDataUnit - 1) /
 		MipMapDataUnit) * MipMapDataUnit;
-	if (new_data_length > m.data_length)
-	{
+	if (new_data_length > m.data_length) {
 		m.data_length = new_data_length;
 
 		// Padding is added to allow for the uint64_t write word
@@ -208,14 +207,12 @@ void LogicSegment::append_payload_to_mipmap()
 	const uint8_t *const end_src_ptr = (uint8_t*)data_.data() +
 		m0.length * unit_size_ * MipMapScaleFactor;
 	for (src_ptr = (uint8_t*)data_.data() +
-		prev_length * unit_size_ * MipMapScaleFactor;
-		src_ptr < end_src_ptr;)
-	{
+			prev_length * unit_size_ * MipMapScaleFactor;
+			src_ptr < end_src_ptr;) {
 		// Accumulate transitions which have occurred in this sample
 		accumulator = 0;
 		diff_counter = MipMapScaleFactor;
-		while (diff_counter-- > 0)
-		{
+		while (diff_counter-- > 0) {
 			const uint64_t sample = unpack_sample(src_ptr);
 			accumulator |= last_append_sample_ ^ sample;
 			last_append_sample_ = sample;
@@ -227,8 +224,7 @@ void LogicSegment::append_payload_to_mipmap()
 	}
 
 	// Compute higher level mipmaps
-	for (unsigned int level = 1; level < ScaleStepCount; level++)
-	{
+	for (unsigned int level = 1; level < ScaleStepCount; level++) {
 		MipMapLevel &m = mip_map_[level];
 		const MipMapLevel &ml = mip_map_[level-1];
 
@@ -248,14 +244,12 @@ void LogicSegment::append_payload_to_mipmap()
 		const uint8_t *const end_dest_ptr =
 			(uint8_t*)m.data + unit_size_ * m.length;
 		for (dest_ptr = (uint8_t*)m.data +
-			unit_size_ * prev_length;
-			dest_ptr < end_dest_ptr;
-			dest_ptr += unit_size_)
-		{
+				unit_size_ * prev_length;
+				dest_ptr < end_dest_ptr;
+				dest_ptr += unit_size_) {
 			accumulator = 0;
 			diff_counter = MipMapScaleFactor;
-			while (diff_counter-- > 0)
-			{
+			while (diff_counter-- > 0) {
 				accumulator |= unpack_sample(src_ptr);
 				src_ptr += unit_size_;
 			}
@@ -299,8 +293,7 @@ void LogicSegment::get_subsampled_edges(
 	last_sample = (get_sample(start) & sig_mask) != 0;
 	edges.push_back(pair<int64_t, bool>(index++, last_sample));
 
-	while (index + block_length <= end)
-	{
+	while (index + block_length <= end) {
 		//----- Continue to search -----//
 		level = min_level;
 
@@ -308,17 +301,15 @@ void LogicSegment::get_subsampled_edges(
 		// at the minimum level.
 		fast_forward = (mip_map_[level].data != nullptr);
 
-		if (min_length < MipMapScaleFactor)
-		{
+		if (min_length < MipMapScaleFactor) {
 			// Search individual samples up to the beginning of
 			// the next first level mip map block
 			const uint64_t final_index = min(end,
 				pow2_ceil(index, MipMapScalePower));
 
 			for (; index < final_index &&
-				(index & ~(~0 << MipMapScalePower)) != 0;
-				index++)
-			{
+					(index & ~(~0 << MipMapScalePower)) != 0;
+					index++) {
 				const bool sample =
 					(get_sample(index) & sig_mask) != 0;
 
@@ -328,9 +319,7 @@ void LogicSegment::get_subsampled_edges(
 					break;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			// If resolution is less than a mip map block,
 			// round up to the beginning of the mip-map block
 			// for this level of detail
@@ -399,7 +388,7 @@ void LogicSegment::get_subsampled_edges(
 				// Check if we reached the last block at this
 				// level, or if there was a change in this block
 				if (offset >= mip_map_[level].length ||
-					(get_subsample(level, offset) &
+						(get_subsample(level, offset) &
 						sig_mask)) {
 					// Zoom in unless we reached the minimum
 					// zoom
diff --git a/pv/data/segment.cpp b/pv/data/segment.cpp
index 831c0aca..754e300d 100644
--- a/pv/data/segment.cpp
+++ b/pv/data/segment.cpp
@@ -98,9 +98,8 @@ void Segment::append_data(void *data, uint64_t samples)
 
 	// Ensure there's enough capacity to copy.
 	const uint64_t free_space = capacity_ - sample_count_;
-	if (free_space < samples) {
+	if (free_space < samples)
 		set_capacity(sample_count_ + samples);
-	}
 
 	memcpy((uint8_t*)data_.data() + sample_count_ * unit_size_,
 		data, samples * unit_size_);
diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index f1f4c542..b11e60c7 100644
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -151,10 +151,12 @@ const shared_ptr<devices::HardwareDevice> DeviceManager::find_device_from_info(
 
 		// If present, vendor and model always have to match.
 		if (dev_info.count("vendor") > 0 && search_info.count("vendor") > 0)
-			if (dev_info.at("vendor") != search_info.at("vendor")) continue;
+			if (dev_info.at("vendor") != search_info.at("vendor"))
+				continue;
 
 		if (dev_info.count("model") > 0 && search_info.count("model") > 0)
-			if (dev_info.at("model") != search_info.at("model")) continue;
+			if (dev_info.at("model") != search_info.at("model"))
+				continue;
 
 		// Most unique match: vendor/model/serial_num (but don't match a S/N of 0)
 		if ((dev_info.count("serial_num") > 0) && (dev_info.at("serial_num") != "0")
@@ -189,7 +191,8 @@ const shared_ptr<devices::HardwareDevice> DeviceManager::find_device_from_info(
 }
 
 bool DeviceManager::compare_devices(shared_ptr<devices::Device> a,
-	shared_ptr<devices::Device> b) {
+	shared_ptr<devices::Device> b)
+{
 	assert(a);
 	assert(b);
 	return a->display_name(*this).compare(b->display_name(*this)) < 0;
diff --git a/pv/devices/device.cpp b/pv/devices/device.cpp
index d7a78afa..4edc1d10 100644
--- 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_;
 }
 
@@ -80,18 +84,21 @@ T Device::read_config(const ConfigKey *key, const T default_value)
 		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();
 }
diff --git a/pv/devices/file.cpp b/pv/devices/file.cpp
index 91f2d5d6..5e1cb859 100644
--- a/pv/devices/file.cpp
+++ b/pv/devices/file.cpp
@@ -26,14 +26,17 @@ namespace pv {
 namespace devices {
 
 File::File(const std::string &file_name) :
-	file_name_(file_name) {
+	file_name_(file_name)
+{
 }
 
-std::string File::full_name() const {
+std::string File::full_name() const
+{
 	return boost::filesystem::path(file_name_).filename().string();
 }
 
-std::string File::display_name(const DeviceManager&) const {
+std::string File::display_name(const DeviceManager&) const
+{
 	return File::full_name();
 }
 
diff --git a/pv/devices/hardwaredevice.cpp b/pv/devices/hardwaredevice.cpp
index d1161aa2..318ce1ca 100644
--- a/pv/devices/hardwaredevice.cpp
+++ b/pv/devices/hardwaredevice.cpp
@@ -44,15 +44,18 @@ namespace devices {
 HardwareDevice::HardwareDevice(const std::shared_ptr<sigrok::Context> &context,
 	std::shared_ptr<sigrok::HardwareDevice> device) :
 	context_(context),
-	device_open_(false) {
+	device_open_(false)
+{
 	device_ = device;
 }
 
-HardwareDevice::~HardwareDevice() {
+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)
@@ -60,12 +63,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
@@ -95,13 +100,14 @@ string HardwareDevice::display_name(
 	return join(parts, " ");
 }
 
-void HardwareDevice::open() {
+void HardwareDevice::open()
+{
 	if (device_open_)
 		close();
 
 	try {
 		device_->open();
-	} catch(const sigrok::Error &e) {
+	} catch (const sigrok::Error &e) {
 		throw QString(e.what());
 	}
 
@@ -112,7 +118,8 @@ void HardwareDevice::open() {
 	session_->add_device(device_);
 }
 
-void HardwareDevice::close() {
+void HardwareDevice::close()
+{
 	if (device_open_)
 		device_->close();
 
diff --git a/pv/devices/inputfile.cpp b/pv/devices/inputfile.cpp
index 13af3db9..3ddc8ae0 100644
--- a/pv/devices/inputfile.cpp
+++ b/pv/devices/inputfile.cpp
@@ -37,27 +37,32 @@ InputFile::InputFile(const std::shared_ptr<sigrok::Context> &context,
 	File(file_name),
 	context_(context),
 	input_(format->create_input(options)),
-	interrupt_(false) {
+	interrupt_(false)
+{
 	if (!input_)
 		throw QString("Failed to create input");
 }
 
-void InputFile::open() {
+void InputFile::open()
+{
 	if (session_)
 		close();
 
 	session_ = context_->create_session();
 }
 
-void InputFile::close() {
+void InputFile::close()
+{
 	if (session_)
 		session_->remove_devices();
 }
 
-void InputFile::start() {
+void InputFile::start()
+{
 }
 
-void InputFile::run() {
+void InputFile::run()
+{
 	char buffer[BufferSize];
 	bool need_device = true;
 
@@ -92,7 +97,8 @@ void InputFile::run() {
 	input_->end();
 }
 
-void InputFile::stop() {
+void InputFile::stop()
+{
 	interrupt_ = true;
 }
 
diff --git a/pv/devices/sessionfile.cpp b/pv/devices/sessionfile.cpp
index e6920ff5..8a583eeb 100644
--- a/pv/devices/sessionfile.cpp
+++ b/pv/devices/sessionfile.cpp
@@ -30,10 +30,12 @@ namespace devices {
 SessionFile::SessionFile(const std::shared_ptr<sigrok::Context> context,
 	const std::string &file_name) :
 	File(file_name),
-	context_(context) {
+	context_(context)
+{
 }
 
-void SessionFile::open() {
+void SessionFile::open()
+{
 	if (session_)
 		close();
 
@@ -41,7 +43,8 @@ void SessionFile::open() {
 	device_ = session_->devices()[0];
 }
 
-void SessionFile::close() {
+void SessionFile::close()
+{
 	if (session_)
 		session_->remove_devices();
 }
diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp
index 5baedcbc..bf92998b 100644
--- a/pv/dialogs/connect.cpp
+++ b/pv/dialogs/connect.cpp
@@ -172,8 +172,7 @@ void Connect::scan_pressed()
 	const list< shared_ptr<HardwareDevice> > devices =
 		device_manager_.driver_scan(driver, drvopts);
 
-	for (shared_ptr<HardwareDevice> device : devices)
-	{
+	for (shared_ptr<HardwareDevice> device : devices) {
 		assert(device);
 
 		QString text = QString::fromStdString(
diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index dad9d680..d693ddc3 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -195,12 +195,11 @@ QMenu* MainWindow::menu_decoder_add() const
 
 void MainWindow::run_stop()
 {
-	switch(session_.get_capture_state()) {
+	switch (session_.get_capture_state()) {
 	case Session::Stopped:
 		session_.start_capture([&](QString message) {
 			session_error("Capture failed", message); });
 		break;
-
 	case Session::AwaitingTrigger:
 	case Session::Running:
 		session_.stop_capture();
@@ -215,7 +214,7 @@ void MainWindow::select_device(shared_ptr<devices::Device> device)
 			session_.set_device(device);
 		else
 			session_.set_default_device();
-	} catch(const QString &e) {
+	} catch (const QString &e) {
 		QMessageBox msg(this);
 		msg.setText(e);
 		msg.setInformativeText(tr("Failed to Select Device"));
@@ -545,7 +544,8 @@ void MainWindow::setup_ui()
 
 }
 
-void MainWindow::select_init_device() {
+void MainWindow::select_init_device()
+{
 	QSettings settings;
 	map<string, string> dev_info;
 	list<string> key_list;
@@ -577,7 +577,8 @@ void MainWindow::select_init_device() {
 }
 
 void MainWindow::load_init_file(const std::string &file_name,
-	const std::string &format) {
+	const std::string &format)
+{
 	shared_ptr<InputFormat> input_format;
 
 	if (!format.empty()) {
@@ -622,7 +623,6 @@ void MainWindow::save_ui_settings()
 			session_.device());
 
 		for (string key : key_list) {
-
 			if (dev_info.count(key))
 				settings.setValue(QString::fromUtf8(key.c_str()),
 						QString::fromUtf8(dev_info.at(key).c_str()));
@@ -681,7 +681,7 @@ void MainWindow::load_file(QString file_name,
 				new devices::SessionFile(
 					device_manager_.context(),
 					file_name.toStdString())));
-	} catch(Error e) {
+	} catch (Error e) {
 		show_session_error(tr("Failed to load ") + file_name, e.what());
 		session_.set_default_device();
 		update_device_list();
diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index bffd0dfe..1a042da8 100644
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -86,14 +86,12 @@ Channels::Channels(Session &session, QWidget *parent) :
 		signal_map[sig->channel()] = sig;
 
 	// Populate channel groups
-	for (auto entry : device->channel_groups())
-	{
+	for (auto entry : device->channel_groups()) {
 		shared_ptr<ChannelGroup> group = entry.second;
 		// Make a set of signals, and removed this signals from the
 		// signal map.
 		vector< shared_ptr<Signal> > group_sigs;
-		for (auto channel : group->channels())
-		{
+		for (auto channel : group->channels()) {
 			const auto iter = signal_map.find(channel);
 
 			if (iter == signal_map.end())
@@ -108,8 +106,7 @@ Channels::Channels(Session &session, QWidget *parent) :
 
 	// Make a vector of the remaining channels
 	vector< shared_ptr<Signal> > global_sigs;
-	for (auto channel : device->channels())
-	{
+	for (auto channel : device->channels()) {
 		const map<shared_ptr<Channel>, shared_ptr<Signal> >::
 			const_iterator iter = signal_map.find(channel);
 		if (iter != signal_map.end())
@@ -144,9 +141,8 @@ void Channels::set_all_channels(bool set)
 	updating_channels_ = true;
 
 	for (map<QCheckBox*, shared_ptr<Signal> >::const_iterator i =
-		check_box_signal_map_.begin();
-		i != check_box_signal_map_.end(); i++)
-	{
+			check_box_signal_map_.begin();
+			i != check_box_signal_map_.end(); i++) {
 		const shared_ptr<Signal> sig = (*i).second;
 		assert(sig);
 
@@ -194,8 +190,7 @@ QGridLayout* Channels::create_channel_group_grid(
 	int row = 0, col = 0;
 	QGridLayout *const grid = new QGridLayout();
 
-	for (const shared_ptr<pv::view::Signal>& sig : sigs)
-	{
+	for (const shared_ptr<pv::view::Signal>& sig : sigs) {
 		assert(sig);
 
 		QCheckBox *const checkbox = new QCheckBox(sig->name());
@@ -221,9 +216,8 @@ void Channels::showEvent(QShowEvent *e)
 	updating_channels_ = true;
 
 	for (map<QCheckBox*, shared_ptr<Signal> >::const_iterator i =
-		check_box_signal_map_.begin();
-		i != check_box_signal_map_.end(); i++)
-	{
+			check_box_signal_map_.begin();
+			i != check_box_signal_map_.end(); i++) {
 		const shared_ptr<Signal> sig = (*i).second;
 		assert(sig);
 
diff --git a/pv/prop/int.cpp b/pv/prop/int.cpp
index 812b7516..e750e9fa 100644
--- a/pv/prop/int.cpp
+++ b/pv/prop/int.cpp
@@ -72,43 +72,28 @@ QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
 	const GVariantType *const type = g_variant_get_type(value);
 	assert(type);
 
-	if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE))
-	{
+	if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE)) {
 		int_val = g_variant_get_byte(value);
 		range_min = 0, range_max = UINT8_MAX;
-	}
-	else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16))
-	{
+	} else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16)) {
 		int_val = g_variant_get_int16(value);
 		range_min = INT16_MIN, range_max = INT16_MAX;
-	}
-	else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT16))
-	{
+	} else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT16)) {
 		int_val = g_variant_get_uint16(value);
 		range_min = 0, range_max = UINT16_MAX;
-	}
-	else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32))
-	{
+	} else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32)) {
 		int_val = g_variant_get_int32(value);
 		range_min = INT32_MIN, range_max = INT32_MAX;
-	}
-	else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32))
-	{
+	} else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32)) {
 		int_val = g_variant_get_uint32(value);
 		range_min = 0, range_max = UINT32_MAX;
-	}
-	else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64))
-	{
+	} else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64)) {
 		int_val = g_variant_get_int64(value);
 		range_min = INT64_MIN, range_max = INT64_MAX;
-	}
-	else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64))
-	{
+	} else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64)) {
 		int_val = g_variant_get_uint64(value);
 		range_min = 0, range_max = UINT64_MAX;
-	}
-	else
-	{
+	} else {
 		// Unexpected value type.
 		assert(0);
 	}
diff --git a/pv/session.cpp b/pv/session.cpp
index 0ac5bb72..7545da3c 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -253,8 +253,7 @@ bool Session::add_decoder(srd_decoder *const dec)
 	map<const srd_channel*, shared_ptr<view::LogicSignal> > channels;
 	shared_ptr<data::DecoderStack> decoder_stack;
 
-	try
-	{
+	try {
 		lock_guard<boost::shared_mutex> lock(signals_mutex_);
 
 		// Create the decoder
@@ -270,8 +269,7 @@ bool Session::add_decoder(srd_decoder *const dec)
 
 		// Auto select the initial channels
 		for (const srd_channel *pdch : all_channels)
-			for (shared_ptr<view::Signal> s : signals_)
-			{
+			for (shared_ptr<view::Signal> s : signals_) {
 				shared_ptr<view::LogicSignal> l =
 					dynamic_pointer_cast<view::LogicSignal>(s);
 				if (l && QString::fromUtf8(pdch->name).
@@ -290,9 +288,7 @@ bool Session::add_decoder(srd_decoder *const dec)
 			new view::DecodeTrace(*this, decoder_stack,
 				decode_traces_.size()));
 		decode_traces_.push_back(d);
-	}
-	catch(std::runtime_error e)
-	{
+	} catch (std::runtime_error e) {
 		return false;
 	}
 
@@ -313,8 +309,7 @@ vector< shared_ptr<view::DecodeTrace> > Session::get_decode_signals() const
 void Session::remove_decode_signal(view::DecodeTrace *signal)
 {
 	for (auto i = decode_traces_.begin(); i != decode_traces_.end(); i++)
-		if ((*i).get() == signal)
-		{
+		if ((*i).get() == signal) {
 			decode_traces_.erase(i);
 			signals_changed();
 			return;
@@ -454,7 +449,7 @@ void Session::sample_thread_proc(shared_ptr<devices::Device> device,
 
 	try {
 		device_->start();
-	} catch(Error e) {
+	} catch (Error e) {
 		error_handler(e.what());
 		return;
 	}
@@ -466,8 +461,7 @@ void Session::sample_thread_proc(shared_ptr<devices::Device> device,
 	set_capture_state(Stopped);
 
 	// Confirm that SR_DF_END was received
-	if (cur_logic_segment_)
-	{
+	if (cur_logic_segment_) {
 		qDebug("SR_DF_END was not received.");
 		assert(0);
 	}
@@ -535,16 +529,14 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 
 	const size_t sample_count = logic->data_length() / logic->unit_size();
 
-	if (!logic_data_)
-	{
+	if (!logic_data_) {
 		// The only reason logic_data_ would not have been created is
 		// if it was not possible to determine the signals when the
 		// device was created.
 		update_signals();
 	}
 
-	if (!cur_logic_segment_)
-	{
+	if (!cur_logic_segment_) {
 		// This could be the first packet after a trigger
 		set_capture_state(Running);
 
@@ -559,9 +551,7 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 		// frame_began is DecoderStack, but in future we need to signal
 		// this after both analog and logic sweeps have begun.
 		frame_began();
-	}
-	else
-	{
+	} else {
 		// Append to the existing data segment
 		cur_logic_segment_->append_payload(logic);
 	}
@@ -579,12 +569,10 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 	const float *data = static_cast<const float *>(analog->data_pointer());
 	bool sweep_beginning = false;
 
-	if (signals_.empty()) {
+	if (signals_.empty())
 		update_signals();
-	}
 
-	for (auto channel : channels)
-	{
+	for (auto channel : channels) {
 		shared_ptr<data::AnalogSegment> segment;
 
 		// Try to get the segment of the channel
@@ -592,8 +580,7 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 			iterator iter = cur_analog_segments_.find(channel);
 		if (iter != cur_analog_segments_.end())
 			segment = (*iter).second;
-		else
-		{
+		else {
 			// If no segment was found, this means we havn't
 			// created one yet. i.e. this is the first packet
 			// in the sweep containing this segment.
diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index bdb0f279..4642ed62 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -216,8 +216,7 @@ void StoreSession::store_proc(shared_ptr<data::LogicSegment> segment)
 
 	const unsigned int samples_per_block = BlockSize / unit_size;
 
-	while (!interrupt_ && sample_count_)
-	{
+	while (!interrupt_ && sample_count_) {
 		progress_updated();
 
 		const uint64_t packet_len =
diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 06d4f409..30cff789 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -278,7 +278,7 @@ void MainBar::update_sample_rate_selector()
 		(*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
 		try {
 			gvar_dict = sr_dev->config_list(ConfigKey::SAMPLERATE);
-		} catch(const sigrok::Error &e) {
+		} catch (const sigrok::Error &e) {
 			// Failed to enunmerate samplerate
 			(void)e;
 		}
@@ -291,8 +291,7 @@ void MainBar::update_sample_rate_selector()
 	}
 
 	if ((gvar_list = g_variant_lookup_value(gvar_dict.gobj(),
-			"samplerate-steps", G_VARIANT_TYPE("at"))))
-	{
+			"samplerate-steps", G_VARIANT_TYPE("at")))) {
 		elements = (const uint64_t *)g_variant_get_fixed_array(
 				gvar_list, &num_elements, sizeof(uint64_t));
 
@@ -309,18 +308,15 @@ void MainBar::update_sample_rate_selector()
 
 		if (step == 1)
 			sample_rate_.show_125_list(min, max);
-		else
-		{
+		else {
 			// When the step is not 1, we cam't make a 1-2-5-10
 			// list of sample rates, because we may not be able to
 			// make round numbers. Therefore in this case, show a
 			// spin box.
 			sample_rate_.show_min_max_step(min, max, step);
 		}
-	}
-	else if ((gvar_list = g_variant_lookup_value(gvar_dict.gobj(),
-			"samplerates", G_VARIANT_TYPE("at"))))
-	{
+	} else if ((gvar_list = g_variant_lookup_value(gvar_dict.gobj(),
+			"samplerates", G_VARIANT_TYPE("at")))) {
 		elements = (const uint64_t *)g_variant_get_fixed_array(
 				gvar_list, &num_elements, sizeof(uint64_t));
 		sample_rate_.show_list(elements, num_elements);
@@ -370,8 +366,7 @@ void MainBar::update_sample_count_selector()
 	assert(!updating_sample_count_);
 	updating_sample_count_ = true;
 
-	if (!sample_count_supported_)
-	{
+	if (!sample_count_supported_) {
 		sample_count_.show_none();
 		updating_sample_count_ = false;
 		return;
@@ -394,7 +389,7 @@ void MainBar::update_sample_count_selector()
 			if (gvar.gobj())
 				g_variant_get(gvar.gobj(), "(tt)",
 					&min_sample_count, &max_sample_count);
-		} catch(const sigrok::Error &e) {
+		} catch (const sigrok::Error &e) {
 			// Failed to query sample limit
 			(void)e;
 		}
@@ -455,8 +450,7 @@ void MainBar::update_device_config_widgets()
 	sample_count_supported_ = false;
 
 	try {
-		for (auto entry : sr_dev->config_keys(ConfigKey::DEVICE_OPTIONS))
-		{
+		for (auto entry : sr_dev->config_keys(ConfigKey::DEVICE_OPTIONS)) {
 			auto key = entry.first;
 			auto capabilities = entry.second;
 			switch (key->id()) {
@@ -465,8 +459,7 @@ void MainBar::update_device_config_widgets()
 					sample_count_supported_ = true;
 				break;
 			case SR_CONF_LIMIT_FRAMES:
-				if (capabilities.count(Capability::SET))
-				{
+				if (capabilities.count(Capability::SET)) {
 					sr_dev->config_set(ConfigKey::LIMIT_FRAMES,
 						Glib::Variant<guint64>::create(1));
 					on_config_changed();
@@ -500,8 +493,7 @@ void MainBar::commit_sample_count()
 	const shared_ptr<sigrok::Device> sr_dev = device->device();
 
 	sample_count = sample_count_.value();
-	if (sample_count_supported_)
-	{
+	if (sample_count_supported_) {
 		try {
 			sr_dev->config_set(ConfigKey::LIMIT_SAMPLES,
 				Glib::Variant<guint64>::create(sample_count));
@@ -586,9 +578,9 @@ void MainBar::on_config_changed()
 
 bool MainBar::eventFilter(QObject *watched, QEvent *event)
 {
-	if (sample_count_supported_ &&
-		(watched == &sample_count_ || watched == &sample_rate_) &&
-		(event->type() == QEvent::ToolTip)) {
+	if (sample_count_supported_ && (watched == &sample_count_ ||
+			watched == &sample_rate_) &&
+			(event->type() == QEvent::ToolTip)) {
 		auto sec = pv::util::Timestamp(sample_count_.value()) / sample_rate_.value();
 		QHelpEvent *help_event = static_cast<QHelpEvent*>(event);
 
diff --git a/pv/util.cpp b/pv/util.cpp
index 4a32147d..f7ee7727 100644
--- a/pv/util.cpp
+++ b/pv/util.cpp
@@ -87,19 +87,13 @@ static QTextStream& operator<<(QTextStream& stream, const Timestamp& t)
 	std::ostringstream ss;
 	ss << std::fixed;
 
-	if (stream.numberFlags() & QTextStream::ForceSign) {
+	if (stream.numberFlags() & QTextStream::ForceSign)
 		ss << std::showpos;
-	}
 
-	if (0 == precision) {
-		ss
-			<< std::setprecision(1)
-			<< round(t);
-	} else {
-		ss
-			<< std::setprecision(precision)
-			<< t;
-	}
+	if (0 == precision)
+		ss << std::setprecision(1) << round(t);
+	else
+		ss << std::setprecision(precision) << t;
 
 	std::string str(ss.str());
 	if (0 == precision) {
diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index 5ee90aa1..f9d3e53d 100644
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -61,7 +61,8 @@ shared_ptr<Cursor> CursorPair::second() const
 	return second_;
 }
 
-void CursorPair::set_time(const pv::util::Timestamp& time) {
+void CursorPair::set_time(const pv::util::Timestamp& time)
+{
 	const pv::util::Timestamp delta = second_->time() - first_->time();
 	first_->set_time(time);
 	second_->set_time(time + delta);
@@ -119,8 +120,7 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect, bool hover)
 	const int radius = delta_rect.height() / 2;
 	const QRectF text_rect(delta_rect.intersected(
 		rect).adjusted(radius, 0, -radius, 0));
-	if (text_rect.width() >= text_size_.width())
-	{
+	if (text_rect.width() >= text_size_.width()) {
 		const int highlight_radius = delta_rect.height() / 2 - 2;
 
 		if (selected()) {
@@ -144,7 +144,8 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect, bool hover)
 	}
 }
 
-void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) {
+void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp)
+{
 	if (!enabled())
 		return;
 
diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 020ce770..52e1c720 100644
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -182,8 +182,7 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 
 	assert(decoder_stack_);
 	const QString err = decoder_stack_->error_message();
-	if (!err.isEmpty())
-	{
+	if (!err.isEmpty()) {
 		draw_unresolved_period(
 			p, annotation_height, pp.left(), pp.right());
 		draw_error(p, err, pp);
@@ -199,8 +198,7 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 	const vector<Row> rows(decoder_stack_->get_visible_rows());
 
 	visible_rows_.clear();
-	for (size_t i = 0; i < rows.size(); i++)
-	{
+	for (size_t i = 0; i < rows.size(); i++) {
 		const Row &row = rows[i];
 
 		size_t base_colour = 0x13579BDF;
@@ -232,15 +230,13 @@ void DecodeTrace::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
 
 	assert(row_height_);
 
-	for (size_t i = 0; i < visible_rows_.size(); i++)
-	{
+	for (size_t i = 0; i < visible_rows_.size(); i++) {
 		const int y = i * row_height_ + get_visual_y();
 
 		p.setPen(QPen(Qt::NoPen));
 		p.setBrush(QApplication::palette().brush(QPalette::WindowText));
 
-		if (i != 0)
-		{
+		if (i != 0) {
 			const QPointF points[] = {
 				QPointF(pp.left(), y - ArrowSize),
 				QPointF(pp.left() + ArrowSize, y),
@@ -286,15 +282,12 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 
 	const list< shared_ptr<Decoder> >& stack = decoder_stack_->stack();
 
-	if (stack.empty())
-	{
+	if (stack.empty()) {
 		QLabel *const l = new QLabel(
 			tr("<p><i>No decoders in the stack</i></p>"));
 		l->setAlignment(Qt::AlignCenter);
 		form->addRow(l);
-	}
-	else
-	{
+	} else {
 		auto iter = stack.cbegin();
 		for (int i = 0; i < (int)stack.size(); i++, iter++) {
 			shared_ptr<Decoder> dec(*iter);
@@ -389,8 +382,7 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,
 	p.setBrush(fill);
 
 	// If the two ends are within 1 pixel, draw a vertical line
-	if (start + 1.0 > end)
-	{
+	if (start + 1.0 > end) {
 		p.drawLine(QPointF(start, top), QPointF(start, bottom));
 		return;
 	}
@@ -729,8 +721,7 @@ QComboBox* DecodeTrace::create_channel_selector(
 
 	for (const shared_ptr<view::Signal> &s : sig_list) {
 		assert(s);
-		if (dynamic_pointer_cast<LogicSignal>(s) && s->enabled())
-		{
+		if (dynamic_pointer_cast<LogicSignal>(s) && s->enabled()) {
 			selector->addItem(s->name(),
 				qVariantFromValue((void*)s.get()));
 
@@ -752,8 +743,7 @@ void DecodeTrace::commit_decoder_channels(shared_ptr<data::decode::Decoder> &dec
 
 	const unordered_set< shared_ptr<Signal> > sigs(session_.signals());
 
-	for (const ChannelSelector &s : channel_selectors_)
-	{
+	for (const ChannelSelector &s : channel_selectors_) {
 		if (s.decoder_ != dec)
 			break;
 
diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 7c2dd9b0..1977d053 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -115,8 +115,7 @@ void Header::paintEvent(QPaintEvent*)
 	QPainter painter(this);
 	painter.setRenderHint(QPainter::Antialiasing);
 
-	for (const shared_ptr<RowItem> r : items)
-	{
+	for (const shared_ptr<RowItem> r : items) {
 		assert(r);
 
 		const bool highlight = !item_dragging_ &&
diff --git a/pv/view/marginwidget.cpp b/pv/view/marginwidget.cpp
index 2d663cdc..0d657611 100644
--- a/pv/view/marginwidget.cpp
+++ b/pv/view/marginwidget.cpp
@@ -66,8 +66,7 @@ void MarginWidget::keyPressEvent(QKeyEvent *e)
 {
 	assert(e);
 
-	if (e->key() == Qt::Key_Delete)
-	{
+	if (e->key() == Qt::Key_Delete) {
 		const auto items = this->items();
 		for (auto &i : items)
 			if (i->selected())
diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 601e73b1..31ec121d 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -128,8 +128,7 @@ shared_ptr<ViewItem> Ruler::get_mouse_over_item(const QPoint &pt)
 void Ruler::paintEvent(QPaintEvent*)
 {
 	if (!tick_position_cache_) {
-		auto ffunc = [this](const pv::util::Timestamp& t)
-		{
+		auto ffunc = [this](const pv::util::Timestamp& t) {
 			return format_time_with_distance(
 				this->view_.tick_period(),
 				t,
diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 6a342915..c6a6afd3 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -408,8 +408,7 @@ pair<Timestamp, Timestamp> View::get_time_extents() const
 {
 	boost::optional<Timestamp> left_time, right_time;
 	const set< shared_ptr<SignalData> > visible_data = get_visible_data();
-	for (const shared_ptr<SignalData> d : visible_data)
-	{
+	for (const shared_ptr<SignalData> d : visible_data) {
 		const vector< shared_ptr<Segment> > segments =
 			d->segments();
 		for (const shared_ptr<Segment> &s : segments) {
@@ -727,8 +726,7 @@ vector< shared_ptr<Trace> > View::extract_new_traces_for_channels(
 {
 	vector< shared_ptr<Trace> > filtered_traces;
 
-	for (const auto &channel : channels)
-	{
+	for (const auto &channel : channels) {
 		const auto map_iter = signal_map.find(channel);
 		if (map_iter == signal_map.end())
 			continue;
@@ -793,7 +791,7 @@ bool View::eventFilter(QObject *object, QEvent *event)
 
 bool View::viewportEvent(QEvent *e)
 {
-	switch(e->type()) {
+	switch (e->type()) {
 	case QEvent::Paint:
 	case QEvent::MouseButtonPress:
 	case QEvent::MouseButtonRelease:
@@ -804,7 +802,6 @@ bool View::viewportEvent(QEvent *e)
 	case QEvent::TouchUpdate:
 	case QEvent::TouchEnd:
 		return false;
-
 	default:
 		return QAbstractScrollArea::viewportEvent(e);
 	}
@@ -920,8 +917,7 @@ void View::signals_changed()
 		signal_map[sig->channel()] = sig;
 
 	// Populate channel groups
-	for (auto entry : sr_dev->channel_groups())
-	{
+	for (auto entry : sr_dev->channel_groups()) {
 		const shared_ptr<sigrok::ChannelGroup> &group = entry.second;
 
 		if (group->channels().size() <= 1)
diff --git a/pv/view/viewitempaintparams.cpp b/pv/view/viewitempaintparams.cpp
index db44f48f..998045c8 100644
--- a/pv/view/viewitempaintparams.cpp
+++ b/pv/view/viewitempaintparams.cpp
@@ -32,7 +32,8 @@ ViewItemPaintParams::ViewItemPaintParams(
 	const QRect &rect, double scale, const pv::util::Timestamp& offset) :
 	rect_(rect),
 	scale_(scale),
-	offset_(offset) {
+	offset_(offset)
+{
 	assert(scale > 0.0);
 }
 
@@ -41,7 +42,8 @@ QFont ViewItemPaintParams::font()
 	return QApplication::font();
 }
 
-int ViewItemPaintParams::text_height() {
+int ViewItemPaintParams::text_height()
+{
 	return QFontMetrics(font()).height();
 }
 
diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 3811c1e8..5cb65079 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -203,8 +203,7 @@ void Viewport::wheelEvent(QWheelEvent *e)
 {
 	assert(e);
 
-	if (e->orientation() == Qt::Vertical)
-	{
+	if (e->orientation() == Qt::Vertical) {
 		if (e->modifiers() & Qt::ControlModifier) {
 			// Vertical scrolling with the control key pressed
 			// is intrepretted as vertical scrolling
@@ -214,9 +213,7 @@ void Viewport::wheelEvent(QWheelEvent *e)
 			// Vertical scrolling is interpreted as zooming in/out
 			view_.zoom(e->delta() / 120, e->x());
 		}
-	}
-	else if (e->orientation() == Qt::Horizontal)
-	{
+	} else if (e->orientation() == Qt::Horizontal) {
 		// Horizontal scrolling is interpreted as moving left/right
 		view_.set_scale_offset(view_.scale(),
 			e->delta() * view_.scale() + view_.offset());
diff --git a/pv/view/viewwidget.cpp b/pv/view/viewwidget.cpp
index a834f9c0..30d96eb3 100644
--- a/pv/view/viewwidget.cpp
+++ b/pv/view/viewwidget.cpp
@@ -73,8 +73,7 @@ bool ViewWidget::accept_drag() const
 	const bool any_time_items_selected = any_of(items.begin(), items.end(),
 		[](const shared_ptr<TimeItem> &i) { return i->selected(); });
 
-	if (any_row_items_selected && !any_time_items_selected)
-	{
+	if (any_row_items_selected && !any_time_items_selected) {
 		// Check all the drag items share a common owner
 		TraceTreeItemOwner *item_owner = nullptr;
 		for (shared_ptr<TraceTreeItem> r : trace_tree_items)
@@ -86,9 +85,7 @@ bool ViewWidget::accept_drag() const
 			}
 
 		return true;
-	}
-	else if (any_time_items_selected && !any_row_items_selected)
-	{
+	} else if (any_time_items_selected && !any_row_items_selected) {
 		return true;
 	}
 
@@ -212,8 +209,7 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event)
 
 	if (item_dragging_)
 		view_.restack_all_trace_tree_items();
-	else
-	{
+	else {
 		if (!ctrl_pressed) {
 			for (shared_ptr<ViewItem> i : items)
 				if (mouse_down_item_ != i)
@@ -278,10 +274,8 @@ void ViewWidget::mouseMoveEvent(QMouseEvent *e)
 
 	if (!e->buttons())
 		item_hover(get_mouse_over_item(e->pos()));
-	else if (e->buttons() & Qt::LeftButton)
-	{
-		if (!item_dragging_)
-		{
+	else if (e->buttons() & Qt::LeftButton) {
+		if (!item_dragging_) {
 			if ((e->pos() - mouse_down_point_).manhattanLength() <
 				QApplication::startDragDistance())
 				return;
diff --git a/pv/widgets/colourbutton.cpp b/pv/widgets/colourbutton.cpp
index 1f503462..13b96738 100644
--- a/pv/widgets/colourbutton.cpp
+++ b/pv/widgets/colourbutton.cpp
@@ -58,9 +58,7 @@ void ColourButton::set_colour(QColor colour)
 
 	for (unsigned int r = 0; r < rows; r++)
 		for (unsigned int c = 0; c < cols; c++)
-			if (popup_.well_array().cellBrush(r, c).color() ==
-				colour)
-			{
+			if (popup_.well_array().cellBrush(r, c).color() == colour) {
 				popup_.well_array().setSelected(r, c);
 				popup_.well_array().setCurrent(r, c);
 				return;
diff --git a/pv/widgets/decodermenu.cpp b/pv/widgets/decodermenu.cpp
index 3ea1c841..7da77bd3 100644
--- a/pv/widgets/decodermenu.cpp
+++ b/pv/widgets/decodermenu.cpp
@@ -33,8 +33,7 @@ DecoderMenu::DecoderMenu(QWidget *parent, bool first_level_decoder) :
 {
 	GSList *l = g_slist_sort(g_slist_copy(
 		(GSList*)srd_decoder_list()), decoder_name_cmp);
-	for (; l; l = l->next)
-	{
+	for (; l; l = l->next) {
 		const srd_decoder *const d = (srd_decoder*)l->data;
 		assert(d);
 
diff --git a/pv/widgets/popup.cpp b/pv/widgets/popup.cpp
index de2d1b57..17bc7191 100644
--- a/pv/widgets/popup.cpp
+++ b/pv/widgets/popup.cpp
@@ -65,7 +65,6 @@ void Popup::set_position(const QPoint point, Position pos)
 		MarginWidth + ((pos == Bottom) ? ArrowLength : 0),
 		MarginWidth + ((pos == Left) ? ArrowLength : 0),
 		MarginWidth + ((pos == Top) ? ArrowLength : 0));
-
 }
 
 bool Popup::eventFilter(QObject *obj, QEvent *evt)
@@ -145,8 +144,7 @@ QPolygon Popup::arrow_polygon() const
 	const QPoint p = mapFromGlobal(point_);
 	const int l = ArrowLength + ArrowOverlap; 
 
-	switch (pos_)
-	{
+	switch (pos_) {
 	case Right:
 		poly << QPoint(p.x() + l, p.y() - l);
 		break;
@@ -163,8 +161,7 @@ QPolygon Popup::arrow_polygon() const
 
 	poly << p;
 
-	switch (pos_)
-	{
+	switch (pos_) {
 	case Right:
 	case Bottom:
 		poly << QPoint(p.x() + l, p.y() + l);
diff --git a/pv/widgets/sweeptimingwidget.cpp b/pv/widgets/sweeptimingwidget.cpp
index b2c0e637..ec404c36 100644
--- a/pv/widgets/sweeptimingwidget.cpp
+++ b/pv/widgets/sweeptimingwidget.cpp
@@ -88,8 +88,7 @@ void SweepTimingWidget::show_list(const uint64_t *vals, size_t count)
 	value_type_ = List;
 
 	list_.clear();
-	for (size_t i = 0; i < count; i++)
-	{
+	for (size_t i = 0; i < count; i++) {
 		char *const s = sr_si_string_u64(vals[i], suffix_);
 		list_.addItem(QString::fromUtf8(s),
 			qVariantFromValue(vals[i]));
@@ -142,8 +141,7 @@ void SweepTimingWidget::show_125_list(uint64_t min, uint64_t max)
 
 uint64_t SweepTimingWidget::value() const
 {
-	switch(value_type_)
-	{
+	switch(value_type_) {
 	case None:
 		return 0;
 
diff --git a/pv/widgets/timestampspinbox.cpp b/pv/widgets/timestampspinbox.cpp
index 233ff648..463a8462 100644
--- a/pv/widgets/timestampspinbox.cpp
+++ b/pv/widgets/timestampspinbox.cpp
@@ -104,8 +104,7 @@ void TimestampSpinBox::on_editingFinished()
 		captures.removeFirst(); // remove entire match
 		QString str = captures.join("");
 		setValue(pv::util::Timestamp(str.toStdString()));
-	}
-	else {
+	} else {
 		// replace the malformed entered string with the old value
 		updateEdit();
 	}
-- 
2.30.2