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

This reverts commit 631a19d8c5c5f69dc0d941c1997806fb422c79a6.

5 files changed, 11 insertions, 11 deletions

diff --git a/tests/exportdatebook.cc b/tests/exportdatebook.cc
index d4cf8c5..18bbf34 100644
--- a/tests/exportdatebook.cc
+++ b/tests/exportdatebook.cc
@@ -123,7 +123,7 @@ int main(int argc, char **argv)
 
 		KCalSync::setEvent(event, d,*fAppointmentAppInfo->categoryInfo());
 
-		event->setSyncStatus( KCal::Incidence::SYNCNONE );
+		event->setSynctqStatus( KCal::Incidence::SYNCNONE );
 
 		calendar->addEvent(event);
 
diff --git a/tests/importdatebook.cc b/tests/importdatebook.cc
index ebbb701..979794f 100644
--- a/tests/importdatebook.cc
+++ b/tests/importdatebook.cc
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
 		<< "], creating DatebookDB in: [" << datadir
 		<< "]" << endl;
 
-	KCal::CalendarLocal *calendar = new KCal::CalendarLocal( TQString::fromLatin1("UTC") );
+	KCal::CalendarLocal *calendar = new KCal::CalendarLocal( TQString::tqfromLatin1("UTC") );
 	if (!calendar || !calendar->load( vcalfile ))
 	{
 		return 1;
diff --git a/tests/mergecalendars.cc b/tests/mergecalendars.cc
index 898eb8c..2fc1e78 100644
--- a/tests/mergecalendars.cc
+++ b/tests/mergecalendars.cc
@@ -84,8 +84,8 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	TQString korgsave = TQString("%1.updated").arg(korgfile);
-	TQString newfilesave = TQString("%1.updated").arg(newfile);
+	TQString korgsave = TQString("%1.updated").tqarg(korgfile);
+	TQString newfilesave = TQString("%1.updated").tqarg(newfile);
 
 	DEBUGKPILOT << "Using korgfile: [" << korgfile 
 		<< "]" << endl;
@@ -96,8 +96,8 @@ int main(int argc, char **argv)
 	DEBUGKPILOT << "Will save newfile to: [" << newfilesave
 		<< "]" << endl << endl;
 
-	KCal::CalendarLocal *calkorg = new KCal::CalendarLocal( TQString::fromLatin1("UTC") );
-	KCal::CalendarLocal *calnew = new KCal::CalendarLocal( TQString::fromLatin1("UTC") );
+	KCal::CalendarLocal *calkorg = new KCal::CalendarLocal( TQString::tqfromLatin1("UTC") );
+	KCal::CalendarLocal *calnew = new KCal::CalendarLocal( TQString::tqfromLatin1("UTC") );
 	if (!calkorg || !calnew)
 	{
 		WARNINGKPILOT << "Unable to create base calendar objects." << endl;
@@ -154,7 +154,7 @@ int main(int argc, char **argv)
 				<< pilotId << "]" << endl;
 
 			ev->setPilotId(pilotId);
-			ev->setSyncStatus(KCal::Incidence::SYNCMOD);
+			ev->setSynctqStatus(KCal::Incidence::SYNCMOD);
 
 			++numkorgpilotids;
 		}
diff --git a/tests/testcategories.cc b/tests/testcategories.cc
index aefb8b9..a29a307 100644
--- a/tests/testcategories.cc
+++ b/tests/testcategories.cc
@@ -53,7 +53,7 @@ TQStringList categories( const PilotAppInfoBase *appinfo )
 		TQString cat = appinfo->categoryName(i);
 		if (!cat.isEmpty())
 		{
-			TQString s = CSL1("(%1:%2)").arg(i).arg(cat);
+			TQString s = CSL1("(%1:%2)").tqarg(i).tqarg(cat);
 			cats.append(s);
 		}
 	}
@@ -123,7 +123,7 @@ void categoryNames( const TQString &dir )
 	DEBUGKPILOT << "# Expect three truncation errors and two bad category numbers." << endl;
 	for (unsigned int i=0; i<Pilot::CATEGORY_COUNT+2; i++)
 	{
-		TQString name = TQString::fromLatin1(funnyname+funnyname_length-i-3);
+		TQString name = TQString::tqfromLatin1(funnyname+funnyname_length-i-3);
 		if (!appinfo->setCategoryName(i,name))
 		{
 			WARNINGKPILOT << "Failed to set category " << i << " name to <" << name << ">" << endl;
diff --git a/tests/testdatabase.cc b/tests/testdatabase.cc
index 02b43c6..7a88089 100644
--- a/tests/testdatabase.cc
+++ b/tests/testdatabase.cc
@@ -105,7 +105,7 @@ int checkDatabase(const char *path, recordInfo *info)
 {
 	FUNCTIONSETUP;
 
-	PilotLocalDatabase db(TQString::fromLatin1(path));
+	PilotLocalDatabase db(TQString::tqfromLatin1(path));
 	if (!db.isOpen())
 	{
 		kdDebug() << "No database " << path << endl;
@@ -191,7 +191,7 @@ TQStringList listCategories()
 		cats.append(s);
 /*
 		if (i<((sizeof(categoryNames) / sizeof(categoryNames[0]))))
-			m->setCategoryName(i,TQString::fromLatin1(categoryNames[i]));
+			m->setCategoryName(i,TQString::tqfromLatin1(categoryNames[i]));
 */
 	}