Revert "Add support to windows unc remote path in module File; code fix/enhancement in KVS classes"

This reverts commit 741e768cfef3d1aa86d057b667f6bb4f1375f78d.

4 files changed, 132 insertions, 501 deletions

diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp
index 8220e74bf..2ff9022f1 100644
--- a/src/modules/file/libkvifile.cpp
+++ b/src/modules/file/libkvifile.cpp
@@ -94,11 +94,8 @@ static bool file_kvs_cmd_copy(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("source",KVS_PT_NONEMPTYSTRING,0,szSrc)
 		KVSM_PARAMETER("destination",KVS_PT_NONEMPTYSTRING,0,szDst)
 	KVSM_PARAMETERS_END(c)
-
-	if (szSrc.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szSrc);
-	if (szDst.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szDst);
+	KviFileUtils::adjustFilePath(szSrc);
+	KviFileUtils::adjustFilePath(szDst);
 	if(KviFileUtils::fileExists(szDst) && !c->switches()->find('o',"overwrite"))
 	{
 		c->warning(__tr2qs("Destination file exists: no copy made"));
@@ -136,8 +133,7 @@ static bool file_kvs_cmd_addimagepath(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("path",KVS_PT_NONEMPTYSTRING,0,szDst)
 	KVSM_PARAMETERS_END(c)
-	if (szDst.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szDst);
+	KviFileUtils::adjustFilePath(szDst);
 
 	//QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).find(szDst);
 	int iIndex = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).indexOf(szDst);
@@ -170,8 +166,7 @@ static bool file_kvs_cmd_delimagepath(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("path",KVS_PT_NONEMPTYSTRING,0,szDst)
 	KVSM_PARAMETERS_END(c)
-	if (szDst.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szDst);
+	KviFileUtils::adjustFilePath(szDst);
 
 	//QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).find(szDst);
 	int iIndex = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).indexOf(szDst);
@@ -220,8 +215,8 @@ static bool file_kvs_cmd_write(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szFileName)
 		KVSM_PARAMETER("data",KVS_PT_NONEMPTYSTRING,0,szData)
 	KVSM_PARAMETERS_END(c)
-	if (szFileName.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szFileName);
+	KviFileUtils::adjustFilePath(szFileName);
+
 	bool bRet;
 	if(c->switches()->find('l',"local-8-bit"))
 		bRet = KviFileUtils::writeFileLocal8Bit(szFileName,szData,c->switches()->find('a',"append"));
@@ -277,8 +272,7 @@ static bool file_kvs_cmd_writeBytes(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("dataArray",KVS_PT_ARRAY,0,pArray)
 	KVSM_PARAMETERS_END(c)
 
-	if (szFileName.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szFileName);
+	KviFileUtils::adjustFilePath(szFileName);
 
 	if(!pArray)
 		return c->error(__tr2qs("Missing data array"));
@@ -345,10 +339,8 @@ static bool file_kvs_cmd_rename(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("newname",KVS_PT_NONEMPTYSTRING,0,szNew)
 	KVSM_PARAMETERS_END(c)
 
-	if (szOld.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szOld);
-	if (szNew.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szNew);
+	KviFileUtils::adjustFilePath(szOld);
+	KviFileUtils::adjustFilePath(szNew);
 
 	if(KviFileUtils::fileExists(szNew))
 		c->warning(__tr2qs("Destination file exists: file not renamed"));
@@ -390,8 +382,7 @@ static bool file_kvs_cmd_mkdir(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("directory",KVS_PT_NONEMPTYSTRING,0,szDir)
 	KVSM_PARAMETERS_END(c)
-	if (szDir.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szDir);
+	KviFileUtils::adjustFilePath(szDir);
 	if(!KviFileUtils::makeDir(szDir))
 	{
 		if(!c->switches()->find('q',"quiet"))
@@ -427,16 +418,15 @@ static bool file_kvs_cmd_mkdir(KviKvsModuleCommandCall * c)
 
 static bool file_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 {
-	QString szFileName;
+	QString szName;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("name",KVS_PT_NONEMPTYSTRING,0,szFileName)
+		KVSM_PARAMETER("name",KVS_PT_NONEMPTYSTRING,0,szName)
 	KVSM_PARAMETERS_END(c)
-	if (szFileName.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szFileName);
-	if(!KviFileUtils::removeFile(szFileName))
+	KviFileUtils::adjustFilePath(szName);
+	if(!KviFileUtils::removeFile(szName))
 	{
 		if(!c->switches()->find('q',"quiet"))
-			c->warning(__tr2qs("Failed to remove the file '%Q'"),&szFileName);
+			c->warning(__tr2qs("Failed to remove the file '%Q'"),&szName);
 	}
 	return true;
 }
@@ -470,16 +460,15 @@ static bool file_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 
 static bool file_kvs_cmd_rmdir(KviKvsModuleCommandCall * c)
 {
-	QString szFileName;
+	QString szName;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("name",KVS_PT_NONEMPTYSTRING,0,szFileName)
+		KVSM_PARAMETER("name",KVS_PT_NONEMPTYSTRING,0,szName)
 	KVSM_PARAMETERS_END(c)
-	if (szFileName.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szFileName);
-	if(!KviFileUtils::removeDir(szFileName))
+	KviFileUtils::adjustFilePath(szName);
+	if(!KviFileUtils::removeDir(szName))
 	{
 		if(!c->switches()->find('q',"quiet"))
-			c->warning(__tr2qs("Failed to remove the directory '%Q'"),&szFileName);
+			c->warning(__tr2qs("Failed to remove the directory '%Q'"),&szName);
 	}
 	return true;
 }
@@ -508,13 +497,12 @@ static bool file_kvs_cmd_rmdir(KviKvsModuleCommandCall * c)
 
 static bool file_kvs_fnc_exists(KviKvsModuleFunctionCall * c)
 {
-	QString szFileName;
+	QString szName;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("filename",KVS_PT_STRING,0,szFileName)
+		KVSM_PARAMETER("filename",KVS_PT_STRING,0,szName)
 	KVSM_PARAMETERS_END(c)
-	if (szFileName.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szFileName);
-	QFileInfo f(szFileName);
+	KviFileUtils::adjustFilePath(szName);
+	QFileInfo f(szName);
 	c->returnValue()->setBoolean(f.exists());
 	return true;
 }
@@ -537,13 +525,12 @@ static bool file_kvs_fnc_exists(KviKvsModuleFunctionCall * c)
 
 static bool file_kvs_fnc_type(KviKvsModuleFunctionCall * c)
 {
-	QString szFileName;
+	QString szName;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szFileName)
+		KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szName)
 	KVSM_PARAMETERS_END(c)
-	if (szFileName.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szFileName);
-	QFileInfo f(szFileName);
+	KviFileUtils::adjustFilePath(szName);
+	QFileInfo f(szName);
 	if(f.isFile())
 		c->returnValue()->setString("f");
 	else if(f.isDir())
@@ -571,13 +558,12 @@ static bool file_kvs_fnc_type(KviKvsModuleFunctionCall * c)
 
 static bool file_kvs_fnc_size(KviKvsModuleFunctionCall * c)
 {
-	QString szFileName;
+	QString szName;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szFileName)
+		KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szName)
 	KVSM_PARAMETERS_END(c)
-	if (szFileName.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szFileName);
-	QFileInfo f(szFileName);
+	KviFileUtils::adjustFilePath(szName);
+	QFileInfo f(szName);
 	c->returnValue()->setInteger(f.size());
 	return true;
 }
@@ -603,8 +589,7 @@ static bool file_kvs_fnc_allSizes(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("directory",KVS_PT_NONEMPTYSTRING,0,szDir)
 	KVSM_PARAMETERS_END(c)
-	if (szDir.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szDir);
+	KviFileUtils::adjustFilePath(szDir);
 
 	QDir d(szDir);
 	if(!d.exists())
@@ -660,12 +645,12 @@ static bool file_kvs_fnc_allSizes(KviKvsModuleFunctionCall * c)
 
 static bool file_kvs_fnc_fixpath(KviKvsModuleFunctionCall * c)
 {
-	QString szFileName;
+	QString szName;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("filename",KVS_PT_STRING,0,szFileName)
+		KVSM_PARAMETER("filename",KVS_PT_STRING,0,szName)
 	KVSM_PARAMETERS_END(c)
-	KviFileUtils::adjustFilePath(szFileName);
-	c->returnValue()->setString(szFileName);
+	KviFileUtils::adjustFilePath(szName);
+	c->returnValue()->setString(szName);
 	return true;
 }
 
@@ -746,9 +731,7 @@ static bool file_kvs_fnc_ls(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("filter",KVS_PT_STRING,KVS_PF_OPTIONAL,szFilter)
 	KVSM_PARAMETERS_END(c)
 
-	if (szDir.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szDir);
-
+	KviFileUtils::adjustFilePath(szDir);
 
 	QDir d(szDir);
 	if(!d.exists())
@@ -840,21 +823,20 @@ static bool file_kvs_fnc_ls(KviKvsModuleFunctionCall * c)
 
 static bool file_kvs_fnc_read(KviKvsModuleFunctionCall * c)
 {
-	QString szFileName;
+	QString szNameZ;
 	kvs_uint_t uSize;
 	QString szFlags;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szFileName)
+		KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szNameZ)
 		KVSM_PARAMETER("size",KVS_PT_UINT,KVS_PF_OPTIONAL,uSize)
 		KVSM_PARAMETER("flags",KVS_PT_STRING,KVS_PF_OPTIONAL,szFlags)
 	KVSM_PARAMETERS_END(c)
-	if (szFileName.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szFileName);
+	KviFileUtils::adjustFilePath(szNameZ);
 
-	QFile f(szFileName);
+	QFile f(szNameZ);
 	if(!f.open(QIODevice::ReadOnly))
 	{
-		c->warning(__tr2qs("Can't open the file '%Q' for reading"),&szFileName);
+		c->warning(__tr2qs("Can't open the file '%Q' for reading"),&szNameZ);
 		return true;
 	}
 
@@ -871,7 +853,7 @@ static bool file_kvs_fnc_read(KviKvsModuleFunctionCall * c)
 		{
 			// ops
 			KviMemory::free(pcBuf);
-			c->warning(__tr2qs("Read error for file '%Q' (have been unable to read the requested size in 1000 retries)"),&szFileName);
+			c->warning(__tr2qs("Read error for file '%Q' (have been unable to read the requested size in 1000 retries)"),&szNameZ);
 			return true;
 		}
 
@@ -880,7 +862,7 @@ static bool file_kvs_fnc_read(KviKvsModuleFunctionCall * c)
 		if(iReadedNow < 0)
 		{
 			KviMemory::free(pcBuf);
-			c->warning(__tr2qs("Read error for file '%Q'"),&szFileName);
+			c->warning(__tr2qs("Read error for file '%Q'"),&szNameZ);
 			return true;
 		}
 
@@ -933,20 +915,19 @@ static bool file_kvs_fnc_read(KviKvsModuleFunctionCall * c)
 
 static bool file_kvs_fnc_readBytes(KviKvsModuleFunctionCall * c)
 {
-	QString szFileName;
+	QString szNameZ;
 	kvs_uint_t uSize;
 	QString szFlags;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szFileName)
+		KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szNameZ)
 		KVSM_PARAMETER("size",KVS_PT_UINT,KVS_PF_OPTIONAL,uSize)
 	KVSM_PARAMETERS_END(c)
-	if (szFileName.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szFileName);
+	KviFileUtils::adjustFilePath(szNameZ);
 
-	QFile f(szFileName);
+	QFile f(szNameZ);
 	if(!f.open(QIODevice::ReadOnly))
 	{
-		c->warning(__tr2qs("Can't open the file '%Q' for reading"),&szFileName);
+		c->warning(__tr2qs("Can't open the file '%Q' for reading"),&szNameZ);
 		return true;
 	}
 
@@ -963,7 +944,7 @@ static bool file_kvs_fnc_readBytes(KviKvsModuleFunctionCall * c)
 		{
 			// ops
 			KviMemory::free(pcBuf);
-			c->warning(__tr2qs("Read error for file '%Q' (have been unable to read the requested size in 1000 retries)"),&szFileName);
+			c->warning(__tr2qs("Read error for file '%Q' (have been unable to read the requested size in 1000 retries)"),&szNameZ);
 			return true;
 		}
 
@@ -972,7 +953,7 @@ static bool file_kvs_fnc_readBytes(KviKvsModuleFunctionCall * c)
 		if(iReadedNow < 0)
 		{
 			KviMemory::free(pcBuf);
-			c->warning(__tr2qs("Read error for file '%Q'"),&szFileName);
+			c->warning(__tr2qs("Read error for file '%Q'"),&szNameZ);
 			return true;
 		}
 
@@ -1032,24 +1013,23 @@ static bool file_kvs_fnc_readBytes(KviKvsModuleFunctionCall * c)
 
 static bool file_kvs_fnc_readLines(KviKvsModuleFunctionCall * c)
 {
-	QString szFileName;
+	QString szName;
 	QString szFlags;
 	kvs_int_t iStartLine;
 	kvs_int_t iCount;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szFileName)
+		KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szName)
 		KVSM_PARAMETER("startline",KVS_PT_INT,KVS_PF_OPTIONAL,iStartLine)
 		KVSM_PARAMETER("count",KVS_PT_INT,KVS_PF_OPTIONAL,iCount)
 		KVSM_PARAMETER("flags",KVS_PT_STRING,KVS_PF_OPTIONAL,szFlags)
 	KVSM_PARAMETERS_END(c)
-	if (szFileName.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szFileName);
+	KviFileUtils::adjustFilePath(szName);
 
-	QFile f(szFileName);
+	QFile f(szName);
 
 	if(!f.open(QIODevice::ReadOnly))
 	{
-		c->warning(__tr2qs("Can't open the file '%Q' for reading"),&szFileName);
+		c->warning(__tr2qs("Can't open the file '%Q' for reading"),&szName);
 		return true;
 	}
 
@@ -1141,17 +1121,16 @@ static bool file_kvs_fnc_readLines(KviKvsModuleFunctionCall * c)
 
 static bool file_kvs_cmd_writeLines(KviKvsModuleCommandCall * c)
 {
-	QString szFileName,szFlags;
+	QString szFile,szFlags;
 	KviKvsArrayCast a;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szFileName)
+		KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szFile)
 		KVSM_PARAMETER("lines",KVS_PT_ARRAYCAST,0,a)
 	KVSM_PARAMETERS_END(c)
 
-	if (szFileName.left(2)!="\\\\")
-		KviFileUtils::adjustFilePath(szFileName);
+	KviFileUtils::adjustFilePath(szFile);
 
-	KviFile f(szFileName);
+	KviFile f(szFile);
 
 	bool bAppend = c->switches()->find('a',"append");
 	bool bLocal8Bit = c->switches()->find('l',"local-8-bit");
@@ -1161,7 +1140,7 @@ static bool file_kvs_cmd_writeLines(KviKvsModuleCommandCall * c)
 	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"),&szFileName);
+			c->warning(__tr2qs("Can't open the file '%Q' for writing"),&szFile);
 		return true;
 	}
 
@@ -1222,14 +1201,14 @@ static bool file_kvs_cmd_writeLines(KviKvsModuleCommandCall * c)
 
 static bool file_kvs_fnc_localdir(KviKvsModuleFunctionCall * c)
 {
-	QString szFileName;
+	QString szName;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("relative_path",KVS_PT_STRING,KVS_PF_OPTIONAL,szFileName)
+		KVSM_PARAMETER("relative_path",KVS_PT_STRING,KVS_PF_OPTIONAL,szName)
 	KVSM_PARAMETERS_END(c)
-	if(szFileName.isEmpty())
-		szFileName.append(KVI_PATH_SEPARATOR_CHAR);
+	if(szName.isEmpty())
+		szName.append(KVI_PATH_SEPARATOR_CHAR);
 	QString szPath;
-	g_pApp->getLocalKvircDirectory(szPath,KviApplication::None,szFileName);
+	g_pApp->getLocalKvircDirectory(szPath,KviApplication::None,szName);
 	KviFileUtils::adjustFilePath(szPath);
 	c->returnValue()->setString(szPath);
 	return true;
@@ -1256,15 +1235,15 @@ static bool file_kvs_fnc_localdir(KviKvsModuleFunctionCall * c)
 
 static bool file_kvs_fnc_homedir(KviKvsModuleFunctionCall * c)
 {
-	QString szFileName;
+	QString szName;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("relative_path",KVS_PT_STRING,KVS_PF_OPTIONAL,szFileName)
+		KVSM_PARAMETER("relative_path",KVS_PT_STRING,KVS_PF_OPTIONAL,szName)
 	KVSM_PARAMETERS_END(c)
-	if(szFileName.isEmpty())
-		szFileName.append(KVI_PATH_SEPARATOR_CHAR);
+	if(szName.isEmpty())
+		szName.append(KVI_PATH_SEPARATOR_CHAR);
 	QString szPath = QDir::homePath();
 	KviQString::ensureLastCharIs(szPath,KVI_PATH_SEPARATOR_CHAR);
-	szPath.append(szFileName);
+	szPath.append(szName);
 	KviFileUtils::adjustFilePath(szPath);
 	c->returnValue()->setString(szPath);
 	return true;
@@ -1292,15 +1271,15 @@ static bool file_kvs_fnc_homedir(KviKvsModuleFunctionCall * c)
 
 static bool file_kvs_fnc_rootdir(KviKvsModuleFunctionCall * c)
 {
-	QString szFileName;
+	QString szName;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("relative_path",KVS_PT_STRING,KVS_PF_OPTIONAL,szFileName)
+		KVSM_PARAMETER("relative_path",KVS_PT_STRING,KVS_PF_OPTIONAL,szName)
 	KVSM_PARAMETERS_END(c)
-	if(szFileName.isEmpty())
-		szFileName.append(KVI_PATH_SEPARATOR_CHAR);
+	if(szName.isEmpty())
+		szName.append(KVI_PATH_SEPARATOR_CHAR);
 	QString szPath = QDir::rootPath();
 	KviQString::ensureLastCharIs(szPath,KVI_PATH_SEPARATOR_CHAR);
-	szPath.append(szFileName);
+	szPath.append(szName);
 	KviFileUtils::adjustFilePath(szPath);
 	c->returnValue()->setString(szPath);
 	return true;
@@ -1327,15 +1306,15 @@ static bool file_kvs_fnc_rootdir(KviKvsModuleFunctionCall * c)
 
 static bool file_kvs_fnc_cwd(KviKvsModuleFunctionCall * c)
 {
-	QString szFileName;
+	QString szName;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("relative_path",KVS_PT_STRING,KVS_PF_OPTIONAL,szFileName)
+		KVSM_PARAMETER("relative_path",KVS_PT_STRING,KVS_PF_OPTIONAL,szName)
 	KVSM_PARAMETERS_END(c)
-	if(szFileName.isEmpty())
-		szFileName.append(KVI_PATH_SEPARATOR_CHAR);
+	if(szName.isEmpty())
+		szName.append(KVI_PATH_SEPARATOR_CHAR);
 	QString szPath = QDir::currentPath();
 	KviQString::ensureLastCharIs(szPath,KVI_PATH_SEPARATOR_CHAR);
-	szPath.append(szFileName);
+	szPath.append(szName);
 	KviFileUtils::adjustFilePath(szPath);
 	c->returnValue()->setString(szPath);
 	return true;
@@ -1371,14 +1350,14 @@ static bool file_kvs_fnc_cwd(KviKvsModuleFunctionCall * c)
 
 static bool file_kvs_fnc_globaldir(KviKvsModuleFunctionCall * c)
 {
-	QString szFileName;
+	QString szName;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("relative_path",KVS_PT_STRING,KVS_PF_OPTIONAL,szFileName)
+		KVSM_PARAMETER("relative_path",KVS_PT_STRING,KVS_PF_OPTIONAL,szName)
 	KVSM_PARAMETERS_END(c)
-	if(szFileName.isEmpty())
-		szFileName.append(KVI_PATH_SEPARATOR_CHAR);
+	if(szName.isEmpty())
+		szName.append(KVI_PATH_SEPARATOR_CHAR);
 	QString szPath;
-	g_pApp->getGlobalKvircDirectory(szPath,KviApplication::None,szFileName);
+	g_pApp->getGlobalKvircDirectory(szPath,KviApplication::None,szName);
 	KviFileUtils::adjustFilePath(szPath);
 	c->returnValue()->setString(szPath);
 	return true;
@@ -1406,11 +1385,11 @@ static bool file_kvs_fnc_globaldir(KviKvsModuleFunctionCall * c)
 
 static bool file_kvs_fnc_extractpath(KviKvsModuleFunctionCall * c)
 {
-	QString szFileName;
+	QString szName;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("filepath",KVS_PT_NONEMPTYSTRING,0,szFileName)
+		KVSM_PARAMETER("filepath",KVS_PT_NONEMPTYSTRING,0,szName)
 	KVSM_PARAMETERS_END(c)
-	c->returnValue()->setString(QFileInfo(szFileName).absolutePath());
+	c->returnValue()->setString(QFileInfo(szName).absolutePath());
 	return true;
 }
 
@@ -1435,13 +1414,13 @@ static bool file_kvs_fnc_extractpath(KviKvsModuleFunctionCall * c)
 
 static bool file_kvs_fnc_extractfilename(KviKvsModuleFunctionCall * c)
 {
-	QString szFileName;
+	QString szName;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("filepath",KVS_PT_NONEMPTYSTRING,0,szFileName)
+		KVSM_PARAMETER("filepath",KVS_PT_NONEMPTYSTRING,0,szName)
 	KVSM_PARAMETERS_END(c)
-	KviFileUtils::extractFileName(szFileName);
-	KviQString::cutToLast(szFileName,KVI_PATH_SEPARATOR_CHAR);
-	c->returnValue()->setString(szFileName);
+	KviFileUtils::extractFileName(szName);
+	KviQString::cutToLast(szName,KVI_PATH_SEPARATOR_CHAR);
+	c->returnValue()->setString(szName);
 	return true;
 }
 
@@ -1619,15 +1598,15 @@ static bool file_kvs_fnc_digest(KviKvsModuleFunctionCall * c)
 
 static bool file_kvs_fnc_time(KviKvsModuleFunctionCall * c)
 {
-	QString szFileName, szType;
+	QString szName, szType;
 
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("filename",KVS_PT_STRING,0,szFileName)
+		KVSM_PARAMETER("filename",KVS_PT_STRING,0,szName)
 		KVSM_PARAMETER("type",KVS_PT_STRING,KVS_PF_OPTIONAL,szType)
 	KVSM_PARAMETERS_END(c)
 
-	KviFileUtils::adjustFilePath(szFileName);
-	QFileInfo f(szFileName);
+	KviFileUtils::adjustFilePath(szName);
+	QFileInfo f(szName);
 
 	QDateTime time;
 
diff --git a/src/modules/objects/KvsObject_lineEdit.cpp b/src/modules/objects/KvsObject_lineEdit.cpp
index 20a480389..f6ccd00c3 100644
--- a/src/modules/objects/KvsObject_lineEdit.cpp
+++ b/src/modules/objects/KvsObject_lineEdit.cpp
@@ -168,7 +168,7 @@ static const int mode_cod[] =  {
 		Called when the lineedit lost focus.
 		!fn: $textChangedEvent(<new text:string>)
 		This event is called when the text changed, In $0 there is the new text.
-		!!fn: $setCompleter(<completion_mode:string>,<completition_list:array>)
+		!fn: $setCompleter(<completion_mode:string>,<items:stringlist>)
 		Provides completions based on an stringlist.
 		Valid completion_mode are:
 		PopupCompletion: Current completions are displayed in a popup below the lineedit.
@@ -451,38 +451,20 @@ KVSO_CLASS_FUNCTION(lineEdit,setInputMask)
 KVSO_CLASS_FUNCTION(lineEdit,setCompleter)
 {
 	CHECK_INTERNAL_POINTER(widget())
-	KviKvsArray *a;
+	QStringList szCompletionList;
 	QString szMode;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("mode",KVS_PT_STRING,KVS_PF_OPTIONAL,szMode)
-		KVSO_PARAMETER("completion_list",KVS_PT_ARRAY,0,a)
+		KVSO_PARAMETER("completion_list",KVS_PT_STRINGLIST,0,szCompletionList)
 	KVSO_PARAMETERS_END(c)
 	if(m_pCompleter)
 		delete m_pCompleter;
-	QStringList szCompletionList;
-	if(a)
-	{
-		kvs_int_t uIdx = 0;
-		kvs_int_t uSize = a->size();
-		while(uIdx < uSize)
-		{
-			KviKvsVariant * v = a->at(uIdx);
-			if(v)
-			{
-				QString tmp;
-				v->asString(tmp);
-				szCompletionList.append(tmp);
-			}
-			else szCompletionList.append("");
-			uIdx++;
-		}
-	}
 	m_pCompleter=new QCompleter(szCompletionList);
 	QCompleter::CompletionMode mode=QCompleter::PopupCompletion;
 	if(KviQString::equalCI(szMode,"InlineCompletion")) mode=QCompleter::InlineCompletion;
 	else if(KviQString::equalCI(szMode,"UnfilteredPopupCompletion")) mode=QCompleter::UnfilteredPopupCompletion;
 	else if(!KviQString::equalCI(szMode,"PopupCompletion"))
-		c->warning(__tr2qs_ctx("Unkonwn '%Q' completition mode, switching to default popupCompletition","objects"),&szMode);
+		c->warning(__tr2qs_ctx("Unknown '%Q' completion mode, switching to default PopupCompletion","objects"),&szMode);
 	m_pCompleter->setCompletionMode(mode);
 	((QLineEdit *)widget())->setCompleter(m_pCompleter);
 	return true;
diff --git a/src/modules/objects/KvsObject_tableWidget.cpp b/src/modules/objects/KvsObject_tableWidget.cpp
index f06d74d1e..7cf4b869e 100644
--- a/src/modules/objects/KvsObject_tableWidget.cpp
+++ b/src/modules/objects/KvsObject_tableWidget.cpp
@@ -3,13 +3,13 @@
 //   File : KvsObject_tableWidget.cpp
 //   Creation date : Wed 04 Feb 2009 09:30:05 CEST by Carbone Alessandro
 //
-//   This file is part of the KVIrc irc client distribution
+//   This file is part of the KVIrc IRC client distribution
 //   Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
 //   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
+//   of the License, or (at your option) any later version.
 //
 //   This program is distributed in the HOPE that it will be USEFUL,
 //   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -65,31 +65,6 @@ const char * const itemflags_tbl[] = {
 	"tristate"
 };
 
-// Tables used in $setAlignment & $alignment
-const char * const align_tbl[] = {
-	"Left",
-	"Right",
-	"HCenter",
-	"VCenter",
-	"Center",
-	"Top",
-	"Bottom",
-	"WordBreak"
-};
-
-const int align_cod[] = {
-	Qt::AlignLeft,
-	Qt::AlignRight,
-	Qt::AlignHCenter,
-	Qt::AlignVCenter,
-	Qt::AlignCenter,
-	Qt::AlignTop,
-	Qt::AlignBottom,
-	Qt::AlignJustify,
-};
-
-#define align_num	(sizeof(align_tbl) / sizeof(align_tbl[0]))
-
 #define itemflags_num	(sizeof(itemflags_tbl) / sizeof(itemflags_tbl[0]))
 
 /*
@@ -108,27 +83,6 @@ const int align_cod[] = {
 	@functions:
 		!fn: $setText(<row:uint>,<col:uint>,[<text:string>])
 		Sets the contents of the cell pointeid by row and col to text.
-		!fn: $setTextAligment(<row:uint>,<col:uint>,[<alignment:string>,<alignment:string>,..])
-		Sets the text alignment for the cell at row,col.
-		Valid flags are:
-		[pre]
-			- Right : text is aligned to right border;[br]
-			- Left : text is aligned to left border;[br]
-			- Top : text is aligned to the top border;[br]
-			- Bottom : text is aligned to the bottom border;[br]
-			- HCenter : text is horizontally centered;[br]
-			- VCenter : text is vertically centered;[br]
-			- Center  : equals HCenter + VCenter;[br]
-			- Justify : justifies the text.
-		[/pre]
-		!fn: $setCheckState(<row:uint>,<col:uint>,<state:string>)
-		Sets the check state of the list item to state.
-		Valid values are:
-		[pre]
-			- Unchecked : item is unchecked;[br]
-			- PartiallyChecked : item is partially checked;[br]
-			- Checked : item is checked.
-		[/pre]
 		!fn: $setTooltip(<row:uint>,<col:uint>,[<text:string>])
 		Sets the tooltip of the cell pointeid by row and col to text.
 		!fn: $setNumber(<row:uint>,<col:uint>,[<number:integer>]).
@@ -147,12 +101,6 @@ const int align_cod[] = {
 		Shows the vertical header.
 		!fn: $hideVerticalHeader()
 		Hides the vertical header.
-		!fn: $setRowHeight(<row:integer>,<height:integer>)
-		Sets  the number of rows in the table.
-		!fn: <integer> $rowHeight()
-		Returns the number of rows in the table.
-		!fn: $setColumnWidth(<integer>)
-		Sets  the number of rows in the table.
 		!fn: $setRowCount(<integer>)
 		Sets the number of rows in the table.
 		!fn: <integer> $rowCount()
@@ -172,14 +120,6 @@ const int align_cod[] = {
 		Sets the number of columns in the table.
 		!fn: <integer> $columnCount()
 		Returns the number of columns in the table.
-		!fn: $setSpan(<row:uinteger>,<col:uinteger>,<span_row_count:uinteger>,<span_column_count:uinteger>)
-		Sets the span of the table element at (row, column) to the number of rows and columns specified by (span_row_count, span_column_count).
-		!fn: <integer> $columnSpan()
-		Returns the column span of the table element at (row, column).
-		!fn: <integer> $rowSpan(<row:uinteger>,<col:uinteger>)
-		Returns the row span of the table element at (row, column)
-		!fn: $sortByColumn(<col:uint>,<sort_order:string>)
-		Sorts the tablel by the values in the given column, in 'ascending' or 'descending'sort_order-
 		!fn: <integer> $currentRow()
 		Returns the current column.
 		Useful in the [classfnc]customContextMenuRequestedEvent[/classfnc]
@@ -191,15 +131,12 @@ const int align_cod[] = {
 		the RED component, the third and fourth digit specify the GREEN component
 		and the last two specify the BLUE component.
 		For example "FFFF00" means full red, full green and no blue that gives
-		!fn: $setFont(<row:uint>,<col:uint>,<family:string>,<size:integer>[,<style1:string>, <style2:string>, ...])
-		Set the cell font's at row,col. Valid flag for style are:[br]
-		- italic, bold, underline, overline, strikeout, fixedpitch  [br]
 		!fn: $setItemFlags(<row:uint>,<col:uint>,<flag1:string>, <flag2:string>, ...)
 		Sets the flags for the cell pointed by row and col to the given flags.
 		These determine whether the cell can be selected or modified.
 		Supported flags are:
 		[pre]
-			- noitemflag : no flag sets;[br]
+			- noitemflag : no flag sets;
 			- selectable : cell is selectable;[br]
 			- editable : cell is editable;[br]
 			- dragEnabled : cell can dragged;[br]
@@ -217,18 +154,10 @@ const int align_cod[] = {
 		Hides the row <row>.
 		!fn: $showRow(<row:uint>)
 		Shows the row <row>.
-		!fn: $isRowHidden(<row:uint>)
-		Returns 1 if the given row is hidden; otherwise returns 0.
 		!fn: $hideColumn(<col:uint>)
 		Hides the column <col>.
 		!fn: $showColumn(<col:uint>)
 		Shows the column <col>.
-		!fn: $isColHidden(<rcol:uint>)
-		Returns 1 if the given column is hidden; otherwise returns 0.
-		!fn: $scrollToTop();
-		Scrolls the view to the top.
-		!fn: $scrollToBottom();
-		Scrolls the view to the bottom.
 		!fn: $clear()
 		Clears the table.
 		!fn: <row,col> $itemEnteredEvent()
@@ -250,10 +179,8 @@ const int align_cod[] = {
 	@signals:
 		!sg: $clicked()
 		This signal is emitted by the default implementation of [classfnc]$clickEvent[/classfnc]().
-
 */
 
-
 KVSO_BEGIN_REGISTERCLASS(KvsObject_tableWidget,"tablewidget","widget")
 
 	// Horizontal Header
@@ -267,61 +194,47 @@ KVSO_BEGIN_REGISTERCLASS(KvsObject_tableWidget,"tablewidget","widget")
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,showVerticalHeader)
 
 	// Rows-Columns
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setCheckState)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,sortByColumn)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setRowCount)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,insertRow)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,insertColumn)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,removeRow)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,removeColumn)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setColumnWidth)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,columnWidth)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setRowHeight)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,rowHeight)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,isColumnHidden)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,isRowHidden)
+
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,rowCount)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,currentRow)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setColumnCount)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setSpan)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,rowSpan)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,columnSpan)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,columnCount)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,currentColumn)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,itemRowColAt)
+
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,hideRow)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,showRow)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,hideColumn)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,showColumn)
 
