X-Git-Url: http://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.hpp;fp=pv%2Fmainwindow.hpp;h=c9a8ad2641270d6d0df83f199b88d91939a2c675;hp=522ab1c0478ea7d1def85a90ada942733735f182;hb=2c5b0f467f467836f2862f5218bbb0f9e8800d30;hpb=f9a0fd83226d97af7458d8c9dac0b88c83a54d29 diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp index 522ab1c0..c9a8ad26 100644 --- a/pv/mainwindow.hpp +++ b/pv/mainwindow.hpp @@ -31,7 +31,6 @@ #include "session.hpp" #include "subwindows/subwindowbase.hpp" -#include "views/viewbase.hpp" using std::list; using std::map; @@ -53,6 +52,7 @@ class MainBar; namespace view { class View; +class ViewBase; } namespace widgets { @@ -61,6 +61,9 @@ class DecoderMenu; #endif } +using pv::views::ViewBase; +using pv::views::ViewType; + class MainWindow : public QMainWindow { Q_OBJECT @@ -78,9 +81,9 @@ public: shared_ptr get_active_view() const; - shared_ptr add_view(views::ViewType type, Session &session); + shared_ptr add_view(ViewType type, Session &session); - void remove_view(shared_ptr view); + void remove_view(shared_ptr view); shared_ptr add_subwindow( subwindows::SubWindowType type, Session &session); @@ -113,7 +116,7 @@ private: virtual bool restoreState(const QByteArray &state, int version = 0); private Q_SLOTS: - void on_add_view(views::ViewType type, Session *session); + void on_add_view(ViewType type, Session *session); void on_focus_changed(); void on_focused_session_changed(shared_ptr session);