diff options
| author | 2010-06-13 15:46:04 +0000 | |
|---|---|---|
| committer | 2010-06-13 15:46:04 +0000 | |
| commit | 4fbdd0c07ae74a6263ef29f934248edc3bd55e89 (patch) | |
| tree | f06b9b586ab1c52518cd3bb7130f8bd690f4d93c /src/modules/objects | |
| parent | Make the KVS parameter specification a bit more typesafe. Fix some mismatched... (diff) | |
| download | KVIrc-4fbdd0c07ae74a6263ef29f934248edc3bd55e89.tar.gz KVIrc-4fbdd0c07ae74a6263ef29f934248edc3bd55e89.tar.bz2 KVIrc-4fbdd0c07ae74a6263ef29f934248edc3bd55e89.zip | |
Yet more typesafe. Yet more minor errors caught.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4458 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/objects')
| -rw-r--r-- | src/modules/objects/class_listwidget.cpp | 8 | ||||
| -rw-r--r-- | src/modules/objects/class_tablewidget.cpp | 31 | ||||
| -rw-r--r-- | src/modules/objects/class_tabwidget.cpp | 6 | ||||
| -rw-r--r-- | src/modules/objects/class_treewidget.cpp | 2 | ||||
| -rw-r--r-- | src/modules/objects/class_widget.cpp | 2 | ||||
| -rw-r--r-- | src/modules/objects/class_wizard.cpp | 2 |
6 files changed, 27 insertions, 24 deletions
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) |
