Browse Source

pointers in parameters

David Rose 24 years ago
parent
commit
87e5025015
2 changed files with 11 additions and 11 deletions
  1. 9 9
      panda/src/tform/mouseWatcher.cxx
  2. 2 2
      panda/src/tform/mouseWatcher.h

+ 9 - 9
panda/src/tform/mouseWatcher.cxx

@@ -174,20 +174,20 @@ write(ostream &out, int indent_level) const {
 //               false if it was already on the list.
 ////////////////////////////////////////////////////////////////////
 bool MouseWatcher::
-add_group(PT(MouseWatcherGroup) group) {
+add_group(MouseWatcherGroup *group) {
   // return _groups.insert(group).second;
 
   // See if the group is in the set/vector already
-  Groups::const_iterator gi = find(_groups.begin(), 
-                                   _groups.end(), 
-                                   group);
+  PT(MouseWatcherGroup) pt = group;
+  Groups::const_iterator gi = 
+    find(_groups.begin(), _groups.end(), pt);
   if (gi != _groups.end()) {
     // Already in the set, return false
     return false;
   }
 
   // Not in the set, add it and return true
-  _groups.push_back(group);
+  _groups.push_back(pt);
   return true;
 }
 
@@ -200,7 +200,7 @@ add_group(PT(MouseWatcherGroup) group) {
 //               removed or was never added via add_group().
 ////////////////////////////////////////////////////////////////////
 bool MouseWatcher::
-remove_group(PT(MouseWatcherGroup) group) {
+remove_group(MouseWatcherGroup *group) {
   remove_regions_from(_current_regions, group);
   if (group->has_region(_preferred_region)) {
     _preferred_region = (MouseWatcherRegion *)NULL;
@@ -210,9 +210,9 @@ remove_group(PT(MouseWatcherGroup) group) {
   }
 
   // See if the group is in the set/vector
-  Groups::iterator gi = find(_groups.begin(),
-                            _groups.end(),
-                            group);
+  PT(MouseWatcherGroup) pt = group;
+  Groups::iterator gi = 
+    find(_groups.begin(), _groups.end(), pt);
   if (gi != _groups.end()) {
     // Found it, now erase it
     _groups.erase(gi);

+ 2 - 2
panda/src/tform/mouseWatcher.h

@@ -110,8 +110,8 @@ public:
   virtual void output(ostream &out) const;
   virtual void write(ostream &out, int indent_level = 0) const;
 
-  bool add_group(PT(MouseWatcherGroup) group);
-  bool remove_group(PT(MouseWatcherGroup) group);
+  bool add_group(MouseWatcherGroup *group);
+  bool remove_group(MouseWatcherGroup *group);
 
 protected:
   typedef pvector< PT(MouseWatcherRegion) > VRegions;