Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:wolfi323:branches:home:wolfi323:branches:KDE:Frameworks5
kget5
multiseg.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File multiseg.patch of Package kget5
diff --git a/ui/metalinkcreator/metalinker.cpp b/ui/metalinkcreator/metalinker.cpp index 377d11ae..520c60bc 100644 --- a/ui/metalinkcreator/metalinker.cpp +++ b/ui/metalinkcreator/metalinker.cpp @@ -1389,7 +1389,7 @@ bool KGetMetalink::HttpLinkHeader::operator<(const HttpLinkHeader &other) const void KGetMetalink::HttpLinkHeader::parseHeaderLine(const QString &line) { - url = line.mid(line.indexOf("<") + 1,line.indexOf(">") -1).trimmed(); qDebug() << "KGetMetalink::HttpLinkHeader::parseHeaderline(), line=" << line << ", url=" << url; //QUrl(line.mid(line.indexOf("<") + 1,line.indexOf(">") -1).trimmed()); + url = QUrl(line.mid(line.indexOf("<") + 1,line.indexOf(">") -1).trimmed()); qDebug() << "KGetMetalink::HttpLinkHeader::parseHeaderline(), line=" << line << ", url=" << url; //QUrl(line.mid(line.indexOf("<") + 1,line.indexOf(">") -1).trimmed()); const QList<QString> attribList = line.split(";"); foreach (const QString str, attribList) { diff --git a/transfer-plugins/bittorrent/bttransfer.cpp b/transfer-plugins/bittorrent/bttransfer.cpp index b5f804bd..98aa071c 100644 --- a/transfer-plugins/bittorrent/bttransfer.cpp +++ b/transfer-plugins/bittorrent/bttransfer.cpp @@ -260,7 +260,7 @@ void BTTransfer::addTracker(const QString &url) return; } - torrent->getTrackersList()->addTracker(url,true); + torrent->getTrackersList()->addTracker(QUrl(url),true); } /**Private functions**/ diff --git a/extensions/konqueror/kget_plug_in.cpp b/extensions/konqueror/kget_plug_in.cpp index f6cc8ead..24356162 100644 --- a/extensions/konqueror/kget_plug_in.cpp +++ b/extensions/konqueror/kget_plug_in.cpp @@ -206,7 +206,7 @@ void KGetPlugin::getLinks(bool selectedOnly) attr = QL1S("src"); else if (element.hasAttribute(QL1S("data"))) attr = QL1S("data"); - const QUrl resolvedUrl (baseUrl.resolved(element.attribute(attr))); qDebug() << "KGetPLugin::getLinks() resolvedUrl=" << resolvedUrl; //fixed(?): const QUrl resolvedUrl (baseUrl.resolved(QUrl::fromUserInput(element.attribute(attr)))); + const QUrl resolvedUrl (baseUrl.resolved(QUrl::fromUserInput(element.attribute(attr)))); qDebug() << "KGetPLugin::getLinks() resolvedUrl=" << resolvedUrl; // Only select valid and non-local links for download... if (resolvedUrl.isValid() && !resolvedUrl.isLocalFile() && !resolvedUrl.host().isEmpty()) { if (element.hasAttribute(QL1S("type"))) diff --git a/transfer-plugins/bittorrent/btsettingswidget.cpp b/transfer-plugins/bittorrent/btsettingswidget.cpp index 1c185f18..09aa48ad 100644 --- a/transfer-plugins/bittorrent/btsettingswidget.cpp +++ b/transfer-plugins/bittorrent/btsettingswidget.cpp @@ -60,8 +60,8 @@ void BTSettingsWidget::defaults() portBox->setValue(BittorrentSettings::port()); uploadBox->setValue(BittorrentSettings::uploadLimit()); downloadBox->setValue(BittorrentSettings::downloadLimit()); - torrentEdit->setUrl(BittorrentSettings::torrentDir()); - tempEdit->setUrl(BittorrentSettings::tmpDir()); + torrentEdit->setUrl(QUrl::fromLocalFile(BittorrentSettings::torrentDir())); qDebug() << "torrentEdit:" << QUrl::fromLocalFile(BittorrentSettings::torrentDir()); + tempEdit->setUrl(QUrl::fromLocalFile(BittorrentSettings::tmpDir())); qDebug() << "tmpEdit" << QUrl::fromLocalFile(BittorrentSettings::tmpDir()); preallocBox->setChecked(BittorrentSettings::preAlloc()); utpBox->setChecked(BittorrentSettings::enableUTP()); } diff --git a/mainwindow.cpp b/mainwindow.cpp index c993fb9c..b0c0b86a 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1205,14 +1205,14 @@ void MainWindow::dropEvent(QDropEvent * event) KGuiItem(i18n("&Load transfer list"), QIcon::fromTheme("list-add")), KStandardGuiItem::cancel()); if (msgBoxResult == 3) //Download - NewTransferDialogHandler::showNewTransferDialog(list.first().url()); + NewTransferDialogHandler::showNewTransferDialog(list.first()); if (msgBoxResult == 4) //Load KGet::load(list.first().url()); } else { if (list.count() == 1) - NewTransferDialogHandler::showNewTransferDialog(list.first().url()); + NewTransferDialogHandler::showNewTransferDialog(list.first()); else NewTransferDialogHandler::showNewTransferDialog(list); } diff --git a/ui/signaturedlg.cpp b/ui/signaturedlg.cpp index 19fdeb63..9b35264d 100644 --- a/ui/signaturedlg.cpp +++ b/ui/signaturedlg.cpp @@ -96,7 +96,7 @@ void SignatureDlg::textChanged() void SignatureDlg::loadSignatureClicked() { - const QUrl url = QFileDialog::getOpenFileUrl(this, i18n("Load Signature File"), KGet::generalDestDir(), "*.asc|" + i18n("Detached OpenPGP ASCII signature (*.asc)") + '\n' + + const QUrl url = QFileDialog::getOpenFileUrl(this, i18n("Load Signature File"), QUrl::fromLocalFile(KGet::generalDestDir()), "*.asc|" + i18n("Detached OpenPGP ASCII signature (*.asc)") + '\n' + "*.sig|" + i18n("Detached OpenPGP binary signature (*.sig)")); if (url.isEmpty()) { return; --- a/ui/linkview/kget_linkview.cpp +++ b/ui/linkview/kget_linkview.cpp @@ -170,13 +170,13 @@ void KGetLinkView::showLinks(const QStringList &links, bool urlRequestVisible) const int count = items.count(); int index = items.indexOf(QLatin1String("url")); if (index > -1 && index+1 < count) - url = items.at(index+1); + url = QUrl(items.at(index+1)); index = items.indexOf(QLatin1String("type")); if (index > -1 && index+1 < count) mt = KMimeType::mimeType(items.at(index+1)); } else { - url = linkitem; - mt = KMimeType::findByUrl(linkitem, 0, true, true); + url = QUrl(linkitem); + mt = KMimeType::findByUrl(QUrl(linkitem), 0, true, true); } qCDebug(KGET_DEBUG) << "Adding:" << linkitem; diff --git a/ui/history/transferhistoryitemdelegate.cpp b/ui/history/transferhistoryitemdelegate.cpp index 981ad503..d9a09301 100644 --- a/ui/history/transferhistoryitemdelegate.cpp +++ b/ui/history/transferhistoryitemdelegate.cpp @@ -87,7 +87,7 @@ void TransferHistoryItemDelegate::paint(QPainter *painter, style->drawPrimitive(QStyle::PE_PanelItemViewItem, &opt, painter, opt.widget); const QAbstractItemModel *model = static_cast <const QAbstractItemModel *> (index.model()); - QUrl url(model->data(index, TransferHistoryCategorizedDelegate::RoleUrl).toString()); + QUrl url(model->data(index, TransferHistoryCategorizedDelegate::RoleUrl).toUrl()); QString name = url.path().mid(url.path().lastIndexOf("/") + 1); QIcon icon(KIO::pixmapForUrl( model->data(index, TransferHistoryCategorizedDelegate::RoleDest).toUrl(), @@ -194,7 +194,7 @@ void TransferHistoryItemDelegate::slotDownload() const QAbstractItemModel *model = static_cast <const QAbstractItemModel *> (m_selectedIndex.model()); NewTransferDialogHandler::showNewTransferDialog(model->data(m_selectedIndex, - TransferHistoryCategorizedDelegate::RoleUrl).toString()); + TransferHistoryCategorizedDelegate::RoleUrl).toUrl()); } void TransferHistoryItemDelegate::slotDeleteTransfer() diff --git a/ui/history/transferhistory.cpp b/ui/history/transferhistory.cpp index 415fe193..04674050 100644 --- a/ui/history/transferhistory.cpp +++ b/ui/history/transferhistory.cpp @@ -169,7 +170,8 @@ void TransferHistory::slotWriteDefault() void TransferHistory::slotDownload() { if (!m_iconModeEnabled) { - NewTransferDialogHandler::showNewTransferDialog(((RangeTreeWidget *) m_view)->currentItem(0)->text()); + qDebug() << "Transfer::slotDownload(), url=" << QUrl(((RangeTreeWidget *) m_view)->currentItem(0)->text()); + NewTransferDialogHandler::showNewTransferDialog(QUrl(((RangeTreeWidget *) m_view)->currentItem(0)->text())); } } diff --git a/ui/transfersettingsdialog.cpp b/ui/transfersettingsdialog.cpp index 8dcabbf2..691f2b3e 100644 --- a/ui/transfersettingsdialog.cpp +++ b/ui/transfersettingsdialog.cpp @@ -39,7 +39,7 @@ TransferSettingsDialog::TransferSettingsDialog(QWidget *parent, TransferHandler ui.downloadSpin->setValue(m_transfer->downloadLimit(Transfer::VisibleSpeedLimit)); ui.uploadSpin->setValue(m_transfer->uploadLimit(Transfer::VisibleSpeedLimit)); ui.ratioSpin->setValue(m_transfer->maximumShareRatio()); - ui.destination->setUrl(m_transfer->directory().toString()); + ui.destination->setUrl(m_transfer->directory()); ui.destination->lineEdit()->setReadOnly(true); ui.rename->setIcon(QIcon::fromTheme("edit-rename")); ui.mirrors->setIcon(QIcon::fromTheme("download")); diff --git a/transfer-plugins/mirrorsearch/mirrorsearchtransferdatasource.cpp b/transfer-plugins/mirrorsearch/mirrorsearchtransferdatasource.cpp index b1d0ddc0..a8c6c446 100644 --- a/transfer-plugins/mirrorsearch/mirrorsearchtransferdatasource.cpp +++ b/transfer-plugins/mirrorsearch/mirrorsearchtransferdatasource.cpp @@ -25,7 +25,7 @@ void MirrorSearchTransferDataSource::start() { qCDebug(KGET_DEBUG); if(!m_filename.isEmpty()) - MirrorSearch (m_filename, this, SLOT(slotSearchUrls(QList<QUrl>&))); + MirrorSearch (QUrl::fromLocalFile(m_filename), this, SLOT(slotSearchUrls(QList<QUrl>&))); } void MirrorSearchTransferDataSource::stop() diff --git a/transfer-plugins/metalink/metalinkhttp.cpp b/transfer-plugins/metalink/metalinkhttp.cpp index c92529a2..00d8a5a9 100644 --- a/transfer-plugins/metalink/metalinkhttp.cpp +++ b/transfer-plugins/metalink/metalinkhttp.cpp @@ -174,7 +174,7 @@ bool MetalinkHttp::metalinkHttpInit() { qDebug() << "m_dest = " << m_dest; const QUrl tempDest = QUrl(m_dest.adjusted(QUrl::RemoveFilename)); // | QUrl::StripTrailingSlash)); - QUrl dest = tempDest.toString() + m_dest.fileName(); // Frage: welcher der beiden Fixes ist besser? + QUrl dest = QUrl(tempDest.toString() + m_dest.fileName()); qDebug() << "dest = " << dest; //sort the urls according to their priority (highest first) @@ -221,7 +221,7 @@ bool MetalinkHttp::metalinkHttpInit() //Add OpenPGP signatures if (m_signatureUrl != QUrl()) { - Download *signat_download = new Download(m_signatureUrl, QString(KStandardDirs::locateLocal("appdata", "metalinks/") + m_source.fileName())); + Download *signat_download = new Download(m_signatureUrl, QUrl::fromLocalFile(KStandardDirs::locateLocal("appdata", "metalinks/") + m_source.fileName())); connect(signat_download, SIGNAL(finishedSuccessfully(QUrl,QByteArray)), SLOT(setSignature(QUrl,QByteArray))); } m_dataSourceFactory[dataFactory->dest()] = dataFactory; diff --git a/transfer-plugins/kio/transferKio.cpp b/transfer-plugins/kio/transferKio.cpp index 232d4e05..b1455ad7 100644 --- a/transfer-plugins/kio/transferKio.cpp +++ b/transfer-plugins/kio/transferKio.cpp @@ -125,7 +125,7 @@ void TransferKio::deinit(Transfer::DeleteOptions options) if (options & DeleteFiles)//if the transfer is not finished, we delete the *.part-file { qDebug() << "TransferKio::deinit(), deleting " << QUrl::fromLocalFile(m_dest.path() + ".part") << ", multiseg.patch:" << QUrl::fromLocalFile(m_dest.path() + ".part"); - KIO::Job *del = KIO::del(QString(m_dest.path() + ".part"), KIO::HideProgressInfo); + KIO::Job *del = KIO::del(QUrl::fromLocalFile(m_dest.path() + ".part"), KIO::HideProgressInfo); KIO::NetAccess::synchronousRun(del, nullptr); }//TODO: Ask the user if he/she wants to delete the *.part-file? To discuss (boom1992) } diff --git a/ui/groupsettingsdialog.cpp b/ui/groupsettingsdialog.cpp index c8b5c078..424d6366 100644 --- a/ui/groupsettingsdialog.cpp +++ b/ui/groupsettingsdialog.cpp @@ -26,8 +26,8 @@ GroupSettingsDialog::GroupSettingsDialog(QWidget *parent, TransferGroupHandler * ui.defaultFolderRequester->setMode(KFile::Directory); QString path = group->defaultFolder(); - ui.defaultFolderRequester->setUrl(path); - ui.defaultFolderRequester->setStartDir(QUrl(KGet::generalDestDir(true))); + ui.defaultFolderRequester->setUrl(QUrl::fromLocalFile(path)); + ui.defaultFolderRequester->setStartDir(QUrl::fromLocalFile(KGet::generalDestDir(true))); qDebug() << "generalDestDir=" << KGet::generalDestDir(true); ui.regExpEdit->setText(group->regExp().pattern()); diff --git a/ui/newtransferdialog.cpp b/ui/newtransferdialog.cpp index 04ef0a6d..c10db5cf 100644 --- a/ui/newtransferdialog.cpp +++ b/ui/newtransferdialog.cpp @@ -153,7 +153,7 @@ void NewTransferDialog::setSource(const QList<QUrl> &sources) } if (sources.count() == 1) { - QUrl m_srcUrl = sources.first().url(); + QUrl m_srcUrl = sources.first(); ui.urlRequester->clear(); if (m_srcUrl.isEmpty()) { m_srcUrl = QUrl(QApplication::clipboard()->text(QClipboard::Clipboard).trimmed()); @@ -181,7 +181,7 @@ void NewTransferDialog::setSource(const QList<QUrl> &sources) void NewTransferDialog::setDestinationFileName(const QString &filename) { qDebug() << "NewTransferDialog::setDestinationFileName(), result=" << QString(ui.destRequester->url().adjusted(QUrl::RemoveFilename).toString() + filename); - ui.destRequester->setUrl(QString(ui.destRequester->url().adjusted(QUrl::RemoveFilename).toString() + filename)); + ui.destRequester->setUrl(QUrl(ui.destRequester->url().adjusted(QUrl::RemoveFilename).toString() + filename)); } void NewTransferDialog::setDestination() diff --git a/transfer-plugins/metalink/abstractmetalink.cpp b/transfer-plugins/metalink/abstractmetalink.cpp index ba991ba8..6126cfbf 100644 --- a/transfer-plugins/metalink/abstractmetalink.cpp +++ b/transfer-plugins/metalink/abstractmetalink.cpp @@ -482,7 +482,7 @@ void AbstractMetalink::filesSelected() doDownload = false; //ask the user, unless he has chosen overwriteAll before } else if (!overwriteAll) { - KIO::RenameDialog dlg(0, i18n("File already exists"), index.data().toString(), dest, KIO::RenameDialog_Mode(KIO::M_MULTI | KIO::M_OVERWRITE | KIO::M_SKIP)); + KIO::RenameDialog dlg(0, i18n("File already exists"), index.data().toUrl(), dest, KIO::RenameDialog_Mode(KIO::M_MULTI | KIO::M_OVERWRITE | KIO::M_SKIP)); const int result = dlg.exec(); if (result == KIO::R_RENAME) { diff --git a/transfer-plugins/metalink/metalinkxml.cpp b/transfer-plugins/metalink/metalinkxml.cpp index 87cccbe8..dc4fcece 100644 --- a/transfer-plugins/metalink/metalinkxml.cpp +++ b/transfer-plugins/metalink/metalinkxml.cpp @@ -76,7 +76,7 @@ void MetalinkXml::downloadMetalink() setStatus(Job::Running, i18n("Downloading Metalink File...."), SmallIcon("document-save")); setTransferChange(Tc_Status, true); - Download *download = new Download(m_source, QString(KStandardDirs::locateLocal("appdata", "metalinks/") + m_source.fileName())); + Download *download = new Download(m_source, QUrl::fromLocalFile(KStandardDirs::locateLocal("appdata", "metalinks/") + m_source.fileName())); connect(download, SIGNAL(finishedSuccessfully(QUrl,QByteArray)), SLOT(metalinkInit(QUrl,QByteArray))); } @@ -95,7 +95,7 @@ bool MetalinkXml::metalinkInit(const QUrl &src, const QByteArray &data) //try to parse the locally stored metalink-file if (!m_metalink.isValid() && m_localMetalinkLocation.isValid()) { - KGetMetalink::HandleMetalink::load(m_localMetalinkLocation.toLocalFile(), &m_metalink); qDebug() << "metalinkInit(), m_localMetalinkLocation=" << m_localMetalinkLocation; + KGetMetalink::HandleMetalink::load(m_localMetalinkLocation, &m_metalink); qDebug() << "metalinkInit(), m_localMetalinkLocation=" << m_localMetalinkLocation; } if (!m_metalink.isValid()) { diff --git a/ui/droptarget.cpp b/ui/droptarget.cpp index 66e0abbf..a9d99d30 100644 --- a/ui/droptarget.cpp +++ b/ui/droptarget.cpp @@ -222,16 +222,16 @@ void DropTarget::dropEvent(QDropEvent * event) KGuiItem(i18n("&Load transfer list"), QIcon::fromTheme("list-add")), KStandardGuiItem::cancel()); if (msgBoxResult == 3) //Download - NewTransferDialogHandler::showNewTransferDialog(list.first().url()); + NewTransferDialogHandler::showNewTransferDialog(list.first()); if (msgBoxResult == 4) //Load - KGet::load(list.first().url()); + KGet::load(list.first().url()); //FIXME should it not rather be toLocalFile()? } else { if (list.count() == 1) { str = event->mimeData()->text(); - NewTransferDialogHandler::showNewTransferDialog(str); + NewTransferDialogHandler::showNewTransferDialog(QUrl(str)); //FIXME correct? } else NewTransferDialogHandler::showNewTransferDialog(list); diff --git a/core/kget.cpp b/core/kget.cpp index 67856022..bd751c97 100644 --- a/core/kget.cpp +++ b/core/kget.cpp @@ -972,8 +976,8 @@ QUrl KGet::urlInputDialog() QString KGet::destDirInputDialog() { qDebug() << "destDirInputDialog(), generalDestDir()=" << generalDestDir(); - QString destDir = KFileDialog::getExistingDirectory(generalDestDir()); - Settings::setLastDirectory(destDir); + QString destDir = KFileDialog::getExistingDirectory(QUrl::fromLocalFile(generalDestDir())); + Settings::setLastDirectory(destDir); return destDir; } diff --git a/core/transfertreemodel.cpp b/core/transfertreemodel.cpp index 068fff88..1fefed0c 100644 --- a/core/transfertreemodel.cpp +++ b/core/transfertreemodel.cpp @@ -105,7 +105,7 @@ QVariant TransferModelItem::data(int role) const //store the icon for speed improvements, KIconLoader should make sure, that //the icon data gets shared if (m_mimeType.isNull()) { - m_mimeType = QIcon::fromTheme(KMimeType::iconNameForUrl(m_transferHandler->dest().url())); + m_mimeType = QIcon::fromTheme(KMimeType::iconNameForUrl(m_transferHandler->dest())); } return m_mimeType; diff --git a/CMakeLists.txt b/CMakeLists.txt index 30652f91..c992255a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,8 @@ if(WIN32) endif(WIN32) #add_definitions(${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS}) #add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) +add_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII) include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
