* 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 <http://www.gnu.org/licenses/>.
*/
#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>
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;
map<shared_ptr<Channel>, shared_ptr<SignalBase> > signal_map;
unordered_set< shared_ptr<SignalBase> > sigs;
- for (const shared_ptr<view::Signal> s : session_.signals())
- sigs.insert(s->base());
+ for (const shared_ptr<data::SignalBase> b : session_.signalbases())
+ sigs.insert(b);
for (const shared_ptr<SignalBase> &sig : sigs)
signal_map[sig->channel()] = sig;
// 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())) &&
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);
}
set_all_channels(false);
}
-} // popups
-} // pv
+} // namespace popups
+} // namespace pv