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

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

SVN commit 558714 by carewolf:

Remove the STREAM command, add more parts


 M  +3 -2      CMakeLists.txt  
 M  +4 -5      global.h  
 M  +6 -1      slavebase.cpp  
 A             slavefile.cpp   [License: LGPL (v2)]
 A             slavefile.h   [License: LGPL (v2)]


--- branches/work/kio_virtualfile/kio/kio/CMakeLists.txt #558713:558714
@@ -20,6 +20,7 @@
   jobuidelegate.h
   paste.h
   slavebase.h
+  slavefile.h
   progressbase.h
   defaultprogress.h
   statusbarprogress.h
@@ -73,6 +74,6 @@
   kremoteencoding.h
   kmimetypechooser.h
   kacl.h
-  kdedesktopmimetype.h 
+  kdedesktopmimetype.h
   kbuildsycocaprogressdialog.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}) 
+  DESTINATION ${INCLUDE_INSTALL_DIR})
--- branches/work/kio_virtualfile/kio/kio/global.h #558713:558714
@@ -176,11 +176,10 @@
    * Commands that can be invoked on a slave-file.
    */
   enum FileCommand {
-    CMD_READ = 128,
-    CMD_STREAM = 129,
-    CMD_STOP = 130,
-    CMD_SEEK = 131,
-    CMD_CLOSE = 132
+    CMD_READ  = 128,
+    CMD_WRITE = 129,
+    CMD_SEEK  = 131,
+    CMD_CLOSE = 134
   }
 
   /**
--- branches/work/kio_virtualfile/kio/kio/slavebase.cpp #558713:558714
@@ -396,7 +396,7 @@
    m_pConnection->send( MSG_DATA_REQ );
 }
 
-void SlaveBase::data( void* fd )
+void SlaveBase::file( void* fd )
 {
    if (!mOutgoingMetaData.isEmpty())
       sendMetaData();
@@ -987,6 +987,11 @@
         stream >> url;
         get( url );
     } break;
+    case CMD_OPEN:
+    {
+        stream >> url;
+        get( url );
+    } break;
     case CMD_PUT:
     {
         int permissions;
[prev in list] [next in list] [prev in thread] [next in thread]