Use tdeApp

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

97 files changed, 250 insertions, 250 deletions

diff --git a/blinken/src/blinken.cpp b/blinken/src/blinken.cpp
index 969efc20..1e720613 100644
--- a/blinken/src/blinken.cpp
+++ b/blinken/src/blinken.cpp
@@ -71,7 +71,7 @@ blinken::blinken() : TQWidget(0, 0, WStaticContents | WNoAutoErase), m_overHighs
 	connect(&m_game, TQ_SIGNAL(phaseChanged()), this, TQ_SLOT(update()));
 	connect(&m_game, TQ_SIGNAL(highlight(blinkenGame::color, bool)), this, TQ_SLOT(highlight(blinkenGame::color, bool)));
 	
-	m_helpMenu = new KHelpMenu(this, kapp->aboutData());
+	m_helpMenu = new KHelpMenu(this, tdeApp->aboutData());
 	
 	for (int i = 0; i < 3; i++) m_overLevels[i] = false;
 	
@@ -301,7 +301,7 @@ void blinken::mousePressEvent(TQMouseEvent *e)
 		blinkenSettings::writeConfig();
 		update();
 	}
-	else if (m_overQuit) kapp->quit();
+	else if (m_overQuit) tdeApp->quit();
 	else if (m_overAboutBlinken || m_overCentralLetters) m_helpMenu -> aboutApplication();
 	else if (m_overAboutKDE) m_helpMenu -> aboutKDE();
 	else if (m_overManual) m_helpMenu -> appHelpActivated();
diff --git a/blinken/src/blinkengame.cpp b/blinken/src/blinkengame.cpp
index 7c1304d0..6a5f51ae 100644
--- a/blinken/src/blinkengame.cpp
+++ b/blinken/src/blinkengame.cpp
@@ -156,7 +156,7 @@ blinkenGame::color blinkenGame::generateColor()
 	// make the compiler happy :-D
 	color c = none;
 
-	r = 1 + (int)(4.0 * kapp -> random() / (RAND_MAX + 1.0));
+	r = 1 + (int)(4.0 * tdeApp -> random() / (RAND_MAX + 1.0));
 	switch(r)
 	{
 		case 1:
diff --git a/blinken/src/button.cpp b/blinken/src/button.cpp
index 584feeb3..a8fadf3d 100644
--- a/blinken/src/button.cpp
+++ b/blinken/src/button.cpp
@@ -17,7 +17,7 @@
 
 button::button(blinkenGame::color c) : m_selected(false), m_color(c)
 {
-	TDEConfig *kc = kapp->config();
+	TDEConfig *kc = tdeApp->config();
 	kc->setGroup("General");
 	TQString cs = getColorString();
 	TQString pixmap = TQString("images/%1h.png").arg(cs);
@@ -58,7 +58,7 @@ void button::setShortcut(int key)
 	m_key = key;
 	m_selected = false;
 	
-	TDEConfig *kc = kapp->config();
+	TDEConfig *kc = tdeApp->config();
 	kc->setGroup("General");
 	kc->writeEntry(getColorString(), key);
 	kc->sync();
diff --git a/blinken/src/highscoredialog.cpp b/blinken/src/highscoredialog.cpp
index 8996a3de..f3a54835 100644
--- a/blinken/src/highscoredialog.cpp
+++ b/blinken/src/highscoredialog.cpp
@@ -130,7 +130,7 @@ highScoreDialog::highScoreDialog(TQWidget *parent) : KDialogBase(parent, 0, true
 	m_tw = new myTabWidget(this);
 	setMainWidget(m_tw);
 	
-	TDEConfig *cfg = kapp -> config();
+	TDEConfig *cfg = tdeApp -> config();
 	for (int i = 1; i <= 3; i++)
 	{
 		cfg -> setGroup(TQString("Level%1").arg(i));
@@ -169,7 +169,7 @@ void highScoreDialog::addScore(int level, int score, const TQString &name)
 		m_scores[level].insert(it, qMakePair(score, name));
 		m_scores[level].remove(--m_scores[level].end());
 		
-		TDEConfig *cfg = kapp -> config();
+		TDEConfig *cfg = tdeApp -> config();
 		cfg -> setGroup(TQString("Level%1").arg(level + 1));
 		int j;
 		for (it = m_scores[level].begin(), j = 1; it != m_scores[level].end(); ++it, j++)
diff --git a/doc/kalzium/index.docbook b/doc/kalzium/index.docbook
index 2bef5de2..d2a49f21 100644
--- a/doc/kalzium/index.docbook
+++ b/doc/kalzium/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-<!ENTITY kappname "&kalzium;"><!-- replace kapp here -->
+<!ENTITY kappname "&kalzium;"><!-- replace tdeApp here -->
  <!ENTITY package "tdeedu">
  <!ENTITY % addindex "IGNORE">
  <!ENTITY % English "INCLUDE"><!-- change language only here -->
diff --git a/doc/kgeography/index.docbook b/doc/kgeography/index.docbook
index 12ed2a55..3675d2eb 100644
--- a/doc/kgeography/index.docbook
+++ b/doc/kgeography/index.docbook
@@ -263,7 +263,7 @@ Guess the flag of a division: a province name is given and you must find the cor
 </para>
 </chapter>
 
-<chapter id="using-kapp">
+<chapter id="using-tdeApp">
 <title>Using &kgeography;</title>
 
 <para>
@@ -284,7 +284,7 @@ Guess the flag of a division: a province name is given and you must find the cor
 </para>
 
 
-<sect1 id="kapp-features">
+<sect1 id="tdeApp-features">
 <title>More &kgeography; features</title>
 
 <para>Another feature of &kgeography; is the possibility of zoom on a map.
@@ -444,7 +444,7 @@ Also include any keys that have a special function but have no equivalent in the
 menus or toolbars. This may not be necessary for small apps or apps with no tool
 or menu bars. -->
 
-<sect1 id="kapp-mainwindow">
+<sect1 id="tdeApp-mainwindow">
 <title>The main &kgeography; window</title>
 
 <sect2>
@@ -613,7 +613,7 @@ Documentation Copyright &copy; 2005 &Anne-Marie.Mahfouf; <email>&Anne-Marie.Mahf
 <appendix id="installation">
 <title>Installation</title>
 
-<sect1 id="getting-kapp">
+<sect1 id="getting-tdeApp">
 <title>How to obtain &kgeography;</title>
 
 <!-- This first entity contains boiler plate for applications that are
diff --git a/doc/ktouch/index.docbook b/doc/ktouch/index.docbook
index 9b61f5a4..ffad20c4 100644
--- a/doc/ktouch/index.docbook
+++ b/doc/ktouch/index.docbook
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
  <!ENTITY ktouch "<application>KTouch</application>">
- <!ENTITY kappname "&ktouch;"><!-- replace kapp here -->
+ <!ENTITY kappname "&ktouch;"><!-- replace tdeApp here -->
  <!ENTITY package "tdeedu">
  <!ENTITY % addindex "IGNORE">
  <!ENTITY % English "INCLUDE"><!-- change language only here -->
diff --git a/doc/kvoctrain/index.docbook b/doc/kvoctrain/index.docbook
index ce20e5b8..fcd05746 100644
--- a/doc/kvoctrain/index.docbook
+++ b/doc/kvoctrain/index.docbook
@@ -2192,7 +2192,7 @@ The International Phonetic Association</ulink></para></listitem>
 <chapter id="commands">
 <title>Command Reference</title>
 
-<sect1 id="kapp-mainwindow">
+<sect1 id="tdeApp-mainwindow">
 <title>The Main &kvoctrain; Window</title>
 
 <sect2 id="file-menu">
diff --git a/kalzium/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp
index a66e7cf8..58d1f599 100644
--- a/kalzium/src/detailinfodlg.cpp
+++ b/kalzium/src/detailinfodlg.cpp
@@ -456,8 +456,8 @@ void DetailedInfoDlg::slotHelp()
 			break;
 	}
 
-	if ( kapp )
-		kapp->invokeHelp ( chapter, "kalzium" );
+	if ( tdeApp )
+		tdeApp->invokeHelp ( chapter, "kalzium" );
 }
 
 void DetailedInfoDlg::wheelEvent( TQWheelEvent *ev )
diff --git a/kalzium/src/elementdataviewer.cpp b/kalzium/src/elementdataviewer.cpp
index ba679d00..e3897d2b 100644
--- a/kalzium/src/elementdataviewer.cpp
+++ b/kalzium/src/elementdataviewer.cpp
@@ -87,8 +87,8 @@ ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name )
 void ElementDataViewer::slotHelp()
 {
 	emit helpClicked();
-	if ( kapp )
-		kapp->invokeHelp ( "plot_data", "kalzium" );
+	if ( tdeApp )
+		tdeApp->invokeHelp ( "plot_data", "kalzium" );
 }
 
 // Reimplement slotUser1 from KDialogBase
diff --git a/kalzium/src/eqchemview.cpp b/kalzium/src/eqchemview.cpp
index 86410749..c2d8a95b 100644
--- a/kalzium/src/eqchemview.cpp
+++ b/kalzium/src/eqchemview.cpp
@@ -113,8 +113,8 @@ EQChemDialog::EQChemDialog( TQWidget *parent )
 void EQChemDialog::slotHelp()
 {
 	emit helpClicked();
-	if ( kapp )
-		kapp->invokeHelp ( "eq_solver", "kalzium" );
+	if ( tdeApp )
+		tdeApp->invokeHelp ( "eq_solver", "kalzium" );
 }
 
 #include "eqchemview.moc"
diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp
index ff89e575..baf25ab1 100644
--- a/kalzium/src/kalzium.cpp
+++ b/kalzium/src/kalzium.cpp
@@ -158,7 +158,7 @@ void Kalzium::setupActions()
 	
 	// the standard actions
 	KStdAction::preferences(this, TQ_SLOT(showSettingsDialog()), actionCollection());
-	KStdAction::quit(kapp, TQ_SLOT (closeAllWindows()),actionCollection() );
+	KStdAction::quit(tdeApp, TQ_SLOT (closeAllWindows()),actionCollection() );
 
 	slotShowScheme( Prefs::colorschemebox() );
 	slotSwitchtoNumeration( Prefs::numeration() );
diff --git a/kalzium/src/kalziumdataobject.cpp b/kalzium/src/kalziumdataobject.cpp
index 1e4f93e3..1b8113a2 100644
--- a/kalzium/src/kalziumdataobject.cpp
+++ b/kalzium/src/kalziumdataobject.cpp
@@ -51,7 +51,7 @@ KalziumDataObject::KalziumDataObject()
 	if (!layoutFile.exists())
 	{
 		kdDebug() << "data.xml not found, exiting" << endl;
-		kapp->exit(0);
+		tdeApp->exit(0);
 		return;
 	}
 
diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp
index d6ba31af..779e6083 100644
--- a/kanagram/src/kanagram.cpp
+++ b/kanagram/src/kanagram.cpp
@@ -113,7 +113,7 @@ Kanagram::Kanagram() : TQWidget(0, 0, WStaticContents | WNoAutoErase), m_overNex
 
 	m_hintTimer = new TQTimer(this);
 	
-	m_helpMenu = new KHelpMenu(this, kapp->aboutData());
+	m_helpMenu = new KHelpMenu(this, tdeApp->aboutData());
 	
 	m_inputBox = new TQLineEdit(this);
 	m_inputBox->setGeometry(TQRect(52, 427, 273, 29));
@@ -393,7 +393,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e)
 
 	if(m_quitRect.contains(e->pos()))
 	{
-		kapp->quit();
+		tdeApp->quit();
 	}
 
 	if(m_revealRect.contains(e->pos()))
diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp
index a89072d8..7f8c04c0 100644
--- a/kanagram/src/keduvocdocument.cpp
+++ b/kanagram/src/keduvocdocument.cpp
@@ -165,7 +165,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
         TQString format = i18n("Could not load \"%1\"\nDo you want to try again?");
         TQString msg = format.arg(url.path());
         int result = KMessageBox::warningContinueCancel(0, msg,
-                                                        kapp->makeStdCaption(i18n("I/O Failure")),
+                                                        tdeApp->makeStdCaption(i18n("I/O Failure")),
                                                         i18n("&Retry"));
         if ( result == KMessageBox::Cancel ) {
           Init();
@@ -255,7 +255,7 @@ bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType f
       TQString format = i18n("Could not save \"%1\"\nDo you want to try again?");
       TQString msg = format.arg(tmp.path());
       int result = KMessageBox::warningContinueCancel(0, msg,
-                                                      kapp->makeStdCaption(i18n("I/O Failure")),
+                                                      tdeApp->makeStdCaption(i18n("I/O Failure")),
                                                       i18n("&Retry"));
       if ( result == KMessageBox::Cancel ) return false;
     }
diff --git a/kanagram/src/keduvockvtmlreader.cpp b/kanagram/src/keduvockvtmlreader.cpp
index 34c31ca7..ed0939bf 100644
--- a/kanagram/src/keduvockvtmlreader.cpp
+++ b/kanagram/src/keduvockvtmlreader.cpp
@@ -1678,7 +1678,7 @@ void KEduVocKvtmlReader::domErrorUnknownElement(const TQString &elem)
      );
   TQString msg = format.arg(elem);
   TQApplication::setOverrideCursor( arrowCursor, true );
-  TQString s = kapp->makeStdCaption(i18n("Unknown Element"));
+  TQString s = tdeApp->makeStdCaption(i18n("Unknown Element"));
   KMessageBox::sorry(0, ln+msg, s);
   TQApplication::restoreOverrideCursor();
 }
@@ -1686,7 +1686,7 @@ void KEduVocKvtmlReader::domErrorUnknownElement(const TQString &elem)
 void KEduVocKvtmlReader::domError(const TQString &text )
 {
   TQApplication::setOverrideCursor( arrowCursor, true );
-  TQString s = kapp->makeStdCaption(i18n("Error"));
+  TQString s = tdeApp->makeStdCaption(i18n("Error"));
   TQString ln = i18n("File:\t%1\n").arg(m_doc->URL().path());
   TQString msg = text;
   KMessageBox::error(0, ln+msg, s);
diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp
index 97d73264..3c44c4bf 100644
--- a/kbruch/src/mainqtwidget.cpp
+++ b/kbruch/src/mainqtwidget.cpp
@@ -159,7 +159,7 @@ void MainQtWidget::setupActions()
 				      actionCollection(), "NewTask");
 
 	// quit action
