[Gcblue-commits] gcb_wx/include/database CsvTranslator.h,1.5,1.6 tcAirDBObject.h,1.12,1.13 tcBallisticDBObject.h,1.7,1.8 tcDBObjSerializer.h,1.4,1.5 tcDBObjSerializerSql.h,1.3,1.4 tcDBString.h,1.5,1.6 tcDatabase.h,1.10,1.11 tcDatabaseIterator.h,1.1,1.2 tcDatabaseObject.h,1.21,1.22 tcESMDBObject.h,1.7,1.8 tcFixedDBObject.h,1.6,1.7 tcFlightportDBObject.h,1.5,1.6 tcGenericDBObject.h,1.17,1.18 tcLauncherDBObject.h,1.12,1.13 tcMissileDBObject.h,1.19,1.20 tcOpticalDBObject.h,1.2,1.3 tcRadarDBObject.h,1.12,1.13 tcSensorDBObject.h,1.9,1.10 tcSensorPlatformDBObject.h,1.1,1.2 tcSonarDBObject.h,1.3,1.4 tcSonobuoyDBObject.h,1.1,1.2 tcSqlReader.h,1.2,1.3 tcStoresDBObject.h,1.2,1.3 tcTorpedoDBObject.h,1.2,1.3 tcWeaponDBObject.h,1.5,1.6

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9387/include/database

Modified Files:
	CsvTranslator.h tcAirDBObject.h tcBallisticDBObject.h 
	tcDBObjSerializer.h tcDBObjSerializerSql.h tcDBString.h 
	tcDatabase.h tcDatabaseIterator.h tcDatabaseObject.h 
	tcESMDBObject.h tcFixedDBObject.h tcFlightportDBObject.h 
	tcGenericDBObject.h tcLauncherDBObject.h tcMissileDBObject.h 
	tcOpticalDBObject.h tcRadarDBObject.h tcSensorDBObject.h 
	tcSensorPlatformDBObject.h tcSonarDBObject.h 
	tcSonobuoyDBObject.h tcSqlReader.h tcStoresDBObject.h 
	tcTorpedoDBObject.h tcWeaponDBObject.h 
Log Message:
namespace housekeeping

Index: tcDatabaseIterator.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDatabaseIterator.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcDatabaseIterator.h	6 Nov 2004 15:13:39 -0000	1.1
--- tcDatabaseIterator.h	1 Jun 2005 00:13:26 -0000	1.2
***************
*** 29,33 ****
  #include "simmath.h"
  
! namespace Database
  {
  	class tcDatabase;
--- 29,33 ----
  #include "simmath.h"
  
! namespace database
  {
  	class tcDatabase;

Index: tcRadarDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcRadarDBObject.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcRadarDBObject.h	2 Dec 2004 04:17:23 -0000	1.12
--- tcRadarDBObject.h	1 Jun 2005 00:13:26 -0000	1.13
***************
*** 31,35 ****
  class TiXmlElement;
  
! namespace Database
  {
      class tcSqlReader;
--- 31,35 ----
  class TiXmlElement;
  
! namespace database
  {
      class tcSqlReader;
***************
*** 66,70 ****
      };
  
! } // namespace Database
  
  #endif
--- 66,70 ----
      };
  
! } // namespace database
  
  #endif

Index: tcESMDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcESMDBObject.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcESMDBObject.h	29 Nov 2004 03:54:49 -0000	1.7
--- tcESMDBObject.h	1 Jun 2005 00:13:26 -0000	1.8
***************
*** 30,34 ****
  #include "database/tcSqlReader.h"
  
! namespace Database
  {
     class tcSqlReader;
--- 30,34 ----
  #include "database/tcSqlReader.h"
  
! namespace database
  {
     class tcSqlReader;
***************
*** 55,59 ****
     };
  
! } // namespace Database
  
  #endif
--- 55,59 ----
     };
  
! } // namespace database
  
  #endif

Index: tcAirDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcAirDBObject.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcAirDBObject.h	27 May 2005 00:28:04 -0000	1.12
--- tcAirDBObject.h	1 Jun 2005 00:13:25 -0000	1.13
***************
*** 39,43 ****
  class TiXmlElement;
  
