generic-library/ebml
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libebml: a plain integer doesn't need a const

Browse Source 
git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libebml@280 a6f86f6d-0131-4f8e-9e7b-e335508773d5
This commit is contained in:
Steve Lhomme 2010-05-27 15:52:47 +00:00
parent c59c4616d3
commit 33c808ec0e
6 changed files with 139 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ebml/EbmlElement.h
View File

@ -371,12 +371,12 @@ class EBML_DLL_API EbmlElement {
int GetSizeLength() const {return SizeLength;} int GetSizeLength() const {return SizeLength;}
static EbmlElement * FindNextElement(IOCallback & DataStream, const EbmlSemanticContext & Context, int & UpperLevel, uint64 MaxDataSize, bool AllowDummyElt, unsigned int MaxLowerLevel = 1); static EbmlElement * FindNextElement(IOCallback & DataStream, const EbmlSemanticContext & Context, int & UpperLevel, uint64 MaxDataSize, bool AllowDummyElt, unsigned int MaxLowerLevel = 1);
static EbmlElement * FindNextID(IOCallback & DataStream, const EbmlCallbacks & ClassInfos, const uint64 MaxDataSize); static EbmlElement * FindNextID(IOCallback & DataStream, const EbmlCallbacks & ClassInfos, uint64 MaxDataSize);
/*! /*!
\brief find the next element with the same ID \brief find the next element with the same ID
*/ */
EbmlElement * FindNext(IOCallback & DataStream, const uint64 MaxDataSize); EbmlElement * FindNext(IOCallback & DataStream, uint64 MaxDataSize);
EbmlElement * SkipData(EbmlStream & DataStream, const EbmlSemanticContext & Context, EbmlElement * TestReadElt = NULL, bool AllowDummyElt = false); EbmlElement * SkipData(EbmlStream & DataStream, const EbmlSemanticContext & Context, EbmlElement * TestReadElt = NULL, bool AllowDummyElt = false);

6
ebml/EbmlStream.h
View File

@ -30,7 +30,7 @@
/*! /*!
\file \file
\version \$Id: EbmlStream.h 639 2004-07-09 20:59:14Z mosu $ \version \$Id$
\author Steve Lhomme <robux4 @ users.sf.net> \author Steve Lhomme <robux4 @ users.sf.net>
*/ */
#ifndef LIBEBML_STREAM_H #ifndef LIBEBML_STREAM_H
@ -56,9 +56,9 @@ class EBML_DLL_API EbmlStream {
\param MaxDataSize The maximum possible of the data in the element (for sanity checks) \param MaxDataSize The maximum possible of the data in the element (for sanity checks)
\note the user will have to delete that element later \note the user will have to delete that element later
*/ */
EbmlElement * FindNextID(const EbmlCallbacks & ClassInfos, const uint64 MaxDataSize); EbmlElement * FindNextID(const EbmlCallbacks & ClassInfos, uint64 MaxDataSize);
EbmlElement * FindNextElement(const EbmlSemanticContext & Context, int & UpperLevel, const uint64 MaxDataSize, bool AllowDummyElt, unsigned int MaxLowerLevel = 1); EbmlElement * FindNextElement(const EbmlSemanticContext & Context, int & UpperLevel, uint64 MaxDataSize, bool AllowDummyElt, unsigned int MaxLowerLevel = 1);
inline IOCallback & I_O() {return Stream;} inline IOCallback & I_O() {return Stream;}
operator IOCallback &() {return Stream;} operator IOCallback &() {return Stream;}

2
ebml/EbmlUInteger.h
View File

@ -76,7 +76,7 @@ class EBML_DLL_API EbmlUInteger : public EbmlElement {
void SetDefaultValue(uint64); void SetDefaultValue(uint64);
const uint64 DefaultVal() const; uint64 DefaultVal() const;
bool IsDefaultValue() const { bool IsDefaultValue() const {
return (DefaultISset() && Value == DefaultValue); return (DefaultISset() && Value == DefaultValue);

2
src/EbmlElement.cpp
View File

@ -257,7 +257,7 @@ EbmlElement::~EbmlElement()
\todo this method is deprecated and should be called FindThisID \todo this method is deprecated and should be called FindThisID
\todo replace the new RawElement with the appropriate class (when known) \todo replace the new RawElement with the appropriate class (when known)
*/ */
EbmlElement * EbmlElement::FindNextID(IOCallback & DataStream, const EbmlCallbacks & ClassInfos, const uint64 MaxDataSize) EbmlElement * EbmlElement::FindNextID(IOCallback & DataStream, const EbmlCallbacks & ClassInfos, uint64 MaxDataSize)
{ {
binary PossibleId[4]; binary PossibleId[4];
int PossibleID_Length = 0; int PossibleID_Length = 0;

6
src/EbmlStream.cpp
View File

@ -30,7 +30,7 @@
/*! /*!
\file \file
\version \$Id: EbmlStream.cpp 639 2004-07-09 20:59:14Z mosu $ \version \$Id$
\author Steve Lhomme <robux4 @ users.sf.net> \author Steve Lhomme <robux4 @ users.sf.net>
*/ */
#include "ebml/EbmlStream.h" #include "ebml/EbmlStream.h"
@ -44,12 +44,12 @@ EbmlStream::EbmlStream(IOCallback & DataStream)
EbmlStream::~EbmlStream() EbmlStream::~EbmlStream()
{} {}
EbmlElement * EbmlStream::FindNextID(const EbmlCallbacks & ClassInfos, const uint64 MaxDataSize) EbmlElement * EbmlStream::FindNextID(const EbmlCallbacks & ClassInfos, uint64 MaxDataSize)
{ {
return EbmlElement::FindNextID(Stream, ClassInfos, MaxDataSize); return EbmlElement::FindNextID(Stream, ClassInfos, MaxDataSize);
} }
EbmlElement * EbmlStream::FindNextElement(const EbmlSemanticContext & Context, int & UpperLevel, const uint64 MaxDataSize, bool AllowDummyElt, unsigned int MaxLowerLevel) EbmlElement * EbmlStream::FindNextElement(const EbmlSemanticContext & Context, int & UpperLevel, uint64 MaxDataSize, bool AllowDummyElt, unsigned int MaxLowerLevel)
{ {
return EbmlElement::FindNextElement(Stream, Context, UpperLevel, MaxDataSize, AllowDummyElt, MaxLowerLevel); return EbmlElement::FindNextElement(Stream, Context, UpperLevel, MaxDataSize, AllowDummyElt, MaxLowerLevel);
} }

4
src/EbmlUInteger.cpp
View File

@ -30,7 +30,7 @@
/*! /*!
\file \file
\version \$Id: EbmlUInteger.cpp 1079 2005-03-03 13:18:14Z robux4 $ \version \$Id$
\author Steve Lhomme <robux4 @ users.sf.net> \author Steve Lhomme <robux4 @ users.sf.net>
\author Moritz Bunkus <moritz @ bunkus.org> \author Moritz Bunkus <moritz @ bunkus.org>
*/ */
@ -64,7 +64,7 @@ void EbmlUInteger::SetDefaultValue(uint64 aValue)
SetDefaultIsSet(); SetDefaultIsSet();
} }
const uint64 EbmlUInteger::DefaultVal() const uint64 EbmlUInteger::DefaultVal() const
{ {
assert(DefaultISset()); assert(DefaultISset());
return DefaultValue; return DefaultValue;