Yet more typesafe. Yet more minor errors caught.

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

11 files changed, 119 insertions, 82 deletions

diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp
index 2e85f09f2..f411479ab 100644
--- a/src/kvirc/kvs/kvi_kvs_object.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object.cpp
@@ -990,7 +990,7 @@ bool KviKvsObject::function_emit(KviKvsObjectFunctionCall * c)
 
 bool KviKvsObject::function_startTimer(KviKvsObjectFunctionCall * c)
 {
-	kvs_int_t timeout;
+	kvs_uint_t timeout;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("timeout",KVS_PT_UINT,0,timeout)
 	KVSO_PARAMETERS_END(c)
diff --git a/src/kvirc/kvs/kvi_kvs_parameterprocessor.h b/src/kvirc/kvs/kvi_kvs_parameterprocessor.h
index 7411d716e..dcfc147c7 100644
--- a/src/kvirc/kvs/kvi_kvs_parameterprocessor.h
+++ b/src/kvirc/kvs/kvi_kvs_parameterprocessor.h
@@ -37,70 +37,103 @@ class QString;
 
 // Data type: QString
 // Default: QString()
-#define KVS_PT_STRING 0
-
-// Data type: QString
-// Default: QString()
-#define KVS_PT_NONEMPTYSTRING 1
+enum KviKvsParameterTypeQString
+{
+	KVS_PT_STRING = 0,
+	KVS_PT_NONEMPTYSTRING = 1
+};
 
 // Data type: kvs_int_t
 // Default: 0
-#define KVS_PT_INT 2
-	#define KVS_PT_INTEGER 2
+enum KviKvsParameterTypeKvsIntT
+{
+	KVS_PT_INT = 2,
+	KVS_PT_INTEGER = 2
+};
 
 // Data type: kvs_uint_t
 // Default: 0
-#define KVS_PT_UINT 3
-	#define KVS_PT_UNSIGNEDINTEGER 3
+enum KviKvsParameterTypeKvsUIntT
+{
+	KVS_PT_UINT = 3,
+	KVS_PT_UNSIGNEDINTEGER = 3
+};
 
 // Data type: kvs_real_t
 // default: 0.0
-#define KVS_PT_DOUBLE 4
-	#define KVS_PT_REAL 4
+enum KviKvsParameterTypeKvsRealT
+{
+	KVS_PT_DOUBLE = 4,
+	KVS_PT_REAL = 4
+};
 
 // Data type: bool
 // default: false
-#define KVS_PT_BOOL 5
-	#define KVS_PT_BOOLEAN 5
+enum KviKvsParameterTypeBool
+{
+	KVS_PT_BOOL = 5,
+	KVS_PT_BOOLEAN = 5
+};
 
 // Data type: KviKvsHash *
 // default: 0
-#define KVS_PT_HASH 6
+enum KviKvsParameterTypeKviKvsHashPointer
+{
+	KVS_PT_HASH = 6
+};
 
 // Data type: KviKvsArrayCast
 // default empty cast
-#define KVS_PT_ARRAYCAST 7
+enum KviKvsParameterTypeKviKvsArrayCast
+{
+	KVS_PT_ARRAYCAST = 7
+};
 
 // Data type: KviKvsVariant *
 // default: 0
-#define KVS_PT_VARIANT 8
-
-// Data type: QByteArray
-// default null string (0)
-#define KVS_PT_CSTRING 9
+enum KviKvsParameterTypeKviKvsVariantPointer
+{
+	KVS_PT_VARIANT = 8
+};
 
 // Data type: QByteArray
 // default null string (0)
-#define KVS_PT_NONEMPTYCSTRING 10
+enum KviKvsParameterTypeQByteArray
+{
+	KVS_PT_CSTRING = 9,
+	KVS_PT_NONEMPTYCSTRING = 10
+};
 
 // Data type: QStringList
 // default: list cleared
 // This eats all the remaining params in the list!
-#define KVS_PT_STRINGLIST 11
+enum KviKvsParameterTypeQStringList
+{
+	KVS_PT_STRINGLIST = 11
+};
 
 // Data type: KviKvsVariantList
 // default: list cleared
 // This eats all the remaining params in the list!
-// The list has autodelete set to off since the copies are SHALLOW!
-#define KVS_PT_VARIANTLIST 12
+// The list has autodelete set to off since the copies are SHALLOW (as opposed to deep)!
+enum KviKvsParameterTypeKviKvsVariantList
+{
+	KVS_PT_VARIANTLIST = 12
+};
 
 // Data type: kvs_hobject_t
 // default: (kvs_hobject_t)0
-#define KVS_PT_HOBJECT 13
+enum KviKvsParameterTypeKvsHObjectT
+{
+	KVS_PT_HOBJECT = 13
+};
 
 // Data type: KviKvsArray *
 // default 0
-#define KVS_PT_ARRAY 14
+enum KviKvsParameterTypeKviKvsArrayPointer
+{
+	KVS_PT_ARRAY = 14
+};
 
 // Data type: ignored
 #define KVS_PT_IGNORE 15
@@ -120,61 +153,61 @@ namespace KviKvsParameterProcessor
 	{
 	public:
 		const char          * szName;
-		const unsigned char   uType;
-		const unsigned char   uFlags;
+		unsigned char         uType;
+		unsigned char         uFlags;
 		void                * pContainer;
 	public:
 		// KVS_PT_STRING, KVS_PT_NONEMPTYSTRING
-		ParameterFormat(const char * name,const unsigned char type,const unsigned char flags,QString &szBuffer)
-			: szName(name), uType(type), uFlags(flags), pContainer((void *)(&szBuffer)) {};
+		ParameterFormat(const char * name,KviKvsParameterTypeQString type,unsigned char flags,QString &szBuffer)
+			: szName(name), uType((unsigned char)type), uFlags(flags), pContainer((void *)(&szBuffer)) {};
 
 		// KVS_PT_INTEGER (KVS_PT_INT)
-		ParameterFormat(const char * name,const unsigned char type,const unsigned char flags,kvs_int_t &iBuffer)
-			: szName(name), uType(type), uFlags(flags), pContainer((void *)(&iBuffer)) {};
+		ParameterFormat(const char * name,KviKvsParameterTypeKvsIntT type,unsigned char flags,kvs_int_t &iBuffer)
+			: szName(name), uType((unsigned char)type), uFlags(flags), pContainer((void *)(&iBuffer)) {};
 
 		// KVS_PT_UNSIGNEDINTEGER (KVS_PT_UINT)
-		ParameterFormat(const char * name,const unsigned char type,const unsigned char flags,kvs_uint_t &uBuffer)
-			: szName(name), uType(type), uFlags(flags), pContainer((void *)(&uBuffer)) {};
+		ParameterFormat(const char * name,KviKvsParameterTypeKvsUIntT type,unsigned char flags,kvs_uint_t &uBuffer)
+			: szName(name), uType((unsigned char)type), uFlags(flags), pContainer((void *)(&uBuffer)) {};
 
 		// KVS_PT_DOUBLE (KVS_PT_REAL)
-		ParameterFormat(const char * name,const unsigned char type,const unsigned char flags,kvs_real_t &dBuffer)
-			: szName(name), uType(type), uFlags(flags), pContainer((void *)(&dBuffer)) {};
+		ParameterFormat(const char * name,KviKvsParameterTypeKvsRealT type,unsigned char flags,kvs_real_t &dBuffer)
+			: szName(name), uType((unsigned char)type), uFlags(flags), pContainer((void *)(&dBuffer)) {};
 
 		// KVS_PT_BOOL (KVS_PT_BOOLEAN)
-		ParameterFormat(const char * name,const unsigned char type,const unsigned char flags,bool &bBuffer)
-			: szName(name), uType(type), uFlags(flags), pContainer((void *)(&bBuffer)) {};
+		ParameterFormat(const char * name,KviKvsParameterTypeBool type,unsigned char flags,bool &bBuffer)
+			: szName(name), uType((unsigned char)type), uFlags(flags), pContainer((void *)(&bBuffer)) {};
 
 		// KVS_PT_HASH
-		ParameterFormat(const char * name,const unsigned char type,const unsigned char flags,KviKvsHash * &pBuffer)
-			: szName(name), uType(type), uFlags(flags), pContainer((void *)(&pBuffer)) {};
+		ParameterFormat(const char * name,KviKvsParameterTypeKviKvsHashPointer type,unsigned char flags,KviKvsHash * &pBuffer)
+			: szName(name), uType((unsigned char)type), uFlags(flags), pContainer((void *)(&pBuffer)) {};
 
 		// KVS_PT_ARRAYCAST
-		ParameterFormat(const char * name,const unsigned char type,const unsigned char flags,KviKvsArrayCast &oBuffer)
-			: szName(name), uType(type), uFlags(flags), pContainer((void *)(&oBuffer)) {};
+		ParameterFormat(const char * name,KviKvsParameterTypeKviKvsArrayCast type,unsigned char flags,KviKvsArrayCast &oBuffer)
+			: szName(name), uType((unsigned char)type), uFlags(flags), pContainer((void *)(&oBuffer)) {};
 
 		// KVS_PT_VARIANT
-		ParameterFormat(const char * name,const unsigned char type,const unsigned char flags,KviKvsVariant * &pBuffer)
-			: szName(name), uType(type), uFlags(flags), pContainer((void *)(&pBuffer)) {};
+		ParameterFormat(const char * name,KviKvsParameterTypeKviKvsVariantPointer type,unsigned char flags,KviKvsVariant * &pBuffer)
+			: szName(name), uType((unsigned char)type), uFlags(flags), pContainer((void *)(&pBuffer)) {};
 
 		// KVS_PT_CSTRING, KVS_PT_NONEMPTYCSTRING
-		ParameterFormat(const char * name,const unsigned char type,const unsigned char flags,QByteArray &szBuffer)
-			: szName(name), uType(type), uFlags(flags), pContainer((void *)(&szBuffer)) {};
+		ParameterFormat(const char * name,KviKvsParameterTypeQByteArray type,unsigned char flags,QByteArray &szBuffer)
+			: szName(name), uType((unsigned char)type), uFlags(flags), pContainer((void *)(&szBuffer)) {};
 
 		// KVS_PT_STRINGLIST
-		ParameterFormat(const char * name,const unsigned char type,const unsigned char flags,QStringList &lBuffer)
-			: szName(name), uType(type), uFlags(flags), pContainer((void *)(&lBuffer)) {};
+		ParameterFormat(const char * name,KviKvsParameterTypeQStringList type,unsigned char flags,QStringList &lBuffer)
+			: szName(name), uType((unsigned char)type), uFlags(flags), pContainer((void *)(&lBuffer)) {};
 
 		// KVS_PT_VARIANTLIST
-		ParameterFormat(const char * name,const unsigned char type,const unsigned char flags,KviKvsVariantList &lBuffer)
-			: szName(name), uType(type), uFlags(flags), pContainer((void *)(&lBuffer)) {};
+		ParameterFormat(const char * name,KviKvsParameterTypeKviKvsVariantList type,unsigned char flags,KviKvsVariantList &lBuffer)
+			: szName(name), uType((unsigned char)type), uFlags(flags), pContainer((void *)(&lBuffer)) {};
 
 		// KVS_PT_HOBJECT
-		ParameterFormat(const char * name,const unsigned char type,const unsigned char flags,kvs_hobject_t &hBuffer)
-			: szName(name), uType(type), uFlags(flags), pContainer((void *)(&hBuffer)) {};
+		ParameterFormat(const char * name,KviKvsParameterTypeKvsHObjectT type,unsigned char flags,kvs_hobject_t &hBuffer)
+			: szName(name), uType((unsigned char)type), uFlags(flags), pContainer((void *)(&hBuffer)) {};
 
 		// KVS_PT_ARRAY
-		ParameterFormat(const char * name,const unsigned char type,const unsigned char flags,KviKvsArray * &pBuffer)
-			: szName(name), uType(type), uFlags(flags), pContainer((void *)(&pBuffer)) {};
+		ParameterFormat(const char * name,KviKvsParameterTypeKviKvsArrayPointer type,unsigned char flags,KviKvsArray * &pBuffer)
+			: szName(name), uType((unsigned char)type), uFlags(flags), pContainer((void *)(&pBuffer)) {};
 
 		// KVS_PT_IGNORE
 		ParameterFormat(const char * name)
@@ -184,7 +217,7 @@ namespace KviKvsParameterProcessor
 		ParameterFormat()
 			: szName(NULL), uType(KVS_PT_IGNORE), uFlags(0), pContainer(NULL) {};
 
-		//ParameterFormat(const char * n,const unsigned char t,const unsigned char f,void * p)
+		//ParameterFormat(const char * n,unsigned char t,unsigned char f,void * p)
 		//: szName(n), uType(t), uFlags(f), pContainer(p) {};
 	};
 
diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp
index eae3af7d7..10ec9e208 100644
--- a/src/modules/context/libkvicontext.cpp
+++ b/src/modules/context/libkvicontext.cpp
@@ -40,7 +40,7 @@
 #include "kvi_ircconnectiontarget.h"
 
 #define GET_CONSOLE_FROM_STANDARD_PARAMS \
-	kvs_int_t iContextId; \
+	kvs_uint_t iContextId; \
 	KVSM_PARAMETERS_BEGIN(c) \
 		KVSM_PARAMETER("irc_context_id",KVS_PT_UINT,KVS_PF_OPTIONAL,iContextId) \
 	KVSM_PARAMETERS_END(c) \
diff --git a/src/modules/objects/class_listwidget.cpp b/src/modules/objects/class_listwidget.cpp
index cf631ea5a..60341f630 100644
--- a/src/modules/objects/class_listwidget.cpp
+++ b/src/modules/objects/class_listwidget.cpp
@@ -215,7 +215,7 @@ KVSO_CLASS_FUNCTION(listwidget,setFlags)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QStringList itemflags;
-	kvs_int_t iIdx;
+	kvs_uint_t iIdx;
 	KVSO_PARAMETERS_BEGIN(c)
 	    KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,iIdx)
 	    KVSO_PARAMETER("flags",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,itemflags)
