- MZeroedObject used instead of the operator new() inlining

- SAFE_DELETE of local objects removed from ICQ

git-svn-id: http://svn.miranda-ng.org/main/trunk@1092 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 5 insertions, 13 deletions

diff --git a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.h b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.h
index 93fc3ba8c7..5820a5f85c 100644
--- a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.h
+++ b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.h
@@ -53,17 +53,14 @@
 #define FLAG_MONITORMIRANDA			64 // db: monitor miranda activity only

 #define FLAG_ONLOCK					128 // db: on work station lock

 

-struct TAAAProtoSetting : public PROTOCOLSETTINGEX 

+struct TAAAProtoSetting : public PROTOCOLSETTINGEX, public MZeroedObject

 {

 	TAAAProtoSetting( PROTOACCOUNT* pa );

 	~TAAAProtoSetting();

 

-	__inline void* operator new( size_t size ) {	return calloc( 1, size ); }

-	__inline void operator delete( void* p ) { free( p ); }

-

 	int originalStatusMode;

-	STATES 

-		oldState, 

+	STATES

+		oldState,

 		curState;

 	BOOL statusChanged; // AAA changed the status, don't update mStatus

 	BOOL mStatus; // status changed manually or not ?

diff --git a/plugins/StatusPlugins/StartupStatus/startupstatus.h b/plugins/StatusPlugins/StartupStatus/startupstatus.h
index 640638f788..69cd54b392 100644
--- a/plugins/StatusPlugins/StartupStatus/startupstatus.h
+++ b/plugins/StatusPlugins/StartupStatus/startupstatus.h
@@ -29,14 +29,11 @@
 

 #define MODULENAME						"StartupStatus"

 

-struct TSSSetting : public PROTOCOLSETTINGEX

+struct TSSSetting : public PROTOCOLSETTINGEX, public MZeroedObject

 {

 	TSSSetting( PROTOACCOUNT* pa );

 	TSSSetting( int profile, PROTOACCOUNT* pa );

 	~TSSSetting();

-

-	__inline void* operator new( size_t size ) {	return calloc( 1, size ); }

-	__inline void operator delete( void* p ) { free( p ); }

 };

 

 typedef OBJLIST<TSSSetting> TSettingsList;

@@ -48,10 +45,8 @@ struct PROFILECE
 	TCHAR *msg;

 };

 

-struct PROFILEOPTIONS

+struct PROFILEOPTIONS : public MZeroedObject

 {

-	__inline void* operator new( size_t size ) {	return mir_calloc(size); }

-	__inline void operator delete( void* p ) { mir_free(p); }

 	__inline ~PROFILEOPTIONS()

 	{

 		delete ps;