← Back to branch summary

~mterry/+junk/u8.2

« back to all changes in this revision

Viewing changes to plugins/Unity/Indicators/plugin.cpp

  • Committer: Michael Terry
  • Date: 2014-11-17 14:56:04 UTC
  • mfrom: (1317.1.118 unity8)
  • Revision ID: michael.terry@canonical.com-20141117145604-96dn9p5nwkifq2f4
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Unity/Indicators/plugin.cpp
30
30
#include "menucontentactivator.h"
31
31
#include "modelprinter.h"
32
32
#include "rootactionstate.h"
 
33
#include "sharedunitymenumodel.h"
33
34
#include "unitymenumodelcache.h"
34
35
#include "unitymenumodelstack.h"
35
36
#include "visibleindicatorsmodel.h"
36
37
 
 
38
#include <unitymenumodel.h>
 
39
 
37
40
static QObject* menuModelCacheSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
38
41
  Q_UNUSED(engine);
39
42
  Q_UNUSED(scriptEngine);
40
 
  return new UnityMenuModelCache;
 
43
  return UnityMenuModelCache::singleton();
41
44
}
42
45
 
43
 
void Indicators2Plugin::registerTypes(const char *uri)
 
46
void IndicatorsPlugin::registerTypes(const char *uri)
44
47
{
 
48
    qRegisterMetaType<UnityMenuModel*>("UnityMenuModel*");
 
49
 
45
50
    qmlRegisterType<IndicatorsManager>(uri, 0, 1, "IndicatorsManager");
46
51
    qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");
47
52
    qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");
49
54
    qmlRegisterType<RootActionState>(uri, 0, 1, "RootActionState");
50
55
    qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter");
51
56
    qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");
 
57
    qmlRegisterType<SharedUnityMenuModel>(uri, 0, 1, "SharedUnityMenuModel");
52
58
 
53
59
    qmlRegisterSingletonType<UnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);
54
60