From acc58a246bee0bf5e1f0da754f25a230452e0f7a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 17 Jan 2015 10:14:03 +0000 Subject: preparing Exchange for the precompiled headers' usage git-svn-id: http://svn.miranda-ng.org/main/trunk@11868 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Exchange/src/MirandaExchange.cpp | 3 +-- plugins/Exchange/src/StdAfx.cpp | 2 +- plugins/Exchange/src/StdAfx.h | 5 +++-- plugins/Exchange/src/dlg_handlers.cpp | 2 +- plugins/Exchange/src/dlg_handlers.h | 2 -- plugins/Exchange/src/emails.cpp | 2 ++ plugins/Exchange/src/emails.h | 2 -- plugins/Exchange/src/hooked_events.cpp | 2 ++ plugins/Exchange/src/hooked_events.h | 3 --- plugins/Exchange/src/services.cpp | 1 + plugins/Exchange/src/services.h | 2 -- plugins/Exchange/src/utils.cpp | 1 + plugins/Exchange/src/utils.h | 3 --- 13 files changed, 12 insertions(+), 18 deletions(-) (limited to 'plugins/Exchange/src') diff --git a/plugins/Exchange/src/MirandaExchange.cpp b/plugins/Exchange/src/MirandaExchange.cpp index d587f9ceb5..afa1efcb2b 100644 --- a/plugins/Exchange/src/MirandaExchange.cpp +++ b/plugins/Exchange/src/MirandaExchange.cpp @@ -29,9 +29,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. purpose: Miranda Exchange Plugin *********************************************************************/ -#include "stdafx.h" +#include "commonheaders.h" #include "MirandaExchange.h" -#include "commonheaders.h" #include "utils.h" #include diff --git a/plugins/Exchange/src/StdAfx.cpp b/plugins/Exchange/src/StdAfx.cpp index 4e991b8f0d..acff65a913 100644 --- a/plugins/Exchange/src/StdAfx.cpp +++ b/plugins/Exchange/src/StdAfx.cpp @@ -2,7 +2,7 @@ // exchange.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" +#include "commonheaders.h" // TODO: reference any additional headers you need in STDAFX.H // and not in this file diff --git a/plugins/Exchange/src/StdAfx.h b/plugins/Exchange/src/StdAfx.h index 801e3c963a..8cd858b701 100644 --- a/plugins/Exchange/src/StdAfx.h +++ b/plugins/Exchange/src/StdAfx.h @@ -14,9 +14,10 @@ #include +#include + // TODO: reference additional headers your program requires here -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. +#include "commonheaders.h" #endif // !defined(AFX_STDAFX_H__B170AF8E_BA64_4233_BF83_B4F0D1F3B775__INCLUDED_) diff --git a/plugins/Exchange/src/dlg_handlers.cpp b/plugins/Exchange/src/dlg_handlers.cpp index 185d93aeeb..7e9fdb0754 100644 --- a/plugins/Exchange/src/dlg_handlers.cpp +++ b/plugins/Exchange/src/dlg_handlers.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 "dlg_handlers.h" #define MIN_EMAILS_WIDTH 300 diff --git a/plugins/Exchange/src/dlg_handlers.h b/plugins/Exchange/src/dlg_handlers.h index 2ac8498082..f98c3a8a43 100644 --- a/plugins/Exchange/src/dlg_handlers.h +++ b/plugins/Exchange/src/dlg_handlers.h @@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef M_EXCHANGE_DIALOG_HANDLERS_H #define M_EXCHANGE_DIALOG_HANDLERS_H -#include "commonheaders.h" - #define EXM_UPDATE_EMAILS WM_USER + 101 INT_PTR CALLBACK DlgProcOptions(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); diff --git a/plugins/Exchange/src/emails.cpp b/plugins/Exchange/src/emails.cpp index 78a9e7e413..b4f73d207e 100644 --- a/plugins/Exchange/src/emails.cpp +++ b/plugins/Exchange/src/emails.cpp @@ -18,6 +18,8 @@ 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 "dlg_handlers.h" #include "emails.h" CExchangeServer::CExchangeServer() diff --git a/plugins/Exchange/src/emails.h b/plugins/Exchange/src/emails.h index 24f63ab233..f33e7a510e 100644 --- a/plugins/Exchange/src/emails.h +++ b/plugins/Exchange/src/emails.h @@ -24,8 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //define if you want to test only the miranda part, and not the exchange one. //#define NO_EXCHANGE_TEST -#include "commonheaders.h" - #ifndef NO_EXCHANGE_TEST #include "MirandaExchange.h" #endif diff --git a/plugins/Exchange/src/hooked_events.cpp b/plugins/Exchange/src/hooked_events.cpp index b1fc66ce68..e02896dde0 100644 --- a/plugins/Exchange/src/hooked_events.cpp +++ b/plugins/Exchange/src/hooked_events.cpp @@ -18,6 +18,8 @@ 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 "dlg_handlers.h" #include "hooked_events.h" HANDLE hModulesLoaded; diff --git a/plugins/Exchange/src/hooked_events.h b/plugins/Exchange/src/hooked_events.h index 064e11c4a9..acf209b216 100644 --- a/plugins/Exchange/src/hooked_events.h +++ b/plugins/Exchange/src/hooked_events.h @@ -21,9 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef M_EXCHANGE_HOOKED_EVENTS_H #define M_EXCHANGE_HOOKED_EVENTS_H -#include "commonheaders.h" -#include "dlg_handlers.h" - extern HANDLE hModulesLoaded; extern HANDLE hOptionsInitialise; extern HANDLE hPreShutdown; diff --git a/plugins/Exchange/src/services.cpp b/plugins/Exchange/src/services.cpp index b15e25d734..e5999ac50a 100644 --- a/plugins/Exchange/src/services.cpp +++ b/plugins/Exchange/src/services.cpp @@ -18,6 +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 "services.h" CRITICAL_SECTION csCheck; diff --git a/plugins/Exchange/src/services.h b/plugins/Exchange/src/services.h index 4640f6bed6..f1c549dedd 100644 --- a/plugins/Exchange/src/services.h +++ b/plugins/Exchange/src/services.h @@ -23,8 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MS_EXCHANGE_CHECKEMAIL "Exchange/CheckEmail" -#include "commonheaders.h" - extern CRITICAL_SECTION csCheck; int InitServices(); diff --git a/plugins/Exchange/src/utils.cpp b/plugins/Exchange/src/utils.cpp index 21b3643df2..4a2ff20514 100644 --- a/plugins/Exchange/src/utils.cpp +++ b/plugins/Exchange/src/utils.cpp @@ -18,6 +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 "utils.h" #define ___DEB diff --git a/plugins/Exchange/src/utils.h b/plugins/Exchange/src/utils.h index a1ad15fe43..c5915e7192 100644 --- a/plugins/Exchange/src/utils.h +++ b/plugins/Exchange/src/utils.h @@ -21,9 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef M_EXCHANGE_UTILS_H #define M_EXCHANGE_UTILS_H -#include -#include "commonheaders.h" - #define LOG_FILE "exchange.log" #define ANCHOR_LEFT 0x000001 -- cgit v1.2.3