From 61c8f68113252586b7d57b753c90fa0a67fd614f Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Sun, 2 Aug 2015 10:55:59 +0000
Subject: WinterSpeak: common project

git-svn-id: http://svn.miranda-ng.org/main/trunk@14811 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/WinterSpeak/src/AnnounceDatabase.cpp    |  2 +-
 plugins/WinterSpeak/src/AnnounceDialog.cpp      |  2 +-
 plugins/WinterSpeak/src/Common.h                | 43 -------------------------
 plugins/WinterSpeak/src/ConfigDatabase.cpp      |  2 +-
 plugins/WinterSpeak/src/DialogConfigActive.cpp  |  2 +-
 plugins/WinterSpeak/src/DialogConfigEngine.cpp  |  2 +-
 plugins/WinterSpeak/src/EventInformation.cpp    |  2 +-
 plugins/WinterSpeak/src/MirandaDialog.cpp       |  2 +-
 plugins/WinterSpeak/src/Observer.cpp            |  2 +-
 plugins/WinterSpeak/src/ProtocolInformation.cpp |  2 +-
 plugins/WinterSpeak/src/SpeakAnnounce.cpp       |  2 +-
 plugins/WinterSpeak/src/SpeakAnnounce.h         |  2 +-
 plugins/WinterSpeak/src/SpeakConfig.cpp         |  2 +-
 plugins/WinterSpeak/src/SpeakConfig.h           |  2 +-
 plugins/WinterSpeak/src/SpeechApi40a.cpp        |  4 +--
 plugins/WinterSpeak/src/SpeechApi40aLexicon.cpp |  4 +--
 plugins/WinterSpeak/src/SpeechApi51.cpp         |  2 +-
 plugins/WinterSpeak/src/SpeechApi51Lexicon.cpp  |  2 +-
 plugins/WinterSpeak/src/SpeechInterface.cpp     |  2 +-
 plugins/WinterSpeak/src/Subject.cpp             |  2 +-
 plugins/WinterSpeak/src/TextToSpeech.cpp        |  2 +-
 plugins/WinterSpeak/src/TextToSpeech.h          |  2 +-
 plugins/WinterSpeak/src/UserInformation.cpp     |  2 +-
 plugins/WinterSpeak/src/main.cpp                |  2 +-
 plugins/WinterSpeak/src/stdafx.cpp              | 18 -----------
 plugins/WinterSpeak/src/stdafx.cxx              | 18 +++++++++++
 plugins/WinterSpeak/src/stdafx.h                | 42 ++++++++++++++++++++++++
 27 files changed, 85 insertions(+), 86 deletions(-)
 delete mode 100644 plugins/WinterSpeak/src/Common.h
 delete mode 100644 plugins/WinterSpeak/src/stdafx.cpp
 create mode 100644 plugins/WinterSpeak/src/stdafx.cxx
 create mode 100644 plugins/WinterSpeak/src/stdafx.h

(limited to 'plugins/WinterSpeak/src')

