Merge lp:~hikiko/compiz/compiz.fix-compile-errors into lp:compiz/0.9.13

Proposed by Eleni Maria Stea
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 4100
Merged at revision: 4098
Proposed branch: lp:~hikiko/compiz/compiz.fix-compile-errors
Merge into: lp:compiz/0.9.13
Diff against target: 47 lines (+0/-23)
1 file modified
plugins/place/src/screen-size-change/tests/screen-size-change/src/test-place-screen-size-change.cpp (+0/-23)
To merge this branch: bzr merge lp:~hikiko/compiz/compiz.fix-compile-errors
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Review via email: mp+310167@code.launchpad.net

Commit message

fixes compile errors caused by unused test functions

Description of the change

fixes compile errors caused by unused test functions

To post a comment you must log in.
4099. By Eleni Maria Stea

removed function definitions too

4100. By Eleni Maria Stea

completely removed the unused functions

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

ACK

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/place/src/screen-size-change/tests/screen-size-change/src/test-place-screen-size-change.cpp'
--- plugins/place/src/screen-size-change/tests/screen-size-change/src/test-place-screen-size-change.cpp 2014-05-19 15:56:24 +0000
+++ plugins/place/src/screen-size-change/tests/screen-size-change/src/test-place-screen-size-change.cpp 2016-11-07 10:32:11 +0000
@@ -64,12 +64,7 @@
64 const cw::extents::Extents & getExtents () const;64 const cw::extents::Extents & getExtents () const;
65 unsigned int getState () const;65 unsigned int getState () const;
6666
67 void setVp (const CompPoint &);
68 void setWorkArea (const CompRect &);67 void setWorkArea (const CompRect &);
69 void setExtents (unsigned int left,
70 unsigned int right,
71 unsigned int top,
72 unsigned int bottom);
7368
74 void setGeometry (const cw::Geometry &g);69 void setGeometry (const cw::Geometry &g);
75 cw::Geometry sizeAdjustTest (const CompSize &oldSize,70 cw::Geometry sizeAdjustTest (const CompSize &oldSize,
@@ -222,30 +217,12 @@
222}217}
223218
224void219void
225StubScreenSizeChangeObject::setVp (const CompPoint &p)
226{
227 mCurrentVp = p;
228}
229
230void
231StubScreenSizeChangeObject::setWorkArea (const CompRect &wa)220StubScreenSizeChangeObject::setWorkArea (const CompRect &wa)
232{221{
233 mCurrentWorkArea = wa;222 mCurrentWorkArea = wa;
234}223}
235224
236void225void
237StubScreenSizeChangeObject::setExtents (unsigned int left,
238 unsigned int right,
239 unsigned int top,
240 unsigned int bottom)
241{
242 mCurrentExtents.left = left;
243 mCurrentExtents.right = right;
244 mCurrentExtents.top = top;
245 mCurrentExtents.bottom = bottom;
246}
247
248void
249StubScreenSizeChangeObject::setGeometry (const cw::Geometry &g)226StubScreenSizeChangeObject::setGeometry (const cw::Geometry &g)
250{227{
251 mCurrentGeometry = g;228 mCurrentGeometry = g;

Subscribers

People subscribed via source and target branches