diff options
Diffstat (limited to 'languages')
40 files changed, 111 insertions, 111 deletions
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() |