X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=1a042da8283c847abfec1efaab4c5441781cfab9;hp=ea5f5fbed8d10c91c61dc1d39cca1826030ab81b;hb=2ad82c2e40b6865481733913a2c32735602f63c4;hpb=bf9146988d2298e1750142dccdcf597ef13d6606

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index ea5f5fb..1a042da 100644
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -20,6 +20,11 @@
 
 #include <map>
 
+#ifdef _WIN32
+// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
+#define NOGDI
+#define NORESOURCE
+#endif
 #include <boost/thread/locks.hpp>
 #include <boost/thread/shared_mutex.hpp>
 
@@ -81,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())
@@ -103,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())
@@ -139,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);
 
@@ -189,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());
@@ -216,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);