aboutsummaryrefslogtreecommitdiff
path: root/net/rclone-browser/files/patch-src_remote__widget.cpp
blob: ed9de46ee2c06e179cfd8542c1d156db43da84a2 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
--- src/remote_widget.cpp.orig	2017-03-11 22:16:36 UTC
+++ src/remote_widget.cpp
@@ -129,7 +129,7 @@ RemoteWidget::RemoteWidget(IconCache* iconCache, const
             UseRclonePassword(&process);
             process.setProgram(GetRclone());
             process.setArguments(QStringList() << "mkdir" << GetRcloneConf() << remote + ":" + folder);
-            process.setReadChannelMode(QProcess::MergedChannels);
+            process.setProcessChannelMode(QProcess::MergedChannels);
 
             ProgressDialog progress("New Folder", "Creating...", folderMsg, &process, this);
             if (progress.exec() == QDialog::Accepted)
@@ -158,7 +158,7 @@ RemoteWidget::RemoteWidget(IconCache* iconCache, const
                                  << GetRcloneConf()
                                  << remote + ":" + path
                                  << remote + ":" + model->path(index.parent()).filePath(name));
-            process.setReadChannelMode(QProcess::MergedChannels);
+            process.setProcessChannelMode(QProcess::MergedChannels);
 
             ProgressDialog progress("Rename", "Renaming...", pathMsg, &process, this);
             if (progress.exec() == QDialog::Accepted)
@@ -182,13 +182,13 @@ RemoteWidget::RemoteWidget(IconCache* iconCache, const
             UseRclonePassword(&process);
             process.setProgram(GetRclone());
             process.setArguments(QStringList() << (model->isFolder(index) ? "purge" : "delete") << GetRcloneConf() << remote + ":" + path);
-            process.setReadChannelMode(QProcess::MergedChannels);
+            process.setProcessChannelMode(QProcess::MergedChannels);
 
             ProgressDialog progress("Delete", "Deleting...", pathMsg, &process, this);
             if (progress.exec() == QDialog::Accepted)
             {
                 QModelIndex parent = index.parent();
-                QModelIndex next = parent.child(index.row() + 1, 0);
+                QModelIndex next = parent.model()->index(index.row() + 1, 0, parent);
                 ui.tree->selectionModel()->select(next.isValid() ? next : parent, QItemSelectionModel::SelectCurrent);
                 model->removeRow(index.row(), parent);
             }
@@ -281,7 +281,7 @@ RemoteWidget::RemoteWidget(IconCache* iconCache, const
         UseRclonePassword(&process);
         process.setProgram(GetRclone());
         process.setArguments(QStringList() << "size" << GetRcloneConf() << remote + ":" + path);
-        process.setReadChannelMode(QProcess::MergedChannels);
+        process.setProcessChannelMode(QProcess::MergedChannels);
 
         ProgressDialog progress("Get Size", "Calculating...", pathMsg, &process, this, false);
         progress.expand();
@@ -314,7 +314,7 @@ RemoteWidget::RemoteWidget(IconCache* iconCache, const
             UseRclonePassword(&process);
             process.setProgram(GetRclone());
             process.setArguments(QStringList() << GetRcloneConf() << e.getOptions());
-            process.setReadChannelMode(QProcess::MergedChannels);
+            process.setProcessChannelMode(QProcess::MergedChannels);
 
             ProgressDialog progress("Export", "Exporting...", dst, &process, this);
             file->setParent(&progress);