[Adonthell-commits] CVS: adonthell/src adonthell.h,1.5,1.6 character.h,1.24,1.25 data_screen.h,1.11,1.12 dialog.h,1.53,1.54 dialog_screen.h,1.2,1.3 event.h,1.33,1.34 event_handler.cc,1.4,1.5 gamedata.h,1.14,1.15 item_base.h,1.9,1.10 landmap.h,1.25,1.26 main.cc,1.58,1.59 mapcharacter.h,1.58,1.59 mapsquare.h,1.12,1.13 mapview.h,1.28,1.29 path.h,1.6,1.7 py_object.h,1.12,1.13 python_class.h,1.8,1.9 slot.h,1.3,1.4 storage.h,1.23,1.24 time_event.h,1.7,1.8 win_background.cc,1.3,1.4 win_background.h,1.2,1.3 win_base.h,1.23,1.24 win_border.cc,1.5,1.6 win_border.h,1.9,1.10 win_container.h,1.16,1.17 win_font.h,1.13,1.14 win_manager.h,1.11,1.12 win_object.h,1.4,1.5 win_scroll.h,1.3,1.4 win_scrollbar.h,1.2,1.3 win_theme.h,1.8,1.9 window.h,1.12,1.13

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src
In directory subversions:/tmp/cvs-serv31165

Modified Files:
        adonthell.h character.h data_screen.h dialog.h dialog_screen.h 
        event.h event_handler.cc gamedata.h item_base.h landmap.h 
        main.cc mapcharacter.h mapsquare.h mapview.h path.h 
        py_object.h python_class.h slot.h storage.h time_event.h 
        win_background.cc win_background.h win_base.h win_border.cc 
        win_border.h win_container.h win_font.h win_manager.h 
        win_object.h win_scroll.h win_scrollbar.h win_theme.h window.h 
Log Message:
CLEANUP of includes

Index: adonthell.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/adonthell.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** adonthell.h 29 Sep 2002 18:22:25 -0000      1.5
--- adonthell.h 23 Feb 2003 23:14:34 -0000      1.6
***************
*** 24,30 ****
  #define __ADONTHELL_H__
  
- #include "fileops.h"
- #include "landmap.h"
- #include "win_base.h"
  #include "win_mapview.h"
  
--- 24,27 ----

Index: character.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/character.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** character.h 2 Nov 2001 13:19:34 -0000       1.24
--- character.h 23 Feb 2003 23:14:34 -0000      1.25
***************
*** 27,31 ****
  #define CHARACTER_H_
  
- #include "storage.h"
  #include "mapcharacter.h"
  
--- 27,30 ----

Index: data_screen.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/data_screen.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** data_screen.h       22 Aug 2002 17:56:40 -0000      1.11
--- data_screen.h       23 Feb 2003 23:14:34 -0000      1.12
***************
*** 28,36 ****
  #define DATA_SCREEN_H__
  
- #include "win_types.h"
- #include "win_font.h"
  #include "win_select.h"
  #include "win_theme.h"
- #include "win_container.h"
  #include "win_write.h"
  
--- 28,33 ----

Index: dialog.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/dialog.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** dialog.h    18 Aug 2002 19:53:16 -0000      1.53
--- dialog.h    23 Feb 2003 23:14:34 -0000      1.54
***************
*** 27,34 ****
  
  #include "character_base.h"
- #include "python_class.h"
  #include "py_object.h"
- #include "types.h"
- #include <vector>
   
  
--- 27,31 ----

Index: dialog_screen.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/dialog_screen.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** dialog_screen.h     25 Apr 2002 21:44:44 -0000      1.2
--- dialog_screen.h     23 Feb 2003 23:14:34 -0000      1.3
***************
*** 28,32 ****
  
  #include "dialog.h"
- #include "character_base.h"
  #include "window.h"
  #include "win_select.h"
--- 28,31 ----

Index: event.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/event.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** event.h     10 Feb 2003 20:01:13 -0000      1.33
--- event.h     23 Feb 2003 23:14:34 -0000      1.34
***************
*** 24,33 ****
  #define EVENT_H__
  
