[Epp-rtk-cpp-commits] CVS: epp-rtk/c++/src/data epp_ContactPhone.h,NONE,1.1 epp_ContactCreateReq.h,1.5,1.6 epp_ContactInfoRsp.h,1.5,1.6 epp_ContactUpdateChange.h,1.5,1.6 epp_ContactVoice.h,1.5,1.6

[Asbjorn M. <ste...@us...>]

Update of /cvsroot/epp-rtk/epp-rtk/c++/src/data
In directory usw-pr-cvs1:/tmp/cvs-serv30460

Modified Files:
	epp_ContactCreateReq.h epp_ContactInfoRsp.h 
	epp_ContactUpdateChange.h epp_ContactVoice.h 
Added Files:
	epp_ContactPhone.h 
Log Message:
* Added class epp_ContactPhone and deprecated epp_ContactVoice.
* Started using the new class instead in referring classes.
* Changed m_fax to be a epp_ContactPhone instead of epp_string.


--- NEW FILE: epp_ContactPhone.h ---
/************************************************************************
* EPP RTK C++
* Copyright (C) 2001 Global Name Registry 
* 
* This library is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*
* Contact information:  ep...@gn...
*
*                       EPP RTK
*                       GNR Ltd.
*                       125 High Holborn
*                       London WC1V 6QA
*                       United Kingdom
************************************************************************/

#ifndef __EPP_CONTACTPHONE_H
#define __EPP_CONTACTPHONE_H

#include "epp_contactdata.h"

namespace eppobject { namespace contact {
   
   class epp_ContactPhone {
    public:
      
      eppobject::epp::epp_string_ref m_extension;
      eppobject::epp::epp_string_ref m_value;
      
      epp_ContactPhone() {};
      
      virtual ~epp_ContactPhone() {};
      
      // Note: Cannot set simple types to NULL
      epp_ContactPhone(eppobject::epp::epp_string _m_extension,
		       eppobject::epp::epp_string _m_value)
	{
	   m_extension.ref(new eppobject::epp::epp_string(_m_extension));
	   m_value.ref(new eppobject::epp::epp_string(_m_value));
	};
      
      
      epp_ContactPhone(eppobject::epp::epp_string_ref _m_extension,
		       eppobject::epp::epp_string_ref _m_value)
	{
	   m_extension = _m_extension;
	   m_value = _m_value;
	};
   };
   
   typedef refcnt_ptr<epp_ContactPhone> epp_ContactPhone_ref;
   
}};

#endif

Index: epp_ContactCreateReq.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_ContactCreateReq.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** epp_ContactCreateReq.h	9 Jul 2001 14:17:18 -0000	1.5
--- epp_ContactCreateReq.h	7 Feb 2002 18:12:54 -0000	1.6
***************
*** 32,36 ****
  #include "epp_Command.h"
  #include "epp_ContactNameAddress.h"
! #include "epp_ContactVoice.h"
  #include "epp_AuthInfo.h"
  
--- 32,36 ----
  #include "epp_Command.h"
  #include "epp_ContactNameAddress.h"
! #include "epp_ContactPhone.h"
  #include "epp_AuthInfo.h"
  
***************
*** 43,48 ****
        epp_ContactNameAddress_ref m_ascii_address;
        epp_ContactNameAddress_ref m_i15d_address;
!       epp_ContactVoice_ref m_voice;
!       eppobject::epp::epp_string_ref m_fax;
        eppobject::epp::epp_string_ref m_email;
        eppobject::epp::epp_AuthInfo_ref m_auth_info;
--- 43,48 ----
        epp_ContactNameAddress_ref m_ascii_address;
        epp_ContactNameAddress_ref m_i15d_address;
!       epp_ContactPhone_ref m_voice;
!       epp_ContactPhone_ref m_fax;
        eppobject::epp::epp_string_ref m_email;
        eppobject::epp::epp_AuthInfo_ref m_auth_info;
***************
*** 56,61 ****
  			   epp_ContactNameAddress_ref _m_ascii_address,
  			   epp_ContactNameAddress_ref _m_i15d_address,
! 			   epp_ContactVoice_ref _m_voice,
! 			   eppobject::epp::epp_string _m_fax,
  			   eppobject::epp::epp_string _m_email,
  			   eppobject::epp::epp_AuthInfo_ref _m_auth_info)
--- 56,61 ----
  			   epp_ContactNameAddress_ref _m_ascii_address,
  			   epp_ContactNameAddress_ref _m_i15d_address,
! 			   epp_ContactPhone_ref _m_voice,
! 			   epp_ContactPhone_ref _m_fax,
  			   eppobject::epp::epp_string _m_email,
  			   eppobject::epp::epp_AuthInfo_ref _m_auth_info)
***************
*** 65,69 ****
  	   m_i15d_address = _m_i15d_address;
  	   m_voice = _m_voice;
