← Back to branch summary

~michael-sheldon/ubuntu-keyboard/fix-1357360

« back to all changes in this revision

Viewing changes to src/plugin/inputmethod_p.h

  • Committer: Michael Sheldon
  • Date: 2014-09-22 12:50:34 UTC
  • mfrom: (223.2.3 ubuntu-keyboard)
  • Revision ID: michael.sheldon@canonical.com-20140922125034-ugo1qtzngnp4d3mu
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugin/inputmethod_p.h
3
3
 
4
4
#include "logic/layoutupdater.h"
5
5
#include "editor.h"
 
6
#include "greeterstatus.h"
6
7
#include "keyboardgeometry.h"
7
8
#include "keyboardsettings.h"
8
9
 
60
61
 
61
62
    KeyboardGeometry *m_geometry;
62
63
    KeyboardSettings m_settings;
 
64
    GreeterStatus *m_greeterStatus;
63
65
 
64
66
    WordRibbon* wordRibbon;
65
67
 
82
84
        , keyboardState("CHARACTERS")
83
85
        , m_geometry(new KeyboardGeometry(q))
84
86
        , m_settings()
 
87
        , m_greeterStatus(new GreeterStatus())
85
88
        , wordRibbon(new WordRibbon)
86
89
        , previous_position(-1)
87
90
    {
174
177
        qml_context->setContextProperty("maliit_event_handler", &event_handler);
175
178
        qml_context->setContextProperty("maliit_wordribbon", wordRibbon);
176
179
        qml_context->setContextProperty("maliit_word_engine", editor.wordEngine());
 
180
        qml_context->setContextProperty("greeter_status", m_greeterStatus);
177
181
    }
178
182
 
179
183