mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
bug #75220: sr=jst, r=vidur. Renaming the member function |Promises| to the more meaningful |IsDependentOn|.
This commit is contained in:
parent
d9e4d736da
commit
7f6ec20ca4
@ -272,7 +272,7 @@ class NS_COM nsAString
|
||||
public:
|
||||
virtual const char_type* GetReadableFragment( nsReadableFragment<char_type>&, nsFragmentRequest, PRUint32 = 0 ) const = 0;
|
||||
virtual char_type* GetWritableFragment( nsWritableFragment<char_type>&, nsFragmentRequest, PRUint32 = 0 ) = 0;
|
||||
virtual PRBool Promises( const self_type& aString ) const { return &aString == this; }
|
||||
virtual PRBool IsDependentOn( const self_type& aString ) const { return &aString == this; }
|
||||
};
|
||||
|
||||
class NS_COM nsACString
|
||||
@ -502,7 +502,7 @@ class NS_COM nsACString
|
||||
public:
|
||||
virtual const char_type* GetReadableFragment( nsReadableFragment<char_type>&, nsFragmentRequest, PRUint32 = 0 ) const = 0;
|
||||
virtual char_type* GetWritableFragment( nsWritableFragment<char_type>&, nsFragmentRequest, PRUint32 = 0 ) = 0;
|
||||
virtual PRBool Promises( const self_type& aString ) const { return &aString == this; }
|
||||
virtual PRBool IsDependentOn( const self_type& aString ) const { return &aString == this; }
|
||||
};
|
||||
|
||||
#include "nsAPromiseString.h"
|
||||
|
@ -107,7 +107,7 @@ class NS_COM nsDependentConcatenation
|
||||
public:
|
||||
|
||||
virtual PRUint32 Length() const;
|
||||
virtual PRBool Promises( const string_type& ) const;
|
||||
virtual PRBool IsDependentOn( const string_type& ) const;
|
||||
// virtual PRBool PromisesExactly( const string_type& ) const;
|
||||
|
||||
// const self_type operator+( const string_type& rhs ) const;
|
||||
@ -184,7 +184,7 @@ class NS_COM nsDependentCConcatenation
|
||||
public:
|
||||
|
||||
virtual PRUint32 Length() const;
|
||||
virtual PRBool Promises( const string_type& ) const;
|
||||
virtual PRBool IsDependentOn( const string_type& ) const;
|
||||
// virtual PRBool PromisesExactly( const string_type& ) const;
|
||||
|
||||
// const self_type operator+( const string_type& rhs ) const;
|
||||
|
@ -83,7 +83,7 @@ class NS_COM nsDependentSubstring
|
||||
|
||||
public:
|
||||
virtual PRUint32 Length() const;
|
||||
virtual PRBool Promises( const string_type& aString ) const { return mString.Promises(aString); }
|
||||
virtual PRBool IsDependentOn( const string_type& aString ) const { return mString.IsDependentOn(aString); }
|
||||
|
||||
private:
|
||||
const string_type& mString;
|
||||
@ -136,7 +136,7 @@ class NS_COM nsDependentCSubstring
|
||||
|
||||
public:
|
||||
virtual PRUint32 Length() const;
|
||||
virtual PRBool Promises( const string_type& aString ) const { return mString.Promises(aString); }
|
||||
virtual PRBool IsDependentOn( const string_type& aString ) const { return mString.IsDependentOn(aString); }
|
||||
|
||||
private:
|
||||
const string_type& mString;
|
||||
|
@ -96,7 +96,7 @@ class NS_COM nsPromiseFlatString
|
||||
virtual const nsBufferHandle<PRUnichar>* GetFlatBufferHandle() const;
|
||||
virtual const nsBufferHandle<PRUnichar>* GetBufferHandle() const;
|
||||
virtual const nsSharedBufferHandle<PRUnichar>* GetSharedBufferHandle() const;
|
||||
virtual PRBool Promises( const nsAString& ) const;
|
||||
virtual PRBool IsDependentOn( const nsAString& ) const;
|
||||
|
||||
|
||||
// things we are forwarding now, but won't when we finally fix obsolete/nsString et al
|
||||
@ -132,7 +132,7 @@ class NS_COM nsPromiseFlatCString
|
||||
virtual const nsBufferHandle<char>* GetFlatBufferHandle() const;
|
||||
virtual const nsBufferHandle<char>* GetBufferHandle() const;
|
||||
virtual const nsSharedBufferHandle<char>* GetSharedBufferHandle() const;
|
||||
virtual PRBool Promises( const nsACString& ) const;
|
||||
virtual PRBool IsDependentOn( const nsACString& ) const;
|
||||
|
||||
|
||||
// things we are forwarding now, but won't when we finally fix obsolete/nsString et al
|
||||
|
@ -220,7 +220,7 @@ nsAString::AssignFromPromise( const self_type& aReadable )
|
||||
option to fix either the callers or this mechanism.
|
||||
*/
|
||||
{
|
||||
if ( !aReadable.Promises(*this) )
|
||||
if ( !aReadable.IsDependentOn(*this) )
|
||||
do_AssignFromReadable(aReadable);
|
||||
else
|
||||
{
|
||||
@ -289,7 +289,7 @@ nsAString::AppendFromReadable( const self_type& aReadable )
|
||||
void
|
||||
nsAString::AppendFromPromise( const self_type& aReadable )
|
||||
{
|
||||
if ( !aReadable.Promises(*this) )
|
||||
if ( !aReadable.IsDependentOn(*this) )
|
||||
do_AppendFromReadable(aReadable);
|
||||
else
|
||||
{
|
||||
@ -354,7 +354,7 @@ nsAString::InsertFromReadable( const self_type& aReadable, index_type atPosition
|
||||
void
|
||||
nsAString::InsertFromPromise( const self_type& aReadable, index_type atPosition )
|
||||
{
|
||||
if ( !aReadable.Promises(*this) )
|
||||
if ( !aReadable.IsDependentOn(*this) )
|
||||
do_InsertFromReadable(aReadable, atPosition);
|
||||
else
|
||||
{
|
||||
@ -443,7 +443,7 @@ nsAString::ReplaceFromReadable( index_type cutStart, size_type cutLength, const
|
||||
void
|
||||
nsAString::ReplaceFromPromise( index_type cutStart, size_type cutLength, const self_type& aReadable )
|
||||
{
|
||||
if ( !aReadable.Promises(*this) )
|
||||
if ( !aReadable.IsDependentOn(*this) )
|
||||
do_ReplaceFromReadable(cutStart, cutLength, aReadable);
|
||||
else
|
||||
{
|
||||
@ -680,7 +680,7 @@ nsACString::AssignFromPromise( const self_type& aReadable )
|
||||
option to fix either the callers or this mechanism.
|
||||
*/
|
||||
{
|
||||
if ( !aReadable.Promises(*this) )
|
||||
if ( !aReadable.IsDependentOn(*this) )
|
||||
do_AssignFromReadable(aReadable);
|
||||
else
|
||||
{
|
||||
@ -749,7 +749,7 @@ nsACString::AppendFromReadable( const self_type& aReadable )
|
||||
void
|
||||
nsACString::AppendFromPromise( const self_type& aReadable )
|
||||
{
|
||||
if ( !aReadable.Promises(*this) )
|
||||
if ( !aReadable.IsDependentOn(*this) )
|
||||
do_AppendFromReadable(aReadable);
|
||||
else
|
||||
{
|
||||
@ -814,7 +814,7 @@ nsACString::InsertFromReadable( const self_type& aReadable, index_type atPositio
|
||||
void
|
||||
nsACString::InsertFromPromise( const self_type& aReadable, index_type atPosition )
|
||||
{
|
||||
if ( !aReadable.Promises(*this) )
|
||||
if ( !aReadable.IsDependentOn(*this) )
|
||||
do_InsertFromReadable(aReadable, atPosition);
|
||||
else
|
||||
{
|
||||
@ -903,7 +903,7 @@ nsACString::ReplaceFromReadable( index_type cutStart, size_type cutLength, const
|
||||
void
|
||||
nsACString::ReplaceFromPromise( index_type cutStart, size_type cutLength, const self_type& aReadable )
|
||||
{
|
||||
if ( !aReadable.Promises(*this) )
|
||||
if ( !aReadable.IsDependentOn(*this) )
|
||||
do_ReplaceFromReadable(cutStart, cutLength, aReadable);
|
||||
else
|
||||
{
|
||||
|
@ -39,9 +39,9 @@ nsDependentConcatenation::Length() const
|
||||
}
|
||||
|
||||
PRBool
|
||||
nsDependentConcatenation::Promises( const string_type& aString ) const
|
||||
nsDependentConcatenation::IsDependentOn( const string_type& aString ) const
|
||||
{
|
||||
return mStrings[0]->Promises(aString) || mStrings[1]->Promises(aString);
|
||||
return mStrings[0]->IsDependentOn(aString) || mStrings[1]->IsDependentOn(aString);
|
||||
}
|
||||
|
||||
#if 0
|
||||
@ -124,9 +124,9 @@ nsDependentCConcatenation::Length() const
|
||||
}
|
||||
|
||||
PRBool
|
||||
nsDependentCConcatenation::Promises( const string_type& aString ) const
|
||||
nsDependentCConcatenation::IsDependentOn( const string_type& aString ) const
|
||||
{
|
||||
return mStrings[0]->Promises(aString) || mStrings[1]->Promises(aString);
|
||||
return mStrings[0]->IsDependentOn(aString) || mStrings[1]->IsDependentOn(aString);
|
||||
}
|
||||
|
||||
#if 0
|
||||
|
@ -63,9 +63,9 @@ nsPromiseFlatString::GetSharedBufferHandle() const
|
||||
}
|
||||
|
||||
PRBool
|
||||
nsPromiseFlatString::Promises( const nsAString& aString ) const
|
||||
nsPromiseFlatString::IsDependentOn( const nsAString& aString ) const
|
||||
{
|
||||
return mPromisedString->Promises(aString);
|
||||
return mPromisedString->IsDependentOn(aString);
|
||||
}
|
||||
|
||||
const PRUnichar*
|
||||
@ -127,9 +127,9 @@ nsPromiseFlatCString::GetSharedBufferHandle() const
|
||||
}
|
||||
|
||||
PRBool
|
||||
nsPromiseFlatCString::Promises( const nsACString& aString ) const
|
||||
nsPromiseFlatCString::IsDependentOn( const nsACString& aString ) const
|
||||
{
|
||||
return mPromisedString->Promises(aString);
|
||||
return mPromisedString->IsDependentOn(aString);
|
||||
}
|
||||
|
||||
const char*
|
||||
|
@ -272,7 +272,7 @@ class NS_COM nsAString
|
||||
public:
|
||||
virtual const char_type* GetReadableFragment( nsReadableFragment<char_type>&, nsFragmentRequest, PRUint32 = 0 ) const = 0;
|
||||
virtual char_type* GetWritableFragment( nsWritableFragment<char_type>&, nsFragmentRequest, PRUint32 = 0 ) = 0;
|
||||
virtual PRBool Promises( const self_type& aString ) const { return &aString == this; }
|
||||
virtual PRBool IsDependentOn( const self_type& aString ) const { return &aString == this; }
|
||||
};
|
||||
|
||||
class NS_COM nsACString
|
||||
@ -502,7 +502,7 @@ class NS_COM nsACString
|
||||
public:
|
||||
virtual const char_type* GetReadableFragment( nsReadableFragment<char_type>&, nsFragmentRequest, PRUint32 = 0 ) const = 0;
|
||||
virtual char_type* GetWritableFragment( nsWritableFragment<char_type>&, nsFragmentRequest, PRUint32 = 0 ) = 0;
|
||||
virtual PRBool Promises( const self_type& aString ) const { return &aString == this; }
|
||||
virtual PRBool IsDependentOn( const self_type& aString ) const { return &aString == this; }
|
||||
};
|
||||
|
||||
#include "nsAPromiseString.h"
|
||||
|
@ -107,7 +107,7 @@ class NS_COM nsDependentConcatenation
|
||||
public:
|
||||
|
||||
virtual PRUint32 Length() const;
|
||||
virtual PRBool Promises( const string_type& ) const;
|
||||
virtual PRBool IsDependentOn( const string_type& ) const;
|
||||
// virtual PRBool PromisesExactly( const string_type& ) const;
|
||||
|
||||
// const self_type operator+( const string_type& rhs ) const;
|
||||
@ -184,7 +184,7 @@ class NS_COM nsDependentCConcatenation
|
||||
public:
|
||||
|
||||
virtual PRUint32 Length() const;
|
||||
virtual PRBool Promises( const string_type& ) const;
|
||||
virtual PRBool IsDependentOn( const string_type& ) const;
|
||||
// virtual PRBool PromisesExactly( const string_type& ) const;
|
||||
|
||||
// const self_type operator+( const string_type& rhs ) const;
|
||||
|
@ -83,7 +83,7 @@ class NS_COM nsDependentSubstring
|
||||
|
||||
public:
|
||||
virtual PRUint32 Length() const;
|
||||
virtual PRBool Promises( const string_type& aString ) const { return mString.Promises(aString); }
|
||||
virtual PRBool IsDependentOn( const string_type& aString ) const { return mString.IsDependentOn(aString); }
|
||||
|
||||
private:
|
||||
const string_type& mString;
|
||||
@ -136,7 +136,7 @@ class NS_COM nsDependentCSubstring
|
||||
|
||||
public:
|
||||
virtual PRUint32 Length() const;
|
||||
virtual PRBool Promises( const string_type& aString ) const { return mString.Promises(aString); }
|
||||
virtual PRBool IsDependentOn( const string_type& aString ) const { return mString.IsDependentOn(aString); }
|
||||
|
||||
private:
|
||||
const string_type& mString;
|
||||
|
@ -96,7 +96,7 @@ class NS_COM nsPromiseFlatString
|
||||
virtual const nsBufferHandle<PRUnichar>* GetFlatBufferHandle() const;
|
||||
virtual const nsBufferHandle<PRUnichar>* GetBufferHandle() const;
|
||||
virtual const nsSharedBufferHandle<PRUnichar>* GetSharedBufferHandle() const;
|
||||
virtual PRBool Promises( const nsAString& ) const;
|
||||
virtual PRBool IsDependentOn( const nsAString& ) const;
|
||||
|
||||
|
||||
// things we are forwarding now, but won't when we finally fix obsolete/nsString et al
|
||||
@ -132,7 +132,7 @@ class NS_COM nsPromiseFlatCString
|
||||
virtual const nsBufferHandle<char>* GetFlatBufferHandle() const;
|
||||
virtual const nsBufferHandle<char>* GetBufferHandle() const;
|
||||
virtual const nsSharedBufferHandle<char>* GetSharedBufferHandle() const;
|
||||
virtual PRBool Promises( const nsACString& ) const;
|
||||
virtual PRBool IsDependentOn( const nsACString& ) const;
|
||||
|
||||
|
||||
// things we are forwarding now, but won't when we finally fix obsolete/nsString et al
|
||||
|
@ -220,7 +220,7 @@ nsAString::AssignFromPromise( const self_type& aReadable )
|
||||
option to fix either the callers or this mechanism.
|
||||
*/
|
||||
{
|
||||
if ( !aReadable.Promises(*this) )
|
||||
if ( !aReadable.IsDependentOn(*this) )
|
||||
do_AssignFromReadable(aReadable);
|
||||
else
|
||||
{
|
||||
@ -289,7 +289,7 @@ nsAString::AppendFromReadable( const self_type& aReadable )
|
||||
void
|
||||
nsAString::AppendFromPromise( const self_type& aReadable )
|
||||
{
|
||||
if ( !aReadable.Promises(*this) )
|
||||
if ( !aReadable.IsDependentOn(*this) )
|
||||
do_AppendFromReadable(aReadable);
|
||||
else
|
||||
{
|
||||
@ -354,7 +354,7 @@ nsAString::InsertFromReadable( const self_type& aReadable, index_type atPosition
|
||||
void
|
||||
nsAString::InsertFromPromise( const self_type& aReadable, index_type atPosition )
|
||||
{
|
||||
if ( !aReadable.Promises(*this) )
|
||||
if ( !aReadable.IsDependentOn(*this) )
|
||||
do_InsertFromReadable(aReadable, atPosition);
|
||||
else
|
||||
{
|
||||
@ -443,7 +443,7 @@ nsAString::ReplaceFromReadable( index_type cutStart, size_type cutLength, const
|
||||
void
|
||||
nsAString::ReplaceFromPromise( index_type cutStart, size_type cutLength, const self_type& aReadable )
|
||||
{
|
||||
if ( !aReadable.Promises(*this) )
|
||||
if ( !aReadable.IsDependentOn(*this) )
|
||||
do_ReplaceFromReadable(cutStart, cutLength, aReadable);
|
||||
else
|
||||
{
|
||||
@ -680,7 +680,7 @@ nsACString::AssignFromPromise( const self_type& aReadable )
|
||||
option to fix either the callers or this mechanism.
|
||||
*/
|
||||
{
|
||||
if ( !aReadable.Promises(*this) )
|
||||
if ( !aReadable.IsDependentOn(*this) )
|
||||
do_AssignFromReadable(aReadable);
|
||||
else
|
||||
{
|
||||
@ -749,7 +749,7 @@ nsACString::AppendFromReadable( const self_type& aReadable )
|
||||
void
|
||||
nsACString::AppendFromPromise( const self_type& aReadable )
|
||||
{
|
||||
if ( !aReadable.Promises(*this) )
|
||||
if ( !aReadable.IsDependentOn(*this) )
|
||||
do_AppendFromReadable(aReadable);
|
||||
else
|
||||
{
|
||||
@ -814,7 +814,7 @@ nsACString::InsertFromReadable( const self_type& aReadable, index_type atPositio
|
||||
void
|
||||
nsACString::InsertFromPromise( const self_type& aReadable, index_type atPosition )
|
||||
{
|
||||
if ( !aReadable.Promises(*this) )
|
||||
if ( !aReadable.IsDependentOn(*this) )
|
||||
do_InsertFromReadable(aReadable, atPosition);
|
||||
else
|
||||
{
|
||||
@ -903,7 +903,7 @@ nsACString::ReplaceFromReadable( index_type cutStart, size_type cutLength, const
|
||||
void
|
||||
nsACString::ReplaceFromPromise( index_type cutStart, size_type cutLength, const self_type& aReadable )
|
||||
{
|
||||
if ( !aReadable.Promises(*this) )
|
||||
if ( !aReadable.IsDependentOn(*this) )
|
||||
do_ReplaceFromReadable(cutStart, cutLength, aReadable);
|
||||
else
|
||||
{
|
||||
|
@ -39,9 +39,9 @@ nsDependentConcatenation::Length() const
|
||||
}
|
||||
|
||||
PRBool
|
||||
nsDependentConcatenation::Promises( const string_type& aString ) const
|
||||
nsDependentConcatenation::IsDependentOn( const string_type& aString ) const
|
||||
{
|
||||
return mStrings[0]->Promises(aString) || mStrings[1]->Promises(aString);
|
||||
return mStrings[0]->IsDependentOn(aString) || mStrings[1]->IsDependentOn(aString);
|
||||
}
|
||||
|
||||
#if 0
|
||||
@ -124,9 +124,9 @@ nsDependentCConcatenation::Length() const
|
||||
}
|
||||
|
||||
PRBool
|
||||
nsDependentCConcatenation::Promises( const string_type& aString ) const
|
||||
nsDependentCConcatenation::IsDependentOn( const string_type& aString ) const
|
||||
{
|
||||
return mStrings[0]->Promises(aString) || mStrings[1]->Promises(aString);
|
||||
return mStrings[0]->IsDependentOn(aString) || mStrings[1]->IsDependentOn(aString);
|
||||
}
|
||||
|
||||
#if 0
|
||||
|
@ -63,9 +63,9 @@ nsPromiseFlatString::GetSharedBufferHandle() const
|
||||
}
|
||||
|
||||
PRBool
|
||||
nsPromiseFlatString::Promises( const nsAString& aString ) const
|
||||
nsPromiseFlatString::IsDependentOn( const nsAString& aString ) const
|
||||
{
|
||||
return mPromisedString->Promises(aString);
|
||||
return mPromisedString->IsDependentOn(aString);
|
||||
}
|
||||
|
||||
const PRUnichar*
|
||||
@ -127,9 +127,9 @@ nsPromiseFlatCString::GetSharedBufferHandle() const
|
||||
}
|
||||
|
||||
PRBool
|
||||
nsPromiseFlatCString::Promises( const nsACString& aString ) const
|
||||
nsPromiseFlatCString::IsDependentOn( const nsACString& aString ) const
|
||||
{
|
||||
return mPromisedString->Promises(aString);
|
||||
return mPromisedString->IsDependentOn(aString);
|
||||
}
|
||||
|
||||
const char*
|
||||
|
Loading…
Reference in New Issue
Block a user