X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=fold.h;h=79ee7354cc7c0c005f30f859ab5799240e83c101;hb=e2fd5debfd8b94a6ec77a514962851594f0690f0;hp=589b76b28783fa740cb718e700231fbb09a9d0d8;hpb=d7f2452e20b04d1559b7bdd3aa49b6fbf7d0abaf;p=odcread.git

diff --git a/fold.h b/fold.h
index 589b76b..79ee735 100644
--- a/fold.h
+++ b/fold.h
@@ -9,31 +9,29 @@ namespace odc {
 
 	class View : public Store {
 		private:
-		static const std::string TYPENAME;
-		static const TypeProxy<View> PROXY;
+		static const TypeProxy<View, Store> PROXY;
 
 		public:
-		View(INTEGER id);
-		static const std::string &getType();
-		static const std::string *getSuper();
+		static const std::string TYPENAME;
 		virtual const std::string &getTypeName() const;
+
+		View(INTEGER id);
 		virtual void internalize(Reader &reader);
 	};
 
 	class Fold : public View {
 		private:
-		static const std::string TYPENAME;
-		static const TypeProxy<Fold> PROXY;
+		static const TypeProxy<Fold, View> PROXY;
 
 		Store *d_hidden;
 		SHORTCHAR *d_label;
 		bool d_collapsed;
 
 		public:
-		Fold(INTEGER id);
-		static const std::string &getType();
-		static const std::string *getSuper();
+		static const std::string TYPENAME;
 		virtual const std::string &getTypeName() const;
+
+		Fold(INTEGER id);
 		virtual void internalize(Reader &reader);
 
 		virtual std::string toString();