projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced boost::function with std::function
[pulseview.git]
/
pv
/
mainwindow.h
diff --git
a/pv/mainwindow.h
b/pv/mainwindow.h
index 6f3c8d56344d601d90628578ac1da419ac3f7e71..22df24cfe4278ce1c271accfbf80db97bda09f6a 100644
(file)
--- a/
pv/mainwindow.h
+++ b/
pv/mainwindow.h
@@
-22,8
+22,7
@@
#define PULSEVIEW_PV_MAINWINDOW_H
#include <list>
#define PULSEVIEW_PV_MAINWINDOW_H
#include <list>
-
-#include <boost/weak_ptr.hpp>
+#include <memory>
#include <QMainWindow>
#include <QMainWindow>
@@
-36,7
+35,10
@@
class QVBoxLayout;
namespace pv {
class DeviceManager;
namespace pv {
class DeviceManager;
+
+namespace device {
class DevInst;
class DevInst;
+}
namespace toolbars {
class ContextBar;
namespace toolbars {
class ContextBar;
@@
-66,14
+68,9
@@
private:
void session_error(const QString text, const QString info_text);
/**
void session_error(const QString text, const QString info_text);
/**
- * Updates the device list in the sampling bar, and updates the
- * selection.
- * @param selected_device The device to select, or NULL if the
- * first device in the device list should be selected.
+ * Updates the device list in the sampling bar
*/
*/
- void update_device_list(
- boost::shared_ptr<pv::DevInst> selected_device =
- boost::shared_ptr<pv::DevInst>());
+ void update_device_list();
private slots:
void load_file(QString file_name);
private slots:
void load_file(QString file_name);