[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kget/kf5_port] /: Port KGet from deprecated functions
From: Lukas Appelhans <l.appelhans () gmx ! de>
Date: 2014-11-05 15:12:37
Message-ID: E1Xm2GD-0006Fn-Fn () scm ! kde ! org
[Download RAW message or body]
Git commit 30982bb96d38709b97977c98dbce24ab5cacb7ec by Lukas Appelhans.
Committed on 05/11/2014 at 15:11.
Pushed by lappelhans into branch 'kf5_port'.
Port KGet from deprecated functions
M +5 -3 conf/pluginselector.cpp
M +2 -2 core/datasourcefactory.cpp
M +5 -3 core/kget.cpp
M +28 -36 core/urlchecker.cpp
M +0 -12 core/urlchecker.h
M +17 -2 core/urlchecker_p.h
M +2 -2 dbus/dbuskgetwrapper.cpp
M +3 -3 dbus/dbustransferwrapper.cpp
M +1 -1 transfer-plugins/checksumsearch/checksumsearchfactory.cpp
M +1 -1 transfer-plugins/checksumsearch/checksumsearchfactory.h
M +1 -1 transfer-plugins/metalink/metalinkfactory.h
M +1 -1 transfer-plugins/metalink/metalinkxml.cpp
M +1 -1 transfer-plugins/mirrorsearch/dlgmirrorsearch.h
M +1 -1 transfer-plugins/mmsthreads/mmstransferfactory.h
M +1 -1 ui/contextmenu.cpp
M +1 -1 ui/history/transferhistory.cpp
M +1 -1 ui/history/transferhistoryitemdelegate.cpp
M +2 -2 ui/newtransferdialog.cpp
http://commits.kde.org/kget/30982bb96d38709b97977c98dbce24ab5cacb7ec
diff --git a/conf/pluginselector.cpp b/conf/pluginselector.cpp
index 0d0b47b..1f6a5f1 100644
--- a/conf/pluginselector.cpp
+++ b/conf/pluginselector.cpp
@@ -16,16 +16,18 @@
#include <KLocalizedString>
#include <KPluginInfo>
#include <KSharedConfig>
+#include <KPluginTrader>
#include <QDialog>
PluginSelector::PluginSelector(QDialog * parent)
: KPluginSelector(parent)
{
- KService::List offers = KServiceTypeTrader::self()->query("KGet/Plugin");
+ KPluginInfo::List offers = KPluginTrader::self()->query("KMyApp/Plugin", "kf5");
- //TODO: POrt this
- addPlugins(KPluginInfo::fromServices(offers), KPluginSelector::ReadConfigFile, \
i18n("Plugins"), "Service", KSharedConfig::openConfig());
+ addPlugins(offers, KPluginSelector::ReadConfigFile, i18n("Plugins"), "Service", \
KSharedConfig::openConfig()); +
+
load();
connect(parent, SIGNAL(accepted()), SLOT(saveState()));
diff --git a/core/datasourcefactory.cpp b/core/datasourcefactory.cpp
index 03e9ec8..ee3eecc 100644
--- a/core/datasourcefactory.cpp
+++ b/core/datasourcefactory.cpp
@@ -167,7 +167,7 @@ bool DataSourceFactory::checkLocalFile()
QString dest_orig = m_dest.toLocalFile();
QString _dest_part(dest_orig);
- KDE_struct_stat buff_part;
+ /*KDE_struct_stat buff_part;
bool bPartExists = (KDE::stat( _dest_part, &buff_part ) != -1);
if(!bPartExists)
{
@@ -185,7 +185,7 @@ bool DataSourceFactory::checkLocalFile()
{
close(fd);
}
- }
+ }*///TODO: Port if needed
qCDebug(KGET_DEBUG) << "success";
return true;
diff --git a/core/kget.cpp b/core/kget.cpp
index 335da43..cc47f3a 100644
--- a/core/kget.cpp
+++ b/core/kget.cpp
@@ -33,7 +33,7 @@
#include <qdebug.h>
#include <iostream>
-#include <kinputdialog.h>
+#include <qinputdialog.h>
#include <kfiledialog.h>
#include <kmessagebox.h>
#include <klocale.h>
@@ -42,6 +42,7 @@
#include <kiconloader.h>
#include <kactioncollection.h>
#include <kio/renamedialog.h>
+#include <kio/deletejob.h>
#include <KSharedConfig>
#include <KPluginInfo>
#include <KConfigDialog>
@@ -969,7 +970,7 @@ QUrl KGet::urlInputDialog()
while (!ok)
{
- newtransfer = KInputDialog::getText(i18n("New Download"), i18n("Enter \
URL:"), newtransfer, &ok, 0); + newtransfer = QInputDialog::getText(0, \
i18n("New Download"), i18n("Enter URL:"), QLineEdit::Normal, \
newtransfer, &ok);
newtransfer = newtransfer.trimmed(); //Remove any unnecessary space at \
the beginning and/or end
if (!ok)
@@ -1276,7 +1277,8 @@ bool KGet::safeDeleteFile( const QUrl& url )
"dialog-info");
return false;
}
- KIO::NetAccess::del( url, 0L );
+ KIO::DeleteJob * del = KIO::del(url);
+ del->exec();
return true;
}
diff --git a/core/urlchecker.cpp b/core/urlchecker.cpp
index 885691d..e0989ea 100644
--- a/core/urlchecker.cpp
+++ b/core/urlchecker.cpp
@@ -37,6 +37,7 @@
#include <QCheckBox>
#include <QHBoxLayout>
#include <QLabel>
+#include <QPushButton>
#include <KDialogButtonBox>
#include <KIO/RenameDialog>
@@ -45,13 +46,11 @@
#include <KStandardGuiItem>
ExistingTransferDialog::ExistingTransferDialog(const QString &text, const QString \
&caption, QWidget *parent)
- : KDialog(parent)
+ : QDialog(parent)
{
- setCaption(caption.isEmpty() ? i18n("Question") : caption);
+ setWindowTitle(caption.isEmpty() ? i18n("Question") : caption);
setModal(true);
- setButtons(0);
- QWidget *widget = new QWidget(this);
QVBoxLayout *layout = new QVBoxLayout;
QHBoxLayout *bottomLayout = new QHBoxLayout;
@@ -63,30 +62,35 @@ ExistingTransferDialog::ExistingTransferDialog(const QString \
&text, const QStrin bottomLayout->addStretch(1);
bottomLayout->addWidget(m_applyAll);
- KDialogButtonBox *buttonBox = new KDialogButtonBox(this);
- buttonBox->addButton(KStandardGuiItem::yes(), QDialogButtonBox::YesRole, this, \
SLOT(slotYesClicked()));
- buttonBox->addButton(KStandardGuiItem::no(), QDialogButtonBox::NoRole, this, \
SLOT(slotNoClicked()));
- buttonBox->addButton(KStandardGuiItem::cancel(), QDialogButtonBox::RejectRole, \
this, SLOT(slotCancelClicked())); + QDialogButtonBox *buttonBox = new \
QDialogButtonBox(this); + buttonBox->setStandardButtons(QDialogButtonBox::Yes | \
QDialogButtonBox::No | QDialogButtonBox::Cancel); + \
connect(buttonBox->button(QDialogButtonBox::Yes), &QPushButton::clicked, this, \
&ExistingTransferDialog::slotYesClicked); + \
connect(buttonBox->button(QDialogButtonBox::No), &QPushButton::clicked, this, \
&ExistingTransferDialog::slotNoClicked); + \
connect(buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, this, \
&ExistingTransferDialog::slotCancelClicked); bottomLayout->addWidget(buttonBox);
layout->addLayout(bottomLayout, 0);
-
- widget->setLayout(layout);
- setMainWidget(widget);
+
+ setLayout(layout);
}
void ExistingTransferDialog::slotYesClicked()
{
- done(m_applyAll->isChecked() ? KDialog::User2 : KDialog::Yes);
+ m_result = m_applyAll ? YesAll : Yes;
}
void ExistingTransferDialog::slotNoClicked()
{
- done(m_applyAll->isChecked() ? KDialog::User1 : KDialog::No);
+ m_result = m_applyAll ? NoAll : No;
}
void ExistingTransferDialog::slotCancelClicked()
{
- done(QDialog::Rejected);
+ m_result = Cancel;
+}
+
+ExistingTransferDialog::ExistingDialogReturn ExistingTransferDialog::result()
+{
+ return m_result;
}
@@ -587,22 +591,22 @@ QList<QUrl> UrlChecker::hasExistingTransferMessages(const \
QList<QUrl> &urls, con
int result;
if (Settings::filesOverwrite() || (Settings::filesAutomaticRename() \
&& (warning != ExistingTransfer))) {
- result = YesAll;
+ result = ExistingTransferDialog::ExistingDialogReturn::YesAll;
} else {
result = hasExistingDialog(it->first, type, warning);
}
switch (result) {
- case YesAll:
+ case ExistingTransferDialog::ExistingDialogReturn::YesAll:
isYesAll = true;
- case Yes:
+ case ExistingTransferDialog::ExistingDialogReturn::Yes:
urlsToDownload << it->first;
toDelete << it->second;
break;
- case NoAll:
+ case ExistingTransferDialog::ExistingDialogReturn::NoAll:
isNoAll = true;
- case No:
+ case ExistingTransferDialog::ExistingDialogReturn::No:
break;
- case Cancel:
+ case ExistingTransferDialog::ExistingDialogReturn::Cancel:
default:
removeTransfers(toDelete);
return urlsToDownload;
@@ -656,23 +660,11 @@ int UrlChecker::hasExistingDialog(const QUrl &url, const \
UrlChecker::UrlType typ }
}
- QScopedPointer<KDialog> dialog(new ExistingTransferDialog(message(url, type, \
warning), caption, parent)); + QScopedPointer<QDialog> dialog(new \
ExistingTransferDialog(message(url, type, warning), caption, parent));
- const int result = dialog->exec();
- switch (result) {
- case QDialog::Rejected:
- return Cancel;
- case KDialog::Yes:
- return Yes;
- case KDialog::User2:
- return YesAll;
- case KDialog::No:
- return No;
- case KDialog::User1:
- return NoAll;
- default:
- return result;
- }
+ dialog->exec();
+ const int result = (int) dialog->result();
+ return result;
}
///Non static methods following
diff --git a/core/urlchecker.h b/core/urlchecker.h
index 1ed1d71..2db0d8f 100644
--- a/core/urlchecker.h
+++ b/core/urlchecker.h
@@ -281,18 +281,6 @@ class KGET_EXPORT UrlChecker
static int hasExistingDialog(const QUrl &url, const UrlChecker::UrlType \
type, const UrlWarning warning);//TODO description --> returncode \
etc.!
static void removeTransfers(const QList<TransferHandler*> &toRemove);
- enum ExistingDialogReturn {
- Cancel = 0,
-
- //old stuff is overwritten/deleted
- Yes,
- YesAll,
-
- //new stuff is not used
- No,
- NoAll
- };
-
private:
UrlType m_type;
QList<QUrl> m_correctUrls;
diff --git a/core/urlchecker_p.h b/core/urlchecker_p.h
index 9da95cc..f7a23f4 100644
--- a/core/urlchecker_p.h
+++ b/core/urlchecker_p.h
@@ -20,19 +20,33 @@
#ifndef URL_CHECKER_P_H
#define URL_CHECKER_P_H
-#include <KDialog>
+#include <QDialog>
class QCheckBox;
/**
* Asks if existing transfers should be overwritten
*/
-class ExistingTransferDialog : public KDialog
+class ExistingTransferDialog : public QDialog
{
Q_OBJECT
public:
ExistingTransferDialog(const QString &text, const QString &caption, QWidget \
*parent = 0); +
+ enum ExistingDialogReturn {
+ Cancel = 0,
+
+ //old stuff is overwritten/deleted
+ Yes,
+ YesAll,
+
+ //new stuff is not used
+ No,
+ NoAll
+ };
+
+ ExistingDialogReturn result();
private slots:
void slotYesClicked();
@@ -41,6 +55,7 @@ class ExistingTransferDialog : public KDialog
private:
QCheckBox *m_applyAll;
+ ExistingDialogReturn m_result;
};
#endif
diff --git a/dbus/dbuskgetwrapper.cpp b/dbus/dbuskgetwrapper.cpp
index 69c1d24..2387363 100644
--- a/dbus/dbuskgetwrapper.cpp
+++ b/dbus/dbuskgetwrapper.cpp
@@ -168,8 +168,8 @@ void DBusKGetWrapper::importLinks(const QList <QString> &links)
bool DBusKGetWrapper::isSupported(const QString &url) const
{
foreach (TransferFactory * factory, KGet::factories()) {
- kDebug() << "Check" << factory->objectName() << "for" << url << "it is?" << \
factory->isSupported(KUrl(url));
- if (factory->isSupported(KUrl(url)))
+ kDebug() << "Check" << factory->objectName() << "for" << url << "it is?" << \
factory->isSupported(QUrl(url)); + if (factory->isSupported(QUrl(url)))
return true;
}
return false;
diff --git a/dbus/dbustransferwrapper.cpp b/dbus/dbustransferwrapper.cpp
index 2b12c08..99cdea3 100644
--- a/dbus/dbustransferwrapper.cpp
+++ b/dbus/dbustransferwrapper.cpp
@@ -71,7 +71,7 @@ QString DBusTransferWrapper::dest() const
bool DBusTransferWrapper::setDirectory(const QString &directory)
{
- return m_transfer->setDirectory(KUrl(directory));
+ return m_transfer->setDirectory(QUrl(directory));
}
qulonglong DBusTransferWrapper::totalSize() const
@@ -153,7 +153,7 @@ void DBusTransferWrapper::slotTransferChanged(TransferHandler \
*transfer, Transfe
QString DBusTransferWrapper::verifier(const QString &file)
{
- Verifier *verifier = m_transfer->verifier(KUrl(file));
+ Verifier *verifier = m_transfer->verifier(QUrl(file));
if (verifier) {
return verifier->dBusObjectPath();
}
@@ -163,7 +163,7 @@ QString DBusTransferWrapper::verifier(const QString &file)
bool DBusTransferWrapper::repair(const QString &file)
{
- return m_transfer->repair(KUrl(file));
+ return m_transfer->repair(QUrl(file));
}
diff --git a/transfer-plugins/checksumsearch/checksumsearchfactory.cpp \
b/transfer-plugins/checksumsearch/checksumsearchfactory.cpp index cb0cfab..9cd9892 \
100644
--- a/transfer-plugins/checksumsearch/checksumsearchfactory.cpp
+++ b/transfer-plugins/checksumsearch/checksumsearchfactory.cpp
@@ -32,7 +32,7 @@ ChecksumSearchFactory::~ChecksumSearchFactory()
{
}
-TransferDataSource *ChecksumSearchFactory::createTransferDataSource(const KUrl \
&srcUrl, const QDomElement &type, QObject *parent) +TransferDataSource \
*ChecksumSearchFactory::createTransferDataSource(const QUrl &srcUrl, const \
QDomElement &type, QObject *parent) {
qCDebug(KGET_DEBUG);
diff --git a/transfer-plugins/checksumsearch/checksumsearchfactory.h \
b/transfer-plugins/checksumsearch/checksumsearchfactory.h index 1aa5c23..d3acb38 \
100644
--- a/transfer-plugins/checksumsearch/checksumsearchfactory.h
+++ b/transfer-plugins/checksumsearch/checksumsearchfactory.h
@@ -23,7 +23,7 @@ class ChecksumSearchFactory : public TransferFactory
ChecksumSearchFactory(QObject *parent, const QVariantList &args);
~ChecksumSearchFactory();
- TransferDataSource * createTransferDataSource(const KUrl &srcUrl, const \
QDomElement &type, QObject *parent); + TransferDataSource * \
createTransferDataSource(const QUrl &srcUrl, const QDomElement &type, QObject \
*parent); };
#endif
diff --git a/transfer-plugins/metalink/metalinkfactory.h \
b/transfer-plugins/metalink/metalinkfactory.h index f834620..0261164 100644
--- a/transfer-plugins/metalink/metalinkfactory.h
+++ b/transfer-plugins/metalink/metalinkfactory.h
@@ -31,7 +31,7 @@ class MetalinkFactory : public TransferFactory
TransferGroup * parent, Scheduler * scheduler,
const QDomElement * e = 0 );
- QString displayName() { return "MetaLink"; }
+ QString displayName() const { return "MetaLink"; }
/**
* Checks if a URL is supported by this plugin.
*
diff --git a/transfer-plugins/metalink/metalinkxml.cpp \
b/transfer-plugins/metalink/metalinkxml.cpp index d521a7d..402e40f 100644
--- a/transfer-plugins/metalink/metalinkxml.cpp
+++ b/transfer-plugins/metalink/metalinkxml.cpp
@@ -212,7 +212,7 @@ bool MetalinkXml::metalinkInit(const QUrl &src, const QByteArray \
&data) // should be downloaded
/* TODO this portion seems not to be working. Need to ask boom1992 */
if (m_metalinkJustDownloaded) {
- KDialog *dialog = new FileSelectionDlg(fileModel());
+ QDialog *dialog = new FileSelectionDlg(fileModel());
dialog->setAttribute(Qt::WA_DeleteOnClose);
connect(dialog, SIGNAL(finished(int)), this, SLOT(fileDlgFinished(int)));
diff --git a/transfer-plugins/mirrorsearch/dlgmirrorsearch.h \
b/transfer-plugins/mirrorsearch/dlgmirrorsearch.h index 895def2..57a79fd 100644
--- a/transfer-plugins/mirrorsearch/dlgmirrorsearch.h
+++ b/transfer-plugins/mirrorsearch/dlgmirrorsearch.h
@@ -57,7 +57,7 @@ private:
void saveSearchEnginesSettings();
Ui::DlgMirrorSearch ui;
- KDialog *m_parent;
+ QDialog *m_parent;
};
#endif // DLGMULTISEGKIO_H
diff --git a/transfer-plugins/mmsthreads/mmstransferfactory.h \
b/transfer-plugins/mmsthreads/mmstransferfactory.h index c94daa0..98a6c0f 100755
--- a/transfer-plugins/mmsthreads/mmstransferfactory.h
+++ b/transfer-plugins/mmsthreads/mmstransferfactory.h
@@ -46,7 +46,7 @@ class MmsTransferFactory : public TransferFactory
bool isSupported(const QUrl &url) const;
- QString displayName(){return "mms";}
+ QString displayName() const {return "mms";}
};
diff --git a/ui/contextmenu.cpp b/ui/contextmenu.cpp
index dc3a468..b62a9a3 100644
--- a/ui/contextmenu.cpp
+++ b/ui/contextmenu.cpp
@@ -97,7 +97,7 @@ QMenu * ContextMenu::createTransferContextMenu(TransferHandler* \
handler, QWidget // only shows the open with actions if the transfer is finished
if (handler->status() == Job::Finished || handler->status() == \
Job::FinishedKeepAlive) { KFileItemList items;
- items << KFileItem(KFileItem::Unknown, KFileItem::Unknown, handler->dest());
+ items << KFileItem(handler->dest());
KFileItemActions menuActions;
diff --git a/ui/history/transferhistory.cpp b/ui/history/transferhistory.cpp
index 8d8d14f..7b5020d 100644
--- a/ui/history/transferhistory.cpp
+++ b/ui/history/transferhistory.cpp
@@ -205,7 +205,7 @@ void TransferHistory::slotOpenFile(const QModelIndex &index)
kDebug() << "Try to open the file : " << file;
if (!file.isEmpty()) {
- new KRun(file, this, true, false);
+ new KRun(file, this, true);
}
}
diff --git a/ui/history/transferhistoryitemdelegate.cpp \
b/ui/history/transferhistoryitemdelegate.cpp index 3bfa484..d39ba1c 100644
--- a/ui/history/transferhistoryitemdelegate.cpp
+++ b/ui/history/transferhistoryitemdelegate.cpp
@@ -186,7 +186,7 @@ void TransferHistoryItemDelegate::slotOpenFile()
{
const QAbstractItemModel *model = static_cast <const QAbstractItemModel *> \
(m_selectedIndex.model());
- new KRun(model->data(m_selectedIndex, \
TransferHistoryCategorizedDelegate::RoleDest).toString(), m_view, true, false); + \
new KRun(model->data(m_selectedIndex, \
TransferHistoryCategorizedDelegate::RoleDest).toString(), m_view, true); }
void TransferHistoryItemDelegate::slotDownload()
diff --git a/ui/newtransferdialog.cpp b/ui/newtransferdialog.cpp
index c3f3d19..04ef0a6 100644
--- a/ui/newtransferdialog.cpp
+++ b/ui/newtransferdialog.cpp
@@ -250,7 +250,7 @@ void NewTransferDialog::setDefaultDestination()
void NewTransferDialog::prepareDialog()
{
if (m_window) {
- KWindowInfo info = KWindowSystem::windowInfo(m_window->winId(), \
NET::WMDesktop); + KWindowInfo info(m_window->winId(), NET::WMDesktop);
KWindowSystem::setCurrentDesktop(info.desktop());
KWindowSystem::forceActiveWindow(m_window->winId());
}
@@ -762,7 +762,7 @@ void NewTransferDialogHandler::handleUrls(const int jobId)
const QList<TransferGroupHandler*> groups = \
KGet::groupsFromExceptions(url);
dialog = factory->createNewTransferDialog(url, suggestedFileName, \
!groups.isEmpty() ? groups.first() : 0); if (dialog) {
- KWindowInfo info = \
KWindowSystem::windowInfo(KGet::m_mainWindow->winId(), NET::WMDesktop); + \
KWindowInfo info(KGet::m_mainWindow->winId(), NET::WMDesktop); \
KWindowSystem::setCurrentDesktop(info.desktop());
KWindowSystem::forceActiveWindow(KGet::m_mainWindow->winId());
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic