removed old Qt3 wrappers;

improved hungarian notation;
added doxygen comments;


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

3 files changed, 12 insertions, 12 deletions

diff --git a/src/modules/objects/class_file.h b/src/modules/objects/class_file.h
index 8c41312be..e184a95c8 100644
--- a/src/modules/objects/class_file.h
+++ b/src/modules/objects/class_file.h
@@ -35,10 +35,10 @@ class KviKvsObject_file : public KviKvsObject_widget
 public:
 	KVSO_DECLARE_OBJECT(KviKvsObject_file)
 protected:
-	KviFile* m_pFile;
+	KviFile * m_pFile;
 public:
 
-	KviFile *pFile(){return m_pFile;};
+	KviFile * file(){ return m_pFile; };
 	bool setName(KviKvsObjectFunctionCall *c);
 	bool name(KviKvsObjectFunctionCall *c);
 	bool open(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/objects/class_memorybuffer.cpp b/src/modules/objects/class_memorybuffer.cpp
index 58e93488a..bff3f425a 100644
--- a/src/modules/objects/class_memorybuffer.cpp
+++ b/src/modules/objects/class_memorybuffer.cpp
@@ -86,14 +86,14 @@ KVSO_CLASS_FUNCTION(memorybuffer,loadFromFile)
 	{
 
 		KviFile f(szFileName);
-                debug("loading file %s",szFileName.toUtf8().data());
-                if (f.open(QIODevice::ReadOnly))
-                {
-                    m_pBuffer->resize(f.size());
-                    f.readBlock(m_pBuffer->data(),f.size());
-                    f.close();
-                }
-                else debug("Error in load file!");
+		debug("loading file %s",szFileName.toUtf8().data());
+		if (f.open(QIODevice::ReadOnly))
+		{
+			m_pBuffer->resize(f.size());
+			f.read(m_pBuffer->data(),f.size());
+			f.close();
+		}
+		else debug("Error in load file!");
 	}
 	else c->warning(__tr2qs_ctx("The file '%Q' does not exist","objects"),&szFileName);
 	return true;
@@ -108,7 +108,7 @@ KVSO_CLASS_FUNCTION(memorybuffer,saveToFile)
 	KviFile f(szFileName);
 	if (f.open(QIODevice::WriteOnly))
 	{
-                f.writeBlock(m_pBuffer->data(),m_pBuffer->size());
+		f.write(m_pBuffer->data(),m_pBuffer->size());
 		f.close();
 	}
 	else
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index 934264356..63dcf0b62 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -511,7 +511,7 @@ KVSO_CLASS_FUNCTION(socket,write)
 		}
 		else if (pObject->inheritsClass("file"))
 		{
-			KviFile *pFile=((KviKvsObject_file *)pObject)->pFile();
+			KviFile *pFile=((KviKvsObject_file *)pObject)->file();
 			if (!pFile->isOpen())
 			{
 				c->warning(__tr2qs_ctx("File is not open!","objects"));