Merge lp:~mc-return/compiz/compiz.fix1030473-part1 into lp:compiz/0.9.8

[MC Return]

Fixed various problems described in bug 1030473.
Optimized performance and style following suggestions reported by cppcheck:

1. Reduced the scope of various variables.

2. Used prefix ++ operators for non-primitive types, because those can be more efficient than post-increment. Post-increment usually keeps a copy of the previous value, adds extra code and is slower.

Fixes various problems described in bug 1030473.

[MC Return (mc-return)]

Still a lot to do :)

[/compizconfig/compizconfig-python/compizconfig.c:619]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:652]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:818]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:1335]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:1343]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:1354]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:1362]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:1370]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:1378]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:1398]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:1431]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:1475]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:1508]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:1532]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:1570]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:2007]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:2057]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:2722]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:3047]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:3136]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:3630]: (style) The second of the two statements can never be executed, and so should be removed.
[/compizconfig/compizconfig-python/compizconfig.c:3648]: (style) The second of the two stateme...

[MC Return (mc-return)]

These warnings remain:

[../compiz.fix1030473-part1/cmake/src/compiz/compiz_discover_gtest_tests.cpp:46]: (performance) Prefix ++/-- operators should be preferred for non-primitive types. Pre-increment/decrement can be more efficient than post-increment/decrement. Post-increment/decrement usually involves keeping a copy of the previous value around and adds a little extra code.
[../compiz.fix1030473-part1/cmake/src/compiz/compiz_discover_gtest_tests.cpp:49]: (performance) Prefix ++/-- operators should be preferred for non-primitive types. Pre-increment/decrement can be more efficient than post-increment/decrement. Post-increment/decrement usually involves keeping a copy of the previous value around and adds a little extra code.
[../compiz.fix1030473-part1/compizconfig/gconf/src/gconf.c:479]: (warning) scanf without field width limits can crash with huge input data. To fix this error message add a field width specifier:
    %s => %20s
    %i => %3i

Sample program that can crash:

#include <stdio.h>
int main()
{
    int a;
    scanf("%i", &a);
    return 0;
}

To make it crash:
perl -e 'print "5"x2100000' | ./a.out
[../compiz.fix1030473-part1/compizconfig/gconf/src/gconf.c:1930]: (error) Memory pointed to by 'pathName' is freed twice.
[../compiz.fix1030473-part1/compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c:184]: (warning) scanf without field width limits can crash with huge input data. To fix this error message add a field width specifier:
    %s => %20s
    %i => %3i

Sample program that can crash:

#include <stdio.h>
int main()
{
    int a;
    scanf("%i", &a);
    return 0;
}

To make it crash:
perl -e 'print "5"x2100000' | ./a.out
[../compiz.fix1030473-part1/compizconfig/gsettings/src/gsettings.c:296]: (warning) Casting between double* and float* which have an incompatible binary data representation
[../compiz.fix1030473-part1/compizconfig/libcompizconfig/backend/src/ini.c:686]: (error) Memory pointed to by 'filePath' is freed twice.
[../compiz.fix1030473-part1/compizconfig/libcompizconfig/backend/src/ini.c:187]: (error) Common realloc mistake: 'privData' nulled but not freed upon failure
[../compiz.fix1030473-part1/compizconfig/libcompizconfig/backend/src/ini.c:221]: (error) Common realloc mistake: 'privData' nulled but not freed upon failure
[../compiz.fix1030473-part1/compizconfig/libcompizconfig/src/bindings.c:380]: (warning) scanf without field width limits can crash with huge input data. To fix this error message add a field width specifier:
    %s => %20s
    %i => %3i

Sample program that can crash:

#include <stdio.h>
int main()
{
    int a;
    scanf("%i", &a);
    return 0;
}

To make it crash:
perl -e 'print "5"x2100000' | ./a.out
[../compiz.fix1030473-part1/compizconfig/libcompizconfig/src/compiz.cpp:3039]: (warning) sscanf %s in format string (no. 1) does not specify a width, use %1023s to prevent overflowing destination: name[1024]
[../compiz.fix1030473-part1/compizconfig/libcompizconfig/src/compiz.cpp:3039]: (warning) scanf without field width limits can crash with huge input data. To fix this error message add a field width specifier:
    %s => %20s
    %i => %3i

Sample program that can crash:

#includ...

[MC Return (mc-return)]

Those problems remain:

[../compizconfig/gconf/src/gconf.c:479]: (warning) scanf without field width limits can crash with huge input data. To fix this error message add a field width specifier:
    %s => %20s
    %i => %3i

Sample program that can crash:

#include <stdio.h>
int main()
{
    int a;
    scanf("%i", &a);
    return 0;
}

To make it crash:
perl -e 'print "5"x2100000' | ./a.out
[../compizconfig/gconf/src/gconf.c:1930]: (error) Memory pointed to by 'pathName' is freed twice.
[../compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c:184]: (warning) scanf without field width limits can crash with huge input data. To fix this error message add a field width specifier:
    %s => %20s
    %i => %3i

Sample program that can crash:

#include <stdio.h>
int main()
{
    int a;
    scanf("%i", &a);
    return 0;
}

To make it crash:
perl -e 'print "5"x2100000' | ./a.out
[../compizconfig/gsettings/src/gsettings.c:296]: (warning) Casting between double* and float* which have an incompatible binary data representation
[../compizconfig/libcompizconfig/backend/src/ini.c:686]: (error) Memory pointed to by 'filePath' is freed twice.
[../compizconfig/libcompizconfig/backend/src/ini.c:187]: (error) Common realloc mistake: 'privData' nulled but not freed upon failure
[../compizconfig/libcompizconfig/backend/src/ini.c:221]: (error) Common realloc mistake: 'privData' nulled but not freed upon failure
[../compizconfig/libcompizconfig/src/bindings.c:380]: (warning) scanf without field width limits can crash with huge input data. To fix this error message add a field width specifier:
    %s => %20s
    %i => %3i

Sample program that can crash:

#include <stdio.h>
int main()
{
    int a;
    scanf("%i", &a);
    return 0;
}

To make it crash:
perl -e 'print "5"x2100000' | ./a.out
[../compizconfig/libcompizconfig/src/compiz.cpp:3039]: (warning) sscanf %s in format string (no. 1) does not specify a width, use %1023s to prevent overflowing destination: name[1024]
[../compizconfig/libcompizconfig/src/compiz.cpp:3039]: (warning) scanf without field width limits can crash with huge input data. To fix this error message add a field width specifier:
    %s => %20s
    %i => %3i

Sample program that can crash:

#include <stdio.h>
int main()
{
    int a;
    scanf("%i", &a);
    return 0;
}

To make it crash:
perl -e 'print "5"x2100000' | ./a.out
[../compizconfig/libcompizconfig/src/compiz.cpp:2705]: (error) Memory leak: pbFile
[../compizconfig/libcompizconfig/src/compiz.cpp:2771]: (error) Memory leak: pbFile
[../compizconfig/libcompizconfig/src/compiz.cpp:768]: (performance) Prefix ++/-- operators should be preferred for non-primitive types. Pre-increment/decrement can be more efficient than post-increment/decrement. Post-increment/decrement usually involves keeping a copy of the previous value around and adds a little extra code.
[../compizconfig/libcompizconfig/src/filewatch.c:113]: (error) Common realloc mistake: 'fwData' nulled but not freed upon failure
[../compizconfig/libcompizconfig/src/filewatch.c:173]: (error) Common realloc mistake: 'fwData' nulled but not freed upon failure
[../compizconfig/libcompizconfig/src/ini.c:791]: (error) Common reall...

[Sam Spilsbury (smspillaz)]

