diff src/graphics.h.in @ 11074:8a3b7e8fcbbc

graphics.cc, graphics.h.in, genprops.awk: use octave_map and octave_scalar_map instead of Octave_map
author John W. Eaton <jwe@octave.org>
date Fri, 01 Oct 2010 05:16:04 -0400
parents 728c970a3e7f
children 4e31d44a9763
line wrap: on
line diff
--- a/src/graphics.h.in
+++ b/src/graphics.h.in
@@ -1619,7 +1619,7 @@
     return plist_map.find (go_name);
   }
 
-  Octave_map as_struct (const std::string& prefix_arg) const;
+  octave_scalar_map as_struct (const std::string& prefix_arg) const;
 
 private:
   plist_map_type plist_map;
@@ -2116,7 +2116,7 @@
 
   virtual std::string values_as_string (void);
 
-  virtual Octave_map values_as_struct (void);
+  virtual octave_scalar_map values_as_struct (void);
 
   virtual graphics_handle get_parent (void) const
   {
@@ -2302,7 +2302,7 @@
   void set (const Array<std::string>& names, const Cell& values,
             octave_idx_type row);
 
-  void set (const Octave_map& m);
+  void set (const octave_map& m);
 
   void set_value_or_default (const caseless_str& name,
                              const octave_value& val);
@@ -2348,7 +2348,7 @@
 
   std::string values_as_string (void) { return rep->values_as_string (); }
 
-  Octave_map values_as_struct (void) { return rep->values_as_struct (); }
+  octave_map values_as_struct (void) { return rep->values_as_struct (); }
 
   graphics_handle get_parent (void) const { return rep->get_parent (); }