inherit privately from noncopyable, set c++ mode, swap init order

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

diff --git a/src/frontends/controllers/ButtonController.h b/src/frontends/controllers/ButtonController.h
index d79733183c38c9f45aef241ecd62a0542dcfa4aa..b0337d3fd81a0c6956f4f4824af0ab60a5c89f56 100644 (file)
--- a/src/frontends/controllers/ButtonController.h
+++ b/src/frontends/controllers/ButtonController.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
@@ -61,8 +62,8 @@ private:
 
 template <class Button, class Widget>
 GuiBC<Button, Widget>::GuiBC(string const & cancel, string const & close)
-       : ButtonControllerBase(cancel, close)
-       , okay_(0), apply_(0), restore_(0), cancel_(0)
+       : ButtonControllerBase(cancel, close),
+         okay_(0), apply_(0), cancel_(0), restore_(0)
 {}
 
 

diff --git a/src/frontends/controllers/ButtonControllerBase.h b/src/frontends/controllers/ButtonControllerBase.h
index d82098ab2da5d396a6e78c63d54075771563fd7a..5114fb483b23d4aa0c5e625bd3727c71721f0b01 100644 (file)
--- a/src/frontends/controllers/ButtonControllerBase.h
+++ b/src/frontends/controllers/ButtonControllerBase.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
@@ -31,7 +32,7 @@
  * This abstract base class stripped of xforms-specific code by
  * Angus Leeming <a.leeming@ic.ac.uk>
  */
-class ButtonControllerBase : public boost::noncopyable
+class ButtonControllerBase : boost::noncopyable
 {
 public:
        /** Constructor.

diff --git a/src/frontends/controllers/ButtonPolicies.h b/src/frontends/controllers/ButtonPolicies.h
index 09c739640d17462a03291f982cc0c4c41f75b414..654f78049fae10f77b7917cf6f8c54adf9ba02ed 100644 (file)
--- a/src/frontends/controllers/ButtonPolicies.h
+++ b/src/frontends/controllers/ButtonPolicies.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /*
  * \file ButtonPolicies.h
  * \author Allan Rae, rae@lyx.org
@@ -68,7 +69,7 @@
 
     The IgnorantPolicy is a special case that allows anything.
  */
-class ButtonPolicy : public boost::noncopyable {
+class ButtonPolicy : boost::noncopyable {
 public:
        ///
        virtual ~ButtonPolicy() {}

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index bde59e42e2ae00b9294302cccb0120049e564276..03b8fce3b79a9263ecfa25b012f99c32edaa22de 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,12 @@
+2001-04-17  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * ButtonControllerBase.h: C++ mode, inherit privately from
+       noncopyable 
+       * ButtonPolicies.h: ditto
+
+       * ButtonController.h: C++ mode, swap init order of restore_ and
+       cancel_ 
+
 2001-04-06  John Levon  <moz@compsoc.man.ac.uk>
 
        * ControlTabularCreate.h: