Merge lp:~thumper/nux/move-geometry-typedef-to-rect into lp:nux

[Tim Penhey]

Move the typedef for Geometry from Nux/Utils.h into the NuxCore/Rect.h header file.

Move the typedef for Geometry from Nux/Utils.h into the NuxCore/Rect.h header file.

Removes some of the "magic".

[Brandon Schaefer (brandontschaefer)]

Awesome!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/78/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=panda-pbuilder,distribution=quantal,flavor=armhf/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/78/console

review: Needs Fixing (continuous-integration)

=== modified file 'Nux/Utils.h'
--- Nux/Utils.h	2011-10-10 01:52:00 +0000
+++ Nux/Utils.h	2012-12-11 01:15:25 +0000
@@ -96,8 +96,6 @@
     eHARight,
   };
 
-  typedef Rect Geometry;
-
   typedef struct
   {
     int x;

=== modified file 'NuxCore/Rect.h'
--- NuxCore/Rect.h	2012-11-23 08:40:36 +0000
+++ NuxCore/Rect.h	2012-12-11 01:15:25 +0000
@@ -122,7 +122,7 @@
   Rect operator-(Rect const& lhs, Rect const& rhs);
   Rect operator*(Rect const& lhs, float scalar);
 
-
+  typedef Rect Geometry;
 }
 
 #endif // RECT_H