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 --- .../iconpacks/res/Others/WhatsApp.ico | Bin 1150 -> 0 bytes .../iconpacks/res/Overlays/overlay_proto_QQ.ico | Bin 1150 -> 0 bytes .../FingerprintNG/iconpacks/res/QQ/Mobile QQ.ico | Bin 1150 -> 0 bytes plugins/FingerprintNG/iconpacks/res/QQ/QQ CRM.ico | Bin 1150 -> 0 bytes .../FingerprintNG/iconpacks/res/QQ/QQ Concept.ico | Bin 1150 -> 0 bytes .../iconpacks/res/QQ/QQ International.ico | Bin 1150 -> 0 bytes .../iconpacks/res/QQ/QQ Silverlight.ico | Bin 1150 -> 0 bytes plugins/FingerprintNG/iconpacks/res/QQ/QQ.ico | Bin 1150 -> 0 bytes plugins/FingerprintNG/iconpacks/res/QQ/TM 2008.ico | Bin 1150 -> 0 bytes plugins/FingerprintNG/iconpacks/res/QQ/TM.ico | Bin 1150 -> 0 bytes plugins/FingerprintNG/iconpacks/res/QQ/WebQQ.ico | Bin 1150 -> 0 bytes plugins/FingerprintNG/iconpacks/res/QQ/Yam QQ.ico | Bin 1150 -> 0 bytes .../iconpacks/res/QQ/overlay_QQ_2000.ico | Bin 1150 -> 0 bytes .../iconpacks/res/QQ/overlay_QQ_2001.ico | Bin 1150 -> 0 bytes .../iconpacks/res/QQ/overlay_QQ_2002.ico | Bin 1150 -> 0 bytes .../iconpacks/res/QQ/overlay_QQ_2003.ico | Bin 1150 -> 0 bytes .../iconpacks/res/QQ/overlay_QQ_2004.ico | Bin 1150 -> 0 bytes .../iconpacks/res/QQ/overlay_QQ_2005.ico | Bin 1150 -> 0 bytes .../iconpacks/res/QQ/overlay_QQ_2006.ico | Bin 1150 -> 0 bytes .../iconpacks/res/QQ/overlay_QQ_2007.ico | Bin 1150 -> 0 bytes .../iconpacks/res/QQ/overlay_QQ_2008.ico | Bin 1150 -> 0 bytes .../iconpacks/res/QQ/overlay_QQ_2009.ico | Bin 1150 -> 0 bytes .../iconpacks/res/QQ/overlay_QQ_2010.ico | Bin 1150 -> 0 bytes .../iconpacks/res/QQ/overlay_QQ_2011.ico | Bin 1150 -> 0 bytes .../iconpacks/res/QQ/overlay_QQ_2012.ico | Bin 1150 -> 0 bytes plugins/FingerprintNG/iconpacks/res/fp_icons.rc | 25 ------------------ plugins/FingerprintNG/res/resource.rc | 1 - 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 - 32 files changed, 1 insertion(+), 90 deletions(-) delete mode 100644 plugins/FingerprintNG/iconpacks/res/Others/WhatsApp.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_QQ.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/Mobile QQ.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/QQ CRM.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/QQ Concept.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/QQ International.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/QQ Silverlight.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/QQ.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/TM 2008.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/TM.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/WebQQ.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/Yam QQ.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2000.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2001.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2002.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2003.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2004.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2005.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2006.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2007.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2008.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2009.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2010.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2011.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2012.ico diff --git a/plugins/FingerprintNG/iconpacks/res/Others/WhatsApp.ico b/plugins/FingerprintNG/iconpacks/res/Others/WhatsApp.ico deleted file mode 100644 index 3388be0b11..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/Others/WhatsApp.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_QQ.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_QQ.ico deleted file mode 100644 index cd872bcb50..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_QQ.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/Mobile QQ.ico b/plugins/FingerprintNG/iconpacks/res/QQ/Mobile QQ.ico deleted file mode 100644 index 1bf24488b2..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/Mobile QQ.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/QQ CRM.ico b/plugins/FingerprintNG/iconpacks/res/QQ/QQ CRM.ico deleted file mode 100644 index a7b018b7dd..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/QQ CRM.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/QQ Concept.ico b/plugins/FingerprintNG/iconpacks/res/QQ/QQ Concept.ico deleted file mode 100644 index 0c29ad082f..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/QQ Concept.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/QQ International.ico b/plugins/FingerprintNG/iconpacks/res/QQ/QQ International.ico deleted file mode 100644 index 089a89742c..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/QQ International.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/QQ Silverlight.ico b/plugins/FingerprintNG/iconpacks/res/QQ/QQ Silverlight.ico deleted file mode 100644 index ca643539db..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/QQ Silverlight.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/QQ.ico b/plugins/FingerprintNG/iconpacks/res/QQ/QQ.ico deleted file mode 100644 index 68e95e61f3..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/QQ.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/TM 2008.ico b/plugins/FingerprintNG/iconpacks/res/QQ/TM 2008.ico deleted file mode 100644 index 55b6fa3c2c..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/TM 2008.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/TM.ico b/plugins/FingerprintNG/iconpacks/res/QQ/TM.ico deleted file mode 100644 index fcbb65da6b..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/TM.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/WebQQ.ico b/plugins/FingerprintNG/iconpacks/res/QQ/WebQQ.ico deleted file mode 100644 index b22bab5a2a..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/WebQQ.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/Yam QQ.ico b/plugins/FingerprintNG/iconpacks/res/QQ/Yam QQ.ico deleted file mode 100644 index b6bad653e0..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/Yam QQ.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2000.ico b/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2000.ico deleted file mode 100644 index 5e3b758773..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2000.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2001.ico b/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2001.ico deleted file mode 100644 index 5300fcbbdc..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2001.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2002.ico b/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2002.ico deleted file mode 100644 index 529aff661d..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2002.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2003.ico b/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2003.ico deleted file mode 100644 index f18af5bad3..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2003.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2004.ico b/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2004.ico deleted file mode 100644 index 431f7c51a6..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2004.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2005.ico b/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2005.ico deleted file mode 100644 index 3b4deadeba..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2005.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2006.ico b/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2006.ico deleted file mode 100644 index 1f2b3a98a9..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2006.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2007.ico b/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2007.ico deleted file mode 100644 index 263cb4f4b0..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2007.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2008.ico b/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2008.ico deleted file mode 100644 index 29d13060f0..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2008.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2009.ico b/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2009.ico deleted file mode 100644 index 495ef1436f..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2009.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2010.ico b/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2010.ico deleted file mode 100644 index 789f9eda5f..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2010.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2011.ico b/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2011.ico deleted file mode 100644 index 3274bc4a50..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2011.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2012.ico b/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2012.ico deleted file mode 100644 index 9d509b14af..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/QQ/overlay_QQ_2012.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc index 634c904cb2..effef7710a 100644 --- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc +++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc @@ -439,29 +439,6 @@ IDI_XIRCON ICON "IRC\\XIRCON.ico" IDI_ZNC ICON "IRC\\znc.ico" IDI_ZSIRC ICON "IRC\\zsIRC.ico" IDI_POCKET_IRC ICON "IRC\\Pocket IRC.ico" -IDI_QQ ICON "QQ\\QQ.ico" -IDI_QQCONCEPT ICON "QQ\\QQ Concept.ico" -IDI_QQCRM ICON "QQ\\QQ CRM.ico" -IDI_QQINT ICON "QQ\\QQ International.ico" -IDI_QQSILVER ICON "QQ\\QQ Silverlight.ico" -IDI_MOBILEQQ ICON "QQ\\Mobile QQ.ico" -IDI_WEBQQ ICON "QQ\\WebQQ.ico" -IDI_YAMQQ ICON "QQ\\Yam QQ.ico" -IDI_TM ICON "QQ\\TM.ico" -IDI_TM2008 ICON "QQ\\TM 2008.ico" -IDI_QQ_2000_OVERLAY ICON "QQ\\overlay_QQ_2000.ico" -IDI_QQ_2001_OVERLAY ICON "QQ\\overlay_QQ_2001.ico" -IDI_QQ_2002_OVERLAY ICON "QQ\\overlay_QQ_2002.ico" -IDI_QQ_2003_OVERLAY ICON "QQ\\overlay_QQ_2003.ico" -IDI_QQ_2004_OVERLAY ICON "QQ\\overlay_QQ_2004.ico" -IDI_QQ_2005_OVERLAY ICON "QQ\\overlay_QQ_2005.ico" -IDI_QQ_2006_OVERLAY ICON "QQ\\overlay_QQ_2006.ico" -IDI_QQ_2007_OVERLAY ICON "QQ\\overlay_QQ_2007.ico" -IDI_QQ_2008_OVERLAY ICON "QQ\\overlay_QQ_2008.ico" -IDI_QQ_2009_OVERLAY ICON "QQ\\overlay_QQ_2009.ico" -IDI_QQ_2010_OVERLAY ICON "QQ\\overlay_QQ_2010.ico" -IDI_QQ_2011_OVERLAY ICON "QQ\\overlay_QQ_2011.ico" -IDI_QQ_2012_OVERLAY ICON "QQ\\overlay_QQ_2012.ico" IDI_ATOM1 ICON "rss\\Atom 1.ico" IDI_ATOM3 ICON "rss\\Atom 3.ico" IDI_RSS09 ICON "rss\\RSS 0.9.ico" @@ -507,7 +484,6 @@ IDI_VK_PHOENIX_LITE ICON "VKontakte\\phoenix_lite.ico" IDI_SKYPE ICON "others\\Skype.ico" IDI_TWITTER ICON "others\\Twitter.ico" IDI_HANGOUTS ICON "others\\Google+ Hangouts.ico" -IDI_WHATSAPP ICON "others\\WhatsApp.ico" IDI_STEAM ICON "others\\Steam.ico" IDI_GMAIL_OVERLAY ICON "overlays\\overlay_proto_Gmail.ico" IDI_ICQ_OVERLAY ICON "overlays\\overlay_proto_ICQ.ico" @@ -515,7 +491,6 @@ IDI_IRC_OVERLAY ICON "overlays\\overlay_proto_IRC.ico IDI_JABBER_OVERLAY ICON "overlays\\overlay_proto_Jabber.ico" IDI_JGTALK_OVERLAY ICON "overlays\\overlay_proto_JGTalk.ico" IDI_MSN_OVERLAY ICON "overlays\\overlay_proto_MSN.ico" -IDI_QQ_OVERLAY ICON "overlays\\overlay_proto_QQ.ico" IDI_VK_OVERLAY ICON "overlays\\overlay_proto_VK.ico" IDI_SKYPE_OVERLAY ICON "overlays\\overlay_proto_skype.ico" IDI_DEBUG_OVERLAY ICON "overlays\\overlay_resource_debug.ico" diff --git a/plugins/FingerprintNG/res/resource.rc b/plugins/FingerprintNG/res/resource.rc index 05d2422296..bf2519d7d5 100644 --- a/plugins/FingerprintNG/res/resource.rc +++ b/plugins/FingerprintNG/res/resource.rc @@ -83,7 +83,6 @@ BEGIN CONTROL "IRC clients",IDC_GROUP_IRC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,120,120,10 CONTROL "Jabber clients",IDC_GROUP_JABBER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,130,120,10 CONTROL "MSN clients",IDC_GROUP_MSN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,150,120,10 - CONTROL "QQ clients",IDC_GROUP_QQ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,160,120,10 CONTROL "RSS clients",IDC_GROUP_RSS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,170,120,10 CONTROL "VKontakte clients",IDC_GROUP_VK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,180,120,10 CONTROL "Weather clients",IDC_GROUP_WEATHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,190,120,10 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