[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdenox/konq-embed/dropin/kio
From: Eva Brucherseifer <eva () kde ! org>
Date: 2006-04-26 21:12:42
Message-ID: 1146085962.187262.5874.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 534323 by eva:
Qtopia:
- create DocLnk for fully downloaded files
M +2 -2 job.cpp
M +15 -4 jobclasses.cpp
M +2 -1 jobclasses.h
M +1 -0 progressbase.cpp
--- trunk/kdenox/konq-embed/dropin/kio/job.cpp #534322:534323
@@ -144,7 +144,7 @@
QIO_perms &= ~IO_Translate;
QIO_perms |= IO_Raw;
deststream->open(QIO_perms);
- job = new IODeviceJob( deststream, src, CMD_GET, packedArgs, QByteArray(), \
showProgressInfo, kapp->mainWidget() ); + job = new IODeviceJob( deststream, src, \
dest, CMD_GET, packedArgs, QByteArray(), showProgressInfo, kapp->mainWidget() ); }
#if 0
@@ -183,7 +183,7 @@
QIO_perms &= ~IO_Translate;
QIO_perms |= IO_Raw;
deststream->open(QIO_perms);
- job = new IODeviceJob( deststream, src, CMD_SPECIAL, packedArgs, httpData, \
showProgressInfo, kapp->mainWidget() ); + job = new IODeviceJob( deststream, src, \
dest, CMD_SPECIAL, packedArgs, httpData, showProgressInfo, kapp->mainWidget() ); }
// ### TODO: support resume
--- trunk/kdenox/konq-embed/dropin/kio/jobclasses.cpp #534322:534323
@@ -45,6 +45,10 @@
#include <kdebug.h>
#include <global.h>
+#ifdef _QT_QPE_
+#include <qtopia/applnk.h>
+#endif
+
using namespace KIO;
Job::Job( bool showProgressInfo ) : m_reenter( 0 ), m_destruct( false )
@@ -638,12 +642,12 @@
}
IODeviceJob::IODeviceJob(QIODevice *device,
- const KURL& url, int command,
+ const KURL& srcurl, const KURL& desturl, int command,
const QByteArray &packedArgs,
const QByteArray &_staticData,
bool showProgressInfo, QWidget* parent)
- : TransferJob( url, command, packedArgs, _staticData, showProgressInfo ),
- m_iodevice( device )
+ : TransferJob( srcurl, command, packedArgs, _staticData, showProgressInfo ),
+ m_iodevice( device ), m_dest(desturl)
{
m_data = NULL;
m_widget = parent;
@@ -651,7 +655,7 @@
if (showProgressInfo)
{
defaultProgress = new ::ProgressDlg(parent);
- defaultProgress->slotTransferring( this, url );
+ defaultProgress->slotTransferring( this, srcurl );
defaultProgress->setOnlyClean( true );
defaultProgress->setJob(this);
@@ -735,6 +739,13 @@
assert(job == this);
setDevice(NULL);
defaultProgress->finished();
+#ifdef _QT_QPE_
+ if (!error())
+ {
+ DocLnk completeFile(m_dest.path()+".desktop");
+ kdDebug() << "Constructing DocLnk: " << m_dest.path()+".desktop" << endl;
+ }
+#endif
}
#include "jobclasses.moc"
--- trunk/kdenox/konq-embed/dropin/kio/jobclasses.h #534322:534323
@@ -270,7 +270,7 @@
public:
IODeviceJob(QIODevice *dest,
- const KURL& url, int command,
+ const KURL& srcurl, const KURL& desturl, int command,
const QByteArray &packedArgs,
const QByteArray &_staticData,
bool showProgressInfo, QWidget* parent);
@@ -294,6 +294,7 @@
protected:
ProgressDlg* defaultProgress;
+ KURL m_dest;
};
};
#endif
--- trunk/kdenox/konq-embed/dropin/kio/progressbase.cpp #534322:534323
@@ -117,6 +117,7 @@
}
emit stopped();
+ slotClean();
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic