diff --git a/textmodel.h b/textmodel.h
index 92d387a61b5596595b4dd985c9f1c36692671755..abfe13d24f6c6ad38b2dae6a333c05d88aa076c8 100644 (file)
--- a/textmodel.h
+++ b/textmodel.h
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);
};
~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;
};
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();