Rename a number of old tq methods that are no longer tq specific

68 files changed, 468 insertions, 468 deletions

diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index 4c279382..af893ddf 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -435,7 +435,7 @@ KexiBrowser::slotContextMenu(KListView* /*list*/, TQListViewItem *item, const TQ
 		pm->changeTitle(m_partPopupTitle_id, *bit->pixmap(0), title_text);
 /*		KexiPart::Part* part = Kexi::partManager().part(bit->info());
 		if (part)
-			m_newObjectAction->setText(i18n("&Create Object: %1...").tqarg( part->instanceName() ));
+			m_newObjectAction->setText(i18n("&Create Object: %1...").arg( part->instanceName() ));
 		else
 			m_newObjectAction->setText(i18n("&Create Object..."));
 		m_newObjectAction->setIconSet( SmallIconSet(bit->info()->itemIcon()) );*/
@@ -523,14 +523,14 @@ KexiBrowser::slotSelectionChanged(TQListViewItem* i)
 		m_prevSelectedPart = part;
 		if (part) {
 			if (m_newObjectAction) {
-				m_newObjectAction->setText(i18n("&Create Object: %1...").tqarg( part->instanceCaption() ));
+				m_newObjectAction->setText(i18n("&Create Object: %1...").arg( part->instanceCaption() ));
 				m_newObjectAction->setIcon( part->info()->createItemIcon() );
 				if (m_features & Toolbar) {
 					m_newObjectToolButton->setIconSet( part->info()->createItemIcon() );
 					TQToolTip::add(m_newObjectToolButton, 
-						i18n("Create object: %1").tqarg( part->instanceCaption().lower() ));
+						i18n("Create object: %1").arg( part->instanceCaption().lower() ));
 					TQWhatsThis::add(m_newObjectToolButton, 
-						i18n("Creates a new object: %1").tqarg( part->instanceCaption().lower() ));
+						i18n("Creates a new object: %1").arg( part->instanceCaption().lower() ));
 				}
 			}
 		} else {
diff --git a/kexi/widget/kexicharencodingcombobox.cpp b/kexi/widget/kexicharencodingcombobox.cpp
index ff277e7d..28c4521a 100644
--- a/kexi/widget/kexicharencodingcombobox.cpp
+++ b/kexi/widget/kexicharencodingcombobox.cpp
@@ -19,7 +19,7 @@
 
 #include "kexicharencodingcombobox.h"
 
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -31,12 +31,12 @@ KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox(
  : KComboBox( parent, "KexiCharacterEncodingComboBox" )
  , m_defaultEncodingAdded(false)
 {
-	TQString defaultEncoding(TQString::tqfromLatin1(KGlobal::locale()->encoding()));
+	TQString defaultEncoding(TQString::fromLatin1(KGlobal::locale()->encoding()));
 	TQString defaultEncodingDescriptiveName;
 
 	TQString _selectedEncoding = selectedEncoding;
 	if (_selectedEncoding.isEmpty())
-		_selectedEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding());
+		_selectedEncoding = TQString::fromLatin1(KGlobal::locale()->encoding());
 
 	TQStringList descEncodings(KGlobal::charsets()->descriptiveEncodingNames());
 	TQStringList::ConstIterator it = descEncodings.constBegin();
@@ -66,7 +66,7 @@ KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox(
 	if (!defaultEncodingDescriptiveName.isEmpty()) {
 		m_defaultEncodingAdded = true;
 		TQString desc = i18n("Text encoding: Default", "Default: %1")
-			.tqarg(defaultEncodingDescriptiveName);
+			.arg(defaultEncodingDescriptiveName);
 		insertItem( desc, 0 );
 		if (_selectedEncoding==defaultEncoding) {
 			setCurrentItem(0);
@@ -84,7 +84,7 @@ KexiCharacterEncodingComboBox::~KexiCharacterEncodingComboBox()
 TQString KexiCharacterEncodingComboBox::selectedEncoding() const
 {
 	if (defaultEncodingSelected()) {
-		return TQString::tqfromLatin1(KGlobal::locale()->encoding());
+		return TQString::fromLatin1(KGlobal::locale()->encoding());
 	}
 	else {
 		return KGlobal::charsets()->encodingForName( currentText() );
diff --git a/kexi/widget/kexicustompropertyfactory_p.cpp b/kexi/widget/kexicustompropertyfactory_p.cpp
index 20e85b04..2cdd0bfc 100644
--- a/kexi/widget/kexicustompropertyfactory_p.cpp
+++ b/kexi/widget/kexicustompropertyfactory_p.cpp
@@ -50,7 +50,7 @@ void KexiImagePropertyEdit::selectPixmap()
 
 	ObjectTreeItem *item = m_manager->activeForm()->objectTree()->lookup(m_manager->activeForm()->selectedWidget()->name());
 	TQString name = item ? item->pixmapName(property()->name()) : "";
-	PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, tqtopLevelWidget() );
+	PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, topLevelWidget() );
 	if(dialog.exec() == TQDialog::Accepted) {
 		setValue(dialog.pixmap(), true);
 		item->setPixmapName(property()->name(), dialog.pixmapName());
@@ -101,7 +101,7 @@ void KexiIdentifierPropertyEdit::setValue(const TQVariant &value, bool emitChang
 	TQString identifier( KexiUtils::string2Identifier(string) );
 	if (identifier!=string)
 		kdDebug() << TQString("KexiIdentifierPropertyEdit::setValue(): "
-			"String \"%1\" converted to identifier \"%2\".").tqarg(string).tqarg(identifier) << endl;
+			"String \"%1\" converted to identifier \"%2\".").arg(string).arg(identifier) << endl;
 	StringEdit::setValue( identifier, emitChange );
 }
 
diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp
index 113f8be4..f73b059e 100644
--- a/kexi/widget/kexidataawareview.cpp
+++ b/kexi/widget/kexidataawareview.cpp
@@ -23,7 +23,7 @@
 #include <utils/kexisharedactionclient.h>
 #include <core/keximainwindow.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kpopupmenu.h>
 
@@ -59,9 +59,9 @@ void KexiDataAwareView::init( TQWidget* viewWidget, KexiSharedActionClient* acti
 	TQVBoxLayout *box = new TQVBoxLayout(this);
 	box->addWidget(m_internalView);
 
-	setMinimumSize(m_internalView->tqminimumSizeHint().width(), 
-		m_internalView->tqminimumSizeHint().height());
-	resize( preferredSizeHint( m_internalView->tqsizeHint() ) );
+	setMinimumSize(m_internalView->minimumSizeHint().width(), 
+		m_internalView->minimumSizeHint().height());
+	resize( preferredSizeHint( m_internalView->sizeHint() ) );
 	setFocusProxy(m_internalView);
 	
 	if (!noDataAware) {
@@ -165,14 +165,14 @@ TQWidget* KexiDataAwareView::mainWidget()
 	return m_internalView;
 }
 
-TQSize KexiDataAwareView::tqminimumSizeHint() const
+TQSize KexiDataAwareView::minimumSizeHint() const
 {
-	return m_internalView ? m_internalView->tqminimumSizeHint() : TQSize(0,0);//KexiViewBase::tqminimumSizeHint();
+	return m_internalView ? m_internalView->minimumSizeHint() : TQSize(0,0);//KexiViewBase::minimumSizeHint();
 }
 
-TQSize KexiDataAwareView::tqsizeHint() const
+TQSize KexiDataAwareView::sizeHint() const
 {
-	return m_internalView ? m_internalView->tqsizeHint() : TQSize(0,0);//KexiViewBase::tqsizeHint();
+	return m_internalView ? m_internalView->sizeHint() : TQSize(0,0);//KexiViewBase::sizeHint();
 }
 
 void KexiDataAwareView::updateActions(bool activated)
@@ -241,7 +241,7 @@ void KexiDataAwareView::slotCellSelected(int /*col*/, int row)
 
 void KexiDataAwareView::deleteAllRows()
 {
-	m_dataAwareObject->deleteAllRows(true/*ask*/, true/*tqrepaint*/);
+	m_dataAwareObject->deleteAllRows(true/*ask*/, true/*repaint*/);
 }
 
 void KexiDataAwareView::deleteCurrentRow()
diff --git a/kexi/widget/kexidataawareview.h b/kexi/widget/kexidataawareview.h
index 5cc76e97..8a787bd7 100644
--- a/kexi/widget/kexidataawareview.h
+++ b/kexi/widget/kexidataawareview.h
@@ -49,9 +49,9 @@ class KEXIEXTWIDGETS_EXPORT KexiDataAwareView : public KexiViewBase,
 
 		TQWidget* mainWidget();
 
-		virtual TQSize tqminimumSizeHint() const;
+		virtual TQSize minimumSizeHint() const;
 		
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 		
 		KexiDataAwareObjectInterface* dataAwareObject() const { return m_dataAwareObject; }
 
diff --git a/kexi/widget/kexidatatable.cpp b/kexi/widget/kexidatatable.cpp
index 09680b14..db75e010 100644
--- a/kexi/widget/kexidatatable.cpp
+++ b/kexi/widget/kexidatatable.cpp
@@ -20,7 +20,7 @@
 */
 
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 #include <kiconloader.h>
@@ -42,10 +42,10 @@ KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *parent,
 	KexiTableView *view;
 	if (dbAware)
 		view = new KexiDataTableView(this, 
-			TQString("%1_datatableview").tqarg(name ? name : "KexiDataTableView").latin1());
+			TQString("%1_datatableview").arg(name ? name : "KexiDataTableView").latin1());
 	else
 		view = new KexiTableView(0, this, 
-			TQString("%1_tableview").tqarg(name ? name : "KexiTableView").latin1());
+			TQString("%1_tableview").arg(name ? name : "KexiTableView").latin1());
 
 	KexiDataAwareView::init( view, view, view );
 }
diff --git a/kexi/widget/kexidbconnectionwidget.cpp b/kexi/widget/kexidbconnectionwidget.cpp
index 78b67c8d..00918d5b 100644
--- a/kexi/widget/kexidbconnectionwidget.cpp
+++ b/kexi/widget/kexidbconnectionwidget.cpp
@@ -39,7 +39,7 @@
 #include <tqcheckbox.h>
 #include <tqbuttongroup.h>
 #include <tqwidgetstack.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
@@ -95,7 +95,7 @@ KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* parent,  const char* n
 	hbox->addWidget( d->btnSaveChanges );
 	hbox->addSpacing( KDialogBase::spacingHint() );
 	TQWidget::setTabOrder(titleEdit, d->btnSaveChanges);
-	d->btnSaveChanges->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+	d->btnSaveChanges->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
 
 	d->btnTestConnection = new KPushButton(KGuiItem(i18n("&Test Connection"), "", 
 		i18n("Test database connection"), 
@@ -103,7 +103,7 @@ KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* parent,  const char* n
 		frmBottom, "testConnection");
 	hbox->addWidget( d->btnTestConnection );
 	TQWidget::setTabOrder(d->btnSaveChanges, d->btnTestConnection);
-	d->btnTestConnection->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+	d->btnTestConnection->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
 
 	connect( locationBGrp, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotLocationBGrpClicked(int)) );
 	connect( chkPortDefault, TQT_SIGNAL(toggled(bool)), this , TQT_SLOT(slotCBToggled(bool)) );
@@ -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 6dd4fbf8..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">
@@ -39,7 +39,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>48</width>
                             <height>48</height>
@@ -56,7 +56,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>331</height>
@@ -75,7 +75,7 @@
             <property name="sizeType">
                 <enum>MinimumExpanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
@@ -111,7 +111,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>41</width>
                             <height>20</height>
@@ -163,7 +163,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>90</width>
                             <height>20</height>
@@ -337,7 +337,7 @@
                     <property name="text">
                         <string>&amp;Title (optional):</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -356,7 +356,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32</width>
                             <height>32767</height>
@@ -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">
@@ -411,7 +411,7 @@
                     <property name="sizeType">
                         <enum>Minimum</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>80</width>
                             <height>20</height>
diff --git a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
index f1f161de..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">
@@ -62,7 +62,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -114,7 +114,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>129</width>
                             <height>20</height>
@@ -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/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp
index 88b72596..d8cead89 100644
--- a/kexi/widget/kexidswelcome.cpp
+++ b/kexi/widget/kexidswelcome.cpp
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
 
@@ -37,7 +37,7 @@ KexiDSWelcome::KexiDSWelcome(KexiDataSourceWizard *parent)
 	KexiDSPixmap *pic = new KexiDSPixmap(this);
 
 	TQLabel *lText = new TQLabel(i18n("Kexi can help you with creation of %2 using data sources in almost no time with the \"%1 Wizard\""), this);
-	lText->tqsetAlignment(AlignTop | AlignLeft | WordBreak);
+	lText->setAlignment(AlignTop | AlignLeft | WordBreak);
 	TQCheckBox *useWizard = new TQCheckBox(i18n("Create %1 using the \"%1 Wizard\""), this);
 	connect(useWizard, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setUseWizard(bool)));
 	useWizard->setChecked(true);
diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp
index 07627f32..6d3848ce 100644
--- a/kexi/widget/kexieditor.cpp
+++ b/kexi/widget/kexieditor.cpp
@@ -23,7 +23,7 @@
 
 #include <keximainwindow.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <klocale.h>
 #include <kdebug.h>
@@ -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/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp
index 31795049..cc1845ab 100644
--- a/kexi/widget/kexifieldcombobox.cpp
+++ b/kexi/widget/kexifieldcombobox.cpp
@@ -20,7 +20,7 @@
 #include "kexifieldcombobox.h"
 
 #include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcursor.h>
@@ -182,7 +182,7 @@ void KexiFieldComboBox::setFieldOrExpression(int index)
 	index++; //skip 1st empty item
 	if (index>=count()) {
 		kexiwarn << TQString("KexiFieldComboBox::setFieldOrExpression(int index): index %1 "
-			"out of range (0..%2)").tqarg(index).tqarg(count()-1) << endl;
+			"out of range (0..%2)").arg(index).arg(count()-1) << endl;
 		index = -1;
 	}
 	if (index<=0) {
@@ -243,7 +243,7 @@ void KexiFieldComboBox::focusOutEvent( TQFocusEvent *e )
 {
 	KComboBox::focusOutEvent( e );
 	// accept changes if the focus is moved
-	if (!KexiUtils::hasParent(TQT_TQOBJECT(this), TQT_TQOBJECT(tqfocusWidget()))) //(a check needed because drop-down listbox also causes a focusout)
+	if (!KexiUtils::hasParent(TQT_TQOBJECT(this), TQT_TQOBJECT(focusWidget()))) //(a check needed because drop-down listbox also causes a focusout)
 		slotReturnPressed(currentText());
 }
 
diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp
index 532ec057..406bcb8a 100644
--- a/kexi/widget/kexifieldlistview.cpp
+++ b/kexi/widget/kexifieldlistview.cpp
@@ -20,7 +20,7 @@
 #include "kexifieldlistview.h"
 
 #include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcursor.h>
@@ -117,7 +117,7 @@ void KexiFieldListView::setSchema(KexiDB::TableOrQuerySchema* schema)
 }
 
 #if 0
-TQSize KexiFieldListView::tqsizeHint()
+TQSize KexiFieldListView::sizeHint()
 {
 	TQFontMetrics fm(font());
 
diff --git a/kexi/widget/kexifieldlistview.h b/kexi/widget/kexifieldlistview.h
index 50d94dba..53682436 100644
--- a/kexi/widget/kexifieldlistview.h
+++ b/kexi/widget/kexifieldlistview.h
@@ -60,7 +60,7 @@ class KEXIEXTWIDGETS_EXPORT KexiFieldListView : public KListView
 		TQStringList selectedFieldNames() const;
 
 //		void setReadOnly(bool);
-//		virtual TQSize tqsizeHint();
+//		virtual TQSize sizeHint();
 
 	signals:
 		/*! Emitted when a field is double clicked */
diff --git a/kexi/widget/kexifilterdlg.cpp b/kexi/widget/kexifilterdlg.cpp
index e41681ab..89225823 100644
--- a/kexi/widget/kexifilterdlg.cpp
+++ b/kexi/widget/kexifilterdlg.cpp
@@ -19,7 +19,7 @@
 
 #include <tqlistview.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqheader.h>
 #include <tqstringlist.h>
 
diff --git a/kexi/widget/kexiprjtypeselectorbase.ui b/kexi/widget/kexiprjtypeselectorbase.ui
index 059bf080..c6ff117a 100644
--- a/kexi/widget/kexiprjtypeselectorbase.ui
+++ b/kexi/widget/kexiprjtypeselectorbase.ui
@@ -88,7 +88,7 @@
                     <property name="scaledContents">
                         <bool>true</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignLeft</set>
                     </property>
                 </widget>
@@ -110,7 +110,7 @@
                     <property name="scaledContents">
                         <bool>true</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignLeft</set>
                     </property>
                 </widget>
diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp
index 02b050b8..e3576a17 100644
--- a/kexi/widget/kexipropertyeditorview.cpp
+++ b/kexi/widget/kexipropertyeditorview.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 KexiObjectInfoLabel::KexiObjectInfoLabel(TQWidget* parent, const char* name)
@@ -40,7 +40,7 @@ KexiObjectInfoLabel::KexiObjectInfoLabel(TQWidget* parent, const char* name)
 	hlyr->addWidget(m_objectIconLabel);
 	m_objectNameLabel = new TQLabel(this);
 	m_objectNameLabel->setMargin(2);
-	m_objectNameLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
+	m_objectNameLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
 	hlyr->addWidget(m_objectNameLabel);
 }
 
@@ -76,7 +76,7 @@ void KexiObjectInfoLabel::updateName()
 	if (txt.isEmpty())
 		txt = m_objectName;
 	else if (!m_objectName.isEmpty())
-		txt += TQString(" \"%1\"").tqarg(m_objectName);
+		txt += TQString(" \"%1\"").arg(m_objectName);
 	m_objectNameLabel->setText(txt);
 }
 