! 	   m_fax.ref(new eppobject::epp::epp_string(_m_fax));
  	   m_email.ref(new eppobject::epp::epp_string(_m_email));
  	   m_auth_info = _m_auth_info;
--- 65,69 ----
  	   m_i15d_address = _m_i15d_address;
  	   m_voice = _m_voice;
! 	   m_fax = _m_fax;
  	   m_email.ref(new eppobject::epp::epp_string(_m_email));
  	   m_auth_info = _m_auth_info;
***************
*** 74,79 ****
  			   epp_ContactNameAddress_ref _m_ascii_address,
  			   epp_ContactNameAddress_ref _m_i15d_address,
! 			   epp_ContactVoice_ref _m_voice,
! 			   eppobject::epp::epp_string_ref _m_fax,
  			   eppobject::epp::epp_string_ref _m_email,
  			   eppobject::epp::epp_AuthInfo_ref _m_auth_info)
--- 74,79 ----
  			   epp_ContactNameAddress_ref _m_ascii_address,
  			   epp_ContactNameAddress_ref _m_i15d_address,
! 			   epp_ContactPhone_ref _m_voice,
! 			   epp_ContactPhone_ref _m_fax,
  			   eppobject::epp::epp_string_ref _m_email,
  			   eppobject::epp::epp_AuthInfo_ref _m_auth_info)

Index: epp_ContactInfoRsp.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_ContactInfoRsp.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** epp_ContactInfoRsp.h	9 Jul 2001 14:17:18 -0000	1.5
--- epp_ContactInfoRsp.h	7 Feb 2002 18:12:55 -0000	1.6
***************
*** 32,36 ****
  #include "epp_Response.h"
  #include "epp_ContactNameAddress.h"
! #include "epp_ContactVoice.h"
  #include "epp_AuthInfo.h"
  #include "epp_ContactStatus.h"
--- 32,36 ----
  #include "epp_Response.h"
  #include "epp_ContactNameAddress.h"
! #include "epp_ContactPhone.h"
  #include "epp_AuthInfo.h"
  #include "epp_ContactStatus.h"
***************
*** 44,49 ****
        epp_ContactNameAddress_ref m_ascii_address;
        epp_ContactNameAddress_ref m_i15d_address;
!       epp_ContactVoice_ref m_voice;
!       eppobject::epp::epp_string_ref m_fax;
        eppobject::epp::epp_string_ref m_email;
        epp_contact_status_seq_ref m_status;
--- 44,49 ----
        epp_ContactNameAddress_ref m_ascii_address;
        epp_ContactNameAddress_ref m_i15d_address;
!       epp_ContactPhone_ref m_voice;
!       epp_ContactPhone_ref m_fax;
        eppobject::epp::epp_string_ref m_email;
        epp_contact_status_seq_ref m_status;
***************
*** 67,72 ****
  			 epp_ContactNameAddress_ref _m_ascii_address,
  			 epp_ContactNameAddress_ref _m_i15d_address,
! 			 epp_ContactVoice_ref _m_voice,
! 			 eppobject::epp::epp_string _m_fax,
  			 eppobject::epp::epp_string _m_email,
  			 epp_contact_status_seq_ref _m_status,
--- 67,72 ----
  			 epp_ContactNameAddress_ref _m_ascii_address,
  			 epp_ContactNameAddress_ref _m_i15d_address,
! 			 epp_ContactPhone_ref _m_voice,
! 			 epp_ContactPhone_ref _m_fax,
  			 eppobject::epp::epp_string _m_email,
  			 epp_contact_status_seq_ref _m_status,
***************
*** 85,89 ****
  	   m_i15d_address = _m_i15d_address;
  	   m_voice = _m_voice;
! 	   m_fax.ref(new eppobject::epp::epp_string(_m_fax));
  	   m_email.ref(new eppobject::epp::epp_string(_m_email));
  	   m_status = _m_status;
--- 85,89 ----
  	   m_i15d_address = _m_i15d_address;
  	   m_voice = _m_voice;
! 	   m_fax = _m_fax;
  	   m_email.ref(new eppobject::epp::epp_string(_m_email));
  	   m_status = _m_status;
***************
*** 103,108 ****
  			 epp_ContactNameAddress_ref _m_ascii_address,
  			 epp_ContactNameAddress_ref _m_i15d_address,
! 			 epp_ContactVoice_ref _m_voice,
! 			 eppobject::epp::epp_string_ref _m_fax,
  			 eppobject::epp::epp_string_ref _m_email,
  			 epp_contact_status_seq_ref _m_status,
--- 103,108 ----
  			 epp_ContactNameAddress_ref _m_ascii_address,
  			 epp_ContactNameAddress_ref _m_i15d_address,
