Merge lp:~laney/platform-api/1350874 into lp:platform-api

[Iain Lane]

Fix error by pulling out and sharing a struct instead of defining it twice.

Pull out PointerCoordinate struct shared between two files

structs have file scope. This means that a struct declared within a struct is
still visible outside it. In this case event_deprecated.h is included into
event.h and they both define an identical struct called PointerCoordinate.

Pull the definition out and share it. This does not add new API due to the
scoping rule mentioned previously.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:258
http://jenkins.qa.ubuntu.com/job/platform-api-ci/353/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-amd64-ci/86
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/86/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-i386-ci/86

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/353/rebuild

review: Needs Fixing (continuous-integration)

[Iain Lane (laney)]

On Mon, Aug 18, 2014 at 11:40:35AM -0000, PS Jenkins bot wrote:
> […]
> FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/86/console
> […]

No details. Did I break this?

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:258
http://jenkins.qa.ubuntu.com/job/platform-api-ci/354/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-amd64-ci/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/87
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/87/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-i386-ci/87

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/354/rebuild

review: Approve (continuous-integration)

[Thomas Voß (thomas-voss)]

LGTM.

review: Approve

=== modified file 'include/ubuntu/application/ui/input/event.h'
--- include/ubuntu/application/ui/input/event.h	2014-07-15 12:41:35 +0000
+++ include/ubuntu/application/ui/input/event.h	2014-08-18 11:11:21 +0000
@@ -142,6 +142,18 @@
     int is_system_key;  ///< \deprecated Do not use.
 } KeyEvent;
 
+struct PointerCoordinate
+{
+    int id; ///< Unique id of the pointer
+    float x, raw_x; ///< Processed and raw x coordinates
+    float y, raw_y; ///< Processed and raw y coordinates
+    float touch_major; ///< Touch major coordinate
+    float touch_minor; ///< Touch minor coordinate
+    float size; ///< Size of the pointer/touch
+    float pressure; ///< Pressure of the touch
+    float orientation; ///< Orientation
+};
+
 /** Information describing an event originating from a
  * "moving" device, e.g., a mouse, a mouse-wheel, a finger
  * on a touchpad. 
@@ -165,17 +177,7 @@
     nsecs_t down_time; ///< Timestamp that marks the down event
     nsecs_t event_time; ///< Timestamp that marks when this event happened
     size_t pointer_count; ///< Number of pointers reported in this event
-    struct PointerCoordinate
-    {
-        int id; ///< Unique id of the pointer
-        float x, raw_x; ///< Processed and raw x coordinates
-        float y, raw_y; ///< Processed and raw y coordinates
-        float touch_major; ///< Touch major coordinate
-        float touch_minor; ///< Touch minor coordinate
-        float size; ///< Size of the pointer/touch
-        float pressure; ///< Pressure of the touch
-        float orientation; ///< Orientation
-    } pointer_coordinates[UBUNTU_APPLICATION_UI_INPUT_EVENT_MAX_POINTER_COUNT]; ///< Pointer information, valid from [0,pointer_count).
+    struct PointerCoordinate pointer_coordinates[UBUNTU_APPLICATION_UI_INPUT_EVENT_MAX_POINTER_COUNT]; ///< Pointer information, valid from [0,pointer_count).
 } MotionEvent;
 
 typedef struct

=== modified file 'include/ubuntu/application/ui/input/event_deprecated.h'
--- include/ubuntu/application/ui/input/event_deprecated.h	2014-07-15 12:41:35 +0000
+++ include/ubuntu/application/ui/input/event_deprecated.h	2014-08-18 11:11:21 +0000
@@ -76,17 +76,7 @@
                 nsecs_t down_time; ///< Timestamp that marks the down event
                 nsecs_t event_time; ///< Timestamp that marks when this event happened
                 size_t pointer_count; ///< Number of pointers reported in this event
-                struct PointerCoordinate
-                {
-                    int id; ///< Unique id of the pointer
-                    float x, raw_x; ///< Processed and raw x coordinates
-                    float y, raw_y; ///< Processed and raw y coordinates
-                    float touch_major; ///< Touch major coordinate
-                    float touch_minor; ///< Touch minor coordinate
-                    float size; ///< Size of the pointer/touch
-                    float pressure; ///< Pressure of the touch
-                    float orientation; ///< Orientation
-                } pointer_coordinates[UBUNTU_APPLICATION_UI_INPUT_EVENT_MAX_POINTER_COUNT]; ///< Pointer information, valid from [0,pointer_count).
+                struct PointerCoordinate pointer_coordinates[UBUNTU_APPLICATION_UI_INPUT_EVENT_MAX_POINTER_COUNT]; ///< Pointer information, valid from [0,pointer_count).
             } motion;
         } details;
     } Event;