QtCanBus: move QDebug stream operators into correct namespace

... so ADL can find them.

Change-Id: I7cd6d18d73b5a7c416c1dd93fbf1405fa13b1081
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit 28e5e91d0edd3b233b9a27e0b00ce95be5c3fd9c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

2 files changed, 21 insertions, 19 deletions

diff --git a/src/serialbus/qcancommondefinitions.cpp b/src/serialbus/qcancommondefinitions.cpp
index c220154..ccd96da 100644
--- a/src/serialbus/qcancommondefinitions.cpp
+++ b/src/serialbus/qcancommondefinitions.cpp
@@ -67,64 +67,64 @@ QT_BEGIN_NAMESPACE
 */
 
 #ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug dbg, QtCanBus::DataSource source)
+QDebug QtCanBus::operator<<(QDebug dbg, DataSource source)
 {
     QDebugStateSaver saver(dbg);
     switch (source) {
-    case QtCanBus::DataSource::Payload:
+    case DataSource::Payload:
         dbg << "Payload";
         break;
-    case QtCanBus::DataSource::FrameId:
+    case DataSource::FrameId:
         dbg << "FrameId";
         break;
     }
     return dbg;
 }
 
-QDebug operator<<(QDebug dbg, QtCanBus::DataFormat format)
+QDebug QtCanBus::operator<<(QDebug dbg, DataFormat format)
 {
     QDebugStateSaver saver(dbg);
     switch (format) {
-    case QtCanBus::DataFormat::UnsignedInteger:
+    case DataFormat::UnsignedInteger:
         dbg << "UnsignedInteger";
         break;
-    case QtCanBus::DataFormat::SignedInteger:
+    case DataFormat::SignedInteger:
         dbg << "SignedInteger";
         break;
-    case QtCanBus::DataFormat::Float:
+    case DataFormat::Float:
         dbg << "Float";
         break;
-    case QtCanBus::DataFormat::Double:
+    case DataFormat::Double:
         dbg << "Double";
         break;
-    case QtCanBus::DataFormat::AsciiString:
+    case DataFormat::AsciiString:
         dbg << "ASCII";
         break;
     }
     return dbg;
 }
 
-QDebug operator<<(QDebug dbg, QtCanBus::MultiplexState state)
+QDebug QtCanBus::operator<<(QDebug dbg, MultiplexState state)
 {
     QDebugStateSaver saver(dbg);
     switch (state) {
-    case QtCanBus::MultiplexState::None:
+    case MultiplexState::None:
         dbg << "None";
         break;
-    case QtCanBus::MultiplexState::MultiplexorSwitch:
+    case MultiplexState::MultiplexorSwitch:
         dbg << "MultiplexorSwitch";
         break;
-    case QtCanBus::MultiplexState::MultiplexedSignal:
+    case MultiplexState::MultiplexedSignal:
         dbg << "MultiplexedSignal";
         break;
-    case QtCanBus::MultiplexState::SwitchAndSignal:
+    case MultiplexState::SwitchAndSignal:
         dbg << "SwitchAndSignal";
         break;
     }
     return dbg;
 }
 
-QDebug operator<<(QDebug dbg, QtCanBus::UniqueId uid)
+QDebug QtCanBus::operator<<(QDebug dbg, UniqueId uid)
 {
     dbg << qToUnderlying(uid);
     return dbg;
diff --git a/src/serialbus/qcancommondefinitions.h b/src/serialbus/qcancommondefinitions.h
index 54e2728..4956d95 100644
--- a/src/serialbus/qcancommondefinitions.h
+++ b/src/serialbus/qcancommondefinitions.h
@@ -49,10 +49,12 @@ inline UniqueId qbswap(UniqueId src) noexcept
 
 class QDebug;
 
-Q_SERIALBUS_EXPORT QDebug operator<<(QDebug dbg, QtCanBus::DataSource source);
-Q_SERIALBUS_EXPORT QDebug operator<<(QDebug dbg, QtCanBus::DataFormat format);
-Q_SERIALBUS_EXPORT QDebug operator<<(QDebug dbg, QtCanBus::MultiplexState state);
-Q_SERIALBUS_EXPORT QDebug operator<<(QDebug dbg, QtCanBus::UniqueId uid);
+namespace QtCanBus {
+Q_SERIALBUS_EXPORT QDebug operator<<(QDebug dbg, DataSource source);
+Q_SERIALBUS_EXPORT QDebug operator<<(QDebug dbg, DataFormat format);
+Q_SERIALBUS_EXPORT QDebug operator<<(QDebug dbg, MultiplexState state);
+Q_SERIALBUS_EXPORT QDebug operator<<(QDebug dbg, UniqueId uid);
+} // namespace QtCanBus
 
 #endif // QT_NO_DEBUG_STREAM