From be0f3de3ea7da8c4e171620eee9c7220f5549952 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Wed, 6 Feb 2019 13:08:09 +0300 Subject: Fingerprint: remove WhatsApp and QQ support --- plugins/FingerprintNG/src/finger_groups.h | 5 ----- plugins/FingerprintNG/src/masks.cpp | 29 ----------------------------- plugins/FingerprintNG/src/options.cpp | 4 +--- plugins/FingerprintNG/src/resource.h | 26 -------------------------- plugins/FingerprintNG/src/stdafx.h | 1 - 5 files changed, 1 insertion(+), 64 deletions(-) (limited to 'plugins/FingerprintNG/src') diff --git a/plugins/FingerprintNG/src/finger_groups.h b/plugins/FingerprintNG/src/finger_groups.h index 46e2964cdf..685fafb1f2 100644 --- a/plugins/FingerprintNG/src/finger_groups.h +++ b/plugins/FingerprintNG/src/finger_groups.h @@ -43,11 +43,6 @@ case MSN_CASE: return LPGENW("Client icons") L"/" LPGENW("MSN clients"); break; -case QQ_CASE: - if (g_plugin.getByte("GroupQQ", 1)) - return LPGENW("Client icons") L"/" LPGENW("QQ clients"); - break; - case RSS_CASE: if (g_plugin.getByte("GroupRSS", 1)) return LPGENW("Client icons") L"/" LPGENW("RSS clients"); diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp index 03ad3ed2ba..6f262441ec 100644 --- a/plugins/FingerprintNG/src/masks.cpp +++ b/plugins/FingerprintNG/src/masks.cpp @@ -514,20 +514,6 @@ KN_FP_MASK def_kn_fp_mask[] = { "client_atom3", L"*Atom*3*", L"Atom 3", IDI_ATOM3, RSS_CASE, TRUE }, { "client_atom1", L"*Atom*1*", L"Atom 1", IDI_ATOM1, RSS_CASE, TRUE }, - //######################################################################################################################################################################### - //################################# QQ ############################################################################################################################### - //######################################################################################################################################################################### - { "client_MobileQQ", L"|Mobile*QQ*|iPhone*QQ*|QQ WAP*", L"Mobile QQ", IDI_MOBILEQQ, QQ_CASE, TRUE }, - { "client_QQConcept", L"QQ*Concept*", L"QQ Concept", IDI_QQCONCEPT, QQ_CASE, TRUE }, - { "client_QQCRM", L"QQ*CRM*", L"QQ CRM", IDI_QQCRM, QQ_CASE, TRUE }, - { "client_QQSilver", L"QQ*Silverlight*", L"QQ Silverlight", IDI_QQSILVER, QQ_CASE, TRUE }, - { "client_TM2008", L"|TM2008*|TM2009*|TM2010*", LPGENW("TM 2008 and >"), IDI_TM2008, QQ_CASE }, - { "client_TM", L"TM*", L"TM", IDI_TM, QQ_CASE }, - { "client_QQInt", L"QQ*International*", L"QQ International", IDI_QQINT, QQ_CASE }, - { "client_YamQQ", L"YamQQ*", L"Yam QQ", IDI_YAMQQ, QQ_CASE }, - { "client_WebQQ", L"WebQQ*", L"WebQQ", IDI_WEBQQ, QQ_CASE }, - { "client_QQ", L"QQ*", L"QQ", IDI_QQ, QQ_CASE }, - //######################################################################################################################################################################### //################################# GADU-GADU ######################################################################################################################### //######################################################################################################################################################################### @@ -642,7 +628,6 @@ KN_FP_MASK def_kn_fp_overlays_mask[] = { "client_JGTalk_overlay", L"*JGTalk*", LPGENW("JGTalk overlay"), IDI_JGTALK_OVERLAY, OVERLAYS_PROTO_CASE }, { "client_Jabber_overlay", L"|^jabber*|Miranda*Jabber*|py*jabb*", LPGENW("Jabber overlay"), IDI_JABBER_OVERLAY, OVERLAYS_PROTO_CASE }, { "client_MSN_overlay", L"|^MSN*|*Miranda*MSN*", LPGENW("MSN overlay"), IDI_MSN_OVERLAY, OVERLAYS_PROTO_CASE }, - { "client_QQ_overlay", L"|Miranda*QQ*|MIM*QQ*", LPGENW("QQ overlay"), IDI_QQ_OVERLAY, OVERLAYS_PROTO_CASE }, { "client_VK_overlay", L"|Miranda*VKontakte*", LPGENW("VK overlay"), IDI_VK_OVERLAY, OVERLAYS_PROTO_CASE }, { "client_Skype_overlay", L"|Miranda*Skype*", LPGENW("Skype overlay"), IDI_SKYPE_OVERLAY, OVERLAYS_PROTO_CASE }, @@ -656,20 +641,6 @@ KN_FP_MASK def_kn_fp_overlays_mask[] = { "client_GG_9", L"|Gadu-Gadu*9*|GG*9*", LPGENW("Gadu-Gadu v9 client"), IDI_GG9_OVERLAY, GG_CASE }, { "client_GG_8", L"|Gadu-Gadu*8*|GG*8*", LPGENW("Gadu-Gadu v8 client"), IDI_GG8_OVERLAY, GG_CASE }, - { "client_QQ_2012", L"|QQ2012*|TM2012*", LPGENW("TM/QQ 2012 overlay"), IDI_QQ_2012_OVERLAY, QQ_CASE }, - { "client_QQ_2011", L"|QQ2011*|TM2011*", LPGENW("TM/QQ 2011 overlay"), IDI_QQ_2011_OVERLAY, QQ_CASE }, - { "client_QQ_2010", L"|QQ2010*|TM2010*", LPGENW("TM/QQ 2010 overlay"), IDI_QQ_2010_OVERLAY, QQ_CASE }, - { "client_QQ_2009", L"|QQ2009*|TM2009*", LPGENW("TM/QQ 2009 overlay"), IDI_QQ_2009_OVERLAY, QQ_CASE }, - { "client_QQ_2008", L"|QQ2008*|TM2008*", LPGENW("TM/QQ 2008 overlay"), IDI_QQ_2008_OVERLAY, QQ_CASE }, - { "client_QQ_2007", L"|QQ2007*|TM2007*", LPGENW("TM/QQ 2007 overlay"), IDI_QQ_2007_OVERLAY, QQ_CASE }, - { "client_QQ_2006", L"|QQ2006*|TM2006*", LPGENW("TM/QQ 2006 overlay"), IDI_QQ_2006_OVERLAY, QQ_CASE }, - { "client_QQ_2005", L"|QQ2005*|TM2005*", LPGENW("TM/QQ 2005 overlay"), IDI_QQ_2005_OVERLAY, QQ_CASE }, - { "client_QQ_2004", L"QQ2004*", LPGENW("QQ 2004 overlay"), IDI_QQ_2004_OVERLAY, QQ_CASE }, - { "client_QQ_2003", L"|QQ2003*|TM 3.*", LPGENW("TM 3.x / QQ 2003 overlay"), IDI_QQ_2003_OVERLAY, QQ_CASE }, - { "client_TM_2002", L"TM 2.*", LPGENW("TM 2.x overlay"), IDI_QQ_2002_OVERLAY, QQ_CASE }, - { "client_TM_2001", L"TM 1.*", LPGENW("TM 1.x overlay"), IDI_QQ_2001_OVERLAY, QQ_CASE }, - { "client_QQ_2000", L"QQ2000*", LPGENW("QQ 2000 overlay"), IDI_QQ_2000_OVERLAY, QQ_CASE }, - //######################################################################################################################################################################### //################################# PLATFORM OVERLAYS ################################################################################################################# //######################################################################################################################################################################### diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp index 5d9378aa13..85ab514eb7 100644 --- a/plugins/FingerprintNG/src/options.cpp +++ b/plugins/FingerprintNG/src/options.cpp @@ -38,7 +38,6 @@ static settings[] = { IDC_GROUP_IRC, TRUE, "GroupIRC" }, { IDC_GROUP_JABBER, TRUE, "GroupJabber" }, { IDC_GROUP_MSN, TRUE, "GroupMSN" }, - { IDC_GROUP_QQ, TRUE, "GroupQQ" }, { IDC_GROUP_RSS, TRUE, "GroupRSS" }, { IDC_GROUP_WEATHER, TRUE, "GroupWeather" }, { IDC_GROUP_FACEBOOK, TRUE, "GroupFacebook" }, @@ -58,7 +57,7 @@ static settings[] = class COptDialog : public CDlgBase { CCtrlCheck m_chkMiranda, m_chkMirandaPacks, m_chkMirandaVer, m_chkOverRes, m_chkOverPlatf, m_chkOverProto, m_chkOverUnicode, m_chkOverSecur, - m_chkFacebbok, m_chkGG, m_chkICQ, m_chkIRC, m_chkJabber, m_chkMSN, m_chkQQ, m_chkRSS, m_chkVK, m_chkWeather, m_chkMulti, m_chkOthersProto, + m_chkFacebbok, m_chkGG, m_chkICQ, m_chkIRC, m_chkJabber, m_chkMSN, m_chkRSS, m_chkVK, m_chkWeather, m_chkMulti, m_chkOthersProto, m_chkOthers, m_chkStatusBar; void LoadDBCheckState(int idCtrl, LPCSTR szSetting, BYTE bDef) @@ -90,7 +89,6 @@ public: m_chkIRC(this, IDC_GROUP_IRC), m_chkJabber(this, IDC_GROUP_JABBER), m_chkMSN(this, IDC_GROUP_MSN), - m_chkQQ(this, IDC_GROUP_QQ), m_chkRSS(this, IDC_GROUP_RSS), m_chkVK(this, IDC_GROUP_VK), m_chkWeather(this, IDC_GROUP_WEATHER), diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h index 4c54f65033..3874fc2ac5 100644 --- a/plugins/FingerprintNG/src/resource.h +++ b/plugins/FingerprintNG/src/resource.h @@ -60,7 +60,6 @@ #define IDI_JABBER_OVERLAY 83 #define IDI_JGTALK_OVERLAY 84 #define IDI_MSN_OVERLAY 86 -#define IDI_QQ_OVERLAY 87 #define IDI_VK_OVERLAY 90 #define IDI_SKYPE_OVERLAY 91 #define IDI_SECUREIM_OVERLAY 95 @@ -395,29 +394,6 @@ #define IDI_RSS09 763 #define IDI_RSS1 764 #define IDI_RSS2 765 -#define IDI_MOBILEQQ 770 -#define IDI_QQ 771 -#define IDI_QQCONCEPT 772 -#define IDI_QQCRM 773 -#define IDI_QQINT 774 -#define IDI_QQSILVER 775 -#define IDI_TM 776 -#define IDI_TM2008 777 -#define IDI_WEBQQ 778 -#define IDI_QQ_2000_OVERLAY 780 -#define IDI_QQ_2001_OVERLAY 781 -#define IDI_QQ_2002_OVERLAY 782 -#define IDI_QQ_2003_OVERLAY 783 -#define IDI_QQ_2004_OVERLAY 784 -#define IDI_QQ_2005_OVERLAY 785 -#define IDI_QQ_2006_OVERLAY 786 -#define IDI_QQ_2007_OVERLAY 787 -#define IDI_QQ_2008_OVERLAY 788 -#define IDI_QQ_2009_OVERLAY 789 -#define IDI_QQ_2010_OVERLAY 790 -#define IDI_QQ_2011_OVERLAY 791 -#define IDI_QQ_2012_OVERLAY 792 -#define IDI_YAMQQ 799 #define IDI_ACCU 801 #define IDI_GISMETEO 802 #define IDI_INTELLI 803 @@ -531,7 +507,6 @@ #define IDI_TWITTER 9003 #define IDI_HANGOUTS 9005 #define IDI_VK 9006 -#define IDI_WHATSAPP 9007 #define IDI_STEAM 9008 #define IDI_VK_KATE 9009 #define IDI_VK_MESSENGER 9010 @@ -548,7 +523,6 @@ #define IDC_GROUP_IRC 10033 #define IDC_GROUP_JABBER 10034 #define IDC_GROUP_MSN 10035 -#define IDC_GROUP_QQ 10037 #define IDC_GROUP_RSS 10038 #define IDC_GROUP_WEATHER 10040 #define IDC_GROUP_FACEBOOK 10042 diff --git a/plugins/FingerprintNG/src/stdafx.h b/plugins/FingerprintNG/src/stdafx.h index a0d7d3ffe1..18e0de9c71 100644 --- a/plugins/FingerprintNG/src/stdafx.h +++ b/plugins/FingerprintNG/src/stdafx.h @@ -83,7 +83,6 @@ struct FOUNDINFO #define IRC_CASE 3009 // IRC clients #define JABBER_CASE 3010 // Jabber clients #define MSN_CASE 3012 // MSN clients -#define QQ_CASE 3013 // QQ clients (+ versions) #define RSS_CASE 3014 // RSS clients #define WEATHER_CASE 3016 // Weather clients #define FACEBOOK_CASE 3018 // Facebook clients -- cgit v1.2.3