summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conduits/docconduit/kpalmdoc_dlg.cpp2
-rw-r--r--conduits/knotes/knotes-action.cpp2
-rw-r--r--conduits/popmail/popmail-conduit.cpp2
-rw-r--r--kpilot/kpilot.cpp2
-rw-r--r--kpilot/kpilotProbeDialog.cpp2
-rw-r--r--kpilot/kroupware.cpp8
-rw-r--r--kpilot/main-test.cpp12
-rw-r--r--kpilot/pilotDaemon.cpp8
-rw-r--r--lib/plugin.cpp2
9 files changed, 20 insertions, 20 deletions
diff --git a/conduits/docconduit/kpalmdoc_dlg.cpp b/conduits/docconduit/kpalmdoc_dlg.cpp
index 3685e45..90ff819 100644
--- a/conduits/docconduit/kpalmdoc_dlg.cpp
+++ b/conduits/docconduit/kpalmdoc_dlg.cpp
@@ -139,7 +139,7 @@ void ConverterDlg::readSettings()
void ConverterDlg::slotClose()
{
writeSettings();
- kapp->quit();
+ tdeApp->quit();
delete this;
}
diff --git a/conduits/knotes/knotes-action.cpp b/conduits/knotes/knotes-action.cpp
index 29a9a50..195dfd1 100644
--- a/conduits/knotes/knotes-action.cpp
+++ b/conduits/knotes/knotes-action.cpp
@@ -192,7 +192,7 @@ KNotesAction::KNotesAction(KPilotLink *o,
FUNCTIONSETUP;
/*
- if (fP) fP->fDCOP = TDEApplication::kApplication()->dcopClient();
+ if (fP) fP->fDCOP = tdeApp->dcopClient();
if (fP && !fP->fDCOP)
{
diff --git a/conduits/popmail/popmail-conduit.cpp b/conduits/popmail/popmail-conduit.cpp
index 7193cd4..5e0f57f 100644
--- a/conduits/popmail/popmail-conduit.cpp
+++ b/conduits/popmail/popmail-conduit.cpp
@@ -186,7 +186,7 @@ int PopMailConduit::sendViaKMail()
int count=0;
TQString kmailOutboxName = getKMailOutbox();
- DCOPClient *dcopptr = TDEApplication::kApplication()->dcopClient();
+ DCOPClient *dcopptr = tdeApp->dcopClient();
if (!dcopptr)
{
WARNINGKPILOT << "Cannot get DCOP client."
diff --git a/kpilot/kpilot.cpp b/kpilot/kpilot.cpp
index 1f67171..493d4c7 100644
--- a/kpilot/kpilot.cpp
+++ b/kpilot/kpilot.cpp
@@ -640,7 +640,7 @@ void KPilotInstaller::quit()
}
killDaemonIfNeeded();
- kapp->quit();
+ tdeApp->quit();
}
void KPilotInstaller::addComponentPage(PilotComponent * p,
diff --git a/kpilot/kpilotProbeDialog.cpp b/kpilot/kpilotProbeDialog.cpp
index e78367b..65b8d80 100644
--- a/kpilot/kpilotProbeDialog.cpp
+++ b/kpilot/kpilotProbeDialog.cpp
@@ -169,7 +169,7 @@ ProbeDialog::~ProbeDialog()
void ProbeDialog::processEvents()
{
FUNCTIONSETUP;
- TDEApplication::kApplication()->processEvents();
+ tdeApp->processEvents();
}
void ProbeDialog::progress()
diff --git a/kpilot/kroupware.cpp b/kpilot/kroupware.cpp
index 289199f..407dce6 100644
--- a/kpilot/kroupware.cpp
+++ b/kpilot/kroupware.cpp
@@ -101,7 +101,7 @@ void KroupwareSync::start_syncCal_TodosWithKMail( bool cal, bool todos )
if ( !cal && ! todos )
return;
TDEConfig*c = KPilotSettings::self()->config();
- DCOPClient *client = kapp->dcopClient();
+ DCOPClient *client = tdeApp->dcopClient();
KTempFile tempfile;
TQString filename = tempfile.name();
TQByteArray data, reply_data;
@@ -147,7 +147,7 @@ void KroupwareSync::start_syncCal_TodosWithKMail( bool cal, bool todos )
void KroupwareSync::start_syncAddWithKMail()
{
logMessage( CSL1("Syncing Addresses with KMail" ));
- DCOPClient *client = kapp->dcopClient();
+ DCOPClient *client = tdeApp->dcopClient();
KTempFile tempfile;
TQString filename = tempfile.name();
TQByteArray data, reply_data;
@@ -203,7 +203,7 @@ void KroupwareSync::end_syncCal_TodosWithKMail( bool cal, bool todos)
if ( !filename.isEmpty() ) {
logMessage(CSL1("Try to call KMail via DCOP to finish sync..."));
// try DCOP connection to KMail
- DCOPClient *client = kapp->dcopClient();
+ DCOPClient *client = tdeApp->dcopClient();
TQByteArray data, reply_data;
TQCString reply_type;
TQDataStream arg(data, IO_WriteOnly);
@@ -228,7 +228,7 @@ void KroupwareSync::end_syncCal_TodosWithKMail( bool cal, bool todos)
void KroupwareSync::end_syncAddWithKMail()
{
logMessage( i18n("Syncing KMail with Addresses " ));
- DCOPClient *client = kapp->dcopClient();
+ DCOPClient *client = tdeApp->dcopClient();
// TODO!! better config handling (TDEConfig XT)
TDEConfig*c = KPilotSettings::self()->config();
c->setGroup("Abbrowser-conduit");
diff --git a/kpilot/main-test.cpp b/kpilot/main-test.cpp
index 77ff7c7..5ff796b 100644
--- a/kpilot/main-test.cpp
+++ b/kpilot/main-test.cpp
@@ -142,7 +142,7 @@ void connectStack( KPilotLink *l, ActionQueue *a, bool loop = false )
if (!loop)
{
TQObject::connect(a, TQ_SIGNAL(syncDone(SyncAction *)),
- kapp, TQ_SLOT(quit()));
+ tdeApp, TQ_SLOT(quit()));
}
else
{
@@ -178,7 +178,7 @@ int exec(const TQString &device, const TQString &what, TDECmdLineArgs *p)
syncStack->queueCleanup();
connectStack(link,syncStack);
link->reset(device);
- return kapp->exec();
+ return tdeApp->exec();
}
int backup(const TQString &device, const TQString &what, TDECmdLineArgs *p)
@@ -193,7 +193,7 @@ int backup(const TQString &device, const TQString &what, TDECmdLineArgs *p)
syncStack->queueCleanup();
connectStack(link,syncStack);
link->reset(device);
- return kapp->exec();
+ return tdeApp->exec();
}
int restore(const TQString &device, const TQString &what, TDECmdLineArgs *p)
@@ -208,7 +208,7 @@ int restore(const TQString &device, const TQString &what, TDECmdLineArgs *p)
syncStack->queueCleanup();
connectStack(link,syncStack);
link->reset(device);
- return kapp->exec();
+ return tdeApp->exec();
}
int listDB(const TQString &device, TDECmdLineArgs *p)
@@ -221,7 +221,7 @@ int listDB(const TQString &device, TDECmdLineArgs *p)
syncStack->queueCleanup();
connectStack(link,syncStack, p->isSet("loop") );
link->reset(device);
- return kapp->exec();
+ return tdeApp->exec();
}
int check( const TQString &device, const TQString &what, TDECmdLineArgs *p )
@@ -248,7 +248,7 @@ int check( const TQString &device, const TQString &what, TDECmdLineArgs *p )
syncStack->queueCleanup();
connectStack(link,syncStack);
link->reset(device);
- return kapp->exec();
+ return tdeApp->exec();
}
return 0;
diff --git a/kpilot/pilotDaemon.cpp b/kpilot/pilotDaemon.cpp
index dfb6e8b..2c99534 100644
--- a/kpilot/pilotDaemon.cpp
+++ b/kpilot/pilotDaemon.cpp
@@ -623,7 +623,7 @@ bool PilotDaemon::setupPilotLink()
case ERROR:
case NOT_LISTENING:
getKPilot().daemonStatus(KPilotDCOP::DaemonQuit);
- kapp->quit();
+ tdeApp->quit();
break;
case READY:
case HOTSYNC_START:
@@ -804,7 +804,7 @@ static KDesktopLockStatus isKDesktopLockRunning()
{
if (!KPilotSettings::screenlockSecure()) return NotLocked;
- DCOPClient *dcopptr = TDEApplication::kApplication()->dcopClient();
+ DCOPClient *dcopptr = tdeApp->dcopClient();
// Can't tell, very weird, err on the side of safety.
if (!dcopptr || !dcopptr->isAttached())
@@ -1175,7 +1175,7 @@ launch:
if (fPostSyncAction & Quit)
{
getKPilot().daemonStatus(KPilotDCOP::DaemonQuit);
- kapp->quit();
+ tdeApp->quit();
}
if (fPostSyncAction & ReloadSettings)
{
@@ -1244,7 +1244,7 @@ void PilotDaemon::slotRunConfig()
// 2 KPilot running with dialog NOT open (configureConduits())
// 3 KPilot NOT running (TDEProcess)
- DCOPClient *client = kapp->dcopClient();
+ DCOPClient *client = tdeApp->dcopClient();
// This DCOP call to kpilot's raise function solves the final case
// ie when kpilot already has the dialog open
diff --git a/lib/plugin.cpp b/lib/plugin.cpp
index c208598..6e3a2db 100644
--- a/lib/plugin.cpp
+++ b/lib/plugin.cpp
@@ -681,7 +681,7 @@ TQString findArgument(const TQStringList &a, const TQString &arg)
/* static */ bool isRunning(const TQCString &n)
{
- DCOPClient *dcop = TDEApplication::kApplication()->dcopClient();
+ DCOPClient *dcop = tdeApp->dcopClient();
QCStringList apps = dcop->registeredApplications();
return apps.contains(n);
}
generated by cgit v1.2.1 (git 2.18.0) at 2025-02-13 16:54:11 +0000