@@ -125,7 +125,7 @@ KexiPropertyEditorView::KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget
 	vlyr->addWidget(d->objectIcon);
 	d->objectClassName = new TQLabel(this);
 	d->objectClassName->setMargin(2);
-	d->objectClassName->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
+	d->objectClassName->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
 	vlyr->addWidget(d->objectClassName);*/
 
 	d->editor = new KoProperty::Editor(this, true /*AutoSync*/, "propeditor");
@@ -146,14 +146,14 @@ KexiPropertyEditorView::~KexiPropertyEditorView()
 	delete d;
 }
 
-TQSize KexiPropertyEditorView::tqsizeHint() const
+TQSize KexiPropertyEditorView::sizeHint() const
 {
-	return TQSize(200,200);//m_editor->tqsizeHint();
+	return TQSize(200,200);//m_editor->sizeHint();
 }
 
-TQSize KexiPropertyEditorView::tqminimumSizeHint() const
+TQSize KexiPropertyEditorView::minimumSizeHint() const
 {
-	return TQSize(200,200);//m_editor->tqsizeHint();
+	return TQSize(200,200);//m_editor->sizeHint();
 }
 
 /*void KexiPropertyEditorView::setGeometry ( const TQRect &r )
diff --git a/kexi/widget/kexipropertyeditorview.h b/kexi/widget/kexipropertyeditorview.h
index 66cc0ac7..008e6759 100644
--- a/kexi/widget/kexipropertyeditorview.h
+++ b/kexi/widget/kexipropertyeditorview.h
@@ -99,8 +99,8 @@ class KEXIEXTWIDGETS_EXPORT KexiPropertyEditorView : public TQWidget
 			KexiObjectInfoLabel *infoLabel, KoProperty::Set* set, 
 			const TQString& textToDisplayForNullSet = TQString());
 
-		virtual TQSize tqsizeHint() const;
-		virtual TQSize tqminimumSizeHint() const;
+		virtual TQSize sizeHint() const;
+		virtual TQSize minimumSizeHint() const;
 		KoProperty::Editor *editor() const;
 
 //	public slots:
diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp
index db9dbb14..ba4c8f9e 100644
--- a/kexi/widget/kexiscrollview.cpp
+++ b/kexi/widget/kexiscrollview.cpp
@@ -52,8 +52,8 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview)
  , m_scrollViewNavPanel(0)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
-	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
-	TQColor fc = tqpalette().active().foreground(),
+	viewport()->setPaletteBackgroundColor(colorGroup().mid());
+	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, 
@@ -80,7 +80,7 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview)
 //! @todo allow to hide navigator
 		updateScrollBars();
 		m_scrollViewNavPanel = new KexiRecordNavigator(this, leftMargin(), "nav");
-		m_scrollViewNavPanel->tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred);
+		m_scrollViewNavPanel->setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred);
 	}
 }
 
@@ -173,11 +173,11 @@ KexiScrollView::refreshContentsSize()
 			change = true;
 		}
 		if (change) {
-	tqrepaint();
-	viewport()->tqrepaint();
+	repaint();
+	viewport()->repaint();
 	repaintContents();
 	updateContents(0, 0, 2000,2000);
-	clipper()->tqrepaint();
+	clipper()->repaint();
 
 			resizeContents(w, h);
 		}
@@ -257,8 +257,8 @@ KexiScrollView::contentsMouseMoveEvent(TQMouseEvent *ev)
 		for(TQObject *o = list->first(); o; o = list->next())
 		{
 			TQWidget *w = (TQWidget*)o;
-			tmpx = TQMAX(tmpx, (w->tqgeometry().right() + 10));
-			tmpy = TQMAX(tmpy, (w->tqgeometry().bottom() + 10));
+			tmpx = TQMAX(tmpx, (w->geometry().right() + 10));
+			tmpy = TQMAX(tmpy, (w->geometry().bottom() + 10));
 		}
 		delete list;
 
@@ -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 7e6989f3..0c1b9f76 100644
--- a/kexi/widget/kexisectionheader.cpp
+++ b/kexi/widget/kexisectionheader.cpp
@@ -22,7 +22,7 @@
 #include <kexiutils/utils.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 #include <tqtooltip.h>
 
@@ -65,7 +65,7 @@ KexiSectionHeader::KexiSectionHeader(const TQString &caption, Qt::Orientation o,
 	d->lyr->setAutoAdd(true);
 	d->lbl_b = new TQHBox(this);
 	d->lbl = new TQLabel(TQString(" ")+caption, d->lbl_b);
-	d->lbl->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
+	d->lbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
 	d->lbl->setFocusPolicy(TQ_StrongFocus);
 	d->lbl->installEventFilter(this);
 	installEventFilter(this);
@@ -83,7 +83,7 @@ void KexiSectionHeader::addButton(const TQString& icon, const TQString& toolTip,
 	KPushButton *btn = new KPushButton(d->lbl_b);
 	btn->setFlat(true);
 	btn->setFocusPolicy(TQ_NoFocus);
-	btn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
+	btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
 	if (receiver && member) {
 		connect(btn, TQT_SIGNAL(clicked()), receiver, member);
 	}
@@ -113,19 +113,19 @@ bool KexiSectionHeader::eventFilter( TQObject *o, TQEvent *e )
 
 void KexiSectionHeader::slotFocus(bool in)
 {
-	in = in || tqfocusWidget()==this;
+	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::tqsizeHint() const
+TQSize KexiSectionHeader::sizeHint() const
 {
 	if (!d->lyr->view)
-		return TQWidget::tqsizeHint();
-	TQSize s = d->lyr->view->tqsizeHint();
-	return TQSize(s.width(), d->lbl->tqsizeHint().height() + s.height());
+		return TQWidget::sizeHint();
+	TQSize s = d->lyr->view->sizeHint();
+	return TQSize(s.width(), d->lbl->sizeHint().height() + s.height());
 }
 
 /*void KexiSectionHeader::setFocus()
diff --git a/kexi/widget/kexisectionheader.h b/kexi/widget/kexisectionheader.h
index 9ed31a35..a8d08a45 100644
--- a/kexi/widget/kexisectionheader.h
+++ b/kexi/widget/kexisectionheader.h
@@ -41,7 +41,7 @@ class KEXIEXTWIDGETS_EXPORT KexiSectionHeader : public TQWidget
 
 		virtual bool eventFilter( TQObject *o, TQEvent *e );
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 	public slots:
 		void slotFocus(bool in);
diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp
index 81bab0c6..a2ccf318 100644
--- a/kexi/widget/kexismalltoolbutton.cpp
+++ b/kexi/widget/kexismalltoolbutton.cpp
@@ -70,8 +70,8 @@ void KexiSmallToolButton::updateAction()
 
 void KexiSmallToolButton::init()
 {
-	setPaletteBackgroundColor(tqpalette().active().background());
-	tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
+	setPaletteBackgroundColor(palette().active().background());
+	setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
 	TQFont f(KGlobalSettings::toolBarFont());
 	f.setPixelSize(Kexi::smallFont().pixelSize());
 	setFont(f);
@@ -125,7 +125,7 @@ void KexiSmallToolButton::drawButton( TQPainter *_painter )
 		if (isEnabled())
 			arrowFlags |= TQStyle::Style_Enabled;
 		tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter,
-			TQRect(width()-7, height()-7, 5, 5), tqcolorGroup(),
+			TQRect(width()-7, height()-7, 5, 5), colorGroup(),
 			arrowFlags, TQStyleOption() );
 	}
 }
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index 0aeddca4..eade3cdd 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <tqpixmap.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqstringlist.h>
 #include <tqtoolbutton.h>
@@ -159,7 +159,7 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent)
 	// Name input
 	TQLabel *name = new TQLabel(i18n("&Name:"), frame);
 	l->addWidget(name, 0, 0);
-	name->tqsetAlignment(TQt::AlignRight|TQt::AlignVCenter);
+	name->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
 	m_nameInput = new KLineEdit("kexi", frame);
 	l->addWidget(m_nameInput, 0, 1);
 	name->setBuddy(m_nameInput);
@@ -167,7 +167,7 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent)
 	// Choose size
 	TQLabel *size = new TQLabel(i18n("&Size:"), frame);
 	l->addWidget(size, 1, 0);
-	size->tqsetAlignment(TQt::AlignRight|TQt::AlignVCenter);
+	size->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
 
 	KComboBox *combo = new KComboBox(frame);
 	l->addWidget(combo, 1, 1);
@@ -232,7 +232,7 @@ TQString LoadIconDialog::iconName()
 /// Pixmap Collection Editor Dialog
 PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQWidget *parent)
 : KDialogBase(parent, "pixcollection_dialog", true,
-	i18n("Edit Pixmap Collection: %1").tqarg(collection->collectionName()), Close, Close, false)
+	i18n("Edit Pixmap Collection: %1").arg(collection->collectionName()), Close, Close, false)
 {
 	m_collection = collection;
 	TQFrame *frame = makeMainWidget();
@@ -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");
@@ -312,7 +312,7 @@ PixmapCollectionEditor::removeItem()
 
 	int confirm = KMessageBox::questionYesNo(parentWidget(), TQString("<qt>")+
 		i18n("Do you want to remove item \"%1\" from collection \"%2\"?")
-		.tqarg(item->text()).tqarg(m_collection->collectionName()) + "</qt>");
+		.arg(item->text()).arg(m_collection->collectionName()) + "</qt>");
 	if(confirm == KMessageBox::No)
 		return;
 
@@ -373,7 +373,7 @@ PixmapCollectionEditor::displayMenu(TQIconViewItem *it, const TQPoint &p)
 
 //// A Dialog to choose a pixmap from the PixmapCollection
 PixmapCollectionChooser::PixmapCollectionChooser(PixmapCollection *collection, const TQString &selectedItem, TQWidget *parent)
-: KDialogBase(parent, "pixchoose_dialog", true, i18n("Select Pixmap From %1").tqarg(collection->collectionName()),
+: KDialogBase(parent, "pixchoose_dialog", true, i18n("Select Pixmap From %1").arg(collection->collectionName()),
    User1|Ok|Cancel, Ok, false, KGuiItem(i18n("Edit Collection...")))
 {
 	m_collection = collection;
diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp
index 18c19ef9..e3537aa5 100644
--- a/kexi/widget/relations/kexirelationview.cpp
+++ b/kexi/widget/relations/kexirelationview.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 
 #include <tqstringlist.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqheader.h>
 #include <tqevent.h>
@@ -57,7 +57,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name)
 
 //	connect(relation, TQT_SIGNAL(relationListUpdated(TQObject *)), this, TQT_SLOT(slotListUpdate(TQObject *)));
 
-	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
+	viewport()->setPaletteBackgroundColor(colorGroup().mid());
 	setFocusPolicy(TQ_WheelFocus);
 	setResizePolicy(Manual);
 /*MOVED TO KexiRelationDialog
@@ -94,7 +94,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name)
 	invalidateActions();
 #endif
 
-	tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, true);
+	setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, true);
 }
 
 KexiRelationView::~KexiRelationView()
@@ -146,13 +146,13 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect)
 	
 	addChild(c, 100,100);
 	if (rect.isValid()) {//predefined size
-		TQSize finalSize = c->size().expandedTo( c->tqsizeHint() );
+		TQSize finalSize = c->size().expandedTo( c->sizeHint() );
 		TQRect r = rect;
 		r.setSize( finalSize + TQSize(0,10) );
 		moveChild( c, rect.left(), rect.top() );
 		//we're doing this instead of setGeometry(rect)
 		//because the geomenty might be saved on other system with bigger fonts :)
-		c->resize(c->tqsizeHint());
+		c->resize(c->sizeHint());
 //		c->setGeometry(r);
 //TODO
 
@@ -164,7 +164,7 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect)
 	updateGeometry();
 	if (!rect.isValid()) {
 		c->updateGeometry();
-		c->resize(c->tqsizeHint());
+		c->resize(c->sizeHint());
 	}
 	int x, y;
 
@@ -584,9 +584,9 @@ void KexiRelationView::slotTableViewGotFocus()
 	emit tableViewGotFocus();
 }
 
-TQSize KexiRelationView::tqsizeHint() const
+TQSize KexiRelationView::sizeHint() const
 {
-	return TQSize(TQScrollView::tqsizeHint());//.width(), 600);
+	return TQSize(TQScrollView::sizeHint());//.width(), 600);
 }
 
 void KexiRelationView::clear()
diff --git a/kexi/widget/relations/kexirelationview.h b/kexi/widget/relations/kexirelationview.h
index 6bc31b31..33d988b9 100644
--- a/kexi/widget/relations/kexirelationview.h
+++ b/kexi/widget/relations/kexirelationview.h
@@ -78,7 +78,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView
 		TablesDict* tables() { return &m_tables; }
 
 		/*! Adds a table \a t to the area. This changes only visual representation.
-		 If \a rect is valid, table widget tqgeometry will be initialized.
+		 If \a rect is valid, table widget geometry will be initialized.
 		 \return added table container or 0 on failure.
 		 */
 		KexiRelationViewTableContainer* addTableContainer(KexiDB::TableSchema *t, 
@@ -96,7 +96,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView
 
 		inline KexiRelationViewTableContainer* focusedTableView() const { return m_focusedTableView; }
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 		const ConnectionList* connections() const { return &m_connectionViews; }
 
diff --git a/kexi/widget/relations/kexirelationviewconnection.cpp b/kexi/widget/relations/kexirelationviewconnection.cpp
index c0635c1b..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();
@@ -92,7 +92,7 @@ KexiRelationViewConnection::drawConnection(TQPainter *p)
 		pa.setPoint(0, rx - 4, ry - 3);
 		pa.setPoint(1, rx - 4, ry + 3);
 		pa.setPoint(2, rx - 1, ry);
-		p->tqdrawPolygon(pa, true);
+		p->drawPolygon(pa, true);
 		
 		//master side
 		p->drawLine(sx, sy - 1, sx + side1CharWidth -1, sy - 1);
@@ -134,7 +134,7 @@ KexiRelationViewConnection::drawConnection(TQPainter *p)
 		pa.setPoint(0, lx + 3, ry - 3);
 		pa.setPoint(1, lx + 3, ry + 3);
 		pa.setPoint(2, lx, ry);
-		p->tqdrawPolygon(pa, true);
+		p->drawPolygon(pa, true);
 		
 //		p->drawLine(lx, ry, lx + 8, ry);
 //		p->drawPoint(lx + 1, ry - 1);
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index 55440da4..5de32b91 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 
 #include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcursor.h>
@@ -61,18 +61,18 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer(
 	m_tableHeader = new KexiRelationViewTableContainerHeader(schema->name(), this);
 
 	m_tableHeader->unsetFocus();
-	m_tableHeader->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+	m_tableHeader->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
 	lyr->addWidget(m_tableHeader);
 	connect(m_tableHeader,TQT_SIGNAL(moved()),this,TQT_SLOT(moved()));
 	connect(m_tableHeader, TQT_SIGNAL(endDrag()), this, TQT_SIGNAL(endDrag()));
 
 	m_tableView = new KexiRelationViewTable(schema, parent, this, "KexiRelationViewTable");
 	//m_tableHeader->setFocusProxy( m_tableView );
-	m_tableView->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+	m_tableView->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
 	
-	m_tableView->setMaximumSize( m_tableView->tqsizeHint() );
+	m_tableView->setMaximumSize( m_tableView->sizeHint() );
 	
-//	m_tableView->resize( m_tableView->tqsizeHint() );
+//	m_tableView->resize( m_tableView->sizeHint() );
 	lyr->addWidget(m_tableView, 0);
 	connect(m_tableView, TQT_SIGNAL(tableScrolling()), this, TQT_SLOT(moved()));
 	connect(m_tableView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
@@ -110,13 +110,13 @@ int KexiRelationViewTableContainer::globalY(const TQString &field)
 }
 
 #if 0//js
-TQSize KexiRelationViewTableContainer::tqsizeHint()
+TQSize KexiRelationViewTableContainer::sizeHint()
 {
 #ifdef TQ_WS_WIN
-	TQSize s = m_tableView->tqsizeHint()
+	TQSize s = m_tableView->sizeHint()
 		+ TQSize(  2 * 5 , m_tableHeader->height() + 2 * 5 );
 #else
-	TQSize s = m_tableView->tqsizeHint();
+	TQSize s = m_tableView->sizeHint();
 	s.setWidth(s.width() + 4);
 	s.setHeight(m_tableHeader->height() + s.height());
 #endif
@@ -140,7 +140,7 @@ void KexiRelationViewTableContainer::setFocus()
 	m_tableView->setPalette(p);*/
 
 	raise();
-	tqrepaint();
+	repaint();
 	emit gotFocus();
 }
 
@@ -166,7 +166,7 @@ void KexiRelationViewTableContainer::unsetFocus()
 	m_tableView->setPalette(p);*/
 	
 	clearFocus();
-	tqrepaint();
+	repaint();
 }
 
 
@@ -307,7 +307,7 @@ KexiRelationViewTable::~KexiRelationViewTable()
 {
 }
 
-TQSize KexiRelationViewTable::tqsizeHint() const
+TQSize KexiRelationViewTable::sizeHint() const
 {
 	TQFontMetrics fm(fontMetrics());
 
@@ -341,7 +341,7 @@ KexiRelationViewTable::globalY(const TQString &item)
 	TQListViewItem *i = findItem(item, 0);
 	if (!i)
 		return -1;
-	int y = tqitemRect(i).y() + (tqitemRect(i).height() / 2);
+	int y = itemRect(i).y() + (itemRect(i).height() / 2);
 	if (contentsY() > itemPos(i))
 		y = 0;
 	else if (y == 0)
@@ -420,10 +420,10 @@ void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev)
 TQRect KexiRelationViewTable::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
 {
 	if (painter) {
-		tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, tqitemRect(item), tqcolorGroup(),
+		tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(),
 			TQStyle::Style_FocusAtBorder);
 	}
-	return tqitemRect(item);
+	return itemRect(item);
 }
 
 #include "kexirelationviewtable.moc"
