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.h | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'plugins/WinterSpeak/src/ConfigDatabase.h') diff --git a/plugins/WinterSpeak/src/ConfigDatabase.h b/plugins/WinterSpeak/src/ConfigDatabase.h index 5682abf0f0..da8b46dc8f 100644 --- a/plugins/WinterSpeak/src/ConfigDatabase.h +++ b/plugins/WinterSpeak/src/ConfigDatabase.h @@ -26,13 +26,13 @@ public: bool message; }; - typedef std::map ActiveUsersMap; + typedef std::map ActiveUsersMap; //-------------------------------------------------------------------------- // Description : get/set the voice description //-------------------------------------------------------------------------- - VoiceDesc getVoiceDesc() const { return m_voice_desc; } - void setVoiceDesc(const VoiceDesc &desc) { m_voice_desc = desc; } + VoiceDesc getVoiceDesc() const { return m_voice_desc; } + void setVoiceDesc(const VoiceDesc &desc) { m_voice_desc = desc; } //-------------------------------------------------------------------------- // Description : get/set the welcome message @@ -43,37 +43,36 @@ public: //-------------------------------------------------------------------------- // Description : get/set an status flags //-------------------------------------------------------------------------- - bool getActiveFlag(ActiveFlag flag) const; + bool getActiveFlag(ActiveFlag flag) const; void setActiveFlag(ActiveFlag flag, bool state); //-------------------------------------------------------------------------- // Description : get/set the user active flag //-------------------------------------------------------------------------- - act getActiveUser(HANDLE user) const; - void setActiveUser(HANDLE user, act state); - ActiveUsersMap getActiveUsers() const { return m_active_users; } - + act getActiveUser(HCONTACT user) const; + void setActiveUser(HCONTACT user, act state); + ActiveUsersMap getActiveUsers() const { return m_active_users; } + //-------------------------------------------------------------------------- // Description : load/save the settings from the miranda database //-------------------------------------------------------------------------- void load(); void save(); - private: +private: //-------------------------------------------------------------------------- // Description : For some reason this isn't implemented in miranda yet // Just get a string from the db - // Parameters : szModule - the entrys' module - // szSetting - the entrys' setting - // def - default string if entry doesn't exist + // Parameters : szModule - the entrys' module + // szSetting - the entrys' setting + // def - default string if entry doesn't exist //-------------------------------------------------------------------------- static std::wstring DBGetContactSettingString(const char *szModule, const char *szSetting, const WCHAR *def); - VoiceDesc m_voice_desc; - unsigned int m_active_flags; + VoiceDesc m_voice_desc; + unsigned int m_active_flags; std::wstring m_welcome_msg; //std::string m_welcome_msg; - ActiveUsersMap m_active_users; + ActiveUsersMap m_active_users; }; - -- cgit v1.2.3