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 8895a5e7341242099557ba96782fc2cdd6532fc4..22df24cfe4278ce1c271accfbf80db97bda09f6a 100644
(file)
--- a/
pv/mainwindow.h
+++ b/
pv/mainwindow.h
@@
-22,19
+22,24
@@
#define PULSEVIEW_PV_MAINWINDOW_H
#include <list>
#define PULSEVIEW_PV_MAINWINDOW_H
#include <list>
-
-#include <boost/weak_ptr.hpp>
+#include <memory>
#include <QMainWindow>
#include "sigsession.h"
#include <QMainWindow>
#include "sigsession.h"
+struct srd_decoder;
+
class QVBoxLayout;
namespace pv {
class DeviceManager;
class QVBoxLayout;
namespace pv {
class DeviceManager;
+namespace device {
+class DevInst;
+}
+
namespace toolbars {
class ContextBar;
class SamplingBar;
namespace toolbars {
class ContextBar;
class SamplingBar;
@@
-63,15
+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(
- struct sr_dev_inst *selected_device = NULL);
-
- static gint decoder_name_cmp(gconstpointer a, gconstpointer b);
+ void update_device_list();
private slots:
void load_file(QString file_name);
private slots:
void load_file(QString file_name);
@@
-81,6
+80,7
@@
private slots:
const QString text, const QString info_text);
void on_actionOpen_triggered();
const QString text, const QString info_text);
void on_actionOpen_triggered();
+ void on_actionSaveAs_triggered();
void on_actionQuit_triggered();
void on_actionConnect_triggered();
void on_actionQuit_triggered();
void on_actionConnect_triggered();
@@
-91,6
+91,8
@@
private slots:
void on_actionViewZoomFit_triggered();
void on_actionViewZoomFit_triggered();
+ void on_actionViewZoomOneToOne_triggered();
+
void on_actionViewShowCursors_triggered();
void on_actionAbout_triggered();
void on_actionViewShowCursors_triggered();
void on_actionAbout_triggered();