diff --git a/kexi/widget/relations/kexirelationviewtable.h b/kexi/widget/relations/kexirelationviewtable.h
index 5c622dad..6578cdd5 100644
--- a/kexi/widget/relations/kexirelationviewtable.h
+++ b/kexi/widget/relations/kexirelationviewtable.h
@@ -105,7 +105,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTable : public KexiFieldListView
 //		KexiDB::TableSchema *table() const { return m_table; };
 		int globalY(const TQString &item);
 //		void setReadOnly(bool);
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 	signals:
 		void tableScrolling();
diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp
index 4b952163..0ff65f38 100644
--- a/kexi/widget/relations/kexirelationwidget.cpp
+++ b/kexi/widget/relations/kexirelationwidget.cpp
@@ -21,7 +21,7 @@
 
 #include "kexirelationwidget.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
 #include <tqtimer.h>
@@ -59,7 +59,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent,
 	m_tableCombo->setInsertionPolicy(TQComboBox::NoInsertion);
 	hlyr->addWidget(lbl);
 	hlyr->addWidget(m_tableCombo);
-	m_tableCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred));
+	m_tableCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred));
 	fillTablesCombo();
 
 	m_btnAdd = new KPushButton(i18n("&Add"), this);
@@ -302,9 +302,9 @@ void KexiRelationWidget::designSelectedTable()
 		Kexi::DesignViewMode, openingCancelled);
 }
 
-TQSize KexiRelationWidget::tqsizeHint() const
+TQSize KexiRelationWidget::sizeHint() const
 {
-	return m_relationView->tqsizeHint();
+	return m_relationView->sizeHint();
 }
 
 void KexiRelationWidget::slotTableHidden(KexiDB::TableSchema &table)
diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h
index 39ac549a..6899a434 100644
--- a/kexi/widget/relations/kexirelationwidget.h
+++ b/kexi/widget/relations/kexirelationwidget.h
@@ -60,7 +60,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase
 
 //		void openTable(KexiDB::TableSchema* table, bool designMode);
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 		/*! Used to add newly created object information to the combo box. */
 		void objectCreated(const TQCString &mime, const TQCString& name);
@@ -76,7 +76,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase
 	
 	public slots:
 		/*! Adds a table \a t to the area. This changes only visual representation.
-		 If \a rect is valid, table widget rtqgeometry will be initialized.
+		 If \a rect is valid, table widget rgeometry will be initialized.
 		 */
 		void addTable(KexiDB::TableSchema *t, const TQRect &rect = TQRect());
 
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index 7ad76c34..2700477a 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -25,8 +25,8 @@
 #include <tqdatastream.h>
 #include <tqfile.h>
 #include <tqpopupmenu.h>
-#include <tqtextedit.h>
-#include <tqlayout.h>
+#include <textedit.h>
+#include <layout.h>
 #include <tqstatusbar.h>
 #include <tqlabel.h>
 #include <tqpixmap.h>
@@ -34,7 +34,7 @@
 #include <tqpainter.h>
 #include <tqtooltip.h>
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqbuffer.h>
 
 #include <kdebug.h>
@@ -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 );
@@ -559,7 +559,7 @@ void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQ
 	s = TQMIN( h-3, s );
 	s = TQMIN( w-3, s );//avoid too large box
 	TQRect r( TQMAX( w/2 - s/2, 0 ) , h/2 - s/2 /*- 1*/, s, s);
-	p->setPen(TQPen(tqcolorGroup().text(), 1));
+	p->setPen(TQPen(colorGroup().text(), 1));
 	p->drawRect(r);
 	if (val.asBool()) {
 		p->drawLine(r.x(), r.y(), r.right(), r.bottom());
diff --git a/kexi/widget/tableview/kexibooltableedit.cpp b/kexi/widget/tableview/kexibooltableedit.cpp
index 8f199b5d..950d19b7 100644
--- a/kexi/widget/tableview/kexibooltableedit.cpp
+++ b/kexi/widget/tableview/kexibooltableedit.cpp
@@ -23,7 +23,7 @@
 
 #include <tqpainter.h>
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include <kglobal.h>
 #include <klocale.h>
@@ -105,7 +105,7 @@ void KexiBoolTableEdit::setupContents( TQPainter *p, bool focused, const TQVaria
 		s = TQMIN( h-3, s );
 		s = TQMIN( w-3, s );//avoid too large box
 		TQRect r( TQMAX( w/2 - s/2, 0 ) , h/2 - s/2 /*- 1*/, s, s);
-//already set ouotside:		p->setPen(TQPen(tqcolorGroup().text(), 1));
+//already set ouotside:		p->setPen(TQPen(colorGroup().text(), 1));
 		p->drawRect(r);
 		if (val.isNull()) { // && !field()->isNotNull()) {
 			p->drawText( r, TQt::AlignCenter, "?" );
@@ -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/kexicomboboxbase.cpp b/kexi/widget/tableview/kexicomboboxbase.cpp
index 89ba63cf..be2f81be 100644
--- a/kexi/widget/tableview/kexicomboboxbase.cpp
+++ b/kexi/widget/tableview/kexicomboboxbase.cpp
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstyle.h>
 #include <tqwindowsstyle.h>
 #include <tqpainter.h>
diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp
index 6a2feec8..5e74a20e 100644
--- a/kexi/widget/tableview/kexicomboboxpopup.cpp
+++ b/kexi/widget/tableview/kexicomboboxpopup.cpp
@@ -30,7 +30,7 @@
 
 #include <kdebug.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqevent.h>
 
 /*! @internal
@@ -56,8 +56,8 @@ class KexiComboBoxPopup_KexiTableView : public KexiDataTableView
 			a.rowHighlightingEnabled = true;
 			a.rowMouseOverHighlightingEnabled = true;
 			a.persistentSelections = false;
-			a.rowMouseOverHighlightingColor = tqcolorGroup().highlight();
-			a.rowMouseOverHighlightingTextColor = tqcolorGroup().highlightedText();
+			a.rowMouseOverHighlightingColor = colorGroup().highlight();
+			a.rowMouseOverHighlightingTextColor = colorGroup().highlightedText();
 			a.rowHighlightingTextColor = a.rowMouseOverHighlightingTextColor;
 			a.gridEnabled = false;
 			setAppearance(a);
@@ -68,7 +68,7 @@ class KexiComboBoxPopup_KexiTableView : public KexiDataTableView
 			setContextMenuEnabled( false );
 			setScrollbarToolTipsEnabled( false );
 			installEventFilter(this);
-			setBottomMarginInternal( - horizontalScrollBar()->tqsizeHint().height() );
+			setBottomMarginInternal( - horizontalScrollBar()->sizeHint().height() );
 		}
 		virtual void setData( KexiTableViewData *data, bool owner = true )
 			{ KexiTableView::setData( data, owner ); }
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp
index 3ae97974..24c4c38f 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.cpp
+++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp
@@ -18,12 +18,12 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstyle.h>
 #include <tqwindowsstyle.h>
 #include <tqpainter.h>
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include "kexicomboboxtableedit.h"
 #include <widget/utils/kexicomboboxdropdownbutton.h>
@@ -80,11 +80,11 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg
 //	m_lineedit->setFrameStyle( TQFrame::Plain | TQFrame::Box );
 //	m_lineedit->setLineWidth( 1 );
 //	if (f.isNumericType()) {
-//		m_lineedit->tqsetAlignment(AlignRight);
+//		m_lineedit->setAlignment(AlignRight);
 //	}
 //	setView( m_lineedit );
 
-//	tqlayout->addWidget(m_view);
+//	layout->addWidget(m_view);
 //	m_combo->setEditable( true );
 //	m_combo->clear();
 //	m_combo->insertStringList(f.enumHints());
@@ -350,8 +350,8 @@ bool KexiComboBoxTableEdit::eventFilter( TQObject *o, TQEvent *e )
 	if (!column()->isReadOnly() && e->type()==TQEvent::MouseButtonPress && m_scrollView) {
 		TQPoint gp = TQT_TQMOUSEEVENT(e)->globalPos() 
 			+ TQPoint(m_scrollView->childX(d->button), m_scrollView->childY(d->button));
-		TQRect r(d->button->mapToGlobal(d->button->tqgeometry().topLeft()), 
-			d->button->mapToGlobal(d->button->tqgeometry().bottomRight()));
+		TQRect r(d->button->mapToGlobal(d->button->geometry().topLeft()), 
+			d->button->mapToGlobal(d->button->geometry().bottomRight()));
 		if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(popup()) && popup()->isVisible() && r.contains( gp )) {
 			m_mouseBtnPressedWhenPopupVisible = true;
 		}
@@ -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/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp
index 79613d9d..ce0b7695 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.cpp
+++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp
@@ -84,7 +84,7 @@ KexiDataAwareObjectInterface::KexiDataAwareObjectInterface()
 	m_scrollBarTip->setPalette(TQToolTip::palette());
 	m_scrollBarTip->setMargin(2);
 	m_scrollBarTip->setIndent(0);
-	m_scrollBarTip->tqsetAlignment(TQt::AlignCenter);
+	m_scrollBarTip->setAlignment(TQt::AlignCenter);
 	m_scrollBarTip->setFrameStyle( TQFrame::Plain | TQFrame::Box );
 	m_scrollBarTip->setLineWidth(1);
 
@@ -539,8 +539,8 @@ void KexiDataAwareObjectInterface::setCursorPosition(int row, int col/*=-1*/, bo
 
 	if ( forceSet || m_curRow != newrow || m_curCol != newcol )
 	{
-		kexidbg << "setCursorPosition(): " <<TQString("old:%1,%2 new:%3,%4").tqarg(m_curCol)
-			.tqarg(m_curRow).tqarg(newcol).tqarg(newrow) << endl;
+		kexidbg << "setCursorPosition(): " <<TQString("old:%1,%2 new:%3,%4").arg(m_curCol)
+			.arg(m_curRow).arg(newcol).arg(newrow) << endl;
 		
 		// cursor moved: get rid of editor
 		if (m_editor) {
@@ -645,7 +645,7 @@ void KexiDataAwareObjectInterface::setCursorPosition(int row, int col/*=-1*/, bo
 			}
 			else {
 				kdDebug(44021) << TQString("NOW item at %1 (%2) is current")
-					.tqarg(m_curRow).tqarg((ulong)itemAt(m_curRow)) << endl;
+					.arg(m_curRow).arg((ulong)itemAt(m_curRow)) << endl;
 	//NOT EFFECTIVE!!!!!!!!!!!
 				//set item iterator
 				if (!newRowInserted && isInsertingEnabled() && m_currentItem == m_insertItem && m_curRow == (rows()-1)) {
@@ -838,7 +838,7 @@ bool KexiDataAwareObjectInterface::cancelRowEdit()
 //			viewport()->width(), d->rowHeight*3 + (m_navPanel ? m_navPanel->height() : 0)*3 );
 //		updateContents(); //js: above did not work well so we do that dirty
 		updateWidgetContents();
-//TODO: still doesn't tqrepaint properly!!
+//TODO: still doesn't repaint properly!!
 //		TQSize s(tableSize());
 //		resizeContents(s.width(), s.height());
 		updateWidgetContentsSize();
@@ -940,7 +940,7 @@ bool KexiDataAwareObjectInterface::acceptEditor()
 				if (!m_errorMessagePopup) {
 //					m_errorMessagePopup->close();
 					m_errorMessagePopup = new KexiArrowTip(
-						i18n("Error: %1").tqarg(m_editor->columnInfo()->field->typeName())+"?", 
+						i18n("Error: %1").arg(m_editor->columnInfo()->field->typeName())+"?", 
 						dynamic_cast<TQWidget*>(this));
 					m_errorMessagePopup->move( 
 						par->mapToGlobal(edit->pos()) + TQPoint(6, edit->height() + 0) );
@@ -954,8 +954,8 @@ bool KexiDataAwareObjectInterface::acceptEditor()
 			if (m_editor->field()->isNotNull() && !autoIncColumnCanBeOmitted) {
 				kdDebug() << "KexiDataAwareObjectInterface::acceptEditor(): NULL NOT ALLOWED!" << endl;
 				res = Validator::Error;
-//				msg = Validator::msgColumnNotEmpty().tqarg(m_editor->columnInfo()->field->captionOrName())
-				msg = Validator::msgColumnNotEmpty().tqarg(m_editor->field()->captionOrName())
+//				msg = Validator::msgColumnNotEmpty().arg(m_editor->columnInfo()->field->captionOrName())
+				msg = Validator::msgColumnNotEmpty().arg(m_editor->field()->captionOrName())
 					+ "\n\n" + Kexi::msgYouCanImproveData();
 				desc = i18n("The column's constraint is declared as NOT NULL.");
 				editCurrentCellAgain = true;
@@ -976,8 +976,8 @@ bool KexiDataAwareObjectInterface::acceptEditor()
 				if (m_editor->field()->isNotEmpty() && !autoIncColumnCanBeOmitted) {
 					kdDebug() << "KexiDataAwareObjectInterface::acceptEditor(): EMPTY NOT ALLOWED!" << endl;
 					res = Validator::Error;
-//					msg = Validator::msgColumnNotEmpty().tqarg(m_editor->columnInfo()->field->captionOrName())
-					msg = Validator::msgColumnNotEmpty().tqarg(m_editor->field()->captionOrName())
+//					msg = Validator::msgColumnNotEmpty().arg(m_editor->columnInfo()->field->captionOrName())
+					msg = Validator::msgColumnNotEmpty().arg(m_editor->field()->captionOrName())
 						+ "\n\n" + Kexi::msgYouCanImproveData();
 					desc = i18n("The column's constraint is declared as NOT EMPTY.");
 					editCurrentCellAgain = true;
@@ -994,8 +994,8 @@ bool KexiDataAwareObjectInterface::acceptEditor()
 				if (m_editor->field()->isNotNull() && !autoIncColumnCanBeOmitted) {
 					kdDebug() << "KexiDataAwareObjectInterface::acceptEditor(): NEITHER NULL NOR EMPTY VALUE CAN BE SET!" << endl;
 					res = Validator::Error;
-//					msg = Validator::msgColumnNotEmpty().tqarg(m_editor->columnInfo()->field->captionOrName())
-					msg = Validator::msgColumnNotEmpty().tqarg(m_editor->field()->captionOrName())
+//					msg = Validator::msgColumnNotEmpty().arg(m_editor->columnInfo()->field->captionOrName())
+					msg = Validator::msgColumnNotEmpty().arg(m_editor->field()->captionOrName())
 						+ "\n\n" + Kexi::msgYouCanImproveData();
 					desc = i18n("The column's constraint is declared as NOT EMPTY and NOT NULL.");
 					editCurrentCellAgain = true;
@@ -1251,7 +1251,7 @@ void KexiDataAwareObjectInterface::insertItem(KexiTableItem *newItem, int row)
 		m_curRow++;
 	}
 
-	m_data->insertRow(*newItem, row, true /*tqrepaint*/);
+	m_data->insertRow(*newItem, row, true /*repaint*/);
 
 	if (changeCurrentRow) {
 		//update iter...
@@ -1281,15 +1281,15 @@ void KexiDataAwareObjectInterface::insertItem(KexiTableItem *newItem, int row)
 	*/
 }
 
-void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem *item, bool tqrepaint)
+void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem *item, bool repaint)
 {
 	int row = m_data->findRef(item);
-	slotRowInserted( item, row, tqrepaint );
+	slotRowInserted( item, row, repaint );
 }
 
-void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem * /*item*/, uint row, bool tqrepaint)
+void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem * /*item*/, uint row, bool repaint)
 {
-	if (tqrepaint && (int)row<rows()) {
+	if (repaint && (int)row<rows()) {
 		updateWidgetContentsSize();
 
 /* updateAllVisibleRowsBelow() used instead
@@ -1317,7 +1317,7 @@ void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem * /*item*/, uin
 	}
 }
 
-tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool tqrepaint)
+tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool repaint)
 {
 	if (!hasData())
 		return true;
@@ -1331,7 +1331,7 @@ tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool tqrepaint)
 			tableName.append("\"");
 		}
 		if (KMessageBox::Cancel == KMessageBox::warningContinueCancel(dynamic_cast<TQWidget*>(this),
-				i18n("Do you want to clear the contents of table %1?").tqarg(tableName),
+				i18n("Do you want to clear the contents of table %1?").arg(tableName),
 				0, KGuiItem(i18n("&Clear Contents")) ))
 			return cancelled;
 	}
@@ -1339,10 +1339,10 @@ tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool tqrepaint)
 	cancelRowEdit();
 //	acceptRowEdit();
 //	m_verticalHeader->clear();
-	const bool repaintLater = tqrepaint && m_spreadSheetMode;
+	const bool repaintLater = repaint && m_spreadSheetMode;
 	const int oldRows = rows();
 
-	bool res = m_data->deleteAllRows(tqrepaint && !repaintLater);
+	bool res = m_data->deleteAllRows(repaint && !repaintLater);
 
 	if (res) {
 		if (m_spreadSheetMode) {
@@ -1359,21 +1359,21 @@ tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool tqrepaint)
 //	m_verticalHeader->setCurrentRow(-1);
 
 //	d->pUpdateTimer->start(1,true);
-//	if (tqrepaint)
-//		viewport()->tqrepaint();
+//	if (repaint)
+//		viewport()->repaint();
 	return res;
 }
 
-void KexiDataAwareObjectInterface::clearColumns(bool tqrepaint)
+void KexiDataAwareObjectInterface::clearColumns(bool repaint)
 {
 	cancelRowEdit();
 	m_data->clearInternal();
 
-	clearColumnsInternal(tqrepaint);
+	clearColumnsInternal(repaint);
 	updateIndicesForVisibleValues();
 
-	if (tqrepaint)
-//		viewport()->tqrepaint();
+	if (repaint)
+//		viewport()->repaint();
 //OK?
 		updateWidgetContents();
 
@@ -1393,7 +1393,7 @@ void KexiDataAwareObjectInterface::clearColumns(bool tqrepaint)
 
 	m_verticalHeader->setCurrentRow(-1);
 
-	viewport()->tqrepaint();
+	viewport()->repaint();
 
 //	d->pColumnTypes.resize(0);
 //	d->pColumnModes.resize(0);
@@ -1490,9 +1490,9 @@ void KexiDataAwareObjectInterface::setEmptyRowInsertingEnabled(bool set)
 }
 
 void KexiDataAwareObjectInterface::slotAboutToDeleteRow(KexiTableItem& item, 
-	KexiDB::ResultInfo* /*result*/, bool tqrepaint)
+	KexiDB::ResultInfo* /*result*/, bool repaint)
 {
-	if (tqrepaint) {
+	if (repaint) {
 		m_rowWillBeDeleted = m_data->findRef(&item);
 	}
 }
@@ -1534,7 +1534,7 @@ bool KexiDataAwareObjectInterface::deleteItem(KexiTableItem *item)/*, bool moveC
 	const bool lastRowDeleted = m_spreadSheetMode && m_data->last() == item; //we need to know this so we
 	                                                                         //can return to the last row 
 	                                                                         //after reinserting it
-	if (!m_data->deleteRow(*item, true /*tqrepaint*/)) {
+	if (!m_data->deleteRow(*item, true /*repaint*/)) {
 		/*const int button =*/ 
 		showErrorMessageForResult( m_data->result() );
 //		if (KMessageBox::No == button) {
@@ -1950,7 +1950,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c
 		if (firstCharacter != -1 && firstCharacter != 0) { //we're not at 0-th char
 			firstCharacter = -1;
 		}
-		else if (where.tqstartsWith(stringValue, caseSensitive)) {
+		else if (where.startsWith(stringValue, caseSensitive)) {
 			if (wholeWordsOnly) {
 				// If where.length() < stringValue.length(), true will be returned too - fine.
 				return !where.at( stringValue.length() ).isLetterOrNumber();
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.h b/kexi/widget/tableview/kexidataawareobjectiface.h
index 389c1c74..0fed82b6 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.h
+++ b/kexi/widget/tableview/kexidataawareobjectiface.h
@@ -267,14 +267,14 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
 		 Does not clear columns information.
 		 Does not destroy KexiTableViewData object (if present) but only clears its contents.
 		 Displays confirmation dialog if \a ask is true (the default is false).
-		 Repaints widget if \a tqrepaint is true (the default). 
+		 Repaints widget if \a repaint is true (the default). 
 		 For empty tables, true is returned immediately.
 		 If isDeleteEnabled() is false, false is returned.
 		 For spreadsheet mode all current rows are just replaced by empty rows.
 		 \return true on success, false on failure, and cancelled if user cancelled deletion 
 		 (only possible if \a ask is true).
 		 */
-		tristate deleteAllRows(bool ask = false, bool tqrepaint = true);
+		tristate deleteAllRows(bool ask = false, bool repaint = true);
 
 		/*! \return maximum number of rows that can be displayed per one "page" 
 		 for current view's size. */
@@ -537,12 +537,12 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
 		virtual void initDataContents();
 
 		/*! Clears columns information and thus all internal table data 
-		 and its visible representation. Repaints widget if \a tqrepaint is true. */
-		virtual void clearColumns(bool tqrepaint = true);
+		 and its visible representation. Repaints widget if \a repaint is true. */
+		virtual void clearColumns(bool repaint = true);
 
 		/*! Called by clearColumns() to clear internals of the object.
 		 For example, KexiTableView removes contents of it's horizontal header. */
-		virtual void clearColumnsInternal(bool tqrepaint) = 0;
+		virtual void clearColumnsInternal(bool repaint) = 0;
 
 		/*! @internal for implementation
 		 This should append another section within horizontal header or any sort of caption
@@ -654,16 +654,16 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
 
 		//! Handles KexiTableViewData::aboutToDeleteRow() signal. Prepares info for slotRowDeleted().
 		virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, 
-			bool tqrepaint);
+			bool repaint);
 
-		//! Handles KexiTableViewData::rowDeleted() signal to tqrepaint when needed.
+		//! Handles KexiTableViewData::rowDeleted() signal to repaint when needed.
 		virtual void slotRowDeleted();
 
-		//! Handles KexiTableViewData::rowInserted() signal to tqrepaint when needed.
-		virtual void slotRowInserted(KexiTableItem *item, bool tqrepaint);
+		//! Handles KexiTableViewData::rowInserted() signal to repaint when needed.
+		virtual void slotRowInserted(KexiTableItem *item, bool repaint);
 
 		//! Like above, not db-aware version
-		virtual void slotRowInserted(KexiTableItem *item, uint row, bool tqrepaint);
+		virtual void slotRowInserted(KexiTableItem *item, uint row, bool repaint);
 
 		virtual void slotRowsDeleted( const TQValueList<int> & ) {}
 
@@ -675,7 +675,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
 		virtual void selectCellInternal() {}
 
 		/*! Used in KexiDataAwareObjectInterface::slotRowDeleted() 
-		 to tqrepaint tow \a row and all visible below. 
+		 to repaint tow \a row and all visible below. 
 		 Implemented if there is more than one row displayed, i.e. currently for KexiTableView. */
 		virtual void updateAllVisibleRowsBelow(int row) { Q_UNUSED( row ); }
 
diff --git a/kexi/widget/tableview/kexidataawarepropertyset.cpp b/kexi/widget/tableview/kexidataawarepropertyset.cpp
index 257cf0aa..3b9fe3af 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.cpp
+++ b/kexi/widget/tableview/kexidataawarepropertyset.cpp
@@ -92,10 +92,10 @@ uint KexiDataAwarePropertySet::size() const
 	return m_sets.size();
 }
 
-void KexiDataAwarePropertySet::clear(uint tqminimumSize)
+void KexiDataAwarePropertySet::clear(uint minimumSize)
 {
 	m_sets.clear();
-	m_sets.resize(TQMAX(tqminimumSize, MAX_FIELDS));
+	m_sets.resize(TQMAX(minimumSize, MAX_FIELDS));
 	m_view->setDirty(true);
 	m_view->propertySetSwitched();
 }
@@ -206,7 +206,7 @@ void KexiDataAwarePropertySet::slotRowsDeleted( const TQValueList<int> &rows )
 }
 
 //void KexiDataAwarePropertySet::slotEmptyRowInserted(KexiTableItem*, uint /*index*/)
-void KexiDataAwarePropertySet::slotRowInserted(KexiTableItem*, uint row, bool /*tqrepaint*/)
+void KexiDataAwarePropertySet::slotRowInserted(KexiTableItem*, uint row, bool /*repaint*/)
 {
 	m_view->setDirty();
 
diff --git a/kexi/widget/tableview/kexidataawarepropertyset.h b/kexi/widget/tableview/kexidataawarepropertyset.h
index e24fbd8a..8db82ba2 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.h
+++ b/kexi/widget/tableview/kexidataawarepropertyset.h
@@ -97,7 +97,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public TQObject
 	public slots:
 		void removeCurrentPropertySet();
 
-		void clear(uint tqminimumSize = 0);
+		void clear(uint minimumSize = 0);
 
 		/*! Inserts \a set property set at \a row position.
 		 If there was a buffer at this position before, it will be destroyed.
@@ -127,7 +127,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public TQObject
 		void slotRowsDeleted( const TQValueList<int> &rows );
 
 		//! Called on \a row insertion in a tableview.
-		void slotRowInserted(KexiTableItem* item, uint row, bool tqrepaint);
+		void slotRowInserted(KexiTableItem* item, uint row, bool repaint);
 
 		//! Called on selecting another cell in a tableview.
 		void slotCellSelected(int, int row);
diff --git a/kexi/widget/tableview/kexidatetableedit.cpp b/kexi/widget/tableview/kexidatetableedit.cpp
index b68b4787..5a8cf297 100644
--- a/kexi/widget/tableview/kexidatetableedit.cpp
+++ b/kexi/widget/tableview/kexidatetableedit.cpp
@@ -25,16 +25,16 @@
 #include <tqpainter.h>
 #include <tqvariant.h>
 #include <tqrect.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqcolor.h>
 #include <tqfontmetrics.h>
 #include <tqdatetime.h>
 #include <tqcursor.h>
 #include <tqpoint.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtoolbutton.h>
 #include <tqdatetimeedit.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -163,7 +163,7 @@ void
 KexiDateTableEdit::slotDateChanged(TQDate date)
 {
 	m_edit->setDate(date);
-	tqrepaint();
+	repaint();
 }
 
 void
diff --git a/kexi/widget/tableview/kexidatetimetableedit.cpp b/kexi/widget/tableview/kexidatetimetableedit.cpp
index 35c599cc..7d33b354 100644
--- a/kexi/widget/tableview/kexidatetimetableedit.cpp
+++ b/kexi/widget/tableview/kexidatetimetableedit.cpp
@@ -25,16 +25,16 @@
 #include <tqpainter.h>
 #include <tqvariant.h>
 #include <tqrect.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqcolor.h>
 #include <tqfontmetrics.h>
 #include <tqdatetime.h>
 #include <tqcursor.h>
 #include <tqpoint.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtoolbutton.h>
 #include <tqdatetimeedit.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp
index 1b834fe9..d057f517 100644
--- a/kexi/widget/tableview/kexiinputtableedit.cpp
+++ b/kexi/widget/tableview/kexiinputtableedit.cpp
@@ -22,11 +22,11 @@
 
 #include <tqregexp.h>
 #include <tqevent.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 #include <tqpainter.h>
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqtooltip.h>
 
 #include <kglobal.h>
@@ -47,7 +47,7 @@ class MyLineEdit : public KLineEdit
 		{}
 	protected:
 		virtual void drawFrame ( TQPainter * p ) {
-			p->setPen( TQPen( tqcolorGroup().text() ) );
+			p->setPen( TQPen( colorGroup().text() ) );
 			TQRect r = rect();
 			p->moveTo( r.topLeft() );
 			p->lineTo( r.topRight() );
@@ -100,7 +100,7 @@ void KexiInputTableEdit::init()
 	m_lineedit = new MyLineEdit(this, "KexiInputTableEdit-KLineEdit");
 	setViewWidget(m_lineedit);
 	if (align_right)
-		m_lineedit->tqsetAlignment(AlignRight);
+		m_lineedit->setAlignment(AlignRight);
 //	m_cview->setFrame(false);
 //	m_cview->setFrameStyle( TQFrame::Plain | TQFrame::Box );
 //	m_cview->setLineWidth( 1 );
@@ -222,7 +222,7 @@ TQString KexiInputTableEdit::valueToText(KexiDB::Field* field, const TQVariant&
 void KexiInputTableEdit::paintEvent ( TQPaintEvent * /*e*/ )
 {
 	TQPainter p(this);
-	p.setPen( TQPen( tqcolorGroup().text() ) );
+	p.setPen( TQPen( colorGroup().text() ) );
 	p.drawRect( rect() );
 }
 
diff --git a/kexi/widget/tableview/kexitableedit.cpp b/kexi/widget/tableview/kexitableedit.cpp
index e531b814..68991f49 100644
--- a/kexi/widget/tableview/kexitableedit.cpp
+++ b/kexi/widget/tableview/kexitableedit.cpp
@@ -23,7 +23,7 @@
 #include <kexidb/field.h>
 #include <kexidb/utils.h>
 
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpainter.h>
 
 #include <kglobal.h>
@@ -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/kexitableitem.cpp b/kexi/widget/tableview/kexitableitem.cpp
index 659e341e..d398dabb 100644
--- a/kexi/widget/tableview/kexitableitem.cpp
+++ b/kexi/widget/tableview/kexitableitem.cpp
@@ -55,7 +55,7 @@ KexiTableItem::clearValues()
 void
 KexiTableItem::debug() const
 {
-	TQString s = TQString("KexiTableItem (%1 items)").tqarg(size());
+	TQString s = TQString("KexiTableItem (%1 items)").arg(size());
 	for (uint i = 0; i < size(); i++)
 		s.append( TQString::number(i)+":"+at(i).toString()+" " );
 	kexidbg << s << endl;
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 4ed993cd..eeb4e378 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -33,7 +33,7 @@
 #include <tqpopupmenu.h>
 #include <tqcursor.h>
 #include <tqstyle.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 
@@ -102,10 +102,10 @@ class KexiTableView::WhatsThis : public TQWhatsThis
 			const int leftMargin = m_tv->verticalHeaderVisible() ? m_tv->verticalHeader()->width() : 0;
 			//const int topMargin = m_tv->horizontalHeaderVisible() ? m_tv->d->pTopHeader->height() : 0;
 			//const int bottomMargin = m_tv->d->appearance.navigatorEnabled ? m_tv->m_navPanel->height() : 0;
-			if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->verticalHeader()), TQT_TQOBJECT(m_tv->tqchildAt(pos)))) {
+			if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->verticalHeader()), TQT_TQOBJECT(m_tv->childAt(pos)))) {
 				return i18n("Contains a pointer to the currently selected row");
 			}