diff --git a/plugins/WinterSpeak/src/AnnounceDatabase.cpp b/plugins/WinterSpeak/src/AnnounceDatabase.cpp
index 526d057058..2aebf7cb9b 100644
--- a/plugins/WinterSpeak/src/AnnounceDatabase.cpp
+++ b/plugins/WinterSpeak/src/AnnounceDatabase.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 #include "AnnounceDatabase.h"
 
 
diff --git a/plugins/WinterSpeak/src/AnnounceDialog.cpp b/plugins/WinterSpeak/src/AnnounceDialog.cpp
index ae6c96e5a4..ab9ddb8384 100644
--- a/plugins/WinterSpeak/src/AnnounceDialog.cpp
+++ b/plugins/WinterSpeak/src/AnnounceDialog.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 #include "AnnounceDialog.h"
 
 
diff --git a/plugins/WinterSpeak/src/Common.h b/plugins/WinterSpeak/src/Common.h
deleted file mode 100644
index b51cc56ff8..0000000000
--- a/plugins/WinterSpeak/src/Common.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#define _CRT_SECURE_NO_WARNINGS
-#define WIN32_LEAN_AND_MEAN
-
-#include <windows.h>
-#include <Winsock2.h>
-#include <CommCtrl.h>
-
-#include <newpluginapi.h>
-#include <m_langpack.h>
-#include <m_database.h>
-#include <m_genmenu.h>
-#include <m_utils.h>
-#include <win2k.h>
-#include <m_options.h>
-#include <m_protocols.h>
-#include <m_protosvc.h>
-#include <m_clist.h>
-#include <m_skin.h>
-#include <m_icolib.h>
-#include <m_netlib.h>
-#include <m_extraicons.h>
-#include <m_message.h>
-
-#include "m_winterspeak.h"
-
-#include "resource.h"
-#include "Version.h"
-
-#include "DialogConfigEngine.h"
-#include "DialogConfigActive.h"
-
-#include "AnnounceDialog.h"
-#include "AnnounceDatabase.h"
-#include "SpeakAnnounce.h"
-
-#include "ConfigDatabase.h"
-#include "MirandaDialog.h"
-#include "Subject.h"
-#include "SpeechInterface.h"
-#include "SpeakConfig.h"
-#include "UserInformation.h"
-#include "EventInformation.h"
-#include "ProtocolInformation.h"
\ No newline at end of file
diff --git a/plugins/WinterSpeak/src/ConfigDatabase.cpp b/plugins/WinterSpeak/src/ConfigDatabase.cpp
index 863dd62a71..ed7ff2db52 100644
--- a/plugins/WinterSpeak/src/ConfigDatabase.cpp
+++ b/plugins/WinterSpeak/src/ConfigDatabase.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 #include "ConfigDatabase.h"
 
 
diff --git a/plugins/WinterSpeak/src/DialogConfigActive.cpp b/plugins/WinterSpeak/src/DialogConfigActive.cpp
index 925e03804a..feec1c51b5 100644
--- a/plugins/WinterSpeak/src/DialogConfigActive.cpp
+++ b/plugins/WinterSpeak/src/DialogConfigActive.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 #include "DialogConfigActive.h"
 
 //------------------------------------------------------------------------------
diff --git a/plugins/WinterSpeak/src/DialogConfigEngine.cpp b/plugins/WinterSpeak/src/DialogConfigEngine.cpp
index b7c33c63eb..1f0ccbca6e 100644
--- a/plugins/WinterSpeak/src/DialogConfigEngine.cpp
+++ b/plugins/WinterSpeak/src/DialogConfigEngine.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 #include "DialogConfigEngine.h"
 
 DialogConfigEngine *DialogConfigEngine::m_instance = 0;
diff --git a/plugins/WinterSpeak/src/EventInformation.cpp b/plugins/WinterSpeak/src/EventInformation.cpp
index f79c03eb0e..3332a7c235 100644
--- a/plugins/WinterSpeak/src/EventInformation.cpp
+++ b/plugins/WinterSpeak/src/EventInformation.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 #include "EventInformation.h"
 
 
diff --git a/plugins/WinterSpeak/src/MirandaDialog.cpp b/plugins/WinterSpeak/src/MirandaDialog.cpp
index eb63e2f5a2..882ffa044f 100644
--- a/plugins/WinterSpeak/src/MirandaDialog.cpp
+++ b/plugins/WinterSpeak/src/MirandaDialog.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 #include "MirandaDialog.h"
 
 
diff --git a/plugins/WinterSpeak/src/Observer.cpp b/plugins/WinterSpeak/src/Observer.cpp
index b2bc38be5c..188a4ae3e6 100644
--- a/plugins/WinterSpeak/src/Observer.cpp
+++ b/plugins/WinterSpeak/src/Observer.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 #include "Observer.h"
 
 Observer::~Observer(void)
diff --git a/plugins/WinterSpeak/src/ProtocolInformation.cpp b/plugins/WinterSpeak/src/ProtocolInformation.cpp
index 19f7c9f70b..7020210881 100644
--- a/plugins/WinterSpeak/src/ProtocolInformation.cpp
+++ b/plugins/WinterSpeak/src/ProtocolInformation.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 #include "ProtocolInformation.h"
 
 
diff --git a/plugins/WinterSpeak/src/SpeakAnnounce.cpp b/plugins/WinterSpeak/src/SpeakAnnounce.cpp
index d054bae1ff..e4abe9e87d 100644
--- a/plugins/WinterSpeak/src/SpeakAnnounce.cpp
+++ b/plugins/WinterSpeak/src/SpeakAnnounce.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 #include "SpeakAnnounce.h"
 
 
diff --git a/plugins/WinterSpeak/src/SpeakAnnounce.h b/plugins/WinterSpeak/src/SpeakAnnounce.h
index 763f36cce8..0e0ad5bca4 100644
--- a/plugins/WinterSpeak/src/SpeakAnnounce.h
+++ b/plugins/WinterSpeak/src/SpeakAnnounce.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Common.h"
+#include "stdafx.h"
 #include <m_database.h>
 
 class SpeakAnnounce
