cpp-common/bt2: remove unnecessary mentions of `bt2::`

[babeltrace.git] / src / cpp-common / bt2 / self-message-iterator.hpp

diff --git a/src/cpp-common/bt2/self-message-iterator.hpp b/src/cpp-common/bt2/self-message-iterator.hpp
index 7ad212c11b4b6e0144b4f774d00202faa78e1055..609514543aa286d47c51b7d794ae2057523c1390 100644 (file)
--- a/src/cpp-common/bt2/self-message-iterator.hpp
+++ b/src/cpp-common/bt2/self-message-iterator.hpp
@@ -72,8 +72,7 @@ public:
         return *this;
     }
 
-    bt2::StreamBeginningMessage::Shared
-    createStreamBeginningMessage(const bt2::ConstStream stream) const
+    StreamBeginningMessage::Shared createStreamBeginningMessage(const ConstStream stream) const
     {
         const auto libObjPtr =
             bt_message_stream_beginning_create(this->libObjPtr(), stream.libObjPtr());
@@ -82,10 +81,10 @@ public:
             throw MemoryError {};
         }
 
-        return bt2::StreamBeginningMessage::Shared::createWithoutRef(libObjPtr);
+        return StreamBeginningMessage::Shared::createWithoutRef(libObjPtr);
     }
 
-    bt2::StreamEndMessage::Shared createStreamEndMessage(const bt2::ConstStream stream) const
+    StreamEndMessage::Shared createStreamEndMessage(const ConstStream stream) const
     {
         const auto libObjPtr = bt_message_stream_end_create(this->libObjPtr(), stream.libObjPtr());
 
@@ -93,11 +92,11 @@ public:
             throw MemoryError {};
         }
 
-        return bt2::StreamEndMessage::Shared::createWithoutRef(libObjPtr);
+        return StreamEndMessage::Shared::createWithoutRef(libObjPtr);
     }
 
-    bt2::EventMessage::Shared createEventMessage(const bt2::ConstEventClass eventCls,
-                                                 const bt2::ConstStream stream) const
+    EventMessage::Shared createEventMessage(const ConstEventClass eventCls,
+                                            const ConstStream stream) const
     {
         const auto libObjPtr =
             bt_message_event_create(this->libObjPtr(), eventCls.libObjPtr(), stream.libObjPtr());
@@ -106,12 +105,12 @@ public:
             throw MemoryError {};
         }
 
-        return bt2::EventMessage::Shared::createWithoutRef(libObjPtr);
+        return EventMessage::Shared::createWithoutRef(libObjPtr);
     }
 
-    bt2::EventMessage::Shared createEventMessage(const bt2::ConstEventClass eventCls,
-                                                 const bt2::ConstStream stream,
-                                                 const std::uint64_t clockSnapshotValue) const
+    EventMessage::Shared createEventMessage(const ConstEventClass eventCls,
+                                            const ConstStream stream,
+                                            const std::uint64_t clockSnapshotValue) const
     {
         const auto libObjPtr = bt_message_event_create_with_default_clock_snapshot(
             this->libObjPtr(), eventCls.libObjPtr(), stream.libObjPtr(), clockSnapshotValue);
@@ -120,11 +119,11 @@ public:
             throw MemoryError {};
         }
 
-        return bt2::EventMessage::Shared::createWithoutRef(libObjPtr);
+        return EventMessage::Shared::createWithoutRef(libObjPtr);
     }
 
-    bt2::EventMessage::Shared createEventMessage(const bt2::ConstEventClass eventCls,
-                                                 const bt2::ConstPacket packet) const
+    EventMessage::Shared createEventMessage(const ConstEventClass eventCls,
+                                            const ConstPacket packet) const
     {
         const auto libObjPtr = bt_message_event_create_with_packet(
             this->libObjPtr(), eventCls.libObjPtr(), packet.libObjPtr());
@@ -133,12 +132,12 @@ public:
             throw MemoryError {};
         }
 
-        return bt2::EventMessage::Shared::createWithoutRef(libObjPtr);
+        return EventMessage::Shared::createWithoutRef(libObjPtr);
     }
 
-    bt2::EventMessage::Shared createEventMessage(const bt2::ConstEventClass eventCls,
-                                                 const bt2::ConstPacket packet,
-                                                 const std::uint64_t clockSnapshotValue) const
+    EventMessage::Shared createEventMessage(const ConstEventClass eventCls,
+                                            const ConstPacket packet,
+                                            const std::uint64_t clockSnapshotValue) const
     {
         const auto libObjPtr = bt_message_event_create_with_packet_and_default_clock_snapshot(
             this->libObjPtr(), eventCls.libObjPtr(), packet.libObjPtr(), clockSnapshotValue);
@@ -147,11 +146,10 @@ public:
             throw MemoryError {};
         }
 
-        return bt2::EventMessage::Shared::createWithoutRef(libObjPtr);
+        return EventMessage::Shared::createWithoutRef(libObjPtr);
     }
 
-    bt2::PacketBeginningMessage::Shared
-    createPacketBeginningMessage(const bt2::ConstPacket packet) const
+    PacketBeginningMessage::Shared createPacketBeginningMessage(const ConstPacket packet) const
     {
         const auto libObjPtr =
             bt_message_packet_beginning_create(this->libObjPtr(), packet.libObjPtr());
@@ -160,11 +158,11 @@ public:
             throw MemoryError {};
         }
 
