Use tdeApprename/tdeapp

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

5 files changed, 11 insertions, 11 deletions

diff --git a/src/configuration.cpp b/src/configuration.cpp
index cbbd740..39997bd 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -58,7 +58,7 @@ void Config::read()
     loadPlugins();
     readProfiles();
 
-    TDEConfig *conf = kapp->config();
+    TDEConfig *conf = tdeApp->config();
     TQStringList listDefaults;
     int intDefault;
     bool boolDefault;
@@ -266,7 +266,7 @@ void Config::write( bool sync )
     writeServiceMenu();
     writeAmarokScript();
 
-    TDEConfig *conf = kapp->config();
+    TDEConfig *conf = tdeApp->config();
 
     conf->setGroup( "Ripper" );
     conf->writeEntry( "ripper", (currentRipper)?currentRipper->rip.bin:"tdeio_audiocd" );
diff --git a/src/filelist.cpp b/src/filelist.cpp
index bbd6516..d8ecbba 100644
--- a/src/filelist.cpp
+++ b/src/filelist.cpp
@@ -570,7 +570,7 @@ void FileList::addDir( const TQString& directory, const TQStringList& filter, bo
     pScanStatus->setProgress( 0 );
     pScanStatus->setTotalSteps( 0 );
     pScanStatus->show(); // show the status while scanning the directories
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     int count = listDir( directory, filter, recursive, true );
     listDir( directory, filter, recursive );
diff --git a/src/replaygainfilelist.cpp b/src/replaygainfilelist.cpp
index aed0e41..0a7c88b 100644
--- a/src/replaygainfilelist.cpp
+++ b/src/replaygainfilelist.cpp
@@ -745,7 +745,7 @@ void ReplayGainFileList::addDir( const TQString& directory, const TQStringList&
     pScanStatus->setProgress( 0 );
     pScanStatus->setTotalSteps( 0 );
     pScanStatus->show(); // show the status while scanning the directories
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     int count = listDir( directory, filter, recursive, true );
     listDir( directory, filter, recursive );
diff --git a/src/soundkonverter.cpp b/src/soundkonverter.cpp
index 314a6eb..5ac3d07 100644
--- a/src/soundkonverter.cpp
+++ b/src/soundkonverter.cpp
@@ -89,7 +89,7 @@ soundKonverter::soundKonverter()
 //                 TDEProcess restart;
 //                 restart << "soundkonverter";
 //                 restart.start( TDEProcess::DontCare );
-//                 kapp->quit();
+//                 tdeApp->quit();
 //                 return;
 //             }
 //         }
@@ -455,7 +455,7 @@ void soundKonverter::stoppedConversion()
     pStop->hide();
     stopActionMenu->setEnabled( false );
 
-    if( autoclose ) kapp->quit(); // NOTE close app on conversion stop (may irritate the user when stopping the conversion)
+    if( autoclose ) tdeApp->quit(); // NOTE close app on conversion stop (may irritate the user when stopping the conversion)
 }
 
 // void soundKonverter::priorityChanged()
@@ -583,7 +583,7 @@ void soundKonverter::showCdDialog( bool intern )
         device = "";
     }
 
-    kapp->eventLoop()->exitLoop();
+    tdeApp->eventLoop()->exitLoop();
 
     // create a new CDOpener object for letting the user add some tracks from a CD
     CDOpener *dialog = new CDOpener( config, cdManager, tagEngine, device, this, "CDOpener" );
@@ -612,7 +612,7 @@ void soundKonverter::showCdDialog( bool intern )
     }
     delete dialog;
 
-    kapp->eventLoop()->enterLoop();
+    tdeApp->eventLoop()->enterLoop();
 
     options->setCurrentOptions( conversionOptions );
 }
@@ -745,7 +745,7 @@ void soundKonverter::showToolbar()
 
 void soundKonverter::editToolbar()
 {
-    saveMainWindowSettings( kapp->config(), "MainWindow" );
+    saveMainWindowSettings( tdeApp->config(), "MainWindow" );
     KEditToolbar dlg( actionCollection() );
     connect( &dlg, TQ_SIGNAL(newToolbarConfig()),
                this, TQ_SLOT(newToolbarConfig())
@@ -756,7 +756,7 @@ void soundKonverter::editToolbar()
 void soundKonverter::newToolbarConfig()
 {
     createGUI();
-    applyMainWindowSettings( kapp->config(), "MainWindow" );
+    applyMainWindowSettings( tdeApp->config(), "MainWindow" );
 }
 
 void soundKonverter::fileCountChanged( int count )
diff --git a/src/soundkonverterapp.cpp b/src/soundkonverterapp.cpp
index 0d396c4..e151b25 100644
--- a/src/soundkonverterapp.cpp
+++ b/src/soundkonverterapp.cpp
@@ -43,7 +43,7 @@ int soundKonverterApp::newInstance()
             //widget->show();
         }
         else
-            TDEStartupInfo::setNewStartupId( mainWidget(), kapp->startupId());
+            TDEStartupInfo::setNewStartupId( mainWidget(), tdeApp->startupId());
 
         soundKonverter *widget = ::tqt_cast<soundKonverter*>( mainWidget() );