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

5 files changed, 22 insertions, 21 deletions

diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp
index 05dbc50e4..5b457ca93 100644
--- a/src/modules/file/libkvifile.cpp
+++ b/src/modules/file/libkvifile.cpp
@@ -696,7 +696,7 @@ static bool file_kvs_fnc_ls(KviKvsModuleFunctionCall * c)
 		An empty string is returned if a serious error occures.[br]
 		The <filename> is adjusted according to the system that KVIrc is running on.[br]
 		Flags are actually limited to the single letter 'l'. By default the file
-		is decoded from the ut8 characters set. If 'l' is present the the file
+		is decoded from the utf8 characters set. If 'l' is present the the file
 		is decoded by using the local 8 bit character set instead.
 	@examples:
 		[example]
@@ -904,17 +904,18 @@ static bool file_kvs_cmd_writeLines(KviKvsModuleCommandCall * c)
 
 	KviFile f(szFile);
 
-	if(!f.openForWriting(c->switches()->find('a',"append")))
+	bool bAppend = c->switches()->find('a',"append");
+	bool bLocal8Bit = c->switches()->find('l',"local-8-bit");
+	bool bNoSeparator = c->switches()->find('n',"no-separator");
+	bool bAddCR = c->switches()->find('c',"crlf");
+	
+	if(!f.open(QFile::WriteOnly | (bAppend ? QFile::Append : QFile::Truncate)))
 	{
 		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs("Can't open the file \"%Q\" for writing"),&szFile);
 		return true;
 	}
 
-	bool bLocal8Bit = c->switches()->find('l',"local-8-bit");
-	bool bNoSeparator = c->switches()->find('n',"no-separator");
-	bool bAddCR = c->switches()->find('c',"crlf");
-
 	unsigned int u = 0;
 	while(u < a.array()->size())
 	{
@@ -931,7 +932,7 @@ static bool file_kvs_cmd_writeLines(KviKvsModuleCommandCall * c)
 				if(bAddCR)dat += "\r\n";
 				else dat += '\n';
 			}
-			f.writeBlock(dat.data(),dat.length());
+			f.write(dat.data(),dat.length());
 		}
 		u++;
 	}
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"));
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index e7696e781..9f6b8c59e 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -732,7 +732,7 @@ void KviRegisteredUsersDialog::exportClicked()
 	hf.version = KVI_REGUSER_DB_FILE_VERSION;
 	hf.nentries = nEntries;
 
-	if(f.writeBlock((const char *)&hf,sizeof(KviReguserDbFileHeader)) != sizeof(KviReguserDbFileHeader))goto write_error;
+	if(f.write((const char *)&hf,sizeof(KviReguserDbFileHeader)) != sizeof(KviReguserDbFileHeader))goto write_error;
 
 	for(int i=0; i<list.count(); i++)
 	{
@@ -834,7 +834,7 @@ void KviRegisteredUsersDialog::importClicked()
 	KviReguserDbFileHeader hf;
 	unsigned int idx;
 
-	if(f.readBlock((char *)&hf,sizeof(KviReguserDbFileHeader)) != sizeof(KviReguserDbFileHeader))goto read_error;
+	if(f.read((char *)&hf,sizeof(KviReguserDbFileHeader)) != sizeof(KviReguserDbFileHeader))goto read_error;
 
 	if(hf.magic != KVI_REGUSER_DB_FILE_MAGIC)
 	{