Rename old tq methods that no longer need a unique name

1 files changed, 23 insertions, 23 deletions

diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index 85bc17392..1de9e8323 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -61,17 +61,17 @@ using namespace KCal;
 
 TQString AlarmCalendar::icalProductId()
 {
-	return TQString::tqfromLatin1("-//K Desktop Environment//NONSGML " KALARM_NAME " %1//EN").tqarg(KAlarm::currentCalendarVersionString());
+	return TQString::fromLatin1("-//K Desktop Environment//NONSGML " KALARM_NAME " %1//EN").tqarg(KAlarm::currentCalendarVersionString());
 }
 
-static const KAEvent::tqStatus eventTypes[AlarmCalendar::NCALS] = {
+static const KAEvent::Status eventTypes[AlarmCalendar::NCALS] = {
 	KAEvent::ACTIVE, KAEvent::EXPIRED, KAEvent::DISPLAYING, KAEvent::TEMPLATE
 };
 static const TQString calendarNames[AlarmCalendar::NCALS] = {
-	TQString::tqfromLatin1("calendar.ics"),
-	TQString::tqfromLatin1("expired.ics"),
-	TQString::tqfromLatin1("displaying.ics"),
-	TQString::tqfromLatin1("template.ics")
+	TQString::fromLatin1("calendar.ics"),
+	TQString::fromLatin1("expired.ics"),
+	TQString::fromLatin1("displaying.ics"),
+	TQString::fromLatin1("template.ics")
 };
 static KStaticDeleter<AlarmCalendar> calendarDeleter[AlarmCalendar::NCALS];    // ensure that the calendar destructors are called
 
@@ -91,10 +91,10 @@ AlarmCalendar* AlarmCalendar::mCalendars[NCALS] = { 0, 0, 0, 0 };
 bool AlarmCalendar::initialiseCalendars()
 {
 	KConfig* config = kapp->config();
-	config->setGroup(TQString::tqfromLatin1("General"));
-	TQString activeKey   = TQString::tqfromLatin1("Calendar");
-	TQString expiredKey  = TQString::tqfromLatin1("ExpiredCalendar");
-	TQString templateKey = TQString::tqfromLatin1("TemplateCalendar");
+	config->setGroup(TQString::fromLatin1("General"));
+	TQString activeKey   = TQString::fromLatin1("Calendar");
+	TQString expiredKey  = TQString::fromLatin1("ExpiredCalendar");
+	TQString templateKey = TQString::fromLatin1("TemplateCalendar");
 	TQString displayCal, activeCal, expiredCal, templateCal;
 	calendarDeleter[ACTIVE].setObject(mCalendars[ACTIVE], createCalendar(ACTIVE, config, activeCal, activeKey));
 	calendarDeleter[EXPIRED].setObject(mCalendars[EXPIRED], createCalendar(EXPIRED, config, expiredCal, expiredKey));
@@ -152,8 +152,8 @@ bool AlarmCalendar::initialiseCalendars()
 */
 AlarmCalendar* AlarmCalendar::createCalendar(CalID type, KConfig* config, TQString& writePath, const TQString& configKey)
 {
-	static TQRegExp vcsRegExp(TQString::tqfromLatin1("\\.vcs$"));
-	static TQString ical = TQString::tqfromLatin1(".ics");
+	static TQRegExp vcsRegExp(TQString::fromLatin1("\\.vcs$"));
+	static TQString ical = TQString::fromLatin1(".ics");
 
 	if (configKey.isNull())
 	{
@@ -206,7 +206,7 @@ const KCal::Event* AlarmCalendar::getEvent(const TQString& uniqueID)
 	if (uniqueID.isEmpty())
 		return 0;
 	CalID calID;
-	switch (KAEvent::uidtqStatus(uniqueID))
+	switch (KAEvent::uidStatus(uniqueID))
 	{
 		case KAEvent::ACTIVE:      calID = ACTIVE;  break;
 		case KAEvent::TEMPLATE:    calID = TEMPLATE;  break;
@@ -261,7 +261,7 @@ bool AlarmCalendar::open()
 
 	kdDebug(5950) << "AlarmCalendar::open(" << mUrl.prettyURL() << ")\n";
 	if (!mCalendar)
-		mCalendar = new CalendarLocal(TQString::tqfromLatin1("UTC"));
+		mCalendar = new CalendarLocal(TQString::fromLatin1("UTC"));
 	mCalendar->setLocalTime();    // write out using local time (i.e. no time zone)
 
 	// Check for file's existence, assuming that it does exist when uncertain,
@@ -404,7 +404,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile)
 		if (!mConfigKey.isNull())
 		{
 			KConfig* config = kapp->config();
-			config->setGroup(TQString::tqfromLatin1("General"));
+			config->setGroup(TQString::fromLatin1("General"));
 			config->writePathEntry(mConfigKey, mICalUrl.path());
 			config->sync();
 		}
@@ -445,8 +445,8 @@ void AlarmCalendar::close()
 */
 bool AlarmCalendar::importAlarms(TQWidget* parent)
 {
-	KURL url = KFileDialog::getOpenURL(TQString::tqfromLatin1(":importalarms"),
-	                                   TQString::tqfromLatin1("*.vcs *.ics|%1").tqarg(i18n("Calendar Files")), parent);
+	KURL url = KFileDialog::getOpenURL(TQString::fromLatin1(":importalarms"),
+	                                   TQString::fromLatin1("*.vcs *.ics|%1").tqarg(i18n("Calendar Files")), parent);
 	if (url.isEmpty())
 	{
 		kdError(5950) << "AlarmCalendar::importAlarms(): Empty URL" << endl;
@@ -484,7 +484,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent)
 	}
 
 	// Read the calendar and add its alarms to the current calendars
-	CalendarLocal cal(TQString::tqfromLatin1("UTC"));
+	CalendarLocal cal(TQString::fromLatin1("UTC"));
 	cal.setLocalTime();    // write out using local time (i.e. no time zone)
 	success = cal.load(filename);
 	if (!success)
@@ -508,7 +508,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent)
 			const Event* event = *it;
 			if (event->alarms().isEmpty()  ||  !KAEvent(*event).valid())
 				continue;    // ignore events without alarms, or usable alarms
-			KAEvent::tqStatus type = KAEvent::uidtqStatus(event->uid());
+			KAEvent::Status type = KAEvent::uidStatus(event->uid());
 			switch (type)
 			{
 				case KAEvent::ACTIVE:
@@ -616,7 +616,7 @@ void AlarmCalendar::convertToICal()
 		if (!mConfigKey.isNull())
 		{
 			KConfig* config = kapp->config();
-			config->setGroup(TQString::tqfromLatin1("General"));
+			config->setGroup(TQString::fromLatin1("General"));
 			config->writePathEntry(mConfigKey, mICalUrl.path());
 			config->sync();
 		}
@@ -688,7 +688,7 @@ void AlarmCalendar::purgeIfQueued()
 		{
 			kdDebug(5950) << "AlarmCalendar::purgeIfQueued(" << mPurgeDaysQueued << ")\n";
 			bool changed = false;
-			TQDate cutoff = TQDate::tqcurrentDate().addDays(-mPurgeDaysQueued);
+			TQDate cutoff = TQDate::currentDate().addDays(-mPurgeDaysQueued);
 			Event::List events = mCalendar->rawEvents();
 			for (Event::List::ConstIterator it = events.begin();  it != events.end();  ++it)
 			{
@@ -807,9 +807,9 @@ bool AlarmCalendar::deleteEvent(const TQString& eventID, bool saveit)
 /******************************************************************************
 * Emit a signal to indicate whether the calendar is empty.
 */
-void AlarmCalendar::emitEmptytqStatus()
+void AlarmCalendar::emitEmptyStatus()
 {
-	emit emptytqStatus(events().isEmpty());
+	emit emptyStatus(events().isEmpty());
 }
 
 /******************************************************************************