git-svn-id: svn://db.shs.com.ru/libs@389 a8b55f48-bf90-11e4-a774-851b48703e85

cd_utils/cdutils_c.h

@@ -9,18 +9,10 @@ namespace CDUtils {
 
 class CInterface: public Interface
 {
-	PIOBJECT(CDUtils::CInterface)
+	PIOBJECT_SUBCLASS(CInterface, Interface)
 public:
 	CInterface();
 
-	EVENT(sended)
-	EVENT(sendFailed)
-	EVENT(received)
-	EVENT(receiveFailed)
-	EVENT1(keepNamesRequest, bool*, cn)
-	EVENT_HANDLER(void, send);
-	EVENT_HANDLER(void, request);
-
 	void sendCommand(const CDType & c);
 	void connect(const CDType & c, PIObject * o, Handler eh);
 	void autoConnect(PIObject * o, const PIString & prefix = PIStringAscii("c_"));