Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

127 files changed, 1150 insertions, 1150 deletions

diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
index 2d1e6b77..7cea44c1 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
@@ -42,8 +42,8 @@ KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& colu
     nColumns->setValue( m_columns.columns );
     m_preview->setPageColumns( m_columns );
 
-    connect( nColumns, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( nColChanged( int ) ) );
-    connect( m_spacing, TQT_SIGNAL( valueChangedPt(double) ), this, TQT_SLOT( nSpaceChanged( double ) ) );
+    connect( nColumns, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( nColChanged( int ) ) );
+    connect( m_spacing, TQ_SIGNAL( valueChangedPt(double) ), this, TQ_SLOT( nSpaceChanged( double ) ) );
 }
 
 void KoPageLayoutColumns::setEnableColumns(bool on) {
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
index b465c4d1..2d469b8d 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
@@ -55,7 +55,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
         cpgUnit->insertStringList( KoUnit::listOfUnitName() );
         cpgUnit->setCurrentItem( unit );
         unitLayout->addWidget( cpgUnit, 0, TQt::AlignLeft | TQt::AlignVCenter );
-        connect( cpgUnit, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( setUnitInt( int ) ) );
+        connect( cpgUnit, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( setUnitInt( int ) ) );
     }
     else {
         TQString str=KoUnit::unitDescription(unit);
@@ -78,7 +78,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
     cpgFormat = new TQComboBox( false, formatPageSize, "cpgFormat" );
     cpgFormat->insertStringList( KoPageFormat::allFormats() );
     lpgFormat->setBuddy( cpgFormat );
-    connect( cpgFormat, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( formatChanged( int ) ) );
+    connect( cpgFormat, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( formatChanged( int ) ) );
 
     // spacer
     formatPageSize->setStretchFactor( new TQWidget( formatPageSize ), 10 );
@@ -94,7 +94,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
     lpgWidth->setBuddy( epgWidth );
     if ( m_layout.format != PG_CUSTOM )
         epgWidth->setEnabled( false );
-    connect( epgWidth, TQT_SIGNAL( valueChangedPt(double) ), this, TQT_SLOT( widthChanged(double) ) );
+    connect( epgWidth, TQ_SIGNAL( valueChangedPt(double) ), this, TQ_SLOT( widthChanged(double) ) );
 
     // label height
     TQLabel *lpgHeight = new TQLabel( i18n( "&Height:" ), formatCustomSize );
@@ -104,7 +104,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
     lpgHeight->setBuddy( epgHeight );
     if ( m_layout.format != PG_CUSTOM )
         epgHeight->setEnabled( false );
-    connect( epgHeight, TQT_SIGNAL( valueChangedPt(double ) ), this, TQT_SLOT( heightChanged(double) ) );
+    connect( epgHeight, TQ_SIGNAL( valueChangedPt(double ) ), this, TQ_SLOT( heightChanged(double) ) );
 
     // --------------- orientation ---------------
     m_orientGroup = new TQHButtonGroup( i18n( "Orientation" ), this );
@@ -121,7 +121,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
     lbLandscape->setMaximumWidth( lbLandscape->pixmap()->width() );
     new TQRadioButton( i18n("La&ndscape"), m_orientGroup );
 
-    connect( m_orientGroup, TQT_SIGNAL (clicked (int)), this, TQT_SLOT( orientationChanged(int) ));
+    connect( m_orientGroup, TQ_SIGNAL (clicked (int)), this, TQ_SLOT( orientationChanged(int) ));
 
     // --------------- page margins ---------------
     TQVGroupBox *marginsFrame = new TQVGroupBox( i18n( "Margins" ), this );
@@ -135,22 +135,22 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
     // left margin
     ebrLeft = new KoUnitDoubleSpinBox( marginsFrame, "Left" );
     marginsLayout->addWidget( ebrLeft, 1, 0 );
-    connect( ebrLeft, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( leftChanged( double ) ) );
+    connect( ebrLeft, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( leftChanged( double ) ) );
 
     // right margin
     ebrRight = new KoUnitDoubleSpinBox( marginsFrame, "Right" );
     marginsLayout->addWidget( ebrRight, 1, 2 );
-    connect( ebrRight, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( rightChanged( double ) ) );
+    connect( ebrRight, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( rightChanged( double ) ) );
 
     // top margin
     ebrTop = new KoUnitDoubleSpinBox( marginsFrame, "Top" );
     marginsLayout->addWidget( ebrTop, 0, 1 , TQt::AlignCenter );
-    connect( ebrTop, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( topChanged( double ) ) );
+    connect( ebrTop, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( topChanged( double ) ) );
 
     // bottom margin
     ebrBottom = new KoUnitDoubleSpinBox( marginsFrame, "Bottom" );
     marginsLayout->addWidget( ebrBottom, 2, 1, TQt::AlignCenter );
-    connect( ebrBottom, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( bottomChanged( double ) ) );
+    connect( ebrBottom, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( bottomChanged( double ) ) );
 
     // ------------- preview -----------
     pgPreview = new KoPagePreview( this, "Preview", m_layout );
diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cpp b/kexi/3rdparty/kolibs/koPageLayoutDia.cpp
index 8d618793..c26579eb 100644
--- a/kexi/3rdparty/kolibs/koPageLayoutDia.cpp
+++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cpp
@@ -257,8 +257,8 @@ void KoPageLayoutDia::setupTab1( bool enableBorders )
     m_pageSizeTab = new KoPageLayoutSize(tab1, m_layout, m_unit, m_column, !(flags & DISABLE_UNIT), enableBorders );
     lay->addWidget(m_pageSizeTab);
     m_pageSizeTab->show();
-    connect (m_pageSizeTab, TQT_SIGNAL( propertyChange(KoPageLayout&)),
-            this, TQT_SLOT (sizeUpdated( KoPageLayout&)));
+    connect (m_pageSizeTab, TQ_SIGNAL( propertyChange(KoPageLayout&)),
+            this, TQ_SLOT (sizeUpdated( KoPageLayout&)));
 }
 
 void KoPageLayoutDia::sizeUpdated(KoPageLayout &layout) {
@@ -365,8 +365,8 @@ void KoPageLayoutDia::setupTab3()
     m_columnsTab->layout()->setMargin(0);
     lay->addWidget(m_columnsTab);
     m_columnsTab->show();
-    connect (m_columnsTab, TQT_SIGNAL( propertyChange(KoColumns&)),
-            this, TQT_SLOT (columnsUpdated( KoColumns&)));
+    connect (m_columnsTab, TQ_SIGNAL( propertyChange(KoColumns&)),
+            this, TQ_SLOT (columnsUpdated( KoColumns&)));
 }
 
 void KoPageLayoutDia::columnsUpdated(KoColumns &columns) {
diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cpp b/kexi/3rdparty/kolibs/koUnitWidgets.cpp
index 097dfc25..0329c882 100644
--- a/kexi/3rdparty/kolibs/koUnitWidgets.cpp
+++ b/kexi/3rdparty/kolibs/koUnitWidgets.cpp
@@ -128,7 +128,7 @@ KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent, const char *name )
     setAcceptLocalizedNumbers( true );
     setUnit( KoUnit::U_PT );
 
-    connect(this, TQT_SIGNAL(valueChanged( double )), TQT_SLOT(privateValueChanged()));
+    connect(this, TQ_SIGNAL(valueChanged( double )), TQ_SLOT(privateValueChanged()));
 }
 
 
@@ -151,7 +151,7 @@ KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent,
     changeValue( value );
     setLineStep( 0.5 );
 
-    connect(this, TQT_SIGNAL(valueChanged( double )), TQT_SLOT(privateValueChanged()));
+    connect(this, TQ_SIGNAL(valueChanged( double )), TQ_SLOT(privateValueChanged()));
 }
 
 void
@@ -291,7 +291,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, const char *name )
     lineEdit()->setValidator( m_validator );
     setUnit( KoUnit::U_PT );
     changeValue(  KoUnit::ptToUnit( 0.0, KoUnit::U_PT ) );
-    connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) );
+    connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivated( int ) ) );
 }
 
 KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, double upper, double value, KoUnit::Unit unit,
@@ -304,7 +304,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, doub
     lineEdit()->setValidator( m_validator );
     setUnit( unit );
     changeValue(  KoUnit::ptToUnit( value, unit ) );
-    connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) );
+    connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivated( int ) ) );
 }
 
 void
@@ -385,16 +385,16 @@ KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char
     up->setMaximumHeight( 15 );
     up->setMaximumWidth( 15 );
     layout->addWidget( up, 0, 0 );
-    connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
+    connect( up, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpClicked() ) );
 
     TQPushButton *down = new TQPushButton( "-", this );
     down->setMaximumHeight( 15 );
     down->setMaximumWidth( 15 );
     layout->addWidget( down, 1, 0 );
-    connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) );
+    connect( down, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDownClicked() ) );
 
     m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( 0.0, KoUnit::U_PT ), KoUnit::ptToUnit( 9999.99, KoUnit::U_PT ), 0.0, KoUnit::U_PT, 2, name );
-    connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) );
+    connect( m_combo, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SIGNAL( valueChanged( double ) ) );
     layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
@@ -409,16 +409,16 @@ KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double low
     up->setMaximumHeight( 15 );
     up->setMaximumWidth( 15 );
     layout->addWidget( up, 0, 0 );
-    connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
+    connect( up, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpClicked() ) );
 
     TQPushButton *down = new TQPushButton( "-", this );
     down->setMaximumHeight( 15 );
     down->setMaximumWidth( 15 );
     layout->addWidget( down, 1, 0 );
-    connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) );
+    connect( down, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDownClicked() ) );
 
     m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( lower, unit ), KoUnit::ptToUnit( upper, unit ), value, unit, precision, name );
-    connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) );
+    connect( m_combo, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SIGNAL( valueChanged( double ) ) );
     layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
diff --git a/kexi/core/kexiactionproxy.cpp b/kexi/core/kexiactionproxy.cpp
index fd3e2b2c..fd749b9f 100644
--- a/kexi/core/kexiactionproxy.cpp
+++ b/kexi/core/kexiactionproxy.cpp
@@ -159,7 +159,7 @@ TDEAction* KexiActionProxy::plugSharedAction(const char *action_name, const TQSt
 	altName += "_alt";
 	TDEAction *alt_act = new TDEAction(alternativeText, a->iconSet(), a->shortcut(), 
 		0, 0, a->parent(), altName);
-	TQObject::connect(alt_act, TQT_SIGNAL(activated()), a, TQT_SLOT(activate()));
+	TQObject::connect(alt_act, TQ_SIGNAL(activated()), a, TQ_SLOT(activate()));
 	alt_act->plug(w);
 
 //OK?
@@ -173,12 +173,12 @@ void KexiActionProxy::plugSharedActionToExternalGUI(const char *action_name, KXM
 	TDEAction *a = client->action(action_name);
 	if (!a)
 		return;
-	plugSharedAction(a->name(), a, TQT_SLOT(activate()));
+	plugSharedAction(a->name(), a, TQ_SLOT(activate()));
 
 	//update availability
 	setAvailable(a->name(), a->isEnabled());
 	//changes will be signaled
-	TQObject::connect(a, TQT_SIGNAL(enabled(bool)), m_TDEAction_setEnabled_helper, TQT_SLOT(slotSetEnabled(bool)));
+	TQObject::connect(a, TQ_SIGNAL(enabled(bool)), m_TDEAction_setEnabled_helper, TQ_SLOT(slotSetEnabled(bool)));
 }
 
 void KexiActionProxy::plugSharedActionsToExternalGUI(
diff --git a/kexi/core/kexicontexthelp.cpp b/kexi/core/kexicontexthelp.cpp
index 627bd761..cca089b3 100644
--- a/kexi/core/kexicontexthelp.cpp
+++ b/kexi/core/kexicontexthelp.cpp
@@ -33,8 +33,8 @@ KexiContextHelp::KexiContextHelp(KexiMainWindow *view, TQWidget *parent)
 	kdDebug()<<"KexiContextHelp::KexiContextHelp()"<<endl;
 	setCaption(i18n("Context Help"));
 	setIcon(SmallIcon("help"));
-	connect(this,TQT_SIGNAL(linkClicked( const TQString& )),
-		this,TQT_SLOT(linkClickedInternal( const TQString& )));
+	connect(this,TQ_SIGNAL(linkClicked( const TQString& )),
+		this,TQ_SLOT(linkClickedInternal( const TQString& )));
 }
 
 void KexiContextHelp::linkClickedInternal(const TQString& link) {
diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp
index f8067ddd..c570a50e 100644
--- a/kexi/core/kexidialogbase.cpp
+++ b/kexi/core/kexidialogbase.cpp
@@ -395,7 +395,7 @@ tristate KexiDialogBase::switchToViewMode( int newViewMode, TQMap<TQString,TQStr
 	m_stack->raiseWidget( newView );
 	newView->propertySetSwitched();
 	m_parentWindow->invalidateSharedActions( newView );
-	TQTimer::singleShot(10, newView, TQT_SLOT(setFocus())); //newView->setFocus(); //js ok?
+	TQTimer::singleShot(10, newView, TQ_SLOT(setFocus())); //newView->setFocus(); //js ok?
 //	setFocus();
 	return true;
 }
diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp
index 48b4f9f0..21c636c0 100644
--- a/kexi/core/kexipart.cpp
+++ b/kexi/core/kexipart.cpp
@@ -127,11 +127,11 @@ void Part::createGUIClients(KexiMainWindow *win)
 
 		//default actions for part's gui client:
 		TDEAction *act = new TDEAction(m_names["instanceCaption"]+"...", info()->createItemIcon(), 0, this, 
-			TQT_SLOT(slotCreate()), m_mainWin->actionCollection(), 
+			TQ_SLOT(slotCreate()), m_mainWin->actionCollection(), 
 			KexiPart::nameForCreateAction(*info()));
 		act->plug( m_mainWin->findPopupMenu("insert") );
 //		new TDEAction(m_names["instance"]+"...", info()->itemIcon(), 0, this, 
-//		TQT_SLOT(create()), m_guiClient->actionCollection(), (info()->objectName()+"part_create").latin1());
+//		TQ_SLOT(create()), m_guiClient->actionCollection(), (info()->objectName()+"part_create").latin1());
 		//let init specific actions for parts
 //		initPartActions( m_guiClient->actionCollection() );
 		m_mainWin->guiFactory()->addClient(m_guiClient); //this client is added permanently
@@ -439,10 +439,10 @@ GUIClient::GUIClient(KexiMainWindow *win, Part* part, bool partInstanceClient, c
 			+"part"+(partInstanceClient?"inst":"")+"ui.rc");
 
 //	new TDEAction(part->m_names["new"], part->info()->itemIcon(), 0, this, 
-//		TQT_SLOT(create()), actionCollection(), (part->info()->objectName()+"part_create").latin1());
+//		TQ_SLOT(create()), actionCollection(), (part->info()->objectName()+"part_create").latin1());
 
 //	new TDEAction(i18nInstanceName+"...", part->info()->itemIcon(), 0, this, 
-//		TQT_SLOT(create()), actionCollection(), (part->info()->objectName()+"part_create").latin1());
+//		TQ_SLOT(create()), actionCollection(), (part->info()->objectName()+"part_create").latin1());
 
 //	win->guiFactory()->addClient(this);
 }
diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp
index 5370ba57..31100b6f 100644
--- a/kexi/core/kexisharedactionhost.cpp
+++ b/kexi/core/kexisharedactionhost.cpp
@@ -37,7 +37,7 @@ KexiSharedActionHostPrivate::KexiSharedActionHostPrivate(KexiSharedActionHost *h
 , host(h)
 {
 	volatileActions.setAutoDelete(true);
-	connect(&actionMapper, TQT_SIGNAL(mapped(const TQString &)), this, TQT_SLOT(slotAction(const TQString &)));
+	connect(&actionMapper, TQ_SIGNAL(mapped(const TQString &)), this, TQ_SLOT(slotAction(const TQString &)));
 }
 
 void KexiSharedActionHostPrivate::slotAction(const TQString& act_id)
@@ -214,7 +214,7 @@ TQWidget* KexiSharedActionHost::focusWindow()
 
 TDEAction* KexiSharedActionHost::createSharedActionInternal( TDEAction *action )
 {
-	TQObject::connect(action,TQT_SIGNAL(activated()), &d->actionMapper, TQT_SLOT(map()));
+	TQObject::connect(action,TQ_SIGNAL(activated()), &d->actionMapper, TQ_SLOT(map()));
 	d->actionMapper.setMapping(action, action->name());
 	d->sharedActions.append( action );
 	return action;
diff --git a/kexi/core/kexiuseraction.cpp b/kexi/core/kexiuseraction.cpp
index ad97123e..994bbd56 100644
--- a/kexi/core/kexiuseraction.cpp
+++ b/kexi/core/kexiuseraction.cpp
@@ -12,11 +12,11 @@
 #include "kexiuseraction.h"
 
 KexiUserAction::KexiUserAction(KexiMainWindow *win, TDEActionCollection *parent, const TQString &name, const TQString &text, const TQString &pixmap)
- : TDEAction(text, pixmap, TDEShortcut::null(), this, TQT_SLOT(execute()), parent, name.latin1())
+ : TDEAction(text, pixmap, TDEShortcut::null(), this, TQ_SLOT(execute()), parent, name.latin1())
 {
 	m_win = win;
 	m_method = 0;
-	connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(execute()));
+	connect(this, TQ_SIGNAL(activated()), this, TQ_SLOT(execute()));
 }
 
 void
diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp
index 0ddb7afa..d6c66aad 100644
--- a/kexi/formeditor/connectiondialog.cpp
+++ b/kexi/formeditor/connectiondialog.cpp
@@ -81,20 +81,20 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent)
 	KPushButton *newItem = new KPushButton(SmallIconSet("document-new"), i18n("&New Connection"), frame);
 	vlayout->addWidget(newItem);
 	m_buttons.insert(BAdd, newItem);
-	connect(newItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItem()));
+	connect(newItem, TQ_SIGNAL(clicked()), this, TQ_SLOT(newItem()));
 
 	KPushButton *delItem = new KPushButton(SmallIconSet("edit-delete"), i18n("&Remove Connection"), frame);
 	vlayout->addWidget(delItem);
 	m_buttons.insert(BRemove, delItem);
-	connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem()));
+	connect(delItem, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeItem()));
 
 	vlayout->addStretch();
 
 	setInitialSize(TQSize(600, 300));
 	//setWFlags(WDestructiveClose);
 
-	connect(m_table,TQT_SIGNAL(cellSelected(int, int)), this, TQT_SLOT(slotCellSelected(int, int)));
-	connect(m_table->KexiDataAwareObjectInterface::data(), TQT_SIGNAL(rowInserted(KexiTableItem*,bool)), this, TQT_SLOT(slotRowInserted(KexiTableItem*,bool)));
+	connect(m_table,TQ_SIGNAL(cellSelected(int, int)), this, TQ_SLOT(slotCellSelected(int, int)));
+	connect(m_table->KexiDataAwareObjectInterface::data(), TQ_SIGNAL(rowInserted(KexiTableItem*,bool)), this, TQ_SLOT(slotRowInserted(KexiTableItem*,bool)));
 	this->newItem();
 }
 
@@ -131,10 +131,10 @@ ConnectionDialog::initTable()
 	m_table->maximizeColumnsWidth(c);
 	m_table->setColumnStretchEnabled( true, 4 );
 
-	connect(m_data, TQT_SIGNAL(aboutToChangeCell(KexiTableItem*, int, TQVariant&, KexiDB::ResultInfo*)),
-	      this,TQT_SLOT(slotCellChanged(KexiTableItem*, int, TQVariant, KexiDB::ResultInfo*)));
-	connect(m_data, TQT_SIGNAL(rowUpdated(KexiTableItem*)), this, TQT_SLOT(checkConnection(KexiTableItem *)));
-	connect(m_table, TQT_SIGNAL(itemSelected(KexiTableItem *)), this, TQT_SLOT(checkConnection(KexiTableItem *)));
+	connect(m_data, TQ_SIGNAL(aboutToChangeCell(KexiTableItem*, int, TQVariant&, KexiDB::ResultInfo*)),
+	      this,TQ_SLOT(slotCellChanged(KexiTableItem*, int, TQVariant, KexiDB::ResultInfo*)));
+	connect(m_data, TQ_SIGNAL(rowUpdated(KexiTableItem*)), this, TQ_SLOT(checkConnection(KexiTableItem *)));
+	connect(m_table, TQ_SIGNAL(itemSelected(KexiTableItem *)), this, TQ_SLOT(checkConnection(KexiTableItem *)));
 }
 
 void
@@ -366,8 +366,8 @@ void
 ConnectionDialog::newItemByDragnDrop()
 {
 	KFormDesigner::FormManager::self()->startCreatingConnection();
-	connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(connectionAborted(KFormDesigner::Form*)), this, TQT_SLOT(slotConnectionAborted(KFormDesigner::Form*)));
-	connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(connectionCreated(KFormDesigner::Form*, Connection&)), this, TQT_SLOT(slotConnectionCreated(KFormDesigner::Form*, Connection&)) );
+	connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(connectionAborted(KFormDesigner::Form*)), this, TQ_SLOT(slotConnectionAborted(KFormDesigner::Form*)));
+	connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(connectionCreated(KFormDesigner::Form*, Connection&)), this, TQ_SLOT(slotConnectionCreated(KFormDesigner::Form*, Connection&)) );
 
 	hide();
 }
diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp
index d1a4b1b6..6c477b5e 100644
--- a/kexi/formeditor/container.cpp
+++ b/kexi/formeditor/container.cpp
@@ -127,10 +127,10 @@ Container::Container(Container *toplevel, TQWidget *container, TQObject *parent,
 		else
 			m_form->objectTree()->addItem(toplevel->objectTree(), it);
 
-		connect(toplevel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDeleted()));
+		connect(toplevel, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDeleted()));
 	}
 
-	connect(container, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDeleted()));
+	connect(container, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDeleted()));
 }
 
 Container::~Container()
diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp
index 55bf34e1..b453bafb 100644
--- a/kexi/formeditor/editlistviewdialog.cpp
+++ b/kexi/formeditor/editlistviewdialog.cpp
@@ -55,35 +55,35 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
 	newRow->setTextLabel(i18n("&Add Item"), true);
 	vlayout->addWidget(newRow);
 	m_buttons.insert(BNewRow, newRow);
-	connect(newRow, TQT_SIGNAL(clicked()), this, TQT_SLOT(newRow()));
+	connect(newRow, TQ_SIGNAL(clicked()), this, TQ_SLOT(newRow()));
 
 	TQToolButton *newChild = new TQToolButton(m_contents);
 	newChild->setIconSet(BarIconSet("1rightarrow"));
 	newChild->setTextLabel(i18n("New &Subitem"), true);
 	vlayout->addWidget(newChild);
 	m_buttons.insert(BNewChild, newChild);
-	connect(newChild, TQT_SIGNAL(clicked()), this, TQT_SLOT(newChildRow()));
+	connect(newChild, TQ_SIGNAL(clicked()), this, TQ_SLOT(newChildRow()));
 
 	TQToolButton *delRow = new TQToolButton(m_contents);
 	delRow->setIconSet(BarIconSet("edit_remove"));
 	delRow->setTextLabel(i18n("&Remove Item"), true);
 	vlayout->addWidget(delRow);
 	m_buttons.insert(BRemRow, delRow);
-	connect(delRow, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeRow()));
+	connect(delRow, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeRow()));
 
 	TQToolButton *rowUp = new TQToolButton(m_contents);
 	rowUp->setIconSet(BarIconSet("1uparrow"));
 	rowUp->setTextLabel(i18n("Move Item &Up"), true);
 	vlayout->addWidget(rowUp);
 	m_buttons.insert(BRowUp, rowUp);
-	connect(rowUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveRowUp()));
+	connect(rowUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(MoveRowUp()));
 
 	TQToolButton *rowDown = new TQToolButton(m_contents);
 	rowDown->setIconSet(BarIconSet("1downarrow"));
 	rowDown->setTextLabel(i18n("Move Item &Down"), true);
 	vlayout->addWidget(rowDown);
 	m_buttons.insert(BRowDown, rowDown);
-	connect(rowDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveRowDown()));
+	connect(rowDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(MoveRowDown()));
 	vlayout->addStretch();
 
 	//// The listview ///////////
@@ -98,8 +98,8 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
 	m_listview->setSorting(-1);
 	layout->addWidget(m_listview);
 	m_listview->setFocus();
-	connect(m_listview, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*)));
-	connect(m_listview, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*)));
+	connect(m_listview, TQ_SIGNAL(currentChanged(TQListViewItem*)), this, TQ_SLOT(updateButtons(TQListViewItem*)));
+	connect(m_listview, TQ_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), this, TQ_SLOT(updateButtons(TQListViewItem*)));
 
 	/////////////////// Setup the columns page ////////////////
 	TQHBoxLayout *hbox = new TQHBoxLayout(m_column, 0, 6);
@@ -113,8 +113,8 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
 	m_propSet->addProperty(new KoProperty::Property("resizable", TQVariant(true), i18n("Resizable"), i18n("Resizable") ));
 	m_propSet->addProperty(new KoProperty::Property("fullwidth", TQVariant(false), i18n("Full Width"), i18n("Full Width") ));
 	m_editor->changeSet(m_propSet);
-	connect(m_propSet, TQT_SIGNAL(propertyChanged(KoProperty::Set & KoProperty::Property&)),
-		this, TQT_SLOT(changeProperty(KoProperty::Set & KoProperty::Property&)));
+	connect(m_propSet, TQ_SIGNAL(propertyChanged(KoProperty::Set & KoProperty::Property&)),
+		this, TQ_SLOT(changeProperty(KoProperty::Set & KoProperty::Property&)));
 
 	// Setup the icon toolbar //////////
 	TQVBoxLayout *vbox = new TQVBoxLayout(hbox, 3);
@@ -123,28 +123,28 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
 	add->setTextLabel(i18n("&Add Item"), true);
 	vbox->addWidget(add);
 	m_buttons.insert(BColAdd, add);
-	connect(add, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItem()));
+	connect(add, TQ_SIGNAL(clicked()), this, TQ_SLOT(newItem()));
 
 	TQToolButton *remove = new TQToolButton(m_column);
 	remove->setIconSet(BarIconSet("edit_remove"));
 	remove->setTextLabel(i18n("&Remove Item"), true);
 	vbox->addWidget(remove);
 	m_buttons.insert(BColRem, remove);
-	connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem()));
+	connect(remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeItem()));
 
 	TQToolButton *up = new TQToolButton(m_column);
 	up->setIconSet(BarIconSet("1uparrow"));
 	up->setTextLabel(i18n("Move Item &Up"), true);
 	vbox->addWidget(up);
 	m_buttons.insert(BColUp, up);
-	connect(up, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveItemUp()));
+	connect(up, TQ_SIGNAL(clicked()), this, TQ_SLOT(MoveItemUp()));
 
 	TQToolButton *down = new TQToolButton(m_column);
 	down->setIconSet(BarIconSet("1downarrow"));
 	down->setTextLabel(i18n("Move Item &Down"), true);
 	vbox->addWidget(down);
 	m_buttons.insert(BColDown, down);
-	connect(down, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveItemDown()));
+	connect(down, TQ_SIGNAL(clicked()), this, TQ_SLOT(MoveItemDown()));
 	vbox->addStretch();
 
 	// The listbox with columns name /////
@@ -152,7 +152,7 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
 	m_listbox->setFocus();
 	hbox->insertWidget(0, m_listbox);
 	hbox->addWidget(m_editor);
-	connect(m_listbox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), this, TQT_SLOT(updateItemProperties(TQListBoxItem*)));
+	connect(m_listbox, TQ_SIGNAL(currentChanged(TQListBoxItem*)), this, TQ_SLOT(updateItemProperties(TQListBoxItem*)));
 
 	//// Init dialog and display it ////////////////////////
 	setInitialSize(TQSize(500, 300), true);
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index f2fde913..12a9760f 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -520,7 +520,7 @@ ContainerFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
 		KFDTabWidget *tab = new KFDTabWidget(p, n);
 #if defined(USE_KTabWidget) && TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
 		tab->setTabReorderingEnabled(true);
-		connect(tab, TQT_SIGNAL(movedTab(int,int)), this, TQT_SLOT(reorderTabs(int,int)));
+		connect(tab, TQ_SIGNAL(movedTab(int,int)), this, TQ_SLOT(reorderTabs(int,int)));
 #endif
 		container->form()->objectTree()->addItem(container->objectTree(),
 			new KFormDesigner::ObjectTreeItem(
@@ -660,9 +660,9 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
 //			m_container = m_container->toplevel();
 		}
 
-		int id = menu->insertItem(SmallIconSet("tab_new"), i18n("Add Page"), this, TQT_SLOT(addTabPage()) );
-		id = menu->insertItem(SmallIconSet("edit"), i18n("Rename Page..."), this, TQT_SLOT(renameTabPage()));
-		id = menu->insertItem(SmallIconSet("tab_remove"), i18n("Remove Page"), this, TQT_SLOT(removeTabPage()));
+		int id = menu->insertItem(SmallIconSet("tab_new"), i18n("Add Page"), this, TQ_SLOT(addTabPage()) );
+		id = menu->insertItem(SmallIconSet("edit"), i18n("Rename Page..."), this, TQ_SLOT(renameTabPage()));
+		id = menu->insertItem(SmallIconSet("tab_remove"), i18n("Remove Page"), this, TQ_SLOT(removeTabPage()));
 //		if( dynamic_cast<TabWidgetBase*>(m_widget)->count() == 1)
 		if( dynamic_cast<TabWidgetBase*>(widget())->count() == 1)
 			menu->setItemEnabled(id, false);
@@ -679,18 +679,18 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
 //		m_container = container->form()->objectTree()->lookup(m_widget->name())->parent()->container();
 //		m_container = container->form()->objectTree()->lookup(stack->name())->parent()->container();
 
-		int id = menu->insertItem(SmallIconSet("tab_new"), i18n("Add Page"), this, TQT_SLOT(addStackPage()) );
+		int id = menu->insertItem(SmallIconSet("tab_new"), i18n("Add Page"), this, TQ_SLOT(addStackPage()) );
 
-		id = menu->insertItem(SmallIconSet("tab_remove"), i18n("Remove Page"), this, TQT_SLOT(removeStackPage()) );
+		id = menu->insertItem(SmallIconSet("tab_remove"), i18n("Remove Page"), this, TQ_SLOT(removeStackPage()) );
 //		if( ((TQWidgetStack*)m_widget)->children()->count() == 4) // == the stack has only one page
 		if(stack->childrenListObject().count() == 4) // == the stack has only one page
 			menu->setItemEnabled(id, false);
 
-		id = menu->insertItem(SmallIconSet("go-next"), i18n("Jump to Next Page"), this, TQT_SLOT(nextStackPage()));
+		id = menu->insertItem(SmallIconSet("go-next"), i18n("Jump to Next Page"), this, TQ_SLOT(nextStackPage()));
 		if(!stack->widget(stack->id(stack->visibleWidget())+1))
 			menu->setItemEnabled(id, false);
 
-		id = menu->insertItem(SmallIconSet("go-previous"), i18n("Jump to Previous Page"), this, TQT_SLOT(prevStackPage()));
+		id = menu->insertItem(SmallIconSet("go-previous"), i18n("Jump to Previous Page"), this, TQ_SLOT(prevStackPage()));
 		if(!stack->widget(stack->id(stack->visibleWidget()) -1) )
 			menu->setItemEnabled(id, false);
 		return true;
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index 89326c20..e970b138 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -472,12 +472,12 @@ StdWidgetFactory::createMenuActions(const TQCString &classname, TQWidget *, TQPo
 {
 	if((classname == "TQLabel") || (classname == "KTextEdit"))
 	{
-		menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQT_SLOT(editText()));
+		menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQ_SLOT(editText()));
 		return true;
 	}
 	else if(classname == "TDEListView")
 	{
-		menu->insertItem(SmallIconSet("edit"), i18n("Edit Listview Contents"), this, TQT_SLOT(editListContents()));
+		menu->insertItem(SmallIconSet("edit"), i18n("Edit Listview Contents"), this, TQ_SLOT(editListContents()));
 		return true;
 	}
 
diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp
index 349210f1..1089b5b3 100644
--- a/kexi/formeditor/form.cpp
+++ b/kexi/formeditor/form.cpp
@@ -99,8 +99,8 @@ Form::Form(WidgetLibrary* library, const char *name, bool designMode)
 	// Init actions
 	d->collection = new TDEActionCollection(0, this);
 	d->history = new KCommandHistory(d->collection, true);
-	connect(d->history, TQT_SIGNAL(commandExecuted()), this, TQT_SLOT(slotCommandExecuted()));
-	connect(d->history, TQT_SIGNAL(documentRestored()), this, TQT_SLOT(slotFormRestored()));
+	connect(d->history, TQ_SIGNAL(commandExecuted()), this, TQ_SLOT(slotCommandExecuted()));
+	connect(d->history, TQ_SIGNAL(documentRestored()), this, TQ_SLOT(slotFormRestored()));
 }
 
 Form::~Form()
@@ -141,7 +141,7 @@ Form::createToplevel(TQWidget *container, FormWidget *formWidget, const TQCStrin
 //	d->topTree->addModifiedProperty("caption", name());
 	//m_topTree->addModifiedProperty("icon");
 
-	connect(container, TQT_SIGNAL(destroyed()), this, TQT_SLOT(formDeleted()));
+	connect(container, TQ_SIGNAL(destroyed()), this, TQ_SLOT(formDeleted()));
 
 	kdDebug() << "Form::createToplevel(): d->toplevel=" << d->toplevel << endl;
 }
@@ -421,8 +421,8 @@ Form::slotCommandExecuted()
 	emit FormManager::self()->dirty(this, true);
 	d->dirty = true;
 	// because actions text is changed after the commandExecuted() signal is emitted
-	TQTimer::singleShot(10, this, TQT_SLOT(emitUndoEnabled()));
-	TQTimer::singleShot(10, this, TQT_SLOT(emitRedoEnabled()));
+	TQTimer::singleShot(10, this, TQ_SLOT(emitUndoEnabled()));
+	TQTimer::singleShot(10, this, TQ_SLOT(emitRedoEnabled()));
 }
 
 void
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index 14584e20..102acda3 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -121,7 +121,7 @@ FormManager::FormManager(TQObject *parent, int options, const char *name)
 	TDEGlobal::locale()->insertCatalogue("kformdesigner");
 #endif
 
-	connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
+	connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
 	slotSettingsChanged(TDEApplication::SETTINGS_SHORTCUTS);
 
 //moved to createWidgetLibrary()	m_lib = new WidgetLibrary(this, supportedFactoryGroups);
@@ -139,9 +139,9 @@ FormManager::FormManager(TQObject *parent, int options, const char *name)
 	m_domDoc.appendChild(m_domDoc.createElement("UI"));
 
 	m_deleteWidgetLater_list.setAutoDelete(true);
-	connect( &m_deleteWidgetLater_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(deleteWidgetLaterTimeout()));
-	connect( this, TQT_SIGNAL(connectionCreated(KFormDesigner::Form*, KFormDesigner::Connection&)),
-		this, TQT_SLOT(slotConnectionCreated(KFormDesigner::Form*, KFormDesigner::Connection&)));
+	connect( &m_deleteWidgetLater_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(deleteWidgetLaterTimeout()));
+	connect( this, TQ_SIGNAL(connectionCreated(KFormDesigner::Form*, KFormDesigner::Connection&)),
+		this, TQ_SLOT(slotConnectionCreated(KFormDesigner::Form*, KFormDesigner::Connection&)));
 
 	// register kfd custom editors
 	KoProperty::FactoryManager::self()->registerFactoryForEditor(KoProperty::Pixmap, 
@@ -187,8 +187,8 @@ FormManager::setObjectTreeView(ObjectTreeView *treeview)
 {
 	m_treeview = treeview;
 	if (m_treeview)
-		connect(m_propSet, TQT_SIGNAL(widgetNameChanged(const TQCString&, const TQCString&)),
-			m_treeview, TQT_SLOT(renameItem(const TQCString&, const TQCString&)));
+		connect(m_propSet, TQ_SIGNAL(widgetNameChanged(const TQCString&, const TQCString&)),
+			m_treeview, TQ_SLOT(renameItem(const TQCString&, const TQCString&)));
 }
 
 ActionList
@@ -196,13 +196,13 @@ FormManager::createActions(WidgetLibrary *lib, TDEActionCollection* collection,
 {
 	m_collection = collection;
 
-	ActionList actions = lib->createWidgetActions(client, m_collection, this, TQT_SLOT(insertWidget(const TQCString &)));
+	ActionList actions = lib->createWidgetActions(client, m_collection, this, TQ_SLOT(insertWidget(const TQCString &)));
 
 	if (m_options & HideSignalSlotConnections)
 		m_dragConnection = 0;
 	else {
 		m_dragConnection = new TDEToggleAction(i18n("Connect Signals/Slots"),
-			"signalslot", TDEShortcut(0), this, TQT_SLOT(startCreatingConnection()), m_collection,
+			"signalslot", TDEShortcut(0), this, TQ_SLOT(startCreatingConnection()), m_collection,
 			"drag_connection");
 		//to be exclusive with any 'widget' action
 		m_dragConnection->setExclusiveGroup("LibActionWidgets");
@@ -211,7 +211,7 @@ FormManager::createActions(WidgetLibrary *lib, TDEActionCollection* collection,
 	}
 
 	m_pointer = new TDEToggleAction(i18n("Pointer"), "mouse_pointer", TDEShortcut(0), 
-		this, TQT_SLOT(slotPointerClicked()), m_collection, "pointer");
+		this, TQ_SLOT(slotPointerClicked()), m_collection, "pointer");
 	m_pointer->setExclusiveGroup("LibActionWidgets"); //to be exclusive with any 'widget' action
 	m_pointer->setChecked(true);
 	actions.append(m_pointer);
@@ -223,7 +223,7 @@ FormManager::createActions(WidgetLibrary *lib, TDEActionCollection* collection,
 
 	// Create the Style selection action (with a combo box in toolbar and submenu items)
 	TDESelectAction *m_style = new TDESelectAction( i18n("Style"), TDEShortcut(0), 
-		this, TQT_SLOT(slotStyle()), m_collection, "change_style");
+		this, TQ_SLOT(slotStyle()), m_collection, "change_style");
 	m_style->setEditable(false);
 
 	TDEGlobal::config()->setGroup("General");
@@ -628,17 +628,17 @@ FormManager::initForm(Form *form)
 
 	m_active = form;
 
-	connect(form, TQT_SIGNAL(selectionChanged(TQWidget*, bool, bool)), 
-		m_propSet, TQT_SLOT(setSelectedWidgetWithoutReload(TQWidget*, bool, bool)));
+	connect(form, TQ_SIGNAL(selectionChanged(TQWidget*, bool, bool)), 
+		m_propSet, TQ_SLOT(setSelectedWidgetWithoutReload(TQWidget*, bool, bool)));
 	if(m_treeview)
 	{
-		connect(form, TQT_SIGNAL(selectionChanged(TQWidget*, bool, bool)), 
-			m_treeview, TQT_SLOT(setSelectedWidget(TQWidget*, bool)));
-		connect(form, TQT_SIGNAL(childAdded(ObjectTreeItem* )), m_treeview, TQT_SLOT(addItem(ObjectTreeItem*)));
-		connect(form, TQT_SIGNAL(childRemoved(ObjectTreeItem* )), m_treeview, TQT_SLOT(removeItem(ObjectTreeItem*)));
+		connect(form, TQ_SIGNAL(selectionChanged(TQWidget*, bool, bool)), 
+			m_treeview, TQ_SLOT(setSelectedWidget(TQWidget*, bool)));
+		connect(form, TQ_SIGNAL(childAdded(ObjectTreeItem* )), m_treeview, TQ_SLOT(addItem(ObjectTreeItem*)));
+		connect(form, TQ_SIGNAL(childRemoved(ObjectTreeItem* )), m_treeview, TQ_SLOT(removeItem(ObjectTreeItem*)));
 	}
-	connect(m_propSet, TQT_SIGNAL(widgetNameChanged(const TQCString&, const TQCString&)),
-		form, TQT_SLOT(changeName(const TQCString&, const TQCString&)));
+	connect(m_propSet, TQ_SIGNAL(widgetNameChanged(const TQCString&, const TQCString&)),
+		form, TQ_SLOT(changeName(const TQCString&, const TQCString&)));
 
 	form->setSelectedWidget(form->widget());
 	windowChanged(form->widget());
@@ -923,7 +923,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 
 		/*int id =*/ m_popup->insertItem(i18n("Choose Buddy..."), sub);
 //		menuIds->append(id);
-		connect(sub, TQT_SIGNAL(activated(int)), this, TQT_SLOT(buddyChosen(int)));
+		connect(sub, TQ_SIGNAL(activated(int)), this, TQ_SLOT(buddyChosen(int)));
 
 		separatorNeeded = true;
 	}
@@ -946,7 +946,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 //		menuIds->append(id);
 		if(list.isEmpty())
 			m_popup->setItemEnabled(id, false);
-		connect(sigMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuSignalChosen(int)));
+		connect(sigMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuSignalChosen(int)));
 		separatorNeeded = true;
 	}
 #endif
diff --git a/kexi/formeditor/libactionwidget.cpp b/kexi/formeditor/libactionwidget.cpp
index 4322ad18..b98843d2 100644
--- a/kexi/formeditor/libactionwidget.cpp
+++ b/kexi/formeditor/libactionwidget.cpp
@@ -26,7 +26,7 @@
 using namespace KFormDesigner;
 
 LibActionWidget::LibActionWidget(WidgetInfo *w, TDEActionCollection *c)
- : TDEToggleAction(w->name(), w->pixmap(), 0/*Key_F5*/, 0, 0 /*TQT_SLOT(slotWidget())*/, 
+ : TDEToggleAction(w->name(), w->pixmap(), 0/*Key_F5*/, 0, 0 /*TQ_SLOT(slotWidget())*/, 
 	c, TQString("library_widget_" + w->className()).latin1())
 {
 //	kdDebug() << "LibActionWidget::LibActionWidget(): " << TQString("library_widget_" + w->className()).latin1() << endl;
@@ -34,7 +34,7 @@ LibActionWidget::LibActionWidget(WidgetInfo *w, TDEActionCollection *c)
 	setExclusiveGroup("LibActionWidgets");
 	setToolTip(w->name());
 	setWhatsThis(w->description());
-//	connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(slotWidget()));
+//	connect(this, TQ_SIGNAL(activated()), this, TQ_SLOT(slotWidget()));
 }
 
 void
diff --git a/kexi/formeditor/objecttreeview.cpp b/kexi/formeditor/objecttreeview.cpp
index 22434c87..0614da0e 100644
--- a/kexi/formeditor/objecttreeview.cpp
+++ b/kexi/formeditor/objecttreeview.cpp
@@ -172,12 +172,12 @@ ObjectTreeView::ObjectTreeView(TQWidget *parent, const char *name, bool tabStop)
 
 	installEventFilter(this);
 
-	connect((TQObject*)header(), TQT_SIGNAL(sectionHandleDoubleClicked(int)), this, TQT_SLOT(slotColumnSizeChanged(int)));
+	connect((TQObject*)header(), TQ_SIGNAL(sectionHandleDoubleClicked(int)), this, TQ_SLOT(slotColumnSizeChanged(int)));
 	if(!tabStop)
 	{
 		setSelectionModeExt(Extended);
-		connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
-		connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)), this, TQT_SLOT(displayContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+		connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
+		connect(this, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)), this, TQ_SLOT(displayContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
 	}
 
 	setFullWidth(true);
@@ -323,7 +323,7 @@ void
 ObjectTreeView::setForm(Form *form)
 {
 	if (m_form)
-		disconnect(m_form, TQT_SIGNAL(destroying()), this, TQT_SLOT(slotBeforeFormDestroyed()));
+		disconnect(m_form, TQ_SIGNAL(destroying()), this, TQ_SLOT(slotBeforeFormDestroyed()));
 	m_form = form;
 	m_topItem = 0;
 	clear();
@@ -331,7 +331,7 @@ ObjectTreeView::setForm(Form *form)
 	if(!m_form)
 		return;
 
-	connect(m_form, TQT_SIGNAL(destroying()), this, TQT_SLOT(slotBeforeFormDestroyed()));
+	connect(m_form, TQ_SIGNAL(destroying()), this, TQ_SLOT(slotBeforeFormDestroyed()));
 
 	// Creates the hidden top Item
 	m_topItem = new ObjectTreeViewItem(this);
diff --git a/kexi/formeditor/resizehandle.cpp b/kexi/formeditor/resizehandle.cpp
index ab46ecd7..13301789 100644
--- a/kexi/formeditor/resizehandle.cpp
+++ b/kexi/formeditor/resizehandle.cpp
@@ -109,7 +109,7 @@ bool ResizeHandle::eventFilter(TQObject *o, TQEvent *ev)
 {
 	if (((ev->type() == TQEvent::Move) || (ev->type() == TQEvent::Resize)) && o == m_set->m_widget)
 	{
-		//TQTimer::singleShot(0,this,TQT_SLOT(updatePos()));
+		//TQTimer::singleShot(0,this,TQ_SLOT(updatePos()));
 		updatePos();
 	}
 /*	else if (ev->type() == TQEvent::Paint && o == this) {
diff --git a/kexi/formeditor/richtextdialog.cpp b/kexi/formeditor/richtextdialog.cpp
index c2f47c6c..eed6ddcb 100644
--- a/kexi/formeditor/richtextdialog.cpp
+++ b/kexi/formeditor/richtextdialog.cpp
@@ -46,13 +46,13 @@ RichTextDialog::RichTextDialog(TQWidget *parent, const TQString &text)
 
 	m_fcombo = new TDEFontCombo(m_toolbar);
 	m_toolbar->insertWidget(TBFont, 40, m_fcombo);
-	connect(m_fcombo, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changeFont(const TQString &)));
+	connect(m_fcombo, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(changeFont(const TQString &)));
 
 	m_toolbar->insertSeparator();
 
 	m_colCombo = new KColorCombo(m_toolbar);
 	m_toolbar->insertWidget(TBColor, 30, m_colCombo);
-	connect(m_colCombo, TQT_SIGNAL(activated(const TQColor&)), this, TQT_SLOT(changeColor(const TQColor&)));
+	connect(m_colCombo, TQ_SIGNAL(activated(const TQColor&)), this, TQ_SLOT(changeColor(const TQColor&)));
 
 	m_toolbar->insertButton("format-text-bold", TBBold, true, i18n("Bold"));
 	m_toolbar->insertButton("format-text-italic", TBItalic, true, i18n("Italic"));
@@ -82,15 +82,15 @@ RichTextDialog::RichTextDialog(TQWidget *parent, const TQString &text)
 	m_toolbar->setToggle(TBJustify, true);
 	group->addButton(TBJustify);
 
-	connect(m_toolbar, TQT_SIGNAL(toggled(int)), this, TQT_SLOT(buttonToggled(int)));
+	connect(m_toolbar, TQ_SIGNAL(toggled(int)), this, TQ_SLOT(buttonToggled(int)));
 
 	m_edit = new KTextEdit(text, TQString(), frame, "richtext_edit");
 	m_edit->setTextFormat(RichText);
 	m_edit->setFocus();
 
-	connect(m_edit, TQT_SIGNAL(cursorPositionChanged(int, int)), this, TQT_SLOT(cursorPositionChanged(int, int)));
-	connect(m_edit, TQT_SIGNAL(clicked(int, int)), this, TQT_SLOT(cursorPositionChanged(int, int)));
-	connect(m_edit, TQT_SIGNAL(currentVerticalAlignmentChanged(VerticalAlignment)), this, TQT_SLOT(slotVerticalAlignmentChanged(VerticalAlignment)));
+	connect(m_edit, TQ_SIGNAL(cursorPositionChanged(int, int)), this, TQ_SLOT(cursorPositionChanged(int, int)));
+	connect(m_edit, TQ_SIGNAL(clicked(int, int)), this, TQ_SLOT(cursorPositionChanged(int, int)));
+	connect(m_edit, TQ_SIGNAL(currentVerticalAlignmentChanged(VerticalAlignment)), this, TQ_SLOT(slotVerticalAlignmentChanged(VerticalAlignment)));
 
 	m_edit->moveCursor(TQTextEdit::MoveEnd, false);
 	cursorPositionChanged(0, 0);
diff --git a/kexi/formeditor/scripting/scriptmanager.cpp b/kexi/formeditor/scripting/scriptmanager.cpp
index 73bf70e3..cf2929b7 100644
--- a/kexi/formeditor/scripting/scriptmanager.cpp
+++ b/kexi/formeditor/scripting/scriptmanager.cpp
@@ -56,8 +56,8 @@ void
 ScriptManager::setFormManager(FormManager *manager)
 {
 	m_formManager = manager;
-	connect(m_formManager, TQT_SIGNAL(aboutToDeleteForm(KFormDesigner::Form*)), this, TQT_SLOT(slotFormDeleted(KFormDesigner::Form*)));
-	connect(m_formManager, TQT_SIGNAL(formCreated(KFormDesigner::Form*)), this, TQT_SLOT(newFormScript(KFormDesigner::Form*)));
+	connect(m_formManager, TQ_SIGNAL(aboutToDeleteForm(KFormDesigner::Form*)), this, TQ_SLOT(slotFormDeleted(KFormDesigner::Form*)));
+	connect(m_formManager, TQ_SIGNAL(formCreated(KFormDesigner::Form*)), this, TQ_SLOT(newFormScript(KFormDesigner::Form*)));
 }
 
 void
diff --git a/kexi/formeditor/tabstopdialog.cpp b/kexi/formeditor/tabstopdialog.cpp
index bbc34098..2c1a5132 100644
--- a/kexi/formeditor/tabstopdialog.cpp
+++ b/kexi/formeditor/tabstopdialog.cpp
@@ -51,24 +51,24 @@ TabStopDialog::TabStopDialog(TQWidget *parent)
 	l->addWidget(m_treeview, 0, 0);
 
 	m_treeview->m_form = 0;
-	connect(m_treeview, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*)));
-	connect(m_treeview, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*)));
+	connect(m_treeview, TQ_SIGNAL(currentChanged(TQListViewItem*)), this, TQ_SLOT(updateButtons(TQListViewItem*)));
+	connect(m_treeview, TQ_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), this, TQ_SLOT(updateButtons(TQListViewItem*)));
 
 	TQVBoxLayout *vbox = new TQVBoxLayout();
 	l->addLayout(vbox, 0, 1);
 	m_btnUp = new KPushButton(SmallIconSet("1uparrow"), i18n("Move Up"), frame);
 	TQToolTip::add( m_btnUp, i18n("Move widget up") );
 	vbox->addWidget(m_btnUp);
-	connect(m_btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveItemUp()));
+	connect(m_btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveItemUp()));
 
 	m_btnDown = new KPushButton(SmallIconSet("1downarrow"), i18n("Move Down"), frame);
 	TQToolTip::add( m_btnDown, i18n("Move widget down") );
 	vbox->addWidget(m_btnDown);
-	connect(m_btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveItemDown()));
+	connect(m_btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveItemDown()));
 	vbox->addStretch();
 
 	m_check = new TQCheckBox(i18n("Handle tab order automatically"), frame, "tabstops_check");
-	connect(m_check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotRadioClicked(bool)));
+	connect(m_check, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotRadioClicked(bool)));
 	l->addMultiCellWidget(m_check, 1, 1, 0, 1);
 
 	updateGeometry();
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
index dfd56a22..c200dc33 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
@@ -172,21 +172,21 @@ KFormDesignerKDevPart::KFormDesignerKDevPart(TQWidget *parent, const char *name,
 		setModified(false);
 
 		// action stuff
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(widgetSelected(KFormDesigner::Form*, bool)), TQT_SLOT(slotWidgetSelected(KFormDesigner::Form*, bool)));
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(formWidgetSelected(KFormDesigner::Form*)), TQT_SLOT(slotFormWidgetSelected(KFormDesigner::Form*)));
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(noFormSelected()), TQT_SLOT(slotNoFormSelected()));
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(undoEnabled(bool, const TQString&)), TQT_SLOT(setUndoEnabled(bool, const TQString&)));
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(redoEnabled(bool, const TQString&)), TQT_SLOT(setRedoEnabled(bool, const TQString&)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(widgetSelected(KFormDesigner::Form*, bool)), TQ_SLOT(slotWidgetSelected(KFormDesigner::Form*, bool)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(formWidgetSelected(KFormDesigner::Form*)), TQ_SLOT(slotFormWidgetSelected(KFormDesigner::Form*)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(noFormSelected()), TQ_SLOT(slotNoFormSelected()));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(undoEnabled(bool, const TQString&)), TQ_SLOT(setUndoEnabled(bool, const TQString&)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(redoEnabled(bool, const TQString&)), TQ_SLOT(setRedoEnabled(bool, const TQString&)));
 
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(dirty(KFormDesigner::Form*, bool)), this, TQT_SLOT(slotFormModified(KFormDesigner::Form*, bool)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(dirty(KFormDesigner::Form*, bool)), this, TQ_SLOT(slotFormModified(KFormDesigner::Form*, bool)));
 
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(createFormSlot(KFormDesigner::Form*, const TQString&, const TQString&)),
-			this, TQT_SLOT(slotCreateFormSlot(KFormDesigner::Form*, const TQString&, const TQString &)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(createFormSlot(KFormDesigner::Form*, const TQString&, const TQString&)),
+			this, TQ_SLOT(slotCreateFormSlot(KFormDesigner::Form*, const TQString&, const TQString &)));
 	}
 
 	container->show();
 	setWidget(container);
-	connect(m_workspace, TQT_SIGNAL(windowActivated(TQWidget*)), KFormDesigner::FormManager::self(), TQT_SLOT(windowChanged(TQWidget*)));
+	connect(m_workspace, TQ_SIGNAL(windowActivated(TQWidget*)), KFormDesigner::FormManager::self(), TQ_SLOT(windowChanged(TQWidget*)));
 	slotNoFormSelected();
 }
 
@@ -198,45 +198,45 @@ KFormDesigner::WidgetLibrary* KFormDesignerKDevPart::formsLibrary()
 void
 KFormDesignerKDevPart::setupActions()
 {
-	KStdAction::open(this, TQT_SLOT(open()), actionCollection());
-	KStdAction::openNew(this, TQT_SLOT(createBlankForm()), actionCollection());
-	KStdAction::save(this, TQT_SLOT(save()), actionCollection());
-	KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection());
-	KStdAction::cut(KFormDesigner::FormManager::self(), TQT_SLOT(cutWidget()), actionCollection());
-	KStdAction::copy(KFormDesigner::FormManager::self(), TQT_SLOT(copyWidget()), actionCollection());
-	KStdAction::paste(KFormDesigner::FormManager::self(), TQT_SLOT(pasteWidget()), actionCollection());
-	KStdAction::undo(KFormDesigner::FormManager::self(), TQT_SLOT(undo()), actionCollection());
-	KStdAction::redo(KFormDesigner::FormManager::self(), TQT_SLOT(redo()), actionCollection());
-	KStdAction::selectAll(KFormDesigner::FormManager::self(), TQT_SLOT(selectAll()), actionCollection());
-	new TDEAction(i18n("Clear Widget Contents"), "edit-clear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents");
-	new TDEAction(i18n("Delete Widget"), "edit-delete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete");
-	new TDEAction(i18n("Preview Form"), "document-print-preview", "Ctrl+T", this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form");
-	new TDEAction(i18n("Edit Tab Order"), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), actionCollection(), "taborder");
-	new TDEAction(i18n("Edit Pixmap Collection"), "icons", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection");
-	new TDEAction(i18n("Edit Form Connections"), "connections", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections");
-
-	new TDEAction(i18n("Lay Out Widgets &Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox");
-	new TDEAction(i18n("Lay Out Widgets &Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox");
-	new TDEAction(i18n("Lay Out Widgets in &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid");
-	new TDEAction(i18n("&Break Layout"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout");
-
-	new TDEAction(i18n("Bring Widget to Front"), "raise", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise");
-	new TDEAction(i18n("Send Widget to Back"), "lower", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()), actionCollection(), "format_lower");
+	KStdAction::open(this, TQ_SLOT(open()), actionCollection());
+	KStdAction::openNew(this, TQ_SLOT(createBlankForm()), actionCollection());
+	KStdAction::save(this, TQ_SLOT(save()), actionCollection());
+	KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection());
+	KStdAction::cut(KFormDesigner::FormManager::self(), TQ_SLOT(cutWidget()), actionCollection());
+	KStdAction::copy(KFormDesigner::FormManager::self(), TQ_SLOT(copyWidget()), actionCollection());
+	KStdAction::paste(KFormDesigner::FormManager::self(), TQ_SLOT(pasteWidget()), actionCollection());
+	KStdAction::undo(KFormDesigner::FormManager::self(), TQ_SLOT(undo()), actionCollection());
+	KStdAction::redo(KFormDesigner::FormManager::self(), TQ_SLOT(redo()), actionCollection());
+	KStdAction::selectAll(KFormDesigner::FormManager::self(), TQ_SLOT(selectAll()), actionCollection());
+	new TDEAction(i18n("Clear Widget Contents"), "edit-clear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(clearWidgetContent()), actionCollection(), "clear_contents");
+	new TDEAction(i18n("Delete Widget"), "edit-delete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(deleteWidget()), actionCollection(), "edit_delete");
+	new TDEAction(i18n("Preview Form"), "document-print-preview", "Ctrl+T", this, TQ_SLOT(slotPreviewForm()), actionCollection(), "preview_form");
+	new TDEAction(i18n("Edit Tab Order"), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editTabOrder()), actionCollection(), "taborder");
+	new TDEAction(i18n("Edit Pixmap Collection"), "icons", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection");
+	new TDEAction(i18n("Edit Form Connections"), "connections", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editConnections()), actionCollection(), "form_connections");
+
+	new TDEAction(i18n("Lay Out Widgets &Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutHBox()), actionCollection(), "layout_hbox");
+	new TDEAction(i18n("Lay Out Widgets &Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutVBox()), actionCollection(), "layout_vbox");
+	new TDEAction(i18n("Lay Out Widgets in &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutGrid()), actionCollection(), "layout_grid");
+	new TDEAction(i18n("&Break Layout"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(breakLayout()), actionCollection(), "break_layout");
+
+	new TDEAction(i18n("Bring Widget to Front"), "raise", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(bringWidgetToFront()), actionCollection(), "format_raise");
+	new TDEAction(i18n("Send Widget to Back"), "lower", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(sendWidgetToBack()), actionCollection(), "format_lower");
 
 	TDEActionMenu *alignMenu = new TDEActionMenu(i18n("Align Widgets' Positions"), "aopos2grid", actionCollection(), "align_menu");
-	alignMenu->insert( new TDEAction(i18n("To Left"), "aoleft", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") );
-	alignMenu->insert( new TDEAction(i18n("To Right"), "aoright", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") );
-	alignMenu->insert( new TDEAction(i18n("To Top"), "aotop", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") );
-	alignMenu->insert( new TDEAction(i18n("To Bottom"), "aobottom", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") );
-	alignMenu->insert( new TDEAction(i18n("To Grid"), "aopos2grid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") );
+	alignMenu->insert( new TDEAction(i18n("To Left"), "aoleft", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") );
+	alignMenu->insert( new TDEAction(i18n("To Right"), "aoright", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") );
+	alignMenu->insert( new TDEAction(i18n("To Top"), "aotop", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") );
+	alignMenu->insert( new TDEAction(i18n("To Bottom"), "aobottom", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") );
+	alignMenu->insert( new TDEAction(i18n("To Grid"), "aopos2grid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") );
 
 	TDEActionMenu *sizeMenu = new TDEActionMenu(i18n("Adjust Widgets' Sizes"), "aogrid", actionCollection(), "adjust_size_menu");
-	sizeMenu->insert( new TDEAction(i18n("To Fit"), "aofit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") );
-	sizeMenu->insert( new TDEAction(i18n("To Grid"), "aogrid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") );
-	sizeMenu->insert( new TDEAction(i18n("To Shortest"), "aoshortest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") );
-	sizeMenu->insert( new TDEAction(i18n("To Tallest"), "aotallest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") );
-	sizeMenu->insert( new TDEAction(i18n("To Narrowest"), "aonarrowest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") );
-	sizeMenu->insert( new TDEAction(i18n("To Widest"), "aowidest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") );
+	sizeMenu->insert( new TDEAction(i18n("To Fit"), "aofit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") );
+	sizeMenu->insert( new TDEAction(i18n("To Grid"), "aogrid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") );
+	sizeMenu->insert( new TDEAction(i18n("To Shortest"), "aoshortest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") );
+	sizeMenu->insert( new TDEAction(i18n("To Tallest"), "aotallest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") );
+	sizeMenu->insert( new TDEAction(i18n("To Narrowest"), "aonarrowest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") );
+	sizeMenu->insert( new TDEAction(i18n("To Widest"), "aowidest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") );
 
 	if(m_inShell)
 		setXMLFile("kformdesigner_part_shell.rc");
diff --git a/kexi/formeditor/test/kfd_mainwindow.cpp b/kexi/formeditor/test/kfd_mainwindow.cpp
index 455fd311..e8adc2ac 100644
--- a/kexi/formeditor/test/kfd_mainwindow.cpp
+++ b/kexi/formeditor/test/kfd_mainwindow.cpp
@@ -73,7 +73,7 @@ KFDMainWindow::loadUIFile(const KURL &url)
 void
 KFDMainWindow::setupActions()
 {
-	KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+	KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
 }
 
 bool
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index 735b9a9e..7c9dd774 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -172,19 +172,19 @@ KFormDesignerPart::KFormDesignerPart(TQWidget *parent, const char *name, bool re
 		setModified(false);
 
 		// action stuff
-//		connect(m_manager, TQT_SIGNAL(widgetSelected(KFormDesigner::Form*, bool)), TQT_SLOT(slotWidgetSelected(KFormDesigner::Form*, bool)));
-//		connect(m_manager, TQT_SIGNAL(formWidgetSelected(KFormDesigner::Form*)), TQT_SLOT(slotFormWidgetSelected(KFormDesigner::Form*)));
-//		connect(m_manager, TQT_SIGNAL(noFormSelected()), TQT_SLOT(slotNoFormSelected()));
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(undoEnabled(bool, const TQString&)), TQT_SLOT(setUndoEnabled(bool, const TQString&)));
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(redoEnabled(bool, const TQString&)), TQT_SLOT(setRedoEnabled(bool, const TQString&)));
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(dirty(KFormDesigner::Form*, bool)), this, TQT_SLOT(slotFormModified(KFormDesigner::Form*, bool)));
+//		connect(m_manager, TQ_SIGNAL(widgetSelected(KFormDesigner::Form*, bool)), TQ_SLOT(slotWidgetSelected(KFormDesigner::Form*, bool)));
+//		connect(m_manager, TQ_SIGNAL(formWidgetSelected(KFormDesigner::Form*)), TQ_SLOT(slotFormWidgetSelected(KFormDesigner::Form*)));
+//		connect(m_manager, TQ_SIGNAL(noFormSelected()), TQ_SLOT(slotNoFormSelected()));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(undoEnabled(bool, const TQString&)), TQ_SLOT(setUndoEnabled(bool, const TQString&)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(redoEnabled(bool, const TQString&)), TQ_SLOT(setRedoEnabled(bool, const TQString&)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(dirty(KFormDesigner::Form*, bool)), this, TQ_SLOT(slotFormModified(KFormDesigner::Form*, bool)));
 	}
 
 	container->show();
 	setWidget(container);
-	connect(m_workspace, TQT_SIGNAL(windowActivated(TQWidget*)), KFormDesigner::FormManager::self(), TQT_SLOT(windowChanged(TQWidget*)));
-	connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(propertySetSwitched(KoProperty::Set*, bool, const TQCString&)),
-		this, TQT_SLOT(slotPropertySetSwitched(KoProperty::Set*, bool, const TQCString&)));
+	connect(m_workspace, TQ_SIGNAL(windowActivated(TQWidget*)), KFormDesigner::FormManager::self(), TQ_SLOT(windowChanged(TQWidget*)));
+	connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(propertySetSwitched(KoProperty::Set*, bool, const TQCString&)),
+		this, TQ_SLOT(slotPropertySetSwitched(KoProperty::Set*, bool, const TQCString&)));
 
 //	slotNoFormSelected();
 	KFormDesigner::FormManager::self()->emitNoFormSelected();
@@ -202,58 +202,58 @@ KFormDesigner::WidgetLibrary* KFormDesignerPart::formsLibrary()
 void
 KFormDesignerPart::setupActions()
 {
-	KStdAction::open(this, TQT_SLOT(open()), actionCollection());
-	KStdAction::openNew(this, TQT_SLOT(createBlankForm()), actionCollection());
-	KStdAction::save(this, TQT_SLOT(save()), actionCollection());
-	KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection());
-	KStdAction::cut(KFormDesigner::FormManager::self(), TQT_SLOT(cutWidget()), actionCollection());
-	KStdAction::copy(KFormDesigner::FormManager::self(), TQT_SLOT(copyWidget()), actionCollection());
-	KStdAction::paste(KFormDesigner::FormManager::self(), TQT_SLOT(pasteWidget()), actionCollection());
-	KStdAction::undo(KFormDesigner::FormManager::self(), TQT_SLOT(undo()), actionCollection());
-	KStdAction::redo(KFormDesigner::FormManager::self(), TQT_SLOT(redo()), actionCollection());
-	KStdAction::selectAll(KFormDesigner::FormManager::self(), TQT_SLOT(selectAll()), actionCollection());
-	new TDEAction(i18n("Clear Widget Contents"), "edit-clear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents");
-	new TDEAction(i18n("Delete Widget"), "edit-delete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete");
-	new TDEAction(i18n("Preview Form"), "document-print-preview", CTRL+Key_T, this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form");
-	new TDEAction(i18n("Edit Tab Order"), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), actionCollection(), "taborder");
-	new TDEAction(i18n("Edit Pixmap Collection"), "icons", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection");
-	new TDEAction(i18n("Edit Form Connections"), "connections", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections");
+	KStdAction::open(this, TQ_SLOT(open()), actionCollection());
+	KStdAction::openNew(this, TQ_SLOT(createBlankForm()), actionCollection());
+	KStdAction::save(this, TQ_SLOT(save()), actionCollection());
+	KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection());
+	KStdAction::cut(KFormDesigner::FormManager::self(), TQ_SLOT(cutWidget()), actionCollection());
+	KStdAction::copy(KFormDesigner::FormManager::self(), TQ_SLOT(copyWidget()), actionCollection());
+	KStdAction::paste(KFormDesigner::FormManager::self(), TQ_SLOT(pasteWidget()), actionCollection());
+	KStdAction::undo(KFormDesigner::FormManager::self(), TQ_SLOT(undo()), actionCollection());
+	KStdAction::redo(KFormDesigner::FormManager::self(), TQ_SLOT(redo()), actionCollection());
+	KStdAction::selectAll(KFormDesigner::FormManager::self(), TQ_SLOT(selectAll()), actionCollection());
+	new TDEAction(i18n("Clear Widget Contents"), "edit-clear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(clearWidgetContent()), actionCollection(), "clear_contents");
+	new TDEAction(i18n("Delete Widget"), "edit-delete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(deleteWidget()), actionCollection(), "edit_delete");
+	new TDEAction(i18n("Preview Form"), "document-print-preview", CTRL+Key_T, this, TQ_SLOT(slotPreviewForm()), actionCollection(), "preview_form");
+	new TDEAction(i18n("Edit Tab Order"), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editTabOrder()), actionCollection(), "taborder");
+	new TDEAction(i18n("Edit Pixmap Collection"), "icons", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection");
+	new TDEAction(i18n("Edit Form Connections"), "connections", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editConnections()), actionCollection(), "form_connections");
 
 	TDEActionMenu *layoutMenu = new TDEActionMenu(i18n("Group Widgets"), "", actionCollection(), "layout_menu");
-	layoutMenu->insert(new TDEAction(i18n("&Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox"));
-	layoutMenu->insert(new TDEAction(i18n("&Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox"));
-	layoutMenu->insert(new TDEAction(i18n("In &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid"));
-	layoutMenu->insert(new TDEAction(i18n("By &Rows"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHFlow()), actionCollection(), "layout_hflow"));
-	layoutMenu->insert(new TDEAction(i18n("By &Columns"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVFlow()), actionCollection(), "layout_vflow"));
-	layoutMenu->insert(new TDEAction(i18n("Horizontally in &Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter"));
-	layoutMenu->insert(new TDEAction(i18n("Verti&cally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter"));
-	new TDEAction(i18n("&Ungroup Widgets"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout");
+	layoutMenu->insert(new TDEAction(i18n("&Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutHBox()), actionCollection(), "layout_hbox"));
+	layoutMenu->insert(new TDEAction(i18n("&Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutVBox()), actionCollection(), "layout_vbox"));
+	layoutMenu->insert(new TDEAction(i18n("In &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutGrid()), actionCollection(), "layout_grid"));
+	layoutMenu->insert(new TDEAction(i18n("By &Rows"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutHFlow()), actionCollection(), "layout_hflow"));
+	layoutMenu->insert(new TDEAction(i18n("By &Columns"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutVFlow()), actionCollection(), "layout_vflow"));
+	layoutMenu->insert(new TDEAction(i18n("Horizontally in &Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter"));
+	layoutMenu->insert(new TDEAction(i18n("Verti&cally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter"));
+	new TDEAction(i18n("&Ungroup Widgets"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(breakLayout()), actionCollection(), "break_layout");
 
 /*
-	new TDEAction(i18n("Lay Out Widgets &Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox");
-	new TDEAction(i18n("Lay Out Widgets &Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox");
-	new TDEAction(i18n("Lay Out Widgets in &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid");
-	new TDEAction(i18n("Lay Out Widgets H&orizontally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter");
-	new TDEAction(i18n("Lay Out Widgets Verti&cally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter");
-	new TDEAction(i18n("&Break Layout"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout");
+	new TDEAction(i18n("Lay Out Widgets &Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutHBox()), actionCollection(), "layout_hbox");
+	new TDEAction(i18n("Lay Out Widgets &Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutVBox()), actionCollection(), "layout_vbox");
+	new TDEAction(i18n("Lay Out Widgets in &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutGrid()), actionCollection(), "layout_grid");
+	new TDEAction(i18n("Lay Out Widgets H&orizontally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter");
+	new TDEAction(i18n("Lay Out Widgets Verti&cally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter");
+	new TDEAction(i18n("&Break Layout"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(breakLayout()), actionCollection(), "break_layout");
 */
-	new TDEAction(i18n("Bring Widget to Front"), "raise", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise");
-	new TDEAction(i18n("Send Widget to Back"), "lower", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()), actionCollection(), "format_lower");
+	new TDEAction(i18n("Bring Widget to Front"), "raise", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(bringWidgetToFront()), actionCollection(), "format_raise");
+	new TDEAction(i18n("Send Widget to Back"), "lower", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(sendWidgetToBack()), actionCollection(), "format_lower");
 
 	TDEActionMenu *alignMenu = new TDEActionMenu(i18n("Align Widgets' Positions"), "aopos2grid", actionCollection(), "align_menu");
-	alignMenu->insert( new TDEAction(i18n("To Left"), "aoleft", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") );
-	alignMenu->insert( new TDEAction(i18n("To Right"), "aoright", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") );
-	alignMenu->insert( new TDEAction(i18n("To Top"), "aotop", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") );
-	alignMenu->insert( new TDEAction(i18n("To Bottom"), "aobottom", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") );
-	alignMenu->insert( new TDEAction(i18n("To Grid"), "aopos2grid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") );
+	alignMenu->insert( new TDEAction(i18n("To Left"), "aoleft", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") );
+	alignMenu->insert( new TDEAction(i18n("To Right"), "aoright", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") );
+	alignMenu->insert( new TDEAction(i18n("To Top"), "aotop", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") );
+	alignMenu->insert( new TDEAction(i18n("To Bottom"), "aobottom", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") );
+	alignMenu->insert( new TDEAction(i18n("To Grid"), "aopos2grid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") );
 
 	TDEActionMenu *sizeMenu = new TDEActionMenu(i18n("Adjust Widgets' Sizes"), "aogrid", actionCollection(), "adjust_size_menu");
-	sizeMenu->insert( new TDEAction(i18n("To Fit"), "aofit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") );
-	sizeMenu->insert( new TDEAction(i18n("To Grid"), "aogrid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") );
-	sizeMenu->insert( new TDEAction(i18n("To Shortest"), "aoshortest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") );
-	sizeMenu->insert( new TDEAction(i18n("To Tallest"), "aotallest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") );
-	sizeMenu->insert( new TDEAction(i18n("To Narrowest"), "aonarrowest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") );
-	sizeMenu->insert( new TDEAction(i18n("To Widest"), "aowidest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") );
+	sizeMenu->insert( new TDEAction(i18n("To Fit"), "aofit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") );
+	sizeMenu->insert( new TDEAction(i18n("To Grid"), "aogrid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") );
+	sizeMenu->insert( new TDEAction(i18n("To Shortest"), "aoshortest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") );
+	sizeMenu->insert( new TDEAction(i18n("To Tallest"), "aotallest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") );
+	sizeMenu->insert( new TDEAction(i18n("To Narrowest"), "aonarrowest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") );
+	sizeMenu->insert( new TDEAction(i18n("To Widest"), "aowidest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") );
 
 	if(m_inShell)
 		setXMLFile("kformdesigner_part_shell.rc");
diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp
index 6611be2f..b4825825 100644
--- a/kexi/formeditor/widgetfactory.cpp
+++ b/kexi/formeditor/widgetfactory.cpp
@@ -222,9 +222,9 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 		textedit->selectAll();
 		setEditor(w, textedit);
 
-		connect(textedit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()));
-		connect(w, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDestroyed()));
-		connect(textedit, TQT_SIGNAL(destroyed()), this, TQT_SLOT(editorDeleted()));
+		connect(textedit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()));
+		connect(w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDestroyed()));
+		connect(textedit, TQ_SIGNAL(destroyed()), this, TQ_SLOT(editorDeleted()));
 //#else
 	}
 	else {
@@ -243,9 +243,9 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 		editor->show();
 		editor->setFocus();
 		editor->selectAll();
-		connect(editor, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changeTextInternal(const TQString&)));
-		connect(w, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDestroyed()));
-		connect(editor, TQT_SIGNAL(destroyed()), this, TQT_SLOT(editorDeleted()));
+		connect(editor, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(changeTextInternal(const TQString&)));
+		connect(w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDestroyed()));
+		connect(editor, TQ_SIGNAL(destroyed()), this, TQ_SLOT(editorDeleted()));
 
 		setEditor(w, editor);
 //		m_editor = editor;
@@ -308,7 +308,7 @@ WidgetFactory::disableFilter(TQWidget *w, Container *container)
 		w->setPalette(p);
 	}
 
-	connect(w, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDestroyed()));
+	connect(w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDestroyed()));
 }
 
 bool
diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp
index f5da30e1..ca086432 100644
--- a/kexi/formeditor/widgetlibrary.cpp
+++ b/kexi/formeditor/widgetlibrary.cpp
@@ -341,7 +341,7 @@ WidgetLibrary::createWidgetActions(KXMLGUIClient* client, TDEActionCollection *p
 		LibActionWidget *a = new LibActionWidget(it.current(),
 			it.current()->factory()->m_guiClient
 			? it.current()->factory()->m_guiClient->actionCollection() : parent);
-		connect(a, TQT_SIGNAL(prepareInsert(const TQCString &)), receiver, slot);
+		connect(a, TQ_SIGNAL(prepareInsert(const TQCString &)), receiver, slot);
 		actions.append(a);
 	}
 	return actions;
diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp
index 9da235d2..ae5ac033 100644
--- a/kexi/formeditor/widgetpropertyset.cpp
+++ b/kexi/formeditor/widgetpropertyset.cpp
@@ -94,10 +94,10 @@ WidgetPropertySet::WidgetPropertySet(TQObject *parent)
 	d = new WidgetPropertySetPrivate();
 //	d->manager = manager;
 
-	connect(&d->set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)),
-		this, TQT_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&)));
-	connect(&d->set, TQT_SIGNAL(propertyReset(KoProperty::Set&, KoProperty::Property&)),
-		this, TQT_SLOT(slotPropertyReset(KoProperty::Set&, KoProperty::Property&)));
+	connect(&d->set, TQ_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)),
+		this, TQ_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&)));
+	connect(&d->set, TQ_SIGNAL(propertyReset(KoProperty::Set&, KoProperty::Property&)),
+		this, TQ_SLOT(slotPropertyReset(KoProperty::Set&, KoProperty::Property&)));
 
 	initPropertiesDescription();
 }
@@ -216,7 +216,7 @@ WidgetPropertySet::setSelectedWidget(TQWidget *w, bool add, bool forceReload, bo
 		createPropertiesForWidget(w);
 
 		w->installEventFilter(this);
-		connect(w, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotWidgetDestroyed()));
+		connect(w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotWidgetDestroyed()));
 	}
 
 	if (!moreWillBeSelected)
diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp
index 0ce563a9..3528bd0a 100644
--- a/kexi/kexidb/drivermanager.cpp
+++ b/kexi/kexidb/drivermanager.cpp
@@ -89,7 +89,7 @@ bool DriverManagerInternal::lookupDrivers()
 		return true;
 
 	if (tqApp) {
-		connect(tqApp,TQT_SIGNAL(aboutToQuit()),this,TQT_SLOT(slotAppQuits()));
+		connect(tqApp,TQ_SIGNAL(aboutToQuit()),this,TQ_SLOT(slotAppQuits()));
 	}
 //TODO: for QT-only version check for TDEInstance wrapper
 //		KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without TDEInstance (TDEGlobal::instance()==0)!" << endl;
diff --git a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
index afc86143..af315dca 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
@@ -71,8 +71,8 @@ tristate SQLiteVacuum::run()
 	args << ksqlite_app << "-verbose-vacuum" << m_filePath << "vacuum";
 	m_process = new TQProcess(args, this, "process");
 	m_process->setWorkingDirectory( TQFileInfo(m_filePath).dir(true) );
-	connect( m_process, TQT_SIGNAL(readyReadStdout()), this, TQT_SLOT(readFromStdout()) );
-	connect( m_process, TQT_SIGNAL(processExited()), this, TQT_SLOT(processExited()) );
+	connect( m_process, TQ_SIGNAL(readyReadStdout()), this, TQ_SLOT(readFromStdout()) );
+	connect( m_process, TQ_SIGNAL(processExited()), this, TQ_SLOT(processExited()) );
 	if (!m_process->start()) {
 		m_result = false;
 		return m_result;
@@ -83,7 +83,7 @@ tristate SQLiteVacuum::run()
 	);
 	m_dlg->adjustSize();
 	m_dlg->resize(300, m_dlg->height());
-	connect(m_dlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked()));
+	connect(m_dlg, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(cancelClicked()));
 	m_dlg->setMinimumDuration(1000);
 	m_dlg->setAutoClose(true);
 	m_dlg->progressBar()->setTotalSteps(100);
diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp
index b7e6a2ed..e9f13589 100644
--- a/kexi/kexidb/utils.cpp
+++ b/kexi/kexidb/utils.cpp
@@ -398,7 +398,7 @@ ConnectionTestDialog::ConnectionTestDialog(TQWidget* parent,
 	showCancelButton(true);
 	progressBar()->setPercentageVisible(false);
 	progressBar()->setTotalSteps(0);
-	connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()));
+	connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()));
 	adjustSize();
 	resize(250, height());
 }
diff --git a/kexi/kexiutils/debuggui.cpp b/kexi/kexiutils/debuggui.cpp
index c48f0d81..d614d9ed 100644
--- a/kexi/kexiutils/debuggui.cpp
+++ b/kexi/kexiutils/debuggui.cpp
@@ -67,7 +67,7 @@ void KexiUtils::addKexiDBDebug(const TQString& text)
 		hbox->addWidget(btn_clear);
 
 		kexiDBDebugPage = new TDEListView(page, "kexiDbDebugPage");
-		TQObject::connect(btn_clear, TQT_SIGNAL(clicked()), kexiDBDebugPage, TQT_SLOT(clear()));
+		TQObject::connect(btn_clear, TQ_SIGNAL(clicked()), kexiDBDebugPage, TQ_SLOT(clear()));
 		vbox->addWidget(kexiDBDebugPage);
 		kexiDBDebugPage->addColumn("");
 		kexiDBDebugPage->header()->hide();
@@ -107,7 +107,7 @@ void KexiUtils::addAlterTableActionDebug(const TQString& text, int nestingLevel)
 		hbox->addWidget(btn_sim);
 
 		kexiAlterTableActionDebugPage = new TDEListView(page, "kexiAlterTableActionDebugPage");
-		TQObject::connect(btn_clear, TQT_SIGNAL(clicked()), kexiAlterTableActionDebugPage, TQT_SLOT(clear()));
+		TQObject::connect(btn_clear, TQ_SIGNAL(clicked()), kexiAlterTableActionDebugPage, TQ_SLOT(clear()));
 		vbox->addWidget(kexiAlterTableActionDebugPage);
 		kexiAlterTableActionDebugPage->addColumn("");
 		kexiAlterTableActionDebugPage->header()->hide();
@@ -165,7 +165,7 @@ void KexiUtils::connectPushButtonActionForDebugWindow(const char* actionName,
 	if (debugWindow) {
 		KPushButton* btn = findFirstChild<KPushButton>(debugWindow, "KPushButton", actionName);
 		if (btn)
-			TQObject::connect(btn, TQT_SIGNAL(clicked()), receiver, slot);
+			TQObject::connect(btn, TQ_SIGNAL(clicked()), receiver, slot);
 	}
 }
 
diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp
index 9d794242..fc126152 100644
--- a/kexi/kexiutils/utils.cpp
+++ b/kexi/kexiutils/utils.cpp
@@ -45,7 +45,7 @@ using namespace KexiUtils;
 DelayedCursorHandler::DelayedCursorHandler() 
  : startedOrActive(false)
 {
-	connect(&timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(show()));
+	connect(&timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(show()));
 }
 void DelayedCursorHandler::start(bool noDelay) {
 	startedOrActive = true;
diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp
index 3365268a..6f8d36e6 100644
--- a/kexi/main/kexifinddialog.cpp
+++ b/kexi/main/kexifinddialog.cpp
@@ -53,7 +53,7 @@ class KexiFindDialog::Private
 		{
 			if (!action)
 				return;
-			TQObject::connect(parent, member, action, TQT_SLOT(activate()));
+			TQObject::connect(parent, member, action, TQ_SLOT(activate()));
 			if (action->shortcut().isNull())
 				return;
 			TQAccel *accel = new TQAccel(parent); // we want to handle dialog-wide shortcut as well
@@ -90,13 +90,13 @@ KexiFindDialog::KexiFindDialog( TQWidget* parent )
 	delete a;
 	m_btnClose->setText(KStdGuiItem::close().text());
 	m_btnClose->setIconSet(KStdGuiItem::close().iconSet());
-	connect(m_btnFind, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(findNext()));
-	connect(m_btnClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCloseClicked()));
-	connect(m_btnReplace, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(replaceNext()));
-	connect(m_btnReplaceAll, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(replaceAll()));
+	connect(m_btnFind, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(findNext()));
+	connect(m_btnClose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCloseClicked()));
+	connect(m_btnReplace, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(replaceNext()));
+	connect(m_btnReplaceAll, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(replaceAll()));
 	// clear message after the text is changed
-	connect(m_textToFind, TQT_SIGNAL(textChanged()), this, TQT_SIGNAL(updateMessage()));
-	connect(m_textToReplace, TQT_SIGNAL(textChanged()), this, TQT_SIGNAL(updateMessage()));
+	connect(m_textToFind, TQ_SIGNAL(textChanged()), this, TQ_SIGNAL(updateMessage()));
+	connect(m_textToReplace, TQ_SIGNAL(textChanged()), this, TQ_SIGNAL(updateMessage()));
 
 	d->replaceMode = true; //to force updating by setReplaceMode()
 	setReplaceMode(false);
@@ -117,10 +117,10 @@ void KexiFindDialog::setActions( TDEAction *findnext, TDEAction *findprev,
 	d->replaceAction = replace;
 	d->replaceallAction = replaceall;
 	d->accels.clear();
-	d->setActionAndAccel(d->findnextAction, this, TQT_SIGNAL(findNext()));
-	d->setActionAndAccel(d->findprevAction, this, TQT_SIGNAL(findPrevious()));
-	d->setActionAndAccel(d->replaceAction, this, TQT_SIGNAL(replaceNext()));
-	d->setActionAndAccel(d->replaceallAction, this, TQT_SIGNAL(replaceAll()));
+	d->setActionAndAccel(d->findnextAction, this, TQ_SIGNAL(findNext()));
+	d->setActionAndAccel(d->findprevAction, this, TQ_SIGNAL(findPrevious()));
+	d->setActionAndAccel(d->replaceAction, this, TQ_SIGNAL(replaceNext()));
+	d->setActionAndAccel(d->replaceallAction, this, TQ_SIGNAL(replaceAll()));
 }
 
 TQStringList KexiFindDialog::lookInColumnNames() const
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 7a82eb1e..c6f64d12 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -259,15 +259,15 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 	TDEGlobal::iconLoader()->addAppDir("koffice");
 
 	//get informed
-	connect(&Kexi::partManager(),TQT_SIGNAL(partLoaded(KexiPart::Part*)),this,TQT_SLOT(slotPartLoaded(KexiPart::Part*)));
-	connect( m_pMdi, TQT_SIGNAL(nowMaximized(bool)), this, TQT_SLOT(slotCaptionForCurrentMDIChild(bool)) );
-	connect( m_pMdi, TQT_SIGNAL(noMaximizedChildFrmLeft(KMdiChildFrm*)), this, TQT_SLOT(slotNoMaximizedChildFrmLeft(KMdiChildFrm*)));
-//	connect( this, TQT_SIGNAL(lastChildFrmClosed()), this, TQT_SLOT(slotLastChildFrmClosed()));
-	connect( this, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastChildViewClosed()));
+	connect(&Kexi::partManager(),TQ_SIGNAL(partLoaded(KexiPart::Part*)),this,TQ_SLOT(slotPartLoaded(KexiPart::Part*)));
+	connect( m_pMdi, TQ_SIGNAL(nowMaximized(bool)), this, TQ_SLOT(slotCaptionForCurrentMDIChild(bool)) );
+	connect( m_pMdi, TQ_SIGNAL(noMaximizedChildFrmLeft(KMdiChildFrm*)), this, TQ_SLOT(slotNoMaximizedChildFrmLeft(KMdiChildFrm*)));
+//	connect( this, TQ_SIGNAL(lastChildFrmClosed()), this, TQ_SLOT(slotLastChildFrmClosed()));
+	connect( this, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastChildViewClosed()));
 
-	connect( this, TQT_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQT_SLOT(slotChildViewIsDetachedNow(TQWidget*)));
-	connect( this, TQT_SIGNAL(mdiModeHasBeenChangedTo(KMdi::MdiMode)),
-		this, TQT_SLOT(slotMdiModeHasBeenChangedTo(KMdi::MdiMode)));
+	connect( this, TQ_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQ_SLOT(slotChildViewIsDetachedNow(TQWidget*)));
+	connect( this, TQ_SIGNAL(mdiModeHasBeenChangedTo(KMdi::MdiMode)),
+		this, TQ_SLOT(slotMdiModeHasBeenChangedTo(KMdi::MdiMode)));
 
 
 	//if (!userMode()) {
@@ -349,7 +349,7 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 
 //	if (!userMode()) {
 		invalidateActions();
-		d->timer.singleShot(0,this,TQT_SLOT(slotLastActions()));
+		d->timer.singleShot(0,this,TQ_SLOT(slotLastActions()));
 //	}
 
 	setTabWidgetVisibility(KMdi::AlwaysShowTabs);
@@ -367,7 +367,7 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 		                     // when initially the main window is empty
 		TQToolTip::add(closeButton, 
 			i18n("Close the current tab page in Kexi tab interface", "Close the current tab"));
-		TQObject::connect( closeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeActiveView() ) );
+		TQObject::connect( closeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeActiveView() ) );
 	}
 
 #ifdef KEXI_ADD_CUSTOM_KEXIMAINWINDOWIMPL
@@ -406,7 +406,7 @@ void KexiMainWindowImpl::setWindowMenu(TQPopupMenu *menu)
 		menuBar()->insertItem(txt, m_pWindowMenu, id, count-3);
 	}
 	m_pWindowMenu->setCheckable(true);
-	TQObject::connect( m_pWindowMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(fillWindowMenu()) );
+	TQObject::connect( m_pWindowMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(fillWindowMenu()) );
 }
 
 void KexiMainWindowImpl::fillWindowMenu()
@@ -521,77 +521,77 @@ void KexiMainWindowImpl::initActions()
 //	setupGUI(TDEMainWindow::Keys|TDEMainWindow::StatusBar|TDEMainWindow::Save|TDEMainWindow::Create);
 
 //	d->actionMapper = new TQSignalMapper(this, "act_map");
-//	connect(d->actionMapper, TQT_SIGNAL(mapped(const TQString &)), this, TQT_SLOT(slotAction(const TQString &)));
+//	connect(d->actionMapper, TQ_SIGNAL(mapped(const TQString &)), this, TQ_SLOT(slotAction(const TQString &)));
 
 	// PROJECT MENU
 	TDEAction *action = new TDEAction(i18n("&New..."), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New),
-		this, TQT_SLOT(slotProjectNew()), actionCollection(), "project_new");
+		this, TQ_SLOT(slotProjectNew()), actionCollection(), "project_new");
 	action->setToolTip(i18n("Create a new project"));
 	action->setWhatsThis(i18n("Creates a new project. Currently opened project is not affected."));
 
-	action = KStdAction::open( this, TQT_SLOT( slotProjectOpen() ), actionCollection(), "project_open" );
+	action = KStdAction::open( this, TQ_SLOT( slotProjectOpen() ), actionCollection(), "project_open" );
 	action->setToolTip(i18n("Open an existing project"));
 	action->setWhatsThis(i18n("Opens an existing project. Currently opened project is not affected."));
 
 #ifdef HAVE_TDENEWSTUFF
 	action = new TDEAction(i18n("&Download Example Databases..."), "kget", TDEShortcut(0),
-		this, TQT_SLOT(slotGetNewStuff()), actionCollection(), "project_download_examples");
+		this, TQ_SLOT(slotGetNewStuff()), actionCollection(), "project_download_examples");
 	action->setToolTip(i18n("Download example databases from the Internet"));
 	action->setWhatsThis(i18n("Downloads example databases from the Internet."));
 #endif
 
-//	d->action_open_recent = KStdAction::openRecent( this, TQT_SLOT(slotProjectOpenRecent(const KURL&)), actionCollection(), "project_open_recent" );
+//	d->action_open_recent = KStdAction::openRecent( this, TQ_SLOT(slotProjectOpenRecent(const KURL&)), actionCollection(), "project_open_recent" );
 
 //#ifdef KEXI_SHOW_UNIMPLEMENTED
 #ifndef KEXI_NO_UNFINISHED
 	d->action_open_recent = new TDEActionMenu(i18n("Open Recent"),
 		actionCollection(), "project_open_recent");
-	connect(d->action_open_recent->popupMenu(),TQT_SIGNAL(activated(int)),
-		this,TQT_SLOT(slotProjectOpenRecent(int)));
-	connect(d->action_open_recent->popupMenu(), TQT_SIGNAL(aboutToShow()),
-		this,TQT_SLOT(slotProjectOpenRecentAboutToShow()));
+	connect(d->action_open_recent->popupMenu(),TQ_SIGNAL(activated(int)),
+		this,TQ_SLOT(slotProjectOpenRecent(int)));
+	connect(d->action_open_recent->popupMenu(), TQ_SIGNAL(aboutToShow()),
+		this,TQ_SLOT(slotProjectOpenRecentAboutToShow()));
 //moved down		d->action_open_recent_projects_title_id = 
 //		d->action_open_recent->popupMenu()->insertTitle(i18n("Recently Opened Databases"));
 //moved down	d->action_open_recent_connections_title_id = 
 //		d->action_open_recent->popupMenu()->insertTitle(i18n("Recently Connected Database Servers"));
 //	d->action_open_recent->popupMenu()->insertSeparator();
 //	d->action_open_recent_more_id = d->action_open_recent->popupMenu()
-//		->insertItem(i18n("&More Projects..."), this, TQT_SLOT(slotProjectOpenRecentMore()), 0, 1000);
+//		->insertItem(i18n("&More Projects..."), this, TQ_SLOT(slotProjectOpenRecentMore()), 0, 1000);
 #else
 	d->action_open_recent = d->dummy_action;
 #endif
 
 	d->action_save = KStdAction::save( 
-		this, TQT_SLOT( slotProjectSave() ), actionCollection(), "project_save" );
+		this, TQ_SLOT( slotProjectSave() ), actionCollection(), "project_save" );
 //	d->action_save = new TDEAction(i18n("&Save"), "document-save", TDEStdAccel::shortcut(TDEStdAccel::Save),
-//		this, TQT_SLOT(slotProjectSave()), actionCollection(), "project_save");
+//		this, TQ_SLOT(slotProjectSave()), actionCollection(), "project_save");
 	d->action_save->setToolTip(i18n("Save object changes"));
 	d->action_save->setWhatsThis(i18n("Saves object changes from currently selected window."));
 
 #ifdef KEXI_SHOW_UNIMPLEMENTED
 	d->action_save_as = new TDEAction(i18n("Save &As..."), "document-save-as", 0,
-		this, TQT_SLOT(slotProjectSaveAs()), actionCollection(), "project_saveas");
+		this, TQ_SLOT(slotProjectSaveAs()), actionCollection(), "project_saveas");
 	d->action_save_as->setToolTip(i18n("Save object as"));
 	d->action_save_as->setWhatsThis(
 		i18n("Saves object changes from currently selected window under a new name (within the same project)."));
 
 	d->action_project_properties = new TDEAction(i18n("Project Properties"), "application-vnd.tde.info", 0,
-		this, TQT_SLOT(slotProjectProperties()), actionCollection(), "project_properties");
+		this, TQ_SLOT(slotProjectProperties()), actionCollection(), "project_properties");
 #else
 	d->action_save_as = d->dummy_action;
 	d->action_project_properties = d->dummy_action;
 #endif
 
 	d->action_close = new TDEAction(i18n("&Close Project"), "window-close", 0,
-		this, TQT_SLOT(slotProjectClose()), actionCollection(), "project_close" );
+		this, TQ_SLOT(slotProjectClose()), actionCollection(), "project_close" );
 	d->action_close->setToolTip(i18n("Close the current project"));
 	d->action_close->setWhatsThis(i18n("Closes the current project."));
 
-	KStdAction::quit( this, TQT_SLOT(slotProjectQuit()), actionCollection(), "quit");
+	KStdAction::quit( this, TQ_SLOT(slotProjectQuit()), actionCollection(), "quit");
 
 #ifdef KEXI_SHOW_UNIMPLEMENTED
 	d->action_project_relations = new TDEAction(i18n("&Relationships..."), "relation", TQt::CTRL + TQt::Key_R,
-		this, TQT_SLOT(slotProjectRelations()), actionCollection(), "project_relations");
+		this, TQ_SLOT(slotProjectRelations()), actionCollection(), "project_relations");
 	d->action_project_relations->setToolTip(i18n("Project relationships"));
 	d->action_project_relations->setWhatsThis(i18n("Shows project relationships."));
 
@@ -600,13 +600,13 @@ void KexiMainWindowImpl::initActions()
 #endif
 	d->action_tools_data_migration = new TDEAction(
 		i18n("&Import Database..."), "database_import", 0,
-		this, TQT_SLOT(slotToolsProjectMigration()), actionCollection(), "tools_import_project");
+		this, TQ_SLOT(slotToolsProjectMigration()), actionCollection(), "tools_import_project");
 	d->action_tools_data_migration->setToolTip(i18n("Import entire database as a Kexi project"));
 	d->action_tools_data_migration->setWhatsThis(i18n("Imports entire database as a Kexi project."));
 
 	d->action_tools_compact_database = new TDEAction(
 		i18n("&Compact Database..."), "", 0,
-		this, TQT_SLOT(slotToolsCompactDatabase()), actionCollection(), "tools_compact_database");
+		this, TQ_SLOT(slotToolsCompactDatabase()), actionCollection(), "tools_compact_database");
 	d->action_tools_compact_database->setToolTip(i18n("Compact the current database project"));
 	d->action_tools_compact_database->setWhatsThis(
 		i18n("Compacts the current database project, so it will take less space and work faster."));
@@ -617,7 +617,7 @@ void KexiMainWindowImpl::initActions()
 		d->action_project_import_data_table = new TDEAction(
 			i18n("Import->Table Data From File...", "Table Data From &File..."),
 			"table"/*! @todo: change to "file_import" or so*/,
-			0, this, TQT_SLOT(slotProjectImportDataTable()), actionCollection(), 
+			0, this, TQ_SLOT(slotProjectImportDataTable()), actionCollection(), 
 			"project_import_data_table");
 		d->action_project_import_data_table->setToolTip(i18n("Import table data from a file"));
 		d->action_project_import_data_table->setWhatsThis(i18n("Imports table data from a file."));
@@ -626,7 +626,7 @@ void KexiMainWindowImpl::initActions()
 	d->action_project_export_data_table = new TDEAction(i18n("Export->Table or Query Data to File...", 
 		"Table or Query Data to &File..."),
 		"table"/*! @todo: change to "file_export" or so*/,
-		0, this, TQT_SLOT(slotProjectExportDataTable()), actionCollection(), 
+		0, this, TQ_SLOT(slotProjectExportDataTable()), actionCollection(), 
 		"project_export_data_table");
 	d->action_project_export_data_table->setToolTip(
 		i18n("Export data from the active table or query data to a file"));
@@ -634,17 +634,17 @@ void KexiMainWindowImpl::initActions()
 		i18n("Exports data from the active table or query data to a file."));
 
 //TODO	new TDEAction(i18n("From File..."), "document-open", 0,
-//TODO		this, TQT_SLOT(slotImportFile()), actionCollection(), "project_import_file");
+//TODO		this, TQ_SLOT(slotImportFile()), actionCollection(), "project_import_file");
 //TODO	new TDEAction(i18n("From Server..."), "server", 0,
-//TODO		this, TQT_SLOT(slotImportServer()), actionCollection(), "project_import_server");
+//TODO		this, TQ_SLOT(slotImportServer()), actionCollection(), "project_import_server");
 
-	d->action_project_print = KStdAction::print(this, TQT_SLOT(slotProjectPrint()),
+	d->action_project_print = KStdAction::print(this, TQ_SLOT(slotProjectPrint()),
 		actionCollection(), "project_print" ); 
 	d->action_project_print->setToolTip(i18n("Print data from the active table or query"));
 	d->action_project_print->setWhatsThis(i18n("Prints data from the active table or query."));
 
 	d->action_project_print_preview = KStdAction::printPreview(
-		this, TQT_SLOT(slotProjectPrintPreview()),
+		this, TQ_SLOT(slotProjectPrintPreview()),
 		actionCollection(), "project_print_preview" ); 
 	d->action_project_print_preview->setToolTip(
 		i18n("Show print preview for the active table or query"));
@@ -652,7 +652,7 @@ void KexiMainWindowImpl::initActions()
 		i18n("Shows print preview for the active table or query."));
 
 	d->action_project_print_setup = new TDEAction(i18n("Page Set&up..."),
-		"", 0, this, TQT_SLOT(slotProjectPageSetup()), actionCollection(), 
+		"", 0, this, TQ_SLOT(slotProjectPageSetup()), actionCollection(), 
 		"project_print_setup");
 	d->action_project_print_setup->setToolTip(
 		i18n("Show page setup for printing the active table or query"));
@@ -669,7 +669,7 @@ void KexiMainWindowImpl::initActions()
 	else {
 		d->action_edit_paste_special_data_table = 
 			new TDEAction(i18n("Paste Special->As Data &Table...", "As Data &Table..."),
-			"table", 0, this, TQT_SLOT(slotEditPasteSpecialDataTable()),
+			"table", 0, this, TQ_SLOT(slotEditPasteSpecialDataTable()),
 			actionCollection(), "edit_paste_special_data_table");
 		d->action_edit_paste_special_data_table->setToolTip(
 			i18n("Paste clipboard data as a table"));
@@ -680,7 +680,7 @@ void KexiMainWindowImpl::initActions()
 	d->action_edit_copy_special_data_table =
 		new TDEAction(i18n("Copy Special->Table or Query Data...", 
 			"Table or Query as Data Table..."),
-		"table", 0, this, TQT_SLOT(slotEditCopySpecialDataTable()),
+		"table", 0, this, TQ_SLOT(slotEditCopySpecialDataTable()),
 		actionCollection(), "edit_copy_special_data_table");
 	d->action_edit_copy_special_data_table->setToolTip(
 		i18n("Copy selected table or query data to clipboard"));
@@ -700,18 +700,18 @@ void KexiMainWindowImpl::initActions()
 #endif
 
 	d->action_edit_find = KStdAction::find(
-		this, TQT_SLOT(slotEditFind()), actionCollection(), "edit_find" );
+		this, TQ_SLOT(slotEditFind()), actionCollection(), "edit_find" );
 //	d->action_edit_find = createSharedAction( KStdAction::Find, "edit_find");
 	d->action_edit_findnext = KStdAction::findNext(
-		this, TQT_SLOT(slotEditFindNext()), actionCollection(), "edit_findnext");
+		this, TQ_SLOT(slotEditFindNext()), actionCollection(), "edit_findnext");
 	d->action_edit_findprev = KStdAction::findPrev(
-		this, TQT_SLOT(slotEditFindPrevious()), actionCollection(), "edit_findprevious");
+		this, TQ_SLOT(slotEditFindPrevious()), actionCollection(), "edit_findprevious");
 	d->action_edit_replace = 0;
 //! @todo	d->action_edit_replace = KStdAction::replace(
-//!		this, TQT_SLOT(slotEditReplace()), actionCollection(), "project_print_preview" ); 
+//!		this, TQ_SLOT(slotEditReplace()), actionCollection(), "project_print_preview" ); 
 	d->action_edit_replace_all = 0;
 //! @todo d->action_edit_replace_all = new TDEAction( i18n("Replace All"), "", 0, 
-//!   this, TQT_SLOT(slotEditReplaceAll()), actionCollection(), "edit_replaceall");
+//!   this, TQ_SLOT(slotEditReplaceAll()), actionCollection(), "edit_replaceall");
 
 	d->action_edit_select_all =  createSharedAction( KStdAction::SelectAll, "edit_select_all");
 
@@ -745,7 +745,7 @@ void KexiMainWindowImpl::initActions()
 	//VIEW MENU
 	if (!userMode()) {
 		d->action_view_data_mode = new TDERadioAction(i18n("&Data View"), "state_data", TQt::Key_F6,
-			this, TQT_SLOT(slotViewDataMode()), actionCollection(), "view_data_mode");
+			this, TQ_SLOT(slotViewDataMode()), actionCollection(), "view_data_mode");
 		d->actions_for_view_modes.insert( Kexi::DataViewMode, d->action_view_data_mode );
 		d->action_view_data_mode->setExclusiveGroup("view_mode");
 		d->action_view_data_mode->setToolTip(i18n("Switch to data view"));
@@ -756,7 +756,7 @@ void KexiMainWindowImpl::initActions()
 
 	if (!userMode()) {
 		d->action_view_design_mode = new TDERadioAction(i18n("D&esign View"), "state_edit", TQt::Key_F7,
-			this, TQT_SLOT(slotViewDesignMode()), actionCollection(), "view_design_mode");
+			this, TQ_SLOT(slotViewDesignMode()), actionCollection(), "view_design_mode");
 		d->actions_for_view_modes.insert( Kexi::DesignViewMode, d->action_view_design_mode );
 		d->action_view_design_mode->setExclusiveGroup("view_mode");
 		d->action_view_design_mode->setToolTip(i18n("Switch to design view"));
@@ -767,7 +767,7 @@ void KexiMainWindowImpl::initActions()
 
 	if (!userMode()) {
 		d->action_view_text_mode = new TDERadioAction(i18n("&Text View"), "state_sql", TQt::Key_F8,
-			this, TQT_SLOT(slotViewTextMode()), actionCollection(), "view_text_mode");
+			this, TQ_SLOT(slotViewTextMode()), actionCollection(), "view_text_mode");
 		d->actions_for_view_modes.insert( Kexi::TextViewMode, d->action_view_text_mode );
 		d->action_view_text_mode->setExclusiveGroup("view_mode");
 		d->action_view_text_mode->setToolTip(i18n("Switch to text view"));
@@ -778,7 +778,7 @@ void KexiMainWindowImpl::initActions()
 
 	if (d->isProjectNavigatorVisible) {
 		d->action_view_nav = new TDEAction(i18n("Project Navigator"), "", TQt::ALT + TQt::Key_1,
-			this, TQT_SLOT(slotViewNavigator()), actionCollection(), "view_navigator");
+			this, TQ_SLOT(slotViewNavigator()), actionCollection(), "view_navigator");
 		d->action_view_nav->setToolTip(i18n("Go to project navigator panel"));
 		d->action_view_nav->setWhatsThis(i18n("Goes to project navigator panel."));
 	}
@@ -786,13 +786,13 @@ void KexiMainWindowImpl::initActions()
 		d->action_view_nav = 0;
 
 	d->action_view_mainarea = new TDEAction(i18n("Main Area"), "", TQt::ALT + TQt::Key_2,
-		this, TQT_SLOT(slotViewMainArea()), actionCollection(), "view_mainarea");
+		this, TQ_SLOT(slotViewMainArea()), actionCollection(), "view_mainarea");
 	d->action_view_mainarea->setToolTip(i18n("Go to main area"));
 	d->action_view_mainarea->setWhatsThis(i18n("Goes to main area."));
 
 	if (!userMode()) {
 		d->action_view_propeditor = new TDEAction(i18n("Property Editor"), "", TQt::ALT + TQt::Key_3,
-			this, TQT_SLOT(slotViewPropertyEditor()), actionCollection(), "view_propeditor");
+			this, TQ_SLOT(slotViewPropertyEditor()), actionCollection(), "view_propeditor");
 		d->action_view_propeditor->setToolTip(i18n("Go to property editor panel"));
 		d->action_view_propeditor->setWhatsThis(i18n("Goes to property editor panel."));
 	}
@@ -863,7 +863,7 @@ void KexiMainWindowImpl::initActions()
 #else
 		TQt::ALT+TQt::Key_Right,
 #endif
-		this, TQT_SLOT(activateNextWin()), actionCollection(), "window_next");
+		this, TQ_SLOT(activateNextWin()), actionCollection(), "window_next");
 	d->action_window_next->setToolTip( i18n("Next window") );
 	d->action_window_next->setWhatsThis(i18n("Switches to the next window."));
 
@@ -873,17 +873,17 @@ void KexiMainWindowImpl::initActions()
 #else
 		TQt::ALT+TQt::Key_Left,
 #endif
-		this, TQT_SLOT(activatePrevWin()), actionCollection(), "window_previous");
+		this, TQ_SLOT(activatePrevWin()), actionCollection(), "window_previous");
 	d->action_window_previous->setToolTip( i18n("Previous window") );
 	d->action_window_previous->setWhatsThis(i18n("Switches to the previous window."));
 
 	//SETTINGS MENU
 	setStandardToolBarMenuEnabled( true );
-	action = KStdAction::keyBindings(this, TQT_SLOT( slotConfigureKeys() ), actionCollection() );
+	action = KStdAction::keyBindings(this, TQ_SLOT( slotConfigureKeys() ), actionCollection() );
 	action->setWhatsThis(i18n("Lets you configure shortcut keys."));
 
 #ifdef KEXI_SHOW_UNIMPLEMENTED
-	action = KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
+	action = KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars() ), actionCollection() );
 	action->setWhatsThis(i18n("Lets you configure toolbars."));
 
 	d->action_show_other = new TDEActionMenu(i18n("Other"),
@@ -923,31 +923,31 @@ void KexiMainWindowImpl::initActions()
 #endif
 
 #ifdef KEXI_SHOW_UNIMPLEMENTED
-	d->action_configure = KStdAction::preferences(this, TQT_SLOT(slotShowSettings()), actionCollection());
+	d->action_configure = KStdAction::preferences(this, TQ_SLOT(slotShowSettings()), actionCollection());
 	action->setWhatsThis(i18n("Lets you configure Kexi."));
 #endif
 
 	//HELP MENU
 #if 0//js: todo reenable later
-	KStdAction::tipOfDay( this, TQT_SLOT( slotTipOfTheDayAction() ), actionCollection() )
+	KStdAction::tipOfDay( this, TQ_SLOT( slotTipOfTheDayAction() ), actionCollection() )
 		->setWhatsThis(i18n("This shows useful tips on the use of this application."));
 #endif
 #if 0 //we don't have a time for updating info text for each new version
 	new TDEAction(i18n("Important Information"), "messagebox_info", 0,
-		this, TQT_SLOT(slotImportantInfo()), actionCollection(), "help_show_important_info");
+		this, TQ_SLOT(slotImportantInfo()), actionCollection(), "help_show_important_info");
 #endif
 //TODO: UNCOMMENT TO REMOVE MDI MODES SETTING	m_pMdiModeMenu->hide();
 
 #ifndef KEXI_NO_FEEDBACK_AGENT
 #ifdef FEEDBACK_CLASS
 	new TDEAction(i18n("Give Feedback..."), "messagebox_info", 0,
-		this, TQT_SLOT(slotStartFeedbackAgent()), actionCollection(), "help_start_feedback_agent");
+		this, TQ_SLOT(slotStartFeedbackAgent()), actionCollection(), "help_start_feedback_agent");
 #endif
 #endif
 //	TDEAction *actionSettings = new TDEAction(i18n("Configure Kexi..."), "configure", 0,
 //	 actionCollection(), "kexi_settings");
 //	actionSettings->setWhatsThis(i18n("Lets you configure Kexi."));
-//	connect(actionSettings, TQT_SIGNAL(activated()), this, TQT_SLOT(slotShowSettings()));
+//	connect(actionSettings, TQ_SIGNAL(activated()), this, TQ_SLOT(slotShowSettings()));
 
 	// -- add a few missing tooltips (usable especially in Form's "Assign action" dialog)
 	if ((action = actionCollection()->action("window_close")))
@@ -1138,7 +1138,7 @@ void KexiMainWindowImpl::invalidateSharedActions()
 // unused, I think
 void KexiMainWindowImpl::invalidateSharedActionsLater()
 {
-	TQTimer::singleShot(1, this, TQT_SLOT(invalidateSharedActions()));
+	TQTimer::singleShot(1, this, TQ_SLOT(invalidateSharedActions()));
 }
 
 void KexiMainWindowImpl::invalidateProjectWideActions()
@@ -1345,7 +1345,7 @@ tristate KexiMainWindowImpl::openProject(const KexiProjectData& projectData)
 //	d->disableErrorMessages = true;
 	enableMessages( false );
 
-	TQTimer::singleShot(1, this, TQT_SLOT(slotAutoOpenObjectsLater()));
+	TQTimer::singleShot(1, this, TQ_SLOT(slotAutoOpenObjectsLater()));
 	return true;
 }
 
@@ -1725,29 +1725,29 @@ void KexiMainWindowImpl::initNavigator()
 		d->navToolWindow = addToolWindow(d->nav, KDockWidget::DockLeft, getMainDockWidget(), 20/*, lv, 35, "2"*/);
 //		d->navToolWindow->hide();
 
-		connect(d->nav,TQT_SIGNAL(openItem(KexiPart::Item*,int)),this,TQT_SLOT(openObject(KexiPart::Item*,int)));
-		connect(d->nav,TQT_SIGNAL(openOrActivateItem(KexiPart::Item*,int)),
-			this,TQT_SLOT(openObjectFromNavigator(KexiPart::Item*,int)));
-		connect(d->nav,TQT_SIGNAL(newItem( KexiPart::Info* )),
-			this,TQT_SLOT(newObject(KexiPart::Info*)));
-		connect(d->nav,TQT_SIGNAL(removeItem(KexiPart::Item*)),
-			this,TQT_SLOT(removeObject(KexiPart::Item*)));
-		connect(d->nav,TQT_SIGNAL(renameItem(KexiPart::Item*,const TQString&, bool&)),
-			this,TQT_SLOT(renameObject(KexiPart::Item*,const TQString&, bool&)));
-		connect(d->nav,TQT_SIGNAL(executeItem(KexiPart::Item*)),
-			this,TQT_SLOT(executeItem(KexiPart::Item*)));
-		connect(d->nav,TQT_SIGNAL(exportItemAsDataTable(KexiPart::Item*)),
-			this,TQT_SLOT(exportItemAsDataTable(KexiPart::Item*)));
-		connect(d->nav,TQT_SIGNAL(printItem( KexiPart::Item* )),
-			this,TQT_SLOT(printItem(KexiPart::Item*)));
-		connect(d->nav,TQT_SIGNAL(pageSetupForItem( KexiPart::Item*)),
-			this,TQT_SLOT(showPageSetupForItem(KexiPart::Item*)));
+		connect(d->nav,TQ_SIGNAL(openItem(KexiPart::Item*,int)),this,TQ_SLOT(openObject(KexiPart::Item*,int)));
+		connect(d->nav,TQ_SIGNAL(openOrActivateItem(KexiPart::Item*,int)),
+			this,TQ_SLOT(openObjectFromNavigator(KexiPart::Item*,int)));
+		connect(d->nav,TQ_SIGNAL(newItem( KexiPart::Info* )),
+			this,TQ_SLOT(newObject(KexiPart::Info*)));
+		connect(d->nav,TQ_SIGNAL(removeItem(KexiPart::Item*)),
+			this,TQ_SLOT(removeObject(KexiPart::Item*)));
+		connect(d->nav,TQ_SIGNAL(renameItem(KexiPart::Item*,const TQString&, bool&)),
+			this,TQ_SLOT(renameObject(KexiPart::Item*,const TQString&, bool&)));
+		connect(d->nav,TQ_SIGNAL(executeItem(KexiPart::Item*)),
+			this,TQ_SLOT(executeItem(KexiPart::Item*)));
+		connect(d->nav,TQ_SIGNAL(exportItemAsDataTable(KexiPart::Item*)),
+			this,TQ_SLOT(exportItemAsDataTable(KexiPart::Item*)));
+		connect(d->nav,TQ_SIGNAL(printItem( KexiPart::Item* )),
+			this,TQ_SLOT(printItem(KexiPart::Item*)));
+		connect(d->nav,TQ_SIGNAL(pageSetupForItem( KexiPart::Item*)),
+			this,TQ_SLOT(showPageSetupForItem(KexiPart::Item*)));
 		if (d->prj) {//connect to the project
-			connect(d->prj, TQT_SIGNAL(itemRemoved(const KexiPart::Item&)),
-				d->nav, TQT_SLOT(slotRemoveItem(const KexiPart::Item&)));
+			connect(d->prj, TQ_SIGNAL(itemRemoved(const KexiPart::Item&)),
+				d->nav, TQ_SLOT(slotRemoveItem(const KexiPart::Item&)));
 		}
-		connect(d->nav,TQT_SIGNAL(selectionChanged(KexiPart::Item*)),
-			this,TQT_SLOT(slotPartItemSelectedInNavigator(KexiPart::Item*)));
+		connect(d->nav,TQ_SIGNAL(selectionChanged(KexiPart::Item*)),
+			this,TQ_SLOT(slotPartItemSelectedInNavigator(KexiPart::Item*)));
 
 //		d->restoreNavigatorWidth();
 	}
@@ -1759,7 +1759,7 @@ void KexiMainWindowImpl::initNavigator()
 				"dontShowWarningsRelatedToPluginsLoading");
 		}
 	}
-	connect(d->prj, TQT_SIGNAL(newItemStored(KexiPart::Item&)), d->nav, TQT_SLOT(addItem(KexiPart::Item&)));
+	connect(d->prj, TQ_SIGNAL(newItemStored(KexiPart::Item&)), d->nav, TQ_SLOT(addItem(KexiPart::Item&)));
 	d->nav->setFocus();
 
 	if (d->forceShowProjectNavigatorOnCreation) {
@@ -1858,8 +1858,8 @@ void KexiMainWindowImpl::slotPartLoaded(KexiPart::Part* p)
 {
 	if (!p)
 		return;
-	connect(p, TQT_SIGNAL(newObjectRequest(KexiPart::Info*)),
-		this, TQT_SLOT(newObject(KexiPart::Info*)));
+	connect(p, TQ_SIGNAL(newObjectRequest(KexiPart::Info*)),
+		this, TQ_SLOT(newObject(KexiPart::Info*)));
 	p->createGUIClients(this);
 }
 
@@ -2224,12 +2224,12 @@ void
 KexiMainWindowImpl::registerChild(KexiDialogBase *dlg)
 {
 	kdDebug() << "KexiMainWindowImpl::registerChild()" << endl;
-	connect(dlg, TQT_SIGNAL(activated(KMdiChildView *)),
-		this, TQT_SLOT(activeWindowChanged(KMdiChildView *)));
-	connect(dlg, TQT_SIGNAL(dirtyChanged(KexiDialogBase*)),
-		this, TQT_SLOT(slotDirtyFlagChanged(KexiDialogBase*)));
+	connect(dlg, TQ_SIGNAL(activated(KMdiChildView *)),
+		this, TQ_SLOT(activeWindowChanged(KMdiChildView *)));
+	connect(dlg, TQ_SIGNAL(dirtyChanged(KexiDialogBase*)),
+		this, TQ_SLOT(slotDirtyFlagChanged(KexiDialogBase*)));
 
-//	connect(dlg, TQT_SIGNAL(childWindowCloseRequest(KMdiChildView *)), this, TQT_SLOT(childClosed(KMdiChildView *)));
+//	connect(dlg, TQ_SIGNAL(childWindowCloseRequest(KMdiChildView *)), this, TQ_SLOT(childClosed(KMdiChildView *)));
 	if(dlg->id() != -1) {
 		d->insertDialog(dlg);
 	}
@@ -2523,7 +2523,7 @@ void
 KexiMainWindowImpl::slotConfigureToolbars()
 {
     KEditToolbar edit(factory());
-//    connect(&edit,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig()));
+//    connect(&edit,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig()));
     (void) edit.exec();
 }
 
@@ -2579,12 +2579,12 @@ KexiMainWindowImpl::createKexiProject(KexiProjectData* new_data)
 {
 	d->prj = new KexiProject( new_data, this );
 //	d->prj = ::createKexiProject(new_data);
-//provided by KexiMessageHandler	connect(d->prj, TQT_SIGNAL(error(const TQString&,KexiDB::Object*)), this, TQT_SLOT(showErrorMessage(const TQString&,KexiDB::Object*)));
-//provided by KexiMessageHandler	connect(d->prj, TQT_SIGNAL(error(const TQString&,const TQString&)), this, TQT_SLOT(showErrorMessage(const TQString&,const TQString&)));
-	connect(d->prj, TQT_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)), this, TQT_SLOT(slotObjectRenamed(const KexiPart::Item&, const TQCString&)));
+//provided by KexiMessageHandler	connect(d->prj, TQ_SIGNAL(error(const TQString&,KexiDB::Object*)), this, TQ_SLOT(showErrorMessage(const TQString&,KexiDB::Object*)));
+//provided by KexiMessageHandler	connect(d->prj, TQ_SIGNAL(error(const TQString&,const TQString&)), this, TQ_SLOT(showErrorMessage(const TQString&,const TQString&)));
+	connect(d->prj, TQ_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)), this, TQ_SLOT(slotObjectRenamed(const KexiPart::Item&, const TQCString&)));
 
 	if (d->nav)
-		connect(d->prj, TQT_SIGNAL(itemRemoved(const KexiPart::Item&)), d->nav, TQT_SLOT(slotRemoveItem(const KexiPart::Item&)));
+		connect(d->prj, TQ_SIGNAL(itemRemoved(const KexiPart::Item&)), d->nav, TQ_SLOT(slotRemoveItem(const KexiPart::Item&)));
 }
 
 KexiProjectData*
@@ -4394,7 +4394,7 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio
 			return false;
 		if (action == PreviewItem || action == PrintItem) {
 			TQTimer::singleShot(0,printingDialog->selectedView(),
-				(action == PreviewItem) ? TQT_SLOT(printPreview()) : TQT_SLOT(print()));
+				(action == PreviewItem) ? TQ_SLOT(printPreview()) : TQ_SLOT(print()));
 		}
 		return true;
 	}
diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h
index d1eac9f5..3843f1da 100644
--- a/kexi/main/keximainwindowimpl_p.h
+++ b/kexi/main/keximainwindowimpl_p.h
@@ -336,10 +336,10 @@ void updatePropEditorDockWidthInfo() {
 			m_findDialog = new KexiFindDialog(wnd);
 			m_findDialog->setActions( action_edit_findnext, action_edit_findprev,
 				action_edit_replace, action_edit_replace_all );
-/*			connect(m_findDialog, TQT_SIGNAL(findNext()), action_edit_findnext, TQT_SLOT(activate()));
-			connect(m_findDialog, TQT_SIGNAL(find()), wnd, TQT_SLOT(slotEditFindNext()));
-			connect(m_findDialog, TQT_SIGNAL(replace()), wnd, TQT_SLOT(slotEditReplaceNext()));
-			connect(m_findDialog, TQT_SIGNAL(replaceAll()), wnd, TQT_SLOT(slotEditReplaceAll()));*/
+/*			connect(m_findDialog, TQ_SIGNAL(findNext()), action_edit_findnext, TQ_SLOT(activate()));
+			connect(m_findDialog, TQ_SIGNAL(find()), wnd, TQ_SLOT(slotEditFindNext()));
+			connect(m_findDialog, TQ_SIGNAL(replace()), wnd, TQ_SLOT(slotEditReplaceNext()));
+			connect(m_findDialog, TQ_SIGNAL(replaceAll()), wnd, TQ_SLOT(slotEditReplaceAll()));*/
 		}
 		return m_findDialog;
 	}
diff --git a/kexi/main/kexinamedialog.cpp b/kexi/main/kexinamedialog.cpp
index f3e1acec..86ad6da7 100644
--- a/kexi/main/kexinamedialog.cpp
+++ b/kexi/main/kexinamedialog.cpp
@@ -64,11 +64,11 @@ void KexiNameDialog::init()
 	lyr->addItem(new TQSpacerItem( 5, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 1, 1);
 //	m_widget->captionLineEdit()->selectAll();
 //	m_widget->captionLineEdit()->setFocus();
-	connect(m_widget,TQT_SIGNAL(messageChanged()),this, TQT_SLOT(updateSize()));
+	connect(m_widget,TQ_SIGNAL(messageChanged()),this, TQ_SLOT(updateSize()));
 	updateSize();
 	enableButtonOK( true );
 	slotTextChanged();
-	connect(m_widget, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()));
+	connect(m_widget, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()));
 }
 
 void KexiNameDialog::updateSize()
diff --git a/kexi/main/kexinamewidget.cpp b/kexi/main/kexinamewidget.cpp
index bf38c28a..fe1babeb 100644
--- a/kexi/main/kexinamewidget.cpp
+++ b/kexi/main/kexinamewidget.cpp
@@ -94,14 +94,14 @@ void KexiNameWidget::init(
 	m_nameWarning = i18n("Please enter the name.");
 	m_captionWarning = i18n("Please enter the caption.");
 
-	connect(le_caption, TQT_SIGNAL(textChanged(const TQString&)),
-		this,TQT_SLOT(slotCaptionTxtChanged(const TQString&)));
-	connect(le_name, TQT_SIGNAL(textChanged(const TQString&)),
-		this,TQT_SLOT(slotNameTxtChanged(const TQString&)));
-	connect(le_caption, TQT_SIGNAL(returnPressed()),
-		this,TQT_SIGNAL(returnPressed()));
-	connect(le_name, TQT_SIGNAL(returnPressed()),
-		this,TQT_SIGNAL(returnPressed()));
+	connect(le_caption, TQ_SIGNAL(textChanged(const TQString&)),
+		this,TQ_SLOT(slotCaptionTxtChanged(const TQString&)));
+	connect(le_name, TQ_SIGNAL(textChanged(const TQString&)),
+		this,TQ_SLOT(slotNameTxtChanged(const TQString&)));
+	connect(le_caption, TQ_SIGNAL(returnPressed()),
+		this,TQ_SIGNAL(returnPressed()));
+	connect(le_name, TQ_SIGNAL(returnPressed()),
+		this,TQ_SIGNAL(returnPressed()));
 }
 
 KexiNameWidget::~KexiNameWidget()
diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp
index 2dbf58fe..0316da78 100644
--- a/kexi/main/kexistatusbar.cpp
+++ b/kexi/main/kexistatusbar.cpp
@@ -54,8 +54,8 @@ KexitStatusBar::KexitStatusBar(TQWidget *parent, const char *name)
 	setReadOnlyFlag(false);
 
 // @todo
-//	connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
-//		this, TQT_SLOT(activePartChanged(KParts::Part*)));
+//	connect(PartController::getInstance(), TQ_SIGNAL(activePartChanged(KParts::Part*)),
+//		this, TQ_SLOT(activePartChanged(KParts::Part*)));
 
 	/// @todo remove parts from the map on PartRemoved() ?
 }
@@ -77,8 +77,8 @@ void KexitStatusBar::activePartChanged(KParts::Part *part)
 // @todo
 	if (part && part->widget()) {
 		if ((m_viewmsgIface = dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget()))) {
-			connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ),
-				this, TQT_SLOT( setStatus( const TQString & ) ) );
+			connect( part->widget(), TQ_SIGNAL( viewStatusMsg( const TQString & ) ),
+				this, TQ_SLOT( setStatus( const TQString & ) ) );
 
 #  if TDE_VERSION < TDE_MAKE_VERSION(3,1,90)
 			changeItem(m_map[ m_activePart ], m_msgID);
@@ -86,7 +86,7 @@ void KexitStatusBar::activePartChanged(KParts::Part *part)
 #  endif
 		}
 		else if ((m_cursorIface = dynamic_cast<KTextEditor::ViewCursorInterface*>(part->widget()))) {
-			connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(cursorPositionChanged()));
+			connect(part->widget(), TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(cursorPositionChanged()));
 			cursorPositionChanged();
 	    }
 		else {
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
index ecf21be9..83db3bbd 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
@@ -55,8 +55,8 @@ KexiSimplePrintingCommand::KexiSimplePrintingCommand(
  , m_previewWindow(0)
  , m_printPreviewNeedsReloading(false)
 {
-	connect(this, TQT_SIGNAL(showPageSetupRequested(KexiPart::Item*)), 
-		m_mainWin, TQT_SLOT(showPageSetupForItem(KexiPart::Item*)));
+	connect(this, TQ_SIGNAL(showPageSetupRequested(KexiPart::Item*)), 
+		m_mainWin, TQ_SLOT(showPageSetupForItem(KexiPart::Item*)));
 }
 
 KexiSimplePrintingCommand::~KexiSimplePrintingCommand()
@@ -261,8 +261,8 @@ bool KexiSimplePrintingCommand::showPrintPreview(const KexiSimplePrintingSetting
 			*m_previewEngine, tableOrQuery.captionOrName(), 0, 
 			TQt::WStyle_Customize|TQt::WStyle_NormalBorder|TQt::WStyle_Title|
 			TQt::WStyle_SysMenu|TQt::WStyle_MinMax|TQt::WStyle_ContextHelp);
-		connect(m_previewWindow, TQT_SIGNAL(printRequested()), this, TQT_SLOT(print()));
-		connect(m_previewWindow, TQT_SIGNAL(pageSetupRequested()), this, TQT_SLOT(slotShowPageSetupRequested()));
+		connect(m_previewWindow, TQ_SIGNAL(printRequested()), this, TQ_SLOT(print()));
+		connect(m_previewWindow, TQ_SIGNAL(pageSetupRequested()), this, TQ_SLOT(slotShowPageSetupRequested()));
 		m_previewWindow->show();
 		KDialog::centerOnScreen(m_previewWindow);
 		m_printPreviewNeedsReloading = false;
@@ -337,17 +337,17 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi
 
 	m_contents->printButton->setIconSet( KStdGuiItem::print().iconSet(TDEIcon::Small) );
 	m_contents->printButton->setText( KStdGuiItem::print().text() );
-	connect(m_contents->printButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(print()));
+	connect(m_contents->printButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(print()));
 
 	m_contents->printPreviewButton->setIconSet( SmallIconSet("document-print-preview") );
 	m_contents->printPreviewButton->setText( i18n("Print Previe&w...") );
-	connect(m_contents->printPreviewButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(printPreview()));
+	connect(m_contents->printPreviewButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(printPreview()));
 
 	m_contents->iconLabel->setFixedWidth(32+6);
 	m_contents->iconLabel->setPixmap( DesktopIcon("text-x-generic", 32) );
 	TQWhatsThis::add(m_contents->headerTitleFontButton, i18n("Changes font for title text."));
-	connect(m_contents->headerTitleFontButton, TQT_SIGNAL(clicked()), 
-		this, TQT_SLOT(slotChangeTitleFont()));
+	connect(m_contents->headerTitleFontButton, TQ_SIGNAL(clicked()), 
+		this, TQ_SLOT(slotChangeTitleFont()));
 
 	if (m_item) {
 		m_origCaptionLabelText = m_contents->captionLabel->text();
@@ -358,18 +358,18 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi
 		}
 		m_contents->captionLabel->setText( m_origCaptionLabelText.arg(m_item->name()) );
 	}
-	connect(m_contents->headerTitleLineEdit,TQT_SIGNAL(textChanged(const TQString&)), 
-		this, TQT_SLOT(slotTitleTextChanged(const TQString&)));
+	connect(m_contents->headerTitleLineEdit,TQ_SIGNAL(textChanged(const TQString&)), 
+		this, TQ_SLOT(slotTitleTextChanged(const TQString&)));
 	m_contents->headerTitleLineEdit->setFont( m_settings.pageTitleFont );
 
 	TQWhatsThis::add(m_contents->openDataLink, 
 		i18n("Shows data for table or query associated with this page setup."));
 	TQToolTip::add(m_contents->openDataLink, 
 		i18n("Shows data for table or query associated with this page setup."));
-	connect(m_contents->openDataLink, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(slotOpenData())); 
+	connect(m_contents->openDataLink, TQ_SIGNAL(leftClickedURL()), this, TQ_SLOT(slotOpenData())); 
 
 	TQWhatsThis::add(m_contents->saveSetupLink, i18n("Saves settings for this setup as default."));
-	connect(m_contents->saveSetupLink, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(slotSaveSetup()));
+	connect(m_contents->saveSetupLink, TQ_SIGNAL(leftClickedURL()), this, TQ_SLOT(slotSaveSetup()));
 #if !KDE_IS_VERSION(3,5,1) && !defined(TQ_WS_WIN)
 	//a fix for problems with focusable KUrlLabel on KDElibs<=3.5.0
 	m_contents->openDataLink->setFocusPolicy(NoFocus);
@@ -388,15 +388,15 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi
 	updatePageLayoutAndUnitInfo();
 	TQWhatsThis::add(m_contents->changePageSizeAndMarginsButton, 
 		i18n("Changes page size and margins."));
-	connect(m_contents->changePageSizeAndMarginsButton, TQT_SIGNAL(clicked()), 
-		this, TQT_SLOT(slotChangePageSizeAndMargins()));
+	connect(m_contents->changePageSizeAndMarginsButton, TQ_SIGNAL(clicked()), 
+		this, TQ_SLOT(slotChangePageSizeAndMargins()));
 
-	connect(m_contents->addPageNumbersCheckbox, TQT_SIGNAL(toggled(bool)), 
-		this, TQT_SLOT(slotAddPageNumbersCheckboxToggled(bool)));
-	connect(m_contents->addDateTimeCheckbox, TQT_SIGNAL(toggled(bool)), 
-		this, TQT_SLOT(slotAddDateTimeCheckboxToggled(bool)));
-	connect(m_contents->addTableBordersCheckbox, TQT_SIGNAL(toggled(bool)), 
-		this, TQT_SLOT(slotAddTableBordersCheckboxToggled(bool)));
+	connect(m_contents->addPageNumbersCheckbox, TQ_SIGNAL(toggled(bool)), 
+		this, TQ_SLOT(slotAddPageNumbersCheckboxToggled(bool)));
+	connect(m_contents->addDateTimeCheckbox, TQ_SIGNAL(toggled(bool)), 
+		this, TQ_SLOT(slotAddDateTimeCheckboxToggled(bool)));
+	connect(m_contents->addTableBordersCheckbox, TQ_SIGNAL(toggled(bool)), 
+		this, TQ_SLOT(slotAddTableBordersCheckboxToggled(bool)));
 
 	if (!ok) {
 		// no data!
@@ -414,16 +414,16 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi
 	m_printPreviewNeedsReloading = false;
 
 /*	if (printPreview)
-		TQTimer::singleShot(50, this, TQT_SLOT(printPreview()));
+		TQTimer::singleShot(50, this, TQ_SLOT(printPreview()));
 	else if (print)
-		TQTimer::singleShot(50, this, TQT_SLOT(print()));*/
-	connect(this, TQT_SIGNAL(printItemRequested(KexiPart::Item*,const KexiSimplePrintingSettings&,
+		TQTimer::singleShot(50, this, TQ_SLOT(print()));*/
+	connect(this, TQ_SIGNAL(printItemRequested(KexiPart::Item*,const KexiSimplePrintingSettings&,
 		const TQString&)),
-		m_mainWin, TQT_SLOT(printItem(KexiPart::Item*,const KexiSimplePrintingSettings&,
+		m_mainWin, TQ_SLOT(printItem(KexiPart::Item*,const KexiSimplePrintingSettings&,
 		const TQString&)));
-	connect(this, TQT_SIGNAL(printPreviewForItemRequested(KexiPart::Item*, 
+	connect(this, TQ_SIGNAL(printPreviewForItemRequested(KexiPart::Item*, 
 		const KexiSimplePrintingSettings&,const TQString&,bool)),
-		m_mainWin, TQT_SLOT(printPreviewForItem(KexiPart::Item*, 
+		m_mainWin, TQ_SLOT(printPreviewForItem(KexiPart::Item*, 
 		const KexiSimplePrintingSettings&,const TQString&,bool)));
 }
 
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index 11cf1114..eb415262 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -169,28 +169,28 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
 	lyr->addWidget(m_toolbar);
 
 	id = m_toolbar->insertWidget( -1, 0, new KPushButton(KStdGuiItem::print(), m_toolbar) );
-	m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrintClicked()));
+	m_toolbar->addConnection(id, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPrintClicked()));
 	static_cast<KPushButton*>(m_toolbar->getWidget(id))->setAccel(TQt::CTRL|TQt::Key_P);
 	m_toolbar->insertSeparator();
 
 	id = m_toolbar->insertWidget(-1, 0, new KPushButton(i18n("Page Set&up..."), m_toolbar));
-	m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPageSetup()));
+	m_toolbar->addConnection(id, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPageSetup()));
 	m_toolbar->insertSeparator();
 
 
 #ifndef KEXI_NO_UNFINISHED 
 //! @todo unfinished
 	id = m_toolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("zoom-in"), i18n("Zoom In"), m_toolbar));
-	m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotZoomInClicked()));
+	m_toolbar->addConnection(id, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotZoomInClicked()));
 	m_toolbar->insertSeparator();
 
 	id = m_toolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("zoom-out"), i18n("Zoom Out"), m_toolbar));
-	m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotZoomOutClicked()));
+	m_toolbar->addConnection(id, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotZoomOutClicked()));
 	m_toolbar->insertSeparator();
 #endif
 
 	id = m_toolbar->insertWidget(-1, 0, new KPushButton(KStdGuiItem::close(), m_toolbar));
-	m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(close()));
+	m_toolbar->addConnection(id, TQ_SIGNAL(clicked()), this, TQ_SLOT(close()));
 	m_toolbar->alignItemRight(id);
 
 	m_scrollView = new KexiSimplePrintPreviewScrollView(this);
@@ -214,29 +214,29 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
 	m_navToolbar->setIconText(TDEToolBar::IconTextRight);
 
 	m_idFirst = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("go-first"), i18n("First Page"), m_navToolbar));
-	m_navToolbar->addConnection(m_idFirst, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFirstClicked()));
+	m_navToolbar->addConnection(m_idFirst, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFirstClicked()));
 	m_navToolbar->insertSeparator();
 
 	m_idPrevious = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("go-previous"), i18n("Previous Page"), m_navToolbar));
-	m_navToolbar->addConnection(m_idPrevious, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPreviousClicked()));
+	m_navToolbar->addConnection(m_idPrevious, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPreviousClicked()));
 	m_navToolbar->insertSeparator();
 
 	m_idPageNumberLabel = m_navToolbar->insertWidget( -1, 0, new TQLabel(m_navToolbar));
 	m_navToolbar->insertSeparator();
 
 	m_idNext = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("go-next"), i18n("Next Page"), m_navToolbar));
-	m_navToolbar->addConnection(m_idNext, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNextClicked()));
+	m_navToolbar->addConnection(m_idNext, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNextClicked()));
 	m_navToolbar->insertSeparator();
 
 	m_idLast = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("go-last"), i18n("Last Page"), m_navToolbar));
-	m_navToolbar->addConnection(m_idLast, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLastClicked()));
+	m_navToolbar->addConnection(m_idLast, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLastClicked()));
 	m_navToolbar->insertSeparator();
 
 	resize(width(), kapp->desktop()->height()*4/5);
 
 //! @todo progress bar...
 
-	TQTimer::singleShot(50, this, TQT_SLOT(initLater()));
+	TQTimer::singleShot(50, this, TQ_SLOT(initLater()));
 }
 
 void KexiSimplePrintPreviewWindow::initLater()
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index 25305e1a..360b7031 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -119,7 +119,7 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set,
 //	TQLabel* lbl = new TQLabel(i18n("<b>Select existing Kexi project to open:</b>"), openExistingWidget);
 //	openExistingWidgetLyr->addWidget( lbl );
 	d->prjTypeSelector = new KexiPrjTypeSelector( d->openExistingWidget );
-	connect(d->prjTypeSelector->buttonGroup,TQT_SIGNAL(clicked(int)),this,TQT_SLOT(slotPrjTypeSelected(int)));
+	connect(d->prjTypeSelector->buttonGroup,TQ_SIGNAL(clicked(int)),this,TQ_SLOT(slotPrjTypeSelected(int)));
 	openExistingWidgetLyr->addWidget( d->prjTypeSelector );
 	openExistingWidgetLyr->addSpacing( KDialogBase::spacingHint() );
 	TQFrame* line = new TQFrame( d->openExistingWidget, "line" );
@@ -136,28 +136,28 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set,
 	m_fileDlg = 0;
 		
 //	addWidget(m_file);
-//	connect(m_file->btn_advanced,TQT_SIGNAL(clicked()),this,TQT_SLOT(showAdvancedConn()));
+//	connect(m_file->btn_advanced,TQ_SIGNAL(clicked()),this,TQ_SLOT(showAdvancedConn()));
 
 	m_remote = new KexiConnSelectorBase(d->stack, "conn_sel");
 	m_remote->icon->setPixmap( DesktopIcon("network") );
 	m_remote->icon->setFixedSize( m_remote->icon->pixmap()->size() );
 //	m_remote->btn_back->setIconSet( SmallIconSet("1uparrow") );
-	connect(m_remote->btn_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoteAddBtnClicked()));
-	connect(m_remote->btn_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoteEditBtnClicked()));
-	connect(m_remote->btn_remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoteRemoveBtnClicked()));
+	connect(m_remote->btn_add, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoteAddBtnClicked()));
+	connect(m_remote->btn_edit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoteEditBtnClicked()));
+	connect(m_remote->btn_remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoteRemoveBtnClicked()));
 	TQToolTip::add(m_remote->btn_add, i18n("Add a new database connection"));
 	TQToolTip::add(m_remote->btn_edit, i18n("Edit selected database connection"));
 	TQToolTip::add(m_remote->btn_remove, i18n("Remove selected database connections"));
 	d->stack->addWidget(m_remote);
 	if (m_remote->layout())
 		m_remote->layout()->setMargin(0);
-//	connect(m_remote->btn_back,TQT_SIGNAL(clicked()),this,TQT_SLOT(showSimpleConn()));
-	connect(m_remote->list,TQT_SIGNAL(doubleClicked(TQListViewItem*)),
-		this,TQT_SLOT(slotConnectionItemExecuted(TQListViewItem*)));
-	connect(m_remote->list,TQT_SIGNAL(returnPressed(TQListViewItem*)),
-		this,TQT_SLOT(slotConnectionItemExecuted(TQListViewItem*)));
-	connect(m_remote->list,TQT_SIGNAL(selectionChanged()),
-		this,TQT_SLOT(slotConnectionSelectionChanged()));
+//	connect(m_remote->btn_back,TQ_SIGNAL(clicked()),this,TQ_SLOT(showSimpleConn()));
+	connect(m_remote->list,TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+		this,TQ_SLOT(slotConnectionItemExecuted(TQListViewItem*)));
+	connect(m_remote->list,TQ_SIGNAL(returnPressed(TQListViewItem*)),
+		this,TQ_SLOT(slotConnectionItemExecuted(TQListViewItem*)));
+	connect(m_remote->list,TQ_SIGNAL(selectionChanged()),
+		this,TQ_SLOT(slotConnectionSelectionChanged()));
 }
 
 KexiConnSelectorWidget::~KexiConnSelectorWidget()
@@ -167,7 +167,7 @@ KexiConnSelectorWidget::~KexiConnSelectorWidget()
 
 /*void KexiConnSelectorWidget::disconnectShowSimpleConnButton()
 {
-	m_remote->btn_back->disconnect(this,TQT_SLOT(showSimpleConn()));
+	m_remote->btn_back->disconnect(this,TQ_SLOT(showSimpleConn()));
 }*/
 
 void KexiConnSelectorWidget::showAdvancedConn()
@@ -228,9 +228,9 @@ void KexiConnSelectorWidget::showSimpleConn()
 		for (TQWidget *w = parentWidget(true);w;w=w->parentWidget(true)) {
 			if (w->isDialog()) {
 //#ifndef TQ_WS_WIN
-				connect(m_fileDlg,TQT_SIGNAL(rejected()),static_cast<TQDialog*>(w),TQT_SLOT(reject()));
+				connect(m_fileDlg,TQ_SIGNAL(rejected()),static_cast<TQDialog*>(w),TQ_SLOT(reject()));
 //#endif
-//				connect(m_fileDlg,TQT_SIGNAL(cancelled()),static_cast<TQDialog*>(w),TQT_SLOT(reject()));
+//				connect(m_fileDlg,TQ_SIGNAL(cancelled()),static_cast<TQDialog*>(w),TQ_SLOT(reject()));
 				break;
 			}
 		}
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index 2b1f4026..e97532b3 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -123,9 +123,9 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
 //	d->chk_server_txt = i18n("Always &use database server for creating new projects.")
 //		+"\n"+txt_dns;
 
-	connect(m_prjtype_sel->lv_types,TQT_SIGNAL(executed(TQListViewItem*)),this,TQT_SLOT(slotLvTypesExecuted(TQListViewItem*)));
-	connect(m_prjtype_sel->lv_types,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotLvTypesExecuted(TQListViewItem*)));
-	connect(m_prjtype_sel->lv_types,TQT_SIGNAL(selectionChanged( TQListViewItem*)),this,TQT_SLOT(slotLvTypesSelected(TQListViewItem*)));
+	connect(m_prjtype_sel->lv_types,TQ_SIGNAL(executed(TQListViewItem*)),this,TQ_SLOT(slotLvTypesExecuted(TQListViewItem*)));
+	connect(m_prjtype_sel->lv_types,TQ_SIGNAL(returnPressed(TQListViewItem*)),this,TQ_SLOT(slotLvTypesExecuted(TQListViewItem*)));
+	connect(m_prjtype_sel->lv_types,TQ_SIGNAL(selectionChanged( TQListViewItem*)),this,TQ_SLOT(slotLvTypesSelected(TQListViewItem*)));
 
 //	static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertWidget(1,d->m_prjtype_sel->lv_types);
 //	static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertStretch(3,1);
@@ -167,26 +167,26 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
 	m_conn_sel->m_fileDlg->setMode( KexiStartupFileDialog::SavingFileBasedDB );
 //	m_conn_sel->m_fileDlg->setMode( KFile::LocalOnly | KFile::File );
 //	m_conn_sel->m_fileDlg->setOperationMode( KFileDialog::Saving );
-////js	connect(m_conn_sel->m_fileDlg,TQT_SIGNAL(rejected()),this,TQT_SLOT(reject()));
-//	connect(m_conn_sel->m_fileDlg,TQT_SIGNAL(fileHighlighted(const TQString&)),this,TQT_SLOT(slotFileHighlighted(const TQString&)));
-	connect(m_conn_sel->m_fileDlg,TQT_SIGNAL(accepted()),this,TQT_SLOT(accept()));
+////js	connect(m_conn_sel->m_fileDlg,TQ_SIGNAL(rejected()),this,TQ_SLOT(reject()));
+//	connect(m_conn_sel->m_fileDlg,TQ_SIGNAL(fileHighlighted(const TQString&)),this,TQ_SLOT(slotFileHighlighted(const TQString&)));
+	connect(m_conn_sel->m_fileDlg,TQ_SIGNAL(accepted()),this,TQ_SLOT(accept()));
 	m_conn_sel->showAdvancedConn();
-	connect(m_conn_sel,TQT_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)),
-		this,TQT_SLOT(next()));
+	connect(m_conn_sel,TQ_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)),
+		this,TQ_SLOT(next()));
 
 	addPage(m_conn_sel_widget, i18n("Select Project's Location"));
 
 	//page: server db name
 	m_server_db_name = new KexiServerDBNamePage(this, "KexiServerDBNamePage");
 	d->server_db_name_dblist_lbl_txt = i18n("Existing project databases on <b>%1</b> database server:");
-	connect(m_server_db_name->le_caption, TQT_SIGNAL(textChanged(const TQString&)),
-		this,TQT_SLOT(slotServerDBCaptionTxtChanged(const TQString&)));
-	connect(m_server_db_name->le_dbname, TQT_SIGNAL(textChanged(const TQString&)),
-		this,TQT_SLOT(slotServerDBNameTxtChanged(const TQString&)));
-	connect(m_server_db_name->le_caption, TQT_SIGNAL(returnPressed()),
-		this,TQT_SLOT(accept()));
-	connect(m_server_db_name->le_dbname, TQT_SIGNAL(returnPressed()),
-		this,TQT_SLOT(accept()));
+	connect(m_server_db_name->le_caption, TQ_SIGNAL(textChanged(const TQString&)),
+		this,TQ_SLOT(slotServerDBCaptionTxtChanged(const TQString&)));
+	connect(m_server_db_name->le_dbname, TQ_SIGNAL(textChanged(const TQString&)),
+		this,TQ_SLOT(slotServerDBNameTxtChanged(const TQString&)));
+	connect(m_server_db_name->le_caption, TQ_SIGNAL(returnPressed()),
+		this,TQ_SLOT(accept()));
+	connect(m_server_db_name->le_dbname, TQ_SIGNAL(returnPressed()),
+		this,TQ_SLOT(accept()));
 	m_server_db_name->le_caption->setText(i18n("New database"));
 	m_server_db_name->le_dbname->setValidator(new KexiUtils::IdentifierValidator(this, "id_val"));
 	m_project_selector = new KexiProjectSelectorWidget(
diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp
index 8f7682a4..b31a7e49 100644
--- a/kexi/main/startup/KexiProjectSelector.cpp
+++ b/kexi/main/startup/KexiProjectSelector.cpp
@@ -121,9 +121,9 @@ KexiProjectSelectorWidget::KexiProjectSelectorWidget(
 
 	//show projects
 	setProjectSet( m_prj_set );
-	connect(list,TQT_SIGNAL(doubleClicked(TQListViewItem*)),this,TQT_SLOT(slotItemExecuted(TQListViewItem*)));
-	connect(list,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotItemExecuted(TQListViewItem*)));
-	connect(list,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotItemSelected()));
+	connect(list,TQ_SIGNAL(doubleClicked(TQListViewItem*)),this,TQ_SLOT(slotItemExecuted(TQListViewItem*)));
+	connect(list,TQ_SIGNAL(returnPressed(TQListViewItem*)),this,TQ_SLOT(slotItemExecuted(TQListViewItem*)));
+	connect(list,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(slotItemSelected()));
 }
 
 /*!  
@@ -267,10 +267,10 @@ void KexiProjectSelectorDialog::init(KexiProjectSet* prj_set, bool showProjectNa
 	setIcon(*m_sel->icon());
 	m_sel->setFocus();
 	
-	connect(m_sel,TQT_SIGNAL(projectExecuted(KexiProjectData*)),
-		this,TQT_SLOT(slotProjectExecuted(KexiProjectData*)));
-	connect(m_sel,TQT_SIGNAL(selectionChanged(KexiProjectData*)),
-		this,TQT_SLOT(slotProjectSelectionChanged(KexiProjectData*)));
+	connect(m_sel,TQ_SIGNAL(projectExecuted(KexiProjectData*)),
+		this,TQ_SLOT(slotProjectExecuted(KexiProjectData*)));
+	connect(m_sel,TQ_SIGNAL(selectionChanged(KexiProjectData*)),
+		this,TQ_SLOT(slotProjectSelectionChanged(KexiProjectData*)));
 }
 
 KexiProjectData* KexiProjectSelectorDialog::selectedProjectData() const
diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp
index f47d7da1..6e668b6c 100644
--- a/kexi/main/startup/KexiStartup.cpp
+++ b/kexi/main/startup/KexiStartup.cpp
@@ -162,8 +162,8 @@ KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionD
 
 	setPrompt( msg );
 	if (showDetailsButton) {
-		connect( this, TQT_SIGNAL(user1Clicked()), 
-			this, TQT_SLOT(slotShowConnectionDetails()) );
+		connect( this, TQ_SIGNAL(user1Clicked()), 
+			this, TQ_SLOT(slotShowConnectionDetails()) );
 		setButtonText(KDialogBase::User1, i18n("&Details")+ " >>");
 	}
 	setButtonOK(KGuiItem(i18n("&Open"), "document-open"));
@@ -388,8 +388,8 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 		if (cdata.password.isEmpty()) {
 			delete d->passwordDialog;
 			d->passwordDialog = new KexiDBPasswordDialog(0, cdata, true);
-//			connect( d->passwordDialog, TQT_SIGNAL(user1Clicked()), 
-//				this, TQT_SLOT(slotShowConnectionDetails()) );
+//			connect( d->passwordDialog, TQ_SIGNAL(user1Clicked()), 
+//				this, TQ_SLOT(slotShowConnectionDetails()) );
 			const int ret = d->passwordDialog->exec();
 			if (d->passwordDialog->showConnectionDetailsRequested() || ret == TQDialog::Accepted) {
 //				if ( ret == TQDialog::Accepted ) {
@@ -485,8 +485,8 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 					}
 					d->connDialog = new KexiDBConnectionDialog(
 						*m_projectData, d->shortcutFile->fileName());
-					connect(d->connDialog, TQT_SIGNAL(saveChanges()), 
-						this, TQT_SLOT(slotSaveShortcutFileChanges()));
+					connect(d->connDialog, TQ_SIGNAL(saveChanges()), 
+						this, TQ_SLOT(slotSaveShortcutFileChanges()));
 					int res = d->connDialog->exec();
 					if (res == TQDialog::Accepted) {
 						//get (possibly changed) prj data
@@ -522,8 +522,8 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 							if (!d->connDialog) {
 								d->connDialog = new KexiDBConnectionDialog(
 									cdata, d->connShortcutFile->fileName());
-								connect(d->connDialog, TQT_SIGNAL(saveChanges()), 
-									this, TQT_SLOT(slotSaveShortcutFileChanges()));
+								connect(d->connDialog, TQ_SIGNAL(saveChanges()), 
+									this, TQ_SLOT(slotSaveShortcutFileChanges()));
 							}
 							const int res = d->connDialog->exec();
 							if (res == TQDialog::Accepted) {
@@ -565,8 +565,8 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 	//let's show connection details, user asked for that in the "password dialog"
 	if (d->passwordDialog && d->passwordDialog->showConnectionDetailsRequested()) {
 		d->connDialog = new KexiDBConnectionDialog(*m_projectData);
-//		connect(d->connDialog->tabWidget->mainWidget, TQT_SIGNAL(saveChanges()), 
-//			this, TQT_SLOT(slotSaveShortcutFileChanges()));
+//		connect(d->connDialog->tabWidget->mainWidget, TQ_SIGNAL(saveChanges()), 
+//			this, TQ_SLOT(slotSaveShortcutFileChanges()));
 		int res = d->connDialog->exec();
 
 		if (res == TQDialog::Accepted) {
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index c738d192..de382d2f 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -194,7 +194,7 @@ KexiStartupDialog::KexiStartupDialog(
 #endif
 
 	if (!d->singlePage) {
-		connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT(slotPageShown(TQWidget*)));
+		connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget*)), this, TQ_SLOT(slotPageShown(TQWidget*)));
 		d->templatesWidget->setFocus();
 	}
 	showPage(0);
@@ -304,7 +304,7 @@ void KexiStartupDialog::setupPageTemplates()
 			d->templatesWidget_IconListBox->installEventFilter(this);
 	}
 	lyr->addWidget(d->templatesWidget);
-	connect(d->templatesWidget, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT(slotPageShown(TQWidget*)));
+	connect(d->templatesWidget, TQ_SIGNAL(aboutToShowPage(TQWidget*)), this, TQ_SLOT(slotPageShown(TQWidget*)));
 
 	if (d->dialogOptions & CheckBoxDoNotShowAgain) {
 		d->chkDoNotShow = new TQCheckBox(i18n("Don't show me this dialog again"), d->pageTemplates, "chkDoNotShow");
@@ -348,21 +348,21 @@ void KexiStartupDialog::setupPageTemplates()
 
 	d->viewTemplates = new KexiStartupDialogTemplatesPage( templPageFrame );
 	tmplyr->addWidget( d->viewTemplates );
-	connect(d->viewTemplates,TQT_SIGNAL(selected(const TQString&)),
-		this,TQT_SLOT(templateSelected(const TQString&)));
-/*	connect(d->viewTemplates->templates,TQT_SIGNAL(returnPressed(TQIconViewItem*)),
-		this,TQT_SLOT(templateItemExecuted(TQIconViewItem*)));
-	connect(d->viewTemplates->templates,TQT_SIGNAL(currentChanged(TQIconViewItem*)),
-		this,TQT_SLOT(templateItemSelected(TQIconViewItem*)));*/
+	connect(d->viewTemplates,TQ_SIGNAL(selected(const TQString&)),
+		this,TQ_SLOT(templateSelected(const TQString&)));
+/*	connect(d->viewTemplates->templates,TQ_SIGNAL(returnPressed(TQIconViewItem*)),
+		this,TQ_SLOT(templateItemExecuted(TQIconViewItem*)));
+	connect(d->viewTemplates->templates,TQ_SIGNAL(currentChanged(TQIconViewItem*)),
+		this,TQ_SLOT(templateItemSelected(TQIconViewItem*)));*/
 /*later
 	templPageFrame = d->templatesWidget->addPage (
 		i18n("Personal Databases"), i18n("New Personal Database Project Templates"), DesktopIcon("folder_home") );
 	tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint());
 	d->viewPersonalTempl = new TemplatesPage(TQt::Vertical, templPageFrame, "personal_page" );
 	tmplyr->addWidget( d->viewPersonalTempl );
-	connect(d->viewPersonalTempl->templates,TQT_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*)));
-	connect(d->viewPersonalTempl->templates,TQT_SIGNAL(returnPressed(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*)));
-	connect(d->viewPersonalTempl->templates,TQT_SIGNAL(currentChanged(TQIconViewItem*)),this,TQT_SLOT(templateItemSelected(TQIconViewItem*)));
+	connect(d->viewPersonalTempl->templates,TQ_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQ_SLOT(templateItemExecuted(TQIconViewItem*)));
+	connect(d->viewPersonalTempl->templates,TQ_SIGNAL(returnPressed(TQIconViewItem*)),this,TQ_SLOT(templateItemExecuted(TQIconViewItem*)));
+	connect(d->viewPersonalTempl->templates,TQ_SIGNAL(currentChanged(TQIconViewItem*)),this,TQ_SLOT(templateItemSelected(TQIconViewItem*)));
 */
 
 	//- page "business db"
@@ -374,9 +374,9 @@ void KexiStartupDialog::setupPageTemplates()
 	tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint());
 	d->viewBusinessTempl = new TemplatesPage(TQt::Vertical, templPageFrame, "business_page" );
 	tmplyr->addWidget( d->viewBusinessTempl );
-	connect(d->viewBusinessTempl->templates,TQT_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*)));
-	connect(d->viewBusinessTempl->templates,TQT_SIGNAL(returnPressed(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*)));
-	connect(d->viewBusinessTempl->templates,TQT_SIGNAL(currentChanged(TQIconViewItem*)),this,TQT_SLOT(templateItemSelected(TQIconViewItem*)));
+	connect(d->viewBusinessTempl->templates,TQ_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQ_SLOT(templateItemExecuted(TQIconViewItem*)));
+	connect(d->viewBusinessTempl->templates,TQ_SIGNAL(returnPressed(TQIconViewItem*)),this,TQ_SLOT(templateItemExecuted(TQIconViewItem*)));
+	connect(d->viewBusinessTempl->templates,TQ_SIGNAL(currentChanged(TQIconViewItem*)),this,TQ_SLOT(templateItemSelected(TQIconViewItem*)));
 */
 #endif //DB_TEMPLATES
 
@@ -559,11 +559,11 @@ void KexiStartupDialog::setupPageOpenExisting()
 		d->openExistingConnWidget->showAdvancedConn();
 	}
 	d->openExistingFileDlg = d->openExistingConnWidget->m_fileDlg;
-	connect(d->openExistingFileDlg,TQT_SIGNAL(accepted()),this,TQT_SLOT(accept()));
-	connect(d->openExistingConnWidget,TQT_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)),
-		this,TQT_SLOT(connectionItemForOpenExistingExecuted(ConnectionDataLVItem*)));
-	connect(d->openExistingConnWidget,TQT_SIGNAL(connectionItemHighlighted(ConnectionDataLVItem*)),
-		this,TQT_SLOT(connectionItemForOpenExistingHighlighted(ConnectionDataLVItem*)));
+	connect(d->openExistingFileDlg,TQ_SIGNAL(accepted()),this,TQ_SLOT(accept()));
+	connect(d->openExistingConnWidget,TQ_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)),
+		this,TQ_SLOT(connectionItemForOpenExistingExecuted(ConnectionDataLVItem*)));
+	connect(d->openExistingConnWidget,TQ_SIGNAL(connectionItemHighlighted(ConnectionDataLVItem*)),
+		this,TQ_SLOT(connectionItemForOpenExistingHighlighted(ConnectionDataLVItem*)));
 }
 
 void KexiStartupDialog::connectionItemForOpenExistingExecuted(ConnectionDataLVItem *item)
@@ -632,8 +632,8 @@ void KexiStartupDialog::setupPageOpenRecent()
 	TQVBoxLayout *lyr = new TQVBoxLayout( d->pageOpenRecent, 0, KDialogBase::spacingHint() );
 	lyr->addWidget( d->prj_selector = new KexiProjectSelectorWidget(
 		d->pageOpenRecent, "prj_selector", d->recentProjects ) );
-	connect(d->prj_selector,TQT_SIGNAL(projectExecuted(KexiProjectData*)),
-		this,TQT_SLOT(recentProjectItemExecuted(KexiProjectData*)));
+	connect(d->prj_selector,TQ_SIGNAL(projectExecuted(KexiProjectData*)),
+		this,TQ_SLOT(recentProjectItemExecuted(KexiProjectData*)));
 #endif
 }
 
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
index d99ad4ae..d0440730 100644
--- a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
+++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
@@ -78,7 +78,7 @@ KexiStartupDialogTemplatesPage::KexiStartupDialogTemplatesPage( TQWidget * paren
 	setColumnWidthMode(0, Maximum);
 	setResizeMode(LastColumn);
 	setItemMargin(6);
-	connect(this,TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*)));
+	connect(this,TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem*)));
 }
 
 KexiStartupDialogTemplatesPage::~KexiStartupDialogTemplatesPage()
@@ -104,7 +104,7 @@ void KexiStartupDialogTemplatesPage::populate()
 //	info = new KTextBrowser(this,"info");
 //	setResizeMode(templates,KeepSize);
 //	setResizeMode(info,KeepSize);
-//	connect(templates,TQT_SIGNAL(selectionChanged(TQIconViewItem*)),this,TQT_SLOT(itemClicked(TQIconViewItem*)));
+//	connect(templates,TQ_SIGNAL(selectionChanged(TQIconViewItem*)),this,TQ_SLOT(itemClicked(TQIconViewItem*)));
 }
 
 /*
diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp
index 9708b037..0db50981 100644
--- a/kexi/main/startup/KexiStartupFileDialog_win.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp
@@ -93,8 +93,8 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
 //(js)    d->okButton = new KPushButton( KStdGuiItem::ok(), d->mainWidget );
 //(js)    d->okButton->setDefault( true );
 //(js)    d->cancelButton = new KPushButton(KStdGuiItem::cancel(), d->mainWidget);
-//(js)    connect( d->okButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOk() ));
-//(js)    connect( d->cancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCancel() ));
+//(js)    connect( d->okButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOk() ));
+//(js)    connect( d->cancelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCancel() ));
 //(js)    d->customWidget = widget;
 //(js)    d->autoSelectExtCheckBox = 0; // delayed loading
 //TODO    d->autoSelectExtChecked = false;
@@ -167,14 +167,14 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
 
     ops = new KDirOperator(d->url, d->mainWidget, "KFileDialog::ops");
     ops->setOnlyDoubleClickSelectsFiles( true );
-    connect(ops, TQT_SIGNAL(urlEntered(const KURL&)),
-            TQT_SLOT(urlEntered(const KURL&)));
-    connect(ops, TQT_SIGNAL(fileHighlighted(const KFileItem *)),
-            TQT_SLOT(fileHighlighted(const KFileItem *)));
-    connect(ops, TQT_SIGNAL(fileSelected(const KFileItem *)),
-            TQT_SLOT(fileSelected(const KFileItem *)));
-    connect(ops, TQT_SIGNAL(finishedLoading()),
-            TQT_SLOT(slotLoadingFinished()));
+    connect(ops, TQ_SIGNAL(urlEntered(const KURL&)),
+            TQ_SLOT(urlEntered(const KURL&)));
+    connect(ops, TQ_SIGNAL(fileHighlighted(const KFileItem *)),
+            TQ_SLOT(fileHighlighted(const KFileItem *)));
+    connect(ops, TQ_SIGNAL(fileSelected(const KFileItem *)),
+            TQ_SLOT(fileSelected(const KFileItem *)));
+    connect(ops, TQ_SIGNAL(finishedLoading()),
+            TQ_SLOT(slotLoadingFinished()));
 
     ops->setupMenu(KDirOperator::SortActions |
                    KDirOperator::FileActions |
@@ -208,13 +208,13 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
                          "edit or select a bookmark.<p>"
                          "These bookmarks are specific to the file dialog, but otherwise operate "
                          "like bookmarks elsewhere in TDE.</qt>"));
-    connect( d->bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )),
-             TQT_SLOT( enterURL( const TQString& )));
+    connect( d->bookmarkHandler, TQ_SIGNAL( openURL( const TQString& )),
+             TQ_SLOT( enterURL( const TQString& )));
 
     TDEToggleAction *showSidebarAction =
         new TDEToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar");
-    connect( showSidebarAction, TQT_SIGNAL( toggled( bool ) ),
-             TQT_SLOT( toggleSpeedbar( bool )) );
+    connect( showSidebarAction, TQ_SIGNAL( toggled( bool ) ),
+             TQ_SLOT( toggleSpeedbar( bool )) );
 
     TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", this, "extra menu" );
     menu->setWhatsThis(i18n("<qt>This is the configuration menu for the file dialog. "
@@ -241,8 +241,8 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
     menu->insert( coll->action( "separate dirs" ));
 
     menu->setDelayed( false );
-    connect( menu->popupMenu(), TQT_SIGNAL( aboutToShow() ),
-             ops, TQT_SLOT( updateSelectionDependentActions() ));
+    connect( menu->popupMenu(), TQ_SIGNAL( aboutToShow() ),
+             ops, TQ_SLOT( updateSelectionDependentActions() ));
     menu->plug( toolbar );
 */
     /*
@@ -264,16 +264,16 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
 
     d->pathCombo->setCompletionObject( ops->dirCompletionObject(), false );
 
-    connect( d->pathCombo, TQT_SIGNAL( urlActivated( const KURL&  )),
-             this,  TQT_SLOT( enterURL( const KURL& ) ));
-    connect( d->pathCombo, TQT_SIGNAL( returnPressed( const TQString&  )),
-             this,  TQT_SLOT( enterURL( const TQString& ) ));
-    connect( d->pathCombo, TQT_SIGNAL(textChanged( const TQString& )),
-             TQT_SLOT( pathComboChanged( const TQString& ) ));
-    connect( d->pathCombo, TQT_SIGNAL( completion( const TQString& )),
-             TQT_SLOT( dirCompletion( const TQString& )));
-    connect( d->pathCombo, TQT_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ),
-             d->pathCombo, TQT_SLOT( rotateText(TDECompletionBase::KeyBindingType) ));
+    connect( d->pathCombo, TQ_SIGNAL( urlActivated( const KURL&  )),
+             this,  TQ_SLOT( enterURL( const KURL& ) ));
+    connect( d->pathCombo, TQ_SIGNAL( returnPressed( const TQString&  )),
+             this,  TQ_SLOT( enterURL( const TQString& ) ));
+    connect( d->pathCombo, TQ_SIGNAL(textChanged( const TQString& )),
+             TQ_SLOT( pathComboChanged( const TQString& ) ));
+    connect( d->pathCombo, TQ_SIGNAL( completion( const TQString& )),
+             TQ_SLOT( dirCompletion( const TQString& )));
+    connect( d->pathCombo, TQ_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ),
+             d->pathCombo, TQ_SLOT( rotateText(TDECompletionBase::KeyBindingType) ));
 
     TQString whatsThisText;
 
@@ -293,14 +293,14 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
 //     locationEdit->setAutoDeleteCompletionObject( true );
     locationEdit->setCompletionObject( ops->completionObject(), false );
 
-    connect( locationEdit, TQT_SIGNAL( returnPressed() ),
-             this, TQT_SLOT( slotOk()));
-    connect(locationEdit, TQT_SIGNAL( activated( const TQString&  )),
-            this,  TQT_SLOT( locationActivated( const TQString& ) ));
-    connect( locationEdit, TQT_SIGNAL( completion( const TQString& )),
-             TQT_SLOT( fileCompletion( const TQString& )));
-    connect( locationEdit, TQT_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ),
-             locationEdit, TQT_SLOT( rotateText(TDECompletionBase::KeyBindingType) ));
+    connect( locationEdit, TQ_SIGNAL( returnPressed() ),
+             this, TQ_SLOT( slotOk()));
+    connect(locationEdit, TQ_SIGNAL( activated( const TQString&  )),
+            this,  TQ_SLOT( locationActivated( const TQString& ) ));
+    connect( locationEdit, TQ_SIGNAL( completion( const TQString& )),
+             TQ_SLOT( fileCompletion( const TQString& )));
+    connect( locationEdit, TQ_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ),
+             locationEdit, TQ_SLOT( rotateText(TDECompletionBase::KeyBindingType) ));
 
     // the Filter label/edit
     whatsThisText = i18n("<qt>This is the filter to apply to the file list. "
@@ -316,12 +316,12 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
     TQWhatsThis::add(filterWidget, whatsThisText);
     setFilter(filter);
     d->filterLabel->setBuddy(filterWidget);
-    connect(filterWidget, TQT_SIGNAL(filterChanged()), TQT_SLOT(slotFilterChanged()));
+    connect(filterWidget, TQ_SIGNAL(filterChanged()), TQ_SLOT(slotFilterChanged()));
 
     // the Automatically Select Extension checkbox
     // (the text, visibility etc. is set in updateAutoSelectExtension(), which is called by readConfig())
     d->autoSelectExtCheckBox = new TQCheckBox (d->mainWidget);
-    connect(d->autoSelectExtCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotAutoSelectExtClicked()));
+    connect(d->autoSelectExtCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotAutoSelectExtClicked()));
 
     initGUI(); // activate GM
 
diff --git a/kexi/main/startup/KexiStartup_p.cpp b/kexi/main/startup/KexiStartup_p.cpp
index f9b535c8..bb3a9d56 100644
--- a/kexi/main/startup/KexiStartup_p.cpp
+++ b/kexi/main/startup/KexiStartup_p.cpp
@@ -65,9 +65,9 @@ tristate SQLite2ToSQLite3Migration::run()
 	m_process = new TDEProcess(this, "process");
 	*m_process << ksqlite2to3_app << m_filePath;
 	m_process->setWorkingDirectory( fi.dir(true).absPath() );
-	connect( m_process, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
-		this, TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
-	connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(processExited(TDEProcess*)) );
+	connect( m_process, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+		this, TQ_SLOT(receivedStderr(TDEProcess*,char*,int)));
+	connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(processExited(TDEProcess*)) );
 	if (!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr))
 		return false;
 
@@ -76,7 +76,7 @@ tristate SQLite2ToSQLite3Migration::run()
 		.arg(TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())).arg("SQLite3")
 	);
 	m_dlg->setModal(true);
-	connect(m_dlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked()));
+	connect(m_dlg, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(cancelClicked()));
 	m_dlg->setMinimumDuration(1000);
 	m_dlg->setAutoClose(true);
 	m_dlg->progressBar()->setTotalSteps(100);
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index 43bf6e4f..d040f06b 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -83,8 +83,8 @@ ImportWizard::ImportWizard(TQWidget *parent, TQMap<TQString,TQString>* args)
 	setupImporting();
 	setupFinish();
 
-	connect(this, TQT_SIGNAL(selected(const TQString &)), this, TQT_SLOT(pageSelected(const TQString &)));
-	connect(this, TQT_SIGNAL(helpClicked()), this, TQT_SLOT(helpClicked()));
+	connect(this, TQ_SIGNAL(selected(const TQString &)), this, TQ_SLOT(pageSelected(const TQString &)));
+	connect(this, TQ_SIGNAL(helpClicked()), this, TQ_SLOT(helpClicked()));
 
 	if (m_predefinedConnectionData) {
 		// setup wizard for predefined server source
@@ -291,11 +291,11 @@ void ImportWizard::setupDst()
 		":ProjectMigrationDestinationDir", m_dstPage, "m_dstConnSelector");
 	m_dstConn->hideHelpers();
 	//me: Can't connect m_dstConn->m_fileDlg here, it doesn't exist yet
-	//connect(this, TQT_SLOT(next()), m_dstConn->m_fileDlg, TQT_SIGNAL(accepted()));
+	//connect(this, TQ_SLOT(next()), m_dstConn->m_fileDlg, TQ_SIGNAL(accepted()));
 
 	vbox->addWidget( m_dstConn );
-	connect(m_dstConn,TQT_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)),
-		this,TQT_SLOT(next()));
+	connect(m_dstConn,TQ_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)),
+		this,TQ_SLOT(next()));
 
 //	m_dstConn->hideHelpers();
 	m_dstConn->showSimpleConn();
@@ -353,7 +353,7 @@ void ImportWizard::setupImporting()
 
 	KButtonBox *optionsBox = new KButtonBox(m_importingPage);
 	vbox->addWidget( optionsBox );
-	m_importOptionsButton = optionsBox->addButton(i18n("Advanced Options"), this, TQT_SLOT(slotOptionsButtonClicked()));
+	m_importOptionsButton = optionsBox->addButton(i18n("Advanced Options"), this, TQ_SLOT(slotOptionsButtonClicked()));
 	m_importOptionsButton->setIconSet(SmallIconSet("configure"));
 	optionsBox->addStretch(1);
 
@@ -736,10 +736,10 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& result)
 		// Setup progress feedback for the GUI
 		if(sourceDriver->progressSupported()) {
 			m_progressBar->updateGeometry();
-			disconnect(sourceDriver, TQT_SIGNAL(progressPercent(int)), 
-				this, TQT_SLOT(progressUpdated(int)));
-			connect(sourceDriver, TQT_SIGNAL(progressPercent(int)),
-				this, TQT_SLOT(progressUpdated(int)));
+			disconnect(sourceDriver, TQ_SIGNAL(progressPercent(int)), 
+				this, TQ_SLOT(progressUpdated(int)));
+			connect(sourceDriver, TQ_SIGNAL(progressPercent(int)),
+				this, TQ_SLOT(progressUpdated(int)));
 			progressUpdated(0);
 		}
 
diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp
index 1bc8945f..212a6842 100644
--- a/kexi/migration/migratemanager.cpp
+++ b/kexi/migration/migratemanager.cpp
@@ -92,7 +92,7 @@ bool MigrateManagerInternal::lookupDrivers()
 		return true;
 
 	if (tqApp) {
-		connect(tqApp,TQT_SIGNAL(aboutToQuit()),this,TQT_SLOT(slotAppQuits()));
+		connect(tqApp,TQ_SIGNAL(aboutToQuit()),this,TQ_SLOT(slotAppQuits()));
 	}
 //TODO: for QT-only version check for TDEInstance wrapper
 //		KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without TDEInstance (TDEGlobal::instance()==0)!" << endl;
diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp
index 9b1af9c1..b282385b 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog.cpp
+++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp
@@ -430,8 +430,8 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ
 	d->actionCategoriesListView = new ActionCategoriesListView(mainWidget);
 	d->actionCategoriesListView->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
 	d->glyr->addWidget(d->actionCategoriesListView, 1, 0);
-	connect( d->actionCategoriesListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), 
-		this, TQT_SLOT(slotActionCategorySelected(TQListViewItem*)));
+	connect( d->actionCategoriesListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), 
+		this, TQ_SLOT(slotActionCategorySelected(TQListViewItem*)));
 
 	TQLabel *lbl = new TQLabel(d->actionCategoriesListView, i18n("Action category:"), mainWidget);
 	lbl->setMinimumHeight(lbl->fontMetrics().height()*2);
@@ -453,8 +453,8 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ
 	// 2nd column: list of actions/objects
 	d->objectsListView = new KexiBrowser(d->secondAnd3rdColumnMainWidget, d->mainWin, 0/*features*/);
 	d->secondAnd3rdColumnGrLyr->addWidget(d->objectsListView, 1, 0);
-	connect(d->objectsListView, TQT_SIGNAL(selectionChanged(KexiPart::Item*)),
-		this, TQT_SLOT(slotItemForOpeningOrExecutingSelected(KexiPart::Item*)));
+	connect(d->objectsListView, TQ_SIGNAL(selectionChanged(KexiPart::Item*)),
+		this, TQ_SLOT(slotItemForOpeningOrExecutingSelected(KexiPart::Item*)));
 
 	d->selectActionToBeExecutedLbl = new TQLabel(d->secondAnd3rdColumnMainWidget);
 	d->selectActionToBeExecutedLbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
@@ -470,10 +470,10 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ
 	d->actionToExecuteListView->installEventFilter(this); //to be able to disable painting
 	d->actionToExecuteListView->viewport()->installEventFilter(this); //to be able to disable painting
 	d->actionToExecuteListView->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
-	connect(d->actionToExecuteListView, TQT_SIGNAL(executed(TQListViewItem*)),
-		this, TQT_SLOT(slotActionToExecuteItemExecuted(TQListViewItem*)));
-	connect(d->actionToExecuteListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-		this, TQT_SLOT(slotActionToExecuteItemSelected(TQListViewItem*)));
+	connect(d->actionToExecuteListView, TQ_SIGNAL(executed(TQListViewItem*)),
+		this, TQ_SLOT(slotActionToExecuteItemExecuted(TQListViewItem*)));
+	connect(d->actionToExecuteListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+		this, TQ_SLOT(slotActionToExecuteItemSelected(TQListViewItem*)));
 	d->secondAnd3rdColumnGrLyr->addWidget(d->actionToExecuteListView, 1, 1);
 
 	d->actionToExecuteLbl = new TQLabel(d->actionToExecuteListView, 
@@ -594,10 +594,10 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
 				vlyr->addWidget(lbl);
 				vlyr->addWidget(d->tdeactionListView);
 				d->secondAnd3rdColumnStack->addWidget(d->tdeactionPageWidget);
-				connect(d->tdeactionListView, TQT_SIGNAL(executed(TQListViewItem*)),
-					this, TQT_SLOT(slotTDEActionItemExecuted(TQListViewItem*)));
-				connect( d->tdeactionListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), 
-					this, TQT_SLOT(slotTDEActionItemSelected(TQListViewItem*)));
+				connect(d->tdeactionListView, TQ_SIGNAL(executed(TQListViewItem*)),
+					this, TQ_SLOT(slotTDEActionItemExecuted(TQListViewItem*)));
+				connect( d->tdeactionListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), 
+					this, TQ_SLOT(slotTDEActionItemSelected(TQListViewItem*)));
 			}
 			d->setActionToExecuteSectionVisible(false);
 			d->raiseWidget(d->tdeactionPageWidget);
@@ -619,10 +619,10 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
 				vlyr->addWidget(lbl);
 				vlyr->addWidget(d->currentFormActionsListView);
 				d->secondAnd3rdColumnStack->addWidget(d->currentFormActionsPageWidget);
-				connect(d->currentFormActionsListView, TQT_SIGNAL(executed(TQListViewItem*)),
-					this, TQT_SLOT(slotCurrentFormActionItemExecuted(TQListViewItem*)));
-				connect( d->currentFormActionsListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), 
-					this, TQT_SLOT(slotCurrentFormActionItemSelected(TQListViewItem*)));
+				connect(d->currentFormActionsListView, TQ_SIGNAL(executed(TQListViewItem*)),
+					this, TQ_SLOT(slotCurrentFormActionItemExecuted(TQListViewItem*)));
+				connect( d->currentFormActionsListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), 
+					this, TQ_SLOT(slotCurrentFormActionItemSelected(TQListViewItem*)));
 			}
 			d->setActionToExecuteSectionVisible(false);
 			d->raiseWidget(d->currentFormActionsPageWidget);
diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp
index ba21827e..d673f5f3 100644
--- a/kexi/plugins/forms/kexidatasourcepage.cpp
+++ b/kexi/plugins/forms/kexidatasourcepage.cpp
@@ -88,7 +88,7 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 	m_clearWidgetDSButton->setMinimumHeight(m_widgetDSLabel->minimumHeight());
 	TQToolTip::add(m_clearWidgetDSButton, i18n("Clear widget's data source"));
 	hlyr->addWidget(m_clearWidgetDSButton);
-	connect(m_clearWidgetDSButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearWidgetDataSourceSelection()));
+	connect(m_clearWidgetDSButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearWidgetDataSourceSelection()));
 
 	m_sourceFieldCombo = new KexiFieldComboBox(contents, "sourceFieldCombo");
 	m_widgetDSLabel->setBuddy(m_sourceFieldCombo);
@@ -114,13 +114,13 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 	m_gotoButton->setMinimumHeight(m_dataSourceLabel->minimumHeight());
 	TQToolTip::add(m_gotoButton, i18n("Go to selected form's data source"));
 	hlyr->addWidget(m_gotoButton);
-	connect(m_gotoButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGotoSelected()));
+	connect(m_gotoButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGotoSelected()));
 
 	m_clearDSButton = new KexiSmallToolButton(contents, TQString(), "clear_left", "clearDSButton");
 	m_clearDSButton->setMinimumHeight(m_dataSourceLabel->minimumHeight());
 	TQToolTip::add(m_clearDSButton, i18n("Clear form's data source"));
 	hlyr->addWidget(m_clearDSButton);
-	connect(m_clearDSButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearDataSourceSelection()));
+	connect(m_clearDSButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearDataSourceSelection()));
 
 	m_dataSourceCombo = new KexiDataSourceComboBox(contents, "dataSourceCombo");
 	m_dataSourceLabel->setBuddy(m_dataSourceCombo);
@@ -179,23 +179,23 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 	m_addField->setFocusPolicy(TQWidget::StrongFocus);
 	TQToolTip::add(m_addField, i18n("Insert selected fields into form"));
 	hlyr->addWidget(m_addField);
-	connect(m_addField, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInsertSelectedFields()));
+	connect(m_addField, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInsertSelectedFields()));
 
 	m_fieldListView = new KexiFieldListView(contents, "fieldListView",
 		KexiFieldListView::ShowDataTypes | KexiFieldListView::AllowMultiSelection );
 	m_fieldListView->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding));
 	m_availableFieldsLabel->setBuddy(m_fieldListView);
 	contentsVlyr->addWidget(m_fieldListView, 1);
-	connect(m_fieldListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotFieldListViewSelectionChanged()));
-	connect(m_fieldListView, TQT_SIGNAL(fieldDoubleClicked(const TQString&, const TQString&, const TQString&)),
-		this, TQT_SLOT(slotFieldDoubleClicked(const TQString&, const TQString&, const TQString&)));
+	connect(m_fieldListView, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotFieldListViewSelectionChanged()));
+	connect(m_fieldListView, TQ_SIGNAL(fieldDoubleClicked(const TQString&, const TQString&, const TQString&)),
+		this, TQ_SLOT(slotFieldDoubleClicked(const TQString&, const TQString&, const TQString&)));
 #endif
 
 	vlyr->addStretch(1);
 
-	connect(m_dataSourceCombo, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotDataSourceTextChanged(const TQString &)));
-	connect(m_dataSourceCombo, TQT_SIGNAL(dataSourceChanged()), this, TQT_SLOT(slotDataSourceChanged()));
-	connect(m_sourceFieldCombo, TQT_SIGNAL(selected()), this, TQT_SLOT(slotFieldSelected()));
+	connect(m_dataSourceCombo, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotDataSourceTextChanged(const TQString &)));
+	connect(m_dataSourceCombo, TQ_SIGNAL(dataSourceChanged()), this, TQ_SLOT(slotDataSourceChanged()));
+	connect(m_sourceFieldCombo, TQ_SIGNAL(selected()), this, TQ_SLOT(slotFieldSelected()));
 
 	clearDataSourceSelection();
 	slotFieldListViewSelectionChanged();
diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp
index 19241a36..1dbffdb1 100644
--- a/kexi/plugins/forms/kexidbfactory.cpp
+++ b/kexi/plugins/forms/kexidbfactory.cpp
@@ -384,7 +384,7 @@ KexiDBFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
 #ifndef KEXI_NO_IMAGEBOX_WIDGET
 	else if(c == "KexiDBImageBox") {
 		w = new KexiDBImageBox(designMode, p, n);
-		connect(w, TQT_SIGNAL(idChanged(long)), this, TQT_SLOT(slotImageBoxIdChanged(long)));
+		connect(w, TQ_SIGNAL(idChanged(long)), this, TQ_SLOT(slotImageBoxIdChanged(long)));
 	}
 #endif
 #ifndef KEXI_NO_AUTOFIELD_WIDGET
diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp
index aae99906..f7a247ec 100644
--- a/kexi/plugins/forms/kexiformeventhandler.cpp
+++ b/kexi/plugins/forms/kexiformeventhandler.cpp
@@ -174,14 +174,14 @@ void KexiFormEventHandler::setMainWidgetForEventHandling(KexiMainWindow *mainWin
 			TDEAction *action = mainWin->actionCollection()->action( actionArg.latin1() );
 			if (!action)
 				continue;
-			TQObject::disconnect( obj, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) ); //safety
-			TQObject::connect( obj, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) );
+			TQObject::disconnect( obj, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()) ); //safety
+			TQObject::connect( obj, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()) );
 		}
 		else if (partInfo) { //'open or execute' action
 			KexiFormEventAction* action = new KexiFormEventAction(mainWin, obj, actionType, actionArg, 
 				data.option);
-			TQObject::disconnect( obj, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) );
-			TQObject::connect( obj, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) );
+			TQObject::disconnect( obj, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()) );
+			TQObject::connect( obj, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()) );
 		}
 	}
 	delete l;
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index e5d7addf..4ba0442a 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -107,13 +107,13 @@ KexiFormPart::KexiFormPart(TQObject *parent, const char *name, const TQStringLis
 	static_formsLibrary = KFormDesigner::FormManager::createWidgetLibrary(
 		formManager, supportedFactoryGroups);
 	static_formsLibrary->setAdvancedPropertiesVisible(false);
-	connect(static_formsLibrary, TQT_SIGNAL(widgetCreated(TQWidget*)),
-		this, TQT_SLOT(slotWidgetCreatedByFormsLibrary(TQWidget*)));
+	connect(static_formsLibrary, TQ_SIGNAL(widgetCreated(TQWidget*)),
+		this, TQ_SLOT(slotWidgetCreatedByFormsLibrary(TQWidget*)));
 
-	connect(KFormDesigner::FormManager::self()->propertySet(), TQT_SIGNAL(widgetPropertyChanged(TQWidget *, const TQCString &, const TQVariant&)),
-		this, TQT_SLOT(slotPropertyChanged(TQWidget *, const TQCString &, const TQVariant&)));
-	connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(autoTabStopsSet(KFormDesigner::Form*,bool)),
-		this, TQT_SLOT(slotAutoTabStopsSet(KFormDesigner::Form*,bool)));
+	connect(KFormDesigner::FormManager::self()->propertySet(), TQ_SIGNAL(widgetPropertyChanged(TQWidget *, const TQCString &, const TQVariant&)),
+		this, TQ_SLOT(slotPropertyChanged(TQWidget *, const TQCString &, const TQVariant&)));
+	connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(autoTabStopsSet(KFormDesigner::Form*,bool)),
+		this, TQ_SLOT(slotAutoTabStopsSet(KFormDesigner::Form*,bool)));
 }
 
 KexiFormPart::~KexiFormPart()
@@ -143,8 +143,8 @@ void KexiFormPart::initInstanceActions( int mode, TDEActionCollection *col )
 {
 	if (mode==Kexi::DesignViewMode) {
 		KFormDesigner::FormManager::self()->createActions(col, 0);
-		new TDEAction(i18n("Edit Tab Order..."), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), col, "taborder");
-		new TDEAction(i18n("Adjust Size"), "zoom-fit-best", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(ajustWidgetSize()), col, "adjust");
+		new TDEAction(i18n("Edit Tab Order..."), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editTabOrder()), col, "taborder");
+		new TDEAction(i18n("Adjust Size"), "zoom-fit-best", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(ajustWidgetSize()), col, "adjust");
 	}
 	//TODO
 }
@@ -152,7 +152,7 @@ void KexiFormPart::initInstanceActions( int mode, TDEActionCollection *col )
 
 void KexiFormPart::initPartActions()
 {
-//	new TDEAction(i18n("Show Form UI Code"), "show_form_ui", CTRL+Key_U, m_manager, TQT_SLOT(showFormUICode()),
+//	new TDEAction(i18n("Show Form UI Code"), "show_form_ui", CTRL+Key_U, m_manager, TQ_SLOT(showFormUICode()),
 //		guiClient()->actionCollection(), "show_form_ui");
 }
 
@@ -162,7 +162,7 @@ void KexiFormPart::initInstanceActions()
 	kapp->config()->setGroup("General");
 	if (kapp->config()->readBoolEntry("showInternalDebugger", false)) {
 		new TDEAction(i18n("Show Form UI Code"), "compfile", 
-			CTRL+Key_U, KFormDesigner::FormManager::self(), TQT_SLOT(showFormUICode()),
+			CTRL+Key_U, KFormDesigner::FormManager::self(), TQ_SLOT(showFormUICode()),
 			actionCollectionForMode(Kexi::DesignViewMode), "show_form_ui");
 	}
 #endif
@@ -171,7 +171,7 @@ void KexiFormPart::initInstanceActions()
 	KFormDesigner::FormManager::self()->createActions( library(), col, (KXMLGUIClient*)col->parentGUIClient() ); //guiClient() );
 
 	//connect actions provided by widget factories
-	connect( col->action("widget_assign_action"), TQT_SIGNAL(activated()), this, TQT_SLOT(slotAssignAction()));
+	connect( col->action("widget_assign_action"), TQ_SIGNAL(activated()), this, TQ_SLOT(slotAssignAction()));
 
 	createSharedAction(Kexi::DesignViewMode, i18n("Clear Widget Contents"), "edit-clear", 0, "formpart_clear_contents");
 	createSharedAction(Kexi::DesignViewMode, i18n("Edit Tab Order..."), "tab_order", 0, "formpart_taborder");
@@ -488,14 +488,14 @@ void KexiFormPart::setupCustomPropertyPanelTabs(KTabWidget *tab, KexiMainWindow*
 		d->objectTreeView = new KFormDesigner::ObjectTreeView(0, "KexiFormPart:ObjectTreeView");
 		KFormDesigner::FormManager::self()->setObjectTreeView(d->objectTreeView); //important: assign to manager
 		d->dataSourcePage = new KexiDataSourcePage(0, "dataSourcePage");
-		connect(d->dataSourcePage, TQT_SIGNAL(jumpToObjectRequested(const TQCString&, const TQCString&)),
-			mainWin, TQT_SLOT(highlightObject(const TQCString&, const TQCString&)));
-		connect(d->dataSourcePage, TQT_SIGNAL(formDataSourceChanged(const TQCString&, const TQCString&)),
-			KFormDesigner::FormManager::self(), TQT_SLOT(setFormDataSource(const TQCString&, const TQCString&)));
-		connect(d->dataSourcePage, TQT_SIGNAL(dataSourceFieldOrExpressionChanged(const TQString&, const TQString&, KexiDB::Field::Type)),
-			KFormDesigner::FormManager::self(), TQT_SLOT(setDataSourceFieldOrExpression(const TQString&, const TQString&, KexiDB::Field::Type)));
-		connect(d->dataSourcePage, TQT_SIGNAL(insertAutoFields(const TQString&, const TQString&, const TQStringList&)),
-			KFormDesigner::FormManager::self(), TQT_SLOT(insertAutoFields(const TQString&, const TQString&, const TQStringList&)));
+		connect(d->dataSourcePage, TQ_SIGNAL(jumpToObjectRequested(const TQCString&, const TQCString&)),
+			mainWin, TQ_SLOT(highlightObject(const TQCString&, const TQCString&)));
+		connect(d->dataSourcePage, TQ_SIGNAL(formDataSourceChanged(const TQCString&, const TQCString&)),
+			KFormDesigner::FormManager::self(), TQ_SLOT(setFormDataSource(const TQCString&, const TQCString&)));
+		connect(d->dataSourcePage, TQ_SIGNAL(dataSourceFieldOrExpressionChanged(const TQString&, const TQString&, KexiDB::Field::Type)),
+			KFormDesigner::FormManager::self(), TQ_SLOT(setDataSourceFieldOrExpression(const TQString&, const TQString&, KexiDB::Field::Type)));
+		connect(d->dataSourcePage, TQ_SIGNAL(insertAutoFields(const TQString&, const TQString&, const TQStringList&)),
+			KFormDesigner::FormManager::self(), TQ_SLOT(insertAutoFields(const TQString&, const TQString&, const TQStringList&)));
 	}
 
 	KexiProject *prj = mainWin->project();
@@ -520,16 +520,16 @@ void KexiFormPart::slotWidgetCreatedByFormsLibrary(TQWidget* widget)
 				kdDebug() << it.current() <<  endl;
 				KexiFormView *formView = KexiUtils::findParent<KexiFormView>(widget, "KexiFormView");
 				if (formView) {
-					connect(widget, TQT_SIGNAL(handleDragMoveEvent(TQDragMoveEvent*)), 
-						formView, TQT_SLOT(slotHandleDragMoveEvent(TQDragMoveEvent*)));
+					connect(widget, TQ_SIGNAL(handleDragMoveEvent(TQDragMoveEvent*)), 
+						formView, TQ_SLOT(slotHandleDragMoveEvent(TQDragMoveEvent*)));
 				}
 			}
 			else if (0==qstrcmp(it.current(), handleDropEventSignal)) {
 				kdDebug() << it.current() <<  endl;
 				KexiFormView *formView = KexiUtils::findParent<KexiFormView>(widget, "KexiFormView");
 				if (formView) {
-					connect(widget, TQT_SIGNAL(handleDropEvent(TQDropEvent*)), 
-						formView, TQT_SLOT(slotHandleDropEvent(TQDropEvent*)));
+					connect(widget, TQ_SIGNAL(handleDropEvent(TQDropEvent*)), 
+						formView, TQ_SLOT(slotHandleDropEvent(TQDropEvent*)));
 				}
 			}
 		}
diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp
index 4e0677f8..86d66517 100644
--- a/kexi/plugins/forms/kexiformscrollview.cpp
+++ b/kexi/plugins/forms/kexiformscrollview.cpp
@@ -49,7 +49,7 @@ KexiFormScrollView::KexiFormScrollView(TQWidget *parent, bool preview)
 //		recordNavigator()->showEditingIndicator(true);
 	}
 
-	connect(this, TQT_SIGNAL(resizingStarted()), this, TQT_SLOT(slotResizingStarted()));
+	connect(this, TQ_SIGNAL(resizingStarted()), this, TQ_SLOT(slotResizingStarted()));
 
 	m_popupMenu = new TDEPopupMenu(this, "contextMenu");
 
@@ -288,9 +288,9 @@ KexiDataItemInterface *KexiFormScrollView::editor( int col, bool ignoreMissingEd
 		return 0;
 	}
 	editor->hide();
-	connect(editor,TQT_SIGNAL(editRequested()),this,TQT_SLOT(slotEditRequested()));
-	connect(editor,TQT_SIGNAL(cancelRequested()),this,TQT_SLOT(cancelEditor()));
-	connect(editor,TQT_SIGNAL(acceptRequested()),this,TQT_SLOT(acceptEditor()));
+	connect(editor,TQ_SIGNAL(editRequested()),this,TQ_SLOT(slotEditRequested()));
+	connect(editor,TQ_SIGNAL(cancelRequested()),this,TQ_SLOT(cancelEditor()));
+	connect(editor,TQ_SIGNAL(acceptRequested()),this,TQ_SLOT(acceptEditor()));
 
 	editor->resize(columnWidth(col)-1, rowHeight()-1);
 	editor->installEventFilter(this);
diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp
index 6ea8bd15..d9423cd8 100644
--- a/kexi/plugins/forms/kexiformview.cpp
+++ b/kexi/plugins/forms/kexiformview.cpp
@@ -91,67 +91,67 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *parent,
 	if (viewMode()==Kexi::DataViewMode) {
 		m_scrollView->recordNavigator()->setRecordHandler( m_scrollView );
 		m_scrollView->viewport()->setPaletteBackgroundColor(m_dbform->palette().active().background());
-//moved to formmanager		connect(formPart()->manager(), TQT_SIGNAL(noFormSelected()), TQT_SLOT(slotNoFormSelected()));
+//moved to formmanager		connect(formPart()->manager(), TQ_SIGNAL(noFormSelected()), TQ_SLOT(slotNoFormSelected()));
 	}
 	else
 	{
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(propertySetSwitched(KoProperty::Set*, bool, const TQCString&)),
-			this, TQT_SLOT(slotPropertySetSwitched(KoProperty::Set*, bool, const TQCString&)));
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(dirty(KFormDesigner::Form *, bool)),
-			this, TQT_SLOT(slotDirty(KFormDesigner::Form *, bool)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(propertySetSwitched(KoProperty::Set*, bool, const TQCString&)),
+			this, TQ_SLOT(slotPropertySetSwitched(KoProperty::Set*, bool, const TQCString&)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(dirty(KFormDesigner::Form *, bool)),
+			this, TQ_SLOT(slotDirty(KFormDesigner::Form *, bool)));
 
-		connect(m_dbform, TQT_SIGNAL(handleDragMoveEvent(TQDragMoveEvent*)), 
-			this, TQT_SLOT(slotHandleDragMoveEvent(TQDragMoveEvent*)));
-		connect(m_dbform, TQT_SIGNAL(handleDropEvent(TQDropEvent*)), 
-			this, TQT_SLOT(slotHandleDropEvent(TQDropEvent*)));
+		connect(m_dbform, TQ_SIGNAL(handleDragMoveEvent(TQDragMoveEvent*)), 
+			this, TQ_SLOT(slotHandleDragMoveEvent(TQDragMoveEvent*)));
+		connect(m_dbform, TQ_SIGNAL(handleDropEvent(TQDropEvent*)), 
+			this, TQ_SLOT(slotHandleDropEvent(TQDropEvent*)));
 
 		// action stuff
-		plugSharedAction("formpart_taborder", KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()));
-		plugSharedAction("formpart_adjust_size", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()));
-//TODO		plugSharedAction("formpart_pixmap_collection", formPart()->manager(), TQT_SLOT(editFormPixmapCollection()));
-//TODO		plugSharedAction("formpart_connections", formPart()->manager(), TQT_SLOT(editConnections()));
-
-		plugSharedAction("edit_copy", KFormDesigner::FormManager::self(), TQT_SLOT(copyWidget()));
-		plugSharedAction("edit_cut", KFormDesigner::FormManager::self(), TQT_SLOT(cutWidget()));
-		plugSharedAction("edit_paste", KFormDesigner::FormManager::self(), TQT_SLOT(pasteWidget()));
-		plugSharedAction("edit_delete", KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()));
-		plugSharedAction("edit_select_all", KFormDesigner::FormManager::self(), TQT_SLOT(selectAll()));
-		plugSharedAction("formpart_clear_contents", KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()));
-		plugSharedAction("edit_undo", KFormDesigner::FormManager::self(), TQT_SLOT(undo()));
-		plugSharedAction("edit_redo", KFormDesigner::FormManager::self(), TQT_SLOT(redo()));
+		plugSharedAction("formpart_taborder", KFormDesigner::FormManager::self(), TQ_SLOT(editTabOrder()));
+		plugSharedAction("formpart_adjust_size", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidgetSize()));
+//TODO		plugSharedAction("formpart_pixmap_collection", formPart()->manager(), TQ_SLOT(editFormPixmapCollection()));
+//TODO		plugSharedAction("formpart_connections", formPart()->manager(), TQ_SLOT(editConnections()));
+
+		plugSharedAction("edit_copy", KFormDesigner::FormManager::self(), TQ_SLOT(copyWidget()));
+		plugSharedAction("edit_cut", KFormDesigner::FormManager::self(), TQ_SLOT(cutWidget()));
+		plugSharedAction("edit_paste", KFormDesigner::FormManager::self(), TQ_SLOT(pasteWidget()));
+		plugSharedAction("edit_delete", KFormDesigner::FormManager::self(), TQ_SLOT(deleteWidget()));
+		plugSharedAction("edit_select_all", KFormDesigner::FormManager::self(), TQ_SLOT(selectAll()));
+		plugSharedAction("formpart_clear_contents", KFormDesigner::FormManager::self(), TQ_SLOT(clearWidgetContent()));
+		plugSharedAction("edit_undo", KFormDesigner::FormManager::self(), TQ_SLOT(undo()));
+		plugSharedAction("edit_redo", KFormDesigner::FormManager::self(), TQ_SLOT(redo()));
 
 		plugSharedAction("formpart_layout_menu", KFormDesigner::FormManager::self(), 0 );
-		plugSharedAction("formpart_layout_hbox", KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()) );
-		plugSharedAction("formpart_layout_vbox", KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()) );
-		plugSharedAction("formpart_layout_grid", KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()) );
+		plugSharedAction("formpart_layout_hbox", KFormDesigner::FormManager::self(), TQ_SLOT(layoutHBox()) );
+		plugSharedAction("formpart_layout_vbox", KFormDesigner::FormManager::self(), TQ_SLOT(layoutVBox()) );
+		plugSharedAction("formpart_layout_grid", KFormDesigner::FormManager::self(), TQ_SLOT(layoutGrid()) );
 #ifdef KEXI_SHOW_SPLITTER_WIDGET
-		plugSharedAction("formpart_layout_hsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()) );
-		plugSharedAction("formpart_layout_vsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()) );
+		plugSharedAction("formpart_layout_hsplitter", KFormDesigner::FormManager::self(), TQ_SLOT(layoutHSplitter()) );
+		plugSharedAction("formpart_layout_vsplitter", KFormDesigner::FormManager::self(), TQ_SLOT(layoutVSplitter()) );
 #endif
-		plugSharedAction("formpart_break_layout", KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()) );
+		plugSharedAction("formpart_break_layout", KFormDesigner::FormManager::self(), TQ_SLOT(breakLayout()) );
 
-		plugSharedAction("formpart_format_raise", KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()) );
-		plugSharedAction("formpart_format_lower", KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()) );
+		plugSharedAction("formpart_format_raise", KFormDesigner::FormManager::self(), TQ_SLOT(bringWidgetToFront()) );
+		plugSharedAction("formpart_format_lower", KFormDesigner::FormManager::self(), TQ_SLOT(sendWidgetToBack()) );
 
 		plugSharedAction("other_widgets_menu", KFormDesigner::FormManager::self(), 0 );
 		setAvailable("other_widgets_menu", true);
 
 		plugSharedAction("formpart_align_menu", KFormDesigner::FormManager::self(), 0 );
-		plugSharedAction("formpart_align_to_left", KFormDesigner::FormManager::self(),TQT_SLOT(alignWidgetsToLeft()) );
-		plugSharedAction("formpart_align_to_right", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()) );
-		plugSharedAction("formpart_align_to_top", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()) );
-		plugSharedAction("formpart_align_to_bottom", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()) );
-		plugSharedAction("formpart_align_to_grid", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()) );
+		plugSharedAction("formpart_align_to_left", KFormDesigner::FormManager::self(),TQ_SLOT(alignWidgetsToLeft()) );
+		plugSharedAction("formpart_align_to_right", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToRight()) );
+		plugSharedAction("formpart_align_to_top", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToTop()) );
+		plugSharedAction("formpart_align_to_bottom", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToBottom()) );
+		plugSharedAction("formpart_align_to_grid", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToGrid()) );
 
 		plugSharedAction("formpart_adjust_size_menu", KFormDesigner::FormManager::self(), 0 );
-		plugSharedAction("formpart_adjust_to_fit", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()) );
-		plugSharedAction("formpart_adjust_size_grid", KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()) );
-		plugSharedAction("formpart_adjust_height_small", KFormDesigner::FormManager::self(),  TQT_SLOT(adjustHeightToSmall()) );
-		plugSharedAction("formpart_adjust_height_big", KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()) );
-		plugSharedAction("formpart_adjust_width_small", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()) );
-		plugSharedAction("formpart_adjust_width_big", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()) );
-
-		plugSharedAction("format_font", KFormDesigner::FormManager::self(), TQT_SLOT(changeFont()) );
+		plugSharedAction("formpart_adjust_to_fit", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidgetSize()) );
+		plugSharedAction("formpart_adjust_size_grid", KFormDesigner::FormManager::self(), TQ_SLOT(adjustSizeToGrid()) );
+		plugSharedAction("formpart_adjust_height_small", KFormDesigner::FormManager::self(),  TQ_SLOT(adjustHeightToSmall()) );
+		plugSharedAction("formpart_adjust_height_big", KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToBig()) );
+		plugSharedAction("formpart_adjust_width_small", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToSmall()) );
+		plugSharedAction("formpart_adjust_width_big", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToBig()) );
+
+		plugSharedAction("format_font", KFormDesigner::FormManager::self(), TQ_SLOT(changeFont()) );
 	}
 
 	initForm();
@@ -159,7 +159,7 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *parent,
 	KexiDataAwareView::init( m_scrollView, m_scrollView, m_scrollView,
 		/* skip data-awarness if design mode */ viewMode()==Kexi::DesignViewMode );
 
-	connect(this, TQT_SIGNAL(focus(bool)), this, TQT_SLOT(slotFocus(bool)));
+	connect(this, TQ_SIGNAL(focus(bool)), this, TQ_SLOT(slotFocus(bool)));
 	/// @todo skip this if ther're no borders
 //	m_dbform->resize( m_dbform->size()+TQSize(m_scrollView->verticalScrollBar()->width(), m_scrollView->horizontalScrollBar()->height()) );
 }
@@ -225,8 +225,8 @@ KexiFormView::initForm()
 
 	if (viewMode()==Kexi::DesignViewMode) {
 		//we want to be informed about executed commands
-		connect(form()->commandHistory(), TQT_SIGNAL(commandExecuted()),
-			KFormDesigner::FormManager::self(), TQT_SLOT(slotHistoryCommandExecuted()));
+		connect(form()->commandHistory(), TQ_SIGNAL(commandExecuted()),
+			KFormDesigner::FormManager::self(), TQ_SLOT(slotHistoryCommandExecuted()));
 	}
 
 	const bool newForm = parentDialog()->id() < 0;
diff --git a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp
index d97fe7d9..0f36a427 100644
--- a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp
@@ -31,7 +31,7 @@ KexiDBCheckBox::KexiDBCheckBox(const TQString &text, TQWidget *parent, const cha
 {
 	setFocusPolicy(TQWidget::StrongFocus);
 	updateTristate();
-	connect(this, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotStateChanged(int)));
+	connect(this, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotStateChanged(int)));
 }
 
 KexiDBCheckBox::~KexiDBCheckBox()
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index 5fb89443..ac97d639 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -317,7 +317,7 @@ void KexiDBComboBox::mousePressEvent( TQMouseEvent *e )
 	if (handleMousePressEvent(e))
 		return;
 
-//	TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout()));
+//	TQTimer::singleShot( 200, this, TQ_SLOT(internalClickTimeout()));
 //	d->shortClick = TRUE;
 //  }
 	KexiDBAutoField::mousePressEvent( e );
diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
index da8c9fc4..58dee2e6 100644
--- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
@@ -38,8 +38,8 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char
 	m_edit = new TQDateEdit(date, this);
 	m_edit->setAutoAdvance(true);
 	m_edit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
-	connect( m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotValueChanged(const TQDate&)) );
-	connect( m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SIGNAL(dateChanged(const TQDate&)) );
+	connect( m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(slotValueChanged(const TQDate&)) );
+	connect( m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SIGNAL(dateChanged(const TQDate&)) );
 
 	TQToolButton* btn = new TQToolButton(this);
 	btn->setText("...");
@@ -53,12 +53,12 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char
 #endif
 
 	m_datePickerPopupMenu = new TDEPopupMenu(0, "date_popup");
-	connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker()));
+	connect(m_datePickerPopupMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotShowDatePicker()));
 	m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0);
 
 	KDateTable *dt = KexiUtils::findFirstChild<KDateTable>(m_datePicker, "KDateTable");
 	if (dt)
-		connect(dt, TQT_SIGNAL(tableClicked()), this, TQT_SLOT(acceptDate()));
+		connect(dt, TQ_SIGNAL(tableClicked()), this, TQ_SLOT(acceptDate()));
 	m_datePicker->setCloseButton(true);
 	m_datePicker->installEventFilter(this);
 	m_datePickerPopupMenu->insertItem(m_datePicker);
diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
index 35506591..6b62f805 100644
--- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
@@ -38,8 +38,8 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par
 	m_dateEdit->setAutoAdvance(true);
 	m_dateEdit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
 //	m_dateEdit->setFixedWidth( TQFontMetrics(m_dateEdit->font()).width("8888-88-88___") );
-	connect(m_dateEdit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotValueChanged()));
-	connect(m_dateEdit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SIGNAL(dateTimeChanged()));
+	connect(m_dateEdit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(slotValueChanged()));
+	connect(m_dateEdit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SIGNAL(dateTimeChanged()));
 
 	TQToolButton* btn = new TQToolButton(this);
 	btn->setText("...");
@@ -49,8 +49,8 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par
 	m_timeEdit = new TQTimeEdit(datetime.time(), this);;
 	m_timeEdit->setAutoAdvance(true);
 	m_timeEdit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
-	connect(m_timeEdit, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(slotValueChanged()));
-	connect(m_timeEdit, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SIGNAL(dateTimeChanged()));
+	connect(m_timeEdit, TQ_SIGNAL(valueChanged(const TQTime&)), this, TQ_SLOT(slotValueChanged()));
+	connect(m_timeEdit, TQ_SIGNAL(valueChanged(const TQTime&)), this, TQ_SIGNAL(dateTimeChanged()));
 
 #ifdef TQDateTimeEditor_HACK
 	m_dte_date = KexiUtils::findFirstChild<TQDateTimeEditor>(m_dateEdit, "TQDateTimeEditor");
@@ -60,12 +60,12 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par
 #endif
 
 	m_datePickerPopupMenu = new TDEPopupMenu(0, "date_popup");
-	connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker()));
+	connect(m_datePickerPopupMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotShowDatePicker()));
 	m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0);
 
 	KDateTable *dt = KexiUtils::findFirstChild<KDateTable>(m_datePicker, "KDateTable");
 	if (dt)
-		connect(dt, TQT_SIGNAL(tableClicked()), this, TQT_SLOT(acceptDate()));
+		connect(dt, TQ_SIGNAL(tableClicked()), this, TQ_SLOT(acceptDate()));
 	m_datePicker->setCloseButton(true);
 	m_datePicker->installEventFilter(this);
 	m_datePickerPopupMenu->insertItem(m_datePicker);
diff --git a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp
index 0fdc08cf..195cecc1 100644
--- a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp
@@ -25,7 +25,7 @@
 KexiDBDoubleSpinBox::KexiDBDoubleSpinBox(TQWidget *parent, const char *name)
  : KDoubleSpinBox(parent, name) , KexiFormDataItemInterface()
 {
-	connect(this, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotValueChanged()));
+	connect(this, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(slotValueChanged()));
 }
 
 KexiDBDoubleSpinBox::~KexiDBDoubleSpinBox()
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index 1d74f94f..2fec335d 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -106,29 +106,29 @@ KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *parent, const char *n
 	
 	m_paletteBackgroundColorChanged = false; //set this here, not before
 
-	connect(m_popupMenu, TQT_SIGNAL(updateActionsAvailabilityRequested(bool&, bool&)), 
-		this, TQT_SLOT(slotUpdateActionsAvailabilityRequested(bool&, bool&)));
-	connect(m_popupMenu, TQT_SIGNAL(insertFromFileRequested(const KURL&)),
-		this, TQT_SLOT(handleInsertFromFileAction(const KURL&)));
-	connect(m_popupMenu, TQT_SIGNAL(saveAsRequested(const TQString&)),
-		this, TQT_SLOT(handleSaveAsAction(const TQString&)));
-	connect(m_popupMenu, TQT_SIGNAL(cutRequested()),
-		this, TQT_SLOT(handleCutAction()));
-	connect(m_popupMenu, TQT_SIGNAL(copyRequested()),
-		this, TQT_SLOT(handleCopyAction()));
-	connect(m_popupMenu, TQT_SIGNAL(pasteRequested()),
-		this, TQT_SLOT(handlePasteAction()));
-	connect(m_popupMenu, TQT_SIGNAL(clearRequested()),
-		this, TQT_SLOT(clear()));
-	connect(m_popupMenu, TQT_SIGNAL(showPropertiesRequested()),
-		this, TQT_SLOT(handleShowPropertiesAction()));
-
-//	connect(m_popupMenu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotAboutToHidePopupMenu()));
+	connect(m_popupMenu, TQ_SIGNAL(updateActionsAvailabilityRequested(bool&, bool&)), 
+		this, TQ_SLOT(slotUpdateActionsAvailabilityRequested(bool&, bool&)));
+	connect(m_popupMenu, TQ_SIGNAL(insertFromFileRequested(const KURL&)),
+		this, TQ_SLOT(handleInsertFromFileAction(const KURL&)));
+	connect(m_popupMenu, TQ_SIGNAL(saveAsRequested(const TQString&)),
+		this, TQ_SLOT(handleSaveAsAction(const TQString&)));
+	connect(m_popupMenu, TQ_SIGNAL(cutRequested()),
+		this, TQ_SLOT(handleCutAction()));
+	connect(m_popupMenu, TQ_SIGNAL(copyRequested()),
+		this, TQ_SLOT(handleCopyAction()));
+	connect(m_popupMenu, TQ_SIGNAL(pasteRequested()),
+		this, TQ_SLOT(handlePasteAction()));
+	connect(m_popupMenu, TQ_SIGNAL(clearRequested()),
+		this, TQ_SLOT(clear()));
+	connect(m_popupMenu, TQ_SIGNAL(showPropertiesRequested()),
+		this, TQ_SLOT(handleShowPropertiesAction()));
+
+//	connect(m_popupMenu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(slotAboutToHidePopupMenu()));
 //	if (m_chooser) {
 		//we couldn't use m_chooser->setPopup() because of drawing problems
-//		connect(m_chooser, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotChooserPressed()));
-//		connect(m_chooser, TQT_SIGNAL(released()), this, TQT_SLOT(slotChooserReleased()));
-//		connect(m_chooser, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled(bool)));
+//		connect(m_chooser, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotChooserPressed()));
+//		connect(m_chooser, TQ_SIGNAL(released()), this, TQ_SLOT(slotChooserReleased()));
+//		connect(m_chooser, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled(bool)));
 //	}
 
 	setDataSource( TQString() ); //to initialize popup menu and actions availability
diff --git a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp
index 633fe6fc..d574963b 100644
--- a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp
@@ -26,7 +26,7 @@
 KexiDBIntSpinBox::KexiDBIntSpinBox(TQWidget *parent, const char *name)
  : KIntSpinBox(parent, name) , KexiFormDataItemInterface()
 {
-	connect(this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged()));
+	connect(this, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotValueChanged()));
 }
 
 KexiDBIntSpinBox::~KexiDBIntSpinBox()
diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp
index 93f35027..7df46895 100644
--- a/kexi/plugins/forms/widgets/kexidblabel.cpp
+++ b/kexi/plugins/forms/widgets/kexidblabel.cpp
@@ -433,7 +433,7 @@ void KexiDBLabel::updatePixmapLater() {
 	if (d->resizeEvent) {
 		if (!d->timer) {
 			d->timer = new TQTimer(this, "KexiDBLabelTimer");
-			connect(d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updatePixmap()));
+			connect(d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updatePixmap()));
 		}
 		d->timer->start(100, true);
 		d->resizeEvent = false;
diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp
index e0395cde..eebe699d 100644
--- a/kexi/plugins/forms/widgets/kexidblineedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp
@@ -67,7 +67,7 @@ KexiDBLineEdit::KexiDBLineEdit(TQWidget *parent, const char *name)
 	widget->setPalette(p);
 #endif
 
-	connect(this, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotTextChanged(const TQString&)));
+	connect(this, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged(const TQString&)));
 }
 
 KexiDBLineEdit::~KexiDBLineEdit()
diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
index 3b9c6f09..96060220 100644
--- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
@@ -35,7 +35,7 @@ KexiDBTextEdit::KexiDBTextEdit(TQWidget *parent, const char *name)
  , m_menuExtender(this, this)
  , m_slotTextChanged_enabled(true)
 {
-	connect(this, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()));
+	connect(this, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()));
 	installEventFilter(this);
 }
 
diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
index ac42fa85..1233c1dd 100644
--- a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
@@ -42,7 +42,7 @@ KexiDBTimeEdit::KexiDBTimeEdit(const TQTime &time, TQWidget *parent, const char
 	m_dte_time = 0;
 #endif
 
-	connect(this, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(slotValueChanged(const TQTime&)));
+	connect(this, TQ_SIGNAL(valueChanged(const TQTime&)), this, TQ_SLOT(slotValueChanged(const TQTime&)));
 }
 
 KexiDBTimeEdit::~KexiDBTimeEdit()
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
index 19e30f24..5719f9f0 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
@@ -109,7 +109,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 		m_fileSavePage->setAdditionalFilters( csvMimeTypes() );
 		m_fileSavePage->setDefaultExtension("csv");
 		m_fileSavePage->setLocationText( KexiUtils::stringToFileName(m_tableOrQuery->captionOrName()) );
-		connect(m_fileSavePage, TQT_SIGNAL(rejected()), this, TQT_SLOT(reject()));
+		connect(m_fileSavePage, TQ_SIGNAL(rejected()), this, TQ_SLOT(reject()));
 		addPage(m_fileSavePage, i18n("Enter Name of File You Want to Save Data To"));
 	}
 
@@ -135,7 +135,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 
 	m_showOptionsButton = new KPushButton(KGuiItem(i18n("Show Options >>"), "configure"),
 		m_exportOptionsPage);
-	connect(m_showOptionsButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotShowOptionsButtonClicked()));
+	connect(m_showOptionsButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotShowOptionsButtonClicked()));
 	exportOptionsLyr->addMultiCellWidget(m_showOptionsButton, 2, 2, 0, 0);
 	m_showOptionsButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 
@@ -358,7 +358,7 @@ void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * layout )
 		if (!m_defaultsBtn) {
 			m_defaultsBtn = new KPushButton(i18n("Defaults"), this);
 			TQWidget::setTabOrder(backButton(), m_defaultsBtn);
-			connect(m_defaultsBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDefaultsButtonClicked()));
+			connect(m_defaultsBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDefaultsButtonClicked()));
 		}
 		if (!m_exportOptionsSection->isVisible())
 			m_defaultsBtn->hide();
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 61f86ec2..26efa602 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -235,7 +235,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 
 	m_primaryKeyField = new TQCheckBox( i18n( "Primary key" ), page, "m_primaryKeyField" );
 	glyr->addWidget( m_primaryKeyField, 2, 1 );
-	connect(m_primaryKeyField, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotPrimaryKeyFieldToggled(bool)));
+	connect(m_primaryKeyField, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotPrimaryKeyFieldToggled(bool)));
 
 	m_comboQuote = new KexiCSVTextQuoteComboBox( page );
 	glyr->addWidget( m_comboQuote, 1, 2 );
@@ -364,24 +364,24 @@ if ( m_mode == Clipboard )
 
 	m_table->setSelectionMode(TQTable::NoSelection);
 
-	connect(m_formatCombo, TQT_SIGNAL(activated(int)),
-	  this, TQT_SLOT(formatChanged(int)));
-	connect(m_delimiterWidget, TQT_SIGNAL(delimiterChanged(const TQString&)),
-	  this, TQT_SLOT(delimiterChanged(const TQString&)));
-	connect(m_startAtLineSpinBox, TQT_SIGNAL(valueChanged ( int )),
-	  this, TQT_SLOT(startlineSelected(int)));
-	connect(m_comboQuote, TQT_SIGNAL(activated(int)),
-	  this, TQT_SLOT(textquoteSelected(int)));
-	connect(m_table, TQT_SIGNAL(currentChanged(int, int)),
-	  this, TQT_SLOT(currentCellChanged(int, int)));
-	connect(m_table, TQT_SIGNAL(valueChanged(int,int)),
-	  this, TQT_SLOT(cellValueChanged(int,int)));
-	connect(m_ignoreDuplicates, TQT_SIGNAL(stateChanged(int)),
-	  this, TQT_SLOT(ignoreDuplicatesChanged(int)));
-	connect(m_1stRowForFieldNames, TQT_SIGNAL(stateChanged(int)),
-	  this, TQT_SLOT(slot1stRowForFieldNamesChanged(int)));
-
-	connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(optionsButtonClicked()));
+	connect(m_formatCombo, TQ_SIGNAL(activated(int)),
+	  this, TQ_SLOT(formatChanged(int)));
+	connect(m_delimiterWidget, TQ_SIGNAL(delimiterChanged(const TQString&)),
+	  this, TQ_SLOT(delimiterChanged(const TQString&)));
+	connect(m_startAtLineSpinBox, TQ_SIGNAL(valueChanged ( int )),
+	  this, TQ_SLOT(startlineSelected(int)));
+	connect(m_comboQuote, TQ_SIGNAL(activated(int)),
+	  this, TQ_SLOT(textquoteSelected(int)));
+	connect(m_table, TQ_SIGNAL(currentChanged(int, int)),
+	  this, TQ_SLOT(currentCellChanged(int, int)));
+	connect(m_table, TQ_SIGNAL(valueChanged(int,int)),
+	  this, TQ_SLOT(cellValueChanged(int,int)));
+	connect(m_ignoreDuplicates, TQ_SIGNAL(stateChanged(int)),
+	  this, TQ_SLOT(ignoreDuplicatesChanged(int)));
+	connect(m_1stRowForFieldNames, TQ_SIGNAL(stateChanged(int)),
+	  this, TQ_SLOT(slot1stRowForFieldNamesChanged(int)));
+
+	connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(optionsButtonClicked()));
 
 	installRecursiveEventFilter(this, this);
 
@@ -406,7 +406,7 @@ void KexiCSVImportDialog::initLater()
 	if (m_dialogCancelled) {
 //		m_loadingProgressDlg->hide();
 	//	m_loadingProgressDlg->close();
-		TQTimer::singleShot(0, this, TQT_SLOT(reject()));
+		TQTimer::singleShot(0, this, TQ_SLOT(reject()));
 		return;
 	}
 
@@ -1270,7 +1270,7 @@ void KexiCSVImportDialog::textquoteSelected(int)
 void KexiCSVImportDialog::fillTableLater()
 {
 	m_table->setNumRows( 0 );
-	TQTimer::singleShot(10, this, TQT_SLOT(fillTable()));
+	TQTimer::singleShot(10, this, TQ_SLOT(fillTable()));
 }
 
 void KexiCSVImportDialog::startlineSelected(int startline)
diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
index d424ffad..a63c3347 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
@@ -65,12 +65,12 @@ KexiCSVDelimiterWidget::KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget
 		lyr->addStretch(2);
 
 	slotDelimiterChangedInternal(KEXICSV_DEFAULT_FILE_DELIMITER_INDEX); //this will init m_delimiter
-	connect(m_combo, TQT_SIGNAL(activated(int)),
-	  this, TQT_SLOT(slotDelimiterChanged(int)));
-	connect(m_delimiterEdit, TQT_SIGNAL(returnPressed()),
-	  this, TQT_SLOT(slotDelimiterLineEditReturnPressed()));
-	connect(m_delimiterEdit, TQT_SIGNAL(textChanged( const TQString & )),
-	  this, TQT_SLOT(slotDelimiterLineEditTextChanged( const TQString & ) ));
+	connect(m_combo, TQ_SIGNAL(activated(int)),
+	  this, TQ_SLOT(slotDelimiterChanged(int)));
+	connect(m_delimiterEdit, TQ_SIGNAL(returnPressed()),
+	  this, TQ_SLOT(slotDelimiterLineEditReturnPressed()));
+	connect(m_delimiterEdit, TQ_SIGNAL(textChanged( const TQString & )),
+	  this, TQ_SLOT(slotDelimiterLineEditTextChanged( const TQString & ) ));
 }
 
 void KexiCSVDelimiterWidget::slotDelimiterChanged(int index)
diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
index dd8b9a92..2352e02f 100644
--- a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
@@ -173,14 +173,14 @@ KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *pare
 	d->propertyset = new KexiDataAwarePropertySet(this, d->tableview);
 
 	// Connect signals the KexiDataTable provides to local slots.
-	connect(d->tabledata, TQT_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)),
-	        this, TQT_SLOT(beforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)));
-	connect(d->tabledata, TQT_SIGNAL(rowUpdated(KexiTableItem*)),
-	        this, TQT_SLOT(rowUpdated(KexiTableItem*)));
-	connect(d->tabledata, TQT_SIGNAL(rowInserted(KexiTableItem*,uint,bool)),
-	        this, TQT_SLOT(rowInserted(KexiTableItem*,uint,bool)));
-	connect(d->tabledata, TQT_SIGNAL(rowDeleted()),
-	        this, TQT_SLOT(rowDeleted()));
+	connect(d->tabledata, TQ_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)),
+	        this, TQ_SLOT(beforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)));
+	connect(d->tabledata, TQ_SIGNAL(rowUpdated(KexiTableItem*)),
+	        this, TQ_SLOT(rowUpdated(KexiTableItem*)));
+	connect(d->tabledata, TQ_SIGNAL(rowInserted(KexiTableItem*,uint,bool)),
+	        this, TQ_SLOT(rowInserted(KexiTableItem*,uint,bool)));
+	connect(d->tabledata, TQ_SIGNAL(rowDeleted()),
+	        this, TQ_SLOT(rowDeleted()));
 
 	// Everything is ready. So, update the data now.
 	updateData();
@@ -382,8 +382,8 @@ void KexiMacroDesignView::updateProperties(int row, KoProperty::Set* set, TDESha
 		// if there exists no such propertyset yet, create one.
 		set = new KoProperty::Set(d->propertyset, action->name());
 		d->propertyset->insert(row, set, true);
-		connect(set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)),
-		        this, TQT_SLOT(propertyChanged(KoProperty::Set&, KoProperty::Property&)));
+		connect(set, TQ_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)),
+		        this, TQ_SLOT(propertyChanged(KoProperty::Set&, KoProperty::Property&)));
 	}
 
 	// The caption.
@@ -433,9 +433,9 @@ void KexiMacroDesignView::propertyChanged(KoProperty::Set& set, KoProperty::Prop
 			updateProperties(row, &set, macroitem);
 		}
 		// It's needed to call the reload delayed cause in KoProperty::Editor
-		// TQTimer::singleShot(10, this, TQT_SLOT(selectItemLater())); may lead
+		// TQTimer::singleShot(10, this, TQ_SLOT(selectItemLater())); may lead
 		// to crashes if we are to fast.
-		TQTimer::singleShot(50, this, TQT_SLOT(reloadPropertyLater()));
+		TQTimer::singleShot(50, this, TQ_SLOT(reloadPropertyLater()));
 	}
 
 	d->reloadsProperties = false;
diff --git a/kexi/plugins/macros/kexipart/keximacroerror.cpp b/kexi/plugins/macros/kexipart/keximacroerror.cpp
index 8b676fb0..d4ba42b4 100644
--- a/kexi/plugins/macros/kexipart/keximacroerror.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroerror.cpp
@@ -86,8 +86,8 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, TDESharedPtr<KoMacro::Co
 		}
 	}
 	
-	connect(designerbtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(designbtnClicked()));
-	connect(continuebtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(continuebtnClicked()));
+	connect(designerbtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(designbtnClicked()));
+	connect(continuebtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(continuebtnClicked()));
 }
 
 KexiMacroError::~KexiMacroError()
@@ -125,6 +125,6 @@ void KexiMacroError::designbtnClicked()
 
 void KexiMacroError::continuebtnClicked()
 {	
-	TQTimer::singleShot(200, d->context, TQT_SLOT(activateNext()));
+	TQTimer::singleShot(200, d->context, TQ_SLOT(activateNext()));
 	close();
 }
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
index 3bb5629d..45d21b10 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
@@ -543,14 +543,14 @@ KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property,
 	d->combobox->setFocusProxy( d->listbox->editItem()->widget() );
 	setFocusWidget( d->combobox->lineEdit() );
 
-	connect(d->combobox, TQT_SIGNAL(textChanged(const TQString&)), 
-	        this, TQT_SLOT(slotComboBoxChanged()));
-	connect(d->combobox, TQT_SIGNAL(activated(int)),
-	        this, TQT_SLOT(slotComboBoxActivated()));
-	connect(d->listbox->editItem()->widget(), TQT_SIGNAL(valueChanged(Widget*)),
-	        this, TQT_SLOT(slotWidgetValueChanged()));
-	connect(d->macroproperty, TQT_SIGNAL(valueChanged()),
-	        this, TQT_SLOT(slotPropertyValueChanged()));
+	connect(d->combobox, TQ_SIGNAL(textChanged(const TQString&)), 
+	        this, TQ_SLOT(slotComboBoxChanged()));
+	connect(d->combobox, TQ_SIGNAL(activated(int)),
+	        this, TQ_SLOT(slotComboBoxActivated()));
+	connect(d->listbox->editItem()->widget(), TQ_SIGNAL(valueChanged(Widget*)),
+	        this, TQ_SLOT(slotWidgetValueChanged()));
+	connect(d->macroproperty, TQ_SIGNAL(valueChanged()),
+	        this, TQ_SLOT(slotPropertyValueChanged()));
 }
 
 KexiMacroPropertyWidget::~KexiMacroPropertyWidget()
diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.cpp b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
index 540dcc39..afbd0e8d 100644
--- a/kexi/plugins/macros/kexipart/keximacrotextview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
@@ -51,7 +51,7 @@ KexiMacroTextView::KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *parent,
 	d->editor->setWordWrap(TQTextEdit::NoWrap);
 	layout->addWidget(d->editor);
 
-	connect(d->editor, TQT_SIGNAL(textChanged()), this, TQT_SLOT(editorChanged()));
+	connect(d->editor, TQ_SIGNAL(textChanged()), this, TQ_SLOT(editorChanged()));
 }
 
 KexiMacroTextView::~KexiMacroTextView()
diff --git a/kexi/plugins/macros/kexipart/keximacroview.cpp b/kexi/plugins/macros/kexipart/keximacroview.cpp
index f0e7ea0b..34f57712 100644
--- a/kexi/plugins/macros/kexipart/keximacroview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroview.cpp
@@ -67,7 +67,7 @@ KexiMacroView::KexiMacroView(KexiMainWindow *mainwin, TQWidget *parent, KoMacro:
 	, d( new Private(macro) )
 {
 	//kdDebug() << "KexiMacroView::KexiMacroView() Ctor" << endl;
-	plugSharedAction( "data_execute", this, TQT_SLOT(execute()) );
+	plugSharedAction( "data_execute", this, TQ_SLOT(execute()) );
 }
 
 KexiMacroView::~KexiMacroView()
diff --git a/kexi/plugins/macros/lib/macro.cpp b/kexi/plugins/macros/lib/macro.cpp
index af29da57..a5f84be7 100644
--- a/kexi/plugins/macros/lib/macro.cpp
+++ b/kexi/plugins/macros/lib/macro.cpp
@@ -115,7 +115,7 @@ TDESharedPtr<Context> Macro::execute(TQObject* sender)
 		// set the sender-variable if we got a sender TQObject.
 		c->setVariable("[sender]", TDESharedPtr<Variable>( new Variable(sender) ));
 	}
-	//connect(context, TQT_SIGNAL(activated()), this, TQT_SIGNAL(activated()));
+	//connect(context, TQ_SIGNAL(activated()), this, TQ_SIGNAL(activated()));
 	
 	//call activate in the context of the macro
 	c->activate( c );
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
index 6d5d557c..d3725728 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
@@ -148,12 +148,12 @@ KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor(
 	d->spl = new TQSplitter(TQt::Vertical, this);
 	d->spl->setChildrenCollapsible(false);
 	d->relations = new KexiRelationWidget(mainWin, d->spl, "relations");
-	connect(d->relations, TQT_SIGNAL(tableAdded(KexiDB::TableSchema&)),
-		this, TQT_SLOT(slotTableAdded(KexiDB::TableSchema&)));
-	connect(d->relations, TQT_SIGNAL(tableHidden(KexiDB::TableSchema&)),
-		this, TQT_SLOT(slotTableHidden(KexiDB::TableSchema&)));
-	connect(d->relations, TQT_SIGNAL(tableFieldDoubleClicked(KexiDB::TableSchema*,const TQString&)),
-		this, TQT_SLOT(slotTableFieldDoubleClicked(KexiDB::TableSchema*,const TQString&)));
+	connect(d->relations, TQ_SIGNAL(tableAdded(KexiDB::TableSchema&)),
+		this, TQ_SLOT(slotTableAdded(KexiDB::TableSchema&)));
+	connect(d->relations, TQ_SIGNAL(tableHidden(KexiDB::TableSchema&)),
+		this, TQ_SLOT(slotTableHidden(KexiDB::TableSchema&)));
+	connect(d->relations, TQ_SIGNAL(tableFieldDoubleClicked(KexiDB::TableSchema*,const TQString&)),
+		this, TQ_SLOT(slotTableFieldDoubleClicked(KexiDB::TableSchema*,const TQString&)));
 
 	d->head = new KexiSectionHeader(i18n("Query Columns"),TQt::Vertical, d->spl);
 	d->dataTable = new KexiDataTable(mainWin, d->head, "guieditor_dataTable", false);
@@ -171,21 +171,21 @@ KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor(
 		d->dataTable->tableView()->adjustColumnWidthToContents(COLUMN_ID_SORTING);
 		d->dataTable->tableView()->maximizeColumnsWidth( c );
 		d->dataTable->tableView()->setDropsAtRowEnabled(true);
-		connect(d->dataTable->tableView(), TQT_SIGNAL(dragOverRow(KexiTableItem*,int,TQDragMoveEvent*)),
-			this, TQT_SLOT(slotDragOverTableRow(KexiTableItem*,int,TQDragMoveEvent*)));
-		connect(d->dataTable->tableView(), TQT_SIGNAL(droppedAtRow(KexiTableItem*,int,TQDropEvent*,KexiTableItem*&)),
-			this, TQT_SLOT(slotDroppedAtRow(KexiTableItem*,int,TQDropEvent*,KexiTableItem*&)));
-		connect(d->dataTable->tableView(), TQT_SIGNAL(newItemAppendedForAfterDeletingInSpreadSheetMode()),
-			this, TQT_SLOT(slotNewItemAppendedForAfterDeletingInSpreadSheetMode()));
+		connect(d->dataTable->tableView(), TQ_SIGNAL(dragOverRow(KexiTableItem*,int,TQDragMoveEvent*)),
+			this, TQ_SLOT(slotDragOverTableRow(KexiTableItem*,int,TQDragMoveEvent*)));
+		connect(d->dataTable->tableView(), TQ_SIGNAL(droppedAtRow(KexiTableItem*,int,TQDropEvent*,KexiTableItem*&)),
+			this, TQ_SLOT(slotDroppedAtRow(KexiTableItem*,int,TQDropEvent*,KexiTableItem*&)));
+		connect(d->dataTable->tableView(), TQ_SIGNAL(newItemAppendedForAfterDeletingInSpreadSheetMode()),
+			this, TQ_SLOT(slotNewItemAppendedForAfterDeletingInSpreadSheetMode()));
 	}
-	connect(d->data, TQT_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)),
-		this, TQT_SLOT(slotBeforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)));
-	connect(d->data, TQT_SIGNAL(rowInserted(KexiTableItem*,uint,bool)),
-		this, TQT_SLOT(slotRowInserted(KexiTableItem*,uint,bool)));
-	connect(d->relations, TQT_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)),
-		this, TQT_SLOT(slotTablePositionChanged(KexiRelationViewTableContainer*)));
-	connect(d->relations, TQT_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)),
-		this, TQT_SLOT(slotAboutConnectionRemove(KexiRelationViewConnection*)));
+	connect(d->data, TQ_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)),
+		this, TQ_SLOT(slotBeforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)));
+	connect(d->data, TQ_SIGNAL(rowInserted(KexiTableItem*,uint,bool)),
+		this, TQ_SLOT(slotRowInserted(KexiTableItem*,uint,bool)));
+	connect(d->relations, TQ_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)),
+		this, TQ_SLOT(slotTablePositionChanged(KexiRelationViewTableContainer*)));
+	connect(d->relations, TQ_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)),
+		this, TQ_SLOT(slotAboutConnectionRemove(KexiRelationViewConnection*)));
 
 	TQVBoxLayout *l = new TQVBoxLayout(this);
 	l->addWidget(d->spl);
@@ -1742,8 +1742,8 @@ KexiQueryDesignerGuiEditor::createPropertySet( int row,
 	set->addProperty(prop = new KoProperty::Property("isExpression", TQVariant(false)) );
 	prop->setVisible(false);
 
-	connect(set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)),
-		this, TQT_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&)));
+	connect(set, TQ_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)),
+		this, TQ_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&)));
 
 	d->sets->insert(row, set, newOne);
 
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index f443c92f..fbd43f31 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -108,7 +108,7 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi
 	d->head = new KexiSectionHeader(i18n("SQL Query Text"),TQt::Vertical, d->splitter);
 	d->editor = new KexiQueryDesignerSQLEditor(mainWin, d->head, "sqle");
 //	d->editor->installEventFilter(this);//for keys
-	connect(d->editor, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()));
+	connect(d->editor, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()));
 	addChildView(d->editor);
 	setViewWidget(d->editor);
 	d->splitter->setFocusProxy(d->editor);
@@ -136,8 +136,8 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi
 	TQHBoxLayout *b = new TQHBoxLayout(this);
 	b->addWidget(d->splitter);
 
-	plugSharedAction("querypart_check_query", this, TQT_SLOT(slotCheckQuery())); 
-	plugSharedAction("querypart_view_toggle_history", this, TQT_SLOT(slotUpdateMode()));
+	plugSharedAction("querypart_check_query", this, TQ_SLOT(slotCheckQuery())); 
+	plugSharedAction("querypart_view_toggle_history", this, TQ_SLOT(slotUpdateMode()));
 	d->action_toggle_history = static_cast<TDEToggleAction*>( sharedAction( "querypart_view_toggle_history" ) );
 
 	d->historyHead = new KexiSectionHeader(i18n("SQL Query History"),TQt::Vertical, d->history_section);
@@ -146,11 +146,11 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi
 
 	static const TQString msg_back = i18n("Back to Selected Query");
 	static const TQString msg_clear = i18n("Clear History");
-	d->historyHead->addButton("select_item", msg_back, this, TQT_SLOT(slotSelectQuery()));
-	d->historyHead->addButton("edit-clear", msg_clear, d->history, TQT_SLOT(clear()));
-	d->history->popupMenu()->insertItem(SmallIcon("select_item"), msg_back, this, TQT_SLOT(slotSelectQuery()));
-	d->history->popupMenu()->insertItem(SmallIcon("edit-clear"), msg_clear, d->history, TQT_SLOT(clear()));
-	connect(d->history, TQT_SIGNAL(currentItemDoubleClicked()), this, TQT_SLOT(slotSelectQuery()));
+	d->historyHead->addButton("select_item", msg_back, this, TQ_SLOT(slotSelectQuery()));
+	d->historyHead->addButton("edit-clear", msg_clear, d->history, TQ_SLOT(clear()));
+	d->history->popupMenu()->insertItem(SmallIcon("select_item"), msg_back, this, TQ_SLOT(slotSelectQuery()));
+	d->history->popupMenu()->insertItem(SmallIcon("edit-clear"), msg_clear, d->history, TQ_SLOT(clear()));
+	connect(d->history, TQ_SIGNAL(currentItemDoubleClicked()), this, TQ_SLOT(slotSelectQuery()));
 
 	d->heightForHistoryMode = -1; //height() / 2;
 	//d->historyHead->hide();
@@ -320,7 +320,7 @@ KexiQueryDesignerSQLView::afterSwitchFrom(int mode)
 	d->slotTextChangedEnabled = false;
 	 d->editor->setText( d->origStatement );
 	d->slotTextChangedEnabled = true;
-	TQTimer::singleShot(100, d->editor, TQT_SLOT(setFocus()));
+	TQTimer::singleShot(100, d->editor, TQ_SLOT(setFocus()));
 	return true;
 }
 
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
index 883bf3ca..4c1c1c6e 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
@@ -41,7 +41,7 @@ KexiQueryDesignerSQLHistory::KexiQueryDesignerSQLHistory(TQWidget *parent, const
 	m_history->setAutoDelete(true);
 
 	m_popup = new TDEPopupMenu(this);
-	m_popup->insertItem(SmallIcon("edit-copy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard()));
+	m_popup->insertItem(SmallIcon("edit-copy"), i18n("Copy to Clipboard"), this, TQ_SLOT(slotToClipboard()));
 }
 
 KexiQueryDesignerSQLHistory::~KexiQueryDesignerSQLHistory()
@@ -162,12 +162,12 @@ KexiQueryDesignerSQLHistory::addEntry(HistoryEntry *e)
 KexiQueryDesignerSQLHistory::contextMenu(const TQPoint &pos, HistoryEntry *)
 {
 	TDEPopupMenu p(this);
-	p.insertItem(SmallIcon("edit-copy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard()));
+	p.insertItem(SmallIcon("edit-copy"), i18n("Copy to Clipboard"), this, TQ_SLOT(slotToClipboard()));
 	
 
 #ifndef KEXI_NO_UNFINISHED
 	p.insertSeparator();
-	p.insertItem(SmallIcon("edit"), i18n("Edit"), this, TQT_SLOT(slotEdit()));
+	p.insertItem(SmallIcon("edit"), i18n("Edit"), this, TQ_SLOT(slotEdit()));
 	p.insertItem(SmallIcon("reload"), i18n("Requery"));
 #endif
 
diff --git a/kexi/plugins/queries/kexiquerypart.cpp b/kexi/plugins/queries/kexiquerypart.cpp
index aad6c992..4882ea9d 100644
--- a/kexi/plugins/queries/kexiquerypart.cpp
+++ b/kexi/plugins/queries/kexiquerypart.cpp
@@ -79,15 +79,15 @@ KexiQueryPart::createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::It
 			dialog->mainWin(), parent, "guieditor");
 		//needed for updating tables combo box:
 		KexiProject *prj = dialog->mainWin()->project();
-		connect(prj, TQT_SIGNAL(newItemStored(KexiPart::Item&)),
-			view, TQT_SLOT(slotNewItemStored(KexiPart::Item&)));
-		connect(prj, TQT_SIGNAL(itemRemoved(const KexiPart::Item&)),
-			view, TQT_SLOT(slotItemRemoved(const KexiPart::Item&)));
-		connect(prj, TQT_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)),
-			view, TQT_SLOT(slotItemRenamed(const KexiPart::Item&, const TQCString&)));
-
-//		connect(dialog->mainWin()->project(), TQT_SIGNAL(tableCreated(KexiDB::TableSchema&)),
-//			view, TQT_SLOT(slotTableCreated(KexiDB::TableSchema&)));
+		connect(prj, TQ_SIGNAL(newItemStored(KexiPart::Item&)),
+			view, TQ_SLOT(slotNewItemStored(KexiPart::Item&)));
+		connect(prj, TQ_SIGNAL(itemRemoved(const KexiPart::Item&)),
+			view, TQ_SLOT(slotItemRemoved(const KexiPart::Item&)));
+		connect(prj, TQ_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)),
+			view, TQ_SLOT(slotItemRenamed(const KexiPart::Item&, const TQCString&)));
+
+//		connect(dialog->mainWin()->project(), TQ_SIGNAL(tableCreated(KexiDB::TableSchema&)),
+//			view, TQ_SLOT(slotTableCreated(KexiDB::TableSchema&)));
 		return view;
 	}
 	else if (viewMode == Kexi::TextViewMode) {
@@ -128,9 +128,9 @@ void KexiQueryPart::initInstanceActions( int mode, TDEActionCollection *col )
 	else if (mode==Kexi::DesignViewMode) {
 	}
 	else if (mode==Kexi::TextViewMode) {
-//		new TDEAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), col, "querypart_check_query");
+//		new TDEAction(i18n("Check Query"), "test_it", 0, this, TQ_SLOT(slotCheckQuery()), col, "querypart_check_query");
 
-//TODO		new TDEAction(i18n("Execute Query"), "?????", 0, this, TQT_SLOT(checkQuery()), col, "querypart_execute_query");
+//TODO		new TDEAction(i18n("Execute Query"), "?????", 0, this, TQ_SLOT(checkQuery()), col, "querypart_execute_query");
 	}
 }
 #endif
@@ -141,7 +141,7 @@ void KexiQueryPart::initPartActions()
 
 void KexiQueryPart::initInstanceActions()
 {
-//	new TDEAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), 
+//	new TDEAction(i18n("Check Query"), "test_it", 0, this, TQ_SLOT(slotCheckQuery()), 
 //		m_instanceGuiClients[Kexi::DesignViewMode]->actionCollection(), "querypart_check_query");
 
 	TDEAction *a = createSharedAction(Kexi::TextViewMode, i18n("Check Query"), "test_it", 
diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp
index 57753a30..2d11892d 100644
--- a/kexi/plugins/reports/kexireportfactory.cpp
+++ b/kexi/plugins/reports/kexireportfactory.cpp
@@ -121,7 +121,7 @@ KexiReportFactory::createMenuActions(const TQCString &classname, TQWidget *w,
 	Q_UNUSED(container);
 	if(classname == "Label") {
 		/*! @todo use TDEAction */
-		menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQT_SLOT(editText()));
+		menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQ_SLOT(editText()));
 		return true;
 	}
 	return false;
diff --git a/kexi/plugins/reports/kexireportview.cpp b/kexi/plugins/reports/kexireportview.cpp
index 2de5f4a7..902bc179 100644
--- a/kexi/plugins/reports/kexireportview.cpp
+++ b/kexi/plugins/reports/kexireportview.cpp
@@ -47,7 +47,7 @@ KexiReportScrollView::KexiReportScrollView(TQWidget *parent, bool preview)
 		recordNavigator()->setLabelText(i18n("Page:"));
 		recordNavigator()->setInsertingButtonVisible(false);
 	}
-	connect(this, TQT_SIGNAL(resizingStarted()), this, TQT_SLOT(slotResizingStarted()));
+	connect(this, TQ_SIGNAL(resizingStarted()), this, TQ_SLOT(slotResizingStarted()));
 }
 
 KexiReportScrollView::~KexiReportScrollView()
@@ -102,52 +102,52 @@ KexiReportView::KexiReportView(KexiMainWindow *win, TQWidget *parent, const char
 	if (viewMode()==Kexi::DataViewMode) {
 		m_scrollView->viewport()->setPaletteBackgroundColor(m_reportform->palette().active().background());
 #if 0
-		connect(reportPart()->manager(), TQT_SIGNAL(noFormSelected()), TQT_SLOT(slotNoFormSelected()));
+		connect(reportPart()->manager(), TQ_SIGNAL(noFormSelected()), TQ_SLOT(slotNoFormSelected()));
 #endif
 	}
 	else {
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(propertySetSwitched(KoProperty::Set *, bool)),
-			this, TQT_SLOT(slotPropertySetSwitched(KoProperty::Set *, bool)));
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(dirty(KFormDesigner::Form *, bool)),
-			this, TQT_SLOT(slotDirty(KFormDesigner::Form *, bool)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(propertySetSwitched(KoProperty::Set *, bool)),
+			this, TQ_SLOT(slotPropertySetSwitched(KoProperty::Set *, bool)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(dirty(KFormDesigner::Form *, bool)),
+			this, TQ_SLOT(slotDirty(KFormDesigner::Form *, bool)));
 
 		// action stuff
-		/*connect(reportPart()->manager(), TQT_SIGNAL(widgetSelected(KFormDesigner::Form*, bool)), TQT_SLOT(slotWidgetSelected(KFormDesigner::Form*, bool)));
-		connect(reportPart()->manager(), TQT_SIGNAL(formWidgetSelected(KFormDesigner::Form*)), TQT_SLOT(slotFormWidgetSelected(KFormDesigner::Form*)));
-		connect(reportPart()->manager(), TQT_SIGNAL(undoEnabled(bool, const TQString&)), this, TQT_SLOT(setUndoEnabled(bool)));
-		connect(reportPart()->manager(), TQT_SIGNAL(redoEnabled(bool, const TQString&)), this, TQT_SLOT(setRedoEnabled(bool)));*/
-
-		plugSharedAction("edit_copy", KFormDesigner::FormManager::self(), TQT_SLOT(copyWidget()));
-		plugSharedAction("edit_cut", KFormDesigner::FormManager::self(), TQT_SLOT(cutWidget()));
-		plugSharedAction("edit_paste", KFormDesigner::FormManager::self(), TQT_SLOT(pasteWidget()));
-		plugSharedAction("edit_delete", KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()));
-		plugSharedAction("edit_select_all", KFormDesigner::FormManager::self(), TQT_SLOT(selectAll()));
-		plugSharedAction("reportpart_clear_contents", KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()));
-		plugSharedAction("edit_undo", KFormDesigner::FormManager::self(), TQT_SLOT(undo()));
-		plugSharedAction("edit_redo", KFormDesigner::FormManager::self(), TQT_SLOT(redo()));
-
-		plugSharedAction("reportpart_format_raise", KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()) );
-		plugSharedAction("reportpart_format_lower", KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()) );
+		/*connect(reportPart()->manager(), TQ_SIGNAL(widgetSelected(KFormDesigner::Form*, bool)), TQ_SLOT(slotWidgetSelected(KFormDesigner::Form*, bool)));
+		connect(reportPart()->manager(), TQ_SIGNAL(formWidgetSelected(KFormDesigner::Form*)), TQ_SLOT(slotFormWidgetSelected(KFormDesigner::Form*)));
+		connect(reportPart()->manager(), TQ_SIGNAL(undoEnabled(bool, const TQString&)), this, TQ_SLOT(setUndoEnabled(bool)));
+		connect(reportPart()->manager(), TQ_SIGNAL(redoEnabled(bool, const TQString&)), this, TQ_SLOT(setRedoEnabled(bool)));*/
+
+		plugSharedAction("edit_copy", KFormDesigner::FormManager::self(), TQ_SLOT(copyWidget()));
+		plugSharedAction("edit_cut", KFormDesigner::FormManager::self(), TQ_SLOT(cutWidget()));
+		plugSharedAction("edit_paste", KFormDesigner::FormManager::self(), TQ_SLOT(pasteWidget()));
+		plugSharedAction("edit_delete", KFormDesigner::FormManager::self(), TQ_SLOT(deleteWidget()));
+		plugSharedAction("edit_select_all", KFormDesigner::FormManager::self(), TQ_SLOT(selectAll()));
+		plugSharedAction("reportpart_clear_contents", KFormDesigner::FormManager::self(), TQ_SLOT(clearWidgetContent()));
+		plugSharedAction("edit_undo", KFormDesigner::FormManager::self(), TQ_SLOT(undo()));
+		plugSharedAction("edit_redo", KFormDesigner::FormManager::self(), TQ_SLOT(redo()));
+
+		plugSharedAction("reportpart_format_raise", KFormDesigner::FormManager::self(), TQ_SLOT(bringWidgetToFront()) );
+		plugSharedAction("reportpart_format_lower", KFormDesigner::FormManager::self(), TQ_SLOT(sendWidgetToBack()) );
 
 		plugSharedAction("reportpart_align_menu", KFormDesigner::FormManager::self(), 0 );
-		plugSharedAction("reportpart_align_to_left", KFormDesigner::FormManager::self(),TQT_SLOT(alignWidgetsToLeft()) );
-		plugSharedAction("reportpart_align_to_right", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()) );
-		plugSharedAction("reportpart_align_to_top", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()) );
-		plugSharedAction("reportpart_align_to_bottom", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()) );
-		plugSharedAction("reportpart_align_to_grid", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()) );
+		plugSharedAction("reportpart_align_to_left", KFormDesigner::FormManager::self(),TQ_SLOT(alignWidgetsToLeft()) );
+		plugSharedAction("reportpart_align_to_right", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToRight()) );
+		plugSharedAction("reportpart_align_to_top", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToTop()) );
+		plugSharedAction("reportpart_align_to_bottom", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToBottom()) );
+		plugSharedAction("reportpart_align_to_grid", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToGrid()) );
 
 		plugSharedAction("reportpart_adjust_size_menu", KFormDesigner::FormManager::self(), 0 );
-		plugSharedAction("reportpart_adjust_to_fit", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()) );
-		plugSharedAction("reportpart_adjust_size_grid", KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()) );
-		plugSharedAction("reportpart_adjust_height_small", KFormDesigner::FormManager::self(),  TQT_SLOT(adjustHeightToSmall()) );
-		plugSharedAction("reportpart_adjust_height_big", KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()) );
-		plugSharedAction("reportpart_adjust_width_small", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()) );
-		plugSharedAction("reportpart_adjust_width_big", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()) );
+		plugSharedAction("reportpart_adjust_to_fit", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidgetSize()) );
+		plugSharedAction("reportpart_adjust_size_grid", KFormDesigner::FormManager::self(), TQ_SLOT(adjustSizeToGrid()) );
+		plugSharedAction("reportpart_adjust_height_small", KFormDesigner::FormManager::self(),  TQ_SLOT(adjustHeightToSmall()) );
+		plugSharedAction("reportpart_adjust_height_big", KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToBig()) );
+		plugSharedAction("reportpart_adjust_width_small", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToSmall()) );
+		plugSharedAction("reportpart_adjust_width_big", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToBig()) );
 	}
 
 	initForm();
 
-	connect(this, TQT_SIGNAL(focus(bool)), this, TQT_SLOT(slotFocus(bool)));
+	connect(this, TQ_SIGNAL(focus(bool)), this, TQ_SLOT(slotFocus(bool)));
 	/// @todo skip this if ther're no borders
 //	m_reportform->resize( m_reportform->size()+TQSize(m_scrollView->verticalScrollBar()->width(), m_scrollView->horizontalScrollBar()->height()) );
 }
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
index 4348aae2..b6cf85f4 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
@@ -88,18 +88,18 @@ KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *pa
     d->statusbrowser->installEventFilter(this);
     splitter->setResizeMode(d->statusbrowser, TQSplitter::KeepSize);
 
-    plugSharedAction( "data_execute", this, TQT_SLOT(execute()) );
+    plugSharedAction( "data_execute", this, TQ_SLOT(execute()) );
     if(KexiEditor::isAdvancedEditor()) // the configeditor is only in advanced mode avaiable.
-        plugSharedAction( "script_config_editor", d->editor, TQT_SLOT(slotConfigureEditor()) );
+        plugSharedAction( "script_config_editor", d->editor, TQ_SLOT(slotConfigureEditor()) );
 
     loadData();
 
     d->properties = new KoProperty::Set(this, "KexiScripting");
-    connect(d->properties, TQT_SIGNAL( propertyChanged(KoProperty::Set&, KoProperty::Property&) ),
-            this, TQT_SLOT( slotPropertyChanged(KoProperty::Set&, KoProperty::Property&) ));
+    connect(d->properties, TQ_SIGNAL( propertyChanged(KoProperty::Set&, KoProperty::Property&) ),
+            this, TQ_SLOT( slotPropertyChanged(KoProperty::Set&, KoProperty::Property&) ));
 
     // To schedule the initialize fixes a crasher in Kate.
-    TQTimer::singleShot(50, this, TQT_SLOT( initialize() ));
+    TQTimer::singleShot(50, this, TQ_SLOT( initialize() ));
 }
 
 KexiScriptDesignView::~KexiScriptDesignView()
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
index 8e4db059..75afc420 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
@@ -62,7 +62,7 @@ void KexiScriptEditor::initialize(Kross::Api::ScriptAction* scriptaction)
     d->scriptaction = scriptaction;
     Q_ASSERT(d->scriptaction);
 
-    disconnect(this, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()));
+    disconnect(this, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()));
 
     TQString code = d->scriptaction->getCode();
     if(code.isNull()) {
@@ -85,7 +85,7 @@ void KexiScriptEditor::initialize(Kross::Api::ScriptAction* scriptaction)
 
     clearUndoRedo();
     KexiEditor::setDirty(false);
-    connect(this, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()));
+    connect(this, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()));
 }
 
 void KexiScriptEditor::slotTextChanged()
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
index fe3453ab..22527f53 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
@@ -102,7 +102,7 @@ bool KexiScriptPart::execute(KexiPart::Item* item, TQObject* sender)
 		}
 
 		if(exec) {
-			//TQTimer::singleShot(10, scriptaction, TQT_SLOT(activate()));
+			//TQTimer::singleShot(10, scriptaction, TQ_SLOT(activate()));
 			d->scriptguiclient->executeScriptAction( scriptaction );
 		}
 	}
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
index 6ecbea5f..4bde164b 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
@@ -105,10 +105,10 @@ def runGuiApp(copycenter, name):
 			btnbox.setSpacing(6)
 			self.okbtn = tqt.TQPushButton(btnbox)
 			self.okbtn.setText("Ok")
-			#tqt.TQObject.connect(okbtn, tqt.SIGNAL("clicked()"), self.okClicked)
+			#tqt.TQObject.connect(okbtn, tqt.TQ_SIGNAL("clicked()"), self.okClicked)
 			self.cancelbtn = tqt.TQPushButton(btnbox)
 			self.cancelbtn.setText("Cancel")
-			tqt.TQObject.connect(self.cancelbtn, tqt.SIGNAL("clicked()"), self.close)
+			tqt.TQObject.connect(self.cancelbtn, tqt.TQ_SIGNAL("clicked()"), self.close)
 			box.setMinimumSize(tqt.TQSize(460,380))
 		def addItem(self,valuelist,afteritem = None):
 			if afteritem == None:
@@ -136,7 +136,7 @@ def runGuiApp(copycenter, name):
 			self.jobfilecombobox.setEditable(True)
 			self.jobfilecombobox.insertItem("")
 			label.setBuddy(self.jobfilecombobox)
-			tqt.TQObject.connect(self.jobfilecombobox, tqt.SIGNAL("textChanged(const TQString&)"), self.jobfilecomboboxChanged)
+			tqt.TQObject.connect(self.jobfilecombobox, tqt.TQ_SIGNAL("textChanged(const TQString&)"), self.jobfilecomboboxChanged)
 
 			import os
 			import re
@@ -147,10 +147,10 @@ def runGuiApp(copycenter, name):
 
 			loadbtn = tqt.TQPushButton(typebox)
 			loadbtn.setText("Open...")
-			tqt.TQObject.connect(loadbtn, tqt.SIGNAL("clicked()"), self.openClicked)
+			tqt.TQObject.connect(loadbtn, tqt.TQ_SIGNAL("clicked()"), self.openClicked)
 			savebtn = tqt.TQPushButton(typebox)
 			savebtn.setText("Save...")
-			tqt.TQObject.connect(savebtn, tqt.SIGNAL("clicked()"), self.saveClicked)
+			tqt.TQObject.connect(savebtn, tqt.TQ_SIGNAL("clicked()"), self.saveClicked)
 
 			self.listview = tqt.TQListView(self)
 			self.listview.setAllColumnsShowFocus(True)
@@ -159,8 +159,8 @@ def runGuiApp(copycenter, name):
 			self.listview.header().setClickEnabled(False)
 			self.listview.addColumn("Name")
 			self.listview.addColumn("Value")
-			tqt.TQObject.connect(self.listview, tqt.SIGNAL("doubleClicked(TQListViewItem*, const TQPoint&, int)"), self.doubleClicked)
-			#tqt.TQObject.connect(self.listview, tqt.SIGNAL("itemRenamed(TQListViewItem*, int, const TQString&)"), self.itemRenamed)
+			tqt.TQObject.connect(self.listview, tqt.TQ_SIGNAL("doubleClicked(TQListViewItem*, const TQPoint&, int)"), self.doubleClicked)
+			#tqt.TQObject.connect(self.listview, tqt.TQ_SIGNAL("itemRenamed(TQListViewItem*, int, const TQString&)"), self.itemRenamed)
 
 		def doubleClicked(self, **args):
 			print("CopyJobWidget.doubleClicked")
@@ -339,10 +339,10 @@ def runGuiApp(copycenter, name):
 			self.donebtn = tqt.TQPushButton(btnbox)
 			self.donebtn.setText("Done")
 			self.donebtn.setEnabled(False)
-			tqt.TQObject.connect(self.donebtn,tqt.SIGNAL("clicked()"),self.close)
+			tqt.TQObject.connect(self.donebtn,tqt.TQ_SIGNAL("clicked()"),self.close)
 			self.cancelbtn = tqt.TQPushButton(btnbox)
 			self.cancelbtn.setText("Cancel")
-			tqt.TQObject.connect(self.cancelbtn,tqt.SIGNAL("clicked()"),self.close)
+			tqt.TQObject.connect(self.cancelbtn,tqt.TQ_SIGNAL("clicked()"),self.close)
 			box.setMinimumSize( tqt.TQSize(500,380) )
 
 		def updateStates(self):
@@ -375,7 +375,7 @@ def runGuiApp(copycenter, name):
 
 				self.starttime = tqt.TQTime()
 				self.updatetimer = tqt.TQTimer(self)
-				tqt.TQObject.connect(self.updatetimer,tqt.SIGNAL("timeout()"),self.updateStates)
+				tqt.TQObject.connect(self.updatetimer,tqt.TQ_SIGNAL("timeout()"),self.updateStates)
 
 				# Initialize the source
 				sourcename = self.dialog.getSourcePluginName()
@@ -469,7 +469,7 @@ def runGuiApp(copycenter, name):
 			except:
 				import traceback
 				print("".join( traceback.format_exception(sys.exc_info()[0],sys.exc_info()[1],sys.exc_info()[2]) ))
-			tqt.TQObject.connect(self.combobox, tqt.SIGNAL("activated(int)"), self.activated)
+			tqt.TQObject.connect(self.combobox, tqt.TQ_SIGNAL("activated(int)"), self.activated)
 
 		def updatePlugin(self):
 			print("DataSelector.updatePlugin")
@@ -570,10 +570,10 @@ def runGuiApp(copycenter, name):
 			okbtn = tqt.TQPushButton(btnbox)
 			okbtn.setText("Start Copy")
 			okbtn.setDefault(True)
-			tqt.TQObject.connect(okbtn,tqt.SIGNAL("clicked()"),self.startCopy)
+			tqt.TQObject.connect(okbtn,tqt.TQ_SIGNAL("clicked()"),self.startCopy)
 			cancelbtn = tqt.TQPushButton(btnbox)
 			cancelbtn.setText("Cancel")
-			tqt.TQObject.connect(cancelbtn,tqt.SIGNAL("clicked()"),self.close)
+			tqt.TQObject.connect(cancelbtn,tqt.TQ_SIGNAL("clicked()"),self.close)
 
 			self.tab.addTab(self.splitter,"Copy")
 			self.tab.setCurrentPage(1)
@@ -582,7 +582,7 @@ def runGuiApp(copycenter, name):
 			self.helpbrowser.setLinkUnderline(False)
 			self.helpbrowser.setUndoRedoEnabled(False)
 			self.tab.addTab(self.helpbrowser,"Help")
-			tqt.TQObject.connect(self.tab,tqt.SIGNAL("currentChanged(TQWidget*)"),self.currentTabChanged)
+			tqt.TQObject.connect(self.tab,tqt.TQ_SIGNAL("currentChanged(TQWidget*)"),self.currentTabChanged)
 
 			box.setMinimumSize( tqt.TQSize(760,500) )
 
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py
index 8c6c431b..87cbfb89 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py
@@ -227,8 +227,8 @@ class CopyCenterPlugin:
 
 				prjlabel.setBuddy(self.prjcombo)
 				prjsavebtn = tqt.TQPushButton("...",self)
-				tqt.TQObject.connect(prjsavebtn, tqt.SIGNAL("clicked()"),self.buttonClicked)
-				tqt.TQObject.connect(self.prjcombo, tqt.SIGNAL("textChanged(const TQString&)"), self.main.projectChanged)
+				tqt.TQObject.connect(prjsavebtn, tqt.TQ_SIGNAL("clicked()"),self.buttonClicked)
+				tqt.TQObject.connect(self.prjcombo, tqt.TQ_SIGNAL("textChanged(const TQString&)"), self.main.projectChanged)
 				self.setStretchFactor(self.prjcombo,1)
 			def buttonClicked(self):
 				text = str(self.prjcombo.currentText())
@@ -258,7 +258,7 @@ class CopyCenterPlugin:
 				for driver in self.copycenterplugin.drivermanager.driverNames():
 					self.drivercombo.insertItem(driver)
 
-				tqt.TQObject.connect(self.drivercombo, tqt.SIGNAL("activated(int)"), self.activated)
+				tqt.TQObject.connect(self.drivercombo, tqt.TQ_SIGNAL("activated(int)"), self.activated)
 				driverlabel.setBuddy(self.drivercombo)
 				driverbox.setStretchFactor(self.drivercombo,1)
 
@@ -291,7 +291,7 @@ class CopyCenterPlugin:
 					filelabel.setBuddy(self.fileedit)
 					filebox.setStretchFactor(self.fileedit,1)
 					filebtn = tqt.TQPushButton("...",filebox)
-					tqt.TQObject.connect(filebtn, tqt.SIGNAL("clicked()"), self.fileClicked)
+					tqt.TQObject.connect(filebtn, tqt.TQ_SIGNAL("clicked()"), self.fileClicked)
 				else:
 					hostbox = tqt.TQHBox(mainbox)
 					hostlabel = tqt.TQLabel("Hostname:",hostbox)
@@ -307,13 +307,13 @@ class CopyCenterPlugin:
 
 					sockbox = tqt.TQHBox(mainbox)
 					self.sockfilecheckbox = tqt.TQCheckBox("Socket File:",sockbox)
-					tqt.TQObject.connect(self.sockfilecheckbox, tqt.SIGNAL("toggled(bool)"), self.sockfilecheckboxClicked)
+					tqt.TQObject.connect(self.sockfilecheckbox, tqt.TQ_SIGNAL("toggled(bool)"), self.sockfilecheckboxClicked)
 					self.sockfilebox = tqt.TQHBox(sockbox)
 					self.sockfileedit = tqt.TQLineEdit(self.plugin.options['socketfile'],self.sockfilebox)
 					self.sockfilebox.setEnabled(False)
 					sockfilebtn = tqt.TQPushButton("...",self.sockfilebox)
 					self.sockfilecheckbox.setChecked( str(self.plugin.options['usesocketfile']) == str(True) )
-					tqt.TQObject.connect(sockfilebtn, tqt.SIGNAL("clicked()"), self.sockfileClicked)
+					tqt.TQObject.connect(sockfilebtn, tqt.TQ_SIGNAL("clicked()"), self.sockfileClicked)
 					self.sockfilebox.setStretchFactor(self.sockfileedit,1)
 					sockbox.setStretchFactor(self.sockfilebox,1)
 
@@ -372,7 +372,7 @@ class CopyCenterPlugin:
 				self.tableedit = tqt.TQLineEdit(self.plugin.options['table'],self)
 				self.tablebtn = tqt.TQPushButton("...",self)
 				self.tablebtn.setEnabled(False)
-				tqt.TQObject.connect(self.tablebtn, tqt.SIGNAL("clicked()"), self.buttonClicked)
+				tqt.TQObject.connect(self.tablebtn, tqt.TQ_SIGNAL("clicked()"), self.buttonClicked)
 				tablelabel.setBuddy(self.tableedit)
 				self.setStretchFactor(self.tableedit,1)
 			def buttonClicked(self):
@@ -392,8 +392,8 @@ class CopyCenterPlugin:
 							if table == text:
 								self.listview.setSelected(item,True)
 								self.listview.ensureItemVisible(item)
-						tqt.TQObject.connect(self.listview, tqt.SIGNAL("doubleClicked(TQListViewItem*, const TQPoint&, int)"), self.okClicked)
-						tqt.TQObject.connect(self.okbtn, tqt.SIGNAL("clicked()"), self.okClicked)
+						tqt.TQObject.connect(self.listview, tqt.TQ_SIGNAL("doubleClicked(TQListViewItem*, const TQPoint&, int)"), self.okClicked)
+						tqt.TQObject.connect(self.okbtn, tqt.TQ_SIGNAL("clicked()"), self.okClicked)
 					def okClicked(self):
 						item = self.listview.selectedItem()
 						if item == None:
@@ -416,7 +416,7 @@ class CopyCenterPlugin:
 				fieldslabel.setBuddy(self.fieldsedit)
 				self.fieldsbtn = tqt.TQPushButton("...",self)
 				self.fieldsbtn.setEnabled(False)
-				tqt.TQObject.connect(self.fieldsbtn, tqt.SIGNAL("clicked()"), self.fieldsClicked)
+				tqt.TQObject.connect(self.fieldsbtn, tqt.TQ_SIGNAL("clicked()"), self.fieldsClicked)
 			def fieldsClicked(self):
 				ListViewDialog = self.copycenterplugin.dialog.ListViewDialog
 				class FieldsDialog(ListViewDialog):
@@ -441,7 +441,7 @@ class CopyCenterPlugin:
 							item = self.addItem(( field.name(),field.type(),",".join(opts) ),item)
 							if allfields or field.name() in fieldslist:
 								self.listview.setSelected(item,True)
-						tqt.TQObject.connect(self.okbtn, tqt.SIGNAL("clicked()"), self.okClicked)
+						tqt.TQObject.connect(self.okbtn, tqt.TQ_SIGNAL("clicked()"), self.okClicked)
 					def okClicked(self):
 						selitems = []
 						item = self.listview.firstChild()
@@ -477,15 +477,15 @@ class CopyCenterPlugin:
 				statusbar.setStretchFactor(tqt.TQWidget(statusbar),1)
 				self.connectbtn = tqt.TQPushButton("Connect",statusbar)
 				self.connectbtn.setEnabled(False)
-				tqt.TQObject.connect(self.connectbtn, tqt.SIGNAL("clicked()"),self.connectClicked)
+				tqt.TQObject.connect(self.connectbtn, tqt.TQ_SIGNAL("clicked()"),self.connectClicked)
 				self.disconnectbtn = tqt.TQPushButton("Disconnect",statusbar)
 				self.disconnectbtn.setEnabled(False)
-				tqt.TQObject.connect(self.disconnectbtn, tqt.SIGNAL("clicked()"),self.disconnectClicked)
+				tqt.TQObject.connect(self.disconnectbtn, tqt.TQ_SIGNAL("clicked()"),self.disconnectClicked)
 
 				#self.connectionbox = ConnectionBox(copycenterplugin,plugin,parent)
 				self.tablebox = TableBox(copycenterplugin,plugin,parent)
 				self.fieldbox = FieldBox(copycenterplugin,plugin,parent)
-				tqt.TQObject.connect(self.tablebox.tableedit, tqt.SIGNAL("textChanged(const TQString&)"), self.fieldbox.tableChanged)
+				tqt.TQObject.connect(self.tablebox.tableedit, tqt.TQ_SIGNAL("textChanged(const TQString&)"), self.fieldbox.tableChanged)
 
 				if self.plugin.options['project'] != '':
 					self.prjbox.prjcombo.setCurrentText(self.plugin.options['project'])
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
index 8f983eb5..9cb8ef93 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
@@ -234,8 +234,8 @@ class CopyCenterPlugin:
 					if table == text:
 						self.listview.setSelected(item,True)
 						self.listview.ensureItemVisible(item)
-				tqt.TQObject.connect(self.listview, tqt.SIGNAL("doubleClicked(TQListViewItem*, const TQPoint&, int)"), self.okClicked)
-				tqt.TQObject.connect(self.okbtn, tqt.SIGNAL("clicked()"), self.okClicked)
+				tqt.TQObject.connect(self.listview, tqt.TQ_SIGNAL("doubleClicked(TQListViewItem*, const TQPoint&, int)"), self.okClicked)
+				tqt.TQObject.connect(self.okbtn, tqt.TQ_SIGNAL("clicked()"), self.okClicked)
 			def okClicked(self):
 				item = self.listview.selectedItem()
 				if item == None:
@@ -267,7 +267,7 @@ class CopyCenterPlugin:
 						item = self.addItem((fieldinfo.name(), tqt.TQVariant.typeToName(fieldinfo.type()), opts),item)
 						if allfields or fieldinfo.name() in fieldslist:
 							self.listview.setSelected(item,True)
-				tqt.TQObject.connect(self.okbtn, tqt.SIGNAL("clicked()"), self.okClicked)
+				tqt.TQObject.connect(self.okbtn, tqt.TQ_SIGNAL("clicked()"), self.okClicked)
 			def okClicked(self):
 				selitems = []
 				item = self.listview.firstChild()
@@ -335,18 +335,18 @@ class CopyCenterPlugin:
 				statusbar.setSpacing(2)
 				statusbar.setStretchFactor(tqt.TQWidget(statusbar),1)
 				self.connectbtn = tqt.TQPushButton("Connect",statusbar)
-				tqt.TQObject.connect(self.connectbtn, tqt.SIGNAL("clicked()"),self.connectClicked)
+				tqt.TQObject.connect(self.connectbtn, tqt.TQ_SIGNAL("clicked()"),self.connectClicked)
 				self.disconnectbtn = tqt.TQPushButton("Disconnect",statusbar)
 				self.disconnectbtn.setEnabled(False)
-				tqt.TQObject.connect(self.disconnectbtn, tqt.SIGNAL("clicked()"),self.disconnectClicked)
+				tqt.TQObject.connect(self.disconnectbtn, tqt.TQ_SIGNAL("clicked()"),self.disconnectClicked)
 
 				tablebox = tqt.TQHBox(parent)
 				tablelabel = tqt.TQLabel("Table:",tablebox)
 				self.tableedit = tqt.TQLineEdit(self.plugin.options['table'],tablebox)
-				tqt.TQObject.connect(self.tableedit, tqt.SIGNAL("textChanged(const TQString&)"), self.tableEditChanged)
+				tqt.TQObject.connect(self.tableedit, tqt.TQ_SIGNAL("textChanged(const TQString&)"), self.tableEditChanged)
 				self.tablebtn = tqt.TQPushButton("...",tablebox)
 				self.tablebtn.setEnabled(False)
-				tqt.TQObject.connect(self.tablebtn, tqt.SIGNAL("clicked()"), self.tableBtnClicked)
+				tqt.TQObject.connect(self.tablebtn, tqt.TQ_SIGNAL("clicked()"), self.tableBtnClicked)
 				tablelabel.setBuddy(self.tableedit)
 				tablebox.setStretchFactor(self.tableedit,1)
 
@@ -355,7 +355,7 @@ class CopyCenterPlugin:
 				self.fieldedit = tqt.TQLineEdit(self.plugin.options['fields'],fieldbox)
 				self.fieldbtn = tqt.TQPushButton("...",fieldbox)
 				self.fieldbtn.setEnabled(False)
-				tqt.TQObject.connect(self.fieldbtn, tqt.SIGNAL("clicked()"), self.fieldBtnClicked)
+				tqt.TQObject.connect(self.fieldbtn, tqt.TQ_SIGNAL("clicked()"), self.fieldBtnClicked)
 				fieldlabel.setBuddy(self.fieldedit)
 				fieldbox.setStretchFactor(self.fieldedit,1)
 
@@ -381,7 +381,7 @@ class CopyCenterPlugin:
 							operationlabel.setBuddy(self.mainwidget.operationedit)
 							opbox.setStretchFactor(self.mainwidget.operationedit,1)
 							self.box = None
-							tqt.TQObject.connect(self.mainwidget.operationedit, tqt.SIGNAL("activated(int)"), self.operationActivated)
+							tqt.TQObject.connect(self.mainwidget.operationedit, tqt.TQ_SIGNAL("activated(int)"), self.operationActivated)
 							self.operationActivated()
 						def operationActivated(self, **args):
 							if self.box:
diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp
index f718efd0..c25bbc99 100644
--- a/kexi/plugins/tables/kexilookupcolumnpage.cpp
+++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp
@@ -152,14 +152,14 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
 	d->gotoRowSourceButton->setMinimumHeight(d->rowSourceLabel->minimumHeight());
 	TQToolTip::add(d->gotoRowSourceButton, i18n("Go to selected row source"));
 	hlyr->addWidget(d->gotoRowSourceButton);
-	connect(d->gotoRowSourceButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGotoSelectedRowSource()));
+	connect(d->gotoRowSourceButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGotoSelectedRowSource()));
 
 	d->clearRowSourceButton = new KexiSmallToolButton(contents, TQString(),
 		"clear_left", "clearRowSourceButton");
 	d->clearRowSourceButton->setMinimumHeight(d->rowSourceLabel->minimumHeight());
 	TQToolTip::add(d->clearRowSourceButton, i18n("Clear row source"));
 	hlyr->addWidget(d->clearRowSourceButton);
-	connect(d->clearRowSourceButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearRowSourceSelection()));
+	connect(d->clearRowSourceButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearRowSourceSelection()));
 
 	d->rowSourceCombo = new KexiDataSourceComboBox(contents, "rowSourceCombo");
 	d->rowSourceLabel->setBuddy(d->rowSourceCombo);
@@ -181,7 +181,7 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
 	d->clearBoundColumnButton->setMinimumHeight(d->boundColumnLabel->minimumHeight());
 	TQToolTip::add(d->clearBoundColumnButton, i18n("Clear bound column"));
 	hlyr->addWidget(d->clearBoundColumnButton);
-	connect(d->clearBoundColumnButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearBoundColumnSelection()));
+	connect(d->clearBoundColumnButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearBoundColumnSelection()));
 
 	d->boundColumnCombo = new KexiFieldComboBox(contents, "boundColumnCombo");
 	d->boundColumnLabel->setBuddy(d->boundColumnCombo);
@@ -203,7 +203,7 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
 	d->clearVisibleColumnButton->setMinimumHeight(d->visibleColumnLabel->minimumHeight());
 	TQToolTip::add(d->clearVisibleColumnButton, i18n("Clear visible column"));
 	hlyr->addWidget(d->clearVisibleColumnButton);
-	connect(d->clearVisibleColumnButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearVisibleColumnSelection()));
+	connect(d->clearVisibleColumnButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearVisibleColumnSelection()));
 
 	d->visibleColumnCombo = new KexiFieldComboBox(contents, "visibleColumnCombo");
 	d->visibleColumnLabel->setBuddy(d->visibleColumnCombo);
@@ -211,11 +211,11 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
 
 	vlyr->addStretch(1);
 
-	connect(d->rowSourceCombo, TQT_SIGNAL(textChanged(const TQString &)), 
-		this, TQT_SLOT(slotRowSourceTextChanged(const TQString &)));
-	connect(d->rowSourceCombo, TQT_SIGNAL(dataSourceChanged()), this, TQT_SLOT(slotRowSourceChanged()));
-	connect(d->boundColumnCombo, TQT_SIGNAL(selected()), this, TQT_SLOT(slotBoundColumnSelected()));
-	connect(d->visibleColumnCombo, TQT_SIGNAL(selected()), this, TQT_SLOT(slotVisibleColumnSelected()));
+	connect(d->rowSourceCombo, TQ_SIGNAL(textChanged(const TQString &)), 
+		this, TQ_SLOT(slotRowSourceTextChanged(const TQString &)));
+	connect(d->rowSourceCombo, TQ_SIGNAL(dataSourceChanged()), this, TQ_SLOT(slotRowSourceChanged()));
+	connect(d->boundColumnCombo, TQ_SIGNAL(selected()), this, TQ_SLOT(slotBoundColumnSelected()));
+	connect(d->visibleColumnCombo, TQ_SIGNAL(selected()), this, TQ_SLOT(slotVisibleColumnSelected()));
 
 	clearBoundColumnSelection();
 	clearVisibleColumnSelection();
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index d092bf89..c641c9cd 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -159,46 +159,46 @@ KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *pare
 
 	d->view->setSpreadSheetMode();
 
-	connect(d->data, TQT_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)),
-		this, TQT_SLOT(slotBeforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)));
-	connect(d->data, TQT_SIGNAL(rowUpdated(KexiTableItem*)),
-		this, TQT_SLOT(slotRowUpdated(KexiTableItem*)));
-	//connect(d->data, TQT_SIGNAL(aboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool)),
-	//	this, TQT_SLOT(slotAboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool)));
-	connect(d->data, TQT_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)),
-		this, TQT_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)));
+	connect(d->data, TQ_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)),
+		this, TQ_SLOT(slotBeforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)));
+	connect(d->data, TQ_SIGNAL(rowUpdated(KexiTableItem*)),
+		this, TQ_SLOT(slotRowUpdated(KexiTableItem*)));
+	//connect(d->data, TQ_SIGNAL(aboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool)),
+	//	this, TQ_SLOT(slotAboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool)));
+	connect(d->data, TQ_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)),
+		this, TQ_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)));
 
 	setMinimumSize(d->view->minimumSizeHint().width(), d->view->minimumSizeHint().height());
 	d->view->setFocus();
 
 	d->sets = new KexiDataAwarePropertySet( this, d->view );
-	connect(d->sets, TQT_SIGNAL(rowDeleted()), this, TQT_SLOT(updateActions()));
-	connect(d->sets, TQT_SIGNAL(rowInserted()), this, TQT_SLOT(slotRowInserted()));
+	connect(d->sets, TQ_SIGNAL(rowDeleted()), this, TQ_SLOT(updateActions()));
+	connect(d->sets, TQ_SIGNAL(rowInserted()), this, TQ_SLOT(slotRowInserted()));
 
 	d->contextMenuTitle = new TDEPopupTitle(d->view->contextMenu());
 	d->view->contextMenu()->insertItem(d->contextMenuTitle, -1, 0);
-	connect(d->view->contextMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShowContextMenu()));
+	connect(d->view->contextMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotAboutToShowContextMenu()));
 
-	plugSharedAction("tablepart_toggle_pkey", this, TQT_SLOT(slotTogglePrimaryKey()));
+	plugSharedAction("tablepart_toggle_pkey", this, TQ_SLOT(slotTogglePrimaryKey()));
 	d->action_toggle_pkey = static_cast<TDEToggleAction*>( sharedAction("tablepart_toggle_pkey") );
 	d->action_toggle_pkey->plug(d->view->contextMenu(), 1); //add at the beginning
 	d->view->contextMenu()->insertSeparator(2);
 	setAvailable("tablepart_toggle_pkey", !conn->isReadOnly());
 
 #ifndef KEXI_NO_UNDOREDO_ALTERTABLE
-	plugSharedAction("edit_undo", this, TQT_SLOT(slotUndo()));
-	plugSharedAction("edit_redo", this, TQT_SLOT(slotRedo()));
+	plugSharedAction("edit_undo", this, TQ_SLOT(slotUndo()));
+	plugSharedAction("edit_redo", this, TQ_SLOT(slotRedo()));
 	setAvailable("edit_undo", false);
 	setAvailable("edit_redo", false);
-	connect(d->history, TQT_SIGNAL(commandExecuted(KCommand*)), this, TQT_SLOT(slotCommandExecuted(KCommand*)));
+	connect(d->history, TQ_SIGNAL(commandExecuted(KCommand*)), this, TQ_SLOT(slotCommandExecuted(KCommand*)));
 #endif
 
 #ifdef KEXI_DEBUG_GUI
 	KexiUtils::addAlterTableActionDebug(TQString()); //to create the tab
 	KexiUtils::connectPushButtonActionForDebugWindow( 
-		"simulateAlterTableExecution", this, TQT_SLOT(slotSimulateAlterTableExecution()));
+		"simulateAlterTableExecution", this, TQ_SLOT(slotSimulateAlterTableExecution()));
 	KexiUtils::connectPushButtonActionForDebugWindow( 
-		"executeRealAlterTable", this, TQT_SLOT(executeRealAlterTable()));
+		"executeRealAlterTable", this, TQ_SLOT(executeRealAlterTable()));
 #endif
 }
 
@@ -308,8 +308,8 @@ KexiTableDesignerView::createPropertySet( int row, const KexiDB::Field& field, b
 	KoProperty::Set *set = new KoProperty::Set(d->sets, typeName);
 	if (mainWin()->project()->dbConnection()->isReadOnly())
 		set->setReadOnly( true );
-//	connect(buff,TQT_SIGNAL(propertyChanged(KexiPropertyBuffer&,KexiProperty&)),
-//		this, TQT_SLOT(slotPropertyChanged(KexiPropertyBuffer&,KexiProperty&)));
+//	connect(buff,TQ_SIGNAL(propertyChanged(KexiPropertyBuffer&,KexiProperty&)),
+//		this, TQ_SLOT(slotPropertyChanged(KexiPropertyBuffer&,KexiProperty&)));
 
 	KoProperty::Property *prop;
 
@@ -456,8 +456,8 @@ KexiTableDesignerView::createPropertySet( int row, const KexiDB::Field& field, b
 	//----
 	d->updatePropertiesVisibility(field.type(), *set);
 
-	connect(set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)),
-		this, TQT_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&)));
+	connect(set, TQ_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)),
+		this, TQ_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&)));
 
 	d->sets->insert(row, set, newOne);
 	return set;
@@ -1556,7 +1556,7 @@ void KexiTableDesignerView::slotSimulateAlterTableExecution()
 tristate KexiTableDesignerView::executeRealAlterTable()
 {
 	TQSignal signal;
-	signal.connect( mainWin(), TQT_SLOT(slotProjectSave()) );
+	signal.connect( mainWin(), TQ_SLOT(slotProjectSave()) );
 	d->tempStoreDataUsingRealAlterTable = true;
 	d->recentResultOfStoreData = false;
 	signal.activate(); //will call KexiMainWindowImpl::slotProjectSaveAs() and thus storeData()
diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp
index e1c3cd22..d709da33 100644
--- a/kexi/plugins/tables/kexitablepart.cpp
+++ b/kexi/plugins/tables/kexitablepart.cpp
@@ -222,18 +222,18 @@ void KexiTablePart::setupCustomPropertyPanelTabs(KTabWidget *tab, KexiMainWindow
 {
 	if (!d->lookupColumnPage) {
 		d->lookupColumnPage = new KexiLookupColumnPage(0);
-		connect(d->lookupColumnPage, TQT_SIGNAL(jumpToObjectRequested(const TQCString&, const TQCString&)),
-			mainWin, TQT_SLOT(highlightObject(const TQCString&, const TQCString&)));
+		connect(d->lookupColumnPage, TQ_SIGNAL(jumpToObjectRequested(const TQCString&, const TQCString&)),
+			mainWin, TQ_SLOT(highlightObject(const TQCString&, const TQCString&)));
 
 //! @todo add "Table" tab
 
 	/*
-		connect(d->dataSourcePage, TQT_SIGNAL(formDataSourceChanged(const TQCString&, const TQCString&)),
-			KFormDesigner::FormManager::self(), TQT_SLOT(setFormDataSource(const TQCString&, const TQCString&)));
-		connect(d->dataSourcePage, TQT_SIGNAL(dataSourceFieldOrExpressionChanged(const TQString&, const TQString&, KexiDB::Field::Type)),
-			KFormDesigner::FormManager::self(), TQT_SLOT(setDataSourceFieldOrExpression(const TQString&, const TQString&, KexiDB::Field::Type)));
-		connect(d->dataSourcePage, TQT_SIGNAL(insertAutoFields(const TQString&, const TQString&, const TQStringList&)),
-			KFormDesigner::FormManager::self(), TQT_SLOT(insertAutoFields(const TQString&, const TQString&, const TQStringList&)));*/
+		connect(d->dataSourcePage, TQ_SIGNAL(formDataSourceChanged(const TQCString&, const TQCString&)),
+			KFormDesigner::FormManager::self(), TQ_SLOT(setFormDataSource(const TQCString&, const TQCString&)));
+		connect(d->dataSourcePage, TQ_SIGNAL(dataSourceFieldOrExpressionChanged(const TQString&, const TQString&, KexiDB::Field::Type)),
+			KFormDesigner::FormManager::self(), TQ_SLOT(setDataSourceFieldOrExpression(const TQString&, const TQString&, KexiDB::Field::Type)));
+		connect(d->dataSourcePage, TQ_SIGNAL(insertAutoFields(const TQString&, const TQString&, const TQStringList&)),
+			KFormDesigner::FormManager::self(), TQ_SLOT(insertAutoFields(const TQString&, const TQString&, const TQStringList&)));*/
 	}
 
 	KexiProject *prj = mainWin->project();
diff --git a/kexi/tests/altertable/altertable.cpp b/kexi/tests/altertable/altertable.cpp
index 39e8e684..8aea3dd9 100644
--- a/kexi/tests/altertable/altertable.cpp
+++ b/kexi/tests/altertable/altertable.cpp
@@ -220,8 +220,8 @@ AlterTableTester::AlterTableTester()
 	TQPtrList<TQNetworkOperation> list = m_copyOperator.copy( 
 		"file://" + TQDir::current().path() + "/" + origDbFilename, 
 		"file://" + TQDir::current().path() + "/" + dbFilename, false, false );
-	connect(&m_copyOperator, TQT_SIGNAL(finished(TQNetworkOperation*)), 
-		this, TQT_SLOT(slotFinishedCopying(TQNetworkOperation*)));
+	connect(&m_copyOperator, TQ_SIGNAL(finished(TQNetworkOperation*)), 
+		this, TQ_SLOT(slotFinishedCopying(TQNetworkOperation*)));
 }
 
 AlterTableTester::~AlterTableTester()
@@ -698,7 +698,7 @@ int main(int argc, char *argv[])
 
 	win = KexiMainWindowImpl::self();
 	AlterTableTester tester;
-	//TQObject::connect(win, TQT_SIGNAL(projectOpened()), &tester, TQT_SLOT(run()));
+	//TQObject::connect(win, TQ_SIGNAL(projectOpened()), &tester, TQ_SLOT(run()));
 
 	bool closeAppRequested;
 	res = tester.run(closeAppRequested);
diff --git a/kexi/tests/widgets/kexidbdrivercombotest.cpp b/kexi/tests/widgets/kexidbdrivercombotest.cpp
index 88de40e8..86e12732 100644
--- a/kexi/tests/widgets/kexidbdrivercombotest.cpp
+++ b/kexi/tests/widgets/kexidbdrivercombotest.cpp
@@ -67,7 +67,7 @@ int main(int argc, char** argv)
   vbLayout->addWidget(quit);
 
   // Show the whole lot
-  TQObject::connect(quit, TQT_SIGNAL(clicked()), app, TQT_SLOT(quit()));
+  TQObject::connect(quit, TQ_SIGNAL(clicked()), app, TQ_SLOT(quit()));
   vbox->show();
   app->exec();
 
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index 6a17bc94..44b957af 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -91,7 +91,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
 	lyr->addWidget(m_list);
 	m_list->installEventFilter(this);
 	m_list->renameLineEdit()->installEventFilter(this);
-	connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
+	connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
 	slotSettingsChanged(0);
 
 	m_list->header()->hide();
@@ -103,28 +103,28 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
 	m_list->setTooltipColumn(0);
 	m_list->renameLineEdit()->setValidator( new KexiUtils::IdentifierValidator(this) );
 	m_list->setResizeMode(TQListView::LastColumn);
-	connect(m_list, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)),
-		this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem *, const TQPoint&)));
-	connect(m_list, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this,
-		TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
+	connect(m_list, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)),
+		this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem *, const TQPoint&)));
+	connect(m_list, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this,
+		TQ_SLOT(slotSelectionChanged(TQListViewItem*)));
 	
 	TDEConfig *config = kapp->config();
 	config->setGroup("MainWindow");
 	if ((m_features & SingleClickOpensItemOptionEnabled) 
 		&& config->readBoolEntry("SingleClickOpensItem", false))
 	{
-		connect(m_list, TQT_SIGNAL(executed(TQListViewItem*)), this,
-			TQT_SLOT(slotExecuteItem(TQListViewItem*)));
+		connect(m_list, TQ_SIGNAL(executed(TQListViewItem*)), this,
+			TQ_SLOT(slotExecuteItem(TQListViewItem*)));
 	}
 	else {
-		connect(m_list, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this,
-			TQT_SLOT(slotExecuteItem(TQListViewItem*)));
+		connect(m_list, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this,
+			TQ_SLOT(slotExecuteItem(TQListViewItem*)));
 		m_list->enableExecuteArea = false;
 	}
 
 	// actions
 	m_openAction = new TDEAction(i18n("&Open"), "document-open", 0/*TQt::Key_Enter conflict!*/, this, 
-		TQT_SLOT(slotOpenObject()), this, "open_object");
+		TQ_SLOT(slotOpenObject()), this, "open_object");
 	m_openAction->setToolTip(i18n("Open object"));
 	m_openAction->setWhatsThis(i18n("Opens object selected in the list"));
 
@@ -146,20 +146,20 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
 	}
 	else {
 		m_deleteAction = new TDEAction(i18n("&Delete"), "edit-delete", 0/*TQt::Key_Delete*/, 
-			this, TQT_SLOT(slotRemove()), m_actions, "edit_delete");
+			this, TQ_SLOT(slotRemove()), m_actions, "edit_delete");
 	//! @todo 1.1: just add "Delete" tooltip and what's this
 		m_deleteAction->setToolTip(i18n("&Delete").replace("&",""));
 
 		m_renameAction = new TDEAction(i18n("&Rename"), "", 0, 
-			this, TQT_SLOT(slotRename()), m_actions, "edit_rename");
+			this, TQ_SLOT(slotRename()), m_actions, "edit_rename");
 #ifdef KEXI_SHOW_UNIMPLEMENTED
-		//todo	plugSharedAction("edit_cut",TQT_SLOT(slotCut()));
-		//todo	plugSharedAction("edit_copy",TQT_SLOT(slotCopy()));
-		//todo	plugSharedAction("edit_paste",TQT_SLOT(slotPaste()));
+		//todo	plugSharedAction("edit_cut",TQ_SLOT(slotCut()));
+		//todo	plugSharedAction("edit_copy",TQ_SLOT(slotCopy()));
+		//todo	plugSharedAction("edit_paste",TQ_SLOT(slotPaste()));
 #endif
 
 		m_designAction = new TDEAction(i18n("&Design"), "edit", 0/*TQt::CTRL + TQt::Key_Enter conflict!*/, this, 
-			TQT_SLOT(slotDesignObject()), this, "design_object");
+			TQ_SLOT(slotDesignObject()), this, "design_object");
 		m_designAction->setToolTip(i18n("Design object"));
 		m_designAction->setWhatsThis(i18n("Starts designing of the object selected in the list"));
 		if (m_features & Toolbar) {
@@ -168,20 +168,20 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
 		}
 
 		m_editTextAction = new TDEAction(i18n("Open in &Text View"), "", 0, this, 
-			TQT_SLOT(slotEditTextObject()), this, "editText_object");
+			TQ_SLOT(slotEditTextObject()), this, "editText_object");
 		m_editTextAction->setToolTip(i18n("Open object in text view"));
 		m_editTextAction->setWhatsThis(i18n("Opens selected object in the list in text view"));
 
-		m_newObjectAction = new TDEAction("", "document-new", 0, this, TQT_SLOT(slotNewObject()), this, "new_object");
+		m_newObjectAction = new TDEAction("", "document-new", 0, this, TQ_SLOT(slotNewObject()), this, "new_object");
 		if (m_features & Toolbar) {
 			m_newObjectToolButton = new KexiSmallToolButton(this, "", TQIconSet(), "new_object");
 			m_newObjectPopup = new TDEPopupMenu(this, "newObjectPopup");
-			connect(m_newObjectPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotNewObjectPopupAboutToShow()));
+			connect(m_newObjectPopup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotNewObjectPopupAboutToShow()));
 		//	KexiPart::Part* part = Kexi::partManager().part("kexi/table");
 		//	m_newObjectPopup->insertItem( SmallIconSet(part->info()->createItemIcon()), part->instanceName() );
 			m_newObjectToolButton->setPopup(m_newObjectPopup);
 			m_newObjectToolButton->setPopupDelay(TQApplication::startDragTime());
-			connect(m_newObjectToolButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewObject()));
+			connect(m_newObjectToolButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewObject()));
 			buttons_flyr->add(m_newObjectToolButton);
 
 			m_deleteObjectToolButton = new KexiSmallToolButton(this, m_deleteAction);
@@ -191,21 +191,21 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
 	}
 
 	m_executeAction = new TDEAction(i18n("Execute"), "media-playback-start", 0, this,
-		TQT_SLOT(slotExecuteObject()), this, "data_execute");
+		TQ_SLOT(slotExecuteObject()), this, "data_execute");
 
 	m_exportActionMenu = new TDEActionMenu(i18n("Export"));
 	m_dataExportAction = new TDEAction(i18n("Export->To File as Data &Table... ", "To &File as Data Table..."), 
-		"table", 0, this, TQT_SLOT(slotExportAsDataTable()), this, "exportAsDataTable");
+		"table", 0, this, TQ_SLOT(slotExportAsDataTable()), this, "exportAsDataTable");
 	m_dataExportAction->setWhatsThis(
 		i18n("Exports data from the currently selected table or query data to a file."));
 	m_exportActionMenu->insert( m_dataExportAction );
 
 	m_printAction = new TDEAction(i18n("&Print..."), "document-print", 0, this, 
-		TQT_SLOT(slotPrintItem()), this, "printItem");
+		TQ_SLOT(slotPrintItem()), this, "printItem");
 	m_printAction->setWhatsThis(
 		i18n("Prints data from the currently selected table or query."));
 	m_pageSetupAction = new TDEAction(i18n("Page Setup..."), "", 0, this, 
-		TQT_SLOT(slotPageSetupForItem()), this, "pageSetupForItem");
+		TQ_SLOT(slotPageSetupForItem()), this, "pageSetupForItem");
 	m_pageSetupAction->setWhatsThis(
 		i18n("Shows page setup for printing the active table or query."));
 
diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp
index 6c61009b..893a9103 100644
--- a/kexi/widget/kexidataawareview.cpp
+++ b/kexi/widget/kexidataawareview.cpp
@@ -45,15 +45,15 @@ void KexiDataAwareView::init( TQWidget* viewWidget, KexiSharedActionClient* acti
 	setViewWidget(m_internalView, true);
 
 	if (!noDataAware) {
-		m_dataAwareObject->connectCellSelectedSignal(this, TQT_SLOT(slotCellSelected(int,int)));
+		m_dataAwareObject->connectCellSelectedSignal(this, TQ_SLOT(slotCellSelected(int,int)));
 
 		//! before closing - we'are accepting editing
-		connect(this, TQT_SIGNAL(closing(bool&)), this, TQT_SLOT(slotClosing(bool&)));
+		connect(this, TQ_SIGNAL(closing(bool&)), this, TQ_SLOT(slotClosing(bool&)));
 
 		//! updating actions on start/stop editing
-		m_dataAwareObject->connectRowEditStartedSignal(this, TQT_SLOT(slotUpdateRowActions(int)));
-		m_dataAwareObject->connectRowEditTerminatedSignal(this, TQT_SLOT(slotUpdateRowActions(int)));
-		m_dataAwareObject->connectReloadActionsSignal(this, TQT_SLOT(reloadActions()));
+		m_dataAwareObject->connectRowEditStartedSignal(this, TQ_SLOT(slotUpdateRowActions(int)));
+		m_dataAwareObject->connectRowEditTerminatedSignal(this, TQ_SLOT(slotUpdateRowActions(int)));
+		m_dataAwareObject->connectReloadActionsSignal(this, TQ_SLOT(reloadActions()));
 	}
 
 	TQVBoxLayout *box = new TQVBoxLayout(this);
@@ -72,37 +72,37 @@ void KexiDataAwareView::init( TQWidget* viewWidget, KexiSharedActionClient* acti
 
 void KexiDataAwareView::initActions()
 {
-	plugSharedAction("edit_delete_row", this, TQT_SLOT(deleteCurrentRow()));
+	plugSharedAction("edit_delete_row", this, TQ_SLOT(deleteCurrentRow()));
 	m_actionClient->plugSharedAction(sharedAction("edit_delete_row")); //for proper shortcut
 
-	plugSharedAction("edit_delete", this, TQT_SLOT(deleteAndStartEditCurrentCell()));
+	plugSharedAction("edit_delete", this, TQ_SLOT(deleteAndStartEditCurrentCell()));
 	m_actionClient->plugSharedAction(sharedAction("edit_delete")); //for proper shortcut
 
-	plugSharedAction("edit_edititem", this, TQT_SLOT(startEditOrToggleValue()));
+	plugSharedAction("edit_edititem", this, TQ_SLOT(startEditOrToggleValue()));
 	m_actionClient->plugSharedAction(sharedAction("edit_edititem")); //for proper shortcut
 
-	plugSharedAction("data_save_row", this, TQT_SLOT(acceptRowEdit()));
+	plugSharedAction("data_save_row", this, TQ_SLOT(acceptRowEdit()));
 	m_actionClient->plugSharedAction(sharedAction("data_save_row")); //for proper shortcut
 
-	plugSharedAction("data_cancel_row_changes", this, TQT_SLOT(cancelRowEdit()));
+	plugSharedAction("data_cancel_row_changes", this, TQ_SLOT(cancelRowEdit()));
 	m_actionClient->plugSharedAction(sharedAction("data_cancel_row_changes")); //for proper shortcut
 
 	if (m_dataAwareObject->isSortingEnabled()) {
-		plugSharedAction("data_sort_az", this, TQT_SLOT(sortAscending()));
-		plugSharedAction("data_sort_za", this, TQT_SLOT(sortDescending()));
+		plugSharedAction("data_sort_az", this, TQ_SLOT(sortAscending()));
+		plugSharedAction("data_sort_za", this, TQ_SLOT(sortDescending()));
 	}
 
 	m_actionClient->plugSharedAction(sharedAction("edit_insert_empty_row")); //for proper shortcut
 
 	setAvailable("data_sort_az", m_dataAwareObject->isSortingEnabled());
 	setAvailable("data_sort_za", m_dataAwareObject->isSortingEnabled());
-//! \todo 	plugSharedAction("data_filter", this, TQT_SLOT(???()));
+//! \todo 	plugSharedAction("data_filter", this, TQ_SLOT(???()));
 
-	plugSharedAction("data_go_to_first_record", this, TQT_SLOT(slotGoToFirstRow()));
-	plugSharedAction("data_go_to_previous_record", this, TQT_SLOT(slotGoToPreviusRow()));
-	plugSharedAction("data_go_to_next_record", this, TQT_SLOT(slotGoToNextRow()));
-	plugSharedAction("data_go_to_last_record", this, TQT_SLOT(slotGoToLastRow()));
-	plugSharedAction("data_go_to_new_record", this, TQT_SLOT(slotGoToNewRow()));
+	plugSharedAction("data_go_to_first_record", this, TQ_SLOT(slotGoToFirstRow()));
+	plugSharedAction("data_go_to_previous_record", this, TQ_SLOT(slotGoToPreviusRow()));
+	plugSharedAction("data_go_to_next_record", this, TQ_SLOT(slotGoToNextRow()));
+	plugSharedAction("data_go_to_last_record", this, TQ_SLOT(slotGoToLastRow()));
+	plugSharedAction("data_go_to_new_record", this, TQ_SLOT(slotGoToNewRow()));
 
 //! \todo update availability
 	setAvailable("data_go_to_first_record", true);
@@ -111,25 +111,25 @@ void KexiDataAwareView::initActions()
 	setAvailable("data_go_to_last_record", true);
 	setAvailable("data_go_to_new_record", true);
 
-	plugSharedAction("edit_copy", this, TQT_SLOT(copySelection()));
+	plugSharedAction("edit_copy", this, TQ_SLOT(copySelection()));
 	m_actionClient->plugSharedAction(sharedAction("edit_copy")); //for proper shortcut
 
-	plugSharedAction("edit_cut", this, TQT_SLOT(cutSelection()));
+	plugSharedAction("edit_cut", this, TQ_SLOT(cutSelection()));
 	m_actionClient->plugSharedAction(sharedAction("edit_cut")); //for proper shortcut
 
-	plugSharedAction("edit_paste", this, TQT_SLOT(paste()));
+	plugSharedAction("edit_paste", this, TQ_SLOT(paste()));
 	m_actionClient->plugSharedAction(sharedAction("edit_paste")); //for proper shortcut
 
-//	plugSharedAction("edit_find", this, TQT_SLOT(editFind()));
+//	plugSharedAction("edit_find", this, TQ_SLOT(editFind()));
 //	m_actionClient->plugSharedAction(sharedAction("edit_find")); //for proper shortcut
 
-//	plugSharedAction("edit_findnext", this, TQT_SLOT(editFindNext()));
+//	plugSharedAction("edit_findnext", this, TQ_SLOT(editFindNext()));
 //	m_actionClient->plugSharedAction(sharedAction("edit_findnext")); //for proper shortcut
 
-//	plugSharedAction("edit_findprevious", this, TQT_SLOT(editFindPrevious()));
+//	plugSharedAction("edit_findprevious", this, TQ_SLOT(editFindPrevious()));
 //	m_actionClient->plugSharedAction(sharedAction("edit_findprev")); //for proper shortcut
 
-//! @todo	plugSharedAction("edit_replace", this, TQT_SLOT(editReplace()));
+//! @todo	plugSharedAction("edit_replace", this, TQ_SLOT(editReplace()));
 //! @todo	m_actionClient->plugSharedAction(sharedAction("edit_replace")); //for proper shortcut
 
 //	setAvailable("edit_find", true);
@@ -188,7 +188,7 @@ void KexiDataAwareView::reloadActions()
 //warning FIXME Move this to the table part
 /*
 	kdDebug()<<"INIT ACTIONS***********************************************************************"<<endl;
-	new TDEAction(i18n("Filter"), "filter", 0, this, TQT_SLOT(filter()), actionCollection(), "tablepart_filter");
+	new TDEAction(i18n("Filter"), "filter", 0, this, TQ_SLOT(filter()), actionCollection(), "tablepart_filter");
 	setXMLFile("kexidatatableui.rc");
 */
 	m_dataAwareObject->contextMenu()->clear();
@@ -200,11 +200,11 @@ void KexiDataAwareView::reloadActions()
 	bool separatorNeeded = true;
 
 	unplugSharedAction("edit_clear_table");
-	plugSharedAction("edit_clear_table", this, TQT_SLOT(deleteAllRows()));
+	plugSharedAction("edit_clear_table", this, TQ_SLOT(deleteAllRows()));
 
 	if (m_dataAwareObject->isEmptyRowInsertingEnabled()) {
 		unplugSharedAction("edit_insert_empty_row");
-		plugSharedAction("edit_insert_empty_row", m_internalView, TQT_SLOT(insertEmptyRow()));
+		plugSharedAction("edit_insert_empty_row", m_internalView, TQ_SLOT(insertEmptyRow()));
 		if (separatorNeeded)
 			m_dataAwareObject->contextMenu()->insertSeparator();
 		plugSharedAction("edit_insert_empty_row", m_dataAwareObject->contextMenu());
diff --git a/kexi/widget/kexidatasourcecombobox.cpp b/kexi/widget/kexidatasourcecombobox.cpp
index 4299017d..dab210a9 100644
--- a/kexi/widget/kexidatasourcecombobox.cpp
+++ b/kexi/widget/kexidatasourcecombobox.cpp
@@ -76,8 +76,8 @@ KexiDataSourceComboBox::KexiDataSourceComboBox(TQWidget *parent, const char *nam
 	setInsertionPolicy(NoInsertion);
 	setCompletionMode(TDEGlobalSettings::CompletionPopupAuto);
 	setSizeLimit( 16 );
-	connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
-	connect(this, TQT_SIGNAL(returnPressed(const TQString &)), this, TQT_SLOT(slotReturnPressed(const TQString &)));
+	connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)));
+	connect(this, TQ_SIGNAL(returnPressed(const TQString &)), this, TQ_SLOT(slotReturnPressed(const TQString &)));
 
 	d->tableIcon = SmallIcon("table");
 	d->queryIcon = SmallIcon("query");
@@ -110,12 +110,12 @@ void KexiDataSourceComboBox::setProject(KexiProject *prj, bool showTables, bool
 		return;
 
 	//needed for updating contents of the combo box
-	connect(d->prj, TQT_SIGNAL(newItemStored(KexiPart::Item&)),
-		this, TQT_SLOT(slotNewItemStored(KexiPart::Item&)));
-	connect(d->prj, TQT_SIGNAL(itemRemoved(const KexiPart::Item&)),
-		this, TQT_SLOT(slotItemRemoved(const KexiPart::Item&)));
-	connect(d->prj, TQT_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)),
-		this, TQT_SLOT(slotItemRenamed(const KexiPart::Item&, const TQCString&)));
+	connect(d->prj, TQ_SIGNAL(newItemStored(KexiPart::Item&)),
+		this, TQ_SLOT(slotNewItemStored(KexiPart::Item&)));
+	connect(d->prj, TQ_SIGNAL(itemRemoved(const KexiPart::Item&)),
+		this, TQ_SLOT(slotItemRemoved(const KexiPart::Item&)));
+	connect(d->prj, TQ_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)),
+		this, TQ_SLOT(slotItemRenamed(const KexiPart::Item&, const TQCString&)));
 
 	KexiDB::Connection *conn = d->prj->dbConnection();
 	if (!conn)
diff --git a/kexi/widget/kexidbconnectionwidget.cpp b/kexi/widget/kexidbconnectionwidget.cpp
index c36df02f..f3a9f0ad 100644
--- a/kexi/widget/kexidbconnectionwidget.cpp
+++ b/kexi/widget/kexidbconnectionwidget.cpp
@@ -105,10 +105,10 @@ KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* parent,  const char* n
 	TQWidget::setTabOrder(d->btnSaveChanges, d->btnTestConnection);
 	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)) );
-	connect( btnLoadDBList, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(loadDBList()) );
-	connect( d->btnSaveChanges, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(saveChanges()) );
+	connect( locationBGrp, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotLocationBGrpClicked(int)) );
+	connect( chkPortDefault, TQ_SIGNAL(toggled(bool)), this , TQ_SLOT(slotCBToggled(bool)) );
+	connect( btnLoadDBList, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(loadDBList()) );
+	connect( d->btnSaveChanges, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(saveChanges()) );
 }
 
 KexiDBConnectionWidget::~KexiDBConnectionWidget()
@@ -237,7 +237,7 @@ KexiDBConnectionTabWidget::KexiDBConnectionTabWidget( TQWidget* parent, const ch
 	detailsWidget = new KexiDBConnectionWidgetDetailsBase(this, "detailsWidget");
 	addTab( detailsWidget, i18n("Details") );
 
-	connect( mainWidget->testConnectionButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(slotTestConnection()) );
+	connect( mainWidget->testConnectionButton(), TQ_SIGNAL(clicked()), this, TQ_SLOT(slotTestConnection()) );
 }
 
 KexiDBConnectionTabWidget::~KexiDBConnectionTabWidget()
@@ -372,10 +372,10 @@ KexiDBConnectionDialog::~KexiDBConnectionDialog()
 
 void KexiDBConnectionDialog::init()
 {
-	connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(accept()));
+	connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(accept()));
 	setMainWidget(tabWidget);
-	connect(tabWidget->mainWidget, TQT_SIGNAL(saveChanges()), this, TQT_SIGNAL(saveChanges()));
-	connect(tabWidget, TQT_SIGNAL(testConnection()), this, TQT_SIGNAL(testConnection()));
+	connect(tabWidget->mainWidget, TQ_SIGNAL(saveChanges()), this, TQ_SIGNAL(saveChanges()));
+	connect(tabWidget, TQ_SIGNAL(testConnection()), this, TQ_SIGNAL(testConnection()));
 
 	adjustSize();
 	resize(width(), tabWidget->height());
diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp
index 6f722f0e..fb78ca04 100644
--- a/kexi/widget/kexidswelcome.cpp
+++ b/kexi/widget/kexidswelcome.cpp
@@ -39,7 +39,7 @@ KexiDSWelcome::KexiDSWelcome(KexiDataSourceWizard *parent)
 	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->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)));
+	connect(useWizard, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setUseWizard(bool)));
 	useWizard->setChecked(true);
 
 	TQSpacerItem *spacer = new TQSpacerItem(320, 220);
diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp
index 01000882..ff598a05 100644
--- a/kexi/widget/kexieditor.cpp
+++ b/kexi/widget/kexieditor.cpp
@@ -54,13 +54,13 @@ public:
 		: KexiSharedActionConnector( proxy, obj )
 	{
 #ifdef KTEXTEDIT_BASED_SQL_EDITOR
-		plugSharedAction("edit_cut", TQT_SLOT(cut()));
-		plugSharedAction("edit_copy", TQT_SLOT(copy()));
-		plugSharedAction("edit_paste", TQT_SLOT(paste()));
-		plugSharedAction("edit_clear", TQT_SLOT(clear()));
-		plugSharedAction("edit_undo", TQT_SLOT(undo()));
-		plugSharedAction("edit_redo", TQT_SLOT(redo()));
-                plugSharedAction("edit_select_all", TQT_SLOT(selectAll()));
+		plugSharedAction("edit_cut", TQ_SLOT(cut()));
+		plugSharedAction("edit_copy", TQ_SLOT(copy()));
+		plugSharedAction("edit_paste", TQ_SLOT(paste()));
+		plugSharedAction("edit_clear", TQ_SLOT(clear()));
+		plugSharedAction("edit_undo", TQ_SLOT(undo()));
+		plugSharedAction("edit_redo", TQ_SLOT(redo()));
+                plugSharedAction("edit_select_all", TQ_SLOT(selectAll()));
 #else
 		TQValueList<TQCString> actions;
 		actions << "edit_cut" << "edit_copy" << "edit_paste" << "edit_clear"
@@ -89,7 +89,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na
 #ifdef KTEXTEDIT_BASED_SQL_EDITOR
 	d->view = new KTextEdit( "", TQString(), this, "kexi_editor" );
 	//adjust font
-	connect(d->view, TQT_SIGNAL(textChanged()), this, TQT_SIGNAL(textChanged()));
+	connect(d->view, TQ_SIGNAL(textChanged()), this, TQ_SIGNAL(textChanged()));
 	TQFont f("Courier");
 	f.setStyleStrategy(TQFont::PreferAntialias);
 	f.setPointSize(d->view->font().pointSize());
@@ -116,7 +116,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na
 			}
 	}
 
-	connect(d->doc, TQT_SIGNAL(textChanged()), this, TQT_SIGNAL(textChanged()));
+	connect(d->doc, TQ_SIGNAL(textChanged()), this, TQ_SIGNAL(textChanged()));
 #endif
 	KexiEditorSharedActionConnector c(this, d->view);
 	d->view->installEventFilter(this);
diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp
index 875425de..eb65fe22 100644
--- a/kexi/widget/kexifieldcombobox.cpp
+++ b/kexi/widget/kexifieldcombobox.cpp
@@ -77,8 +77,8 @@ KexiFieldComboBox::KexiFieldComboBox(TQWidget *parent, const char *name)
 	setInsertionPolicy(NoInsertion);
 	setCompletionMode(TDEGlobalSettings::CompletionPopupAuto);
 	setSizeLimit( 16 );
-	connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
-	connect(this, TQT_SIGNAL(returnPressed(const TQString &)), this, TQT_SLOT(slotReturnPressed(const TQString &)));
+	connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)));
+	connect(this, TQ_SIGNAL(returnPressed(const TQString &)), this, TQ_SLOT(slotReturnPressed(const TQString &)));
 
 //	setAcceptDrops(true);
 //	viewport()->setAcceptDrops(true);
diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp
index 348e9ee0..64d38a32 100644
--- a/kexi/widget/kexifieldlistview.cpp
+++ b/kexi/widget/kexifieldlistview.cpp
@@ -65,8 +65,8 @@ KexiFieldListView::KexiFieldListView(TQWidget *parent, const char *name, int opt
 	setSorting(-1, true); // disable sorting
 	setDragEnabled(true);
 	
-	connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint &, int)), 
-		this, TQT_SLOT(slotDoubleClicked(TQListViewItem*)));
+	connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint &, int)), 
+		this, TQ_SLOT(slotDoubleClicked(TQListViewItem*)));
 }
 
 KexiFieldListView::~KexiFieldListView()
diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp
index 6af497d1..35d5d0f3 100644
--- a/kexi/widget/kexipropertyeditorview.cpp
+++ b/kexi/widget/kexipropertyeditorview.cpp
@@ -134,8 +134,8 @@ KexiPropertyEditorView::KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget
 	d->objectInfoLabel->setBuddy(d->editor);
 	setFocusPolicy(TQWidget::WheelFocus);
 
-	connect(d->editor, TQT_SIGNAL(propertySetChanged(KoProperty::Set*)), 
-		this, TQT_SLOT(slotPropertySetChanged(KoProperty::Set*)));
+	connect(d->editor, TQ_SIGNAL(propertySetChanged(KoProperty::Set*)), 
+		this, TQ_SLOT(slotPropertySetChanged(KoProperty::Set*)));
 
 //	d->iconName = "dummy";
 	slotPropertySetChanged(0);
diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp
index ea456b21..c5f05032 100644
--- a/kexi/widget/kexiscrollview.cpp
+++ b/kexi/widget/kexiscrollview.cpp
@@ -73,7 +73,7 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview)
 	m_gridSize = 0;
 	m_outerAreaVisible = true;
 
-	connect(&m_delayedResize, TQT_SIGNAL(timeout()), this, TQT_SLOT(refreshContentsSize()));
+	connect(&m_delayedResize, TQ_SIGNAL(timeout()), this, TQ_SLOT(refreshContentsSize()));
 	m_smodeSet = false;
 	if (m_preview) {
 		refreshContentsSizeLater(true, true);
diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp
index 7ff39106..2ad8b428 100644
--- a/kexi/widget/kexisectionheader.cpp
+++ b/kexi/widget/kexisectionheader.cpp
@@ -85,7 +85,7 @@ void KexiSectionHeader::addButton(const TQString& icon, const TQString& toolTip,
 	btn->setFocusPolicy(TQWidget::NoFocus);
 	btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
 	if (receiver && member) {
-		connect(btn, TQT_SIGNAL(clicked()), receiver, member);
+		connect(btn, TQ_SIGNAL(clicked()), receiver, member);
 	}
 
 	if (!icon.isEmpty()) {
@@ -151,7 +151,7 @@ void KexiSectionHeader::BoxLayout::addItem( TQLayoutItem * item )
 		if (item->widget()->inherits("KexiViewBase")) {
 			view = static_cast<KexiViewBase*>(item->widget());
 			KexiSectionHeader *sh = static_cast<KexiSectionHeader*>(mainWidget());
-			connect(view,TQT_SIGNAL(focus(bool)),sh,TQT_SLOT(slotFocus(bool)));
+			connect(view,TQ_SIGNAL(focus(bool)),sh,TQ_SLOT(slotFocus(bool)));
 			sh->d->lbl->setBuddy(item->widget());
 		}
 	}
diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp
index e7d5c6b9..890d5549 100644
--- a/kexi/widget/kexismalltoolbutton.cpp
+++ b/kexi/widget/kexismalltoolbutton.cpp
@@ -49,8 +49,8 @@ KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, TDEAction* action)
  , m_action(action)
 {
 	init();
-	connect(this, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()));
-	connect(action, TQT_SIGNAL(enabled(bool)), this, TQT_SLOT(setEnabled(bool)));
+	connect(this, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()));
+	connect(action, TQ_SIGNAL(enabled(bool)), this, TQ_SLOT(setEnabled(bool)));
 	updateAction();
 }
 
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index 9248916c..d28759e9 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -176,7 +176,7 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent)
 	list << i18n("Small") << i18n("Medium") << i18n("Large") << i18n("Huge");
 	combo->insertStringList(list);
 	combo->setCurrentItem(2);
-	connect(combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeIconSize(int)));
+	connect(combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changeIconSize(int)));
 
 
 	// Icon chooser button
@@ -184,8 +184,8 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent)
 	m_button->setIcon("kexi");
 	m_button->setIconSize(TDEIcon::SizeMedium);
 	l->addMultiCellWidget(m_button, 0, 1, 2, 2);
-	connect(m_button, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(updateIconName(TQString)));
-	connect(m_nameInput, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(setIcon(const TQString &)));
+	connect(m_button, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(updateIconName(TQString)));
+	connect(m_nameInput, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(setIcon(const TQString &)));
 }
 
 void
@@ -246,21 +246,21 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW
 	newItemPath->setTextLabel(i18n("&Add File"), true);
 	vlayout->addWidget(newItemPath);
 	m_buttons.insert(BNewItemPath, newItemPath);
-	connect(newItemPath, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByPath()));
+	connect(newItemPath, TQ_SIGNAL(clicked()), this, TQ_SLOT(newItemByPath()));
 
 	TQToolButton *newItemName = new TQToolButton(frame);
 	newItemName->setIconSet(BarIconSet("icons"));
 	newItemName->setTextLabel(i18n("&Add an Icon"), true);
 	vlayout->addWidget(newItemName);
 	m_buttons.insert(BNewItemName, newItemName);
-	connect(newItemName, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByName()));
+	connect(newItemName, TQ_SIGNAL(clicked()), this, TQ_SLOT(newItemByName()));
 
 	TQToolButton *delItem = new TQToolButton(frame);
 	delItem->setIconSet(BarIconSet("edit_remove"));
 	delItem->setTextLabel(i18n("&Remove Selected Item"), true);
 	vlayout->addWidget(delItem);
 	m_buttons.insert(BDelItem, delItem);
-	connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem()));
+	connect(delItem, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeItem()));
 	vlayout->addStretch();
 
 	// Setup the iconView
@@ -270,8 +270,8 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW
 	m_iconView->setAutoArrange(true);
 	m_iconView->setMode(TDEIconView::Select);
 	l->addWidget(m_iconView);
-	connect(m_iconView, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQT_SLOT(displayMenu(TQIconViewItem*, const TQPoint&)));
-	connect(m_iconView, TQT_SIGNAL(itemRenamed(TQIconViewItem*, const TQString &)), this, TQT_SLOT(renameCollectionItem(TQIconViewItem*, const TQString&)));
+	connect(m_iconView, TQ_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQ_SLOT(displayMenu(TQIconViewItem*, const TQPoint&)));
+	connect(m_iconView, TQ_SIGNAL(itemRenamed(TQIconViewItem*, const TQString &)), this, TQ_SLOT(renameCollectionItem(TQIconViewItem*, const TQString&)));
 
 	PixmapMap::ConstIterator it;
 	PixmapMap::ConstIterator endIt = collection->m_pixmaps.end();
@@ -366,8 +366,8 @@ PixmapCollectionEditor::displayMenu(TQIconViewItem *it, const TQPoint &p)
 {
 	if(!it) return;
 	TDEPopupMenu *menu = new TDEPopupMenu();
-	menu->insertItem(SmallIconSet("edit"), i18n("Rename Item"), this, TQT_SLOT(renameItem()));
-	menu->insertItem(SmallIconSet("remove"), i18n("Remove Item"), this, TQT_SLOT(removeItem()));
+	menu->insertItem(SmallIconSet("edit"), i18n("Rename Item"), this, TQ_SLOT(renameItem()));
+	menu->insertItem(SmallIconSet("remove"), i18n("Remove Item"), this, TQ_SLOT(removeItem()));
 	menu->exec(p);
 }
 
diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp
index 81ce1382..150ab65f 100644
--- a/kexi/widget/relations/kexirelationview.cpp
+++ b/kexi/widget/relations/kexirelationview.cpp
@@ -55,7 +55,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name)
 	m_focusedTableView = 0;
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
 
-//	connect(relation, TQT_SIGNAL(relationListUpdated(TQObject *)), this, TQT_SLOT(slotListUpdate(TQObject *)));
+//	connect(relation, TQ_SIGNAL(relationListUpdated(TQObject *)), this, TQ_SLOT(slotListUpdate(TQObject *)));
 
 	viewport()->setPaletteBackgroundColor(colorGroup().mid());
 	setFocusPolicy(TQWidget::WheelFocus);
@@ -70,15 +70,15 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name)
 	
 	plugSharedAction("edit_delete", i18n("Hide Table"), m_tableQueryPopup);
 	plugSharedAction("edit_delete",m_connectionPopup);
-	plugSharedAction("edit_delete",this, TQT_SLOT(removeSelectedObject()));
+	plugSharedAction("edit_delete",this, TQ_SLOT(removeSelectedObject()));
 */	
 #if 0
 	m_removeSelectedTableQueryAction = new TDEAction(i18n("&Hide Selected Table/Query"), "edit-delete", "",
-		this, TQT_SLOT(removeSelectedTableQuery()), parent->actionCollection(), "relationsview_removeSelectedTableQuery");
+		this, TQ_SLOT(removeSelectedTableQuery()), parent->actionCollection(), "relationsview_removeSelectedTableQuery");
 	m_removeSelectedConnectionAction = new TDEAction(i18n("&Remove Selected Relationship"), "button_cancel", "",
-		this, TQT_SLOT(removeSelectedConnection()), parent->actionCollection(), "relationsview_removeSelectedConnection");
+		this, TQ_SLOT(removeSelectedConnection()), parent->actionCollection(), "relationsview_removeSelectedConnection");
 	m_openSelectedTableQueryAction = new TDEAction(i18n("&Open Selected Table/Query"), "", "",
-		this, TQT_SLOT(openSelectedTableQuery()), 0/*parent->actionCollection()*/, "relationsview_openSelectedTableQuery");
+		this, TQ_SLOT(openSelectedTableQuery()), 0/*parent->actionCollection()*/, "relationsview_openSelectedTableQuery");
 #endif
 
 //	invalidateActions();
@@ -137,12 +137,12 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect)
 /*! @todo what about query? */
 		new KexiDB::TableOrQuerySchema(t)
 	);
-	connect(c, TQT_SIGNAL(endDrag()), this, TQT_SLOT(slotTableViewEndDrag()));
-	connect(c, TQT_SIGNAL(gotFocus()), this, TQT_SLOT(slotTableViewGotFocus()));
-//	connect(c, TQT_SIGNAL(headerContextMenuRequest(const TQPoint&)), 
-//		this, TQT_SLOT(tableHeaderContextMenuRequest(const TQPoint&)));
-	connect(c, TQT_SIGNAL(contextMenuRequest(const TQPoint&)), 
-		this, TQT_SIGNAL(tableContextMenuRequest(const TQPoint&)));
+	connect(c, TQ_SIGNAL(endDrag()), this, TQ_SLOT(slotTableViewEndDrag()));
+	connect(c, TQ_SIGNAL(gotFocus()), this, TQ_SLOT(slotTableViewGotFocus()));
+//	connect(c, TQ_SIGNAL(headerContextMenuRequest(const TQPoint&)), 
+//		this, TQ_SLOT(tableHeaderContextMenuRequest(const TQPoint&)));
+	connect(c, TQ_SIGNAL(contextMenuRequest(const TQPoint&)), 
+		this, TQ_SIGNAL(tableContextMenuRequest(const TQPoint&)));
 	
 	addChild(c, 100,100);
 	if (rect.isValid()) {//predefined size
@@ -195,8 +195,8 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect)
 
 	m_tables.insert(t->name(), c);
 
-	connect(c, TQT_SIGNAL(moved(KexiRelationViewTableContainer *)), this,
-            TQT_SLOT(containerMoved(KexiRelationViewTableContainer *)));
+	connect(c, TQ_SIGNAL(moved(KexiRelationViewTableContainer *)), this,
+            TQ_SLOT(containerMoved(KexiRelationViewTableContainer *)));
 	
 	if (hasFocus()) //ok?
 		c->setFocus();
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index 7053c778..7c28d463 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -63,8 +63,8 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer(
 	m_tableHeader->unsetFocus();
 	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()));
+	connect(m_tableHeader,TQ_SIGNAL(moved()),this,TQ_SLOT(moved()));
+	connect(m_tableHeader, TQ_SIGNAL(endDrag()), this, TQ_SIGNAL(endDrag()));
 
 	m_tableView = new KexiRelationViewTable(schema, parent, this, "KexiRelationViewTable");
 	//m_tableHeader->setFocusProxy( m_tableView );
@@ -74,9 +74,9 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer(
 	
 //	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(TDEListView*, TQListViewItem*, const TQPoint&)),
-		this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+	connect(m_tableView, TQ_SIGNAL(tableScrolling()), this, TQ_SLOT(moved()));
+	connect(m_tableView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+		this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
 }
 
 KexiRelationViewTableContainer::~KexiRelationViewTableContainer()
@@ -299,8 +299,8 @@ KexiRelationViewTable::KexiRelationViewTable(KexiDB::TableOrQuerySchema* tableOr
 	setSchema(tableOrQuerySchema);
 	header()->hide();
 
-	connect(this, TQT_SIGNAL(dropped(TQDropEvent *, TQListViewItem *)), this, TQT_SLOT(slotDropped(TQDropEvent *)));
-	connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotContentsMoving(int,int)));
+	connect(this, TQ_SIGNAL(dropped(TQDropEvent *, TQListViewItem *)), this, TQ_SLOT(slotDropped(TQDropEvent *)));
+	connect(this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotContentsMoving(int,int)));
 }
 
 KexiRelationViewTable::~KexiRelationViewTable()
diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp
index e3a2e8b2..2fbda78e 100644
--- a/kexi/widget/relations/kexirelationwidget.cpp
+++ b/kexi/widget/relations/kexirelationwidget.cpp
@@ -65,7 +65,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent,
 	m_btnAdd = new KPushButton(i18n("&Add"), this);
 	hlyr->addWidget(m_btnAdd);
 	hlyr->addStretch(1);
-	connect(m_btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddTable()));
+	connect(m_btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddTable()));
 
 	m_relationView = new KexiRelationView(this, "relation_view");
 	setViewWidget(m_relationView);
@@ -75,19 +75,19 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent,
 	//actions
 	m_tableQueryPopup = new TDEPopupMenu(this, "m_popup");
 	m_tableQueryPopupTitleID = m_tableQueryPopup->insertTitle(SmallIcon("table"), "");
-	connect(m_tableQueryPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowPopupMenu()));
+	connect(m_tableQueryPopup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowPopupMenu()));
 
 	m_connectionPopup = new TDEPopupMenu(this, "m_connectionPopup");
 	m_connectionPopupTitleID = m_connectionPopup->insertTitle("");
-	connect(m_connectionPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowPopupMenu()));
+	connect(m_connectionPopup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowPopupMenu()));
 
 	m_areaPopup = new TDEPopupMenu(this, "m_areaPopup");
 	
 	m_openSelectedTableAction = new TDEAction(i18n("&Open Table"), SmallIcon("document-open"), TDEShortcut(),
-		this, TQT_SLOT(openSelectedTable()), this, "relationsview_openTable");
+		this, TQ_SLOT(openSelectedTable()), this, "relationsview_openTable");
 	m_openSelectedTableAction->plug( m_tableQueryPopup );
 	m_designSelectedTableAction = new TDEAction(i18n("&Design Table"), SmallIcon("edit"), TDEShortcut(),
-		this, TQT_SLOT(designSelectedTable()), this, "relationsview_designTable");
+		this, TQ_SLOT(designSelectedTable()), this, "relationsview_designTable");
 	m_designSelectedTableAction->plug( m_tableQueryPopup );
 	m_tableQueryPopup->insertSeparator();
 
@@ -95,24 +95,24 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent,
 	hide_action->setIconSet(TQIconSet());
 
 	plugSharedAction("edit_delete",m_connectionPopup);
-	plugSharedAction("edit_delete",this, TQT_SLOT(removeSelectedObject()));
-
-	connect(m_relationView, TQT_SIGNAL(tableViewGotFocus()),
-		this, TQT_SLOT(tableViewGotFocus()));
-	connect(m_relationView, TQT_SIGNAL(connectionViewGotFocus()),
-		this, TQT_SLOT(connectionViewGotFocus()));
-	connect(m_relationView, TQT_SIGNAL(emptyAreaGotFocus()),
-		this, TQT_SLOT(emptyAreaGotFocus()));
-	connect(m_relationView, TQT_SIGNAL(tableContextMenuRequest( const TQPoint& )),
-		this, TQT_SLOT(tableContextMenuRequest( const TQPoint& )));
-	connect(m_relationView, TQT_SIGNAL(connectionContextMenuRequest( const TQPoint& )),
-		this, TQT_SLOT(connectionContextMenuRequest( const TQPoint& )));
-	connect(m_relationView, TQT_SIGNAL(tableHidden(KexiDB::TableSchema&)),
-		this, TQT_SLOT(slotTableHidden(KexiDB::TableSchema&)));
-	connect(m_relationView, TQT_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)),
-		this, TQT_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)));
-	connect(m_relationView, TQT_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)),
-		this, TQT_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)));
+	plugSharedAction("edit_delete",this, TQ_SLOT(removeSelectedObject()));
+
+	connect(m_relationView, TQ_SIGNAL(tableViewGotFocus()),
+		this, TQ_SLOT(tableViewGotFocus()));
+	connect(m_relationView, TQ_SIGNAL(connectionViewGotFocus()),
+		this, TQ_SLOT(connectionViewGotFocus()));
+	connect(m_relationView, TQ_SIGNAL(emptyAreaGotFocus()),
+		this, TQ_SLOT(emptyAreaGotFocus()));
+	connect(m_relationView, TQ_SIGNAL(tableContextMenuRequest( const TQPoint& )),
+		this, TQ_SLOT(tableContextMenuRequest( const TQPoint& )));
+	connect(m_relationView, TQ_SIGNAL(connectionContextMenuRequest( const TQPoint& )),
+		this, TQ_SLOT(connectionContextMenuRequest( const TQPoint& )));
+	connect(m_relationView, TQ_SIGNAL(tableHidden(KexiDB::TableSchema&)),
+		this, TQ_SLOT(slotTableHidden(KexiDB::TableSchema&)));
+	connect(m_relationView, TQ_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)),
+		this, TQ_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)));
+	connect(m_relationView, TQ_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)),
+		this, TQ_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)));
 
 #if 0
 	if(!embedd)
@@ -126,7 +126,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent,
 
 #ifdef TESTING_KexiRelationWidget
 	for (int i=0;i<(int)m_db->tableNames().count();i++)
-		TQTimer::singleShot(100,this,TQT_SLOT(slotAddTable()));
+		TQTimer::singleShot(100,this,TQ_SLOT(slotAddTable()));
 #endif
 
 	invalidateActions();
@@ -171,8 +171,8 @@ KexiRelationWidget::addTable(KexiDB::TableSchema *t, const TQRect &rect)
 		kdDebug() << "KexiRelationWidget::slotAddTable(): adding table " << t->name() << endl;
 		if (!c)
 			return;
-		connect(c->tableView(), TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
-			this, TQT_SLOT(slotTableFieldDoubleClicked(TQListViewItem*,const TQPoint&,int)));
+		connect(c->tableView(), TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
+			this, TQ_SLOT(slotTableFieldDoubleClicked(TQListViewItem*,const TQPoint&,int)));
 	}
 
 	const TQString tname = t->name().lower();
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index b3de3419..b02a74a6 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -101,25 +101,25 @@ KexiBlobTableEdit::KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *pare
 	d->button->setPopup( d->popup );
 
 	//force edit requested to start editing... (this will call slotUpdateActionsAvailabilityRequested())
-	//connect(d->popup, TQT_SIGNAL(aboutToShow()), this, TQT_SIGNAL(editRequested()));
-
-	connect(d->popup, TQT_SIGNAL(updateActionsAvailabilityRequested(bool&, bool&)), 
-		this, TQT_SLOT(slotUpdateActionsAvailabilityRequested(bool&, bool&)));
-
-	connect(d->popup, TQT_SIGNAL(insertFromFileRequested(const KURL&)),
-		this, TQT_SLOT(handleInsertFromFileAction(const KURL&)));
-	connect(d->popup, TQT_SIGNAL(saveAsRequested(const TQString&)),
-		this, TQT_SLOT(handleSaveAsAction(const TQString&)));
-	connect(d->popup, TQT_SIGNAL(cutRequested()),
-		this, TQT_SLOT(handleCutAction()));
-	connect(d->popup, TQT_SIGNAL(copyRequested()),
-		this, TQT_SLOT(handleCopyAction()));
-	connect(d->popup, TQT_SIGNAL(pasteRequested()),
-		this, TQT_SLOT(handlePasteAction()));
-	connect(d->popup, TQT_SIGNAL(clearRequested()),
-		this, TQT_SLOT(clear()));
-	connect(d->popup, TQT_SIGNAL(showPropertiesRequested()),
-		this, TQT_SLOT(handleShowPropertiesAction()));
+	//connect(d->popup, TQ_SIGNAL(aboutToShow()), this, TQ_SIGNAL(editRequested()));
+
+	connect(d->popup, TQ_SIGNAL(updateActionsAvailabilityRequested(bool&, bool&)), 
+		this, TQ_SLOT(slotUpdateActionsAvailabilityRequested(bool&, bool&)));
+
+	connect(d->popup, TQ_SIGNAL(insertFromFileRequested(const KURL&)),
+		this, TQ_SLOT(handleInsertFromFileAction(const KURL&)));
+	connect(d->popup, TQ_SIGNAL(saveAsRequested(const TQString&)),
+		this, TQ_SLOT(handleSaveAsAction(const TQString&)));
+	connect(d->popup, TQ_SIGNAL(cutRequested()),
+		this, TQ_SLOT(handleCutAction()));
+	connect(d->popup, TQ_SIGNAL(copyRequested()),
+		this, TQ_SLOT(handleCopyAction()));
+	connect(d->popup, TQ_SIGNAL(pasteRequested()),
+		this, TQ_SLOT(handlePasteAction()));
+	connect(d->popup, TQ_SIGNAL(clearRequested()),
+		this, TQ_SLOT(clear()));
+	connect(d->popup, TQ_SIGNAL(showPropertiesRequested()),
+		this, TQ_SLOT(handleShowPropertiesAction()));
 }
 
 KexiBlobTableEdit::~KexiBlobTableEdit()
diff --git a/kexi/widget/tableview/kexicomboboxbase.cpp b/kexi/widget/tableview/kexicomboboxbase.cpp
index 89ba63cf..d2aaee78 100644
--- a/kexi/widget/tableview/kexicomboboxbase.cpp
+++ b/kexi/widget/tableview/kexicomboboxbase.cpp
@@ -357,10 +357,10 @@ void KexiComboBoxBase::createPopup(bool show)
 	if (!popup()) {
 		setPopup( column() ? new KexiComboBoxPopup(thisWidget, *column()) 
 			: new KexiComboBoxPopup(thisWidget, *field()) );
-		TQObject::connect(popup(), TQT_SIGNAL(rowAccepted(KexiTableItem*,int)), 
-			thisWidget, TQT_SLOT(slotRowAccepted(KexiTableItem*,int)));
-		TQObject::connect(popup()->tableView(), TQT_SIGNAL(itemSelected(KexiTableItem*)),
-			thisWidget, TQT_SLOT(slotItemSelected(KexiTableItem*)));
+		TQObject::connect(popup(), TQ_SIGNAL(rowAccepted(KexiTableItem*,int)), 
+			thisWidget, TQ_SLOT(slotRowAccepted(KexiTableItem*,int)));
+		TQObject::connect(popup()->tableView(), TQ_SIGNAL(itemSelected(KexiTableItem*)),
+			thisWidget, TQ_SLOT(slotItemSelected(KexiTableItem*)));
 
 		popup()->setFocusProxy( widgetToFocus );	
 		popup()->tableView()->setFocusProxy( widgetToFocus );
diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp
index 6877bd78..b0f6621c 100644
--- a/kexi/widget/tableview/kexicomboboxpopup.cpp
+++ b/kexi/widget/tableview/kexicomboboxpopup.cpp
@@ -134,14 +134,14 @@ void KexiComboBoxPopup::init()
 	d->tv = new KexiComboBoxPopup_KexiTableView(this);
 	installEventFilter(this);
 	
-	connect(d->tv, TQT_SIGNAL(itemReturnPressed(KexiTableItem*,int,int)),
-		this, TQT_SLOT(slotTVItemAccepted(KexiTableItem*,int,int)));
+	connect(d->tv, TQ_SIGNAL(itemReturnPressed(KexiTableItem*,int,int)),
+		this, TQ_SLOT(slotTVItemAccepted(KexiTableItem*,int,int)));
 
-	connect(d->tv, TQT_SIGNAL(itemMouseReleased(KexiTableItem*,int,int)),
-		this, TQT_SLOT(slotTVItemAccepted(KexiTableItem*,int,int)));
+	connect(d->tv, TQ_SIGNAL(itemMouseReleased(KexiTableItem*,int,int)),
+		this, TQ_SLOT(slotTVItemAccepted(KexiTableItem*,int,int)));
 
-	connect(d->tv, TQT_SIGNAL(itemDblClicked(KexiTableItem*,int,int)),
-		this, TQT_SLOT(slotTVItemAccepted(KexiTableItem*,int,int)));
+	connect(d->tv, TQ_SIGNAL(itemDblClicked(KexiTableItem*,int,int)),
+		this, TQ_SLOT(slotTVItemAccepted(KexiTableItem*,int,int)));
 }
 
 void KexiComboBoxPopup::setData(KexiTableViewColumn *column, KexiDB::Field *field)
@@ -258,7 +258,7 @@ void KexiComboBoxPopup::setData(KexiTableViewColumn *column, KexiDB::Field *fiel
 			d->tv->KexiDataAwareObjectInterface::data()->disconnect( this );
 		d->tv->setData( cursor );
 
-		connect( d->tv, TQT_SIGNAL(dataRefreshed()), this, TQT_SLOT(slotDataReloadRequested()));
+		connect( d->tv, TQ_SIGNAL(dataRefreshed()), this, TQ_SLOT(slotDataReloadRequested()));
 		updateSize();
 		return;
 	}
@@ -287,7 +287,7 @@ void KexiComboBoxPopup::setDataInternal( KexiTableViewData *data, bool owner )
 	if (d->tv->KexiDataAwareObjectInterface::data())
 		d->tv->KexiDataAwareObjectInterface::data()->disconnect( this );
 	d->tv->setData( data, owner );
-	connect( d->tv, TQT_SIGNAL(dataRefreshed()), this, TQT_SLOT(slotDataReloadRequested()));
+	connect( d->tv, TQ_SIGNAL(dataRefreshed()), this, TQ_SLOT(slotDataReloadRequested()));
 
 	updateSize();
 }
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp
index 0ac9923e..2d771041 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.cpp
+++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp
@@ -71,9 +71,9 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg
 	d->button = new KexiComboBoxDropDownButton( parentWidget() /*usually a viewport*/ );
 	d->button->hide();
 	d->button->setFocusPolicy( TQWidget::NoFocus );
-	connect(d->button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotButtonClicked()));
+	connect(d->button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotButtonClicked()));
 
-	connect(m_lineedit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotLineEditTextChanged(const TQString&)));
+	connect(m_lineedit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotLineEditTextChanged(const TQString&)));
 
 //	m_lineedit = new KLineEdit(this, "lineedit");
 //	m_lineedit->setFrame(false);
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp
index 2ba85294..bcb510d2 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.cpp
+++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp
@@ -158,29 +158,29 @@ void KexiDataAwareObjectInterface::setData( KexiTableViewData *data, bool owner
 	if (m_data && !theSameData) {
 //! @todo: store sorting settings?
 		setSorting(-1);
-//		connect(m_data, TQT_SIGNAL(refreshRequested()), this, TQT_SLOT(slotRefreshRequested()));
-		connectToReloadDataSlot(m_data, TQT_SIGNAL(reloadRequested()));
+//		connect(m_data, TQ_SIGNAL(refreshRequested()), this, TQ_SLOT(slotRefreshRequested()));
+		connectToReloadDataSlot(m_data, TQ_SIGNAL(reloadRequested()));
 		TQObject* thisObject = dynamic_cast<TQObject*>(this);
 		if (thisObject) {
-			TQObject::connect(m_data, TQT_SIGNAL(destroying()), thisObject, TQT_SLOT(slotDataDestroying()));
-			TQObject::connect(m_data, TQT_SIGNAL(rowsDeleted( const TQValueList<int> & )), 
-				thisObject, TQT_SLOT(slotRowsDeleted( const TQValueList<int> & )));
-			TQObject::connect(m_data, TQT_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)),
-				thisObject, TQT_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)));
-			TQObject::connect(m_data, TQT_SIGNAL(rowDeleted()), thisObject, TQT_SLOT(slotRowDeleted()));
-			TQObject::connect(m_data, TQT_SIGNAL(rowInserted(KexiTableItem*,bool)), 
-				thisObject, TQT_SLOT(slotRowInserted(KexiTableItem*,bool)));
-			TQObject::connect(m_data, TQT_SIGNAL(rowInserted(KexiTableItem*,uint,bool)), 
-				thisObject, TQT_SLOT(slotRowInserted(KexiTableItem*,uint,bool))); //not db-aware
-			TQObject::connect(m_data, TQT_SIGNAL(rowRepaintRequested(KexiTableItem&)), 
-				thisObject, TQT_SLOT(slotRowRepaintRequested(KexiTableItem&)));
+			TQObject::connect(m_data, TQ_SIGNAL(destroying()), thisObject, TQ_SLOT(slotDataDestroying()));
+			TQObject::connect(m_data, TQ_SIGNAL(rowsDeleted( const TQValueList<int> & )), 
+				thisObject, TQ_SLOT(slotRowsDeleted( const TQValueList<int> & )));
+			TQObject::connect(m_data, TQ_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)),
+				thisObject, TQ_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)));
+			TQObject::connect(m_data, TQ_SIGNAL(rowDeleted()), thisObject, TQ_SLOT(slotRowDeleted()));
+			TQObject::connect(m_data, TQ_SIGNAL(rowInserted(KexiTableItem*,bool)), 
+				thisObject, TQ_SLOT(slotRowInserted(KexiTableItem*,bool)));
+			TQObject::connect(m_data, TQ_SIGNAL(rowInserted(KexiTableItem*,uint,bool)), 
+				thisObject, TQ_SLOT(slotRowInserted(KexiTableItem*,uint,bool))); //not db-aware
+			TQObject::connect(m_data, TQ_SIGNAL(rowRepaintRequested(KexiTableItem&)), 
+				thisObject, TQ_SLOT(slotRowRepaintRequested(KexiTableItem&)));
 			// setup scrollbar's tooltip
-			TQObject::connect(verticalScrollBar(),TQT_SIGNAL(sliderReleased()),
-				thisObject,TQT_SLOT(vScrollBarSliderReleased()));
-			TQObject::connect(verticalScrollBar(),TQT_SIGNAL(valueChanged(int)),
-				thisObject,TQT_SLOT(vScrollBarValueChanged(int)));
-			TQObject::connect(&m_scrollBarTipTimer,TQT_SIGNAL(timeout()),
-				thisObject,TQT_SLOT(scrollBarTipTimeout()));
+			TQObject::connect(verticalScrollBar(),TQ_SIGNAL(sliderReleased()),
+				thisObject,TQ_SLOT(vScrollBarSliderReleased()));
+			TQObject::connect(verticalScrollBar(),TQ_SIGNAL(valueChanged(int)),
+				thisObject,TQ_SLOT(vScrollBarValueChanged(int)));
+			TQObject::connect(&m_scrollBarTipTimer,TQ_SIGNAL(timeout()),
+				thisObject,TQ_SLOT(scrollBarTipTimeout()));
 		}
 	}
 
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.h b/kexi/widget/tableview/kexidataawareobjectiface.h
index d9819f5d..31bfcc29 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.h
+++ b/kexi/widget/tableview/kexidataawareobjectiface.h
@@ -896,23 +896,23 @@ inline KexiTableItem *KexiDataAwareObjectInterface::itemAt(int row) const
 #define KEXI_DATAAWAREOBJECTINTERFACE \
 public: \
 	void connectCellSelectedSignal(const TQObject* receiver, const char* intIntMember) { \
-		connect(this, TQT_SIGNAL(cellSelected(int,int)), receiver, intIntMember); \
+		connect(this, TQ_SIGNAL(cellSelected(int,int)), receiver, intIntMember); \
 	} \
 	void connectRowEditStartedSignal(const TQObject* receiver, const char* intMember) { \
-		connect(this, TQT_SIGNAL(rowEditStarted(int)), receiver, intMember); \
+		connect(this, TQ_SIGNAL(rowEditStarted(int)), receiver, intMember); \
 	} \
 	void connectRowEditTerminatedSignal(const TQObject* receiver, const char* voidMember) { \
-		connect(this, TQT_SIGNAL(rowEditTerminated(int)), receiver, voidMember); \
+		connect(this, TQ_SIGNAL(rowEditTerminated(int)), receiver, voidMember); \
 	} \
 	void connectReloadActionsSignal(const TQObject* receiver, const char* voidMember) { \
-		connect(this, TQT_SIGNAL(reloadActions()), receiver, voidMember); \
+		connect(this, TQ_SIGNAL(reloadActions()), receiver, voidMember); \
 	} \
 	void connectDataSetSignal(const TQObject* receiver, \
 		const char* kexiTableViewDataMember) { \
-		connect(this, TQT_SIGNAL(dataSet(KexiTableViewData*)), receiver, kexiTableViewDataMember); \
+		connect(this, TQ_SIGNAL(dataSet(KexiTableViewData*)), receiver, kexiTableViewDataMember); \
 	} \
 	void connectToReloadDataSlot(const TQObject* sender, const char* voidSignal) { \
-		connect(sender, voidSignal, this, TQT_SLOT(reloadData())); \
+		connect(sender, voidSignal, this, TQ_SLOT(reloadData())); \
 	}
 
 #endif
diff --git a/kexi/widget/tableview/kexidataawarepropertyset.cpp b/kexi/widget/tableview/kexidataawarepropertyset.cpp
index 8b0fdff7..2219cf97 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.cpp
+++ b/kexi/widget/tableview/kexidataawarepropertyset.cpp
@@ -35,12 +35,12 @@ KexiDataAwarePropertySet::KexiDataAwarePropertySet(KexiViewBase *view,
 {
 	m_sets.setAutoDelete(true);
 
-//	connect(m_dataObject, TQT_SIGNAL(dataSet(KexiTableViewData*)),
-//		this, TQT_SLOT(slotDataSet(KexiTableViewData*)));
-	m_dataObject->connectDataSetSignal(this, TQT_SLOT(slotDataSet(KexiTableViewData*)));
-//	connect(m_dataObject, TQT_SIGNAL(cellSelected(int,int)),
-//		this, TQT_SLOT(slotCellSelected(int,int)));
-	m_dataObject->connectCellSelectedSignal(this, TQT_SLOT(slotCellSelected(int,int)));
+//	connect(m_dataObject, TQ_SIGNAL(dataSet(KexiTableViewData*)),
+//		this, TQ_SLOT(slotDataSet(KexiTableViewData*)));
+	m_dataObject->connectDataSetSignal(this, TQ_SLOT(slotDataSet(KexiTableViewData*)));
+//	connect(m_dataObject, TQ_SIGNAL(cellSelected(int,int)),
+//		this, TQ_SLOT(slotCellSelected(int,int)));
+	m_dataObject->connectCellSelectedSignal(this, TQ_SLOT(slotCellSelected(int,int)));
 //
 	slotDataSet( m_dataObject->data() );
 	const bool wasDirty = view->dirty();
@@ -61,13 +61,13 @@ void KexiDataAwarePropertySet::slotDataSet( KexiTableViewData *data )
 	}
 	m_currentTVData = data;
 	if (!m_currentTVData.isNull()) {
-		connect(m_currentTVData, TQT_SIGNAL(rowDeleted()), this, TQT_SLOT(slotRowDeleted()));
-		connect(m_currentTVData, TQT_SIGNAL(rowsDeleted( const TQValueList<int> & )),
-			this, TQT_SLOT(slotRowsDeleted( const TQValueList<int> & )));
-		connect(m_currentTVData, TQT_SIGNAL(rowInserted(KexiTableItem*,uint,bool)),
-			this, TQT_SLOT(slotRowInserted(KexiTableItem*,uint,bool)));
-		connect(m_currentTVData, TQT_SIGNAL(reloadRequested()),
-			this, TQT_SLOT(slotReloadRequested()));
+		connect(m_currentTVData, TQ_SIGNAL(rowDeleted()), this, TQ_SLOT(slotRowDeleted()));
+		connect(m_currentTVData, TQ_SIGNAL(rowsDeleted( const TQValueList<int> & )),
+			this, TQ_SLOT(slotRowsDeleted( const TQValueList<int> & )));
+		connect(m_currentTVData, TQ_SIGNAL(rowInserted(KexiTableItem*,uint,bool)),
+			this, TQ_SLOT(slotRowInserted(KexiTableItem*,uint,bool)));
+		connect(m_currentTVData, TQ_SIGNAL(reloadRequested()),
+			this, TQ_SLOT(slotReloadRequested()));
 	}
 }
 
@@ -118,7 +118,7 @@ void KexiDataAwarePropertySet::insert(uint row, KoProperty::Set* set, bool newOn
 
 	m_sets.insert(row, set);
 
-	connect(set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), m_view, TQT_SLOT(setDirty()));
+	connect(set, TQ_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), m_view, TQ_SLOT(setDirty()));
 
 	if (newOne) {
 		//add a special property indicating that this is brand new set,
diff --git a/kexi/widget/tableview/kexidatatableview.cpp b/kexi/widget/tableview/kexidatatableview.cpp
index 800c76e7..3c7a3e27 100644
--- a/kexi/widget/tableview/kexidatatableview.cpp
+++ b/kexi/widget/tableview/kexidatatableview.cpp
@@ -59,14 +59,14 @@ KexiDataTableView::init()
 //	m_records = 0;
 //	m_first = false;
 
-//	connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotMoving(int)));
-//	connect(verticalScrollBar(), TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(slotMoving(int)));
+//	connect(this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotMoving(int)));
+//	connect(verticalScrollBar(), TQ_SIGNAL(sliderMoved(int)), this, TQ_SLOT(slotMoving(int)));
 }
 
 /*void KexiDataTableView::initActions(TDEActionCollection *col)
 {
 	KexiTableView::initActions(col);
-	new TDEAction(i18n("Filter"), "filter", 0, this, TQT_SLOT(filter()), col, "tablepart_filter");
+	new TDEAction(i18n("Filter"), "filter", 0, this, TQ_SLOT(filter()), col, "tablepart_filter");
 }*/
 
 bool KexiDataTableView::setData(KexiDB::Cursor *cursor)
diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp
index b6853037..5fe56aa9 100644
--- a/kexi/widget/tableview/kexiinputtableedit.cpp
+++ b/kexi/widget/tableview/kexiinputtableedit.cpp
@@ -107,10 +107,10 @@ void KexiInputTableEdit::init()
 	m_calculatedCell = false;
 
 #if 0 //js TODO
-	connect(m_cview->completionBox(), TQT_SIGNAL(activated(const TQString &)),
-	 this, TQT_SLOT(completed(const TQString &)));
-	connect(m_cview->completionBox(), TQT_SIGNAL(highlighted(const TQString &)),
-	 this, TQT_SLOT(completed(const TQString &)));
+	connect(m_cview->completionBox(), TQ_SIGNAL(activated(const TQString &)),
+	 this, TQ_SLOT(completed(const TQString &)));
+	connect(m_cview->completionBox(), TQ_SIGNAL(highlighted(const TQString &)),
+	 this, TQ_SLOT(completed(const TQString &)));
 	 m_cview->completionBox()->setTabHandling(true);
 #endif
 
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 11ff828d..61655424 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -184,7 +184,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 
 	d = new KexiTableViewPrivate(this);
 
-	connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
+	connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
 	slotSettingsChanged(TDEApplication::SETTINGS_SHORTCUTS);
 
 	m_data = new KexiTableViewData(); //to prevent crash because m_data==0
@@ -219,10 +219,10 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 	//context menu
 	m_popupMenu = new TDEPopupMenu(this, "contextMenu");
 #if 0 //moved to mainwindow's actions
-	d->menu_id_addRecord = m_popupMenu->insertItem(i18n("Add Record"), this, TQT_SLOT(addRecord()), TQt::CTRL+TQt::Key_Insert);
+	d->menu_id_addRecord = m_popupMenu->insertItem(i18n("Add Record"), this, TQ_SLOT(addRecord()), TQt::CTRL+TQt::Key_Insert);
 	d->menu_id_removeRecord = m_popupMenu->insertItem(
 		kapp->iconLoader()->loadIcon("button_cancel", TDEIcon::Small),
-		i18n("Remove Record"), this, TQT_SLOT(removeRecord()), TQt::CTRL+TQt::Key_Delete);
+		i18n("Remove Record"), this, TQ_SLOT(removeRecord()), TQt::CTRL+TQt::Key_Delete);
 #endif
 
 #ifdef TQ_WS_WIN
@@ -244,7 +244,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 	m_horizontalHeader->setOrientation(TQt::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)));
+	connect(m_horizontalHeader, TQ_SIGNAL(sizeChange(int,int,int)), this, TQ_SLOT(slotTopHeaderSizeChange(int,int,int)));
 
 	m_verticalHeader = new KexiRecordMarker(this, "rm");
 	m_verticalHeader->setSelectionBackgroundColor( palette().active().highlight() );
@@ -268,7 +268,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 
 #if 0//(js) doesn't work!
 	d->scrollTimer = new TQTimer(this);
-	connect(d->scrollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoScroll()));
+	connect(d->scrollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoScroll()));
 #endif
 
 //	setBackgroundAltering(true);
@@ -278,13 +278,13 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 	viewport()->setAcceptDrops(true);
 
 	// Connect header, table and scrollbars
-	connect(horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)), m_horizontalHeader, TQT_SLOT(setOffset(int)));
-	connect(verticalScrollBar(), TQT_SIGNAL(valueChanged(int)), m_verticalHeader, TQT_SLOT(setOffset(int)));
-	connect(m_horizontalHeader, TQT_SIGNAL(sizeChange(int, int, int)), this, TQT_SLOT(slotColumnWidthChanged(int, int, int)));
-	connect(m_horizontalHeader, TQT_SIGNAL(sectionHandleDoubleClicked(int)), this, TQT_SLOT(slotSectionHandleDoubleClicked(int)));
-	connect(m_horizontalHeader, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(sortColumnInternal(int)));
+	connect(horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)), m_horizontalHeader, TQ_SLOT(setOffset(int)));
+	connect(verticalScrollBar(), TQ_SIGNAL(valueChanged(int)), m_verticalHeader, TQ_SLOT(setOffset(int)));
+	connect(m_horizontalHeader, TQ_SIGNAL(sizeChange(int, int, int)), this, TQ_SLOT(slotColumnWidthChanged(int, int, int)));
+	connect(m_horizontalHeader, TQ_SIGNAL(sectionHandleDoubleClicked(int)), this, TQ_SLOT(slotSectionHandleDoubleClicked(int)));
+	connect(m_horizontalHeader, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(sortColumnInternal(int)));
 
-	connect(d->pUpdateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdate()));
+	connect(d->pUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdate()));
 	
 //	horizontalScrollBar()->show();
 	updateScrollBars();
@@ -1010,7 +1010,7 @@ void KexiTableView::contentsMousePressEvent( TQMouseEvent* e )
 	}
 //	d->contentsMousePressEvent_ev = *e;
 //	d->contentsMousePressEvent_enabled = true;
-//	TQTimer::singleShot(2000, this, TQT_SLOT( contentsMousePressEvent_Internal() ));
+//	TQTimer::singleShot(2000, this, TQ_SLOT( contentsMousePressEvent_Internal() ));
 //	d->contentsMousePressEvent_timer.start(100,true);
 	
 //	if (!d->contentsMousePressEvent_enabled)
@@ -1495,9 +1495,9 @@ KexiDataItemInterface *KexiTableView::editor( int col, bool ignoreMissingEditor
 	if (m_data->cursor() && m_data->cursor()->query())
 		editor->createInternalEditor(*m_data->cursor()->query());
 
-	connect(editor,TQT_SIGNAL(editRequested()),this,TQT_SLOT(slotEditRequested()));
-	connect(editor,TQT_SIGNAL(cancelRequested()),this,TQT_SLOT(cancelEditor()));
-	connect(editor,TQT_SIGNAL(acceptRequested()),this,TQT_SLOT(acceptEditor()));
+	connect(editor,TQ_SIGNAL(editRequested()),this,TQ_SLOT(slotEditRequested()));
+	connect(editor,TQ_SIGNAL(cancelRequested()),this,TQ_SLOT(cancelEditor()));
+	connect(editor,TQ_SIGNAL(acceptRequested()),this,TQ_SLOT(acceptEditor()));
 
 	editor->resize(columnWidth(col)-1, rowHeight()-1);
 	editor->installEventFilter(this);
diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp
index 305222ca..ec1326ae 100644
--- a/kexi/widget/tableview/kexitableviewheader.cpp
+++ b/kexi/widget/tableview/kexitableviewheader.cpp
@@ -67,8 +67,8 @@ KexiTableViewHeader::KexiTableViewHeader(TQWidget * parent, const char * name)
 {
 	styleChange( style() );
 	installEventFilter(this);
-	connect(this, TQT_SIGNAL(sizeChange(int,int,int)), 
-		this, TQT_SLOT(slotSizeChange(int,int,int)));
+	connect(this, TQ_SIGNAL(sizeChange(int,int,int)), 
+		this, TQ_SLOT(slotSizeChange(int,int,int)));
 }
 
 KexiTableViewHeader::~KexiTableViewHeader()
diff --git a/kexi/widget/utils/kexiarrowtip.cpp b/kexi/widget/utils/kexiarrowtip.cpp
index f22248e6..027af36e 100644
--- a/kexi/widget/utils/kexiarrowtip.cpp
+++ b/kexi/widget/utils/kexiarrowtip.cpp
@@ -88,7 +88,7 @@ void KexiArrowTip::increaseOpacity()
 	m_opacity += 0.10;
 	setWindowOpacity(m_opacity);
 	if (m_opacity < 1.0)
-		TQTimer::singleShot(25, this, TQT_SLOT(increaseOpacity()));
+		TQTimer::singleShot(25, this, TQ_SLOT(increaseOpacity()));
 }
 
 void KexiArrowTip::decreaseOpacity()
@@ -100,7 +100,7 @@ void KexiArrowTip::decreaseOpacity()
 	}
 	m_opacity -= 0.10;
 	setWindowOpacity(m_opacity);
-	TQTimer::singleShot(25, this, TQT_SLOT(decreaseOpacity()));
+	TQTimer::singleShot(25, this, TQ_SLOT(decreaseOpacity()));
 }
 
 bool KexiArrowTip::close ( bool alsoDelete )
diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp
index e127bea6..e59d93f1 100644
--- a/kexi/widget/utils/kexicontextmenuutils.cpp
+++ b/kexi/widget/utils/kexicontextmenuutils.cpp
@@ -63,30 +63,30 @@ KexiImageContextMenu::KexiImageContextMenu(TQWidget* parent)
 	insertTitle(TQString());
 
 	d->insertFromFileAction = new TDEAction(i18n("Insert From &File..."), SmallIconSet("document-open"), 0,
-			this, TQT_SLOT(insertFromFile()), &d->actionCollection, "insert");
+			this, TQ_SLOT(insertFromFile()), &d->actionCollection, "insert");
 	d->insertFromFileAction->plug(this);
-	d->saveAsAction = KStdAction::saveAs(this, TQT_SLOT(saveAs()), &d->actionCollection);
+	d->saveAsAction = KStdAction::saveAs(this, TQ_SLOT(saveAs()), &d->actionCollection);
 //	d->saveAsAction->setText(i18n("&Save &As..."));
 	d->saveAsAction->plug(this);
 	insertSeparator();
-	d->cutAction = KStdAction::cut(this, TQT_SLOT(cut()), &d->actionCollection);
+	d->cutAction = KStdAction::cut(this, TQ_SLOT(cut()), &d->actionCollection);
 	d->cutAction->plug(this);
-	d->copyAction = KStdAction::copy(this, TQT_SLOT(copy()), &d->actionCollection);
+	d->copyAction = KStdAction::copy(this, TQ_SLOT(copy()), &d->actionCollection);
 	d->copyAction->plug(this);
-	d->pasteAction = KStdAction::paste(this, TQT_SLOT(paste()), &d->actionCollection);
+	d->pasteAction = KStdAction::paste(this, TQ_SLOT(paste()), &d->actionCollection);
 	d->pasteAction->plug(this);
 	d->deleteAction = new TDEAction(i18n("&Clear"), SmallIconSet("edit-delete"), 0,
-		this, TQT_SLOT(clear()), &d->actionCollection, "delete");
+		this, TQ_SLOT(clear()), &d->actionCollection, "delete");
 	d->deleteAction->plug(this);
 #ifdef KEXI_NO_UNFINISHED 
 	d->propertiesAction = 0;
 #else
 	insertSeparator();
 	d->propertiesAction = new TDEAction(i18n("Properties"), 0, 0,
-		this, TQT_SLOT(showProperties()), &d->actionCollection, "properties");
+		this, TQ_SLOT(showProperties()), &d->actionCollection, "properties");
 	d->propertiesAction->plug(this);
 #endif
-	connect(this, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(updateActionsAvailability()));
+	connect(this, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(updateActionsAvailability()));
 }
 
 KexiImageContextMenu::~KexiImageContextMenu()
diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp
index 4aa7341c..331fabe9 100644
--- a/kexi/widget/utils/kexigradientwidget.cpp
+++ b/kexi/widget/utils/kexigradientwidget.cpp
@@ -40,7 +40,7 @@ KexiGradientWidget::KexiGradientWidget( TQWidget *parent, const char *name, WFla
 
 	p_backgroundColor = TQWidget::paletteBackgroundColor();
 
-	connect ( &p_rebuildDelayTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( setCacheDirty() ) );
+	connect ( &p_rebuildDelayTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( setCacheDirty() ) );
 
 	installEventFilter( this );
 }
diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp
index 5e3cfae8..a7ff7d01 100644
--- a/kexi/widget/utils/kexirecordnavigator.cpp
+++ b/kexi/widget/utils/kexirecordnavigator.cpp
@@ -157,11 +157,11 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const
 	d->lyr->addSpacing( 6 );
 	d->lyr->addStretch(10);
 
-	connect(m_navBtnPrev,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotPrevButtonClicked()));
-	connect(m_navBtnNext,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotNextButtonClicked()));
-	connect(m_navBtnLast,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotLastButtonClicked()));
-	connect(m_navBtnFirst,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotFirstButtonClicked()));
-	connect(m_navBtnNew,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotNewButtonClicked()));
+	connect(m_navBtnPrev,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotPrevButtonClicked()));
+	connect(m_navBtnNext,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotNextButtonClicked()));
+	connect(m_navBtnLast,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotLastButtonClicked()));
+	connect(m_navBtnFirst,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotFirstButtonClicked()));
+	connect(m_navBtnNew,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotNewButtonClicked()));
 
 	setRecordCount(0);
 	setCurrentRecordNumber(0);