diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-16 19:02:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-16 19:02:47 +0000 |
commit | e985f7e545f4739493965aad69bbecb136dc9346 (patch) | |
tree | 54afd409d8acd6202dd8ab611d24e78c28e4c0a0 /kommander/editor/choosewidgetimpl.cpp | |
parent | f7670c198945adc3b95ad69a959fe5f8ae55b493 (diff) | |
download | tdewebdev-e985f7e545f4739493965aad69bbecb136dc9346.tar.gz tdewebdev-e985f7e545f4739493965aad69bbecb136dc9346.zip |
TQt4 port kdewebdev
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237029 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kommander/editor/choosewidgetimpl.cpp')
-rw-r--r-- | kommander/editor/choosewidgetimpl.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kommander/editor/choosewidgetimpl.cpp b/kommander/editor/choosewidgetimpl.cpp index 527137b4..4fe816e2 100644 --- a/kommander/editor/choosewidgetimpl.cpp +++ b/kommander/editor/choosewidgetimpl.cpp @@ -55,7 +55,7 @@ void ChooseWidget::setWidget(TQWidget* w) TQPtrStack<TQWidget> p_widgets; TQPtrStack<TQListViewItem> p_items; - item = new TQListViewItem(widgetView, TQString("%1 (%2)").arg(w->name()).arg(w->className())); + item = new TQListViewItem(widgetView, TQString("%1 (%2)").tqarg(w->name()).tqarg(w->className())); item->setOpen(true); p_widgets.push(w); @@ -68,8 +68,8 @@ void ChooseWidget::setWidget(TQWidget* w) for (TQObjectListIt it(*objectList); it.current(); ++it) { TQListViewItem* newItem = item; if (isKommanderWidget(*it)) - newItem = new TQListViewItem(item, TQString("%1 (%2)").arg((*it)->name()).arg((*it)->className())); - if ((*it)->children()) { + newItem = new TQListViewItem(item, TQString("%1 (%2)").tqarg((*it)->name()).tqarg((*it)->className())); + if (!(*it)->childrenListObject().isEmpty()) { p_widgets.push((TQWidget*)(*it)); p_items.push(newItem); } @@ -88,12 +88,12 @@ TQString ChooseWidget::selection() if (widgetView->currentItem()) return widgetView->currentItem()->text(0); else - return TQString::null; + return TQString(); } void ChooseWidget::textChanged(const TQString& text) { - TQListViewItem* item = widgetView->findItem(text, 0, Qt::BeginsWith); + TQListViewItem* item = widgetView->tqfindItem(text, 0, TQt::BeginsWith); if (item) { widgetView->setCurrentItem(item); widgetView->ensureItemVisible(item); @@ -103,10 +103,10 @@ void ChooseWidget::textChanged(const TQString& text) bool ChooseWidget::isKommanderWidget(TQObject* w) { bool pExists = false; - TQMetaObject *metaObj = w->metaObject(); + TQMetaObject *metaObj = w->tqmetaObject(); if (metaObj) { - int id = metaObj->findProperty("KommanderWidget", true); + int id = metaObj->tqfindProperty("KommanderWidget", true); const TQMetaProperty *metaProp = metaObj->property(id, true); if (metaProp && metaProp->isValid()) pExists = true; |