Rename old tq methods that no longer need a unique name

1 files changed, 25 insertions, 25 deletions

diff --git a/kpilot/pilotDaemon.cc b/kpilot/pilotDaemon.cc
index bbd8233..7ad7756 100644
--- a/kpilot/pilotDaemon.cc
+++ b/kpilot/pilotDaemon.cc
@@ -279,7 +279,7 @@ void PilotDaemonTray::endHotSync()
 
 PilotDaemon::PilotDaemon() :
 	DCOPObject("KPilotDaemonIface"),
-	fDaemontqStatus(INIT),
+	fDaemonStatus(INIT),
 	fPostSyncAction(None),
 	fPilotLink(0L),
 	fNextSyncType(SyncAction::SyncMode::eHotSync,true),
@@ -297,7 +297,7 @@ PilotDaemon::PilotDaemon() :
 	setupPilotLink();
 	reloadSettings();
 
-	if (fDaemontqStatus == ERROR)
+	if (fDaemonStatus == ERROR)
 	{
 		WARNINGKPILOT << "Connecting to device failed." << endl;
 		return;
@@ -403,7 +403,7 @@ void PilotDaemon::showTray()
 	DEBUGKPILOT << fname << ": Tray icon displayed." << endl;
 #endif
 
-	updateTraytqStatus();
+	updateTrayStatus();
 }
 
 /* DCOP ASYNC */ void PilotDaemon::setTempDevice(TQString d)
@@ -420,7 +420,7 @@ void PilotDaemon::showTray()
 {
 	FUNCTIONSETUP;
 
-	switch (fDaemontqStatus)
+	switch (fDaemonStatus)
 	{
 	case INIT:
 	case HOTSYNC_END:
@@ -508,7 +508,7 @@ void PilotDaemon::showTray()
 		}
 	}
 
-	updateTraytqStatus();
+	updateTrayStatus();
 	logProgress(TQString(),0);
 }
 
@@ -516,7 +516,7 @@ void PilotDaemon::showTray()
 {
 	fIsListening=false;
 	fTray->changeIcon(PilotDaemonTray::NotListening);
-	fDaemontqStatus=NOT_LISTENING;
+	fDaemonStatus=NOT_LISTENING;
 	fPilotLink->close();
 }
 
@@ -524,7 +524,7 @@ void PilotDaemon::showTray()
 {
 	fIsListening=true;
 	fTray->changeIcon(PilotDaemonTray::Normal);
-	fDaemontqStatus=INIT;
+	fDaemonStatus=INIT;
 	fPilotLink->reset();
 }
 
@@ -616,13 +616,13 @@ bool PilotDaemon::setupPilotLink()
 	// Using switch to make sure we cover all the cases.
 	//
 	//
-	switch (fDaemontqStatus)
+	switch (fDaemonStatus)
 	{
 	case INIT:
 	case HOTSYNC_END:
 	case ERROR:
 	case NOT_LISTENING:
-		getKPilot().daemontqStatus(KPilotDCOP::DaemonQuit);
+		getKPilot().daemonStatus(KPilotDCOP::DaemonQuit);
 		kapp->quit();
 		break;
 	case READY:
@@ -655,7 +655,7 @@ bool PilotDaemon::setupPilotLink()
 		return;
 	}
 
-	updateTraytqStatus();
+	updateTrayStatus();
 
 	if (fTray && (fTray->fSyncTypeMenu))
 	{
@@ -799,8 +799,8 @@ bool PilotDaemon::killDaemonOnExit()
 	return KPilotSettings::killDaemonAtExit();
 }
 
