diff options
Diffstat (limited to 'kexi/formeditor/commands.cpp')
-rw-r--r-- | kexi/formeditor/commands.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp index 241a1291..a2cddd89 100644 --- a/kexi/formeditor/commands.cpp +++ b/kexi/formeditor/commands.cpp @@ -139,9 +139,9 @@ TQString PropertyCommand::name() const { if(m_oldvalues.count() >= 2) - return i18n("Change \"%1\" property for multiple widgets" ).tqarg(TQString(m_property)); + return i18n("Change \"%1\" property for multiple widgets" ).arg(TQString(m_property)); else - return i18n("Change \"%1\" property for widget \"%2\"" ).tqarg(TQString(m_property)).tqarg(TQString(m_oldvalues.begin().key())); + return i18n("Change \"%1\" property for widget \"%2\"" ).arg(TQString(m_property)).arg(TQString(m_oldvalues.begin().key())); } void @@ -435,7 +435,7 @@ AdjustSizeCommand::execute() { for(TQWidget *w = list.first(); w; w = list.next()) { ObjectTreeItem *item = m_form->objectTree()->lookup(w->name()); - if(item && !item->tqchildren()->isEmpty()) { // container + if(item && !item->children()->isEmpty()) { // container TQSize s; if(item->container() && item->container()->tqlayout()) s = w->sizeHint(); @@ -545,17 +545,17 @@ AdjustSizeCommand::getSizeFromChildren(ObjectTreeItem *item) { TQSize s; // get size for each container, and keep the biggest one - for(ObjectTreeItem *tree = item->tqchildren()->first(); tree; tree = item->tqchildren()->next()) + for(ObjectTreeItem *tree = item->children()->first(); tree; tree = item->children()->next()) s = s.expandedTo(getSizeFromChildren(tree)); return s; } int tmpw = 0, tmph = 0; - for(ObjectTreeItem *tree = item->tqchildren()->first(); tree; tree = item->tqchildren()->next()) { + for(ObjectTreeItem *tree = item->children()->first(); tree; tree = item->children()->next()) { if(!tree->widget()) continue; - tmpw = TQMAX(tmpw, tree->widget()->tqgeometry().right()); - tmph = TQMAX(tmph, tree->widget()->tqgeometry().bottom()); + tmpw = TQMAX(tmpw, tree->widget()->geometry().right()); + tmph = TQMAX(tmph, tree->widget()->geometry().bottom()); } return TQSize(tmpw, tmph) + TQSize(10, 10); @@ -621,9 +621,9 @@ LayoutPropertyCommand::LayoutPropertyCommand(WidgetPropertySet *buf, const TQCSt if (!titem) return; //better this than a crash Container *m_container = titem->container(); - // We save the tqgeometry of each wigdet - for(ObjectTreeItem *it = m_container->objectTree()->tqchildren()->first(); it; it = m_container->objectTree()->tqchildren()->next()) - m_geometries.insert(it->name().latin1(), it->widget()->tqgeometry()); + // We save the geometry of each wigdet + for(ObjectTreeItem *it = m_container->objectTree()->children()->first(); it; it = m_container->objectTree()->children()->next()) + m_geometries.insert(it->name().latin1(), it->widget()->geometry()); } void @@ -655,7 +655,7 @@ LayoutPropertyCommand::unexecute() TQString LayoutPropertyCommand::name() const { - return i18n("Change tqlayout of widget \"%1\"").tqarg(TQString(m_oldvalues.begin().key())); + return i18n("Change tqlayout of widget \"%1\"").arg(TQString(m_oldvalues.begin().key())); } void @@ -740,7 +740,7 @@ InsertWidgetCommand::execute() WidgetInfo *winfo = m_container->form()->library()->widgetInfoForClassName(m_class); KMessageBox::sorry(FormManager::self()->activeForm() ? FormManager::self()->activeForm()->widget() : 0, i18n("Could not insert widget of type \"%1\". A problem with widget's creation encountered.") - .tqarg(winfo ? winfo->name() : TQString())); + .arg(winfo ? winfo->name() : TQString())); kdWarning() << "InsertWidgetCommand::execute() ERROR: widget creation failed" << endl; return; } @@ -830,7 +830,7 @@ TQString InsertWidgetCommand::name() const { if(!m_name.isEmpty()) - return i18n("Insert widget \"%1\"").tqarg(TQString(m_name)); + return i18n("Insert widget \"%1\"").arg(TQString(m_name)); else return i18n("Insert widget"); } @@ -867,7 +867,7 @@ CreateLayoutCommand::CreateLayoutCommand(int layoutType, WidgetList &list, Form m_list->sort(); // we sort them now, before creating the tqlayout for(TQWidget *w = m_list->first(); w; w = m_list->next()) - m_pos.insert(w->name(), w->tqgeometry()); + m_pos.insert(w->name(), w->geometry()); ObjectTreeItem *item = form->objectTree()->lookup(m_list->first()->name()); if(item && item->parent()->container()) m_containername = item->parent()->name(); @@ -912,7 +912,7 @@ CreateLayoutCommand::execute() container->setSelectedWidget(0, false); w->move(m_pos.begin().data().topLeft()); // we move the tqlayout at the position of the topleft widget - // sizeHint of these widgets depends on tqgeometry, so give them appropriate tqgeometry + // sizeHint of these widgets depends on geometry, so give them appropriate geometry if(m_type == Container::HFlow) w->resize( TQSize(700, 20) ); else if(m_type == Container::VFlow) @@ -1019,7 +1019,7 @@ BreakLayoutCommand::BreakLayoutCommand(Container *container) m_form = container->form(); m_type = container->layoutType(); - for(ObjectTreeItem *tree = container->objectTree()->tqchildren()->first(); tree; tree = container->objectTree()->tqchildren()->next()) + for(ObjectTreeItem *tree = container->objectTree()->children()->first(); tree; tree = container->objectTree()->children()->next()) { TQRect r(container->widget()->mapTo(container->widget()->parentWidget(), tree->widget()->pos()), tree->widget()->size()); m_pos.insert(tree->widget()->name(), r); @@ -1041,7 +1041,7 @@ BreakLayoutCommand::unexecute() TQString BreakLayoutCommand::name() const { - return i18n("Break Layout: \"%1\"").tqarg(m_name); + return i18n("Break Layout: \"%1\"").arg(m_name); } void @@ -1208,7 +1208,7 @@ PasteWidgetCommand::changePos(TQDomElement &el, const TQPoint &newpos) { //TQDomElement el = widg.cloneNode(true).toElement(); TQDomElement rect; - // Find the widget tqgeometry if there is one + // Find the widget geometry if there is one for(TQDomNode n = el.firstChild(); !n.isNull(); n = n.nextSibling()) { if((n.toElement().tagName() == "property") && (n.toElement().attribute("name") == "geometry")) @@ -1253,7 +1253,7 @@ PasteWidgetCommand::fixPos(TQDomElement &el, Container *container) if(!w) return; - while((w->tqgeometry() == r) && (w != 0))// there is already a widget there, with the same size + while((w->geometry() == r) && (w != 0))// there is already a widget there, with the same size { w = m_form->widget()->childAt(w->x() + 16, w->y() + 16, false); r.moveBy(10,10); @@ -1302,7 +1302,7 @@ PasteWidgetCommand::moveWidgetBy(TQDomElement &el, Container *container, const T TQWidget *w = m_form->widget()->childAt(r.x() + 6, r.y() + 6, false); - while(w && (w->tqgeometry() == r))// there is already a widget there, with the same size + while(w && (w->geometry() == r))// there is already a widget there, with the same size { w = m_form->widget()->childAt(w->x() + 16, w->y() + 16, false); r.moveBy(10,10); |