[Pingus-CVS] CVS: Games/Pingus/src/editor action_window.hxx,1.5,1.6 editor.cxx,1.27,1.28 editor.hxx,1.12,1.13 editor_event.cxx,1.29,1.30 editor_event.hxx,1.12,1.13 editor_groundpiece_obj.hxx,1.7,1.8 editor_help_screen.hxx,1.3,1.4 editor_view.hxx,1.3,1.4 editorobj.hxx,1.12,1.13 editorobj_group.hxx,1.8,1.9 editorobj_group_data.hxx,1.4,1.5 entrance_window.hxx,1.4,1.5 groundpiece_window.hxx,1.6,1.7 level_property_window.cxx,1.8,1.9 level_property_window.hxx,1.5,1.6 object_manager.hxx,1.15,1.16 object_selector.hxx,1.6,1.7 panel.hxx,1.5,1.6 panel_icons.hxx,1.4,1.5 plfobj.hxx,1.6,1.7 property_frame.hxx,1.3,1.4 property_window.hxx,1.5,1.6 rect_editorobj.cxx,1.2,1.3 rect_editorobj.hxx,1.2,1.3 scroll_map.hxx,1.2,1.3 selection.hxx,1.7,1.8 sprite_editorobj.cxx,1.2,1.3 sprite_editorobj.hxx,1.2,1.3 start_pos.hxx,1.4,1.5 status_line.hxx,1.7,1.8 string_reader.hxx,1.4,1.5 surface_selector.cxx,1.3,1.4 surface_selector.hxx,1.5,1.6 thumb_cache.hxx,1.5,1.6 weather_obj.hxx,1.4,1.5

[torangan]

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

Modified Files:
        action_window.hxx editor.cxx editor.hxx editor_event.cxx 
        editor_event.hxx editor_groundpiece_obj.hxx 
        editor_help_screen.hxx editor_view.hxx editorobj.hxx 
        editorobj_group.hxx editorobj_group_data.hxx 
        entrance_window.hxx groundpiece_window.hxx 
        level_property_window.cxx level_property_window.hxx 
        object_manager.hxx object_selector.hxx panel.hxx 
        panel_icons.hxx plfobj.hxx property_frame.hxx 
        property_window.hxx rect_editorobj.cxx rect_editorobj.hxx 
        scroll_map.hxx selection.hxx sprite_editorobj.cxx 
        sprite_editorobj.hxx start_pos.hxx status_line.hxx 
        string_reader.hxx surface_selector.cxx surface_selector.hxx 
        thumb_cache.hxx weather_obj.hxx 
Log Message:
- added copy constructor/operator= or private declarations
- some cleanup


Index: action_window.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/action_window.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- action_window.hxx   16 Aug 2002 13:03:35 -0000      1.5
+++ action_window.hxx   23 Aug 2002 15:49:54 -0000      1.6
@@ -55,6 +55,9 @@
 private:
   void read_data ();
   void write_data ();
+  
+  ActionWindow (const ActionWindow&);
+  ActionWindow operator= (const ActionWindow&);
 };
 
 #endif

Index: editor.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor.cxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- editor.cxx  22 Aug 2002 02:33:56 -0000      1.27
+++ editor.cxx  23 Aug 2002 15:49:54 -0000      1.28
@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "../pingus.hxx"
 #include <ClanLib/Core/System/system.h>
 #include <ClanLib/Core/Resources/resource_manager.h>
 #include <ClanLib/Display/Display/display.h>

Index: editor.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- editor.hxx  14 Aug 2002 12:45:02 -0000      1.12
+++ editor.hxx  23 Aug 2002 15:49:54 -0000      1.13
@@ -129,6 +129,10 @@
 
   void on_startup ();
   void on_shutdown ();
+  
+private:
+  Editor (const Editor&);
+  Editor operator= (const Editor&);
 };
 
 #endif

Index: editor_event.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_event.cxx,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- editor_event.cxx    17 Aug 2002 17:56:23 -0000      1.29
+++ editor_event.cxx    23 Aug 2002 15:49:54 -0000      1.30
@@ -516,11 +516,11 @@
       std::string levelfile = editor->save_tmp_level();
       ScreenManager::instance()->push_screen(new PingusGameSession 
(levelfile), true);
     }
-  catch(PingusError err) 
+  catch(const PingusError& err) 
     {
       std::cout << "Editor: Error caught from Pingus: " << err.get_message () 
<< std::endl;
     }  
-  catch (CL_Error err) 
+  catch (const CL_Error& err) 
     {
       std::cout << "Editor: Error caught from ClanLib: " << err.message << 
std::endl;
     }
@@ -561,7 +561,7 @@
        object_manager->load_level(str);
        editor->last_level = str;
       }
