use anon namespace, somewhat better comp. handling of minipages, not quite there yet

[lyx.git] / src / frontends / ButtonPolicies.C

diff --git a/src/frontends/ButtonPolicies.C b/src/frontends/ButtonPolicies.C
index 11d833394829ac5e3da3ff5d3521fa20cc1be4bc..89c09018b3bc87d684c7793e619d864cbbf59572 100644 (file)
--- a/src/frontends/ButtonPolicies.C
+++ b/src/frontends/ButtonPolicies.C
@@ -21,9 +21,12 @@
 #include "ButtonPolicies.h"
 #include "debug.h"
 
+using std::endl;
 
 /// Helper function
-static inline
+namespace {
+
+inline
 void nextState(ButtonPolicy::State & state,
               ButtonPolicy::SMInput in,
               ButtonPolicy::StateMachine const & s_m,
@@ -38,10 +41,12 @@ void nextState(ButtonPolicy::State & state,
                       << in
                       << " from state "
                       << state
-                      << std::endl;
+                      << endl;
        }
 }
 
+} // namespace anon
+
 
 /*-----------------------------PreferencesPolicy-----------------------------*/
 
@@ -50,7 +55,7 @@ PreferencesPolicy::PreferencesPolicy()
        : state_(INITIAL),
          outputs_(APPLIED + 1, ButtonPolicy::ALL_BUTTONS),
          state_machine_(APPLIED + 1,
-                        StateArray(SMI_TOTAL, ButtonPolicy::BOGUS))
+                        StateArray(int(SMI_TOTAL), ButtonPolicy::BOGUS))
 {
        // Build the state output map
        outputs_[INITIAL] = CLOSE;
@@ -98,6 +103,7 @@ PreferencesPolicy::PreferencesPolicy()
 
 void PreferencesPolicy::input(SMInput input)
 {
+       //lyxerr << "PreferencesPolicy::input" << endl;
        // CANCEL and HIDE always take us to INITIAL for all cases.
        // Note that I didn't put that special case in the helper function
        // because it doesn't belong there.  Some other 
@@ -123,7 +129,7 @@ OkCancelPolicy::OkCancelPolicy()
        : state_(INITIAL),
          outputs_(INVALID + 1, ButtonPolicy::ALL_BUTTONS),
          state_machine_(INVALID + 1,
-                        StateArray(SMI_TOTAL, ButtonPolicy::BOGUS))
+                        StateArray(int(SMI_TOTAL), ButtonPolicy::BOGUS))
 {
        // Build the state output map
        outputs_[INITIAL] = CLOSE;
@@ -159,6 +165,8 @@ OkCancelPolicy::OkCancelPolicy()
 
 void OkCancelPolicy::input(SMInput input)
 {
+       //lyxerr << "OkCancelPolicy::input" << endl;
+       
        // CANCEL and HIDE always take us to INITIAL for all cases
        if (SMI_CANCEL == input
            || SMI_HIDE == input) {
@@ -176,7 +184,7 @@ OkCancelReadOnlyPolicy::OkCancelReadOnlyPolicy()
        : state_(INITIAL),
          outputs_(RO_INVALID + 1, ButtonPolicy::ALL_BUTTONS),
          state_machine_(RO_INVALID + 1,
-                        StateArray(SMI_TOTAL, ButtonPolicy::BOGUS))
+                        StateArray(int(SMI_TOTAL), ButtonPolicy::BOGUS))
 {
        // Build the state output map
        outputs_[INITIAL] = CLOSE;
@@ -231,6 +239,8 @@ OkCancelReadOnlyPolicy::OkCancelReadOnlyPolicy()
 
 void OkCancelReadOnlyPolicy::input(SMInput input)
 {
+       //lyxerr << "OkCancelReadOnlyPolicy::input" << endl;
+       
        // CANCEL and HIDE always take us to INITIAL for all cases
        if (SMI_CANCEL == input
            || SMI_HIDE == input) {
@@ -251,7 +261,7 @@ NoRepeatedApplyReadOnlyPolicy::NoRepeatedApplyReadOnlyPolicy()
        : state_(INITIAL),
          outputs_(RO_INVALID + 1, ButtonPolicy::ALL_BUTTONS),
          state_machine_(RO_INVALID + 1,
-                        StateArray(SMI_TOTAL, ButtonPolicy::BOGUS))
+                        StateArray(int(SMI_TOTAL), ButtonPolicy::BOGUS))
 {
        // Build the state output map
        outputs_[INITIAL] = CLOSE;
@@ -307,6 +317,8 @@ NoRepeatedApplyReadOnlyPolicy::NoRepeatedApplyReadOnlyPolicy()
 
 void NoRepeatedApplyReadOnlyPolicy::input(SMInput input)
 {
+       //lyxerr << "NoReapeatedApplyReadOnlyPolicy::input" << endl;
+       
        // CANCEL and HIDE always take us to INITIAL for all cases
        if (SMI_CANCEL == input
            || SMI_HIDE == input) {
@@ -327,7 +339,7 @@ OkApplyCancelReadOnlyPolicy::OkApplyCancelReadOnlyPolicy()
        : state_(INITIAL),
          outputs_(RO_APPLIED + 1, ButtonPolicy::ALL_BUTTONS),
          state_machine_(RO_APPLIED + 1,
-                        StateArray(SMI_TOTAL, ButtonPolicy::BOGUS))
+                        StateArray(int(SMI_TOTAL), ButtonPolicy::BOGUS))
 {
        // Build the state output map
        outputs_[INITIAL] = CLOSE;
@@ -397,6 +409,8 @@ OkApplyCancelReadOnlyPolicy::OkApplyCancelReadOnlyPolicy()
 
 void OkApplyCancelReadOnlyPolicy::input(SMInput input)
 {
+       //lyxerr << "OkApplyCancelReadOnlyPolicy::input" << endl;
+       
        // CANCEL and HIDE always take us to INITIAL for all cases
        if (SMI_CANCEL == input
            || SMI_HIDE == input) {
@@ -417,7 +431,7 @@ OkApplyCancelPolicy::OkApplyCancelPolicy()
        : state_(INITIAL),
          outputs_(APPLIED + 1, ButtonPolicy::ALL_BUTTONS),
          state_machine_(APPLIED + 1,
-                        StateArray(SMI_TOTAL, ButtonPolicy::BOGUS))
+                        StateArray(int(SMI_TOTAL), ButtonPolicy::BOGUS))
 {
        // Build the state output map
        outputs_[INITIAL] = CLOSE;
@@ -461,6 +475,8 @@ OkApplyCancelPolicy::OkApplyCancelPolicy()
 
 void OkApplyCancelPolicy::input(SMInput input)
 {
+       //lyxerr << "OkApplyCancelPolicy::input" << endl;
+       
        // CANCEL and HIDE always take us to INITIAL for all cases
        if (SMI_CANCEL == input
            || SMI_HIDE == input) {
@@ -481,7 +497,7 @@ NoRepeatedApplyPolicy::NoRepeatedApplyPolicy()
        : state_(INITIAL),
          outputs_(INVALID + 1, ButtonPolicy::ALL_BUTTONS),
          state_machine_(INVALID + 1,
-                        StateArray(SMI_TOTAL, ButtonPolicy::BOGUS))
+                        StateArray(int(SMI_TOTAL), ButtonPolicy::BOGUS))
 {
        // Build the state output map
        outputs_[INITIAL] = CLOSE;
@@ -517,6 +533,8 @@ NoRepeatedApplyPolicy::NoRepeatedApplyPolicy()
 
 void NoRepeatedApplyPolicy::input(SMInput input)
 {
+       //lyxerr << "NoRepeatedApplyPolicy::input" << endl;
+       
        // CANCEL and HIDE always take us to INITIAL for all cases
        if (SMI_CANCEL == input
            || SMI_HIDE == input) {