more code cleaning

5 files changed, 24 insertions, 45 deletions

diff --git a/plugins/MirandaG15/src/CAppletManager.cpp b/plugins/MirandaG15/src/CAppletManager.cpp
index 583f847b54..c0625f81c2 100644
--- a/plugins/MirandaG15/src/CAppletManager.cpp
+++ b/plugins/MirandaG15/src/CAppletManager.cpp
@@ -23,10 +23,6 @@ CAppletManager *CAppletManager::GetInstance()
 //************************************************************************
 CAppletManager::CAppletManager()
 {
-	m_uiTimer = NULL;
-	m_pLastScreen = nullptr;
-
-
 }
 
 //************************************************************************
diff --git a/plugins/MirandaG15/src/CAppletManager.h b/plugins/MirandaG15/src/CAppletManager.h
index 12e4978469..80a29d9603 100644
--- a/plugins/MirandaG15/src/CAppletManager.h
+++ b/plugins/MirandaG15/src/CAppletManager.h
@@ -149,7 +149,7 @@ private:
 	list<SMessageJob*> m_MessageJobs;

 

 	// update timer handle

-	UINT m_uiTimer;

+	UINT m_uiTimer = 0;

 

 	// screens

 	CNotificationScreen m_NotificationScreen;

@@ -164,22 +164,22 @@ private:
 	CProtocolData* GetProtocolData(tstring strProtocol);

 

 	// hook handles

-	HANDLE m_hMIHookMessageWindowEvent;

-	HANDLE m_hMIHookContactIsTyping;

-	HANDLE m_hMIHookEventAdded;

-	HANDLE m_hMIHookStatusChanged;

-	HANDLE m_hMIHookProtoAck;

-	HANDLE m_hMIHookSettingChanged;

-	HANDLE m_hMIHookContactDeleted;

-	HANDLE m_hMIHookContactAdded;

-	HANDLE m_hMIHookChatEvent;

+	HANDLE m_hMIHookMessageWindowEvent = 0;

+	HANDLE m_hMIHookContactIsTyping = 0;

+	HANDLE m_hMIHookEventAdded = 0;

+	HANDLE m_hMIHookStatusChanged = 0;

+	HANDLE m_hMIHookProtoAck = 0;

+	HANDLE m_hMIHookSettingChanged = 0;

+	HANDLE m_hMIHookContactDeleted = 0;

+	HANDLE m_hMIHookContactAdded = 0;

+	HANDLE m_hMIHookChatEvent = 0;

 

 	vector<CIRCConnection*> m_vIRCConnections;

 

 	// last active screen

-	CScreen *m_pLastScreen;

+	CScreen *m_pLastScreen = nullptr;

 

-	bool m_bScreensaver;

+	bool m_bScreensaver = false;

 

 	HBITMAP m_ahStatusBitmaps[8];

 	HBITMAP m_ahEventBitmaps[4];

diff --git a/plugins/MirandaG15/src/CEvent.h b/plugins/MirandaG15/src/CEvent.h
index 677e7b07a1..42f435480a 100644
--- a/plugins/MirandaG15/src/CEvent.h
+++ b/plugins/MirandaG15/src/CEvent.h
@@ -36,37 +36,22 @@ enum EventType
 #define MSG_READ 0

 #define MSG_UNREAD 1 

 

-class CEvent

+struct CEvent

 {

-public:

-	CEvent()

-	{

-		bTime = false;

-		dwFlags = NULL;

-		hContact = NULL;

-		bNotification = false;

-		bLog = true;

-		strDescription = L"";

-

-		iValue = NULL;

-		hValue = NULL;

-		strValue = L"";

-	}

-

 	enum EventType	eType;

-	DWORD dwFlags;

-	MCONTACT hContact;

-	tm	Time;

-	bool bTime;

+	DWORD dwFlags = 0;

+	MCONTACT hContact = 0;

+	struct tm Time = {};

+	bool bTime = false;

 

-	bool bNotification;

-	bool bLog;

+	bool bNotification = false;

+	bool bLog = true;

 

 	tstring strDescription;

 	tstring strSummary;

 

-	MEVENT hValue;

-	int iValue;

+	MEVENT hValue = 0;

+	int iValue = 0;

 	tstring strValue;

 };

 

diff --git a/plugins/MirandaG15/src/CIRCHistory.h b/plugins/MirandaG15/src/CIRCHistory.h
index 5b46ae32c9..667c1efd26 100644
--- a/plugins/MirandaG15/src/CIRCHistory.h
+++ b/plugins/MirandaG15/src/CIRCHistory.h
@@ -3,7 +3,7 @@
 

 struct SIRCMessage

 {

-	tm Time;

+	struct tm Time;

 	bool bIsMe;

 	tstring strMessage;

 };

diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDList.h b/plugins/MirandaG15/src/LCDFramework/CLCDList.h
index 52b623fecc..932101dbea 100644
--- a/plugins/MirandaG15/src/LCDFramework/CLCDList.h
+++ b/plugins/MirandaG15/src/LCDFramework/CLCDList.h
@@ -21,13 +21,11 @@ public:
 			m_eType = ROOT;
 			m_pRoot = this;
 		}
-		else
-			m_iLevel = m_pParent->GetLevel() + 1;
+		else m_iLevel = m_pParent->GetLevel() + 1;
 	}
 
 	virtual ~CListEntry()
 	{
-
 	}
 
 	int GetLevel()
@@ -66,7 +64,7 @@ public:
 		return m_eType;
 	}
 
-	int	GetEntryCount()
+	int GetEntryCount()
 	{
 		return m_iEntryCount;
 	}