Changeset 13894

Timestamp:

Jan 28, 2013, 6:20:20 PM (9 years ago)

Author:

jordan

Message:

(qt) more futzing with file-tree

Location:

trunk/qt

Files:

• file-tree.cc (modified) (16 diffs)
• file-tree.h (modified) (7 diffs)

trunk/qt/file-tree.cc

@@ -53 +53 @@
   while (myFirstUnhashedRow < n)
     {
-      myChildRows.insert (myChildren[myFirstUnhashedRow]->name(), myFirstUnhashedRow);
-      myFirstUnhashedRow++;
+      myChildRows.insert (myChildren[myFirstUnhashedRow]->name(),
+                          myFirstUnhashedRow);
+      ++myFirstUnhashedRow;
     }
 
@@ -120 +121 @@
   if (column == COL_FILE_INDEX)
     {
-      return myIndex;
+      return myFileIndex;
     }
   else if (role == Qt::EditRole)
@@ -235 +236 @@
 FileTreeItem :: priorityString () const
 {
-    const int i(priority());
-    if(i == LOW) return tr("Low");
-    if(i == HIGH) return tr("High");
-    if(i == NORMAL) return tr("Normal");
-    return tr("Mixed");
+  const int i = priority();
+
+  switch (i)
+    {
+      case LOW:    return tr("Low");
+      case HIGH:   return tr("High");
+      case NORMAL: return tr("Normal");
+      default:     return tr("Mixed");
+    }
 }
 
@@ -278 +283 @@
       myPriority = i;
 
-      if (myIndex >= 0)
-        ids.insert (myIndex);
+      if (myFileIndex >= 0)
+        ids.insert (myFileIndex);
     }
 
@@ -332 +337 @@
       myIsWanted = b;
 
-      if (myIndex >= 0)
-        ids.insert(myIndex);
+      if (myFileIndex >= 0)
+        ids.insert(myFileIndex);
     }
 
@@ -366 +371 @@
 }
 
+FileTreeItem *
+FileTreeModel :: itemFromIndex (const QModelIndex& index) const
+{
+  return static_cast<FileTreeItem*>(index.internalPointer()); 
+}
+
 QVariant
 FileTreeModel :: data (const QModelIndex &index, int role) const
@@ -372 +383 @@
 
   if (index.isValid())
-    {
-      FileTreeItem * i = static_cast<FileTreeItem*>(index.internalPointer());
-      value = i->data (index.column(), role);
-    }
+    value = itemFromIndex(index)->data (index.column(), role);
 
   return value;
@@ -401 +409 @@
       QString oldpath;
       QModelIndex walk = index;
-      FileTreeItem * item = static_cast<FileTreeItem*>(index.internalPointer());
+      FileTreeItem * item = itemFromIndex (index);
 
       while (item && !item->name().isEmpty())
@@ -467 +475 @@
         parentItem = myRootItem;
       else
-        parentItem = static_cast<FileTreeItem*>(parent.internalPointer());
+        parentItem = itemFromIndex (parent);
 
       FileTreeItem * childItem = parentItem->child(row);
@@ -487 +495 @@
 FileTreeModel :: parent (const QModelIndex& child, int column) const
 {
-  if (!child.isValid())
-    return QModelIndex();
-
-  FileTreeItem * childItem = static_cast<FileTreeItem*>(child.internalPointer());
-
-  return indexOf (childItem->parent(), column);
+  QModelIndex parent;
+
+  if (child.isValid())
+    parent = indexOf (itemFromIndex(child)->parent(), column);
+
+  return parent;
 }
 
@@ -500 +508 @@
   FileTreeItem * parentItem;
 
-  if (!parent.isValid())
+  if (parent.isValid())
+    parentItem = itemFromIndex (parent);
+  else
     parentItem = myRootItem;
-  else
-    parentItem = static_cast<FileTreeItem*>(parent.internalPointer());
 
   return parentItem->childCount();
@@ -533 +541 @@
     clearSubtree(index(--i, 0, top));
 
-  delete static_cast<FileTreeItem*>(top.internalPointer());
+  delete static_cast<FileTreeItem*>(itemFromIndex(top));
 }
 
@@ -559 +567 @@
       QModelIndex& index = indices.front ();
       if (index.isValid())
-        ret = static_cast<FileTreeItem*>(index.internalPointer());
+        ret = itemFromIndex (index);
     }
 
@@ -679 +687 @@
       FileTreeItem * item;
 
-      item = static_cast<FileTreeItem*>(index.internalPointer());
+      item = itemFromIndex (index);
       item->twiddleWanted (file_ids, want);
       emit wantedChanged (file_ids, want);
@@ -693 +701 @@
       FileTreeItem * item;
 
-      item = static_cast<FileTreeItem*>(index.internalPointer());
+      item = itemFromIndex (index);
       item->twiddlePriority (file_ids, priority);
       emit priorityChanged (file_ids, priority);
@@ -906 +914 @@
 
 void
-FileTreeView :: update (const FileList& files)
-{
-  update (files, true);
-}
-
-void
 FileTreeView :: update (const FileList& files, bool updateFields)
 {

trunk/qt/file-tree.h

@@ -11 +11 @@
  */
 
-#ifndef QTR_TREE_FILE_MODEL
-#define QTR_TREE_FILE_MODEL
+#ifndef QTR_FILE_TREE
+#define QTR_FILE_TREE
 
 #include <QAbstractItemModel>
@@ -45 +45 @@
 
     FileTreeItem (const QString& name="", int fileIndex=-1, uint64_t size=0):
-      myIndex (fileIndex),
+      myFileIndex (fileIndex),
       myParent (0),
       myName (name),
@@ -67 +67 @@
     void twiddleWanted (QSet<int>& fileIds, bool&);
     void twiddlePriority (QSet<int>& fileIds, int&);
-    int fileIndex () const { return myIndex; }
+    int fileIndex () const { return myFileIndex; }
     uint64_t totalSize () const { return myTotalSize; }
-    
-    
 
   private:
@@ -82 +80 @@
     int isSubtreeWanted () const;
 
-    const int myIndex;
+    const int myFileIndex;
     FileTreeItem * myParent;
     QList<FileTreeItem*> myChildren;
@@ -134 +132 @@
     void subtreeChanged (const QModelIndex &, int column);
     FileTreeItem * findItemForFileIndex (int fileIndex) const;
-
-
+    FileTreeItem * itemFromIndex (const QModelIndex&) const;
 
   private:
@@ -166 +163 @@
     virtual ~FileTreeView ();
     void clear ();
-    void update (const FileList& files);
-    void update (const FileList& files, bool torrentChanged);
+    void update (const FileList& files, bool updateProperties=true);
 
   signals:
-    void priorityChanged (const QSet<int>& fileIndices, int);
-    void wantedChanged (const QSet<int>& fileIndices, bool);
+    void priorityChanged (const QSet<int>& fileIndices, int priority);
+    void wantedChanged (const QSet<int>& fileIndices, bool wanted);
     void pathEdited (const QString& oldpath, const QString& newname);
 
@@ -183 +179 @@
 
   public slots:
-    void onClicked (const QModelIndex & index);
+    void onClicked (const QModelIndex& index);
 };