Rename obsolete tq methods to standard names

25 files changed, 71 insertions, 71 deletions

diff --git a/kexi/widget/kexidbconnectionwidget.cpp b/kexi/widget/kexidbconnectionwidget.cpp
index 1f9006fd..aabd7cc2 100644
--- a/kexi/widget/kexidbconnectionwidget.cpp
+++ b/kexi/widget/kexidbconnectionwidget.cpp
@@ -225,7 +225,7 @@ KexiDBConnectionTabWidget::KexiDBConnectionTabWidget( TQWidget* parent, const ch
  : KTabWidget( parent, name )
 {
 	mainWidget = new KexiDBConnectionWidget( this, "mainWidget" );
-	mainWidget->tqlayout()->setMargin(KDialog::marginHint());
+	mainWidget->layout()->setMargin(KDialog::marginHint());
 	addTab( mainWidget, i18n("Parameters") );
 
 //	TQVBox *page2 = new TQVBox(this);
diff --git a/kexi/widget/kexidbconnectionwidgetbase.ui b/kexi/widget/kexidbconnectionwidgetbase.ui
index 02fe2853..d121f1b7 100644
--- a/kexi/widget/kexidbconnectionwidgetbase.ui
+++ b/kexi/widget/kexidbconnectionwidgetbase.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="3" colspan="1">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -395,7 +395,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
index 74b4326d..46d2dfac 100644
--- a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
+++ b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -40,7 +40,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -125,7 +125,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout9</cstring>
+                <cstring>layout9</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp
index 07627f32..121ee8dd 100644
--- a/kexi/widget/kexieditor.cpp
+++ b/kexi/widget/kexieditor.cpp
@@ -85,7 +85,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na
 	: KexiViewBase(mainWin, parent, name)
 	, d(new KexiEditorPrivate())
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *layout = new TQVBoxLayout(this);
 #ifdef KTEXTEDIT_BASED_SQL_EDITOR
 	d->view = new KTextEdit( "", TQString(), this, "kexi_editor" );
 	//adjust font
@@ -98,9 +98,9 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na
 #else
 	TQFrame *fr = new TQFrame(this);
 	fr->setFrameStyle(TQFrame::Sunken|TQFrame::WinPanel);
-	tqlayout->addWidget(fr);
-	tqlayout = new TQVBoxLayout(fr);
-	tqlayout->setMargin( 2 );
+	layout->addWidget(fr);
+	layout = new TQVBoxLayout(fr);
+	layout->setMargin( 2 );
 
 	d->doc =  KTextEditor::EditorChooser::createDocument(TQT_TQOBJECT(fr));
 	if (!d->doc)
@@ -121,7 +121,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na
 	KexiEditorSharedActionConnector c(this, TQT_TQOBJECT(d->view));
 	d->view->installEventFilter(this);
 
-	tqlayout->addWidget(d->view);
+	layout->addWidget(d->view);
 	setViewWidget(d->view, true/*focus*/);
 	d->view->show();
 }
diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp
index 04beace6..ba4c8f9e 100644
--- a/kexi/widget/kexiscrollview.cpp
+++ b/kexi/widget/kexiscrollview.cpp
@@ -53,7 +53,7 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
 	viewport()->setPaletteBackgroundColor(colorGroup().mid());
-	TQColor fc = tqpalette().active().foreground(),
+	TQColor fc = palette().active().foreground(),
 		bc = viewport()->paletteBackgroundColor();
 	m_helpColor = KexiUtils::blendedColors(fc, bc, 1, 2);
 //	m_helpColor = TQColor((fc.red()+bc.red()*2)/3, (fc.green()+bc.green()*2)/3, 
@@ -345,7 +345,7 @@ KexiScrollView::drawContents( TQPainter * p, int clipx, int clipy, int clipw, in
 		//draw right and bottom borders
 		const int wx = childX(m_widget);
 		const int wy = childY(m_widget);
-		p->setPen(tqpalette().active().foreground());
+		p->setPen(palette().active().foreground());
 		p->drawLine(wx+m_widget->width(), wy, wx+m_widget->width(), wy+m_widget->height());
 		p->drawLine(wx, wy+m_widget->height(), wx+m_widget->width(), wy+m_widget->height());
 //kdDebug() << "KexiScrollView::drawContents() " << wy+m_widget->height() << endl;
diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp
index 65286fbd..cbd48e84 100644
--- a/kexi/widget/kexisectionheader.cpp
+++ b/kexi/widget/kexisectionheader.cpp
@@ -115,9 +115,9 @@ void KexiSectionHeader::slotFocus(bool in)
 {
 	in = in || focusWidget()==this;
 	d->lbl->setPaletteBackgroundColor( 
-		in ? tqpalette().active().color(TQColorGroup::Highlight) : tqpalette().active().color(TQColorGroup::Background) );
+		in ? palette().active().color(TQColorGroup::Highlight) : palette().active().color(TQColorGroup::Background) );
 	d->lbl->setPaletteForegroundColor( 
-		in ? tqpalette().active().color(TQColorGroup::HighlightedText) : tqpalette().active().color(TQColorGroup::Foreground) );
+		in ? palette().active().color(TQColorGroup::HighlightedText) : palette().active().color(TQColorGroup::Foreground) );
 }
 
 TQSize KexiSectionHeader::sizeHint() const
diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp
index 237130f2..ab703923 100644
--- a/kexi/widget/kexismalltoolbutton.cpp
+++ b/kexi/widget/kexismalltoolbutton.cpp
@@ -70,7 +70,7 @@ void KexiSmallToolButton::updateAction()
 
 void KexiSmallToolButton::init()
 {
-	setPaletteBackgroundColor(tqpalette().active().background());
+	setPaletteBackgroundColor(palette().active().background());
 	setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
 	TQFont f(KGlobalSettings::toolBarFont());
 	f.setPixelSize(Kexi::smallFont().pixelSize());
@@ -124,7 +124,7 @@ void KexiSmallToolButton::drawButton( TQPainter *_painter )
 			arrowFlags |= TQStyle::Style_Down;
 		if (isEnabled())
 			arrowFlags |= TQStyle::Style_Enabled;
-		tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter,
+		style().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter,
 			TQRect(width()-7, height()-7, 5, 5), colorGroup(),
 			arrowFlags, TQStyleOption() );
 	}
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index cee4f360..c03d16e2 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -240,28 +240,28 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW
 	setInitialSize(TQSize(400, 200), true);
 
 	//// Setup the icon toolbar /////////////////
-	TQVBoxLayout *vtqlayout = new TQVBoxLayout(l, 3);
+	TQVBoxLayout *vlayout = new TQVBoxLayout(l, 3);
 	TQToolButton *newItemPath = new TQToolButton(frame);
 	newItemPath->setIconSet(BarIconSet("fileopen"));
 	newItemPath->setTextLabel(i18n("&Add File"), true);
-	vtqlayout->addWidget(newItemPath);
+	vlayout->addWidget(newItemPath);
 	m_buttons.insert(BNewItemPath, newItemPath);
 	connect(newItemPath, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByPath()));
 
 	TQToolButton *newItemName = new TQToolButton(frame);
 	newItemName->setIconSet(BarIconSet("icons"));
 	newItemName->setTextLabel(i18n("&Add an Icon"), true);
-	vtqlayout->addWidget(newItemName);
+	vlayout->addWidget(newItemName);
 	m_buttons.insert(BNewItemName, newItemName);
 	connect(newItemName, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByName()));
 
 	TQToolButton *delItem = new TQToolButton(frame);
 	delItem->setIconSet(BarIconSet("edit_remove"));
 	delItem->setTextLabel(i18n("&Remove Selected Item"), true);
-	vtqlayout->addWidget(delItem);
+	vlayout->addWidget(delItem);
 	m_buttons.insert(BDelItem, delItem);
 	connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem()));
-	vtqlayout->addStretch();
+	vlayout->addStretch();
 
 	// Setup the iconView
 	m_iconView = new KIconView(frame, "pixcollection_iconView");
