From 69a87ceb0623fd28afe72611441f7a6e6ed6307c Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 15 Mar 2013 07:23:33 +0000 Subject: removed not used headers git-svn-id: http://svn.miranda-ng.org/main/trunk@4036 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/WhenWasIt/WhenWasIt_10.vcxproj | 4 +- plugins/WhenWasIt/WhenWasIt_11.vcxproj | 4 +- plugins/WhenWasIt/res/WhenWasIt.rc | 17 ------- plugins/WhenWasIt/res/version.rc | 85 ++++----------------------------- plugins/WhenWasIt/src/WhenWasIt.cpp | 10 ++-- plugins/WhenWasIt/src/birthdays.cpp | 1 - plugins/WhenWasIt/src/commonheaders.h | 19 +++----- plugins/WhenWasIt/src/date_utils.cpp | 1 - plugins/WhenWasIt/src/dlg_handlers.cpp | 1 - plugins/WhenWasIt/src/events.cpp | 1 - plugins/WhenWasIt/src/hooked_events.cpp | 1 - plugins/WhenWasIt/src/icons.cpp | 1 - plugins/WhenWasIt/src/notifiers.cpp | 1 - plugins/WhenWasIt/src/services.cpp | 1 - plugins/WhenWasIt/src/utils.cpp | 1 - plugins/WhenWasIt/src/version.h | 59 ++++++----------------- 16 files changed, 39 insertions(+), 168 deletions(-) (limited to 'plugins/WhenWasIt') diff --git a/plugins/WhenWasIt/WhenWasIt_10.vcxproj b/plugins/WhenWasIt/WhenWasIt_10.vcxproj index 2eb791a465..242425de83 100644 --- a/plugins/WhenWasIt/WhenWasIt_10.vcxproj +++ b/plugins/WhenWasIt/WhenWasIt_10.vcxproj @@ -72,7 +72,7 @@ Disabled - WIN32;_DEBUG;_USE_32BIT_TIME_T;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -102,7 +102,7 @@ Full OnlyExplicitInline Size - WIN32;NDEBUG;_USE_32BIT_TIME_T;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true Level3 ProgramDatabase diff --git a/plugins/WhenWasIt/WhenWasIt_11.vcxproj b/plugins/WhenWasIt/WhenWasIt_11.vcxproj index e7a11204c4..1913f5da36 100644 --- a/plugins/WhenWasIt/WhenWasIt_11.vcxproj +++ b/plugins/WhenWasIt/WhenWasIt_11.vcxproj @@ -76,7 +76,7 @@ Disabled - WIN32;_DEBUG;_USE_32BIT_TIME_T;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -106,7 +106,7 @@ Full OnlyExplicitInline Size - WIN32;NDEBUG;_USE_32BIT_TIME_T;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true Level3 ProgramDatabase diff --git a/plugins/WhenWasIt/res/WhenWasIt.rc b/plugins/WhenWasIt/res/WhenWasIt.rc index 970504273d..062c20ac18 100644 --- a/plugins/WhenWasIt/res/WhenWasIt.rc +++ b/plugins/WhenWasIt/res/WhenWasIt.rc @@ -230,23 +230,6 @@ IDI_REFRESH_USERDETAILS ICON "refresh.ico" IDI_IMPORT_BIRTHDAYS ICON "import.ico" IDI_EXPORT_BIRTHDAYS ICON "export.ico" -///////////////////////////////////////////////////////////////////////////// -// -// Dialog Info -// - -IDD_ADD_BIRTHDAY DLGINIT -BEGIN - IDC_COMPATIBILITY, 0x403, 16, 0 -0x7250, 0x746f, 0x636f, 0x6c6f, 0x6d20, 0x646f, 0x6c75, 0x0065, - IDC_COMPATIBILITY, 0x403, 19, 0 -0x7355, 0x7265, 0x6544, 0x6174, 0x6c69, 0x2073, 0x6f6d, 0x7564, 0x656c, -"\000" - IDC_COMPATIBILITY, 0x403, 17, 0 -0x426d, 0x7269, 0x6874, 0x6164, 0x2079, 0x6f6d, 0x7564, 0x656c, "\000" - 0 -END - #endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/WhenWasIt/res/version.rc b/plugins/WhenWasIt/res/version.rc index c4e7212bd7..5bfbab4754 100644 --- a/plugins/WhenWasIt/res/version.rc +++ b/plugins/WhenWasIt/res/version.rc @@ -4,61 +4,12 @@ #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED -#include "..\src\version.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// #include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "..\\src\\version.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// +#include "..\src\version.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION __PLUGINVERSION_STRING - PRODUCTVERSION __PLUGINVERSION_STRING + FILEVERSION __FILEVERSION_STRING + PRODUCTVERSION __FILEVERSION_STRING FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -66,38 +17,22 @@ VS_VERSION_INFO VERSIONINFO FILEFLAGS 0x0L #endif FILEOS 0x4L - FILETYPE 0x2L + FILETYPE 0x0L FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" BEGIN - BLOCK "040904b0" + BLOCK "000004b0" BEGIN - VALUE "Author", __AUTHOR - VALUE "FileDescription", __DESC - VALUE "FileVersion", __VERSION_STRING - VALUE "InternalName", __PLUGIN_DISPLAY_NAME + VALUE "FileDescription", __DESCRIPTION + VALUE "InternalName", __PLUGIN_NAME VALUE "LegalCopyright", __COPYRIGHT + VALUE "OriginalFilename", __FILENAME + VALUE "ProductName", __PLUGIN_NAME END END BLOCK "VarFileInfo" BEGIN - VALUE "Translation", 0x409, 1200 + VALUE "Translation", 0x0, 1200 END END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/plugins/WhenWasIt/src/WhenWasIt.cpp b/plugins/WhenWasIt/src/WhenWasIt.cpp index 093c4b33c0..022b5cf589 100644 --- a/plugins/WhenWasIt/src/WhenWasIt.cpp +++ b/plugins/WhenWasIt/src/WhenWasIt.cpp @@ -24,22 +24,22 @@ char ModuleName[] = "WhenWasIt"; HINSTANCE hInstance; HWND hBirthdaysDlg = NULL; HWND hUpcomingDlg = NULL; -extern HANDLE hAddBirthdayWndsList = NULL; +HANDLE hAddBirthdayWndsList = NULL; int hLangpack; CommonData commonData = {0}; PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), - __PLUGIN_DISPLAY_NAME, - VERSION, - __DESC, + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, __AUTHOR, __AUTHOREMAIL, __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, - // {2ff96c84-b0b5-470e-bbf9-907b9f3f5d2f} + // {2FF96C84-B0B5-470E-BBF9-907B9F3F5D2F} {0x2ff96c84, 0xb0b5, 0x470e, {0xbb, 0xf9, 0x90, 0x7b, 0x9f, 0x3f, 0x5d, 0x2f}} }; diff --git a/plugins/WhenWasIt/src/birthdays.cpp b/plugins/WhenWasIt/src/birthdays.cpp index 4d4242e265..a99ed2e868 100644 --- a/plugins/WhenWasIt/src/birthdays.cpp +++ b/plugins/WhenWasIt/src/birthdays.cpp @@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "commonheaders.h" -#include "birthdays.h" CBirthdays &birthdays = CBirthdays(); diff --git a/plugins/WhenWasIt/src/commonheaders.h b/plugins/WhenWasIt/src/commonheaders.h index a4d54b019b..3ab56ea9ff 100644 --- a/plugins/WhenWasIt/src/commonheaders.h +++ b/plugins/WhenWasIt/src/commonheaders.h @@ -24,11 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define _CRT_SECURE_NO_WARNINGS #define _CRT_NON_CONFORMING_SWPRINTFS -#define MIRANDA_VER 0x0A00 - -#include -#include -#include #include #include #include @@ -36,36 +31,34 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -#include #include #include -#include #include -#include #include #include #include -#include #include #include -#include #include #include -#include -#include #include #include #include +#include +#include + #include "icons.h" #include "resource.h" #include "version.h" - #include "utils.h" #include "date_utils.h" #include "services.h" #include "hooked_events.h" #include "notifiers.h" +#include "birthdays.h" +#include "dlg_handlers.h" +#include "events.h" extern char ModuleName[]; extern HINSTANCE hInstance; diff --git a/plugins/WhenWasIt/src/date_utils.cpp b/plugins/WhenWasIt/src/date_utils.cpp index 2dd9a3b91b..a903a36a28 100644 --- a/plugins/WhenWasIt/src/date_utils.cpp +++ b/plugins/WhenWasIt/src/date_utils.cpp @@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "commonheaders.h" -#include "date_utils.h" time_t Today() { diff --git a/plugins/WhenWasIt/src/dlg_handlers.cpp b/plugins/WhenWasIt/src/dlg_handlers.cpp index bd987f61fe..790d766863 100644 --- a/plugins/WhenWasIt/src/dlg_handlers.cpp +++ b/plugins/WhenWasIt/src/dlg_handlers.cpp @@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "commonheaders.h" -#include "dlg_handlers.h" #define COLOR_USERINFO RGB(138, 190, 160) #define COLOR_MBIRTHDAY RGB(222, 222, 88) diff --git a/plugins/WhenWasIt/src/events.cpp b/plugins/WhenWasIt/src/events.cpp index 70dc0ffee4..27e35e73eb 100644 --- a/plugins/WhenWasIt/src/events.cpp +++ b/plugins/WhenWasIt/src/events.cpp @@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "commonheaders.h" -#include "events.h" HANDLE heContactSendMessage; diff --git a/plugins/WhenWasIt/src/hooked_events.cpp b/plugins/WhenWasIt/src/hooked_events.cpp index c15195a238..df5f28b418 100644 --- a/plugins/WhenWasIt/src/hooked_events.cpp +++ b/plugins/WhenWasIt/src/hooked_events.cpp @@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "commonheaders.h" -#include "hooked_events.h" #define DATE_CHANGE_CHECK_INTERVAL 20 diff --git a/plugins/WhenWasIt/src/icons.cpp b/plugins/WhenWasIt/src/icons.cpp index aa01db7e71..edfc7cc8e8 100644 --- a/plugins/WhenWasIt/src/icons.cpp +++ b/plugins/WhenWasIt/src/icons.cpp @@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "commonheaders.h" -#include "icons.h" HANDLE hCheckMenu, hListMenu, hAddBirthdayContact, hRefreshUserDetails; HANDLE hImportBirthdays, hExportBirthdays; diff --git a/plugins/WhenWasIt/src/notifiers.cpp b/plugins/WhenWasIt/src/notifiers.cpp index 3ae570bf70..15736f1951 100644 --- a/plugins/WhenWasIt/src/notifiers.cpp +++ b/plugins/WhenWasIt/src/notifiers.cpp @@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "commonheaders.h" -#include "notifiers.h" void FillPopupData(POPUPDATAT &pd, int dtb) { diff --git a/plugins/WhenWasIt/src/services.cpp b/plugins/WhenWasIt/src/services.cpp index 3e1d391a79..b7ee590882 100644 --- a/plugins/WhenWasIt/src/services.cpp +++ b/plugins/WhenWasIt/src/services.cpp @@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "commonheaders.h" -#include "services.h" #define COMMENT_CHAR '#' diff --git a/plugins/WhenWasIt/src/utils.cpp b/plugins/WhenWasIt/src/utils.cpp index e5ed9b9475..724b4331a4 100644 --- a/plugins/WhenWasIt/src/utils.cpp +++ b/plugins/WhenWasIt/src/utils.cpp @@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "commonheaders.h" -#include "utils.h" int LogInit() { diff --git a/plugins/WhenWasIt/src/version.h b/plugins/WhenWasIt/src/version.h index 73caab55c5..7a4ae36caf 100644 --- a/plugins/WhenWasIt/src/version.h +++ b/plugins/WhenWasIt/src/version.h @@ -1,45 +1,14 @@ -/* -WhenWasIt (birthday reminder) plugin for Miranda IM - -Copyright © 2006-2011 Cristian Libotean - -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 M_WWI_VERSION_H -#define M_WWI_VERSION_H - -#define __MAJOR_VERSION 0 -#define __MINOR_VERSION 3 -#define __RELEASE_NUM 3 -#define __BUILD_NUM 4 - -#define VERSION PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM) - -#define __PLUGINVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM -#define __PLUGINVERSION_STRING_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM -#define __STRINGIFY_(x) #x -#define __STRINGIFY(x) __STRINGIFY_(x) -#define __VERSION_STRING __STRINGIFY(__PLUGINVERSION_STRING_DOTS) - -#define __DESC "Notifies you of upcoming birthdays." -#define __AUTHOR "Cristian Libotean" -#define __AUTHOREMAIL "eblis102@yahoo.com" -#define __COPYRIGHT "© 2006-2011 Cristian Libotean" -#define __AUTHORWEB "http://miranda-ng.org/" -#define __PLUGIN_DISPLAY_NAME "Birthday reminder" - - -#endif //M_WWI_VERSION_H +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 3 +#define __RELEASE_NUM 3 +#define __BUILD_NUM 4 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM + +#define __PLUGIN_NAME "Birthday reminder" +#define __FILENAME "WhenWasIt.dll" +#define __DESCRIPTION "Notifies you of upcoming birthdays." +#define __AUTHOR "Cristian Libotean" +#define __AUTHOREMAIL "eblis102@yahoo.com" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "© 2006-2011 Cristian Libotean" -- cgit v1.2.3