gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] gnash ChangeLog server/movie_root.cpp server/sp...


From: Benjamin Wolsey
Subject: [Gnash-commit] gnash ChangeLog server/movie_root.cpp server/sp...
Date: Sun, 10 Feb 2008 09:36:39 +0000

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/02/10 09:36:39

Modified files:
        .              : ChangeLog 
        server         : movie_root.cpp sprite_instance.cpp 
        server/asobj   : LoadVars.cpp 
        libbase        : utf8.h 

Log message:
                * server/sprite_instance.cpp, server/movie_root.cpp: const 
correct
                  some iterators.
                * server/asobj/LoadVars.cpp: ditto.
                * libbase/utf8.h: make comments more Doxygen-friendly.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5605&r2=1.5606
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.159&r2=1.160
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.465&r2=1.466
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LoadVars.cpp?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utf8.h?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5605
retrieving revision 1.5606
diff -u -b -r1.5605 -r1.5606
--- ChangeLog   10 Feb 2008 06:19:19 -0000      1.5605
+++ ChangeLog   10 Feb 2008 09:36:38 -0000      1.5606
@@ -1,3 +1,10 @@
+2008-02-10 Benjamin Wolsey <address@hidden>
+
+       * server/sprite_instance.cpp, server/movie_root.cpp: const correct
+         some iterators.
+       * server/asobj/LoadVars.cpp: ditto.
+       * libbase/utf8.h: make comments more Doxygen-friendly.
+
 2008-02-09  Rob Savoye  <address@hidden>
 
        * packaging/snapshot.am: Fix rules to build binary tarballs

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -b -r1.159 -r1.160
--- server/movie_root.cpp       8 Feb 2008 19:33:20 -0000       1.159
+++ server/movie_root.cpp       10 Feb 2008 09:36:38 -0000      1.160
@@ -252,7 +252,7 @@
 
 #ifdef GNASH_DEBUG_LEVELS_SWAPPING
        log_debug("Before swapLevels (source depth %d, target depth %d) levels 
are: ", oldDepth, depth);
-       for (Levels::iterator i=_movies.begin(), e=_movies.end(); i!=e; ++i)
+       for (Levels::const_iterator i=_movies.begin(), e=_movies.end(); i!=e; 
++i)
        {
                log_debug(" %d: %p (%s @ depth %d)", i->first, 
(void*)(i->second.get()), i->second->getTarget().c_str(), 
i->second->get_depth());
        }
@@ -303,7 +303,7 @@
        
 #ifdef GNASH_DEBUG_LEVELS_SWAPPING
        log_debug("After swapLevels levels are: ");
-       for (Levels::iterator i=_movies.begin(), e=_movies.end(); i!=e; ++i)
+       for (Levels::const_iterator i=_movies.begin(), e=_movies.end(); i!=e; 
++i)
        {
                log_debug(" %d: %p (%s @ depth %d)", i->first, 
(void*)(i->second.get()), i->second->getTarget().c_str(), 
i->second->get_depth());
        }
@@ -1165,7 +1165,7 @@
 void movie_root::add_listener(CharacterList& ll, character* listener)
 {
        assert(listener);
-       for(CharacterList::iterator i = ll.begin(), e = ll.end(); i != e; ++i)
+       for(CharacterList::const_iterator i = ll.begin(), e = ll.end(); i != e; 
++i)
        {
                // Conceptually, we don't need to add the same character twice.
                // but see edit_text_character::setFocus()...

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -b -r1.465 -r1.466
--- server/sprite_instance.cpp  8 Feb 2008 11:58:56 -0000       1.465
+++ server/sprite_instance.cpp  10 Feb 2008 09:36:38 -0000      1.466
@@ -2258,7 +2258,7 @@
   TextFieldPtrVect* etc = get_textfield_variable(name);
   if ( etc )
   {
-    for (TextFieldPtrVect::iterator i=etc->begin(), e=etc->end(); i!=e; ++i)
+    for (TextFieldPtrVect::const_iterator i=etc->begin(), e=etc->end(); i!=e; 
++i)
     {
       TextFieldPtr tf = *i;
           val->set_string(tf->get_text_value());
@@ -2462,7 +2462,7 @@
 void
 sprite_instance::queueActions(ActionList& actions)
 {
-  for(ActionList::iterator it=actions.begin(), itEnd=actions.end();
+  for(ActionList::const_iterator it=actions.begin(), itEnd=actions.end();
            it != itEnd; ++it)
   {
     const action_buffer* buf = *it;
@@ -4154,7 +4154,7 @@
     if ( (sendVarsMethod == 1) && (url.querystring() != "") )  // GET
       del = "&";
     
-    for (PropMap::iterator i=props.begin(), e=props.end(); i!=e; ++i)
+    for (PropMap::const_iterator i=props.begin(), e=props.end(); i!=e; ++i)
     {
       std::string name = i->first;
       std::string value = i->second;

Index: server/asobj/LoadVars.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LoadVars.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- server/asobj/LoadVars.cpp   8 Feb 2008 13:28:33 -0000       1.41
+++ server/asobj/LoadVars.cpp   10 Feb 2008 09:36:39 -0000      1.42
@@ -447,7 +447,7 @@
        URL::parse_querystring(fn.arg(0).to_string(), vals);
 
        string_table& st = ptr->getVM().getStringTable();
-       for  (ValuesMap::iterator it=vals.begin(), itEnd=vals.end();
+       for  (ValuesMap::const_iterator it=vals.begin(), itEnd=vals.end();
                        it != itEnd; ++it)
        {
                ptr->set_member(st.find(it->first), 
as_value(it->second.c_str()));

Index: libbase/utf8.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utf8.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libbase/utf8.h      7 Feb 2008 16:15:34 -0000       1.8
+++ libbase/utf8.h      10 Feb 2008 09:36:39 -0000      1.9
@@ -26,11 +26,12 @@
 #include <boost/cstdint.hpp> // for boost::?int??_t
 
 /// Utilities to convert between std::string and std::wstring.
+//
 /// Strings in Gnash are generally stored as std::strings.
 /// We have to deal, however, with characters larger than standard
 /// ASCII (128), which can be encoded in two different ways.
 ///
-/// SWF 6 and later use UTF-8, encoded as multibyte characters and
+/// SWF6 and later use UTF-8, encoded as multibyte characters and
 /// allowing many thousands of unique codes. Multibyte characters are 
 /// difficult to handle, as their length - used for many string
 /// operations - is not certain without parsing the string.
@@ -49,23 +50,24 @@
 /// so we cannot convert all strings to UTF-8.
 ///
 /// Presently, this code is used for the AS String object,
-/// edit_text_character, ord() and chr().
-
+/// gnash::edit_text_character, ord() and chr().
 namespace utf8
 {
-       /// Converts a canonical std::string with multibyte characters into
-       /// a std::wstring.
-       /// @ param str the canonical string to convert
-       /// @ param version the SWF version, used to decide how to decode the 
string.
+       /// Converts a std::string with multibyte characters into a 
std::wstring.
+       //
+       /// @return a version-dependent wstring.
+       /// @param str the canonical string to convert.
+       /// @param version the SWF version, used to decide how to decode the 
string.
        //
        /// For SWF5, UTF-8 (or any other) multibyte encoded characters are
        /// converted char by char, mangling the string. 
        DSOEXPORT std::wstring decodeCanonicalString(const std::string& str, 
int version);
 
-       /// Converts a std::wstring into canonical std::string, depending on
-       /// version.
-       /// @ param wstr the wide string to convert
-       /// @ param version the SWF version, used to decide how to encode the 
string.
+       /// Converts a std::wstring into canonical std::string.
+       //
+       /// @return a version-dependent encoded std::string.
+       /// @param wstr the wide string to convert.
+       /// @param version the SWF version, used to decide how to encode the 
string.
        ///
        /// For SWF 5, each character is stored as an 8-bit (at least) char, 
rather
        /// than converting it to a canonical UTF-8 byte sequence. Gnash can 
then
@@ -74,19 +76,21 @@
        /// string methods. 
        DSOEXPORT std::string encodeCanonicalString(const std::wstring& wstr, 
int version);
 
-       /// Return the next Unicode character in the UTF-8 encoded
-       /// string.  Invalid UTF-8 sequences produce a U+FFFD character
+       /// Return the next Unicode character in the UTF-8 encoded string.
+       //
+       /// Invalid UTF-8 sequences produce a U+FFFD character
        /// as output.  Advances string iterator past the character
        /// returned, unless the returned character is '\0', in which
        /// case the iterator does not advance.
        boost::uint32_t decodeNextUnicodeCharacter(std::string::const_iterator& 
it);
 
-       /// Encodes the given wide character into a canonical
+       /// \brief Encodes the given wide character into a canonical
        /// string, theoretically up to 6 chars in length.
        std::string encodeUnicodeCharacter(boost::uint32_t ucs_character);
        
-       /// Encodes the given wide character into an at least 8-bit character,
-       /// allowing storage of Latin1 (ISO-8859-1) characters. This
+       /// Encodes the given wide character into an at least 8-bit character.
+       //
+       /// Allows storage of Latin1 (ISO-8859-1) characters. This
        /// is the format of SWF5 and below.
        std::string encodeLatin1Character(boost::uint32_t ucsCharacter);
 }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]