diff --git a/cli/kdeconnect-cli.cpp b/cli/kdeconnect-cli.cpp index b5eb9c6a9..adad7007b 100644 --- a/cli/kdeconnect-cli.cpp +++ b/cli/kdeconnect-cli.cpp @@ -110,9 +110,8 @@ int main(int argc, char** argv) QTextStream(stderr) << i18n("No device specified") << endl; } device = parser.value("device"); - QUrl url; if(parser.isSet("share")) { - url = QUrl::fromUserInput(parser.value("share"), QDir::currentPath()); + QUrl url = QUrl::fromUserInput(parser.value("share"), QDir::currentPath()); parser.clearPositionalArguments(); if(!url.isEmpty() && !device.isEmpty()) { QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.kdeconnect", "/modules/kdeconnect/devices/"+device+"/share", "org.kde.kdeconnect.device.share", "shareUrl"); diff --git a/core/filetransferjob.cpp b/core/filetransferjob.cpp index 0e21af013..77cdf45ff 100644 --- a/core/filetransferjob.cpp +++ b/core/filetransferjob.cpp @@ -80,7 +80,7 @@ void FileTransferJob::startTransfer() mTime = QTime::currentTime(); description(this, i18n("Receiving file over KDE-Connect"), QPair(i18nc("File transfer origin", "From"), - QString(mDeviceName)), + mDeviceName), QPair(i18nc("File transfer destination", "To"), mDestination.toLocalFile())); mReply = Daemon::instance()->networkAccessManager()->put(QNetworkRequest(mDestination), mOrigin.data()); diff --git a/core/networkpackage.cpp b/core/networkpackage.cpp index 64cfab764..8bdc2ad20 100644 --- a/core/networkpackage.cpp +++ b/core/networkpackage.cpp @@ -59,8 +59,8 @@ void NetworkPackage::createIdentityPackage(NetworkPackage* np) np->set("deviceName", config->name()); np->set("deviceType", config->deviceType()); np->set("protocolVersion", NetworkPackage::ProtocolVersion); - np->set("SupportedIncomingInterfaces", PluginLoader::instance()->incomingInterfaces().join(",")); - np->set("SupportedOutgoingInterfaces", PluginLoader::instance()->outgoingInterfaces().join(",")); + np->set("SupportedIncomingInterfaces", PluginLoader::instance()->incomingInterfaces()); + np->set("SupportedOutgoingInterfaces", PluginLoader::instance()->outgoingInterfaces()); //qCDebug(KDECONNECT_CORE) << "createIdentityPackage" << np->serialize(); }