gcblue-commits

[Xavi <xr...@us...>]

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

Modified Files:
	tcDatabaseObject.cpp 
Log Message:
newline at the end of file
added ifdef where needed

Index: tcDatabaseObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDatabaseObject.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcDatabaseObject.cpp	25 Mar 2004 01:33:39 -0000	1.6
--- tcDatabaseObject.cpp	28 Mar 2004 18:57:02 -0000	1.7
***************
*** 22,27 ****
  #include "stdwx.h"
  
! 
  #pragma warning(disable:4786) // suppress warning for STL bug in VC6, see Q167355 in the MSDN Library.
  
  #include "tcDatabaseObject.h"
--- 22,29 ----
  #include "stdwx.h"
  
! #if _MSC_VER > 1000
  #pragma warning(disable:4786) // suppress warning for STL bug in VC6, see Q167355 in the MSDN Library.
+ #endif 
+ 
  
  #include "tcDatabaseObject.h"
***************
*** 29,33 ****
  #include "math_constants.h"
  #include "randfn.h"
! //#include "aerror.h"
  #include <iostream>
  #include <fstream>
--- 31,35 ----
  #include "math_constants.h"
  #include "randfn.h"
! //#include "AError.h"
  #include <iostream>
  #include <fstream>
***************
*** 209,231 ****
          return 1;
      }
! 
!     /**
!     * Loads/saves XML data for database object
!     * @param load true to load, false to save
!     */
!     void tcDatabaseObject::SerializeXml(TiXmlElement* node, bool load)
!     {
!         if (load) return; // write only for now
!         wxASSERT(node);
! 
!         node->SetAttribute("DBCLASS", mzClass.mz);
!         node->SetAttribute("MODELTYPE", int(mnModelType));
!         node->SetAttribute("FUNCTYPE", int(mnType));
!         node->SetAttribute("IMAGE", mzImageFileName.mz);
!         node->SetAttribute("3DMODEL", mz3DModelFileName.mz);
!         TiXmlNode* descriptionNode = node->InsertEndChild(TiXmlElement("DESCRIPTION"));
!         descriptionNode->InsertEndChild(TiXmlText(mzDescription));
      }
!     
      int tcDatabaseObject::WriteCSVHeader(Database::CsvTranslator *csv)
      {
--- 211,234 ----
          return 1;
      }
!         
! 	/** 
!     * Loads/saves XML data for database object 
!     * @param load true to load, false to save
!     */
! 
!     void tcDatabaseObject::SerializeXml(TiXmlElement* node, bool load)
!     {
!         if (load) return; // write only for now
!         wxASSERT(node);
! 
!         node->SetAttribute("DBCLASS", mzClass.mz);
!         node->SetAttribute("MODELTYPE", int(mnModelType));
!         node->SetAttribute("FUNCTYPE", int(mnType));
!         node->SetAttribute("IMAGE", mzImageFileName.mz);
!         node->SetAttribute("3DMODEL", mz3DModelFileName.mz);
!         TiXmlNode* descriptionNode = node->InsertEndChild(TiXmlElement("DESCRIPTION"));
!         descriptionNode->InsertEndChild(TiXmlText(mzDescription));
      }
! 
      int tcDatabaseObject::WriteCSVHeader(Database::CsvTranslator *csv)
      {
***************
*** 275,277 ****
      
      
! }
\ No newline at end of file
--- 278,280 ----
      
      
! }