MainWindow: Moved static constants to top of class definitions

[pulseview.git] / pv / mainwindow.hpp

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 333eda2a0a75dfbc02f9c534444d389d42498efa..bf491156f7552781c4f3456228a478c5fa78f334 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -26,19 +26,23 @@
 
 #include <QMainWindow>
 
-#include "sigsession.hpp"
+#include "session.hpp"
 
 struct srd_decoder;
 
 class QVBoxLayout;
 
+namespace sigrok {
+class Device;
+}
+
 namespace pv {
 
 class DeviceManager;
 
 namespace toolbars {
 class ContextBar;
-class SamplingBar;
+class MainBar;
 }
 
 namespace view {
@@ -53,11 +57,28 @@ class MainWindow : public QMainWindow
 {
        Q_OBJECT
 
+private:
+       /**
+        * Name of the setting used to remember the directory
+        * containing the last file that was opened.
+        */
+       static const char *SettingOpenDirectory;
+
+       /**
+        * Name of the setting used to remember the directory
+        * containing the last file that was saved.
+        */
+       static const char *SettingSaveDirectory;
+
 public:
        explicit MainWindow(DeviceManager &device_manager,
                const char *open_file_name = NULL,
                QWidget *parent = 0);
 
+       void run_stop();
+
+       void select_device(std::shared_ptr<sigrok::Device> device);
+
 private:
        void setup_ui();
 
@@ -100,34 +121,20 @@ private Q_SLOTS:
 
        void add_decoder(srd_decoder *decoder);
 
-       void run_stop();
-
        void capture_state_changed(int state);
        void device_selected();
 
 private:
-       /**
-        * Name of the setting used to remember the directory
-        * containing the last file that was opened.
-        */
-       static const char *SettingOpenDirectory;
-
-       /**
-        * Name of the setting used to remember the directory
-        * containing the last file that was saved.
-        */
-       static const char *SettingSaveDirectory;
-
        DeviceManager &device_manager_;
 
-       SigSession session_;
+       Session session_;
 
        pv::view::View *view_;
 
        QWidget *central_widget_;
        QVBoxLayout *vertical_layout_;
 
-       toolbars::SamplingBar *sampling_bar_;
+       toolbars::MainBar *main_bar_;
 };
 
 } // namespace pv