NNTPGrab - /trunk/client/gui_qt/DownloadQueueModel.cpp - Diff - NNTPGrab

Revision 1788 trunk/client/gui_qt/DownloadQueueModel.cpp

                   int DownloadQueueModel::columnCount(const QModelIndex &parent) const
+                  {
                       if (parent.isValid())
                           return static_cast(parent.internalPointer())->columnCount();
                       else
                           return rootItem->columnCount();
                       return parent.isValid() && parent.column() != 0 ? 0 : DownloadQueueItem::NUM_FIELDS;
+                  }
                   QVariant DownloadQueueModel::data(const QModelIndex &index, int role) const
-...
                       if (!index.isValid())
                           return QModelIndex();
                       DownloadQueueItem *childItem = static_cast(index.internalPointer());
                       DownloadQueueItem *parentItem = childItem->parent();
                       if (DownloadQueueItem *childItem = itemForIndex(index)) {
                           if (DownloadQueueItem *parentItem = childItem->parent()) {
                               if (parentItem == rootItem)
                                   return QModelIndex();
                               if (DownloadQueueItem *grandParentItem = parentItem->parent()) {
                                   int row = grandParentItem->rowOfChild(parentItem);
                                   return createIndex(row, 0, parentItem);
+                              }
+                          }
+                      }
                       if (parentItem == rootItem || !parentItem)
                           return QModelIndex();
                       return QModelIndex();
+                  }
                       return createIndex(parentItem->row(), 0, parentItem);
                   DownloadQueueItem *DownloadQueueModel::itemForIndex(const QModelIndex &index) const
+                  {
                       if (index.isValid()) {
                           if (DownloadQueueItem *item = static_cast(index.internalPointer())) {
                               return item;
+                          }
+                      }
                       return rootItem;
+                  }
                   int DownloadQueueModel::rowCount(const QModelIndex &parent) const
+                  {
                       DownloadQueueItem *parentItem;
                       if (parent.column() > 0)
                       if (parent.isValid() && parent.column() != 0)
                           return 0;
                       if (!parent.isValid())
                           parentItem = rootItem;
                       else
                           parentItem = static_cast(parent.internalPointer());
                       return parentItem->childCount();
                       DownloadQueueItem *parentItem = itemForIndex(parent);
                       return parentItem ? parentItem->childCount() : 0;
+                  }
                   void DownloadQueueModel::loadDownloadQueue(QNNTPGrabGlue *glue)
-...
                       int ret = (((double)size - sizeRemaining) / size) * 100;
                       if (ret < 0 || ret > 100) {
                           qWarning("Invalid progress detected, size = %lli, size_remaining = %lli", size, sizeRemaining);
                           qDebug("Invalid progress detected, size = %lli, size_remaining = %lli", size, sizeRemaining);
+                      }
                       return qMin(100, ret);
-...
                       idx = createIndex(subject_node->row(), (int) DownloadQueueItem::FIELD_FILE_SIZE_REMAINING_STR, subject_node);
                       emit dataChanged(idx, idx);
                       emit requestColumnResize(DownloadQueueItem::FIELD_STATE_STR);
+                  }
                   void DownloadQueueModel::onFileAdded(QString collection_name, QString subject, QString poster, QDateTime stamp, quint64 file_size, quint64 total_size, quint64 total_size_remaining, QNNTPGrabGlue::TaskState state, int num_parts, QList groups)
-...
                           return;
+                      }
                       beginInsertRows(createIndex(collection_node->row(), 0, collection_node), collection_node->childCount(), collection_node->childCount());
                       DownloadQueueItem *file_node = new DownloadQueueItem(collection_node);
                       file_node->subject = subject;
                       file_node->poster = poster;
-...
                           file_node->sizeRemainingStr = QNNTPGrabGlue::utilsCalculateFileSize(0);
+                      }
                       QModelIndex idx_start = createIndex(file_node->row(), 0, file_node);
                       QModelIndex idx_end = createIndex(file_node->row(), DownloadQueueItem::NUM_FIELDS - 1, file_node);
                       emit dataChanged(idx_start, idx_end);
                       /* Update the parent */
                       collection_node->appendChild(file_node);
                       endInsertRows();
                       collection_node->size = total_size;
                       collection_node->sizeStr = QNNTPGrabGlue::utilsCalculateFileSize(total_size);
                       collection_node->sizeRemaining = total_size_remaining;
