From 2077fd0cb27da069e6bc8588f680b6eed261c8fa Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Wed, 1 Aug 2012 10:15:44 +0000 Subject: small warinig fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@1296 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_nicer/res/resource.rc | 2 +- plugins/New_GPG/new_gpg_10.vcxproj | 14 ++++++-------- plugins/New_GPG/new_gpg_10.vcxproj.filters | 6 ------ plugins/New_GPG/src/commonheaders.h | 3 +++ plugins/TabSRMM/resource.rc | 2 +- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc index 4278d11097..834cea5d7c 100644 --- a/plugins/Clist_nicer/res/resource.rc +++ b/plugins/Clist_nicer/res/resource.rc @@ -103,7 +103,7 @@ BEGIN LTEXT "",IDC_WHITERECT,0,0,228,116 DEFPUSHBUTTON "OK",IDOK,168,123,55,14 LTEXT "Clist Nicer+",IDC_CLNICER,5,7,150,15 - CTEXT "Copyright © 2004-2010 by the Miranda IM project, 2012 Miranda NG project. More detailed copyright information can be found in the included README file.\n\nThis software is distributed and licensed under the terms of the GNU General Public License V2 or any later version.",IDC_COPYRIGHT,5,39,217,47 + CTEXT "Copyright © 2004-2010 by the Miranda NG project. More detailed copyright information can be found in the included README file.\n\nThis software is distributed and licensed under the terms of the GNU General Public License V2 or any later version.",IDC_COPYRIGHT,5,39,217,47 ICON 0,IDC_LOGO,201,2,20,20 LTEXT "Version",IDC_VERSION,5,19,150,15 CTEXT "build time",IDC_BUILDTIME,37,105,150,11 diff --git a/plugins/New_GPG/new_gpg_10.vcxproj b/plugins/New_GPG/new_gpg_10.vcxproj index 9478a20409..171d5ffee8 100755 --- a/plugins/New_GPG/new_gpg_10.vcxproj +++ b/plugins/New_GPG/new_gpg_10.vcxproj @@ -46,8 +46,6 @@ - - @@ -309,7 +307,7 @@ true true .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -359,7 +357,7 @@ true true .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -405,7 +403,7 @@ Disabled x:\temp\windows\libs\utf8cpp\include;x:\temp\windows\libs\boost;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Use @@ -448,7 +446,7 @@ Disabled .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -494,7 +492,7 @@ Disabled .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -540,7 +538,7 @@ Disabled x:\temp\windows\libs\utf8cpp\include;X:\temp\windows\libs\Boost\include;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Use diff --git a/plugins/New_GPG/new_gpg_10.vcxproj.filters b/plugins/New_GPG/new_gpg_10.vcxproj.filters index 37e663c898..96cb8c90fe 100755 --- a/plugins/New_GPG/new_gpg_10.vcxproj.filters +++ b/plugins/New_GPG/new_gpg_10.vcxproj.filters @@ -68,12 +68,6 @@ Headers - - Headers - - - Headers - Headers diff --git a/plugins/New_GPG/src/commonheaders.h b/plugins/New_GPG/src/commonheaders.h index 459d76ef64..0fd218bbcf 100755 --- a/plugins/New_GPG/src/commonheaders.h +++ b/plugins/New_GPG/src/commonheaders.h @@ -15,6 +15,9 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef COMMONHEADERS_H #define COMMONHEADERS_H + +#define _CRT_SECURE_NO_WARNINGS + #define MIRANDA_VER 0x0901 //windows #include diff --git a/plugins/TabSRMM/resource.rc b/plugins/TabSRMM/resource.rc index a3f45ca516..95e0e1705b 100644 --- a/plugins/TabSRMM/resource.rc +++ b/plugins/TabSRMM/resource.rc @@ -537,7 +537,7 @@ BEGIN LTEXT "",IDC_STATIC,0,30,228,110,NOT WS_GROUP CONTROL "",IDC_HEADERBAR,"MHeaderbarCtrl",WS_TABSTOP,0,0,228,30 DEFPUSHBUTTON "OK",IDOK,168,123,55,14 - CTEXT "Copyright © 2004-2010 by the Miranda IM project, 2012 Miranda NG project. More \ndetailed copyright information can be found in the included README file.\n\nThis software is distributed and licensed under the terms of the GNU General Public License V2 or any later version.",IDC_COPYRIGHT,5,39,217,47 + CTEXT "Copyright © 2004-2012 by the Miranda NG project. More \ndetailed copyright information can be found in the included README file.\n\nThis software is distributed and licensed under the terms of the GNU General Public License V2 or any later version.",IDC_COPYRIGHT,5,39,217,47 CTEXT "",IDC_BUILDTIME,37,105,150,11 CONTROL "Support and latest version information",IDC_SUPPORT, "Hyperlink",WS_TABSTOP | 0x1,18,91,192,12 -- cgit v1.2.3