fixed typos

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

3 files changed, 71 insertions, 79 deletions

diff --git a/po/modules/objects/objects.pot b/po/modules/objects/objects.pot
index c7bea541e..2d5d16187 100644
--- a/po/modules/objects/objects.pot
+++ b/po/modules/objects/objects.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-28 18:59+0100\n"
+"POT-Creation-Date: 2008-10-28 19:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -336,14 +336,14 @@ msgstr ""
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_pixmap.cpp:211
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_socket.cpp:428
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_socket.cpp:499
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:367
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:487
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:369
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:489
 msgid "Buffer parameter is not an object"
 msgstr ""
 
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_pixmap.cpp:216
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_socket.cpp:433
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:372
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:374
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:508
 msgid "Buffer parameter is not a memorybuffer object"
 msgstr ""
@@ -474,7 +474,7 @@ msgid "The hex string lenght is not a multiple of 2"
 msgstr ""
 
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_socket.cpp:627
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:614
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:613
 msgid "The hex string is not correct!"
 msgstr ""
 
@@ -775,44 +775,44 @@ msgstr ""
 msgid "No such open mode '%Q'"
 msgstr ""
 
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:319
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:321
 msgid "Argument too long, using only first char"
 msgstr ""
 
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:321
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:323
 msgid "Write error occured!"
 msgstr ""
 
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:330
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:332
 msgid "Read error occured!"
 msgstr ""
 
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:344
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:346
 msgid "Argument too long, using only the first char"
 msgstr ""
 
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:419
-msgid "The incoming data doesn't an array"
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:421
+msgid "The incoming data isn't an array"
 msgstr ""
 
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:429
-msgid "The incoming data doesn't a Dictionary"
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:431
+msgid "The incoming data isn't a Dictionary"
 msgstr ""
 
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:439
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:441
 msgid "Unsupported datatype '%Q'"
 msgstr ""
 
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:478
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:480
 msgid "File is not open !"
 msgstr ""
 
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:498
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:500
 msgid "The memoryBuffer object is empty: nothing will be saved"
 msgstr ""
 
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:516
-msgid "Block parameter must been a string or a memorybuffer object"
+msgid "Block parameter must be a string or a memorybuffer object"
 msgstr ""
 
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:597
diff --git a/po/modules/objects/objects_it.po b/po/modules/objects/objects_it.po
index a1d38507a..1294d0467 100644
--- a/po/modules/objects/objects_it.po
+++ b/po/modules/objects/objects_it.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: objects_it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-28 18:59+0100\n"
-"PO-Revision-Date: 2008-10-24 21:18+0200\n"
-"Last-Translator: Elvio Basello\n"
+"POT-Creation-Date: 2008-10-28 19:21+0100\n"
+"PO-Revision-Date: 2008-10-28 19:21+0100\n"
+"Last-Translator: \n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,10 +58,8 @@ msgstr ""
 "esadecimale o tre interi"
 
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_widget.cpp:1141
-msgid ""
-"$setGeometry() requires either an array as first parameter or four integers"
-msgstr ""
-"$setGeometry() richiede sia un array come primo parametro o quattro interi"
+msgid "$setGeometry() requires either an array as first parameter or four integers"
+msgstr "$setGeometry() richiede sia un array come primo parametro o quattro interi"
 
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_http.cpp:247
 msgid "'%Q' is not a valid file path"
@@ -81,15 +79,13 @@ msgstr "Un'altra connessione in corso"
 
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_pixmap.cpp:278
 msgid "Area dimensions are out of destination size "
-msgstr ""
-"Le dimensioni dell'area sono più grandi della grandezza di destinazione"
+msgstr "Le dimensioni dell'area sono più grandi della grandezza di destinazione"
 
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:319
-#, fuzzy
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:321
 msgid "Argument too long, using only first char"
 msgstr "Argomento troppo lungo, uso solo il primo carattere"
 
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:344
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:346
 msgid "Argument too long, using only the first char"
 msgstr "Argomento troppo lungo, uso solo il primo carattere"
 
