mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

temporarily backing out the headers with the explicit change (we haven't finished platform specific code or commercial yet)

This commit is contained in:
scc%mozilla.org 2000-08-20 07:40:30 +00:00
Родитель 1a8bb49b19
Коммит 6bd92ca334
6 изменённых файлов: 51 добавлений и 69 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
string/obsolete/nsString.h
Просмотреть файл

@ -110,9 +110,9 @@ public:
nsCString(const nsCString& aString);
#ifdef NEW_STRING_APIS
explicit nsCString( const nsAReadableCString& );
nsCString( const nsAReadableCString& );
explicit nsCString(const char*);
nsCString(const char*);
nsCString(const char*, PRInt32);
#else
/**
@ -833,11 +833,10 @@ public:
virtual ~nsCAutoString();
nsCAutoString();
// why does this class have no copy constructor? nsCAutoString( const nsCAutoString& );
explicit nsCAutoString(const nsCString& );
explicit nsCAutoString(const char* aString);
nsCAutoString(const nsCString& );
nsCAutoString(const char* aString);
nsCAutoString(const char* aString,PRInt32 aLength);
explicit nsCAutoString(const CBufDescriptor& aBuffer);
nsCAutoString(const CBufDescriptor& aBuffer);
#ifndef NEW_STRING_APIS
// nsCAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
@ -896,7 +895,6 @@ class NS_COM NS_ConvertUCS2toUTF8
*/
{
public:
explicit
NS_ConvertUCS2toUTF8( const PRUnichar* aString )
{
Init( aString, ~PRUint32(0) /* MAXINT */);
@ -907,7 +905,6 @@ class NS_COM NS_ConvertUCS2toUTF8
Init( aString, aLength );
}
explicit
NS_ConvertUCS2toUTF8( PRUnichar aChar )
{
Init( &aChar, 1 );
@ -942,7 +939,7 @@ class NS_COM NS_ConvertUCS2toUTF8
***************************************************************/
class NS_COM nsSubsumeCStr : public nsCString {
public:
explicit nsSubsumeCStr(nsStr& aString);
nsSubsumeCStr(nsStr& aString);
nsSubsumeCStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
nsSubsumeCStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);

25
string/obsolete/nsString2.h
Просмотреть файл

@ -104,9 +104,9 @@ public:
nsString(const nsString& aString);
#ifdef NEW_STRING_APIS
explicit nsString(const nsAReadableString&);
nsString(const nsAReadableString&);
explicit nsString(const PRUnichar*);
nsString(const PRUnichar*);
nsString(const PRUnichar*, PRInt32);
#else
/**
@ -924,11 +924,11 @@ public:
virtual ~nsAutoString();
nsAutoString();
nsAutoString(const nsAutoString& aString);
explicit nsAutoString(const nsString& aString);
explicit nsAutoString(const PRUnichar* aString);
nsAutoString(const nsString& aString);
nsAutoString(const PRUnichar* aString);
nsAutoString(const PRUnichar* aString,PRInt32 aLength);
explicit nsAutoString(PRUnichar aChar);
explicit nsAutoString(const CBufDescriptor& aBuffer);
nsAutoString(PRUnichar aChar);
nsAutoString(const CBufDescriptor& aBuffer);
#ifndef NEW_STRING_APIS
// nsAutoString(const char* aCString,PRInt32 aLength=-1);
@ -979,15 +979,15 @@ class NS_COM NS_ConvertASCIItoUCS2
*/
{
public:
explicit NS_ConvertASCIItoUCS2( const char* );
NS_ConvertASCIItoUCS2( const char* );
NS_ConvertASCIItoUCS2( const char*, PRUint32 );
explicit NS_ConvertASCIItoUCS2( char );
NS_ConvertASCIItoUCS2( char );
#if 0
#ifdef NEW_STRING_APIS
explicit NS_ConvertASCIItoUCS2( const nsAReadableCString& );
NS_ConvertASCIItoUCS2( const nsAReadableCString& );
#else
class nsCString;
explicit NS_ConvertASCIItoUCS2( const nsCString& );
NS_ConvertASCIItoUCS2( const nsCString& );
#endif
#endif
@ -997,7 +997,6 @@ class NS_COM NS_ConvertASCIItoUCS2
return GetUnicode();
}
// is this really a good idea? I'm getting very paranoid about automatic conversions
operator nsLiteralString() const
{
return nsLiteralString(mUStr, mLength);
@ -1036,7 +1035,6 @@ class NS_COM NS_ConvertUTF8toUCS2
: public nsAutoString
{
public:
explicit
NS_ConvertUTF8toUCS2( const char* aCString )
{
Init( aCString, ~PRUint32(0) /* MAXINT */ );
@ -1047,7 +1045,6 @@ class NS_COM NS_ConvertUTF8toUCS2
Init( aCString, aLength );
}
explicit
NS_ConvertUTF8toUCS2( char aChar )
{
Init( &aChar, 1 );
@ -1081,7 +1078,7 @@ class NS_COM NS_ConvertUTF8toUCS2
class NS_COM nsSubsumeStr : public nsString {
public:
nsSubsumeStr();
explicit nsSubsumeStr(nsStr& aString);
nsSubsumeStr(nsStr& aString);
nsSubsumeStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
nsSubsumeStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
int Subsume(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);

15
xpcom/ds/nsString.h
Просмотреть файл

@ -110,9 +110,9 @@ public:
nsCString(const nsCString& aString);
#ifdef NEW_STRING_APIS
explicit nsCString( const nsAReadableCString& );
nsCString( const nsAReadableCString& );
explicit nsCString(const char*);
nsCString(const char*);
nsCString(const char*, PRInt32);
#else
/**
@ -833,11 +833,10 @@ public:
virtual ~nsCAutoString();
nsCAutoString();
// why does this class have no copy constructor? nsCAutoString( const nsCAutoString& );
explicit nsCAutoString(const nsCString& );
explicit nsCAutoString(const char* aString);
nsCAutoString(const nsCString& );
nsCAutoString(const char* aString);
nsCAutoString(const char* aString,PRInt32 aLength);
explicit nsCAutoString(const CBufDescriptor& aBuffer);
nsCAutoString(const CBufDescriptor& aBuffer);
#ifndef NEW_STRING_APIS
// nsCAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
@ -896,7 +895,6 @@ class NS_COM NS_ConvertUCS2toUTF8
*/
{
public:
explicit
NS_ConvertUCS2toUTF8( const PRUnichar* aString )
{
Init( aString, ~PRUint32(0) /* MAXINT */);
@ -907,7 +905,6 @@ class NS_COM NS_ConvertUCS2toUTF8
Init( aString, aLength );
}
explicit
NS_ConvertUCS2toUTF8( PRUnichar aChar )
{
Init( &aChar, 1 );
@ -942,7 +939,7 @@ class NS_COM NS_ConvertUCS2toUTF8
***************************************************************/
class NS_COM nsSubsumeCStr : public nsCString {
public:
explicit nsSubsumeCStr(nsStr& aString);
nsSubsumeCStr(nsStr& aString);
nsSubsumeCStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
nsSubsumeCStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);

25
xpcom/ds/nsString2.h
Просмотреть файл

@ -104,9 +104,9 @@ public:
nsString(const nsString& aString);
#ifdef NEW_STRING_APIS
explicit nsString(const nsAReadableString&);
nsString(const nsAReadableString&);
explicit nsString(const PRUnichar*);
nsString(const PRUnichar*);
nsString(const PRUnichar*, PRInt32);
#else
/**
@ -924,11 +924,11 @@ public:
virtual ~nsAutoString();
nsAutoString();
nsAutoString(const nsAutoString& aString);
explicit nsAutoString(const nsString& aString);
explicit nsAutoString(const PRUnichar* aString);
nsAutoString(const nsString& aString);
nsAutoString(const PRUnichar* aString);
nsAutoString(const PRUnichar* aString,PRInt32 aLength);
explicit nsAutoString(PRUnichar aChar);
explicit nsAutoString(const CBufDescriptor& aBuffer);
nsAutoString(PRUnichar aChar);
nsAutoString(const CBufDescriptor& aBuffer);
#ifndef NEW_STRING_APIS
// nsAutoString(const char* aCString,PRInt32 aLength=-1);
@ -979,15 +979,15 @@ class NS_COM NS_ConvertASCIItoUCS2
*/
{
public:
explicit NS_ConvertASCIItoUCS2( const char* );
NS_ConvertASCIItoUCS2( const char* );
NS_ConvertASCIItoUCS2( const char*, PRUint32 );
explicit NS_ConvertASCIItoUCS2( char );
NS_ConvertASCIItoUCS2( char );
#if 0
#ifdef NEW_STRING_APIS
explicit NS_ConvertASCIItoUCS2( const nsAReadableCString& );
NS_ConvertASCIItoUCS2( const nsAReadableCString& );
#else
class nsCString;
explicit NS_ConvertASCIItoUCS2( const nsCString& );
NS_ConvertASCIItoUCS2( const nsCString& );
#endif
#endif
@ -997,7 +997,6 @@ class NS_COM NS_ConvertASCIItoUCS2
return GetUnicode();
}
// is this really a good idea? I'm getting very paranoid about automatic conversions
operator nsLiteralString() const
{
return nsLiteralString(mUStr, mLength);
@ -1036,7 +1035,6 @@ class NS_COM NS_ConvertUTF8toUCS2
: public nsAutoString
{
public:
explicit
NS_ConvertUTF8toUCS2( const char* aCString )
{
Init( aCString, ~PRUint32(0) /* MAXINT */ );
@ -1047,7 +1045,6 @@ class NS_COM NS_ConvertUTF8toUCS2
Init( aCString, aLength );
}
explicit
NS_ConvertUTF8toUCS2( char aChar )
{
Init( &aChar, 1 );
@ -1081,7 +1078,7 @@ class NS_COM NS_ConvertUTF8toUCS2
class NS_COM nsSubsumeStr : public nsString {
public:
nsSubsumeStr();
explicit nsSubsumeStr(nsStr& aString);
nsSubsumeStr(nsStr& aString);
nsSubsumeStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
nsSubsumeStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
int Subsume(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);

15
xpcom/string/obsolete/nsString.h
Просмотреть файл

@ -110,9 +110,9 @@ public:
nsCString(const nsCString& aString);
#ifdef NEW_STRING_APIS
explicit nsCString( const nsAReadableCString& );
nsCString( const nsAReadableCString& );
explicit nsCString(const char*);
nsCString(const char*);
nsCString(const char*, PRInt32);
#else
/**
@ -833,11 +833,10 @@ public:
virtual ~nsCAutoString();
nsCAutoString();
// why does this class have no copy constructor? nsCAutoString( const nsCAutoString& );
explicit nsCAutoString(const nsCString& );
explicit nsCAutoString(const char* aString);
nsCAutoString(const nsCString& );
nsCAutoString(const char* aString);
nsCAutoString(const char* aString,PRInt32 aLength);
explicit nsCAutoString(const CBufDescriptor& aBuffer);
nsCAutoString(const CBufDescriptor& aBuffer);
#ifndef NEW_STRING_APIS
// nsCAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
@ -896,7 +895,6 @@ class NS_COM NS_ConvertUCS2toUTF8
*/
{
public:
explicit
NS_ConvertUCS2toUTF8( const PRUnichar* aString )
{
Init( aString, ~PRUint32(0) /* MAXINT */);
@ -907,7 +905,6 @@ class NS_COM NS_ConvertUCS2toUTF8
Init( aString, aLength );
}
explicit
NS_ConvertUCS2toUTF8( PRUnichar aChar )
{
Init( &aChar, 1 );
@ -942,7 +939,7 @@ class NS_COM NS_ConvertUCS2toUTF8
***************************************************************/
class NS_COM nsSubsumeCStr : public nsCString {
public:
explicit nsSubsumeCStr(nsStr& aString);
nsSubsumeCStr(nsStr& aString);
nsSubsumeCStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
nsSubsumeCStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);

25
xpcom/string/obsolete/nsString2.h
Просмотреть файл

@ -104,9 +104,9 @@ public:
nsString(const nsString& aString);
#ifdef NEW_STRING_APIS
explicit nsString(const nsAReadableString&);
nsString(const nsAReadableString&);
explicit nsString(const PRUnichar*);
nsString(const PRUnichar*);
nsString(const PRUnichar*, PRInt32);
#else
/**
@ -924,11 +924,11 @@ public:
virtual ~nsAutoString();
nsAutoString();
nsAutoString(const nsAutoString& aString);
explicit nsAutoString(const nsString& aString);
explicit nsAutoString(const PRUnichar* aString);
nsAutoString(const nsString& aString);
nsAutoString(const PRUnichar* aString);
nsAutoString(const PRUnichar* aString,PRInt32 aLength);
explicit nsAutoString(PRUnichar aChar);
explicit nsAutoString(const CBufDescriptor& aBuffer);
nsAutoString(PRUnichar aChar);
nsAutoString(const CBufDescriptor& aBuffer);
#ifndef NEW_STRING_APIS
// nsAutoString(const char* aCString,PRInt32 aLength=-1);
@ -979,15 +979,15 @@ class NS_COM NS_ConvertASCIItoUCS2
*/
{
public:
explicit NS_ConvertASCIItoUCS2( const char* );
NS_ConvertASCIItoUCS2( const char* );
NS_ConvertASCIItoUCS2( const char*, PRUint32 );
explicit NS_ConvertASCIItoUCS2( char );
NS_ConvertASCIItoUCS2( char );
#if 0
#ifdef NEW_STRING_APIS
explicit NS_ConvertASCIItoUCS2( const nsAReadableCString& );
NS_ConvertASCIItoUCS2( const nsAReadableCString& );
#else
class nsCString;
explicit NS_ConvertASCIItoUCS2( const nsCString& );
NS_ConvertASCIItoUCS2( const nsCString& );
#endif
#endif
@ -997,7 +997,6 @@ class NS_COM NS_ConvertASCIItoUCS2
return GetUnicode();
}
// is this really a good idea? I'm getting very paranoid about automatic conversions
operator nsLiteralString() const
{
return nsLiteralString(mUStr, mLength);
@ -1036,7 +1035,6 @@ class NS_COM NS_ConvertUTF8toUCS2
: public nsAutoString
{
public:
explicit
NS_ConvertUTF8toUCS2( const char* aCString )
{
Init( aCString, ~PRUint32(0) /* MAXINT */ );
@ -1047,7 +1045,6 @@ class NS_COM NS_ConvertUTF8toUCS2
Init( aCString, aLength );
}
explicit
NS_ConvertUTF8toUCS2( char aChar )
{
Init( &aChar, 1 );
@ -1081,7 +1078,7 @@ class NS_COM NS_ConvertUTF8toUCS2
class NS_COM nsSubsumeStr : public nsString {
public:
nsSubsumeStr();
explicit nsSubsumeStr(nsStr& aString);
nsSubsumeStr(nsStr& aString);
nsSubsumeStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
nsSubsumeStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
int Subsume(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);