- #include <string>
  #include "callback.h"
  #include "py_object.h"
  #include "py_callback.h"
  
- using std::string;
  class event_list;
  
--- 24,31 ----

Index: event_handler.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/event_handler.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** event_handler.cc    18 Aug 2002 19:53:16 -0000      1.4
--- event_handler.cc    23 Feb 2003 23:14:34 -0000      1.5
***************
*** 23,27 ****
   
  #include "event_handler.h"
- #include "event_list.h"
  #include "map_event.h"
  #include "map_event_handler.h"
--- 23,26 ----

Index: gamedata.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gamedata.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** gamedata.h  22 Aug 2002 19:52:41 -0000      1.14
--- gamedata.h  23 Feb 2003 23:14:34 -0000      1.15
***************
*** 27,35 ****
  #define GAMEDATA_H__
  
- #include <zlib.h>
- #include <string> 
- #include <vector>
- #include "fileops.h"
- 
  #include "quest.h"
  #include "character.h"
--- 27,30 ----

Index: item_base.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/item_base.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** item_base.h 20 Feb 2003 17:27:41 -0000      1.9
--- item_base.h 23 Feb 2003 23:14:34 -0000      1.10
***************
*** 26,30 ****
  
  #include "py_object.h"
- #include "fileops.h"
  #include "slot.h"
  
--- 26,29 ----

Index: landmap.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/landmap.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** landmap.h   9 Aug 2002 20:01:26 -0000       1.25
--- landmap.h   23 Feb 2003 23:14:34 -0000      1.26
***************
*** 27,36 ****
  #include "mapobject.h"
  #include "mapcharacter.h"