-      catch(PingusError err) {
+      catch(const PingusError& err) {
        std::cout << err.get_message () << std::endl;
        PingusMessageBox(err.get_message ());
       }

Index: editor_event.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_event.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- editor_event.hxx    4 Aug 2002 19:57:16 -0000       1.12
+++ editor_event.hxx    23 Aug 2002 15:49:54 -0000      1.13
@@ -105,6 +105,9 @@
 
 private:
   bool accept_input ();
+  
+  EditorEvent (const EditorEvent&);
+  EditorEvent operator= (const EditorEvent&);
 };
 
 #endif

Index: editor_groundpiece_obj.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editor/editor_groundpiece_obj.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- editor_groundpiece_obj.hxx  1 Jul 2002 18:36:39 -0000       1.7
+++ editor_groundpiece_obj.hxx  23 Aug 2002 15:49:54 -0000      1.8
@@ -47,6 +47,10 @@
   std::string status_line();
 
   Pingus::Editor::PropertyFrame* get_gui_dialog(CL_Component* parent);
+  
+private:
+  EditorGroundpieceObj (const EditorGroundpieceObj&);
+  EditorGroundpieceObj operator= (const EditorGroundpieceObj&);
 };
 
 #endif

Index: editor_help_screen.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_help_screen.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- editor_help_screen.hxx      16 Aug 2002 13:03:36 -0000      1.3
+++ editor_help_screen.hxx      23 Aug 2002 15:49:54 -0000      1.4
@@ -33,6 +33,10 @@
   EditorHelpScreen ();
   void draw ();
   void update (float delta);
+  
+private:
+  EditorHelpScreen (const EditorHelpScreen&);
+  EditorHelpScreen operator= (const EditorHelpScreen&);
 };
 
 #endif

Index: editor_view.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_view.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- editor_view.hxx     16 Aug 2002 13:03:36 -0000      1.3
+++ editor_view.hxx     23 Aug 2002 15:49:54 -0000      1.4
@@ -20,8 +20,8 @@
 #ifndef header_pingus_editor_editor_view_hxx
 #define header_pingus_editor_editor_view_hxx
 
-#include <ClanLib/Core/Math/cl_vector.h>
 #include "../pingus.hxx"
+#include <ClanLib/Core/Math/cl_vector.h>
 
 class Sprite;
 class CL_Rect;
@@ -91,6 +91,10 @@
                   float r, float g, float b, float a = 1.0f);
   void draw_circle (int x_pos, int y_pos, int radius,
                   float r, float g, float b, float a = 1.0f);
+
+private:
+  EditorView (const EditorView&);
+  EditorView operator= (const EditorView&);
 };
 
 #endif

Index: editorobj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editorobj.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- editorobj.hxx       16 Aug 2002 13:03:36 -0000      1.12
+++ editorobj.hxx       23 Aug 2002 15:49:54 -0000      1.13
@@ -20,9 +20,9 @@
 #ifndef HEADER_PINGUS_EDITOR_EDITOROBJ_HXX
 #define HEADER_PINGUS_EDITOR_EDITOROBJ_HXX
 
+#include "../pingus.hxx"
 #include <string>
 #include <iosfwd>
-#include "../pingus.hxx"
 
 class CL_Rect;
 class CL_Vector;
@@ -118,6 +118,10 @@
       CL_Component* should/must be a CL_Frame so that it can get
       embedded in the properties window */
   virtual Pingus::Editor::PropertyFrame* get_gui_dialog (Editor* parent);
+  
+protected:
+  EditorObj (const EditorObj&) { }
+  void operator= (const EditorObj&) { }
 };
 
 #endif

Index: editorobj_group.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editorobj_group.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- editorobj_group.hxx 2 Jul 2002 13:36:06 -0000       1.8
+++ editorobj_group.hxx 23 Aug 2002 15:49:54 -0000      1.9
@@ -56,6 +56,10 @@
   EditorObj* duplicate();
 
   unsigned int size () { return objs.size (); }
+  
+private:
+  EditorObjGroup (const EditorObjGroup&);
+  EditorObjGroup operator= (const EditorObjGroup&);
 };
 
 #endif

Index: editorobj_group_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editorobj_group_data.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- editorobj_group_data.hxx    2 Jul 2002 13:36:06 -0000       1.4
+++ editorobj_group_data.hxx    23 Aug 2002 15:49:54 -0000      1.5
@@ -36,6 +36,10 @@
 
   virtual void write_xml(std::ostream& xml);
   static WorldObjData* create(xmlDocPtr doc, xmlNodePtr cur);  
