summaryrefslogtreecommitdiffstats
path: root/examples/dbus/remotecontrolledcar/controller
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-08-02 20:50:01 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-07 23:27:17 +0200
commitbf2ae556acaabf6db0350fd52f626f9dd212487a (patch)
tree13d19871e5d66a11a172369ce35254041f2baf83 /examples/dbus/remotecontrolledcar/controller
parent842b1bd29ea8914a00620432d860433fe5374cad (diff)
let qmake auto-generate d-bus adaptors and interfaces
Change-Id: If721dc2d75e382bde6bf9bcda921170186406c7f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'examples/dbus/remotecontrolledcar/controller')
-rw-r--r--examples/dbus/remotecontrolledcar/controller/car_interface.cpp64
-rw-r--r--examples/dbus/remotecontrolledcar/controller/car_interface.h113
-rw-r--r--examples/dbus/remotecontrolledcar/controller/controller.pro6
3 files changed, 3 insertions, 180 deletions
diff --git a/examples/dbus/remotecontrolledcar/controller/car_interface.cpp b/examples/dbus/remotecontrolledcar/controller/car_interface.cpp
deleted file mode 100644
index 3a7020eac7..0000000000
--- a/examples/dbus/remotecontrolledcar/controller/car_interface.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** 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 Nokia Corporation and its Subsidiary(-ies) 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$
-**
-**
-** This file was generated by qdbusxml2cpp version 0.7
-** Command line was: qdbusxml2cpp -i car_interface.h -p :car_interface.cpp car.xml
-**
-** qqdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** This is an auto-generated file.
-** This file may have been hand-edited. Look for HAND-EDIT comments
-** before re-generating it.
-**
-****************************************************************************/
-
-#include "car_interface.h"
-/*
- * Implementation of interface class OrgExampleExamplesCarInterfaceInterface
- */
-
-OrgExampleExamplesCarInterfaceInterface::OrgExampleExamplesCarInterfaceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
- : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-OrgExampleExamplesCarInterfaceInterface::~OrgExampleExamplesCarInterfaceInterface()
-{
-}
-
diff --git a/examples/dbus/remotecontrolledcar/controller/car_interface.h b/examples/dbus/remotecontrolledcar/controller/car_interface.h
deleted file mode 100644
index 1696b2fe83..0000000000
--- a/examples/dbus/remotecontrolledcar/controller/car_interface.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** 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 Nokia Corporation and its Subsidiary(-ies) 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$
-**
-**
-** This file was generated by qdbusxml2cpp version 0.7
-** Command line was: qdbusxml2cpp -p car_interface.h: car.xml
-**
-** qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** This is an auto-generated file.
-** Do not edit! All changes made to it will be lost.
-**
-****************************************************************************/
-
-#ifndef CAR_INTERFACE_H_1264772826
-#define CAR_INTERFACE_H_1264772826
-
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtDBus/QtDBus>
-
-/*
- * Proxy class for interface org.example.Examples.CarInterface
- */
-class OrgExampleExamplesCarInterfaceInterface: public QDBusAbstractInterface
-{
- Q_OBJECT
-public:
- static inline const char *staticInterfaceName()
- { return "org.example.Examples.CarInterface"; }
-
-public:
- OrgExampleExamplesCarInterfaceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
- ~OrgExampleExamplesCarInterfaceInterface();
-
-public Q_SLOTS: // METHODS
- inline QDBusPendingReply<> accelerate()
- {
- QList<QVariant> argumentList;
- return asyncCallWithArgumentList(QLatin1String("accelerate"), argumentList);
- }
-
- inline QDBusPendingReply<> decelerate()
- {
- QList<QVariant> argumentList;
- return asyncCallWithArgumentList(QLatin1String("decelerate"), argumentList);
- }
-
- inline QDBusPendingReply<> turnLeft()
- {
- QList<QVariant> argumentList;
- return asyncCallWithArgumentList(QLatin1String("turnLeft"), argumentList);
- }
-
- inline QDBusPendingReply<> turnRight()
- {
- QList<QVariant> argumentList;
- return asyncCallWithArgumentList(QLatin1String("turnRight"), argumentList);
- }
-
-Q_SIGNALS: // SIGNALS
- void crashed();
-};
-
-namespace org {
- namespace example {
- namespace Examples {
- typedef ::OrgExampleExamplesCarInterfaceInterface CarInterface;
- }
- }
-}
-#endif
diff --git a/examples/dbus/remotecontrolledcar/controller/controller.pro b/examples/dbus/remotecontrolledcar/controller/controller.pro
index d072c27239..5ee37bec71 100644
--- a/examples/dbus/remotecontrolledcar/controller/controller.pro
+++ b/examples/dbus/remotecontrolledcar/controller/controller.pro
@@ -1,9 +1,9 @@
QT += dbus widgets
-# DBUS_INTERFACES += car.xml
+DBUS_INTERFACES += car.xml
FORMS += controller.ui
-HEADERS += car_interface.h controller.h
-SOURCES += main.cpp car_interface.cpp controller.cpp
+HEADERS += controller.h
+SOURCES += main.cpp controller.cpp
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/controller