Rename obsolete tq methods to standard names

31 files changed, 109 insertions, 109 deletions

diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp
index a20dbe21..bec4de7d 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog.cpp
+++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp
@@ -581,7 +581,7 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
 			i18n("&Select action to be executed after clicking \"%1\" button:")); // msg for a label
 		if (simpleItem->data == "kaction") {
 			if (!d->kactionPageWidget) {
-				//create lbl+list view with a vtqlayout
+				//create lbl+list view with a vlayout
 				d->kactionPageWidget = new TQWidget();
 				d->kactionPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 				TQVBoxLayout *vlyr = new TQVBoxLayout(d->kactionPageWidget, 0, KDialog::spacingHint());
@@ -605,7 +605,7 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
 		}
 		else if (simpleItem->data == "currentForm") {
 			if (!d->currentFormActionsPageWidget) {
-				//create lbl+list view with a vtqlayout
+				//create lbl+list view with a vlayout
 				d->currentFormActionsPageWidget = new TQWidget();
 				d->currentFormActionsPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 				TQVBoxLayout *vlyr = new TQVBoxLayout(d->currentFormActionsPageWidget, 0, KDialog::spacingHint());
diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp
index d87b31c5..c46b04de 100644
--- a/kexi/plugins/forms/kexidbfactory.cpp
+++ b/kexi/plugins/forms/kexidbfactory.cpp
@@ -535,7 +535,7 @@ KexiDBFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDesign
 	else if (classname == "KexiDBCheckBox") {
 		KexiDBCheckBox *cb = static_cast<KexiDBCheckBox*>(w);
 		TQRect r( cb->geometry() );
-		r.setLeft( r.left() + 2 + cb->tqstyle().subRect( TQStyle::SR_CheckBoxIndicator, cb ).width() );
+		r.setLeft( r.left() + 2 + cb->style().subRect( TQStyle::SR_CheckBoxIndicator, cb ).width() );
 		createEditor(classname, cb->text(), cb, container, r, TQt::AlignAuto);
 		return true;
 	}
diff --git a/kexi/plugins/forms/kexidbtextwidgetinterface.cpp b/kexi/plugins/forms/kexidbtextwidgetinterface.cpp
index 68dea85f..e8da5ad5 100644
--- a/kexi/plugins/forms/kexidbtextwidgetinterface.cpp
+++ b/kexi/plugins/forms/kexidbtextwidgetinterface.cpp
@@ -53,7 +53,7 @@ void KexiDBTextWidgetInterface::paint( TQFrame *w, TQPainter* p, bool textIsEmpt
 			if (w->hasFocus()) {
 				p->setPen(
 					KexiUtils::blendedColors(
-						m_autonumberDisplayParameters->textColor, w->tqpalette().active().base(), 1, 3));
+						m_autonumberDisplayParameters->textColor, w->palette().active().base(), 1, 3));
 			}
 			KexiDisplayUtils::paintAutonumberSign(*m_autonumberDisplayParameters, p,
 				2 + margin + w->margin(), margin, w->width() - margin*2 -2-2, 
diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp
index 36a64db7..c6d689f7 100644
--- a/kexi/plugins/forms/kexiformview.cpp
+++ b/kexi/plugins/forms/kexiformview.cpp
@@ -90,7 +90,7 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *parent,
 
 	if (viewMode()==Kexi::DataViewMode) {
 		m_scrollView->recordNavigator()->setRecordHandler( m_scrollView );
-		m_scrollView->viewport()->setPaletteBackgroundColor(m_dbform->tqpalette().active().background());
+		m_scrollView->viewport()->setPaletteBackgroundColor(m_dbform->palette().active().background());
 //moved to formmanager		connect(formPart()->manager(), TQT_SIGNAL(noFormSelected()), TQT_SLOT(slotNoFormSelected()));
 	}
 	else
@@ -860,7 +860,7 @@ KexiFormView::slotWidgetSelected(KFormDesigner::Form *f, bool multiple)
 	setAvailable("formpart_format_raise", true);
 	setAvailable("formpart_format_lower", true);
 
-	// If the widgets selected is a container, we enable tqlayout actions
+	// If the widgets selected is a container, we enable layout actions
 	if(!multiple)
 	{
 		KFormDesigner::ObjectTreeItem *item = f->objectTree()->lookup( f->selectedWidgets()->first()->name() );
diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp
index 3a8e8453..9437faca 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 += ": ";
 				}
 			}
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index db56b550..5d2a24fd 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -124,7 +124,7 @@ bool KexiDBComboBox::isEditable() const
 void KexiDBComboBox::paintEvent( TQPaintEvent * )
 {
 	TQPainter p( this );
-	TQColorGroup cg( tqpalette().active() );
+	TQColorGroup cg( palette().active() );
 //	if ( hasFocus() )
 //		cg.setColor(TQColorGroup::Base, cg.highlight());
 //	else
@@ -144,9 +144,9 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
 		return;
 	}
 
-//! @todo support reverse tqlayout
+//! @todo support reverse layout
 //bool reverse = TQApplication::reverseLayout();
-	tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg,
+	style().drawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg,
 		flags, (uint)TQStyle::SC_All, 
 		(d->buttonPressed ? TQStyle::SC_ComboBoxArrow : TQStyle::SC_None )
 	);
@@ -157,11 +157,11 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
 	else { //not editable: we need to paint the current item
 		TQRect editorGeometry( this->editorGeometry() );
 		if ( hasFocus() ) {
-			if (0==qstrcmp(tqstyle().name(), "windows")) //a hack
+			if (0==qstrcmp(style().name(), "windows")) //a hack
 				p.fillRect( editorGeometry, cg.brush( TQColorGroup::Highlight ) );
-			TQRect r( TQStyle::visualRect( tqstyle().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) );
+			TQRect r( TQStyle::visualRect( style().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) );
 			r = TQRect(r.left()-1, r.top()-1, r.width()+2, r.height()+2); //enlare by 1 pixel each side to avoid covering by the subwidget
-			tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, 
+			style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, 
 				r, cg, flags | TQStyle::Style_FocusAtBorder, TQStyleOption(cg.highlight()));
 		}
 		//todo
@@ -171,7 +171,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
 TQRect KexiDBComboBox::editorGeometry() const
 {
 	TQRect r( TQStyle::visualRect(
-		tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, d->paintedCombo,
+		style().querySubControlMetrics(TQStyle::CC_ComboBox, d->paintedCombo,
 		TQStyle::SC_ComboBoxEditField), d->paintedCombo ) );
 	
 	//if ((height()-r.bottom())<6)
@@ -232,7 +232,7 @@ void KexiDBComboBox::setLabelPosition(LabelPosition position)
 TQRect KexiDBComboBox::buttonGeometry() const
 {
 	TQRect arrowRect( 
-		tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, d->paintedCombo, TQStyle::SC_ComboBoxArrow) );
+		style().querySubControlMetrics( TQStyle::CC_ComboBox, d->paintedCombo, TQStyle::SC_ComboBoxArrow) );
 	arrowRect = TQStyle::visualRect(arrowRect, d->paintedCombo);
 	arrowRect.setHeight( TQMAX(  height() - (2 * arrowRect.y()), arrowRect.height() ) ); // a fix for Motif style
 	return arrowRect;
@@ -509,7 +509,7 @@ TQSize KexiDBComboBox::sizeHint() const
 
 	const int maxWidth = 7 * fontMetrics().width(TQChar('x')) + 18;
 	const int maxHeight = TQMAX( fontMetrics().lineSpacing(), 14 ) + 2;
-	d->sizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo,
+	d->sizeHint = (style().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo,
 		TQSize(maxWidth, maxHeight)).expandedTo(TQApplication::globalStrut()));
 
 	return d->sizeHint;
diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
index 3058f02c..daff9ef9 100644
--- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
@@ -64,9 +64,9 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char
 	m_datePickerPopupMenu->insertItem(m_datePicker);
 	btn->setPopup(m_datePickerPopupMenu);
 
-	TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
-	tqlayout->addWidget(m_edit, 1);
-	tqlayout->addWidget(btn, 0);
+	TQHBoxLayout* layout = new TQHBoxLayout(this);
+	layout->addWidget(m_edit, 1);
+	layout->addWidget(btn, 0);
 
 	setFocusProxy(m_edit);
 }
diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
index 629a4bca..627e1172 100644
--- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
@@ -71,11 +71,11 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par
 	m_datePickerPopupMenu->insertItem(m_datePicker);
 	btn->setPopup(m_datePickerPopupMenu);
 
-	TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
-	tqlayout->addWidget(m_dateEdit, 0);
-	tqlayout->addWidget(btn, 0);
-	tqlayout->addWidget(m_timeEdit, 0);
-	//tqlayout->addStretch(1);
+	TQHBoxLayout* layout = new TQHBoxLayout(this);
+	layout->addWidget(m_dateEdit, 0);
+	layout->addWidget(btn, 0);
+	layout->addWidget(m_timeEdit, 0);
+	//layout->addStretch(1);
 
 	setFocusProxy(m_dateEdit);
 }
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index 5b8b2939..dd52f9f5 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -401,14 +401,14 @@ void KexiDBImageBox::handleCutAction()
 
 void KexiDBImageBox::handleCopyAction()
 {
-	tqApp->tqclipboard()->setPixmap(pixmap(), TQClipboard::Clipboard);
+	tqApp->clipboard()->setPixmap(pixmap(), TQClipboard::Clipboard);
 }
 
 void KexiDBImageBox::handlePasteAction()
 {
 	if (isReadOnly() || (!m_designMode && !hasFocus()))
 		return;
-	TQPixmap pm( tqApp->tqclipboard()->pixmap(TQClipboard::Clipboard) );
+	TQPixmap pm( tqApp->clipboard()->pixmap(TQClipboard::Clipboard) );
 //	if (!pm.isNull())
 //		setValueInternal(pm, true);
 	if (dataSource().isEmpty()) {
@@ -610,7 +610,7 @@ void KexiDBImageBox::setDataSource( const TQString &ds )
 	}
 	if (!m_paletteBackgroundColorChanged && parentWidget()) {
 		KexiFrame::setPaletteBackgroundColor( 
-			dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : tqpalette().active().base() );
+			dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : palette().active().base() );
 	}
 }
 
