From 52bf4ce9dd80ed5179fe6be622626c3376c0da99 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 20 Jan 2025 18:26:31 +0900 Subject: Use tdeApp Signed-off-by: Michele Calgaro --- doc/kolourpaint/index.docbook | 2 +- doc/kpdf/index.docbook | 2 +- doc/kuickshow/index.docbook | 13 ------------- kcoloredit/kcoloredit.cpp | 4 ++-- kdvi/dviRenderer.cpp | 2 +- kdvi/optionDialogSpecialWidget.cpp | 2 +- kfax/kfax.cpp | 6 +++--- kfax/options.cpp | 2 +- kghostview/kgv_view.cpp | 2 +- kghostview/kgvdocument.cpp | 2 +- kghostview/kgvshell.cpp | 8 ++++---- kghostview/kpswidget.cpp | 4 ++-- kghostview/main.cpp | 2 +- kolourpaint/kpcommandhistory.cpp | 4 ++-- kolourpaint/kpmainwindow.cpp | 10 +++++----- kolourpaint/kpmainwindow_file.cpp | 18 +++++++++--------- kolourpaint/kpmainwindow_image.cpp | 4 ++-- kolourpaint/kpmainwindow_settings.cpp | 6 +++--- kolourpaint/kpmainwindow_text.cpp | 14 +++++++------- kolourpaint/kpmainwindow_tools.cpp | 4 ++-- kolourpaint/kpmainwindow_view.cpp | 10 +++++----- kolourpaint/kptool.cpp | 2 +- kolourpaint/widgets/kptoolwidgetbase.cpp | 4 ++-- kooka/kooka.cpp | 2 +- kooka/ksaneocr.cpp | 2 +- kpdf/conf/dlggeneral.ui.h | 2 +- kpdf/core/document.cpp | 2 +- kpdf/core/generator_pdf/generator_pdf.cpp | 2 +- kpdf/shell/shell.cpp | 2 +- kpdf/ui/pageviewutils.cpp | 2 +- kruler/klineal.cpp | 8 ++++---- ksnapshot/ksnapshot.cpp | 6 ++---- ksvg/plugin/svgcreator.cpp | 2 +- kuickshow/src/generalwidget.cpp | 2 +- kuickshow/src/imagewindow.cpp | 4 ++-- kuickshow/src/kuickshow.cpp | 8 ++++---- kview/kimageviewer/canvas.h | 2 +- kview/kview.cpp | 4 ++-- kview/kviewcanvas/test/test.cpp | 2 +- kview/kviewviewer/kviewviewer.cpp | 4 ++-- kview/kviewviewer/test/test.cpp | 2 +- kview/modules/browser/kviewbrowser.cpp | 4 ++-- kviewshell/documentWidget.cpp | 6 +++--- kviewshell/kviewpart.cpp | 4 ++-- kviewshell/kviewshell.cpp | 8 ++++---- kviewshell/marklist.cpp | 4 ++-- kviewshell/plugins/djvu/djvurenderer.cpp | 10 +++++----- kviewshell/tdemultipage.cpp | 6 +++--- libkscan/img_canvas.cpp | 2 +- tdeiconedit/kcolorgrid.cpp | 2 +- tdeiconedit/knew.cpp | 4 ++-- tdeiconedit/properties.cpp | 4 ++-- tdeiconedit/tdeiconconfig.cpp | 2 +- tdeiconedit/tdeiconedit.cpp | 12 ++++++------ tdeiconedit/tdeicongrid.cpp | 10 +++++----- 55 files changed, 124 insertions(+), 139 deletions(-) diff --git a/doc/kolourpaint/index.docbook b/doc/kolourpaint/index.docbook index d59b41bd..2de369d9 100644 --- a/doc/kolourpaint/index.docbook +++ b/doc/kolourpaint/index.docbook @@ -1446,7 +1446,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Installation - + How to obtain &kolourpaint; &install.intro.documentation; diff --git a/doc/kpdf/index.docbook b/doc/kpdf/index.docbook index c6164cb9..89237908 100644 --- a/doc/kpdf/index.docbook +++ b/doc/kpdf/index.docbook @@ -900,7 +900,7 @@ Installation - + How to obtain &kpdf; &install.intro.documentation; diff --git a/doc/kuickshow/index.docbook b/doc/kuickshow/index.docbook index 3f12bad0..ba245c60 100644 --- a/doc/kuickshow/index.docbook +++ b/doc/kuickshow/index.docbook @@ -995,26 +995,13 @@ capabilities, screen resolution, special expansion cards, etc. specific OS, (you wrote a graphical LILO configurator for example) put this information here. - In order to successfully use &kuickshow;, you need &kde; 1.1. Foobar.lib is required in order to support the advanced &kuickshow; features. &kuickshow; uses about 5 megs of memory to run, but this may vary depending on your platform and configuration. - - -All required libraries as well as &kuickshow; itself can be found -on The &kuickshow; home page. - --> - - diff --git a/kcoloredit/kcoloredit.cpp b/kcoloredit/kcoloredit.cpp index 16f06b89..1e478fe4 100644 --- a/kcoloredit/kcoloredit.cpp +++ b/kcoloredit/kcoloredit.cpp @@ -41,7 +41,7 @@ KColorEditApp::KColorEditApp() : TDEMainWindow(0) { - config=kapp->config(); + config=tdeApp->config(); /////////////////////////////////////////////////////////////////// // call inits to invoke all other construction parts @@ -74,7 +74,7 @@ void KColorEditApp::initActions() m_actRecent = KStdAction::openRecent( this, TQ_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() ); - ( void ) new TDEAction( i18n("New &Window"), kapp->miniIcon(), TDEShortcut(), + ( void ) new TDEAction( i18n("New &Window"), tdeApp->miniIcon(), TDEShortcut(), this, TQ_SLOT( slotFileNewWindow() ), actionCollection(), "file_new_window" ); diff --git a/kdvi/dviRenderer.cpp b/kdvi/dviRenderer.cpp index 68cb2238..a35e3126 100644 --- a/kdvi/dviRenderer.cpp +++ b/kdvi/dviRenderer.cpp @@ -254,7 +254,7 @@ void dviRenderer::showThatSourceInformationIsPresent() // here. Most of the code is stolen from there. // Check if the 'Don't show again' feature was used - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); TDEConfigGroupSaver saver( config, "Notification Messages" ); bool showMsg = config->readBoolEntry( "KDVI-info_on_source_specials", true); diff --git a/kdvi/optionDialogSpecialWidget.cpp b/kdvi/optionDialogSpecialWidget.cpp index e365d9e2..b07a5b35 100644 --- a/kdvi/optionDialogSpecialWidget.cpp +++ b/kdvi/optionDialogSpecialWidget.cpp @@ -123,7 +123,7 @@ void optionDialogSpecialWidget::slotComboBox(int item) void optionDialogSpecialWidget::slotExtraHelpButton( const TQString & ) { - kapp->invokeHelp( "inv-search", "kdvi" ); + tdeApp->invokeHelp( "inv-search", "kdvi" ); } void optionDialogSpecialWidget::apply() diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp index 77f64539..4cfca778 100644 --- a/kfax/kfax.cpp +++ b/kfax/kfax.cpp @@ -295,7 +295,7 @@ void TopLevel::setupStatusBar() void TopLevel::readSettings() { - config = kapp->config(); + config = tdeApp->config(); applyMainWindowSettings( config, "MainWindowSettings" ); @@ -358,7 +358,7 @@ bool TopLevel::queryClose() void TopLevel::writeSettings() { - config = kapp->config(); + config = tdeApp->config(); config->setGroup("General Options"); @@ -723,7 +723,7 @@ void TopLevel::printIt( KPrinter &printer, TQPainter &painter ) TQPaintDeviceMetrics dm(painter.device()); TQApplication::setOverrideCursor( waitCursor ); - kapp->processEvents(); + tdeApp->processEvents(); const bool fullpage = printer.option(APP_KFAX_SCALE_FULLPAGE) == "true"; const bool center_h = printer.option(APP_KFAX_CENTER_HORZ) == "true"; diff --git a/kfax/options.cpp b/kfax/options.cpp index 03a7c44b..edae435c 100644 --- a/kfax/options.cpp +++ b/kfax/options.cpp @@ -367,7 +367,7 @@ void OptionsDialog::geomtoggled(){ } void OptionsDialog::slotHelp(){ - kapp->invokeHelp(); + tdeApp->invokeHelp(); } diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp index 8c9be61a..0a4c5e46 100644 --- a/kghostview/kgv_view.cpp +++ b/kghostview/kgv_view.cpp @@ -795,7 +795,7 @@ void KGVPart::slotMimetypeError() kdDebug(4500) << "KGVPart::slotMimetypeError()" << endl; _mimetypeScanner = 0; emit started( 0 ); - //kapp->processEvents(); + //tdeApp->processEvents(); emit canceled( TQString() ); } diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp index 94d7fc21..cb0061e3 100644 --- a/kghostview/kgvdocument.cpp +++ b/kghostview/kgvdocument.cpp @@ -314,7 +314,7 @@ void KGVDocument::scanDSC() /* if( clock.elapsed() > 10 ) { - kapp->processEvents(); + tdeApp->processEvents(); clock.start(); } */ diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp index 8217ce47..4eec70f4 100644 --- a/kghostview/kgvshell.cpp +++ b/kghostview/kgvshell.cpp @@ -151,7 +151,7 @@ KGVShell::~KGVShell() void KGVShell::slotQuit() { - kapp->closeAllWindows(); + tdeApp->closeAllWindows(); } void KGVShell::slotShowMenubar() @@ -263,7 +263,7 @@ KGVShell::openStdin() wrtn = _tmpFile->file()->writeBlock( buf.data(), read ); if( read != wrtn ) break; - kapp->processEvents(); + tdeApp->processEvents(); } if( read != 0 ) { @@ -329,13 +329,13 @@ void KGVShell::slotUpdateFullScreen() toolBar()->hide(); m_gvpart->updateFullScreen( true ); showFullScreen(); - kapp->installEventFilter( m_fsFilter ); + tdeApp->installEventFilter( m_fsFilter ); if ( m_gvpart->document()->isOpen() ) m_gvpart->slotFitToPage(); } else { - kapp->removeEventFilter( m_fsFilter ); + tdeApp->removeEventFilter( m_fsFilter ); m_gvpart->updateFullScreen( false ); menuBar()->show(); #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) diff --git a/kghostview/kpswidget.cpp b/kghostview/kpswidget.cpp index e64a6c25..e89d19e3 100644 --- a/kghostview/kpswidget.cpp +++ b/kghostview/kpswidget.cpp @@ -298,7 +298,7 @@ void KPSWidget::setupWidget() { setEraseColor( white ); setFixedSize( newWidth, newHeight ); - kapp->processEvents(); + tdeApp->processEvents(); _backgroundPixmap.resize( size() ); _backgroundPixmap.fill( white ); @@ -367,7 +367,7 @@ bool KPSWidget::startInterpreter() connect( _process, TQ_SIGNAL( wroteStdin( TDEProcess*) ), this, TQ_SLOT( gs_input( TDEProcess* ) ) ); - kapp->flushX(); + tdeApp->flushX(); // Finally fire up the interpreter. kdDebug(4500) << "KPSWidget: starting interpreter" << endl; diff --git a/kghostview/main.cpp b/kghostview/main.cpp index cd11b877..38a2f2e0 100644 --- a/kghostview/main.cpp +++ b/kghostview/main.cpp @@ -50,7 +50,7 @@ int main( int argc, char** argv ) TDEApplication app; TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); - if( kapp->isRestored() ) + if( tdeApp->isRestored() ) RESTORE( KGVShell ) else { KGVShell* shell = new KGVShell; diff --git a/kolourpaint/kpcommandhistory.cpp b/kolourpaint/kpcommandhistory.cpp index 943c4501..e4ec7eb0 100644 --- a/kolourpaint/kpcommandhistory.cpp +++ b/kolourpaint/kpcommandhistory.cpp @@ -413,7 +413,7 @@ void kpCommandHistoryBase::readConfig () #if DEBUG_KP_COMMAND_HISTORY kdDebug () << "kpCommandHistoryBase::readConfig()" << endl; #endif - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupUndoRedo); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupUndoRedo); TDEConfigBase *cfg = cfgGroupSaver.config (); setUndoMinLimit (cfg->readNumEntry (kpSettingUndoMinLimit, undoMinLimit ())); @@ -430,7 +430,7 @@ void kpCommandHistoryBase::writeConfig () #if DEBUG_KP_COMMAND_HISTORY kdDebug () << "kpCommandHistoryBase::writeConfig()" << endl; #endif - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupUndoRedo); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupUndoRedo); TDEConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingUndoMinLimit, undoMinLimit ()); diff --git a/kolourpaint/kpmainwindow.cpp b/kolourpaint/kpmainwindow.cpp index d43921d1..211830be 100644 --- a/kolourpaint/kpmainwindow.cpp +++ b/kolourpaint/kpmainwindow.cpp @@ -103,7 +103,7 @@ double kpMainWindow::configColorSimilarity () const // public void kpMainWindow::configSetColorSimilarity (double val) { - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupGeneral); TDEConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingColorSimilarity, m_configColorSimilarity = val); @@ -118,7 +118,7 @@ void kpMainWindow::readGeneralSettings () kdDebug () << "\tkpMainWindow(" << name () << ")::readGeneralSettings()" << endl; #endif - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupGeneral); TDEConfigBase *cfg = cfgGroupSaver.config (); m_configFirstTime = cfg->readBoolEntry (kpSettingFirstTime, true); @@ -147,7 +147,7 @@ void kpMainWindow::readThumbnailSettings () kdDebug () << "\tkpMainWindow(" << name () << ")::readThumbnailSettings()" << endl; #endif - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupThumbnail); TDEConfigBase *cfg = cfgGroupSaver.config (); m_configThumbnailShown = cfg->readBoolEntry (kpSettingThumbnailShown, false); @@ -208,7 +208,7 @@ void kpMainWindow::init () // TDEConfig::readEntry() does not actually reread from disk, hence doesn't // realise what other processes have done e.g. Settings / Show Path - kapp->config ()->reparseConfiguration (); + tdeApp->config ()->reparseConfiguration (); #if DEBUG_KP_MAIN_WINDOW kdDebug () << "\tTIME: reparseConfig = " << time.restart () << "msec" << endl; #endif @@ -298,7 +298,7 @@ void kpMainWindow::init () m_toolToolBar->setBarPos (TDEToolBar::Left); m_colorToolBar->setBarPos (TDEToolBar::Bottom); - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupGeneral); TDEConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingFirstTime, m_configFirstTime = false); diff --git a/kolourpaint/kpmainwindow_file.cpp b/kolourpaint/kpmainwindow_file.cpp index 60fd99a7..d9da99d2 100644 --- a/kolourpaint/kpmainwindow_file.cpp +++ b/kolourpaint/kpmainwindow_file.cpp @@ -71,7 +71,7 @@ void kpMainWindow::setupFileMenuActions () m_actionOpen = KStdAction::open (this, TQ_SLOT (slotOpen ()), ac); m_actionOpenRecent = KStdAction::openRecent (this, TQ_SLOT (slotOpenRecent (const KURL &)), ac); - m_actionOpenRecent->loadEntries (kapp->config ()); + m_actionOpenRecent->loadEntries (tdeApp->config ()); #if DEBUG_KP_MAIN_WINDOW kdDebug () << "\trecent URLs=" << m_actionOpenRecent->items () << endl; #endif @@ -146,7 +146,7 @@ void kpMainWindow::addRecentURL (const KURL &url) return; - TDEConfig *cfg = kapp->config (); + TDEConfig *cfg = tdeApp->config (); // TDEConfig::readEntry() does not actually reread from disk, hence doesn't // realise what other processes have done e.g. Settings / Show Path @@ -232,9 +232,9 @@ TQSize kpMainWindow::defaultDocSize () const { // TDEConfig::readEntry() does not actually reread from disk, hence doesn't // realise what other processes have done e.g. Settings / Show Path - kapp->config ()->reparseConfiguration (); + tdeApp->config ()->reparseConfiguration (); - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupGeneral); TDEConfigBase *cfg = cfgGroupSaver.config (); TQSize docSize = cfg->readSizeEntry (kpSettingLastDocSize); @@ -261,7 +261,7 @@ void kpMainWindow::saveDefaultDocSize (const TQSize &size) kdDebug () << "\tCONFIG: saving Last Doc Size = " << size << endl; #endif - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupGeneral); TDEConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingLastDocSize, size); @@ -605,11 +605,11 @@ KURL kpMainWindow::askForSaveURL (const TQString &caption, #define SETUP_READ_CFG() \ if (!reparsedConfiguration) \ { \ - kapp->config ()->reparseConfiguration (); \ + tdeApp->config ()->reparseConfiguration (); \ reparsedConfiguration = true; \ } \ \ - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), forcedSaveOptionsGroup); \ + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), forcedSaveOptionsGroup); \ TDEConfigBase *cfg = cfgGroupSaver.config (); @@ -715,7 +715,7 @@ KURL kpMainWindow::askForSaveURL (const TQString &caption, newSaveOptions.printDebug ("\tnewSaveOptions"); #endif - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), forcedSaveOptionsGroup); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), forcedSaveOptionsGroup); TDEConfigBase *cfg = cfgGroupSaver.config (); // Save options user forced - probably want to use them in future @@ -1262,7 +1262,7 @@ void kpMainWindow::slotMail () } } - kapp->invokeMailer ( + tdeApp->invokeMailer ( TQString()/*to*/, TQString()/*cc*/, TQString()/*bcc*/, diff --git a/kolourpaint/kpmainwindow_image.cpp b/kolourpaint/kpmainwindow_image.cpp index 9a5fd060..5e29a493 100644 --- a/kolourpaint/kpmainwindow_image.cpp +++ b/kolourpaint/kpmainwindow_image.cpp @@ -317,7 +317,7 @@ void kpMainWindow::slotResizeScale () { d->m_resizeScaleDialogLastKeepAspect = dialog.keepAspectRatio (); - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupGeneral); TDEConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingResizeScaleLastKeepAspect, @@ -464,7 +464,7 @@ void kpMainWindow::slotMoreEffects () { d->m_moreEffectsDialogLastEffect = dialog.selectedEffect (); - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupGeneral); TDEConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingMoreEffectsLastEffect, diff --git a/kolourpaint/kpmainwindow_settings.cpp b/kolourpaint/kpmainwindow_settings.cpp index c3fe3025..27150dce 100644 --- a/kolourpaint/kpmainwindow_settings.cpp +++ b/kolourpaint/kpmainwindow_settings.cpp @@ -116,7 +116,7 @@ void kpMainWindow::slotShowPathToggled () slotUpdateCaption (); - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupGeneral); TDEConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingShowPath, m_configShowPath); @@ -165,7 +165,7 @@ void kpMainWindow::slotConfigureToolBars () tool ()->endShapeInternal (); - //saveMainWindowSettings (kapp->config (), autoSaveGroup ()); + //saveMainWindowSettings (tdeApp->config (), autoSaveGroup ()); KEditToolbar dialog (actionCollection (), TQString()/*default ui.rc file*/, @@ -198,7 +198,7 @@ void kpMainWindow::slotNewToolBarConfig () TQString::fromLatin1 ("ToolBarSettingsChanged")); //createGUI(); - //applyMainWindowSettings (kapp->config (), autoSaveGroup ()); + //applyMainWindowSettings (tdeApp->config (), autoSaveGroup ()); } diff --git a/kolourpaint/kpmainwindow_text.cpp b/kolourpaint/kpmainwindow_text.cpp index 55dff166..9c876091 100644 --- a/kolourpaint/kpmainwindow_text.cpp +++ b/kolourpaint/kpmainwindow_text.cpp @@ -77,7 +77,7 @@ void kpMainWindow::setupTextToolBarActions () // private void kpMainWindow::readAndApplyTextSettings () { - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupText); TDEConfigBase *cfg = cfgGroupSaver.config (); m_actionTextFontFamily->setFont (cfg->readEntry (kpSettingFontFamily, TQString::fromLatin1 ("Times"))); @@ -141,7 +141,7 @@ void kpMainWindow::slotTextFontFamilyChanged () if (m_mainView) m_mainView->setFocus (); - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupText); TDEConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingFontFamily, m_actionTextFontFamily->font ()); cfg->sync (); @@ -174,7 +174,7 @@ void kpMainWindow::slotTextFontSizeChanged () if (m_mainView) m_mainView->setFocus (); - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupText); TDEConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingFontSize, m_actionTextFontSize->fontSize ()); cfg->sync (); @@ -199,7 +199,7 @@ void kpMainWindow::slotTextBoldChanged () if (m_toolText && m_toolText->hasBegun ()) m_toolText->slotBoldChanged (m_actionTextBold->isChecked ()); - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupText); TDEConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingBold, m_actionTextBold->isChecked ()); cfg->sync (); @@ -222,7 +222,7 @@ void kpMainWindow::slotTextItalicChanged () if (m_toolText && m_toolText->hasBegun ()) m_toolText->slotItalicChanged (m_actionTextItalic->isChecked ()); - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupText); TDEConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingItalic, m_actionTextItalic->isChecked ()); cfg->sync (); @@ -245,7 +245,7 @@ void kpMainWindow::slotTextUnderlineChanged () if (m_toolText && m_toolText->hasBegun ()) m_toolText->slotUnderlineChanged (m_actionTextUnderline->isChecked ()); - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupText); TDEConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingUnderline, m_actionTextUnderline->isChecked ()); cfg->sync (); @@ -268,7 +268,7 @@ void kpMainWindow::slotTextStrikeThruChanged () if (m_toolText && m_toolText->hasBegun ()) m_toolText->slotStrikeThruChanged (m_actionTextStrikeThru->isChecked ()); - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupText); TDEConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingStrikeThru, m_actionTextStrikeThru->isChecked ()); cfg->sync (); diff --git a/kolourpaint/kpmainwindow_tools.cpp b/kolourpaint/kpmainwindow_tools.cpp index 3e906899..0c77de8e 100644 --- a/kolourpaint/kpmainwindow_tools.cpp +++ b/kolourpaint/kpmainwindow_tools.cpp @@ -392,7 +392,7 @@ void kpMainWindow::slotToolSelected (kpTool *tool) // private void kpMainWindow::readLastTool () { - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupTools); TDEConfigBase *cfg = cfgGroupSaver.config (); m_lastToolNumber = cfg->readNumEntry (kpSettingLastTool, -1); @@ -424,7 +424,7 @@ void kpMainWindow::saveLastTool () return; - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupTools); TDEConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingLastTool, number); diff --git a/kolourpaint/kpmainwindow_view.cpp b/kolourpaint/kpmainwindow_view.cpp index e45888e9..0f7151a0 100644 --- a/kolourpaint/kpmainwindow_view.cpp +++ b/kolourpaint/kpmainwindow_view.cpp @@ -729,7 +729,7 @@ void kpMainWindow::slotShowGridToggled () updateMainViewGrid (); - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupGeneral); TDEConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingShowGrid, m_configShowGrid = m_actionShowGrid->isChecked ()); @@ -853,7 +853,7 @@ void kpMainWindow::slotSaveThumbnailGeometry () << endl; #endif - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupThumbnail); TDEConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingThumbnailGeometry, m_configThumbnailGeometry); @@ -869,7 +869,7 @@ void kpMainWindow::slotShowThumbnailToggled () m_configThumbnailShown = m_actionShowThumbnail->isChecked (); - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupThumbnail); TDEConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingThumbnailShown, m_configThumbnailShown); @@ -904,7 +904,7 @@ void kpMainWindow::slotZoomedThumbnailToggled () m_configZoomedThumbnail = m_actionZoomedThumbnail->isChecked (); - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupThumbnail); TDEConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingThumbnailZoomed, m_configZoomedThumbnail); @@ -923,7 +923,7 @@ void kpMainWindow::slotThumbnailShowRectangleToggled () d->m_configThumbnailShowRectangle = d->m_actionShowThumbnailRectangle->isChecked (); - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupThumbnail); TDEConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingThumbnailShowRectangle, d->m_configThumbnailShowRectangle); diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp index 15f1c895..a8b78672 100644 --- a/kolourpaint/kptool.cpp +++ b/kolourpaint/kptool.cpp @@ -1046,7 +1046,7 @@ void kpTool::mouseMoveEvent (TQMouseEvent *e) << " viewUnderCursorTQt=" << (v1 ? v1->name () : "(none)") << " viewUnderStartPoint=" << (v2 ? v2->name () : "(none)") << endl; - kdDebug () << "\tfocusWidget=" << kapp->focusWidget () << endl; + kdDebug () << "\tfocusWidget=" << tdeApp->focusWidget () << endl; #endif TQt::ButtonState buttonState = e->stateAfter (); diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp index 25761856..8c55015e 100644 --- a/kolourpaint/widgets/kptoolwidgetbase.cpp +++ b/kolourpaint/widgets/kptoolwidgetbase.cpp @@ -172,7 +172,7 @@ TQPair kpToolWidgetBase::defaultSelectedRowAndCol () const if (name ()) { - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupTools); TDEConfigBase *cfg = cfgGroupSaver.config (); TQString nameString = TQString::fromLatin1 (name ()); @@ -215,7 +215,7 @@ void kpToolWidgetBase::saveSelectedAsDefault () const if (!name ()) return; - TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools); + TDEConfigGroupSaver cfgGroupSaver (tdeApp->config (), kpSettingsGroupTools); TDEConfigBase *cfg = cfgGroupSaver.config (); TQString nameString = TQString::fromLatin1 (name ()); diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp index af8f5dd6..41b8d959 100644 --- a/kooka/kooka.cpp +++ b/kooka/kooka.cpp @@ -459,7 +459,7 @@ void Kooka::slEnableWarnings( ) { KMessageBox::information (this, i18n("All messages and warnings will now be shown.")); KMessageBox::enableAllMessages(); - kapp->config()->reparseConfiguration(); + tdeApp->config()->reparseConfiguration(); } #include "kooka.moc" diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp index 0f73aa5c..577a9fc9 100644 --- a/kooka/ksaneocr.cpp +++ b/kooka/ksaneocr.cpp @@ -489,7 +489,7 @@ void KSANEOCR::startOCRProcess( void ) /* starting the animation, setting fields disabled */ m_ocrProcessDia->startOCR(); - kapp->processEvents(); + tdeApp->processEvents(); if( m_ocrEngine == OCRAD ) { startOCRAD(); diff --git a/kpdf/conf/dlggeneral.ui.h b/kpdf/conf/dlggeneral.ui.h index 3a12c7c9..262d3c71 100644 --- a/kpdf/conf/dlggeneral.ui.h +++ b/kpdf/conf/dlggeneral.ui.h @@ -19,7 +19,7 @@ void DlgGeneral::showEvent( TQShowEvent * ) #if KPDF_FORCE_DRM kcfg_ObeyDRM->hide(); #else - if (kapp->authorize("skip_drm")) kcfg_ObeyDRM->show(); + if (tdeApp->authorize("skip_drm")) kcfg_ObeyDRM->show(); else kcfg_ObeyDRM->hide(); #endif } diff --git a/kpdf/core/document.cpp b/kpdf/core/document.cpp index 97bc6706..e58151e8 100644 --- a/kpdf/core/document.cpp +++ b/kpdf/core/document.cpp @@ -1068,7 +1068,7 @@ void KPDFDocument::processLink( const KPDFLink * link ) const KPDFLinkBrowse * browse = static_cast< const KPDFLinkBrowse * >( link ); // if the url is a mailto one, invoke mailer if ( browse->url().startsWith( "mailto:", false ) ) - kapp->invokeMailer( browse->url() ); + tdeApp->invokeMailer( browse->url() ); else { TQString url = browse->url(); diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp index 08578a8e..7818f2c3 100644 --- a/kpdf/core/generator_pdf/generator_pdf.cpp +++ b/kpdf/core/generator_pdf/generator_pdf.cpp @@ -260,7 +260,7 @@ const DocumentSynopsis * PDFGenerator::generateDocumentSynopsis() bool PDFGenerator::isAllowed( int permissions ) { #if !KPDF_FORCE_DRM - if (kapp->authorize("skip_drm") && !KpdfSettings::obeyDRM()) return true; + if (tdeApp->authorize("skip_drm") && !KpdfSettings::obeyDRM()) return true; #endif bool b = true; diff --git a/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp index a0fdefdc..463f8a12 100644 --- a/kpdf/shell/shell.cpp +++ b/kpdf/shell/shell.cpp @@ -209,7 +209,7 @@ Shell::applyNewToolbarConfig() void Shell::slotQuit() { - kapp->closeAllWindows(); + tdeApp->closeAllWindows(); } // only called when starting the program diff --git a/kpdf/ui/pageviewutils.cpp b/kpdf/ui/pageviewutils.cpp index 90d90472..9f09ca09 100644 --- a/kpdf/ui/pageviewutils.cpp +++ b/kpdf/ui/pageviewutils.cpp @@ -26,7 +26,7 @@ PageViewMessage::PageViewMessage( TQWidget * parent ) { setFocusPolicy( TQWidget::NoFocus ); setBackgroundMode( NoBackground ); - setPaletteBackgroundColor(kapp->palette().color(TQPalette::Active, TQColorGroup::Background)); + setPaletteBackgroundColor(tdeApp->palette().color(TQPalette::Active, TQColorGroup::Background)); // if the layout is LtR, we can safely place it in the right position if ( !TQApplication::reverseLayout() ) move( 10, 10 ); diff --git a/kruler/klineal.cpp b/kruler/klineal.cpp index 9e9187a2..1cbce0b0 100644 --- a/kruler/klineal.cpp +++ b/kruler/klineal.cpp @@ -94,7 +94,7 @@ KLineal::KLineal(TQWidget*parent,const char* name):TDEMainWindow(parent,name){ mCurrentCursor = mNorthCursor; setMinimumSize(60,60); setMaximumSize(8000,8000); - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); TQColor defaultColor = DEFAULT_RULER_COLOR; TQFont defaultFont(TDEGlobalSettings::generalFont().family(), 8); defaultFont.setPixelSize(8); @@ -164,7 +164,7 @@ KLineal::KLineal(TQWidget*parent,const char* name):TDEMainWindow(parent,name){ mMenu->insertSeparator(); mMenu->insertItem(SmallIcon( "help" ), KStdGuiItem::help().text(), helpMenu()); mMenu->insertSeparator(); - mMenu->insertItem(SmallIcon( "system-log-out" ), KStdGuiItem::quit().text(), kapp, TQ_SLOT(quit()), CTRL+Key_Q); + mMenu->insertItem(SmallIcon( "system-log-out" ), KStdGuiItem::quit().text(), tdeApp, TQ_SLOT(quit()), CTRL+Key_Q); mLastClickPos = geometry().topLeft()+TQPoint(width()/2, height()/2); } @@ -420,7 +420,7 @@ void KLineal::setColor(const TQColor &color) { * save the ruler color to the config file */ void KLineal::saveSettings() { - TDEConfig *cfg = kapp->config(); // new TDEConfig(locateLocal("config", kapp->name()+"rc")); + TDEConfig *cfg = tdeApp->config(); // new TDEConfig(locateLocal("config", tdeApp->name()+"rc")); if (cfg) { TQColor color = mColor; cfg->setGroup(CFG_GROUP_SETTINGS); @@ -500,7 +500,7 @@ void KLineal::keyPressEvent(TQKeyEvent *e) { TQPoint dist(0,0); switch (e->key()) { case Key_F1: - kapp->invokeHelp(); + tdeApp->invokeHelp(); break; case Key_Left: dist.setX(-1); diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp index b82fd1c0..c0ebc1be 100644 --- a/ksnapshot/ksnapshot.cpp +++ b/ksnapshot/ksnapshot.cpp @@ -60,8 +60,6 @@ #include -#define kApp TDEApplication::kApplication() - KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent) : DCOPObject("interface"), KDialogBase(parent, name, true, TQString(), Help|User1, User1, @@ -139,7 +137,7 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent) } TDEAccel* accel = new TDEAccel(this); - accel->insert(TDEStdAccel::Quit, kapp, TQ_SLOT(quit())); + accel->insert(TDEStdAccel::Quit, tdeApp, TQ_SLOT(quit())); accel->insert( "QuickSave", i18n("Quick Save Snapshot &As..."), i18n("Save the snapshot to the file specified by the user without showing the file dialog."), CTRL+SHIFT+Key_S, this, TQ_SLOT(slotSave())); @@ -606,7 +604,7 @@ int KSnapshot::grabMode() void KSnapshot::updateCaption() { - setCaption( kApp->makeStdCaption( filename.fileName(), true, modified ) ); + setCaption( tdeApp->makeStdCaption( filename.fileName(), true, modified ) ); } void KSnapshot::slotMovePointer(int x, int y) diff --git a/ksvg/plugin/svgcreator.cpp b/ksvg/plugin/svgcreator.cpp index bbc59e2a..a3c5d825 100644 --- a/ksvg/plugin/svgcreator.cpp +++ b/ksvg/plugin/svgcreator.cpp @@ -68,7 +68,7 @@ bool SVGCreator::create(const TQString &path, int width, int height, TQImage &im m_finished = false; while(!m_finished) { - kapp->processOneEvent(); + tdeApp->processOneEvent(); } doc->deref(); diff --git a/kuickshow/src/generalwidget.cpp b/kuickshow/src/generalwidget.cpp index db8d5c7c..5289c8e7 100644 --- a/kuickshow/src/generalwidget.cpp +++ b/kuickshow/src/generalwidget.cpp @@ -112,7 +112,7 @@ GeneralWidget::~GeneralWidget() void GeneralWidget::slotURLClicked( const TQString & url ) { - kapp->invokeBrowser( url ); + tdeApp->invokeBrowser( url ); } void GeneralWidget::loadSettings( const KuickData& data ) diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp index 6b934f18..26668f22 100644 --- a/kuickshow/src/imagewindow.cpp +++ b/kuickshow/src/imagewindow.cpp @@ -101,7 +101,7 @@ void ImageWindow::init() // give the image window a different WM_CLASS XClassHint hint; - hint.res_name = const_cast( kapp->name() ); + hint.res_name = const_cast( tdeApp->name() ); hint.res_class = const_cast( "ImageWindow" ); XSetClassHint( x11Display(), winId(), &hint ); @@ -312,7 +312,7 @@ void ImageWindow::updateGeometry( int imWidth, int imHeight ) "%3 (%1 x %2)" ); caption = caption.arg( m_kuim->originalWidth() ). arg( m_kuim->originalHeight() ).arg( m_kuim->url().prettyURL() ); - setCaption( kapp->makeStdCaption( caption ) ); + setCaption( tdeApp->makeStdCaption( caption ) ); } diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp index 9ff903b3..f823d02d 100644 --- a/kuickshow/src/kuickshow.cpp +++ b/kuickshow/src/kuickshow.cpp @@ -192,7 +192,7 @@ KuickShow::KuickShow( const char *name ) if ( s_viewers.isEmpty() || isDir ) { initGUI( startDir ); - if (!kapp->isRestored()) // during session management, readProperties() will show() + if (!tdeApp->isRestored()) // during session management, readProperties() will show() show(); } @@ -212,7 +212,7 @@ KuickShow::~KuickShow() FileCache::shutdown(); free( id ); - kapp->quit(); + tdeApp->quit(); delete kdata; } @@ -873,7 +873,7 @@ bool KuickShow::eventFilter( TQObject *o, TQEvent *e ) { if ( m_delayedRepeatItem ) // we probably need to install an eventFilter over { - return true; // kapp, to make it really safe + return true; // tdeApp, to make it really safe } bool ret = false; @@ -1079,7 +1079,7 @@ void KuickShow::configuration() dialog = new KuickConfigDialog( fileWidget->actionCollection(), 0L, "dialog", false ); dialog->resize( 540, 510 ); - dialog->setIcon( kapp->miniIcon() ); + dialog->setIcon( tdeApp->miniIcon() ); connect( dialog, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotConfigApplied() ) ); diff --git a/kview/kimageviewer/canvas.h b/kview/kimageviewer/canvas.h index 52682d11..21dfc23e 100644 --- a/kview/kimageviewer/canvas.h +++ b/kview/kimageviewer/canvas.h @@ -52,7 +52,7 @@ namespace KImageViewer if( ! ( widget && m_canvas ) ) { KMessageBox::error( this, "Could not find the Canvas!" ); - kapp->quit(); + tdeApp->quit(); } setCentralWidget( widget ); connect( widget, TQ_SIGNAL( contextPress( const TQPoint & ) ), TQ_SLOT( mySlot( const TQPoint & ) ) ); diff --git a/kview/kview.cpp b/kview/kview.cpp index 34dd83ee..3ef926b8 100644 --- a/kview/kview.cpp +++ b/kview/kview.cpp @@ -145,7 +145,7 @@ KView::KView() else { KMessageBox::error( this, i18n( "An error occurred while loading the KViewViewer KPart. Check your installation." ) ); - TQTimer::singleShot( 0, kapp, TQ_SLOT( quit() ) ); + TQTimer::singleShot( 0, tdeApp, TQ_SLOT( quit() ) ); } } @@ -653,7 +653,7 @@ TQSize KView::barSize( int mainwinwidth, BarSizeFrom from ) width += toolBar()->width(); break; case TDEToolBar::Flat: - height += kapp->style().pixelMetric( TQStyle::PM_DockWindowHandleExtent ); + height += tdeApp->style().pixelMetric( TQStyle::PM_DockWindowHandleExtent ); break; case TDEToolBar::Floating: break; diff --git a/kview/kviewcanvas/test/test.cpp b/kview/kviewcanvas/test/test.cpp index de1694f8..9fae6f82 100644 --- a/kview/kviewcanvas/test/test.cpp +++ b/kview/kviewcanvas/test/test.cpp @@ -26,7 +26,7 @@ KImageViewerTest::KImageViewerTest() else { KMessageBox::error(this, "Could not find our Part!"); - kapp->quit(); + tdeApp->quit(); } } diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp index a51d29e3..d3973946 100644 --- a/kview/kviewviewer/kviewviewer.cpp +++ b/kview/kviewviewer/kviewviewer.cpp @@ -803,8 +803,8 @@ void KViewViewer::slotFileDirty( const TQString & ) if( isModified() && isReadWrite() ) { KPassivePopup * pop = new KPassivePopup( m_pParentWidget ); - TQVBox * vb = pop->standardView( i18n( "Load changed image? - %1" ).arg( kapp->aboutData()->programName() ), - TQString(), kapp->miniIcon() ); + TQVBox * vb = pop->standardView( i18n( "Load changed image? - %1" ).arg( tdeApp->aboutData()->programName() ), + TQString(), tdeApp->miniIcon() ); ( void )new TQLabel( i18n( "The image %1 which you have modified has changed on disk.\n" "Do you want to reload the file and lose your changes?\n" "If you don't and subsequently save the image, you will lose the\n" diff --git a/kview/kviewviewer/test/test.cpp b/kview/kviewviewer/test/test.cpp index 87b0d1c8..ed854567 100644 --- a/kview/kviewviewer/test/test.cpp +++ b/kview/kviewviewer/test/test.cpp @@ -27,7 +27,7 @@ Test::Test() else { KMessageBox::error(this, "Could not find our Part!"); - kapp->quit(); + tdeApp->quit(); } } diff --git a/kview/modules/browser/kviewbrowser.cpp b/kview/modules/browser/kviewbrowser.cpp index fff86dbb..1ba8823e 100644 --- a/kview/modules/browser/kviewbrowser.cpp +++ b/kview/modules/browser/kviewbrowser.cpp @@ -168,9 +168,9 @@ void KViewBrowser::setupDirLister() kdDebug( 4630 ) << "open KDirLister for " << url << endl; m_pDirLister->openURL( KURL( url )); while( ! m_pDirLister->isFinished() ) - kapp->processEvents(); + tdeApp->processEvents(); //while( ! m_pFileItemList ) - //kapp->processEvents(); + //tdeApp->processEvents(); TQApplication::restoreOverrideCursor(); } } diff --git a/kviewshell/documentWidget.cpp b/kviewshell/documentWidget.cpp index 90533c26..dfd97033 100644 --- a/kviewshell/documentWidget.cpp +++ b/kviewshell/documentWidget.cpp @@ -187,7 +187,7 @@ void DocumentWidget::paintEvent(TQPaintEvent *e) if (!isVisible()) { //kdDebug() << "widget of page " << pageNr << " is not visible. Abort rendering" << endl; - kapp->processEvents(); + tdeApp->processEvents(); return; } @@ -687,7 +687,7 @@ void DocumentWidget::delayedRequestPage() //kdDebug() << "delayedRequest: widget of page " << pageNr << " is not visible. Abort rendering" << endl; pixmapRequested = false; - kapp->processEvents(); + tdeApp->processEvents(); return; } @@ -699,7 +699,7 @@ void DocumentWidget::delayedRequestPage() // displayed one after another. Widthout it all widgets are updated after all the rendering // is completed. This is especially noticable in overview mode. After the change to a seperate // rendering thread this will probably not be needed anymore. - kapp->processEvents(); + tdeApp->processEvents(); } TQSize DocumentWidget::pageSize() const diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp index a370bc76..ae9d673f 100644 --- a/kviewshell/kviewpart.cpp +++ b/kviewshell/kviewpart.cpp @@ -724,7 +724,7 @@ bool KViewPart::openFile() bool progress_dialog_was_cancelled = false; while ((read = filterDev->readBlock(buf.data(), buf.size())) > 0) { - kapp->processEvents(); + tdeApp->processEvents(); progress_dialog_was_cancelled = prog->wasCancelled(); if (progress_dialog_was_cancelled) break; @@ -856,7 +856,7 @@ bool KViewPart::openFile() // is at first show at a very small zoomlevel before the zoom switches to the right value. // This makes the plugin switching actually slower. // TODO: Get rid of this without causing nasty artifacts. - kapp->processEvents(); + tdeApp->processEvents(); initializeMultiPage(); partManager->setActivePart(this); diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp index 12d56b73..ff6b3902 100644 --- a/kviewshell/kviewshell.cpp +++ b/kviewshell/kviewshell.cpp @@ -158,8 +158,8 @@ void KViewShell::slotQuit() menuBar()->show(); view->slotSetFullPage(false); } - kapp->closeAllWindows(); - kapp->quit(); + tdeApp->closeAllWindows(); + tdeApp->quit(); } @@ -168,7 +168,7 @@ void KViewShell::readSettings() resize(600, 300); // default size if the config file specifies no size setAutoSaveSettings( "General" ); // apply mainwindow settings (size, toolbars, etc.) - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General"); recent->loadEntries(config, "Recent Files"); @@ -191,7 +191,7 @@ void KViewShell::readSettings() void KViewShell::writeSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( "General" ); recent->saveEntries(config, "Recent Files"); diff --git a/kviewshell/marklist.cpp b/kviewshell/marklist.cpp index 0d895df3..fcd80160 100644 --- a/kviewshell/marklist.cpp +++ b/kviewshell/marklist.cpp @@ -144,7 +144,7 @@ void ThumbnailWidget::setThumbnail() // When we are fast scrolling thru the document. Many paint events are created, that // are often not needed anymore at the time the eventloop executes them. //kdDebug() << "Delayed request Abort Thumbnail drawing for page " << pageNumber << endl; - kapp->processEvents(); + tdeApp->processEvents(); return; } @@ -157,7 +157,7 @@ void ThumbnailWidget::setThumbnail() setFixedHeight(thumbnail.height() + 2); update(); - kapp->processEvents(); + tdeApp->processEvents(); } diff --git a/kviewshell/plugins/djvu/djvurenderer.cpp b/kviewshell/plugins/djvu/djvurenderer.cpp index 2bac1743..2fac80bb 100644 --- a/kviewshell/plugins/djvu/djvurenderer.cpp +++ b/kviewshell/plugins/djvu/djvurenderer.cpp @@ -403,7 +403,7 @@ bool DjVuRenderer::initializeDocument() for(TQ_UINT16 i=0; iprocessEvents(); + tdeApp->processEvents(); GP djvuFile = document->get_djvu_file(i); int resolution; @@ -611,7 +611,7 @@ bool DjVuRenderer::convertToPSFile( DjVuToPS &converter, TQString filename, TQVa delete pdialog; // This is to keep the GUI updated. - kapp->processEvents(); + tdeApp->processEvents(); obs->flush(); return !iscancelled; @@ -639,7 +639,7 @@ void DjVuRenderer::deletePages(TQ_UINT16 from, TQ_UINT16 to) pdialog->progressBar()->setTotalSteps(to-from+1); pdialog->progressBar()->setFormat(TQString()); pdialog->show(); - kapp->processEvents(); + tdeApp->processEvents(); } // set the document pointer temporarily to 0, so that no-one tries @@ -658,7 +658,7 @@ void DjVuRenderer::deletePages(TQ_UINT16 from, TQ_UINT16 to) document_new->remove_page(from-1); pdialog->progressBar()->setProgress(i-from); pdialog->progressBar()->setFormat(i18n("deleting page %1").arg(i)); - kapp->processEvents(); + tdeApp->processEvents(); } delete pdialog; } @@ -712,7 +712,7 @@ void DjVuRenderer::printerInfoCallBack(int page_num, int page_count, int, DjVuTo G_THROW("STOP"); // This is to keep the GUI updated. - kapp->processEvents(); + tdeApp->processEvents(); } diff --git a/kviewshell/tdemultipage.cpp b/kviewshell/tdemultipage.cpp index 49294609..b11f9b38 100644 --- a/kviewshell/tdemultipage.cpp +++ b/kviewshell/tdemultipage.cpp @@ -639,7 +639,7 @@ void KMultiPage::handleLocalLink(const TQString &linkText) TQStringList args; args << "openURL"; args << Link_Url.toString(); - kapp->tdeinitExec("kfmclient", args); + tdeApp->tdeinitExec("kfmclient", args); } } } @@ -1428,7 +1428,7 @@ void KMultiPage::findNextText() if (i != 0) { setStatusBarText(i18n("Search page %1 of %2").arg(pageNumber).arg(numberOfPages())); - kapp->processEvents(); + tdeApp->processEvents(); } // Check if we already have a rendered version of the page in the cache. As we are only interested in the @@ -1570,7 +1570,7 @@ void KMultiPage::findPrevText() if (i != 0) { setStatusBarText(i18n("Search page %1 of %2").arg(pageNumber).arg(numberOfPages())); - kapp->processEvents(); + tdeApp->processEvents(); } // Check if we already have a rendered version of the page in the cache. As we are only interested in the diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp index 0003520e..3829643d 100644 --- a/libkscan/img_canvas.cpp +++ b/libkscan/img_canvas.cpp @@ -675,7 +675,7 @@ void ImageCanvas::update_scaled_pixmap( void ) if( scaleKind() == DYNAMIC ) kdDebug(28000) << "Scaling DYNAMIC" << endl; TQSize noSBSize( visibleWidth(), visibleHeight()); - const int sbWidth = kapp->style().pixelMetric( TQStyle::PM_ScrollBarExtent ); + const int sbWidth = tdeApp->style().pixelMetric( TQStyle::PM_ScrollBarExtent ); // if( verticalScrollBar()->visible() ) noSBSize.width()+=sbWidth; // if( horizontalScrollBar()->visible() ) noSBSize.height()+=sbWidth; diff --git a/tdeiconedit/kcolorgrid.cpp b/tdeiconedit/kcolorgrid.cpp index 131d5a9f..b19a9516 100644 --- a/tdeiconedit/kcolorgrid.cpp +++ b/tdeiconedit/kcolorgrid.cpp @@ -138,7 +138,7 @@ void KColorGrid::paintEvent(TQPaintEvent *e) matrix.reset(); p.setWorldMatrix( matrix ); } - //kapp->processEvents(); + //tdeApp->processEvents(); } matrix.translate(-urect.x(),-urect.y()); diff --git a/tdeiconedit/knew.cpp b/tdeiconedit/knew.cpp index 5bbc4ed0..40609e99 100644 --- a/tdeiconedit/knew.cpp +++ b/tdeiconedit/knew.cpp @@ -71,7 +71,7 @@ void createStandardTemplates(TDEIconTemplateContainer *list) void TDEIconTemplateContainer::save() { - TDEConfig *k = kapp->config(); + TDEConfig *k = tdeApp->config(); k->setGroup("Templates"); TQStringList names; @@ -91,7 +91,7 @@ void TDEIconTemplateContainer::save() TDEIconTemplateContainer::TDEIconTemplateContainer() : TQValueList() { TQStrList names; - TDEConfig *k = kapp->config(); + TDEConfig *k = tdeApp->config(); k->setGroup("Templates"); k->readListEntry("Names", names); for(int i = 0; i < (int)names.count(); i++) diff --git a/tdeiconedit/properties.cpp b/tdeiconedit/properties.cpp index 4a90d7fe..4bd6b125 100644 --- a/tdeiconedit/properties.cpp +++ b/tdeiconedit/properties.cpp @@ -35,7 +35,7 @@ TDEIconEditProperties* TDEIconEditProperties::self() TDEIconEditProperties::TDEIconEditProperties() : TQObject() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( "Appearance" ); @@ -92,7 +92,7 @@ TDEIconEditProperties::~TDEIconEditProperties() void TDEIconEditProperties::save() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( "Appearance" ); diff --git a/tdeiconedit/tdeiconconfig.cpp b/tdeiconedit/tdeiconconfig.cpp index 3763f4db..cceeb519 100644 --- a/tdeiconedit/tdeiconconfig.cpp +++ b/tdeiconedit/tdeiconconfig.cpp @@ -534,7 +534,7 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent) parent, "configDialog", true, true) { setHelp(TQString()); - //KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); + //KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon()); connect(this, TQ_SIGNAL(finished()), this, TQ_SLOT(finis())); TQVBox* page = addVBoxPage(i18n("Icon Templates"), TQString(), loadIcon("icons")); diff --git a/tdeiconedit/tdeiconedit.cpp b/tdeiconedit/tdeiconedit.cpp index b72320ac..af5dcf12 100644 --- a/tdeiconedit/tdeiconedit.cpp +++ b/tdeiconedit/tdeiconedit.cpp @@ -55,7 +55,7 @@ void TDEIconEdit::init() setMinimumSize( 600, 540 ); windowList.append(this); - setCaption(kapp->caption()); + setCaption(tdeApp->caption()); m_paletteToolBar = 0L; statusbar = 0L; @@ -141,7 +141,7 @@ void TDEIconEdit::init() setCentralWidget(gridview); - applyMainWindowSettings( kapp->config(), "MainWindowSettings" ); + applyMainWindowSettings( tdeApp->config(), "MainWindowSettings" ); updateProperties(); updateAccels(); @@ -155,7 +155,7 @@ TDEIconEdit::~TDEIconEdit() if (windowList.count() < 1) { - kapp->quit(); + tdeApp->quit(); } } @@ -214,8 +214,8 @@ void TDEIconEdit::readProperties(TDEConfig *config) */ void TDEIconEdit::writeConfig() { - TDEConfig *config = kapp->config(); - m_actRecent->saveEntries( kapp->config() ); + TDEConfig *config = tdeApp->config(); + m_actRecent->saveEntries( tdeApp->config() ); TDEIconEditProperties::self()->save(); @@ -253,7 +253,7 @@ void TDEIconEdit::setupActions() m_actRecent = KStdAction::openRecent(this, TQ_SLOT(slotOpenRecent(const KURL&)), actionCollection()); m_actRecent->setMaxItems(15); // FIXME should be configurable! - m_actRecent->loadEntries(kapp->config()); + m_actRecent->loadEntries(tdeApp->config()); action = KStdAction::save(this, TQ_SLOT(slotSave()), actionCollection()); action->setWhatsThis(i18n("Save\n\nSave the current icon")); diff --git a/tdeiconedit/tdeicongrid.cpp b/tdeiconedit/tdeicongrid.cpp index c4caedc3..bc268f34 100644 --- a/tdeiconedit/tdeicongrid.cpp +++ b/tdeiconedit/tdeicongrid.cpp @@ -319,7 +319,7 @@ TDEIconEditGrid::TDEIconEditGrid(TQImage *image, KCommandHistory* h, TQWidget *p setNumCols(32); fill(TRANSPARENT); - connect( kapp->clipboard(), TQ_SIGNAL(dataChanged()), TQ_SLOT(checkClipboard())); + connect( tdeApp->clipboard(), TQ_SIGNAL(dataChanged()), TQ_SLOT(checkClipboard())); connect( h, TQ_SIGNAL(commandExecuted()), this, TQ_SLOT(updatePreviewPixmap() )); createCursors(); @@ -1035,7 +1035,7 @@ void TDEIconEditGrid::load( TQImage *image) setColor((y*numCols())+x, *l, false); } //kdDebug(4640) << "Row: " << y << endl; - kapp->processEvents(200); + tdeApp->processEvents(200); } updateColors(); @@ -1118,7 +1118,7 @@ TQImage TDEIconEditGrid::clipboardImage(bool &ok) { TQCString format = fileFormats.current(); TQCString type = "image/" + format.lower(); - if (kapp->clipboard()->data()->provides(type ) ) + if (tdeApp->clipboard()->data()->provides(type ) ) { oneIsSupported = true; } @@ -1130,7 +1130,7 @@ TQImage TDEIconEditGrid::clipboardImage(bool &ok) return TQImage(); } - TQImage image = kapp->clipboard()->image(); + TQImage image = tdeApp->clipboard()->image(); ok = !image.isNull(); if ( ok ) { @@ -1213,7 +1213,7 @@ TQImage TDEIconEditGrid::getSelection(bool cut) void TDEIconEditGrid::editCopy(bool cut) { - kapp->clipboard()->setImage(getSelection(cut)); + tdeApp->clipboard()->setImage(getSelection(cut)); isselecting = false; } -- cgit v1.2.1