[Pingus-CVS] CVS: Games/Pingus/src/editor EditorGroundpieceObj.cc,1.6,1.7 EditorObj.hh,1.40,1.41 PLFObj.hh,1.28,1.29 RectEditorObj.hh,1.2,1.3 ScrollMap.hh,1.5,1.6 SpriteEditorObj.hh,1.3,1.4 StartPos.cc,1.10,1.11 StatusLine.hh,1.8,1.9 WeatherObj.cc,1.11,1.12

[torangan]

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

Modified Files:
        EditorGroundpieceObj.cc EditorObj.hh PLFObj.hh 
        RectEditorObj.hh ScrollMap.hh SpriteEditorObj.hh StartPos.cc 
        StatusLine.hh WeatherObj.cc 
Log Message:
reduced header dependencies


Index: EditorGroundpieceObj.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/EditorGroundpieceObj.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- EditorGroundpieceObj.cc     31 Aug 2001 07:51:51 -0000      1.6
+++ EditorGroundpieceObj.cc     8 Jun 2002 20:19:54 -0000       1.7
@@ -17,13 +17,10 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <fstream>
-#include <ClanLib/core.h>
-#include "../XMLhelper.hh"
-#include "../algo.hh"
-#include "../globals.hh"
 #include "../PingusResource.hh"
+#include "../boost/smart_ptr.hpp"
 
+#include "EditorObj.hh"
 #include "EditorGroundpieceObj.hh"
 
 EditorGroundpieceObj::EditorGroundpieceObj(const GroundpieceData& data)

Index: EditorObj.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/EditorObj.hh,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- EditorObj.hh        7 Jun 2002 20:35:14 -0000       1.40
+++ EditorObj.hh        8 Jun 2002 20:19:54 -0000       1.41
@@ -21,6 +21,7 @@
 #define EDITOROBJ_HH
 
 #include <string>
+#include <iosfwd>
 
 using namespace std;
 
@@ -28,13 +29,6 @@
 class CL_Vector;
 class EditorView;
 class Editor;
-
-// looks strange, but it's just a predeclaration of ofstream
-namespace std {
-  template <class T> class char_traits;
-  template <class T1, class T2> struct basic_ofstream;
-  typedef struct basic_ofstream<char, char_traits<char> > ofstream;
-}
 
 namespace boost {
   template <class T> class shared_ptr;

Index: PLFObj.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/PLFObj.hh,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- PLFObj.hh   7 Jun 2002 14:50:34 -0000       1.28
+++ PLFObj.hh   8 Jun 2002 20:19:54 -0000       1.29
@@ -20,10 +20,7 @@
 #ifndef PLFOBJ_HH
 #define PLFOBJ_HH
 
-#include "../WorldObjData.hh"
-#include "../Direction.hh"
 #include "../Liquid.hh"
-#include "../HotspotData.hh"
 #include "../EntranceData.hh"
 #include "../ExitData.hh"
 #include "../TrapData.hh"

Index: RectEditorObj.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/RectEditorObj.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- RectEditorObj.hh    7 Jun 2002 14:50:35 -0000       1.2
+++ RectEditorObj.hh    8 Jun 2002 20:19:54 -0000       1.3
@@ -20,8 +20,6 @@
 #ifndef RECTEDITOROBJ_HH
 #define RECTEDITOROBJ_HH
 
-#include "../boost/smart_ptr.hpp"
-
 #include "EditorObj.hh"
 
 /** Abstract class which can be used for all objects which have a

Index: ScrollMap.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/ScrollMap.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ScrollMap.hh        7 Jun 2002 14:50:35 -0000       1.5
+++ ScrollMap.hh        8 Jun 2002 20:19:54 -0000       1.6
@@ -22,7 +22,6 @@
 
 #include "../boost/smart_ptr.hpp"
 #include "EditorView.hh"
-#include "EditorEvent.hh"
 
 class EditorEvent;
 

Index: SpriteEditorObj.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/SpriteEditorObj.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SpriteEditorObj.hh  7 Jun 2002 14:50:35 -0000       1.3
+++ SpriteEditorObj.hh  8 Jun 2002 20:19:54 -0000       1.4
@@ -20,9 +20,10 @@
 #ifndef SPRITEEDITOROBJ_HH
 #define SPRITEEDITOROBJ_HH
 
-#include <ClanLib/display.h>
+#include <ClanLib/core.h>
 #include "../Sprite.hh"
 #include "RectEditorObj.hh"
+
 
 class SpriteEditorObj : public RectEditorObj
 {

Index: StartPos.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/StartPos.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- StartPos.cc 11 Aug 2001 18:53:39 -0000      1.10
+++ StartPos.cc 8 Jun 2002 20:19:54 -0000       1.11
@@ -19,6 +19,8 @@
 
 #include "../XMLhelper.hh"
 #include "../PingusResource.hh"
+#include "../boost/smart_ptr.hpp"
+#include "../Position.hh"
 #include "StartPos.hh"
 
 StartPos::StartPos(int arg_x_pos, int arg_y_pos)

Index: StatusLine.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/StatusLine.hh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- StatusLine.hh       7 Jun 2002 14:50:35 -0000       1.8
+++ StatusLine.hh       8 Jun 2002 20:19:54 -0000       1.9
@@ -21,8 +21,9 @@
 #define STATUSLINE_HH
 
 #include <list>
-#include <ClanLib/core.h>
 #include "EditorObj.hh"
+
+class CL_Font;
 
 ///
 class StatusLine

Index: WeatherObj.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/WeatherObj.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- WeatherObj.cc       7 Jun 2002 14:50:35 -0000       1.11
+++ WeatherObj.cc       8 Jun 2002 20:19:54 -0000       1.12
@@ -19,6 +19,9 @@
 
 #include "../XMLhelper.hh"
 #include "../PingusResource.hh"
+#include "../Position.hh"
+#include "../editor/EditorObj.hh"
+#include "../boost/smart_ptr.hpp"
 #include "EditorView.hh"
 #include "WeatherObj.hh"