aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/objects
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/objects')
-rw-r--r--src/modules/objects/class_file.cpp45
-rw-r--r--src/modules/objects/class_pixmap.cpp4
-rw-r--r--src/modules/objects/class_socket.cpp14
-rw-r--r--src/modules/objects/class_xmlreader.cpp14
-rw-r--r--src/modules/objects/libkviobjects.cpp4
5 files changed, 35 insertions, 46 deletions
diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp
index 111c73e53..4494c5afb 100644
--- a/src/modules/objects/class_file.cpp
+++ b/src/modules/objects/class_file.cpp
@@ -30,31 +30,32 @@
#include "kvi_error.h"
#include "kvi_file.h"
#include "kvi_fileutils.h"
+#include "class_memorybuffer.h"
#include <QStringList>
//#include <QFile>
#include <QTextStream>
// needed for $open()
-const char * const mod_tbl[] = {
- "Raw",
- "ReadOnly",
- "WriteOnly",
- "ReadWrite",
- "Append",
- "Truncate"
-};
+const char * const mod_tbl[] = {
+ "Raw",
+ "ReadOnly",
+ "WriteOnly",
+ "ReadWrite",
+ "Append",
+ "Truncate"
+ };
const QIODevice::OpenMode mod_cod[] = {
- QIODevice::Unbuffered,
- QIODevice::ReadOnly,
- QIODevice::WriteOnly,
- QIODevice::ReadWrite,
- QIODevice::Append,
- QIODevice::Truncate
-};
+ QIODevice::Unbuffered,
+ QIODevice::ReadOnly,
+ QIODevice::WriteOnly,
+ QIODevice::ReadWrite,
+ QIODevice::Append,
+ QIODevice::Truncate
+ };
-#define mod_num (sizeof(mod_tbl) / sizeof(mod_tbl[0]))
+#define mod_num (sizeof(mod_tbl) / sizeof(mod_tbl[0]))
/*
@doc: file
@@ -379,8 +380,7 @@ KVSO_CLASS_FUNCTION(file,readBlock)
return true;
}
//m_pFile->flush();
- // FIXME
- //((KviKvsObject_memorybuffer *)pObject)->pBuffer()->append(m_pFile->read(uLen));
+ ((KviKvsObject_memorybuffer *)pObject)->pBuffer()->append(m_pFile->read(uLen));
return true;
}
else
@@ -410,7 +410,7 @@ KVSO_CLASS_FUNCTION(file,read)
if(KviQString::equalCI(szType, "String"))
{
QString szStr;
- m_pFile->load(szStr);
+ m_pFile->load((QString)szStr);
c->returnValue()->setString(szStr);
}
else if(KviQString::equalCI(szType, "Integer"))
@@ -503,24 +503,17 @@ KVSO_CLASS_FUNCTION(file,writeBlock)
{
if (!uLen)
{
- /*
- FIXME
if (((KviKvsObject_memorybuffer *)pObject)->pBuffer()->size())
uLen=((KviKvsObject_memorybuffer *)pObject)->pBuffer()->size();
else
{
c->warning(__tr2qs("The memoryBuffer object is empty: nothing will be saved"));
}
- */
}
-
- /*
- FIXME
const char *pData=((KviKvsObject_memorybuffer *)pObject)->pBuffer()->data();
int rlen=m_pFile->write(pData,uLen);
c->returnValue()->setInteger(rlen);
//m_pFile->flush();
- */
}
else
{
diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp
index c40a93b43..a2f0eb9cd 100644
--- a/src/modules/objects/class_pixmap.cpp
+++ b/src/modules/objects/class_pixmap.cpp
@@ -24,6 +24,7 @@
//=============================================================================
#include "class_pixmap.h"
+#include "class_memorybuffer.h"
#include "kvi_debug.h"
#include "kvi_locale.h"
@@ -223,8 +224,7 @@ bool KviKvsObject_pixmap::functionloadFromMemoryBuffer(KviKvsObjectFunctionCall
return true;
}
- // FIXME
- //m_pPixmap->loadFromData(((KviKvsObject_memorybuffer *)pObject)->dataBuffer());
+ m_pPixmap->loadFromData(((KviKvsObject_memorybuffer *)pObject)->dataBuffer());
bPixmapModified=true;
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())
diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp
index a9e6b5985..4438df709 100644
--- a/src/modules/objects/class_xmlreader.cpp
+++ b/src/modules/objects/class_xmlreader.cpp
@@ -23,11 +23,12 @@
//=============================================================================
#include "class_xmlreader.h"
-//#include "class_memorybuffer.h"
-
+#include "class_memorybuffer.h"
#include "kvi_locale.h"
+
#include "kvi_kvs_variantlist.h"
#include "kvi_kvs_hash.h"
+
#include "kvi_qstring.h"
@@ -310,10 +311,10 @@ KVSO_CLASS_FUNCTION(xmlreader,parse)
KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("string_or_memorybuffer_object",KVS_PT_VARIANT,0,pVariantData)
KVSO_PARAMETERS_END(c)
-#ifdef QT_NO_XML
+ #ifdef QT_NO_XML
fatalError(__tr2qs("XML support not available in the Qt library"));
c->returnValue()->setBoolean(false);
-#else // QT_NO_XML
+ #else
m_szLastError = "";
KviXmlHandler handler(this);
QXmlInputSource source;
@@ -329,8 +330,6 @@ KVSO_CLASS_FUNCTION(xmlreader,parse)
c->warning(__tr2qs("Data parameter is not an object"));
return true;
}
- /*
- FIXME
if (pObject->inherits("KviKvsObject_memorybuffer"))
{
source.setData(*((KviKvsObject_memorybuffer *)pObject)->pBuffer());
@@ -340,7 +339,6 @@ KVSO_CLASS_FUNCTION(xmlreader,parse)
c->warning(__tr2qs("Data parameter is not a memorybuffer object"));
return true;
}
- */
}
else if(pVariantData->isString())
{
@@ -364,7 +362,7 @@ KVSO_CLASS_FUNCTION(xmlreader,parse)
reader.setContentHandler(&handler);
reader.setErrorHandler(&handler);
c->returnValue()->setBoolean(reader.parse(source));
-#endif // QT_NO_XML
+#endif
return true;
}
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 862c3b993..5a3cf5fe9 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -40,6 +40,7 @@
#include "class_list.h"
#include "class_listwidget.h"
#include "class_mainwindow.h"
+#include "class_memorybuffer.h"
#include "class_menubar.h"
#include "class_multilineedit.h"
#include "class_painter.h"
@@ -89,6 +90,8 @@ static bool objects_module_cleanup(KviModule *m)
// Don't attempt to change the order of these calls.
// Derived classes must be unregistered before the base ones.
+ KviKvsObject_memorybuffer::unregisterSelf();
+
KviKvsObject_process::unregisterSelf();
KviKvsObject_ftp::unregisterSelf();
KviKvsObject_http::unregisterSelf();
@@ -996,6 +999,7 @@ static bool objects_module_init(KviModule * m)
KviKvsObject_ftp::registerSelf();
KviKvsObject_process::registerSelf();
+ KviKvsObject_memorybuffer::registerSelf();
return true;
}
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 08:13:57 +0000