Merge lp:~alan-griffiths/compiz-core/cleanup into lp:compiz-core/0.9.5

Proposed by Alan Griffiths
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 2905
Merged at revision: 2906
Proposed branch: lp:~alan-griffiths/compiz-core/cleanup
Merge into: lp:compiz-core/0.9.5
Diff against target: 50 lines (+4/-3)
4 files modified
include/core/region.h (+1/-1)
plugins/kde/src/dispatcher.cpp (+1/-1)
plugins/move/src/move.cpp (+1/-0)
src/region.cpp (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/compiz-core/cleanup
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
Review via email: mp+87968@code.launchpad.net

Description of the change

Code tweaked to avoid compiler diagnostic messages

To post a comment you must log in.
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 'include/core/region.h'
2--- include/core/region.h 2010-07-25 03:46:58 +0000
3+++ include/core/region.h 2012-01-09 18:04:42 +0000
4@@ -74,7 +74,7 @@
5 /**
6 * Returns the internal XRegion handle
7 */
8- const Region handle () const;
9+ Region handle () const;
10
11 /**
12 * Returns true if the specified CompPoint falls within the
13
14=== modified file 'plugins/kde/src/dispatcher.cpp'
15--- plugins/kde/src/dispatcher.cpp 2010-08-20 12:52:54 +0000
16+++ plugins/kde/src/dispatcher.cpp 2012-01-09 18:04:42 +0000
17@@ -31,7 +31,7 @@
18
19 #include "dispatcher.moc"
20
21-EventDispatcherCompiz::EventDispatcherCompiz (QObject *parent)
22+EventDispatcherCompiz::EventDispatcherCompiz (QObject *)
23 {
24 mWakeUpPipe[0] = 0;
25 mWakeUpPipe[1] = 0;
26
27=== modified file 'plugins/move/src/move.cpp'
28--- plugins/move/src/move.cpp 2011-10-15 11:00:51 +0000
29+++ plugins/move/src/move.cpp 2012-01-09 18:04:42 +0000
30@@ -708,6 +708,7 @@
31 {
32 hasCompositing = true;
33 cScreen->registerPaintHandler (pHnd);
34+ return true;
35 }
36
37 void
38
39=== modified file 'src/region.cpp'
40--- src/region.cpp 2010-12-04 21:28:09 +0000
41+++ src/region.cpp 2012-01-09 18:04:42 +0000
42@@ -104,7 +104,7 @@
43 delete priv;
44 }
45
46-const Region
47+Region
48 CompRegion::handle () const
49 {
50 return priv->region;

Subscribers

People subscribed via source and target branches