summaryrefslogtreecommitdiffstats
path: root/src/Database.cc
diff options
context:
space:
mode:
authorPeng Huang <shawn.p.huang@gmail.com>2010-04-08 15:33:34 +0800
committerPeng Huang <shawn.p.huang@gmail.com>2010-04-08 15:33:34 +0800
commit5817602139905bd82a9cf9d14811d2ed08ded672 (patch)
treeacdfe175bf019eb34443e2252f4ffa3eb0625aa9 /src/Database.cc
parent7d53bd778bcb4ce47a6b99ca01cb3a12f1cc73ee (diff)
downloadibus-libpinyin-5817602139905bd82a9cf9d14811d2ed08ded672.tar.gz
ibus-libpinyin-5817602139905bd82a9cf9d14811d2ed08ded672.tar.xz
ibus-libpinyin-5817602139905bd82a9cf9d14811d2ed08ded672.zip
Refine code
Diffstat (limited to 'src/Database.cc')
-rw-r--r--src/Database.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Database.cc b/src/Database.cc
index 02570a7..568e451 100644
--- a/src/Database.cc
+++ b/src/Database.cc
@@ -20,9 +20,9 @@ namespace PY {
#define DB_PREFETCH_LEN (6)
-class Conditions : public vector<string> {
+class Conditions : public std::vector<std::string> {
public:
- Conditions (void) : vector<string> (1) {}
+ Conditions (void) : std::vector<std::string> (1) {}
void double_ (void) {
gint i = size ();
@@ -34,7 +34,7 @@ public:
void triple (void) {
gint i = size ();
do {
- const string & value = at (--i);
+ const std::string & value = std::vector<std::string>::at (--i);
push_back (value);
push_back (value);
} while (i > 0);
@@ -59,7 +59,9 @@ public:
class SQLStmt {
public:
SQLStmt (sqlite3 *db)
- : m_db (db), m_stmt (NULL) {}
+ : m_db (db), m_stmt (NULL) {
+ g_assert (m_db != NULL);
+ }
~SQLStmt () {
if (m_stmt != NULL) {
@@ -522,7 +524,6 @@ Database::query (const PinyinArray &pinyin,
}
return stmt;
-
}
inline void