Replaced NULL with nullptr

[pulseview.git] / pv / mainwindow.hpp

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index d2bcd918361ce6fc4e053f3f7d6196d37412154f..a6b2c89831ab60ab6796297918bce86eb3277430 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -22,8 +22,11 @@
 #define PULSEVIEW_PV_MAINWINDOW_HPP
 
 #include <list>
+#include <map>
 #include <memory>
 
+#include <glibmm/variant.h>
+
 #include <QMainWindow>
 
 #include "session.hpp"
@@ -33,7 +36,7 @@ struct srd_decoder;
 class QVBoxLayout;
 
 namespace sigrok {
-class Device;
+class InputFormat;
 class OutputFormat;
 }
 
@@ -53,7 +56,7 @@ class View;
 namespace widgets {
 #ifdef ENABLE_DECODE
 class DecoderMenu;
-#endif /* ENABLE_DECODE */
+#endif
 }
 
 class MainWindow : public QMainWindow
@@ -75,7 +78,7 @@ private:
 
 public:
        explicit MainWindow(DeviceManager &device_manager,
-               const char *open_file_name = NULL,
+               const char *open_file_name = nullptr,
                QWidget *parent = 0);
 
        QAction* action_open() const;
@@ -91,14 +94,15 @@ 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);
+       void import_file(std::shared_ptr<sigrok::InputFormat> format);
 
 private:
        void setup_ui();
@@ -120,7 +124,10 @@ private:
        void keyReleaseEvent(QKeyEvent *event);
 
 private Q_SLOTS:
-       void load_file(QString file_name);
+       void load_file(QString file_name,
+               std::shared_ptr<sigrok::InputFormat> format = nullptr,
+               const std::map<std::string, Glib::VariantBase> &options =
+                       std::map<std::string, Glib::VariantBase>());
 
        void show_session_error(
                const QString text, const QString info_text);
@@ -173,7 +180,7 @@ private:
 
 #ifdef ENABLE_DECODE
        QMenu *const menu_decoders_add_;
-#endif /* ENABLE_DECODE */
+#endif
 };
 
 } // namespace pv