~phablet-team/qtubuntu/trunk

Update code to use new Mir Api's.

Changes:
- Update/Remove deprecated code to fix build issues

Approved by: Daniel d'Andrada

added added

removed removed

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

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

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

, m_mapper(nullptr)

{

qCDebug(mirclientDebug) << "NOTICE: Loading mirclient-debug-extension";

m_mapper = (MapperPrototype) m_mirclientDebug.resolve("mir_debug_surface_coords_to_screen");

m_mapper = (MapperPrototype) m_mirclientDebug.resolve("mir_extension_window_coordinate_translation");

if (!m_mirclientDebug.isLoaded()) {

qCWarning(mirclientDebug) << "ERROR: mirclient-debug-extension failed to load:"

return m_mirclientDebug.isLoaded() && m_mapper;

}

QPoint QMirClientDebugExtension::mapSurfacePointToScreen(MirSurface *surface, const QPoint &point)

QPoint QMirClientDebugExtension::mapWindowPointToScreen(MirWindow *window, const QPoint &point)

{

if (!m_mapper) {

return point;

}

QPoint mappedPoint;

bool status = m_mapper(surface, point.x(), point.y(), &mappedPoint.rx(), &mappedPoint.ry());

bool status = m_mapper(window, point.x(), point.y(), &mappedPoint.rx(), &mappedPoint.ry());

if (status) {

return mappedPoint;

} else {