[Gnash-commit] gnash ChangeLog server/generic_character.cpp se...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/05/29 09:22:00

Modified files:
        .              : ChangeLog 
        server         : generic_character.cpp sprite_instance.cpp 
                         array.cpp 
        server/asobj   : Key.cpp NetStream.cpp 
        server/vm      : Machine.cpp 

Log message:
                * server/generic_character.cpp: header cleanup.
                * server/sprite_instance.cpp, server/edit_text_character.cpp: 
replace
                  deprecated to_number<>().
                * server/asobj/Key.cpp, server/asobj/NetStream.cpp: ditto.
                * server/vm/Machine.cpp: ditto.
                * server/array.cpp: use to_int() instead of casting to_number().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6754&r2=1.6755
http://cvs.savannah.gnu.org/viewcvs/gnash/server/generic_character.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.543&r2=1.544
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Key.cpp?cvsroot=gnash&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/Machine.cpp?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6754
retrieving revision 1.6755
diff -u -b -r1.6754 -r1.6755
--- ChangeLog   29 May 2008 08:45:55 -0000      1.6754
+++ ChangeLog   29 May 2008 09:21:59 -0000      1.6755
@@ -1,3 +1,12 @@
+2008-05-29 Benjamin Wolsey <address@hidden>
+
+       * server/generic_character.cpp: header cleanup.
+       * server/sprite_instance.cpp, server/edit_text_character.cpp: replace
+         deprecated to_number<>().
+       * server/asobj/Key.cpp, server/asobj/NetStream.cpp: ditto.
+       * server/vm/Machine.cpp: ditto.
+       * server/array.cpp: use to_int() instead of casting to_number().
+
 2008-05-29 Sandro Santilli <address@hidden>
 
        * server/font.{cpp,h}: drop reference to "owning movie"

Index: server/generic_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/generic_character.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/generic_character.cpp        29 Apr 2008 11:29:03 -0000      1.15
+++ server/generic_character.cpp        29 May 2008 09:22:00 -0000      1.16
@@ -17,11 +17,6 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
 #include "generic_character.h"
 
 namespace gnash

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.543
retrieving revision 1.544
diff -u -b -r1.543 -r1.544
--- server/sprite_instance.cpp  28 May 2008 14:00:40 -0000      1.543
+++ server/sprite_instance.cpp  29 May 2008 09:22:00 -0000      1.544
@@ -903,7 +903,7 @@
     return as_value();
   }
 
-  int depth = fn.arg(0).to_number<int>();
+  int depth = fn.arg(0).to_int();
   boost::intrusive_ptr<character> ch = sprite->get_character_at_depth(depth);
   if ( ! ch ) return as_value(); // we want 'undefined', not 'null'
   return as_value(ch.get());

Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- server/array.cpp    25 May 2008 10:05:19 -0000      1.110
+++ server/array.cpp    29 May 2008 09:22:00 -0000      1.111
@@ -381,7 +381,7 @@
                assert(prevStackSize == _env.stack_size());
 #endif
 
-               return (*_zeroCmp)((int)ret.to_number());
+               return (*_zeroCmp)(ret.to_int());
        }
 };
 
