diff --git a/string/obsolete/README.html b/string/obsolete/README.html index a0f4a17c3917..28dd61ea2304 100644 --- a/string/obsolete/README.html +++ b/string/obsolete/README.html @@ -23,7 +23,10 @@

original string implementations soon to be replaced

- + These are the original string implementations by rickg and others. + Most of the code here will be made obsolete by the new shared-buffer string (see bug #53065). + If you're interested in learning how strings work, you probably want to start with + nsAReadableString.

diff --git a/string/obsolete/bufferRoutines.h b/string/obsolete/bufferRoutines.h index 31cc767171f1..541d192358d7 100644 --- a/string/obsolete/bufferRoutines.h +++ b/string/obsolete/bufferRoutines.h @@ -21,6 +21,13 @@ * Pierre Phaneuf */ +/* bufferRoutines.h --- rickg's original string manipulation underpinnings; + this code will be made obsolete by the new shared-buffer string (see bug #53065) + */ + +#ifndef _BUFFERROUTINES_H +#define _BUFFERROUTINES_H + /****************************************************************************************** MODULE NOTES: @@ -31,9 +38,6 @@ *******************************************************************************************/ -#ifndef _BUFFERROUTINES_H -#define _BUFFERROUTINES_H - #include "nsCRT.h" #ifndef XPCOM_STANDALONE diff --git a/string/obsolete/nsStr.cpp b/string/obsolete/nsStr.cpp index 888c63ca37b1..87bf47bcdfb6 100644 --- a/string/obsolete/nsStr.cpp +++ b/string/obsolete/nsStr.cpp @@ -24,6 +24,12 @@ * Scott Collins */ +#include "nsStr.h" +#include "bufferRoutines.h" +#include //only used for printf +#include "nsCRT.h" +#include "nsDeque.h" + /****************************************************************************************** MODULE NOTES: @@ -36,12 +42,6 @@ *******************************************************************************************/ -#include "nsStr.h" -#include "bufferRoutines.h" -#include //only used for printf -#include "nsCRT.h" -#include "nsDeque.h" - //static const char* kCallFindChar = "For better performance, call FindChar() for targets whose length==1."; //static const char* kCallRFindChar = "For better performance, call RFindChar() for targets whose length==1."; diff --git a/string/obsolete/nsStr.h b/string/obsolete/nsStr.h index c5e50045f194..4348d7ea9dea 100644 --- a/string/obsolete/nsStr.h +++ b/string/obsolete/nsStr.h @@ -22,6 +22,13 @@ * Scott Collins */ +/* nsStr.h --- the underlying buffer for rickg's original string implementations; + these classes will be replaced by the new shared-buffer string (see bug #53065) + */ + +#ifndef _nsStr +#define _nsStr + /*********************************************************************** MODULE NOTES: @@ -181,9 +188,6 @@ **********************************************************************************/ -#ifndef _nsStr -#define _nsStr - #include "nscore.h" #include "nsMemory.h" #include diff --git a/string/obsolete/nsString.h b/string/obsolete/nsString.h index 5b1580f900f8..bf6d0fe22684 100644 --- a/string/obsolete/nsString.h +++ b/string/obsolete/nsString.h @@ -22,6 +22,13 @@ * Scott Collins */ +/* nsString.h --- rickg's original strings of 1-byte chars, |nsCString| and |nsCAutoString|; + these classes will be replaced by the new shared-buffer string (see bug #53065) + */ + + +#ifndef _nsCString_ +#define _nsCString_ /*********************************************************************** MODULE NOTES: @@ -36,9 +43,6 @@ 4. Subsumable strings ***********************************************************************/ -#ifndef _nsCString_ -#define _nsCString_ - #include "nsString2.h" #include "prtypes.h" #include "nscore.h" diff --git a/string/obsolete/nsString2.h b/string/obsolete/nsString2.h index b7e954fe179b..bb9740a0b42f 100644 --- a/string/obsolete/nsString2.h +++ b/string/obsolete/nsString2.h @@ -22,8 +22,15 @@ * Scott Collins */ +/* nsString2.h --- rickg's original strings of 2-byte chars, |nsString| and |nsAutoString|; + these classes will be replaced by the new shared-buffer string (see bug #53065) + */ + +#ifndef _nsString_ +#define _nsString_ + /*********************************************************************** MODULE NOTES: @@ -37,9 +44,6 @@ 4. Subsumable strings ***********************************************************************/ -#ifndef _nsString_ -#define _nsString_ - #include "prtypes.h" #include "nscore.h" #include diff --git a/string/obsolete/nsXPIDLString.h b/string/obsolete/nsXPIDLString.h index 9f99d1a4a96b..c1a30745cb9a 100644 --- a/string/obsolete/nsXPIDLString.h +++ b/string/obsolete/nsXPIDLString.h @@ -20,6 +20,16 @@ * Contributor(s): */ +/* nsXPIDLString.h --- an `|auto_ptr|' for character buffers, this functionality will be replaced + by the new shared-buffer string (see bug #53065) + */ + + + + +#ifndef nsXPIDLString_h__ +#define nsXPIDLString_h__ + /* A set of string wrapper classes that ease transition to use of XPIDL @@ -77,9 +87,6 @@ */ -#ifndef nsXPIDLString_h__ -#define nsXPIDLString_h__ - #include "nscore.h" #include "nsCom.h" #include "prtypes.h" diff --git a/xpcom/string/obsolete/README.html b/xpcom/string/obsolete/README.html index a0f4a17c3917..28dd61ea2304 100644 --- a/xpcom/string/obsolete/README.html +++ b/xpcom/string/obsolete/README.html @@ -23,7 +23,10 @@

original string implementations soon to be replaced

- + These are the original string implementations by rickg and others. + Most of the code here will be made obsolete by the new shared-buffer string (see bug #53065). + If you're interested in learning how strings work, you probably want to start with + nsAReadableString.

diff --git a/xpcom/string/obsolete/bufferRoutines.h b/xpcom/string/obsolete/bufferRoutines.h index 31cc767171f1..541d192358d7 100644 --- a/xpcom/string/obsolete/bufferRoutines.h +++ b/xpcom/string/obsolete/bufferRoutines.h @@ -21,6 +21,13 @@ * Pierre Phaneuf */ +/* bufferRoutines.h --- rickg's original string manipulation underpinnings; + this code will be made obsolete by the new shared-buffer string (see bug #53065) + */ + +#ifndef _BUFFERROUTINES_H +#define _BUFFERROUTINES_H + /****************************************************************************************** MODULE NOTES: @@ -31,9 +38,6 @@ *******************************************************************************************/ -#ifndef _BUFFERROUTINES_H -#define _BUFFERROUTINES_H - #include "nsCRT.h" #ifndef XPCOM_STANDALONE diff --git a/xpcom/string/obsolete/nsStr.cpp b/xpcom/string/obsolete/nsStr.cpp index 888c63ca37b1..87bf47bcdfb6 100644 --- a/xpcom/string/obsolete/nsStr.cpp +++ b/xpcom/string/obsolete/nsStr.cpp @@ -24,6 +24,12 @@ * Scott Collins */ +#include "nsStr.h" +#include "bufferRoutines.h" +#include //only used for printf +#include "nsCRT.h" +#include "nsDeque.h" + /****************************************************************************************** MODULE NOTES: @@ -36,12 +42,6 @@ *******************************************************************************************/ -#include "nsStr.h" -#include "bufferRoutines.h" -#include //only used for printf -#include "nsCRT.h" -#include "nsDeque.h" - //static const char* kCallFindChar = "For better performance, call FindChar() for targets whose length==1."; //static const char* kCallRFindChar = "For better performance, call RFindChar() for targets whose length==1."; diff --git a/xpcom/string/obsolete/nsStr.h b/xpcom/string/obsolete/nsStr.h index c5e50045f194..4348d7ea9dea 100644 --- a/xpcom/string/obsolete/nsStr.h +++ b/xpcom/string/obsolete/nsStr.h @@ -22,6 +22,13 @@ * Scott Collins */ +/* nsStr.h --- the underlying buffer for rickg's original string implementations; + these classes will be replaced by the new shared-buffer string (see bug #53065) + */ + +#ifndef _nsStr +#define _nsStr + /*********************************************************************** MODULE NOTES: @@ -181,9 +188,6 @@ **********************************************************************************/ -#ifndef _nsStr -#define _nsStr - #include "nscore.h" #include "nsMemory.h" #include diff --git a/xpcom/string/obsolete/nsString.h b/xpcom/string/obsolete/nsString.h index 5b1580f900f8..bf6d0fe22684 100644 --- a/xpcom/string/obsolete/nsString.h +++ b/xpcom/string/obsolete/nsString.h @@ -22,6 +22,13 @@ * Scott Collins */ +/* nsString.h --- rickg's original strings of 1-byte chars, |nsCString| and |nsCAutoString|; + these classes will be replaced by the new shared-buffer string (see bug #53065) + */ + + +#ifndef _nsCString_ +#define _nsCString_ /*********************************************************************** MODULE NOTES: @@ -36,9 +43,6 @@ 4. Subsumable strings ***********************************************************************/ -#ifndef _nsCString_ -#define _nsCString_ - #include "nsString2.h" #include "prtypes.h" #include "nscore.h" diff --git a/xpcom/string/obsolete/nsString2.h b/xpcom/string/obsolete/nsString2.h index b7e954fe179b..bb9740a0b42f 100644 --- a/xpcom/string/obsolete/nsString2.h +++ b/xpcom/string/obsolete/nsString2.h @@ -22,8 +22,15 @@ * Scott Collins */ +/* nsString2.h --- rickg's original strings of 2-byte chars, |nsString| and |nsAutoString|; + these classes will be replaced by the new shared-buffer string (see bug #53065) + */ + +#ifndef _nsString_ +#define _nsString_ + /*********************************************************************** MODULE NOTES: @@ -37,9 +44,6 @@ 4. Subsumable strings ***********************************************************************/ -#ifndef _nsString_ -#define _nsString_ - #include "prtypes.h" #include "nscore.h" #include diff --git a/xpcom/string/obsolete/nsXPIDLString.h b/xpcom/string/obsolete/nsXPIDLString.h index 9f99d1a4a96b..c1a30745cb9a 100644 --- a/xpcom/string/obsolete/nsXPIDLString.h +++ b/xpcom/string/obsolete/nsXPIDLString.h @@ -20,6 +20,16 @@ * Contributor(s): */ +/* nsXPIDLString.h --- an `|auto_ptr|' for character buffers, this functionality will be replaced + by the new shared-buffer string (see bug #53065) + */ + + + + +#ifndef nsXPIDLString_h__ +#define nsXPIDLString_h__ + /* A set of string wrapper classes that ease transition to use of XPIDL @@ -77,9 +87,6 @@ */ -#ifndef nsXPIDLString_h__ -#define nsXPIDLString_h__ - #include "nscore.h" #include "nsCom.h" #include "prtypes.h"