fixes for the int vs unsigned long warnings

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

diff --git a/ChangeLog b/ChangeLog
index 77058807054f2bcfef718d063b8dbaa79cf6c971..6681aaf5e37494d2bfaf8aabe7fe810c887f0906 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2000-10-25  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * src/frontends/ButtonPolicies.h: remove the LOstream and remove
+       the two recently added operator<< for SMInput and State.
+
+       * src/frontends/ButtonPolicies.C (PreferencesPolicy): cast
+       SMI_TOTAL to int.
+       (OkCancelPolicy): ditto
+       (OkCancelReadOnlyPolicy): ditto
+       (NoRepeatedApplyReadOnlyPolicy): ditto
+       (OkApplyCancelReadOnlyPolicy): ditto
+       (OkApplyCancelPolicy): ditto
+       (NoRepeatedApplyPolicy): ditto
+
 2000-10-25  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * src/frontends/ButtonPolicies.h: include "support/LOstream.h" and

diff --git a/src/frontends/ButtonPolicies.C b/src/frontends/ButtonPolicies.C
index 11d833394829ac5e3da3ff5d3521fa20cc1be4bc..fcb15da1bc2d367b1e4d0937258e6f7cddc8a692 100644 (file)
--- a/src/frontends/ButtonPolicies.C
+++ b/src/frontends/ButtonPolicies.C
@@ -50,7 +50,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;
@@ -123,7 +123,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;
@@ -176,7 +176,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;
@@ -251,7 +251,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;
@@ -327,7 +327,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;
@@ -417,7 +417,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;
@@ -481,7 +481,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;

diff --git a/src/frontends/ButtonPolicies.h b/src/frontends/ButtonPolicies.h
index 2cc39853afad54f478ed02a9b24477e25906d87e..bc416a5287f05c066caa3c2fb57b040ee68bc65c 100644 (file)
--- a/src/frontends/ButtonPolicies.h
+++ b/src/frontends/ButtonPolicies.h
@@ -22,7 +22,6 @@
 
 #include <vector>
 #include <boost/utility.hpp>
-#include "support/LOstream.h"
 
 /** An abstract base class for button policies.
     A state machine implementation of the various button policies used by the
@@ -159,20 +158,6 @@ public:
 };
 
 
-inline
-std::ostream & operator<<(std::ostream & os, ButtonPolicy::SMInput smi) 
-{
-       os << int(smi);
-       return os;
-}
-
-inline
-std::ostream & operator<<(std::ostream & os, ButtonPolicy::State st)
-{
-       os << int(st);
-       return os;
-}
-
 //--------------------- Actual Policy Classes -----------------------------
 
 /** Ok and Cancel buttons for dialogs with read-only operation.