Rename KApplication to TDEApplication to avoid conflicts with KDE4

46 files changed, 62 insertions, 62 deletions

diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp
index 8ccef7e9..2aa4f608 100644
--- a/arts/builder/execdlg.cpp
+++ b/arts/builder/execdlg.cpp
@@ -196,6 +196,6 @@ void ExecDlg::saveSession()
 
 void ExecDlg::help()
 {
-	KApplication::kApplication()->invokeHelp("", "karts");
+	TDEApplication::kApplication()->invokeHelp("", "karts");
 }
 #include "execdlg.moc"
diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp
index 26265eea..58637153 100644
--- a/arts/builder/interfacedlg.cpp
+++ b/arts/builder/interfacedlg.cpp
@@ -172,7 +172,7 @@ void InterfaceDlg::update()
 
 void InterfaceDlg::help()
 {
-	KApplication::kApplication()->invokeHelp("", "karts");
+	TDEApplication::kApplication()->invokeHelp("", "karts");
 }
 
 #include "interfacedlg.moc"
diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp
index 9e6cc8ac..bdfe7727 100644
--- a/arts/builder/main.cpp
+++ b/arts/builder/main.cpp
@@ -71,7 +71,7 @@ using namespace std;
 
 /*************************************************************/
 
-class ArtsBuilderApp :public KApplication
+class ArtsBuilderApp :public TDEApplication
 {
 protected:
 	ArtsBuilderWindow *mainWindow;
diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp
index 1397bd1e..b200d812 100644
--- a/arts/builder/portposdlg.cpp
+++ b/arts/builder/portposdlg.cpp
@@ -252,7 +252,7 @@ void PortPosDlg::update()
 
 void PortPosDlg::help()
 {
-	KApplication::kApplication()->invokeHelp("", "karts");
+	TDEApplication::kApplication()->invokeHelp("", "karts");
 }
 
 #include "portposdlg.moc"
diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp
index fc9bbb94..1df54dca 100644
--- a/arts/builder/retrievedlg.cpp
+++ b/arts/builder/retrievedlg.cpp
@@ -132,6 +132,6 @@ TQString RetrieveDlg::result()
 
 void RetrieveDlg::help()
 {
-	KApplication::kApplication()->invokeHelp("", "karts");
+	TDEApplication::kApplication()->invokeHelp("", "karts");
 }
 #include "retrievedlg.moc"
diff --git a/arts/gui/kde/artstestgui.cpp b/arts/gui/kde/artstestgui.cpp
index c7532003..23833992 100644
--- a/arts/gui/kde/artstestgui.cpp
+++ b/arts/gui/kde/artstestgui.cpp
@@ -33,7 +33,7 @@ int main(int argc, char **argv)
 {
 	TQIOManager iomanager;
 	Dispatcher dispatcher(&iomanager);
-	KApplication application(argc, argv, "testgui");
+	TDEApplication application(argc, argv, "testgui");
 
 	ObjectManager::the()->provideCapability("kdegui");
 
diff --git a/arts/gui/kde/dbtest.cpp b/arts/gui/kde/dbtest.cpp
index d1dda3ac..e792edd8 100644
--- a/arts/gui/kde/dbtest.cpp
+++ b/arts/gui/kde/dbtest.cpp
@@ -32,7 +32,7 @@ int main( int argc, char* argv[] ) {
 	aboutData.addAuthor( "Arnold Krille", I18N_NOOP(  "Creator" ), "arnold@arnoldarts.de");
 	TDECmdLineArgs::init( argc, argv, &aboutData );
 
-	KApplication app;
+	TDEApplication app;
 
 	dBTestWidget* w = new dBTestWidget( 0 );
 	w->show();
diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp
index 45b4eead..3793294f 100644
--- a/arts/tools/choosebusdlg.cpp
+++ b/arts/tools/choosebusdlg.cpp
@@ -155,7 +155,7 @@ TQString ChooseBusDlg::result()
 
 void ChooseBusDlg::help()
 {
-	KApplication::kApplication()->invokeHelp("", "artsbuilder");
+	TDEApplication::kApplication()->invokeHelp("", "artsbuilder");
 }
 
 void ChooseBusDlg::textChanged( const TQString & busname )
diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp
index 3042f46e..4d0fc782 100644
--- a/arts/tools/main.cpp
+++ b/arts/tools/main.cpp
@@ -197,7 +197,7 @@ int main(int argc, char **argv) {
 
 	TDECmdLineArgs::init( argc, argv, &aboutData );
 
-	KApplication app(argc, argv);
+	TDEApplication app(argc, argv);
 
 	// setup mcop communication
 	QIOManager qiomanager;
diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp
index 96b7ff44..234a53a8 100644
--- a/arts/tools/midiinstdlg.cpp
+++ b/arts/tools/midiinstdlg.cpp
@@ -173,7 +173,7 @@ TQCString MidiInstDlg::filename()
 
 void MidiInstDlg::help()
 {
-	KApplication::kApplication()->invokeHelp("", "artsbuilder");
+	TDEApplication::kApplication()->invokeHelp("", "artsbuilder");
 }
 
 #include "midiinstdlg.moc"
diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp
index 4b5678c1..49611ec0 100644
--- a/arts/tools/midiportdlg.cpp
+++ b/arts/tools/midiportdlg.cpp
@@ -105,7 +105,7 @@ const char *MidiPortDlg::device()
 
 void MidiPortDlg::help()
 {
-	KApplication::kApplication()->invokeHelp("", "artsbuilder");
+	TDEApplication::kApplication()->invokeHelp("", "artsbuilder");
 }
 
 #include "midiportdlg.moc"
diff --git a/doc/artsbuilder/mcop.docbook b/doc/artsbuilder/mcop.docbook
index 790ccb9f..f140bff9 100644
--- a/doc/artsbuilder/mcop.docbook
+++ b/doc/artsbuilder/mcop.docbook
@@ -1892,7 +1892,7 @@ struct TypeDef {
 Since &kde; dropped <acronym>CORBA</acronym> completely, and is using
 &DCOP; everywhere instead, naturally the question arises why &arts;
 isn't doing so. After all, &DCOP; support is in
-<classname>KApplication</classname>, is well-maintained, supposed to
+<classname>TDEApplication</classname>, is well-maintained, supposed to
 integrate greatly with libICE, and whatever else.
 </para>
 
diff --git a/juk/coverinfo.cpp b/juk/coverinfo.cpp
index 624a67fd..e6b7691a 100644
--- a/juk/coverinfo.cpp
+++ b/juk/coverinfo.cpp
@@ -193,7 +193,7 @@ void CoverInfo::popup() const
 {
     TQPixmap image = pixmap(FullSize);
     TQPoint mouse  = TQCursor::pos();
-    TQRect desktop = KApplication::desktop()->screenGeometry(mouse);
+    TQRect desktop = TDEApplication::desktop()->screenGeometry(mouse);
     
     int x = mouse.x();
     int y = mouse.y();
diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp
index 31570dbd..4c83fbd6 100644
--- a/juk/filerenamer.cpp
+++ b/juk/filerenamer.cpp
@@ -864,7 +864,7 @@ void FileRenamer::rename(const PlaylistItemList &items)
     if(itemMap.isEmpty() || ConfirmationDialog(map).exec() != TQDialog::Accepted)
         return;
 
-    KApplication::setOverrideCursor(TQt::waitCursor);
+    TDEApplication::setOverrideCursor(TQt::waitCursor);
     for(TQMap<TQString, TQString>::ConstIterator it = map.begin();
         it != map.end(); ++it)
     {
@@ -879,7 +879,7 @@ void FileRenamer::rename(const PlaylistItemList &items)
 
         processEvents();
     }
-    KApplication::restoreOverrideCursor();
+    TDEApplication::restoreOverrideCursor();
 
     if(!errorFiles.isEmpty())
         KMessageBox::errorList(0, i18n("The following rename operations failed:\n"), errorFiles);
diff --git a/juk/ktrm.cpp b/juk/ktrm.cpp
index 09a77546..95d38e6d 100644
--- a/juk/ktrm.cpp
+++ b/juk/ktrm.cpp
@@ -244,7 +244,7 @@ class KTRMEventHandler : public TQObject
 public:
     static void send(int fileId, KTRMEvent::Status status)
     {
-        KApplication::postEvent(instance(), new KTRMEvent(fileId, status));
+        TDEApplication::postEvent(instance(), new KTRMEvent(fileId, status));
     }
 
 protected:
diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp
index 568a8d59..78b09d42 100644
--- a/juk/nowplaying.cpp
+++ b/juk/nowplaying.cpp
@@ -356,7 +356,7 @@ void HistoryItem::slotAddPlaying()
     PlayerManager *manager = PlayerManager::instance();
 
     if(manager->playing() && manager->playingFile() == m_file) {
-        m_history.prepend(Item(KApplication::randomString(20),
+        m_history.prepend(Item(TDEApplication::randomString(20),
                                m_file, Playlist::playingItem()->playlist()));
     }
 
diff --git a/juk/playlist.cpp b/juk/playlist.cpp
index 047bba00..1a83797b 100644
--- a/juk/playlist.cpp
+++ b/juk/playlist.cpp
@@ -750,7 +750,7 @@ void Playlist::slotRefresh()
     if(l.isEmpty())
 	l = visibleItems();
 
-    KApplication::setOverrideCursor(TQt::waitCursor);
+    TDEApplication::setOverrideCursor(TQt::waitCursor);
     for(PlaylistItemList::Iterator it = l.begin(); it != l.end(); ++it) {
 	(*it)->refreshFromDisk();
 
@@ -763,7 +763,7 @@ void Playlist::slotRefresh()
 
 	processEvents();
     }
-    KApplication::restoreOverrideCursor();
+    TDEApplication::restoreOverrideCursor();
 }
 
 void Playlist::slotRenameFile()
@@ -877,7 +877,7 @@ void Playlist::slotCoverChanged(int coverId)
 
 void Playlist::slotGuessTagInfo(TagGuesser::Type type)
 {
-    KApplication::setOverrideCursor(TQt::waitCursor);
+    TDEApplication::setOverrideCursor(TQt::waitCursor);
     PlaylistItemList items = selectedItems();
     setDynamicListsFrozen(true);
 
@@ -898,7 +898,7 @@ void Playlist::slotGuessTagInfo(TagGuesser::Type type)
 
     dataChanged();
     setDynamicListsFrozen(false);
-    KApplication::restoreOverrideCursor();
+    TDEApplication::restoreOverrideCursor();
 }
 
 void Playlist::slotReload()
@@ -1161,7 +1161,7 @@ void Playlist::keyPressEvent(TQKeyEvent *event)
 	    TQListViewItemIterator visible(this, TQListViewItemIterator::IteratorFlag(
 					      TQListViewItemIterator::Visible));
 	    if(selected.current() == visible.current())
-		KApplication::postEvent(parent(), new FocusUpEvent);
+		TDEApplication::postEvent(parent(), new FocusUpEvent);
 	}
 	
     }
@@ -1353,7 +1353,7 @@ void Playlist::addFiles(const TQStringList &files, PlaylistItem *after)
     if(!after)
 	after = static_cast<PlaylistItem *>(lastItem());
 
-    KApplication::setOverrideCursor(TQt::waitCursor);
+    TDEApplication::setOverrideCursor(TQt::waitCursor);
 
     m_blockDataChanged = true;
 
@@ -1370,7 +1370,7 @@ void Playlist::addFiles(const TQStringList &files, PlaylistItem *after)
     slotWeightDirty();
     dataChanged();
 
-    KApplication::restoreOverrideCursor();
+    TDEApplication::restoreOverrideCursor();
 }
 
 void Playlist::refreshAlbums(const PlaylistItemList &items, coverKey id)
diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index f8a258ae..cabdd462 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -618,7 +618,7 @@ void TagEditor::save(const PlaylistItemList &list)
 {
     if(!list.isEmpty() && m_dataChanged) {
 	
-	KApplication::setOverrideCursor(TQt::waitCursor);
+	TDEApplication::setOverrideCursor(TQt::waitCursor);
 	m_dataChanged = false;
 	m_performingSave = true;
 
@@ -685,7 +685,7 @@ void TagEditor::save(const PlaylistItemList &list)
 	TagTransactionManager::instance()->commit();
 	CollectionList::instance()->dataChanged();
 	m_performingSave = false;
-	KApplication::restoreOverrideCursor();
+	TDEApplication::restoreOverrideCursor();
     }
 }
 
diff --git a/juk/tagguesserconfigdlg.cpp b/juk/tagguesserconfigdlg.cpp
index 7caea019..5d85dcc1 100644
--- a/juk/tagguesserconfigdlg.cpp
+++ b/juk/tagguesserconfigdlg.cpp
@@ -61,7 +61,7 @@ void TagGuesserConfigDlg::accept()
 {
     if(m_child->lvSchemes->renameLineEdit()) {
         TQKeyEvent returnKeyPress(TQEvent::KeyPress, Key_Return, 0, 0);
-        KApplication::sendEvent(m_child->lvSchemes->renameLineEdit(), &returnKeyPress);
+        TDEApplication::sendEvent(m_child->lvSchemes->renameLineEdit(), &returnKeyPress);
     }
 
     TQStringList schemes;
diff --git a/juk/tagguessertest.cpp b/juk/tagguessertest.cpp
index 7f358343..7b92ee49 100644
--- a/juk/tagguessertest.cpp
+++ b/juk/tagguessertest.cpp
@@ -66,7 +66,7 @@ int main( int argc, char **argv )
 {
     KAboutData aboutData("tagguessertest", "tagguessertest", "0.1");
     TDECmdLineArgs::init(argc, argv, &aboutData);
-    KApplication app;
+    TDEApplication app;
     check( "/home/frerich/Chemical Brothers - (01) - Block rockin' beats [Live].mp3",
             "Block Rockin' Beats", "Chemical Brothers", "01", "Live" );
     check( "/home/frerich/Chemical Brothers - (01) - Block rockin' beats (Live).mp3",
diff --git a/juk/tracksequenceiterator.cpp b/juk/tracksequenceiterator.cpp
index d53a3a17..b60a68d0 100644
--- a/juk/tracksequenceiterator.cpp
+++ b/juk/tracksequenceiterator.cpp
@@ -97,7 +97,7 @@ void DefaultSequenceIterator::advance()
 
         if(albumRandom) {
             if(m_albumSearch.isNull() || m_albumSearch.matchedItems().isEmpty()) {
-                item = m_randomItems[KApplication::random() % m_randomItems.count()];
+                item = m_randomItems[TDEApplication::random() % m_randomItems.count()];
                 initAlbumSearch(item);
             }
 
@@ -132,7 +132,7 @@ void DefaultSequenceIterator::advance()
                 kdError(65432) << "Unable to perform album random play on " << *item << endl;
         }
         else
-            item = m_randomItems[KApplication::random() % m_randomItems.count()];
+            item = m_randomItems[TDEApplication::random() % m_randomItems.count()];
 
         setCurrent(item);
         m_randomItems.remove(item);
@@ -173,7 +173,7 @@ void DefaultSequenceIterator::prepareToPlay(Playlist *playlist)
 
         PlaylistItem *newItem = 0;
         if(!items.isEmpty())
-            newItem = items[KApplication::random() % items.count()];
+            newItem = items[TDEApplication::random() % items.count()];
 
         setCurrent(newItem);
         refillRandomList();
diff --git a/kaboodle/kaboodleapp.cpp b/kaboodle/kaboodleapp.cpp
index e2872e6b..6aced727 100644
--- a/kaboodle/kaboodleapp.cpp
+++ b/kaboodle/kaboodleapp.cpp
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "userinterface.h"
 
 Kaboodle::KaboodleApp::KaboodleApp()
-	: KApplication()
+	: TDEApplication()
 {
 	disableSessionManagement();
 
diff --git a/kaboodle/kaboodleapp.h b/kaboodle/kaboodleapp.h
index b80563b3..e81340cf 100644
--- a/kaboodle/kaboodleapp.h
+++ b/kaboodle/kaboodleapp.h
@@ -30,7 +30,7 @@ namespace Kaboodle
 {
 class UserInterface;
 
-class KaboodleApp : public KApplication
+class KaboodleApp : public TDEApplication
 {
 Q_OBJECT
   
diff --git a/kaudiocreator/main.cpp b/kaudiocreator/main.cpp
index 05c4cffe..16fb3631 100644
--- a/kaudiocreator/main.cpp
+++ b/kaudiocreator/main.cpp
@@ -39,7 +39,7 @@ int main(int argc, char *argv[]){
   // command line
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );
-  KApplication a(argc, argv);
+  TDEApplication a(argc, argv);
   KAudioCreator *app = new KAudioCreator(0, "MainWindow");
 
   // we need some strings from libkcddb for the cddb album dialog
diff --git a/kioslave/audiocd/audiocd.cpp b/kioslave/audiocd/audiocd.cpp
index ba1b8ada..51e4d6c1 100644
--- a/kioslave/audiocd/audiocd.cpp
+++ b/kioslave/audiocd/audiocd.cpp
@@ -75,14 +75,14 @@ static const KCmdLineOptions options[] =
 
 int kdemain(int argc, char ** argv)
 {
-	// KApplication uses libkcddb which needs a valid kapp pointer
+	// TDEApplication uses libkcddb which needs a valid kapp pointer
 	// GUIenabled must be true as libkcddb sometimes wants to communicate
 	// with the user
 	putenv(strdup("SESSION_MANAGER="));
-	KApplication::disableAutoDcopRegistration();
+	TDEApplication::disableAutoDcopRegistration();
 	TDECmdLineArgs::init(argc, argv, "kio_audiocd", 0, 0, 0, 0);
 	TDECmdLineArgs::addCmdLineOptions(options);
-	KApplication app(false, true);
+	TDEApplication app(false, true);
 
 	kdDebug(7117) << "Starting " << getpid() << endl;
 
diff --git a/kmid/channelview.cpp b/kmid/channelview.cpp
index 9a1f1e88..b810aa4e 100644
--- a/kmid/channelview.cpp
+++ b/kmid/channelview.cpp
@@ -121,7 +121,7 @@ int ChannelView::lookmode=0;
 
 int ChannelView::lookMode(void)
 {
-    KConfig *kcfg=(KApplication::kApplication())->config();
+    KConfig *kcfg=(TDEApplication::kApplication())->config();
 
     kcfg->setGroup("KMid");
     lookmode=kcfg->readNumEntry("ChannelViewLookMode",0);
@@ -131,7 +131,7 @@ int ChannelView::lookMode(void)
 
 void ChannelView::lookMode(int i)
 {
-    KConfig *kcfg=(KApplication::kApplication())->config();
+    KConfig *kcfg=(TDEApplication::kApplication())->config();
 
     lookmode=i;
 
diff --git a/kmid/kmidclient.h b/kmid/kmidclient.h
index 3f4bf7c7..cdb5d1fa 100644
--- a/kmid/kmidclient.h
+++ b/kmid/kmidclient.h
@@ -43,7 +43,7 @@
 class DeviceManager;
 
 
-class KApplication;
+class TDEApplication;
 class KConfig;
 class KLCDNumber;
 class TQLabel;
diff --git a/kmid/kmidframe.h b/kmid/kmidframe.h
index 21a173fb..1e3e08c6 100644
--- a/kmid/kmidframe.h
+++ b/kmid/kmidframe.h
@@ -32,7 +32,7 @@
 #include <tqtimer.h>
 #include <tdelibs_export.h>
 
-class KApplication;
+class TDEApplication;
 class KConfig;
 class kmidClient;
 class KToolBar;
diff --git a/kmid/main.cpp b/kmid/main.cpp
index 55596d3c..c368e523 100644
--- a/kmid/main.cpp
+++ b/kmid/main.cpp
@@ -65,7 +65,7 @@ int main(int argc, char **argv)
     };
     TDECmdLineArgs::addCmdLineOptions(options);
 
-    KApplication app;
+    TDEApplication app;
 
     kmidFrame *kmidframe=new kmidFrame("KMid");
 
diff --git a/kmix/kmixctrl.cpp b/kmix/kmixctrl.cpp
index 97e1c6ed..b602b5b3 100644
--- a/kmix/kmixctrl.cpp
+++ b/kmix/kmixctrl.cpp
@@ -58,7 +58,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
    TDECmdLineArgs::init( argc, argv, &aboutData );
    TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
-   KApplication app( false, false );
+   TDEApplication app( false, false );
 
    // get maximum values
    KConfig *config= new KConfig("kmixrc", true, false);
diff --git a/krec/main.cpp b/krec/main.cpp
index bbbdc2a4..1a841fe2 100644
--- a/krec/main.cpp
+++ b/krec/main.cpp
@@ -54,7 +54,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
 	TDECmdLineArgs::init( argc, argv, &aboutData );
 	TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
-	KApplication app;
+	TDEApplication app;
 	KRecord *w = new KRecord();
 	w->show();
 	app.setMainWidget(w);
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index 8f115ea0..6c26e1d3 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -1491,7 +1491,7 @@ void KSCD::information(int i)
 bool KSCD::saveState(TQSessionManager& /*sm*/)
 {
   writeSettings();
-  KConfig* config = KApplication::kApplication()->sessionConfig();
+  KConfig* config = TDEApplication::kApplication()->sessionConfig();
   config->setGroup("General");
   config->writeEntry("Show", isVisible());
   return true;
@@ -1659,7 +1659,7 @@ int main( int argc, char *argv[] )
 
     if (kapp->isRestored())
     {
-        KConfig* config = KApplication::kApplication()->sessionConfig();
+        KConfig* config = TDEApplication::kApplication()->sessionConfig();
         config->setGroup("General");
         if (config->readBoolEntry("Show"))
             k->show();
diff --git a/kscd/kscdmagic/main.cpp b/kscd/kscdmagic/main.cpp
index b452a1fb..1c9a7eae 100644
--- a/kscd/kscdmagic/main.cpp
+++ b/kscd/kscdmagic/main.cpp
@@ -197,7 +197,7 @@ main(int argc, char **argv)
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication magicApp;
+  TDEApplication magicApp;
   */
 
 
diff --git a/libkcddb/test/asynccddblookuptest.cpp b/libkcddb/test/asynccddblookuptest.cpp
index 948411f3..10813ffd 100644
--- a/libkcddb/test/asynccddblookuptest.cpp
+++ b/libkcddb/test/asynccddblookuptest.cpp
@@ -103,7 +103,7 @@ int main(int argc, char ** argv)
 {
   TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
 
-  KApplication app(false /* No styles */, false /* No GUI */);
+  TDEApplication app(false /* No styles */, false /* No GUI */);
 
   AsyncCDDBLookupTest test;
 
diff --git a/libkcddb/test/asynchttplookuptest.cpp b/libkcddb/test/asynchttplookuptest.cpp
index 13f83679..60a93efe 100644
--- a/libkcddb/test/asynchttplookuptest.cpp
+++ b/libkcddb/test/asynchttplookuptest.cpp
@@ -101,7 +101,7 @@ int main(int argc, char ** argv)
 {
   TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
 
-  KApplication app(false /* No styles */, false /* No GUI */);
+  TDEApplication app(false /* No styles */, false /* No GUI */);
 
   AsyncHTTPLookupTest a;
 
diff --git a/libkcddb/test/asynchttpsubmittest.cpp b/libkcddb/test/asynchttpsubmittest.cpp
index dc0d9fa7..af24ccfa 100644
--- a/libkcddb/test/asynchttpsubmittest.cpp
+++ b/libkcddb/test/asynchttpsubmittest.cpp
@@ -70,7 +70,7 @@ int main(int argc, char ** argv)
 {
   TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
 
-  KApplication app(false /* No styles */, false /* No GUI */);
+  TDEApplication app(false /* No styles */, false /* No GUI */);
 
   new AsyncHTTPSubmitTest;
 
diff --git a/libkcddb/test/asyncsmtpsubmittest.cpp b/libkcddb/test/asyncsmtpsubmittest.cpp
index 0c7293e6..dae10a87 100644
--- a/libkcddb/test/asyncsmtpsubmittest.cpp
+++ b/libkcddb/test/asyncsmtpsubmittest.cpp
@@ -71,7 +71,7 @@ int main(int argc, char ** argv)
 {
   TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
 
-  KApplication app(false /* No styles */, false /* No GUI */);
+  TDEApplication app(false /* No styles */, false /* No GUI */);
 
   new AsyncSMTPSubmitTest;
 
diff --git a/libkcddb/test/sitestest.cpp b/libkcddb/test/sitestest.cpp
index 8a729295..021dd92d 100644
--- a/libkcddb/test/sitestest.cpp
+++ b/libkcddb/test/sitestest.cpp
@@ -28,7 +28,7 @@ main(int argc, char ** argv)
 {
   TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
 
-  KApplication app(false /* No styles */);
+  TDEApplication app(false /* No styles */);
 
   using namespace KCDDB;
 
diff --git a/libkcddb/test/synccddblookuptest.cpp b/libkcddb/test/synccddblookuptest.cpp
index a92e7084..511ea571 100644
--- a/libkcddb/test/synccddblookuptest.cpp
+++ b/libkcddb/test/synccddblookuptest.cpp
@@ -12,7 +12,7 @@ main(int argc, char ** argv)
 {
   TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
 
-  KApplication app(false /* No styles */, false /* No GUI */);
+  TDEApplication app(false /* No styles */, false /* No GUI */);
 
   using namespace KCDDB;
 
diff --git a/libkcddb/test/synchttplookuptest.cpp b/libkcddb/test/synchttplookuptest.cpp
index cd616a0c..579b40cf 100644
--- a/libkcddb/test/synchttplookuptest.cpp
+++ b/libkcddb/test/synchttplookuptest.cpp
@@ -11,7 +11,7 @@ main(int argc, char ** argv)
 {
   TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
 
-  KApplication app(false /* No styles */);
+  TDEApplication app(false /* No styles */);
 
   using namespace KCDDB;
 
diff --git a/libkcddb/test/synchttpsubmittest.cpp b/libkcddb/test/synchttpsubmittest.cpp
index 2b7b6d0c..c7f1c3a6 100644
--- a/libkcddb/test/synchttpsubmittest.cpp
+++ b/libkcddb/test/synchttpsubmittest.cpp
@@ -30,7 +30,7 @@ main(int argc, char ** argv)
 {
   TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
 
-  KApplication app(false /* No styles */);
+  TDEApplication app(false /* No styles */);
 
   using namespace KCDDB;
 
diff --git a/libkcddb/test/syncsmtpsubmittest.cpp b/libkcddb/test/syncsmtpsubmittest.cpp
index a75e239e..02bda641 100644
--- a/libkcddb/test/syncsmtpsubmittest.cpp
+++ b/libkcddb/test/syncsmtpsubmittest.cpp
@@ -30,7 +30,7 @@ main(int argc, char ** argv)
 {
   TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
 
-  KApplication app(false /* No styles */);
+  TDEApplication app(false /* No styles */);
 
   using namespace KCDDB;
 
diff --git a/libkcddb/test/utf8test.cpp b/libkcddb/test/utf8test.cpp
index 61f6827d..6d7b4f2b 100644
--- a/libkcddb/test/utf8test.cpp
+++ b/libkcddb/test/utf8test.cpp
@@ -11,7 +11,7 @@ main(int argc, char ** argv)
 {
   TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
 
-  KApplication app;
+  TDEApplication app;
 
   using namespace KCDDB;
 
diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp
index 42615a8b..2db96950 100644
--- a/noatun/library/app.cpp
+++ b/noatun/library/app.cpp
@@ -117,7 +117,7 @@ NoatunApp::NoatunApp()
 		{
 			KMessageBox::error(0,i18n("No playlist plugin was found. " \
 				"Please make sure that Noatun was installed correctly."));
-			KApplication::quit();
+			TDEApplication::quit();
 			delete this;
 		}
 		else
@@ -400,7 +400,7 @@ void NoatunApp::preferences()
 
 void NoatunApp::quit()
 {
-	KApplication::quit();
+	TDEApplication::quit();
 }
 
 void NoatunApp::fileOpen()
@@ -487,7 +487,7 @@ void NoatunApp::saveState(TQSessionManager &sm)
 	TQStringList restartCommand = sm.restartCommand();
 	sm.setRestartCommand( restartCommand );
 
-	KApplication::saveState(sm);
+	TDEApplication::saveState(sm);
 }
 
 // Deprecated
diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp
index 143be362..0229f619 100644
--- a/noatun/modules/keyz/keyz.cpp
+++ b/noatun/modules/keyz/keyz.cpp
@@ -147,7 +147,7 @@ void Keyz::slotPrevSection()
 void Keyz::slotCopyTitle()
 {
     if (napp->player()->current())
-        KApplication::kApplication()->clipboard()->setText(napp->player()->current().title());
+        TDEApplication::kApplication()->clipboard()->setText(napp->player()->current().title());
 }
 
 
diff --git a/noatun/modules/splitplaylist/playlist.cpp b/noatun/modules/splitplaylist/playlist.cpp
index a08faa94..e9d8acae 100644
--- a/noatun/modules/splitplaylist/playlist.cpp
+++ b/noatun/modules/splitplaylist/playlist.cpp
@@ -58,7 +58,7 @@ PlaylistItem SplitPlaylist::next(bool play)
 		if (lview->childCount())
 		{
 			SafeListViewItem *slvi = static_cast<SafeListViewItem*>(
-					lview->itemAtIndex(KApplication::random() % lview->childCount())
+					lview->itemAtIndex(TDEApplication::random() % lview->childCount())
 				);
 			nextItem = PlaylistItem(slvi);
 		}