diff --git a/kexi/widget/relations/kexirelationviewconnection.cpp b/kexi/widget/relations/kexirelationviewconnection.cpp
index ab3f1ac4..fe3b5a53 100644
--- a/kexi/widget/relations/kexirelationviewconnection.cpp
+++ b/kexi/widget/relations/kexirelationviewconnection.cpp
@@ -67,7 +67,7 @@ KexiRelationViewConnection::~KexiRelationViewConnection()
 void
 KexiRelationViewConnection::drawConnection(TQPainter *p)
 {
-	p->setPen(m_parent->tqpalette().active().foreground());
+	p->setPen(m_parent->palette().active().foreground());
 	int sx = m_masterTable->x() + m_masterTable->width() + m_parent->contentsX();
 	int sy = m_masterTable->globalY(m_masterField);
 	int rx = m_detailsTable->x() + m_parent->contentsX();
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index b40b9761..ce94a809 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -420,7 +420,7 @@ void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev)
 TQRect KexiRelationViewTable::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
 {
 	if (painter) {
-		tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(),
+		style().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(),
 			TQStyle::Style_FocusAtBorder);
 	}
 	return itemRect(item);
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index c818606d..1218a978 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -309,14 +309,14 @@ void KexiBlobTableEdit::executeCopyAction(const TQByteArray& data)
 	TQPixmap pixmap;
 	if (!pixmap.loadFromData(data))
 		return;
-	tqApp->tqclipboard()->setPixmap(pixmap, TQClipboard::Clipboard);
+	tqApp->clipboard()->setPixmap(pixmap, TQClipboard::Clipboard);
 }
 
 void KexiBlobTableEdit::handlePasteAction()
 {
 	if (isReadOnly())
 		return;
-	TQPixmap pm( tqApp->tqclipboard()->pixmap(TQClipboard::Clipboard) );
+	TQPixmap pm( tqApp->clipboard()->pixmap(TQClipboard::Clipboard) );
 	TQByteArray ba;
 	TQBuffer buffer( ba );
 	buffer.open( IO_WriteOnly );
diff --git a/kexi/widget/tableview/kexibooltableedit.cpp b/kexi/widget/tableview/kexibooltableedit.cpp
index c0753269..c4067dfd 100644
--- a/kexi/widget/tableview/kexibooltableedit.cpp
+++ b/kexi/widget/tableview/kexibooltableedit.cpp
@@ -135,7 +135,7 @@ void KexiBoolTableEdit::handleAction(const TQString& actionName)
 	if (actionName=="edit_paste") {
 		emit editRequested();
 		bool ok;
-		const int value = tqApp->tqclipboard()->text( TQClipboard::Clipboard ).toInt(&ok);
+		const int value = tqApp->clipboard()->text( TQClipboard::Clipboard ).toInt(&ok);
 		if (ok) {
 			m_currentValue = (value==0) ? TQVariant(false, 0) : TQVariant(true, 1);
 		}
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp
index f45eb0e2..308e565e 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.cpp
+++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp
@@ -84,7 +84,7 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg
 //	}
 //	setView( m_lineedit );
 
-//	tqlayout->addWidget(m_view);
+//	layout->addWidget(m_view);
 //	m_combo->setEditable( true );
 //	m_combo->clear();
 //	m_combo->insertStringList(f.enumHints());
@@ -434,7 +434,7 @@ void KexiComboBoxTableEdit::handleAction(const TQString& actionName)
 			m_lineedit->clear();
 		}
 //! @todo does not work with BLOBs!
-		setValueInInternalEditor( tqApp->tqclipboard()->text() );
+		setValueInInternalEditor( tqApp->clipboard()->text() );
 	}
 	else
 		KexiInputTableEdit::handleAction(actionName);
