--- a/kernel/eka/euser/unicode/Compare.cpp Fri Sep 17 08:37:04 2010 +0300
+++ b/kernel/eka/euser/unicode/Compare.cpp Mon Oct 04 02:35:35 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of the License "Eclipse Public License v1.0"
@@ -26,29 +26,6 @@
////////////////////////////////////////////////////////////////////////////////////////////
/**
-@internalComponent
-*/
-TChar UTF16ToChar(const TText16* a)
- {
- if (0xD800 <= a[0])
- {
- if (a[0] < 0xE000)
- {
- if (a[0] < 0xDC00 && ::IsLowSurrogate(a[1]))
- {
- TChar c = ::PairSurrogates(a[0], a[1]);
- if ((c & 0xFFFE) != 0xFFFE)
- return c;
- }
- return 0xFFFF;
- }
- if (a[0] == 0xFFFE)
- return 0xFFFF;
- }
- return a[0];
- }
-
-/**
Is a character a base character (ETrue) or a combiner (EFalse)?
For now, we will treat all control characters as base characters.
@internalComponent
@@ -152,20 +129,6 @@
////////////////////////////////////////////////////////////////////////////////////////////
/**
-@internalComponent
-*/
-void TUTF32Iterator::Next()
- {
- ASSERT(iStart != iEnd);
- while (++iStart != iEnd)
- {
- iCurrent = ::UTF16ToChar(iStart);
- if (iCurrent != 0xFFFF)
- return;
- }
- }
-
-/**
Locates a base character in a string using a folded comparision. Will not find combining
characters, nor will it consider Korean combining Jamo to be equivalent to Hangul.
@internalComponent
@@ -209,14 +172,6 @@
/**
@internalComponent
*/
-TBool TFoldedDecompIterator::AtEnd() const
- {
- return iOriginal.AtEnd();
- }
-
-/**
-@internalComponent
-*/
TBool TFoldedDecompIterator::AtEndOrWildcard() const
{
// neither '?' nor '*' have decomposition sequences, so we can assume that
@@ -279,15 +234,6 @@
return folded.Current() != 0x3B9;
}
-/**
-@internalComponent
-*/
-TChar TFoldedDecompIterator::Current() const
- {
- ASSERT(!AtEnd());
- return IsInFoldedSequence()? iFolded.Current() : iOriginal.Current();
- }
-
/**
Move past this code if it matches unfolded or folded
@internalComponent
@@ -426,23 +372,6 @@
/**
@internalComponent
*/
-TBool TFoldedSortedDecompIterator::AtEnd() const
- {
- return iRemaining == 0;
- }
-
-/**
-@internalComponent
-*/
-TChar TFoldedSortedDecompIterator::Current() const
- {
- ASSERT(!AtEnd());
- return iCurrent.Current();
- }
-
-/**
-@internalComponent
-*/
void TFoldedSortedDecompIterator::Next()
{
ASSERT(!AtEnd());
@@ -498,23 +427,6 @@
/**
@internalComponent
*/
-TBool TFoldedCanonicalIterator::AtEnd() const
- {
- return iSorted.AtEnd() && iBase.AtEnd();
- }
-
-/**
-@internalComponent
-*/
-TChar TFoldedCanonicalIterator::Current() const
- {
- ASSERT(!iBase.AtEnd() || !iSorted.AtEnd());
- return iSorted.AtEnd()? iBase.Current() : iSorted.Current();
- }
-
-/**
-@internalComponent
-*/
void TFoldedCanonicalIterator::Next(const TUnicodeDataSet* aCharDataSet)
{
ASSERT(!iBase.AtEnd() || !iSorted.AtEnd());
@@ -1144,22 +1056,6 @@
/**
@internalComponent
*/
-TBool TDecompositionIterator::AtEnd() const
- {
- return iBase.AtEnd();
- }
-
-/**
-@internalComponent
-*/
-TChar TDecompositionIterator::Current() const
- {
- return iDecomposition.Current();
- }
-
-/**
-@internalComponent
-*/
void TDecompositionIterator::Next()
{
ASSERT(!iBase.AtEnd() && !iDecomposition.AtEnd());
@@ -1244,22 +1140,6 @@
/**
@internalComponent
*/
-TBool TCanonicalDecompositionIterator::AtEnd() const
- {
- return iBase.AtEnd();
- }
-
-/**
-@internalComponent
-*/
-TChar TCanonicalDecompositionIterator::Current() const
- {
- return iCurrentCombiningClass? iCurrent.Current() : iBase.Current();
- }
-
-/**
-@internalComponent
-*/
void TCanonicalDecompositionIterator::Next()
{
iLastPosition = iBase.CurrentPosition();
@@ -1321,14 +1201,6 @@
/**
@internalComponent
*/
-TBool TCanonicalDecompositionIteratorCached::AtEnd() const
- {
- return iCacheSize == 0 && iBase.AtEnd();
- }
-
-/**
-@internalComponent
-*/
void TCanonicalDecompositionIteratorCached::Next(TInt aOffset)
{
ASSERT(0 <= aOffset);