-	// scroll
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,scrollToTop)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,scrollToBottom)
-
-	// update rows-cols
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,resizeRowsToContents)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,resizeColumnsToContents)
 
 	// Item (text. icon, widget)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setText)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setTextAlignment)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setNumber)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setToolTip)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setForeground)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,text)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setCellWidget)
+
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setIcon)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setFont)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,clear)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setItemFlags);
 
-	// Events
 	KVSO_REGISTER_HANDLER(KvsObject_tableWidget,"itemEnteredEvent",itemEnteredEvent);
 	KVSO_REGISTER_HANDLER(KvsObject_tableWidget,"cellActivatedEvent",cellActivatedEvent);
 	KVSO_REGISTER_HANDLER(KvsObject_tableWidget,"cellDoubleClickedEvent",cellDoubleClickedEvent);
 	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KvsObject_tableWidget,"paintCellEvent")
 	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_tableWidget,"sizeHintCellRequestEvent")
 
+
+
 KVSO_END_REGISTERCLASS(KvsObject_tableWidget)
 
 KVSO_BEGIN_CONSTRUCTOR(KvsObject_tableWidget,KvsObject_widget)
@@ -340,7 +253,6 @@ KVSO_END_DESTRUCTOR(KvsObject_tableWidget)
 bool KvsObject_tableWidget::init(KviKvsRunTimeContext *c,KviKvsVariantList *)
 {
 
-    int a=0;
 	SET_OBJECT(QTableWidget)
 	m_pCellItemDelegate=new KviCellItemDelegate(((QTableWidget *)widget()),this);
 
@@ -362,23 +274,11 @@ KVSO_CLASS_FUNCTION(tableWidget,clear)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tableWidget,scrollToTop)
-{
-	CHECK_INTERNAL_POINTER(widget())
-	((QTableWidget *)widget())->scrollToTop();
-	return true;
-}
-
-KVSO_CLASS_FUNCTION(tableWidget,scrollToBottom)
-{
-	CHECK_INTERNAL_POINTER(widget())
-	((QTableWidget *)widget())->scrollToBottom();
-	return true;
-}
-
 KVSO_CLASS_FUNCTION(tableWidget,resizeRowsToContents)
 {
 	CHECK_INTERNAL_POINTER(widget())
+	//qDebug("resize row to contents");
+
 	((QTableWidget *)widget())->resizeRowsToContents();
 	return true;
 }
@@ -391,6 +291,7 @@ KVSO_CLASS_FUNCTION(tableWidget,resizeColumnsToContents)
 	return true;
 }
 
+
 KVSO_CLASS_FUNCTION(tableWidget,setForeground)
 {
 	CHECK_INTERNAL_POINTER(widget())
@@ -446,17 +347,17 @@ KVSO_CLASS_FUNCTION(tableWidget,setForeground)
 					color.setNamedColor(szColor);
 					if (!color.isValid())
 					{
-						// itsn't a color name: let try with an hex triplette
+						// isn't a color name: lets try with an hex triplet
 						color.setNamedColor("#"+szColor);
 						if (!color.isValid())
 						{
-							c->warning(__tr2qs_ctx("Not a valid color !","objects"));
+							c->warning(__tr2qs_ctx("Not a valid color!","objects"));
 							return true;
 						}
 					}
 				}
 				else {
-					c->warning(__tr2qs_ctx("Not a valid color !","objects"));
+					c->warning(__tr2qs_ctx("Not a valid color!","objects"));
 					return true;
 				}
 				QBrush brush(color);
@@ -481,76 +382,6 @@ KVSO_CLASS_FUNCTION(tableWidget,setForeground)
 }
 
 
-
-KVSO_CLASS_FUNCTION(tableWidget,isColumnHidden)
-{
-	CHECK_INTERNAL_POINTER(widget())
-	kvs_uint_t uCol;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,uCol)
-	KVSO_PARAMETERS_END(c)
-	c->returnValue()->setBoolean(((QTableWidget *)widget())->isColumnHidden(uCol));
-	return true;
-}
-
-
-KVSO_CLASS_FUNCTION(tableWidget,isRowHidden)
-{
-	CHECK_INTERNAL_POINTER(widget())
-	kvs_uint_t uRow;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,uRow)
-	KVSO_PARAMETERS_END(c)
-	c->returnValue()->setBoolean(((QTableWidget *)widget())->isRowHidden(uRow));
-	return true;
-}
-
-KVSO_CLASS_FUNCTION(tableWidget,setColumnWidth)
-{
-	CHECK_INTERNAL_POINTER(widget())
-	kvs_uint_t uCol,uWidth;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,uCol)
-		KVSO_PARAMETER("width",KVS_PT_UNSIGNEDINTEGER,0,uWidth)
-	KVSO_PARAMETERS_END(c)
-	((QTableWidget *)widget())->setColumnWidth(uCol,uWidth);
-	return true;
-}
-
-KVSO_CLASS_FUNCTION(tableWidget,columnWidth)
-{
-	CHECK_INTERNAL_POINTER(widget())
-	kvs_uint_t uCol;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,uCol)
-	KVSO_PARAMETERS_END(c)
-	c->returnValue()->setInteger(((QTableWidget *)widget())->columnWidth(uCol));
-	return true;
-}
-
-KVSO_CLASS_FUNCTION(tableWidget,setRowHeight)
-{
-	CHECK_INTERNAL_POINTER(widget())
-	kvs_uint_t uRow,uWidth;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,uRow)
-		KVSO_PARAMETER("width",KVS_PT_UNSIGNEDINTEGER,0,uWidth)
-	KVSO_PARAMETERS_END(c)
-	((QTableWidget *)widget())->setRowHeight(uRow,uWidth);
-	return true;
-}
-
-KVSO_CLASS_FUNCTION(tableWidget,rowHeight)
-{
-	CHECK_INTERNAL_POINTER(widget())
-	kvs_uint_t uRow;
-		KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,uRow)
-		KVSO_PARAMETERS_END(c)
-	c->returnValue()->setInteger(((QTableWidget *)widget())->rowHeight(uRow));
-	return true;
-}
-
 KVSO_CLASS_FUNCTION(tableWidget,setText)
 {
 	CHECK_INTERNAL_POINTER(widget())
@@ -596,79 +427,6 @@ KVSO_CLASS_FUNCTION(tableWidget,setNumber)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tableWidget,setTextAlignment)
-{
-	CHECK_INTERNAL_POINTER(widget())
-	kvs_uint_t uCol,uRow;
-	QStringList szAlignment;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,uRow)
-		KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,uCol)
-		KVSO_PARAMETER("alignment",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,szAlignment)
-	KVSO_PARAMETERS_END(c)
-	int align,sum=0;
-	for ( QStringList::Iterator it = szAlignment.begin(); it != szAlignment.end(); ++it )
-	{
-		align = 0;
-		for(unsigned int j = 0; j < align_num; j++)
-		{
-			if(KviQString::equalCI((*it), align_tbl[j]))
-			{
-				align=align_cod[j];
-				break;
-			}
-		}
-		if(align)
-			sum = sum | align;
-		else
-			c->warning(__tr2qs_ctx("Unknown alignment '%Q'","objects"),&(*it));
-	}
-	QTableWidgetItem *pItem=((QTableWidget *)widget())->item(uRow,uCol);
-	if (pItem)
-	{
-		pItem->setTextAlignment(sum);
-	}
-	return true;
-}
-
-KVSO_CLASS_FUNCTION(tableWidget,setFont)
-{
-	CHECK_INTERNAL_POINTER(widget())
-	kvs_uint_t uCol,uRow;
-	QString szFamily;
-	QStringList szListStyle;
-	kvs_int_t iSize;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,uRow)
-		KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,uCol)
-		KVSO_PARAMETER("family",KVS_PT_STRING,0,szFamily)
-		KVSO_PARAMETER("size",KVS_PT_INTEGER,0,iSize)
-		KVSO_PARAMETER("style",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,szListStyle)
-	KVSO_PARAMETERS_END(c)
-	QFont font;
-	if(!szFamily.isEmpty()) font.setFamily(szFamily);
-	if(iSize) font.setPointSize(iSize);
-	QString szStyle;
-	for(int i=0;i<szListStyle.length();i++)
-	{
-		szStyle=szListStyle.at(i);
-		if(KviQString::equalCI(szStyle,"italic")) font.setItalic(true);
-		else if(KviQString::equalCI(szStyle,"bold")) font.setBold(true);
-		else if(KviQString::equalCI(szStyle,"underline"))font.setUnderline(true);
-		else if(KviQString::equalCI(szStyle,"overline")) font.setOverline(true);
-		else if(KviQString::equalCI(szStyle,"strikeout"))font.setStrikeOut(true);
-		else if(KviQString::equalCI(szStyle,"fixedpitch")) font.setFixedPitch(true);
-		else c->warning(__tr2qs_ctx("Unknown style '%Q'","objects"),&szStyle);
-	}
-	QTableWidgetItem *pItem=((QTableWidget *)widget())->item(uRow,uCol);
-	if (pItem)
-	{
-		pItem->setFont(font);
-	}
-	return true;
-
-}
-
 KVSO_CLASS_FUNCTION(tableWidget,insertRow)
 {
 	CHECK_INTERNAL_POINTER(widget())
@@ -690,7 +448,6 @@ KVSO_CLASS_FUNCTION(tableWidget,insertColumn)
 	((QTableWidget *)widget())->insertColumn(uCol);
 	return true;
 }
