From f952e74cfea438a5a411454cb50d470cd5928be7 Mon Sep 17 00:00:00 2001
From: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
Date: Wed, 22 Feb 2023 12:52:55 +0100
Subject: pingpong example: Remove pong.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 examples/dbus/pingpong/CMakeLists.txt |  2 +-
 examples/dbus/pingpong/pong.cpp       | 11 ++++++++++-
 examples/dbus/pingpong/pong.h         | 16 ----------------
 examples/dbus/pingpong/pong.pro       |  2 +-
 4 files changed, 12 insertions(+), 19 deletions(-)
 delete mode 100644 examples/dbus/pingpong/pong.h

(limited to 'examples')

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
-- 
cgit v1.2.3