Remove unneeded typedef QWORD.

3 files changed, 20 insertions, 22 deletions

diff --git a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp
index 570475e9c..d1458114b 100644
--- a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp
+++ b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp
@@ -218,7 +218,7 @@ HRESULT Segment::ParseMinimal(CMatroskaNode* pMN0)
         return S_OK;

     }

 

-    while (MatroskaReader::QWORD pos = pMN->FindPos(0x114D9B74, pMN->GetPos())) {

+    while (QWORD pos = pMN->FindPos(0x114D9B74, pMN->GetPos())) {

         pMN->SeekTo(pos);

         if (FAILED(pMN->Parse())) {

             break; // a broken file

@@ -752,9 +752,9 @@ HRESULT SimpleBlock::Parse(CMatroskaNode* pMN, bool fFull)
         return S_OK;

     }

 

-    CAtlList<MatroskaReader::QWORD> lens;

-    MatroskaReader::QWORD tlen = 0;

-    MatroskaReader::QWORD FrameSize;

+    CAtlList<QWORD> lens;

+    QWORD tlen = 0;

+    QWORD FrameSize;

     BYTE FramesInLaceLessOne;

 

     switch ((Lacing & 0x06) >> 1) {

@@ -768,7 +768,7 @@ HRESULT SimpleBlock::Parse(CMatroskaNode* pMN, bool fFull)
             pMN->Read(n);

             while (n-- > 0) {

                 BYTE b;

-                MatroskaReader::QWORD len = 0;

+                QWORD len = 0;

                 do {

                     pMN->Read(b);

                     len += b;

@@ -811,7 +811,7 @@ HRESULT SimpleBlock::Parse(CMatroskaNode* pMN, bool fFull)
 

     POSITION pos = lens.GetHeadPosition();

     while (pos) {

-        MatroskaReader::QWORD len = lens.GetNext(pos);

+        QWORD len = lens.GetNext(pos);

         CAutoPtr<CBinary> p(DEBUG_NEW CBinary());

         p->SetCount((INT_PTR)len);

         pMN->Read(p->GetData(), len);

@@ -1119,7 +1119,7 @@ HRESULT CANSI::Parse(CMatroskaNode* pMN)
 {

     Empty();

 

-    MatroskaReader::QWORD len = pMN->m_len;

+    QWORD len = pMN->m_len;

     CHAR c;

     while (len-- > 0 && SUCCEEDED(pMN->Read(c))) {

         *this += c;

@@ -1278,7 +1278,7 @@ HRESULT CLength::Parse(CMatroskaNode* pMN)
 

     //int nMoreBytesTmp = nMoreBytes;

 

-    MatroskaReader::QWORD UnknownSize = (1i64 << (7 * (nMoreBytes + 1))) - 1;

+    QWORD UnknownSize = (1i64 << (7 * (nMoreBytes + 1))) - 1;

 

     while (nMoreBytes-- > 0) {

         m_val <<= 8;

@@ -1327,7 +1327,7 @@ HRESULT CSignedLength::Parse(CMatroskaNode* pMN)
 

     //int nMoreBytesTmp = nMoreBytes;

 

-    MatroskaReader::QWORD UnknownSize = (1i64<<(7*(nMoreBytes+1)))-1;

+    QWORD UnknownSize = (1i64<<(7*(nMoreBytes+1)))-1;

 

     while (nMoreBytes-- > 0)

     {

@@ -1451,9 +1451,9 @@ bool CMatroskaNode::Next(bool fSame)
 

 bool CMatroskaNode::Find(DWORD id, bool fSearch)

 {

-    MatroskaReader::QWORD pos = m_pParent && m_pParent->m_id == 0x18538067 /*segment?*/

-                                ? FindPos(id)

-                                : 0;

+    QWORD pos = m_pParent && m_pParent->m_id == 0x18538067 /*segment?*/

+                ? FindPos(id)

+                : 0;

 

     if (pos) {

         SeekTo(pos);

@@ -1467,17 +1467,17 @@ bool CMatroskaNode::Find(DWORD id, bool fSearch)
     return (m_id == id);

 }

 

-void CMatroskaNode::SeekTo(MatroskaReader::QWORD pos)

+void CMatroskaNode::SeekTo(QWORD pos)

 {

     m_pMF->Seek(pos);

 }

 

-MatroskaReader::QWORD CMatroskaNode::GetPos()

+QWORD CMatroskaNode::GetPos()

 {

     return m_pMF->GetPos();

 }

 

-MatroskaReader::QWORD CMatroskaNode::GetLength()

+QWORD CMatroskaNode::GetLength()

 {

     return m_pMF->GetLength();

 }

@@ -1488,12 +1488,12 @@ HRESULT CMatroskaNode::Read(T& var)
     return m_pMF->Read(var);

 }

 

-HRESULT CMatroskaNode::Read(BYTE* pData, MatroskaReader::QWORD len)

+HRESULT CMatroskaNode::Read(BYTE* pData, QWORD len)

 {

     return m_pMF->ByteRead(pData, len);

 }

 

-MatroskaReader::QWORD CMatroskaNode::FindPos(DWORD id, MatroskaReader::QWORD start)

+QWORD CMatroskaNode::FindPos(DWORD id, QWORD start)

 {

     Segment& sm = m_pMF->m_segment;

 

diff --git a/src/filters/parser/MatroskaSplitter/MatroskaFile.h b/src/filters/parser/MatroskaSplitter/MatroskaFile.h
index 8169e578e..9ef8995ca 100644
--- a/src/filters/parser/MatroskaSplitter/MatroskaFile.h
+++ b/src/filters/parser/MatroskaSplitter/MatroskaFile.h
@@ -1,6 +1,6 @@
 /*

  * (C) 2003-2006 Gabest

- * (C) 2006-2012 see Authors.txt

+ * (C) 2006-2013 see Authors.txt

  *

  * This file is part of MPC-HC.

  *

@@ -29,8 +29,6 @@ namespace MatroskaReader
 {

     class CMatroskaNode;

 

-    typedef unsigned __int64 QWORD;

-

     class CANSI : public CStringA

     {

     public:

diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp
index f95fb9be5..77857a7a0 100644
--- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp
+++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp
@@ -443,7 +443,7 @@ avcsuccess:
                     m_pSegment = Root.Child(0x18538067);

                     m_pCluster = m_pSegment->Child(0x1F43B675);

 

-                    MatroskaReader::QWORD lastCueClusterPosition = (MatroskaReader::QWORD) - 1;

+                    QWORD lastCueClusterPosition = (QWORD) - 1;

                     UINT64 timecode1 = 0;

                     UINT64 timecode2 = 0;

                     unsigned int framecount = 0;

@@ -1157,7 +1157,7 @@ void CMatroskaSplitterFilter::DemuxSeek(REFERENCE_TIME rt)
     if (rt > 0) {

         rt += m_pFile->m_rtOffset;

 

-        MatroskaReader::QWORD lastCueClusterPosition = (MatroskaReader::QWORD) - 1;

+        QWORD lastCueClusterPosition = (QWORD) - 1;

 

         Segment& s = m_pFile->m_segment;