[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kio_virtualfile/kio
From:       Allan Sandfeld Jensen <kde () carewolf ! com>
Date:       2006-07-14 14:56:13
Message-ID: 1152888973.906692.29762.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 562344 by carewolf:

Better naming


 M  +1 -1      CMakeLists.txt  
 M  +1 -1      kio/CMakeLists.txt  
 A             kio/filejob.cpp   kio/slavefile.cpp#562283 [License: LGPL (v2)]
 A             kio/filejob.h   kio/slavefile.h#562283 [License: LGPL (v2)]
 M  +2 -1      kio/global.h  
 M  +5 -5      kio/job.h  
 M  +6 -0      kio/slavebase.cpp  
 M  +2 -0      kio/slavebase.h  
 D             kio/slavefile.cpp  
 D             kio/slavefile.h  


--- branches/work/kio_virtualfile/kio/CMakeLists.txt #562343:562344
@@ -84,7 +84,7 @@
   kio/kprotocolmanager.cpp
   kio/slave.cpp
   kio/slaveinterface.cpp
-  kio/slavefile.cpp
+  kio/filejob.cpp
   kio/sessiondata.cpp
   kio/scheduler.cpp
   kio/connection.cpp
--- branches/work/kio_virtualfile/kio/kio/CMakeLists.txt #562343:562344
@@ -22,7 +22,7 @@
   jobuidelegate.h
   paste.h
   slavebase.h
-  slavefile.h
+  filejob.h
   progressbase.h
   defaultprogress.h
   statusbarprogress.h
--- branches/work/kio_virtualfile/kio/kio/global.h #562343:562344
@@ -258,8 +258,9 @@
     ERR_UPGRADE_REQUIRED = KJob::UserDefinedError + 64, // A transport upgrade is \
                required to access this
                                                         // object.  For instance, \
                TLS is demanded by
                                                         // the server in order to \
                continue.
-    ERR_POST_DENIED = KJob::UserDefinedError + 65 // Issued when trying to POST data \
to a certain Ports +    ERR_POST_DENIED = KJob::UserDefinedError + 65, // Issued when \
trying to POST data to a certain Ports  // see job.cpp
+    ERR_COULD_NOT_SEEK = KJob::UserDefinedError + 66
   };
 
   /**
--- branches/work/kio_virtualfile/kio/kio/job.h #562343:562344
@@ -26,7 +26,7 @@
 
 namespace KIO {
 
-    class SlaveFile;
+    class FileJob;
 
     /**
      * Creates a single directory.
@@ -189,13 +189,13 @@
     KIO_EXPORT TransferJob *get( const KUrl& url, bool reload=false, bool \
showProgressInfo = true );  
     /**
-     * Open ( read-only )
+     * Open ( stepwise I/O )
      *
-     * The slave-file emits open()
+     * The file-job emits open() when opened
      * @param url the URL of the file
-     * @return the file-handle slave
+     * @return the file-handling job
      */
-    KIO_EXPORT SlaveFile *open( const KUrl& url );
+    KIO_EXPORT FileJob *open( const KUrl& url );
 
     /**
      * Put (a.k.a. write)
--- branches/work/kio_virtualfile/kio/kio/slavebase.cpp #562343:562344
@@ -510,6 +510,12 @@
 //    d->processed_size = _bytes;
 }
 
+void SlaveBase::written( KIO::filesize_t _bytes )
+{
+    KIO_DATA << KIO_FILESIZE_T(_bytes);
+    m_pConnection->send( MSG_WRITTEN, data );
+}
+
 void SlaveBase::position( KIO::filesize_t _pos )
 {
     KIO_DATA << KIO_FILESIZE_T(_pos);
--- branches/work/kio_virtualfile/kio/kio/slavebase.h #562343:562344
@@ -189,6 +189,8 @@
 
     void position( KIO::filesize_t _pos );
 
+    void written( KIO::filesize_t _bytes );
+
     /**
      * Only use this if you can't know in advance the size of the
      * copied data. For example, if you're doing variable bitrate


[prev in list] [next in list] [prev in thread] [next in thread]