summaryrefslogtreecommitdiffstats
path: root/languages/java
diff options
context:
space:
mode:
Diffstat (limited to 'languages/java')
-rw-r--r--languages/java/app_templates/kappjava/app.java26
-rw-r--r--languages/java/app_templates/kappjava/app_client.java10
-rw-r--r--languages/java/app_templates/kappjava/appview.java8
-rw-r--r--languages/java/backgroundparser.cpp16
-rw-r--r--languages/java/configproblemreporter.ui4
-rw-r--r--languages/java/configproblemreporter.ui.h6
-rw-r--r--languages/java/javasupportfactory.cpp4
-rw-r--r--languages/java/javasupportpart.cpp68
-rw-r--r--languages/java/problemreporter.cpp30
9 files changed, 86 insertions, 86 deletions
diff --git a/languages/java/app_templates/kappjava/app.java b/languages/java/app_templates/kappjava/app.java
index 40bc6b93..00202b9d 100644
--- a/languages/java/app_templates/kappjava/app.java
+++ b/languages/java/app_templates/kappjava/app.java
@@ -43,10 +43,10 @@ public class %{APPNAME} extends TDEMainWindow
setupGUI();
// allow the view to change the statusbar and caption
- connect(m_view, SIGNAL("signalChangeStatusbar(String)"),
- this, SLOT("changeStatusbar(String)"));
- connect(m_view, SIGNAL("signalChangeCaption(String)"),
- this, SLOT("changeCaption(String)"));
+ connect(m_view, TQ_SIGNAL("signalChangeStatusbar(String)"),
+ this, TQ_SLOT("changeStatusbar(String)"));
+ connect(m_view, TQ_SIGNAL("signalChangeCaption(String)"),
+ this, TQ_SLOT("changeCaption(String)"));
}
@@ -76,20 +76,20 @@ public void load(KURL url)
public void setupActions()
{
- TDEApplication kapp = TDEApplication.kApplication();
- KStdAction.openNew(this, SLOT("fileNew()"), actionCollection());
- KStdAction.open(this, SLOT("fileOpen()"), actionCollection());
- KStdAction.save(this, SLOT("fileSave()"), actionCollection());
- KStdAction.saveAs(this, SLOT("fileSaveAs()"), actionCollection());
- KStdAction.print(this, SLOT("filePrint()"), actionCollection());
- KStdAction.quit(kapp, SLOT("quit()"), actionCollection());
+ 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(tdeApp, TQ_SLOT("quit()"), actionCollection());
- KStdAction.preferences(this, SLOT("optionsPreferences()"), actionCollection());
+ KStdAction.preferences(this, TQ_SLOT("optionsPreferences()"), actionCollection());
// this doesn't do anything useful. it's just here to illustrate
// how to insert a custom menu and menu item
TDEAction custom = new TDEAction(tr("Cus&tom Menuitem"), new TDEShortcut(),
- this, SLOT("optionsPreferences()"),
+ this, TQ_SLOT("optionsPreferences()"),
actionCollection(), "custom_action");
}
diff --git a/languages/java/app_templates/kappjava/app_client.java b/languages/java/app_templates/kappjava/app_client.java
index ab327d4c..4b310179 100644
--- a/languages/java/app_templates/kappjava/app_client.java
+++ b/languages/java/app_templates/kappjava/app_client.java
@@ -2,10 +2,10 @@
* Copyright (C) %{YEAR} %{AUTHOR} <%{EMAIL}>
*/
-#include <kapp.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
-#include <qdatastream.h>
-#include <qstring.h>
+#include <tqdatastream.h>
+#include <tqstring.h>
int main(int argc, char **argv)
{
@@ -16,8 +16,8 @@ int main(int argc, char **argv)
client->attach();
// do a 'send' for now
- QByteArray data;
- QDataStream ds(data, IO_WriteOnly);
+ TQByteArray data;
+ TQDataStream ds(data, IO_WriteOnly);
if (argc > 1)
ds << TQString(argv[1]);
else
diff --git a/languages/java/app_templates/kappjava/appview.java b/languages/java/app_templates/kappjava/appview.java
index 0d79ac31..4a1e9f84 100644
--- a/languages/java/app_templates/kappjava/appview.java
+++ b/languages/java/app_templates/kappjava/appview.java
@@ -71,10 +71,10 @@ public %{APPNAME}View(TQWidget parent)
return;
}
- connect(m_html, SIGNAL("setWindowCaption(String)"),
- this, SLOT("slotSetTitle(String)"));
- connect(m_html, SIGNAL("setStatusBarText(String)"),
- this, SLOT("slotOnURL(String)"));
+ connect(m_html, TQ_SIGNAL("setWindowCaption(String)"),
+ this, TQ_SLOT("slotSetTitle(String)"));
+ connect(m_html, TQ_SIGNAL("setStatusBarText(String)"),
+ this, TQ_SLOT("slotOnURL(String)"));
}
diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp
index 7c63a63f..ccc2032a 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();
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 b/languages/java/configproblemreporter.ui
index 9bea48d7..c253e1d4 100644
--- a/languages/java/configproblemreporter.ui
+++ b/languages/java/configproblemreporter.ui
@@ -234,7 +234,7 @@
<tabstop>pushButton5</tabstop>
<tabstop>pushButton6</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot>init()</slot>
<slot>destroy()</slot>
<slot>accept()</slot>
@@ -244,7 +244,7 @@
<slot>removeSpecialHeader()</slot>
<slot>moveUpSpecialHeader()</slot>
<slot>moveDownSpecialHeader()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includes>
diff --git a/languages/java/configproblemreporter.ui.h b/languages/java/configproblemreporter.ui.h
index ef0510d3..72405f0d 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() )
@@ -37,7 +37,7 @@ void ConfigureProblemReporter::accept()
void ConfigureProblemReporter::bgParserCheckbox_toggled( bool b )
{
delaySlider->setEnabled( b );
- if ( b == TRUE )
+ if ( b )
delayLabel->show();
else
delayLabel->hide();
diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp
index 299e283f..7757991e 100644
--- a/languages/java/javasupportfactory.cpp
+++ b/languages/java/javasupportfactory.cpp
@@ -9,8 +9,8 @@
* *
***************************************************************************/
-#include <kinstance.h>
-#include <kstandarddirs.h>
+#include <tdeinstance.h>
+#include <tdestandarddirs.h>
#include <kdevplugininfo.h>
#include "javasupportfactory.h"
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index 80203576..ff2d120c 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -51,7 +51,7 @@
#include <kstatusbar.h>
#include <tdeconfig.h>
#include <tdeversion.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kiconloader.h>
#include <tdetexteditor/document.h>
@@ -135,37 +135,37 @@ JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStr
m_backgroundParser = new BackgroundParser( this, &m_eventConsumed );
m_backgroundParser->start();
- connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) );
- connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) );
- connect( partController(), TQT_SIGNAL(savedFile(const KURL&)),
- this, TQT_SLOT(savedFile(const KURL&)) );
- connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
- this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
- connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
- this, TQT_SLOT(activePartChanged(KParts::Part*)));
- connect( partController(), TQT_SIGNAL(partRemoved(KParts::Part*)),
- this, TQT_SLOT(partRemoved(KParts::Part*)));
+ connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) );
+ connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) );
+ connect( partController(), TQ_SIGNAL(savedFile(const KURL&)),
+ this, TQ_SLOT(savedFile(const KURL&)) );
+ connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
+ this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
+ connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)),
+ this, TQ_SLOT(activePartChanged(KParts::Part*)));
+ connect( partController(), TQ_SIGNAL(partRemoved(KParts::Part*)),
+ this, TQ_SLOT(partRemoved(KParts::Part*)));
m_problemReporter = new ProblemReporter( this, 0, "problemReporterWidget" );
m_problemReporter->setIcon( SmallIcon("application-vnd.tde.info") );
mainWindow( )->embedOutputView( m_problemReporter, i18n("Problems"), i18n("Problem reporter"));
- connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)),
- m_problemReporter, TQT_SLOT(configWidget(KDialogBase*)) );
- connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)),
- this, TQT_SLOT(configWidget(KDialogBase*)) );
+ connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)),
+ m_problemReporter, TQ_SLOT(configWidget(KDialogBase*)) );
+ connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)),
+ this, TQ_SLOT(configWidget(KDialogBase*)) );
TDEAction *action;
action = new TDEAction(i18n("New Class..."), "classnew", 0,
- this, TQT_SLOT(slotNewClass()),
+ this, TQ_SLOT(slotNewClass()),
actionCollection(), "project_newclass");
action->setToolTip( i18n("Generate a new class") );
action->setWhatsThis( i18n("<b>New Class</b>Generates a new class.<p>") );
// daniel
- connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this,
- TQT_SLOT( projectConfigWidget( KDialogBase* ) ) );
+ connect( core( ), TQ_SIGNAL( projectConfigWidget( KDialogBase* ) ), this,
+ TQ_SLOT( projectConfigWidget( KDialogBase* ) ) );
new KDevJavaSupportIface( this );
//(void) dcopClient();
@@ -288,8 +288,8 @@ void JavaSupportPart::activePartChanged(KParts::Part *part)
if( !textHintIface )
return;
- connect( view, TQT_SIGNAL(needTextHint(int,int,TQString&)),
- this, TQT_SLOT(slotNeedTextHint(int,int,TQString&)) );
+ connect( view, TQ_SIGNAL(needTextHint(int,int,TQString&)),
+ this, TQ_SLOT(slotNeedTextHint(int,int,TQString&)) );
textHintIface->enableTextHints( 1000 );
#endif
@@ -302,20 +302,20 @@ void JavaSupportPart::projectOpened( )
m_projectDirectory = URLUtil::canonicalPath( project()->projectDirectory() );
- connect( project( ), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ),
- this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) );
- connect( project( ), TQT_SIGNAL( removedFilesFromProject( const TQStringList &) ),
- this, TQT_SLOT( removedFilesFromProject( const TQStringList & ) ) );
- connect( project( ), TQT_SIGNAL( changedFilesInProject( const TQStringList & ) ),
- this, TQT_SLOT( changedFilesInProject( const TQStringList & ) ) );
- connect( project(), TQT_SIGNAL(projectCompiled()),
- this, TQT_SLOT(slotProjectCompiled()) );
+ connect( project( ), TQ_SIGNAL( addedFilesToProject( const TQStringList & ) ),
+ this, TQ_SLOT( addedFilesToProject( const TQStringList & ) ) );
+ connect( project( ), TQ_SIGNAL( removedFilesFromProject( const TQStringList &) ),
+ this, TQ_SLOT( removedFilesFromProject( const TQStringList & ) ) );
+ connect( project( ), TQ_SIGNAL( changedFilesInProject( const TQStringList & ) ),
+ this, TQ_SLOT( changedFilesInProject( const TQStringList & ) ) );
+ connect( project(), TQ_SIGNAL(projectCompiled()),
+ this, TQ_SLOT(slotProjectCompiled()) );
m_timestamp.clear();
m_projectClosed = false;
- TQTimer::singleShot( 500, this, TQT_SLOT( initialParse( ) ) );
+ TQTimer::singleShot( 500, this, TQ_SLOT( initialParse( ) ) );
}
@@ -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 e1fc4174..088032f2 100644
--- a/languages/java/problemreporter.cpp
+++ b/languages/java/problemreporter.cpp
@@ -93,21 +93,21 @@ ProblemReporter::ProblemReporter( JavaSupportPart* part, TQWidget* parent, const
addColumn( i18n("Line") );
addColumn( i18n("Column") );
addColumn( i18n("Problem") );
- setAllColumnsShowFocus( TRUE );
+ setAllColumnsShowFocus( true );
m_timer = new TQTimer( this );
- connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
- this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) );
- connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)),
- this, TQT_SLOT(slotPartAdded(KParts::Part*)) );
- connect( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)),
- this, TQT_SLOT(slotPartRemoved(KParts::Part*)) );
+ connect( part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)),
+ this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) );
+ connect( part->partController(), TQ_SIGNAL(partAdded(KParts::Part*)),
+ this, TQ_SLOT(slotPartAdded(KParts::Part*)) );
+ connect( part->partController(), TQ_SIGNAL(partRemoved(KParts::Part*)),
+ this, TQ_SLOT(slotPartRemoved(KParts::Part*)) );
- connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reparse()) );
+ connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reparse()) );
- connect( this, TQT_SIGNAL(executed(TQListViewItem*)),
- this, TQT_SLOT(slotSelected(TQListViewItem*)) );
+ connect( this, TQ_SIGNAL(executed(TQListViewItem*)),
+ this, TQ_SLOT(slotSelected(TQListViewItem*)) );
configure();
}
@@ -137,7 +137,7 @@ void ProblemReporter::slotActivePartChanged( KParts::Part* part )
if( !m_javaSupport->isValidSource(m_fileName) )
return;
- connect( m_document, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) );
+ connect( m_document, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) );
m_markIface = dynamic_cast<KTextEditor::MarkInterface*>( part );
if( !m_javaSupport->backgroundParser() )
@@ -227,9 +227,9 @@ 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_active = config->readBoolEntry( "EnableJavaBgParser", true );
m_delay = config->readNumEntry( "BgParserDelay", 500 );
}
@@ -239,8 +239,8 @@ void ProblemReporter::configWidget( KDialogBase* dlg )
ConfigureProblemReporter* w = new ConfigureProblemReporter( vbox );
//FIXME adymo: unused functionality
w->groupBox3->hide();
- connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
- connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(configure()));
+ connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()));
+ connect(dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(configure()));
}
void ProblemReporter::slotPartAdded( KParts::Part* part )
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-23 18:39:51 +0000