diff options
| -rw-r--r-- | acinclude.m4 | 26 | ||||
| -rw-r--r-- | aclocal.m4 | 26 | ||||
| -rw-r--r-- | doc/kaffeine/index.docbook | 2 | ||||
| -rw-r--r-- | kaffeine/src/input/audiobrowser/playlist.cpp | 6 | ||||
| -rw-r--r-- | kaffeine/src/input/dvb/dvbsi.cpp | 4 | ||||
| -rw-r--r-- | kaffeine/src/input/dvb/dvbstream.cpp | 2 | ||||
| -rw-r--r-- | kaffeine/src/kaffeine.cpp | 4 | ||||
| -rw-r--r-- | kaffeine/src/player-parts/xine-part/xine_part.cpp | 4 |
8 files changed, 37 insertions, 37 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 151ccd1..d692af8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext <<EOF #include <kapp.h> int main() { - printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); - printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); - printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); - printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); - printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); - printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); - printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); - printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); - printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); - printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); + printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data()); + printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data()); + printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data()); + printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data()); + printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data()); + printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data()); + printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data()); + printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data()); + printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data()); + printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data()); printf("kde_wallpaperdir=\\"%s\\"\n", - KApplication::kde_wallpaperdir().data()); - printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); + TDEApplication::kde_wallpaperdir().data()); + printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data()); + printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data()); printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n"); @@ -1991,20 +1991,20 @@ cat > conftest.$ac_ext <<EOF #include <kapp.h> int main() { - printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); - printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); - printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); - printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); - printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); - printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); - printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); - printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); - printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); - printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); + printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data()); + printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data()); + printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data()); + printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data()); + printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data()); + printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data()); + printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data()); + printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data()); + printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data()); + printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data()); printf("kde_wallpaperdir=\\"%s\\"\n", - KApplication::kde_wallpaperdir().data()); - printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); + TDEApplication::kde_wallpaperdir().data()); + printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data()); + printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data()); printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n"); diff --git a/doc/kaffeine/index.docbook b/doc/kaffeine/index.docbook index 5a9cf7c..f8bee2e 100644 --- a/doc/kaffeine/index.docbook +++ b/doc/kaffeine/index.docbook @@ -497,7 +497,7 @@ http://gstreamer.freedesktop.org</ulink> <sect1 id="dcop-overview"> <title>Overview</title> -<para>You can use the DCOP interface in two kinds: From inside another application with <function>KApplication::dcopClient()->send( "kaffeine", "KaffeineIface", "pause()" )</function> +<para>You can use the DCOP interface in two kinds: From inside another application with <function>TDEApplication::dcopClient()->send( "kaffeine", "KaffeineIface", "pause()" )</function> or from command line with <command>dcop kaffeine KaffeineIface openURL best_song_of_the_world.mp3</command>. </para> </sect1> diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp index c48cf28..0a3b103 100644 --- a/kaffeine/src/input/audiobrowser/playlist.cpp +++ b/kaffeine/src/input/audiobrowser/playlist.cpp @@ -219,7 +219,7 @@ void CoverFrame::setCoverPixmap( const TQString &path ) void CoverFrame::popup( const TQPixmap &pix ) const { TQPoint mouse = TQCursor::pos(); - TQRect desktop = KApplication::desktop()->screenGeometry(mouse); + TQRect desktop = TDEApplication::desktop()->screenGeometry(mouse); int x = mouse.x(); int y = mouse.y(); int height = pix.height() + 4; @@ -1344,7 +1344,7 @@ void PlayList::add(const TQStringList& urlList, TQListViewItem* after) break; progress->progressBar()->setProgress(i+1); progress->setLabel(TQString::number(i+1) + " / " + TQString::number(progress->progressBar()->totalSteps()) + " " + i18n("Files")); - KApplication::kApplication()->processEvents(); + TDEApplication::kApplication()->processEvents(); } delete progress; @@ -1403,7 +1403,7 @@ void PlayList::createRandomList() return; } - KRandomSequence r(KApplication::random()); + KRandomSequence r(TDEApplication::random()); r.randomize(&m_randomList); } diff --git a/kaffeine/src/input/dvb/dvbsi.cpp b/kaffeine/src/input/dvb/dvbsi.cpp index 7fd8669..414c53a 100644 --- a/kaffeine/src/input/dvb/dvbsi.cpp +++ b/kaffeine/src/input/dvb/dvbsi.cpp @@ -931,7 +931,7 @@ void DVBsi::out( bool stopscan ) } if ( stopscan ) dvb->stopScan(); - KApplication::kApplication()->postEvent( this, new TQTimerEvent( TIMER_EVENT_SCAN_END ) ); + TDEApplication::kApplication()->postEvent( this, new TQTimerEvent( TIMER_EVENT_SCAN_END ) ); } @@ -1107,7 +1107,7 @@ void DVBsi::run() fprintf(stderr,"dvbsi: The end :)\n"); isRunning = false; listChannels(); - KApplication::kApplication()->postEvent( this, new TQTimerEvent( TIMER_EVENT_SCAN_END ) ); + TDEApplication::kApplication()->postEvent( this, new TQTimerEvent( TIMER_EVENT_SCAN_END ) ); } diff --git a/kaffeine/src/input/dvb/dvbstream.cpp b/kaffeine/src/input/dvb/dvbstream.cpp index be8ae7d..180ba82 100644 --- a/kaffeine/src/input/dvb/dvbstream.cpp +++ b/kaffeine/src/input/dvb/dvbstream.cpp @@ -1029,7 +1029,7 @@ bool DvbStream::running() const void DvbStream::receivePlayDvb() { - KApplication::kApplication()->postEvent( this, new TQTimerEvent( 500 ) ); + TDEApplication::kApplication()->postEvent( this, new TQTimerEvent( 500 ) ); } diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp index 8edd3a6..e12b24c 100644 --- a/kaffeine/src/kaffeine.cpp +++ b/kaffeine/src/kaffeine.cpp @@ -240,7 +240,7 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"), /** TWin are you there? **/ - m_haveKWin = KApplication::dcopClient()->isApplicationRegistered("twin"); + m_haveKWin = TDEApplication::dcopClient()->isApplicationRegistered("twin"); if (m_haveKWin) kdDebug() << "Window manager: TWin found" << endl; else @@ -1523,7 +1523,7 @@ void Kaffeine::slotQuit() m_systemTray = NULL; }*/ - KApplication::exit(0); + TDEApplication::exit(0); } void Kaffeine::closeEvent(TQCloseEvent* e) 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); |