-
 KVSO_CLASS_FUNCTION(tableWidget,removeRow)
 {
 	CHECK_INTERNAL_POINTER(widget())
@@ -713,6 +470,7 @@ KVSO_CLASS_FUNCTION(tableWidget,removeColumn)
 	return true;
 }
 
+
 KVSO_CLASS_FUNCTION(tableWidget,setIcon)
 {
 	kvs_uint_t uCol,uRow;
@@ -741,7 +499,7 @@ KVSO_CLASS_FUNCTION(tableWidget,setIcon)
 			pix=g_pIconManager->getImage(szPix);
 			if(!pix)
 			{
-				c->warning(__tr2qs_ctx("Error occured: the suitable file '%Q' is not of the correct format or it is not a valid icon number.","objects"),&szPix);
+				c->warning(__tr2qs_ctx("Error occurred: the suitable file '%Q' is not of the correct format or it is not a valid icon number.","objects"),&szPix);
 				return true;
 			}
 	}
@@ -817,8 +575,8 @@ KVSO_CLASS_FUNCTION(tableWidget,itemRowColAt)
 		KVSO_PARAMETER("y_pos",KVS_PT_INT,0,iYpos)
 	KVSO_PARAMETERS_END(c)
 	KviKvsArray *pArray;
-	//QPoint pPoint=((QTableWidget *)widget())->viewport()->mapFromGlobal(QPoint(iXpos,iYpos));
-	QTableWidgetItem *pItem=((QTableWidget *)widget())->itemAt(iXpos,iYpos);
+	QPoint pPoint=((QTableWidget *)widget())->viewport()->mapFromGlobal(QPoint(iXpos,iYpos));
+	QTableWidgetItem *pItem=((QTableWidget *)widget())->itemAt(pPoint.x(),pPoint.y());
 	pArray=new KviKvsArray();
 	if (!pItem) {
 		pArray->set(0,new KviKvsVariant((kvs_int_t)-1));
@@ -858,44 +616,6 @@ KVSO_CLASS_FUNCTION(tableWidget,setColumnCount)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tableWidget,setSpan)
-{
-	CHECK_INTERNAL_POINTER(widget())
-	kvs_uint_t uCol, uRow, uSpanCol, uSpanRow;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,uRow)
-		KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,uCol)
-		KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,uSpanRow)
-		KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,uSpanCol)
-	KVSO_PARAMETERS_END(c)
-	((QTableWidget *)widget())->setSpan(uRow,uCol,uSpanRow,uSpanCol);
-	return true;
-}
-
-KVSO_CLASS_FUNCTION(tableWidget,columnSpan)
-{
-	CHECK_INTERNAL_POINTER(widget())
-	kvs_uint_t uRow,uCol;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,uRow)
-		KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,uCol)
-	KVSO_PARAMETERS_END(c)
-	c->returnValue()->setInteger(((QTableWidget *)widget())->columnSpan(uRow,uCol));
-	return true;
-}
-
-KVSO_CLASS_FUNCTION(tableWidget,rowSpan)
-{
-	CHECK_INTERNAL_POINTER(widget())
-	kvs_uint_t uRow,uCol;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,uRow)
-		KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,uCol)
-	KVSO_PARAMETERS_END(c)
-	c->returnValue()->setInteger(((QTableWidget *)widget())->rowSpan(uRow,uCol));
-	return true;
-}
-
 KVSO_CLASS_FUNCTION(tableWidget,hideColumn)
 {
 	CHECK_INTERNAL_POINTER(widget())
@@ -1042,10 +762,10 @@ KVSO_CLASS_FUNCTION(tableWidget,showVerticalHeader)
 	((QTableWidget *)widget())->verticalHeader()->show();
 	return true;
 }
