From 504311e2a45c18e08865269985f00f7f3f3e6e8a Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 20 Jan 2009 19:03:00 +0100 Subject: Implemented a new function to download data with KJob technologies.. It's not working. For now. But we are nearing the goal.. --- src/browserapplication.cpp | 55 +++++++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 15 deletions(-) (limited to 'src/browserapplication.cpp') diff --git a/src/browserapplication.cpp b/src/browserapplication.cpp index bbd4b8b1..008917e1 100644 --- a/src/browserapplication.cpp +++ b/src/browserapplication.cpp @@ -22,9 +22,10 @@ // Local Includes #include "browserapplication.h" +#include "rekonq.h" + #include "mainwindow.h" #include "cookiejar.h" -#include "downloadmanager.h" #include "history.h" #include "networkaccessmanager.h" #include "mainview.h" @@ -34,6 +35,8 @@ #include #include #include +#include +#include // Qt Includes #include @@ -49,7 +52,6 @@ -DownloadManager *BrowserApplication::s_downloadManager = 0; HistoryManager *BrowserApplication::s_historyManager = 0; NetworkAccessManager *BrowserApplication::s_networkAccessManager = 0; @@ -103,7 +105,6 @@ BrowserApplication::BrowserApplication(KCmdLineArgs *args, const QString &server BrowserApplication::~BrowserApplication() { - delete s_downloadManager; qDeleteAll(m_mainWindows); delete s_networkAccessManager; } @@ -146,6 +147,41 @@ void BrowserApplication::postLaunch() } +void BrowserApplication::downloadUrl(const KUrl &url) +{ +// QString path = ReKonfig::downloadDir() + QString("/") + url.fileName(); +// KIO::NetAccess::download( url , path , mainWindow() ); + m_downloadUrl = url; + KIO::TransferJob * job = KIO::get( m_downloadUrl, KIO::NoReload); + connect(job, SIGNAL( result(KJob*) ), this, SLOT( slotResult(KJob*) ) ); + connect(job, SIGNAL(data(KIO::Job*,const QByteArray &)), this, SLOT(slotData(KIO::Job*, const QByteArray&))); +} + + +void BrowserApplication::slotResult(KJob* job) +{ + if ( job->error() ) + { + kDebug() << job->errorString(); + } + else + { + QString path = ReKonfig::downloadDir() + QString("/") + m_downloadUrl.fileName(); + QFile destFile( path ); + destFile.write(m_downloadData); + destFile.close(); + m_downloadData = 0; + } +} + + +void BrowserApplication::slotData(KIO::Job*, const QByteArray& data) +{ + m_downloadData.append(data); +} + + + QList BrowserApplication::mainWindows() { clean(); @@ -243,7 +279,7 @@ bool BrowserApplication::isTheOnlyBrowser() const void BrowserApplication::openUrl(const KUrl &url) { - mainWindow()->loadUrl( url ); + mainWindow()->loadUrl(url); } @@ -293,17 +329,6 @@ CookieJar *BrowserApplication::cookieJar() } -DownloadManager *BrowserApplication::downloadManager() -{ - if (!s_downloadManager) - { - s_downloadManager = new DownloadManager(); - } - return s_downloadManager; -} - - - NetworkAccessManager *BrowserApplication::networkAccessManager() { if (!s_networkAccessManager) -- cgit v1.2.1