From 2f1044cf6325ef76548375b602a14f8eb56eeb3f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:21:27 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- noatun/library/app.cpp | 6 +++--- noatun/modules/keyz/keyz.cpp | 2 +- noatun/modules/splitplaylist/playlist.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'noatun') 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( - lview->itemAtIndex(KApplication::random() % lview->childCount()) + lview->itemAtIndex(TDEApplication::random() % lview->childCount()) ); nextItem = PlaylistItem(slvi); } -- cgit v1.2.1