1 files changed, 26 insertions, 26 deletions

diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp
index a4e45daf..5905706b 100644
--- a/kexi/widget/tableview/kexitableviewdata.cpp
+++ b/kexi/widget/tableview/kexitableviewdata.cpp
@@ -509,8 +509,8 @@ int KexiTableViewData::cmpStr(Item item1, Item item2)
 	const TQString &as = m_leftTmp.toString();
 	const TQString &bs = m_rightTmp.toString();
 
-	const TQChar *a = as.unicode();
-	const TQChar *b = bs.unicode();
+	const TQChar *a = as.tqunicode();
+	const TQChar *b = bs.tqunicode();
 
 	if ( a == b )
 		return 0;
@@ -524,16 +524,16 @@ int KexiTableViewData::cmpStr(Item item1, Item item2)
 
 	int l=TQMIN(as.length(),bs.length());
 
-	au = a->unicode();
-	bu = b->unicode();
+	au = a->tqunicode();
+	bu = b->tqunicode();
 	au = (au <= 0x17e ? charTable[au] : 0xffff);
 	bu = (bu <= 0x17e ? charTable[bu] : 0xffff);
 
 	while (l-- && au == bu)
 	{
 		a++,b++;
-		au = a->unicode();
-		bu = b->unicode();
+		au = a->tqunicode();
+		bu = b->tqunicode();
 		au = (au <= 0x17e ? charTable[au] : 0xffff);
 		bu = (bu <= 0x17e ? charTable[bu] : 0xffff);
 	}
@@ -635,7 +635,7 @@ bool KexiTableViewData::updateRowEditBufferRef(KexiTableItem *item,
 	}
 
 //! @todo if there're multiple views for this data, we need multiple buffers!
-bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool repaint)
+bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool tqrepaint)
 {
 	if (!m_pRowEditBuffer)
 		return true; //nothing to do
@@ -655,7 +655,7 @@ bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool repaint)
 			if (val->isNull() && !f->isAutoIncrement()) {
 				//NOT NULL violated
 				m_result.msg = i18n("\"%1\" column requires a value to be entered.")
-					.arg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData();
+					.tqarg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData();
 				m_result.desc = i18n("The column's constraint is declared as NOT NULL.");
 				m_result.column = col;
 				return false;
@@ -666,7 +666,7 @@ bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool repaint)
 			if (!f->isAutoIncrement() && (val->isNull() || KexiDB::isEmptyValue( f, *val ))) {
 				//NOT EMPTY violated
 				m_result.msg = i18n("\"%1\" column requires a value to be entered.")
-					.arg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData();
+					.tqarg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData();
 				m_result.desc = i18n("The column's constraint is declared as NOT EMPTY.");
 				m_result.column = col;
 				return false;
@@ -721,12 +721,12 @@ js: TODO: use KexiMainWindowImpl::showErrorMessage(const TQString &title, KexiDB
 	
 	m_pRowEditBuffer->clear();
 
-	if (repaint)
+	if (tqrepaint)
 		emit rowRepaintRequested(item);
 	return true;
 }
 
-bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool repaint)
+bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool tqrepaint)
 {
 	kdDebug() << "KexiTableViewData::saveRowChanges()..." << endl;
 	m_result.clear();
@@ -734,32 +734,32 @@ bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool repaint)
 	if (!m_result.success)
 		return false;
 
-	if (saveRow(item, false /*update*/, repaint)) {
+	if (saveRow(item, false /*update*/, tqrepaint)) {
 		emit rowUpdated(&item);
 		return true;
 	}
 	return false;
 }
 
-bool KexiTableViewData::saveNewRow(KexiTableItem& item, bool repaint)
+bool KexiTableViewData::saveNewRow(KexiTableItem& item, bool tqrepaint)
 {
 	kdDebug() << "KexiTableViewData::saveNewRow()..." << endl;
 	m_result.clear();
-	emit aboutToInsertRow(&item, &m_result, repaint);
+	emit aboutToInsertRow(&item, &m_result, tqrepaint);
 	if (!m_result.success)
 		return false;
 	
-	if (saveRow(item, true /*insert*/, repaint)) {
-		emit rowInserted(&item, repaint);
+	if (saveRow(item, true /*insert*/, tqrepaint)) {
+		emit rowInserted(&item, tqrepaint);
 		return true;
 	}
 	return false;
 }
 
-bool KexiTableViewData::deleteRow(KexiTableItem& item, bool repaint)
+bool KexiTableViewData::deleteRow(KexiTableItem& item, bool tqrepaint)
 {
 	m_result.clear();
-	emit aboutToDeleteRow(item, &m_result, repaint);
+	emit aboutToDeleteRow(item, &m_result, tqrepaint);
 	if (!m_result.success)
 		return false;
 
@@ -784,9 +784,9 @@ bool KexiTableViewData::deleteRow(KexiTableItem& item, bool repaint)
 	return true;
 }
 
-void KexiTableViewData::deleteRows( const TQValueList<int> &rowsToDelete, bool repaint )
+void KexiTableViewData::deleteRows( const TQValueList<int> &rowsToDelete, bool tqrepaint )
 {
-	Q_UNUSED( repaint );
+	Q_UNUSED( tqrepaint );
 
 	if (rowsToDelete.isEmpty())
 		return;
@@ -804,11 +804,11 @@ void KexiTableViewData::deleteRows( const TQValueList<int> &rowsToDelete, bool r
 	emit rowsDeleted( rowsToDelete );
 }
 
-void KexiTableViewData::insertRow(KexiTableItem& item, uint index, bool repaint)
+void KexiTableViewData::insertRow(KexiTableItem& item, uint index, bool tqrepaint)
 {
 	if (!insert( index = TQMIN(index, count()), &item ))
 		return;
-	emit rowInserted(&item, index, repaint);
+	emit rowInserted(&item, index, tqrepaint);
 }
 
 void KexiTableViewData::clearInternal()
@@ -822,12 +822,12 @@ void KexiTableViewData::clearInternal()
 		removeLast();
 #ifndef KEXI_NO_PROCESS_EVENTS
 		if (i % 1000 == 0)
-			tqApp->processEvents( 1 );
+			tqApp->tqprocessEvents( 1 );
 #endif
 	}
 }
 
-bool KexiTableViewData::deleteAllRows(bool repaint)
+bool KexiTableViewData::deleteAllRows(bool tqrepaint)
 {
 	clearInternal();
 
@@ -837,7 +837,7 @@ bool KexiTableViewData::deleteAllRows(bool repaint)
 		res = m_cursor->deleteAllRows();
 	}
 
-	if (repaint)
+	if (tqrepaint)
 		emit reloadRequested();
 	return res;
 }
@@ -873,7 +873,7 @@ void KexiTableViewData::preloadAllRows()
 		m_cursor->moveNext();
 #ifndef KEXI_NO_PROCESS_EVENTS
 		if ((i % 1000) == 0)
-			tqApp->processEvents( 1 );
+			tqApp->tqprocessEvents( 1 );
 #endif
 	}
 }