+  
+private:
+  EditorObjGroupData (const EditorObjGroupData&);
+  EditorObjGroupData operator= (const EditorObjGroupData&);
 };
 
 #endif

Index: entrance_window.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/entrance_window.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- entrance_window.hxx 16 Aug 2002 13:03:36 -0000      1.4
+++ entrance_window.hxx 23 Aug 2002 15:49:54 -0000      1.5
@@ -51,6 +51,10 @@
       ~EntranceWindow ();
 
       std::string get_title () { return "Entrance Properties"; }
+      
+    private:
+      EntranceWindow (const EntranceWindow&);
+      EntranceWindow operator= (const EntranceWindow&);
     };
   }
 }

Index: groundpiece_window.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/groundpiece_window.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- groundpiece_window.hxx      16 Aug 2002 13:03:36 -0000      1.6
+++ groundpiece_window.hxx      23 Aug 2002 15:49:54 -0000      1.7
@@ -59,6 +59,10 @@
       void write_data ();
 
       std::string get_title () { return "Groundpiece Properties"; }
+      
+    private:
+      GroundpieceWindow (const GroundpieceWindow&);
+      GroundpieceWindow operator= (const GroundpieceWindow&);
     };
   }
 }

Index: level_property_window.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/level_property_window.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- level_property_window.cxx   22 Aug 2002 02:33:56 -0000      1.8
+++ level_property_window.cxx   23 Aug 2002 15:49:54 -0000      1.9
@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "../pingus.hxx"
 #include "object_manager.hxx"
 #include "../string_converter.hxx"
 #include "level_property_window.hxx"

Index: level_property_window.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/level_property_window.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- level_property_window.hxx   16 Aug 2002 13:03:36 -0000      1.5
+++ level_property_window.hxx   23 Aug 2002 15:49:54 -0000      1.6
@@ -20,11 +20,11 @@
 #ifndef HEADER_PINGUS_LEVEL_PROPERTY_WINDOW_HXX
 #define HEADER_PINGUS_LEVEL_PROPERTY_WINDOW_HXX
 
+#include "../pingus.hxx"
 #include <ClanLib/GUI/label.h>
 #include <ClanLib/GUI/window.h>
 #include <ClanLib/GUI/checkbox.h>
 #include <ClanLib/GUI/inputbox.h>
-#include "../pingus.hxx"
 
 class ObjectManager;
 
@@ -70,6 +70,10 @@
     public:
       LevelPropertyWindow (CL_Component* parent, ObjectManager*);
       ~LevelPropertyWindow ();
+      
+    private:
+      LevelPropertyWindow (const LevelPropertyWindow&);
+      LevelPropertyWindow operator= (const LevelPropertyWindow&);
     };
   }
 }

Index: object_manager.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_manager.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- object_manager.hxx  3 Jul 2002 09:53:32 -0000       1.15
+++ object_manager.hxx  23 Aug 2002 15:49:54 -0000      1.16
@@ -145,6 +145,10 @@
       to varify that an referenc to and object is still valid and that
       the object has not yet been deleted */
   bool has_object (EditorObj* obj);
+  
+private:
+  ObjectManager (const ObjectManager&);
+  ObjectManager operator= (const ObjectManager&);
 };
 
 #endif

Index: object_selector.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_selector.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- object_selector.hxx 2 Jul 2002 13:36:07 -0000       1.6
+++ object_selector.hxx 23 Aug 2002 15:49:54 -0000      1.7
@@ -64,6 +64,10 @@
   EditorObjLst get_from_file();
   EditorObjLst get_background();
   EditorObjLst get_prefab();
+  
+private:
+  ObjectSelector (const ObjectSelector&);
+  ObjectSelector operator= (const ObjectSelector&);
 };
 
 #endif

Index: panel.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/panel.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- panel.hxx   16 Aug 2002 13:03:36 -0000      1.5
+++ panel.hxx   23 Aug 2002 15:49:54 -0000      1.6
@@ -20,9 +20,9 @@
 #ifndef HEADER_PINGUS_EDITOR_PANEL_HXX
 #define HEADER_PINGUS_EDITOR_PANEL_HXX
 
+#include "../pingus.hxx"
 #include <vector>
 #include <ClanLib/Display/Display/surface.h>
-#include "../pingus.hxx"
 
 class CL_Font;
 class Editor;
@@ -47,6 +47,10 @@
   void start();
   void put_screen(int x, int y);
   virtual void on_click();
+  
+private:
+  PanelIcon (const PanelIcon&);
+  PanelIcon operator= (const PanelIcon&);
 };
 
 class Panel
@@ -68,11 +72,12 @@
   void on_release();
   bool mouse_over(int x, int y);
   void set_editor(Editor* e);
