Merge lp:~sil2100/unity/libunity-7.0-breakage-ref-fix-autopilot into lp:~unity-team/unity/libunity-7.0-breakage

[Łukasz Zemczak]

Fix a general typo that caused failures in AP tests DashKeyNavTests suite. We need to pass the variables as references if we want to modify them - thus returning the correct column and row size in GetResultDimensions

- Problem:

AP tests related to the DashKeyNavTests test_dash suite are failing because of invalid row/column count of scope results.

- Fix:

The problem was a typo in the GetResultDimensions() function - we need to pass references instead of values if we are to assign any values to the rows and columns parameters inside of the function.

- Tests:

Covered by existing AP tests.

[Nick Dedekind (nick-dedekind)]

My bad,
LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3092
http://jenkins.qa.ubuntu.com/job/unity-team-unity-libunity-7.0-breakage-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-libunity-7.0-breakage-raring-amd64-ci/32

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-libunity-7.0-breakage-ci/32/rebuild

review: Approve (continuous-integration)

=== modified file 'dash/ResultView.cpp'
--- dash/ResultView.cpp	2013-03-11 17:20:46 +0000
+++ dash/ResultView.cpp	2013-03-22 17:07:26 +0000
@@ -269,7 +269,7 @@
   return "ResultView";
 }
 
-void ResultView::GetResultDimensions(int rows, int columns)
+void ResultView::GetResultDimensions(int& rows, int& columns)
 {
   columns = results_per_row;  
   rows = result_model_ ? ceil(static_cast<double>(result_model_->count()) / static_cast<double>(std::min(1, columns))) : 0.0;
 
=== modified file 'dash/ResultView.h'
--- dash/ResultView.h	2013-03-11 17:20:46 +0000
+++ dash/ResultView.h	2013-03-22 17:07:26 +0000
@@ -91,7 +91,7 @@
   std::vector<ResultViewTexture::Ptr> const& GetResultTextureContainers();
   virtual void RenderResultTexture(ResultViewTexture::Ptr const& result_texture);
 
-  virtual void GetResultDimensions(int rows, int columns);
+  virtual void GetResultDimensions(int& rows, int& columns);
 
 protected:
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
 
=== modified file 'dash/ResultViewGrid.cpp'
--- dash/ResultViewGrid.cpp	2013-03-18 17:23:42 +0000
+++ dash/ResultViewGrid.cpp	2013-03-22 17:07:26 +0000
@@ -301,7 +301,7 @@
   return (items_per_row) ? items_per_row : 1; // always at least one item per row
 }
 
-void  ResultViewGrid::GetResultDimensions(int rows, int columns)
+void  ResultViewGrid::GetResultDimensions(int& rows, int& columns)
 {
   columns = GetItemsPerRow();
   rows = result_model_ ? ceil(static_cast<double>(result_model_->count()) / static_cast<double>(std::min<int>(1, results_per_row))) : 0.0;
 
=== modified file 'dash/ResultViewGrid.h'
--- dash/ResultViewGrid.h	2013-03-11 17:20:46 +0000
+++ dash/ResultViewGrid.h	2013-03-22 17:07:26 +0000
@@ -56,7 +56,7 @@
 
   virtual void RenderResultTexture(ResultViewTexture::Ptr const& result_texture);
 
-  virtual void GetResultDimensions(int rows, int columns);
+  virtual void GetResultDimensions(int& rows, int& columns);
 
 protected:
   void MouseMove(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);