diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2011-07-19 10:40:05 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-19 03:06:23 +0200 |
commit | eccb43d73c08b85bab89d8f632d423b63592e14f (patch) | |
tree | e16b44f1548a48f49b64c58263dd067b67232a8e /examples/declarative-camera | |
parent | 1403a1c7be7892ad4d1c5d04c143a318055fb36b (diff) |
Remove a few more obsolete parts.
Change-Id: I3a001f01ab7fd8cf63452126037b98c1b01df80d
Reviewed-on: http://codereview.qt.nokia.com/1797
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'examples/declarative-camera')
5 files changed, 5 insertions, 216 deletions
diff --git a/examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.cpp b/examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.cpp deleted file mode 100644 index 30723af40..000000000 --- a/examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.cpp +++ /dev/null @@ -1,101 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "camerakeyevent_symbian.h" - -#include <QtGui/QWidget> // WId -#include <eikon.hrh> // EKeyCamera -#include <coecntrl.h> // CCoeControl (WId) -#include <w32std.h> // RWindowbase, RWindowGroup, RWsSession - -QSymbianCameraKeyListener::QSymbianCameraKeyListener(QWidget *widget): - QObject(widget), - m_widget(widget) -{ - if (!m_widget) - return; - - // Get view's native Symbian window - WId windowId = 0; - if (m_widget->internalWinId()) - windowId = m_widget->internalWinId(); - else if (m_widget->parentWidget() && m_widget->effectiveWinId()) - windowId = m_widget->effectiveWinId(); - RWindowBase *window = windowId ? static_cast<RWindowBase*>(windowId->DrawableWindow()) : 0; - - // Get hold of the window group - TInt wGroupId = window ? window->WindowGroupId() : 0; - if (!wGroupId) - return; - RWsSession &wsSession = CCoeEnv::Static()->WsSession(); - TUint wGroupHandle = wsSession.GetWindowGroupHandle(wGroupId); - if (wGroupHandle) { - RWindowGroup wGroup(wsSession); - wGroup.Construct(wGroupHandle); - if (wGroup.CaptureKey(EKeyCamera, 0, 0, 100) < 0) - qWarning("Unable to register for camera capture key events, SwEvent capability may be missing"); - } -} - -QSymbianCameraKeyListener::~QSymbianCameraKeyListener() -{ - if (!m_widget) - return; - - // Get view's native Symbian window - WId windowId = 0; - if (m_widget->internalWinId()) - windowId = m_widget->internalWinId(); - else if (m_widget->parentWidget() && m_widget->effectiveWinId()) - windowId = m_widget->effectiveWinId(); - RWindowBase *window = windowId ? static_cast<RWindowBase*>(windowId->DrawableWindow()) : 0; - - // Get hold of the window group - TInt wGroupId = window ? window->WindowGroupId() : 0; - if (!wGroupId) - return; - RWsSession &wsSession = CCoeEnv::Static()->WsSession(); - TUint wGroupHandle = wsSession.GetWindowGroupHandle(wGroupId); - if (wGroupHandle) { - RWindowGroup wGroup(wsSession); - wGroup.Construct(wGroupHandle); - wGroup.CancelCaptureKey(EKeyCamera); - } -} diff --git a/examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.h b/examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.h deleted file mode 100644 index 4cd5701b9..000000000 --- a/examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.h +++ /dev/null @@ -1,87 +0,0 @@ -#ifndef CAMERAKEYEVENT_SYMBIAN_H -#define CAMERAKEYEVENT_SYMBIAN_H - -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/* - * Description: - * This header can be used to register application on Symbian platforms - * for the Camera capture button key events. Application can avoid native - * camera application from starting by not forwarding the key event. - * - * Usage: - * Application needs to include this header and include the needed Symbian - * libraries. Optionally application can include camerakeyevent_symbian.pri - * file. Application can register and unregister for the Camera capture - * key events by creating/destructing the QSymbianCameraKeyListener helper - * object. The widget needs to be shown before it registers for the - * Camera key event. - * - * Libraries needed: - * User needs to define following in the .pro file (or optionally include - * the camerakeyevent_symbian.pri): - * LIBS += -lcone -lws32 - * - * Symbian Capabilities needed: - * To use this header user needs to have SwEvent capability (included in - * the camerakeyevent_symbian.pri): - * TARGET.CAPABILITY += SwEvent - */ - -#include <QtCore/QObject> - -QT_BEGIN_NAMESPACE -QT_FORWARD_DECLARE_CLASS(QWidget) -QT_END_NAMESPACE - -QT_USE_NAMESPACE - -class QSymbianCameraKeyListener : public QObject -{ - Q_OBJECT -public: - QSymbianCameraKeyListener(QWidget *parent = 0); - ~QSymbianCameraKeyListener(); -private: - QWidget *m_widget; -}; - -#endif // CAMERAKEYEVENT_SYMBIAN_H diff --git a/examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.pri b/examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.pri deleted file mode 100644 index 097c3b245..000000000 --- a/examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.pri +++ /dev/null @@ -1,7 +0,0 @@ -message("camerakeyevent_symbian: Including Symbian camera capture key event register methods") - -HEADERS += $$PWD/camerakeyevent_symbian.h -SOURCES += $$PWD/camerakeyevent_symbian.cpp -INCLUDEPATH += $$PWD -LIBS *= -lcone -lws32 -TARGET.CAPABILITY *= SwEvent diff --git a/examples/declarative-camera/declarative-camera.pro b/examples/declarative-camera/declarative-camera.pro index 22112bf30..455ea6298 100644 --- a/examples/declarative-camera/declarative-camera.pro +++ b/examples/declarative-camera/declarative-camera.pro @@ -3,10 +3,8 @@ TEMPLATE=app QT += declarative qtquick1 network multimediakit -!maemo5 { - contains(QT_CONFIG, opengl) { - QT += opengl - } +contains(QT_CONFIG, opengl) { + QT += opengl } SOURCES += $$PWD/qmlcamera.cpp @@ -15,13 +13,6 @@ else:TARGET = QmlCamera RESOURCES += declarative-camera.qrc -symbian { - include(camerakeyevent_symbian/camerakeyevent_symbian.pri) - load(data_caging_paths) - TARGET.CAPABILITY += UserEnvironment NetworkServices Location ReadUserData WriteUserData - TARGET.EPOCHEAPSIZE = 0x20000 0x3000000 -} - target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/qml_camera sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/qml_camera diff --git a/examples/declarative-camera/qmlcamera.cpp b/examples/declarative-camera/qmlcamera.cpp index 8494e3feb..409b46440 100644 --- a/examples/declarative-camera/qmlcamera.cpp +++ b/examples/declarative-camera/qmlcamera.cpp @@ -47,14 +47,10 @@ #include <QtOpenGL/QGLWidget> #endif -#ifdef Q_OS_SYMBIAN -#include "camerakeyevent_symbian.h" -#endif // Q_OS_SYMBIAN - int main(int argc, char *argv[]) { -#if defined (Q_WS_X11) || defined (Q_WS_MAC) || defined (Q_OS_SYMBIAN) +#if defined (Q_WS_X11) || defined (Q_WS_MAC) //### default to using raster graphics backend for now bool gsSpecified = false; for (int i = 0; i < argc; ++i) { @@ -72,7 +68,7 @@ int main(int argc, char *argv[]) QApplication application(argc, argv); const QString mainQmlApp = QLatin1String("qrc:/declarative-camera.qml"); QDeclarativeView view; -#if !defined(QT_NO_OPENGL) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_S60) +#if !defined(QT_NO_OPENGL) view.setViewport(new QGLWidget); #endif view.setSource(QUrl(mainQmlApp)); @@ -80,12 +76,9 @@ int main(int argc, char *argv[]) // Qt.quit() called in embedded .qml by default only emits // quit() signal, so do this (optionally use Qt.exit()). QObject::connect(view.engine(), SIGNAL(quit()), qApp, SLOT(quit())); -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) +#if defined(Q_WS_MAEMO_6) view.setGeometry(application.desktop()->screenGeometry()); view.showFullScreen(); -#ifdef Q_OS_SYMBIAN - new QSymbianCameraKeyListener(&view); -#endif // Q_OS_SYMBIAN #else view.setGeometry(QRect(100, 100, 800, 480)); view.show(); |