diff --git a/src/kjotsedit.cpp b/src/kjotsedit.cpp --- a/src/kjotsedit.cpp +++ b/src/kjotsedit.cpp @@ -299,15 +299,13 @@ void KJotsEdit::insertFromMimeData(const QMimeData *source) { - if (source->formats().contains(QLatin1String("kjots/internal_link"))) { - insertHtml(QLatin1String(source->data(QLatin1String("kjots/internal_link")))); + if (source->formats().contains(QStringLiteral("kjots/internal_link"))) { + insertHtml(source->data(QStringLiteral("kjots/internal_link"))); } else if (source->hasUrls()) { const QList urls = source->urls(); for (const QUrl &url : urls) { if (url.isValid()) { - QString html = QString::fromLatin1("%2 ") - .arg(QString::fromUtf8(url.toEncoded())) - .arg(url.toString(QUrl::RemovePassword)); + QString html = QStringLiteral("%2").arg(QString::fromUtf8(url.toEncoded()), url.toString(QUrl::RemovePassword)); insertHtml(html); } } diff --git a/src/kjotstreeview.cpp b/src/kjotstreeview.cpp --- a/src/kjotstreeview.cpp +++ b/src/kjotstreeview.cpp @@ -169,40 +169,19 @@ void KJotsTreeView::copyLinkAddress() { - QModelIndexList rows = selectionModel()->selectedRows(); - + const QModelIndexList rows = selectionModel()->selectedRows(); if (rows.size() != 1) { return; } + const QModelIndex idx = rows.at(0); - QModelIndex idx = rows.at(0); - - QString title = idx.data().toString(); + const QString title = idx.data().toString(); + const QString link = QStringLiteral("%2 ").arg(idx.data(KJotsModel::UrlRole).toString(), title); Item item = idx.data(KJotsModel::ItemRole).value(); QMimeData *mimeData = new QMimeData(); - - QString link; - if (item.isValid()) { - Q_ASSERT(item.hasPayload()); - if (!item.hasPayload()) { - return; - } - - link = QString::fromLatin1("%2").arg(item.url().url()).arg(title); - } else { - Collection col = idx.data(KJotsModel::CollectionRole).value(); - - Q_ASSERT(col.isValid()); - if (!col.isValid()) { - return; - } - - link = QString::fromLatin1("%2").arg(col.url().url()).arg(title); - } - - mimeData->setData(QLatin1String("kjots/internal_link"), link.toUtf8()); + mimeData->setData(QStringLiteral("kjots/internal_link"), link.toUtf8()); mimeData->setText(title); QApplication::clipboard()->setMimeData(mimeData); }