diff options
Diffstat (limited to 'src/plugins/canbus/passthrucan/passthrucanbackend.h')
| -rw-r--r-- | src/plugins/canbus/passthrucan/passthrucanbackend.h | 46 |
1 files changed, 7 insertions, 39 deletions
diff --git a/src/plugins/canbus/passthrucan/passthrucanbackend.h b/src/plugins/canbus/passthrucan/passthrucanbackend.h index 864d1b4..7f78036 100644 --- a/src/plugins/canbus/passthrucan/passthrucanbackend.h +++ b/src/plugins/canbus/passthrucan/passthrucanbackend.h @@ -1,38 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Ford Motor Company. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtSerialBus module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2017 Ford Motor Company. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef PASSTHRUCAN_PASSTHRUCANBACKEND_H #define PASSTHRUCAN_PASSTHRUCANBACKEND_H @@ -40,9 +7,9 @@ #include <QtSerialBus/qcanbusdevice.h> #include <QtSerialBus/qcanbusframe.h> +#include <QList> #include <QString> #include <QThread> -#include <QVector> QT_BEGIN_NAMESPACE @@ -56,11 +23,12 @@ public: explicit PassThruCanBackend(const QString &name, QObject *parent = nullptr); virtual ~PassThruCanBackend(); - void setConfigurationParameter(int key, const QVariant &value) override; + void setConfigurationParameter(ConfigurationKey key, const QVariant &value) override; bool writeFrame(const QCanBusFrame &frame) override; QString interpretErrorFrame(const QCanBusFrame &errorFrame) override; static QList<QCanBusDeviceInfo> interfaces(); + QCanBusDeviceInfo deviceInfo() const override; protected: bool open() override; @@ -69,7 +37,7 @@ protected: private: void ackOpenFinished(bool success); void ackCloseFinished(); - void applyConfig(int key, const QVariant &value); + void applyConfig(QCanBusDevice::ConfigurationKey key, const QVariant &value); QString m_deviceName; QThread m_ioThread; @@ -79,6 +47,6 @@ private: QT_END_NAMESPACE Q_DECLARE_METATYPE(QCanBusDevice::CanBusError) -Q_DECLARE_METATYPE(QVector<QCanBusFrame>) +Q_DECLARE_METATYPE(QList<QCanBusFrame>) #endif // PASSTHRUCAN_PASSTHRUCANBACKEND_H |