From: Kevin Ottens Date: Wed, 27 Dec 2023 18:08:36 +0000 (+0100) Subject: [dolphin] Don't rely on QByteArray -> const char * implicit conversion X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~7^2~110^2~4 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=17b913c3a79983c8a8320ae8c9ef5cd4984fc9fc;p=nextcloud-desktop.git [dolphin] Don't rely on QByteArray -> const char * implicit conversion Signed-off-by: Kevin Ottens --- diff --git a/shell_integration/dolphin/ownclouddolphinactionplugin.cpp b/shell_integration/dolphin/ownclouddolphinactionplugin.cpp index e7c2e7b84..75677996e 100644 --- a/shell_integration/dolphin/ownclouddolphinactionplugin.cpp +++ b/shell_integration/dolphin/ownclouddolphinactionplugin.cpp @@ -77,12 +77,12 @@ public: action->setDisabled(true); auto call = args.value(1).toLatin1(); connect(action, &QAction::triggered, [helper, call, files] { - helper->sendCommand(QByteArray(call + ":" + files + "\n")); + helper->sendCommand(QByteArray(call + ":" + files + "\n").constData()); }); } }); QTimer::singleShot(100, &loop, &QEventLoop::quit); // add a timeout to be sure we don't freeze dolphin - helper->sendCommand(QByteArray("GET_MENU_ITEMS:" + files + "\n")); + helper->sendCommand(QByteArray("GET_MENU_ITEMS:" + files + "\n").constData()); loop.exec(QEventLoop::ExcludeUserInputEvents); disconnect(con); if (menu->actions().isEmpty()) { @@ -111,20 +111,20 @@ public: auto shareAction = menu->addAction(helper->shareActionTitle()); connect(shareAction, &QAction::triggered, this, [localFile, helper] { - helper->sendCommand(QByteArray("SHARE:" + localFile.toUtf8() + "\n")); + helper->sendCommand(QByteArray("SHARE:" + localFile.toUtf8() + "\n").constData()); }); if (!helper->copyPrivateLinkTitle().isEmpty()) { auto copyPrivateLinkAction = menu->addAction(helper->copyPrivateLinkTitle()); connect(copyPrivateLinkAction, &QAction::triggered, this, [localFile, helper] { - helper->sendCommand(QByteArray("COPY_PRIVATE_LINK:" + localFile.toUtf8() + "\n")); + helper->sendCommand(QByteArray("COPY_PRIVATE_LINK:" + localFile.toUtf8() + "\n").constData()); }); } if (!helper->emailPrivateLinkTitle().isEmpty()) { auto emailPrivateLinkAction = menu->addAction(helper->emailPrivateLinkTitle()); connect(emailPrivateLinkAction, &QAction::triggered, this, [localFile, helper] { - helper->sendCommand(QByteArray("EMAIL_PRIVATE_LINK:" + localFile.toUtf8() + "\n")); + helper->sendCommand(QByteArray("EMAIL_PRIVATE_LINK:" + localFile.toUtf8() + "\n").constData()); }); } return { menuaction }; diff --git a/shell_integration/dolphin/ownclouddolphinoverlayplugin.cpp b/shell_integration/dolphin/ownclouddolphinoverlayplugin.cpp index 7c43b2349..ed28448a6 100644 --- a/shell_integration/dolphin/ownclouddolphinoverlayplugin.cpp +++ b/shell_integration/dolphin/ownclouddolphinoverlayplugin.cpp @@ -50,7 +50,7 @@ public: QDir localPath(url.toLocalFile()); const QByteArray localFile = localPath.canonicalPath().toUtf8(); - helper->sendCommand(QByteArray("RETRIEVE_FILE_STATUS:" + localFile + "\n")); + helper->sendCommand(QByteArray("RETRIEVE_FILE_STATUS:" + localFile + "\n").constData()); StatusMap::iterator it = m_status.find(localFile); if (it != m_status.constEnd()) {