From a4f31a97e407280dc7e306a6c96948b53f9c0cab Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 3 Apr 2013 18:05:17 +0000
Subject: SmileyAdd: - array indexes totally unborkred; - code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@4296 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/SmileyAdd/src/customsmiley.cpp | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'plugins/SmileyAdd/src/customsmiley.cpp')

diff --git a/plugins/SmileyAdd/src/customsmiley.cpp b/plugins/SmileyAdd/src/customsmiley.cpp
index 448d3dc99b..4c0a75a11a 100644
--- a/plugins/SmileyAdd/src/customsmiley.cpp
+++ b/plugins/SmileyAdd/src/customsmiley.cpp
@@ -43,9 +43,8 @@ bool SmileyPackCListType::AddSmileyPack(HANDLE hContact, TCHAR* dir)
 
 bool SmileyPackCListType::AddSmiley(HANDLE hContact, TCHAR* path)
 {
-	SmileyPackCType* smpack = GetSmileyPack(hContact);
-	if (smpack == NULL)
-	{  
+	SmileyPackCType *smpack = GetSmileyPack(hContact);
+	if (smpack == NULL) {  
 		smpack = new SmileyPackCType;
 
 		smpack->SetId(hContact);
@@ -58,9 +57,9 @@ bool SmileyPackCListType::AddSmiley(HANDLE hContact, TCHAR* path)
 SmileyPackCType* SmileyPackCListType::GetSmileyPack(HANDLE id)
 {
 	for (int i = 0; i < m_SmileyPacks.getCount(); i++)
-	{
-		if (m_SmileyPacks[i].GetId() == id) return &m_SmileyPacks[i];
-	}
+		if (m_SmileyPacks[i].GetId() == id)
+			return &m_SmileyPacks[i];
+
 	return NULL;
 }
 
@@ -142,10 +141,8 @@ bool SmileyPackCType::LoadSmiley(TCHAR* path)
 
 	bkstring name = dirs.substr(slash+1, dot - slash - 1); 
 
-	for (int i=0; i < m_SmileyList.getCount(); i++)
-	{
-		if (m_SmileyList[i].GetTriggerText() == name)
-		{
+	for (int i=0; i < m_SmileyList.getCount(); i++) {
+		if (m_SmileyList[i].GetTriggerText() == name) {
 			m_SmileyList[i].LoadFromResource(dirs, 0);
 			return true; 
 		}
@@ -164,8 +161,7 @@ bool SmileyPackCType::LoadSmiley(TCHAR* path)
 void SmileyPackCType::AddTriggersToSmileyLookup(void)
 {
 	bkstring empty;
-	for (int dist=0; dist<m_SmileyList.getCount(); dist++)
-	{
+	for (int dist=0; dist<m_SmileyList.getCount(); dist++) {
 		SmileyLookup *dats = new SmileyLookup(m_SmileyList[dist].GetTriggerText(), false, dist, empty); 
 		m_SmileyLookup.insert(dats);
 	}
-- 
cgit v1.2.3