diff options
Diffstat (limited to 'examples/dbus/complexpingpong/complexping.cpp')
| -rw-r--r-- | examples/dbus/complexpingpong/complexping.cpp | 91 |
1 files changed, 25 insertions, 66 deletions
diff --git a/examples/dbus/complexpingpong/complexping.cpp b/examples/dbus/complexpingpong/complexping.cpp index 8878083ee9..9651183c92 100644 --- a/examples/dbus/complexpingpong/complexping.cpp +++ b/examples/dbus/complexpingpong/complexping.cpp @@ -1,105 +1,62 @@ -/**************************************************************************** -** -** 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 "complexping.h" #include <QCoreApplication> +#include <QDBusInterface> #include <QDBusReply> #include <QDBusServiceWatcher> -#include <QFile> #include <QDebug> #include <QProcess> -#include <stdio.h> +#include <iostream> +#include <string> void Ping::start(const QString &name) { if (name != SERVICE_NAME) return; - // open stdin for reading - qstdin.open(stdin, QIODevice::ReadOnly); - + auto connection = QDBusConnection::sessionBus(); // find our remote - iface = new QDBusInterface(SERVICE_NAME, "/", "org.example.QtDBus.ComplexPong.Pong", - QDBusConnection::sessionBus(), this); + auto iface = new QDBusInterface(SERVICE_NAME, "/", "org.example.QtDBus.ComplexPong.Pong", + connection, this); if (!iface->isValid()) { - fprintf(stderr, "%s\n", - qPrintable(QDBusConnection::sessionBus().lastError().message())); + qWarning().noquote() << connection.lastError().message(); QCoreApplication::instance()->quit(); } connect(iface, SIGNAL(aboutToQuit()), QCoreApplication::instance(), SLOT(quit())); + std::string s; + while (true) { - printf("Ask your question: "); + std::cout << qPrintable(tr("Ask your question: ")) << std::flush; + + std::getline(std::cin, s); + auto line = QString::fromStdString(s).trimmed(); - QString line = QString::fromLocal8Bit(qstdin.readLine()).trimmed(); if (line.isEmpty()) { iface->call("quit"); return; } else if (line == "value") { QVariant reply = iface->property("value"); if (!reply.isNull()) - printf("value = %s\n", qPrintable(reply.toString())); + std::cout << "value = " << qPrintable(reply.toString()) << std::endl; } else if (line.startsWith("value=")) { iface->setProperty("value", line.mid(6)); } else { QDBusReply<QDBusVariant> reply = iface->call("query", line); - if (reply.isValid()) - printf("Reply was: %s\n", qPrintable(reply.value().variant().toString())); + if (reply.isValid()) { + std::cout << qPrintable(tr("Reply was: %1").arg(reply.value().variant().toString())) + << std::endl; + } } if (iface->lastError().isValid()) - fprintf(stderr, "Call failed: %s\n", qPrintable(iface->lastError().message())); + qWarning().noquote() << tr("Call failed: %1").arg(iface->lastError().message()); } } @@ -108,9 +65,11 @@ int main(int argc, char **argv) QCoreApplication app(argc, argv); if (!QDBusConnection::sessionBus().isConnected()) { - fprintf(stderr, "Cannot connect to the D-Bus session bus.\n" + qWarning().noquote() << QCoreApplication::translate( + "complexping", + "Cannot connect to the D-Bus session bus.\n" "To start it, run:\n" - "\teval `dbus-launch --auto-syntax`\n"); + "\teval `dbus-launch --auto-syntax`"); return 1; } |