X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fflatproxymodel.cpp;h=d722c18f662cf684c1cb7eb95aa920f6efdb836a;hb=8582c2ad5708a1972c85bea1cf8d81ad3ece4814;hp=0894f89c2fd88c59d7086a1dc7d66f772588d94b;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce;p=quassel.git

diff --git a/src/uisupport/flatproxymodel.cpp b/src/uisupport/flatproxymodel.cpp
index 0894f89c..d722c18f 100644
--- a/src/uisupport/flatproxymodel.cpp
+++ b/src/uisupport/flatproxymodel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "flatproxymodel.h"
@@ -24,8 +24,7 @@
 #include <QDebug>
 
 FlatProxyModel::FlatProxyModel(QObject *parent)
-    : QAbstractProxyModel(parent),
-    _rootSourceItem(0)
+    : QAbstractProxyModel(parent)
 {
 }
 
@@ -33,7 +32,7 @@ FlatProxyModel::FlatProxyModel(QObject *parent)
 QModelIndex FlatProxyModel::mapFromSource(const QModelIndex &sourceIndex) const
 {
     if (!sourceIndex.isValid())
-        return QModelIndex();
+        return {};
 
     SourceItem *sourceItem = sourceToInternal(sourceIndex);
     Q_ASSERT(sourceItem);
@@ -44,7 +43,7 @@ QModelIndex FlatProxyModel::mapFromSource(const QModelIndex &sourceIndex) const
 QModelIndex FlatProxyModel::mapToSource(const QModelIndex &proxyIndex) const
 {
     if (!proxyIndex.isValid())
-        return QModelIndex();
+        return {};
 
     Q_ASSERT(proxyIndex.model() == this);
     Q_ASSERT(_rootSourceItem);
@@ -64,7 +63,7 @@ QModelIndex FlatProxyModel::mapToSource(const QModelIndex &proxyIndex) const
 
     qWarning() << "FlatProxyModel::mapToSource(): couldn't find source index for" << proxyIndex;
     Q_ASSERT(false);
-    return QModelIndex(); // make compilers happy :)
+    return {}; // make compilers happy :)
 }
 
 
@@ -96,7 +95,7 @@ QItemSelection FlatProxyModel::mapSelectionFromSource(const QItemSelection &sour
         QModelIndex currentParent = currentRange.topLeft().parent();
         Q_ASSERT(currentParent == currentRange.bottomRight().parent());
 
-        SourceItem *parentItem = 0;
+        SourceItem *parentItem = nullptr;
         if (!itemLookup.contains(currentParent)) {
             parentItem = sourceToInternal(currentParent);
             itemLookup[currentParent] = parentItem;
@@ -178,9 +177,9 @@ QItemSelection FlatProxyModel::mapSelectionToSource(const QItemSelection &proxyS
     for (int i = 0; i < proxySelection.count(); i++) {
         const QItemSelectionRange &range = proxySelection[i];
 
-        SourceItem *topLeftItem = 0;
-        SourceItem *bottomRightItem = 0;
-        SourceItem *currentItem = static_cast<SourceItem *>(range.topLeft().internalPointer());
+        SourceItem *topLeftItem = nullptr;
+        SourceItem *bottomRightItem = nullptr;
+        auto *currentItem = static_cast<SourceItem *>(range.topLeft().internalPointer());
         int row = range.topLeft().row();
         int left = range.topLeft().column();
         int right = range.bottomRight().column();
@@ -195,8 +194,8 @@ QItemSelection FlatProxyModel::mapSelectionToSource(const QItemSelection &proxyS
             else {
                 Q_ASSERT(topLeftItem && bottomRightItem);
                 sourceSelection << QItemSelectionRange(mapToSource(createIndex(topLeftItem->pos(), left, topLeftItem)), mapToSource(createIndex(bottomRightItem->pos(), right, bottomRightItem)));
-                topLeftItem = 0;
-                bottomRightItem = 0;
+                topLeftItem = nullptr;
+                bottomRightItem = nullptr;
             }
 
             // update loop vars
@@ -204,8 +203,9 @@ QItemSelection FlatProxyModel::mapSelectionToSource(const QItemSelection &proxyS
             row++;
         }
 
-        Q_ASSERT(topLeftItem && bottomRightItem); // there should be one range left.
-        sourceSelection << QItemSelectionRange(mapToSource(createIndex(topLeftItem->pos(), left, topLeftItem)), mapToSource(createIndex(bottomRightItem->pos(), right, bottomRightItem)));
+        if (topLeftItem && bottomRightItem) { // there should be one range left.
+            sourceSelection << QItemSelectionRange(mapToSource(createIndex(topLeftItem->pos(), left, topLeftItem)), mapToSource(createIndex(bottomRightItem->pos(), right, bottomRightItem)));
+        }
     }
 
     return sourceSelection;
@@ -215,7 +215,7 @@ QItemSelection FlatProxyModel::mapSelectionToSource(const QItemSelection &proxyS
 void FlatProxyModel::setSourceModel(QAbstractItemModel *sourceModel)
 {
     if (QAbstractProxyModel::sourceModel()) {
-        disconnect(QAbstractProxyModel::sourceModel(), 0, this, 0);
+        disconnect(QAbstractProxyModel::sourceModel(), nullptr, this, nullptr);
     }
 
     QAbstractProxyModel::setSourceModel(sourceModel);
@@ -270,7 +270,7 @@ void FlatProxyModel::insertSubTree(const QModelIndex &source_idx, bool emitInser
     SourceItem *lastItem = insertSubTreeHelper(newSubTree, newSubTree, source_idx);
 
     Q_ASSERT(lastItem);
-    Q_ASSERT(lastItem->next() == 0);
+    Q_ASSERT(lastItem->next() == nullptr);
 
     if (emitInsert)
         beginInsertRows(QModelIndex(), newSubTree->pos(), lastItem->pos());
@@ -309,7 +309,7 @@ void FlatProxyModel::insertSubTree(const QModelIndex &source_idx, bool emitInser
 FlatProxyModel::SourceItem *FlatProxyModel::insertSubTreeHelper(SourceItem *parentItem, SourceItem *lastItem_, const QModelIndex &source_idx)
 {
     SourceItem *lastItem = lastItem_;
-    SourceItem *newItem = 0;
+    SourceItem *newItem = nullptr;
     for (int row = 0; row < sourceModel()->rowCount(source_idx); row++) {
         newItem = new SourceItem(row, parentItem);
         newItem->setPos(lastItem->pos() + 1);
@@ -367,12 +367,12 @@ QModelIndex FlatProxyModel::index(int row, int column, const QModelIndex &parent
 {
     if (parent.isValid()) {
         qWarning() << "FlatProxyModel::index() called with valid parent:" << parent;
-        return QModelIndex();
+        return {};
     }
 
     if (!_rootSourceItem) {
         qWarning() << "FlatProxyModel::index() while model has no root Item";
-        return QModelIndex();
+        return {};
     }
 
     SourceItem *item = _rootSourceItem;
@@ -380,7 +380,7 @@ QModelIndex FlatProxyModel::index(int row, int column, const QModelIndex &parent
         item = item->findChild(row);
         if (!item) {
             qWarning() << "FlatProxyModel::index() no such row:" << row;
-            return QModelIndex();
+            return {};
         }
     }
 
@@ -393,7 +393,7 @@ QModelIndex FlatProxyModel::parent(const QModelIndex &index) const
 {
     Q_UNUSED(index)
     // this is a flat model
-    return QModelIndex();
+    return {};
 }
 
 
@@ -524,7 +524,7 @@ void FlatProxyModel::on_rowsAboutToBeInserted(const QModelIndex &parent, int sta
 
     SourceItem *nextItem = prevItem->next();
 
-    SourceItem *newItem = 0;
+    SourceItem *newItem = nullptr;
     int newPos = prevItem->pos() + 1;
     for (int row = start; row <= end; row++) {
         newItem = new SourceItem(row, sourceItem);
@@ -682,9 +682,7 @@ void FlatProxyModel::checkChildCount(const QModelIndex &index, const SourceItem
 //  SourceItem
 // ========================================
 FlatProxyModel::SourceItem::SourceItem(int row, SourceItem *parent)
-    : _parent(parent),
-    _pos(-1),
-    _next(0)
+    : _parent(parent)
 {
     if (parent) {
         parent->_childs.insert(row, this);