X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=ca142d68582a433eb0626661a459e8000653a5c6;hp=7489b93f81b832d0f8bb64586155c75b7502556c;hb=2601ce965fc455d23f5a964b84ddd74eb93705c4;hpb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287 diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp index 7489b93f..ca142d68 100644 --- a/pv/popups/channels.cpp +++ b/pv/popups/channels.cpp @@ -14,20 +14,11 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * along with this program; if not, see . */ #include -#ifdef _WIN32 -// Windows: Avoid boost/thread namespace pollution (which includes windows.h). -#define NOGDI -#define NORESOURCE -#endif -#include -#include - #include #include #include @@ -39,19 +30,15 @@ #include #include #include -#include +#include #include using namespace Qt; -using boost::shared_lock; -using boost::shared_mutex; -using std::lock_guard; using std::map; -using std::mutex; -using std::set; using std::shared_ptr; +using std::make_shared; using std::unordered_set; using std::vector; @@ -82,8 +69,8 @@ Channels::Channels(Session &session, QWidget *parent) : map, shared_ptr > signal_map; unordered_set< shared_ptr > sigs; - for (const shared_ptr s : session_.signals()) - sigs.insert(s->channel()); + for (const shared_ptr b : session_.signalbases()) + sigs.insert(b); for (const shared_ptr &sig : sigs) signal_map[sig->channel()] = sig; @@ -166,7 +153,7 @@ void Channels::populate_group(shared_ptr group, // popup. shared_ptr binding; if (group) - binding = shared_ptr(new Device(group)); + binding = make_shared(group); // Create a title if the group is going to have any content if ((!sigs.empty() || (binding && !binding->properties().empty())) && @@ -175,13 +162,11 @@ void Channels::populate_group(shared_ptr group, QString("

%1

").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); } @@ -259,5 +244,5 @@ void Channels::disable_all_channels() set_all_channels(false); } -} // popups -} // pv +} // namespace popups +} // namespace pv