Remove QCanBusFactory and rename QCanBusFactoryV2 to QCanBusFactory

Fixes: QTBUG-93403
Change-Id: I1b8f3952284e7ec722716fa11e701b96d80a85f1
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

1 files changed, 3 insertions, 37 deletions

diff --git a/src/serialbus/qcanbusfactory.cpp b/src/serialbus/qcanbusfactory.cpp
index 508741b..4b6f278 100644
--- a/src/serialbus/qcanbusfactory.cpp
+++ b/src/serialbus/qcanbusfactory.cpp
@@ -41,17 +41,12 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QCanBusFactory
     \inmodule QtSerialBus
-    \since 5.8
-    \deprecated
+    \since 5.9
 
     \brief The QCanBusFactory class is a factory class used as the
     plugin interface for CAN bus plugins.
 
     All plugins must implement the functions provided by this factory class.
-
-    This class is deprecated, you should use QCanBusFactoryV2 instead.
-
-    \sa QCanBusFactoryV2
 */
 
 /*!
@@ -67,36 +62,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \internal
-
-    \fn QCanBusFactory::~QCanBusFactory()
-*/
-
-/*!
-    \class QCanBusFactoryV2
-    \inmodule QtSerialBus
-    \since 5.9
-
-    \brief The QCanBusFactoryV2 class is a factory class used as the
-    plugin interface for CAN bus plugins.
-
-    All plugins must implement the functions provided by this factory class.
-*/
-
-/*!
-    \fn QCanBusDevice *QCanBusFactoryV2::createDevice(const QString &interfaceName,
-                                                    QString *errorMessage) const
-
-    Creates a new QCanBusDevice. The caller must take ownership of the returned pointer.
-
-    \a interfaceName is the CAN interface name and
-    \a errorMessage contains an error description in case of failure.
-
-    If the factory cannot create a plugin, it returns \c nullptr.
-*/
-
-/*!
-    \fn QList<QCanBusDeviceInfo> QCanBusFactoryV2::availableDevices(QString *errorMessage) const
+    \fn QList<QCanBusDeviceInfo> QCanBusFactory::availableDevices(QString *errorMessage) const
 
     Returns the list of available devices and their capabilities for the QCanBusDevice.
 
@@ -106,7 +72,7 @@ QT_BEGIN_NAMESPACE
 /*!
  * \internal
  */
-QCanBusFactoryV2::~QCanBusFactoryV2()
+QCanBusFactory::~QCanBusFactory()
 {
 }