Merge lp:~mc-return/compiz/compiz.merge-fix1134251-minor-issues into lp:compiz/0.9.9

[MC Return]

Fixed minor cppcheck issues:

Do not assign a value to rv, because this value is never used.
Instead declare and assign a value to bool rv in the same line.

Do not assign false to Bool readonly, because this value is never used.
Instead declare the variable and assign a value in the same line.

Other minor problems:

Fixed some guaruntee->guarantee typos in comments.
Fixed copyright headers still referring to the old .c files.
Fixed wrong names in copyright headers.

(LP: #1134251)

cppcheck reports these valid issues:

[plugins/cubeaddon/src/cubeaddon.cpp:320] -> [plugins/cubeaddon/src/cubeaddon.cpp:322]: (performance) Variable 'rv' is reassigned a value before the old one has been used.

[compizconfig/libcompizconfig/src/compiz.cpp:731] -> [compizconfig/libcompizconfig/src/compiz.cpp:735]: (performance) Variable 'readonly' is reassigned a value before the old one has been used.

Other minor issues:

* Some guaruntee->guarantee typos in comments.

* Some copyright headers are still referring to the old .c files.

* Some copyright headers are not referring to the correct file names (mainly animation file headers).

[Sam Spilsbury (smspillaz)]

I'm assuming the actual ccpcheck changes have been merged in already and this is just the residual typo fixes in comments?

review: Needs Information

[MC Return (mc-return)]

> I'm assuming the actual ccpcheck changes have been merged in already and this
> is just the residual typo fixes in comments?

No, the cppcheck fixes are in:
compizconfig/libcompizconfig/src/compiz.cpp

and:
plugins/cubeaddon/src/cubeaddon.cpp

But you are right, except those 2 the rest are just fixes/changes in comments.

[Sam Spilsbury (smspillaz)]

Ah okay, thanks, I had missed those.

Just a reminder that too many unrelated changes in an MRQ can make the important ones easy to miss.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-02-20 07:42:08 +0000
+++ CMakeLists.txt	2013-02-27 11:55:26 +0000
@@ -210,7 +210,7 @@
 add_subdirectory (plugins)
 add_subdirectory (tests)
 
-# Leave last - the cmake_install.cmake script is guarunteed
+# Leave last - the cmake_install.cmake script is guaranteed
 # to run in a single job, and we need to force GSettings
 # schema recompilation to happen after all other install
 # targets (there is no way to set install target dependencies)

=== modified file 'compizconfig/compizconfig-python/CMakeLists.txt'
--- compizconfig/compizconfig-python/CMakeLists.txt	2012-12-11 16:22:58 +0000
+++ compizconfig/compizconfig-python/CMakeLists.txt	2013-02-27 11:55:26 +0000
@@ -63,7 +63,7 @@
 # is by using add_custom_command to "generate" it into existence.
 # Unfortunately this has drawbacks. Namely, it is not possible for
 # add_custom_command to depend on library targets. Because of that, there's
-# no way that we can guaruntee that libcompizconfig.so will be linked
+# no way that we can guarantee that libcompizconfig.so will be linked
 # before compizconfig.so (which is required). The best that we can do
 # there is to use add_custom_target, and make that target depend on the
 # file, 

=== modified file 'compizconfig/libcompizconfig/src/compiz.cpp'
--- compizconfig/libcompizconfig/src/compiz.cpp	2012-12-07 06:09:22 +0000
+++ compizconfig/libcompizconfig/src/compiz.cpp	2013-02-27 11:55:26 +0000
@@ -728,11 +728,10 @@
 		 const OptionMetadata & option)
 {
     const char *name;
-    Bool readonly = FALSE;
 
     name = option.name ().c_str ();
 
-    readonly = option.has_read_only () && option.read_only ();
+    Bool readonly = option.has_read_only () && option.read_only ();
 
     if (!strlen (name) || readonly)
 	return;

=== modified file 'compizconfig/tests/compizconfig_ccs_setting_value_operators.cpp'
--- compizconfig/tests/compizconfig_ccs_setting_value_operators.cpp	2012-09-29 04:40:41 +0000
+++ compizconfig/tests/compizconfig_ccs_setting_value_operators.cpp	2013-02-27 11:55:26 +0000
@@ -180,7 +180,7 @@
 
     for (unsigned int i = 0; i < finalType; ++i)
     {
-	/* We cannot print list values as there's no guaruntee
+	/* We cannot print list values as there's no guarantee
 	 * this is actually a list */
 	if (static_cast <CCSSettingType> (i) == TypeList)
 	    os << "A list value" << std::endl;
@@ -199,7 +199,7 @@
 
     for (unsigned int i = 0; i < finalType; ++i)
     {
-	/* We cannot print list values as there's no guaruntee
+	/* We cannot print list values as there's no guarantee
 	 * this is actually a list */
 	if (static_cast <CCSSettingType> (i) == TypeList)
 	    os << "A list value" << std::endl;

=== modified file 'plugins/animation/src/animation.cpp'
--- plugins/animation/src/animation.cpp	2013-01-11 08:28:51 +0000
+++ plugins/animation/src/animation.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /**
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * animation.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animation/src/curvedfold.cpp'
--- plugins/animation/src/curvedfold.cpp	2011-03-14 15:35:30 +0000
+++ plugins/animation/src/curvedfold.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * curvedfold.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animation/src/dodge.cpp'
--- plugins/animation/src/dodge.cpp	2012-05-27 04:32:55 +0000
+++ plugins/animation/src/dodge.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * dodge.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animation/src/dream.cpp'
--- plugins/animation/src/dream.cpp	2009-08-02 20:42:56 +0000
+++ plugins/animation/src/dream.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * dream.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animation/src/extensionplugin.cpp'
--- plugins/animation/src/extensionplugin.cpp	2012-08-03 10:12:25 +0000
+++ plugins/animation/src/extensionplugin.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * extensionplugin.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animation/src/fade.cpp'
--- plugins/animation/src/fade.cpp	2009-07-15 16:05:10 +0000
+++ plugins/animation/src/fade.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * fade.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animation/src/focusfade.cpp'
--- plugins/animation/src/focusfade.cpp	2009-11-17 17:59:54 +0000
+++ plugins/animation/src/focusfade.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * focusfade.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animation/src/glide.cpp'
--- plugins/animation/src/glide.cpp	2012-11-04 15:25:34 +0000
+++ plugins/animation/src/glide.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * glide.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animation/src/grid.cpp'
--- plugins/animation/src/grid.cpp	2012-11-19 21:02:02 +0000
+++ plugins/animation/src/grid.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * grid.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animation/src/horizontalfold.cpp'
--- plugins/animation/src/horizontalfold.cpp	2009-08-02 20:42:56 +0000
+++ plugins/animation/src/horizontalfold.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * horizontalfold.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animation/src/magiclamp.cpp'
--- plugins/animation/src/magiclamp.cpp	2012-11-04 15:38:49 +0000
+++ plugins/animation/src/magiclamp.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * magiclamp.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animation/src/options.cpp'
--- plugins/animation/src/options.cpp	2012-09-04 10:00:14 +0000
+++ plugins/animation/src/options.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * options.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animation/src/restack.cpp'
--- plugins/animation/src/restack.cpp	2011-03-14 15:35:30 +0000
+++ plugins/animation/src/restack.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * restack.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animation/src/rollup.cpp'
--- plugins/animation/src/rollup.cpp	2009-08-02 20:42:56 +0000
+++ plugins/animation/src/rollup.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * rollup.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animation/src/wave.cpp'
--- plugins/animation/src/wave.cpp	2009-08-02 20:42:56 +0000
+++ plugins/animation/src/wave.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * wave.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animation/src/zoomside.cpp'
--- plugins/animation/src/zoomside.cpp	2011-03-14 15:35:30 +0000
+++ plugins/animation/src/zoomside.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * zoomside.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animationaddon/src/airplane.cpp'
--- plugins/animationaddon/src/airplane.cpp	2012-05-25 02:27:04 +0000
+++ plugins/animationaddon/src/airplane.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * airplane3d.c
+ * airplane.cpp (based on airplane3d.c)
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animationaddon/src/animationaddon.cpp'
--- plugins/animationaddon/src/animationaddon.cpp	2012-09-07 22:37:20 +0000
+++ plugins/animationaddon/src/animationaddon.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /**
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * animationaddon.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animationaddon/src/beamup.cpp'
--- plugins/animationaddon/src/beamup.cpp	2011-02-22 13:05:27 +0000
+++ plugins/animationaddon/src/beamup.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * beamup.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animationaddon/src/burn.cpp'
--- plugins/animationaddon/src/burn.cpp	2012-07-30 09:20:41 +0000
+++ plugins/animationaddon/src/burn.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * burn.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animationaddon/src/domino.cpp'
--- plugins/animationaddon/src/domino.cpp	2010-01-27 05:53:22 +0000
+++ plugins/animationaddon/src/domino.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * domino.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animationaddon/src/explode.cpp'
--- plugins/animationaddon/src/explode.cpp	2010-01-27 05:53:22 +0000
+++ plugins/animationaddon/src/explode.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * explode.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animationaddon/src/fold.cpp'
--- plugins/animationaddon/src/fold.cpp	2011-03-14 16:00:55 +0000
+++ plugins/animationaddon/src/fold.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /**
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * fold.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animationaddon/src/glide3.cpp'
--- plugins/animationaddon/src/glide3.cpp	2010-01-27 05:53:22 +0000
+++ plugins/animationaddon/src/glide3.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * glide3.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animationaddon/src/leafspread.cpp'
--- plugins/animationaddon/src/leafspread.cpp	2010-01-27 05:53:22 +0000
+++ plugins/animationaddon/src/leafspread.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * leafspread.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animationaddon/src/particle.cpp'
--- plugins/animationaddon/src/particle.cpp	2012-05-25 06:10:15 +0000
+++ plugins/animationaddon/src/particle.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * particle.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animationaddon/src/polygon.cpp'
--- plugins/animationaddon/src/polygon.cpp	2012-09-05 18:23:22 +0000
+++ plugins/animationaddon/src/polygon.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * polygon.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/animationaddon/src/skewer.cpp'
--- plugins/animationaddon/src/skewer.cpp	2010-01-27 05:53:22 +0000
+++ plugins/animationaddon/src/skewer.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /**
  * Animation plugin for compiz/beryl
  *
- * animation.c
+ * skewer.cpp
  *
  * Copyright : (C) 2006 Erkin Bahceci
  * E-mail    : [e-mail]

=== modified file 'plugins/bench/src/bench.cpp'
--- plugins/bench/src/bench.cpp	2012-09-05 18:23:22 +0000
+++ plugins/bench/src/bench.cpp	2013-02-27 11:55:26 +0000
@@ -2,7 +2,7 @@
  *
  * Compiz benchmark plugin
  *
- * bench.c
+ * bench.cpp
  *
  * Copyright : (C) 2006 by Dennis Kasprzyk
  * E-mail    : [e-mail]

=== modified file 'plugins/cubeaddon/src/cubeaddon.cpp'
--- plugins/cubeaddon/src/cubeaddon.cpp	2013-01-04 09:14:39 +0000
+++ plugins/cubeaddon/src/cubeaddon.cpp	2013-02-27 11:55:26 +0000
@@ -317,9 +317,7 @@
 					  CompOutput                *output,
 					  PaintOrder                order)
 {
-    bool rv = false;
-
-    rv = cubeScreen->cubeShouldPaintViewport (sAttrib, transform,
+    bool rv = cubeScreen->cubeShouldPaintViewport (sAttrib, transform,
 					      output, order);
 
     if (rv || cubeScreen->unfolded ())

=== modified file 'plugins/expo/src/expo.cpp'
--- plugins/expo/src/expo.cpp	2012-12-04 15:35:36 +0000
+++ plugins/expo/src/expo.cpp	2013-02-27 11:55:26 +0000
@@ -2,7 +2,7 @@
  *
  * Compiz expo plugin
  *
- * expo.c
+ * expo.cpp
  *
  * Copyright (c) 2011 Linaro Limited
  * Copyright (c) 2008 Dennis Kasprzyk <[e-mail]>

=== modified file 'plugins/firepaint/src/firepaint.cpp'
--- plugins/firepaint/src/firepaint.cpp	2013-02-26 21:29:59 +0000
+++ plugins/firepaint/src/firepaint.cpp	2013-02-27 11:55:26 +0000
@@ -1,7 +1,7 @@
 /*
  * Compiz fire effect plugin
  *
- * firepaint.c
+ * firepaint.cpp
  *
  * Copyright : (C) 2007 by Dennis Kasprzyk
  * E-mail    : [e-mail]

=== modified file 'plugins/group/src/group.h'
--- plugins/group/src/group.h	2012-09-07 22:48:26 +0000
+++ plugins/group/src/group.h	2013-02-27 11:55:26 +0000
@@ -414,14 +414,14 @@
 	void
 	computeGlowQuads (GLTexture::Matrix *matrix);
 
-	/* paint.c */
+	/* paint.cpp */
 
 	void
 	getStretchRectangle (CompRect &box,
 			     float  &xScaleRet,
 			     float  &yScaleRet);
 
-	/* queues.c */
+	/* queues.cpp */
 
 	void
 	enqueueMoveNotify (int  dx,
@@ -438,13 +438,13 @@
 	void
 	enqueueUngrabNotify ();
 
-	/* selection.c */
+	/* selection.cpp */
 
 	bool
 	windowInRegion (CompRegion src,
 			  float  precision);
 
-	/* group.c */
+	/* group.cpp */
 
 	bool
 	isGroupWindow ();
@@ -593,12 +593,12 @@
 	bool
 	applyInitialActions ();
 
-	/* cairo.c */
+	/* cairo.cpp */
 
 	void
 	damagePaintRectangle (const CompRect &box);
 
-	/* queues.c */
+	/* queues.cpp */
 
 	void
 	dequeueSyncs (GroupWindow::PendingSyncs *);
@@ -615,7 +615,7 @@
 	bool
 	dequeueTimer ();
 
-	/* selection.c */
+	/* selection.cpp */
 
 	bool
 	selectSingle (CompAction         *action,
@@ -631,7 +631,7 @@
 			   CompAction::State  state,
 			   CompOption::Vector options);
 
-	/* group.c */
+	/* group.cpp */
 
 	void
 	grabScreen (GroupScreen::GrabState newState);
@@ -681,7 +681,7 @@
 	handleMotionEvent (int xRoot,
 			     int yRoot);
 
-	/* tab.c */
+	/* tab.cpp */
 
 	bool
 	getCurrentMousePosition (int &x, int &y);

=== modified file 'plugins/imgjpeg/src/imgjpeg.cpp'
--- plugins/imgjpeg/src/imgjpeg.cpp	2012-12-04 12:09:36 +0000
+++ plugins/imgjpeg/src/imgjpeg.cpp	2013-02-27 11:55:26 +0000
@@ -1,4 +1,6 @@
 /*
+ * jpeg.cpp
+ * based on:
  * beryl-plugins::jpeg.c - adds JPEG image support to beryl.
  * Copyright: (C) 2006 Nicholas Thomas
  *		       Danny Baumann (JPEG writing, option stuff)

=== modified file 'plugins/mag/src/mag.cpp'
--- plugins/mag/src/mag.cpp	2012-09-04 15:33:44 +0000
+++ plugins/mag/src/mag.cpp	2013-02-27 11:55:26 +0000
@@ -2,7 +2,7 @@
  *
  * Compiz magnifier plugin
  *
- * mag.c
+ * mag.cpp
  *
  * Copyright : (C) 2008 by Dennis Kasprzyk
  * E-mail    : [e-mail]

=== modified file 'plugins/mousepoll/src/mousepoll.cpp'
--- plugins/mousepoll/src/mousepoll.cpp	2012-10-12 09:05:18 +0000
+++ plugins/mousepoll/src/mousepoll.cpp	2013-02-27 11:55:26 +0000
@@ -2,7 +2,7 @@
  *
  * Compiz mouse position polling plugin
  *
- * mousepoll.c
+ * mousepoll.cpp
  *
  * Copyright : (C) 2008 by Dennis Kasprzyk
  * E-mail    : [e-mail]

=== modified file 'plugins/resizeinfo/src/resizeinfo.cpp'
--- plugins/resizeinfo/src/resizeinfo.cpp	2013-02-03 19:12:44 +0000
+++ plugins/resizeinfo/src/resizeinfo.cpp	2013-02-27 11:55:26 +0000
@@ -2,7 +2,7 @@
  *
  * Compiz metacity like info during resize
  *
- * resizeinfo.c
+ * resizeinfo.cpp
  *
  * Copyright (c) 2007 Robert Carr <[e-mail]>
  *

=== modified file 'plugins/scalefilter/src/scalefilter.cpp'
--- plugins/scalefilter/src/scalefilter.cpp	2012-05-28 08:39:10 +0000
+++ plugins/scalefilter/src/scalefilter.cpp	2013-02-27 11:55:26 +0000
@@ -2,7 +2,7 @@
  *
  * Compiz scale window title filter plugin
  *
- * scalefilter.c
+ * scalefilter.cpp
  *
  * Copyright : (C) 2007 by Danny Baumann
  * E-mail    : [e-mail]

=== modified file 'plugins/session/src/session.cpp'
--- plugins/session/src/session.cpp	2012-07-30 10:06:24 +0000
+++ plugins/session/src/session.cpp	2013-02-27 11:55:26 +0000
@@ -2,7 +2,7 @@
  *
  * Compiz session plugin
  *
- * session.c
+ * session.cpp
  *
  * Copyright (c) 2008 Travis Watkins <[e-mail]>
  * Copyright (c) 2008 Danny Baumann <[e-mail]>

=== modified file 'plugins/text/src/text.cpp'
--- plugins/text/src/text.cpp	2012-10-19 10:29:49 +0000
+++ plugins/text/src/text.cpp	2013-02-27 11:55:26 +0000
@@ -2,7 +2,7 @@
  * Compiz text plugin
  * Description: Adds text to pixmap support to Compiz.
  *
- * text.c
+ * text.cpp
  *
  * Copyright: (C) 2006-2007 Patrick Niklaus, Danny Baumann, Dennis Kasprzyk
  * Authors: Patrick Niklaus <[e-mail]>

=== modified file 'plugins/trip/src/trip.cpp'
--- plugins/trip/src/trip.cpp	2012-11-05 00:26:30 +0000
+++ plugins/trip/src/trip.cpp	2013-02-27 11:55:26 +0000
@@ -2,7 +2,7 @@
  *
  * Compiz trip plugin
  *
- * trip.c
+ * trip.cpp
  *
  * Copyright : (C) 2010 by Scott Moreau
  * E-mail    : [e-mail]

=== modified file 'plugins/wall/src/offset_movement/src/offset-movement.cpp'
--- plugins/wall/src/offset_movement/src/offset-movement.cpp	2012-08-13 05:46:59 +0000
+++ plugins/wall/src/offset_movement/src/offset-movement.cpp	2013-02-27 11:55:26 +0000
@@ -2,7 +2,7 @@
  *
  * Compiz wall plugin
  *
- * offset-movement.c
+ * offset-movement.cpp
  *
  * Copyright (c) 2006 Robert Carr <[e-mail]>
  *

=== modified file 'plugins/widget/src/widget.cpp'
--- plugins/widget/src/widget.cpp	2012-12-10 05:35:03 +0000
+++ plugins/widget/src/widget.cpp	2013-02-27 11:55:26 +0000
@@ -2,7 +2,7 @@
  *
  * Compiz widget handling plugin
  *
- * widget.c
+ * widget.cpp
  *
  * Copyright : (C) 2007 by Danny Baumann
  * E-mail    : [e-mail]

=== modified file 'src/pluginclasshandler/include/core/pluginclasshandler.h'
--- src/pluginclasshandler/include/core/pluginclasshandler.h	2012-12-10 05:35:03 +0000
+++ src/pluginclasshandler/include/core/pluginclasshandler.h	2013-02-27 11:55:26 +0000
@@ -34,7 +34,7 @@
 #include <core/pluginclasses.h>
 
 /* Continuously increments every time a new
- * plugin class is added, guarunteed to be
+ * plugin class is added, guaranteed to be
  * the same as the pcIndex of the most up-to-date
  * PluginClassHandler index. Any index that
  * hold the same value this value is safe to

=== modified file 'src/timer/tests/set-values/src/test-timer-set-values.cpp'
--- src/timer/tests/set-values/src/test-timer-set-values.cpp	2012-01-12 06:48:58 +0000
+++ src/timer/tests/set-values/src/test-timer-set-values.cpp	2013-02-27 11:55:26 +0000
@@ -36,7 +36,7 @@
     usleep (100000);
 
     /* minLeft and maxLeft are now
-     * real-time, so wait the guarunteed
+     * real-time, so wait the guaranteed
      * expiry time in order to check them
      * for an accurate value of zero */
 

=== modified file 'tests/system/xorg-gtest/tests/compiz_xorg_gtest_test_window_stacking.cpp'
--- tests/system/xorg-gtest/tests/compiz_xorg_gtest_test_window_stacking.cpp	2013-02-12 22:43:18 +0000
+++ tests/system/xorg-gtest/tests/compiz_xorg_gtest_test_window_stacking.cpp	2013-02-27 11:55:26 +0000
@@ -329,7 +329,7 @@
     ASSERT_TRUE (Advance (dpy, ct::WaitForEventOfTypeOnWindow (dpy,w1, ReparentNotify, -1, -1)));
     ASSERT_TRUE (Advance (dpy, ct::WaitForEventOfTypeOnWindow (dpy, w1, MapNotify, -1, -1)));
 
-    /* Grab the server so that we can guaruntee that all of these requests
+    /* Grab the server so that we can guarantee that all of these requests
      * happen before compiz gets them */
     XGrabServer (dpy);
     XSync (dpy, false);