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

This reverts commit 252fce5a2a5384702fbcc1c9987284d7bd2e6943.

1 files changed, 23 insertions, 23 deletions

diff --git a/kmymoney2/mymoney/mymoneyaccounttest.cpp b/kmymoney2/mymoney/mymoneyaccounttest.cpp
index 12ea7f1..a7c55af 100644
--- a/kmymoney2/mymoney/mymoneyaccounttest.cpp
+++ b/kmymoney2/mymoney/mymoneyaccounttest.cpp
@@ -49,8 +49,8 @@ void MyMoneyAccountTest::testConstructor() {
 	MyMoneyAccount r;
 	MyMoneySplit s;
 	r.setAccountType(MyMoneyAccount::Asset);
-	r.setOpeningDate(TQDate::currentDate());
-	r.setLastModified(TQDate::currentDate());
+	r.setOpeningDate(TQDate::tqcurrentDate());
+	r.setLastModified(TQDate::tqcurrentDate());
 	r.setDescription("Desc");
 	r.setNumber("465500");
 	r.setParentAccountId(parent);
@@ -65,8 +65,8 @@ void MyMoneyAccountTest::testConstructor() {
 	CPPUNIT_ASSERT(a.id() == id);
 	CPPUNIT_ASSERT(a.institutionId().isEmpty());
 	CPPUNIT_ASSERT(a.accountType() == MyMoneyAccount::Asset);
-	CPPUNIT_ASSERT(a.openingDate() == TQDate::currentDate());
-	CPPUNIT_ASSERT(a.lastModified() == TQDate::currentDate());
+	CPPUNIT_ASSERT(a.openingDate() == TQDate::tqcurrentDate());
+	CPPUNIT_ASSERT(a.lastModified() == TQDate::tqcurrentDate());
 	CPPUNIT_ASSERT(a.number() == "465500");
 	CPPUNIT_ASSERT(a.description() == "Desc");
 	CPPUNIT_ASSERT(a.accountList().count() == 0);
@@ -82,7 +82,7 @@ void MyMoneyAccountTest::testConstructor() {
 void MyMoneyAccountTest::testSetFunctions() {
 	MyMoneyAccount a;
 
-	TQDate today(TQDate::currentDate());
+	TQDate today(TQDate::tqcurrentDate());
 	CPPUNIT_ASSERT(a.name().isEmpty());
 	CPPUNIT_ASSERT(a.lastModified() == TQDate());
 	CPPUNIT_ASSERT(a.description().isEmpty());
@@ -108,8 +108,8 @@ void MyMoneyAccountTest::testCopyConstructor() {
 	TQString parent = "ParentAccount";
 	MyMoneyAccount r;
 	r.setAccountType(MyMoneyAccount::Expense);
-	r.setOpeningDate(TQDate::currentDate());
-	r.setLastModified(TQDate::currentDate());
+	r.setOpeningDate(TQDate::tqcurrentDate());
+	r.setLastModified(TQDate::tqcurrentDate());
 	r.setName("Account");
 	r.setInstitutionId("Inst1");
 	r.setDescription("Desc1");
@@ -125,8 +125,8 @@ void MyMoneyAccountTest::testCopyConstructor() {
 	CPPUNIT_ASSERT(b.name() == "Account");
 	CPPUNIT_ASSERT(b.institutionId() == institutionid);
 	CPPUNIT_ASSERT(b.accountType() == MyMoneyAccount::Expense);
-	CPPUNIT_ASSERT(b.lastModified() == TQDate::currentDate());
-	CPPUNIT_ASSERT(b.openingDate() == TQDate::currentDate());
+	CPPUNIT_ASSERT(b.lastModified() == TQDate::tqcurrentDate());
+	CPPUNIT_ASSERT(b.openingDate() == TQDate::tqcurrentDate());
 	CPPUNIT_ASSERT(b.description() == "Desc1");
 	CPPUNIT_ASSERT(b.number() == "Number");
 	CPPUNIT_ASSERT(b.parentAccountId() == "ParentAccount");
@@ -146,7 +146,7 @@ void MyMoneyAccountTest::testAssignmentConstructor() {
 
 	MyMoneyAccount b;
 
-	b.setLastModified(TQDate::currentDate());
+	b.setLastModified(TQDate::tqcurrentDate());
 
 	b = a;
 
@@ -199,13 +199,13 @@ void MyMoneyAccountTest::testEquality()
 {
 	MyMoneyAccount a;
 
-	a.setLastModified(TQDate::currentDate());
+	a.setLastModified(TQDate::tqcurrentDate());
 	a.setName("Name");
 	a.setNumber("Number");
 	a.setDescription("Desc");
 	a.setInstitutionId("I-ID");
-	a.setOpeningDate(TQDate::currentDate());
-	a.setLastReconciliationDate(TQDate::currentDate());
+	a.setOpeningDate(TQDate::tqcurrentDate());
+	a.setLastReconciliationDate(TQDate::tqcurrentDate());
 	a.setAccountType(MyMoneyAccount::Asset);
 	a.setParentAccountId("P-ID");
 	a.setId("A-ID");
@@ -221,7 +221,7 @@ void MyMoneyAccountTest::testEquality()
 	CPPUNIT_ASSERT(!(b == a));
 	b = a;
 
-	a.setLastModified(TQDate::currentDate().addDays(-1));
+	a.setLastModified(TQDate::tqcurrentDate().addDays(-1));
 	CPPUNIT_ASSERT(!(b == a));
 	b = a;
 
@@ -237,11 +237,11 @@ void MyMoneyAccountTest::testEquality()
 	CPPUNIT_ASSERT(!(b == a));
 	b = a;
 
-	a.setOpeningDate(TQDate::currentDate().addDays(-1));
+	a.setOpeningDate(TQDate::tqcurrentDate().addDays(-1));
 	CPPUNIT_ASSERT(!(b == a));
 	b = a;
 
-	a.setLastReconciliationDate(TQDate::currentDate().addDays(-1));
+	a.setLastReconciliationDate(TQDate::tqcurrentDate().addDays(-1));
 	CPPUNIT_ASSERT(!(b == a));
 	b = a;
 
@@ -278,8 +278,8 @@ void MyMoneyAccountTest::testWriteXML() {
 
 	MyMoneyAccount r;
 	r.setAccountType(MyMoneyAccount::Asset);
-	r.setOpeningDate(TQDate::currentDate());
-	r.setLastModified(TQDate::currentDate());
+	r.setOpeningDate(TQDate::tqcurrentDate());
+	r.setLastModified(TQDate::tqcurrentDate());
 	r.setDescription("Desc");
 	r.setName("AccountName");
 	r.setNumber("465500");
@@ -309,7 +309,7 @@ void MyMoneyAccountTest::testWriteXML() {
 		"  </KEYVALUEPAIRS>\n"
 		" </ACCOUNT>\n"
 		"</ACCOUNT-CONTAINER>\n").
-			arg(TQDate::currentDate().toString(Qt::ISODate)).arg(TQDate::currentDate().toString(Qt::ISODate));
+			arg(TQDate::tqcurrentDate().toString(Qt::ISODate)).tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate));
 
 	CPPUNIT_ASSERT(doc.toString() == ref);
 }
@@ -330,7 +330,7 @@ void MyMoneyAccountTest::testReadXML() {
 		"  </KEYVALUEPAIRS>\n"
 		" </ACCOUNT>\n"
 		"</ACCOUNT-CONTAINER>\n").
-			arg(TQDate::currentDate().toString(Qt::ISODate)).arg(TQDate::currentDate().toString(Qt::ISODate));
+			arg(TQDate::tqcurrentDate().toString(Qt::ISODate)).tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate));
 
 	TQString ref_false = TQString(
 		"<!DOCTYPE TEST>\n"
@@ -346,7 +346,7 @@ void MyMoneyAccountTest::testReadXML() {
 		"  </KEYVALUEPAIRS>\n"
 		" </KACCOUNT>\n"
 		"</ACCOUNT-CONTAINER>\n").
-			arg(TQDate::currentDate().toString(Qt::ISODate)).arg(TQDate::currentDate().toString(Qt::ISODate));
+			arg(TQDate::tqcurrentDate().toString(Qt::ISODate)).tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate));
 
 	TQDomDocument doc;
 	TQDomElement node;
@@ -371,11 +371,11 @@ void MyMoneyAccountTest::testReadXML() {
 		CPPUNIT_ASSERT(a.id() == "A000001");
 		CPPUNIT_ASSERT(a.m_name == "AccountName");
 		CPPUNIT_ASSERT(a.m_parentAccount == "Parent");
-		CPPUNIT_ASSERT(a.m_lastModified == TQDate::currentDate());
+		CPPUNIT_ASSERT(a.m_lastModified == TQDate::tqcurrentDate());
 		CPPUNIT_ASSERT(a.m_lastReconciliationDate == TQDate());
 		CPPUNIT_ASSERT(a.m_institution == "B000001");
 		CPPUNIT_ASSERT(a.m_number == "465500");
-		CPPUNIT_ASSERT(a.m_openingDate == TQDate::currentDate());
+		CPPUNIT_ASSERT(a.m_openingDate == TQDate::tqcurrentDate());
 		CPPUNIT_ASSERT(a.m_accountType == MyMoneyAccount::Asset);
 		CPPUNIT_ASSERT(a.m_description == "Desc");
 		CPPUNIT_ASSERT(a.accountList().count() == 2);