Merge lp:~mc-return/compiz/compiz.merge-fix1033877-fix-uninitialized-class-member-variables-in-constructors-part2 into lp:compiz/0.9.9

Proposed by MC Return
Status: Merged
Approved by: Daniel van Vugt
Approved revision: 3453
Merged at revision: 3449
Proposed branch: lp:~mc-return/compiz/compiz.merge-fix1033877-fix-uninitialized-class-member-variables-in-constructors-part2
Merge into: lp:compiz/0.9.9
Diff against target: 106 lines (+28/-6)
6 files modified
plugins/firepaint/src/firepaint.cpp (+6/-2)
plugins/grid/src/grid.h (+6/-1)
plugins/opengl/src/screen.cpp (+1/-0)
plugins/showmouse/src/showmouse.cpp (+6/-2)
plugins/trip/src/trip.cpp (+7/-0)
src/stackdebugger.cpp (+2/-1)
To merge this branch: bzr merge lp:~mc-return/compiz/compiz.merge-fix1033877-fix-uninitialized-class-member-variables-in-constructors-part2
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+132830@code.launchpad.net

Commit message

Initialized all class member variables in their respective constructors.
Used false for bools, 0 for ints. (LP: #1033877)

To post a comment you must log in.
3453. By MC Return

Also initialize the member variable bool mTimeoutRequired in the Stackdebugger::Stackdebugger (...) constructor

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/firepaint/src/firepaint.cpp'
2--- plugins/firepaint/src/firepaint.cpp 2012-09-07 22:37:20 +0000
3+++ plugins/firepaint/src/firepaint.cpp 2012-11-05 02:09:21 +0000
4@@ -51,12 +51,16 @@
5 {
6 }
7
8-ParticleSystem::ParticleSystem (int n)
9+ParticleSystem::ParticleSystem (int n) :
10+ x (0),
11+ y (0)
12 {
13 initParticles (n);
14 }
15
16-ParticleSystem::ParticleSystem ()
17+ParticleSystem::ParticleSystem () :
18+ x (0),
19+ y (0)
20 {
21 initParticles (0);
22 }
23
24=== modified file 'plugins/grid/src/grid.h'
25--- plugins/grid/src/grid.h 2012-09-05 17:15:39 +0000
26+++ plugins/grid/src/grid.h 2012-11-05 02:09:21 +0000
27@@ -53,7 +53,12 @@
28 {
29 public:
30
31- GridProps () {}
32+ GridProps ():
33+ gravityRight (0),
34+ gravityDown (0),
35+ numCellsX (0),
36+ numCellsY (0)
37+ {}
38
39 GridProps (int r, int d, int x, int y):
40 gravityRight (r),
41
42=== modified file 'plugins/opengl/src/screen.cpp'
43--- plugins/opengl/src/screen.cpp 2012-11-04 14:27:08 +0000
44+++ plugins/opengl/src/screen.cpp 2012-11-05 02:09:21 +0000
45@@ -1152,6 +1152,7 @@
46 bindPixmap (),
47 hasCompositing (false),
48 commonFrontbuffer (true),
49+ incorrectRefreshRate (false),
50 programCache (new GLProgramCache (30)),
51 shaderCache (),
52 autoProgram (new GLScreenAutoProgram(gs)),
53
54=== modified file 'plugins/showmouse/src/showmouse.cpp'
55--- plugins/showmouse/src/showmouse.cpp 2012-09-04 15:33:44 +0000
56+++ plugins/showmouse/src/showmouse.cpp 2012-11-05 02:09:21 +0000
57@@ -54,12 +54,16 @@
58 {
59 }
60
61-ParticleSystem::ParticleSystem (int n)
62+ParticleSystem::ParticleSystem (int n) :
63+ x (0),
64+ y (0)
65 {
66 initParticles (n);
67 }
68
69-ParticleSystem::ParticleSystem ()
70+ParticleSystem::ParticleSystem () :
71+ x (0),
72+ y (0)
73 {
74 initParticles (0);
75 }
76
77=== modified file 'plugins/trip/src/trip.cpp'
78--- plugins/trip/src/trip.cpp 2010-08-13 10:37:09 +0000
79+++ plugins/trip/src/trip.cpp 2012-11-05 02:09:21 +0000
80@@ -559,6 +559,13 @@
81
82 Ripple::Ripple () :
83 dScreen (TripScreen::get (screen))
84+ radius (0),
85+ rMod (0),
86+ duration (0),
87+ timer (0),
88+ width (0),
89+ height (0),
90+ adjust (false)
91 {
92 }
93
94
95=== modified file 'src/stackdebugger.cpp'
96--- src/stackdebugger.cpp 2012-07-30 13:05:05 +0000
97+++ src/stackdebugger.cpp 2012-11-05 02:09:21 +0000
98@@ -55,7 +55,8 @@
99 mServerWindowsChanged (false),
100 mRoot (root),
101 mDpy (dpy),
102- mFetchXEvent (fetchXEvent)
103+ mFetchXEvent (fetchXEvent),
104+ mTimeoutRequired (false)
105 {
106 }
107

Subscribers

People subscribed via source and target branches