Rename old tq methods that no longer need a unique name

5 files changed, 31 insertions, 31 deletions

diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp
index 409ab88f0..3b9c9f55a 100644
--- a/kalarm/kalarmd/adcalendar.cpp
+++ b/kalarm/kalarmd/adcalendar.cpp
@@ -37,7 +37,7 @@ TQStringList             ADCalendar::mCalendarUrls;    // never delete or reorde
 
 
 ADCalendar::ADCalendar(const TQString& url, const TQCString& appname)
-	: KCal::CalendarLocal(TQString::tqfromLatin1("UTC")),
+	: KCal::CalendarLocal(TQString::fromLatin1("UTC")),
 	  mUrlString(url),
 	  mAppName(appname),
 	  mLoaded(false),
diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp
index 9f471e4da..06ee4597e 100644
--- a/kalarm/kalarmd/adconfigdata.cpp
+++ b/kalarm/kalarmd/adconfigdata.cpp
@@ -31,13 +31,13 @@
 #include "adconfigdata.h"
 
 // Config file key strings
-const TQString CLIENT_GROUP(TQString::tqfromLatin1("Client "));
+const TQString CLIENT_GROUP(TQString::fromLatin1("Client "));
 const TQRegExp CLIENT_GROUP_SEARCH("^Client ");
 // Client data file key strings
-const TQString CALENDAR_KEY(TQString::tqfromLatin1("Calendar"));
-const TQString TITLE_KEY(TQString::tqfromLatin1("Title"));
-const TQString DCOP_OBJECT_KEY(TQString::tqfromLatin1("DCOP object"));
-const TQString START_CLIENT_KEY(TQString::tqfromLatin1("Start"));
+const TQString CALENDAR_KEY(TQString::fromLatin1("Calendar"));
+const TQString TITLE_KEY(TQString::fromLatin1("Title"));
+const TQString DCOP_OBJECT_KEY(TQString::fromLatin1("DCOP object"));
+const TQString START_CLIENT_KEY(TQString::fromLatin1("Start"));
 
 
 /******************************************************************************
@@ -139,8 +139,8 @@ void ADConfigData::enableAutoStart(bool on)
         kdDebug(5900) << "ADConfigData::enableAutoStart(" << on << ")\n";
         KConfig* config = KGlobal::config();
 	config->reparseConfiguration();
-        config->setGroup(TQString::tqfromLatin1(DAEMON_AUTOSTART_SECTION));
-        config->writeEntry(TQString::tqfromLatin1(DAEMON_AUTOSTART_KEY), on);
+        config->setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION));
+        config->writeEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), on);
         config->sync();
 }
 
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index 0fad7935f..85d214656 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -54,8 +54,8 @@ static const int KALARM_AUTOSTART_TIMEOUT = 30;
 static const int SECS_PER_DAY = 3600 * 24;
 
 // KAlarm config file keys
-static const TQString START_OF_DAY(TQString::tqfromLatin1("StartOfDay"));
-static const TQString AUTOSTART_TRAY(TQString::tqfromLatin1("AutostartTray"));
+static const TQString START_OF_DAY(TQString::fromLatin1("StartOfDay"));
+static const TQString AUTOSTART_TRAY(TQString::fromLatin1("AutostartTray"));
 
 
 AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
@@ -84,7 +84,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
 		 * itself and instead will simply open a new window.
 		 */
 		KConfig kaconfig(locate("config", "kalarmrc"));
-		kaconfig.setGroup(TQString::tqfromLatin1("General"));
+		kaconfig.setGroup(TQString::fromLatin1("General"));
 		autostart = kaconfig.readBoolEntry(AUTOSTART_TRAY, false);
 		if (autostart)
 		{
@@ -119,8 +119,8 @@ void AlarmDaemon::autostartKAlarm()
 	}
 	kdDebug(5900) << "AlarmDaemon::autostartKAlarm(): starting KAlarm\n";
 	TQStringList args;
