[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kget/kf5_port] /: More deprecated porting and enable checksumsearch plugin again
From: Lukas Appelhans <l.appelhans () gmx ! de>
Date: 2014-10-29 12:54:14
Message-ID: E1XjSlS-0004To-8s () scm ! kde ! org
[Download RAW message or body]
Git commit 5b051fcdef00bcc5c1bc1bdfebbf0224273af632 by Lukas Appelhans.
Committed on 29/10/2014 at 12:36.
Pushed by lappelhans into branch 'kf5_port'.
More deprecated porting and enable checksumsearch plugin again
M +3 -3 mainwindow.cpp
M +1 -1 transfer-plugins/CMakeLists.txt
M +2 -0 transfer-plugins/checksumsearch/CMakeLists.txt
M +13 -12 transfer-plugins/checksumsearch/checksumsearch.cpp
M +5 -5 transfer-plugins/checksumsearch/checksumsearch.h
M +7 -0 transfer-plugins/checksumsearch/checksumsearchadddlg.ui
M +8 -3 transfer-plugins/checksumsearch/checksumsearchfactory.cpp
M +20 -19 transfer-plugins/checksumsearch/checksumsearchtransferdatasource.cpp
M +19 -15 transfer-plugins/checksumsearch/dlgchecksumsearch.cpp
M +2 -3 transfer-plugins/checksumsearch/dlgchecksumsearch.h
M +2 -2 transfer-plugins/mmsthreads/mmstransfer.cpp
M +1 -1 transfer-plugins/mmsthreads/mmstransfer.h
M +2 -2 ui/droptarget.cpp
M +1 -1 ui/groupsettingsdialog.cpp
M +10 -9 ui/linkview/kget_linkview.cpp
M +1 -0 ui/linkview/kget_linkview.h
M +3 -3 ui/signaturedlg.cpp
M +1 -1 ui/tray.cpp
http://commits.kde.org/kget/5b051fcdef00bcc5c1bc1bdfebbf0224273af632
diff --git a/mainwindow.cpp b/mainwindow.cpp
index d0f33f8..71c38eb 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -43,7 +43,7 @@
#include <kapplication.h>
#include <kstandarddirs.h>
-#include <KInputDialog>
+#include <QInputDialog>
#include <kmessagebox.h>
#include <knotifyconfigwidget.h>
#include <kfiledialog.h>
@@ -631,8 +631,8 @@ void MainWindow::slotRenameGroup()
foreach(TransferGroupHandler * it, KGet::selectedTransferGroups())
{
- groupName = KInputDialog::getText(i18n("Enter Group Name"),
- i18n("Group name:"), it->name(), &ok, \
this); + groupName = QInputDialog::getText(this, i18n("Enter Group Name"),
+ i18n("Group name:"), QLineEdit::Normal, \
it->name(), &ok); if(ok)
it->setName(groupName);
}
diff --git a/transfer-plugins/CMakeLists.txt b/transfer-plugins/CMakeLists.txt
index 21f7222..3473716 100644
--- a/transfer-plugins/CMakeLists.txt
+++ b/transfer-plugins/CMakeLists.txt
@@ -9,6 +9,6 @@ add_subdirectory(mirrorsearch)
if (LIBMMS_FOUND)
add_subdirectory(mmsthreads)
endif (LIBMMS_FOUND)
-#add_subdirectory(checksumsearch) TODO: Port to KF5
+add_subdirectory(checksumsearch)
SET(SUPPORTED_KGET_MIMETYPES "${SUPPORTED_KGET_MIMETYPES}" PARENT_SCOPE)
diff --git a/transfer-plugins/checksumsearch/CMakeLists.txt \
b/transfer-plugins/checksumsearch/CMakeLists.txt index ccda164..d641350 100644
--- a/transfer-plugins/checksumsearch/CMakeLists.txt
+++ b/transfer-plugins/checksumsearch/CMakeLists.txt
@@ -6,6 +6,7 @@ set(kget_checksumsearchfactory_PART_SRCS
checksumsearch.cpp
checksumsearchtransferdatasource.cpp
checksumsearchfactory.cpp
+ ../../kget_debug.cpp
)
kconfig_add_kcfg_files(kget_checksumsearchfactory_PART_SRCS \
checksumsearchsettings.kcfgc) @@ -20,6 +21,7 @@ install(FILES \
kget_checksumsearchfactory.kcfg DESTINATION ${KCFG_INSTALL_DIR})
###Build KCM-Module
set(kcm_kget_checksumsearchfactory_PART_SRCS
+../../kget_debug.cpp
checksumsearch.cpp
dlgchecksumsearch.cpp
)
diff --git a/transfer-plugins/checksumsearch/checksumsearch.cpp \
b/transfer-plugins/checksumsearch/checksumsearch.cpp index a47daa6..f9ffe5c 100644
--- a/transfer-plugins/checksumsearch/checksumsearch.cpp
+++ b/transfer-plugins/checksumsearch/checksumsearch.cpp
@@ -20,16 +20,17 @@
#include "checksumsearch.h"
#include "core/verifier.h"
+#include "kget_debug.h"
#include <QFile>
#include <QFileInfo>
-#include <KDebug>
+#include <QDebug>
#include <KLocalizedString>
const QStringList ChecksumSearch::URLCHANGEMODES = (QStringList() << i18n("Append") \
<< i18n("Replace file") << i18n("Replace file-ending"));
-ChecksumSearch::ChecksumSearch(const QList<KUrl> &srcs, const QString &fileName, \
const QStringList &types, QObject *parent) +ChecksumSearch::ChecksumSearch(const \
QList<QUrl> &srcs, const QString &fileName, const QStringList &types, QObject \
*parent) : QObject(parent),
m_copyJob(0),
m_srcs(srcs),
@@ -84,13 +85,13 @@ void ChecksumSearch::slotResult(KJob *job)
{
case 0://The download has finished
{
- qCDebug(KGET_DEBUG) << "Correctly downloaded" << m_src.pathOrUrl();
+ qCDebug(KGET_DEBUG) << "Correctly downloaded" << \
m_src.toDisplayString(); m_data = QString(m_dataBA);
break;
}
default:
- qCDebug(KGET_DEBUG) << "There was error" << job->error() << "while \
downloading" << m_src.pathOrUrl(); + qCDebug(KGET_DEBUG) << "There was \
error" << job->error() << "while downloading" << m_src.toDisplayString(); break;
}
@@ -163,22 +164,22 @@ void ChecksumSearch::parseDownloadEmpty()
createDownload();
}
-KUrl ChecksumSearch::createUrl(const KUrl &src, const QString &change, \
ChecksumSearch::UrlChangeMode mode) +QUrl ChecksumSearch::createUrl(const QUrl &src, \
const QString &change, ChecksumSearch::UrlChangeMode mode) {
if (!src.isValid() || change.isEmpty())
{
- return KUrl();
+ return QUrl();
}
- KUrl url;
+ QUrl url;
if (mode == kg_Append)
{
- url = KUrl(src.pathOrUrl() + change);
+ url = QUrl(src.toString() + change);
}
else if (mode == kg_ReplaceFile)
{
- KUrl temp = src.upUrl();
- temp.addPath(change);
+ QUrl temp = src.adjusted(QUrl::RemoveFilename);
+ temp.setPath(temp.toString() + "/" + change);
url = temp;
}
else if (mode == kg_ReplaceEnding)
@@ -188,8 +189,8 @@ KUrl ChecksumSearch::createUrl(const KUrl &src, const QString \
&change, ChecksumS if (index > -1)
{
fileName = fileName.left(index) + change;
- KUrl temp = src.upUrl();
- temp.addPath(fileName);
+ QUrl temp = src.adjusted(QUrl::RemoveFilename);
+ temp.setPath(temp.toString() + "/" + fileName);
url = temp;
}
}
diff --git a/transfer-plugins/checksumsearch/checksumsearch.h \
b/transfer-plugins/checksumsearch/checksumsearch.h index 6cda412..e8e7e36 100644
--- a/transfer-plugins/checksumsearch/checksumsearch.h
+++ b/transfer-plugins/checksumsearch/checksumsearch.h
@@ -23,14 +23,14 @@
#include <QObject>
#include <KIO/Job>
-#include <KUrl>
+#include <QUrl>
class ChecksumSearch : public QObject
{
Q_OBJECT
public:
- ChecksumSearch(const QList<KUrl> &srcs, const QString &fileName, const \
QStringList &types, QObject *parent = 0); + ChecksumSearch(const QList<QUrl> \
&srcs, const QString &fileName, const QStringList &types, QObject *parent = 0); \
~ChecksumSearch();
/**
@@ -55,7 +55,7 @@ class ChecksumSearch : public QObject
* @param change the string containing the change e.g. ".md5"
* @param mode the mode of the change e.g. Append
*/
- static KUrl createUrl(const KUrl &src, const QString &change, UrlChangeMode \
mode); + static QUrl createUrl(const QUrl &src, const QString &change, \
UrlChangeMode mode);
Q_SIGNALS:
void data(QString type, QString checksum);
@@ -82,8 +82,8 @@ class ChecksumSearch : public QObject
private:
KIO::TransferJob *m_copyJob;
- KUrl m_src;
- QList<KUrl> m_srcs;
+ QUrl m_src;
+ QList<QUrl> m_srcs;
QString m_fileName;
QString m_type;
QStringList m_types;
diff --git a/transfer-plugins/checksumsearch/checksumsearchadddlg.ui \
b/transfer-plugins/checksumsearch/checksumsearchadddlg.ui index 90e1409..27c77ee \
100644
--- a/transfer-plugins/checksumsearch/checksumsearchadddlg.ui
+++ b/transfer-plugins/checksumsearch/checksumsearchadddlg.ui
@@ -101,6 +101,13 @@
</property>
</spacer>
</item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<customwidgets>
diff --git a/transfer-plugins/checksumsearch/checksumsearchfactory.cpp \
b/transfer-plugins/checksumsearch/checksumsearchfactory.cpp index a931297..cb0cfab \
100644
--- a/transfer-plugins/checksumsearch/checksumsearchfactory.cpp
+++ b/transfer-plugins/checksumsearch/checksumsearchfactory.cpp
@@ -14,12 +14,15 @@
#include "core/scheduler.h"
#include "core/transfergroup.h"
-#include <QDomElement>
+#include "kget_debug.h"
-#include <kdebug.h>
+#include <QDomElement>
-KGET_EXPORT_PLUGIN( ChecksumSearchFactory )
+#include <qdebug.h>
+K_PLUGIN_FACTORY(KGetFactory,
+ registerPlugin<ChecksumSearchFactory>();
+)
ChecksumSearchFactory::ChecksumSearchFactory(QObject *parent, const QVariantList \
&args) : TransferFactory(parent, args)
{
@@ -38,3 +41,5 @@ TransferDataSource \
*ChecksumSearchFactory::createTransferDataSource(const KUrl & }
return 0;
}
+
+#include "checksumsearchfactory.moc"
diff --git a/transfer-plugins/checksumsearch/checksumsearchtransferdatasource.cpp \
b/transfer-plugins/checksumsearch/checksumsearchtransferdatasource.cpp index \
6edf1ce..38e0a89 100644
--- a/transfer-plugins/checksumsearch/checksumsearchtransferdatasource.cpp
+++ b/transfer-plugins/checksumsearch/checksumsearchtransferdatasource.cpp
@@ -20,10 +20,11 @@
#include "checksumsearchtransferdatasource.h"
#include "checksumsearch.h"
#include "checksumsearchsettings.h"
+#include "kget_debug.h"
#include <QFile>
-#include <KDebug>
+#include <QDebug>
#include <KIO/DeleteJob>
#include <KIO/NetAccess>
#include <KStandardDirs>
@@ -39,11 +40,11 @@ ChecksumSearchController::~ChecksumSearchController()
{
}
-void ChecksumSearchController::registerSearch(ChecksumSearchTransferDataSource \
*search, const KUrl &baseUrl) +void \
ChecksumSearchController::registerSearch(ChecksumSearchTransferDataSource *search, \
const QUrl &baseUrl) {
if (m_finished.contains(baseUrl)) {
qCDebug(KGET_DEBUG) << "Already downloaded" << baseUrl;
- const KUrl urlToFile = m_finished[baseUrl];
+ const QUrl urlToFile = m_finished[baseUrl];
if (!urlToFile.isEmpty()) {
search->gotBaseUrl(m_finished[baseUrl]);
}
@@ -59,13 +60,13 @@ void \
ChecksumSearchController::registerSearch(ChecksumSearchTransferDataSource * \
qCDebug(KGET_DEBUG) << "Creating download for" << baseUrl; static int files = 0;
- const KUrl dest = KUrl(KStandardDirs::locateLocal("appdata", \
"checksumsearch/") + QString::number(files++)); + const QUrl dest = \
QUrl(KStandardDirs::locateLocal("appdata", "checksumsearch/") + \
QString::number(files++)); if (QFile::exists(dest.toLocalFile())) {
KIO::Job *del = KIO::del(dest, KIO::HideProgressInfo);
KIO::NetAccess::synchronousRun(del, 0);
}
- if (baseUrl.protocol() != "ftp" && baseUrl.protocol() != "sftp") {
+ if (baseUrl.scheme() != "ftp" && baseUrl.scheme() != "sftp") {
qCDebug(KGET_DEBUG) << "Downloading" << baseUrl;
KIO::FileCopyJob *job = KIO::file_copy(baseUrl, dest, -1, \
KIO::HideProgressInfo); job->addMetaData("errorPage", "false");
@@ -82,11 +83,11 @@ void \
ChecksumSearchController::registerSearch(ChecksumSearchTransferDataSource * }
}
-void ChecksumSearchController::unregisterSearch(ChecksumSearchTransferDataSource \
*search, const KUrl &baseUrl) +void \
ChecksumSearchController::unregisterSearch(ChecksumSearchTransferDataSource *search, \
const QUrl &baseUrl) {
if (baseUrl.isEmpty()) {
- const QList<KUrl> keys = m_searches.keys(search);
- foreach (const KUrl &key, keys) {
+ const QList<QUrl> keys = m_searches.keys(search);
+ foreach (const QUrl &key, keys) {
m_searches.remove(key, search);
}
} else {
@@ -102,8 +103,8 @@ void ChecksumSearchController::slotEntries(KIO::Job *job, const \
KIO::UDSEntryLis return;
}
- const KUrl baseUrl = m_jobs[job].first;
- const KUrl urlToFile = m_jobs[job].second;
+ const QUrl baseUrl = m_jobs[job].first;
+ const QUrl urlToFile = m_jobs[job].second;
QFile file(urlToFile.toLocalFile());
if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
qCDebug(KGET_DEBUG) << "Could not open file" << urlToFile;
@@ -126,12 +127,12 @@ void ChecksumSearchController::slotResult(KJob *job)
return;
}
- const KUrl baseUrl = m_jobs[job].first;
- const KUrl urlToFile = m_jobs[job].second;
+ const QUrl baseUrl = m_jobs[job].first;
+ const QUrl urlToFile = m_jobs[job].second;
m_jobs.remove(job);
if (job->error()) {
qCDebug(KGET_DEBUG) << "Error while getting baseurl:" << baseUrl << \
job->error() << job->errorString();
- m_finished[baseUrl] = KUrl();
+ m_finished[baseUrl] = QUrl();
return;
}
@@ -144,25 +145,25 @@ void ChecksumSearchController::slotResult(KJob *job)
}
}
-ChecksumSearchTransferDataSource::ChecksumSearchTransferDataSource(const KUrl \
&srcUrl, QObject *parent) \
+ChecksumSearchTransferDataSource::ChecksumSearchTransferDataSource(const QUrl \
&srcUrl, QObject *parent) : TransferDataSource(srcUrl, parent)
{
}
ChecksumSearchTransferDataSource::~ChecksumSearchTransferDataSource()
{
- s_controller.unregisterSearch(this, m_sourceUrl.upUrl());
+ s_controller.unregisterSearch(this, m_sourceUrl.adjusted(QUrl::RemoveFilename));
}
void ChecksumSearchTransferDataSource::start()
{
qCDebug(KGET_DEBUG);
- const KUrl baseUrl = m_sourceUrl.upUrl();
+ const QUrl baseUrl = m_sourceUrl.adjusted(QUrl::RemoveFilename);
s_controller.registerSearch(this, baseUrl);
}
-void ChecksumSearchTransferDataSource::gotBaseUrl(const KUrl &urlToFile)
+void ChecksumSearchTransferDataSource::gotBaseUrl(const QUrl &urlToFile)
{
QFile file(urlToFile.toLocalFile());
if (!file.open(QIODevice::ReadOnly)) {
@@ -177,11 +178,11 @@ void ChecksumSearchTransferDataSource::gotBaseUrl(const KUrl \
&urlToFile)
QList<int> modes = ChecksumSearchSettings::self()->urlChangeModeList();
QStringList types = ChecksumSearchSettings::self()->checksumTypeList();
- QList<KUrl> urls;
+ QList<QUrl> urls;
for (int i = 0, k = 0; i < changes.size(); ++i) {
const ChecksumSearch::UrlChangeMode mode = \
static_cast<ChecksumSearch::UrlChangeMode>(modes.at(i));
- const KUrl source = ChecksumSearch::createUrl(m_sourceUrl, changes.at(i), \
mode); + const QUrl source = ChecksumSearch::createUrl(m_sourceUrl, \
changes.at(i), mode); if (data.indexOf(source.fileName().toAscii()) != -1) {
urls.append(source);
++k;
diff --git a/transfer-plugins/checksumsearch/dlgchecksumsearch.cpp \
b/transfer-plugins/checksumsearch/dlgchecksumsearch.cpp index 07ceb0e..7c6a4d5 100644
--- a/transfer-plugins/checksumsearch/dlgchecksumsearch.cpp
+++ b/transfer-plugins/checksumsearch/dlgchecksumsearch.cpp
@@ -19,33 +19,34 @@
#include "dlgchecksumsearch.h"
-#include "kget_export.h"
-
#include "core/verifier.h"
#include "checksumsearch.h"
#include "checksumsearchsettings.h"
+#include "kget_debug.h"
#include <QSortFilterProxyModel>
#include <QStandardItemModel>
#include <QStringListModel>
-#include <KDebug>
+#include <QDebug>
+
+#include <KStandardGuiItem>
+#include <KPluginFactory>
-KGET_EXPORT_PLUGIN_CONFIG(DlgChecksumSettingsWidget)
const QUrl ChecksumSearchAddDlg::URL = QUrl("http://www.example.com/file.zip");
+K_PLUGIN_FACTORY( KGetFactory, registerPlugin<DlgChecksumSettingsWidget>(); )
+
ChecksumSearchAddDlg::ChecksumSearchAddDlg(QStringListModel *modesModel, \
QStringListModel *typesModel, QWidget *parent, Qt::WFlags flags)
- : KDialog(parent, flags),
+ : QDialog(parent, flags),
m_modesModel(modesModel),
m_typesModel(typesModel)
{
- setCaption(i18n("Add item"));
- showButtonSeparator(true);
- QWidget *widget = new QWidget(this);
- ui.setupUi(widget);
- setMainWidget(widget);
+ setWindowTitle(i18n("Add item"));
+
+ ui.setupUi(this);
if (m_modesModel)
{
@@ -61,15 +62,17 @@ ChecksumSearchAddDlg::ChecksumSearchAddDlg(QStringListModel \
*modesModel, QString
connect(ui.change, SIGNAL(textChanged(QString)), this, SLOT(slotUpdate()));
connect(ui.mode, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdate()));
connect(this, SIGNAL(accepted()), this, SLOT(slotAccpeted()));
+ connect(ui.buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+ connect(ui.buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
}
void ChecksumSearchAddDlg::slotUpdate()
{
- enableButtonOk(!ui.change->text().isEmpty());
+ ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!ui.change->text().isEmpty());
const ChecksumSearch::UrlChangeMode mode = \
static_cast<ChecksumSearch::UrlChangeMode>(ui.mode->currentIndex());
const QUrl modifiedUrl = ChecksumSearch::createUrl(URL, ui.change->text(), \
mode);
- const QString text = i18n("%1 would become %2", URL.prettyUrl(), \
modifiedUrl.prettyUrl()); + const QString text = i18n("%1 would become %2", \
URL.toDisplayString(), modifiedUrl.toDisplayString()); ui.label->setText(text);
}
@@ -180,7 +183,7 @@ void ChecksumDelegate::updateEditorGeometry(QWidget *editor, \
const QStyleOptionV }
DlgChecksumSettingsWidget::DlgChecksumSettingsWidget(QWidget *parent, const \
QVariantList &args)
- : KCModule(KGetFactory::componentData(), parent, args)
+ : KCModule(/*KGetFactory::componentDaa(), */parent, args)
{
ui.setupUi(this);
@@ -203,8 +206,8 @@ DlgChecksumSettingsWidget::DlgChecksumSettingsWidget(QWidget \
*parent, const QVar
ChecksumDelegate *delegate = new ChecksumDelegate(m_modesModel, m_typesModel, \
this); ui.treeView->setItemDelegate(delegate);
ui.treeView->sortByColumn(2, Qt::AscendingOrder);
- ui.add->setGuiItem(KStandardGuiItem::add());
- ui.remove->setGuiItem(KStandardGuiItem::remove());
+ KGuiItem::assign(ui.add, KStandardGuiItem::add());
+ KGuiItem::assign(ui.remove, KStandardGuiItem::remove());
slotUpdate();
connect(ui.add, SIGNAL(clicked()), this, SLOT(slotAdd()));
@@ -285,4 +288,5 @@ void DlgChecksumSettingsWidget::save()
ChecksumSearchSettings::self()->save();
}
+#include "dlgchecksumsearch.moc"
diff --git a/transfer-plugins/checksumsearch/dlgchecksumsearch.h \
b/transfer-plugins/checksumsearch/dlgchecksumsearch.h index 0769136..946cb0d 100644
--- a/transfer-plugins/checksumsearch/dlgchecksumsearch.h
+++ b/transfer-plugins/checksumsearch/dlgchecksumsearch.h
@@ -34,7 +34,7 @@ class QSortFilterProxyModel;
class QStandardItemModel;
class QStringListModel;
-class ChecksumSearchAddDlg : public KDialog
+class ChecksumSearchAddDlg : public QDialog
{
Q_OBJECT
@@ -65,7 +65,7 @@ class ChecksumSearchAddDlg : public KDialog
QStringListModel *m_modesModel;
QStringListModel *m_typesModel;
- static const KUrl URL;
+ static const QUrl URL;
};
class ChecksumDelegate : public QStyledItemDelegate
@@ -126,7 +126,6 @@ class DlgChecksumSettingsWidget : public KCModule
private:
Ui::ChecksumSearch ui;
- KDialog *m_parent;
QStandardItemModel *m_model;
QSortFilterProxyModel *m_proxy;
QStringList m_modes;
diff --git a/transfer-plugins/mmsthreads/mmstransfer.cpp \
b/transfer-plugins/mmsthreads/mmstransfer.cpp index d8c236c..2bd53f8 100755
--- a/transfer-plugins/mmsthreads/mmstransfer.cpp
+++ b/transfer-plugins/mmsthreads/mmstransfer.cpp
@@ -24,8 +24,8 @@
#include <qdebug.h>
MmsTransfer::MmsTransfer(TransferGroup * parent, TransferFactory * factory,
- Scheduler * scheduler, const KUrl & source, const
- KUrl &dest, const QDomElement * e)
+ Scheduler * scheduler, const QUrl & source, const
+ QUrl &dest, const QDomElement * e)
: Transfer(parent, factory, scheduler, source, dest, e),
m_mmsdownload(NULL),
m_amountThreads(MmsSettings::threads()),
diff --git a/transfer-plugins/mmsthreads/mmstransfer.h \
b/transfer-plugins/mmsthreads/mmstransfer.h index ffa2278..ed9c869 100755
--- a/transfer-plugins/mmsthreads/mmstransfer.h
+++ b/transfer-plugins/mmsthreads/mmstransfer.h
@@ -34,7 +34,7 @@ class MmsTransfer : public Transfer
public:
MmsTransfer(TransferGroup * parent, TransferFactory * factory,
- Scheduler * scheduler, const KUrl & src, const KUrl & dest,
+ Scheduler * scheduler, const QUrl & src, const QUrl & dest,
const QDomElement * e = 0);
~MmsTransfer();
diff --git a/ui/droptarget.cpp b/ui/droptarget.cpp
index 6737dd7..66e0abb 100644
--- a/ui/droptarget.cpp
+++ b/ui/droptarget.cpp
@@ -203,14 +203,14 @@ void DropTarget::slotStartStopToggled( bool started )
void DropTarget::dragEnterEvent(QDragEnterEvent * event)
{
- event->setAccepted(KUrl::List::canDecode(event->mimeData())
+ event->setAccepted(event->mimeData()->hasUrls()
|| event->mimeData()->hasText());
}
void DropTarget::dropEvent(QDropEvent * event)
{
- KUrl::List list = KUrl::List::fromMimeData(event->mimeData());
+ QList<QUrl> list = event->mimeData()->urls();
QString str;
if (!list.isEmpty())
diff --git a/ui/groupsettingsdialog.cpp b/ui/groupsettingsdialog.cpp
index ef9f35e..7d6a44b 100644
--- a/ui/groupsettingsdialog.cpp
+++ b/ui/groupsettingsdialog.cpp
@@ -32,7 +32,7 @@ GroupSettingsDialog::GroupSettingsDialog(QWidget *parent, \
TransferGroupHandler * ui.defaultFolderRequester->setMode(KFile::Directory);
QString path = group->defaultFolder();
ui.defaultFolderRequester->setUrl(path);
- ui.defaultFolderRequester->setStartDir(KUrl(KGet::generalDestDir(true)));
+ ui.defaultFolderRequester->setStartDir(QUrl(KGet::generalDestDir(true)));
ui.regExpEdit->setText(group->regExp().pattern());
diff --git a/ui/linkview/kget_linkview.cpp b/ui/linkview/kget_linkview.cpp
index 70131a7..4c9f3e5 100644
--- a/ui/linkview/kget_linkview.cpp
+++ b/ui/linkview/kget_linkview.cpp
@@ -113,9 +113,9 @@ KGetLinkView::KGetLinkView(QWidget *parent)
connect(ui.dialogButtonBox, SIGNAL(rejected()), SLOT(reject()));
connect(ui.dialogButtonBox, SIGNAL(accepted()), SLOT(accept()));
- QPushButton *download = ui.dialogButtonBox->addButton(i18nc("Download the items \
which have been selected","&Download"), + m_downloadButton = \
ui.dialogButtonBox->addButton(i18nc("Download the items which have been \
selected","&Download"),
\
QDialogButtonBox::AcceptRole);
- download->setIcon(QIcon::fromTheme("kget"));
+ m_downloadButton->setIcon(QIcon::fromTheme("kget"));
checkClipboard();
}
@@ -161,7 +161,7 @@ void KGetLinkView::showLinks(const QStringList &links, bool \
urlRequestVisible)
foreach (const QString &linkitem, links)
{
- KUrl url;
+ QUrl url;
KMimeType::Ptr mt;
if (linkitem.contains(QLatin1String("url "), Qt::CaseInsensitive) &&
@@ -206,7 +206,7 @@ void KGetLinkView::showLinks(const QStringList &links, bool \
urlRequestVisible) items << item;
items << new QStandardItem();
items << new QStandardItem(mimeTypeComment);
- items << new QStandardItem(url.prettyUrl());
+ items << new QStandardItem(url.toDisplayString());
model->insertRow(model->rowCount(), items);
}
@@ -243,7 +243,7 @@ void KGetLinkView::slotStartLeech()
QStandardItemModel *model = qobject_cast<QStandardItemModel \
*>(m_proxyModel->sourceModel()); if (model)
{
- KUrl::List urls;
+ QList<QUrl> urls;
for (int row = 0; row < model->rowCount(); row++)
{
@@ -251,7 +251,7 @@ void KGetLinkView::slotStartLeech()
if (checkeableItem->checkState() == Qt::Checked)
{
- urls.append(KUrl(model->data(model->index(row, 4)).toString()));
+ urls.append(QUrl(model->data(model->index(row, 4)).toString()));
}
}
@@ -268,7 +268,7 @@ void KGetLinkView::importUrl(const QString &url)
{
if (url.isEmpty())
{
- KUrl clipboardUrl = \
KUrl(QApplication::clipboard()->text(QClipboard::Clipboard).trimmed()); + QUrl \
clipboardUrl = QUrl(QApplication::clipboard()->text(QClipboard::Clipboard).trimmed());
if (clipboardUrl.isValid() &&
((!clipboardUrl.scheme().isEmpty() && !clipboardUrl.host().isEmpty()) ||
(clipboardUrl.isLocalFile())))
@@ -278,7 +278,7 @@ void KGetLinkView::importUrl(const QString &url)
}
else
{
- ui.urlRequester->setUrl(KUrl(url));
+ ui.urlRequester->setUrl(QUrl(url));
slotStartImport();
}
}
@@ -311,6 +311,7 @@ void KGetLinkView::selectionChanged()
ui.selectAll->setEnabled( !(!modelRowCount || count == \
m_proxyModel->rowCount() ) ); ui.deselectAll->setEnabled( count > 0 );
ui.invertSelection->setEnabled( count > 0 );
+ m_downloadButton->setEnabled(buttonEnabled);
}
}
@@ -442,7 +443,7 @@ void KGetLinkView::updateImportButtonStatus(const QString &text)
bool enabled = false;
if (!text.isEmpty())
{
- KUrl url(text);
+ QUrl url(text);
if (url.isValid())
{
enabled = true;
diff --git a/ui/linkview/kget_linkview.h b/ui/linkview/kget_linkview.h
index 601f17d..5674c64 100644
--- a/ui/linkview/kget_linkview.h
+++ b/ui/linkview/kget_linkview.h
@@ -75,6 +75,7 @@ private:
QMenu *m_patternSyntaxMenu;
QAction *m_nameAction;
QAction *m_urlAction;
+ QPushButton * m_downloadButton;
};
#endif // KGET_LINKVIEW_H
diff --git a/ui/signaturedlg.cpp b/ui/signaturedlg.cpp
index dec6ea9..19fdeb6 100644
--- a/ui/signaturedlg.cpp
+++ b/ui/signaturedlg.cpp
@@ -35,7 +35,7 @@
#include <QLayoutItem>
-#include <KFileDialog>
+#include <QFileDialog>
#include <KLocalizedString>
#include <KIconLoader>
@@ -96,8 +96,8 @@ void SignatureDlg::textChanged()
void SignatureDlg::loadSignatureClicked()
{
- const KUrl url = KFileDialog::getOpenUrl(KGet::generalDestDir(), "*.asc|" + \
i18n("Detached OpenPGP ASCII signature (*.asc)") + '\n' +
- "*.sig|" + i18n("Detached OpenPGP \
binary signature (*.sig)"), this, i18n("Load Signature File")); + const QUrl url = \
QFileDialog::getOpenFileUrl(this, i18n("Load Signature File"), \
KGet::generalDestDir(), "*.asc|" + i18n("Detached OpenPGP ASCII signature (*.asc)") + \
'\n' + + "*.sig|" + i18n("Detached \
OpenPGP binary signature (*.sig)")); if (url.isEmpty()) {
return;
}
diff --git a/ui/tray.cpp b/ui/tray.cpp
index b13e592..01db7dc 100644
--- a/ui/tray.cpp
+++ b/ui/tray.cpp
@@ -63,7 +63,7 @@ void Tray::slotActivated()
newtransfer = newtransfer.trimmed();
if(!newtransfer.isEmpty())
- NewTransferDialogHandler::showNewTransferDialog(KUrl(newtransfer));
+ NewTransferDialogHandler::showNewTransferDialog(QUrl(newtransfer));
}
// display a play icon when downloading and
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic