diff options
Diffstat (limited to 'src/modules/objects')
| -rw-r--r-- | src/modules/objects/class_listbox.cpp | 68 | ||||
| -rw-r--r-- | src/modules/objects/class_listbox.h | 8 | ||||
| -rw-r--r-- | src/modules/objects/class_listview.cpp | 82 | ||||
| -rw-r--r-- | src/modules/objects/class_listview.h | 26 | ||||
| -rw-r--r-- | src/modules/objects/class_listviewitem.cpp | 32 | ||||
| -rw-r--r-- | src/modules/objects/class_listviewitem.h | 18 | ||||
| -rw-r--r-- | src/modules/objects/libkviobjects.cpp | 2 |
7 files changed, 118 insertions, 118 deletions
diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp index efd576acd..56ce9d3ee 100644 --- a/src/modules/objects/class_listbox.cpp +++ b/src/modules/objects/class_listbox.cpp @@ -26,7 +26,7 @@ #include "kvi_debug.h" -#include <qlistbox.h> +#include "kvi_tal_listbox.h" #include "class_list.h" #include "class_listbox.h" @@ -149,12 +149,12 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_listbox) bool KviKvsObject_listbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - QListBox * b = new QListBox(parentScriptWidget(), name()); - b->setSelectionMode(QListBox::Single); + KviTalListBox * b = new KviTalListBox(parentScriptWidget()); + b->setSelectionMode(KviTalListBox::Single); connect(b,SIGNAL(selectionChanged()),this,SLOT(selectionChanged())); - connect(b,SIGNAL(currentChanged(QListBoxItem *)),this,SLOT(currentItemChanged(QListBoxItem *))); + connect(b,SIGNAL(currentChanged(KviTalListBoxItem *)),this,SLOT(currentItemChanged(KviTalListBoxItem *))); - connect(b,SIGNAL(onItem(QListBoxItem *)),this,SLOT(onItem(QListBoxItem *))); + connect(b,SIGNAL(onItem(KviTalListBoxItem *)),this,SLOT(onItem(KviTalListBoxItem *))); setObject(b,true);; return true; @@ -169,12 +169,12 @@ bool KviKvsObject_listbox::functioninsertItem(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("index",KVS_PT_INT,KVS_PF_OPTIONAL,iIndex) KVSO_PARAMETERS_END(c) if(widget()) - ((QListBox *)widget())->insertItem(szItem, iIndex); + ((KviTalListBox *)widget())->insertItem(szItem, iIndex); return true; } bool KviKvsObject_listbox::functionclear(KviKvsObjectFunctionCall *c) { - if (widget()) ((QListBox *)widget())->clear(); + if (widget()) ((KviTalListBox *)widget())->clear(); return true; } bool KviKvsObject_listbox::functionchangeItem(KviKvsObjectFunctionCall *c) @@ -188,14 +188,14 @@ bool KviKvsObject_listbox::functionchangeItem(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) if(!widget()) return true; if (szText.isEmpty()) c->warning(__tr2qs("No string parameter given - using empty string")); - if(uIndex >= (cnt = ((QListBox *)widget())->count())) + if(uIndex >= (cnt = ((KviTalListBox *)widget())->count())) { c->warning(__tr2qs("Item index [%d] is too big - defaulting to " \ "$count() - 1 [%d]"), uIndex, cnt); uIndex = cnt - 1; } - ((QListBox *)widget())->changeItem(szText, uIndex); + ((KviTalListBox *)widget())->changeItem(szText, uIndex); return true; @@ -208,14 +208,14 @@ bool KviKvsObject_listbox::functionremoveItem(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex) KVSO_PARAMETERS_END(c) if(!widget()) return true; - if(uIndex >= (cnt = ((QListBox *)widget())->count())) + if(uIndex >= (cnt = ((KviTalListBox *)widget())->count())) { c->warning(__tr2qs("Item index [%d] is too big - defaulting to " \ "$count() - 1 [%d]"), uIndex, cnt); uIndex = cnt - 1; } - ((QListBox *)widget())->removeItem(uIndex); + ((KviTalListBox *)widget())->removeItem(uIndex); return true; @@ -223,17 +223,17 @@ bool KviKvsObject_listbox::functionremoveItem(KviKvsObjectFunctionCall *c) bool KviKvsObject_listbox::functioncount(KviKvsObjectFunctionCall *c) { - if (widget()) c->returnValue()->setInteger(((QListBox *)widget())->count()); + if (widget()) c->returnValue()->setInteger(((KviTalListBox *)widget())->count()); return true; } bool KviKvsObject_listbox::functioncurrentText(KviKvsObjectFunctionCall *c) { - if (widget()) c->returnValue()->setString(((QListBox *)widget())->currentText().local8Bit().data()); + if (widget()) c->returnValue()->setString(((KviTalListBox *)widget())->currentText().local8Bit().data()); return true; } bool KviKvsObject_listbox::functioncurrentItem(KviKvsObjectFunctionCall *c) { - if (widget()) c->returnValue()->setInteger(((QListBox *)widget())->currentItem()); + if (widget()) c->returnValue()->setInteger(((KviTalListBox *)widget())->currentItem()); return true; } @@ -245,7 +245,7 @@ bool KviKvsObject_listbox::functiontextAt(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex) KVSO_PARAMETERS_END(c) if(widget()) - c->returnValue()->setString(((QListBox *)widget())->text(uIndex)); + c->returnValue()->setString(((KviTalListBox *)widget())->text(uIndex)); return true; } bool KviKvsObject_listbox::functionsetCurrentItem(KviKvsObjectFunctionCall *c) @@ -255,7 +255,7 @@ bool KviKvsObject_listbox::functionsetCurrentItem(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex) KVSO_PARAMETERS_END(c) if(widget()) - ((QListBox *)widget())->setCurrentItem(uIndex); + ((KviTalListBox *)widget())->setCurrentItem(uIndex); return true; } bool KviKvsObject_listbox::functionsetSelectionMode(KviKvsObjectFunctionCall *c) @@ -265,18 +265,18 @@ bool KviKvsObject_listbox::functionsetSelectionMode(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("selection_mode",KVS_PT_STRING,0,szMode) KVSO_PARAMETERS_END(c) if(!widget()) return true; - QListBox::SelectionMode iMode = QListBox::Single; + KviTalListBox::SelectionMode iMode = KviTalListBox::Single; - if(KviQString::equalCI(szMode,"single")) iMode = QListBox::Single; + if(KviQString::equalCI(szMode,"single")) iMode = KviTalListBox::Single; - else if(KviQString::equalCI(szMode,"multi")) iMode = QListBox::Multi; + else if(KviQString::equalCI(szMode,"multi")) iMode = KviTalListBox::Multi; - else if(KviQString::equalCI(szMode,"extended")) iMode = QListBox::Extended; + else if(KviQString::equalCI(szMode,"extended")) iMode = KviTalListBox::Extended; - else if(KviQString::equalCI(szMode,"none")) iMode = QListBox::NoSelection; + else if(KviQString::equalCI(szMode,"none")) iMode = KviTalListBox::NoSelection; else c->warning(__tr2qs("Invalid selection mode '%Q' assuming single"),&szMode); - ((QListBox *)widget())->setSelectionMode(iMode); + ((KviTalListBox *)widget())->setSelectionMode(iMode); return true; } @@ -284,12 +284,12 @@ bool KviKvsObject_listbox::functionselectionMode(KviKvsObjectFunctionCall *c) { if(!widget()) return true; - switch(((QListBox *)widget())->selectionMode()) + switch(((KviTalListBox *)widget())->selectionMode()) { - case QListBox::Single: c->returnValue()->setString("single"); break; - case QListBox::Multi: c->returnValue()->setString("multi"); break; - case QListBox::Extended: c->returnValue()->setString("extended"); break; - case QListBox::NoSelection: c->returnValue()->setString("none"); break; + case KviTalListBox::Single: c->returnValue()->setString("single"); break; + case KviTalListBox::Multi: c->returnValue()->setString("multi"); break; + case KviTalListBox::Extended: c->returnValue()->setString("extended"); break; + case KviTalListBox::NoSelection: c->returnValue()->setString("none"); break; default: c->returnValue()->setString("single"); break; } return true; @@ -302,7 +302,7 @@ bool KviKvsObject_listbox::functionisSelected(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex) KVSO_PARAMETERS_END(c) - if(widget())c->returnValue()->setBoolean(((QListBox *)widget())->isSelected(uIndex)); + if(widget())c->returnValue()->setBoolean(((KviTalListBox *)widget())->isSelected(uIndex)); return true; } bool KviKvsObject_listbox::functionsetSelected(KviKvsObjectFunctionCall *c) @@ -313,7 +313,7 @@ bool KviKvsObject_listbox::functionsetSelected(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex) KVSO_PARAMETER("benabled",KVS_PT_BOOLEAN,0,bSel) KVSO_PARAMETERS_END(c) - if(widget()) ((QListBox *)widget())->setSelected(uIndex,bSel); + if(widget()) ((KviTalListBox *)widget())->setSelected(uIndex,bSel); return true; } bool KviKvsObject_listbox::functionitemAt(KviKvsObjectFunctionCall *c) @@ -324,7 +324,7 @@ bool KviKvsObject_listbox::functionitemAt(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("uY",KVS_PT_UNSIGNEDINTEGER,0,uY) KVSO_PARAMETERS_END(c) if(widget()) - c->returnValue()->setInteger(((QListBox *)widget())->index(((QListBox *)widget())->itemAt(QPoint(uX,uY)))); + c->returnValue()->setInteger(((KviTalListBox *)widget())->index(((KviTalListBox *)widget())->itemAt(QPoint(uX,uY)))); return true; } @@ -341,7 +341,7 @@ void KviKvsObject_listbox::selectionChanged() callFunction(this,"selectionChangeEvent",0,0); } -void KviKvsObject_listbox::currentItemChanged(QListBoxItem *item) +void KviKvsObject_listbox::currentItemChanged(KviTalListBoxItem *item) { if (!item) callFunction(this,"currentItemChangeEvent",0,0); else @@ -358,9 +358,9 @@ bool KviKvsObject_listbox::functiononItemEvent(KviKvsObjectFunctionCall *c) return true; } -void KviKvsObject_listbox::onItem(QListBoxItem *item) +void KviKvsObject_listbox::onItem(KviTalListBoxItem *item) { - QListBox *lbx(item->listBox()); + KviTalListBox *lbx = (KviTalListBox *)(item->listBox()); KviKvsVariantList params(new KviKvsVariant((kvs_int_t)lbx->index(item))); callFunction(this,"onItemEvent",0,¶ms); } @@ -374,7 +374,7 @@ kvs_uint_t uIndex; KVSO_PARAMETERS_END(c) if(widget()) { - QRect rect=((QListBox *)widget())->itemRect(((QListBox *)widget())->item(uIndex)); + QRect rect=((KviTalListBox *)widget())->itemRect(((KviTalListBox *)widget())->item(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())); diff --git a/src/modules/objects/class_listbox.h b/src/modules/objects/class_listbox.h index 30991927d..360f162bd 100644 --- a/src/modules/objects/class_listbox.h +++ b/src/modules/objects/class_listbox.h @@ -26,8 +26,8 @@ #include "class_widget.h" -class QListBox; -class QListBoxItem; +class KviTalListBox; +class KviTalListBoxItem; #include "object_macros.h" @@ -61,8 +61,8 @@ protected: bool functionitemRect(KviKvsObjectFunctionCall *c); protected slots: void selectionChanged(); - void currentItemChanged(QListBoxItem *); - void onItem(QListBoxItem *); + void currentItemChanged(KviTalListBoxItem *); + void onItem(KviTalListBoxItem *); }; diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp index 347166d14..735a55384 100644 --- a/src/modules/objects/class_listview.cpp +++ b/src/modules/objects/class_listview.cpp @@ -25,7 +25,7 @@ //================================================================================= -#include <qlistview.h> +#include "kvi_tal_listview.h" #include <qheader.h> #include "class_listview.h" #include "kvi_error.h" @@ -213,17 +213,17 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_listview) bool KviKvsObject_listview::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { setObject(new KviKvsMdmListView(parentScriptWidget(),name(),this),true); - connect(widget(),SIGNAL(clicked(QListViewItem *)),this,SLOT(slotClicked(QListViewItem *))); - connect(widget(),SIGNAL(selectionChanged(QListViewItem *)),this,SLOT(slotSelectionChanged(QListViewItem *))); + connect(widget(),SIGNAL(clicked(KviTalListViewItem *)),this,SLOT(slotClicked(KviTalListViewItem *))); + connect(widget(),SIGNAL(selectionChanged(KviTalListViewItem *)),this,SLOT(slotSelectionChanged(KviTalListViewItem *))); connect(widget(),SIGNAL(selectionChanged()),this,SLOT(slotMultipleSelectionChanged())); - connect(widget(),SIGNAL(currentChanged(QListViewItem *)),this,SLOT(slotCurrentChanged(QListViewItem *))); - connect(widget(),SIGNAL(returnPressed(QListViewItem *)),this,SLOT(slotReturnPressed(QListViewItem *))); - connect(widget(),SIGNAL(spacePressed(QListViewItem *)),this,SLOT(slotSpacePressed(QListViewItem *))); - connect(widget(),SIGNAL(onItem(QListViewItem *)),this,SLOT(slotOnItem(QListViewItem *))); - connect(widget(),SIGNAL(expanded(QListViewItem *)),this,SLOT(slotItemExpanded(QListViewItem *))); - connect(widget(),SIGNAL(collapsed(QListViewItem *)),this,SLOT(slotItemCollapsed(QListViewItem *))); - connect(widget(),SIGNAL(rightButtonClicked(QListViewItem *,const QPoint &,int)),this,SLOT(slotRightButtonClicked(QListViewItem *,const QPoint &,int))); - connect(widget(),SIGNAL(itemRenamed(QListViewItem *,int,const QString &)),this,SLOT(slotItemRenamed(QListViewItem *,int,const QString &))); + connect(widget(),SIGNAL(currentChanged(KviTalListViewItem *)),this,SLOT(slotCurrentChanged(KviTalListViewItem *))); + connect(widget(),SIGNAL(returnPressed(KviTalListViewItem *)),this,SLOT(slotReturnPressed(KviTalListViewItem *))); + connect(widget(),SIGNAL(spacePressed(KviTalListViewItem *)),this,SLOT(slotSpacePressed(KviTalListViewItem *))); + connect(widget(),SIGNAL(onItem(KviTalListViewItem *)),this,SLOT(slotOnItem(KviTalListViewItem *))); + connect(widget(),SIGNAL(expanded(KviTalListViewItem *)),this,SLOT(slotItemExpanded(KviTalListViewItem *))); + connect(widget(),SIGNAL(collapsed(KviTalListViewItem *)),this,SLOT(slotItemCollapsed(KviTalListViewItem *))); + connect(widget(),SIGNAL(rightButtonClicked(KviTalListViewItem *,const QPoint &,int)),this,SLOT(slotRightButtonClicked(KviTalListViewItem *,const QPoint &,int))); + connect(widget(),SIGNAL(itemRenamed(KviTalListViewItem *,int,const QString &)),this,SLOT(slotItemRenamed(KviTalListViewItem *,int,const QString &))); return true; } @@ -236,7 +236,7 @@ bool KviKvsObject_listview::function_addColumn(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("width",KVS_PT_INT,0,iW) KVSO_PARAMETERS_END(c) if (widget()) - ((QListView *)object())->addColumn(szLabel,iW); + ((KviTalListView *)object())->addColumn(szLabel,iW); return true; } /* @@ -247,21 +247,21 @@ bool KviKvsObject_listview::function_setAcceptDrops(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("bEnable",KVS_PT_BOOLEAN,0,bEnable) KVSO_PARAMETERS_END(c) if (widget()) - ((QListView *)object())->setAcceptDrops(bEnable); + ((KviTalListView *)object())->setAcceptDrops(bEnable); return true; } */ bool KviKvsObject_listview::function_clear(KviKvsObjectFunctionCall *c) { if (widget()) - ((QListView *)object())->clear(); + ((KviTalListView *)object())->clear(); return true; } bool KviKvsObject_listview::function_selectedItem(KviKvsObjectFunctionCall *c) { if(widget()) - c->returnValue()->setHObject(KviKvsObject_listviewitem::itemToHandle(((QListView *)widget())->selectedItem())); + c->returnValue()->setHObject(KviKvsObject_listviewitem::itemToHandle(((KviTalListView *)widget())->selectedItem())); else c->returnValue()->setHObject((kvs_hobject_t)0); return true; @@ -270,7 +270,7 @@ bool KviKvsObject_listview::function_selectedItem(KviKvsObjectFunctionCall *c) bool KviKvsObject_listview::function_firstChild(KviKvsObjectFunctionCall *c) { if(widget()) - c->returnValue()->setHObject(KviKvsObject_listviewitem::itemToHandle(((QListView *)widget())->firstChild())); + c->returnValue()->setHObject(KviKvsObject_listviewitem::itemToHandle(((KviTalListView *)widget())->firstChild())); else c->returnValue()->setHObject((kvs_hobject_t)0); return true; @@ -279,7 +279,7 @@ bool KviKvsObject_listview::function_firstChild(KviKvsObjectFunctionCall *c) bool KviKvsObject_listview::function_currentItem(KviKvsObjectFunctionCall *c) { if(widget()) - c->returnValue()->setHObject(KviKvsObject_listviewitem::itemToHandle(((QListView *)widget())->currentItem())); + c->returnValue()->setHObject(KviKvsObject_listviewitem::itemToHandle(((KviTalListView *)widget())->currentItem())); else c->returnValue()->setHObject((kvs_hobject_t)0); return true; @@ -293,7 +293,7 @@ bool KviKvsObject_listview::function_setColumnText(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,uCol) KVSO_PARAMETER("text",KVS_PT_STRING,0,szText) KVSO_PARAMETERS_END(c) - if (widget())((QListView *)widget())->setColumnText(uCol,szText); + if (widget())((KviTalListView *)widget())->setColumnText(uCol,szText); return true; } @@ -305,13 +305,13 @@ bool KviKvsObject_listview::function_setSelectionMode(KviKvsObjectFunctionCall * KVSO_PARAMETERS_END(c) if(!widget())return true; if(KviQString::equalCI(szMode,"NoSelection")) - ((QListView *)widget())->setSelectionMode(QListView::NoSelection); + ((KviTalListView *)widget())->setSelectionMode(KviTalListView::NoSelection); else if(KviQString::equalCI(szMode,"Multi")) - ((QListView *)widget())->setSelectionMode(QListView::Multi); + ((KviTalListView *)widget())->setSelectionMode(KviTalListView::Multi); else if(KviQString::equalCI(szMode,"Extended")) - ((QListView *)widget())->setSelectionMode(QListView::Extended); + ((KviTalListView *)widget())->setSelectionMode(KviTalListView::Extended); else if(KviQString::equalCI(szMode,"Single")) - ((QListView *)widget())->setSelectionMode(QListView::Single); + ((KviTalListView *)widget())->setSelectionMode(KviTalListView::Single); else c->warning(__tr2qs("Invalid selection mode 'Q'"),&szMode); return true; } @@ -324,7 +324,7 @@ bool KviKvsObject_listview::function_setSorting(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("column",KVS_PT_INT,0,iCol) KVSO_PARAMETER("benabled",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) - if (widget()) ((QListView *)widget())->setSorting(iCol,bEnabled); + if (widget()) ((KviTalListView *)widget())->setSorting(iCol,bEnabled); return true; } @@ -335,7 +335,7 @@ bool KviKvsObject_listview::function_setRootIsDecorated(KviKvsObjectFunctionCall KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) - if (widget()) ((QListView *)widget())->setRootIsDecorated(bEnabled); + if (widget()) ((KviTalListView *)widget())->setRootIsDecorated(bEnabled); return true; } @@ -345,23 +345,23 @@ bool KviKvsObject_listview::function_setAllColumnsShowFocus(KviKvsObjectFunction KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bAllColumnsShowFocus",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) - if (widget())((QListView *)widget())->setAllColumnsShowFocus(bEnabled); + if (widget())((KviTalListView *)widget())->setAllColumnsShowFocus(bEnabled); return true; } bool KviKvsObject_listview::function_hideListViewHeader(KviKvsObjectFunctionCall *c) { - ((QListView *)widget())->header()->hide(); + ((KviTalListView *)widget())->header()->hide(); return true; } bool KviKvsObject_listview::function_showListViewHeader(KviKvsObjectFunctionCall *c) { - ((QListView *)widget())->header()->show(); + ((KviTalListView *)widget())->header()->show(); return true; } bool KviKvsObject_listview::function_listViewHeaderIsVisible(KviKvsObjectFunctionCall *c) { - c->returnValue()->setBoolean(((QListView *)widget())->header()->isVisible()); + c->returnValue()->setBoolean(((KviTalListView *)widget())->header()->isVisible()); return true; } @@ -371,7 +371,7 @@ bool KviKvsObject_listview::function_itemClickedEvent(KviKvsObjectFunctionCall * return true; } -void KviKvsObject_listview::slotClicked(QListViewItem * i) +void KviKvsObject_listview::slotClicked(KviTalListViewItem * i) { KviKvsVariantList params(new KviKvsVariant(KviKvsObject_listviewitem::itemToHandle(i))); callFunction(this,"itemClickedEvent",0,¶ms); @@ -383,7 +383,7 @@ bool KviKvsObject_listview::function_selectionChangedEvent(KviKvsObjectFunctionC return true; } -void KviKvsObject_listview::slotSelectionChanged(QListViewItem * i) +void KviKvsObject_listview::slotSelectionChanged(KviTalListViewItem * i) { KviKvsVariantList params(new KviKvsVariant(KviKvsObject_listviewitem::itemToHandle(i))); callFunction(this,"selectionChangedEvent",0,¶ms); @@ -402,7 +402,7 @@ bool KviKvsObject_listview::function_currentChangedEvent(KviKvsObjectFunctionCal return true; } -void KviKvsObject_listview::slotCurrentChanged(QListViewItem * i) +void KviKvsObject_listview::slotCurrentChanged(KviTalListViewItem * i) { KviKvsVariantList params(new KviKvsVariant(KviKvsObject_listviewitem::itemToHandle(i))); callFunction(this,"currentChangedEvent",0,¶ms); @@ -415,7 +415,7 @@ bool KviKvsObject_listview::function_returnPressedEvent(KviKvsObjectFunctionCall return true; } -void KviKvsObject_listview::slotReturnPressed(QListViewItem * i) +void KviKvsObject_listview::slotReturnPressed(KviTalListViewItem * i) { KviKvsVariantList params(new KviKvsVariant(KviKvsObject_listviewitem::itemToHandle(i))); callFunction(this,"returnPressedEvent",0,¶ms); @@ -427,7 +427,7 @@ bool KviKvsObject_listview::function_spacePressedEvent(KviKvsObjectFunctionCall return true; } -void KviKvsObject_listview::slotSpacePressed(QListViewItem * i) +void KviKvsObject_listview::slotSpacePressed(KviTalListViewItem * i) { KviKvsVariantList params(new KviKvsVariant(KviKvsObject_listviewitem::itemToHandle(i))); callFunction(this,"spacePressedEvent",0,¶ms); @@ -439,7 +439,7 @@ bool KviKvsObject_listview::function_onItemEvent(KviKvsObjectFunctionCall *c) return true; } -void KviKvsObject_listview::slotOnItem(QListViewItem * i) +void KviKvsObject_listview::slotOnItem(KviTalListViewItem * i) { KviKvsVariantList params(new KviKvsVariant(KviKvsObject_listviewitem::itemToHandle(i))); callFunction(this,"onItemEvent",0,¶ms); @@ -452,7 +452,7 @@ bool KviKvsObject_listview::function_itemExpandedEvent(KviKvsObjectFunctionCall return true; } -void KviKvsObject_listview::slotItemExpanded(QListViewItem * i) +void KviKvsObject_listview::slotItemExpanded(KviTalListViewItem * i) { KviKvsVariantList params(new KviKvsVariant(KviKvsObject_listviewitem::itemToHandle(i))); callFunction(this,"itemExpandedEvent",0,¶ms); @@ -464,7 +464,7 @@ bool KviKvsObject_listview::function_itemCollapsedEvent(KviKvsObjectFunctionCall return true; } -void KviKvsObject_listview::slotItemCollapsed(QListViewItem * i) +void KviKvsObject_listview::slotItemCollapsed(KviTalListViewItem * i) { KviKvsVariantList params(new KviKvsVariant(KviKvsObject_listviewitem::itemToHandle(i))); callFunction(this,"itemCollapsedEvent",0,¶ms); @@ -476,7 +476,7 @@ bool KviKvsObject_listview::function_rightButtonClickedEvent(KviKvsObjectFunctio return true; } -void KviKvsObject_listview::slotRightButtonClicked(QListViewItem * i,const QPoint &coor, int col) +void KviKvsObject_listview::slotRightButtonClicked(KviTalListViewItem * i,const QPoint &coor, int col) { KviKvsVariant *xpos=new KviKvsVariant((kvs_int_t)coor.x()); KviKvsVariant *ypos=new KviKvsVariant((kvs_int_t)coor.y()); @@ -491,14 +491,14 @@ bool KviKvsObject_listview::function_itemRenamedEvent(KviKvsObjectFunctionCall * return true; } -void KviKvsObject_listview::slotItemRenamed(QListViewItem *item,int col,const QString & szText) +void KviKvsObject_listview::slotItemRenamed(KviTalListViewItem *item,int col,const QString & szText) { KviKvsVariant *column=new KviKvsVariant((kvs_int_t)col); KviKvsVariant *txt=new KviKvsVariant(szText); KviKvsVariantList params(new KviKvsVariant(KviKvsObject_listviewitem::itemToHandle(item)),column,txt); callFunction(this,"itemRenamedEvent",0,¶ms); } -void KviKvsObject_listview::fileDropped(QString &szFile,QListViewItem *item) +void KviKvsObject_listview::fileDropped(QString &szFile,KviTalListViewItem *item) { KviKvsVariant *file=new KviKvsVariant(szFile); KviKvsVariantList params(new KviKvsVariant(KviKvsObject_listviewitem::itemToHandle(item)),file); @@ -506,7 +506,7 @@ void KviKvsObject_listview::fileDropped(QString &szFile,QListViewItem *item) } KviKvsMdmListView::KviKvsMdmListView(QWidget * par,const char * name,KviKvsObject_listview *parent) -:QListView( par,name) +:KviTalListView(par) { m_pParentScript=parent; setAcceptDrops(true); @@ -543,7 +543,7 @@ void KviKvsMdmListView::contentsDropEvent(QDropEvent *e) #ifndef COMPILE_ON_WINDOWS if(tmp[0] != '/')tmp.prepend("/"); //HACK HACK HACK for Qt bug (?!?) #endif - QListViewItem *i = itemAt( contentsToViewport(e->pos()) ); + KviTalListViewItem *i = itemAt( contentsToViewport(e->pos()) ); m_pParentScript->fileDropped(tmp,i); } } diff --git a/src/modules/objects/class_listview.h b/src/modules/objects/class_listview.h index dff661984..bd5f749cf 100644 --- a/src/modules/objects/class_listview.h +++ b/src/modules/objects/class_listview.h @@ -26,7 +26,7 @@ // //================================================================================= -#include <qlistview.h> +#include "kvi_tal_listview.h" #include <qdragobject.h> #include "class_widget.h" #include "class_listviewitem.h" @@ -41,7 +41,7 @@ public: public: QWidget * widget() { return (QWidget *)object(); }; - void fileDropped(QString &,QListViewItem *); + void fileDropped(QString &,KviTalListViewItem *); protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); @@ -73,20 +73,20 @@ protected: bool function_setAcceptDrops(KviKvsObjectFunctionCall *c); protected slots: - void slotClicked(QListViewItem *); - void slotSelectionChanged(QListViewItem *); + void slotClicked(KviTalListViewItem *); + void slotSelectionChanged(KviTalListViewItem *); void slotMultipleSelectionChanged(); - void slotCurrentChanged(QListViewItem *); - void slotReturnPressed(QListViewItem *); - void slotSpacePressed(QListViewItem *); - void slotOnItem(QListViewItem *); - void slotItemExpanded(QListViewItem *); - void slotItemCollapsed(QListViewItem *); - void slotItemRenamed(QListViewItem *,int,const QString &); - void slotRightButtonClicked(QListViewItem * i,const QPoint &coor, int col); + void slotCurrentChanged(KviTalListViewItem *); + void slotReturnPressed(KviTalListViewItem *); + void slotSpacePressed(KviTalListViewItem *); + void slotOnItem(KviTalListViewItem *); + void slotItemExpanded(KviTalListViewItem *); + void slotItemCollapsed(KviTalListViewItem *); + void slotItemRenamed(KviTalListViewItem *,int,const QString &); + void slotRightButtonClicked(KviTalListViewItem * i,const QPoint &coor, int col); }; -class KviKvsMdmListView : public QListView +class KviKvsMdmListView : public KviTalListView { Q_OBJECT public: diff --git a/src/modules/objects/class_listviewitem.cpp b/src/modules/objects/class_listviewitem.cpp index 98a17f3e3..f50ab4910 100644 --- a/src/modules/objects/class_listviewitem.cpp +++ b/src/modules/objects/class_listviewitem.cpp @@ -147,7 +147,7 @@ bool KviKvsObject_listviewitem::init(KviKvsRunTimeContext * pContext,KviKvsVaria m_pListViewItem = new KviKvsMdmStandardListViewItem(this,((KviKvsObject_listviewitem *)parentObject())->m_pListViewItem); } else { if(parentObject()->inherits("KviKvsObject_listview")) - m_pListViewItem = new KviKvsMdmStandardListViewItem(this,((QListView *)parentScriptWidget())); + m_pListViewItem = new KviKvsMdmStandardListViewItem(this,((KviTalListView *)parentScriptWidget())); else { pContext->error(__tr2qs("The parent of the listviewitem must be either another listviewitem or a listview")); return false; @@ -163,13 +163,13 @@ void KviKvsObject_listviewitem::childDestroyed() die(); } -KviKvsMdmStandardListViewItem::KviKvsMdmStandardListViewItem(KviKvsObject_listviewitem * ob,QListView * par) -:QListViewItem(par), m_pMasterObject(ob) +KviKvsMdmStandardListViewItem::KviKvsMdmStandardListViewItem(KviKvsObject_listviewitem * ob,KviTalListView * par) +:KviTalListViewItem(par), m_pMasterObject(ob) { } -KviKvsMdmStandardListViewItem::KviKvsMdmStandardListViewItem(KviKvsObject_listviewitem * ob,QListViewItem * par) -:QListViewItem(par), m_pMasterObject(ob) +KviKvsMdmStandardListViewItem::KviKvsMdmStandardListViewItem(KviKvsObject_listviewitem * ob,KviTalListViewItem * par) +:KviTalListViewItem(par), m_pMasterObject(ob) { } @@ -180,13 +180,13 @@ KviKvsMdmStandardListViewItem::~KviKvsMdmStandardListViewItem() -KviKvsMdmCheckListViewItem::KviKvsMdmCheckListViewItem(KviKvsObject_listviewitem * ob,QListView * par) -:QCheckListItem(par,QString::null,QCheckListItem::CheckBox), m_pMasterObject(ob) +KviKvsMdmCheckListViewItem::KviKvsMdmCheckListViewItem(KviKvsObject_listviewitem * ob,KviTalListView * par) +:KviTalCheckListItem(par,QString::null,KviTalCheckListItem::CheckBox), m_pMasterObject(ob) { } -KviKvsMdmCheckListViewItem::KviKvsMdmCheckListViewItem(KviKvsObject_listviewitem * ob,QListViewItem * par) -:QCheckListItem(par,QString::null,QCheckListItem::CheckBox), m_pMasterObject(ob) +KviKvsMdmCheckListViewItem::KviKvsMdmCheckListViewItem(KviKvsObject_listviewitem * ob,KviTalListViewItem * par) +:KviTalCheckListItem(par,QString::null,KviTalCheckListItem::CheckBox), m_pMasterObject(ob) { } @@ -196,7 +196,7 @@ KviKvsMdmCheckListViewItem::~KviKvsMdmCheckListViewItem() } -kvs_hobject_t KviKvsObject_listviewitem::itemToHandle(QListViewItem * it) +kvs_hobject_t KviKvsObject_listviewitem::itemToHandle(KviTalListViewItem * it) { if(!it)return (kvs_hobject_t)0; KviKvsObject_listviewitem * pObject; @@ -335,10 +335,10 @@ bool KviKvsObject_listviewitem::function_setCheckable(KviKvsObjectFunctionCall * if(bCheckable) { if(m_pListViewItem->rtti() == 1)return true; // a QCheckListItem already - QListViewItem * pParent = m_pListViewItem->parent(); - QListView * pLV = m_pListViewItem->listView(); + KviTalListViewItem * pParent = m_pListViewItem->parent(); + KviTalListView * pLV = (KviTalListView *)m_pListViewItem->listView(); // swap the items, so we don't die now - QListViewItem * pThis = m_pListViewItem; + KviTalListViewItem * pThis = m_pListViewItem; m_pListViewItem = 0; delete pThis; if(pParent) @@ -347,10 +347,10 @@ bool KviKvsObject_listviewitem::function_setCheckable(KviKvsObjectFunctionCall * m_pListViewItem = new KviKvsMdmCheckListViewItem(this,pLV); } else { if(m_pListViewItem->rtti() != 1)return true; // not a QCheckListItem yet - QListViewItem * pParent = m_pListViewItem->parent(); - QListView * pLV = m_pListViewItem->listView(); + KviTalListViewItem * pParent = m_pListViewItem->parent(); + KviTalListView * pLV = (KviTalListView *)m_pListViewItem->listView(); // swap the items, so we don't die now - QListViewItem * pThis = m_pListViewItem; + KviTalListViewItem * pThis = m_pListViewItem; m_pListViewItem = 0; delete pThis; if(pParent) diff --git a/src/modules/objects/class_listviewitem.h b/src/modules/objects/class_listviewitem.h index 8d994a940..b7f0db217 100644 --- a/src/modules/objects/class_listviewitem.h +++ b/src/modules/objects/class_listviewitem.h @@ -22,7 +22,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include <qlistview.h> +#include "kvi_tal_listview.h" #include "class_widget.h" @@ -36,7 +36,7 @@ public: KVSO_DECLARE_OBJECT(KviKvsObject_listviewitem) void childDestroyed(); protected: - QListViewItem * m_pListViewItem; + KviTalListViewItem * m_pListViewItem; protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); protected: @@ -56,16 +56,16 @@ protected: bool function_firstChild(KviKvsObjectFunctionCall *c); bool function_nextSibling(KviKvsObjectFunctionCall *c); public: - static kvs_hobject_t itemToHandle(QListViewItem * it); + static kvs_hobject_t itemToHandle(KviTalListViewItem * it); }; -class KviKvsMdmStandardListViewItem : public QListViewItem +class KviKvsMdmStandardListViewItem : public KviTalListViewItem { public: - KviKvsMdmStandardListViewItem(KviKvsObject_listviewitem * ob,QListView * par); - KviKvsMdmStandardListViewItem(KviKvsObject_listviewitem * ob,QListViewItem * par); + KviKvsMdmStandardListViewItem(KviKvsObject_listviewitem * ob,KviTalListView * par); + KviKvsMdmStandardListViewItem(KviKvsObject_listviewitem * ob,KviTalListViewItem * par); virtual ~KviKvsMdmStandardListViewItem(); protected: KviKvsObject_listviewitem * m_pMasterObject; @@ -73,11 +73,11 @@ public: KviKvsObject_listviewitem * masterObject(){ return m_pMasterObject; } }; -class KviKvsMdmCheckListViewItem : public QCheckListItem +class KviKvsMdmCheckListViewItem : public KviTalCheckListItem { public: - KviKvsMdmCheckListViewItem(KviKvsObject_listviewitem * ob,QListView * par); - KviKvsMdmCheckListViewItem(KviKvsObject_listviewitem * ob,QListViewItem * par); + KviKvsMdmCheckListViewItem(KviKvsObject_listviewitem * ob,KviTalListView * par); + KviKvsMdmCheckListViewItem(KviKvsObject_listviewitem * ob,KviTalListViewItem * par); virtual ~KviKvsMdmCheckListViewItem(); protected: KviKvsObject_listviewitem * m_pMasterObject; diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index 4606c2083..e083be5ee 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -24,7 +24,7 @@ #include <qwidgetlist.h>
#include <qobjectlist.h>
-#include <qlistview.h>
+#include "kvi_tal_listview.h"
#include <qimage.h>
#include "kvi_iconmanager.h"
#include "kvi_window.h"
|
