diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/WebGestureHelper.h --- a/ginebra2/WebGestureHelper.h Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/WebGestureHelper.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License as published by +* the Free Software Foundation, version 2.1 of the License. * -* Initial Contributors: -* Nokia Corporation - initial contribution. +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License for more details. * -* Contributors: +* 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/old-licenses/lgpl-2.1.html/". * -* Description: +* Description: * */ - #ifndef WEBGESTUREHELPER_H_ #define WEBGESTUREHELPER_H_ #include "qstmgestureapi.h" @@ -32,21 +35,21 @@ class WebGestureHelper { -public: - WebGestureHelper(QWidget* ctrl); - - virtual ~WebGestureHelper(); - - QStm_GestureEngineApi* gestureEngine() { return m_gestureEngine; } - QStm_GestureContext* gestureContext(){ return m_gestures; } - bool symbianEventFilter(const QSymbianEvent *event); - bool x11EventFilter (XEvent* event); - void setupGestureEngine(QWidget* ctrl); - +public: + WebGestureHelper(QWidget* ctrl); + + virtual ~WebGestureHelper(); + + QStm_GestureEngineApi* gestureEngine() { return m_gestureEngine; } + QStm_GestureContext* gestureContext(){ return m_gestures; } + bool symbianEventFilter(const QSymbianEvent *event); + bool x11EventFilter (XEvent* event); + void setupGestureEngine(QWidget* ctrl); + private: - QStm_GestureEngineApi* m_gestureEngine; + QStm_GestureEngineApi* m_gestureEngine; QStm_GestureContext* m_gestures; - QStm_GestureParameters* m_parameters; + QStm_GestureParameters* m_parameters; QWidget* m_ctrl; QStm_QtDummyGestureRecognizer* m_dummyRecognizer; Qt::GestureType m_qstmGestureType; @@ -60,22 +63,22 @@ class BrowserApp : public QApplication { - Q_OBJECT + Q_OBJECT public: - BrowserApp(int argc, char** argv); - virtual bool symbianEventFilter(const QSymbianEvent *event); + BrowserApp(int argc, char** argv); + virtual bool symbianEventFilter(const QSymbianEvent *event); virtual bool x11EventFilter (XEvent* event); - void setGestureHelper(WebGestureHelper* gh); - WebGestureHelper* gestureHelper() { return m_gestureHelper; } + void setGestureHelper(WebGestureHelper* gh); + WebGestureHelper* gestureHelper() { return m_gestureHelper; } - void setMainWindow(QWidget* mw) { m_mainWindow = mw; } - QWidget* mainWindow() { return m_mainWindow; } - QStm_GestureEngineApi* gestureEngine() { return m_gestureEngine; } - + void setMainWindow(QWidget* mw) { m_mainWindow = mw; } + QWidget* mainWindow() { return m_mainWindow; } + QStm_GestureEngineApi* gestureEngine() { return m_gestureEngine; } + private: - WebGestureHelper* m_gestureHelper; - QWidget* m_mainWindow; - QStm_GestureEngineApi* m_gestureEngine; + WebGestureHelper* m_gestureHelper; + QWidget* m_mainWindow; + QStm_GestureEngineApi* m_gestureEngine; }; @@ -83,11 +86,11 @@ class WebGestureHelperEventFilter : public QObject { public: - WebGestureHelperEventFilter() {} - virtual ~WebGestureHelperEventFilter() {} - static WebGestureHelperEventFilter* instance(); + WebGestureHelperEventFilter() {} + virtual ~WebGestureHelperEventFilter() {} + static WebGestureHelperEventFilter* instance(); bool eventFilter(QObject* receiver, QEvent* event); - + private: static WebGestureHelperEventFilter* m_instance; }; @@ -97,20 +100,20 @@ public QStm_GestureListenerApiIf { public: - QStm_QtDummyGestureRecognizer(QStm_GestureContext* ctx); - ~QStm_QtDummyGestureRecognizer(); - QGesture* create(QObject* target); - QGestureRecognizer::Result recognize(QGesture *state, - QObject *watched, - QEvent *event); - void reset(QGesture *state); - - //from QStm_GestureListenerApiIf - QStm_ProcessingResult handleGestureEvent(qstmGesture::QStm_GestureUid uid, qstmGesture::QStm_GestureIf* gesture); - -private: - QStm_GestureContext* m_context; - QStm_Gesture* m_currentGesture; + QStm_QtDummyGestureRecognizer(QStm_GestureContext* ctx); + ~QStm_QtDummyGestureRecognizer(); + QGesture* create(QObject* target); + QGestureRecognizer::Result recognize(QGesture *state, + QObject *watched, + QEvent *event); + void reset(QGesture *state); + + //from QStm_GestureListenerApiIf + QStm_ProcessingResult handleGestureEvent(qstmGesture::QStm_GestureUid uid, qstmGesture::QStm_GestureIf* gesture); + +private: + QStm_GestureContext* m_context; + QStm_Gesture* m_currentGesture; }; #endif /* GESTUREHELPER_H_ */