Database: modify DatabaseTree

Author: KangLin

App/Client/Favorite/FavoriteDatabase.cpp

@@ -207,30 +207,37 @@ int CFavoriteDatabase::AddFavorite(const QString &szFile,
             success = query.exec();
             if (!success) {
                 QString szErr = "Failed to insert favorite table: " + query.lastError().text();
+                SetError(szErr);
                 qCritical(log) << szErr;
                 throw std::runtime_error(szErr.toStdString());
             }
 
             key = query.lastInsertId().toInt();
             if(0 >= key) {
                 QString szErr = "Failed to insert favorite table";
+                SetError(szErr);
+                qCritical(log) << szErr;
                 throw std::runtime_error(szErr.toStdString());
             }
         }
 
         // 在 tree 表中增加
-        TreeItem item;
+        TreeItem item(TreeItem::Leaf);
         item.SetKey(key);
         item.SetParentId(parentId);
         int id = Add(item);
         if (0 >= id) {
             QString szErr = "Failed to insert favorite folder table";
+            SetError(szErr);
+            qCritical(log) << szErr;
             throw std::runtime_error(szErr.toStdString());
         }
 
         // 提交事务
         if (!db.commit()) {
             QString szErr = "Failed to commit transaction:" + db.lastError().text();
+            SetError(szErr);
+            qCritical(log) << szErr;
             throw std::runtime_error(szErr.toStdString());
         }
 

Plugins/WebBrowser/Bookmark/BookmarkDatabase.cpp

@@ -704,10 +704,9 @@ QDomElement CBookmarkDatabase::findFirstElement(const QDomElement &parent, const
 
 TreeItem CBookmarkDatabase::BookmarkToTree(const BookmarkItem& tree, bool setKey)
 {
-    TreeItem item;
     TreeItem::TYPE type;
     type = tree.type == BookmarkType_Folder ? TreeItem::Node: TreeItem::Leaf;
-    item.SetType(type);
+    TreeItem item(type);   
     item.SetId(tree.id);
     item.SetParentId(tree.folderId);
     item.SetCreateTime(tree.createdTime);