From b82dbf0f7c0eff78b30b05290d63454c35f9ee46 Mon Sep 17 00:00:00 2001 From: "hwaara%chello.se" Date: Wed, 6 Feb 2002 15:39:52 +0000 Subject: [PATCH] #123347, "Remove #if 0-ed nsPrintfCString::GetReadableFragment()", #123354, "Remove nsAFlatString.cpp and nsDependentString.cpp" r/sr=jag, shaver git-svn-id: svn://10.0.0.236/trunk@113796 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/string/macbuild/string.xml | 108 ------------------ mozilla/string/public/nsPrintfCString.h | 1 - mozilla/string/src/Makefile.in | 2 - mozilla/string/src/makefile.win | 2 - mozilla/string/src/nsAFlatString.cpp | 25 ---- mozilla/string/src/nsDependentString.cpp | 25 ---- mozilla/string/src/nsPrintfCString.cpp | 21 ---- mozilla/xpcom/string/macbuild/string.xml | 108 ------------------ mozilla/xpcom/string/public/nsPrintfCString.h | 1 - mozilla/xpcom/string/src/Makefile.in | 2 - mozilla/xpcom/string/src/makefile.win | 2 - mozilla/xpcom/string/src/nsAFlatString.cpp | 25 ---- .../xpcom/string/src/nsDependentString.cpp | 25 ---- mozilla/xpcom/string/src/nsPrintfCString.cpp | 21 ---- 14 files changed, 368 deletions(-) delete mode 100644 mozilla/string/src/nsAFlatString.cpp delete mode 100644 mozilla/string/src/nsDependentString.cpp delete mode 100644 mozilla/xpcom/string/src/nsAFlatString.cpp delete mode 100644 mozilla/xpcom/string/src/nsDependentString.cpp diff --git a/mozilla/string/macbuild/string.xml b/mozilla/string/macbuild/string.xml index a64aba4be4b..dd32c263b6b 100644 --- a/mozilla/string/macbuild/string.xml +++ b/mozilla/string/macbuild/string.xml @@ -1206,13 +1206,6 @@ Text - - Name - nsAFlatString.cpp - MacOS - Text - - Name nsPromiseFlatString.cpp @@ -1241,13 +1234,6 @@ Text - - Name - nsDependentString.cpp - MacOS - Text - - Name nsDependentSubstring.cpp @@ -1515,11 +1501,6 @@ nsASingleFragmentString.cpp MacOS - - Name - nsAFlatString.cpp - MacOS - Name nsPromiseFlatString.cpp @@ -1540,11 +1521,6 @@ nsDependentConcatenation.cpp MacOS - - Name - nsDependentString.cpp - MacOS - Name nsDependentSubstring.cpp @@ -2740,13 +2716,6 @@ Text - - Name - nsAFlatString.cpp - MacOS - Text - - Name nsPromiseFlatString.cpp @@ -2775,13 +2744,6 @@ Text - - Name - nsDependentString.cpp - MacOS - Text - - Name nsDependentSubstring.cpp @@ -3049,11 +3011,6 @@ nsASingleFragmentString.cpp MacOS - - Name - nsAFlatString.cpp - MacOS - Name nsPromiseFlatString.cpp @@ -3074,11 +3031,6 @@ nsDependentConcatenation.cpp MacOS - - Name - nsDependentString.cpp - MacOS - Name nsDependentSubstring.cpp @@ -4253,13 +4205,6 @@ Text - - Name - nsAFlatString.cpp - MacOS - Text - - Name nsPromiseFlatString.cpp @@ -4288,13 +4233,6 @@ Text - - Name - nsDependentString.cpp - MacOS - Text - - Name nsDependentSubstring.cpp @@ -4547,11 +4485,6 @@ nsASingleFragmentString.cpp MacOS - - Name - nsAFlatString.cpp - MacOS - Name nsPromiseFlatString.cpp @@ -4572,11 +4505,6 @@ nsDependentConcatenation.cpp MacOS - - Name - nsDependentString.cpp - MacOS - Name nsDependentSubstring.cpp @@ -5751,13 +5679,6 @@ Text - - Name - nsAFlatString.cpp - MacOS - Text - Debug - Name nsPromiseFlatString.cpp @@ -5786,13 +5707,6 @@ Text Debug - - Name - nsDependentString.cpp - MacOS - Text - Debug - Name nsDependentSubstring.cpp @@ -6045,11 +5959,6 @@ nsASingleFragmentString.cpp MacOS - - Name - nsAFlatString.cpp - MacOS - Name nsPromiseFlatString.cpp @@ -6070,11 +5979,6 @@ nsDependentConcatenation.cpp MacOS - - Name - nsDependentString.cpp - MacOS - Name nsDependentSubstring.cpp @@ -6350,12 +6254,6 @@ src - - string.shlb - Name - nsAFlatString.cpp - MacOS - string.shlb Name @@ -6374,12 +6272,6 @@ nsDependentConcatenation.cpp MacOS - - string.shlb - Name - nsDependentString.cpp - MacOS - string.shlb Name diff --git a/mozilla/string/public/nsPrintfCString.h b/mozilla/string/public/nsPrintfCString.h index 508bdfc0b23..407536d1e72 100755 --- a/mozilla/string/public/nsPrintfCString.h +++ b/mozilla/string/public/nsPrintfCString.h @@ -85,7 +85,6 @@ class NS_COM nsPrintfCString protected: virtual const char_type* GetReadableFragment( const_fragment_type&, nsFragmentRequest, PRUint32 ) const; virtual char_type* GetWritableFragment( fragment_type&, nsFragmentRequest, PRUint32 ) { return 0; } -// virtual PRBool GetReadableFragment( const_fragment_type&, nsFragmentRequest ) const; private: char_type* mStart; diff --git a/mozilla/string/src/Makefile.in b/mozilla/string/src/Makefile.in index 9b96d1b8383..23591954d30 100644 --- a/mozilla/string/src/Makefile.in +++ b/mozilla/string/src/Makefile.in @@ -35,11 +35,9 @@ REQUIRES = xpcom \ $(NULL) CPPSRCS = \ - nsAFlatString.cpp \ nsASingleFragmentString.cpp \ nsAString.cpp \ nsDependentConcatenation.cpp \ - nsDependentString.cpp \ nsDependentSubstring.cpp \ nsFragmentedString.cpp \ nsPrintfCString.cpp \ diff --git a/mozilla/string/src/makefile.win b/mozilla/string/src/makefile.win index 476bc68148d..e51271f97ff 100644 --- a/mozilla/string/src/makefile.win +++ b/mozilla/string/src/makefile.win @@ -31,11 +31,9 @@ REQUIRES = xpcom \ LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN CPP_OBJS = \ - .\$(OBJDIR)\nsAFlatString.obj \ .\$(OBJDIR)\nsASingleFragmentString.obj \ .\$(OBJDIR)\nsAString.obj \ .\$(OBJDIR)\nsDependentConcatenation.obj \ - .\$(OBJDIR)\nsDependentString.obj \ .\$(OBJDIR)\nsDependentSubstring.obj \ .\$(OBJDIR)\nsFragmentedString.obj \ .\$(OBJDIR)\nsPrintfCString.obj \ diff --git a/mozilla/string/src/nsAFlatString.cpp b/mozilla/string/src/nsAFlatString.cpp deleted file mode 100644 index b3722ce4262..00000000000 --- a/mozilla/string/src/nsAFlatString.cpp +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is Mozilla. - * - * The Initial Developer of the Original Code is Netscape - * Communications. Portions created by Netscape Communications are - * Copyright (C) 2001 by Netscape Communications. All - * Rights Reserved. - * - * Contributor(s): - * Scott Collins (original author) - */ - -#include "nsAFlatString.h" - diff --git a/mozilla/string/src/nsDependentString.cpp b/mozilla/string/src/nsDependentString.cpp deleted file mode 100644 index 389815af200..00000000000 --- a/mozilla/string/src/nsDependentString.cpp +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is Mozilla. - * - * The Initial Developer of the Original Code is Netscape - * Communications. Portions created by Netscape Communications are - * Copyright (C) 2001 by Netscape Communications. All - * Rights Reserved. - * - * Contributor(s): - * Scott Collins (original author) - */ - -#include "nsDependentString.h" - diff --git a/mozilla/string/src/nsPrintfCString.cpp b/mozilla/string/src/nsPrintfCString.cpp index 8588bfefc18..4839479c21a 100755 --- a/mozilla/string/src/nsPrintfCString.cpp +++ b/mozilla/string/src/nsPrintfCString.cpp @@ -94,26 +94,6 @@ nsPrintfCString::Length() const return mLength; } -#if 0 -PRBool -nsPrintfCString::GetReadableFragment( const_fragment_type& aFragment, nsFragmentRequest aRequest ) const - { - switch ( aRequest ) - { - case kFirstFragment: - case kLastFragment: - aFragment.mFragmentIdentifier = this; - // fall through - case kThisFragment: - aFragment.mStart = mStart; - aFragment.mEnd = mStart + mLength; - return PR_TRUE; - - default: - return PR_FALSE; - } - } -#else const nsPrintfCString::char_type* nsPrintfCString::GetReadableFragment( const_fragment_type& aFragment, nsFragmentRequest aRequest, PRUint32 aOffset ) const { @@ -131,5 +111,4 @@ nsPrintfCString::GetReadableFragment( const_fragment_type& aFragment, nsFragment return 0; } } -#endif diff --git a/mozilla/xpcom/string/macbuild/string.xml b/mozilla/xpcom/string/macbuild/string.xml index a64aba4be4b..dd32c263b6b 100644 --- a/mozilla/xpcom/string/macbuild/string.xml +++ b/mozilla/xpcom/string/macbuild/string.xml @@ -1206,13 +1206,6 @@ Text - - Name - nsAFlatString.cpp - MacOS - Text - - Name nsPromiseFlatString.cpp @@ -1241,13 +1234,6 @@ Text - - Name - nsDependentString.cpp - MacOS - Text - - Name nsDependentSubstring.cpp @@ -1515,11 +1501,6 @@ nsASingleFragmentString.cpp MacOS - - Name - nsAFlatString.cpp - MacOS - Name nsPromiseFlatString.cpp @@ -1540,11 +1521,6 @@ nsDependentConcatenation.cpp MacOS - - Name - nsDependentString.cpp - MacOS - Name nsDependentSubstring.cpp @@ -2740,13 +2716,6 @@ Text - - Name - nsAFlatString.cpp - MacOS - Text - - Name nsPromiseFlatString.cpp @@ -2775,13 +2744,6 @@ Text - - Name - nsDependentString.cpp - MacOS - Text - - Name nsDependentSubstring.cpp @@ -3049,11 +3011,6 @@ nsASingleFragmentString.cpp MacOS - - Name - nsAFlatString.cpp - MacOS - Name nsPromiseFlatString.cpp @@ -3074,11 +3031,6 @@ nsDependentConcatenation.cpp MacOS - - Name - nsDependentString.cpp - MacOS - Name nsDependentSubstring.cpp @@ -4253,13 +4205,6 @@ Text - - Name - nsAFlatString.cpp - MacOS - Text - - Name nsPromiseFlatString.cpp @@ -4288,13 +4233,6 @@ Text - - Name - nsDependentString.cpp - MacOS - Text - - Name nsDependentSubstring.cpp @@ -4547,11 +4485,6 @@ nsASingleFragmentString.cpp MacOS - - Name - nsAFlatString.cpp - MacOS - Name nsPromiseFlatString.cpp @@ -4572,11 +4505,6 @@ nsDependentConcatenation.cpp MacOS - - Name - nsDependentString.cpp - MacOS - Name nsDependentSubstring.cpp @@ -5751,13 +5679,6 @@ Text - - Name - nsAFlatString.cpp - MacOS - Text - Debug - Name nsPromiseFlatString.cpp @@ -5786,13 +5707,6 @@ Text Debug - - Name - nsDependentString.cpp - MacOS - Text - Debug - Name nsDependentSubstring.cpp @@ -6045,11 +5959,6 @@ nsASingleFragmentString.cpp MacOS - - Name - nsAFlatString.cpp - MacOS - Name nsPromiseFlatString.cpp @@ -6070,11 +5979,6 @@ nsDependentConcatenation.cpp MacOS - - Name - nsDependentString.cpp - MacOS - Name nsDependentSubstring.cpp @@ -6350,12 +6254,6 @@ src - - string.shlb - Name - nsAFlatString.cpp - MacOS - string.shlb Name @@ -6374,12 +6272,6 @@ nsDependentConcatenation.cpp MacOS - - string.shlb - Name - nsDependentString.cpp - MacOS - string.shlb Name diff --git a/mozilla/xpcom/string/public/nsPrintfCString.h b/mozilla/xpcom/string/public/nsPrintfCString.h index 508bdfc0b23..407536d1e72 100755 --- a/mozilla/xpcom/string/public/nsPrintfCString.h +++ b/mozilla/xpcom/string/public/nsPrintfCString.h @@ -85,7 +85,6 @@ class NS_COM nsPrintfCString protected: virtual const char_type* GetReadableFragment( const_fragment_type&, nsFragmentRequest, PRUint32 ) const; virtual char_type* GetWritableFragment( fragment_type&, nsFragmentRequest, PRUint32 ) { return 0; } -// virtual PRBool GetReadableFragment( const_fragment_type&, nsFragmentRequest ) const; private: char_type* mStart; diff --git a/mozilla/xpcom/string/src/Makefile.in b/mozilla/xpcom/string/src/Makefile.in index 9b96d1b8383..23591954d30 100644 --- a/mozilla/xpcom/string/src/Makefile.in +++ b/mozilla/xpcom/string/src/Makefile.in @@ -35,11 +35,9 @@ REQUIRES = xpcom \ $(NULL) CPPSRCS = \ - nsAFlatString.cpp \ nsASingleFragmentString.cpp \ nsAString.cpp \ nsDependentConcatenation.cpp \ - nsDependentString.cpp \ nsDependentSubstring.cpp \ nsFragmentedString.cpp \ nsPrintfCString.cpp \ diff --git a/mozilla/xpcom/string/src/makefile.win b/mozilla/xpcom/string/src/makefile.win index 476bc68148d..e51271f97ff 100644 --- a/mozilla/xpcom/string/src/makefile.win +++ b/mozilla/xpcom/string/src/makefile.win @@ -31,11 +31,9 @@ REQUIRES = xpcom \ LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN CPP_OBJS = \ - .\$(OBJDIR)\nsAFlatString.obj \ .\$(OBJDIR)\nsASingleFragmentString.obj \ .\$(OBJDIR)\nsAString.obj \ .\$(OBJDIR)\nsDependentConcatenation.obj \ - .\$(OBJDIR)\nsDependentString.obj \ .\$(OBJDIR)\nsDependentSubstring.obj \ .\$(OBJDIR)\nsFragmentedString.obj \ .\$(OBJDIR)\nsPrintfCString.obj \ diff --git a/mozilla/xpcom/string/src/nsAFlatString.cpp b/mozilla/xpcom/string/src/nsAFlatString.cpp deleted file mode 100644 index b3722ce4262..00000000000 --- a/mozilla/xpcom/string/src/nsAFlatString.cpp +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is Mozilla. - * - * The Initial Developer of the Original Code is Netscape - * Communications. Portions created by Netscape Communications are - * Copyright (C) 2001 by Netscape Communications. All - * Rights Reserved. - * - * Contributor(s): - * Scott Collins (original author) - */ - -#include "nsAFlatString.h" - diff --git a/mozilla/xpcom/string/src/nsDependentString.cpp b/mozilla/xpcom/string/src/nsDependentString.cpp deleted file mode 100644 index 389815af200..00000000000 --- a/mozilla/xpcom/string/src/nsDependentString.cpp +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is Mozilla. - * - * The Initial Developer of the Original Code is Netscape - * Communications. Portions created by Netscape Communications are - * Copyright (C) 2001 by Netscape Communications. All - * Rights Reserved. - * - * Contributor(s): - * Scott Collins (original author) - */ - -#include "nsDependentString.h" - diff --git a/mozilla/xpcom/string/src/nsPrintfCString.cpp b/mozilla/xpcom/string/src/nsPrintfCString.cpp index 8588bfefc18..4839479c21a 100755 --- a/mozilla/xpcom/string/src/nsPrintfCString.cpp +++ b/mozilla/xpcom/string/src/nsPrintfCString.cpp @@ -94,26 +94,6 @@ nsPrintfCString::Length() const return mLength; } -#if 0 -PRBool -nsPrintfCString::GetReadableFragment( const_fragment_type& aFragment, nsFragmentRequest aRequest ) const - { - switch ( aRequest ) - { - case kFirstFragment: - case kLastFragment: - aFragment.mFragmentIdentifier = this; - // fall through - case kThisFragment: - aFragment.mStart = mStart; - aFragment.mEnd = mStart + mLength; - return PR_TRUE; - - default: - return PR_FALSE; - } - } -#else const nsPrintfCString::char_type* nsPrintfCString::GetReadableFragment( const_fragment_type& aFragment, nsFragmentRequest aRequest, PRUint32 aOffset ) const { @@ -131,5 +111,4 @@ nsPrintfCString::GetReadableFragment( const_fragment_type& aFragment, nsFragment return 0; } } -#endif