X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=49784bd7ae40630f3f5b3ccc4e125a9f228053e4;hb=b8f1cdeba7cf6c2b749ff60102ce4e260fa1309e;hp=0251a9d17a0d6604a666afc02c40b4f80c58c5be;hpb=83b1c8d251386ac1980284c4668cbdd8e425550f;p=pulseview.git

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index 0251a9d..49784bd 100644
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -19,12 +19,6 @@
 
 #include <map>
 
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-
 #include <QCheckBox>
 #include <QFormLayout>
 #include <QGridLayout>
@@ -168,13 +162,11 @@ void Channels::populate_group(shared_ptr<ChannelGroup> group,
 			QString("<h3>%1</h3>").arg(group->name().c_str())));
 
 	// Create the channel group grid
-	QGridLayout *const channel_grid =
-		create_channel_group_grid(sigs);
+	QGridLayout *const channel_grid = create_channel_group_grid(sigs);
 	layout_.addRow(channel_grid);
 
 	// Create the channel group options
-	if (binding)
-	{
+	if (binding) {
 		binding->add_properties_to_form(&layout_, true);
 		group_bindings_.push_back(binding);
 	}
@@ -252,5 +244,5 @@ void Channels::disable_all_channels()
 	set_all_channels(false);
 }
 
-} // popups
-} // pv
+}  // namespace popups
+}  // namespace pv