X-Git-Url: http://deadsoftware.ru/gitweb?p=odcread.git;a=blobdiff_plain;f=textmodel.h;h=abfe13d24f6c6ad38b2dae6a333c05d88aa076c8;hp=07a8f646c56760606adf5607623a3a5260dd7d46;hb=2466c23751f131a07432df964658c2de90315e7b;hpb=c71568094a35bbda781ac2070e50a59a3b5ac9f7

diff --git a/textmodel.h b/textmodel.h
index 07a8f64..abfe13d 100644
--- a/textmodel.h
+++ b/textmodel.h
@@ -9,14 +9,13 @@ namespace odc {
 
 	class TextModel : public ContainerModel {
 		private:
-		static const std::string TYPENAME;
-		static const TypeProxy<TextModel> PROXY;
+		static const TypeProxy<TextModel, ContainerModel> PROXY;
 
 		public:
-		TextModel(INTEGER id);
-		static const std::string &getType();
-		static const std::string *getSuper();
+		static const std::string TYPENAME;
 		virtual const std::string &getTypeName() const;
+
+		TextModel(INTEGER id);
 		virtual void internalize(Reader &reader);
 	};
 
@@ -64,15 +63,14 @@ namespace odc {
 
 	class StdTextModel : public TextModel {
 		private:
-		static const std::string TYPENAME;
-		static const TypeProxy<StdTextModel> PROXY;
+		static const TypeProxy<StdTextModel, TextModel> PROXY;
 		std::vector<TextPiece *> d_pieces;
 
 		public:
-		StdTextModel(INTEGER id);
-		static const std::string &getType();
-		static const std::string *getSuper();
+		static const std::string TYPENAME;
 		virtual const std::string &getTypeName() const;
+
+		StdTextModel(INTEGER id);
 		virtual void internalize(Reader &reader);
 
 		virtual std::string toString();