-
 KVSO_CLASS_FUNCTION(tableWidget,setItemFlags)
 {
 	CHECK_INTERNAL_POINTER(widget())
+
 	QStringList itemflags;
 	kvs_uint_t iRow,iCol;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -1079,48 +799,6 @@ KVSO_CLASS_FUNCTION(tableWidget,setItemFlags)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tableWidget,setCheckState)
-{
-	CHECK_INTERNAL_POINTER(widget())
-	QString szCheckState;
-	kvs_uint_t uRow,uCol;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,uRow)
-		KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,uCol)
-		KVSO_PARAMETER("state",KVS_PT_STRING,0,szCheckState)
-	KVSO_PARAMETERS_END(c)
-	Qt::CheckState r = Qt::Unchecked;
-	if(KviQString::equalCI(szCheckState,"Unchecked")) r = Qt::Unchecked;
-	else if(KviQString::equalCI(szCheckState,"PartiallyChecked")) r = Qt::PartiallyChecked;
-	else if(KviQString::equalCI(szCheckState,"Checked"))r = Qt::Checked;
-	else c->warning(__tr2qs_ctx("Invalid checkState mode defaulting to Unchecked","objects"));
-	QTableWidgetItem * pItem = ((QTableWidget *)widget())->item(uRow,uCol);
-	if(!pItem)
-	{
-		pItem = new QTableWidgetItem();
-		((QTableWidget *)widget())->setItem(uRow,uCol,pItem);
-	}
-	pItem->setCheckState(r);
-	return true;
-}
-
-KVSO_CLASS_FUNCTION(tableWidget,sortByColumn)
-{
-	CHECK_INTERNAL_POINTER(widget())
-	QString szSortOrder;
-	kvs_uint_t uCol;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,uCol)
-		KVSO_PARAMETER("sortorder",KVS_PT_STRING,0,szSortOrder)
-	KVSO_PARAMETERS_END(c)
-	Qt::SortOrder order = Qt::AscendingOrder;
-	if(KviQString::equalCI(szSortOrder,"Ascending")) order = Qt::AscendingOrder;
-	else if(KviQString::equalCI(szSortOrder,"Descending")) order = Qt::DescendingOrder;
-	else c->warning(__tr2qs_ctx("Invalid sort order mode defaulting to Ascending","objects"));
-	((QTableWidget *)widget())->sortByColumn(uCol,order);
-	return true;
-}
-
 void KvsObject_tableWidget::slotItemEntered(QTableWidgetItem * i)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)i->row()),new KviKvsVariant((kvs_int_t)i->column()));
