diff options
Diffstat (limited to 'examples/dbus/pingpong')
| -rw-r--r-- | examples/dbus/pingpong/CMakeLists.txt | 36 | ||||
| -rw-r--r-- | examples/dbus/pingpong/ping.cpp | 21 | ||||
| -rw-r--r-- | examples/dbus/pingpong/pong.cpp | 32 | ||||
| -rw-r--r-- | examples/dbus/pingpong/pong.h | 16 | ||||
| -rw-r--r-- | examples/dbus/pingpong/pong.pro | 2 |
5 files changed, 55 insertions, 52 deletions
diff --git a/examples/dbus/pingpong/CMakeLists.txt b/examples/dbus/pingpong/CMakeLists.txt index 08fc2bc4a6..d159ad9ba4 100644 --- a/examples/dbus/pingpong/CMakeLists.txt +++ b/examples/dbus/pingpong/CMakeLists.txt @@ -4,38 +4,50 @@ cmake_minimum_required(VERSION 3.16) project(pingpong LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") +if (ANDROID) + message(FATAL_ERROR "This project cannot be built on Android.") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/dbus/pingpong") - find_package(Qt6 REQUIRED COMPONENTS Core DBus) +qt_standard_project_setup() + qt_add_executable(ping ping.cpp ping-common.h ) -target_link_libraries(ping PUBLIC +target_link_libraries(ping PRIVATE Qt6::Core Qt6::DBus ) qt_add_executable(pong ping-common.h - pong.cpp pong.h + pong.cpp ) -target_link_libraries(pong PUBLIC +target_link_libraries(pong PRIVATE Qt6::Core Qt6::DBus ) install(TARGETS ping pong - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_app_script( + TARGET ping + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR +) +install(SCRIPT ${deploy_script}) + +qt_generate_deploy_app_script( + TARGET pong + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/dbus/pingpong/ping.cpp b/examples/dbus/pingpong/ping.cpp index 17f6b0e3cb..a217107835 100644 --- a/examples/dbus/pingpong/ping.cpp +++ b/examples/dbus/pingpong/ping.cpp @@ -8,32 +8,33 @@ #include <QDBusInterface> #include <QDBusReply> -#include <stdio.h> +#include <iostream> 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" - "To start it, run:\n" - "\teval `dbus-launch --auto-syntax`\n"); + auto connection = QDBusConnection::sessionBus(); + + if (!connection.isConnected()) { + qWarning("Cannot connect to the D-Bus session bus.\n" + "To start it, run:\n" + "\teval `dbus-launch --auto-syntax`\n"); return 1; } - QDBusInterface iface(SERVICE_NAME, "/", "", QDBusConnection::sessionBus()); + QDBusInterface iface(SERVICE_NAME, "/"); if (iface.isValid()) { QDBusReply<QString> reply = iface.call("ping", argc > 1 ? argv[1] : ""); if (reply.isValid()) { - printf("Reply was: %s\n", qPrintable(reply.value())); + std::cout << "Reply was: " << qPrintable(reply.value()) << std::endl; return 0; } - fprintf(stderr, "Call failed: %s\n", qPrintable(reply.error().message())); + qWarning("Call failed: %s\n", qPrintable(reply.error().message())); return 1; } - fprintf(stderr, "%s\n", - qPrintable(QDBusConnection::sessionBus().lastError().message())); + qWarning("%s\n", qPrintable(connection.lastError().message())); return 1; } diff --git a/examples/dbus/pingpong/pong.cpp b/examples/dbus/pingpong/pong.cpp index 2aad1f10f7..ed8c90195e 100644 --- a/examples/dbus/pingpong/pong.cpp +++ b/examples/dbus/pingpong/pong.cpp @@ -2,19 +2,22 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #include "ping-common.h" -#include "pong.h" +#include <QObject> #include <QCoreApplication> #include <QDBusConnection> #include <QDBusError> -#include <QTimer> -#include <stdio.h> -#include <stdlib.h> +class Pong : public QObject +{ + Q_OBJECT +public slots: + QString ping(const QString &arg); +}; QString Pong::ping(const QString &arg) { - QMetaObject::invokeMethod(QCoreApplication::instance(), "quit"); + QMetaObject::invokeMethod(QCoreApplication::instance(), &QCoreApplication::quit); return QString("ping(\"%1\") got called").arg(arg); } @@ -22,22 +25,25 @@ 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" - "To start it, run:\n" - "\teval `dbus-launch --auto-syntax`\n"); + auto connection = QDBusConnection::sessionBus(); + + if (!connection.isConnected()) { + qWarning("Cannot connect to the D-Bus session bus.\n" + "To start it, run:\n" + "\teval `dbus-launch --auto-syntax`\n"); return 1; } - if (!QDBusConnection::sessionBus().registerService(SERVICE_NAME)) { - fprintf(stderr, "%s\n", - qPrintable(QDBusConnection::sessionBus().lastError().message())); + if (!connection.registerService(SERVICE_NAME)) { + qWarning("%s\n", qPrintable(connection.lastError().message())); exit(1); } Pong pong; - QDBusConnection::sessionBus().registerObject("/", &pong, QDBusConnection::ExportAllSlots); + connection.registerObject("/", &pong, QDBusConnection::ExportAllSlots); app.exec(); return 0; } + +#include "pong.moc" diff --git a/examples/dbus/pingpong/pong.h b/examples/dbus/pingpong/pong.h deleted file mode 100644 index f683ec3dfb..0000000000 --- a/examples/dbus/pingpong/pong.h +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef PONG_H -#define PONG_H - -#include <QtCore/QObject> - -class Pong: public QObject -{ - Q_OBJECT -public slots: - Q_SCRIPTABLE QString ping(const QString &arg); -}; - -#endif diff --git a/examples/dbus/pingpong/pong.pro b/examples/dbus/pingpong/pong.pro index bc78730534..1307e70805 100644 --- a/examples/dbus/pingpong/pong.pro +++ b/examples/dbus/pingpong/pong.pro @@ -1,7 +1,7 @@ QT -= gui QT += dbus -HEADERS += ping-common.h pong.h +HEADERS += ping-common.h SOURCES += pong.cpp target.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong |