summaryrefslogtreecommitdiffstats
path: root/examples/dbus/complexpingpong
diff options
context:
space:
mode:
Diffstat (limited to 'examples/dbus/complexpingpong')
-rw-r--r--examples/dbus/complexpingpong/CMakeLists.txt28
-rw-r--r--examples/dbus/complexpingpong/complexping.cpp40
-rw-r--r--examples/dbus/complexpingpong/complexping.h9
-rw-r--r--examples/dbus/complexpingpong/complexpong.cpp20
-rw-r--r--examples/dbus/complexpingpong/complexpong.h11
5 files changed, 61 insertions, 47 deletions
diff --git a/examples/dbus/complexpingpong/CMakeLists.txt b/examples/dbus/complexpingpong/CMakeLists.txt
index 377b56b1ab..da4ca95288 100644
--- a/examples/dbus/complexpingpong/CMakeLists.txt
+++ b/examples/dbus/complexpingpong/CMakeLists.txt
@@ -1,15 +1,13 @@
# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
cmake_minimum_required(VERSION 3.16)
project(complexpingpong LANGUAGES CXX)
-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/complexpingpong")
-
find_package(Qt6 REQUIRED COMPONENTS Core DBus)
qt_standard_project_setup()
@@ -34,7 +32,21 @@ target_link_libraries(complexpong PRIVATE
)
install(TARGETS complexping complexpong
- 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 complexping
+ OUTPUT_SCRIPT deploy_script
+ NO_UNSUPPORTED_PLATFORM_ERROR
+)
+install(SCRIPT ${deploy_script})
+
+qt_generate_deploy_app_script(
+ TARGET complexpong
+ OUTPUT_SCRIPT deploy_script
+ NO_UNSUPPORTED_PLATFORM_ERROR
)
+install(SCRIPT ${deploy_script})
diff --git a/examples/dbus/complexpingpong/complexping.cpp b/examples/dbus/complexpingpong/complexping.cpp
index 71e3e41b01..9651183c92 100644
--- a/examples/dbus/complexpingpong/complexping.cpp
+++ b/examples/dbus/complexpingpong/complexping.cpp
@@ -5,54 +5,58 @@
#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());
}
}
@@ -61,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;
}
diff --git a/examples/dbus/complexpingpong/complexping.h b/examples/dbus/complexpingpong/complexping.h
index cb067993d3..fd566a9bab 100644
--- a/examples/dbus/complexpingpong/complexping.h
+++ b/examples/dbus/complexpingpong/complexping.h
@@ -5,17 +5,12 @@
#define COMPLEXPING_H
#include <QtCore/QObject>
-#include <QtCore/QFile>
-#include <QtDBus/QDBusInterface>
-class Ping: public QObject
+class Ping : public QObject
{
Q_OBJECT
public slots:
- void start(const QString &);
-public:
- QFile qstdin;
- QDBusInterface *iface;
+ void start(const QString &name);
};
#endif
diff --git a/examples/dbus/complexpingpong/complexpong.cpp b/examples/dbus/complexpingpong/complexpong.cpp
index 059153ba36..088b452b30 100644
--- a/examples/dbus/complexpingpong/complexpong.cpp
+++ b/examples/dbus/complexpingpong/complexpong.cpp
@@ -7,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;
@@ -25,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)
@@ -54,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();
diff --git a/examples/dbus/complexpingpong/complexpong.h b/examples/dbus/complexpingpong/complexpong.h
index 56d0badc22..b9328c399e 100644
--- a/examples/dbus/complexpingpong/complexpong.h
+++ b/examples/dbus/complexpingpong/complexpong.h
@@ -8,23 +8,26 @@
#include <QtDBus/QDBusAbstractAdaptor>
#include <QtDBus/QDBusVariant>
-class Pong: public QDBusAbstractAdaptor
+class Pong : public QDBusAbstractAdaptor
{
Q_OBJECT
Q_CLASSINFO("D-Bus Interface", "org.example.QtDBus.ComplexPong.Pong")
Q_PROPERTY(QString value READ value WRITE setValue)
public:
- QString m_value;
QString value() const;
void setValue(const QString &newValue);
- Pong(QObject *obj) : QDBusAbstractAdaptor(obj)
- { }
+ Pong(QObject *obj) : QDBusAbstractAdaptor(obj) { }
+
signals:
void aboutToQuit();
+
public slots:
QDBusVariant query(const QString &query);
Q_NOREPLY void quit();
+
+private:
+ QString m_value;
};
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 11:02:41 +0000