From efe91f205310de8ee21915a52b52c9250dd45f58 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Wed, 27 Feb 2013 06:40:17 +0000 Subject: added version info added precompiled header git-svn-id: http://svn.miranda-ng.org/main/trunk@3790 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/IEView/ieview_10.vcxproj | 20 ++++++++++++++---- plugins/IEView/ieview_10.vcxproj.filters | 6 ++++++ plugins/IEView/ieview_11.vcxproj | 20 ++++++++++++++---- plugins/IEView/ieview_11.vcxproj.filters | 6 ++++++ plugins/IEView/res/Version.rc | 4 ---- plugins/IEView/src/ChatHTMLBuilder.cpp | 5 +---- plugins/IEView/src/HTMLBuilder.cpp | 7 +------ plugins/IEView/src/HistoryHTMLBuilder.cpp | 4 +--- plugins/IEView/src/IEView.cpp | 7 +------ plugins/IEView/src/MUCCHTMLBuilder.cpp | 4 +--- plugins/IEView/src/Options.cpp | 10 ++------- plugins/IEView/src/ScriverHTMLBuilder.cpp | 4 +--- plugins/IEView/src/TabSRMMHTMLBuilder.cpp | 5 ++--- plugins/IEView/src/Template.cpp | 8 ++++---- plugins/IEView/src/Template.h | 2 +- plugins/IEView/src/TemplateHTMLBuilder.cpp | 5 +++-- plugins/IEView/src/TextToken.cpp | 6 ++---- plugins/IEView/src/Utils.cpp | 6 +++--- plugins/IEView/src/Version.h | 6 ------ plugins/IEView/src/ieview_common.h | 33 ++++++++++++++++++++---------- plugins/IEView/src/ieview_main.cpp | 7 +------ plugins/IEView/src/ieview_services.cpp | 12 +---------- plugins/IEView/src/stdafx.cpp | 18 ++++++++++++++++ 23 files changed, 109 insertions(+), 96 deletions(-) create mode 100644 plugins/IEView/src/stdafx.cpp (limited to 'plugins/IEView') diff --git a/plugins/IEView/ieview_10.vcxproj b/plugins/IEView/ieview_10.vcxproj index f2c40ad7e6..7cea4ac791 100644 --- a/plugins/IEView/ieview_10.vcxproj +++ b/plugins/IEView/ieview_10.vcxproj @@ -73,13 +73,15 @@ Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;IEVIEW_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL Level3 EditAndContinue false + Use + ieview_common.h comctl32.lib;%(AdditionalDependencies) @@ -98,11 +100,13 @@ Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;IEVIEW_EXPORTS;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Level3 false + Use + ieview_common.h comctl32.lib;%(AdditionalDependencies) @@ -122,9 +126,11 @@ Full Size ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;IEVIEW_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Level3 false + Use + ieview_common.h comctl32.lib;%(AdditionalDependencies) @@ -147,9 +153,11 @@ Full Size ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;IEVIEW_EXPORTS;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Level3 false + Use + ieview_common.h comctl32.lib;%(AdditionalDependencies) @@ -186,6 +194,7 @@ + @@ -197,6 +206,9 @@ + + Create + diff --git a/plugins/IEView/ieview_10.vcxproj.filters b/plugins/IEView/ieview_10.vcxproj.filters index 1a3c723700..4bbed46c39 100644 --- a/plugins/IEView/ieview_10.vcxproj.filters +++ b/plugins/IEView/ieview_10.vcxproj.filters @@ -43,6 +43,9 @@ Source Files + + Source Files + @@ -95,6 +98,9 @@ Resource Files + + Resource Files + diff --git a/plugins/IEView/ieview_11.vcxproj b/plugins/IEView/ieview_11.vcxproj index 2a4d81a9b2..2748d1b8d1 100644 --- a/plugins/IEView/ieview_11.vcxproj +++ b/plugins/IEView/ieview_11.vcxproj @@ -77,13 +77,15 @@ Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;IEVIEW_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL Level3 EditAndContinue false + Use + ieview_common.h comctl32.lib;%(AdditionalDependencies) @@ -102,11 +104,13 @@ Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;IEVIEW_EXPORTS;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Level3 false + Use + ieview_common.h comctl32.lib;%(AdditionalDependencies) @@ -126,9 +130,11 @@ Full Size ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;IEVIEW_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Level3 false + Use + ieview_common.h comctl32.lib;%(AdditionalDependencies) @@ -151,9 +157,11 @@ Full Size ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;IEVIEW_EXPORTS;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Level3 false + Use + ieview_common.h comctl32.lib;%(AdditionalDependencies) @@ -190,6 +198,7 @@ + @@ -201,6 +210,9 @@ + + Create + diff --git a/plugins/IEView/ieview_11.vcxproj.filters b/plugins/IEView/ieview_11.vcxproj.filters index 1a3c723700..4bbed46c39 100644 --- a/plugins/IEView/ieview_11.vcxproj.filters +++ b/plugins/IEView/ieview_11.vcxproj.filters @@ -43,6 +43,9 @@ Source Files + + Source Files + @@ -95,6 +98,9 @@ Resource Files + + Resource Files + diff --git a/plugins/IEView/res/Version.rc b/plugins/IEView/res/Version.rc index d741488c4f..5bfbab4754 100644 --- a/plugins/IEView/res/Version.rc +++ b/plugins/IEView/res/Version.rc @@ -7,10 +7,6 @@ #include "afxres.h" #include "..\src\version.h" -#ifdef _WIN32 -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#endif //_WIN32 - VS_VERSION_INFO VERSIONINFO FILEVERSION __FILEVERSION_STRING PRODUCTVERSION __FILEVERSION_STRING diff --git a/plugins/IEView/src/ChatHTMLBuilder.cpp b/plugins/IEView/src/ChatHTMLBuilder.cpp index 22ab1730fa..8eedfa1ef1 100644 --- a/plugins/IEView/src/ChatHTMLBuilder.cpp +++ b/plugins/IEView/src/ChatHTMLBuilder.cpp @@ -18,11 +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 "ChatHTMLBuilder.h" -#include "Options.h" -#include "Utils.h" -#include "m_chat.h" +#include "ieview_common.h" #define CHATMOD "Chat" #define CHATFONTMOD "ChatFonts" diff --git a/plugins/IEView/src/HTMLBuilder.cpp b/plugins/IEView/src/HTMLBuilder.cpp index ee1a7baa10..1ce651da9f 100644 --- a/plugins/IEView/src/HTMLBuilder.cpp +++ b/plugins/IEView/src/HTMLBuilder.cpp @@ -18,13 +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 "HTMLBuilder.h" -#include "m_MathModule.h" -#include "m_metacontacts.h" -#include "Utils.h" -//#include "Smiley.h" -#include "Options.h" +#include "ieview_common.h" int HTMLBuilder::mimFlags = 0; diff --git a/plugins/IEView/src/HistoryHTMLBuilder.cpp b/plugins/IEView/src/HistoryHTMLBuilder.cpp index bf0c68c8dd..f0cb077253 100644 --- a/plugins/IEView/src/HistoryHTMLBuilder.cpp +++ b/plugins/IEView/src/HistoryHTMLBuilder.cpp @@ -18,10 +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 "HistoryHTMLBuilder.h" -#include "Options.h" -#include "Utils.h" +#include "ieview_common.h" // srmm stuff #define SMF_LOG_SHOWNICK 1 diff --git a/plugins/IEView/src/IEView.cpp b/plugins/IEView/src/IEView.cpp index c5bd59681b..5d0709a5f8 100644 --- a/plugins/IEView/src/IEView.cpp +++ b/plugins/IEView/src/IEView.cpp @@ -18,13 +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 "IEView.h" -#include "resource.h" -#include "Options.h" -#include "Utils.h" - -//#include +#include "ieview_common.h" #define WM_WAITWHILEBUSY (WM_USER+600) //#define GECKO diff --git a/plugins/IEView/src/MUCCHTMLBuilder.cpp b/plugins/IEView/src/MUCCHTMLBuilder.cpp index 807f05bc7e..92603a3fc5 100644 --- a/plugins/IEView/src/MUCCHTMLBuilder.cpp +++ b/plugins/IEView/src/MUCCHTMLBuilder.cpp @@ -18,10 +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 "MUCCHTMLBuilder.h" -#include "Options.h" -#include "Utils.h" +#include "ieview_common.h" #define MUCCMOD "MUCC" diff --git a/plugins/IEView/src/Options.cpp b/plugins/IEView/src/Options.cpp index bbc81f8d03..c29060fc18 100644 --- a/plugins/IEView/src/Options.cpp +++ b/plugins/IEView/src/Options.cpp @@ -18,14 +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. */ -#define _WIN32_WINNT 0x0501 -#include "Options.h" -#include "resource.h" -#include "Template.h" -#include "Utils.h" -#include "m_MathModule.h" -#include "m_avatars.h" -#include + +#include "ieview_common.h" #define UM_CHECKSTATECHANGE (WM_USER+100) HANDLE hHookOptionsChanged; diff --git a/plugins/IEView/src/ScriverHTMLBuilder.cpp b/plugins/IEView/src/ScriverHTMLBuilder.cpp index 288d7e7c18..cef26fc459 100644 --- a/plugins/IEView/src/ScriverHTMLBuilder.cpp +++ b/plugins/IEView/src/ScriverHTMLBuilder.cpp @@ -18,10 +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 "ScriverHTMLBuilder.h" -#include "Options.h" -#include "Utils.h" +#include "ieview_common.h" // srmm stuff #define SMF_LOG_SHOWNICK 1 diff --git a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp index 78d00177a8..4bf26980c7 100644 --- a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp +++ b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp @@ -18,9 +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 "TabSRMMHTMLBuilder.h" -#include "Options.h" -#include "Utils.h" + +#include "ieview_common.h" // tabsrmm stuff diff --git a/plugins/IEView/src/Template.cpp b/plugins/IEView/src/Template.cpp index 940efa8bfd..ac6ced05d0 100644 --- a/plugins/IEView/src/Template.cpp +++ b/plugins/IEView/src/Template.cpp @@ -18,8 +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 "Template.h" -#include "Utils.h" + +#include "ieview_common.h" TokenDef::TokenDef(const char *tokenString) { this->tokenString = tokenString; @@ -111,7 +111,7 @@ bool Template::equals(const char *name) { } static TokenDef tokenNames[] = { - TokenDef("%name%", Token::NAME, 0), + TokenDef("%name%", Token::INAME, 0), TokenDef("%time%", Token::TIME, 0), TokenDef("%text%", Token::TEXT, 0), TokenDef("%date%", Token::DATE, 0), @@ -131,7 +131,7 @@ static TokenDef tokenNames[] = { TokenDef("%statusMsg%", Token::STATUSMSG, 0), TokenDef("%fileDesc%", Token::FILEDESC, 0), - TokenDef("%\\name%", Token::NAME, 1), + TokenDef("%\\name%", Token::INAME, 1), TokenDef("%\\time%", Token::TIME, 1), TokenDef("%\\text%", Token::TEXT, 1), TokenDef("%\\date%", Token::DATE, 1), diff --git a/plugins/IEView/src/Template.h b/plugins/IEView/src/Template.h index c0ee5f28fe..5f0f3c5626 100644 --- a/plugins/IEView/src/Template.h +++ b/plugins/IEView/src/Template.h @@ -47,7 +47,7 @@ public: BASE, PLAIN, TEXT, - NAME, + INAME, TIME, DATE, AVATAR, diff --git a/plugins/IEView/src/TemplateHTMLBuilder.cpp b/plugins/IEView/src/TemplateHTMLBuilder.cpp index a4356760a3..3cc39d9d43 100644 --- a/plugins/IEView/src/TemplateHTMLBuilder.cpp +++ b/plugins/IEView/src/TemplateHTMLBuilder.cpp @@ -18,7 +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 "TemplateHTMLBuilder.h" + +#include "ieview_common.h" #define EVENTTYPE_STATUSCHANGE 25368 @@ -514,7 +515,7 @@ void TemplateHTMLBuilder::appendEventTemplate(IEView *view, IEVIEWEVENT *event, case Token::PLAIN: tokenVal = token->getText(); break; - case Token::NAME: + case Token::INAME: if (getFlags(protoSettings) & Options::LOG_SHOW_NICKNAMES) { tokenVal = szName; } else { diff --git a/plugins/IEView/src/TextToken.cpp b/plugins/IEView/src/TextToken.cpp index 4d911c9bf7..1b6d2fed58 100644 --- a/plugins/IEView/src/TextToken.cpp +++ b/plugins/IEView/src/TextToken.cpp @@ -18,10 +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 "TextToken.h" -#include "m_MathModule.h" -//#include "m_metacontacts.h" -#include "Utils.h" + +#include "ieview_common.h" TextToken::TextToken(int type, const char *text, int len) { next = NULL; diff --git a/plugins/IEView/src/Utils.cpp b/plugins/IEView/src/Utils.cpp index 813a6e67f1..5c52ae696a 100644 --- a/plugins/IEView/src/Utils.cpp +++ b/plugins/IEView/src/Utils.cpp @@ -18,9 +18,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "Utils.h" -#include -#include + +#include "ieview_common.h" + wchar_t Utils::base_dir[MAX_PATH]; unsigned Utils::hookNum = 0; unsigned Utils::serviceNum = 0; diff --git a/plugins/IEView/src/Version.h b/plugins/IEView/src/Version.h index f76ee4a4ca..81c66422c3 100644 --- a/plugins/IEView/src/Version.h +++ b/plugins/IEView/src/Version.h @@ -4,14 +4,8 @@ #define __BUILD_NUM 0 #define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM -#define __FILEVERSION_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM - -#define __STRINGIFY_IMPL(x) #x -#define __STRINGIFY(x) __STRINGIFY_IMPL(x) -#define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) #define __PLUGIN_NAME "IEView" -#define __INTERNAL_NAME "IEView" #define __FILENAME "IEView.dll" #define __DESCRIPTION "IE Based Chat Log." #define __AUTHOR "Piotr Piastucki, Francois Mean" diff --git a/plugins/IEView/src/ieview_common.h b/plugins/IEView/src/ieview_common.h index 77835b66c5..a909a9a6b1 100644 --- a/plugins/IEView/src/ieview_common.h +++ b/plugins/IEView/src/ieview_common.h @@ -25,40 +25,51 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define _CRT_SECURE_NO_WARNINGS #define _CRT_NONSTDC_NO_DEPRECATE -#define MIRANDA_VER 0x0A00 +#define _WIN32_WINNT 0x0501 #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 "m_avatars.h" +#include +#include +#include +#include -#include "m_smileyadd.h" -#include "m_ieview.h" +#include +#include +#include +#include #include "IEView.h" #include "Utils.h" +#include "ieview_services.h" +#include "Options.h" +#include "Version.h" +#include "ChatHTMLBuilder.h" +#include "HistoryHTMLBuilder.h" +#include "HTMLBuilder.h" +#include "resource.h" +#include "ScriverHTMLBuilder.h" +#include "TabSRMMHTMLBuilder.h" +#include "TemplateHTMLBuilder.h" +#include "MUCCHTMLBuilder.h" +#include "Template.h" +#include "TextToken.h" extern HINSTANCE hInstance; extern IEView *debugView; diff --git a/plugins/IEView/src/ieview_main.cpp b/plugins/IEView/src/ieview_main.cpp index 247a80c67a..8462e0189d 100644 --- a/plugins/IEView/src/ieview_main.cpp +++ b/plugins/IEView/src/ieview_main.cpp @@ -18,12 +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 "IEView.h" -#include "m_ieview.h" -#include "ieview_services.h" -#include "Options.h" -#include "Utils.h" -#include "Version.h" +#include "ieview_common.h" char *ieviewModuleName; HINSTANCE hInstance; diff --git a/plugins/IEView/src/ieview_services.cpp b/plugins/IEView/src/ieview_services.cpp index a9745e4184..2baf9abc00 100644 --- a/plugins/IEView/src/ieview_services.cpp +++ b/plugins/IEView/src/ieview_services.cpp @@ -18,17 +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 "ieview_services.h" -//#include "SRMMHTMLBuilder.h" -#include "ScriverHTMLBuilder.h" -#include "TabSRMMHTMLBuilder.h" -#include "TemplateHTMLBuilder.h" -#include "MUCCHTMLBuilder.h" -#include "ChatHTMLBuilder.h" -#include "HistoryHTMLBuilder.h" -#include "IEView.h" -#include "m_ieview.h" -#include "Options.h" + #include "ieview_common.h" INT_PTR HandleIEWindow(WPARAM wParam, LPARAM lParam) { diff --git a/plugins/IEView/src/stdafx.cpp b/plugins/IEView/src/stdafx.cpp new file mode 100644 index 0000000000..f99bd75a06 --- /dev/null +++ b/plugins/IEView/src/stdafx.cpp @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-13 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 "ieview_common.h" \ No newline at end of file -- cgit v1.2.3