Compiz Core

Merge lp:~alan-griffiths/compiz-core/fix-headers into lp:compiz-core/0.9.5

  1. fix-headers
  2. Merge into 0.9.5
Proposed by Alan Griffiths
Status: Merged
Approved by: Daniel van Vugt
Approved revision: 2915
Merged at revision: 2917
Proposed branch: lp:~alan-griffiths/compiz-core/fix-headers
Merge into: lp:compiz-core/0.9.5
Diff against target: 1509 lines (+252/-186)
80 files modified
include/core/CMakeLists.txt (+2/-0)
include/core/abiversion.h (+10/-0)
include/core/action.h (+2/-1)
include/core/core.h (+1/-10)
include/core/countedlist.h (+1/-0)
include/core/deg2rad.h (+6/-0)
include/core/match.h (+0/-1)
include/core/output.h (+5/-2)
include/core/plugin.h (+3/-0)
include/core/propertywriter.h (+4/-1)
include/core/rect.h (+6/-0)
plugins/annotate/src/annotate.cpp (+2/-1)
plugins/annotate/src/annotate.h (+6/-6)
plugins/blur/src/blur.h (+6/-5)
plugins/clone/src/clone.h (+8/-6)
plugins/commands/src/commands.cpp (+4/-0)
plugins/commands/src/commands.h (+3/-3)
plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h (+0/-1)
plugins/compiztoolbox/src/compiztoolbox.cpp (+3/-3)
plugins/composite/include/composite/composite.h (+5/-3)
plugins/composite/src/composite.cpp (+4/-2)
plugins/copytex/src/copytex.h (+0/-1)
plugins/cube/include/cube/cube.h (+2/-1)
plugins/dbus/src/dbus.h (+3/-1)
plugins/decor/src/decor.cpp (+1/-1)
plugins/decor/src/decor.h (+1/-1)
plugins/fade/src/fade.h (+4/-3)
plugins/gnomecompat/src/gnomecompat.h (+1/-1)
plugins/imgpng/src/imgpng.cpp (+10/-1)
plugins/imgpng/src/imgpng.h (+11/-11)
plugins/imgsvg/src/imgsvg.cpp (+2/-0)
plugins/imgsvg/src/imgsvg.h (+10/-10)
plugins/ini/src/ini.cpp (+3/-0)
plugins/ini/src/ini.h (+7/-8)
plugins/inotify/src/inotify.cpp (+6/-0)
plugins/inotify/src/inotify.h (+7/-5)
plugins/kde/src/kde.h (+2/-5)
plugins/move/src/move.h (+3/-2)
plugins/obs/src/obs.h (+1/-1)
plugins/opengl/include/opengl/fragment.h (+1/-0)
plugins/opengl/include/opengl/texture.h (+5/-2)
plugins/opengl/src/fragment.cpp (+7/-6)
plugins/opengl/src/matrix.cpp (+6/-2)
plugins/opengl/src/opengl.cpp (+0/-1)
plugins/opengl/src/paint.cpp (+5/-3)
plugins/opengl/src/privates.h (+1/-1)
plugins/opengl/src/privatetexture.h (+3/-2)
plugins/opengl/src/texture.cpp (+0/-1)
plugins/place/src/place.h (+1/-1)
plugins/regex/src/regex.cpp (+5/-1)
plugins/regex/src/regexplugin.h (+8/-6)
plugins/resize/src/resize.cpp (+0/-1)
plugins/resize/src/resize.h (+1/-1)
plugins/rotate/src/rotate.cpp (+3/-5)
plugins/rotate/src/rotate.h (+1/-1)
plugins/scale/include/scale/scale.h (+1/-2)
plugins/screenshot/src/screenshot.cpp (+11/-0)
plugins/screenshot/src/screenshot.h (+1/-5)
plugins/water/src/water.cpp (+3/-0)
plugins/water/src/water.h (+2/-10)
plugins/zoom/src/zoom.cpp (+5/-0)
plugins/zoom/src/zoom.h (+1/-9)
src/event.cpp (+0/-1)
src/main.cpp (+0/-1)
src/match.cpp (+0/-2)
src/option.cpp (+0/-1)
src/output.cpp (+0/-1)
src/plugin.cpp (+12/-1)
src/pluginclasshandler/tests/test-pluginclasshandler.cpp (+3/-0)
src/pluginclasshandler/tests/test-pluginclasshandler.h (+0/-5)
src/privatescreen.h (+0/-1)
src/propertywriter.cpp (+1/-1)
src/rect.cpp (+0/-1)
src/region.cpp (+4/-3)
src/screen.cpp (+0/-2)
src/session.cpp (+4/-3)
src/string/tests/printf/src/test-string-printf.cpp (+0/-1)
src/timer/tests/test-timer.h (+0/-1)
src/window.cpp (+0/-1)
src/windowgeometry.cpp (+2/-3)
To merge this branch: bzr merge lp:~alan-griffiths/compiz-core/fix-headers
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
Thomas Voß Approve
Sam Spilsbury Approve
Review via email: mp+89075@code.launchpad.net

Description of the change

There are a lot of unnecessary and annoying header dependencies. A particular example was core/core.h which was included by everything and included almost everything.

This change removes many of those dependencies - which makes it a lot easier to break out "units" to put them under test.

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

YES

review: Approve
Revision history for this message
Thomas Voß (thomas-voss) wrote :

Yes, indeed.

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Approved, BUT... This branch causes a couple of other plugins to no longer build:

lp:compiz-expo-plugin / compiz-plugins-main
lp:compiz-cubeaddon-plugin / compiz-plugins-extra

Both are simply missing #include <core/deg2rad.h>

Note also bug 915236 which describes other unresolved build failures in main/extra plugins.

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Off topic, but also note... the compiz ABI broke a while ago. Not sure which changes did it but the core code is most definitely no longer compatible with plugins in oneiric. So this probably needs incrementing:

#define CORE_ABIVERSION 20110828

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

