aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
authorGravatar Noldor2008-04-15 20:42:07 +0000
committerGravatar Noldor2008-04-15 20:42:07 +0000
commit310b66f157951449c25eec883a5bdef42a4af236 (patch)
tree2365fd88bd529cfbe46e5c16a068e2acdbb89802 /src/modules
parentfix in class listbox (now based on QListWidget) (diff)
downloadKVIrc-310b66f157951449c25eec883a5bdef42a4af236.tar.gz
KVIrc-310b66f157951449c25eec883a5bdef42a4af236.tar.bz2
KVIrc-310b66f157951449c25eec883a5bdef42a4af236.zip
other fixes in objects modules
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1488 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/objects/class_listbox.cpp8
-rw-r--r--src/modules/objects/class_listbox.h2
-rw-r--r--src/modules/objects/class_widget.cpp2
3 files changed, 5 insertions, 7 deletions
diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp
index ccdb3b6d8..592d3b27d 100644
--- a/src/modules/objects/class_listbox.cpp
+++ b/src/modules/objects/class_listbox.cpp
@@ -145,7 +145,7 @@ bool KviKvsObject_listbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
SET_OBJECT(QListWidget)
obj->setSelectionMode(QAbstractItemView::SingleSelection);
connect(obj,SIGNAL(itemSelectionChanged()),this,SLOT(selectionChanged()));
- connect(obj,SIGNAL(currentItemChanged(QListWidgetItem *)),this,SLOT(currentItemChanged(QListWidgetItem *)));
+ connect(obj,SIGNAL(currentItemChanged(QListWidgetItem *,QListWidgetItem *)),this,SLOT(currentItemChanged(QListWidgetItem *,QListWidgetItem *)));
// connect(obj,SIGNAL(onItem(QListWidgetItem *)),this,SLOT(onItem(QListWidgetItem *)));
return true;
}
@@ -362,12 +362,12 @@ void KviKvsObject_listbox::selectionChanged()
callFunction(this,"selectionChangeEvent",0,0);
}
-void KviKvsObject_listbox::currentItemChanged(QListWidgetItem *item)
+void KviKvsObject_listbox::currentItemChanged(QListWidgetItem *currentItem,QListWidgetItem *previousItem)
{
- if (!item) callFunction(this,"currentItemChangeEvent",0,0);
+ if (!currentItem) callFunction(this,"currentItemChangeEvent",0,0);
else
{
- KviKvsVariantList params(new KviKvsVariant(item->text()));
+ KviKvsVariantList params(new KviKvsVariant(currentItem->text()));
callFunction(this,"currentItemChangeEvent",0,&params);
}
diff --git a/src/modules/objects/class_listbox.h b/src/modules/objects/class_listbox.h
index 59a1081dc..21703fb89 100644
--- a/src/modules/objects/class_listbox.h
+++ b/src/modules/objects/class_listbox.h
@@ -64,7 +64,7 @@ protected:
//bool functionitemRect(KviKvsObjectFunctionCall *c);
protected slots:
void selectionChanged();
- void currentItemChanged(QListWidgetItem *);
+ void currentItemChanged(QListWidgetItem *,QListWidgetItem *);
void onItem(QListWidgetItem *);
};
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index 53f825fdb..2c7c7b3b9 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -1552,9 +1552,7 @@ bool KviKvsObject_widget::function_move(KviKvsObjectFunctionCall *c)
}
bool KviKvsObject_widget::function_sizeHint(KviKvsObjectFunctionCall *c)
{
- debug ("Kvs WIDGET size hint");
if(!widget())return true;
- //QVariant pro=widget()->property("sizeHint");
QSize sizehint =widget()->sizeHint();
KviKvsArray * a = new KviKvsArray();
a->set(0,new KviKvsVariant((kvs_int_t)sizehint.width()));