From 1a6e6a2265719faed255a2483eb7c3ab03d30d08 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 24 Jul 2015 10:08:42 +0000 Subject: ignore: common project git-svn-id: http://svn.miranda-ng.org/main/trunk@14670 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/IgnoreState/ignore.vcxproj | 28 ++++ plugins/IgnoreState/ignore.vcxproj.filters | 4 + plugins/IgnoreState/ignore_10.vcxproj | 200 ------------------------- plugins/IgnoreState/ignore_10.vcxproj.filters | 47 ------ plugins/IgnoreState/ignore_12.vcxproj | 203 -------------------------- plugins/IgnoreState/ignore_12.vcxproj.filters | 47 ------ plugins/IgnoreState/ignore_14.vcxproj | 203 -------------------------- plugins/IgnoreState/ignore_14.vcxproj.filters | 47 ------ plugins/IgnoreState/src/commonheaders.h | 67 --------- plugins/IgnoreState/src/main.cpp | 4 +- plugins/IgnoreState/src/options.cpp | 2 +- plugins/IgnoreState/src/stdafx.cpp | 18 --- plugins/IgnoreState/src/stdafx.cxx | 18 +++ plugins/IgnoreState/src/stdafx.h | 65 +++++++++ 14 files changed, 118 insertions(+), 835 deletions(-) create mode 100644 plugins/IgnoreState/ignore.vcxproj create mode 100644 plugins/IgnoreState/ignore.vcxproj.filters delete mode 100644 plugins/IgnoreState/ignore_10.vcxproj delete mode 100644 plugins/IgnoreState/ignore_10.vcxproj.filters delete mode 100644 plugins/IgnoreState/ignore_12.vcxproj delete mode 100644 plugins/IgnoreState/ignore_12.vcxproj.filters delete mode 100644 plugins/IgnoreState/ignore_14.vcxproj delete mode 100644 plugins/IgnoreState/ignore_14.vcxproj.filters delete mode 100644 plugins/IgnoreState/src/commonheaders.h delete mode 100644 plugins/IgnoreState/src/stdafx.cpp create mode 100644 plugins/IgnoreState/src/stdafx.cxx create mode 100644 plugins/IgnoreState/src/stdafx.h (limited to 'plugins') diff --git a/plugins/IgnoreState/ignore.vcxproj b/plugins/IgnoreState/ignore.vcxproj new file mode 100644 index 0000000000..7753c42f0e --- /dev/null +++ b/plugins/IgnoreState/ignore.vcxproj @@ -0,0 +1,28 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + IgnoreState + {214F211F-1A2B-4F79-8993-B8DEE2EF7441} + + + + + \ No newline at end of file diff --git a/plugins/IgnoreState/ignore.vcxproj.filters b/plugins/IgnoreState/ignore.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/plugins/IgnoreState/ignore.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/IgnoreState/ignore_10.vcxproj b/plugins/IgnoreState/ignore_10.vcxproj deleted file mode 100644 index 7ed3a4d332..0000000000 --- a/plugins/IgnoreState/ignore_10.vcxproj +++ /dev/null @@ -1,200 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - IgnoreState - {214F211F-1A2B-4F79-8993-B8DEE2EF7441} - - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level3 - EditAndContinue - Use - Commonheaders.h - false - - - comctl32.lib;%(AdditionalDependencies) - true - Windows - 0x22620000 - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib - - - ..\..\include\msapi - _DEBUG;%(PreprocessorDefinitions) - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level3 - Use - Commonheaders.h - false - - - comctl32.lib;%(AdditionalDependencies) - true - Windows - 0x22620000 - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib - - - ..\..\include\msapi - _DEBUG;%(PreprocessorDefinitions) - - - - - Full - OnlyExplicitInline - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - Level3 - Use - Commonheaders.h - false - - - comctl32.lib;%(AdditionalDependencies) - Windows - true - true - 0x22620000 - false - $(IntDir)$(TargetName).lib - true - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - ..\..\include\msapi - NDEBUG;%(PreprocessorDefinitions) - - - - - Full - OnlyExplicitInline - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - Level3 - Use - Commonheaders.h - false - - - comctl32.lib;%(AdditionalDependencies) - Windows - true - true - 0x22620000 - false - $(IntDir)$(TargetName).lib - true - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - ..\..\include\msapi - NDEBUG;%(PreprocessorDefinitions) - - - - - Create - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/IgnoreState/ignore_10.vcxproj.filters b/plugins/IgnoreState/ignore_10.vcxproj.filters deleted file mode 100644 index 2030ffb0eb..0000000000 --- a/plugins/IgnoreState/ignore_10.vcxproj.filters +++ /dev/null @@ -1,47 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/IgnoreState/ignore_12.vcxproj b/plugins/IgnoreState/ignore_12.vcxproj deleted file mode 100644 index 29213e8781..0000000000 --- a/plugins/IgnoreState/ignore_12.vcxproj +++ /dev/null @@ -1,203 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - IgnoreState - {214F211F-1A2B-4F79-8993-B8DEE2EF7441} - - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level4 - EditAndContinue - Use - Commonheaders.h - false - - - comctl32.lib;%(AdditionalDependencies) - true - Windows - 0x22620000 - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib - false - - - ..\..\include\msapi - _DEBUG;%(PreprocessorDefinitions) - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level4 - Use - Commonheaders.h - false - - - comctl32.lib;%(AdditionalDependencies) - true - Windows - 0x22620000 - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib - - - ..\..\include\msapi - _DEBUG;%(PreprocessorDefinitions) - - - - - Full - OnlyExplicitInline - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - Level4 - Use - Commonheaders.h - false - - - comctl32.lib;%(AdditionalDependencies) - Windows - true - true - 0x22620000 - false - $(IntDir)$(TargetName).lib - true - $(ProfileDir)..\..\bin12\lib - - - ..\..\include\msapi - NDEBUG;%(PreprocessorDefinitions) - - - - - Full - OnlyExplicitInline - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - Level4 - Use - Commonheaders.h - false - - - comctl32.lib;%(AdditionalDependencies) - Windows - true - true - 0x22620000 - false - $(IntDir)$(TargetName).lib - true - $(ProfileDir)..\..\bin12\lib - - - ..\..\include\msapi - NDEBUG;%(PreprocessorDefinitions) - - - - - Create - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/IgnoreState/ignore_12.vcxproj.filters b/plugins/IgnoreState/ignore_12.vcxproj.filters deleted file mode 100644 index 2030ffb0eb..0000000000 --- a/plugins/IgnoreState/ignore_12.vcxproj.filters +++ /dev/null @@ -1,47 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/IgnoreState/ignore_14.vcxproj b/plugins/IgnoreState/ignore_14.vcxproj deleted file mode 100644 index 143bf4fd19..0000000000 --- a/plugins/IgnoreState/ignore_14.vcxproj +++ /dev/null @@ -1,203 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - IgnoreState - {214F211F-1A2B-4F79-8993-B8DEE2EF7441} - - - - DynamicLibrary - Unicode - true - v140_xp - - - DynamicLibrary - Unicode - true - v140_xp - - - DynamicLibrary - Unicode - v140_xp - - - DynamicLibrary - Unicode - v140_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level4 - EditAndContinue - Use - Commonheaders.h - false - - - comctl32.lib;%(AdditionalDependencies) - true - Windows - 0x22620000 - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib - false - - - ..\..\include\msapi - _DEBUG;%(PreprocessorDefinitions) - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level4 - Use - Commonheaders.h - false - - - comctl32.lib;%(AdditionalDependencies) - true - Windows - 0x22620000 - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib - - - ..\..\include\msapi - _DEBUG;%(PreprocessorDefinitions) - - - - - Full - OnlyExplicitInline - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - Level4 - Use - Commonheaders.h - false - - - comctl32.lib;%(AdditionalDependencies) - Windows - true - true - 0x22620000 - false - $(IntDir)$(TargetName).lib - true - $(ProfileDir)..\..\bin14\lib - - - ..\..\include\msapi - NDEBUG;%(PreprocessorDefinitions) - - - - - Full - OnlyExplicitInline - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - Level4 - Use - Commonheaders.h - false - - - comctl32.lib;%(AdditionalDependencies) - Windows - true - true - 0x22620000 - false - $(IntDir)$(TargetName).lib - true - $(ProfileDir)..\..\bin14\lib - - - ..\..\include\msapi - NDEBUG;%(PreprocessorDefinitions) - - - - - Create - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/IgnoreState/ignore_14.vcxproj.filters b/plugins/IgnoreState/ignore_14.vcxproj.filters deleted file mode 100644 index 2030ffb0eb..0000000000 --- a/plugins/IgnoreState/ignore_14.vcxproj.filters +++ /dev/null @@ -1,47 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/IgnoreState/src/commonheaders.h b/plugins/IgnoreState/src/commonheaders.h deleted file mode 100644 index e0abfe1972..0000000000 --- a/plugins/IgnoreState/src/commonheaders.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - - IgnoreState plugin for Miranda-IM (www.miranda-im.org) - (c) 2010 by Kildor - - 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; either version 2 of the License, or - (at your option) any later version. - - 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, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - */ - -#ifndef COMMHEADERS_H -#define COMMHEADERS_H - -#define _CRT_SECURE_NO_WARNINGS - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "resource.h" -#include "Version.h" - -#define MODULENAME "IgnoreState" - -struct IGNOREITEMS -{ - TCHAR* name; - int type; - int icon; - bool filtered; -}; - -extern IGNOREITEMS ii[]; -extern int nII; - -static byte bUseMirandaSettings; - -extern HINSTANCE g_hInst; - -void applyExtraImage(MCONTACT hContact); - -int onOptInitialise(WPARAM wParam, LPARAM lParam); -BOOL checkState(int type); -VOID fill_filter(); - -extern HANDLE hExtraIcon; - -#endif //COMMHEADERS_H diff --git a/plugins/IgnoreState/src/main.cpp b/plugins/IgnoreState/src/main.cpp index 353efadb94..89013018cc 100644 --- a/plugins/IgnoreState/src/main.cpp +++ b/plugins/IgnoreState/src/main.cpp @@ -18,7 +18,7 @@ */ -#include "commonheaders.h" +#include "stdafx.h" HINSTANCE g_hInst; @@ -74,7 +74,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) ///////////////////////////////////////////////////////////////////////////////////////// -inline BOOL checkState(int type) +BOOL checkState(int type) { return ((currentFilter >> (type - 1)) & 1); } diff --git a/plugins/IgnoreState/src/options.cpp b/plugins/IgnoreState/src/options.cpp index 6118fbbd25..26bd7df886 100644 --- a/plugins/IgnoreState/src/options.cpp +++ b/plugins/IgnoreState/src/options.cpp @@ -18,7 +18,7 @@ */ -#include "commonheaders.h" +#include "stdafx.h" #define MS_SKINENG_DRAWICONEXFIX "SkinEngine/DrawIconEx_Fix" diff --git a/plugins/IgnoreState/src/stdafx.cpp b/plugins/IgnoreState/src/stdafx.cpp deleted file mode 100644 index 048b14e9d2..0000000000 --- a/plugins/IgnoreState/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 . -*/ - -#include "commonheaders.h" \ No newline at end of file diff --git a/plugins/IgnoreState/src/stdafx.cxx b/plugins/IgnoreState/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/IgnoreState/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 . +*/ + +#include "stdafx.h" \ No newline at end of file diff --git a/plugins/IgnoreState/src/stdafx.h b/plugins/IgnoreState/src/stdafx.h new file mode 100644 index 0000000000..644f8ee04f --- /dev/null +++ b/plugins/IgnoreState/src/stdafx.h @@ -0,0 +1,65 @@ +/* + + IgnoreState plugin for Miranda-IM (www.miranda-im.org) + (c) 2010 by Kildor + + 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; either version 2 of the License, or + (at your option) any later version. + + 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, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + */ + +#ifndef COMMHEADERS_H +#define COMMHEADERS_H + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "resource.h" +#include "Version.h" + +#define MODULENAME "IgnoreState" + +struct IGNOREITEMS +{ + TCHAR* name; + int type; + int icon; + bool filtered; +}; + +extern IGNOREITEMS ii[]; +extern int nII; + +static byte bUseMirandaSettings; + +extern HINSTANCE g_hInst; + +void applyExtraImage(MCONTACT hContact); + +int onOptInitialise(WPARAM wParam, LPARAM lParam); +BOOL checkState(int type); +VOID fill_filter(); + +extern HANDLE hExtraIcon; + +#endif //COMMHEADERS_H -- cgit v1.2.3