-			else if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->m_navPanel), TQT_TQOBJECT(m_tv->tqchildAt(pos)))) {
+			else if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->m_navPanel), TQT_TQOBJECT(m_tv->childAt(pos)))) {
 				return i18n("Row navigator");
 //				return TQWhatsThis::textFor(m_tv->m_navPanel, TQPoint( pos.x(), pos.y() - m_tv->height() + bottomMargin ));
 			}
@@ -204,8 +204,8 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 	setBackgroundMode(TQt::PaletteBackground);
 //	setEmptyAreaColor(d->appearance.baseColor);//palette().active().color(TQColorGroup::Base));
 
-//	d->baseColor = tqcolorGroup().base();
-//	d->textColor = tqcolorGroup().text();
+//	d->baseColor = colorGroup().base();
+//	d->textColor = colorGroup().text();
 
 //	d->altColor = KGlobalSettings::alternateBackgroundColor();
 //	d->grayColor = TQColor(200,200,200);
@@ -240,21 +240,21 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 
 	// Create headers
 	m_horizontalHeader = new KexiTableViewHeader(this, "topHeader");
-	m_horizontalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() );
+	m_horizontalHeader->setSelectionBackgroundColor( palette().active().highlight() );
 	m_horizontalHeader->setOrientation(Qt::Horizontal);
 	m_horizontalHeader->setTracking(false);
 	m_horizontalHeader->setMovingEnabled(false);
 	connect(m_horizontalHeader, TQT_SIGNAL(sizeChange(int,int,int)), this, TQT_SLOT(slotTopHeaderSizeChange(int,int,int)));
 
 	m_verticalHeader = new KexiRecordMarker(this, "rm");
-	m_verticalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() );
+	m_verticalHeader->setSelectionBackgroundColor( palette().active().highlight() );
 	m_verticalHeader->setCellHeight(d->rowHeight);
 //	m_verticalHeader->setFixedWidth(d->rowHeight);
 	m_verticalHeader->setCurrentRow(-1);
 
 	setMargins(
-		TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight),
-		m_horizontalHeader->tqsizeHint().height(), 0, 0);
+		TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight),
+		m_horizontalHeader->sizeHint().height(), 0, 0);
 
 	setupNavigator();
 
@@ -288,7 +288,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 	
 //	horizontalScrollBar()->show();
 	updateScrollBars();
-//	resize(tqsizeHint());
+//	resize(sizeHint());
 //	updateContents();
 //	setMinimumHeight(horizontalScrollBar()->height() + d->rowHeight + topMargin());
 
@@ -333,7 +333,7 @@ void KexiTableView::setupNavigator()
 	
 	m_navPanel = new KexiRecordNavigator(this, leftMargin(), "navPanel");
 	m_navPanel->setRecordHandler(this);
-	m_navPanel->tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred);
+	m_navPanel->setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred);
 }
 
 void KexiTableView::initDataContents()
@@ -366,7 +366,7 @@ void KexiTableView::updateWidgetContentsSize()
 
 void KexiTableView::slotRowsDeleted( const TQValueList<int> &rows )
 {
-	viewport()->tqrepaint();
+	viewport()->repaint();
 	updateWidgetContentsSize();
 	setCursorPosition(TQMAX(0, (int)m_curRow - (int)rows.count()), -1, true);
 }
@@ -384,7 +384,7 @@ void KexiTableView::setFont( const TQFont &font )
 	updateFonts(true);
 }
 
-void KexiTableView::updateFonts(bool tqrepaint)
+void KexiTableView::updateFonts(bool repaint)
 {
 #ifdef TQ_WS_WIN
 	d->rowHeight = fontMetrics().lineSpacing() + 4;
@@ -399,15 +399,15 @@ void KexiTableView::updateFonts(bool tqrepaint)
 //	if(d->rowHeight < 22)
 //		d->rowHeight = 22;
 	setMargins(
-		TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight),
-		m_horizontalHeader->tqsizeHint().height(), 0, 0);
+		TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight),
+		m_horizontalHeader->sizeHint().height(), 0, 0);
 //	setMargins(14, d->rowHeight, 0, 0);
 	m_verticalHeader->setCellHeight(d->rowHeight);
 
 	KexiDisplayUtils::initDisplayForAutonumberSign(d->autonumberSignDisplayParameters, this);
 	KexiDisplayUtils::initDisplayForDefaultValue(d->defaultValueDisplayParameters, this);
 
-	if (tqrepaint)
+	if (repaint)
 		updateContents();
 }
 
@@ -425,7 +425,7 @@ void KexiTableView::updateAllVisibleRowsBelow(int row)
 		clipper()->width(), clipper()->height() - (rowPos(row) - contentsY()) );
 }
 
-void KexiTableView::clearColumnsInternal(bool /*tqrepaint*/)
+void KexiTableView::clearColumnsInternal(bool /*repaint*/)
 {
 	while(m_horizontalHeader->count()>0)
 		m_horizontalHeader->removeLabel(0);
@@ -494,29 +494,29 @@ TQSizePolicy KexiTableView::sizePolicy() const
 	return TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 }
 
