devices::Device: Moved in full_name and display_name

[pulseview.git] / pv / mainwindow.hpp

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index d2bcd918361ce6fc4e053f3f7d6196d37412154f..1779712f4c93aa9edc5b2182930454021f5099a1 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -33,7 +33,6 @@ struct srd_decoder;
 class QVBoxLayout;
 
 namespace sigrok {
-class Device;
 class OutputFormat;
 }
 
@@ -53,7 +52,7 @@ class View;
 namespace widgets {
 #ifdef ENABLE_DECODE
 class DecoderMenu;
-#endif /* ENABLE_DECODE */
+#endif
 }
 
 class MainWindow : public QMainWindow
@@ -91,11 +90,11 @@ public:
 
 #ifdef ENABLE_DECODE
        QMenu* menu_decoder_add() const;
-#endif /* ENABLE_DECODE */
+#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);
@@ -173,7 +172,7 @@ private:
 
 #ifdef ENABLE_DECODE
        QMenu *const menu_decoders_add_;
-#endif /* ENABLE_DECODE */
+#endif
 };
 
 } // namespace pv