From fe46ed0171aacb41a76764f01b2b60abb98fcb60 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 1 Aug 2015 20:59:52 +0000 Subject: WhenWasIt: common project git-svn-id: http://svn.miranda-ng.org/main/trunk@14801 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/WhenWasIt/src/WhenWasIt.cpp | 2 +- plugins/WhenWasIt/src/birthdays.cpp | 2 +- plugins/WhenWasIt/src/commonheaders.h | 96 --------------------------------- plugins/WhenWasIt/src/date_utils.cpp | 2 +- plugins/WhenWasIt/src/dlg_handlers.cpp | 2 +- plugins/WhenWasIt/src/events.cpp | 2 +- plugins/WhenWasIt/src/hooked_events.cpp | 2 +- plugins/WhenWasIt/src/icons.cpp | 2 +- plugins/WhenWasIt/src/notifiers.cpp | 2 +- plugins/WhenWasIt/src/services.cpp | 2 +- plugins/WhenWasIt/src/stdafx.cpp | 18 ------- plugins/WhenWasIt/src/stdafx.cxx | 18 +++++++ plugins/WhenWasIt/src/stdafx.h | 95 ++++++++++++++++++++++++++++++++ plugins/WhenWasIt/src/utils.cpp | 2 +- 14 files changed, 123 insertions(+), 124 deletions(-) delete mode 100644 plugins/WhenWasIt/src/commonheaders.h delete mode 100644 plugins/WhenWasIt/src/stdafx.cpp create mode 100644 plugins/WhenWasIt/src/stdafx.cxx create mode 100644 plugins/WhenWasIt/src/stdafx.h (limited to 'plugins/WhenWasIt/src') diff --git a/plugins/WhenWasIt/src/WhenWasIt.cpp b/plugins/WhenWasIt/src/WhenWasIt.cpp index f6f2f739ad..bb900196e6 100644 --- a/plugins/WhenWasIt/src/WhenWasIt.cpp +++ b/plugins/WhenWasIt/src/WhenWasIt.cpp @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" char ModuleName[] = "WhenWasIt"; HINSTANCE hInstance; diff --git a/plugins/WhenWasIt/src/birthdays.cpp b/plugins/WhenWasIt/src/birthdays.cpp index cf8e4c65ed..78e128130c 100644 --- a/plugins/WhenWasIt/src/birthdays.cpp +++ b/plugins/WhenWasIt/src/birthdays.cpp @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" CBirthdays &birthdays = CBirthdays(); diff --git a/plugins/WhenWasIt/src/commonheaders.h b/plugins/WhenWasIt/src/commonheaders.h deleted file mode 100644 index 39d5161d8c..0000000000 --- a/plugins/WhenWasIt/src/commonheaders.h +++ /dev/null @@ -1,96 +0,0 @@ -/* -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_COMMONHEADERS_H -#define M_WWI_COMMONHEADERS_H - -#define _CRT_SECURE_NO_WARNINGS -#define _CRT_NON_CONFORMING_SWPRINTFS - -#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; -extern HWND hBirthdaysDlg; -extern HWND hUpcomingDlg; -extern MWindowList hAddBirthdayWndsList; - -struct CommonData{ - DWORD foreground; - DWORD background; - int checkInterval; - int daysInAdvance; - int popupTimeout; - int popupTimeoutToday; - int bUsePopups; - int bUseDialog; - int bIgnoreSubcontacts; - int cShowAgeMode; - int bNoBirthdaysPopup; - int cSoundNearDays; - int cDefaultModule; - int lPopupClick; - int rPopupClick; - int bOncePerDay; - int cDlgTimeout; - int notifyFor; - int daysAfter; - int bOpenInBackground; -}; - -extern CommonData commonData; - -#endif //M_WWI_COMMONHEADERS_H \ No newline at end of file diff --git a/plugins/WhenWasIt/src/date_utils.cpp b/plugins/WhenWasIt/src/date_utils.cpp index 4e0cabacc2..cb2f47ebe2 100644 --- a/plugins/WhenWasIt/src/date_utils.cpp +++ b/plugins/WhenWasIt/src/date_utils.cpp @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" time_t Today() { diff --git a/plugins/WhenWasIt/src/dlg_handlers.cpp b/plugins/WhenWasIt/src/dlg_handlers.cpp index 899904ccb4..9e1209d1a1 100644 --- a/plugins/WhenWasIt/src/dlg_handlers.cpp +++ b/plugins/WhenWasIt/src/dlg_handlers.cpp @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.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 794f748596..63828b0422 100644 --- a/plugins/WhenWasIt/src/events.cpp +++ b/plugins/WhenWasIt/src/events.cpp @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" HANDLE heContactSendMessage; diff --git a/plugins/WhenWasIt/src/hooked_events.cpp b/plugins/WhenWasIt/src/hooked_events.cpp index ebc715a279..83d2904a90 100644 --- a/plugins/WhenWasIt/src/hooked_events.cpp +++ b/plugins/WhenWasIt/src/hooked_events.cpp @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" #define DATE_CHANGE_CHECK_INTERVAL 20 diff --git a/plugins/WhenWasIt/src/icons.cpp b/plugins/WhenWasIt/src/icons.cpp index 98760e03c6..13a2e17350 100644 --- a/plugins/WhenWasIt/src/icons.cpp +++ b/plugins/WhenWasIt/src/icons.cpp @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" HANDLE hCheckMenu, hListMenu, hAddBirthdayContact, hRefreshUserDetails; HANDLE hImportBirthdays, hExportBirthdays; diff --git a/plugins/WhenWasIt/src/notifiers.cpp b/plugins/WhenWasIt/src/notifiers.cpp index 4f2412143d..4844dcece1 100644 --- a/plugins/WhenWasIt/src/notifiers.cpp +++ b/plugins/WhenWasIt/src/notifiers.cpp @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" void FillPopupData(POPUPDATAT &pd, int dtb) { diff --git a/plugins/WhenWasIt/src/services.cpp b/plugins/WhenWasIt/src/services.cpp index 2130782dec..f38ba2acd6 100644 --- a/plugins/WhenWasIt/src/services.cpp +++ b/plugins/WhenWasIt/src/services.cpp @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" #define COMMENT_CHAR '#' diff --git a/plugins/WhenWasIt/src/stdafx.cpp b/plugins/WhenWasIt/src/stdafx.cpp deleted file mode 100644 index 048b14e9d2..0000000000 --- a/plugins/WhenWasIt/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/WhenWasIt/src/stdafx.cxx b/plugins/WhenWasIt/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/WhenWasIt/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/WhenWasIt/src/stdafx.h b/plugins/WhenWasIt/src/stdafx.h new file mode 100644 index 0000000000..2a0760b1e1 --- /dev/null +++ b/plugins/WhenWasIt/src/stdafx.h @@ -0,0 +1,95 @@ +/* +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_COMMONHEADERS_H +#define M_WWI_COMMONHEADERS_H + +#define _CRT_NON_CONFORMING_SWPRINTFS + +#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; +extern HWND hBirthdaysDlg; +extern HWND hUpcomingDlg; +extern MWindowList hAddBirthdayWndsList; + +struct CommonData{ + DWORD foreground; + DWORD background; + int checkInterval; + int daysInAdvance; + int popupTimeout; + int popupTimeoutToday; + int bUsePopups; + int bUseDialog; + int bIgnoreSubcontacts; + int cShowAgeMode; + int bNoBirthdaysPopup; + int cSoundNearDays; + int cDefaultModule; + int lPopupClick; + int rPopupClick; + int bOncePerDay; + int cDlgTimeout; + int notifyFor; + int daysAfter; + int bOpenInBackground; +}; + +extern CommonData commonData; + +#endif //M_WWI_COMMONHEADERS_H \ No newline at end of file diff --git a/plugins/WhenWasIt/src/utils.cpp b/plugins/WhenWasIt/src/utils.cpp index 8c396b757f..3bfa1843f2 100644 --- a/plugins/WhenWasIt/src/utils.cpp +++ b/plugins/WhenWasIt/src/utils.cpp @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" int LogInit() { -- cgit v1.2.3