@@ -99,12 +95,12 @@ msgid "Bind failure"
 msgstr "Bind fallito"
 
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:516
-msgid "Block parameter must been a string or a memorybuffer object"
-msgstr ""
+msgid "Block parameter must be a string or a memorybuffer object"
+msgstr "Il parametro di blocco deve essere una stringa o un oggetto memorybuffer"
 
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_pixmap.cpp:216
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_socket.cpp:433
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:372
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:374
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:508
 msgid "Buffer parameter is not a memorybuffer object"
 msgstr ""
@@ -116,8 +112,8 @@ msgstr ""
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_pixmap.cpp:211
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_socket.cpp:428
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_socket.cpp:499
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:367
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:487
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:369
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:489
 msgid "Buffer parameter is not an object"
 msgstr ""
 
@@ -249,7 +245,7 @@ msgstr ""
 msgid "Failed to setup a nonblocking socket"
 msgstr ""
 
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:478
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:480
 msgid "File is not open !"
 msgstr ""
 
@@ -541,7 +537,7 @@ msgstr ""
 msgid "Processing aborted"
 msgstr ""
 
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:330
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:332
 msgid "Read error occured!"
 msgstr ""
 
@@ -599,7 +595,7 @@ msgid "The first parameter didn't evaluate to an array nor an integer"
 msgstr "Il primo parametro non viene valutato come array né come intero"
 
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_socket.cpp:627
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:614
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:613
 msgid "The hex string is not correct!"
 msgstr ""
 
@@ -607,19 +603,19 @@ msgstr ""
 msgid "The hex string lenght is not a multiple of 2"
 msgstr ""
 
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:429
-msgid "The incoming data doesn't a Dictionary"
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:431
+msgid "The incoming data isn't a Dictionary"
 msgstr ""
 
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:419
-msgid "The incoming data doesn't an array"
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:421
+msgid "The incoming data isn't an array"
 msgstr ""
 
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_treewidgetitem.cpp:169
 msgid "The listviewitem cannot be parentless"
 msgstr ""
 
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:498
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:500
 msgid "The memoryBuffer object is empty: nothing will be saved"
 msgstr ""
 
@@ -671,8 +667,7 @@ msgid "There is no connection to accept!"
 msgstr ""
 
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_socket.cpp:1198
-msgid ""
-"Too much unprocessed incoming data (you've left this socket unmanaged ?)"
+msgid "Too much unprocessed incoming data (you've left this socket unmanaged ?)"
 msgstr ""
 
 #: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_widget.cpp:1934
@@ -761,7 +756,7 @@ msgstr ""
 msgid "Unknown widget flag '%Q'"
 msgstr ""
 
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:439
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:441
 msgid "Unsupported datatype '%Q'"
 msgstr ""
 
@@ -823,7 +818,7 @@ msgstr "Il parametro widget non è un oggetto"
 msgid "Widget, Image or Pixmap required "
 msgstr ""
 
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:321
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_file.cpp:323
 msgid "Write error occured!"
 msgstr ""
 
@@ -836,5 +831,3 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#~ msgid " I can't find the specified file '%Q'."
-#~ msgstr "Non trovo il file '%Q' specificato."
diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp
index f3c430005..519b5172b 100644
--- a/src/modules/objects/class_file.cpp
+++ b/src/modules/objects/class_file.cpp
@@ -40,23 +40,23 @@
 	{c->warning(__tr2qs_ctx("File is not open!","objects"));return true;}
 
 // 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]))
 
@@ -268,6 +268,7 @@ KVSO_CLASS_FUNCTION(file,close)
 	m_pFile->close();
 	return true;
 }
+
 KVSO_CLASS_FUNCTION(file,flush)
 {
 	CHECK_INTERNAL_POINTER(m_pFile)
@@ -282,6 +283,7 @@ KVSO_CLASS_FUNCTION(file,size)
 	c->returnValue()->setInteger((kvs_int_t)(m_pFile->size()));
 	return true;
 }
+
 KVSO_CLASS_FUNCTION(file,atEnd)
 {
 	CHECK_INTERNAL_POINTER(m_pFile)
@@ -289,7 +291,6 @@ KVSO_CLASS_FUNCTION(file,atEnd)
 	return true;
 }
 