-        return bt2::PacketBeginningMessage::Shared::createWithoutRef(libObjPtr);
+        return PacketBeginningMessage::Shared::createWithoutRef(libObjPtr);
     }
 
-    bt2::PacketBeginningMessage::Shared
-    createPacketBeginningMessage(const bt2::ConstPacket packet,
+    PacketBeginningMessage::Shared
+    createPacketBeginningMessage(const ConstPacket packet,
                                  const std::uint64_t clockSnapshotValue) const
     {
         const auto libObjPtr = bt_message_packet_beginning_create_with_default_clock_snapshot(
@@ -174,10 +172,10 @@ public:
             throw MemoryError {};
         }
 
-        return bt2::PacketBeginningMessage::Shared::createWithoutRef(libObjPtr);
+        return PacketBeginningMessage::Shared::createWithoutRef(libObjPtr);
     }
 
-    bt2::PacketEndMessage::Shared createPacketEndMessage(const bt2::ConstPacket packet) const
+    PacketEndMessage::Shared createPacketEndMessage(const ConstPacket packet) const
     {
         const auto libObjPtr = bt_message_packet_end_create(this->libObjPtr(), packet.libObjPtr());
 
@@ -185,12 +183,11 @@ public:
             throw MemoryError {};
         }
 
-        return bt2::PacketEndMessage::Shared::createWithoutRef(libObjPtr);
+        return PacketEndMessage::Shared::createWithoutRef(libObjPtr);
     }
 
-    bt2::PacketEndMessage::Shared
-    createPacketEndMessage(const bt2::ConstPacket packet,
-                           const std::uint64_t clockSnapshotValue) const
+    PacketEndMessage::Shared createPacketEndMessage(const ConstPacket packet,
+                                                    const std::uint64_t clockSnapshotValue) const
     {
         const auto libObjPtr = bt_message_packet_end_create_with_default_clock_snapshot(
             this->libObjPtr(), packet.libObjPtr(), clockSnapshotValue);
@@ -199,10 +196,10 @@ public:
             throw MemoryError {};
         }
 
-        return bt2::PacketEndMessage::Shared::createWithoutRef(libObjPtr);
+        return PacketEndMessage::Shared::createWithoutRef(libObjPtr);
     }
 
-    bt2::DiscardedEventsMessage::Shared createDiscardedEventsMessage(const bt2::ConstStream stream)
+    DiscardedEventsMessage::Shared createDiscardedEventsMessage(const ConstStream stream)
     {
         const auto libObjPtr =
             bt_message_discarded_events_create(this->libObjPtr(), stream.libObjPtr());
@@ -211,11 +208,11 @@ public:
             throw MemoryError {};
         }
 
-        return bt2::DiscardedEventsMessage::Shared::createWithoutRef(libObjPtr);
+        return DiscardedEventsMessage::Shared::createWithoutRef(libObjPtr);
     }
 
-    bt2::DiscardedEventsMessage::Shared
-    createDiscardedEventsMessage(const bt2::ConstStream stream,
+    DiscardedEventsMessage::Shared
+    createDiscardedEventsMessage(const ConstStream stream,
                                  const std::uint64_t beginningClockSnapshotValue,
                                  const std::uint64_t endClockSnapshotValue) const
     {
@@ -227,11 +224,10 @@ public:
             throw MemoryError {};
         }
 
-        return bt2::DiscardedEventsMessage::Shared::createWithoutRef(libObjPtr);
+        return DiscardedEventsMessage::Shared::createWithoutRef(libObjPtr);
     }
 
-    bt2::DiscardedPacketsMessage::Shared
-    createDiscardedPacketsMessage(const bt2::ConstStream stream) const
+    DiscardedPacketsMessage::Shared createDiscardedPacketsMessage(const ConstStream stream) const
     {
         const auto libObjPtr =
             bt_message_discarded_packets_create(this->libObjPtr(), stream.libObjPtr());
@@ -240,11 +236,11 @@ public:
             throw MemoryError {};
         }
 
-        return bt2::DiscardedPacketsMessage::Shared::createWithoutRef(libObjPtr);
+        return DiscardedPacketsMessage::Shared::createWithoutRef(libObjPtr);
     }
 
-    bt2::DiscardedPacketsMessage::Shared
-    createDiscardedPacketsMessage(const bt2::ConstStream stream,
+    DiscardedPacketsMessage::Shared
+    createDiscardedPacketsMessage(const ConstStream stream,
                                   const std::uint64_t beginningClockSnapshotValue,
                                   const std::uint64_t endClockSnapshotValue) const
     {
@@ -256,11 +252,11 @@ public:
             throw MemoryError {};
         }
 
-        return bt2::DiscardedPacketsMessage::Shared::createWithoutRef(libObjPtr);
+        return DiscardedPacketsMessage::Shared::createWithoutRef(libObjPtr);
     }
 
-    bt2::MessageIteratorInactivityMessage::Shared
-    createMessageIteratorInactivityMessage(const bt2::ConstClockClass clockClass,
+    MessageIteratorInactivityMessage::Shared
+    createMessageIteratorInactivityMessage(const ConstClockClass clockClass,
                                            const std::uint64_t clockSnapshotValue) const
     {
         const auto libObjPtr = bt_message_message_iterator_inactivity_create(
@@ -270,7 +266,7 @@ public:
             throw MemoryError {};
         }
 
-        return bt2::MessageIteratorInactivityMessage::Shared::createWithoutRef(libObjPtr);
+        return MessageIteratorInactivityMessage::Shared::createWithoutRef(libObjPtr);
     }
 };