diff --git a/kexi/widget/tableview/kexitableedit.cpp b/kexi/widget/tableview/kexitableedit.cpp
index e531b814..b082bd95 100644
--- a/kexi/widget/tableview/kexitableedit.cpp
+++ b/kexi/widget/tableview/kexitableedit.cpp
@@ -101,7 +101,7 @@ void KexiTableEdit::resize(int w, int h)
 {
 	TQWidget::resize(w, h);
 	if (m_view) {
-		if (!tqlayout()) { //if there is tqlayout (eg. KexiInputTableEdit), resize is automatic
+		if (!layout()) { //if there is layout (eg. KexiInputTableEdit), resize is automatic
 			m_view->move(0,0);
 			m_view->resize(w, h);
 		}
diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h
index fc488c83..b602168a 100644
--- a/kexi/widget/tableview/kexitableview.h
+++ b/kexi/widget/tableview/kexitableview.h
@@ -504,7 +504,7 @@ protected:
 	 *value is set to the default value. */
 	bool isDefaultValueDisplayed(KexiTableItem *item, int col, TQVariant* value = 0);
 
-	//! painting and tqlayout
+	//! painting and layout
 	void drawContents(TQPainter *p, int cx, int cy, int cw, int ch);
 	void createBuffer(int width, int height);
 	void paintCell(TQPainter* p, KexiTableItem *item, int col, int row, const TQRect &cr, bool print=false);
diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp
index 6a15b0db..a4e45daf 100644
--- a/kexi/widget/tableview/kexitableviewdata.cpp
+++ b/kexi/widget/tableview/kexitableviewdata.cpp
@@ -509,8 +509,8 @@ int KexiTableViewData::cmpStr(Item item1, Item item2)
 	const TQString &as = m_leftTmp.toString();
 	const TQString &bs = m_rightTmp.toString();
 
-	const TQChar *a = as.tqunicode();
-	const TQChar *b = bs.tqunicode();
+	const TQChar *a = as.unicode();
+	const TQChar *b = bs.unicode();
 
 	if ( a == b )
 		return 0;
@@ -524,16 +524,16 @@ int KexiTableViewData::cmpStr(Item item1, Item item2)
 
 	int l=TQMIN(as.length(),bs.length());
 
-	au = a->tqunicode();
-	bu = b->tqunicode();
+	au = a->unicode();
+	bu = b->unicode();
 	au = (au <= 0x17e ? charTable[au] : 0xffff);
 	bu = (bu <= 0x17e ? charTable[bu] : 0xffff);
 
 	while (l-- && au == bu)
 	{
 		a++,b++;
-		au = a->tqunicode();
-		bu = b->tqunicode();
+		au = a->unicode();
+		bu = b->unicode();
 		au = (au <= 0x17e ? charTable[au] : 0xffff);
 		bu = (bu <= 0x17e ? charTable[bu] : 0xffff);
 	}
diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp
index d217337b..cab7f791 100644
--- a/kexi/widget/tableview/kexitableviewheader.cpp
+++ b/kexi/widget/tableview/kexitableviewheader.cpp
@@ -34,7 +34,7 @@ class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy
 		KexiTableViewHeaderStyle(TQStyle *parentStyle, TQWidget *widget)
 		 : KexiUtils::StyleProxy(parentStyle)
 		{
-			setBackgroundColor( widget->tqpalette().active().background() );
+			setBackgroundColor( widget->palette().active().background() );
 		}
 		~KexiTableViewHeaderStyle() {}
 
@@ -65,7 +65,7 @@ KexiTableViewHeader::KexiTableViewHeader(TQWidget * parent, const char * name)
 	, m_selectedSection(-1)
 	, m_styleChangeEnabled(true)
 {
-	styleChange( tqstyle() );
+	styleChange( style() );
 	installEventFilter(this);
 	connect(this, TQT_SIGNAL(sizeChange(int,int,int)), 
 		this, TQT_SLOT(slotSizeChange(int,int,int)));
@@ -81,7 +81,7 @@ void KexiTableViewHeader::styleChange( TQStyle& oldStyle )
 	if (!m_styleChangeEnabled)
 		return;
 	m_styleChangeEnabled = false;
-	setStyle( new KexiTableViewHeaderStyle(&tqApp->tqstyle(), this) );
+	setStyle( new KexiTableViewHeaderStyle(&tqApp->style(), this) );
 	m_styleChangeEnabled = true;
 }
 
@@ -126,7 +126,7 @@ bool KexiTableViewHeader::eventFilter(TQObject * watched, TQEvent * e)
 			TQString tip = m_toolTips[ section ];
 			if (tip.isEmpty()) { //try label
 				TQFontMetrics fm(font());
-				int minWidth = fm.width( label( section ) ) + tqstyle().pixelMetric( TQStyle::PM_HeaderMargin );
+				int minWidth = fm.width( label( section ) ) + style().pixelMetric( TQStyle::PM_HeaderMargin );
 				TQIconSet *iset = iconSet( section );
 				if (iset)
 					minWidth += (2+iset->pixmap( TQIconSet::Small, TQIconSet::Normal ).width()); //taken from TQHeader::sectionSizeHint()
@@ -186,16 +186,16 @@ void KexiTableViewHeader::paintSection( TQPainter * p, int index, const TQRect &
 {
 	const bool paintSelection = index==m_selectedSection && index != -1;
 	if (paintSelection) {
-		static_cast<KexiTableViewHeaderStyle&>(tqstyle()).setBackgroundColor(
+		static_cast<KexiTableViewHeaderStyle&>(style()).setBackgroundColor(
 			KexiUtils::blendedColors( 
-				tqpalette().active().background(), m_selectionBackgroundColor, 2, 1) );
+				palette().active().background(), m_selectionBackgroundColor, 2, 1) );
 	}
 
 	TQHeader::paintSection( p, index, fr );
 
 	if (paintSelection) { //revert the color for subsequent paints
-		static_cast<KexiTableViewHeaderStyle&>(tqstyle()).setBackgroundColor(
-			tqpalette().active().background());
+		static_cast<KexiTableViewHeaderStyle&>(style()).setBackgroundColor(
+			palette().active().background());
 	}
 }
 
diff --git a/kexi/widget/utils/kexiarrowtip.cpp b/kexi/widget/utils/kexiarrowtip.cpp
index fa5c35ab..6279aa04 100644
--- a/kexi/widget/utils/kexiarrowtip.cpp
+++ b/kexi/widget/utils/kexiarrowtip.cpp
@@ -117,14 +117,14 @@ bool KexiArrowTip::close ( bool alsoDelete )
 
 void KexiArrowTip::drawContents(TQPainter& p)
 {
-	p.setPen( TQPen(tqpalette().active().foreground(), 1) );
+	p.setPen( TQPen(palette().active().foreground(), 1) );
 	p.drawText(TQRect(0,m_arrowHeight,width(),height()-m_arrowHeight), 
 		TQt::AlignCenter, m_value.toString());
 }
 
 void KexiArrowTip::drawFrame(TQPainter& p)
 {
-	TQPen pen(tqpalette().active().foreground(), 1, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin);
+	TQPen pen(palette().active().foreground(), 1, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin);
 	p.setPen( pen );
 	/*
 	   /\
diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
index 60f99f85..5e0b7ab8 100644
--- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
+++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
@@ -34,7 +34,7 @@ KexiComboBoxDropDownButton::KexiComboBoxDropDownButton( TQWidget *parent )
 	m_paintedCombo->setEditable(true);
 
 	setToggleButton(true);
-	styleChange(tqstyle());
+	styleChange(style());
 	m_paintedCombo->move(0,0);
 	m_paintedCombo->setFixedSize(size());
 }
@@ -58,30 +58,30 @@ void KexiComboBoxDropDownButton::drawButton(TQPainter *p)
 			m_paintedCombo->move(0,0);
 			m_paintedCombo->setFixedSize(size()+TQSize(0, m_fixForHeight)); //last chance to fix size
 		}
-		tqstyle().drawComplexControl( TQStyle::CC_ComboBox, p,
+		style().drawComplexControl( TQStyle::CC_ComboBox, p,
 			m_fixForHeight>0 ? (const TQWidget*)m_paintedCombo : this, r, colorGroup(),
 			flags, (uint)(TQStyle::SC_ComboBoxArrow), TQStyle::SC_None );
 	}
 	else {
 		r.setWidth(r.width()+2);
-		tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags);
+		style().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags);
 	}
 }
 
 void KexiComboBoxDropDownButton::styleChange( TQStyle & oldStyle )
 {
 	//<hack>
-	if (qstricmp(tqstyle().name(),"thinkeramik")==0) {
+	if (qstricmp(style().name(),"thinkeramik")==0) {
 		m_fixForHeight = 3;
 	}
 	else
 		m_fixForHeight = 0;
 	//</hack>
 	m_drawComplexControl =
-		(tqstyle().inherits("KStyle") && qstricmp(tqstyle().name(),"qtcurve")!=0)
-		|| qstricmp(tqstyle().name(),"platinum")==0;
+		(style().inherits("KStyle") && qstricmp(style().name(),"qtcurve")!=0)
+		|| qstricmp(style().name(),"platinum")==0;
 	if (m_fixForHeight==0)
-		setFixedWidth( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, 
+		setFixedWidth( style().querySubControlMetrics( TQStyle::CC_ComboBox, 
 			(const TQWidget*)m_paintedCombo, TQStyle::SC_ComboBoxArrow ).width() +1 );
 	KPushButton::styleChange(oldStyle);
 }
diff --git a/kexi/widget/utils/kexidisplayutils.cpp b/kexi/widget/utils/kexidisplayutils.cpp
index 1943b086..0866cf65 100644
--- a/kexi/widget/utils/kexidisplayutils.cpp
+++ b/kexi/widget/utils/kexidisplayutils.cpp
@@ -92,7 +92,7 @@ KexiDisplayUtils::DisplayParameters::DisplayParameters()
 
 KexiDisplayUtils::DisplayParameters::DisplayParameters(TQWidget *w)
 {
-	textColor = w->tqpalette().active().foreground();
+	textColor = w->palette().active().foreground();
 	selectedTextColor = w->tqpalette().active().highlightedText();
 	font = w->font();
 }
diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp
index 054192ce..0710b4d0 100644
--- a/kexi/widget/utils/kexidropdownbutton.cpp
+++ b/kexi/widget/utils/kexidropdownbutton.cpp
@@ -33,10 +33,10 @@ KexiDropDownButton::KexiDropDownButton(TQWidget *parent)
 //	setFixedWidth(TQMAX(18, tqApp->globalStrut().width()));
 	int fixedWidth;
 	//hack
-	if (qstricmp(tqstyle().name(),"thinkeramik")==0)
+	if (qstricmp(style().name(),"thinkeramik")==0)
 		fixedWidth = 18; //typical width as in "windows" style
 	else
-		fixedWidth = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, 
+		fixedWidth = style().querySubControlMetrics( TQStyle::CC_ComboBox, 
 			this, TQStyle::SC_ComboBoxArrow ).width();
 	setFixedWidth( fixedWidth );
 	setPopupDelay(10/*ms*/);
@@ -54,7 +54,7 @@ void KexiDropDownButton::drawButton( TQPainter *p )
 		arrowFlags |= TQStyle::Style_Down;
 	if (isEnabled())
 		arrowFlags |= TQStyle::Style_Enabled;
-	tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
+	style().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
 		TQRect((width()-7)/2, height()-9, 7, 7), colorGroup(),
 		arrowFlags, TQStyleOption() );
 }
diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp
index f6868a5e..e2397ede 100644
--- a/kexi/widget/utils/kexiflowlayout.cpp
+++ b/kexi/widget/utils/kexiflowlayout.cpp
@@ -64,7 +64,7 @@ KexiFlowLayoutIterator::takeCurrent()
 	return (m_idx < (int)count()) ? m_list->take(m_idx) : 0;
 }
 
-//// The tqlayout itself
+//// The layout itself
 
 KexiFlowLayout::KexiFlowLayout(TQWidget *parent, int border, int space, const char *name)
  : TQLayout(parent, border, space, name)
@@ -182,8 +182,8 @@ KexiFlowLayout::sizeHint() const
 TQSize
 KexiFlowLayout::minimumSize() const
 {
-//js: do we really need to simulate tqlayout here?
-//    I commented this out because it was impossible to stretch tqlayout conveniently.
+//js: do we really need to simulate layout here?
+//    I commented this out because it was impossible to stretch layout conveniently.
 //    Now, minimum size is computed automatically based on item's minimumSize...
 #if 0
 	if(m_cached_minSize.isEmpty()) {
@@ -246,7 +246,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 //		kdDebug() << "- doHorizontalLayout(): " << o->widget()->className() << " " << o->widget()->name() << endl;
 		TQSize oSizeHint = o->sizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts)
 		if ((x + oSizeHint.width()) > r.right() && h > 0) {
-			// do the tqlayout of current line
+			// do the layout of current line
 			TQPtrListIterator<TQLayoutItem> it2(currentLine);
 			TQLayoutItem *item;
 			int wx = r.x();
@@ -298,7 +298,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 		++it;
 	}
 
-	// don't forget to tqlayout the last line
+	// don't forget to layout the last line
 	TQPtrListIterator<TQLayoutItem> it2(currentLine);
 	TQLayoutItem *item;
 	int wx = r.x();
@@ -362,7 +362,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 
 		TQSize oSizeHint = o->sizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts)
 		if (y + oSizeHint.height() > r.bottom() && w > 0) {
-			// do the tqlayout of current line
+			// do the layout of current line
 			TQPtrListIterator<TQLayoutItem> it2(currentLine);
 			TQLayoutItem *item;
 			int wy = r.y();
@@ -414,7 +414,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 		++it;
 	}
 
-	// don't forget to tqlayout the last line
+	// don't forget to layout the last line
 	TQPtrListIterator<TQLayoutItem> it2(currentLine);
 	TQLayoutItem *item;
 	int wy = r.y();
diff --git a/kexi/widget/utils/kexiflowlayout.h b/kexi/widget/utils/kexiflowlayout.h
index aec6c6c3..c23398e0 100644
--- a/kexi/widget/utils/kexiflowlayout.h
+++ b/kexi/widget/utils/kexiflowlayout.h
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqptrlist.h>
 
-//! @short a special "flow" tqlayout
+//! @short a special "flow" layout
 class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
 {
 	public:
@@ -33,14 +33,14 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
 
 		~KexiFlowLayout();
 
-		/*! \return the widgets in the order of the tqlayout,
+		/*! \return the widgets in the order of the layout,
 		 ie as it is stored in m_list. You must delete the list after using it. */
 		TQPtrList<TQWidget>* widgetList() const;
 
-		/*! Sets tqlayout's orientation to \a orientation. Default orientation isQt::Vertical. */
+		/*! Sets layout's orientation to \a orientation. Default orientation isQt::Vertical. */
 		void  setOrientation(Qt::Orientation orientation) { m_orientation = orientation; }
 
-		/*! \return tqlayout's orientation. */
+		/*! \return layout's orientation. */
 		Qt::Orientation orientation() const { return m_orientation; }
 
 		void setJustified(bool justify) { m_justify = justify; }
diff --git a/kexi/widget/utils/kexirecordmarker.cpp b/kexi/widget/utils/kexirecordmarker.cpp
index e3e281e3..a2d6b3d6 100644
--- a/kexi/widget/utils/kexirecordmarker.cpp
+++ b/kexi/widget/utils/kexirecordmarker.cpp
@@ -205,7 +205,7 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e)
 		int y = ((d->rowHeight * i)-d->offset);
 		TQRect r(0, y, width(), d->rowHeight);
 		p.drawRect(r);
-		tqstyle().tqdrawPrimitive( TQStyle::PE_HeaderSection, &p, r,
+		style().tqdrawPrimitive( TQStyle::PE_HeaderSection, &p, r,
 			(d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : colorGroup()), 
 			TQStyle::Style_Raised | (isEnabled() ? TQStyle::Style_Enabled : 0));
 	}
diff --git a/kexi/widget/utils/kexitooltip.cpp b/kexi/widget/utils/kexitooltip.cpp
index ad55774e..2a36ef09 100644
--- a/kexi/widget/utils/kexitooltip.cpp
+++ b/kexi/widget/utils/kexitooltip.cpp
@@ -64,7 +64,7 @@ void KexiToolTip::paintEvent( TQPaintEvent *pev )
 
 void KexiToolTip::drawFrame(TQPainter& p)
 {
-	p.setPen( TQPen(tqpalette().active().foreground(), 1) );
+	p.setPen( TQPen(palette().active().foreground(), 1) );
 	p.drawRect(rect());
 }