-	KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+	KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
 
 	//
 	KStdAction::preferences(this,  TQ_SLOT( slotPrefs() ), actionCollection());
diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp
index 06d617a4..0401e56e 100644
--- a/keduca/keduca/keduca.cpp
+++ b/keduca/keduca/keduca.cpp
@@ -68,7 +68,7 @@ void Keduca::setupActions()
 actionCollection(), "open_gallery" );
 	_recentFiles = KStdAction::openRecent(this, TQ_SLOT ( slotFileOpenURL(const KURL &) ),
 actionCollection());
-	KStdAction::quit(kapp, TQ_SLOT( quit() ), actionCollection());
+	KStdAction::quit(tdeApp, TQ_SLOT( quit() ), actionCollection());
 }
 
 void Keduca::slotFileOpen()
diff --git a/kgeography/src/boxasker.cpp b/kgeography/src/boxasker.cpp
index 76535874..fa1cdb1b 100644
--- a/kgeography/src/boxasker.cpp
+++ b/kgeography/src/boxasker.cpp
@@ -71,7 +71,7 @@ void boxAsker::nextQuestionHook(const TQString &division)
 	auxList << division;
 		
 	// we put the division in a random place
-	p_position = (int)((float)4 * kapp -> random() / (RAND_MAX + 1.0));
+	p_position = (int)((float)4 * tdeApp -> random() / (RAND_MAX + 1.0));
 	nextBoxAskerQuestionHook(division, p_position, true);
 		
 	// we put other 3 names
diff --git a/kgeography/src/map.cpp b/kgeography/src/map.cpp
index 6c54db69..6dac2722 100644
--- a/kgeography/src/map.cpp
+++ b/kgeography/src/map.cpp
@@ -119,7 +119,7 @@ TQString KGmap::getName() const
 TQString KGmap::getRandomDivision(bool clickDivisionMode) const
 {
 	TQValueList<division*> aux;
-	int i = (int)((float)p_nameMap.size() * kapp -> random() / (RAND_MAX + 1.0));
+	int i = (int)((float)p_nameMap.size() * tdeApp -> random() / (RAND_MAX + 1.0));
 	aux = p_nameMap.values();
 	if (!aux[i] -> canAsk(clickDivisionMode)) return getRandomDivision(clickDivisionMode);
 	else return aux[i] -> getName();
diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp
index 03dabbdf..7f6441e2 100644
--- a/khangman/khangman/khangman.cpp
+++ b/khangman/khangman/khangman.cpp
@@ -134,7 +134,7 @@ void KHangMan::slotQuit()
 {
     Prefs::setShowCharToolbar( secondToolbar->isVisible());
     Prefs::writeConfig();
-    kapp->quit();
+    tdeApp->quit();
 }
 
 
@@ -223,7 +223,7 @@ void KHangMan::setLanguages()
     temp_languages.clear();
 
     // Write the present languages in config so they cannot be downloaded.
-    TDEConfig *config=kapp->config();
+    TDEConfig *config=tdeApp->config();
     config->setGroup("TDENewStuffStatus");
     for (uint i=0;  i<m_languages.count(); i++) {
         TQString tmp = m_languages[i];
@@ -440,7 +440,7 @@ void KHangMan::loadLangToolBar()
 				 "check your installation.").arg(Prefs::selectedLanguage());
 	    KMessageBox::sorry( this, mString,
 				i18n("Error") );
-	    kapp->quit();
+	    tdeApp->quit();
 	}
 	update();
 
diff --git a/khangman/khangman/khangmanview.cpp b/khangman/khangman/khangmanview.cpp
index dc8864c8..a55b0e98 100644
--- a/khangman/khangman/khangmanview.cpp
+++ b/khangman/khangman/khangmanview.cpp
@@ -434,7 +434,7 @@ void KHangManView::slotTry()
 		else if (KMessageBox::questionYesNo(this, i18n("Congratulations! You won! Do you want to play again?"),TQString(),i18n("Play Again"), i18n("Do Not Play")) == 3)
 		    slotNewGame();
 		else
-		    kapp->quit();
+		    tdeApp->quit();
 	    }
 	}
 	else {
@@ -480,7 +480,7 @@ void KHangManView::slotTry()
 		else if (KMessageBox::questionYesNo(this, newGameString, TQString(), i18n("Play Again"), i18n("Do Not Play")) == 3)
 		    slotNewGame();
 		else
-		    kapp->quit();
+		    tdeApp->quit();
 	    }
 	}
     }
@@ -596,7 +596,7 @@ void KHangManView::game()
 	             .arg(Prefs::selectedLanguage())
 	             .arg(Prefs::levelFile());
 	KMessageBox::sorry( this, mString, i18n("Error") );
-	kapp->quit();
+	tdeApp->quit();
     }
 
     // We open the file and store info into the stream...
diff --git a/khangman/khangman/khnewstuff.cpp b/khangman/khangman/khnewstuff.cpp
index a3719a9a..4e4d2073 100644
--- a/khangman/khangman/khnewstuff.cpp
+++ b/khangman/khangman/khnewstuff.cpp
@@ -47,7 +47,7 @@ bool KHNewStuff::install( const TQString &fileName )
                     return false;
     const KArchiveDirectory *archiveDir = archive.directory();
     TDEStandardDirs myStdDir;
-    const TQString destDir =myStdDir.saveLocation("data", kapp->instanceName() + "/data/", true);      
+    const TQString destDir =myStdDir.saveLocation("data", tdeApp->instanceName() + "/data/", true);      
     TDEStandardDirs::makeDir( destDir );
     archiveDir->copyTo(destDir);
     archive.close();
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index 4ccbb62b..187b9699 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -635,7 +635,7 @@ void KigPart::runMode( KigMode* m )
 
   setMode( m );
 
-  (void) kapp->eventLoop()->enterLoop();
+  (void) tdeApp->eventLoop()->enterLoop();
 
   setMode( prev );
   redrawScreen();
@@ -646,7 +646,7 @@ void KigPart::doneMode( KigMode* d )
   assert( d == mMode );
   // pretend to use this var..
   (void)d;
-  kapp->eventLoop()->exitLoop();
+  tdeApp->eventLoop()->exitLoop();
 }
 
 void KigPart::actionRemoved( GUIAction* a, GUIUpdateToken& t )
