From 69739f33352395f72de7f2f52599e04183623233 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 8 Mar 2013 10:47:18 +0000 Subject: removed not used headers git-svn-id: http://svn.miranda-ng.org/main/trunk@3914 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Quotes/src/Base64.cpp | 1 - plugins/Quotes/src/ComHelper.cpp | 3 - plugins/Quotes/src/ComHelper.h | 2 - plugins/Quotes/src/CommonOptionDlg.cpp | 8 -- plugins/Quotes/src/CreateFilePath.cpp | 4 - plugins/Quotes/src/CreateFilePath.h | 2 - plugins/Quotes/src/CurrencyConverter.cpp | 11 --- plugins/Quotes/src/DBUtils.cpp | 1 - plugins/Quotes/src/ExtraImages.cpp | 9 -- plugins/Quotes/src/ExtraImages.h | 2 - plugins/Quotes/src/Forex.cpp | 27 ------ plugins/Quotes/src/HTMLParserMS.cpp | 1 - plugins/Quotes/src/HTMLParserMS.h | 4 - plugins/Quotes/src/HTTPSession.cpp | 3 - plugins/Quotes/src/HTTPSession.h | 2 - plugins/Quotes/src/IQuotesProvider.h | 3 - plugins/Quotes/src/IconLib.cpp | 10 -- plugins/Quotes/src/ImportExport.cpp | 15 --- plugins/Quotes/src/LightMutex.cpp | 1 - plugins/Quotes/src/Locale.cpp | 1 - plugins/Quotes/src/Log.cpp | 4 - plugins/Quotes/src/ModuleInfo.cpp | 7 -- plugins/Quotes/src/OptionDukasCopy.cpp | 10 -- plugins/Quotes/src/QuoteChart.cpp | 13 --- plugins/Quotes/src/QuoteInfoDlg.cpp | 10 -- plugins/Quotes/src/QuotesProviderBase.cpp | Bin 58754 -> 57792 bytes plugins/Quotes/src/QuotesProviderBase.h | 4 - plugins/Quotes/src/QuotesProviderDukasCopy.cpp | Bin 15324 -> 14520 bytes plugins/Quotes/src/QuotesProviderDukasCopy.h | 3 - plugins/Quotes/src/QuotesProviderFinance.cpp | 9 -- plugins/Quotes/src/QuotesProviderFinance.h | 2 - plugins/Quotes/src/QuotesProviderGoogle.cpp | 12 --- plugins/Quotes/src/QuotesProviderGoogle.h | 2 - plugins/Quotes/src/QuotesProviderGoogleFinance.cpp | 14 --- plugins/Quotes/src/QuotesProviderGoogleFinance.h | 2 - .../Quotes/src/QuotesProviderVisitorDbSettings.cpp | 4 - .../Quotes/src/QuotesProviderVisitorDbSettings.h | 2 - .../QuotesProviderVisitorFormatSpecificator.cpp | 1 - .../src/QuotesProviderVisitorFormatSpecificator.h | 2 - .../Quotes/src/QuotesProviderVisitorFormater.cpp | 8 -- plugins/Quotes/src/QuotesProviderVisitorFormater.h | 2 - .../Quotes/src/QuotesProviderVisitorTendency.cpp | 5 - plugins/Quotes/src/QuotesProviderVisitorTendency.h | 2 - plugins/Quotes/src/QuotesProviderYahoo.cpp | 6 -- plugins/Quotes/src/QuotesProviderYahoo.h | 3 - plugins/Quotes/src/QuotesProviders.cpp | 8 -- plugins/Quotes/src/QuotesProviders.h | 3 - plugins/Quotes/src/SettingsDlg.cpp | 10 -- plugins/Quotes/src/WinCtrlHelper.cpp | 4 - plugins/Quotes/src/WorkingThread.cpp | 3 - plugins/Quotes/src/XMLEngineMI.cpp | 1 - plugins/Quotes/src/XMLEngineMI.h | 2 - plugins/Quotes/src/stdafx.cpp | 22 +++-- plugins/Quotes/src/stdafx.h | 108 ++++++++++++--------- plugins/Quotes/src/targetver.h | 24 ----- plugins/Quotes/src/version.h | 7 -- 56 files changed, 78 insertions(+), 351 deletions(-) delete mode 100644 plugins/Quotes/src/targetver.h (limited to 'plugins/Quotes/src') diff --git a/plugins/Quotes/src/Base64.cpp b/plugins/Quotes/src/Base64.cpp index 1854fb42fd..ac8c56ed14 100644 --- a/plugins/Quotes/src/Base64.cpp +++ b/plugins/Quotes/src/Base64.cpp @@ -1,5 +1,4 @@ #include "StdAfx.h" -#include "Base64.h" bool base64::encode(const BYTE* in, size_t inlen,std::vector& out) { diff --git a/plugins/Quotes/src/ComHelper.cpp b/plugins/Quotes/src/ComHelper.cpp index e15d05d739..77c0fc7d60 100644 --- a/plugins/Quotes/src/ComHelper.cpp +++ b/plugins/Quotes/src/ComHelper.cpp @@ -1,7 +1,4 @@ #include "StdAfx.h" -#include "ComHelper.h" -#include "Log.h" -#include "WinCtrlHelper.h" tstring ComException2Msg(_com_error& e,const tstring& rsAdditionalInfo) { diff --git a/plugins/Quotes/src/ComHelper.h b/plugins/Quotes/src/ComHelper.h index 0b4140d80d..a9d87784d8 100644 --- a/plugins/Quotes/src/ComHelper.h +++ b/plugins/Quotes/src/ComHelper.h @@ -1,8 +1,6 @@ #ifndef __37ae28ab_c414_4aba_bbef_d23dd68643a5_ComHelper_h__ #define __37ae28ab_c414_4aba_bbef_d23dd68643a5_ComHelper_h__ -#include - void ShowComError(_com_error& e,const tstring& rsAdditionalInfo); tstring ComException2Msg(_com_error& e,const tstring& rsAdditionalInfo); diff --git a/plugins/Quotes/src/CommonOptionDlg.cpp b/plugins/Quotes/src/CommonOptionDlg.cpp index 0b460665c5..55315c3947 100644 --- a/plugins/Quotes/src/CommonOptionDlg.cpp +++ b/plugins/Quotes/src/CommonOptionDlg.cpp @@ -1,12 +1,4 @@ #include "StdAfx.h" -#include "CommonOptionDlg.h" -#include "QuotesProviderBase.h" -#include "resource.h" -#include "EconomicRateInfo.h" -#include "DBUtils.h" -#include "QuotesProviderVisitorDbSettings.h" -#include "WinCtrlHelper.h" -#include "SettingsDlg.h" namespace { diff --git a/plugins/Quotes/src/CreateFilePath.cpp b/plugins/Quotes/src/CreateFilePath.cpp index 23c0c345b0..b2472f5978 100644 --- a/plugins/Quotes/src/CreateFilePath.cpp +++ b/plugins/Quotes/src/CreateFilePath.cpp @@ -1,8 +1,4 @@ #include "StdAfx.h" -#include "CreateFilePath.h" - -#include -#include "ModuleInfo.h" namespace { diff --git a/plugins/Quotes/src/CreateFilePath.h b/plugins/Quotes/src/CreateFilePath.h index f097e59a52..17aca8ab83 100644 --- a/plugins/Quotes/src/CreateFilePath.h +++ b/plugins/Quotes/src/CreateFilePath.h @@ -1,8 +1,6 @@ #ifndef _aaf3bee6_cee7_4023_8848_5911ad7a9660_CreateFilePath_h__ #define _aaf3bee6_cee7_4023_8848_5911ad7a9660_CreateFilePath_h__ -#include - tstring CreateFilePath(const tstring& rsName); #endif //_aaf3bee6_cee7_4023_8848_5911ad7a9660_CreateFilePath_h__ diff --git a/plugins/Quotes/src/CurrencyConverter.cpp b/plugins/Quotes/src/CurrencyConverter.cpp index 7124677567..a586bb3e77 100644 --- a/plugins/Quotes/src/CurrencyConverter.cpp +++ b/plugins/Quotes/src/CurrencyConverter.cpp @@ -1,15 +1,4 @@ #include "StdAfx.h" -#include "CurrencyConverter.h" -#include "ModuleInfo.h" -#include "resource.h" - -#include "QuotesProviderGoogle.h" -#include "QuotesProviders.h" -#include "WinCtrlHelper.h" -#include "EconomicRateInfo.h" -#include "Locale.h" -#include "DBUtils.h" -#include "IconLib.h" #define WINDOW_PREFIX "CurrenyConverter_" diff --git a/plugins/Quotes/src/DBUtils.cpp b/plugins/Quotes/src/DBUtils.cpp index 11c0fb3d0d..462abb38a5 100644 --- a/plugins/Quotes/src/DBUtils.cpp +++ b/plugins/Quotes/src/DBUtils.cpp @@ -1,5 +1,4 @@ #include "StdAfx.h" -#include "DBUtils.h" std::string Quotes_DBGetStringA(HANDLE hContact,const char* szModule,const char* szSetting,const char* pszDefValue /*= NULL*/) { diff --git a/plugins/Quotes/src/ExtraImages.cpp b/plugins/Quotes/src/ExtraImages.cpp index a89032e53c..2a6c95b10d 100644 --- a/plugins/Quotes/src/ExtraImages.cpp +++ b/plugins/Quotes/src/ExtraImages.cpp @@ -1,13 +1,4 @@ #include "StdAfx.h" -#include "ExtraImages.h" -#include "IconLib.h" -#include "EconomicRateInfo.h" -#include "ModuleInfo.h" -#include "QuotesProviders.h" -#include "IQuotesProvider.h" -#include "Log.h" -#include "DBUtils.h" -#include "resource.h" CExtraImages::CExtraImages() : m_hExtraIcons(ExtraIcon_Register(ICON_STR_QUOTE,QUOTES_PROTOCOL_NAME,Quotes_MakeIconName(ICON_STR_MAIN).c_str())), diff --git a/plugins/Quotes/src/ExtraImages.h b/plugins/Quotes/src/ExtraImages.h index cd09600217..ca9cfd7c42 100644 --- a/plugins/Quotes/src/ExtraImages.h +++ b/plugins/Quotes/src/ExtraImages.h @@ -1,8 +1,6 @@ #ifndef __9d0dac0c_12e4_46ce_809a_db6dc7d6f269_ExtraImages_h__ #define __9d0dac0c_12e4_46ce_809a_db6dc7d6f269_ExtraImages_h__ -#include "LightMutex.h" - class CExtraImages : private boost::noncopyable { public: diff --git a/plugins/Quotes/src/Forex.cpp b/plugins/Quotes/src/Forex.cpp index 1fbd17f439..8bc53324d2 100644 --- a/plugins/Quotes/src/Forex.cpp +++ b/plugins/Quotes/src/Forex.cpp @@ -3,33 +3,6 @@ #include "stdafx.h" -#pragma warning(disable:4996) -#include -#include -#pragma warning(default:4996) -#include "WorkingThread.h" -#include -#include "resource.h" -#include "IconLib.h" -#include -#include -#include "QuoteInfoDlg.h" -#include "ModuleInfo.h" -#include "QuotesProviders.h" -#include "IQuotesProvider.h" -#include "EconomicRateInfo.h" -#include "DBUtils.h" -#include "ExtraImages.h" -#include "HTTPSession.h" -#include "CurrencyConverter.h" -#ifdef CHART_IMPLEMENT -#include "QuoteChart.h" -#endif -#include "WinCtrlHelper.h" -#include "ImportExport.h" -#include "m_Quotes.h" -#include "version.h" - int hLangpack; HINSTANCE g_hInstance = NULL; HANDLE g_hEventWorkThreadStop; diff --git a/plugins/Quotes/src/HTMLParserMS.cpp b/plugins/Quotes/src/HTMLParserMS.cpp index bfe58b43b1..86b9c7d933 100644 --- a/plugins/Quotes/src/HTMLParserMS.cpp +++ b/plugins/Quotes/src/HTMLParserMS.cpp @@ -1,5 +1,4 @@ #include "StdAfx.h" -#include "HTMLParserMS.h" using _com_util::CheckError; diff --git a/plugins/Quotes/src/HTMLParserMS.h b/plugins/Quotes/src/HTMLParserMS.h index 0773efa42a..2a2673e720 100644 --- a/plugins/Quotes/src/HTMLParserMS.h +++ b/plugins/Quotes/src/HTMLParserMS.h @@ -1,10 +1,6 @@ #ifndef __3c99e3f7_ecd9_4d9b_8f86_fe293c5fc8e6_HTMLParserMS_h__ #define __3c99e3f7_ecd9_4d9b_8f86_fe293c5fc8e6_HTMLParserMS_h__ -#include "ihtmlparser.h" -#include "LightMutex.h" -#include "IHTMLEngine.h" - class CHTMLParserMS : public IHTMLParser { public: diff --git a/plugins/Quotes/src/HTTPSession.cpp b/plugins/Quotes/src/HTTPSession.cpp index aa66948ae9..4d618928aa 100644 --- a/plugins/Quotes/src/HTTPSession.cpp +++ b/plugins/Quotes/src/HTTPSession.cpp @@ -1,7 +1,4 @@ #include "StdAfx.h" -#include "HTTPSession.h" -#include "EconomicRateInfo.h" -#include "LightMutex.h" class CHTTPSession::CImpl { diff --git a/plugins/Quotes/src/HTTPSession.h b/plugins/Quotes/src/HTTPSession.h index fe93a2dce5..a37e109a43 100644 --- a/plugins/Quotes/src/HTTPSession.h +++ b/plugins/Quotes/src/HTTPSession.h @@ -1,8 +1,6 @@ #ifndef __8C9706FF_6B05_4d0d_85B8_5724E5DC0BA4_HTTPSession_h__ #define __8C9706FF_6B05_4d0d_85B8_5724E5DC0BA4_HTTPSession_h__ -#include - class CHTTPSession { public: diff --git a/plugins/Quotes/src/IQuotesProvider.h b/plugins/Quotes/src/IQuotesProvider.h index a03a2a9bcd..1317a115f6 100644 --- a/plugins/Quotes/src/IQuotesProvider.h +++ b/plugins/Quotes/src/IQuotesProvider.h @@ -3,9 +3,6 @@ #ifndef __ac71e133_786c_41a7_ab07_625b76ff2a8c_QuotesProvider_h__ #define __ac71e133_786c_41a7_ab07_625b76ff2a8c_QuotesProvider_h__ -#include -#include - class CQuotesProviderVisitor; class IQuotesProvider : private boost::noncopyable diff --git a/plugins/Quotes/src/IconLib.cpp b/plugins/Quotes/src/IconLib.cpp index ce7ad5cddc..2ea239fb6c 100644 --- a/plugins/Quotes/src/IconLib.cpp +++ b/plugins/Quotes/src/IconLib.cpp @@ -1,14 +1,4 @@ #include "StdAfx.h" -#include "IconLib.h" -#include -#include "resource.h" -#include "EconomicRateInfo.h" -#include -#include -#pragma warning (disable:4996) -#include -#pragma warning (default:4996) -#include "ModuleInfo.h" static IconItem iconList[] = { diff --git a/plugins/Quotes/src/ImportExport.cpp b/plugins/Quotes/src/ImportExport.cpp index 80ab41d309..c50e2f3cbf 100644 --- a/plugins/Quotes/src/ImportExport.cpp +++ b/plugins/Quotes/src/ImportExport.cpp @@ -1,19 +1,4 @@ #include "StdAfx.h" -#include "ImportExport.h" -#include "ModuleInfo.h" -#include "QuotesProviders.h" -#ifdef TEST_IMPORT_EXPORT -#include "m_Quotes.h" -#endif -#include "IXMLEngine.h" -#include "Base64.h" -#include "EconomicRateInfo.h" -#include "IQuotesProvider.h" -#include "QuotesProviderVisitor.h" -#include "QuotesProviderDukasCopy.h" -#include "QuotesProviderGoogle.h" -#include "QuotesProviderGoogleFinance.h" -#include "Locale.h" namespace { diff --git a/plugins/Quotes/src/LightMutex.cpp b/plugins/Quotes/src/LightMutex.cpp index 8d14e8e7bb..88f79c4388 100644 --- a/plugins/Quotes/src/LightMutex.cpp +++ b/plugins/Quotes/src/LightMutex.cpp @@ -1,5 +1,4 @@ #include "StdAfx.h" -#include "LightMutex.h" CLightMutex::CLightMutex() { diff --git a/plugins/Quotes/src/Locale.cpp b/plugins/Quotes/src/Locale.cpp index c01f67148a..25584e360a 100644 --- a/plugins/Quotes/src/Locale.cpp +++ b/plugins/Quotes/src/Locale.cpp @@ -1,5 +1,4 @@ #include "StdAfx.h" -#include "Locale.h" const std::locale GetSystemLocale() { diff --git a/plugins/Quotes/src/Log.cpp b/plugins/Quotes/src/Log.cpp index d692763bad..46fb0cc325 100644 --- a/plugins/Quotes/src/Log.cpp +++ b/plugins/Quotes/src/Log.cpp @@ -1,8 +1,4 @@ #include "StdAfx.h" -#include "Log.h" -#include "LightMutex.h" -#include "EconomicRateInfo.h" -#include "CreateFilePath.h" namespace { diff --git a/plugins/Quotes/src/ModuleInfo.cpp b/plugins/Quotes/src/ModuleInfo.cpp index 4caec96368..e166adc6ea 100644 --- a/plugins/Quotes/src/ModuleInfo.cpp +++ b/plugins/Quotes/src/ModuleInfo.cpp @@ -1,11 +1,4 @@ #include "StdAfx.h" -#include "ModuleInfo.h" -#include "QuotesProviders.h" -#include "HTMLParserMS.h" -#include "LightMutex.h" -#include "WinCtrlHelper.h" -#include "EconomicRateInfo.h" -#include "XMLEngineMI.h" namespace { diff --git a/plugins/Quotes/src/OptionDukasCopy.cpp b/plugins/Quotes/src/OptionDukasCopy.cpp index 6fcc542b09..8ba2d9768f 100644 --- a/plugins/Quotes/src/OptionDukasCopy.cpp +++ b/plugins/Quotes/src/OptionDukasCopy.cpp @@ -1,14 +1,4 @@ #include "StdAfx.h" -#include "OptionDukasCopy.h" -#include "IconLib.h" -#include "ModuleInfo.h" -#include "QuotesProviders.h" -#include "QuotesProviderDukasCopy.h" -#include "resource.h" -#include "EconomicRateInfo.h" -#include "CommonOptionDlg.h" - -// extern HANDLE g_hEventSettingsCnanged; namespace { diff --git a/plugins/Quotes/src/QuoteChart.cpp b/plugins/Quotes/src/QuoteChart.cpp index 5e5567cb0b..4f717f1275 100644 --- a/plugins/Quotes/src/QuoteChart.cpp +++ b/plugins/Quotes/src/QuoteChart.cpp @@ -1,20 +1,7 @@ #include "StdAfx.h" -#include "QuoteChart.h" #ifdef CHART_IMPLEMENT -// #include "QuotesProviderDukasCopy.h" -// #include "QuotesProviders.h" -#include "ModuleInfo.h" -#include "EconomicRateInfo.h" -// #include "WinCtrlHelper.h" -#include "resource.h" -#include "DBUtils.h" -#include "Locale.h" -#include "SettingsDlg.h" -#include "Chart.h" -#include "WinCtrlHelper.h" - #define WINDOW_PREFIX "Quotes Chart_" #define CHART_CTRL_CLASS _T("DioksinChart") diff --git a/plugins/Quotes/src/QuoteInfoDlg.cpp b/plugins/Quotes/src/QuoteInfoDlg.cpp index b828ee7931..a28aa838a9 100644 --- a/plugins/Quotes/src/QuoteInfoDlg.cpp +++ b/plugins/Quotes/src/QuoteInfoDlg.cpp @@ -1,14 +1,4 @@ #include "StdAfx.h" -#include "QuoteInfoDlg.h" -#include "EconomicRateInfo.h" -#include "resource.h" -#include "ModuleInfo.h" -#include "QuotesProviders.h" -#include "IconLib.h" -#include "DBUtils.h" -#include "IQuotesProvider.h" -#include "Locale.h" -#include "SettingsDlg.h" // extern HANDLE g_hWindowListEditSettings; extern HGENMENU g_hMenuEditSettings; diff --git a/plugins/Quotes/src/QuotesProviderBase.cpp b/plugins/Quotes/src/QuotesProviderBase.cpp index df4c11729f..d0d9c5fa6f 100644 Binary files a/plugins/Quotes/src/QuotesProviderBase.cpp and b/plugins/Quotes/src/QuotesProviderBase.cpp differ diff --git a/plugins/Quotes/src/QuotesProviderBase.h b/plugins/Quotes/src/QuotesProviderBase.h index 76db155f4c..7340d41f79 100644 --- a/plugins/Quotes/src/QuotesProviderBase.h +++ b/plugins/Quotes/src/QuotesProviderBase.h @@ -1,10 +1,6 @@ #ifndef __3e6cb4ec_fc47_468f_a2c8_a77941176bc9_QuotesProviderBase_h__ #define __3e6cb4ec_fc47_468f_a2c8_a77941176bc9_QuotesProviderBase_h__ -#include "iquotesprovider.h" -#include -#include "LightMutex.h" - class CQuotesProviderBase : public IQuotesProvider { public: diff --git a/plugins/Quotes/src/QuotesProviderDukasCopy.cpp b/plugins/Quotes/src/QuotesProviderDukasCopy.cpp index a7ffc5331a..3d8ac08a7b 100644 Binary files a/plugins/Quotes/src/QuotesProviderDukasCopy.cpp and b/plugins/Quotes/src/QuotesProviderDukasCopy.cpp differ diff --git a/plugins/Quotes/src/QuotesProviderDukasCopy.h b/plugins/Quotes/src/QuotesProviderDukasCopy.h index d6ec498bcf..6bd49fc87e 100644 --- a/plugins/Quotes/src/QuotesProviderDukasCopy.h +++ b/plugins/Quotes/src/QuotesProviderDukasCopy.h @@ -1,9 +1,6 @@ #ifndef __93121758_68c7_4836_b571_da84dfe82b84_QuotesProviderDukasCopy_h__ #define __93121758_68c7_4836_b571_da84dfe82b84_QuotesProviderDukasCopy_h__ -#include "quotesproviderbase.h" -#include - #define DB_STR_REFRESH_RATE_TYPE "RefreshRateType" #define DB_STR_REFRESH_RATE_VALUE "RefreshRateValue" #define DB_STR_DC_DISPLAY_NAME_FORMAT "DC_DisplayNameFormat" diff --git a/plugins/Quotes/src/QuotesProviderFinance.cpp b/plugins/Quotes/src/QuotesProviderFinance.cpp index e8b335035d..0dcfe6db54 100644 --- a/plugins/Quotes/src/QuotesProviderFinance.cpp +++ b/plugins/Quotes/src/QuotesProviderFinance.cpp @@ -1,13 +1,4 @@ #include "stdafx.h" -#include "QuotesProviderFinance.h" -#include "EconomicRateInfo.h" -#include "DBUtils.h" -#include "QuotesProviderVisitor.h" -#include "ModuleInfo.h" -#include "QuotesProviders.h" -#include "CommonOptionDlg.h" -#include "resource.h" -#include "WinCtrlHelper.h" void CQuotesProviderFinance::GetWatchedQuotes(TQuotes& raQuotes)const { diff --git a/plugins/Quotes/src/QuotesProviderFinance.h b/plugins/Quotes/src/QuotesProviderFinance.h index f63077071d..f5f0e547cc 100644 --- a/plugins/Quotes/src/QuotesProviderFinance.h +++ b/plugins/Quotes/src/QuotesProviderFinance.h @@ -1,8 +1,6 @@ #ifndef __95A13A68_0DF0_43FA_B6C1_81D83AED59AA_QuotesProviderFinance_h__ #define __95A13A68_0DF0_43FA_B6C1_81D83AED59AA_QuotesProviderFinance_h__ -#include "QuotesProviderBase.h" - class CQuotesProviderFinance : public CQuotesProviderBase { public: diff --git a/plugins/Quotes/src/QuotesProviderGoogle.cpp b/plugins/Quotes/src/QuotesProviderGoogle.cpp index d55f28fb82..a873a58b23 100644 --- a/plugins/Quotes/src/QuotesProviderGoogle.cpp +++ b/plugins/Quotes/src/QuotesProviderGoogle.cpp @@ -1,16 +1,4 @@ #include "StdAfx.h" -#include "QuotesProviderGoogle.h" -#include "resource.h" -#include "HTTPSession.h" -#include "Log.h" -#include "DBUtils.h" -#include "EconomicRateInfo.h" -#include "ModuleInfo.h" -#include "QuotesProviders.h" -#include "IHTMLParser.h" -#include "IHTMLEngine.h" -#include "CommonOptionDlg.h" -#include "QuotesProviderVisitor.h" CQuotesProviderGoogle::CQuotesProviderGoogle() { diff --git a/plugins/Quotes/src/QuotesProviderGoogle.h b/plugins/Quotes/src/QuotesProviderGoogle.h index 4289861178..48e3d27e11 100644 --- a/plugins/Quotes/src/QuotesProviderGoogle.h +++ b/plugins/Quotes/src/QuotesProviderGoogle.h @@ -1,8 +1,6 @@ #ifndef __c0e48a95_b3f0_4227_8adc_455e265f3c14_QuotesProviderGoogle_h__ #define __c0e48a95_b3f0_4227_8adc_455e265f3c14_QuotesProviderGoogle_h__ -#include "quotesproviderBase.h" - #define DB_STR_FROM_ID "FromID" #define DB_STR_TO_ID "ToID" #define DB_STR_FROM_DESCRIPTION "FromDesc" diff --git a/plugins/Quotes/src/QuotesProviderGoogleFinance.cpp b/plugins/Quotes/src/QuotesProviderGoogleFinance.cpp index 8a129b6b8b..729cc57b94 100644 --- a/plugins/Quotes/src/QuotesProviderGoogleFinance.cpp +++ b/plugins/Quotes/src/QuotesProviderGoogleFinance.cpp @@ -1,18 +1,4 @@ #include "StdAfx.h" -#include "QuotesProviderGoogleFinance.h" -#include "QuotesProviderVisitor.h" -#include "EconomicRateInfo.h" -#include "DBUtils.h" -#include "resource.h" -#include "ModuleInfo.h" -// #include "QuotesProviders.h" -// #include "CommonOptionDlg.h" -// #include "WinCtrlHelper.h" -#include "IHTMLParser.h" -#include "IHTMLEngine.h" -#include "HTTPSession.h" -#include "Log.h" -#include "Locale.h" CQuotesProviderGoogleFinance::CQuotesProviderGoogleFinance() { diff --git a/plugins/Quotes/src/QuotesProviderGoogleFinance.h b/plugins/Quotes/src/QuotesProviderGoogleFinance.h index 075498a4dd..de419225c9 100644 --- a/plugins/Quotes/src/QuotesProviderGoogleFinance.h +++ b/plugins/Quotes/src/QuotesProviderGoogleFinance.h @@ -1,8 +1,6 @@ #ifndef __89D3CC58_7DED_484f_AA25_62BDBB57E18B_QuotesProvider_Google_Finance_h__ #define __89D3CC58_7DED_484f_AA25_62BDBB57E18B_QuotesProvider_Google_Finance_h__ -#include "QuotesProviderFinance.h" - #define DB_STR_GOOGLE_FINANCE_OPEN_VALUE "OpenQuotePrice" #define DB_STR_GOOGLE_FINANCE_DIFF "DifferentFromStartOfDay" #define DB_STR_GOOGLE_FINANCE_PERCENT_CHANGE_TO_YERSTERDAY_CLOSE "PercentChangeToYersterdayClose" diff --git a/plugins/Quotes/src/QuotesProviderVisitorDbSettings.cpp b/plugins/Quotes/src/QuotesProviderVisitorDbSettings.cpp index 5caea48685..c5ea95b598 100644 --- a/plugins/Quotes/src/QuotesProviderVisitorDbSettings.cpp +++ b/plugins/Quotes/src/QuotesProviderVisitorDbSettings.cpp @@ -1,8 +1,4 @@ #include "StdAfx.h" -#include "QuotesProviderVisitorDbSettings.h" - -#include "QuotesProviderGoogle.h" -#include "QuotesProviderDukasCopy.h" CQuotesProviderVisitorDbSettings::CQuotesProviderVisitorDbSettings() : m_pszDbRefreshRateType(NULL), diff --git a/plugins/Quotes/src/QuotesProviderVisitorDbSettings.h b/plugins/Quotes/src/QuotesProviderVisitorDbSettings.h index 728a436dfa..596d5139b7 100644 --- a/plugins/Quotes/src/QuotesProviderVisitorDbSettings.h +++ b/plugins/Quotes/src/QuotesProviderVisitorDbSettings.h @@ -1,8 +1,6 @@ #ifndef __97cd432a_1119_4803_a96f_0abc1cc2653f_QuotesProviderVisitorDbSettings_h__ #define __97cd432a_1119_4803_a96f_0abc1cc2653f_QuotesProviderVisitorDbSettings_h__ -#include "quotesprovidervisitor.h" - class CQuotesProviderVisitorDbSettings : public CQuotesProviderVisitor { public: diff --git a/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.cpp b/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.cpp index 9e643fe1b6..cd71efaa0d 100644 --- a/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.cpp +++ b/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.cpp @@ -1,5 +1,4 @@ #include "StdAfx.h" -#include "QuotesProviderVisitorFormatSpecificator.h" CQuotesProviderVisitorFormatSpecificator::CQuotesProviderVisitorFormatSpecificator() { diff --git a/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.h b/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.h index 870ab00634..cb0c3c5df2 100644 --- a/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.h +++ b/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.h @@ -1,8 +1,6 @@ #ifndef __00c159f3_525a_41e9_8fc5_00464b6fafa3_QuotesProviderVisitorFormatSpecificator_h__ #define __00c159f3_525a_41e9_8fc5_00464b6fafa3_QuotesProviderVisitorFormatSpecificator_h__ -#include "quotesprovidervisitor.h" - class CQuotesProviderVisitorFormatSpecificator : public CQuotesProviderVisitor { public: diff --git a/plugins/Quotes/src/QuotesProviderVisitorFormater.cpp b/plugins/Quotes/src/QuotesProviderVisitorFormater.cpp index 4b1d73bb05..d95b4ed342 100644 --- a/plugins/Quotes/src/QuotesProviderVisitorFormater.cpp +++ b/plugins/Quotes/src/QuotesProviderVisitorFormater.cpp @@ -1,12 +1,4 @@ #include "StdAfx.h" -#include "QuotesProviderVisitorFormater.h" -#include "DBUtils.h" -#include "EconomicRateInfo.h" -#include "QuotesProviderGoogle.h" -#include "Locale.h" -#include "IsWithinAccuracy.h" -#include "QuotesProviderGoogleFinance.h" -#include "QuotesProviderYahoo.h" CQuotesProviderVisitorFormater::CQuotesProviderVisitorFormater(HANDLE hContact,TCHAR chr,int nWidth) : m_hContact(hContact), diff --git a/plugins/Quotes/src/QuotesProviderVisitorFormater.h b/plugins/Quotes/src/QuotesProviderVisitorFormater.h index 7c9c222269..412c4a9fda 100644 --- a/plugins/Quotes/src/QuotesProviderVisitorFormater.h +++ b/plugins/Quotes/src/QuotesProviderVisitorFormater.h @@ -1,8 +1,6 @@ #ifndef __2b5ddd05_9255_4be0_9408_e59768b70568_QuotesProviderVisitorFormater_h__ #define __2b5ddd05_9255_4be0_9408_e59768b70568_QuotesProviderVisitorFormater_h__ -#include "quotesprovidervisitor.h" - class CQuotesProviderVisitorFormater : public CQuotesProviderVisitor { public: diff --git a/plugins/Quotes/src/QuotesProviderVisitorTendency.cpp b/plugins/Quotes/src/QuotesProviderVisitorTendency.cpp index 00703521b3..752dcc403e 100644 --- a/plugins/Quotes/src/QuotesProviderVisitorTendency.cpp +++ b/plugins/Quotes/src/QuotesProviderVisitorTendency.cpp @@ -1,9 +1,4 @@ #include "stdafx.h" -#include "QuotesProviderVisitorTendency.h" -#include "DBUtils.h" -#include "QuotesProviderGoogleFinance.h" -#include "EconomicRateInfo.h" -#include "QuotesProviderYahoo.h" CQuotesProviderVisitorTendency::CQuotesProviderVisitorTendency(HANDLE hContact,TCHAR chr) : m_hContact(hContact),m_chr(chr),m_bValid(false),m_dResult(0.0) diff --git a/plugins/Quotes/src/QuotesProviderVisitorTendency.h b/plugins/Quotes/src/QuotesProviderVisitorTendency.h index fa0f04c5f0..c9acf27317 100644 --- a/plugins/Quotes/src/QuotesProviderVisitorTendency.h +++ b/plugins/Quotes/src/QuotesProviderVisitorTendency.h @@ -1,8 +1,6 @@ #ifndef __AD721194_E9944366_9CF1_0307460EF32F_QuotesProviderVisitorTendency_h__ #define __AD721194_E9944366_9CF1_0307460EF32F_QuotesProviderVisitorTendency_h__ -#include "quotesprovidervisitor.h" - class CQuotesProviderVisitorTendency : public CQuotesProviderVisitor { public: diff --git a/plugins/Quotes/src/QuotesProviderYahoo.cpp b/plugins/Quotes/src/QuotesProviderYahoo.cpp index 35edb3207c..567cb6423d 100644 --- a/plugins/Quotes/src/QuotesProviderYahoo.cpp +++ b/plugins/Quotes/src/QuotesProviderYahoo.cpp @@ -1,10 +1,4 @@ #include "stdafx.h" -#include "QuotesProviderYahoo.h" -#include "QuotesProviderVisitor.h" -#include "ModuleInfo.h" -#include "DBUtils.h" -#include "EconomicRateInfo.h" -#include "HTTPSession.h" namespace { diff --git a/plugins/Quotes/src/QuotesProviderYahoo.h b/plugins/Quotes/src/QuotesProviderYahoo.h index feadefbca4..a5209c504a 100644 --- a/plugins/Quotes/src/QuotesProviderYahoo.h +++ b/plugins/Quotes/src/QuotesProviderYahoo.h @@ -1,9 +1,6 @@ #ifndef __E927F394_5452_458E_AF48_71E44F9EE793_QuotesProviderYahoo_h__ #define __E927F394_5452_458E_AF48_71E44F9EE793_QuotesProviderYahoo_h__ -#include "QuotesProviderFinance.h" - - #define DB_STR_YAHOO_OPEN_VALUE "OpenQuotePrice" #define DB_STR_YAHOO_DAY_HIGH "DayHigh" #define DB_STR_YAHOO_DAY_LOW "DayLow" diff --git a/plugins/Quotes/src/QuotesProviders.cpp b/plugins/Quotes/src/QuotesProviders.cpp index 26cbb067ea..5867b12a87 100644 --- a/plugins/Quotes/src/QuotesProviders.cpp +++ b/plugins/Quotes/src/QuotesProviders.cpp @@ -1,12 +1,4 @@ #include "StdAfx.h" -#include "QuotesProviders.h" - -#include "QuotesProviderDukasCopy.h" -#include "EconomicRateInfo.h" -#include "QuotesProviderGoogle.h" -#include "DBUtils.h" -#include "QuotesProviderGoogleFinance.h" -#include "QuotesProviderYahoo.h" #define LAST_RUN_VERSION "LastRunVersion" diff --git a/plugins/Quotes/src/QuotesProviders.h b/plugins/Quotes/src/QuotesProviders.h index 02aa5184c9..8ccb3a5474 100644 --- a/plugins/Quotes/src/QuotesProviders.h +++ b/plugins/Quotes/src/QuotesProviders.h @@ -1,9 +1,6 @@ #ifndef __148306d1_da2a_43df_b1ad_0cdc8ef8a79e_QuotesProviders_h__ #define __148306d1_da2a_43df_b1ad_0cdc8ef8a79e_QuotesProviders_h__ -#include -#include - class IQuotesProvider; class CQuotesProviders diff --git a/plugins/Quotes/src/SettingsDlg.cpp b/plugins/Quotes/src/SettingsDlg.cpp index d426880cd0..108a77554c 100644 --- a/plugins/Quotes/src/SettingsDlg.cpp +++ b/plugins/Quotes/src/SettingsDlg.cpp @@ -1,14 +1,4 @@ #include "StdAfx.h" -#include "SettingsDlg.h" -#include "EconomicRateInfo.h" -#include "ModuleInfo.h" -#include "WinCtrlHelper.h" -#include "CreateFilePath.h" -#include "QuotesProviderVisitorDbSettings.h" -#include "DBUtils.h" -#include "resource.h" -#include "QuotesProviders.h" -#include "IQuotesProvider.h" #define WINDOW_PREFIX_SETTINGS "Edit Settings_" diff --git a/plugins/Quotes/src/WinCtrlHelper.cpp b/plugins/Quotes/src/WinCtrlHelper.cpp index 619fe3d41b..f9b2e340db 100644 --- a/plugins/Quotes/src/WinCtrlHelper.cpp +++ b/plugins/Quotes/src/WinCtrlHelper.cpp @@ -1,8 +1,4 @@ #include "stdafx.h" -#include "QuotesProviderVisitorFormatSpecificator.h" -#include "IQuotesProvider.h" -#include "resource.h" -#include "ModuleInfo.h" namespace { diff --git a/plugins/Quotes/src/WorkingThread.cpp b/plugins/Quotes/src/WorkingThread.cpp index bc4d80b734..23bd475a0a 100644 --- a/plugins/Quotes/src/WorkingThread.cpp +++ b/plugins/Quotes/src/WorkingThread.cpp @@ -1,7 +1,4 @@ #include "StdAfx.h" -#include "WorkingThread.h" - -#include "IQuotesProvider.h" void WorkingThread(void* pParam) { diff --git a/plugins/Quotes/src/XMLEngineMI.cpp b/plugins/Quotes/src/XMLEngineMI.cpp index 7e2adfb7d9..fd329db61d 100644 --- a/plugins/Quotes/src/XMLEngineMI.cpp +++ b/plugins/Quotes/src/XMLEngineMI.cpp @@ -1,5 +1,4 @@ #include "StdAfx.h" -#include "XMLEngineMI.h" XML_API xi; diff --git a/plugins/Quotes/src/XMLEngineMI.h b/plugins/Quotes/src/XMLEngineMI.h index 5e5a51232f..c1e29c87e9 100644 --- a/plugins/Quotes/src/XMLEngineMI.h +++ b/plugins/Quotes/src/XMLEngineMI.h @@ -1,8 +1,6 @@ #ifndef __0c3d1da4_92b7_431c_83e5_f998cd513f0d_XMLEngineMI_h__ #define __0c3d1da4_92b7_431c_83e5_f998cd513f0d_XMLEngineMI_h__ -#include "ixmlengine.h" - class CXMLEngineMI : public IXMLEngine { public: diff --git a/plugins/Quotes/src/stdafx.cpp b/plugins/Quotes/src/stdafx.cpp index e4738d8f60..54dddf84b3 100644 --- a/plugins/Quotes/src/stdafx.cpp +++ b/plugins/Quotes/src/stdafx.cpp @@ -1,8 +1,18 @@ -// stdafx.cpp : source file that includes just the standard includes -// Forex.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information +/* +Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org) -#include "stdafx.h" +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. -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "stdafx.h" diff --git a/plugins/Quotes/src/stdafx.h b/plugins/Quotes/src/stdafx.h index 5e72bc0e0b..aa9fe75d34 100644 --- a/plugins/Quotes/src/stdafx.h +++ b/plugins/Quotes/src/stdafx.h @@ -5,74 +5,43 @@ #pragma once -#include "targetver.h" -#define MIRANDA_VER 0x0A00 -// #define CHART_IMPLEMENT #define TEST_IMPORT_EXPORT - +//#define CHART_IMPLEMENT +#define _CRT_SECURE_NO_WARNINGS #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -// Windows Header Files: + #include -#include -#include -#include -#include -#include -#include #include -#include -#include +#include #include #include #include -#include #include #include -#include -#include - +#include -// Miranda headers -#pragma warning(disable: 4996) #include #include -#include #include -#pragma warning(default: 4996) #include #include #include #include -#include #include #include -#include #include #include #include #include + #include +#include -// boost headers -#include -#include -#include -#include +#include #include #include -#include -#include -#include -#include "boost/date_time/c_local_time_adjustor.hpp" - -// stl headers -#include -#include -#include -#include -#include -#include - +#include +#include typedef std::wstring tstring; typedef std::wostringstream tostringstream; @@ -84,11 +53,6 @@ typedef std::wistream tistream; typedef boost::posix_time::wtime_input_facet ttime_input_facet; typedef boost::posix_time::wtime_facet ttime_facet; -inline int quotes_stricmp(LPCTSTR p1,LPCTSTR p2) -{ - return _tcsicmp(p1,p2); -} - inline std::string quotes_t2a(const TCHAR* t) { std::string s; @@ -112,6 +76,58 @@ inline tstring quotes_a2t(const char* s) } return t; } + +inline int quotes_stricmp(LPCTSTR p1,LPCTSTR p2) +{ + return _tcsicmp(p1,p2); +} + +#include "resource.h" +#include "version.h" +#include "WorkingThread.h" +#include "IconLib.h" +#include "QuoteInfoDlg.h" +#include "ModuleInfo.h" +#include "DBUtils.h" +#include "HTTPSession.h" +#include "CurrencyConverter.h" +#include "WinCtrlHelper.h" +#include "ImportExport.h" +#include "Base64.h" +#include "ComHelper.h" +#include "Log.h" +#include "CommonOptionDlg.h" +#include "EconomicRateInfo.h" +#include "SettingsDlg.h" +#include "CreateFilePath.h" +#include "Locale.h" +#include "LightMutex.h" +#include "ExtraImages.h" +#include "IsWithinAccuracy.h" +#include "OptionDukasCopy.h" +#include "IQuotesProvider.h" +#include "QuotesProviders.h" +#include "QuotesProviderBase.h" +#include "QuotesProviderFinance.h" +#include "QuotesProviderGoogle.h" +#include "QuotesProviderYahoo.h" +#include "QuotesProviderDukasCopy.h" +#include "QuotesProviderGoogleFinance.h" +#include "QuotesProviderVisitor.h" +#include "QuotesProviderVisitorDbSettings.h" +#include "QuotesProviderVisitorFormater.h" +#include "QuotesProviderVisitorTendency.h" +#include "QuotesProviderVisitorFormatSpecificator.h" +#ifdef CHART_IMPLEMENT +#include "QuoteChart.h" +#include "Chart.h" +#endif +#include "IHTMLParser.h" +#include "IHTMLEngine.h" +#include "HTMLParserMS.h" +#include "IXMLEngine.h" +#include "XMLEngineMI.h" + namespace detail { template struct safe_string_impl diff --git a/plugins/Quotes/src/targetver.h b/plugins/Quotes/src/targetver.h deleted file mode 100644 index f583181dfd..0000000000 --- a/plugins/Quotes/src/targetver.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -// The following macros define the minimum required platform. The minimum required platform -// is the earliest version of Windows, Internet Explorer etc. that has the necessary features to run -// your application. The macros work by enabling all features available on platform versions up to and -// including the version specified. - -// Modify the following defines if you have to target a platform prior to the ones specified below. -// Refer to MSDN for the latest info on corresponding values for different platforms. -#ifndef WINVER // Specifies that the minimum required platform is Windows Vista. -#define WINVER 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows Vista. -#define _WIN32_WINNT 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINDOWS // Specifies that the minimum required platform is Windows 98. -#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later. -#endif - -#ifndef _WIN32_IE // Specifies that the minimum required platform is Internet Explorer 7.0. -#define _WIN32_IE 0x0700 // Change this to the appropriate value to target other versions of IE. -#endif diff --git a/plugins/Quotes/src/version.h b/plugins/Quotes/src/version.h index a80f032948..ffe9ac675b 100644 --- a/plugins/Quotes/src/version.h +++ b/plugins/Quotes/src/version.h @@ -4,18 +4,11 @@ #define __BUILD_NUM 0 #define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM -#define __FILEVERSION_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM - -#define __STRINGIFY_IMPL(x) #x -#define __STRINGIFY(x) __STRINGIFY_IMPL(x) -#define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) #define __PLUGIN_NAME "Quotes" -#define __INTERNAL_NAME "Quotes" #define __FILENAME "Quotes.dll" #define __DESCRIPTION "Shows currency rates and economic quotes." #define __AUTHOR "Dioksin" #define __AUTHOREMAIL "dioksin@ua.fm" #define __AUTHORWEB "http://miranda-ng.org/" #define __COPYRIGHT "Don't worry!" -#define SPECIAL_BUILD_STRING "5388" -- cgit v1.2.3