Use tdeApp

Signed-off-by: Michele Calgaro <[email protected]>

25 files changed, 85 insertions, 85 deletions

diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index 3790c5d3..bc383e28 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -229,7 +229,7 @@ void CatalogManager::setupActions()
                          TQ_SLOT(slotOpenFileInNewWindow()),actionCollection(), "open_new_window");
     action->setEnabled(false);
 
-    action = KStdAction::quit(kapp, TQ_SLOT (closeAllWindows()), actionCollection());
+    action = KStdAction::quit(tdeApp, TQ_SLOT (closeAllWindows()), actionCollection());
 
     actionMap["open_template"] = NEEDS_POT;
 
@@ -632,7 +632,7 @@ CatalogManagerView *CatalogManager::view()
 
 void CatalogManager::openFile(TQString filename, TQString package)
 {
-    DCOPClient * client = kapp->dcopClient();
+    DCOPClient * client = tdeApp->dcopClient();
 
     if( startKBabel() )
     {
@@ -657,7 +657,7 @@ void CatalogManager::openFile(TQString filename, TQString package)
         kdDebug(KBABEL_CATMAN) << callfunc << endl;
 	
 	// update the user timestamp for KBabel to get it a focus
-	kapp->updateRemoteUserTimestamp ("kbabel");
+	tdeApp->updateRemoteUserTimestamp ("kbabel");
 
         if( !client->send("kbabel","KBabelIFace", callfunc, data) )
             KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n"
@@ -667,7 +667,7 @@ void CatalogManager::openFile(TQString filename, TQString package)
 
 void CatalogManager::openFile(TQString filename, TQString package, int msgid)
 {
-    DCOPClient * client = kapp->dcopClient();
+    DCOPClient * client = tdeApp->dcopClient();
 
     if( startKBabel() )
     {
@@ -690,7 +690,7 @@ void CatalogManager::openFile(TQString filename, TQString package, int msgid)
         kdDebug(KBABEL_CATMAN) << callfunc << endl;
 
 	// update the user timestamp for KBabel to get it a focus
-	kapp->updateRemoteUserTimestamp ("kbabel");
+	tdeApp->updateRemoteUserTimestamp ("kbabel");
 
         if( !client->send("kbabel","KBabelIFace", callfunc, data) )
             KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n"
@@ -700,7 +700,7 @@ void CatalogManager::openFile(TQString filename, TQString package, int msgid)
 
 void CatalogManager::openFileInNewWindow(TQString filename, TQString package)
 {
-    DCOPClient * client = kapp->dcopClient();
+    DCOPClient * client = tdeApp->dcopClient();
 
     if( startKBabel() )
     {
@@ -721,7 +721,7 @@ void CatalogManager::openFileInNewWindow(TQString filename, TQString package)
         }
 
 	// update the user timestamp for KBabel to get it a focus
-	kapp->updateRemoteUserTimestamp ("kbabel");
+	tdeApp->updateRemoteUserTimestamp ("kbabel");
 
         if( !client->send("kbabel","KBabelIFace", callfunc, data) )
             KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n"
@@ -731,7 +731,7 @@ void CatalogManager::openFileInNewWindow(TQString filename, TQString package)
 
 void CatalogManager::openTemplate(TQString openFilename,TQString saveFilename,TQString package)
 {
-    DCOPClient * client = kapp->dcopClient();
+    DCOPClient * client = tdeApp->dcopClient();
 
     if( startKBabel() ) {
         TQByteArray data;
@@ -751,7 +751,7 @@ void CatalogManager::openTemplate(TQString openFilename,TQString saveFilename,TQ
         }
 
 	// update the user timestamp for KBabel to get it a focus
-	kapp->updateRemoteUserTimestamp ("kbabel");
+	tdeApp->updateRemoteUserTimestamp ("kbabel");
 
         if( !client->send("kbabel","KBabelIFace", callfunc, data) )
             KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n"
@@ -761,7 +761,7 @@ void CatalogManager::openTemplate(TQString openFilename,TQString saveFilename,TQ
 
 void CatalogManager::openTemplateInNewWindow(TQString openFilename,TQString saveFilename,TQString package)
 {
-    DCOPClient * client = kapp->dcopClient();
+    DCOPClient * client = tdeApp->dcopClient();
 
     if( startKBabel() ) {
         TQByteArray data;
@@ -781,7 +781,7 @@ void CatalogManager::openTemplateInNewWindow(TQString openFilename,TQString save
         }
 
 	// update the user timestamp for KBabel to get it a focus
-	kapp->updateRemoteUserTimestamp ("kbabel");
+	tdeApp->updateRemoteUserTimestamp ("kbabel");
 
         if( !client->send("kbabel","KBabelIFace", callfunc, data) )
             KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n"
@@ -791,7 +791,7 @@ void CatalogManager::openTemplateInNewWindow(TQString openFilename,TQString save
 
 void CatalogManager::spellcheck()
 {
-    DCOPClient * client = kapp->dcopClient();
+    DCOPClient * client = tdeApp->dcopClient();
 
     TQStringList fileList = _catalogManager->current();
 
@@ -801,7 +801,7 @@ void CatalogManager::spellcheck()
         arg << fileList;
 
 	// update the user timestamp for KBabel to get it a focus
-	kapp->updateRemoteUserTimestamp ("kbabel");
+	tdeApp->updateRemoteUserTimestamp ("kbabel");
 
         if( !client->send("kbabel","KBabelIFace", "spellcheck(TQStringList)", data) )
             KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n"
@@ -811,7 +811,7 @@ void CatalogManager::spellcheck()
 
 void CatalogManager::markedSpellcheck()
 {
-    DCOPClient * client = kapp->dcopClient();
+    DCOPClient * client = tdeApp->dcopClient();
 
     TQStringList fileList = _catalogManager->marked();
 
@@ -821,7 +821,7 @@ void CatalogManager::markedSpellcheck()
         arg << fileList;
 
 	// update the user timestamp for KBabel to get it a focus
-	kapp->updateRemoteUserTimestamp ("kbabel");
+	tdeApp->updateRemoteUserTimestamp ("kbabel");
 
         if( !client->send("kbabel","KBabelIFace", "spellcheck(TQStringList)", data) )
             KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n"
@@ -834,7 +834,7 @@ bool CatalogManager::startKBabel()
     TQCString service;
     TQString result;
 
-    DCOPClient * client = kapp->dcopClient();
+    DCOPClient * client = tdeApp->dcopClient();
 
     // find out, if there is a running kbabel
     QCStringList apps = client->registeredApplications();
@@ -853,7 +853,7 @@ bool CatalogManager::startKBabel()
     {
         TQString app = "kbabel";
         TQString url = "";
-        if( kapp->startServiceByDesktopName(app,url, &result, &service))
+        if( tdeApp->startServiceByDesktopName(app,url, &result, &service))
         {
             KMessageBox::error( this, i18n("Unable to use TDELauncher to start KBabel.\n"
                                            "You should check the installation of TDE.\n"
@@ -925,7 +925,7 @@ void CatalogManager::decreaseNumberOfFound()
 
 void CatalogManager::slotHelp()
 {
-   kapp->invokeHelp("CATALOGMANAGER","kbabel");
+   tdeApp->invokeHelp("CATALOGMANAGER","kbabel");
 }
 
 void CatalogManager::find()
@@ -959,7 +959,7 @@ void CatalogManager::find()
             if( startKBabel() )
             {
                 TQCString funcCall("findInFile(TQCString,TQCString,TQString,int,int,int,int,int,int,int,int,int,int)");
-                DCOPClient *client = kapp->dcopClient();
+                DCOPClient *client = tdeApp->dcopClient();
                 TQByteArray data;
                 TQDataStream arg(data, IO_WriteOnly);
                 arg << client->appId();
@@ -1044,7 +1044,7 @@ void CatalogManager::replace()
             if( startKBabel() )
             {
 		TQCString funcCall("replaceInFile(TQCString,TQCString,TQString,TQString,int,int,int,int,int,int,int,int,int,int,int)");
-                DCOPClient *client = kapp->dcopClient();
+                DCOPClient *client = tdeApp->dcopClient();
                 TQByteArray data;
                 TQDataStream arg(data, IO_WriteOnly);
                 
diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index eb963796..76ab194a 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -1998,7 +1998,7 @@ ConversionStatus Catalog::saveFileAs(const KURL &url, bool overwrite)
    }
    else
    {
-      TQString tempFile=kapp->tempSaveName(targetURL.path(0));
+      TQString tempFile=tdeApp->tempSaveName(targetURL.path(0));
 
       status = writeFile(tempFile,overwrite);
 
@@ -2033,7 +2033,7 @@ ConversionStatus Catalog::saveFileAs(const KURL &url, bool overwrite)
 
 TQString Catalog::saveTempFile()
 {
-   TQString filename = kapp->tempSaveName("/temp/kbabel_temp.po");
+   TQString filename = tdeApp->tempSaveName("/temp/kbabel_temp.po");
    if( writeFile(filename) != OK )
    {
       filename = TQString();
@@ -2549,7 +2549,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le
         int contextInfoPos = -1;
 		TQString targetStr;
 
-		kapp->processEvents(10);
+		tdeApp->processEvents(10);
 
 		if( d->_stop || endReached)
 		{
@@ -2798,7 +2798,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le
         int contextInfoPos = -1;
 		TQString targetStr;
 
-		kapp->processEvents(10);
+		tdeApp->processEvents(10);
 
 		if( d->_stop || beginReached)
 		{
@@ -3155,7 +3155,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result)
                 bestId = (*it);
             }
 
-            kapp->processEvents(10);
+            tdeApp->processEvents(10);
 
 	    if( d->_stop )
 	    {
@@ -3232,7 +3232,7 @@ void Catalog::setDiffList( const TQValueList<DiffEntry>& list)
         {
             oldPercent = percent;
             emit signalProgress(percent);
-            kapp->processEvents(10);
+            tdeApp->processEvents(10);
         }
 
         TQString id = (*it).msgid;
diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp
index a85fb990..471660f0 100644
--- a/kbabel/common/kbmailer.cpp
+++ b/kbabel/common/kbmailer.cpp
@@ -68,11 +68,11 @@ KBabelMailer::~KBabelMailer()
 void KBabelMailer::sendOneFile(const TQString& fileName)
 {
   if (!singleFileCompression) {
-    kapp->invokeMailer("", "", "", "", "", "", fileName);
+    tdeApp->invokeMailer("", "", "", "", "", "", fileName);
   } else {
     const TQString archive ( createArchive( TQStringList( fileName ), TQFileInfo( fileName ).baseName() ) );
     if ( !archive.isEmpty() ) {
-      kapp->invokeMailer("", "", "", "", "", "", archive);
+      tdeApp->invokeMailer("", "", "", "", "", "", archive);
     }
   }
 }
@@ -100,7 +100,7 @@ void KBabelMailer::sendOneFile( const KURL& url)
     TQString tempName( m_tempDir.name() );
     tempName += fileName;
     if ( TDEIO::NetAccess::download( url, tempName, m_parent ) )
-      kapp->invokeMailer("", "", "", "", "", "", fileName);
+      tdeApp->invokeMailer("", "", "", "", "", "", fileName);
     else
     {
       KMessageBox::error( m_parent, i18n("Error while trying to download file %1.").arg( url.prettyURL() ) );
@@ -110,7 +110,7 @@ void KBabelMailer::sendOneFile( const KURL& url)
   {
     const TQString archive ( createArchive( TQStringList( url.url() ), url.filename() ) );
     if ( !archive.isEmpty() ) {
-      kapp->invokeMailer("", "", "", "", "", "", archive);
+      tdeApp->invokeMailer("", "", "", "", "", "", archive);
     }
   }
 }
@@ -119,7 +119,7 @@ void KBabelMailer::sendFiles(TQStringList fileList, const TQString& initialName)
 {
   const TQString archive ( createArchive( fileList, initialName ) );
   if ( !archive.isEmpty() ) {
-    kapp->invokeMailer("", "", "", "", "", "", archive);
+    tdeApp->invokeMailer("", "", "", "", "", "", archive);
   }
 }
 
diff --git a/kbabel/common/msgfmt.cpp b/kbabel/common/msgfmt.cpp
index 82ac7a90..3ebd2a88 100644
--- a/kbabel/common/msgfmt.cpp
+++ b/kbabel/common/msgfmt.cpp
@@ -141,7 +141,7 @@ void Msgfmt::addToOutput(TDEProcess*,char *buffer, int buflen)
 
 TQString Msgfmt::tempSaveName()
 {
-   return kapp->tempSaveName("/tmp/kbabel_msgfmt.po");
+   return tdeApp->tempSaveName("/tmp/kbabel_msgfmt.po");
 }
 
 #include "msgfmt.moc"
diff --git a/kbabel/common/poinfo.cpp b/kbabel/common/poinfo.cpp
index 17d930d9..4df7041f 100644
--- a/kbabel/common/poinfo.cpp
+++ b/kbabel/common/poinfo.cpp
@@ -399,7 +399,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w
 	   
            while( lexer->lastToken != T_EOF && success==OK)
            {
-               if( interactive ) kapp->processEvents(10);
+               if( interactive ) tdeApp->processEvents(10);
 	       
 	       if( stopStaticRead )
 	       {
@@ -639,7 +639,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
 		   }
 		   case T_MSGID: 
 		   case T_MSGIDPLURAL: {
-	    		kapp->processEvents(10);
+	    		tdeApp->processEvents(10);
 			
 			// if stopped, return not found
 			if( stopStaticRead ) 
diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp
index 8eac4b06..9bb8dcec 100644
--- a/kbabel/commonui/projectwizard.cpp
+++ b/kbabel/commonui/projectwizard.cpp
@@ -166,7 +166,7 @@ Project::Ptr ProjectWizard::newProject()
 
 void ProjectWizard::slotHelpClicked( void )
 {
-    kapp->invokeHelp( "preferences-project-wizard", "kbabel" );
+    tdeApp->invokeHelp( "preferences-project-wizard", "kbabel" );
 }
 
 #include "projectwizard.moc"
diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp
index 507e7988..609dbdcd 100644
--- a/kbabel/commonui/roughtransdlg.cpp
+++ b/kbabel/commonui/roughtransdlg.cpp
@@ -278,7 +278,7 @@ void RoughTransDlg::translate()
     for(int i = 0; i < total; i++)
     {
         progressbar->setProgress(i+1);
-        kapp->processEvents(100);
+        tdeApp->processEvents(100);
 
         if(stop || cancel) break;
 
diff --git a/kbabel/filters/gettext/gettextexport.cpp b/kbabel/filters/gettext/gettextexport.cpp
index 9b08bfd2..e0695bea 100644
--- a/kbabel/filters/gettext/gettextexport.cpp
+++ b/kbabel/filters/gettext/gettextexport.cpp
@@ -164,7 +164,7 @@ ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQS
             
             stream << "\n";
 
-	 kapp->processEvents(10);
+	 tdeApp->processEvents(10);
 	 if( isStopped() )
 	 {
 	    return STOPPED;
@@ -181,7 +181,7 @@ ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQS
     	  {
               stream << (*oit) << "\n\n";
 
-	      kapp->processEvents(10);
+	      tdeApp->processEvents(10);
 	      if( isStopped() )
 	      {
 		  return STOPPED;
diff --git a/kbabel/filters/gettext/gettextimport.cpp b/kbabel/filters/gettext/gettextimport.cpp
index fb59fb4b..1f3ace87 100644
--- a/kbabel/filters/gettext/gettextimport.cpp
+++ b/kbabel/filters/gettext/gettextimport.cpp
@@ -171,7 +171,7 @@ ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQStr
 
    while( !stream.eof() )
    {
-      kapp->processEvents(10);
+      tdeApp->processEvents(10);
       if( isStopped() )
       {
          return STOPPED;
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 0f1bc0bf..4666ba9a 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -1090,7 +1090,7 @@ void KBabelMW::fileSave_internal()
 
        KURL url=m_view->currentURL();
 
-       DCOPClient *client = kapp->dcopClient();
+       DCOPClient *client = tdeApp->dcopClient();
        TQByteArray data;
        TQDataStream arg(data, IO_WriteOnly);
        arg << ((url.directory(false)+url.fileName()).utf8())  ;
@@ -1107,7 +1107,7 @@ void KBabelMW::fileSaveAs()
     m_view->saveFileAs();
     KURL url=m_view->currentURL();
 
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     TQByteArray data;
     TQDataStream arg(data, IO_WriteOnly);
     arg << ((url.directory(false)+url.fileName()).utf8())  ;
@@ -1121,7 +1121,7 @@ void KBabelMW::fileSaveSpecial()
 
     KURL url=m_view->currentURL();
 
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     TQByteArray data;
     TQDataStream arg(data, IO_WriteOnly);
     arg << ((url.directory(false)+url.fileName()).utf8())  ;
@@ -1242,7 +1242,7 @@ void KBabelMW::openCatalogManager()
     TQCString service;
     TQString result;
 
-    DCOPClient * client = kapp->dcopClient();
+    DCOPClient * client = tdeApp->dcopClient();
 
     // find out, if there is a running catalog manager
     QCStringList apps = client->registeredApplications();
@@ -1261,7 +1261,7 @@ void KBabelMW::openCatalogManager()
     {
         TQString prog = "catalogmanager";
         TQString url = "";
-        if( kapp->startServiceByDesktopName(prog,url, &result,&service))
+        if( tdeApp->startServiceByDesktopName(prog,url, &result,&service))
         {
              KMessageBox::error(this, i18n("Unable to use TDELauncher to start "
                 "Catalog Manager. You should check the installation of TDE.\n"
diff --git a/kbabel/kbabel/kbabelpref.cpp b/kbabel/kbabel/kbabelpref.cpp
index 25cbb77c..626b5ae7 100644
--- a/kbabel/kbabel/kbabelpref.cpp
+++ b/kbabel/kbabel/kbabelpref.cpp
@@ -103,7 +103,7 @@ KBabelPreferences::KBabelPreferences(TQPtrList<ModuleInfo> ml)
 void KBabelPreferences::slotHelp()
 {
    //TODO
-   kapp->invokeHelp("Preferences","");
+   tdeApp->invokeHelp("Preferences","");
 }
 
 bool KBabelPreferences::hasChanged()
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index fb38e592..adb07ac7 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -2083,7 +2083,7 @@ bool KBabelView::findNext_internal(DocPosition& pos, bool forReplace, bool gui)
 
 		}
 		if( isModified() && !opts.askForSave ) saveFile();
-		DCOPClient *client = kapp->dcopClient();
+		DCOPClient *client = tdeApp->dcopClient();
 		TQByteArray data, replyData;
 		TQCString replyType;
 		bool morefiles = false;	// more files to lookup in
@@ -2615,7 +2615,7 @@ void KBabelView::replaceAll()
 
 	while(success)
 	{
-		kapp->processEvents(100);
+		tdeApp->processEvents(100);
 
 		_replacesTotal++;
 
@@ -3888,7 +3888,7 @@ void KBabelView::spellcheck()
 	    if(emitProgress)
 	    {
 		emit signalResetProgressBar(i18n("Preparing spell check"),100);
-		kapp->processEvents(100);
+		tdeApp->processEvents(100);
 	    }
 
 	    uint total=last-first+1;
@@ -3900,7 +3900,7 @@ void KBabelView::spellcheck()
 		    lastPercent++;
 		    emit signalProgress(lastPercent);
 
-		    kapp->processEvents(100);
+		    tdeApp->processEvents(100);
 		}
 
 		TQStringList msgs=_catalog->msgstr(i);
@@ -4018,7 +4018,7 @@ void KBabelView::spellStart(KSpell *)
 		if(spell.ignoreList.count() > 0)
 		{
 			emit signalResetProgressBar(i18n("Preparing spell check"),100);
-			kapp->processEvents(100);
+			tdeApp->processEvents(100);
 
 			uint total = spell.ignoreList.count();
 			uint oldPercent=0;
@@ -4031,7 +4031,7 @@ void KBabelView::spellStart(KSpell *)
 				{
 					oldPercent++;
 					emit signalProgress(oldPercent);
-					kapp->processEvents(100);
+					tdeApp->processEvents(100);
 				}
 
 				spell.tdespell->ignore(*it);
diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp
index 5be00141..85daae34 100644
--- a/kbabel/kbabel/kbhighlighting.cpp
+++ b/kbabel/kbabel/kbhighlighting.cpp
@@ -300,7 +300,7 @@ void KBabelHighlighter::setSpellChecker( KSpell* spell )
             this, TQ_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int)));
 
 	// wait for KSpell to startup correctly
-	kapp->processEvents(500);
+	tdeApp->processEvents(500);
     }    
     
     highlight();
diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp
index cf6b8b4a..37132825 100644
--- a/kbabel/kbabel/main.cpp
+++ b/kbabel/kbabel/main.cpp
@@ -126,7 +126,7 @@ int KBabelApp::newInstance()
 #endif
     {
 	kdDebug () << "Suspending DCOP" << endl;
-	kapp->dcopClient()->suspend();
+	tdeApp->dcopClient()->suspend();
 
         TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
@@ -162,7 +162,7 @@ int KBabelApp::newInstance()
             TQString m = TQString::fromLocal8Bit(msgid);
 
 	    kdDebug () << "Resuming DCOP" << endl;
-	    kapp->dcopClient()->resume();
+	    tdeApp->dcopClient()->resume();
             kbInterface->gotoFileEntry(args->url(0).url().local8Bit(),m.utf8());
         }
         else
@@ -191,7 +191,7 @@ int KBabelApp::newInstance()
             }
 
 	    kdDebug () << "Resuming DCOP" << endl;
-	    kapp->dcopClient()->resume();
+	    tdeApp->dcopClient()->resume();
         }
 
 
@@ -237,7 +237,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
     KURL u(TQString::fromLocal8Bit(url));
 
     kdDebug () << "Suspending DCOP" << endl;
-    kapp->dcopClient()->suspend();
+    tdeApp->dcopClient()->suspend();
 
     KBabelMW *kb = KBabelMW::winForURL(u,project);
     if(kb)
@@ -259,7 +259,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
         	kb->open(u, TQString::fromUtf8(package),newWindow);
 
 		kdDebug () << "Resuming DCOP" << endl;
-		kapp->dcopClient()->resume();
+		tdeApp->dcopClient()->resume();
 
 		return ;
 	    }
@@ -277,7 +277,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
     	    kb->open(u,TQString::fromUtf8(package),false);
 
 	    kdDebug () << "Resuming DCOP" << endl;
-	    kapp->dcopClient()->resume();
+	    tdeApp->dcopClient()->resume();
 
 	    return;
 	}
@@ -293,7 +293,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
         	kb->open(u, TQString::fromUtf8(package),newWindow);
 
 		kdDebug () << "Resuming DCOP" << endl;
-		kapp->dcopClient()->resume();
+		tdeApp->dcopClient()->resume();
 
 		return ;
 	    }
@@ -310,7 +310,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
     }
     
     kdDebug () << "Resuming DCOP" << endl;
-    kapp->dcopClient()->resume();
+    tdeApp->dcopClient()->resume();
 }
 
 void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilename, TQCString package, int newWindow)
@@ -326,7 +326,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
     const KURL t( TQString::fromLocal8Bit( openFilename ) );
 
     kdDebug () << "Suspending DCOP" << endl;
-    kapp->dcopClient()->suspend();
+    tdeApp->dcopClient()->suspend();
 
     KBabelMW *kb = KBabelMW::winForURL(u, project);
     if(kb)
@@ -356,7 +356,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
     }
 
     kdDebug () << "Resuming DCOP" << endl;
-    kapp->dcopClient()->resume();
+    tdeApp->dcopClient()->resume();
 }
 
 void KBabelInterface::gotoFileEntry(TQCString url, TQCString m)
@@ -496,7 +496,7 @@ void KBabelInterface::spellcheck(TQStringList fileList)
 KBabelMW* KBabelInterface::findInstance( const KURL& url, const TQString& project, const TQString& package) const
 {
     kdDebug () << "Suspending DCOP" << endl;
-    kapp->dcopClient()->suspend();
+    tdeApp->dcopClient()->suspend();
 
     KBabelMW *kb = 0;
     if( !url.isEmpty() )
@@ -527,7 +527,7 @@ KBabelMW* KBabelInterface::findInstance( const KURL& url, const TQString& projec
     }
 
     kdDebug () << "Resuming DCOP" << endl;
-    kapp->dcopClient()->resume();
+    tdeApp->dcopClient()->resume();
 
     return kb;
 }
diff --git a/kbabel/kbabeldict/kbabeldict.cpp b/kbabel/kbabeldict/kbabeldict.cpp
index 6d8a35ef..0777a1b9 100644
--- a/kbabel/kbabeldict/kbabeldict.cpp
+++ b/kbabel/kbabeldict/kbabeldict.cpp
@@ -92,7 +92,7 @@ void KBabelDict::readConfig()
 
 void KBabelDict::quit()
 {
-    kapp->quit();
+    tdeApp->quit();
 }
 
 void KBabelDict::togglePref()
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index f9ea82e7..2347c28f 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -1676,7 +1676,7 @@ void KBabelDictBox::editFile()
                  msgid = result->found.first();
              }
 
-             DCOPClient *dcop = kapp->dcopClient();
+             DCOPClient *dcop = tdeApp->dcopClient();
 
              QCStringList list = dcop->registeredApplications();
              int index = list.findIndex("kbabel");
@@ -1691,7 +1691,7 @@ void KBabelDictBox::editFile()
                  argList.append("--gotomsgid");
                  argList.append(msgid.local8Bit());
                  argList.append(url.local8Bit());
-                 kapp->tdeinitExec("kbabel",argList,&error);
+                 tdeApp->tdeinitExec("kbabel",argList,&error);
                  if(!error.isNull())
                  {
                      KMessageBox::sorry(this
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
index 7280bbbd..290145d8 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
@@ -474,7 +474,7 @@ KDBSearchEngine::messagesForFilter (const SearchFilter * filter,
 	  if (count % step == 0)
 	    {
 		emit progress (100 * count / totalRecord);
-		kapp->processEvents (100);
+		tdeApp->processEvents (100);
 	    }
 	  if (stopNow)
 	    {
@@ -582,7 +582,7 @@ KDBSearchEngine::repeat ()
 	  if (count % step == 0)
 	    {
 		emit progress (100 * count / totalRecord);
-		kapp->processEvents (100);
+		tdeApp->processEvents (100);
 	    }
 	  if (stopNow)
 	    {
@@ -755,7 +755,7 @@ KDBSearchEngine::startSearchNow (int searchmode)
 	step = 100;
 
     emit progress (0);
-    kapp->processEvents (100);
+    tdeApp->processEvents (100);
     if (stopNow)
     {
 	stopNow = false;
@@ -775,7 +775,7 @@ KDBSearchEngine::startSearchNow (int searchmode)
 	    {
 		emit progress (100 * count / /*TQMAX( */
 			       totalprogress /*,1) */ );
-		kapp->processEvents (100);
+		tdeApp->processEvents (100);
 
 		if (stopNow)
 		{
@@ -1715,7 +1715,7 @@ TQValueList < KeyAndScore > KDBSearchEngine::searchWords (TQString phrase,
 				  {
 				      emit
 				      progress (100 * count / totalprogress);
-				      kapp->processEvents (100);
+				      tdeApp->processEvents (100);
 				  }
 				  if (stopNow)
 				  {
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
index c8b46db4..8ea17024 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
@@ -159,7 +159,7 @@ for (i=0;i<tot;i++)  //Skip header        = ????
   { 
    emit fileProgress(100*i/tot);
    emit added(count);
-   kapp->processEvents(100);
+   tdeApp->processEvents(100);
   }
 
   fuzzy=catalog->isFuzzy(i);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp
index aa64a4b0..862e7db3 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp
@@ -172,7 +172,7 @@ DataBaseInterface::MainEntry DataBaseInterface::get(const TQString& query,Search
     //int r=
     main->get(&k,&d);
     //  kdDebug(0) << "MAINDB->GET returned: " << r << endl;
-    if(counter%5==0) kapp->processEvents(100);
+    if(counter%5==0) tdeApp->processEvents(100);
     //  kdDebug(0) << "events processed" << endl;
     return qMakePair(k,d);
     
@@ -726,7 +726,7 @@ DataBaseInterface::MainEntry DataBaseInterface::getSentence( const TQString & qu
     DBItemMainKey k(query);
     DBItemMainData d;
     sentence->get(&k,&d);
-    if(counter%5==0) kapp->processEvents(100);
+    if(counter%5==0) tdeApp->processEvents(100);
     return qMakePair(k,d);
     
 }
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
index db7ac4ee..9ae67fde 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
@@ -243,7 +243,7 @@ for (i=0;i<tot;i++)  //Skip header        = ????
   { 
    emit fileProgress(100*i/tot);
    emit added(count);
-   kapp->processEvents(100);
+   tdeApp->processEvents(100);
   }
 
   fuzzy=catalog->isFuzzy(i);
diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
index aa85f267..bb280768 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
@@ -182,7 +182,7 @@ bool PoAuxiliary::startSearch(const TQString& t, uint pluralForm, const SearchFi
 
     clearResults();
    
-    kapp->processEvents(100);
+    tdeApp->processEvents(100);
 
     text.replace("\n","");
     
@@ -255,7 +255,7 @@ bool PoAuxiliary::startSearchInTranslation(const TQString& text)
 
     clearResults();
    
-    kapp->processEvents(100);
+    tdeApp->processEvents(100);
 
     Entry *entry = msgstrDict[text];
     if(entry)
@@ -455,7 +455,7 @@ void PoAuxiliary::loadAuxiliary()
             if( (100*(i+1))%total < 100 )
             {
                 emit progress((100*(i+1))/total);
-                kapp->processEvents(100);
+                tdeApp->processEvents(100);
             }
 
             Entry *e = new Entry;
diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
index 9c6f96a5..33bd2981 100644
--- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
@@ -109,7 +109,7 @@ bool CompendiumData::load(KURL url)
         if( (100*(i+1))%total < 100 )
         {
             emit progress((100*(i+1))/total);
-            kapp->processEvents(100);
+            tdeApp->processEvents(100);
         }
 
 	// FIXME: shoudl care about plural forms
diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
index 6045612b..48a41efb 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
@@ -369,7 +369,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr
                     emit progress( (50*checkCounter+1)/catalogInfo.total);
                 }
             
-                kapp->processEvents(100);
+                tdeApp->processEvents(100);
 
                 TQString origStr = data->catalog()->msgid(*it).first();
                 origStr = CompendiumData::simplify(origStr);
@@ -537,7 +537,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr
             continue;
         }
        
-        kapp->processEvents(100);
+        tdeApp->processEvents(100);
 
         TQString origStr = data->catalog()->msgid(i).first();
         origStr = CompendiumData::simplify(origStr);
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
index 2c2f5220..64d3ae84 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
@@ -337,7 +337,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
                     emit progress( (100*(checkCounter+1))/data->numberOfEntries());
                 }
             
-                kapp->processEvents(100);
+                tdeApp->processEvents(100);
 
                 TQString origStr = data->msgid(*it);
                 origStr = TmxCompendiumData::simplify(origStr);
@@ -484,7 +484,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
                  continue;
             }
        
-            kapp->processEvents(100);
+            tdeApp->processEvents(100);
 
             if(i >= data->numberOfEntries())
             {
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
index 17a9ec15..85902961 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
@@ -146,7 +146,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language)
         if( (100*(i+1))%total < 100 )
         {
             emit progress((100*(i+1))/total);
-            kapp->processEvents(100);
+            tdeApp->processEvents(100);
         }
 	
     	TQDomNodeList tuvTags = tuTags.item(i).toElement().elementsByTagName("tuv");