@@ -685,9 +685,9 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
 
 	// if the widget is focused, draw focus indicator rect _if_ there is no chooser button
 	if (!m_designMode && !dataSource().isEmpty() && hasFocus() && (!m_chooser || !m_chooser->isVisible())) {
-		tqstyle().tqdrawPrimitive(
-			TQStyle::PE_FocusRect, &p, tqstyle().subRect(TQStyle::SR_PushButtonContents, this), 
-			tqpalette().active() );
+		style().tqdrawPrimitive(
+			TQStyle::PE_FocusRect, &p, style().subRect(TQStyle::SR_PushButtonContents, this), 
+			palette().active() );
 	}
 }
 
diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp
index adb833fa..93f35027 100644
--- a/kexi/plugins/forms/widgets/kexidblabel.cpp
+++ b/kexi/plugins/forms/widgets/kexidblabel.cpp
@@ -424,7 +424,7 @@ void KexiDBLabel::init()
 	m_hasFocusableWidget = false;
 	d->internalLabel = new KexiDBInternalLabel( this );
 	d->internalLabel->hide();
-	d->frameColor = tqpalette().active().foreground();
+	d->frameColor = palette().active().foreground();
 
 	setAlignment( d->internalLabel->alignment() );
 }
diff --git a/kexi/plugins/forms/widgets/kexiframe.cpp b/kexi/plugins/forms/widgets/kexiframe.cpp
index 09266ae4..b64d6edf 100644
--- a/kexi/plugins/forms/widgets/kexiframe.cpp
+++ b/kexi/plugins/forms/widgets/kexiframe.cpp
@@ -48,7 +48,7 @@ KexiFrame::KexiFrame( TQWidget * parent, const char * name, WFlags f )
 	, d( new Private() )
 {
 	//defaults
-	d->frameColor = tqpalette().active().foreground();
+	d->frameColor = palette().active().foreground();
 //! @todo obtain these defaults from current template's style...
 	setLineWidth(2);
 	setFrameStyle(TQFrame::StyledPanel|TQFrame::Raised);
diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp
index f3347676..37e30e04 100644
--- a/kexi/plugins/importexport/csv/kexicsvexport.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp
@@ -252,7 +252,7 @@ bool KexiCSVExport::exportData(KexiDB::TableOrQuerySchema& tableOrQuery,
 	}
 
 	if (copyToClipboard)
-		kapp->tqclipboard()->setText(buffer, TQClipboard::Clipboard);
+		kapp->clipboard()->setText(buffer, TQClipboard::Clipboard);
 
 	delete [] isText;
 	delete [] isDateTime;
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
index 94642d38..4a11d1d7 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
@@ -346,14 +346,14 @@ void KexiCSVExportWizard::slotShowOptionsButtonClicked()
 	}
 }
 