-	args << TQString::tqfromLatin1("--tray");
-	int ret = KApplication::tdeinitExec(TQString::tqfromLatin1("kalarm"), args);
+	args << TQString::fromLatin1("--tray");
+	int ret = KApplication::tdeinitExec(TQString::fromLatin1("kalarm"), args);
 	if (ret)
 		kdError(5900) << "AlarmDaemon::autostartKAlarm(): error=" << ret << endl;
 	else
@@ -138,7 +138,7 @@ void AlarmDaemon::startMonitoring()
 	// Set up the alarm timer
 	mAlarmTimer = new TQTimer(this);
 	connect(mAlarmTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAlarmsSlot()));
-	setTimertqStatus();
+	setTimerStatus();
 
 	// Start monitoring calendar files.
 	// They are monitored until their client application registers, upon which
@@ -156,7 +156,7 @@ void AlarmDaemon::enableCal(const TQString& urlString, bool enable)
 	if (cal)
 	{
 		cal->setEnabled(enable);
-		notifyCaltqStatus(cal);    // notify KAlarm
+		notifyCalStatus(cal);    // notify KAlarm
 	}
 }
 
@@ -196,8 +196,8 @@ void AlarmDaemon::calendarLoaded(ADCalendar* cal, bool success)
 {
 	if (success)
 		kdDebug(5900) << "Calendar reloaded" << endl;
-	notifyCaltqStatus(cal);       // notify KAlarm
-	setTimertqStatus();
+	notifyCalStatus(cal);       // notify KAlarm
+	setTimerStatus();
 	checkAlarms(cal);
 }
 
@@ -262,8 +262,8 @@ void AlarmDaemon::registerApp(const TQCString& appName, const TQString& appTitle
 		ADConfigData::writeClient(appName, client);
 
 		ADConfigData::enableAutoStart(true);
-		setTimertqStatus();
-		notifyCaltqStatus(client->calendar());
+		setTimerStatus();
+		notifyCalStatus(client->calendar());
 		result = KAlarmd::SUCCESS;
 	}
 
@@ -365,7 +365,7 @@ void AlarmDaemon::checkAlarms(ADCalendar* cal)
 	if (!cal->loaded()  ||  !cal->enabled())
 		return;
 
-	TQDateTime now  = TQDateTime::tqcurrentDateTime();
+	TQDateTime now  = TQDateTime::currentDateTime();
 	kdDebug(5901) << "  To: " << now.toString() << endl;
 	TQValueList<KCal::Alarm*> alarms = cal->alarmsTo(now);
 	if (!alarms.count())
@@ -385,7 +385,7 @@ void AlarmDaemon::checkAlarms(ADCalendar* cal)
 		// The times for non-due alarms are set invalid in 'alarmtimes'.
 		bool recurs = event->doesRecur();
 		const TQStringList cats = event->categories();
-		bool floats = (cats.find(TQString::tqfromLatin1("DATE")) != cats.end());
+		bool floats = (cats.find(TQString::fromLatin1("DATE")) != cats.end());
 		TQDateTime nextDateTime = event->dtStart();
 		if (recurs)
 		{
@@ -478,7 +478,7 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID)
 		return false;
 	}
 	kdDebug(5900) << "AlarmDaemon::notifyEvent(" << appname << ", " << eventID << "): notification type=" << client->startClient() << endl;
-	TQString id = TQString::tqfromLatin1("ad:") + eventID;    // prefix to indicate that the notification if from the daemon
+	TQString id = TQString::fromLatin1("ad:") + eventID;    // prefix to indicate that the notification if from the daemon
 
 	// Check if the client application is running and ready to receive notification
 	bool registered = kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname));
@@ -531,7 +531,7 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID)
 /******************************************************************************
 * Starts or stops the alarm timer as necessary after a calendar is enabled/disabled.
 */
