[Gnash-commit] gnash/server StringPredicates.h as_environment....

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/11/27 23:02:53

Modified files:
        server         : StringPredicates.h as_environment.h dlist.cpp 
                         impl.cpp 

Log message:
        Fixes nameing...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/StringPredicates.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.79&r2=1.80

Patches:
Index: StringPredicates.h
===================================================================
RCS file: /sources/gnash/gnash/server/StringPredicates.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- StringPredicates.h  27 Nov 2006 22:49:07 -0000      1.5
+++ StringPredicates.h  27 Nov 2006 23:02:53 -0000      1.6
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: StringPredicates.h,v 1.5 2006/11/27 22:49:07 nihilus Exp $ */
+/* $Id: StringPredicates.h,v 1.6 2006/11/27 23:02:53 nihilus Exp $ */
 
 #ifndef GNASH_STRINGPREDICATES_H
 #define GNASH_STRINGPREDICATES_H
@@ -37,8 +37,8 @@
 
 namespace gnash {
 
-/// A case-insensitive string comparator.
-class StringNoCaseLessThen {
+/// A case-sensitive string comparator.
+class StringCase {
 public:
        bool operator() (const std::string& a, const std::string& b) const
        {
@@ -47,7 +47,7 @@
 };
 
 /// A case-insensitive string equality operator.
-class StringNoCaseEqual {
+class StringNoCase {
 public:
        bool operator() (const std::string& a, const std::string& b) const
        {

Index: as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- as_environment.h    3 Nov 2006 14:03:37 -0000       1.28
+++ as_environment.h    27 Nov 2006 23:02:53 -0000      1.29
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: as_environment.h,v 1.28 2006/11/03 14:03:37 strk Exp $ */
+/* $Id: as_environment.h,v 1.29 2006/11/27 23:02:53 nihilus Exp $ */
 
 #ifndef GNASH_AS_ENVIRONMENT_H
 #define GNASH_AS_ENVIRONMENT_H
@@ -308,7 +308,7 @@
 
 
        /// The variables container (case-insensitive)
-       typedef std::map<std::string, as_value, StringNoCaseLessThen> Variables;
+       typedef std::map<std::string, as_value, StringNoCase> Variables;
 
 private:
 

Index: dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- dlist.cpp   21 Nov 2006 00:25:46 -0000      1.39
+++ dlist.cpp   27 Nov 2006 23:02:53 -0000      1.40
@@ -81,7 +81,7 @@
 
 class NameEqualsNoCase {
 
-       StringNoCaseEqual noCaseEquals;
+       StringNoCase noCaseEquals;
 
 public:
        const std::string& _name;

Index: impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- impl.cpp    27 Nov 2006 15:57:51 -0000      1.79
+++ impl.cpp    27 Nov 2006 23:02:53 -0000      1.80
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: impl.cpp,v 1.79 2006/11/27 15:57:51 strk Exp $ */
+/* $Id: impl.cpp,v 1.80 2006/11/27 23:02:53 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -574,7 +574,7 @@
                }
        }
 
-       void add(const std::string& key, movie_definition* mov)
+       void add(const std::string& key, movie_definition& mov)
        {
                _map[key] = mov;
        }