diff options
55 files changed, 170 insertions, 170 deletions
diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp index fec40c03..e4fcb07c 100644 --- a/arts/builder/execdlg.cpp +++ b/arts/builder/execdlg.cpp @@ -196,6 +196,6 @@ void ExecDlg::saveSession() void ExecDlg::help() { - TDEApplication::kApplication()->invokeHelp("", "karts"); + tdeApp->invokeHelp("", "karts"); } #include "execdlg.moc" diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp index 936a0697..c036887b 100644 --- a/arts/builder/interfacedlg.cpp +++ b/arts/builder/interfacedlg.cpp @@ -172,7 +172,7 @@ void InterfaceDlg::update() void InterfaceDlg::help() { - TDEApplication::kApplication()->invokeHelp("", "karts"); + tdeApp->invokeHelp("", "karts"); } #include "interfacedlg.moc" diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp index bba94fca..cf0a5336 100644 --- a/arts/builder/main.cpp +++ b/arts/builder/main.cpp @@ -263,7 +263,7 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name) connect(m_modules_instruments, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int))); connect(m_modules_other, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int))); */ - connect(kapp, TQ_SIGNAL(lastWindowClosed()), this , TQ_SLOT(quit())); + connect(tdeApp, TQ_SIGNAL(lastWindowClosed()), this , TQ_SLOT(quit())); // update the modules menu once for the start #endif @@ -422,7 +422,7 @@ void ArtsBuilderWindow::quit() { if(execDlg) return; arts_debug(">> ArtsBuilderWindow::quit() called"); - kapp->quit(); + tdeApp->quit(); arts_debug("<< leaving ArtsBuilderWindow::quit()"); } diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp index 246f972c..914be3c3 100644 --- a/arts/builder/portposdlg.cpp +++ b/arts/builder/portposdlg.cpp @@ -252,7 +252,7 @@ void PortPosDlg::update() void PortPosDlg::help() { - TDEApplication::kApplication()->invokeHelp("", "karts"); + tdeApp->invokeHelp("", "karts"); } #include "portposdlg.moc" diff --git a/arts/builder/propertypanel.cpp b/arts/builder/propertypanel.cpp index 209fe7e4..ad1a3fe0 100644 --- a/arts/builder/propertypanel.cpp +++ b/arts/builder/propertypanel.cpp @@ -43,9 +43,9 @@ PropertyPanel::PropertyPanel( TQWidget* parent, const char* name, WFlags fl ) { setTitleFont(); setTitleColors(); - connect( kapp, TQ_SIGNAL( tdedisplayFontChanged() ), + connect( tdeApp, TQ_SIGNAL( tdedisplayFontChanged() ), this, TQ_SLOT( setTitleFont() )); - connect( kapp, TQ_SIGNAL( tdedisplayPaletteChanged() ), + connect( tdeApp, TQ_SIGNAL( tdedisplayPaletteChanged() ), this, TQ_SLOT( setTitleColors() )); connect( portValueGroup, TQ_SIGNAL( clicked(int) ), this, TQ_SLOT( pvModeChanged(int) )); diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp index 9f6e4107..c912691a 100644 --- a/arts/builder/retrievedlg.cpp +++ b/arts/builder/retrievedlg.cpp @@ -132,6 +132,6 @@ TQString RetrieveDlg::result() void RetrieveDlg::help() { - TDEApplication::kApplication()->invokeHelp("", "karts"); + tdeApp->invokeHelp("", "karts"); } #include "retrievedlg.moc" diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp index e3a533a7..f611a205 100644 --- a/arts/tools/choosebusdlg.cpp +++ b/arts/tools/choosebusdlg.cpp @@ -155,7 +155,7 @@ TQString ChooseBusDlg::result() void ChooseBusDlg::help() { - TDEApplication::kApplication()->invokeHelp("", "artsbuilder"); + tdeApp->invokeHelp("", "artsbuilder"); } void ChooseBusDlg::textChanged( const TQString & busname ) diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp index f07a7b8f..126b34d2 100644 --- a/arts/tools/midiinstdlg.cpp +++ b/arts/tools/midiinstdlg.cpp @@ -173,7 +173,7 @@ TQCString MidiInstDlg::filename() void MidiInstDlg::help() { - TDEApplication::kApplication()->invokeHelp("", "artsbuilder"); + tdeApp->invokeHelp("", "artsbuilder"); } #include "midiinstdlg.moc" diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp index 5c20e2bf..370d7999 100644 --- a/arts/tools/midiportdlg.cpp +++ b/arts/tools/midiportdlg.cpp @@ -105,7 +105,7 @@ const char *MidiPortDlg::device() void MidiPortDlg::help() { - TDEApplication::kApplication()->invokeHelp("", "artsbuilder"); + tdeApp->invokeHelp("", "artsbuilder"); } #include "midiportdlg.moc" 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; } diff --git a/kaboodle/userinterface.cpp b/kaboodle/userinterface.cpp index 45edc4a4..d9d2c3f4 100644 --- a/kaboodle/userinterface.cpp +++ b/kaboodle/userinterface.cpp @@ -55,7 +55,7 @@ Kaboodle::UserInterface::UserInterface(TQWidget *parent, const KURL &initialFile setStandardToolBarMenuEnabled(true); KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); KStdAction::preferences(this, TQ_SLOT(playerPreferences()), actionCollection()); KStdAction::keyBindings( this, TQ_SLOT( slotConfigureKeys() ), actionCollection() ); diff --git a/kaboodle/view.cpp b/kaboodle/view.cpp index 3a16135c..ccb36cfa 100644 --- a/kaboodle/view.cpp +++ b/kaboodle/view.cpp @@ -174,7 +174,7 @@ void Kaboodle::View::stateChanged(int s) void Kaboodle::View::playerFinished() { - if(quitAfterPlaying) kapp->quit(); + if(quitAfterPlaying) tdeApp->quit(); } void Kaboodle::View::playerTimeout() diff --git a/kmix/dialogselectmaster.cpp b/kmix/dialogselectmaster.cpp index abeca6e4..34ad8acd 100644 --- a/kmix/dialogselectmaster.cpp +++ b/kmix/dialogselectmaster.cpp @@ -102,8 +102,8 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer) void DialogSelectMaster::show(Mixer *curr_mixer) { - kapp->config()->setGroup(0); - bool useDefaultMaster = kapp->config()->readBoolEntry("UseDefaultMaster", true); + tdeApp->config()->setGroup(0); + bool useDefaultMaster = tdeApp->config()->readBoolEntry("UseDefaultMaster", true); if (useDefaultMaster) { m_defaultMaster->setChecked(true); diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp index 8db11212..b6a7ea4c 100644 --- a/kmix/kmix.cpp +++ b/kmix/kmix.cpp @@ -97,7 +97,7 @@ KMixWindow::KMixWindow() { hide(); } - connect( kapp, TQ_SIGNAL( aboutToQuit()), TQ_SLOT( saveSettings()) ); + connect( tdeApp, TQ_SIGNAL( aboutToQuit()), TQ_SLOT( saveSettings()) ); } @@ -255,7 +255,7 @@ KMixWindow::loadConfig() if (a) a->setChecked( KMixSettings::menubar() ); // restore window size and position - if ( !kapp->isRestored() ) // done by the session manager otherwise + if ( !tdeApp->isRestored() ) // done by the session manager otherwise { TQSize size = KMixSettings::size(); if(!size.isEmpty()) @@ -333,7 +333,7 @@ KMixWindow::initMixerWidgets() bool KMixWindow::queryClose ( ) { - if ( KMixSettings::allowDocking() && !kapp->sessionSaving() ) + if ( KMixSettings::allowDocking() && !tdeApp->sessionSaving() ) { hide(); return false; @@ -345,7 +345,7 @@ KMixWindow::queryClose ( ) void KMixWindow::quit() { - kapp->quit(); + tdeApp->quit(); } @@ -449,7 +449,7 @@ KMixWindow::applyPrefs() this->setUpdatesEnabled(true); this->repaint(); // make KMix look fast (saveConfig() often uses several seconds) - kapp->processEvents(); + tdeApp->processEvents(); saveConfig(); } diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp index fba30421..c756ef7f 100644 --- a/kmix/kmixdockwidget.cpp +++ b/kmix/kmixdockwidget.cpp @@ -73,7 +73,7 @@ KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *parent, const char *name } createActions(); createMasterVolWidget(); - connect(this, TQ_SIGNAL(quitSelected()), kapp, TQ_SLOT(quitExtended())); + connect(this, TQ_SIGNAL(quitSelected()), tdeApp, TQ_SLOT(quitExtended())); TDEGlobal::dirs()->addResourceDir("icons_crystal", locate("appdata", "pics/crystal/")); TDEGlobal::dirs()->addResourceDir("icons_oldcrystal", locate("appdata", "pics/oldcrystal/")); @@ -220,8 +220,8 @@ void KMixDockWidget::selectMaster() void KMixDockWidget::handleNewMaster(bool defaultMaster, int soundcard_id, const TQString &channel_id) { //kdDebug(67100) << "KMixDockWidget::handleNewMaster() default master=" << defaultMaster << ", soundcard_id=" << soundcard_id << ", channel_id=" << channel_id << endl; - kapp->config()->setGroup(0); - kapp->config()->writeEntry("UseDefaultMaster", defaultMaster); + tdeApp->config()->setGroup(0); + tdeApp->config()->writeEntry("UseDefaultMaster", defaultMaster); Mixer *mixer; TQString channel = TQString::null; if (defaultMaster) @@ -399,7 +399,7 @@ TQString KMixDockWidget::getIconPath(TQStringList fallback) { if (iconTheme == KMixSettings::EnumIconTheme::System) { - TQString iconPath = kapp->iconLoader()->iconPath((*it), TDEIcon::Panel, true); + TQString iconPath = tdeApp->iconLoader()->iconPath((*it), TDEIcon::Panel, true); if (!iconPath.isNull()) { return iconPath; diff --git a/krec/krecconfig_fileswidget.cpp b/krec/krecconfig_fileswidget.cpp index eae7157a..56e6a7c7 100644 --- a/krec/krecconfig_fileswidget.cpp +++ b/krec/krecconfig_fileswidget.cpp @@ -74,8 +74,8 @@ KRecConfigFilesWidget::~KRecConfigFilesWidget() { void KRecConfigFilesWidget::load() { kdDebug( 60005 ) << k_funcinfo << endl; defaults(); - kapp->config()->setGroup( "FileDefaults" ); - _samplingRate = kapp->config()->readNumEntry( "SamplingRate", 44100 ); + tdeApp->config()->setGroup( "FileDefaults" ); + _samplingRate = tdeApp->config()->readNumEntry( "SamplingRate", 44100 ); switch ( _samplingRate ) { case 48000: _rate48->setChecked( true ); break; case 44100: _rate44->setChecked( true ); break; @@ -87,29 +87,29 @@ kdDebug( 60005 ) << k_funcinfo << endl; _rateotherline->setText( TQString::number( _samplingRate ) ); break; }; - _channels = kapp->config()->readNumEntry( "Channels", 2 ); + _channels = tdeApp->config()->readNumEntry( "Channels", 2 ); switch ( _channels ) { default: case 2: _channels2->setChecked( true ); break; case 1: _channels1->setChecked( true ); break; }; - _bits = kapp->config()->readNumEntry( "Bits", 16 ); + _bits = tdeApp->config()->readNumEntry( "Bits", 16 ); switch ( _bits ) { default: case 16: _bits16->setChecked( true ); break; case 8: _bits8->setChecked( true ); break; }; - _usedefaults->setChecked( kapp->config()->readBoolEntry( "UseDefaults", false ) ); + _usedefaults->setChecked( tdeApp->config()->readBoolEntry( "UseDefaults", false ) ); } void KRecConfigFilesWidget::save() { - kapp->config()->setGroup( "FileDefaults" ); - kapp->config()->writeEntry( "SamplingRate", _samplingRate ); - kapp->config()->writeEntry( "Channels", _channels ); - kapp->config()->writeEntry( "Bits", _bits ); - kapp->config()->writeEntry( "UseDefaults", _usedefaults->isOn() ); + tdeApp->config()->setGroup( "FileDefaults" ); + tdeApp->config()->writeEntry( "SamplingRate", _samplingRate ); + tdeApp->config()->writeEntry( "Channels", _channels ); + tdeApp->config()->writeEntry( "Bits", _bits ); + tdeApp->config()->writeEntry( "UseDefaults", _usedefaults->isOn() ); - kapp->config()->sync(); + tdeApp->config()->sync(); } void KRecConfigFilesWidget::defaults() { diff --git a/krec/krecconfigure.cpp b/krec/krecconfigure.cpp index 34c8d0cf..04311206 100644 --- a/krec/krecconfigure.cpp +++ b/krec/krecconfigure.cpp @@ -127,8 +127,8 @@ kdDebug( 60005 ) << k_funcinfo << endl; _framebaseotherline->setText( TQString::number( _framebase ) ); break; }; - kapp->config()->setGroup( "TipOfDay" ); - _tip = kapp->config()->readBoolEntry( "RunOnStart", true ); + tdeApp->config()->setGroup( "TipOfDay" ); + _tip = tdeApp->config()->readBoolEntry( "RunOnStart", true ); _tipofday->setChecked( _tip ); } @@ -137,10 +137,10 @@ void KRecConfigGeneral::save() { KRecGlobal::the()->setFrameBase( _framebase ); kdDebug(60005) << k_funcinfo << "Framebase=" << _framebase << endl; - kapp->config()->setGroup( "TipOfDay" ); - kapp->config()->writeEntry( "RunOnStart", _tip ); + tdeApp->config()->setGroup( "TipOfDay" ); + tdeApp->config()->writeEntry( "RunOnStart", _tip ); - kapp->config()->sync(); + tdeApp->config()->sync(); emit changed( false ); } diff --git a/krec/krecglobal.cpp b/krec/krecglobal.cpp index 3c0191de..4e852eac 100644 --- a/krec/krecglobal.cpp +++ b/krec/krecglobal.cpp @@ -51,7 +51,7 @@ KRecGlobal* KRecGlobal::the() { void KRecGlobal::setMainWidget( TQWidget* n ) { _qwidget = n; } TQWidget* KRecGlobal::mainWidget() { return _qwidget; } -TDEConfig* KRecGlobal::tdeconfig() { return kapp->config(); } +TDEConfig* KRecGlobal::tdeconfig() { return tdeApp->config(); } void KRecGlobal::setStatusBar( KStatusBar *bar ) { _statusbar = bar; } void KRecGlobal::message( const TQString &text ) { if ( _statusbar ) _statusbar->message( text, 2000 ); } @@ -104,27 +104,27 @@ KRecExportItem* KRecGlobal::getExportItemForEnding( const TQString &ending ) { int KRecGlobal::timeFormatMode() { if ( _timeformatcache < 0 ) { - kapp->config()->setGroup( "General" ); - _timeformatcache = kapp->config()->readNumEntry( "TimeFormat", 0 ); + tdeApp->config()->setGroup( "General" ); + _timeformatcache = tdeApp->config()->readNumEntry( "TimeFormat", 0 ); } return _timeformatcache; } void KRecGlobal::setTimeFormatMode( int n ) { - kapp->config()->setGroup( "General" ); - kapp->config()->writeEntry( "TimeFormat", n ); + tdeApp->config()->setGroup( "General" ); + tdeApp->config()->writeEntry( "TimeFormat", n ); _timeformatcache = n; } int KRecGlobal::frameBase() { if ( _framebasecache < 0 ) { - kapp->config()->setGroup( "General" ); - _framebasecache = kapp->config()->readNumEntry( "FrameBase", 25 ); + tdeApp->config()->setGroup( "General" ); + _framebasecache = tdeApp->config()->readNumEntry( "FrameBase", 25 ); } return _framebasecache; } void KRecGlobal::setFrameBase( int n ) { - kapp->config()->setGroup( "General" ); - kapp->config()->writeEntry( "FrameBase", n ); + tdeApp->config()->setGroup( "General" ); + tdeApp->config()->writeEntry( "FrameBase", n ); _framebasecache = n; } diff --git a/krec/krecglobal.h b/krec/krecglobal.h index 4cb57681..4daa3dab 100644 --- a/krec/krecglobal.h +++ b/krec/krecglobal.h @@ -50,7 +50,7 @@ public: */ TQWidget* mainWidget(); - /// @return kapp->config() + /// @return tdeApp->config() static TDEConfig* tdeconfig(); /// Sets the Statusbar. diff --git a/krec/krecord.cpp b/krec/krecord.cpp index d1f74f54..d4ac5413 100644 --- a/krec/krecord.cpp +++ b/krec/krecord.cpp @@ -252,10 +252,10 @@ void KRecPrivate::forceTipOfDay() { } void KRecPrivate::execaRtsControl() { - kapp->tdeinitExec( "artscontrol" ); + tdeApp->tdeinitExec( "artscontrol" ); } void KRecPrivate::execKMix() { - kapp->tdeinitExec( "kmix" ); + tdeApp->tdeinitExec( "kmix" ); } /** diff --git a/kscd/docking.cpp b/kscd/docking.cpp index 3a45e71a..cce4652f 100644 --- a/kscd/docking.cpp +++ b/kscd/docking.cpp @@ -59,7 +59,7 @@ DockWidget::DockWidget( KSCD* parent, const char *name) popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-backward", TDEIcon::Small), i18n("Previous"), parent, TQ_SLOT(prevClicked())); popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_eject", TDEIcon::Small), i18n("Eject"), parent, TQ_SLOT(ejectClicked())); - TQToolTip::add(this, kapp->aboutData()->programName()); + TQToolTip::add(this, tdeApp->aboutData()->programName()); } DockWidget::~DockWidget() @@ -110,7 +110,7 @@ void DockWidget::setToolTip(const TQString& text) if (text.isEmpty()) { - TQToolTip::add(this, kapp->aboutData()->programName()); + TQToolTip::add(this, tdeApp->aboutData()->programName()); } else { diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp index 68f02405..510a0029 100644 --- a/kscd/kscd.cpp +++ b/kscd/kscd.cpp @@ -160,8 +160,8 @@ KSCD::KSCD( TQWidget *parent, const char *name ) connect( songListCB, TQ_SIGNAL(activated(int)), TQ_SLOT(trackSelected(int))); connect( shufflePB, TQ_SIGNAL(clicked()), TQ_SLOT(randomSelected())); connect( cddbPB, TQ_SIGNAL(clicked()), TQ_SLOT(CDDialogSelected())); - connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(setColors())); - connect(kapp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(setIcons())); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(setColors())); + connect(tdeApp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(setIcons())); TQToolTip::remove(songListCB); TQToolTip::add(songListCB, i18n("Track list")); @@ -193,7 +193,7 @@ KSCD::KSCD( TQWidget *parent, const char *name ) m_actions->action( "options_configure_globals" )->setText( i18n( "Configure &Global Shortcuts..." ) ); - kapp->installKDEPropertyMap(); + tdeApp->installKDEPropertyMap(); TQSqlPropertyMap *map = TQSqlPropertyMap::defaultMap(); map->insert("KComboBox", "currentText"); @@ -248,7 +248,7 @@ void KSCD::initGlobalShortcuts() { this, TQ_SLOT(incVolume())); m_globalAccel->setConfigGroup( "GlobalShortcuts" ); - m_globalAccel->readSettings( kapp->config() ); + m_globalAccel->readSettings( tdeApp->config() ); m_globalAccel->updateConnections(); } @@ -382,13 +382,13 @@ void KSCD::playClicked() if (m_cd->discId() == TDECompactDisc::missingDisc) return; - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); if (!m_cd->isPlaying()) { - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); if (m_cd->isPaused()) { @@ -427,8 +427,8 @@ void KSCD::playClicked() playPB->setText(i18n("Play")); } - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); } // playClicked() void KSCD::setShuffle(int shuffle) @@ -462,8 +462,8 @@ void KSCD::stopClicked() { stoppedByUser = true; - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); m_cd->stop(); } // stopClicked() @@ -488,8 +488,8 @@ void KSCD::prevClicked() } } - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); m_cd->play(track, 0, playlist.isEmpty() ? 0 : track); } // prevClicked() @@ -516,8 +516,8 @@ bool KSCD::nextClicked() } } - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); m_cd->play(track, 0, Prefs::randomPlay() || !playlist.isEmpty() ? track + 1 : 0); return true; } // nextClicked() @@ -570,8 +570,8 @@ void KSCD::trackChanged(unsigned track, unsigned trackLength) void KSCD::jumpToTime(int ms, bool forcePlay) { - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); int track = m_cd->track(); if ((m_cd->isPlaying() || forcePlay) && @@ -617,15 +617,15 @@ void KSCD::quitClicked() setLEDs(-1); // Good GOD this is evil - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); if(Prefs::stopExit()) m_cd->stop(); delete m_cd; - kapp->quit(); + tdeApp->quit(); } // quitClicked() bool KSCD::event( TQEvent *e ) @@ -639,8 +639,8 @@ void KSCD::loopOn() Prefs::setLooping(true); loopled->on(); loopled->show(); - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); } // loopOn; void KSCD::loopOff() @@ -648,8 +648,8 @@ void KSCD::loopOff() Prefs::setLooping(false); loopled->off(); loopled->show(); - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); } // loopOff; void KSCD::loopClicked() @@ -675,7 +675,7 @@ void KSCD::ejectClicked() void KSCD::closeEvent(TQCloseEvent *e) { - if (Prefs::docking() && !kapp->sessionSaving()) + if (Prefs::docking() && !tdeApp->sessionSaving()) { hide(); e->ignore(); @@ -1274,8 +1274,8 @@ void KSCD::led_on() queryledtimer.start(800); queryled->off(); queryled->show(); - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); } // led_on void KSCD::togglequeryled() @@ -1491,7 +1491,7 @@ void KSCD::information(int i) bool KSCD::saveState(TQSessionManager& /*sm*/) { writeSettings(); - TDEConfig* config = TDEApplication::kApplication()->sessionConfig(); + TDEConfig* config = tdeApp->sessionConfig(); config->setGroup("General"); config->writeEntry("Show", isVisible()); return true; @@ -1508,7 +1508,7 @@ void KSCD::keyPressEvent(TQKeyEvent* e) if (e->key() == TQt::Key_F1) { - kapp->invokeHelp(); + tdeApp->invokeHelp(); } else if (isNum) { @@ -1648,7 +1648,7 @@ int main( int argc, char *argv[] ) TDEUniqueApplication a; - kapp->dcopClient()->setDefaultObject("CDPlayer"); + tdeApp->dcopClient()->setDefaultObject("CDPlayer"); KSCD *k = new KSCD(); @@ -1657,9 +1657,9 @@ int main( int argc, char *argv[] ) k->setCaption(a.caption()); - if (kapp->isRestored()) + if (tdeApp->isRestored()) { - TDEConfig* config = TDEApplication::kApplication()->sessionConfig(); + TDEConfig* config = tdeApp->sessionConfig(); config->setGroup("General"); if (config->readBoolEntry("Show")) k->show(); diff --git a/libkcddb/test/asynccddblookuptest.cpp b/libkcddb/test/asynccddblookuptest.cpp index 1910527b..6a43b0ca 100644 --- a/libkcddb/test/asynccddblookuptest.cpp +++ b/libkcddb/test/asynccddblookuptest.cpp @@ -96,7 +96,7 @@ AsyncCDDBLookupTest::slotFinished(CDDB::Result r) kdDebug() << "Best CDInfo had title: " << i.title << endl; kdDebug() << "and revision: " << i.revision << endl; - kapp->quit(); + tdeApp->quit(); } int main(int argc, char ** argv) diff --git a/libkcddb/test/asynchttplookuptest.cpp b/libkcddb/test/asynchttplookuptest.cpp index a86d4a66..f614b468 100644 --- a/libkcddb/test/asynchttplookuptest.cpp +++ b/libkcddb/test/asynchttplookuptest.cpp @@ -94,7 +94,7 @@ AsyncHTTPLookupTest::slotFinished(CDDB::Result r) kdDebug() << "Best CDInfo had title: " << i.title << endl; kdDebug() << "and revision: " << i.revision << endl; - kapp->quit(); + tdeApp->quit(); } int main(int argc, char ** argv) diff --git a/libkcddb/test/asynchttpsubmittest.cpp b/libkcddb/test/asynchttpsubmittest.cpp index ace90808..425f5873 100644 --- a/libkcddb/test/asynchttpsubmittest.cpp +++ b/libkcddb/test/asynchttpsubmittest.cpp @@ -63,7 +63,7 @@ AsyncHTTPSubmitTest::slotFinished(CDDB::Result r) { kdDebug() << "AsyncHTTPSubmitTest::slotFinished: Got " << KCDDB::CDDB::resultToString(r) << endl; - kapp->quit(); + tdeApp->quit(); } int main(int argc, char ** argv) diff --git a/libkcddb/test/asyncsmtpsubmittest.cpp b/libkcddb/test/asyncsmtpsubmittest.cpp index 90f6fddd..a146bb11 100644 --- a/libkcddb/test/asyncsmtpsubmittest.cpp +++ b/libkcddb/test/asyncsmtpsubmittest.cpp @@ -64,7 +64,7 @@ AsyncSMTPSubmitTest::slotFinished(CDDB::Result r) { kdDebug() << "AsyncSMTPSubmitTest::slotFinished: Got " << KCDDB::CDDB::resultToString(r) << endl; - kapp->quit(); + tdeApp->quit(); } int main(int argc, char ** argv) diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp index 89ec960b..e2e2f0c1 100644 --- a/noatun/library/equalizerview.cpp +++ b/noatun/library/equalizerview.cpp @@ -42,7 +42,7 @@ PresetList::PresetList(TQWidget *parent, const char *name) header()->hide(); // a try to set a sne minimum width. unfortuately the custom item // still doesn't draw all text with that minimum width - setMinimumWidth(kapp->fontMetrics().boundingRect(i18n("Custom")).width()+2*itemMargin()); + setMinimumWidth(tdeApp->fontMetrics().boundingRect(i18n("Custom")).width()+2*itemMargin()); } void PresetList::rename(TQListViewItem *item, int c) @@ -77,8 +77,8 @@ EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band) layout->addWidget(mLabel); setMinimumHeight(200); -// setMinimumWidth(kapp->fontMetrics().width("158kHz")); -// setMinimumWidth(kapp->fontMetrics().width("549kHz")); +// setMinimumWidth(tdeApp->fontMetrics().width("158kHz")); +// setMinimumWidth(tdeApp->fontMetrics().width("549kHz")); setBand(band); diff --git a/noatun/library/noatun/app.h b/noatun/library/noatun/app.h index 3b934232..ba6108fb 100644 --- a/noatun/library/noatun/app.h +++ b/noatun/library/noatun/app.h @@ -258,7 +258,7 @@ private: bool showingInterfaces; }; -#define napp (static_cast<NoatunApp*>(kapp)) +#define napp (static_cast<NoatunApp*>(tdeApp)) // version info for the plugins // this is MAJOR.MINOR.PATCHLEVEL diff --git a/noatun/library/noatun/pluginloader.h b/noatun/library/noatun/pluginloader.h index c6341a75..d6059021 100644 --- a/noatun/library/noatun/pluginloader.h +++ b/noatun/library/noatun/pluginloader.h @@ -64,7 +64,7 @@ public: **/ bool remove(const TQString &spec); /** - * Same as the above, but does not call kapp->exit() even + * Same as the above, but does not call tdeApp->exit() even * when the last userinterface plugin is removed. Necessary * during session management (see marquis plugin). * ### BIC: merge with above with terminateOnLastUI = true diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp index 5fa6b0fc..f9e6f49f 100644 --- a/noatun/library/noatunstdaction.cpp +++ b/noatun/library/noatunstdaction.cpp @@ -330,7 +330,7 @@ TDEPopupMenu *ContextMenu::createContextMenu(TQWidget *p) { TDEPopupMenu *contextMenu = new TDEPopupMenu(p, "NoatunContextMenu"); - KHelpMenu *helpmenu = new KHelpMenu(contextMenu, kapp->aboutData(), false); + KHelpMenu *helpmenu = new KHelpMenu(contextMenu, tdeApp->aboutData(), false); TDEActionCollection* actions = new TDEActionCollection(helpmenu); KStdAction::open(napp, TQ_SLOT(fileOpen()), actions)->plug(contextMenu); diff --git a/noatun/library/pluginloader.cpp b/noatun/library/pluginloader.cpp index 2fecb898..7f8bb1be 100644 --- a/noatun/library/pluginloader.cpp +++ b/noatun/library/pluginloader.cpp @@ -262,7 +262,7 @@ bool LibraryLoader::remove(const TQString& spec, bool terminateOnLastUI) else { // No other UIs, terminate - kapp->exit(); + tdeApp->exit(); } } else if (info.type=="playlist") diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp index b8f46fa5..2e777a43 100644 --- a/noatun/library/vequalizer.cpp +++ b/noatun/library/vequalizer.cpp @@ -315,7 +315,7 @@ VEqualizer::VEqualizer() void VEqualizer::init() { KURL url; - url.setPath(kapp->dirs()->localtdedir()+"/share/apps/noatun/equalizer"); + url.setPath(tdeApp->dirs()->localtdedir()+"/share/apps/noatun/equalizer"); if(!load(url)) { setPreamp(0); @@ -323,7 +323,7 @@ void VEqualizer::init() } else { - TDEConfig *config=kapp->config(); + TDEConfig *config=tdeApp->config(); config->setGroup("Equalizer"); setEnabled(config->readBoolEntry("enabled", false)); } @@ -333,7 +333,7 @@ void VEqualizer::init() VEqualizer::~VEqualizer() { KURL url; - url.setPath(kapp->dirs()->localtdedir()+"/share/apps/noatun/equalizer"); + url.setPath(tdeApp->dirs()->localtdedir()+"/share/apps/noatun/equalizer"); save(url, "auto"); delete d; @@ -535,7 +535,7 @@ void VEqualizer::setEnabled(bool e) { update(true); // just in case EQBACK->enabled((long)e); - TDEConfig *config=kapp->config(); + TDEConfig *config=tdeApp->config(); config->setGroup("Equalizer"); config->writeEntry("enabled", e); config->sync(); @@ -664,7 +664,7 @@ bool VEqualizer::fromString(const TQString &str) static TQString makePresetFile() { - TQString basedir=kapp->dirs()->localtdedir()+"/share/apps/noatun/eq.preset/"; + TQString basedir=tdeApp->dirs()->localtdedir()+"/share/apps/noatun/eq.preset/"; // now append a filename that doesn't exist TDEStandardDirs::makeDir(basedir); TQString fullpath; @@ -698,7 +698,7 @@ VPreset VEqualizer::createPreset(const TQString &name, bool smart) preset.setName(nameReal); save(preset.file(), nameReal); - TDEConfig *config=kapp->config(); + TDEConfig *config=tdeApp->config(); config->setGroup("Equalizer"); TQStringList list = config->readListEntry("presets"); list += preset.file(); @@ -722,7 +722,7 @@ TQValueList<VPreset> VEqualizer::presets() const } else { - list=kapp->dirs()->findAllResources("data", "noatun/eq.preset/*"); + list=tdeApp->dirs()->findAllResources("data", "noatun/eq.preset/*"); conf->writeEntry("presets", list); conf->sync(); } @@ -763,7 +763,7 @@ VPreset VEqualizer::presetByFile(const TQString &file) { TDEConfig *conf=TDEGlobal::config(); conf->setGroup("Equalizer"); - TQStringList list=kapp->config()->readListEntry("presets"); + TQStringList list=tdeApp->config()->readListEntry("presets"); if (list.contains(file)) return VPreset(file); return VPreset(); @@ -911,7 +911,7 @@ TQString VPreset::file() const void VPreset::remove() { - TDEConfig *config=kapp->config(); + TDEConfig *config=tdeApp->config(); config->setGroup("Equalizer"); TQStringList items=config->readListEntry("presets"); items.remove(file()); @@ -920,7 +920,7 @@ void VPreset::remove() emit EQ->removed(*this); - if (file().find(kapp->dirs()->localtdedir())==0) + if (file().find(tdeApp->dirs()->localtdedir())==0) { TQFile f(file()); f.remove(); diff --git a/noatun/modules/dcopiface/dcopiface.cpp b/noatun/modules/dcopiface/dcopiface.cpp index 4c9e0f37..0a146f94 100644 --- a/noatun/modules/dcopiface/dcopiface.cpp +++ b/noatun/modules/dcopiface/dcopiface.cpp @@ -24,7 +24,7 @@ NIF::NIF() : Plugin(), DCOPObject("Noatun") NIF::~NIF() { - kapp->dcopClient()->emitDCOPSignal("exiting()", TQByteArray()); + tdeApp->dcopClient()->emitDCOPSignal("exiting()", TQByteArray()); } void NIF::toggleListView() @@ -241,7 +241,7 @@ TQCString NIF::version() void NIF::newSongPlaying() { - kapp->dcopClient()->emitDCOPSignal("newFile()", TQByteArray()); + tdeApp->dcopClient()->emitDCOPSignal("newFile()", TQByteArray()); } void NIF::clear() diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp index 50df64cd..829f51aa 100644 --- a/noatun/modules/infrared/irprefs.cpp +++ b/noatun/modules/infrared/irprefs.cpp @@ -103,7 +103,7 @@ IRPrefs::IRPrefs(TQObject *parent) void IRPrefs::save() { - TDEConfig *c = kapp->config(); + TDEConfig *c = tdeApp->config(); TDEConfigGroupSaver groupSaver(c, "Infrared"); c->writeEntry("CommandCount", s_commands.count()); int i = 1; @@ -282,7 +282,7 @@ void IRPrefs::readConfig() { if (s_configRead) return; - TDEConfig *c = kapp->config(); + TDEConfig *c = tdeApp->config(); TDEConfigGroupSaver groupSaver(c, "Infrared"); int count = c->readNumEntry("CommandCount"); for (int i = 1; i <= count; ++i) diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp index bed68ec6..a1eea028 100644 --- a/noatun/modules/kaiman/userinterface.cpp +++ b/noatun/modules/kaiman/userinterface.cpp @@ -372,7 +372,7 @@ void Kaiman::volumeDown() void Kaiman::execMixer() { - kapp->startServiceByDesktopName ( TQString::fromLatin1("kmix"), TQString() ); + tdeApp->startServiceByDesktopName ( TQString::fromLatin1("kmix"), TQString() ); } diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp index cda022a2..8eae1e8d 100644 --- a/noatun/modules/keyz/keyz.cpp +++ b/noatun/modules/keyz/keyz.cpp @@ -147,7 +147,7 @@ void Keyz::slotPrevSection() void Keyz::slotCopyTitle() { if (napp->player()->current()) - TDEApplication::kApplication()->clipboard()->setText(napp->player()->current().title()); + tdeApp->clipboard()->setText(napp->player()->current().title()); } diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp index 293dca96..690361d6 100644 --- a/noatun/modules/kjofol-skin/kjloader.cpp +++ b/noatun/modules/kjofol-skin/kjloader.cpp @@ -146,7 +146,7 @@ KJLoader::KJLoader() napp->preferences(); } - mHelpMenu = new KHelpMenu(this, kapp->aboutData()); + mHelpMenu = new KHelpMenu(this, tdeApp->aboutData()); connect(napp->player(), TQ_SIGNAL(timeout()), TQ_SLOT(timeUpdate())); connect(napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(timeUpdate())); connect(napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(newSong())); diff --git a/tdeioslave/audiocd/audiocd.cpp b/tdeioslave/audiocd/audiocd.cpp index 71eba0e2..8116f4e7 100644 --- a/tdeioslave/audiocd/audiocd.cpp +++ b/tdeioslave/audiocd/audiocd.cpp @@ -75,7 +75,7 @@ static const TDECmdLineOptions options[] = int kdemain(int argc, char ** argv) { - // TDEApplication uses libkcddb which needs a valid kapp pointer + // TDEApplication uses libkcddb which needs a valid tdeApp pointer // GUIenabled must be true as libkcddb sometimes wants to communicate // with the user TDEApplication::disableAutoDcopRegistration(); diff --git a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp index 8f5888be..d4e0f199 100644 --- a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp +++ b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp @@ -281,7 +281,7 @@ long EncoderLame::read(int16_t *buf, int frames){ // We can't return until the buffer has been written d->waitingForWrite = true; while(d->waitingForWrite && d->currentEncodeProcess->isRunning()){ - kapp->processEvents(); + tdeApp->processEvents(); usleep(1); } @@ -299,7 +299,7 @@ long EncoderLame::readCleanup(){ // Let lame tag the first frame of the mp3 d->currentEncodeProcess->closeStdin(); while( d->currentEncodeProcess->isRunning()){ - kapp->processEvents(); + tdeApp->processEvents(); usleep(1); } diff --git a/tdemid/channelview.cpp b/tdemid/channelview.cpp index 32f6472a..140d6a7e 100644 --- a/tdemid/channelview.cpp +++ b/tdemid/channelview.cpp @@ -121,7 +121,7 @@ int ChannelView::lookmode=0; int ChannelView::lookMode(void) { - TDEConfig *kcfg=(TDEApplication::kApplication())->config(); + TDEConfig *kcfg=tdeApp->config(); kcfg->setGroup("KMid"); lookmode=kcfg->readNumEntry("ChannelViewLookMode",0); @@ -131,7 +131,7 @@ int ChannelView::lookMode(void) void ChannelView::lookMode(int i) { - TDEConfig *kcfg=(TDEApplication::kApplication())->config(); + TDEConfig *kcfg=tdeApp->config(); lookmode=i; diff --git a/tdemid/tdemidclient.cpp b/tdemid/tdemidclient.cpp index dc6f09ae..cba1a81f 100644 --- a/tdemid/tdemidclient.cpp +++ b/tdemid/tdemidclient.cpp @@ -69,7 +69,7 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char : DCOPObject("KMidIface"), TQWidget(parent,name) { actionCollection=ac; - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); midifile_opened=0L; loopsong=cfg->readNumEntry("Loop",0); @@ -375,7 +375,7 @@ int tdemidClient::openURL(const TQString _url) connect( iojob, TQ_SIGNAL( result( TDEIO::Job *) ), this, TQ_SLOT(downloadFinished( TDEIO::Job * ) ) ); if (!downloaded) - kapp->enter_loop(); + tdeApp->enter_loop(); deleteFile=true; } @@ -1374,7 +1374,7 @@ void tdemidClient::visibleChannelView(int i) } channelView->show(); connect(channelView,TQ_SIGNAL(signalToKMidClient(int *)),this,TQ_SLOT(communicationFromChannelView(int *))); - connect(kapp,TQ_SIGNAL(shutDown()),parentWidget(),TQ_SLOT(shuttingDown())); + connect(tdeApp,TQ_SIGNAL(shutDown()),parentWidget(),TQ_SLOT(shuttingDown())); } else if ((channelView!=NULL)&&(i==0)) @@ -1519,7 +1519,7 @@ void tdemidClient::slotSetTempo(double value) void tdemidClient::downloadFinished(TDEIO::Job *) { downloaded=true; - kapp->exit_loop(); + tdeApp->exit_loop(); } TQSize tdemidClient::sizeHint() const diff --git a/tdemid/tdemidframe.cpp b/tdemid/tdemidframe.cpp index 88069499..aa10a6e4 100644 --- a/tdemid/tdemidframe.cpp +++ b/tdemid/tdemidframe.cpp @@ -89,7 +89,7 @@ tdemidFrame::tdemidFrame(const char *name) KStdAction::open(this, TQ_SLOT(file_Open()), actionCollection()); (void)new TDEAction(i18n("&Save Lyrics..."), 0, this, TQ_SLOT(file_SaveLyrics()), actionCollection(), "file_save_lyrics"); - KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); (void)new TDEAction(i18n("&Play"), "media-playback-start", TQt::Key_Space, tdemidclient, TQ_SLOT(slotPlay()), actionCollection(), "song_play"); @@ -175,7 +175,7 @@ tdemidFrame::tdemidFrame(const char *name) setupGUI((ToolBar | Keys | StatusBar | Save | Create ), "tdemidui.rc" ); - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); TDESelectAction *tmplistaction= ((TDESelectAction*)actionCollection()->action("display_events")); @@ -230,7 +230,7 @@ tdemidFrame::tdemidFrame(const char *name) cfg->writeEntry("AutoAddToCollection",0); char ttt[40]; - sprintf(ttt,"%d",kapp->argc()); + sprintf(ttt,"%d",tdeApp->argc()); int i=0; int c=autoAddSongToCollection( args->url( 0 ).path() , 1 ); i++; @@ -242,7 +242,7 @@ tdemidFrame::tdemidFrame(const char *name) tdemidclient->setActiveCollection(c); - /// tdemidclient->openURL((kapp->argv())[1]); + /// tdemidclient->openURL((tdeApp->argv())[1]); /* if ((cfg->readNumEntry("AutomaticTextEventChooser",1))==1) { if (tdemidclient->ChooseTypeOfTextEvents()==1) @@ -262,7 +262,7 @@ tdemidFrame::tdemidFrame(const char *name) */ // kKeysAccel->writeSettings(cfg); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isRegistered()) // just in case we're embeeded { client->attach(); @@ -304,7 +304,7 @@ void tdemidFrame::song_stopPause() void tdemidFrame::options_FileType(int i) { - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); cfg->writeEntry("TypeOfMidiFile",i); tdemidclient->setSongType(1-i); @@ -312,7 +312,7 @@ void tdemidFrame::options_FileType(int i) void tdemidFrame::options_DisplayEvents(int i) { - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); cfg->writeEntry("TypeOfTextEvents",(i==0)?1:5); cfg->sync(); @@ -321,7 +321,7 @@ void tdemidFrame::options_DisplayEvents(int i) void tdemidFrame::options_AutomaticText() { - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); cfg->writeEntry("AutomaticTextEventChooser",1-cfg->readNumEntry("AutomaticTextEventChooser",1)); } @@ -333,7 +333,7 @@ void tdemidFrame::options_FontChange() font=*tdemidclient->getFont(); kfd->getFont(font); delete kfd; - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); cfg->writeEntry("KaraokeFont",font); cfg->sync(); @@ -345,7 +345,7 @@ int tdemidFrame::autoAddSongToCollection(const TQString& filename,int setactive) int r; SLManager *slman; SongList *sl; - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); if (cfg->readNumEntry("AutoAddToCollection",0)==0) { @@ -474,7 +474,7 @@ void tdemidFrame::options_MidiSetup() dlg=new MidiConfigDialog(tdemidclient->devman(),NULL,"MidiDialog"); if (dlg->exec() == TQDialog::Accepted) { - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); cfg->writeEntry("MidiPortNumber",MidiConfigDialog::selecteddevice); tdemidclient->setMidiDevice(MidiConfigDialog::selecteddevice); @@ -509,7 +509,7 @@ delete dlg; void tdemidFrame::rechooseTextEvent() { - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); if ((cfg->readNumEntry("AutomaticTextEventChooser",1))==1) { @@ -524,7 +524,7 @@ void tdemidFrame::rechooseTextEvent() void tdemidFrame::song_Loop() { - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); int i=1-cfg->readNumEntry("Loop",0); cfg->writeEntry("Loop",i); @@ -534,7 +534,7 @@ void tdemidFrame::song_Loop() void tdemidFrame::collect_PlayOrder(int i) { - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); cfg->writeEntry("CollectionPlayMode", i); cfg->sync(); @@ -543,7 +543,7 @@ void tdemidFrame::collect_PlayOrder(int i) void tdemidFrame::collect_AutoAdd() { - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); cfg->writeEntry("AutoAddToCollection",1-cfg->readNumEntry("AutoAddToCollection",0)); cfg->sync(); @@ -584,7 +584,7 @@ void tdemidFrame::spacePressed() } void tdemidFrame::options_ShowVolumeBar() { - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); int i=1-cfg->readNumEntry("ShowVolumeBar",0); cfg->writeEntry("ShowVolumeBar",i); |