@@ -248,7 +248,7 @@ KVSO_CLASS_FUNCTION(listwidget,setFlags)
 KVSO_CLASS_FUNCTION(listwidget,setChecked)
 {
 	bool bChecked;
-	kvs_int_t iIdx;
+	kvs_uint_t iIdx;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,iIdx)
 		KVSO_PARAMETER("bChecked",KVS_PT_BOOL,0,bChecked)
@@ -261,7 +261,7 @@ KVSO_CLASS_FUNCTION(listwidget,setChecked)
 
 KVSO_CLASS_FUNCTION(listwidget,isChecked)
 {
-	kvs_int_t iIdx;
+	kvs_uint_t iIdx;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,iIdx)
 	KVSO_PARAMETERS_END(c)
@@ -313,7 +313,7 @@ KVSO_CLASS_FUNCTION(listwidget,clear)
 KVSO_CLASS_FUNCTION(listwidget,changeItem)
 {
 	CHECK_INTERNAL_POINTER(widget())
-	kvs_int_t iIndex,cnt;
+	kvs_uint_t iIndex,cnt;
 	QString szText;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("text",KVS_PT_STRING,0,szText)
diff --git a/src/modules/objects/class_tablewidget.cpp b/src/modules/objects/class_tablewidget.cpp
index 357884373..c455c881a 100644
--- a/src/modules/objects/class_tablewidget.cpp
+++ b/src/modules/objects/class_tablewidget.cpp
@@ -22,6 +22,8 @@
 //
 //=============================================================================
 
+// FIXME: Indentation in this file sux :D
+
 #include "kvi_debug.h"
 #include "kvi_app.h"
 #include "kvi_locale.h"
@@ -189,7 +191,7 @@ KVSO_CLASS_FUNCTION(tablewidget,clear)
 KVSO_CLASS_FUNCTION(tablewidget,setText)
 {
             CHECK_INTERNAL_POINTER(widget())
-            kvs_int_t iCol,iRow;
+            kvs_uint_t iCol,iRow;
             QString szText;
             KVSO_PARAMETERS_BEGIN(c)
                         KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,iRow)
@@ -210,7 +212,8 @@ KVSO_CLASS_FUNCTION(tablewidget,setText)
 KVSO_CLASS_FUNCTION(tablewidget,setNumber)
 {
 	    CHECK_INTERNAL_POINTER(widget())
-	    kvs_int_t iCol,iRow,iNumber;
+	    kvs_uint_t iCol,iRow;
+			kvs_int_t iNumber;
 	    QString szText;
 	    KVSO_PARAMETERS_BEGIN(c)
 			KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,iRow)
@@ -230,7 +233,7 @@ KVSO_CLASS_FUNCTION(tablewidget,setNumber)
 }
 KVSO_CLASS_FUNCTION(tablewidget,setIcon)
 {
-            kvs_int_t iCol,iRow;
+            kvs_uint_t iCol,iRow;
             KviKvsObject *obPixmap;
             kvs_hobject_t obHpixmap;
             KviKvsVariant * vPixmap;
@@ -272,7 +275,7 @@ KVSO_CLASS_FUNCTION(tablewidget,setIcon)
 KVSO_CLASS_FUNCTION(tablewidget,text)
 {
             CHECK_INTERNAL_POINTER(widget())
-            kvs_int_t iCol,iRow;
+            kvs_uint_t iCol,iRow;
             KVSO_PARAMETERS_BEGIN(c)
                         KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,iRow)
                         KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,iCol)
