diff options
Diffstat (limited to 'kexi/plugins/macros/kexipart/keximacroproperty.cpp')
| -rw-r--r-- | kexi/plugins/macros/kexipart/keximacroproperty.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp index e67794be..73827383 100644 --- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp +++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp @@ -17,7 +17,7 @@ #include "keximacroproperty.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqlistbox.h> #include <tqpainter.h> @@ -86,7 +86,7 @@ void KexiMacroProperty::init() } //TESTCASE!!!!!!!!!!!!!!!!!!!!!! - //if(! variable->isEnabled()) qFatal( TQString("############## VARIABLE=%1").tqarg(variable->name()).latin1() ); + //if(! variable->isEnabled()) qFatal( TQString("############## VARIABLE=%1").arg(variable->name()).latin1() ); Q_ASSERT(! d->name.isNull()); m_property->setName( d->name.latin1() ); @@ -349,9 +349,9 @@ class EditListBoxItem : public ListBoxItem Q_ASSERT( m_widget != 0 ); //m_widget->reparent(listBox()->viewport(), 0, TQPoint(0,0)); m_widget->reparent(listBox(), 0, TQPoint(1,1)); - //tqlayout->addWidget(m_widget, 1); + //layout->addWidget(m_widget, 1); m_widget->setMinimumHeight(5); - m_widget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_widget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); } private: @@ -389,45 +389,45 @@ class ListBox : public TQListBox Q_ASSERT( m_edititem->widget() != 0 ); const TQString name = m_macroproperty->name(); - KoMacro::Variable::List tqchildren; + KoMacro::Variable::List children; { - KoMacro::Variable::List actiontqchildren; + KoMacro::Variable::List actionchildren; KSharedPtr<KoMacro::Variable> itemvar = m_macroproperty->macroItem()->variable(name,false); //kdDebug() << "KexiMacroProperty::ListBox::update() itemvar="<<(itemvar.data() ? "name:"+itemvar->name()+" value:"+itemvar->toString() : "NULL")<<endl; if(itemvar.data()) - actiontqchildren = itemvar->tqchildren(); + actionchildren = itemvar->children(); KSharedPtr<KoMacro::Action> action = m_edititem->action(); KSharedPtr<KoMacro::Variable> actionvar = action.data() ? action->variable(name) : KSharedPtr<KoMacro::Variable>(); //kdDebug() << "KexiMacroProperty::ListBox::update() actionvar="<<(actionvar.data() ? "name:"+actionvar->name()+" value:"+actionvar->toString() : "NULL")<<endl; if(actionvar.data()) - actiontqchildren += actionvar->tqchildren(); + actionchildren += actionvar->children(); - KoMacro::Variable::List::ConstIterator it(actiontqchildren.constBegin()), end(actiontqchildren.constEnd()); + KoMacro::Variable::List::ConstIterator it(actionchildren.constBegin()), end(actionchildren.constEnd()); for(; it != end; ++it) { if(name == (*it)->name()) { - KoMacro::Variable::List list = (*it)->tqchildren(); + KoMacro::Variable::List list = (*it)->children(); KoMacro::Variable::List::ConstIterator listit(list.constBegin()), listend(list.constEnd()); for(; listit != listend; ++listit) - tqchildren.append( *listit ); + children.append( *listit ); } } - if(tqchildren.count() <= 0) - tqchildren = actiontqchildren; + if(children.count() <= 0) + children = actionchildren; } /* - kdDebug() << "KexiMacroProperty::ListBox::update() name="<<name<<" childcount="<<tqchildren.count()<<endl; - KoMacro::Variable::List::ConstIterator listit(tqchildren.constBegin()), listend(tqchildren.constEnd()); + kdDebug() << "KexiMacroProperty::ListBox::update() name="<<name<<" childcount="<<children.count()<<endl; + KoMacro::Variable::List::ConstIterator listit(children.constBegin()), listend(children.constEnd()); for(; listit != listend; ++listit) { - kdDebug()<<" child name="<<(*listit)->name()<<" value="<<(*listit)->toString()<<" childcount="<<(*listit)->tqchildren().count()<<endl; + kdDebug()<<" child name="<<(*listit)->name()<<" value="<<(*listit)->toString()<<" childcount="<<(*listit)->children().count()<<endl; } */ - if(tqchildren.count() > 0) { - KoMacro::Variable::List::Iterator childit(tqchildren.begin()), childend(tqchildren.end()); + if(children.count() > 0) { + KoMacro::Variable::List::Iterator childit(children.begin()), childend(children.end()); for(; childit != childend; ++childit) { const TQString n = (*childit)->name(); //if(! n.startsWith("@")) continue; @@ -507,7 +507,7 @@ KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property, { kdDebug() << "KexiMacroPropertyWidget::KexiMacroPropertyWidget() Ctor" << endl; - TQHBoxLayout* tqlayout = new TQHBoxLayout(this, 0, 0); + TQHBoxLayout* layout = new TQHBoxLayout(this, 0, 0); d->macroproperty = dynamic_cast<KexiMacroProperty*>( property->customProperty() ); if(! d->macroproperty) { @@ -516,11 +516,11 @@ KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property, } d->combobox = new KComboBox(this); - tqlayout->addWidget(d->combobox); + layout->addWidget(d->combobox); d->listbox = new ListBox(d->combobox, d->macroproperty); d->combobox->setEditable(true); d->combobox->setListBox(d->listbox); - d->combobox->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + d->combobox->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); d->combobox->setMinimumHeight(5); d->combobox->setInsertionPolicy(TQComboBox::NoInsertion); d->combobox->setMinimumSize(10, 0); // to allow the combo to be resized to a small size |