aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/objects
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/objects')
-rw-r--r--src/modules/objects/class_listbox.cpp4
-rw-r--r--src/modules/objects/class_widget.cpp12
-rw-r--r--src/modules/objects/libkviobjects.cpp6
3 files changed, 11 insertions, 11 deletions
diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp
index cbfe3bc83..8d9f3381a 100644
--- a/src/modules/objects/class_listbox.cpp
+++ b/src/modules/objects/class_listbox.cpp
@@ -369,8 +369,8 @@ kvs_uint_t uIndex;
KviKvsArray * a = new KviKvsArray();
a->set(0,new KviKvsVariant((kvs_int_t)rect.left()));
a->set(1,new KviKvsVariant((kvs_int_t)rect.top()));
- a->set(2,new KviKvsVariant((kvs_int_t)rect.bottom()));
- a->set(3,new KviKvsVariant((kvs_int_t)rect.right()));
+ a->set(2,new KviKvsVariant((kvs_int_t)rect.width()));
+ a->set(3,new KviKvsVariant((kvs_int_t)rect.height()));
c->returnValue()->setArray(a);
}
return true;
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index 488d5f650..856006cce 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -1636,16 +1636,16 @@ bool KviKvsObject_widget::function_setDynamicToolTip(KviKvsObjectFunctionCall *c
if (!m_pTip)m_pTip=new KviKvsTip(this,widget());
QString szTip;
- kvs_int_t uXstart,uYstart,uXend,uYend;
+ kvs_int_t iXstart,iYstart,uWidth,uHeight;
KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("tip_text",KVS_PT_STRING,0,szTip)
- KVSO_PARAMETER("left",KVS_PT_INT,0,uXstart)
- KVSO_PARAMETER("top",KVS_PT_INT,0,uYstart)
- KVSO_PARAMETER("right",KVS_PT_INT,0,uXend)
- KVSO_PARAMETER("bottom",KVS_PT_INT,0,uYend)
+ KVSO_PARAMETER("x_start",KVS_PT_INT,0,iXstart)
+ KVSO_PARAMETER("y_start",KVS_PT_INT,0,iYstart)
+ KVSO_PARAMETER("width",KVS_PT_INT,0,uWidth)
+ KVSO_PARAMETER("height",KVS_PT_INT,0,uHeight)
KVSO_PARAMETERS_END(c)
if(!widget())return true;
- m_pTip->doTip(QRect(QPoint(uXstart,uYstart),QPoint(uXend,uYend)),szTip);
+ m_pTip->doTip(QRect(QPoint(iXstart,iYstart),QSize(uWidth,uHeight)),szTip);
return true;
}
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 3b017fad0..be70650ae 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -493,7 +493,7 @@ static bool objects_kvs_fnc_classes(KviKvsModuleFunctionCall * c)
@syntax:
<array> $object.classes()
@description:
- Returns an array with the user defined classes(useful only for debugging).
+ Returns an array with the user defined classes.
@seealso:
[doc:objects]objects documentation[/doc]
*/
@@ -503,7 +503,7 @@ static bool objects_kvs_fnc_classes(KviKvsModuleFunctionCall * c)
int uIdx=0;
QDictIterator<KviKvsObjectClass> it(*KviKvsKernel::instance()->objectController()->classDict());
QDict<bool> *classdict=new QDict<bool>;
- classdict->setAutoDelete(true);
+ classdict->setAutoDelete(false);
bool bFake=true;
while(KviKvsObjectClass * pClass=it.current())
{
@@ -531,7 +531,7 @@ static bool objects_kvs_fnc_classes(KviKvsModuleFunctionCall * c)
idx++;
++strIt;
}
-
+ delete classdict;
return true;
}