-TQSize KexiTableView::tqsizeHint() const
+TQSize KexiTableView::sizeHint() const
 {
 	const TQSize &ts = tableSize();
-	int w = TQMAX( ts.width() + leftMargin()+ verticalScrollBar()->tqsizeHint().width() + 2*2, 
+	int w = TQMAX( ts.width() + leftMargin()+ verticalScrollBar()->sizeHint().width() + 2*2, 
 		(m_navPanel->isVisible() ? m_navPanel->width() : 0) );
-	int h = TQMAX( ts.height()+topMargin()+horizontalScrollBar()->tqsizeHint().height(), 
-		tqminimumSizeHint().height() );
+	int h = TQMAX( ts.height()+topMargin()+horizontalScrollBar()->sizeHint().height(), 
+		minimumSizeHint().height() );
 	w = TQMIN( w, tqApp->desktop()->width()*3/4 ); //stretch
 	h = TQMIN( h, tqApp->desktop()->height()*3/4 ); //stretch
 
-//	kexidbg << "KexiTableView::tqsizeHint()= " <<w <<", " <<h << endl;
+//	kexidbg << "KexiTableView::sizeHint()= " <<w <<", " <<h << endl;
 
 	return TQSize(w, h);
 		/*TQSize(
 		TQMAX( ts.width() + leftMargin() + 2*2, (m_navPanel ? m_navPanel->width() : 0) ),
 		//+ TQMIN(m_verticalHeader->width(),d->rowHeight) + margin()*2,
-		TQMAX( ts.height()+topMargin()+horizontalScrollBar()->tqsizeHint().height(), 
-			tqminimumSizeHint().height() )
+		TQMAX( ts.height()+topMargin()+horizontalScrollBar()->sizeHint().height(), 
+			minimumSizeHint().height() )
 	);*/
-//		TQMAX(ts.height() + topMargin(), tqminimumSizeHint().height()) );
+//		TQMAX(ts.height() + topMargin(), minimumSizeHint().height()) );
 }
 
-TQSize KexiTableView::tqminimumSizeHint() const
+TQSize KexiTableView::minimumSizeHint() const
 {
 	return TQSize(
 		leftMargin() + ((columns()>0)?columnWidth(0):KEXI_DEFAULT_DATA_COLUMN_WIDTH) + 2*2, 
@@ -614,7 +614,7 @@ void KexiTableView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch)
 	bool paintOnlyInsertRow = false;
 
 /*	kdDebug(44021) << TQString(" KexiTableView::drawContents(cx:%1 cy:%2 cw:%3 ch:%4)")
-			.tqarg(cx).tqarg(cy).tqarg(cw).tqarg(ch) << endl;*/
+			.arg(cx).arg(cy).arg(cw).arg(ch) << endl;*/
 
 	if (rowlast == -1) {
 		rowlast = rows() - 1;
@@ -658,7 +658,7 @@ void KexiTableView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch)
 	if(d->pBufferPm->isNull())
 		return;
 	TQPainter *pb = new TQPainter(d->pBufferPm, this);
-//	pb->fillRect(0, 0, cw, ch, tqcolorGroup().base());
+//	pb->fillRect(0, 0, cw, ch, colorGroup().base());
 
 //	int maxwc = TQMIN(cw, (columnPos(d->numCols - 1) + columnWidth(d->numCols - 1)));
 	int maxwc = columnPos(columns() - 1) + columnWidth(columns() - 1);
@@ -812,7 +812,7 @@ void KexiTableView::paintCell(TQPainter* p, KexiTableItem *item, int col, int ro
 		&& !dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted
 		&& usesSelectedTextColor)
 	{
-		defaultPen = TQPen(tqcolorGroup().highlightedText()); //selected text
+		defaultPen = TQPen(colorGroup().highlightedText()); //selected text
 	}
 	else if (d->appearance.rowHighlightingEnabled && row == m_curRow 
 		&& !dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted
@@ -849,7 +849,7 @@ void KexiTableView::paintCell(TQPainter* p, KexiTableItem *item, int col, int ro
 	if (m_currentItem == item && (col == m_curCol || d->appearance.fullRowSelection)) {
 		if (edit && ((d->appearance.rowHighlightingEnabled && !d->appearance.fullRowSelection) || (row == m_curRow && d->highlightedRow==-1 && d->appearance.fullRowSelection))) //!dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted)
 			edit->paintSelectionBackground( p, isEnabled(), txt, align, x, y_offset, w, h,
-				isEnabled() ? tqcolorGroup().highlight() : TQColor(200,200,200),//d->grayColor,
+				isEnabled() ? colorGroup().highlight() : TQColor(200,200,200),//d->grayColor,
 				p->fontMetrics(), columnReadOnly, d->appearance.fullRowSelection );
 	}
 
@@ -931,9 +931,9 @@ void KexiTableView::paintEmptyArea( TQPainter *p, int cx, int cy, int cw, int ch
 //	ts.setWidth( TQMIN( ts.width(), visibleWidth() ) );
 //	ts.setHeight( TQMIN( ts.height() - (m_navPanel ? m_navPanel->height() : 0), visibleHeight()) );
 /*	kdDebug(44021) << TQString(" (cx:%1 cy:%2 cw:%3 ch:%4)")
-			.tqarg(cx).tqarg(cy).tqarg(cw).tqarg(ch) << endl;
+			.arg(cx).arg(cy).arg(cw).arg(ch) << endl;
 	kdDebug(44021) << TQString(" (w:%3 h:%4)")
-			.tqarg(ts.width()).tqarg(ts.height()) << endl;*/
+			.arg(ts.width()).arg(ts.height()) << endl;*/
 	
 	// Region of the rect we should draw, calculated in viewport
 	// coordinates, as a region can't handle bigger coordinates
@@ -945,26 +945,26 @@ void KexiTableView::paintEmptyArea( TQPainter *p, int cx, int cy, int cw, int ch
 	// Subtract the table from it
 //	reg = reg.subtract( TQRect( TQPoint( 0, 0 ), ts-TQSize(0,m_navPanel->isVisible() ? m_navPanel->height() : 0) ) );
 	reg = reg.subtract( TQRect( TQPoint( 0, 0 ), ts
-		-TQSize(0,TQMAX((m_navPanel ? m_navPanel->height() : 0), horizontalScrollBar()->tqsizeHint().height())
-			- (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height()/2 : 0)
+		-TQSize(0,TQMAX((m_navPanel ? m_navPanel->height() : 0), horizontalScrollBar()->sizeHint().height())
+			- (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height()/2 : 0)
 			+ (horizontalScrollBar()->isVisible() ? 0 : 
 				d->internal_bottomMargin
-//	horizontalScrollBar()->tqsizeHint().height()/2
+//	horizontalScrollBar()->sizeHint().height()/2
 		)
-//- /*d->bottomMargin */ horizontalScrollBar()->tqsizeHint().height()*3/2
+//- /*d->bottomMargin */ horizontalScrollBar()->sizeHint().height()*3/2
 			+ contentsY()
-//			- (verticalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height()/2 : 0)
+//			- (verticalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height()/2 : 0)
 			)
 		) );
 //	reg = reg.subtract( TQRect( TQPoint( 0, 0 ), ts ) );
 
 	// And draw the rectangles (transformed inc contents coordinates as needed)
-	TQMemArray<TQRect> r = reg.tqrects();
+	TQMemArray<TQRect> r = reg.rects();
 	for ( int i = 0; i < (int)r.count(); i++ ) {
 		TQRect rect( viewportToContents2(r[i].topLeft()), r[i].size() );
 /*		kdDebug(44021) << TQString("- pEA: p->fillRect(x:%1 y:%2 w:%3 h:%4)")
-			.tqarg(rect.x()).tqarg(rect.y())
-			.tqarg(rect.width()).tqarg(rect.height()) << endl;*/
+			.arg(rect.x()).arg(rect.y())
+			.arg(rect.width()).arg(rect.height()) << endl;*/
 //		p->fillRect( TQRect(viewportToContents2(r[i].topLeft()),r[i].size()), d->emptyAreaColor );
 		p->fillRect( rect, d->appearance.emptyAreaColor );
 //		p->fillRect( TQRect(viewportToContents2(r[i].topLeft()),r[i].size()), viewport()->backgroundBrush() );
@@ -1261,7 +1261,7 @@ void KexiTableView::keyPressEvent(TQKeyEvent* e)
 
 	const int k = e->key();
 	const bool ro = isReadOnly();
-	TQWidget *w = tqfocusWidget();
+	TQWidget *w = focusWidget();
 //	if (!w || w!=viewport() && w!=this && (!m_editor || w!=m_editor->view() && w!=m_editor)) {
 //	if (!w || w!=viewport() && w!=this && (!m_editor || w!=m_editor->view())) {
 	if (!w || TQT_BASE_OBJECT(w)!=TQT_BASE_OBJECT(viewport()) && TQT_TQOBJECT(w)!=TQT_TQOBJECT(this) && (!m_editor || !KexiUtils::hasParent(TQT_TQOBJECT(dynamic_cast<TQT_BASE_OBJECT_NAME*>(m_editor)), TQT_TQOBJECT(w)))) {
@@ -1425,7 +1425,7 @@ void KexiTableView::keyPressEvent(TQKeyEvent* e)
 			else {
 				kexidbg << "KexiTableView::KeyPressEvent(): default" << endl;
 				if (e->text().isEmpty() || !e->text().isEmpty() && !e->text()[0].isPrint() ) {
-					kdDebug(44021) << "NOT PRINTABLE: 0x0" << TQString("%1").tqarg(k,0,16) <<endl;
+					kdDebug(44021) << "NOT PRINTABLE: 0x0" << TQString("%1").arg(k,0,16) <<endl;
 	//				e->ignore();
 					TQScrollView::keyPressEvent(e);
 					return;
@@ -1450,7 +1450,7 @@ void KexiTableView::keyPressEvent(TQKeyEvent* e)
 
 	m_vScrollBarValueChanged_enabled=false;
 
-	// if focus cell changes, tqrepaint
+	// if focus cell changes, repaint
 	setCursorPosition(curRow, curCol);
 
 	m_vScrollBarValueChanged_enabled=true;
@@ -1630,29 +1630,29 @@ void KexiTableView::resizeEvent(TQResizeEvent *e)
 		slotUpdate();
 		triggerUpdate();
 	}
-//	d->pTopHeader->tqrepaint();
+//	d->pTopHeader->repaint();
 
 
 /*		m_navPanel->setGeometry(
 			frameWidth(),
 			viewport()->height() +d->pTopHeader->height() 
-			-(horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->tqsizeHint().height())
+			-(horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->sizeHint().height())
 			+frameWidth(),
-			m_navPanel->tqsizeHint().width(), // - verticalScrollBar()->tqsizeHint().width() - horizontalScrollBar()->tqsizeHint().width(),
-			horizontalScrollBar()->tqsizeHint().height()
+			m_navPanel->sizeHint().width(), // - verticalScrollBar()->sizeHint().width() - horizontalScrollBar()->sizeHint().width(),
+			horizontalScrollBar()->sizeHint().height()
 		);*/
 //		updateContents();
 //		m_navPanel->setGeometry(1,horizontalScrollBar()->pos().y(),
 	//		m_navPanel->width(), horizontalScrollBar()->height());
 //	updateContents(0,0,2000,2000);//js
-//	erase(); tqrepaint();
+//	erase(); repaint();
 }
 
 void KexiTableView::viewportResizeEvent( TQResizeEvent *e )
 {
 	TQScrollView::viewportResizeEvent( e );
 	updateGeometries();
-//	erase(); tqrepaint();
+//	erase(); repaint();
 }
 
 void KexiTableView::showEvent(TQShowEvent *e)
@@ -1818,7 +1818,7 @@ void KexiTableView::slotColumnWidthChanged( int, int, int )
 	else {
 	//	updateContents( columnPos(col), 0, contentsWidth(), contentsHeight() );
 		updateContents(contentsX(), 0, viewport()->width(), contentsHeight());
-	//	viewport()->tqrepaint();
+	//	viewport()->repaint();
 	}
 
 //	updateContents(0, 0, d->pBufferPm->width(), d->pBufferPm->height());
@@ -1923,42 +1923,42 @@ TQSize KexiTableView::tableSize() const
 	if ((rows()+ (isInsertingEnabled()?1:0) ) > 0 && columns() > 0) {
 /*		kexidbg << "tableSize()= " << columnPos( columns() - 1 ) + columnWidth( columns() - 1 ) 
 			<< ", " << rowPos( rows()-1+(isInsertingEnabled()?1:0)) + d->rowHeight
-//			+ TQMAX(m_navPanel ? m_navPanel->height() : 0, horizontalScrollBar()->tqsizeHint().height())
-			+ (m_navPanel->isVisible() ? TQMAX( m_navPanel->height(), horizontalScrollBar()->tqsizeHint().height() ) :0 )
+//			+ TQMAX(m_navPanel ? m_navPanel->height() : 0, horizontalScrollBar()->sizeHint().height())
+			+ (m_navPanel->isVisible() ? TQMAX( m_navPanel->height(), horizontalScrollBar()->sizeHint().height() ) :0 )
 			+ margin() << endl;
 */
 //		kexidbg<< m_navPanel->isVisible() <<" "<<m_navPanel->height()<<" "
-//		<<horizontalScrollBar()->tqsizeHint().height()<<" "<<rowPos( rows()-1+(isInsertingEnabled()?1:0))<<endl;
+//		<<horizontalScrollBar()->sizeHint().height()<<" "<<rowPos( rows()-1+(isInsertingEnabled()?1:0))<<endl;
 
-		//int xx = horizontalScrollBar()->tqsizeHint().height()/2;
+		//int xx = horizontalScrollBar()->sizeHint().height()/2;
 
 		TQSize s( 
 			columnPos( columns() - 1 ) + columnWidth( columns() - 1 ),
-//			+ verticalScrollBar()->tqsizeHint().width(),
+//			+ verticalScrollBar()->sizeHint().width(),
 			rowPos( rows()-1+(isInsertingEnabled()?1:0) ) + d->rowHeight
-			+ (horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->tqsizeHint().height())
+			+ (horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->sizeHint().height())
 			+ d->internal_bottomMargin
-//				horizontalScrollBar()->tqsizeHint().height()/2
-//			- /*d->bottomMargin */ horizontalScrollBar()->tqsizeHint().height()*3/2
+//				horizontalScrollBar()->sizeHint().height()/2
+//			- /*d->bottomMargin */ horizontalScrollBar()->sizeHint().height()*3/2
 
 //			+ ( (m_navPanel && m_navPanel->isVisible() && verticalScrollBar()->isVisible()
 	//			&& !horizontalScrollBar()->isVisible()) 
-		//		? horizontalScrollBar()->tqsizeHint().height() : 0)
+		//		? horizontalScrollBar()->sizeHint().height() : 0)
 
 //			+ TQMAX( (m_navPanel && m_navPanel->isVisible()) ? m_navPanel->height() : 0, 
-//				horizontalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height() : 0)
+//				horizontalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height() : 0)
 
 //			+ (m_navPanel->isVisible() 
-//				? TQMAX( m_navPanel->height(), horizontalScrollBar()->tqsizeHint().height() ) :0 )
+//				? TQMAX( m_navPanel->height(), horizontalScrollBar()->sizeHint().height() ) :0 )
 
-//			- (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height() :0 )
+//			- (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height() :0 )
 			+ margin() 
 //-2*d->rowHeight
 		);
 
 //		kexidbg << rows()-1 <<" "<< (isInsertingEnabled()?1:0) <<" "<< (m_rowEditing?1:0) << " " <<  s << endl;
 		return s;
-//			+horizontalScrollBar()->tqsizeHint().height() + margin() );
+//			+horizontalScrollBar()->sizeHint().height() + margin() );
 	}
 	return TQSize(0,0);
 }
@@ -2271,13 +2271,13 @@ void KexiTableView::setVerticalHeaderVisible(bool set)
 	int left_width;
 	if (set) {
 		m_verticalHeader->show();
-		left_width = TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight);
+		left_width = TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight);
 	}
 	else {
 		m_verticalHeader->hide();
 		left_width = 0;
 	}
-	setMargins( left_width, horizontalHeaderVisible() ? m_horizontalHeader->tqsizeHint().height() : 0, 0, 0);
+	setMargins( left_width, horizontalHeaderVisible() ? m_horizontalHeader->sizeHint().height() : 0, 0, 0);
 }
 
 bool KexiTableView::horizontalHeaderVisible() const
@@ -2291,7 +2291,7 @@ void KexiTableView::setHorizontalHeaderVisible(bool set)
 	d->horizontalHeaderVisible = set; //needed because isVisible() is not always accurate
 	if (set) {
 		m_horizontalHeader->show();
-		top_height = m_horizontalHeader->tqsizeHint().height();
+		top_height = m_horizontalHeader->sizeHint().height();
 	}
 	else {
 		m_horizontalHeader->hide();
@@ -2478,10 +2478,10 @@ bool KexiTableView::eventFilter( TQObject *o, TQEvent *e )
 	}
 /*	else if (e->type()==TQEvent::FocusOut && o->inherits(TQWIDGET_OBJECT_NAME_STRING)) {
 		//hp==true if currently focused widget is a child of this table view
-		const bool hp = KexiUtils::hasParent( static_cast<TQWidget*>(o), tqfocusWidget());
+		const bool hp = KexiUtils::hasParent( static_cast<TQWidget*>(o), focusWidget());
 		if (!hp && KexiUtils::hasParent( this, static_cast<TQWidget*>(o))) {
 			//accept row editing if focus is moved to foreign widget 
-			//(not a child, like eg. editor) from one of our table view's tqchildren
+			//(not a child, like eg. editor) from one of our table view's children
 			//or from table view itself
 			if (!acceptRowEdit()) {
 				static_cast<TQWidget*>(o)->setFocus();
@@ -2508,9 +2508,9 @@ void KexiTableView::paletteChange( const TQPalette &oldPalette )
 	Q_UNUSED(oldPalette);
 	//update:
 	if (m_verticalHeader)
-		m_verticalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() );
+		m_verticalHeader->setSelectionBackgroundColor( palette().active().highlight() );
 	if (m_horizontalHeader)
-		m_horizontalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() );
+		m_horizontalHeader->setSelectionBackgroundColor( palette().active().highlight() );
 }
 
 const KexiTableView::Appearance& KexiTableView::appearance() const
@@ -2531,8 +2531,8 @@ void KexiTableView::setAppearance(const Appearance& a)
 		m_verticalHeader->setCellHeight(d->rowHeight);
 	if (m_horizontalHeader) {
 		setMargins(
-			TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight),
-			m_horizontalHeader->tqsizeHint().height(), 0, 0);
+			TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight),
+			m_horizontalHeader->sizeHint().height(), 0, 0);
 	}
 //	}
 	if (a.rowHighlightingEnabled)
diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h
index 9cfcf47e..b602168a 100644
--- a/kexi/widget/tableview/kexitableview.h
+++ b/kexi/widget/tableview/kexitableview.h
@@ -223,8 +223,8 @@ public:
 
 	// reimplemented for internal reasons
 	virtual TQSizePolicy sizePolicy() const;
-	virtual TQSize tqsizeHint() const;
-	virtual TQSize tqminimumSizeHint() const;
+	virtual TQSize sizeHint() const;
+	virtual TQSize minimumSizeHint() const;
 
 	/*! Reimplemented to update cached fonts and row sizes for the painter. */
 	void setFont(const TQFont &f);
@@ -263,7 +263,7 @@ public slots:
 	virtual void setData( KexiTableViewData *data, bool owner = true )
 		{ KexiDataAwareObjectInterface::setData( data, owner ); }
 
-	virtual void clearColumnsInternal(bool tqrepaint);
+	virtual void clearColumnsInternal(bool repaint);
 
 	/*! Adjusts \a colNum column's width to its (current) contents. 
 	 If \a colNum == -1, all columns' width is adjusted. */
@@ -432,19 +432,19 @@ protected slots:
 	virtual void slotRowRepaintRequested(KexiTableItem& item);
 
 	//! Handles KexiTableViewData::aboutToDeleteRow() signal. Prepares info for slotRowDeleted().
-	virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint)
-	{ KexiDataAwareObjectInterface::slotAboutToDeleteRow(item, result, tqrepaint); }
+	virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint)
+	{ KexiDataAwareObjectInterface::slotAboutToDeleteRow(item, result, repaint); }
 
-	//! Handles KexiTableViewData::rowDeleted() signal to tqrepaint when needed.
+	//! Handles KexiTableViewData::rowDeleted() signal to repaint when needed.
 	virtual void slotRowDeleted() { KexiDataAwareObjectInterface::slotRowDeleted(); }
 
-	//! Handles KexiTableViewData::rowInserted() signal to tqrepaint when needed.
-	virtual void slotRowInserted(KexiTableItem *item, bool tqrepaint)
-	{ KexiDataAwareObjectInterface::slotRowInserted(item, tqrepaint); }
+	//! Handles KexiTableViewData::rowInserted() signal to repaint when needed.
+	virtual void slotRowInserted(KexiTableItem *item, bool repaint)
+	{ KexiDataAwareObjectInterface::slotRowInserted(item, repaint); }
 
 	//! Like above, not db-aware version
-	virtual void slotRowInserted(KexiTableItem *item, uint row, bool tqrepaint)
-	{ KexiDataAwareObjectInterface::slotRowInserted(item, row, tqrepaint); }
+	virtual void slotRowInserted(KexiTableItem *item, uint row, bool repaint)
+	{ KexiDataAwareObjectInterface::slotRowInserted(item, row, repaint); }
 
 	/*! Handles verticalScrollBar()'s valueChanged(int) signal. 
 	 Called when vscrollbar's value has been changed. */
@@ -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);
@@ -588,7 +588,7 @@ protected:
 	virtual void removeEditor();
 
 	//! Internal: updated sched fonts for painting.
-	void updateFonts(bool tqrepaint = false);
+	void updateFonts(bool repaint = false);
 
 	/*! @internal Changes bottom margin settings, in pixels. 
 	 At this time, it's used by KexiComboBoxPopup to decrease margin for popup's table. */
@@ -614,7 +614,7 @@ protected:
 	virtual void paste();
 
 	/*! Used in KexiDataAwareObjectInterface::slotRowDeleted() 
-	 to tqrepaint tow \a row and all visible below. */
+	 to repaint tow \a row and all visible below. */
 	virtual void updateAllVisibleRowsBelow(int row);
 
 	void updateAfterCancelRowEdit();
@@ -626,7 +626,7 @@ protected:
 	bool getVisibleLookupValue(TQVariant& cellValue, KexiTableEdit *edit, 
 		KexiTableItem *item, KexiTableViewColumn *tvcol) const;
 
-//	//! Called to tqrepaint contents after a row is deleted.
+//	//! Called to repaint contents after a row is deleted.
 //	void repaintAfterDelete();
 
 	KexiTableViewPrivate *d;
diff --git a/kexi/widget/tableview/kexitableview_p.cpp b/kexi/widget/tableview/kexitableview_p.cpp
index d5e1641a..983378cb 100644
--- a/kexi/widget/tableview/kexitableview_p.cpp
+++ b/kexi/widget/tableview/kexitableview_p.cpp
@@ -48,7 +48,7 @@ KexiTableViewPrivate::KexiTableViewPrivate(KexiTableView* t)
 //moved	scrollBarTipTimerCnt = 0;
 //moved	scrollBarTip = 0;
 	ensureCellVisibleOnShow = TQPoint(-1,-1);
-	internal_bottomMargin = tv->horizontalScrollBar()->tqsizeHint().height()/2;
+	internal_bottomMargin = tv->horizontalScrollBar()->sizeHint().height()/2;
 	highlightedRow = -1;
 	moveCursorOnMouseRelease = false;
 	horizontalHeaderVisible = true;
diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp
index 5905706b..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);
 	}
@@ -635,7 +635,7 @@ bool KexiTableViewData::updateRowEditBufferRef(KexiTableItem *item,
 	}
 
 //! @todo if there're multiple views for this data, we need multiple buffers!
-bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool tqrepaint)
+bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool repaint)
 {
 	if (!m_pRowEditBuffer)
 		return true; //nothing to do
@@ -655,7 +655,7 @@ bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool tqrepaint
 			if (val->isNull() && !f->isAutoIncrement()) {
 				//NOT NULL violated
 				m_result.msg = i18n("\"%1\" column requires a value to be entered.")
-					.tqarg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData();
+					.arg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData();
 				m_result.desc = i18n("The column's constraint is declared as NOT NULL.");
 				m_result.column = col;
 				return false;
@@ -666,7 +666,7 @@ bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool tqrepaint
 			if (!f->isAutoIncrement() && (val->isNull() || KexiDB::isEmptyValue( f, *val ))) {
 				//NOT EMPTY violated
 				m_result.msg = i18n("\"%1\" column requires a value to be entered.")
-					.tqarg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData();
+					.arg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData();
 				m_result.desc = i18n("The column's constraint is declared as NOT EMPTY.");
 				m_result.column = col;
 				return false;
@@ -721,12 +721,12 @@ js: TODO: use KexiMainWindowImpl::showErrorMessage(const TQString &title, KexiDB
 	
 	m_pRowEditBuffer->clear();
 
-	if (tqrepaint)
+	if (repaint)
 		emit rowRepaintRequested(item);
 	return true;
 }
 
-bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool tqrepaint)
+bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool repaint)
 {
 	kdDebug() << "KexiTableViewData::saveRowChanges()..." << endl;
 	m_result.clear();
@@ -734,32 +734,32 @@ bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool tqrepaint)
 	if (!m_result.success)
 		return false;
 
-	if (saveRow(item, false /*update*/, tqrepaint)) {
+	if (saveRow(item, false /*update*/, repaint)) {
 		emit rowUpdated(&item);
 		return true;
 	}
 	return false;
 }
 
-bool KexiTableViewData::saveNewRow(KexiTableItem& item, bool tqrepaint)
+bool KexiTableViewData::saveNewRow(KexiTableItem& item, bool repaint)
 {
 	kdDebug() << "KexiTableViewData::saveNewRow()..." << endl;
 	m_result.clear();
-	emit aboutToInsertRow(&item, &m_result, tqrepaint);
+	emit aboutToInsertRow(&item, &m_result, repaint);
 	if (!m_result.success)
 		return false;
 	
-	if (saveRow(item, true /*insert*/, tqrepaint)) {
-		emit rowInserted(&item, tqrepaint);
+	if (saveRow(item, true /*insert*/, repaint)) {
+		emit rowInserted(&item, repaint);
 		return true;
 	}
 	return false;
 }
 
-bool KexiTableViewData::deleteRow(KexiTableItem& item, bool tqrepaint)
+bool KexiTableViewData::deleteRow(KexiTableItem& item, bool repaint)
 {
 	m_result.clear();
-	emit aboutToDeleteRow(item, &m_result, tqrepaint);
+	emit aboutToDeleteRow(item, &m_result, repaint);
 	if (!m_result.success)
 		return false;
 
@@ -784,9 +784,9 @@ bool KexiTableViewData::deleteRow(KexiTableItem& item, bool tqrepaint)
 	return true;
 }
 
-void KexiTableViewData::deleteRows( const TQValueList<int> &rowsToDelete, bool tqrepaint )
+void KexiTableViewData::deleteRows( const TQValueList<int> &rowsToDelete, bool repaint )
 {
-	Q_UNUSED( tqrepaint );
+	Q_UNUSED( repaint );
 
 	if (rowsToDelete.isEmpty())
 		return;
@@ -804,11 +804,11 @@ void KexiTableViewData::deleteRows( const TQValueList<int> &rowsToDelete, bool t
 	emit rowsDeleted( rowsToDelete );
 }
 
-void KexiTableViewData::insertRow(KexiTableItem& item, uint index, bool tqrepaint)
+void KexiTableViewData::insertRow(KexiTableItem& item, uint index, bool repaint)
 {
 	if (!insert( index = TQMIN(index, count()), &item ))
 		return;
-	emit rowInserted(&item, index, tqrepaint);
+	emit rowInserted(&item, index, repaint);
 }
 
 void KexiTableViewData::clearInternal()
@@ -822,12 +822,12 @@ void KexiTableViewData::clearInternal()
 		removeLast();
 #ifndef KEXI_NO_PROCESS_EVENTS
 		if (i % 1000 == 0)
-			tqApp->tqprocessEvents( 1 );
+			tqApp->processEvents( 1 );
 #endif
 	}
 }
 
-bool KexiTableViewData::deleteAllRows(bool tqrepaint)
+bool KexiTableViewData::deleteAllRows(bool repaint)
 {
 	clearInternal();
 
@@ -837,7 +837,7 @@ bool KexiTableViewData::deleteAllRows(bool tqrepaint)
 		res = m_cursor->deleteAllRows();
 	}
 
-	if (tqrepaint)
+	if (repaint)
 		emit reloadRequested();
 	return res;
 }
@@ -873,7 +873,7 @@ void KexiTableViewData::preloadAllRows()
 		m_cursor->moveNext();
 #ifndef KEXI_NO_PROCESS_EVENTS
 		if ((i % 1000) == 0)
-			tqApp->tqprocessEvents( 1 );
+			tqApp->processEvents( 1 );
 #endif
 	}
 }
diff --git a/kexi/widget/tableview/kexitableviewdata.h b/kexi/widget/tableview/kexitableviewdata.h
index 7263f3fe..eb3d20df 100644
--- a/kexi/widget/tableview/kexitableviewdata.h
+++ b/kexi/widget/tableview/kexitableviewdata.h
@@ -359,27 +359,27 @@ public:
 	/*! \return last operation's result information (always not null). */
 	inline KexiDB::ResultInfo* result() { return &m_result; }
 
-	bool saveRowChanges(KexiTableItem& item, bool tqrepaint = false);
+	bool saveRowChanges(KexiTableItem& item, bool repaint = false);
 
-	bool saveNewRow(KexiTableItem& item, bool tqrepaint = false);
+	bool saveNewRow(KexiTableItem& item, bool repaint = false);
 
-	bool deleteRow(KexiTableItem& item, bool tqrepaint = false);
+	bool deleteRow(KexiTableItem& item, bool repaint = false);
 
 	/*! Deletes rows (by number) passed with \a rowsToDelete. 
 	 Currently, this method is only for non data-aware tables. */
-	void deleteRows( const TQValueList<int> &rowsToDelete, bool tqrepaint = false );
+	void deleteRows( const TQValueList<int> &rowsToDelete, bool repaint = false );
 
 	/*! Deletes all rows. Works either for db-aware and non db-aware tables.
 	 Column's definition is not changed.
 	 For db-aware version, all rows are removed from a database.
 	 Row-edit buffer is cleared.
 
-	 If \a tqrepaint is true, reloadRequested() signal 
+	 If \a repaint is true, reloadRequested() signal 
 	 is emitted after deleting (if at least one row was deleted), 
-	 so presenters can tqrepaint their contents. 
+	 so presenters can repaint their contents. 
 
 	 \return true on success. */
-	virtual bool deleteAllRows(bool tqrepaint = false);
+	virtual bool deleteAllRows(bool repaint = false);
 
 	/*! @internal method, used mostly by specialized classes like KexiTableView.
 	 Clears internal row structures. Row-edit buffer is cleared. 
@@ -390,7 +390,7 @@ public:
 	/*! Inserts new \a item at index \a index. 
 	 \a item will be owned by this data object.
 	 Note: Reasonable only for not not-db-aware version. */
-	void insertRow(KexiTableItem& item, uint index, bool tqrepaint = false);
+	void insertRow(KexiTableItem& item, uint index, bool repaint = false);
 
 /*TODO: add this as well? 
 	void insertRow(KexiTableItem& item, KexiTableItem& aboveItem); */
@@ -445,7 +445,7 @@ signals:
 	/*! Emited before inserting of a new, current row.
 	 Connect this signal to your slot and set \a result->success to false 
 	 to disallow this inserting. You can also change columns in \a item row. */
-	void aboutToInsertRow(KexiTableItem *item, KexiDB::ResultInfo* result, bool tqrepaint);
+	void aboutToInsertRow(KexiTableItem *item, KexiDB::ResultInfo* result, bool repaint);
 
 	/*! Emited before changing of an edited, current row.
 	 Connect this signal to your slot and set \a result->success to false 
@@ -455,15 +455,15 @@ signals:
 
 	void rowUpdated(KexiTableItem*); //!< Current row has been updated
 
-	void rowInserted(KexiTableItem*, bool tqrepaint); //!< A row has been inserted
+	void rowInserted(KexiTableItem*, bool repaint); //!< A row has been inserted
 
 	//! A row has been inserted at \a index position (not db-aware data only)
-	void rowInserted(KexiTableItem*, uint index, bool tqrepaint);
+	void rowInserted(KexiTableItem*, uint index, bool repaint);
 
 	/*! Emited before deleting of a current row.
 	 Connect this signal to your slot and set \a result->success to false 
 	 to disallow this deleting. */
-	void aboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint);
+	void aboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint);
 
 	//! Current row has been deleted
 	void rowDeleted(); 
@@ -497,7 +497,7 @@ protected:
 	int cmpBLOB(Item item1, Item item2);
 
 	//! internal: for saveRowChanges() and saveNewRow()
-	bool saveRow(KexiTableItem& item, bool insert, bool tqrepaint);
+	bool saveRow(KexiTableItem& item, bool insert, bool repaint);
 
 	//! (logical) sorted column number, set by setSorting()
 	//! can differ from m_realSortedColumn if there's lookup column used
diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp
index 4a00be38..ef4c83da 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() {}
 
@@ -61,7 +61,7 @@ class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy
 KexiTableViewHeader::KexiTableViewHeader(TQWidget * parent, const char * name) 
 	: TQHeader(parent, name)
 	, m_lastToolTipSection(-1)
-	, m_selectionBackgroundColor(tqApp->tqpalette().active().highlight())
+	, m_selectionBackgroundColor(tqApp->palette().active().highlight())
 	, m_selectedSection(-1)
 	, 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().tqpixelMetric( TQStyle::PM_HeaderMargin );
+				int minWidth = fm.width( label( section ) ) + tqstyle().pixelMetric( TQStyle::PM_HeaderMargin );
 				TQIconSet *iset = iconSet( section );
 				if (iset)
 					minWidth += (2+iset->pixmap( TQIconSet::Small, TQIconSet::Normal ).width()); //taken from TQHeader::sectionSizeHint()
@@ -188,14 +188,14 @@ void KexiTableViewHeader::paintSection( TQPainter * p, int index, const TQRect &
 	if (paintSelection) {
 		static_cast<KexiTableViewHeaderStyle&>(tqstyle()).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());
+			palette().active().background());
 	}
 }
 
diff --git a/kexi/widget/tableview/kexitimetableedit.cpp b/kexi/widget/tableview/kexitimetableedit.cpp
index 8110716b..6035aed5 100644
--- a/kexi/widget/tableview/kexitimetableedit.cpp
+++ b/kexi/widget/tableview/kexitimetableedit.cpp
@@ -23,16 +23,16 @@
 #include <tqpainter.h>
 #include <tqvariant.h>
 #include <tqrect.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqcolor.h>
 #include <tqfontmetrics.h>
 #include <tqdatetime.h>
 #include <tqcursor.h>
 #include <tqpoint.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtoolbutton.h>
 #include <tqdatetimeedit.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include <kdebug.h>
 #include <klocale.h>
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 777fea1b..60f99f85 100644
--- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
+++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
@@ -53,18 +53,18 @@ void KexiComboBoxDropDownButton::drawButton(TQPainter *p)
 
 	TQRect r = rect();
 	r.setHeight(r.height()+m_fixForHeight);