diff --git a/plugins/WinterSpeak/src/SpeakConfig.cpp b/plugins/WinterSpeak/src/SpeakConfig.cpp
index 11b7d249b6..b6401b4423 100644
--- a/plugins/WinterSpeak/src/SpeakConfig.cpp
+++ b/plugins/WinterSpeak/src/SpeakConfig.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 #include "SpeakConfig.h"
 
 
diff --git a/plugins/WinterSpeak/src/SpeakConfig.h b/plugins/WinterSpeak/src/SpeakConfig.h
index be86fa4409..64fdaeb64a 100644
--- a/plugins/WinterSpeak/src/SpeakConfig.h
+++ b/plugins/WinterSpeak/src/SpeakConfig.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Common.h"
+#include "stdafx.h"
 #include "ConfigDatabase.h"
 #include "TextToSpeech.h"
 
diff --git a/plugins/WinterSpeak/src/SpeechApi40a.cpp b/plugins/WinterSpeak/src/SpeechApi40a.cpp
index 5e6bbebe2c..5be847dbac 100644
--- a/plugins/WinterSpeak/src/SpeechApi40a.cpp
+++ b/plugins/WinterSpeak/src/SpeechApi40a.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 #include "SpeechApi40a.h"
 
 #include "SpeechApi40aLexicon.h"
@@ -12,7 +12,7 @@
 #include <ObjError.h>
 #include <Ole2Ver.h>
 
-#include <speech.h>
+#include "SAPI 4.0\Include\speech.h"
 //#include <spchwrap.h>
 
 #include <sstream>
diff --git a/plugins/WinterSpeak/src/SpeechApi40aLexicon.cpp b/plugins/WinterSpeak/src/SpeechApi40aLexicon.cpp
index efb82b84e7..bf511458a9 100644
--- a/plugins/WinterSpeak/src/SpeechApi40aLexicon.cpp
+++ b/plugins/WinterSpeak/src/SpeechApi40aLexicon.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 #include "SpeechApi40aLexicon.h"
 
 #include <windows.h>
@@ -10,7 +10,7 @@
 #include <ObjError.h>
 #include <Ole2Ver.h>
 
-#include <speech.h>
+#include "SAPI 4.0\Include\speech.h"
 //#include <spchwrap.h>
 
 
diff --git a/plugins/WinterSpeak/src/SpeechApi51.cpp b/plugins/WinterSpeak/src/SpeechApi51.cpp
index 194a867172..a674f80b35 100644
--- a/plugins/WinterSpeak/src/SpeechApi51.cpp
+++ b/plugins/WinterSpeak/src/SpeechApi51.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 #include "SpeechApi51.h"
 #include "SpeechApi51Lexicon.h"
 
diff --git a/plugins/WinterSpeak/src/SpeechApi51Lexicon.cpp b/plugins/WinterSpeak/src/SpeechApi51Lexicon.cpp
index db55c2bb09..a069e7319d 100644
--- a/plugins/WinterSpeak/src/SpeechApi51Lexicon.cpp
+++ b/plugins/WinterSpeak/src/SpeechApi51Lexicon.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 #include "SpeechApi51Lexicon.h"
 #include "SpeechApi51.h"
 
diff --git a/plugins/WinterSpeak/src/SpeechInterface.cpp b/plugins/WinterSpeak/src/SpeechInterface.cpp
index 261cf547ec..3fb668934a 100644
--- a/plugins/WinterSpeak/src/SpeechInterface.cpp
+++ b/plugins/WinterSpeak/src/SpeechInterface.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 #include "SpeechInterface.h"
 #include "SpeechApi51.h"
 #include "SpeechApi40a.h"