+  
+private:
+  Panel (const Panel&);
+  Panel operator= (const Panel&);
 };
 
 #endif
 
 /* EOF */
-
-
-

Index: panel_icons.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/panel_icons.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- panel_icons.hxx     1 Jul 2002 12:46:22 -0000       1.4
+++ panel_icons.hxx     23 Aug 2002 15:49:54 -0000      1.5
@@ -27,6 +27,10 @@
 public:
   PanelIconNew();
   virtual void on_click();
+  
+private:
+  PanelIconNew (const PanelIconNew&);
+  PanelIconNew operator= (const PanelIconNew&);
 };
 
 class PanelIconLoad : public PanelIcon
@@ -34,6 +38,10 @@
 public:
   PanelIconLoad();
   virtual void on_click();
+  
+private:
+  PanelIconLoad (const PanelIconLoad&);
+  PanelIconLoad operator= (const PanelIconLoad&);
 };
 
 class PanelIconSave : public PanelIcon
@@ -41,6 +49,10 @@
 public:
   PanelIconSave();
   virtual void on_click();
+  
+private:
+  PanelIconSave (const PanelIconSave&);
+  PanelIconSave operator= (const PanelIconSave&);
 };
 
 class PanelIconCopy : public PanelIcon
@@ -48,6 +60,10 @@
 public:
   PanelIconCopy();
   virtual void on_click();
+  
+private:
+  PanelIconCopy (const PanelIconCopy&);
+  PanelIconCopy operator= (const PanelIconCopy&);
 };
 
 class PanelIconPaste : public PanelIcon
@@ -55,6 +71,10 @@
 public:
   PanelIconPaste();
   virtual void on_click();
+  
+private:
+  PanelIconPaste (const PanelIconPaste&);
+  PanelIconPaste operator= (const PanelIconPaste&);
 };
 
 class PanelIconLevelProperties : public PanelIcon
@@ -62,6 +82,10 @@
 public:
   PanelIconLevelProperties();
   virtual void on_click();
+  
+private:
+  PanelIconLevelProperties (const PanelIconLevelProperties&);
+  PanelIconLevelProperties operator= (const PanelIconLevelProperties&);
 };
 
 class PanelIconObjectProperties : public PanelIcon
@@ -69,6 +93,10 @@
 public:
   PanelIconObjectProperties();
   virtual void on_click();
+  
+private:
+  PanelIconObjectProperties (const PanelIconObjectProperties&);
+  PanelIconObjectProperties operator= (const PanelIconObjectProperties&);
 };
 
 class PanelIconDelete : public PanelIcon
@@ -76,6 +104,10 @@
 public:
   PanelIconDelete();
   virtual void on_click();
+  
+private:
+  PanelIconDelete (const PanelIconDelete&);
+  PanelIconDelete operator= (const PanelIconDelete&);
 };
 
 class PanelIconExit : public PanelIcon
@@ -83,6 +115,10 @@
 public:
   PanelIconExit();
   virtual void on_click();
+  
+private:
+  PanelIconExit (const PanelIconExit&);
+  PanelIconExit operator= (const PanelIconExit&);
 };
 
 class PanelIconRun : public PanelIcon
@@ -90,6 +126,10 @@
 public:
   PanelIconRun();
   virtual void on_click();
+  
+private:
+  PanelIconRun (const PanelIconRun&);
+  PanelIconRun operator= (const PanelIconRun&);
 };
 
 class PanelIconInsertObject : public PanelIcon
@@ -97,6 +137,10 @@
 public:
   PanelIconInsertObject();
   virtual void on_click();
+  
+private:
+  PanelIconInsertObject (const PanelIconInsertObject&);
+  PanelIconInsertObject operator= (const PanelIconInsertObject&);
 };
 
 class PanelIconZoomOut : public PanelIcon
@@ -104,6 +148,10 @@
 public:
   PanelIconZoomOut();
   virtual void on_click();
+  
+private:
+  PanelIconZoomOut (const PanelIconZoomOut&);
+  PanelIconZoomOut operator= (const PanelIconZoomOut&);
 };
 
 class PanelIconZoomIn : public PanelIcon
@@ -111,6 +159,10 @@
 public:
   PanelIconZoomIn();
   virtual void on_click();
+  
+private:
+  PanelIconZoomIn (const PanelIconZoomIn&);
+  PanelIconZoomIn operator= (const PanelIconZoomIn&);
 };
 
 class PanelIconRegionZoom : public PanelIcon
@@ -118,6 +170,10 @@
 public:
   PanelIconRegionZoom();
   virtual void on_click();
+  
+private:
+  PanelIconRegionZoom (const PanelIconRegionZoom&);
+  PanelIconRegionZoom operator= (const PanelIconRegionZoom&);
 };
 
 class PanelIconSetupActions : public PanelIcon