7 for (map <string, vector<string> >::iterator it = testCases.begin ();
8 - it != testCases.end (); it++)
9 + it != testCases.end (); ++it)
10 {
11 for (vector <string>::iterator jt = it->second.begin ();
12 - jt != it->second.end (); jt++)
13 + jt != it->second.end (); ++jt)
14 {
15 if (testfilecmake.good ())
16 {

That's fine - you just need to fix the indentation on lines 9 and 13 of the diff (make it line up with the parens)

51 + int j;
52 for (j = 0; j < num; j++)
53 {

Indentation (should be 1 tab)

68 + int j, num = option.int_desc_size ();
69 for (j = 0; j < num; j++)
70 {

ditto ... there seem to be a lot of places where the indentation isn't quite right. Compiz uses the X11 scheme (which is stupid, but we shouldn't change it)

1 indent: 4 spaces
2 indents: 1 tab (8 wide)
3 indents: 1 tab 4 spaces
4 indents: 2 tabs

etc

You might want to change these:

505 - lastX = -1000000000.0;
506 + float lastX = -1000000000.0, lastZ = 0.0;
507
508 for (i = oldVCount; i < geometry.vCount; i++)
509 {
510 @@ -728,7 +727,7 @@
511 last[0][0] = -1000000000.0;
512 last[1][0] = -1000000000.0;

to

float lastX = std::numeric_limits <float>::min (), rather than their current magic number of -1000000000.0

595 - left = 0;
596 - right = minWidth;
597 - top = 0;
598 - bottom = minHeight;
599 + int left = 0, right = minWidth, top = 0, bottom = minHeight;

Keep these on separate lines, its a bit easier to read

[Daniel van Vugt (vanvugt)]

Lots of indentation needs fixing. Look at the Preview Diff.

I'm not concerned about multiple declarations on one line. It makes sense when the variables are related and/or the line is not very long.

review: Needs Fixing

[MC Return (mc-return)]

Daniel, I am sorry about the indentation problems.

I tried to not create any new ones ;), but the diff here shows the code differently than the code editor (QTCreator) that I am currently using - it seems that QTCreator is inserting spaces automatically, when I use Tabulator and I am a bit confused about the strange looking diff here...

Also when reading the code it seemed that inconsistent indentation was already an existing problem...

How about using some specialized tool to fix all of those indentation and stylistic problems automatically ?
I've heard recommendations for the code beautifier "Artistic Style" for example: http://astyle.sourceforge.net/

Also: Are the fixes already done in this branch ok so far, except from the wrong indentation, and do you have any comments on the remaining problems cppcheck found and how to best fix those ?

review: Needs Information

[lp:~mc-return/compiz/compiz.fix1030473-part1]

3423. By MC Return on 2012-07-30

Hopefully fixed indentation

[MC Return (mc-return)]

The strange thing is that I did not touch the indentation at all, when I changed postfix to prefix operators for example, and it looks correct when I check it in QTCreator, but the diff here says otherwise... :(

[lp:~mc-return/compiz/compiz.fix1030473-part1]

3424. By MC Return on 2012-07-30

Hopefully fixed indentation

3425. By MC Return on 2012-07-30

Hopefully fixed indentation

3426. By MC Return on 2012-07-30

Hopefully fixed indentation

3427. By MC Return on 2012-07-30

Hopefully fixed indentation

3428. By MC Return on 2012-07-30

Hopefully fixed identation

3429. By MC Return on 2012-07-30

Hopefully fixed indentation

3430. By MC Return on 2012-07-30

Hopefully fixed indentation

3431. By MC Return on 2012-07-30

Hopefully fixed indentation (although grid.cpp does not follow the 4 spaces/tabulator style and uses other method of indentation)

3432. By MC Return on 2012-07-30

Hopefully fixed indentation

3433. By MC Return on 2012-07-30

Hopefully fixed indentation

3434. By MC Return on 2012-07-30

Hopefully fixed indentation

3435. By MC Return on 2012-07-30

Hopefully fixed indentation

3436. By MC Return on 2012-07-30

Hopefully fixed indentation

[MC Return (mc-return)]

Sometimes (in the for loops) Tabulator + 5 Spaces were used, I am not sure about those (I used TAB + 4 Spaces)...

The rest of the problems should now be fixed. I hope we can merge this branch ASAP, before starting work on the remaining problems cppcheck detected as those are the more complicated ones and should IMHO not be mixed into one large diff to provide better readability. That is why I named this branch compiz.fix1030473-part1 in the first place ;).

review: Needs Resubmitting

[lp:~mc-return/compiz/compiz.fix1030473-part1]

3437. By MC Return on 2012-07-30

Fixed possible performance problem by replacing postfix operator with prefix one for the variable 'it'

3438. By MC Return on 2012-07-30

Fixed possible performance problem by replacing postfix operator with prefix one for the variables 'it' and 'cur'

3439. By MC Return on 2012-07-30

Fixed possible performance problem by replacing postfix operator with prefix one for the variable 'it'

3440. By MC Return on 2012-07-30

Hopefully fixed indentation

3441. By MC Return on 2012-07-30

Reduced the scope of the variable 'temp'

3442. By MC Return on 2012-07-30

Reduced the scope of the variable 'pixmap'

3443. By MC Return on 2012-07-30

Reduced the scope of the variable 'i'

3444. By MC Return on 2012-07-30

Reduced the scope of the variables 'v', 's' and 'e'

3445. By MC Return on 2012-07-30

Reduced the scope of the variables 'v', 's' and 'e'

3446. By MC Return on 2012-07-30

Reduced the scope of the variables 'v', 's' and 'e'

3447. By MC Return on 2012-07-30

Reduced the scope of the variables 'v', 's' and 'e'

3448. By MC Return on 2012-07-30

Reduced the scope of the variable 'i'

[Sam Spilsbury (smspillaz)]

Looks good now, the only indentation thing that remains is aligning the next line of the for statements with the content of the statement itself and not the brace, eg

    for (....
         ....)

not

    for (....
        ....)

As for Qt Creator, here are the settings I use:

http://fpaste.org/MOvt/

[lp:~mc-return/compiz/compiz.fix1030473-part1]

3449. By MC Return on 2012-07-30

Reduced the scope of the variable 'icccmVersion'

[MC Return (mc-return)]

Sam, thanks for the comment. I will fix those also, now that I understand how it is supposed to be :)

And thanks a lot for your Qt Creator settings !

[MC Return (mc-return)]

Remaining problems detected:

[../compizconfig/gconf/src/gconf.c:479]: (warning) scanf without field width limits can crash with huge input data. To fix this error message add a field width specifier:
    %s => %20s
    %i => %3i

Sample program that can crash:

#include <stdio.h>
int main()
{
    int a;
    scanf("%i", &a);
    return 0;
}

To make it crash:
perl -e 'print "5"x2100000' | ./a.out
[../compizconfig/gconf/src/gconf.c:1930]: (error) Memory pointed to by 'pathName' is freed twice.
[../compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c:184]: (warning) scanf without field width limits can crash with huge input data. To fix this error message add a field width specifier:
    %s => %20s
    %i => %3i

Sample program that can crash:

#include <stdio.h>
int main()
{
    int a;
    scanf("%i", &a);
    return 0;
}

To make it crash:
perl -e 'print "5"x2100000' | ./a.out
[../compizconfig/gsettings/src/gsettings.c:296]: (warning) Casting between double* and float* which have an incompatible binary data representation
[../compizconfig/libcompizconfig/backend/src/ini.c:686]: (error) Memory pointed to by 'filePath' is freed twice.
[../compizconfig/libcompizconfig/backend/src/ini.c:187]: (error) Common realloc mistake: 'privData' nulled but not freed upon failure
[../compizconfig/libcompizconfig/backend/src/ini.c:221]: (error) Common realloc mistake: 'privData' nulled but not freed upon failure
[../compizconfig/libcompizconfig/src/bindings.c:380]: (warning) scanf without field width limits can crash with huge input data. To fix this error message add a field width specifier:
    %s => %20s
    %i => %3i

Sample program that can crash:

#include <stdio.h>
int main()
{
    int a;
    scanf("%i", &a);
    return 0;
}

To make it crash:
perl -e 'print "5"x2100000' | ./a.out
[../compizconfig/libcompizconfig/src/compiz.cpp:3039]: (warning) sscanf %s in format string (no. 1) does not specify a width, use %1023s to prevent overflowing destination: name[1024]
[../compizconfig/libcompizconfig/src/compiz.cpp:3039]: (warning) scanf without field width limits can crash with huge input data. To fix this error message add a field width specifier:
    %s => %20s
    %i => %3i

Sample program that can crash:

#include <stdio.h>
int main()
{
    int a;
    scanf("%i", &a);
    return 0;
}

To make it crash:
perl -e 'print "5"x2100000' | ./a.out
[../compizconfig/libcompizconfig/src/compiz.cpp:2705]: (error) Memory leak: pbFile
[../compizconfig/libcompizconfig/src/compiz.cpp:2771]: (error) Memory leak: pbFile
[../compizconfig/libcompizconfig/src/filewatch.c:113]: (error) Common realloc mistake: 'fwData' nulled but not freed upon failure
[../compizconfig/libcompizconfig/src/filewatch.c:173]: (error) Common realloc mistake: 'fwData' nulled but not freed upon failure
[../compizconfig/libcompizconfig/src/ini.c:791]: (error) Common realloc mistake: 'stringBuffer' nulled but not freed upon failure
[../compizconfig/libcompizconfig/src/iniparser.c:123]: (style) Defensive programming: The variable i is used as array index and then there is a check that it is within limits. This can mean that the array might be accessed out-of-bounds. Reorder conditions such ...

[lp:~mc-return/compiz/compiz.fix1030473-part1]

3450. By MC Return on 2012-07-30

Fixed indentation

3451. By MC Return on 2012-07-30

Fixed indentation

3452. By MC Return on 2012-07-30

Fixed intendation

3453. By MC Return on 2012-07-30

Fixed intendation

3454. By MC Return on 2012-07-30

Fixed intendation

3455. By MC Return on 2012-07-30

Fixed intendation

3456. By MC Return on 2012-07-30

Fixed intendation

3457. By MC Return on 2012-07-30

Fixed intendation

3458. By MC Return on 2012-07-30

Fixed intendation

3459. By MC Return on 2012-07-30

Fixed intendation

[MC Return (mc-return)]

Okay, should be ready now... :)

[Sam Spilsbury (smspillaz)]

LGTM

review: Approve

[lp:~mc-return/compiz/compiz.fix1030473-part1]

3460. By MC Return on 2012-07-30

Replaced the magic number assignment of the variable 'lastX' by 'float lastX = std::numeric_limits <float>::min ()'

[MC Return (mc-return)]

I hope r3460 is okay as well ;) (followed your suggestion in your first comment here).

[MC Return (mc-return)]

review: Needs Resubmitting

[Daniel van Vugt (vanvugt)]

Looks OK and passes basic testing too.

review: Approve

