AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iOS: refactor general convenience functions into new file 'qiosglobal'

Browse Source 
Some functions are needed across several files and classes. Lets
place them in a common file for all to use.

Change-Id: I5f9b578f948d66d10e57a835b80b5c493e07fb4c
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
This commit is contained in:
Richard Moe Gustavsen 2012-12-18 10:15:39 +01:00 committed by Tor Arne Vestbø
parent 54448b2f9f
commit 5abe9aa435
7 changed files with 170 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/ios/plugin.pro
View File

@ -17,7 +17,8 @@ OBJECTIVE_SOURCES = \
qiosviewcontroller.mm \
qioscontext.mm \
qiosinputcontext.mm \
qiostheme.mm
qiostheme.mm \
qiosglobal.mm
HEADERS = \
qiosintegration.h \
@ -29,6 +30,7 @@ HEADERS = \
qiosviewcontroller.h \
qioscontext.h \
qiosinputcontext.h \
qiostheme.h
qiostheme.h \
qiosglobal.h
#HEADERS = qiossoftwareinputhandler.h

59
src/plugins/platforms/ios/qiosglobal.h Normal file
View File

@ -0,0 +1,59 @@
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** 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 Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QIOSGLOBAL_H
#define QIOSGLOBAL_H
#import <UIKit/UIKit.h>
#import <QtCore/qglobal.h>
#import <QtGui/qguiapplication.h>
#import "qiosscreen.h"
QT_BEGIN_NAMESPACE
CGRect toCGRect(const QRect &rect);
QRect fromCGRect(const CGRect &rect);
Qt::ScreenOrientation toQtScreenOrientation(UIDeviceOrientation uiDeviceOrientation);
UIDeviceOrientation fromQtScreenOrientation(Qt::ScreenOrientation qtOrientation);
QT_END_NAMESPACE
#endif // QIOSGLOBAL_H

104
src/plugins/platforms/ios/qiosglobal.mm Normal file
View File

@ -0,0 +1,104 @@
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** 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 Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "qiosglobal.h"
#include <QtGui/qscreen.h>
QT_BEGIN_NAMESPACE
CGRect toCGRect(const QRect &rect)
{
return CGRectMake(rect.x(), rect.y(), rect.width(), rect.height());
}
QRect fromCGRect(const CGRect &rect)
{
return QRect(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
}
Qt::ScreenOrientation toQtScreenOrientation(UIDeviceOrientation uiDeviceOrientation)
{
Qt::ScreenOrientation qtOrientation;
switch (uiDeviceOrientation) {
case UIDeviceOrientationPortraitUpsideDown:
qtOrientation = Qt::InvertedPortraitOrientation;
break;
case UIDeviceOrientationLandscapeLeft:
qtOrientation = Qt::InvertedLandscapeOrientation;
break;
case UIDeviceOrientationLandscapeRight:
qtOrientation = Qt::LandscapeOrientation;
break;
case UIDeviceOrientationFaceUp:
case UIDeviceOrientationFaceDown:
qtOrientation = static_cast<Qt::ScreenOrientation>(-1); // not supported ATM.
break;
default:
qtOrientation = Qt::PortraitOrientation;
break;
}
return qtOrientation;
}
UIDeviceOrientation fromQtScreenOrientation(Qt::ScreenOrientation qtOrientation)
{
UIDeviceOrientation uiOrientation;
switch (qtOrientation) {
case Qt::LandscapeOrientation:
uiOrientation = UIDeviceOrientationLandscapeRight;
break;
case Qt::InvertedLandscapeOrientation:
uiOrientation = UIDeviceOrientationLandscapeLeft;
break;
case Qt::InvertedPortraitOrientation:
uiOrientation = UIDeviceOrientationPortraitUpsideDown;
break;
case Qt::PrimaryOrientation:
case Qt::PortraitOrientation:
default:
uiOrientation = UIDeviceOrientationPortrait;
break;
}
return uiOrientation;
}
QT_END_NAMESPACE

3
src/plugins/platforms/ios/qiosscreen.h
View File

@ -50,9 +50,6 @@
QT_BEGIN_NAMESPACE
Qt::ScreenOrientation toQtScreenOrientation(UIDeviceOrientation uiDeviceOrientation);
UIDeviceOrientation fromQtScreenOrientation(Qt::ScreenOrientation qtOrientation);
class QIOSScreen : public QPlatformScreen
{
public:

49
src/plugins/platforms/ios/qiosscreen.mm
View File

@ -39,6 +39,7 @@
**
****************************************************************************/
#include "qiosglobal.h"
#include "qiosscreen.h"
#include "qioswindow.h"
#include <qpa/qwindowsysteminterface.h>
@ -88,54 +89,6 @@
@end
QT_BEGIN_NAMESPACE
Qt::ScreenOrientation toQtScreenOrientation(UIDeviceOrientation uiDeviceOrientation)
{
Qt::ScreenOrientation qtOrientation;
switch (uiDeviceOrientation) {
case UIDeviceOrientationPortraitUpsideDown:
qtOrientation = Qt::InvertedPortraitOrientation;
break;
case UIDeviceOrientationLandscapeLeft:
qtOrientation = Qt::InvertedLandscapeOrientation;
break;
case UIDeviceOrientationLandscapeRight:
qtOrientation = Qt::LandscapeOrientation;
break;
case UIDeviceOrientationFaceUp:
case UIDeviceOrientationFaceDown:
qtOrientation = static_cast<Qt::ScreenOrientation>(-1); // not supported ATM.
break;
default:
qtOrientation = Qt::PortraitOrientation;
break;
}
return qtOrientation;
}
UIDeviceOrientation fromQtScreenOrientation(Qt::ScreenOrientation qtOrientation)
{
UIDeviceOrientation uiOrientation;
switch (qtOrientation) {
case Qt::LandscapeOrientation:
uiOrientation = UIDeviceOrientationLandscapeRight;
break;
case Qt::InvertedLandscapeOrientation:
uiOrientation = UIDeviceOrientationLandscapeLeft;
break;
case Qt::InvertedPortraitOrientation:
uiOrientation = UIDeviceOrientationPortraitUpsideDown;
break;
case Qt::PrimaryOrientation:
case Qt::PortraitOrientation:
default:
uiOrientation = UIDeviceOrientationPortrait;
break;
}
return uiOrientation;
}
/*!
Returns the model identifier of the device.

1
src/plugins/platforms/ios/qiosviewcontroller.mm
View File

@ -44,6 +44,7 @@
#include <QtGui/QGuiApplication>
#include <QtGui/QScreen>
#include "qiosscreen.h"
#include "qiosglobal.h"
@implementation QIOSViewController

11
src/plugins/platforms/ios/qioswindow.mm
View File

@ -39,6 +39,7 @@
**
****************************************************************************/
#include "qiosglobal.h"
#include "qioswindow.h"
#include "qioscontext.h"
#include "qiosscreen.h"
@ -52,16 +53,6 @@
#include <QtDebug>
static CGRect toCGRect(const QRect &rect)
{
return CGRectMake(rect.x(), rect.y(), rect.width(), rect.height());
}
static QRect fromCGRect(const CGRect &rect)
{
return QRect(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
}
@implementation EAGLView
+ (Class)layerClass