Reviewed by Adele.

        - remove HAVE_ICU_LIBRARY ifdefs

        * khtml/rendering/render_text.cpp: Just use ICU all the time; no ifdef.
        * kwq/KWQKURL.mm: Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9223 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 322f4737d0289e18d1f9dab82e09c7da57f79e44..1b7278b9e7aa72dd4035d070014604d2a4e6a1e4 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2005-05-27  Darin Adler  <darin@apple.com>
+
+        Reviewed by Adele.
+
+        - remove HAVE_ICU_LIBRARY ifdefs
+
+        * khtml/rendering/render_text.cpp: Just use ICU all the time; no ifdef.
+        * kwq/KWQKURL.mm: Ditto.
+
 2005-05-26  Darin Adler  <darin@apple.com>
 
         Reviewed by me, patch by Mitz Pettel.

diff --git a/WebCore/khtml/rendering/render_text.cpp b/WebCore/khtml/rendering/render_text.cpp
index e9bd8c60b0cd87cfae9587d3035af9c258a5ebee..3d570024b7f2ded1f7d4068be2a697cce51a6f17 100644 (file)
--- a/WebCore/khtml/rendering/render_text.cpp
+++ b/WebCore/khtml/rendering/render_text.cpp
@@ -43,15 +43,10 @@
 #include <kdebug.h>
 #include <assert.h>
 
-// You may have to turn this to 0 to compile without the headers for ICU installed.
-#define HAVE_ICU_LIBRARY 1
-
-#if HAVE_ICU_LIBRARY
 #include <unicode/ubrk.h>
 #include <unicode/uloc.h>
 #include <unicode/utypes.h>
 #include <unicode/parseerr.h>
-#endif
 
 using namespace khtml;
 using namespace DOM;
@@ -691,8 +686,6 @@ unsigned long InlineTextBox::caretMaxRenderedOffset() const
     return m_start + m_len;
 }
 
-#if HAVE_ICU_LIBRARY
-
 static UBreakIterator *getCharacterBreakIterator(const DOMStringImpl *i)
 {
     // The locale is currently ignored when determining character cluster breaks.  This may change
@@ -716,27 +709,21 @@ static UBreakIterator *getCharacterBreakIterator(const DOMStringImpl *i)
     return iterator;
 }
 
-#endif
-
 long RenderText::previousOffset (long current) const
 {
-#if HAVE_ICU_LIBRARY
     UBreakIterator *iterator = getCharacterBreakIterator(str);
     if (iterator) {
         return ubrk_preceding(iterator, current);
     }
-#endif
     return current - 1;
 }
 
 long RenderText::nextOffset (long current) const
 {
-#if HAVE_ICU_LIBRARY
     UBreakIterator *iterator = getCharacterBreakIterator(str);
     if (iterator) {
         return ubrk_following(iterator, current);
     }
-#endif
     return current + 1;
 }
 

diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index 05fd99d8f2a6cb20bf5ebcbab99b3e10002eb0c3..2368fb0740b043ccf5263c00e8cd1e4499c7c5ad 100644 (file)
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -35,12 +35,7 @@
 // FIXME: Should get this from a header.
 extern "C" int malloc_good_size(int size);
 
-// You may have to turn this to 0 to compile without the headers for ICU installed.
-#define HAVE_ICU_LIBRARY 1
-
-#if HAVE_ICU_LIBRARY
 #import <unicode/uidna.h>
-#endif
 
 struct KWQIntegerPair {
     KWQIntegerPair(int s, int e) : start(s), end(e) { }
@@ -1506,8 +1501,6 @@ NSData *KURL::getNSData() const
     return [NSData dataWithBytes:bytes length:urlString.length()];
 }
 
-#if HAVE_ICU_LIBRARY
-
 static QString encodeHostname(const QString &s)
 {
     // Needs to be big enough to hold an IDN-encoded name.
@@ -1672,15 +1665,9 @@ static QString encodeHostnames(const QString &s)
     return s;
 }
 
-#endif // HAVE_ICU_LIBRARY
-
 static char *encodeRelativeString(const KURL &base, const QString &rel, const QTextCodec *codec)
 {
-#if HAVE_ICU_LIBRARY
     QString s = encodeHostnames(rel);
-#else
-    QString s = rel;
-#endif
 
     char *strBuffer;