TDE
/
kaffeine
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kaffeine
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KApplication to TDEApplication to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent fbfe699023
commit 6c5727bbf4
8 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File

26
acinclude.m4
Unescape View File

@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");

26
aclocal.m4 vendored
Unescape View File

@ -1991,20 +1991,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");

2
doc/kaffeine/index.docbook
Unescape View File

@ -497,7 +497,7 @@ http://gstreamer.freedesktop.org</ulink>
<sect1 id="dcop-overview"> <sect1 id="dcop-overview">
<title>Overview</title> <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>. or from command line with <command>dcop kaffeine KaffeineIface openURL best_song_of_the_world.mp3</command>.
</para> </para>
</sect1> </sect1>

6
kaffeine/src/input/audiobrowser/playlist.cpp
Unescape View File

@ -219,7 +219,7 @@ void CoverFrame::setCoverPixmap( const TQString &path )
void CoverFrame::popup( const TQPixmap &pix ) const void CoverFrame::popup( const TQPixmap &pix ) const
{ {
TQPoint mouse = TQCursor::pos(); TQPoint mouse = TQCursor::pos();
TQRect desktop = KApplication::desktop()->screenGeometry(mouse); TQRect desktop = TDEApplication::desktop()->screenGeometry(mouse);
int x = mouse.x(); int x = mouse.x();
int y = mouse.y(); int y = mouse.y();
int height = pix.height() + 4; int height = pix.height() + 4;
@ -1344,7 +1344,7 @@ void PlayList::add(const TQStringList& urlList, TQListViewItem* after)
break; break;
progress->progressBar()->setProgress(i+1); progress->progressBar()->setProgress(i+1);
progress->setLabel(TQString::number(i+1) + " / " + TQString::number(progress->progressBar()->totalSteps()) + " " + i18n("Files")); progress->setLabel(TQString::number(i+1) + " / " + TQString::number(progress->progressBar()->totalSteps()) + " " + i18n("Files"));
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
} }
delete progress; delete progress;
@ -1403,7 +1403,7 @@ void PlayList::createRandomList()
return; return;
} }
KRandomSequence r(KApplication::random()); KRandomSequence r(TDEApplication::random());
r.randomize(&m_randomList); r.randomize(&m_randomList);
} }

4
kaffeine/src/input/dvb/dvbsi.cpp
Unescape View File

@ -931,7 +931,7 @@ void DVBsi::out( bool stopscan )
} }
if ( stopscan ) if ( stopscan )
dvb->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"); fprintf(stderr,"dvbsi: The end :)\n");
isRunning = false; isRunning = false;
listChannels(); listChannels();
KApplication::kApplication()->postEvent( this, new TQTimerEvent( TIMER_EVENT_SCAN_END ) ); TDEApplication::kApplication()->postEvent( this, new TQTimerEvent( TIMER_EVENT_SCAN_END ) );
} }

2
kaffeine/src/input/dvb/dvbstream.cpp
Unescape View File

@ -1029,7 +1029,7 @@ bool DvbStream::running() const
void DvbStream::receivePlayDvb() void DvbStream::receivePlayDvb()
{ {
KApplication::kApplication()->postEvent( this, new TQTimerEvent( 500 ) ); TDEApplication::kApplication()->postEvent( this, new TQTimerEvent( 500 ) );
} }

4
kaffeine/src/kaffeine.cpp
Unescape View File

@ -240,7 +240,7 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
/** TWin are you there? **/ /** TWin are you there? **/
m_haveKWin = KApplication::dcopClient()->isApplicationRegistered("twin"); m_haveKWin = TDEApplication::dcopClient()->isApplicationRegistered("twin");
if (m_haveKWin) if (m_haveKWin)
kdDebug() << "Window manager: TWin found" << endl; kdDebug() << "Window manager: TWin found" << endl;
else else
@ -1523,7 +1523,7 @@ void Kaffeine::slotQuit()
m_systemTray = NULL; m_systemTray = NULL;
}*/ }*/
KApplication::exit(0); TDEApplication::exit(0);
} }
void Kaffeine::closeEvent(TQCloseEvent* e) void Kaffeine::closeEvent(TQCloseEvent* e)

4
kaffeine/src/player-parts/xine-part/xine_part.cpp
Unescape View File

@ -1293,7 +1293,7 @@ void XinePart::slotFinalize()
void XinePart::slotCopyToClipboard() void XinePart::slotCopyToClipboard()
{ {
kdDebug() << "XinePart: Send URL to klipper: " << m_mrl.url() << endl; 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())) if (!client->send("klipper", "klipper", "setClipboardContents(TQString)", m_mrl.url()))
kdError() << "Can't send current URL to klipper" << endl; 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()) if (progress->wasCancelled())
break; break;
progress->progressBar()->setProgress(i+1); progress->progressBar()->setProgress(i+1);
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
} }
xine_dispose(xineStreamForMeta); xine_dispose(xineStreamForMeta);

Write Preview
Loading…
Cancel
Save