Use device::Devices to represent sigrok Devices

[pulseview.git] / pv / mainwindow.hpp

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 2e6e55c1d1dee53bbb12c796bbd3d6c28a1e7046..1779712f4c93aa9edc5b2182930454021f5099a1 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_MAINWINDOW_H
-#define PULSEVIEW_PV_MAINWINDOW_H
+#ifndef PULSEVIEW_PV_MAINWINDOW_HPP
+#define PULSEVIEW_PV_MAINWINDOW_HPP
 
 #include <list>
 #include <memory>
@@ -33,7 +33,7 @@ struct srd_decoder;
 class QVBoxLayout;
 
 namespace sigrok {
-class Device;
+class OutputFormat;
 }
 
 namespace pv {
@@ -50,7 +50,9 @@ class View;
 }
 
 namespace widgets {
+#ifdef ENABLE_DECODE
 class DecoderMenu;
+#endif
 }
 
 class MainWindow : public QMainWindow
@@ -86,11 +88,16 @@ public:
        QAction* action_view_show_cursors() const;
        QAction* action_about() const;
 
+#ifdef ENABLE_DECODE
        QMenu* menu_decoder_add() const;
+#endif
 
        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);
 
 private:
        void setup_ui();
@@ -104,10 +111,13 @@ private:
        /**
         * Updates the device list in the toolbar
         */
-       void update_device_list();
+       void update_device_list();      
 
+private:
        void closeEvent(QCloseEvent *event);
 
+       void keyReleaseEvent(QKeyEvent *event);
+
 private Q_SLOTS:
        void load_file(QString file_name);
 
@@ -160,9 +170,11 @@ private:
        QAction *const action_view_show_cursors_;
        QAction *const action_about_;
 
+#ifdef ENABLE_DECODE
        QMenu *const menu_decoders_add_;
+#endif
 };
 
 } // namespace pv
 
-#endif // PULSEVIEW_PV_MAINWINDOW_H
+#endif // PULSEVIEW_PV_MAINWINDOW_HPP