! namespace Database 
  {
  
--- 39,43 ----
  class TiXmlElement;
  
! namespace database 
  {
  

Index: tcSonarDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcSonarDBObject.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcSonarDBObject.h	7 Dec 2004 03:59:07 -0000	1.3
--- tcSonarDBObject.h	1 Jun 2005 00:13:26 -0000	1.4
***************
*** 31,35 ****
  class TiXmlElement;
  
! namespace Database
  {
      class tcSqlReader;
--- 31,35 ----
  class TiXmlElement;
  
! namespace database
  {
      class tcSqlReader;
***************
*** 81,85 ****
      };
  
! } // namespace Database
  
  #endif
--- 81,85 ----
      };
  
! } // namespace database
  
  #endif

Index: tcDatabaseObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDatabaseObject.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** tcDatabaseObject.h	5 Mar 2005 22:37:50 -0000	1.21
--- tcDatabaseObject.h	1 Jun 2005 00:13:26 -0000	1.22
***************
*** 28,34 ****
  
  #include "wx/wx.h" 
! #ifdef WIN32
! #include "wx/msw/private.h" // for MS Windows specific definitions
! #endif
  
  #include "tcString.h"
--- 28,32 ----
  
  #include "wx/wx.h" 
! 
  
  #include "tcString.h"
***************
*** 36,45 ****
  #include "tcDBString.h"
  #include "gctypes.h"
! 
  
  class tc3DModel;
  class TiXmlElement;
  
! namespace Database 
  {
      class tcDatabase;
--- 34,47 ----
  #include "tcDBString.h"
  #include "gctypes.h"
! #include <osg/ref_ptr>
  
  class tc3DModel;
  class TiXmlElement;
+ namespace osg
+ {
+ 	class Geometry;
+ }
  
! namespace database 
  {
      class tcDatabase;
***************
*** 166,169 ****
--- 168,172 ----
          static tcDatabase *database; ///< allows db objects to query for other db objects
          tc3DModel *model;
+ 		osg::ref_ptr<osg::Geometry> icon; ///< icon for drag/drop container gui
  
      };

Index: tcDBString.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDBString.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcDBString.h	8 Aug 2004 00:31:32 -0000	1.5
--- tcDBString.h	1 Jun 2005 00:13:25 -0000	1.6
***************
*** 35,39 ****
  class tcStream;
  
! namespace Database 
  {
      class tcDBString 
--- 35,39 ----
  class tcStream;
  
! namespace database 
  {
      class tcDBString 
***************
*** 58,62 ****
      };
      
! } // namespace Database
  
  #endif
--- 58,62 ----
      };
      
! } // namespace database
  
  #endif

Index: tcSqlReader.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcSqlReader.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcSqlReader.h	9 Aug 2004 02:35:14 -0000	1.2
--- tcSqlReader.h	1 Jun 2005 00:13:26 -0000	1.3
***************
*** 44,48 ****
  * C++ wrapper
  */
! namespace Database
  {
  	/**
--- 44,48 ----
  * C++ wrapper
  */
! namespace database
  {
  	/**
***************
*** 76,80 ****
  
  
! } // namespace Database
  
  #endif
--- 76,80 ----
  
  
! } // namespace database
  
  #endif

Index: tcDBObjSerializerSql.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDBObjSerializerSql.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcDBObjSerializerSql.h	29 Nov 2004 03:54:48 -0000	1.3
--- tcDBObjSerializerSql.h	1 Jun 2005 00:13:25 -0000	1.4
***************
*** 47,51 ****
  * C++ wrapper
  */
! namespace Database
  {
  
--- 47,51 ----
  * C++ wrapper
  */
! namespace database
  {
  
***************
*** 211,215 ****
  	}
  
! } // namespace Database
  
  #endif
--- 211,215 ----
  	}
  
! } // namespace database
  
  #endif

Index: tcMissileDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcMissileDBObject.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** tcMissileDBObject.h	31 Mar 2005 03:51:11 -0000	1.19
--- tcMissileDBObject.h	1 Jun 2005 00:13:26 -0000	1.20
***************
*** 32,36 ****
  class TiXmlElement;
  
