From 27ace2c1eb1faecf01b6229cf7ebb7534a1c6125 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 12 May 2009 18:48:22 +0200 Subject: Qt-ifications. Mostly license headers and coding conventions. --- src/gui/softkeys/qsoftkeyaction.cpp | 48 ++++++++++++--- src/gui/softkeys/qsoftkeyaction.h | 60 ++++++++++++++----- src/gui/softkeys/qsoftkeystack.cpp | 104 ++++++++++++--------------------- src/gui/softkeys/qsoftkeystack.h | 91 ++++++++++++++--------------- src/gui/softkeys/qsoftkeystack_p.h | 86 +++++++++++++++++++++++++++ src/gui/softkeys/qsoftkeystack_s60.cpp | 100 +++++++++++++++++++++++++++++++ src/gui/softkeys/softkeys.pro | 2 + 7 files changed, 355 insertions(+), 136 deletions(-) create mode 100644 src/gui/softkeys/qsoftkeystack_p.h create mode 100644 src/gui/softkeys/qsoftkeystack_s60.cpp diff --git a/src/gui/softkeys/qsoftkeyaction.cpp b/src/gui/softkeys/qsoftkeyaction.cpp index bfa8330..1d21376 100644 --- a/src/gui/softkeys/qsoftkeyaction.cpp +++ b/src/gui/softkeys/qsoftkeyaction.cpp @@ -1,11 +1,41 @@ /**************************************************************************** ** -** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** -** This file is part of the $MODULE$ of the Qt Toolkit. +** This file is part of the QtGui module of the Qt Toolkit. ** -** $TROLLTECH_DUAL_LICENSE$ +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -57,7 +87,7 @@ QSoftKeyAction::QSoftKeyAction(QObject *parent) d = new QSoftKeyActionPrivate(); } -QSoftKeyAction::QSoftKeyAction(QSoftKeyAction::StandardRole role, QObject *parent) +QSoftKeyAction::QSoftKeyAction(StandardRole role, QObject *parent) : QAction(parent) { d = new QSoftKeyActionPrivate(role); @@ -69,7 +99,7 @@ QSoftKeyAction::QSoftKeyAction(const QString &text, QObject* parent) d = new QSoftKeyActionPrivate(); } -QSoftKeyAction::QSoftKeyAction(QSoftKeyAction::StandardRole role, const QString &text, QObject* parent) +QSoftKeyAction::QSoftKeyAction(StandardRole role, const QString &text, QObject* parent) : QAction(text, parent) { d = new QSoftKeyActionPrivate(role); @@ -81,7 +111,7 @@ QSoftKeyAction::QSoftKeyAction(const QIcon &icon, const QString &text, QObject* d = new QSoftKeyActionPrivate(); } -QSoftKeyAction::QSoftKeyAction(QSoftKeyAction::StandardRole role, const QIcon &icon, const QString &text, QObject* parent) +QSoftKeyAction::QSoftKeyAction(StandardRole role, const QIcon &icon, const QString &text, QObject* parent) : QAction(icon, text, parent) { d = new QSoftKeyActionPrivate(role); @@ -120,7 +150,7 @@ QString QSoftKeyAction::roleName() const \sa role(), roleName() */ -void QSoftKeyAction::setRole(QSoftKeyAction::StandardRole role) +void QSoftKeyAction::setRole(StandardRole role) { d->role = role; d->roleName = QString(); @@ -140,7 +170,7 @@ void QSoftKeyAction::setRole(const QString& role) emit changed(); } -int QSoftKeyAction::nativePosition() +int QSoftKeyAction::nativePosition() const { return d->nativePosition; } @@ -150,7 +180,7 @@ void QSoftKeyAction::setNativePosition(int position) d->nativePosition = position; } -int QSoftKeyAction::qtContextKey() +int QSoftKeyAction::qtContextKey() const { return d->qtContextKey; } diff --git a/src/gui/softkeys/qsoftkeyaction.h b/src/gui/softkeys/qsoftkeyaction.h index 76be8ee..e735376 100644 --- a/src/gui/softkeys/qsoftkeyaction.h +++ b/src/gui/softkeys/qsoftkeyaction.h @@ -1,27 +1,57 @@ /**************************************************************************** ** -** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** -** This file is part of the $MODULE$ of the Qt Toolkit. +** This file is part of the QtGui module of the Qt Toolkit. ** -** $TROLLTECH_DUAL_LICENSE$ +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ ** ****************************************************************************/ #ifndef QSOFTKEYACTION_H #define QSOFTKEYACTION_H -#include +#include "QtGui/qaction.h" + +QT_BEGIN_NAMESPACE class QSoftKeyActionPrivate; class QSoftKeyAction : public QAction { - Q_OBJECT public: - enum StandardRole - { + enum StandardRole { Options, Select, Back, @@ -41,24 +71,26 @@ public: }; QSoftKeyAction(QObject *parent); - QSoftKeyAction(QSoftKeyAction::StandardRole role, QObject *parent); + QSoftKeyAction(StandardRole role, QObject *parent); QSoftKeyAction(const QString &text, QObject* parent); - QSoftKeyAction(QSoftKeyAction::StandardRole role, const QString &text, QObject* parent); + QSoftKeyAction(StandardRole role, const QString &text, QObject* parent); QSoftKeyAction(const QIcon &icon, const QString &text, QObject* parent); - QSoftKeyAction(QSoftKeyAction::StandardRole role, const QIcon &icon, const QString &text, QObject* parent); + QSoftKeyAction(StandardRole role, const QIcon &icon, const QString &text, QObject* parent); ~QSoftKeyAction(); - QSoftKeyAction::StandardRole role() const; + StandardRole role() const; QString roleName() const; - void setRole(QSoftKeyAction::StandardRole role); + void setRole(StandardRole role); void setRole(const QString& role); - int nativePosition(); + int nativePosition() const; void setNativePosition(int position); - int qtContextKey(); + int qtContextKey() const; void setQtContextKey(int position); QSoftKeyActionPrivate *d; }; +QT_END_NAMESPACE + #endif // QSOFTKEYACTION_H diff --git a/src/gui/softkeys/qsoftkeystack.cpp b/src/gui/softkeys/qsoftkeystack.cpp index c1d6e98..a8bd3a9 100644 --- a/src/gui/softkeys/qsoftkeystack.cpp +++ b/src/gui/softkeys/qsoftkeystack.cpp @@ -1,24 +1,46 @@ /**************************************************************************** ** -** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** -** This file is part of the $MODULE$ of the Qt Toolkit. +** This file is part of the QtGui module of the Qt Toolkit. ** -** $TROLLTECH_DUAL_LICENSE$ +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ ** ****************************************************************************/ -#include -#include -#include -#include -#include - -#include "private/qcore_symbian_p.h" - - #include "qsoftkeystack.h" +#include "qsoftkeystack_p.h" QSoftKeyStackPrivate::QSoftKeyStackPrivate() { @@ -30,65 +52,15 @@ QSoftKeyStackPrivate::~QSoftKeyStackPrivate() } -void QSoftKeyStackPrivate::mapSoftKeys(QSoftkeySet& top) -{ - if( top.count() == 1) - { - top.at(0)->setNativePosition(2); - top.at(0)->setQtContextKey(Qt::Key_Context2); - } - else - { - // FIX THIS - // veryWeirdMagic is needes as s60 5th edition sdk always panics if cba is set with index 1, this hops over it - // This needs further investigation why so that the hack can be removed - int veryWeirdMagic = 0; - for (int index=0;indexsetNativePosition(index+veryWeirdMagic); - top.at(index)->setQtContextKey(Qt::Key_Context1+index); - if (veryWeirdMagic==0) - veryWeirdMagic=1; - } - } -} - -void QSoftKeyStackPrivate::setNativeSoftKeys() -{ - CCoeAppUi* appui = CEikonEnv::Static()->AppUi(); - CAknAppUi* aknAppUi = static_cast (appui); - CEikButtonGroupContainer* nativeContainer = aknAppUi->Cba(); - nativeContainer->SetCommandSetL(R_AVKON_SOFTKEYS_EMPTY_WITH_IDS); - if(softKeyStack.isEmpty()) - return; - - QSoftkeySet top = softKeyStack.top(); - mapSoftKeys(top); - - for (int index=0;indextext()); - CleanupStack::PushL(text); - if (softKeyAction->role() == QSoftKeyAction::Menu) { - nativeContainer->SetCommandL(softKeyAction->nativePosition(), EAknSoftkeyOptions, *text); - } - else { - nativeContainer->SetCommandL(softKeyAction->nativePosition(), SOFTKEYSTART+softKeyAction->qtContextKey(), *text); - } - CleanupStack::PopAndDestroy(); - } -} - void QSoftKeyStackPrivate::push(QSoftKeyAction *softKey) { QSoftkeySet softKeySet; - softKeySet.append( softKey ); + softKeySet.append(softKey); softKeyStack.push(softKeySet); setNativeSoftKeys(); } -void QSoftKeyStackPrivate::push( QList softkeys) +void QSoftKeyStackPrivate::push(const QList &softkeys) { QSoftkeySet softKeySet(softkeys); softKeyStack.push(softKeySet); @@ -101,7 +73,7 @@ void QSoftKeyStackPrivate::pop() setNativeSoftKeys(); } -EXPORT_C QSoftKeyStack::QSoftKeyStack(QWidget *parent) +QSoftKeyStack::QSoftKeyStack(QWidget *parent) { d = new QSoftKeyStackPrivate(); } @@ -116,7 +88,7 @@ void QSoftKeyStack::push(QSoftKeyAction *softKey) d->push(softKey); } -void QSoftKeyStack::push(QList softKeys) +void QSoftKeyStack::push(const QList &softKeys) { d->push(softKeys); } diff --git a/src/gui/softkeys/qsoftkeystack.h b/src/gui/softkeys/qsoftkeystack.h index b96bf60..90df43d 100644 --- a/src/gui/softkeys/qsoftkeystack.h +++ b/src/gui/softkeys/qsoftkeystack.h @@ -1,77 +1,74 @@ /**************************************************************************** ** -** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** -** This file is part of the $MODULE$ of the Qt Toolkit. +** This file is part of the QtGui module of the Qt Toolkit. ** -** $TROLLTECH_DUAL_LICENSE$ +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ ** ****************************************************************************/ #ifndef QSOFTKEYSTACK_H #define QSOFTKEYSTACK_H -#include -#include -#include +#include "QtGui/qwidget.h" +#include "QtGui/qaction.h" +#include "qstack.h" #include "qsoftkeyaction.h" -#define QSoftkeySet QList -#define SOFTKEYSTART 5000 -#define SOFTKEYEND 5000+Qt::Key_Context4 +QT_BEGIN_NAMESPACE -class QSoftKeyStackPrivate : public QObject - { - Q_OBJECT - public: - IMPORT_C QSoftKeyStackPrivate(); - ~QSoftKeyStackPrivate(); - -public: - void push(QSoftKeyAction *softKey); - void push(QList softKeys); - void pop(); - -private: - void mapSoftKeys(QSoftkeySet& top); - void setNativeSoftKeys(); - -private: - QStack softKeyStack; - }; - - - -/*class QSoftkeySet - { - const QList softkeys; - }; +#define QSoftkeySet QList +class QSoftKeyStackPrivate; -class QSoftkeySet - { - const QList softkeys; - }; -*/ class QSoftKeyStack : public QObject { - Q_OBJECT public: - IMPORT_C QSoftKeyStack(QWidget *parent); + QSoftKeyStack(QWidget *parent); ~QSoftKeyStack(); + public: void push(QSoftKeyAction *softKey); - void push(QList softkeys); + void push(const QList &softkeys); void pop(); -protected: - -private Q_SLOTS: private: QSoftKeyStackPrivate *d; - }; +QT_END_NAMESPACE + #endif // QSOFTKEYSTACK_H diff --git a/src/gui/softkeys/qsoftkeystack_p.h b/src/gui/softkeys/qsoftkeystack_p.h new file mode 100644 index 0000000..8e029af --- /dev/null +++ b/src/gui/softkeys/qsoftkeystack_p.h @@ -0,0 +1,86 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QSOFTKEYSTACK_P_H +#define QSOFTKEYSTACK_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "QtGui/qwidget.h" +#include "QtGui/qaction.h" +#include "qstack.h" + +#include "qsoftkeyaction.h" + +QT_BEGIN_NAMESPACE + +#define QSoftkeySet QList + +class QSoftKeyStackPrivate : public QObject +{ +public: + QSoftKeyStackPrivate(); + ~QSoftKeyStackPrivate(); + + void push(QSoftKeyAction *softKey); + void push(const QList &softKeys); + void pop(); + +private: + void mapSoftKeys(const QSoftkeySet &top); + void setNativeSoftKeys(); + +private: + QStack softKeyStack; +}; + +QT_END_NAMESPACE + +#endif // QSOFTKEYSTACK_P_H diff --git a/src/gui/softkeys/qsoftkeystack_s60.cpp b/src/gui/softkeys/qsoftkeystack_s60.cpp new file mode 100644 index 0000000..ce4f116 --- /dev/null +++ b/src/gui/softkeys/qsoftkeystack_s60.cpp @@ -0,0 +1,100 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include +#include +#include + +#include "private/qcore_symbian_p.h" + +#include "qsoftkeystack_p.h" + +#define SOFTKEYSTART 5000 +#define SOFTKEYEND (5000 + Qt::Key_Context4) + +void QSoftKeyStackPrivate::mapSoftKeys(const QSoftkeySet &top) +{ + if (top.count() == 1) { + top.at(0)->setNativePosition(2); + top.at(0)->setQtContextKey(Qt::Key_Context2); + } + else { + // FIX THIS + // veryWeirdMagic is needes as s60 5th edition sdk always panics if cba is set with index 1, this hops over it + // This needs further investigation why so that the hack can be removed + int veryWeirdMagic = 0; + for (int index = 0; index < top.count(); index++) { + top.at(index)->setNativePosition(index + veryWeirdMagic); + top.at(index)->setQtContextKey(Qt::Key_Context1 + index); + if (veryWeirdMagic == 0) + veryWeirdMagic = 1; + } + } +} + +void QSoftKeyStackPrivate::setNativeSoftKeys() +{ + CCoeAppUi* appui = CEikonEnv::Static()->AppUi(); + CAknAppUi* aknAppUi = static_cast (appui); + CEikButtonGroupContainer* nativeContainer = aknAppUi->Cba(); + nativeContainer->SetCommandSetL(R_AVKON_SOFTKEYS_EMPTY_WITH_IDS); + if (softKeyStack.isEmpty()) + return; + + const QSoftkeySet top = softKeyStack.top(); + mapSoftKeys(top); + + for (int index = 0; index < top.count(); index++) { + const QSoftKeyAction* softKeyAction = top.at(index); + HBufC* text = qt_QString2HBufCNewL(softKeyAction->text()); + CleanupStack::PushL(text); + if (softKeyAction->role() == QSoftKeyAction::Menu) { + nativeContainer->SetCommandL(softKeyAction->nativePosition(), EAknSoftkeyOptions, *text); + } else { + nativeContainer->SetCommandL(softKeyAction->nativePosition(), SOFTKEYSTART + softKeyAction->qtContextKey(), *text); + } + CleanupStack::PopAndDestroy(); + } +} + + diff --git a/src/gui/softkeys/softkeys.pro b/src/gui/softkeys/softkeys.pro index 88a813e..6bb584e 100644 --- a/src/gui/softkeys/softkeys.pro +++ b/src/gui/softkeys/softkeys.pro @@ -3,11 +3,13 @@ TARGET = softkeys HEADERS += \ qsoftkeystack.h \ + qsoftkeystack_p.h \ qsoftkeyaction.h SOURCES += \ main.cpp \ qsoftkeyaction.cpp \ + qsoftkeystack_s60.cpp \ qsoftkeystack.cpp iCONFIG += qt debug warn_on -- cgit v0.12