1 files changed, 25 insertions, 25 deletions

diff --git a/kexi/widget/tableview/kexidataawarepropertyset.cpp b/kexi/widget/tableview/kexidataawarepropertyset.cpp
index 92fda11e5..7d49ec522 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.cpp
+++ b/kexi/widget/tableview/kexidataawarepropertyset.cpp
@@ -28,19 +28,19 @@
 
 KexiDataAwarePropertySet::KexiDataAwarePropertySet(KexiViewBase *view,
 	KexiDataAwareObjectInterface* dataObject)
- : QObject( view, QCString(view->name())+"KexiDataAwarePropertySet" )
+ : TQObject( view, TQCString(view->name())+"KexiDataAwarePropertySet" )
  , m_view(view)
  , m_dataObject(dataObject)
  , m_row(-99)
 {
 	m_sets.setAutoDelete(true);
 
-//	connect(m_dataObject, SIGNAL(dataSet(KexiTableViewData*)),
-//		this, SLOT(slotDataSet(KexiTableViewData*)));
-	m_dataObject->connectDataSetSignal(this, SLOT(slotDataSet(KexiTableViewData*)));
-//	connect(m_dataObject, SIGNAL(cellSelected(int,int)),
-//		this, SLOT(slotCellSelected(int,int)));
-	m_dataObject->connectCellSelectedSignal(this, SLOT(slotCellSelected(int,int)));
+//	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)));
 //
 	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, SIGNAL(rowDeleted()), this, SLOT(slotRowDeleted()));
-		connect(m_currentTVData, SIGNAL(rowsDeleted( const QValueList<int> & )),
-			this, SLOT(slotRowsDeleted( const QValueList<int> & )));
-		connect(m_currentTVData, SIGNAL(rowInserted(KexiTableItem*,uint,bool)),
-			this, SLOT(slotRowInserted(KexiTableItem*,uint,bool)));
-		connect(m_currentTVData, SIGNAL(reloadRequested()),
-			this, SLOT(slotReloadRequested()));
+		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()));
 	}
 }
 
@@ -92,10 +92,10 @@ uint KexiDataAwarePropertySet::size() const
 	return m_sets.size();
 }
 
-void KexiDataAwarePropertySet::clear(uint minimumSize)
+void KexiDataAwarePropertySet::clear(uint tqminimumSize)
 {
 	m_sets.clear();
-	m_sets.resize(QMAX(minimumSize, MAX_FIELDS));
+	m_sets.resize(TQMAX(tqminimumSize, MAX_FIELDS));
 	m_view->setDirty(true);
 	m_view->propertySetSwitched();
 }
@@ -111,14 +111,14 @@ void KexiDataAwarePropertySet::insert(uint row, KoProperty::Set* set, bool newOn
 		kexiwarn << "KexiDataAwarePropertySet::insert() invalid args: rew="<< row<< " propertyset="<< set<< endl;
 		return;
 	}
-	if (set->parent() && set->parent()!=this) {
-		kexiwarn << "KexiDataAwarePropertySet::insert() propertyset's parent must be NULL or this KexiDataAwarePropertySet" << endl;
+	if (set->tqparent() && set->tqparent()!=this) {
+		kexiwarn << "KexiDataAwarePropertySet::insert() propertyset's tqparent must be NULL or this KexiDataAwarePropertySet" << endl;
 		return;
 	}
 
 	m_sets.insert(row, set);
 
-	connect(set, SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), m_view, SLOT(setDirty()));
+	connect(set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), m_view, TQT_SLOT(setDirty()));
 
 	if (newOne) {
 		//add a special property indicating that this is brand new set,
@@ -159,14 +159,14 @@ void KexiDataAwarePropertySet::slotRowDeleted()
 	emit rowDeleted();
 }
 
-void KexiDataAwarePropertySet::slotRowsDeleted( const QValueList<int> &rows )
+void KexiDataAwarePropertySet::slotRowsDeleted( const TQValueList<int> &rows )
 {
 	//let's move most property sets up & delete unwanted
 	m_sets.setAutoDelete(false);//to avoid auto deleting in insert()
 	const int orig_size = size();
 	int prev_r = -1;
 	int num_removed = 0, cur_r = -1;
-	for (QValueList<int>::ConstIterator r_it = rows.constBegin(); r_it!=rows.constEnd() && *r_it < orig_size; ++r_it) {
+	for (TQValueList<int>::ConstIterator r_it = rows.constBegin(); r_it!=rows.constEnd() && *r_it < orig_size; ++r_it) {
 		cur_r = *r_it;// - num_removed;
 		if (prev_r>=0) {
 //			kdDebug() << "move " << prev_r+num_removed-1 << ".." << cur_r-1 << " to " << prev_r+num_removed-1 << ".." << cur_r-2 << endl;
@@ -206,7 +206,7 @@ void KexiDataAwarePropertySet::slotRowsDeleted( const QValueList<int> &rows )
 }
 
 //void KexiDataAwarePropertySet::slotEmptyRowInserted(KexiTableItem*, uint /*index*/)
-void KexiDataAwarePropertySet::slotRowInserted(KexiTableItem*, uint row, bool /*repaint*/)
+void KexiDataAwarePropertySet::slotRowInserted(KexiTableItem*, uint row, bool /*tqrepaint*/)
 {
 	m_view->setDirty();
 
@@ -238,18 +238,18 @@ KoProperty::Set* KexiDataAwarePropertySet::findPropertySetForItem(KexiTableItem&
 {
 	if (m_currentTVData.isNull())
 		return 0;
-	int idx = m_currentTVData->findRef(&item);
+	int idx = m_currentTVData->tqfindRef(&item);
 	if (idx<0)
 		return 0;
 	return m_sets[idx];
 }
 
-int KexiDataAwarePropertySet::findRowForPropertyValue(const QCString& propertyName, const QVariant& value)
+int KexiDataAwarePropertySet::findRowForPropertyValue(const TQCString& propertyName, const TQVariant& value)
 {
 	const int size = m_sets.size();
 	for (int i=0; i<size; i++) {
 		KoProperty::Set *set = m_sets[i];
-		if (!set || !set->contains(propertyName))
+		if (!set || !set->tqcontains(propertyName))
 			continue;
 		if (set->property(propertyName).value() == value)
 			return i;