From 83a181ebf18df79dcde057ac25280dc63bbb0e4a Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <jfiat@eiffel.com>
Date: Mon, 31 Oct 2011 09:02:19 +0100
Subject: [PATCH] Fixed remaining 6.8 vs 7.0 compilation issue related to
 UTF8_(URL_)ENCODER

---
 .../70/{utf8_url_encoder_i.e => utf8_encoder_helper.e}    | 2 +-
 .../{utf8_url_encoder_i.e => utf8_encoder_helper.e}       | 2 +-
 library/text/encoder/src/utf8_encoder.e                   | 8 +-------
 library/text/encoder/src/utf8_url_encoder.e               | 4 ++--
 4 files changed, 5 insertions(+), 11 deletions(-)
 rename library/text/encoder/src/spec/70/{utf8_url_encoder_i.e => utf8_encoder_helper.e} (96%)
 rename library/text/encoder/src/spec/before_70/{utf8_url_encoder_i.e => utf8_encoder_helper.e} (98%)

diff --git a/library/text/encoder/src/spec/70/utf8_url_encoder_i.e b/library/text/encoder/src/spec/70/utf8_encoder_helper.e
similarity index 96%
rename from library/text/encoder/src/spec/70/utf8_url_encoder_i.e
rename to library/text/encoder/src/spec/70/utf8_encoder_helper.e
index 024d3db8..8e82c656 100644
--- a/library/text/encoder/src/spec/70/utf8_url_encoder_i.e
+++ b/library/text/encoder/src/spec/70/utf8_encoder_helper.e
@@ -5,7 +5,7 @@ note
 	revision    : "$Revision$"
 
 deferred class
-	UTF8_URL_ENCODER_I
+	UTF8_ENCODER_HELPER
 
 inherit
 	ANY
diff --git a/library/text/encoder/src/spec/before_70/utf8_url_encoder_i.e b/library/text/encoder/src/spec/before_70/utf8_encoder_helper.e
similarity index 98%
rename from library/text/encoder/src/spec/before_70/utf8_url_encoder_i.e
rename to library/text/encoder/src/spec/before_70/utf8_encoder_helper.e
index 048bb913..e8e996e3 100644
--- a/library/text/encoder/src/spec/before_70/utf8_url_encoder_i.e
+++ b/library/text/encoder/src/spec/before_70/utf8_encoder_helper.e
@@ -5,7 +5,7 @@ note
 	revision    : "$Revision$"
 
 deferred class
-	UTF8_URL_ENCODER_I
+	UTF8_ENCODER_HELPER
 
 inherit
 	ANY
diff --git a/library/text/encoder/src/utf8_encoder.e b/library/text/encoder/src/utf8_encoder.e
index 71a818e5..451cb5e3 100644
--- a/library/text/encoder/src/utf8_encoder.e
+++ b/library/text/encoder/src/utf8_encoder.e
@@ -15,13 +15,7 @@ class
 inherit
 	ENCODER [STRING_32, STRING_8]
 
-	UNICODE_CONVERSION
-		export
-			{NONE} all
-			{ANY} is_valid_utf8
-		undefine
-			is_little_endian
-		end
+	UTF8_ENCODER_HELPER
 
 	PLATFORM
 		export
diff --git a/library/text/encoder/src/utf8_url_encoder.e b/library/text/encoder/src/utf8_url_encoder.e
index 443a527f..3648f111 100644
--- a/library/text/encoder/src/utf8_url_encoder.e
+++ b/library/text/encoder/src/utf8_url_encoder.e
@@ -21,7 +21,7 @@ inherit
 			decoded_string
 		end
 
-	UTF8_URL_ENCODER_I
+	UTF8_ENCODER_HELPER
 		redefine
 			default_create
 		end
@@ -30,7 +30,7 @@ feature {NONE} -- Initialization
 
 	default_create
 		do
-			Precursor {UTF8_URL_ENCODER_I}
+			Precursor {UTF8_ENCODER_HELPER}
 		end
 
 feature -- Access