From def247e9edee1588c9eafd39940cd15bff10c898 Mon Sep 17 00:00:00 2001
From: Noldor
Date: Sat, 11 Oct 2008 07:40:03 +0000
Subject: Sometimes they come back :)

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2696 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/objects/class_file.cpp | 45 ++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

(limited to 'src/modules/objects/class_file.cpp')

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
 			{
-- 
cgit v1.3.1-10-gc9f91