Rename additional global TQt functions

11 files changed, 24 insertions, 24 deletions

diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp
index 1ba85265..4c7bc9ea 100644
--- a/kexi/core/kexisharedactionhost.cpp
+++ b/kexi/core/kexisharedactionhost.cpp
@@ -246,12 +246,12 @@ KAction* KexiSharedActionHost::createSharedAction(const TQString &text, const TQ
 			new KAction(text, pix_name,
 			cut, 0/*receiver*/, 0/*slot*/, col ? col : d->mainWin->actionCollection(), name)
 		);
-	else if (qstricmp(subclassName,"KToggleAction")==0)
+	else if (tqstricmp(subclassName,"KToggleAction")==0)
 		return createSharedActionInternal(
 			new KToggleAction(text, pix_name,
 			cut, 0/*receiver*/, 0/*slot*/, col ? col : d->mainWin->actionCollection(), name)
 		);
-	else if (qstricmp(subclassName,"KActionMenu")==0)
+	else if (tqstricmp(subclassName,"KActionMenu")==0)
 		return createSharedActionInternal(
 			new KActionMenu(text, pix_name, col ? col : d->mainWin->actionCollection(), name)
 		);
diff --git a/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp b/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp
index 7b245d9a..74479fe7 100644
--- a/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp
@@ -153,7 +153,7 @@ bool MySqlPreparedStatement::execute()
 		if (field->isTextType()) {
 //! @todo optimize
 m_stringBuffer[ 1024 ]; ???
-			char *str = qstrncpy(m_stringBuffer, (const char*)(*it).toString().utf8(), 1024);
+			char *str = tqstrncpy(m_stringBuffer, (const char*)(*it).toString().utf8(), 1024);
 			m_mysqlBind[arg].buffer_type = MYSQL_TYPE_STRING;
 			m_mysqlBind[arg].buffer = m_stringBuffer;
 			m_mysqlBind[arg].is_null = (my_bool*)0;
diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp
index 38a7d386..1d2e5295 100644
--- a/kexi/kexidb/parser/parser_p.cpp
+++ b/kexi/kexidb/parser/parser_p.cpp
@@ -84,11 +84,11 @@ void yyerror(const char *str)
 	KexiDBDbg << "at character " << current << " near tooken " << ctoken << endl;
 	parser->setOperation(Parser::OP_Error);
 
-	const bool otherError = (qstrnicmp(str, "other error", 11)==0);
+	const bool otherError = (tqstrnicmp(str, "other error", 11)==0);
 	
 	if (parser->error().type().isEmpty() 
 		&& (str==0 || strlen(str)==0 
-		|| qstrnicmp(str, "syntax error", 12)==0 || qstrnicmp(str, "parse error", 11)==0)
+		|| tqstrnicmp(str, "syntax error", 12)==0 || tqstrnicmp(str, "parse error", 11)==0)
 		|| otherError)
 	{
 		KexiDBDbg << parser->statement() << endl;
diff --git a/kexi/kexidb/simplecommandlineapp.cpp b/kexi/kexidb/simplecommandlineapp.cpp
index 570043fe..c0f95391 100644
--- a/kexi/kexidb/simplecommandlineapp.cpp
+++ b/kexi/kexidb/simplecommandlineapp.cpp
@@ -108,17 +108,17 @@ SimpleCommandLineApp::SimpleCommandLineApp(
 	d->allOptions = new KCmdLineOptions[predefinedOptionsCount + userOptionsCount + 1];
 	KCmdLineOptions *allOptionsPtr = d->allOptions;
 	for (KCmdLineOptions *optionsPtr = predefinedOptions; optionsPtr->name; optionsPtr++, allOptionsPtr++) {
-		allOptionsPtr->name = qstrdup(optionsPtr->name);
-		allOptionsPtr->description = qstrdup(optionsPtr->description);
+		allOptionsPtr->name = tqstrdup(optionsPtr->name);
+		allOptionsPtr->description = tqstrdup(optionsPtr->description);
 		if (optionsPtr == predefinedOptions) //first row == drv
-			allOptionsPtr->def = qstrdup(KexiDB::Driver::defaultFileBasedDriverName().latin1());
+			allOptionsPtr->def = tqstrdup(KexiDB::Driver::defaultFileBasedDriverName().latin1());
 		else
-			allOptionsPtr->def = qstrdup(optionsPtr->def);
+			allOptionsPtr->def = tqstrdup(optionsPtr->def);
 	}
 	for (KCmdLineOptions *optionsPtr = options; optionsPtr->name; optionsPtr++, allOptionsPtr++) {
-		allOptionsPtr->name = qstrdup(optionsPtr->name);
-		allOptionsPtr->description = qstrdup(optionsPtr->description);
-		allOptionsPtr->def = qstrdup(optionsPtr->def);
+		allOptionsPtr->name = tqstrdup(optionsPtr->name);
+		allOptionsPtr->description = tqstrdup(optionsPtr->description);
+		allOptionsPtr->def = tqstrdup(optionsPtr->def);
 	}
 	allOptionsPtr->name = 0; //end
 	allOptionsPtr->description = 0;
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
index 489640a2..7934ec71 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
@@ -86,7 +86,7 @@ void KexiMacroProperty::init()
 	}
 
 	//TESTCASE!!!!!!!!!!!!!!!!!!!!!!
-	//if(! variable->isEnabled()) qFatal( TQString("############## VARIABLE=%1").arg(variable->name()).latin1() );
+	//if(! variable->isEnabled()) tqFatal( TQString("############## VARIABLE=%1").arg(variable->name()).latin1() );
 
 	Q_ASSERT(! d->name.isNull());
 	m_property->setName( d->name.latin1() );
diff --git a/kexi/plugins/macros/tests/komacrotest.cpp b/kexi/plugins/macros/tests/komacrotest.cpp
index 55d017a9..cc64aa8d 100644
--- a/kexi/plugins/macros/tests/komacrotest.cpp
+++ b/kexi/plugins/macros/tests/komacrotest.cpp
@@ -53,6 +53,6 @@ int main( int argc, char** argv )
 	}
 	// mmh seems we forgot to catch an exception...
 	catch(...) {
-		qFatal("Unhandled Exception!");
+		tqFatal("Unhandled Exception!");
 	}
 }
