Rename old tq methods that no longer need a unique name

23 files changed, 80 insertions, 80 deletions

diff --git a/kexi/main/kexifinddialogbase.ui b/kexi/main/kexifinddialogbase.ui
index 8ffc254d..133570e7 100644
--- a/kexi/main/kexifinddialogbase.ui
+++ b/kexi/main/kexifinddialogbase.ui
@@ -150,7 +150,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
@@ -243,7 +243,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>2</height>
@@ -279,7 +279,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>70</width>
                     <height>20</height>
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 5594d577..293271c5 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -245,8 +245,8 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 		int scnum = TQApplication::desktop()->screenNumber(parentWidget());
 		TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
 		d->config->setGroup("MainWindow");
-		TQSize s ( d->config->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg(desk.width()), 700 ),
-			d->config->readNumEntry( TQString::tqfromLatin1("Height %1").tqarg(desk.height()), 480 ) );
+		TQSize s ( d->config->readNumEntry( TQString::fromLatin1("Width %1").tqarg(desk.width()), 700 ),
+			d->config->readNumEntry( TQString::fromLatin1("Height %1").tqarg(desk.height()), 480 ) );
 		resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height()));
 	}
 
@@ -1836,7 +1836,7 @@ void KexiMainWindowImpl::initPropertyEditor()
 
 	//1		dw->setMinimumWidth(200);
 
-	//	ds->setSeparatorPos(d->propEditor->tqsizeHint().width(), true);
+	//	ds->setSeparatorPos(d->propEditor->sizeHint().width(), true);
 
 			//heh, this is for IDEAl only, I suppose?
 	//js		if (m_rightContainer) {
@@ -1885,10 +1885,10 @@ void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool tqchildrenMaximized)
 
 	if (tqchildrenMaximized && view) {
 		setCaption( d->curDialog->caption()
-			+ (d->appCaptionPrefix.isEmpty() ? TQString() : (TQString::tqfromLatin1(" - ") + d->appCaptionPrefix)) );
+			+ (d->appCaptionPrefix.isEmpty() ? TQString() : (TQString::fromLatin1(" - ") + d->appCaptionPrefix)) );
 	}
 	else {
-		setCaption( (d->appCaptionPrefix.isEmpty() ? TQString() : (d->appCaptionPrefix + TQString::tqfromLatin1(" - ")))
+		setCaption( (d->appCaptionPrefix.isEmpty() ? TQString() : (d->appCaptionPrefix + TQString::fromLatin1(" - ")))
 			+ d->origAppCaption );
 	}
 }
@@ -2093,8 +2093,8 @@ KexiMainWindowImpl::restoreSettings()
 		}*/
 
 		config->setGroup("MainWindow");
-	    TQSize s ( config->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg(desk.width()), 700 ),
-              config->readNumEntry( TQString::tqfromLatin1("Height %1").tqarg(desk.height()), 480 ) );
+	    TQSize s ( config->readNumEntry( TQString::fromLatin1("Width %1").tqarg(desk.width()), 700 ),
+              config->readNumEntry( TQString::fromLatin1("Height %1").tqarg(desk.height()), 480 ) );
 		resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height()));
 	}
 #endif
@@ -3479,8 +3479,8 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 		KexiVDebug << (focus_w ? focus_w->name() : "" )  << endl;
 		KexiVDebug << "eventFilter: " <<e->type() << " " <<obj->name() <<endl;
 #ifdef KEXI_STATUSBAR_DEBUG
-		TQWidget *focus_widget = focus_w ? focus_w->tqfocusWidget() : 0;
-		d->statusBar->settqStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4")
+		TQWidget *focus_widget = focus_w ? focus_w->focusWidget() : 0;
+		d->statusBar->setStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4")
 			.tqarg(focus_w ? focus_w->className() : "").tqarg(focus_w ? focus_w->name() : "")
 			.tqarg(focus_widget ? focus_widget->className() : "").tqarg(focus_widget ? focus_widget->name() : "")
 			);
@@ -3492,8 +3492,8 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 		KexiVDebug << (focus_w ? focus_w->name() : "" )  << endl;
 		KexiVDebug << "eventFilter: " <<e->type() << " " <<obj->name() <<endl;
 #ifdef KEXI_STATUSBAR_DEBUG
