From 70990846e10b6592c5f1bed7430b8ffd441bffcc Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 3 Mar 2016 16:08:07 +0100 Subject: [PATCH] Compare methods changed to compare index relevant fields only, to make reusable for search purposes --- lib/libZRCola/include/zrcola/translate.h | 5 +---- lib/libZRColaUI/include/zrcolaui/keyboard.h | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/libZRCola/include/zrcola/translate.h b/lib/libZRCola/include/zrcola/translate.h index 997a0fc..534762a 100644 --- a/lib/libZRCola/include/zrcola/translate.h +++ b/lib/libZRCola/include/zrcola/translate.h @@ -111,9 +111,6 @@ namespace ZRCola { int r = translation::CompareString(trans_a.str, trans_a.str_len, trans_b.str, trans_b.str_len); if (r != 0) return r; - if (trans_a.chr < trans_b.chr) return -1; - else if (trans_a.chr > trans_b.chr) return +1; - return 0; } } idxComp; ///< Composition index @@ -152,7 +149,7 @@ namespace ZRCola { if (trans_a.chr < trans_b.chr) return -1; else if (trans_a.chr > trans_b.chr) return +1; - return translation::CompareString(trans_a.str, trans_a.str_len, trans_b.str, trans_b.str_len); + return 0; } } idxDecomp; ///< Decomposition index diff --git a/lib/libZRColaUI/include/zrcolaui/keyboard.h b/lib/libZRColaUI/include/zrcolaui/keyboard.h index 26bc53e..8ebfd74 100644 --- a/lib/libZRColaUI/include/zrcolaui/keyboard.h +++ b/lib/libZRColaUI/include/zrcolaui/keyboard.h @@ -119,7 +119,7 @@ namespace ZRCola { if (ks_a.chr < ks_b.chr) return -1; else if (ks_a.chr > ks_b.chr) return +1; - return keyseq::CompareSequence(ks_a.seq, ks_a.seq_len, ks_b.seq, ks_b.seq_len); + return 0; } } idxChr; ///< Character index @@ -157,9 +157,6 @@ namespace ZRCola { int r = keyseq::CompareSequence(ks_a.seq, ks_a.seq_len, ks_b.seq, ks_b.seq_len); if (r != 0) return r; - if (ks_a.chr < ks_b.chr) return -1; - else if (ks_a.chr > ks_b.chr) return +1; - return 0; } } idxKey; ///< Key index