projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use device::Devices to represent sigrok Devices
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index f975ca516b5dbc0c84dbccd1e2c967e256ac3467..1779712f4c93aa9edc5b2182930454021f5099a1 100644
(file)
--- a/
pv/mainwindow.hpp
+++ b/
pv/mainwindow.hpp
@@
-33,7
+33,6
@@
struct srd_decoder;
class QVBoxLayout;
namespace sigrok {
class QVBoxLayout;
namespace sigrok {
-class Device;
class OutputFormat;
}
class OutputFormat;
}
@@
-51,7
+50,9
@@
class View;
}
namespace widgets {
}
namespace widgets {
+#ifdef ENABLE_DECODE
class DecoderMenu;
class DecoderMenu;
+#endif
}
class MainWindow : public QMainWindow
}
class MainWindow : public QMainWindow
@@
-87,11
+88,13
@@
public:
QAction* action_view_show_cursors() const;
QAction* action_about() const;
QAction* action_view_show_cursors() const;
QAction* action_about() const;
+#ifdef ENABLE_DECODE
QMenu* menu_decoder_add() const;
QMenu* menu_decoder_add() const;
+#endif
void run_stop();
void run_stop();
- void select_device(std::shared_ptr<
sigrok
::Device> device);
+ void select_device(std::shared_ptr<
devices
::Device> device);
public Q_SLOTS:
void export_file(std::shared_ptr<sigrok::OutputFormat> format);
public Q_SLOTS:
void export_file(std::shared_ptr<sigrok::OutputFormat> format);
@@
-167,7
+170,9
@@
private:
QAction *const action_view_show_cursors_;
QAction *const action_about_;
QAction *const action_view_show_cursors_;
QAction *const action_about_;
+#ifdef ENABLE_DECODE
QMenu *const menu_decoders_add_;
QMenu *const menu_decoders_add_;
+#endif
};
} // namespace pv
};
} // namespace pv