-		TQWidget *focus_widget = focus_w ? focus_w->tqfocusWidget() : 0;
-		d->statusBar->settqStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4")
+		TQWidget *focus_widget = focus_w ? focus_w->focusWidget() : 0;
+		d->statusBar->setStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4")
 			.tqarg(focus_w ? focus_w->className() : "").tqarg(focus_w ? focus_w->name() : "")
 			.tqarg(focus_widget ? focus_widget->className() : "").tqarg(focus_widget ? focus_widget->name() : "")
 			);
@@ -3512,7 +3512,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 //				invalidateSharedActions();
 			}
 			else {
-/*			TQObject* o = tqfocusWidget();
+/*			TQObject* o = focusWidget();
 			while (o && !o->inherits("KexiDialogBase") && !o->inherits("KexiDockBase"))
 				o = o->parent();*/
 //js				invalidateSharedActions(focus_w);
@@ -4409,7 +4409,7 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio
 
 	if (dlg) {
 		// accept row changes
-		TQWidget *prevFocusWidget = tqfocusWidget();
+		TQWidget *prevFocusWidget = focusWidget();
 		dlg->setFocus();
 		d->action_data_save_row->activate();
 		if (prevFocusWidget)
diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h
index 9dbedae3..5f3d887a 100644
--- a/kexi/main/keximainwindowimpl.h
+++ b/kexi/main/keximainwindowimpl.h
@@ -296,7 +296,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		virtual bool acceptsSharedActions(TQObject *w);
 
 		/*! Performs lookup like in KexiSharedActionHost::focusWindow()
-		 but starting from \a w instead of a widget returned by TQWidget::tqfocusWidget().
+		 but starting from \a w instead of a widget returned by TQWidget::focusWidget().
 		 \return NULL if no widget matches acceptsSharedActions() or if \a w is NULL. */
 		TQWidget* findWindow(TQWidget *w);
 
diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h
index c79b58db..98600c62 100644
--- a/kexi/main/keximainwindowimpl_p.h
+++ b/kexi/main/keximainwindowimpl_p.h
@@ -267,7 +267,7 @@ void updatePropEditorDockWidthInfo() {
 #endif
 			} else {
 				//propEditorToolWindow->show();
-				TQWidget *origFocusWidget = tqApp->tqfocusWidget();
+				TQWidget *origFocusWidget = tqApp->focusWidget();
 				wnd->makeWidgetDockVisible(propEditorTabWidget);
 				if (origFocusWidget)
 					origFocusWidget->setFocus();
diff --git a/kexi/main/kexinamedialog.cpp b/kexi/main/kexinamedialog.cpp
index 45cbc449..f3e1acec 100644
--- a/kexi/main/kexinamedialog.cpp
+++ b/kexi/main/kexinamedialog.cpp
@@ -53,12 +53,12 @@ void KexiNameDialog::init()
 {
 	TQGridLayout *lyr = new TQGridLayout(plainPage(), 2, 3);
 	m_icon = new TQLabel( plainPage(), "icon" );
-	m_icon->tqsetAlignment( int( AlignTop | AlignLeft ) );
-	m_icon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred,1,0));
+	m_icon->setAlignment( int( AlignTop | AlignLeft ) );
+	m_icon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred,1,0));
 	m_icon->setFixedWidth(50);
 	lyr->addWidget(m_icon,0,0);
 
-	m_widget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred,1,0));
+	m_widget->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred,1,0));
 	lyr->addWidget(m_widget,0,1);
 	lyr->addItem(new TQSpacerItem( 25, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ), 0, 2);
 	lyr->addItem(new TQSpacerItem( 5, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 1, 1);
@@ -75,7 +75,7 @@ void KexiNameDialog::updateSize()
 {
 //	resize( TQSize(400, 140 + (m_widget->lbl_message->isVisible()?m_widget->lbl_message->height():0) )
 	resize( TQSize(400, 140 + (!m_widget->lbl_message->text().isEmpty()?m_widget->lbl_message->height():0) )
-		.expandedTo(tqminimumSizeHint()) );
+		.expandedTo(minimumSizeHint()) );
 //	updateGeometry();
 }
 