! 			 epp_ContactPhone_ref _m_voice,
! 		         epp_ContactPhone_ref _m_fax,
  			 eppobject::epp::epp_string_ref _m_email,
  			 epp_contact_status_seq_ref _m_status,

Index: epp_ContactUpdateChange.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_ContactUpdateChange.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** epp_ContactUpdateChange.h	9 Jul 2001 14:17:18 -0000	1.5
--- epp_ContactUpdateChange.h	7 Feb 2002 18:12:55 -0000	1.6
***************
*** 31,35 ****
  #include "epp_contactdata.h"
  #include "epp_ContactNameAddress.h"
! #include "epp_ContactVoice.h"
  #include "epp_AuthInfo.h"
  
--- 31,35 ----
  #include "epp_contactdata.h"
  #include "epp_ContactNameAddress.h"
! #include "epp_ContactPhone.h"
  #include "epp_AuthInfo.h"
  
***************
*** 41,46 ****
        epp_ContactNameAddress_ref m_ascii_address;
        epp_ContactNameAddress_ref m_i15d_address;
!       epp_ContactVoice_ref m_voice;
!       eppobject::epp::epp_string_ref m_fax;
        eppobject::epp::epp_string_ref m_email;
        eppobject::epp::epp_AuthInfo_ref m_auth_info;
--- 41,46 ----
        epp_ContactNameAddress_ref m_ascii_address;
        epp_ContactNameAddress_ref m_i15d_address;
!       epp_ContactPhone_ref m_voice;
!       epp_ContactPhone_ref m_fax;
        eppobject::epp::epp_string_ref m_email;
        eppobject::epp::epp_AuthInfo_ref m_auth_info;
***************
*** 53,58 ****
        epp_ContactUpdateChange(epp_ContactNameAddress_ref _m_ascii_address,
  			      epp_ContactNameAddress_ref _m_i15d_address,
! 			      epp_ContactVoice_ref _m_voice,
! 			      eppobject::epp::epp_string _m_fax,
  			      eppobject::epp::epp_string _m_email,
  			      eppobject::epp::epp_AuthInfo_ref _m_auth_info)
--- 53,58 ----
        epp_ContactUpdateChange(epp_ContactNameAddress_ref _m_ascii_address,
  			      epp_ContactNameAddress_ref _m_i15d_address,
! 			      epp_ContactPhone_ref _m_voice,
! 			      epp_ContactPhone_ref _m_fax,
  			      eppobject::epp::epp_string _m_email,
  			      eppobject::epp::epp_AuthInfo_ref _m_auth_info)
***************
*** 61,65 ****
  	   m_i15d_address = _m_i15d_address;
  	   m_voice = _m_voice;
! 	   m_fax.ref(new eppobject::epp::epp_string(_m_fax));
  	   m_email.ref(new eppobject::epp::epp_string(_m_email));
  	   m_auth_info = _m_auth_info;
--- 61,65 ----
  	   m_i15d_address = _m_i15d_address;
  	   m_voice = _m_voice;
! 	   m_fax = _m_fax;
  	   m_email.ref(new eppobject::epp::epp_string(_m_email));
  	   m_auth_info = _m_auth_info;
***************
*** 69,74 ****
        epp_ContactUpdateChange(epp_ContactNameAddress_ref _m_ascii_address,
  			      epp_ContactNameAddress_ref _m_i15d_address,
! 			      epp_ContactVoice_ref _m_voice,
! 			      eppobject::epp::epp_string_ref _m_fax,
  			      eppobject::epp::epp_string_ref _m_email,
  			      eppobject::epp::epp_AuthInfo_ref _m_auth_info)
--- 69,74 ----
        epp_ContactUpdateChange(epp_ContactNameAddress_ref _m_ascii_address,
  			      epp_ContactNameAddress_ref _m_i15d_address,
! 			      epp_ContactPhone_ref _m_voice,
! 			      epp_ContactPhone_ref _m_fax,
  			      eppobject::epp::epp_string_ref _m_email,
  			      eppobject::epp::epp_AuthInfo_ref _m_auth_info)

Index: epp_ContactVoice.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_ContactVoice.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** epp_ContactVoice.h	9 Jul 2001 14:17:18 -0000	1.5
--- epp_ContactVoice.h	7 Feb 2002 18:12:55 -0000	1.6
***************
*** 29,36 ****
--- 29,43 ----
  #define __EPP_CONTACTVOICE_H
  
+ /** @file epp_ContactVoice.h
+  *  @brief Deprecated! Definition of epp_ContactVoice and epp_ContactVoice_ref
+  *  @author Asbjorn Steira Mikkelsen
+  *  @deprecated Replaced by epp_ContactPhone.h
+  */
+ 
  #include "epp_contactdata.h"
  
  namespace eppobject { namespace contact {
     
+    /** @deprecated Replaced by epp_ContactPhone */
     class epp_ContactVoice {
      public: