Merge lp://qastaging/~alan-griffiths/compiz-core/say-no-to-screen-global into lp://qastaging/compiz-core

20 - static unsigned int allocPluginClassIndex ();
21 - static void freePluginClassIndex (unsigned int index);
22 + unsigned int allocPluginClassIndex ();
23 + void freePluginClassIndex (unsigned int index);
24 static int checkForError (Display *dpy);
25
26
27
28 === modified file 'src/pluginclasshandler/include/core/pluginclasshandler.h'
29 --- src/pluginclasshandler/include/core/pluginclasshandler.h 2012-01-12 06:48:58 +0000
30 +++ src/pluginclasshandler/include/core/pluginclasshandler.h 2012-02-28 18:01:19 +0000
31 @@ -86,7 +86,7 @@
32 * on this base class if there wasn't one already and then
33 * storing that index inside of ValueHolder
34 */
35 - static bool initializeIndex ();
36 + static bool initializeIndex (Tb *base);

Is there any reason these changed from static to nonstatic ?

The change from static to non-static looks correct. Required due to the changes in src/screen.cpp where we no longer use the screen global, but use "this" instead.

If they really should be static, then other methods such as sizePluginClasses would have to be made static too.

> Is there any reason these changed from static to nonstatic ?

That is the cleanest way to avoid use of ::screen.

The alternative begins the transformation of CompScreen into Monostate - which is a *bad idea*.

Looks OK, works OK.