@@ -285,7 +288,7 @@ KVSO_CLASS_FUNCTION(tablewidget,text)
 KVSO_CLASS_FUNCTION(tablewidget,setRowCount)
 {
             CHECK_INTERNAL_POINTER(widget())
-            kvs_int_t iRow;
+            kvs_uint_t iRow;
             KVSO_PARAMETERS_BEGIN(c)
                         KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,iRow)
             KVSO_PARAMETERS_END(c)
@@ -319,7 +322,7 @@ KVSO_CLASS_FUNCTION(tablewidget,columnCount)
 KVSO_CLASS_FUNCTION(tablewidget,itemRowColAt)
 {
         CHECK_INTERNAL_POINTER(widget())
-        kvs_int_t uX,uY;
+        kvs_uint_t uX,uY;
         KVSO_PARAMETERS_BEGIN(c)
                 KVSO_PARAMETER("uX",KVS_PT_UNSIGNEDINTEGER,0,uX)
                 KVSO_PARAMETER("uY",KVS_PT_UNSIGNEDINTEGER,0,uY)
@@ -336,7 +339,7 @@ KVSO_CLASS_FUNCTION(tablewidget,setToolTip)
 {
         CHECK_INTERNAL_POINTER(widget())
         QString szTooltip;
-        kvs_int_t uX,uY;
+        kvs_uint_t uX,uY;
         KVSO_PARAMETERS_BEGIN(c)
                 KVSO_PARAMETER("uX",KVS_PT_UNSIGNEDINTEGER,0,uX)
                 KVSO_PARAMETER("uY",KVS_PT_UNSIGNEDINTEGER,0,uY)
@@ -348,7 +351,7 @@ KVSO_CLASS_FUNCTION(tablewidget,setToolTip)
 KVSO_CLASS_FUNCTION(tablewidget,setColumnCount)
 {
             CHECK_INTERNAL_POINTER(widget())
-            kvs_int_t iCol;
+            kvs_uint_t iCol;
             KVSO_PARAMETERS_BEGIN(c)
                         KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,iCol)
             KVSO_PARAMETERS_END(c)
@@ -359,7 +362,7 @@ KVSO_CLASS_FUNCTION(tablewidget,setColumnCount)
 KVSO_CLASS_FUNCTION(tablewidget,hideColumn)
 {
             CHECK_INTERNAL_POINTER(widget())
-            kvs_int_t iCol;
+            kvs_uint_t iCol;
             KVSO_PARAMETERS_BEGIN(c)
                         KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,iCol)
             KVSO_PARAMETERS_END(c)
@@ -369,7 +372,7 @@ KVSO_CLASS_FUNCTION(tablewidget,hideColumn)
 KVSO_CLASS_FUNCTION(tablewidget,showColumn)
 {
             CHECK_INTERNAL_POINTER(widget())
-            kvs_int_t iCol;
+            kvs_uint_t iCol;
             KVSO_PARAMETERS_BEGIN(c)
                         KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,iCol)
             KVSO_PARAMETERS_END(c)
@@ -378,7 +381,7 @@ KVSO_CLASS_FUNCTION(tablewidget,showColumn)
 }KVSO_CLASS_FUNCTION(tablewidget,hideRow)
 {
             CHECK_INTERNAL_POINTER(widget())
-            kvs_int_t iRow;
+            kvs_uint_t iRow;
             KVSO_PARAMETERS_BEGIN(c)
                         KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,iRow)
             KVSO_PARAMETERS_END(c)
@@ -387,7 +390,7 @@ KVSO_CLASS_FUNCTION(tablewidget,showColumn)
 }KVSO_CLASS_FUNCTION(tablewidget,showRow)
 {
             CHECK_INTERNAL_POINTER(widget())
-            kvs_int_t iRow;
+            kvs_uint_t iRow;
             KVSO_PARAMETERS_BEGIN(c)
                         KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,iRow)
             KVSO_PARAMETERS_END(c)
