some controller simplification

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20871 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/DialogView.h b/src/frontends/qt4/DialogView.h
index 09201abefe2061c77ea5cd82146d9f58ce2f13b0..0f36c4894e47169e305179edd8d355bfd27a33f4 100644 (file)
--- a/src/frontends/qt4/DialogView.h
+++ b/src/frontends/qt4/DialogView.h
@@ -31,8 +31,8 @@ namespace frontend {
 /// Window Dialog container for LyX dialogs.
 /// This template class that encapsulates a given Widget inside a
 /// QDialog and presents a Dialog interface
-template<class MyController, class MyWidget>
-class DialogView : public QDialog, public Dialog
+template<class MyWidget>
+class DialogView : public QDialog, public Dialog, public Controller
 {
 public:
        DialogView(
@@ -44,10 +44,9 @@ public:
                : QDialog(&parent, flags), name_(name)
        {
                setModal(modal);
-               controller_ = new MyController(*this, parent);
                QGridLayout * gridLayout = new QGridLayout(this);
                gridLayout->setMargin(0);
-               widget_ = new MyWidget(*controller_, this);
+               widget_ = new MyWidget(*this, this);
                gridLayout->addWidget(widget_);
                setWindowTitle("LyX: " + widget_->windowTitle());
        }
@@ -57,12 +56,12 @@ public:
        void applyView() {}
        void hideView()
        {
-               controller().clearParams();
+               clearParams();
                QDialog::hide();
        }
        void showData(std::string const & data)
        {
-               controller_->initialiseParams(data);
+               initialiseParams(data);
                showView();
        }
        void showView()
@@ -78,7 +77,7 @@ public:
        void redrawView() {}
        void updateData(std::string const & data)
        {
-               controller_->initialiseParams(data);
+               initialiseParams(data);
                updateView();
        }
        void updateView()
@@ -86,13 +85,12 @@ public:
                widget_->updateView();
        }
        void partialUpdateView(int /*id*/) {}
-       Controller & controller() { return *controller_; }
+       Controller & controller() { return *this; }
        std::string name() const { return name_; }
        //@}
 private:
        /// The encapsulated widget.
        MyWidget * widget_;
-       Controller * controller_;
        std::string name_;
 
        void showEvent(QShowEvent * e)
@@ -112,7 +110,7 @@ private:
                std::string key = name_ + "/geometry";
                settings.setValue(key.c_str(), QDialog::saveGeometry());
 #endif
-           QDialog::closeEvent(e);
+         QDialog::closeEvent(e);
        }
 };
 

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index ceab67789057b2bafa3810dc3324659e0a4cff90..0717da93735d38b3d952050bbad9380d131da588 100644 (file)
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -138,6 +138,7 @@ SOURCEFILES = \
 
 NOMOCHEADER = \
        ButtonController.h \
+       DialogView.h \
        GuiFontLoader.h \
        GuiFontMetrics.h \
        GuiImage.h \
@@ -150,7 +151,6 @@ MOCHEADER = \
        Action.h \
        BulletsModule.h \
        ColorCache.h \
-       DialogView.h \
        DockView.h \
        EmptyTable.h \
        FloatPlacement.h \