diff --git a/kexi/main/kexinamewidget.cpp b/kexi/main/kexinamewidget.cpp
index c6ca8f41..8f5ee38a 100644
--- a/kexi/main/kexinamewidget.cpp
+++ b/kexi/main/kexinamewidget.cpp
@@ -66,8 +66,8 @@ void KexiNameWidget::init(
 
 	lbl_message = new TQLabel( this, "message" );
 	setMessageText( message );
-	lbl_message->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
-	lbl_message->tqsetAlignment( TQLabel::AlignTop | TQLabel::WordBreak );
+	lbl_message->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+	lbl_message->setAlignment( TQLabel::AlignTop | TQLabel::WordBreak );
 	lyr->addMultiCellWidget( lbl_message, 0, 0, 0, 1 );
 
 	lbl_caption = new TQLabel( captionLabel.isEmpty() ? i18n( "Caption:" ) : captionLabel,
@@ -79,17 +79,17 @@ void KexiNameWidget::init(
 	lyr->addWidget( lbl_name, 2, 0 );
 
 	le_caption = new KLineEdit( nameText, this, "le_caption" );
-	le_caption->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 1, 0));
+	le_caption->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 1, 0));
 	lyr->addWidget( le_caption, 1, 1 );
 
 	le_name = new KLineEdit( nameText, this, "le_name" );
-	le_name->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed,1,0));
+	le_name->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed,1,0));
 	Validator *idValidator = new IdentifierValidator(0, "id_val");
 	le_name->setValidator( m_validator = new MultiValidator(idValidator, TQT_TQOBJECT(this), "val") );
 	lyr->addWidget( le_name, 2, 1 );
 
 	setFocusProxy(le_caption);
-	resize( TQSize(342, 123).expandedTo(tqminimumSizeHint()) );
+	resize( TQSize(342, 123).expandedTo(minimumSizeHint()) );
 
 	m_nameWarning = i18n("Please enter the name.");
 	m_captionWarning = i18n("Please enter the caption.");
diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp
index e4bfd580..439c20b6 100644
--- a/kexi/main/kexistatusbar.cpp
+++ b/kexi/main/kexistatusbar.cpp
@@ -78,7 +78,7 @@ void KexiStatusBar::activePartChanged(KParts::Part *part)
 	if (part && part->widget()) {
 		if ((m_viewmsgIface = dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget()))) {
 			connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ),
-				this, TQT_SLOT( settqStatus( const TQString & ) ) );
+				this, TQT_SLOT( setStatus( const TQString & ) ) );
 
 #  if TDE_VERSION < KDE_MAKE_VERSION(3,1,90)
 			changeItem(m_map[ m_activePart ], m_msgID);
@@ -110,7 +110,7 @@ void KexiStatusBar::cursorPositionChanged()
 #endif
 }
 
-void KexiStatusBar::settqStatus(const TQString &str)
+void KexiStatusBar::setStatus(const TQString &str)
 {
 	kdDebug() << "KexiStatusBar::setStatus(" << str << ")" << endl;
 //	m_status->setText(str);
@@ -133,8 +133,8 @@ void KexiStatusBar::setCursorPosition(int line, int col)
 {
 	KStatusBar::addWidget(widget,stretch,permanent);
 
-	if(widget->tqsizeHint().height() + 4 > height())
-		setFixedHeight(widget->tqsizeHint().height() + 4);
+	if(widget->sizeHint().height() + 4 > height())
+		setFixedHeight(widget->sizeHint().height() + 4);
 }*/
 
 void KexiStatusBar::setReadOnlyFlag(bool readOnly)
diff --git a/kexi/main/kexistatusbar.h b/kexi/main/kexistatusbar.h
index bab1277a..e8c31d41 100644
--- a/kexi/main/kexistatusbar.h
+++ b/kexi/main/kexistatusbar.h
@@ -48,7 +48,7 @@ class KexiStatusBar : public KStatusBar
 //		virtual void addWidget( TQWidget *widget, int stretch = 0, bool permanent = false);
 
 	public slots:
-		virtual void settqStatus(const TQString &str);
+		virtual void setStatus(const TQString &str);
 		virtual void setReadOnlyFlag(bool readOnly);
 
 	protected slots:
@@ -58,7 +58,7 @@ class KexiStatusBar : public KStatusBar
 
 	protected:
 		int m_msgID, m_readOnlyID;
-//		TQLabel *m_status, *m_readOnlytqStatus;
+//		TQLabel *m_status, *m_readOnlyStatus;
 
 #if KexiStatusBar_KTEXTEDITOR_USED
 	KTextEditor::ViewCursorInterface * m_cursorIface;
diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp
index 45ab5892..ac829ce1 100644
--- a/kexi/main/printing/kexisimpleprintingengine.cpp
+++ b/kexi/main/printing/kexisimpleprintingengine.cpp
@@ -278,7 +278,7 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, TQPainter& painter, boo
 		}
 		painter.setFont(m_mainFont);
 
