src/plugin/Plugin.cpp - Issue 5948518908821504: Issue #1158 - removed unnecessary definitions and #ifdef/#else/#endif sections

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: src/plugin/Plugin.cpp

Issue 5948518908821504: Issue #1158 - removed unnecessary definitions and #ifdef/#else/#endif sections (Closed)

Patch Set: Created Aug. 6, 2014, 7:38 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

OLD	NEW
1 #include "PluginStdAfx.h"	1 #include "PluginStdAfx.h"

2	2

3 #include "Plugin.h"	3 #include "Plugin.h"

4 #ifdef _WIN64	4 #ifdef _WIN64

5 #include "../../build/x64/AdblockPlus_i.c"	5 #include "../../build/x64/AdblockPlus_i.c"

6 #else	6 #else

7 #include "../../build/ia32/AdblockPlus_i.c"	7 #include "../../build/ia32/AdblockPlus_i.c"

8 #endif	8 #endif

9	9

10 #include "PluginClass.h"	10 #include "PluginClass.h"

11 #include "PluginClient.h"	11 #include "PluginClient.h"

12 #include "PluginSystem.h"	12 #include "PluginSystem.h"

13 #include "PluginSettings.h"	13 #include "PluginSettings.h"

14 #include "PluginMimeFilterClient.h"	14 #include "PluginMimeFilterClient.h"

15 #include "Msiquery.h"	15 #include "Msiquery.h"

16

17 #ifdef SUPPORT_FILTER

18 #include "PluginFilter.h"	16 #include "PluginFilter.h"

19 #endif

20 #ifdef SUPPORT_CONFIG

21 #include "PluginConfig.h"

22 #endif

23	17

24 #include "../shared/Dictionary.h"	18 #include "../shared/Dictionary.h"

25	19

26 CComModule _Module;	20 CComModule _Module;

27	21

28 BEGIN_OBJECT_MAP(ObjectMap)	22 BEGIN_OBJECT_MAP(ObjectMap)

29 OBJECT_ENTRY(CLSID_PluginClass, CPluginClass)	23 OBJECT_ENTRY(CLSID_PluginClass, CPluginClass)

30 END_OBJECT_MAP()	24 END_OBJECT_MAP()

31	25

32 //Dll Entry Point	26 //Dll Entry Point

(...skipping 98 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
131 EXTERN_C void STDAPICALLTYPE OnInstall(MSIHANDLE hInstall, MSIHANDLE tmp)	125 EXTERN_C void STDAPICALLTYPE OnInstall(MSIHANDLE hInstall, MSIHANDLE tmp)

132 {	126 {

133 InitPlugin(true);	127 InitPlugin(true);

134 }	128 }

135	129

136 // Called from updater	130 // Called from updater

137 EXTERN_C void STDAPICALLTYPE OnUpdate(void)	131 EXTERN_C void STDAPICALLTYPE OnUpdate(void)

138 {	132 {

139 InitPlugin(false);	133 InitPlugin(false);

140 }	134 }

OLD	NEW

« src/plugin/Config.h ('K') | « src/plugin/Config.h ('k') | src/plugin/PluginClass.h » ('j') | src/plugin/PluginClass.h » ('J')