diff options
Diffstat (limited to 'juk')
-rw-r--r-- | juk/collectionlist.h | 2 | ||||
-rw-r--r-- | juk/coverdialog.cpp | 2 | ||||
-rw-r--r-- | juk/gstreamerplayer.cpp | 8 | ||||
-rw-r--r-- | juk/juk.cpp | 20 | ||||
-rw-r--r-- | juk/musicbrainzquery.cpp | 2 | ||||
-rw-r--r-- | juk/playlist.cpp | 8 | ||||
-rw-r--r-- | juk/playlistbox.cpp | 2 | ||||
-rw-r--r-- | juk/playlistcollection.cpp | 4 | ||||
-rw-r--r-- | juk/splashscreen.cpp | 2 | ||||
-rw-r--r-- | juk/tageditor.cpp | 2 | ||||
-rw-r--r-- | juk/tagguesser.cpp | 2 | ||||
-rw-r--r-- | juk/tagtransactionmanager.cpp | 2 | ||||
-rw-r--r-- | juk/webimagefetcher.cpp | 2 | ||||
-rw-r--r-- | juk/webimagefetcherdialog.cpp | 2 |
14 files changed, 30 insertions, 30 deletions
diff --git a/juk/collectionlist.h b/juk/collectionlist.h index d01463ac..e3cda375 100644 --- a/juk/collectionlist.h +++ b/juk/collectionlist.h @@ -96,7 +96,7 @@ public: virtual bool canReload() const { return true; } public slots: - virtual void paste() { decode(kapp->clipboard()->data()); } + virtual void paste() { decode(tdeApp->clipboard()->data()); } virtual void clear(); void slotCheckCache(); diff --git a/juk/coverdialog.cpp b/juk/coverdialog.cpp index fc4fa7ed..fa152697 100644 --- a/juk/coverdialog.cpp +++ b/juk/coverdialog.cpp @@ -106,7 +106,7 @@ void CoverDialog::loadCovers() if(++i == 10) { i = 0; - kapp->processEvents(); + tdeApp->processEvents(); } } } diff --git a/juk/gstreamerplayer.cpp b/juk/gstreamerplayer.cpp index 464e7486..74f8603b 100644 --- a/juk/gstreamerplayer.cpp +++ b/juk/gstreamerplayer.cpp @@ -149,8 +149,8 @@ void GStreamerPlayer::setupPipeline() { static bool initialized = false; if(!initialized) { - int argc = kapp->argc(); - char **argv = kapp->argv(); + int argc = tdeApp->argc(); + char **argv = tdeApp->argv(); gst_init(&argc, &argv); initialized = true; } @@ -299,8 +299,8 @@ void GStreamerPlayer::setupPipeline() { static bool initialized = false; if(!initialized) { - int argc = kapp->argc(); - char **argv = kapp->argv(); + int argc = tdeApp->argc(); + char **argv = tdeApp->argv(); gst_init(&argc, &argv); initialized = true; } diff --git a/juk/juk.cpp b/juk/juk.cpp index ad35266c..fd987501 100644 --- a/juk/juk.cpp +++ b/juk/juk.cpp @@ -54,7 +54,7 @@ JuK::JuK(TQWidget *parent, const char *name) : if(m_showSplash && !m_startDocked && Cache::cacheFileExists()) { SplashScreen::instance()->show(); - kapp->processEvents(); + tdeApp->processEvents(); } setupActions(); @@ -114,13 +114,13 @@ void JuK::setupActions() KStdAction::quit(this, TQ_SLOT(slotQuit()), ActionCollection::actions()); KStdAction::undo(this, TQ_SLOT(slotUndo()), ActionCollection::actions()); - KStdAction::cut(kapp, TQ_SLOT(cut()), ActionCollection::actions()); - KStdAction::copy(kapp, TQ_SLOT(copy()), ActionCollection::actions()); - KStdAction::paste(kapp, TQ_SLOT(paste()), ActionCollection::actions()); - KStdAction::clear(kapp, TQ_SLOT(clear()), ActionCollection::actions()); - KStdAction::selectAll(kapp, TQ_SLOT(selectAll()), ActionCollection::actions()); + KStdAction::cut(tdeApp, TQ_SLOT(cut()), ActionCollection::actions()); + KStdAction::copy(tdeApp, TQ_SLOT(copy()), ActionCollection::actions()); + KStdAction::paste(tdeApp, TQ_SLOT(paste()), ActionCollection::actions()); + KStdAction::clear(tdeApp, TQ_SLOT(clear()), ActionCollection::actions()); + KStdAction::selectAll(tdeApp, TQ_SLOT(selectAll()), ActionCollection::actions()); - new TDEAction(i18n("Remove From Playlist"), "edit_remove", 0, kapp, TQ_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist"); + new TDEAction(i18n("Remove From Playlist"), "edit_remove", 0, tdeApp, TQ_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist"); TDEActionMenu *actionMenu = new TDEActionMenu(i18n("&Random Play"), "roll", ActionCollection::actions(), "actionMenu"); actionMenu->setDelayed(false); @@ -257,7 +257,7 @@ void JuK::slotProcessArgs() void JuK::createDirs() { - TQDir dir(TDEGlobal::dirs()->saveLocation("data", kapp->instanceName() + '/')); + TQDir dir(TDEGlobal::dirs()->saveLocation("data", tdeApp->instanceName() + '/')); if (!dir.exists("covers", false)) dir.mkdir("covers", false); dir.cd("covers"); @@ -391,7 +391,7 @@ bool JuK::queryClose() kdDebug(65432) << k_funcinfo << endl; if(!m_shuttingDown && - !kapp->sessionSaving() && + !tdeApp->sessionSaving() && m_systemTray && m_toggleDockOnCloseAction->isChecked()) { @@ -425,7 +425,7 @@ void JuK::slotQuit() kdDebug(65432) << k_funcinfo << endl; m_shuttingDown = true; - kapp->quit(); + tdeApp->quit(); } //////////////////////////////////////////////////////////////////////////////// diff --git a/juk/musicbrainzquery.cpp b/juk/musicbrainzquery.cpp index f1042930..2e449f86 100644 --- a/juk/musicbrainzquery.cpp +++ b/juk/musicbrainzquery.cpp @@ -67,7 +67,7 @@ void MusicBrainzLookup::error() void MusicBrainzLookup::message(const TQString &s) const { - TDEMainWindow *w = static_cast<TDEMainWindow *>(kapp->mainWidget()); + TDEMainWindow *w = static_cast<TDEMainWindow *>(tdeApp->mainWidget()); w->statusBar()->message(TQString("%1 (%2)").arg(s).arg(m_file.fileInfo().fileName()), 3000); } diff --git a/juk/playlist.cpp b/juk/playlist.cpp index 2895542d..784db887 100644 --- a/juk/playlist.cpp +++ b/juk/playlist.cpp @@ -729,12 +729,12 @@ void Playlist::synchronizePlayingItems(const PlaylistList &sources, bool setMast void Playlist::copy() { - kapp->clipboard()->setData(dragObject(0), TQClipboard::Clipboard); + tdeApp->clipboard()->setData(dragObject(0), TQClipboard::Clipboard); } void Playlist::paste() { - decode(kapp->clipboard()->data(), static_cast<PlaylistItem *>(currentItem())); + decode(tdeApp->clipboard()->data(), static_cast<PlaylistItem *>(currentItem())); } void Playlist::clear() @@ -1727,7 +1727,7 @@ void Playlist::setPlaying(PlaylistItem *item, bool addToHistory) TrackSequenceManager::instance()->setCurrent(item); TQByteArray data; - kapp->dcopClient()->emitDCOPSignal("Player", "trackChanged()", data); + tdeApp->dcopClient()->emitDCOPSignal("Player", "trackChanged()", data); if(!item) return; @@ -2354,7 +2354,7 @@ bool processEvents() if(time.elapsed() > 100) { time.restart(); - kapp->processEvents(); + tdeApp->processEvents(); return true; } return false; diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp index a8a09018..a9614ea3 100644 --- a/juk/playlistbox.cpp +++ b/juk/playlistbox.cpp @@ -208,7 +208,7 @@ void PlaylistBox::duplicate() void PlaylistBox::paste() { Item *i = static_cast<Item *>(currentItem()); - decode(kapp->clipboard()->data(), i); + decode(tdeApp->clipboard()->data(), i); } //////////////////////////////////////////////////////////////////////////////// diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp index 1d96e025..ab7b2659 100644 --- a/juk/playlistcollection.cpp +++ b/juk/playlistcollection.cpp @@ -44,7 +44,7 @@ #include <tqwidgetstack.h> #include <tqhbox.h> -#define widget (kapp->mainWidget()) +#define widget (tdeApp->mainWidget()) using namespace ActionCollection; @@ -582,7 +582,7 @@ void PlaylistCollection::setUpcomingPlaylistEnabled(bool enable) m_upcomingPlaylist = 0; if(raiseCollection) { - kapp->processEvents(); // Seems to stop a crash, weird. + tdeApp->processEvents(); // Seems to stop a crash, weird. raise(CollectionList::instance()); } } diff --git a/juk/splashscreen.cpp b/juk/splashscreen.cpp index ae72f05b..92775471 100644 --- a/juk/splashscreen.cpp +++ b/juk/splashscreen.cpp @@ -100,5 +100,5 @@ SplashScreen::~SplashScreen() void SplashScreen::processEvents() { setText(loadedText(count)); - kapp->processEvents(); + tdeApp->processEvents(); } diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp index ed1cdca8..e4bbfffc 100644 --- a/juk/tageditor.cpp +++ b/juk/tageditor.cpp @@ -636,7 +636,7 @@ void TagEditor::save(const PlaylistItemList &list) // playlists will try to modify the file we edit if the tag changes // due to our alterations here. - kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); + tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); PlaylistItem *item = *it; diff --git a/juk/tagguesser.cpp b/juk/tagguesser.cpp index 146f2ecb..3fe3db7f 100644 --- a/juk/tagguesser.cpp +++ b/juk/tagguesser.cpp @@ -150,7 +150,7 @@ TQStringList TagGuesser::schemeStrings() void TagGuesser::setSchemeStrings(const TQStringList &schemes) { - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); { TDEConfigGroupSaver saver(cfg, "TagGuesser"); cfg->writeEntry("Filename schemes", schemes); diff --git a/juk/tagtransactionmanager.cpp b/juk/tagtransactionmanager.cpp index 2c66f120..ee1bd7ca 100644 --- a/juk/tagtransactionmanager.cpp +++ b/juk/tagtransactionmanager.cpp @@ -190,7 +190,7 @@ bool TagTransactionManager::processChangeList(bool undo) errorItems.append(str); } - kapp->processEvents(); + tdeApp->processEvents(); } undo ? m_undoList.clear() : m_list.clear(); diff --git a/juk/webimagefetcher.cpp b/juk/webimagefetcher.cpp index 368832d1..024169bb 100644 --- a/juk/webimagefetcher.cpp +++ b/juk/webimagefetcher.cpp @@ -201,7 +201,7 @@ void WebImageFetcher::slotNewSearch() void WebImageFetcher::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/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp index c7abdf1a..535177cf 100644 --- a/juk/webimagefetcherdialog.cpp +++ b/juk/webimagefetcherdialog.cpp @@ -209,7 +209,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; } |