diff options
97 files changed, 247 insertions, 247 deletions
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index 6793afaf..5ed76143 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -509,7 +509,7 @@ TQString AutoProjectPart::makeEnvironment() const environstr += " "; } - TDEConfigGroup grp( kapp->config(), "MakeOutputView" ); + TDEConfigGroup grp( tdeApp->config(), "MakeOutputView" ); if( grp.readBoolEntry( "ForceCLocale", true ) ) environstr += "LC_MESSAGES="+EnvVarTools::quote("C")+" "+"LC_CTYPE="+EnvVarTools::quote("C")+" "; diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index 2fa7515f..9ce7b0cf 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -466,7 +466,7 @@ void AutoSubprojectView::slotRemoveSubproject() } parent->listView()->setSelected( parent, true ); - kapp->processEvents( 500 ); + tdeApp->processEvents( 500 ); if( removeSources ){ diff --git a/buildtools/autotools/autotoolsaction.cpp b/buildtools/autotools/autotoolsaction.cpp index fbaf91a8..66fe9f08 100644 --- a/buildtools/autotools/autotoolsaction.cpp +++ b/buildtools/autotools/autotoolsaction.cpp @@ -104,7 +104,7 @@ int AutoToolsAction::plug( TQWidget* w, int index ) } // Check if action is permitted - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return -1; if ( ::tqt_cast<TQToolButton*>( w ) ) diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index 1941d2e8..839b23da 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -884,7 +884,7 @@ TQString CustomProjectPart::makeEnvironment() const environstr += " "; } - TDEConfigGroup grp( kapp->config(), "MakeOutputView" ); + TDEConfigGroup grp( tdeApp->config(), "MakeOutputView" ); if( grp.readBoolEntry( "ForceCLocale", true ) ) environstr += "LC_MESSAGES=" + EnvVarTools::quote( "C" )+" "+" "+"LC_CTYPE="+EnvVarTools::quote("C")+" "; diff --git a/buildtools/lib/widgets/addfilesdialog.cpp b/buildtools/lib/widgets/addfilesdialog.cpp index 64bb9471..1508d48d 100644 --- a/buildtools/lib/widgets/addfilesdialog.cpp +++ b/buildtools/lib/widgets/addfilesdialog.cpp @@ -28,7 +28,7 @@ AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, TQWidget *parent, const char *name, bool modal): KFileDialog(startDir, filter, parent, name, modal) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Add Files Dialog"); m_extraWidget = new TQComboBox(false, this); @@ -48,7 +48,7 @@ AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, TQWidget *parent, const char *name, bool modal, TQComboBox *extraWidget): KFileDialog(startDir, filter, parent, name, modal, extraWidget), m_extraWidget(extraWidget) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Add Files Dialog"); m_extraWidget->insertItem(i18n("Copy File(s)"), 0); @@ -72,7 +72,7 @@ AddFilesDialog::Mode AddFilesDialog::mode( ) void AddFilesDialog::storePreferred( int index ) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Add Files Dialog"); config->writeEntry("Mode", index); } diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index ab5f8fad..58aa9d17 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -260,7 +260,7 @@ TQString TrollProjectPart::makeEnvironment() environstr += TQString( "TQTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$TQTDIR/bin:$PATH " ); } - TDEConfigGroup grp( kapp->config(), "MakeOutputView" ); + TDEConfigGroup grp( tdeApp->config(), "MakeOutputView" ); if( grp.readBoolEntry( "ForceCLocale", true ) ) environstr += "LC_MESSAGES="+EnvVarTools::quote("C")+" "+" "+"LC_CTYPE="+EnvVarTools::quote("C")+" "; diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 7d102ceb..1b0e8990 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -679,7 +679,7 @@ void TrollProjectWidget::slotExecuteTarget() m_part->appFrontend()->stopApplication(); while(m_part->appFrontend()->isRunning()) { - TDEApplication::kApplication()->processEvents(); + tdeApp->processEvents(); usleep(100); } } @@ -2052,7 +2052,7 @@ void TrollProjectWidget::slotExecuteProject() m_part->appFrontend()->stopApplication(); while(m_part->appFrontend()->isRunning()) { - TDEApplication::kApplication()->processEvents(); + tdeApp->processEvents(); usleep(100); } } diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook index 8dff869d..1044cfe4 100644 --- a/doc/kdearch/index.docbook +++ b/doc/kdearch/index.docbook @@ -1814,7 +1814,7 @@ class. In order to show the manual of your application, just use </para> <programlisting> -kapp->invokeHelp() +tdeApp->invokeHelp() </programlisting> <para> @@ -2139,7 +2139,7 @@ class: </para> <programlisting> -DCOPClient *client = kapp->dcopClient(); +DCOPClient *client = tdeApp->dcopClient(); client->attach(); if (!client->isApplicationRegistered("tdeio_uiserver")) { TQString error; diff --git a/editors/editor-chooser/editorchooser_widget.cpp b/editors/editor-chooser/editorchooser_widget.cpp index ae253456..427830d4 100644 --- a/editors/editor-chooser/editorchooser_widget.cpp +++ b/editors/editor-chooser/editorchooser_widget.cpp @@ -41,7 +41,7 @@ void EditorChooserWidget::load() EditorPart->clear(); // find the editor to use - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Editor"); TQString editor = config->readPathEntry("EmbeddedKTextEditor"); @@ -78,7 +78,7 @@ void EditorChooserWidget::load() void EditorChooserWidget::save() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Editor"); TDETrader::OfferList::Iterator it; diff --git a/kdevdesigner/src/kdevdesigner.cpp b/kdevdesigner/src/kdevdesigner.cpp index 6ff96718..d5f3fcc0 100644 --- a/kdevdesigner/src/kdevdesigner.cpp +++ b/kdevdesigner/src/kdevdesigner.cpp @@ -76,8 +76,8 @@ KDevDesigner::KDevDesigner() // if we couldn't find our Part, we exit since the Shell by // itself can't do anything useful KMessageBox::error(this, i18n("Could not find the KDevDesigner part.")); - kapp->quit(); - // we return here, cause kapp->quit() only means "exit the + tdeApp->quit(); + // we return here, cause tdeApp->quit() only means "exit the // next time we enter the event loop... return; } @@ -102,7 +102,7 @@ void KDevDesigner::setupActions() /* KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());*/ - KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp index ab1eac5e..05927d6e 100644 --- a/languages/ada/adasupportpart.cpp +++ b/languages/ada/adasupportpart.cpp @@ -126,8 +126,8 @@ void AdaSupportPart::initialParse () if (project ()) { mainWindow()->statusBar()->message( i18n("Updating...") ); - kapp->processEvents( ); - kapp->setOverrideCursor (waitCursor); + tdeApp->processEvents( ); + tdeApp->setOverrideCursor (waitCursor); int n = 0; TQStringList files = project ()->allFiles (); @@ -143,7 +143,7 @@ void AdaSupportPart::initialParse () TQString fn = project ()->projectDirectory () + "/" + *it; maybeParse (fn); - kapp->processEvents (500); + tdeApp->processEvents (500); } emit updatedSourceInfo(); @@ -151,7 +151,7 @@ void AdaSupportPart::initialParse () mainWindow( )->statusBar( )->removeWidget( bar ); delete bar; - kapp->restoreOverrideCursor (); + tdeApp->restoreOverrideCursor (); mainWindow( )->statusBar( )->message( i18n( "Done" ), 2000 ); /* mainWindow ()->statusBar ()->message (i18n ("Found 1 problem", "Found %n problems", d->problemReporter->childCount ()));*/ diff --git a/languages/ada/configproblemreporter.ui.h b/languages/ada/configproblemreporter.ui.h index cd22ba1f..cda9f269 100644 --- a/languages/ada/configproblemreporter.ui.h +++ b/languages/ada/configproblemreporter.ui.h @@ -11,7 +11,7 @@ void ConfigureProblemReporter::init() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); bgParserCheckbox->setChecked( config->readBoolEntry("EnableAdaBgParser", true) ); delaySlider->setEnabled( bgParserCheckbox->isChecked() ); @@ -24,7 +24,7 @@ void ConfigureProblemReporter::destroy() void ConfigureProblemReporter::accept() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); config->writeEntry( "EnableAdaBgParser", bgParserCheckbox->isChecked() ); if( bgParserCheckbox->isChecked() ) diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp index 66966f33..df9b14ac 100644 --- a/languages/ada/problemreporter.cpp +++ b/languages/ada/problemreporter.cpp @@ -244,7 +244,7 @@ void ProblemReporter::reportMessage( TQString message, void ProblemReporter::configure() { kdDebug() << "ProblemReporter::configure()" << endl; - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); m_active = config->readBoolEntry( "EnableAdaBgParser", TRUE ); m_delay = config->readNumEntry( "BgParserDelay", 500 ); diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp index 674ff798..24b21746 100644 --- a/languages/bash/bashsupport_part.cpp +++ b/languages/bash/bashsupport_part.cpp @@ -121,7 +121,7 @@ void BashSupportPart::parse() if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { @@ -129,7 +129,7 @@ void BashSupportPart::parse() parse(project()->projectDirectory() + "/" + *it); } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } else { kdDebug(9014) << "No project" << endl; } diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.cpp b/languages/cpp/app_templates/dcopservice/dcopservice.cpp index a631186c..cca191c1 100644 --- a/languages/cpp/app_templates/dcopservice/dcopservice.cpp +++ b/languages/cpp/app_templates/dcopservice/dcopservice.cpp @@ -45,5 +45,5 @@ bool %{APPNAME}::remove(TQString arg) bool %{APPNAME}::exit() { - kapp->quit(); + tdeApp->quit(); } diff --git a/languages/cpp/app_templates/kapp/Makefile.am b/languages/cpp/app_templates/kapp/Makefile.am index efe532d3..a6a4e597 100644 --- a/languages/cpp/app_templates/kapp/Makefile.am +++ b/languages/cpp/app_templates/kapp/Makefile.am @@ -16,4 +16,4 @@ $(templateName).tar.gz: ${dataFiles} archivedir = ${appwizarddatadir} archive_DATA = $(templateName).tar.gz ${templateName}.png -CLEANFILES = *.tar.gz
\ No newline at end of file +CLEANFILES = *.tar.gz diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp index d801904f..3fad8256 100644 --- a/languages/cpp/app_templates/kapp/app.cpp +++ b/languages/cpp/app_templates/kapp/app.cpp @@ -93,7 +93,7 @@ void %{APPNAME}::setupActions() KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); KStdAction::print(this, TQ_SLOT(filePrint()), actionCollection()); - KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp index c96ffbf1..25955e3f 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp @@ -134,14 +134,14 @@ void %{APPNAME}Part::parse() if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { kdDebug(9014) << "maybe parse " << project()->projectDirectory() + "/" + (*it) << endl; } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } else { kdDebug(9014) << "No project" << endl; } diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp index f963714e..6b5e22a5 100644 --- a/languages/cpp/app_templates/kpartapp/app.cpp +++ b/languages/cpp/app_templates/kpartapp/app.cpp @@ -53,8 +53,8 @@ // if we couldn't find our Part, we exit since the Shell by // itself can't do anything useful KMessageBox::error(this, i18n("Could not find our part.")); - kapp->quit(); - // we return here, cause kapp->quit() only means "exit the + tdeApp->quit(); + // we return here, cause tdeApp->quit() only means "exit the // next time we enter the event loop... return; } @@ -79,7 +79,7 @@ void %{APPNAME}::setupActions() KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp index 44a90d53..f918fe91 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.cpp +++ b/languages/cpp/app_templates/kscons_kxt/app.cpp @@ -63,7 +63,7 @@ void %{APPNAME}::setupActions() { KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp index e9edb6d5..9001f45e 100644 --- a/languages/cpp/app_templates/kxt/app.cpp +++ b/languages/cpp/app_templates/kxt/app.cpp @@ -61,7 +61,7 @@ void %{APPNAMELC}::setupActions() { KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); diff --git a/languages/cpp/app_templates/tdeconfig35/app.cpp b/languages/cpp/app_templates/tdeconfig35/app.cpp index ce638d20..66a901d2 100644 --- a/languages/cpp/app_templates/tdeconfig35/app.cpp +++ b/languages/cpp/app_templates/tdeconfig35/app.cpp @@ -48,7 +48,7 @@ void %{APPNAMELC}::setupActions() { KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp index a111acde..be28b31b 100644 --- a/languages/cpp/backgroundparser.cpp +++ b/languages/cpp/backgroundparser.cpp @@ -77,9 +77,9 @@ public: { m_deadlock.unlock(); // GET LOCK - kapp->lock (); + tdeApp->lock (); - //kdDebug(9007) << "-------> kapp locked" << endl; + //kdDebug(9007) << "-------> tdeApp locked" << endl; TQPtrList<KParts::Part> parts( *m_cppSupport->partController() ->parts() ); TQPtrListIterator<KParts::Part> it( parts ); @@ -94,15 +94,15 @@ public: contents = TQString( editIface->text().ascii() ); // deep copy - //kdDebug(9007) << "-------> kapp unlocked" << endl; + //kdDebug(9007) << "-------> tdeApp unlocked" << endl; break; } // RELEASE LOCK - kapp->unlock(); + tdeApp->unlock(); m_deadlock.lock(); - //kdDebug(9007) << "-------> kapp unlocked" << endl; + //kdDebug(9007) << "-------> tdeApp unlocked" << endl; } if( m_readFromDisk || contents == TQString() ) @@ -123,7 +123,7 @@ public: { bool ret = false; m_deadlock.unlock(); - kapp->lock (); + tdeApp->lock (); KParts::ReadOnlyPart *part = m_cppSupport->partController()->partForURL( KURL(fileName) ); KTextEditor::Document * doc = dynamic_cast<KTextEditor::Document*>( part ); @@ -131,7 +131,7 @@ public: if ( doc ) ret = doc->isModified(); - kapp->unlock(); + tdeApp->unlock(); m_deadlock.lock(); return ret; } @@ -475,11 +475,11 @@ void BackgroundParser::close() m_close = true; m_canParse.wakeAll(); } - kapp->unlock(); + tdeApp->unlock(); while ( running() ) sleep( 1 ); - kapp->lock(); + tdeApp->lock(); } bool BackgroundParser::filesInQueue() diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h index f65db442..43fa1b67 100644 --- a/languages/cpp/configproblemreporter.ui.h +++ b/languages/cpp/configproblemreporter.ui.h @@ -21,7 +21,7 @@ void ConfigureProblemReporter::init() { m_part = 0; - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); problemReporterCheckbox->setChecked( config->readBoolEntry( "EnableProblemReporter", true ) ); bgParserCheckbox->setChecked( config->readBoolEntry( "EnableCppBgParser", true ) ); @@ -54,7 +54,7 @@ void ConfigureProblemReporter::setPart( CppSupportPart* part ) void ConfigureProblemReporter::accept() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "General Options" ); config->writeEntry( "EnableProblemReporter", problemReporterCheckbox->isChecked() ); config->writeEntry( "EnableCppBgParser", bgParserCheckbox->isChecked() ); diff --git a/languages/cpp/cppsupport_utils.cpp b/languages/cpp/cppsupport_utils.cpp index e58639e0..68c89488 100644 --- a/languages/cpp/cppsupport_utils.cpp +++ b/languages/cpp/cppsupport_utils.cpp @@ -120,7 +120,7 @@ static void typedefMap( TQMap<TQString, TQString> & map, ClassDom klass ) TQString formattedOpeningParenthesis(bool suppressSpace) { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("AStyle"); bool use_spaces = config->readBoolEntry("PadParentheses", false); if (not use_spaces or suppressSpace) return "("; @@ -129,7 +129,7 @@ TQString formattedOpeningParenthesis(bool suppressSpace) TQString formattedClosingParenthesis(bool suppressSpace) { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("AStyle"); bool use_spaces = config->readBoolEntry("PadParentheses", false); if (not use_spaces or suppressSpace) return ")"; diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index c94539de..7d02b77c 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -178,7 +178,7 @@ class BackgroundParserConfig public: void readConfig() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); m_useProblemReporter = config->readBoolEntry( "EnableProblemReporter", true ); m_useBackgroundParser = config->readBoolEntry( "EnableCppBgParser", true ); @@ -1464,7 +1464,7 @@ bool CppSupportPart::parseProject( bool force ) mainWindow() ->statusBar() ->message( i18n( "Updating..." ) ); - kapp->setOverrideCursor( waitCursor ); + tdeApp->setOverrideCursor( waitCursor ); _jd = new JobData; if( TQFileInfo( project() ->projectDirectory() + "/" + project()->projectName().lower() @@ -1604,7 +1604,7 @@ void CppSupportPart::slotParseFiles() _jd->backgroundState = 0; _jd->cycle = 1; _jd->lastParse = TQTime::currentTime(); - kapp->restoreOverrideCursor( ); + tdeApp->restoreOverrideCursor( ); } } else // finished or interrupted @@ -1615,7 +1615,7 @@ void CppSupportPart::slotParseFiles() if ( !m_projectClosed ) { kdDebug( 9007 ) << "updating sourceinfo" << endl; - kapp->restoreOverrideCursor( ); + tdeApp->restoreOverrideCursor( ); emit updatedSourceInfo(); mainWindow( ) ->statusBar( ) ->message( i18n( "Done" ), 2000 ); TQFile::remove( project() ->projectDirectory() @@ -1835,7 +1835,7 @@ void CppSupportPart::slotMakeMember() if ( !implFile.isEmpty() ) { partController() ->editDocument( KURL( implFile ) ); - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers, 500 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers, 500 ); } if ( atLine == -2 ) atLine = m_activeEditor->numLines() - 1; diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index e2efd7b0..ea0c410d 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -374,13 +374,13 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi void DebuggerPart::setupDcop() { - QCStringList objects = kapp->dcopClient()->registeredApplications(); + QCStringList objects = tdeApp->dcopClient()->registeredApplications(); for (QCStringList::Iterator it = objects.begin(); it != objects.end(); ++it) if ((*it).find("drkonqi-") == 0) slotDCOPApplicationRegistered(*it); - connect(kapp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)), TQ_SLOT(slotDCOPApplicationRegistered(const TQCString&))); - kapp->dcopClient()->setNotifications(true); + connect(tdeApp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)), TQ_SLOT(slotDCOPApplicationRegistered(const TQCString&))); + tdeApp->dcopClient()->setNotifications(true); } void DebuggerPart::slotDCOPApplicationRegistered(const TQCString& appId) @@ -389,14 +389,14 @@ void DebuggerPart::slotDCOPApplicationRegistered(const TQCString& appId) TQByteArray answer; TQCString replyType; - kapp->dcopClient()->call(appId, "krashinfo", "appName()", TQByteArray(), replyType, answer, true, 5000); + tdeApp->dcopClient()->call(appId, "krashinfo", "appName()", TQByteArray(), replyType, answer, true, 5000); TQDataStream d(answer, IO_ReadOnly); TQCString appName; d >> appName; if (appName.length() && project() && project()->mainProgram().endsWith(appName)) { - kapp->dcopClient()->send(appId, "krashinfo", "registerDebuggingApplication(TQString)", i18n("Debug in &TDevelop")); + tdeApp->dcopClient()->send(appId, "krashinfo", "registerDebuggingApplication(TQString)", i18n("Debug in &TDevelop")); connectDCOPSignal(appId, "krashinfo", "acceptDebuggingApplication()", "slotDebugExternalProcess()", true); } } @@ -407,14 +407,14 @@ ASYNC DebuggerPart::slotDebugExternalProcess() TQByteArray answer; TQCString replyType; - kapp->dcopClient()->call(kapp->dcopClient()->senderId(), "krashinfo", "pid()", TQByteArray(), replyType, answer, true, 5000); + tdeApp->dcopClient()->call(tdeApp->dcopClient()->senderId(), "krashinfo", "pid()", TQByteArray(), replyType, answer, true, 5000); TQDataStream d(answer, IO_ReadOnly); int pid; d >> pid; if (attachProcess(pid) && m_drkonqi.isEmpty()) { - m_drkonqi = kapp->dcopClient()->senderId(); + m_drkonqi = tdeApp->dcopClient()->senderId(); TQTimer::singleShot(15000, this, TQ_SLOT(slotCloseDrKonqi())); mainWindow()->raiseView(framestackWidget); } @@ -429,13 +429,13 @@ ASYNC DebuggerPart::slotDebugCommandLine(const TQString& /*command*/) void DebuggerPart::slotCloseDrKonqi() { - kapp->dcopClient()->send(m_drkonqi, "MainApplication-Interface", "quit()", TQByteArray()); + tdeApp->dcopClient()->send(m_drkonqi, "MainApplication-Interface", "quit()", TQByteArray()); m_drkonqi = ""; } DebuggerPart::~DebuggerPart() { - kapp->dcopClient()->setNotifications(false); + tdeApp->dcopClient()->setNotifications(false); if (variableWidget) mainWindow()->removeView(variableWidget); diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp index 60c4366b..da53c0ec 100644 --- a/languages/cpp/debugger/gdbcontroller.cpp +++ b/languages/cpp/debugger/gdbcontroller.cpp @@ -984,7 +984,7 @@ void GDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); now = TQTime::currentTime(); if (!stateIsOn(s_dbgBusy) || start.msecsTo( now ) > 2000) break; @@ -1002,7 +1002,7 @@ void GDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); now = TQTime::currentTime(); if (!stateIsOn(s_attached) || start.msecsTo( now ) > 2000) break; @@ -1018,7 +1018,7 @@ void GDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); now = TQTime::currentTime(); if (stateIsOn(s_programExited) || start.msecsTo( now ) > 2000) break; @@ -1098,7 +1098,7 @@ void GDBController::slotRun() if (stateIsOn(s_appNotStarted)) { delete tty_; - tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *kapp->config() )); + tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *tdeApp->config() )); if (!config_dbgTerminal_) { connect( tty_, TQ_SIGNAL(OutOutput(const char*)), TQ_SIGNAL(ttyStdout(const char*)) ); @@ -1840,7 +1840,7 @@ int GDBController::qtVersion( ) const void GDBController::demandAttention() const { - if ( TQWidget * w = kapp->mainWidget() ) + if ( TQWidget * w = tdeApp->mainWidget() ) { KWin::demandAttention( w->winId(), true ); } diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp index 0c2ea291..3f8a2760 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp @@ -41,8 +41,8 @@ TQListBoxItem* TQListBox_selectedItem( TQListBox* cpTQListBox ) SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) : SettingsDialogBase( parent, name, fl ) { - TDEApplication::kApplication()->dirs()->addResourceType("include","include"); - TQStringList tdedirs=TDEApplication::kApplication()->dirs()->findDirs("include",""); + tdeApp->dirs()->addResourceType("include","include"); + TQStringList tdedirs=tdeApp->dirs()->findDirs("include",""); for( TQStringList::Iterator it=tdedirs.begin(); it!=tdedirs.end(); ++it ) { TQString tdedir = *it; diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp index 400cfcfa..886b486e 100644 --- a/languages/csharp/csharpsupportpart.cpp +++ b/languages/csharp/csharpsupportpart.cpp @@ -262,9 +262,9 @@ void CSharpSupportPart::initialParse() if (project()) { //copy from cpp support : give user some feedback mainWindow()->statusBar()->message( i18n("Updating...") ); - kapp->processEvents( ); + tdeApp->processEvents( ); - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); // m_parser->initialParse(); @@ -281,7 +281,7 @@ void CSharpSupportPart::initialParse() //update progress bar bar->setProgress( n++ ); if( (n%5) == 0 ) - kapp->processEvents(); + tdeApp->processEvents(); } parseUseFiles(); emit updatedSourceInfo(); @@ -289,7 +289,7 @@ void CSharpSupportPart::initialParse() //remove progressbar mainWindow( )->statusBar( )->removeWidget( bar ); delete bar; - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); mainWindow()->statusBar()->message( i18n("Done") ); } else { diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp index 67f66279..cd82ebab 100644 --- a/languages/fortran/fortransupportpart.cpp +++ b/languages/fortran/fortransupportpart.cpp @@ -208,7 +208,7 @@ void FortranSupportPart::initialParse() kdDebug(9019) << "initialParse()" << endl; if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { TQFileInfo fileInfo( project()->projectDirectory(), *it ); @@ -217,7 +217,7 @@ void FortranSupportPart::initialParse() } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } else { kdDebug(9019) << "No project" << endl; } diff --git a/languages/java/app_templates/kappjava/app.java b/languages/java/app_templates/kappjava/app.java index 50f3bff1..00202b9d 100644 --- a/languages/java/app_templates/kappjava/app.java +++ b/languages/java/app_templates/kappjava/app.java @@ -76,13 +76,13 @@ public void load(KURL url) public void setupActions() { - TDEApplication kapp = TDEApplication.kApplication(); + TDEApplication tdeApp = TDEApplication.tdeApplication(); KStdAction.openNew(this, TQ_SLOT("fileNew()"), actionCollection()); KStdAction.open(this, TQ_SLOT("fileOpen()"), actionCollection()); KStdAction.save(this, TQ_SLOT("fileSave()"), actionCollection()); KStdAction.saveAs(this, TQ_SLOT("fileSaveAs()"), actionCollection()); KStdAction.print(this, TQ_SLOT("filePrint()"), actionCollection()); - KStdAction.quit(kapp, TQ_SLOT("quit()"), actionCollection()); + KStdAction.quit(tdeApp, TQ_SLOT("quit()"), actionCollection()); KStdAction.preferences(this, TQ_SLOT("optionsPreferences()"), actionCollection()); diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp index 7c63a63f..68a59a20 100644 --- a/languages/java/backgroundparser.cpp +++ b/languages/java/backgroundparser.cpp @@ -47,13 +47,13 @@ public: virtual TQString contents( const TQString& fileName ) { if( !m_readFromDisk ){ - //kdDebug(9013) << "-------> kapp is locked = " << kapp->locked() << endl; - bool needToLock = kapp->locked() == false; + //kdDebug(9013) << "-------> tdeApp is locked = " << tdeApp->locked() << endl; + bool needToLock = tdeApp->locked() == false; if( needToLock ) - kapp->lock(); + tdeApp->lock(); - //kdDebug(9013) << "-------> kapp locked" << endl; + //kdDebug(9013) << "-------> tdeApp locked" << endl; TQPtrList<KParts::Part> parts( *m_javaSupport->partController()->parts() ); TQPtrListIterator<KParts::Part> it( parts ); @@ -68,16 +68,16 @@ public: TQString contents = TQString( editIface->text().ascii() ); // deep copy if( needToLock ) - kapp->unlock(); + tdeApp->unlock(); - //kdDebug(9013) << "-------> kapp unlocked" << endl; + //kdDebug(9013) << "-------> tdeApp unlocked" << endl; return contents; } if( needToLock ) - kapp->unlock(); - //kdDebug(9013) << "-------> kapp unlocked" << endl; + tdeApp->unlock(); + //kdDebug(9013) << "-------> tdeApp unlocked" << endl; } TQFile f( fileName ); diff --git a/languages/java/configproblemreporter.ui.h b/languages/java/configproblemreporter.ui.h index ef0510d3..b2f76ed2 100644 --- a/languages/java/configproblemreporter.ui.h +++ b/languages/java/configproblemreporter.ui.h @@ -11,7 +11,7 @@ void ConfigureProblemReporter::init() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); bgParserCheckbox->setChecked( config->readBoolEntry("EnableJavaBgParser", true) ); delaySlider->setEnabled( bgParserCheckbox->isChecked() ); @@ -25,7 +25,7 @@ void ConfigureProblemReporter::destroy() void ConfigureProblemReporter::accept() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); config->writeEntry( "EnableJavaBgParser", bgParserCheckbox->isChecked() ); if( bgParserCheckbox->isChecked() ) diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp index 36f9dadc..238ebffa 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -491,8 +491,8 @@ JavaSupportPart::parseProject( ) mainWindow()->statusBar()->message( i18n("Updating...") ); - kapp->processEvents( ); - kapp->setOverrideCursor( waitCursor ); + tdeApp->processEvents( ); + tdeApp->setOverrideCursor( waitCursor ); TQStringList files = modifiedFileList(); @@ -546,7 +546,7 @@ JavaSupportPart::parseProject( ) kdDebug(9013) << "parse file: " << absFilePath << endl; if( (n%5) == 0 ){ - kapp->processEvents(); + tdeApp->processEvents(); if( m_projectClosed ){ delete( bar ); @@ -574,7 +574,7 @@ JavaSupportPart::parseProject( ) if( m_projectClosed ){ kdDebug(9013) << "ABORT" << endl; - kapp->restoreOverrideCursor( ); + tdeApp->restoreOverrideCursor( ); return false; } } @@ -587,7 +587,7 @@ JavaSupportPart::parseProject( ) //mainWindow( )->statusBar( )->removeWidget( label ); //delete label; - kapp->restoreOverrideCursor( ); + tdeApp->restoreOverrideCursor( ); mainWindow( )->statusBar( )->message( i18n( "Done" ), 2000 ); return true; diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp index e5a158b6..2155a517 100644 --- a/languages/java/problemreporter.cpp +++ b/languages/java/problemreporter.cpp @@ -227,7 +227,7 @@ void ProblemReporter::reportProblem( const TQString& fileName, const Problem& p void ProblemReporter::configure() { kdDebug(9013) << "ProblemReporter::configure()" << endl; - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); m_active = config->readBoolEntry( "EnableJavaBgParser", TRUE ); m_delay = config->readNumEntry( "BgParserDelay", 500 ); diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp index 306fdb4a..a2e6b989 100644 --- a/languages/kjssupport/kjssupport_part.cpp +++ b/languages/kjssupport/kjssupport_part.cpp @@ -202,7 +202,7 @@ void kjsSupportPart::parse() if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); m_problemReporter->clear(); @@ -214,7 +214,7 @@ void kjsSupportPart::parse() } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } else { kdDebug(9014) << "No project" << endl; } diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp index 76758693..bb00f039 100644 --- a/languages/pascal/pascalsupport_part.cpp +++ b/languages/pascal/pascalsupport_part.cpp @@ -138,7 +138,7 @@ void PascalSupportPart::addedFilesToProject(const TQStringList &fileList) { TQString fn = project()->projectDirectory() + "/" + *it; maybeParse( fn ); - kapp->processEvents( 500 ); + tdeApp->processEvents( 500 ); emit addedSourceInfo(fn); } } @@ -165,7 +165,7 @@ void PascalSupportPart::initialParse( ) if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); /// @todo Progress indicator! @@ -173,12 +173,12 @@ void PascalSupportPart::initialParse( ) for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it){ TQString fn = project()->projectDirectory() + "/" + *it; maybeParse( fn ); - kapp->processEvents( 500 ); + tdeApp->processEvents( 500 ); } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); mainWindow()->statusBar()->message( i18n("Found 1 problem", "Found %n problems", d->problemReporter->childCount()) ); } } diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp index d88599e0..1f2ba4d4 100644 --- a/languages/pascal/problemreporter.cpp +++ b/languages/pascal/problemreporter.cpp @@ -250,7 +250,7 @@ void ProblemReporter::reportMessage( TQString message, void ProblemReporter::configure() { kdDebug(9007) << "ProblemReporter::configure()" << endl; - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); m_active = config->readBoolEntry( "EnablePascalBgParser", TRUE ); m_delay = config->readNumEntry( "BgParserDelay", 500 ); diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp index 2b230cd7..910e9f7e 100644 --- a/languages/perl/perlsupportpart.cpp +++ b/languages/perl/perlsupportpart.cpp @@ -262,9 +262,9 @@ void PerlSupportPart::initialParse() if (project()) { //copy from cpp support : give user some feedback mainWindow()->statusBar()->message( i18n("Updating...") ); - kapp->processEvents( ); + tdeApp->processEvents( ); - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); m_parser->initialParse(); @@ -281,7 +281,7 @@ void PerlSupportPart::initialParse() //update progress bar bar->setProgress( n++ ); if( (n%5) == 0 ) - kapp->processEvents(); + tdeApp->processEvents(); } parseUseFiles(); emit updatedSourceInfo(); @@ -289,7 +289,7 @@ void PerlSupportPart::initialParse() //remove progressbar mainWindow( )->statusBar( )->removeWidget( bar ); delete bar; - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); mainWindow()->statusBar()->message( i18n("Done") ); } else { diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp index c592c763..b2757dda 100644 --- a/languages/php/phpfile.cpp +++ b/languages/php/phpfile.cpp @@ -71,7 +71,7 @@ TQStringList PHPFile::readFromEditor() { TQStringList contents; - kapp->lock(); + tdeApp->lock(); TQPtrList<KParts::Part> parts( *m_part->partController()->parts() ); TQPtrListIterator<KParts::Part> it( parts ); while( it.current() ){ @@ -85,7 +85,7 @@ TQStringList PHPFile::readFromEditor() contents = TQStringList::split("\n", editIface->text().ascii(), true); break; } - kapp->unlock(); + tdeApp->unlock(); return contents; } diff --git a/languages/php/phpparser.cpp b/languages/php/phpparser.cpp index 6b725dc8..99bc4b71 100644 --- a/languages/php/phpparser.cpp +++ b/languages/php/phpparser.cpp @@ -150,7 +150,7 @@ void PHPParser::close() m_canParse.wakeAll(); while (running()) { - kapp->processEvents(); + tdeApp->processEvents(); } } diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp index 273db008..9226104a 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -426,7 +426,7 @@ bool PHPSupportPart::parseProject() kdDebug(9018) << "parseProject()" << endl; mainWindow() ->statusBar() ->message( i18n( "Updating..." ) ); - kapp->setOverrideCursor( waitCursor ); + tdeApp->setOverrideCursor( waitCursor ); _jd = new JobData; @@ -450,7 +450,7 @@ void PHPSupportPart::slotParseFiles() { kdDebug(9018) << "slotParseFiles()" << endl; - kapp->lock(); + tdeApp->lock(); if ( _jd->it != _jd->files.end() ) { @@ -474,7 +474,7 @@ void PHPSupportPart::slotParseFiles() } else // finished or interrupted { - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); mainWindow()->statusBar()->removeWidget( _jd->progressBar ); mainWindow()->statusBar()->message( i18n( "Done" ), 2000 ); @@ -486,7 +486,7 @@ void PHPSupportPart::slotParseFiles() _jd = 0; } - kapp->unlock(); + tdeApp->unlock(); } void PHPSupportPart::addedFilesToProject(const TQStringList &fileList) @@ -570,7 +570,7 @@ void PHPSupportPart::customEvent( TQCustomEvent* ev ) if ( ev->type() < Event_AddFile || ev->type() > Event_AddFixme ) return; - kapp->lock(); + tdeApp->lock(); FileParseEvent* event = (FileParseEvent*) ev; NamespaceDom ns = codeModel()->globalNamespace(); @@ -736,8 +736,8 @@ void PHPSupportPart::customEvent( TQCustomEvent* ev ) } - kapp->unlock(); - kapp->processEvents(); + tdeApp->unlock(); + tdeApp->processEvents(); } PHPErrorView *PHPSupportPart::ErrorView( ) { diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp index 11e3d44f..333d5c82 100644 --- a/languages/python/pythonsupportpart.cpp +++ b/languages/python/pythonsupportpart.cpp @@ -154,7 +154,7 @@ void PythonSupportPart::initialParse() kdDebug(9014) << "initialParse()" << endl; if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { kdDebug(9014) << "maybe parse " << project()->projectDirectory() + "/" + (*it) << endl; @@ -162,7 +162,7 @@ void PythonSupportPart::initialParse() } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } else { kdDebug(9014) << "No project" << endl; } diff --git a/languages/ruby/app_templates/dcopservice/dcopservice.rb b/languages/ruby/app_templates/dcopservice/dcopservice.rb index b0e59b6d..487d4804 100644 --- a/languages/ruby/app_templates/dcopservice/dcopservice.rb +++ b/languages/ruby/app_templates/dcopservice/dcopservice.rb @@ -31,7 +31,7 @@ class %{APPNAME} < KDE::DCOPObject end def exit() - $kapp.quit() + $tdeApp.quit() return true end end diff --git a/languages/ruby/app_templates/kapp/app.rb b/languages/ruby/app_templates/kapp/app.rb index f5b9927e..39b919da 100644 --- a/languages/ruby/app_templates/kapp/app.rb +++ b/languages/ruby/app_templates/kapp/app.rb @@ -79,7 +79,7 @@ class %{APPNAMESC} < KDE::MainWindow KDE::StdAction.save(self, TQ_SLOT('fileSave()'), actionCollection()) KDE::StdAction.saveAs(self, TQ_SLOT('fileSaveAs()'), actionCollection()) KDE::StdAction.print(self, TQ_SLOT('filePrint()'), actionCollection()) - KDE::StdAction.quit($kapp, TQ_SLOT('quit()'), actionCollection()) + KDE::StdAction.quit($tdeApp, TQ_SLOT('quit()'), actionCollection()) KDE::StdAction.preferences(self, TQ_SLOT('optionsPreferences()'), actionCollection()) diff --git a/languages/ruby/app_templates/kxt/app.rb b/languages/ruby/app_templates/kxt/app.rb index 4ffcfe51..c8485460 100644 --- a/languages/ruby/app_templates/kxt/app.rb +++ b/languages/ruby/app_templates/kxt/app.rb @@ -49,7 +49,7 @@ class %{APPNAMESC} < KDE::MainWindow def setupActions() KDE::StdAction.openNew(self, TQ_SLOT('fileNew()'), actionCollection()) - KDE::StdAction.quit($kapp, TQ_SLOT('quit()'), actionCollection()) + KDE::StdAction.quit($tdeApp, TQ_SLOT('quit()'), actionCollection()) KDE::StdAction.preferences(self, TQ_SLOT('optionsPreferences()'), actionCollection()) diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp index b5210bdb..66c27513 100644 --- a/languages/ruby/debugger/debuggerpart.cpp +++ b/languages/ruby/debugger/debuggerpart.cpp @@ -270,7 +270,7 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ RubyDebuggerPart::~RubyDebuggerPart() { - kapp->dcopClient()->setNotifications(false); + tdeApp->dcopClient()->setNotifications(false); if (variableWidget) mainWindow()->removeView(variableWidget); diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp index e1cef233..a9580249 100644 --- a/languages/ruby/debugger/rdbcontroller.cpp +++ b/languages/ruby/debugger/rdbcontroller.cpp @@ -693,7 +693,7 @@ void RDBController::slotStart(const TQString& ruby_interpreter, const TQString& Q_ASSERT (!dbgProcess_ && !tty_); // tty_ = new STTY(config_dbgTerminal_, "konsole"); - tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *kapp->config() )); + tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *tdeApp->config() )); if (!config_dbgTerminal_) { connect( tty_, TQ_SIGNAL(OutOutput(const char*)), TQ_SIGNAL(ttyStdout(const char*)) ); @@ -797,7 +797,7 @@ void RDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->processEvents(20); + tdeApp->processEvents(20); now = TQTime::currentTime(); if (!stateIsOn(s_appBusy) || start.msecsTo( now ) > 2000) break; @@ -816,7 +816,7 @@ void RDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->processEvents(20); + tdeApp->processEvents(20); now = TQTime::currentTime(); if (stateIsOn(s_programExited) || start.msecsTo( now ) > 2000) break; diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp index 141d4081..f77f3d05 100644 --- a/languages/ruby/rubysupport_part.cpp +++ b/languages/ruby/rubysupport_part.cpp @@ -157,7 +157,7 @@ void RubySupportPart::initialParse() kdDebug() << "initialParse()" << endl; if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { kdDebug() << "maybe parse " << project()->projectDirectory() + "/" + (*it) << endl; @@ -165,7 +165,7 @@ void RubySupportPart::initialParse() } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } else { kdDebug() << "No project" << endl; } @@ -686,7 +686,7 @@ void RubySupportPart::slotCreateSubclass() void RubySupportPart::slotBrowse() { - kapp->invokeBrowser("http://localhost:3000/"); + tdeApp->invokeBrowser("http://localhost:3000/"); } void RubySupportPart::slotSwitchToController() diff --git a/lib/interfaces/katedocumentmanagerinterface.cpp b/lib/interfaces/katedocumentmanagerinterface.cpp index 0afbcc81..e190ed04 100644 --- a/lib/interfaces/katedocumentmanagerinterface.cpp +++ b/lib/interfaces/katedocumentmanagerinterface.cpp @@ -50,7 +50,7 @@ DCOPRef KateDocumentManagerInterface::document( uint n ) DCOPRef KateDocumentManagerInterface::documentWithID( uint id ) { TQString dcopobj = "KateDocument#" + TQString::number(id); - return DCOPRef(kapp->dcopClient()->appId(), dcopobj.latin1() ); + return DCOPRef(tdeApp->dcopClient()->appId(), dcopobj.latin1() ); } DCOPRef KateDocumentManagerInterface::openURL( const KURL &url, const TQString &encoding ) diff --git a/lib/util/tdescriptactionmanager.cpp b/lib/util/tdescriptactionmanager.cpp index de10a9e0..39f1c6c0 100644 --- a/lib/util/tdescriptactionmanager.cpp +++ b/lib/util/tdescriptactionmanager.cpp @@ -136,7 +136,7 @@ TQPtrList< TDEAction > KScriptActionManager::scripts( TQObject * interface , con TQStringList scripts; scripts += TDEGlobal::dirs()->findAllResources("data", - TQString(kapp->name())+"/scripts/*.desktop", false, true ); + TQString(tdeApp->name())+"/scripts/*.desktop", false, true ); for( TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) { diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index 8787ea45..481b3575 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -116,7 +116,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch m_appsInfo.setAutoDelete(true); m_tempFiles.setAutoDelete(true); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); //config->setGroup("AppWizard"); //templates_tabwidget->setCurrentPage(config->readNumEntry("CurrentTab", 0)); @@ -913,7 +913,7 @@ void AppWizardDialog::destButtonClicked(const TQString& dir) if(!dir.isEmpty()) { // set new location as default project dir? - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); TQDir defPrjDir( config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()) ); TQDir newDir (dir); @@ -1158,7 +1158,7 @@ void AppWizardDialog::removeFavourite() void AppWizardDialog::populateFavourites() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("AppWizard"); //favourites are stored in config as a list of templates and a seperate @@ -1204,7 +1204,7 @@ void AppWizardDialog::done(int r) } } - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("AppWizard"); config->writePathEntry("FavTemplates", templatesList); config->writeEntry("FavNames", iconNamesList); diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index af16f84f..df911cc1 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -88,7 +88,7 @@ AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) void AStylePart::loadGlobal() { // kdDebug(9009) << "Load global"<<endl; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("AStyle"); TQString options = config->readEntry("Options","BlockBreak=0,BlockBreakAll=0,BlockIfElse=0,Brackets=Break,BracketsCloseHeaders=0,FStyle=UserDefined,Fill=Tabs,FillCount=4,FillEmptyLines=0,FillForce=0,IndentBlocks=0,IndentBrackets=0,IndentCases=0,IndentClasses=1,IndentLabels=1,IndentNamespaces=1,IndentPreprocessors=0,IndentSwitches=1,KeepBlocks=1,KeepStatements=1,MaxStatement=40,MinConditional=-1,PadOperators=0,PadParenthesesIn=1,PadParenthesesOut=1,PadParenthesesUn=1,"); m_globalExtensions=TQStringList::split(",",config->readEntry("Extensions",defaultFormatExtensions)); @@ -123,7 +123,7 @@ void AStylePart::saveGlobal() // kdDebug(9009) << "project before: " <<iter.key() << "="<< iter.data() << endl; // } - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("AStyle"); config->writeEntry("Options",options); config->writeEntry("Extensions",m_globalExtensions.join(",")); diff --git a/parts/bookmarks/bookmarks_config.cpp b/parts/bookmarks/bookmarks_config.cpp index 36cc05a5..f49b76c8 100644 --- a/parts/bookmarks/bookmarks_config.cpp +++ b/parts/bookmarks/bookmarks_config.cpp @@ -32,7 +32,7 @@ BookmarksConfig::~BookmarksConfig() */ void BookmarksConfig::writeConfig() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Bookmarks"); config->writeEntry("Context", _context ); @@ -49,7 +49,7 @@ void BookmarksConfig::writeConfig() */ void BookmarksConfig::readConfig() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Bookmarks"); _context = config->readPropertyEntry( "Context", 5 ).toInt(); diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp index f42bd8db..5556446c 100644 --- a/parts/classview/navigator.cpp +++ b/parts/classview/navigator.cpp @@ -198,7 +198,7 @@ void Navigator::slotCursorPositionChanged() //FIXME: we assume that background parser delay is set globally in tdeveloprc file //for all available language supports //this is reasonable assumption because problem reporter should be the same for all languages - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); int m_delay = config->readNumEntry( "BgParserDelay", 500 ); diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp index 05ade367..80cee6e5 100644 --- a/parts/ctags2/ctags2_part.cpp +++ b/parts/ctags2/ctags2_part.cpp @@ -147,7 +147,7 @@ bool CTags2Part::createTagsFile(const TQString& tagFile, const TQString& dir) */ // get name of the ctags binary - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "CTAGS" ); TQString ctagsBinary = config->readEntry( "ctags binary" ).stripWhiteSpace(); if ( ctagsBinary.isEmpty() ) @@ -180,7 +180,7 @@ void CTags2Part::contextMenu(TQPopupMenu *popup, const Context *context) if (ident.isEmpty()) return; - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "CTAGS" ); bool showDeclaration = config->readBoolEntry( "ShowDeclaration", true ); bool showDefinition = config->readBoolEntry( "ShowDefinition", true ); @@ -223,7 +223,7 @@ void CTags2Part::gotoTagForTypes( TQStringList const & types ) if ( list.count() < 1 ) return; - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("CTAGS"); bool jumpToFirst = config->readBoolEntry( "JumpToFirst", false ); diff --git a/parts/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp index 96837e98..3d33b6a7 100644 --- a/parts/ctags2/ctags2_settingswidget.cpp +++ b/parts/ctags2/ctags2_settingswidget.cpp @@ -73,7 +73,7 @@ void CTags2SettingsWidget::loadSettings() TQStringList activeTagsFiles = DomUtil::readListEntry(dom, "/ctagspart/activeTagsFiles", "file"); - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "CTAGS" ); showDeclarationBox->setChecked( config->readBoolEntry( "ShowDeclaration", true ) ); showDefinitionBox->setChecked( config->readBoolEntry( "ShowDefinition", true ) ); @@ -102,7 +102,7 @@ void CTags2SettingsWidget::storeSettings() DomUtil::writeEntry( dom, "/ctagspart/customArguments", tagfileCustomEdit->text() ); DomUtil::writeEntry( dom, "/ctagspart/customTagfilePath", tagfilePath->url() ); - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "CTAGS" ); config->writeEntry( "ShowDeclaration", showDeclarationBox->isChecked() ); config->writeEntry( "ShowDefinition", showDefinitionBox->isChecked() ); diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp index 59dcf3de..2b7e5fc7 100644 --- a/parts/diff/diffwidget.cpp +++ b/parts/diff/diffwidget.cpp @@ -44,7 +44,7 @@ TQStringList KDiffTextEdit::extPartsTranslated; KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name ) { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "Diff" ); _highlight = config->readBoolEntry( "Highlight", true ); @@ -53,7 +53,7 @@ KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( KDiffTextEdit::~KDiffTextEdit() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "Diff" ); config->writeEntry( "Highlight", _highlight ); diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index 9822829b..c15cb185 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -70,12 +70,12 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, TDEConfig *config = m_part->config(); //read full text search settings config->setGroup("htdig"); - TQString databaseDir = kapp->dirs()->saveLocation("data", + TQString databaseDir = tdeApp->dirs()->saveLocation("data", "kdevdocumentation/search"); databaseDirEdit->setURL(config->readPathEntry("databaseDir", databaseDir)); - htdigbinEdit->setURL(config->readPathEntry("htdigbin", kapp->dirs()->findExe("htdig"))); - htmergebinEdit->setURL(config->readPathEntry("htmergebin", kapp->dirs()->findExe("htmerge"))); - htsearchbinEdit->setURL(config->readPathEntry("htsearchbin", kapp->dirs()->findExe("htsearch"))); + htdigbinEdit->setURL(config->readPathEntry("htdigbin", tdeApp->dirs()->findExe("htdig"))); + htmergebinEdit->setURL(config->readPathEntry("htmergebin", tdeApp->dirs()->findExe("htmerge"))); + htsearchbinEdit->setURL(config->readPathEntry("htsearchbin", tdeApp->dirs()->findExe("htsearch"))); if (config->readBoolEntry("IsSetup", false) == false) { TQFileInfo fi(htsearchbinEdit->url()); @@ -104,7 +104,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, useAssistant_box->setChecked(m_part->isAssistantUsed()); // Having app-specific settings isn't pretty, but this setting is nonsensical in kdevassistant - if ( kapp->instanceName().find("kdevassistant") != -1 ) + if ( tdeApp->instanceName().find("kdevassistant") != -1 ) useAssistant_box->hide(); //font sizes and zoom levels diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index 09aaa042..0bac7045 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -676,7 +676,7 @@ TQCString DocumentationPart::startAssistant() bool DocumentationPart::isAssistantUsed() const { // hack to solve BR #90334 - don't call kdevassistant via DCOP if we ARE kdevassistant - if ( kapp->instanceName().find("kdevassistant") != -1 ) + if ( tdeApp->instanceName().find("kdevassistant") != -1 ) { return false; } @@ -688,7 +688,7 @@ void DocumentationPart::setAssistantUsed(bool b) { m_assistantUsed = b; //use global config to store different settings for kdevassistant and tdevelop - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Documentation"); config->writeEntry("UseAssistant", isAssistantUsed()); } @@ -736,7 +736,7 @@ void DocumentationPart::callAssistant(const TQCString &interface, const TQCStrin void DocumentationPart::loadSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Documentation"); m_assistantUsed = config->readBoolEntry("UseAssistant", false); diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp index 7d533753..3430c440 100644 --- a/parts/documentation/documentation_widget.cpp +++ b/parts/documentation/documentation_widget.cpp @@ -69,7 +69,7 @@ DocumentationWidget::DocumentationWidget(DocumentationPart *part) DocumentationWidget::~DocumentationWidget() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Documentation"); config->writeEntry("LastPage", m_tab->currentIndex()); } diff --git a/parts/documentation/find_documentation_options.cpp b/parts/documentation/find_documentation_options.cpp index ef0deaca..ee8fd976 100644 --- a/parts/documentation/find_documentation_options.cpp +++ b/parts/documentation/find_documentation_options.cpp @@ -108,7 +108,7 @@ void FindDocumentationOptions::sourceMoveUp() void FindDocumentationOptions::writeOptions() { - config = kapp->config(); + config = tdeApp->config(); config->setGroup("DocumentationFinder"); config->writeEntry("goto_first_match", goto_first_match->isChecked()); @@ -151,7 +151,7 @@ void FindDocumentationOptions::writeOptions() void FindDocumentationOptions::readOptions() { - config = kapp->config(); + config = tdeApp->config(); config->setGroup("DocumentationFinder"); source_list->clear(); diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index b0496f03..287b36f9 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -152,7 +152,7 @@ void SearchView::search() updateIndex(); return; } - TQString exe = config->readPathEntry("htsearchbin", kapp->dirs()->findExe("htsearch")); + TQString exe = config->readPathEntry("htsearchbin", tdeApp->dirs()->findExe("htsearch")); if (exe.isEmpty()) { KMessageBox::error(this, i18n("Cannot find the htsearch executable.\nIt is part of the ht://Dig package that is used by TDevelop to perform full text search. Please install ht://Dig and use Documentation page in Configure TDevelop dialog to set the htsearch location.")); @@ -160,7 +160,7 @@ void SearchView::search() return; } - TQString indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); + TQString indexdir = tdeApp->dirs()->saveLocation("data", "kdevdocumentation/search"); TQDir d; if (indexdir.isEmpty() || !TQFile::exists(indexdir + "/htdig.conf")) { @@ -177,7 +177,7 @@ void SearchView::search() } } - TQString savedir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); + TQString savedir = tdeApp->dirs()->saveLocation("data", "kdevdocumentation/search"); if (!d.exists(savedir)) d.mkdir(savedir); @@ -191,7 +191,7 @@ void SearchView::search() kdDebug(9002) << "starting tdeprocess" << endl; kdDebug(9002) << "htdig line:" << exe << " -c " << (indexdir + "/htdig.conf ") << query << endl; TDEProcess *proc = new TDEProcess; - TQString picdir = kapp->dirs()->findResourceDir("data", "kdevdocumentation/pics/htdig.png"); + TQString picdir = tdeApp->dirs()->findResourceDir("data", "kdevdocumentation/pics/htdig.png"); proc->setEnvironment("PICDIR", picdir); *proc << exe << "-c" << (indexdir + "/htdig.conf") << query; @@ -213,12 +213,12 @@ void SearchView::search() // While receiving data from the subprocess, we want // to block the user interface, but still get repaint // events. Hack taken from NetAccess... - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQWidget blocker(0, 0, WType_Dialog | WShowModal); tqt_enter_modal(&blocker); - kapp->enter_loop(); + tdeApp->enter_loop(); tqt_leave_modal(&blocker); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); if (!proc->normalExit() || proc->exitStatus() != 0) { @@ -254,7 +254,7 @@ void SearchView::htsearchStdout(TDEProcess *, char *buffer, int len) void SearchView::htsearchExited(TDEProcess *) { - kapp->exit_loop(); + tdeApp->exit_loop(); } void SearchView::analyseSearchResults() diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index ce02d6bc..bbde09fa 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -45,7 +45,7 @@ ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name) { proc = 0; - indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); + indexdir = tdeApp->dirs()->saveLocation("data", "kdevdocumentation/search"); TQDir d; d.mkdir(indexdir); TDEConfig config("kdevdocumentation", true); @@ -170,14 +170,14 @@ void ProgressDialog::addDir(const TQString &dir) if (*it != "." && *it != "..") { addDir(dir + "/" + *it); - kapp->processEvents(); + tdeApp->processEvents(); } if (procdone) { return; } } - kapp->processEvents(); + tdeApp->processEvents(); } void ProgressDialog::scanDirectories() @@ -302,7 +302,7 @@ bool ProgressDialog::generateIndex() // run htdig TDEConfig config("kdevdocumentation", true); config.setGroup("htdig"); - exe = config.readPathEntry("htdigbin", kapp->dirs()->findExe("htdig")); + exe = config.readPathEntry("htdigbin", tdeApp->dirs()->findExe("htdig")); if (exe.isEmpty()) { done(1); @@ -368,7 +368,7 @@ void ProgressDialog::htdigExited(TDEProcess *proc) TDEConfig config("kdevdocumentation", true); config.setGroup("htdig"); // run htmerge ----------------------------------------------------- - exe = config.readPathEntry("htmergebin", kapp->dirs()->findExe("htmerge")); + exe = config.readPathEntry("htmergebin", tdeApp->dirs()->findExe("htmerge")); if (exe.isEmpty()) { done(1); diff --git a/parts/filelist/projectviewconfig.cpp b/parts/filelist/projectviewconfig.cpp index c982350e..4cb2338c 100644 --- a/parts/filelist/projectviewconfig.cpp +++ b/parts/filelist/projectviewconfig.cpp @@ -28,7 +28,7 @@ ProjectviewConfig::ProjectviewConfig(TQWidget *parent, const char *name) : ProjectviewConfigBase(parent, name) { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("File List Plugin"); inToolview->setChecked(config->readBoolEntry("ToolbarInToolview", true)); onlyProject->setChecked(config->readBoolEntry("OnlyProjectFiles", false)); @@ -37,7 +37,7 @@ ProjectviewConfig::ProjectviewConfig(TQWidget *parent, const char *name) void ProjectviewConfig::accept() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("File List Plugin"); config->writeEntry("ToolbarInToolview", inToolview->isChecked()); config->writeEntry("OnlyProjectFiles", onlyProject->isChecked()); diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp index 99b45623..39d309ef 100644 --- a/parts/filelist/projectviewpart.cpp +++ b/parts/filelist/projectviewpart.cpp @@ -88,7 +88,7 @@ ProjectviewPart::ProjectviewPart(TQObject *parent, const char *name, const TQStr connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); connect(core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed())); - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("File List Plugin"); if (config->readBoolEntry("ToolbarInToolview", true)) { @@ -382,7 +382,7 @@ void ProjectviewPart::projectClosed() void ProjectviewPart::slotOpenProjectView(const TQString &view) { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("File List Plugin"); bool onlyProject = config->readBoolEntry("OnlyProjectFiles", false); bool closeOpenFiles = config->readBoolEntry("CloseOpenFiles", true); @@ -535,7 +535,7 @@ void ProjectviewPart::slotSaveAsProjectView(bool askForName) void ProjectviewPart::writeConfig() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->deleteGroup("ProjectViews", true); config->setGroup("ProjectViews"); @@ -559,7 +559,7 @@ void ProjectviewPart::writeConfig() void ProjectviewPart::readConfig() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); TQMap<TQString, TQString> entries = config->entryMap("ProjectViews"); m_projectViews.clear(); diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index 83ff0fb6..3a57dc96 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -250,7 +250,7 @@ void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name) cmbPath->setMaxItems( config->readNumEntry( "pathcombo history len", 9 ) ); cmbPath->setURLs( config->readPathListEntry("dir history") ); // if we restore history - if ( config->readBoolEntry( "restore location", true ) || kapp->isRestored() ) + if ( config->readBoolEntry( "restore location", true ) || tdeApp->isRestored() ) { TQString loc( config->readPathEntry( "location" ) ); if ( ! loc.isEmpty() ) @@ -266,7 +266,7 @@ void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name) filter->setHistoryItems( config->readListEntry("filter history"), true ); lastFilter = config->readEntry( "last filter" ); TQString flt(""); - if ( config->readBoolEntry( "restore last filter", true ) || kapp->isRestored() ) + if ( config->readBoolEntry( "restore last filter", true ) || tdeApp->isRestored() ) flt = config->readEntry("current filter"); filter->lineEdit()->setText( flt ); slotFilterChange( flt ); diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp index 5a62b7a6..76dfb6c3 100644 --- a/parts/konsole/konsoleviewwidget.cpp +++ b/parts/konsole/konsoleviewwidget.cpp @@ -104,7 +104,7 @@ void KonsoleViewWidget::setDirectory(const KURL &dirUrl) { kdDebug(9035) << k_funcinfo << "Changing dirUrl.path() == " << dirUrl.path() << endl; kdDebug(9035) << k_funcinfo << "Changing part->url.path() == " << part->url().path() << endl; - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); kdDebug(9035) << k_funcinfo << "SyncTerminalEmulator: " << config->readBoolEntry("SyncTerminalEmulator") << endl; diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp index 5a961419..b2771a8a 100644 --- a/parts/outputviews/appoutputviewpart.cpp +++ b/parts/outputviews/appoutputviewpart.cpp @@ -97,7 +97,7 @@ void AppOutputViewPart::startAppCommand(const TQString &directory, const TQStrin TQString cmd; if (inTerminal) { - cmd = Settings::terminalEmulatorName( *kapp->config() ); + cmd = Settings::terminalEmulatorName( *tdeApp->config() ); if ( cmd == "konsole" && !directory.isNull() ) { // isn't setting the working directory below enough? // If a directory was specified, use it cmd += TQString(" --workdir '%1'").arg(directory); diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp index a8931f86..fbc4bb4c 100644 --- a/parts/outputviews/appoutputwidget.cpp +++ b/parts/outputviews/appoutputwidget.cpp @@ -43,7 +43,7 @@ AppOutputWidget::AppOutputWidget(AppOutputViewPart* part) connect(this, TQ_SIGNAL(executed(TQListBoxItem*)), TQ_SLOT(slotRowSelected(TQListBoxItem*))); connect(this, TQ_SIGNAL(rightButtonClicked( TQListBoxItem *, const TQPoint & )), TQ_SLOT(slotContextMenu( TQListBoxItem *, const TQPoint & ))); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); setFont(config->readFontEntry("OutputViewFont")); setSelectionMode(TQListBox::Extended); @@ -339,7 +339,7 @@ void AppOutputWidget::copySelected() if (isSelected(i)) buffer += item(i)->text() + "\n"; } - kapp->clipboard()->setText(buffer, TQClipboard::Clipboard); + tdeApp->clipboard()->setText(buffer, TQClipboard::Clipboard); } void AppOutputWidget::addPartialStderrLine(const TQCString & line) diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index c1527a76..6222c956 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -342,7 +342,7 @@ void MakeWidget::copy() selection.replace(""","\""); selection.replace("&","&"); - kapp->clipboard()->setText(selection, TQClipboard::Clipboard); + tdeApp->clipboard()->setText(selection, TQClipboard::Clipboard); } void MakeWidget::nextError() @@ -527,7 +527,7 @@ void MakeWidget::searchItem(int parag) void MakeWidget::insertStdoutLine( const TQCString& line ) { TQString sline; - bool forceCLocale = TDEConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); + bool forceCLocale = TDEConfigGroup( tdeApp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); if( forceCLocale ) sline = TQString::fromAscii( stdoutbuf+line ); @@ -542,7 +542,7 @@ void MakeWidget::insertStdoutLine( const TQCString& line ) void MakeWidget::insertStderrLine( const TQCString& line ) { TQString sline; - bool forceCLocale = TDEConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); + bool forceCLocale = TDEConfigGroup( tdeApp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); if( forceCLocale ) { sline = TQString( stderrbuf+line ); @@ -724,7 +724,7 @@ TQPopupMenu* MakeWidget::createPopupMenu( const TQPoint& pos ) void MakeWidget::toggleLineWrapping() { m_bLineWrapping = !m_bLineWrapping; - TDEConfig *pConfig = kapp->config(); + TDEConfig *pConfig = tdeApp->config(); pConfig->setGroup("MakeOutputView"); pConfig->writeEntry("LineWrapping", m_bLineWrapping); pConfig->sync(); @@ -759,7 +759,7 @@ void MakeWidget::slotFullCompilerOutput() { setTextFormat( TQt::RichText ); setC void MakeWidget::setCompilerOutputLevel(EOutputLevel level) { m_compilerOutputLevel = level; - TDEConfig *pConfig = kapp->config(); + TDEConfig *pConfig = tdeApp->config(); pConfig->setGroup("MakeOutputView"); pConfig->writeEntry("CompilerOutputLevel", (int) level); pConfig->sync(); @@ -769,7 +769,7 @@ void MakeWidget::setCompilerOutputLevel(EOutputLevel level) void MakeWidget::toggleShowDirNavigMessages() { DirectoryItem::setShowDirectoryMessages( !DirectoryItem::getShowDirectoryMessages() ); - TDEConfig *pConfig = kapp->config(); + TDEConfig *pConfig = tdeApp->config(); pConfig->setGroup("MakeOutputView"); pConfig->writeEntry("ShowDirNavigMsg", DirectoryItem::getShowDirectoryMessages()); pConfig->sync(); @@ -778,7 +778,7 @@ void MakeWidget::toggleShowDirNavigMessages() void MakeWidget::updateSettingsFromConfig() { - TDEConfig *pConfig = kapp->config(); + TDEConfig *pConfig = tdeApp->config(); pConfig->setGroup("General Options"); TQFont outputFont = pConfig->readFontEntry("OutputViewFont"); setFont(outputFont); diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp index 22a256ae..210a1c19 100644 --- a/parts/replace/replace_widget.cpp +++ b/parts/replace/replace_widget.cpp @@ -235,7 +235,7 @@ bool ReplaceWidget::showReplacements() } ++it; - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); } m_part->core()->running( m_part, false ); @@ -330,7 +330,7 @@ bool ReplaceWidget::makeReplacements() } fileitem = fileitem->nextSibling(); - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); } // Telling the project about the edited files diff --git a/parts/scripting/scriptingglobalconfig.cpp b/parts/scripting/scriptingglobalconfig.cpp index 6a3376f2..ca008029 100644 --- a/parts/scripting/scriptingglobalconfig.cpp +++ b/parts/scripting/scriptingglobalconfig.cpp @@ -28,7 +28,7 @@ scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *pare : scriptingGlobalConfigBase(parent, name), m_part(part) { // read tdeconfig and post list to the m_dirs - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); TQStringList searchDirs = cfg->readListEntry("SearchDirs"); m_dirs->clear(); m_dirs->insertStringList(searchDirs); @@ -37,7 +37,7 @@ scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *pare void scriptingGlobalConfig::accept() { // read mdirs and save to tdeconfig - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); if( !m_dirs->isEnabled() ) cfg->writeEntry("SearchDirs", TQStringList() ); else diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp index eba3d6cb..17aa5b51 100644 --- a/parts/scripting/scriptingpart.cpp +++ b/parts/scripting/scriptingpart.cpp @@ -83,7 +83,7 @@ void scriptingPart::setupActions() TQStringList searchDirs; searchDirs += "kate/scripts"; - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); searchDirs += cfg->readListEntry("SearchDirs"); unplugActionList(TQString::fromLatin1( "script_actions" )); diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp index 6d276e88..bf56d0a4 100644 --- a/parts/tipofday/tipofday_part.cpp +++ b/parts/tipofday/tipofday_part.cpp @@ -46,7 +46,7 @@ TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringLis TQString TipOfDayPart::getFilename() { - TDEConfig * config = TDEApplication::kApplication()->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("Tip of day plugin"); return config->readEntry("TipsFile", "kdevtipofday/tips"); } diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp index 9781f1b1..8dabccbd 100644 --- a/parts/tools/tools_part.cpp +++ b/parts/tools/tools_part.cpp @@ -114,7 +114,7 @@ void ToolsPart::updateMenu() void ToolsPart::slotToolActivated() { TQString df = sender()->name(); - kapp->startServiceByDesktopPath(df); + tdeApp->startServiceByDesktopPath(df); } void ToolsPart::startCommand(TQString cmdline, bool captured, TQString fileName) @@ -234,7 +234,7 @@ void ToolsPart::toolsMenuActivated() << "with cmdline " << cmdline << "and desktopfile " << isdesktopfile << endl; if (isdesktopfile) - kapp->startServiceByDesktopPath(cmdline); + tdeApp->startServiceByDesktopPath(cmdline); else startCommand(cmdline, captured, TQString()); } diff --git a/parts/uimode/uichooser_widget.cpp b/parts/uimode/uichooser_widget.cpp index cb75ec02..481670c1 100644 --- a/parts/uimode/uichooser_widget.cpp +++ b/parts/uimode/uichooser_widget.cpp @@ -36,7 +36,7 @@ UIChooserWidget::UIChooserWidget( UIChooserPart * part, TQWidget *parent, const void UIChooserWidget::load() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); int mdistyle = config->readNumEntry( "MDIStyle", 1 ); @@ -86,7 +86,7 @@ void UIChooserWidget::load() void UIChooserWidget::save() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); if ( AlwaysShowTabs->isChecked() ) diff --git a/src/Mainpage.dox b/src/Mainpage.dox index 69e2e239..b15ccbaf 100644 --- a/src/Mainpage.dox +++ b/src/Mainpage.dox @@ -80,7 +80,7 @@ Example: delete splash; - kapp->dcopClient()->registerAs("myapp"); + tdeApp->dcopClient()->registerAs("myapp"); return app.exec(); } diff --git a/src/core.cpp b/src/core.cpp index ccdd0ace..4f3d8cf5 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -71,7 +71,7 @@ Core::~Core() bool Core::queryClose() { // save the the project to open it automaticly on startup if needed - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("General Options"); config->writePathEntry("Last Project",ProjectManager::getInstance()->projectFile().url()); diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp index 75e0ba13..f9ce2ab8 100644 --- a/src/editorproxy.cpp +++ b/src/editorproxy.cpp @@ -41,7 +41,7 @@ EditorProxy::EditorProxy() { m_delayedLineTimer = new TQTimer( this ); connect( m_delayedLineTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT(setLineNumberDelayed()) ); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); m_delayedViewCreationCompatibleUI = true; diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp index 7bfbf29f..e9e3d9ac 100644 --- a/src/kdevideextension.cpp +++ b/src/kdevideextension.cpp @@ -53,7 +53,7 @@ void KDevIDEExtension::init() void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg) { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); TQVBox *vbox = dlg->addVBoxPage(i18n("General"), i18n("General"), BarIcon("tdevelop", TDEIcon::SizeMedium) ); gsw = new SettingsWidget(vbox, "general settings widget"); @@ -87,7 +87,7 @@ void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg) void KDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg) { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("General Options"); config->writeEntry("DesignerApp", gsw->designerButtonGroup->selectedId()); diff --git a/src/main.cpp b/src/main.cpp index 7faf9b53..16a859dc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -138,7 +138,7 @@ int main(int argc, char *argv[]) } } - kapp->dcopClient()->registerAs("tdevelop"); + tdeApp->dcopClient()->registerAs("tdevelop"); int ret = app.exec(); diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp index b548aa3b..41728b27 100644 --- a/src/main_assistant.cpp +++ b/src/main_assistant.cpp @@ -109,7 +109,7 @@ int main(int argc, char *argv[]) if (splash) delete splash; - kapp->dcopClient()->registerAs("kdevassistant"); + tdeApp->dcopClient()->registerAs("kdevassistant"); return app.exec(); } diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp index 38414c00..f67f2cd2 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -302,7 +302,7 @@ void MainWindowShare::slotSettings() ShellExtension::getInstance()->createGlobalSettingsPage(&dlg); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Global Settings Dialog"); int height = config->readNumEntry( "Height", 600 ); diff --git a/src/newui/button.cpp b/src/newui/button.cpp index fc8bf826..3220533e 100644 --- a/src/newui/button.cpp +++ b/src/newui/button.cpp @@ -60,7 +60,7 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, m_clearAccelAction = new TDEAction(i18n("Clear Accelerator"), 0, this, TQ_SLOT(clearAccel()), this); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); TQString accel = config->readEntry(TQString("button_%1").arg(text), ""); if (!accel.isEmpty()) @@ -70,7 +70,7 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, Button::~Button() { // m_buttonBar->removeButton(this); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); TQRegExp r("^&([0-9])\\s.*"); diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp index 60292252..0cf3cbdc 100644 --- a/src/newui/ddockwindow.cpp +++ b/src/newui/ddockwindow.cpp @@ -68,7 +68,7 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position) break; } - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); int mode = config->readNumEntry("MDIStyle", 3); Ideal::ButtonMode buttonMode = Ideal::Text; @@ -103,7 +103,7 @@ DDockWindow::~DDockWindow() void DDockWindow::setVisible(bool v) { //write dock width to the config file - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); TQString group = TQString("%1").arg(m_name); config->setGroup(group); @@ -147,7 +147,7 @@ void DDockWindow::loadSettings() void DDockWindow::saveSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); TQString group = TQString("%1").arg(m_name); int invisibleWidth = 0; config->setGroup(group); @@ -199,7 +199,7 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc { //if the widget was selected last time the dock is deleted //we need to show it - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); TQString group = TQString("%1").arg(m_name); config->setGroup(group); if (config->readEntry("ViewLastWidget") == title) diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp index d3c70d4e..b2488901 100644 --- a/src/newui/dmainwindow.cpp +++ b/src/newui/dmainwindow.cpp @@ -42,7 +42,7 @@ DMainWindow::DMainWindow(TQWidget *parent, const char *name) void DMainWindow::loadSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); m_openTabAfterCurrent = config->readBoolEntry("OpenNewTabAfterCurrent", true); m_showIconsOnTabs = config->readBoolEntry("ShowTabIcons", false); diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp index f96f3ca0..e0a27982 100644 --- a/src/newui/dtabwidget.cpp +++ b/src/newui/dtabwidget.cpp @@ -55,7 +55,7 @@ DTabWidget::DTabWidget(TQWidget *parent, const char *name) void DTabWidget::loadSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); // m_tabBarShown = config->readBoolEntry("TabBarShown", true); m_tabBarShown = ! config->readNumEntry("TabWidgetVisibility", 0); diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp index 086d641e..b5a5ef3b 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -132,7 +132,7 @@ void PartController::setupActions() m_openRecentAction = KStdAction::openRecent( this, TQ_SLOT(slotOpenRecent(const KURL&) ), ac, "file_open_recent" ); m_openRecentAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_openRecentAction->text())).arg(i18n("Opens recently opened file."))); - m_openRecentAction->loadEntries( kapp->config(), "RecentFiles" ); + m_openRecentAction->loadEntries( tdeApp->config(), "RecentFiles" ); m_saveAllFilesAction = new TDEAction(i18n("Save Al&l"), 0, this, TQ_SLOT(slotSaveAllFiles()), ac, "file_save_all"); m_saveAllFilesAction->setToolTip( i18n("Save all modified files") ); @@ -382,7 +382,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, m_openNextAsText = true; } - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); // we don't trust KDE with designer files, let's handle it ourselves @@ -419,7 +419,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, addHistoryEntry(); integratePart( kdevpart, url ); m_openRecentAction->addURL( url ); - m_openRecentAction->saveEntries( kapp->config(), "RecentFiles" ); + m_openRecentAction->saveEntries( tdeApp->config(), "RecentFiles" ); return; } } @@ -476,7 +476,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, m_openNextAsText = false; m_openRecentAction->addURL( url ); - m_openRecentAction->saveEntries( kapp->config(), "RecentFiles" ); + m_openRecentAction->saveEntries( tdeApp->config(), "RecentFiles" ); return; } @@ -521,7 +521,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, } m_openRecentAction->addURL( url ); - m_openRecentAction->saveEntries( kapp->config(), "RecentFiles" ); + m_openRecentAction->saveEntries( tdeApp->config(), "RecentFiles" ); } } else @@ -540,7 +540,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, { if ( dlg.always_open_as_text->isChecked() ) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General"); TQStringList texttypeslist = config->readListEntry( "TextTypes" ); texttypeslist << MimeType->name(); @@ -631,8 +631,8 @@ KTextEditor::Editor * PartController::createEditorPart( bool activate, static bool alwaysActivate = true; - kapp->config()->setGroup("Editor"); - TQString preferred = kapp->config()->readPathEntry("EmbeddedKTextEditor"); + tdeApp->config()->setGroup("Editor"); + TQString preferred = tdeApp->config()->readPathEntry("EmbeddedKTextEditor"); // If we are not using kyzis... // Don't create non-wrapped views for now, // avoid two paths (== two chances for bad bugs) @@ -1275,7 +1275,7 @@ void PartController::slotOpenFile() if ( DefaultEncoding.isEmpty() ) { // have a peek at katepart's settings: - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("Kate Document Defaults"); DefaultEncoding = config->readEntry("Encoding", TQString() ); } @@ -1453,7 +1453,7 @@ bool PartController::isDirty( KURL const & url ) bool PartController::reactToDirty( KURL const & url, unsigned char reason ) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Editor"); TQString dirtyAction = config->readEntry( "DirtyAction" ); diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp index 7166ab34..6a7eed9e 100644 --- a/src/plugincontroller.cpp +++ b/src/plugincontroller.cpp @@ -80,7 +80,7 @@ PluginController::PluginController() : KDevPluginController() { /* m_defaultProfile = TQString::fromLatin1( "FullIDE" ); - m_defaultProfilePath = kapp->dirs()->localtdedir() + "/" + + m_defaultProfilePath = tdeApp->dirs()->localtdedir() + "/" + TDEStandardDirs::kde_default( "data" ) + TQString::fromLatin1("/tdevelop/profiles/FullIDE");*/ diff --git a/src/pluginselectdialog.cpp b/src/pluginselectdialog.cpp index f7e92089..1e73ff48 100644 --- a/src/pluginselectdialog.cpp +++ b/src/pluginselectdialog.cpp @@ -86,7 +86,7 @@ void PluginSelectDialog::saveAsDefault() void PluginSelectDialog::openURL( const TQString & url ) { - kapp->invokeBrowser( url ); + tdeApp->invokeBrowser( url ); } void PluginSelectDialog::itemSelected( TQListViewItem * item ) diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index d94e5d71..b99dc436 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -105,7 +105,7 @@ void ProjectManager::createActions( TDEActionCollection* ac ) ac, "project_open_recent"); m_openRecentProjectAction->setToolTip(i18n("Open recent project")); m_openRecentProjectAction->setWhatsThis(i18n("<b>Open recent project</b><p>Opens recently opened project.")); - m_openRecentProjectAction->loadEntries(kapp->config(), "RecentProjects"); + m_openRecentProjectAction->loadEntries(tdeApp->config(), "RecentProjects"); m_closeProjectAction = new TDEAction(i18n("C&lose Project"), "window-close",0, @@ -125,7 +125,7 @@ void ProjectManager::createActions( TDEActionCollection* ac ) void ProjectManager::slotOpenProject() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); TQString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/"); @@ -153,7 +153,7 @@ void ProjectManager::slotProjectOptions() GeneralInfoWidget *g = new GeneralInfoWidget(*API::getInstance()->projectDom(), box, "general informations widget"); connect (&dlg, TQ_SIGNAL(okClicked()), g, TQ_SLOT(accept())); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Project Settings Dialog"); int height = config->readNumEntry( "Height", 600 ); int width = config->readNumEntry( "Width", 800 ); @@ -176,7 +176,7 @@ void ProjectManager::loadSettings() void ProjectManager::saveSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); if (projectLoaded()) { @@ -189,7 +189,7 @@ void ProjectManager::saveSettings() void ProjectManager::loadDefaultProject() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); TQString project = config->readPathEntry("Last Project"); bool readProject = config->readBoolEntry("Read Last Project On Startup", true); @@ -226,13 +226,13 @@ bool ProjectManager::loadProject(const KURL &projectURL) } TopLevel::getInstance()->main()->menuBar()->setEnabled( false ); - kapp->setOverrideCursor( waitCursor ); + tdeApp->setOverrideCursor( waitCursor ); if( projectLoaded() && !closeProject() ) { m_openRecentProjectAction->setCurrentItem( -1 ); TopLevel::getInstance()->main()->menuBar()->setEnabled( true ); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); return false; } @@ -253,7 +253,7 @@ void ProjectManager::slotLoadProject( ) delete m_info; m_info = 0; saveSettings(); TopLevel::getInstance()->main()->menuBar()->setEnabled( true ); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); return; } @@ -262,7 +262,7 @@ void ProjectManager::slotLoadProject( ) if( !loadLanguageSupport(m_info->m_language) ) { delete m_info; m_info = 0; TopLevel::getInstance()->main()->menuBar()->setEnabled( true ); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); return; } @@ -271,7 +271,7 @@ void ProjectManager::slotLoadProject( ) delete m_info; m_info = 0; API::getInstance()->setProjectDom( 0 ); TopLevel::getInstance()->main()->menuBar()->setEnabled( true ); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); return; } @@ -301,7 +301,7 @@ void ProjectManager::slotLoadProject( ) Core::getInstance()->doEmitProjectOpened(); TopLevel::getInstance()->main()->menuBar()->setEnabled( true ); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); TopLevel::getInstance()->statusBar()->message( i18n("Project loaded."), 3000 ); diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index b18f4cb5..eebc7ad1 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -260,7 +260,7 @@ void SimpleMainWindow::embedView( DDockWindow::Position pos, TQWidget * view, co DDockWindow::Position SimpleMainWindow::recallToolViewPosition( const TQString & name, DDockWindow::Position defaultPos ) { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "DToolDockPosition" ); TQString position = config->readEntry( name ); @@ -279,7 +279,7 @@ DDockWindow::Position SimpleMainWindow::recallToolViewPosition( const TQString & void SimpleMainWindow::rememberToolViewPosition( const TQString & name, DDockWindow::Position pos ) { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "DToolDockPosition" ); TQString position = "unknown"; @@ -364,7 +364,7 @@ void SimpleMainWindow::lowerView(TQWidget * view) void SimpleMainWindow::loadSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); ProjectManager::getInstance()->loadSettings(); applyMainWindowSettings(config, "SimpleMainWindow"); @@ -374,7 +374,7 @@ void SimpleMainWindow::loadSettings() void SimpleMainWindow::saveSettings( ) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); ProjectManager::getInstance()->saveSettings(); saveMainWindowSettings(config, "SimpleMainWindow"); @@ -1019,7 +1019,7 @@ void SimpleMainWindow::projectClosed() void SimpleMainWindow::slotProgrammingHandbook() { - kapp->invokeHelp(TQString::null, "tde_app_devel"); + tdeApp->invokeHelp(TQString::null, "tde_app_devel"); } #include "simplemainwindow.moc" diff --git a/src/toplevel.cpp b/src/toplevel.cpp index 129d869c..75b3b50b 100644 --- a/src/toplevel.cpp +++ b/src/toplevel.cpp @@ -22,7 +22,7 @@ KDevMainWindow *TopLevel::getInstance() SimpleMainWindow *mainWindow = new SimpleMainWindow(0, "SimpleMainWindow"); s_instance = mainWindow; mainWindow->init(); - kapp->setMainWidget(mainWindow); + tdeApp->setMainWidget(mainWindow); } return s_instance; diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp index c91f8309..ff14eb20 100644 --- a/vcs/cvsservice/checkoutdialog.cpp +++ b/vcs/cvsservice/checkoutdialog.cpp @@ -89,7 +89,7 @@ CheckoutDialog::CheckoutDialog( CvsService_stub *cvsService, // Grab the entries from $HOME/.cvspass fetchUserCvsRepositories(); // And suggest to use the default projects dir set in KDevelop's preferences - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); TQString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/"); setWorkDir( defaultProjectsDir ); diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp index 1119c6ff..0b92b200 100644 --- a/vcs/cvsservice/diffwidget.cpp +++ b/vcs/cvsservice/diffwidget.cpp @@ -41,7 +41,7 @@ TQStringList KDiffTextEdit::extPartsTranslated; KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name ) { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "Diff" ); _highlight = config->readBoolEntry( "Highlight", true ); @@ -50,7 +50,7 @@ KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( KDiffTextEdit::~KDiffTextEdit() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "Diff" ); config->writeEntry( "Highlight", _highlight ); |