@@ -458,7 +461,7 @@ KVSO_CLASS_FUNCTION(tablewidget,setCellWidget)
             CHECK_INTERNAL_POINTER(widget())
             KviKvsObject * pObject;
             kvs_hobject_t hObject;
-            kvs_int_t iRow,iCol;
+            kvs_uint_t iRow,iCol;
             KVSO_PARAMETERS_BEGIN(c)
                         KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,iRow)
                         KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,iCol)
@@ -499,7 +502,7 @@ KVSO_CLASS_FUNCTION(tablewidget,setItemFlags)
     CHECK_INTERNAL_POINTER(widget())
 
     QStringList itemflags;
-        kvs_int_t iRow,iCol;
+        kvs_uint_t iRow,iCol;
         KVSO_PARAMETERS_BEGIN(c)
                 KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,iRow)
                 KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,iCol)
diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp
index 605becec7..cb38dc9d1 100644
--- a/src/modules/objects/class_tabwidget.cpp
+++ b/src/modules/objects/class_tabwidget.cpp
@@ -211,7 +211,7 @@ KVSO_CLASS_FUNCTION(tabwidget,insertTab)
 	CHECK_INTERNAL_POINTER(widget())
 	KviKvsObject *pObject;
 	QString szLabel,szIcon;
-	kvs_int_t iIndex;
+	kvs_uint_t iIndex;
 	kvs_hobject_t hObject;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("tab_widget",KVS_PT_HOBJECT,0,hObject)