diff --git a/kig/modes/edittype.cpp b/kig/modes/edittype.cpp
index 00686392..75ba9ca3 100644
--- a/kig/modes/edittype.cpp
+++ b/kig/modes/edittype.cpp
@@ -50,7 +50,7 @@ EditType::~EditType()
 
 void EditType::helpSlot()
 {
-  kapp->invokeHelp( TQString::fromLatin1( "working-with-types" ),
+  tdeApp->invokeHelp( TQString::fromLatin1( "working-with-types" ),
                     TQString::fromLatin1( "kig" ) );
 }
 
diff --git a/kig/modes/macrowizard.cpp b/kig/modes/macrowizard.cpp
index e4c02aa0..3d1e598d 100644
--- a/kig/modes/macrowizard.cpp
+++ b/kig/modes/macrowizard.cpp
@@ -85,6 +85,6 @@ void MacroWizard::accept()
 
 void MacroWizard::slotHelpClicked()
 {
-  kapp->invokeHelp( TQString::fromLatin1( "defining-macros"),
+  tdeApp->invokeHelp( TQString::fromLatin1( "defining-macros"),
                     TQString::fromLatin1( "kig" ) );
 }
diff --git a/kig/modes/textlabelwizard.cpp b/kig/modes/textlabelwizard.cpp
index 84d86adb..f52e9bb0 100644
--- a/kig/modes/textlabelwizard.cpp
+++ b/kig/modes/textlabelwizard.cpp
@@ -89,7 +89,7 @@ void TextLabelWizard::relayoutArgsPage()
 
 void TextLabelWizard::slotHelpClicked()
 {
-  kapp->invokeHelp( TQString::fromLatin1( "text-labels" ),
+  tdeApp->invokeHelp( TQString::fromLatin1( "text-labels" ),
                     TQString::fromLatin1( "kig" ) );
 }
 
diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp
index 2c1235df..0c3609c5 100644
--- a/kig/modes/typesdialog.cpp
+++ b/kig/modes/typesdialog.cpp
@@ -108,7 +108,7 @@ TypesDialog::~TypesDialog()
 
 void TypesDialog::helpSlot()
 {
-  kapp->invokeHelp( TQString::fromLatin1( "working-with-types" ),
+  tdeApp->invokeHelp( TQString::fromLatin1( "working-with-types" ),
                     TQString::fromLatin1( "kig" ) );
 }
 
diff --git a/kig/objects/text_type.cpp b/kig/objects/text_type.cpp
index c82c2047..05d564ff 100644
--- a/kig/objects/text_type.cpp
+++ b/kig/objects/text_type.cpp
@@ -144,7 +144,7 @@ void TextType::executeAction( int i, ObjectHolder& o, ObjectTypeCalcer& c,
 
   if ( i == 0 )
   {
-    TQClipboard* cb = kapp->clipboard();
+    TQClipboard* cb = tdeApp->clipboard();
 
     // copy the text into the clipboard
     const TextImp* ti = static_cast<const TextImp*>( c.imp() );
diff --git a/kig/scripting/newscriptwizard.cpp b/kig/scripting/newscriptwizard.cpp
index 12c27e51..0268b67c 100644
--- a/kig/scripting/newscriptwizard.cpp
+++ b/kig/scripting/newscriptwizard.cpp
@@ -159,7 +159,7 @@ void NewScriptWizard::accept()
 
 void NewScriptWizard::slotHelpClicked()
 {
-  kapp->invokeHelp( TQString::fromLatin1( "scripting" ),
+  tdeApp->invokeHelp( TQString::fromLatin1( "scripting" ),
                     TQString::fromLatin1( "kig" ) );
 }
 
diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp
index 781f684b..c7dc98eb 100644
--- a/kiten/kiten.cpp
+++ b/kiten/kiten.cpp
@@ -115,7 +115,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) : TDEMainWindow(parent, n
 	applyMainWindowSettings(TDEGlobal::config(), "TopLevelWindow");
 
 	connect(_ResultView, TQ_SIGNAL(linkClicked(const TQString &)), TQ_SLOT(ressearch(const TQString &)));
-	connect(kapp->clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(autoSearch()));
+	connect(tdeApp->clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(autoSearch()));
 
 	TQTimer::singleShot(10, this, TQ_SLOT(finishInit()));
 }
@@ -130,7 +130,7 @@ void TopLevel::finishInit()
 {
 	// if it's the application's first time starting, 
 	// the app group won't exist and we show demo
-	if (!kapp->config()->hasGroup("app"))
+	if (!tdeApp->config()->hasGroup("app"))
 	{
 		if (kanjiCB->isChecked())
 		  	Edit->setText(TQString::fromUtf8("辞"));
@@ -277,14 +277,14 @@ void TopLevel::handleSearchResult(Dict::SearchResult results)
 			{
 				//kdDebug() << "adding " << (*it).kanji() << endl;
 				_ResultView->addResult(*it, common);
-				kapp->processEvents();
+				tdeApp->processEvents();
 			}
 		}
 		else
 		{
 			for (TQValueListIterator<Dict::Entry> it = results.list.begin(); it != results.list.end(); ++it)
 			{
-				kapp->processEvents();
+				tdeApp->processEvents();
 				_ResultView->addKanjiResult(*it, results.common);
 			}
 		}
@@ -293,7 +293,7 @@ void TopLevel::handleSearchResult(Dict::SearchResult results)
 	{
 		for (TQValueListIterator<Dict::Entry> it = results.list.begin(); it != results.list.end(); ++it)
 		{
-			kapp->processEvents();
+			tdeApp->processEvents();
 			_ResultView->addResult(*it, comCB->isChecked());
 		}
 	}
@@ -529,9 +529,9 @@ void TopLevel::gradeSearch()
 
 TQString TopLevel::clipBoardText() // gets text from clipboard for globalaccels
 {
-	kapp->clipboard()->setSelectionMode(true);
-	TQString text = kapp->clipboard()->text().stripWhiteSpace();
-	kapp->clipboard()->setSelectionMode(false);
+	tdeApp->clipboard()->setSelectionMode(true);
+	TQString text = tdeApp->clipboard()->text().stripWhiteSpace();
+	tdeApp->clipboard()->setSelectionMode(false);
 
 	return text;
 }
diff --git a/kiten/learn.cpp b/kiten/learn.cpp
index c9c58435..cb647aa1 100644
--- a/kiten/learn.cpp
+++ b/kiten/learn.cpp
@@ -247,7 +247,7 @@ bool Learn::queryClose()
 
 void Learn::random()
 {
-	int rand = static_cast<int>(static_cast<float>(list.count()) / (static_cast<float>(RAND_MAX) / kapp->random()));
+	int rand = static_cast<int>(static_cast<float>(list.count()) / (static_cast<float>(RAND_MAX) / tdeApp->random()));
 
 	current = list.at(rand - 1);
 	update();
@@ -303,7 +303,7 @@ void Learn::update()
 	
 	for (TQValueListIterator<Dict::Entry> it = compounds.list.begin(); it != compounds.list.end(); ++it)
 	{
-		kapp->processEvents();
+		tdeApp->processEvents();
 		View->addResult(*it, true);
 	}
 
@@ -683,12 +683,12 @@ TQString Learn::randomMeaning(TQStringList &oldMeanings)
 
 	do
 	{
-		float rand = kapp->random();
+		float rand = tdeApp->random();
 		if ((rand > (RAND_MAX / 2)) || (List->childCount() < numberOfAnswers))
 		{
 			// get a meaning from dict
 			//kdDebug() << "from our dict\n";
-			rand = kapp->random();
+			rand = tdeApp->random();
 			float rand2 = RAND_MAX / rand;
 			rand = ((float)list.count() - 1) / rand2;
 			//rand -= 1;
@@ -711,7 +711,7 @@ TQString Learn::randomMeaning(TQStringList &oldMeanings)
 		{
 			// get a meaning from our list
 			//kdDebug() << "from our list\n";
-			rand = kapp->random();
+			rand = tdeApp->random();
 			float rand2 = RAND_MAX / rand;
 			rand = List->childCount() / rand2;
 
@@ -749,7 +749,7 @@ void Learn::qupdate()
 		newFont.setPixelSize(24);
 	qKanji->setFont(newFont);
 
-	float rand = kapp->random();
+	float rand = tdeApp->random();
 	float rand2 = RAND_MAX / rand;
 	seikai = static_cast<int>(numberOfAnswers / rand2);
 
@@ -787,10 +787,10 @@ void Learn::qnew() // new quiz kanji
 	// use f(2) every third time, f(1) otherwise
 	// where f(1) = numberOfItems * rand[0..1]
 	// and f(2) = numberOfItems * rand[0..1] * rand[0..1]
-	// rand[0..1] = kapp->random() / RAND_MAX
-	float max = static_cast<float>(count) / (static_cast<float>(RAND_MAX) / kapp->random());
-	if (kapp->random() < (static_cast<float>(RAND_MAX) / 3.25))
-		max /= (static_cast<float>(RAND_MAX) / (kapp->random() + 1));
+	// rand[0..1] = tdeApp->random() / RAND_MAX
+	float max = static_cast<float>(count) / (static_cast<float>(RAND_MAX) / tdeApp->random());
+	if (tdeApp->random() < (static_cast<float>(RAND_MAX) / 3.25))
+		max /= (static_cast<float>(RAND_MAX) / (tdeApp->random() + 1));
 
 	max = static_cast<int>(max);
 
diff --git a/kiten/rad.cpp b/kiten/rad.cpp
index a77afd16..cb73b51f 100644
--- a/kiten/rad.cpp
+++ b/kiten/rad.cpp
@@ -296,7 +296,7 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p
 	connect(clear, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearSelected()));
 	clear->setEnabled(false);
 
-	setCaption(kapp->makeStdCaption(i18n("Radical Selector")));
+	setCaption(tdeApp->makeStdCaption(i18n("Radical Selector")));
 
 	strokesSpin->setValue(config->strokes());
 	strokesSpin->setFocus();
diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp
index 1fbdc262..f3fa8692 100644
--- a/kiten/widgets.cpp
+++ b/kiten/widgets.cpp
@@ -278,7 +278,7 @@ void ResultView::print(TQString title)
 			printer.newPage();
 			page++;
 
-			kapp->processEvents();
+			tdeApp->processEvents();
 		}
 		while (true);
     }
diff --git a/klatin/klatin/klatin.cpp b/klatin/klatin/klatin.cpp
index 3375603d..414cc838 100644
--- a/klatin/klatin/klatin.cpp
+++ b/klatin/klatin/klatin.cpp
@@ -58,7 +58,7 @@ void KLatin::setupActions()
 	m_loadGrammar = new TDEAction(i18n("Load &Grammar"), 0, this, TQ_SLOT(loadGrammar()),  actionCollection(), "go_grammar");
 	m_loadVerbs = new TDEAction(i18n("Load V&erbs"), 0, this, TQ_SLOT(loadVerbs()),  actionCollection(), "go_verbs");
 	m_loadRevision = new TDEAction(i18n("Load &Revision"), 0, this, TQ_SLOT(loadRevision()),  actionCollection(), "go_revision");
-	KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+	KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
 }
 
 void KLatin::startClicked()
@@ -151,7 +151,7 @@ void KLatin::loadVerbs()
 
 void KLatin::loadRevision()
 {
-	kapp->invokeHelp("klatin-index", "klatin");
+	tdeApp->invokeHelp("klatin-index", "klatin");
 }
 
 void KLatin::loadSettings()
@@ -191,7 +191,7 @@ void KLatin::resetGUI()
 	// Connect the "Start" button to slot StartPressed()
 	connect(klatinchoose->StartButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(startClicked()));
 	// Make the quit button quit the application :)
-	connect(klatinchoose->QuitButton, TQ_SIGNAL(clicked()), kapp, TQ_SLOT(quit()));
+	connect(klatinchoose->QuitButton, TQ_SIGNAL(clicked()), tdeApp, TQ_SLOT(quit()));
 	
 	// Enable all the menu entries under Section/
 	updateSection(TRUE);
diff --git a/klatin/klatin/klatinvocab.cpp b/klatin/klatin/klatinvocab.cpp
index 8181d7af..234eeda6 100644
--- a/klatin/klatin/klatinvocab.cpp
+++ b/klatin/klatin/klatinvocab.cpp
@@ -108,7 +108,7 @@ void KLatinVocab::parseVocab(TQString customFile)
 		
 		if (TQFile::exists(defaultFile) == FALSE) {
 			KMessageBox::error(this, i18n("Could not load vocabulary file; there is a problem with your KLatin installation."), i18n("Error with KLatin"));
-			kapp->quit();
+			tdeApp->quit();
 		} else {
 			fileName = defaultFile;
 			Settings::setDefaultFile(defaultFile);
diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp
index f9c17cb8..be272a7b 100644
--- a/klettres/klettres/klettres.cpp
+++ b/klettres/klettres/klettres.cpp
@@ -121,7 +121,7 @@ void KLettres::findLanguages()
 //TODO TEST in FRENCH
     m_languages.sort();
     //write the present languages in config so they cannot be downloaded
-    TDEConfig *config=kapp->config();
+    TDEConfig *config=tdeApp->config();
     config->setGroup("TDENewStuffStatus");
     for (uint i=0;  i<m_languages.count(); i++)
     {
@@ -178,7 +178,7 @@ bool KLettres::loadLayout(TQDomDocument &layoutDocument)
                              "$TDEDIR/share/apps/klettres/\n\n"
                              "Please install this file and start KLettres again.\n\n");
         KMessageBox::information( this, mString,"KLettres - Error" );
-        kapp->quit();//exit(1);
+        tdeApp->quit();//exit(1);
     }
     if (!layoutFile.open(IO_ReadOnly))
         return false;
@@ -202,7 +202,7 @@ void KLettres::setupActions()
     TDEAction *m_playAgainAction = new TDEAction(i18n("Replay Sound"),"media-playback-start", CTRL+Key_P, m_view, TQ_SLOT(slotPlayAgain()), actionCollection(), "play_again");
     m_playAgainAction->setToolTip(i18n("Play the same sound again"));
     m_playAgainAction->setWhatsThis(i18n("You can replay the same sound again by clicking this button or using the File menu, Replay Sound."));
-    KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+    KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
 
     m_menubarAction = new TDEToggleAction(i18n("Show &Menubar"),"edit-clear", CTRL+Key_M, this, TQ_SLOT(slotMenubar()), actionCollection(), "menubar");
     m_menubarAction->setCheckedState(i18n("Hide &Menubar"));
@@ -462,7 +462,7 @@ void KLettres::loadLangToolBar()
                                     "please check your installation.").arg(m_languages[Prefs::languageNumber()]);
             KMessageBox::sorry( this, mString,
                                     i18n("Error") );
-            kapp->quit();
+            tdeApp->quit();
         }
         update();
         //we open the file and store info into the stream...
diff --git a/klettres/klettres/klettresview.cpp b/klettres/klettres/klettresview.cpp
index 6cdf78a7..143a77ae 100644
--- a/klettres/klettres/klettresview.cpp
+++ b/klettres/klettres/klettresview.cpp
@@ -64,7 +64,7 @@ void KLettresView::chooseSound()
     if (m_klettres->soundFactory->sounds ==0)
         return;
     //get a random sound
-    m_random=kapp->random()%(m_klettres->soundFactory->sounds);
+    m_random=tdeApp->random()%(m_klettres->soundFactory->sounds);
     //have not 2 same sounds consecutively
     int temp = 0;
     if (temp<0)
@@ -72,7 +72,7 @@ void KLettresView::chooseSound()
     else
     {
         while (m_random==temp)
-            m_random=kapp->random()%(m_klettres->soundFactory->sounds);
+            m_random=tdeApp->random()%(m_klettres->soundFactory->sounds);
         temp=m_random;
     }
 
diff --git a/klettres/klettres/klnewstuff.cpp b/klettres/klettres/klnewstuff.cpp
index 5a542418..88531ccc 100644
--- a/klettres/klettres/klnewstuff.cpp
+++ b/klettres/klettres/klnewstuff.cpp
@@ -40,7 +40,7 @@ bool KLNewStuff::install( const TQString &fileName )
         return false;
     const KArchiveDirectory *archiveDir = archive.directory();
     TDEStandardDirs myStdDir;
-    const TQString destDir =myStdDir.saveLocation("data", kapp->instanceName() + "/", true);
+    const TQString destDir =myStdDir.saveLocation("data", tdeApp->instanceName() + "/", true);
     TDEStandardDirs::makeDir( destDir );
     archiveDir->copyTo(destDir);
     archive.close();
diff --git a/kmplot/kmplot/FktDlg.cpp b/kmplot/kmplot/FktDlg.cpp
index 7597fc9e..e4df4f6d 100644
--- a/kmplot/kmplot/FktDlg.cpp
+++ b/kmplot/kmplot/FktDlg.cpp
@@ -297,7 +297,7 @@ void FktDlg::getPlots()
 
 void  FktDlg::slotHelp()
 {
-	kapp->invokeHelp( "", "kmplot" );
+	tdeApp->invokeHelp( "", "kmplot" );
 }
 
 bool FktDlg::isChanged()
diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp
index 5202a98c..31c62e7f 100644
--- a/kmplot/kmplot/MainDlg.cpp
+++ b/kmplot/kmplot/MainDlg.cpp
@@ -95,7 +95,7 @@ MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const c
 	setupActions();
 	loadConstants();
 	kmplotio = new KmPlotIO(view->parser());
-	m_config = kapp->config();
+	m_config = tdeApp->config();
 	m_recentFiles->loadEntries( m_config );
 
 	// Let's create a Configure Diloag
@@ -127,7 +127,7 @@ void MainDlg::setupActions()
 	KStdAction::print( this, TQ_SLOT( slotPrint() ), actionCollection(),"file_print" );
 	KStdAction::save( this, TQ_SLOT( slotSave() ), actionCollection() );
 	KStdAction::saveAs( this, TQ_SLOT( slotSaveas() ), actionCollection() );
-	connect( kapp, TQ_SIGNAL( lastWindowClosed() ), kapp, TQ_SLOT( quit() ) );
+	connect( tdeApp, TQ_SIGNAL( lastWindowClosed() ), tdeApp, TQ_SLOT( quit() ) );
 
 	TDEAction *prefs  = KStdAction::preferences( this, TQ_SLOT( slotSettings() ), actionCollection());
 	prefs->setText( i18n( "Configure KmPlot..." ) );
@@ -369,7 +369,7 @@ void MainDlg::slotOpenRecent( const KURL &url )
 		TQByteArray data;
 		TQDataStream stream(data, IO_WriteOnly);
 		stream << url;
-		TDEApplication::kApplication()->dcopClient()->send(TDEApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","openFileInNewWindow(KURL)", data);
+		tdeApp->dcopClient()->send(tdeApp->dcopClient()->appId(), "KmPlotShell","openFileInNewWindow(KURL)", data);
 		return;
 	}
 
@@ -457,7 +457,7 @@ void MainDlg::editConstants()
 
 void MainDlg::slotNames()
 {
-	kapp->invokeHelp( "func-predefined", "kmplot" );
+	tdeApp->invokeHelp( "func-predefined", "kmplot" );
 }
 
 void MainDlg::newFunction()
@@ -752,12 +752,12 @@ void MainDlg::setReadOnlyStatusBarText(const TQString &text)
 
 void MainDlg::optionsConfigureKeys()
 {
-	TDEApplication::kApplication()->dcopClient()->send(TDEApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","optionsConfigureKeys()", TQByteArray());
+	tdeApp->dcopClient()->send(tdeApp->dcopClient()->appId(), "KmPlotShell","optionsConfigureKeys()", TQByteArray());
 }
 
 void MainDlg::optionsConfigureToolbars()
 {
-	TDEApplication::kApplication()->dcopClient()->send(TDEApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","optionsConfigureToolbars()", TQByteArray());
+	tdeApp->dcopClient()->send(tdeApp->dcopClient()->appId(), "KmPlotShell","optionsConfigureToolbars()", TQByteArray());
 }
 
 void MainDlg::resetZoom()
diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp
index abadabdf..db089543 100644
--- a/kmplot/kmplot/View.cpp
+++ b/kmplot/kmplot/View.cpp
@@ -56,7 +56,7 @@ double View::xmin = 0;
 double View::xmax = 0;
 
 
-View::View(bool const r, bool &mo, TDEPopupMenu *p, TQWidget* parent, const char* name ) : DCOPObject("View"), TQWidget( parent, name , WStaticContents ),  buffer( width(), height() ), m_popupmenu(p), m_modified(mo), m_readonly(r), m_dcop_client(TDEApplication::kApplication()->dcopClient())
+View::View(bool const r, bool &mo, TDEPopupMenu *p, TQWidget* parent, const char* name ) : DCOPObject("View"), TQWidget( parent, name , WStaticContents ),  buffer( width(), height() ), m_popupmenu(p), m_modified(mo), m_readonly(r), m_dcop_client(tdeApp->dcopClient())
 {
 	csmode = csparam = -1;
 	cstype = 0;
@@ -346,7 +346,7 @@ void View::plotfkt(Ufkt *ufkt, TQPainter *pDC)
 							y = m_parser->euler_method(x, ufkt);
 							if ( int(x*100)%2==0)
 							{
-								TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function
+								tdeApp->processEvents(); //makes the program usable when drawing a complicated integral function
 								increaseProgressBar();
 							}
 							break;
@@ -1283,7 +1283,7 @@ void View::findMinMaxValue(Ufkt *ufkt, char p_mode, bool minimum, double &dmin,
 				y = m_parser->euler_method(x, ufkt);
 				if ( int(x*100)%2==0)
 				{
-					TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function
+					tdeApp->processEvents(); //makes the program usable when drawing a complicated integral function
 					increaseProgressBar();
 				}
 				break;
@@ -1416,7 +1416,7 @@ void View::getYValue(Ufkt *ufkt, char p_mode,  double x, double &y, const TQStri
 			y = m_parser->euler_method( x, ufkt );
 			if ( int(x*100)%2==0)
 			{
-				TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function
+				tdeApp->processEvents(); //makes the program usable when drawing a complicated integral function
 				increaseProgressBar();
 			}
 
@@ -1716,7 +1716,7 @@ void View::areaUnderGraph( Ufkt *ufkt, char const p_mode,  double &dmin, double
 				y = m_parser->euler_method(x, ufkt);
 				if ( int(x*100)%2==0)
 				{
-					TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function
+					tdeApp->processEvents(); //makes the program usable when drawing a complicated integral function
 						increaseProgressBar();
 				}
 				break;
diff --git a/kmplot/kmplot/editfunction.cpp b/kmplot/kmplot/editfunction.cpp
index 66547508..0e9e7a09 100644
--- a/kmplot/kmplot/editfunction.cpp
+++ b/kmplot/kmplot/editfunction.cpp
@@ -386,7 +386,7 @@ Ufkt * EditFunction::functionItem()
 
 void EditFunction::slotHelp()
 {
-	kapp->invokeHelp( "", "kmplot" );
+	tdeApp->invokeHelp( "", "kmplot" );
 }
 
 bool EditFunction::functionHas2Arguments()
diff --git a/kmplot/kmplot/keditparametric.cpp b/kmplot/kmplot/keditparametric.cpp
index ae4fbe10..ce0f2f74 100644
--- a/kmplot/kmplot/keditparametric.cpp
+++ b/kmplot/kmplot/keditparametric.cpp
@@ -326,7 +326,7 @@ Ufkt * KEditParametric::functionItem()
 
 void KEditParametric::slotHelp()
 {
-	kapp->invokeHelp( "", "kmplot" );
+	tdeApp->invokeHelp( "", "kmplot" );
 }
 void KEditParametric::customMinRange_toggled(bool status)
 {
diff --git a/kmplot/kmplot/keditpolar.cpp b/kmplot/kmplot/keditpolar.cpp
index 1d730b04..b1d4815e 100644
--- a/kmplot/kmplot/keditpolar.cpp
+++ b/kmplot/kmplot/keditpolar.cpp
@@ -230,7 +230,7 @@ Ufkt *KEditPolar::functionItem()
 
 void KEditPolar::slotHelp()
 {
-	kapp->invokeHelp( "", "kmplot" );
+	tdeApp->invokeHelp( "", "kmplot" );
 }
 
 void KEditPolar::customMinRange_toggled(bool status)
diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp
index a6c17053..7c3208d9 100644
--- a/kmplot/kmplot/kmplot.cpp
+++ b/kmplot/kmplot/kmplot.cpp
@@ -75,8 +75,8 @@ KmPlot::KmPlot( TDECmdLineArgs* args)
 		// if we couldn't find our Part, we exit since the Shell by
 		// itself can't do anything useful
 		KMessageBox::error(this, i18n("Could not find KmPlot's part."));
-		kapp->quit();
-		// we return here, cause kapp->quit() only means "exit the
+		tdeApp->quit();
+		// we return here, cause tdeApp->quit() only means "exit the
 		// next time we enter the event loop...
 		return;
 	}
@@ -137,7 +137,7 @@ void KmPlot::setupActions()
 {
 	KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection());
 	KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
-	KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+	KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
 
 	createStandardStatusBarAction();
 	setStandardToolBarMenuEnabled(true);
@@ -265,7 +265,7 @@ bool KmPlot::checkModified()
 {
 	TQCString replyType;
 	TQByteArray replyData;
-	kapp->dcopClient()->call(kapp->dcopClient()->appId(), "MainDlg","checkModified()", TQByteArray(), replyType, replyData, false);
+	tdeApp->dcopClient()->call(tdeApp->dcopClient()->appId(), "MainDlg","checkModified()", TQByteArray(), replyType, replyData, false);
 	bool result;
 	TQDataStream stream(replyData, IO_ReadOnly);
 	stream >> result;
@@ -276,7 +276,7 @@ bool KmPlot::isModified()
 {
 	TQCString replyType;
 	TQByteArray replyData;
-	kapp->dcopClient()->call(kapp->dcopClient()->appId(), "MainDlg","isModified()", TQByteArray(), replyType, replyData, false);
+	tdeApp->dcopClient()->call(tdeApp->dcopClient()->appId(), "MainDlg","isModified()", TQByteArray(), replyType, replyData, false);
 	bool result;
 	TQDataStream stream(replyData, IO_ReadOnly);
 	stream >> result;
@@ -312,7 +312,7 @@ void KmPlot::setupStatusBar()
 
 void KmPlot::progressbar_clicked()
 {
-	kapp->dcopClient()->send(kapp->dcopClient()->appId(), "View","stopDrawing()", TQByteArray());
+	tdeApp->dcopClient()->send(tdeApp->dcopClient()->appId(), "View","stopDrawing()", TQByteArray());
 }
 
 #include "kmplot.moc"
diff --git a/kmplot/kmplot/xparser.cpp b/kmplot/kmplot/xparser.cpp
index 4ab4300f..624b4883 100644
--- a/kmplot/kmplot/xparser.cpp
+++ b/kmplot/kmplot/xparser.cpp
@@ -759,10 +759,10 @@ bool XParser::setFunctionExpression(const TQString &f_str, uint id)
 
 bool XParser::sendFunction(int id, const TQString &dcopclient_target)
 {
-	QCStringList cstr_list = kapp->dcopClient()->registeredApplications();
+	QCStringList cstr_list = tdeApp->dcopClient()->registeredApplications();
 	TQStringList str_list;
 	for ( QCStringList::iterator it = cstr_list.begin(); it!=cstr_list.end();++it )
-		if ( TQString(*it).startsWith("kmplot") && *it!=kapp->dcopClient()->appId() )
+		if ( TQString(*it).startsWith("kmplot") && *it!=tdeApp->dcopClient()->appId() )
 			str_list.append(*it);
 	if ( str_list.isEmpty() )
 	{
@@ -801,7 +801,7 @@ bool XParser::sendFunction(int id, const TQString &dcopclient_target)
 	arg << item->fstr << item->f_mode << item->f1_mode << item->f2_mode << item->integral_mode << item->integral_use_precision << item->linewidth << item->f1_linewidth << item->f2_linewidth << item->integral_linewidth << str_dmin << str_dmax << item->str_startx << item->str_starty << item->integral_precision << item->color << item->f1_color << item->f2_color << item->integral_color << str_parameters << item->use_slider;
 	TQByteArray replay_data;
 	TQCString replay_type;
-	bool ok = kapp->dcopClient()->call( str_result.utf8(), "Parser", "addFunction(TQString,bool,bool,bool,bool,bool,int,int,int,int,TQString,TQString,TQString,TQString,double,TQRgb,TQRgb,TQRgb,TQRgb,TQStringList,int)", parameters, replay_type, replay_data, false);
+	bool ok = tdeApp->dcopClient()->call( str_result.utf8(), "Parser", "addFunction(TQString,bool,bool,bool,bool,bool,int,int,int,int,TQString,TQString,TQString,TQString,double,TQRgb,TQRgb,TQRgb,TQRgb,TQStringList,int)", parameters, replay_type, replay_data, false);
 	if (!ok)
 	{
 		KMessageBox::error(0, i18n("An error appeared during the transfer"));
@@ -817,7 +817,7 @@ bool XParser::sendFunction(int id, const TQString &dcopclient_target)
 		return false;
 	}
 	
-	kapp->dcopClient()->send(str_result.utf8(), "View","drawPlot()",TQByteArray() ); //update the other window
+	tdeApp->dcopClient()->send(str_result.utf8(), "View","drawPlot()",TQByteArray() ); //update the other window
 	
 	if (item->fname.at(0) == 'x') // a parametric function
 		return sendFunction(id+1, str_result);
diff --git a/kpercentage/kpercentage/kpercentage.cpp b/kpercentage/kpercentage/kpercentage.cpp
index 32b4101a..fcaa2d5a 100644
--- a/kpercentage/kpercentage/kpercentage.cpp
+++ b/kpercentage/kpercentage/kpercentage.cpp
@@ -220,7 +220,7 @@ void KPercentage::startExercise()
 
 void KPercentage::needHelp()
 {
-    kapp->invokeHelp( "", "kpercentage" );
+    tdeApp->invokeHelp( "", "kpercentage" );
 }
 
 void KPercentage::closeEvent( TQCloseEvent * )
diff --git a/kstars/kstars/addlinkdialog.cpp b/kstars/kstars/addlinkdialog.cpp
index 40ef152d..9649d719 100644
--- a/kstars/kstars/addlinkdialog.cpp
+++ b/kstars/kstars/addlinkdialog.cpp
@@ -48,12 +48,12 @@ AddLinkDialog::AddLinkDialog( TQWidget *parent, const TQString &oname )
 void AddLinkDialog::checkURL( void ) {
 	KURL _url ( url() );
 	if ( _url.isValid() ) {   //Is the string a valid URL?
-		kapp->invokeBrowser( _url.url() );   //If so, launch the browser to see if it's the correct document
+		tdeApp->invokeBrowser( _url.url() );   //If so, launch the browser to see if it's the correct document
 	} else {   //If not, print a warning message box that offers to open the browser to a search engine.
 		TQString message = i18n( "The URL is not valid. Would you like to open a browser window\nto the Google search engine?" );
 		TQString caption = i18n( "Invalid URL" );
 		if ( KMessageBox::warningYesNo( 0, message, caption, i18n("Browse Google"), i18n("Do Not Browse") )==KMessageBox::Yes ) {
-			kapp->invokeBrowser( "http://www.google.com" );
+			tdeApp->invokeBrowser( "http://www.google.com" );
 		}
 	}
 }
diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp
index af7f38e8..9e252d80 100644
--- a/kstars/kstars/detaildialog.cpp
+++ b/kstars/kstars/detaildialog.cpp
@@ -514,7 +514,7 @@ void DetailDialog::viewLink()
 		URL = TQString( *selectedObject->ImageList.at( Links->ImagesList->currentItem() ) );
 
 	if (!URL.isEmpty())
-		kapp->invokeBrowser(URL);
+		tdeApp->invokeBrowser(URL);
 }
 
 void DetailDialog::updateLists()
@@ -837,7 +837,7 @@ void  DetailDialog::viewADVData()
 
 	link = treeIt->current()->Link;
 	link = parseADVData(link);
-	kapp->invokeBrowser(link);
+	tdeApp->invokeBrowser(link);
 }
 
 TQString DetailDialog::parseADVData(TQString link)
diff --git a/kstars/kstars/finddialog.cpp b/kstars/kstars/finddialog.cpp
index 25f0683c..ea9c0139 100644
--- a/kstars/kstars/finddialog.cpp
+++ b/kstars/kstars/finddialog.cpp
@@ -126,7 +126,7 @@ void FindDialog::filter() {  //Filter the list of names with the string in the S
 			if ( name->text().lower().startsWith( searchFor ) ) {
 				new SkyObjectNameListItem ( SearchList, name );
 /*				if ( i++ >= 5000 ) {              //Every 5000 name insertions,
-					kapp->processEvents ( 50 );		//spend 50 msec processing TDEApplication events
+					tdeApp->processEvents ( 50 );		//spend 50 msec processing TDEApplication events
 					i = 0;
 				}*/
 			}
diff --git a/kstars/kstars/fitsprocess.cpp b/kstars/kstars/fitsprocess.cpp
index 717650fe..aa2bf2c4 100644
--- a/kstars/kstars/fitsprocess.cpp
+++ b/kstars/kstars/fitsprocess.cpp
@@ -64,7 +64,7 @@
      }
      
      reduceProgress.progressBar()->setProgress(++nprogress);
-     kapp->processEvents();
+     tdeApp->processEvents();
      darkFrames.append(buffer);
    }
    
@@ -78,7 +78,7 @@
      }
      
      reduceProgress.progressBar()->setProgress(++nprogress);
-     kapp->processEvents();
+     tdeApp->processEvents();
      flatFrames.append(buffer);
    }
    
@@ -92,7 +92,7 @@
      }
      
      reduceProgress.progressBar()->setProgress(++nprogress);
-     kapp->processEvents();
+     tdeApp->processEvents();
      darkflatFrames.append(buffer);
    }
     
@@ -266,29 +266,29 @@ void FITSProcess::reduce()
    reduceProgress.show();
    
    reduceProgress.progressBar()->setProgress(1);
-   kapp->processEvents();
+   tdeApp->processEvents();
    
    /* Combine darks */
    finalDark = combine(darkFrames, darkCombineMode);
    
    reduceProgress.progressBar()->setProgress(5);
-   kapp->processEvents();
+   tdeApp->processEvents();
    
    /* Combine flats */
    finalFlat = combine(flatFrames, flatCombineMode);
    reduceProgress.progressBar()->setProgress(10);
-   kapp->processEvents();
+   tdeApp->processEvents();
    
    /* Combine dark flats */
    finalDarkFlat = combine(darkflatFrames, darkflatCombineMode);
    reduceProgress.progressBar()->setProgress(12);
-   kapp->processEvents();
+   tdeApp->processEvents();
      
    /* Subtract the dark frame */
    if (finalDark)
    	subtract( viewer->imgBuffer, finalDark);
    reduceProgress.progressBar()->setProgress(14);
-   kapp->processEvents();
+   tdeApp->processEvents();
    
 
    /* Subtract the fark frame from the flat field and then apply to the image buffer */
@@ -297,17 +297,17 @@ void FITSProcess::reduce()
      if (finalDarkFlat)
         subtract( finalFlat, finalDarkFlat);
       reduceProgress.progressBar()->setProgress(16);
-      kapp->processEvents();
+      tdeApp->processEvents();
      
      normalize(finalFlat);
      reduceProgress.progressBar()->setProgress(18);
-     kapp->processEvents();
+     tdeApp->processEvents();
      
      divide(viewer->imgBuffer, finalFlat);
    }
    
    reduceProgress.progressBar()->setProgress(20);
-   kapp->processEvents();
+   tdeApp->processEvents();
 
 } 
  
diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp
index 9a9b3f62..f10dfe95 100644
--- a/kstars/kstars/fitsviewer.cpp
+++ b/kstars/kstars/fitsviewer.cpp
@@ -712,7 +712,7 @@ void FITSViewer::fileSaveAs()
 
 void FITSViewer::fitsCOPY()
 {
-   kapp->clipboard()->setImage(*image->displayImage);
+   tdeApp->clipboard()->setImage(*image->displayImage);
 }
 
 void FITSViewer::updateImgBuffer()
diff --git a/kstars/kstars/imageviewer.cpp b/kstars/kstars/imageviewer.cpp
index fa6194c2..480104d9 100644
--- a/kstars/kstars/imageviewer.cpp
+++ b/kstars/kstars/imageviewer.cpp
@@ -173,7 +173,7 @@ void ImageViewer::showImage()
 		image.smoothScale ( statusBar()->width() , image.height() * statusBar()->width() / image.width() );
 	}
 	
-	TQRect deskRect = kapp->desktop()->availableGeometry();
+	TQRect deskRect = tdeApp->desktop()->availableGeometry();
 	int w = deskRect.width(); // screen width
 	int h = deskRect.height(); // screen height
 	int h2 = image.height() + toolBar()->height() + statusBar()->height(); //height required for ImageViewer
diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp
index 9a028f05..73678648 100644
--- a/kstars/kstars/ksnewstuff.cpp
+++ b/kstars/kstars/ksnewstuff.cpp
@@ -42,7 +42,7 @@ KSNewStuff::KSNewStuff( TQWidget *parent ) :
 {
 	ks = (KStars*)parent;
 	kdw = new KDirWatch( this );
-	kdw->addDir( TDEGlobal::dirs()->saveLocation("data", kapp->instanceName(), true) );
+	kdw->addDir( TDEGlobal::dirs()->saveLocation("data", tdeApp->instanceName(), true) );
 }
 
 bool KSNewStuff::install( const TQString &fileName )
@@ -54,7 +54,7 @@ bool KSNewStuff::install( const TQString &fileName )
 			return false;
 	
 	const KArchiveDirectory *archiveDir = archive.directory();
-	const TQString destDir = TDEGlobal::dirs()->saveLocation("data", kapp->instanceName(), true);      
+	const TQString destDir = TDEGlobal::dirs()->saveLocation("data", tdeApp->instanceName(), true);      
 	TDEStandardDirs::makeDir( destDir );
 
 	//monitor destDir for changes; inform updateData when files are created.
@@ -62,7 +62,7 @@ bool KSNewStuff::install( const TQString &fileName )
 
 	archiveDir->copyTo(destDir);
 	archive.close();
-	kapp->processEvents(10000);
+	tdeApp->processEvents(10000);
 	
 	//read the new data into the program
 	//this return might be the result of checking if everything is installed ok
@@ -87,7 +87,7 @@ void KSNewStuff::updateData( const TQString &path ) {
 		prog.setMinimumDuration( 0 /*millisec*/ );
 		prog.progressBar()->setTotalSteps( 0 );  //show generic progress activity
 		prog.show();
-		kapp->processEvents(1000);
+		tdeApp->processEvents(1000);
 		
 		//First, remove the existing NGC/IC objects from the ObjectNameList.
 		for ( DeepSkyObject *o = ks->data()->deepSkyList.first(); o; o = ks->data()->deepSkyList.next() ) {
@@ -166,7 +166,7 @@ void KSNewStuff::updateData( const TQString &path ) {
 	ks->setCursor(TQCursor(TQt::ArrowCursor));
 }
 
-void KSNewStuff::slotProcessEvents() { kapp->processEvents( 500 ); }
+void KSNewStuff::slotProcessEvents() { tdeApp->processEvents( 500 ); }
 
 #include "ksnewstuff.moc"
 
diff --git a/kstars/kstars/ksnewstuff.h b/kstars/kstars/ksnewstuff.h
index 7f4a35b0..71a506cd 100644
--- a/kstars/kstars/ksnewstuff.h
+++ b/kstars/kstars/ksnewstuff.h
@@ -78,7 +78,7 @@ class KSNewStuff : public TQObject, public TDENewStuff
 		void updateData( const TQString &newFile );
 
 	/**
-		*Simply calls kapp->processEvents(), to make the UI responsive while 
+		*Simply calls tdeApp->processEvents(), to make the UI responsive while 
 		*new NGC/IC data are being added to the program.
 		*/
  		void slotProcessEvents();
diff --git a/kstars/kstars/kstars.cpp b/kstars/kstars/kstars.cpp
index 8b811771..34b656b9 100644
--- a/kstars/kstars/kstars.cpp
+++ b/kstars/kstars/kstars.cpp
@@ -57,7 +57,7 @@ KStars::KStars( bool doSplash, bool clockrun, const TQString &startdate ) :
 	pd = new privatedata(this);
 
 	// we're nowhere near ready to take dcop calls
-	kapp->dcopClient()->suspend();
+	tdeApp->dcopClient()->suspend();
 
 	if ( doSplash ) {
 		pd->kstarsData = new KStarsData();
@@ -65,7 +65,7 @@ KStars::KStars( bool doSplash, bool clockrun, const TQString &startdate ) :
 				this, TQ_SLOT( datainitFinished(bool) ) );
 
 		pd->splash = new KStarsSplash(0, "Splash");
-		TQObject::connect(pd->splash, TQ_SIGNAL( closeWindow() ), kapp, TQ_SLOT( quit() ) );
+		TQObject::connect(pd->splash, TQ_SIGNAL( closeWindow() ), tdeApp, TQ_SLOT( quit() ) );
 		TQObject::connect(pd->kstarsData, TQ_SIGNAL( progressText(TQString) ),
 				pd->splash, TQ_SLOT( setMessage(TQString) ));
 		pd->splash->show();
@@ -108,7 +108,7 @@ KStars::~KStars()
 	Options::setWindowHeight( height() );
 
 	//We need to explicitly save the colorscheme data to the config file
-	data()->colorScheme()->saveToConfig( kapp->config() );
+	data()->colorScheme()->saveToConfig( tdeApp->config() );
 
 	//synch the config file with the Config object
 	Options::writeConfig();
@@ -182,7 +182,7 @@ void KStars::applyConfig() {
 	((TDEToggleAction*)actionCollection()->action("show_horizon"))->setChecked( Options::showGround() );
 	
 	//color scheme
-	pd->kstarsData->colorScheme()->loadFromConfig( kapp->config() );
+	pd->kstarsData->colorScheme()->loadFromConfig( tdeApp->config() );
 	if ( Options::darkAppColors() ) {
 		TQApplication::setPalette( DarkPalette, true );
 	} else {
diff --git a/kstars/kstars/kstars.h b/kstars/kstars/kstars.h
index 021ac979..db8ac252 100644
--- a/kstars/kstars/kstars.h
+++ b/kstars/kstars/kstars.h
@@ -431,7 +431,7 @@ class KStars : public TDEMainWindow, virtual public KStarsInterface
 	/**
 		*Resume execution of DCOP commands
 		*/
-		void resumeDCOP( void ) { kapp->dcopClient()->resume(); }
+		void resumeDCOP( void ) { tdeApp->dcopClient()->resume(); }
 
 	/**
 		*Remove all trails which may have been added to solar system bodies
diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp
index d1b60bae..44317e9d 100644
--- a/kstars/kstars/kstarsactions.cpp
+++ b/kstars/kstars/kstarsactions.cpp
@@ -569,7 +569,7 @@ void KStars::slotRunScript() {
 		p << f.name();
 		p.start( TDEProcess::DontCare );
 
-		while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes.
+		while ( p.isRunning() ) tdeApp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes.
 	}
 }
 
diff --git a/kstars/kstars/kstarsdata.cpp b/kstars/kstars/kstarsdata.cpp
index 598e4028..b424e129 100644
--- a/kstars/kstars/kstarsdata.cpp
+++ b/kstars/kstars/kstarsdata.cpp
@@ -1808,7 +1808,7 @@ void KStarsData::slotInitialize() {
 	TQFile imFile;
 	TQString ImageName;
 
-	kapp->flush(); // flush all paint events before loading data
+	tdeApp->flush(); // flush all paint events before loading data
 
 	switch ( initCounter )
 	{
diff --git a/kstars/kstars/kstarsdcop.cpp b/kstars/kstars/kstarsdcop.cpp
index bada6d1d..3266370b 100644
--- a/kstars/kstars/kstarsdcop.cpp
+++ b/kstars/kstars/kstarsdcop.cpp
@@ -105,14 +105,14 @@ void KStars::setLocalTime(int yr, int mth, int day, int hr, int min, int sec) {
 }
 
 void KStars::waitFor( double t ) {
-	kapp->dcopClient()->suspend();
+	tdeApp->dcopClient()->suspend();
 	TQTimer::singleShot( int( 1000.*t ), this, TQ_SLOT( resumeDCOP() ) );
 }
 
 void KStars::waitForKey( const TQString k ) {
 	data()->resumeKey = KKey( k );
 	if ( ! data()->resumeKey.isNull() ) {
-		kapp->dcopClient()->suspend();
+		tdeApp->dcopClient()->suspend();
 	} else {
 		kdDebug() << i18n( "Error [DCOP waitForKey()]: Invalid key requested." ) << endl;
 	}
@@ -421,7 +421,7 @@ void KStars::exportImage( const TQString url, int w, int h ) {
 		else { kdWarning() << i18n( "Could not parse image format of %1; assuming PNG." ).arg( fname ) << endl; }
 
 		map()->exportSkyImage( &skyimage );
-		kapp->processEvents(10000);
+		tdeApp->processEvents(10000);
 
 		//skyImage is the size of the sky map.  The requested image size is w x h.
 		//If w x h is smaller than the skymap, then we simply crop the image.
@@ -472,7 +472,7 @@ void KStars::printImage( bool usePrintDialog, bool useChartColors ) {
 		ok = printer.autoConfigure();
 
 	if( ok ) {
-		kapp->setOverrideCursor( waitCursor );
+		tdeApp->setOverrideCursor( waitCursor );
 
 		//Save current colorscheme and switch to Star Chart colors
 		//(if requested)
@@ -496,7 +496,7 @@ void KStars::printImage( bool usePrintDialog, bool useChartColors ) {
 			map()->forceUpdate();
 		}
 
-		kapp->restoreOverrideCursor();
+		tdeApp->restoreOverrideCursor();
 	}
 }
 
@@ -780,7 +780,7 @@ void KStars::waitForINDIAction(TQString deviceName, TQString action)
   else
     TQObject::connect(prop, TQ_SIGNAL(okState()), this, TQ_SLOT(resumeDCOP(void )));
 
-  kapp->dcopClient()->suspend();
+  tdeApp->dcopClient()->suspend();
 
 }
 
diff --git a/kstars/kstars/kstarsinit.cpp b/kstars/kstars/kstarsinit.cpp
index 7e64e27f..4963d418 100644
--- a/kstars/kstars/kstarsinit.cpp
+++ b/kstars/kstars/kstarsinit.cpp
@@ -365,7 +365,7 @@ void KStars::initStatusBar() {
 
 void KStars::datainitFinished(bool worked) {
 	if (!worked) {
-		kapp->quit();
+		tdeApp->quit();
 		return;
 	}
 
@@ -578,5 +578,5 @@ void KStars::privatedata::buildGUI() {
 	if ( Options::zoomFactor() >= MAXZOOM ) ks->actionCollection()->action("zoom_in")->setEnabled( false );
 	if ( Options::zoomFactor() <= MINZOOM ) ks->actionCollection()->action("zoom_out")->setEnabled( false );
 
-	kapp->dcopClient()->resume();
+	tdeApp->dcopClient()->resume();
 }
diff --git a/kstars/kstars/kstarssplash.cpp b/kstars/kstars/kstarssplash.cpp
index 6c0414dd..cb850820 100644
--- a/kstars/kstars/kstarssplash.cpp
+++ b/kstars/kstars/kstarssplash.cpp
@@ -97,7 +97,7 @@ void KStarsSplash::setMessage( TQString s ) {
 	*repaint call will queued in event buffer. With flush all X11 events of
 	*this application will flushed.
 	*/
-	kapp->flush();
+	tdeApp->flush();
 }
 
 #include "kstarssplash.moc"
diff --git a/kstars/kstars/main.cpp b/kstars/kstars/main.cpp
index 93b73ad7..f8d12121 100644
--- a/kstars/kstars/main.cpp
+++ b/kstars/kstars/main.cpp
@@ -96,13 +96,13 @@ int main(int argc, char *argv[])
 		KStarsData *dat = new KStarsData();
 		TQObject::connect( dat, TQ_SIGNAL( progressText(TQString) ), dat, TQ_SLOT( slotConsoleMessage(TQString) ) );
 		dat->initialize();
-		while (!dat->startupComplete) { kapp->processEvents(50); }
+		while (!dat->startupComplete) { tdeApp->processEvents(50); }
 
 		//Set Geographic Location
 		dat->setLocationFromOptions(); 
 
 		//Set color scheme
-		dat->colorScheme()->loadFromConfig( kapp->config() );
+		dat->colorScheme()->loadFromConfig( tdeApp->config() );
 
 		//set clock now that we have a location:
 		//Check to see if user provided a date/time string.  If not, use current CPU time
@@ -160,10 +160,10 @@ int main(int argc, char *argv[])
 		dat->setFullTimeUpdate();
 		dat->updateTime(dat->geo(), map );
 
-		kapp->processEvents(100000);
+		tdeApp->processEvents(100000);
 		map->setMapGeometry();
 		map->exportSkyImage( &sky );
-		kapp->processEvents(100000);
+		tdeApp->processEvents(100000);
 
 		if ( ! sky.save( fname, format ) ) kdWarning() << i18n( "Unable to save image: %1 " ).arg( fname ) << endl;
 		else kdDebug() << i18n( "Saved to file: %1" ).arg( fname ) << endl;
@@ -185,7 +185,7 @@ int main(int argc, char *argv[])
 	
 	new KStars( true, ! args->isSet( "paused" ), datestring );
 	args->clear();
-	TQObject::connect(kapp, TQ_SIGNAL(lastWindowClosed()), kapp, TQ_SLOT(quit()));
+	TQObject::connect(tdeApp, TQ_SIGNAL(lastWindowClosed()), tdeApp, TQ_SLOT(quit()));
 	return a.exec();
 
 }
diff --git a/kstars/kstars/skymap.cpp b/kstars/kstars/skymap.cpp
index 0e7a929d..3d3edccf 100644
--- a/kstars/kstars/skymap.cpp
+++ b/kstars/kstars/skymap.cpp
@@ -650,7 +650,7 @@ void SkyMap::slotInfo( int id ) {
 	TQString sURL = (*it);
 	KURL url ( sURL );
 	if (!url.isEmpty())
-		kapp->invokeBrowser(sURL);
+		tdeApp->invokeBrowser(sURL);
 }
 
 void SkyMap::slotBeginAngularDistance(void) {
@@ -925,7 +925,7 @@ void SkyMap::slewFocus( void ) {
 					fadeTransientLabel();
 
 				forceUpdate();
-				kapp->processEvents(10); //keep up with other stuff
+				tdeApp->processEvents(10); //keep up with other stuff
 
 				if ( Options::useAltAz() ) {
 					dX = destination()->az()->Degrees() - focus()->az()->Degrees();
diff --git a/kstars/kstars/skymapevents.cpp b/kstars/kstars/skymapevents.cpp
index 2750f355..8e4d0220 100644
--- a/kstars/kstars/skymapevents.cpp
+++ b/kstars/kstars/skymapevents.cpp
@@ -250,7 +250,7 @@ void SkyMap::keyPressEvent( TQKeyEvent *e ) {
 			data->clock()->manualTick( true );
 			data->clock()->setScale( -1.0 * data->clock()->scale() ); //reset original sign of time step
 			update();
-			kapp->processEvents();
+			tdeApp->processEvents();
 			break;
 
 		case Key_Period: //advance one step forward in time
@@ -258,7 +258,7 @@ void SkyMap::keyPressEvent( TQKeyEvent *e ) {
 			if ( data->clock()->isActive() ) data->clock()->stop();
 			data->clock()->manualTick( true );
 			update();
-			kapp->processEvents();
+			tdeApp->processEvents();
 			break;
 
 			//FIXME: Uncomment after feature thaw!
diff --git a/kstars/kstars/thumbnailpicker.cpp b/kstars/kstars/thumbnailpicker.cpp
index c68e6bc6..229052dc 100644
--- a/kstars/kstars/thumbnailpicker.cpp
+++ b/kstars/kstars/thumbnailpicker.cpp
@@ -176,7 +176,7 @@ void ThumbnailPicker::downloadReady(TDEIO::Job *job) {
 
 	//Add image to list
 	//If image is taller than desktop, rescale it.
-	//I tried to use kapp->style().pixelMetric( TQStyle::PM_TitleBarHeight )
+	//I tried to use tdeApp->style().pixelMetric( TQStyle::PM_TitleBarHeight )
 	//for the titlebar height, but this returned zero.
 	//Hard-coding 25 instead :(
 	if ( tmp.exists() ) {
@@ -191,11 +191,11 @@ void ThumbnailPicker::downloadReady(TDEIO::Job *job) {
 		uint w = im.width();
 		uint h = im.height();
 		uint pad = 4*marginHint() + 2*ui->SearchLabel->height() + actionButton( Ok )->height() + 25;
-		uint hDesk = kapp->desktop()->availableGeometry().height() - pad;
+		uint hDesk = tdeApp->desktop()->availableGeometry().height() - pad;
 
 //	this returns zero...
 // 		//DEBUG
-// 		kdDebug() << "Title bar height: " << kapp->style().pixelMetric( TQStyle::PM_TitleBarHeight ) << endl;
+// 		kdDebug() << "Title bar height: " << tdeApp->style().pixelMetric( TQStyle::PM_TitleBarHeight ) << endl;
 
 		if ( h > hDesk ) 
 			im = im.smoothScale( w*hDesk/h, hDesk );
@@ -321,7 +321,7 @@ void ThumbnailPicker::slotSetFromURL() {
 			uint w = im.width();
 			uint h = im.height();
 			uint pad = 4*marginHint() + 2*ui->SearchLabel->height() + actionButton( Ok )->height() + 25;
-			uint hDesk = kapp->desktop()->availableGeometry().height() - pad;
+			uint hDesk = tdeApp->desktop()->availableGeometry().height() - pad;
 
 			if ( h > hDesk ) 
 				im = im.smoothScale( w*hDesk/h, hDesk );
diff --git a/kstars/kstars/tools/planetviewer.cpp b/kstars/kstars/tools/planetviewer.cpp
index 982feefb..178a0722 100644
--- a/kstars/kstars/tools/planetviewer.cpp
+++ b/kstars/kstars/tools/planetviewer.cpp
@@ -416,7 +416,7 @@ void PVPlotWidget::mouseMoveEvent( TQMouseEvent *e ) {
 			setLimits( xc - 0.5*dataWidth(), xc + 0.5*dataWidth(), 
 					yc - 0.5*dataHeight(), yc + 0.5*dataHeight() );
 			update();
-			kapp->processEvents(20);
+			tdeApp->processEvents(20);
 		}
 		
 		oldx = e->x();
diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp
index 68d2c0ea..88efac95 100644
--- a/kstars/kstars/tools/scriptbuilder.cpp
+++ b/kstars/kstars/tools/scriptbuilder.cpp
@@ -903,7 +903,7 @@ void ScriptBuilder::slotRunScript() {
 	if ( ! p.start( TDEProcess::DontCare ) )
 		kdDebug() << "Process did not start." << endl;
 
-	while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes.
+	while ( p.isRunning() ) tdeApp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes.
 
 	//delete temp file
 	if ( f.exists() ) f.remove();
diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp
index b10dd9f8..e70bad89 100644
--- a/ktouch/src/ktouch.cpp
+++ b/ktouch/src/ktouch.cpp
@@ -88,7 +88,7 @@ KTouch::KTouch()
 	initTrainingSession();
 	
 	// If session was restored, the function readProperties() was already called
-    if (kapp->isRestored()) {
+    if (tdeApp->isRestored()) {
 		kdDebug() << "[KTouch::KTouch]  restoring session..." << endl;
 		/// \todo Rewrite all the session management stuff.
 		///       For now we just do the same as for the standard startup.
@@ -374,7 +374,7 @@ void KTouch::fileEditKeyboard() {
 // ----------------------------------------------------------------------------
 
 void KTouch::fileQuit() {
-    kapp->quit();
+    tdeApp->quit();
 }
 // ----------------------------------------------------------------------------
 
diff --git a/kturtle/TODO b/kturtle/TODO
index f3e26f00..f7883e31 100644
--- a/kturtle/TODO
+++ b/kturtle/TODO
@@ -185,7 +185,7 @@ Translating data in the tdenewstuff.xml file: how would the translators access t
 
 
 
-After a conversiation with lypanov I came to the conclusion that making the executer 'statefull' is a very by thing! So I take the cheap approach using kapp->processEvents();... Maybe someday, later, I'll do it neatly -- the lypanov pointed out. FIXED
+After a conversiation with lypanov I came to the conclusion that making the executer 'statefull' is a very by thing! So I take the cheap approach using tdeApp->processEvents();... Maybe someday, later, I'll do it neatly -- the lypanov pointed out. FIXED
 
 
 
@@ -292,7 +292,7 @@ dcop khelpcenter KHelpCenterIface openUrl "help:/kate/index.html#kate-part-selec
 Im tryered of this... I can fix it; too much for me. Sorry
 
 
-in tdelibs/tdecore/kapp... :
+in tdelibs/tdecore/tdeapp... :
 url = TQString("help:/%1?anchor=%2").arg(appname).arg(anchor);
 and
 DCOPRef( "khelpcenter", "KHelpCenterIface" ).send( "openUrl", url, startup_id );
diff --git a/kturtle/src/dialogs.cpp b/kturtle/src/dialogs.cpp
index d358860c..0499b7db 100644
--- a/kturtle/src/dialogs.cpp
+++ b/kturtle/src/dialogs.cpp
@@ -125,13 +125,13 @@ void ErrorMessage::updateSelection()
 void ErrorMessage::showHelpOnError()
 {
 // #if 0 // FIXME
-// 	kapp->invokeHelp(tokenTypeNames[currentError.tok.type], "", "");
+// 	tdeApp->invokeHelp(tokenTypeNames[currentError.tok.type], "", "");
 // #endif
 }
 
 void ErrorMessage::errorMessageHelp()
 {
-	kapp->invokeHelp("anchorname", "", "");
+	tdeApp->invokeHelp("anchorname", "", "");
 }
 
 // END
@@ -288,7 +288,7 @@ void ColorPicker::slotEmitColorCode()
 
 void ColorPicker::slotColorPickerHelp()
 {
-	kapp->invokeHelp("tools-color-picker", "", "");
+	tdeApp->invokeHelp("tools-color-picker", "", "");
 }
 
 // END
diff --git a/kturtle/src/executer.cpp b/kturtle/src/executer.cpp
index eec03261..d98f5df8 100644
--- a/kturtle/src/executer.cpp
+++ b/kturtle/src/executer.cpp
@@ -61,7 +61,7 @@ bool Executer::run()
 	for (i = tree->begin(); i != tree->end(); ++i)
 	{
 		if (bAbort) return false;
-		kapp->processEvents();
+		tdeApp->processEvents();
 		execute(*i);
 	
 		symbolTables.pop(); //free up stack
@@ -103,7 +103,7 @@ void Executer::pause()
 	// The next line is within all loops of the Executer
 	//     if (bAbort) return;
 	// mostly before
-	//     kapp->processEvents();
+	//     tdeApp->processEvents();
 	// this to keep the GUI of KTurtle accessible while executing the logo code
 	// so the Abort button can be clicked, and will function
 	bPause = true;
@@ -114,7 +114,7 @@ void Executer::abort()
 	// The next line is within all loops of the Executer
 	//     if(bAbort) return;
 	// mostly before
-	//     kapp->processEvents();
+	//     tdeApp->processEvents();
 	// this to keep the GUI of KTurtle accessible while executing the logo code
 	// so the Abort button can be clicked, and will function
 	bAbort = true;
@@ -244,7 +244,7 @@ void Executer::execFunction(TreeNode* node)
 	{
 		if (bAbort) return;
 		if (bPause) startPausing();
-		kapp->processEvents();
+		tdeApp->processEvents();
 		
 		// execute the parameters which can be expressions
 		execute(*pfrom); 
@@ -305,7 +305,7 @@ void Executer::execBlock(TreeNode* node)
 		if (runSpeed != 0) slowDown(*i);
 		if (bAbort) return;
 		if (bPause) startPausing();
-		kapp->processEvents();
+		tdeApp->processEvents();
 		
 		execute(*i);
 	
@@ -334,7 +334,7 @@ void Executer::execForEach(TreeNode* node)
 	{
 		if (bAbort) return;
 		if (bPause) startPausing();
-		kapp->processEvents();
+		tdeApp->processEvents();
 		
 		execute(statements);
 		if (bBreak || bReturn) break; //jump out loop
@@ -369,7 +369,7 @@ void Executer::execFor(TreeNode* node)
 		{
 			if (bAbort) return;
 			if (bPause) startPausing();
-			kapp->processEvents();
+			tdeApp->processEvents();
 			( symbolTables.top() )[name] = d;
 			execute( statements );
 			if (bBreak || bReturn) break; //jump out loop
@@ -390,7 +390,7 @@ void Executer::execFor(TreeNode* node)
 			{
 				if (bAbort) return;
 				if (bPause) startPausing();
-				kapp->processEvents();
+				tdeApp->processEvents();
 				
 				(symbolTables.top() )[name] = d;
 				execute( statements );
@@ -403,7 +403,7 @@ void Executer::execFor(TreeNode* node)
 			{
 				if (bAbort) return;
 				if (bPause) startPausing();
-				kapp->processEvents();
+				tdeApp->processEvents();
 				
 				( symbolTables.top() )[name] = d;
 				execute(statements);
@@ -427,7 +427,7 @@ void Executer::execRepeat(TreeNode* node)
 	{
 		if (bAbort) return;
 		if (bPause) startPausing();
-		kapp->processEvents();
+		tdeApp->processEvents();
 		
 		execute(statements);
 		if (bBreak || bReturn) break; //jump out loop
@@ -447,7 +447,7 @@ void Executer::execWhile(TreeNode* node)
 	{
 		if (bAbort) return;
 		if (bPause) startPausing();
-		kapp->processEvents();
+		tdeApp->processEvents();
 		
 		execute(statements);
 		if (bBreak || bReturn) break; //jump out loop
@@ -647,7 +647,7 @@ TQString Executer::runCommand(const TQString& command)
 	
 	while( fgets(buf, sizeof(buf), pstream) !=NULL) {
 		if (bAbort) return ("");
-		kapp->processEvents();
+		tdeApp->processEvents();
 		
 		Line += buf;
 	}
@@ -1020,7 +1020,7 @@ void Executer::startWaiting(int msec)
 	{
 		if (bAbort) return; // waits need to be interrupted by the stop action
 		if (bPause) startPausing();
-		kapp->processEvents();
+		tdeApp->processEvents();
 
 		// only 10 times per second is enough... else the CPU gets 100% loaded ( not nice :)
 		usleep(100000);
@@ -1037,7 +1037,7 @@ void Executer::startPausing()
 	while (bPause == true)
 	{
 		if (bAbort) return; // waits need to be interrupted by the stop action
-		kapp->processEvents();
+		tdeApp->processEvents();
 		// only 10 times per second is enough... else the CPU gets 100% loaded ( not nice :)
 		usleep(100000);
 	}
diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp
index b62f5e4c..04416053 100644
--- a/kturtle/src/kturtle.cpp
+++ b/kturtle/src/kturtle.cpp
@@ -86,7 +86,7 @@ MainWindow::MainWindow(KTextEditor::Document *document) : editor(0)
 		{
 			KMessageBox::error( this, i18n("A TDE text-editor component could not be found;\n"
 			                               "please check your TDE installation.") );
-			kapp->exit(1);
+			tdeApp->exit(1);
 		}
 		// docList.append(doc);
 	}
@@ -101,9 +101,9 @@ MainWindow::MainWindow(KTextEditor::Document *document) : editor(0)
 	setMinimumSize(200,200);
 
 	// init with more usefull size, stolen from kwite (they stole it from konq)
-	if ( !initialGeometrySet() && !kapp->config()->hasGroup("MainWindow Settings") ) resize(640, 480);
+	if ( !initialGeometrySet() && !tdeApp->config()->hasGroup("MainWindow Settings") ) resize(640, 480);
 
-	TDEConfig *config = kapp->config();
+	TDEConfig *config = tdeApp->config();
 	readConfig(config);
 }
 
@@ -490,7 +490,7 @@ bool MainWindow::queryClose()
 			}
 		}
 	}
-	TDEConfig *config = kapp->config();
+	TDEConfig *config = tdeApp->config();
 	config->setGroup("General Options");
 	m_recentFiles->saveEntries(config, "Recent Files");
 	config->sync();
@@ -520,7 +520,7 @@ void MainWindow::slotExecute()
 	// start paring
 	slotStatusBar(i18n("Parsing commands..."),  IDS_STATUS);
 	kdDebug(0)<<"############## PARSING STARTED ##############"<<endl;
-	kapp->processEvents();
+	tdeApp->processEvents();
 	errMsg = new ErrorMessage(this); // create an empty errorDialog
 	TQString txt = editorInterface->text() + "\x0a\x0a"; // parser expects input to have 2 delimiting newlines
 	TQTextIStream in(&txt); // create the stream
@@ -984,7 +984,7 @@ void MainWindow::readConfig(TDEConfig *config)
 
 void MainWindow::slotSettingsHelp()
 {
-	kapp->invokeHelp("settings-configure", "", "");
+	tdeApp->invokeHelp("settings-configure", "", "");
 }
 
 // END
@@ -1040,7 +1040,7 @@ void MainWindow::slotContextHelp()
 	
 	kdDebug(0)<<"trying to open a help page using this keyword: "<<helpWord<<endl;
 	
-	kapp->invokeHelp(helpWord, "", "");
+	tdeApp->invokeHelp(helpWord, "", "");
 	
 	TQString help2statusBar;
 	if ( helpKeyword.startsWith("<") ) help2statusBar = helpKeyword;
diff --git a/kverbos/kverbos/kfeedercontrol.cpp b/kverbos/kverbos/kfeedercontrol.cpp
index 614a9699..4f108c0d 100644
--- a/kverbos/kverbos/kfeedercontrol.cpp
+++ b/kverbos/kverbos/kfeedercontrol.cpp
@@ -41,7 +41,7 @@ KFeederControl::KFeederControl(int ID, bool splash, bool automatic)
 		feederID.setNum(childFeeder.pid());
 		feederID = "KFeeder-" + feederID;
 
-		dcop = kapp->dcopClient();
+		dcop = tdeApp->dcopClient();
 		dcop->attach();
 		appId = dcop->registerAs("KVerbos");	
 		active = true;
diff --git a/kverbos/kverbos/kverbos.cpp b/kverbos/kverbos/kverbos.cpp
index 82baf9a0..bbb986ad 100644
--- a/kverbos/kverbos/kverbos.cpp
+++ b/kverbos/kverbos/kverbos.cpp
@@ -58,7 +58,7 @@ KVerbosApp::KVerbosApp(TQWidget* , const char* name):TDEMainWindow (0, name)
   // die Instanzen von kverbos z�hlen
   kverbosCounter++;
 
-  config=kapp->config();
+  config=tdeApp->config();
 
   ///////////////////////////////////////////////////////////////////
   // call inits to invoke all other construction parts
@@ -295,7 +295,7 @@ void KVerbosApp::saveProperties(TDEConfig *_cfg)
     KURL url=doc->URL();	
     _cfg->writePathEntry("filename", url.url());
     _cfg->writeEntry("modified", doc->isModified());
-    TQString tempname = kapp->tempSaveName(url.url());
+    TQString tempname = tdeApp->tempSaveName(url.url());
     TQString tempurl= KURL::encode_string(tempname);
     KURL _url(tempurl);
     doc->saveDocument(_url);
@@ -311,7 +311,7 @@ void KVerbosApp::readProperties(TDEConfig* _cfg)
   if(modified)
   {
     bool canRecover;
-    TQString tempname = kapp->checkRecoverFile(filename, canRecover);
+    TQString tempname = tdeApp->checkRecoverFile(filename, canRecover);
     KURL _url(tempname);
     if(canRecover)
     {
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
index 1fdbd151..b9457dd3 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
@@ -150,7 +150,7 @@ void LessOptPage::slotDeleteLesson()
       if (doc->getEntry(ent)->getLesson() == lessonIndex[act_lesson]+1) {
         KMessageBox::information(this,
                   i18n("This lesson could not be deleted\nbecause it is in use."),
-                  kapp->makeStdCaption(i18n("Deleting Lesson")));
+                  tdeApp->makeStdCaption(i18n("Deleting Lesson")));
         return;
       }
     }
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
index 0b5c6f73..6b3921b0 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
@@ -156,7 +156,7 @@ void TenseOptPage::slotDeleteTense()
           if (conj.getType(con) == t) {
             KMessageBox::information(this,
                       i18n("This user defined tense could not be deleted\nbecause it is in use."),
-                      kapp->makeStdCaption(i18n("Deleting Tense Description")));
+                      tdeApp->makeStdCaption(i18n("Deleting Tense Description")));
             return;
           }
         }
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
index adac2c24..bb025e94 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
@@ -152,7 +152,7 @@ void TypeOptPage::slotDeleteType()
         if (exp->getType(lang) == t) {
           KMessageBox::information(this,
                     i18n("This user defined type could not be deleted\nbecause it is in use."),
-                    kapp->makeStdCaption(i18n("Deleting Type Description")));
+                    tdeApp->makeStdCaption(i18n("Deleting Type Description")));
           return;
         }
       }
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
index 74b9dcab..1e36d74b 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
@@ -158,7 +158,7 @@ void UsageOptPage::slotDeleteUsage()
                     i18n("usage (area) of an expression",
                         "This user-defined usage label could not be deleted "
                         "because it is in use."),
-                    kapp->makeStdCaption(i18n("usage (area) of an expression",
+                    tdeApp->makeStdCaption(i18n("usage (area) of an expression",
                                               "Deleting Usage Label")));
           return;
         }
diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
index efe7e374..2bbee94e 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
@@ -236,7 +236,7 @@ void EntryDlg::setData(
   const TQString &title,
   bool           active)
 {
-  setCaption (kapp->makeStdCaption(title));
+  setCaption (tdeApp->makeStdCaption(title));
 
   TQString s;
   if (langset.findLongId(lang).isEmpty() )
diff --git a/kvoctrain/kvoctrain/kva_config.cpp b/kvoctrain/kvoctrain/kva_config.cpp
index 09f0f402..c729e172 100644
--- a/kvoctrain/kvoctrain/kva_config.cpp
+++ b/kvoctrain/kvoctrain/kva_config.cpp
@@ -34,7 +34,7 @@
 
 void kvoctrainApp::saveOptions()
 {
-  TDEConfig *config = TDEApplication::kApplication()->config();
+  TDEConfig *config = tdeApp->config();
   fileOpenRecent->saveEntries(config, "Recent Files");
 
   if (view)
@@ -75,7 +75,7 @@ void kvoctrainApp::saveLanguages()
 
 void kvoctrainApp::readOptions()
 {
-  TDEConfig *config = TDEApplication::kApplication()->config();
+  TDEConfig *config = tdeApp->config();
   fileOpenRecent->loadEntries(config, "Recent Files");
   /*
   int ls = Prefs::numPreSetting();
@@ -126,7 +126,7 @@ void kvoctrainApp::saveProperties(TDEConfig *config )
     config->writeEntry(CFG_QUERYMODE, querymode);
 
     TQString filename=doc->URL().path();
-    TQString tempname = kapp->tempSaveName(filename);
+    TQString tempname = tdeApp->tempSaveName(filename);
     saveDocProps(doc);
     doc->saveAs(this, KURL(tempname), doc->getTitle(), kvoctrainDoc::automatic);
   }
@@ -142,31 +142,31 @@ void kvoctrainApp::readProperties(TDEConfig *config)
   bool modified = config->readBoolEntry(CFG_MODIFIED,false);
   if( modified ){
     bool b_canRecover;
-    TQString tempname = kapp->checkRecoverFile(filename,b_canRecover);
+    TQString tempname = tdeApp->checkRecoverFile(filename,b_canRecover);
 
     if(b_canRecover){
-      pdlg = new ProgressDlg(TQString(), TQString(), kapp->makeStdCaption(""));
+      pdlg = new ProgressDlg(TQString(), TQString(), tdeApp->makeStdCaption(""));
       pdlg->show();
       doc = new kvoctrainDoc(this, KURL(tempname));
       removeProgressBar();
       doc->setModified();
       doc->setTitle(title);
       doc->setURL(KURL(filename));
-      setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified()));
+      setCaption(tdeApp->makeStdCaption(doc->getTitle(), false, doc->isModified()));
       TQFile::remove(tempname);
     }
   }
   else if(!filename.isEmpty()){
     pdlg = new ProgressDlg (TQString(), TQString(),
-                            kapp->makeStdCaption(""));
+                            tdeApp->makeStdCaption(""));
     pdlg->show();
     doc = new kvoctrainDoc(this, KURL(filename));
     removeProgressBar();
-    setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified()));
+    setCaption(tdeApp->makeStdCaption(doc->getTitle(), false, doc->isModified()));
   }
 
   show();
-  kapp->setTopWidget(this);
-  kapp->setMainWidget( this );
+  tdeApp->setTopWidget(this);
+  tdeApp->setMainWidget( this );
 }
 
diff --git a/kvoctrain/kvoctrain/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp
index 55a37717..16c325dd 100644
--- a/kvoctrain/kvoctrain/kva_header.cpp
+++ b/kvoctrain/kvoctrain/kva_header.cpp
@@ -446,7 +446,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
       msg = format.arg(name);
 
       int exit = KMessageBox::warningContinueCancel(this, msg,
-                    kapp->makeStdCaption(""),KStdGuiItem::del());
+                    tdeApp->makeStdCaption(""),KStdGuiItem::del());
       if(exit==KMessageBox::Continue) {
         doc->removeIdent(header1);
         view->setView (doc, langset);
@@ -551,7 +551,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
       msg = format.arg(name);
 
       int exit = KMessageBox::warningContinueCancel(this, msg,
-                    kapp->makeStdCaption(""),i18n("Reset"));
+                    tdeApp->makeStdCaption(""),i18n("Reset"));
       if(exit==KMessageBox::Continue) {
         doc->resetEntry (header1, act_lesson);
         doc->setModified();
diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp
index 7261bd5d..eb4e555e 100644
--- a/kvoctrain/kvoctrain/kva_io.cpp
+++ b/kvoctrain/kvoctrain/kva_io.cpp
@@ -90,7 +90,7 @@ bool kvoctrainApp::queryExit()
   {
      int exit = KMessageBox::warningYesNoCancel(this,
                i18n("Vocabulary is modified.\n\nSave file before exit?\n"),
-               kapp->makeStdCaption(""),
+               tdeApp->makeStdCaption(""),
                KStdGuiItem::save(), KStdGuiItem::discard());
      if (exit==KMessageBox::Yes) {
        save = true;   // save and exit
@@ -123,7 +123,7 @@ void kvoctrainApp::slotFileQuit()
   if(queryExit())
     {
       doc->setModified(false);  // Make sure not to bother about saving again.
-      kapp->quit();
+      tdeApp->quit();
     }
   else
     slotStatusMsg(IDS_DEFAULT);
@@ -136,7 +136,7 @@ void kvoctrainApp::slotProgress(kvoctrainDoc *curr_doc, int percent)
     pdlg->setValue (curr_doc, percent);
   else if (pbar != 0)
     pbar->setValue (percent);
-  kapp->processEvents();
+  tdeApp->processEvents();
 }
 
 
diff --git a/kvoctrain/kvoctrain/kva_query.cpp b/kvoctrain/kvoctrain/kva_query.cpp
index fce1db59..273b97f1 100644
--- a/kvoctrain/kvoctrain/kva_query.cpp
+++ b/kvoctrain/kvoctrain/kva_query.cpp
@@ -158,7 +158,7 @@ void kvoctrainApp::slotStartPropertyQuery(int col, QueryType property)
   if (query_startnum == 0) {
     if( KMessageBox::Yes == KMessageBox::questionYesNo(this,
                                 i18n(not_contain),
-                                kapp->makeStdCaption(i18n("Starting Query"))))
+                                tdeApp->makeStdCaption(i18n("Starting Query"))))
        slotGeneralOptionsPage(5);
      return;
   }
@@ -208,7 +208,7 @@ void kvoctrainApp::slotTimeOutProperty(QueryDlgBase::Result res)
       if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) {
         slotStopQuery(true);
         KMessageBox::information(this, i18n(not_answered),
-                                 kapp->makeStdCaption(i18n("Stopping Query")));
+                                 tdeApp->makeStdCaption(i18n("Stopping Query")));
         return;
       }
       else {
@@ -329,7 +329,7 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type)
   if (query_startnum == 0) {
     if( KMessageBox::Yes == KMessageBox::questionYesNo(this,
                                 i18n(not_contain),
-                                kapp->makeStdCaption(i18n("Starting Query"))))
+                                tdeApp->makeStdCaption(i18n("Starting Query"))))
        slotGeneralOptionsPage(5);
      return;
   }
@@ -414,7 +414,7 @@ void kvoctrainApp::slotTimeOutType(QueryDlgBase::Result res)
       if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) {
         slotStopQuery(true);
         KMessageBox::information(this, i18n(not_answered),
-                                 kapp->makeStdCaption(i18n("Stopping Query")));
+                                 tdeApp->makeStdCaption(i18n("Stopping Query")));
         return;
       }
       else {
@@ -606,7 +606,7 @@ void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & o
   if (query_startnum == 0) {
     if( KMessageBox::Yes == KMessageBox::questionYesNo(this,
                                 i18n(not_contain),
-                                kapp->makeStdCaption(i18n("Starting Query"))))
+                                tdeApp->makeStdCaption(i18n("Starting Query"))))
        slotGeneralOptionsPage(5);
      return;
   }
@@ -718,7 +718,7 @@ void kvoctrainApp::slotTimeOutQuery(QueryDlgBase::Result res)
       if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) {
         slotStopQuery(true);
         KMessageBox::information(this, i18n(not_answered),
-                                 kapp->makeStdCaption(i18n("Stopping Query")));
+                                 tdeApp->makeStdCaption(i18n("Stopping Query")));
         return;
       }
       else {
@@ -1016,6 +1016,6 @@ void kvoctrainApp::slotStopQuery(bool )
     querying = false;
     querymode = false;
     show();
-    kapp->setTopWidget(this);
-    kapp->setMainWidget( this );
+    tdeApp->setTopWidget(this);
+    tdeApp->setMainWidget( this );
 }
diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp
index b75c2050..c8f79a90 100644
--- a/kvoctrain/kvoctrain/kvoctrain.cpp
+++ b/kvoctrain/kvoctrain/kvoctrain.cpp
@@ -180,7 +180,7 @@ void kvoctrainApp::commitEntryDlg(bool force)
      if( KMessageBox::No == KMessageBox::warningYesNo(this,
                    i18n("The entry dialog contains unsaved changes.\n"
                         "Do you want to apply or discard your changes?"),
-                   kapp->makeStdCaption(i18n("Unsaved Changes")),
+                   tdeApp->makeStdCaption(i18n("Unsaved Changes")),
                    KStdGuiItem::apply(), KStdGuiItem::discard())) {
         return;
      }
@@ -651,7 +651,7 @@ void kvoctrainApp::slotDocProps ()
       doc->setModified();
       view->getTable()->updateContents();
 
-      setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified()));
+      setCaption(tdeApp->makeStdCaption(doc->getTitle(), false, doc->isModified()));
 
       TQApplication::restoreOverrideCursor();
       slotStatusMsg(IDS_DEFAULT);
@@ -672,7 +672,7 @@ void kvoctrainApp::slotDocPropsLang ()
 
       doc->setModified();
       view->getTable()->updateContents();
-      setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified()));
+      setCaption(tdeApp->makeStdCaption(doc->getTitle(), false, doc->isModified()));
 
       slotStatusMsg(IDS_DEFAULT);
    }
@@ -681,7 +681,7 @@ void kvoctrainApp::slotDocPropsLang ()
 
 void kvoctrainApp::slotModifiedDoc(bool mod)
 {
-  setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified()));
+  setCaption(tdeApp->makeStdCaption(doc->getTitle(), false, doc->isModified()));
   slotStatusMsg(IDS_DEFAULT);
 }
 
@@ -701,7 +701,7 @@ void kvoctrainApp::slotRemoveRow()
   if (!hasSelection()) {
     if( KMessageBox::Continue == KMessageBox::warningContinueCancel(this,
                   i18n("Do you really want to delete the selected entry?\n"),
-                  kapp->makeStdCaption(""),KStdGuiItem::del()))
+                  tdeApp->makeStdCaption(""),KStdGuiItem::del()))
     {
       KVocTrainTable *table = view->getTable();
       doc->removeEntry(table->currentRow());
@@ -712,7 +712,7 @@ void kvoctrainApp::slotRemoveRow()
   else {
     if(KMessageBox::Continue == KMessageBox::warningContinueCancel(this,
                   i18n("Do you really want to delete the selected range?\n"),
-                  kapp->makeStdCaption(""),KStdGuiItem::del()))
+                  tdeApp->makeStdCaption(""),KStdGuiItem::del()))
     {
       KVocTrainTable *table = view->getTable();
 
@@ -895,7 +895,7 @@ void kvoctrainApp::slotCleanVocabulary ()
 
      KMessageBox::information(this,
        s,
-       kapp->makeStdCaption(i18n("Clean Up")));
+       tdeApp->makeStdCaption(i18n("Clean Up")));
    }
 }
 
@@ -1005,7 +1005,7 @@ void kvoctrainApp::slotAppendLang(int header_and_cmd)
                         "Should this dialog be invoked now?");
     if( KMessageBox::Yes == KMessageBox::questionYesNo(this,
                   msg,
-                  kapp->makeStdCaption(""),i18n("Invoke Dialog"), i18n("Do Not Invoke")))
+                  tdeApp->makeStdCaption(""),i18n("Invoke Dialog"), i18n("Do Not Invoke")))
      {
        slotGeneralOptionsPage(1);
      }
diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp
index ff3382df..3e103bd9 100644
--- a/kvoctrain/kvoctrain/kvoctraintable.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintable.cpp
@@ -122,7 +122,7 @@ void KVocTrainTable::sortByColumn(int header, bool alpha) {
 
   if (m_doc && !m_doc->isAllowedSorting()) {
     KMessageBox::information(this, i18n("Sorting is currently turned off for this document.\n"
-      "\nUse the document properties dialog to turn sorting on."), kapp->makeStdCaption(""));
+      "\nUse the document properties dialog to turn sorting on."), tdeApp->makeStdCaption(""));
     return;
   }
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
index f1f13f89..af029b9e 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
@@ -286,7 +286,7 @@ void kvoctrainDoc::errorCsv (int /*line*/, const TQString &text )
 {
    unknown_elem = true;
    TQApplication::setOverrideCursor( arrowCursor, true );
-   TQString s = kapp->makeStdCaption(i18n("Error in csv file"));
+   TQString s = tdeApp->makeStdCaption(i18n("Error in csv file"));
    TQString msg = text;
    KMessageBox::error( 0, msg, s);
    TQApplication::restoreOverrideCursor();
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
index aa158466..7e6b59e8 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
@@ -388,7 +388,7 @@ void kvoctrainDoc::errorLex (int /*line*/, const TQString &text )
 {
    unknown_elem = true;
    TQApplication::setOverrideCursor( arrowCursor, true );
-   TQString s = kapp->makeStdCaption(i18n("Error in lex file"));
+   TQString s = tdeApp->makeStdCaption(i18n("Error in lex file"));
    TQString msg = text;
    KMessageBox::error(0, msg, s);
    TQApplication::restoreOverrideCursor();
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
index 3f33b25f..55973e75 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
@@ -837,7 +837,7 @@ bool kvoctrainDoc::unknownAttribute (int line, const TQString &name,
    TQString msg = format.arg(attr).arg(name);
 
    TQApplication::setOverrideCursor( arrowCursor, true );
-   TQString s = kapp->makeStdCaption(i18n("Unknown attribute"));
+   TQString s = tdeApp->makeStdCaption(i18n("Unknown attribute"));
    bool result = (KMessageBox::warningContinueCancel(0, ln+msg, s) == KMessageBox::Continue);
    TQApplication::restoreOverrideCursor();
    return result;
@@ -859,7 +859,7 @@ void kvoctrainDoc::unknownElement (int line, const TQString &elem )
      );
    TQString msg = format.arg(elem);
    TQApplication::setOverrideCursor( arrowCursor, true );
-   TQString s = kapp->makeStdCaption(i18n("Unknown element"));
+   TQString s = tdeApp->makeStdCaption(i18n("Unknown element"));
    KMessageBox::sorry(0, ln+msg, s);
    TQApplication::restoreOverrideCursor();
 }
@@ -868,7 +868,7 @@ void kvoctrainDoc::unknownElement (int line, const TQString &elem )
 void kvoctrainDoc::errorKvtMl (int line, const TQString &text )
 {
    TQApplication::setOverrideCursor( arrowCursor, true );
-   TQString s = kapp->makeStdCaption(i18n("Error"));
+   TQString s = tdeApp->makeStdCaption(i18n("Error"));
    TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line);
 
    TQString msg = text;
@@ -880,7 +880,7 @@ void kvoctrainDoc::errorKvtMl (int line, const TQString &text )
 void kvoctrainDoc::warningKvtMl (int line, const TQString &text )
 {
    TQApplication::setOverrideCursor( arrowCursor, true );
-   TQString s = kapp->makeStdCaption(i18n("Warning"));
+   TQString s = tdeApp->makeStdCaption(i18n("Warning"));
    TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line);
    TQString msg = text;
    KMessageBox::information(0, ln+msg, s);
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
index a3eca8e4..43ad8b7e 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
@@ -192,7 +192,7 @@ void kvoctrainDoc::errorVcb (int /*line*/, const TQString &text )
 {
    unknown_elem = true;
    TQApplication::setOverrideCursor( arrowCursor, true );
-   TQString s = kapp->makeStdCaption(i18n("Error in vocabbox file"));
+   TQString s = tdeApp->makeStdCaption(i18n("Error in vocabbox file"));
    TQString msg = text;
    KMessageBox::error(0, msg, s);
    TQApplication::restoreOverrideCursor();
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
index 4d364bbc..1139384d 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
@@ -168,7 +168,7 @@ kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url)
         TQString format = i18n("Could not load \"%1\"\nDo you want to try again?");
         TQString msg = format.arg(url.path());
         int result = KMessageBox::warningContinueCancel(0, msg,
-                                                        kapp->makeStdCaption(i18n("I/O Failure")),
+                                                        tdeApp->makeStdCaption(i18n("I/O Failure")),
                                                         i18n("&Retry"));
         if ( result == KMessageBox::Cancel ) {
           Init();
@@ -264,7 +264,7 @@ bool kvoctrainDoc::saveAs (TQObject *parent, const KURL & url, TQString title, F
       TQString format = i18n("Could not save \"%1\"\nDo you want to try again?");
       TQString msg = format.arg(tmp.path());
       int result = KMessageBox::warningContinueCancel(0, msg,
-                                                      kapp->makeStdCaption(i18n("I/O Failure")),
+                                                      tdeApp->makeStdCaption(i18n("I/O Failure")),
                                                       i18n("&Retry"));
       if ( result == KMessageBox::Cancel ) return false;
     }
diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
index f9725434..12458e9e 100644
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
@@ -191,7 +191,7 @@ RandomQueryDlg::RandomQueryDlg(
 
   kv_doc = 0;
   qtimer = 0;
-  //setCaption (kapp->makeStdCaption(i18n("Random Query")));
+  //setCaption (tdeApp->makeStdCaption(i18n("Random Query")));
   setQuery (org, trans, entry, orgcol, transcol, q_cycle, q_num, q_start, exp, doc);
   mw->countbar->setFormat("%v/%m");
   mw->timebar->setFormat("%v");
@@ -201,10 +201,10 @@ RandomQueryDlg::RandomQueryDlg(
     ProgressDlg* pdlg = 0;
     if ( split && kv_doc -> numEntries() >= 500 )
     {
-      pdlg = new ProgressDlg (TQString(), TQString(), kapp -> makeStdCaption (i18n("Loading Random Query")));
+      pdlg = new ProgressDlg (TQString(), TQString(), tdeApp -> makeStdCaption (i18n("Loading Random Query")));
       pdlg -> resize (pdlg -> width(), pdlg -> minimumSize().height());
       pdlg -> show();
-      kapp -> processEvents();
+      tdeApp -> processEvents();
     }
     for ( i = 0; i < kv_doc -> numEntries(); i ++ )
     {
@@ -223,7 +223,7 @@ RandomQueryDlg::RandomQueryDlg(
       if ( pdlg )
       {
         pdlg -> setValue (doc, i * 100 / kv_doc -> numEntries());
-        kapp -> processEvents();
+        tdeApp -> processEvents();
       }
     }
     vocabulary.sort();
diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp
index 92a20dd6..2db402dd 100644
--- a/kwordquiz/src/kwordquiz.cpp
+++ b/kwordquiz/src/kwordquiz.cpp
@@ -396,7 +396,7 @@ KWordQuizDoc *KWordQuizApp::getDocument() const
 
 void KWordQuizApp::saveOptions()
 {
-  fileOpenRecent->saveEntries(kapp->config(), "Recent Files");
+  fileOpenRecent->saveEntries(tdeApp->config(), "Recent Files");
   Prefs::writeConfig();
 }
 
@@ -404,7 +404,7 @@ void KWordQuizApp::saveOptions()
 void KWordQuizApp::readOptions()
 {
   //Prefs::readConfig();
-  fileOpenRecent->loadEntries(kapp->config(), "Recent Files");
+  fileOpenRecent->loadEntries(tdeApp->config(), "Recent Files");
 }
 
 void KWordQuizApp::saveProperties(TDEConfig *_cfg)
@@ -419,7 +419,7 @@ void KWordQuizApp::saveProperties(TDEConfig *_cfg)
     KURL url=doc->URL();
     _cfg->writeEntry("filename", url.url());
     _cfg->writeEntry("modified", doc->isModified());
-    TQString tempname = kapp->tempSaveName(url.url());
+    TQString tempname = tdeApp->tempSaveName(url.url());
     TQString tempurl= KURL::encode_string(tempname);
     KURL _url(tempurl);
     doc->saveDocument(_url);
@@ -435,7 +435,7 @@ void KWordQuizApp::readProperties(TDEConfig* _cfg)
   if(modified)
   {
     bool canRecover;
-    TQString tempname = kapp->checkRecoverFile(filename, canRecover);
+    TQString tempname = tdeApp->checkRecoverFile(filename, canRecover);
     KURL _url(tempname);
 
     if(canRecover)
diff --git a/kwordquiz/src/kwordquizprefs.cpp b/kwordquiz/src/kwordquizprefs.cpp
index 2844ce48..4ebf8426 100644
--- a/kwordquiz/src/kwordquizprefs.cpp
+++ b/kwordquiz/src/kwordquizprefs.cpp
@@ -78,7 +78,7 @@ KWordQuizPrefs::KWordQuizPrefs(TQWidget *parent, const char *name,  TDEConfigSke
   m_prefCharacter->lstCharacters->setSelected(m_prefCharacter->lstCharacters->firstChild(), true);
   m_prefCharacter->lstCharacters->setItemMargin(2);
 
-  kapp->processEvents();
+  tdeApp->processEvents();
 }
 
 void KWordQuizPrefs::slotCharListSelectionChanged()
diff --git a/kwordquiz/src/kwordquizview.cpp b/kwordquiz/src/kwordquizview.cpp
index b1b75b41..3fac1d06 100644
--- a/kwordquiz/src/kwordquizview.cpp
+++ b/kwordquiz/src/kwordquizview.cpp
@@ -435,7 +435,7 @@ void KWordQuizView::doEditCopy( )
         s = s + text(r, c) + "\t";
       s = s + "\n";
     }
-    kapp->clipboard()->setText(s);
+    tdeApp->clipboard()->setText(s);
   }
   getDocument()->setModified(mod);
 }
@@ -457,7 +457,7 @@ void KWordQuizView::doEditPaste( )
 
     if (lc == rc && tr == br) //one cell selected
     {
-      TQString s = kapp->clipboard()->text();
+      TQString s = tdeApp->clipboard()->text();
       TQStringList sl;
       sl = TQStringList::split("\n", s);
 
@@ -498,7 +498,7 @@ void KWordQuizView::doEditPaste( )
     }
     else
     {
-      TQString s = kapp->clipboard()->text();
+      TQString s = tdeApp->clipboard()->text();
       TQStringList sl;
       sl = TQStringList::split("\n", s);
       uint i = 0;
diff --git a/libtdeedu/extdate/main.cpp b/libtdeedu/extdate/main.cpp
index 585668c6..c444d655 100644
--- a/libtdeedu/extdate/main.cpp
+++ b/libtdeedu/extdate/main.cpp
@@ -25,6 +25,6 @@ int main( int argc, char *argv[] )
 	TDEApplication a;
 	TestWidget *t = new TestWidget(0,0);
 	t->show();
-	TQObject::connect(kapp, TQ_SIGNAL(lastWindowClosed()), kapp, TQ_SLOT(quit()));
+	TQObject::connect(tdeApp, TQ_SIGNAL(lastWindowClosed()), tdeApp, TQ_SLOT(quit()));
 	return a.exec();
 }