diff --git a/plugins/WinterSpeak/src/Subject.cpp b/plugins/WinterSpeak/src/Subject.cpp
index b502aac4fb..9c1fce2a08 100644
--- a/plugins/WinterSpeak/src/Subject.cpp
+++ b/plugins/WinterSpeak/src/Subject.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 #include "Subject.h"
 #include "Observer.h"
 
diff --git a/plugins/WinterSpeak/src/TextToSpeech.cpp b/plugins/WinterSpeak/src/TextToSpeech.cpp
index ddb1185225..844ca8373f 100644
--- a/plugins/WinterSpeak/src/TextToSpeech.cpp
+++ b/plugins/WinterSpeak/src/TextToSpeech.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 #include "TextToSpeech.h"
 
 //------------------------------------------------------------------------------
diff --git a/plugins/WinterSpeak/src/TextToSpeech.h b/plugins/WinterSpeak/src/TextToSpeech.h
index f426c43e87..94702b690f 100644
--- a/plugins/WinterSpeak/src/TextToSpeech.h
+++ b/plugins/WinterSpeak/src/TextToSpeech.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Common.h"
+#include "stdafx.h"
 #include <string>
 #include <vector>
 
diff --git a/plugins/WinterSpeak/src/UserInformation.cpp b/plugins/WinterSpeak/src/UserInformation.cpp
index 43f02605fa..d39ad691be 100644
--- a/plugins/WinterSpeak/src/UserInformation.cpp
+++ b/plugins/WinterSpeak/src/UserInformation.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 #include "UserInformation.h"
 
 
diff --git a/plugins/WinterSpeak/src/main.cpp b/plugins/WinterSpeak/src/main.cpp
index 554ee64ee4..d8c34eeadd 100644
--- a/plugins/WinterSpeak/src/main.cpp
+++ b/plugins/WinterSpeak/src/main.cpp
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "stdafx.h"
 
 CLIST_INTERFACE *pcli;
 HINSTANCE g_hInst;
diff --git a/plugins/WinterSpeak/src/stdafx.cpp b/plugins/WinterSpeak/src/stdafx.cpp
deleted file mode 100644
index c5fe5abaad..0000000000
--- a/plugins/WinterSpeak/src/stdafx.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org)
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation version 2
-of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "common.h"
\ No newline at end of file
diff --git a/plugins/WinterSpeak/src/stdafx.cxx b/plugins/WinterSpeak/src/stdafx.cxx
new file mode 100644
index 0000000000..6fb37564b7
--- /dev/null
+++ b/plugins/WinterSpeak/src/stdafx.cxx
@@ -0,0 +1,18 @@
+/*
+Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation version 2
+of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "stdafx.h"
\ No newline at end of file
diff --git a/plugins/WinterSpeak/src/stdafx.h b/plugins/WinterSpeak/src/stdafx.h
new file mode 100644
index 0000000000..be8b37d29f
--- /dev/null
+++ b/plugins/WinterSpeak/src/stdafx.h
@@ -0,0 +1,42 @@
+#define WIN32_LEAN_AND_MEAN
+
+#include <windows.h>
+#include <Winsock2.h>
+#include <CommCtrl.h>
+
+#include <newpluginapi.h>
+#include <m_langpack.h>
+#include <m_database.h>
+#include <m_genmenu.h>
+#include <m_utils.h>
+#include <win2k.h>
+#include <m_options.h>
+#include <m_protocols.h>
+#include <m_protosvc.h>
+#include <m_clist.h>
+#include <m_skin.h>
+#include <m_icolib.h>
+#include <m_netlib.h>
+#include <m_extraicons.h>
+#include <m_message.h>
+
+#include "m_winterspeak.h"
+
+#include "resource.h"
+#include "Version.h"
+
+#include "DialogConfigEngine.h"
+#include "DialogConfigActive.h"
+
+#include "AnnounceDialog.h"
+#include "AnnounceDatabase.h"
+#include "SpeakAnnounce.h"
+
+#include "ConfigDatabase.h"
+#include "MirandaDialog.h"
+#include "Subject.h"
+#include "SpeechInterface.h"
+#include "SpeakConfig.h"
+#include "UserInformation.h"
+#include "EventInformation.h"
+#include "ProtocolInformation.h"
\ No newline at end of file
-- 
cgit v1.2.3