do what the FIXME suggested

[lyx.git] / src / frontends / qt4 / DockView.h

diff --git a/src/frontends/qt4/DockView.h b/src/frontends/qt4/DockView.h
index 30e336119fc462266f657ffcaa5657591ea7d2ab..5b2cdd7a96fa44185a95fc74b70a4f7a827ba7e6 100644 (file)
--- a/src/frontends/qt4/DockView.h
+++ b/src/frontends/qt4/DockView.h
@@ -12,61 +12,47 @@
 #ifndef DOCK_VIEW_H
 #define DOCK_VIEW_H
 
-#include "controllers/Dialog.h"
+#include "Dialog.h"
 #include "GuiView.h"
-#include "qt_helpers.h"
-#include "debug.h"
 
 #include <QDockWidget>
 
-#include <boost/scoped_ptr.hpp>
-
-#include <string>
-
 namespace lyx {
 namespace frontend {
 
 /// Dock Widget container for LyX dialogs.
-/// This template class that encapsulates a given Widget inside a
-/// QDockWidget and presents a Dialog interface
-template<class MyController, class MyWidget>
+/**
+ * This template class that encapsulates a given Widget inside a
+ * QDockWidget and presents a Dialog interface
+ * FIXME: create a DockView.cpp file
+ **/
 class DockView : public QDockWidget, public Dialog
 {
 public:
        DockView(
-               GuiViewBase & parent, ///< the main window where to dock.
-               std::string const & title, ///< Window title (shown in the top title bar).
+               GuiView & parent, ///< the main window where to dock.
+               QString const & name, ///< dialog identifier.
+               QString const & title, ///< dialog title.
                Qt::DockWidgetArea area = Qt::LeftDockWidgetArea, ///< Position of the dock (and also drawer)
                Qt::WindowFlags flags = 0
-               )
-               : QDockWidget(toqstr(title), &parent, flags),
-               Dialog(parent, title)
+       )
+               : QDockWidget(&parent, flags), Dialog(parent, name, title)
        {
                if (flags & Qt::Drawer)
                        setFeatures(QDockWidget::NoDockWidgetFeatures);
-               MyController * controller = new MyController(*this);
-               setController(controller);
-               widget_.reset(new MyWidget(*controller));
-               setWidget(widget_.get());
                parent.addDockWidget(area, this);
        }
 
+       virtual ~DockView() {}
+
+       virtual QWidget * asQWidget() { return this; }
+       virtual QWidget const * asQWidget() const { return this; }
+
        /// Dialog inherited methods
        //@{
        void applyView() {}
-       void hideView() { QDockWidget::hide(); }
-       void showView() { QDockWidget::show(); }
-       bool isVisibleView() const { return QDockWidget::isVisible(); }
-       void redrawView() {}
-       void updateView()
-       {
-               widget_->updateView();
-               QDockWidget::update();
-       }
+       bool isClosing() const { return false; }
        //@}
-private:
-       /// The encapsulated widget.
-       boost::scoped_ptr<MyWidget> widget_;
 };
 
 } // frontend