Quotes: hidden setting and not used icon removed (fixes #292)

7 files changed, 1 insertions, 27 deletions

diff --git a/plugins/Quotes/proto_Quotes/res/proto_occupied.ico b/plugins/Quotes/proto_Quotes/res/proto_occupied.ico
deleted file mode 100644
index 1fbaa99523..0000000000
--- a/plugins/Quotes/proto_Quotes/res/proto_occupied.ico
+++ /dev/null
diff --git a/plugins/Quotes/src/ModuleInfo.cpp b/plugins/Quotes/src/ModuleInfo.cpp
index ffdc8542a7..a362bf9133 100644
--- a/plugins/Quotes/src/ModuleInfo.cpp
+++ b/plugins/Quotes/src/ModuleInfo.cpp
@@ -5,7 +5,6 @@ static CModuleInfo::THTMLEnginePtr g_pHTMLEngine;
 static mir_cs g_lmParsers;

 

 CModuleInfo::CModuleInfo()

-	: m_bExtendedStatusInfo(1 == db_get_b(NULL, QUOTES_MODULE_NAME, "ExtendedStatus", false))

 {

 }

 

@@ -97,9 +96,4 @@ bool CModuleInfo::Verify()
 	}

 

 	return true;

-}

-

-bool CModuleInfo::GetExtendedStatusFlag()const

-{

-	return m_bExtendedStatusInfo;

-}

+}
\ No newline at end of file
diff --git a/plugins/Quotes/src/ModuleInfo.h b/plugins/Quotes/src/ModuleInfo.h
index fdc67ccd6a..6f33844c83 100644
--- a/plugins/Quotes/src/ModuleInfo.h
+++ b/plugins/Quotes/src/ModuleInfo.h
@@ -22,7 +22,6 @@ public:
 

 	void OnMirandaShutdown();

 	MWindowList GetWindowList(const std::string& rsKey, bool bAllocateIfNonExist = true);

-	bool GetExtendedStatusFlag()const;

 

 	static bool Verify();

 

@@ -37,7 +36,6 @@ public:
 private:

 	typedef std::map<std::string, MWindowList> THandles;

 	THandles m_ahWindowLists;

-	bool m_bExtendedStatusInfo;

 };

 

 #endif //__d0f22b66_3135_4bbe_bee5_a31ea631ce58_ModuleInfo__

diff --git a/plugins/Quotes/src/QuotesProviderDukasCopy.cpp b/plugins/Quotes/src/QuotesProviderDukasCopy.cpp
index c86049c521..064ce9dcec 100644
--- a/plugins/Quotes/src/QuotesProviderDukasCopy.cpp
+++ b/plugins/Quotes/src/QuotesProviderDukasCopy.cpp
@@ -165,11 +165,6 @@ bool parse_HTML(const tstring& sHTML, TEconomicRates& raRates)
 

 void CQuotesProviderDukasCopy::RefreshQuotes(TContracts& anContacts)

 {

-	if (CModuleInfo::GetInstance().GetExtendedStatusFlag()) {

-		std::for_each(anContacts.begin(), anContacts.end(),

-			boost::bind(SetContactStatus, _1, ID_STATUS_OCCUPIED));

-	}

-

 	tstring sURL = BuildHTTPURL();

 

 	CHTTPSession http;

diff --git a/plugins/Quotes/src/QuotesProviderGoogle.cpp b/plugins/Quotes/src/QuotesProviderGoogle.cpp
index 63b60b3e8b..94d39e5d46 100644
--- a/plugins/Quotes/src/QuotesProviderGoogle.cpp
+++ b/plugins/Quotes/src/QuotesProviderGoogle.cpp
@@ -145,15 +145,9 @@ void CQuotesProviderGoogle::RefreshQuotes(TContracts& anContacts)
 	CHTTPSession http;

 	tstring sURL = GetURL();

 

-	bool bUseExtendedStatus = CModuleInfo::GetInstance().GetExtendedStatusFlag();

-

 	for (TContracts::const_iterator i = anContacts.begin(); i != anContacts.end() && IsOnline(); ++i) {

 		MCONTACT hContact = *i;

 

-		if (bUseExtendedStatus) {

-			SetContactStatus(hContact, ID_STATUS_OCCUPIED);

-		}

-

 		tstring sFullURL = build_url(hContact, sURL);

 		// 		LogIt(Info,sFullURL);

 		if ((true == http.OpenURL(sFullURL)) && (true == IsOnline())) {

diff --git a/plugins/Quotes/src/QuotesProviderGoogleFinance.cpp b/plugins/Quotes/src/QuotesProviderGoogleFinance.cpp
index 253fe16172..09d4546573 100644
--- a/plugins/Quotes/src/QuotesProviderGoogleFinance.cpp
+++ b/plugins/Quotes/src/QuotesProviderGoogleFinance.cpp
@@ -239,14 +239,10 @@ void CQuotesProviderGoogleFinance::RefreshQuotes(TContracts& anContacts)
 {

 	CHTTPSession http;

 	tstring sURL = GetURL();

-	bool bUseExtendedStatus = CModuleInfo::GetInstance().GetExtendedStatusFlag();

 

 	for (TContracts::const_iterator i = anContacts.begin(); i != anContacts.end() && IsOnline(); ++i) {

 		MCONTACT hContact = *i;

 

-		if (bUseExtendedStatus)

-			SetContactStatus(hContact, ID_STATUS_OCCUPIED);

-

 		tstring sFullURL = build_url(hContact, sURL);

 

 		if ((true == http.OpenURL(sFullURL)) && (true == IsOnline())) {

diff --git a/plugins/Quotes/src/QuotesProviderYahoo.cpp b/plugins/Quotes/src/QuotesProviderYahoo.cpp
index 4950acd78c..c08a7c1ce8 100644
--- a/plugins/Quotes/src/QuotesProviderYahoo.cpp
+++ b/plugins/Quotes/src/QuotesProviderYahoo.cpp
@@ -50,7 +50,6 @@ bool get_double_from_parsed_line(MCONTACT hContact, const TStrings& rasParsedLin
 void CQuotesProviderYahoo::RefreshQuotes(TContracts& anContacts)

 {

 	tstring sURL = GetURL();

-	bool bUseExtendedStatus = CModuleInfo::GetInstance().GetExtendedStatusFlag();

 

 	typedef std::map<tstring, MCONTACT> TQuoteID2ContractHandles;

 	TQuoteID2ContractHandles aQuoteID2Handles;

@@ -58,8 +57,6 @@ void CQuotesProviderYahoo::RefreshQuotes(TContracts& anContacts)
 	oURL << sURL << L"dioksin.txt?s=";

 	for (TContracts::const_iterator i = anContacts.begin(); i != anContacts.end() && IsOnline(); ++i) {

 		MCONTACT hContact = *i;

-		if (bUseExtendedStatus)

-			SetContactStatus(hContact, ID_STATUS_OCCUPIED);

 

 		tstring sQuoteID = Quotes_DBGetStringT(hContact, QUOTES_MODULE_NAME, DB_STR_QUOTE_ID);

 		aQuoteID2Handles[sQuoteID] = hContact;