summaryrefslogtreecommitdiffstats
path: root/noatun
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:21:27 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:21:27 -0600
commit2f1044cf6325ef76548375b602a14f8eb56eeb3f (patch)
treea5c4773d5bcb1e35ca3717dc96ba5cfcfac1b5f2 /noatun
parent58646ccdcdc8ee08b081edba54e1460ff3295166 (diff)
downloadtdemultimedia-2f1044cf6325ef76548375b602a14f8eb56eeb3f.tar.gz
tdemultimedia-2f1044cf6325ef76548375b602a14f8eb56eeb3f.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'noatun')
-rw-r--r--noatun/library/app.cpp6
-rw-r--r--noatun/modules/keyz/keyz.cpp2
-rw-r--r--noatun/modules/splitplaylist/playlist.cpp2
3 files changed, 5 insertions, 5 deletions
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);
}