App: modify CFavoriteDatabase::Item

Author: KangLin

App/Client/Favorite/FavoriteDatabase.cpp

@@ -315,8 +315,7 @@ bool CFavoriteDatabase::UpdateFavorite(
 
 CFavoriteDatabase::Item CFavoriteDatabase::GetFavorite(int id)
 {
-    Item item;
-    item.type = TreeItem::Leaf;
+    Item item(TreeItem::Leaf);
     auto leaf = GetLeaf(id);
     if(leaf.GetId() == 0)
         return item;
@@ -351,8 +350,7 @@ CFavoriteDatabase::Item CFavoriteDatabase::GetFavorite(int id)
 QList<CFavoriteDatabase::Item> CFavoriteDatabase::GetFavorite(const QString &szFile)
 {
     QList<CFavoriteDatabase::Item> lstItems;
-    Item item;
-    item.type = TreeItem::Leaf;
+    Item item(TreeItem::Leaf);
 
     QSqlQuery query(GetDatabase());
     query.prepare(
@@ -389,11 +387,10 @@ QList<CFavoriteDatabase::Item> CFavoriteDatabase::GetFavorite(const QString &szF
 CFavoriteDatabase::Item CFavoriteDatabase::GetGroup(int id)
 {
     auto f = GetNode(id);
-    Item item;
+    Item item(f.GetType());
     item.id = f.GetId();
     item.parentId = f.GetParentId();
     item.szName = f.GetName();
-    item.type = f.GetType();
     return item;
 }
 
@@ -403,11 +400,10 @@ QList<CFavoriteDatabase::Item> CFavoriteDatabase::GetChildren(int parentId)
     // Get nodes
     auto folders = GetSubNodes(parentId);
     foreach(auto f, folders) {
-        Item item;
+        Item item(f.GetType());
         item.id = f.GetId();
         item.parentId = f.GetParentId();
         item.szName = f.GetName();
-        item.type = f.GetType();
         children << item;
     }
     // Get leaves

App/Client/Favorite/FavoriteDatabase.h

@@ -26,10 +26,10 @@ class CFavoriteDatabase : public CDatabaseTree
         QString szFile;
         QString szDescription;
         TreeItem::TYPE type;
-        Item()
+        explicit Item(TreeItem::TYPE t = TreeItem::Node)
             : id(0)
             , parentId(0)
-            , type(TreeItem::Leaf)
+            , type(t)
         {}
         QIcon GetIcon() {
             if(!icon.isNull())
@@ -40,6 +40,10 @@ class CFavoriteDatabase : public CDatabaseTree
         }
         bool isFolder() const { return type == TreeItem::Node; }
         bool isFavorite() const { return type == TreeItem::Leaf; }
+        // 添加有效性检查
+        bool isValid() const {
+            return id > 0 || !szFile.isEmpty();
+        }
     };
 
     int AddFavorite(const QString &szFile, const QString& szName,

App/Client/Favorite/FavoriteModel.cpp

@@ -232,8 +232,7 @@ bool CFavoriteModel::AddFavorite(
 {
     if(!m_pDatabase || !m_Folders.contains(parentId)) return false;
     int id = 0;
-    CFavoriteDatabase::Item item;
-    item.type = TreeItem::Leaf;
+    CFavoriteDatabase::Item item(TreeItem::Leaf);
     // Check if it already exists
     auto items = m_pDatabase->GetFavorite(szFile);
     if(items.isEmpty()) {
@@ -318,7 +317,7 @@ bool CFavoriteModel::Copy(QModelIndex index, QModelIndex parentIndex)
 
 CFavoriteDatabase::Item CFavoriteModel::GetFavorite(const QString &szFile)
 {
-    CFavoriteDatabase::Item item;
+    CFavoriteDatabase::Item item(TreeItem::TYPE::Leaf);
     if(!m_pDatabase) return item;
     auto items = m_pDatabase->GetFavorite(szFile);
     if(!items.isEmpty()) {
@@ -484,7 +483,7 @@ bool CFavoriteModel::MoveTree(const CFavoriteDatabase::Item &item, int newParent
         int sourcePos = parent->children.indexOf(cur);
         if(sourcePos < 0)
             return false;
-        int desPos = parent->GetInserIndex(cur);
+        int desPos = newParent->GetInserIndex(cur);
         QModelIndex index = CreateIndex(parent);
         QModelIndex newIndex = CreateIndex(newParent);
         beginMoveRows(index, sourcePos, sourcePos, newIndex, desPos);
@@ -495,7 +494,7 @@ bool CFavoriteModel::MoveTree(const CFavoriteDatabase::Item &item, int newParent
     return true;
 }
 
-CFavoriteModel::tree::tree()
+CFavoriteModel::tree::tree(): item(TreeItem::TYPE::Node)
 {}
 
 CFavoriteModel::tree::tree(CFavoriteDatabase::Item i)

App/Client/Favorite/FavoriteView.cpp

@@ -561,10 +561,11 @@ void CFavoriteView::dropEvent(QDropEvent *event)
 #else
     auto idxParent = m_pTreeView->indexAt(event->pos());
 #endif
-    CFavoriteDatabase::Item item
-        = m_pModel->data(idxParent, CFavoriteModel::RoleItem)
-              .value<CFavoriteDatabase::Item>();
-    if(0 < item.id && item.isFolder())
+    QVariant v = m_pModel->data(idxParent, CFavoriteModel::RoleItem);
+    CFavoriteDatabase::Item item(TreeItem::TYPE::Node);
+    if(v.isValid())
+        item = v.value<CFavoriteDatabase::Item>();
+    if(0 <= item.id && item.isFolder())
     {
         foreach(auto i, pData->m_Items)
         {
@@ -614,15 +615,15 @@ void CFavoriteView::mousePressEvent(QMouseEvent *event)
                     drag->setMimeData(pData);
                     Qt::DropAction dropAction = Qt::MoveAction;
                     /*
-                if(event->modifiers() & Qt::ControlModifier) {
-                    dropAction = Qt::CopyAction;
-                    // 设置拖拽时的光标
-                    // QIcon icon = QIcon::fromTheme("edit-copy");
-                    // QSize size(16, 16);
-                    // if(!icon.availableSizes().isEmpty())
-                    //     size = icon.availableSizes().at(0);
-                    // drag->setDragCursor(icon.pixmap(size), Qt::MoveAction);
-                }//*/
+                    if(event->modifiers() & Qt::ControlModifier) {
+                        dropAction = Qt::CopyAction;
+                        // 设置拖拽时的光标
+                        // QIcon icon = QIcon::fromTheme("edit-copy");
+                        // QSize size(16, 16);
+                        // if(!icon.availableSizes().isEmpty())
+                        //     size = icon.availableSizes().at(0);
+                        // drag->setDragCursor(icon.pixmap(size), Qt::MoveAction);
+                    }//*/
                     drag->exec(dropAction);
                 } while(0);
                 if(drag)