diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-18 09:54:31 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-18 15:47:49 +0200 |
| commit | 87274e272d2a854563066489e20d019b4e6320de (patch) | |
| tree | d01e71403a41db3ca2b83599fcc7036d79d7a13e /examples/widgets | |
| parent | 08e24858607d1b1483fb1faa54effa957501cfbb (diff) | |
QtBase examples: Remove Maemo/Symbian-specific code.
- Maemo/Symbian are no longer supported and QWidget-based examples
are no longer supposed to run on mobile platforms, so, remove any
Maemo/Symbian or mobile-specific code from source files and
profiles.
- Remove Maemo/Symbian vibration examples.
- Change Q_WS_MAC/WIN to Q_OS_MAC/WIN where appropriate.
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Change-Id: I488a0adadb98934567aa6416206a80465c9c3a81
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'examples/widgets')
72 files changed, 1 insertions, 1737 deletions
diff --git a/examples/widgets/analogclock/analogclock.pro b/examples/widgets/analogclock/analogclock.pro index c8e1dc916d..a2641150e2 100644 --- a/examples/widgets/analogclock/analogclock.pro +++ b/examples/widgets/analogclock/analogclock.pro @@ -8,10 +8,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS analogclock.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/analogclock INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000A64F - CONFIG += qt_example -} QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/widgets/analogclock/main.cpp b/examples/widgets/analogclock/main.cpp index 040fbb0265..0f31f07573 100644 --- a/examples/widgets/analogclock/main.cpp +++ b/examples/widgets/analogclock/main.cpp @@ -46,10 +46,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); AnalogClock clock; -#if defined(Q_OS_SYMBIAN) - clock.showMaximized(); -#else clock.show(); -#endif return app.exec(); } diff --git a/examples/widgets/applicationicon/applicationicon.pro b/examples/widgets/applicationicon/applicationicon.pro index dd4ace3993..6b14644e12 100644 --- a/examples/widgets/applicationicon/applicationicon.pro +++ b/examples/widgets/applicationicon/applicationicon.pro @@ -9,22 +9,3 @@ SOURCES += main.cpp OTHER_FILES += applicationicon.svg \ applicationicon.png \ applicationicon.desktop - -symbian { - CONFIG += qt_example - # override icon - ICON = applicationicon.svg - TARGET.UID3 = 0xe9f919ee - TARGET.EPOCSTACKSIZE = 0x14000 - TARGET.EPOCHEAPSIZE = 0x020000 0x800000 -} - -maemo5 { - CONFIG += qt_example - - # override icon from maemo5pkgrules.pri - icon.files = $${TARGET}.png -} -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) -simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/applicationicon/main.cpp b/examples/widgets/applicationicon/main.cpp index 24bc747d18..0573383620 100644 --- a/examples/widgets/applicationicon/main.cpp +++ b/examples/widgets/applicationicon/main.cpp @@ -45,10 +45,6 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); QLabel label(QObject::tr("Hello, world!")); -#if defined(Q_WS_S60) - label.showMaximized(); -#else label.show(); -#endif return a.exec(); } diff --git a/examples/widgets/calculator/calculator.cpp b/examples/widgets/calculator/calculator.cpp index acdb319952..1e5db2f0b2 100644 --- a/examples/widgets/calculator/calculator.cpp +++ b/examples/widgets/calculator/calculator.cpp @@ -98,11 +98,7 @@ Calculator::Calculator(QWidget *parent) //! [5] QGridLayout *mainLayout = new QGridLayout; //! [5] //! [6] -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - mainLayout->setSizeConstraint(QLayout::SetNoConstraint); -#else mainLayout->setSizeConstraint(QLayout::SetFixedSize); -#endif mainLayout->addWidget(display, 0, 0, 1, 6); mainLayout->addWidget(backspaceButton, 1, 0, 1, 2); mainLayout->addWidget(clearButton, 1, 2, 1, 2); diff --git a/examples/widgets/calculator/calculator.pro b/examples/widgets/calculator/calculator.pro index f1e110dfd2..d237871e0d 100644 --- a/examples/widgets/calculator/calculator.pro +++ b/examples/widgets/calculator/calculator.pro @@ -10,10 +10,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calculator.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/calculator INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000C602 - CONFIG += qt_example -} QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/widgets/calculator/main.cpp b/examples/widgets/calculator/main.cpp index 3974f801b1..0038aa10dd 100644 --- a/examples/widgets/calculator/main.cpp +++ b/examples/widgets/calculator/main.cpp @@ -46,10 +46,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); Calculator calc; -#if defined(Q_OS_SYMBIAN) - calc.showMaximized(); -#else calc.show(); -#endif return app.exec(); } diff --git a/examples/widgets/calendarwidget/calendarwidget.pro b/examples/widgets/calendarwidget/calendarwidget.pro index 6e664cf353..3c75fb6a33 100644 --- a/examples/widgets/calendarwidget/calendarwidget.pro +++ b/examples/widgets/calendarwidget/calendarwidget.pro @@ -8,13 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calendarwidget.pro resou sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/calendarwidget INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000C603 - CONFIG += qt_example -} QT += widgets -maemo5: CONFIG += qt_example - -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) -simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/charactermap/charactermap.pro b/examples/widgets/charactermap/charactermap.pro index 4baaac1b31..0a9d6e7b5c 100644 --- a/examples/widgets/charactermap/charactermap.pro +++ b/examples/widgets/charactermap/charactermap.pro @@ -10,10 +10,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS charactermap.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/charactermap INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/codeeditor/codeeditor.pro b/examples/widgets/codeeditor/codeeditor.pro index caee3f7ca1..ec38770cc6 100644 --- a/examples/widgets/codeeditor/codeeditor.pro +++ b/examples/widgets/codeeditor/codeeditor.pro @@ -8,8 +8,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/codeeditor INSTALLS += target sources QT += widgets -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) diff --git a/examples/widgets/codeeditor/main.cpp b/examples/widgets/codeeditor/main.cpp index 8a893244df..1bce70e03f 100644 --- a/examples/widgets/codeeditor/main.cpp +++ b/examples/widgets/codeeditor/main.cpp @@ -48,11 +48,7 @@ int main(int argv, char **args) CodeEditor editor; editor.setWindowTitle(QObject::tr("Code Editor Example")); -#if defined(Q_OS_SYMBIAN) - editor.showMaximized(); -#else editor.show(); -#endif return app.exec(); } diff --git a/examples/widgets/digitalclock/digitalclock.pro b/examples/widgets/digitalclock/digitalclock.pro index 9df216e855..c0ad11e146 100644 --- a/examples/widgets/digitalclock/digitalclock.pro +++ b/examples/widgets/digitalclock/digitalclock.pro @@ -8,6 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS digitalclock.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/digitalclock INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/widgets/digitalclock/main.cpp b/examples/widgets/digitalclock/main.cpp index d022918b2c..c43162bade 100644 --- a/examples/widgets/digitalclock/main.cpp +++ b/examples/widgets/digitalclock/main.cpp @@ -46,10 +46,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); DigitalClock clock; -#if defined(Q_OS_SYMBIAN) - clock.showMaximized(); -#else clock.show(); -#endif return app.exec(); } diff --git a/examples/widgets/elidedlabel/elidedlabel.pro b/examples/widgets/elidedlabel/elidedlabel.pro index 30c308cd7e..1e391d9a5d 100644 --- a/examples/widgets/elidedlabel/elidedlabel.pro +++ b/examples/widgets/elidedlabel/elidedlabel.pro @@ -16,16 +16,3 @@ HEADERS += \ CONFIG += mobility MOBILITY = - -symbian { - TARGET.UID3 = 0xE2728354 # randomly generated - TARGET.EPOCSTACKSIZE = 0x14000 - TARGET.EPOCHEAPSIZE = 0x020000 0x800000 - CONFIG += qt_example -} - -maemo5: CONFIG += qt_example - -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) -simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/elidedlabel/testwidget.cpp b/examples/widgets/elidedlabel/testwidget.cpp index a915de1875..72c5170d97 100644 --- a/examples/widgets/elidedlabel/testwidget.cpp +++ b/examples/widgets/elidedlabel/testwidget.cpp @@ -118,9 +118,6 @@ TestWidget::TestWidget(QWidget *parent): //! [4] //! [5] -#ifdef Q_WS_MAEMO_5 - setAttribute(Qt::WA_Maemo5AutoOrientation, true); -#endif } //! [5] diff --git a/examples/widgets/groupbox/groupbox.pro b/examples/widgets/groupbox/groupbox.pro index 361c037d24..07c0ed8818 100644 --- a/examples/widgets/groupbox/groupbox.pro +++ b/examples/widgets/groupbox/groupbox.pro @@ -8,10 +8,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS groupbox.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/groupbox INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/groupbox/main.cpp b/examples/widgets/groupbox/main.cpp index 4a43828d45..f2079f511b 100644 --- a/examples/widgets/groupbox/main.cpp +++ b/examples/widgets/groupbox/main.cpp @@ -46,10 +46,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); Window window; -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } diff --git a/examples/widgets/icons/icons.pro b/examples/widgets/icons/icons.pro index 17c09f354f..8b0831117c 100644 --- a/examples/widgets/icons/icons.pro +++ b/examples/widgets/icons/icons.pro @@ -14,7 +14,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS icons.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/icons INSTALLS += target sources -symbian: CONFIG += qt_example wince*: { imageFiles.files = images/* @@ -26,8 +25,5 @@ wince*: { DEPLOYMENT += imageFiles } QT += widgets -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/icons/main.cpp b/examples/widgets/icons/main.cpp index c1ba2bda40..923c1f8514 100644 --- a/examples/widgets/icons/main.cpp +++ b/examples/widgets/icons/main.cpp @@ -46,10 +46,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); MainWindow mainWin; -#if defined(Q_OS_SYMBIAN) - mainWin.showMaximized(); -#else mainWin.show(); -#endif return app.exec(); } diff --git a/examples/widgets/imageviewer/imageviewer.pro b/examples/widgets/imageviewer/imageviewer.pro index 939d60a208..e3fea079bd 100644 --- a/examples/widgets/imageviewer/imageviewer.pro +++ b/examples/widgets/imageviewer/imageviewer.pro @@ -8,17 +8,12 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS imageviewer.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/imageviewer INSTALLS += target sources -symbian: CONFIG += qt_example #Symbian has built-in component named imageviewer so we use different target -symbian: TARGET = imageviewerexample wince*: { DEPLOYMENT_PLUGIN += qjpeg qmng qgif } QT += widgets printsupport -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/imageviewer/main.cpp b/examples/widgets/imageviewer/main.cpp index 8d1a068c5a..55a362a622 100644 --- a/examples/widgets/imageviewer/main.cpp +++ b/examples/widgets/imageviewer/main.cpp @@ -46,10 +46,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); ImageViewer imageViewer; -#if defined(Q_OS_SYMBIAN) - imageViewer.showMaximized(); -#else imageViewer.show(); -#endif return app.exec(); } diff --git a/examples/widgets/lineedits/lineedits.pro b/examples/widgets/lineedits/lineedits.pro index 484ffde462..01d4b2f1b7 100644 --- a/examples/widgets/lineedits/lineedits.pro +++ b/examples/widgets/lineedits/lineedits.pro @@ -8,13 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS lineedits.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/lineedits INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000C604 - CONFIG += qt_example -} QT += widgets -maemo5: CONFIG += qt_example - -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) -simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/lineedits/main.cpp b/examples/widgets/lineedits/main.cpp index 4a43828d45..f2079f511b 100644 --- a/examples/widgets/lineedits/main.cpp +++ b/examples/widgets/lineedits/main.cpp @@ -46,10 +46,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); Window window; -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } diff --git a/examples/widgets/maemovibration/buttonwidget.cpp b/examples/widgets/maemovibration/buttonwidget.cpp deleted file mode 100644 index d56d7a5160..0000000000 --- a/examples/widgets/maemovibration/buttonwidget.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $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 "buttonwidget.h" -#include <QSignalMapper> -#include <QGridLayout> -#include <QPushButton> - -//! [0] -ButtonWidget::ButtonWidget(QStringList texts, QWidget *parent) - : QWidget(parent) -{ - signalMapper = new QSignalMapper(this); - - QGridLayout *gridLayout = new QGridLayout; - for (int i = 0; i < texts.size(); ++i) { - QPushButton *button = new QPushButton(texts[i]); - connect(button, SIGNAL(clicked()), signalMapper, SLOT(map())); - signalMapper->setMapping(button, texts[i]); - gridLayout->addWidget(button, i / 2, i % 2); - } - - connect(signalMapper, SIGNAL(mapped(const QString &)), - this, SIGNAL(clicked(const QString &))); - - setLayout(gridLayout); -} -//! [0] - diff --git a/examples/widgets/maemovibration/buttonwidget.h b/examples/widgets/maemovibration/buttonwidget.h deleted file mode 100644 index 3068825212..0000000000 --- a/examples/widgets/maemovibration/buttonwidget.h +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $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$ -** -****************************************************************************/ - -#ifndef BUTTONWIDGET_H -#define BUTTONWIDGET_H - -#include <QWidget> -#include <QSignalMapper> - -//! [0] -class ButtonWidget : public QWidget -{ - Q_OBJECT - -public: - ButtonWidget(QStringList texts, QWidget *parent = 0); - -signals: - void clicked(const QString &text); - -private: - QSignalMapper *signalMapper; -}; -//! [0] - -#endif // BUTTONWIDGET_H - diff --git a/examples/widgets/maemovibration/data/48x48/maemovibration.png b/examples/widgets/maemovibration/data/48x48/maemovibration.png Binary files differdeleted file mode 100644 index f32e9ced99..0000000000 --- a/examples/widgets/maemovibration/data/48x48/maemovibration.png +++ /dev/null diff --git a/examples/widgets/maemovibration/data/64x64/maemovibration.png b/examples/widgets/maemovibration/data/64x64/maemovibration.png Binary files differdeleted file mode 100644 index f09cf7c3c6..0000000000 --- a/examples/widgets/maemovibration/data/64x64/maemovibration.png +++ /dev/null diff --git a/examples/widgets/maemovibration/data/maemovibration.desktop b/examples/widgets/maemovibration/data/maemovibration.desktop deleted file mode 100644 index a88ed4e0aa..0000000000 --- a/examples/widgets/maemovibration/data/maemovibration.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Name=Maemo Vibration -Exec=/usr/bin/maemovibration -Icon=maemovibration -X-HildonDesk-ShowInToolbar=true -X-Window-Icon=maemovibration -X-Window-Icon-Dimmed=maemovibration -X-Osso-Type=application/x-executable -X-Osso-Service=com.nokia.maemovibration diff --git a/examples/widgets/maemovibration/data/maemovibration.service b/examples/widgets/maemovibration/data/maemovibration.service deleted file mode 100644 index 1fab19f35c..0000000000 --- a/examples/widgets/maemovibration/data/maemovibration.service +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=com.nokia.maemovibration -Exec=/usr/bin/maemovibration diff --git a/examples/widgets/maemovibration/maemovibration.pro b/examples/widgets/maemovibration/maemovibration.pro deleted file mode 100644 index 5c645dd369..0000000000 --- a/examples/widgets/maemovibration/maemovibration.pro +++ /dev/null @@ -1,52 +0,0 @@ -TARGET = maemovibration -HEADERS += buttonwidget.h mcevibrator.h -SOURCES += main.cpp buttonwidget.cpp mcevibrator.cpp - -# All generated files goes same directory -OBJECTS_DIR = build -MOC_DIR = build -UI_DIR = build -DESTDIR = build - -TEMPLATE = app -CONFIG += debug -QT=core gui - -maemo5 { - QT += dbus - CONFIG += link_pkgconfig - PKG_CONFIG += mce - INSTALLS += target - target.path = /usr/bin/ - - INSTALLS += desktop - desktop.path = /usr/share/applications/hildon - desktop.files = data/maemovibration.desktop - - INSTALLS += service - service.path = /usr/share/dbus-1/services - service.files = data/maemovibration.service - - INSTALLS += icon64 - icon64.path = /usr/share/icons/hicolor/64x64/apps - icon64.files = data/64x64/maemovibration.png - - # - # Targets for debian source and binary package creation - # - debian-src.commands = dpkg-buildpackage -S -r -us -uc -d - debian-bin.commands = dpkg-buildpackage -b -r -uc -d - debian-all.depends = debian-src debian-bin - - # - # Clean all but Makefile - # - compiler_clean.commands = -$(DEL_FILE) $(TARGET) - - QMAKE_EXTRA_TARGETS += debian-all debian-src debian-bin compiler_clean -} - -!maemo5 { - error(The Maemo Vibration Example only works for the maemo target!) -} - diff --git a/examples/widgets/maemovibration/main.cpp b/examples/widgets/maemovibration/main.cpp deleted file mode 100644 index fbac37478a..0000000000 --- a/examples/widgets/maemovibration/main.cpp +++ /dev/null @@ -1,84 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $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 "buttonwidget.h" -#include "mcevibrator.h" - -#include <QtDebug> -#include <QApplication> -#include <QFile> -#include <QTextStream> -#include <QMessageBox> -#include <QTextStream> - -#include <cstdlib> - -//! [0] -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - QString path = MceVibrator::defaultMceFilePath; - - QFile file(path); - QStringList names; - if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { - QTextStream stream(&file); - names = MceVibrator::parsePatternNames(stream); - file.close(); - } - - if (names.isEmpty()){ - qDebug() << "Could not read vibration pattern names from " << path; - a.exit(-1); - } -//! [0] - -//! [1] - ButtonWidget buttonWidget(names); - MceVibrator vibrator; - QObject::connect(&buttonWidget, SIGNAL(clicked(const QString &)), - &vibrator, SLOT(vibrate(const QString &))); - buttonWidget.show(); - - return a.exec(); -} -//! [1] - diff --git a/examples/widgets/maemovibration/mcevibrator.cpp b/examples/widgets/maemovibration/mcevibrator.cpp deleted file mode 100644 index fcae1dc5d2..0000000000 --- a/examples/widgets/maemovibration/mcevibrator.cpp +++ /dev/null @@ -1,119 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $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 "mcevibrator.h" - -#include <QStringList> -#include <QDebug> -#include <QDBusConnection> -#include <QDBusMessage> - -#include <mce/dbus-names.h> - -const char MceVibrator::defaultMceFilePath[] = "/etc/mce/mce.ini"; - -//! [5] -static void checkError(QDBusMessage &msg) -{ - if (msg.type() == QDBusMessage::ErrorMessage) - qDebug() << msg.errorName() << msg.errorMessage(); -} -//! [5] - -//! [0] -MceVibrator::MceVibrator(QObject *parent) : - QObject(parent), - mceInterface(MCE_SERVICE, MCE_REQUEST_PATH, MCE_REQUEST_IF, - QDBusConnection::systemBus()) -{ - QDBusMessage reply = mceInterface.call(MCE_ENABLE_VIBRATOR); - checkError(reply); -} -//! [0] - -//! [3] -MceVibrator::~MceVibrator() -{ - deactivate(lastPatternName); - QDBusMessage reply = mceInterface.call(MCE_DISABLE_VIBRATOR); - checkError(reply); -} -//! [3] - -//! [1] -void MceVibrator::vibrate(const QString &patternName) -{ - deactivate(lastPatternName); - lastPatternName = patternName; - QDBusMessage reply = mceInterface.call(MCE_ACTIVATE_VIBRATOR_PATTERN, patternName); - checkError(reply); -} -//! [1] - -//! [2] -void MceVibrator::deactivate(const QString &patternName) -{ - if (!patternName.isNull()) { - QDBusMessage reply = mceInterface.call(MCE_DEACTIVATE_VIBRATOR_PATTERN, patternName); - checkError(reply); - } -} -//! [2] - -//! [4] -QStringList MceVibrator::parsePatternNames(QTextStream &stream) -{ - QStringList result; - QString line; - - do { - line = stream.readLine(); - if (line.startsWith(QLatin1String("VibratorPatterns="))) { - QString values = line.section('=', 1); - result = values.split(';'); - break; - } - } while (!line.isNull()); - - return result; -} -//! [4] - diff --git a/examples/widgets/maemovibration/mcevibrator.h b/examples/widgets/maemovibration/mcevibrator.h deleted file mode 100644 index fae99be035..0000000000 --- a/examples/widgets/maemovibration/mcevibrator.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $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$ -** -****************************************************************************/ - -#ifndef MCEVIBRATOR_H -#define MCEVIBRATOR_H - -#include <QObject> -#include <QTextStream> -#include <QDBusInterface> - -//! [0] -class MceVibrator : public QObject -{ - Q_OBJECT -public: - explicit MceVibrator(QObject *parent = 0); - ~MceVibrator(); - - static const char defaultMceFilePath[]; - static QStringList parsePatternNames(QTextStream &stream); - -public slots: - void vibrate(const QString &patternName); - -private: - void deactivate(const QString &patternName); - - QDBusInterface mceInterface; - QString lastPatternName; -}; -//! [0] - -#endif // MCEVIBRATOR_H - diff --git a/examples/widgets/movie/main.cpp b/examples/widgets/movie/main.cpp index b9a1c69914..c686eec157 100644 --- a/examples/widgets/movie/main.cpp +++ b/examples/widgets/movie/main.cpp @@ -47,10 +47,6 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); MoviePlayer player; player.show(); -#if defined(Q_OS_SYMBIAN) - player.showMaximized(); -#else player.show(); -#endif return app.exec(); } diff --git a/examples/widgets/movie/movie.pro b/examples/widgets/movie/movie.pro index 5657efa3c1..eb70d6d0b6 100644 --- a/examples/widgets/movie/movie.pro +++ b/examples/widgets/movie/movie.pro @@ -8,7 +8,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES movie.pro animation.mng sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/movie INSTALLS += target sources -symbian: CONFIG += qt_example wince*: { addFiles.files += *.mng @@ -18,8 +17,5 @@ wince*: { } QT += widgets -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/orientation/mainwindow.cpp b/examples/widgets/orientation/mainwindow.cpp index 246a79dc72..74f1803261 100644 --- a/examples/widgets/orientation/mainwindow.cpp +++ b/examples/widgets/orientation/mainwindow.cpp @@ -69,9 +69,6 @@ MainWindow::MainWindow(QWidget *parent) : //! [1] //! [2] -#ifdef Q_WS_MAEMO_5 - setAttribute(Qt::WA_Maemo5AutoOrientation, true); -#endif } //! [2] diff --git a/examples/widgets/orientation/orientation.pro b/examples/widgets/orientation/orientation.pro index 91560a3b38..2334cb0005 100644 --- a/examples/widgets/orientation/orientation.pro +++ b/examples/widgets/orientation/orientation.pro @@ -22,9 +22,5 @@ FORMS += \ RESOURCES += \ images.qrc -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/scribble/main.cpp b/examples/widgets/scribble/main.cpp index dffe80348a..01c8adae53 100644 --- a/examples/widgets/scribble/main.cpp +++ b/examples/widgets/scribble/main.cpp @@ -46,10 +46,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); MainWindow window; -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } diff --git a/examples/widgets/scribble/scribble.pro b/examples/widgets/scribble/scribble.pro index ef11636efd..1bccb9be62 100644 --- a/examples/widgets/scribble/scribble.pro +++ b/examples/widgets/scribble/scribble.pro @@ -10,6 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS scribble.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/scribble INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets printsupport -maemo5: CONFIG += qt_example diff --git a/examples/widgets/shapedclock/main.cpp b/examples/widgets/shapedclock/main.cpp index f5e9718d4f..9b7f951a48 100644 --- a/examples/widgets/shapedclock/main.cpp +++ b/examples/widgets/shapedclock/main.cpp @@ -46,10 +46,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); ShapedClock clock; -#if defined(Q_OS_SYMBIAN) - clock.showMaximized(); -#else clock.show(); -#endif return app.exec(); } diff --git a/examples/widgets/shapedclock/shapedclock.pro b/examples/widgets/shapedclock/shapedclock.pro index d7ab454ac7..5bc1cb8706 100644 --- a/examples/widgets/shapedclock/shapedclock.pro +++ b/examples/widgets/shapedclock/shapedclock.pro @@ -8,12 +8,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS shapedclock.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/shapedclock INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000C605 - CONFIG += qt_example -} QT += widgets -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) diff --git a/examples/widgets/sliders/main.cpp b/examples/widgets/sliders/main.cpp index 4a43828d45..f2079f511b 100644 --- a/examples/widgets/sliders/main.cpp +++ b/examples/widgets/sliders/main.cpp @@ -46,10 +46,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); Window window; -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } diff --git a/examples/widgets/sliders/sliders.pro b/examples/widgets/sliders/sliders.pro index 7361ba1ed3..b0438072ec 100644 --- a/examples/widgets/sliders/sliders.pro +++ b/examples/widgets/sliders/sliders.pro @@ -10,10 +10,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sliders.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/sliders INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/softkeys/softkeys.pro b/examples/widgets/softkeys/softkeys.pro index e0be830b4d..5473069bb1 100644 --- a/examples/widgets/softkeys/softkeys.pro +++ b/examples/widgets/softkeys/softkeys.pro @@ -9,10 +9,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS softkeys.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/softkeys INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000CF6B - CONFIG += qt_example -} QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/widgets/spinboxes/main.cpp b/examples/widgets/spinboxes/main.cpp index 4a43828d45..f2079f511b 100644 --- a/examples/widgets/spinboxes/main.cpp +++ b/examples/widgets/spinboxes/main.cpp @@ -46,10 +46,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); Window window; -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } diff --git a/examples/widgets/spinboxes/spinboxes.pro b/examples/widgets/spinboxes/spinboxes.pro index 11d5aa1d41..e19e33178d 100644 --- a/examples/widgets/spinboxes/spinboxes.pro +++ b/examples/widgets/spinboxes/spinboxes.pro @@ -8,10 +8,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS spinboxes.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/spinboxes INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/styles/styles.pro b/examples/widgets/styles/styles.pro index a3d0e92ee8..fef1dc6084 100644 --- a/examples/widgets/styles/styles.pro +++ b/examples/widgets/styles/styles.pro @@ -13,10 +13,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS styles.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/styles INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/stylesheet/main.cpp b/examples/widgets/stylesheet/main.cpp index 6259969f2d..2c05ee950d 100644 --- a/examples/widgets/stylesheet/main.cpp +++ b/examples/widgets/stylesheet/main.cpp @@ -48,10 +48,6 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); MainWindow window; -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } diff --git a/examples/widgets/stylesheet/stylesheet.pro b/examples/widgets/stylesheet/stylesheet.pro index 7d699a654f..4d609a9210 100644 --- a/examples/widgets/stylesheet/stylesheet.pro +++ b/examples/widgets/stylesheet/stylesheet.pro @@ -13,10 +13,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images layouts qss sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/stylesheet INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/symbianvibration/main.cpp b/examples/widgets/symbianvibration/main.cpp deleted file mode 100644 index c6e0abbd3b..0000000000 --- a/examples/widgets/symbianvibration/main.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $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 <QtGui/QApplication> -#include "mainwindow.h" - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - MainWindow w; -#if defined(Q_WS_S60) - w.showMaximized(); -#else - w.show(); -#endif - return a.exec(); -} diff --git a/examples/widgets/symbianvibration/mainwindow.cpp b/examples/widgets/symbianvibration/mainwindow.cpp deleted file mode 100644 index d43877cda7..0000000000 --- a/examples/widgets/symbianvibration/mainwindow.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $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 <QtGui/QMenuBar> -#include "mainwindow.h" -#include "vibrationsurface.h" -#include "xqvibra.h" - -//! [0] -MainWindow::MainWindow(QWidget *parent) - : QMainWindow(parent) -{ - vibra = new XQVibra(this); - setCentralWidget(new VibrationSurface(vibra, this)); - menuBar()->addAction(tr("Vibrate"), this, SLOT(vibrate())); -} -//! [0] - -//! [1] -void MainWindow::vibrate() -{ - vibra->setIntensity(75); - vibra->start(2500); -} -//! [1] - diff --git a/examples/widgets/symbianvibration/mainwindow.h b/examples/widgets/symbianvibration/mainwindow.h deleted file mode 100644 index c555cc5e4e..0000000000 --- a/examples/widgets/symbianvibration/mainwindow.h +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $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$ -** -****************************************************************************/ - -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include <QtGui/QMainWindow> -class XQVibra; - -//! [0] -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - MainWindow(QWidget *parent = 0); - -private slots: - void vibrate(); - -private: - XQVibra *vibra; -}; -//! [0] - -#endif // MAINWINDOW_H diff --git a/examples/widgets/symbianvibration/symbianvibration.pro b/examples/widgets/symbianvibration/symbianvibration.pro deleted file mode 100644 index d99b76d9e1..0000000000 --- a/examples/widgets/symbianvibration/symbianvibration.pro +++ /dev/null @@ -1,39 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2010-06-14T10:09:27 -# -#------------------------------------------------- - -QT += core gui - -TARGET = symbianvibration -TEMPLATE = app - - -SOURCES += main.cpp\ - mainwindow.cpp \ - vibrationsurface.cpp \ - xqvibra.cpp \ - xqvibra_p.cpp - -HEADERS += mainwindow.h \ - vibrationsurface.h \ - xqvibra.h \ - xqvibra_p.h - -CONFIG += mobility -MOBILITY = - -symbian { - TARGET.UID3 = 0xecf47018 - # TARGET.CAPABILITY += - TARGET.EPOCSTACKSIZE = 0x14000 - TARGET.EPOCHEAPSIZE = 0x020000 0x800000 - LIBS += -lhwrmvibraclient - include($$PWD/../../symbianpkgrules.pri) -} - -!symbian { - error(The Symbian Vibration Example only works for the Symbian target!) -} - diff --git a/examples/widgets/symbianvibration/vibrationsurface.cpp b/examples/widgets/symbianvibration/vibrationsurface.cpp deleted file mode 100644 index e06241d179..0000000000 --- a/examples/widgets/symbianvibration/vibrationsurface.cpp +++ /dev/null @@ -1,157 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $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 "vibrationsurface.h" -#include <QtGui/QPainter> -#include <QtCore/QLine> -#include <QtGui/QMouseEvent> -#include <QtGui/QScreen> -#include <QtCore/QRect> -#include <QtGui/QColor> - -#include "xqvibra.h" - -//! [4] -const int NumberOfLevels = 10; -const double IntensityFactor = XQVibra::MaxIntensity / NumberOfLevels; -//! [4] - -VibrationSurface::VibrationSurface(XQVibra *vibra, QWidget *parent) : - QWidget(parent), - vibra(vibra), - lastIntensity(0) -{ -} - -//! [0] -void VibrationSurface::mousePressEvent(QMouseEvent *event) -{ - applyIntensity(event->x(), event->y()); - vibra->start(); -} -//! [0] - -//! [1] -void VibrationSurface::mouseMoveEvent(QMouseEvent *event) -{ - applyIntensity(event->x(), event->y()); -} -//! [1] - -//! [2] -void VibrationSurface::mouseReleaseEvent(QMouseEvent *) -{ - vibra->stop(); -} -//! [2] - -//! [5] -void VibrationSurface::paintEvent(QPaintEvent *) -{ - QPainter painter(this); - QRect rect = geometry(); - int dx = 0, dy = 0; - - if (height() > width()) { - dy = height() / NumberOfLevels; - rect.setHeight(dy); - } else { - dx = width() / NumberOfLevels; - rect.setWidth(dx); - } -//! [5] -//! [6] - for (int i = 0; i < NumberOfLevels; i++) { - int x = i * dx; - int y = i * dy; - int intensity = getIntensity(x, y); - QColor color = QColor(40, 80, 10).lighter(100 + intensity); - - rect.moveTo(x, y); - painter.fillRect(rect, color); - painter.setPen(color.darker()); - painter.drawText(rect, Qt::AlignCenter, QString::number(intensity)); - } -} -//! [6] - -//! [7] -int VibrationSurface::getIntensity(int x, int y) -{ - int level; - int coord; - - if (height() > width()) { - level = height() / NumberOfLevels; - coord = y; - } else { - level = width() / NumberOfLevels; - coord = x; - } - - if (level == 0) { - return 0; - } -//! [7] -//! [8] - int intensity = (coord / level + 1) * IntensityFactor; - - if (intensity < 0) { - intensity = 0; - } else if (intensity > XQVibra::MaxIntensity) { - intensity = XQVibra::MaxIntensity; - } - - return intensity; -} -//! [8] - -//! [3] -void VibrationSurface::applyIntensity(int x, int y) -{ - int intensity = getIntensity(x, y); - - if (intensity != lastIntensity) { - vibra->setIntensity(intensity); - lastIntensity = intensity; - } -} -//! [3] - diff --git a/examples/widgets/symbianvibration/vibrationsurface.h b/examples/widgets/symbianvibration/vibrationsurface.h deleted file mode 100644 index 2c4f3e56e1..0000000000 --- a/examples/widgets/symbianvibration/vibrationsurface.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $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$ -** -****************************************************************************/ - -#ifndef TOUCHAREA_H -#define TOUCHAREA_H - -#include <QWidget> - -class XQVibra; - -//! [0] -class VibrationSurface : public QWidget -{ - Q_OBJECT -public: - explicit VibrationSurface(XQVibra *vibra, QWidget *parent = 0); - -protected: - virtual void mousePressEvent(QMouseEvent *); - virtual void mouseMoveEvent(QMouseEvent *); - virtual void mouseReleaseEvent(QMouseEvent *); - virtual void paintEvent(QPaintEvent *); - -private: - - int getIntensity(int x, int y); - void applyIntensity(int x, int y); - - XQVibra *vibra; - int lastIntensity; -}; -//! [0] - -#endif // TOUCHAREA_H diff --git a/examples/widgets/symbianvibration/xqvibra.cpp b/examples/widgets/symbianvibration/xqvibra.cpp deleted file mode 100644 index ba1b0b1f05..0000000000 --- a/examples/widgets/symbianvibration/xqvibra.cpp +++ /dev/null @@ -1,210 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $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 "xqvibra.h" -#include "xqvibra_p.h" - -/*! - \class XQVibra - - \brief The XQVibra class is used to control the device's vibra. The XQVibra - class provides also information of vibration setting in the user profile. - - Example: - \code - XQVibra *vibra = new XQVibra(this); - QPushButton *startButton = new QPushButton(this); - QPushButton *stopButton = new QPushButton(this); - connect(startButton, SIGNAL(clicked()), vibra, SLOT(start())); - connect(stopButton, SIGNAL(clicked()), vibra, SLOT(stop())); - \endcode -*/ - -/*! \var XQVibra::InfiniteDuration - With this constant vibration can be set to work indefinitely (Note! Depends on the HW) -*/ -/*! \var XQVibra::MaxIntensity - Maximum intensity as percentages -*/ -/*! \var XQVibra::MinIntensity - Minumum intensity as percentages -*/ - -/*! - Constructs a XQVibra object with the given parent. - Call error() to get a value of XQVibra::Error that indicates which error occurred during initialisation if any. - \sa start(), setIntensity(), error() -*/ -XQVibra::XQVibra(QObject *parent) - : QObject(parent), d(new XQVibraPrivate(this)) -{ -} - -/*! - Destroys the XQVibra object. -*/ -XQVibra::~XQVibra() -{ - delete d; -} - -/*! - \enum XQVibra::Error - - This enum defines the possible errors for a XQVibra object. -*/ -/*! \var XQVibra::Error XQVibra::NoError - No error occured. -*/ -/*! \var XQVibra::Error XQVibra::OutOfMemoryError - Not enough memory. -*/ -/*! \var XQVibra::Error XQVibra::ArgumentError - Duration is invalid. -*/ -/*! \var XQVibra::Error XQVibra::VibraInUseError - Vibra is already in used by other client. -*/ -/*! \var XQVibra::Error XQVibra::HardwareError - There is a hardware error. -*/ -/*! \var XQVibra::Error XQVibra::TimeOutError - Timeout occurred in controlling vibra. -*/ -/*! \var XQVibra::Error XQVibra::VibraLockedError - Vibra is locked down because too much continuous use or explicitly blocked by - for example some vibration sensitive accessory. -*/ -/*! \var XQVibra::Error XQVibra::AccessDeniedError - Vibration setting in the user profile is not set. -*/ -/*! \var XQVibra::Error XQVibra::UnknownError - Unknown error. -*/ - -/*! - \enum XQVibra::Status - - This enum defines the possible statuses of the vibration -*/ -/*! \var XQVibra::Status XQVibra::StatusNotAllowed - Vibra is set off in the user profile or status is unknow -*/ -/*! \var XQVibra::Status XQVibra::StatusOff - Vibration is non-active -*/ -/*! \var XQVibra::Status XQVibra::StatusOn - Vibration is active -*/ - -/*! - Starts vibrating. If duration hasn't been set the vibration continues - indefinitely unless stopped with stop() function. Calling the start while vibration - is active the active vibration is interrupted and the new vibration starts immediately. - - \param duration Specifies duration how long vibration should last - \return If false is returned, an error has occurred. Call error() to get a value of - XQVibra::Error that indicates which error occurred - \sa stop(), setIntensity(), error() -*/ -bool XQVibra::start(int duration) -{ - return d->start(duration); -} - -/*! - Interrupts the device vibration immediately. - - \return If false is returned, an error has occurred. Call error() to get a value of - XQVibra::Error that indicates which error occurred - \sa start(), setIntensity(), error() -*/ -bool XQVibra::stop() -{ - return d->stop(); -} - -/*! - Sets the intensity of the vibration. Allowed values for the intensity are - between -100 and 100. 0 means no vibrating. NOTE: The device might have - hardware-imposed limits on supported vibra intensity values, so actual - effect might vary between different hardware. - - \param intensity Intensity of the vibra in decimals - \return If false is returned, an error has occurred. Call error() to get a value of - XQVibra::Error that indicates which error occurred - \sa error() -*/ -bool XQVibra::setIntensity(int intensity) -{ - return d->setIntensity(intensity); -} - -/*! - Returns the current status of the vibration. This function can be used to check has vibration - allowed in the user profile. - - \return current status - \sa statusChanged() -*/ -XQVibra::Status XQVibra::currentStatus() const -{ - return d->currentStatus(); -} - -/*! - Returns the type of error that occurred if the latest function call failed; otherwise returns NoError - \return Error code -*/ -XQVibra::Error XQVibra::error() const -{ - return d->error(); -} - -/*! - \fn void XQVibra::statusChanged(Status status) - - This signal is emitted when the there is a change of the vibration status. - - \param status a vibration status - \sa currentStatus() -*/ - -// End of file diff --git a/examples/widgets/symbianvibration/xqvibra.h b/examples/widgets/symbianvibration/xqvibra.h deleted file mode 100644 index 7eb8697266..0000000000 --- a/examples/widgets/symbianvibration/xqvibra.h +++ /dev/null @@ -1,101 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $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$ -** -****************************************************************************/ - -#ifndef XQVIBRA_H -#define XQVIBRA_H - -// INCLUDES -#include <QObject> - -// FORWARD DECLARATIONS -class XQVibraPrivate; - -// CLASS DECLARATION -//! [0] -class XQVibra : public QObject -{ - Q_OBJECT - -public: - static const int InfiniteDuration = 0; - static const int MaxIntensity = 100; - static const int MinIntensity = -100; - - enum Error { - NoError = 0, - OutOfMemoryError, - ArgumentError, - VibraInUseError, - HardwareError, - TimeOutError, - VibraLockedError, - AccessDeniedError, - UnknownError = -1 - }; - - enum Status { - StatusNotAllowed = 0, - StatusOff, - StatusOn - }; - - XQVibra(QObject *parent = 0); - ~XQVibra(); - - XQVibra::Status currentStatus() const; - XQVibra::Error error() const; - -Q_SIGNALS: - void statusChanged(XQVibra::Status status); - -public Q_SLOTS: - bool start(int duration = InfiniteDuration); - bool stop(); - bool setIntensity(int intensity); - -private: - friend class XQVibraPrivate; - XQVibraPrivate *d; -}; -//! [0] - -#endif // XQVIBRA_H - -// End of file diff --git a/examples/widgets/symbianvibration/xqvibra_p.cpp b/examples/widgets/symbianvibration/xqvibra_p.cpp deleted file mode 100644 index 145434c52f..0000000000 --- a/examples/widgets/symbianvibration/xqvibra_p.cpp +++ /dev/null @@ -1,171 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $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 "xqvibra_p.h" - -const int KDefaultIntensity = 0xFF; - -XQVibraPrivate::XQVibraPrivate(XQVibra *vibra) - : q(vibra), iStatus(XQVibra::StatusOff), iDuration(XQVibra::InfiniteDuration), iIntensity(KDefaultIntensity) - -{ - TRAP(iError, iVibra = CHWRMVibra::NewL();) - QObject::connect(&iTimer, SIGNAL(timeout()), q, SLOT(stop())); -} - -XQVibraPrivate::~XQVibraPrivate() -{ - delete iVibra; -} - -bool XQVibraPrivate::start(int aDuration) -{ - iDuration = aDuration; - TRAP(iError, - if (iIntensity == KDefaultIntensity) { - iVibra->StartVibraL(XQVibra::InfiniteDuration); - } else { - iVibra->StopVibraL(); - iVibra->StartVibraL(XQVibra::InfiniteDuration, iIntensity); - } - - if (aDuration != XQVibra::InfiniteDuration) { - iTimer.start(aDuration); - } else { - iTimer.stop(); - } - - if (iStatus != XQVibra::StatusOn) { - iStatus = XQVibra::StatusOn; - emit q->statusChanged(iStatus); - } - ) - return (iError == KErrNone); -} - -bool XQVibraPrivate::stop() -{ - TRAP(iError, - if (iVibra->VibraStatus() == CHWRMVibra::EVibraStatusOn) { - iVibra->StopVibraL(); - if (iTimer.isActive()) { - iTimer.stop(); - } - } - - iStatus = XQVibra::StatusOff; - emit q->statusChanged(iStatus); - ) - return (iError == KErrNone); -} - -void XQVibraPrivate::VibraModeChanged(CHWRMVibra::TVibraModeState /*aStatus*/) -{ - // Implementation isn't needed here because this information isn't used in the public side of the extension -} - -void XQVibraPrivate::VibraStatusChanged(CHWRMVibra::TVibraStatus aStatus) -{ - if (aStatus == CHWRMVibra::EVibraStatusUnknown || - aStatus == CHWRMVibra::EVibraStatusNotAllowed) { - iStatus = XQVibra::StatusNotAllowed; - emit q->statusChanged(iStatus); - } - - if (iDuration == XQVibra::InfiniteDuration) { - if (iStatus != XQVibra::StatusOff) { - iStatus = XQVibra::StatusOff; - emit q->statusChanged(iStatus); - } - } -} - -bool XQVibraPrivate::setIntensity(int aIntensity) -{ - TRAP(iError, - if (aIntensity >= KHWRMVibraMinIntensity && aIntensity <= KHWRMVibraMaxIntensity) { - iIntensity = aIntensity; - if (iIntensity == 0 && iStatus == XQVibra::StatusOn) { - iVibra->StopVibraL(); - } else if (iStatus == XQVibra::StatusOn) { - iVibra->StopVibraL(); - iVibra->StartVibraL(XQVibra::InfiniteDuration, iIntensity); - } - } else { - User::Leave(KErrArgument); - } - ) - return (iError == KErrNone); -} - -XQVibra::Status XQVibraPrivate::currentStatus() const -{ - if (iVibra->VibraStatus() == CHWRMVibra::EVibraStatusUnknown || - iVibra->VibraStatus() == CHWRMVibra::EVibraStatusNotAllowed) { - return XQVibra::StatusNotAllowed; - } - return iStatus; -} - -XQVibra::Error XQVibraPrivate::error() const -{ - switch (iError) { - case KErrNone: - return XQVibra::NoError; - case KErrNoMemory: - return XQVibra::OutOfMemoryError; - case KErrArgument: - return XQVibra::ArgumentError; - case KErrInUse: - return XQVibra::VibraInUseError; - case KErrGeneral: - return XQVibra::HardwareError; - case KErrTimedOut: - return XQVibra::TimeOutError; - case KErrLocked: - return XQVibra::VibraLockedError; - case KErrAccessDenied: - return XQVibra::AccessDeniedError; - default: - return XQVibra::UnknownError; - } -} - -// End of file diff --git a/examples/widgets/symbianvibration/xqvibra_p.h b/examples/widgets/symbianvibration/xqvibra_p.h deleted file mode 100644 index a8be0193e2..0000000000 --- a/examples/widgets/symbianvibration/xqvibra_p.h +++ /dev/null @@ -1,79 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $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$ -** -****************************************************************************/ - -#ifndef XQVIBRA_P_H -#define XQVIBRA_P_H - -// INCLUDES -#include "xqvibra.h" -#include <hwrmvibra.h> -#include <QTimer> - -// CLASS DECLARATION -class XQVibraPrivate: public CBase, public MHWRMVibraObserver -{ - -public: - XQVibraPrivate(XQVibra *vibra); - ~XQVibraPrivate(); - - bool start(int aDuration = XQVibra::InfiniteDuration); - bool stop(); - bool setIntensity(int aIntensity); - XQVibra::Status currentStatus() const; - XQVibra::Error error() const; - -private: // From MHWRMVibraObserver - void VibraModeChanged(CHWRMVibra::TVibraModeState aStatus); - void VibraStatusChanged(CHWRMVibra::TVibraStatus aStatus); - -private: - XQVibra *q; - XQVibra::Status iStatus; - CHWRMVibra *iVibra; - QTimer iTimer; - int iDuration; - int iIntensity; - int iError; -}; - -#endif /*XQVIBRA_P_H*/ - -// End of file diff --git a/examples/widgets/tablet/main.cpp b/examples/widgets/tablet/main.cpp index a7a054a666..40c41bfc9a 100644 --- a/examples/widgets/tablet/main.cpp +++ b/examples/widgets/tablet/main.cpp @@ -52,14 +52,8 @@ int main(int argv, char *args[]) app.setCanvas(canvas); MainWindow mainWindow(canvas); -#if defined(Q_OS_SYMBIAN) - mainWindow.showMaximized(); -#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - mainWindow.show(); -#else mainWindow.resize(500, 500); mainWindow.show(); -#endif return app.exec(); } //! [0] diff --git a/examples/widgets/tablet/tablet.pro b/examples/widgets/tablet/tablet.pro index 4788fad2c7..9ad533fc64 100644 --- a/examples/widgets/tablet/tablet.pro +++ b/examples/widgets/tablet/tablet.pro @@ -12,10 +12,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tablet.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tablet INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/tetrix/main.cpp b/examples/widgets/tetrix/main.cpp index b10764387a..6c30ae5cae 100644 --- a/examples/widgets/tetrix/main.cpp +++ b/examples/widgets/tetrix/main.cpp @@ -48,11 +48,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); TetrixWindow window; -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); return app.exec(); } diff --git a/examples/widgets/tetrix/tetrix.pro b/examples/widgets/tetrix/tetrix.pro index d9fff26fef..6e8a270335 100644 --- a/examples/widgets/tetrix/tetrix.pro +++ b/examples/widgets/tetrix/tetrix.pro @@ -12,10 +12,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tetrix.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tetrix INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000C606 - CONFIG += qt_example -} QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/widgets/tooltips/main.cpp b/examples/widgets/tooltips/main.cpp index 5fba6cc1d6..893b65da86 100644 --- a/examples/widgets/tooltips/main.cpp +++ b/examples/widgets/tooltips/main.cpp @@ -49,10 +49,6 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); SortingBox sortingBox; -#if defined(Q_OS_SYMBIAN) - sortingBox.showMaximized(); -#else sortingBox.show(); -#endif return app.exec(); } diff --git a/examples/widgets/tooltips/tooltips.pro b/examples/widgets/tooltips/tooltips.pro index d19c1d9bc1..76a6cd00f8 100644 --- a/examples/widgets/tooltips/tooltips.pro +++ b/examples/widgets/tooltips/tooltips.pro @@ -11,6 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tooltips.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tooltips INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/widgets/validators/main.cpp b/examples/widgets/validators/main.cpp index 748a36125d..5e5765e957 100644 --- a/examples/widgets/validators/main.cpp +++ b/examples/widgets/validators/main.cpp @@ -128,11 +128,7 @@ int main(int argc, char **argv) QApplication app(argc, argv); ValidatorWidget w; -#if defined(Q_OS_SYMBIAN) - w.showMaximized(); -#else w.show(); -#endif return app.exec(); } diff --git a/examples/widgets/validators/validators.pro b/examples/widgets/validators/validators.pro index 406a5f442a..f4cab8edac 100644 --- a/examples/widgets/validators/validators.pro +++ b/examples/widgets/validators/validators.pro @@ -20,10 +20,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/validators INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro index 232657eabe..51a92bcc29 100644 --- a/examples/widgets/widgets.pro +++ b/examples/widgets/widgets.pro @@ -23,20 +23,7 @@ SUBDIRS = analogclock \ tooltips \ validators \ wiggly \ - windowflags \ - -symbian: SUBDIRS = \ - analogclock \ - calculator \ - calendarwidget \ - lineedits \ - shapedclock \ - symbianvibration \ - tetrix \ - wiggly \ - softkeys - -MAEMO5: SUBDIRS += maemovibration + windowflags contains(styles, motif): SUBDIRS += styles @@ -46,6 +33,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS widgets.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/widgets/wiggly/main.cpp b/examples/widgets/wiggly/main.cpp index 0b9222864f..c64e352f47 100644 --- a/examples/widgets/wiggly/main.cpp +++ b/examples/widgets/wiggly/main.cpp @@ -47,9 +47,6 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); bool smallScreen = QApplication::arguments().contains("-small-screen"); -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_HILDON) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - smallScreen = true; -#endif Dialog dialog(0, smallScreen); diff --git a/examples/widgets/wiggly/wiggly.pro b/examples/widgets/wiggly/wiggly.pro index 8a1bec3100..6b89cd1769 100644 --- a/examples/widgets/wiggly/wiggly.pro +++ b/examples/widgets/wiggly/wiggly.pro @@ -11,10 +11,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/wiggly sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS wiggly.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/wiggly INSTALLS += target sources - -symbian { - TARGET.UID3 = 0xA000C607 - CONFIG += qt_example -} -maemo5: CONFIG += qt_example - diff --git a/examples/widgets/windowflags/main.cpp b/examples/widgets/windowflags/main.cpp index 941a3fadf7..8dd71ed0a5 100644 --- a/examples/widgets/windowflags/main.cpp +++ b/examples/widgets/windowflags/main.cpp @@ -46,10 +46,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); ControllerWindow controller; -#if defined(Q_OS_SYMBIAN) - controller.showMaximized(); -#else controller.show(); -#endif return app.exec(); } diff --git a/examples/widgets/windowflags/windowflags.pro b/examples/widgets/windowflags/windowflags.pro index 9a781cdce3..b063b8ab2c 100644 --- a/examples/widgets/windowflags/windowflags.pro +++ b/examples/widgets/windowflags/windowflags.pro @@ -10,10 +10,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS windowflags.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/windowflags INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) |
