← Back to branch summary

~kdub/qtmir/nochange-rebuild

« back to all changes in this revision

Viewing changes to tests/modules/common/fake_mirsurface.h

  • Committer: CI Train Bot
  • Author(s): Michał Sawicz, Albert Astals Cid
  • Date: 2015-11-19 12:55:57 UTC
  • mfrom: (381.3.9 origin/clang)
  • Revision ID: ci-train-bot@canonical.com-20151119125557-sbefmngx5npw81iz
Build with clang (tests/gmock fails and is unfixable on our side i'd say)
Approved by: Gerry Boland

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/modules/common/fake_mirsurface.h
52
52
    FakeMirSurface(QObject *parent = nullptr)
53
53
        : MirSurfaceInterface(parent)
54
54
        , m_isFirstFrameDrawn(false)
55
 
        , m_session(nullptr)
56
55
        , m_isFrameDropperRunning(true)
57
56
        , m_live(true)
58
57
        , m_state(Mir::RestoredState)
65
64
    // unity.shell.application.MirSurfaceInterface
66
65
    Mir::Type type() const override { return Mir::NormalType; }
67
66
 
68
 
    QString name() const { return QString("Fake MirSurface"); }
 
67
    QString name() const override { return QString("Fake MirSurface"); }
69
68
 
70
69
    QSize size() const override { return m_size; }
71
70
 
211
210
 
212
211
 
213
212
    bool m_isFirstFrameDrawn;
214
 
    SessionInterface *m_session;
215
213
    bool m_isFrameDropperRunning;
216
214
    bool m_live;
217
215
    Mir::State m_state;