diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2011-09-22 13:14:00 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-27 06:16:46 +0200 |
commit | ffeadf7a7c09971fab09ed08b1f3f503c6facb7e (patch) | |
tree | 07264779d1a55ffc6641c316c371feabdd252848 /tests/auto/declarative | |
parent | 1ec3460d838c05ddbd9b991d7edf9fded31fe684 (diff) |
Add convenience macro for fast connects in declarative.
We already follow this pattern several places, so
this commit creates a convenience macro for it, and replaces
previous usage where appropriate. Also adds the macro
several places as further optimization.
Change-Id: Ieff5ed6cc51c34d0a1c8aa42ac40314ea243477a
Reviewed-on: http://codereview.qt-project.org/5342
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'tests/auto/declarative')
-rw-r--r-- | tests/auto/declarative/qdeclarativecpputils/qdeclarativecpputils.pro | 9 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativecpputils/tst_qdeclarativecpputils.cpp | 106 |
2 files changed, 115 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativecpputils/qdeclarativecpputils.pro b/tests/auto/declarative/qdeclarativecpputils/qdeclarativecpputils.pro new file mode 100644 index 0000000000..aa7ca093de --- /dev/null +++ b/tests/auto/declarative/qdeclarativecpputils/qdeclarativecpputils.pro @@ -0,0 +1,9 @@ +load(qttest_p4) +contains(QT_CONFIG,declarative): QT += declarative +macx:CONFIG -= app_bundle + +SOURCES += tst_qdeclarativecpputils.cpp + +CONFIG += parallel_test + +QT += core-private gui-private declarative-private diff --git a/tests/auto/declarative/qdeclarativecpputils/tst_qdeclarativecpputils.cpp b/tests/auto/declarative/qdeclarativecpputils/tst_qdeclarativecpputils.cpp new file mode 100644 index 0000000000..d72e6d3290 --- /dev/null +++ b/tests/auto/declarative/qdeclarativecpputils/tst_qdeclarativecpputils.cpp @@ -0,0 +1,106 @@ +/**************************************************************************** +** +** 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 test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <qtest.h> +#include <qsignalspy.h> +#include <private/qdeclarativeglobal_p.h> + +class tst_qdeclarativecpputils : public QObject +{ + Q_OBJECT +public: + tst_qdeclarativecpputils() {} + +private slots: + void fastConnect(); +}; + +class MyObject : public QObject { + Q_OBJECT +public: + MyObject() : slotCount(0) {} + friend class tst_qdeclarativecpputils; + + int slotCount; + +signals: + void signal1(); + void signal2(); + +public slots: + void slot1() { slotCount++; } +}; + +void tst_qdeclarativecpputils::fastConnect() +{ + { + MyObject *obj = new MyObject; + FAST_CONNECT(obj, SIGNAL(signal1()), obj, SLOT(slot1())); + + obj->signal1(); + QCOMPARE(obj->slotCount, 1); + + delete obj; + } + + { + MyObject obj; + FAST_CONNECT(&obj, SIGNAL(signal1()), &obj, SLOT(slot1())) + + obj.signal1(); + QCOMPARE(obj.slotCount, 1); + } + + { + MyObject *obj = new MyObject; + QSignalSpy spy(obj, SIGNAL(signal2())); + FAST_CONNECT(obj, SIGNAL(signal1()), obj, SIGNAL(signal2())); + + obj->signal1(); + QCOMPARE(spy.count(), 1); + + delete obj; + } +} + +QTEST_MAIN(tst_qdeclarativecpputils) + +#include "tst_qdeclarativecpputils.moc" |