Use tdeApp

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

3 files changed, 7 insertions, 7 deletions

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