-void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * tqlayout )
+void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * layout )
 {
-	TQWizard::layOutButtonRow( tqlayout );
+	TQWizard::layOutButtonRow( layout );
 
-	//find the last subtqlayout
+	//find the last sublayout
 	TQLayout *l = 0;
-	for (TQLayoutIterator lit( tqlayout->iterator() ); lit.current(); ++lit)
-		l = lit.current()->tqlayout();
+	for (TQLayoutIterator lit( layout->iterator() ); lit.current(); ++lit)
+		l = lit.current()->layout();
 	if (dynamic_cast<TQBoxLayout*>(l)) {
 		if (!m_defaultsBtn) {
 			m_defaultsBtn = new KPushButton(i18n("Defaults"), this);
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.h b/kexi/plugins/importexport/csv/kexicsvexportwizard.h
index 27213159..7ef7020d 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.h
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.h
@@ -62,7 +62,7 @@ class KexiCSVExportWizard : public KWizard
 
 	protected:
 		//! reimplemented to add "Defaults" button on the left hand
-		virtual void layOutButtonRow( TQHBoxLayout * tqlayout );
+		virtual void layOutButtonRow( TQHBoxLayout * layout );
 
 		//! \return default delimiter depending on mode.
 		TQString defaultDelimiter() const;
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 69942a79..0e5f6e4c 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -280,7 +280,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 if ( m_mode == Clipboard )
   {
 	setCaption( i18n( "Inserting From Clipboard" ) );
-	TQMimeSource * mime = TQApplication::tqclipboard()->data();
+	TQMimeSource * mime = TQApplication::clipboard()->data();
 	if ( !mime )
 	{
 	  KMessageBox::information( this, i18n("There is no data in the clipboard.") );
@@ -336,11 +336,11 @@ if ( m_mode == Clipboard )
 	}
 	else if (m_mode == Clipboard) {
 		TQCString subtype("plain");
-		m_clipboardData = TQApplication::tqclipboard()->text(subtype, TQClipboard::Clipboard);
+		m_clipboardData = TQApplication::clipboard()->text(subtype, TQClipboard::Clipboard);
 /* debug
-		for (int i=0;TQApplication::tqclipboard()->data(TQClipboard::Clipboard)->format(i);i++)
+		for (int i=0;TQApplication::clipboard()->data(TQClipboard::Clipboard)->format(i);i++)
 			kdDebug() << i << ": " 
-				<< TQApplication::tqclipboard()->data(TQClipboard::Clipboard)->format(i) << endl;
+				<< TQApplication::clipboard()->data(TQClipboard::Clipboard)->format(i) << endl;
 */
 	}
 	else {
@@ -705,9 +705,9 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i
 		if (x == '\r') {
 			continue; // eat '\r', to handle RFC-compliant files
 		}
-		if (offset==0 && x.tqunicode()==0xfeff) {
+		if (offset==0 && x.unicode()==0xfeff) {
 			// Ignore BOM, the "Byte Order Mark" 
-			// (http://en.wikipedia.org/wiki/Byte_Order_Mark, // http://www.tqunicode.org/charts/PDF/UFFF0.pdf)
+			// (http://en.wikipedia.org/wiki/Byte_Order_Mark, // http://www.unicode.org/charts/PDF/UFFF0.pdf)
 			// Probably fixed in TQt4.
 			continue;
 		}
diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.h b/kexi/plugins/importexport/csv/kexicsvwidgets.h
index 3c420c7a..76f76d31 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.h
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.h
@@ -46,7 +46,7 @@ class KexiCSVInfoLabel : public TQWidget
 		 setFileName() can be used to display filename and setCommentAfterFileName() to display 
 		 additional comment.
 
-		 The widget's tqlayout can look like this:
+		 The widget's layout can look like this:
 
 		 \pre [icon] [labeltext] [filename] [comment]
 		*/
diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
index 2f6ee825..5406e8ca 100644
--- a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
@@ -158,9 +158,9 @@ KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *pare
 	) );
 
 	// Create the tableview.
-	TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
+	TQHBoxLayout* layout = new TQHBoxLayout(this);
 	d->datatable = new KexiDataTable(mainWin(), this, "Macro KexiDataTable", false /*not db aware*/);
-	tqlayout->addWidget(d->datatable);
+	layout->addWidget(d->datatable);
 	d->tableview = d->datatable->tableView();
 	d->tableview->setSpreadSheetMode();
 	d->tableview->setColumnStretchEnabled( true, COLUMN_ID_COMMENT ); //last column occupies the rest of the area
diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
index 26bd964d..05d7ba72 100644
--- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
+++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -35,7 +35,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -154,7 +154,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
index e3599b22..489640a2 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
@@ -349,7 +349,7 @@ 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->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 		}
@@ -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,7 +516,7 @@ 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);
diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.cpp b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
index d7f3801e..540dcc39 100644
--- a/kexi/plugins/macros/kexipart/keximacrotextview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
@@ -45,11 +45,11 @@ KexiMacroTextView::KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *parent,
 	: KexiMacroView(mainwin, parent, macro, "KexiMacroTextView")
 	, d( new Private() )
 {
-	TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
+	TQHBoxLayout* layout = new TQHBoxLayout(this);
 	d->editor = new KTextEdit(this);
 	d->editor->setTextFormat(TQt::PlainText);
 	d->editor->setWordWrap(TQTextEdit::NoWrap);
-	tqlayout->addWidget(d->editor);
+	layout->addWidget(d->editor);
 
 	connect(d->editor, TQT_SIGNAL(textChanged()), this, TQT_SLOT(editorChanged()));
 }
diff --git a/kexi/plugins/queries/kexiaddparamwidget.ui b/kexi/plugins/queries/kexiaddparamwidget.ui
index 080f8d08..01a3ee3c 100644
--- a/kexi/plugins/queries/kexiaddparamwidget.ui
+++ b/kexi/plugins/queries/kexiaddparamwidget.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -37,7 +37,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -82,7 +82,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -105,7 +105,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kexi/plugins/queries/kexiparameterlisteditor.ui b/kexi/plugins/queries/kexiparameterlisteditor.ui
index e7526413..26b7d0f2 100644
--- a/kexi/plugins/queries/kexiparameterlisteditor.ui
+++ b/kexi/plugins/queries/kexiparameterlisteditor.ui
@@ -53,7 +53,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
index cfd38e3a..1b4a3301 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
@@ -1074,7 +1074,7 @@ bool KexiQueryDesignerGuiEditor::loadLayout()
 //		return false;
 //	}
 	if (xml.isEmpty()) {
-		//in a case when query tqlayout was not saved, build tqlayout by hand
+		//in a case when query layout was not saved, build layout by hand
 		// -- dynamic cast because of a need for handling invalid queries
 		//    (as in KexiQueryDesignerGuiEditor::afterSwitchFrom()):
 		KexiDB::QuerySchema * q =	dynamic_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData());
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.h b/kexi/plugins/queries/kexiquerydesignerguieditor.h
index 1102b1d9..f85125c6 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.h
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.h
@@ -134,10 +134,10 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase
 		void slotAboutConnectionRemove(KexiRelationViewConnection*);
 		void slotTableFieldDoubleClicked( KexiDB::TableSchema* table, const TQString& fieldName );
 
-		/*! Loads tqlayout of relation GUI diagram. */
+		/*! Loads layout of relation GUI diagram. */
 		bool loadLayout();
 
-		/*! Stores tqlayout of relation GUI diagram. */
+		/*! Stores layout of relation GUI diagram. */
 		bool storeLayout();
 
 		void showTablesForQuery(KexiDB::QuerySchema *query);
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index 43353b84..5de13fe2 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -124,14 +124,14 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi
 	d->pixmapStatus->setFixedWidth(d->statusPixmapOk.width()*3/2);
 	d->pixmapStatus->setAlignment(AlignHCenter | AlignTop);
 	d->pixmapStatus->setMargin(d->statusPixmapOk.width()/4);
-	d->pixmapStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) );
+	d->pixmapStatus->setPaletteBackgroundColor( palette().active().color(TQColorGroup::Base) );
 
 	d->lblStatus = new TQLabel(d->status_hbox);
 	d->lblStatus->setAlignment(AlignLeft | AlignTop | WordBreak);
 	d->lblStatus->setMargin(d->statusPixmapOk.width()/4);
 	d->lblStatus->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
 	d->lblStatus->resize(d->lblStatus->width(),d->statusPixmapOk.width()*3);
