move stuff from a class template to a ordinary class...

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

diff --git a/src/frontends/controllers/ControlEmbeddedFiles.cpp b/src/frontends/controllers/ControlEmbeddedFiles.cpp
index 7ad8ba63b4119ba42a2ed3e50b43747f8907d6a7..4887541266cd2d3e7caa2c5138e16df19771b02f 100644 (file)
--- a/src/frontends/controllers/ControlEmbeddedFiles.cpp
+++ b/src/frontends/controllers/ControlEmbeddedFiles.cpp
@@ -55,6 +55,7 @@ void ControlEmbeddedFiles::updateEmbeddedFiles()
 {
        // copy buffer embeddedFiles to a local copy
        kernel().buffer().embeddedFiles().update();
+       //kernel().buffer().embeddingChanged();
 }
 
 

diff --git a/src/frontends/qt4/GuiDialogView.cpp b/src/frontends/qt4/GuiDialogView.cpp
index 9fd6b9151e3fe788a50834c26322dc2cd784d216..716aef5f68b77e1bf675c37e441795082e69a638 100644 (file)
--- a/src/frontends/qt4/GuiDialogView.cpp
+++ b/src/frontends/qt4/GuiDialogView.cpp
@@ -73,6 +73,15 @@ void GuiDialogView::hide()
 }
 
 
+void GuiDialogView::build()
+{
+       // protect the BC from unwarranted state transitions
+       updating_ = true;
+       build_dialog();
+       updating_ = false;
+}
+
+
 bool GuiDialogView::isValid()
 {
        return true;

diff --git a/src/frontends/qt4/GuiDialogView.h b/src/frontends/qt4/GuiDialogView.h
index 8d2fb4e2de590819f9833aa0fd9867980e1cb417..8da53c57d3780f9ef8eae1f7eb95059cd62c9f0b 100644 (file)
--- a/src/frontends/qt4/GuiDialogView.h
+++ b/src/frontends/qt4/GuiDialogView.h
@@ -45,8 +45,8 @@ public:
 protected:
        /// build the actual dialog
        virtual void build_dialog() = 0;
-       ///
-       virtual void build() = 0;
+       /// Build the dialog
+       virtual void build();
        /// Hide the dialog.
        virtual void hide();
        /// Create the dialog if necessary, update it and display it.
@@ -55,30 +55,26 @@ protected:
        virtual void update_contents() = 0;
        ///
        virtual bool isVisible() const;
-
        /// is the dialog currently valid ?
        virtual bool isValid();
 
        /// are we updating ?
        bool updating_;
-
+       ///
        GuiDialog & parent_;
 
 public Q_SLOTS:
        // dialog closed from WM
        void slotWMHide();
-
        // Restore button clicked
        void slotRestore();
-
        // OK button clicked
        void slotOK();
-
        // Apply button clicked
        void slotApply();
-
        // Close button clicked
        void slotClose();
+
 private:
        /// Pointer to the actual instantiation of the Qt dialog
        virtual QWidget * form() const = 0;
@@ -107,14 +103,6 @@ protected:
                dialog_->update();
        }
 
-       /// Build the dialog
-       virtual void build() {
-               // protect the BC from unwarranted state transitions
-               updating_ = true;
-               build_dialog();
-               updating_ = false;
-       }
-
        /// Pointer to the actual instantiation of the Qt dialog
        virtual GUIDialog * form() const { return dialog_.get(); }