From 867c6635ed0455a2d3bffd8c21e1933b32370708 Mon Sep 17 00:00:00 2001
From: fcolin
Date: Thu, 1 Feb 2007 12:57:05 +0000
Subject:  Utilisateur : Fcolin       Date : 31/01/01   Heure : 11:18 Archivé
 dans $/Ivy (vss 4)

---
 Bus/Ivy/Ivy.h | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

(limited to 'Bus')

diff --git a/Bus/Ivy/Ivy.h b/Bus/Ivy/Ivy.h
index 451a6c7..e2258b7 100644
--- a/Bus/Ivy/Ivy.h
+++ b/Bus/Ivy/Ivy.h
@@ -2,12 +2,9 @@
 //
 //////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_BUS_H__F7F08FE9_E653_11D0_AE3E_080009F92591__INCLUDED_)
-#define AFX_BUS_H__F7F08FE9_E653_11D0_AE3E_080009F92591__INCLUDED_
 
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 #ifdef  WIN32
 #ifdef IVY_EXPORTS
 class _declspec(dllexport) IvyWatcher;
@@ -33,18 +30,18 @@ class Ivy
 {
 private:
 	
-	UINT applicationPort;
+	unsigned short applicationPort;
 	void SendSubscriptions(IvyApplication *app);
 
 public:
 	void AddApplication( IvyApplication *app );
 	void RemoveApplication( IvyApplication *app);
 
-	BOOL CheckConnected( IvyApplication *app );
-	BOOL CheckRegexp( const char *exp );
+	bool CheckConnected( IvyApplication *app );
+	bool CheckRegexp( const char *exp );
 	void CallApplicationConnectedCallback( IvyApplication *app );
 	void CallApplicationDisconnectedCallback( IvyApplication *app );
-	BOOL CallDieCallback( IvyApplication *app, int id, const char *arg );
+	bool CallDieCallback( IvyApplication *app, int id, const char *arg );
 	void CallDirectMessageCallback( IvyApplication *app, int id, const char *arg );
 	void CallMessageCallback( IvyApplication *app, int id, int argc, const char **argv );
 	
@@ -58,7 +55,7 @@ public:
 	int SendMsg( const char *message );
 
 	const char *GetDomain(const char *domainlist);
-	UINT GetApplicationPort();
+	unsigned short GetApplicationPort();
 	int BindMsg( const char *regexp, IvyMessageCallback *cb );
 	void UnbindMsg( int id );
 	Ivy( const char *name, const char* ready, IvyApplicationCallback *callback, bool Synchronous = true );
@@ -67,7 +64,7 @@ public:
 	virtual ~Ivy();
 	
 	/* message a emettre sur connection nouvelle application */
-	String ready_message;
+	string ready_message;
 	
 protected:
 	bool synchronous;		// use Window Shink to made CB mono thread like
@@ -77,22 +74,20 @@ protected:
 	IvyDirectMessageCallback *direct_callback;
 	IvyApplicationCallback *application_callback;
 	/* list des adresses de broadcast */
-	String domain;
+	string domain;
 	/* nom de l'appliction */
-	String appname;
+	string appname;
 	/* liste des clients connectes */
 	CRITICAL_SECTION  m_application_cs;
-	typedef std::list<IvyApplication*> IvyApplicationList;
+	typedef list<IvyApplication*> IvyApplicationList;
 	IvyApplicationList applications;
 
 	/* liste des souscriptions locale a emettre aux autres applications */
-	std::vector<String> regexp_out;
+	vector<string> regexp_out;
 	/* liste des callbacks a appeler */
-	std::vector< IvyMessageCallback* > callbacks;
+	vector< IvyMessageCallback* > callbacks;
 	/* classes de messages emis par l'application utilise pour le filtrage */
 	int messages_classes_count;
 	const char **messages_classes;
 
 };
-
-#endif // !defined(AFX_BUS_H__F7F08FE9_E653_11D0_AE3E_080009F92591__INCLUDED_)
-- 
cgit v1.1