From: stephan b. <sg...@us...> - 2004-12-31 16:18:40
|
Update of /cvsroot/pclasses/pclasses2/include/pclasses/App In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4077/include/pclasses/App Modified Files: AppDetails.h Log Message: Changed some (const String &) returns to (String). Index: AppDetails.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/App/AppDetails.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- AppDetails.h 30 Dec 2004 20:59:28 -0000 1.1 +++ AppDetails.h 31 Dec 2004 16:18:31 -0000 1.2 @@ -1,5 +1,5 @@ -#ifndef App_APPINFO_HPP_INCLUDED -#define App_APPINFO_HPP_INCLUDED 1 +#ifndef p_App_APPINFO_HPP_INCLUDED +#define p_App_APPINFO_HPP_INCLUDED 1 #include <string> #include <list> @@ -41,15 +41,15 @@ const DetailList & getAuthors() const throw(); - const String & getLicenseText() const throw(); + String getLicenseText() const throw(); void setLicenseText( const String & l ) throw(); - const String & getName() const throw(); + String getName() const throw(); void setName( const String & n ) throw(); - const String & getAboutText() const throw(); + String getAboutText() const throw(); void setAboutText( const String & n ) throw(); @@ -59,38 +59,7 @@ AppDetailsHolder * details() const; // performs lazy instantiation of m_detail }; -#define APPDETAIL_S11N_EXPERIMENTATION 0 -#if 1 == APPDETAIL_S11N_EXPERIMENTATION - struct AppDetails_s11n - { - // serialize - template <typename NodeType> - bool operator()( NodeType & dest, const AppDetails & src ) const - { - typedef ::P::s11n::node_traits<NodeType> TR; - TR::class_name( dest, "P::App::AppDetails" ); - TR::set( dest, "name", src.getName() ); - TR::set( dest, "about", src.getAboutText() ); - TR::set( dest, "license", src.getLicenseText() ); - return ::P::s11n::serialize_subnode<NodeType,AppDetails>( dest, "authors", src.getAuthors() ); - } - - // deserialize - template <typename NodeType> - bool operator()( const NodeType & src, AppDetails & dest ) const - { - typedef ::P::s11n::node_traits<NodeType> TR; - dest.setName( TR::get( src, "name", dest.getName() ) ); - dest.setAboutText( TR::get( src, "about", dest.getAboutText() ) ); - dest.setLicenseText( TR::get( src, "license", dest.getLicenseText() ) ); - return ::P::s11n::deserialize_subnode<NodeType,AppDetails>( src, "authors", src.getAuthors() ); - } - }; // AppDetails_s11n -#endif // APPDETAIL_S11N_EXPERIMENTATION - - }} // namespace P::App - -#endif // App_APPINFO_HPP_INCLUDED +#endif // p_App_APPINFO_HPP_INCLUDED |