summaryrefslogtreecommitdiff
path: root/net/rclone-browser/files
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2019-10-01 04:13:31 +0000
committerTobias C. Berner <tcberner@FreeBSD.org>2019-10-01 04:13:31 +0000
commitc45de9579f6ec97574056dd335df02031ccd00ad (patch)
treebf42b7c476faa7a6183d0feaa4c65bb90053847d /net/rclone-browser/files
parentirc/py-limnoria: Backport Web plugin bugfixes (diff)
Qt5 update to 5.13.0
For new features, check: https://wiki.qt.io/New_Features_in_Qt_5.13 Thanks to adridg who helped to fix a lot of packages. Exp-run by: antoine PR: 238782
Notes
Notes: svn path=/head/; revision=513447
Diffstat (limited to 'net/rclone-browser/files')
-rw-r--r--net/rclone-browser/files/patch-src_item__model.cpp67
-rw-r--r--net/rclone-browser/files/patch-src_job__widget.cpp11
-rw-r--r--net/rclone-browser/files/patch-src_main__window.cpp38
-rw-r--r--net/rclone-browser/files/patch-src_mount__widget.cpp11
-rw-r--r--net/rclone-browser/files/patch-src_remote__widget.cpp54
-rw-r--r--net/rclone-browser/files/patch-src_stream__widget.cpp11
-rw-r--r--net/rclone-browser/files/patch-src_transfer__dialog.cpp11
7 files changed, 203 insertions, 0 deletions
diff --git a/net/rclone-browser/files/patch-src_item__model.cpp b/net/rclone-browser/files/patch-src_item__model.cpp
new file mode 100644
index 000000000000..17636c769b0d
--- /dev/null
+++ b/net/rclone-browser/files/patch-src_item__model.cpp
@@ -0,0 +1,67 @@
+--- src/item_model.cpp.orig 2017-03-11 22:16:36.000000000 +0000
++++ src/item_model.cpp 2019-09-01 18:49:37.991420000 +0000
+@@ -2,6 +2,8 @@
+ #include "icon_cache.h"
+ #include "utils.h"
+
++#include <algorithm>
++
+ namespace
+ {
+ static void advanceSpinner(QString& text)
+@@ -10,7 +12,7 @@
+ QChar current = text[spinnerPos];
+ static const QChar spinner[] = { '-', '\\', '|', '/' };
+ size_t spinnerCount = sizeof(spinner) / sizeof(*spinner);
+- const QChar* found = qFind(spinner, spinner + spinnerCount, current);
++ const QChar* found = std::find(spinner, spinner + spinnerCount, current);
+ size_t idx = found - spinner;
+ size_t next = idx == spinnerCount - 1 ? 0 : idx + 1;
+ text[spinnerPos] = spinner[next];
+@@ -161,7 +163,7 @@
+ {
+ Item* item = get(index);
+ item->name = name;
+- item->path = item->parent->path.filePath(item->name);
++ item->path.setPath(item->parent->path.filePath(item->name));
+ emit dataChanged(index, index, QVector<int>{Qt::DisplayRole});
+ }
+
+@@ -182,7 +184,7 @@
+ Item* item = new Item();
+ item->isFolder = true;
+ item->name = name;
+- item->path = path;
++ item->path.setPath(path);
+ item->parent = mRoot;
+ mRoot->childs.append(item);
+
+@@ -500,7 +502,7 @@
+ auto it = existing.find(item->name);
+ if (it == existing.end())
+ {
+- item->path = parent->path.filePath(item->name);
++ item->path.setPath(parent->path.filePath(item->name));
+ if (!item->isFolder && mFileIcons)
+ {
+ QString ext = QFileInfo(item->name).suffix();
+@@ -561,8 +563,8 @@
+ }
+ };
+
+- QObject::connect(lsd, static_cast<void(QProcess::*)(int)>(&QProcess::finished), this, rcloneFinished);
+- QObject::connect(lsl, static_cast<void(QProcess::*)(int)>(&QProcess::finished), this, rcloneFinished);
++ QObject::connect(lsd, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, rcloneFinished);
++ QObject::connect(lsl, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, rcloneFinished);
+
+ QObject::connect(lsd, &QProcess::readyRead, this, [=]()
+ {
+@@ -617,7 +619,7 @@
+
+ void ItemModel::sortRecursive(Item* item, const ItemSorter& sorter)
+ {
+- qSort(item->childs.begin(), item->childs.end(), sorter);
++ std::sort(item->childs.begin(), item->childs.end(), sorter);
+
+ for (auto child : item->childs)
+ {
diff --git a/net/rclone-browser/files/patch-src_job__widget.cpp b/net/rclone-browser/files/patch-src_job__widget.cpp
new file mode 100644
index 000000000000..2088f79f56bc
--- /dev/null
+++ b/net/rclone-browser/files/patch-src_job__widget.cpp
@@ -0,0 +1,11 @@
+--- src/job_widget.cpp.orig 2017-03-11 22:16:36 UTC
++++ src/job_widget.cpp
+@@ -162,7 +162,7 @@ JobWidget::JobWidget(QProcess* process, const QString&
+ }
+ });
+
+- QObject::connect(mProcess, static_cast<void(QProcess::*)(int)>(&QProcess::finished), this, [=](int status)
++ QObject::connect(mProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [=](int status)
+ {
+ mProcess->deleteLater();
+ for (auto label : mActive)
diff --git a/net/rclone-browser/files/patch-src_main__window.cpp b/net/rclone-browser/files/patch-src_main__window.cpp
new file mode 100644
index 000000000000..32e81e9b0cc4
--- /dev/null
+++ b/net/rclone-browser/files/patch-src_main__window.cpp
@@ -0,0 +1,38 @@
+--- src/main_window.cpp.orig 2017-03-11 22:16:36 UTC
++++ src/main_window.cpp
+@@ -193,7 +193,7 @@ void MainWindow::rcloneGetVersion()
+
+ QProcess* p = new QProcess();
+
+- QObject::connect(p, static_cast<void(QProcess::*)(int)>(&QProcess::finished), this, [=](int code)
++ QObject::connect(p, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [=](int code)
+ {
+ if (code == 0)
+ {
+@@ -241,7 +241,7 @@ void MainWindow::rcloneConfig()
+ {
+ QProcess* p = new QProcess(this);
+
+- QObject::connect(p, static_cast<void(QProcess::*)(int)>(&QProcess::finished), this, [=](int code)
++ QObject::connect(p, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [=](int code)
+ {
+ if (code == 0)
+ {
+@@ -297,7 +297,7 @@ void MainWindow::rcloneListRemotes()
+
+ QProcess* p = new QProcess();
+
+- QObject::connect(p, static_cast<void(QProcess::*)(int)>(&QProcess::finished), this, [=](int code)
++ QObject::connect(p, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [=](int code)
+ {
+ if (code == 0)
+ {
+@@ -570,7 +570,7 @@ void MainWindow::addStream(const QString& remote, cons
+ auto rclone = new QProcess();
+ rclone->setStandardOutputProcess(player);
+
+- QObject::connect(player, static_cast<void(QProcess::*)(int)>(&QProcess::finished), this, [=](int status)
++ QObject::connect(player, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [=](int status)
+ {
+ player->deleteLater();
+ if (status != 0 && player->error() == QProcess::FailedToStart)
diff --git a/net/rclone-browser/files/patch-src_mount__widget.cpp b/net/rclone-browser/files/patch-src_mount__widget.cpp
new file mode 100644
index 000000000000..0f3e3c8c77ff
--- /dev/null
+++ b/net/rclone-browser/files/patch-src_mount__widget.cpp
@@ -0,0 +1,11 @@
+--- src/mount_widget.cpp.orig 2017-03-11 22:16:36 UTC
++++ src/mount_widget.cpp
+@@ -57,7 +57,7 @@ MountWidget::MountWidget(QProcess* process, const QStr
+ }
+ });
+
+- QObject::connect(mProcess, static_cast<void(QProcess::*)(int)>(&QProcess::finished), this, [=](int status)
++ QObject::connect(mProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [=](int status)
+ {
+ mProcess->deleteLater();
+ mRunning = false;
diff --git a/net/rclone-browser/files/patch-src_remote__widget.cpp b/net/rclone-browser/files/patch-src_remote__widget.cpp
new file mode 100644
index 000000000000..ed9de46ee2c0
--- /dev/null
+++ b/net/rclone-browser/files/patch-src_remote__widget.cpp
@@ -0,0 +1,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);
diff --git a/net/rclone-browser/files/patch-src_stream__widget.cpp b/net/rclone-browser/files/patch-src_stream__widget.cpp
new file mode 100644
index 000000000000..f1133b273734
--- /dev/null
+++ b/net/rclone-browser/files/patch-src_stream__widget.cpp
@@ -0,0 +1,11 @@
+--- src/stream_widget.cpp.orig 2017-03-11 22:16:36 UTC
++++ src/stream_widget.cpp
+@@ -58,7 +58,7 @@ StreamWidget::StreamWidget(QProcess* rclone, QProcess*
+ }
+ });
+
+- QObject::connect(mRclone, static_cast<void(QProcess::*)(int)>(&QProcess::finished), this, [=]()
++ QObject::connect(mRclone, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [=]()
+ {
+ mRclone->deleteLater();
+ mRunning = false;
diff --git a/net/rclone-browser/files/patch-src_transfer__dialog.cpp b/net/rclone-browser/files/patch-src_transfer__dialog.cpp
new file mode 100644
index 000000000000..ca282d3e6a51
--- /dev/null
+++ b/net/rclone-browser/files/patch-src_transfer__dialog.cpp
@@ -0,0 +1,11 @@
+--- src/transfer_dialog.cpp.orig 2017-03-11 22:16:36 UTC
++++ src/transfer_dialog.cpp
+@@ -131,7 +131,7 @@ QString TransferDialog::getMode() const
+ return "Sync";
+ }
+
+- return QString::null;
++ return QString();
+ }
+
+ QString TransferDialog::getSource() const