MainWindow: Use regular pointer for QDockWidgets

[pulseview.git] / pv / mainwindow.hpp

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 3cd269f4ff50c162e6868cddd6741a1f9fb91115..2448a3570d45b9f10187a480d6ef7a85dcf5a83d 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -26,9 +26,10 @@
 #include <memory>
 
 #include <QMainWindow>
+#include <QTabWidget>
 
 #include "session.hpp"
-#include "view/viewwidget.hpp"
+#include "views/viewbase.hpp"
 
 struct srd_decoder;
 
@@ -72,10 +73,10 @@ public:
        QAction* action_view_coloured_bg() const;
        QAction* action_about() const;
 
-       std::shared_ptr<pv::view::View> get_active_view() const;
+       std::shared_ptr<views::ViewBase> get_active_view() const;
 
-       std::shared_ptr<pv::view::View> add_view(const QString &title,
-               view::ViewType type, Session &session);
+       std::shared_ptr<views::ViewBase> add_view(const QString &title,
+               views::ViewType type, Session &session);
 
        std::shared_ptr<Session> add_session();
 
@@ -96,7 +97,7 @@ private:
        virtual bool restoreState(const QByteArray &state, int version = 0);
 
 private Q_SLOTS:
-       void on_add_view(const QString &title, view::ViewType type,
+       void on_add_view(const QString &title, views::ViewType type,
                Session *session);
 
        void on_focus_changed();
@@ -117,8 +118,11 @@ private:
 
        std::list< std::shared_ptr<Session> > sessions_;
 
-       std::map< std::shared_ptr<QDockWidget>,
-               std::shared_ptr<pv::view::View> > view_docks_;
+       std::map< QDockWidget*, std::shared_ptr<views::ViewBase> > view_docks_;
+
+       std::map< std::shared_ptr<Session>, QMainWindow*> session_windows_;
+
+       QTabWidget session_selector_;
 
        QAction *const action_view_sticky_scrolling_;
        QAction *const action_view_coloured_bg_;