← Back to branch summary

~macslow/qtmir/fix-1475678

« back to all changes in this revision

Viewing changes to src/platforms/mirserver/mirserverintegration.h

  • Committer: CI Train Bot
  • Author(s): Gerry Boland
  • Date: 2015-06-17 13:46:06 UTC
  • mfrom: (328.6.12 qmirserver-hides-mirserver)
  • Revision ID: ci-train-bot@canonical.com-20150617134606-3h9ssmbzza0h24f4
[qpa] refactor QMirServer to clean up its API, and fix strange thread design.

This does the following:
- QMirServer has a much cleaner API - using d-pointer to encourage ABI stability
- move quit decision point to MirServerIntegration
- the Mir server is run from a class inheriting a QThread, simplifies thread control significantly
Approved by: Daniel d'Andrada

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/platforms/mirserver/mirserverintegration.h
1
1
/*
2
 
 * Copyright (C) 2013-2014 Canonical, Ltd.
 
2
 * Copyright (C) 2013-2015 Canonical, Ltd.
3
3
 *
4
4
 * This program is free software: you can redistribute it and/or modify it under
5
5
 * the terms of the GNU Lesser General Public License version 3, as published by
69
69
    QPlatformNativeInterface *nativeInterface() const override;
70
70
 
71
71
private:
72
 
    QSharedPointer<MirServer> m_mirServer;
73
 
 
74
72
    QScopedPointer<QPlatformAccessibility> m_accessibility;
75
73
    QScopedPointer<QPlatformFontDatabase> m_fontDb;
76
74
    QScopedPointer<QPlatformServices> m_services;
78
76
    QScopedPointer<QAbstractEventDispatcher> m_eventDispatcher;
79
77
#endif
80
78
 
 
79
    QScopedPointer<QMirServer> m_mirServer;
 
80
 
81
81
    Display *m_display;
82
 
    QMirServer *m_qmirServer;
83
82
    NativeInterface *m_nativeInterface;
84
83
    QPlatformInputContext* m_inputContext;
85
84
    QScopedPointer<qtmir::Clipboard> m_clipboard;