summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kaffeine/src/input/audiobrowser/googlefetcher.cpp2
-rw-r--r--kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp2
-rw-r--r--kaffeine/src/input/audiobrowser/playlist.cpp4
-rw-r--r--kaffeine/src/input/dvb/dvbsi.cpp4
-rw-r--r--kaffeine/src/input/dvb/dvbstream.cpp2
-rw-r--r--kaffeine/src/kaffeine.cpp14
-rw-r--r--kaffeine/src/player-parts/xine-part/xine_part.cpp2
7 files changed, 15 insertions, 15 deletions
diff --git a/kaffeine/src/input/audiobrowser/googlefetcher.cpp b/kaffeine/src/input/audiobrowser/googlefetcher.cpp
index 1497642..243398c 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcher.cpp
+++ b/kaffeine/src/input/audiobrowser/googlefetcher.cpp
@@ -249,7 +249,7 @@ TQPixmap GoogleFetcher::pixmap( bool forceFetch )
void GoogleFetcher::displayWaitMessage()
{
- //KStatusBar *statusBar = static_cast<TDEMainWindow *>(kapp->mainWidget())->statusBar();
+ //KStatusBar *statusBar = static_cast<TDEMainWindow *>(tdeApp->mainWidget())->statusBar();
//statusBar->message(i18n("Searching for Images. Please Wait..."));
slotLoadImageURLs();
//statusBar->clear();*/
diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
index 38561a1..d1c3bca 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
+++ b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
@@ -228,7 +228,7 @@ CoverIconViewItem::~CoverIconViewItem()
// Drain results issued by TDEIO before being deleted,
// and before deleting the job.
- kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
+ tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
delete m_job;
}
diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp
index 1bd3ce8..befd0e7 100644
--- a/kaffeine/src/input/audiobrowser/playlist.cpp
+++ b/kaffeine/src/input/audiobrowser/playlist.cpp
@@ -364,7 +364,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
m_list->setColumnWidthMode(TRACK_COLUMN, TQListView::Manual);
m_list->setColumnWidthMode(LENGTH_COLUMN, TQListView::Manual);
m_list->setResizeMode(TQListView::NoColumn);
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
m_list->restoreLayout(config, "Playlist Layout");
m_list->setFullWidth(true);
m_list->setSorting(-1);
@@ -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"));
- TDEApplication::kApplication()->processEvents();
+ tdeApp->processEvents();
}
delete progress;
diff --git a/kaffeine/src/input/dvb/dvbsi.cpp b/kaffeine/src/input/dvb/dvbsi.cpp
index 75ca94f..24cef8a 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();
- TDEApplication::kApplication()->postEvent( this, new TQTimerEvent( TIMER_EVENT_SCAN_END ) );
+ tdeApp->postEvent( this, new TQTimerEvent( TIMER_EVENT_SCAN_END ) );
}
@@ -1107,7 +1107,7 @@ void DVBsi::run()
fprintf(stderr,"dvbsi: The end :)\n");
isRunning = false;
listChannels();
- TDEApplication::kApplication()->postEvent( this, new TQTimerEvent( TIMER_EVENT_SCAN_END ) );
+ tdeApp->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 b0832e9..547988b 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()
{
- TDEApplication::kApplication()->postEvent( this, new TQTimerEvent( 500 ) );
+ tdeApp->postEvent( this, new TQTimerEvent( 500 ) );
}
diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp
index 45eefe3..778d449 100644
--- a/kaffeine/src/kaffeine.cpp
+++ b/kaffeine/src/kaffeine.cpp
@@ -344,7 +344,7 @@ void Kaffeine::unloadCurrentPart()
{
kdDebug() << "Kaffeine: Unloading player part: " << m_currentPartService << endl;
if (m_mediaPart) {
- saveMainWindowSettings(kapp->config(), "Main Window"); // save toolbar state etc.
+ saveMainWindowSettings(tdeApp->config(), "Main Window"); // save toolbar state etc.
guiFactory()->removeClient(m_mediaPart);
}
KService::Ptr service = KService::serviceByDesktopName(m_currentPartService);
@@ -438,7 +438,7 @@ void Kaffeine::slotLoadPart(const TQString& desktopName)
//statusBar()->changeItem(playerName, 10);
//slotChangeStatusbar(m_mediaPart->instance()->aboutData()->shortDescription());
guiFactory()->addClient(m_mediaPart);
- applyMainWindowSettings(kapp->config(), "Main Window"); //restore toolbar state
+ applyMainWindowSettings(tdeApp->config(), "Main Window"); //restore toolbar state
stateChanged("no_media_part", StateReverse);
if (isPlaying)
slotPlaylistPlay();
@@ -754,7 +754,7 @@ void Kaffeine::slotDVBNextBack(int dir)
void Kaffeine::loadConfig()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
bool b;
config->setGroup("General Options");
@@ -821,7 +821,7 @@ void Kaffeine::loadConfig()
void Kaffeine::saveConfig()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
if (!m_fullscreen->isChecked())
{
@@ -1526,14 +1526,14 @@ void Kaffeine::slotQuit()
m_systemTray = NULL;
}*/
- if ( !kapp->sessionSaving() ) {
+ if ( !tdeApp->sessionSaving() ) {
TDEApplication::exit(0);
}
}
void Kaffeine::closeEvent(TQCloseEvent* e)
{
- if (m_systemTray && !kapp->sessionSaving())
+ if (m_systemTray && !tdeApp->sessionSaving())
{
//KMessageBox::information(this, i18n("Closing the main window will keep Kaffeine running in the system tray. Use Quit from the File menu to quit the application."), TQString(), "system_tray_info");
hide();
@@ -1542,7 +1542,7 @@ void Kaffeine::closeEvent(TQCloseEvent* e)
else
{
slotQuit();
- if (kapp->sessionSaving())
+ if (tdeApp->sessionSaving())
e->accept();
else
e->ignore();
diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp
index 732c77d..a5268d9 100644
--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp
+++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp
@@ -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);
- TDEApplication::kApplication()->processEvents();
+ tdeApp->processEvents();
}
xine_dispose(xineStreamForMeta);
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-17 21:55:20 +0000