-		m_dateTimeText = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(),
+		m_dateTimeText = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(),
 			true, false);
 		m_dateTimeWidth = painter.fontMetrics().width(m_dateTimeText+"   ");
 		m_mainLineSpacing = painter.fontMetrics().lineSpacing();
diff --git a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
index 6b169f7e..de57e97e 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
+++ b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
@@ -158,7 +158,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>230</width>
                             <height>20</height>
@@ -238,7 +238,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>80</width>
                             <height>6</height>
@@ -343,7 +343,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -360,7 +360,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
@@ -377,7 +377,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
@@ -394,7 +394,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
@@ -411,7 +411,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index 68c1c673..f07722d8 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -196,11 +196,11 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
 	m_scrollView = new KexiSimplePrintPreviewScrollView(this);
 	m_scrollView->setUpdatesEnabled(false);
 	m_view = m_scrollView->widget;
-	m_scrollView->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+	m_scrollView->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 	lyr->addWidget(m_scrollView);
 
 	TQWidget* navToolbarWidget = new TQWidget(this); //widget used to center the navigator toolbar
-	navToolbarWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	navToolbarWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	TQHBoxLayout *navToolbarLyr = new TQHBoxLayout(navToolbarWidget);
 	lyr->addWidget(navToolbarWidget);
 
diff --git a/kexi/main/startup/KexiConnSelectorBase.ui b/kexi/main/startup/KexiConnSelectorBase.ui
index 5c7bb64d..4c371ed2 100644
--- a/kexi/main/startup/KexiConnSelectorBase.ui
+++ b/kexi/main/startup/KexiConnSelectorBase.ui
@@ -72,7 +72,7 @@
                     <verstretch>1</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>60</height>
@@ -149,7 +149,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
@@ -166,7 +166,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
@@ -177,7 +177,7 @@
             <property name="name">
                 <cstring>descGroupBox</cstring>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>80</height>
@@ -205,7 +205,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>50</height>
diff --git a/kexi/main/startup/KexiDBTitlePageBase.ui b/kexi/main/startup/KexiDBTitlePageBase.ui
index 7b711ea3..e8a00ef9 100644
--- a/kexi/main/startup/KexiDBTitlePageBase.ui
+++ b/kexi/main/startup/KexiDBTitlePageBase.ui
@@ -40,7 +40,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>111</height>
@@ -57,7 +57,7 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
@@ -76,7 +76,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>100</width>
                     <height>0</height>
diff --git a/kexi/main/startup/KexiNewPrjTypeSelector.ui b/kexi/main/startup/KexiNewPrjTypeSelector.ui
index 79f763ee..29e52812 100644
--- a/kexi/main/startup/KexiNewPrjTypeSelector.ui
+++ b/kexi/main/startup/KexiNewPrjTypeSelector.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index b24a66ab..625af34f 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -96,7 +96,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
 	//page: type selector
 	m_prjtype_sel = new KexiNewPrjTypeSelector(this, "KexiNewPrjTypeSelector");
 //	lv_types = new KListView(m_prjtype_sel, "types listview");
-//	m_prjtype_sel->lv_types->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2));
+//	m_prjtype_sel->lv_types->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2));
 #if KDE_IS_VERSION(3,3,9)
 	m_prjtype_sel->lv_types->setShadeSortColumn(false);
 #endif
@@ -142,7 +142,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
 	m_conn_sel_widget = new TQWidget(this);
 	TQVBoxLayout* conn_sel_lyr = new TQVBoxLayout(m_conn_sel_widget);
 	TQLabel *conn_sel_label = new TQLabel(i18n("Enter a new Kexi project's file name:"), m_conn_sel_widget);
-	conn_sel_label->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+	conn_sel_label->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
 	conn_sel_lyr->addWidget( conn_sel_label );
 	conn_sel_lyr->addSpacing(KDialogBase::spacingHint());
 
diff --git a/kexi/main/startup/KexiOpenExistingFile.ui b/kexi/main/startup/KexiOpenExistingFile.ui
index f11d7f58..b822f0ff 100644
--- a/kexi/main/startup/KexiOpenExistingFile.ui
+++ b/kexi/main/startup/KexiOpenExistingFile.ui
@@ -43,7 +43,7 @@
             <property name="name">
                 <cstring>line</cstring>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>8</height>
@@ -60,13 +60,13 @@
             <property name="name">
                 <cstring>spacer</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>6</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>6</height>