-	d->lblStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) );
+	d->lblStatus->setPaletteBackgroundColor( palette().active().color(TQColorGroup::Base) );
 
 	TQHBoxLayout *b = new TQHBoxLayout(this);
 	b->addWidget(d->splitter);
@@ -449,7 +449,7 @@ KexiQueryDesignerSQLView::storeNewData(const KexiDB::SchemaData& sdata, bool &ca
 {
 	Q_UNUSED( cancel );
 
-	//here: we won't store query tqlayout: it will be recreated 'by hand' in GUI Query Editor
+	//here: we won't store query layout: it will be recreated 'by hand' in GUI Query Editor
 	bool queryOK = slotCheckQuery();
 	bool ok = true;
 	KexiDB::SchemaData* query = 0;
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
index e53e876c..4fea781e 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
@@ -180,7 +180,7 @@ KexiQueryDesignerSQLHistory::slotToClipboard()
 	if(!m_selected)
 		return;
 
-	TQApplication::tqclipboard()->setText(m_selected->statement(), TQClipboard::Clipboard);
+	TQApplication::clipboard()->setText(m_selected->statement(), TQClipboard::Clipboard);
 }
 
 void
diff --git a/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp b/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp
index 74723bc3..00b5a21d 100644
--- a/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp
+++ b/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp
@@ -139,7 +139,7 @@ KexiDBConnectionData* KexiDBDriverManager::createConnectionDataByFile(const TQSt
             data->password = config.readEntry("encryptedPassword");
             uint len = data->password.length();
             for (uint i=0; i<len; i++)
-                data->password[i] = TQChar( data->password[i].tqunicode() - 47 - i );
+                data->password[i] = TQChar( data->password[i].unicode() - 47 - i );
         }
         if(data->password.isEmpty())
             data->password = config.readEntry("password");
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
index ed3b99e2..d44c59b9 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
@@ -73,8 +73,8 @@ KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *pa
 
     TQSplitter* splitter = new TQSplitter(this);
     splitter->setOrientation(Qt::Vertical);
-    TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
-    tqlayout->addWidget(splitter);
+    TQHBoxLayout* layout = new TQHBoxLayout(this);
+    layout->addWidget(splitter);
 
     d->editor = new KexiScriptEditor(mainWin, splitter, "ScriptEditor");
     splitter->setFocusProxy(d->editor);
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
index 6f75bdea..f244ae39 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
@@ -93,10 +93,10 @@ def runGuiApp(copycenter, name):
 			qt.QDialog.__init__(self, parent, "ProgressDialog", 1)
 			self.parent = parent
 			self.setCaption(caption)
-			tqlayout = qt.QVBoxLayout(self)
+			layout = qt.QVBoxLayout(self)
 			box = qt.QVBox(self)
 			box.setMargin(2)
-			tqlayout.addWidget(box)
+			layout.addWidget(box)
 			self.listview = qt.QListView(box)
 			self.listview.setAllColumnsShowFocus(True)
 			self.listview.header().setStretchEnabled(True,0)
@@ -216,7 +216,7 @@ def runGuiApp(copycenter, name):
 			print "CopyJobWidget.writeOptions"
 			writer.write("<%s plugin=\"%s\">\n" % (plugininst.plugintype, pluginname))
 			for optionname in plugininst.options:
-				value = self.escape( tqunicode(plugininst.options[optionname]).encode("utf-8") )
+				value = self.escape( unicode(plugininst.options[optionname]).encode("utf-8") )
 				writer.write("\t<%s value=\"%s\" />\n" % (optionname,value))
 			writer.write("</%s>\n" % plugininst.plugintype)
 
@@ -309,31 +309,31 @@ def runGuiApp(copycenter, name):
 			self.starttime = None
 			qt.QDialog.__init__(self, dialog, "ProgressDialog", 1)
 			self.setCaption("Copying...")
-			tqlayout = qt.QVBoxLayout(self)
+			layout = qt.QVBoxLayout(self)
 			box = qt.QVBox(self)
 			box.setSpacing(6)
 			box.setMargin(6)
-			tqlayout.addWidget(box)
+			layout.addWidget(box)
 			self.textbrowser = qt.QTextBrowser(box)
 			self.textbrowser.setWordWrap(qt.QTextEdit.WidgetWidth)
 			self.textbrowser.setTextFormat(qt.Qt.RichText)
 			statusbox = qt.QFrame(box)
-			tqlayout = qt.QGridLayout(statusbox,4,2,0,2)
-			tqlayout.addWidget(qt.QLabel("Number of records done:",statusbox),0,0)
+			layout = qt.QGridLayout(statusbox,4,2,0,2)
+			layout.addWidget(qt.QLabel("Number of records done:",statusbox),0,0)
 			self.donecounter = 0
 			self.donelabel = qt.QLabel("-",statusbox)
-			tqlayout.addWidget(self.donelabel,0,1)
-			tqlayout.addWidget(qt.QLabel("Successfully copied records:",statusbox),1,0)
+			layout.addWidget(self.donelabel,0,1)
+			layout.addWidget(qt.QLabel("Successfully copied records:",statusbox),1,0)
 			self.successcounter = 0
 			self.successlabel = qt.QLabel("-",statusbox)
-			tqlayout.addWidget(self.successlabel,1,1)
-			tqlayout.addWidget(qt.QLabel("Failed to copy records:",statusbox),2,0)
+			layout.addWidget(self.successlabel,1,1)
+			layout.addWidget(qt.QLabel("Failed to copy records:",statusbox),2,0)
 			self.failedcounter = 0
 			self.failedlabel = qt.QLabel("-",statusbox)
-			tqlayout.addWidget(self.failedlabel,2,1)
-			tqlayout.addWidget(qt.QLabel("Elapsed time in seconds:",statusbox),3,0)
+			layout.addWidget(self.failedlabel,2,1)
+			layout.addWidget(qt.QLabel("Elapsed time in seconds:",statusbox),3,0)
 			self.elapsedlabel = qt.QLabel("-",statusbox)
-			tqlayout.addWidget(self.elapsedlabel,3,1)
+			layout.addWidget(self.elapsedlabel,3,1)
 			btnbox = qt.QHBox(box)
 			btnbox.setSpacing(6)
 			self.donebtn = qt.QPushButton(btnbox)
@@ -530,11 +530,11 @@ def runGuiApp(copycenter, name):
 			self.ListViewDialog = ListViewDialog
 			qt.QDialog.__init__(self, parent, "Dialog", 1, qt.Qt.WDestructiveClose)
 			self.setCaption("Copy Center")
-			tqlayout = qt.QVBoxLayout(self)
+			layout = qt.QVBoxLayout(self)
 			box = qt.QVBox(self)
 			box.setMargin(6)
 			box.setSpacing(6)
-			tqlayout.addWidget(box)
+			layout.addWidget(box)
 			self.tab = qt.QTabWidget(box)
 			self.tab.setMargin(6)
 			box.setStretchFactor(self.tab,1)
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
index 678cf40b..985d757d 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
@@ -84,7 +84,7 @@ class CopyCenterPlugin:
 				return None
 			record = []
 			for fieldname in self.fieldlist:
-				record.append( tqunicode(self.cursor.value(fieldname).toString()).encode("latin-1") )
+				record.append( unicode(self.cursor.value(fieldname).toString()).encode("latin-1") )
 			#print "read record: %s" % record
 			return record
 
@@ -145,8 +145,8 @@ class CopyCenterPlugin:
 				cursorrecord.setValue(self.fieldlist[i], v)
 			rowcount = self.cursor.insert()
 			if rowcount < 1:
-				drv = tqunicode(self.cursor.lastError().driverText()).encode("latin-1")
-				db = tqunicode(self.cursor.lastError().databaseText()).encode("latin-1")
+				drv = unicode(self.cursor.lastError().driverText()).encode("latin-1")
+				db = unicode(self.cursor.lastError().databaseText()).encode("latin-1")
 				print "failed: %s %s" % (drv,db)
 				self.copierer.writeFailed(record)
 			else:
diff --git a/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py b/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py
index 6ca94f9a..200b3dee 100755
--- a/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py
+++ b/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py
@@ -124,9 +124,9 @@ class SaxInput:
 				was parsed. """
 
 				if self.field != None:
-					# the xml-data is tqunicode and we need to encode it
+					# the xml-data is unicode and we need to encode it
 					# to latin-1 cause KexiDB deals only with latin-1.
-					u = tqunicode(chars[offset:offset+length])
+					u = unicode(chars[offset:offset+length])
 					self.field.append(u.encode("latin-1"))
 
 		# start the job