summaryrefslogtreecommitdiffstats
path: root/languages/pascal
diff options
context:
space:
mode:
Diffstat (limited to 'languages/pascal')
-rw-r--r--languages/pascal/PascalStoreWalkerTokenTypes.h2
-rw-r--r--languages/pascal/PascalTokenTypes.h2
-rw-r--r--languages/pascal/compiler/dccoptions/dccoptionsplugin.h2
-rw-r--r--languages/pascal/compiler/dccoptions/optiontabs.cpp4
-rw-r--r--languages/pascal/compiler/dccoptions/optiontabs.h2
-rw-r--r--languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h2
-rw-r--r--languages/pascal/compiler/fpcoptions/optiontabs.cpp4
-rw-r--r--languages/pascal/compiler/fpcoptions/optiontabs.h2
-rw-r--r--languages/pascal/configproblemreporter.ui4
-rw-r--r--languages/pascal/pascal.tree.g6
-rw-r--r--languages/pascal/pascalsupport_part.cpp54
-rw-r--r--languages/pascal/pascalsupport_part.h2
-rw-r--r--languages/pascal/problemreporter.cpp34
-rw-r--r--languages/pascal/problemreporter.h2
14 files changed, 61 insertions, 61 deletions
diff --git a/languages/pascal/PascalStoreWalkerTokenTypes.h b/languages/pascal/PascalStoreWalkerTokenTypes.h
index 4631429c..1911fc9c 100644
--- a/languages/pascal/PascalStoreWalkerTokenTypes.h
+++ b/languages/pascal/PascalStoreWalkerTokenTypes.h
@@ -183,7 +183,7 @@ struct CUSTOM_API PascalStoreWalkerTokenTypes {
INHERITED = 172,
NEW = 173,
SELF = 174,
- TQT_METHOD = 175,
+ METHOD = 175,
ADDSUBOR = 176,
ASSIGNEQUAL = 177,
SIGN = 178,
diff --git a/languages/pascal/PascalTokenTypes.h b/languages/pascal/PascalTokenTypes.h
index 42e97d53..185197e4 100644
--- a/languages/pascal/PascalTokenTypes.h
+++ b/languages/pascal/PascalTokenTypes.h
@@ -186,7 +186,7 @@ struct CUSTOM_API PascalTokenTypes {
INHERITED = 172,
NEW = 173,
SELF = 174,
- TQT_METHOD = 175,
+ METHOD = 175,
ADDSUBOR = 176,
ASSIGNEQUAL = 177,
SIGN = 178,
diff --git a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h
index d8465520..7e9a9772 100644
--- a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h
+++ b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h
@@ -17,7 +17,7 @@
class DccOptionsPlugin : public KDevCompilerOptions
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/languages/pascal/compiler/dccoptions/optiontabs.cpp b/languages/pascal/compiler/dccoptions/optiontabs.cpp
index 306fe5a0..bc586c0c 100644
--- a/languages/pascal/compiler/dccoptions/optiontabs.cpp
+++ b/languages/pascal/compiler/dccoptions/optiontabs.cpp
@@ -357,8 +357,8 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
layout3->addWidget(release);
layout3->addWidget(debug);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
- connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions()));
- connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions()));
+ connect(release, TQ_SIGNAL(clicked()), this, TQ_SLOT(setReleaseOptions()));
+ connect(debug, TQ_SIGNAL(clicked()), this, TQ_SLOT(setDebugOptions()));
layout->addStretch();
}
diff --git a/languages/pascal/compiler/dccoptions/optiontabs.h b/languages/pascal/compiler/dccoptions/optiontabs.h
index 04351ea7..07977e42 100644
--- a/languages/pascal/compiler/dccoptions/optiontabs.h
+++ b/languages/pascal/compiler/dccoptions/optiontabs.h
@@ -92,7 +92,7 @@ private:
class DebugOptimTab : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
DebugOptimTab( TQWidget *parent=0, const char *name=0 );
diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h
index e30b33c0..8b876bf4 100644
--- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h
+++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h
@@ -17,7 +17,7 @@
class FpcOptionsPlugin : public KDevCompilerOptions
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.cpp b/languages/pascal/compiler/fpcoptions/optiontabs.cpp
index 86c77cda..4f39337d 100644
--- a/languages/pascal/compiler/fpcoptions/optiontabs.cpp
+++ b/languages/pascal/compiler/fpcoptions/optiontabs.cpp
@@ -410,8 +410,8 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
TQPushButton *debug = new TQPushButton(i18n("Debug"), this);
layout6->addWidget(release);
layout6->addWidget(debug);
- connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions()));
- connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions()));
+ connect(release, TQ_SIGNAL(clicked()), this, TQ_SLOT(setReleaseOptions()));
+ connect(debug, TQ_SIGNAL(clicked()), this, TQ_SLOT(setDebugOptions()));
layout->addStretch();
}
diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.h b/languages/pascal/compiler/fpcoptions/optiontabs.h
index 9ae5c77b..af2a907f 100644
--- a/languages/pascal/compiler/fpcoptions/optiontabs.h
+++ b/languages/pascal/compiler/fpcoptions/optiontabs.h
@@ -91,7 +91,7 @@ private:
class DebugOptimTab : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
DebugOptimTab( TQWidget *parent=0, const char *name=0 );
diff --git a/languages/pascal/configproblemreporter.ui b/languages/pascal/configproblemreporter.ui
index 020557a1..3ba64c82 100644
--- a/languages/pascal/configproblemreporter.ui
+++ b/languages/pascal/configproblemreporter.ui
@@ -77,12 +77,12 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot>init()</slot>
<slot>destroy()</slot>
<slot>accept()</slot>
<slot>bgParserCheckbox_toggled( bool b )</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/languages/pascal/pascal.tree.g b/languages/pascal/pascal.tree.g
index d90503c4..c50d5a9f 100644
--- a/languages/pascal/pascal.tree.g
+++ b/languages/pascal/pascal.tree.g
@@ -46,7 +46,7 @@ options {
{
private:
- QString m_fileName;
+ TQString m_fileName;
QStringList m_currentScope;
int m_currentAccess;
int m_anon;
@@ -57,8 +57,8 @@ public:
CodeModel* codeModel() { return m_model; }
const CodeModel* codeModel() const { return m_model; }
- QString fileName() const { return m_fileName; }
- void setFileName( const QString& fileName ) { m_fileName = fileName; }
+ TQString fileName() const { return m_fileName; }
+ void setFileName( const TQString& fileName ) { m_fileName = fileName; }
void init(){
m_currentScope.clear();
diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp
index a61ab6a0..bb00f039 100644
--- a/languages/pascal/pascalsupport_part.cpp
+++ b/languages/pascal/pascalsupport_part.cpp
@@ -44,30 +44,30 @@ struct PascalSupportPartData{
};
typedef KDevGenericFactory<PascalSupportPart> PascalSupportFactory;
-static const KDevPluginInfo data("kdevpascalsupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( data ) )
+static const KDevPluginInfo pluginData("kdevpascalsupport");
+K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( pluginData ) )
PascalSupportPart::PascalSupportPart(TQObject *parent, const char *name, const TQStringList &)
- : KDevLanguageSupport(&data, parent, name ? name : "KDevPascalSupport" ),
+ : KDevLanguageSupport(&pluginData, parent, name ? name : "KDevPascalSupport" ),
d( new PascalSupportPartData() )
{
setInstance(PascalSupportFactory::instance());
setXMLFile("kdevpascalsupport.rc");
d->problemReporter = new ProblemReporter( this );
- connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)),
- d->problemReporter, TQT_SLOT(configWidget(KDialogBase*)) );
-
- 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( core(), TQT_SIGNAL(configWidget(KDialogBase*)),
- this, TQT_SLOT(configWidget(KDialogBase*)) );
- connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this,
- TQT_SLOT( projectConfigWidget( KDialogBase* ) ) );
+ connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)),
+ d->problemReporter, TQ_SLOT(configWidget(KDialogBase*)) );
+
+ 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( core(), TQ_SIGNAL(configWidget(KDialogBase*)),
+ this, TQ_SLOT(configWidget(KDialogBase*)) );
+ connect( core( ), TQ_SIGNAL( projectConfigWidget( KDialogBase* ) ), this,
+ TQ_SLOT( projectConfigWidget( KDialogBase* ) ) );
mainWindow()->embedOutputView( d->problemReporter, i18n("Problems"), i18n("problem reporter") );
TQWhatsThis::add(d->problemReporter, i18n("<b>Problem reporter</b><p>This window shows various \"problems\" in your project. "
@@ -89,17 +89,17 @@ PascalSupportPart::Features PascalSupportPart::features()
void PascalSupportPart::projectOpened()
{
- 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(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(projectCompiled()),
+ this, TQ_SLOT(slotProjectCompiled()) );
m_projectFileList = project()->allFiles();
m_projectClosed = false;
- TQTimer::singleShot(0, this, TQT_SLOT(initialParse()));
+ TQTimer::singleShot(0, this, TQ_SLOT(initialParse()));
}
void PascalSupportPart::projectClosed()
@@ -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/pascalsupport_part.h b/languages/pascal/pascalsupport_part.h
index 5c99c2ae..4450f45d 100644
--- a/languages/pascal/pascalsupport_part.h
+++ b/languages/pascal/pascalsupport_part.h
@@ -21,7 +21,7 @@ class PascalSupportPartData;
class PascalSupportPart : public KDevLanguageSupport
{
- Q_OBJECT
+ TQ_OBJECT
public:
PascalSupportPart(TQObject *parent, const char *name, const TQStringList &);
diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp
index d0aaf01a..0d505e8f 100644
--- a/languages/pascal/problemreporter.cpp
+++ b/languages/pascal/problemreporter.cpp
@@ -82,23 +82,23 @@ ProblemReporter::ProblemReporter( PascalSupportPart* part, TQWidget* parent, con
addColumn( i18n("File") );
addColumn( i18n("Line") );
//addColumn( i18n("Column") );
- 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(doubleClicked(TQListViewItem*)),
- this, TQT_SLOT(slotSelected(TQListViewItem*)) );
- connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)),
- this, TQT_SLOT(slotSelected(TQListViewItem*)) );
+ connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+ this, TQ_SLOT(slotSelected(TQListViewItem*)) );
+ connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)),
+ this, TQ_SLOT(slotSelected(TQListViewItem*)) );
configure();
}
@@ -128,7 +128,7 @@ void ProblemReporter::slotActivePartChanged( KParts::Part* part )
m_editor = dynamic_cast<KTextEditor::EditInterface*>( part );
if( m_editor )
- 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 );
@@ -250,9 +250,9 @@ 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_active = config->readBoolEntry( "EnablePascalBgParser", true );
m_delay = config->readNumEntry( "BgParserDelay", 500 );
}
@@ -262,8 +262,8 @@ void ProblemReporter::configWidget( KDialogBase* dlg )
Q_UNUSED(dlg);
/* TQVBox *vbox = dlg->addVBoxPage(i18n("Pascal Parsing"));
ConfigureProblemReporter* w = new ConfigureProblemReporter( vbox );
- 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 )
diff --git a/languages/pascal/problemreporter.h b/languages/pascal/problemreporter.h
index e329f2fe..89010aa3 100644
--- a/languages/pascal/problemreporter.h
+++ b/languages/pascal/problemreporter.h
@@ -37,7 +37,7 @@ namespace KTextEditor{
}
class ProblemReporter: public TQListView{
- Q_OBJECT
+ TQ_OBJECT
public:
ProblemReporter( PascalSupportPart* part, TQWidget* parent=0, const char* name=0 );