diff options
Diffstat (limited to 'examples/dbus/complexpingpong/complexpong.cpp')
| -rw-r--r-- | examples/dbus/complexpingpong/complexpong.cpp | 71 |
1 files changed, 11 insertions, 60 deletions
diff --git a/examples/dbus/complexpingpong/complexpong.cpp b/examples/dbus/complexpingpong/complexpong.cpp index 6b3430bc94..088b452b30 100644 --- a/examples/dbus/complexpingpong/complexpong.cpp +++ b/examples/dbus/complexpingpong/complexpong.cpp @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, 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 The Qt Company Ltd 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #include "ping-common.h" #include "complexpong.h" @@ -54,12 +7,8 @@ #include <QCoreApplication> #include <QDBusConnection> #include <QDBusError> -#include <QTimer> +#include <QDebug> -#include <stdio.h> -#include <stdlib.h> - -// the property QString Pong::value() const { return m_value; @@ -72,7 +21,8 @@ void Pong::setValue(const QString &newValue) void Pong::quit() { - QTimer::singleShot(0, QCoreApplication::instance(), &QCoreApplication::quit); + QMetaObject::invokeMethod(QCoreApplication::instance(), &QCoreApplication::quit, + Qt::QueuedConnection); } QDBusVariant Pong::query(const QString &query) @@ -101,12 +51,13 @@ int main(int argc, char **argv) Pong *pong = new Pong(&obj); QObject::connect(&app, &QCoreApplication::aboutToQuit, pong, &Pong::aboutToQuit); pong->setProperty("value", "initial value"); - QDBusConnection::sessionBus().registerObject("/", &obj); - if (!QDBusConnection::sessionBus().registerService(SERVICE_NAME)) { - fprintf(stderr, "%s\n", - qPrintable(QDBusConnection::sessionBus().lastError().message())); - exit(1); + auto connection = QDBusConnection::sessionBus(); + connection.registerObject("/", &obj); + + if (!connection.registerService(SERVICE_NAME)) { + qWarning().noquote() << connection.lastError().message(); + return 1; } app.exec(); |