[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kget/kf5_port] /: Port KUrl -> QUrl in more occasions
From: Lukas Appelhans <l.appelhans () gmx ! de>
Date: 2014-10-24 17:18:23
Message-ID: E1XhiVL-0005hi-M4 () scm ! kde ! org
[Download RAW message or body]
Git commit 77c5937af810587632cfd967048efd25edc350fa by Lukas Appelhans.
Committed on 24/10/2014 at 17:17.
Pushed by lappelhans into branch 'kf5_port'.
Port KUrl -> QUrl in more occasions
M +4 -4 core/signature.cpp
M +4 -4 core/signature.h
M +2 -2 core/signature_p.h
M +2 -2 core/signaturethread.cpp
M +3 -3 core/signaturethread.h
M +0 -1 core/transfertreemodel.cpp
M +6 -6 core/verificationthread.cpp
M +5 -5 core/verificationthread.h
M +1 -1 core/verifier_p.h
M +9 -10 mainwindow.cpp
http://commits.kde.org/kget/77c5937af810587632cfd967048efd25edc350fa
diff --git a/core/signature.cpp b/core/signature.cpp
index 69f17ce..b42fe58 100644
--- a/core/signature.cpp
+++ b/core/signature.cpp
@@ -63,7 +63,7 @@ void SignaturePrivate::signatureDownloaded()
}
#ifdef HAVE_QGPGME
-GpgME::VerificationResult SignaturePrivate::verify(const KUrl &dest, const \
QByteArray &sig) +GpgME::VerificationResult SignaturePrivate::verify(const QUrl \
&dest, const QByteArray &sig) {
GpgME::VerificationResult result;
if (!QFile::exists(dest.pathOrUrl()) || sig.isEmpty()) {
@@ -96,7 +96,7 @@ GpgME::VerificationResult SignaturePrivate::verify(const KUrl \
&dest, const QByte #endif //HAVE_QGPGME
-Signature::Signature(const KUrl &dest, QObject *object)
+Signature::Signature(const QUrl &dest, QObject *object)
: QObject(object),
d(new SignaturePrivate(this))
{
@@ -112,12 +112,12 @@ Signature::~Signature()
delete d;
}
-KUrl Signature::destination() const
+QUrl Signature::destination() const
{
return d->dest;
}
-void Signature::setDestination(const KUrl &destination)
+void Signature::setDestination(const QUrl &destination)
{
d->dest = destination;
}
diff --git a/core/signature.h b/core/signature.h
index b01ea14..3d7e8ca 100644
--- a/core/signature.h
+++ b/core/signature.h
@@ -22,7 +22,7 @@
#include "kget_export.h"
-#include <KUrl>
+#include <QUrl>
class QDomElement;
@@ -44,7 +44,7 @@ class KGET_EXPORT Signature : public QObject
//TODO also support verification and decryption of files that contain the signature?
public:
- explicit Signature(const KUrl &dest, QObject *object = 0);
+ explicit Signature(const QUrl &dest, QObject *object = 0);
~Signature();
enum SignatureType
@@ -64,8 +64,8 @@ class KGET_EXPORT Signature : public QObject
VerifiedWarning //verified, though there is a warning
};
- KUrl destination() const;
- void setDestination(const KUrl &destination);
+ QUrl destination() const;
+ void setDestination(const QUrl &destination);
VerificationStatus status() const;
#ifdef HAVE_QGPGME
diff --git a/core/signature_p.h b/core/signature_p.h
index 0763afa..47d13cd 100644
--- a/core/signature_p.h
+++ b/core/signature_p.h
@@ -38,7 +38,7 @@ struct SignaturePrivate
/**
* Verifies a signature
*/
- static GpgME::VerificationResult verify(const KUrl &dest, const QByteArray \
&sig); + static GpgME::VerificationResult verify(const QUrl &dest, const \
QByteArray &sig); #endif //HAVE_QGPGME
Signature *q;
@@ -49,7 +49,7 @@ struct SignaturePrivate
int sigSummary;
int error;
SignatureThread thread;
- KUrl dest;
+ QUrl dest;
QByteArray signature;
QString fingerprint;
#ifdef HAVE_QGPGME
diff --git a/core/signaturethread.cpp b/core/signaturethread.cpp
index 93b085f..5079576 100644
--- a/core/signaturethread.cpp
+++ b/core/signaturethread.cpp
@@ -47,7 +47,7 @@ bool SignatureThread::isValid() const
#endif //HAVE_QGPGME
}
-void SignatureThread::verify(const KUrl &dest, const QByteArray &sig)
+void SignatureThread::verify(const QUrl &dest, const QByteArray &sig)
{
QMutexLocker locker(&m_mutex);
m_dest.append(dest);
@@ -63,7 +63,7 @@ void SignatureThread::run()
#ifdef HAVE_QGPGME
while (!m_abort && m_dest.count()) {
m_mutex.lock();
- const KUrl dest = m_dest.takeFirst();
+ const QUrl dest = m_dest.takeFirst();
const QByteArray sig = m_sig.takeFirst();
m_mutex.unlock();
diff --git a/core/signaturethread.h b/core/signaturethread.h
index 48d2051..8d4b2be 100644
--- a/core/signaturethread.h
+++ b/core/signaturethread.h
@@ -20,7 +20,7 @@
#ifndef SIGNATURE_THREAD_H
#define SIGNATURE_THREAD_H
-#include <KUrl>
+#include <QUrl>
#include <QMutex>
#include <QThread>
@@ -41,7 +41,7 @@ class SignatureThread : public QThread
* @return true if the thread is valid, i.e. has QGPGME support
*/
bool isValid() const;
- void verify(const KUrl &dest, const QByteArray &sig);
+ void verify(const QUrl &dest, const QByteArray &sig);
#ifdef HAVE_QGPGME
signals:
@@ -59,7 +59,7 @@ class SignatureThread : public QThread
private:
QMutex m_mutex;
bool m_abort;
- QList<KUrl> m_dest;
+ QList<QUrl> m_dest;
QList<QByteArray> m_sig;
};
diff --git a/core/transfertreemodel.cpp b/core/transfertreemodel.cpp
index cdc8831..068fff8 100644
--- a/core/transfertreemodel.cpp
+++ b/core/transfertreemodel.cpp
@@ -247,7 +247,6 @@ void TransferTreeModel::delGroup(TransferGroup * group)
void TransferTreeModel::addTransfers(const QList<Transfer*> &transfers, \
TransferGroup *group) {
ModelItem *parentItem = itemFromTransferGroupHandler(group->handler());
- const QModelIndex parentIndex = parentItem->index();
beginInsertRows(parentItem->index(), parentItem->rowCount(), \
parentItem->rowCount() + transfers.count() - 1);
//HACK blocks all signals from the model when adding multiple items,
diff --git a/core/verificationthread.cpp b/core/verificationthread.cpp
index feb203f..5b1db9d 100644
--- a/core/verificationthread.cpp
+++ b/core/verificationthread.cpp
@@ -42,7 +42,7 @@ VerificationThread::~VerificationThread()
wait();
}
-void VerificationThread::verifiy(const QString &type, const QString &checksum, const \
KUrl &file) +void VerificationThread::verifiy(const QString &type, const QString \
&checksum, const QUrl &file) {
QMutexLocker locker(&m_mutex);
m_types.append(type);
@@ -56,7 +56,7 @@ void VerificationThread::verifiy(const QString &type, const QString \
&checksum, c }
}
-void VerificationThread::findBrokenPieces(const QString &type, const QList<QString> \
checksums, KIO::filesize_t length, const KUrl &file) +void \
VerificationThread::findBrokenPieces(const QString &type, const QList<QString> \
checksums, KIO::filesize_t length, const QUrl &file) {
QMutexLocker locker(&m_mutex);
m_types.clear();
@@ -101,7 +101,7 @@ void VerificationThread::doVerify()
m_mutex.lock();
const QString type = m_types.takeFirst();
const QString checksum = m_checksums.takeFirst();
- const KUrl url = m_files.takeFirst();
+ const QUrl url = m_files.takeFirst();
m_mutex.unlock();
if (type.isEmpty() || checksum.isEmpty())
@@ -138,15 +138,15 @@ void VerificationThread::doBrokenPieces()
const QString type = m_types.takeFirst();
const QStringList checksums = m_checksums;
m_checksums.clear();
- const KUrl url = m_files.takeFirst();
+ const QUrl url = m_files.takeFirst();
const KIO::filesize_t length = m_length;
m_mutex.unlock();
QList<KIO::fileoffset_t> broken;
- if (QFile::exists(url.pathOrUrl()))
+ if (QFile::exists(url.toString()))
{
- QFile file(url.pathOrUrl());
+ QFile file(url.toString());
if (!file.open(QIODevice::ReadOnly))
{
emit brokenPieces(broken, length);
diff --git a/core/verificationthread.h b/core/verificationthread.h
index 77cfd80..9d9df78 100644
--- a/core/verificationthread.h
+++ b/core/verificationthread.h
@@ -21,7 +21,7 @@
#define VERIFICATION_THREAD_H
#include <kio/global.h>
-#include <KUrl>
+#include <QUrl>
#include <QMutex>
#include <QThread>
@@ -34,9 +34,9 @@ class VerificationThread : public QThread
VerificationThread(QObject *parent = 0);
~VerificationThread();
- void verifiy(const QString &type, const QString &checksum, const KUrl \
&file); + void verifiy(const QString &type, const QString &checksum, const \
QUrl &file);
- void findBrokenPieces(const QString &type, const QList<QString> checksums, \
KIO::filesize_t length, const KUrl &file); + void findBrokenPieces(const \
QString &type, const QList<QString> checksums, KIO::filesize_t length, const QUrl \
&file);
private:
enum WorkType
@@ -57,7 +57,7 @@ class VerificationThread : public QThread
*/
void verified(bool verified);
- void verified(const QString &type, bool verified, const KUrl &file);
+ void verified(const QString &type, bool verified, const QUrl &file);
void brokenPieces(const QList<KIO::fileoffset_t> &offsets, KIO::filesize_t \
length);
@@ -69,7 +69,7 @@ class VerificationThread : public QThread
bool m_abort;
QStringList m_types;
QStringList m_checksums;
- QList<KUrl> m_files;
+ QList<QUrl> m_files;
KIO::filesize_t m_length;
WorkType m_type;
};
diff --git a/core/verifier_p.h b/core/verifier_p.h
index b86c536..d6e05ee 100644
--- a/core/verifier_p.h
+++ b/core/verifier_p.h
@@ -44,7 +44,7 @@ struct VerifierPrivate
QString dBusObjectPath;
VerificationModel *model;
- KUrl dest;
+ QUrl dest;
Verifier::VerificationStatus status;
QHash<QString, PartialChecksums*> partialSums;
diff --git a/mainwindow.cpp b/mainwindow.cpp
index df13583..d0f33f8 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -496,12 +496,12 @@ void MainWindow::slotToggleDropTarget()
void MainWindow::slotNewTransfer()
{
- NewTransferDialogHandler::showNewTransferDialog(KUrl());
+ NewTransferDialogHandler::showNewTransferDialog(QUrl());
}
void MainWindow::slotImportTransfers()
{
- QString filename = KFileDialog::getOpenFileName(KUrl(),
+ QString filename = KFileDialog::getOpenFileName(QUrl(),
"*.kgt *.metalink *.meta4 \
*.torrent|" + i18n("All Openable Files") +
" (*.kgt *.metalink *.meta4 \
*.torrent)", this, i18n("Open File"));
@@ -512,7 +512,7 @@ void MainWindow::slotImportTransfers()
}
if(!filename.isEmpty())
- KGet::addTransfer( KUrl( filename ) );
+ KGet::addTransfer( QUrl( filename ) );
}
void MainWindow::slotUpdateTitlePercent()
@@ -597,7 +597,7 @@ void MainWindow::slotPreferences()
void MainWindow::slotExportTransfers()
{
const QString filename = KFileDialog::getSaveFileName
- (KUrl(),
+ (QUrl(),
"*.kgt|" + i18n("KGet Transfer List") + " (*.kgt)\n*.txt|" + i18n("Text \
File") + " (*.txt)", this,
i18n("Export Transfers")
@@ -1047,8 +1047,8 @@ void MainWindow::slotCheckClipboard()
if (lastClipboard.isEmpty())
return;
- const KUrl url = KUrl(lastClipboard);
- if (url.isValid() && !url.protocol().isEmpty() && url.hasPath() && \
url.hasHost() && !url.isLocalFile()) { + const QUrl url = QUrl(lastClipboard);
+ if (url.isValid() && !url.scheme().isEmpty() && !url.path().isEmpty() && \
!url.host().isEmpty() && !url.isLocalFile()) { bool add = false;
const QString urlString = url.url();
@@ -1187,13 +1187,12 @@ void MainWindow::showEvent(QShowEvent *)
void MainWindow::dragEnterEvent(QDragEnterEvent * event)
{
- event->setAccepted(KUrl::List::canDecode(event->mimeData())
- || event->mimeData()->hasText());
+ event->setAccepted(event->mimeData()->hasUrls());
}
void MainWindow::dropEvent(QDropEvent * event)
{
- KUrl::List list = KUrl::List::fromMimeData(event->mimeData());
+ QList<QUrl> list = event->mimeData()->urls();
if (!list.isEmpty())
{
@@ -1218,7 +1217,7 @@ void MainWindow::dropEvent(QDropEvent * event)
}
else
{
- NewTransferDialogHandler::showNewTransferDialog(KUrl());
+ NewTransferDialogHandler::showNewTransferDialog(QUrl());
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic