From 2b49f2b34e0e3cbcda608c07e5cb206c9fa01c9a Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 15 Nov 2012 17:08:48 +0000
Subject: core: tabs over spaces

git-svn-id: http://svn.miranda-ng.org/main/trunk@2316 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/extraicons/DefaultExtraIcons.cpp | 2 +-
 src/modules/extraicons/ExtraIconGroup.cpp    | 6 +++---
 src/modules/extraicons/IcolibExtraIcon.cpp   | 8 ++++----
 src/modules/extraicons/extraicons.cpp        | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/modules/extraicons')

diff --git a/src/modules/extraicons/DefaultExtraIcons.cpp b/src/modules/extraicons/DefaultExtraIcons.cpp
index 8115e50b07..70b7acc089 100644
--- a/src/modules/extraicons/DefaultExtraIcons.cpp
+++ b/src/modules/extraicons/DefaultExtraIcons.cpp
@@ -67,7 +67,7 @@ static void SetVisibility(HANDLE hContact, int apparentMode, BOOL clear)
 		return;
 
 	if (apparentMode <= 0)
-		apparentMode = DBGetContactSettingWord(hContact, proto, "ApparentMode", 0);
+		apparentMode = db_get_w(hContact, proto, "ApparentMode", 0);
 
 	const char *ico = NULL;
 
diff --git a/src/modules/extraicons/ExtraIconGroup.cpp b/src/modules/extraicons/ExtraIconGroup.cpp
index c38aed8bf7..5d26f8488c 100644
--- a/src/modules/extraicons/ExtraIconGroup.cpp
+++ b/src/modules/extraicons/ExtraIconGroup.cpp
@@ -23,11 +23,11 @@
 #include "ExtraIconGroup.h"
 #include "extraicons.h"
 
-ExtraIconGroup::ExtraIconGroup(const char *name) :
-	ExtraIcon(name), setValidExtraIcon(false), insideApply(false)
+ExtraIconGroup::ExtraIconGroup(const char *_name) :
+	ExtraIcon(_name), setValidExtraIcon(false), insideApply(false)
 {
 	char setting[512];
-	mir_snprintf(setting, SIZEOF(setting), "%s/%s", MODULE_NAME, name);
+	mir_snprintf(setting, SIZEOF(setting), "%s/%s", MODULE_NAME, _name);
 	CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (WPARAM) setting);
 }
 
diff --git a/src/modules/extraicons/IcolibExtraIcon.cpp b/src/modules/extraicons/IcolibExtraIcon.cpp
index 8f69a77a5b..8ea4f51512 100644
--- a/src/modules/extraicons/IcolibExtraIcon.cpp
+++ b/src/modules/extraicons/IcolibExtraIcon.cpp
@@ -24,12 +24,12 @@
 #include "extraicons.h"
 #include "usedIcons.h"
 
-IcolibExtraIcon::IcolibExtraIcon(int id, const char *name, const TCHAR *description, const char *descIcon,
-		MIRANDAHOOKPARAM OnClick, LPARAM param) :
-	BaseExtraIcon(id, name, description, descIcon, OnClick, param)
+IcolibExtraIcon::IcolibExtraIcon(int _id, const char *_name, const TCHAR *_description, const char *_descIcon,
+		MIRANDAHOOKPARAM _OnClick, LPARAM _param) :
+	BaseExtraIcon(_id, _name, _description, _descIcon, _OnClick, _param)
 {
 	char setting[512];
-	mir_snprintf(setting, SIZEOF(setting), "%s/%s", MODULE_NAME, name);
+	mir_snprintf(setting, SIZEOF(setting), "%s/%s", MODULE_NAME, _name);
 	CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (WPARAM) setting);
 }
 
diff --git a/src/modules/extraicons/extraicons.cpp b/src/modules/extraicons/extraicons.cpp
index 667d46f5d3..45a81235e6 100644
--- a/src/modules/extraicons/extraicons.cpp
+++ b/src/modules/extraicons/extraicons.cpp
@@ -132,11 +132,11 @@ BaseExtraIcon* GetExtraIconByName(const char *name)
 
 static void LoadGroups(vector<ExtraIconGroup *> &groups)
 {
-	unsigned int count = DBGetContactSettingWord(NULL, MODULE_NAME "Groups", "Count", 0);
+	unsigned int count = db_get_w(NULL, MODULE_NAME "Groups", "Count", 0);
 	for (unsigned int i = 0; i < count; i++) {
 		char setting[512];
 		mir_snprintf(setting, SIZEOF(setting), "%d_count", i);
-		unsigned int items = DBGetContactSettingWord(NULL, MODULE_NAME "Groups", setting, 0);
+		unsigned int items = db_get_w(NULL, MODULE_NAME "Groups", setting, 0);
 		if (items < 1)
 			continue;
 
@@ -406,10 +406,10 @@ INT_PTR ExtraIcon_Register(WPARAM wParam, LPARAM lParam)
 
 	char setting[512];
 	mir_snprintf(setting, SIZEOF(setting), "Position_%s", ei->name);
-	extra->setPosition(DBGetContactSettingWord(NULL, MODULE_NAME, setting, 1000));
+	extra->setPosition(db_get_w(NULL, MODULE_NAME, setting, 1000));
 
 	mir_snprintf(setting, SIZEOF(setting), "Slot_%s", ei->name);
-	int slot = DBGetContactSettingWord(NULL, MODULE_NAME, setting, 1);
+	int slot = db_get_w(NULL, MODULE_NAME, setting, 1);
 	if (slot == (WORD) -1)
 		slot = -1;
 	extra->setSlot(slot);
-- 
cgit v1.2.3