1 files changed, 16 insertions, 16 deletions

diff --git a/tdemid/tdemidframe.cpp b/tdemid/tdemidframe.cpp
index 88069499..aa10a6e4 100644
--- a/tdemid/tdemidframe.cpp
+++ b/tdemid/tdemidframe.cpp
@@ -89,7 +89,7 @@ tdemidFrame::tdemidFrame(const char *name)
     KStdAction::open(this, TQ_SLOT(file_Open()), actionCollection());
     (void)new TDEAction(i18n("&Save Lyrics..."), 0, this,
 	TQ_SLOT(file_SaveLyrics()), actionCollection(), "file_save_lyrics");
-    KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+    KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
 
     (void)new TDEAction(i18n("&Play"), "media-playback-start", TQt::Key_Space,
 		tdemidclient, TQ_SLOT(slotPlay()), actionCollection(), "song_play");
@@ -175,7 +175,7 @@ tdemidFrame::tdemidFrame(const char *name)
 
     setupGUI((ToolBar | Keys | StatusBar | Save | Create ), "tdemidui.rc" );
 
-    TDEConfig *cfg=kapp->config();
+    TDEConfig *cfg=tdeApp->config();
     cfg->setGroup("KMid");
     TDESelectAction *tmplistaction=
 		((TDESelectAction*)actionCollection()->action("display_events"));
@@ -230,7 +230,7 @@ tdemidFrame::tdemidFrame(const char *name)
         cfg->writeEntry("AutoAddToCollection",0);
 
         char ttt[40];
-        sprintf(ttt,"%d",kapp->argc());
+        sprintf(ttt,"%d",tdeApp->argc());
         int i=0;
         int c=autoAddSongToCollection( args->url( 0 ).path() , 1 );
         i++;
@@ -242,7 +242,7 @@ tdemidFrame::tdemidFrame(const char *name)
 
         tdemidclient->setActiveCollection(c);
 
-        ///	    tdemidclient->openURL((kapp->argv())[1]);
+        ///	    tdemidclient->openURL((tdeApp->argv())[1]);
         /*	    if ((cfg->readNumEntry("AutomaticTextEventChooser",1))==1)
          {
          if (tdemidclient->ChooseTypeOfTextEvents()==1)
@@ -262,7 +262,7 @@ tdemidFrame::tdemidFrame(const char *name)
          */
 //    kKeysAccel->writeSettings(cfg);
 
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if (!client->isRegistered())  // just in case we're embeeded
     {
       client->attach();
@@ -304,7 +304,7 @@ void tdemidFrame::song_stopPause()
 
 void tdemidFrame::options_FileType(int i)
 {
-  TDEConfig *cfg=kapp->config();
+  TDEConfig *cfg=tdeApp->config();
   cfg->setGroup("KMid");
   cfg->writeEntry("TypeOfMidiFile",i);
   tdemidclient->setSongType(1-i);
@@ -312,7 +312,7 @@ void tdemidFrame::options_FileType(int i)
 
 void tdemidFrame::options_DisplayEvents(int i)
 {
-  TDEConfig *cfg=kapp->config();
+  TDEConfig *cfg=tdeApp->config();
   cfg->setGroup("KMid");
   cfg->writeEntry("TypeOfTextEvents",(i==0)?1:5);
   cfg->sync();
@@ -321,7 +321,7 @@ void tdemidFrame::options_DisplayEvents(int i)
 
 void tdemidFrame::options_AutomaticText()
 {
-  TDEConfig *cfg=kapp->config();
+  TDEConfig *cfg=tdeApp->config();
   cfg->setGroup("KMid");
   cfg->writeEntry("AutomaticTextEventChooser",1-cfg->readNumEntry("AutomaticTextEventChooser",1));
 }
@@ -333,7 +333,7 @@ void tdemidFrame::options_FontChange()
   font=*tdemidclient->getFont();
   kfd->getFont(font);
   delete kfd;
-  TDEConfig *cfg=kapp->config();
+  TDEConfig *cfg=tdeApp->config();
   cfg->setGroup("KMid");
   cfg->writeEntry("KaraokeFont",font);
   cfg->sync();
@@ -345,7 +345,7 @@ int tdemidFrame::autoAddSongToCollection(const TQString& filename,int setactive)
   int r;
   SLManager *slman;
   SongList *sl;
-  TDEConfig *cfg=kapp->config();
+  TDEConfig *cfg=tdeApp->config();
   cfg->setGroup("KMid");
   if (cfg->readNumEntry("AutoAddToCollection",0)==0)
   {
@@ -474,7 +474,7 @@ void tdemidFrame::options_MidiSetup()
   dlg=new MidiConfigDialog(tdemidclient->devman(),NULL,"MidiDialog");
   if (dlg->exec() == TQDialog::Accepted)
   {
-    TDEConfig *cfg=kapp->config();
+    TDEConfig *cfg=tdeApp->config();
     cfg->setGroup("KMid");
     cfg->writeEntry("MidiPortNumber",MidiConfigDialog::selecteddevice);
     tdemidclient->setMidiDevice(MidiConfigDialog::selecteddevice);
@@ -509,7 +509,7 @@ delete dlg;
 
 void tdemidFrame::rechooseTextEvent()
 {
-  TDEConfig *cfg=kapp->config();
+  TDEConfig *cfg=tdeApp->config();
   cfg->setGroup("KMid");
   if ((cfg->readNumEntry("AutomaticTextEventChooser",1))==1)
   {
@@ -524,7 +524,7 @@ void tdemidFrame::rechooseTextEvent()
 
 void tdemidFrame::song_Loop()
 {
-  TDEConfig *cfg=kapp->config();
+  TDEConfig *cfg=tdeApp->config();
   cfg->setGroup("KMid");
   int i=1-cfg->readNumEntry("Loop",0);
   cfg->writeEntry("Loop",i);
@@ -534,7 +534,7 @@ void tdemidFrame::song_Loop()
 
 void tdemidFrame::collect_PlayOrder(int i)
 {
-  TDEConfig *cfg=kapp->config();
+  TDEConfig *cfg=tdeApp->config();
   cfg->setGroup("KMid");
   cfg->writeEntry("CollectionPlayMode", i);
   cfg->sync();
@@ -543,7 +543,7 @@ void tdemidFrame::collect_PlayOrder(int i)
 
 void tdemidFrame::collect_AutoAdd()
 {
-  TDEConfig *cfg=kapp->config();
+  TDEConfig *cfg=tdeApp->config();
   cfg->setGroup("KMid");
   cfg->writeEntry("AutoAddToCollection",1-cfg->readNumEntry("AutoAddToCollection",0));
   cfg->sync();
@@ -584,7 +584,7 @@ void tdemidFrame::spacePressed()
 }
 void tdemidFrame::options_ShowVolumeBar()
 {
-  TDEConfig *cfg=kapp->config();
+  TDEConfig *cfg=tdeApp->config();
   cfg->setGroup("KMid");
   int i=1-cfg->readNumEntry("ShowVolumeBar",0);
   cfg->writeEntry("ShowVolumeBar",i);