diff options
| author | Peng Huang <shawn.p.huang@gmail.com> | 2010-04-08 14:45:29 +0800 |
|---|---|---|
| committer | Peng Huang <shawn.p.huang@gmail.com> | 2010-04-08 14:45:29 +0800 |
| commit | b11ffca250e50c2968eff626696496f74c6d98ea (patch) | |
| tree | f37fbf92ddb5c798594957d0e8dd582e48af99c0 /src/Database.cc | |
| parent | f8f97605d124b0c3cc128477cd7f9aba994f6906 (diff) | |
| download | ibus-libpinyin-b11ffca250e50c2968eff626696496f74c6d98ea.tar.gz ibus-libpinyin-b11ffca250e50c2968eff626696496f74c6d98ea.tar.xz ibus-libpinyin-b11ffca250e50c2968eff626696496f74c6d98ea.zip | |
Refine code.
Diffstat (limited to 'src/Database.cc')
| -rw-r--r-- | src/Database.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Database.cc b/src/Database.cc index e6e4781..02570a7 100644 --- a/src/Database.cc +++ b/src/Database.cc @@ -111,7 +111,7 @@ Query::Query (Database & db, m_option (option), m_stmt (NULL) { - g_assert (m_pinyin.length () >= pinyin_begin + pinyin_len); + g_assert (m_pinyin.size () >= pinyin_begin + pinyin_len); } Query::~Query (void) @@ -406,8 +406,8 @@ Database::query (const PinyinArray &pinyin, gint m, guint option) { - g_assert (pinyin_begin < pinyin.length ()); - g_assert (pinyin_len <= pinyin.length () - pinyin_begin); + g_assert (pinyin_begin < pinyin.size ()); + g_assert (pinyin_len <= pinyin.size () - pinyin_begin); g_assert (pinyin_len <= MAX_PHRASE_LEN); /* prepare sql */ @@ -425,7 +425,7 @@ Database::query (const PinyinArray &pinyin, conditions.appendPrintf (0, conditions.size (), " AND "); - if (fs1 || fs2) { + if (G_UNLIKELY (fs1 || fs2)) { if (G_LIKELY (i < DB_INDEX_SIZE)) { if (fs1 && fs2 == 0) { conditions.double_ (); @@ -564,11 +564,11 @@ Database::commit (const PhraseArray &phrases) Phrase phrase = {""}; m_sql = "BEGIN TRANSACTION;\n"; - for (guint i = 0; i < phrases.length (); i++) { + for (guint i = 0; i < phrases.size (); i++) { phrase += phrases[i]; phraseSql (phrases[i], m_sql); } - if (phrases.length () > 1) + if (phrases.size () > 1) phraseSql (phrase, m_sql); m_sql << "COMMIT;\n"; |