[core] :

extensionに関する変更を行った。
また、queryの大幅な変更に対する修正も加えた。

diff --git a/core/src/GikoMona.cpp b/core/src/GikoMona.cpp
index 58c05b3..0cc0b4d 100644 (file)
--- a/core/src/GikoMona.cpp
+++ b/core/src/GikoMona.cpp
@@ -5,11 +5,14 @@
 #include "database.hpp"
 #include "model.hpp"
 
+#include "extension.hpp"
+
 namespace monazilla { namespace GikoMona { namespace core {
 
 namespace {
 
 model *app_model;
+extension *app_extension;
 
 }
 
@@ -21,6 +24,8 @@ bool init_core() {
     model::get_instance()->load_file("./config.xml");
     model::get_instance()->load_file("./history.db");
     model::get_instance()->load_file("./saved-tab-session.xml");
+    
+    app_extension = new extension;
 }
 
 void done_core() noexcept {
@@ -31,14 +36,13 @@ void done_core() noexcept {
     
     optimize_database("./history.db");
 
+    delete app_extension;
     delete app_model;
 }
 
 void optimize_database(const boost::filesystem::path& db_path) {
     database db("./history.db");
-    auto q = query().define()
-        .select("count-of-deleting-values", "file-infomation");
-    if(db.do_query<int>(q) >= 1000) {
+    if(db.select<int>("count-of-deleting-values", "file-infomation") >= 1000) {
         db.optimize();
     }
 }