Clean up code and make the fake virtual keyboard work again
commitcc896a58c1061f8b3bf901420617e87d8f16570b
authorDaniel d'Andrada <daniel.dandrada@canonical.com>
dateWed 19 Aug 2015, 17:30 (11 years ago)
parent6157460
tests/mocks/Unity/Application/MirSurface.h+1−1
@@ -54,7 +54,7 @@ public:
5454
5555
5656 Mir::State state() const override;
57− void setState(Mir::State) override;
57+ Q_INVOKABLE void setState(Mir::State) override;
5858
5959 bool live() const override;
6060
tests/mocks/Unity/Application/VirtualKeyboard.cpp−7
@@ -36,10 +36,3 @@ VirtualKeyboard::VirtualKeyboard()
3636VirtualKeyboard::~VirtualKeyboard()
3737{
3838}
39−
40−/*
41−void VirtualKeyboard::touchEvent(QTouchEvent *event)
42−{
43− event->setAccepted(false);
44−}
45−*/
tests/mocks/Unity/Application/VirtualKeyboard.h−5
@@ -27,11 +27,6 @@ class VirtualKeyboard : public MirSurface
2727public:
2828 explicit VirtualKeyboard();
2929 ~VirtualKeyboard();
30−
31−/*
32−protected:
33− void touchEvent(QTouchEvent * event) override;
34−*/
3530};
3631
3732Q_DECLARE_METATYPE(VirtualKeyboard*)