diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2016-05-03 15:45:40 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2016-05-04 16:14:19 +0000 |
commit | b8d5c1f1dff57da6927470543e5d004c237846ac (patch) | |
tree | 5fdd8fafd036df90e8dd45b4767b26984ca5c828 | |
parent | aa4222f350a59ad2d90f14a1dfb88f83bf2d2c78 (diff) |
CAN: Do not use QPointer class as it is overhead
... and use the QScopedPointer instead, where possible.
Change-Id: Ie503d5ff31af77cf6a495f324c1e93c34ff7d58b
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
-rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.cpp | 4 | ||||
-rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.h | 3 | ||||
-rw-r--r-- | src/plugins/canbus/tinycan/tinycanbackend.cpp | 1 | ||||
-rw-r--r-- | src/plugins/canbus/tinycan/tinycanbackend.h | 1 | ||||
-rw-r--r-- | src/plugins/canbus/tinycan/tinycanbackend_p.h | 2 | ||||
-rw-r--r-- | src/tools/canbusutil/canbusutil.cpp | 6 | ||||
-rw-r--r-- | src/tools/canbusutil/canbusutil.h | 7 | ||||
-rw-r--r-- | src/tools/canbusutil/main.cpp | 3 | ||||
-rw-r--r-- | src/tools/canbusutil/sigtermhandler.cpp | 2 | ||||
-rw-r--r-- | src/tools/canbusutil/sigtermhandler.h | 3 | ||||
-rw-r--r-- | tests/auto/plugins/genericcanbus/dummybackend.h | 3 | ||||
-rw-r--r-- | tests/auto/qcanbus/tst_qcanbus.cpp | 5 | ||||
-rw-r--r-- | tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp | 15 |
13 files changed, 27 insertions, 28 deletions
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index 2579881..87c466e 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -77,7 +77,7 @@ QT_BEGIN_NAMESPACE SocketCanBackend::SocketCanBackend(const QString &name) : canSocket(-1), - notifier(0), + notifier(nullptr), canSocketName(name), canFdOptionEnabled(false) { @@ -285,7 +285,7 @@ bool SocketCanBackend::connectSocket() delete notifier; notifier = new QSocketNotifier(canSocket, QSocketNotifier::Read, this); - connect(notifier.data(), &QSocketNotifier::activated, + connect(notifier, &QSocketNotifier::activated, this, &SocketCanBackend::readSocket); //apply all stored configurations diff --git a/src/plugins/canbus/socketcan/socketcanbackend.h b/src/plugins/canbus/socketcan/socketcanbackend.h index b0c2362..06e7f84 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.h +++ b/src/plugins/canbus/socketcan/socketcanbackend.h @@ -40,7 +40,6 @@ #include <QtSerialBus/qcanbusframe.h> #include <QtSerialBus/qcanbusdevice.h> -#include <QtCore/qpointer.h> #include <QtCore/qsocketnotifier.h> #include <QtCore/qstring.h> #include <QtCore/qvariant.h> @@ -72,7 +71,7 @@ private: bool applyConfigurationParameter(int key, const QVariant &value); qint64 canSocket; - QPointer<QSocketNotifier> notifier; + QSocketNotifier *notifier; QString canSocketName; bool canFdOptionEnabled; }; diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp index 727721f..530959a 100644 --- a/src/plugins/canbus/tinycan/tinycanbackend.cpp +++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp @@ -115,6 +115,7 @@ TinyCanBackendPrivate::TinyCanBackendPrivate(TinyCanBackend *q) : q_ptr(q) , isOpen(false) , channelIndex(INDEX_INVALID) + , outgoingEventNotifier(nullptr) { startupDriver(); diff --git a/src/plugins/canbus/tinycan/tinycanbackend.h b/src/plugins/canbus/tinycan/tinycanbackend.h index 5b71f19..bd3aca0 100644 --- a/src/plugins/canbus/tinycan/tinycanbackend.h +++ b/src/plugins/canbus/tinycan/tinycanbackend.h @@ -41,7 +41,6 @@ #include <QtSerialBus/qcanbusframe.h> #include <QtSerialBus/qcanbusdevice.h> -#include <QtCore/qpointer.h> #include <QtCore/qvariant.h> #include <QtCore/qvector.h> #include <QtCore/qlist.h> diff --git a/src/plugins/canbus/tinycan/tinycanbackend_p.h b/src/plugins/canbus/tinycan/tinycanbackend_p.h index bd17c62..bc0f385 100644 --- a/src/plugins/canbus/tinycan/tinycanbackend_p.h +++ b/src/plugins/canbus/tinycan/tinycanbackend_p.h @@ -82,7 +82,7 @@ public: TinyCanBackend * const q_ptr; bool isOpen; int channelIndex; - QPointer<QTimer> outgoingEventNotifier; + QTimer *outgoingEventNotifier; }; QT_END_NAMESPACE diff --git a/src/tools/canbusutil/canbusutil.cpp b/src/tools/canbusutil/canbusutil.cpp index 299a252..8f70f07 100644 --- a/src/tools/canbusutil/canbusutil.cpp +++ b/src/tools/canbusutil/canbusutil.cpp @@ -62,7 +62,7 @@ bool CanBusUtil::start(int argc, char *argv[]) return false; if (listening) { - connect(canDevice.data(), &QCanBusDevice::framesReceived, readTask.data(), &ReadTask::checkMessages); + connect(canDevice.data(), &QCanBusDevice::framesReceived, readTask, &ReadTask::checkMessages); } else { if (!sendData()) return false; @@ -227,12 +227,12 @@ bool CanBusUtil::connectCanDevice() for (int i = 0; i < plugins.size(); i++) { if (plugins.at(i) == pluginName) { - canDevice = canBus->createDevice(plugins.at(i), deviceName); + canDevice.reset(canBus->createDevice(plugins.at(i), deviceName)); if (!canDevice) { output << "Unable to create QCanBusDevice with device name: " << deviceName << endl; return false; } - connect(canDevice.data(), &QCanBusDevice::errorOccurred, readTask.data(), &ReadTask::receiveError); + connect(canDevice.data(), &QCanBusDevice::errorOccurred, readTask, &ReadTask::receiveError); if (!canDevice->connectDevice()) { output << "Unable to connect QCanBusDevice with device name: " << deviceName << endl; return false; diff --git a/src/tools/canbusutil/canbusutil.h b/src/tools/canbusutil/canbusutil.h index 42d4bcf..3ae20ec 100644 --- a/src/tools/canbusutil/canbusutil.h +++ b/src/tools/canbusutil/canbusutil.h @@ -40,6 +40,7 @@ #include <QObject> #include <QTextStream> #include <QCoreApplication> +#include <QScopedPointer> #include "readtask.h" @@ -63,15 +64,15 @@ private: bool sendData(); private: - QPointer<QCanBus> canBus; + QCanBus *canBus; QTextStream &output; QCoreApplication &app; bool listening; QString pluginName; QString deviceName; QString data; - QPointer<QCanBusDevice> canDevice; - QPointer<ReadTask> readTask; + QScopedPointer<QCanBusDevice> canDevice; + ReadTask *readTask; }; #endif // CANBUSUTIL_H diff --git a/src/tools/canbusutil/main.cpp b/src/tools/canbusutil/main.cpp index 4bdbef6..ee7d30e 100644 --- a/src/tools/canbusutil/main.cpp +++ b/src/tools/canbusutil/main.cpp @@ -36,6 +36,7 @@ #include <QCoreApplication> #include <QTextStream> +#include <QScopedPointer> #include <signal.h> @@ -46,7 +47,7 @@ int main(int argc, char *argv[]) { QCoreApplication a(argc, argv); - QPointer<SigTermHandler> s = SigTermHandler::instance(); + QScopedPointer<SigTermHandler> s(SigTermHandler::instance()); if (signal(SIGINT, SigTermHandler::handle) == SIG_ERR) return -1; QObject::connect(s.data(), &SigTermHandler::sigTermSignal, &a, &QCoreApplication::quit); diff --git a/src/tools/canbusutil/sigtermhandler.cpp b/src/tools/canbusutil/sigtermhandler.cpp index 1c7fac1..bf6f6ba 100644 --- a/src/tools/canbusutil/sigtermhandler.cpp +++ b/src/tools/canbusutil/sigtermhandler.cpp @@ -38,7 +38,7 @@ #include <QTextStream> -QPointer<SigTermHandler> SigTermHandler::instance() +SigTermHandler *SigTermHandler::instance() { static auto inst = new SigTermHandler(); return inst; diff --git a/src/tools/canbusutil/sigtermhandler.h b/src/tools/canbusutil/sigtermhandler.h index a767eba..b2c09b3 100644 --- a/src/tools/canbusutil/sigtermhandler.h +++ b/src/tools/canbusutil/sigtermhandler.h @@ -38,13 +38,12 @@ #define SIGTERMHANDLER_H #include <QObject> -#include <QPointer> class SigTermHandler : public QObject { Q_OBJECT public: - static QPointer<SigTermHandler> instance(); + static SigTermHandler *instance(); static void handle(int s); virtual ~SigTermHandler(); diff --git a/tests/auto/plugins/genericcanbus/dummybackend.h b/tests/auto/plugins/genericcanbus/dummybackend.h index 2ba5dfe..1c708b3 100644 --- a/tests/auto/plugins/genericcanbus/dummybackend.h +++ b/tests/auto/plugins/genericcanbus/dummybackend.h @@ -40,7 +40,6 @@ #include <QtSerialBus/qcanbusdevice.h> #include <QtCore/qbytearray.h> -#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE @@ -63,7 +62,7 @@ public Q_SLOTS: void sendMessage(); private: - QPointer<QTimer> sendTimer; + QTimer *sendTimer; QByteArray byteArray; }; diff --git a/tests/auto/qcanbus/tst_qcanbus.cpp b/tests/auto/qcanbus/tst_qcanbus.cpp index 664f4e8..b549f09 100644 --- a/tests/auto/qcanbus/tst_qcanbus.cpp +++ b/tests/auto/qcanbus/tst_qcanbus.cpp @@ -51,7 +51,7 @@ private slots: void createDevice(); private: - QPointer<QCanBus> bus; + QCanBus *bus; }; tst_QCanBus::tst_QCanBus() @@ -71,8 +71,7 @@ void tst_QCanBus::initTestCase() #endif bus = QCanBus::instance(); QVERIFY(bus); - QPointer<QCanBus> sameInstance; - sameInstance = QCanBus::instance(); + QCanBus *sameInstance = QCanBus::instance(); QCOMPARE(bus, sameInstance); } diff --git a/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp b/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp index b99ac64..c8ffb40 100644 --- a/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp +++ b/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp @@ -39,6 +39,7 @@ #include <QtTest/QtTest> #include <QSignalSpy> +#include <QScopedPointer> class tst_Backend : public QCanBusDevice { @@ -119,7 +120,7 @@ private slots: void tst_filtering(); private: - QPointer<QCanBusDevice> device; + QScopedPointer<QCanBusDevice> device; }; tst_QCanBusDevice::tst_QCanBusDevice() @@ -130,7 +131,7 @@ tst_QCanBusDevice::tst_QCanBusDevice() void tst_QCanBusDevice::initTestCase() { - device = new tst_Backend(); + device.reset(new tst_Backend()); QVERIFY(device); QSignalSpy stateSpy(device.data(), @@ -180,8 +181,8 @@ void tst_QCanBusDevice::conf() void tst_QCanBusDevice::write() { - QSignalSpy spy(device, SIGNAL(written())); - QSignalSpy stateSpy(device, + QSignalSpy spy(device.data(), SIGNAL(written())); + QSignalSpy stateSpy(device.data(), SIGNAL(stateChanged(QCanBusDevice::CanBusDeviceState))); QCanBusFrame frame; @@ -217,7 +218,7 @@ void tst_QCanBusDevice::write() void tst_QCanBusDevice::read() { - QSignalSpy stateSpy(device, + QSignalSpy stateSpy(device.data(), SIGNAL(stateChanged(QCanBusDevice::CanBusDeviceState))); device->disconnectDevice(); @@ -244,10 +245,10 @@ void tst_QCanBusDevice::read() void tst_QCanBusDevice::error() { - QSignalSpy spy(device, SIGNAL(errorOccurred(QCanBusDevice::CanBusError))); + QSignalSpy spy(device.data(), SIGNAL(errorOccurred(QCanBusDevice::CanBusError))); QString testString(QStringLiteral("testString")); - auto backend = qobject_cast<tst_Backend *>(device); + auto backend = qobject_cast<tst_Backend *>(device.data()); QVERIFY(backend); //NoError |