diff options
Diffstat (limited to 'languages/java')
| -rw-r--r-- | languages/java/app_templates/kappjava/app.java | 4 | ||||
| -rw-r--r-- | languages/java/backgroundparser.cpp | 16 | ||||
| -rw-r--r-- | languages/java/configproblemreporter.ui.h | 4 | ||||
| -rw-r--r-- | languages/java/javasupportpart.cpp | 10 | ||||
| -rw-r--r-- | languages/java/problemreporter.cpp | 2 |
5 files changed, 18 insertions, 18 deletions
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 ); |