From 2f55b1b39ffd4896f6783096de4ce90bc0b7924c Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Mon, 11 Jun 2007 17:37:31 +0000 Subject: [PATCH] ICU-5410 Improve code coverage by removing unused/unuseable code. X-SVN-Rev: 21693 --- icu4c/source/i18n/rbt.cpp | 10 +++++----- icu4c/source/i18n/rbt.h | 8 ++++---- icu4c/source/i18n/rbt_pars.cpp | 6 +++--- icu4c/source/i18n/rbt_pars.h | 6 +++--- icu4c/source/i18n/rematch.cpp | 16 ++++++++-------- icu4c/source/i18n/unicode/regex.h | 4 ++-- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/icu4c/source/i18n/rbt.cpp b/icu4c/source/i18n/rbt.cpp index 5519d927e23..0da86eb8cc8 100644 --- a/icu4c/source/i18n/rbt.cpp +++ b/icu4c/source/i18n/rbt.cpp @@ -1,6 +1,6 @@ /* ********************************************************************** -* Copyright (C) 1999-2006, International Business Machines +* Copyright (C) 1999-2007, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Date Name Description @@ -87,7 +87,7 @@ RuleBasedTransliterator::RuleBasedTransliterator( * @exception IllegalArgumentException if rules are malformed * or direction is invalid. */ -RuleBasedTransliterator::RuleBasedTransliterator( +/*RuleBasedTransliterator::RuleBasedTransliterator( const UnicodeString& id, const UnicodeString& rules, UTransDirection direction, @@ -96,7 +96,7 @@ RuleBasedTransliterator::RuleBasedTransliterator( Transliterator(id, adoptedFilter) { UParseError parseError; _construct(rules, direction,parseError, status); -} +}*/ /** * Covenience constructor with no filter. @@ -126,7 +126,7 @@ RuleBasedTransliterator::RuleBasedTransliterator( /** * Covenience constructor with FORWARD direction. */ -RuleBasedTransliterator::RuleBasedTransliterator( +/*RuleBasedTransliterator::RuleBasedTransliterator( const UnicodeString& id, const UnicodeString& rules, UnicodeFilter* adoptedFilter, @@ -134,7 +134,7 @@ RuleBasedTransliterator::RuleBasedTransliterator( Transliterator(id, adoptedFilter) { UParseError parseError; _construct(rules, UTRANS_FORWARD,parseError, status); -} +}*/ RuleBasedTransliterator::RuleBasedTransliterator(const UnicodeString& id, const TransliterationRuleData* theData, diff --git a/icu4c/source/i18n/rbt.h b/icu4c/source/i18n/rbt.h index 799f50cd2b4..93136541b7f 100644 --- a/icu4c/source/i18n/rbt.h +++ b/icu4c/source/i18n/rbt.h @@ -323,11 +323,11 @@ public: * @exception IllegalArgumentException if rules are malformed. * @internal Use transliterator factory methods instead since this class will be removed in that release. */ - RuleBasedTransliterator(const UnicodeString& id, + /*RuleBasedTransliterator(const UnicodeString& id, const UnicodeString& rules, UTransDirection direction, UnicodeFilter* adoptedFilter, - UErrorCode& status); + UErrorCode& status);*/ /** * Covenience constructor with no filter. @@ -350,10 +350,10 @@ public: * Covenience constructor with FORWARD direction. * @internal Use transliterator factory methods instead since this class will be removed in that release. */ - RuleBasedTransliterator(const UnicodeString& id, + /*RuleBasedTransliterator(const UnicodeString& id, const UnicodeString& rules, UnicodeFilter* adoptedFilter, - UErrorCode& status); + UErrorCode& status);*/ private: friend class TransliteratorRegistry; // to access TransliterationRuleData convenience ctor diff --git a/icu4c/source/i18n/rbt_pars.cpp b/icu4c/source/i18n/rbt_pars.cpp index a67e710c941..83eccf54eaf 100644 --- a/icu4c/source/i18n/rbt_pars.cpp +++ b/icu4c/source/i18n/rbt_pars.cpp @@ -1,6 +1,6 @@ /* ********************************************************************** - * Copyright (C) 1999-2006, International Business Machines + * Copyright (C) 1999-2007, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Date Name Description @@ -1567,9 +1567,9 @@ void TransliteratorParser::appendVariableDef(const UnicodeString& name, /** * Glue method to get around access restrictions in C++. */ -Transliterator* TransliteratorParser::createBasicInstance(const UnicodeString& id, const UnicodeString* canonID) { +/*Transliterator* TransliteratorParser::createBasicInstance(const UnicodeString& id, const UnicodeString* canonID) { return Transliterator::createBasicInstance(id, canonID); -} +}*/ U_NAMESPACE_END diff --git a/icu4c/source/i18n/rbt_pars.h b/icu4c/source/i18n/rbt_pars.h index a9b11d34837..96bdac06479 100644 --- a/icu4c/source/i18n/rbt_pars.h +++ b/icu4c/source/i18n/rbt_pars.h @@ -1,6 +1,6 @@ /* ********************************************************************** -* Copyright (C) 1999-2006, International Business Machines Corporation +* Copyright (C) 1999-2007, International Business Machines Corporation * and others. All Rights Reserved. ********************************************************************** * Date Name Description @@ -316,8 +316,8 @@ private: /** * Glue method to get around access restrictions in C++. */ - static Transliterator* createBasicInstance(const UnicodeString& id, - const UnicodeString* canonID); + /*static Transliterator* createBasicInstance(const UnicodeString& id, + const UnicodeString* canonID);*/ friend class RuleHalf; diff --git a/icu4c/source/i18n/rematch.cpp b/icu4c/source/i18n/rematch.cpp index 294833ec718..d3aab9f7189 100644 --- a/icu4c/source/i18n/rematch.cpp +++ b/icu4c/source/i18n/rematch.cpp @@ -1,15 +1,15 @@ +/* +************************************************************************** +* Copyright (C) 2002-2007 International Business Machines Corporation * +* and others. All rights reserved. * +************************************************************************** +*/ // // file: rematch.cpp // // Contains the implementation of class RegexMatcher, // which is one of the main API classes for the ICU regular expression package. // -/* -************************************************************************** -* Copyright (C) 2002-2005 International Business Machines Corporation * -* and others. All rights reserved. * -************************************************************************** -*/ #include "unicode/utypes.h" #if !UCONFIG_NO_REGULAR_EXPRESSIONS @@ -722,10 +722,10 @@ RegexMatcher &RegexMatcher::reset(const UnicodeString &input) { return *this; } -RegexMatcher &RegexMatcher::reset(const UChar *) { +/*RegexMatcher &RegexMatcher::reset(const UChar *) { fDeferredStatus = U_INTERNAL_PROGRAM_ERROR; return *this; -} +}*/ RegexMatcher &RegexMatcher::reset(int32_t position, UErrorCode &status) { diff --git a/icu4c/source/i18n/unicode/regex.h b/icu4c/source/i18n/unicode/regex.h index 979082a394f..ce24ef5f89b 100644 --- a/icu4c/source/i18n/unicode/regex.h +++ b/icu4c/source/i18n/unicode/regex.h @@ -1,6 +1,6 @@ /* ********************************************************************** -* Copyright (C) 2002-2006, International Business Machines +* Copyright (C) 2002-2007, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * file name: regex.h @@ -733,7 +733,7 @@ private: * * @internal */ - virtual RegexMatcher &reset(const UChar *input); + RegexMatcher &reset(const UChar *input); public: /**