X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=textmodel.h;h=abfe13d24f6c6ad38b2dae6a333c05d88aa076c8;hb=75cf4599cf50d987efa2e402243c2680640ef339;hp=92d387a61b5596595b4dd985c9f1c36692671755;hpb=d7f2452e20b04d1559b7bdd3aa49b6fbf7d0abaf;p=odcread.git

diff --git a/textmodel.h b/textmodel.h
index 92d387a..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);
 	};
 
@@ -37,7 +36,7 @@ namespace odc {
 		~LongPiece();
 		virtual void read(Reader &reader);
 		virtual std::string toString() const;
-		virtual std::string getText() const;
+		virtual std::wstring getText() const;
 		virtual void accept(Visitor &visitor) const;
 	};
 
@@ -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();