@@ -476,7 +476,7 @@
        {
                if ( _cmps.empty() ) return false;
 
-               Comps::iterator cmp = _cmps.begin();
+               Comps::const_iterator cmp = _cmps.begin();
                Props::iterator pit;
 
                // why do we cast ao/bo to objects here ?
@@ -920,7 +920,7 @@
        // Get start offset
        //----------------
        unsigned startoffset;
-       int start = fn.arg(0).to_number<int>();
+       int start = fn.arg(0).to_int();
        if ( start < 0 ) start = array->size()+start; // start is negative, so 
+ means -abs()
        startoffset = utility::clamp<int>(start, 0, origlen);
 #ifdef GNASH_DEBUG
@@ -934,7 +934,7 @@
        unsigned len = origlen - start;
        if (fn.nargs > 1)
        {
-               int lenval = fn.arg(1).to_number<int>();
+               int lenval = fn.arg(1).to_int();
                if ( lenval < 0 )
                {
                        IF_VERBOSE_ASCODING_ERRORS(
@@ -1348,7 +1348,7 @@
        }
 
 
-       startindex = int(fn.arg(0).to_number());
+       startindex = fn.arg(0).to_int();
 
        // if the index is negative, it means "places from the end"
        // where -1 is the last element
@@ -1357,7 +1357,7 @@
        // if we sent at least two arguments, setup endindex
        if (fn.nargs >= 2)
        {
-               endindex = int(fn.arg(1).to_number());
+               endindex = fn.arg(1).to_int();
 
                // if the index is negative, it means
                // "places from the end" where -1 is the last element

Index: server/asobj/Key.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Key.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- server/asobj/Key.cpp        25 May 2008 10:05:22 -0000      1.54
+++ server/asobj/Key.cpp        29 May 2008 09:22:00 -0000      1.55
@@ -152,7 +152,7 @@
         return as_value();
     }
 
-    int keycode = fn.arg(0).to_number<int>();
+    int keycode = fn.arg(0).to_int();
 
     return as_value(ko->is_key_down(keycode));
 }

Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- server/asobj/NetStream.cpp  27 May 2008 13:24:59 -0000      1.95
+++ server/asobj/NetStream.cpp  29 May 2008 09:22:00 -0000      1.96
@@ -170,7 +170,7 @@
        boost::uint32_t time = 0;
        if (fn.nargs > 0)
        {
-               time = fn.arg(0).to_number<boost::uint32_t>();
+               time = static_cast<boost::uint32_t>(fn.arg(0).to_number());
        }
        ns->seek(time);
 

Index: server/vm/Machine.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/Machine.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/vm/Machine.cpp       7 May 2008 20:59:30 -0000       1.9
+++ server/vm/Machine.cpp       29 May 2008 09:22:00 -0000      1.10
@@ -1655,7 +1655,7 @@
        case SWF::ABC_ACTION_CONVERT_I:
        case SWF::ABC_ACTION_COERCE_I:
        {
-               mStack.top(0) = mStack.top(0).to_number<int>();
+               mStack.top(0) = mStack.top(0).to_int();
                break;
        }
 /// 0x74 ABC_ACTION_CONVERT_U
@@ -1875,7 +1875,7 @@
 ///  nint -- ~((Int) obj)
        case SWF::ABC_ACTION_BITNOT:
        {
-               mStack.top(0) = ~mStack.top(0).to_number<int>();
+               mStack.top(0) = ~mStack.top(0).to_int();
                break;
        }
 /// 0xA0 ABC_ACTION_ADD        
@@ -1949,7 +1949,7 @@
 ///  a << b
        case SWF::ABC_ACTION_LSHIFT:
        {
-               mStack.top(1) = mStack.top(1).to_number<int>() << 
mStack.top(0).to_number<int>();
+               mStack.top(1) = mStack.top(1).to_int() << 
mStack.top(0).to_int();
                mStack.drop(1);
                break;
        }
@@ -1961,7 +1961,7 @@
 ///  a >> b
        case SWF::ABC_ACTION_RSHIFT:
        {
-               mStack.top(1) = mStack.top(1).to_number<int>() >> 
mStack.top(0).to_number<int>();
+               mStack.top(1) = mStack.top(1).to_int() >> 
mStack.top(0).to_int();
                mStack.drop(1);
                break;
        }
@@ -1974,7 +1974,7 @@
        case SWF::ABC_ACTION_URSHIFT:
        {
                mStack.top(1) = mStack.top(1).to_number<unsigned int>()
-                       >> mStack.top(0).to_number<int>();
+                       >> mStack.top(0).to_int();
                mStack.drop(1);
                break;
        }
@@ -1985,7 +1985,7 @@
 ///  a & b
        case SWF::ABC_ACTION_BITAND:
        {
-               mStack.top(1) = mStack.top(1).to_number<int>() & 
mStack.top(0).to_number<int>();
+               mStack.top(1) = mStack.top(1).to_int() & mStack.top(0).to_int();
                mStack.drop(1);
                break;
        }
@@ -1997,7 +1997,7 @@
 ///  a | b
        case SWF::ABC_ACTION_BITOR:
        {
-               mStack.top(1) = mStack.top(1).to_number<int>() | 
mStack.top(0).to_number<int>();
+               mStack.top(1) = mStack.top(1).to_int() | mStack.top(0).to_int();
                mStack.drop(1);
                break;
        }
@@ -2009,7 +2009,7 @@
 ///  a ^ b
        case SWF::ABC_ACTION_BITXOR:
        {
-               mStack.top(1) = mStack.top(1).to_number<int>() ^ 
mStack.top(0).to_number<int>();
+               mStack.top(1) = mStack.top(1).to_int() ^ mStack.top(0).to_int();
                mStack.drop(1);
                break;
        }
@@ -2159,14 +2159,14 @@
 /// See: 0x91 (ABC_ACTION_INCREMENT), but forces types to int, not double
        case SWF::ABC_ACTION_INCREMENT_I:
        {
-               mStack.top(0) = mStack.top(0).to_number<int>() + 1;
+               mStack.top(0) = mStack.top(0).to_int() + 1;
                break;
        }
 /// 0xC1 ABC_ACTION_DECREMENT_I
 /// See: 0x93 (ABC_ACTION_DECREMENT), but forces types to int, not double
        case SWF::ABC_ACTION_DECREMENT_I:
        {
-               mStack.top(0) = mStack.top(0).to_number<int>() - 1;
+               mStack.top(0) = mStack.top(0).to_int() - 1;
                break;
        }
 /// 0xC2 ABC_ACTION_INCLOCAL_I
@@ -2174,7 +2174,7 @@
        case SWF::ABC_ACTION_INCLOCAL_I:
        {
                boost::uint32_t foff = mStream->read_V32();
-               mFrame.value(foff) = mFrame.value(foff).to_number<int>() + 1;
+               mFrame.value(foff) = mFrame.value(foff).to_int() + 1;
                break;
        }
 /// 0xC3 ABC_ACTION_DECLOCAL_I
@@ -2182,21 +2182,21 @@
        case SWF::ABC_ACTION_DECLOCAL_I:
        {
                boost::uint32_t foff = mStream->read_V32();
-               mFrame.value(foff) = mFrame.value(foff).to_number<int>() - 1;
+               mFrame.value(foff) = mFrame.value(foff).to_int() - 1;
                break;
        }
 /// 0xC4 ABC_ACTION_NEGATE_I
 /// See: 0x90 (ABC_ACTION_NEGATE), but forces type to int, not double
        case SWF::ABC_ACTION_NEGATE_I:
        {
-               mStack.top(0) = - mStack.top(0).to_number<int>();
+               mStack.top(0) = - mStack.top(0).to_int();
                break;
        }
 /// 0xC5 ABC_ACTION_ADD_I
 /// See: 0xA0 (ABC_ACTION_ADD), but forces type to int
        case SWF::ABC_ACTION_ADD_I:
        {
-               mStack.top(1) = mStack.top(1).to_number<int>() + 
mStack.top(0).to_number<int>();
+               mStack.top(1) = mStack.top(1).to_int() + mStack.top(0).to_int();
                mStack.drop(1);
                break;
        }
@@ -2204,7 +2204,7 @@
 /// See: 0xA1 (ABC_ACTION_SUBTRACT), but forces type to int
        case SWF::ABC_ACTION_SUBTRACT_I:
        {
-               mStack.top(1) = mStack.top(1).to_number<int>() - 
mStack.top(0).to_number<int>();
+               mStack.top(1) = mStack.top(1).to_int() - mStack.top(0).to_int();
                mStack.drop(1);
                break;
        }
@@ -2212,7 +2212,7 @@
 /// See: 0xA2 (ABC_ACTION_MULTIPLY), but forces type to int
        case SWF::ABC_ACTION_MULTIPLY_I:
        {
-               mStack.top(1) = mStack.top(0).to_number<int>() * 
mStack.top(1).to_number<int>();
+               mStack.top(1) = mStack.top(0).to_int() * mStack.top(1).to_int();
                mStack.drop(1);
                break;
        }