From 4a966be3c32e745b2567e51c27766942f798f77d Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 26 Jul 2015 12:33:08 +0000 Subject: common projects git-svn-id: http://svn.miranda-ng.org/main/trunk@14724 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Popup/src/actions.cpp | 2 +- plugins/Popup/src/avatars.cpp | 2 +- plugins/Popup/src/avatars_gif.cpp | 2 +- plugins/Popup/src/avatars_simple.cpp | 2 +- plugins/Popup/src/bitmap_funcs.cpp | 2 +- plugins/Popup/src/config.cpp | 2 +- plugins/Popup/src/effects.cpp | 2 +- plugins/Popup/src/font.cpp | 2 +- plugins/Popup/src/formula.cpp | 2 +- plugins/Popup/src/headers.h | 138 ----------------------------------- plugins/Popup/src/history.cpp | 2 +- plugins/Popup/src/icons.cpp | 2 +- plugins/Popup/src/main.cpp | 2 +- plugins/Popup/src/notifications.cpp | 2 +- plugins/Popup/src/opt_adv.cpp | 2 +- plugins/Popup/src/opt_class.cpp | 2 +- plugins/Popup/src/opt_contacts.cpp | 2 +- plugins/Popup/src/opt_gen.cpp | 2 +- plugins/Popup/src/opt_skins.cpp | 2 +- plugins/Popup/src/opttree.cpp | 2 +- plugins/Popup/src/popup_gdiplus.cpp | 2 +- plugins/Popup/src/popup_thread.cpp | 2 +- plugins/Popup/src/popup_wnd2.cpp | 2 +- plugins/Popup/src/services.cpp | 2 +- plugins/Popup/src/skin.cpp | 2 +- plugins/Popup/src/srmm_menu.cpp | 2 +- plugins/Popup/src/stdafx.cpp | 18 ----- plugins/Popup/src/stdafx.cxx | 18 +++++ plugins/Popup/src/stdafx.h | 138 +++++++++++++++++++++++++++++++++++ 29 files changed, 181 insertions(+), 181 deletions(-) delete mode 100644 plugins/Popup/src/headers.h delete mode 100644 plugins/Popup/src/stdafx.cpp create mode 100644 plugins/Popup/src/stdafx.cxx create mode 100644 plugins/Popup/src/stdafx.h (limited to 'plugins/Popup/src') diff --git a/plugins/Popup/src/actions.cpp b/plugins/Popup/src/actions.cpp index 0fafcbd980..92ae2f282b 100644 --- a/plugins/Popup/src/actions.cpp +++ b/plugins/Popup/src/actions.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" static int ActionsSortFunc(const POPUPACTION *p1, const POPUPACTION *p2) { diff --git a/plugins/Popup/src/avatars.cpp b/plugins/Popup/src/avatars.cpp index 89dee0724c..4af7fe944a 100644 --- a/plugins/Popup/src/avatars.cpp +++ b/plugins/Popup/src/avatars.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" PopupAvatar *PopupAvatar::create(MCONTACT hContact) { diff --git a/plugins/Popup/src/avatars_gif.cpp b/plugins/Popup/src/avatars_gif.cpp index 33ea2b02f4..c0eba9f628 100644 --- a/plugins/Popup/src/avatars_gif.cpp +++ b/plugins/Popup/src/avatars_gif.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" GifAvatar::GifAvatar(MCONTACT hContact) : PopupAvatar() { diff --git a/plugins/Popup/src/avatars_simple.cpp b/plugins/Popup/src/avatars_simple.cpp index 22e603db3d..5b55467b7f 100644 --- a/plugins/Popup/src/avatars_simple.cpp +++ b/plugins/Popup/src/avatars_simple.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" SimpleAvatar::SimpleAvatar(HANDLE h, bool bUseBitmap) : PopupAvatar() diff --git a/plugins/Popup/src/bitmap_funcs.cpp b/plugins/Popup/src/bitmap_funcs.cpp index 15b51a5998..2ae6256e21 100644 --- a/plugins/Popup/src/bitmap_funcs.cpp +++ b/plugins/Popup/src/bitmap_funcs.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" #include "bitmap_funcs.h" #define PU_BMP_ACCURATE_ARITHMETICS diff --git a/plugins/Popup/src/config.cpp b/plugins/Popup/src/config.cpp index 404ac56916..29178f9182 100644 --- a/plugins/Popup/src/config.cpp +++ b/plugins/Popup/src/config.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" // ===== General Plugin ===== HINSTANCE hInst; diff --git a/plugins/Popup/src/effects.cpp b/plugins/Popup/src/effects.cpp index c0c6763ab3..ede4d633f1 100644 --- a/plugins/Popup/src/effects.cpp +++ b/plugins/Popup/src/effects.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" class MyTestEffect; diff --git a/plugins/Popup/src/font.cpp b/plugins/Popup/src/font.cpp index 78a2f58274..2cd803f1f0 100644 --- a/plugins/Popup/src/font.cpp +++ b/plugins/Popup/src/font.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" PopupFonts fonts = { 0 }; diff --git a/plugins/Popup/src/formula.cpp b/plugins/Popup/src/formula.cpp index 2448fbb1fd..c328f32503 100644 --- a/plugins/Popup/src/formula.cpp +++ b/plugins/Popup/src/formula.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" static inline bool myisspace(char ch) { diff --git a/plugins/Popup/src/headers.h b/plugins/Popup/src/headers.h deleted file mode 100644 index db8bbf6bee..0000000000 --- a/plugins/Popup/src/headers.h +++ /dev/null @@ -1,138 +0,0 @@ -/* -Popup Plus plugin for Miranda IM - -Copyright © 2002 Luca Santarelli, -© 2004-2007 Victor Pavlychko -© 2010 MPK -© 2010 Merlin_de - -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. -*/ - -/* -=============================================================================== -Popup plugin - -This plugin notifies you when a contact changes his/hers status with a Popup. -You can customize its look (style of popup, font, text...) and behaviour (the -position in the screen, the time to live, the action on a mouse click). - -File name: "headers.h" -This file has the purpose of becoming a precompiled header common to every -project file. - -Written by: Hrk (Luca Santarelli) -Updated by: Zazoo (Victor Pavlychko) - -Miranda NG can be found here: -http://miranda-ng.org/ - -Miranda NG plugins and tools can be found here: -http://miranda-ng.org/distr/ -*/ - -#ifndef HEADERS_H -#define HEADERS_H - -// disable security warnings about "*_s" functions -#define _CRT_SECURE_NO_DEPRECATE - -#define OEMRESOURCE - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#undef db_get_s -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#ifndef MTEXT_NOHELPERS -#define MTEXT_NOHELPERS -#endif // MTEXT_NOHELPERS -#include -#include -#include - -#include "resource.h" -#include "defs.h" -#include "version.h" -#include "config.h" -#include "common.h" -#include "def_settings.h" -#include "opttree.h" -#include "opt_gen.h" -#include "opt_skins.h" -#include "opt_contacts.h" -#include "opt_adv.h" -#include "history.h" -#include "services.h" -#include "srmm_menu.h" -#include "bitmap_funcs.h" -#include "icons.h" -#include "font.h" -#include "formula.h" -#include "skin.h" -#include "popup_thread.h" -#include "actions.h" -#include "notifications.h" -#include "opt_class.h" -#include "popup_wnd2.h" -#include "effects.h" -#include "avatars.h" -#include "avatars_simple.h" -#include "avatars_flash.h" -#include "avatars_gif.h" -#include "popup_gdiplus.h" - -#define PU_MODULCLASS "PopupCLASS" // temp DB modul for this plugin -#define MODULNAME "Popup" -#define MODULNAME_LONG "Popup Plus" -#define MODULNAME_PLU "Popups" - -INT_PTR svcEnableDisableMenuCommand(WPARAM, LPARAM); - -#endif //HEADERS_H diff --git a/plugins/Popup/src/history.cpp b/plugins/Popup/src/history.cpp index 3749dc7906..5f7c6cf14c 100644 --- a/plugins/Popup/src/history.cpp +++ b/plugins/Popup/src/history.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" static mir_cs csPopupHistory; static LIST arPopupHistory(SETTING_HISTORYSIZE_DEFAULT); diff --git a/plugins/Popup/src/icons.cpp b/plugins/Popup/src/icons.cpp index c23d09e8cb..ce4cb1b0c0 100644 --- a/plugins/Popup/src/icons.cpp +++ b/plugins/Popup/src/icons.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" static IconItem iconList[] = { diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index 9ed1bc2215..0d3d6902c3 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -20,7 +20,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 "headers.h" +#include "stdafx.h" WORD SETTING_MAXIMUMWIDTH_MAX = GetSystemMetrics(SM_CXSCREEN); diff --git a/plugins/Popup/src/notifications.cpp b/plugins/Popup/src/notifications.cpp index c24f0a2765..ebdc53219e 100644 --- a/plugins/Popup/src/notifications.cpp +++ b/plugins/Popup/src/notifications.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" HANDLE g_hntfError, g_hntfWarning, g_hntfNotification; diff --git a/plugins/Popup/src/opt_adv.cpp b/plugins/Popup/src/opt_adv.cpp index 17bf55f118..68dd085240 100644 --- a/plugins/Popup/src/opt_adv.cpp +++ b/plugins/Popup/src/opt_adv.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" HWND hwndBox = NULL; diff --git a/plugins/Popup/src/opt_class.cpp b/plugins/Popup/src/opt_class.cpp index 1d41bf4896..da96d69c60 100644 --- a/plugins/Popup/src/opt_class.cpp +++ b/plugins/Popup/src/opt_class.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" //--------------------------------------------------------------------------- // Workaround for MS bug ComboBox_SelectItemData diff --git a/plugins/Popup/src/opt_contacts.cpp b/plugins/Popup/src/opt_contacts.cpp index 51d4bb8f02..3434287acf 100644 --- a/plugins/Popup/src/opt_contacts.cpp +++ b/plugins/Popup/src/opt_contacts.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" static void sttResetListOptions(HWND hwndList) { diff --git a/plugins/Popup/src/opt_gen.cpp b/plugins/Popup/src/opt_gen.cpp index 8ad16037b3..476699e0f0 100644 --- a/plugins/Popup/src/opt_gen.cpp +++ b/plugins/Popup/src/opt_gen.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" INT_PTR CALLBACK PositionBoxDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); diff --git a/plugins/Popup/src/opt_skins.cpp b/plugins/Popup/src/opt_skins.cpp index a2d2fe4a30..9a0986a33e 100644 --- a/plugins/Popup/src/opt_skins.cpp +++ b/plugins/Popup/src/opt_skins.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" static volatile bool gPreviewOk = false; static PopupWnd2 *wndPreview = NULL; diff --git a/plugins/Popup/src/opttree.cpp b/plugins/Popup/src/opttree.cpp index c238b5f499..1bacdf0212 100644 --- a/plugins/Popup/src/opttree.cpp +++ b/plugins/Popup/src/opttree.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" enum { IMG_GROUP, IMG_CHECK, IMG_NOCHECK, IMG_RCHECK, IMG_NORCHECK, IMG_GRPOPEN, IMG_GRPCLOSED }; diff --git a/plugins/Popup/src/popup_gdiplus.cpp b/plugins/Popup/src/popup_gdiplus.cpp index d323654740..0f6212d7e9 100644 --- a/plugins/Popup/src/popup_gdiplus.cpp +++ b/plugins/Popup/src/popup_gdiplus.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /* 99% of this code was adopted from clist_modern by FYR */ -#include "headers.h" +#include "stdafx.h" #undef Translate diff --git a/plugins/Popup/src/popup_thread.cpp b/plugins/Popup/src/popup_thread.cpp index a586cf3eb5..50db5f8580 100644 --- a/plugins/Popup/src/popup_thread.cpp +++ b/plugins/Popup/src/popup_thread.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" #include // globals diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp index 337faf1297..a0dd244046 100644 --- a/plugins/Popup/src/popup_wnd2.cpp +++ b/plugins/Popup/src/popup_wnd2.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" #include "bitmap_funcs.h" #include diff --git a/plugins/Popup/src/services.cpp b/plugins/Popup/src/services.cpp index 900a9908e6..5d994d9311 100644 --- a/plugins/Popup/src/services.cpp +++ b/plugins/Popup/src/services.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" int num_classes = 0; // for core class api support diff --git a/plugins/Popup/src/skin.cpp b/plugins/Popup/src/skin.cpp index 423fb25ea3..723b6f6a41 100644 --- a/plugins/Popup/src/skin.cpp +++ b/plugins/Popup/src/skin.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" #include #include diff --git a/plugins/Popup/src/srmm_menu.cpp b/plugins/Popup/src/srmm_menu.cpp index d2792940fa..b21f96f2d6 100644 --- a/plugins/Popup/src/srmm_menu.cpp +++ b/plugins/Popup/src/srmm_menu.cpp @@ -21,7 +21,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 "headers.h" +#include "stdafx.h" /************************************************************************************* === how does this work === diff --git a/plugins/Popup/src/stdafx.cpp b/plugins/Popup/src/stdafx.cpp deleted file mode 100644 index 7e0216078c..0000000000 --- a/plugins/Popup/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 "headers.h" \ No newline at end of file diff --git a/plugins/Popup/src/stdafx.cxx b/plugins/Popup/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/Popup/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/Popup/src/stdafx.h b/plugins/Popup/src/stdafx.h new file mode 100644 index 0000000000..db8bbf6bee --- /dev/null +++ b/plugins/Popup/src/stdafx.h @@ -0,0 +1,138 @@ +/* +Popup Plus plugin for Miranda IM + +Copyright © 2002 Luca Santarelli, +© 2004-2007 Victor Pavlychko +© 2010 MPK +© 2010 Merlin_de + +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. +*/ + +/* +=============================================================================== +Popup plugin + +This plugin notifies you when a contact changes his/hers status with a Popup. +You can customize its look (style of popup, font, text...) and behaviour (the +position in the screen, the time to live, the action on a mouse click). + +File name: "headers.h" +This file has the purpose of becoming a precompiled header common to every +project file. + +Written by: Hrk (Luca Santarelli) +Updated by: Zazoo (Victor Pavlychko) + +Miranda NG can be found here: +http://miranda-ng.org/ + +Miranda NG plugins and tools can be found here: +http://miranda-ng.org/distr/ +*/ + +#ifndef HEADERS_H +#define HEADERS_H + +// disable security warnings about "*_s" functions +#define _CRT_SECURE_NO_DEPRECATE + +#define OEMRESOURCE + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#undef db_get_s +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#ifndef MTEXT_NOHELPERS +#define MTEXT_NOHELPERS +#endif // MTEXT_NOHELPERS +#include +#include +#include + +#include "resource.h" +#include "defs.h" +#include "version.h" +#include "config.h" +#include "common.h" +#include "def_settings.h" +#include "opttree.h" +#include "opt_gen.h" +#include "opt_skins.h" +#include "opt_contacts.h" +#include "opt_adv.h" +#include "history.h" +#include "services.h" +#include "srmm_menu.h" +#include "bitmap_funcs.h" +#include "icons.h" +#include "font.h" +#include "formula.h" +#include "skin.h" +#include "popup_thread.h" +#include "actions.h" +#include "notifications.h" +#include "opt_class.h" +#include "popup_wnd2.h" +#include "effects.h" +#include "avatars.h" +#include "avatars_simple.h" +#include "avatars_flash.h" +#include "avatars_gif.h" +#include "popup_gdiplus.h" + +#define PU_MODULCLASS "PopupCLASS" // temp DB modul for this plugin +#define MODULNAME "Popup" +#define MODULNAME_LONG "Popup Plus" +#define MODULNAME_PLU "Popups" + +INT_PTR svcEnableDisableMenuCommand(WPARAM, LPARAM); + +#endif //HEADERS_H -- cgit v1.2.3