projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a tooltip for the "Delete decoder trace" icon.
[pulseview.git]
/
pv
/
popups
/
channels.cpp
diff --git
a/pv/popups/channels.cpp
b/pv/popups/channels.cpp
index 89080c4fc45426fd5ccaf6b8d2abe8467be9ddad..49784bd7ae40630f3f5b3ccc4e125a9f228053e4 100644
(file)
--- a/
pv/popups/channels.cpp
+++ b/
pv/popups/channels.cpp
@@
-19,14
+19,6
@@
#include <map>
#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>
-
#include <QCheckBox>
#include <QFormLayout>
#include <QGridLayout>
#include <QCheckBox>
#include <QFormLayout>
#include <QGridLayout>
@@
-44,13
+36,9
@@
using namespace Qt;
using namespace Qt;
-using boost::shared_lock;
-using boost::shared_mutex;
-using std::lock_guard;
using std::map;
using std::map;
-using std::mutex;
-using std::set;
using std::shared_ptr;
using std::shared_ptr;
+using std::make_shared;
using std::unordered_set;
using std::vector;
using std::unordered_set;
using std::vector;
@@
-165,7
+153,7
@@
void Channels::populate_group(shared_ptr<ChannelGroup> group,
// popup.
shared_ptr<Device> binding;
if (group)
// popup.
shared_ptr<Device> binding;
if (group)
- binding =
shared_ptr<Device>(new Device(group)
);
+ binding =
make_shared<Device>(group
);
// Create a title if the group is going to have any content
if ((!sigs.empty() || (binding && !binding->properties().empty())) &&
// Create a title if the group is going to have any content
if ((!sigs.empty() || (binding && !binding->properties().empty())) &&
@@
-174,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
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
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);
}
binding->add_properties_to_form(&layout_, true);
group_bindings_.push_back(binding);
}
@@
-258,5
+244,5
@@
void Channels::disable_all_channels()
set_all_channels(false);
}
set_all_channels(false);
}
-}
//
popups
-}
//
pv
+}
// namespace
popups
+}
// namespace
pv