diff --git a/kexi/main/startup/KexiProjectSelectorBase.ui b/kexi/main/startup/KexiProjectSelectorBase.ui
index 18c80544..57aa28ad 100644
--- a/kexi/main/startup/KexiProjectSelectorBase.ui
+++ b/kexi/main/startup/KexiProjectSelectorBase.ui
@@ -103,7 +103,7 @@
                     <verstretch>1</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>60</height>
diff --git a/kexi/main/startup/KexiServerDBNamePage.ui b/kexi/main/startup/KexiServerDBNamePage.ui
index b423d467..f482ed73 100644
--- a/kexi/main/startup/KexiServerDBNamePage.ui
+++ b/kexi/main/startup/KexiServerDBNamePage.ui
@@ -44,7 +44,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>100</width>
                     <height>0</height>
@@ -55,7 +55,7 @@
             <property name="name">
                 <cstring>le_dbname</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>100</width>
                     <height>0</height>
@@ -72,7 +72,7 @@
             <property name="sizeType">
                 <enum>MinimumExpanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>70</width>
                     <height>20</height>
@@ -89,7 +89,7 @@
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>70</width>
                     <height>20</height>
@@ -128,7 +128,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>12</height>
diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp
index c479a4e0..1708efbc 100644
--- a/kexi/main/startup/KexiStartup.cpp
+++ b/kexi/main/startup/KexiStartup.cpp
@@ -126,7 +126,7 @@ void updateProgressBar(KProgressDialog *pd, char *buffer, int buflen)
 			if (ok && percent>=0 && percent<=100 && pd->progressBar()->progress()<percent) {
 //				kdDebug() << percent << endl;
 				pd->progressBar()->setProgress(percent);
-				tqApp->tqprocessEvents(100);
+				tqApp->processEvents(100);
 			}
 		}
 	}
