Use tdeApp

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

conduits/docconduit/kpalmdoc_dlg.cpp

@@ -139,7 +139,7 @@ void ConverterDlg::readSettings()
 void ConverterDlg::slotClose()
 {
   writeSettings();
-  kapp->quit();
+  tdeApp->quit();
   delete this;
 }
 

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)
 	{

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."

kpilot/kpilot.cpp

@@ -640,7 +640,7 @@ void KPilotInstaller::quit()
 	}
 
 	killDaemonIfNeeded();
-	kapp->quit();
+	tdeApp->quit();
 }
 
 void KPilotInstaller::addComponentPage(PilotComponent * p,

kpilot/kpilotProbeDialog.cpp

@@ -169,7 +169,7 @@ ProbeDialog::~ProbeDialog()
 void ProbeDialog::processEvents()
 {
 	FUNCTIONSETUP;
-	TDEApplication::kApplication()->processEvents();
+	tdeApp->processEvents();
 }
 
 void ProbeDialog::progress()

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");

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;

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

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);
 }