[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kget/kf5_port] transfer-plugins: Make KGet compileable with KF5
From: Lukas Appelhans <l.appelhans () gmx ! de>
Date: 2014-10-10 15:56:14
Message-ID: E1XccYA-0001N0-KG () scm ! kde ! org
[Download RAW message or body]
Git commit bfe62e3abf8713b8c4afe57af980ded6fe6a7014 by Lukas Appelhans.
Committed on 10/10/2014 at 15:55.
Pushed by lappelhans into branch 'kf5_port'.
Make KGet compileable with KF5
M +1 -0 transfer-plugins/metalink/fileselectiondlg.cpp
M +2 -0 transfer-plugins/metalink/metalinkfactory.cpp
M +2 -2 transfer-plugins/metalink/metalinkhttp.cpp
M +1 -1 transfer-plugins/metalink/metalinkxml.cpp
M +2 -0 transfer-plugins/mirrorsearch/mirrorsearchfactory.cpp
M +3 -3 transfer-plugins/mirrorsearch/mirrorsearchtransferdatasource.cpp
M +2 -2 transfer-plugins/mirrorsearch/mirrorsearchtransferdatasource.h
M +1 -1 transfer-plugins/mmsthreads/mmstransfer.cpp
M +2 -0 transfer-plugins/mmsthreads/mmstransferfactory.cpp
M +5 -5 transfer-plugins/multisegmentkio/transfermultisegkio.cpp
M +2 -0 transfer-plugins/multisegmentkio/transfermultisegkiofactory.cpp
http://commits.kde.org/kget/bfe62e3abf8713b8c4afe57af980ded6fe6a7014
diff --git a/transfer-plugins/metalink/fileselectiondlg.cpp \
b/transfer-plugins/metalink/fileselectiondlg.cpp index 4ed49f6..485b16e 100644
--- a/transfer-plugins/metalink/fileselectiondlg.cpp
+++ b/transfer-plugins/metalink/fileselectiondlg.cpp
@@ -24,6 +24,7 @@
#include <QSortFilterProxyModel>
#include <KInputDialog>
+#include <KLocale>
FileSelectionDlg::FileSelectionDlg(FileModel *model, QWidget *parent)
: KDialog(parent)
diff --git a/transfer-plugins/metalink/metalinkfactory.cpp \
b/transfer-plugins/metalink/metalinkfactory.cpp index 65a60cf..2b51064 100644
--- a/transfer-plugins/metalink/metalinkfactory.cpp
+++ b/transfer-plugins/metalink/metalinkfactory.cpp
@@ -58,3 +58,5 @@ bool MetalinkFactory::isSupported(const KUrl &url) const
{
return (url.fileName().endsWith(QLatin1String(".metalink")) || \
url.fileName().endsWith(QLatin1String(".meta4"))); }
+
+#include "metalinkfactory.moc"
diff --git a/transfer-plugins/metalink/metalinkhttp.cpp \
b/transfer-plugins/metalink/metalinkhttp.cpp index 8b9dd83..cbf3734 100644
--- a/transfer-plugins/metalink/metalinkhttp.cpp
+++ b/transfer-plugins/metalink/metalinkhttp.cpp
@@ -153,7 +153,7 @@ void MetalinkHttp::slotSignatureVerified()
m_fileModel->setData(signatureVerified, \
factory->signature()->status()); }
if (factory->doDownload() && (factory->verifier()->status() == \
Verifier::NotVerified)) {
- brokenFiles.append(factory->dest().pathOrUrl());
+ brokenFiles.append(factory->dest().toString());
}
}
@@ -175,7 +175,7 @@ void MetalinkHttp::slotSignatureVerified()
bool MetalinkHttp::metalinkHttpInit()
{
kDebug() << "m_dest = " << m_dest;
- const KUrl tempDest = KUrl(m_dest.directory());
+ const KUrl tempDest = KUrl(m_dest.adjusted(QUrl::RemoveFilename));
KUrl dest = tempDest;
dest.addPath(m_dest.fileName());
kDebug() << "dest = " << dest;
diff --git a/transfer-plugins/metalink/metalinkxml.cpp \
b/transfer-plugins/metalink/metalinkxml.cpp index eb92e34..a4e1daa 100644
--- a/transfer-plugins/metalink/metalinkxml.cpp
+++ b/transfer-plugins/metalink/metalinkxml.cpp
@@ -128,7 +128,7 @@ bool MetalinkXml::metalinkInit(const QUrl &src, const QByteArray \
&data) for (it = m_metalink.files.files.constBegin(); it != itEnd ; ++it)
{
dest = tempDest;
- dest.setPath(tmpDest.adjusted(QUrl::RemoveFilename).toString() + \
(*it).name); + dest.setPath(tempDest.adjusted(QUrl::RemoveFilename).toString() \
+ (*it).name);
QList<KGetMetalink::Url> urlList = (*it).resources.urls;
//sort the urls according to their priority (highest first)
diff --git a/transfer-plugins/mirrorsearch/mirrorsearchfactory.cpp \
b/transfer-plugins/mirrorsearch/mirrorsearchfactory.cpp index 18b6fbd..e135328 100644
--- a/transfer-plugins/mirrorsearch/mirrorsearchfactory.cpp
+++ b/transfer-plugins/mirrorsearch/mirrorsearchfactory.cpp
@@ -38,3 +38,5 @@ TransferDataSource \
*MirrorSearchFactory::createTransferDataSource(const KUrl &sr }
return 0;
}
+
+#include "mirrorsearchfactory.moc"
diff --git a/transfer-plugins/mirrorsearch/mirrorsearchtransferdatasource.cpp \
b/transfer-plugins/mirrorsearch/mirrorsearchtransferdatasource.cpp index \
829ee2d..d332332 100644
--- a/transfer-plugins/mirrorsearch/mirrorsearchtransferdatasource.cpp
+++ b/transfer-plugins/mirrorsearch/mirrorsearchtransferdatasource.cpp
@@ -12,7 +12,7 @@
#include "mirrors.h"
#include <kdebug.h>
-MirrorSearchTransferDataSource::MirrorSearchTransferDataSource(const KUrl &srcUrl, \
QObject *parent) +MirrorSearchTransferDataSource::MirrorSearchTransferDataSource(const \
QUrl &srcUrl, QObject *parent) : TransferDataSource(srcUrl, parent)
{
m_filename = m_sourceUrl.fileName();
@@ -23,7 +23,7 @@ void MirrorSearchTransferDataSource::start()
{
kDebug(5001);
if(!m_filename.isEmpty())
- MirrorSearch (m_filename, this, SLOT(slotSearchUrls(QList<KUrl>&)));
+ MirrorSearch (m_filename, this, SLOT(slotSearchUrls(QList<QUrl>&)));
}
void MirrorSearchTransferDataSource::stop()
@@ -38,7 +38,7 @@ void MirrorSearchTransferDataSource::addSegments(const \
QPair<KIO::fileoffset_t, kDebug(5001);
}
-void MirrorSearchTransferDataSource::slotSearchUrls(QList<KUrl>& Urls)
+void MirrorSearchTransferDataSource::slotSearchUrls(QList<QUrl>& Urls)
{
emit data(Urls);
}
diff --git a/transfer-plugins/mirrorsearch/mirrorsearchtransferdatasource.h \
b/transfer-plugins/mirrorsearch/mirrorsearchtransferdatasource.h index \
5f18d91..b801a04 100644
--- a/transfer-plugins/mirrorsearch/mirrorsearchtransferdatasource.h
+++ b/transfer-plugins/mirrorsearch/mirrorsearchtransferdatasource.h
@@ -19,14 +19,14 @@ class MirrorSearchTransferDataSource : public TransferDataSource
{
Q_OBJECT
public:
- MirrorSearchTransferDataSource(const KUrl &srcUrl, QObject *parent);
+ MirrorSearchTransferDataSource(const QUrl &srcUrl, QObject *parent);
void start();
void stop();
void addSegments(const QPair<KIO::fileoffset_t, KIO::fileoffset_t> \
&segmentSize, const QPair<int, int> &segmentRange);
private Q_SLOTS:
- void slotSearchUrls(QList<KUrl>& Urls);
+ void slotSearchUrls(QList<QUrl>& Urls);
private:
QString m_filename;
diff --git a/transfer-plugins/mmsthreads/mmstransfer.cpp \
b/transfer-plugins/mmsthreads/mmstransfer.cpp index 4844205..288097e 100755
--- a/transfer-plugins/mmsthreads/mmstransfer.cpp
+++ b/transfer-plugins/mmsthreads/mmstransfer.cpp
@@ -28,7 +28,7 @@ MmsTransfer::MmsTransfer(TransferGroup * parent, TransferFactory * \
factory, m_retryDownload(false)
{
m_fileTemp = KStandardDirs::locateLocal("appdata", m_dest.fileName());
- kDebug(5001) << "Mms transfer initialized: " + m_source.prettyUrl();
+ kDebug(5001) << "Mms transfer initialized: " + m_source.toString();
}
MmsTransfer::~MmsTransfer()
diff --git a/transfer-plugins/mmsthreads/mmstransferfactory.cpp \
b/transfer-plugins/mmsthreads/mmstransferfactory.cpp index dc0aa42..2a5c8ff 100755
--- a/transfer-plugins/mmsthreads/mmstransferfactory.cpp
+++ b/transfer-plugins/mmsthreads/mmstransferfactory.cpp
@@ -65,3 +65,5 @@ bool MmsTransferFactory::isSupported(const KUrl &url) const
kDebug(5001) << "Protocol = " << prot;
return (prot == "mms" || prot == "mmsh");
}
+
+#include "mmstransferfactory.moc"
diff --git a/transfer-plugins/multisegmentkio/transfermultisegkio.cpp \
b/transfer-plugins/multisegmentkio/transfermultisegkio.cpp index 2684f65..b183dbf \
100644
--- a/transfer-plugins/multisegmentkio/transfermultisegkio.cpp
+++ b/transfer-plugins/multisegmentkio/transfermultisegkio.cpp
@@ -123,7 +123,7 @@ bool TransferMultiSegKio::repair(const QUrl &file)
bool TransferMultiSegKio::setDirectory(const QUrl& newDirectory)
{
QUrl newDest = newDirectory;
- newDest.addPath(m_dest.fileName());
+ newDest.setPath(newDest.toString() + "/" + m_dest.fileName());
return setNewDestination(newDest);
}
@@ -175,8 +175,8 @@ void \
TransferMultiSegKio::slotDataSourceFactoryChange(Transfer::ChangesFlags cha if \
(filename != url.fileName()) return;
}
- QUrl path = m_dest.directory();
- path.addPath(filename);
+ QUrl path = m_dest.adjusted(QUrl::RemoveFilename);
+ path.setPath(path.toString() + "/" + filename);
setNewDestination(path);
}
if (change & Tc_Source) {
@@ -191,7 +191,7 @@ void \
TransferMultiSegKio::slotDataSourceFactoryChange(Transfer::ChangesFlags cha }
}
if (change & Tc_Status) {
- if ((m_dataSourceFactory->status() == Job::Finished) && m_source.protocol() \
== "ftp") { + if ((m_dataSourceFactory->status() == Job::Finished) && \
m_source.scheme() == "ftp") { KIO::StatJob * statJob = KIO::stat(m_source);
connect(statJob, SIGNAL(result(KJob*)), this, \
SLOT(slotStatResult(KJob*))); statJob->start();
@@ -338,7 +338,7 @@ FileModel *TransferMultiSegKio::fileModel()
{
if (!m_fileModel)
{
- m_fileModel = new FileModel(QList<QUrl>() << m_dest, m_dest.upUrl(), this);
+ m_fileModel = new FileModel(QList<QUrl>() << m_dest, \
m_dest.adjusted(QUrl::RemoveFilename), this);
connect(m_fileModel, SIGNAL(rename(QUrl,QUrl)), this, \
SLOT(slotRename(QUrl,QUrl)));
QModelIndex statusIndex = m_fileModel->index(m_dest, FileItem::Status);
diff --git a/transfer-plugins/multisegmentkio/transfermultisegkiofactory.cpp \
b/transfer-plugins/multisegmentkio/transfermultisegkiofactory.cpp index \
b4c30a5..02e4e16 100644
--- a/transfer-plugins/multisegmentkio/transfermultisegkiofactory.cpp
+++ b/transfer-plugins/multisegmentkio/transfermultisegkiofactory.cpp
@@ -92,3 +92,5 @@ QStringList TransferMultiSegKioFactory::addsProtocols() const
static const QStringList protocols = QStringList() << "http" << "https" << "ftp" \
<< "sftp"; return protocols;
}
+
+#include "transfermultisegkiofactory.moc"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic