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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

7 files changed, 34 insertions, 34 deletions

diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp
index e3537aa5..18c19ef9 100644
--- a/kexi/widget/relations/kexirelationview.cpp
+++ b/kexi/widget/relations/kexirelationview.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 
 #include <tqstringlist.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqheader.h>
 #include <tqevent.h>
@@ -57,7 +57,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name)
 
 //	connect(relation, TQT_SIGNAL(relationListUpdated(TQObject *)), this, TQT_SLOT(slotListUpdate(TQObject *)));
 
-	viewport()->setPaletteBackgroundColor(colorGroup().mid());
+	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
 	setFocusPolicy(TQ_WheelFocus);
 	setResizePolicy(Manual);
 /*MOVED TO KexiRelationDialog
@@ -94,7 +94,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name)
 	invalidateActions();
 #endif
 
-	setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, true);
+	tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, true);
 }
 
 KexiRelationView::~KexiRelationView()
@@ -146,13 +146,13 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect)
 	
 	addChild(c, 100,100);
 	if (rect.isValid()) {//predefined size
-		TQSize finalSize = c->size().expandedTo( c->sizeHint() );
+		TQSize finalSize = c->size().expandedTo( c->tqsizeHint() );
 		TQRect r = rect;
 		r.setSize( finalSize + TQSize(0,10) );
 		moveChild( c, rect.left(), rect.top() );
 		//we're doing this instead of setGeometry(rect)
 		//because the geomenty might be saved on other system with bigger fonts :)
-		c->resize(c->sizeHint());
+		c->resize(c->tqsizeHint());
 //		c->setGeometry(r);
 //TODO
 
@@ -164,7 +164,7 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect)
 	updateGeometry();
 	if (!rect.isValid()) {
 		c->updateGeometry();
-		c->resize(c->sizeHint());
+		c->resize(c->tqsizeHint());
 	}
 	int x, y;
 
@@ -584,9 +584,9 @@ void KexiRelationView::slotTableViewGotFocus()
 	emit tableViewGotFocus();
 }
 
-TQSize KexiRelationView::sizeHint() const
+TQSize KexiRelationView::tqsizeHint() const
 {
-	return TQSize(TQScrollView::sizeHint());//.width(), 600);
+	return TQSize(TQScrollView::tqsizeHint());//.width(), 600);
 }
 
 void KexiRelationView::clear()
diff --git a/kexi/widget/relations/kexirelationview.h b/kexi/widget/relations/kexirelationview.h
index 33d988b9..6bc31b31 100644
--- a/kexi/widget/relations/kexirelationview.h
+++ b/kexi/widget/relations/kexirelationview.h
@@ -78,7 +78,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView
 		TablesDict* tables() { return &m_tables; }
 
 		/*! Adds a table \a t to the area. This changes only visual representation.
-		 If \a rect is valid, table widget geometry will be initialized.
+		 If \a rect is valid, table widget tqgeometry will be initialized.
 		 \return added table container or 0 on failure.
 		 */
 		KexiRelationViewTableContainer* addTableContainer(KexiDB::TableSchema *t, 
@@ -96,7 +96,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView
 
 		inline KexiRelationViewTableContainer* focusedTableView() const { return m_focusedTableView; }
 
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 		const ConnectionList* connections() const { return &m_connectionViews; }
 
diff --git a/kexi/widget/relations/kexirelationviewconnection.cpp b/kexi/widget/relations/kexirelationviewconnection.cpp
index fe3b5a53..c0635c1b 100644
--- a/kexi/widget/relations/kexirelationviewconnection.cpp
+++ b/kexi/widget/relations/kexirelationviewconnection.cpp
@@ -67,7 +67,7 @@ KexiRelationViewConnection::~KexiRelationViewConnection()
 void
 KexiRelationViewConnection::drawConnection(TQPainter *p)
 {
-	p->setPen(m_parent->palette().active().foreground());
+	p->setPen(m_parent->tqpalette().active().foreground());
 	int sx = m_masterTable->x() + m_masterTable->width() + m_parent->contentsX();
 	int sy = m_masterTable->globalY(m_masterField);
 	int rx = m_detailsTable->x() + m_parent->contentsX();
@@ -92,7 +92,7 @@ KexiRelationViewConnection::drawConnection(TQPainter *p)
 		pa.setPoint(0, rx - 4, ry - 3);
 		pa.setPoint(1, rx - 4, ry + 3);
 		pa.setPoint(2, rx - 1, ry);
-		p->drawPolygon(pa, true);
+		p->tqdrawPolygon(pa, true);
 		
 		//master side
 		p->drawLine(sx, sy - 1, sx + side1CharWidth -1, sy - 1);
@@ -134,7 +134,7 @@ KexiRelationViewConnection::drawConnection(TQPainter *p)
 		pa.setPoint(0, lx + 3, ry - 3);
 		pa.setPoint(1, lx + 3, ry + 3);
 		pa.setPoint(2, lx, ry);
-		p->drawPolygon(pa, true);
+		p->tqdrawPolygon(pa, true);
 		
 //		p->drawLine(lx, ry, lx + 8, ry);
 //		p->drawPoint(lx + 1, ry - 1);
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index 5de32b91..55440da4 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcursor.h>
@@ -61,18 +61,18 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer(
 	m_tableHeader = new KexiRelationViewTableContainerHeader(schema->name(), this);
 
 	m_tableHeader->unsetFocus();
-	m_tableHeader->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+	m_tableHeader->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
 	lyr->addWidget(m_tableHeader);
 	connect(m_tableHeader,TQT_SIGNAL(moved()),this,TQT_SLOT(moved()));
 	connect(m_tableHeader, TQT_SIGNAL(endDrag()), this, TQT_SIGNAL(endDrag()));
 
 	m_tableView = new KexiRelationViewTable(schema, parent, this, "KexiRelationViewTable");
 	//m_tableHeader->setFocusProxy( m_tableView );
-	m_tableView->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+	m_tableView->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
 	
-	m_tableView->setMaximumSize( m_tableView->sizeHint() );
+	m_tableView->setMaximumSize( m_tableView->tqsizeHint() );
 	
-//	m_tableView->resize( m_tableView->sizeHint() );
+//	m_tableView->resize( m_tableView->tqsizeHint() );
 	lyr->addWidget(m_tableView, 0);
 	connect(m_tableView, TQT_SIGNAL(tableScrolling()), this, TQT_SLOT(moved()));
 	connect(m_tableView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
@@ -110,13 +110,13 @@ int KexiRelationViewTableContainer::globalY(const TQString &field)
 }
 
 #if 0//js
-TQSize KexiRelationViewTableContainer::sizeHint()
+TQSize KexiRelationViewTableContainer::tqsizeHint()
 {
 #ifdef TQ_WS_WIN
-	TQSize s = m_tableView->sizeHint()
+	TQSize s = m_tableView->tqsizeHint()
 		+ TQSize(  2 * 5 , m_tableHeader->height() + 2 * 5 );
 #else
-	TQSize s = m_tableView->sizeHint();
+	TQSize s = m_tableView->tqsizeHint();
 	s.setWidth(s.width() + 4);
 	s.setHeight(m_tableHeader->height() + s.height());
 #endif
@@ -140,7 +140,7 @@ void KexiRelationViewTableContainer::setFocus()
 	m_tableView->setPalette(p);*/
 
 	raise();
-	repaint();
+	tqrepaint();
 	emit gotFocus();
 }
 
@@ -166,7 +166,7 @@ void KexiRelationViewTableContainer::unsetFocus()
 	m_tableView->setPalette(p);*/
 	
 	clearFocus();
-	repaint();
+	tqrepaint();
 }
 
 
@@ -307,7 +307,7 @@ KexiRelationViewTable::~KexiRelationViewTable()
 {
 }
 
-TQSize KexiRelationViewTable::sizeHint() const
+TQSize KexiRelationViewTable::tqsizeHint() const
 {
 	TQFontMetrics fm(fontMetrics());
 
@@ -341,7 +341,7 @@ KexiRelationViewTable::globalY(const TQString &item)
 	TQListViewItem *i = findItem(item, 0);
 	if (!i)
 		return -1;
-	int y = itemRect(i).y() + (itemRect(i).height() / 2);
+	int y = tqitemRect(i).y() + (tqitemRect(i).height() / 2);
 	if (contentsY() > itemPos(i))
 		y = 0;
 	else if (y == 0)
@@ -420,10 +420,10 @@ void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev)
 TQRect KexiRelationViewTable::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
 {
 	if (painter) {
-		tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(),
+		tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, tqitemRect(item), tqcolorGroup(),
 			TQStyle::Style_FocusAtBorder);
 	}
-	return itemRect(item);
+	return tqitemRect(item);
 }
 
 #include "kexirelationviewtable.moc"
diff --git a/kexi/widget/relations/kexirelationviewtable.h b/kexi/widget/relations/kexirelationviewtable.h
index 6578cdd5..5c622dad 100644
--- a/kexi/widget/relations/kexirelationviewtable.h
+++ b/kexi/widget/relations/kexirelationviewtable.h
@@ -105,7 +105,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTable : public KexiFieldListView
 //		KexiDB::TableSchema *table() const { return m_table; };
 		int globalY(const TQString &item);
 //		void setReadOnly(bool);
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 	signals:
 		void tableScrolling();
diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp
index 0ff65f38..4b952163 100644
--- a/kexi/widget/relations/kexirelationwidget.cpp
+++ b/kexi/widget/relations/kexirelationwidget.cpp
@@ -21,7 +21,7 @@
 
 #include "kexirelationwidget.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
 #include <tqtimer.h>
@@ -59,7 +59,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent,
 	m_tableCombo->setInsertionPolicy(TQComboBox::NoInsertion);
 	hlyr->addWidget(lbl);
 	hlyr->addWidget(m_tableCombo);
-	m_tableCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred));
+	m_tableCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred));
 	fillTablesCombo();
 
 	m_btnAdd = new KPushButton(i18n("&Add"), this);
@@ -302,9 +302,9 @@ void KexiRelationWidget::designSelectedTable()
 		Kexi::DesignViewMode, openingCancelled);
 }
 
-TQSize KexiRelationWidget::sizeHint() const
+TQSize KexiRelationWidget::tqsizeHint() const
 {
-	return m_relationView->sizeHint();
+	return m_relationView->tqsizeHint();
 }
 
 void KexiRelationWidget::slotTableHidden(KexiDB::TableSchema &table)
diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h
index 6899a434..39ac549a 100644
--- a/kexi/widget/relations/kexirelationwidget.h
+++ b/kexi/widget/relations/kexirelationwidget.h
@@ -60,7 +60,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase
 
 //		void openTable(KexiDB::TableSchema* table, bool designMode);
 
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 		/*! Used to add newly created object information to the combo box. */
 		void objectCreated(const TQCString &mime, const TQCString& name);
@@ -76,7 +76,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase
 	
 	public slots:
 		/*! Adds a table \a t to the area. This changes only visual representation.
-		 If \a rect is valid, table widget rgeometry will be initialized.
+		 If \a rect is valid, table widget rtqgeometry will be initialized.
 		 */
 		void addTable(KexiDB::TableSchema *t, const TQRect &rect = TQRect());