[Gnash-commit] /srv/bzr/gnash/trunk r12242: Don't use int when we meant boost::uint16_t. Cleanups only.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 12242 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Fri 2010-06-11 16:35:08 +0200
message:
  Don't use int when we meant boost::uint16_t. Cleanups only.
modified:
  libcore/parser/SWFMovieDefinition.cpp
  libcore/parser/SWFMovieDefinition.h
  libcore/parser/movie_definition.h
  libcore/parser/sprite_definition.h
  libcore/swf/PlaceObject2Tag.h

=== modified file 'libcore/parser/SWFMovieDefinition.cpp'
--- a/libcore/parser/SWFMovieDefinition.cpp     2010-06-11 12:21:46 +0000
+++ b/libcore/parser/SWFMovieDefinition.cpp     2010-06-11 14:03:55 +0000
@@ -173,7 +173,7 @@
 }
 
 void
-SWFMovieDefinition::addDisplayObject(int id, SWF::DefinitionTag* c)
+SWFMovieDefinition::addDisplayObject(boost::uint16_t id, SWF::DefinitionTag* c)
 {
     assert(c);
     boost::mutex::scoped_lock lock(_dictionaryMutex);
@@ -182,7 +182,7 @@
 }
 
 SWF::DefinitionTag*
-SWFMovieDefinition::getDefinitionTag(int id) const
+SWFMovieDefinition::getDefinitionTag(boost::uint16_t id) const
 {
 
     boost::mutex::scoped_lock lock(_dictionaryMutex);

=== modified file 'libcore/parser/SWFMovieDefinition.h'
--- a/libcore/parser/SWFMovieDefinition.h       2010-06-11 12:21:46 +0000
+++ b/libcore/parser/SWFMovieDefinition.h       2010-06-11 14:03:55 +0000
@@ -131,7 +131,7 @@
     /// replaces any existing DisplayObject with the same id
     ///
     void addDisplayObject(int id, boost::intrusive_ptr<SWF::DefinitionTag> c);
-
+      
     /// Return an iterator to the first dictionary element
     CharacterIterator begin() { return _map.begin(); }
 
@@ -238,10 +238,10 @@
     virtual void importResources(boost::intrusive_ptr<movie_definition> source,
             const Imports& imports);
 
-    void addDisplayObject(int DisplayObject_id, SWF::DefinitionTag* c);
+    virtual void addDisplayObject(boost::uint16_t id, SWF::DefinitionTag* c);
 
     /// Return a DisplayObject from the dictionary
-    SWF::DefinitionTag* getDefinitionTag(int id) const;
+    SWF::DefinitionTag* getDefinitionTag(boost::uint16_t id) const;
 
     // See dox in movie_definition
     //

=== modified file 'libcore/parser/movie_definition.h'
--- a/libcore/parser/movie_definition.h 2010-06-11 12:21:46 +0000
+++ b/libcore/parser/movie_definition.h 2010-06-11 14:03:55 +0000
@@ -190,8 +190,7 @@
        ///
        /// @return NULL if no DisplayObject with the given ID is found
        ///         (this is the default)
-       ///
-       virtual DefinitionTag* getDefinitionTag(int /*id*/) const
+       virtual DefinitionTag* getDefinitionTag(boost::uint16_t /*id*/) const
        {
                return NULL;
        }
@@ -228,8 +227,7 @@
        //
        /// This method is here to be called by DEFINE tags loaders.
        /// The default implementation does nothing.
-       ///
-       virtual void addDisplayObject(int /*id*/, DefinitionTag* /*ch*/)
+       virtual void addDisplayObject(boost::uint16_t /*id*/, DefinitionTag* 
/*c*/)
        {
        }
 

=== modified file 'libcore/parser/sprite_definition.h'
--- a/libcore/parser/sprite_definition.h        2010-06-11 12:21:46 +0000
+++ b/libcore/parser/sprite_definition.h        2010-06-11 14:03:55 +0000
@@ -207,15 +207,15 @@
        /// Get a SWF::DefinitionTag from this Sprite's root movie
        /// CharacterDictionary.
        ///
-       virtual SWF::DefinitionTag*     getDefinitionTag(int id) const
+       virtual SWF::DefinitionTag*     getDefinitionTag(boost::uint16_t id) 
const
        {
            return m_movie_def.getDefinitionTag(id);
        }
 
        /// Delegate call to associated root movie
-       virtual void addDisplayObject(int id, SWF::DefinitionTag* ch)
+       virtual void addDisplayObject(boost::uint16_t id, SWF::DefinitionTag* c)
        {
-               m_movie_def.addDisplayObject(id, ch);
+               m_movie_def.addDisplayObject(id, c);
        }
 
        // Create a (mutable) instance of our definition.  The

=== modified file 'libcore/swf/PlaceObject2Tag.h'
--- a/libcore/swf/PlaceObject2Tag.h     2010-05-20 09:57:10 +0000
+++ b/libcore/swf/PlaceObject2Tag.h     2010-06-11 14:05:12 +0000
@@ -118,7 +118,7 @@
 
     int getRatio()     const { return m_ratio; }
     int getClipDepth() const { return m_clip_depth; }
-    int getID()        const { return _id; }
+    boost::uint16_t getID()        const { return _id; }
     const std::string& getName() const { return m_name; }
     const SWFMatrix& getMatrix()    const { return m_matrix; }
     const cxform& getCxform()    const { return m_color_transform; }