From d6f8bbb45b267065a6907e71ff9c98bb6d161241 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:56:07 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1157658 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../compiler/pgioptions/pgioptionsfactory.cpp | 6 +- .../compiler/pgioptions/pgioptionsfactory.h | 6 +- .../compiler/pgioptions/pgioptionsplugin.cpp | 130 ++++++++++----------- .../fortran/compiler/pgioptions/pgioptionsplugin.h | 10 +- languages/fortran/fixedformparser.cpp | 22 ++-- languages/fortran/fixedformparser.h | 12 +- languages/fortran/fortransupportpart.cpp | 86 +++++++------- languages/fortran/fortransupportpart.h | 8 +- languages/fortran/ftnchekconfigwidget.cpp | 76 ++++++------ languages/fortran/ftnchekconfigwidget.h | 12 +- 10 files changed, 184 insertions(+), 184 deletions(-) (limited to 'languages/fortran') diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp index 5fad6630..66a12fbb 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp +++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp @@ -25,7 +25,7 @@ extern "C" { } -PgiOptionsFactory::PgiOptionsFactory(QObject *parent, const char *name) +PgiOptionsFactory::PgiOptionsFactory(TQObject *parent, const char *name) : KLibFactory(parent, name) { instance(); @@ -39,8 +39,8 @@ PgiOptionsFactory::~PgiOptionsFactory() } -QObject *PgiOptionsFactory::createObject(QObject *parent, const char *name, - const char * /*classname*/, const QStringList &args) +TQObject *PgiOptionsFactory::createObject(TQObject *parent, const char *name, + const char * /*classname*/, const TQStringList &args) { if (args.count() > 0 && qstrcmp(args[0].latin1(), "pghpf") == 0) { kdDebug(9021) << "Building PgiOptions for PGHPF" << endl; diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.h b/languages/fortran/compiler/pgioptions/pgioptionsfactory.h index 9e3113a7..4fd73b7f 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.h +++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.h @@ -20,11 +20,11 @@ class PgiOptionsFactory : public KLibFactory Q_OBJECT public: - PgiOptionsFactory( QObject *parent=0, const char *name=0 ); + PgiOptionsFactory( TQObject *parent=0, const char *name=0 ); ~PgiOptionsFactory(); - virtual QObject* createObject( QObject *parent, const char *name, - const char *classname, const QStringList &args); + virtual TQObject* createObject( TQObject *parent, const char *name, + const char *classname, const TQStringList &args); static KInstance *instance(); private: diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp index 8bed362e..8f22453a 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp +++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp @@ -9,13 +9,13 @@ * * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -75,68 +75,68 @@ const char * const hpf_flags[] = { class GeneralTab : public QWidget { public: - GeneralTab( QWidget *parent=0, const char *name=0 ); + GeneralTab( TQWidget *parent=0, const char *name=0 ); ~GeneralTab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); }; class OptimizationTab : public QWidget { public: - OptimizationTab( PgiOptionsPlugin::Type type, QWidget *parent=0, const char *name=0 ); + OptimizationTab( PgiOptionsPlugin::Type type, TQWidget *parent=0, const char *name=0 ); ~OptimizationTab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); private: - QRadioButton *Odefault, *O0, *O1, *O2; - QListView *optBox; + TQRadioButton *Odefault, *O0, *O1, *O2; + TQListView *optBox; }; class HpfTab : public QWidget { public: - HpfTab( QWidget *parent=0, const char *name=0 ); + HpfTab( TQWidget *parent=0, const char *name=0 ); ~HpfTab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); private: - QListView *hpfBox; + TQListView *hpfBox; }; -OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, QWidget *parent, const char *name) - : QWidget(parent, name) +OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, TQWidget *parent, const char *name) + : TQWidget(parent, name) { - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->setAutoAdd(true); - QVButtonGroup *group = new QVButtonGroup(i18n("Optimization Level"), this); - Odefault = new QRadioButton(i18n("Default"), group); + TQVButtonGroup *group = new TQVButtonGroup(i18n("Optimization Level"), this); + Odefault = new TQRadioButton(i18n("Default"), group); Odefault->setChecked(true); - O0 = new QRadioButton(i18n("No optimization"), group); - O1 = new QRadioButton(i18n("Level 1"), group); - O2 = new QRadioButton(i18n("Level 2"), group); + O0 = new TQRadioButton(i18n("No optimization"), group); + O1 = new TQRadioButton(i18n("Level 1"), group); + O2 = new TQRadioButton(i18n("Level 2"), group); if (type == PgiOptionsPlugin::PGHPF) { - optBox = new QListView(this); - optBox->addColumn(QString::null); + optBox = new TQListView(this); + optBox->addColumn(TQString::null); optBox->header()->hide(); for (const char * const *p = optimization_flags; *p; ++p) { - new QCheckListItem(optBox, *p, QCheckListItem::CheckBox); + new TQCheckListItem(optBox, *p, TQCheckListItem::CheckBox); kdDebug() << (*p) << endl; } } else optBox = 0; - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addStretch(); } @@ -145,20 +145,20 @@ OptimizationTab::~OptimizationTab() {} -void OptimizationTab::readFlags(QStringList *list) +void OptimizationTab::readFlags(TQStringList *list) { if (optBox) { - QListViewItem *item = optBox->firstChild(); + TQListViewItem *item = optBox->firstChild(); for (; item; item = item->nextSibling()) { - QStringList::Iterator sli = list->find(item->text(0)); + TQStringList::Iterator sli = list->find(item->text(0)); if (sli != list->end()) { - static_cast(item)->setOn(true); + static_cast(item)->setOn(true); list->remove(sli); } } } - QStringList::Iterator sli; + TQStringList::Iterator sli; sli = list->find("-O0"); if (sli != list->end()) { O0->setChecked(true); @@ -177,12 +177,12 @@ void OptimizationTab::readFlags(QStringList *list) } -void OptimizationTab::writeFlags(QStringList *list) +void OptimizationTab::writeFlags(TQStringList *list) { if (optBox) { - QListViewItem *item = optBox->firstChild(); + TQListViewItem *item = optBox->firstChild(); for (; item; item = item->nextSibling()) - if (static_cast(item)->isOn()) + if (static_cast(item)->isOn()) (*list) << item->text(0); } @@ -195,19 +195,19 @@ void OptimizationTab::writeFlags(QStringList *list) } -HpfTab::HpfTab(QWidget *parent, const char *name) - : QWidget(parent, name) +HpfTab::HpfTab(TQWidget *parent, const char *name) + : TQWidget(parent, name) { - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->setAutoAdd(true); - hpfBox = new QListView(this); - hpfBox->addColumn(QString::null); + hpfBox = new TQListView(this); + hpfBox->addColumn(TQString::null); hpfBox->header()->hide(); for (const char * const *p = hpf_flags; *p; ++p) - new QCheckListItem(hpfBox, *p, QCheckListItem::CheckBox); + new TQCheckListItem(hpfBox, *p, TQCheckListItem::CheckBox); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addStretch(); } @@ -216,34 +216,34 @@ HpfTab::~HpfTab() {} -void HpfTab::readFlags(QStringList *list) +void HpfTab::readFlags(TQStringList *list) { - QListViewItem *item = hpfBox->firstChild(); + TQListViewItem *item = hpfBox->firstChild(); for (; item; item = item->nextSibling()) { - QStringList::Iterator sli = list->find(item->text(0)); + TQStringList::Iterator sli = list->find(item->text(0)); if (sli != list->end()) { - static_cast(item)->setOn(true); + static_cast(item)->setOn(true); list->remove(sli); } } } -void HpfTab::writeFlags(QStringList *list) +void HpfTab::writeFlags(TQStringList *list) { - QListViewItem *item = hpfBox->firstChild(); + TQListViewItem *item = hpfBox->firstChild(); for (; item; item = item->nextSibling()) { - if (static_cast(item)->isOn()) + if (static_cast(item)->isOn()) (*list) << item->text(0); } } -PgiOptionsDialog::PgiOptionsDialog(PgiOptionsPlugin::Type type, QWidget *parent, const char *name) +PgiOptionsDialog::PgiOptionsDialog(PgiOptionsPlugin::Type type, TQWidget *parent, const char *name) : KDialogBase(Tabbed, (type == PgiOptionsPlugin::PGHPF)? i18n("PGHPF Compiler Options") : i18n("PGF77 Compiler Options"), Ok|Cancel, Ok, parent, name, true) { - QVBox *vbox; + TQVBox *vbox; // vbox = addVBoxPage(i18n("General")); // general = new GeneralTab(vbox, "general tab"); @@ -265,9 +265,9 @@ PgiOptionsDialog::~PgiOptionsDialog() } -void PgiOptionsDialog::setFlags(const QString &flags) +void PgiOptionsDialog::setFlags(const TQString &flags) { - QStringList flaglist = QStringList::split(" ", flags); + TQStringList flaglist = TQStringList::split(" ", flags); // Hand them to 'general' at last, so it can make a line edit // with the unprocessed items @@ -278,17 +278,17 @@ void PgiOptionsDialog::setFlags(const QString &flags) } -QString PgiOptionsDialog::flags() const +TQString PgiOptionsDialog::flags() const { - QStringList flaglist; + TQStringList flaglist; if (hpf) hpf->writeFlags(&flaglist); optimization->writeFlags(&flaglist); // general->writeFlags(&flaglist); - QString flags; - QStringList::ConstIterator li; + TQString flags; + TQStringList::ConstIterator li; for (li = flaglist.begin(); li != flaglist.end(); ++li) { flags += (*li); flags += " "; @@ -299,7 +299,7 @@ QString PgiOptionsDialog::flags() const } -PgiOptionsPlugin::PgiOptionsPlugin(Type type, QObject *parent, const char *name) +PgiOptionsPlugin::PgiOptionsPlugin(Type type, TQObject *parent, const char *name) : KDevCompilerOptions(parent, name) { pgitype = type; @@ -310,12 +310,12 @@ PgiOptionsPlugin::~PgiOptionsPlugin() {} -QString PgiOptionsPlugin::exec(QWidget *parent, const QString &flags) +TQString PgiOptionsPlugin::exec(TQWidget *parent, const TQString &flags) { PgiOptionsDialog *dlg = new PgiOptionsDialog(pgitype, parent, "pgi options dialog"); - QString newFlags = flags; + TQString newFlags = flags; dlg->setFlags(flags); - if (dlg->exec() == QDialog::Accepted) + if (dlg->exec() == TQDialog::Accepted) newFlags = dlg->flags(); delete dlg; return newFlags; diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h index dfbf4547..aba83fbc 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h +++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h @@ -28,10 +28,10 @@ class PgiOptionsPlugin : public KDevCompilerOptions public: enum Type { PGHPF, PGF77 }; - PgiOptionsPlugin( Type type, QObject *parent=0, const char *name=0 ); + PgiOptionsPlugin( Type type, TQObject *parent=0, const char *name=0 ); ~PgiOptionsPlugin(); - virtual QString exec(QWidget *parent, const QString &flags); + virtual TQString exec(TQWidget *parent, const TQString &flags); private: Type pgitype; @@ -41,11 +41,11 @@ private: class PgiOptionsDialog : public KDialogBase { public: - PgiOptionsDialog(PgiOptionsPlugin::Type type, QWidget *parent=0, const char *name=0 ); + PgiOptionsDialog(PgiOptionsPlugin::Type type, TQWidget *parent=0, const char *name=0 ); ~PgiOptionsDialog(); - void setFlags(const QString &flags); - QString flags() const; + void setFlags(const TQString &flags); + TQString flags() const; private: OptimizationTab *optimization; diff --git a/languages/fortran/fixedformparser.cpp b/languages/fortran/fixedformparser.cpp index 7084fbba..312d811e 100644 --- a/languages/fortran/fixedformparser.cpp +++ b/languages/fortran/fixedformparser.cpp @@ -11,8 +11,8 @@ #include "fixedformparser.h" -#include -#include +#include +#include #include #include @@ -30,9 +30,9 @@ FixedFormParser::FixedFormParser(CodeModel* model) } -void FixedFormParser::process(const QCString &line, const QString &fileName, int lineNum) +void FixedFormParser::process(const TQCString &line, const TQString &fileName, int lineNum) { - QCString simplified; + TQCString simplified; int l = line.length(); for (int i=0; i < l; ++i) if (line[i] != ' ') @@ -40,7 +40,7 @@ void FixedFormParser::process(const QCString &line, const QString &fileName, int if ( simplified.isEmpty() ) return; - QString name; + TQString name; if (functionre.search(simplified) != -1) name = functionre.cap(3); else if (subroutinere.search(simplified) != -1) @@ -58,22 +58,22 @@ void FixedFormParser::process(const QCString &line, const QString &fileName, int } -void FixedFormParser::parse(const QString &fileName) +void FixedFormParser::parse(const TQString &fileName) { - QFile f(QFile::encodeName(fileName)); + TQFile f(TQFile::encodeName(fileName)); if (!f.open(IO_ReadOnly)) return; - QTextStream stream(&f); + TQTextStream stream(&f); m_file = m_model->create(); m_file->setName( fileName ); - QCString line; + TQCString line; int lineNum=0, startLineNum=0; while (!stream.atEnd()) { ++lineNum; - QCString str = stream.readLine().local8Bit(); - if (!str.isEmpty() && QCString("*Cc#!").find(str[0]) != -1) + TQCString str = stream.readLine().local8Bit(); + if (!str.isEmpty() && TQCString("*Cc#!").find(str[0]) != -1) continue; // Continuation line if (str.length() > 6 && str.left(5) == " " && str[5] != ' ') { diff --git a/languages/fortran/fixedformparser.h b/languages/fortran/fixedformparser.h index a7016510..f219e5ca 100644 --- a/languages/fortran/fixedformparser.h +++ b/languages/fortran/fixedformparser.h @@ -12,9 +12,9 @@ #ifndef _FIXEDFORMPARSER_H_ #define _FIXEDFORMPARSER_H_ -#include -#include -#include +#include +#include +#include #include @@ -23,13 +23,13 @@ class FixedFormParser public: FixedFormParser(CodeModel* model); - void parse(const QString &fileName); + void parse(const TQString &fileName); private: - void process(const QCString &line, const QString &fileName, int lineNum); + void process(const TQCString &line, const TQString &fileName, int lineNum); CodeModel* m_model; FileDom m_file; - QRegExp functionre, subroutinere; + TQRegExp functionre, subroutinere; }; #endif diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp index e0c0bde9..7d4ed1bc 100644 --- a/languages/fortran/fortransupportpart.cpp +++ b/languages/fortran/fortransupportpart.cpp @@ -17,13 +17,13 @@ #include "ftnchekconfigwidget.h" #include "fixedformparser.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -48,24 +48,24 @@ typedef KDevGenericFactory FortranSupportFactory; static const KDevPluginInfo data("kdevfortransupport"); K_EXPORT_COMPONENT_FACTORY( libkdevfortransupport, FortranSupportFactory( data ) ) -FortranSupportPart::FortranSupportPart(QObject *parent, const char *name, const QStringList &) +FortranSupportPart::FortranSupportPart(TQObject *parent, const char *name, const TQStringList &) : KDevLanguageSupport(&data, parent, name ? name : "FortranSupportPart") { setInstance(FortranSupportFactory::instance()); setXMLFile("kdevfortransupport.rc"); - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(projectClosed()) ); - connect( partController(), SIGNAL(savedFile(const KURL&)), - this, SLOT(savedFile(const KURL&)) ); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(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&)) ); KAction *action; action = new KAction( i18n("&Ftnchek"), 0, - this, SLOT(slotFtnchek()), + this, TQT_SLOT(slotFtnchek()), actionCollection(), "project_ftnchek" ); action->setToolTip(i18n("Run ftnchek")); action->setWhatsThis(i18n("Run ftnchek

Runs ftnchek to check fortran programs for semantic errors. Configure ftnchek options in project settings dialog, Ftnchek tab.")); @@ -89,9 +89,9 @@ void FortranSupportPart::slotFtnchek() if (partController()->saveAllFiles()==false) return; //user cancelled - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); - QString cmdline = "cd "; + TQString cmdline = "cd "; cmdline += KProcess::quote(project()->projectDirectory()); cmdline += "&& ftnchek -nonovice "; @@ -140,26 +140,26 @@ void FortranSupportPart::slotFtnchek() else cmdline += DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/portabilityonly") + " "; - QStringList list = project()->allFiles(); - QStringList::ConstIterator it; + TQStringList list = project()->allFiles(); + TQStringList::ConstIterator it; for (it = list.begin(); it != list.end(); ++it) { - QFileInfo fi(*it); - QString extension = fi.extension(); + TQFileInfo fi(*it); + TQString extension = fi.extension(); if (extension == "f77" || extension == "f" || extension == "for" || extension == "ftn") { cmdline += *it + " "; } } - makeFrontend()->queueCommand(QString::null, cmdline); + makeFrontend()->queueCommand(TQString::null, cmdline); } void FortranSupportPart::projectConfigWidget(KDialogBase *dlg) { - QVBox *vbox = dlg->addVBoxPage(i18n("Ftnchek"), i18n("Ftnchek"), BarIcon("kdevelop", KIcon::SizeMedium)); + TQVBox *vbox = dlg->addVBoxPage(i18n("Ftnchek"), i18n("Ftnchek"), BarIcon("kdevelop", KIcon::SizeMedium)); FtnchekConfigWidget *w = new FtnchekConfigWidget(*projectDom(), vbox, "ftnchek config widget"); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } @@ -167,16 +167,16 @@ void FortranSupportPart::projectOpened() { kdDebug(9019) << "projectOpened()" << endl; - connect( project(), SIGNAL(addedFilesToProject(const QStringList &)), - this, SLOT(addedFilesToProject(const QStringList &)) ); - connect( project(), SIGNAL(removedFilesFromProject(const QStringList &)), - this, SLOT(removedFilesFromProject(const QStringList &)) ); + 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 &)) ); // We want to parse only after all components have been // properly initialized parser = new FixedFormParser(codeModel()); - QTimer::singleShot(0, this, SLOT(initialParse())); + TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); } @@ -187,10 +187,10 @@ void FortranSupportPart::projectClosed() } -void FortranSupportPart::maybeParse(const QString fileName) +void FortranSupportPart::maybeParse(const TQString fileName) { - QFileInfo fi(fileName); - QString extension = fi.extension(); + TQFileInfo fi(fileName); + TQString extension = fi.extension(); if (extension == "f77" || extension == "f" || extension == "for" || extension == "ftn") { if( codeModel()->hasFile(fileName) ){ @@ -209,9 +209,9 @@ void FortranSupportPart::initialParse() if (project()) { kapp->setOverrideCursor(waitCursor); - QStringList files = project()->allFiles(); - for (QStringList::Iterator it = files.begin(); it != files.end() ;++it) { - QFileInfo fileInfo( project()->projectDirectory(), *it ); + TQStringList files = project()->allFiles(); + for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { + TQFileInfo fileInfo( project()->projectDirectory(), *it ); kdDebug(9019) << "maybe parse " << fileInfo.absFilePath() << endl; maybeParse( fileInfo.absFilePath() ); } @@ -224,16 +224,16 @@ void FortranSupportPart::initialParse() } -void FortranSupportPart::addedFilesToProject(const QStringList &fileList) +void FortranSupportPart::addedFilesToProject(const TQStringList &fileList) { kdDebug(9019) << "addedFilesToProject()" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { - QFileInfo fileInfo( project()->projectDirectory(), *it ); - QString path = fileInfo.absFilePath(); + TQFileInfo fileInfo( project()->projectDirectory(), *it ); + TQString path = fileInfo.absFilePath(); maybeParse( path ); emit addedSourceInfo( path ); } @@ -242,16 +242,16 @@ void FortranSupportPart::addedFilesToProject(const QStringList &fileList) } -void FortranSupportPart::removedFilesFromProject(const QStringList &fileList) +void FortranSupportPart::removedFilesFromProject(const TQStringList &fileList) { kdDebug(9019) << "removedFilesFromProject()" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { - QFileInfo fileInfo( project()->projectDirectory(), *it ); - QString path = fileInfo.absFilePath(); + TQFileInfo fileInfo( project()->projectDirectory(), *it ); + TQString path = fileInfo.absFilePath(); if( codeModel()->hasFile(path) ){ emit aboutToRemoveSourceInfo( path ); diff --git a/languages/fortran/fortransupportpart.h b/languages/fortran/fortransupportpart.h index 52dcba5a..9f7cbcdd 100644 --- a/languages/fortran/fortransupportpart.h +++ b/languages/fortran/fortransupportpart.h @@ -25,7 +25,7 @@ class FortranSupportPart : public KDevLanguageSupport Q_OBJECT public: - FortranSupportPart( QObject *parent, const char *name, const QStringList & ); + FortranSupportPart( TQObject *parent, const char *name, const TQStringList & ); ~FortranSupportPart(); protected: @@ -37,14 +37,14 @@ private slots: void projectOpened(); void projectClosed(); void savedFile(const KURL &fileName); - void addedFilesToProject(const QStringList &fileList); - void removedFilesFromProject(const QStringList &fileList); + void addedFilesToProject(const TQStringList &fileList); + void removedFilesFromProject(const TQStringList &fileList); // Internal void initialParse(); private: - void maybeParse(const QString fileName); + void maybeParse(const TQString fileName); KDevMakeFrontend *makeFrontend(); FixedFormParser *parser; diff --git a/languages/fortran/ftnchekconfigwidget.cpp b/languages/fortran/ftnchekconfigwidget.cpp index fd4f7a87..3448a343 100644 --- a/languages/fortran/ftnchekconfigwidget.cpp +++ b/languages/fortran/ftnchekconfigwidget.cpp @@ -11,12 +11,12 @@ #include "ftnchekconfigwidget.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include "domutil.h" @@ -25,30 +25,30 @@ class FtnchekItem : public QCheckListItem { public: - FtnchekItem(QListView *parent, const QString &flagstr, - const QString &description) - : QCheckListItem(parent, flagstr, QCheckListItem::CheckBox), + FtnchekItem(TQListView *parent, const TQString &flagstr, + const TQString &description) + : TQCheckListItem(parent, flagstr, TQCheckListItem::CheckBox), flag(flagstr), desc(description) { setText(1, desc); } - static void readFlagsToListView(QListView *listview, QStringList *list); - static void writeFlagsFromListView(QListView *listview, QStringList *list); + static void readFlagsToListView(TQListView *listview, TQStringList *list); + static void writeFlagsFromListView(TQListView *listview, TQStringList *list); private: - QString flag; - QString desc; + TQString flag; + TQString desc; friend class FtnchekToolTip; }; -void FtnchekItem::readFlagsToListView(QListView *listview, QStringList *list) +void FtnchekItem::readFlagsToListView(TQListView *listview, TQStringList *list) { - QListViewItem *item = listview->firstChild(); + TQListViewItem *item = listview->firstChild(); for (; item; item = item->nextSibling()) { FtnchekItem *flitem = static_cast(item); - QStringList::Iterator sli = list->find(flitem->flag); + TQStringList::Iterator sli = list->find(flitem->flag); if (sli != list->end()) { flitem->setOn(true); list->remove(sli); @@ -57,11 +57,11 @@ void FtnchekItem::readFlagsToListView(QListView *listview, QStringList *list) } -void FtnchekItem::writeFlagsFromListView(QListView *listview, QStringList *list) +void FtnchekItem::writeFlagsFromListView(TQListView *listview, TQStringList *list) { (*list).clear(); - QListViewItem *item = listview->firstChild(); + TQListViewItem *item = listview->firstChild(); for (; item; item = item->nextSibling()) { FtnchekItem *flitem = static_cast(item); if (flitem->isOn()) @@ -73,14 +73,14 @@ void FtnchekItem::writeFlagsFromListView(QListView *listview, QStringList *list) class FtnchekToolTip : public QToolTip { public: - FtnchekToolTip(QWidget *parent) - : QToolTip(parent) + FtnchekToolTip(TQWidget *parent) + : TQToolTip(parent) {} protected: - void maybeTip(const QPoint &pos) + void maybeTip(const TQPoint &pos) { - QListView *listview = static_cast(parentWidget()); - QListViewItem *item = listview->itemAt(pos); + TQListView *listview = static_cast(parentWidget()); + TQListViewItem *item = listview->itemAt(pos); FtnchekItem *flitem = static_cast(item); if (item) @@ -147,7 +147,7 @@ const char *portability_flags[] = { }; -FtnchekConfigWidget::FtnchekConfigWidget(QDomDocument &projectDom, QWidget *parent, const char *name) +FtnchekConfigWidget::FtnchekConfigWidget(TQDomDocument &projectDom, TQWidget *parent, const char *name) : FtnchekConfigWidgetBase(parent, name), dom(projectDom) { arguments_group = new QButtonGroup; @@ -188,22 +188,22 @@ FtnchekConfigWidget::FtnchekConfigWidget(QDomDocument &projectDom, QWidget *pare new FtnchekToolTip(portability_listview); for (const char **p = arguments_flags; *p; p += 2) - new FtnchekItem(arguments_listview, QString::fromUtf8(*p), i18n(*(p+1))); + new FtnchekItem(arguments_listview, TQString::fromUtf8(*p), i18n(*(p+1))); for (const char **p = common_flags; *p; p += 2) - new FtnchekItem(common_listview, QString::fromUtf8(*p), i18n(*(p+1))); + new FtnchekItem(common_listview, TQString::fromUtf8(*p), i18n(*(p+1))); for (const char **p = truncation_flags; *p; p += 2) - new FtnchekItem(truncation_listview, QString::fromUtf8(*p), i18n(*(p+1))); + new FtnchekItem(truncation_listview, TQString::fromUtf8(*p), i18n(*(p+1))); for (const char **p = usage_flags; *p; p += 2) - new FtnchekItem(usage_listview, QString::fromUtf8(*p), i18n(*(p+1))); + new FtnchekItem(usage_listview, TQString::fromUtf8(*p), i18n(*(p+1))); for (const char **p = f77_flags; *p; p += 2) - new FtnchekItem(f77_listview, QString::fromUtf8(*p), i18n(*(p+1))); + new FtnchekItem(f77_listview, TQString::fromUtf8(*p), i18n(*(p+1))); for (const char **p = portability_flags; *p; p += 2) - new FtnchekItem(portability_listview, QString::fromUtf8(*p), i18n(*(p+1))); + new FtnchekItem(portability_listview, TQString::fromUtf8(*p), i18n(*(p+1))); readConfig(); } @@ -240,19 +240,19 @@ void FtnchekConfigWidget::readConfig() f77all_button->setChecked(DomUtil::readBoolEntry(dom, "/kdevfortransupport/ftnchek/f77all")); portabilityall_button->setChecked(DomUtil::readBoolEntry(dom, "/kdevfortransupport/ftnchek/portabilityall")); - QStringList list; + TQStringList list; - list = QStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/argumentsonly")); + list = TQStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/argumentsonly")); FtnchekItem::readFlagsToListView(arguments_listview, &list); - list = QStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/commononly")); + list = TQStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/commononly")); FtnchekItem::readFlagsToListView(common_listview, &list); - list = QStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/truncationonly")); + list = TQStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/truncationonly")); FtnchekItem::readFlagsToListView(truncation_listview, &list); - list = QStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/usageonly")); + list = TQStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/usageonly")); FtnchekItem::readFlagsToListView(usage_listview, &list); - list = QStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/f77only")); + list = TQStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/f77only")); FtnchekItem::readFlagsToListView(f77_listview, &list); - list = QStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/portabilityonly")); + list = TQStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/portabilityonly")); FtnchekItem::readFlagsToListView(portability_listview, &list); } @@ -271,7 +271,7 @@ void FtnchekConfigWidget::storeConfig() DomUtil::writeBoolEntry(dom, "/kdevfortransupport/ftnchek/f77all", f77all_button->isChecked()); DomUtil::writeBoolEntry(dom, "/kdevfortransupport/ftnchek/portabilityall", portabilityall_button->isChecked()); - QStringList list; + TQStringList list; FtnchekItem::writeFlagsFromListView(arguments_listview, &list); DomUtil::writeEntry(dom, "/kdevfortransupport/ftnchek/argumentsonly", list.join(",")); diff --git a/languages/fortran/ftnchekconfigwidget.h b/languages/fortran/ftnchekconfigwidget.h index 053b2598..f465ac3f 100644 --- a/languages/fortran/ftnchekconfigwidget.h +++ b/languages/fortran/ftnchekconfigwidget.h @@ -12,7 +12,7 @@ #ifndef _FTNCHEKCONFIGWIDGET_H_ #define _FTNCHEKCONFIGWIDGET_H_ -#include +#include #include "ftnchekconfigwidgetbase.h" class QButtonGroup; @@ -22,7 +22,7 @@ class FtnchekConfigWidget : public FtnchekConfigWidgetBase Q_OBJECT public: - FtnchekConfigWidget(QDomDocument &projectDom, QWidget *parent, const char *name); + FtnchekConfigWidget(TQDomDocument &projectDom, TQWidget *parent, const char *name); ~FtnchekConfigWidget(); public slots: @@ -32,10 +32,10 @@ private: void readConfig(); void storeConfig(); - QButtonGroup *arguments_group, *common_group; - QButtonGroup *truncation_group, *usage_group; - QButtonGroup *f77_group, *portability_group; - QDomDocument dom; + TQButtonGroup *arguments_group, *common_group; + TQButtonGroup *truncation_group, *usage_group; + TQButtonGroup *f77_group, *portability_group; + TQDomDocument dom; }; #endif -- cgit v1.2.1