summaryrefslogtreecommitdiffstats
path: root/kpilot/pilotDaemon.cc
diff options
context:
space:
mode:
Diffstat (limited to 'kpilot/pilotDaemon.cc')
-rw-r--r--kpilot/pilotDaemon.cc80
1 files changed, 40 insertions, 40 deletions
diff --git a/kpilot/pilotDaemon.cc b/kpilot/pilotDaemon.cc
index 198fe11..2e70aef 100644
--- a/kpilot/pilotDaemon.cc
+++ b/kpilot/pilotDaemon.cc
@@ -119,14 +119,14 @@ PilotDaemonTray::PilotDaemonTray(PilotDaemon * p) :
switch (e->button())
{
- case RightButton:
+ case Qt::RightButton:
{
KPopupMenu *menu = contextMenu();
contextMenuAboutToShow(menu);
menu->popup(e->globalPos());
}
break;
- case LeftButton:
+ case Qt::LeftButton:
if (daemon) daemon->slotRunKPilot();
break;
default:
@@ -166,7 +166,7 @@ void PilotDaemonTray::setupWidget()
SyncAction::SyncMode::name(SyncAction::SyncMode::a) + once, \
(int)(SyncAction::SyncMode::a));
fSyncTypeMenu->insertItem(i18n("Default (%1)")
- .arg(SyncAction::SyncMode::name((SyncAction::SyncMode::Mode)KPilotSettings::syncType())),
+ .tqarg(SyncAction::SyncMode::name((SyncAction::SyncMode::Mode)KPilotSettings::syncType())),
0);
fSyncTypeMenu->insertSeparator();
@@ -279,7 +279,7 @@ void PilotDaemonTray::endHotSync()
PilotDaemon::PilotDaemon() :
DCOPObject("KPilotDaemonIface"),
- fDaemonStatus(INIT),
+ fDaemontqStatus(INIT),
fPostSyncAction(None),
fPilotLink(0L),
fNextSyncType(SyncAction::SyncMode::eHotSync,true),
@@ -290,14 +290,14 @@ PilotDaemon::PilotDaemon() :
fLogStub(new LoggerDCOP_stub("kpilot", "LogIface")),
fLogFileStub(new LoggerDCOP_stub("kpilotDaemon", "LogIface")),
fKPilotStub(new KPilotDCOP_stub("kpilot", "KPilotIface")),
- fTempDevice(TQString::null)
+ fTempDevice(TQString())
{
FUNCTIONSETUP;
setupPilotLink();
reloadSettings();
- if (fDaemonStatus == ERROR)
+ if (fDaemontqStatus == ERROR)
{
WARNINGKPILOT << "Connecting to device failed." << endl;
return;
@@ -313,7 +313,7 @@ PilotDaemon::PilotDaemon() :
#ifdef DEBUG
DEBUGKPILOT << fname
<< ": The daemon is ready with status "
- << statusString() << " (" << (int) fDaemonStatus << ")" << endl;
+ << statusString() << " (" << (int) fDaemontqStatus << ")" << endl;
#endif
}
@@ -403,7 +403,7 @@ void PilotDaemon::showTray()
DEBUGKPILOT << fname << ": Tray icon displayed." << endl;
#endif
- updateTrayStatus();
+ updateTraytqStatus();
}
/* DCOP ASYNC */ void PilotDaemon::setTempDevice(TQString d)
@@ -420,7 +420,7 @@ void PilotDaemon::showTray()
{
FUNCTIONSETUP;
- switch (fDaemonStatus)
+ switch (fDaemontqStatus)
{
case INIT:
case HOTSYNC_END:
@@ -508,15 +508,15 @@ void PilotDaemon::showTray()
}
}
- updateTrayStatus();
- logProgress(TQString::null,0);
+ updateTraytqStatus();
+ logProgress(TQString(),0);
}
/* DCOP */ void PilotDaemon::stopListening()
{
fIsListening=false;
fTray->changeIcon(PilotDaemonTray::NotListening);
- fDaemonStatus=NOT_LISTENING;
+ fDaemontqStatus=NOT_LISTENING;
fPilotLink->close();
}
@@ -524,7 +524,7 @@ void PilotDaemon::showTray()
{
fIsListening=true;
fTray->changeIcon(PilotDaemonTray::Normal);
- fDaemonStatus=INIT;
+ fDaemontqStatus=INIT;
fPilotLink->reset();
}
@@ -616,13 +616,13 @@ bool PilotDaemon::setupPilotLink()
// Using switch to make sure we cover all the cases.
//
//
- switch (fDaemonStatus)
+ switch (fDaemontqStatus)
{
case INIT:
case HOTSYNC_END:
case ERROR:
case NOT_LISTENING:
- getKPilot().daemonStatus(KPilotDCOP::DaemonQuit);
+ getKPilot().daemontqStatus(KPilotDCOP::DaemonQuit);
kapp->quit();
break;
case READY:
@@ -655,7 +655,7 @@ bool PilotDaemon::setupPilotLink()
return;
}
- updateTrayStatus();
+ updateTraytqStatus();
if (fTray && (fTray->fSyncTypeMenu))
{
@@ -667,7 +667,7 @@ bool PilotDaemon::setupPilotLink()
}
}
- getLogger().logMessage(i18n("Next HotSync will be: %1. ").arg(fNextSyncType.name()) +
+ getLogger().logMessage(i18n("Next HotSync will be: %1. ").tqarg(fNextSyncType.name()) +
i18n("Please press the HotSync button."));
}
@@ -731,7 +731,7 @@ static void fillConduitNameMap()
TQStringList l = KPilotSettings::installedConduits();
// Fill with internal settings.
- if ( l.find( CSL1("internal_fileinstall") ) != l.end() ) {
+ if ( l.tqfind( CSL1("internal_fileinstall") ) != l.end() ) {
conduitNameMap->insert( CSL1("internal_fileinstall"),
new TQString(i18n("File Installer")) );
}
@@ -739,7 +739,7 @@ static void fillConduitNameMap()
TQStringList::ConstIterator end = l.end();
for (TQStringList::ConstIterator i = l.begin(); i != end; ++i)
{
- if (!conduitNameMap->find(*i))
+ if (!conduitNameMap->tqfind(*i))
{
TQString readableName = CSL1("<unknown>");
KSharedPtr < KService > o = KService::serviceByDesktopName(*i);
@@ -774,7 +774,7 @@ TQStringList PilotDaemon::configuredConduitList()
TQStringList result;
for (TQStringList::ConstIterator i = keys.begin(); i != end; ++i)
{
- result << *(conduitNameMap->find(*i));
+ result << *(conduitNameMap->tqfind(*i));
}
return result;
@@ -799,8 +799,8 @@ bool PilotDaemon::killDaemonOnExit()
return KPilotSettings::killDaemonAtExit();
}
-typedef enum { NotLocked=0, Locked=1, DCOPError=2 } KDesktopLockStatus;
-static KDesktopLockStatus isKDesktopLockRunning()
+typedef enum { NotLocked=0, Locked=1, DCOPError=2 } KDesktopLocktqStatus;
+static KDesktopLocktqStatus isKDesktopLockRunning()
{
if (!KPilotSettings::screenlockSecure()) return NotLocked;
@@ -847,7 +847,7 @@ static void informOthers(KPilotDCOP_stub &kpilot,
LoggerDCOP_stub &log,
LoggerDCOP_stub &filelog)
{
- kpilot.daemonStatus(KPilotDCOP::StartOfHotSync);
+ kpilot.daemontqStatus(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.kpiloStatus();
+ int kpilotstatus = kpilot.kpilotqStatus();
DCOPStub::Status callstatus = kpilot.status();
#ifdef DEBUG
@@ -920,7 +920,7 @@ static void queueInstaller(ActionQueue *fSyncStack,
FileInstaller *fInstaller,
const TQStringList &c)
{
- if (c.findIndex(CSL1("internal_fileinstall")) >= 0)
+ if (c.tqfindIndex(CSL1("internal_fileinstall")) >= 0)
{
fSyncStack->addAction(new FileInstallAction(pilotLink,fInstaller->dir()));
}
@@ -999,11 +999,11 @@ bool PilotDaemon::shouldBackup()
DEBUGKPILOT << fname
<< ": Starting Sync with type "
<< fNextSyncType.name() << endl;
- DEBUGKPILOT << fname << ": Status is " << shorStatusString() << endl;
+ DEBUGKPILOT << fname << ": tqStatus is " << shorStatusString() << endl;
(void) PilotDatabase::instanceCount();
#endif
- fDaemonStatus = HOTSYNC_START ;
+ fDaemontqStatus = HOTSYNC_START ;
if (fTray)
{
fTray->startHotSync();
@@ -1120,7 +1120,7 @@ launch:
TQTimer::singleShot(0,fSyncStack,TQT_SLOT(execConduit()));
- updateTrayStatus();
+ updateTraytqStatus();
}
/* slot */ void PilotDaemon::logMessage(const TQString & s)
@@ -1129,7 +1129,7 @@ launch:
getLogger().logMessage(s);
getFileLogger().logMessage(s);
- updateTrayStatus(s);
+ updateTraytqStatus(s);
}
/* slot */ void PilotDaemon::logError(const TQString & s)
@@ -1138,7 +1138,7 @@ launch:
getLogger().logError(s);
getFileLogger().logError(s);
- updateTrayStatus(s);
+ updateTraytqStatus(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()) updateTrayStatus(s);
+ if (!s.isEmpty()) updateTraytqStatus(s);
}
/* slot */ void PilotDaemon::endHotSync()
@@ -1166,15 +1166,15 @@ launch:
getFileLogger().logProgress(i18n("HotSync Completed.<br>"), 100);
getLogger().logEndSync();
getFileLogger().logEndSync();
- getKPilot().daemonStatus(KPilotDCOP::EndOfHotSync);
+ getKPilot().daemontqStatus(KPilotDCOP::EndOfHotSync);
KPilotSettings::setLastSyncTime(TQDateTime::tqcurrentDateTime());
KPilotSettings::self()->writeConfig();
- fDaemonStatus = HOTSYNC_END;
+ fDaemontqStatus = HOTSYNC_END;
if (fPostSyncAction & Quit)
{
- getKPilot().daemonStatus(KPilotDCOP::DaemonQuit);
+ getKPilot().daemontqStatus(KPilotDCOP::DaemonQuit);
kapp->quit();
}
if (fPostSyncAction & ReloadSettings)
@@ -1191,7 +1191,7 @@ launch:
(void) PilotDatabase::instanceCount();
- updateTrayStatus();
+ updateTraytqStatus();
}
@@ -1209,7 +1209,7 @@ void PilotDaemon::slotRunKPilot()
int kpilotPID;
if (KApplication::startServiceByDesktopName(CSL1("kpilot"),
- TQString::null, &kpilotError, &kpilotDCOP, &kpilotPID
+ TQString(), &kpilotError, &kpilotDCOP, &kpilotPID
#if (KDE_VERSION >= 220)
// Startup notification added in 2.2
, ""
@@ -1251,8 +1251,8 @@ void PilotDaemon::slotRunConfig()
if ( client->isApplicationRegistered( "kpilot" ) )
{
- client->send("kpilot", "kpilot-mainwindow#1", "raise()",TQString::null);
- client->send("kpilot", "KPilotIface", "configure()", TQString::null);
+ client->send("kpilot", "kpilot-mainwindow#1", "raise()",TQString());
+ client->send("kpilot", "KPilotIface", "configure()", TQString());
}
else
{
@@ -1264,7 +1264,7 @@ void PilotDaemon::slotRunConfig()
}
}
-void PilotDaemon::updateTrayStatus(const TQString &s)
+void PilotDaemon::updateTraytqStatus(const TQString &s)
{
if (!fTray) return;
@@ -1272,7 +1272,7 @@ void PilotDaemon::updateTrayStatus(const TQString &s)
tipText.append( s );
tipText.append( CSL1(" ") );
tipText.append( i18n("Next sync is %1.")
- .arg( fNextSyncType.name() ) );
+ .tqarg( fNextSyncType.name() ) );
tipText.append( CSL1("</qt>") );
TQToolTip::remove(fTray);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 09:24:23 +0000