qtcsharp-patches

[Andreas H. <ah...@us...>]

Update of /cvsroot/qtcsharp/Bugtussle/src/static/clib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv507/src/static/clib

Modified Files:
	signalhookbase.cpp signalhookbase.h 
Log Message:
Update

Index: signalhookbase.h
===================================================================
RCS file: /cvsroot/qtcsharp/Bugtussle/src/static/clib/signalhookbase.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** signalhookbase.h	18 Aug 2004 22:16:12 -0000	1.2
--- signalhookbase.h	13 Oct 2004 15:10:35 -0000	1.3
***************
*** 7,11 ****
  class SignalHookBase;
  
! typedef void(*objectDestroyedHook)(SignalHookBase* hook, QObject* obj);
  
  class SignalHookBase: public QObject
--- 7,11 ----
  class SignalHookBase;
  
! typedef void(*objectDestroyedHook)(void* hook, QObject* obj);
  
  class SignalHookBase: public QObject
***************
*** 17,23 ****
  
  public:
! 	inline void setObjectDestroyed(objectDestroyedHook hook)
  	{
! 		objectDestroyed = hook;
  	}
  
--- 17,24 ----
  
  public:
! 	inline void setObjectDestroyed(void* hookData, objectDestroyedHook hook)
  	{
! 		objectDestroyedCallbackData = hookData;
! 		objectDestroyedCallback = hook;
  	}
  
***************
*** 36,44 ****
  
  private:
! 	objectDestroyedHook objectDestroyed;
  protected:
  	QObject* owner;
  };
  
- 
  #endif
--- 37,45 ----
  
  private:
! 	objectDestroyedHook objectDestroyedCallback;
! 	void* objectDestroyedCallbackData;
  protected:
  	QObject* owner;
  };
  
  #endif

Index: signalhookbase.cpp
===================================================================
RCS file: /cvsroot/qtcsharp/Bugtussle/src/static/clib/signalhookbase.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** signalhookbase.cpp	18 Aug 2004 22:09:55 -0000	1.3
--- signalhookbase.cpp	13 Oct 2004 15:10:35 -0000	1.4
***************
*** 12,17 ****
  }
  
! void QTC_EXPORT SignalHookBase_setObjectDestroyed(SignalHookBase* handle, objectDestroyedHook hook) {
! 	handle->setObjectDestroyed(hook);
  }
  
--- 12,17 ----
  }
  
! void QTC_EXPORT SignalHookBase_setObjectDestroyed(SignalHookBase* handle, void* hookData, objectDestroyedHook hook) {
! 	handle->setObjectDestroyed(hookData, hook);
  }
  
***************
*** 43,48 ****
  void SignalHookBase::ObjectDestroyedSlot(QObject* obj)
  {
! 	if(objectDestroyed)
! 		objectDestroyed(this, obj);
  	delete this;
  }
--- 43,48 ----
  void SignalHookBase::ObjectDestroyedSlot(QObject* obj)
  {
! 	if(objectDestroyedCallback)
! 		objectDestroyedCallback(objectDestroyedCallbackData ? objectDestroyedCallbackData : this, obj);
  	delete this;
  }