-void AlarmDaemon::setTimertqStatus()
+void AlarmDaemon::setTimerStatus()
 {
 #ifdef AUTOSTART_KALARM
 	if (!mAlarmTimer)
@@ -569,7 +569,7 @@ void AlarmDaemon::setTimertqStatus()
 * Send a DCOP message to to the client which owns the specified calendar,
 * notifying it of a change in calendar status.
 */
-void AlarmDaemon::notifyCaltqStatus(const ADCalendar* cal)
+void AlarmDaemon::notifyCalStatus(const ADCalendar* cal)
 {
 	ClientInfo* client = ClientInfo::get(cal);
 	if (!client)
@@ -577,7 +577,7 @@ void AlarmDaemon::notifyCaltqStatus(const ADCalendar* cal)
 	TQCString appname = client->appName();
 	if (kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname)))
 	{
-		KAlarmd::CalendartqStatus change = cal->available() ? (cal->enabled() ? KAlarmd::CALENDAR_ENABLED : KAlarmd::CALENDAR_DISABLED)
+		KAlarmd::CalendarStatus change = cal->available() ? (cal->enabled() ? KAlarmd::CALENDAR_ENABLED : KAlarmd::CALENDAR_DISABLED)
 		                                                  : KAlarmd::CALENDAR_UNAVAILABLE;
 		kdDebug(5900) << "AlarmDaemon::notifyCalStatus() sending:" << appname << " -> " << change << endl;
 		AlarmGuiIface_stub stub(appname, client->dcopObject());
@@ -595,7 +595,7 @@ void AlarmDaemon::notifyCaltqStatus(const ADCalendar* cal)
 void AlarmDaemon::readKAlarmConfig()
 {
 	KConfig config(locate("config", "kalarmrc"));
-	config.setGroup(TQString::tqfromLatin1("General"));
+	config.setGroup(TQString::fromLatin1("General"));
 	TQDateTime defTime(TQDate(1900,1,1), TQTime());
 	mStartOfDay = config.readDateTimeEntry(START_OF_DAY, &defTime).time();
 	kdDebug(5900) << "AlarmDaemon::readKAlarmConfig()" << endl;
diff --git a/kalarm/kalarmd/alarmdaemon.h b/kalarm/kalarmd/alarmdaemon.h
index c2c34e10f..fbbb8f308 100644
--- a/kalarm/kalarmd/alarmdaemon.h
+++ b/kalarm/kalarmd/alarmdaemon.h
@@ -67,8 +67,8 @@ class AlarmDaemon : public TQObject, virtual public AlarmDaemonIface
 		void    reloadCal(ADCalendar*, bool reset);
 		void    checkAlarms(ADCalendar*);
 		bool    notifyEvent(ADCalendar*, const TQString& eventID);
-		void    notifyCaltqStatus(const ADCalendar*);
-		void    setTimertqStatus();
+		void    notifyCalStatus(const ADCalendar*);
+		void    setTimerStatus();
 		static TQString expandURL(const TQString& urlString);
 
 		TQTimer* mAlarmTimer;
diff --git a/kalarm/kalarmd/alarmguiiface.h b/kalarm/kalarmd/alarmguiiface.h
index 49a467008..d221fd345 100644
--- a/kalarm/kalarmd/alarmguiiface.h
+++ b/kalarm/kalarmd/alarmguiiface.h
@@ -35,7 +35,7 @@ namespace KAlarmd
 		NOT_FOUND = 2    // notification type requires client start, but client executable not found
 	};
 
-	enum CalendartqStatus    // parameters to client notification
+	enum CalendarStatus    // parameters to client notification
 	{
 		CALENDAR_ENABLED,        // calendar is now being monitored
 		CALENDAR_DISABLED,       // calendar is available but not being monitored
@@ -53,9 +53,9 @@ class AlarmGuiIface : virtual public DCOPObject
 		K_DCOP
 	k_dcop:
 		/** Called to notify a change in status of the calendar.
-		    @param calendartqStatus new calendar status. Value is of type CalendartqStatus.
+		    @param calendarStatus new calendar status. Value is of type CalendarStatus.
 		 */
-		virtual ASYNC alarmDaemonUpdate(int calendartqStatus, const TQString& calendarURL) = 0;
+		virtual ASYNC alarmDaemonUpdate(int calendarStatus, const TQString& calendarURL) = 0;
 
 		/** Called to notify that an alarm is due.
 		 */