@@ -125,6 +181,10 @@
 public:
   PanelIconSetupActions ();
   virtual void on_click();
+  
+private:
+  PanelIconSetupActions (const PanelIconSetupActions&);
+  PanelIconSetupActions operator= (const PanelIconSetupActions&);
 };
 
 #endif

Index: plfobj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/plfobj.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- plfobj.hxx  1 Jul 2002 18:36:40 -0000       1.6
+++ plfobj.hxx  23 Aug 2002 15:49:54 -0000      1.7
@@ -26,54 +26,60 @@
 #include "../trap_data.hxx"
 #include "sprite_editorobj.hxx"
 
-///
 class EntranceObj : public SpriteEditorObj,
                    public EntranceData
 {
-private:
 public:
-  EntranceObj(const EntranceData&);
+  EntranceObj (const EntranceData&);
 
-  EditorObj* duplicate();
-  void write_xml(std::ostream& xml) { EntranceData::write_xml (xml); }
-  std::string status_line();
+  EditorObj* duplicate ();
+  void write_xml (std::ostream& xml) { EntranceData::write_xml (xml); }
+  std::string status_line ();
   Pingus::Editor::PropertyFrame* get_gui_dialog (CL_Component* parent);
+  
+private:
+  EntranceObj (const EntranceObj&);
+  EntranceObj operator= (const EntranceObj&);
 };
 
-///
 class ExitObj : public SpriteEditorObj,
                public ExitData
 {
-private:
 public:
-  ExitObj(const ExitData&);
+  ExitObj (const ExitData&);
 
   EditorObj* duplicate();
   void write_xml(std::ostream& xml) { ExitData::write_xml (xml); }
   std::string  status_line();
+  
+private:
+  ExitObj (const ExitObj&);
+  ExitObj operator= (const ExitObj&);
 };
 
 
-///
 class TrapObj : public SpriteEditorObj,
                protected TrapData
 {
 private:
   int frame;
 public:
-  TrapObj(const TrapData&);
+  TrapObj (const TrapData&);
 
-  EditorObj* duplicate();
-  void write_xml(std::ostream& xml) { TrapData::write_xml (xml); }
+  EditorObj* duplicate ();
+  void write_xml (std::ostream& xml) { TrapData::write_xml (xml); }
   void draw (EditorView * view);
-  std::string  status_line();
+  std::string status_line ();
+  
+private:
+  TrapObj (const TrapObj&);
+  TrapObj operator= (const TrapObj&);
 };
 
 ///
 class LiquidObj : public SpriteEditorObj,
                  protected LiquidData
 {
-private:
 public:
   LiquidObj(const LiquidData& data);
 
@@ -88,6 +94,10 @@
 
   void make_larger ();
   void make_smaller ();
+  
+private:
+  LiquidObj (const LiquidObj&);
+  LiquidObj operator= (const LiquidObj&);
 };
 
 #endif

Index: property_frame.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/property_frame.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- property_frame.hxx  16 Aug 2002 13:03:36 -0000      1.3
+++ property_frame.hxx  23 Aug 2002 15:49:54 -0000      1.4
@@ -20,8 +20,8 @@
 #ifndef HEADER_PINGUS_EDITOR_PROPERTY_FRAME_HXX
 #define HEADER_PINGUS_EDITOR_PROPERTY_FRAME_HXX
 
-#include <ClanLib/GUI/frame.h>
 #include "../pingus.hxx"
+#include <ClanLib/GUI/frame.h>
 
 class CL_Component;
 
@@ -31,12 +31,14 @@
   {
     class PropertyFrame : public CL_Frame
     {
-    private:
-
     public:
       PropertyFrame (int width, int height, CL_Component*);
 
       virtual std::string get_title () =0;
+      
+    private:
+      PropertyFrame (const PropertyFrame&);
+      PropertyFrame operator= (const PropertyFrame&);
     };
   }
 }

Index: property_window.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/property_window.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- property_window.hxx 16 Aug 2002 13:03:36 -0000      1.5
+++ property_window.hxx 23 Aug 2002 15:49:54 -0000      1.6
@@ -20,9 +20,9 @@
 #ifndef PINGUS_EDITOR_PROPERTY_WINDOW_HXX
 #define PINGUS_EDITOR_PROPERTY_WINDOW_HXX
 
+#include "../pingus.hxx"
 #include <ClanLib/GUI/label.h>
 #include <ClanLib/GUI/window.h>
-#include "../pingus.hxx"
 
 class Editor;
 class EditorObj;
@@ -43,6 +43,10 @@
       PropertyWindow (::Editor* parent);
 
       void update_frame (EditorObj*);