- #include "mapsquare.h"
- #include "event_list.h"
- 
- #include <string>
- #include <vector>
- #include <list>
  
  /**
--- 27,30 ----

Index: main.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/main.cc,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -r1.58 -r1.59
*** main.cc     20 Feb 2003 17:27:41 -0000      1.58
--- main.cc     23 Feb 2003 23:14:34 -0000      1.59
***************
*** 24,28 ****
   
  #include "audio.h"
- #include "character.h"
  #include "event_handler.h"
  #include "game.h"
--- 24,27 ----

Index: mapcharacter.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/mapcharacter.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -r1.58 -r1.59
*** mapcharacter.h      21 Aug 2002 15:25:45 -0000      1.58
--- mapcharacter.h      23 Feb 2003 23:14:34 -0000      1.59
***************
*** 33,43 ****
  #define MAPCHAR_DIR "gfx/mapcharacters/"
  
- #include <vector>
- #include <string>
  #include "animation.h"
  #include "character_base.h"
- #include "mapsquare_walkable.h"
- #include "py_object.h"
- #include "py_callback.h"
  #include "path.h"
  #include "text_bubble.h"
--- 33,38 ----

Index: mapsquare.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/mapsquare.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** mapsquare.h 18 Aug 2001 20:09:50 -0000      1.12
--- mapsquare.h 23 Feb 2003 23:14:34 -0000      1.13
***************
*** 27,38 ****
  #define MAPSQUARE_H_ 
  
- 
- #include "fileops.h"
- #include "mapsquare_walkable.h"
- 
- #include <string>
- #include <vector>
  #include <list>
  
  
  class mapobject;
--- 27,33 ----
  #define MAPSQUARE_H_ 
  
  #include <list>
  
+ #include "mapsquare_walkable.h"
  
  class mapobject;

Index: mapview.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/mapview.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** mapview.h   9 Sep 2001 09:48:28 -0000       1.28
--- mapview.h   23 Feb 2003 23:14:34 -0000      1.29
***************
*** 30,34 ****
  #include "landmap.h"
  #include "python_class.h"
- #include <list>
  
  
--- 30,33 ----

Index: path.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/path.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** path.h      22 Sep 2001 13:26:04 -0000      1.6
--- path.h      23 Feb 2003 23:14:34 -0000      1.7
***************
*** 26,31 ****
  #define PATH_H__
  
- #include "types.h"
- #include <vector>
  #include "mapsquare.h"
  
--- 26,29 ----

Index: py_object.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/py_object.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** py_object.h 17 Feb 2003 19:31:21 -0000      1.12
--- py_object.h 23 Feb 2003 23:14:34 -0000      1.13
***************
*** 27,34 ****
  #define PY_OBJECT_H
                     
- #include <string>
  #include "python_class.h"
- 
- using std::string; 
  
  
--- 27,31 ----

Index: python_class.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/python_class.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** python_class.h      7 Apr 2002 11:56:29 -0000       1.8
--- python_class.h      23 Feb 2003 23:14:34 -0000      1.9
***************
*** 29,34 ****
  #define PYTHON_CLASS_H__
  
- #include <string>
- 
  #include "Python.h"
  #include "compile.h"
--- 29,32 ----

Index: slot.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/slot.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** slot.h      12 Feb 2003 15:58:55 -0000      1.3
--- slot.h      23 Feb 2003 23:14:34 -0000      1.4
***************
*** 24,31 ****
  #define SLOT_H
  
- #include <string>
  #include "fileops.h"
- 
- using std::string;
  
  class item_base;
--- 24,28 ----

Index: storage.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/storage.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** storage.h   31 Jan 2002 08:56:07 -0000      1.23
--- storage.h   23 Feb 2003 23:14:34 -0000      1.24
***************
*** 28,41 ****
  
  #include <string.h>
- #if __GNUG__ > 2
- #include <ext/hash_map>
- #else
- #include <hash_map>
- #endif
- #include "str_hash.h"
  #include <map>
  #include <vector>
! #include <string>
  #include "types.h"
  
  #ifndef SWIG
--- 28,36 ----
  
  #include <string.h>
  #include <map>
  #include <vector>
! 
  #include "types.h"
+ #include "str_hash.h"
  
  #ifndef SWIG

Index: time_event.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/time_event.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** time_event.h        20 Jan 2003 20:18:43 -0000      1.7
--- time_event.h        23 Feb 2003 23:14:34 -0000      1.8
***************
*** 23,30 ****
  #define TIME_EVENT_H__
  
- #include <string>
  #include "event.h"
- 
- using std::string;
  
  /**
--- 23,27 ----

Index: win_background.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/win_background.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** win_background.cc   28 Jun 2002 12:15:21 -0000      1.3
--- win_background.cc   23 Feb 2003 23:14:34 -0000      1.4
***************
*** 13,17 ****
  #include "win_theme.h"
  #include "win_background.h"
- #include "win_base.h"
  
  win_background::win_background()
--- 13,16 ----

Index: win_background.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/win_background.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** win_background.h    28 Jul 2001 20:34:49 -0000      1.2
--- win_background.h    23 Feb 2003 23:14:34 -0000      1.3
***************
*** 18,22 ****
  
  #include "image.h"
- #include "drawing_area.h"
  #include "win_types.h"
  
--- 18,21 ----

Index: win_base.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/win_base.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** win_base.h  29 Sep 2002 16:08:34 -0000      1.23
--- win_base.h  23 Feb 2003 23:14:34 -0000      1.24
***************
*** 27,37 ****
  #define _WIN_BASE_H_
  
- #include"types.h"
- #include "input.h"
  #include "win_event.h"
  #include "win_border.h"
  #include "win_background.h"
  #include "win_keys.h"
- #include "drawing_area.h"
  
  class win_container;
--- 27,34 ----

Index: win_border.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/win_border.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** win_border.cc       28 Jun 2002 12:15:21 -0000      1.5
--- win_border.cc       23 Feb 2003 23:14:34 -0000      1.6
***************
*** 12,16 ****
  
  #include "win_theme.h"
- #include "win_base.h"
  #include "win_border.h"
  
--- 12,15 ----

Index: win_border.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/win_border.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** win_border.h        23 Aug 2001 21:53:00 -0000      1.9
--- win_border.h        23 Feb 2003 23:14:34 -0000      1.10
***************
*** 17,21 ****
  #include "win_types.h"
  #include "image.h"
- #include "drawing_area.h"
  
  class win_theme;
--- 17,20 ----

Index: win_container.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/win_container.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** win_container.h     3 Aug 2001 17:05:37 -0000       1.16
--- win_container.h     23 Feb 2003 23:14:34 -0000      1.17
***************
*** 17,21 ****
  
  #include<list>
- #include "drawing_area.h"
  #include "win_base.h"
  
--- 17,20 ----

Index: win_font.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/win_font.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** win_font.h  28 Jun 2002 12:15:21 -0000      1.13
--- win_font.h  23 Feb 2003 23:14:34 -0000      1.14
***************
*** 17,21 ****
  #include <stdlib.h>
  #include <string.h>
! #include "types.h"
  #include "win_types.h"
  #include "image.h"
--- 17,21 ----
  #include <stdlib.h>
  #include <string.h>
! 
  #include "win_types.h"
  #include "image.h"

Index: win_manager.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/win_manager.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** win_manager.h       29 Oct 2001 15:58:37 -0000      1.11
--- win_manager.h       23 Feb 2003 23:14:34 -0000      1.12
***************
*** 23,36 ****
  #define _WIN_MANAGER_
  
! #include <list> 
! #if __GNUG__ > 2
! #include <ext/hash_map>
! #else
! #include <hash_map>
! #endif
  #include "win_theme.h"
  #include "win_font.h"
- #include "win_base.h"
- #include "str_hash.h"
  
  #ifndef SWIG
--- 23,29 ----
  #define _WIN_MANAGER_
  
! #include "str_hash.h"
  #include "win_theme.h"
  #include "win_font.h"
  
  #ifndef SWIG

Index: win_object.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/win_object.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** win_object.h        20 Aug 2001 20:54:12 -0000      1.4
--- win_object.h        23 Feb 2003 23:14:34 -0000      1.5
***************
*** 17,21 ****
  #define _WIN_OBJECT_H_
  
- #include "win_base.h" 
  #include "win_container.h"
  
--- 17,20 ----

Index: win_scroll.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/win_scroll.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** win_scroll.h        30 Jul 2001 23:08:12 -0000      1.3
--- win_scroll.h        23 Feb 2003 23:14:34 -0000      1.4
***************
*** 1,3 ****
--- 1,5 ----
  /*
+    $Id$
+ 
     (C) Copyright 2000 Joel Vennin
     Part of the Adonthell Project http://adonthell.linuxgames.com
***************
*** 11,19 ****
  */
  
