unity-2d

Merge lp://qastaging/~uriboni/unity-2d/dash-use-search-hint into lp://qastaging/unity-2d/3.0

dash-use-search-hint
Merge into natty

Proposed by Ugo Riboni on 2011-03-22

Status:

Merged

Approved by:

Aurélien Gâteau on 2011-03-22

Approved revision:

464

Merged at revision:

472

Proposed branch:

lp://qastaging/~uriboni/unity-2d/dash-use-search-hint

Merge into:

lp://qastaging/unity-2d/3.0

Diff against target:

115 lines (+26/-3)

4 files modified

launcher/UnityApplications/place.cpp (+1/-0)
launcher/UnityApplications/placeentry.cpp (+15/-0)
launcher/UnityApplications/placeentry.h (+7/-0)
places/SearchEntry.qml (+3/-3)

To merge this branch:

bzr merge lp://qastaging/~uriboni/unity-2d/dash-use-search-hint

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Aurélien Gâteau (community)		2011-03-22	Approve on 2011-03-22
Review via email: mp+54322@code.qastaging.launchpad.net

Description of the change

[dash] Use the SearchHint from the .place file to choose what to display in the search box for a place entry.

Revision history for this message

Aurélien Gâteau (agateau) wrote on 2011-03-22:

Looks good. Just a minor coding style nitpick: setSearchHint argument should be "const QString&", same for searchHintChanged(), that's slightly more efficient. Feel free to mark the MR as approved when this is fixed.

review: Needs Fixing

Revision history for this message

Ugo Riboni (uriboni) wrote on 2011-03-22:

Let's take care of that in a separate review. All the other set* methods in that class that are of type QString are not using const QString&, so let's keep it consistent for now and fix it later all in one go. I added a FIXME.

lp://qastaging/~uriboni/unity-2d/dash-use-search-hint updated on 2011-03-22