Rename obsolete tq methods to standard names

1 files changed, 18 insertions, 18 deletions

diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp
index 3a8e84532..9437facae 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.cpp
+++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp
@@ -57,7 +57,7 @@ class KexiDBAutoField::Private
 		                       //!< of widgetTypeForFieldType() if widgetTypeForFieldType is Auto
 		WidgetType  widgetType_property; //!< provides widget type or Auto
 		LabelPosition  lblPosition;
-		TQBoxLayout  *tqlayout;
+		TQBoxLayout  *layout;
 		TQLabel  *label;
 		TQString  caption;
 		KexiDB::Field::Type fieldTypeInternal;
@@ -104,7 +104,7 @@ void
 KexiDBAutoField::init(const TQString &text, WidgetType type, LabelPosition pos)
 {
 	d->fieldTypeInternal = KexiDB::Field::InvalidType;
-	d->tqlayout = 0;
+	d->layout = 0;
 	m_subwidget = 0;
 	d->label = new TQLabel(text, this);
 	d->label->installEventFilter( this );
@@ -116,8 +116,8 @@ KexiDBAutoField::init(const TQString &text, WidgetType type, LabelPosition pos)
 	d->widgetType_property = (type==Auto ? Text : type); //to force "differ" to be true in setWidgetType()
 	setLabelPosition(pos);
 	setWidgetType(type);
-	d->baseColor = tqpalette().active().base();
-	d->textColor = tqpalette().active().text();
+	d->baseColor = palette().active().base();
+	d->textColor = palette().active().text();
 }
 
 void
@@ -222,25 +222,25 @@ void
 KexiDBAutoField::setLabelPosition(LabelPosition position)
 {
 	d->lblPosition = position;
-	if(d->tqlayout) {
-		TQBoxLayout *lyr = d->tqlayout;
-		d->tqlayout = 0;
+	if(d->layout) {
+		TQBoxLayout *lyr = d->layout;
+		d->layout = 0;
 		delete lyr;
 	}
 
 	if(m_subwidget)
 		m_subwidget->show();
-	//! \todo support right-to-left tqlayout where positions are inverted
+	//! \todo support right-to-left layout where positions are inverted
 	if (position==Top || position==Left) {
 		int align = d->label->alignment();
 		if(position == Top) {
-			d->tqlayout = (TQBoxLayout*) new TQVBoxLayout(this);
+			d->layout = (TQBoxLayout*) new TQVBoxLayout(this);
 			align |= AlignVertical_Mask;
 			align ^= AlignVertical_Mask;
 			align |= AlignTop;
 		}
 		else {
-			d->tqlayout = (TQBoxLayout*) new TQHBoxLayout(this);
+			d->layout = (TQBoxLayout*) new TQHBoxLayout(this);
 			align |= AlignVertical_Mask;
 			align ^= AlignVertical_Mask;
 			align |= AlignVCenter;
@@ -254,14 +254,14 @@ KexiDBAutoField::setLabelPosition(LabelPosition position)
 		else {
 			d->label->show();
 		}
-		d->tqlayout->addWidget(d->label, 0, position == Top ? int(TQt::AlignLeft) : 0);
+		d->layout->addWidget(d->label, 0, position == Top ? int(TQt::AlignLeft) : 0);
 		if(position == Left && d->widgetType != Boolean)
-			d->tqlayout->addSpacing(KexiDBAutoField_SPACING);
-		d->tqlayout->addWidget(m_subwidget, 1);
+			d->layout->addSpacing(KexiDBAutoField_SPACING);
+		d->layout->addWidget(m_subwidget, 1);
 		KexiSubwidgetInterface *subwidgetInterface = dynamic_cast<KexiSubwidgetInterface*>((TQWidget*)m_subwidget);
 		if (subwidgetInterface) {
 			if (subwidgetInterface->appendStretchRequired(this))
-				d->tqlayout->addStretch(0);
+				d->layout->addStretch(0);
 			if (subwidgetInterface->subwidgetStretchRequired(this)) {
 				TQSizePolicy sizePolicy( m_subwidget->sizePolicy() );
 				if(position == Left) {
@@ -279,11 +279,11 @@ KexiDBAutoField::setLabelPosition(LabelPosition position)
 	//		m_subwidget->setSizePolicy(...);
 	}
 	else {
-		d->tqlayout = (TQBoxLayout*) new TQHBoxLayout(this);
+		d->layout = (TQBoxLayout*) new TQHBoxLayout(this);
 		d->label->hide();
-		d->tqlayout->addWidget(m_subwidget);
+		d->layout->addWidget(m_subwidget);
 	}
-	//a hack to force tqlayout to be refreshed (any better idea for this?)
+	//a hack to force layout to be refreshed (any better idea for this?)
 	resize(size()+TQSize(1,0));
 	resize(size()-TQSize(1,0));
 	if (dynamic_cast<KexiDBAutoField*>((TQWidget*)m_subwidget)) {
@@ -584,7 +584,7 @@ KexiDBAutoField::changeText(const TQString &text, bool beautify)
 				realText = text[0].upper() + text.mid(1);
 				if (d->widgetType!=Boolean) {
 //! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label
-//! @todo support right-to-left tqlayout where position of ":" is inverted
+//! @todo support right-to-left layout where position of ":" is inverted
 					realText += ": ";
 				}
 			}