[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeedu/kiten
From:       Anne-Marie Mahfouf <annma () kde ! org>
Date:       2005-01-27 13:51:23
Message-ID: 20050127135123.CE4BE1D187 () office ! kde ! org
[Download RAW message or body]

CVS commit by annma: 

Patch from Paul Temple which adresses 2 problems:
- dict.cpp:66: warning: control reaches end of non-void function
- crash when searching for a word starting with a special char:
the binary search in Index::doSearch(..) needed a stop criterion 
for the case that "needle < all elements in haystack", which is 
true for all strings beginning with a char that is "smaller" 
than latin characters, as there are only strings beginning with 
latin (or "greater") characters in the haystack.

CCBUG:97892


  M +2 -2      dict.cpp   1.55


--- kdeedu/kiten/dict.cpp  #1.54:1.55
@@ -62,5 +62,5 @@ TextType Dict::textType(const QString &t
                 return Text_Kana;
         
-        else if (first >= 0x3400 && first < 0x4DC0) // CJK Unified Ideographs Extension A
+        else /*if (first >= 0x3400 && first < 0x4DC0)*/ // CJK Unified Ideographs Extension A
                 return Text_Kanji;
 }
@@ -279,5 +279,5 @@ QStringList Index::doSearch(File &file, 
                         lo = cur + 1;
         }
-        while(hi >= lo && comp != 0);
+        while(hi >= lo && comp != 0 && !(hi == 0 && lo == 0));
         QStringList results;
         // A match?


[prev in list] [next in list] [prev in thread] [next in thread]