-...
                       idx = createIndex(collection_node->row(), (int) DownloadQueueItem::FIELD_FILE_SIZE_REMAINING_STR, collection_node);
                       emit dataChanged(idx, idx);
                       emit requestColumnResize(DownloadQueueItem::FIELD_STATE_STR);
+                  }
                   void DownloadQueueModel::onFileRemoved(QString collection_name, QString subject, quint64 total_size, quint64 total_size_remaining)
-...
                           return;
+                      }
                       beginRemoveRows(createIndex(collection_node->row(), 0, collection_node), subject_node->row(), subject_node->row());
                       collection_node->size = total_size;
                       collection_node->sizeStr = QNNTPGrabGlue::utilsCalculateFileSize(total_size);
                       collection_node->sizeRemaining = total_size_remaining;
-...
                       collection_node->progress = calculateProgress(total_size, total_size_remaining);
                       collection_node->removeChild(subject_node);
                       delete subject_node;
                       QModelIndex idx_start = createIndex(subject_node->row(), 0, subject_node);
                       QModelIndex idx_end = createIndex(subject_node->row(), DownloadQueueItem::NUM_FIELDS - 1, subject_node);
                       emit dataChanged(idx_start, idx_end);
                       endRemoveRows();
                       delete subject_node;
                       QModelIndex idx = createIndex(collection_node->row(), (int) DownloadQueueItem::FIELD_STATE_STR, collection_node);
                       emit dataChanged(idx, idx);
-...
                   void DownloadQueueModel::onCollectionAdded(QString collection_name, QString poster)
+                  {
                       beginInsertRows(QModelIndex(), rootItem->childCount(), rootItem->childCount());
                       DownloadQueueItem *collection_node = new DownloadQueueItem(rootItem);
                       collection_node->subject = collection_name;
                       collection_node->poster = poster;
                       rootItem->appendChild(collection_node);
                       QModelIndex idx_start = createIndex(collection_node->row(), 0, collection_node);
                       QModelIndex idx_end = createIndex(collection_node->row(), DownloadQueueItem::NUM_FIELDS - 1, collection_node);
                       emit dataChanged(idx_start, idx_end);
                       endInsertRows();
                       QModelIndex idx_begin = createIndex(collection_node->row(), (int) DownloadQueueItem::FIELD_STATE_STR, collection_node);
                       QModelIndex idx_end = createIndex(collection_node->row(), (int) DownloadQueueItem::NUM_FIELDS, collection_node);
                       emit dataChanged(idx_begin, idx_end);
                       emit requestColumnResize(DownloadQueueItem::FIELD_SUBJECT);
+                  }
                   void DownloadQueueModel::onCollectionRemoved(QString collection_name)
-...
                           return;
+                      }
                       /* Does the collection still contain files? */
                       if (collection_node->childCount() != 0) {
                           qWarning("Request received to remove collection, but collection is not empty");
                           return;
+                      }
                       beginRemoveRows(createIndex(rootItem->row(), 0, rootItem), collection_node->row(), collection_node->row());
                       rootItem->removeChild(collection_node);
                       //delete collection_node;       /* Disabled for now as this causes a segfault later on */
                       QModelIndex idx_start = createIndex(collection_node->row(), 0, collection_node);
                       QModelIndex idx_end = createIndex(collection_node->row(), DownloadQueueItem::NUM_FIELDS - 1, collection_node);
                       emit dataChanged(idx_start, idx_end);
                       delete collection_node;
                       endRemoveRows();
+                  }
                   void DownloadQueueModel::onCollectionModified(QString collection_name, QString poster)
-...
                       QModelIndex parent_idx = createIndex(rootItem->row(), 0, rootItem);
                       int new_pos_in_model = qMin(rootItem->childCount(), ((old_position < new_position) ? new_position + 1 : new_position));
                       if (!beginMoveRows(parent_idx, old_position, old_position, parent_idx, new_pos_in_model)) {
                       if (!beginMoveRows(QModelIndex(), old_position, old_position, QModelIndex(), new_pos_in_model)) {
                           qWarning("beginMoveRows failed\n");
                           return;
+                      }

Also available in: Unified diff