-typedef enum { NotLocked=0, Locked=1, DCOPError=2 } KDesktopLocktqStatus;
-static KDesktopLocktqStatus isKDesktopLockRunning()
+typedef enum { NotLocked=0, Locked=1, DCOPError=2 } KDesktopLockStatus;
+static KDesktopLockStatus isKDesktopLockRunning()
 {
 	if (!KPilotSettings::screenlockSecure()) return NotLocked;
 
@@ -847,7 +847,7 @@ static void informOthers(KPilotDCOP_stub &kpilot,
 	LoggerDCOP_stub &log,
 	LoggerDCOP_stub &filelog)
 {
-	kpilot.daemontqStatus(KPilotDCOP::StartOfHotSync);
+	kpilot.daemonStatus(KPilotDCOP::StartOfHotSync);
 	log.logStartSync();
 	filelog.logStartSync();
 }
@@ -864,7 +864,7 @@ static bool isSyncPossible(ActionQueue *fSyncStack,
 	* just tell the user that the sync couldn't run because
 	* of that.
 	*/
-	int kpilotstatus = kpilot.kpilotqStatus();
+	int kpilotstatus = kpilot.kpiloStatus();
 	DCOPStub::Status callstatus = kpilot.status();
 
 #ifdef DEBUG
@@ -1003,7 +1003,7 @@ bool PilotDaemon::shouldBackup()
 	(void) PilotDatabase::instanceCount();
 #endif
 
-	fDaemontqStatus = HOTSYNC_START ;
+	fDaemonStatus = HOTSYNC_START ;
 	if (fTray)
 	{
 		fTray->startHotSync();
@@ -1120,7 +1120,7 @@ launch:
 
 	TQTimer::singleShot(0,fSyncStack,TQT_SLOT(execConduit()));
 
-	updateTraytqStatus();
+	updateTrayStatus();
 }
 
 /* slot */ void PilotDaemon::logMessage(const TQString & s)
@@ -1129,7 +1129,7 @@ launch:
 
 	getLogger().logMessage(s);
 	getFileLogger().logMessage(s);
-	updateTraytqStatus(s);
+	updateTrayStatus(s);
 }
 
 /* slot */ void PilotDaemon::logError(const TQString & s)
@@ -1138,7 +1138,7 @@ launch:
 
 	getLogger().logError(s);
 	getFileLogger().logError(s);
-	updateTraytqStatus(s);
+	updateTrayStatus(s);
 }
 
 /* slot */ void PilotDaemon::logProgress(const TQString & s, int i)
@@ -1147,7 +1147,7 @@ launch:
 
 	getLogger().logProgress(s, i);
 	getFileLogger().logProgress(s, i);
-	if (!s.isEmpty()) updateTraytqStatus(s);
+	if (!s.isEmpty()) updateTrayStatus(s);
 }
 
 /* slot */ void PilotDaemon::endHotSync()
@@ -1166,15 +1166,15 @@ launch:
 	getFileLogger().logProgress(i18n("HotSync Completed.<br>"), 100);
 	getLogger().logEndSync();
 	getFileLogger().logEndSync();
-	getKPilot().daemontqStatus(KPilotDCOP::EndOfHotSync);
-	KPilotSettings::setLastSyncTime(TQDateTime::tqcurrentDateTime());
+	getKPilot().daemonStatus(KPilotDCOP::EndOfHotSync);
+	KPilotSettings::setLastSyncTime(TQDateTime::currentDateTime());
 	KPilotSettings::self()->writeConfig();
 
-	fDaemontqStatus = HOTSYNC_END;
+	fDaemonStatus = HOTSYNC_END;
 
 	if (fPostSyncAction & Quit)
 	{
-		getKPilot().daemontqStatus(KPilotDCOP::DaemonQuit);
+		getKPilot().daemonStatus(KPilotDCOP::DaemonQuit);
 		kapp->quit();
 	}
 	if (fPostSyncAction & ReloadSettings)
@@ -1191,7 +1191,7 @@ launch:
 
 	(void) PilotDatabase::instanceCount();
 
-	updateTraytqStatus();
+	updateTrayStatus();
 }
 
 
@@ -1264,7 +1264,7 @@ void PilotDaemon::slotRunConfig()
 	}
 }
 
-void PilotDaemon::updateTraytqStatus(const TQString &s)
+void PilotDaemon::updateTrayStatus(const TQString &s)
 {
 	if (!fTray) return;