unused MODULENAME macros removed

2 files changed, 51 insertions, 51 deletions

diff --git a/plugins/SkypeStatusChange/src/main.cpp b/plugins/SkypeStatusChange/src/main.cpp
index 9ddbc28fcd..1abb83ad54 100644
--- a/plugins/SkypeStatusChange/src/main.cpp
+++ b/plugins/SkypeStatusChange/src/main.cpp
@@ -33,7 +33,7 @@ static PLUGININFOEX pluginInfoEx =
 };

 

 CMPlugin::CMPlugin() :

-	PLUGIN<CMPlugin>(MODULENAME, pluginInfoEx)

+	PLUGIN<CMPlugin>("Change Skype Status", pluginInfoEx)

 {}

 

 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/plugins/SkypeStatusChange/src/stdafx.h b/plugins/SkypeStatusChange/src/stdafx.h
index d33c1cef9f..1aaead0247 100644
--- a/plugins/SkypeStatusChange/src/stdafx.h
+++ b/plugins/SkypeStatusChange/src/stdafx.h
@@ -15,8 +15,6 @@
 #include <m_utils.h>

 #include <win2k.h>

 

-#define MODULENAME "Change Skype Status"

-

 struct CMPlugin : public PLUGIN<CMPlugin>

 {

 	CMPlugin();

@@ -28,35 +26,34 @@ class COptions
 {

 	enum

 	{

-		cssOnline		= 0x00000001,

-		cssOffline		= 0x00000002,

-		cssInvisible	= 0x00000004,

-		cssShortAway	= 0x00000008,

-		cssLongAway		= 0x00000010,

-		cssLightDND		= 0x00000020,

-		cssHeavyDND		= 0x00000040,

-		cssFreeChart	= 0x00000080,

-		cssOutToLunch	= 0x00000100,

-		cssOnThePhone	= 0x00000200,

-		cssIdle			= 0x00000400,

-		cssAll			= 0x80000000

+		cssOnline = 0x00000001,

+		cssOffline = 0x00000002,

+		cssInvisible = 0x00000004,

+		cssShortAway = 0x00000008,

+		cssLongAway = 0x00000010,

+		cssLightDND = 0x00000020,

+		cssHeavyDND = 0x00000040,

+		cssFreeChart = 0x00000080,

+		cssOutToLunch = 0x00000100,

+		cssOnThePhone = 0x00000200,

+		cssIdle = 0x00000400,

+		cssAll = 0x80000000

 	};

 

 	static unsigned long Status2Flag(int status)

 	{

-		switch(status)

-		{

-			case ID_STATUS_ONLINE: return cssOnline;

-			case ID_STATUS_OFFLINE: return cssOffline;

-			case ID_STATUS_INVISIBLE: return cssInvisible;

-			case ID_STATUS_OUTTOLUNCH: return cssOutToLunch;

-			case ID_STATUS_ONTHEPHONE: return cssOnThePhone;

-			case ID_STATUS_AWAY: return cssShortAway;

-			case ID_STATUS_NA: return cssLongAway;

-			case ID_STATUS_OCCUPIED: return cssLightDND;

-			case ID_STATUS_DND: return cssHeavyDND;

-			case ID_STATUS_FREECHAT: return cssFreeChart;

-			case ID_STATUS_IDLE: return cssIdle;

+		switch (status) {

+		case ID_STATUS_ONLINE: return cssOnline;

+		case ID_STATUS_OFFLINE: return cssOffline;

+		case ID_STATUS_INVISIBLE: return cssInvisible;

+		case ID_STATUS_OUTTOLUNCH: return cssOutToLunch;

+		case ID_STATUS_ONTHEPHONE: return cssOnThePhone;

+		case ID_STATUS_AWAY: return cssShortAway;

+		case ID_STATUS_NA: return cssLongAway;

+		case ID_STATUS_OCCUPIED: return cssLightDND;

+		case ID_STATUS_DND: return cssHeavyDND;

+		case ID_STATUS_FREECHAT: return cssFreeChart;

+		case ID_STATUS_IDLE: return cssIdle;

 		}

 		return 0;

 	}

@@ -66,7 +63,8 @@ class COptions
 		PrevStatus(const char *_proto, int _status) :

 			szProto(mir_strdup(_proto)),

 			iStatus(_status)

-		{}

+		{

+		}

 

 		ptrA szProto;

 		int iStatus;

@@ -74,69 +72,71 @@ class COptions
 

 	OBJLIST<PrevStatus> m_aProtocol2Status;

 	static int CompareStatuses(const PrevStatus *p1, const PrevStatus *p2)

-	{	return mir_strcmp(p1->szProto, p2->szProto);

+	{

+		return mir_strcmp(p1->szProto, p2->szProto);

 	}

 

 public:

 	COptions() :

 		m_aProtocol2Status(3, CompareStatuses)

-		{}

+	{

+	}

 

 	bool IsProtocolExcluded(const char* pszProtocol)const

 	{

-		DWORD dwSettings = db_get_dw(NULL,pszProtocol,"ChangeSkypeStatus_Exclusions",0);

+		DWORD dwSettings = db_get_dw(NULL, pszProtocol, "ChangeSkypeStatus_Exclusions", 0);

 		return ((dwSettings&cssAll) ? true : false);

 	}

 

-	bool IsProtocolStatusExcluded(const char* pszProtocol,int nStatus)const

+	bool IsProtocolStatusExcluded(const char* pszProtocol, int nStatus)const

 	{

-		DWORD dwSettings = db_get_dw(NULL,pszProtocol,"ChangeSkypeStatus_Exclusions",0);

+		DWORD dwSettings = db_get_dw(NULL, pszProtocol, "ChangeSkypeStatus_Exclusions", 0);

 		return ((dwSettings&Status2Flag(nStatus)) ? true : false);

 	}

 

-	void ExcludeProtocol(const char* pszProtocol,bool bExclude)

+	void ExcludeProtocol(const char* pszProtocol, bool bExclude)

 	{

-		DWORD dwSettings = db_get_dw(NULL,pszProtocol,"ChangeSkypeStatus_Exclusions",0);

+		DWORD dwSettings = db_get_dw(NULL, pszProtocol, "ChangeSkypeStatus_Exclusions", 0);

 		if (bExclude)

-			dwSettings |=cssAll;

+			dwSettings |= cssAll;

 		else

 			dwSettings &= ~cssAll;

 

-		db_set_dw(NULL,pszProtocol,"ChangeSkypeStatus_Exclusions",dwSettings);

+		db_set_dw(NULL, pszProtocol, "ChangeSkypeStatus_Exclusions", dwSettings);

 	}

 

-	void ExcludeProtocolStatus(const char* pszProtocol,int nStatus,bool bExclude)

+	void ExcludeProtocolStatus(const char* pszProtocol, int nStatus, bool bExclude)

 	{

-		DWORD dwSettings = db_get_dw(NULL,pszProtocol,"ChangeSkypeStatus_Exclusions",0);

+		DWORD dwSettings = db_get_dw(NULL, pszProtocol, "ChangeSkypeStatus_Exclusions", 0);

 		if (bExclude)

-			dwSettings |=Status2Flag(nStatus);

+			dwSettings |= Status2Flag(nStatus);

 		else

 			dwSettings &= ~Status2Flag(nStatus);

 

-		db_set_dw(NULL,pszProtocol,"ChangeSkypeStatus_Exclusions",dwSettings);

+		db_set_dw(NULL, pszProtocol, "ChangeSkypeStatus_Exclusions", dwSettings);

 	}

 

-	bool GetSyncStatusMsgFlag()const

+	bool GetSyncStatusMsgFlag() const

 	{

-		return db_get_b(NULL,MODULENAME,"SyncStatusMsg",false) > 0;

+		return g_plugin.getBool("SyncStatusMsg");

 	}

 

-	bool GetSyncStatusStateFlag()const

+	bool GetSyncStatusStateFlag() const

 	{

-		return db_get_b(NULL,MODULENAME,"SyncStatusState",false) > 0;

+		return g_plugin.getBool("SyncStatusState");

 	}

 

 	void SetSyncStatusMsgFlag(bool b)

 	{

-		db_set_b(NULL,MODULENAME,"SyncStatusMsg",b);

+		g_plugin.setByte("SyncStatusMsg", b);

 	}

 

 	void SetSyncStatusStateFlag(bool b)

 	{

-		db_set_b(NULL,MODULENAME,"SyncStatusState",b);

+		g_plugin.setByte("SyncStatusState", b);

 	}

 

-	bool GetPreviousStatus(const char* pszProtocol,int& nStatus)const

+	bool GetPreviousStatus(const char* pszProtocol, int& nStatus)const

 	{

 		int i = m_aProtocol2Status.getIndex((PrevStatus*)&pszProtocol);

 		if (i != -1) {

@@ -147,13 +147,13 @@ public:
 		return false;

 	}

 

-	void SetPreviousStatus(const char* pszProtocol,int nStatus)

+	void SetPreviousStatus(const char* pszProtocol, int nStatus)

 	{

 		int i = m_aProtocol2Status.getIndex((PrevStatus*)&pszProtocol);

 		if (i != -1)

 			m_aProtocol2Status[i].iStatus = nStatus;

 		else

-			m_aProtocol2Status.insert( new PrevStatus(pszProtocol, nStatus));

+			m_aProtocol2Status.insert(new PrevStatus(pszProtocol, nStatus));

 	}

 };