@@ -1156,7 +834,6 @@ KVSO_CLASS_FUNCTION(tableWidget,cellDoubleClickedEvent)
 	emitSignal("cellDoubleClicked",c,c->params());
 	return true;
 }
-
 bool KvsObject_tableWidget::paint(QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index)
 {
 	p->save();
@@ -1200,6 +877,7 @@ void KviCellItemDelegate::paint(QPainter * pPainter, const QStyleOptionViewItem
 QSize KviCellItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex & index) const
 {
 	KviKvsVariant vSizeBuffer;
+
 	KviKvsVariantList parameters(new KviKvsVariant((kvs_int_t) index.row()),new KviKvsVariant((kvs_int_t) index.column()));
 	m_pParentScript->callFunction(m_pParentScript,"sizeHintCellRequestEvent",&vSizeBuffer,&parameters);
 	if(vSizeBuffer.isArray())
diff --git a/src/modules/objects/KvsObject_tableWidget.h b/src/modules/objects/KvsObject_tableWidget.h
index ad0a89feb..4b7455d42 100644
--- a/src/modules/objects/KvsObject_tableWidget.h
+++ b/src/modules/objects/KvsObject_tableWidget.h
@@ -5,14 +5,14 @@
 //   File : KvsObject_tableWidget.h
 //   Creation date : Wed 4 Feb 2009 09:30:05 CEST by Carbone Alessandro
 //
-//   This file is part of the KVIrc irc client distribution
+//   This file is part of the KVIrc IRC client distribution
 //   Copyright (C) 2000 Krzysztof Godlewski
 //   Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
 //   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
+//   of the License, or (at your option) any later version.
 //
 //   This program is distributed in the HOPE that it will be USEFUL,
 //   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -64,49 +64,41 @@ protected:
 	virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
 
 	bool setText(KviKvsObjectFunctionCall *c);
-	bool setTextAlignment(KviKvsObjectFunctionCall *c);
 	bool setForeground(KviKvsObjectFunctionCall *c);
 	bool setNumber(KviKvsObjectFunctionCall *c);
 	bool setToolTip(KviKvsObjectFunctionCall *c);
 	bool text(KviKvsObjectFunctionCall *c);
 	bool setIcon(KviKvsObjectFunctionCall *c);
-	bool setFont(KviKvsObjectFunctionCall *c);
 	bool setItemFlags(KviKvsObjectFunctionCall *c);
-	bool setCheckState(KviKvsObjectFunctionCall *c);
-	bool sortByColumn(KviKvsObjectFunctionCall *c);
+
 	bool setColumnCount(KviKvsObjectFunctionCall *c);
-	bool setSpan(KviKvsObjectFunctionCall *c);
-	bool rowSpan(KviKvsObjectFunctionCall *c);
-	bool columnSpan(KviKvsObjectFunctionCall *c);
 	bool columnCount(KviKvsObjectFunctionCall *c);
 	bool setRowCount(KviKvsObjectFunctionCall *c);
 	bool currentRow(KviKvsObjectFunctionCall *c);
 	bool currentColumn(KviKvsObjectFunctionCall *c);
 	bool itemRowColAt(KviKvsObjectFunctionCall *c);
+
 	bool rowCount(KviKvsObjectFunctionCall *c);
+
 	bool insertRow(KviKvsObjectFunctionCall *c);
 	bool insertColumn(KviKvsObjectFunctionCall *c);
 	bool removeRow(KviKvsObjectFunctionCall *c);
 	bool removeColumn(KviKvsObjectFunctionCall *c);
-	bool setColumnWidth(KviKvsObjectFunctionCall *c);
-	bool columnWidth(KviKvsObjectFunctionCall *c);
-	bool setRowHeight(KviKvsObjectFunctionCall *c);
-	bool rowHeight(KviKvsObjectFunctionCall *c);
-	bool isColumnHidden(KviKvsObjectFunctionCall *c);
-	bool isRowHidden(KviKvsObjectFunctionCall *c);
+
+
 	bool setHorizontalHeaderLabels(KviKvsObjectFunctionCall *c);
 	bool setVerticalHeaderLabels(KviKvsObjectFunctionCall *c);
 	bool setCellWidget(KviKvsObjectFunctionCall *c);
+
 	bool hideHorizontalHeader(KviKvsObjectFunctionCall *c);
 	bool showHorizontalHeader(KviKvsObjectFunctionCall *c);
 	bool hideVerticalHeader(KviKvsObjectFunctionCall *c);
 	bool showVerticalHeader(KviKvsObjectFunctionCall *c);
 	bool clear(KviKvsObjectFunctionCall *c);
-	bool scrollToTop(KviKvsObjectFunctionCall *c);
-	bool scrollToBottom(KviKvsObjectFunctionCall *c);
 	bool itemEnteredEvent(KviKvsObjectFunctionCall *c);
 	bool cellActivatedEvent(KviKvsObjectFunctionCall *c);
 	bool cellDoubleClickedEvent(KviKvsObjectFunctionCall *c);
+
 	bool hideColumn(KviKvsObjectFunctionCall *c);
 	bool showColumn(KviKvsObjectFunctionCall *c);
 	bool hideRow(KviKvsObjectFunctionCall *c);