git-svn-id: svn://db.shs.com.ru/pip@803 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

src_main/introspection/piintrospection_server.h

@@ -21,21 +21,35 @@
 #define PIINTROSPECTION_SERVER_H
 
 #include "pipeer.h"
-#include "pimutex.h"
 
-class __PIIntrospectionServer__;
+class PIIntrospectionServer;
 
+#define PIINTROSPECTION_SERVER (PIIntrospectionServer::instance())
+
+#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)
+#  define PIINTROSPECTION_START PIINTROSPECTION_SERVER->start();
+#else
+#  define PIINTROSPECTION_START
+#endif
 
 class PIP_EXPORT PIIntrospectionServer: public PIPeer {
 	PIOBJECT_SUBCLASS(PIIntrospectionServer, PIPeer)
-	friend class __PIIntrospectionServer__;
-	PIIntrospectionServer();
 public:
-	PIString appname;
+	static PIIntrospectionServer * instance() {static PIIntrospectionServer ret; return &ret;}
+
+	void start();
+
 private:
+	PIIntrospectionServer();
+	~PIIntrospectionServer();
+	NO_COPY_CLASS(PIIntrospectionServer)
+
 	EVENT_HANDLER(void, timerEvent);
 	PIString genName();
+
+	PRIVATE_DECLARATION
 	PITimer itimer;
+
 };
 
 #endif // PIINTROSPECTION_SERVER_H