+      
+    private:
+      PropertyWindow (const PropertyWindow&);
+      PropertyWindow operator= (const PropertyWindow&);
     };
   }
 }

Index: rect_editorobj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/rect_editorobj.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rect_editorobj.cxx  13 Jun 2002 14:25:13 -0000      1.2
+++ rect_editorobj.cxx  23 Aug 2002 15:49:54 -0000      1.3
@@ -25,6 +25,17 @@
 {
 }
 
+RectEditorObj::RectEditorObj (const RectEditorObj& old) : EditorObj(old)
+{
+}
+
+void
+RectEditorObj::operator= (const RectEditorObj& old)
+{
+  if (this != &old)
+    EditorObj::operator=(old);
+}
+
 RectEditorObj::~RectEditorObj()
 {
 }

Index: rect_editorobj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/rect_editorobj.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rect_editorobj.hxx  24 Jun 2002 22:52:58 -0000      1.2
+++ rect_editorobj.hxx  23 Aug 2002 15:49:54 -0000      1.3
@@ -27,39 +27,32 @@
 class RectEditorObj : public EditorObj
 {
 public:
-  RectEditorObj();
-  virtual ~RectEditorObj();
+  RectEditorObj ();
+  virtual ~RectEditorObj ();
 
   /** Returns the position of the upper left corner of the object */
   virtual CL_Vector get_upper_left_corner () =0;
 
   /// Return the object width
-  virtual int get_width() =0;
+  virtual int get_width () =0;
   /// Return the object height
-  virtual int get_height() =0;
+  virtual int get_height () =0;
 
   /** Draw the caputre rectangle around the object */
   virtual void   draw_mark (EditorView * view);
   
   /** Return true when the object is under the given coordinates */
-  virtual bool   is_over(const CL_Vector&);
+  virtual bool   is_over (const CL_Vector&);
 
   /** Return true if the current object is inside the current
       selection rectangle */
-  virtual bool   is_in_rect(const CL_Rect&);
+  virtual bool   is_in_rect (const CL_Rect&);
+  
+protected:
+  RectEditorObj (const RectEditorObj& old);
+  void operator= (const RectEditorObj& old);
 };
 
-/*
-// Structure for the sorting algorithm (stable_sort)
-class EditorObj_less : public 
std::binary_function<boost::shared_ptr<EditorObj>, 
boost::shared_ptr<EditorObj>, bool>
-{
-public:
-  bool operator() (boost::shared_ptr<EditorObj> a, 
boost::shared_ptr<EditorObj> b) const 
-    {
-      return (*a) < (*b);
-    }
-};
-*/
 #endif
 
 /* EOF */

Index: scroll_map.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/scroll_map.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- scroll_map.hxx      24 Jun 2002 22:52:58 -0000      1.2
+++ scroll_map.hxx      23 Aug 2002 15:49:54 -0000      1.3
@@ -45,6 +45,10 @@
   void  on_button_press(CL_InputDevice *device, const CL_Key& key);
   void  on_button_release(CL_InputDevice *device, const CL_Key& key);
   bool  mouse_over(int x, int y);
+  
+private:
+  ScrollMap (const ScrollMap&);
+  ScrollMap operator= (const ScrollMap&);
 };
 
 #endif

Index: selection.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/selection.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- selection.hxx       2 Jul 2002 13:36:07 -0000       1.7
+++ selection.hxx       23 Aug 2002 15:49:54 -0000      1.8
@@ -70,6 +70,10 @@
   void rotate_270();
 
   void draw(EditorView* view);  
+  
+private:
+  EditorSelection (const EditorSelection&);
+  EditorSelection operator= (const EditorSelection&);
 };
 
 #endif

Index: sprite_editorobj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/sprite_editorobj.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sprite_editorobj.cxx        27 Jun 2002 17:16:40 -0000      1.2
+++ sprite_editorobj.cxx        23 Aug 2002 15:49:54 -0000      1.3
@@ -42,6 +42,24 @@
 {
 }
 
+SpriteEditorObj::SpriteEditorObj (const SpriteEditorObj& old) : 
RectEditorObj(old),
+                                                                
sprite(old.sprite),
+                                                               
pos_ref(old.pos_ref)
+{
+}
+
+void
+SpriteEditorObj::operator= (const SpriteEditorObj& old)
+{
+  if (this != &old)
+    {    
+      RectEditorObj::operator=(old);
+  
+      sprite  = old.sprite;
+      pos_ref = old.pos_ref;
+    }
+}
+
 SpriteEditorObj::~SpriteEditorObj ()
 {
 }

