From ddba4ede6b451d0cfcd0d32b5180fbd0689966bf Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 08:04:30 +0000 Subject: - HANDLE hContact => HCONTACT - GCF_* prefix was added to chat constants to avoid name conflicts git-svn-id: http://svn.miranda-ng.org/main/trunk@8078 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/WinterSpeak/src/ConfigDatabase.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'plugins/WinterSpeak/src/ConfigDatabase.cpp') diff --git a/plugins/WinterSpeak/src/ConfigDatabase.cpp b/plugins/WinterSpeak/src/ConfigDatabase.cpp index 64af1e35f4..0184e7e5d0 100644 --- a/plugins/WinterSpeak/src/ConfigDatabase.cpp +++ b/plugins/WinterSpeak/src/ConfigDatabase.cpp @@ -47,7 +47,7 @@ void ConfigDatabase::setActiveFlag(ActiveFlag flag, bool state) } //------------------------------------------------------------------------------ -ConfigDatabase::act ConfigDatabase::getActiveUser(HANDLE user) const +ConfigDatabase::act ConfigDatabase::getActiveUser(HCONTACT user) const { ActiveUsersMap::const_iterator iter = m_active_users.find(user); @@ -69,7 +69,7 @@ ConfigDatabase::act ConfigDatabase::getActiveUser(HANDLE user) const } //------------------------------------------------------------------------------ -void ConfigDatabase::setActiveUser(HANDLE user, act state) +void ConfigDatabase::setActiveUser(HCONTACT user, act state) { m_active_users[user].status = state.status; m_active_users[user].message = state.message; @@ -89,10 +89,8 @@ void ConfigDatabase::load() m_welcome_msg = DBGetContactSettingString(SPEAK, WELCOME_MSG, L"Welcome to Miranda"); // iterate through all the users and add them to the list if active - HANDLE contact = db_find_first(); - - while (NULL != contact) - { + HCONTACT contact = db_find_first(); + while (NULL != contact) { m_active_users[contact].status = (db_get_b(contact, SPEAK, ACTIVE_STATE, true) != 0); m_active_users[contact].message = (db_get_b(contact, SPEAK, ACTIVE_MSG, true) != 0); -- cgit v1.2.3