From b53f73d5762f09620ad95bfd81c74660c2077dad Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 24 Apr 2015 19:36:19 +0000 Subject: Alarms - common project git-svn-id: http://svn.miranda-ng.org/main/trunk@13103 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Alarms/alarms.vcxproj | 28 ++++++++++++++++++ plugins/Alarms/alarms.vcxproj.filters | 4 +++ plugins/Alarms/alarms_10.vcxproj | 12 ++++---- plugins/Alarms/alarms_12.vcxproj | 12 ++++---- plugins/Alarms/src/alarm_win.cpp | 2 +- plugins/Alarms/src/alarmlist.cpp | 2 +- plugins/Alarms/src/alarms.cpp | 2 +- plugins/Alarms/src/common.h | 55 ----------------------------------- plugins/Alarms/src/frame.cpp | 2 +- plugins/Alarms/src/icons.cpp | 2 +- plugins/Alarms/src/options.cpp | 2 +- plugins/Alarms/src/stdafx.cpp | 18 ------------ plugins/Alarms/src/stdafx.cxx | 18 ++++++++++++ plugins/Alarms/src/stdafx.h | 54 ++++++++++++++++++++++++++++++++++ plugins/Alarms/src/time_utils.cpp | 2 +- 15 files changed, 123 insertions(+), 92 deletions(-) create mode 100644 plugins/Alarms/alarms.vcxproj create mode 100644 plugins/Alarms/alarms.vcxproj.filters delete mode 100644 plugins/Alarms/src/common.h delete mode 100644 plugins/Alarms/src/stdafx.cpp create mode 100644 plugins/Alarms/src/stdafx.cxx create mode 100644 plugins/Alarms/src/stdafx.h diff --git a/plugins/Alarms/alarms.vcxproj b/plugins/Alarms/alarms.vcxproj new file mode 100644 index 0000000000..e811ecbad3 --- /dev/null +++ b/plugins/Alarms/alarms.vcxproj @@ -0,0 +1,28 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + Alarms + {5F09C93B-463A-4BF5-A85E-6E4E916AA8F8} + + + + + \ No newline at end of file diff --git a/plugins/Alarms/alarms.vcxproj.filters b/plugins/Alarms/alarms.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/plugins/Alarms/alarms.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/Alarms/alarms_10.vcxproj b/plugins/Alarms/alarms_10.vcxproj index c8c9fef902..5252841576 100644 --- a/plugins/Alarms/alarms_10.vcxproj +++ b/plugins/Alarms/alarms_10.vcxproj @@ -75,7 +75,7 @@ ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Use - common.h + stdafx.h Level3 4996;%(DisableSpecificWarnings) OnlyExplicitInline @@ -104,7 +104,7 @@ ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Use - common.h + stdafx.h Level3 4996;%(DisableSpecificWarnings) OnlyExplicitInline @@ -136,7 +136,7 @@ EnableFastChecks MultiThreadedDebugDLL Use - common.h + stdafx.h Level3 EditAndContinue 4996;%(DisableSpecificWarnings) @@ -163,7 +163,7 @@ EnableFastChecks MultiThreadedDebugDLL Use - common.h + stdafx.h Level3 4996;%(DisableSpecificWarnings) false @@ -185,7 +185,7 @@ - + Create @@ -197,11 +197,11 @@ - + diff --git a/plugins/Alarms/alarms_12.vcxproj b/plugins/Alarms/alarms_12.vcxproj index 0e2b6bc5a2..5242bfd51e 100644 --- a/plugins/Alarms/alarms_12.vcxproj +++ b/plugins/Alarms/alarms_12.vcxproj @@ -79,7 +79,7 @@ ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Use - common.h + stdafx.h Level3 4996;%(DisableSpecificWarnings) OnlyExplicitInline @@ -107,7 +107,7 @@ ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Use - common.h + stdafx.h Level3 4996;%(DisableSpecificWarnings) OnlyExplicitInline @@ -138,7 +138,7 @@ EnableFastChecks MultiThreadedDebugDLL Use - common.h + stdafx.h Level3 EditAndContinue 4996;%(DisableSpecificWarnings) @@ -166,7 +166,7 @@ EnableFastChecks MultiThreadedDebugDLL Use - common.h + stdafx.h Level3 4996;%(DisableSpecificWarnings) false @@ -188,7 +188,7 @@ - + Create @@ -200,11 +200,11 @@ - + diff --git a/plugins/Alarms/src/alarm_win.cpp b/plugins/Alarms/src/alarm_win.cpp index 4c0231d316..cd4d691845 100644 --- a/plugins/Alarms/src/alarm_win.cpp +++ b/plugins/Alarms/src/alarm_win.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" #include "alarm_win.h" #define ID_TIMER_SOUND 10101 diff --git a/plugins/Alarms/src/alarmlist.cpp b/plugins/Alarms/src/alarmlist.cpp index 563ad000f0..acbcfef543 100644 --- a/plugins/Alarms/src/alarmlist.cpp +++ b/plugins/Alarms/src/alarmlist.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" #include "alarmlist.h" AlarmList alarms; diff --git a/plugins/Alarms/src/alarms.cpp b/plugins/Alarms/src/alarms.cpp index cf8050f8ec..9144031f2a 100644 --- a/plugins/Alarms/src/alarms.cpp +++ b/plugins/Alarms/src/alarms.cpp @@ -7,7 +7,7 @@ modify it as they wish with no restriction. There is no warranty. */ -#include "common.h" +#include "stdafx.h" #include "alarms.h" diff --git a/plugins/Alarms/src/common.h b/plugins/Alarms/src/common.h deleted file mode 100644 index 76b82b44b9..0000000000 --- a/plugins/Alarms/src/common.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef _COMMON_INC -#define _COMMON_INC - - -#define _WIN32_WINNT 0x0500 -#define _WIN32_IE 0x0400 - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -#define VC_EXTRALEAN -#define _CRT_SECURE_NO_DEPRECATE - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "resource.h" -#include "version.h" - -#define MODULE "Alarm" - -extern HINSTANCE hInst; - -extern HANDLE hTopToolbarButton; - -typedef struct ALARM_tag { - unsigned short id; - TCHAR *szTitle; - TCHAR *szDesc; - Occurrence occurrence; - BOOL snoozer; - SYSTEMTIME time; - unsigned short action; - TCHAR *szCommand; - TCHAR *szCommandParams; - BYTE sound_num; - int flags; -} ALARM; - -#endif diff --git a/plugins/Alarms/src/frame.cpp b/plugins/Alarms/src/frame.cpp index e6342dcc17..6c22768090 100644 --- a/plugins/Alarms/src/frame.cpp +++ b/plugins/Alarms/src/frame.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" #include "frame.h" HWND hwnd_plugin = 0; diff --git a/plugins/Alarms/src/icons.cpp b/plugins/Alarms/src/icons.cpp index ca735b8951..655ec171a4 100644 --- a/plugins/Alarms/src/icons.cpp +++ b/plugins/Alarms/src/icons.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" #include "icons.h" HICON hIconMenuSet, hIconList1, hIconList2, hIconMenuShowHide, hIconSystray; diff --git a/plugins/Alarms/src/options.cpp b/plugins/Alarms/src/options.cpp index ac3cdbf80e..4b5fc36af7 100644 --- a/plugins/Alarms/src/options.cpp +++ b/plugins/Alarms/src/options.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" #include "options.h" Options options; diff --git a/plugins/Alarms/src/stdafx.cpp b/plugins/Alarms/src/stdafx.cpp deleted file mode 100644 index c5fe5abaad..0000000000 --- a/plugins/Alarms/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 "common.h" \ No newline at end of file diff --git a/plugins/Alarms/src/stdafx.cxx b/plugins/Alarms/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/Alarms/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/Alarms/src/stdafx.h b/plugins/Alarms/src/stdafx.h new file mode 100644 index 0000000000..78cfb91ed3 --- /dev/null +++ b/plugins/Alarms/src/stdafx.h @@ -0,0 +1,54 @@ +#ifndef _COMMON_INC +#define _COMMON_INC + + +#define _WIN32_WINNT 0x0500 +#define _WIN32_IE 0x0400 + +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#define VC_EXTRALEAN + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "resource.h" +#include "version.h" + +#define MODULE "Alarm" + +extern HINSTANCE hInst; + +extern HANDLE hTopToolbarButton; + +typedef struct ALARM_tag { + unsigned short id; + TCHAR *szTitle; + TCHAR *szDesc; + Occurrence occurrence; + BOOL snoozer; + SYSTEMTIME time; + unsigned short action; + TCHAR *szCommand; + TCHAR *szCommandParams; + BYTE sound_num; + int flags; +} ALARM; + +#endif diff --git a/plugins/Alarms/src/time_utils.cpp b/plugins/Alarms/src/time_utils.cpp index 69f45612f8..c25a281fe5 100644 --- a/plugins/Alarms/src/time_utils.cpp +++ b/plugins/Alarms/src/time_utils.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" #include "time_utils.h" SYSTEMTIME last_check; -- cgit v1.2.3