-	if (m_tqdrawComplexControl) {
+	if (m_drawComplexControl) {
 		if (m_fixForHeight>0 && m_paintedCombo->size()!=size()) {
 			m_paintedCombo->move(0,0);
 			m_paintedCombo->setFixedSize(size()+TQSize(0, m_fixForHeight)); //last chance to fix size
 		}
-		tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, p,
-			m_fixForHeight>0 ? (const TQWidget*)m_paintedCombo : this, r, tqcolorGroup(),
+		tqstyle().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, tqcolorGroup(), flags);
+		tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags);
 	}
 }
 
@@ -77,7 +77,7 @@ void KexiComboBoxDropDownButton::styleChange( TQStyle & oldStyle )
 	else
 		m_fixForHeight = 0;
 	//</hack>
-	m_tqdrawComplexControl =
+	m_drawComplexControl =
 		(tqstyle().inherits("KStyle") && qstricmp(tqstyle().name(),"qtcurve")!=0)
 		|| qstricmp(tqstyle().name(),"platinum")==0;
 	if (m_fixForHeight==0)
diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.h b/kexi/widget/utils/kexicomboboxdropdownbutton.h
index f480de74..94c26484 100644
--- a/kexi/widget/utils/kexicomboboxdropdownbutton.h
+++ b/kexi/widget/utils/kexicomboboxdropdownbutton.h
@@ -41,7 +41,7 @@ class KEXIGUIUTILS_EXPORT KexiComboBoxDropDownButton : public KPushButton
 		virtual void styleChange( TQStyle & oldStyle );
 
 		int m_fixForHeight;
-		bool m_tqdrawComplexControl : 1;
+		bool m_drawComplexControl : 1;
 		KComboBox *m_paintedCombo; //!< fake combo used only to pass it as 'this' for TQStyle 
 		                           //!< (because styles use \<static_cast\>)
 };
diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp
index 3c6b22f0..aeeec86d 100644
--- a/kexi/widget/utils/kexicontextmenuutils.cpp
+++ b/kexi/widget/utils/kexicontextmenuutils.cpp
@@ -96,7 +96,7 @@ KexiImageContextMenu::~KexiImageContextMenu()
 
 void KexiImageContextMenu::insertFromFile()
 {
-//	TQWidget *tqfocusWidget = tqApp->tqfocusWidget();
+//	TQWidget *focusWidget = tqApp->focusWidget();
 #ifdef TQ_WS_WIN
 	TQString recentDir;
 	TQString fileName = TQFileDialog::getOpenFileName(
@@ -116,8 +116,8 @@ void KexiImageContextMenu::insertFromFile()
 	if (!url.isValid()) {
 		//focus the app again because to avoid annoying the user with unfocused main window
 		if (tqApp->mainWidget()) {
-			//tqfocusWidget->raise();
-			//tqfocusWidget->setFocus();
+			//focusWidget->raise();
+			//focusWidget->setFocus();
 			tqApp->mainWidget()->raise();
 		}
 		return;
@@ -133,8 +133,8 @@ void KexiImageContextMenu::insertFromFile()
 
 	emit insertFromFileRequested(url);
 	if (tqApp->mainWidget()) {
-//		tqfocusWidget->raise();
-//		tqfocusWidget->setFocus();
+//		focusWidget->raise();
+//		focusWidget->setFocus();
 		tqApp->mainWidget()->raise();
 	}
 }
@@ -187,7 +187,7 @@ void KexiImageContextMenu::saveAs()
 	if (f.exists() && KMessageBox::Yes != KMessageBox::warningYesNo(this, 
 		"<qt>"+i18n("File \"%1\" already exists."
 		"<p>Do you want to replace it with a new one?")
-		.tqarg(TQDir::convertSeparators(fileName))+"</qt>",0, 
+		.arg(TQDir::convertSeparators(fileName))+"</qt>",0, 
 		KGuiItem(i18n("&Replace")), KGuiItem(i18n("&Don't Replace"))))
 	{
 		return;
@@ -268,8 +268,8 @@ bool KexiContextMenuUtils::updateTitle(TQPopupMenu *menu, const TQString& object
 /*! @todo look at makeFirstCharacterUpperCaseInCaptions setting [bool]
  (see doc/dev/settings.txt) */
 	TQString realTitle( i18n("Object name : Object type", "%1 : %2")
-		.tqarg( objectName[0].upper() + objectName.mid(1) )
-		.tqarg( objectTypeName ));
+		.arg( objectName[0].upper() + objectName.mid(1) )
+		.arg( objectTypeName ));
 
 	if (iconName.isEmpty())
 		title->setTitle(realTitle);
diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp
index 718fcbf6..298eda48 100644
--- a/kexi/widget/utils/kexidatetimeformatter.cpp
+++ b/kexi/widget/utils/kexidatetimeformatter.cpp
@@ -78,7 +78,7 @@ KexiDateFormatter::KexiDateFormatter()
 			m_order = TQDateEdit::YDM;
 //! @todo use TQRegExp (to replace %Y by %1, etc.) instead of hardcoded "%1%299%399" 
 //!       because df may contain also other characters
-			m_inputMask = TQString("%1%299%399").tqarg(yearMask).tqarg(m_separator).tqarg(m_separator);
+			m_inputMask = TQString("%1%299%399").arg(yearMask).arg(m_separator).arg(m_separator);
 			m_qtFormat = yearDateFormat+m_separator+dayDateFormat+m_separator+monthDateFormat;
 			m_yearpos = 0;
 			m_daypos = yearMask.length()+separatorLen;
@@ -86,7 +86,7 @@ KexiDateFormatter::KexiDateFormatter()
 		}
 		else if (daypos<monthpos && monthpos<yearpos) {
 			m_order = TQDateEdit::DMY;
-			m_inputMask = TQString("99%199%2%3").tqarg(m_separator).tqarg(m_separator).tqarg(yearMask);
+			m_inputMask = TQString("99%199%2%3").arg(m_separator).arg(m_separator).arg(yearMask);
 			m_qtFormat = dayDateFormat+m_separator+monthDateFormat+m_separator+yearDateFormat;
 			m_daypos = 0;
 			m_monthpos = 2+separatorLen;
@@ -94,7 +94,7 @@ KexiDateFormatter::KexiDateFormatter()
 		}
 		else if (monthpos<daypos && daypos<yearpos) {
 			m_order = TQDateEdit::MDY;
-			m_inputMask = TQString("99%199%2%3").tqarg(m_separator).tqarg(m_separator).tqarg(yearMask);
+			m_inputMask = TQString("99%199%2%3").arg(m_separator).arg(m_separator).arg(yearMask);
 			m_qtFormat = monthDateFormat+m_separator+dayDateFormat+m_separator+yearDateFormat;
 			m_monthpos = 0;
 			m_daypos = 2+separatorLen;
@@ -104,7 +104,7 @@ KexiDateFormatter::KexiDateFormatter()
 			ok = false;
 	}
 	if (!ok || m_order == TQDateEdit::YMD) {//default: YMD
-		m_inputMask = TQString("%1%299%399").tqarg(yearMask).tqarg(m_separator).tqarg(m_separator);
+		m_inputMask = TQString("%1%299%399").arg(yearMask).arg(m_separator).arg(m_separator);
 		m_qtFormat = yearDateFormat+m_separator+monthDateFormat+m_separator+dayDateFormat;
 		m_yearpos = 0;
 		m_monthpos = yearMask.length()+separatorLen;
@@ -294,20 +294,20 @@ TQString KexiTimeFormatter::timeToString( const TQTime& time ) const
 	TQString s(m_outputFormat);
 	if (m_24h) {
 		if (m_hoursWithLeadingZero)
-			s.replace( "%H", TQString::tqfromLatin1(time.hour()<10 ? "0" : "") + TQString::number(time.hour()) );
+			s.replace( "%H", TQString::fromLatin1(time.hour()<10 ? "0" : "") + TQString::number(time.hour()) );
 		else
 			s.replace( "%k", TQString::number(time.hour()) );
 	}
 	else {
 		int time12 = (time.hour()>12) ? (time.hour()-12) : time.hour();
 		if (m_hoursWithLeadingZero)
-			s.replace( "%I", TQString::tqfromLatin1(time12<10 ? "0" : "") + TQString::number(time12) );
+			s.replace( "%I", TQString::fromLatin1(time12<10 ? "0" : "") + TQString::number(time12) );
 		else
 			s.replace( "%l", TQString::number(time12) );
 	}
-	s.replace( "%M", TQString::tqfromLatin1(time.minute()<10 ? "0" : "") + TQString::number(time.minute()) );
+	s.replace( "%M", TQString::fromLatin1(time.minute()<10 ? "0" : "") + TQString::number(time.minute()) );
 	if (m_secpos>=0)
-		s.replace( "%S", TQString::tqfromLatin1(time.second()<10 ? "0" : "") + TQString::number(time.second()) );
+		s.replace( "%S", TQString::fromLatin1(time.second()<10 ? "0" : "") + TQString::number(time.second()) );
 	if (m_ampmpos>=0)
 		s.replace( "%p", KGlobal::locale()->translate( time.hour()>=12 ? "pm" : "am") );
 	return s;
diff --git a/kexi/widget/utils/kexidisplayutils.cpp b/kexi/widget/utils/kexidisplayutils.cpp
index 1943b086..11b1d742 100644
--- a/kexi/widget/utils/kexidisplayutils.cpp
+++ b/kexi/widget/utils/kexidisplayutils.cpp
@@ -92,8 +92,8 @@ KexiDisplayUtils::DisplayParameters::DisplayParameters()
 
 KexiDisplayUtils::DisplayParameters::DisplayParameters(TQWidget *w)
 {
-	textColor = w->tqpalette().active().foreground();
-	selectedTextColor = w->tqpalette().active().highlightedText();
+	textColor = w->palette().active().foreground();
+	selectedTextColor = w->palette().active().highlightedText();
 	font = w->font();
 }
 
@@ -113,7 +113,7 @@ void KexiDisplayUtils::initDisplayForAutonumberSign(DisplayParameters& par, TQWi
 void KexiDisplayUtils::initDisplayForDefaultValue(DisplayParameters& par, TQWidget *widget)
 {
 	par.textColor = SPECIAL_TEXT_COLOR;
-	par.selectedTextColor = widget->tqpalette().active().highlightedText();
+	par.selectedTextColor = widget->palette().active().highlightedText();
 	par.font = widget->font();
 	par.font.setItalic(true);
 }
diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp
index 909d507c..054192ce 100644
--- a/kexi/widget/utils/kexidropdownbutton.cpp
+++ b/kexi/widget/utils/kexidropdownbutton.cpp
@@ -28,7 +28,7 @@
 KexiDropDownButton::KexiDropDownButton(TQWidget *parent)
  : TQToolButton(parent, "KexiDBImageBox::Button")
 {
-	tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
+	setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
 //! @todo get this from a KStyle
 //	setFixedWidth(TQMAX(18, tqApp->globalStrut().width()));
 	int fixedWidth;
@@ -55,11 +55,11 @@ void KexiDropDownButton::drawButton( TQPainter *p )
 	if (isEnabled())
 		arrowFlags |= TQStyle::Style_Enabled;
 	tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
-		TQRect((width()-7)/2, height()-9, 7, 7), tqcolorGroup(),
+		TQRect((width()-7)/2, height()-9, 7, 7), colorGroup(),
 		arrowFlags, TQStyleOption() );
 }
 
-TQSize KexiDropDownButton::tqsizeHint () const
+TQSize KexiDropDownButton::sizeHint () const
 {
 	return TQSize( fontMetrics().maxWidth() + 2*2, fontMetrics().height()*2 + 2*2 );
 }
diff --git a/kexi/widget/utils/kexidropdownbutton.h b/kexi/widget/utils/kexidropdownbutton.h
index e61ab9f5..178f17a7 100644
--- a/kexi/widget/utils/kexidropdownbutton.h
+++ b/kexi/widget/utils/kexidropdownbutton.h
@@ -38,7 +38,7 @@ class KEXIGUIUTILS_EXPORT KexiDropDownButton : public TQToolButton
 
 		virtual void drawButton( TQPainter *p );
 		
-		virtual TQSize tqsizeHint () const;
+		virtual TQSize sizeHint () const;
 
 		virtual void keyPressEvent ( TQKeyEvent * e );
 };
diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp
index e4bc4207..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)
@@ -134,10 +134,10 @@ KexiFlowLayout::widgetList() const
 }
 
 void
-KexiFlowLayout::tqinvalidate()
+KexiFlowLayout::invalidate()
 {
-	TQLayout::tqinvalidate();
-	m_cached_tqsizeHint = TQSize();
+	TQLayout::invalidate();
+	m_cached_sizeHint = TQSize();
 	m_cached_minSize = TQSize();
 	m_cached_width = 0;
 }
@@ -169,22 +169,22 @@ KexiFlowLayout::heightForWidth(int w) const
 }
 
 TQSize