Index: sprite_editorobj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/sprite_editorobj.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sprite_editorobj.hxx        24 Jun 2002 22:52:58 -0000      1.2
+++ sprite_editorobj.hxx        23 Aug 2002 15:49:54 -0000      1.3
@@ -59,6 +59,10 @@
   /** This will be overritten to provide pixel exact click
       detection */
   virtual bool   is_over(const CL_Vector&);
+  
+protected:
+  SpriteEditorObj (const SpriteEditorObj& old);
+  void operator= (const SpriteEditorObj& old);
 };
 
 #endif

Index: start_pos.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/start_pos.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- start_pos.hxx       1 Jul 2002 18:36:40 -0000       1.4
+++ start_pos.hxx       23 Aug 2002 15:49:55 -0000      1.5
@@ -22,16 +22,20 @@
 
 #include "sprite_editorobj.hxx"
 
-class StartPos 
-  : public SpriteEditorObj
+class StartPos : public SpriteEditorObj
 {
 private:
   CL_Vector pos;
+  
 public:
   StartPos(int arg_x_pos, int arg_y_pos);
 
   virtual void write_xml(std::ostream& xml);
   virtual EditorObj* duplicate();
+  
+private:
+  StartPos (const StartPos&);
+  StartPos operator= (const StartPos&);
 };
 
 #endif

Index: status_line.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/status_line.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- status_line.hxx     16 Aug 2002 13:03:36 -0000      1.7
+++ status_line.hxx     23 Aug 2002 15:49:55 -0000      1.8
@@ -20,25 +20,29 @@
 #ifndef HEADER_PINGUS_EDITOR_STATUS_LINE_HXX
 #define HEADER_PINGUS_EDITOR_STATUS_LINE_HXX
 
-#include <vector>
 #include "../pingus.hxx"
+#include <vector>
 
 class CL_Font;
 class EditorObj;
 class EditorView;
 
-///
 class StatusLine
 {
 private:
   CL_Font* font;
   const std::vector<EditorObj*>* current_objs;
+  
 public:
   StatusLine();
   ~StatusLine();
   
   void set_current_objs(const std::vector<EditorObj*>* c_objs);
   void draw(EditorView * view);
+  
+private:
+  StatusLine (const StatusLine&);
+  StatusLine operator= (const StatusLine&);
 };
 
 #endif

Index: string_reader.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/string_reader.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- string_reader.hxx   16 Aug 2002 13:03:36 -0000      1.4
+++ string_reader.hxx   23 Aug 2002 15:49:55 -0000      1.5
@@ -20,57 +20,40 @@
 #ifndef HEADER_PINGUS_EDITOR_STRING_READER_HXX
 #define HEADER_PINGUS_EDITOR_STRING_READER_HXX
 
+#include "../pingus.hxx"
 #include <list>
 #include <string>
-#include "../pingus.hxx"
 
 class CL_Font;
 
-///
 class StringReader
 {
 private:
-  ///
   std::list<std::string>* strings;
-  ///
   std::list<std::string*> completions;
-  ///
   std::string current_string;
-  ///
   std::string default_string;
-  ///
   bool finished;
-  ///
   std::string description;
-  ///
   CL_Font* font;
 
 public:
-  ///
-  StringReader();
-  ///
-  StringReader(const std::string &, const std::string &);
-  ///
-  virtual ~StringReader();
+  StringReader ();
+  StringReader (const std::string &, const std::string &);
+  virtual ~StringReader ();
 
-  ///
-  void   set_strings(std::list<std::string>*);
-  ///
-  std::string read_string();
-  ///
-  void   draw();
-  ///
-  std::string find_uniq();
-  ///
-  std::string while_eq(const std::string& a, const std::string& b);
-  ///
-  void   complete_string();
-}///
-;
+  void   set_strings (std::list<std::string>*);
+  std::string read_string ();
+  void draw ();
+  std::string find_uniq ();
+  std::string while_eq (const std::string& a, const std::string& b);
+  void complete_string ();
+  
+private:
+  StringReader (const StringReader&);
+  StringReader operator= (const StringReader&);
+};
 
 #endif
 
 /* EOF */
-
-
-

Index: surface_selector.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/surface_selector.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- surface_selector.cxx        17 Aug 2002 17:56:24 -0000      1.3
+++ surface_selector.cxx        23 Aug 2002 15:49:55 -0000      1.4
@@ -192,7 +192,30 @@
   return str;
 }
 
-/* EOF */
+surface_obj::surface_obj ()
+{
+}
 
+surface_obj::surface_obj (const surface_obj& old) : thumbnail(old.thumbnail),
+                                                    large_sur(old.large_sur),
+                                                   name(old.name),
+                                                   datafile(old.datafile),
+                                                   
display_time(old.display_time)
+{
+}
 