@@ -232,7 +232,7 @@ KVSO_CLASS_FUNCTION(tabwidget,insertTab)
 KVSO_CLASS_FUNCTION(tabwidget,setCurrentPage)
 {
 	CHECK_INTERNAL_POINTER(widget())
-	kvs_int_t iIndex;
+	kvs_uint_t iIndex;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,iIndex)
 	KVSO_PARAMETERS_END(c)
@@ -311,7 +311,7 @@ KVSO_CLASS_FUNCTION(tabwidget,currentPageIndex)
 KVSO_CLASS_FUNCTION(tabwidget,tabLabel)
 {
 	CHECK_INTERNAL_POINTER(widget())
-	kvs_uint_t uIndex;
+	kvs_int_t uIndex;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("index",KVS_PT_INT,0,uIndex)
 	KVSO_PARAMETERS_END(c)
diff --git a/src/modules/objects/class_treewidget.cpp b/src/modules/objects/class_treewidget.cpp
index 6c924eb7e..5014f2599 100644
--- a/src/modules/objects/class_treewidget.cpp
+++ b/src/modules/objects/class_treewidget.cpp
@@ -388,7 +388,7 @@ KVSO_CLASS_FUNCTION(treewidget,setColumnText)
 */
 KVSO_CLASS_FUNCTION(treewidget,setColumnCount)
 {
-	kvs_int_t uCol;
+	kvs_uint_t uCol;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,uCol)
 	KVSO_PARAMETERS_END(c)
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index 3f60e1dbf..f96f19339 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -1753,7 +1753,7 @@ KVSO_CLASS_FUNCTION(widget,addWidgetToWrappedLayout)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	KviKvsObject *ob;
-	kvs_int_t uCol,uRow;
+	kvs_uint_t uCol,uRow;
 	kvs_hobject_t hObject;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("widget",KVS_PT_HOBJECT,0,hObject)
diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp
index 11d32e693..905608caf 100644
--- a/src/modules/objects/class_wizard.cpp
+++ b/src/modules/objects/class_wizard.cpp
@@ -155,7 +155,7 @@ KVSO_CLASS_FUNCTION(wizard,insertPage)
 
 	KviKvsObject *ob;
 	QString szLabel;
-	kvs_int_t uIndex;
+	kvs_uint_t uIndex;
 	kvs_hobject_t hObject;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("page_widget",KVS_PT_HOBJECT,0,hObject)
diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp
index 7c459d9ea..81b1a7b2e 100644
--- a/src/modules/spaste/libkvispaste.cpp
+++ b/src/modules/spaste/libkvispaste.cpp
@@ -197,7 +197,7 @@ static bool spaste_kvs_cmd_clipboard(KviKvsModuleCommandCall * c)
 
 static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c)
 {
-	kvs_int_t iId=0;
+	kvs_uint_t iId=0;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("delay",KVS_PT_UNSIGNEDINTEGER,KVS_PF_OPTIONAL,iId)
 	KVSM_PARAMETERS_END(c)
diff --git a/src/modules/upnp/libkviupnp.cpp b/src/modules/upnp/libkviupnp.cpp
index 865192d4a..954afe7dd 100644
--- a/src/modules/upnp/libkviupnp.cpp
+++ b/src/modules/upnp/libkviupnp.cpp
@@ -149,6 +149,7 @@ static bool upnp_kvs_cmd_addPortMapping(KviKvsModuleCommandCall * c)
 static bool upnp_kvs_cmd_delPortMapping(KviKvsModuleCommandCall * c)
 {
 	kvs_int_t iPort;
+	QString tmp;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("port",KVS_PT_INT,0,iPort)
 	KVSM_PARAMETERS_END(c)