diff --git a/kexi/plugins/macros/tests/komacrotestgui.cpp b/kexi/plugins/macros/tests/komacrotestgui.cpp
index abf4459d..cddb4596 100644
--- a/kexi/plugins/macros/tests/komacrotestgui.cpp
+++ b/kexi/plugins/macros/tests/komacrotestgui.cpp
@@ -55,6 +55,6 @@ int main( int argc, char** argv )
 	}
 	// mmh seems we forgot to catch an exception...
 	catch(...) {
-		qFatal("Unhandled Exception!");
+		tqFatal("Unhandled Exception!");
 	}
 }
diff --git a/kexi/tests/altertable/altertable.cpp b/kexi/tests/altertable/altertable.cpp
index 55cd5a1c..7e8af75b 100644
--- a/kexi/tests/altertable/altertable.cpp
+++ b/kexi/tests/altertable/altertable.cpp
@@ -216,7 +216,7 @@ AlterTableTester::AlterTableTester()
  , m_finishedCopying(false)
 {
 	//copy the db file to a temp file
-	qInitNetworkProtocols();
+	tqInitNetworkProtocols();
 	TQPtrList<TQNetworkOperation> list = m_copyOperator.copy( 
 		"file://" + TQDir::current().path() + "/" + origDbFilename, 
 		"file://" + TQDir::current().path() + "/" + dbFilename, false, false );
@@ -687,8 +687,8 @@ int main(int argc, char *argv[])
 
 	newArgc = 2;
 	newArgv = new char*[newArgc];
-	newArgv[0] = qstrdup(argv[0]);
-	newArgv[1] = qstrdup( "--skip-startup-dialog" );
+	newArgv[0] = tqstrdup(argv[0]);
+	newArgv[1] = tqstrdup( "--skip-startup-dialog" );
 
 	KAboutData* aboutdata = Kexi::createAboutData();
 	aboutdata->setProgramName( "Kexi Alter Table Test" );
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index f5e3a376..a766c597 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -643,7 +643,7 @@ void KexiTableView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch)
 		rowlast = tmp;
 	}
 
-// 	qDebug("cx:%3d cy:%3d w:%3d h:%3d col:%2d..%2d row:%2d..%2d tsize:%4d,%4d", 
+// 	tqDebug("cx:%3d cy:%3d w:%3d h:%3d col:%2d..%2d row:%2d..%2d tsize:%4d,%4d", 
 //	cx, cy, cw, ch, colfirst, collast, rowfirst, rowlast, tableSize().width(), tableSize().height());
 //	triggerUpdate();
 
@@ -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*)parentWidget()->caption(),cx,cy,cw,ch);
+//  tqDebug("%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/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
index 5e0b7ab8..4931eb19 100644
--- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
+++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
@@ -71,15 +71,15 @@ void KexiComboBoxDropDownButton::drawButton(TQPainter *p)
 void KexiComboBoxDropDownButton::styleChange( TQStyle & oldStyle )
 {
 	//<hack>
-	if (qstricmp(style().name(),"thinkeramik")==0) {
+	if (tqstricmp(style().name(),"thinkeramik")==0) {
 		m_fixForHeight = 3;
 	}
 	else
 		m_fixForHeight = 0;
 	//</hack>
 	m_drawComplexControl =
-		(style().inherits("KStyle") && qstricmp(style().name(),"qtcurve")!=0)
-		|| qstricmp(style().name(),"platinum")==0;
+		(style().inherits("KStyle") && tqstricmp(style().name(),"qtcurve")!=0)
+		|| tqstricmp(style().name(),"platinum")==0;
 	if (m_fixForHeight==0)
 		setFixedWidth( style().querySubControlMetrics( TQStyle::CC_ComboBox, 
 			(const TQWidget*)m_paintedCombo, TQStyle::SC_ComboBoxArrow ).width() +1 );
diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp
index 0710b4d0..fa9b2497 100644
--- a/kexi/widget/utils/kexidropdownbutton.cpp
+++ b/kexi/widget/utils/kexidropdownbutton.cpp
@@ -33,7 +33,7 @@ KexiDropDownButton::KexiDropDownButton(TQWidget *parent)
 //	setFixedWidth(TQMAX(18, tqApp->globalStrut().width()));
 	int fixedWidth;
 	//hack
-	if (qstricmp(style().name(),"thinkeramik")==0)
+	if (tqstricmp(style().name(),"thinkeramik")==0)
 		fixedWidth = 18; //typical width as in "windows" style
 	else
 		fixedWidth = style().querySubControlMetrics( TQStyle::CC_ComboBox,