← Back to branch summary

~lukas-kde/unity8/dashboard

« back to all changes in this revision

Viewing changes to tests/mocks/Unity/Application/MirMock.cpp

  • Committer: Lukáš Tinkl
  • Date: 2017-01-26 12:13:17 UTC
  • mfrom: (2749.1.49 unity8)
  • Revision ID: lukas.tinkl@canonical.com-20170126121317-qms39s9pikclidbe
merge trunk, fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/mocks/Unity/Application/MirMock.cpp
47
47
{
48
48
    return m_cursorName;
49
49
}
 
50
 
 
51
QString MirMock::currentKeymap() const
 
52
{
 
53
    return m_keymap;
 
54
}
 
55
 
 
56
void MirMock::setCurrentKeymap(const QString &keymap)
 
57
{
 
58
    if (keymap != m_keymap) {
 
59
        m_keymap = keymap;
 
60
        Q_EMIT currentKeymapChanged(m_keymap);
 
61
    }
 
62
}