← Back to branch summary

~canonical-dx-team/unity/unity.fix-ql-losing-focus

~canonical-dx-team/unity/unity.fix-ql-losing-focus

« back to all changes in this revision

Viewing changes to src/PlaceEntryHome.h

Committer: Jay Taoko
Date: 2011-02-27 08:25:15 UTC
mfrom: (884.3.1 unity.scrolling-improvements)
mto: (894.1.8 dash-fixes-2011-02-28)
mto: This revision was merged to the branch mainline in revision 895.
Revision ID: jay.taoko@canonical.com-20110227082515-vgjqwdyh2ubvye1b

Merge

files modified:
CMakeLists.txt

services/CMakeLists.txt

services/panel-a11y.c

src/DeviceLauncherIcon.cpp

src/IconTexture.cpp

src/Launcher.cpp

src/Launcher.h

src/LauncherIcon.cpp

src/LauncherIcon.h

src/PanelIndicatorObjectEntryView.cpp

src/PanelStyle.cpp

src/PanelStyle.h

src/PlaceEntry.h

src/PlaceEntryHome.cpp

src/PlaceEntryHome.h

src/PlaceEntryRemote.cpp

src/PlaceEntryRemote.h

src/PlacesGroup.cpp

src/PlacesGroup.h

src/PlacesResultsController.cpp

src/PlacesResultsController.h

src/PlacesResultsView.cpp

src/PlacesSearchBar.cpp

src/PlacesSearchBar.h

src/PlacesView.cpp

src/StaticCairoText.cpp

src/StaticCairoText.h

src/unitya11y.cpp

tools/autopilot.py

Show diffs side-by-side

added added

removed removed

src/PlaceEntryHome.h

65

65

DeeModel * GetResultsModel ();

66

66

67

67

DeeModel * GetGlobalResultsModel () { return NULL; };

68

DeeModel * GetGlobalGroupsModel () { return NULL; };

68

69

69

70

private:

70

71

void LoadExistingEntries ();

85

86

std::map<char *, gchar *> _hints;

86

87

87

88

std::map<DeeModel *, int> _model_to_group;

89

std::map<DeeModel *, DeeModel *> _model_to_group_model;

88

90

std::vector<PlaceEntry *> _entries;

89

91

};

90

92

Older »