=== modified file 'cmake/src/compiz/compiz_discover_gtest_tests.cpp'
--- cmake/src/compiz/compiz_discover_gtest_tests.cpp	2012-07-13 09:58:47 +0000
+++ cmake/src/compiz/compiz_discover_gtest_tests.cpp	2012-07-30 14:34:37 +0000
@@ -43,10 +43,10 @@
     if (testfilecmake.is_open ())
     {
 	for (map <string, vector<string> >::iterator it = testCases.begin ();
-	     it != testCases.end (); it++)
+	     it != testCases.end (); ++it)
 	{
 	    for (vector <string>::iterator jt = it->second.begin ();
-		 jt != it->second.end (); jt++)
+		 jt != it->second.end (); ++jt)
 	    {
 		if (testfilecmake.good ())
 		{

=== modified file 'compizconfig/libcompizconfig/src/bindings.c'
--- compizconfig/libcompizconfig/src/bindings.c	2009-09-01 04:17:14 +0000
+++ compizconfig/libcompizconfig/src/bindings.c	2012-07-30 14:34:37 +0000
@@ -213,13 +213,13 @@
 {
     char *binding;
     char *edges;
-    char buttonStr[256];
 
     edges = ccsEdgesToModString (button->edgeMask);
     binding = stringAppend (edges, ccsModifiersToString (button->buttonModMask));
 
     if (button->button)
     {
+        char buttonStr[256];
         snprintf (buttonStr, 256, "Button%d", button->button);
         binding = stringAppend (binding, buttonStr);
     }

=== modified file 'compizconfig/libcompizconfig/src/compiz.cpp'
--- compizconfig/libcompizconfig/src/compiz.cpp	2012-07-03 06:50:34 +0000
+++ compizconfig/libcompizconfig/src/compiz.cpp	2012-07-30 14:34:37 +0000
@@ -343,12 +343,13 @@
 		 CCSSettingInfo * i,
 		 const OptionMetadata & option)
 {
-    int num, j;
+    int num;
 
     num = option.default_value_size ();
 
     if (num)
     {
+	int j;
 	for (j = 0; j < num; j++)
 	{
 	    CCSSettingValue *val;
@@ -409,7 +410,6 @@
 static void
 initIntInfoPB (CCSSettingInfo * i, const OptionMetadata & option)
 {
-    int num, j;
     i->forInt.min = std::numeric_limits <short>::min ();
     i->forInt.max = std::numeric_limits <short>::max ();
     i->forInt.desc = NULL;
@@ -422,7 +422,7 @@
 
     if (!basicMetadata)
     {
-	num = option.int_desc_size ();
+	int j, num = option.int_desc_size ();
 	for (j = 0; j < num; j++)
 	{
 	    const OptionMetadata::IntDescription & intDescMetadata =
@@ -468,7 +468,6 @@
 static void
 initStringInfoPB (CCSSettingInfo * i, const OptionMetadata & option)
 {
-    int num, j;
     i->forString.restriction = NULL;
     i->forString.sortStartsAt = -1;
     i->forString.extensible = FALSE;
@@ -481,7 +480,7 @@
 	if (option.has_sort_start ())
 	    i->forString.sortStartsAt = option.sort_start ();
 
-	num = option.str_restriction_size ();
+	int j, num = option.str_restriction_size ();
 	for (j = 0; j < num; j++)
 	{
 	    const OptionMetadata::StringRestriction &
@@ -746,14 +745,12 @@
 initOptionsFromPB (CCSPlugin * plugin,
 		   const PluginMetadata & pluginPB)
 {
-    int numOpt, i;
-
     if (pluginPB.has_screen ())
     {
 	const ScreenMetadata &screenPB = pluginPB.screen ();
 
 	// Screen options
-	numOpt = screenPB.option_size ();
+	int i, numOpt = screenPB.option_size ();
 	for (i = 0; i < numOpt; i++)
 	    addOptionFromPB (plugin,
 			     screenPB.group_desc (),
@@ -768,7 +765,7 @@
 {
     StringList::const_iterator it;
 
-    for (it = strings.begin (); it != strings.end (); it++)
+    for (it = strings.begin (); it != strings.end (); ++it)
     {
 	const char *value = (*it).c_str ();
 
@@ -1551,11 +1548,12 @@
 	       void * optionPBv)
 {
     xmlNode **nodes;
-    int num, j;
+    int num;
 
     nodes = getNodesFromXPath (node->doc, node, "value", &num);
     if (num)
     {
+	int j;
 	for (j = 0; j < num; j++)
 	{
 	    void *valuePBv = NULL;
@@ -1616,9 +1614,8 @@
 initIntInfo (CCSSettingInfo * i, xmlNode * node, void * optionPBv)
 {
     xmlNode **nodes;
-    char *name;
     char *value;
-    int num, j;
+    int num;
     i->forInt.min = std::numeric_limits <short>::min ();
     i->forInt.max = std::numeric_limits <short>::max ();
     i->forInt.desc = NULL;
@@ -1652,6 +1649,8 @@
 	nodes = getNodesFromXPath (node->doc, node, "desc", &num);
 	if (num)
 	{
+	    char *name;
+	    int j;
 	    for (j = 0; j < num; j++)
 	    {
 		value = getStringFromXPath (node->doc, nodes[j],
@@ -1751,9 +1750,7 @@
 initStringInfo (CCSSettingInfo * i, xmlNode * node, void * optionPBv)
 {
     xmlNode **nodes;
-    char *name;
-    char *value;
-    int num, j;
+    int num;
     i->forString.restriction = NULL;
     i->forString.sortStartsAt = -1;
     i->forString.extensible = FALSE;
@@ -1772,6 +1769,7 @@
 	nodes = getNodesFromXPath (node->doc, node, "sort", &num);
 	if (num)
 	{
+	    char *value;
 	    int val = 0; /* Start sorting at 0 unless otherwise specified. */
 
 	    value = getStringFromXPath (node->doc, nodes[0], "@start");
@@ -1794,6 +1792,8 @@
 	nodes = getNodesFromXPath (node->doc, node, "restriction", &num);
 	if (num)
 	{
+	    int j;
+	    char *name, *value;
 	    for (j = 0; j < num; j++)
 	    {
 #ifdef USE_PROTOBUF
@@ -2269,7 +2269,7 @@
 {
     xmlNode **nodes;
     xmlNode **optNodes;
-    int num, i;
+    int num;
     void *groupListPBv = NULL;
     void *subgroupListPBv = NULL;
 
@@ -2294,6 +2294,7 @@
 	 &num);
     if (num)
     {
+	int i;
 	for (i = 0; i < num; i++)
 	{
 	    void *optionPBv = NULL;
@@ -2326,11 +2327,12 @@
 		    void * stringListPBv)
 {
     xmlNode **nodes;
-    int num, i;
+    int num;
     nodes = getNodesFromXPath (node->doc, node, path, &num);
 
     if (num)
     {
+	int i;
 	for (i = 0; i < num; i++)
 	{
 	    char *value = stringFromNodeDef (nodes[i], "child::text()", NULL);

=== modified file 'gtk/window-decorator/events.c'
--- gtk/window-decorator/events.c	2012-05-26 10:13:26 +0000
+++ gtk/window-decorator/events.c	2012-07-30 14:34:37 +0000
@@ -440,11 +440,8 @@
 	     decor_event      *gtkwd_event,
 	     decor_event_type gtkwd_type)
 {
-    static int	  last_button_num = 0;
     static Window last_button_xwindow = None;
     static Time	  last_button_time = 0;
-    static int	  last_button_x = 0;
-    static int	  last_button_y = 0;
 
     decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
 
@@ -460,6 +457,9 @@
 
     if (gtkwd_event->button == 1)
     {
+	static int last_button_num = 0;
+	static int last_button_x = 0;
+	static int last_button_y = 0;
 	if (gtkwd_event->button == last_button_num		        &&
 	    gtkwd_event->window == last_button_xwindow		        &&
 	    gtkwd_event->time < last_button_time + double_click_timeout &&

=== modified file 'kde/window-decorator-kde4/window.cpp'
--- kde/window-decorator-kde4/window.cpp	2012-01-12 06:48:58 +0000
+++ kde/window-decorator-kde4/window.cpp	2012-07-30 14:34:37 +0000
@@ -1150,7 +1150,6 @@
     unsigned int    frameType = 0xffffff;
     unsigned int    frameState = 0;
     unsigned int    frameActions = 0;
-    int		    nQuad = 0;
     int             left, right, top, bottom, width, height;
     unsigned int    saveState;
     bool            allocated = false;
@@ -1204,6 +1203,7 @@
 
     if (mType != Normal2D)
     {
+      int nQuad = 0;
       if (!data)
       {
           allocated = true;

=== modified file 'plugins/animation/src/animation.cpp'
--- plugins/animation/src/animation.cpp	2012-05-25 04:06:13 +0000
+++ plugins/animation/src/animation.cpp	2012-07-30 14:34:37 +0000
@@ -596,10 +596,10 @@
     bool allRandom = optionGetAllRandom ();
     AnimEffectVector *randomEffects = &mRandomEffects[animEvent].effects;
     unsigned int nRandomEffects = randomEffects->size ();
-    unsigned int nFirstRandomEffect = 0;
 
     if ((effect == AnimEffectRandom) || allRandom)
     {
+	unsigned int nFirstRandomEffect = 0;
 	if (nRandomEffects == 0) // no random animation selected, assume "all"
 	{
 	    randomEffects = &mEventEffectsAllowed[animEvent];
@@ -978,7 +978,7 @@
 PrivateAnimScreen::eventMatchesChanged (CompOption                *opt,
 					AnimationOptions::Options num)
 {
-    if (mExtensionPlugins.size () == 0)
+    if (mExtensionPlugins.empty ())
 	initAnimationList ();
     foreach (CompOption::Value &val, opt->value ().list ())
 	val.match ().update ();
@@ -988,7 +988,7 @@
 PrivateAnimScreen::eventOptionsChanged (CompOption                *opt,
 					AnimationOptions::Options num)
 {
-    if (mExtensionPlugins.size () == 0)
+    if (mExtensionPlugins.empty ())
 	initAnimationList ();
     updateOptionSets (getCorrespondingAnimEvent (num));
 }
@@ -997,7 +997,7 @@
 PrivateAnimScreen::eventEffectsChanged (CompOption                *opt,
 					AnimationOptions::Options num)
 {
-    if (mExtensionPlugins.size () == 0)
+    if (mExtensionPlugins.empty ())
 	initAnimationList ();
     updateEventEffects (getCorrespondingAnimEvent (num), false);
 }
@@ -1006,7 +1006,7 @@
 PrivateAnimScreen::eventRandomEffectsChanged (CompOption                *opt,
 					      AnimationOptions::Options num)
 {
-    if (mExtensionPlugins.size () == 0)
+    if (mExtensionPlugins.empty ())
 	initAnimationList ();
     updateEventEffects (getCorrespondingAnimEvent (num), true);
 }
@@ -1267,7 +1267,7 @@
 
 	/* Paint list includes destroyed windows */
 	for (CompWindowList::const_reverse_iterator rit = pl.rbegin ();
-	     rit != pl.rend (); rit++)
+	     rit != pl.rend (); ++rit)
 	{
 	    CompWindow *w = (*rit);
 	    AnimWindow *animWin = AnimWindow::get (w);
@@ -1383,7 +1383,7 @@
 
     /* Paint list includes destroyed windows */
     for (CompWindowList::const_reverse_iterator rit = pl.rbegin ();
-	 rit != pl.rend (); rit++)
+	 rit != pl.rend (); ++rit)
     {
 	CompWindow *w = (*rit);
 	AnimWindow *animWin = AnimWindow::get (w);
@@ -2931,7 +2931,7 @@
 
     // Destroy each persistent data object
     PersistentDataMap::iterator itData = persistentData.begin ();
-    for (; itData != persistentData.end (); itData++)
+    for (; itData != persistentData.end (); ++itData)
 	delete itData->second;
 
     persistentData.clear ();

=== modified file 'plugins/animation/src/extensionplugin.cpp'
--- plugins/animation/src/extensionplugin.cpp	2011-09-15 09:54:32 +0000
+++ plugins/animation/src/extensionplugin.cpp	2012-07-30 14:34:37 +0000
@@ -149,7 +149,7 @@
 
     // Go in reverse order so that restack chains are handled properly
     for (CompWindowVector::reverse_iterator rit = mLastClientList.rbegin ();
-	 rit != mLastClientList.rend (); rit++)
+	 rit != mLastClientList.rend (); ++rit)
     {
 	CompWindow *w = (*rit);
 	AnimWindow *aw = AnimWindow::get (w);
@@ -227,7 +227,7 @@
     // Now initiate focus animations (after the restack chains are formed
     // right above)
     for (CompWindowVector::reverse_iterator rit = mLastClientList.rbegin ();
-	 rit != mLastClientList.rend (); rit++)
+	 rit != mLastClientList.rend (); ++rit)
     {
 	CompWindow *w = (*rit);
 	AnimWindow *aw = AnimWindow::get (w);
@@ -274,7 +274,7 @@
 
     // TODO consider removing this loop and skipPostPrepareScreen
     for (CompWindowVector::reverse_iterator rit = mLastClientList.rbegin ();
-	 rit != mLastClientList.rend (); rit++)
+	 rit != mLastClientList.rend (); ++rit)
     {
 	CompWindow *w = (*rit);
 	AnimWindow *aw = AnimWindow::get (w);

=== modified file 'plugins/animationaddon/src/burn.cpp'
--- plugins/animationaddon/src/burn.cpp	2010-01-26 03:40:28 +0000
+++ plugins/animationaddon/src/burn.cpp	2012-07-30 14:34:37 +0000
@@ -392,11 +392,11 @@
 	// force animation to continue until particle systems are done
 	mRemainingTime = timestep;
 
-    int nParticles;
     Particle *part;
 
     if (mRemainingTime > 0)
     {
+	int nParticles;
 	if (mHasSmoke)
 	{
 	    float partxg = outRect.width () / 40.0;

=== modified file 'plugins/annotate/src/annotate.cpp'
--- plugins/annotate/src/annotate.cpp	2012-06-24 10:12:15 +0000
+++ plugins/annotate/src/annotate.cpp	2012-07-30 14:34:37 +0000
@@ -779,12 +779,11 @@
 AnnoScreen::handleMotionEvent (int	  xRoot,
 		       	       int	  yRoot)
 {
-    static unsigned short clearColor[] = { 0, 0, 0, 0 };
-
     CompRect damageRect;
 
     if (grabIndex)
     {
+	static unsigned short clearColor[] = { 0, 0, 0, 0 };
 	switch (drawMode)
 	{
 	case EraseMode:

=== modified file 'plugins/ccp/src/ccp.cpp'
--- plugins/ccp/src/ccp.cpp	2012-07-03 06:22:53 +0000
+++ plugins/ccp/src/ccp.cpp	2012-07-30 14:34:37 +0000
@@ -193,7 +193,6 @@
     else
     {
 	CCSSettingValueList list;
-	int                 i = 0;
 	CompOption::Type    type;
 
 	ccsGetList (s, &list);
@@ -208,6 +207,7 @@
 	}
 	else
 	{
+	    int i = 0;
 	    CompOption::Value::Vector val (ccsSettingValueListLength (list));
 
 	    while (list)

=== modified file 'plugins/clone/src/clone.cpp'
--- plugins/clone/src/clone.cpp	2010-02-04 17:16:02 +0000
+++ plugins/clone/src/clone.cpp	2012-07-30 14:34:37 +0000
@@ -376,7 +376,7 @@
         }
         else
         {
-	    it++;
+	    ++it;
         }
     }
 
@@ -533,7 +533,7 @@
 {
     std::list <Clone *>::iterator it;
 
-    for (it = clones.begin (); it != clones.end (); it++)
+    for (it = clones.begin (); it != clones.end (); ++it)
     {
 	if ((unsigned int) (*it)->dst >= screen->outputDevs ().size () ||
 	    (unsigned int) (*it)->src >= screen->outputDevs ().size ())

=== modified file 'plugins/colorfilter/src/parser.cpp'
--- plugins/colorfilter/src/parser.cpp	2010-11-04 14:47:16 +0000
+++ plugins/colorfilter/src/parser.cpp	2012-07-30 14:34:37 +0000
@@ -149,7 +149,7 @@
 {
     CompString arg;
     CompString string;
-    size_t next, temp, orig;
+    size_t next, orig;
     int length;
     CompString retArg;
 
@@ -167,6 +167,7 @@
     if ((next = string.find (",", pos)) != std::string::npos ||
 	(next = string.find (";", pos)) != std::string::npos)
     {
+	size_t temp;
 	length = next - pos;
 	if (!length)
 	{

=== modified file 'plugins/compiztoolbox/src/compiztoolbox.cpp'
--- plugins/compiztoolbox/src/compiztoolbox.cpp	2012-01-18 16:26:45 +0000
+++ plugins/compiztoolbox/src/compiztoolbox.cpp	2012-07-30 14:34:37 +0000
@@ -267,7 +267,7 @@
     if (!grabIndex)
 	return NULL;
 
-    for (it = windows.begin (); it != windows.end (); it++, cur++)
+    for (it = windows.begin (); it != windows.end (); ++it, ++cur)
     {
 	if (*it == selectedWindow)
 	    break;
@@ -278,7 +278,7 @@
 
     if (toNext)
     {
-	it++;
+	++it;
 	if (it == windows.end ())
 	    w = windows.front ();
 	else

=== modified file 'plugins/composite/src/screen.cpp'
--- plugins/composite/src/screen.cpp	2012-06-24 10:01:31 +0000
+++ plugins/composite/src/screen.cpp	2012-07-30 14:34:37 +0000
@@ -573,7 +573,7 @@
 
 	for (CompWindowList::reverse_iterator rit =
 	     screen->windows ().rbegin ();
-	     rit != screen->windows ().rend (); rit++)
+	     rit != screen->windows ().rend (); ++rit)
 	    if (CompositeWindow::get (*rit)->overlayWindow ())
 	    {
 		tmpRegion -= (*rit)->region ();
@@ -770,7 +770,7 @@
 	{
 	    for (CompWindowList::reverse_iterator rit =
 		 screen->windows ().rbegin ();
-	         rit != screen->windows ().rend (); rit++)
+		 rit != screen->windows ().rend (); ++rit)
 	    {
 		CompWindow *w = (*rit);
 
@@ -800,7 +800,7 @@
 
 	Display *dpy = screen->dpy ();
 	std::map<Damage, XRectangle>::iterator d = priv->damages.begin ();
-	for (; d != priv->damages.end (); d++)
+	for (; d != priv->damages.end (); ++d)
 	{
 	    XserverRegion sub = XFixesCreateRegion (dpy, &d->second, 1);
 	    if (sub != None)

=== modified file 'plugins/cubeaddon/src/cubeaddon.cpp'
--- plugins/cubeaddon/src/cubeaddon.cpp	2012-05-18 06:52:20 +0000
+++ plugins/cubeaddon/src/cubeaddon.cpp	2012-07-30 14:34:37 +0000
@@ -611,12 +611,11 @@
 	int                i, oldVCount = geometry.vCount;
 	GLfloat            *v;
 	int                offX = 0, offY = 0;
-	int                sx1, sx2, sw, sy1, sy2, sh, cLast;
-	float              lastX, lastZ = 0.0, radSquare, last[2][4];
+	int                sx1, sx2, sw, sy1, sy2, sh;
+	float              radSquare, last[2][4];
 	float              inv = (cubeScreen->invert () == 1) ? 1.0 : -1.0;
 
-	float              a1, a2, ang, vpx, vpy, sx1g, sx2g, sy1g, sy2g;
-	int                iang;
+	float              ang, sx1g, sx2g, sy1g, sy2g;
 	
 	CubeScreen::MultioutputMode   cMOM = cubeScreen->multioutputMode ();
 	int                           caD = caScreen->optionGetDeformation ();
@@ -696,7 +695,7 @@
 
 	if (caD == CubeaddonScreen::DeformationCylinder || cubeScreen->unfolded ())
 	{
-	    lastX = -1000000000.0;
+	    float lastX = std::numeric_limits <float>::min (), lastZ = 0.0;
 	
 	    for (i = oldVCount; i < geometry.vCount; i++)
 	    {
@@ -728,7 +727,7 @@
 	    last[0][0] = -1000000000.0;
 	    last[1][0] = -1000000000.0;
 
-	    cLast = 0;
+	    int cLast = 0;
 	    for (i = oldVCount; i < geometry.vCount; i++)
 	    {
 		if (last[0][0] == v[0] && last[0][1] == v[1])
@@ -746,21 +745,21 @@
 		    continue;
 		}
 		
-		vpx = v[0] + offX;
-		vpy = v[1] + offY;
+		float vpx = v[0] + offX;
+		float vpy = v[1] + offY;
 		
 		if (vpx >= sx1g && vpx < sx2g &&
 		    vpy >= sy1g && vpy < sy2g)
 		{
 		    last[cLast][0] = v[0];
 		    last[cLast][1] = v[1];
-		    a1 = (((vpx - sx1) / (float)sw) - 0.5);
-		    a2 = (((vpy - sy1) / (float)sh) - 0.5);
+		    float a1 = (((vpx - sx1) / (float)sw) - 0.5);
+		    float a2 = (((vpy - sy1) / (float)sh) - 0.5);
 		    a2 *= a2;
 
 		    ang = atanf (a1 / cDist);
 		    a2 = sqrtf (radSquare - a2);
-		    iang = (((int)(ang * RAD2I1024)) + 1024) & 0x3ff;
+		    int iang = (((int)(ang * RAD2I1024)) + 1024) & 0x3ff;
 
 		    v[2] += ((caScreen->mCosT [iang] * a2) - cDist) * caScreen->mDeform * inv;
 		    v[0] += ((caScreen->mSinT [iang] * a2) - a1) * sw * caScreen->mDeform;
@@ -1001,8 +1000,8 @@
         mCapDeformType != optionGetDeformation ())
     {
 	float       *quad;
-	int         i, j;
-	float       rS, r, x, y, z, w;
+	int         j;
+	float       rS, r, x, y, z;
 	if (optionGetDeformation () != DeformationSphere ||
 	    !optionGetDeformCaps ())
 	{
@@ -1039,6 +1038,8 @@
 	}
 	else
 	{
+	    int i;
+	    float w;
 	    rS = cDist2 + 0.5;
 
 	    mCapFill[0] = 0.0;

=== modified file 'plugins/dbus/src/dbus.cpp'
--- plugins/dbus/src/dbus.cpp	2012-06-24 09:00:27 +0000
+++ plugins/dbus/src/dbus.cpp	2012-07-30 14:34:37 +0000
@@ -211,7 +211,7 @@
     CompPlugin::List::const_iterator it = plugins.begin ();
     if (it != plugins.end ())
     {
-	for (; it != plugins.end (); it++)
+	for (; it != plugins.end (); ++it)
 	{
 	    CompPlugin::VTable *v = it->vTable;
 	    if (v)

=== modified file 'plugins/decor/src/clip-groups/tests/clip-groups/src/test-decor-clip-groups.cpp'
--- plugins/decor/src/clip-groups/tests/clip-groups/src/test-decor-clip-groups.cpp	2012-03-30 14:29:18 +0000
+++ plugins/decor/src/clip-groups/tests/clip-groups/src/test-decor-clip-groups.cpp	2012-07-30 14:34:37 +0000
@@ -134,7 +134,7 @@
     const CompRect::vector &rv = reg.rects ();
     for (CompRect::vector::const_iterator it = rv.begin ();
 	 it != rv.end ();
-	 it++)
+	 ++it)
     {
 	const CompRect &r = *it;
 	*os << " - Rect : " << r.x () << " " << r.y () << " " << r.width () << " " << r.height () << std::endl;

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2012-07-09 11:09:28 +0000
+++ plugins/decor/src/decor.cpp	2012-07-30 14:34:37 +0000
@@ -609,7 +609,6 @@
     updateState (0),
     mPixmapReceiver (requestor, this)
 {
-    int		    left, right, top, bottom;
     int		    x1, y1, x2, y2;
 
     if (!texture && type == WINDOW_DECORATION_TYPE_PIXMAP)
@@ -620,10 +619,7 @@
 
     if (type == WINDOW_DECORATION_TYPE_PIXMAP)
     {
-	left   = 0;
-	right  = minWidth;
-	top    = 0;
-	bottom = minHeight;
+	int left = 0, right = minWidth, top = 0, bottom = minHeight;
 
 	for (unsigned int i = 0; i  < nQuad; i++)
 	{
@@ -835,7 +831,7 @@
 	    Decoration::Ptr d = Decoration::create (id, prop, n, type, i, requestor);
 
 	    /* Try to replace an existing decoration */
-	    for (; it != mList.end (); it++)
+	    for (; it != mList.end (); ++it)
 	    {
 		if ((*it)->frameType == d->frameType &&
 		    (*it)->frameState == d->frameState &&
@@ -884,7 +880,7 @@
 		std::list <Decoration::Ptr>::iterator it = mList.begin ();
 
 		/* Use an existing decoration */
-		for (; it != mList.end (); it++)
+		for (; it != mList.end (); ++it)
 		{
 		    if ((*it)->frameType == frameType &&
 			(*it)->frameState == frameState &&
@@ -1340,7 +1336,7 @@
 		cit = mList.begin ();
 
 	for (std::list <Decoration::Ptr>::iterator it = mList.begin ();
-	     it != mList.end (); it++)
+	     it != mList.end (); ++it)
 	{
 	    const Decoration::Ptr &d = *it;
 

=== modified file 'plugins/extrawm/src/extrawm.cpp'
--- plugins/extrawm/src/extrawm.cpp	2010-12-02 09:20:58 +0000
+++ plugins/extrawm/src/extrawm.cpp	2012-07-30 14:34:37 +0000
@@ -32,7 +32,7 @@
     std::list <CompWindow *>::iterator it;
 
     /* check if the window is already there */
-    for (it = attentionWindows.begin (); it != attentionWindows.end (); it++)
+    for (it = attentionWindows.begin (); it != attentionWindows.end (); ++it)
     {
 	if (*it == w)
 	    return;
@@ -90,7 +90,7 @@
 	 * again, and that would mean that we'd want to handle them
 	 * if they became wanting attention again) */
 
-	for (; it != es->attentionWindows.end (); it++)
+	for (; it != es->attentionWindows.end (); ++it)
 	{
 	    CompWindow *w = *it;
 

=== modified file 'plugins/ezoom/src/ezoom.cpp'
--- plugins/ezoom/src/ezoom.cpp	2012-05-18 06:52:20 +0000
+++ plugins/ezoom/src/ezoom.cpp	2012-07-30 14:34:37 +0000
@@ -1480,7 +1480,6 @@
 			  CompOption::Vector options,
 			  float		     target)
 {
-    int          x, y;
     int          out = screen->outputDeviceForPoint (pointerX, pointerY);
     CompWindow   *w;
 
@@ -1499,8 +1498,8 @@
     }
     else
     {
-        x = CompOption::getIntOptionNamed (options, "x", 0);
-        y = CompOption::getIntOptionNamed (options, "y", 0);
+        int x = CompOption::getIntOptionNamed (options, "x", 0);
+        int y = CompOption::getIntOptionNamed (options, "y", 0);
         setCenter (x, y, false);
     }
 

=== modified file 'plugins/firepaint/src/firepaint.cpp'
--- plugins/firepaint/src/firepaint.cpp	2010-10-23 15:42:02 +0000
+++ plugins/firepaint/src/firepaint.cpp	2012-07-30 14:34:37 +0000
@@ -453,7 +453,6 @@
 void
 FireScreen::preparePaint (int      time)
 {
-    float size = 4;
     float bg = (float) optionGetBgBrightness () / 100.0;
 
     if (init && points.size ())
@@ -485,7 +484,7 @@
 	float max_new = MIN ((int) ps.particles.size (),  (int) points.size () * 2) *
 			((float) time / 50.0) *
 			(1.05 -	optionGetFireLife());
-	float rVal;
+	float rVal, size = 4;
 	int rVal2;
 
 	for (unsigned int i = 0;

=== modified file 'plugins/grid/src/grid.cpp'
--- plugins/grid/src/grid.cpp	2012-05-27 04:32:55 +0000
+++ plugins/grid/src/grid.cpp	2012-07-30 14:34:37 +0000
@@ -447,7 +447,7 @@
     glDisableClientState (GL_TEXTURE_COORD_ARRAY);
     glEnable (GL_BLEND);
 
-	for (iter = animations.begin (); iter != animations.end () && animating; iter++)
+	for (iter = animations.begin (); iter != animations.end () && animating; ++iter)
 	{
 		Animation& anim = *iter;
 		float alpha = ((float) optionGetFillColorAlpha () / 65535.0f) * anim.opacity;
@@ -632,7 +632,6 @@
 {
     CompOutput out;
     CompWindow *w;
-    bool       check = false;
 
     screen->handleEvent (event);
 
@@ -696,6 +695,7 @@
 
     if (lastEdge != edge)
     {
+		bool check = false;
 		lastSlot = desiredSlot;
 
 		if (edge == NoEdge)
@@ -932,7 +932,7 @@
 {
 	std::vector<Animation>::iterator iter;
 
-	for (iter = animations.begin (); iter != animations.end (); iter++)
+	for (iter = animations.begin (); iter != animations.end (); ++iter)
 	{
 		Animation& anim = *iter;
 		anim.timer -= msSinceLastPaint;
@@ -972,7 +972,7 @@
 		if (anim.complete)
 			iter = animations.erase(iter);
 		else
-			iter++;
+			++iter;
 	}
 
 	if (animations.empty ())

=== modified file 'plugins/group/src/group.cpp'
--- plugins/group/src/group.cpp	2012-05-18 06:52:20 +0000
+++ plugins/group/src/group.cpp	2012-07-30 14:34:37 +0000
@@ -318,7 +318,7 @@
 	if ((w->id () != top->id ()) && (gw->mGroup == this))
 	{
 	    (*it) = w;
-	    it++;
+	    ++it;
 	}
     }
 

=== modified file 'plugins/group/src/init.cpp'
--- plugins/group/src/init.cpp	2012-05-27 04:32:55 +0000
+++ plugins/group/src/init.cpp	2012-07-30 14:34:37 +0000
@@ -185,7 +185,7 @@
 	    }
 	}
 
-	rit++;
+	++rit;
     }
 
     return false;
@@ -298,7 +298,7 @@
 	bool topIdInGroup = false;
 	for (std::list <Window>::iterator it = group->mWindowIds.begin ();
 	     it != group->mWindowIds.end ();
-	     it++)
+	     ++it)
 	{
 	    CompWindow *w = screen->findWindow (*it);
 
@@ -493,7 +493,7 @@
 		{
 		    GroupTabBarSlot *slot = *rit;
 		    delete slot;
-		    rit--;
+		    --rit;
 		}
 
 		group->mTabBar->mSlots.clear ();
@@ -502,7 +502,7 @@
 	    }
 
 	    delete group;
-	    rit++;
+	    ++rit;
 	}
     }
 

=== modified file 'plugins/group/src/paint.cpp'
--- plugins/group/src/paint.cpp	2011-03-14 15:58:39 +0000
+++ plugins/group/src/paint.cpp	2012-07-30 14:34:37 +0000
@@ -588,7 +588,7 @@
 	/* groupDrawTabAnimation may delete the group, so better
 	   save the pointer to the next chain element */
 
-	it++;
+	++it;
 
 	if (group->mTabbingState != GroupSelection::NoTabbing)
 	    keepPainting |= group->drawTabAnimation (msSinceLastPaint);

=== modified file 'plugins/group/src/selection.cpp'
--- plugins/group/src/selection.cpp	2010-11-05 07:44:58 +0000
+++ plugins/group/src/selection.cpp	2012-07-30 14:34:37 +0000
@@ -120,14 +120,14 @@
 	     */
 	    if (gw->mGroup && groupFindGroupInWindows (gw->mGroup, *ret))
 	    {
-		rit++;
+		++rit;
 		continue;
 	    }
 
 	    ret->push_back (w);
 	}
 
-	rit++;
+	++rit;
     }
 
     return ret;
@@ -186,7 +186,7 @@
 	}
 
 	(*it) = cw;
-	it++;
+	++it;
     }
 }
 
@@ -317,7 +317,7 @@
 	    GroupScreen::get (screen)->mGroups.push_front (group);
 	}
 
-        for (; it != end (); it++)
+        for (; it != end (); ++it)
         {
 	    cw = *it;
 	    GROUP_WINDOW (cw);

=== modified file 'plugins/group/src/tab.cpp'
--- plugins/group/src/tab.cpp	2012-05-18 06:52:20 +0000
+++ plugins/group/src/tab.cpp	2012-07-30 14:34:37 +0000
@@ -983,7 +983,7 @@
     /* Move all windows to their animation target position */
     for (CompWindowList::iterator it = mWindows.begin ();
 	 it != mWindows.end ();
-	 it++)
+	 ++it)
     {
 	CompWindow *w = *it;
 	GROUP_WINDOW (w);
@@ -1850,11 +1850,11 @@
 	/* Count from left to the current top tab */
 	if (group->mTabBar->mTopTab)
 	    for (; (*it) && ((*it) != group->mTabBar->mTopTab);
-		 it++, distanceOld++);
+		 ++it, distanceOld++);
 
 	/* Count from left to the requested top tab */
 	for (it = group->mTabBar->mSlots.begin (); (*it) && ((*it) != topTab);
-	     it++, distanceNew++);
+	     ++it, distanceNew++);
 
 	if (distanceNew < distanceOld)
 	    group->mTabBar->mChangeAnimationDirection = 1;   /*left */

=== modified file 'plugins/loginout/src/loginout.cpp'
--- plugins/loginout/src/loginout.cpp	2010-04-29 03:30:17 +0000
+++ plugins/loginout/src/loginout.cpp	2012-07-30 14:34:37 +0000
@@ -171,7 +171,7 @@
 void
 LoginoutScreen::preparePaint (int        ms)
 {
-    float val, val2;
+    float val;
 
     val = ((float)ms / 1000.0) / optionGetInTime ();
 
@@ -190,7 +190,7 @@
     if (in > 0.0 || out > 0.0)
     {
 	val  = (in * optionGetInOpacity () / 100.0) + (1.0 - in);
-	val2 = (out * optionGetOutOpacity () / 100.0) + (1.0 - out);
+	float val2 = (out * optionGetOutOpacity () / 100.0) + (1.0 - out);
 	opacity = MIN (val, val2);
 
 	val  = (in * optionGetInSaturation () / 100.0) + (1.0 - in);

=== modified file 'plugins/mousepoll/src/mousepoll.cpp'
--- plugins/mousepoll/src/mousepoll.cpp	2009-03-16 05:20:59 +0000
+++ plugins/mousepoll/src/mousepoll.cpp	2012-07-30 14:34:37 +0000
@@ -60,8 +60,8 @@
         for (it = pollers.begin (); it != pollers.end (); )
         {
             MousePoller *poller = *it;
- 
-            it++;
+
+            ++it;
             poller->mPoint = pos;
             poller->mCallback (pos);
         }

=== modified file 'plugins/opengl/src/fragment.cpp'
--- plugins/opengl/src/fragment.cpp	2012-01-18 16:26:45 +0000
+++ plugins/opengl/src/fragment.cpp	2012-07-30 14:34:37 +0000
@@ -1050,7 +1050,7 @@
 
 	    it = s->fragmentStorage ()->programs.begin ();
 
-	    for (; it != s->fragmentStorage ()->programs.end (); it++)
+	    for (; it != s->fragmentStorage ()->programs.end (); ++it)
 	    {
 		foreach (FunctionId i, (*it)->signature)
 		    if (i == id)

=== modified file 'plugins/opengl/src/paint.cpp'
--- plugins/opengl/src/paint.cpp	2012-04-14 06:36:49 +0000
+++ plugins/opengl/src/paint.cpp	2012-07-30 14:34:37 +0000
@@ -244,7 +244,7 @@
     if (!(mask & PAINT_SCREEN_NO_OCCLUSION_DETECTION_MASK))
     {
 	/* detect occlusions */
-	for (rit = pl.rbegin (); rit != pl.rend (); rit++)
+	for (rit = pl.rbegin (); rit != pl.rend (); ++rit)
 	{
 	    w = (*rit);
 	    gw = GLWindow::get (w);

=== modified file 'plugins/place/src/place.cpp'
--- plugins/place/src/place.cpp	2012-06-24 09:00:27 +0000
+++ plugins/place/src/place.cpp	2012-07-30 14:34:37 +0000
@@ -959,7 +959,7 @@
     winHeight = window->serverHeight ();
 
     cascadeStage = 0;
-    for (iter = sorted.begin (); iter != sorted.end (); iter++)
+    for (iter = sorted.begin (); iter != sorted.end (); ++iter)
     {
 	Placeable  *p = *iter;
 	int        wx, wy;

=== modified file 'plugins/place/src/screen-size-change/src/screen-size-change.cpp'
--- plugins/place/src/screen-size-change/src/screen-size-change.cpp	2012-01-21 17:16:07 +0000
+++ plugins/place/src/screen-size-change/src/screen-size-change.cpp	2012-07-30 14:34:37 +0000
@@ -37,7 +37,7 @@
 compiz::place::ScreenSizeChangeObject::adjustForSize (const CompSize &oldSize,
 						      const CompSize &newSize)
 {
-    int            vpX, vpY, shiftX, shiftY;
+    int            vpX, vpY;
     compiz::window::Geometry g, vpRelRect;
     int		   pivotX, pivotY;
     int		   curVpOffsetX = getViewport ().x () * newSize.width ();
@@ -92,8 +92,8 @@
 
 	g.setPos (g.pos ());
 
-	shiftX = vpX * (newSize.width () - oldSize.width ());
-	shiftY = vpY * (newSize.width () - oldSize.height ());
+	int shiftX = vpX * (newSize.width () - oldSize.width ()),
+	    shiftY = vpY * (newSize.width () - oldSize.height ());
 
 	/* if coords. relative to viewport are outside new viewport area,
 	   shift window left/up so that it falls inside */

=== modified file 'plugins/resize/src/resize.cpp'
--- plugins/resize/src/resize.cpp	2012-04-19 12:06:05 +0000
+++ plugins/resize/src/resize.cpp	2012-07-30 14:34:37 +0000
@@ -1043,7 +1043,6 @@
 
 	if (isConstrained)
 	{
-	    int minWidth  = 50;
 	    int minHeight = 50;
 
 	    /* rect. for a minimal height window + borders
@@ -1083,6 +1082,7 @@
 		int nx = x;
 		int nw = wi;
 		int nh = he;
+		int minWidth  = 50;
 
 		if (mask & (ResizeLeftMask | ResizeRightMask))
 		{
@@ -1304,20 +1304,19 @@
 			}
 			else
 			{
-			    static unsigned int mask[] = {
-				ResizeUpMask | ResizeLeftMask,
-				ResizeUpMask,
-				ResizeUpMask | ResizeRightMask,
-				ResizeRightMask,
-				ResizeDownMask | ResizeRightMask,
-				ResizeDownMask,
-				ResizeDownMask | ResizeLeftMask,
-				ResizeLeftMask,
-			    };
-
 			    /* TODO: not only button 1 */
 			    if (pointerMods & Button1Mask)
 			    {
+				static unsigned int mask[] = {
+				    ResizeUpMask | ResizeLeftMask,
+				    ResizeUpMask,
+				    ResizeUpMask | ResizeRightMask,
+				    ResizeRightMask,
+				    ResizeDownMask | ResizeRightMask,
+				    ResizeDownMask,
+				    ResizeDownMask | ResizeLeftMask,
+				    ResizeLeftMask,
+				};
 				o.push_back (CompOption ("modifiers",
 					     CompOption::TypeInt));
 				o.push_back (CompOption ("x",

=== modified file 'plugins/ring/src/ring.cpp'
--- plugins/ring/src/ring.cpp	2011-02-23 20:59:45 +0000
+++ plugins/ring/src/ring.cpp	2012-07-30 14:34:37 +0000
@@ -221,14 +221,14 @@
 		     unsigned int	       mask)
 {
     bool       status;
-    bool       pixmap = true;
 
     RING_SCREEN (screen);
 
     if (rs->mState != RingScreen::RingStateNone)
     {
 	GLWindowPaintAttrib sAttrib = attrib;
-	bool		  scaled = false;
+	bool scaled = false;
+	bool pixmap = true;
 
     	if (window->mapNum ())
 	{
@@ -784,7 +784,7 @@
 	    mState == RingScreen::RingStateOut)
 	{
 	    for (std::vector <RingDrawSlot>::iterator it = mDrawSlots.begin ();
-		 it != mDrawSlots.end (); it++)
+		 it != mDrawSlots.end (); ++it)
 	    {
 		CompWindow *w = (*it).w;
 
@@ -1116,12 +1116,12 @@
 
 		if (w == selected)
 		{
-		    it++;
+		    ++it;
 		    if (it != mWindows.end ())
 			selected = *it;
     		    else
 			selected = mWindows.front ();
-		    it--;
+		    --it;
 
 		    mSelectedWindow = selected;
 		    renderWindowTitle ();
@@ -1130,7 +1130,7 @@
 		mWindows.erase (it);
 		break;
 	    }
-	    it++;
+	    ++it;
 	}
 
 	if (!inList)

=== modified file 'plugins/scale/src/scale.cpp'
--- plugins/scale/src/scale.cpp	2012-06-22 10:10:44 +0000
+++ plugins/scale/src/scale.cpp	2012-07-30 14:34:37 +0000
@@ -770,7 +770,7 @@
     windows.clear ();
 
     for (std::map<ScaleWindow *, ScaleSlot>::iterator it = slotWindows.begin ();
-	 it != slotWindows.end (); it++)
+	 it != slotWindows.end (); ++it)
     {
 	slots.push_back (it->second);
 	windows.push_back (it->first);
@@ -949,7 +949,7 @@
     int                              x1, y1, x2, y2;
     CompWindowList::reverse_iterator rit = screen->windows ().rbegin ();
 
-    for (; rit != screen->windows ().rend (); rit++)
+    for (; rit != screen->windows ().rend (); ++rit)
     {
 	CompWindow *w = *rit;
 	SCALE_WINDOW (w);

=== modified file 'plugins/session/src/session.cpp'
--- plugins/session/src/session.cpp	2012-05-18 06:52:20 +0000
+++ plugins/session/src/session.cpp	2012-07-30 14:34:37 +0000
@@ -200,12 +200,11 @@
 			      const char *prop)
 {
     xmlChar *temp;
-    int     num;
 
     temp = xmlGetProp (node, BAD_CAST prop);
     if (temp)
     {
-	num = xmlXPathCastStringToNumber (temp);
+	int num = xmlXPathCastStringToNumber (temp);
 	xmlFree (temp);
 
 	return num;
@@ -267,7 +266,6 @@
 {
     CompString clientId, command, string;
     CompString resName, resClass;
-    int        x, y, width, height;
     xmlNodePtr node, childNode;
 
     if (!getClientLeaderProperty (w, clientIdAtom, clientId) &&
@@ -308,8 +306,8 @@
     childNode = xmlNewChild (node, NULL, BAD_CAST "geometry", NULL);
     if (childNode)
     {
-	x = (w->saveMask () & CWX) ? w->saveWc ().x : w->serverX ();
-	y = (w->saveMask () & CWY) ? w->saveWc ().y : w->serverY ();
+	int x = (w->saveMask () & CWX) ? w->saveWc ().x : w->serverX ();
+	int y = (w->saveMask () & CWY) ? w->saveWc ().y : w->serverY ();
 	if (!w->onAllViewports ())
 	{
 	    x += screen->vp ().x () * screen->width ();
@@ -319,9 +317,9 @@
 	x -= w->border ().left;
 	y -= w->border ().top;
 
-	width  = (w->saveMask () & CWWidth) ? w->saveWc ().width :
+	int width  = (w->saveMask () & CWWidth) ? w->saveWc ().width :
 			                  w->serverWidth ();
-	height = (w->saveMask () & CWHeight) ? w->saveWc ().height :
+	int height = (w->saveMask () & CWHeight) ? w->saveWc ().height :
 			                   w->serverHeight ();
 
 	addIntegerPropToNode (childNode, "x", x);
@@ -502,7 +500,7 @@
     getWindowTitle (w->id (), title);
     getTextProperty (w->id (), roleAtom, role);
 
-    for (item = items.begin (); item != items.end (); item++)
+    for (item = items.begin (); item != items.end (); ++item)
     {
 	if (!clientId.empty () && clientId == item->clientId)
 	{

=== modified file 'plugins/shift/src/shift.cpp'
--- plugins/shift/src/shift.cpp	2011-03-14 15:56:53 +0000
+++ plugins/shift/src/shift.cpp	2012-07-30 14:34:37 +0000
@@ -1162,7 +1162,6 @@
 	if (optionGetReflection ())
 	{
 	    GLMatrix	   rTransform = sTransform;
-	    unsigned short color[4];
 	    int            cull, cullInv;
 	    glGetIntegerv (GL_CULL_FACE_MODE, &cull);
 	    cullInv = (cull == GL_BACK)? GL_FRONT : GL_BACK;
@@ -1223,6 +1222,7 @@
 
 	    if (optionGetGroundSize () > 0.0)
 	    {
+		unsigned short color[4];
 		glBegin (GL_QUADS);
 		color[0] = optionGetGroundColor1 ()[0];
 		color[1] = optionGetGroundColor1 ()[1];
@@ -1452,13 +1452,14 @@
 		CompWindow *w;
 
 		CompWindow *pw = NULL;
-		int i;
 
 		mState = ShiftStateIn;
 		mMoreAdjust = true;
 		cScreen->damageScreen ();
 
 		if (!mCancelled && mMvTarget != 0)
+		{
+		    int i;
 		    for (i = 0; i < mNSlots; i++)
 		    {
 			w = mDrawSlots[i].w;
@@ -1472,6 +1473,7 @@
 			    pw = w;
 			}
 		    }
+		}
 
 		if (!mCancelled && mSelectedWindow)
 		{

=== modified file 'plugins/snap/src/snap.cpp'
--- plugins/snap/src/snap.cpp	2012-05-18 06:52:20 +0000
+++ plugins/snap/src/snap.cpp	2012-07-30 14:34:37 +0000
@@ -201,7 +201,7 @@
 	    {
 		if (e->id == w->id ())
 		    e->passed = true;
-		it++;
+		++it;
 		continue;
 	    }
 
@@ -244,7 +244,7 @@
 	    }
 	    else
 	    {
-		it++;
+		++it;
 	    }
 	}
     }
@@ -289,7 +289,7 @@
 
 	    if (!e->screenEdge)
 	    {
-		it++;
+		++it;
 		continue;
 	    }
 
@@ -330,7 +330,7 @@
 	    }
 	    else
 	    {
-		it++;
+		++it;
 	    }
 	}
     }

=== modified file 'plugins/staticswitcher/src/staticswitcher.cpp'
--- plugins/staticswitcher/src/staticswitcher.cpp	2011-03-14 15:50:29 +0000
+++ plugins/staticswitcher/src/staticswitcher.cpp	2012-07-30 14:34:37 +0000
@@ -553,20 +553,20 @@
 
 		if (w == selected)
 		{
-		    it++;
+		    ++it;
 		    if (it == windows.end ())
 			selected = windows.front ();
 		    else
 			selected = *it;
-		    it--;
+		    --it;
 		}
 
 		CompWindowList::iterator del = it;
-		it++;
+		++it;
 		windows.erase (del);
 	    }
 	    else
-		it++;
+		++it;
 	}
 
 	if (!inList)

=== modified file 'plugins/switcher/src/switcher.cpp'
--- plugins/switcher/src/switcher.cpp	2012-01-25 09:20:47 +0000
+++ plugins/switcher/src/switcher.cpp	2012-07-30 14:34:37 +0000
@@ -480,7 +480,7 @@
 	    if (w == windows.back ())
 		newSelected = windows.begin ();
 	    else
-		newSelected++;
+		++newSelected;
 
 	    selected = *newSelected;
 	}

=== modified file 'plugins/td/src/3d.cpp'
--- plugins/td/src/3d.cpp	2010-10-23 15:42:55 +0000
+++ plugins/td/src/3d.cpp	2012-07-30 14:34:37 +0000
@@ -390,7 +390,7 @@
 	pl = cScreen->getWindowPaintList ();
 
 	/* paint all windows from bottom to top */
-	for (it = pl.begin (); it != pl.end (); it++)
+	for (it = pl.begin (); it != pl.end (); ++it)
 	{
 	    CompWindow *w = (*it);
 	    tdw = TdWindow::get (w);

=== modified file 'plugins/trailfocus/src/trailfocus.cpp'
--- plugins/trailfocus/src/trailfocus.cpp	2010-05-06 15:34:05 +0000
+++ plugins/trailfocus/src/trailfocus.cpp	2012-07-30 14:34:37 +0000
@@ -121,7 +121,7 @@
     if (!isTrailfocusWindow (w))
 	return false;
 
-    for (iter = windows.begin (); iter != windows.end (); iter++)
+    for (iter = windows.begin (); iter != windows.end (); ++iter)
 	if ((*iter)->window->id () == id)
 	    break;
 
@@ -152,7 +152,7 @@
     int                    distance, bestDist = 1000000;
     unsigned int           i;
 
-    for (iter = windows.begin (); iter != windows.end (); iter++)
+    for (iter = windows.begin (); iter != windows.end (); ++iter)
 	if (*iter == tw)
 	    break;
 

=== modified file 'plugins/wall/src/offset_movement/src/offset-movement.cpp'
--- plugins/wall/src/offset_movement/src/offset-movement.cpp	2012-06-24 09:00:27 +0000
+++ plugins/wall/src/offset_movement/src/offset-movement.cpp	2012-07-30 14:34:37 +0000
@@ -45,7 +45,7 @@
 
     for (std::vector <CompRect>::const_iterator it = rects.begin ();
 	 it != rects.end ();
-	 it++)
+	 ++it)
     {
 	const CompRect &r = *it;
 

=== modified file 'plugins/wobbly/src/wobbly.cpp'
--- plugins/wobbly/src/wobbly.cpp	2012-04-19 12:06:05 +0000
+++ plugins/wobbly/src/wobbly.cpp	2012-07-30 14:34:37 +0000
@@ -34,9 +34,9 @@
 void
 WobblyWindow::findNextWestEdge (Object *object)
 {
-    int v, v1, v2;
-    int s, start;
-    int e, end;
+    int v1, v2;
+    int start;
+    int end;
     int x;
     int output;
     int workAreaEdge;
@@ -56,6 +56,7 @@
 
     if (x >= workAreaEdge)
     {
+	int v, s, e;
 	v1 = workAreaEdge;
 
 	foreach (CompWindow *p, ::screen->windows ())
@@ -142,9 +143,9 @@
 void
 WobblyWindow::findNextEastEdge (Object *object)
 {
-    int v, v1, v2;
-    int s, start;
-    int e, end;
+    int v1, v2;
+    int start;
+    int end;
     int x;
     int output;
     int workAreaEdge;
@@ -164,6 +165,7 @@
 
     if (x <= workAreaEdge)
     {
+	int v, s, e;
 	v1 = workAreaEdge;
 
 	foreach (CompWindow *p, ::screen->windows ())
@@ -249,9 +251,9 @@
 void
 WobblyWindow::findNextNorthEdge (Object *object)
 {
-    int v, v1, v2;
-    int s, start;
-    int e, end;
+    int v1, v2;
+    int start;
+    int end;
     int y;
     int output;
     int workAreaEdge;
@@ -271,6 +273,7 @@
 
     if (y >= workAreaEdge)
     {
+	int v, s, e;
 	v1 = workAreaEdge;
 
 	foreach (CompWindow *p, ::screen->windows ())
@@ -356,9 +359,9 @@
 void
 WobblyWindow::findNextSouthEdge (Object *object)
 {
-    int v, v1, v2;
-    int s, start;
-    int e, end;
+    int v1, v2;
+    int start;
+    int end;
     int y;
     int output;
     int workAreaEdge;
@@ -378,6 +381,7 @@
 
     if (y <= workAreaEdge)
     {
+	int v, s, e;
 	v1 = workAreaEdge;
 
 	foreach (CompWindow *p, ::screen->windows ())
@@ -2141,7 +2145,6 @@
 	if (ensureModel ())
 	{
 	    Spring *s;
-	    int	   i;
 
 	    if (wScreen->optionGetMaximizeEffect ())
 	    {
@@ -2207,6 +2210,7 @@
 
 	    if (wScreen->optionGetGrabWindowMatch ().evaluate (window))
 	    {
+		int i;
 		for (i = 0; i < model->numSprings; i++)
 		{
 		    s = &model->springs[i];

=== modified file 'src/event.cpp'
--- src/event.cpp	2012-06-24 09:00:27 +0000
+++ src/event.cpp	2012-07-30 14:34:37 +0000
@@ -2005,7 +2005,7 @@
 					if (sibling)
 					{
 					    for (CompWindowList::reverse_iterator rit = windowsLostFocus.rbegin ();
-						 rit != windowsLostFocus.rend (); rit++)
+						 rit != windowsLostFocus.rend (); ++rit)
 					    {
 						(*rit)->restackAbove (sibling);
 					    }

=== modified file 'src/match.cpp'
--- src/match.cpp	2012-04-24 16:39:22 +0000
+++ src/match.cpp	2012-07-30 14:34:37 +0000
@@ -236,8 +236,8 @@
 		break;
 	}
 
-	it1++;
-	it2++;
+	++it1;
+	++it2;
     }
 
     return true;

=== modified file 'src/plugin.cpp'
--- src/plugin.cpp	2012-06-24 09:00:27 +0000
+++ src/plugin.cpp	2012-07-30 14:34:37 +0000
@@ -279,7 +279,7 @@
     CompWindow               *w;
 
     it = fail = windowManager.begin ();
-    for (;it != windowManager.end (); it++)
+    for (;it != windowManager.end (); ++it)
     {
 	w = *it;
 	if (!p->vTable->initWindow (w))
@@ -294,7 +294,7 @@
     }
 
     it = windowManager.begin ();
-    for (;it != fail; it++)
+    for (;it != fail; ++it)
     {
 	w = *it;
 	p->vTable->finiWindow (w);
@@ -331,7 +331,7 @@
 	if (p->vTable->initScreen (s))
 	    s->initPluginForScreen (p);
 
-	it++;
+	++it;
     }
 
     return true;

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-06-24 09:00:27 +0000
+++ src/screen.cpp	2012-07-30 14:34:37 +0000
@@ -226,7 +226,7 @@
 {
     std::list<CompFileWatch *>::iterator it;
 
-    for (it = fileWatch.begin (); it != fileWatch.end (); it++)
+    for (it = fileWatch.begin (); it != fileWatch.end (); ++it)
 	if ((*it)->handle == handle)
 	    break;
 
@@ -333,7 +333,7 @@
     CompWatchFd *			w;
 
     for (it = watchFds.begin();
-	 it != watchFds.end (); it++)
+	 it != watchFds.end (); ++it)
     {
 	if ((*it)->mHandle == handle)
 	    break;
@@ -1026,7 +1026,7 @@
 	bool skip = false;
 
 	for (iterator it = initialPlugins.begin(); it != initialPlugins.end();
-		it++)
+		++it)
 	{
 	    if ((*it) == opt.s())
 	    {
@@ -1151,7 +1151,6 @@
 #define N_TARGETS 4
 
     Atom conversionTargets[N_TARGETS];
-    long icccmVersion[] = { 2, 0 };
 
     conversionTargets[0] = Atoms::targets;
     conversionTargets[1] = Atoms::multiple;
@@ -1167,9 +1166,12 @@
 			 XA_INTEGER, 32, PropModeReplace,
 			 (unsigned char *) &time, 1);
     else if (target == Atoms::version)
+    {
+	long icccmVersion[] = { 2, 0 };
 	XChangeProperty (dpy, w, property,
 			 XA_INTEGER, 32, PropModeReplace,
 			 (unsigned char *) icccmVersion, 2);
+    }
     else
 	return false;
 
@@ -2228,7 +2230,7 @@
 
     std::list<CompStartupSequence *>::iterator it = startupSequences.begin ();
 
-    for (; it != startupSequences.end (); it++)
+    for (; it != startupSequences.end (); ++it)
     {
 	if ((*it)->sequence == sequence)
 	{
@@ -2938,7 +2940,7 @@
 	{
 	    break;
 	}
-	it++;
+	++it;
     }
 
     if (it == windows.end ())
@@ -3002,7 +3004,7 @@
 	{
 	    break;
 	}
-	it++;
+	++it;
     }
 
     if (it == serverWindows.end ())
@@ -3225,7 +3227,7 @@
 
     std::list<cps::Grab *>::iterator it;
 
-    for (it = privateScreen.eventManager.grabsBegin (); it != privateScreen.eventManager.grabsEnd (); it++)
+    for (it = privateScreen.eventManager.grabsBegin (); it != privateScreen.eventManager.grabsEnd (); ++it)
     {
 	va_start (ap, first);
 
@@ -3369,7 +3371,7 @@
 
     mask = modHandler->virtualToRealModMask (key.modifiers ());
 
-    for (it = keyGrabs.begin (); it != keyGrabs.end (); it++)
+    for (it = keyGrabs.begin (); it != keyGrabs.end (); ++it)
     {
 	if (key.keycode () == (*it).keycode &&
 	    mask           == (*it).modifiers)
@@ -3404,7 +3406,7 @@
 
     mask = modHandler->virtualToRealModMask (key.modifiers ());
 
-    for (it = keyGrabs.begin (); it != keyGrabs.end (); it++)
+    for (it = keyGrabs.begin (); it != keyGrabs.end (); ++it)
     {
 	if (key.keycode () == (*it).keycode &&
 	    mask           == (*it).modifiers)
@@ -3436,7 +3438,7 @@
 
     XUngrabKey (screen->dpy(), AnyKey, AnyModifier, screen->root());
 
-    for (it = keyGrabs.begin (); it != keyGrabs.end (); it++)
+    for (it = keyGrabs.begin (); it != keyGrabs.end (); ++it)
     {
 	if (!((*it).modifiers & CompNoMask))
 	{
@@ -3452,7 +3454,7 @@
     ButtonGrab                      newButtonGrab;
     std::list<ButtonGrab>::iterator it;
 
-    for (it = buttonGrabs.begin (); it != buttonGrabs.end (); it++)
+    for (it = buttonGrabs.begin (); it != buttonGrabs.end (); ++it)
     {
 	if (button.button ()    == (*it).button &&
 	    button.modifiers () == (*it).modifiers)
@@ -3510,7 +3512,7 @@
 {
     std::list<ButtonGrab>::iterator it;
 
-    for (it = buttonGrabs.begin (); it != buttonGrabs.end (); it++)
+    for (it = buttonGrabs.begin (); it != buttonGrabs.end (); ++it)
     {
 	if (button.button ()    == (*it).button &&
 	    button.modifiers () == (*it).modifiers)

=== modified file 'src/stackdebugger.cpp'
--- src/stackdebugger.cpp	2012-06-24 09:00:27 +0000
+++ src/stackdebugger.cpp	2012-07-30 14:34:37 +0000
@@ -81,7 +81,7 @@
     /* Find the toplevel window in the list and remove it */
     for (CompWindowList::iterator it = mLastServerWindows.begin ();
 	 it != mLastServerWindows.end ();
-	 it++)
+	 ++it)
     {
 	if ((*it)->id () == id)
 	{
@@ -105,7 +105,7 @@
     {
 	for (CompWindowList::iterator it = mLastServerWindows.begin ();
 	     it != mLastServerWindows.end ();
-	     it++)
+	     ++it)
 	{
 	    if (sibling == (*it)->id () ||
 		sibling == (*it)->frame ())
@@ -153,7 +153,7 @@
     while (it != mEvents.end ())
     {
 	mFetchXEvent->getNextXEvent ((*it));
-	it++;
+	++it;
     }
 
     XSync (mDpy, FALSE);
@@ -249,10 +249,10 @@
 	    err = true;
 
 	if (lrrit != windows.rend ())
-	    lrrit++;
+	    ++lrrit;
 
 	if (lsrit != mLastServerWindows.rend())
-	    lsrit++;
+	    ++lsrit;
 
 	if (i != serverSideWindows.size ())
 	    i++;
@@ -335,7 +335,7 @@
 
     /* go backwards down the stack */
     for (CompWindowList::reverse_iterator rit = serverWindows.rbegin ();
-	 rit != serverWindows.rend (); rit++)
+	 rit != serverWindows.rend (); ++rit)
     {
 	CompWindow *w = (*rit);
 

=== modified file 'src/timer/src/timeouthandler.cpp'
--- src/timer/src/timeouthandler.cpp	2012-04-12 06:50:42 +0000
+++ src/timer/src/timeouthandler.cpp	2012-07-30 14:34:37 +0000
@@ -55,7 +55,7 @@
     if (it != priv->mTimers.end ())
 	return;
 
-    for (it = priv->mTimers.begin (); it != priv->mTimers.end (); it++)
+    for (it = priv->mTimers.begin (); it != priv->mTimers.end (); ++it)
     {
 	if (timer->minTime () < (*it)->minLeft ())
 	    break;

=== modified file 'src/timer/src/timer.cpp'
--- src/timer/src/timer.cpp	2012-01-20 17:50:31 +0000
+++ src/timer/src/timer.cpp	2012-07-30 14:34:37 +0000
@@ -109,7 +109,7 @@
 		break;
 	    if (t->maxLeft () < (unsigned int) timeout)
 		timeout = (int) t->maxLeft ();
-	    it++;
+	    ++it;
 	}
     }
     else
@@ -152,7 +152,7 @@
     }
 
     std::list<CompTimer*>::const_iterator i = requeue.begin ();
-    for (; i != requeue.end (); i++)
+    for (; i != requeue.end (); ++i)
     {
 	CompTimer *t = *i;
 	handler->addTimer (t);

=== modified file 'src/timer/tests/callbacks/src/test-timer-callbacks.cpp'
--- src/timer/tests/callbacks/src/test-timer-callbacks.cpp	2012-07-25 14:04:46 +0000
+++ src/timer/tests/callbacks/src/test-timer-callbacks.cpp	2012-07-30 14:34:37 +0000
@@ -146,7 +146,7 @@
     void Run ()
     {
 	for (std::deque <CompTimer *>::iterator it = timers.begin ();
-	     it != timers.end (); it++)
+	     it != timers.end (); ++it)
 	    (*it)->start ();
 
 	/* TimeoutHandler::timers should have the timer that

=== modified file 'src/timer/tests/while-calling/src/test-timer-set-times-while-calling.cpp'
--- src/timer/tests/while-calling/src/test-timer-set-times-while-calling.cpp	2012-02-24 12:52:17 +0000
+++ src/timer/tests/while-calling/src/test-timer-set-times-while-calling.cpp	2012-07-30 14:34:37 +0000
@@ -50,7 +50,7 @@
     {
 	for (std::list<CompTimer *>::iterator it =
 		TimeoutHandler::Default()->timers().begin();
-		it != TimeoutHandler::Default()->timers().end(); it++)
+        	it != TimeoutHandler::Default()->timers().end(); ++it)
 	{
 	    CompTimer *t = (*it);
 	    RecordProperty("minLeft", t->minLeft());