[Gnash-commit] gnash ChangeLog libamf/element.cpp libamf/eleme...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/01 10:45:59

Modified files:
        .              : ChangeLog 
        libamf         : element.cpp element.h 
        server/asobj   : SharedObject.cpp 

Log message:
        Improve const correctness of amf::Element.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5283&r2=1.5284
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/element.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/element.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SharedObject.cpp?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5283
retrieving revision 1.5284
diff -u -b -r1.5283 -r1.5284
--- ChangeLog   1 Jan 2008 10:36:38 -0000       1.5283
+++ ChangeLog   1 Jan 2008 10:45:58 -0000       1.5284
@@ -1,5 +1,10 @@
 2008-01-01 Sandro Santilli <address@hidden>
 
+       * libamf/element.{cpp,h}: improve const correctness.
+       * server/asobj/SharedObject.cpp: drop useless const_casts.
+
+2008-01-01 Sandro Santilli <address@hidden>
+
        * server/asobj/SharedObject.cpp (sharedobject_getlocal):
          Use URL of first movie loaded, not base url, for security:
          base url can be set arbitrarily by publishers.

Index: libamf/element.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/element.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libamf/element.cpp  31 Dec 2007 02:17:02 -0000      1.2
+++ libamf/element.cpp  1 Jan 2008 10:45:58 -0000       1.3
@@ -80,43 +80,25 @@
     init(indata);
 }
 
-Element::Element(const char *name, double indata)
-{
-//    GNASH_REPORT_FUNCTION;
-    init(name, indata);
-}
-
 Element::Element(double indata)
 {
 //    GNASH_REPORT_FUNCTION;
     init(indata);
 }
 
-Element::Element(string &indata)
+Element::Element(const string &indata)
 {
 //    GNASH_REPORT_FUNCTION;
     init(indata);
 }
 
-Element::Element(const char *name, string &indata)
-{
-//    GNASH_REPORT_FUNCTION;
-    init(name, indata);
-}
-
-Element::Element(string &name, string &indata)
-{
-//    GNASH_REPORT_FUNCTION;
-    init(name, indata);
-}
-
-Element::Element(const char *name, bool indata)
+Element::Element(const string &name, const string &indata)
 {
 //    GNASH_REPORT_FUNCTION;
     init(name, indata);
 }
 
-Element::Element(string &name, bool indata)
+Element::Element(const string &name, bool indata)
 {
 //    GNASH_REPORT_FUNCTION;
     init(name, indata);
@@ -150,14 +132,14 @@
 }
 
 Element &
-Element::init(string &indata)
+Element::init(const string &indata)
 {
 //    GNASH_REPORT_FUNCTION;
     return init("", indata);
 }
 
 Element &
-Element::init(const string &name, string &indata)
+Element::init(const string &name, const string &indata)
 {
 //    GNASH_REPORT_FUNCTION;
     _type = Element::STRING;

Index: libamf/element.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/element.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libamf/element.h    31 Dec 2007 02:17:02 -0000      1.2
+++ libamf/element.h    1 Jan 2008 10:45:58 -0000       1.3
@@ -61,20 +61,17 @@
     Element();
     Element(boost::uint8_t *data);
     Element(double data);
-    Element(const char *name, double data);
-    Element(std::string &data);
-    Element(const char *name, std::string &data);
-    Element(std::string &name, std::string &data);
+    Element(const std::string &data);
+    Element(const std::string &name, const std::string &data);
     Element(bool data);
-    Element(const char *name, bool data);
-    Element(std::string &name, bool data);
+    Element(const std::string &name, bool data);
     ~Element();
     void clear();
     boost::uint8_t *init(boost::uint8_t *data);
     Element &init(const std::string &name, double data);
     Element &init(double data);
-    Element &init(const std::string &name, std::string &data);
-    Element &init(std::string &data);
+    Element &init(const std::string &name, const std::string &data);
+    Element &init(const std::string &data);
     Element &init(const std::string &name, bool data);
     Element &init(bool data);
 
@@ -115,8 +112,8 @@
     
     boost::uint16_t getLength() { return _length; };
     void setLength(boost::uint16_t x) { _length = x; };
-    std::string &getName() { return _name; };
-    void setName(std::string &name) { _name = name; };
+    const std::string &getName() const { return _name; };
+    void setName(const std::string &name) { _name = name; };
     void setName(boost::uint8_t *name) { _name = reinterpret_cast<const char 
*>(name); };
 //    boost::posix_time::ptime to_date();
 private:

Index: server/asobj/SharedObject.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SharedObject.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/asobj/SharedObject.cpp       1 Jan 2008 10:36:39 -0000       1.25
+++ server/asobj/SharedObject.cpp       1 Jan 2008 10:45:59 -0000       1.26
@@ -83,9 +83,7 @@
             AMF amf;
             Element *el = 0;
 
-            const string& name_c = _st.string_table::value(key);
-            // TODO: fix amf::Element interface to take const strings !!!
-            string& name = const_cast<string&>(name_c);
+            const string& name = _st.string_table::value(key);
 
 //            cerr << "FIXME: yes!!!!! " << name << ": "<< 
val.to_debug_string() << endl;