! namespace Database
  {
     class tcSqlReader;
--- 32,36 ----
  class TiXmlElement;
  
! namespace database
  {
     class tcSqlReader;

Index: tcGenericDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcGenericDBObject.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tcGenericDBObject.h	4 Mar 2005 00:46:14 -0000	1.17
--- tcGenericDBObject.h	1 Jun 2005 00:13:26 -0000	1.18
***************
*** 36,40 ****
  
  
! namespace Database
  {
  
--- 36,40 ----
  
  
! namespace database
  {
  

Index: tcStoresDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcStoresDBObject.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcStoresDBObject.h	2 Dec 2004 04:17:23 -0000	1.2
--- tcStoresDBObject.h	1 Jun 2005 00:13:26 -0000	1.3
***************
*** 32,36 ****
  class TiXmlElement;
  
! namespace Database
  {
      class tcSqlReader;
--- 32,36 ----
  class TiXmlElement;
  
! namespace database
  {
      class tcSqlReader;
***************
*** 67,71 ****
      };
  
! } // namespace Database
  
  #endif
--- 67,71 ----
      };
  
! } // namespace database
  
  #endif

Index: tcTorpedoDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcTorpedoDBObject.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcTorpedoDBObject.h	7 Dec 2004 03:59:07 -0000	1.2
--- tcTorpedoDBObject.h	1 Jun 2005 00:13:26 -0000	1.3
***************
*** 32,36 ****
  class TiXmlElement;
  
! namespace Database
  {
      class tcSqlReader;
--- 32,36 ----
  class TiXmlElement;
  
! namespace database
  {
      class tcSqlReader;

Index: tcSensorDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcSensorDBObject.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcSensorDBObject.h	2 Mar 2005 22:28:36 -0000	1.9
--- tcSensorDBObject.h	1 Jun 2005 00:13:26 -0000	1.10
***************
*** 33,37 ****
  class tcGameObject;
  
! namespace Database
  {
  	class tcSqlReader;
--- 33,37 ----
  class tcGameObject;
  
! namespace database
  {
  	class tcSqlReader;
***************
*** 66,70 ****
  	};
  
! } // namespace Database
  
  #endif
--- 66,70 ----
  	};
  
! } // namespace database
  
  #endif

Index: tcFixedDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcFixedDBObject.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcFixedDBObject.h	29 Nov 2004 03:54:49 -0000	1.6
--- tcFixedDBObject.h	1 Jun 2005 00:13:26 -0000	1.7
***************
*** 31,35 ****
  
  
! namespace Database
  {
     class tcSqlReader;
--- 31,35 ----
  
  
! namespace database
  {
     class tcSqlReader;
***************
*** 56,60 ****
  
  
! } // namespace Database
  
  #endif
--- 56,60 ----
  
  
! } // namespace database
  
  #endif

Index: tcLauncherDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcLauncherDBObject.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcLauncherDBObject.h	21 May 2005 02:00:27 -0000	1.12
--- tcLauncherDBObject.h	1 Jun 2005 00:13:26 -0000	1.13
***************
*** 31,35 ****
  class TiXmlElement;
  
! namespace Database
  {
      class tcSqlReader;
--- 31,35 ----
  class TiXmlElement;
  
! namespace database
  {
      class tcSqlReader;
***************
*** 69,73 ****
      };
  
! } // namespace Database
  
  #endif
--- 69,73 ----
      };
  
! } // namespace database
  
  #endif

Index: tcSensorPlatformDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcSensorPlatformDBObject.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcSensorPlatformDBObject.h	4 Mar 2005 00:46:14 -0000	1.1
--- tcSensorPlatformDBObject.h	1 Jun 2005 00:13:26 -0000	1.2
***************
*** 33,37 ****
  class tcFile;
  
! namespace Database
  {
      class tcDatabase;
--- 33,37 ----
  class tcFile;
  
! namespace database
  {
      class tcDatabase;

Index: tcWeaponDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcWeaponDBObject.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcWeaponDBObject.h	7 Dec 2004 03:59:07 -0000	1.5
--- tcWeaponDBObject.h	1 Jun 2005 00:13:26 -0000	1.6
***************
*** 31,35 ****
  class TiXmlElement;
  
! namespace Database
  {
  
--- 31,35 ----
  class TiXmlElement;
  
! namespace database
  {
  
***************
*** 67,71 ****
  	};
  
! } // namespace Database
  
  #endif
--- 67,71 ----
  	};
  
! } // namespace database
  
  #endif

