[Gcblue-commits] gcb_wx/src/database CsvTranslator.cpp,1.6,1.7 tcAirDBObject.cpp,1.14,1.15 tcBallist
Status: Alpha
Brought to you by:
ddcforge
Update of /cvsroot/gcblue/gcb_wx/src/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9387/src/database Modified Files: CsvTranslator.cpp tcAirDBObject.cpp tcBallisticDBObject.cpp tcDBString.cpp tcDatabase.cpp tcDatabaseIterator.cpp tcDatabaseObject.cpp tcESMDBObject.cpp tcFixedDBObject.cpp tcFlightportDBObject.cpp tcGenericDBObject.cpp tcLauncherDBObject.cpp tcMissileDBObject.cpp tcOpticalDBObject.cpp tcRadarDBObject.cpp tcSensorDBObject.cpp tcSensorPlatformDBObject.cpp tcSonarDBObject.cpp tcSonobuoyDBObject.cpp tcSqlReader.cpp tcStoresDBObject.cpp tcTorpedoDBObject.cpp tcWeaponDBObject.cpp Log Message: namespace housekeeping Index: CsvTranslator.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/CsvTranslator.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CsvTranslator.cpp 21 May 2005 02:01:04 -0000 1.6 --- CsvTranslator.cpp 1 Jun 2005 00:13:29 -0000 1.7 *************** *** 35,39 **** using namespace std; ! namespace Database { /** --- 35,39 ---- using namespace std; ! namespace database { /** Index: tcSensorDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcSensorDBObject.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tcSensorDBObject.cpp 2 Mar 2005 22:28:42 -0000 1.11 --- tcSensorDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.12 *************** *** 43,47 **** using namespace std; ! namespace Database { --- 43,47 ---- using namespace std; ! namespace database { *************** *** 133,137 **** } ! int tcSensorDBObject::WriteCSVHeader(Database::CsvTranslator *csv) { tcDatabaseObject::WriteCSVHeader(csv); --- 133,137 ---- } ! int tcSensorDBObject::WriteCSVHeader(database::CsvTranslator *csv) { tcDatabaseObject::WriteCSVHeader(csv); Index: tcSqlReader.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcSqlReader.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcSqlReader.cpp 2 Nov 2004 04:23:55 -0000 1.3 --- tcSqlReader.cpp 1 Jun 2005 00:13:29 -0000 1.4 *************** *** 29,33 **** #endif ! namespace Database { --- 29,33 ---- #endif ! namespace database { Index: tcDatabaseIterator.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDatabaseIterator.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcDatabaseIterator.cpp 6 Nov 2004 15:13:41 -0000 1.1 --- tcDatabaseIterator.cpp 1 Jun 2005 00:13:29 -0000 1.2 *************** *** 34,38 **** #endif ! namespace Database { --- 34,38 ---- #endif ! namespace database { Index: tcMissileDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcMissileDBObject.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** tcMissileDBObject.cpp 31 Mar 2005 03:51:12 -0000 1.17 --- tcMissileDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.18 *************** *** 44,48 **** using namespace std; ! namespace Database { --- 44,48 ---- using namespace std; ! namespace database { *************** *** 213,217 **** } ! int tcMissileDBObject::SerializeCSV(Database::CsvTranslator *csv, bool mbLoad) { tcWeaponDBObject::SerializeCSV(csv, mbLoad); --- 213,217 ---- } ! int tcMissileDBObject::SerializeCSV(database::CsvTranslator *csv, bool mbLoad) { tcWeaponDBObject::SerializeCSV(csv, mbLoad); *************** *** 356,360 **** } ! int tcMissileDBObject::WriteCSVHeader(Database::CsvTranslator *csv) { tcWeaponDBObject::WriteCSVHeader(csv); --- 356,360 ---- } ! int tcMissileDBObject::WriteCSVHeader(database::CsvTranslator *csv) { tcWeaponDBObject::WriteCSVHeader(csv); *************** *** 640,643 **** } ! } // namespace Database --- 640,643 ---- } ! } // namespace database Index: tcSonobuoyDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcSonobuoyDBObject.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcSonobuoyDBObject.cpp 5 Mar 2005 22:37:51 -0000 1.1 --- tcSonobuoyDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.2 *************** *** 37,41 **** using namespace std; ! namespace Database { /** --- 37,41 ---- using namespace std; ! namespace database { /** Index: tcAirDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcAirDBObject.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** tcAirDBObject.cpp 27 May 2005 00:28:21 -0000 1.14 --- tcAirDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.15 *************** *** 32,36 **** #endif ! namespace Database { std::vector<float> tcAirDBObject::tableAltitudes; --- 32,36 ---- #endif ! namespace database { std::vector<float> tcAirDBObject::tableAltitudes; *************** *** 158,162 **** ! int tcAirDBObject::SerializeCSV(Database::CsvTranslator *csv, bool mbLoad) { csv->SetWriteLineBlock(true); --- 158,162 ---- ! int tcAirDBObject::SerializeCSV(database::CsvTranslator *csv, bool mbLoad) { csv->SetWriteLineBlock(true); *************** *** 223,227 **** } ! int tcAirDBObject::WriteCSVHeader(Database::CsvTranslator *csv) { csv->SetWriteLineBlock(true); --- 223,227 ---- } ! int tcAirDBObject::WriteCSVHeader(database::CsvTranslator *csv) { csv->SetWriteLineBlock(true); Index: tcESMDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcESMDBObject.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tcESMDBObject.cpp 29 Nov 2004 03:55:04 -0000 1.9 --- tcESMDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.10 *************** *** 40,44 **** using namespace std; ! namespace Database { --- 40,44 ---- using namespace std; ! namespace database { *************** *** 101,105 **** ! int tcESMDBObject::WriteCSVHeader(Database::CsvTranslator *csv) { tcSensorDBObject::WriteCSVHeader(csv); --- 101,105 ---- ! int tcESMDBObject::WriteCSVHeader(database::CsvTranslator *csv) { tcSensorDBObject::WriteCSVHeader(csv); Index: tcSensorPlatformDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcSensorPlatformDBObject.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcSensorPlatformDBObject.cpp 4 Mar 2005 00:46:16 -0000 1.1 --- tcSensorPlatformDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.2 *************** *** 43,47 **** using namespace std; ! namespace Database { --- 43,47 ---- using namespace std; ! namespace database { *************** *** 82,86 **** ! int tcSensorPlatformDBObject::SerializeCSV(Database::CsvTranslator *csv, bool mbLoad) { if (mbLoad) --- 82,86 ---- ! int tcSensorPlatformDBObject::SerializeCSV(database::CsvTranslator *csv, bool mbLoad) { if (mbLoad) *************** *** 144,148 **** } ! int tcSensorPlatformDBObject::WriteCSVHeader(Database::CsvTranslator *csv) { int i; --- 144,148 ---- } ! int tcSensorPlatformDBObject::WriteCSVHeader(database::CsvTranslator *csv) { int i; Index: tcDatabaseObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDatabaseObject.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** tcDatabaseObject.cpp 31 Jan 2005 01:33:07 -0000 1.16 --- tcDatabaseObject.cpp 1 Jun 2005 00:13:29 -0000 1.17 *************** *** 37,40 **** --- 37,41 ---- #include "common/tinyxml.h" #include "database/tcSqlReader.h" + #include <osg/Geometry> #ifdef _DEBUG *************** *** 42,46 **** #endif ! namespace Database { tcDatabase* tcDatabaseObject::database = NULL; --- 43,47 ---- #endif ! namespace database { tcDatabase* tcDatabaseObject::database = NULL; *************** *** 220,224 **** } ! int tcDatabaseObject::SerializeCSV(Database::CsvTranslator *csv, bool mbLoad) { if (mbLoad) --- 221,225 ---- } ! int tcDatabaseObject::SerializeCSV(database::CsvTranslator *csv, bool mbLoad) { if (mbLoad) *************** *** 280,284 **** ! int tcDatabaseObject::WriteCSVHeader(Database::CsvTranslator *csv) { *csv << "Database class"; // database class --- 281,285 ---- ! int tcDatabaseObject::WriteCSVHeader(database::CsvTranslator *csv) { *csv << "Database class"; // database class Index: tcBallisticDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcBallisticDBObject.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tcBallisticDBObject.cpp 25 Mar 2005 03:48:07 -0000 1.10 --- tcBallisticDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.11 *************** *** 40,44 **** using namespace std; ! namespace Database { --- 40,44 ---- using namespace std; ! namespace database { *************** *** 190,194 **** } ! int tcBallisticDBObject::WriteCSVHeader(Database::CsvTranslator *csv) { tcWeaponDBObject::WriteCSVHeader(csv); --- 190,194 ---- } ! int tcBallisticDBObject::WriteCSVHeader(database::CsvTranslator *csv) { tcWeaponDBObject::WriteCSVHeader(csv); Index: tcTorpedoDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcTorpedoDBObject.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcTorpedoDBObject.cpp 7 Dec 2004 04:00:28 -0000 1.2 --- tcTorpedoDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.3 *************** *** 42,46 **** ! namespace Database { --- 42,46 ---- ! namespace database { *************** *** 252,255 **** } ! } // namespace Database --- 252,255 ---- } ! } // namespace database Index: tcRadarDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcRadarDBObject.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** tcRadarDBObject.cpp 29 Nov 2004 03:55:04 -0000 1.15 --- tcRadarDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.16 *************** *** 39,43 **** #endif ! namespace Database { --- 39,43 ---- #endif ! namespace database { *************** *** 189,193 **** } ! int tcRadarDBObject::WriteCSVHeader(Database::CsvTranslator *csv) { tcSensorDBObject::WriteCSVHeader(csv); --- 189,193 ---- } ! int tcRadarDBObject::WriteCSVHeader(database::CsvTranslator *csv) { tcSensorDBObject::WriteCSVHeader(csv); Index: tcDBString.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDBString.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcDBString.cpp 2 Nov 2004 04:23:55 -0000 1.6 --- tcDBString.cpp 1 Jun 2005 00:13:29 -0000 1.7 *************** *** 29,33 **** #endif ! namespace Database { --- 29,33 ---- #endif ! namespace database { Index: tcStoresDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcStoresDBObject.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcStoresDBObject.cpp 2 Dec 2004 04:17:24 -0000 1.2 --- tcStoresDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.3 *************** *** 39,43 **** using namespace std; ! namespace Database { --- 39,43 ---- using namespace std; ! namespace database { *************** *** 136,140 **** ! int tcStoresDBObject::WriteCSVHeader(Database::CsvTranslator *csv) { tcDatabaseObject::WriteCSVHeader(csv); --- 136,140 ---- ! int tcStoresDBObject::WriteCSVHeader(database::CsvTranslator *csv) { tcDatabaseObject::WriteCSVHeader(csv); Index: tcSonarDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcSonarDBObject.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcSonarDBObject.cpp 7 Dec 2004 04:00:28 -0000 1.2 --- tcSonarDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.3 *************** *** 37,41 **** #endif ! namespace Database { --- 37,41 ---- #endif ! namespace database { Index: tcOpticalDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcOpticalDBObject.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcOpticalDBObject.cpp 29 Nov 2004 03:55:04 -0000 1.2 --- tcOpticalDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.3 *************** *** 39,43 **** #endif ! namespace Database { --- 39,43 ---- #endif ! namespace database { Index: tcLauncherDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcLauncherDBObject.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** tcLauncherDBObject.cpp 26 May 2005 11:54:11 -0000 1.15 --- tcLauncherDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.16 *************** *** 41,45 **** using namespace std; ! namespace Database { --- 41,45 ---- using namespace std; ! namespace database { *************** *** 172,176 **** ! int tcLauncherDBObject::WriteCSVHeader(Database::CsvTranslator *csv) { tcDatabaseObject::WriteCSVHeader(csv); --- 172,176 ---- ! int tcLauncherDBObject::WriteCSVHeader(database::CsvTranslator *csv) { tcDatabaseObject::WriteCSVHeader(csv); Index: tcGenericDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcGenericDBObject.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** tcGenericDBObject.cpp 4 Mar 2005 00:46:16 -0000 1.21 --- tcGenericDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.22 *************** *** 43,47 **** using namespace std; ! namespace Database { --- 43,47 ---- using namespace std; ! namespace database { *************** *** 262,266 **** } ! int tcGenericDBObject::SerializeCSV(Database::CsvTranslator *csv, bool mbLoad) { tcDatabaseObject::SerializeCSV(csv, mbLoad); --- 262,266 ---- } ! int tcGenericDBObject::SerializeCSV(database::CsvTranslator *csv, bool mbLoad) { tcDatabaseObject::SerializeCSV(csv, mbLoad); *************** *** 437,441 **** } ! int tcGenericDBObject::WriteCSVHeader(Database::CsvTranslator *csv) { tcDatabaseObject::WriteCSVHeader(csv); --- 437,441 ---- } ! int tcGenericDBObject::WriteCSVHeader(database::CsvTranslator *csv) { tcDatabaseObject::WriteCSVHeader(csv); Index: tcDatabase.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDatabase.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** tcDatabase.cpp 17 Apr 2005 22:35:31 -0000 1.26 --- tcDatabase.cpp 1 Jun 2005 00:13:29 -0000 1.27 *************** *** 61,65 **** using namespace std; ! namespace Database { --- 61,65 ---- using namespace std; ! namespace database { Index: tcFixedDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcFixedDBObject.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tcFixedDBObject.cpp 29 Nov 2004 03:55:04 -0000 1.8 --- tcFixedDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.9 *************** *** 38,42 **** using namespace std; ! namespace Database { --- 38,42 ---- using namespace std; ! namespace database { *************** *** 88,92 **** } ! int tcFixedDBObject::WriteCSVHeader(Database::CsvTranslator *csv) { tcDatabaseObject::WriteCSVHeader(csv); --- 88,92 ---- } ! int tcFixedDBObject::WriteCSVHeader(database::CsvTranslator *csv) { tcDatabaseObject::WriteCSVHeader(csv); Index: tcWeaponDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcWeaponDBObject.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcWeaponDBObject.cpp 7 Dec 2004 04:00:28 -0000 1.7 --- tcWeaponDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.8 *************** *** 40,44 **** using namespace std; ! namespace Database { --- 40,44 ---- using namespace std; ! namespace database { *************** *** 117,121 **** } ! int tcWeaponDBObject::WriteCSVHeader(Database::CsvTranslator *csv) { tcDatabaseObject::WriteCSVHeader(csv); --- 117,121 ---- } ! int tcWeaponDBObject::WriteCSVHeader(database::CsvTranslator *csv) { tcDatabaseObject::WriteCSVHeader(csv); Index: tcFlightportDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcFlightportDBObject.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcFlightportDBObject.cpp 29 Nov 2004 03:55:04 -0000 1.7 --- tcFlightportDBObject.cpp 1 Jun 2005 00:13:29 -0000 1.8 *************** *** 38,42 **** using namespace std; ! namespace Database { --- 38,42 ---- using namespace std; ! namespace database { *************** *** 64,68 **** ! int tcFlightportDBObject::SerializeCSV(Database::CsvTranslator *csv, bool mbLoad) { tcDatabaseObject::SerializeCSV(csv, mbLoad); --- 64,68 ---- ! int tcFlightportDBObject::SerializeCSV(database::CsvTranslator *csv, bool mbLoad) { tcDatabaseObject::SerializeCSV(csv, mbLoad); *************** *** 195,199 **** ! int tcFlightportDBObject::WriteCSVHeader(Database::CsvTranslator *csv) { tcDatabaseObject::WriteCSVHeader(csv); --- 195,199 ---- ! int tcFlightportDBObject::WriteCSVHeader(database::CsvTranslator *csv) { tcDatabaseObject::WriteCSVHeader(csv); |