From 1dbb15dd1cc6d436e88956f2ef368eec4bd57e99 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 4 May 2019 22:17:28 +0200
Subject: [PATCH] Don't use deprecated Qt features

---
 gui/mainwindow.cpp                              | 2 +-
 gui/renamefilesdialog.ui                        | 3 ---
 misc/utility.cpp                                | 2 +-
 renamingutility/filteredfilesystemitemmodel.cpp | 7 ++++---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 245cf2e..7330737 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -459,7 +459,7 @@ void MainWindow::selectNextFile(QItemSelectionModel *selectionModel, const QMode
             return;
         } else {
             // files and subdirectories have been fetched already
-            next = currentIndex.child(0, currentIndex.column());
+            next = currentIndex.model()->index(0, currentIndex.column(), currentIndex);
         }
     }
     if (!next.isValid()) {
diff --git a/gui/renamefilesdialog.ui b/gui/renamefilesdialog.ui
index f1045c5..192a20b 100644
--- a/gui/renamefilesdialog.ui
+++ b/gui/renamefilesdialog.ui
@@ -563,9 +563,6 @@
                 <property name="plainText">
                  <string/>
                 </property>
-                <property name="tabStopWidth">
-                 <number>15</number>
-                </property>
                </widget>
               </item>
              </layout>
diff --git a/misc/utility.cpp b/misc/utility.cpp
index 18a3ba1..e6076df 100644
--- a/misc/utility.cpp
+++ b/misc/utility.cpp
@@ -237,7 +237,7 @@ void printModelIndex(const QModelIndex &index, QString &res, int level)
             res += data;
         }
         const auto nextInCol = index.sibling(index.row(), index.column() + 1);
-        const auto child = index.child(0, 0);
+        const auto child = index.model()->index(0, 0, index);
         const auto next = index.sibling(index.row() + 1, 0);
         if (nextInCol.isValid()) {
             printModelIndex(nextInCol, res, level);
diff --git a/renamingutility/filteredfilesystemitemmodel.cpp b/renamingutility/filteredfilesystemitemmodel.cpp
index 681cd1d..c08eb45 100644
--- a/renamingutility/filteredfilesystemitemmodel.cpp
+++ b/renamingutility/filteredfilesystemitemmodel.cpp
@@ -15,7 +15,8 @@ FilteredFileSystemItemModel::FilteredFileSystemItemModel(ItemStatus statusFilter
 
 bool FilteredFileSystemItemModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
 {
-    const auto sourceIndex = sourceModel()->index(sourceRow, 0, sourceParent);
+    const auto *const sourceModel = this->sourceModel();
+    const auto sourceIndex = sourceModel->index(sourceRow, 0, sourceParent);
     if (!sourceIndex.isValid()) {
         return false;
     }
@@ -31,12 +32,12 @@ bool FilteredFileSystemItemModel::filterAcceptsRow(int sourceRow, const QModelIn
         return false;
     }
 
-    auto child = sourceIndex.child(0, 0);
+    auto child = sourceModel->index(0, 0, sourceIndex);
     while (child.isValid()) {
         if (filterAcceptsRow(child.row(), sourceIndex)) {
             return true;
         }
-        child = sourceIndex.child(child.row() + 1, 0);
+        child = sourceModel->index(child.row() + 1, 0, sourceIndex);
     }
     return false;
 }