← Back to branch summary

~unity-2d-team/unity-2d/enable-super-NumKey-shortcuts

« back to all changes in this revision

Viewing changes to libunity-2d-private/Unity2d/plugin.cpp

  • Committer: Michał Sawicz
  • Date: 2012-01-20 10:19:06 UTC
  • mfrom: (771.40.41 unity-2d)
  • Revision ID: michal.sawicz@canonical.com-20120120101906-585m0tzb47g064ac
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
libunity-2d-private/Unity2d/plugin.cpp
24
24
 
25
25
#include "dashsettings.h"
26
26
#include "launcherapplication.h"
27
 
#include "place.h"
28
 
#include "placeentry.h"
29
27
#include "launcherdevice.h"
30
28
#include "trash.h"
31
29
#include "workspaces.h"
32
30
#include "listaggregatormodel.h"
33
31
#include "launcherapplicationslist.h"
34
32
#include "launcherdeviceslist.h"
35
 
#include "launcherplaceslist.h"
36
33
#include "iconimageprovider.h"
37
34
#include "blendedimageprovider.h"
38
35
#include "qsortfilterproxymodelqml.h"
130
127
    qmlRegisterType<LauncherApplicationsList>(uri, 0, 1, "LauncherApplicationsList");
131
128
    qmlRegisterType<LauncherApplication>(uri, 0, 1, "LauncherApplication");
132
129
 
133
 
    qmlRegisterType<LauncherPlacesList>(uri, 0, 1, "LauncherPlacesList");
134
 
    qmlRegisterType<Place>(uri, 0, 1, "Place");
135
 
    qmlRegisterType<PlaceEntry>(uri, 0, 1, "PlaceEntry");
136
 
    /* DeeListModel is exposed to QML by PlaceEntry */
137
130
    qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
138
131
 
139
132
    qmlRegisterType<LauncherDevicesList>(uri, 0, 1, "LauncherDevicesList");