diff options
Diffstat (limited to 'languages/ada')
-rw-r--r-- | languages/ada/ada.store.g | 14 | ||||
-rw-r--r-- | languages/ada/adasupportpart.cpp | 48 | ||||
-rw-r--r-- | languages/ada/adasupportpart.h | 2 | ||||
-rw-r--r-- | languages/ada/addclassdlg.ui | 4 | ||||
-rw-r--r-- | languages/ada/configproblemreporter.ui | 4 | ||||
-rw-r--r-- | languages/ada/configproblemreporter.ui.h | 4 | ||||
-rw-r--r-- | languages/ada/problemreporter.cpp | 34 | ||||
-rw-r--r-- | languages/ada/problemreporter.h | 2 |
8 files changed, 56 insertions, 56 deletions
diff --git a/languages/ada/ada.store.g b/languages/ada/ada.store.g index 658bfcfa..b15e5f3e 100644 --- a/languages/ada/ada.store.g +++ b/languages/ada/ada.store.g @@ -30,7 +30,7 @@ options { { private: - QString m_fileName; + TQString m_fileName; QValueList<NamespaceDom> m_scopeStack; CodeModel* m_model; QValueList<QStringList> m_imports; @@ -46,8 +46,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_scopeStack.clear (); @@ -66,13 +66,13 @@ public: void wipeout () { m_model->wipeout (); } // void out () { m_store->out (); } - void removeWithReferences (const QString& fileName) { + void removeWithReferences (const TQString& fileName) { m_model->removeFile (m_model->fileByName(fileName)); } NamespaceDom insertScopeContainer (NamespaceDom scope, const QStringList & scopes ) { QStringList::ConstIterator it = scopes.begin(); - QString prefix( *it ); + TQString prefix( *it ); NamespaceDom ns = scope->namespaceByName( prefix ); // kdDebug() << "insertScopeContainer begin with prefix " << prefix << endl; if (!ns.data()) { @@ -89,7 +89,7 @@ public: } // kdDebug() << "insertScopeContainer: while" << endl; while ( ++it != scopes.end() ) { - QString nameSegment( *it ); + TQString nameSegment( *it ); prefix += "." + nameSegment; // kdDebug() << "insertScopeContainer: while prefix = " << prefix << endl; NamespaceDom inner = scope->namespaceByName( prefix ); @@ -592,7 +592,7 @@ name_or_qualified package_body : #(PACKAGE_BODY id:def_id /* TBD - { QString name (qtext (id)); + { TQString name (qtext (id)); } */ pkg_body_part) diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp index 0d87f0a7..05927d6e 100644 --- a/languages/ada/adasupportpart.cpp +++ b/languages/ada/adasupportpart.cpp @@ -40,8 +40,8 @@ enum { KDEV_PCS_VERSION = 6 }; typedef KDevGenericFactory<AdaSupportPart> AdaSupportPartFactory; -static const KDevPluginInfo data("kdevadasupport"); -K_EXPORT_COMPONENT_FACTORY (libkdevadasupport, AdaSupportPartFactory (data)) +static const KDevPluginInfo pluginData("kdevadasupport"); +K_EXPORT_COMPONENT_FACTORY (libkdevadasupport, AdaSupportPartFactory (pluginData)) struct AdaSupportPartData { @@ -51,13 +51,13 @@ struct AdaSupportPartData { }; AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStringList &) - : KDevLanguageSupport (&data, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData()) + : KDevLanguageSupport (&pluginData, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData()) { setInstance (AdaSupportPartFactory::instance ()); d->problemReporter = new ProblemReporter (this); -// connect (core (), TQT_SIGNAL (configWidget (KDialogBase*)), -// d->problemReporter, TQT_SLOT (configWidget (KDialogBase*))); +// connect (core (), TQ_SIGNAL (configWidget (KDialogBase*)), +// d->problemReporter, TQ_SLOT (configWidget (KDialogBase*))); d->problemReporter->setIcon( SmallIcon("application-vnd.tde.info") ); 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. " @@ -65,15 +65,15 @@ AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStri setXMLFile ("adasupportpart.rc"); - connect (core (), TQT_SIGNAL (projectOpened ()), this, TQT_SLOT (projectOpened ())); - connect (core (), TQT_SIGNAL (projectClosed ()), this, TQT_SLOT (projectClosed ())); + connect (core (), TQ_SIGNAL (projectOpened ()), this, TQ_SLOT (projectOpened ())); + connect (core (), TQ_SIGNAL (projectClosed ()), this, TQ_SLOT (projectClosed ())); - connect (partController (), TQT_SIGNAL (savedFile (const KURL&)), - this, TQT_SLOT (savedFile (const KURL&))); + connect (partController (), TQ_SIGNAL (savedFile (const KURL&)), + this, TQ_SLOT (savedFile (const KURL&))); -// connect (core (), TQT_SIGNAL (configWidget (KDialogBase*)), this, TQT_SLOT (configWidget (KDialogBase*))); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - d->problemReporter, TQT_SLOT(configWidget(KDialogBase*)) ); +// connect (core (), TQ_SIGNAL (configWidget (KDialogBase*)), this, TQ_SLOT (configWidget (KDialogBase*))); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + d->problemReporter, TQ_SLOT(configWidget(KDialogBase*)) ); // a small hack (robe) //classStore ()->globalScope ()->setName ("(default packages)"); @@ -102,14 +102,14 @@ KDevLanguageSupport::Features AdaSupportPart::features () void AdaSupportPart::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( changedFilesInProject( const TQStringList & ) ), - this, TQT_SLOT( changedFilesInProject( const TQStringList & ) ) ); - - TQTimer::singleShot (0, this, TQT_SLOT (initialParse ())); + 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 & ) ) ); + + TQTimer::singleShot (0, this, TQ_SLOT (initialParse ())); } @@ -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/adasupportpart.h b/languages/ada/adasupportpart.h index eb9e2630..22d66fd8 100644 --- a/languages/ada/adasupportpart.h +++ b/languages/ada/adasupportpart.h @@ -12,7 +12,7 @@ class TQStringList; class AdaSupportPart : public KDevLanguageSupport { - Q_OBJECT + TQ_OBJECT public: AdaSupportPart (TQObject *parent, const char *name, const TQStringList &); diff --git a/languages/ada/addclassdlg.ui b/languages/ada/addclassdlg.ui index 046b06ab..94006be8 100644 --- a/languages/ada/addclassdlg.ui +++ b/languages/ada/addclassdlg.ui @@ -420,9 +420,9 @@ <tabstop>PushButton2</tabstop> <tabstop>PushButton3</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>Public_toggled( bool )</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in implementation">keditlistbox.h</include> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/languages/ada/configproblemreporter.ui b/languages/ada/configproblemreporter.ui index f2e03383..32a9b13d 100644 --- a/languages/ada/configproblemreporter.ui +++ b/languages/ada/configproblemreporter.ui @@ -78,12 +78,12 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="local" impldecl="in implementation">configproblemreporter.ui.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/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 12090860..6aade4e9 100644 --- a/languages/ada/problemreporter.cpp +++ b/languages/ada/problemreporter.cpp @@ -88,23 +88,23 @@ ProblemReporter::ProblemReporter( AdaSupportPart* part, TQWidget* parent, const 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(); } @@ -134,7 +134,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 ); @@ -244,9 +244,9 @@ 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_active = config->readBoolEntry( "EnableAdaBgParser", true ); m_delay = config->readNumEntry( "BgParserDelay", 500 ); } @@ -255,8 +255,8 @@ void ProblemReporter::configWidget( KDialogBase* dlg ) kdDebug() << "ProblemReporter::configWidget()" << endl; TQVBox *vbox = dlg->addVBoxPage(i18n("Ada Parsing"), i18n("Ada Parsing"), BarIcon( "text-x-src", TDEIcon::SizeMedium )); 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/ada/problemreporter.h b/languages/ada/problemreporter.h index 3f23cbfd..4b497a1a 100644 --- a/languages/ada/problemreporter.h +++ b/languages/ada/problemreporter.h @@ -38,7 +38,7 @@ namespace KTextEditor{ } class ProblemReporter: public TQListView{ - Q_OBJECT + TQ_OBJECT public: ProblemReporter( AdaSupportPart* part, TQWidget* parent=0, const char* name=0 ); |