fix compiles with gcc

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

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 3c59b46845a2d2ebf2f41fb17f84bc2f80261666..2f549876051ea258a6ee2deb77f378ac49d65d99 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-10  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * ControlDialog.tmpl: remove the Base:: prefix
+
 2002-06-07  Angus Leeming  <leeming@lyx.org>
 
        Fixes needed to compile with Compaq cxx 6.5.

diff --git a/src/frontends/controllers/ControlDialog.tmpl b/src/frontends/controllers/ControlDialog.tmpl
index 5e7390360a82c8ab391d84426302b5ff5b6f9b27..adfa9e424f7d2f1321f813a3ad67818ac66299be 100644 (file)
--- a/src/frontends/controllers/ControlDialog.tmpl
+++ b/src/frontends/controllers/ControlDialog.tmpl
@@ -27,49 +27,49 @@ ControlDialog<Base>::ControlDialog(LyXView & lv, Dialogs & d)
 template <class Base>
 void ControlDialog<Base>::show()
 {
-       if (Base::isBufferDependent() && !Base::lv_.view()->available())
+       if (isBufferDependent() && !lv_.view()->available())
                return;
 
-       Base::connect();
+       connect();
 
        setParams();
-       if (Base::emergency_exit_) {
+       if (emergency_exit_) {
                hide();
                return;
        }
 
        if (!dialog_built_) {
-               Base::view().build();
+               view().build();
                dialog_built_ = true;
        }
 
-       Base::bc().readOnly(Base::isReadonly());
-       Base::view().show();
+       bc().readOnly(isReadonly());
+       view().show();
 }
 
 template <class Base>
 void ControlDialog<Base>::update()
 {
-       if (Base::isBufferDependent() && !Base::lv_.view()->available())
+       if (isBufferDependent() && !lv_.view()->available())
                return;
 
        setParams();
-       if (Base::emergency_exit_) {
+       if (emergency_exit_) {
                hide();
                return;
        }
 
-       Base::bc().readOnly(Base::isReadonly());
-       Base::view().update();
+       bc().readOnly(isReadonly());
+       view().update();
 }
 
 template <class Base>
 void ControlDialog<Base>::hide()
 {
-       Base::emergency_exit_ = false;
+       emergency_exit_ = false;
        clearParams();
 
-       Base::disconnect();
-       Base::view().hide();
+       disconnect();
+       view().hide();
 }