From: Steve Lhomme <slhomme@matroska.org>
Date: Sat, 17 Sep 2022 10:43:21 +0000 (+0200)
Subject: use the libebml namespace directly
X-Git-Tag: release-1.7.0~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4eef0bf9975a956c7ecf7f67edafa238e76353f;p=libmatroska

use the libebml namespace directly

There hasn't been a case where there's no namespace in a long time.
---

diff --git a/matroska/FileKax.h b/matroska/FileKax.h
index e4a0b6a..b234720 100644
--- a/matroska/FileKax.h
+++ b/matroska/FileKax.h
@@ -45,7 +45,7 @@
 //#include "Cluster.h"
 //#include "CodecHeader.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 
diff --git a/matroska/KaxBlock.h b/matroska/KaxBlock.h
index 78d17df..6dc6c20 100644
--- a/matroska/KaxBlock.h
+++ b/matroska/KaxBlock.h
@@ -43,7 +43,7 @@
 #include "matroska/KaxTracks.h"
 #include "matroska/KaxDefines.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 
diff --git a/matroska/KaxBlockData.h b/matroska/KaxBlockData.h
index ab2ae05..517f0cc 100644
--- a/matroska/KaxBlockData.h
+++ b/matroska/KaxBlockData.h
@@ -40,7 +40,7 @@
 #include "matroska/KaxDefines.h"
 #include "matroska/KaxBlock.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 
diff --git a/matroska/KaxCluster.h b/matroska/KaxCluster.h
index e7babcf..31e81b8 100644
--- a/matroska/KaxCluster.h
+++ b/matroska/KaxCluster.h
@@ -42,7 +42,7 @@
 #include "matroska/KaxCues.h"
 #include "matroska/KaxDefines.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 
diff --git a/matroska/KaxContexts.h b/matroska/KaxContexts.h
index dacdd14..37808bc 100644
--- a/matroska/KaxContexts.h
+++ b/matroska/KaxContexts.h
@@ -38,7 +38,7 @@
 #include "matroska/KaxTypes.h"
 #include "ebml/EbmlElement.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 
diff --git a/matroska/KaxCues.h b/matroska/KaxCues.h
index 69e933f..6a9610d 100644
--- a/matroska/KaxCues.h
+++ b/matroska/KaxCues.h
@@ -41,7 +41,7 @@
 #include "ebml/EbmlMaster.h"
 #include "matroska/KaxBlock.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 
diff --git a/matroska/KaxCuesData.h b/matroska/KaxCuesData.h
index 6de03f2..7f6bed3 100644
--- a/matroska/KaxCuesData.h
+++ b/matroska/KaxCuesData.h
@@ -38,7 +38,7 @@
 #include "ebml/EbmlMaster.h"
 #include "matroska/KaxDefines.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 
diff --git a/matroska/KaxInfoData.h b/matroska/KaxInfoData.h
index dde2be4..053dc88 100644
--- a/matroska/KaxInfoData.h
+++ b/matroska/KaxInfoData.h
@@ -47,7 +47,7 @@
 #include "matroska/KaxDefines.h"
 #include "matroska/KaxSemantic.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 
diff --git a/matroska/KaxSeekHead.h b/matroska/KaxSeekHead.h
index 77238e2..f21fdcd 100644
--- a/matroska/KaxSeekHead.h
+++ b/matroska/KaxSeekHead.h
@@ -41,7 +41,7 @@
 #include "ebml/EbmlUInteger.h"
 #include "matroska/KaxDefines.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 
diff --git a/matroska/KaxSegment.h b/matroska/KaxSegment.h
index c31856e..112d61d 100644
--- a/matroska/KaxSegment.h
+++ b/matroska/KaxSegment.h
@@ -39,7 +39,7 @@
 #include "ebml/EbmlMaster.h"
 #include "matroska/KaxDefines.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 
diff --git a/matroska/KaxSemantic.h b/matroska/KaxSemantic.h
index 272c5dd..d970894 100644
--- a/matroska/KaxSemantic.h
+++ b/matroska/KaxSemantic.h
@@ -44,7 +44,7 @@
 #include "ebml/EbmlMaster.h"
 #include "matroska/KaxDefines.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 DECLARE_MKX_BINARY (KaxSeekID)
diff --git a/matroska/KaxTracks.h b/matroska/KaxTracks.h
index cf76596..ca82334 100644
--- a/matroska/KaxTracks.h
+++ b/matroska/KaxTracks.h
@@ -41,7 +41,7 @@
 #include "matroska/KaxDefines.h"
 #include "matroska/KaxSemantic.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 
diff --git a/src/KaxAttached.cpp b/src/KaxAttached.cpp
index 4d59872..881c83a 100644
--- a/src/KaxAttached.cpp
+++ b/src/KaxAttached.cpp
@@ -38,7 +38,7 @@
 
 // sub elements
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 
diff --git a/src/KaxAttachments.cpp b/src/KaxAttachments.cpp
index c437b2d..3483d5a 100644
--- a/src/KaxAttachments.cpp
+++ b/src/KaxAttachments.cpp
@@ -36,7 +36,7 @@
 #include "matroska/KaxDefines.h"
 #include "matroska/KaxSemantic.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 // sub elements
 namespace libmatroska {
diff --git a/src/KaxBlockData.cpp b/src/KaxBlockData.cpp
index 4459c10..86cda32 100644
--- a/src/KaxBlockData.cpp
+++ b/src/KaxBlockData.cpp
@@ -38,7 +38,7 @@
 #include "matroska/KaxDefines.h"
 #include "matroska/KaxSemantic.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 
diff --git a/src/KaxContexts.cpp b/src/KaxContexts.cpp
index 6b72db1..fd92035 100644
--- a/src/KaxContexts.cpp
+++ b/src/KaxContexts.cpp
@@ -40,7 +40,7 @@
 #include "matroska/KaxSegment.h"
 #include "matroska/KaxTracks.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 
diff --git a/src/KaxSeekHead.cpp b/src/KaxSeekHead.cpp
index c9d5b61..6631182 100644
--- a/src/KaxSeekHead.cpp
+++ b/src/KaxSeekHead.cpp
@@ -38,7 +38,7 @@
 #include "matroska/KaxCues.h"
 #include "matroska/KaxDefines.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 // sub elements
 namespace libmatroska {
diff --git a/test/ebml/test0.cpp b/test/ebml/test0.cpp
index fb8e191..ac94fe7 100644
--- a/test/ebml/test0.cpp
+++ b/test/ebml/test0.cpp
@@ -50,7 +50,7 @@
 #include "ebml/EbmlStream.h"
 #include "ebml/StdIOCallback.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 const char RW_FILENAME[] = "test.kax";
 
@@ -149,7 +149,7 @@ int main(void)
   ///////////////////////////////
   //   Unicode String data
   ///////////////////////////////
-  UTFstring bString = L"Stève Lhomm€";
+  UTFstring bString = L"St�ve Lhomm�";
   EbmlUnicodeString testUStr(200);
 
   testUStr.SetID(SemanticList[4].Id, SemanticList[4].IdLength);