The build failure deg2rad problem is now described in bug 918554.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/core/CMakeLists.txt'
2--- include/core/CMakeLists.txt 2012-01-12 08:35:59 +0000
3+++ include/core/CMakeLists.txt 2012-01-18 16:53:24 +0000
4@@ -22,6 +22,8 @@
5 string.h
6 window.h
7 wrapsystem.h
8+ abiversion.h
9+ deg2rad.h
10 )
11
12 install (
13
14=== added file 'include/core/abiversion.h'
15--- include/core/abiversion.h 1970-01-01 00:00:00 +0000
16+++ include/core/abiversion.h 2012-01-18 16:53:24 +0000
17@@ -0,0 +1,10 @@
18+#ifndef COMPIZ_ABIVERSION_H
19+#define COMPIZ_ABIVERSION_H
20+
21+#ifdef CORE_ABIVERSION
22+# error Conflicting definitions of CORE_ABIVERSION
23+#endif
24+
25+#define CORE_ABIVERSION 20110828
26+
27+#endif // COMPIZ_ABIVERSION_H
28
29=== modified file 'include/core/action.h'
30--- include/core/action.h 2010-11-09 14:13:19 +0000
31+++ include/core/action.h 2012-01-18 16:53:24 +0000
32@@ -28,11 +28,12 @@
33 #ifndef _COMPACTION_H
34 #define _COMPACTION_H
35
36+#include <core/option.h>
37+
38 #include <boost/function.hpp>
39
40 #include <X11/Xlib-xcb.h>
41
42-#include <core/option.h>
43
44 class PrivateAction;
45
46
47=== modified file 'include/core/core.h'
48--- include/core/core.h 2011-12-19 07:06:22 +0000
49+++ include/core/core.h 2012-01-18 16:53:24 +0000
50@@ -27,7 +27,7 @@
51 #define _COMPIZ_CORE_H
52
53
54-#define CORE_ABIVERSION 20110828
55+#include "abiversion.h"
56
57 #include <stdio.h>
58 #include <assert.h>
59@@ -56,7 +56,6 @@
60 #include <boost/foreach.hpp>
61 #define foreach BOOST_FOREACH
62
63-#include <glib.h>
64
65 /*
66 * WORDS_BIGENDIAN should be defined before including this file for
67@@ -75,14 +74,6 @@
68
69 #define STRINGIFY(x) #x
70 #define TOSTRING(x) STRINGIFY (x)
71-#define DEG2RAD (M_PI / 180.0f)
72-
73-#if defined(HAVE_SCANDIR_POSIX)
74- // POSIX (2008) defines the comparison function like this:
75- #define scandir(a,b,c,d) scandir((a), (b), (c), (int(*)(const dirent **, const dirent **))(d));
76-#else
77- #define scandir(a,b,c,d) scandir((a), (b), (c), (int(*)(const void*,const void*))(d));
78-#endif
79
80 #include <core/global.h>
81
82
83=== modified file 'include/core/countedlist.h'
84--- include/core/countedlist.h 2009-12-16 12:14:32 +0000
85+++ include/core/countedlist.h 2012-01-18 16:53:24 +0000
86@@ -8,6 +8,7 @@
87 #ifndef COUNTEDLIST_H_
88 #define COUNTEDLIST_H_
89
90+#include <list>
91
92 template<typename value_type,
93 typename allocator_type = std::allocator<value_type> >
94
95=== added file 'include/core/deg2rad.h'
96--- include/core/deg2rad.h 1970-01-01 00:00:00 +0000
97+++ include/core/deg2rad.h 2012-01-18 16:53:24 +0000
98@@ -0,0 +1,6 @@
99+#ifndef DEG2RAD_H
100+#define DEG2RAD_H
101+#include <math.h>
102+#define DEG2RAD (M_PI / 180.0f)
103+
104+#endif // DEG2RAD_H
105
106=== modified file 'include/core/match.h'
107--- include/core/match.h 2011-10-31 13:51:00 +0000
108+++ include/core/match.h 2012-01-18 16:53:24 +0000
109@@ -29,7 +29,6 @@
110 #define _COMPMATCH_H
111
112 #include <core/string.h>
113-#include <core/core.h>
114
115 class PrivateMatch;
116 class CompWindow;
117
118=== modified file 'include/core/output.h'
119--- include/core/output.h 2010-03-24 09:37:19 +0000
120+++ include/core/output.h 2012-01-18 16:53:24 +0000
121@@ -28,8 +28,11 @@
122 #ifndef _COMPOUTPUT_H
123 #define _COMPOUTPUT_H
124
125-#include <core/core.h>
126-#include <core/rect.h>
127+#include "core/rect.h"
128+#include "core/string.h"
129+
130+#include <list>
131+#include <vector>
132
133 /**
134 * Represents a phisically attached screen in Compiz, where this
135
136=== modified file 'include/core/plugin.h'
137--- include/core/plugin.h 2011-10-31 13:51:00 +0000
138+++ include/core/plugin.h 2012-01-18 16:53:24 +0000
139@@ -30,6 +30,8 @@
140 #include <core/option.h>
141 #include <core/privateunion.h>
142
143+#include <string.h>
144+
145 class CompScreen;
146 extern CompScreen *screen;
147
148@@ -54,6 +56,7 @@
149 }
150
151 class CompPlugin;
152+class CompWindow;
153
154 typedef bool (*LoadPluginProc) (CompPlugin *p,
155 const char *path,
156
157=== modified file 'include/core/propertywriter.h'
158--- include/core/propertywriter.h 2010-06-12 07:43:36 +0000
159+++ include/core/propertywriter.h 2012-01-18 16:53:24 +0000
160@@ -26,8 +26,11 @@
161 #ifndef _COMPPROPERTYWRITER_H
162 #define _COMPPROPERTYWRITER_H
163
164-#include "core.h"
165+#include "core/option.h"
166+#include "core/string.h"
167+
168 #include <X11/Xatom.h>
169+#include <X11/X.h>
170
171 static const CompOption::Vector nilValues;
172
173
174=== modified file 'include/core/rect.h'
175--- include/core/rect.h 2011-03-16 19:39:09 +0000
176+++ include/core/rect.h 2012-01-18 16:53:24 +0000
177@@ -26,6 +26,12 @@
178 #ifndef _COMPRECT_H
179 #define _COMPRECT_H
180
181+#include "core/point.h"
182+#include "core/size.h"
183+
184+#include <X11/Xutil.h>
185+#include <X11/Xregion.h>
186+
187 /**
188 * A 2D rectangle, which is likely in screen space. It's data is
189 * isolated and can only be mutated with set() methods.
190
191=== modified file 'plugins/annotate/src/annotate.cpp'
192--- plugins/annotate/src/annotate.cpp 2010-07-02 03:00:14 +0000
193+++ plugins/annotate/src/annotate.cpp 2012-01-18 16:53:24 +0000
194@@ -24,8 +24,9 @@
195 */
196
197 #include "annotate.h"
198+#include "core/deg2rad.h"
199
200-COMPIZ_PLUGIN_20090315 (annotate, AnnoPluginVTable);
201+COMPIZ_PLUGIN_20090315 (annotate, AnnoPluginVTable)
202
203 void
204 AnnoScreen::cairoClear (cairo_t *cr)
205
206=== modified file 'plugins/annotate/src/annotate.h'
207--- plugins/annotate/src/annotate.h 2010-06-12 07:43:36 +0000
208+++ plugins/annotate/src/annotate.h 2012-01-18 16:53:24 +0000
209@@ -23,15 +23,15 @@
210 * Author: David Reveman <davidr@novell.com>
211 */
212
213-#include <cmath>
214+#include "annotate_options.h"
215+#include <composite/composite.h>
216+
217+#include <core/serialization.h>
218+
219 #include <cairo-xlib-xrender.h>
220-
221-#include <core/core.h>
222-#include <core/serialization.h>
223 #include <opengl/opengl.h>
224-#include <composite/composite.h>
225
226-#include "annotate_options.h"
227+#include <cmath>
228
229 static int annoLastPointerX = 0;
230 static int annoLastPointerY = 0;
231
232=== modified file 'plugins/blur/src/blur.h'
233--- plugins/blur/src/blur.h 2009-07-17 22:20:23 +0000
234+++ plugins/blur/src/blur.h 2012-01-18 16:53:24 +0000
235@@ -23,19 +23,20 @@
236 * Author: David Reveman <davidr@novell.com>
237 */
238
239+#include "blur_options.h"
240+
241+#include <composite/composite.h>
242+#include <opengl/opengl.h>
243+#include <decoration.h>
244+
245 #include <stdlib.h>
246 #include <string.h>
247 #include <math.h>
248
249-#include <core/core.h>
250-#include <composite/composite.h>
251-#include <opengl/opengl.h>
252-#include <decoration.h>
253
254 #include <X11/Xatom.h>
255 #include <GL/glu.h>
256
257-#include "blur_options.h"
258
259 #define BLUR_GAUSSIAN_RADIUS_MAX 15
260
261
262=== modified file 'plugins/clone/src/clone.h'
263--- plugins/clone/src/clone.h 2009-08-11 14:20:20 +0000
264+++ plugins/clone/src/clone.h 2012-01-18 16:53:24 +0000
265@@ -1,3 +1,5 @@
266+#ifndef COMPIZ_CLONE_H
267+#define COMPIZ_CLONE_H
268 /*
269 * Copyright © 2006 Novell, Inc.
270 *
271@@ -28,16 +30,14 @@
272 * Author: David Reveman <davidr@novell.com>
273 */
274
275-#include <cmath>
276-
277-#include <core/core.h>
278+
279+#include "clone_options.h"
280+
281 #include <core/pluginclasshandler.h>
282-
283 #include <composite/composite.h>
284+
285 #include <opengl/opengl.h>
286
287-#include "clone_options.h"
288-
289 class Clone
290 {
291 public:
292@@ -145,3 +145,5 @@
293
294 bool init ();
295 };
296+
297+#endif
298
299=== modified file 'plugins/commands/src/commands.cpp'
300--- plugins/commands/src/commands.cpp 2010-05-13 17:22:54 +0000
301+++ plugins/commands/src/commands.cpp 2012-01-18 16:53:24 +0000
302@@ -25,6 +25,10 @@
303
304 #include "commands.h"
305
306+#include "core/abiversion.h"
307+#include "core/screen.h"
308+
309+
310 COMPIZ_PLUGIN_20090315 (commands, CommandsPluginVTable);
311
312 bool
313
314=== modified file 'plugins/commands/src/commands.h'
315--- plugins/commands/src/commands.h 2009-03-15 22:41:00 +0000
316+++ plugins/commands/src/commands.h 2012-01-18 16:53:24 +0000
317@@ -23,11 +23,11 @@
318 * Author: Danny Baumann <dannybaumann@web.de>
319 */
320
321-#include <core/core.h>
322+#include "commands_options.h"
323+
324+#include "core/plugin.h"
325 #include <core/pluginclasshandler.h>
326
327-#include "commands_options.h"
328-
329 class CommandsScreen :
330 public PluginClassHandler<CommandsScreen, CompScreen>,
331 public CommandsOptions
332
333=== modified file 'plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h'
334--- plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h 2011-03-11 18:13:44 +0000
335+++ plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h 2012-01-18 16:53:24 +0000
336@@ -27,7 +27,6 @@
337 #define _COMPIZ_COMPIZTOOLBOX_H
338
339 #include <decoration.h>
340-#include <core/core.h>
341 #include <core/atoms.h>
342 #include <core/countedlist.h>
343 #include <core/propertywriter.h>
344
345=== modified file 'plugins/compiztoolbox/src/compiztoolbox.cpp'
346--- plugins/compiztoolbox/src/compiztoolbox.cpp 2011-09-16 00:51:33 +0000
347+++ plugins/compiztoolbox/src/compiztoolbox.cpp 2012-01-18 16:53:24 +0000
348@@ -23,11 +23,11 @@
349 * Author: David Reveman <davidr@novell.com>
350 */
351
352-#include <core/core.h>
353-#include <core/propertywriter.h>
354 #include <compiztoolbox/compiztoolbox.h>
355 #include "compiztoolbox_options.h"
356
357+#include <core/abiversion.h>
358+#include <core/propertywriter.h>
359
360 bool openGLAvailable;
361
362@@ -47,7 +47,7 @@
363 void fini ();
364 };
365
366-COMPIZ_PLUGIN_20090315 (compiztoolbox, CompizToolboxPluginVTable);
367+COMPIZ_PLUGIN_20090315 (compiztoolbox, CompizToolboxPluginVTable)
368
369 CompString
370 getXDGUserDir (XDGUserDir userDir)
371
372=== modified file 'plugins/composite/include/composite/composite.h'
373--- plugins/composite/include/composite/composite.h 2011-10-15 11:02:37 +0000
374+++ plugins/composite/include/composite/composite.h 2012-01-18 16:53:24 +0000
375@@ -32,9 +32,11 @@
376
377 #define COMPIZ_COMPOSITE_ABI 3
378
379-#include <core/pluginclasshandler.h>
380-#include <core/timer.h>
381-#include <core/core.h>
382+#include "core/pluginclasshandler.h"
383+#include "core/timer.h"
384+#include "core/output.h"
385+#include "core/screen.h"
386+#include "core/wrapsystem.h"
387
388 #define COMPOSITE_SCREEN_DAMAGE_PENDING_MASK (1 << 0)
389 #define COMPOSITE_SCREEN_DAMAGE_REGION_MASK (1 << 1)
390
391=== modified file 'plugins/composite/src/composite.cpp'
392--- plugins/composite/src/composite.cpp 2009-03-15 17:37:45 +0000
393+++ plugins/composite/src/composite.cpp 2012-01-18 16:53:24 +0000
394@@ -25,11 +25,13 @@
395 * David Reveman <davidr@novell.com>
396 */
397
398-#include <core/core.h>
399-#include <composite/composite.h>
400+#include "composite/composite.h"
401
402 #include "privates.h"
403
404+#include "core/abiversion.h"
405+
406+
407 class CompositePluginVTable :
408 public CompPlugin::VTableForScreenAndWindow<CompositeScreen, CompositeWindow>
409 {
410
411=== modified file 'plugins/copytex/src/copytex.h'
412--- plugins/copytex/src/copytex.h 2011-06-01 03:33:04 +0000
413+++ plugins/copytex/src/copytex.h 2012-01-18 16:53:24 +0000
414@@ -22,7 +22,6 @@
415 * http://live.gnome.org/Luminocity
416 */
417
418-#include <core/core.h>
419 #include <core/pluginclasshandler.h>
420
421 #include <composite/composite.h>
422
423=== modified file 'plugins/cube/include/cube/cube.h'
424--- plugins/cube/include/cube/cube.h 2010-10-01 13:42:31 +0000
425+++ plugins/cube/include/cube/cube.h 2012-01-18 16:53:24 +0000
426@@ -26,7 +26,8 @@
427 #ifndef _COMPIZ_CUBE_H
428 #define _COMPIZ_CUBE_H
429
430-#include <core/core.h>
431+#include <core/screen.h>
432+#include <core/output.h>
433 #include <core/pluginclasshandler.h>
434
435 #include <composite/composite.h>
436
437=== modified file 'plugins/dbus/src/dbus.h'
438--- plugins/dbus/src/dbus.h 2010-11-09 14:13:19 +0000
439+++ plugins/dbus/src/dbus.h 2012-01-18 16:53:24 +0000
440@@ -26,9 +26,11 @@
441 * Copyright (C) 2009 Sam Spilsbury <smspillaz@gmail.com>
442 */
443
444-#include <core/core.h>
445+#include <core/screen.h>
446 #include <core/pluginclasshandler.h>
447+
448 #include <cstring>
449+#include <vector>
450 #include <poll.h>
451
452 #define DBUS_API_SUBJECT_TO_CHANGE
453
454=== modified file 'plugins/decor/src/decor.cpp'
455--- plugins/decor/src/decor.cpp 2011-12-15 07:40:03 +0000
456+++ plugins/decor/src/decor.cpp 2012-01-18 16:53:24 +0000
457@@ -33,7 +33,7 @@
458 #include <math.h>
459 #include <unistd.h>
460
461-#include <core/core.h>
462+#include <core/abiversion.h>
463 #include <decoration.h>
464 #include "decor.h"
465
466
467=== modified file 'plugins/decor/src/decor.h'
468--- plugins/decor/src/decor.h 2011-12-15 07:40:03 +0000
469+++ plugins/decor/src/decor.h 2012-01-18 16:53:24 +0000
470@@ -24,7 +24,7 @@
471 */
472
473 #include <boost/shared_ptr.hpp>
474-#include <core/core.h>
475+#include <core/window.h>
476 #include <core/pluginclasshandler.h>
477
478 #include <composite/composite.h>
479
480=== modified file 'plugins/fade/src/fade.h'
481--- plugins/fade/src/fade.h 2011-06-27 13:32:58 +0000
482+++ plugins/fade/src/fade.h 2012-01-18 16:53:24 +0000
483@@ -23,13 +23,14 @@
484 * Author: David Reveman <davidr@novell.com>
485 */
486
487-#include <core/core.h>
488+#include <core/window.h>
489 #include <core/pluginclasshandler.h>
490 #include <composite/composite.h>
491+
492+#include "fade_options.h"
493+
494 #include <opengl/opengl.h>
495
496-#include "fade_options.h"
497-
498 class FadeScreen :
499 public ScreenInterface,
500 public CompositeScreenInterface,
501
502=== modified file 'plugins/gnomecompat/src/gnomecompat.h'
503--- plugins/gnomecompat/src/gnomecompat.h 2009-03-15 22:41:00 +0000
504+++ plugins/gnomecompat/src/gnomecompat.h 2012-01-18 16:53:24 +0000
505@@ -23,7 +23,7 @@
506 * Author: Danny Baumann <dannybaumann@web.de>
507 */
508
509-#include <core/core.h>
510+#include <core/screen.h>
511 #include <core/pluginclasshandler.h>
512
513 #include "gnomecompat_options.h"
514
515=== modified file 'plugins/imgpng/src/imgpng.cpp'
516--- plugins/imgpng/src/imgpng.cpp 2010-03-25 01:25:06 +0000
517+++ plugins/imgpng/src/imgpng.cpp 2012-01-18 16:53:24 +0000
518@@ -25,6 +25,15 @@
519
520 #include "imgpng.h"
521
522+#include "core/abiversion.h"
523+
524+#include <fstream>
525+#include <stdio.h>
526+#include <stdlib.h>
527+#include <string.h>
528+#include <setjmp.h>
529+
530+
531 COMPIZ_PLUGIN_20090315 (imgpng, PngPluginVTable)
532
533 PngScreen::PngScreen (CompScreen *screen) :
534@@ -207,7 +216,7 @@
535
536 bool
537 PngScreen::writePng (unsigned char *buffer,
538- std::ofstream &file,
539+ std::ostream &file,
540 CompSize &size,
541 int stride)
542 {
543
544=== modified file 'plugins/imgpng/src/imgpng.h'
545--- plugins/imgpng/src/imgpng.h 2009-03-15 05:11:33 +0000
546+++ plugins/imgpng/src/imgpng.h 2012-01-18 16:53:24 +0000
547@@ -23,17 +23,16 @@
548 * Author: David Reveman <davidr@novell.com>
549 */
550
551-#include <stdio.h>
552-#include <stdlib.h>
553-#include <string.h>
554+#ifndef COMPIZ_IMGPGN_H
555+#define COMPIZ_IMGPGN_H
556+
557+#include <core/screen.h>
558+#include <core/string.h>
559+#include <core/pluginclasshandler.h>
560+
561 #include <png.h>
562-#include <setjmp.h>
563-
564-#include <iostream>
565-#include <fstream>
566-
567-#include <core/core.h>
568-#include <core/pluginclasshandler.h>
569+
570+#include <iosfwd>
571
572 #define PNG_SIG_SIZE 8
573
574@@ -56,7 +55,7 @@
575 bool readPngData (png_struct *png, png_info *info,
576 void *&data, CompSize &size);
577 bool readPng (std::ifstream &file, CompSize &size, void *& data);
578- bool writePng (unsigned char *buffer, std::ofstream &file,
579+ bool writePng (unsigned char *buffer, std::ostream &file,
580 CompSize &size, int stride);
581 };
582
583@@ -67,3 +66,4 @@
584 bool init ();
585 };
586
587+#endif
588
589=== modified file 'plugins/imgsvg/src/imgsvg.cpp'
590--- plugins/imgsvg/src/imgsvg.cpp 2010-02-04 17:16:02 +0000
591+++ plugins/imgsvg/src/imgsvg.cpp 2012-01-18 16:53:24 +0000
592@@ -25,6 +25,8 @@
593
594 #include "imgsvg.h"
595
596+#include <fstream>
597+
598 COMPIZ_PLUGIN_20090315 (imgsvg, SvgPluginVTable)
599
600 static bool
601
602=== modified file 'plugins/imgsvg/src/imgsvg.h'
603--- plugins/imgsvg/src/imgsvg.h 2009-03-15 17:58:48 +0000
604+++ plugins/imgsvg/src/imgsvg.h 2012-01-18 16:53:24 +0000
605@@ -23,6 +23,13 @@
606 * Author: David Reveman <davidr@novell.com>
607 */
608
609+#include "imgsvg_options.h"
610+
611+#include <composite/composite.h>
612+#include <decoration.h>
613+#include <core/screen.h>
614+#include <core/pluginclasshandler.h>
615+
616 #include <stdlib.h>
617 #include <string.h>
618
619@@ -32,17 +39,10 @@
620
621 #include <X11/Xatom.h>
622 #include <X11/extensions/shape.h>
623-
624-#include <core/core.h>
625-#include <core/pluginclasshandler.h>
626-#include <composite/composite.h>
627 #include <opengl/opengl.h>
628-#include <decoration.h>
629-
630-#include <iostream>
631-#include <fstream>
632-
633-#include "imgsvg_options.h"
634+
635+#include <iosfwd>
636+
637
638 #define SVG_SCREEN(s) SvgScreen *ss = SvgScreen::get (s)
639 #define SVG_WINDOW(w) SvgWindow *sw = SvgWindow::get (w)
640
641=== modified file 'plugins/ini/src/ini.cpp'
642--- plugins/ini/src/ini.cpp 2009-08-22 02:55:41 +0000
643+++ plugins/ini/src/ini.cpp 2012-01-18 16:53:24 +0000
644@@ -27,6 +27,9 @@
645 */
646
647 #include "ini.h"
648+
649+#include <sys/stat.h>
650+
651 #include <errno.h>
652 #include <boost/lexical_cast.hpp>
653
654
655=== modified file 'plugins/ini/src/ini.h'
656--- plugins/ini/src/ini.h 2009-03-15 05:11:33 +0000
657+++ plugins/ini/src/ini.h 2012-01-18 16:53:24 +0000
658@@ -23,16 +23,14 @@
659 * Author: Danny Baumann <dannybaumann@web.de>
660 */
661
662-#include <stdio.h>
663-#include <stdlib.h>
664-#include <sys/stat.h>
665-
666-#include <iostream>
667+#ifndef COMPIZ_INI_H
668+#define COMPIZ_INI_H
669+
670+#include <core/screen.h>
671+#include <core/pluginclasshandler.h>
672+
673 #include <fstream>
674
675-#include <core/core.h>
676-#include <core/pluginclasshandler.h>
677-
678 #define HOME_OPTIONDIR ".compiz/options"
679 #define CORE_NAME "general"
680 #define FILE_SUFFIX ".conf"
681@@ -104,3 +102,4 @@
682 };
683
684
685+#endif
686
687=== modified file 'plugins/inotify/src/inotify.cpp'
688--- plugins/inotify/src/inotify.cpp 2009-07-14 22:02:15 +0000
689+++ plugins/inotify/src/inotify.cpp 2012-01-18 16:53:24 +0000
690@@ -25,6 +25,12 @@
691
692 #include "inotify.h"
693
694+#include <stdlib.h>
695+#include <unistd.h>
696+#include <poll.h>
697+#include <sys/inotify.h>
698+
699+
700 COMPIZ_PLUGIN_20090315 (inotify, InotifyPluginVTable)
701
702 InotifyScreen::InotifyScreen (CompScreen *screen) :
703
704=== modified file 'plugins/inotify/src/inotify.h'
705--- plugins/inotify/src/inotify.h 2009-03-15 05:11:33 +0000
706+++ plugins/inotify/src/inotify.h 2012-01-18 16:53:24 +0000
707@@ -23,14 +23,14 @@
708 * Author: David Reveman <davidr@novell.com>
709 */
710
711-#include <stdlib.h>
712-#include <unistd.h>
713-#include <poll.h>
714-#include <sys/inotify.h>
715+#ifndef COMPIZ_INOTIFY_H
716+#define COMPIZ_INOTIFY_H
717
718-#include <core/core.h>
719+#include <core/screen.h>
720 #include <core/pluginclasshandler.h>
721
722+#include <list>
723+
724 class InotifyScreen :
725 public ScreenInterface,
726 public PluginClassHandler<InotifyScreen, CompScreen>
727@@ -64,3 +64,5 @@
728
729 bool init ();
730 };
731+
732+#endif
733
734=== modified file 'plugins/kde/src/kde.h'
735--- plugins/kde/src/kde.h 2010-02-10 17:52:40 +0000
736+++ plugins/kde/src/kde.h 2012-01-18 16:53:24 +0000
737@@ -21,14 +21,11 @@
738 #ifndef KDE_H_
739 #define KDE_H_
740
741-#include <core/core.h>
742+#include "dispatcher.h"
743+#include <core/screen.h>
744 #include <core/timer.h>
745 #include <core/pluginclasshandler.h>
746
747-#include "dispatcher.h"
748-
749-#include <fixx11h.h>
750-
751 #include <KApplication>
752
753 class KdeScreen :
754
755=== modified file 'plugins/move/src/move.h'
756--- plugins/move/src/move.h 2011-10-15 11:00:51 +0000
757+++ plugins/move/src/move.h 2012-01-18 16:53:24 +0000
758@@ -23,13 +23,14 @@
759 * Author: David Reveman <davidr@novell.com>
760 */
761
762-#include <core/core.h>
763+#include "move_options.h"
764+
765+#include <core/screen.h>
766 #include <core/pluginclasshandler.h>
767
768 #include <composite/composite.h>
769 #include <opengl/opengl.h>
770
771-#include "move_options.h"
772
773 #define NUM_KEYS (sizeof (mKeys) / sizeof (mKeys[0]))
774
775
776=== modified file 'plugins/obs/src/obs.h'
777--- plugins/obs/src/obs.h 2010-06-12 07:43:36 +0000
778+++ plugins/obs/src/obs.h 2012-01-18 16:53:24 +0000
779@@ -23,7 +23,7 @@
780 * Author: Danny Baumann <dannybaumann@web.de>
781 */
782
783-#include <core/core.h>
784+#include <core/screen.h>
785 #include <core/pluginclasshandler.h>
786 #include <core/serialization.h>
787
788
789=== modified file 'plugins/opengl/include/opengl/fragment.h'
790--- plugins/opengl/include/opengl/fragment.h 2010-04-03 16:24:05 +0000
791+++ plugins/opengl/include/opengl/fragment.h 2012-01-18 16:53:24 +0000
792@@ -36,6 +36,7 @@
793
794 struct GLWindowPaintAttrib;
795 class GLScreen;
796+class GLTexture;
797
798 /**
799 * Describes a texture modification fragment program
800
801=== modified file 'plugins/opengl/include/opengl/texture.h'
802--- plugins/opengl/include/opengl/texture.h 2011-02-24 07:52:09 +0000
803+++ plugins/opengl/include/opengl/texture.h 2012-01-18 16:53:24 +0000
804@@ -28,13 +28,16 @@
805 #ifndef _GLTEXTURE_H
806 #define _GLTEXTURE_H
807
808+#include "core/region.h"
809+#include "core/string.h"
810+
811 #include <X11/Xlib-xcb.h>
812-
813 #include <GL/gl.h>
814
815+#include <boost/function.hpp>
816+
817 #include <vector>
818
819-#include <core/region.h>
820
821 #define POWER_OF_TWO(v) ((v & (v - 1)) == 0)
822
823
824=== modified file 'plugins/opengl/src/fragment.cpp'
825--- plugins/opengl/src/fragment.cpp 2010-10-26 03:29:56 +0000
826+++ plugins/opengl/src/fragment.cpp 2012-01-18 16:53:24 +0000
827@@ -23,16 +23,17 @@
828 * Author: David Reveman <davidr@novell.com>
829 */
830
831+#include "privatefragment.h"
832+#include "privates.h"
833+
834+#include "core/string.h"
835+
836 #include <boost/function.hpp>
837 #include <boost/bind.hpp>
838 #include <boost/foreach.hpp>
839 #define foreach BOOST_FOREACH
840
841-#include <core/core.h>
842 #include <opengl/texture.h>
843-#include <opengl/fragment.h>
844-#include "privatefragment.h"
845-#include "privates.h"
846
847 #include <string.h>
848 #include <stdlib.h>
849@@ -84,7 +85,7 @@
850
851 class HeaderOp {
852 public:
853- HeaderOp () : type (OpTypeHeaderTemp), name ("") {};
854+ HeaderOp () : type (OpTypeHeaderTemp), name ("") {}
855 public:
856 OpType type;
857 CompString name;
858@@ -118,7 +119,7 @@
859
860 class PrivateFunctionData {
861 public:
862- PrivateFunctionData () : header (0), body (0), status (true) {};
863+ PrivateFunctionData () : header (0), body (0), status (true) {}
864 PrivateFunctionData (const PrivateFunctionData&, CompString);
865
866 public:
867
868=== modified file 'plugins/opengl/src/matrix.cpp'
869--- plugins/opengl/src/matrix.cpp 2011-10-31 13:51:00 +0000
870+++ plugins/opengl/src/matrix.cpp 2012-01-18 16:53:24 +0000
871@@ -46,10 +46,14 @@
872 * From Mesa 3-D graphics library.
873 */
874
875+#include <core/output.h>
876+#include "core/deg2rad.h"
877+
878+#include <opengl/matrix.h>
879+
880 #include <string.h>
881 #include <math.h>
882-#include <core/core.h>
883-#include <opengl/matrix.h>
884+#include <cassert>
885
886 /**
887 * Identity matrix.
888
889=== modified file 'plugins/opengl/src/opengl.cpp'
890--- plugins/opengl/src/opengl.cpp 2009-03-15 17:49:22 +0000
891+++ plugins/opengl/src/opengl.cpp 2012-01-18 16:53:24 +0000
892@@ -25,7 +25,6 @@
893 * David Reveman <davidr@novell.com>
894 */
895
896-#include <core/core.h>
897 #include <core/pluginclasshandler.h>
898 #include "privates.h"
899
900
901=== modified file 'plugins/opengl/src/paint.cpp'
902--- plugins/opengl/src/paint.cpp 2012-01-12 17:49:40 +0000
903+++ plugins/opengl/src/paint.cpp 2012-01-18 16:53:24 +0000
904@@ -23,6 +23,11 @@
905 * Author: David Reveman <davidr@novell.com>
906 */
907
908+
909+#include <core/deg2rad.h>
910+
911+#include "privates.h"
912+
913 #include <stdlib.h>
914 #include <string.h>
915 #include <math.h>
916@@ -30,11 +35,8 @@
917 #include <boost/foreach.hpp>
918 #define foreach BOOST_FOREACH
919
920-#include <core/core.h>
921 #include <opengl/opengl.h>
922
923-#include "privates.h"
924-
925
926 GLScreenPaintAttrib defaultScreenPaintAttrib = {
927 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -DEFAULT_Z_CAMERA
928
929=== modified file 'plugins/opengl/src/privates.h'
930--- plugins/opengl/src/privates.h 2012-01-09 15:12:20 +0000
931+++ plugins/opengl/src/privates.h 2012-01-18 16:53:24 +0000
932@@ -41,7 +41,7 @@
933 class GLIcon
934 {
935 public:
936- GLIcon () : icon (NULL) {};
937+ GLIcon () : icon (NULL) {}
938
939 CompIcon *icon;
940 GLTexture::List textures;
941
942=== modified file 'plugins/opengl/src/privatetexture.h'
943--- plugins/opengl/src/privatetexture.h 2009-08-27 20:04:20 +0000
944+++ plugins/opengl/src/privatetexture.h 2012-01-18 16:53:24 +0000
945@@ -28,11 +28,12 @@
946 #ifndef _PRIVATETEXTURE_H
947 #define _PRIVATETEXTURE_H
948
949-#include <map>
950-
951 #include <GL/gl.h>
952 #include <GL/glx.h>
953 #include <opengl/texture.h>
954+#include <X11/extensions/Xdamage.h>
955+
956+#include <map>
957
958 class GLScreen;
959 class GLDisplay;
960
961=== modified file 'plugins/opengl/src/texture.cpp'
962--- plugins/opengl/src/texture.cpp 2011-10-31 13:51:00 +0000
963+++ plugins/opengl/src/texture.cpp 2012-01-18 16:53:24 +0000
964@@ -31,7 +31,6 @@
965 #include <stdlib.h>
966 #include <string.h>
967
968-#include <core/core.h>
969 #include <opengl/texture.h>
970 #include <privatetexture.h>
971 #include "privates.h"
972
973=== modified file 'plugins/place/src/place.h'
974--- plugins/place/src/place.h 2011-05-01 01:55:39 +0000
975+++ plugins/place/src/place.h 2012-01-18 16:53:24 +0000
976@@ -24,7 +24,7 @@
977 #include <stdlib.h>
978 #include <string.h>
979
980-#include <core/core.h>
981+#include <core/screen.h>
982 #include <core/atoms.h>
983 #include <core/timer.h>
984 #include <core/pluginclasshandler.h>
985
986=== modified file 'plugins/regex/src/regex.cpp'
987--- plugins/regex/src/regex.cpp 2010-10-26 07:56:49 +0000
988+++ plugins/regex/src/regex.cpp 2012-01-18 16:53:24 +0000
989@@ -24,9 +24,13 @@
990 */
991
992 #include "regexplugin.h"
993+
994+#include "core/atoms.h"
995+
996+#include <regex.h>
997 #include <limits.h>
998
999-COMPIZ_PLUGIN_20090315 (regex, RegexPluginVTable);
1000+COMPIZ_PLUGIN_20090315 (regex, RegexPluginVTable)
1001
1002 class RegexExp : public CompMatch::Expression
1003 {
1004
1005=== modified file 'plugins/regex/src/regexplugin.h'
1006--- plugins/regex/src/regexplugin.h 2010-10-26 07:56:49 +0000
1007+++ plugins/regex/src/regexplugin.h 2012-01-18 16:53:24 +0000
1008@@ -23,14 +23,14 @@
1009 * Author: David Reveman <davidr@novell.com>
1010 */
1011
1012-#include <regex.h>
1013+#ifndef COMPIZ_REGEXPLUGIN_H
1014+#define COMPIZ_REGEXPLUGIN_H
1015+
1016+#include <core/screen.h>
1017+#include <core/pluginclasshandler.h>
1018+
1019 #include <X11/Xatom.h>
1020
1021-#include <core/core.h>
1022-#include <core/atoms.h>
1023-#include <core/pluginclasshandler.h>
1024-#include <core/timer.h>
1025-
1026 class RegexScreen :
1027 public PluginClassHandler<RegexScreen, CompScreen>,
1028 public ScreenInterface
1029@@ -77,3 +77,5 @@
1030 public:
1031 bool init ();
1032 };
1033+
1034+#endif
1035
1036=== modified file 'plugins/resize/src/resize.cpp'
1037--- plugins/resize/src/resize.cpp 2011-08-19 14:25:11 +0000
1038+++ plugins/resize/src/resize.cpp 2012-01-18 16:53:24 +0000
1039@@ -31,7 +31,6 @@
1040 #include <X11/Xatom.h>
1041 #include <X11/cursorfont.h>
1042
1043-#include <core/core.h>
1044 #include <core/atoms.h>
1045 #include "resize.h"
1046
1047
1048=== modified file 'plugins/resize/src/resize.h'
1049--- plugins/resize/src/resize.h 2010-12-09 09:37:25 +0000
1050+++ plugins/resize/src/resize.h 2012-01-18 16:53:24 +0000
1051@@ -26,7 +26,7 @@
1052 #ifndef _RESIZE_H
1053 #define _RESIZE_H
1054
1055-#include <core/core.h>
1056+#include <core/screen.h>
1057 #include <core/pluginclasshandler.h>
1058 #include <core/propertywriter.h>
1059
1060
1061=== modified file 'plugins/rotate/src/rotate.cpp'
1062--- plugins/rotate/src/rotate.cpp 2010-12-23 03:57:46 +0000
1063+++ plugins/rotate/src/rotate.cpp 2012-01-18 16:53:24 +0000
1064@@ -23,13 +23,11 @@
1065 * Author: David Reveman <davidr@novell.com>
1066 */
1067
1068+#include "rotate.h"
1069+#include <core/atoms.h>
1070+
1071 #include <math.h>
1072
1073-#include <core/core.h>
1074-#include <core/atoms.h>
1075-
1076-#include "rotate.h"
1077-
1078 #define ROTATE_POINTER_SENSITIVITY_FACTOR 0.05f
1079
1080 COMPIZ_PLUGIN_20090315 (rotate, RotatePluginVTable)
1081
1082=== modified file 'plugins/rotate/src/rotate.h'
1083--- plugins/rotate/src/rotate.h 2009-11-03 20:15:02 +0000
1084+++ plugins/rotate/src/rotate.h 2012-01-18 16:53:24 +0000
1085@@ -26,7 +26,7 @@
1086 #ifndef _ROTATE_H
1087 #define _ROTATE_H
1088
1089-#include <core/core.h>
1090+#include <core/screen.h>
1091 #include <core/pluginclasshandler.h>
1092
1093 #include <composite/composite.h>
1094
1095=== modified file 'plugins/scale/include/scale/scale.h'
1096--- plugins/scale/include/scale/scale.h 2010-08-07 02:35:07 +0000
1097+++ plugins/scale/include/scale/scale.h 2012-01-18 16:53:24 +0000
1098@@ -26,7 +26,6 @@
1099 #ifndef _COMPIZ_SCALE_H
1100 #define _COMPIZ_SCALE_H
1101
1102-#include <core/core.h>
1103 #include <core/pluginclasshandler.h>
1104
1105 #include <composite/composite.h>
1106@@ -43,7 +42,7 @@
1107 public CompRect
1108 {
1109 public:
1110- ScaleSlot () {};
1111+ ScaleSlot () {}
1112 ScaleSlot (const CompRect &r) :
1113 CompRect (r) {}
1114 public:
1115
1116=== modified file 'plugins/screenshot/src/screenshot.cpp'
1117--- plugins/screenshot/src/screenshot.cpp 2010-12-07 03:14:59 +0000
1118+++ plugins/screenshot/src/screenshot.cpp 2012-01-18 16:53:24 +0000
1119@@ -25,6 +25,17 @@
1120
1121 #include "screenshot.h"
1122
1123+#include <dirent.h>
1124+
1125+#if defined(HAVE_SCANDIR_POSIX)
1126+ // POSIX (2008) defines the comparison function like this:
1127+ #define scandir(a,b,c,d) scandir((a), (b), (c), (int(*)(const dirent **, const dirent **))(d));
1128+#else
1129+ #define scandir(a,b,c,d) scandir((a), (b), (c), (int(*)(const void*,const void*))(d));
1130+#endif
1131+
1132+
1133+
1134 COMPIZ_PLUGIN_20090315 (screenshot, ShotPluginVTable)
1135
1136 bool
1137
1138=== modified file 'plugins/screenshot/src/screenshot.h'
1139--- plugins/screenshot/src/screenshot.h 2010-06-12 07:43:36 +0000
1140+++ plugins/screenshot/src/screenshot.h 2012-01-18 16:53:24 +0000
1141@@ -23,13 +23,9 @@
1142 * Author: David Reveman <davidr@novell.com>
1143 */
1144
1145-#include <stdlib.h>
1146-#include <string.h>
1147-#include <dirent.h>
1148-
1149 #include "screenshot_options.h"
1150
1151-#include <core/core.h>
1152+#include <core/screen.h>
1153 #include <core/propertywriter.h>
1154
1155 #include <compiztoolbox/compiztoolbox.h>
1156
1157=== modified file 'plugins/water/src/water.cpp'
1158--- plugins/water/src/water.cpp 2011-03-14 16:12:45 +0000
1159+++ plugins/water/src/water.cpp 2012-01-18 16:53:24 +0000
1160@@ -25,6 +25,9 @@
1161
1162 #include "water.h"
1163
1164+#include <math.h>
1165+
1166+
1167 COMPIZ_PLUGIN_20090315 (water, WaterPluginVTable)
1168
1169 static int waterLastPointerX = 0;
1170
1171=== modified file 'plugins/water/src/water.h'
1172--- plugins/water/src/water.h 2011-02-22 14:48:05 +0000
1173+++ plugins/water/src/water.h 2012-01-18 16:53:24 +0000
1174@@ -23,21 +23,13 @@
1175 * Author: David Reveman <davidr@novell.com>
1176 */
1177
1178-#include <stdio.h>
1179-#include <stdlib.h>
1180-#include <string.h>
1181-#include <math.h>
1182-#include <sys/time.h>
1183-
1184-#include <X11/cursorfont.h>
1185-
1186-#include <core/core.h>
1187+#include "water_options.h"
1188+#include <core/screen.h>
1189 #include <core/pluginclasshandler.h>
1190
1191 #include <composite/composite.h>
1192 #include <opengl/opengl.h>
1193
1194-#include "water_options.h"
1195
1196 #define WATER_SCREEN(s) \
1197 WaterScreen *ws = WaterScreen::get (s)
1198
1199=== modified file 'plugins/zoom/src/zoom.cpp'
1200--- plugins/zoom/src/zoom.cpp 2010-02-04 17:16:02 +0000
1201+++ plugins/zoom/src/zoom.cpp 2012-01-18 16:53:24 +0000
1202@@ -25,6 +25,11 @@
1203
1204 #include "zoom.h"
1205
1206+#include <X11/cursorfont.h>
1207+
1208+#include <math.h>
1209+
1210+
1211 COMPIZ_PLUGIN_20090315 (zoom, ZoomPluginVTable)
1212
1213 static int
1214
1215=== modified file 'plugins/zoom/src/zoom.h'
1216--- plugins/zoom/src/zoom.h 2009-03-16 09:18:16 +0000
1217+++ plugins/zoom/src/zoom.h 2012-01-18 16:53:24 +0000
1218@@ -23,15 +23,7 @@
1219 * Author: David Reveman <davidr@novell.com>
1220 */
1221
1222-#include <stdio.h>
1223-#include <stdlib.h>
1224-#include <string.h>
1225-#include <math.h>
1226-#include <sys/time.h>
1227-
1228-#include <X11/cursorfont.h>
1229-
1230-#include <core/core.h>
1231+#include <core/screen.h>
1232 #include <core/pluginclasshandler.h>
1233
1234 #include <composite/composite.h>
1235
1236=== modified file 'src/event.cpp'
1237--- src/event.cpp 2012-01-12 17:49:40 +0000
1238+++ src/event.cpp 2012-01-18 16:53:24 +0000
1239@@ -36,7 +36,6 @@
1240 #include <X11/extensions/Xrandr.h>
1241 #include <X11/extensions/Xfixes.h>
1242
1243-#include <core/core.h>
1244 #include <core/atoms.h>
1245 #include "privatescreen.h"
1246 #include "privatewindow.h"
1247
1248=== modified file 'src/main.cpp'
1249--- src/main.cpp 2011-10-31 13:51:00 +0000
1250+++ src/main.cpp 2012-01-18 16:53:24 +0000
1251@@ -34,7 +34,6 @@
1252 #include <string.h>
1253 #include <sys/wait.h>
1254
1255-#include <core/core.h>
1256 #include "privatescreen.h"
1257 #include "privatestackdebugger.h"
1258
1259
1260=== modified file 'src/match.cpp'
1261--- src/match.cpp 2012-01-12 17:49:40 +0000
1262+++ src/match.cpp 2012-01-18 16:53:24 +0000
1263@@ -29,8 +29,6 @@
1264 #include <boost/foreach.hpp>
1265 #define foreach BOOST_FOREACH
1266
1267-#include <core/core.h>
1268-
1269 #include <core/screen.h>
1270 #include <core/match.h>
1271 #include <core/window.h>
1272
1273=== modified file 'src/option.cpp'
1274--- src/option.cpp 2010-11-11 03:14:20 +0000
1275+++ src/option.cpp 2012-01-18 16:53:24 +0000
1276@@ -32,7 +32,6 @@
1277 #include <boost/foreach.hpp>
1278 #define foreach BOOST_FOREACH
1279
1280-#include <core/core.h>
1281 #include <core/option.h>
1282 #include "privateoption.h"
1283
1284
1285=== modified file 'src/output.cpp'
1286--- src/output.cpp 2009-08-15 17:21:39 +0000
1287+++ src/output.cpp 2012-01-18 16:53:24 +0000
1288@@ -25,7 +25,6 @@
1289 * David Reveman <davidr@novell.com>
1290 */
1291
1292-#include <core/core.h>
1293 #include <core/output.h>
1294
1295 CompOutput::CompOutput ()
1296
1297=== modified file 'src/plugin.cpp'
1298--- src/plugin.cpp 2012-01-12 17:49:40 +0000
1299+++ src/plugin.cpp 2012-01-18 16:53:24 +0000
1300@@ -23,6 +23,9 @@
1301 * Author: David Reveman <davidr@novell.com>
1302 */
1303
1304+#include "core/plugin.h"
1305+#include "privatescreen.h"
1306+
1307 #include <stdio.h>
1308 #include <stdlib.h>
1309 #include <string.h>
1310@@ -36,9 +39,17 @@
1311 #include <boost/foreach.hpp>
1312 #define foreach BOOST_FOREACH
1313
1314-#include <core/core.h>
1315 #include "privatescreen.h"
1316
1317+#if defined(HAVE_SCANDIR_POSIX)
1318+ // POSIX (2008) defines the comparison function like this:
1319+ #define scandir(a,b,c,d) scandir((a), (b), (c), (int(*)(const dirent **, const dirent **))(d));
1320+#else
1321+ #define scandir(a,b,c,d) scandir((a), (b), (c), (int(*)(const void*,const void*))(d));
1322+#endif
1323+
1324+
1325+
1326 CompPlugin::Map pluginsMap;
1327 CompPlugin::List plugins;
1328
1329
1330=== modified file 'src/pluginclasshandler/tests/test-pluginclasshandler.cpp'
1331--- src/pluginclasshandler/tests/test-pluginclasshandler.cpp 2011-12-19 07:06:22 +0000
1332+++ src/pluginclasshandler/tests/test-pluginclasshandler.cpp 2012-01-18 16:53:24 +0000
1333@@ -1,5 +1,8 @@
1334 #include "test-pluginclasshandler.h"
1335
1336+#include <boost/foreach.hpp>
1337+#define foreach BOOST_FOREACH
1338+
1339 PluginClassStorage::Indices globalPluginClassIndices (0);
1340 unsigned int pluginClassHandlerIndex = 0;
1341 bool debugOutput;
1342
1343=== modified file 'src/pluginclasshandler/tests/test-pluginclasshandler.h'
1344--- src/pluginclasshandler/tests/test-pluginclasshandler.h 2011-12-19 07:06:22 +0000
1345+++ src/pluginclasshandler/tests/test-pluginclasshandler.h 2012-01-18 16:53:24 +0000
1346@@ -4,11 +4,6 @@
1347 #include <gtest/gtest.h>
1348
1349 #include <list>
1350-#include <boost/foreach.hpp>
1351-
1352-#include <iostream>
1353-
1354-#define foreach BOOST_FOREACH
1355
1356 extern PluginClassStorage::Indices globalPluginClassIndices;
1357 extern unsigned int pluginClassHandlerIndex;
1358
1359=== modified file 'src/privatescreen.h'
1360--- src/privatescreen.h 2011-10-31 13:51:00 +0000
1361+++ src/privatescreen.h 2012-01-18 16:53:24 +0000
1362@@ -28,7 +28,6 @@
1363 #ifndef _PRIVATESCREEN_H
1364 #define _PRIVATESCREEN_H
1365
1366-#include <core/core.h>
1367 #include <core/screen.h>
1368 #include <core/size.h>
1369 #include <core/point.h>
1370
1371=== modified file 'src/propertywriter.cpp'
1372--- src/propertywriter.cpp 2010-10-24 14:42:07 +0000
1373+++ src/propertywriter.cpp 2012-01-18 16:53:24 +0000
1374@@ -23,8 +23,8 @@
1375 * Authors: Sam Spilsbury <smspillaz@gmail.com>
1376 */
1377
1378-#include <core/core.h>
1379 #include <core/propertywriter.h>
1380+#include <core/screen.h>
1381
1382 PropertyWriter::PropertyWriter ()
1383 {
1384
1385=== modified file 'src/rect.cpp'
1386--- src/rect.cpp 2011-03-16 19:39:09 +0000
1387+++ src/rect.cpp 2012-01-18 16:53:24 +0000
1388@@ -23,7 +23,6 @@
1389 * Authors: Dennis Kasprzyk <onestone@compiz-fusion.org>
1390 */
1391
1392-#include <core/core.h>
1393 #include <core/rect.h>
1394
1395 CompRect::CompRect ()
1396
1397=== modified file 'src/region.cpp'
1398--- src/region.cpp 2012-01-09 16:01:47 +0000
1399+++ src/region.cpp 2012-01-18 16:53:24 +0000
1400@@ -23,15 +23,16 @@
1401 * Authors: Dennis Kasprzyk <onestone@compiz-fusion.org>
1402 */
1403
1404-#include <stdio.h>
1405+#include "privateregion.h"
1406
1407 #include <X11/Xlib-xcb.h>
1408 #include <X11/Xutil.h>
1409 #include <X11/Xregion.h>
1410
1411-#include <core/core.h>
1412+#include <stdio.h>
1413
1414-#include "privateregion.h"
1415+#include <boost/foreach.hpp>
1416+#define foreach BOOST_FOREACH
1417
1418 const CompRegion infiniteRegion (CompRect (MINSHORT, MINSHORT,
1419 MAXSHORT * 2, MAXSHORT * 2));
1420
1421=== modified file 'src/screen.cpp'
1422--- src/screen.cpp 2012-01-16 08:36:54 +0000
1423+++ src/screen.cpp 2012-01-18 16:53:24 +0000
1424@@ -52,8 +52,6 @@
1425 #include <X11/extensions/shape.h>
1426 #include <X11/cursorfont.h>
1427
1428-#include <core/core.h>
1429-
1430 #include <core/screen.h>
1431 #include <core/icon.h>
1432 #include <core/atoms.h>
1433
1434=== modified file 'src/session.cpp'
1435--- src/session.cpp 2011-10-31 13:51:00 +0000
1436+++ src/session.cpp 2012-01-18 16:53:24 +0000
1437@@ -23,6 +23,10 @@
1438 * Author: Radek Doulik <rodo@novell.com>
1439 */
1440
1441+
1442+#include "core/session.h"
1443+#include "core/screen.h"
1444+
1445 #ifdef HAVE_CONFIG_H
1446 # include <config.h>
1447 #endif
1448@@ -39,9 +43,6 @@
1449
1450 #include <boost/bind.hpp>
1451
1452-#include <core/session.h>
1453-#include <core/core.h>
1454-
1455 #define SM_DEBUG(x)
1456
1457 static SmcConn smcConnection;
1458
1459=== modified file 'src/string/tests/printf/src/test-string-printf.cpp'
1460--- src/string/tests/printf/src/test-string-printf.cpp 2011-12-19 07:06:22 +0000
1461+++ src/string/tests/printf/src/test-string-printf.cpp 2012-01-18 16:53:24 +0000
1462@@ -28,7 +28,6 @@
1463 #include <gtest/gtest.h>
1464
1465 #include <string>
1466-#include <iostream>
1467 #include <map>
1468 #include <boost/shared_ptr.hpp>
1469 #include <boost/pointer_cast.hpp>
1470
1471=== modified file 'src/timer/tests/test-timer.h'
1472--- src/timer/tests/test-timer.h 2011-12-23 03:20:52 +0000
1473+++ src/timer/tests/test-timer.h 2012-01-18 16:53:24 +0000
1474@@ -33,7 +33,6 @@
1475 #include <core/timer.h>
1476 #include <privatetimeouthandler.h>
1477 #include <privatetimeoutsource.h>
1478-#include <iostream>
1479 #include <boost/bind.hpp>
1480 #include <boost/shared_ptr.hpp>
1481 #include <deque>
1482
1483=== modified file 'src/window.cpp'
1484--- src/window.cpp 2012-01-16 09:10:42 +0000
1485+++ src/window.cpp 2012-01-18 16:53:24 +0000
1486@@ -38,7 +38,6 @@
1487
1488 #include <boost/bind.hpp>
1489
1490-#include <core/core.h>
1491 #include <core/icon.h>
1492 #include <core/atoms.h>
1493 #include "privatewindow.h"
1494
1495=== modified file 'src/windowgeometry.cpp'
1496--- src/windowgeometry.cpp 2011-09-20 04:10:56 +0000
1497+++ src/windowgeometry.cpp 2012-01-18 16:53:24 +0000
1498@@ -23,9 +23,8 @@
1499 * Authors: Dennis Kasprzyk <onestone@compiz-fusion.org>
1500 */
1501
1502-#include <core/core.h>
1503-#include <core/window.h>
1504-#include <privatewindow.h>
1505+#include "privatewindow.h"
1506+#include "core/window.h"
1507
1508
1509 CompWindow::Geometry::Geometry () :

Subscribers

People subscribed via source and target branches