Nux

Merge lp:~aacid/nux/const_get_position into lp:nux

  1. const_get_position
  2. Merge into trunk
Proposed by Albert Astals Cid on 2012-10-29
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2012-11-23
Approved revision: 702
Merged at revision: 718
Proposed branch: lp:~aacid/nux/const_get_position
Merge into: lp:nux
Diff against target: 25 lines (+2/-2)
2 files modified
NuxCore/Rect.h (+1/-1)
configure.ac (+1/-1)
To merge this branch: bzr merge lp:~aacid/nux/const_get_position
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve on 2012-11-23
PS Jenkins bot continuous-integration Needs Fixing on 2012-11-23
Neil J. Patel (community) Approve on 2012-11-20
Tim Penhey (community) 2012-10-29 Needs Fixing on 2012-11-12
Review via email: mp+131856@code.launchpad.net

Commit Message

Make GetPosition const

Description of the Change

Make GetPosition const

Note this is ABI incompatible according to http://techbase.kde.org/Policies/Binary_Compatibility_Issues_With_C++ so if we really care about ABI i can add a const overload and mark the old one as deprecated

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) wrote :

I think it's fine, just update the ABI value in configure.ac

Albert Astals Cid (aacid) wrote :

Updated!

Tim Penhey (thumper) wrote :

Merge trunk and adjust the abi version as I think this has recently changed, and we don't want to go backwards, but otherwise I'm fine with this.

review: Needs Fixing
Albert Astals Cid (aacid) wrote :

Updated!

Neil J. Patel (njpatel) :
review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~aacid/nux/const_get_position updated on 2012-11-23
702. By Albert Astals Cid on 2012-11-23

merge

Marco Trevisan (Treviño) (3v1n0) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NuxCore/Rect.h'
2--- NuxCore/Rect.h 2012-11-16 02:12:57 +0000
3+++ NuxCore/Rect.h 2012-11-23 08:42:19 +0000
4@@ -68,7 +68,7 @@
5 return Point (x + width / 2, y + height / 2);
6 }
7 //! Returns a Point at the center of the Rectangle.
8- Point GetPosition()
9+ Point GetPosition() const
10 {
11 return Point (x, y);
12 }
13
14=== modified file 'configure.ac'
15--- configure.ac 2012-11-20 22:13:38 +0000
16+++ configure.ac 2012-11-23 08:42:19 +0000
17@@ -23,7 +23,7 @@
18 # e.g.: december 5th, 2011 is: 20111205
19 # To make more than one API change in a day, add a number to the date. Like 20111205.xx
20
21-m4_define([nux_abi_version], [20121121.01])
22+m4_define([nux_abi_version], [20121123.01])
23
24 m4_define([nux_version],
25 [nux_major_version.nux_minor_version.nux_micro_version])

Subscribers

People subscribed via source and target branches