[Pingus-CVS] CVS: Games/Pingus/src/editor EditorObj.hh,1.38,1.39 EditorObjGroup.cc,1.12,1.13 EditorObjGroup.hh,1.8,1.9 ObjectManager.cc,1.60,1.61 ObjectManager.hh,1.23,1.24 PLFObj.cc,1.59,1.60 PLFObj.hh,1.27,1.28 RectEditorObj.cc,1.1,1.2 RectEditorObj.hh,1.1,1.2 ScrollMap.hh,1.4,1.5 SpriteEditorObj.cc,1.2,1.3 SpriteEditorObj.hh,1.2,1.3 StatusLine.cc,1.9,1.10 StatusLine.hh,1.7,1.8 WeatherObj.cc,1.10,1.11 WeatherObj.hh,1.5,1.6

[torangan]

Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv15758/editor

Modified Files:
        EditorObj.hh EditorObjGroup.cc EditorObjGroup.hh 
        ObjectManager.cc ObjectManager.hh PLFObj.cc PLFObj.hh 
        RectEditorObj.cc RectEditorObj.hh ScrollMap.hh 
        SpriteEditorObj.cc SpriteEditorObj.hh StatusLine.cc 
        StatusLine.hh WeatherObj.cc WeatherObj.hh 
Log Message:
removed dummy_ptr - this reduces compile time, footprint and complexity.
There was no point where it was needed and it's even been removed from boost.


Index: EditorObj.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/EditorObj.hh,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- EditorObj.hh        1 Jun 2002 18:05:36 -0000       1.38
+++ EditorObj.hh        7 Jun 2002 14:50:34 -0000       1.39
@@ -24,7 +24,6 @@
 #include <fstream>
 
 #include "../boost/smart_ptr.hpp"
-#include "../boost/dummy_ptr.hpp"
 
 using namespace std;
 
@@ -49,14 +48,14 @@
   virtual ~EditorObj ();
 
   /** Draw the object to the given view */
-  virtual void draw (boost::dummy_ptr<EditorView> view) =0;
+  virtual void draw (EditorView * view) =0;
 
   /** Called once a game loop, the delta is the time passed since the
       last update in seconds */
   virtual void update (float /*delta*/) {};
 
   /** Draw a rectangle or shape around the object to the given view */
-  virtual void draw_mark (boost::dummy_ptr<EditorView> view) =0;
+  virtual void draw_mark (EditorView * view) =0;
 
   /** Return true when the object is under the given coordinates */
   virtual bool is_over(const CL_Vector&) =0;

Index: EditorObjGroup.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/EditorObjGroup.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- EditorObjGroup.cc   15 Jan 2002 10:48:51 -0000      1.12
+++ EditorObjGroup.cc   7 Jun 2002 14:50:34 -0000       1.13
@@ -45,7 +45,7 @@
 
 /** Draw the object */
 void
