excluded Noldor's breaking code: FIX IT\!

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2694 17fca916-40b9-46aa-a4ea-0a15b648b75c

4 files changed, 45 insertions, 29 deletions

diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp
index 4494c5afb..111c73e53 100644
--- a/src/modules/objects/class_file.cpp
+++ b/src/modules/objects/class_file.cpp
@@ -30,32 +30,31 @@
 #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
@@ -380,7 +379,8 @@ KVSO_CLASS_FUNCTION(file,readBlock)
 				return true;
 			}
 			//m_pFile->flush();
-			((KviKvsObject_memorybuffer *)pObject)->pBuffer()->append(m_pFile->read(uLen));
+			// FIXME
+			//((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((QString)szStr);
+			m_pFile->load(szStr);
 			c->returnValue()->setString(szStr);
 		}
 		else if(KviQString::equalCI(szType, "Integer"))
@@ -503,17 +503,24 @@ 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 a2f0eb9cd..c40a93b43 100644
--- a/src/modules/objects/class_pixmap.cpp
+++ b/src/modules/objects/class_pixmap.cpp
@@ -24,7 +24,6 @@
 //=============================================================================
 
 #include "class_pixmap.h"
-#include "class_memorybuffer.h"
 
 #include "kvi_debug.h"
 #include "kvi_locale.h"
@@ -224,7 +223,8 @@ bool KviKvsObject_pixmap::functionloadFromMemoryBuffer(KviKvsObjectFunctionCall
 		return true;
 	}
 
-	m_pPixmap->loadFromData(((KviKvsObject_memorybuffer *)pObject)->dataBuffer());
+	// FIXME
+	//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 786040786..279637c71 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -24,7 +24,6 @@
 
 #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"
@@ -284,9 +283,12 @@ 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_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)
@@ -434,10 +436,13 @@ 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;
 	}
@@ -499,12 +504,14 @@ 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 4438df709..a9e6b5985 100644
--- a/src/modules/objects/class_xmlreader.cpp
+++ b/src/modules/objects/class_xmlreader.cpp
@@ -23,12 +23,11 @@
 //=============================================================================
 
 #include "class_xmlreader.h"
-#include "class_memorybuffer.h"
-#include "kvi_locale.h"
+//#include "class_memorybuffer.h"
 
+#include "kvi_locale.h"
 #include "kvi_kvs_variantlist.h"
 #include "kvi_kvs_hash.h"
-
 #include "kvi_qstring.h"
 
 
@@ -311,10 +310,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
+#else // QT_NO_XML
 	m_szLastError = "";
 	KviXmlHandler handler(this);
 	QXmlInputSource source;
@@ -330,6 +329,8 @@ 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());
@@ -339,6 +340,7 @@ KVSO_CLASS_FUNCTION(xmlreader,parse)
 			c->warning(__tr2qs("Data parameter is not a memorybuffer object"));
 			return true;
 		}
+		*/
 	}
 	else if(pVariantData->isString())
 	{
@@ -362,7 +364,7 @@ KVSO_CLASS_FUNCTION(xmlreader,parse)
 	reader.setContentHandler(&handler);
 	reader.setErrorHandler(&handler);
 	c->returnValue()->setBoolean(reader.parse(source));
-#endif
+#endif // QT_NO_XML
 	return true;
 }