Merge lp:~vanvugt/compiz-core/Werror into lp:compiz-core/0.9.5

[Daniel van Vugt]

Fix all compiler warnings and (optionally) treat all future warnings as errors.

This is controlled by the cmake option COMPIZ_WERROR, which defaults to ON for compiz-core, and OFF for all other projects.

[Alan Griffiths (alan-griffiths)]

Looks good

review: Approve

=== modified file 'cmake/CompizCommon.cmake'
--- cmake/CompizCommon.cmake	2011-12-19 07:06:22 +0000
+++ cmake/CompizCommon.cmake	2012-01-17 05:24:23 +0000
@@ -42,15 +42,30 @@
     COMPIZ_I18N_DIR ${COMPIZ_I18N_DIR} CACHE PATH "Translation file directory"
 )
 
-option (COMPIZ_SIGN_WARNINGS "Should compiz use -Wsign-conversion during compilation." OFF)
-
-if (COMPIZ_SIGN_WARNINGS)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wsign-conversion")
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wsign-conversion")
+set (COMMON_FLAGS "-Wall")
+
+option (COMPIZ_DEPRECATED_WARNINGS "Warn about declarations marked deprecated" OFF)
+if (NOT COMPIZ_DEPRECATED_WARNINGS)
+    set (COMMON_FLAGS "${COMMON_FLAGS} -Wno-deprecated-declarations")
+endif ()
+
+option (COMPIZ_SIGN_WARNINGS "Should compiz use -Wsign-conversion during compilation." ON)
+if (NOT COMPIZ_SIGN_WARNINGS)
+    set (COMMON_FLAGS "${COMMON_FLAGS} -Wno-sign-conversion")
+endif ()
+
+if (${CMAKE_PROJECT_NAME} STREQUAL "compiz")
+    set (COMPIZ_WERROR_DEFAULT ON)
 else ()
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-endif ()
+    set (COMPIZ_WERROR_DEFAULT OFF)
+endif ()
+option (COMPIZ_WERROR "Treat warnings as errors" ${COMPIZ_WERROR_DEFAULT})
+if (COMPIZ_WERROR)
+    set (COMMON_FLAGS "${COMMON_FLAGS} -Werror")
+endif ()
+
+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}")
 
 if (IS_DIRECTORY ${CMAKE_SOURCE_DIR}/.git)
     set(IS_GIT_REPO 1)

=== modified file 'libdecoration/decoration.c'
--- libdecoration/decoration.c	2011-05-07 17:31:23 +0000
+++ libdecoration/decoration.c	2012-01-17 05:24:23 +0000
@@ -134,7 +134,7 @@
 decor_alloc_property (unsigned int n,
                       unsigned int type)
 {
-    unsigned int  propSize;
+    unsigned int  propSize = 0;
     long          *data;
 
     if (type == WINDOW_DECORATION_TYPE_WINDOW)

=== modified file 'plugins/decor/decor.xml.in'
--- plugins/decor/decor.xml.in	2011-10-13 11:31:37 +0000
+++ plugins/decor/decor.xml.in	2012-01-17 05:24:23 +0000
@@ -38,6 +38,12 @@
 		<option name="active_shadow_color" type="color">
 		    <_short>Shadow Color</_short>
 		    <_long>Drop shadow color</_long>
+		    <default>
+		        <red>0x0000</red>
+		        <green>0x0000</green>
+		        <blue>0x0000</blue>
+		        <alpha>0x8000</alpha>
+		    </default>
 		</option>
 		<option name="active_shadow_x_offset" type="int">
 		    <_short>Shadow Offset X</_short>

=== modified file 'plugins/opengl/src/texture.cpp'
--- plugins/opengl/src/texture.cpp	2011-10-31 13:51:00 +0000
+++ plugins/opengl/src/texture.cpp	2012-01-17 05:24:23 +0000
@@ -287,7 +287,7 @@
 			       GLenum       format,
 			       GLenum       type)
 {
-#warning Add support for multiple textures
+/* TODO Add support for multiple textures */
     if ((int) width > GL::maxTextureSize || (int) height > GL::maxTextureSize)
 	return GLTexture::List ();
 

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-01-16 08:36:54 +0000
+++ src/screen.cpp	2012-01-17 05:24:23 +0000
@@ -2204,7 +2204,7 @@
     atoms.push_back (Atoms::winOpacity);
     atoms.push_back (Atoms::winBrightness);
 
-#warning fixme
+/* FIXME */
 #if 0
     if (canDoSaturated)
     {

=== modified file 'src/timer/src/timer.cpp'
--- src/timer/src/timer.cpp	2012-01-12 09:09:35 +0000
+++ src/timer/src/timer.cpp	2012-01-17 05:24:23 +0000
@@ -248,7 +248,7 @@
 
     if (priv->mCallBack.empty ())
     {
-#warning compLogMessage needs to be testable
+/* FIXME: compLogMessage needs to be testable */
 #if 0
 	compLogMessage ("core", CompLogLevelWarn,
 			"Attempted to start timer without callback.");

=== modified file 'src/window.cpp'
--- src/window.cpp	2012-01-16 09:10:42 +0000
+++ src/window.cpp	2012-01-17 05:24:23 +0000
@@ -91,7 +91,7 @@
 {
     int maxSize;
 
-#warning fixme to max Texture size
+/* FIXME to max Texture size */
     maxSize  = MAXSHORT;
     maxSize -= serverGeometry.border () * 2;