~albaguirre/qtubuntu/mir-0.26.1-compat

Viewing changes to src/ubuntumirclient/qmirclientintegration.h

Committer: Gerry Boland
Date: 2017-01-24 15:57:14 UTC
mfrom: (362.1.1 1648842.window-focus-regression) (360.6.3 upstream-closer1)
Revision ID: gerry.boland@canonical.com-20170124155714-vi4humbpys97zbn0

Class renaming and syntax changes to shrink delta with upstream mirclient QPA plugin (which is equivalent to rev 360)

Changes:
- Rename classes to prefix "QMirClient" instead of "Ubuntu"
- Update licence headers to match Qt's
- change logging categories spec to match Qt: qt.qpa.mirclient
- Enforce American English
- some minor syntax tweaks

Some differences still exist:
- QPA plugin remains "ubuntumirclient" and not "mirclient" as used upstream.
- some header paths differ between in-Qt code and externally built code
- I've not included build-type switches for things like accessibility support
- relaxed switch cases to allow older versions of Mir not break a build
- panel height hack removed from upstream
- platform-api env var setting removed from upstream

files renamed:
src/ubuntumirclient/appstatecontroller.cpp => src/ubuntumirclient/qmirclientappstatecontroller.cpp

src/ubuntumirclient/appstatecontroller.h => src/ubuntumirclient/qmirclientappstatecontroller.h

src/ubuntumirclient/backingstore.cpp => src/ubuntumirclient/qmirclientbackingstore.cpp

src/ubuntumirclient/backingstore.h => src/ubuntumirclient/qmirclientbackingstore.h

src/ubuntumirclient/clipboard.cpp => src/ubuntumirclient/qmirclientclipboard.cpp

src/ubuntumirclient/clipboard.h => src/ubuntumirclient/qmirclientclipboard.h

src/ubuntumirclient/cursor.cpp => src/ubuntumirclient/qmirclientcursor.cpp

src/ubuntumirclient/cursor.h => src/ubuntumirclient/qmirclientcursor.h

src/ubuntumirclient/debugextension.cpp => src/ubuntumirclient/qmirclientdebugextension.cpp

src/ubuntumirclient/debugextension.h => src/ubuntumirclient/qmirclientdebugextension.h

src/ubuntumirclient/desktopwindow.cpp => src/ubuntumirclient/qmirclientdesktopwindow.cpp

src/ubuntumirclient/desktopwindow.h => src/ubuntumirclient/qmirclientdesktopwindow.h

src/ubuntumirclient/glcontext.cpp => src/ubuntumirclient/qmirclientglcontext.cpp

src/ubuntumirclient/glcontext.h => src/ubuntumirclient/qmirclientglcontext.h

src/ubuntumirclient/input.cpp => src/ubuntumirclient/qmirclientinput.cpp

src/ubuntumirclient/input.h => src/ubuntumirclient/qmirclientinput.h

src/ubuntumirclient/integration.cpp => src/ubuntumirclient/qmirclientintegration.cpp

src/ubuntumirclient/integration.h => src/ubuntumirclient/qmirclientintegration.h

src/ubuntumirclient/logging.h => src/ubuntumirclient/qmirclientlogging.h

src/ubuntumirclient/nativeinterface.cpp => src/ubuntumirclient/qmirclientnativeinterface.cpp

src/ubuntumirclient/nativeinterface.h => src/ubuntumirclient/qmirclientnativeinterface.h

src/ubuntumirclient/orientationchangeevent_p.h => src/ubuntumirclient/qmirclientorientationchangeevent_p.h

src/ubuntumirclient/platformservices.cpp => src/ubuntumirclient/qmirclientplatformservices.cpp

src/ubuntumirclient/platformservices.h => src/ubuntumirclient/qmirclientplatformservices.h

src/ubuntumirclient/plugin.cpp => src/ubuntumirclient/qmirclientplugin.cpp

src/ubuntumirclient/plugin.h => src/ubuntumirclient/qmirclientplugin.h

src/ubuntumirclient/screen.cpp => src/ubuntumirclient/qmirclientscreen.cpp

src/ubuntumirclient/screen.h => src/ubuntumirclient/qmirclientscreen.h

src/ubuntumirclient/screenobserver.cpp => src/ubuntumirclient/qmirclientscreenobserver.cpp

src/ubuntumirclient/screenobserver.h => src/ubuntumirclient/qmirclientscreenobserver.h

src/ubuntumirclient/window.cpp => src/ubuntumirclient/qmirclientwindow.cpp

src/ubuntumirclient/window.h => src/ubuntumirclient/qmirclientwindow.h

files modified:
README

src/ubuntumirclient/ubuntumirclient.pro

Show diffs side-by-side

added added

removed removed

src/ubuntumirclient/qmirclientintegration.h

* This program is free software: you can redistribute it and/or modify it under

* the terms of the GNU Lesser General Public License version 3, as published by

* the Free Software Foundation.

* This program is distributed in the hope that it will be useful, but WITHOUT

* ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

* SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

* Lesser General Public License for more details.

* You should have received a copy of the GNU Lesser General Public License

