diff options
Diffstat (limited to 'src/modules/objects/class_socket.cpp')
| -rw-r--r-- | src/modules/objects/class_socket.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index 279637c71..0efabf88e 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -24,6 +24,7 @@ #include "kvi_settings.h" #include "kvi_qstring.h" +#include "class_memorybuffer.h" #include "class_file.h" #define _KVI_DEBUG_CHECK_RANGE_ #include "kvi_debug.h" @@ -283,12 +284,10 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_socket,"socket","object") KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,remoteIp) KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,localIp) KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,localPort) - /* - FIXME - KVSO_REGISTER_HANDLER(KviKvsObject_socket,"connect",functionConnect) +/* KVSO_REGISTER_HANDLER(KviKvsObject_socket,"connect",functionConnect) KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,connectTimeout) KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,setConnectTimeout) - */ +*/ KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,close) KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,read) KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,readHex) @@ -436,13 +435,10 @@ KVSO_CLASS_FUNCTION(socket,read) return true; } - /* - FIXME QByteArray *pBuffer=((KviKvsObject_memorybuffer *)pObject)->pBuffer(); int oldsize=pBuffer->size(); pBuffer->resize(oldsize+uLen); kvi_memmove(pBuffer->data()+oldsize,m_pInBuffer,uLen); - */ eatInData(uLen); return true; } @@ -504,14 +500,12 @@ KVSO_CLASS_FUNCTION(socket,write) c->warning(__tr2qs("Buffer parameter is not an object")); return true; } - /* - FIXME if (pObject->inherits("KviKvsObject_memorybuffer")) { QByteArray *p=((KviKvsObject_memorybuffer *)pObject)->pBuffer(); m_pOutBuffer->append((const unsigned char*)p->data(),p->size()); } - else*/ if (pObject->inherits("KviKvsObject_file")) + else if (pObject->inherits("KviKvsObject_file")) { KviFile *pFile=((KviKvsObject_file *)pObject)->pFile(); if (!pFile->isOpen()) |