From aff30cc9e892f4918bb4f65cd8048abb9357d22d Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Sun, 4 Dec 2022 06:39:08 -0600
Subject: [PATCH] cleaning up moveRows to be easier to maintain

---
 src/serviceitemmodel.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/serviceitemmodel.cpp b/src/serviceitemmodel.cpp
index d7c92fe..5955c8d 100644
--- a/src/serviceitemmodel.cpp
+++ b/src/serviceitemmodel.cpp
@@ -326,16 +326,17 @@ bool ServiceItemModel::moveRows(int sourceIndex, int destIndex, int count) {
   qDebug() << index(sourceIndex).row();
   qDebug() << index(destIndex).row();
 
-  if (sourceIndex < 0 || sourceIndex == destIndex ||
-      destIndex == -1 || destIndex > rowCount() ||
-      sourceIndex >= rowCount()) {
+  const int lastIndex = rowCount() - 1;
+
+  if (sourceIndex == destIndex
+      || (sourceIndex < 0 || sourceIndex > lastIndex)
+      || (destIndex < 0 || destIndex > lastIndex)) {
     return false;
-  };
+  }
 
   const QModelIndex parent = index(sourceIndex).parent();
   const bool isMoveDown = destIndex > sourceIndex;
 
-
   if (!beginMoveRows(parent, sourceIndex, sourceIndex + count - 1,
                      parent, isMoveDown ? destIndex + 1 : destIndex)) {
     qDebug() << "Can't move rows";