-KexiFlowLayout::tqsizeHint() const
+KexiFlowLayout::sizeHint() const
 {
-	if(m_cached_tqsizeHint.isEmpty()) {
+	if(m_cached_sizeHint.isEmpty()) {
 		KexiFlowLayout *mthis = (KexiFlowLayout*)this;
 		TQRect r = TQRect(0, 0, 2000, 2000);
 		mthis->simulateLayout(r);
 	}
-	return m_cached_tqsizeHint;
+	return m_cached_sizeHint;
 }
 
 TQSize
-KexiFlowLayout::tqminimumSize() const
+KexiFlowLayout::minimumSize() const
 {
-//js: do we really need to simulate tqlayout here?
-//    I commented this out because it was impossible to stretch tqlayout conveniently.
-//    Now, minimum size is computed automatically based on item's tqminimumSize...
+//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()) {
 		KexiFlowLayout *mthis = (KexiFlowLayout*)this;
@@ -234,7 +234,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 	TQPtrListIterator<TQLayoutItem> it(m_list);
 	TQPtrList<TQLayoutItem> currentLine;
 	TQLayoutItem *o;
-	TQSize minSize, tqsizeHint(20, 20);
+	TQSize minSize, sizeHint(20, 20);
 	int minSizeHeight = 0 - spacing();
 
 	while ( (o = it.current()) != 0 ) {
@@ -244,20 +244,20 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 		}
 
 //		kdDebug() << "- doHorizontalLayout(): " << o->widget()->className() << " " << o->widget()->name() << endl;
-		TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts)
+		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();
 			int sizeHintWidth = 0 -spacing(), minSizeWidth=0 - spacing(), lineMinHeight=0;
 			while( (item = it2.current()) != 0 ) {
-				TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take
-				TQSize itemMinSize = item->tqminimumSize(); // a while to get them
+				TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take
+				TQSize itemMinSize = item->minimumSize(); // a while to get them
 				TQSize s;
 				if(m_justify) {
 					if(expandingWidgets != 0) {
-						if(item->expandingDirections() == TQSizePolicy::Horizontally || item->expandingDirections() == TQSizePolicy::BothDirections)
+						if(item->expanding() == TQSizePolicy::Horizontally || item->expanding() == TQSizePolicy::BothDirections)
 							s = TQSize( TQMIN(itemSizeHint.width() + availableSpace / expandingWidgets
 								, r.width()), itemSizeHint.height() );
 						else
@@ -277,7 +277,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 				lineMinHeight = TQMAX( lineMinHeight, itemMinSize.height() );
 				++it2;
 			}
-			tqsizeHint = tqsizeHint.expandedTo( TQSize(sizeHintWidth, 0) );
+			sizeHint = sizeHint.expandedTo( TQSize(sizeHintWidth, 0) );
 			minSize = minSize.expandedTo( TQSize(minSizeWidth, 0) );
 			minSizeHeight = minSizeHeight + spacing() + lineMinHeight;
 			// start a new line
@@ -292,24 +292,24 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 		x = x + spacing() + oSizeHint.width();
 		h = TQMAX( h,  oSizeHint.height() );
 		currentLine.append(o);
-		if(o->expandingDirections() == TQSizePolicy::Horizontally || o->expandingDirections() == TQSizePolicy::BothDirections)
+		if(o->expanding() == TQSizePolicy::Horizontally || o->expanding() == TQSizePolicy::BothDirections)
 			++expandingWidgets;
 		availableSpace = TQMAX(0, availableSpace - spacing() - oSizeHint.width());
 		++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();
 	int sizeHintWidth = 0 -spacing(), minSizeWidth=0 - spacing(), lineMinHeight=0;
 	while( (item = it2.current()) != 0 ) {
-		TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take
-		TQSize itemMinSize = item->tqminimumSize(); // a while to get them
+		TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take
+		TQSize itemMinSize = item->minimumSize(); // a while to get them
 		TQSize s;
 		if(m_justify) {
 			if(expandingWidgets != 0) {
-				if(item->expandingDirections() == TQSizePolicy::Horizontally || item->expandingDirections() == TQSizePolicy::BothDirections)
+				if(item->expanding() == TQSizePolicy::Horizontally || item->expanding() == TQSizePolicy::BothDirections)
 					s = TQSize( TQMIN(itemSizeHint.width() + availableSpace / expandingWidgets
 						, r.width()), itemSizeHint.height() );
 				else
@@ -329,12 +329,12 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 		lineMinHeight = TQMAX( lineMinHeight, itemMinSize.height() );
 		++it2;
 	}
-	tqsizeHint = tqsizeHint.expandedTo( TQSize(sizeHintWidth, y + spacing() + h) );
+	sizeHint = sizeHint.expandedTo( TQSize(sizeHintWidth, y + spacing() + h) );
 	minSizeHeight = minSizeHeight + spacing() + lineMinHeight;
 	minSize = minSize.expandedTo( TQSize(minSizeWidth, minSizeHeight) );
 
-	// store tqsizeHint() and tqminimumSize()
-	m_cached_tqsizeHint = tqsizeHint + TQSize(2* margin(), 2*margin());
+	// store sizeHint() and minimumSize()
+	m_cached_sizeHint = sizeHint + TQSize(2* margin(), 2*margin());
 	m_cached_minSize = minSize + TQSize(2* margin() , 2*margin());
 	// return our height
 	return y + h - r.y();
@@ -351,7 +351,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 	TQPtrListIterator<TQLayoutItem> it(m_list);
 	TQPtrList<TQLayoutItem> currentLine;
 	TQLayoutItem *o;
-	TQSize minSize, tqsizeHint(20, 20);
+	TQSize minSize, sizeHint(20, 20);
 	int minSizeWidth = 0 - spacing();
 
 	while ( (o = it.current()) != 0 ) {
@@ -360,20 +360,20 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 			continue;
 		}
 
-		TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts)
+		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();
 			int sizeHintHeight = 0 - spacing(), minSizeHeight = 0 - spacing(), colMinWidth=0;
 			while( (item = it2.current()) != 0 ) {
-				TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take
-				TQSize itemMinSize = item->tqminimumSize(); // a while to get them
+				TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take
+				TQSize itemMinSize = item->minimumSize(); // a while to get them
 				TQSize s;
 				if(m_justify) {
 					if(expandingWidgets != 0) {
-						if(item->expandingDirections() == TQSizePolicy::Vertically || item->expandingDirections() == TQSizePolicy::BothDirections)
+						if(item->expanding() == TQSizePolicy::Vertically || item->expanding() == TQSizePolicy::BothDirections)
 							s = TQSize( itemSizeHint.width(), TQMIN(itemSizeHint.height() + availableSpace / expandingWidgets
 								, r.height()) );
 						else
@@ -393,7 +393,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 				colMinWidth = TQMAX( colMinWidth, itemMinSize.width() );
 				++it2;
 			}
-			tqsizeHint = tqsizeHint.expandedTo( TQSize(0, sizeHintHeight) );
+			sizeHint = sizeHint.expandedTo( TQSize(0, sizeHintHeight) );
 			minSize = minSize.expandedTo( TQSize(0, minSizeHeight) );
 			minSizeWidth = minSizeWidth + spacing() + colMinWidth;
 			// start a new column
@@ -408,24 +408,24 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 		y = y + spacing() + oSizeHint.height();
 		w = TQMAX( w,  oSizeHint.width() );
 		currentLine.append(o);
-		if(o->expandingDirections() == TQSizePolicy::Vertically || o->expandingDirections() == TQSizePolicy::BothDirections)
+		if(o->expanding() == TQSizePolicy::Vertically || o->expanding() == TQSizePolicy::BothDirections)
 			++expandingWidgets;
 		availableSpace = TQMAX(0, availableSpace - spacing() - oSizeHint.height());
 		++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();
 	int sizeHintHeight = 0 - spacing(), minSizeHeight = 0 - spacing(), colMinWidth=0;
 	while( (item = it2.current()) != 0 ) {
-		TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take
-		TQSize itemMinSize = item->tqminimumSize(); // a while to get them
+		TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take
+		TQSize itemMinSize = item->minimumSize(); // a while to get them
 		TQSize s;
 		if(m_justify) {
 			if(expandingWidgets != 0) {
-				if(item->expandingDirections() == TQSizePolicy::Vertically || item->expandingDirections() == TQSizePolicy::BothDirections)
+				if(item->expanding() == TQSizePolicy::Vertically || item->expanding() == TQSizePolicy::BothDirections)
 					s = TQSize( itemSizeHint.width(), TQMIN(itemSizeHint.height() + availableSpace / expandingWidgets
 						, r.height()) );
 				else
@@ -445,12 +445,12 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 		colMinWidth = TQMAX( colMinWidth, itemMinSize.width() );
 		++it2;
 	}
-	tqsizeHint = tqsizeHint.expandedTo( TQSize( x + spacing() + w, sizeHintHeight) );
+	sizeHint = sizeHint.expandedTo( TQSize( x + spacing() + w, sizeHintHeight) );
 	minSizeWidth = minSizeWidth + spacing() + colMinWidth;
 	minSize = minSize.expandedTo( TQSize(minSizeWidth, minSizeHeight) );
 
-	// store tqsizeHint() and tqminimumSize()
-	m_cached_tqsizeHint = tqsizeHint + TQSize(2* margin(), 2*margin());
+	// store sizeHint() and minimumSize()
+	m_cached_sizeHint = sizeHint + TQSize(2* margin(), 2*margin());
 	m_cached_minSize = minSize + TQSize(2* margin(), 2*margin());
 	// return our width
 	return x + w - r.x();
@@ -468,7 +468,7 @@ int KexiFlowLayout::count() const {
     \reimp
 */
 TQLayoutItem* KexiFlowLayout::itemAt(int index) const {
-	return index >= 0 && index < m_list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(m_list).tqat(index)) : 0;
+	return index >= 0 && index < m_list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(m_list).at(index)) : 0;
 }
 
 /*!
@@ -477,8 +477,8 @@ TQLayoutItem* KexiFlowLayout::itemAt(int index) const {
 TQLayoutItem* KexiFlowLayout::takeAt(int index) {
 	if (index < 0 || index >= m_list.count())
 		return 0;
-	TQLayoutItem *item = m_list.tqat(index);
-	m_list.remove(m_list.tqat(index));
+	TQLayoutItem *item = m_list.at(index);
+	m_list.remove(m_list.at(index));
 	delete item;
 	
 	invalidate();
diff --git a/kexi/widget/utils/kexiflowlayout.h b/kexi/widget/utils/kexiflowlayout.h
index 0f6d8384..f48ed140 100644
--- a/kexi/widget/utils/kexiflowlayout.h
+++ b/kexi/widget/utils/kexiflowlayout.h
@@ -20,10 +20,10 @@
 #ifndef KEXIFLOWLAYOUT_H
 #define KEXIFLOWLAYOUT_H
 
-#include <tqlayout.h>
+#include <layout.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; }
@@ -49,12 +49,12 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
 		virtual void addItem(TQLayoutItem *item);
 		virtual void addSpacing(int size);
 		virtual TQLayoutIterator iterator();
-		virtual void  tqinvalidate();
+		virtual void  invalidate();
 
 		virtual bool hasHeightForWidth() const;
 		virtual int heightForWidth(int width) const;
-		virtual TQSize tqsizeHint() const;
-		virtual TQSize tqminimumSize() const;
+		virtual TQSize sizeHint() const;
+		virtual TQSize minimumSize() const;
 		virtual TQSizePolicy::ExpandData expanding() const;
 
 		virtual bool isEmpty();
@@ -75,7 +75,7 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
 		int m_cached_hfw;
 		bool m_justify;
 		Qt::Orientation m_orientation;
-		TQSize m_cached_tqsizeHint;
+		TQSize m_cached_sizeHint;
 		TQSize m_cached_minSize;
 };
 
diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp
index 18d34447..d93b13ff 100644
--- a/kexi/widget/utils/kexigradientwidget.cpp
+++ b/kexi/widget/utils/kexigradientwidget.cpp
@@ -155,7 +155,7 @@ void KexiGradientWidget::rebuildCache( void ) {
 	}
 
 	/**
-	All tqchildren need to have our background set.
+	All children need to have our background set.
 	*/
 	KPixmap partPixmap;
 	TQRect area;
@@ -180,7 +180,7 @@ void KexiGradientWidget::rebuildCache( void ) {
 		under the current child-widget.
 		*/
 		if ( TQT_BASE_OBJECT(childWidget->parent()) == TQT_BASE_OBJECT(this) ) {
-			area = childWidget->tqgeometry();
+			area = childWidget->geometry();
 		} else {
 			area.setTopLeft( childWidget->mapTo( this,
 				childWidget->clipRegion().boundingRect().topLeft() ) );
@@ -311,7 +311,7 @@ void KexiGradientWidget::updateChildBackground( TQWidget* childWidget )
 
 	/**
 	Exclude widgtes that don't have a parent.
-	This happens when tqchildren are removed
+	This happens when children are removed
 	which are in the knownWidgets-list.
 	*/
 	if ( childWidget->parent() == 0L )
@@ -330,7 +330,7 @@ void KexiGradientWidget::updateChildBackground( TQWidget* childWidget )
 	under the current child-widget.
 	*/
 	if ( TQT_BASE_OBJECT(childWidget->parent()) == TQT_BASE_OBJECT(this) ) {
-		area = childWidget->tqgeometry();
+		area = childWidget->geometry();
 	} else {
 		area.setTopLeft( childWidget->mapTo( this,
 			childWidget->clipRegion().boundingRect().topLeft() ) );
diff --git a/kexi/widget/utils/kexigradientwidget.h b/kexi/widget/utils/kexigradientwidget.h
index 3f9b894d..d11c4f04 100644
--- a/kexi/widget/utils/kexigradientwidget.h
+++ b/kexi/widget/utils/kexigradientwidget.h
@@ -184,11 +184,11 @@ class KEXIGUIUTILS_EXPORT KexiGradientWidget : public TQWidget {
 
 	private:
 		/*!
-		Builds a list of tqchildren of \a p.
+		Builds a list of children of \a p.
 		Only widgets that work correctly with KexiGradientWidget
 		will be in this list.
 		The results will be stored in \a list.
-		The method recursively calls itself until all tqchildren of \a p
+		The method recursively calls itself until all children of \a p
 		have been found and stored in the list.
 		*/
 		static void buildChildrenList( WidgetList& list, TQWidget* p );
diff --git a/kexi/widget/utils/kexirecordmarker.cpp b/kexi/widget/utils/kexirecordmarker.cpp
index b22e0500..55a7c47a 100644
--- a/kexi/widget/utils/kexirecordmarker.cpp
+++ b/kexi/widget/utils/kexirecordmarker.cpp
@@ -100,7 +100,7 @@ public:
 	 , highlightedRow(-1)
 	 , editRow(-1)
 	 , rows(0)
-	 , selectionBackgroundColor(tqApp->tqpalette().active().highlight())
+	 , selectionBackgroundColor(tqApp->palette().active().highlight())
 	 , showInsertRow(true)
 	{
 	}
@@ -188,13 +188,13 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e)
 	if(last > (d->rows-1+(d->showInsertRow?1:0)))
 		last = d->rows-1+(d->showInsertRow?1:0);
 
-	TQColorGroup selectedColorGroup(tqcolorGroup());
+	TQColorGroup selectedColorGroup(colorGroup());
 	selectedColorGroup.setColor( TQColorGroup::Button, 
 		KexiUtils::blendedColors( selectedColorGroup.color(TQColorGroup::Background), 
 			d->selectionBackgroundColor, 2, 1) );
 	selectedColorGroup.setColor( TQColorGroup::Background, 
 		selectedColorGroup.color(TQColorGroup::Button) ); //set background color as well (e.g. for thinkeramik)
-	TQColorGroup highlightedColorGroup(tqcolorGroup());
+	TQColorGroup highlightedColorGroup(colorGroup());
 	highlightedColorGroup.setColor( TQColorGroup::Button, 
 		KexiUtils::blendedColors( highlightedColorGroup.color(TQColorGroup::Background), 
 			d->selectionBackgroundColor, 4, 1) );
@@ -206,7 +206,7 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e)
 		TQRect r(0, y, width(), d->rowHeight);
 		p.drawRect(r);
 		tqstyle().tqdrawPrimitive( TQStyle::PE_HeaderSection, &p, r,
-			(d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : tqcolorGroup()), 
+			(d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : colorGroup()), 
 			TQStyle::Style_Raised | (isEnabled() ? TQStyle::Style_Enabled : 0));
 	}
 	if (d->editRow!=-1 && d->editRow >= first && d->editRow <= (last/*+1 for insert row*/)) {
@@ -220,7 +220,7 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e)
 		&& (!d->showInsertRow || (d->showInsertRow && d->currentRow < last)))/*don't display marker for 'insert' row*/ 
 	{
 		//show marker
-		p.setBrush(tqcolorGroup().foreground());
+		p.setBrush(colorGroup().foreground());
 		p.setPen(TQPen(TQt::NoPen));
 		TQPointArray points(3);
 		int ofs = d->rowHeight / 4;
diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp
index 4c1dd02b..f4c96b58 100644
--- a/kexi/widget/utils/kexirecordnavigator.cpp
+++ b/kexi/widget/utils/kexirecordnavigator.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqtoolbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqvalidator.h>
 #include <tqtooltip.h>
@@ -102,7 +102,7 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const
 	d->lyr->addSpacing( 6 );
 	
 	d->lyr->addWidget( m_navRecordNumber = new KLineEdit(this) );
-	m_navRecordNumber->tqsetAlignment(AlignRight | AlignVCenter);
+	m_navRecordNumber->setAlignment(AlignRight | AlignVCenter);
 	m_navRecordNumber->setFocusPolicy(TQ_ClickFocus);
 	m_navRecordNumber->installEventFilter(this);
 //	m_navRowNumber->setFixedWidth(fw);
@@ -112,20 +112,20 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const
 	TQToolTip::add(m_navRecordNumber, i18n("Current row number"));
 	
 	KLineEdit *lbl_of = new KLineEdit(i18n("of"), this);
-	lbl_of->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred);
+	lbl_of->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred);
 	lbl_of->setMaximumWidth(fm.width(lbl_of->text())+8);
 	lbl_of->setReadOnly(true);
 	lbl_of->setLineWidth(0);
 	lbl_of->setFocusPolicy(TQ_NoFocus);
-	lbl_of->tqsetAlignment(AlignCenter);
+	lbl_of->setAlignment(AlignCenter);
 	d->lyr->addWidget( lbl_of );
 	
 	d->lyr->addWidget( m_navRecordCount = new KLineEdit(this) );
-	m_navRecordCount->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred);
+	m_navRecordCount->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred);
 	m_navRecordCount->setReadOnly(true);
 	m_navRecordCount->setLineWidth(0);
 	m_navRecordCount->setFocusPolicy(TQ_NoFocus);
-	m_navRecordCount->tqsetAlignment(AlignLeft | AlignVCenter);
+	m_navRecordCount->setAlignment(AlignLeft | AlignVCenter);
 	TQToolTip::add(m_navRecordCount, i18n("Number of rows"));
 
 	lbl_of->setFont(f);
@@ -337,7 +337,7 @@ void KexiRecordNavigator::updateGeometry(int leftMargin)
 	if (m_view) {
 		int navWidth;
 		if (m_view->horizontalScrollBar()->isVisible()) {
-			navWidth = tqsizeHint().width();
+			navWidth = sizeHint().width();
 		}
 		else {
 			navWidth = leftMargin + m_view->clipper()->width();
@@ -345,9 +345,9 @@ void KexiRecordNavigator::updateGeometry(int leftMargin)
 		
 		setGeometry(
 			m_view->frameWidth(),
-			m_view->height() - m_view->horizontalScrollBar()->tqsizeHint().height()-m_view->frameWidth(),
+			m_view->height() - m_view->horizontalScrollBar()->sizeHint().height()-m_view->frameWidth(),
 			navWidth,
-			m_view->horizontalScrollBar()->tqsizeHint().height()
+			m_view->horizontalScrollBar()->sizeHint().height()
 		);
 
 		m_view->updateScrollBars();
@@ -361,7 +361,7 @@ void KexiRecordNavigator::setHBarGeometry( TQScrollBar & hbar, int x, int y, int
 
 void KexiRecordNavigator::setLabelText(const TQString& text)
 {
-	m_textLabel->setText(text.isEmpty() ? TQString() : (TQString::tqfromLatin1(" ")+text+" "));
+	m_textLabel->setText(text.isEmpty() ? TQString() : (TQString::fromLatin1(" ")+text+" "));
 }
 
 void KexiRecordNavigator::setInsertingButtonVisible(bool set)
@@ -429,7 +429,7 @@ void KexiRecordNavigator::setEditingIndicatorEnabled(bool set)
 	if (d->editingIndicatorEnabled) {
 		if (!d->editingIndicatorLabel) {
 			d->editingIndicatorLabel = new TQLabel(this);
-			d->editingIndicatorLabel->tqsetAlignment(TQt::AlignCenter);
+			d->editingIndicatorLabel->setAlignment(TQt::AlignCenter);
 			TQPixmap pix;
 			pix.convertFromImage( *KexiRecordMarker::penImage() );
 			d->editingIndicatorLabel->setFixedWidth( pix.width() + 2*2 );
diff --git a/kexi/widget/utils/kexirecordnavigator.h b/kexi/widget/utils/kexirecordnavigator.h
index 9eae328b..6c666e78 100644
--- a/kexi/widget/utils/kexirecordnavigator.h
+++ b/kexi/widget/utils/kexirecordnavigator.h
@@ -87,7 +87,7 @@ class KEXIGUIUTILS_EXPORT KexiRecordNavigator : public TQFrame
 		/*! \return record count displayed for this navigator. */
 		uint recordCount() const;
 
-		/*! Sets horizontal bar's \a hbar (at the bottom) tqgeometry so this record navigator
+		/*! Sets horizontal bar's \a hbar (at the bottom) geometry so this record navigator
 		 is properly positioned together with horizontal scroll bar. This method is used 
 		 in TQScrollView::setHBarGeometry() implementations:
 		 see KexiTableView::setHBarGeometry() and KexiFormScrollView::setHBarGeometry()
diff --git a/kexi/widget/utils/kexitooltip.cpp b/kexi/widget/utils/kexitooltip.cpp
index 7d71752c..2a36ef09 100644
--- a/kexi/widget/utils/kexitooltip.cpp
+++ b/kexi/widget/utils/kexitooltip.cpp
@@ -42,7 +42,7 @@ KexiToolTip::~KexiToolTip()
 {
 }
 
-TQSize KexiToolTip::tqsizeHint() const
+TQSize KexiToolTip::sizeHint() const
 {
 	TQSize sz(fontMetrics().boundingRect(m_value.toString()).size());
 	return sz;
@@ -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());
 }
 
diff --git a/kexi/widget/utils/kexitooltip.h b/kexi/widget/utils/kexitooltip.h
index cfa1b483..83d0d7e0 100644
--- a/kexi/widget/utils/kexitooltip.h
+++ b/kexi/widget/utils/kexitooltip.h
@@ -32,7 +32,7 @@ class KEXIGUIUTILS_EXPORT KexiToolTip : public TQWidget
 		KexiToolTip(const TQVariant& value, TQWidget* parent);
 		virtual ~KexiToolTip();
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 	public slots:
 		virtual void show();