! #ifndef _WIN_SCROLLED_H_
! #define _WIN_SCROLLED_H_
  
- #include "input.h"
- #include "win_base.h"
  #include "win_container.h"
  #include "win_scrollbar.h"
--- 13,19 ----
  */
  
! #ifndef WIN_SCROLLED_H
! #define WIN_SCROLLED_H
  
  #include "win_container.h"
  #include "win_scrollbar.h"

Index: win_scrollbar.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/win_scrollbar.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** win_scrollbar.h     28 Jul 2001 20:34:49 -0000      1.2
--- win_scrollbar.h     23 Feb 2003 23:14:34 -0000      1.3
***************
*** 15,19 ****
  
  #include "image.h"
- #include "drawing_area.h"
  #include "win_types.h"
  
--- 15,18 ----

Index: win_theme.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/win_theme.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** win_theme.h 23 Aug 2001 21:54:25 -0000      1.8
--- win_theme.h 23 Feb 2003 23:14:34 -0000      1.9
***************
*** 16,23 ****
  #define _WIN_THEME_H_
  
- #include "win_border.h"
- #include "win_background.h"
  #include "win_scroll.h"
- #include "win_scrollbar.h"
  
  class win_theme
--- 16,20 ----

Index: window.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/window.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** window.h    2 Aug 2001 15:18:35 -0000       1.12
--- window.h    23 Feb 2003 23:14:34 -0000      1.13
***************
*** 1,10 ****
- #include <list>
- #include "win_types.h"
- #include "win_base.h"
- #include "win_font.h"
  #include "win_label.h"
  #include "win_write.h"
  #include "win_image.h"
  #include "win_mapview.h"
- #include "win_container.h"
- #include "win_border.h"
--- 1,4 ----