diff options
Diffstat (limited to 'src')
28 files changed, 59 insertions, 59 deletions
diff --git a/src/k3b.cpp b/src/k3b.cpp index fb9d6aa..ee8404a 100644 --- a/src/k3b.cpp +++ b/src/k3b.cpp @@ -154,7 +154,7 @@ K3bMainWindow::K3bMainWindow() setPlainCaption( i18n("K3b - The CD and DVD Kreator") ); - m_config = kapp->config(); + m_config = tdeApp->config(); /////////////////////////////////////////////////////////////////// // call inits to invoke all other construction parts @@ -380,7 +380,7 @@ void K3bMainWindow::initView() { // setup main docking things mainDock = createDockWidget( "project_view", SmallIcon("idea"), 0, - kapp->makeStdCaption( i18n("Project View") ), i18n("Project View") ); + tdeApp->makeStdCaption( i18n("Project View") ), i18n("Project View") ); mainDock->setDockSite( KDockWidget::DockCorner ); mainDock->setEnableDocking( KDockWidget::DockNone ); setView( mainDock ); @@ -419,7 +419,7 @@ void K3bMainWindow::initView() // --- Directory Dock -------------------------------------------------------------------------- m_dirTreeDock = createDockWidget( "directory_tree", SmallIcon("folder"), 0, - kapp->makeStdCaption( i18n("Sidepanel") ), i18n("Sidepanel") ); + tdeApp->makeStdCaption( i18n("Sidepanel") ), i18n("Sidepanel") ); m_dirTreeDock->setEnableDocking( KDockWidget::DockCorner ); K3bFileTreeView* sidePanel = new K3bFileTreeView( m_dirTreeDock ); @@ -433,7 +433,7 @@ void K3bMainWindow::initView() // --- Contents Dock --------------------------------------------------------------------------- m_contentsDock = createDockWidget( "contents_view", SmallIcon("idea"), 0, - kapp->makeStdCaption( i18n("Contents View") ), i18n("Contents View") ); + tdeApp->makeStdCaption( i18n("Contents View") ), i18n("Contents View") ); m_contentsDock->setEnableDocking( KDockWidget::DockCorner ); m_dirView = new K3bDirView( sidePanel/*->fileTreeView()*/, m_contentsDock ); m_contentsDock->setWidget( m_dirView ); @@ -616,7 +616,7 @@ void K3bMainWindow::readOptions() void K3bMainWindow::saveProperties( TDEConfig* c ) { // 1. put saved projects in the config - // 2. save every modified project in "~/.trinity/share/apps/k3b/sessions/" + KApp->sessionId() + // 2. save every modified project in "~/.trinity/share/apps/k3b/sessions/" + TDEApp->sessionId() // 3. save the url of the project (might be something like "AudioCD1") in the config // 4. save the status of every project (modified/saved) @@ -673,7 +673,7 @@ void K3bMainWindow::readProperties( TDEConfig* c ) // 1. read all projects from the config // 2. simply open all of themg // 3. reset the saved urls and the modified state - // 4. delete "~/.trinity/share/apps/k3b/sessions/" + KApp->sessionId() + // 4. delete "~/.trinity/share/apps/k3b/sessions/" + TDEApp->sessionId() TQString saveDir = TDEGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); @@ -795,7 +795,7 @@ bool K3bMainWindow::queryClose() // if we are closed by the session manager everything is fine since we store the // current state in saveProperties // - if( kapp->sessionSaving() ) + if( tdeApp->sessionSaving() ) return true; // FIXME: do not close the docs here. Just ask for them to be saved and return false diff --git a/src/k3bapplication.cpp b/src/k3bapplication.cpp index b8ded2d..c5c4734 100644 --- a/src/k3bapplication.cpp +++ b/src/k3bapplication.cpp @@ -362,7 +362,7 @@ K3bDevice::DeviceManager* K3bApplication::Core::deviceManager() const TDEConfig* K3bApplication::Core::config() const { - return kapp->config(); + return tdeApp->config(); } diff --git a/src/k3bdirview.cpp b/src/k3bdirview.cpp index ec6c762..116cf1e 100644 --- a/src/k3bdirview.cpp +++ b/src/k3bdirview.cpp @@ -225,7 +225,7 @@ void K3bDirView::showMediumInfo( const K3bMedium& medium ) } else if( r == KMessageBox::No ) { m_viewStack->raiseWidget( m_fileView ); - static_cast<K3bMainWindow*>( kapp->mainWidget() )->slotDvdCopy(); + static_cast<K3bMainWindow*>( tdeApp->mainWidget() )->slotDvdCopy(); } else { m_movieView->reload( medium ); diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp index 739a2b4..179bb23 100644 --- a/src/k3bfiletreeview.cpp +++ b/src/k3bfiletreeview.cpp @@ -420,8 +420,8 @@ K3bFileTreeView::K3bFileTreeView( TQWidget *parent, const char *name ) // we always simulate the single click slotSettingsChangedK3b(TDEApplication::SETTINGS_MOUSE); - if( kapp ) - connect( kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChangedK3b(int)) ); + if( tdeApp ) + connect( tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChangedK3b(int)) ); initActions(); } diff --git a/src/k3bflatbutton.cpp b/src/k3bflatbutton.cpp index c11f1a1..68ff3d1 100644 --- a/src/k3bflatbutton.cpp +++ b/src/k3bflatbutton.cpp @@ -67,7 +67,7 @@ void K3bFlatButton::init() setFrameStyle( TQFrame::Box|TQFrame::Plain ); connect( k3bappcore->themeManager(), TQ_SIGNAL(themeChanged()), this, TQ_SLOT(slotThemeChanged()) ); - connect( kapp, TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(slotThemeChanged()) ); + connect( tdeApp, TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(slotThemeChanged()) ); slotThemeChanged(); } diff --git a/src/k3binterface.cpp b/src/k3binterface.cpp index 0d90fa1..f4a07a2 100644 --- a/src/k3binterface.cpp +++ b/src/k3binterface.cpp @@ -39,49 +39,49 @@ K3bInterface::K3bInterface() DCOPRef K3bInterface::createDataCDProject() { - return DCOPRef( kapp->dcopClient()->appId(), + return DCOPRef( tdeApp->dcopClient()->appId(), k3bappcore->projectManager()->dcopInterface( k3bappcore->projectManager()->createProject( K3bDoc::DATA ) )->objId() ); } DCOPRef K3bInterface::createAudioCDProject() { - return DCOPRef( kapp->dcopClient()->appId(), + return DCOPRef( tdeApp->dcopClient()->appId(), k3bappcore->projectManager()->dcopInterface( k3bappcore->projectManager()->createProject( K3bDoc::AUDIO ) )->objId() ); } DCOPRef K3bInterface::createMixedCDProject() { - return DCOPRef( kapp->dcopClient()->appId(), + return DCOPRef( tdeApp->dcopClient()->appId(), k3bappcore->projectManager()->dcopInterface( k3bappcore->projectManager()->createProject( K3bDoc::MIXED ) )->objId() ); } DCOPRef K3bInterface::createVideoCDProject() { - return DCOPRef( kapp->dcopClient()->appId(), + return DCOPRef( tdeApp->dcopClient()->appId(), k3bappcore->projectManager()->dcopInterface( k3bappcore->projectManager()->createProject( K3bDoc::VCD ) )->objId() ); } DCOPRef K3bInterface::createMovixCDProject() { - return DCOPRef( kapp->dcopClient()->appId(), + return DCOPRef( tdeApp->dcopClient()->appId(), k3bappcore->projectManager()->dcopInterface( k3bappcore->projectManager()->createProject( K3bDoc::MOVIX ) )->objId() ); } DCOPRef K3bInterface::createDataDVDProject() { - return DCOPRef( kapp->dcopClient()->appId(), + return DCOPRef( tdeApp->dcopClient()->appId(), k3bappcore->projectManager()->dcopInterface( k3bappcore->projectManager()->createProject( K3bDoc::DVD ) )->objId() ); } DCOPRef K3bInterface::createVideoDVDProject() { - return DCOPRef( kapp->dcopClient()->appId(), + return DCOPRef( tdeApp->dcopClient()->appId(), k3bappcore->projectManager()->dcopInterface( k3bappcore->projectManager()->createProject( K3bDoc::VIDEODVD ) )->objId() ); } DCOPRef K3bInterface::createMovixDVDProject() { - return DCOPRef( kapp->dcopClient()->appId(), + return DCOPRef( tdeApp->dcopClient()->appId(), k3bappcore->projectManager()->dcopInterface( k3bappcore->projectManager()->createProject( K3bDoc::MOVIX_DVD ) )->objId() ); } @@ -89,7 +89,7 @@ DCOPRef K3bInterface::currentProject() { K3bView* view = m_main->activeView(); if( view ) - return DCOPRef( kapp->dcopClient()->appId(), + return DCOPRef( tdeApp->dcopClient()->appId(), k3bappcore->projectManager()->dcopInterface( view->doc() )->objId() ); else return DCOPRef(); @@ -99,7 +99,7 @@ DCOPRef K3bInterface::openProject( const KURL& url ) { K3bDoc* doc = k3bappcore->projectManager()->openProject( url ); if( doc ) - return DCOPRef( kapp->dcopClient()->appId(), + return DCOPRef( tdeApp->dcopClient()->appId(), k3bappcore->projectManager()->dcopInterface( doc )->objId() ); else return DCOPRef(); @@ -110,7 +110,7 @@ TQValueList<DCOPRef> K3bInterface::projects() TQValueList<DCOPRef> lst; const TQPtrList<K3bDoc>& docs = k3bappcore->projectManager()->projects(); for( TQPtrListIterator<K3bDoc> it( docs ); it.current(); ++it ) - lst.append( DCOPRef( kapp->dcopClient()->appId(), k3bappcore->projectManager()->dcopInterface( it.current() )->objId() ) ); + lst.append( DCOPRef( tdeApp->dcopClient()->appId(), k3bappcore->projectManager()->dcopInterface( it.current() )->objId() ) ); return lst; } diff --git a/src/k3bjobprogressdialog.cpp b/src/k3bjobprogressdialog.cpp index 0f1dee2..6378d45 100644 --- a/src/k3bjobprogressdialog.cpp +++ b/src/k3bjobprogressdialog.cpp @@ -256,7 +256,7 @@ void K3bJobProgressDialog::setupGUI() connect( k3bappcore->themeManager(), TQ_SIGNAL(themeChanged()), this, TQ_SLOT(slotThemeChanged()) ); - connect( kapp, TQ_SIGNAL(appearanceChanged()), + connect( tdeApp, TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(slotThemeChanged()) ); } @@ -264,7 +264,7 @@ void K3bJobProgressDialog::setupGUI() void K3bJobProgressDialog::show() { if( TDEConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "hide main window while writing", false ) ) - if( TQWidget* w = kapp->mainWidget() ) + if( TQWidget* w = tdeApp->mainWidget() ) w->hide(); if( m_osd ) { @@ -287,16 +287,16 @@ void K3bJobProgressDialog::closeEvent( TQCloseEvent* e ) { if( m_buttonClose->isVisible() ) { KDialog::closeEvent( e ); - if( TQWidget* w = kapp->mainWidget() ) + if( TQWidget* w = tdeApp->mainWidget() ) w->show(); if( !m_plainCaption.isEmpty() ) - if( TDEMainWindow* w = dynamic_cast<TDEMainWindow*>(kapp->mainWidget()) ) + if( TDEMainWindow* w = dynamic_cast<TDEMainWindow*>(tdeApp->mainWidget()) ) w->setPlainCaption( m_plainCaption ); if( m_osd ) { m_osd->hide(); - m_osd->saveSettings( kapp->config() ); + m_osd->saveSettings( tdeApp->config() ); } } else @@ -504,7 +504,7 @@ void K3bJobProgressDialog::slotStarted() d->lastProgress = 0; m_timer->start( 1000 ); m_startTime = TQTime::currentTime(); - if( TDEMainWindow* w = dynamic_cast<TDEMainWindow*>(kapp->mainWidget()) ) + if( TDEMainWindow* w = dynamic_cast<TDEMainWindow*>(tdeApp->mainWidget()) ) m_plainCaption = w->caption(); m_logFile.open(); @@ -545,7 +545,7 @@ void K3bJobProgressDialog::slotProgress( int percent ) if( percent > d->lastProgress ) { d->lastProgress = percent; m_lastProgressUpdateTime = TQTime::currentTime(); - if( TDEMainWindow* w = dynamic_cast<TDEMainWindow*>(kapp->mainWidget()) ) { + if( TDEMainWindow* w = dynamic_cast<TDEMainWindow*>(tdeApp->mainWidget()) ) { w->setPlainCaption( TQString( "(%1%) %2" ).arg(percent).arg(m_plainCaption) ); } diff --git a/src/k3bjobprogressosd.cpp b/src/k3bjobprogressosd.cpp index dcf2fd6..a88f7c8 100644 --- a/src/k3bjobprogressosd.cpp +++ b/src/k3bjobprogressosd.cpp @@ -52,7 +52,7 @@ K3bJobProgressOSD::K3bJobProgressOSD( TQWidget* parent, const char* name ) connect( k3bappcore->themeManager(), TQ_SIGNAL(themeChanged()), this, TQ_SLOT(refresh()) ); - connect( kapp, TQ_SIGNAL(appearanceChanged()), + connect( tdeApp, TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(refresh()) ); } diff --git a/src/k3bmixedprojectinterface.cpp b/src/k3bmixedprojectinterface.cpp index a49b61a..b8d9492 100644 --- a/src/k3bmixedprojectinterface.cpp +++ b/src/k3bmixedprojectinterface.cpp @@ -36,11 +36,11 @@ K3bMixedProjectInterface::K3bMixedProjectInterface( K3bMixedDoc* doc, const char DCOPRef K3bMixedProjectInterface::dataPart() const { - return DCOPRef( kapp->dcopClient()->appId(), m_dataInterface->objId() ); + return DCOPRef( tdeApp->dcopClient()->appId(), m_dataInterface->objId() ); } DCOPRef K3bMixedProjectInterface::audioPart() const { - return DCOPRef( kapp->dcopClient()->appId(), m_audioInterface->objId() ); + return DCOPRef( tdeApp->dcopClient()->appId(), m_audioInterface->objId() ); } diff --git a/src/k3bpassivepopup.cpp b/src/k3bpassivepopup.cpp index 86c7d35..f8320a8 100644 --- a/src/k3bpassivepopup.cpp +++ b/src/k3bpassivepopup.cpp @@ -72,7 +72,7 @@ static TQPixmap themedMessageBoxIcon( K3bPassivePopup::MessageType mt ) break; } - TQPixmap ret = TDEApplication::kApplication()->iconLoader()->loadIcon(icon_name, TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true); + TQPixmap ret = tdeApp->iconLoader()->loadIcon(icon_name, TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true); if( ret.isNull() ) return TQMessageBox::standardIcon( qIcon ); diff --git a/src/k3bprojectmanager.cpp b/src/k3bprojectmanager.cpp index face9e7..00c6d24 100644 --- a/src/k3bprojectmanager.cpp +++ b/src/k3bprojectmanager.cpp @@ -273,7 +273,7 @@ K3bDoc* K3bProjectManager::createProject( K3bDoc::DocType type ) void K3bProjectManager::loadDefaults( K3bDoc* doc ) { - TDEConfig* c = kapp->config(); + TDEConfig* c = tdeApp->config(); TQString oldGroup = c->group(); diff --git a/src/k3bsplash.cpp b/src/k3bsplash.cpp index e90e3b9..56c2c7d 100644 --- a/src/k3bsplash.cpp +++ b/src/k3bsplash.cpp @@ -43,7 +43,7 @@ K3bSplash::K3bSplash( TQWidget* parent, const char* name ) setMargin( 0 ); setSpacing( 0 ); - TQLabel* copyrightLabel = new TQLabel( kapp->aboutData()->copyrightStatement(), this ); + TQLabel* copyrightLabel = new TQLabel( tdeApp->aboutData()->copyrightStatement(), this ); copyrightLabel->setMargin( 5 ); copyrightLabel->setPaletteBackgroundColor( black ); copyrightLabel->setPaletteForegroundColor( white ); diff --git a/src/k3bstatusbarmanager.cpp b/src/k3bstatusbarmanager.cpp index 7684cdc..7f0e98d 100644 --- a/src/k3bstatusbarmanager.cpp +++ b/src/k3bstatusbarmanager.cpp @@ -66,7 +66,7 @@ K3bStatusBarManager::K3bStatusBarManager( K3bMainWindow* parent ) m_labelInfoMessage = new TQLabel( " ", m_mainWindow->statusBar() ); // setup version info - m_versionBox = new TQLabel( TQString("K3b %1").arg(kapp->aboutData()->version()), m_mainWindow->statusBar() ); + m_versionBox = new TQLabel( TQString("K3b %1").arg(tdeApp->aboutData()->version()), m_mainWindow->statusBar() ); m_versionBox->installEventFilter( this ); // setup the statusbar diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp index e7a161d..e54215a 100644 --- a/src/k3bsystemproblemdialog.cpp +++ b/src/k3bsystemproblemdialog.cpp @@ -160,7 +160,7 @@ K3bSystemProblemDialog::K3bSystemProblemDialog( const TQValueList<K3bSystemProbl void K3bSystemProblemDialog::closeEvent( TQCloseEvent* e ) { if( m_checkDontShowAgain->isChecked() ) { - TDEConfigGroup grp( kapp->config(), "General Options" ); + TDEConfigGroup grp( tdeApp->config(), "General Options" ); grp.writeEntry( "check system config", false ); } diff --git a/src/k3bthemedheader.cpp b/src/k3bthemedheader.cpp index ab4e21d..2d4b23d 100644 --- a/src/k3bthemedheader.cpp +++ b/src/k3bthemedheader.cpp @@ -106,7 +106,7 @@ void K3bThemedHeader::init() connect( k3bappcore->themeManager(), TQ_SIGNAL(themeChanged()), this, TQ_SLOT(slotThemeChanged()) ); - connect( kapp, TQ_SIGNAL(appearanceChanged()), + connect( tdeApp, TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(slotThemeChanged()) ); } diff --git a/src/k3bthemedlabel.cpp b/src/k3bthemedlabel.cpp index e8df457..e798cc3 100644 --- a/src/k3bthemedlabel.cpp +++ b/src/k3bthemedlabel.cpp @@ -24,7 +24,7 @@ K3bThemedLabel::K3bThemedLabel( TQWidget* parent ) connect( k3bappcore->themeManager(), TQ_SIGNAL(themeChanged()), this, TQ_SLOT(slotThemeChanged()) ); - connect( kapp, TQ_SIGNAL(appearanceChanged()), + connect( tdeApp, TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(slotThemeChanged()) ); } @@ -37,7 +37,7 @@ K3bThemedLabel::K3bThemedLabel( const TQString& text, TQWidget* parent ) connect( k3bappcore->themeManager(), TQ_SIGNAL(themeChanged()), this, TQ_SLOT(slotThemeChanged()) ); - connect( kapp, TQ_SIGNAL(appearanceChanged()), + connect( tdeApp, TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(slotThemeChanged()) ); } @@ -49,7 +49,7 @@ K3bThemedLabel::K3bThemedLabel( K3bTheme::PixmapType pix, TQWidget* parent ) connect( k3bappcore->themeManager(), TQ_SIGNAL(themeChanged()), this, TQ_SLOT(slotThemeChanged()) ); - connect( kapp, TQ_SIGNAL(appearanceChanged()), + connect( tdeApp, TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(slotThemeChanged()) ); } diff --git a/src/k3bwelcomewidget.cpp b/src/k3bwelcomewidget.cpp index 8541996..8782a15 100644 --- a/src/k3bwelcomewidget.cpp +++ b/src/k3bwelcomewidget.cpp @@ -86,7 +86,7 @@ K3bWelcomeWidget::Display::Display( K3bWelcomeWidget* parent ) fnt.setPointSize( 16 ); m_header = new TQSimpleRichText( i18n("Welcome to K3b - The CD and DVD Kreator"), fnt ); m_infoText = new TQSimpleRichText( TQString::fromUtf8("<qt align=\"center\">K3b %1 (c) 1999 - 2007 Sebastian Trüg") - .arg(kapp->aboutData()->version()), font() ); + .arg(tdeApp->aboutData()->version()), font() ); // set a large width just to be sure no linebreak occurs m_header->setWidth( 800 ); @@ -353,7 +353,7 @@ K3bWelcomeWidget::K3bWelcomeWidget( K3bMainWindow* mw, TQWidget* parent, const c connect( main, TQ_SIGNAL(dropped(const KURL::List&)), m_mainWindow, TQ_SLOT(addUrls(const KURL::List&)) ); - connect( kapp, TQ_SIGNAL(appearanceChanged()), main, TQ_SLOT(update()) ); + connect( tdeApp, TQ_SIGNAL(appearanceChanged()), main, TQ_SLOT(update()) ); } diff --git a/src/misc/k3bcdcopydialog.cpp b/src/misc/k3bcdcopydialog.cpp index 9a58570..1beda00 100644 --- a/src/misc/k3bcdcopydialog.cpp +++ b/src/misc/k3bcdcopydialog.cpp @@ -279,10 +279,10 @@ void K3bCdCopyDialog::slotStartClicked() K3bJobProgressDialog* dlg = 0; if( m_checkOnlyCreateImage->isChecked() ) { - dlg = new K3bJobProgressDialog( kapp->mainWidget() ); + dlg = new K3bJobProgressDialog( tdeApp->mainWidget() ); } else { - dlg = new K3bBurnProgressDialog( kapp->mainWidget() ); + dlg = new K3bBurnProgressDialog( tdeApp->mainWidget() ); } K3bBurnJob* burnJob = 0; diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp index b5526dc..c75f770 100644 --- a/src/misc/k3bcdimagewritingdialog.cpp +++ b/src/misc/k3bcdimagewritingdialog.cpp @@ -347,7 +347,7 @@ void K3bCdImageWritingDialog::slotStartClicked() d->tocFile = imagePath(); // create a progresswidget - K3bBurnProgressDialog dlg( kapp->mainWidget(), "burnProgress", true ); + K3bBurnProgressDialog dlg( tdeApp->mainWidget(), "burnProgress", true ); // create the job K3bBurnJob* job = 0; diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp index 6a3c8a4..f162265 100644 --- a/src/misc/k3bdvdcopydialog.cpp +++ b/src/misc/k3bdvdcopydialog.cpp @@ -247,10 +247,10 @@ void K3bDvdCopyDialog::slotStartClicked() K3bJobProgressDialog* dlg = 0; if( m_checkOnlyCreateImage->isChecked() ) { - dlg = new K3bJobProgressDialog( kapp->mainWidget() ); + dlg = new K3bJobProgressDialog( tdeApp->mainWidget() ); } else { - dlg = new K3bBurnProgressDialog( kapp->mainWidget() ); + dlg = new K3bBurnProgressDialog( tdeApp->mainWidget() ); } K3bDvdCopyJob* job = new K3bDvdCopyJob( dlg, this ); diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp index 635613c..ded0a74 100644 --- a/src/misc/k3bdvdformattingdialog.cpp +++ b/src/misc/k3bdvdformattingdialog.cpp @@ -126,7 +126,7 @@ void K3bDvdFormattingDialog::slotStartClicked() - K3bJobProgressDialog d( kapp->mainWidget(), "formattingProgress", false ); + K3bJobProgressDialog d( tdeApp->mainWidget(), "formattingProgress", false ); K3bDvdFormattingJob* job = new K3bDvdFormattingJob( &d, this ); job->setDevice( m_writerSelectionWidget->writerDevice() ); diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp index c8f8ff8..c417d86 100644 --- a/src/misc/k3bisoimagewritingdialog.cpp +++ b/src/misc/k3bisoimagewritingdialog.cpp @@ -265,7 +265,7 @@ void K3bIsoImageWritingDialog::slotStartClicked() c->writePathEntry( "last written image", imagePath() ); // create a progresswidget - K3bBurnProgressDialog dlg( kapp->mainWidget(), "burnProgress", true ); + K3bBurnProgressDialog dlg( tdeApp->mainWidget(), "burnProgress", true ); // create the job K3bIso9660ImageWritingJob* job = new K3bIso9660ImageWritingJob( &dlg ); diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp index d34f511..6a330b2 100644 --- a/src/option/k3bcddboptiontab.cpp +++ b/src/option/k3bcddboptiontab.cpp @@ -130,7 +130,7 @@ K3bCddbOptionTab::~K3bCddbOptionTab() void K3bCddbOptionTab::readSettings() { - TDEConfig* c = kapp->config(); + TDEConfig* c = tdeApp->config(); c->setGroup( "Cddb" ); @@ -188,7 +188,7 @@ void K3bCddbOptionTab::readSettings() void K3bCddbOptionTab::apply() { - TDEConfig* c = kapp->config(); + TDEConfig* c = tdeApp->config(); c->setGroup( "Cddb" ); diff --git a/src/option/k3bdeviceoptiontab.cpp b/src/option/k3bdeviceoptiontab.cpp index dba6e4a..04a86f7 100644 --- a/src/option/k3bdeviceoptiontab.cpp +++ b/src/option/k3bdeviceoptiontab.cpp @@ -78,7 +78,7 @@ void K3bDeviceOptionTab::saveDevices() m_deviceWidget->apply(); // save the config - k3bcore->deviceManager()->saveConfig( kapp->config() ); + k3bcore->deviceManager()->saveConfig( tdeApp->config() ); } diff --git a/src/option/k3bmiscoptiontab.cpp b/src/option/k3bmiscoptiontab.cpp index a24512a..301da2e 100644 --- a/src/option/k3bmiscoptiontab.cpp +++ b/src/option/k3bmiscoptiontab.cpp @@ -69,7 +69,7 @@ K3bMiscOptionTab::~K3bMiscOptionTab() void K3bMiscOptionTab::readSettings() { - TDEConfig* c = kapp->config(); + TDEConfig* c = tdeApp->config(); c->setGroup( "General Options" ); m_checkSaveOnExit->setChecked( c->readBoolEntry( "ask_for_saving_changes_on_exit", true ) ); m_checkShowSplash->setChecked( c->readBoolEntry("Show splash", true) ); @@ -106,7 +106,7 @@ void K3bMiscOptionTab::readSettings() bool K3bMiscOptionTab::saveSettings() { - TDEConfig* c = kapp->config(); + TDEConfig* c = tdeApp->config(); c->setGroup( "General Options" ); c->writeEntry( "ask_for_saving_changes_on_exit", m_checkSaveOnExit->isChecked() ); c->writeEntry( "Show splash", m_checkShowSplash->isChecked() ); diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp index dd4b269..26e29d5 100644 --- a/src/option/k3bthemeoptiontab.cpp +++ b/src/option/k3bthemeoptiontab.cpp @@ -69,7 +69,7 @@ K3bThemeOptionTab::K3bThemeOptionTab(TQWidget *parent, const char *name ) connect( m_viewTheme, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChanged()) ); - connect( kapp, TQ_SIGNAL(appearanceChanged()), + connect( tdeApp, TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(selectionChanged()) ); connect( m_buttonInstallTheme, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallTheme()) ); diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp index 00f52f3..98584d1 100644 --- a/src/rip/k3bvideocdrippingdialog.cpp +++ b/src/rip/k3bvideocdrippingdialog.cpp @@ -186,7 +186,7 @@ void K3bVideoCdRippingDialog::slotStartClicked() m_videooptions ->setVideoCdExtractXml( m_extractXML ->isChecked() ); m_videooptions ->setVideoCdDestination( m_editDirectory ->url() ); - K3bJobProgressDialog ripDialog( kapp->mainWidget(), "Ripping" ); + K3bJobProgressDialog ripDialog( tdeApp->mainWidget(), "Ripping" ); K3bVideoCdRip * rip = new K3bVideoCdRip( &ripDialog, m_videooptions ); hide(); diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp index 6cb67e2..3a26899 100644 --- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp @@ -193,7 +193,7 @@ protected: preW = h*16/9; p->drawRect( ( w - preW ) / 2, ( height() - h ) / 2, preW, h ); - TQPixmap noIcon = TDEApplication::kApplication()->iconLoader()->loadIcon( "no", TDEIcon::NoGroup, TDEIcon::SizeSmall, TDEIcon::DefaultState, 0, true ); + TQPixmap noIcon = tdeApp->iconLoader()->loadIcon( "no", TDEIcon::NoGroup, TDEIcon::SizeSmall, TDEIcon::DefaultState, 0, true ); p->drawPixmap( ( w - noIcon.width() ) / 2, ( height() - noIcon.height() ) / 2, noIcon ); } else { |