From 2d6954f69caf63ed5057bd8e1405a65d7d970292 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:05:41 -0600 Subject: Rename obsolete tq methods to standard names --- kexi/formeditor/factories/containerfactory.cpp | 6 +++--- kexi/formeditor/factories/stdwidgetfactory.cpp | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'kexi/formeditor/factories') diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp index e41e5613..e87c300e 100644 --- a/kexi/formeditor/factories/containerfactory.cpp +++ b/kexi/formeditor/factories/containerfactory.cpp @@ -150,7 +150,7 @@ void KFDTabWidget::dropEvent( TQDropEvent *e ) emit handleDropEvent(e); } -/// Various tqlayout widgets /////////////////: +/// Various layout widgets /////////////////: HBox::HBox(TQWidget *parent, const char *name) : TQFrame(parent, name), m_preview(false) @@ -220,8 +220,8 @@ VFlow::paintEvent(TQPaintEvent *) TQSize VFlow::sizeHint() const { - if(tqlayout()) - return tqlayout()->sizeHint(); + if(layout()) + return layout()->sizeHint(); else return TQSize(700, 50); // default } diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index 2607fcca..e6b13f0e 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -511,7 +511,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes else if(classname == "KPushButton") { KPushButton *push = static_cast(w); - TQRect r = w->tqstyle().subRect(TQStyle::SR_PushButtonContents, w); + TQRect r = w->style().subRect(TQStyle::SR_PushButtonContents, w); TQRect editorRect = TQRect(push->x() + r.x(), push->y() + r.y(), r.width(), r.height()); //r.setX(r.x() + 5); //r.setY(r.y() + 5); @@ -523,7 +523,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes else if(classname == TQRADIOBUTTON_OBJECT_NAME_STRING) { TQRadioButton *radio = static_cast(w); - TQRect r = w->tqstyle().subRect(TQStyle::SR_RadioButtonContents, w); + TQRect r = w->style().subRect(TQStyle::SR_RadioButtonContents, w); TQRect editorRect = TQRect(radio->x() + r.x(), radio->y() + r.y(), r.width(), r.height()); createEditor(classname, radio->text(), radio, container, editorRect, TQt::AlignAuto); return true; @@ -533,7 +533,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes TQCheckBox *check = static_cast(w); //TQRect r(check->geometry()); //r.setX(r.x() + 20); - TQRect r = w->tqstyle().subRect(TQStyle::SR_CheckBoxContents, w); + TQRect r = w->style().subRect(TQStyle::SR_CheckBoxContents, w); TQRect editorRect = TQRect(check->x() + r.x(), check->y() + r.y(), r.width(), r.height()); createEditor(classname, check->text(), check, container, editorRect, TQt::AlignAuto); return true; @@ -645,19 +645,19 @@ StdWidgetFactory::resizeEditor(TQWidget *editor, TQWidget *widget, const TQCStri if(classname == TQRADIOBUTTON_OBJECT_NAME_STRING) { - r = widget->tqstyle().subRect(TQStyle::SR_RadioButtonContents, widget); + r = widget->style().subRect(TQStyle::SR_RadioButtonContents, widget); p += r.topLeft(); s.setWidth(r.width()); } else if(classname == TQCHECKBOX_OBJECT_NAME_STRING) { - r = widget->tqstyle().subRect(TQStyle::SR_CheckBoxContents, widget); + r = widget->style().subRect(TQStyle::SR_CheckBoxContents, widget); p += r.topLeft(); s.setWidth(r.width()); } else if(classname == "KPushButton") { - r = widget->tqstyle().subRect(TQStyle::SR_PushButtonContents, widget); + r = widget->style().subRect(TQStyle::SR_PushButtonContents, widget); p += r.topLeft(); s = r.size(); } -- cgit v1.2.1