diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 23:54:17 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 23:54:17 -0600 |
commit | 6c5727bbf4a52d254bd2013e2cfd0034f8618ed5 (patch) | |
tree | f3a4846ca7bb745824c78211390a9f56d4838105 /kaffeine/src/player-parts | |
parent | fbfe699023a0839506892a8447b3f128eca37cc8 (diff) | |
download | kaffeine-6c5727bbf4a52d254bd2013e2cfd0034f8618ed5.tar.gz kaffeine-6c5727bbf4a52d254bd2013e2cfd0034f8618ed5.zip |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kaffeine/src/player-parts')
-rw-r--r-- | kaffeine/src/player-parts/xine-part/xine_part.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp index 9fc18e6..45a1f07 100644 --- a/kaffeine/src/player-parts/xine-part/xine_part.cpp +++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp @@ -1293,7 +1293,7 @@ void XinePart::slotFinalize() void XinePart::slotCopyToClipboard() { kdDebug() << "XinePart: Send URL to klipper: " << m_mrl.url() << endl; - DCOPClient* client = KApplication::dcopClient(); + DCOPClient* client = TDEApplication::dcopClient(); if (!client->send("klipper", "klipper", "setClipboardContents(TQString)", m_mrl.url())) kdError() << "Can't send current URL to klipper" << endl; } @@ -1658,7 +1658,7 @@ void XinePart::audiocdMRLS(MRL::List& mrls, bool& ok, bool& supported, const TQS if (progress->wasCancelled()) break; progress->progressBar()->setProgress(i+1); - KApplication::kApplication()->processEvents(); + TDEApplication::kApplication()->processEvents(); } xine_dispose(xineStreamForMeta); |