* along with this program. If not, see <http://www.gnu.org/licenses/>.

#ifndef UBUNTU_CLIENT_INTEGRATION_H

#define UBUNTU_CLIENT_INTEGRATION_H

/****************************************************************************

** Contact: https://www.qt.io/licensing/

** This file is part of the plugins of the Qt Toolkit.

** $QT_BEGIN_LICENSE:LGPL$

** Commercial License Usage

** Licensees holding valid commercial Qt licenses may use this file in

** accordance with the commercial license agreement provided with the

** Software or, alternatively, in accordance with the terms contained in

** a written agreement between you and The Qt Company. For licensing terms

** and conditions see https://www.qt.io/terms-conditions. For further

** information use the contact form at https://www.qt.io/contact-us.

** GNU Lesser General Public License Usage

** Alternatively, this file may be used under the terms of the GNU Lesser

** General Public License version 3 as published by the Free Software

** Foundation and appearing in the file LICENSE.LGPL3 included in the

** packaging of this file. Please review the following information to

** ensure the GNU Lesser General Public License version 3 requirements

** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.

** GNU General Public License Usage

** Alternatively, this file may be used under the terms of the GNU

** General Public License version 2.0 or (at your option) the GNU General

** Public license version 3 or any later version approved by the KDE Free

** Qt Foundation. The licenses are as published by the Free Software

** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3

** included in the packaging of this file. Please review the following

** information to ensure the GNU General Public License requirements will

** be met: https://www.gnu.org/licenses/gpl-2.0.html and

** https://www.gnu.org/licenses/gpl-3.0.html.

** $QT_END_LICENSE$

****************************************************************************/

#ifndef QMIRCLIENTINTEGRATION_H

#define QMIRCLIENTINTEGRATION_H

#include <qpa/qplatformintegration.h>

#include <QSharedPointer>

#include "appstatecontroller.h"

#include "platformservices.h"

#include "screenobserver.h"

#include "qmirclientappstatecontroller.h"

#include "qmirclientplatformservices.h"

#include "qmirclientscreenobserver.h"

// platform-api

#include <ubuntu/application/description.h>

#include <EGL/egl.h>

class UbuntuDebugExtension;

class UbuntuInput;

class UbuntuNativeInterface;

class UbuntuScreen;

class QMirClientDebugExtension;

class QMirClientInput;

class QMirClientNativeInterface;

class QMirClientScreen;

class MirConnection;

class UbuntuClientIntegration : public QObject, public QPlatformIntegration

class QMirClientClientIntegration : public QObject, public QPlatformIntegration

{

Q_OBJECT

public:

UbuntuClientIntegration(int argc, char **argv);

virtual ~UbuntuClientIntegration();

QMirClientClientIntegration(int argc, char **argv);

virtual ~QMirClientClientIntegration();

// QPlatformIntegration methods.

bool hasCapability(QPlatformIntegration::Capability cap) const override;

MirConnection *mirConnection() const { return mMirConnection; }

EGLDisplay eglDisplay() const { return mEglDisplay; }

EGLNativeDisplayType eglNativeDisplay() const { return mEglNativeDisplay; }

UbuntuAppStateController *appStateController() const { return mAppStateController.data(); }

UbuntuScreenObserver *screenObserver() const { return mScreenObserver.data(); }

UbuntuDebugExtension *debugExtension() const { return mDebugExtension.data(); }

QMirClientAppStateController *appStateController() const { return mAppStateController.data(); }

QMirClientScreenObserver *screenObserver() const { return mScreenObserver.data(); }

QMirClientDebugExtension *debugExtension() const { return mDebugExtension.data(); }

private Q_SLOTS:

void destroyScreen(UbuntuScreen *screen);

void destroyScreen(QMirClientScreen *screen);

100

private:

101

void setupOptions(QStringList &args);

103

static QByteArray generateSessionName(QStringList &args);

104

static QByteArray generateSessionNameFromQmlFile(QStringList &args);

105

UbuntuNativeInterface* mNativeInterface;

106

QMirClientNativeInterface* mNativeInterface;

107

QPlatformFontDatabase* mFontDb;

108

UbuntuPlatformServices* mServices;

109

QMirClientPlatformServices* mServices;

110

UbuntuInput* mInput;

111

QMirClientInput* mInput;

112

QPlatformInputContext* mInputContext;

113

mutable QScopedPointer<QPlatformAccessibility> mAccessibility;

QScopedPointer<UbuntuDebugExtension> mDebugExtension;

QScopedPointer<UbuntuScreenObserver> mScreenObserver;

QScopedPointer<UbuntuAppStateController> mAppStateController;

114

QScopedPointer<QMirClientDebugExtension> mDebugExtension;

115

QScopedPointer<QMirClientScreenObserver> mScreenObserver;

116

QScopedPointer<QMirClientAppStateController> mAppStateController;

117

qreal mScaleFactor;

118

119

MirConnection *mMirConnection;

104

128

EGLNativeDisplayType mEglNativeDisplay;

105

129

};

106

130

107

#endif // UBUNTU_CLIENT_INTEGRATION_H

131

#endif // QMIRCLIENTINTEGRATION_H

Older »