-EditorObjGroup::draw (boost::dummy_ptr<EditorView> view)
+EditorObjGroup::draw (EditorView * view)
 {
   for(std::list<boost::shared_ptr<EditorObj> >::iterator i = objs.begin();
       i != objs.end();
@@ -69,7 +69,7 @@
 
 /** Draw the caputre rectangle around the object */
 void
-EditorObjGroup::draw_mark (boost::dummy_ptr<EditorView> view)
+EditorObjGroup::draw_mark (EditorView * view)
 {
   for(std::list<boost::shared_ptr<EditorObj> >::iterator i = objs.begin();
       i != objs.end();

Index: EditorObjGroup.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/EditorObjGroup.hh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- EditorObjGroup.hh   15 Jan 2002 10:48:51 -0000      1.8
+++ EditorObjGroup.hh   7 Jun 2002 14:50:34 -0000       1.9
@@ -40,8 +40,8 @@
   float get_z_pos();
 
   void set_position_offset(const CL_Vector& offset);
-  void draw(boost::dummy_ptr<EditorView>);
-  void draw_mark (boost::dummy_ptr<EditorView> view);
+  void draw(EditorView *);
+  void draw_mark (EditorView * view);
   
   /** Add an object to the group */
   void EditorObjGroup::add (boost::shared_ptr<EditorObj>);

Index: ObjectManager.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/ObjectManager.cc,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- ObjectManager.cc    4 Jun 2002 13:43:19 -0000       1.60
+++ ObjectManager.cc    7 Jun 2002 14:50:34 -0000       1.61
@@ -217,7 +217,7 @@
 }
 
 void 
-ObjectManager::draw(boost::dummy_ptr<EditorView> view)
+ObjectManager::draw(EditorView * view)
 {
   view->draw_fillrect(0, 0, width, height,
                      bg.red, bg.green, bg.blue, 1.0);

Index: ObjectManager.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/ObjectManager.hh,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ObjectManager.hh    4 Jun 2002 13:43:19 -0000       1.23
+++ ObjectManager.hh    7 Jun 2002 14:50:34 -0000       1.24
@@ -23,7 +23,6 @@
 #include <iostream>
 #include <fstream>
 
-#include "../boost/dummy_ptr.hpp"
 #include "../ActionData.hh"
 #include "../Color.hh"
 
@@ -91,7 +90,7 @@
   void save_level_xml (const std::string & filename);
 
   ///
-  void draw(boost::dummy_ptr<EditorView> view);
+  void draw(EditorView * view);
   ///
   void draw_scroll_map(int x_pos, int y_pos, int arg_width, int arg_height);
   

Index: PLFObj.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/PLFObj.cc,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- PLFObj.cc   24 Jan 2002 23:07:37 -0000      1.59
+++ PLFObj.cc   7 Jun 2002 14:50:34 -0000       1.60
@@ -173,7 +173,7 @@
 }
 
 void
-TrapObj::draw (boost::dummy_ptr<EditorView> view)
+TrapObj::draw (EditorView * view)
 {
     view->draw(sprite, pos, frame);
 }
@@ -204,14 +204,14 @@
 }
 
 void
-LiquidObj::draw (boost::dummy_ptr<EditorView> view)
+LiquidObj::draw (EditorView * view)
 {
   for(int i = 0; i < width; i++)
     view->draw (sprite, pos + CL_Vector (i * sprite.get_width (), 0));
 }
 
 void
-LiquidObj::draw_mark (boost::dummy_ptr<EditorView> view) 
+LiquidObj::draw_mark (EditorView * view) 
 {
   view->draw_rect(int(pos.x),
                  int(pos.y),

Index: PLFObj.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/PLFObj.hh,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- PLFObj.hh   15 Jan 2002 10:48:52 -0000      1.27
+++ PLFObj.hh   7 Jun 2002 14:50:34 -0000       1.28
@@ -70,7 +70,7 @@
 
   boost::shared_ptr<EditorObj> duplicate();
   void write_xml(std::ofstream* xml) { TrapData::write_xml (xml); }
-  void draw (boost::dummy_ptr<EditorView> view);
+  void draw (EditorView * view);
   std::string  status_line();
 };
 
@@ -83,8 +83,8 @@
   LiquidObj(const LiquidData& data);
 
   boost::shared_ptr<EditorObj> duplicate();
-  void draw (boost::dummy_ptr<EditorView> view);
-  void draw_mark (boost::dummy_ptr<EditorView> view);
+  void draw (EditorView * view);
+  void draw_mark (EditorView * view);
   void save(std::ofstream* plf, std::ofstream* psm);
   void write_xml(std::ofstream* xml) { LiquidData::write_xml (xml); }
   std::string  status_line();

Index: RectEditorObj.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/RectEditorObj.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- RectEditorObj.cc    16 Aug 2001 17:46:51 -0000      1.1
+++ RectEditorObj.cc    7 Jun 2002 14:50:35 -0000       1.2
@@ -33,7 +33,7 @@
 }
 
 void
-RectEditorObj::draw_mark (boost::dummy_ptr<EditorView> view) 
+RectEditorObj::draw_mark (EditorView * view) 
 {
   CL_Vector ul (get_upper_left_corner ());
 

Index: RectEditorObj.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/RectEditorObj.hh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- RectEditorObj.hh    16 Aug 2001 17:46:51 -0000      1.1
+++ RectEditorObj.hh    7 Jun 2002 14:50:35 -0000       1.2
@@ -21,7 +21,6 @@
 #define RECTEDITOROBJ_HH
 
 #include "../boost/smart_ptr.hpp"
-#include "../boost/dummy_ptr.hpp"
 
 #include "EditorObj.hh"
 
@@ -42,7 +41,7 @@
   virtual int get_height() =0;
 
   /** Draw the caputre rectangle around the object */
-  virtual void   draw_mark (boost::dummy_ptr<EditorView> view);
+  virtual void   draw_mark (EditorView * view);
   
   /** Return true when the object is under the given coordinates */
   virtual bool   is_over(const CL_Vector&);

Index: ScrollMap.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/ScrollMap.hh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ScrollMap.hh        15 Aug 2001 22:01:45 -0000      1.4
+++ ScrollMap.hh        7 Jun 2002 14:50:35 -0000       1.5
@@ -20,7 +20,6 @@
 #ifndef SCROLLMAP_HH
 #define SCROLLMAP_HH
 
-#include "../boost/dummy_ptr.hpp"
 #include "../boost/smart_ptr.hpp"
 #include "EditorView.hh"
 #include "EditorEvent.hh"

Index: SpriteEditorObj.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/SpriteEditorObj.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SpriteEditorObj.cc  23 Mar 2002 07:37:09 -0000      1.2
+++ SpriteEditorObj.cc  7 Jun 2002 14:50:35 -0000       1.3
@@ -46,7 +46,7 @@
 }
 
 void 
-SpriteEditorObj::draw(boost::dummy_ptr<EditorView> view)
+SpriteEditorObj::draw(EditorView * view)
 {
   view->draw (sprite, pos_ref);
 }

Index: SpriteEditorObj.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/SpriteEditorObj.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SpriteEditorObj.hh  23 Mar 2002 07:37:09 -0000      1.2
+++ SpriteEditorObj.hh  7 Jun 2002 14:50:35 -0000       1.3
@@ -51,7 +51,7 @@
 
   virtual CL_Vector get_upper_left_corner();
 
-  virtual void draw(boost::dummy_ptr<EditorView>);
+  virtual void draw(EditorView *);
 
   virtual void set_position_offset(const CL_Vector& offset);
 

Index: StatusLine.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/StatusLine.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- StatusLine.cc       15 Aug 2001 22:01:45 -0000      1.9
+++ StatusLine.cc       7 Jun 2002 14:50:35 -0000       1.10
@@ -32,7 +32,7 @@
 }
   
 void
-StatusLine::draw(boost::dummy_ptr<EditorView> view)
+StatusLine::draw(EditorView * view)
 {
   char mouse_co[256];
   // FIXME: This is a potential buffer overrun, to lazy to fix it right now

Index: StatusLine.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/StatusLine.hh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- StatusLine.hh       19 May 2001 20:58:42 -0000      1.7
+++ StatusLine.hh       7 Jun 2002 14:50:35 -0000       1.8
@@ -22,7 +22,6 @@
 
 #include <list>
 #include <ClanLib/core.h>
-#include "../boost/smart_ptr.hpp"
 #include "EditorObj.hh"
 
 ///
@@ -42,7 +41,7 @@
   ///
   void set_current_objs(std::list<boost::shared_ptr<EditorObj> >* c_objs);
   ///
-  void draw(boost::dummy_ptr<EditorView> view);
+  void draw(EditorView * view);
 };
 
 #endif

Index: WeatherObj.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/WeatherObj.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- WeatherObj.cc       29 Jan 2002 20:43:18 -0000      1.10
+++ WeatherObj.cc       7 Jun 2002 14:50:35 -0000       1.11
@@ -49,7 +49,7 @@
 }
 
 void 
-WeatherObj::draw (boost::dummy_ptr<EditorView> view)
+WeatherObj::draw (EditorView * view)
 {
   //std::cout << "Dragging: " << dragging << std::endl;
       

Index: WeatherObj.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/WeatherObj.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- WeatherObj.hh       12 Aug 2001 18:36:41 -0000      1.5
+++ WeatherObj.hh       7 Jun 2002 14:50:35 -0000       1.6
@@ -37,7 +37,7 @@
   virtual void drag ();
   virtual void drop ();
 
-  virtual void draw (boost::dummy_ptr<EditorView> view);
+  virtual void draw (EditorView * view);
   virtual void write_xml(std::ofstream* xml);
   virtual boost::shared_ptr<EditorObj> duplicate();
 };