@@ -176,7 +176,7 @@ KexiDBPasswordDialog::~KexiDBPasswordDialog()
 void KexiDBPasswordDialog::done(int r)
 {
 	if (r == TQDialog::Accepted) {
-		m_cdata->password = TQString::tqfromLatin1(password());
+		m_cdata->password = TQString::fromLatin1(password());
 	}
 //	if (d->showConnectionDetailsExecuted || ret == TQDialog::Accepted) {
 /*			} else {
@@ -364,7 +364,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 	const bool dropDB = args->isSet("dropdb");
 	const bool openExisting = !createDB && !dropDB;
 	const bool readOnly = args->isSet("readonly");
-	const TQString couldnotMsg = TQString::tqfromLatin1("\n")
+	const TQString couldnotMsg = TQString::fromLatin1("\n")
 		+i18n("Could not start Kexi application this way.");
 
 	if (createDB && dropDB) {
@@ -872,19 +872,19 @@ tristate KexiStartupHandler::detectActionForFile(
 	if (detectedDriverName.isEmpty()) {
 		TQString possibleProblemsInfoMsg( Kexi::driverManager().possibleProblemsInfoMsg() );
 		if (!possibleProblemsInfoMsg.isEmpty()) {
-			possibleProblemsInfoMsg.prepend(TQString::tqfromLatin1("<p>")+i18n("Possible problems:"));
-			possibleProblemsInfoMsg += TQString::tqfromLatin1("</p>");
+			possibleProblemsInfoMsg.prepend(TQString::fromLatin1("<p>")+i18n("Possible problems:"));
+			possibleProblemsInfoMsg += TQString::fromLatin1("</p>");
 		}
 		if (!(options & SkipMessages))
 			KMessageBox::detailedSorry(parent, 
 				i18n( "The file \"%1\" is not recognized as being supported by Kexi.")
 					.tqarg(TQDir::convertSeparators(dbFileName)),
-				TQString::tqfromLatin1("<p>")
+				TQString::fromLatin1("<p>")
 				+i18n("Database driver for this file type not found.\nDetected MIME type: %1")
 					.tqarg(mimename)
 				+(ptr.data()->comment().isEmpty() 
-					? TQString::tqfromLatin1(".") : TQString::tqfromLatin1(" (%1).").tqarg(ptr.data()->comment()))
-				+TQString::tqfromLatin1("</p>")
+					? TQString::fromLatin1(".") : TQString::fromLatin1(" (%1).").tqarg(ptr.data()->comment()))
+				+TQString::fromLatin1("</p>")
 				+possibleProblemsInfoMsg);
 		return false;
 	}
@@ -894,7 +894,7 @@ tristate KexiStartupHandler::detectActionForFile(
 KexiProjectData*
 KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *parent)
 {
-	cleartqStatus();
+	clearStatus();
 	cancelled = false;
 	if (!cdata)
 		return 0;
@@ -922,7 +922,7 @@ KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled
 			msgh.showErrorMessage(
 				i18n("Could not load list of available projects for <b>%1</b> database server.")
 				.tqarg(cdata->serverInfoString(true)));
-//		settqStatus(i18n("Could not load list of available projects for database server \"%1\"")
+//		setStatus(i18n("Could not load list of available projects for database server \"%1\"")
 //		.tqarg(cdata->serverInfoString(true)), prjdlg.projectSet()->errorMsg());
 		return 0;
 	}
diff --git a/kexi/main/startup/KexiStartup.h b/kexi/main/startup/KexiStartup.h
index fe1b3cf0..23d8e832 100644
--- a/kexi/main/startup/KexiStartup.h
+++ b/kexi/main/startup/KexiStartup.h
@@ -59,7 +59,7 @@ class KEXIMAIN_EXPORT KexiDBPasswordDialog : public KPasswordDialog
 /*! Handles startup actions for Kexi application.
 */
 class KEXIMAIN_EXPORT KexiStartupHandler 
-	: public TQObject, public KexiStartupData, public Kexi::ObjecttqStatus
+	: public TQObject, public KexiStartupData, public Kexi::ObjectStatus
 {
 	Q_OBJECT
   TQ_OBJECT
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 7f67bc76..91bd6bfc 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -324,7 +324,7 @@ void KexiStartupDialog::setupPageTemplates()
 	tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint());
 	TQLabel *lbl_blank = new TQLabel( 
 		i18n("Kexi will create a new blank database project.")+clickMsg, templPageFrame );
-	lbl_blank->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+	lbl_blank->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
 	lbl_blank->setMargin(0);
 	tmplyr->addWidget( lbl_blank );
 	tmplyr->addStretch(1);
@@ -342,7 +342,7 @@ void KexiStartupDialog::setupPageTemplates()
 	TQLabel *lbl_templ = new TQLabel( 
 		i18n("Kexi will create a new database project using selected template.\n"
 		"Select template and click \"OK\" button to proceed."), templPageFrame );
-	lbl_templ->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+	lbl_templ->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
 	lbl_templ->setMargin(0);
 	tmplyr->addWidget( lbl_templ );
 
@@ -389,7 +389,7 @@ void KexiStartupDialog::setupPageTemplates()
 	TQLabel *lbl_import = new TQLabel( 
 		i18n("Kexi will import the structure and data of an existing database as a new database project.")
 		+clickMsg, templPageFrame );
-	lbl_import->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+	lbl_import->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
 	lbl_import->setMargin(0);
 	tmplyr->addWidget( lbl_import );
 	tmplyr->addStretch(1);
diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp
index cd54602b..1e50a12d 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -42,7 +42,7 @@ KexiStartupFileDialog::KexiStartupFileDialog(
 	, m_confirmOverwrites(true)
 	, m_filtersUpdated(false)
 {
-	tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum);
+	setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum);
 	setMode( mode );
 	
 	TQPoint point( 0, 0 );
diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp
index c81de131..67a44ca6 100644
--- a/kexi/main/startup/KexiStartupFileDialog_win.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp
@@ -197,7 +197,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
     coll->action( "mkdir" )->setWhatsThis(i18n("Click this button to create a new directory."));
 
     d->bookmarkHandler = new KFileBookmarkHandler( this );
-    toolbar->insertButton(TQString::tqfromLatin1("bookmark"),
+    toolbar->insertButton(TQString::fromLatin1("bookmark"),
                           (int)HOTLIST_BUTTON, true,
                           i18n("Bookmarks"));
     toolbar->getButton(HOTLIST_BUTTON)->setPopup( d->bookmarkHandler->menu(),
@@ -441,7 +441,7 @@ void KexiStartupFileDialogBase::setMimeFilter( const TQStringList& mimeTypes,
 //(js)    filterWidget->setMimeFilter( mimeTypes, defaultType );
 
 //(js)    TQStringList types = TQStringList::split(" ", filterWidget->currentFilter());
-//(js)    types.append( TQString::tqfromLatin1( "inode/directory" ));
+//(js)    types.append( TQString::fromLatin1( "inode/directory" ));
 //(js)    ops->clearFilter();
 //(js)    ops->setMimeFilter( types );
 //(js)    d->hasDefaultFilter = !defaultType.isEmpty();