-
 KVSO_CLASS_FUNCTION(file,where)
 {
 	CHECK_INTERNAL_POINTER(m_pFile)
@@ -297,6 +298,7 @@ KVSO_CLASS_FUNCTION(file,where)
 	c->returnValue()->setInteger((kvs_int_t)(m_pFile->pos()));
 	return true;
 }
+
 KVSO_CLASS_FUNCTION(file,seek)
 {
 	CHECK_INTERNAL_POINTER(m_pFile)
@@ -416,7 +418,7 @@ KVSO_CLASS_FUNCTION(file,read)
 		if (pVar->isArray())
 			c->returnValue()->setArray(pVar->array());
 		else
-			c->warning(__tr2qs_ctx("The incoming data doesn't an array","objects"));
+			c->warning(__tr2qs_ctx("The incoming data isn't an array","objects"));
 	}
 	else if(KviQString::equalCI(szType, "Dict"))
 	{
@@ -426,7 +428,7 @@ KVSO_CLASS_FUNCTION(file,read)
 		if (pVar->isHash())
 			c->returnValue()->setHash(pVar->hash());
 		else
-			c->warning(__tr2qs_ctx("The incoming data doesn't a Dictionary","objects"));
+			c->warning(__tr2qs_ctx("The incoming data isn't a Dictionary","objects"));
 	}
 	else if(KviQString::equalCI(szType, "String"))
 	{
@@ -502,9 +504,7 @@ KVSO_CLASS_FUNCTION(file,writeBlock)
 				int rlen=m_pFile->write(pData,uLen);
 				c->returnValue()->setInteger(rlen);
 				//m_pFile->flush();
-			}
-			else
-			{
+			} else {
 				c->warning(__tr2qs_ctx("Buffer parameter is not a memorybuffer object","objects"));
 				return true;
 			}
@@ -513,7 +513,7 @@ KVSO_CLASS_FUNCTION(file,writeBlock)
 		else
 		{
 			if (!pVariantData->isString()){
-				c->warning(__tr2qs_ctx("Block parameter must been a string or a memorybuffer object","objects"));
+				c->warning(__tr2qs_ctx("Block parameter must be a string or a memorybuffer object","objects"));
 				return true;
 			}
 			QString szBlock;
@@ -570,11 +570,11 @@ KVSO_CLASS_FUNCTION(file,readHexBlock)
 		byte=(unsigned char)buff[i];
 		lsb=byte & 0x0f;
 		msb=byte>>4;
-		msb>9?msb+='7':msb+='0'; 
-		lsb>9?lsb+='7':lsb+='0'; 
-		str[index++]=msb; 
+		msb>9?msb+='7':msb+='0';
+		lsb>9?lsb+='7':lsb+='0';
+		str[index++]=msb;
 		str[index++]=lsb;
-	}		
+	}
 	str[index]='\0';
 	c->returnValue()->setString(str);
 	delete str;
@@ -592,7 +592,7 @@ KVSO_CLASS_FUNCTION(file,writeHexBlock)
 		KVSO_PARAMETER("text_block",KVS_PT_STRING,0,szBlock)
 		KVSO_PARAMETER("lenght",KVS_PT_UNSIGNEDINTEGER,KVS_PF_OPTIONAL,uLen)
 	KVSO_PARAMETERS_END(c)
-	if (szBlock.length()%2) 
+	if (szBlock.length()%2)
 	{
 		c->warning(__tr2qs_ctx("Lenght of hex string is not multiple of 2","objects"));
 		return true;
@@ -607,10 +607,9 @@ KVSO_CLASS_FUNCTION(file,writeHexBlock)
 		
 		if (((msb>='A' && msb<='F')||(msb>='0' && msb<='9')) && ((lsb>='A' && lsb<='F')|| (lsb>='0' && lsb<='9')))
 		{
-					msb>='A'?msb-='7':msb-='0';
-					lsb>='A'?lsb-='7':lsb-='0';
-		}
-		else{
+			msb>='A'?msb-='7':msb-='0';
+			lsb>='A'?lsb-='7':lsb-='0';
+		} else{
 			c->warning(__tr2qs_ctx("The hex string is not correct!","objects"));
 			return true;
 		}