+surface_obj surface_obj::operator= (const surface_obj& old)
+{
+  if (this == &old)
+    return *this;
+
+  thumbnail    = old.thumbnail;
+  large_sur    = old.large_sur;
+  name         = old.name;
+  datafile     = old.datafile;
+  display_time = old.display_time;
+  
+  return *this;
+}
 
+/* EOF */

Index: surface_selector.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/surface_selector.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- surface_selector.hxx        16 Aug 2002 13:03:36 -0000      1.5
+++ surface_selector.hxx        23 Aug 2002 15:49:55 -0000      1.6
@@ -20,14 +20,13 @@
 #ifndef HEADER_PINGUS_EDITOR_SURFACE_SELECTOR_HXX
 #define HEADER_PINGUS_EDITOR_SURFACE_SELECTOR_HXX
 
+#include "../pingus.hxx"
 #include <string>
 #include <vector>
 #include <ClanLib/Display/Display/surface.h>
-#include "../pingus.hxx"
 
 class CL_Font;
 
-///
 struct surface_obj
 {
   /** Thumbnail of the surface */
@@ -45,39 +44,36 @@
   /** The time the small tumbnail was selected, when the mouse is
       longer than 1sec above the surface it will be enlarged */
   unsigned int display_time;
+  
+  surface_obj ();
+  surface_obj (const surface_obj& old);
+  surface_obj operator= (const surface_obj& old);
 };
 
-///
 class SurfaceSelector
 {
 private:
-  ///
   CL_Font* font;
-  ///
   std::vector<surface_obj>* sur_list;
-  ///
   int y_of;
-  ///
   int width;
-  ///
   int height;
 
-  ///
-  void   draw();
-  ///
-  void scroll();
-  ///
-  std::vector<surface_obj>::iterator get_current_obj();
+  void   draw ();
+  void scroll ();
+  std::vector<surface_obj>::iterator get_current_obj ();
 
   std::vector<surface_obj>::iterator c_obj;
+  
 public:
-  ///
-  SurfaceSelector(std::vector<surface_obj>*);
-  ///
-  ~SurfaceSelector();
+  SurfaceSelector (std::vector<surface_obj>*);
+  ~SurfaceSelector ();
 
-  ///
-  std::string select();
+  std::string select ();
+  
+private:
+  SurfaceSelector (const SurfaceSelector&);
+  SurfaceSelector operator= (const SurfaceSelector&);
 }; 
 
 

Index: thumb_cache.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/thumb_cache.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- thumb_cache.hxx     16 Aug 2002 13:03:36 -0000      1.5
+++ thumb_cache.hxx     23 Aug 2002 15:49:55 -0000      1.6
@@ -20,8 +20,8 @@
 #ifndef HEADER_PINGUS_EDITOR_THUMB_CACHE_HXX
 #define HEADER_PINGUS_EDITOR_THUMB_CACHE_HXX
 
-#include <string>
 #include "../pingus.hxx"
+#include <string>
 
 class CL_Surface;
 
@@ -29,8 +29,6 @@
     of surfaces for selection */
 class ThumbCache
 {
-private:
-  
 public:
   /** Load a surface from its source, instead of from the cache */
   static CL_Surface uncached_load (const std::string & res_ident, const 
std::string & datafile);
@@ -43,6 +41,10 @@
   /** Add a surface as thumbnail to the cache, the surface will be
       resized to a 50x50 size, the return value is the resized surface */
   static CL_Surface cache (const CL_Surface&, const std::string & res_ident, 
const std::string & datafile);
+  
+private:
+  ThumbCache (const ThumbCache&);
+  ThumbCache operator= (const ThumbCache&);  
 };
 
 #endif

Index: weather_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/weather_obj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- weather_obj.hxx     1 Jul 2002 18:36:40 -0000       1.4
+++ weather_obj.hxx     23 Aug 2002 15:49:55 -0000      1.5
@@ -23,15 +23,14 @@
 #include "../weather_data.hxx"
 #include "sprite_editorobj.hxx"
 
-class WeatherObj 
-  : public SpriteEditorObj,
-    public WeatherData
+class WeatherObj : public SpriteEditorObj, public WeatherData
 {
 private:
   CL_Vector pos;
   bool dragging;
+  
 public:
-   WeatherObj(const WeatherData& data);
+  WeatherObj (const WeatherData& data);
   virtual ~WeatherObj();
 
   virtual void drag ();
@@ -40,6 +39,10 @@
   virtual void draw (EditorView * view);
   virtual void write_xml(std::ostream& xml);
   virtual EditorObj* duplicate();
+  
+private:
+  WeatherObj (const WeatherObj&);
+  WeatherObj operator= (const WeatherObj&);
 };
 
 #endif