Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

5 files changed, 27 insertions, 27 deletions

diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp
index ae35334b..2be89bb0 100644
--- a/kexi/widget/relations/kexirelationview.cpp
+++ b/kexi/widget/relations/kexirelationview.cpp
@@ -81,7 +81,7 @@ KexiRelationView::KexiRelationView(TQWidget *tqparent, const char *name)
 		this, TQT_SLOT(openSelectedTableQuery()), 0/*tqparent->actionCollection()*/, "relationsview_openSelectedTableQuery");
 #endif
 
-//	tqinvalidateActions();
+//	invalidateActions();
 
 #if 0
 
@@ -91,7 +91,7 @@ KexiRelationView::KexiRelationView(TQWidget *tqparent, const char *name)
 	m_removeSelectedTableQueryAction->plug( m_popup );
 	m_removeSelectedConnectionAction->plug( m_popup );
 
-	tqinvalidateActions();
+	invalidateActions();
 #endif
 
 	tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, true);
@@ -334,7 +334,7 @@ KexiRelationView::setReadOnly(bool b)
 {
 	m_readOnly=b;
 //TODO
-//	tqinvalidateActions();
+//	invalidateActions();
 /*	TableList::Iterator it, end( m_tables.end() );	
  	for ( it=m_tables.begin(); it != end; ++it)
 	{
@@ -381,7 +381,7 @@ KexiRelationView::contentsMousePressEvent(TQMouseEvent *ev)
 		updateContents(cview->connectionRect());
 		m_selectedConnection = cview;
 		emit connectionViewGotFocus();
-//		tqinvalidateActions();
+//		invalidateActions();
 
 		if(ev->button() == Qt::RightButton) {//show popup
 			kdDebug() << "KexiRelationView::contentsMousePressEvent(): context" << endl;
@@ -395,7 +395,7 @@ KexiRelationView::contentsMousePressEvent(TQMouseEvent *ev)
 	}
 	//connection not found
 	clearSelection();
-//	tqinvalidateActions();
+//	invalidateActions();
 	if(ev->button() == Qt::RightButton) {//show popup on view background area
 //		TQPopupMenu m;
 //			m_removeSelectedConnectionAction->plug( &m );
@@ -415,13 +415,13 @@ void KexiRelationView::clearSelection()
 		m_focusedTableView->unsetFocus();
 		m_focusedTableView = 0;
 //		setFocus();
-//		tqinvalidateActions();
+//		invalidateActions();
 	}
 	if (m_selectedConnection) {
 		m_selectedConnection->setSelected(false);
 		updateContents(m_selectedConnection->connectionRect());
 		m_selectedConnection = 0;
-//		tqinvalidateActions();
+//		invalidateActions();
 	}
 }
 
@@ -516,7 +516,7 @@ KexiRelationView::removeSelectedObject()
 #endif
 		delete m_selectedConnection;
 		m_selectedConnection = 0;
-//		tqinvalidateActions();
+//		invalidateActions();
 	}
 	else if (m_focusedTableView) {
 		KexiRelationViewTableContainer *tmp = m_focusedTableView;
@@ -580,7 +580,7 @@ void KexiRelationView::slotTableViewGotFocus()
 //	if (m_focusedTableView)
 //		m_focusedTableView->unsetFocus();
 	m_focusedTableView = (KexiRelationViewTableContainer*)sender();
-//	tqinvalidateActions();
+//	invalidateActions();
 	emit tableViewGotFocus();
 }
 
@@ -614,12 +614,12 @@ void KexiRelationView::tableHeaderContextMenuRequest(const TQPoint& pos)
 	if (m_focusedTableView != sender())
 		return;
 	kdDebug() << "HEADER CTXT MENU!" <<endl;
-	tqinvalidateActions();
+	invalidateActions();
 	m_tableQueryPopup->exec(pos);	
 }
 
 //! Invalidates all actions availability
-void KexiRelationView::tqinvalidateActions()
+void KexiRelationView::invalidateActions()
 {
 	setAvailable("edit_delete", m_selectedConnection || m_focusedTableView);
 }
diff --git a/kexi/widget/relations/kexirelationview.h b/kexi/widget/relations/kexirelationview.h
index b5d1785d..dcf78834 100644
--- a/kexi/widget/relations/kexirelationview.h
+++ b/kexi/widget/relations/kexirelationview.h
@@ -151,7 +151,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView
 
 		void recalculateSize(int width, int height);
 		void stretchExpandSize();
-//		void		tqinvalidateActions();
+//		void		invalidateActions();
 //		void clearTableSelection();
 //		void clearConnSelection();
 
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index c850d722..2145cf20 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -214,7 +214,7 @@ bool KexiRelationViewTableContainerHeader::eventFilter(TQObject *, TQEvent *ev)
 			diffY=TQT_TQMOUSEEVENT(ev)->globalPos().y()-m_grabY;
 			if ((abs(diffX)>2) || (abs(diffY)>2))
 			{
-				TQPoint newPos=tqparentWidget()->pos()+TQPoint(diffX,diffY);
+				TQPoint newPos=parentWidget()->pos()+TQPoint(diffX,diffY);
 //correct the x position
 				if (newPos.x()<0) {
 					m_offsetX+=newPos.x();
@@ -244,7 +244,7 @@ bool KexiRelationViewTableContainerHeader::eventFilter(TQObject *, TQEvent *ev)
 				}
 //move and update helpers
 
-				tqparentWidget()->move(newPos);
+				parentWidget()->move(newPos);
 				m_grabX=TQT_TQMOUSEEVENT(ev)->globalPos().x();
 				m_grabY=TQT_TQMOUSEEVENT(ev)->globalPos().y();
 //				kdDebug()<<"HEADER:emitting moved"<<endl;
@@ -258,7 +258,7 @@ bool KexiRelationViewTableContainerHeader::eventFilter(TQObject *, TQEvent *ev)
 
 void KexiRelationViewTableContainerHeader::mousePressEvent(TQMouseEvent *ev) {
 	kdDebug()<<"KexiRelationViewTableContainerHeader::Mouse Press Event"<<endl;
-	tqparentWidget()->setFocus();
+	parentWidget()->setFocus();
 	ev->accept();
 	if (ev->button()==Qt::LeftButton) {
 		m_dragging=true;
@@ -270,7 +270,7 @@ void KexiRelationViewTableContainerHeader::mousePressEvent(TQMouseEvent *ev) {
 		return;
 	}
 	if (ev->button()==Qt::RightButton) {
-		emit static_cast<KexiRelationViewTableContainer*>(tqparentWidget())
+		emit static_cast<KexiRelationViewTableContainer*>(parentWidget())
 			->contextMenuRequest(ev->globalPos());
 	}
 //	TQLabel::mousePressEvent(ev);
@@ -410,11 +410,11 @@ KexiRelationViewTable::slotContentsMoving(int,int)
 
 void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev)
 {
-	tqparentWidget()->setFocus();
+	parentWidget()->setFocus();
 	setFocus();
 	KListView::contentsMousePressEvent(ev);
 //	if (ev->button()==Qt::RightButton)
-//		static_cast<KexiRelationView*>(tqparentWidget())->executePopup(ev->pos());
+//		static_cast<KexiRelationView*>(parentWidget())->executePopup(ev->pos());
 }
 
 TQRect KexiRelationViewTable::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp
index 7ef5a961..e48a5d00 100644
--- a/kexi/widget/relations/kexirelationwidget.cpp
+++ b/kexi/widget/relations/kexirelationwidget.cpp
@@ -129,7 +129,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *tqparent,
 		TQTimer::singleShot(100,this,TQT_SLOT(slotAddTable()));
 #endif
 
-	tqinvalidateActions();
+	invalidateActions();
 }
 
 KexiRelationWidget::~KexiRelationWidget()
@@ -228,39 +228,39 @@ void KexiRelationWidget::tableViewGotFocus()
 //	if (m_focusedTableView)
 //		m_focusedTableView->unsetFocus();
 //	m_focusedTableView = (KexiRelationViewTableContainer*)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
-	tqinvalidateActions();
+	invalidateActions();
 }
 
 void KexiRelationWidget::connectionViewGotFocus()
 {
-	tqinvalidateActions();
+	invalidateActions();
 }
 
 void KexiRelationWidget::emptyAreaGotFocus()
 {
-	tqinvalidateActions();
+	invalidateActions();
 }
 
 void KexiRelationWidget::tableContextMenuRequest(const TQPoint& pos)
 {
-	tqinvalidateActions();
+	invalidateActions();
 	executePopup( pos );
 }
 
 void KexiRelationWidget::connectionContextMenuRequest(const TQPoint& pos)
 {
-	tqinvalidateActions();
+	invalidateActions();
 	executePopup( pos );
 //	m_connectionPopup->exec(pos);
 }
 
 void KexiRelationWidget::emptyAreaContextMenuRequest( const TQPoint& /*pos*/ )
 {
-	tqinvalidateActions();
+	invalidateActions();
 	//TODO
 }
 
-void KexiRelationWidget::tqinvalidateActions()
+void KexiRelationWidget::invalidateActions()
 {
 	setAvailable("edit_delete", m_relationView->selectedConnection() || m_relationView->focusedTableView());
 }
diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h
index 869dbf11..20a70174 100644
--- a/kexi/widget/relations/kexirelationwidget.h
+++ b/kexi/widget/relations/kexirelationwidget.h
@@ -115,7 +115,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase
 		void executePopup( TQPoint pos = TQPoint(-1,-1) );
 
 		//! Invalidates all actions availability.
-		void tqinvalidateActions();
+		void invalidateActions();
 
 		//! Fills table's combo box with all available table names.
 		void fillTablesCombo();