[Pingus-CVS] CVS: Games/Pingus/src config.cxx,1.9,1.10 config.hxx,1.7,1.8 pingus_main.cxx,1.39,1.40 world.hxx,1.22,1.23

[torangan]

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

Modified Files:
        config.cxx config.hxx pingus_main.cxx world.hxx 
Log Message:
removed the last usages of boost::shared_ptr and boost/


Index: config.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/config.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- config.cxx  1 Dec 2002 17:08:47 -0000       1.9
+++ config.cxx  25 Jan 2003 18:34:36 -0000      1.10
@@ -300,8 +300,7 @@
 }
 
 void
-Config::set_value(std::string valueid,
-                 std::string value)
+Config::set_value(const std::string& valueid, const std::string& value)
 {
   if (valueid == "fullscreen")
     {

Index: config.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/config.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- config.hxx  8 Nov 2002 01:38:27 -0000       1.7
+++ config.hxx  25 Jan 2003 18:34:36 -0000      1.8
@@ -30,7 +30,7 @@
 private:
   
   ///
-  std::ifstream in;                 /// The file to parse
+  std::ifstream in;            /// The file to parse
 
   char   last_atom;            /// The last returned atom
   int    lineno;               /// Current line number
@@ -51,8 +51,7 @@
 
   // Some virtual functions
   /// Put the retrieved value in the correct struct
-  virtual void set_value(std::string valueid,
-                        std::string value) = 0; 
+  virtual void set_value(const std::string& valueid, const std::string& value) 
= 0; 
 
 public:
   ///
@@ -80,8 +79,7 @@
   Config ();
   Config (std::string);
 
-  void set_value(std::string valueid,
-                std::string value);
+  void set_value(const std::string& valueid, const std::string& value);
                 
 private:
   Config (const Config&);

Index: pingus_main.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- pingus_main.cxx     29 Dec 2002 23:29:00 -0000      1.39
+++ pingus_main.cxx     25 Jan 2003 18:34:36 -0000      1.40
@@ -72,7 +72,6 @@
 #include "demo_session.hxx"
 #include "debug.hxx"
 #include "editor/editor.hxx"
-#include "boost/smart_ptr.hpp"
 #include "screen_manager.hxx"
 #include "action_data.hxx"
 #include "fonts.hxx"
@@ -150,15 +149,15 @@
 {
   if (!no_config_file)
     {
-      std::string   rcfile;
+      std::string rcfile;
 
       if (config_file.empty())
        rcfile = System::get_statdir() + "config";
       else
        rcfile = config_file;
 
-      // FIXME: kind of weird...
-      boost::shared_ptr<Config> config(new Config(rcfile));
+      //constructor of config must be run
+      Config config(rcfile);
       
//ConfigXML("/home/ingo/projects/pingus/cvs/data/levels/stone3-grumbel.xml");
     }
 }

Index: world.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/world.hxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- world.hxx   25 Jan 2003 11:03:58 -0000      1.22
+++ world.hxx   25 Jan 2003 18:34:36 -0000      1.23
@@ -159,8 +159,7 @@
 
   PinguHolder* get_pingus(void);
 
-  /** @return the pingu at the given word coordinates, an empty
-      shared_ptr is returned if none is there */
+  /** @return the pingu at the given word coordinates, 0 if none is there */
   Pingu* get_pingu (const Vector& pos);
   
   /** Return a pointer to the GameTime object of this World */