From 088403332a5a0a0312441a7938ed66f80126018f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 11 Aug 2015 21:53:02 +0000 Subject: more warning fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@14917 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/WinterSpeak/src/AnnounceDialog.h | 13 ++++++------ plugins/WinterSpeak/src/DialogConfigActive.h | 27 +++++++++++++------------ plugins/WinterSpeak/src/DialogConfigEngine.h | 30 +++++++++++++++------------- plugins/WinterSpeak/src/SpeechApi40a.cpp | 8 +------- plugins/WinterSpeak/src/SpeechApi40a.h | 2 +- plugins/WinterSpeak/src/SpeechInterface.cpp | 2 +- plugins/WinterSpeak/src/SpeechInterface.h | 2 +- 7 files changed, 41 insertions(+), 43 deletions(-) (limited to 'plugins/WinterSpeak') diff --git a/plugins/WinterSpeak/src/AnnounceDialog.h b/plugins/WinterSpeak/src/AnnounceDialog.h index 3a3da28f9a..f2f3ed86b6 100644 --- a/plugins/WinterSpeak/src/AnnounceDialog.h +++ b/plugins/WinterSpeak/src/AnnounceDialog.h @@ -4,7 +4,9 @@ class AnnounceDialog : public MirandaDialog { - public: + AnnounceDialog& operator=(const AnnounceDialog&); + +public: AnnounceDialog(AnnounceDatabase &db); ~AnnounceDialog(); @@ -13,10 +15,10 @@ class AnnounceDialog : public MirandaDialog // Return : true - update the systems configuration // false - do nothing //-------------------------------------------------------------------------- - static INT_PTR CALLBACK process(HWND window, UINT message, WPARAM wparam, LPARAM lparam); + static INT_PTR CALLBACK process(HWND window, UINT message, WPARAM wparam, LPARAM lparam); - private: - void command(HWND window, int control); +private: + void command(HWND window, int control); //-------------------------------------------------------------------------- // Description : load/save settings to the miranda database @@ -24,7 +26,6 @@ class AnnounceDialog : public MirandaDialog void load(HWND window); void save(HWND window); - static AnnounceDialog *m_instance; + static AnnounceDialog *m_instance; AnnounceDatabase &m_db; }; - diff --git a/plugins/WinterSpeak/src/DialogConfigActive.h b/plugins/WinterSpeak/src/DialogConfigActive.h index 5c65d44840..da778b3b56 100644 --- a/plugins/WinterSpeak/src/DialogConfigActive.h +++ b/plugins/WinterSpeak/src/DialogConfigActive.h @@ -3,23 +3,25 @@ class DialogConfigActive : public MirandaDialog { - public: - //-------------------------------------------------------------------------- + DialogConfigActive& operator=(const DialogConfigActive&); + +public: + //-------------------------------------------------------------------------- // Description : Initialise // Parameters : db - reference to the database to initalise and save - // control to and from + // control to and from //-------------------------------------------------------------------------- DialogConfigActive(ConfigDatabase &db); virtual ~DialogConfigActive(); - //-------------------------------------------------------------------------- + //-------------------------------------------------------------------------- // Description : process a dialog message // Return : 0 - process ok - // 1 - error + // 1 - error //-------------------------------------------------------------------------- - static INT_PTR CALLBACK process(HWND window, UINT message, WPARAM wparam, LPARAM lparam); + static INT_PTR CALLBACK process(HWND window, UINT message, WPARAM wparam, LPARAM lparam); - private: +private: //-------------------------------------------------------------------------- // Description : load/save setting to the miranda database //-------------------------------------------------------------------------- @@ -29,9 +31,9 @@ class DialogConfigActive : public MirandaDialog //-------------------------------------------------------------------------- // Description : select/unselect all the active status checkboxes - // Parameters : state - the state to apply to the checkboxes + // Parameters : state - the state to apply to the checkboxes //-------------------------------------------------------------------------- - void selectAllUsers(HWND window, bool state); + void selectAllUsers(HWND window, bool state); void ResetListOptions(HWND listview); void InitialiseItem(HWND hwndList, HANDLE hItem, bool message, bool status); void SetAllContactIcons(HWND listview); @@ -39,11 +41,10 @@ class DialogConfigActive : public MirandaDialog void SetAllChildIcons(HWND hwndList, HANDLE hFirstItem, int iColumn, int iImage); void SetListGroupIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentItem, int *groupChildCount); void SaveItemMask(HWND hwndList, MCONTACT hContact, HANDLE hItem); - - static DialogConfigActive *m_instance; - ConfigDatabase &m_db; + + static DialogConfigActive *m_instance; + ConfigDatabase &m_db; HICON hIcons[4]; HANDLE hItemUnknown; HANDLE hItemAll; }; - diff --git a/plugins/WinterSpeak/src/DialogConfigEngine.h b/plugins/WinterSpeak/src/DialogConfigEngine.h index b72037288f..e103ec1003 100644 --- a/plugins/WinterSpeak/src/DialogConfigEngine.h +++ b/plugins/WinterSpeak/src/DialogConfigEngine.h @@ -7,19 +7,21 @@ class TextToSpeech; class DialogConfigEngine : public MirandaDialog { - public: + DialogConfigEngine& operator=(const DialogConfigEngine&); + +public: DialogConfigEngine(ConfigDatabase &db); virtual ~DialogConfigEngine(); - //-------------------------------------------------------------------------- + //-------------------------------------------------------------------------- // Description : process a dialog message // Return : 0 - process ok - // 1 - error + // 1 - error //-------------------------------------------------------------------------- - static INT_PTR CALLBACK process(HWND window, UINT message, WPARAM wparam, LPARAM lparam); + static INT_PTR CALLBACK process(HWND window, UINT message, WPARAM wparam, LPARAM lparam); - private: - void command(HWND window, int control); +private: + void command(HWND window, int control); //-------------------------------------------------------------------------- // Description : load/save setting to the miranda database @@ -30,12 +32,12 @@ class DialogConfigEngine : public MirandaDialog //-------------------------------------------------------------------------- // Description : update the voices combo box //-------------------------------------------------------------------------- - void updateVoices(HWND window); - void getVoiceDesc(HWND window, VoiceDesc &desc); - std::wstring getEngine(HWND window); - bool createTts(HWND window); - - static DialogConfigEngine *m_instance; - ConfigDatabase &m_db; - std::auto_ptr m_test_tts; + void updateVoices(HWND window); + void getVoiceDesc(HWND window, VoiceDesc &desc); + std::wstring getEngine(HWND window); + bool createTts(HWND window); + + static DialogConfigEngine* m_instance; + ConfigDatabase& m_db; + std::auto_ptr m_test_tts; }; diff --git a/plugins/WinterSpeak/src/SpeechApi40a.cpp b/plugins/WinterSpeak/src/SpeechApi40a.cpp index 5be847dbac..7689cd39e4 100644 --- a/plugins/WinterSpeak/src/SpeechApi40a.cpp +++ b/plugins/WinterSpeak/src/SpeechApi40a.cpp @@ -218,7 +218,7 @@ std::wstring SpeechApi40a::getDescription() //------------------------------------------------------------------------------ // private: //------------------------------------------------------------------------------ -bool SpeechApi40a::loadWithVoice(std::wstring &voice) +bool SpeechApi40a::loadWithVoice(const std::wstring &voice) { CoInitialize(NULL); @@ -228,18 +228,12 @@ bool SpeechApi40a::loadWithVoice(std::wstring &voice) // create the enumerator if (FAILED(CoCreateInstance(CLSID_TTSEnumerator, NULL, CLSCTX_ALL, IID_ITTSEnum, (void**)&pITTSEnum))) - { return false; - } // iterate through the voices until we find the right one while (!pITTSEnum->Next(1, &inf, NULL)) - { if (inf.szModeName == voice) - { break; - } - } if (FAILED(CoCreateInstance(CLSID_MMAudioDest, NULL, CLSCTX_ALL, IID_IAudioMultiMediaDevice, (void**)&pAudioDest))) { diff --git a/plugins/WinterSpeak/src/SpeechApi40a.h b/plugins/WinterSpeak/src/SpeechApi40a.h index e9b524f954..fcc1b03421 100644 --- a/plugins/WinterSpeak/src/SpeechApi40a.h +++ b/plugins/WinterSpeak/src/SpeechApi40a.h @@ -75,7 +75,7 @@ class SpeechApi40a : public TextToSpeech //-------------------------------------------------------------------------- // Description : load the speech api with the specified voice //-------------------------------------------------------------------------- - bool loadWithVoice(std::wstring &voice); + bool loadWithVoice(const std::wstring &voice); ITTSCentralW *m_tts_central; ITTSAttributesA *m_tts_attribs; diff --git a/plugins/WinterSpeak/src/SpeechInterface.cpp b/plugins/WinterSpeak/src/SpeechInterface.cpp index 3fb668934a..fa1282a8a8 100644 --- a/plugins/WinterSpeak/src/SpeechInterface.cpp +++ b/plugins/WinterSpeak/src/SpeechInterface.cpp @@ -14,7 +14,7 @@ SpeechInterface::~SpeechInterface() } //------------------------------------------------------------------------------ -TextToSpeech * SpeechInterface::createTts(std::wstring &engine) const +TextToSpeech * SpeechInterface::createTts(const std::wstring &engine) const { TextToSpeech *tts = 0; diff --git a/plugins/WinterSpeak/src/SpeechInterface.h b/plugins/WinterSpeak/src/SpeechInterface.h index eec7eae4f0..78e51a0f75 100644 --- a/plugins/WinterSpeak/src/SpeechInterface.h +++ b/plugins/WinterSpeak/src/SpeechInterface.h @@ -15,7 +15,7 @@ class SpeechInterface // Parameters : engine - the name of the engine to create // Returns : an instance of the text to speech engine //-------------------------------------------------------------------------- - TextToSpeech * createTts(std::wstring &engine) const; + TextToSpeech * createTts(const std::wstring &engine) const; //-------------------------------------------------------------------------- // Description : configure the tts object -- cgit v1.2.3