diff options
| author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2023-02-22 12:52:55 +0100 |
|---|---|---|
| committer | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2023-02-28 18:15:24 +0100 |
| commit | f952e74cfea438a5a411454cb50d470cd5928be7 (patch) | |
| tree | eed00631539f74b4bb57556878be4256142b1125 /examples/dbus | |
| parent | 07b8a5a4093ecb69ced47b67cbcac5121064fe5e (diff) | |
pingpong example: Remove pong.h
Move the class definition inside pong.cpp.
Task-number: QTBUG-111366
Pick-to: 6.5
Change-Id: Id4b376451cb2bdbd04ccce4b2dcf0760dbfbfb2a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'examples/dbus')
| -rw-r--r-- | examples/dbus/pingpong/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/dbus/pingpong/pong.cpp | 11 | ||||
| -rw-r--r-- | examples/dbus/pingpong/pong.h | 16 | ||||
| -rw-r--r-- | examples/dbus/pingpong/pong.pro | 2 |
4 files changed, 12 insertions, 19 deletions
diff --git a/examples/dbus/pingpong/CMakeLists.txt b/examples/dbus/pingpong/CMakeLists.txt index 551fc0f0f6..5d59813784 100644 --- a/examples/dbus/pingpong/CMakeLists.txt +++ b/examples/dbus/pingpong/CMakeLists.txt @@ -26,7 +26,7 @@ target_link_libraries(ping PRIVATE qt_add_executable(pong ping-common.h - pong.cpp pong.h + pong.cpp ) target_link_libraries(pong PRIVATE diff --git a/examples/dbus/pingpong/pong.cpp b/examples/dbus/pingpong/pong.cpp index 6bcb9a6771..ed8c90195e 100644 --- a/examples/dbus/pingpong/pong.cpp +++ b/examples/dbus/pingpong/pong.cpp @@ -2,12 +2,19 @@ // 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> +class Pong : public QObject +{ + Q_OBJECT +public slots: + QString ping(const QString &arg); +}; + QString Pong::ping(const QString &arg) { QMetaObject::invokeMethod(QCoreApplication::instance(), &QCoreApplication::quit); @@ -38,3 +45,5 @@ int main(int argc, char **argv) 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 2a99be9ca5..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: - 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 |