Merge lp:~mc-return/compiz/compiz.merge-replace-defines into lp:compiz/0.9.8

[MC Return]

Replaced #defines of standard variable types

Replaces #defines of standard variable types

[MC Return (mc-return)]

If this is a good idea I could continue this...
I also noticed that PI for example is defined by several plug-ins. It could be made global, no ?

[Sam Spilsbury (smspillaz)]

I vote continue. Daniel?

review: Approve

[MC Return (mc-return)]

Ready for review so far.
I've left out converting stuff like ABI_VERSION and may have missed some others - also for now I did replace just the #defines of short, int and string types, but this compiles and *should* work.

[Daniel van Vugt (vanvugt)]

I think PI should be defined as value M_PI (from #include <math.h>). And *ABI* macros have to stay as macros so they can be used in preprocessing:
    #if SOMETHING_ABI >= N

[Daniel van Vugt (vanvugt)]

Scratch that. M_PI is not technically a C/C++ standard, so don't use it.

[MC Return (mc-return)]

> And *ABI*
> macros have to stay as macros so they can be used in preprocessing:
> #if SOMETHING_ABI >= N

Okay, did not touch any of the ABI #defines.

[MC Return (mc-return)]

> Scratch that. M_PI is not technically a C/C++ standard, so don't use it.

For now I did just change #defines of PI to "static const double PI = 3.14159265359f;".

[MC Return (mc-return)]

CI test start, please :)

review: Needs Resubmitting

[Sam Spilsbury (smspillaz)]

review: Approve

=== modified file 'gtk/window-decorator/gtk-window-decorator.c'
--- gtk/window-decorator/gtk-window-decorator.c	2012-08-27 15:40:30 +0000
+++ gtk/window-decorator/gtk-window-decorator.c	2012-09-08 00:13:22 +0000
@@ -43,6 +43,23 @@
 
 #define SWITCHER_SPACE 40
 
+const float STROKE_ALPHA = 0.6f;
+
+const unsigned short ICON_SPACE = 20;
+
+const float DOUBLE_CLICK_DISTANCE = 8.0f;
+
+const float	    SHADOW_RADIUS      = 8.0f;
+const float	    SHADOW_OPACITY     = 0.5f;
+const unsigned short SHADOW_OFFSET_X    = 1;
+const unsigned short SHADOW_OFFSET_Y    = 1;
+
+const float META_OPACITY              = 0.75f;
+
+const float META_ACTIVE_OPACITY       = 1.0f;
+
+guint cmdline_options = 0;
+
 GdkPixmap *decor_normal_pixmap = NULL;
 GdkPixmap *decor_active_pixmap = NULL;
 
 
=== modified file 'gtk/window-decorator/gtk-window-decorator.h'
--- gtk/window-decorator/gtk-window-decorator.h	2012-08-28 04:45:17 +0000
+++ gtk/window-decorator/gtk-window-decorator.h	2012-09-08 00:13:22 +0000
@@ -172,11 +172,11 @@
 #define DBUS_INTERFACE  "org.freedesktop.compiz"
 #define DBUS_METHOD_GET "get"
 
-#define STROKE_ALPHA 0.6
-
-#define ICON_SPACE 20
-
-#define DOUBLE_CLICK_DISTANCE 8.0
+extern const float STROKE_ALPHA;
+
+extern const unsigned short ICON_SPACE;
+
+extern const float DOUBLE_CLICK_DISTANCE;
 
 #define WM_MOVERESIZE_SIZE_TOPLEFT      0
 #define WM_MOVERESIZE_SIZE_TOP          1
@@ -190,18 +190,18 @@
 #define WM_MOVERESIZE_SIZE_KEYBOARD     9
 #define WM_MOVERESIZE_MOVE_KEYBOARD    10
 
-#define SHADOW_RADIUS      8.0
-#define SHADOW_OPACITY     0.5
-#define SHADOW_OFFSET_X    1
-#define SHADOW_OFFSET_Y    1
+extern const float	    SHADOW_RADIUS;
+extern const float	    SHADOW_OPACITY;
+extern const unsigned short SHADOW_OFFSET_X;
+extern const unsigned short SHADOW_OFFSET_Y;
 #define SHADOW_COLOR_RED   0x0000
 #define SHADOW_COLOR_GREEN 0x0000
 #define SHADOW_COLOR_BLUE  0x0000
 
-#define META_OPACITY              0.75
-#define META_SHADE_OPACITY        TRUE
-#define META_ACTIVE_OPACITY       1.0
-#define META_ACTIVE_SHADE_OPACITY TRUE
+extern const float META_OPACITY;
+#define META_SHADE_OPACITY	    TRUE;
+extern const float META_ACTIVE_OPACITY;
+#define META_ACTIVE_SHADE_OPACITY   TRUE;
 
 #define META_MAXIMIZED (WNCK_WINDOW_STATE_MAXIMIZED_HORIZONTALLY | \
 WNCK_WINDOW_STATE_MAXIMIZED_VERTICALLY)
 
=== modified file 'include/core/screen.h'
--- include/core/screen.h	2012-06-24 09:00:27 +0000
+++ include/core/screen.h	2012-09-08 00:13:22 +0000
@@ -69,15 +69,15 @@
 #define NOTIFY_MOVE_MASK   (1 << 2)
 #define NOTIFY_MODIFY_MASK (1 << 3)
 
-#define SCREEN_EDGE_LEFT	0
-#define SCREEN_EDGE_RIGHT	1
-#define SCREEN_EDGE_TOP		2
-#define SCREEN_EDGE_BOTTOM	3
-#define SCREEN_EDGE_TOPLEFT	4
-#define SCREEN_EDGE_TOPRIGHT	5
-#define SCREEN_EDGE_BOTTOMLEFT	6
-#define SCREEN_EDGE_BOTTOMRIGHT 7
-#define SCREEN_EDGE_NUM		8
+#define SCREEN_EDGE_LEFT	    0
+#define SCREEN_EDGE_RIGHT	    1
+#define SCREEN_EDGE_TOP		    2
+#define SCREEN_EDGE_BOTTOM	    3
+#define SCREEN_EDGE_TOPLEFT	    4
+#define SCREEN_EDGE_TOPRIGHT	    5
+#define SCREEN_EDGE_BOTTOMLEFT	    6
+#define SCREEN_EDGE_BOTTOMRIGHT	    7
+#define SCREEN_EDGE_NUM		    8
 
 typedef boost::function<void (short int)> FdWatchCallBack;
 typedef boost::function<void (const char *)> FileWatchCallBack;
 
=== modified file 'kde/window-decorator-kde4/decorator.cpp'
--- kde/window-decorator-kde4/decorator.cpp	2012-05-27 04:32:55 +0000
+++ kde/window-decorator-kde4/decorator.cpp	2012-09-08 00:13:22 +0000
@@ -46,10 +46,17 @@
 
 #include <stdio.h>
 
-#define SHADOW_RADIUS      8.0
-#define SHADOW_OPACITY     0.5
-#define SHADOW_OFFSET_X    1
-#define SHADOW_OFFSET_Y    1
+const unsigned int ROOT_OFF_X = 8192;
+const unsigned int ROOT_OFF_Y = 8192;
+
+const unsigned short BLUR_TYPE_NONE     = 0;
+const unsigned short BLUR_TYPE_TITLEBAR = 1;
+const unsigned short BLUR_TYPE_ALL      = 2;
+
+static const float SHADOW_RADIUS    = 8.0f;
+static const float SHADOW_OPACITY   = 0.5f;
+static const unsigned short  SHADOW_OFFSET_X = 1;
+static const unsigned short  SHADOW_OFFSET_Y = 1;
 #define SHADOW_COLOR_RED   0x0000
 #define SHADOW_COLOR_GREEN 0x0000
 #define SHADOW_COLOR_BLUE  0x0000
 
=== modified file 'kde/window-decorator-kde4/decorator.h'
--- kde/window-decorator-kde4/decorator.h	2011-10-13 11:31:37 +0000
+++ kde/window-decorator-kde4/decorator.h	2012-09-08 00:13:22 +0000
@@ -43,8 +43,8 @@
 #include "kdecoration_plugins.h"
 #include "utils.h"
 
-#define ROOT_OFF_X 8192
-#define ROOT_OFF_Y 8192
+extern const unsigned int ROOT_OFF_X;
+extern const unsigned int ROOT_OFF_Y;
 
 #define C(name) { 0, XC_ ## name }
 
@@ -55,9 +55,9 @@
 
 extern struct _cursor cursors[3][3];
 
-#define BLUR_TYPE_NONE     0
-#define BLUR_TYPE_TITLEBAR 1
-#define BLUR_TYPE_ALL      2
+extern const unsigned short BLUR_TYPE_NONE;
+extern const unsigned short BLUR_TYPE_TITLEBAR;
+extern const unsigned short BLUR_TYPE_ALL;
 
 extern int blurType;
 
 
=== modified file 'libdecoration/decoration.c'
--- libdecoration/decoration.c	2012-08-20 05:40:55 +0000
+++ libdecoration/decoration.c	2012-09-08 00:13:22 +0000
@@ -3145,7 +3145,7 @@
 		  Time    dm_sn_timestamp)
 {
 
-#define N_TARGETS 4
+static const unsigned short N_TARGETS = 4;
 
     Atom conversion_targets[N_TARGETS];
 
 
=== modified file 'plugins/animation/include/animation/animation.h'
--- plugins/animation/include/animation/animation.h	2012-09-04 10:00:14 +0000
+++ plugins/animation/include/animation/animation.h	2012-09-08 00:13:22 +0000
@@ -39,7 +39,8 @@
     AnimDirectionRandom,
     AnimDirectionAuto
 } AnimDirection;
-#define LAST_ANIM_DIRECTION 5
+
+extern const unsigned short LAST_ANIM_DIRECTION;
 
 class PrivateAnimScreen;
 class PrivateAnimWindow;
 
=== modified file 'plugins/animation/src/animation.cpp'
--- plugins/animation/src/animation.cpp	2012-09-05 08:17:59 +0000
+++ plugins/animation/src/animation.cpp	2012-09-08 00:13:22 +0000
@@ -103,7 +103,11 @@
 
 COMPIZ_PLUGIN_20090315 (animation, AnimPluginVTable);
 
-#define FAKE_ICON_SIZE 4
+static const unsigned short FAKE_ICON_SIZE = 4;
+
+const unsigned short LAST_ANIM_DIRECTION = 5;
+
+const unsigned short NUM_EFFECTS = 16;
 
 const char *eventNames[AnimEventNum] =
 {"Open", "Close", "Minimize", "Unminimize", "Shade", "Focus"};
 
=== modified file 'plugins/animation/src/private.h'
--- plugins/animation/src/private.h	2012-08-14 06:33:22 +0000
+++ plugins/animation/src/private.h	2012-09-08 00:13:22 +0000
@@ -89,7 +89,7 @@
 extern AnimEffect AnimEffectWave;
 extern AnimEffect AnimEffectZoom;
 
-#define NUM_EFFECTS 16
+extern const unsigned short NUM_EFFECTS;
 
 extern int customOptionOptionIds[AnimEventNum];
 
 
=== modified file 'plugins/animationaddon/src/animationaddon.cpp'
--- plugins/animationaddon/src/animationaddon.cpp	2012-08-20 14:24:34 +0000
+++ plugins/animationaddon/src/animationaddon.cpp	2012-09-08 00:13:22 +0000
@@ -90,6 +90,9 @@
 
 COMPIZ_PLUGIN_20090315 (animationaddon, AnimAddonPluginVTable);
 
+// TODO Update this for each added animation effect! (total: 11)
+const unsigned short NUM_EFFECTS = 11;
+
 AnimEffect animEffects[NUM_EFFECTS];
 
 ExtensionPluginAnimAddon animAddonExtPluginInfo (CompString ("animationaddon"),
 
=== modified file 'plugins/animationaddon/src/polygon.cpp'
--- plugins/animationaddon/src/polygon.cpp	2012-05-21 08:50:26 +0000
+++ plugins/animationaddon/src/polygon.cpp	2012-09-08 00:13:22 +0000
@@ -37,7 +37,7 @@
 #include <GL/glu.h>
 #include "private.h"
 
-#define MIN_WINDOW_GRID_SIZE 10
+static const unsigned short MIN_WINDOW_GRID_SIZE = 10;
 
 PolygonAnim::PolygonAnim (CompWindow *w,
 			  WindowEvent curWindowEvent,
@@ -1902,7 +1902,7 @@
 
 	float zradius = radius / ::screen->width ();
 
-#define N_POINTS 8
+static const unsigned short N_POINTS = 8;
 	// Corners of bounding cube
 	Point3d cubeCorners[N_POINTS];
 	cubeCorners[0].set (center.x () - radius, center.y () - radius,
 
=== modified file 'plugins/animationaddon/src/private.h'
--- plugins/animationaddon/src/private.h	2010-10-23 15:41:30 +0000
+++ plugins/animationaddon/src/private.h	2012-09-08 00:13:22 +0000
@@ -29,7 +29,7 @@
 extern AnimEffect AnimEffectSkewer;
 
 // TODO Update this for each added animation effect! (total: 11)
-#define NUM_EFFECTS 11
+extern const unsigned short NUM_EFFECTS;
 
 // This must have the value of the first "effect setting" above
 // in AnimAddonScreenOptions
 
=== modified file 'plugins/bench/src/bench.cpp'
--- plugins/bench/src/bench.cpp	2012-09-04 15:33:44 +0000
+++ plugins/bench/src/bench.cpp	2012-09-08 00:13:22 +0000
@@ -29,8 +29,8 @@
 
 COMPIZ_PLUGIN_20090315 (bench, BenchPluginVTable)
 
-#define TEX_WIDTH  512
-#define TEX_HEIGHT 256
+static const unsigned int TEX_WIDTH = 512;
+static const unsigned short TEX_HEIGHT = 256;
 
 void
 BenchScreen::preparePaint (int msSinceLastPaint)
 
=== modified file 'plugins/blur/src/blur.cpp'
--- plugins/blur/src/blur.cpp	2010-10-24 14:42:07 +0000
+++ plugins/blur/src/blur.cpp	2012-09-08 00:13:22 +0000
@@ -27,6 +27,12 @@
 
 COMPIZ_PLUGIN_20090315 (blur, BlurPluginVTable)
 
+const unsigned short BLUR_GAUSSIAN_RADIUS_MAX = 15;
+
+const unsigned short BLUR_STATE_CLIENT = 0;
+const unsigned short BLUR_STATE_DECOR  = 1;
+const unsigned short BLUR_STATE_NUM    = 2;
+
 /* pascal triangle based kernel generator */
 static int
 blurCreateGaussianLinearKernel (int   radius,
@@ -1210,7 +1216,7 @@
     return true;
 }
 
-#define MAX_VERTEX_PROJECT_COUNT 20
+static const unsigned short MAX_VERTEX_PROJECT_COUNT = 20;
 
 void
 BlurWindow::projectRegion (CompOutput     *output,
 
=== modified file 'plugins/blur/src/blur.h'
--- plugins/blur/src/blur.h	2012-01-18 16:26:45 +0000
+++ plugins/blur/src/blur.h	2012-09-08 00:13:22 +0000
@@ -38,7 +38,7 @@
 #include <GL/glu.h>
 
 
-#define BLUR_GAUSSIAN_RADIUS_MAX 15
+extern const unsigned short BLUR_GAUSSIAN_RADIUS_MAX;
 
 struct BlurFunction {
 
@@ -56,9 +56,9 @@
     decor_point_t p2;
 };
 
-#define BLUR_STATE_CLIENT 0
-#define BLUR_STATE_DECOR  1
-#define BLUR_STATE_NUM    2
+extern const unsigned short BLUR_STATE_CLIENT;
+extern const unsigned short BLUR_STATE_DECOR;
+extern const unsigned short BLUR_STATE_NUM;
 
 struct BlurState {
     int                  threshold;
 
=== modified file 'plugins/ccp/src/ccp.cpp'
--- plugins/ccp/src/ccp.cpp	2012-08-15 02:17:36 +0000
+++ plugins/ccp/src/ccp.cpp	2012-09-08 00:13:22 +0000
@@ -22,8 +22,8 @@
 
 COMPIZ_PLUGIN_20090315 (ccp, CcpPluginVTable)
 
-#define CCP_UPDATE_MIN_TIMEOUT 250
-#define CCP_UPDATE_MAX_TIMEOUT 4000
+static const unsigned short CCP_UPDATE_MIN_TIMEOUT = 250;
+static const unsigned short CCP_UPDATE_MAX_TIMEOUT = 4000;
 #define CORE_VTABLE_NAME  "core"
 
 
 
=== modified file 'plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h'
--- plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h	2012-01-31 17:01:32 +0000
+++ plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h	2012-09-08 00:13:22 +0000
@@ -161,7 +161,7 @@
 	CompWindow       *window;
 };
 
-#define ICON_SIZE 48
-#define MAX_ICON_SIZE 256
+extern const unsigned short ICON_SIZE;
+extern const unsigned int MAX_ICON_SIZE;
 
 #endif
 
=== modified file 'plugins/compiztoolbox/src/compiztoolbox.cpp'
--- plugins/compiztoolbox/src/compiztoolbox.cpp	2012-08-14 06:33:22 +0000
+++ plugins/compiztoolbox/src/compiztoolbox.cpp	2012-09-08 00:13:22 +0000
@@ -29,6 +29,9 @@
 #include <core/abiversion.h>
 #include <core/propertywriter.h>
 
+const unsigned short ICON_SIZE = 48;
+const unsigned int MAX_ICON_SIZE = 256;
+
 bool openGLAvailable;
 
 class CompizToolboxScreen :
 
=== modified file 'plugins/copytex/src/copytex.cpp'
--- plugins/copytex/src/copytex.cpp	2012-07-03 18:16:28 +0000
+++ plugins/copytex/src/copytex.cpp	2012-09-08 00:13:22 +0000
@@ -27,6 +27,9 @@
 
 COMPIZ_PLUGIN_20090315 (copytex, CopytexPluginVTable)
 
+const int MAX_SUB_TEX = 2048;
+const unsigned int SHM_SIZE = MAX_SUB_TEX * MAX_SUB_TEX * 4;
+
 static GLTexture::Matrix _identity_matrix = {
     1.0f, 0.0f,
     0.0f, 1.0f,
 
=== modified file 'plugins/copytex/src/copytex.h'
--- plugins/copytex/src/copytex.h	2012-01-18 16:26:45 +0000
+++ plugins/copytex/src/copytex.h	2012-09-08 00:13:22 +0000
@@ -34,8 +34,8 @@
 #include <sys/shm.h>
 #include <sys/ipc.h>
 
-#define MAX_SUB_TEX 2048
-#define SHM_SIZE MAX_SUB_TEX * MAX_SUB_TEX * 4
+extern const int MAX_SUB_TEX;
+extern const unsigned int SHM_SIZE;
 
 class CopyTexture;
 
 
=== modified file 'plugins/cubeaddon/src/cubeaddon.cpp'
--- plugins/cubeaddon/src/cubeaddon.cpp	2012-07-30 14:27:55 +0000
+++ plugins/cubeaddon/src/cubeaddon.cpp	2012-09-08 00:13:22 +0000
@@ -27,6 +27,16 @@
 
 COMPIZ_PLUGIN_20090315 (cubeaddon, CubeaddonPluginVTable);
 
+const unsigned short CUBEADDON_GRID_SIZE = 100;
+const unsigned short CAP_ELEMENTS    = 15;
+const unsigned int   CAP_NVERTEX	    = (((CAP_ELEMENTS * (CAP_ELEMENTS + 1)) + 2) * 3);
+const unsigned int   CAP_NIDX	    = (CAP_ELEMENTS * (CAP_ELEMENTS - 1) * 4);
+
+const unsigned int   CAP_NIMGVERTEX  = (((CAP_ELEMENTS + 1) * (CAP_ELEMENTS + 1)) * 5);
+const unsigned int   CAP_NIMGIDX	    = (CAP_ELEMENTS * CAP_ELEMENTS * 4);
+
+const float RAD2I1024 = 162.9746617f;
+
 /*
  * Initiate a CubeCap
  */
 
=== modified file 'plugins/cubeaddon/src/cubeaddon.h'
--- plugins/cubeaddon/src/cubeaddon.h	2010-09-30 11:47:10 +0000
+++ plugins/cubeaddon/src/cubeaddon.h	2012-09-08 00:13:22 +0000
@@ -39,15 +39,15 @@
 
 #include "cubeaddon_options.h"
 
-#define CUBEADDON_GRID_SIZE    100
-#define CAP_ELEMENTS 15
-#define CAP_NVERTEX (((CAP_ELEMENTS * (CAP_ELEMENTS + 1)) + 2) * 3)
-#define CAP_NIDX (CAP_ELEMENTS * (CAP_ELEMENTS - 1) * 4)
-
-#define CAP_NIMGVERTEX (((CAP_ELEMENTS + 1) * (CAP_ELEMENTS + 1)) * 5)
-#define CAP_NIMGIDX (CAP_ELEMENTS * CAP_ELEMENTS * 4)
-
-#define RAD2I1024 162.9746617
+extern const unsigned short CUBEADDON_GRID_SIZE;
+extern const unsigned short CAP_ELEMENTS;
+extern const unsigned int   CAP_NVERTEX;
+extern const unsigned int   CAP_NIDX;
+
+extern const unsigned int   CAP_NIMGVERTEX;
+extern const unsigned int   CAP_NIMGIDX;
+
+extern const float RAD2I1024 = 162.9746617f;
 
 class CubeaddonScreen :
     public CompositeScreenInterface,
 
=== modified file 'plugins/dbus/src/dbus.h'
--- plugins/dbus/src/dbus.h	2012-06-24 09:00:27 +0000
+++ plugins/dbus/src/dbus.h	2012-09-08 00:13:22 +0000
@@ -53,10 +53,10 @@
 #define COMPIZ_DBUS_CHANGED_SIGNAL_NAME		    "changed"
 #define COMPIZ_DBUS_PLUGINS_CHANGED_SIGNAL_NAME	    "pluginsChanged"
 
-#define DBUS_FILE_WATCH_CURRENT 0
-#define DBUS_FILE_WATCH_PLUGIN  1
-#define DBUS_FILE_WATCH_HOME    2
-#define DBUS_FILE_WATCH_NUM     3
+#define DBUS_FILE_WATCH_CURRENT	0
+#define DBUS_FILE_WATCH_PLUGIN	1
+#define DBUS_FILE_WATCH_HOME	2
+#define DBUS_FILE_WATCH_NUM	3
 
 class DbusScreen :
     public PluginClassHandler <DbusScreen, CompScreen>,
 
=== modified file 'plugins/decor/src/decor.h'
--- plugins/decor/src/decor.h	2012-07-30 07:10:52 +0000
+++ plugins/decor/src/decor.h	2012-09-08 00:13:22 +0000
@@ -50,9 +50,9 @@
 };
 
 /* FIXME: Remove */
-#define DECOR_BARE   0
-#define DECOR_ACTIVE 1
-#define DECOR_NUM    2
+#define DECOR_BARE	0
+#define DECOR_ACTIVE	1
+#define DECOR_NUM	2
 
 using namespace compiz::decor;
 
 
=== modified file 'plugins/expo/src/expo.cpp'
--- plugins/expo/src/expo.cpp	2012-08-22 01:21:08 +0000
+++ plugins/expo/src/expo.cpp	2012-09-08 00:13:22 +0000
@@ -1290,7 +1290,7 @@
     return gWindow->glDraw (transform, eAttrib, region, mask);
 }
 
-#define EXPO_GRID_SIZE 100
+static const unsigned short EXPO_GRID_SIZE = 100;
 
 void
 ExpoWindow::glAddGeometry (const GLTexture::MatrixList& matrices,
 
=== modified file 'plugins/firepaint/src/firepaint.cpp'
--- plugins/firepaint/src/firepaint.cpp	2012-09-04 15:33:44 +0000
+++ plugins/firepaint/src/firepaint.cpp	2012-09-08 00:13:22 +0000
@@ -23,6 +23,8 @@
 
 COMPIZ_PLUGIN_20090315 (firepaint, FirePluginVTable);
 
+const unsigned int NUM_ADD_POINTS = 1000;
+
 Particle::Particle () :
     life (0),
     fade (0),
 
=== modified file 'plugins/firepaint/src/firepaint.h'
--- plugins/firepaint/src/firepaint.h	2012-09-04 15:33:44 +0000
+++ plugins/firepaint/src/firepaint.h	2012-09-08 00:13:22 +0000
@@ -107,7 +107,7 @@
 	finiParticles ();
 };
 
-#define NUM_ADD_POINTS 1000
+extern const unsigned int NUM_ADD_POINTS;
 
 class FireScreen:
     public PluginClassHandler <FireScreen, CompScreen>,
 
=== modified file 'plugins/grid/src/grid.h'
--- plugins/grid/src/grid.h	2012-05-27 04:32:55 +0000
+++ plugins/grid/src/grid.h	2012-09-08 00:13:22 +0000
@@ -30,7 +30,7 @@
 
 #include "grid_options.h"
 
-#define SNAPOFF_THRESHOLD 50
+static const unsigned short SNAPOFF_THRESHOLD = 50;
 
 namespace GridWindowType
 {
 
=== modified file 'plugins/group/src/glow.cpp'
--- plugins/group/src/glow.cpp	2011-03-14 15:58:39 +0000
+++ plugins/group/src/glow.cpp	2012-09-08 00:13:22 +0000
@@ -27,6 +27,16 @@
 #include "group.h"
 #include "group_glow.h"
 
+const unsigned short GLOWQUAD_TOPLEFT	    = 0;
+const unsigned short GLOWQUAD_TOPRIGHT	    = 1;
+const unsigned short GLOWQUAD_BOTTOMLEFT    = 2;
+const unsigned short GLOWQUAD_BOTTOMRIGHT   = 3;
+const unsigned short GLOWQUAD_TOP	    = 4;
+const unsigned short GLOWQUAD_BOTTOM	    = 5;
+const unsigned short GLOWQUAD_LEFT	    = 6;
+const unsigned short GLOWQUAD_RIGHT	    = 7;
+const unsigned short NUM_GLOWQUADS	    = 8;
+
 const GlowTextureProperties glowTextureProperties[2] = {
     /* GlowTextureRectangular */
     {glowTexRect, 32, 21},
 
=== modified file 'plugins/group/src/glow.h'
--- plugins/group/src/glow.h	2010-10-15 03:57:18 +0000
+++ plugins/group/src/glow.h	2012-09-08 00:13:22 +0000
@@ -29,15 +29,15 @@
 
 #include "group.h"
  
-#define GLOWQUAD_TOPLEFT	 0
-#define GLOWQUAD_TOPRIGHT	 1
-#define GLOWQUAD_BOTTOMLEFT	 2
-#define GLOWQUAD_BOTTOMRIGHT     3
-#define GLOWQUAD_TOP		 4
-#define GLOWQUAD_BOTTOM		 5
-#define GLOWQUAD_LEFT		 6
-#define GLOWQUAD_RIGHT		 7
-#define NUM_GLOWQUADS		 8
+extern const unsigned short GLOWQUAD_TOPLEFT;
+extern const unsigned short GLOWQUAD_TOPRIGHT;
+extern const unsigned short GLOWQUAD_BOTTOMLEFT;
+extern const unsigned short GLOWQUAD_BOTTOMRIGHT;
+extern const unsigned short GLOWQUAD_TOP;
+extern const unsigned short GLOWQUAD_BOTTOM;
+extern const unsigned short GLOWQUAD_LEFT;
+extern const unsigned short GLOWQUAD_RIGHT;
+extern const unsigned short NUM_GLOWQUADS;
 
 /* Represents a particular glow texture, so here
  * we have hardcoded in the texture data, the offset
 
=== modified file 'plugins/group/src/group.cpp'
--- plugins/group/src/group.cpp	2012-07-30 09:53:16 +0000
+++ plugins/group/src/group.cpp	2012-09-08 00:13:22 +0000
@@ -26,6 +26,8 @@
 
 #include "group.h"
 
+const double PI = 3.14159265359f;
+
 /*
  * GroupExp class
  *
@@ -1559,7 +1561,7 @@
  */
 
 /* the radius to determine if it was a click or a drag */
-#define RADIUS 5
+static const unsigned short RADIUS = 5;
 
 void
 GroupScreen::handleMotionEvent (int xRoot, int yRoot)
 
=== modified file 'plugins/group/src/group.h'
--- plugins/group/src/group.h	2012-09-04 15:33:44 +0000
+++ plugins/group/src/group.h	2012-09-08 00:13:22 +0000
@@ -85,7 +85,7 @@
  * Constants
  *
  */
-#define PI 3.1415926535897
+extern const double PI;
 
 /*
  * Helpers
 
=== modified file 'plugins/group/src/tab.cpp'
--- plugins/group/src/tab.cpp	2012-07-30 12:58:44 +0000
+++ plugins/group/src/tab.cpp	2012-09-08 00:13:22 +0000
@@ -2187,7 +2187,7 @@
        properly - however the best way would be if slot->mRegion was
        sized including the border */
 
-#define DAMAGE_BUFFER 20
+static const unsigned short DAMAGE_BUFFER = 20;
 
     /* If there is a front slot in this bar, then we need to damage
      * areas just outside where the slot might be sitting */
 
=== modified file 'plugins/imgpng/src/imgpng.cpp'
--- plugins/imgpng/src/imgpng.cpp	2012-01-18 16:26:45 +0000
+++ plugins/imgpng/src/imgpng.cpp	2012-09-08 00:13:22 +0000
@@ -36,6 +36,8 @@
 
 COMPIZ_PLUGIN_20090315 (imgpng, PngPluginVTable)
 
+const unsigned short PNG_SIG_SIZE = 8;
+
 PngScreen::PngScreen (CompScreen *screen) :
     PluginClassHandler<PngScreen, CompScreen> (screen)
 {
 
=== modified file 'plugins/imgpng/src/imgpng.h'
--- plugins/imgpng/src/imgpng.h	2012-01-18 16:26:45 +0000
+++ plugins/imgpng/src/imgpng.h	2012-09-08 00:13:22 +0000
@@ -34,7 +34,7 @@
 
 #include <iosfwd>
 
-#define PNG_SIG_SIZE 8
+extern const unsigned short PNG_SIG_SIZE;
 
 class PngScreen :
     public ScreenInterface,
 
=== modified file 'plugins/maximumize/src/maximumize.cpp'
--- plugins/maximumize/src/maximumize.cpp	2011-03-14 16:04:58 +0000
+++ plugins/maximumize/src/maximumize.cpp	2012-09-08 00:13:22 +0000
@@ -31,6 +31,10 @@
 
 COMPIZ_PLUGIN_20090315 (maximumize, MaximumizePluginVTable);
 
+/* Convenience constants to make the code more readable (hopefully) */
+const short		REDUCE  = -1;
+const unsigned short	INCREASE = 1;
+
 /* Returns true if rectangles a and b intersect by at least 40 in both
  * directions
  */
 
=== modified file 'plugins/maximumize/src/maximumize.h'
--- plugins/maximumize/src/maximumize.h	2009-03-20 07:58:25 +0000
+++ plugins/maximumize/src/maximumize.h	2012-09-08 00:13:22 +0000
@@ -31,9 +31,9 @@
 
 #include "maximumize_options.h"
 
-/* Convenience macros to make the code more readable (hopefully) */
-#define REDUCE -1
-#define INCREASE 1
+/* Convenience constants to make the code more readable (hopefully) */
+extern const short	    REDUCE;
+extern const unsigned short INCREASE;
 
 typedef struct
 {
 
=== modified file 'plugins/mousepoll/src/mousepoll.cpp'
--- plugins/mousepoll/src/mousepoll.cpp	2012-07-30 09:53:16 +0000
+++ plugins/mousepoll/src/mousepoll.cpp	2012-09-08 00:13:22 +0000
@@ -24,6 +24,9 @@
 
 COMPIZ_PLUGIN_20090315 (mousepoll, MousepollPluginVTable);
 
+const unsigned short MP_OPTION_MOUSE_POLL_INTERVAL = 0;
+const unsigned short MP_OPTION_NUM = 1;
+
 bool
 MousepollScreen::getMousePosition ()
 {
 
=== modified file 'plugins/mousepoll/src/private.h'
--- plugins/mousepoll/src/private.h	2009-03-16 05:20:59 +0000
+++ plugins/mousepoll/src/private.h	2012-09-08 00:13:22 +0000
@@ -34,8 +34,8 @@
     MP_DISPLAY_OPTION_NUM
 } MousepollDisplayOptions;
 
-#define MP_OPTION_MOUSE_POLL_INTERVAL 0
-#define MP_OPTION_NUM 1
+extern const unsigned short MP_OPTION_MOUSE_POLL_INTERVAL;
+extern const unsigned short MP_OPTION_NUM;
 
 class MousepollScreen :
     public PluginClassHandler <MousepollScreen, CompScreen, COMPIZ_MOUSEPOLL_ABI>,
 
=== modified file 'plugins/move/src/move.cpp'
--- plugins/move/src/move.cpp	2012-04-19 12:06:05 +0000
+++ plugins/move/src/move.cpp	2012-09-08 00:13:22 +0000
@@ -34,6 +34,11 @@
 
 COMPIZ_PLUGIN_20090315 (move, MovePluginVTable)
 
+const unsigned short KEY_MOVE_INC = 24;
+
+const unsigned short SNAP_BACK = 20;
+const unsigned short SNAP_OFF  = 100;
+
 static bool
 moveInitiate (CompAction      *action,
 	      CompAction::State state,
 
=== modified file 'plugins/move/src/move.h'
--- plugins/move/src/move.h	2012-02-01 17:49:07 +0000
+++ plugins/move/src/move.h	2012-09-08 00:13:22 +0000
@@ -34,10 +34,10 @@
 
 #define NUM_KEYS (sizeof (mKeys) / sizeof (mKeys[0]))
 
-#define KEY_MOVE_INC 24
+extern const unsigned short KEY_MOVE_INC;
 
-#define SNAP_BACK 20
-#define SNAP_OFF  100
+extern const unsigned short SNAP_BACK;
+extern const unsigned short SNAP_OFF;
 
 struct _MoveKeys {
     const char *name;
 
=== modified file 'plugins/notification/src/notification.cpp'
--- plugins/notification/src/notification.cpp	2012-05-18 06:52:20 +0000
+++ plugins/notification/src/notification.cpp	2012-09-08 00:13:22 +0000
@@ -26,6 +26,8 @@
 
 COMPIZ_PLUGIN_20090315 (notification, NotificationPluginVTable);
 
+const std::string IMAGE_DIR(".compiz/images");
+
 /* libnotify 0.7 introduced proper NOTIFY_CHECK_VERSION macro */
 #if defined(NOTIFY_CHECK_VERSION) && !defined(HAVE_LIBNOTIFY_0_6_1)
 #if NOTIFY_CHECK_VERSION(0,6,1)
@@ -58,7 +60,7 @@
               in $PREFIX/share/compiz, not in the home dir */
     iconUri   = "file://";
     iconUri += homeDir;
-    iconUri += "/" IMAGE_DIR "/compiz.png";
+    iconUri += "/" + IMAGE_DIR + "/compiz.png";
     logLevel = (char *) logLevelToString (level);
 
     n = notify_notification_new (logLevel, message,
 
=== modified file 'plugins/notification/src/notification.h'
--- plugins/notification/src/notification.h	2009-03-16 01:57:00 +0000
+++ plugins/notification/src/notification.h	2012-09-08 00:13:22 +0000
@@ -29,7 +29,7 @@
 
 #include "notification_options.h"
 
-#define IMAGE_DIR ".compiz/images"
+extern const std::string IMAGE_DIR;
 
 class NotificationScreen :
     public PluginClassHandler <NotificationScreen, CompScreen>,
 
=== modified file 'plugins/obs/src/obs.cpp'
--- plugins/obs/src/obs.cpp	2012-09-04 15:33:44 +0000
+++ plugins/obs/src/obs.cpp	2012-09-08 00:13:22 +0000
@@ -27,6 +27,10 @@
 
 COMPIZ_PLUGIN_20090315 (obs, ObsPluginVTable);
 
+const unsigned short MODIFIER_OPACITY    = 0;
+const unsigned short MODIFIER_SATURATION = 1;
+const unsigned short MODIFIER_BRIGHTNESS = 2;
+
 void
 ObsWindow::changePaintModifier (unsigned int modifier,
 				int          direction)
 
=== modified file 'plugins/obs/src/obs.h'
--- plugins/obs/src/obs.h	2012-09-04 15:33:44 +0000
+++ plugins/obs/src/obs.h	2012-09-08 00:13:22 +0000
@@ -31,10 +31,10 @@
 
 #include "obs_options.h"
 
-#define MODIFIER_OPACITY    0
-#define MODIFIER_SATURATION 1
-#define MODIFIER_BRIGHTNESS 2
-#define MODIFIER_COUNT      3
+extern const unsigned short MODIFIER_OPACITY;
+extern const unsigned short MODIFIER_SATURATION;
+extern const unsigned short MODIFIER_BRIGHTNESS;
+#define MODIFIER_COUNT 3
 
 class ObsScreen :
     public ScreenInterface,
 
=== modified file 'plugins/opacify/src/opacify.cpp'
--- plugins/opacify/src/opacify.cpp	2012-09-04 15:33:44 +0000
+++ plugins/opacify/src/opacify.cpp	2012-09-08 00:13:22 +0000
@@ -28,6 +28,8 @@
 
 COMPIZ_PLUGIN_20090315 (opacify, OpacifyPluginVTable);
 
+const unsigned short MAX_WINDOWS = 64;
+
 void
 setFunctions (bool enabled)
 {
 
=== modified file 'plugins/opacify/src/opacify.h'
--- plugins/opacify/src/opacify.h	2012-09-04 15:33:44 +0000
+++ plugins/opacify/src/opacify.h	2012-09-08 00:13:22 +0000
@@ -31,7 +31,7 @@
 #include "opacify_options.h"
 
 /* Size of the Window array storing passive windows. */
-#define MAX_WINDOWS 64
+extern const unsigned short MAX_WINDOWS;
 
 class OpacifyScreen :
     public PluginClassHandler <OpacifyScreen, CompScreen>,
 
=== modified file 'plugins/opengl/include/opengl/opengl.h'
--- plugins/opengl/include/opengl/opengl.h	2012-08-14 08:42:15 +0000
+++ plugins/opengl/include/opengl/opengl.h	2012-09-08 00:13:22 +0000
@@ -78,11 +78,11 @@
 /**
  * camera distance from screen, 0.5 * tan (FOV)
  */
-#define DEFAULT_Z_CAMERA 0.866025404f
+extern const float DEFAULT_Z_CAMERA;
 
-#define RED_SATURATION_WEIGHT   0.30f
-#define GREEN_SATURATION_WEIGHT 0.59f
-#define BLUE_SATURATION_WEIGHT  0.11f
+extern const float RED_SATURATION_WEIGHT;
+extern const float GREEN_SATURATION_WEIGHT;
+extern const float BLUE_SATURATION_WEIGHT;
 
 class PrivateGLScreen;
 class PrivateGLWindow;
@@ -571,9 +571,9 @@
 };
 #endif
 
-#define NOTHING_TRANS_FILTER 0
-#define SCREEN_TRANS_FILTER  1
-#define WINDOW_TRANS_FILTER  2
+extern const unsigned short NOTHING_TRANS_FILTER;
+extern const unsigned short SCREEN_TRANS_FILTER;
+extern const unsigned short WINDOW_TRANS_FILTER;
 
 
 extern GLScreenPaintAttrib defaultScreenPaintAttrib;
 
=== modified file 'plugins/opengl/src/opengl.cpp'
--- plugins/opengl/src/opengl.cpp	2012-01-18 16:26:45 +0000
+++ plugins/opengl/src/opengl.cpp	2012-09-08 00:13:22 +0000
@@ -28,6 +28,16 @@
 #include <core/pluginclasshandler.h>
 #include "privates.h"
 
+const float DEFAULT_Z_CAMERA = 0.866025404f;
+
+const float RED_SATURATION_WEIGHT   = 0.30f;
+const float GREEN_SATURATION_WEIGHT = 0.59f;
+const float BLUE_SATURATION_WEIGHT  = 0.11f;
+
+const unsigned short NOTHING_TRANS_FILTER = 0;
+const unsigned short SCREEN_TRANS_FILTER  = 1;
+const unsigned short WINDOW_TRANS_FILTER  = 2;
+
 CompOption::Vector &
 GLScreen::getOptions ()
 {
 
=== modified file 'plugins/place/src/place.cpp'
--- plugins/place/src/place.cpp	2012-09-05 23:54:21 +0000
+++ plugins/place/src/place.cpp	2012-09-08 00:13:22 +0000
@@ -943,7 +943,7 @@
     /* arbitrary-ish threshold, honors user attempts to
      * manually cascade.
      */
-#define CASCADE_FUZZ 15
+static const unsigned short CASCADE_FUZZ = 15;
 
     xThreshold = MAX (this->extents ().left, CASCADE_FUZZ);
     yThreshold = MAX (this->extents ().top, CASCADE_FUZZ);
@@ -988,7 +988,7 @@
 		cascadeX = MAX (0, workArea.x ());
 		cascadeY = MAX (0, workArea.y ());
 
-#define CASCADE_INTERVAL 50 /* space between top-left corners of cascades */
+static const unsigned short CASCADE_INTERVAL = 50; /* space between top-left corners of cascades */
 
 		cascadeStage += 1;
 		cascadeX += CASCADE_INTERVAL * cascadeStage;
 
=== modified file 'plugins/place/src/smart/src/smart.cpp'
--- plugins/place/src/smart/src/smart.cpp	2012-02-02 17:01:15 +0000
+++ plugins/place/src/smart/src/smart.cpp	2012-09-08 00:13:22 +0000
@@ -6,9 +6,9 @@
 #endif
 
 /* overlap types */
-#define NONE    0
-#define H_WRONG -1
-#define W_WRONG -2
+static const unsigned short NONE = 0;
+static const short H_WRONG = -1;
+static const short W_WRONG = -2;
 
 namespace compiz
 {
 
=== modified file 'plugins/put/src/put.cpp'
--- plugins/put/src/put.cpp	2011-03-14 15:53:05 +0000
+++ plugins/put/src/put.cpp	2012-09-08 00:13:22 +0000
@@ -106,10 +106,10 @@
  * PS: Decorations are icky.
  */
 
-#define LEFT   0
-#define RIGHT  1
-#define TOP    2
-#define BOTTOM 3
+static const unsigned short LEFT = 0;
+static const unsigned short RIGHT = 1;
+static const unsigned short TOP = 2;
+static const unsigned short BOTTOM = 3;
 
 inline void
 addToCorner (CompRect&    rect,
 
=== modified file 'plugins/resize/src/logic/include/resize-defs.h'
--- plugins/resize/src/logic/include/resize-defs.h	2012-08-15 21:36:40 +0000
+++ plugins/resize/src/logic/include/resize-defs.h	2012-09-08 00:13:22 +0000
@@ -36,7 +36,7 @@
 
 #define NUM_KEYS 4
 
-#define MIN_KEY_WIDTH_INC  24
-#define MIN_KEY_HEIGHT_INC 24
+#define MIN_KEY_WIDTH_INC   24
+#define MIN_KEY_HEIGHT_INC  24
 
 #endif /* RESIZEDEFS_H */
 
=== modified file 'plugins/resize/src/logic/src/resize-logic.cpp'
--- plugins/resize/src/logic/src/resize-logic.cpp	2012-09-03 21:21:12 +0000
+++ plugins/resize/src/logic/src/resize-logic.cpp	2012-09-08 00:13:22 +0000
@@ -43,10 +43,10 @@
 
 #define XWINDOWCHANGES_INIT {0, 0, 0, 0, 0, None, 0}
 
-#define TOUCH_LEFT 1
-#define TOUCH_RIGHT 2
-#define TOUCH_TOP 3
-#define TOUCH_BOTTOM 4
+static const unsigned short TOUCH_LEFT = 1;
+static const unsigned short TOUCH_RIGHT = 2;
+static const unsigned short TOUCH_TOP = 3;
+static const unsigned short TOUCH_BOTTOM = 4;
 
 using namespace resize;
 
 
=== modified file 'plugins/resizeinfo/src/resizeinfo.cpp'
--- plugins/resizeinfo/src/resizeinfo.cpp	2012-07-30 07:10:52 +0000
+++ plugins/resizeinfo/src/resizeinfo.cpp	2012-09-08 00:13:22 +0000
@@ -25,6 +25,11 @@
 
 COMPIZ_PLUGIN_20090315 (resizeinfo, InfoPluginVTable);
 
+const unsigned short RESIZE_POPUP_WIDTH = 85;
+const unsigned short RESIZE_POPUP_HEIGHT = 50;
+
+const double PI = 3.14159265359f;
+
 /* Set up an InfoLayer to build a cairo->opengl texture pipeline */
 InfoLayer::~InfoLayer ()
 {
 
=== modified file 'plugins/resizeinfo/src/resizeinfo.h'
--- plugins/resizeinfo/src/resizeinfo.h	2012-07-30 07:10:52 +0000
+++ plugins/resizeinfo/src/resizeinfo.h	2012-09-08 00:13:22 +0000
@@ -34,10 +34,10 @@
 
 #include "resizeinfo_options.h"
 
-#define RESIZE_POPUP_WIDTH 85
-#define RESIZE_POPUP_HEIGHT 50
+extern const unsigned short RESIZE_POPUP_WIDTH;
+extern const unsigned short RESIZE_POPUP_HEIGHT;
 
-#define PI 3.1415926
+extern const double PI;
 
 /* Cairo helper class */
 
 
=== modified file 'plugins/ring/src/ring.cpp'
--- plugins/ring/src/ring.cpp	2012-08-14 06:33:22 +0000
+++ plugins/ring/src/ring.cpp	2012-09-08 00:13:22 +0000
@@ -31,6 +31,10 @@
 
 COMPIZ_PLUGIN_20090315 (ring, RingPluginVTable);
 
+const double PI = 3.14159265359f;
+
+const unsigned short ICON_SIZE = 64;
+
 bool textAvailable;
 
 static void
 
=== modified file 'plugins/ring/src/ring.h'
--- plugins/ring/src/ring.h	2012-05-22 13:55:35 +0000
+++ plugins/ring/src/ring.h	2012-09-08 00:13:22 +0000
@@ -246,10 +246,10 @@
 	adjustVelocity ();
 };
 
-#define PI 3.1415926
+extern const double PI;
 #define DIST_ROT (3600 / mWindows.size ())
 #define DIST_ROT_w (3600 / rs->mWindows.size ())
-#define ICON_SIZE 64
+extern const unsigned short ICON_SIZE;
 
 #define RING_SCREEN(s)							       \
     RingScreen *rs = RingScreen::get (s)
 
=== modified file 'plugins/rotate/src/rotate.cpp'
--- plugins/rotate/src/rotate.cpp	2012-01-18 16:26:45 +0000
+++ plugins/rotate/src/rotate.cpp	2012-09-08 00:13:22 +0000
@@ -28,7 +28,7 @@
 
 #include <math.h>
 
-#define ROTATE_POINTER_SENSITIVITY_FACTOR 0.05f
+static const float ROTATE_POINTER_SENSITIVITY_FACTOR = 0.05f;
 
 COMPIZ_PLUGIN_20090315 (rotate, RotatePluginVTable)
 
 
=== modified file 'plugins/scaleaddon/src/scaleaddon.cpp'
--- plugins/scaleaddon/src/scaleaddon.cpp	2012-07-30 07:10:52 +0000
+++ plugins/scaleaddon/src/scaleaddon.cpp	2012-09-08 00:13:22 +0000
@@ -545,8 +545,8 @@
  * inspired by smallwindows (smallwindows.sf.net) by Jens Egeblad
  * FIXME: broken.
  * */
-#define ORGANIC_STEP 0.05
 #if 0
+static const double ORGANIC_STEP = 0.05f;
 static int
 organicCompareWindows (const void *elem1,
 		       const void *elem2)
 
=== modified file 'plugins/shelf/src/shelf.cpp'
--- plugins/shelf/src/shelf.cpp	2012-05-18 06:52:20 +0000
+++ plugins/shelf/src/shelf.cpp	2012-09-08 00:13:22 +0000
@@ -36,6 +36,8 @@
 
 COMPIZ_PLUGIN_20090315 (shelf, ShelfPluginVTable);
 
+const float SHELF_MIN_SIZE = 50.0f; // Minimum pixelsize a window can be scaled to
+
 /* Enables / Disables screen paint functions */
 static void
 toggleScreenFunctions (bool enabled)
 
=== modified file 'plugins/shelf/src/shelf.h'
--- plugins/shelf/src/shelf.h	2010-08-04 16:09:38 +0000
+++ plugins/shelf/src/shelf.h	2012-09-08 00:13:22 +0000
@@ -221,7 +221,7 @@
 #define SHELF_SCREEN(w)							       \
 	ShelfScreen *ss = ShelfScreen::get (w)
 
-#define SHELF_MIN_SIZE 50.0f // Minimum pixelsize a window can be scaled to
+extern const float SHELF_MIN_SIZE; // Minimum pixelsize a window can be scaled to
 
 
 class ShelfPluginVTable :
 
=== modified file 'plugins/shift/src/shift.cpp'
--- plugins/shift/src/shift.cpp	2012-08-14 06:33:22 +0000
+++ plugins/shift/src/shift.cpp	2012-09-08 00:13:22 +0000
@@ -37,6 +37,8 @@
 
 COMPIZ_PLUGIN_20090315 (shift, ShiftPluginVTable);
 
+const double PI = 3.14159265359f;
+
 bool textAvailable = false;
 
 void
 
=== modified file 'plugins/shift/src/shift.h'
--- plugins/shift/src/shift.h	2012-05-22 13:58:31 +0000
+++ plugins/shift/src/shift.h	2012-09-08 00:13:22 +0000
@@ -305,7 +305,7 @@
 
 };
 
-#define PI 3.1415926
+extern const double PI;
 
 #define SHIFT_WINDOW(w)							      \
     ShiftWindow *sw = ShiftWindow::get (w)
 
=== modified file 'plugins/showdesktop/src/showdesktop.cpp'
--- plugins/showdesktop/src/showdesktop.cpp	2012-05-18 06:52:20 +0000
+++ plugins/showdesktop/src/showdesktop.cpp	2012-09-08 00:13:22 +0000
@@ -37,6 +37,11 @@
 
 COMPIZ_PLUGIN_20090315 (showdesktop, ShowdesktopPluginVTable);
 
+const unsigned short SD_STATE_OFF          = 0;
+const unsigned short SD_STATE_ACTIVATING   = 1;
+const unsigned short SD_STATE_ON           = 2;
+const unsigned short SD_STATE_DEACTIVATING = 3;
+
 /* non interfacing code, aka the logic of the plugin */
 bool
 ShowdesktopWindow::is ()
 
=== modified file 'plugins/showdesktop/src/showdesktop.h'
--- plugins/showdesktop/src/showdesktop.h	2011-03-14 15:47:56 +0000
+++ plugins/showdesktop/src/showdesktop.h	2012-09-08 00:13:22 +0000
@@ -54,10 +54,10 @@
 #define MOVE_LEFT(w) ((WIN_X (w) + (WIN_W (w) / 2)) < (screen->width () / 2))
 #define MOVE_UP(w) ((WIN_Y (w) + (WIN_H (w) / 2)) < (screen->height () / 2))
 
-#define SD_STATE_OFF          0
-#define SD_STATE_ACTIVATING   1
-#define SD_STATE_ON           2
-#define SD_STATE_DEACTIVATING 3
+extern const unsigned short SD_STATE_OFF;
+extern const unsigned short SD_STATE_ACTIVATING;
+extern const unsigned short SD_STATE_ON;
+extern const unsigned short SD_STATE_DEACTIVATING;
 
 class ShowdesktopPlacer
 {
 
=== modified file 'plugins/splash/src/splash.cpp'
--- plugins/splash/src/splash.cpp	2011-02-24 06:28:27 +0000
+++ plugins/splash/src/splash.cpp	2012-09-08 00:13:22 +0000
@@ -23,6 +23,9 @@
 
 COMPIZ_PLUGIN_20090315 (splash, SplashPluginVTable);
 
+const std::string SPLASH_BACKGROUND_DEFAULT("");
+const std::string SPLASH_LOGO_DEFAULT("");
+
 void
 SplashScreen::preparePaint (int ms)
 {
 
=== modified file 'plugins/splash/src/splash.h'
--- plugins/splash/src/splash.h	2009-03-16 01:58:28 +0000
+++ plugins/splash/src/splash.h	2012-09-08 00:13:22 +0000
@@ -34,8 +34,8 @@
 #define MESH_W 16
 #define MESH_H 16
 
-#define SPLASH_BACKGROUND_DEFAULT ""
-#define SPLASH_LOGO_DEFAULT ""
+extern const std::string SPLASH_BACKGROUND_DEFAULT;
+extern const std::string SPLASH_LOGO_DEFAULT;
 
 class SplashScreen :
     public PluginClassHandler <SplashScreen, CompScreen>,
 
=== modified file 'plugins/staticswitcher/src/staticswitcher.cpp'
--- plugins/staticswitcher/src/staticswitcher.cpp	2012-08-08 08:54:15 +0000
+++ plugins/staticswitcher/src/staticswitcher.cpp	2012-09-08 00:13:22 +0000
@@ -27,6 +27,9 @@
 
 COMPIZ_PLUGIN_20090315 (staticswitcher, StaticSwitchPluginVTable)
 
+const unsigned short PREVIEWSIZE = 150;
+const unsigned short BORDER = 10;
+
 void
 StaticSwitchScreen::updatePopupWindow ()
 {
 
=== modified file 'plugins/staticswitcher/src/staticswitcher.h'
--- plugins/staticswitcher/src/staticswitcher.h	2012-07-30 07:10:52 +0000
+++ plugins/staticswitcher/src/staticswitcher.h	2012-09-08 00:13:22 +0000
@@ -159,8 +159,8 @@
 
 #define MAX_ICON_SIZE 256
 
-#define PREVIEWSIZE 150
-#define BORDER 10
+extern const unsigned short PREVIEWSIZE;
+extern const unsigned short BORDER;
 
 #define SWITCH_SCREEN(s) \
     StaticSwitchScreen *ss = StaticSwitchScreen::get (s)
 
=== modified file 'plugins/switcher/src/switcher.cpp'
--- plugins/switcher/src/switcher.cpp	2012-08-06 01:36:00 +0000
+++ plugins/switcher/src/switcher.cpp	2012-09-08 00:13:22 +0000
@@ -27,6 +27,12 @@
 
 COMPIZ_PLUGIN_20090315 (switcher, SwitchPluginVTable)
 
+const unsigned short WIDTH  = 212;
+const unsigned short HEIGHT = 192;
+const unsigned short SPACE  = 10;
+
+const unsigned short BOX_WIDTH = 3;
+
 #define XWINDOWCHANGES_INIT {0, 0, 0, 0, 0, None, 0}
 
 static float _boxVertices[] =
 
=== modified file 'plugins/switcher/src/switcher.h'
--- plugins/switcher/src/switcher.h	2010-12-07 15:25:17 +0000
+++ plugins/switcher/src/switcher.h	2012-09-08 00:13:22 +0000
@@ -154,11 +154,11 @@
     unsigned long decorations;
 } MwmHints;
 
-#define WIDTH  212
-#define HEIGHT 192
-#define SPACE  10
+extern const unsigned short WIDTH;
+extern const unsigned short HEIGHT;
+extern const unsigned short SPACE;
 
-#define BOX_WIDTH 3
+extern const unsigned short BOX_WIDTH;
 
 #define WINDOW_WIDTH(count) (WIDTH * (count) + (SPACE << 1))
 #define WINDOW_HEIGHT (HEIGHT + (SPACE << 1))
 
=== modified file 'plugins/td/src/3d.cpp'
--- plugins/td/src/3d.cpp	2012-07-30 10:15:41 +0000
+++ plugins/td/src/3d.cpp	2012-09-08 00:13:22 +0000
@@ -2,6 +2,8 @@
 
 COMPIZ_PLUGIN_20090315 (td, TdPluginVTable);
 
+const double PI = 3.14159265359f;
+
 void
 setFunctions (bool enabled)
 {
 
=== modified file 'plugins/td/src/3d.h'
--- plugins/td/src/3d.h	2010-08-15 10:01:46 +0000
+++ plugins/td/src/3d.h	2012-09-08 00:13:22 +0000
@@ -43,7 +43,7 @@
 
 #include "td_options.h"
 
-#define PI 3.14159265359f
+extern const double PI;
 
 class TdScreen :
     public PluginClassHandler <TdScreen, CompScreen>,
 
=== modified file 'plugins/text/src/text.cpp'
--- plugins/text/src/text.cpp	2012-07-30 07:10:52 +0000
+++ plugins/text/src/text.cpp	2012-09-08 00:13:22 +0000
@@ -27,7 +27,7 @@
 
 #include "private.h"
 
-#define PI 3.14159265359f
+static const double PI = 3.14159265359f;
 
 COMPIZ_PLUGIN_20090315 (text, TextPluginVTable);
 
 
=== modified file 'plugins/thumbnail/src/thumbnail.cpp'
--- plugins/thumbnail/src/thumbnail.cpp	2012-08-06 01:36:00 +0000
+++ plugins/thumbnail/src/thumbnail.cpp	2012-09-08 00:13:22 +0000
@@ -32,6 +32,8 @@
 
 COMPIZ_PLUGIN_20090315 (thumbnail, ThumbPluginVTable);
 
+const unsigned short TEXT_DISTANCE = 10;
+
 void
 ThumbScreen::freeThumbText (Thumbnail  *t)
 {
 
=== modified file 'plugins/thumbnail/src/thumbnail.h'
--- plugins/thumbnail/src/thumbnail.h	2012-07-30 07:10:52 +0000
+++ plugins/thumbnail/src/thumbnail.h	2012-09-08 00:13:22 +0000
@@ -58,7 +58,7 @@
 #define WIN_W(w) ((w)->width () + (w)->border ().left + (w)->border ().right)
 #define WIN_H(w) ((w)->height () + (w)->border ().top + (w)->border ().bottom)
 
-#define TEXT_DISTANCE 10
+extern const unsigned short TEXT_DISTANCE;
 
 bool textPluginLoaded;
 
 
=== modified file 'plugins/wall/src/wall.cpp'
--- plugins/wall/src/wall.cpp	2012-08-02 06:54:30 +0000
+++ plugins/wall/src/wall.cpp	2012-09-08 00:13:22 +0000
@@ -37,9 +37,9 @@
 
 #include "wall.h"
 
-#define PI 3.14159265359f
-#define VIEWPORT_SWITCHER_SIZE 100
-#define ARROW_SIZE 33
+static const double PI = 3.14159265359f;
+static const unsigned short VIEWPORT_SWITCHER_SIZE = 100;
+static const unsigned short ARROW_SIZE = 33;
 
 #define getColorRGBA(name) \
     r = optionGet##name##Red() / 65535.0f;\
@@ -385,7 +385,7 @@
 }
 
 /* movement remainder that gets ignored for direction calculation */
-#define IGNORE_REMAINDER 0.05
+static const float IGNORE_REMAINDER = 0.05f;
 
 void
 WallScreen::determineMovementAngle ()
 
=== modified file 'plugins/water/src/water.cpp'
--- plugins/water/src/water.cpp	2012-09-05 23:54:21 +0000
+++ plugins/water/src/water.cpp	2012-09-08 00:13:22 +0000
@@ -31,6 +31,10 @@
 
 COMPIZ_PLUGIN_20090315 (water, WaterPluginVTable)
 
+const unsigned int TEXTURE_SIZE = 256;
+
+const float K = 0.1964f;
+
 static int waterLastPointerX = 0;
 static int waterLastPointerY = 0;
 
 
=== modified file 'plugins/water/src/water.h'
--- plugins/water/src/water.h	2012-07-30 07:10:52 +0000
+++ plugins/water/src/water.h	2012-09-08 00:13:22 +0000
@@ -37,9 +37,9 @@
 #define WATER_SCREEN(s) \
     WaterScreen *ws = WaterScreen::get (s)
 
-#define TEXTURE_SIZE 256
+extern const unsigned int TEXTURE_SIZE;
 
-#define K 0.1964f
+extern const float K;
 
 #define TEXTURE_NUM 3
 #define PROG_NUM 3
 
=== modified file 'plugins/wobbly/src/wobbly.h'
--- plugins/wobbly/src/wobbly.h	2012-08-14 06:33:22 +0000
+++ plugins/wobbly/src/wobbly.h	2012-09-08 00:13:22 +0000
@@ -41,7 +41,7 @@
 			  CompWindowTypeMenuMask    | \
 			  CompWindowTypeUtilMask)
 
-#define GRID_WIDTH  4
+#define GRID_WIDTH 4
 #define GRID_HEIGHT 4
 
 #define MODEL_MAX_SPRINGS (GRID_WIDTH * GRID_HEIGHT * 2)
 
=== modified file 'src/event.cpp'
--- src/event.cpp	2012-08-07 04:17:07 +0000
+++ src/event.cpp	2012-09-08 00:13:22 +0000
@@ -1619,9 +1619,9 @@
 		    if (state & ~CompWindowStateHiddenMask)
 		    {
 
-#define _NET_WM_STATE_REMOVE 0
-#define _NET_WM_STATE_ADD    1
-#define _NET_WM_STATE_TOGGLE 2
+static const unsigned short _NET_WM_STATE_REMOVE = 0;
+static const unsigned short _NET_WM_STATE_ADD    = 1;
+static const unsigned short _NET_WM_STATE_TOGGLE = 2;
 
 			switch (event->xclient.data.l[0]) {
 			case _NET_WM_STATE_REMOVE:
 
=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-08-03 10:12:25 +0000
+++ src/screen.cpp	2012-09-08 00:13:22 +0000
@@ -80,7 +80,7 @@
 
 #define MwmHintsFunctions   (1L << 0)
 #define MwmHintsDecorations (1L << 1)
-#define PropMotifWmHintElements 3
+static const unsigned short PropMotifWmHintElements = 3;
 
 typedef struct {
     unsigned long flags;
@@ -1148,7 +1148,7 @@
 		 Atom    property)
 {
 
-#define N_TARGETS 4
+static const unsigned short N_TARGETS = 4;
 
     Atom conversionTargets[N_TARGETS];
 
@@ -1272,8 +1272,8 @@
     eventManager.quit ();
 }
 
-#define IMAGEDIR "images"
-#define HOMECOMPIZDIR ".compiz-1"
+static const std::string IMAGEDIR("images");
+static const std::string HOMECOMPIZDIR(".compiz-1");
 
 bool
 CompScreenImpl::readImageFromFile (CompString &name,
@@ -2174,7 +2174,7 @@
     }
 }
 
-#define STARTUP_TIMEOUT_DELAY 15000
+static const unsigned int STARTUP_TIMEOUT_DELAY = 15000;
 
 bool
 cps::StartupSequence::handleStartupSequenceTimeout ()
 
=== modified file 'src/timer/src/timer.cpp'
--- src/timer/src/timer.cpp	2012-08-08 02:22:12 +0000
+++ src/timer/src/timer.cpp	2012-09-08 00:13:22 +0000
@@ -79,7 +79,7 @@
     return new CompTimeoutSource (ctx);
 }
 
-#define COMPIZ_TIMEOUT_WAIT 15
+static const unsigned short COMPIZ_TIMEOUT_WAIT = 15;
 
 bool
 CompTimeoutSource::prepare (int &timeout)