diff --git a/textmodel.cc b/textmodel.cc
index f9dbae242b007f39c8438e7dfae1708cae626a8c..c02620c36c9e0dd5c97b31c493f3ebddb827eb0a 100644 (file)
--- a/textmodel.cc
+++ b/textmodel.cc
namespace odc {
const std::string TextModel::TYPENAME("TextModels.Model^");
namespace odc {
const std::string TextModel::TYPENAME("TextModels.Model^");
-const TypeProxy<TextModel> TextModel::PROXY;
+const TypeProxy<TextModel, ContainerModel> TextModel::PROXY;
TextModel::TextModel(INTEGER id) : ContainerModel(id) {}
TextModel::TextModel(INTEGER id) : ContainerModel(id) {}
-const std::string &TextModel::getType() {
- return TYPENAME;
-}
-
-const std::string *TextModel::getSuper() {
- return &ContainerModel::getType();
-}
-
const std::string &TextModel::getTypeName() const {
const std::string &TextModel::getTypeName() const {
- return getType();
+ return TYPENAME;
}
void TextModel::internalize(Reader &reader) {
}
void TextModel::internalize(Reader &reader) {
}
const std::string StdTextModel::TYPENAME("TextModels.StdModel^");
}
const std::string StdTextModel::TYPENAME("TextModels.StdModel^");
-const TypeProxy<StdTextModel> StdTextModel::PROXY;
+const TypeProxy<StdTextModel, TextModel> StdTextModel::PROXY;
StdTextModel::StdTextModel(INTEGER id) : TextModel(id), d_pieces() {}
StdTextModel::StdTextModel(INTEGER id) : TextModel(id), d_pieces() {}
-const std::string &StdTextModel::getType() {
- return TYPENAME;
-}
-
-const std::string *StdTextModel::getSuper() {
- return &TextModel::getType();
-}
-
const std::string &StdTextModel::getTypeName() const {
const std::string &StdTextModel::getTypeName() const {
- return getType();
+ return TYPENAME;
}
/*
}
/*
return std::string("LongPiece(FIXME)");// + std::wstring((wchar_t*)d_buf) + std::string(")");
}
return std::string("LongPiece(FIXME)");// + std::wstring((wchar_t*)d_buf) + std::string(")");
}
-std::string LongPiece::getText() const {
- return std::string("FIXME");// + std::wstring((wchar_t*)d_buf) + std::string(")");
+std::wstring LongPiece::getText() const {
+ return std::wstring((wchar_t*)d_buf);
}
void LongPiece::accept(Visitor &visitor) const {
}
void LongPiece::accept(Visitor &visitor) const {