Index: tcSonobuoyDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcSonobuoyDBObject.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcSonobuoyDBObject.h	5 Mar 2005 22:37:50 -0000	1.1
--- tcSonobuoyDBObject.h	1 Jun 2005 00:13:26 -0000	1.2
***************
*** 32,36 ****
  class TiXmlElement;
  
! namespace Database
  {
  	class tcSqlReader;
--- 32,36 ----
  class TiXmlElement;
  
! namespace database
  {
  	class tcSqlReader;
***************
*** 57,61 ****
  	};
  
! } // namespace Database
  
  #endif
--- 57,61 ----
  	};
  
! } // namespace database
  
  #endif

Index: CsvTranslator.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/CsvTranslator.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CsvTranslator.h	21 May 2005 02:00:26 -0000	1.5
--- CsvTranslator.h	1 Jun 2005 00:13:25 -0000	1.6
***************
*** 32,36 ****
  #include <vector>
  
! namespace Database
  {
  /**
--- 32,36 ----
  #include <vector>
  
! namespace database
  {
  /**

Index: tcBallisticDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcBallisticDBObject.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcBallisticDBObject.h	25 Mar 2005 03:48:06 -0000	1.7
--- tcBallisticDBObject.h	1 Jun 2005 00:13:25 -0000	1.8
***************
*** 31,35 ****
  class TiXmlElement;
  
! namespace Database
  {
  	class tcSqlReader;
--- 31,35 ----
  class TiXmlElement;
  
! namespace database
  {
  	class tcSqlReader;
***************
*** 66,70 ****
  	};
  
! } // namespace Database
  
  #endif
--- 66,70 ----
  	};
  
! } // namespace database
  
  #endif

Index: tcOpticalDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcOpticalDBObject.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcOpticalDBObject.h	29 Nov 2004 03:54:49 -0000	1.2
--- tcOpticalDBObject.h	1 Jun 2005 00:13:26 -0000	1.3
***************
*** 31,35 ****
  class TiXmlElement;
  
! namespace Database
  {
  	class tcSqlReader;
--- 31,35 ----
  class TiXmlElement;
  
! namespace database
  {
  	class tcSqlReader;
***************
*** 60,64 ****
  	};
  
! } // namespace Database
  
  #endif
--- 60,64 ----
  	};
  
! } // namespace database
  
  #endif

Index: tcDBObjSerializer.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDBObjSerializer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcDBObjSerializer.h	14 Sep 2004 02:01:45 -0000	1.4
--- tcDBObjSerializer.h	1 Jun 2005 00:13:25 -0000	1.5
***************
*** 38,42 ****
  * Class T should be a leaf class for this to work properly.
  */
! namespace Database
  {
  
--- 38,42 ----
  * Class T should be a leaf class for this to work properly.
  */
! namespace database
  {
  
***************
*** 133,137 ****
  }
  
! } // namespace Database
  
  #endif
--- 133,137 ----
  }
  
! } // namespace database
  
  #endif

Index: tcDatabase.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDatabase.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcDatabase.h	4 Mar 2005 00:46:14 -0000	1.10
--- tcDatabase.h	1 Jun 2005 00:13:25 -0000	1.11
***************
*** 47,51 ****
  * also added to support a web effort that lost steam.
  */
! namespace Database 
  {
  
--- 47,51 ----
  * also added to support a web effort that lost steam.
  */
! namespace database 
  {
  

Index: tcFlightportDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcFlightportDBObject.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcFlightportDBObject.h	29 Nov 2004 03:54:49 -0000	1.5
--- tcFlightportDBObject.h	1 Jun 2005 00:13:26 -0000	1.6
***************
*** 31,35 ****
  class TiXmlElement;
  
! namespace Database
  {
  	class tcSqlReader;
--- 31,35 ----
  class TiXmlElement;
  
! namespace database
  {
  	class tcSqlReader;