7 files changed, 12 insertions, 12 deletions
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index 4352c260..dbf95ad6 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -88,7 +88,7 @@ KexiBlobTableEdit::KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *tqpa
 //	m_proc = 0;
 //	m_content = 0;
 	m_hasFocusableWidget = false;
-	d->button = new KexiDropDownButton( tqparentWidget() /*usually a viewport*/ );
+	d->button = new KexiDropDownButton( parentWidget() /*usually a viewport*/ );
 	d->button->hide();
 	TQToolTip::add(d->button, i18n("Click to show available actions for this cell"));
 
diff --git a/kexi/widget/tableview/kexicomboboxbase.cpp b/kexi/widget/tableview/kexicomboboxbase.cpp
index 19cf0b99..89ba63cf 100644
--- a/kexi/widget/tableview/kexicomboboxbase.cpp
+++ b/kexi/widget/tableview/kexicomboboxbase.cpp
@@ -482,7 +482,7 @@ void KexiComboBoxBase::slotItemSelected(KexiTableItem*)
 		if (valueToSet.toString().isEmpty() && !m_insideCreatePopup) {
 			clear();
 			TQWidget* thisWidget = dynamic_cast<TQWidget*>(this);
-			thisWidget->tqparentWidget()->setFocus();
+			thisWidget->parentWidget()->setFocus();
 			return;
 		}
 	}
diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp
index 65edd806..4fe8b940 100644
--- a/kexi/widget/tableview/kexicomboboxpopup.cpp
+++ b/kexi/widget/tableview/kexicomboboxpopup.cpp
@@ -298,9 +298,9 @@ void KexiComboBoxPopup::updateSize(int minWidth)
 
 	d->tv->adjustColumnWidthToContents(-1);
 
-	KexiTableEdit *te = dynamic_cast<KexiTableEdit*>(tqparentWidget());
+	KexiTableEdit *te = dynamic_cast<KexiTableEdit*>(parentWidget());
 	const int width = TQMAX( d->tv->tableSize().width(), 
-		(te ? te->totalSize().width() : (tqparentWidget()?tqparentWidget()->width():0/*sanity*/)) );
+		(te ? te->totalSize().width() : (parentWidget()?parentWidget()->width():0/*sanity*/)) );
 	kexidbg << "KexiComboBoxPopup::updateSize(): size=" << size() << endl;
 	resize( TQMAX(minWidth, width)/*+(d->tv->columns()>1?2:0)*/ /*(d->updateSizeCalled?0:1)*/, d->tv->rowHeight() * rows +2 );
 	kexidbg << "KexiComboBoxPopup::updateSize(): size after=" << size() << endl;
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp
index ba61e305..4695dbf8 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.cpp
+++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp
@@ -68,7 +68,7 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg
 {
 	setName("KexiComboBoxTableEdit");
 	m_setVisibleValueOnSetValueInternal = true;
-	d->button = new KexiComboBoxDropDownButton( tqparentWidget() /*usually a viewport*/ );
+	d->button = new KexiComboBoxDropDownButton( parentWidget() /*usually a viewport*/ );
 	d->button->hide();
 	d->button->setFocusPolicy( TQ_NoFocus );
 	connect(d->button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotButtonClicked()));
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 799a1a8b..9fc319ff 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -128,7 +128,7 @@ KexiTableViewCellToolTip::KexiTableViewCellToolTip( KexiTableView * tableView )
 
 KexiTableViewCellToolTip::~KexiTableViewCellToolTip()
 {
-	remove(tqparentWidget());
+	remove(parentWidget());
 }
 
 void KexiTableViewCellToolTip::maybeTip( const TQPoint & p )
@@ -718,8 +718,8 @@ void KexiTableView::paintCell(TQPainter* p, KexiTableItem *item, int col, int ro
 	int x2 = w - 1;
 	int y2 = h - 1;
 
-/*	if (0==qstrcmp("KexiComboBoxPopup",tqparentWidget()->className())) {
-	  kexidbg  << tqparentWidget()->className() << " >>>>>> KexiTableView::paintCell(col=" << col <<"row="<<row<<") w="<<w<<endl;
+/*	if (0==qstrcmp("KexiComboBoxPopup",parentWidget()->className())) {
+	  kexidbg  << parentWidget()->className() << " >>>>>> KexiTableView::paintCell(col=" << col <<"row="<<row<<") w="<<w<<endl;
 	}*/
 
 	//	Draw our lines
@@ -923,7 +923,7 @@ TQPoint KexiTableView::viewportToContents2( const TQPoint& vp )
 
 void KexiTableView::paintEmptyArea( TQPainter *p, int cx, int cy, int cw, int ch )
 {
-//  qDebug("%s: paintEmptyArea(x:%d y:%d w:%d h:%d)", (const char*)tqparentWidget()->caption(),cx,cy,cw,ch);
+//  qDebug("%s: paintEmptyArea(x:%d y:%d w:%d h:%d)", (const char*)parentWidget()->caption(),cx,cy,cw,ch);
 
 	// Regions work with shorts, so avoid an overflow and adjust the
 	// table size to the visible size
diff --git a/kexi/widget/tableview/kexitableviewdata.h b/kexi/widget/tableview/kexitableviewdata.h
index 56241fcb..b22d619d 100644
--- a/kexi/widget/tableview/kexitableviewdata.h
+++ b/kexi/widget/tableview/kexitableviewdata.h
@@ -285,7 +285,7 @@ public:
 	inline bool isDBAware() { return m_cursor; }
 
 	/*! For db-aware data set only: table name is returned;
-	 equivalent to cursor()->query()->tqparentTable()->name(). */
+	 equivalent to cursor()->query()->parentTable()->name(). */
 	TQString dbTableName() const;
 
 	inline KexiDB::Cursor* cursor() const { return m_cursor; }
diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp
index 05212dd1..f6a839e3 100644
--- a/kexi/widget/tableview/kexitableviewheader.cpp
+++ b/kexi/widget/tableview/kexitableviewheader.cpp
@@ -31,8 +31,8 @@
 class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy
 {
 	public:
-		KexiTableViewHeaderStyle(TQStyle *tqparentStyle, TQWidget *widget)
-		 : KexiUtils::StyleProxy(tqparentStyle)
+		KexiTableViewHeaderStyle(TQStyle *parentStyle, TQWidget *widget)
+		 : KexiUtils::StyleProxy(parentStyle)
 		{
 			setBackgroundColor( widget->tqpalette().active().background() );
 		}