From e6c4594bfd63d7480fa4c010e5336586c61c240f Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 26 Sep 2019 18:23:54 +0300
Subject: C++'17 compatibility mode enabled

---
 plugins/WinterSpeak/src/DialogConfigEngine.cpp | 7 ++-----
 plugins/WinterSpeak/src/DialogConfigEngine.h   | 2 +-
 plugins/WinterSpeak/src/SpeakConfig.cpp        | 4 ++--
 plugins/WinterSpeak/src/SpeakConfig.h          | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'plugins/WinterSpeak/src')

diff --git a/plugins/WinterSpeak/src/DialogConfigEngine.cpp b/plugins/WinterSpeak/src/DialogConfigEngine.cpp
index dc6834fe13..8041453eb7 100644
--- a/plugins/WinterSpeak/src/DialogConfigEngine.cpp
+++ b/plugins/WinterSpeak/src/DialogConfigEngine.cpp
@@ -144,7 +144,7 @@ void DialogConfigEngine::save(HWND window)
 void DialogConfigEngine::updateVoices(HWND window)
 {
 	SpeechInterface si;
-	m_test_tts = std::auto_ptr<TextToSpeech>(si.createTts(getEngine(window)));
+	m_test_tts = std::unique_ptr<TextToSpeech>(si.createTts(getEngine(window)));
 
 	if (!m_test_tts.get())
 	{
@@ -215,12 +215,9 @@ bool DialogConfigEngine::createTts(HWND window)
 	getVoiceDesc(window, desc);
 
 	SpeechInterface si;
-	m_test_tts = std::auto_ptr<TextToSpeech>(si.createTts(desc.engine));
-
+	m_test_tts = std::unique_ptr<TextToSpeech>(si.createTts(desc.engine));
 	if (!m_test_tts.get())
-	{
 		return false;
-	}
 	
 	si.configureTts(m_test_tts.get(), desc);
 	return true;
diff --git a/plugins/WinterSpeak/src/DialogConfigEngine.h b/plugins/WinterSpeak/src/DialogConfigEngine.h
index 5d585bf6cf..7014bc6106 100644
--- a/plugins/WinterSpeak/src/DialogConfigEngine.h
+++ b/plugins/WinterSpeak/src/DialogConfigEngine.h
@@ -37,5 +37,5 @@ private:
 
 	static DialogConfigEngine*  m_instance;
 	ConfigDatabase&             m_db;
-	std::auto_ptr<TextToSpeech> m_test_tts;
+	std::unique_ptr<TextToSpeech> m_test_tts;
 };
diff --git a/plugins/WinterSpeak/src/SpeakConfig.cpp b/plugins/WinterSpeak/src/SpeakConfig.cpp
index 1d0d4185d7..c9bc28f878 100644
--- a/plugins/WinterSpeak/src/SpeakConfig.cpp
+++ b/plugins/WinterSpeak/src/SpeakConfig.cpp
@@ -7,7 +7,7 @@ SpeakConfig::SpeakConfig(HINSTANCE instance) : m_instance(instance), m_db(), m_t
 	// create and configure the tts
 	SpeechInterface si;
 	VoiceDesc desc = m_db.getVoiceDesc();
-	m_tts = std::auto_ptr<TextToSpeech>(si.createTts(desc.engine));
+	m_tts = std::unique_ptr<TextToSpeech>(si.createTts(desc.engine));
 	si.configureTts(m_tts.get(), desc);
 	
 	// observer the database for changes
@@ -28,7 +28,7 @@ void SpeakConfig::update(Subject &subject)
 
 	SpeechInterface si;
 	VoiceDesc desc = db.getVoiceDesc();
-	m_tts = std::auto_ptr<TextToSpeech>(si.createTts(desc.engine));
+	m_tts = std::unique_ptr<TextToSpeech>(si.createTts(desc.engine));
 	si.configureTts(m_tts.get(), desc);
 }
 
diff --git a/plugins/WinterSpeak/src/SpeakConfig.h b/plugins/WinterSpeak/src/SpeakConfig.h
index 64fdaeb64a..bc453e8baa 100644
--- a/plugins/WinterSpeak/src/SpeakConfig.h
+++ b/plugins/WinterSpeak/src/SpeakConfig.h
@@ -35,7 +35,7 @@ private:
 	HINSTANCE                   m_instance;
 
 	ConfigDatabase              m_db;
-	std::auto_ptr<TextToSpeech> m_tts;
+	std::unique_ptr<TextToSpeech> m_tts;
 	DialogConfigEngine          m_dialog_engine;
 	DialogConfigActive          m_dialog_active;
 };
\ No newline at end of file
-- 
cgit v1.2.3