diff options
Diffstat (limited to 'buildtools')
163 files changed, 4646 insertions, 4646 deletions
diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp index a8171c81..e44a15be 100644 --- a/buildtools/ada/adaglobaloptionsdlg.cpp +++ b/buildtools/ada/adaglobaloptionsdlg.cpp @@ -6,10 +6,10 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ -#include <qlayout.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qcombobox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqcombobox.h> #include <kurlrequester.h> #include <kdebug.h> @@ -21,7 +21,7 @@ #include "adaproject_part.h" #include "adaglobaloptionsdlg.h" -AdaGlobalOptionsDlg::AdaGlobalOptionsDlg(AdaProjectPart *part, QWidget* parent, const char* name, WFlags fl) +AdaGlobalOptionsDlg::AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* parent, const char* name, WFlags fl) :AdaProjectOptionsDlgBase(parent,name,fl), m_part(part) { delete config_label; @@ -44,7 +44,7 @@ AdaGlobalOptionsDlg::AdaGlobalOptionsDlg(AdaProjectPart *part, QWidget* parent, if (offers.isEmpty()) options_button->setEnabled(false); - currentCompiler = QString::null; + currentCompiler = TQString::null; /*kdDebug() << ServiceComboBox::defaultCompiler() << endl; kdDebug() << ServiceComboBox::itemForText(ServiceComboBox::defaultCompiler(), service_names) << endl; @@ -60,17 +60,17 @@ AdaGlobalOptionsDlg::~AdaGlobalOptionsDlg() void AdaGlobalOptionsDlg::optionsButtonClicked() { - QString name = ServiceComboBox::currentText(compiler_box, service_names); + TQString name = ServiceComboBox::currentText(compiler_box, service_names); KDevCompilerOptions *plugin = m_part->createCompilerOptions(name); if (plugin) { - QString flags = plugin->exec(this, options_edit->text()); + TQString flags = plugin->exec(this, options_edit->text()); options_edit->setText(flags); delete plugin; } } -void AdaGlobalOptionsDlg::compiler_box_activated(const QString& text) +void AdaGlobalOptionsDlg::compiler_box_activated(const TQString& text) { kdDebug() << "text changed from " << currentCompiler << " to " << text << endl; if (currentCompiler == text) @@ -88,14 +88,14 @@ void AdaGlobalOptionsDlg::accept() saveConfigCache(); } -void AdaGlobalOptionsDlg::saveCompilerOpts( QString compiler ) +void AdaGlobalOptionsDlg::saveCompilerOpts( TQString compiler ) { configCache[compiler] = options_edit->text(); } -void AdaGlobalOptionsDlg::readCompilerOpts( QString compiler ) +void AdaGlobalOptionsDlg::readCompilerOpts( TQString compiler ) { - QString settings = configCache[compiler]; + TQString settings = configCache[compiler]; if (settings.isEmpty()) { KConfig *config = KGlobal::config(); @@ -111,7 +111,7 @@ void AdaGlobalOptionsDlg::readConfigCache( ) /* KConfig *config = KGlobal::config(); config->setGroup("Ada Compiler"); - QMap<QString, QString> settings = config->entryMap("Ada Compiler"); + TQMap<TQString, TQString> settings = config->entryMap("Ada Compiler"); */ } @@ -120,7 +120,7 @@ void AdaGlobalOptionsDlg::saveConfigCache( ) KConfig *config = KGlobal::config(); config->setGroup("Ada Compiler"); - for (QMap<QString, QString>::iterator it = configCache.begin(); it != configCache.end(); ++it) + for (TQMap<TQString, TQString>::iterator it = configCache.begin(); it != configCache.end(); ++it) { config->writeEntry(it.key(), it.data()); } diff --git a/buildtools/ada/adaglobaloptionsdlg.h b/buildtools/ada/adaglobaloptionsdlg.h index 92001a1b..1a186ce9 100644 --- a/buildtools/ada/adaglobaloptionsdlg.h +++ b/buildtools/ada/adaglobaloptionsdlg.h @@ -9,7 +9,7 @@ #ifndef ADAGLOBALOPTIONSDLG_H #define ADAGLOBALOPTIONSDLG_H -#include <qmap.h> +#include <tqmap.h> #include <ktrader.h> @@ -22,7 +22,7 @@ class AdaGlobalOptionsDlg : public AdaProjectOptionsDlgBase Q_OBJECT public: - AdaGlobalOptionsDlg(AdaProjectPart *part, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~AdaGlobalOptionsDlg(); public slots: @@ -30,18 +30,18 @@ public slots: protected slots: virtual void optionsButtonClicked(); - virtual void compiler_box_activated(const QString& text); + virtual void compiler_box_activated(const TQString& text); private: AdaProjectPart *m_part; KTrader::OfferList offers; - QString currentCompiler; - QStringList service_names; - QStringList service_execs; - QMap<QString, QString> configCache; + TQString currentCompiler; + TQStringList service_names; + TQStringList service_execs; + TQMap<TQString, TQString> configCache; - void saveCompilerOpts(QString compiler); - void readCompilerOpts(QString compiler); + void saveCompilerOpts(TQString compiler); + void readCompilerOpts(TQString compiler); void readConfigCache(); void saveConfigCache(); diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp index 33ba166b..f226809d 100644 --- a/buildtools/ada/adaproject_part.cpp +++ b/buildtools/ada/adaproject_part.cpp @@ -8,12 +8,12 @@ */ #include "adaproject_part.h" -#include <qdom.h> -#include <qfileinfo.h> -#include <qdir.h> -#include <qvaluestack.h> -#include <qregexp.h> -#include <qvbox.h> +#include <tqdom.h> +#include <tqfileinfo.h> +#include <tqdir.h> +#include <tqvaluestack.h> +#include <tqregexp.h> +#include <tqvbox.h> #include <kiconloader.h> #include <klocale.h> @@ -46,7 +46,7 @@ typedef KDevGenericFactory<AdaProjectPart> AdaProjectFactory; static const KDevPluginInfo data("kdevadaproject"); K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( data ) ) -AdaProjectPart::AdaProjectPart(QObject *parent, const char *name, const QStringList& ) +AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStringList& ) :KDevBuildTool(&data, parent, name ? name : "AdaProjectPart" ) { setInstance(AdaProjectFactory::instance()); @@ -54,21 +54,21 @@ AdaProjectPart::AdaProjectPart(QObject *parent, const char *name, const QStringL KAction *action; action = new KAction( i18n("&Build Project"), "make_kdevelop", Key_F8, - this, SLOT(slotBuild()), + this, TQT_SLOT(slotBuild()), actionCollection(), "build_build" ); action = new KAction( i18n("Execute Program"), "exec", 0, - this, SLOT(slotExecute()), + this, TQT_SLOT(slotExecute()), actionCollection(), "build_execute" ); - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), SIGNAL(configWidget(KDialogBase*)), - this, SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), + this, TQT_SLOT(configWidget(KDialogBase*)) ); // m_widget = new AdaProjectWidget(this); -// QWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); +// TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); // now you decide what should happen to the widget. Take a look at kdevcore.h // or at other plugins how to embed it. @@ -89,11 +89,11 @@ AdaProjectPart::~AdaProjectPart() * This should really be merged with FileTreeWidget::matchesHidePattern() * and put in its own class. Currently this is repeated in scriptprojectpart.cpp, pascalproject_part.cpp, adaproject_part.cpp */ -static bool matchesPattern(const QString &fileName, const QStringList &patternList) +static bool matchesPattern(const TQString &fileName, const TQStringList &patternList) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = patternList.begin(); it != patternList.end(); ++it) { - QRegExp re(*it, true, true); + TQRegExp re(*it, true, true); if (re.search(fileName) == 0 && re.matchedLength() == (int)fileName.length()) return true; } @@ -101,13 +101,13 @@ static bool matchesPattern(const QString &fileName, const QStringList &patternLi return false; } -void AdaProjectPart::openProject(const QString &dirName, const QString &projectName) +void AdaProjectPart::openProject(const TQString &dirName, const TQString &projectName) { m_buildDir = dirName; m_projectDir = dirName; m_projectName = projectName; - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); // Set the default directory radio to "executable" if (DomUtil::readEntry(dom, "/kdevadaproject/run/directoryradio") == "" ) { DomUtil::writeEntry(dom, "/kdevadaproject/run/directoryradio", "executable"); @@ -116,11 +116,11 @@ void AdaProjectPart::openProject(const QString &dirName, const QString &projectN loadProjectConfig(); // Put all files from all subdirectories into file list - QValueStack<QString> s; + TQValueStack<TQString> s; int prefixlen = m_projectDir.length()+1; s.push(m_projectDir); - QStringList includepatternList; + TQStringList includepatternList; if ( languageSupport() ) { @@ -132,10 +132,10 @@ void AdaProjectPart::openProject(const QString &dirName, const QString &projectN } } - QString excludepatterns = "*~"; - QStringList excludepatternList = QStringList::split(",", excludepatterns); + TQString excludepatterns = "*~"; + TQStringList excludepatternList = TQStringList::split(",", excludepatterns); - QDir dir; + TQDir dir; do { dir.setPath(s.pop()); kdDebug() << "AdaProjectPart::openProject examining: " << dir.path() << endl; @@ -143,12 +143,12 @@ void AdaProjectPart::openProject(const QString &dirName, const QString &projectN if( !dirEntries ) break; - QPtrListIterator<QFileInfo> it(*dirEntries); + TQPtrListIterator<TQFileInfo> it(*dirEntries); for (; it.current(); ++it) { - QString fileName = it.current()->fileName(); + TQString fileName = it.current()->fileName(); if (fileName == "." || fileName == "..") continue; - QString path = it.current()->absFilePath(); + TQString path = it.current()->absFilePath(); if (it.current()->isDir()) { kdDebug() << "AdaProjectPart::openProject pushing: " << path << endl; s.push(path); @@ -188,9 +188,9 @@ DomUtil::PairList AdaProjectPart::runEnvironmentVars() const * if run/directoryradio == custom * The custom directory absolute path */ -QString AdaProjectPart::runDirectory() const +TQString AdaProjectPart::runDirectory() const { - QString cwd = defaultRunDirectory("kdevadaproject"); + TQString cwd = defaultRunDirectory("kdevadaproject"); if (cwd.isEmpty()) cwd = buildDirectory(); return cwd; @@ -206,15 +206,15 @@ QString AdaProjectPart::runDirectory() const * if run/directoryradio == custom or relative == false * The absolute path to executable */ -QString AdaProjectPart::mainProgram() const +TQString AdaProjectPart::mainProgram() const { - QDomDocument * dom = projectDom(); + TQDomDocument * dom = projectDom(); - if ( !dom ) return QString(); + if ( !dom ) return TQString(); - QString DomMainProgram = DomUtil::readEntry( *dom, "/kdevadaproject/run/mainprogram"); + TQString DomMainProgram = DomUtil::readEntry( *dom, "/kdevadaproject/run/mainprogram"); - if ( DomMainProgram.isEmpty() ) return QString(); + if ( DomMainProgram.isEmpty() ) return TQString(); if ( DomMainProgram.startsWith("/") ) // assume absolute path { @@ -225,68 +225,68 @@ QString AdaProjectPart::mainProgram() const return projectDirectory() + "/" + DomMainProgram; } - return QString(); + return TQString(); } -/** Retuns a QString with the run command line arguments */ -QString AdaProjectPart::debugArguments() const +/** Retuns a TQString with the run command line arguments */ +TQString AdaProjectPart::debugArguments() const { return DomUtil::readEntry(*projectDom(), "/kdevadaproject/run/globaldebugarguments"); } -/** Retuns a QString with the run command line arguments */ -QString AdaProjectPart::runArguments() const +/** Retuns a TQString with the run command line arguments */ +TQString AdaProjectPart::runArguments() const { return DomUtil::readEntry(*projectDom(), "/kdevadaproject/run/programargs"); } -QString AdaProjectPart::mainSource() const +TQString AdaProjectPart::mainSource() const { return projectDirectory() + "/" + m_mainSource; } -void AdaProjectPart::setMainSource(QString fullPath) +void AdaProjectPart::setMainSource(TQString fullPath) { - QString olddir = activeDirectory(); - m_mainSource = fullPath.replace(QRegExp(QString(projectDirectory() + QString("/"))),""); + TQString olddir = activeDirectory(); + m_mainSource = fullPath.replace(TQRegExp(TQString(projectDirectory() + TQString("/"))),""); emit activeDirectoryChanged( olddir, activeDirectory() ); } -QString AdaProjectPart::projectDirectory() const +TQString AdaProjectPart::projectDirectory() const { return m_projectDir; } -QString AdaProjectPart::projectName() const +TQString AdaProjectPart::projectName() const { return m_projectName; } -QString AdaProjectPart::activeDirectory() const +TQString AdaProjectPart::activeDirectory() const { - QFileInfo fi(mainSource()); - return fi.dirPath(true).replace(QRegExp(projectDirectory()),""); + TQFileInfo fi(mainSource()); + return fi.dirPath(true).replace(TQRegExp(projectDirectory()),""); } -QString AdaProjectPart::buildDirectory() const +TQString AdaProjectPart::buildDirectory() const { - QFileInfo fi(mainSource()); + TQFileInfo fi(mainSource()); return fi.dirPath(true); } -void AdaProjectPart::listOfFiles(QStringList &result, QString path) const +void AdaProjectPart::listOfFiles(TQStringList &result, TQString path) const { - QDir d(path); + TQDir d(path); if (!d.exists()) return; - const QFileInfoList *entries = d.entryInfoList(QDir::Dirs | QDir::Files | QDir::Hidden); + const QFileInfoList *entries = d.entryInfoList(TQDir::Dirs | TQDir::Files | TQDir::Hidden); if( !entries ) return; QFileInfoListIterator it( *entries ); - while( const QFileInfo* fileInfo = it.current() ) + while( const TQFileInfo* fileInfo = it.current() ) { ++it; @@ -303,9 +303,9 @@ void AdaProjectPart::listOfFiles(QStringList &result, QString path) const } } -QStringList AdaProjectPart::allFiles() const +TQStringList AdaProjectPart::allFiles() const { -// QStringList files; +// TQStringList files; // listOfFiles(files, projectDirectory()); @@ -313,19 +313,19 @@ QStringList AdaProjectPart::allFiles() const return m_sourceFiles; } -void AdaProjectPart::addFile(const QString& /*fileName*/) +void AdaProjectPart::addFile(const TQString& /*fileName*/) { } -void AdaProjectPart::addFiles(const QStringList& /*fileList*/) +void AdaProjectPart::addFiles(const TQStringList& /*fileList*/) { } -void AdaProjectPart::removeFile(const QString& /*fileName*/) +void AdaProjectPart::removeFile(const TQString& /*fileName*/) { } -void AdaProjectPart::removeFiles(const QStringList& /*fileList*/) +void AdaProjectPart::removeFiles(const TQStringList& /*fileList*/) { } @@ -334,7 +334,7 @@ void AdaProjectPart::slotBuild() if (partController()->saveAllFiles()==false) return; //user cancelled - QString cmdline = m_compilerExec + " " + m_compilerOpts + " "; + TQString cmdline = m_compilerExec + " " + m_compilerOpts + " "; if (cmdline.isEmpty()) { @@ -342,10 +342,10 @@ void AdaProjectPart::slotBuild() return; } - QFileInfo fi(mainSource()); + TQFileInfo fi(mainSource()); cmdline += fi.fileName(); - QString dircmd = "cd "; + TQString dircmd = "cd "; dircmd += KProcess::quote(buildDirectory()); dircmd += " && "; @@ -355,42 +355,42 @@ void AdaProjectPart::slotBuild() void AdaProjectPart::slotExecute() { partController()->saveAllFiles(); - QString program = "./"; + TQString program = "./"; appFrontend()->startAppCommand(buildDirectory(), mainProgram(), true); } -void AdaProjectPart::changedFiles( const QStringList & fileList ) +void AdaProjectPart::changedFiles( const TQStringList & fileList ) { KDevProject::changedFiles(fileList); } -void AdaProjectPart::changedFile( const QString & fileName ) +void AdaProjectPart::changedFile( const TQString & fileName ) { KDevProject::changedFile(fileName); } void AdaProjectPart::projectConfigWidget( KDialogBase * dlg ) { - QVBox *vbox; + TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Ada Compiler")); AdaProjectOptionsDlg *w = new AdaProjectOptionsDlg(this, vbox); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); - connect( dlg, SIGNAL(okClicked()), this, SLOT(loadProjectConfig()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(loadProjectConfig()) ); } void AdaProjectPart::loadProjectConfig( ) { - QDomDocument &dom = *(projectDom()); + TQDomDocument &dom = *(projectDom()); - QString config = DomUtil::readEntry(dom, "/kdevadaproject/general/useconfiguration", "default"); - m_mainSource = DomUtil::readEntry(dom, QString("/kdevadaproject/configurations/") + config + QString("/mainsource") ); - m_compilerOpts = DomUtil::readEntry(dom, QString("/kdevadaproject/configurations/") + config + QString("/compileroptions")); - m_compilerExec = DomUtil::readEntry(dom, QString("/kdevadaproject/configurations/") + config + QString("/compilerexec")); + TQString config = DomUtil::readEntry(dom, "/kdevadaproject/general/useconfiguration", "default"); + m_mainSource = DomUtil::readEntry(dom, TQString("/kdevadaproject/configurations/") + config + TQString("/mainsource") ); + m_compilerOpts = DomUtil::readEntry(dom, TQString("/kdevadaproject/configurations/") + config + TQString("/compileroptions")); + m_compilerExec = DomUtil::readEntry(dom, TQString("/kdevadaproject/configurations/") + config + TQString("/compilerexec")); if (m_compilerExec.isEmpty()) { KTrader::OfferList offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Ada'"); - QValueList<KService::Ptr>::ConstIterator it; + TQValueList<KService::Ptr>::ConstIterator it; for (it = offers.begin(); it != offers.end(); ++it) { if ((*it)->property("X-KDevelop-Default").toBool()) { m_compilerExec = (*it)->exec(); @@ -402,13 +402,13 @@ void AdaProjectPart::loadProjectConfig( ) void AdaProjectPart::configWidget( KDialogBase * dlg ) { - QVBox *vbox; + TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Ada Compiler")); AdaGlobalOptionsDlg *w = new AdaGlobalOptionsDlg(this, vbox); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } -KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const QString &name) +KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name) { KService::Ptr service = KService::serviceByDesktopName(name); if (!service) { @@ -416,20 +416,20 @@ KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const QString &name) return 0; } - KLibFactory *factory = KLibLoader::self()->factory(QFile::encodeName(service->library())); + KLibFactory *factory = KLibLoader::self()->factory(TQFile::encodeName(service->library())); if (!factory) { - QString errorMessage = KLibLoader::self()->lastErrorMessage(); + TQString errorMessage = KLibLoader::self()->lastErrorMessage(); KMessageBox::error(0, i18n("There was an error loading the module %1.\n" "The diagnostics are:\n%2").arg(service->name()).arg(errorMessage)); exit(1); } - QStringList args; - QVariant prop = service->property("X-KDevelop-Args"); + TQStringList args; + TQVariant prop = service->property("X-KDevelop-Args"); if (prop.isValid()) - args = QStringList::split(" ", prop.toString()); + args = TQStringList::split(" ", prop.toString()); - QObject *obj = factory->create(this, service->name().latin1(), + TQObject *obj = factory->create(this, service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) { @@ -441,7 +441,7 @@ KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const QString &name) return dlg; } -QString AdaProjectPart::defaultOptions( const QString compiler ) +TQString AdaProjectPart::defaultOptions( const TQString compiler ) { KConfig *config = KGlobal::config(); config->setGroup("Ada Compiler"); @@ -454,12 +454,12 @@ QString AdaProjectPart::defaultOptions( const QString compiler ) /*! \fn AdaProjectPart::distFiles() const */ -QStringList AdaProjectPart::distFiles() const +TQStringList AdaProjectPart::distFiles() const { - QStringList sourceList = allFiles(); + TQStringList sourceList = allFiles(); // Scan current source directory for any .pro files. - QString projectDir = projectDirectory(); - QDir dir(projectDir); - QStringList files = dir.entryList( "Makefile"); + TQString projectDir = projectDirectory(); + TQDir dir(projectDir); + TQStringList files = dir.entryList( "Makefile"); return sourceList + files; } diff --git a/buildtools/ada/adaproject_part.h b/buildtools/ada/adaproject_part.h index 88966ae2..b62cf204 100644 --- a/buildtools/ada/adaproject_part.h +++ b/buildtools/ada/adaproject_part.h @@ -9,7 +9,7 @@ #ifndef __KDEVPART_ADAPROJECT_H__ #define __KDEVPART_ADAPROJECT_H__ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include "kdevbuildtool.h" @@ -21,47 +21,47 @@ class AdaProjectPart : public KDevBuildTool { Q_OBJECT public: - AdaProjectPart(QObject *parent, const char *name, const QStringList &); + AdaProjectPart(TQObject *parent, const char *name, const TQStringList &); ~AdaProjectPart(); - virtual void openProject(const QString &dirName, const QString &projectName); + virtual void openProject(const TQString &dirName, const TQString &projectName); virtual void closeProject(); /**Returns the name of the main source file without extension. We assume that all Ada compilers call the binary that way. */ - virtual QString mainProgram() const; + virtual TQString mainProgram() const; /**Main source file (like src/main.adb)*/ - virtual QString mainSource() const; - virtual void setMainSource(QString fullPath); + virtual TQString mainSource() const; + virtual void setMainSource(TQString fullPath); - virtual QString projectDirectory() const; - virtual QString projectName() const; - virtual QString activeDirectory() const; + virtual TQString projectDirectory() const; + virtual TQString projectName() const; + virtual TQString activeDirectory() const; /**The location of the main source file*/ - virtual QString buildDirectory() const; - virtual QString runDirectory() const; - virtual QString debugArguments() const; - virtual QString runArguments() const; + virtual TQString buildDirectory() const; + virtual TQString runDirectory() const; + virtual TQString debugArguments() const; + virtual TQString runArguments() const; virtual DomUtil::PairList runEnvironmentVars() const; /**Returns everything in the project directory*/ - virtual QStringList allFiles() const; + virtual TQStringList allFiles() const; /**This does absolutelly nothing*/ - virtual void addFile(const QString &fileName); + virtual void addFile(const TQString &fileName); /**This does absolutelly nothing*/ - virtual void addFiles(const QStringList &fileList); + virtual void addFiles(const TQStringList &fileList); /**This does absolutelly nothing*/ - virtual void removeFile(const QString &fileName); + virtual void removeFile(const TQString &fileName); /**This does absolutelly nothing*/ - virtual void removeFiles(const QStringList &fileList); + virtual void removeFiles(const TQStringList &fileList); - virtual void changedFiles( const QStringList & fileList ); - virtual void changedFile( const QString & fileName ); + virtual void changedFiles( const TQStringList & fileList ); + virtual void changedFile( const TQString & fileName ); - KDevCompilerOptions *createCompilerOptions(const QString &name); + KDevCompilerOptions *createCompilerOptions(const TQString &name); - virtual QString defaultOptions(const QString compiler); - QStringList distFiles() const; + virtual TQString defaultOptions(const TQString compiler); + TQStringList distFiles() const; public slots: /**loads config from project file*/ @@ -74,20 +74,20 @@ private slots: void configWidget(KDialogBase *dlg); private: - QGuardedPtr<AdaProjectWidget> m_widget; + TQGuardedPtr<AdaProjectWidget> m_widget; - void listOfFiles(QStringList &result, QString path) const; + void listOfFiles(TQStringList &result, TQString path) const; - QString m_buildDir; - QString m_projectDir; - QString m_projectName; + TQString m_buildDir; + TQString m_projectDir; + TQString m_projectName; - QString m_mainProg; - QString m_mainSource; - QString m_compilerExec; - QString m_compilerOpts; + TQString m_mainProg; + TQString m_mainSource; + TQString m_compilerExec; + TQString m_compilerOpts; - QStringList m_sourceFiles; + TQStringList m_sourceFiles; }; #endif diff --git a/buildtools/ada/adaproject_widget.cpp b/buildtools/ada/adaproject_widget.cpp index d4bdf37b..2e5d818a 100644 --- a/buildtools/ada/adaproject_widget.cpp +++ b/buildtools/ada/adaproject_widget.cpp @@ -10,7 +10,7 @@ AdaProjectWidget::AdaProjectWidget(AdaProjectPart *part) - : QWidget(0, "AdaProject widget") + : TQWidget(0, "AdaProject widget") { Q_UNUSED( part ); } diff --git a/buildtools/ada/adaproject_widget.h b/buildtools/ada/adaproject_widget.h index dc6b4ec4..5e7038f2 100644 --- a/buildtools/ada/adaproject_widget.h +++ b/buildtools/ada/adaproject_widget.h @@ -1,8 +1,8 @@ #ifndef __ADAPROJECT_WIDGET_H__ #define __ADAPROJECT_WIDGET_H__ -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> class KDevProject; class AdaProjectPart; diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp index 3eafb082..ee08da6d 100644 --- a/buildtools/ada/adaprojectoptionsdlg.cpp +++ b/buildtools/ada/adaprojectoptionsdlg.cpp @@ -12,10 +12,10 @@ #include <kmessagebox.h> #include <klocale.h> -#include <qlineedit.h> -#include <qcombobox.h> -#include <qregexp.h> -#include <qvalidator.h> +#include <tqlineedit.h> +#include <tqcombobox.h> +#include <tqregexp.h> +#include <tqvalidator.h> #include "domutil.h" #include "kdevcompileroptions.h" @@ -24,10 +24,10 @@ #include "adaproject_part.h" #include "adaprojectoptionsdlg.h" -AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, QWidget* parent, const char* name, WFlags fl) +AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* parent, const char* name, WFlags fl) : AdaProjectOptionsDlgBase(parent,name, fl), m_part(part) { - config_combo->setValidator(new QRegExpValidator(QRegExp("^\\D.*"), this)); + config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Ada'"); @@ -41,8 +41,8 @@ AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, QWidget* parent dirty = false; - QDomDocument &dom = *(m_part->projectDom()); - currentConfig = QString::null; + TQDomDocument &dom = *(m_part->projectDom()); + currentConfig = TQString::null; configChanged(DomUtil::readEntry(dom, "/kdevadaproject/general/useconfiguration", "default")); } @@ -50,17 +50,17 @@ AdaProjectOptionsDlg::~AdaProjectOptionsDlg() { } -QStringList AdaProjectOptionsDlg::allBuildConfigs() +TQStringList AdaProjectOptionsDlg::allBuildConfigs() { - QDomDocument &dom = *(m_part->projectDom()); + TQDomDocument &dom = *(m_part->projectDom()); - QStringList allConfigs; + TQStringList allConfigs; allConfigs.append("default"); - QDomNode node = dom.documentElement().namedItem("kdevadaproject").namedItem("configurations"); - QDomElement childEl = node.firstChild().toElement(); + TQDomNode node = dom.documentElement().namedItem("kdevadaproject").namedItem("configurations"); + TQDomElement childEl = node.firstChild().toElement(); while (!childEl.isNull()) { - QString config = childEl.tagName(); + TQString config = childEl.tagName(); kdDebug() << "Found config " << config << endl; if (config != "default") allConfigs.append(config); @@ -79,35 +79,35 @@ void AdaProjectOptionsDlg::accept() } } -void AdaProjectOptionsDlg::compiler_box_activated( const QString& /*s*/ ) +void AdaProjectOptionsDlg::compiler_box_activated( const TQString& /*s*/ ) { - QString exec = ServiceComboBox::currentText(compiler_box, service_execs); + TQString exec = ServiceComboBox::currentText(compiler_box, service_execs); exec_edit->setText(exec); } -void AdaProjectOptionsDlg::saveConfig( QString config ) +void AdaProjectOptionsDlg::saveConfig( TQString config ) { - QDomDocument dom = *m_part->projectDom(); - QString prefix = "/kdevadaproject/configurations/" + config + "/"; + TQDomDocument dom = *m_part->projectDom(); + TQString prefix = "/kdevadaproject/configurations/" + config + "/"; DomUtil::writeEntry(dom, prefix + "compiler", ServiceComboBox::currentText(compiler_box, service_names)); DomUtil::writeEntry(dom, prefix + "compileroptions", options_edit->text()); DomUtil::writeEntry(dom, prefix + "compilerexec", exec_edit->text()); - DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().replace(QRegExp(m_part->projectDirectory() + QString("/")),"")); + DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().replace(TQRegExp(m_part->projectDirectory() + TQString("/")),"")); } -void AdaProjectOptionsDlg::readConfig( QString config ) +void AdaProjectOptionsDlg::readConfig( TQString config ) { - QDomDocument dom = *m_part->projectDom(); - QString prefix = "/kdevadaproject/configurations/" + config + "/"; + TQDomDocument dom = *m_part->projectDom(); + TQString prefix = "/kdevadaproject/configurations/" + config + "/"; - QString compiler = DomUtil::readEntry(dom, prefix + "compiler", ""); + TQString compiler = DomUtil::readEntry(dom, prefix + "compiler", ""); if (compiler.isEmpty()) { offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Ada'"); - QValueList<KService::Ptr>::ConstIterator it; + TQValueList<KService::Ptr>::ConstIterator it; for (it = offers.begin(); it != offers.end(); ++it) { if ((*it)->property("X-KDevelop-Default").toBool()) { compiler = (*it)->name(); @@ -118,7 +118,7 @@ void AdaProjectOptionsDlg::readConfig( QString config ) } ServiceComboBox::setCurrentText(compiler_box, compiler, service_names); - QString exec = DomUtil::readEntry(dom, prefix + "compilerexec", ""); + TQString exec = DomUtil::readEntry(dom, prefix + "compilerexec", ""); if (exec.isEmpty()) exec = ServiceComboBox::currentText(compiler_box, service_execs); exec_edit->setText(exec); @@ -126,7 +126,7 @@ void AdaProjectOptionsDlg::readConfig( QString config ) mainSourceUrl->setURL(m_part->projectDirectory() + "/" + DomUtil::readEntry(dom, prefix + "mainsource")); } -void AdaProjectOptionsDlg::configComboTextChanged(const QString &config) +void AdaProjectOptionsDlg::configComboTextChanged(const TQString &config) { bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty(); bool canRemove = allConfigs.contains(config) && config != "default"; @@ -135,7 +135,7 @@ void AdaProjectOptionsDlg::configComboTextChanged(const QString &config) } -void AdaProjectOptionsDlg::configChanged(const QString &config) +void AdaProjectOptionsDlg::configChanged(const TQString &config) { if (config == currentConfig || !allConfigs.contains(config)) return; @@ -155,7 +155,7 @@ void AdaProjectOptionsDlg::configChanged(const QString &config) void AdaProjectOptionsDlg::configAdded() { - QString config = config_combo->currentText(); + TQString config = config_combo->currentText(); allConfigs.append(config); @@ -168,27 +168,27 @@ void AdaProjectOptionsDlg::configAdded() void AdaProjectOptionsDlg::configRemoved() { - QString config = config_combo->currentText(); + TQString config = config_combo->currentText(); - QDomDocument dom = *m_part->projectDom(); - QDomNode node = dom.documentElement().namedItem("kdevadaproject").namedItem("configurations"); + TQDomDocument dom = *m_part->projectDom(); + TQDomNode node = dom.documentElement().namedItem("kdevadaproject").namedItem("configurations"); node.removeChild(node.namedItem(config)); allConfigs.remove(config); config_combo->clear(); config_combo->insertStringList(allConfigs); - currentConfig = QString::null; + currentConfig = TQString::null; configChanged("default"); } void AdaProjectOptionsDlg::optionsButtonClicked( ) { - QString name = ServiceComboBox::currentText(compiler_box, service_names); + TQString name = ServiceComboBox::currentText(compiler_box, service_names); KDevCompilerOptions *plugin = m_part->createCompilerOptions(name); if (plugin) { - QString flags = plugin->exec(this, options_edit->text()); + TQString flags = plugin->exec(this, options_edit->text()); options_edit->setText(flags); delete plugin; } diff --git a/buildtools/ada/adaprojectoptionsdlg.h b/buildtools/ada/adaprojectoptionsdlg.h index d91c5266..5e40547d 100644 --- a/buildtools/ada/adaprojectoptionsdlg.h +++ b/buildtools/ada/adaprojectoptionsdlg.h @@ -21,16 +21,16 @@ class AdaProjectOptionsDlg : public AdaProjectOptionsDlgBase Q_OBJECT public: - AdaProjectOptionsDlg(AdaProjectPart *part, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~AdaProjectOptionsDlg(); public slots: virtual void accept(); protected slots: - virtual void compiler_box_activated(const QString &s); - void configComboTextChanged(const QString &config); - void configChanged(const QString &config); + virtual void compiler_box_activated(const TQString &s); + void configComboTextChanged(const TQString &config); + void configChanged(const TQString &config); void configAdded(); void configRemoved(); void optionsButtonClicked(); @@ -38,19 +38,19 @@ protected slots: void setDefaultOptions(); private: - QStringList allConfigs; - QString currentConfig; + TQStringList allConfigs; + TQString currentConfig; bool dirty; KTrader::OfferList offers; - QStringList service_names; - QStringList service_execs; + TQStringList service_names; + TQStringList service_execs; AdaProjectPart *m_part; - void saveConfig(QString config); - void readConfig(QString config); - QStringList allBuildConfigs(); + void saveConfig(TQString config); + void readConfig(TQString config); + TQStringList allBuildConfigs(); }; #endif diff --git a/buildtools/ada/service.cpp b/buildtools/ada/service.cpp index 02081a58..97b4f2f5 100644 --- a/buildtools/ada/service.cpp +++ b/buildtools/ada/service.cpp @@ -8,8 +8,8 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ -#include <qcombobox.h> -#include <qvaluelist.h> +#include <tqcombobox.h> +#include <tqvaluelist.h> #include <kservice.h> #include <kdebug.h> @@ -17,10 +17,10 @@ #include "service.h" -void ServiceComboBox::insertStringList(QComboBox *combo, const QValueList<KService::Ptr> &list, - QStringList *names, QStringList *execs) +void ServiceComboBox::insertStringList(TQComboBox *combo, const TQValueList<KService::Ptr> &list, + TQStringList *names, TQStringList *execs) { - QValueList<KService::Ptr>::ConstIterator it; + TQValueList<KService::Ptr>::ConstIterator it; for (it = list.begin(); it != list.end(); ++it) { combo->insertItem((*it)->comment()); (*names) << (*it)->desktopEntryName(); @@ -29,16 +29,16 @@ void ServiceComboBox::insertStringList(QComboBox *combo, const QValueList<KServi } } -QString ServiceComboBox::currentText(QComboBox *combo, const QStringList &names) +TQString ServiceComboBox::currentText(TQComboBox *combo, const TQStringList &names) { if (combo->currentItem() == -1) - return QString::null; + return TQString::null; return names[combo->currentItem()]; } -void ServiceComboBox::setCurrentText(QComboBox *combo, const QString &str, const QStringList &names) +void ServiceComboBox::setCurrentText(TQComboBox *combo, const TQString &str, const TQStringList &names) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; int i = 0; for (it = names.begin(); it != names.end(); ++it) { if (*it == str) { @@ -49,9 +49,9 @@ void ServiceComboBox::setCurrentText(QComboBox *combo, const QString &str, const } } -int ServiceComboBox::itemForText(const QString &str, const QStringList &names) +int ServiceComboBox::itemForText(const TQString &str, const TQStringList &names) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; int i = 0; for (it = names.begin(); it != names.end(); ++it) { if (*it == str) { @@ -62,10 +62,10 @@ int ServiceComboBox::itemForText(const QString &str, const QStringList &names) return 0; } -QString ServiceComboBox::defaultCompiler() +TQString ServiceComboBox::defaultCompiler() { KTrader::OfferList offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Ada'"); - QValueList<KService::Ptr>::ConstIterator it; + TQValueList<KService::Ptr>::ConstIterator it; for (it = offers.begin(); it != offers.end(); ++it) { if ((*it)->property("X-KDevelop-Default").toBool()) { return (*it)->name();; diff --git a/buildtools/ada/service.h b/buildtools/ada/service.h index f9671d0a..f170bb54 100644 --- a/buildtools/ada/service.h +++ b/buildtools/ada/service.h @@ -16,12 +16,12 @@ class ServiceComboBox { public: - static void insertStringList(QComboBox *combo, const QValueList<KService::Ptr> &list, - QStringList *names, QStringList *execs); - static QString currentText(QComboBox *combo, const QStringList &names); - static void setCurrentText(QComboBox *combo, const QString &str, const QStringList &names); - static int itemForText(const QString &str, const QStringList &names); - static QString defaultCompiler(); + static void insertStringList(TQComboBox *combo, const TQValueList<KService::Ptr> &list, + TQStringList *names, TQStringList *execs); + static TQString currentText(TQComboBox *combo, const TQStringList &names); + static void setCurrentText(TQComboBox *combo, const TQString &str, const TQStringList &names); + static int itemForText(const TQString &str, const TQStringList &names); + static TQString defaultCompiler(); }; #endif diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp index a7f0ea25..d6f66b46 100644 --- a/buildtools/ant/antprojectpart.cpp +++ b/buildtools/ant/antprojectpart.cpp @@ -1,14 +1,14 @@ #include "antprojectpart.h" -#include <qapplication.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qpopupmenu.h> -#include <qvbox.h> -#include <qtable.h> -#include <qtextstream.h> -#include <qvaluestack.h> -#include <qdir.h> +#include <tqapplication.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqpopupmenu.h> +#include <tqvbox.h> +#include <tqtable.h> +#include <tqtextstream.h> +#include <tqvaluestack.h> +#include <tqdir.h> #include <kdevgenericfactory.h> @@ -45,7 +45,7 @@ AntOptions::AntOptions() } -AntProjectPart::AntProjectPart(QObject *parent, const char *name, const QStringList &) +AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStringList &) : KDevBuildTool(&data, parent, name ? name : "AntProjectPart") { setInstance(AntProjectFactory::instance()); @@ -53,7 +53,7 @@ AntProjectPart::AntProjectPart(QObject *parent, const char *name, const QStringL setXMLFile("kdevantproject.rc"); m_buildProjectAction = new KAction(i18n("&Build Project"), "make_kdevelop", Key_F8, - this, SLOT(slotBuild()), + this, TQT_SLOT(slotBuild()), actionCollection(), "build_build" ); m_buildProjectAction->setToolTip(i18n("Build project")); m_buildProjectAction->setWhatsThis(i18n("<b>Build project</b><p>Executes <b>ant dist</b> command to build the project.")); @@ -65,9 +65,9 @@ AntProjectPart::AntProjectPart(QObject *parent, const char *name, const QStringL m_targetMenu = menu->popupMenu(); - connect(m_targetMenu, SIGNAL(activated(int)), this, SLOT(slotTargetMenuActivated(int))); - connect(core(), SIGNAL(projectConfigWidget(KDialogBase*)), this, SLOT(projectConfigWidget(KDialogBase*))); - connect(core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), this, SLOT(contextMenu(QPopupMenu *, const Context *))); + connect(m_targetMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTargetMenuActivated(int))); + connect(core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*))); + connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); m_antOptionsWidget = 0; } @@ -78,12 +78,12 @@ AntProjectPart::~AntProjectPart() } -void AntProjectPart::openProject(const QString &dirName, const QString &projectName) +void AntProjectPart::openProject(const TQString &dirName, const TQString &projectName) { m_projectDirectory = dirName; m_projectName = projectName; - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); // Set the default directory radio to "executable" /// \FIXME there is no kdevantproject so this will not work ! if (DomUtil::readEntry(dom, "/kdevantproject/run/directoryradio") == "" ) { @@ -97,13 +97,13 @@ void AntProjectPart::openProject(const QString &dirName, const QString &projectN fillMenu(); - QFile f(dirName + "/" + projectName.lower() + ".kdevelop" + ".filelist"); + TQFile f(dirName + "/" + projectName.lower() + ".kdevelop" + ".filelist"); if (f.open(IO_ReadOnly)) { - QTextStream stream(&f); + TQTextStream stream(&f); while (!stream.atEnd()) { - QString s = stream.readLine(); + TQString s = stream.readLine(); if (!s.startsWith("#")) m_sourceFiles << s; } @@ -117,25 +117,25 @@ void AntProjectPart::openProject(const QString &dirName, const QString &projectN void AntProjectPart::populateProject() { - QApplication::setOverrideCursor(Qt::waitCursor); + TQApplication::setOverrideCursor(Qt::waitCursor); - QValueStack<QString> s; + TQValueStack<TQString> s; int prefixlen = m_projectDirectory.length()+1; s.push(m_projectDirectory); - QDir dir; + TQDir dir; do { dir.setPath(s.pop()); kdDebug() << "Examining: " << dir.path() << endl; const QFileInfoList *dirEntries = dir.entryInfoList(); - QPtrListIterator<QFileInfo> it(*dirEntries); + TQPtrListIterator<TQFileInfo> it(*dirEntries); for (; it.current(); ++it) { - QString fileName = it.current()->fileName(); + TQString fileName = it.current()->fileName(); if (fileName == "." || fileName == "..") continue; - QString path = it.current()->absFilePath(); + TQString path = it.current()->absFilePath(); if (it.current()->isDir()) { kdDebug() << "Pushing: " << path << endl; @@ -150,7 +150,7 @@ void AntProjectPart::populateProject() } while (!s.isEmpty()); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } @@ -164,32 +164,32 @@ void AntProjectPart::closeProject() m_antOptions = AntOptions(); - QFile f(m_projectDirectory + "/" + m_projectName.lower() + ".kdevelop" + ".filelist"); + TQFile f(m_projectDirectory + "/" + m_projectName.lower() + ".kdevelop" + ".filelist"); if (!f.open(IO_WriteOnly)) return; - QTextStream stream(&f); + TQTextStream stream(&f); stream << "# KDevelop Ant Project File List" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = m_sourceFiles.begin(); it != m_sourceFiles.end(); ++it) stream << (*it) << endl; f.close(); } -QString AntProjectPart::projectDirectory() const +TQString AntProjectPart::projectDirectory() const { return m_projectDirectory; } -QString AntProjectPart::buildDirectory() const +TQString AntProjectPart::buildDirectory() const { return m_projectDirectory; } -QString AntProjectPart::projectName() const +TQString AntProjectPart::projectName() const { return m_projectName; } @@ -212,16 +212,16 @@ DomUtil::PairList AntProjectPart::runEnvironmentVars() const * if run/directoryradio == custom * The custom directory absolute path */ -QString AntProjectPart::runDirectory() const +TQString AntProjectPart::runDirectory() const { return buildDirectory(); /// \FIXME put the code below into use! - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); /// \FIXME there is no kdevantproject so this will not work ! - QString directoryRadioString = DomUtil::readEntry(dom, "/kdevantproject/run/directoryradio"); - QString DomMainProgram = DomUtil::readEntry(dom, "/kdevantproject/run/mainprogram"); + TQString directoryRadioString = DomUtil::readEntry(dom, "/kdevantproject/run/directoryradio"); + TQString DomMainProgram = DomUtil::readEntry(dom, "/kdevantproject/run/mainprogram"); if ( directoryRadioString == "build" ) return buildDirectory(); @@ -247,15 +247,15 @@ QString AntProjectPart::runDirectory() const * if run/directoryradio == custom or relative == false * The absolute path to executable */ -QString AntProjectPart::mainProgram() const +TQString AntProjectPart::mainProgram() const { - QDomDocument * dom = projectDom(); + TQDomDocument * dom = projectDom(); - if ( !dom ) return QString(); + if ( !dom ) return TQString(); - QString DomMainProgram = DomUtil::readEntry( *dom, "/kdevantproject/run/mainprogram"); + TQString DomMainProgram = DomUtil::readEntry( *dom, "/kdevantproject/run/mainprogram"); - if ( DomMainProgram.isEmpty() ) return QString(); + if ( DomMainProgram.isEmpty() ) return TQString(); if ( DomMainProgram.startsWith("/") ) // assume absolute path { @@ -266,24 +266,24 @@ QString AntProjectPart::mainProgram() const return projectDirectory() + "/" + DomMainProgram; } - return QString(); + return TQString(); } -QString AntProjectPart::debugArguments() const +TQString AntProjectPart::debugArguments() const { - return QString(""); + return TQString(""); } -/** Retuns a QString with the run command line arguments */ -QString AntProjectPart::runArguments() const +/** Retuns a TQString with the run command line arguments */ +TQString AntProjectPart::runArguments() const { /// \FIXME there is no kdevantproject so this will not work ! return DomUtil::readEntry(*projectDom(), "/kdevantproject/run/programargs"); } -QString AntProjectPart::activeDirectory() const +TQString AntProjectPart::activeDirectory() const { /// \FIXME @@ -291,18 +291,18 @@ QString AntProjectPart::activeDirectory() const // returning m_projectDirectory is wrong, the path returned should be _relative_ to the project dir // returning an empty string until antproject supports the idea of an active directory - return QString(""); + return TQString(""); } -QStringList AntProjectPart::allFiles() const +TQStringList AntProjectPart::allFiles() const { -/* QStringList res; +/* TQStringList res; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = m_sourceFiles.begin(); it != m_sourceFiles.end(); ++it) { - QString fileName = *it; + TQString fileName = *it; if (!fileName.startsWith("/")) { fileName.prepend("/"); @@ -318,17 +318,17 @@ QStringList AntProjectPart::allFiles() const } -void AntProjectPart::addFile(const QString &fileName) +void AntProjectPart::addFile(const TQString &fileName) { - QStringList fileList; + TQStringList fileList; fileList.append ( fileName ); this->addFiles ( fileList ); } -void AntProjectPart::addFiles ( const QStringList& fileList ) +void AntProjectPart::addFiles ( const TQStringList& fileList ) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { @@ -339,20 +339,20 @@ void AntProjectPart::addFiles ( const QStringList& fileList ) emit addedFilesToProject(fileList); } -void AntProjectPart::removeFile(const QString &fileName) +void AntProjectPart::removeFile(const TQString &fileName) { - QStringList fileList; + TQStringList fileList; fileList.append ( fileName ); this->removeFiles ( fileList ); } -void AntProjectPart::removeFiles ( const QStringList& fileList ) +void AntProjectPart::removeFiles ( const TQStringList& fileList ) { kdDebug() << "Emitting removedFilesFromProject" << endl; emit removedFilesFromProject(fileList); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { @@ -367,12 +367,12 @@ void AntProjectPart::parseBuildXML() m_antOptions.m_defineProperties.clear(); // open build file - QFile bf(m_projectDirectory + "/" + m_antOptions.m_buildXML); + TQFile bf(m_projectDirectory + "/" + m_antOptions.m_buildXML); if (!bf.open(IO_ReadOnly)) return; // parse build file - QDomDocument dom; + TQDomDocument dom; if (!dom.setContent(&bf)) { bf.close(); @@ -383,7 +383,7 @@ void AntProjectPart::parseBuildXML() m_projectName = dom.documentElement().attribute("name", m_projectName); m_antOptions.m_defaultTarget = dom.documentElement().attribute("default", ""); - QDomNode node = dom.documentElement().firstChild(); + TQDomNode node = dom.documentElement().firstChild(); while (!node.isNull()) { if (node.toElement().tagName() == "target") @@ -412,7 +412,7 @@ void AntProjectPart::fillMenu() m_targetMenu->clear(); int id = 0; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = m_antOptions.m_targets.begin(); it != m_antOptions.m_targets.end(); ++it) m_targetMenu->insertItem(*it, id++); } @@ -430,11 +430,11 @@ void AntProjectPart::slotTargetMenuActivated(int id) } -void AntProjectPart::ant(const QString &target) +void AntProjectPart::ant(const TQString &target) { - QString cmd = "%0 cd %1 && ant %2 -buildfile %3 %4 %5"; + TQString cmd = "%0 cd %1 && ant %2 -buildfile %3 %4 %5"; - QString verb = ""; + TQString verb = ""; switch (m_antOptions.m_verbosity) { case AntOptions::Quiet: @@ -448,13 +448,13 @@ void AntProjectPart::ant(const QString &target) break; } - QString options = ""; - QMap<QString,QString>::Iterator it; + TQString options = ""; + TQMap<TQString,TQString>::Iterator it; for (it = m_antOptions.m_properties.begin(); it != m_antOptions.m_properties.end(); ++it) if (m_antOptions.m_defineProperties[it.key()]) options += "-D" + it.key() + "=\"" + it.data() + "\" "; - QString cp; + TQString cp; if (!m_classPath.count() == 0) cp = "CLASSPATH="+m_classPath.join(":"); @@ -464,7 +464,7 @@ void AntProjectPart::ant(const QString &target) void AntProjectPart::projectConfigWidget(KDialogBase *dlg) { - QVBox *vbox = dlg->addVBoxPage(i18n("Ant Options")); + TQVBox *vbox = dlg->addVBoxPage(i18n("Ant Options")); m_antOptionsWidget = new AntOptionsWidget(vbox); m_antOptionsWidget->BuildXML->setURL(m_antOptions.m_buildXML); @@ -485,19 +485,19 @@ void AntProjectPart::projectConfigWidget(KDialogBase *dlg) m_antOptionsWidget->Properties->setNumRows(m_antOptions.m_properties.count()); m_antOptionsWidget->Properties->setNumCols(2); - QMap<QString,QString>::Iterator it; + TQMap<TQString,TQString>::Iterator it; int i=0; for (it = m_antOptions.m_properties.begin(); it != m_antOptions.m_properties.end(); ++it) { - QCheckTableItem *citem = new QCheckTableItem(m_antOptionsWidget->Properties, it.key()); + TQCheckTableItem *citem = new TQCheckTableItem(m_antOptionsWidget->Properties, it.key()); citem->setChecked(m_antOptions.m_defineProperties[it.key()]); m_antOptionsWidget->Properties->setItem(i,0, citem); - QTableItem *item = new QTableItem(m_antOptionsWidget->Properties, QTableItem::WhenCurrent, it.data()); + TQTableItem *item = new TQTableItem(m_antOptionsWidget->Properties, TQTableItem::WhenCurrent, it.data()); m_antOptionsWidget->Properties->setItem(i,1, item); ++i; } - connect(dlg, SIGNAL(okClicked()), this, SLOT(optionsAccepted())); + connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(optionsAccepted())); vbox = dlg->addVBoxPage(i18n("Classpath")); m_classPathWidget = new ClassPathWidget(vbox); @@ -528,11 +528,11 @@ void AntProjectPart::optionsAccepted() for (int i=0; i<m_antOptionsWidget->Properties->numRows(); ++i) { - QString key = m_antOptionsWidget->Properties->text(i,0); + TQString key = m_antOptionsWidget->Properties->text(i,0); m_antOptions.m_properties.replace(key, m_antOptionsWidget->Properties->text(i,1)); kdDebug() << "PROP: " << key << " = " << m_antOptionsWidget->Properties->text(i,1); - QCheckTableItem *item =(QCheckTableItem*) m_antOptionsWidget->Properties->item(i,0); + TQCheckTableItem *item =(TQCheckTableItem*) m_antOptionsWidget->Properties->item(i,0); m_antOptions.m_defineProperties.replace(key, item->isChecked()); } @@ -543,7 +543,7 @@ void AntProjectPart::optionsAccepted() } -void AntProjectPart::contextMenu(QPopupMenu *popup, const Context *context) +void AntProjectPart::contextMenu(TQPopupMenu *popup, const Context *context) { if (!context->hasType( Context::FileContext )) return; @@ -555,7 +555,7 @@ void AntProjectPart::contextMenu(QPopupMenu *popup, const Context *context) m_contextFileName = url.fileName(); bool inProject = project()->allFiles().contains(m_contextFileName.mid ( project()->projectDirectory().length() + 1 ) ); - QString popupstr = QFileInfo(m_contextFileName).fileName(); + TQString popupstr = TQFileInfo(m_contextFileName).fileName(); if (m_contextFileName.startsWith(projectDirectory()+ "/")) m_contextFileName.remove(0, projectDirectory().length()+1); @@ -563,13 +563,13 @@ void AntProjectPart::contextMenu(QPopupMenu *popup, const Context *context) if (inProject) { int id = popup->insertItem( i18n("Remove %1 From Project").arg(popupstr), - this, SLOT(slotRemoveFromProject()) ); + this, TQT_SLOT(slotRemoveFromProject()) ); popup->setWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the project.")); } else { int id = popup->insertItem( i18n("Add %1 to Project").arg(popupstr), - this, SLOT(slotAddToProject()) ); + this, TQT_SLOT(slotAddToProject()) ); popup->setWhatsThis(id, i18n("<b>Add to project</b><p>Adds current file from the project.")); } } @@ -577,7 +577,7 @@ void AntProjectPart::contextMenu(QPopupMenu *popup, const Context *context) void AntProjectPart::slotAddToProject() { - QStringList fileList; + TQStringList fileList; fileList.append ( m_contextFileName ); addFiles ( fileList ); } @@ -585,7 +585,7 @@ void AntProjectPart::slotAddToProject() void AntProjectPart::slotRemoveFromProject() { - QStringList fileList; + TQStringList fileList; fileList.append ( m_contextFileName ); removeFiles ( fileList ); } @@ -597,12 +597,12 @@ void AntProjectPart::slotRemoveFromProject() /*! \fn AntProjectPart::distFiles() const */ -QStringList AntProjectPart::distFiles() const +TQStringList AntProjectPart::distFiles() const { - QStringList sourceList = allFiles(); + TQStringList sourceList = allFiles(); // Scan current source directory for any .pro files. - QString projectDir = projectDirectory(); - QDir dir(projectDir); - QStringList files = dir.entryList( "build.xml"); + TQString projectDir = projectDirectory(); + TQDir dir(projectDir); + TQStringList files = dir.entryList( "build.xml"); return sourceList + files; } diff --git a/buildtools/ant/antprojectpart.h b/buildtools/ant/antprojectpart.h index d6540c48..b40740b5 100644 --- a/buildtools/ant/antprojectpart.h +++ b/buildtools/ant/antprojectpart.h @@ -2,9 +2,9 @@ #define _ANTPROJECTPART_H_ -#include <qstring.h> -#include <qstringlist.h> -#include <qmap.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqmap.h> class QPopupMenu; @@ -30,11 +30,11 @@ public: enum Verbosity { Quiet, Verbose, Debug }; - QString m_buildXML; - QString m_defaultTarget; - QStringList m_targets; - QMap<QString,QString> m_properties; - QMap<QString,bool> m_defineProperties; + TQString m_buildXML; + TQString m_defaultTarget; + TQStringList m_targets; + TQMap<TQString,TQString> m_properties; + TQMap<TQString,bool> m_defineProperties; Verbosity m_verbosity; }; @@ -46,31 +46,31 @@ class AntProjectPart : public KDevBuildTool public: - AntProjectPart(QObject *parent, const char *name, const QStringList &args); + AntProjectPart(TQObject *parent, const char *name, const TQStringList &args); ~AntProjectPart(); - QStringList distFiles() const; + TQStringList distFiles() const; protected: - virtual void openProject(const QString &dirName, const QString &projectName); + virtual void openProject(const TQString &dirName, const TQString &projectName); virtual void closeProject(); - virtual QString projectDirectory() const; - virtual QString projectName() const; - virtual QString mainProgram() const; - virtual QString activeDirectory() const; - virtual QStringList allFiles() const; - virtual QString buildDirectory() const; - virtual QString runDirectory() const; - virtual QString runArguments() const; - virtual QString debugArguments() const; + virtual TQString projectDirectory() const; + virtual TQString projectName() const; + virtual TQString mainProgram() const; + virtual TQString activeDirectory() const; + virtual TQStringList allFiles() const; + virtual TQString buildDirectory() const; + virtual TQString runDirectory() const; + virtual TQString runArguments() const; + virtual TQString debugArguments() const; virtual DomUtil::PairList runEnvironmentVars() const; - virtual void addFile(const QString &fileName); - virtual void addFiles ( const QStringList &fileList ); - virtual void removeFile(const QString &fileName); - virtual void removeFiles ( const QStringList& fileList ); + virtual void addFile(const TQString &fileName); + virtual void addFiles ( const TQStringList &fileList ); + virtual void removeFile(const TQString &fileName); + virtual void removeFiles ( const TQStringList& fileList ); private slots: @@ -79,7 +79,7 @@ private slots: void slotTargetMenuActivated(int id); void projectConfigWidget(KDialogBase *dlg); - void contextMenu(QPopupMenu *popup, const Context *context); + void contextMenu(TQPopupMenu *popup, const Context *context); void optionsAccepted(); @@ -93,23 +93,23 @@ private: void fillMenu(); void populateProject(); - void ant(const QString &target); + void ant(const TQString &target); - QString m_projectDirectory, m_projectName; - QStringList m_classPath; + TQString m_projectDirectory, m_projectName; + TQStringList m_classPath; - QStringList m_sourceFiles; + TQStringList m_sourceFiles; AntOptions m_antOptions; KAction *m_buildProjectAction; - QPopupMenu *m_targetMenu; + TQPopupMenu *m_targetMenu; AntOptionsWidget *m_antOptionsWidget; ClassPathWidget *m_classPathWidget; - QString m_contextFileName; + TQString m_contextFileName; }; diff --git a/buildtools/autotools/addapplicationdlg.cpp b/buildtools/autotools/addapplicationdlg.cpp index 04e132dd..f0cd3693 100644 --- a/buildtools/autotools/addapplicationdlg.cpp +++ b/buildtools/autotools/addapplicationdlg.cpp @@ -11,13 +11,13 @@ #include "addapplicationdlg.h" -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qfile.h> -#include <qheader.h> -#include <qlistview.h> -#include <qtextstream.h> -#include <qapplication.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqfile.h> +#include <tqheader.h> +#include <tqlistview.h> +#include <tqtextstream.h> +#include <tqapplication.h> #include <klineedit.h> #include <kdebug.h> #include <kicondialog.h> @@ -33,7 +33,7 @@ AddApplicationDialog::AddApplicationDialog(AutoProjectWidget *widget, SubprojectItem *spitem, - QWidget *parent, const char *name) + TQWidget *parent, const char *name) : AddApplicationDialogBase(parent, name, true) { filename_edit->setText(".desktop"); @@ -41,27 +41,27 @@ AddApplicationDialog::AddApplicationDialog(AutoProjectWidget *widget, Subproject filename_edit->setFocus(); chosentypes_listview->header()->hide(); availtypes_listview->header()->hide(); - QString addApplication = add_button->text(); - QString removeApplication = remove_button->text(); + TQString addApplication = add_button->text(); + TQString removeApplication = remove_button->text(); - add_button->setText( QApplication::reverseLayout() ? removeApplication : addApplication ); - remove_button->setText( QApplication::reverseLayout() ? addApplication : removeApplication ); + add_button->setText( TQApplication::reverseLayout() ? removeApplication : addApplication ); + remove_button->setText( TQApplication::reverseLayout() ? addApplication : removeApplication ); m_widget = widget; subProject = spitem; // Fill the combo box with program names in the directory - QPtrListIterator<TargetItem> tit(spitem->targets); + TQPtrListIterator<TargetItem> tit(spitem->targets); for (; tit.current(); ++tit) { if ((*tit)->primary == "PROGRAMS") - executable_combo->insertItem(QString((*tit)->name)); + executable_combo->insertItem(TQString((*tit)->name)); } // Fill the list of available mime types KMimeType::List l = KMimeType::allMimeTypes(); KMimeType::List::Iterator it; for (it = l.begin(); it != l.end(); ++it) - new QListViewItem(availtypes_listview, (*it)->name()); + new TQListViewItem(availtypes_listview, (*it)->name()); setIcon ( SmallIcon ( "window_new" ) ); } @@ -74,7 +74,7 @@ AddApplicationDialog::~AddApplicationDialog() void AddApplicationDialog::iconClicked() { KIconLoader *loader = AutoProjectFactory::instance()->iconLoader(); - QString name = KIconDialog::getIcon(KIcon::Desktop); + TQString name = KIconDialog::getIcon(KIcon::Desktop); if (!name.isNull()) { iconName = name; icon_button->setPixmap(loader->loadIcon(name, KIcon::Desktop)); @@ -84,17 +84,17 @@ void AddApplicationDialog::iconClicked() void AddApplicationDialog::addTypeClicked() { - QListViewItem *selitem = availtypes_listview->selectedItem(); + TQListViewItem *selitem = availtypes_listview->selectedItem(); if (!selitem) return; - QListViewItem *olditem = chosentypes_listview->firstChild(); + TQListViewItem *olditem = chosentypes_listview->firstChild(); while (olditem) { if (selitem->text(0) == olditem->text(0)) return; olditem = olditem->nextSibling(); } - new QListViewItem(chosentypes_listview, selitem->text(0)); + new TQListViewItem(chosentypes_listview, selitem->text(0)); } @@ -107,36 +107,36 @@ void AddApplicationDialog::removeTypeClicked() void AddApplicationDialog::accept() { // Create list of mime types - QStringList mimeTypes; - QListViewItem *item = chosentypes_listview->firstChild(); + TQStringList mimeTypes; + TQListViewItem *item = chosentypes_listview->firstChild(); while (item) { mimeTypes.append(item->text(0)); item = item->nextSibling(); } // Some plausibility tests - QString fileName = filename_edit->text(); + TQString fileName = filename_edit->text(); if (fileName.isEmpty() || fileName == ".desktop") { KMessageBox::sorry(this, i18n("You have to enter a file name.")); filename_edit->setFocus(); return; } - QString executable = executable_combo->currentText(); + TQString executable = executable_combo->currentText(); if (executable.isEmpty()) { KMessageBox::sorry(this, i18n("You have to enter the file name of an executable program.")); executable_combo->setFocus(); return; } - QString name = name_edit->text(); + TQString name = name_edit->text(); if (name.isEmpty()) { KMessageBox::sorry(this, i18n("You have to enter an application name.")); name_edit->setFocus(); return; } - QFile f(subProject->path + "/" + fileName); + TQFile f(subProject->path + "/" + fileName); if (f.exists()) { KMessageBox::sorry(this, i18n("A file with this name exists already.")); filename_edit->setFocus(); @@ -147,7 +147,7 @@ void AddApplicationDialog::accept() return; } - QTextStream stream(&f); + TQTextStream stream(&f); stream << "[Desktop Entry]" << endl; stream << "Type=Application" << endl; stream << "Name=" << name << endl; @@ -161,15 +161,15 @@ void AddApplicationDialog::accept() // Find a prefix that points to the applnk directory. // If there is none, use appslnksection - QString section = section_combo->currentText(); - QString appsdir = "$(kde_appsdir)/" + section; - QMap<QString,QString>::ConstIterator it; + TQString section = section_combo->currentText(); + TQString appsdir = "$(kde_appsdir)/" + section; + TQMap<TQString,TQString>::ConstIterator it; for (it = subProject->prefixes.begin(); it != subProject->prefixes.end(); ++it) if (it.data() == appsdir) break; - QMap<QString, QString> replaceMap; - QString prefix; + TQMap<TQString, TQString> replaceMap; + TQString prefix; if (it == subProject->prefixes.end()) { prefix = "applnk" + section; replaceMap.insert(prefix + "dir", appsdir); @@ -177,7 +177,7 @@ void AddApplicationDialog::accept() } else { prefix = it.key(); } - QString varname = prefix + "_DATA"; + TQString varname = prefix + "_DATA"; // Look if a list view item for this prefix exists already. // Create a new one otherwise @@ -201,7 +201,7 @@ void AddApplicationDialog::accept() replaceMap.insert(varname, subProject->variables[varname]); AutoProjectTool::addToMakefileam(subProject->path + "/Makefile.am", replaceMap); - QDialog::accept(); + TQDialog::accept(); } #include "addapplicationdlg.moc" diff --git a/buildtools/autotools/addapplicationdlg.h b/buildtools/autotools/addapplicationdlg.h index d9f8e6fc..4ab74ef2 100644 --- a/buildtools/autotools/addapplicationdlg.h +++ b/buildtools/autotools/addapplicationdlg.h @@ -25,7 +25,7 @@ class AddApplicationDialog : public AddApplicationDialogBase public: AddApplicationDialog( AutoProjectWidget *widget, SubprojectItem *spitem, - QWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~AddApplicationDialog(); protected: @@ -37,7 +37,7 @@ protected: private: AutoProjectWidget *m_widget; SubprojectItem *subProject; - QString iconName; + TQString iconName; }; #endif diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp index 625d6af1..912edc52 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.cpp +++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp @@ -14,8 +14,8 @@ * * ***************************************************************************/ -#include <qgroupbox.h> -#include <qlayout.h> +#include <tqgroupbox.h> +#include <tqlayout.h> #include <kprogress.h> #include <klocale.h> @@ -34,7 +34,7 @@ #include "addexistingdirectoriesdlg.h" -AddExistingDirectoriesDialog::AddExistingDirectoriesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, QWidget* parent, const char* name, bool modal, WFlags fl ) +AddExistingDirectoriesDialog::AddExistingDirectoriesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TQWidget* parent, const char* name, bool modal, WFlags fl ) : AddExistingDlgBase ( parent, name, modal, fl ) { setIcon ( SmallIcon ( "fileimport.png" ) ); @@ -62,13 +62,13 @@ AddExistingDirectoriesDialog::AddExistingDirectoriesDialog ( AutoProjectPart* pa setIcon ( SmallIcon ( "fileimport.png" ) ); - QWidget::setTabOrder(sourceSelector, addAllButton); - QWidget::setTabOrder(addAllButton, addSelectedButton); - QWidget::setTabOrder(addSelectedButton, importView); - QWidget::setTabOrder(importView, removeAllButton); - QWidget::setTabOrder(removeAllButton, removeSelectedButton); - QWidget::setTabOrder(removeSelectedButton, okButton); - QWidget::setTabOrder(okButton, cancelButton); + TQWidget::setTabOrder(sourceSelector, addAllButton); + TQWidget::setTabOrder(addAllButton, addSelectedButton); + TQWidget::setTabOrder(addSelectedButton, importView); + TQWidget::setTabOrder(importView, removeAllButton); + TQWidget::setTabOrder(removeAllButton, removeSelectedButton); + TQWidget::setTabOrder(removeSelectedButton, okButton); + TQWidget::setTabOrder(okButton, cancelButton); sourceSelector->setFocus(); @@ -87,14 +87,14 @@ void AddExistingDirectoriesDialog::init() importView->setMode ( KIconView::Select ); importView->setItemsMovable ( false ); - connect ( okButton, SIGNAL ( clicked () ), this, SLOT ( slotOk () ) ); + connect ( okButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotOk () ) ); - connect ( addSelectedButton, SIGNAL ( clicked () ), this, SLOT ( slotAddSelected() ) ); - connect ( addAllButton, SIGNAL ( clicked () ), this, SLOT ( slotAddAll() ) ); - connect ( removeSelectedButton, SIGNAL ( clicked () ), this, SLOT ( slotRemoveSelected() ) ); - connect ( removeAllButton, SIGNAL ( clicked () ), this, SLOT ( slotRemoveAll() ) ); + connect ( addSelectedButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddSelected() ) ); + connect ( addAllButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddAll() ) ); + connect ( removeSelectedButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveSelected() ) ); + connect ( removeAllButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveAll() ) ); - connect ( importView, SIGNAL ( dropped( QDropEvent* ) ), this, SLOT ( slotDropped ( QDropEvent* ) ) ); + connect ( importView, TQT_SIGNAL ( dropped( TQDropEvent* ) ), this, TQT_SLOT ( slotDropped ( TQDropEvent* ) ) ); importView->setSelectionMode ( KFile::Multi ); @@ -112,7 +112,7 @@ void AddExistingDirectoriesDialog::importItems() // items already added to the importView KFileItemListIterator importedList ( *importView->items() ); - QStringList duplicateList; + TQStringList duplicateList; importedList.toFirst(); @@ -156,11 +156,11 @@ void AddExistingDirectoriesDialog::importItems() void AddExistingDirectoriesDialog::slotOk() { - if ( importView->items()->count() == 0 ) QDialog::reject(); + if ( importView->items()->count() == 0 ) TQDialog::reject(); KFileItemListIterator items ( *importView->items() ); - QStringList dirs; + TQStringList dirs; for ( ; items.current(); ++items ) { @@ -181,17 +181,17 @@ void AddExistingDirectoriesDialog::slotOk() dirs << items.current()->name(); } - for (QStringList::const_iterator it = dirs.begin(); it != dirs.end(); ++it) + for (TQStringList::const_iterator it = dirs.begin(); it != dirs.end(); ++it) { - QString name = *it; + TQString name = *it; // Adjust SUBDIRS variable in containing Makefile.am if (m_spitem->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1) { - QFile subdirsfile( m_spitem->path + "/subdirs" ); + TQFile subdirsfile( m_spitem->path + "/subdirs" ); if ( subdirsfile.open( IO_WriteOnly | IO_Append ) ) { - QTextStream subdirsstream( &subdirsfile ); + TQTextStream subdirsstream( &subdirsfile ); subdirsstream << name << endl; subdirsfile.close(); } @@ -202,7 +202,7 @@ void AddExistingDirectoriesDialog::slotOk() else { m_spitem->variables["SUBDIRS"] += (" " + name); - QMap<QString,QString> replaceMap; + TQMap<TQString,TQString> replaceMap; replaceMap.insert("SUBDIRS", m_spitem->variables["SUBDIRS"]); AutoProjectTool::addToMakefileam(m_spitem->path + "/Makefile.am", replaceMap); } @@ -215,7 +215,7 @@ void AddExistingDirectoriesDialog::slotOk() newitem->setOpen(true); // Move to the bottom of the list - QListViewItem *lastItem = m_spitem->firstChild(); + TQListViewItem *lastItem = m_spitem->firstChild(); while (lastItem->nextSibling()) lastItem = lastItem->nextSibling(); if (lastItem != newitem) @@ -223,8 +223,8 @@ void AddExistingDirectoriesDialog::slotOk() // Create a Makefile in the new subdirectory - QDir dir( m_spitem->path + "/" + name ); - QFile f( dir.filePath("Makefile.am") ); + TQDir dir( m_spitem->path + "/" + name ); + TQFile f( dir.filePath("Makefile.am") ); if (f.exists()) { m_widget->getSubprojectView()->parse( newitem ); } else { @@ -232,7 +232,7 @@ void AddExistingDirectoriesDialog::slotOk() // KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name)); continue; } - QTextStream stream(&f); + TQTextStream stream(&f); stream << "INCLUDES = " << newitem->variables["INCLUDES"] << endl << "METASOURCES = AUTO" << endl; f.close(); } @@ -241,13 +241,13 @@ void AddExistingDirectoriesDialog::slotOk() // if !isKDE: add the new sub-proj to configure.in or configure.ac if ( !m_part->isKDE() ) { - QString projroot = m_part->projectDirectory() + "/"; - QString subdirectory = dir.path(); - QString relpath = subdirectory.replace(0, projroot.length(),""); + TQString projroot = m_part->projectDirectory() + "/"; + TQString subdirectory = dir.path(); + TQString relpath = subdirectory.replace(0, projroot.length(),""); - QString configureFile = m_part->getAutoConfFile(projroot); + TQString configureFile = m_part->getAutoConfFile(projroot); - QStringList list = AutoProjectTool::configureinLoadMakefiles(configureFile); + TQStringList list = AutoProjectTool::configureinLoadMakefiles(configureFile); if ( !list.isEmpty() ) { list.push_back( relpath + "/Makefile" ); @@ -258,7 +258,7 @@ void AddExistingDirectoriesDialog::slotOk() m_part->needMakefileCvs(); } - QDialog::accept(); + TQDialog::accept(); } void AddExistingDirectoriesDialog::slotAddSelected() @@ -267,7 +267,7 @@ void AddExistingDirectoriesDialog::slotAddSelected() for ( ; it.current(); ++it ) { - QString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url()); + TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url()); if (relPath[relPath.length()-1] == '/') relPath = relPath.left(relPath.length()-1); if ( (relPath.isEmpty()) || (! m_widget->allSubprojects().contains( relPath )) ) @@ -285,7 +285,7 @@ void AddExistingDirectoriesDialog::slotAddAll() for ( ; it.current(); ++it ) { - QString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url()); + TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url()); if (relPath[relPath.length()-1] == '/') relPath = relPath.left(relPath.length()-1); if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().contains( relPath )) ) @@ -345,7 +345,7 @@ void AddExistingDirectoriesDialog::slotRemoveSelected() importView->viewport()->update(); } -void AddExistingDirectoriesDialog::slotDropped ( QDropEvent* ev ) +void AddExistingDirectoriesDialog::slotDropped ( TQDropEvent* ev ) { kdDebug ( 9020 ) << "AddExistingDirectoriesDialog::dropped()" << endl; @@ -360,7 +360,7 @@ void AddExistingDirectoriesDialog::slotDropped ( QDropEvent* ev ) for ( KURL::List::Iterator it = urls.begin(); it != urls.end(); ++it ) { //check if this subproject is already in project - QString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), *it); + TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), *it); if (relPath[relPath.length()-1] == '/') relPath = relPath.left(relPath.length()-1); if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().contains( relPath )) ) diff --git a/buildtools/autotools/addexistingdirectoriesdlg.h b/buildtools/autotools/addexistingdirectoriesdlg.h index c4dd048e..3b8853ee 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.h +++ b/buildtools/autotools/addexistingdirectoriesdlg.h @@ -19,7 +19,7 @@ #include "addexistingdlgbase.h" -#include <qdialog.h> +#include <tqdialog.h> #include <kfile.h> #include "misc.h" @@ -39,7 +39,7 @@ class AddExistingDirectoriesDialog : public AddExistingDlgBase public: AddExistingDirectoriesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, - SubprojectItem* spitem, QWidget* parent = 0, + SubprojectItem* spitem, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddExistingDirectoriesDialog(); @@ -64,7 +64,7 @@ protected slots: void slotAddAll(); void slotRemoveAll(); void slotRemoveSelected(); - void slotDropped ( QDropEvent* ev ); + void slotDropped ( TQDropEvent* ev ); void slotOk(); }; diff --git a/buildtools/autotools/addexistingfilesdlg.cpp b/buildtools/autotools/addexistingfilesdlg.cpp index 00f3e61b..6d3224df 100644 --- a/buildtools/autotools/addexistingfilesdlg.cpp +++ b/buildtools/autotools/addexistingfilesdlg.cpp @@ -16,15 +16,15 @@ /** Here resides the Import-existing-files-dialog of the Automake Manager (a KDevelop build tool part) **/ -#include <qapplication.h> -#include <qgroupbox.h> -#include <qlabel.h> -//#include <qlistbox.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qpixmap.h> +#include <tqapplication.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +//#include <tqlistbox.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqpixmap.h> #include <kdebug.h> #include <kfileview.h> @@ -56,7 +56,7 @@ * TRUE to construct a modal dialog. */ -AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TargetItem* titem, QWidget* parent, const char* name, bool modal, WFlags fl ) +AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TargetItem* titem, TQWidget* parent, const char* name, bool modal, WFlags fl ) : AddExistingDlgBase ( parent, name, modal, fl ) { m_spitem = spitem; @@ -72,7 +72,7 @@ AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProj if ( titem->name.isEmpty() ) { - QString target = i18n ( "%1 in %2" ).arg ( titem->primary ).arg ( titem->prefix ); + TQString target = i18n ( "%1 in %2" ).arg ( titem->primary ).arg ( titem->prefix ); targetLabel->setText ( target ); } else @@ -89,13 +89,13 @@ AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProj destGroupBoxLayout->addWidget ( importView ); //destGroupBoxLayout->setStretchFactor(dir, 2); - QWidget::setTabOrder(sourceSelector, addAllButton); - QWidget::setTabOrder(addAllButton, addSelectedButton); - QWidget::setTabOrder(addSelectedButton, importView); - QWidget::setTabOrder(importView, removeAllButton); - QWidget::setTabOrder(removeAllButton, removeSelectedButton); - QWidget::setTabOrder(removeSelectedButton, okButton); - QWidget::setTabOrder(okButton, cancelButton); + TQWidget::setTabOrder(sourceSelector, addAllButton); + TQWidget::setTabOrder(addAllButton, addSelectedButton); + TQWidget::setTabOrder(addSelectedButton, importView); + TQWidget::setTabOrder(importView, removeAllButton); + TQWidget::setTabOrder(removeAllButton, removeSelectedButton); + TQWidget::setTabOrder(removeSelectedButton, okButton); + TQWidget::setTabOrder(okButton, cancelButton); sourceSelector->setFocus(); @@ -114,7 +114,7 @@ AddExistingFilesDialog::~AddExistingFilesDialog() } -// void AddExistingFilesDialog::resizeEvent ( QResizeEvent* ev ) +// void AddExistingFilesDialog::resizeEvent ( TQResizeEvent* ev ) // { // AddExistingDlgBase::resizeEvent ( ev ); // //importView->update(); @@ -128,14 +128,14 @@ void AddExistingFilesDialog::init() importView->setMode ( KIconView::Select ); importView->setItemsMovable ( false ); - connect ( okButton, SIGNAL ( clicked () ), this, SLOT ( slotOk () ) ); + connect ( okButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotOk () ) ); - connect ( addSelectedButton, SIGNAL ( clicked () ), this, SLOT ( slotAddSelected() ) ); - connect ( addAllButton, SIGNAL ( clicked () ), this, SLOT ( slotAddAll() ) ); - connect ( removeSelectedButton, SIGNAL ( clicked () ), this, SLOT ( slotRemoveSelected() ) ); - connect ( removeAllButton, SIGNAL ( clicked () ), this, SLOT ( slotRemoveAll() ) ); + connect ( addSelectedButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddSelected() ) ); + connect ( addAllButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddAll() ) ); + connect ( removeSelectedButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveSelected() ) ); + connect ( removeAllButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveAll() ) ); - connect ( importView, SIGNAL ( dropped( QDropEvent* ) ), this, SLOT ( slotDropped ( QDropEvent* ) ) ); + connect ( importView, TQT_SIGNAL ( dropped( TQDropEvent* ) ), this, TQT_SLOT ( slotDropped ( TQDropEvent* ) ) ); importView->setSelectionMode ( KFile::Multi ); @@ -154,9 +154,9 @@ void AddExistingFilesDialog::importItems() // items already added to the importView KFileItemListIterator importedList ( *importView->items() ); - QListViewItem* child = m_titem->firstChild(); + TQListViewItem* child = m_titem->firstChild(); - QStringList duplicateList; + TQStringList duplicateList; while ( child ) { @@ -229,7 +229,7 @@ void AddExistingFilesDialog::importItems() void AddExistingFilesDialog::slotOk() { - if ( importView->items()->count() == 0 ) QDialog::reject(); + if ( importView->items()->count() == 0 ) TQDialog::reject(); progressBar->show(); progressBar->setFormat ( i18n ( "Importing... %p%" ) ); @@ -241,7 +241,7 @@ void AddExistingFilesDialog::slotOk() // contains at the end only the imported files outside the subproject directory KFileItemList outsideList; - QStringList stringList; + TQStringList stringList; for ( ; items.current(); ++items ) { @@ -300,16 +300,16 @@ void AddExistingFilesDialog::slotOk() items.toFirst(); - QString canontargetname = AutoProjectTool::canonicalize ( m_titem->name ); - QString varname; + TQString canontargetname = AutoProjectTool::canonicalize ( m_titem->name ); + TQString varname; if( m_titem->primary == "PROGRAMS" || m_titem->primary == "LIBRARIES" || m_titem->primary == "LTLIBRARIES" ) varname = canontargetname + "_SOURCES"; else varname = m_titem->prefix + "_" + m_titem->primary; - QMap<QString,QString> replaceMap; + TQMap<TQString,TQString> replaceMap; FileItem* fitem = 0L; - QStringList fileList; + TQStringList fileList; for ( ; items.current(); ++items ) { @@ -329,7 +329,7 @@ void AddExistingFilesDialog::slotOk() AutoProjectTool::addToMakefileam ( m_spitem->path + "/Makefile.am", replaceMap ); - QDialog::accept(); + TQDialog::accept(); } @@ -413,7 +413,7 @@ void AddExistingFilesDialog::slotRemoveSelected() } -void AddExistingFilesDialog::slotDropped ( QDropEvent* ev ) +void AddExistingFilesDialog::slotDropped ( TQDropEvent* ev ) { kdDebug ( 9020 ) << "AddExistingFilesDialog::dropped()" << endl; diff --git a/buildtools/autotools/addexistingfilesdlg.h b/buildtools/autotools/addexistingfilesdlg.h index 5bee18b6..aa00a99e 100644 --- a/buildtools/autotools/addexistingfilesdlg.h +++ b/buildtools/autotools/addexistingfilesdlg.h @@ -20,7 +20,7 @@ #ifndef ADDEXISTINGFILESDLG_H #define ADDEXISTINGFILESDLG_H -#include <qdialog.h> +#include <tqdialog.h> #include <kfile.h> #include "addexistingdlgbase.h" @@ -42,7 +42,7 @@ class AddExistingFilesDialog : public AddExistingDlgBase public: AddExistingFilesDialog( AutoProjectPart* part, AutoProjectWidget *widget, - SubprojectItem* spitem, TargetItem* titem, QWidget* parent = 0, + SubprojectItem* spitem, TargetItem* titem, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddExistingFilesDialog(); @@ -59,7 +59,7 @@ private: KFileItemList m_importList; protected: - // virtual void resizeEvent ( QResizeEvent* ev ); + // virtual void resizeEvent ( TQResizeEvent* ev ); void init(); void importItems (); @@ -68,7 +68,7 @@ protected slots: void slotAddAll(); void slotRemoveAll(); void slotRemoveSelected(); - void slotDropped ( QDropEvent* ev ); + void slotDropped ( TQDropEvent* ev ); void slotOk(); }; diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp index 46529086..56df4998 100644 --- a/buildtools/autotools/addfiledlg.cpp +++ b/buildtools/autotools/addfiledlg.cpp @@ -11,14 +11,14 @@ #include "addfiledlg.h" -#include <qcheckbox.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qtextstream.h> +#include <tqcheckbox.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqtextstream.h> #include <kbuttonbox.h> #include <kdebug.h> @@ -40,11 +40,11 @@ AddFileDialog::AddFileDialog(AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *item, - QWidget *parent, const char *name) + TQWidget *parent, const char *name) : AddFileDlgBase(parent, name, true) { - connect ( createButton, SIGNAL ( clicked() ), this, SLOT ( accept() ) ); - connect ( cancelButton, SIGNAL ( clicked() ), this, SLOT ( reject() ) ); + connect ( createButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( accept() ) ); + connect ( cancelButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( reject() ) ); directoryLabel->setText ( spitem->path ); if ( item->name.isEmpty() ) @@ -67,13 +67,13 @@ AddFileDialog::~AddFileDialog() void AddFileDialog::accept() { - QString name = fileEdit->text(); + TQString name = fileEdit->text(); if (name.find('/') != -1) { KMessageBox::sorry(this, i18n("Please enter the file name without '/' and so on.")); return; } - QListViewItem *child = target->firstChild(); + TQListViewItem *child = target->firstChild(); while (child) { FileItem *item = static_cast<FileItem*>(child); if (name == item->name) { @@ -84,27 +84,27 @@ void AddFileDialog::accept() } if (templateCheckBox->isChecked()) { - QString srcdir = m_part->projectDirectory(); - QString destdir = subProject->path; - QString destpath = destdir + "/" + name; - if (QFileInfo(destpath).exists()) { + TQString srcdir = m_part->projectDirectory(); + TQString destdir = subProject->path; + TQString destpath = destdir + "/" + name; + if (TQFileInfo(destpath).exists()) { KMessageBox::sorry(this, i18n("<b>A file with this name already exists.</b><br><br>Please use the \"Add existing file\" dialog.")); return; } - if( !FileTemplate::copy(m_part, QFileInfo(name).extension(), destpath) ) + if( !FileTemplate::copy(m_part, TQFileInfo(name).extension(), destpath) ) kdDebug(9020) << "cannot create file " << destpath << endl; } else { // create an empty file - QString srcdir = m_part->projectDirectory(); - QString destdir = subProject->path; - QString destpath = destdir + "/" + name; + TQString srcdir = m_part->projectDirectory(); + TQString destdir = subProject->path; + TQString destpath = destdir + "/" + name; - if (QFileInfo(destpath).exists()) { + if (TQFileInfo(destpath).exists()) { KMessageBox::sorry(this, i18n("<b>A file with this name already exists.</b><br><br>Please use the \"Add existing file\" dialog.")); return; } - QFile f( destpath ); + TQFile f( destpath ); if( f.open(IO_WriteOnly) ) f.close(); } @@ -113,15 +113,15 @@ void AddFileDialog::accept() target->sources.append(fitem); target->insertItem(fitem); - QString canontargetname = AutoProjectTool::canonicalize(target->name); - QString varname; + TQString canontargetname = AutoProjectTool::canonicalize(target->name); + TQString varname; if( target->primary == "PROGRAMS" || target->primary == "LIBRARIES" || target->primary == "LTLIBRARIES" ) varname = canontargetname + "_SOURCES"; else varname = target->prefix + "_" + target->primary; subProject->variables[varname] += (" " + name); - QMap<QString,QString> replaceMap; + TQMap<TQString,TQString> replaceMap; replaceMap.insert(varname, subProject->variables[varname]); AutoProjectTool::addToMakefileam(subProject->path + "/Makefile.am", replaceMap); @@ -129,7 +129,7 @@ void AddFileDialog::accept() m_widget->emitAddedFile( subProject->path.mid ( m_part->project()->projectDirectory().length() + 1 ) + "/" + name ); m_part->partController()->editDocument ( KURL ( subProject->path + "/" + name ) ); - QDialog::accept(); + TQDialog::accept(); } #include "addfiledlg.moc" diff --git a/buildtools/autotools/addfiledlg.h b/buildtools/autotools/addfiledlg.h index 328e3593..4b1b78a0 100644 --- a/buildtools/autotools/addfiledlg.h +++ b/buildtools/autotools/addfiledlg.h @@ -12,7 +12,7 @@ #ifndef _ADDFILEDLG_H_ #define _ADDFILEDLG_H_ -#include <qdialog.h> +#include <tqdialog.h> #include "addfiledlgbase.h" @@ -31,7 +31,7 @@ class AddFileDialog : public AddFileDlgBase public: AddFileDialog( AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *item, - QWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~AddFileDialog(); protected: diff --git a/buildtools/autotools/addicondlg.cpp b/buildtools/autotools/addicondlg.cpp index 251601f7..5531c656 100644 --- a/buildtools/autotools/addicondlg.cpp +++ b/buildtools/autotools/addicondlg.cpp @@ -11,8 +11,8 @@ #include "addicondlg.h" -#include <qcombobox.h> -#include <qlabel.h> +#include <tqcombobox.h> +#include <tqlabel.h> #include <klineedit.h> #include <kdebug.h> #include <klocale.h> @@ -39,7 +39,7 @@ const char *size_map[] = { AddIconDialog::AddIconDialog(AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *titem, - QWidget *parent, const char *name) + TQWidget *parent, const char *name) : AddIconDialogBase(parent, name, true) { type_combo->insertItem(i18n("Application")); @@ -72,9 +72,9 @@ AddIconDialog::~AddIconDialog() void AddIconDialog::somethingChanged() { - QString size = size_map[size_combo->currentItem()]; - QString type = type_map[type_combo->currentItem()]; - QString name = name_edit->text(); + TQString size = size_map[size_combo->currentItem()]; + TQString type = type_map[type_combo->currentItem()]; + TQString name = name_edit->text(); filename_edit->setText(size + "-" + type + "-" + name + ".png"); } @@ -82,15 +82,15 @@ void AddIconDialog::somethingChanged() void AddIconDialog::accept() { - QString name = filename_edit->text(); + TQString name = filename_edit->text(); - QString destdir = m_subProject->subdir; - QString destpath = destdir + "/" + name; + TQString destdir = m_subProject->subdir; + TQString destpath = destdir + "/" + name; - QString size = size_combo->currentText(); - QString unknown = KIconTheme::defaultThemeName()+ "/" + size + "x" + size + "/mimetypes/unknown.png"; + TQString size = size_combo->currentText(); + TQString unknown = KIconTheme::defaultThemeName()+ "/" + size + "x" + size + "/mimetypes/unknown.png"; - QString templateFileName = locate("icon", unknown); + TQString templateFileName = locate("icon", unknown); kdDebug(9020) << "Unknown: " << unknown << ", template: " << templateFileName << endl; if (!templateFileName.isEmpty()) { @@ -105,11 +105,11 @@ void AddIconDialog::accept() m_target->sources.append(fitem); m_target->insertItem(fitem); - m_part->startMakeCommand(destdir, QString::fromLatin1("force-reedit")); + m_part->startMakeCommand(destdir, TQString::fromLatin1("force-reedit")); m_widget->emitAddedFile(destpath); - QDialog::accept(); + TQDialog::accept(); } #include "addicondlg.moc" diff --git a/buildtools/autotools/addicondlg.h b/buildtools/autotools/addicondlg.h index 64fac0a5..8ab8437f 100644 --- a/buildtools/autotools/addicondlg.h +++ b/buildtools/autotools/addicondlg.h @@ -27,7 +27,7 @@ class AddIconDialog : public AddIconDialogBase public: AddIconDialog( AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *titem, - QWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~AddIconDialog(); diff --git a/buildtools/autotools/addprefixdlg.cpp b/buildtools/autotools/addprefixdlg.cpp index d1557114..c4570d8f 100644 --- a/buildtools/autotools/addprefixdlg.cpp +++ b/buildtools/autotools/addprefixdlg.cpp @@ -11,54 +11,54 @@ #include "addprefixdlg.h" -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> #include <kbuttonbox.h> #include <kfiledialog.h> #include <klocale.h> #include <kstdguiitem.h> #include <kdeversion.h> -AddPrefixDialog::AddPrefixDialog( const QString& nameEdit, const QString& pathEdit, - QWidget *parent, const char *name) - : QDialog(parent, name, true) +AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& pathEdit, + TQWidget *parent, const char *name) + : TQDialog(parent, name, true) { setCaption(i18n("Add Prefix")); - QLabel *name_label = new QLabel(i18n("&Name:"), this); + TQLabel *name_label = new TQLabel(i18n("&Name:"), this); name_edit = new KLineEdit(nameEdit, this); name_edit->setFocus(); name_label->setBuddy(name_edit); - connect( name_edit, SIGNAL( textChanged ( const QString & ) ), SLOT( slotPrefixChanged() ) ); + connect( name_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotPrefixChanged() ) ); - QLabel *path_label = new QLabel(i18n("&Path:"), this); + TQLabel *path_label = new TQLabel(i18n("&Path:"), this); path_edit = new KLineEdit(pathEdit, this); path_label->setBuddy(path_edit); - QFontMetrics fm(path_edit->fontMetrics()); + TQFontMetrics fm(path_edit->fontMetrics()); path_edit->setMinimumWidth(fm.width('X')*35); - connect( path_edit, SIGNAL( textChanged ( const QString & ) ), SLOT( slotPrefixChanged() ) ); + connect( path_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotPrefixChanged() ) ); - QVBoxLayout *layout = new QVBoxLayout(this, 10); + TQVBoxLayout *layout = new TQVBoxLayout(this, 10); - QGridLayout *grid = new QGridLayout(2, 2); + TQGridLayout *grid = new TQGridLayout(2, 2); layout->addLayout(grid); grid->addWidget(name_label, 0, 0); grid->addWidget(name_edit, 0, 1); grid->addWidget(path_label, 1, 0); grid->addWidget(path_edit, 1, 1); - QFrame *frame = new QFrame(this); - frame->setFrameStyle(QFrame::HLine | QFrame::Sunken); + TQFrame *frame = new TQFrame(this); + frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); layout->addWidget(frame, 0); KButtonBox *buttonbox = new KButtonBox(this); buttonbox->addStretch(); m_pOk = buttonbox->addButton(KStdGuiItem::ok()); - QPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); + TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); m_pOk->setDefault(true); - connect( m_pOk, SIGNAL(clicked()), this, SLOT(accept()) ); - connect( cancel, SIGNAL(clicked()), this, SLOT(reject()) ); + connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); buttonbox->layout(); layout->addWidget(buttonbox, 0); slotPrefixChanged(); diff --git a/buildtools/autotools/addprefixdlg.h b/buildtools/autotools/addprefixdlg.h index a20bc63a..8712f47f 100644 --- a/buildtools/autotools/addprefixdlg.h +++ b/buildtools/autotools/addprefixdlg.h @@ -12,7 +12,7 @@ #ifndef _ADDPREFIXDLG_H_ #define _ADDPREFIXDLG_H_ -#include <qdialog.h> +#include <tqdialog.h> #include <klineedit.h> class QPushButton; @@ -21,15 +21,15 @@ class AddPrefixDialog : public QDialog Q_OBJECT public: - AddPrefixDialog( const QString& nameEdit = "", const QString& pathEdit = "", - QWidget *parent = 0, const char *name = 0 ); + AddPrefixDialog( const TQString& nameEdit = "", const TQString& pathEdit = "", + TQWidget *parent = 0, const char *name = 0 ); ~AddPrefixDialog(); - QString name() const + TQString name() const { return name_edit->text(); } - QString path() const + TQString path() const { return path_edit->text(); } @@ -39,7 +39,7 @@ private slots: private: KLineEdit *name_edit; KLineEdit *path_edit; - QPushButton *m_pOk; + TQPushButton *m_pOk; }; #endif diff --git a/buildtools/autotools/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp index 2dc76e5e..dde34053 100644 --- a/buildtools/autotools/addservicedlg.cpp +++ b/buildtools/autotools/addservicedlg.cpp @@ -11,11 +11,11 @@ #include "addservicedlg.h" -#include <qcombobox.h> -#include <qfile.h> -#include <qheader.h> -#include <qlistview.h> -#include <qtextstream.h> +#include <tqcombobox.h> +#include <tqfile.h> +#include <tqheader.h> +#include <tqlistview.h> +#include <tqtextstream.h> #include <klineedit.h> #include <kdebug.h> #include <kicondialog.h> @@ -32,7 +32,7 @@ AddServiceDialog::AddServiceDialog(AutoProjectWidget *widget, SubprojectItem *spitem, - QWidget *parent, const char *name) + TQWidget *parent, const char *name) : AddServiceDialogBase(parent, name, true) { filename_edit->setText(".desktop"); @@ -45,10 +45,10 @@ AddServiceDialog::AddServiceDialog(AutoProjectWidget *widget, SubprojectItem *sp subProject = spitem; // Fill the combo box with library names in the directory - QPtrListIterator<TargetItem> tit(spitem->targets); + TQPtrListIterator<TargetItem> tit(spitem->targets); for (; tit.current(); ++tit) { if ((*tit)->primary == "LTLIBRARIES") - library_combo->insertItem(QString((*tit)->name)); + library_combo->insertItem(TQString((*tit)->name)); } // Fill the list of available service types @@ -56,7 +56,7 @@ AddServiceDialog::AddServiceDialog(AutoProjectWidget *widget, SubprojectItem *sp KServiceType::List::Iterator it; for (it = l.begin(); it != l.end(); ++it) if (!(*it)->isType(KST_KMimeType)) - new QListViewItem(availtypes_listview, (*it)->name()); + new TQListViewItem(availtypes_listview, (*it)->name()); setIcon ( SmallIcon ( "servicenew_kdevelop.png" ) ); } @@ -68,14 +68,14 @@ AddServiceDialog::~AddServiceDialog() void AddServiceDialog::updateProperties() { - QStringList props; + TQStringList props; - QListViewItem *item = static_cast<QCheckListItem*>(chosentypes_listview->firstChild()); + TQListViewItem *item = static_cast<TQCheckListItem*>(chosentypes_listview->firstChild()); while (item) { KServiceType::Ptr type = KServiceType::serviceType(item->text(0)); if (type) { - QStringList stprops = type->propertyDefNames(); - QStringList::ConstIterator stit; + TQStringList stprops = type->propertyDefNames(); + TQStringList::ConstIterator stit; for (stit = stprops.begin(); stit != stprops.end(); ++stit) if (props.find(*stit) == props.end() && (*stit) != "Name" && (*stit) != "Comment" && (*stit) != "Icon") @@ -85,16 +85,16 @@ void AddServiceDialog::updateProperties() } properties_listview->clear(); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = props.begin(); it != props.end(); ++it) - new QListViewItem(properties_listview, *it); + new TQListViewItem(properties_listview, *it); } void AddServiceDialog::iconClicked() { KIconLoader *loader = AutoProjectFactory::instance()->iconLoader(); - QString name = KIconDialog::getIcon(KIcon::Desktop); + TQString name = KIconDialog::getIcon(KIcon::Desktop); if (!name.isNull()) { iconName = name; icon_button->setPixmap(loader->loadIcon(name, KIcon::Desktop)); @@ -104,17 +104,17 @@ void AddServiceDialog::iconClicked() void AddServiceDialog::addTypeClicked() { - QListViewItem *selitem = availtypes_listview->selectedItem(); + TQListViewItem *selitem = availtypes_listview->selectedItem(); if (!selitem) return; - QListViewItem *olditem = chosentypes_listview->firstChild(); + TQListViewItem *olditem = chosentypes_listview->firstChild(); while (olditem) { if (selitem->text(0) == olditem->text(0)) return; olditem = olditem->nextSibling(); } - new QListViewItem(chosentypes_listview, selitem->text(0)); + new TQListViewItem(chosentypes_listview, selitem->text(0)); updateProperties(); } @@ -128,13 +128,13 @@ void AddServiceDialog::removeTypeClicked() } -void AddServiceDialog::propertyExecuted(QListViewItem *item) +void AddServiceDialog::propertyExecuted(TQListViewItem *item) { if (!item) return; - QString prop = item->text(0); - QString value = item->text(1); + TQString prop = item->text(0); + TQString value = item->text(1); bool ok; value = KInputDialog::getText(i18n("Enter Value"), i18n("Property %1:").arg(prop), value, &ok, this); if (!ok) @@ -147,29 +147,29 @@ void AddServiceDialog::propertyExecuted(QListViewItem *item) void AddServiceDialog::accept() { // Create list of service types - QStringList serviceTypes; - QListViewItem *item = chosentypes_listview->firstChild(); + TQStringList serviceTypes; + TQListViewItem *item = chosentypes_listview->firstChild(); while (item) { serviceTypes.append(item->text(0)); item = item->nextSibling(); } // Some plausibility tests - QString fileName = filename_edit->text(); + TQString fileName = filename_edit->text(); if (fileName.isEmpty() || fileName == ".desktop") { KMessageBox::sorry(this, i18n("You have to enter a file name.")); filename_edit->setFocus(); return; } - QString name = name_edit->text(); + TQString name = name_edit->text(); if (name.isEmpty()) { KMessageBox::sorry(this, i18n("You have to enter a service name.")); name_edit->setFocus(); return; } - QFile f(subProject->path + "/" + fileName); + TQFile f(subProject->path + "/" + fileName); if (f.exists()) { KMessageBox::sorry(this, i18n("A file with this name exists already.")); filename_edit->setFocus(); @@ -180,7 +180,7 @@ void AddServiceDialog::accept() return; } - QTextStream stream(&f); + TQTextStream stream(&f); stream << "[Desktop Entry]" << endl; stream << "Type=Service" << endl; stream << "Name=" << name << endl; @@ -197,12 +197,12 @@ void AddServiceDialog::accept() // Find a prefix that points to the services directory. // If there is none, use kde_services - QMap<QString,QString>::ConstIterator it; + TQMap<TQString,TQString>::ConstIterator it; for (it = subProject->prefixes.begin(); it != subProject->prefixes.end(); ++it) if (it.data() == "$(kde_servicesdir)") break; - QString prefix = (it == subProject->prefixes.end())? QString("kde_services") : it.key(); - QString varname = prefix + "_DATA"; + TQString prefix = (it == subProject->prefixes.end())? TQString("kde_services") : it.key(); + TQString varname = prefix + "_DATA"; // Look if a list view item for this prefix exists already. // Create a new one otherwise @@ -223,11 +223,11 @@ void AddServiceDialog::accept() titem->sources.append(fitem); subProject->variables[varname] += (" " + fileName); - QMap<QString, QString> replaceMap; + TQMap<TQString, TQString> replaceMap; replaceMap.insert(varname, subProject->variables[varname]); AutoProjectTool::addToMakefileam(subProject->path + "/Makefile.am", replaceMap); - QDialog::accept(); + TQDialog::accept(); } #include "addservicedlg.moc" diff --git a/buildtools/autotools/addservicedlg.h b/buildtools/autotools/addservicedlg.h index c8b694a5..84469e0c 100644 --- a/buildtools/autotools/addservicedlg.h +++ b/buildtools/autotools/addservicedlg.h @@ -25,14 +25,14 @@ class AddServiceDialog : public AddServiceDialogBase public: AddServiceDialog( AutoProjectWidget *widget, SubprojectItem *spitem, - QWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~AddServiceDialog(); protected: virtual void iconClicked(); virtual void addTypeClicked(); virtual void removeTypeClicked(); - virtual void propertyExecuted( QListViewItem *item ); + virtual void propertyExecuted( TQListViewItem *item ); virtual void accept(); private: @@ -40,7 +40,7 @@ private: AutoProjectWidget *m_widget; SubprojectItem *subProject; - QString iconName; + TQString iconName; }; #endif diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp index 8011886b..9aeef695 100644 --- a/buildtools/autotools/addsubprojectdlg.cpp +++ b/buildtools/autotools/addsubprojectdlg.cpp @@ -11,11 +11,11 @@ #include "addsubprojectdlg.h" -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qstringlist.h> -#include <qtextstream.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqstringlist.h> +#include <tqtextstream.h> #include <kbuttonbox.h> #include <kdebug.h> #include <kfiledialog.h> @@ -32,13 +32,13 @@ AddSubprojectDialog::AddSubprojectDialog(AutoProjectPart *part, AutoSubprojectView *view, - SubprojectItem *item, QWidget *parent, const char *name) + SubprojectItem *item, TQWidget *parent, const char *name) : AddSubprojectDlgBase(parent, name, true) { setIcon(SmallIcon("folder_new.png")); - connect( createButton, SIGNAL(clicked()), this, SLOT(accept()) ); - connect( cancelButton, SIGNAL(clicked()), this, SLOT(reject()) ); + connect( createButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( cancelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); m_subProject = item; m_subprojectView = view; @@ -52,14 +52,14 @@ AddSubprojectDialog::~AddSubprojectDialog() void AddSubprojectDialog::accept() { - QString name = spEdit->text().stripWhiteSpace(); + TQString name = spEdit->text().stripWhiteSpace(); if (name.isEmpty()) { KMessageBox::sorry(this, i18n("You have to give the subproject a name.")); return; } - QListViewItem *childItem = m_subProject->firstChild(); + TQListViewItem *childItem = m_subProject->firstChild(); while (childItem) { if (name == static_cast<SubprojectItem*>(childItem)->subdir) { KMessageBox::sorry(this, i18n("A subproject with this name already exists.")); @@ -71,47 +71,47 @@ void AddSubprojectDialog::accept() #if 0 // check for config.status - if( !QFileInfo(m_part->projectDirectory(), "config.status").exists() ){ + if( !TQFileInfo(m_part->projectDirectory(), "config.status").exists() ){ KMessageBox::sorry(this, i18n("There is no config.status in the project root directory. Run 'Configure' first")); - QDialog::accept(); + TQDialog::accept(); return; } #endif - QDir dir( m_subProject->path ); - QFileInfo file( dir, name ); + TQDir dir( m_subProject->path ); + TQFileInfo file( dir, name ); if( file.exists() && !file.isDir() ) { KMessageBox::sorry(this, i18n("A file named %1 already exists.").arg(name)); - QDialog::accept(); + TQDialog::accept(); return; } else if( file.isDir() ) { if( KMessageBox::warningContinueCancel(this, i18n("A subdirectory %1 already exists. " "Do you wish to add it as a subproject?").arg(name)) == KMessageBox::Cancel ){ - QDialog::accept(); + TQDialog::accept(); return; } } else if (!dir.mkdir(name)) { KMessageBox::sorry(this, i18n("Could not create subdirectory %1.").arg(name)); - QDialog::accept(); + TQDialog::accept(); return; } if(!dir.cd(name)) { KMessageBox::sorry(this, i18n("Could not access the subdirectory %1.").arg(name)); - QDialog::accept(); + TQDialog::accept(); return; } // Adjust SUBDIRS variable in containing Makefile.am if (m_subProject->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1) { - QFile subdirsfile( m_subProject->path + "/subdirs" ); + TQFile subdirsfile( m_subProject->path + "/subdirs" ); if ( subdirsfile.open( IO_WriteOnly | IO_Append ) ) { - QTextStream subdirsstream( &subdirsfile ); + TQTextStream subdirsstream( &subdirsfile ); subdirsstream << name << endl; subdirsfile.close(); } @@ -122,7 +122,7 @@ void AddSubprojectDialog::accept() else { m_subProject->variables["SUBDIRS"] += (" " + name); - QMap<QString,QString> replaceMap; + TQMap<TQString,TQString> replaceMap; replaceMap.insert("SUBDIRS", m_subProject->variables["SUBDIRS"]); AutoProjectTool::addToMakefileam(m_subProject->path + "/Makefile.am", replaceMap); } @@ -135,7 +135,7 @@ void AddSubprojectDialog::accept() newitem->setOpen(true); // Move to the bottom of the list - QListViewItem *lastItem = m_subProject->firstChild(); + TQListViewItem *lastItem = m_subProject->firstChild(); while (lastItem->nextSibling()) lastItem = lastItem->nextSibling(); if (lastItem != newitem) @@ -143,7 +143,7 @@ void AddSubprojectDialog::accept() // Create a Makefile in the new subdirectory - QFile f( dir.filePath("Makefile.am") ); + TQFile f( dir.filePath("Makefile.am") ); if (f.exists()) { m_subprojectView->parse( newitem ); } else { @@ -151,7 +151,7 @@ void AddSubprojectDialog::accept() KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name)); return; } - QTextStream stream(&f); + TQTextStream stream(&f); stream << "INCLUDES = " << newitem->variables["INCLUDES"] << endl << "METASOURCES = AUTO" << endl; f.close(); } @@ -160,13 +160,13 @@ void AddSubprojectDialog::accept() // if !isKDE: add the new sub-proj to configure.in if ( !m_part->isKDE() ) { - QString projroot = m_part->projectDirectory() + "/"; - QString subdirectory = dir.path(); - QString relpath = subdirectory.replace(0, projroot.length(),""); + TQString projroot = m_part->projectDirectory() + "/"; + TQString subdirectory = dir.path(); + TQString relpath = subdirectory.replace(0, projroot.length(),""); - QString configureFile = m_part->getAutoConfFile(projroot); + TQString configureFile = m_part->getAutoConfFile(projroot); - QStringList list = AutoProjectTool::configureinLoadMakefiles(configureFile); + TQStringList list = AutoProjectTool::configureinLoadMakefiles(configureFile); if ( !list.isEmpty() ) { list.push_back( relpath + "/Makefile" ); @@ -175,10 +175,10 @@ void AddSubprojectDialog::accept() } #if 0 - QString relmakefile = (m_subProject->path + "/" + name + "/Makefile").mid(m_part->projectDirectory().length()+1); + TQString relmakefile = (m_subProject->path + "/" + name + "/Makefile").mid(m_part->projectDirectory().length()+1); kdDebug(9020) << "Relative makefile path: " << relmakefile << endl; - QString cmdline = "cd "; + TQString cmdline = "cd "; cmdline += KProcess::quote(m_part->projectDirectory()); cmdline += " && automake "; cmdline += KProcess::quote(relmakefile); @@ -192,7 +192,7 @@ void AddSubprojectDialog::accept() m_part->needMakefileCvs(); - QDialog::accept(); + TQDialog::accept(); } #include "addsubprojectdlg.moc" diff --git a/buildtools/autotools/addsubprojectdlg.h b/buildtools/autotools/addsubprojectdlg.h index eabfc0e1..c1d3b7bf 100644 --- a/buildtools/autotools/addsubprojectdlg.h +++ b/buildtools/autotools/addsubprojectdlg.h @@ -12,7 +12,7 @@ #ifndef _ADDSUBPROJECTDLG_H_ #define _ADDSUBPROJECTDLG_H_ -#include <qdialog.h> +#include <tqdialog.h> #include <klineedit.h> #include "addsubprojectdlgbase.h" @@ -28,7 +28,7 @@ class AddSubprojectDialog : public AddSubprojectDlgBase public: AddSubprojectDialog( AutoProjectPart *part, AutoSubprojectView *widget, - SubprojectItem *item, QWidget *parent = 0, const char *name = 0 ); + SubprojectItem *item, TQWidget *parent = 0, const char *name = 0 ); ~AddSubprojectDialog(); private: diff --git a/buildtools/autotools/addtargetdlg.cpp b/buildtools/autotools/addtargetdlg.cpp index b01b5b82..5ca96c45 100644 --- a/buildtools/autotools/addtargetdlg.cpp +++ b/buildtools/autotools/addtargetdlg.cpp @@ -11,10 +11,10 @@ #include "addtargetdlg.h" -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qgroupbox.h> -#include <qvalidator.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqgroupbox.h> +#include <tqvalidator.h> #include <klineedit.h> #include <klocale.h> @@ -29,7 +29,7 @@ AddTargetDialog::AddTargetDialog(AutoProjectWidget *widget, SubprojectItem *item, - QWidget *parent, const char *name) + TQWidget *parent, const char *name) : AddTargetDialogBase(parent, name, true) { m_subproject = item; @@ -50,11 +50,11 @@ AddTargetDialog::AddTargetDialog(AutoProjectWidget *widget, SubprojectItem *item if (widget->kdeMode()) ldflagsother_edit->setText("$(all_libraries)"); - connect( filename_edit, SIGNAL( textChanged(const QString&) ), this, SLOT( slotFileNameChanged (const QString&) ) ); + connect( filename_edit, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotFileNameChanged (const TQString&) ) ); setIcon ( SmallIcon ( "targetnew_kdevelop.png" ) ); - canonicalLabel->setText ( QString::null ); + canonicalLabel->setText ( TQString::null ); } @@ -64,7 +64,7 @@ AddTargetDialog::~AddTargetDialog() void AddTargetDialog::primaryChanged() { - QStringList list; + TQStringList list; switch (primary_combo->currentItem()) { case 0: // Program list.append("bin"); @@ -108,8 +108,8 @@ void AddTargetDialog::primaryChanged() prefix_combo->clear(); prefix_combo->insertStringList(list); - QStringList prefixes; - QMap<QString,QString>::ConstIterator it; + TQStringList prefixes; + TQMap<TQString,TQString>::ConstIterator it; for (it = m_subproject->prefixes.begin(); it != m_subproject->prefixes.end(); ++it) prefix_combo->insertItem(it.key()); @@ -126,10 +126,10 @@ void AddTargetDialog::primaryChanged() void AddTargetDialog::accept() { - QString name = filename_edit->text().stripWhiteSpace(); - QString prefix = prefix_combo->currentText(); + TQString name = filename_edit->text().stripWhiteSpace(); + TQString prefix = prefix_combo->currentText(); - QString primary; + TQString primary; switch (primary_combo->currentItem()) { case 0: primary = "PROGRAMS"; break; case 1: primary = "LIBRARIES"; break; @@ -165,22 +165,22 @@ void AddTargetDialog::accept() #endif if( primary.endsWith("LIBRARIES") && !name.startsWith("lib") && !module_box->isChecked() ) - name.prepend( QString::fromLatin1("lib") ); + name.prepend( TQString::fromLatin1("lib") ); if( primary == "LTLIBRARIES" && !name.endsWith(".la") ) - name.append( QString::fromLatin1(".la") ); + name.append( TQString::fromLatin1(".la") ); if ( primary == "LIBRARIES" && !name.endsWith(".a") ) - name.append ( QString::fromLatin1(".a") ); + name.append ( TQString::fromLatin1(".a") ); - QPtrListIterator<TargetItem> it(m_subproject->targets); + TQPtrListIterator<TargetItem> it(m_subproject->targets); for (; it.current(); ++it) if (name == (*it)->name) { KMessageBox::sorry(this, i18n("A target with this name already exists.")); return; } - QStringList flagslist; + TQStringList flagslist; if (primary == "LTLIBRARIES") { if (allstatic_box->isChecked()) flagslist.append("-all-static"); @@ -192,18 +192,18 @@ void AddTargetDialog::accept() flagslist.append("-no-undefined"); } flagslist.append(ldflagsother_edit->text()); - QString ldflags = flagslist.join( " " ); + TQString ldflags = flagslist.join( " " ); TargetItem *titem = m_widget->createTargetItem(name, prefix, primary, false); // m_detailsView->insertItem ( titem ); m_subproject->targets.append(titem); - QString canonname = AutoProjectTool::canonicalize(name); + TQString canonname = AutoProjectTool::canonicalize(name); - QMap<QString,QString> replaceMap; + TQMap<TQString,TQString> replaceMap; if( primary == "PROGRAMS" || primary == "LIBRARIES" || primary == "LTLIBRARIES" || primary == "DATA" ){ - QString varname = prefix + "_" + primary; + TQString varname = prefix + "_" + primary; m_subproject->variables[varname] += (" " + name); replaceMap.insert(varname, m_subproject->variables[varname]); if ( primary != "DATA" ){ @@ -215,10 +215,10 @@ void AddTargetDialog::accept() AutoProjectTool::addToMakefileam(m_subproject->path + "/Makefile.am", replaceMap); - QDialog::accept(); + TQDialog::accept(); } -void AddTargetDialog::slotFileNameChanged ( const QString& text ) +void AddTargetDialog::slotFileNameChanged ( const TQString& text ) { canonicalLabel->setText ( AutoProjectTool::canonicalize ( text ) ); } diff --git a/buildtools/autotools/addtargetdlg.h b/buildtools/autotools/addtargetdlg.h index 98708531..8c44aef4 100644 --- a/buildtools/autotools/addtargetdlg.h +++ b/buildtools/autotools/addtargetdlg.h @@ -25,11 +25,11 @@ class AddTargetDialog : public AddTargetDialogBase public: AddTargetDialog( AutoProjectWidget *widget, SubprojectItem *item, - QWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~AddTargetDialog(); protected slots: - virtual void slotFileNameChanged ( const QString& ); + virtual void slotFileNameChanged ( const TQString& ); private: virtual void primaryChanged(); diff --git a/buildtools/autotools/addtranslationdlg.cpp b/buildtools/autotools/addtranslationdlg.cpp index 993dee7d..559e1369 100644 --- a/buildtools/autotools/addtranslationdlg.cpp +++ b/buildtools/autotools/addtranslationdlg.cpp @@ -11,15 +11,15 @@ #include "addtranslationdlg.h" -#include <qcombobox.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qhbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qstrlist.h> +#include <tqcombobox.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqhbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqstrlist.h> #include <kbuttonbox.h> #include <kdialog.h> #include <klocale.h> @@ -31,35 +31,35 @@ #include "autoprojectpart.h" -AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, QWidget *parent, const char *name) - : QDialog(parent, name, true) +AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *parent, const char *name) + : TQDialog(parent, name, true) { setCaption(i18n("Add Translation")); m_part = part; - QHBox *hbox = new QHBox(this); - (void) new QLabel(i18n("Language:"), hbox); - lang_combo = new QComboBox(hbox); + TQHBox *hbox = new TQHBox(this); + (void) new TQLabel(i18n("Language:"), hbox); + lang_combo = new TQComboBox(hbox); - QVBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->addWidget(hbox); - QFrame *frame = new QFrame(this); - frame->setFrameStyle(QFrame::HLine | QFrame::Sunken); + TQFrame *frame = new TQFrame(this); + frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); layout->addWidget(frame, 0); KButtonBox *buttonbox = new KButtonBox(this); buttonbox->addStretch(); - QPushButton *ok_button = buttonbox->addButton(KStdGuiItem::ok()); - QPushButton *cancel_button = buttonbox->addButton(KStdGuiItem::cancel()); + TQPushButton *ok_button = buttonbox->addButton(KStdGuiItem::ok()); + TQPushButton *cancel_button = buttonbox->addButton(KStdGuiItem::cancel()); ok_button->setDefault(true); - connect( ok_button, SIGNAL(clicked()), this, SLOT(accept()) ); - connect( cancel_button, SIGNAL(clicked()), this, SLOT(reject()) ); + connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); buttonbox->layout(); layout->addWidget(buttonbox, 0); - QStringList rawlist, list; + TQStringList rawlist, list; rawlist << "af" << "ar" << "bg" << "bo" << "br" << "bs" << "ca" << "cs" << "cy" << "da" << "de" << "el" << "en_GB" << "eo" << "es" << "et" << "eu" << "fi" << "fr"; rawlist << "ga" << "gl" << "gu" << "he" << "hi" << "hu" << "id" << "is" << "it" << "ja" @@ -68,9 +68,9 @@ AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, QWidget *paren << "ta" << "th" << "tr" << "uk" << "wa" << "zh_CN.GB2312" << "zh_TW.Big5"; // Remove already added languages - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = rawlist.begin(); it != rawlist.end(); ++it) { - QFileInfo fi(m_part->projectDirectory() + "/po/" + (*it) + ".po"); + TQFileInfo fi(m_part->projectDirectory() + "/po/" + (*it) + ".po"); if (!fi.exists()) list.append(*it); } @@ -89,10 +89,10 @@ AddTranslationDialog::~AddTranslationDialog() void AddTranslationDialog::accept() { - QString dir = m_part->projectDirectory() + "/po"; - QString fileName = dir + "/" + lang_combo->currentText() + ".po"; + TQString dir = m_part->projectDirectory() + "/po"; + TQString fileName = dir + "/" + lang_combo->currentText() + ".po"; - QFile f(fileName); + TQFile f(fileName); if (f.exists()) { KMessageBox::information(this, i18n("A translation file for the language %1 exists already.")); return; @@ -101,9 +101,9 @@ void AddTranslationDialog::accept() f.close(); dir = m_part->buildDirectory() + "/po"; - m_part->startMakeCommand(dir, QString::fromLatin1("force-reedit")); + m_part->startMakeCommand(dir, TQString::fromLatin1("force-reedit")); - QDialog::accept(); + TQDialog::accept(); } #include "addtranslationdlg.moc" diff --git a/buildtools/autotools/addtranslationdlg.h b/buildtools/autotools/addtranslationdlg.h index cd14ddf2..7ad5cbdb 100644 --- a/buildtools/autotools/addtranslationdlg.h +++ b/buildtools/autotools/addtranslationdlg.h @@ -12,7 +12,7 @@ #ifndef _ADDTRANSLATIONDLG_H_ #define _ADDTRANSLATIONDLG_H_ -#include <qdialog.h> +#include <tqdialog.h> class QComboBox; class AutoProjectPart; @@ -23,13 +23,13 @@ class AddTranslationDialog : public QDialog Q_OBJECT public: - AddTranslationDialog( AutoProjectPart *part, QWidget *parent = 0, const char *name = 0 ); + AddTranslationDialog( AutoProjectPart *part, TQWidget *parent = 0, const char *name = 0 ); ~AddTranslationDialog(); private: virtual void accept(); - QComboBox *lang_combo; + TQComboBox *lang_combo; AutoProjectPart *m_part; }; diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp index 26255fd3..d3cf3864 100644 --- a/buildtools/autotools/autodetailsview.cpp +++ b/buildtools/autotools/autodetailsview.cpp @@ -16,11 +16,11 @@ #include "autodetailsview.h" /** Qt */ -#include <qregexp.h> -#include <qlistview.h> -#include <qwidget.h> -#include <qheader.h> -#include <qlayout.h> +#include <tqregexp.h> +#include <tqlistview.h> +#include <tqwidget.h> +#include <tqheader.h> +#include <tqlayout.h> /** KDE Libs */ #include <kxmlguiclient.h> @@ -57,21 +57,21 @@ #include "subclassesdlg.h" -AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* part, QWidget *parent, const char *name) +AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name) : AutoProjectViewBase(parent, name) { m_widget = widget; m_part = part; initActions(); - QDomDocument dom = *(m_part->projectDom()); + TQDomDocument dom = *(m_part->projectDom()); m_subclasslist = DomUtil::readPairListEntry(dom, "/kdevautoproject/subclassing", "subclass","sourcefile", "uifile"); m_listView->setAllColumnsShowFocus( true ); m_listView->setRootIsDecorated( true ); - m_listView->setResizeMode( QListView::LastColumn ); - m_listView->addColumn( QString::null ); + m_listView->setResizeMode( TQListView::LastColumn ); + m_listView->addColumn( TQString::null ); m_listView->header()->hide(); targetOptionsAction->setEnabled( false ); addNewFileAction->setEnabled( false ); @@ -79,10 +79,10 @@ AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* par buildTargetAction->setEnabled( false ); executeTargetAction->setEnabled( false ); removeDetailAction->setEnabled(false); - connect( m_listView, SIGNAL( selectionChanged( QListViewItem* ) ), - this, SLOT( slotSelectionChanged( QListViewItem* ) ) ); - connect( m_listView, SIGNAL( selectionChanged() ), - this, SLOT( slotSelectionChanged( ) ) ); + connect( m_listView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); + connect( m_listView, TQT_SIGNAL( selectionChanged() ), + this, TQT_SLOT( slotSelectionChanged( ) ) ); } @@ -110,7 +110,7 @@ void AutoDetailsView::slotSelectionChanged( ){ * This is never called if nothing is selected.. * @param item */ -void AutoDetailsView::slotSelectionChanged( QListViewItem* item ) +void AutoDetailsView::slotSelectionChanged( TQListViewItem* item ) { bool isTarget = false; bool isRegularTarget = false; @@ -128,7 +128,7 @@ void AutoDetailsView::slotSelectionChanged( QListViewItem* item ) { titem = static_cast <TargetItem*> ( pvitem->parent() ); - QString primary = titem->primary; + TQString primary = titem->primary; if ( primary == "PROGRAMS" || primary == "LIBRARIES" || primary == "LTLIBRARIES" || primary == "JAVA" ) { @@ -142,7 +142,7 @@ void AutoDetailsView::slotSelectionChanged( QListViewItem* item ) isTarget = true; } - QString primary = titem->primary; + TQString primary = titem->primary; if ( primary == "PROGRAMS" || primary == "LIBRARIES" || primary == "LTLIBRARIES" || primary == "JAVA" ) { @@ -177,7 +177,7 @@ void AutoDetailsView::initActions() KActionCollection * actions = new KActionCollection( this ); targetOptionsAction = new AutoToolsAction( i18n( "Options..." ), "configure", 0, - this, SLOT( slotTargetOptions() ), actions, + this, TQT_SLOT( slotTargetOptions() ), actions, "target options" ); targetOptionsAction->setWhatsThis(i18n("<b>Options</b><p>Target options dialog that " "provides settings for linker flags and lists " @@ -186,18 +186,18 @@ void AutoDetailsView::initActions() targetOptionsAction->plug( m_optionsButton ); targetOptionsAction->setEnabled( false ); - QToolTip::add( m_button1, tr2i18n( "Create New File..." ) ); + TQToolTip::add( m_button1, tr2i18n( "Create New File..." ) ); addNewFileAction = new AutoToolsAction( i18n( "Create New File..." ), "filenew", 0, - this, SLOT( slotAddNewFile() ), actions, + this, TQT_SLOT( slotAddNewFile() ), actions, "add new file" ); addNewFileAction->setWhatsThis(i18n("<b>Create new file</b><p>Creates a new file and " "adds it to a currently selected target.")); addNewFileAction->plug( m_button1 ); addNewFileAction->setEnabled( false ); - QToolTip::add( m_button2, tr2i18n( "Add Existing Files..." ) ); + TQToolTip::add( m_button2, tr2i18n( "Add Existing Files..." ) ); addExistingFileAction = new AutoToolsAction( i18n( "Add Existing Files..." ), "fileimport", 0, - this, SLOT( slotAddExistingFile() ), actions, + this, TQT_SLOT( slotAddExistingFile() ), actions, "add existing file" ); addExistingFileAction->setWhatsThis(i18n("<b>Add existing files</b><p>Adds existing " "file to a currently selected target. Header " @@ -208,12 +208,12 @@ void AutoDetailsView::initActions() addExistingFileAction->setEnabled( false ); addIconAction = new KAction( i18n( "Add Icon..." ), "iconadd_kdevelop", 0, - this, SLOT( slotAddIcon() ), actions, "add icon" ); + this, TQT_SLOT( slotAddIcon() ), actions, "add icon" ); addIconAction->setWhatsThis(i18n("<b>Add icon</b><p>Adds an icon to a KDEICON target.")); - QToolTip::add( m_button4, tr2i18n( "Build Target")); + TQToolTip::add( m_button4, tr2i18n( "Build Target")); buildTargetAction = new AutoToolsAction( i18n( "Build Target..." ), "launch", 0, - this, SLOT( slotBuildTarget() ), actions, + this, TQT_SLOT( slotBuildTarget() ), actions, "build target" ); buildTargetAction->setWhatsThis(i18n("<b>Build target</b><p>Constructs a series of " "make commands to build the selected target. " @@ -221,9 +221,9 @@ void AutoDetailsView::initActions() buildTargetAction->plug( m_button4 ); buildTargetAction->setEnabled( false ); - QToolTip::add( m_button5, tr2i18n( "Execute Target...")); + TQToolTip::add( m_button5, tr2i18n( "Execute Target...")); executeTargetAction = new AutoToolsAction( i18n( "Execute Target..." ), "exec", 0, - this, SLOT( slotExecuteTarget() ), actions, + this, TQT_SLOT( slotExecuteTarget() ), actions, "execute target" ); executeTargetAction->setWhatsThis(i18n("<b>Execute target</b><p>Executes the target " "and tries to build in case it is not built.")); @@ -231,7 +231,7 @@ void AutoDetailsView::initActions() executeTargetAction->setEnabled( false ); setActiveTargetAction = new KAction( i18n( "Make Target Active" ), "", 0, - this, SLOT( slotSetActiveTarget() ), actions, + this, TQT_SLOT( slotSetActiveTarget() ), actions, "set active target" ); setActiveTargetAction->setWhatsThis(i18n("<b>Make target active</b><p>Marks the " "currently selected target as 'active'. New " @@ -240,9 +240,9 @@ void AutoDetailsView::initActions() "Using the <b>Build Active Target</b> menu " "command builds it.")); - QToolTip::add( m_button3, tr2i18n( "Remove")); + TQToolTip::add( m_button3, tr2i18n( "Remove")); removeDetailAction = new AutoToolsAction( i18n( "Remove" ), "editdelete", 0, this, - SLOT( slotRemoveDetail() ), actions, + TQT_SLOT( slotRemoveDetail() ), actions, "remove detail" ); removeDetailAction->setWhatsThis(i18n("<b>Remove</b><p>Shows a list of targets " "dependent on the selected target or file and " @@ -251,25 +251,25 @@ void AutoDetailsView::initActions() removeDetailAction->plug( m_button3 ); removeDetailAction->setEnabled( false ); - connect( m_listView, SIGNAL( executed( QListViewItem* ) ), - this, SLOT( slotDetailsExecuted( QListViewItem* ) ) ); - connect( m_listView, SIGNAL( returnPressed( QListViewItem* ) ), - this, SLOT( slotDetailsExecuted( QListViewItem* ) ) ); - connect( m_listView, SIGNAL( contextMenu( KListView*, QListViewItem*, const QPoint& ) ), - this, SLOT( slotDetailsContextMenu( KListView*, QListViewItem*, const QPoint& ) ) ); + connect( m_listView, TQT_SIGNAL( executed( TQListViewItem* ) ), + this, TQT_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); + connect( m_listView, TQT_SIGNAL( returnPressed( TQListViewItem* ) ), + this, TQT_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); + connect( m_listView, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( slotDetailsContextMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); } -QString AutoDetailsView::getUiFileLink(const QString& relpath, const QString& filename) +TQString AutoDetailsView::getUiFileLink(const TQString& relpath, const TQString& filename) { DomUtil::PairList::iterator it; for (it=m_subclasslist.begin(); it != m_subclasslist.end(); ++it) { - if ((*it).first == QString("/")+relpath+filename) + if ((*it).first == TQString("/")+relpath+filename) return (*it).second; } - return QString::null; + return TQString::null; } void AutoDetailsView::slotTargetOptions() @@ -298,7 +298,7 @@ void AutoDetailsView::slotAddNewFile() if (createFileSupport) { KDevCreateFile::CreatedFile crFile = - createFileSupport->createNewFile(QString::null, + createFileSupport->createNewFile(TQString::null, m_widget->selectedSubproject()->path); /* if (crFile.status == KDevCreateFile::CreatedFile::STATUS_OK) { @@ -310,7 +310,7 @@ void AutoDetailsView::slotAddNewFile() } else { AddFileDialog dlg( m_part, m_widget, m_widget->selectedSubproject(), titem, this, "add file dialog" ); - QString caption; + TQString caption; if ( titem->name.isEmpty() ) caption = i18n ( "%1 in %2" ).arg ( titem->primary ).arg ( titem->prefix ); else @@ -332,7 +332,7 @@ void AutoDetailsView::slotAddExistingFile() AddExistingFilesDialog dlg( m_part, m_widget, m_widget->selectedSubproject(), titem, this, "add existing files" ); - QString caption; + TQString caption; if ( titem->name.isEmpty() ) caption = i18n ( "%1 in %2" ).arg ( titem->primary ).arg ( titem->prefix ); else @@ -369,7 +369,7 @@ void AutoDetailsView::slotBuildTarget() else titem = static_cast <TargetItem*> ( m_listView->selectedItem() ); - QString relpath = URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + m_widget->selectedSubproject()->relativePath(); + TQString relpath = URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + m_widget->selectedSubproject()->relativePath(); m_part->buildTarget(relpath, titem); } @@ -387,8 +387,8 @@ void AutoDetailsView::slotExecuteTarget() else titem = static_cast <TargetItem*> ( m_listView->selectedItem() ); - QString relpath = URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + m_part->activeDirectory(); - m_part->executeTarget(QDir( DomUtil::readEntry( *m_part->projectDom(), "/kdevautoproject/run/cwd/"+titem->name )), titem); + TQString relpath = URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + m_part->activeDirectory(); + m_part->executeTarget(TQDir( DomUtil::readEntry( *m_part->projectDom(), "/kdevautoproject/run/cwd/"+titem->name )), titem); } void AutoDetailsView::slotRemoveDetail() @@ -404,7 +404,7 @@ void AutoDetailsView::slotRemoveDetail() return; } - QListViewItem* sibling = fitem->nextSibling(); + TQListViewItem* sibling = fitem->nextSibling(); if ( !fitem ) return; @@ -414,7 +414,7 @@ void AutoDetailsView::slotRemoveDetail() RemoveFileDialog dlg( m_widget, m_part, m_widget->selectedSubproject(), titem, fitem->text( 0 ), this, "remove file dialog" ); - QString caption; + TQString caption; if ( titem->name.isEmpty() ) caption = i18n ( "%1 in %2" ).arg ( titem->primary ).arg ( titem->prefix ); else @@ -439,7 +439,7 @@ void AutoDetailsView::slotRemoveDetail() if ( pvitem && ( pvitem->type() == ProjectItem::Target ) ) { TargetItem* titem = static_cast <TargetItem*> ( m_listView->selectedItem() ); - QListViewItem* sibling = titem->nextSibling(); + TQListViewItem* sibling = titem->nextSibling(); if ( !titem ) return; @@ -469,7 +469,7 @@ void AutoDetailsView::slotRemoveDetail() } -void AutoDetailsView::slotDetailsContextMenu( KListView *, QListViewItem *item, const QPoint &p ) +void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) { if ( !item ) return; @@ -493,7 +493,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, QListViewItem *item, return; } - QString caption; + TQString caption; if ( titem->name.isEmpty() ) caption = i18n ( "%1 in %2" ).arg ( titem->primary ).arg ( titem->prefix ); else @@ -587,7 +587,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, QListViewItem *item, popup.setWhatsThis(idViewUIH, i18n("<b>Open ui.h file</b><p>Opens .ui.h file " "associated with the selected .ui.")); - if (!fitem->name.contains(QRegExp("ui$")) || fitem->is_subst == true) + if (!fitem->name.contains(TQRegExp("ui$")) || fitem->is_subst == true) { popup.removeItem(idUISubclasses); popup.removeItem(idViewUIH); @@ -605,27 +605,27 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, QListViewItem *item, if(r == idViewUIH) { m_part->partController()->editDocument(KURL(m_widget->selectedSubproject()->path - + "/" + QString(fitem->name + ".h"))); + + "/" + TQString(fitem->name + ".h"))); } else if (r == idSubclassWidget) { - QStringList newFileNames; + TQStringList newFileNames; newFileNames = m_part->languageSupport()->subclassWidget(m_widget->selectedSubproject()->path + "/" + fitem->name); if (!newFileNames.empty()) { - QDomDocument &dom = *(m_part->projectDom()); + TQDomDocument &dom = *(m_part->projectDom()); for (uint i=0; i<newFileNames.count(); i++) { - QString srcfile_relpath = newFileNames[i]; + TQString srcfile_relpath = newFileNames[i]; srcfile_relpath.remove(0,m_part->projectDirectory().length()); - QString uifile_relpath = QString(m_widget->selectedSubproject()->path + "/" + fitem->name).remove(0,m_part->projectDirectory().length()); + TQString uifile_relpath = TQString(m_widget->selectedSubproject()->path + "/" + fitem->name).remove(0,m_part->projectDirectory().length()); DomUtil::PairList list = DomUtil::readPairListEntry(dom,"/kdevautoproject/subclassing", "subclass","sourcefile", "uifile"); list << DomUtil::Pair(srcfile_relpath,uifile_relpath); DomUtil::writePairListEntry(dom, "/kdevautoproject/subclassing", "subclass", "sourcefile", "uifile", list); - newFileNames[i] = newFileNames[i].replace(QRegExp(m_part->projectDirectory()+"/"),""); + newFileNames[i] = newFileNames[i].replace(TQRegExp(m_part->projectDirectory()+"/"),""); } m_subclasslist = DomUtil::readPairListEntry(dom,"/kdevautoproject/subclassing", "subclass","sourcefile", "uifile"); @@ -634,17 +634,17 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, QListViewItem *item, } else if (r == idUpdateWidgetclass) { - QString noext = m_widget->selectedSubproject()->path + "/" + fitem->name; + TQString noext = m_widget->selectedSubproject()->path + "/" + fitem->name; if (noext.findRev('.')>-1) noext = noext.left(noext.findRev('.')); - QStringList dummy; - QString uifile = fitem->uiFileLink; + TQStringList dummy; + TQString uifile = fitem->uiFileLink; if (uifile.findRev('/')>-1) { - QStringList uisplit = QStringList::split('/',uifile); + TQStringList uisplit = TQStringList::split('/',uifile); uifile=uisplit[uisplit.count()-1]; } @@ -653,16 +653,16 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, QListViewItem *item, } else if (r == idUISubclasses) { - QDomDocument &dom = *(m_part->projectDom()); + TQDomDocument &dom = *(m_part->projectDom()); DomUtil::PairList list = DomUtil::readPairListEntry(dom,"/kdevautoproject/subclassing", "subclass","sourcefile", "uifile"); - SubclassesDlg *sbdlg = new SubclassesDlg( QString(m_widget->selectedSubproject()->path + "/" +fitem->name).remove(0,m_part->projectDirectory().length()), + SubclassesDlg *sbdlg = new SubclassesDlg( TQString(m_widget->selectedSubproject()->path + "/" +fitem->name).remove(0,m_part->projectDirectory().length()), list, m_part->projectDirectory()); if (sbdlg->exec()) { - QDomElement el = DomUtil::elementByPath( dom, "/kdevautoproject"); - QDomElement el2 = DomUtil::elementByPath( dom, "/kdevautoproject/subclassing"); + TQDomElement el = DomUtil::elementByPath( dom, "/kdevautoproject"); + TQDomElement el2 = DomUtil::elementByPath( dom, "/kdevautoproject/subclassing"); if ( (!el.isNull()) && (!el2.isNull()) ) { el.removeChild(el2); @@ -679,7 +679,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, QListViewItem *item, } -void AutoDetailsView::slotDetailsExecuted( QListViewItem *item ) +void AutoDetailsView::slotDetailsExecuted( TQListViewItem *item ) { if ( !item ) return ; @@ -691,7 +691,7 @@ void AutoDetailsView::slotDetailsExecuted( QListViewItem *item ) if ( !m_widget->selectedSubproject() ) return; - QString dirName = m_widget->selectedSubproject()->path; + TQString dirName = m_widget->selectedSubproject()->path; FileItem *fitem = static_cast<FileItem*>( item ); if(fitem->is_subst) { @@ -710,15 +710,15 @@ void AutoDetailsView::slotSetActiveTarget() SubprojectItem * subpitem = m_widget->selectedSubproject(); if ( !subpitem ) return; - QString targetPath = subpitem->path + "/" + titem->name; + TQString targetPath = subpitem->path + "/" + titem->name; targetPath = targetPath.mid( m_part->projectDirectory().length() + 1 ); kdDebug( 9020 ) << "Setting active " << targetPath << endl; m_widget->setActiveTarget( targetPath ); - QDomDocument &dom = *m_part->projectDom(); + TQDomDocument &dom = *m_part->projectDom(); DomUtil::writeEntry( dom, "/kdevautoproject/general/activetarget", targetPath ); } -void AutoDetailsView::focusOutEvent(QFocusEvent */*e*/) +void AutoDetailsView::focusOutEvent(TQFocusEvent */*e*/) { m_widget->setLastFocusedView(AutoProjectWidget::DetailsView); } diff --git a/buildtools/autotools/autodetailsview.h b/buildtools/autotools/autodetailsview.h index ee67558d..60f10738 100644 --- a/buildtools/autotools/autodetailsview.h +++ b/buildtools/autotools/autodetailsview.h @@ -34,29 +34,29 @@ class AutoDetailsView : protected AutoProjectViewBase Q_OBJECT public: - AutoDetailsView( AutoProjectWidget* widget, AutoProjectPart* part, QWidget *parent, const char *name ); + AutoDetailsView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name ); virtual ~AutoDetailsView(); - QString getUiFileLink( const QString &path, const QString& filename ); + TQString getUiFileLink( const TQString &path, const TQString& filename ); KListView* listView() { return m_listView; } public slots: - void slotSelectionChanged( QListViewItem* item ); + void slotSelectionChanged( TQListViewItem* item ); void slotSelectionChanged(); signals: - void selectionChanged( QListViewItem* ); + void selectionChanged( TQListViewItem* ); protected: void initActions (); - virtual void focusOutEvent( QFocusEvent *e ); + virtual void focusOutEvent( TQFocusEvent *e ); private slots: - void slotDetailsExecuted( QListViewItem *item ); - void slotDetailsContextMenu( KListView *, QListViewItem *item, const QPoint &p ); + void slotDetailsExecuted( TQListViewItem *item ); + void slotDetailsContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ); void slotTargetOptions (); void slotAddNewFile(); diff --git a/buildtools/autotools/autolistviewitems.cpp b/buildtools/autotools/autolistviewitems.cpp index 454d12f5..865e82d0 100644 --- a/buildtools/autotools/autolistviewitems.cpp +++ b/buildtools/autotools/autolistviewitems.cpp @@ -12,9 +12,9 @@ * * ***************************************************************************/ -#include <qpainter.h> -#include <qinputdialog.h> -#include <qregexp.h> +#include <tqpainter.h> +#include <tqinputdialog.h> +#include <tqregexp.h> #include <kiconloader.h> #include "misc.h" @@ -27,30 +27,30 @@ * Class ProjectItem */ -ProjectItem::ProjectItem( Type type, QListView *parent, const QString &text ) - : QListViewItem( parent, text ), typ( type ) +ProjectItem::ProjectItem( Type type, TQListView *parent, const TQString &text ) + : TQListViewItem( parent, text ), typ( type ) { bld = false; } -ProjectItem::ProjectItem( Type type, ProjectItem *parent, const QString &text ) - : QListViewItem( parent, text ), typ( type ) +ProjectItem::ProjectItem( Type type, ProjectItem *parent, const TQString &text ) + : TQListViewItem( parent, text ), typ( type ) { bld = false; } -void ProjectItem::paintCell( QPainter *p, const QColorGroup &cg, +void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ) { if ( isBold() ) { - QFont font( p->font() ); + TQFont font( p->font() ); font.setBold( true ); p->setFont( font ); } - QListViewItem::paintCell( p, cg, column, width, alignment ); + TQListViewItem::paintCell( p, cg, column, width, alignment ); } @@ -58,14 +58,14 @@ void ProjectItem::paintCell( QPainter *p, const QColorGroup &cg, * Class SubprojectItem */ -SubprojectItem::SubprojectItem( QListView *parent, const QString &text ) +SubprojectItem::SubprojectItem( TQListView *parent, const TQString &text ) : ProjectItem( Subproject, parent, text ) { init(); } -SubprojectItem::SubprojectItem( SubprojectItem *parent, const QString &text ) +SubprojectItem::SubprojectItem( SubprojectItem *parent, const TQString &text ) : ProjectItem( Subproject, parent, text ) { init(); @@ -79,9 +79,9 @@ void SubprojectItem::init() } -QString SubprojectItem::relativePath() +TQString SubprojectItem::relativePath() { - QString relpath = subdir; + TQString relpath = subdir; SubprojectItem *it = this; while ( (it= dynamic_cast<SubprojectItem*>(it->parent())) ) @@ -98,7 +98,7 @@ QString SubprojectItem::relativePath() * Class TargetItem */ -TargetItem::TargetItem( QListView *lv, bool group, const QString &text ) +TargetItem::TargetItem( TQListView *lv, bool group, const TQString &text ) : ProjectItem( Target, lv, text ) { sources.setAutoDelete( true ); @@ -110,7 +110,7 @@ TargetItem::TargetItem( QListView *lv, bool group, const QString &text ) * Class FileItem */ -FileItem::FileItem( QListView *lv, const QString &text, bool set_is_subst ) +FileItem::FileItem( TQListView *lv, const TQString &text, bool set_is_subst ) : ProjectItem( File, lv, text ) , is_subst(set_is_subst) { if(!is_subst) @@ -130,13 +130,13 @@ if(!is_subst) return; bool ok; - QString text = QInputDialog::getText( - i18n("Edit Substitution"), i18n("Substitution:"), QLineEdit::Normal, + TQString text = QInputDialog::getText( + i18n("Edit Substitution"), i18n("Substitution:"), TQLineEdit::Normal, name, &ok ); if ( ok && !text.isEmpty() ) { // user entered something and pressed OK - QString new_name = text; + TQString new_name = text; if(new_name == name) return; setText(0,new_name); @@ -150,14 +150,14 @@ return; } } -void FileItem::changeMakefileEntry(const QString& new_name) +void FileItem::changeMakefileEntry(const TQString& new_name) { TargetItem* target = dynamic_cast<TargetItem*>(parent()); - QMap<QString,QString> replaceMap; + TQMap<TQString,TQString> replaceMap; - QString canontargetname = AutoProjectTool::canonicalize(target->name); - QString varname; + TQString canontargetname = AutoProjectTool::canonicalize(target->name); + TQString varname; if( target->primary == "PROGRAMS" || target->primary == "LIBRARIES" || target->primary == "LTLIBRARIES" ) varname = canontargetname + "_SOURCES"; else @@ -166,8 +166,8 @@ void FileItem::changeMakefileEntry(const QString& new_name) { if ( SubprojectItem* subProject = lv->m_part->m_widget->selectedSubproject() ) { - QStringList sources = QStringList::split(QRegExp("[ \t\n]"), subProject->variables[varname]); - QStringList::iterator it = sources.find(name); + TQStringList sources = TQStringList::split(TQRegExp("[ \t\n]"), subProject->variables[varname]); + TQStringList::iterator it = sources.find(name); (*it) = new_name; subProject->variables[varname] = sources.join(" "); replaceMap.insert(varname, subProject->variables[varname]); diff --git a/buildtools/autotools/autolistviewitems.h b/buildtools/autotools/autolistviewitems.h index 0dece2a2..008fecc4 100644 --- a/buildtools/autotools/autolistviewitems.h +++ b/buildtools/autotools/autolistviewitems.h @@ -15,9 +15,9 @@ #ifndef AUTOLISTVIEWITEMS_H #define AUTOLISTVIEWITEMS_H -#include <qptrlist.h> +#include <tqptrlist.h> -#include <qlistview.h> +#include <tqlistview.h> class TargetItem; class FileItem; @@ -31,10 +31,10 @@ class ProjectItem : public QListViewItem public: enum Type { Subproject, Target, File }; - ProjectItem( Type type, QListView *parent, const QString &text ); - ProjectItem( Type type, ProjectItem *parent, const QString &text ); + ProjectItem( Type type, TQListView *parent, const TQString &text ); + ProjectItem( Type type, ProjectItem *parent, const TQString &text ); - void paintCell( QPainter *p, const QColorGroup &cg, + void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ); void setBold( bool b ) { @@ -62,21 +62,21 @@ private: class SubprojectItem : public ProjectItem { public: - SubprojectItem( QListView *parent, const QString &text ); - SubprojectItem( SubprojectItem *parent, const QString &text ); + SubprojectItem( TQListView *parent, const TQString &text ); + SubprojectItem( SubprojectItem *parent, const TQString &text ); /** name of the directory */ - QString subdir; + TQString subdir; /** absolute path */ - QString path; + TQString path; /** mapping from prefix to path */ - QMap<QString, QString> prefixes; + TQMap<TQString, TQString> prefixes; /** mapping from variable name to value */ - QMap<QString, QString> variables; + TQMap<TQString, TQString> variables; /** list of targets */ - QPtrList<TargetItem> targets; + TQPtrList<TargetItem> targets; - QString relativePath(); + TQString relativePath(); private: void init(); @@ -99,28 +99,28 @@ class TargetItem : public ProjectItem public: //enum TargetKind { Program, Library, DataGroup, IconGroup, DocGroup }; - TargetItem( QListView *lv, bool group, const QString &text ); + TargetItem( TQListView *lv, bool group, const TQString &text ); // Target kind - not used currently //TargetKind kind; //! Name of target, e.g. foo - QString name; + TQString name; //! One of PROGRAMS, LIBRARIES, LTLIBRARIES, SCRIPTS, HEADERS, DATA, JAVA //! In addition to these automake primaries, we use KDEICON and KDEDOCS //! for am_edit magic - QString primary; + TQString primary; //! May be bin, pkglib, noinst, check, sbin, pkgdata, java... - QString prefix; + TQString prefix; //! Content of foo_SOURCES (or java_JAVA) assignment - QPtrList<FileItem> sources; + TQPtrList<FileItem> sources; //! Content of foo_LDFLAGS assignment - QString ldflags; + TQString ldflags; //! Content of foo_LDADD assignment - QString ldadd; + TQString ldadd; //! Content of foo_LIBADD assignment - QString libadd; + TQString libadd; //! Content of foo_DEPENDENCIES assignment - QString dependencies; + TQString dependencies; }; @@ -129,12 +129,12 @@ class FileItem : public ProjectItem { public: - FileItem( QListView *lv, const QString &text, bool set_is_subst = false ); + FileItem( TQListView *lv, const TQString &text, bool set_is_subst = false ); void changeSubstitution(); - void changeMakefileEntry( const QString& ); + void changeMakefileEntry( const TQString& ); - QString name; - QString uiFileLink; + TQString name; + TQString uiFileLink; const bool is_subst; }; diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index ea0b6896..38604ee0 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -21,14 +21,14 @@ #include "addicondlg.h" #include "autoprojectwidget.h" -#include <qdom.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qpopupmenu.h> -#include <qstringlist.h> -#include <qwhatsthis.h> -#include <qregexp.h> -#include <qgroupbox.h> +#include <tqdom.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqpopupmenu.h> +#include <tqstringlist.h> +#include <tqwhatsthis.h> +#include <tqregexp.h> +#include <tqgroupbox.h> #include <kapplication.h> @@ -65,7 +65,7 @@ static const KDevPluginInfo data("kdevautoproject"); K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( data ) ) -AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStringList &args) +AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStringList &args) : KDevBuildTool(&data, parent, name ? name : "AutoProjectPart") , m_lastCompilationFailed(false) { @@ -80,7 +80,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin m_widget = new AutoProjectWidget(this, m_isKDE); m_widget->setIcon(SmallIcon( info()->icon() )); m_widget->setCaption(i18n("Automake Manager")); - QWhatsThis::add(m_widget, i18n("<b>Automake manager</b><p>" + TQWhatsThis::add(m_widget, i18n("<b>Automake manager</b><p>" "The project tree consists of two parts. The 'overview' " "in the upper half shows the subprojects, each one having a " "Makefile.am. The 'details' view in the lower half shows the " @@ -90,7 +90,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin KAction *action; action = new KAction( i18n("Add Translation..."), 0, - this, SLOT(slotAddTranslation()), + this, TQT_SLOT(slotAddTranslation()), actionCollection(), "project_addtranslation" ); action->setToolTip(i18n("Add translation")); action->setWhatsThis(i18n("<b>Add translation</b><p>Creates .po file for the selected language.")); @@ -101,7 +101,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin action->setEnabled(false); action = new KAction( i18n("&Build Project"), "make_kdevelop", Key_F8, - this, SLOT(slotBuild()), + this, TQT_SLOT(slotBuild()), actionCollection(), "build_build" ); action->setToolTip(i18n("Build project")); action->setWhatsThis(i18n("<b>Build project</b><p>Runs <b>make</b> from the project directory.<br>" @@ -110,7 +110,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin action->setGroup("autotools"); action = new KAction( i18n("Build &Active Target"), "make_kdevelop", Key_F7, - this, SLOT(slotBuildActiveTarget()), + this, TQT_SLOT(slotBuildActiveTarget()), actionCollection(), "build_buildactivetarget" ); action->setToolTip(i18n("Build active target")); action->setWhatsThis(i18n("<b>Build active target</b><p>Constructs a series of make commands to build an active target. " @@ -120,7 +120,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin action->setGroup("autotools"); action = new KAction( i18n("Compile &File"), "make_kdevelop", - this, SLOT(slotCompileFile()), + this, TQT_SLOT(slotCompileFile()), actionCollection(), "build_compilefile" ); action->setToolTip(i18n("Compile file")); action->setWhatsThis(i18n("<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory where 'filename' is the name of currently opened file.<br>" @@ -129,7 +129,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin action->setGroup("autotools"); action = new KAction( i18n("Run Configure"), 0, - this, SLOT(slotConfigure()), + this, TQT_SLOT(slotConfigure()), actionCollection(), "build_configure" ); action->setToolTip(i18n("Run configure")); action->setWhatsThis(i18n("<b>Run configure</b><p>Executes <b>configure</b> with flags, arguments " @@ -138,14 +138,14 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin action->setGroup("autotools"); action = new KAction( i18n("Run automake && friends"), 0, - this, SLOT(slotMakefilecvs()), + this, TQT_SLOT(slotMakefilecvs()), actionCollection(), "build_makefilecvs" ); action->setToolTip(i18n("Run automake && friends")); action->setWhatsThis(i18n("<b>Run automake && friends</b><p>Executes<br><b>make -f Makefile.cvs</b><br><b>./configure</b><br>commands from the project directory.")); action->setGroup("autotools"); action = new KAction( i18n("Install"), 0, - this, SLOT(slotInstall()), + this, TQT_SLOT(slotInstall()), actionCollection(), "build_install" ); action->setToolTip(i18n("Install")); action->setWhatsThis(i18n("<b>Install</b><p>Runs <b>make install</b> command from the project directory.<br>" @@ -154,7 +154,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin action->setGroup("autotools"); action = new KAction( i18n("Install (as root user)"), 0, - this, SLOT(slotInstallWithKdesu()), + this, TQT_SLOT(slotInstallWithKdesu()), actionCollection(), "build_install_kdesu" ); action->setToolTip(i18n("Install as root user")); action->setWhatsThis(i18n("<b>Install</b><p>Runs <b>make install</b> command from the project directory with root privileges.<br>" @@ -164,7 +164,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin action->setGroup("autotools"); action = new KAction( i18n("&Clean Project"), 0, - this, SLOT(slotClean()), + this, TQT_SLOT(slotClean()), actionCollection(), "build_clean" ); action->setToolTip(i18n("Clean project")); action->setWhatsThis(i18n("<b>Clean project</b><p>Runs <b>make clean</b> command from the project directory.<br>" @@ -173,7 +173,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin action->setGroup("autotools"); action = new KAction( i18n("&Distclean"), 0, - this, SLOT(slotDistClean()), + this, TQT_SLOT(slotDistClean()), actionCollection(), "build_distclean" ); action->setToolTip(i18n("Distclean")); action->setWhatsThis(i18n("<b>Distclean</b><p>Runs <b>make distclean</b> command from the project directory.<br>" @@ -182,7 +182,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin action->setGroup("autotools"); action = new KAction( i18n("Make Messages && Merge"), 0, - this, SLOT(slotMakeMessages()), + this, TQT_SLOT(slotMakeMessages()), actionCollection(), "build_messages" ); action->setToolTip(i18n("Make messages && merge")); action->setWhatsThis(i18n("<b>Make messages && merge</b><p>Runs <b>make package-messages</b> command from the project directory.<br>" @@ -202,36 +202,36 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin "Modify build configurations in project settings dialog, <b>Configure Options</b> tab.")); buildConfigAction->setGroup("autotools"); - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); if (!DomUtil::readBoolEntry(dom, "/kdevautoproject/run/disable_default")) { //ok we handle the execute in this kpart action = new KAction( i18n("Execute Program"), "exec", SHIFT+Key_F9, - this, SLOT(slotExecute()), + this, TQT_SLOT(slotExecute()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Execute program")); action->setWhatsThis(i18n("<b>Execute program</b><p>Executes the currently active target or the main program specified in project settings, <b>Run Options</b> tab.")); action->setGroup("autotools"); } - connect( buildConfigAction, SIGNAL(activated(const QString&)), - this, SLOT(slotBuildConfigChanged(const QString&)) ); - connect( buildConfigAction->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotBuildConfigAboutToShow()) ); + connect( buildConfigAction, TQT_SIGNAL(activated(const TQString&)), + this, TQT_SLOT(slotBuildConfigChanged(const TQString&)) ); + connect( buildConfigAction->popupMenu(), TQT_SIGNAL(aboutToShow()), + this, TQT_SLOT(slotBuildConfigAboutToShow()) ); -// connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), this, SLOT(projectConfigWidget(KDialogBase*)) ); +// connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("Configure Options"), CONFIGURE_OPTIONS, info()->icon() ); _configProxy->createProjectConfigPage( i18n("Run Options"), RUN_OPTIONS, info()->icon() ); _configProxy->createProjectConfigPage( i18n("Make Options"), MAKE_OPTIONS, info()->icon() ); - connect( _configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )), - this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )) ); + connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - connect( makeFrontend(), SIGNAL(commandFinished(const QString&)), - this, SLOT(slotCommandFinished(const QString&)) ); - connect( makeFrontend(), SIGNAL(commandFailed(const QString&)), - this, SLOT(slotCommandFailed(const QString&)) ); + connect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), + this, TQT_SLOT(slotCommandFinished(const TQString&)) ); + connect( makeFrontend(), TQT_SIGNAL(commandFailed(const TQString&)), + this, TQT_SLOT(slotCommandFailed(const TQString&)) ); setWantautotools(); @@ -250,25 +250,25 @@ AutoProjectPart::~AutoProjectPart() } -void AutoProjectPart::insertConfigWidget( const KDialogBase* dlg, QWidget * page, unsigned int pagenumber ) +void AutoProjectPart::insertConfigWidget( const KDialogBase* dlg, TQWidget * page, unsigned int pagenumber ) { switch ( pagenumber ) { case CONFIGURE_OPTIONS: { ConfigureOptionsWidget *w2 = new ConfigureOptionsWidget(this, page ); - connect( dlg, SIGNAL(okClicked()), w2, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w2, TQT_SLOT(accept()) ); } break; case RUN_OPTIONS: { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); if (!DomUtil::readBoolEntry(dom, "/kdevautoproject/run/disable_default")) { //ok we handle the execute in this kpart RunOptionsWidget *w3 = new RunOptionsWidget(*projectDom(), "/kdevautoproject", buildDirectory(), page ); - connect( dlg, SIGNAL(okClicked()), w3, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w3, TQT_SLOT(accept()) ); } } break; @@ -276,21 +276,21 @@ void AutoProjectPart::insertConfigWidget( const KDialogBase* dlg, QWidget * page case MAKE_OPTIONS: { MakeOptionsWidget *w4 = new MakeOptionsWidget(*projectDom(), "/kdevautoproject", page ); - connect( dlg, SIGNAL(okClicked()), w4, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w4, TQT_SLOT(accept()) ); } break; } } -void AutoProjectPart::openProject(const QString &dirName, const QString &projectName) +void AutoProjectPart::openProject(const TQString &dirName, const TQString &projectName) { m_projectName = projectName; m_projectPath =dirName; m_widget->openProject(dirName); - QDomDocument &dom = *projectDom(); - QString activeTarget = DomUtil::readEntry(dom, "/kdevautoproject/general/activetarget"); + TQDomDocument &dom = *projectDom(); + TQString activeTarget = DomUtil::readEntry(dom, "/kdevautoproject/general/activetarget"); kdDebug(9020) << k_funcinfo << "activeTarget " << activeTarget << endl; if (!activeTarget.isEmpty()) m_widget->setActiveTarget(activeTarget); @@ -312,13 +312,13 @@ void AutoProjectPart::closeProject() } -QString AutoProjectPart::projectDirectory() const +TQString AutoProjectPart::projectDirectory() const { return m_projectPath; } -QString AutoProjectPart::projectName() const +TQString AutoProjectPart::projectName() const { return m_projectName; } @@ -342,12 +342,12 @@ DomUtil::PairList AutoProjectPart::runEnvironmentVars() const * if /kdevautoproject/run/directoryradio == custom * The custom directory absolute path */ -QString AutoProjectPart::runDirectory() const +TQString AutoProjectPart::runDirectory() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); - QString cwd; + TQString cwd; if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/useglobalprogram", false) || !m_widget->activeTarget() ) { cwd = defaultRunDirectory("kdevautoproject"); @@ -374,17 +374,17 @@ QString AutoProjectPart::runDirectory() const * The absolute path to executable */ -QString AutoProjectPart::mainProgram() const +TQString AutoProjectPart::mainProgram() const { - QDomDocument * dom = projectDom(); + TQDomDocument * dom = projectDom(); - if ( !dom ) return QString(); + if ( !dom ) return TQString(); if( DomUtil::readBoolEntry(*dom, "/kdevautoproject/run/useglobalprogram", false) ) { - QString DomMainProgram = DomUtil::readEntry(*dom, "/kdevautoproject/run/mainprogram"); + TQString DomMainProgram = DomUtil::readEntry(*dom, "/kdevautoproject/run/mainprogram"); - if ( DomMainProgram.isEmpty() ) return QString(); + if ( DomMainProgram.isEmpty() ) return TQString(); if ( DomMainProgram.startsWith("/") ) // assume absolute path { @@ -392,7 +392,7 @@ QString AutoProjectPart::mainProgram() const } else // assume builddir relative path { - QString relprojectpath = URLUtil::getRelativePath( topsourceDirectory(), projectDirectory() ); + TQString relprojectpath = URLUtil::getRelativePath( topsourceDirectory(), projectDirectory() ); if( !relprojectpath.isEmpty() ) relprojectpath = "/" + relprojectpath; return buildDirectory() + relprojectpath + "/" + DomMainProgram; @@ -407,7 +407,7 @@ QString AutoProjectPart::mainProgram() const KMessageBox::error( m_widget, i18n("There is no active target.\n" "Unable to determine the main program."), i18n("No active target found") ); kdDebug ( 9020 ) << k_funcinfo << "Error! : There's no active target! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl; - return QString::null; + return TQString::null; } if ( titem->primary != "PROGRAMS" ) { @@ -416,10 +416,10 @@ QString AutoProjectPart::mainProgram() const "to be the active target, set a main program under\n" "Project -> Project Options -> Run Options").arg(titem->name).arg(titem->primary), i18n("Active target is not a library") ); kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << titem->primary << ") ! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl; - return QString::null; + return TQString::null; } - QString relprojectpath = URLUtil::getRelativePath( topsourceDirectory(), projectDirectory() ); + TQString relprojectpath = URLUtil::getRelativePath( topsourceDirectory(), projectDirectory() ); if( !relprojectpath.isEmpty() ) relprojectpath = "/" + relprojectpath; return buildDirectory() + relprojectpath + "/" + activeDirectory() + "/" + titem->name; @@ -427,10 +427,10 @@ QString AutoProjectPart::mainProgram() const } -/** Retuns a QString with the debug command line arguments */ -QString AutoProjectPart::debugArguments() const +/** Retuns a TQString with the debug command line arguments */ +TQString AutoProjectPart::debugArguments() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/useglobalprogram", false) || !m_widget->activeTarget() ) { @@ -442,10 +442,10 @@ QString AutoProjectPart::debugArguments() const } -/** Retuns a QString with the run command line arguments */ -QString AutoProjectPart::runArguments() const +/** Retuns a TQString with the run command line arguments */ +TQString AutoProjectPart::runArguments() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/useglobalprogram", false) || !m_widget->activeTarget() ) { @@ -457,13 +457,13 @@ QString AutoProjectPart::runArguments() const } -QString AutoProjectPart::activeDirectory() const +TQString AutoProjectPart::activeDirectory() const { return m_widget->activeDirectory(); } -QStringList AutoProjectPart::allFiles() const +TQStringList AutoProjectPart::allFiles() const { return m_widget->allFiles(); } @@ -471,8 +471,8 @@ QStringList AutoProjectPart::allFiles() const void AutoProjectPart::setWantautotools() { - QDomDocument &dom = *projectDom(); - QDomElement el = DomUtil::elementByPath(dom, "/kdevautoproject/make"); + TQDomDocument &dom = *projectDom(); + TQDomElement el = DomUtil::elementByPath(dom, "/kdevautoproject/make"); if ( el.namedItem("envvars").isNull() ) { DomUtil::PairList list; list << DomUtil::Pair("WANT_AUTOCONF_2_5", "1"); @@ -482,7 +482,7 @@ void AutoProjectPart::setWantautotools() } -QString AutoProjectPart::makeEnvironment() const +TQString AutoProjectPart::makeEnvironment() const { // Get the make environment variables pairs into the environstr string // in the form of: "ENV_VARIABLE=ENV_VALUE" @@ -491,7 +491,7 @@ QString AutoProjectPart::makeEnvironment() const DomUtil::PairList envvars = DomUtil::readPairListEntry(*projectDom(), "/kdevautoproject/make/envvars", "envvar", "name", "value"); - QString environstr; + TQString environstr; DomUtil::PairList::ConstIterator it; for (it = envvars.begin(); it != envvars.end(); ++it) { @@ -509,18 +509,18 @@ QString AutoProjectPart::makeEnvironment() const } -void AutoProjectPart::addFile(const QString &fileName) +void AutoProjectPart::addFile(const TQString &fileName) { - QStringList fileList; + TQStringList fileList; fileList.append ( fileName ); this->addFiles ( fileList ); } -void AutoProjectPart::addFiles ( const QStringList& fileList ) +void AutoProjectPart::addFiles ( const TQStringList& fileList ) { - QString directory, name; - QStringList::ConstIterator it; + TQString directory, name; + TQStringList::ConstIterator it; bool messageBoxShown = false; for ( it = fileList.begin(); it != fileList.end(); ++it ) @@ -554,15 +554,15 @@ void AutoProjectPart::addFiles ( const QStringList& fileList ) m_widget->addFiles(fileList); } -void AutoProjectPart::removeFile(const QString &fileName) +void AutoProjectPart::removeFile(const TQString &fileName) { - QStringList fileList; + TQStringList fileList; fileList.append ( fileName ); this->removeFiles ( fileList ); } -void AutoProjectPart::removeFiles ( const QStringList& fileList ) +void AutoProjectPart::removeFiles ( const TQStringList& fileList ) { /// \FIXME m_widget->removeFiles does nothing! m_widget->removeFiles ( fileList ); @@ -570,18 +570,18 @@ void AutoProjectPart::removeFiles ( const QStringList& fileList ) emit removedFilesFromProject ( fileList ); } -QStringList AutoProjectPart::allBuildConfigs() const +TQStringList AutoProjectPart::allBuildConfigs() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); - QStringList allConfigs; + TQStringList allConfigs; allConfigs.append("default"); - QDomNode node = dom.documentElement().namedItem("kdevautoproject").namedItem("configurations"); - QDomElement childEl = node.firstChild().toElement(); + TQDomNode node = dom.documentElement().namedItem("kdevautoproject").namedItem("configurations"); + TQDomElement childEl = node.firstChild().toElement(); while (!childEl.isNull()) { - QString config = childEl.tagName(); + TQString config = childEl.tagName(); kdDebug(9020) << k_funcinfo << "Found config " << config << endl; if (config != "default") allConfigs.append(config); @@ -592,11 +592,11 @@ QStringList AutoProjectPart::allBuildConfigs() const } -QString AutoProjectPart::currentBuildConfig() const +TQString AutoProjectPart::currentBuildConfig() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); - QString config = DomUtil::readEntry(dom, "/kdevautoproject/general/useconfiguration"); + TQString config = DomUtil::readEntry(dom, "/kdevautoproject/general/useconfiguration"); if (config.isEmpty() || !allBuildConfigs().contains(config)) config = "default"; @@ -604,11 +604,11 @@ QString AutoProjectPart::currentBuildConfig() const } -QString AutoProjectPart::buildDirectory() const +TQString AutoProjectPart::buildDirectory() const { - QString prefix = "/kdevautoproject/configurations/" + currentBuildConfig() + "/"; + TQString prefix = "/kdevautoproject/configurations/" + currentBuildConfig() + "/"; - QString builddir = DomUtil::readEntry(*projectDom(), prefix + "builddir"); + TQString builddir = DomUtil::readEntry(*projectDom(), prefix + "builddir"); if (builddir.isEmpty()) return topsourceDirectory(); else if (builddir.startsWith("/")) @@ -617,11 +617,11 @@ QString AutoProjectPart::buildDirectory() const return projectDirectory() + "/" + builddir; } -QString AutoProjectPart::topsourceDirectory() const +TQString AutoProjectPart::topsourceDirectory() const { - QString prefix = "/kdevautoproject/configurations/" + currentBuildConfig() + "/"; + TQString prefix = "/kdevautoproject/configurations/" + currentBuildConfig() + "/"; - QString topsourcedir = DomUtil::readEntry(*projectDom(), prefix + "topsourcedir"); + TQString topsourcedir = DomUtil::readEntry(*projectDom(), prefix + "topsourcedir"); if (topsourcedir.isEmpty()) return projectDirectory(); else if (topsourcedir.startsWith("/")) @@ -630,45 +630,45 @@ QString AutoProjectPart::topsourceDirectory() const return projectDirectory() + "/" + topsourcedir; } -QString AutoProjectPart::constructMakeCommandLine(const QString &dir, const QString &target) const +TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQString &target) const { - QString preCommand; - QFileInfo fi1(); + TQString preCommand; + TQFileInfo fi1(); kdDebug(9020) << k_funcinfo << "Looking for Makefile in " << dir << endl; - if ( !QFile::exists(dir + "/GNUmakefile") && !QFile::exists(dir + "/makefile") - && ! QFile::exists(dir + "/Makefile") ) + if ( !TQFile::exists(dir + "/GNUmakefile") && !TQFile::exists(dir + "/makefile") + && ! TQFile::exists(dir + "/Makefile") ) { - if (!QFile::exists(buildDirectory() + "/configure")) + if (!TQFile::exists(buildDirectory() + "/configure")) { int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory\n" "and no configure script for this project.\n" - "Run automake & friends and configure first?").arg(buildDirectory()), QString::null, i18n("Run Them"), i18n("Do Not Run")); + "Run automake & friends and configure first?").arg(buildDirectory()), TQString::null, i18n("Run Them"), i18n("Do Not Run")); if (r == KMessageBox::No) - return QString::null; + return TQString::null; preCommand = makefileCvsCommand(); if (preCommand.isNull()) - return QString::null; + return TQString::null; preCommand += " && "; preCommand += configureCommand() + " && "; } else { - int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory. Run 'configure' first?").arg(dir), QString::null, i18n("Run configure"), i18n("Do Not Run")); + int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory. Run 'configure' first?").arg(dir), TQString::null, i18n("Run configure"), i18n("Do Not Run")); if (r == KMessageBox::No) - return QString::null; + return TQString::null; preCommand = configureCommand() + " && "; } } - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); - QString cmdline = DomUtil::readEntry(dom, "/kdevautoproject/make/makebin"); + TQString cmdline = DomUtil::readEntry(dom, "/kdevautoproject/make/makebin"); int prio = DomUtil::readIntEntry(dom, "/kdevautoproject/make/prio"); - QString nice; + TQString nice; kdDebug(9020) << k_funcinfo << "nice = " << prio<< endl; if (prio != 0) { - nice = QString("nice -n%1 ").arg(prio); + nice = TQString("nice -n%1 ").arg(prio); } if (cmdline.isEmpty()) @@ -680,7 +680,7 @@ QString AutoProjectPart::constructMakeCommandLine(const QString &dir, const QStr if (runmultiple && jobs != 0) { cmdline += " -j"; - cmdline += QString::number(jobs); + cmdline += TQString::number(jobs); } if (DomUtil::readBoolEntry(dom, "/kdevautoproject/make/dontact")) cmdline += " -n"; @@ -690,7 +690,7 @@ QString AutoProjectPart::constructMakeCommandLine(const QString &dir, const QStr cmdline.prepend(nice); cmdline.prepend(makeEnvironment()); - QString dircmd = "cd "; + TQString dircmd = "cd "; dircmd += KProcess::quote(dir); dircmd += " && "; @@ -698,7 +698,7 @@ QString AutoProjectPart::constructMakeCommandLine(const QString &dir, const QStr } -void AutoProjectPart::startMakeCommand(const QString &dir, const QString &target, bool withKdesu) +void AutoProjectPart::startMakeCommand(const TQString &dir, const TQString &target, bool withKdesu) { if (partController()->saveAllFiles()==false) return; //user cancelled @@ -715,18 +715,18 @@ void AutoProjectPart::startMakeCommand(const QString &dir, const QString &target /** Adds the make command for the libraries that the target depends on * to the make frontend queue (this is a recursive function) */ -bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, QStringList& alreadyScheduledDeps) +bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStringList& alreadyScheduledDeps) { - QString addstr = (titem->primary == "PROGRAMS")? titem->ldadd : titem->libadd; - QStringList l2 = QStringList::split(QRegExp("[ \t]"), addstr); // list of dependencies - QString tdir; // temp target directory - QString tname; // temp target name - QString tcmd; // temp command line - QStringList::Iterator l2it; + TQString addstr = (titem->primary == "PROGRAMS")? titem->ldadd : titem->libadd; + TQStringList l2 = TQStringList::split(TQRegExp("[ \t]"), addstr); // list of dependencies + TQString tdir; // temp target directory + TQString tname; // temp target name + TQString tcmd; // temp command line + TQStringList::Iterator l2it; for (l2it = l2.begin(); l2it != l2.end(); ++l2it) { - QString dependency = *l2it; + TQString dependency = *l2it; if (dependency.startsWith("$(top_builddir)/")) { // These are the internal libraries @@ -753,7 +753,7 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, QStri SubprojectItem *spi = m_widget->subprojectItemForPath( dependency.left(pos) ); if (spi) { - QPtrList< TargetItem > tl = spi->targets; + TQPtrList< TargetItem > tl = spi->targets; // Cycle through the list of targets to find the one we're looking for TargetItem *ti = tl.first(); do @@ -812,11 +812,11 @@ void AutoProjectPart::slotBuild() m_needMakefileCvs = false; } - startMakeCommand(buildDirectory(), QString::fromLatin1("")); + startMakeCommand(buildDirectory(), TQString::fromLatin1("")); } -void AutoProjectPart::buildTarget(QString relpath, TargetItem* titem) +void AutoProjectPart::buildTarget(TQString relpath, TargetItem* titem) { if ( !titem ) @@ -825,12 +825,12 @@ void AutoProjectPart::buildTarget(QString relpath, TargetItem* titem) //m_lastCompilationFailed = false; // Calculate the complete name of the target and store it in name - QString name = titem->name; + TQString name = titem->name; if ( titem->primary == "KDEDOCS" ) name = "index.cache.bz2"; // Calculate the full path of the target and store it in path - QString path = buildDirectory(); + TQString path = buildDirectory(); if (!path.endsWith("/") && !path.isEmpty()) path += "/"; if (relpath.at(0) == '/') @@ -843,16 +843,16 @@ void AutoProjectPart::buildTarget(QString relpath, TargetItem* titem) // Add the make command for the libraries that the target depends on to the make frontend queue // if this recursive behavour is un-wanted comment the next line - QStringList deps; + TQStringList deps; if( !queueInternalLibDependenciesBuild(titem, deps) ) return; // Calculate the "make" command line for the target - //QString relpath = dir.path().mid( projectDirectory().length() ); + //TQString relpath = dir.path().mid( projectDirectory().length() ); m_runProg=buildDirectory() + "/" + relpath+"/"+name; kdDebug(9020) << "buildTarget:" << buildDirectory()<< endl; kdDebug(9020) << "buildTarget:" << relpath << " " << path << ": "<< name << " : " << m_runProg << endl; - QString tcmd = constructMakeCommandLine( path, name ); + TQString tcmd = constructMakeCommandLine( path, name ); // Call make if (!tcmd.isNull()) @@ -882,60 +882,60 @@ void AutoProjectPart::slotCompileFile() if (!part || !part->url().isLocalFile()) return; - QString fileName = part->url().path(); - QFileInfo fi(fileName); - QString sourceDir = fi.dirPath(); - QString baseName = fi.baseName(true); + TQString fileName = part->url().path(); + TQFileInfo fi(fileName); + TQString sourceDir = fi.dirPath(); + TQString baseName = fi.baseName(true); kdDebug(9020) << "Compiling " << fileName << " in dir " << sourceDir << " with baseName " << baseName << endl; - QString projectDir = projectDirectory(); + TQString projectDir = projectDirectory(); if (!sourceDir.startsWith(projectDir)) { KMessageBox::sorry(m_widget, i18n("Can only compile files in directories which belong to the project.")); return; } - QString buildDir = buildDirectory() + sourceDir.mid(projectDir.length()); - QString target = baseName + ".lo"; + TQString buildDir = buildDirectory() + sourceDir.mid(projectDir.length()); + TQString target = baseName + ".lo"; kdDebug(9020) << "builddir " << buildDir << ", target " << target << endl; startMakeCommand(buildDir, target); } -QString AutoProjectPart::configureCommand() const +TQString AutoProjectPart::configureCommand() const { - QDomDocument &dom = *projectDom(); - QString prefix = "/kdevautoproject/configurations/" + currentBuildConfig() + "/"; + TQDomDocument &dom = *projectDom(); + TQString prefix = "/kdevautoproject/configurations/" + currentBuildConfig() + "/"; - QString cmdline = "\"" + topsourceDirectory(); + TQString cmdline = "\"" + topsourceDirectory(); cmdline += "/configure\""; - QString cc = DomUtil::readEntry(dom, prefix + "ccompilerbinary"); + TQString cc = DomUtil::readEntry(dom, prefix + "ccompilerbinary"); if (!cc.isEmpty()) - cmdline.prepend(QString("CC=%1 ").arg(cc)); - QString cflags = DomUtil::readEntry(dom, prefix + "cflags"); + cmdline.prepend(TQString("CC=%1 ").arg(cc)); + TQString cflags = DomUtil::readEntry(dom, prefix + "cflags"); if (!cflags.isEmpty()) - cmdline.prepend(QString("CFLAGS=\"%1\" ").arg(cflags)); - QString cxx = DomUtil::readEntry(dom, prefix + "cxxcompilerbinary"); + cmdline.prepend(TQString("CFLAGS=\"%1\" ").arg(cflags)); + TQString cxx = DomUtil::readEntry(dom, prefix + "cxxcompilerbinary"); if (!cxx.isEmpty()) - cmdline.prepend(QString("CXX=%1 ").arg(cxx)); - QString cxxflags = DomUtil::readEntry(dom, prefix + "cxxflags"); + cmdline.prepend(TQString("CXX=%1 ").arg(cxx)); + TQString cxxflags = DomUtil::readEntry(dom, prefix + "cxxflags"); if (!cxxflags.isEmpty()) - cmdline.prepend(QString("CXXFLAGS=\"%1\" ").arg(cxxflags)); - QString f77 = DomUtil::readEntry(dom, prefix + "f77compilerbinary"); + cmdline.prepend(TQString("CXXFLAGS=\"%1\" ").arg(cxxflags)); + TQString f77 = DomUtil::readEntry(dom, prefix + "f77compilerbinary"); if (!f77.isEmpty()) - cmdline.prepend(QString("F77=%1 ").arg(f77)); - QString fflags = DomUtil::readEntry(dom, prefix + "f77flags"); + cmdline.prepend(TQString("F77=%1 ").arg(f77)); + TQString fflags = DomUtil::readEntry(dom, prefix + "f77flags"); if (!fflags.isEmpty()) - cmdline.prepend(QString("FFLAGS=\"%1\" ").arg(fflags)); - QString cppflags = DomUtil::readEntry(dom, prefix + "cppflags"); + cmdline.prepend(TQString("FFLAGS=\"%1\" ").arg(fflags)); + TQString cppflags = DomUtil::readEntry(dom, prefix + "cppflags"); if (!cppflags.isEmpty()) - cmdline.prepend(QString("CPPFLAGS=\"%1\" ").arg(cppflags)); - QString ldflags = DomUtil::readEntry(dom, prefix + "ldflags"); + cmdline.prepend(TQString("CPPFLAGS=\"%1\" ").arg(cppflags)); + TQString ldflags = DomUtil::readEntry(dom, prefix + "ldflags"); if (!ldflags.isEmpty()) - cmdline.prepend(QString("LDFLAGS=\"%1\" ").arg(ldflags)); + cmdline.prepend(TQString("LDFLAGS=\"%1\" ").arg(ldflags)); - QString configargs = DomUtil::readEntry(dom, prefix + "configargs"); + TQString configargs = DomUtil::readEntry(dom, prefix + "configargs"); if (!configargs.isEmpty()) { cmdline += " "; cmdline += configargs; @@ -944,7 +944,7 @@ QString AutoProjectPart::configureCommand() const DomUtil::PairList envvars = DomUtil::readPairListEntry(*projectDom(), prefix + "envvars", "envvar", "name", "value"); - QString environstr; + TQString environstr; DomUtil::PairList::ConstIterator it; for (it = envvars.begin(); it != envvars.end(); ++it) { environstr += (*it).first; @@ -954,11 +954,11 @@ QString AutoProjectPart::configureCommand() const } cmdline.prepend(environstr); - QString builddir = buildDirectory(); - QString dircmd; + TQString builddir = buildDirectory(); + TQString dircmd; // if the build directory doesn't exist, add it's creation to the configureCommand - if ( !QFile::exists(builddir)) { + if ( !TQFile::exists(builddir)) { dircmd = "mkdir "; dircmd += KProcess::quote(builddir); dircmd += " && "; @@ -974,14 +974,14 @@ QString AutoProjectPart::configureCommand() const void AutoProjectPart::slotConfigure() { - QString cmdline = configureCommand(); + TQString cmdline = configureCommand(); if (cmdline.isNull()) return; makeFrontend()->queueCommand(buildDirectory(), cmdline); } -QString AutoProjectPart::makefileCvsCommand() const +TQString AutoProjectPart::makefileCvsCommand() const { kdDebug(9020) << "makefileCvsCommand: runDirectory :" << runDirectory() << ":" <<endl; kdDebug(9020) << "makefileCvsCommand: topsourceDirectory :" << topsourceDirectory() << ":" <<endl; @@ -989,33 +989,33 @@ QString AutoProjectPart::makefileCvsCommand() const kdDebug(9020) << "makefileCvsCommand: currentBuildConfig :" << currentBuildConfig() << ":" <<endl; - QString cmdline = DomUtil::readEntry(*projectDom(), "/kdevautoproject/make/makebin"); + TQString cmdline = DomUtil::readEntry(*projectDom(), "/kdevautoproject/make/makebin"); if (cmdline.isEmpty()) cmdline = MAKE_COMMAND; int prio = DomUtil::readIntEntry(*projectDom(), "/kdevautoproject/make/prio"); - QString nice; + TQString nice; kdDebug(9020) << "makefileCvsCommand() nice = " << prio<< endl; if (prio != 0) { - nice = QString("nice -n%1 ").arg(prio); + nice = TQString("nice -n%1 ").arg(prio); } - if (QFile::exists(topsourceDirectory() + "/Makefile.cvs")) + if (TQFile::exists(topsourceDirectory() + "/Makefile.cvs")) cmdline += " -f Makefile.cvs"; - else if (QFile::exists(topsourceDirectory() + "/Makefile.dist")) + else if (TQFile::exists(topsourceDirectory() + "/Makefile.dist")) cmdline += " -f Makefile.dist"; - else if (QFile::exists(topsourceDirectory() + "/autogen.sh")) + else if (TQFile::exists(topsourceDirectory() + "/autogen.sh")) cmdline = "./autogen.sh"; else { KMessageBox::sorry(m_widget, i18n("There is neither a Makefile.cvs file nor an " "autogen.sh script in the project directory.")); - return QString::null; + return TQString::null; } cmdline.prepend(nice); cmdline.prepend(makeEnvironment()); - QString dircmd = "cd "; + TQString dircmd = "cd "; dircmd += KProcess::quote(topsourceDirectory()); dircmd += " && "; @@ -1024,7 +1024,7 @@ QString AutoProjectPart::makefileCvsCommand() const void AutoProjectPart::slotMakefilecvs() { - QString cmdline = makefileCvsCommand(); + TQString cmdline = makefileCvsCommand(); if ( cmdline.isNull() ) return; @@ -1034,7 +1034,7 @@ void AutoProjectPart::slotMakefilecvs() void AutoProjectPart::slotInstall() { - startMakeCommand(buildDirectory(), QString::fromLatin1("install")); + startMakeCommand(buildDirectory(), TQString::fromLatin1("install")); } @@ -1045,25 +1045,25 @@ void AutoProjectPart::slotInstallWithKdesu() slotBuild(); // After that issue "make install" with the root user - startMakeCommand(buildDirectory(), QString::fromLatin1("install"), true); + startMakeCommand(buildDirectory(), TQString::fromLatin1("install"), true); } void AutoProjectPart::slotClean() { - startMakeCommand(buildDirectory(), QString::fromLatin1("clean")); + startMakeCommand(buildDirectory(), TQString::fromLatin1("clean")); } void AutoProjectPart::slotDistClean() { - startMakeCommand(buildDirectory(), QString::fromLatin1("distclean")); + startMakeCommand(buildDirectory(), TQString::fromLatin1("distclean")); } void AutoProjectPart::slotMakeMessages() { - startMakeCommand(buildDirectory(), QString::fromLatin1("package-messages")); + startMakeCommand(buildDirectory(), TQString::fromLatin1("package-messages")); } @@ -1076,7 +1076,7 @@ void AutoProjectPart::slotMakeMessages() void AutoProjectPart::slotExecute() { partController()->saveAllFiles(); - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); m_runProg=m_runProg.isEmpty()?mainProgram():m_runProg; @@ -1103,7 +1103,7 @@ void AutoProjectPart::slotExecute() if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/autokdesu", false) ){ //slotInstallWithKdesu assumes that it hasn't just been build... kdDebug(9020) << "slotExecute: before startMakeCommand" << endl; - _auto ? slotInstallWithKdesu() : startMakeCommand(buildDirectory(), QString::fromLatin1("install"), true); + _auto ? slotInstallWithKdesu() : startMakeCommand(buildDirectory(), TQString::fromLatin1("install"), true); } else{ kdDebug(9020) << "slotExecute: before slotInstall" << endl; @@ -1120,7 +1120,7 @@ void AutoProjectPart::slotExecute() if (appFrontend()->isRunning()) { if (KMessageBox::questionYesNo(m_widget, i18n("Your application is currently running. Do you want to restart it?"), i18n("Application Already Running"), i18n("&Restart Application"), i18n("Do &Nothing")) == KMessageBox::No) return; - connect(appFrontend(), SIGNAL(processExited()), SLOT(slotExecute2())); + connect(appFrontend(), TQT_SIGNAL(processExited()), TQT_SLOT(slotExecute2())); appFrontend()->stopApplication(); return; } @@ -1128,30 +1128,30 @@ void AutoProjectPart::slotExecute() slotExecute2(); } -void AutoProjectPart::executeTarget(const QDir& dir, const TargetItem* titem) +void AutoProjectPart::executeTarget(const TQDir& dir, const TargetItem* titem) { m_executeAfterBuild=true; partController()->saveAllFiles(); bool is_dirty = false; - QDateTime t = QFileInfo(dir , titem->name ).lastModified(); - QPtrListIterator<FileItem> it( titem->sources ); + TQDateTime t = TQFileInfo(dir , titem->name ).lastModified(); + TQPtrListIterator<FileItem> it( titem->sources ); for( ; it.current() ; ++it ) { - if( t < QFileInfo(dir , (*it)->name).lastModified()) + if( t < TQFileInfo(dir , (*it)->name).lastModified()) is_dirty = true; } if( DomUtil::readBoolEntry(*projectDom(), "/kdevautoproject/run/autocompile", true) && is_dirty ) { - connect( makeFrontend(), SIGNAL(commandFinished(const QString&)), this, SLOT(slotExecuteTargetAfterBuild(const QString&)) ); - connect( makeFrontend(), SIGNAL(commandFailed(const QString&)), this, SLOT(slotNotExecuteTargetAfterBuildFailed(const QString&)) ); + connect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), this, TQT_SLOT(slotExecuteTargetAfterBuild(const TQString&)) ); + connect( makeFrontend(), TQT_SIGNAL(commandFailed(const TQString&)), this, TQT_SLOT(slotNotExecuteTargetAfterBuildFailed(const TQString&)) ); m_runProg=titem->name; m_executeTargetAfterBuild.first = dir; m_executeTargetAfterBuild.second = const_cast<TargetItem*>(titem); - QString relpath = "/" + URLUtil::getRelativePath( topsourceDirectory(), projectDirectory() ) + "/" + m_widget->selectedSubproject()->subdir; + TQString relpath = "/" + URLUtil::getRelativePath( topsourceDirectory(), projectDirectory() ) + "/" + m_widget->selectedSubproject()->subdir; kdDebug(9020) << "executeTarget: before buildTarget " << relpath << endl; buildTarget(relpath, const_cast<TargetItem*>(titem)); return; @@ -1160,7 +1160,7 @@ void AutoProjectPart::executeTarget(const QDir& dir, const TargetItem* titem) bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevautoproject/run/terminal"); - QString program = environString(); + TQString program = environString(); if ( !titem ) { KMessageBox::error( m_widget, i18n("There is no active target.\n" @@ -1177,7 +1177,7 @@ void AutoProjectPart::executeTarget(const QDir& dir, const TargetItem* titem) }else program += buildDirectory() + "/" + URLUtil::getRelativePath( topsourceDirectory(), projectDirectory() ) + "/" + m_widget->selectedSubproject()->relativePath()+ "/" + titem->name; - QString args = DomUtil::readEntry(*projectDom(), "/kdevautoproject/run/runarguments/" + titem->name); + TQString args = DomUtil::readEntry(*projectDom(), "/kdevautoproject/run/runarguments/" + titem->name); program += " " + args; kdDebug(9020) << "executeTarget:cmd=" << dir.path() << " " << program << endl; @@ -1186,27 +1186,27 @@ void AutoProjectPart::executeTarget(const QDir& dir, const TargetItem* titem) } -void AutoProjectPart::slotExecuteTargetAfterBuild(const QString& command) +void AutoProjectPart::slotExecuteTargetAfterBuild(const TQString& command) { kdDebug(9020) << "slotExecuteTargetAfterBuild " << command << endl; if ( m_executeAfterBuild && constructMakeCommandLine(m_executeTargetAfterBuild.first.path(), m_executeTargetAfterBuild.second->name) == command ) { - disconnect( makeFrontend(), SIGNAL(commandFinished(const QString&)), this, SLOT(slotExecuteAfterTargetBuild()) ); - disconnect( makeFrontend(), SIGNAL(commandFailed(const QString&)), this, SLOT(slotExecuteAfterTargetBuildFailed()) ); + disconnect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), this, TQT_SLOT(slotExecuteAfterTargetBuild()) ); + disconnect( makeFrontend(), TQT_SIGNAL(commandFailed(const TQString&)), this, TQT_SLOT(slotExecuteAfterTargetBuildFailed()) ); kdDebug(9020) << "slotExecuteTargetAfterBuild " << endl; executeTarget(m_executeTargetAfterBuild.first, m_executeTargetAfterBuild.second); } } -void AutoProjectPart::slotNotExecuteTargetAfterBuildFailed(const QString& command) +void AutoProjectPart::slotNotExecuteTargetAfterBuildFailed(const TQString& command) { kdDebug(9020) << "executeTargetAfterBuildFailed" << endl; if ( constructMakeCommandLine(m_executeTargetAfterBuild.first.path(), m_executeTargetAfterBuild.second->name) == command ) { m_executeAfterBuild=false; - disconnect( makeFrontend(), SIGNAL(commandFinished(const QString&)), this, SLOT(slotExecuteTargetAfterBuild()) ); - disconnect( makeFrontend(), SIGNAL(commandFailed(const QString&)), this, SLOT(slotNotExecuteTargetAfterBuildFailed()) ); + disconnect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), this, TQT_SLOT(slotExecuteTargetAfterBuild()) ); + disconnect( makeFrontend(), TQT_SIGNAL(commandFailed(const TQString&)), this, TQT_SLOT(slotNotExecuteTargetAfterBuildFailed()) ); } } @@ -1215,10 +1215,10 @@ void AutoProjectPart::slotNotExecuteTargetAfterBuildFailed(const QString& comman * in the form of: "ENV_VARIABLE=ENV_VALUE" * Note that we quote the variable value due to the possibility of * embedded spaces. */ -QString AutoProjectPart::environString() const +TQString AutoProjectPart::environString() const { DomUtil::PairList envvars = runEnvironmentVars(); - QString environstr; + TQString environstr; DomUtil::PairList::ConstIterator it; for (it = envvars.begin(); it != envvars.end(); ++it) { environstr += (*it).first; @@ -1235,14 +1235,14 @@ QString AutoProjectPart::environString() const */ void AutoProjectPart::slotExecute2() { - disconnect(appFrontend(), SIGNAL(processExited()), this, SLOT(slotExecute2())); + disconnect(appFrontend(), TQT_SIGNAL(processExited()), this, TQT_SLOT(slotExecute2())); if (m_runProg.isEmpty()){ // Do not execute non executable targets return; } - QString program = environString(); + TQString program = environString(); // Adds the ./ that is necessary to execute the program in bash shells if (!m_runProg.startsWith("/")){ program += "./"; @@ -1271,7 +1271,7 @@ void AutoProjectPart::slotAddTranslation() } -void AutoProjectPart::slotBuildConfigChanged(const QString &config) +void AutoProjectPart::slotBuildConfigChanged(const TQString &config) { DomUtil::writeEntry(*projectDom(), "/kdevautoproject/general/useconfiguration", config); kdDebug(9020) << "Changed used configuration to " << config << endl; @@ -1280,19 +1280,19 @@ void AutoProjectPart::slotBuildConfigChanged(const QString &config) void AutoProjectPart::slotBuildConfigAboutToShow() { - QStringList l = allBuildConfigs(); + TQStringList l = allBuildConfigs(); buildConfigAction->setItems(l); buildConfigAction->setCurrentItem(l.findIndex(currentBuildConfig())); } -void AutoProjectPart::restorePartialProjectSession ( const QDomElement* el ) +void AutoProjectPart::restorePartialProjectSession ( const TQDomElement* el ) { m_widget->restoreSession ( el ); } -void AutoProjectPart::savePartialProjectSession ( QDomElement* el ) +void AutoProjectPart::savePartialProjectSession ( TQDomElement* el ) { - QDomDocument domDoc = el->ownerDocument(); + TQDomDocument domDoc = el->ownerDocument(); KMessageBox::information ( 0, "Hallo, Welt!" ); @@ -1309,23 +1309,23 @@ void AutoProjectPart::savePartialProjectSession ( QDomElement* el ) m_widget->saveSession ( el ); } -void AutoProjectPart::slotCommandFinished( const QString& command ) +void AutoProjectPart::slotCommandFinished( const TQString& command ) { kdDebug(9020) << k_funcinfo << endl; if( m_buildCommand != command ) return; - m_buildCommand = QString::null; + m_buildCommand = TQString::null; m_timestamp.clear(); - QStringList fileList = allFiles(); - QStringList::Iterator it = fileList.begin(); + TQStringList fileList = allFiles(); + TQStringList::Iterator it = fileList.begin(); while( it != fileList.end() ){ - QString fileName = *it; + TQString fileName = *it; ++it; - m_timestamp[ fileName ] = QFileInfo( projectDirectory(), fileName ).lastModified(); + m_timestamp[ fileName ] = TQFileInfo( projectDirectory(), fileName ).lastModified(); } emit projectCompiled(); @@ -1338,7 +1338,7 @@ void AutoProjectPart::slotCommandFinished( const QString& command ) } } -void AutoProjectPart::slotCommandFailed( const QString& /*command*/ ) +void AutoProjectPart::slotCommandFailed( const TQString& /*command*/ ) { kdDebug(9020) << "slotCommandFinished " << k_funcinfo << endl; @@ -1350,14 +1350,14 @@ bool AutoProjectPart::isDirty() { if (m_lastCompilationFailed) return true; - QStringList fileList = allFiles(); - QStringList::Iterator it = fileList.begin(); + TQStringList fileList = allFiles(); + TQStringList::Iterator it = fileList.begin(); while( it != fileList.end() ){ - QString fileName = *it; + TQString fileName = *it; ++it; - QMap<QString, QDateTime>::Iterator it = m_timestamp.find( fileName ); - QDateTime t = QFileInfo( projectDirectory(), fileName ).lastModified(); + TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( fileName ); + TQDateTime t = TQFileInfo( projectDirectory(), fileName ).lastModified(); if( it == m_timestamp.end() || *it != t ){ return true; } @@ -1381,25 +1381,25 @@ KDevProject::Options AutoProjectPart::options() const return UsesAutotoolsBuildSystem; } -QStringList recursiveATFind( const QString &currDir, const QString &baseDir ) +TQStringList recursiveATFind( const TQString &currDir, const TQString &baseDir ) { kdDebug(9020) << "Dir " << currDir << endl; - QStringList fileList; + TQStringList fileList; if( !currDir.contains( "/..") && !currDir.contains("/.") ) { - QDir dir(currDir); - QStringList dirList = dir.entryList(QDir::Dirs ); - QStringList::Iterator idx = dirList.begin(); + TQDir dir(currDir); + TQStringList dirList = dir.entryList(TQDir::Dirs ); + TQStringList::Iterator idx = dirList.begin(); for( ; idx != dirList.end(); ++idx ) { fileList += recursiveATFind( currDir + "/" + (*idx),baseDir ); } - QStringList newFiles = dir.entryList("*.am *.in"); + TQStringList newFiles = dir.entryList("*.am *.in"); idx = newFiles.begin(); for( ; idx != newFiles.end(); ++idx ) { - QString file = currDir + "/" + (*idx); + TQString file = currDir + "/" + (*idx); fileList.append( file.remove( baseDir ) ); } } @@ -1411,21 +1411,21 @@ QStringList recursiveATFind( const QString &currDir, const QString &baseDir ) /*! \fn AutoProjectPart::distFiles() const */ -QStringList AutoProjectPart::distFiles() const +TQStringList AutoProjectPart::distFiles() const { - QStringList sourceList = allFiles(); + TQStringList sourceList = allFiles(); // Scan current source directory for any .pro files. - QString projectDir = projectDirectory(); - QDir dir(projectDir); - QDir admin(projectDir +"/admin"); - QStringList files = dir.entryList( "Makefile.cvs Makefile.am configure* INSTALL README NEWS TODO ChangeLog COPYING AUTHORS stamp-h.in acinclude.m4 config.h.in Makefile.in install-sh config.sub config.guess mkinstalldirs missing ltmain.sh depcomp"); - QStringList adminFiles = admin.entryList(QDir::Files); - QStringList::Iterator idx = adminFiles.begin(); + TQString projectDir = projectDirectory(); + TQDir dir(projectDir); + TQDir admin(projectDir +"/admin"); + TQStringList files = dir.entryList( "Makefile.cvs Makefile.am configure* INSTALL README NEWS TODO ChangeLog COPYING AUTHORS stamp-h.in acinclude.m4 config.h.in Makefile.in install-sh config.sub config.guess mkinstalldirs missing ltmain.sh depcomp"); + TQStringList adminFiles = admin.entryList(TQDir::Files); + TQStringList::Iterator idx = adminFiles.begin(); for( ; idx != adminFiles.end(); ++idx) { files.append( "admin/" + (*idx) ); } - QStringList srcDirs = dir.entryList(QDir::Dirs); + TQStringList srcDirs = dir.entryList(TQDir::Dirs); idx = srcDirs.begin(); for(; idx != srcDirs.end(); ++idx) { @@ -1434,17 +1434,17 @@ QStringList AutoProjectPart::distFiles() const return sourceList + files; } -void AutoProjectPart::startSimpleMakeCommand( const QString & dir, const QString & command, bool withKdesu ) +void AutoProjectPart::startSimpleMakeCommand( const TQString & dir, const TQString & command, bool withKdesu ) { if (partController()->saveAllFiles()==false) return; //user cancelled // m_buildCommand = constructMakeCommandLine(dir, target); - QString cmdline = command; + TQString cmdline = command; cmdline.prepend(makeEnvironment()); - QString dircmd = "cd "; + TQString dircmd = "cd "; dircmd += KProcess::quote(dir); dircmd += " && "; @@ -1457,10 +1457,10 @@ void AutoProjectPart::startSimpleMakeCommand( const QString & dir, const QString makeFrontend()->queueCommand(dir, m_buildCommand); } -QString AutoProjectPart::getAutoConfFile(const QString& dir){ +TQString AutoProjectPart::getAutoConfFile(const TQString& dir){ - QFile inFile(dir + "/configure.in"); - QFile acFile(dir + "/configure.ac"); + TQFile inFile(dir + "/configure.in"); + TQFile acFile(dir + "/configure.ac"); if ( inFile.exists()){ return inFile.name(); }else if (acFile.exists()){ diff --git a/buildtools/autotools/autoprojectpart.h b/buildtools/autotools/autoprojectpart.h index d0862cc3..c48e2fe7 100644 --- a/buildtools/autotools/autoprojectpart.h +++ b/buildtools/autotools/autoprojectpart.h @@ -15,11 +15,11 @@ #ifndef _AUTOPROJECTPART_H_ #define _AUTOPROJECTPART_H_ -#include <qdict.h> -#include <qguardedptr.h> -#include <qmap.h> -#include <qdatetime.h> -#include <qdir.h> +#include <tqdict.h> +#include <tqguardedptr.h> +#include <tqmap.h> +#include <tqdatetime.h> +#include <tqdir.h> #include <kdevgenericfactory.h> #include "kdevbuildtool.h" @@ -36,58 +36,58 @@ class AutoProjectPart : public KDevBuildTool Q_OBJECT public: - AutoProjectPart( QObject *parent, const char *name, const QStringList &args ); + AutoProjectPart( TQObject *parent, const char *name, const TQStringList &args ); virtual ~AutoProjectPart(); /** * Implementation of the KDevProject interface. */ - virtual QString projectDirectory() const; - virtual QString projectName() const; + virtual TQString projectDirectory() const; + virtual TQString projectName() const; virtual DomUtil::PairList runEnvironmentVars() const; - virtual QString runDirectory() const; - virtual QString mainProgram() const; - virtual QString debugArguments() const; - virtual QString runArguments() const; - virtual QString environString() const; - virtual QString activeDirectory() const; - virtual QStringList allFiles() const; - virtual void addFile( const QString &fileName ); - virtual void addFiles ( const QStringList& fileList ); - virtual void removeFile( const QString &fileName ); - virtual void removeFiles ( const QStringList& fileList ); - virtual QString buildDirectory() const; + virtual TQString runDirectory() const; + virtual TQString mainProgram() const; + virtual TQString debugArguments() const; + virtual TQString runArguments() const; + virtual TQString environString() const; + virtual TQString activeDirectory() const; + virtual TQStringList allFiles() const; + virtual void addFile( const TQString &fileName ); + virtual void addFiles ( const TQStringList& fileList ); + virtual void removeFile( const TQString &fileName ); + virtual void removeFiles ( const TQStringList& fileList ); + virtual TQString buildDirectory() const; virtual Options options() const; /** * Implementation of the KDevPlugin interface. */ - virtual void restorePartialProjectSession ( const QDomElement* el ); - virtual void savePartialProjectSession ( QDomElement* el ); + virtual void restorePartialProjectSession ( const TQDomElement* el ); + virtual void savePartialProjectSession ( TQDomElement* el ); /** * automake specific methods. */ - QStringList allBuildConfigs() const; - QString currentBuildConfig() const; - QString topsourceDirectory() const; - void startMakeCommand( const QString &dir, const QString &target, bool withKdesu = false ); - void startSimpleMakeCommand( const QString &dir, const QString &command, bool withKdesu = false ); - void buildTarget( QString relpath, TargetItem* titem ); - void executeTarget( const QDir& dir, const TargetItem* titem ); + TQStringList allBuildConfigs() const; + TQString currentBuildConfig() const; + TQString topsourceDirectory() const; + void startMakeCommand( const TQString &dir, const TQString &target, bool withKdesu = false ); + void startSimpleMakeCommand( const TQString &dir, const TQString &command, bool withKdesu = false ); + void buildTarget( TQString relpath, TargetItem* titem ); + void executeTarget( const TQDir& dir, const TargetItem* titem ); void needMakefileCvs(); bool isDirty(); bool isKDE() const; - QStringList distFiles() const; - QString getAutoConfFile(const QString& dir); + TQStringList distFiles() const; + TQString getAutoConfFile(const TQString& dir); protected: /** * Reimplemented from KDevProject. These methods are only * for use by the application core. */ - virtual void openProject( const QString &dirName, const QString &projectName ); + virtual void openProject( const TQString &dirName, const TQString &projectName ); virtual void closeProject(); private slots: @@ -105,35 +105,35 @@ private slots: void slotConfigure(); void slotExecute(); void slotExecute2(); - void slotExecuteTargetAfterBuild( const QString& command ); - void slotNotExecuteTargetAfterBuildFailed( const QString& command ); - void slotBuildConfigChanged( const QString &config ); + void slotExecuteTargetAfterBuild( const TQString& command ); + void slotNotExecuteTargetAfterBuildFailed( const TQString& command ); + void slotBuildConfigChanged( const TQString &config ); void slotBuildConfigAboutToShow(); - void slotCommandFinished( const QString& command ); - void slotCommandFailed( const QString& command ); + void slotCommandFinished( const TQString& command ); + void slotCommandFailed( const TQString& command ); //void slotImportExisting(); - void insertConfigWidget( const KDialogBase* dlg, QWidget * page, unsigned int ); + void insertConfigWidget( const KDialogBase* dlg, TQWidget * page, unsigned int ); private: - QGuardedPtr<AutoProjectWidget> m_widget; - QString m_projectName; - QString m_projectPath; + TQGuardedPtr<AutoProjectWidget> m_widget; + TQString m_projectName; + TQString m_projectPath; KSelectAction *buildConfigAction; - QString makeEnvironment() const; + TQString makeEnvironment() const; void setWantautotools(); - QString makefileCvsCommand() const; - QString configureCommand() const; + TQString makefileCvsCommand() const; + TQString configureCommand() const; - QMap<QString, QDateTime> m_timestamp; + TQMap<TQString, TQDateTime> m_timestamp; bool m_executeAfterBuild; - QString m_buildCommand; + TQString m_buildCommand; bool m_needMakefileCvs; bool m_lastCompilationFailed; bool m_isKDE; - QPair<QDir, TargetItem*> m_executeTargetAfterBuild; - QString m_runProg; + QPair<TQDir, TargetItem*> m_executeTargetAfterBuild; + TQString m_runProg; ConfigWidgetProxy * _configProxy; @@ -143,8 +143,8 @@ private: friend class FileItem; // For make commands queuing - QString constructMakeCommandLine( const QString &dir, const QString &target ) const; - bool queueInternalLibDependenciesBuild( TargetItem* titem, QStringList& list ); + TQString constructMakeCommandLine( const TQString &dir, const TQString &target ) const; + bool queueInternalLibDependenciesBuild( TargetItem* titem, TQStringList& list ); }; typedef KDevGenericFactory<AutoProjectPart> AutoProjectFactory; diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp index c3248504..321aa349 100644 --- a/buildtools/autotools/autoprojectwidget.cpp +++ b/buildtools/autotools/autoprojectwidget.cpp @@ -17,20 +17,20 @@ #include "autoprojectwidget.h" -#include <qcheckbox.h> -#include <qdom.h> -#include <qfile.h> -#include <qheader.h> -#include <qpainter.h> -#include <qptrstack.h> -#include <qregexp.h> -#include <qsplitter.h> -#include <qstringlist.h> -#include <qtextstream.h> -#include <qtoolbutton.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qtimer.h> +#include <tqcheckbox.h> +#include <tqdom.h> +#include <tqfile.h> +#include <tqheader.h> +#include <tqpainter.h> +#include <tqptrstack.h> +#include <tqregexp.h> +#include <tqsplitter.h> +#include <tqstringlist.h> +#include <tqtextstream.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqtimer.h> #include <kdebug.h> #include <kfiledialog.h> @@ -55,7 +55,7 @@ #include "urlutil.h" #include "makefilehandler.h" -static QString nicePrimary( const QString &primary ) +static TQString nicePrimary( const TQString &primary ) { if ( primary == "PROGRAMS" ) return i18n( "Program" ); @@ -72,12 +72,12 @@ static QString nicePrimary( const QString &primary ) else if ( primary == "JAVA" ) return i18n( "Java" ); else - return QString::null; + return TQString::null; } AutoProjectWidget::AutoProjectWidget( AutoProjectPart *part, bool kde ) - : QVBox( 0, "auto project widget" ) + : TQVBox( 0, "auto project widget" ) { m_part = part; m_kdeMode = kde; @@ -87,7 +87,7 @@ AutoProjectWidget::AutoProjectWidget( AutoProjectPart *part, bool kde ) m_choosenTarget = 0; m_makefileHandler = new MakefileHandler(); - QSplitter *splitter = new QSplitter(Vertical, this); + TQSplitter *splitter = new TQSplitter(Vertical, this); initOverview ( splitter ); initDetailview ( splitter ); @@ -101,20 +101,20 @@ AutoProjectWidget::~AutoProjectWidget() delete m_makefileHandler; } -void AutoProjectWidget::initOverview ( QWidget* parent ) +void AutoProjectWidget::initOverview ( TQWidget* parent ) { m_subprojectView = new AutoSubprojectView( this, m_part, parent, "project overview widget" ); } -void AutoProjectWidget::initDetailview ( QWidget* parent ) +void AutoProjectWidget::initDetailview ( TQWidget* parent ) { m_detailView = new AutoDetailsView( this, m_part, parent, "project details widget" ); } void AutoProjectWidget::initActions() { - connect( m_subprojectView, SIGNAL( selectionChanged( QListViewItem* ) ), - this, SLOT( slotOverviewSelectionChanged( QListViewItem* ) ) ); + connect( m_subprojectView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQT_SLOT( slotOverviewSelectionChanged( TQListViewItem* ) ) ); } AutoSubprojectView* AutoProjectWidget::getSubprojectView () @@ -127,7 +127,7 @@ AutoDetailsView* AutoProjectWidget::getDetailsView () return m_detailView; } -void AutoProjectWidget::openProject( const QString &dirName ) +void AutoProjectWidget::openProject( const TQString &dirName ) { m_subprojectView->loadMakefileams ( dirName ); MakefileHandler mfh; @@ -153,29 +153,29 @@ TargetItem* AutoProjectWidget::activeTarget () return m_activeTarget; } -QStringList AutoProjectWidget::allSubprojects() +TQStringList AutoProjectWidget::allSubprojects() { int prefixlen = m_part->projectDirectory().length() + 1; - QStringList res; + TQStringList res; - QListViewItemIterator it( m_subprojectView->listView() ); + TQListViewItemIterator it( m_subprojectView->listView() ); for ( ; it.current(); ++it ) { // Skip root subproject // if ( it.current() == m_subprojectView->firstChild() ) // continue; - QString path = static_cast<SubprojectItem*>( it.current() ) ->path; + TQString path = static_cast<SubprojectItem*>( it.current() ) ->path; res.append( path.mid( prefixlen ) ); } return res; } -QPtrList <SubprojectItem> AutoProjectWidget::allSubprojectItems() +TQPtrList <SubprojectItem> AutoProjectWidget::allSubprojectItems() { - QPtrList <SubprojectItem> res; + TQPtrList <SubprojectItem> res; - QListViewItemIterator it ( m_subprojectView->listView() ); + TQListViewItemIterator it ( m_subprojectView->listView() ); for ( ; it.current(); ++it ) { @@ -190,16 +190,16 @@ QPtrList <SubprojectItem> AutoProjectWidget::allSubprojectItems() return res; } -SubprojectItem* AutoProjectWidget::subprojectItemForPath(const QString & path, bool pathIsAbsolute) +SubprojectItem* AutoProjectWidget::subprojectItemForPath(const TQString & path, bool pathIsAbsolute) { kdDebug(9020) << "Looking for path " << path << endl; int prefixLen = m_part->projectDirectory().length() + 1; - QListViewItemIterator it( m_subprojectView->listView() ); + TQListViewItemIterator it( m_subprojectView->listView() ); for(; it.current(); ++it) { SubprojectItem* spitem = static_cast<SubprojectItem*>(it.current() ); - QString relpath = (spitem->path).mid(prefixLen); + TQString relpath = (spitem->path).mid(prefixLen); kdDebug(9020) << " ... checking -" << spitem->path << "-" << endl; kdDebug(9020) << " ... (tailored: -" << relpath << "- against -" << (pathIsAbsolute ? path.mid(prefixLen) : path) << "- )" << endl; if ( relpath == (pathIsAbsolute ? path.mid(prefixLen) : path)) @@ -212,15 +212,15 @@ SubprojectItem* AutoProjectWidget::subprojectItemForPath(const QString & path, b return NULL; } -QString AutoProjectWidget::pathForTarget(const TargetItem *titem) const +TQString AutoProjectWidget::pathForTarget(const TargetItem *titem) const { if (!titem) - return QString::null; + return TQString::null; kdDebug(9020) << "Looking for target " << titem->name << endl; int prefixLen = m_part->projectDirectory().length() + 1; - QListViewItemIterator it( m_subprojectView->listView() ); + TQListViewItemIterator it( m_subprojectView->listView() ); for(; it.current(); ++it) { SubprojectItem* spitem = static_cast<SubprojectItem*>(it.current() ); @@ -228,31 +228,31 @@ QString AutoProjectWidget::pathForTarget(const TargetItem *titem) const if (spitem->targets.containsRef(titem)) { kdDebug(9020) << "Found it!" << endl; - QString relpath = (spitem->path).mid(prefixLen); + TQString relpath = (spitem->path).mid(prefixLen); return relpath; } } kdDebug(9020) << "Not found" << endl; - return QString::null; + return TQString::null; } -QStringList AutoProjectWidget::allLibraries() +TQStringList AutoProjectWidget::allLibraries() { int prefixlen = m_part->projectDirectory().length() + 1; - QStringList res; + TQStringList res; - QListViewItemIterator it( m_subprojectView->listView() ); + TQListViewItemIterator it( m_subprojectView->listView() ); for ( ; it.current(); ++it ) { SubprojectItem *spitem = static_cast<SubprojectItem*>( it.current() ); - QString path = spitem->path; - QPtrListIterator<TargetItem> tit( spitem->targets ); + TQString path = spitem->path; + TQPtrListIterator<TargetItem> tit( spitem->targets ); for ( ; tit.current(); ++tit ) { - QString primary = ( *tit ) ->primary; + TQString primary = ( *tit ) ->primary; if ( primary == "LIBRARIES" || primary == "LTLIBRARIES" ) { - QString fullname = path + "/" + ( *tit ) ->name; + TQString fullname = path + "/" + ( *tit ) ->name; res.append( fullname.mid( prefixlen ) ); } } @@ -262,12 +262,12 @@ QStringList AutoProjectWidget::allLibraries() } -QStringList AutoProjectWidget::allFiles() +TQStringList AutoProjectWidget::allFiles() { - QPtrStack<QListViewItem> s; - QMap<QString, bool> dict; + TQPtrStack<TQListViewItem> s; + TQMap<TQString, bool> dict; - for ( QListViewItem * item = m_subprojectView->listView()->firstChild(); item; + for ( TQListViewItem * item = m_subprojectView->listView()->firstChild(); item; item = item->nextSibling() ? item->nextSibling() : s.pop() ) { if ( item->firstChild() ) @@ -275,18 +275,18 @@ QStringList AutoProjectWidget::allFiles() SubprojectItem *spitem = static_cast<SubprojectItem*>( item ); // use URLUtil so paths in root project dir are worked out correctly - QString relPath = URLUtil::relativePath(m_part->projectDirectory(), spitem->path, URLUtil::SLASH_SUFFIX); - QPtrListIterator<TargetItem> tit( spitem->targets ); + TQString relPath = URLUtil::relativePath(m_part->projectDirectory(), spitem->path, URLUtil::SLASH_SUFFIX); + TQPtrListIterator<TargetItem> tit( spitem->targets ); for ( ; tit.current(); ++tit ) { - QPtrListIterator<FileItem> fit( tit.current() ->sources ); + TQPtrListIterator<FileItem> fit( tit.current() ->sources ); for ( ; fit.current(); ++fit ) { if((*fit)->is_subst) continue; - QFileInfo fileInfo( (*fit)->name ); + TQFileInfo fileInfo( (*fit)->name ); if( fileInfo.extension() == "ui" ) { dict.insert( relPath + fileInfo.baseName() + ".h", true ); @@ -300,8 +300,8 @@ QStringList AutoProjectWidget::allFiles() // Files may be in multiple targets, so we have to remove // duplicates - QStringList res; - QMap<QString, bool>::Iterator it = dict.begin(); + TQStringList res; + TQMap<TQString, bool>::Iterator it = dict.begin(); while( it != dict.end() ){ res << it.key(); ++it; @@ -311,36 +311,36 @@ QStringList AutoProjectWidget::allFiles() } -QString AutoProjectWidget::subprojectDirectory() +TQString AutoProjectWidget::subprojectDirectory() { if ( !selectedSubproject() ) - return QString::null; + return TQString::null; return selectedSubproject()->path; } -void AutoProjectWidget::setActiveTarget( const QString &targetPath ) +void AutoProjectWidget::setActiveTarget( const TQString &targetPath ) { int prefixlen = m_part->projectDirectory().length() + 1; - QString olddir = m_part->activeDirectory(); + TQString olddir = m_part->activeDirectory(); m_activeSubproject = 0; m_activeTarget = 0; - QListViewItemIterator it( m_subprojectView->listView() ); + TQListViewItemIterator it( m_subprojectView->listView() ); for ( ; it.current(); ++it ) { SubprojectItem *spitem = static_cast<SubprojectItem*>( it.current() ); - QString path = spitem->path; - QPtrListIterator<TargetItem> tit( spitem->targets ); + TQString path = spitem->path; + TQPtrListIterator<TargetItem> tit( spitem->targets ); for ( ; tit.current(); ++tit ) { - QString primary = ( *tit ) ->primary; + TQString primary = ( *tit ) ->primary; if ( primary != "PROGRAMS" && primary != "LIBRARIES" && primary != "LTLIBRARIES" && primary != "JAVA" ) continue; - QString currentTargetPath = ( path + "/" + ( *tit ) ->name ).mid( prefixlen ); + TQString currentTargetPath = ( path + "/" + ( *tit ) ->name ).mid( prefixlen ); bool hasTarget = ( targetPath == currentTargetPath ); ( *tit )->setBold( hasTarget ); @@ -378,7 +378,7 @@ void AutoProjectWidget::setActiveTarget( const QString &targetPath ) } -QString AutoProjectWidget::activeDirectory() +TQString AutoProjectWidget::activeDirectory() { if ( m_activeSubproject ) return m_activeSubproject->path.mid( m_part->projectDirectory().length() + 1 ); @@ -387,21 +387,21 @@ QString AutoProjectWidget::activeDirectory() /* if ( selectedSubproject() ) return selectedSubproject()->path; else*/ - return QString::null; + return TQString::null; } } -void AutoProjectWidget::addFiles( const QStringList &list ) +void AutoProjectWidget::addFiles( const TQStringList &list ) { - QDomDocument &dom = *m_part->projectDom(); - QStringList fileList = list; + TQDomDocument &dom = *m_part->projectDom(); + TQStringList fileList = list; if ( DomUtil::readBoolEntry( dom, "/kdevautoproject/general/useactivetarget" ) ) { - QStringList::iterator it; + TQStringList::iterator it; - QString fileName; + TQString fileName; for ( it = fileList.begin(); it != fileList.end(); ++it ) { @@ -422,7 +422,7 @@ void AutoProjectWidget::addFiles( const QStringList &list ) { TargetItem *titem = dynamic_cast <TargetItem*> ( m_detailView->listView()->selectedItem() ); SubprojectItem * subitem = dynamic_cast <SubprojectItem*> ( m_subprojectView->listView()->selectedItem() ); - QString relativeDir = URLUtil::directory(*it); + TQString relativeDir = URLUtil::directory(*it); SubprojectItem* spitem = subprojectItemForPath(relativeDir); if( titem && subitem && subitem == spitem ) @@ -437,11 +437,11 @@ void AutoProjectWidget::addFiles( const QStringList &list ) addToTarget(fileName, m_activeSubproject, m_activeTarget); } -// QString canontargetname = AutoProjectTool::canonicalize( m_activeTarget->name ); -// QString varname = canontargetname + "_SOURCES"; +// TQString canontargetname = AutoProjectTool::canonicalize( m_activeTarget->name ); +// TQString varname = canontargetname + "_SOURCES"; // m_activeSubproject->variables[ varname ] += ( " " + fileName ); // -// QMap<QString, QString> replaceMap; +// TQMap<TQString, TQString> replaceMap; // replaceMap.insert( varname, m_activeSubproject->variables[ varname ] ); // // AutoProjectTool::addToMakefileam( m_activeSubproject->path + "/Makefile.am", replaceMap ); @@ -451,18 +451,18 @@ void AutoProjectWidget::addFiles( const QStringList &list ) } else { - QStringList doManually, doneAutomatically; + TQStringList doManually, doneAutomatically; // First check wether the detail view has a selected target and the subproject // view selected subproject matches the path of the new file. Then // we can assume the user used the right-click option on the target - for( QStringList::iterator it = fileList.begin(); it != fileList.end(); ++it) + for( TQStringList::iterator it = fileList.begin(); it != fileList.end(); ++it) { bool autoAdded = false; if( m_detailView->listView()->selectedItem() && m_subprojectView->listView()->selectedItem() ) { TargetItem *titem = dynamic_cast <TargetItem*> ( m_detailView->listView()->selectedItem() ); SubprojectItem * subitem = dynamic_cast <SubprojectItem*> ( m_subprojectView->listView()->selectedItem() ); - QString relativeDir = URLUtil::directory(*it); + TQString relativeDir = URLUtil::directory(*it); SubprojectItem* spitem = subprojectItemForPath(relativeDir); if( titem && subitem && subitem == spitem ) { @@ -477,16 +477,16 @@ void AutoProjectWidget::addFiles( const QStringList &list ) // See if we can figure out the target for each file without asking the user // I think it's a valid assumption that if a directory contains only one target // the file can be added to that target (Julian Rockey linux at jrockey.com) - QStringList temp = doManually; + TQStringList temp = doManually; doManually.clear(); - for(QStringList::iterator it = temp.begin();it!=temp.end();++it) + for(TQStringList::iterator it = temp.begin();it!=temp.end();++it) { bool autoAdded = false; - QString relativeDir = URLUtil::directory(*it); + TQString relativeDir = URLUtil::directory(*it); SubprojectItem* spitem = subprojectItemForPath(relativeDir); if (spitem) { - QPtrList<TargetItem> titemList = spitem->targets; + TQPtrList<TargetItem> titemList = spitem->targets; if (titemList.count()==1) { addToTarget( URLUtil::filename(*it), spitem, titemList.first() ); doneAutomatically.append(*it); @@ -511,9 +511,9 @@ void AutoProjectWidget::addFiles( const QStringList &list ) } } -void AutoProjectWidget::addToTarget(const QString & fileName, SubprojectItem* spitem, TargetItem* titem) +void AutoProjectWidget::addToTarget(const TQString & fileName, SubprojectItem* spitem, TargetItem* titem) { - QString varname; + TQString varname; /// \FIXME a quick hack to prevent adding header files to _SOURCES and display them in noinst_HEADERS if (AutoProjectPrivate::isHeader(fileName) && ( titem->primary == "PROGRAMS" || titem->primary == "LIBRARIES" || titem->primary == "LTLIBRARIES" ) ) @@ -531,12 +531,12 @@ void AutoProjectWidget::addToTarget(const QString & fileName, SubprojectItem* sp titem->sources.append( fitem ); titem->insertItem( fitem ); - QString canontargetname = AutoProjectTool::canonicalize( titem->name ); + TQString canontargetname = AutoProjectTool::canonicalize( titem->name ); varname = canontargetname + "_SOURCES"; } spitem->variables[ varname ] += ( " " + fileName ); - QMap<QString, QString> replaceMap; + TQMap<TQString, TQString> replaceMap; replaceMap.insert( varname, spitem->variables[ varname ] ); AutoProjectTool::addToMakefileam( spitem->path + "/Makefile.am", replaceMap ); @@ -544,12 +544,12 @@ void AutoProjectWidget::addToTarget(const QString & fileName, SubprojectItem* sp m_detailView->slotSelectionChanged( spitem ); } -void AutoProjectWidget::removeFiles( const QStringList &list ) +void AutoProjectWidget::removeFiles( const TQStringList &list ) { Q_UNUSED( list ) } -void AutoProjectWidget::slotOverviewSelectionChanged( QListViewItem *item ) +void AutoProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item ) { if ( !item ) return; @@ -560,10 +560,10 @@ void AutoProjectWidget::slotOverviewSelectionChanged( QListViewItem *item ) // Remove all TargetItems and all of their children from the view kdDebug ( 9020 ) << "m_shownSubproject (before takeItem()): " << m_shownSubproject->subdir << endl; - QListViewItem* i = m_detailView->listView()->firstChild(); + TQListViewItem* i = m_detailView->listView()->firstChild(); while( i ) { - QListViewItem* o = i; + TQListViewItem* o = i; i = i->nextSibling(); m_detailView->listView()->takeItem(o); } @@ -576,15 +576,15 @@ void AutoProjectWidget::slotOverviewSelectionChanged( QListViewItem *item ) kdDebug ( 9020 ) << "m_shownSubproject (after takeItem()): " << selectedSubproject()->subdir << endl; // Insert all TargetItems and all of their children into the view - QPtrListIterator<TargetItem> it2( selectedSubproject()->targets ); + TQPtrListIterator<TargetItem> it2( selectedSubproject()->targets ); for ( ; it2.current(); ++it2 ) { kdDebug ( 9020 ) << "insertItem in detail " << ( *it2 )->name << endl; m_detailView->listView()->insertItem( *it2 ); - QPtrListIterator<FileItem> it3( ( *it2 ) ->sources ); + TQPtrListIterator<FileItem> it3( ( *it2 ) ->sources ); for ( ; it3.current(); ++it3 ) ( *it2 )->insertItem( *it3 ); - QString primary = ( *it2 ) ->primary; + TQString primary = ( *it2 ) ->primary; if ( primary == "PROGRAMS" || primary == "LIBRARIES" || primary == "LTLIBRARIES" || primary == "JAVA" ) ( *it2 ) ->setOpen( true ); @@ -620,15 +620,15 @@ SubprojectItem* AutoProjectWidget::selectedSubproject() return static_cast <SubprojectItem*> ( pvitem ); } -TargetItem *AutoProjectWidget::createTargetItem( const QString &name, - const QString &prefix, const QString &primary, +TargetItem *AutoProjectWidget::createTargetItem( const TQString &name, + const TQString &prefix, const TQString &primary, bool take ) { bool docgroup = ( primary == "KDEDOCS" ); bool icongroup = ( primary == "KDEICON" ); bool group = !(docgroup || icongroup); - QString text; + TQString text; if ( docgroup ) text = i18n( "Documentation data" ); else if ( icongroup ) @@ -636,7 +636,7 @@ TargetItem *AutoProjectWidget::createTargetItem( const QString &name, else text = i18n( "%1 (%2 in %3)" ).arg( name ).arg( nicePrimary( primary ) ).arg( prefix ); - // Workaround because of QListView not being able to create + // Workaround because of TQListView not being able to create // items without actually inserting them TargetItem *titem = new TargetItem( m_detailView->listView(), group, text ); titem->name = name; @@ -649,7 +649,7 @@ TargetItem *AutoProjectWidget::createTargetItem( const QString &name, } -FileItem *AutoProjectWidget::createFileItem( const QString &name, SubprojectItem *subproject ) +FileItem *AutoProjectWidget::createFileItem( const TQString &name, SubprojectItem *subproject ) { bool is_subst; if(name.find("$(") == 0 || name.find("${") == 0) @@ -666,45 +666,45 @@ FileItem *AutoProjectWidget::createFileItem( const QString &name, SubprojectItem } -void AutoProjectWidget::emitAddedFiles( const QStringList &fileList ) +void AutoProjectWidget::emitAddedFiles( const TQStringList &fileList ) { emit m_part->addedFilesToProject( fileList ); } -void AutoProjectWidget::emitAddedFile( const QString &name ) +void AutoProjectWidget::emitAddedFile( const TQString &name ) { - QStringList fileList; + TQStringList fileList; fileList.append ( name ); emit m_part->addedFilesToProject( fileList ); } -void AutoProjectWidget::emitRemovedFiles( const QStringList &fileList ) +void AutoProjectWidget::emitRemovedFiles( const TQStringList &fileList ) { emit m_part->removedFilesFromProject( fileList ); } -void AutoProjectWidget::emitRemovedFile( const QString &name ) +void AutoProjectWidget::emitRemovedFile( const TQString &name ) { - QStringList fileList; + TQStringList fileList; fileList.append ( name ); emit m_part->removedFilesFromProject( fileList ); } -void AutoProjectWidget::restoreSession ( const QDomElement* el ) +void AutoProjectWidget::restoreSession ( const TQDomElement* el ) { Q_UNUSED( el ); } -void AutoProjectWidget::saveSession ( QDomElement* el ) +void AutoProjectWidget::saveSession ( TQDomElement* el ) { if ( m_activeTarget && m_activeSubproject ) { - QDomDocument domDoc = el->ownerDocument(); + TQDomDocument domDoc = el->ownerDocument(); - QString activeTargetPath = m_activeSubproject->path.mid ( m_part->project()->projectDirectory().length() + 1 ); + TQString activeTargetPath = m_activeSubproject->path.mid ( m_part->project()->projectDirectory().length() + 1 ); activeTargetPath = activeTargetPath + "/" + m_activeTarget->name; - QDomElement generalEl = domDoc.createElement("general"); + TQDomElement generalEl = domDoc.createElement("general"); kdDebug ( 9020 ) << k_funcinfo << "Saving session data of AutoProjectWidget: " << activeTargetPath << endl; @@ -715,12 +715,12 @@ void AutoProjectWidget::saveSession ( QDomElement* el ) void AutoProjectWidget::setActiveSubproject( SubprojectItem * spitem ) { - QString olddir = m_part->activeDirectory(); + TQString olddir = m_part->activeDirectory(); m_activeSubproject = spitem; emit m_part->activeDirectoryChanged( olddir, m_part->activeDirectory() ); } -void AutoProjectWidget::focusInEvent( QFocusEvent */*e*/ ) +void AutoProjectWidget::focusInEvent( TQFocusEvent */*e*/ ) { switch (m_lastFocusedView) { diff --git a/buildtools/autotools/autoprojectwidget.h b/buildtools/autotools/autoprojectwidget.h index 0f4a8b13..6c578506 100644 --- a/buildtools/autotools/autoprojectwidget.h +++ b/buildtools/autotools/autoprojectwidget.h @@ -17,13 +17,13 @@ #ifndef _AUTOPROJECTWIDGET_H_ #define _AUTOPROJECTWIDGET_H_ -#include <qdict.h> -#include <qlistview.h> -#include <qmap.h> -#include <qvbox.h> -#include <qhbox.h> -#include <qlayout.h> -#include <qtoolbutton.h> +#include <tqdict.h> +#include <tqlistview.h> +#include <tqmap.h> +#include <tqvbox.h> +#include <tqhbox.h> +#include <tqlayout.h> +#include <tqtoolbutton.h> #include <kiconloader.h> #include <klocale.h> @@ -54,33 +54,33 @@ public: AutoProjectWidget( AutoProjectPart *part, bool kde ); ~AutoProjectWidget(); - void openProject( const QString &dirName ); + void openProject( const TQString &dirName ); void closeProject(); /** * A list of the (relative) names of all subprojects (== subdirectories) */ - QStringList allSubprojects(); + TQStringList allSubprojects(); /** * A list of all Subproject items in the overview KListView */ - QPtrList <SubprojectItem> allSubprojectItems(); + TQPtrList <SubprojectItem> allSubprojectItems(); /** * A list of the (relative) names of all libraries */ - QStringList allLibraries(); + TQStringList allLibraries(); /** * A list of all files that belong to the project **/ - QStringList allFiles(); + TQStringList allFiles(); /** * The top level directory of the project. **/ - QString projectDirectory() const; + TQString projectDirectory() const; /** * The directory of the currently shown subproject. */ - QString subprojectDirectory(); + TQString subprojectDirectory(); /** * Are we in KDE mode? */ @@ -93,12 +93,12 @@ public: * Sets the given target active. The argument is given * relative to the project directory. */ - void setActiveTarget( const QString &targetPath ); + void setActiveTarget( const TQString &targetPath ); /** * Returns the active target as path relative to * the project directory. */ - QString activeDirectory(); + TQString activeDirectory(); /** * Adds a file to the active target. @@ -106,12 +106,12 @@ public: * to the active target. * If it does contain "/" character(s), ... @todo .. add to appropriate target */ - void addFiles( const QStringList &list ); + void addFiles( const TQStringList &list ); /** * Removes the file fileName from the directory directory. * (not implemented currently) */ - void removeFiles( const QStringList &list ); + void removeFiles( const TQStringList &list ); /** * Returns the currently selected target. Returns 0 if @@ -134,13 +134,13 @@ public: /** * Creates a TargetItem instance without a parent item. */ - TargetItem *createTargetItem( const QString &name, - const QString &prefix, const QString &primary, + TargetItem *createTargetItem( const TQString &name, + const TQString &prefix, const TQString &primary, bool take = true ); /** * Creates a FileItem instance without a parent item. */ - FileItem *createFileItem( const QString &name, SubprojectItem *subproject ); + FileItem *createFileItem( const TQString &name, SubprojectItem *subproject ); /** * Returns the Subproject that contains the Active Target. The Active Target is a special target @@ -160,36 +160,36 @@ public: * absolute, or relative to the project directory. If no subproject item is found for the * path, null is returned. */ - SubprojectItem* subprojectItemForPath( const QString & path, bool pathIsAbsolute = false ); + SubprojectItem* subprojectItemForPath( const TQString & path, bool pathIsAbsolute = false ); /** * Returns the projectdir-relative path for a target item */ - QString pathForTarget( const TargetItem *item ) const; + TQString pathForTarget( const TargetItem *item ) const; /** * Adds file fileName to target titem in subproject spitem */ - void addToTarget( const QString & fileName, SubprojectItem* spitem, TargetItem* titem ); + void addToTarget( const TQString & fileName, SubprojectItem* spitem, TargetItem* titem ); /** * Restores the last settings of the AutoProjectWidget */ - void restoreSession ( const QDomElement* el ); + void restoreSession ( const TQDomElement* el ); /** * Saves the latest changes of the AutoProjectWidget to the session file. */ - void saveSession ( QDomElement* el ); + void saveSession ( TQDomElement* el ); AutoSubprojectView* getSubprojectView (); AutoDetailsView* getDetailsView (); - void emitAddedFile ( const QString& name ); - void emitAddedFiles( const QStringList &fileList ); - void emitRemovedFile ( const QString& name ); - void emitRemovedFiles( const QStringList &fileList ); + void emitAddedFile ( const TQString& name ); + void emitAddedFiles( const TQStringList &fileList ); + void emitRemovedFile ( const TQString& name ); + void emitRemovedFiles( const TQStringList &fileList ); void parse( SubprojectItem *item ); @@ -199,14 +199,14 @@ public: MakefileHandler* makefileHandler(); public slots: - void slotOverviewSelectionChanged( QListViewItem *item ); + void slotOverviewSelectionChanged( TQListViewItem *item ); protected: - void initOverview ( QWidget* parent ); - void initDetailview ( QWidget* parent ); + void initOverview ( TQWidget* parent ); + void initDetailview ( TQWidget* parent ); void initActions (); - virtual void focusInEvent( QFocusEvent *e ); + virtual void focusInEvent( TQFocusEvent *e ); private: diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index efa3a358..9e1f9735 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -14,11 +14,11 @@ */ /** Qt */ -#include <qregexp.h> -#include <qcheckbox.h> -#include <qstringlist.h> -#include <qtable.h> -#include <qlayout.h> +#include <tqregexp.h> +#include <tqcheckbox.h> +#include <tqstringlist.h> +#include <tqtable.h> +#include <tqlayout.h> /** KDE Libs */ #include <kxmlguiclient.h> @@ -58,17 +58,17 @@ namespace AutoProjectPrivate { -bool isHeader( const QString& fileName ) +bool isHeader( const TQString& fileName ) { - return QStringList::split( ";", "h;H;hh;hxx;hpp;tcc;h++" ).contains( QFileInfo(fileName).extension(false) ); + return TQStringList::split( ";", "h;H;hh;hxx;hpp;tcc;h++" ).contains( TQFileInfo(fileName).extension(false) ); } -static QString cleanWhitespace( const QString &str ) +static TQString cleanWhitespace( const TQString &str ) { - QString res; + TQString res; - QStringList l = QStringList::split( QRegExp( "[ \t]" ), str ); - QStringList::ConstIterator it; + TQStringList l = TQStringList::split( TQRegExp( "[ \t]" ), str ); + TQStringList::ConstIterator it; for ( it = l.begin(); it != l.end(); ++it ) { res += *it; @@ -78,16 +78,16 @@ static QString cleanWhitespace( const QString &str ) return res.left( res.length() - 1 ); } -static void removeDir( const QString& dirName ) +static void removeDir( const TQString& dirName ) { - QDir d( dirName ); + TQDir d( dirName ); const QFileInfoList* fileList = d.entryInfoList(); if( !fileList ) return; QFileInfoListIterator it( *fileList ); while( it.current() ){ - const QFileInfo* fileInfo = it.current(); + const TQFileInfo* fileInfo = it.current(); ++it; if( fileInfo->fileName() == "." || fileInfo->fileName() == ".." ) @@ -107,7 +107,7 @@ static void removeDir( const QString& dirName ) } -AutoSubprojectView::AutoSubprojectView(AutoProjectWidget* widget, AutoProjectPart* part, QWidget *parent, const char *name) +AutoSubprojectView::AutoSubprojectView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name) : AutoProjectViewBase(parent, name) { @@ -116,10 +116,10 @@ AutoSubprojectView::AutoSubprojectView(AutoProjectWidget* widget, AutoProjectPar m_listView->setSorting(-1); m_listView->header()->hide(); - m_listView->addColumn( QString::null ); + m_listView->addColumn( TQString::null ); - connect( m_listView, SIGNAL( selectionChanged( QListViewItem* ) ), - this, SLOT( slotSelectionChanged( QListViewItem* ) ) ); + connect( m_listView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); initActions(); } @@ -129,7 +129,7 @@ AutoSubprojectView::~AutoSubprojectView() { } -void AutoSubprojectView::slotSelectionChanged( QListViewItem* item ) +void AutoSubprojectView::slotSelectionChanged( TQListViewItem* item ) { if ( m_listView->selectedItems().count() <= 0 ) { @@ -153,7 +153,7 @@ void AutoSubprojectView::slotSelectionChanged( QListViewItem* item ) emit selectionChanged( item ); } -void AutoSubprojectView::loadMakefileams ( const QString& dir ) +void AutoSubprojectView::loadMakefileams ( const TQString& dir ) { SubprojectItem * item = new SubprojectItem( m_listView, m_part->projectName() ); item->setPixmap ( 0, SmallIcon ( "kdevelop" ) ); @@ -173,53 +173,53 @@ void AutoSubprojectView::initActions() KActionCollection * actions = new KActionCollection( this ); subProjectOptionsAction = new AutoToolsAction( i18n( "Options..." ), "configure", 0, - this, SLOT( slotSubprojectOptions() ), actions, "subproject options" ); + this, TQT_SLOT( slotSubprojectOptions() ), actions, "subproject options" ); subProjectOptionsAction->setWhatsThis(i18n("<qt><b>Options</b><p>Shows subproject options dialog " "that provides settings for compiler, include paths, " "prefixes and build order.</qt>")); subProjectOptionsAction->plug( m_optionsButton ); - QToolTip::add( m_button1, tr2i18n( "Add new subproject...")); + TQToolTip::add( m_button1, tr2i18n( "Add new subproject...")); addSubprojectAction = new AutoToolsAction( i18n( "Add new subproject..." ), "folder_new", 0, - this, SLOT( slotAddSubproject() ), actions, "add subproject" ); + this, TQT_SLOT( slotAddSubproject() ), actions, "add subproject" ); addSubprojectAction->setWhatsThis(i18n("<qt><b>Add new subproject</b><p>Creates a new " "subproject in currently selected subproject.</qt>")); addSubprojectAction->plug( m_button1 ); removeSubprojectAction = new KAction( i18n( "Remove Subproject..." ), "remove_subdir", 0, - this, SLOT( slotRemoveSubproject() ), actions, "remove subproject" ); + this, TQT_SLOT( slotRemoveSubproject() ), actions, "remove subproject" ); removeSubprojectAction->setWhatsThis(i18n("<qt><b>Remove subproject</b><p>Removes the subproject. Asks if the " "subproject should be also removed from disk. Only subprojects " "which do not hold other subprojects can be removed.</qt>")); addExistingSubprojectAction = new KAction( i18n( "Add Existing Subprojects..." ), "fileimport", 0, - this, SLOT( slotAddExistingSubproject() ), actions, "add existing subproject" ); + this, TQT_SLOT( slotAddExistingSubproject() ), actions, "add existing subproject" ); addExistingSubprojectAction->setWhatsThis(i18n("<qt><b>Add existing subprojects</b><p>Imports existing " "subprojects containing Makefile.am.</qt>")); - QToolTip::add( m_button2, tr2i18n( "Add Target...")); + TQToolTip::add( m_button2, tr2i18n( "Add Target...")); addTargetAction = new AutoToolsAction( i18n( "Add Target..." ), "targetnew_kdevelop", 0, - this, SLOT( slotAddTarget() ), actions, "add target" ); + this, TQT_SLOT( slotAddTarget() ), actions, "add target" ); addTargetAction->setWhatsThis(i18n( "<qt><b>Add target</b><p>Adds a new target to " "the currently selected subproject. Target can be a " "binary program, library, script, also a collection of " "data or header files.</qt>")); addTargetAction->plug( m_button2 ); - QToolTip::add( m_button3, tr2i18n( "Add Service...")); + TQToolTip::add( m_button3, tr2i18n( "Add Service...")); addServiceAction = new AutoToolsAction( i18n( "Add Service..." ), "servicenew_kdevelop", 0, this, - SLOT( slotAddService() ), actions, "add service" ); + TQT_SLOT( slotAddService() ), actions, "add service" ); addServiceAction->setWhatsThis(i18n("<qt><b>Add service</b><p>Creates a .desktop file describing the service.</qt>")); addServiceAction->plug( m_button3 ); - QToolTip::add( m_button4, tr2i18n( "Add Application...")); + TQToolTip::add( m_button4, tr2i18n( "Add Application...")); addApplicationAction = new AutoToolsAction( i18n( "Add Application..." ), "window_new", 0, this, - SLOT( slotAddApplication() ), actions, "add application" ); + TQT_SLOT( slotAddApplication() ), actions, "add application" ); addApplicationAction->setWhatsThis(i18n("<qt><b>Add application</b><p>Creates an application .desktop file.</qt>")); addApplicationAction->plug( m_button4 ); - QToolTip::add( m_button5, tr2i18n( "Build")); + TQToolTip::add( m_button5, tr2i18n( "Build")); buildSubprojectAction = new AutoToolsAction( i18n( "Build" ), "launch", 0, this, - SLOT( slotBuildSubproject() ), actions, "build subproject" ); + TQT_SLOT( slotBuildSubproject() ), actions, "build subproject" ); buildSubprojectAction->setWhatsThis(i18n("<qt><b>Build</b><p>Runs <b>make</b> from the directory of " "the selected subproject.<br> Environment variables and " "make arguments can be specified in the project settings " @@ -227,7 +227,7 @@ void AutoSubprojectView::initActions() buildSubprojectAction->plug( m_button5 ); forceReeditSubprojectAction = new KAction( i18n( "Force Reedit" ), 0, 0, this, - SLOT( slotForceReeditSubproject() ), actions, "force-reedit subproject" ); + TQT_SLOT( slotForceReeditSubproject() ), actions, "force-reedit subproject" ); forceReeditSubprojectAction->setWhatsThis(i18n("<qt><b>Force Reedit</b><p>Runs <b>make force-reedit</b> " "from the directory of the selected subproject.<br>This " "recreates makefile (tip: and solves most of .moc related " @@ -239,20 +239,20 @@ void AutoSubprojectView::initActions() forceReeditSubprojectAction->setEnabled(false); cleanSubprojectAction = new KAction( i18n( "Clean" ), 0, 0, this, - SLOT( slotCleanSubproject() ), actions, "clean subproject" ); + TQT_SLOT( slotCleanSubproject() ), actions, "clean subproject" ); cleanSubprojectAction->setWhatsThis(i18n("<qt><b>Clean</b><p>Runs <b>make clean</b> from the directory of " "the selected subproject.<br> Environment variables and make " "arguments can be specified in the project settings dialog, " "<b>Make Options</b> tab.</qt>")); installSubprojectAction = new KAction( i18n( "Install" ), 0, 0, this, - SLOT( slotInstallSubproject() ), actions, "install subproject" ); + TQT_SLOT( slotInstallSubproject() ), actions, "install subproject" ); installSubprojectAction->setWhatsThis(i18n("<qt><b>Install</b><p>Runs <b>make install</b> from the directory " "of the selected subproject.<br> Environment variables and " "make arguments can be specified in the project settings " "dialog, <b>Make Options</b> tab.</qt>")); installSuSubprojectAction = new KAction( i18n( "Install (as root user)" ), 0, 0, - this, SLOT( slotInstallSuSubproject() ), actions, "install subproject as root" ); + this, TQT_SLOT( slotInstallSuSubproject() ), actions, "install subproject as root" ); installSuSubprojectAction->setWhatsThis(i18n("<qt><b>Install as root user</b><p>Runs <b>make install</b> " "command from the directory of the selected subproject " "with root privileges.<br> It is executed via kdesu " @@ -261,21 +261,21 @@ void AutoSubprojectView::initActions() "<b>Make Options</b> tab.</qt>")); expandAction = new KAction( i18n( "Expand Subtree" ), 0, 0, this, - SLOT(slotExpandTree()), actions, "expandAction" ); + TQT_SLOT(slotExpandTree()), actions, "expandAction" ); collapseAction = new KAction( i18n( "Collapse Subtree" ), 0, 0, this, - SLOT(slotCollapseTree()), actions, "collapseAction" ); + TQT_SLOT(slotCollapseTree()), actions, "collapseAction" ); otherAction = new KAction( i18n( "Manage Custom Commands..." ), 0, 0, this, - SLOT( slotManageBuildCommands() ), actions, "manage custom commands" ); + TQT_SLOT( slotManageBuildCommands() ), actions, "manage custom commands" ); otherAction->setWhatsThis(i18n("<qt><b>Manage custom commands</b><p>Allows to create, edit and " "delete custom build commands which appears in the subproject " "context menu.<br></qt>")); - connect( m_listView, SIGNAL( contextMenu( KListView*, QListViewItem*, const QPoint& ) ), - this, SLOT( slotContextMenu( KListView*, QListViewItem*, const QPoint& ) ) ); + connect( m_listView, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( slotContextMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); } -void AutoSubprojectView::slotContextMenu( KListView *, QListViewItem *item, const QPoint &p ) +void AutoSubprojectView::slotContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) { if ( !item ) return ; @@ -306,8 +306,8 @@ void AutoSubprojectView::slotContextMenu( KListView *, QListViewItem *item, cons KConfig *config = m_part->instance()->config(); bool separate = true; - QMap<QString,QString> customBuildCommands = config->entryMap("CustomCommands"); - for (QMap<QString,QString>::const_iterator it = customBuildCommands.constBegin(); + TQMap<TQString,TQString> customBuildCommands = config->entryMap("CustomCommands"); + for (TQMap<TQString,TQString>::const_iterator it = customBuildCommands.constBegin(); it != customBuildCommands.constEnd(); ++it) { if (separate) @@ -315,7 +315,7 @@ void AutoSubprojectView::slotContextMenu( KListView *, QListViewItem *item, cons popup.insertSeparator(); separate = false; } - int id = popup.insertItem(it.key(), this, SLOT(slotCustomBuildCommand(int))); + int id = popup.insertItem(it.key(), this, TQT_SLOT(slotCustomBuildCommand(int))); m_commandList.append(it.data()); popup.setItemParameter(id, m_commandList.findIndex(it.data())); } @@ -420,9 +420,9 @@ void AutoSubprojectView::slotBuildSubproject() SubprojectItem* spitem = dynamic_cast<SubprojectItem*>( m_listView->selectedItem() ); if ( !spitem ) return; - QString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); + TQString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); - m_part->startMakeCommand( m_part->buildDirectory() + relpath, QString::fromLatin1( "" ) ); + m_part->startMakeCommand( m_part->buildDirectory() + relpath, TQString::fromLatin1( "" ) ); } void AutoSubprojectView::slotRemoveSubproject() @@ -439,9 +439,9 @@ void AutoSubprojectView::slotRemoveSubproject() return; } - QStringList list = QStringList::split( QRegExp("[ \t]"), parent->variables["SUBDIRS"] ); - QStringList::Iterator it = list.find( spitem->subdir ); - QString subdirToRemove = spitem->subdir; + TQStringList list = TQStringList::split( TQRegExp("[ \t]"), parent->variables["SUBDIRS"] ); + TQStringList::Iterator it = list.find( spitem->subdir ); + TQString subdirToRemove = spitem->subdir; bool topsubdirs = true; if ((parent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") == -1) && (parent->variables["SUBDIRS"].find("$(AUTODIRS)") == -1)) @@ -481,19 +481,19 @@ void AutoSubprojectView::slotRemoveSubproject() // Adjust AC_OUTPUT in configure.in if ( !m_part->isKDE() ) { - QString projroot = m_part->projectDirectory() + "/"; - QString subdirectory = spitem->path; - QString relpath = subdirectory.replace(0, projroot.length(),""); + TQString projroot = m_part->projectDirectory() + "/"; + TQString subdirectory = spitem->path; + TQString relpath = subdirectory.replace(0, projroot.length(),""); - QString configureFile = m_part->getAutoConfFile(projroot); + TQString configureFile = m_part->getAutoConfFile(projroot); - QStringList list = AutoProjectTool::configureinLoadMakefiles(configureFile); + TQStringList list = AutoProjectTool::configureinLoadMakefiles(configureFile); - QStringList::iterator it; + TQStringList::iterator it; for ( it = list.begin(); it != list.end(); it++ ) { - QString current = (QString) (*it); - QRegExp path_regex(relpath); + TQString current = (TQString) (*it); + TQRegExp path_regex(relpath); if ( path_regex.search(current) >= 0) { list.remove(it); break; @@ -513,11 +513,11 @@ void AutoSubprojectView::slotRemoveSubproject() if (parent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1) { - QFile subdirsfile( parent->path + "/subdirs" ); - QStringList topdirs; + TQFile subdirsfile( parent->path + "/subdirs" ); + TQStringList topdirs; if ( subdirsfile.open( IO_ReadOnly ) ) { - QTextStream subdirsstream( &subdirsfile ); + TQTextStream subdirsstream( &subdirsfile ); while (!subdirsstream.atEnd()) topdirs.append(subdirsstream.readLine()); subdirsfile.close(); @@ -525,26 +525,26 @@ void AutoSubprojectView::slotRemoveSubproject() topdirs.remove(subdirToRemove); if ( subdirsfile.open( IO_WriteOnly | IO_Truncate ) ) { - QTextStream subdirsstream( &subdirsfile ); - for (QStringList::const_iterator it = topdirs.begin(); it != topdirs.end(); ++it) + TQTextStream subdirsstream( &subdirsfile ); + for (TQStringList::const_iterator it = topdirs.begin(); it != topdirs.end(); ++it) subdirsstream << *it << endl; subdirsfile.close(); } } - QMap<QString,QString> replaceMap; + TQMap<TQString,TQString> replaceMap; replaceMap.insert( "SUBDIRS", subdirToRemove ); AutoProjectTool::removeFromMakefileam( parent->path + "/Makefile.am", replaceMap ); - QString relmakefile = ( parent->path + "/Makefile" ).mid( m_part->projectDirectory().length()+1 ); + TQString relmakefile = ( parent->path + "/Makefile" ).mid( m_part->projectDirectory().length()+1 ); kdDebug(9020) << "Relative makefile path: " << relmakefile << endl; // check for config.status - if( !QFileInfo(m_part->buildDirectory(), "config.status").exists() ){ + if( !TQFileInfo(m_part->buildDirectory(), "config.status").exists() ){ return; } - QString cmdline = "cd "; + TQString cmdline = "cd "; cmdline += KProcess::quote(m_part->projectDirectory()); cmdline += " && automake "; cmdline += KProcess::quote(relmakefile); @@ -559,26 +559,26 @@ void AutoSubprojectView::slotRemoveSubproject() void AutoSubprojectView::parsePrimary( SubprojectItem *item, - const QString &lhs, const QString &rhs ) + const TQString &lhs, const TQString &rhs ) { // Parse line foo_bar = bla bla int pos = lhs.findRev( '_' ); - QString prefix = lhs.left( pos ); - QString primary = lhs.right( lhs.length() - pos - 1 ); + TQString prefix = lhs.left( pos ); + TQString primary = lhs.right( lhs.length() - pos - 1 ); // kdDebug(9020) << "Prefix:" << prefix << ",Primary:" << primary << endl; #if 0 - QStrList prefixes; + TQStrList prefixes; prefixes.append( "bin" ); prefixes.append( "pkglib" ); prefixes.append( "pkgdata" ); prefixes.append( "noinst" ); prefixes.append( "check" ); prefixes.append( "sbin" ); - QStrList primaries; + TQStrList primaries; primaries.append( "PROGRAMS" ); primaries.append( "LIBRARIES" ); primaries.append( "LTLIBRARIES" ); @@ -592,31 +592,31 @@ void AutoSubprojectView::parsePrimary( SubprojectItem *item, // possible prefixes can be extended dynamically (see below) if ( primary == "PROGRAMS" || primary == "LIBRARIES" || primary == "LTLIBRARIES" ) { - QStringList l = QStringList::split( QRegExp( "[ \t\n]" ), rhs ); - QStringList::Iterator it1; + TQStringList l = TQStringList::split( TQRegExp( "[ \t\n]" ), rhs ); + TQStringList::Iterator it1; for ( it1 = l.begin(); it1 != l.end(); ++it1 ) { TargetItem *titem = m_widget->createTargetItem( *it1, prefix, primary ); item->targets.append( titem ); - QString canonname = AutoProjectTool::canonicalize( *it1 ); + TQString canonname = AutoProjectTool::canonicalize( *it1 ); titem->ldflags = AutoProjectPrivate::cleanWhitespace( item->variables[ canonname + "_LDFLAGS" ] ); titem->ldadd = AutoProjectPrivate::cleanWhitespace( item->variables[ canonname + "_LDADD" ] ); titem->libadd = AutoProjectPrivate::cleanWhitespace( item->variables[ canonname + "_LIBADD" ] ); titem->dependencies = AutoProjectPrivate::cleanWhitespace( item->variables[ canonname + "_DEPENDENCIES" ] ); - QString sources = item->variables[ canonname + "_SOURCES" ]; - QStringList sourceList = QStringList::split( QRegExp( "[ \t\n]" ), sources ); - QMap<QString, bool> dict; - QStringList::Iterator it = sourceList.begin(); + TQString sources = item->variables[ canonname + "_SOURCES" ]; + TQStringList sourceList = TQStringList::split( TQRegExp( "[ \t\n]" ), sources ); + TQMap<TQString, bool> dict; + TQStringList::Iterator it = sourceList.begin(); while( it != sourceList.end() ){ dict.insert( *it, true ); ++it; } - QMap<QString, bool>::Iterator dictIt = dict.begin(); + TQMap<TQString, bool>::Iterator dictIt = dict.begin(); while( dictIt != dict.end() ){ - QString fname = dictIt.key(); + TQString fname = dictIt.key(); ++dictIt; FileItem *fitem = m_widget->createFileItem( fname, item ); @@ -643,11 +643,11 @@ void AutoSubprojectView::parsePrimary( SubprojectItem *item, TargetItem *titem = m_widget->createTargetItem( "", prefix, primary ); item->targets.append( titem ); - QStringList l = QStringList::split( QRegExp( "[ \t]" ), rhs ); - QStringList::Iterator it3; + TQStringList l = TQStringList::split( TQRegExp( "[ \t]" ), rhs ); + TQStringList::Iterator it3; for ( it3 = l.begin(); it3 != l.end(); ++it3 ) { - QString fname = *it3; + TQString fname = *it3; FileItem *fitem = m_widget->createFileItem( fname, item ); titem->sources.append( fitem ); @@ -658,8 +658,8 @@ void AutoSubprojectView::parsePrimary( SubprojectItem *item, } else if ( primary == "JAVA" ) { - QStringList l = QStringList::split( QRegExp( "[ \t\n]" ), rhs ); - QStringList::Iterator it1; + TQStringList l = TQStringList::split( TQRegExp( "[ \t\n]" ), rhs ); + TQStringList::Iterator it1; TargetItem *titem = m_widget->createTargetItem( "", prefix, primary ); item->targets.append( titem ); @@ -673,28 +673,28 @@ void AutoSubprojectView::parsePrimary( SubprojectItem *item, void AutoSubprojectView::parseKDEDOCS( SubprojectItem *item, - const QString & /*lhs*/, const QString & /*rhs*/ ) + const TQString & /*lhs*/, const TQString & /*rhs*/ ) { // Handle the line KDE_ICON = // (actually, no parsing is involved here) - QString prefix = "kde_docs"; - QString primary = "KDEDOCS"; + TQString prefix = "kde_docs"; + TQString primary = "KDEDOCS"; TargetItem *titem = m_widget->createTargetItem( "", prefix, primary ); item->targets.append( titem ); - QDir d( item->path ); - QStringList l = d.entryList( QDir::Files ); + TQDir d( item->path ); + TQStringList l = d.entryList( TQDir::Files ); - QRegExp re( "Makefile.*|\\..*|.*~|index.cache.bz2" ); + TQRegExp re( "Makefile.*|\\..*|.*~|index.cache.bz2" ); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = l.begin(); it != l.end(); ++it ) { if ( !re.exactMatch( *it ) ) { - QString fname = *it; + TQString fname = *it; FileItem * fitem = m_widget->createFileItem( fname, item ); titem->sources.append( fitem ); } @@ -703,24 +703,24 @@ void AutoSubprojectView::parseKDEDOCS( SubprojectItem *item, void AutoSubprojectView::parseKDEICON( SubprojectItem *item, - const QString &lhs, const QString &rhs ) + const TQString &lhs, const TQString &rhs ) { // Parse a line foo_ICON = bla bla int pos = lhs.find( "_ICON" ); - QString prefix = lhs.left( pos ); + TQString prefix = lhs.left( pos ); if ( prefix == "KDE" ) prefix = "kde_icon"; - QString primary = "KDEICON"; + TQString primary = "KDEICON"; TargetItem *titem = m_widget->createTargetItem( "", prefix, primary ); item->targets.append( titem ); - QDir d( item->path ); - QStringList l = d.entryList( QDir::Files ); + TQDir d( item->path ); + TQStringList l = d.entryList( TQDir::Files ); - QString regexp; + TQString regexp; if ( rhs == "AUTO" ) { @@ -728,13 +728,13 @@ void AutoSubprojectView::parseKDEICON( SubprojectItem *item, } else { - QStringList appNames = QStringList::split( QRegExp( "[ \t\n]" ), rhs ); + TQStringList appNames = TQStringList::split( TQRegExp( "[ \t\n]" ), rhs ); regexp = ".*(-" + appNames.join( "|-" ) + ")\\.(png|mng|xpm)"; } - QRegExp re( regexp ); + TQRegExp re( regexp ); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = l.begin(); it != l.end(); ++it ) { if ( re.exactMatch( *it ) ) @@ -747,20 +747,20 @@ void AutoSubprojectView::parseKDEICON( SubprojectItem *item, void AutoSubprojectView::parsePrefix( SubprojectItem *item, - const QString &lhs, const QString &rhs ) + const TQString &lhs, const TQString &rhs ) { // Parse a line foodir = bla bla - QString name = lhs.left( lhs.length() - 3 ); - QString dir = rhs; + TQString name = lhs.left( lhs.length() - 3 ); + TQString dir = rhs; item->prefixes.insert( name, dir ); } void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, - const QString & /*lhs*/, const QString &rhs ) + const TQString & /*lhs*/, const TQString &rhs ) { // Parse a line SUBDIRS = bla bla - QString subdirs = rhs; + TQString subdirs = rhs; kdDebug( 9020 ) << "subdirs are " << subdirs << endl; // Take care of KDE hacks: @@ -768,26 +768,26 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, // listed in the subdirs file if ( subdirs.find( "$(TOPSUBDIRS)" ) != -1 ) { - QStringList dirs; - QFile subdirsfile( item->path + "/subdirs" ); + TQStringList dirs; + TQFile subdirsfile( item->path + "/subdirs" ); if( subdirsfile.exists() ) { if ( subdirsfile.open( IO_ReadOnly ) ) { - QTextStream subdirsstream( &subdirsfile ); + TQTextStream subdirsstream( &subdirsfile ); while ( !subdirsstream.atEnd() ) dirs.append( subdirsstream.readLine() ); subdirsfile.close(); } } else { - QDir d( item->path ); - QStringList l = d.entryList( QDir::Dirs ); - for( QStringList::const_iterator it = l.begin(); it != l.end(); ++it ) + TQDir d( item->path ); + TQStringList l = d.entryList( TQDir::Dirs ); + for( TQStringList::const_iterator it = l.begin(); it != l.end(); ++it ) { if( (*it) != "CVS" && (*it) != "admin" && (*it) != ".svn" && (*it) != "." && (*it) != ".." ) { - QDir subdir = d; + TQDir subdir = d; subdir.cd( *it, false ); if( subdir.exists( "Makefile.am" ) ) dirs.append( *it ); @@ -795,34 +795,34 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, } } - subdirs.replace( QRegExp( "\\$\\(TOPSUBDIRS\\)" ), dirs.join( " " ) ); + subdirs.replace( TQRegExp( "\\$\\(TOPSUBDIRS\\)" ), dirs.join( " " ) ); } // AUTODIRS is an alias for all subdirectories if ( subdirs.find( "$(AUTODIRS)" ) != -1 ) { - QDir d( item->path ); - QStringList dirs = d.entryList( QDir::Dirs ); + TQDir d( item->path ); + TQStringList dirs = d.entryList( TQDir::Dirs ); dirs.remove( "." ); dirs.remove( ".." ); dirs.remove( "CVS" ); - subdirs.replace( QRegExp( "\\$\\(AUTODIRS\\)" ), dirs.join( " " ) ); + subdirs.replace( TQRegExp( "\\$\\(AUTODIRS\\)" ), dirs.join( " " ) ); } // If there are any variables in the subdirs line then search // the Makefile(.am?) for its definition. Unfortunately, it may be // defined outside this file in which case those dirs won't be added. - QRegExp varre( "\\$\\(\\s*(.*)\\s*\\)" ); + TQRegExp varre( "\\$\\(\\s*(.*)\\s*\\)" ); varre.setMinimal( true ); while ( varre.search( subdirs ) != -1 ) { - QString varname = varre.cap( 1 ); - QString varvalue; + TQString varname = varre.cap( 1 ); + TQString varvalue; // Search the whole Makefile(.am?) // Note that if the variable isn't found it just disappears // (Perhaps we should add it back in this case?) - QMap<QString, QString>::ConstIterator varit = item->variables.find( varname ); + TQMap<TQString, TQString>::ConstIterator varit = item->variables.find( varname ); if ( varit != item->variables.end() ) { kdDebug( 9020 ) << "Found Makefile var " << varname << ", adding dirs <" << varit.data() << ">" << endl; @@ -832,22 +832,22 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, { kdDebug( 9020 ) << "Not found Makefile var " << varname << endl; } - subdirs.replace( QRegExp( "\\$\\(\\s*" + varname + "\\s*\\)" ), varvalue ); + subdirs.replace( TQRegExp( "\\$\\(\\s*" + varname + "\\s*\\)" ), varvalue ); } //search for AC_SUBST variables and try to replace them with variables //that have been already defined e.g. in a "kdevelop hint" - varre = QRegExp( "\\@(.*)\\@" ); + varre = TQRegExp( "\\@(.*)\\@" ); varre.setMinimal( true ); while ( varre.search( subdirs ) != -1 ) { - QString varname = varre.cap( 1 ); - QString varvalue; + TQString varname = varre.cap( 1 ); + TQString varvalue; // Search the whole Makefile(.am?) // Note that if the variable isn't found it just disappears // (Perhaps we should add it back in this case?) - QMap<QString, QString>::ConstIterator varit = item->variables.find( varname ); + TQMap<TQString, TQString>::ConstIterator varit = item->variables.find( varname ); if ( varit != item->variables.end() ) { kdDebug( 9020 ) << "Found Makefile var " << varname << ", adding dirs <" << varit.data() << ">" << endl; @@ -857,12 +857,12 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, { kdDebug( 9020 ) << "Not found Makefile var " << varname << endl; } - subdirs.replace( QRegExp( "\\@" + varname + "\\@" ), varvalue ); + subdirs.replace( TQRegExp( "\\@" + varname + "\\@" ), varvalue ); } - QStringList l = QStringList::split( QRegExp( "[ \t]" ), subdirs ); + TQStringList l = TQStringList::split( TQRegExp( "[ \t]" ), subdirs ); l.sort(); - QStringList::Iterator it; + TQStringList::Iterator it; for ( it = l.begin(); it != l.end(); ++it ) { if ( *it == "." ) @@ -891,7 +891,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, newitem->setOpen( open ); // Move to the bottom of the list - QListViewItem *lastItem = item->firstChild(); + TQListViewItem *lastItem = item->firstChild(); while ( lastItem->nextSibling() ) lastItem = lastItem->nextSibling(); @@ -905,11 +905,11 @@ void AutoSubprojectView::parse( SubprojectItem *item ) headers.clear(); AutoProjectTool::parseMakefileam( item->path + "/Makefile.am", &item->variables ); - QMap<QString, QString>::ConstIterator it; + TQMap<TQString, TQString>::ConstIterator it; for ( it = item->variables.begin(); it != item->variables.end(); ++it ) { - QString lhs = it.key(); - QString rhs = it.data(); + TQString lhs = it.key(); + TQString rhs = it.data(); if ( lhs == "KDE_DOCS" ) parseKDEDOCS( item, lhs, rhs ); else if ( lhs.right( 5 ) == "_ICON" ) @@ -925,16 +925,16 @@ void AutoSubprojectView::parse( SubprojectItem *item ) /// @todo only if in a c++ project TargetItem* noinst_HEADERS_item = findNoinstHeaders(item); - QDir dir( item->path ); - QStringList headersList = QStringList::split( QRegExp("[ \t]"), item->variables[ "noinst_HEADERS" ] ); + TQDir dir( item->path ); + TQStringList headersList = TQStringList::split( TQRegExp("[ \t]"), item->variables[ "noinst_HEADERS" ] ); - headersList += dir.entryList( "*.h;*.H;*.hh;*.hxx;*.hpp;*.tcc", QDir::Files ); + headersList += dir.entryList( "*.h;*.H;*.hh;*.hxx;*.hpp;*.tcc", TQDir::Files ); headersList.sort(); - headersList = QStringList::split(QRegExp("[ \t]"), headersList.join( " " )); + headersList = TQStringList::split(TQRegExp("[ \t]"), headersList.join( " " )); - QStringList::Iterator fileIt = headersList.begin(); + TQStringList::Iterator fileIt = headersList.begin(); while( fileIt != headersList.end() ){ - QString fname = *fileIt; + TQString fname = *fileIt; ++fileIt; if( AutoProjectPrivate::isHeader(fname) && !headers.contains(fname) ){ @@ -949,7 +949,7 @@ void AutoSubprojectView::slotForceReeditSubproject( ) SubprojectItem* spitem = dynamic_cast <SubprojectItem*>( m_listView->selectedItem() ); if ( !spitem ) return; - QString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); + TQString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); m_part->startMakeCommand( m_part->buildDirectory() + relpath, "force-reedit" ); } @@ -959,7 +959,7 @@ void AutoSubprojectView::slotInstallSubproject( ) SubprojectItem* spitem = dynamic_cast<SubprojectItem*>( m_listView->selectedItem() ); if ( !spitem ) return; - QString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); + TQString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); m_part->startMakeCommand( m_part->buildDirectory() + relpath, "install" ); } @@ -969,7 +969,7 @@ void AutoSubprojectView::slotInstallSuSubproject( ) SubprojectItem* spitem = dynamic_cast<SubprojectItem*>( m_listView->selectedItem() ); if ( !spitem ) return; - QString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); + TQString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); m_part->startMakeCommand( m_part->buildDirectory() + relpath, "install", true ); } @@ -977,7 +977,7 @@ void AutoSubprojectView::slotInstallSuSubproject( ) TargetItem * AutoSubprojectView::findNoinstHeaders( SubprojectItem *item ) { TargetItem* noinst_HEADERS_item = 0; - QPtrListIterator<TargetItem> itemIt( item->targets ); + TQPtrListIterator<TargetItem> itemIt( item->targets ); while( itemIt.current() ){ TargetItem* titem = itemIt.current(); ++itemIt; @@ -1001,12 +1001,12 @@ void AutoSubprojectView::slotCleanSubproject( ) SubprojectItem* spitem = dynamic_cast<SubprojectItem*>( m_listView->selectedItem() ); if ( !spitem ) return; - QString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); + TQString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); m_part->startMakeCommand( m_part->buildDirectory() + relpath, "clean" ); } -void AutoSubprojectView::focusOutEvent( QFocusEvent */* e*/ ) +void AutoSubprojectView::focusOutEvent( TQFocusEvent */* e*/ ) { m_widget->setLastFocusedView(AutoProjectWidget::SubprojectView); } @@ -1015,15 +1015,15 @@ void AutoSubprojectView::slotManageBuildCommands( ) { KConfig *config = m_part->instance()->config(); //menu item name <-> command - QMap<QString, QString> customBuildCommands = config->entryMap("CustomCommands"); + TQMap<TQString, TQString> customBuildCommands = config->entryMap("CustomCommands"); KDialogBase dlg(KDialogBase::Plain, i18n("Manage Custom Commands"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok); dlg.plainPage()->setMargin(0); - (new QVBoxLayout(dlg.plainPage(), 0, 0))->setAutoAdd(true); + (new TQVBoxLayout(dlg.plainPage(), 0, 0))->setAutoAdd(true); ManageCustomCommand *widget = new ManageCustomCommand(dlg.plainPage()); - for (QMap<QString,QString>::const_iterator it = customBuildCommands.constBegin(); + for (TQMap<TQString,TQString>::const_iterator it = customBuildCommands.constBegin(); it != customBuildCommands.constEnd(); ++it) { widget->commandsTable->insertRows(widget->commandsTable->numRows()); @@ -1031,13 +1031,13 @@ void AutoSubprojectView::slotManageBuildCommands( ) widget->commandsTable->setText(widget->commandsTable->numRows() - 1, 0, it.key()); widget->commandsTable->setText(widget->commandsTable->numRows() - 1, 1, it.data().section(":::", 0, 0)); - static_cast<QComboTableItem*>(widget->commandsTable-> + static_cast<TQComboTableItem*>(widget->commandsTable-> item(widget->commandsTable->numRows() - 1, 2))-> setCurrentItem(it.data().section(":::", 1, 1).toInt()); } widget->commandsTable->setFocus(); - if (dlg.exec() == QDialog::Accepted) + if (dlg.exec() == TQDialog::Accepted) { config->deleteGroup("CustomCommands"); config->setGroup("CustomCommands"); @@ -1045,7 +1045,7 @@ void AutoSubprojectView::slotManageBuildCommands( ) { config->writeEntry(widget->commandsTable->text(i, 0), widget->commandsTable->text(i, 1)+":::"+ - QString("%1").arg(static_cast<QComboTableItem*>(widget-> + TQString("%1").arg(static_cast<TQComboTableItem*>(widget-> commandsTable->item(i, 2))->currentItem())); } config->sync(); @@ -1055,13 +1055,13 @@ void AutoSubprojectView::slotManageBuildCommands( ) void AutoSubprojectView::slotCustomBuildCommand(int val) { - QString cmd = m_commandList[val].section(":::", 0, 0); + TQString cmd = m_commandList[val].section(":::", 0, 0); int type = m_commandList[val].section(":::", 1, 1).toInt(); SubprojectItem* spitem = dynamic_cast<SubprojectItem*>( m_listView->selectedItem() ); if ( !spitem ) return; - QString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); + TQString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); switch (type) { case 0: //make target @@ -1099,7 +1099,7 @@ void AutoSubprojectView::slotCollapseTree() expandCollapseFirst( m_listView->currentItem(), false ); } -void AutoSubprojectView::expandCollapseFirst( QListViewItem * item, bool expand ) +void AutoSubprojectView::expandCollapseFirst( TQListViewItem * item, bool expand ) { if ( !item ) return; @@ -1118,7 +1118,7 @@ void AutoSubprojectView::expandCollapseFirst( QListViewItem * item, bool expand } } -void AutoSubprojectView::expandCollapse( QListViewItem * item, bool expand ) +void AutoSubprojectView::expandCollapse( TQListViewItem * item, bool expand ) { if ( !item ) return; diff --git a/buildtools/autotools/autosubprojectview.h b/buildtools/autotools/autosubprojectview.h index e49caddd..81c772dc 100644 --- a/buildtools/autotools/autosubprojectview.h +++ b/buildtools/autotools/autosubprojectview.h @@ -16,7 +16,7 @@ #ifndef AUTOSUBPROJECTVIEW_H #define AUTOSUBPROJECTVIEW_H -#include <qwidget.h> +#include <tqwidget.h> #include "autoprojectviewbase.h" @@ -31,23 +31,23 @@ class KListView; namespace AutoProjectPrivate { - bool isHeader( const QString& fileName ); + bool isHeader( const TQString& fileName ); } //with protected inheritance gcc 3.2.3 complains in autoprojectwidget.cpp, line 116 -//that it cannot access the base class QObject (for the connect() call), +//that it cannot access the base class TQObject (for the connect() call), //so in order to be able to compile this file I made the inheritance public again, Alex class AutoSubprojectView : public AutoProjectViewBase { Q_OBJECT public: - AutoSubprojectView( AutoProjectWidget* widget, AutoProjectPart* part, QWidget *parent, const char *name ); + AutoSubprojectView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name ); virtual ~AutoSubprojectView(); public: - void loadMakefileams ( const QString& dir ); + void loadMakefileams ( const TQString& dir ); void parse( SubprojectItem *item ); KListView* listView() const @@ -58,29 +58,29 @@ public: TargetItem *findNoinstHeaders( SubprojectItem *item ); signals: - void selectionChanged( QListViewItem* ); + void selectionChanged( TQListViewItem* ); protected: void initActions (); void parseKDEDOCS( SubprojectItem *item, - const QString &lhs, const QString &rhs ); + const TQString &lhs, const TQString &rhs ); void parseKDEICON( SubprojectItem *item, - const QString &lhs, const QString &rhs ); + const TQString &lhs, const TQString &rhs ); void parsePrimary( SubprojectItem *item, - const QString &lhs, const QString &rhs ); + const TQString &lhs, const TQString &rhs ); void parsePrefix( SubprojectItem *item, - const QString &lhs, const QString &rhs ); + const TQString &lhs, const TQString &rhs ); void parseSUBDIRS( SubprojectItem *item, - const QString &lhs, const QString &rhs ); - virtual void focusOutEvent( QFocusEvent *e ); - void expandCollapse( QListViewItem * item, bool expand ); - void expandCollapseFirst( QListViewItem * item, bool expand ); + const TQString &lhs, const TQString &rhs ); + virtual void focusOutEvent( TQFocusEvent *e ); + void expandCollapse( TQListViewItem * item, bool expand ); + void expandCollapseFirst( TQListViewItem * item, bool expand ); private: AutoProjectWidget* m_widget; AutoProjectPart* m_part; - QStringList headers; + TQStringList headers; bool m_kdeMode; @@ -100,13 +100,13 @@ private: KAction* expandAction; KAction* collapseAction; - QStringList m_commandList; - QValueList<int> m_commandTypeList; + TQStringList m_commandList; + TQValueList<int> m_commandTypeList; private slots: - void slotContextMenu( KListView *, QListViewItem *item, const QPoint &p ); - //void slotSubprojectExecuted(QListViewItem* item); - void slotSelectionChanged( QListViewItem* item ); + void slotContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ); + //void slotSubprojectExecuted(TQListViewItem* item); + void slotSelectionChanged( TQListViewItem* item ); void slotAddApplication(); void slotSubprojectOptions(); void slotAddSubproject(); diff --git a/buildtools/autotools/autotoolsaction.cpp b/buildtools/autotools/autotoolsaction.cpp index 63b38762..b5191b37 100644 --- a/buildtools/autotools/autotoolsaction.cpp +++ b/buildtools/autotools/autotoolsaction.cpp @@ -13,9 +13,9 @@ */ #include "autotoolsaction.h" -#include <qtoolbutton.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> #include <kapplication.h> #include <kdebug.h> #include <kiconloader.h> @@ -24,79 +24,79 @@ AutoToolsAction::~AutoToolsAction() { } -AutoToolsAction::AutoToolsAction( const QString& text, const KShortcut& cut, - const QObject* receiver, const char* slot, +AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut, + const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name ) : KAction( text, cut, receiver, slot, parent, name ) { } -AutoToolsAction::AutoToolsAction( const QString& text, const QIconSet& pix, const KShortcut& cut, - const QObject* receiver, const char* slot, +AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, + const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name ) : KAction( text, pix, cut, receiver, slot, parent, name ) { } -AutoToolsAction::AutoToolsAction( const QString& text, const QString& pix, const KShortcut& cut, - const QObject* receiver, const char* slot, +AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut, + const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name ) : KAction( text, pix, cut, receiver, slot, parent, name ) { } AutoToolsAction::AutoToolsAction( const KGuiItem& item, const KShortcut & cut, - const QObject* receiver, const char* slot, + const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name ) : KAction( item, cut, receiver, slot, parent, name ) { } -AutoToolsAction::AutoToolsAction( const QString& text, const KShortcut& cut, - QObject* parent, const char* name ) +AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut, + TQObject* parent, const char* name ) : KAction( text, cut, parent, name ) { } -AutoToolsAction::AutoToolsAction( const QString& text, const KShortcut& cut, - const QObject* receiver, const char* slot, - QObject* parent, const char* name ) +AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut, + const TQObject* receiver, const char* slot, + TQObject* parent, const char* name ) : KAction( text, cut, receiver, slot, parent, name ) { } -AutoToolsAction::AutoToolsAction( const QString& text, const QIconSet& pix, - const KShortcut& cut, QObject* parent, const char* name ) +AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, + const KShortcut& cut, TQObject* parent, const char* name ) : KAction( text, pix, cut, parent, name ) { } -AutoToolsAction::AutoToolsAction( const QString& text, const QString& pix, - const KShortcut& cut, QObject* parent, const char* name ) +AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, + const KShortcut& cut, TQObject* parent, const char* name ) : KAction( text, pix, cut, parent, name ) { } -AutoToolsAction::AutoToolsAction( const QString& text, const QIconSet& pix, - const KShortcut& cut, const QObject* receiver, - const char* slot, QObject* parent, const char * name ) +AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, + const KShortcut& cut, const TQObject* receiver, + const char* slot, TQObject* parent, const char * name ) : KAction( text, pix, cut, receiver, slot, parent, name ) { } -AutoToolsAction::AutoToolsAction( const QString& text, const QString& pix, - const KShortcut & cut, const QObject* receiver, - const char* slot, QObject* parent, const char * name ) +AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, + const KShortcut & cut, const TQObject* receiver, + const char* slot, TQObject* parent, const char * name ) : KAction( text, pix, cut, receiver, slot, parent, name ) { } -AutoToolsAction::AutoToolsAction( QObject * parent, const char * name ) +AutoToolsAction::AutoToolsAction( TQObject * parent, const char * name ) : KAction( parent, name ) { } -int AutoToolsAction::plug( QWidget* w, int index ) +int AutoToolsAction::plug( TQWidget* w, int index ) { if ( !w ) { kdWarning(129) << "KAction::plug called with 0 argument\n"; @@ -107,10 +107,10 @@ int AutoToolsAction::plug( QWidget* w, int index ) if (kapp && !kapp->authorizeKAction(name())) return -1; - if ( ::qt_cast<QToolButton*>( w ) ) + if ( ::qt_cast<TQToolButton*>( w ) ) { - QToolButton* tb = static_cast<QToolButton*>( w ); - connect( tb, SIGNAL( clicked() ), this, SLOT( activate() ) ); + TQToolButton* tb = static_cast<TQToolButton*>( w ); + connect( tb, TQT_SIGNAL( clicked() ), this, TQT_SLOT( activate() ) ); int id = getToolButtonID(); if ( !icon().isEmpty() ) @@ -123,14 +123,14 @@ int AutoToolsAction::plug( QWidget* w, int index ) if ( !whatsThis().isEmpty() ) { - QWhatsThis::remove( tb ); - QWhatsThis::add( tb, whatsThisWithIcon() ); + TQWhatsThis::remove( tb ); + TQWhatsThis::add( tb, whatsThisWithIcon() ); } if ( !toolTip().isEmpty() ) { - QToolTip::remove( tb ); - QToolTip::add( tb, toolTip() ); + TQToolTip::remove( tb ); + TQToolTip::add( tb, toolTip() ); } addContainer( tb, id ); @@ -143,10 +143,10 @@ int AutoToolsAction::plug( QWidget* w, int index ) void AutoToolsAction::updateEnabled( int i ) { - QWidget* w = container( i ); + TQWidget* w = container( i ); - if ( ::qt_cast<QToolButton*>( w ) ) - static_cast<QToolButton*>( w )->setEnabled( isEnabled() ); + if ( ::qt_cast<TQToolButton*>( w ) ) + static_cast<TQToolButton*>( w )->setEnabled( isEnabled() ); else KAction::updateEnabled( i ) ; } diff --git a/buildtools/autotools/autotoolsaction.h b/buildtools/autotools/autotoolsaction.h index 97c8e79e..52f32f26 100644 --- a/buildtools/autotools/autotoolsaction.h +++ b/buildtools/autotools/autotoolsaction.h @@ -30,37 +30,37 @@ class AutoToolsAction : public KAction public: virtual ~AutoToolsAction(); - AutoToolsAction( const QString& text, const KShortcut& cut, - const QObject* receiver, const char* slot, + AutoToolsAction( const TQString& text, const KShortcut& cut, + const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name ); - AutoToolsAction( const QString& text, const QIconSet& pix, const KShortcut& cut, - const QObject* receiver, const char* slot, + AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, + const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name ); - AutoToolsAction( const QString& text, const QString& pix, const KShortcut& cut, - const QObject* receiver, const char* slot, + AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut, + const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name ); AutoToolsAction( const KGuiItem& item, const KShortcut& cut, - const QObject* receiver, const char* slot, + const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name ); - AutoToolsAction( const QString& text, const KShortcut& cut = KShortcut(), QObject* parent = 0, const char* name = 0 ); - AutoToolsAction( const QString& text, const KShortcut& cut, - const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 ); - AutoToolsAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(), - QObject* parent = 0, const char* name = 0 ); - AutoToolsAction( const QString& text, const QString& pix, const KShortcut& cut = KShortcut(), - QObject* parent = 0, const char* name = 0 ); - AutoToolsAction( const QString& text, const QIconSet& pix, const KShortcut& cut, - const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 ); - AutoToolsAction( const QString& text, const QString& pix, const KShortcut& cut, - const QObject* receiver, const char* slot, QObject* parent, + AutoToolsAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 ); + AutoToolsAction( const TQString& text, const KShortcut& cut, + const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); + AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(), + TQObject* parent = 0, const char* name = 0 ); + AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(), + TQObject* parent = 0, const char* name = 0 ); + AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, + const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); + AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut, + const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); - AutoToolsAction( QObject* parent = 0, const char* name = 0 ); + AutoToolsAction( TQObject* parent = 0, const char* name = 0 ); - virtual int plug( QWidget *widget, int index = -1 ); + virtual int plug( TQWidget *widget, int index = -1 ); virtual void updateEnabled( int i ); }; diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp index b35c5c75..4ffc326b 100644 --- a/buildtools/autotools/choosetargetdialog.cpp +++ b/buildtools/autotools/choosetargetdialog.cpp @@ -16,15 +16,15 @@ #include "choosetargetdialog.h" -#include <qcheckbox.h> -#include <qwidget.h> -#include <qgroupbox.h> -#include <qheader.h> -#include <qlistview.h> -#include <qptrlist.h> -#include <qradiobutton.h> -#include <qstringlist.h> -#include <qfileinfo.h> +#include <tqcheckbox.h> +#include <tqwidget.h> +#include <tqgroupbox.h> +#include <tqheader.h> +#include <tqlistview.h> +#include <tqptrlist.h> +#include <tqradiobutton.h> +#include <tqstringlist.h> +#include <tqfileinfo.h> #include <kcombobox.h> #include <kdialog.h> @@ -50,15 +50,15 @@ class ChooseTargetDialog::Private public: AutoProjectWidget* widget; AutoProjectPart* part; - QStringList fileList; - QPtrList<SubprojectItem> subprojectList; + TQStringList fileList; + TQPtrList<SubprojectItem> subprojectList; SubprojectItem* chosenSubproject; TargetItem* chosenTarget; ChooseTargetDlgBase* baseUI; }; ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectPart* part, - QStringList fileList, QWidget* parent, const char* name ) + TQStringList fileList, TQWidget* parent, const char* name ) : KDialogBase( parent, name, false, i18n("Automake Manager - Choose Target"), Ok | Cancel, KDialogBase::Ok, true /* seperator */ ) @@ -76,22 +76,22 @@ ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectP d->baseUI->subprojectComboBox->setAutoCompletion( true ); d->baseUI->targetComboBox->setAutoCompletion( true ); d->baseUI->newFileList->header()->hide(); - d->baseUI->newFileList->addColumn( QString::null ); + d->baseUI->newFileList->addColumn( TQString::null ); d->baseUI->newFileList->setSorting(-1); setIcon ( SmallIcon ( "target_kdevelop" ) ); - QPtrListIterator<SubprojectItem> sit(d->subprojectList); + TQPtrListIterator<SubprojectItem> sit(d->subprojectList); for ( ; (*sit); ++sit ) { - QPtrList<TargetItem> targetList = (*sit)->targets; - QPtrListIterator<TargetItem> targetIt(targetList); + TQPtrList<TargetItem> targetList = (*sit)->targets; + TQPtrListIterator<TargetItem> targetIt(targetList); // Only insert Subproject which have a "regular" target for ( ; (*targetIt); ++targetIt ) { - QString titemPrimary = (*targetIt)->primary; + TQString titemPrimary = (*targetIt)->primary; if ( titemPrimary == "PROGRAMS" || titemPrimary == "LIBRARIES" || titemPrimary == "LTLIBRARIES" || titemPrimary == "JAVA" ) { @@ -123,8 +123,8 @@ ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectP slotSubprojectChanged ( d->baseUI->subprojectComboBox->text(0) ); } - QStringList::iterator it; - QString fileName; + TQStringList::iterator it; + TQString fileName; for ( it = fileList.begin(); it != fileList.end(); ++it ) { @@ -135,13 +135,13 @@ ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectP fileName = ( *it ); - d->baseUI->newFileList->insertItem( new QListViewItem( d->baseUI->newFileList, fileName ) ); + d->baseUI->newFileList->insertItem( new TQListViewItem( d->baseUI->newFileList, fileName ) ); } - connect ( d->baseUI->subprojectComboBox, SIGNAL ( activated ( const QString& ) ), - this, SLOT( slotSubprojectChanged ( const QString& ) ) ); - connect ( d->baseUI->targetComboBox, SIGNAL ( activated ( const QString& ) ), - this, SLOT( slotTargetChanged ( const QString& ) ) ); + connect ( d->baseUI->subprojectComboBox, TQT_SIGNAL ( activated ( const TQString& ) ), + this, TQT_SLOT( slotSubprojectChanged ( const TQString& ) ) ); + connect ( d->baseUI->targetComboBox, TQT_SIGNAL ( activated ( const TQString& ) ), + this, TQT_SLOT( slotTargetChanged ( const TQString& ) ) ); } @@ -149,7 +149,7 @@ ChooseTargetDialog::~ChooseTargetDialog() { } -void ChooseTargetDialog::slotSubprojectChanged ( const QString& name ) +void ChooseTargetDialog::slotSubprojectChanged ( const TQString& name ) { d->chosenTarget = 0; SubprojectItem* spitem = d->subprojectList.first(); @@ -158,7 +158,7 @@ void ChooseTargetDialog::slotSubprojectChanged ( const QString& name ) { if ( spitem->subdir == name ) { - QPtrList <TargetItem> targetList = spitem->targets; + TQPtrList <TargetItem> targetList = spitem->targets; TargetItem* titem = targetList.first(); d->baseUI->targetComboBox->clear(); @@ -206,12 +206,12 @@ void ChooseTargetDialog::slotSubprojectChanged ( const QString& name ) } } -void ChooseTargetDialog::slotTargetChanged( const QString& name ) +void ChooseTargetDialog::slotTargetChanged( const TQString& name ) { d->baseUI->chosenTargetLabel->setText( ( d->chosenSubproject->path + "/<b>" + name + "</b>" ) .mid( d->part->projectDirectory().length() + 1 ) ); - QPtrList <TargetItem> targetList = d->chosenSubproject->targets; + TQPtrList <TargetItem> targetList = d->chosenSubproject->targets; TargetItem* titem = targetList.first(); for ( ; titem; titem = targetList.next() ) @@ -238,9 +238,9 @@ void ChooseTargetDialog::slotOk() //kdDebug ( 9020 ) << "3) Chosen target is " << d->chosenTarget->name << endl; - QStringList newFileList; - QStringList::iterator it; - QString directory, fileName; + TQStringList newFileList; + TQStringList::iterator it; + TQString directory, fileName; for ( it = d->fileList.begin(); it != d->fileList.end(); ++it ) { @@ -282,10 +282,10 @@ void ChooseTargetDialog::slotOk() noinst_HEADERS_item->sources.append( fitem ); noinst_HEADERS_item->insertItem( fitem ); - QString varname = "noinst_HEADERS"; + TQString varname = "noinst_HEADERS"; d->chosenSubproject->variables[ varname ] += ( " " + fileName ); - QMap<QString, QString> replaceMap; + TQMap<TQString, TQString> replaceMap; replaceMap.insert( varname, d->chosenSubproject->variables[ varname ] ); AutoProjectTool::addToMakefileam( d->chosenSubproject->path + "/Makefile.am", replaceMap ); @@ -296,11 +296,11 @@ void ChooseTargetDialog::slotOk() d->chosenTarget->sources.append( fitem ); d->chosenTarget->insertItem( fitem ); - QString canontargetname = AutoProjectTool::canonicalize( d->chosenTarget->name ); - QString varname = canontargetname + "_SOURCES"; + TQString canontargetname = AutoProjectTool::canonicalize( d->chosenTarget->name ); + TQString varname = canontargetname + "_SOURCES"; d->chosenSubproject->variables[ varname ] += ( " " + fileName ); - QMap<QString, QString> replaceMap; + TQMap<TQString, TQString> replaceMap; replaceMap.insert( varname, d->chosenSubproject->variables[ varname ] ); AutoProjectTool::addToMakefileam( d->chosenSubproject->path + "/Makefile.am", replaceMap ); diff --git a/buildtools/autotools/choosetargetdialog.h b/buildtools/autotools/choosetargetdialog.h index 44825ce5..0d431b4d 100644 --- a/buildtools/autotools/choosetargetdialog.h +++ b/buildtools/autotools/choosetargetdialog.h @@ -31,7 +31,7 @@ class ChooseTargetDialog : public KDialogBase Q_OBJECT public: ChooseTargetDialog( AutoProjectWidget* widget, AutoProjectPart* part, - QStringList fileList, QWidget* parent = 0, + TQStringList fileList, TQWidget* parent = 0, const char* name = 0 ); ~ChooseTargetDialog(); @@ -42,8 +42,8 @@ public: bool alwaysUseActiveTarget() const; public slots: - void slotSubprojectChanged ( const QString& ); - void slotTargetChanged ( const QString& ); + void slotSubprojectChanged ( const TQString& ); + void slotTargetChanged ( const TQString& ); protected: virtual void slotOk(); diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp index 7e2db214..0be8903b 100644 --- a/buildtools/autotools/configureoptionswidget.cpp +++ b/buildtools/autotools/configureoptionswidget.cpp @@ -11,15 +11,15 @@ #include "configureoptionswidget.h" -#include <qcombobox.h> -#include <qdir.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qtimer.h> -#include <qvalidator.h> +#include <tqcombobox.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqtimer.h> +#include <tqvalidator.h> #include <klineedit.h> #include <kdebug.h> #include <kfiledialog.h> @@ -37,10 +37,10 @@ class ServiceComboBox { public: - static void insertStringList(QComboBox *combo, const QValueList<KService::Ptr> &list, - QStringList *names, QStringList *execs) + static void insertStringList(TQComboBox *combo, const TQValueList<KService::Ptr> &list, + TQStringList *names, TQStringList *execs) { - QValueList<KService::Ptr>::ConstIterator it; + TQValueList<KService::Ptr>::ConstIterator it; for (it = list.begin(); it != list.end(); ++it) { combo->insertItem((*it)->comment()); (*names) << (*it)->desktopEntryName(); @@ -48,15 +48,15 @@ public: kdDebug(9020) << "insertStringList item " << (*it)->name() << "," << (*it)->exec() << endl; } } - static QString currentText(QComboBox *combo, const QStringList &names) + static TQString currentText(TQComboBox *combo, const TQStringList &names) { if (combo->currentItem() == -1) - return QString::null; + return TQString::null; return names[combo->currentItem()]; } - static void setCurrentText(QComboBox *combo, const QString &str, const QStringList &names) + static void setCurrentText(TQComboBox *combo, const TQString &str, const TQStringList &names) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; int i = 0; for (it = names.begin(); it != names.end(); ++it) { if (*it == str) { @@ -69,14 +69,14 @@ public: }; -ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, QWidget *parent, const char *name) +ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, TQWidget *parent, const char *name) : ConfigureOptionsWidgetBase(parent, name) { - config_combo->setValidator(new QRegExpValidator(QRegExp("^\\D.*"), this)); + config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); m_part = part; env_groupBox->setColumnLayout( 1, Qt::Vertical ); - QDomDocument &dom = *part->projectDom(); + TQDomDocument &dom = *part->projectDom(); m_environmentVariablesWidget = new EnvironmentVariablesWidget(dom, "/kdevautoproject/general/envvars", env_groupBox); coffers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'C'"); @@ -98,7 +98,7 @@ ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, QWidget *p config_combo->insertStringList(allConfigs); dirty = false; - currentConfig = QString::null; + currentConfig = TQString::null; configChanged(part->currentBuildConfig()); fixLayout(); @@ -132,14 +132,14 @@ void ConfigureOptionsWidget::fixLayout() } -void ConfigureOptionsWidget::readSettings(const QString &config) +void ConfigureOptionsWidget::readSettings(const TQString &config) { - QDomDocument dom = *m_part->projectDom(); - QString prefix = "/kdevautoproject/configurations/" + config + "/"; + TQDomDocument dom = *m_part->projectDom(); + TQString prefix = "/kdevautoproject/configurations/" + config + "/"; kdDebug(9020) << "Reading config from " << prefix << endl; configargs_edit->setText(DomUtil::readEntry(dom, prefix + "configargs")); - QString builddir = DomUtil::readEntry(dom, prefix + "builddir"); + TQString builddir = DomUtil::readEntry(dom, prefix + "builddir"); if (builddir.isEmpty() && config != "default") builddir = config; builddir_edit->setText(builddir); @@ -149,13 +149,13 @@ void ConfigureOptionsWidget::readSettings(const QString &config) cppflags_edit->setText(DomUtil::readEntry(dom, prefix + "cppflags")); ldflags_edit->setText(DomUtil::readEntry(dom, prefix + "ldflags")); - QString ccompiler = DomUtil::readEntry(dom, prefix + "ccompiler"); - QString cxxcompiler = DomUtil::readEntry(dom, prefix + "cxxcompiler"); - QString f77compiler = DomUtil::readEntry(dom, prefix + "f77compiler"); + TQString ccompiler = DomUtil::readEntry(dom, prefix + "ccompiler"); + TQString cxxcompiler = DomUtil::readEntry(dom, prefix + "cxxcompiler"); + TQString f77compiler = DomUtil::readEntry(dom, prefix + "f77compiler"); if (ccompiler.isEmpty()) { kdDebug(9020) << "No c compiler set" << endl; - QValueList<KService::Ptr>::ConstIterator it; + TQValueList<KService::Ptr>::ConstIterator it; for (it = coffers.begin(); it != coffers.end(); ++it) { if ((*it)->property("X-KDevelop-Default").toBool()) { kdDebug(9020) << "Found default " << (*it)->name() << endl; @@ -166,7 +166,7 @@ void ConfigureOptionsWidget::readSettings(const QString &config) } if (cxxcompiler.isEmpty()) { kdDebug(9020) << "No cxx compiler set" << endl; - QValueList<KService::Ptr>::ConstIterator it; + TQValueList<KService::Ptr>::ConstIterator it; for (it = cxxoffers.begin(); it != cxxoffers.end(); ++it) { if ((*it)->property("X-KDevelop-Default").toBool()) { kdDebug(9020) << "Found default " << (*it)->name() << endl; @@ -177,7 +177,7 @@ void ConfigureOptionsWidget::readSettings(const QString &config) } if (f77compiler.isEmpty()) { kdDebug(9020) << "No c compiler set" << endl; - QValueList<KService::Ptr>::ConstIterator it; + TQValueList<KService::Ptr>::ConstIterator it; for (it = f77offers.begin(); it != f77offers.end(); ++it) { if ((*it)->property("X-KDevelop-Default").toBool()) { kdDebug(9020) << "Found default " << (*it)->name() << endl; @@ -203,11 +203,11 @@ void ConfigureOptionsWidget::readSettings(const QString &config) } -void ConfigureOptionsWidget::saveSettings(const QString &config) +void ConfigureOptionsWidget::saveSettings(const TQString &config) { m_environmentVariablesWidget->accept(); - QDomDocument dom = *m_part->projectDom(); - QString prefix = "/kdevautoproject/configurations/" + config + "/"; + TQDomDocument dom = *m_part->projectDom(); + TQString prefix = "/kdevautoproject/configurations/" + config + "/"; kdDebug(9020) << "Saving config under " << prefix << endl; DomUtil::writeEntry(dom, prefix + "configargs", configargs_edit->text()); @@ -217,8 +217,8 @@ void ConfigureOptionsWidget::saveSettings(const QString &config) DomUtil::writeEntry(dom, prefix + "cppflags", cppflags_edit->text()); DomUtil::writeEntry(dom, prefix + "ldflags", ldflags_edit->text()); - QFileInfo fi(m_part->buildDirectory()); - QDir dir(fi.dir()); + TQFileInfo fi(m_part->buildDirectory()); + TQDir dir(fi.dir()); dir.mkdir(fi.fileName()); DomUtil::writeEntry(dom, prefix + "ccompiler", @@ -236,8 +236,8 @@ void ConfigureOptionsWidget::saveSettings(const QString &config) DomUtil::writeEntry(dom, prefix + "cxxflags", cxxflags_edit->text()); DomUtil::writeEntry(dom, prefix + "f77flags", f77flags_edit->text()); - if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").arg(config), QString::null, i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes) - QTimer::singleShot(0, m_part, SLOT(slotConfigure())); + if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").arg(config), TQString::null, i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes) + TQTimer::singleShot(0, m_part, TQT_SLOT(slotConfigure())); } @@ -251,7 +251,7 @@ void ConfigureOptionsWidget::setDirty() void ConfigureOptionsWidget::builddirClicked() { - QString dir = builddir_edit->text(); + TQString dir = builddir_edit->text(); dir = KFileDialog::getExistingDirectory(dir, this); if (!dir.isNull()) builddir_edit->setText(dir); @@ -259,13 +259,13 @@ void ConfigureOptionsWidget::builddirClicked() void ConfigureOptionsWidget::topsourcedirClicked() { - QString dir = topsourcedir_edit->text(); + TQString dir = topsourcedir_edit->text(); dir = KFileDialog::getExistingDirectory(dir, this); if (!dir.isNull()) topsourcedir_edit->setText(dir); } -void ConfigureOptionsWidget::configComboTextChanged(const QString &config) +void ConfigureOptionsWidget::configComboTextChanged(const TQString &config) { bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty(); bool canRemove = allConfigs.contains(config) && config != "default"; @@ -274,7 +274,7 @@ void ConfigureOptionsWidget::configComboTextChanged(const QString &config) } -void ConfigureOptionsWidget::configChanged(const QString &config) +void ConfigureOptionsWidget::configChanged(const TQString &config) { if (config == currentConfig || !allConfigs.contains(config)) return; @@ -294,7 +294,7 @@ void ConfigureOptionsWidget::configChanged(const QString &config) void ConfigureOptionsWidget::configAdded() { - QString config = config_combo->currentText(); + TQString config = config_combo->currentText(); allConfigs.append(config); @@ -307,24 +307,24 @@ void ConfigureOptionsWidget::configAdded() void ConfigureOptionsWidget::configRemoved() { - QString config = config_combo->currentText(); + TQString config = config_combo->currentText(); - QDomDocument dom = *m_part->projectDom(); - QDomNode node = dom.documentElement().namedItem("kdevautoproject").namedItem("configurations"); + TQDomDocument dom = *m_part->projectDom(); + TQDomNode node = dom.documentElement().namedItem("kdevautoproject").namedItem("configurations"); node.removeChild(node.namedItem(config)); allConfigs.remove(config); config_combo->clear(); config_combo->insertStringList(allConfigs); - currentConfig = QString::null; + currentConfig = TQString::null; configChanged("default"); } void ConfigureOptionsWidget::cserviceChanged() { - QString exec = ServiceComboBox::currentText(cservice_combo, cservice_execs); + TQString exec = ServiceComboBox::currentText(cservice_combo, cservice_execs); cbinary_edit->setText(exec); kdDebug(9020) << "exec: " << exec << endl; } @@ -332,14 +332,14 @@ void ConfigureOptionsWidget::cserviceChanged() void ConfigureOptionsWidget::cxxserviceChanged() { - QString exec = ServiceComboBox::currentText(cxxservice_combo, cxxservice_execs); + TQString exec = ServiceComboBox::currentText(cxxservice_combo, cxxservice_execs); cxxbinary_edit->setText(exec); } void ConfigureOptionsWidget::f77serviceChanged() { - QString exec = ServiceComboBox::currentText(f77service_combo, f77service_execs); + TQString exec = ServiceComboBox::currentText(f77service_combo, f77service_execs); f77binary_edit->setText(exec); kdDebug(9020) << "exec: " << exec << endl; } @@ -347,11 +347,11 @@ void ConfigureOptionsWidget::f77serviceChanged() void ConfigureOptionsWidget::cflagsClicked() { - QString name = ServiceComboBox::currentText(cservice_combo, cservice_names); + TQString name = ServiceComboBox::currentText(cservice_combo, cservice_names); KDevCompilerOptions *plugin = createCompilerOptions(name); if (plugin) { - QString flags = plugin->exec(this, cflags_edit->text()); + TQString flags = plugin->exec(this, cflags_edit->text()); cflags_edit->setText(flags); delete plugin; } @@ -360,11 +360,11 @@ void ConfigureOptionsWidget::cflagsClicked() void ConfigureOptionsWidget::cxxflagsClicked() { - QString name = ServiceComboBox::currentText(cxxservice_combo, cxxservice_names); + TQString name = ServiceComboBox::currentText(cxxservice_combo, cxxservice_names); KDevCompilerOptions *plugin = createCompilerOptions(name); if (plugin) { - QString flags = plugin->exec(this, cxxflags_edit->text()); + TQString flags = plugin->exec(this, cxxflags_edit->text()); cxxflags_edit->setText(flags); delete plugin; } @@ -373,18 +373,18 @@ void ConfigureOptionsWidget::cxxflagsClicked() void ConfigureOptionsWidget::f77flagsClicked() { - QString name = ServiceComboBox::currentText(f77service_combo, f77service_names); + TQString name = ServiceComboBox::currentText(f77service_combo, f77service_names); KDevCompilerOptions *plugin = createCompilerOptions(name); if (plugin) { - QString flags = plugin->exec(this, f77flags_edit->text()); + TQString flags = plugin->exec(this, f77flags_edit->text()); f77flags_edit->setText(flags); delete plugin; } } -KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const QString &name) +KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQString &name) { KService::Ptr service = KService::serviceByDesktopName(name); if (!service) { @@ -392,20 +392,20 @@ KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const QString return 0; } - KLibFactory *factory = KLibLoader::self()->factory(QFile::encodeName(service->library())); + KLibFactory *factory = KLibLoader::self()->factory(TQFile::encodeName(service->library())); if (!factory) { - QString errorMessage = KLibLoader::self()->lastErrorMessage(); + TQString errorMessage = KLibLoader::self()->lastErrorMessage(); KMessageBox::error(0, i18n("There was an error loading the module %1.\n" "The diagnostics is:\n%2").arg(service->name()).arg(errorMessage)); exit(1); } - QStringList args; - QVariant prop = service->property("X-KDevelop-Args"); + TQStringList args; + TQVariant prop = service->property("X-KDevelop-Args"); if (prop.isValid()) - args = QStringList::split(" ", prop.toString()); + args = TQStringList::split(" ", prop.toString()); - QObject *obj = factory->create(this, service->name().latin1(), + TQObject *obj = factory->create(this, service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) { diff --git a/buildtools/autotools/configureoptionswidget.h b/buildtools/autotools/configureoptionswidget.h index a973ce7d..9272b3f2 100644 --- a/buildtools/autotools/configureoptionswidget.h +++ b/buildtools/autotools/configureoptionswidget.h @@ -27,7 +27,7 @@ class ConfigureOptionsWidget : public ConfigureOptionsWidgetBase Q_OBJECT public: - ConfigureOptionsWidget( AutoProjectPart *part, QWidget *parent = 0, const char *name = 0 ); + ConfigureOptionsWidget( AutoProjectPart *part, TQWidget *parent = 0, const char *name = 0 ); ~ConfigureOptionsWidget(); public slots: @@ -37,8 +37,8 @@ private: virtual void builddirClicked(); virtual void topsourcedirClicked(); virtual void setDirty(); - virtual void configChanged( const QString &config ); - virtual void configComboTextChanged( const QString &config ); + virtual void configChanged( const TQString &config ); + virtual void configComboTextChanged( const TQString &config ); virtual void configAdded(); virtual void configRemoved(); virtual void cflagsClicked(); @@ -49,16 +49,16 @@ private: virtual void f77serviceChanged(); void fixLayout(); - void readSettings( const QString &config ); - void saveSettings( const QString &config ); + void readSettings( const TQString &config ); + void saveSettings( const TQString &config ); - KDevCompilerOptions *createCompilerOptions( const QString &lang ); + KDevCompilerOptions *createCompilerOptions( const TQString &lang ); KTrader::OfferList coffers, cxxoffers, f77offers; - QStringList cservice_names, cservice_execs; - QStringList cxxservice_names, cxxservice_execs; - QStringList f77service_names, f77service_execs; - QStringList allConfigs; - QString currentConfig; + TQStringList cservice_names, cservice_execs; + TQStringList cxxservice_names, cxxservice_execs; + TQStringList f77service_names, f77service_execs; + TQStringList allConfigs; + TQString currentConfig; bool dirty; AutoProjectPart *m_part; diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp index 65b87bf7..2235f357 100644 --- a/buildtools/autotools/fileselectorwidget.cpp +++ b/buildtools/autotools/fileselectorwidget.cpp @@ -14,13 +14,13 @@ * * ***************************************************************************/ -#include <qlayout.h> -#include <qpushbutton.h> -#include <qhbox.h> -#include <qlabel.h> -#include <qstrlist.h> -#include <qtooltip.h> -#include <qregexp.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqhbox.h> +#include <tqlabel.h> +#include <tqstrlist.h> +#include <tqtooltip.h> +#include <tqregexp.h> #include <kxmlguiclient.h> #include <kiconloader.h> @@ -48,12 +48,12 @@ #include "kfilednddetailview.h" #include "kfiledndiconview.h" -KDnDDirOperator::KDnDDirOperator ( const KURL &urlName, QWidget* parent, const char* name ) : KDirOperator ( urlName, parent, name ) +KDnDDirOperator::KDnDDirOperator ( const KURL &urlName, TQWidget* parent, const char* name ) : KDirOperator ( urlName, parent, name ) { } -KFileView* KDnDDirOperator::createView( QWidget* parent, KFile::FileView view ) +KFileView* KDnDDirOperator::createView( TQWidget* parent, KFile::FileView view ) { KFileView* new_view = 0L; @@ -69,36 +69,36 @@ KFileView* KDnDDirOperator::createView( QWidget* parent, KFile::FileView view ) } -FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, QWidget* parent, const char* name ) : QWidget(parent, name) +FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, TQWidget* parent, const char* name ) : TQWidget(parent, name) { m_part = part; // widgets and layout - QVBoxLayout* lo = new QVBoxLayout(this); + TQVBoxLayout* lo = new TQVBoxLayout(this); - QHBox *hlow = new QHBox (this); + TQHBox *hlow = new TQHBox (this); lo->addWidget(hlow); - home = new QPushButton( hlow ); + home = new TQPushButton( hlow ); home->setPixmap(SmallIcon("gohome")); - QToolTip::add(home, i18n("Home directory")); - up = new QPushButton( /*i18n("&Up"),*/ hlow ); + TQToolTip::add(home, i18n("Home directory")); + up = new TQPushButton( /*i18n("&Up"),*/ hlow ); up->setPixmap(SmallIcon("up")); - QToolTip::add(up, i18n("Up one level")); - back = new QPushButton( /*i18n("&Back"),*/ hlow ); + TQToolTip::add(up, i18n("Up one level")); + back = new TQPushButton( /*i18n("&Back"),*/ hlow ); back->setPixmap(SmallIcon("back")); - QToolTip::add(back, i18n("Previous directory")); - forward = new QPushButton( /*i18n("&Next"),*/ hlow ); + TQToolTip::add(back, i18n("Previous directory")); + forward = new TQPushButton( /*i18n("&Next"),*/ hlow ); forward->setPixmap(SmallIcon("forward")); - QToolTip::add(forward, i18n("Next directory")); + TQToolTip::add(forward, i18n("Next directory")); // HACK - QWidget* spacer = new QWidget(hlow); + TQWidget* spacer = new TQWidget(hlow); hlow->setStretchFactor(spacer, 1); hlow->setMaximumHeight(up->height()); cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); - cmbPath->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed )); + cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); KURLCompletion* cmpl = new KURLCompletion(); cmbPath->setCompletionObject( cmpl ); lo->addWidget(cmbPath); @@ -110,45 +110,45 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, lo->addWidget(dir); lo->setStretchFactor(dir, 2); - QHBox* filterBox = new QHBox(this); - filterIcon = new QLabel(filterBox); + TQHBox* filterBox = new TQHBox(this); + filterIcon = new TQLabel(filterBox); filterIcon->setPixmap( BarIcon("filter") ); filter = new KHistoryCombo(filterBox, "filter"); - filter->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed )); + filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(filter, 2); lo->addWidget(filterBox); // slots and signals - connect( filter, SIGNAL( textChanged(const QString&) ), SLOT( slotFilterChanged(const QString&) ) ); - connect( filter, SIGNAL( activated(const QString&) ), SLOT( slotFilterChanged(const QString&) ) ); - connect( filter, SIGNAL( returnPressed(const QString&) ), SLOT( filterReturnPressed(const QString&) ) ); + connect( filter, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotFilterChanged(const TQString&) ) ); + connect( filter, TQT_SIGNAL( activated(const TQString&) ), TQT_SLOT( slotFilterChanged(const TQString&) ) ); + connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ), TQT_SLOT( filterReturnPressed(const TQString&) ) ); - connect( home, SIGNAL( clicked() ), dir, SLOT( home() ) ); - connect( up, SIGNAL( clicked() ), dir, SLOT( cdUp() ) ); - connect( back, SIGNAL( clicked() ), dir, SLOT( back() ) ); - connect( forward, SIGNAL( clicked() ), dir, SLOT( forward() ) ); + connect( home, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( home() ) ); + connect( up, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( cdUp() ) ); + connect( back, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( back() ) ); + connect( forward, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( forward() ) ); - connect( cmbPath, SIGNAL( urlActivated( const KURL& )), this, SLOT( cmbPathActivated( const KURL& ) )); - //connect( cmbPath, SIGNAL( returnPressed( const QString& )), this, SLOT( cmbPathReturnPressed( const QString& ) )); - connect( dir, SIGNAL(urlEntered(const KURL&)), this, SLOT(dirUrlEntered(const KURL&)) ); + connect( cmbPath, TQT_SIGNAL( urlActivated( const KURL& )), this, TQT_SLOT( cmbPathActivated( const KURL& ) )); + //connect( cmbPath, TQT_SIGNAL( returnPressed( const TQString& )), this, TQT_SLOT( cmbPathReturnPressed( const TQString& ) )); + connect( dir, TQT_SIGNAL(urlEntered(const KURL&)), this, TQT_SLOT(dirUrlEntered(const KURL&)) ); - connect( dir, SIGNAL(finishedLoading()), this, SLOT(dirFinishedLoading()) ); + connect( dir, TQT_SIGNAL(finishedLoading()), this, TQT_SLOT(dirFinishedLoading()) ); // dirUrlEntered( dir->url() ); - QStringList list; + TQStringList list; /* read the file patterns from the project DOM */ - QDomElement docEl = m_part->projectDom()->documentElement(); - QDomElement fileviewEl = docEl.namedItem("kdevfileview").toElement(); - QDomElement groupsEl = fileviewEl.namedItem("groups").toElement(); - QDomElement groupEl = groupsEl.firstChild().toElement(); + TQDomElement docEl = m_part->projectDom()->documentElement(); + TQDomElement fileviewEl = docEl.namedItem("kdevfileview").toElement(); + TQDomElement groupsEl = fileviewEl.namedItem("groups").toElement(); + TQDomElement groupEl = groupsEl.firstChild().toElement(); while ( !groupEl.isNull() ) { if (groupEl.tagName() == "group") { - list << groupEl.attribute("pattern").replace ( QRegExp ( ";" ), " " ) + " (" + groupEl.attribute("name") + ")"; + list << groupEl.attribute("pattern").replace ( TQRegExp ( ";" ), " " ) + " (" + groupEl.attribute("name") + ")"; } groupEl = groupEl.nextSibling().toElement(); } @@ -162,27 +162,27 @@ FileSelectorWidget::~FileSelectorWidget() { } -void FileSelectorWidget::dragEnterEvent ( QDragEnterEvent* /*ev*/ ) +void FileSelectorWidget::dragEnterEvent ( TQDragEnterEvent* /*ev*/ ) { } -void FileSelectorWidget::dropEvent ( QDropEvent* /*ev*/ ) +void FileSelectorWidget::dropEvent ( TQDropEvent* /*ev*/ ) { kdDebug ( 9020 ) << "Dropped" << endl; - QString path = "Something was dropped in the Destination directory file-selector"; + TQString path = "Something was dropped in the Destination directory file-selector"; emit dropped ( path ); } -void FileSelectorWidget::filterReturnPressed ( const QString& nf ) +void FileSelectorWidget::filterReturnPressed ( const TQString& nf ) { // KURL u ( m_part->project()->projectDirectory() ); setDir ( nf ); } -void FileSelectorWidget::slotFilterChanged( const QString & nf ) +void FileSelectorWidget::slotFilterChanged( const TQString & nf ) { dir->setNameFilter( nf ); dir->updateDir(); @@ -193,7 +193,7 @@ void FileSelectorWidget::cmbPathActivated( const KURL& u ) dir->setURL( u, true ); } -void FileSelectorWidget::cmbPathReturnPressed( const QString& u ) +void FileSelectorWidget::cmbPathReturnPressed( const TQString& u ) { dir->setFocus(); dir->setURL( KURL(u), true ); @@ -203,7 +203,7 @@ void FileSelectorWidget::cmbPathReturnPressed( const QString& u ) void FileSelectorWidget::dirUrlEntered( const KURL& u ) { cmbPath->removeURL( u ); - QStringList urls = cmbPath->urls(); + TQStringList urls = cmbPath->urls(); urls.prepend( u.url() ); while ( urls.count() >= (uint)cmbPath->maxItems() ) urls.remove( urls.last() ); @@ -222,7 +222,7 @@ void FileSelectorWidget::dirFinishedLoading() } -void FileSelectorWidget::focusInEvent(QFocusEvent*) +void FileSelectorWidget::focusInEvent(TQFocusEvent*) { dir->setFocus(); } @@ -232,7 +232,7 @@ void FileSelectorWidget::setDir( KURL u ) dir->setURL(u, true); } -void FileSelectorWidget::setDir(const QString& path) +void FileSelectorWidget::setDir(const TQString& path) { KURL u ( path ); dir->setURL ( u, true ); diff --git a/buildtools/autotools/fileselectorwidget.h b/buildtools/autotools/fileselectorwidget.h index 7a981194..636cec87 100644 --- a/buildtools/autotools/fileselectorwidget.h +++ b/buildtools/autotools/fileselectorwidget.h @@ -12,16 +12,16 @@ #ifndef _FILESELECTORWIDGET_H_ #define _FILESELECTORWIDGET_H_ -#include <qlayout.h> -#include <qpushbutton.h> -#include <qhbox.h> -#include <qlabel.h> -#include <qstrlist.h> -#include <qtooltip.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqhbox.h> +#include <tqlabel.h> +#include <tqstrlist.h> +#include <tqtooltip.h> #include <klistview.h> -#include <qvbox.h> -#include <qwidget.h> +#include <tqvbox.h> +#include <tqwidget.h> #include <kfile.h> #include <kurlcombobox.h> #include <kurlcompletion.h> @@ -42,10 +42,10 @@ class KDnDDirOperator : public KDirOperator Q_OBJECT public: - KDnDDirOperator ( const KURL& urlName = KURL(), QWidget *parent = 0, const char* name = 0 ); + KDnDDirOperator ( const KURL& urlName = KURL(), TQWidget *parent = 0, const char* name = 0 ); protected: - virtual KFileView* createView( QWidget* parent, KFile::FileView view ); + virtual KFileView* createView( TQWidget* parent, KFile::FileView view ); }; class FileSelectorWidget : public QWidget @@ -53,7 +53,7 @@ class FileSelectorWidget : public QWidget Q_OBJECT public: - FileSelectorWidget( AutoProjectPart* part, KFile::Mode, QWidget* parent = 0, const char* name = 0 ); + FileSelectorWidget( AutoProjectPart* part, KFile::Mode, TQWidget* parent = 0, const char* name = 0 ); ~FileSelectorWidget(); KDnDDirOperator * dirOperator() @@ -62,32 +62,32 @@ public: } public slots: - void slotFilterChanged( const QString& ); + void slotFilterChanged( const TQString& ); void setDir( KURL ); - void setDir( const QString& ); + void setDir( const TQString& ); private slots: void cmbPathActivated( const KURL& u ); - void cmbPathReturnPressed( const QString& u ); + void cmbPathReturnPressed( const TQString& u ); void dirUrlEntered( const KURL& u ); void dirFinishedLoading(); - void filterReturnPressed( const QString& nf ); + void filterReturnPressed( const TQString& nf ); protected: - void focusInEvent( QFocusEvent* ); - void dragEnterEvent ( QDragEnterEvent* ev ); - void dropEvent ( QDropEvent* ev ); + void focusInEvent( TQFocusEvent* ); + void dragEnterEvent ( TQDragEnterEvent* ev ); + void dropEvent ( TQDropEvent* ev ); private: KURLComboBox *cmbPath; KHistoryCombo * filter; - QLabel* filterIcon; + TQLabel* filterIcon; KDnDDirOperator * dir; - QPushButton *home, *up, *back, *forward; + TQPushButton *home, *up, *back, *forward; AutoProjectPart* m_part; signals: - void dropped ( const QString& ); + void dropped ( const TQString& ); }; diff --git a/buildtools/autotools/kfilednddetailview.cpp b/buildtools/autotools/kfilednddetailview.cpp index c75022fb..098d975f 100644 --- a/buildtools/autotools/kfilednddetailview.cpp +++ b/buildtools/autotools/kfilednddetailview.cpp @@ -17,8 +17,8 @@ ////////////////////////////////////////////////////// // Qt specific includes -#include <qptrlist.h> -#include <qapplication.h> +#include <tqptrlist.h> +#include <tqapplication.h> ////////////////////////////////////////////////////// // KDE specific includes #include <kfileitem.h> @@ -33,7 +33,7 @@ static int autoOpenTime = 750; #endif //----------------------------------------------- -KFileDnDDetailView::KFileDnDDetailView(QWidget *parent, const char *name ) +KFileDnDDetailView::KFileDnDDetailView(TQWidget *parent, const char *name ) : KFileDetailView(parent,name), m_autoOpenTimer( this ), m_autoOpenTime( autoOpenTime ), m_useAutoOpenTimer( true ), m_dropItem(0), m_dndEnabled( true ) @@ -46,14 +46,14 @@ KFileDnDDetailView::KFileDnDDetailView(QWidget *parent, const char *name ) KFileDnDDetailView::~KFileDnDDetailView(){ } //----------------------------------------------- -void KFileDnDDetailView::readConfig( KConfig* config, const QString& group ) { +void KFileDnDDetailView::readConfig( KConfig* config, const TQString& group ) { KConfigGroupSaver cs( config, group ); bool dnd = config->readBoolEntry("DragAndDrop", true ); setDnDEnabled( dnd ); KFileDetailView::readConfig( config, group ); } //----------------------------------------------- -void KFileDnDDetailView::writeConfig( KConfig* config, const QString& group ) { +void KFileDnDDetailView::writeConfig( KConfig* config, const TQString& group ) { KConfigGroupSaver cs( config, group ); config->writeEntry("DragAndDrop", m_dndEnabled ); KFileDetailView::writeConfig( config, group ); @@ -78,7 +78,7 @@ void KFileDnDDetailView::slotOpenFolder(){ } } //----------------------------------------------- -void KFileDnDDetailView::contentsDragEnterEvent( QDragEnterEvent *e ) { +void KFileDnDDetailView::contentsDragEnterEvent( TQDragEnterEvent *e ) { kdDebug (9020) << "KFileDnDDetailView::contentsDragEnterEvent" << endl; @@ -87,14 +87,14 @@ void KFileDnDDetailView::contentsDragEnterEvent( QDragEnterEvent *e ) { return; } e->acceptAction(); - QListViewItem *i = itemAt( contentsToViewport( e->pos() ) ); + TQListViewItem *i = itemAt( contentsToViewport( e->pos() ) ); if ( i && m_useAutoOpenTimer ) { m_dropItem = i; m_autoOpenTimer.start( m_autoOpenTime ); } } //----------------------------------------------- -void KFileDnDDetailView::contentsDragMoveEvent( QDragMoveEvent *e ) { +void KFileDnDDetailView::contentsDragMoveEvent( TQDragMoveEvent *e ) { kdDebug (9020) << "KFileDnDDetailView::contentsDragMoveEvent" << endl; @@ -103,7 +103,7 @@ void KFileDnDDetailView::contentsDragMoveEvent( QDragMoveEvent *e ) { return; } e->acceptAction(); - QListViewItem *i = itemAt( contentsToViewport( e->pos() ) ); + TQListViewItem *i = itemAt( contentsToViewport( e->pos() ) ); if( ! m_useAutoOpenTimer ) return; if ( i ) { @@ -117,7 +117,7 @@ void KFileDnDDetailView::contentsDragMoveEvent( QDragMoveEvent *e ) { m_autoOpenTimer.stop(); } //----------------------------------------------- -void KFileDnDDetailView::contentsDragLeaveEvent( QDragLeaveEvent* ) { +void KFileDnDDetailView::contentsDragLeaveEvent( TQDragLeaveEvent* ) { kdDebug (9020) << "KFileDnDDetailView::contentsDragLeaveEvent" << endl; @@ -127,7 +127,7 @@ void KFileDnDDetailView::contentsDragLeaveEvent( QDragLeaveEvent* ) { } } //----------------------------------------------- -void KFileDnDDetailView::contentsDropEvent( QDropEvent* e ) { +void KFileDnDDetailView::contentsDropEvent( TQDropEvent* e ) { kdDebug (9020) << "KFileDndDetailView::contentsDropEvent" << endl; @@ -158,13 +158,13 @@ void KFileDnDDetailView::startDrag(){ for ( ; it.current(); ++it ){ urls.append( (*it)->url() ); } - QPixmap pixmap; + TQPixmap pixmap; if( urls.count() > 1 ){ pixmap = DesktopIcon( "kmultiple", 16 ); } if( pixmap.isNull() ) pixmap = currentFileItem()->pixmap( 16 ); - QPoint hotspot; + TQPoint hotspot; hotspot.setX( pixmap.width() / 2 ); hotspot.setY( pixmap.height() / 2 ); m_dragObject = KURLDrag::newDrag( urls, widget() ); @@ -172,15 +172,15 @@ void KFileDnDDetailView::startDrag(){ m_dragObject->drag(); // start the drag } //----------------------------------------------- -QDragObject* KFileDnDDetailView::dragObject() const { +TQDragObject* KFileDnDDetailView::dragObject() const { return m_dragObject; } //----------------------------------------------- -bool KFileDnDDetailView::acceptDrag(QDropEvent* e ) const { +bool KFileDnDDetailView::acceptDrag(TQDropEvent* e ) const { return KURLDrag::canDecode( e ) && - ( e->action() == QDropEvent::Copy - || e->action() == QDropEvent::Move - || e->action() == QDropEvent::Link ); + ( e->action() == TQDropEvent::Copy + || e->action() == TQDropEvent::Move + || e->action() == TQDropEvent::Link ); } //----------------------------------------------- void KFileDnDDetailView::setAutoOpenTime( const int& time ){ @@ -191,9 +191,9 @@ void KFileDnDDetailView::setAutoOpenTime( const int& time ){ void KFileDnDDetailView::useAutoOpenTimer( bool use ){ m_useAutoOpenTimer = use; if( use ) - connect( &m_autoOpenTimer, SIGNAL( timeout() ),this, SLOT( slotOpenFolder() ) ); + connect( &m_autoOpenTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotOpenFolder() ) ); else { - disconnect( &m_autoOpenTimer, SIGNAL( timeout() ),this, SLOT( slotOpenFolder() ) ); + disconnect( &m_autoOpenTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotOpenFolder() ) ); m_dropItem = 0L; m_autoOpenTimer.stop(); } diff --git a/buildtools/autotools/kfilednddetailview.h b/buildtools/autotools/kfilednddetailview.h index ecb232c6..0cf13f7e 100644 --- a/buildtools/autotools/kfilednddetailview.h +++ b/buildtools/autotools/kfilednddetailview.h @@ -20,8 +20,8 @@ ////////////////////////////////////////////////////////////////////// // Qt specific include files -#include <qwidget.h> -#include <qtimer.h> +#include <tqwidget.h> +#include <tqtimer.h> ////////////////////////////////////////////////////////////////////// // KDE specific include files #include <kfiledetailview.h> @@ -42,7 +42,7 @@ class KFileDnDDetailView : public KFileDetailView Q_OBJECT public: /** */ - KFileDnDDetailView( QWidget *parent = 0, const char *name = 0 ); + KFileDnDDetailView( TQWidget *parent = 0, const char *name = 0 ); /** */ virtual ~KFileDnDDetailView(); /** @@ -78,20 +78,20 @@ public: return m_useAutoOpenTimer; } /** */ - virtual void readConfig( KConfig*, const QString& group = QString::null ); + virtual void readConfig( KConfig*, const TQString& group = TQString::null ); /** */ - virtual void writeConfig( KConfig*, const QString& group = QString::null ); + virtual void writeConfig( KConfig*, const TQString& group = TQString::null ); signals: // Signals /** * Emitted whenever an decodable item is dropped in the view. - * Note: The @ref QDropEvent contains a @ref KURLDrag object. + * Note: The @ref TQDropEvent contains a @ref KURLDrag object. */ - void dropped( QDropEvent* ); + void dropped( TQDropEvent* ); /** * Emitted whenever an decodable item is dropped in the view - * Note: The @ref QDropEvent contains a @ref KURLDrag object. + * Note: The @ref TQDropEvent contains a @ref KURLDrag object. */ - void dropped( KFileView*, QDropEvent* ); + void dropped( KFileView*, TQDropEvent* ); /** * Emitted whenever an decodable item is dropped in the view. *@param urls contains a list of all dropped @ref KURL @@ -104,13 +104,13 @@ protected slots: // Protected slots void slotOpenFolder(); protected: //Protected Methods /** */ - virtual void contentsDragEnterEvent( QDragEnterEvent *e ); + virtual void contentsDragEnterEvent( TQDragEnterEvent *e ); /** */ - virtual void contentsDragMoveEvent( QDragMoveEvent *e ); + virtual void contentsDragMoveEvent( TQDragMoveEvent *e ); /** */ - virtual void contentsDragLeaveEvent( QDragLeaveEvent *e ); + virtual void contentsDragLeaveEvent( TQDragLeaveEvent *e ); /** */ - virtual void contentsDropEvent( QDropEvent* e ); + virtual void contentsDropEvent( TQDropEvent* e ); /** * Create dragobject encoding the current selection and starts the drag */ @@ -118,16 +118,16 @@ protected: //Protected Methods /** * @returns the dragObject */ - virtual QDragObject* dragObject() const; + virtual TQDragObject* dragObject() const; /** * @returns true if we can decode the drag and support the action */ - virtual bool acceptDrag( QDropEvent* event ) const; + virtual bool acceptDrag( TQDropEvent* event ) const; protected: // Private attributes - QTimer m_autoOpenTimer; + TQTimer m_autoOpenTimer; int m_autoOpenTime; bool m_useAutoOpenTimer; - QListViewItem* m_dropItem; + TQListViewItem* m_dropItem; KURLDrag* m_dragObject; bool m_dndEnabled; }; diff --git a/buildtools/autotools/kfiledndiconview.cpp b/buildtools/autotools/kfiledndiconview.cpp index 47bb32a9..1a491c62 100644 --- a/buildtools/autotools/kfiledndiconview.cpp +++ b/buildtools/autotools/kfiledndiconview.cpp @@ -17,8 +17,8 @@ ////////////////////////////////////////////////////// // Qt specific includes -#include <qptrlist.h> -#include <qapplication.h> +#include <tqptrlist.h> +#include <tqapplication.h> ////////////////////////////////////////////////////// // KDE specific includes #include <kfileitem.h> @@ -33,7 +33,7 @@ static int autoOpenTime = 750; #endif //----------------------------------------------- -KFileDnDIconView::KFileDnDIconView( QWidget *parent, const char *name ) +KFileDnDIconView::KFileDnDIconView( TQWidget *parent, const char *name ) : KFileIconView(parent,name), m_autoOpenTimer( this ), m_autoOpenTime( autoOpenTime ), m_useAutoOpenTimer( true ), m_dropItem(0), m_dndEnabled( true ) @@ -46,14 +46,14 @@ KFileDnDIconView::KFileDnDIconView( QWidget *parent, const char *name ) KFileDnDIconView::~KFileDnDIconView(){ } //----------------------------------------------- -void KFileDnDIconView::readConfig( KConfig* config, const QString& group ) { +void KFileDnDIconView::readConfig( KConfig* config, const TQString& group ) { KConfigGroupSaver cs( config, group ); bool dnd = config->readBoolEntry("EnableDND", true ); setDnDEnabled( dnd ); KFileIconView::readConfig( config, group ); } //----------------------------------------------- -void KFileDnDIconView::writeConfig( KConfig* config, const QString& group ) { +void KFileDnDIconView::writeConfig( KConfig* config, const TQString& group ) { KConfigGroupSaver cs( config, group ); config->writeEntry("EnableDND", m_dndEnabled ); KFileIconView::writeConfig( config, group ); @@ -78,26 +78,26 @@ void KFileDnDIconView::slotOpenFolder(){ } } //----------------------------------------------- -void KFileDnDIconView::contentsDragEnterEvent( QDragEnterEvent *e ) { +void KFileDnDIconView::contentsDragEnterEvent( TQDragEnterEvent *e ) { if ( ! acceptDrag( e ) ) { // can we decode this ? e->accept( false ); // No return; } e->acceptAction(); // Yes - QIconViewItem *i = findItem( contentsToViewport( e->pos() ) ); + TQIconViewItem *i = findItem( contentsToViewport( e->pos() ) ); if ( i && m_useAutoOpenTimer) { // are we over an item ? m_dropItem = i; // set new m_dropItem m_autoOpenTimer.start( m_autoOpenTime ); // restart timer } } //----------------------------------------------- -void KFileDnDIconView::contentsDragMoveEvent( QDragMoveEvent *e ) { +void KFileDnDIconView::contentsDragMoveEvent( TQDragMoveEvent *e ) { if ( ! acceptDrag( e ) ) { // can we decode this ? e->accept( false ); // No return; } e->acceptAction(); // Yes - QIconViewItem *i = findItem( contentsToViewport( e->pos() ) ); + TQIconViewItem *i = findItem( contentsToViewport( e->pos() ) ); if( ! m_useAutoOpenTimer ) return; if ( i ) { // are we over an item ? @@ -111,14 +111,14 @@ void KFileDnDIconView::contentsDragMoveEvent( QDragMoveEvent *e ) { m_autoOpenTimer.stop(); // stop timer } //----------------------------------------------- -void KFileDnDIconView::contentsDragLeaveEvent( QDragLeaveEvent* ) { +void KFileDnDIconView::contentsDragLeaveEvent( TQDragLeaveEvent* ) { if( m_useAutoOpenTimer ) { m_autoOpenTimer.stop(); m_dropItem = 0L; } } //----------------------------------------------- -void KFileDnDIconView::contentsDropEvent( QDropEvent* e ) { +void KFileDnDIconView::contentsDropEvent( TQDropEvent* e ) { if( m_useAutoOpenTimer ) { m_autoOpenTimer.stop(); m_dropItem = 0L; @@ -140,22 +140,22 @@ void KFileDnDIconView::startDrag(){ dragObject()->dragCopy(); // start the drag } //----------------------------------------------- -QDragObject* KFileDnDIconView::dragObject() { +TQDragObject* KFileDnDIconView::dragObject() { // create a list of the URL:s that we want to drag KURL::List urls; KFileItemListIterator it( * KFileView::selectedItems() ); for ( ; it.current(); ++it ){ urls.append( (*it)->url() ); } - QPixmap pixmap; + TQPixmap pixmap; if( urls.count() > 1 ) pixmap = DesktopIcon( "kmultiple", iconSize() ); if( pixmap.isNull() ) pixmap = currentFileItem()->pixmap( iconSize() ); - QPoint hotspot; + TQPoint hotspot; hotspot.setX( pixmap.width() / 2 ); hotspot.setY( pixmap.height() / 2 ); - QDragObject* myDragObject = KURLDrag::newDrag( urls, widget() ); + TQDragObject* myDragObject = KURLDrag::newDrag( urls, widget() ); myDragObject->setPixmap( pixmap, hotspot ); return myDragObject; } @@ -168,9 +168,9 @@ void KFileDnDIconView::setAutoOpenTime( const int& time ){ void KFileDnDIconView::useAutoOpenTimer( bool use ){ m_useAutoOpenTimer = use; if ( use ) - connect( &m_autoOpenTimer, SIGNAL( timeout() ),this, SLOT( slotOpenFolder() ) ); + connect( &m_autoOpenTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotOpenFolder() ) ); else { - disconnect( &m_autoOpenTimer, SIGNAL( timeout() ),this, SLOT( slotOpenFolder() ) ); + disconnect( &m_autoOpenTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotOpenFolder() ) ); m_dropItem = 0L; m_autoOpenTimer.stop(); } @@ -182,11 +182,11 @@ void KFileDnDIconView::setDnDEnabled( bool useDnD ){ viewport()->setAcceptDrops( useDnD ); } //----------------------------------------------- -bool KFileDnDIconView::acceptDrag(QDropEvent* e ) const { +bool KFileDnDIconView::acceptDrag(TQDropEvent* e ) const { return KURLDrag::canDecode( e ) && - ( e->action() == QDropEvent::Copy - || e->action() == QDropEvent::Move - || e->action() == QDropEvent::Link ); + ( e->action() == TQDropEvent::Copy + || e->action() == TQDropEvent::Move + || e->action() == TQDropEvent::Link ); } //----------------------------------------------- #ifndef NO_INCLUDE_MOCFILES diff --git a/buildtools/autotools/kfiledndiconview.h b/buildtools/autotools/kfiledndiconview.h index 65edd91a..e2b3402e 100644 --- a/buildtools/autotools/kfiledndiconview.h +++ b/buildtools/autotools/kfiledndiconview.h @@ -18,8 +18,8 @@ #ifndef KFILEDNDICONVIEW_H #define KFILEDNDICONVIEW_H -#include <qwidget.h> -#include <qtimer.h> +#include <tqwidget.h> +#include <tqtimer.h> #include <kfileiconview.h> #include <kurldrag.h> @@ -37,7 +37,7 @@ class KFileDnDIconView : public KFileIconView Q_OBJECT public: // Public methods - KFileDnDIconView( QWidget *parent = 0, const char *name = 0 ); + KFileDnDIconView( TQWidget *parent = 0, const char *name = 0 ); virtual ~KFileDnDIconView(); /** @@ -77,15 +77,15 @@ public: // Public methods return m_useAutoOpenTimer; } - virtual void readConfig( KConfig*, const QString& group = QString::null ); - virtual void writeConfig( KConfig*, const QString& group = QString::null ); + virtual void readConfig( KConfig*, const TQString& group = TQString::null ); + virtual void writeConfig( KConfig*, const TQString& group = TQString::null ); signals: /** * Emitted whenever an decodable item is dropped in the view. - * Note: The @ref QDropEvent contains a @ref KURLDrag object. + * Note: The @ref TQDropEvent contains a @ref KURLDrag object. */ - void dropped( QDropEvent* ); + void dropped( TQDropEvent* ); protected slots: /** @@ -94,16 +94,16 @@ protected slots: void slotOpenFolder(); protected: - virtual void contentsDragEnterEvent( QDragEnterEvent *e ); - virtual void contentsDragMoveEvent( QDragMoveEvent *e ); - virtual void contentsDragLeaveEvent( QDragLeaveEvent *e ); - virtual void contentsDropEvent( QDropEvent* e ); + virtual void contentsDragEnterEvent( TQDragEnterEvent *e ); + virtual void contentsDragMoveEvent( TQDragMoveEvent *e ); + virtual void contentsDragLeaveEvent( TQDragLeaveEvent *e ); + virtual void contentsDropEvent( TQDropEvent* e ); /** - * Creates a @ref QDragObject containing all urls of the selected @ref KFileItem of the view, + * Creates a @ref TQDragObject containing all urls of the selected @ref KFileItem of the view, * @returns the @ref QDragObject */ - virtual QDragObject* dragObject(); + virtual TQDragObject* dragObject(); /** *Creates the drag item and starts the drag @@ -113,14 +113,14 @@ protected: /** *@returns true if we can decode the drag and support the action */ - virtual bool acceptDrag( QDropEvent* event ) const; + virtual bool acceptDrag( TQDropEvent* event ) const; protected: - QTimer m_autoOpenTimer; + TQTimer m_autoOpenTimer; int m_autoOpenTime; bool m_useAutoOpenTimer; - QIconViewItem* m_dropItem; + TQIconViewItem* m_dropItem; bool m_dndEnabled; }; #endif diff --git a/buildtools/autotools/kimporticonview.cpp b/buildtools/autotools/kimporticonview.cpp index 9b64d3ee..3634886a 100644 --- a/buildtools/autotools/kimporticonview.cpp +++ b/buildtools/autotools/kimporticonview.cpp @@ -14,10 +14,10 @@ * * ***************************************************************************/ -#include <qfontmetrics.h> -#include <qpainter.h> -#include <qrect.h> -#include <qwidget.h> +#include <tqfontmetrics.h> +#include <tqpainter.h> +#include <tqrect.h> +#include <tqwidget.h> #include <kglobalsettings.h> #include <klocale.h> @@ -26,7 +26,7 @@ #include "kimporticonview.h" -KImportIconView::KImportIconView(const QString& strIntro, QWidget *parent, const char *name) +KImportIconView::KImportIconView(const TQString& strIntro, TQWidget *parent, const char *name) : KFileDnDIconView(parent, name) { m_strIntro = strIntro; @@ -40,22 +40,22 @@ KImportIconView::~KImportIconView() { } -void KImportIconView::drawContents ( QPainter *p, int cx, int cy, int cw, int ch ) +void KImportIconView::drawContents ( TQPainter *p, int cx, int cy, int cw, int ch ) { if ( !m_bDropped) { - QIconView::drawContents ( p, cx, cy, cw, ch ); + TQIconView::drawContents ( p, cx, cy, cw, ch ); p->save(); - QFont font ( p->font() ); + TQFont font ( p->font() ); font.setBold ( true ); font.setFamily ( "Helvetica [Adobe]" ); font.setPointSize ( 10 ); p->setFont ( font ); - p->setPen ( QPen ( KGlobalSettings::highlightColor() ) ); + p->setPen ( TQPen ( KGlobalSettings::highlightColor() ) ); - QRect rect = frameRect(); - QFontMetrics fm ( p->font() ); + TQRect rect = frameRect(); + TQFontMetrics fm ( p->font() ); rect.setLeft ( rect.left() + 30 ); rect.setRight ( rect.right() - 30 ); @@ -65,8 +65,8 @@ void KImportIconView::drawContents ( QPainter *p, int cx, int cy, int cw, int ch KWordWrap* wordWrap1 = KWordWrap::formatText( fm, rect, AlignHCenter | WordBreak, m_strIntro ); KWordWrap* wordWrap2 = KWordWrap::formatText( fm, rect, AlignHCenter | WordBreak, i18n("Or just use the buttons.") ); - QRect introRect1 = wordWrap1->boundingRect(); - QRect introRect2 = wordWrap2->boundingRect(); + TQRect introRect1 = wordWrap1->boundingRect(); + TQRect introRect2 = wordWrap2->boundingRect(); wordWrap1->drawText ( p, ( ( frameRect().right() - introRect1.right() ) / 2 ), ( ( frameRect().bottom() - introRect1.bottom() ) / 2 ) - 20, AlignHCenter | AlignVCenter ); wordWrap2->drawText ( p, ( ( frameRect().right() - introRect2.right() ) / 2 ), ( ( frameRect().bottom() - introRect2.bottom() ) / 2 ) + introRect1.bottom(), AlignHCenter | AlignVCenter ); @@ -75,7 +75,7 @@ void KImportIconView::drawContents ( QPainter *p, int cx, int cy, int cw, int ch } else { - QIconView::drawContents ( p, cx, cy, cw, ch ); + TQIconView::drawContents ( p, cx, cy, cw, ch ); } } diff --git a/buildtools/autotools/kimporticonview.h b/buildtools/autotools/kimporticonview.h index 100fc33e..3cfd5745 100644 --- a/buildtools/autotools/kimporticonview.h +++ b/buildtools/autotools/kimporticonview.h @@ -17,7 +17,7 @@ #ifndef KIMPORTICONVIEW_H #define KIMPORTICONVIEW_H -#include <qwidget.h> +#include <tqwidget.h> #include "kfiledndiconview.h" @@ -26,16 +26,16 @@ class KImportIconView : public KFileDnDIconView Q_OBJECT public: - KImportIconView( const QString& strIntro, QWidget *parent, const char *name ); + KImportIconView( const TQString& strIntro, TQWidget *parent, const char *name ); virtual ~KImportIconView(); void somethingDropped ( bool dropped ); protected: - void drawContents ( QPainter *p, int cx, int cy, int cw, int ch ); + void drawContents ( TQPainter *p, int cx, int cy, int cw, int ch ); private: - QString m_strIntro; + TQString m_strIntro; bool m_bDropped; }; diff --git a/buildtools/autotools/makefilehandler.cpp b/buildtools/autotools/makefilehandler.cpp index 03ad5277..db30508d 100644 --- a/buildtools/autotools/makefilehandler.cpp +++ b/buildtools/autotools/makefilehandler.cpp @@ -12,12 +12,12 @@ *************************************************************************** */ -#include <qdir.h> -#include <qglobal.h> -#include <qmap.h> -#include <qregexp.h> -#include <qstring.h> -#include <qvaluelist.h> +#include <tqdir.h> +#include <tqglobal.h> +#include <tqmap.h> +#include <tqregexp.h> +#include <tqstring.h> +#include <tqvaluelist.h> #include <kdebug.h> @@ -26,13 +26,13 @@ #include "makefilehandler.h" -typedef QValueList<AutoTools::AST*> ASTList; +typedef TQValueList<AutoTools::AST*> ASTList; class MakefileHandler::Private { public: - QMap<QString, AutoTools::ProjectAST*> projects; - QMap<QString, QString> folderToFileMap; + TQMap<TQString, AutoTools::ProjectAST*> projects; + TQMap<TQString, TQString> folderToFileMap; }; MakefileHandler::MakefileHandler() @@ -45,23 +45,23 @@ MakefileHandler::~MakefileHandler() delete d; } -void MakefileHandler::parse( const QString& folder, bool recursive ) +void MakefileHandler::parse( const TQString& folder, bool recursive ) { //look for either Makefile.am.in, Makefile.am, or Makefile.in, in that order AutoTools::ProjectAST* ast; int ret = -1; - QString filePath = folder + "/Makefile.am.in"; - if ( QFile::exists( filePath ) ) + TQString filePath = folder + "/Makefile.am.in"; + if ( TQFile::exists( filePath ) ) ret = AutoTools::Driver::parseFile( filePath, &ast ); else { filePath = folder + "/Makefile.am"; - if ( QFile::exists( filePath ) ) + if ( TQFile::exists( filePath ) ) ret = AutoTools::Driver::parseFile( filePath, &ast ); else { filePath = folder + "/Makefile.in"; - if ( QFile::exists( filePath ) ) + if ( TQFile::exists( filePath ) ) ret = AutoTools::Driver::parseFile( filePath, &ast ); else kdDebug(9020) << k_funcinfo << "no appropriate file to parse in " @@ -81,8 +81,8 @@ void MakefileHandler::parse( const QString& folder, bool recursive ) if ( recursive && ast && ast->hasChildren() ) { - QValueList<AutoTools::AST*> astChildList = ast->children(); - QValueList<AutoTools::AST*>::iterator it(astChildList.begin()), clEnd(astChildList.end()); + TQValueList<AutoTools::AST*> astChildList = ast->children(); + TQValueList<AutoTools::AST*>::iterator it(astChildList.begin()), clEnd(astChildList.end()); for ( ; it != clEnd; ++it ) { if ( (*it)->nodeType() == AutoTools::AST::AssignmentAST ) @@ -90,14 +90,14 @@ void MakefileHandler::parse( const QString& folder, bool recursive ) AutoTools::AssignmentAST* assignment = static_cast<AutoTools::AssignmentAST*>( (*it) ); if ( assignment->scopedID == "SUBDIRS" ) { - QString list = assignment->values.join( QString::null ); + TQString list = assignment->values.join( TQString::null ); list.simplifyWhiteSpace(); kdDebug(9020) << k_funcinfo << "subdirs is " << list << endl; - QStringList subdirList = QStringList::split( " ", list ); - QStringList::iterator vit = subdirList.begin(); + TQStringList subdirList = TQStringList::split( " ", list ); + TQStringList::iterator vit = subdirList.begin(); for ( ; vit != subdirList.end(); ++vit ) { - QString realDir = ( *vit ); + TQString realDir = ( *vit ); if ( realDir.startsWith( "\\" ) ) realDir.remove( 0, 1 ); @@ -120,26 +120,26 @@ void MakefileHandler::parse( const QString& folder, bool recursive ) } } -AutoTools::ProjectAST* MakefileHandler::astForFolder( const QString& folderPath ) +AutoTools::ProjectAST* MakefileHandler::astForFolder( const TQString& folderPath ) { if ( d->folderToFileMap.contains( folderPath ) ) { - QString filePath = d->folderToFileMap[folderPath]; + TQString filePath = d->folderToFileMap[folderPath]; return d->projects[filePath]; } else return 0; } -bool MakefileHandler::isVariable( const QString& item ) const +bool MakefileHandler::isVariable( const TQString& item ) const { - if ( item.contains( QRegExp( "(\\$\\([a-zA-Z0-9_-]*\\)|@[a-zA-Z0-9_-]*@)" ) ) ) + if ( item.contains( TQRegExp( "(\\$\\([a-zA-Z0-9_-]*\\)|@[a-zA-Z0-9_-]*@)" ) ) ) return true; else return false; } -QString MakefileHandler::resolveVariable( const QString& variable, AutoTools::ProjectAST* ast ) +TQString MakefileHandler::resolveVariable( const TQString& variable, AutoTools::ProjectAST* ast ) { if ( !ast ) return variable; @@ -155,8 +155,8 @@ QString MakefileHandler::resolveVariable( const QString& variable, AutoTools::Pr if ( variable.find( assignment->scopedID ) != -1 ) { kdDebug(9020) << k_funcinfo << "Resolving variable '" << variable << "' to '" - << assignment->values.join( QString::null ).stripWhiteSpace() << "'" << endl; - return assignment->values.join( QString::null ).stripWhiteSpace(); + << assignment->values.join( TQString::null ).stripWhiteSpace() << "'" << endl; + return assignment->values.join( TQString::null ).stripWhiteSpace(); } } } diff --git a/buildtools/autotools/makefilehandler.h b/buildtools/autotools/makefilehandler.h index 77045fe9..a104774c 100644 --- a/buildtools/autotools/makefilehandler.h +++ b/buildtools/autotools/makefilehandler.h @@ -40,20 +40,20 @@ public: * \param folder, the folder to parse * \param recursive if true, subfolders will be parsed - defaults to true */ - void parse( const QString& folder, bool recursive = true ); + void parse( const TQString& folder, bool recursive = true ); /** * Get the AST for a certain path * \param folderPath the path of the folder to get an AST for * \return the AST that represents a particular folder */ - AutoTools::ProjectAST* astForFolder( const QString& folderPath ); + AutoTools::ProjectAST* astForFolder( const TQString& folderPath ); /** * Check if a string is an automake variable * \return true if it is an automake variable, false otherwise */ - bool isVariable( const QString& item ) const; + bool isVariable( const TQString& item ) const; /** * Find the value for the variable specified by \p variable @@ -61,7 +61,7 @@ public: * \param ast the AST to use to look for the variable in * \return the value to substitute for the variable */ - QString resolveVariable( const QString& variable, + TQString resolveVariable( const TQString& variable, AutoTools::ProjectAST* ast ); diff --git a/buildtools/autotools/managecustomcommand.cpp b/buildtools/autotools/managecustomcommand.cpp index 31d1d534..a602a3a9 100644 --- a/buildtools/autotools/managecustomcommand.cpp +++ b/buildtools/autotools/managecustomcommand.cpp @@ -18,11 +18,11 @@ ***************************************************************************/ #include "managecustomcommand.h" -#include <qtable.h> +#include <tqtable.h> #include <klocale.h> -ManageCustomCommand::ManageCustomCommand(QWidget *parent, const char *name) +ManageCustomCommand::ManageCustomCommand(TQWidget *parent, const char *name) :ManageCustomBuildCommandsBase(parent, name) { } @@ -41,7 +41,7 @@ void ManageCustomCommand::removeButton_clicked() void ManageCustomCommand::setRowProperties(int row) { commandsTable->setItem(row, 2, - new QComboTableItem(commandsTable, QStringList::split(",", + new TQComboTableItem(commandsTable, TQStringList::split(",", i18n("this is a list of items in the combobox", "Make target,Make target (as root),Make command,Make command (as root),Command,Command (as root)")))); } diff --git a/buildtools/autotools/managecustomcommand.h b/buildtools/autotools/managecustomcommand.h index 12ddeae7..b4e4af49 100644 --- a/buildtools/autotools/managecustomcommand.h +++ b/buildtools/autotools/managecustomcommand.h @@ -25,7 +25,7 @@ class ManageCustomCommand: public ManageCustomBuildCommandsBase { Q_OBJECT public: - ManageCustomCommand( QWidget *parent = 0, const char *name = 0 ); + ManageCustomCommand( TQWidget *parent = 0, const char *name = 0 ); void setRowProperties( int row ); public slots: diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp index 97c449e7..e44a32c3 100644 --- a/buildtools/autotools/misc.cpp +++ b/buildtools/autotools/misc.cpp @@ -9,11 +9,11 @@ * * ***************************************************************************/ -#include <qdir.h> -#include <qfile.h> -#include <qregexp.h> -#include <qtextstream.h> -#include <qdict.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqregexp.h> +#include <tqtextstream.h> +#include <tqdict.h> #include <kdebug.h> #include <kparts/componentfactory.h> @@ -24,7 +24,7 @@ #include "kdevcompileroptions.h" -static KDevCompilerOptions *createCompilerOptions( const QString &name, QObject *parent ) +static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent ) { KService::Ptr service = KService::serviceByDesktopName( name ); if ( !service ) @@ -34,20 +34,20 @@ static KDevCompilerOptions *createCompilerOptions( const QString &name, QObject } - KLibFactory *factory = KLibLoader::self()->factory(QFile::encodeName(service->library())); + KLibFactory *factory = KLibLoader::self()->factory(TQFile::encodeName(service->library())); if (!factory) { - QString errorMessage = KLibLoader::self()->lastErrorMessage(); + TQString errorMessage = KLibLoader::self()->lastErrorMessage(); kdDebug(9020) << "There was an error loading the module " << service->name() << endl << "The diagnostics is:" << endl << errorMessage << endl; exit(1); } - QStringList args; - QVariant prop = service->property("X-KDevelop-Args"); + TQStringList args; + TQVariant prop = service->property("X-KDevelop-Args"); if (prop.isValid()) - args = QStringList::split(" ", prop.toString()); + args = TQStringList::split(" ", prop.toString()); - QObject *obj = factory->create(parent, service->name().latin1(), + TQObject *obj = factory->create(parent, service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) { @@ -59,10 +59,10 @@ static KDevCompilerOptions *createCompilerOptions( const QString &name, QObject return dlg; /* - QStringList args; - QVariant prop = service->property( "X-KDevelop-Args" ); + TQStringList args; + TQVariant prop = service->property( "X-KDevelop-Args" ); if ( prop.isValid() ) - args = QStringList::split( " ", prop.toString() ); + args = TQStringList::split( " ", prop.toString() ); return KParts::ComponentFactory ::createInstanceFromService<KDevCompilerOptions>( service, parent, @@ -70,25 +70,25 @@ static KDevCompilerOptions *createCompilerOptions( const QString &name, QObject } -QString AutoProjectTool::execFlagsDialog( const QString &compiler, const QString &flags, QWidget *parent ) +TQString AutoProjectTool::execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent ) { KDevCompilerOptions * plugin = createCompilerOptions( compiler, parent ); if ( plugin ) { - QString newflags = plugin->exec( parent, flags ); + TQString newflags = plugin->exec( parent, flags ); delete plugin; return newflags; } - return QString::null; + return TQString::null; } -QString AutoProjectTool::canonicalize( const QString &str ) +TQString AutoProjectTool::canonicalize( const TQString &str ) { - QString res; + TQString res; for ( uint i = 0; i < str.length(); ++i ) - res += ( str[ i ].isLetterOrNumber() || str[ i ] == '@' ) ? str[ i ] : QChar( '_' ); + res += ( str[ i ].isLetterOrNumber() || str[ i ] == '@' ) ? str[ i ] : TQChar( '_' ); kdDebug(9020) << k_funcinfo << "normalized '" << str << "' to '" << res << "'" << endl; return res; @@ -101,26 +101,26 @@ QString AutoProjectTool::canonicalize( const QString &str ) * @param fileName * @param variables */ -void AutoProjectTool::parseMakefileam(const QString &fileName, QMap<QString, QString> *variables) +void AutoProjectTool::parseMakefileam(const TQString &fileName, TQMap<TQString, TQString> *variables) { - QFile f(fileName); + TQFile f(fileName); if (!f.open(IO_ReadOnly)) { return ; } - QTextStream stream(&f); + TQTextStream stream(&f); - QRegExp re("^(#kdevelop:[ \t]*)?([A-Za-z][@A-Za-z0-9_]*)[ \t]*([:\\+]?=)[ \t]*(.*)$"); + TQRegExp re("^(#kdevelop:[ \t]*)?([A-Za-z][@A-Za-z0-9_]*)[ \t]*([:\\+]?=)[ \t]*(.*)$"); - QString last; + TQString last; bool multiLine = false; while (!stream.atEnd()) { - QString s = stream.readLine().stripWhiteSpace(); + TQString s = stream.readLine().stripWhiteSpace(); if (re.exactMatch(s)) { - QString lhs = re.cap(2); - QString rhs = re.cap(4); + TQString lhs = re.cap(2); + TQString rhs = re.cap(4); if (rhs[ rhs.length() - 1 ] == '\\') { multiLine = true; @@ -130,7 +130,7 @@ void AutoProjectTool::parseMakefileam(const QString &fileName, QMap<QString, QSt // The need for stripWhiteSpace seems to be a Qt bug. // make our list nice and neat. - QStringList bits = QStringList::split(" ", rhs); + TQStringList bits = TQStringList::split(" ", rhs); rhs = bits.join(" "); if (re.cap(3) == "+=") { @@ -151,24 +151,24 @@ void AutoProjectTool::parseMakefileam(const QString &fileName, QMap<QString, QSt { multiLine = false; } - QStringList bits = QStringList::split(" ", s); + TQStringList bits = TQStringList::split(" ", s); ((*variables)[last] += ' ') += bits.join(" "); } } f.close(); - QMap<QString, QString> list; + TQMap<TQString, TQString> list; - for (QMap<QString, QString>::iterator iter = variables->begin();iter != variables->end();iter++) + for (TQMap<TQString, TQString>::iterator iter = variables->begin();iter != variables->end();iter++) { - QStringList items = QStringList::split(" ", iter.data()); - QMap<QString, QString> unique; + TQStringList items = TQStringList::split(" ", iter.data()); + TQMap<TQString, TQString> unique; for (uint i = 0;i < items.size();i++) { unique.insert(items[i], ""); } - QString line; - for (QMap<QString, QString>::iterator it = unique.begin();it != unique.end();it++) + TQString line; + for (TQMap<TQString, TQString>::iterator it = unique.begin();it != unique.end();it++) { line += it.key() + ' '; } @@ -189,7 +189,7 @@ void AutoProjectTool::parseMakefileam(const QString &fileName, QMap<QString, QSt * @param fileName * @param variables key=value string of entries to add */ -void AutoProjectTool::addToMakefileam(const QString &fileName, QMap<QString, QString> variables) +void AutoProjectTool::addToMakefileam(const TQString &fileName, TQMap<TQString, TQString> variables) { AutoProjectTool::addRemoveMakefileam(fileName, variables, true); } @@ -202,42 +202,42 @@ void AutoProjectTool::addToMakefileam(const QString &fileName, QMap<QString, QSt * @param fileName * @param variables key=value string of entries to add */ -void AutoProjectTool::setMakefileam ( const QString &fileName, QMap<QString, QString> variables ) +void AutoProjectTool::setMakefileam ( const TQString &fileName, TQMap<TQString, TQString> variables ) { - for ( QMap<QString, QString>::Iterator it0 = variables.begin(); it0 != variables.end(); ++it0 ) + for ( TQMap<TQString, TQString>::Iterator it0 = variables.begin(); it0 != variables.end(); ++it0 ) { kdDebug ( 9020 ) << "key (set): " << it0.key() << "=" << it0.data() << endl; } // input file reading - QFile fin ( fileName ); + TQFile fin ( fileName ); if ( !fin.open ( IO_ReadOnly ) ) { return ; } - QTextStream ins ( &fin ); + TQTextStream ins ( &fin ); // output file writing. - QFile fout ( fileName + "#" ); + TQFile fout ( fileName + "#" ); if ( !fout.open ( IO_WriteOnly ) ) { fin.close(); return ; } - QTextStream outs ( &fout ); + TQTextStream outs ( &fout ); // variables - QRegExp re ( "^(#kdevelop:[ \t]*)?([A-Za-z][@A-Za-z0-9_]*)[ \t]*([:\\+]?=)[ \t]*(.*)$" ); + TQRegExp re ( "^(#kdevelop:[ \t]*)?([A-Za-z][@A-Za-z0-9_]*)[ \t]*([:\\+]?=)[ \t]*(.*)$" ); bool multiLine = false; - QString lastLhs; - QMap<QString, QString> seenLhs; + TQString lastLhs; + TQMap<TQString, TQString> seenLhs; while ( !fin.atEnd() ) { - QString s = ins.readLine(); + TQString s = ins.readLine(); if ( re.exactMatch ( s ) ) { - QString lhs = re.cap ( 2 ); + TQString lhs = re.cap ( 2 ); bool notFound = ( variables.find ( lhs ) == variables.end() ); if ( notFound ) @@ -254,7 +254,7 @@ void AutoProjectTool::setMakefileam ( const QString &fileName, QMap<QString, QSt else { // we are interested in this line.. - QString rhs = re.cap ( 4 ).stripWhiteSpace(); + TQString rhs = re.cap ( 4 ).stripWhiteSpace(); if ( rhs[ rhs.length() - 1 ] == '\\' ) { // save it for when we have the whole line.. @@ -266,11 +266,11 @@ void AutoProjectTool::setMakefileam ( const QString &fileName, QMap<QString, QSt // deal with it now - a single line // we are adding our interested values to this line and writing it // now write the line out if it is not going to be empty. - QString newLine ( lhs ); + TQString newLine ( lhs ); newLine += " = "; bool added = false; int len = newLine.length(); - QStringList variableList = QStringList::split ( ' ', variables[lhs] ); + TQStringList variableList = TQStringList::split ( ' ', variables[lhs] ); for ( uint count = 0; count < variableList.size(); count++ ) { len += variableList[count].length() + 1; @@ -314,11 +314,11 @@ void AutoProjectTool::setMakefileam ( const QString &fileName, QMap<QString, QSt { // we are adding our interested values to this line and writing it // now write the line out if it is not going to be empty. - QString newLine ( lastLhs ); + TQString newLine ( lastLhs ); newLine += " = "; bool added = false; int len = newLine.length(); - QStringList variableList = QStringList::split ( ' ', variables[lastLhs] ); + TQStringList variableList = TQStringList::split ( ' ', variables[lastLhs] ); for ( uint count = 0; count < variableList.size(); count++ ) { len += variableList[count].length() + 1; @@ -350,13 +350,13 @@ void AutoProjectTool::setMakefileam ( const QString &fileName, QMap<QString, QSt } } - for ( QMap<QString, QString>::Iterator it0 = variables.begin(); it0 != variables.end(); ++it0 ) + for ( TQMap<TQString, TQString>::Iterator it0 = variables.begin(); it0 != variables.end(); ++it0 ) { - QString newLine ( it0.key() ); + TQString newLine ( it0.key() ); newLine += " = "; bool added = false; int len = newLine.length(); - QStringList variableList = QStringList::split ( ' ', it0.data() ); + TQStringList variableList = TQStringList::split ( ' ', it0.data() ); for ( uint count = 0; count < variableList.size(); count++ ) { len += variableList[count].length() + 1; @@ -381,7 +381,7 @@ void AutoProjectTool::setMakefileam ( const QString &fileName, QMap<QString, QSt fin.close(); fout.close(); - QDir().rename ( fileName + "#", fileName ); + TQDir().rename ( fileName + "#", fileName ); } @@ -394,39 +394,39 @@ void AutoProjectTool::setMakefileam ( const QString &fileName, QMap<QString, QSt * @param add true= add these key,value pairs, false = remove. You can have empty values for an add - the whole line is * removed. For adding, we will not add an empty line. */ -void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap<QString, QString> variables, bool add) +void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQString, TQString> variables, bool add) { // input file reading - QFile fin(fileName); + TQFile fin(fileName); if (!fin.open(IO_ReadOnly)) { return ; } - QTextStream ins(&fin); + TQTextStream ins(&fin); // output file writing. - QFile fout(fileName + "#"); + TQFile fout(fileName + "#"); if (!fout.open(IO_WriteOnly)) { fin.close(); return ; } - QTextStream outs(&fout); + TQTextStream outs(&fout); // variables - QRegExp re("^(#kdevelop:[ \t]*)?([A-Za-z][@A-Za-z0-9_]*)[ \t]*([:\\+]?=)[ \t]*(.*)$"); + TQRegExp re("^(#kdevelop:[ \t]*)?([A-Za-z][@A-Za-z0-9_]*)[ \t]*([:\\+]?=)[ \t]*(.*)$"); // build key=map of values to add // map can be empty.we never add an empty key, but do remove empty keys from the file.. - QDict< QMap<QString, bool> > interest; - for (QMap<QString, QString>::Iterator it0 = variables.begin(); it0 != variables.end(); ++it0) + TQDict< TQMap<TQString, bool> > interest; + for (TQMap<TQString, TQString>::Iterator it0 = variables.begin(); it0 != variables.end(); ++it0) { kdDebug(9020) << "key (" << add<<"): " << it0.key() << "="<< it0.data() << endl; - QMap<QString, bool>* set = new QMap<QString, bool>(); + TQMap<TQString, bool>* set = new TQMap<TQString, bool>(); if (!it0.data().stripWhiteSpace().isEmpty()) { - QStringList variableList = QStringList::split(' ', it0.data()); + TQStringList variableList = TQStringList::split(' ', it0.data()); for (uint i = 0; i < variableList.count(); i++) { @@ -437,16 +437,16 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap<QString, } bool multiLine = false; - QString lastLhs; - QStringList lastRhs; - QMap<QString, QString> seenLhs; + TQString lastLhs; + TQStringList lastRhs; + TQMap<TQString, TQString> seenLhs; while (!fin.atEnd()) { - QString s = ins.readLine(); + TQString s = ins.readLine(); if (re.exactMatch(s)) { - QString lhs = re.cap(2); - QMap<QString, bool>* ourRhs = interest.find(lhs); + TQString lhs = re.cap(2); + TQMap<TQString, bool>* ourRhs = interest.find(lhs); if (!ourRhs) { @@ -457,20 +457,20 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap<QString, else { // we are interested in this line.. - QString rhs = re.cap(4).stripWhiteSpace(); + TQString rhs = re.cap(4).stripWhiteSpace(); if (rhs[ rhs.length() - 1 ] == '\\') { // save it for when we have the whole line.. multiLine = true; lastLhs = lhs; rhs.setLength(rhs.length() - 1); - lastRhs += QStringList::split(" ", rhs); + lastRhs += TQStringList::split(" ", rhs); } else { // deal with it now. - QStringList bits = QStringList::split(" ", rhs); + TQStringList bits = TQStringList::split(" ", rhs); if (add) { // we are adding our interested values to this line and writing it @@ -478,7 +478,7 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap<QString, // add this line to we we want to add to remove duplicates. for (uint index = 0; index < bits.size(); index++) { - QMap<QString, bool>::iterator findEntry = ourRhs->find(bits[index]); + TQMap<TQString, bool>::iterator findEntry = ourRhs->find(bits[index]); if (findEntry == ourRhs->end()) { // we haven't seen it, so add it, so we don't add it again later.. @@ -489,7 +489,7 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap<QString, // case we will do so soon. so we can ignore this now.. } // now write the line out if it is not going to be empty. - QString newLine(lhs); + TQString newLine(lhs); if (seenLhs.find(lhs) == seenLhs.end()) { newLine += " = "; @@ -502,7 +502,7 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap<QString, int len = newLine.length(); bool added = false; - QValueList<QString> keys = ourRhs->keys(); + TQValueList<TQString> keys = ourRhs->keys(); for (uint count = 0; count < keys.size(); count++) { // if out entry is true, add it.. @@ -536,7 +536,7 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap<QString, if (!ourRhs->empty()) { // check if any of these values are down to remove. - QString newLine(lhs); + TQString newLine(lhs); if (seenLhs.find(lhs) == seenLhs.end()) { newLine += " = "; @@ -549,9 +549,9 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap<QString, int len = newLine.length(); bool added = false; - for (QStringList::Iterator posIter = bits.begin(); posIter != bits.end();posIter++) + for (TQStringList::Iterator posIter = bits.begin(); posIter != bits.end();posIter++) { - QMap<QString, bool>::iterator findEntry = ourRhs->find(*posIter); + TQMap<TQString, bool>::iterator findEntry = ourRhs->find(*posIter); if (findEntry == ourRhs->end()) { // we do not want to remove it.. @@ -592,13 +592,13 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap<QString, // end of the multi line.. multiLine = false; } - lastRhs += QStringList::split(" ", s); + lastRhs += TQStringList::split(" ", s); if (!multiLine) { // now we have to deal with this multiLine value.. // ourRhs will always be a value, as we only get multiLine if we're interested in it.. - QMap<QString, bool>* ourRhs = interest.find(lastLhs); + TQMap<TQString, bool>* ourRhs = interest.find(lastLhs); if (add) { @@ -607,7 +607,7 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap<QString, // add this line to we we want to add to remove duplicates. for (uint index = 0; index < lastRhs.size(); index++) { - QMap<QString, bool>::iterator findEntry = ourRhs->find(lastRhs[index]); + TQMap<TQString, bool>::iterator findEntry = ourRhs->find(lastRhs[index]); if (findEntry == ourRhs->end()) { // we haven't seen it, so add it, so we don't add it again later.. @@ -618,7 +618,7 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap<QString, // case we will do so soon. so we can ignore this now.. } // now write the line out if it is not going to be empty. - QString newLine(lastLhs); + TQString newLine(lastLhs); if (seenLhs.find(lastLhs) == seenLhs.end()) { newLine += " = "; @@ -631,7 +631,7 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap<QString, int len = newLine.length(); bool added = false; - QValueList<QString> keys = ourRhs->keys(); + TQValueList<TQString> keys = ourRhs->keys(); for (uint count = 0; count < keys.size(); count++) { // if out entry is true, add it.. @@ -664,7 +664,7 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap<QString, if (!ourRhs->empty()) { // check if any of these values are down to remove. - QString newLine(lastLhs); + TQString newLine(lastLhs); if (seenLhs.find(lastLhs) == seenLhs.end()) { newLine += " = "; @@ -676,9 +676,9 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap<QString, } int len = newLine.length(); bool added = false; - for (QStringList::Iterator posIter = lastRhs.begin(); posIter != lastRhs.end();posIter++) + for (TQStringList::Iterator posIter = lastRhs.begin(); posIter != lastRhs.end();posIter++) { - QMap<QString, bool>::iterator findEntry = ourRhs->find(*posIter); + TQMap<TQString, bool>::iterator findEntry = ourRhs->find(*posIter); if (findEntry == ourRhs->end()) { // we do not want to remove it.. @@ -717,13 +717,13 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap<QString, if (add) { - QDictIterator<QMap<QString, bool> > it(interest); + TQDictIterator<TQMap<TQString, bool> > it(interest); for (; it.current(); ++it) { - QString lhs = it.currentKey(); - QMap<QString, bool>* ourRhs = it.current(); + TQString lhs = it.currentKey(); + TQMap<TQString, bool>* ourRhs = it.current(); - QString newLine(lhs); + TQString newLine(lhs); if (seenLhs.find(lhs) == seenLhs.end()) { newLine += " = "; @@ -735,7 +735,7 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap<QString, } int len = newLine.length(); bool added = false; - QValueList<QString> keys = ourRhs->keys(); + TQValueList<TQString> keys = ourRhs->keys(); for (uint count = 0; count < keys.size(); count++) { if ((*ourRhs)[keys[count]]) @@ -767,7 +767,7 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap<QString, fin.close(); fout.close(); - QDir().rename(fileName + "#", fileName); + TQDir().rename(fileName + "#", fileName); } /** @@ -776,7 +776,7 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap<QString, * @param fileName full path to Makefile.am * @param variables lines to remove items from. */ -void AutoProjectTool::removeFromMakefileam(const QString &fileName, QMap <QString, QString> variables) +void AutoProjectTool::removeFromMakefileam(const TQString &fileName, TQMap <TQString, TQString> variables) { AutoProjectTool::addRemoveMakefileam(fileName, variables, false); } @@ -787,35 +787,35 @@ void AutoProjectTool::removeFromMakefileam(const QString &fileName, QMap <QStrin * @param configureinpath * @return list of all the values */ -QStringList AutoProjectTool::configureinLoadMakefiles(QString configureinpath) +TQStringList AutoProjectTool::configureinLoadMakefiles(TQString configureinpath) { - QFile configurein(configureinpath); + TQFile configurein(configureinpath); if (!configurein.open(IO_ReadOnly)) { kdDebug(9020) << k_funcinfo << " - couldn't open file: " << configureinpath << endl; - return QStringList(); + return TQStringList(); } - QTextStream stream(&configurein); - QStringList list; + TQTextStream stream(&configurein); + TQStringList list; - QString ac_match("^AC_OUTPUT"); + TQString ac_match("^AC_OUTPUT"); - QRegExp ac_regex(ac_match); + TQRegExp ac_regex(ac_match); bool multiLine = false; - QChar cont('\\'); - QRegExp close("\\)"); - QRegExp open("\\("); + TQChar cont('\\'); + TQRegExp close("\\)"); + TQRegExp open("\\("); while (!stream.eof()) { - QString line = stream.readLine().stripWhiteSpace(); + TQString line = stream.readLine().stripWhiteSpace(); if (multiLine) { if (close.search(line) >= 0) { line = line.replace(close.search(line), 1, ""); - list += QStringList::split(" ", line); + list += TQStringList::split(" ", line); break; } else @@ -824,7 +824,7 @@ QStringList AutoProjectTool::configureinLoadMakefiles(QString configureinpath) { line.setLength(line.length() - 1); } - list += QStringList::split(" ", line); + list += TQStringList::split(" ", line); } } else if (ac_regex.search(line) >= 0) @@ -849,7 +849,7 @@ QStringList AutoProjectTool::configureinLoadMakefiles(QString configureinpath) } } - list = QStringList::split(" ", line); + list = TQStringList::split(" ", line); if (!multiLine) { @@ -870,42 +870,42 @@ QStringList AutoProjectTool::configureinLoadMakefiles(QString configureinpath) * @param configureinpath * @param makefiles */ -void AutoProjectTool::configureinSaveMakefiles(QString fileName, QStringList makefiles) +void AutoProjectTool::configureinSaveMakefiles(TQString fileName, TQStringList makefiles) { // input file reading - QFile fin(fileName); + TQFile fin(fileName); if (!fin.open(IO_ReadOnly)) { return ; } - QTextStream ins(&fin); + TQTextStream ins(&fin); // output file writing. - QFile fout(fileName + "#"); + TQFile fout(fileName + "#"); if (!fout.open(IO_WriteOnly)) { fin.close(); return ; } - QTextStream outs(&fout); + TQTextStream outs(&fout); // remove duplicates if any.. - QMap<QString, QString> toAdd; + TQMap<TQString, TQString> toAdd; for (uint i = 0; i < makefiles.size();i++) { toAdd.insert(makefiles[i].stripWhiteSpace(), ""); } - QString ac_match("^AC_OUTPUT"); - QRegExp ac_regex(ac_match); + TQString ac_match("^AC_OUTPUT"); + TQRegExp ac_regex(ac_match); bool multiLine = false; - QChar cont('\\'); - QRegExp close("\\)"); - QRegExp open("\\("); + TQChar cont('\\'); + TQRegExp close("\\)"); + TQRegExp open("\\("); bool done = false; while (!fin.atEnd()) { - QString line = ins.readLine(); + TQString line = ins.readLine(); if (done) { outs << line << endl; @@ -918,8 +918,8 @@ void AutoProjectTool::configureinSaveMakefiles(QString fileName, QStringList mak if (close.search(line) >= 0) { int len = 10; - QString acline("AC_OUTPUT("); - for (QMap<QString, QString>::iterator iter = toAdd.begin();iter != toAdd.end();iter++) + TQString acline("AC_OUTPUT("); + for (TQMap<TQString, TQString>::iterator iter = toAdd.begin();iter != toAdd.end();iter++) { len += iter.key().length(); if (len > 80) @@ -964,8 +964,8 @@ void AutoProjectTool::configureinSaveMakefiles(QString fileName, QStringList mak if (!multiLine) { int len = 10; - QString acline("AC_OUTPUT("); - for (QMap<QString, QString>::iterator iter = toAdd.begin();iter != toAdd.end();iter++) + TQString acline("AC_OUTPUT("); + for (TQMap<TQString, TQString>::iterator iter = toAdd.begin();iter != toAdd.end();iter++) { len += iter.key().length(); if (len > 80) @@ -992,7 +992,7 @@ void AutoProjectTool::configureinSaveMakefiles(QString fileName, QStringList mak fin.close(); fout.close(); - QDir().rename(fileName + "#", fileName); + TQDir().rename(fileName + "#", fileName); } diff --git a/buildtools/autotools/misc.h b/buildtools/autotools/misc.h index 9db9919e..2f8a092d 100644 --- a/buildtools/autotools/misc.h +++ b/buildtools/autotools/misc.h @@ -12,9 +12,9 @@ #ifndef _MISC_H_ #define _MISC_H_ -#include <qcstring.h> -#include <qmap.h> -#include <qwidget.h> +#include <tqcstring.h> +#include <tqmap.h> +#include <tqwidget.h> /** * Very small helper class. It has just static methods. @@ -27,36 +27,36 @@ public: * Loads the compiler options plugin for the given compiler, executes the dialog * with some initial flags, and returns the new flags. */ - static QString execFlagsDialog( const QString &compiler, const QString &flags, QWidget *parent ); + static TQString execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent ); /** * Returns the canonicalized version of a file name, i.e. * the file name with special characters replaced by underscores */ - static QString canonicalize( const QString &str ); + static TQString canonicalize( const TQString &str ); /** * Parses a Makefile.am and stores its variable assignments * in a map. */ - static void parseMakefileam( const QString &filename, QMap<QString, QString> *variables ); + static void parseMakefileam( const TQString &filename, TQMap<TQString, TQString> *variables ); - static void addToMakefileam( const QString &filename, QMap<QString, QString> variables ); - static void removeFromMakefileam( const QString &filename, QMap<QString, QString> variables ); - static void setMakefileam ( const QString &fileName, QMap<QString, QString> variables ); + static void addToMakefileam( const TQString &filename, TQMap<TQString, TQString> variables ); + static void removeFromMakefileam( const TQString &filename, TQMap<TQString, TQString> variables ); + static void setMakefileam ( const TQString &fileName, TQMap<TQString, TQString> variables ); - static void addRemoveMakefileam(const QString &fileName, QMap<QString, QString> variables, bool add); + static void addRemoveMakefileam(const TQString &fileName, TQMap<TQString, TQString> variables, bool add); /** * Parses configure.in and splits AC_OUTPUT into a QStringList */ - static QStringList configureinLoadMakefiles( QString configureinpath ); + static TQStringList configureinLoadMakefiles( TQString configureinpath ); /** - * Receives a QStringList and puts it into + * Receives a TQStringList and puts it into * configure.in as arguments to AC_OUTPUT */ - static void configureinSaveMakefiles( QString configureinpath, QStringList makefiles ); + static void configureinSaveMakefiles( TQString configureinpath, TQStringList makefiles ); }; diff --git a/buildtools/autotools/removefiledlg.cpp b/buildtools/autotools/removefiledlg.cpp index 2c3bc37f..e265a969 100644 --- a/buildtools/autotools/removefiledlg.cpp +++ b/buildtools/autotools/removefiledlg.cpp @@ -11,13 +11,13 @@ #include "removefiledlg.h" -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qfile.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qregexp.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqfile.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqregexp.h> #include <kbuttonbox.h> #include <kdebug.h> @@ -31,9 +31,9 @@ #include "autoprojectwidget.h" #include "autodetailsview.h" -static bool fileListContains(const QPtrList<FileItem> &list, const QString &name) +static bool fileListContains(const TQPtrList<FileItem> &list, const TQString &name) { - QPtrListIterator<FileItem> it(list); + TQPtrListIterator<FileItem> it(list); for (; it.current(); ++it) if ((*it)->text(0) == name) return true; @@ -42,29 +42,29 @@ static bool fileListContains(const QPtrList<FileItem> &list, const QString &name RemoveFileDialog::RemoveFileDialog(AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, - TargetItem *item, const QString &filename, - QWidget *parent, const char *name) + TargetItem *item, const TQString &filename, + TQWidget *parent, const char *name) : RemoveFileDlgBase(parent, name, true) { removeFromTargetsCheckBox = 0; - QStringList targets; + TQStringList targets; - QPtrListIterator<TargetItem> it(spitem->targets); + TQPtrListIterator<TargetItem> it(spitem->targets); for (; it.current(); ++it) if (fileListContains((*it)->sources, filename)) targets.append((*it)->name); if (targets.count() > 1) { - removeFromTargetsCheckBox = new QCheckBox( fileGroupBox, "removeFromTargetsCheckBox" ); - removeFromTargetsCheckBox->setMinimumSize( QSize( 0, 45 ) ); + removeFromTargetsCheckBox = new TQCheckBox( fileGroupBox, "removeFromTargetsCheckBox" ); + removeFromTargetsCheckBox->setMinimumSize( TQSize( 0, 45 ) ); fileLayout->addWidget( removeFromTargetsCheckBox ); - QString joinedtargets = " *" + targets.join("\n *"); + TQString joinedtargets = " *" + targets.join("\n *"); removeFromTargetsCheckBox->setText ( i18n ( "The file %1 is still used by the following targets:\n%2\n" "Remove it from all of them?").arg(filename).arg(joinedtargets) ); - setMinimumSize(QSize(size().width(), size().height() + removeFromTargetsCheckBox->size().height()*2) ); + setMinimumSize(TQSize(size().width(), size().height() + removeFromTargetsCheckBox->size().height()*2) ); } removeLabel->setText ( i18n ( "Do you really want to remove <b>%1</b>?" ).arg ( filename ) ); @@ -75,8 +75,8 @@ RemoveFileDialog::RemoveFileDialog(AutoProjectWidget *widget, AutoProjectPart* p else targetLabel->setText ( item->name ); - connect ( removeButton, SIGNAL ( clicked() ), this, SLOT ( accept() ) ); - connect ( cancelButton, SIGNAL ( clicked() ), this, SLOT ( reject() ) ); + connect ( removeButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( accept() ) ); + connect ( cancelButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( reject() ) ); setIcon ( SmallIcon ( "editdelete.png" ) ); @@ -96,29 +96,29 @@ void RemoveFileDialog::accept() { m_widget->emitRemovedFile ( subProject->path.mid ( m_part->projectDirectory().length() + 1 ) + "/" + fileName ); - QMap<QString,QString> replaceMap; + TQMap<TQString,TQString> replaceMap; if (removeFromTargetsCheckBox && removeFromTargetsCheckBox->isChecked()) { - QPtrListIterator<TargetItem> it(subProject->targets); + TQPtrListIterator<TargetItem> it(subProject->targets); for (; it.current(); ++it) { if ((*it) != target && fileListContains((*it)->sources, fileName)) { FileItem *fitem = static_cast<FileItem*>((*it)->firstChild()); while (fitem) { FileItem *nextitem = static_cast<FileItem*>(fitem->nextSibling()); if (fitem->text(0) == fileName) { - QListView *lv = fitem->listView(); + TQListView *lv = fitem->listView(); lv->setSelected(fitem, false); (*it)->sources.remove(fitem); } fitem = nextitem; } - QString canontargetname = AutoProjectTool::canonicalize((*it)->name); - QString varname; + TQString canontargetname = AutoProjectTool::canonicalize((*it)->name); + TQString varname; if( (*it)->primary == "PROGRAMS" || (*it)->primary == "LIBRARIES" || (*it)->primary == "LTLIBRARIES" ) varname = canontargetname + "_SOURCES"; else varname = (*it)->prefix + "_" + (*it)->primary; - QStringList sources = QStringList::split(QRegExp("[ \t\n]"), subProject->variables[varname]); + TQStringList sources = TQStringList::split(TQRegExp("[ \t\n]"), subProject->variables[varname]); sources.remove(fileName); subProject->variables[varname] = sources.join(" "); replaceMap.insert(varname, fileName); @@ -126,11 +126,11 @@ void RemoveFileDialog::accept() } } - QString fileItemName; + TQString fileItemName; FileItem *fitem = static_cast<FileItem*>(target->firstChild()); while (fitem) { if (fitem->text(0) == fileName) { - QListView *lv = fitem->listView(); + TQListView *lv = fitem->listView(); lv->setSelected(fitem, false); fileItemName = fitem->name; target->sources.remove(fitem); @@ -138,13 +138,13 @@ void RemoveFileDialog::accept() } fitem = static_cast<FileItem*>(fitem->nextSibling()); } - QString canontargetname = AutoProjectTool::canonicalize(target->name); - QString varname; + TQString canontargetname = AutoProjectTool::canonicalize(target->name); + TQString varname; if( target->primary == "PROGRAMS" || target->primary == "LIBRARIES" || target->primary == "LTLIBRARIES" ) varname = canontargetname + "_SOURCES"; else varname = target->prefix + "_" + target->primary; - QStringList sources = QStringList::split(QRegExp("[ \t\n]"), subProject->variables[varname]); + TQStringList sources = TQStringList::split(TQRegExp("[ \t\n]"), subProject->variables[varname]); sources.remove(fileName); subProject->variables[varname] = sources.join(" "); replaceMap.insert(varname, fileName); @@ -152,31 +152,31 @@ void RemoveFileDialog::accept() AutoProjectTool::removeFromMakefileam(subProject->path + "/Makefile.am", replaceMap); // review configuration cleanup in the project file after removing subclassing related source - QDomDocument &dom = *(m_part->projectDom()); + TQDomDocument &dom = *(m_part->projectDom()); - QDomElement el = dom.documentElement(); - QDomNode el2 = el.namedItem("kdevautoproject"); - QDomNode el3 = el2.namedItem("subclassing"); + TQDomElement el = dom.documentElement(); + TQDomNode el2 = el.namedItem("kdevautoproject"); + TQDomNode el3 = el2.namedItem("subclassing"); - QDomNode n = el3.firstChild(); - QValueList<QDomNode> nodesToRemove; + TQDomNode n = el3.firstChild(); + TQValueList<TQDomNode> nodesToRemove; while ( !n.isNull() ) { - QDomNamedNodeMap attr = n.attributes(); - QString fpath = subProject->path + QString("/") + fileItemName; - QString relpath = fpath.remove(0, m_part->projectDirectory().length()); + TQDomNamedNodeMap attr = n.attributes(); + TQString fpath = subProject->path + TQString("/") + fileItemName; + TQString relpath = fpath.remove(0, m_part->projectDirectory().length()); if ((attr.item(0).nodeValue() == relpath) || (attr.item(1).nodeValue() == relpath) ) nodesToRemove.append(n); n = n.nextSibling(); } - QValueList<QDomNode>::iterator it; + TQValueList<TQDomNode>::iterator it; for ( it = nodesToRemove.begin(); it != nodesToRemove.end(); ++it ) el3.removeChild(*it); if (removeCheckBox->isChecked()) - QFile::remove(subProject->path + "/" + fileName); + TQFile::remove(subProject->path + "/" + fileName); - QDialog::accept(); + TQDialog::accept(); } #include "removefiledlg.moc" diff --git a/buildtools/autotools/removefiledlg.h b/buildtools/autotools/removefiledlg.h index ab843dda..58836da3 100644 --- a/buildtools/autotools/removefiledlg.h +++ b/buildtools/autotools/removefiledlg.h @@ -12,7 +12,7 @@ #ifndef _REMOVEFILEDLG_H_ #define _REMOVEFILEDLG_H_ -#include <qdialog.h> +#include <tqdialog.h> #include "removefiledlgbase.h" @@ -29,22 +29,22 @@ class RemoveFileDialog : public RemoveFileDlgBase public: RemoveFileDialog( AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, - TargetItem *item, const QString &filename, - QWidget *parent = 0, const char *name = 0 ); + TargetItem *item, const TQString &filename, + TQWidget *parent = 0, const char *name = 0 ); ~RemoveFileDialog(); protected: virtual void accept(); private: - QCheckBox *removeFromTargetsCheckBox; - //QCheckBox *removefromdisk_box; + TQCheckBox *removeFromTargetsCheckBox; + //TQCheckBox *removefromdisk_box; AutoProjectWidget* m_widget; AutoProjectPart *m_part; SubprojectItem *subProject; TargetItem *target; - QString fileName; + TQString fileName; }; #endif diff --git a/buildtools/autotools/removetargetdlg.cpp b/buildtools/autotools/removetargetdlg.cpp index 6104e404..5783900c 100644 --- a/buildtools/autotools/removetargetdlg.cpp +++ b/buildtools/autotools/removetargetdlg.cpp @@ -16,14 +16,14 @@ #include "removetargetdlg.h" -#include <qapplication.h> -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qfile.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qregexp.h> +#include <tqapplication.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqfile.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqregexp.h> #include <kbuttonbox.h> #include <kdebug.h> @@ -42,7 +42,7 @@ RemoveTargetDialog::RemoveTargetDialog( AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, - TargetItem *titem, QWidget* parent, const char* name ) + TargetItem *titem, TQWidget* parent, const char* name ) : RemoveTargetDlgBase ( parent, name, true, 0 ) { removeLabel->setText ( i18n ( "Do you really want to remove <b>%1</b><br>with <b>all files</b> that are attached to it<br>and <b>all dependencies</b>?" ).arg ( titem->name ) ); @@ -53,8 +53,8 @@ RemoveTargetDialog::RemoveTargetDialog( AutoProjectWidget *widget, AutoProjectPa else targetLabel->setText ( titem->name ); - connect ( removeButton, SIGNAL ( clicked() ), this, SLOT ( accept() ) ); - connect ( cancelButton, SIGNAL ( clicked() ), this, SLOT ( reject() ) ); + connect ( removeButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( accept() ) ); + connect ( cancelButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( reject() ) ); setIcon ( SmallIcon ( "editdelete" ) ); @@ -77,7 +77,7 @@ RemoveTargetDialog::~RemoveTargetDialog() void RemoveTargetDialog::init() { - QPtrList <SubprojectItem> subprojectItems = m_widget->allSubprojectItems(); + TQPtrList <SubprojectItem> subprojectItems = m_widget->allSubprojectItems(); TargetItem* titem = 0; @@ -94,7 +94,7 @@ void RemoveTargetDialog::init() if ( titem->primary == "LTLIBRARIES" || titem->primary == "PROGRAMS" || titem->primary == "LIBRARIES" || titem->primary == "JAVA" ) { - QString canonname = AutoProjectTool::canonicalize ( titem->name ); + TQString canonname = AutoProjectTool::canonicalize ( titem->name ); if ( spitem->variables[canonname + "_LIBADD"].contains ( m_titem->name ) > 0 || spitem->variables[canonname + "_LDADD"].contains ( m_titem->name ) > 0 ) @@ -118,36 +118,36 @@ void RemoveTargetDialog::accept () qApp->processEvents(); - QString canonname = AutoProjectTool::canonicalize ( m_titem->name ); - QString varname = m_titem->prefix + "_" + m_titem->primary; + TQString canonname = AutoProjectTool::canonicalize ( m_titem->name ); + TQString varname = m_titem->prefix + "_" + m_titem->primary; SubprojectItem* spitem = 0; TargetItem* titem = 0; - QMap <QString, QString> removeMap; - QMap <QString, QString> replaceMap; + TQMap <TQString, TQString> removeMap; + TQMap <TQString, TQString> replaceMap; // Remove dependencies to other targets first (stored by init() in 'dependentTargets') for ( spitem = dependentSubprojects.first(); spitem; spitem = dependentSubprojects.next() ) { for ( titem = spitem->targets.first(); titem; titem = spitem->targets.next() ) { - QString curVarname; - QString curCanonname = AutoProjectTool::canonicalize ( titem->name ); - QStringList dependencies; + TQString curVarname; + TQString curCanonname = AutoProjectTool::canonicalize ( titem->name ); + TQStringList dependencies; if ( spitem->variables[curCanonname + "_LIBADD"].contains ( m_titem->name ) ) curVarname = curCanonname + "_LIBADD"; else curVarname = curCanonname + "_LDADD"; - dependencies = QStringList::split(QRegExp("[ \t\n]"), spitem->variables[curVarname]); + dependencies = TQStringList::split(TQRegExp("[ \t\n]"), spitem->variables[curVarname]); - //QStringList::Iterator it = dependencies.begin(); + //TQStringList::Iterator it = dependencies.begin(); for ( uint i = 0; i < dependencies.size(); ++i ) { - QString s = dependencies[i]; + TQString s = dependencies[i]; if ( s.contains ( m_titem->name ) > 0 ) dependencies.remove ( s ); } @@ -178,7 +178,7 @@ void RemoveTargetDialog::accept () { // if we have bin_PROGRAMS = [target to be deleted] [other target] // delete only the [target to be deleted], not the whole line! - QStringList targets = QStringList::split(QRegExp("[ \t\n]"), m_spitem->variables[varname]); + TQStringList targets = TQStringList::split(TQRegExp("[ \t\n]"), m_spitem->variables[varname]); if ( targets.count() > 1 ) { @@ -222,7 +222,7 @@ void RemoveTargetDialog::accept () //kdDebug (9020) << "******** " << m_spitem->subdir << endl; if ( titem->primary == "PROGRAMS" || titem->primary == "LTLIBRARIES" ) { - QString curCanonname = AutoProjectTool::canonicalize ( titem->name ); + TQString curCanonname = AutoProjectTool::canonicalize ( titem->name ); if ( m_spitem->variables[curCanonname + "_LIBADD"].isEmpty() ) { @@ -241,14 +241,14 @@ void RemoveTargetDialog::accept () progressBar->setTotalSteps ( m_titem->sources.count() ); - QStringList fileList; + TQStringList fileList; for ( FileItem* fitem = m_titem->sources.first(); fitem; fitem = m_titem->sources.next() ) { if (removeCheckBox->isChecked()) { // before removing the files, check if they are mentioned in "noinst_HEADERS = blabla1.h blabla2.h" - QStringList noInstHeaders = QStringList::split ( QRegExp ( "[ \t\n]" ), m_spitem->variables["noinst_HEADERS"] ); + TQStringList noInstHeaders = TQStringList::split ( TQRegExp ( "[ \t\n]" ), m_spitem->variables["noinst_HEADERS"] ); if ( noInstHeaders.contains ( fitem->name ) ) { @@ -260,7 +260,7 @@ void RemoveTargetDialog::accept () replaceMap.clear(); } - QFile::remove(m_spitem->path + "/" + fitem->name); + TQFile::remove(m_spitem->path + "/" + fitem->name); } fileList.append ( m_spitem->path.mid ( m_part->projectDirectory().length() + 1 ) + "/" + fitem->name ); @@ -275,5 +275,5 @@ void RemoveTargetDialog::accept () m_spitem->targets.remove ( m_titem ); - QDialog::accept(); + TQDialog::accept(); } diff --git a/buildtools/autotools/removetargetdlg.h b/buildtools/autotools/removetargetdlg.h index 6953d2bf..a9981007 100644 --- a/buildtools/autotools/removetargetdlg.h +++ b/buildtools/autotools/removetargetdlg.h @@ -19,7 +19,7 @@ #include "removetargetdlgbase.h" -#include <qptrlist.h> +#include <tqptrlist.h> class AutoProjectWidget; class AutoProjectPart; @@ -35,7 +35,7 @@ class RemoveTargetDialog : public RemoveTargetDlgBase public: RemoveTargetDialog( AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, - TargetItem *titem, QWidget* parent = 0, const char* name = 0 ); + TargetItem *titem, TQWidget* parent = 0, const char* name = 0 ); ~RemoveTargetDialog(); private: @@ -44,7 +44,7 @@ private: AutoProjectWidget* m_widget; AutoProjectPart* m_part; - QPtrList <SubprojectItem> dependentSubprojects; + TQPtrList <SubprojectItem> dependentSubprojects; protected: void init (); diff --git a/buildtools/autotools/subprojectoptionsdlg.cpp b/buildtools/autotools/subprojectoptionsdlg.cpp index 5ad6bf10..a7fd2c11 100644 --- a/buildtools/autotools/subprojectoptionsdlg.cpp +++ b/buildtools/autotools/subprojectoptionsdlg.cpp @@ -11,14 +11,14 @@ #include "subprojectoptionsdlg.h" -#include <qdom.h> -#include <qheader.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qregexp.h> +#include <tqdom.h> +#include <tqheader.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqregexp.h> #include <kbuttonbox.h> #include <kdebug.h> #include <kdialog.h> @@ -42,7 +42,7 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProjectWidget *widget, - SubprojectItem *item, QWidget *parent, const char *name) + SubprojectItem *item, TQWidget *parent, const char *name) : SubprojectOptionsDialogBase(parent, name, true) { setCaption(i18n("Subproject Options for '%1'").arg(item->subdir)); @@ -50,14 +50,14 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProj subProject = item; m_part = part; - QFontMetrics fm(cflags_edit->fontMetrics()); + TQFontMetrics fm(cflags_edit->fontMetrics()); int wid = fm.width('X')*35; cflags_edit->setMinimumWidth(wid); cxxflags_edit->setMinimumWidth(wid); fflags_edit->setMinimumWidth(wid); - QDomDocument &dom = *part->projectDom(); - QString prefix = "/kdevautoproject/configurations/" + m_part->currentBuildConfig() + "/"; + TQDomDocument &dom = *part->projectDom(); + TQString prefix = "/kdevautoproject/configurations/" + m_part->currentBuildConfig() + "/"; ccompiler = DomUtil::readEntry(dom, prefix + "ccompiler", "kdevgccoptions"); cxxcompiler = DomUtil::readEntry(dom, prefix + "cxxcompiler", "kdevgppoptions"); @@ -79,20 +79,20 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProj prefix_listview->setSorting(-1); buildorder_listview->setSorting(-1); - connect( prefix_listview, SIGNAL( doubleClicked ( QListViewItem *, const QPoint &, int ) ), this, SLOT( editPrefixClicked() ) ); + connect( prefix_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( editPrefixClicked() ) ); // Insert all subdirectories as possible include directories - QStringList l = widget->allSubprojects(); - QCheckListItem *lastItem = 0; - QStringList::ConstIterator it; + TQStringList l = widget->allSubprojects(); + TQCheckListItem *lastItem = 0; + TQStringList::ConstIterator it; for (it = l.begin(); it != l.end(); ++it) { kdDebug(9020) << "----------> subproject = " << (*it) << endl; - QString subProjectName = *it; + TQString subProjectName = *it; if( subProjectName.isEmpty() ){ - subProjectName = QString::fromLatin1( "." ); + subProjectName = TQString::fromLatin1( "." ); } - QCheckListItem *clitem = new QCheckListItem(insideinc_listview, subProjectName, QCheckListItem::CheckBox); + TQCheckListItem *clitem = new TQCheckListItem(insideinc_listview, subProjectName, TQCheckListItem::CheckBox); if (lastItem) clitem->moveItem(lastItem); lastItem = clitem; @@ -117,38 +117,38 @@ void SubprojectOptionsDialog::readConfig() metasources_checkbox->setChecked(subProject->variables["METASOURCES"].stripWhiteSpace() == "AUTO"); - QString includes = subProject->variables["INCLUDES"]; - QStringList includeslist = QStringList::split(QRegExp("[ \t]"), QString(includes)); + TQString includes = subProject->variables["INCLUDES"]; + TQStringList includeslist = TQStringList::split(TQRegExp("[ \t]"), TQString(includes)); - QListViewItem *lastItem = 0; - QStringList::Iterator it; + TQListViewItem *lastItem = 0; + TQStringList::Iterator it; for (it = includeslist.begin(); it != includeslist.end(); ++it) { - QCheckListItem *clitem = static_cast<QCheckListItem*>(insideinc_listview->firstChild()); + TQCheckListItem *clitem = static_cast<TQCheckListItem*>(insideinc_listview->firstChild()); while (clitem) { if (*it == ("-I$(top_srcdir)/" + clitem->text())) { clitem->setOn(true); break; } - clitem = static_cast<QCheckListItem*>(clitem->nextSibling()); + clitem = static_cast<TQCheckListItem*>(clitem->nextSibling()); } if (!clitem) { - QListViewItem *item = new QListViewItem(outsideinc_listview, *it); + TQListViewItem *item = new TQListViewItem(outsideinc_listview, *it); if (lastItem) item->moveItem(lastItem); lastItem = item; } } - QMap<QString, QString>::ConstIterator it2; + TQMap<TQString, TQString>::ConstIterator it2; for (it2 = subProject->prefixes.begin(); it2 != subProject->prefixes.end(); ++it2) - new QListViewItem(prefix_listview, it2.key(), it2.data()); + new TQListViewItem(prefix_listview, it2.key(), it2.data()); - QString subdirs = subProject->variables["SUBDIRS"]; + TQString subdirs = subProject->variables["SUBDIRS"]; kdDebug(9020) << "Subdirs variable: " << subdirs << endl; - QStringList subdirslist = QStringList::split(QRegExp("[ \t]"), QString(subdirs)); + TQStringList subdirslist = TQStringList::split(TQRegExp("[ \t]"), TQString(subdirs)); lastItem = 0; for (it = subdirslist.begin(); it != subdirslist.end(); ++it) { - QListViewItem *item = new QListViewItem(buildorder_listview, *it); + TQListViewItem *item = new TQListViewItem(buildorder_listview, *it); if (lastItem) item->moveItem(lastItem); lastItem = item; @@ -158,67 +158,67 @@ void SubprojectOptionsDialog::readConfig() void SubprojectOptionsDialog::storeConfig() { - QMap<QString, QString> replaceMap; + TQMap<TQString, TQString> replaceMap; - QString old_cflags = subProject->variables["AM_CFLAGS"]; - QString new_cflags = cflags_edit->text(); + TQString old_cflags = subProject->variables["AM_CFLAGS"]; + TQString new_cflags = cflags_edit->text(); if (new_cflags != old_cflags) { subProject->variables["AM_CFLAGS"] = new_cflags; replaceMap.insert("AM_CFLAGS", new_cflags); } - QString old_cxxflags = subProject->variables["AM_CXXFLAGS"]; - QString new_cxxflags = cxxflags_edit->text(); + TQString old_cxxflags = subProject->variables["AM_CXXFLAGS"]; + TQString new_cxxflags = cxxflags_edit->text(); if (new_cxxflags != old_cxxflags) { subProject->variables["AM_CXXFLAGS"] = new_cxxflags; replaceMap.insert("AM_CXXFLAGS", new_cxxflags); } - QString old_fflags = subProject->variables["AM_FFLAGS"]; - QString new_fflags = fflags_edit->text(); + TQString old_fflags = subProject->variables["AM_FFLAGS"]; + TQString new_fflags = fflags_edit->text(); if (new_fflags != old_fflags) { subProject->variables["AM_FFLAGS"] = new_fflags; replaceMap.insert("AM_FFLAGS", new_fflags); } - QString old_metasources = subProject->variables["METASOURCES"]; - QString new_metasources = metasources_checkbox->isChecked() ? QString::fromLatin1("AUTO") : QString::null; + TQString old_metasources = subProject->variables["METASOURCES"]; + TQString new_metasources = metasources_checkbox->isChecked() ? TQString::fromLatin1("AUTO") : TQString::null; if (new_metasources != old_metasources) { subProject->variables["METASOURCES"] = new_metasources; replaceMap.insert("METASOURCES", new_metasources); } - QStringList includeslist; - QCheckListItem *clitem = static_cast<QCheckListItem*>(insideinc_listview->firstChild()); + TQStringList includeslist; + TQCheckListItem *clitem = static_cast<TQCheckListItem*>(insideinc_listview->firstChild()); while (clitem) { if (clitem->isOn()) includeslist.append("-I$(top_srcdir)/" + clitem->text()); - clitem = static_cast<QCheckListItem*>(clitem->nextSibling()); + clitem = static_cast<TQCheckListItem*>(clitem->nextSibling()); } - clitem = static_cast<QCheckListItem*>(outsideinc_listview->firstChild()); + clitem = static_cast<TQCheckListItem*>(outsideinc_listview->firstChild()); while (clitem) { includeslist.append(clitem->text()); - clitem = static_cast<QCheckListItem*>(clitem->nextSibling()); + clitem = static_cast<TQCheckListItem*>(clitem->nextSibling()); } - QString includes = includeslist.join(" "); + TQString includes = includeslist.join(" "); subProject->variables["INCLUDES"] = includes; replaceMap.insert("INCLUDES", includes); subProject->prefixes.clear(); - for (QListViewItem *item = prefix_listview->firstChild(); + for (TQListViewItem *item = prefix_listview->firstChild(); item; item = item->nextSibling()) { - QString key = item->text(0); - QString data = item->text(1); + TQString key = item->text(0); + TQString data = item->text(1); subProject->prefixes[key] = data; replaceMap.insert(key + "dir", data); } /// \FIXME take removed prefixes into account - QStringList subdirslist; - for (QListViewItem *item = buildorder_listview->firstChild(); + TQStringList subdirslist; + for (TQListViewItem *item = buildorder_listview->firstChild(); item; item = item->nextSibling()) subdirslist.append(item->text(0)); - QString subdirs = subdirslist.join(" "); + TQString subdirs = subdirslist.join(" "); kdDebug() << "New subdirs variable: " << subdirs << endl; subProject->variables["SUBDIRS"] = subdirs; replaceMap.insert("SUBDIRS", subdirs); @@ -229,7 +229,7 @@ void SubprojectOptionsDialog::storeConfig() void SubprojectOptionsDialog::cflagsClicked() { - QString new_cflags = AutoProjectTool::execFlagsDialog(ccompiler, cflags_edit->text(), this); + TQString new_cflags = AutoProjectTool::execFlagsDialog(ccompiler, cflags_edit->text(), this); // if (!new_cflags.isNull()) cflags_edit->setText(new_cflags); } @@ -237,7 +237,7 @@ void SubprojectOptionsDialog::cflagsClicked() void SubprojectOptionsDialog::cxxFlagsClicked() { - QString new_cxxflags = AutoProjectTool::execFlagsDialog(cxxcompiler, cxxflags_edit->text(), this); + TQString new_cxxflags = AutoProjectTool::execFlagsDialog(cxxcompiler, cxxflags_edit->text(), this); // if (!new_cxxflags.isNull()) cxxflags_edit->setText(new_cxxflags); } @@ -245,7 +245,7 @@ void SubprojectOptionsDialog::cxxFlagsClicked() void SubprojectOptionsDialog::fflagsClicked() { - QString new_fflags = AutoProjectTool::execFlagsDialog(f77compiler, fflags_edit->text(), this); + TQString new_fflags = AutoProjectTool::execFlagsDialog(f77compiler, fflags_edit->text(), this); // if (!new_fflags.isNull()) fflags_edit->setText(new_fflags); } @@ -258,7 +258,7 @@ void SubprojectOptionsDialog::insideMoveUpClicked() return; } - QListViewItem *item = insideinc_listview->firstChild(); + TQListViewItem *item = insideinc_listview->firstChild(); while (item->nextSibling() != insideinc_listview->currentItem()) item = item->nextSibling(); item->moveItem(insideinc_listview->currentItem()); @@ -283,7 +283,7 @@ void SubprojectOptionsDialog::outsideMoveUpClicked() return; } - QListViewItem *item = outsideinc_listview->firstChild(); + TQListViewItem *item = outsideinc_listview->firstChild(); while (item->nextSibling() != outsideinc_listview->currentItem()) item = item->nextSibling(); item->moveItem(outsideinc_listview->currentItem()); @@ -304,19 +304,19 @@ void SubprojectOptionsDialog::outsideAddClicked() { KURLRequesterDlg dialog( "", i18n( "Add Include directory: Choose directory, give -Idirectory or use a variable with -I$(FOOBAR)" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - dialog.urlRequester() ->setURL( QString::null ); - if ( dialog.exec() != QDialog::Accepted ) + dialog.urlRequester() ->setURL( TQString::null ); + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString file = dialog.urlRequester() ->url(); + TQString file = dialog.urlRequester() ->url(); if ( !file.isEmpty() ) { if ( !file.isEmpty() ) { if( file.startsWith("-I") ) - new QListViewItem( outsideinc_listview, file ); + new TQListViewItem( outsideinc_listview, file ); else { - new QListViewItem( outsideinc_listview, "-I"+file ); + new TQListViewItem( outsideinc_listview, "-I"+file ); } } } @@ -328,7 +328,7 @@ void SubprojectOptionsDialog::outsideEditClicked() if ( (outsideinc_listview->childCount()==0) || (outsideinc_listview->currentItem() == 0) ) return; bool ok; - QString dir = KInputDialog::getText(i18n("Edit Include Directory"), i18n("Edit include directory:"), + TQString dir = KInputDialog::getText(i18n("Edit Include Directory"), i18n("Edit include directory:"), outsideinc_listview->currentItem()-> text(0), &ok, 0); if (ok && !dir.isEmpty()) outsideinc_listview->currentItem()-> setText(0, dir); @@ -347,13 +347,13 @@ void SubprojectOptionsDialog::addPrefixClicked() if (!dlg.exec() || dlg.name().isEmpty() || dlg.path().isEmpty() ) return; - new QListViewItem(prefix_listview, dlg.name(), dlg.path()); + new TQListViewItem(prefix_listview, dlg.name(), dlg.path()); } void SubprojectOptionsDialog::editPrefixClicked() { - QListViewItem* lvItem = prefix_listview->currentItem(); + TQListViewItem* lvItem = prefix_listview->currentItem(); if ( (prefix_listview->childCount()==0) || (lvItem == 0) ) return; AddPrefixDialog dlg(lvItem-> text(0), lvItem-> text(1)); @@ -377,7 +377,7 @@ void SubprojectOptionsDialog::buildorderMoveUpClicked() return; } - QListViewItem *item = buildorder_listview->firstChild(); + TQListViewItem *item = buildorder_listview->firstChild(); while (item->nextSibling() != buildorder_listview->currentItem()) item = item->nextSibling(); item->moveItem(buildorder_listview->currentItem()); @@ -398,7 +398,7 @@ void SubprojectOptionsDialog::buildorderMoveDownClicked() void SubprojectOptionsDialog::accept() { storeConfig(); - QDialog::accept(); + TQDialog::accept(); } #include "subprojectoptionsdlg.moc" diff --git a/buildtools/autotools/subprojectoptionsdlg.h b/buildtools/autotools/subprojectoptionsdlg.h index 7ec1fbf0..648c007d 100644 --- a/buildtools/autotools/subprojectoptionsdlg.h +++ b/buildtools/autotools/subprojectoptionsdlg.h @@ -25,7 +25,7 @@ class SubprojectOptionsDialog : public SubprojectOptionsDialogBase public: SubprojectOptionsDialog( AutoProjectPart *part, AutoProjectWidget *widget, - SubprojectItem *item, QWidget *parent = 0, const char *name = 0 ); + SubprojectItem *item, TQWidget *parent = 0, const char *name = 0 ); ~SubprojectOptionsDialog(); private: @@ -53,9 +53,9 @@ private: AutoProjectWidget *m_widget; AutoProjectPart *m_part; - QString ccompiler; - QString cxxcompiler; - QString f77compiler; + TQString ccompiler; + TQString cxxcompiler; + TQString f77compiler; }; #endif diff --git a/buildtools/autotools/targetoptionsdlg.cpp b/buildtools/autotools/targetoptionsdlg.cpp index c8d49c55..39cd35f2 100644 --- a/buildtools/autotools/targetoptionsdlg.cpp +++ b/buildtools/autotools/targetoptionsdlg.cpp @@ -11,11 +11,11 @@ #include "targetoptionsdlg.h" -#include <qcheckbox.h> -#include <qheader.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qregexp.h> +#include <tqcheckbox.h> +#include <tqheader.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqregexp.h> #include <klineedit.h> #include <kbuttonbox.h> #include <kdialog.h> @@ -34,7 +34,7 @@ #include "urlutil.h" TargetOptionsDialog::TargetOptionsDialog(AutoProjectWidget *widget, TargetItem *item, - QWidget *parent, const char *name) + TQWidget *parent, const char *name) : TargetOptionsDialogBase(parent, name, true) { setCaption( i18n("Target Options for '%1'").arg(item->name) ); @@ -61,13 +61,13 @@ TargetOptionsDialog::TargetOptionsDialog(AutoProjectWidget *widget, TargetItem * m_cwdEdit->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); // Insert all convenience libraries as possible linked libraries - QStringList l = widget->allLibraries(); - QStringList::ConstIterator it; - QString fulltargetname = m_widget->subprojectDirectory() + "/" + item->name; + TQStringList l = widget->allLibraries(); + TQStringList::ConstIterator it; + TQString fulltargetname = m_widget->subprojectDirectory() + "/" + item->name; for (it = l.begin(); it != l.end(); ++it) // Do not list the target itself (a target can not link with itself) if ( !fulltargetname.endsWith(*it) ) - (void) new QCheckListItem(insidelib_listview, *it, QCheckListItem::CheckBox); + (void) new TQCheckListItem(insidelib_listview, *it, TQCheckListItem::CheckBox); readConfig(); } @@ -78,10 +78,10 @@ TargetOptionsDialog::~TargetOptionsDialog() void TargetOptionsDialog::readConfig() { - QString flagsstr = target->ldflags; - flagsstr.replace(QRegExp("$(KDE_PLUGIN)"), "-avoid-version -module -no-undefined $(KDE_RPATH)"); - QStringList l1 = QStringList::split(QRegExp("[ \t]"), flagsstr); - QStringList::Iterator l1it; + TQString flagsstr = target->ldflags; + flagsstr.replace(TQRegExp("$(KDE_PLUGIN)"), "-avoid-version -module -no-undefined $(KDE_RPATH)"); + TQStringList l1 = TQStringList::split(TQRegExp("[ \t]"), flagsstr); + TQStringList::Iterator l1it; l1it = l1.find("-all-static"); if (l1it != l1.end()) { @@ -106,18 +106,18 @@ void TargetOptionsDialog::readConfig() ldflagsother_edit->setText(l1.join(" ")); dependencies_edit->setText(target->dependencies); - QString addstr = (target->primary == "PROGRAMS")? target->ldadd : target->libadd; - QStringList l2 = QStringList::split(QRegExp("[ \t]"), addstr); + TQString addstr = (target->primary == "PROGRAMS")? target->ldadd : target->libadd; + TQStringList l2 = TQStringList::split(TQRegExp("[ \t]"), addstr); kdDebug(9020) << "ls=: " << addstr << endl; bool inlistItem; - QListViewItem *lastItem = 0; - QStringList::Iterator l2it; - QCheckListItem *flitem = static_cast<QCheckListItem*>(insidelib_listview->firstChild()); + TQListViewItem *lastItem = 0; + TQStringList::Iterator l2it; + TQCheckListItem *flitem = static_cast<TQCheckListItem*>(insidelib_listview->firstChild()); for (l2it = l2.begin(); l2it != l2.end(); ++l2it) { inlistItem = false; - QCheckListItem *clitem = static_cast<QCheckListItem*>(insidelib_listview->firstChild()); + TQCheckListItem *clitem = static_cast<TQCheckListItem*>(insidelib_listview->firstChild()); if (flitem) { while (clitem) { if (*l2it == ("$(top_builddir)/" + clitem->text())) { @@ -126,15 +126,15 @@ void TargetOptionsDialog::readConfig() if (flitem != clitem) clitem->moveItem(flitem); // move the "top of the list" one item down - flitem = static_cast<QCheckListItem*>(flitem->nextSibling()); + flitem = static_cast<TQCheckListItem*>(flitem->nextSibling()); inlistItem = true; break; } - clitem = static_cast<QCheckListItem*>(clitem->nextSibling()); + clitem = static_cast<TQCheckListItem*>(clitem->nextSibling()); } } if ( inlistItem == false ) { - QListViewItem *item = new QListViewItem(outsidelib_listview, *l2it); + TQListViewItem *item = new TQListViewItem(outsidelib_listview, *l2it); if (lastItem) item->moveItem(lastItem); lastItem = item; @@ -160,7 +160,7 @@ void TargetOptionsDialog::readConfig() void TargetOptionsDialog::storeConfig() { - QStringList flagslist; + TQStringList flagslist; if (allstatic_box->isChecked()) flagslist.append("-all-static"); if (avoidversion_box->isChecked()) @@ -170,27 +170,27 @@ void TargetOptionsDialog::storeConfig() if (noundefined_box->isChecked()) flagslist.append("-no-undefined"); flagslist.append(ldflagsother_edit->text()); - QString new_ldflags = flagslist.join(" "); + TQString new_ldflags = flagslist.join(" "); - QStringList liblist; - QCheckListItem *clitem = static_cast<QCheckListItem*>(insidelib_listview->firstChild()); + TQStringList liblist; + TQCheckListItem *clitem = static_cast<TQCheckListItem*>(insidelib_listview->firstChild()); while (clitem) { if( clitem->isOn() ) liblist.append("$(top_builddir)/" + clitem->text()); - clitem = static_cast<QCheckListItem*>(clitem->nextSibling()); + clitem = static_cast<TQCheckListItem*>(clitem->nextSibling()); } - clitem = static_cast<QCheckListItem*>(outsidelib_listview->firstChild()); + clitem = static_cast<TQCheckListItem*>(outsidelib_listview->firstChild()); while (clitem) { liblist.append(clitem->text()); - clitem = static_cast<QCheckListItem*>(clitem->nextSibling()); + clitem = static_cast<TQCheckListItem*>(clitem->nextSibling()); } - QString new_addstr = liblist.join(" "); + TQString new_addstr = liblist.join(" "); - QString canonname = AutoProjectTool::canonicalize(target->name); - QMap<QString, QString> replaceMap; + TQString canonname = AutoProjectTool::canonicalize(target->name); + TQMap<TQString, TQString> replaceMap; if (target->primary == "PROGRAMS") { - QString old_ldadd = target->ldadd; + TQString old_ldadd = target->ldadd; if (new_addstr != old_ldadd) { target->ldadd = new_addstr; replaceMap.insert(canonname + "_LDADD", new_addstr); @@ -198,21 +198,21 @@ void TargetOptionsDialog::storeConfig() } if (target->primary == "LIBRARIES" || target->primary == "LTLIBRARIES") { - QString old_libadd = target->libadd; + TQString old_libadd = target->libadd; if (new_addstr != old_libadd) { target->libadd = new_addstr; replaceMap.insert(canonname + "_LIBADD", new_addstr); } } - QString old_ldflags = target->ldflags; + TQString old_ldflags = target->ldflags; if (new_ldflags != old_ldflags) { target->ldflags = new_ldflags; replaceMap.insert(canonname + "_LDFLAGS", new_ldflags); } - QString new_dependencies = dependencies_edit->text(); - QString old_dependencies = target->dependencies; + TQString new_dependencies = dependencies_edit->text(); + TQString old_dependencies = target->dependencies; if (new_dependencies != old_dependencies) { target->dependencies = new_dependencies; if (!new_dependencies.isEmpty()) @@ -240,7 +240,7 @@ void TargetOptionsDialog::insideMoveUpClicked() return; } - QListViewItem *item = insidelib_listview->firstChild(); + TQListViewItem *item = insidelib_listview->firstChild(); while (item->nextSibling() != insidelib_listview->currentItem()) item = item->nextSibling(); item->moveItem(insidelib_listview->currentItem()); @@ -270,7 +270,7 @@ void TargetOptionsDialog::outsideMoveUpClicked() return; } - QListViewItem *item = outsidelib_listview->firstChild(); + TQListViewItem *item = outsidelib_listview->firstChild(); while (item->nextSibling() != outsidelib_listview->currentItem()) item = item->nextSibling(); item->moveItem(outsidelib_listview->currentItem()); @@ -295,33 +295,33 @@ void TargetOptionsDialog::outsideAddClicked() KURLRequesterDlg dialog( "", i18n( "Add Library: Choose the .a/.so file, give -l<libname> or use a variable with $(FOOBAR)" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); dialog.urlRequester() ->setFilter( "*.so|"+i18n("Shared Library (*.so)")+"\n*.a|"+i18n("Static Library (*.a)") ); - dialog.urlRequester() ->setURL( QString::null ); + dialog.urlRequester() ->setURL( TQString::null ); dialog.urlRequester() ->completionObject() ->setDir( m_widget->selectedSubproject()->path ); dialog.urlRequester() ->fileDialog() ->setURL( KURL::fromPathOrURL( m_widget->selectedSubproject()->path ) ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString file = dialog.urlRequester() ->url(); + TQString file = dialog.urlRequester() ->url(); if ( !file.isEmpty() ) { if ( !file.isEmpty() ) { if( file.startsWith("-l") ) - new QListViewItem( outsidelib_listview, file ); + new TQListViewItem( outsidelib_listview, file ); else { - QFileInfo fi(file); + TQFileInfo fi(file); if( !fi.exists() ) - new QListViewItem( outsidelib_listview, file ); + new TQListViewItem( outsidelib_listview, file ); if( fi.extension(false) == "a" ) { - new QListViewItem( outsidelib_listview, file ); + new TQListViewItem( outsidelib_listview, file ); }else if ( fi.extension(false) == "so" ) { - QString name = fi.fileName(); + TQString name = fi.fileName(); if( name.startsWith( "lib" ) ) name = name.mid(3); name = "-l"+name.left( name.length() - 3 ); - new QListViewItem( outsidelib_listview, name ); + new TQListViewItem( outsidelib_listview, name ); } } } @@ -334,7 +334,7 @@ void TargetOptionsDialog::outsideEditClicked() if ( (outsidelib_listview->childCount()==0) || (outsidelib_listview->currentItem() == 0) ) return; bool ok; - QString dir = KInputDialog::getText(i18n("Edit External Library"), i18n("Edit external library:"), + TQString dir = KInputDialog::getText(i18n("Edit External Library"), i18n("Edit external library:"), outsidelib_listview->currentItem()-> text(0), &ok, 0); if (ok && !dir.isEmpty()) outsidelib_listview->currentItem()-> setText(0, dir); @@ -350,7 +350,7 @@ void TargetOptionsDialog::outsideRemoveClicked() void TargetOptionsDialog::accept() { storeConfig(); - QDialog::accept(); + TQDialog::accept(); } #include "targetoptionsdlg.moc" diff --git a/buildtools/autotools/targetoptionsdlg.h b/buildtools/autotools/targetoptionsdlg.h index c1dea20a..3b938046 100644 --- a/buildtools/autotools/targetoptionsdlg.h +++ b/buildtools/autotools/targetoptionsdlg.h @@ -24,7 +24,7 @@ class TargetOptionsDialog : public TargetOptionsDialogBase public: TargetOptionsDialog( AutoProjectWidget *widget, TargetItem *item, - QWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~TargetOptionsDialog(); private: diff --git a/buildtools/custommakefiles/custombuildoptionswidget.cpp b/buildtools/custommakefiles/custombuildoptionswidget.cpp index 37b087b2..e979df61 100644 --- a/buildtools/custommakefiles/custombuildoptionswidget.cpp +++ b/buildtools/custommakefiles/custombuildoptionswidget.cpp @@ -11,43 +11,43 @@ #include "custombuildoptionswidget.h" -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <klineedit.h> #include <kurlrequester.h> #include <kurlcompletion.h> #include <kfiledialog.h> -#include <qradiobutton.h> -#include <qtabwidget.h> +#include <tqradiobutton.h> +#include <tqtabwidget.h> #include "domutil.h" -CustomBuildOptionsWidget::CustomBuildOptionsWidget(QDomDocument &dom, - QWidget *parent, const char *name) +CustomBuildOptionsWidget::CustomBuildOptionsWidget(TQDomDocument &dom, + TQWidget *parent, const char *name) : CustomBuildOptionsWidgetBase(parent, name), m_dom(dom) { ant_button->setChecked(DomUtil::readEntry(dom, "/kdevcustomproject/build/buildtool") == "ant"); other_button->setChecked(DomUtil::readEntry(dom, "/kdevcustomproject/build/buildtool") == "other"); if( !DomUtil::readEntry(dom, "/kdevcustomproject/build/builddir").isEmpty() - && QFileInfo( DomUtil::readEntry(dom, "/kdevcustomproject/build/builddir") ).exists() ) + && TQFileInfo( DomUtil::readEntry(dom, "/kdevcustomproject/build/builddir") ).exists() ) { builddir_edit->setURL(DomUtil::readEntry(dom, "/kdevcustomproject/build/builddir")); builddir_edit->fileDialog()->setURL( DomUtil::readEntry(dom, "/kdevcustomproject/build/builddir") ); } else { - builddir_edit->setURL( QString() ); - builddir_edit->fileDialog()->setURL( QString() ); + builddir_edit->setURL( TQString() ); + builddir_edit->fileDialog()->setURL( TQString() ); } builddir_edit->completionObject()->setMode(KURLCompletion::DirCompletion); builddir_edit->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); // This connection must not be made before the ant->setChecked() line, // because at this time makeToggled() would crash - connect( make_button, SIGNAL(toggled(bool)), - this, SLOT(makeToggled(bool)) ); - connect( other_button, SIGNAL(toggled(bool)), - this, SLOT(otherToggled(bool)) ); + connect( make_button, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(makeToggled(bool)) ); + connect( other_button, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(otherToggled(bool)) ); } @@ -57,7 +57,7 @@ CustomBuildOptionsWidget::~CustomBuildOptionsWidget() void CustomBuildOptionsWidget::accept() { - QString buildtool; + TQString buildtool; if (ant_button->isChecked()) { buildtool = "ant"; @@ -75,7 +75,7 @@ void CustomBuildOptionsWidget::accept() } -void CustomBuildOptionsWidget::setMakeOptionsWidget(QTabWidget *tw, QWidget *mow, QWidget* oow) +void CustomBuildOptionsWidget::setMakeOptionsWidget(TQTabWidget *tw, TQWidget *mow, TQWidget* oow) { m_tabWidget = tw; m_makeOptions = mow; diff --git a/buildtools/custommakefiles/custombuildoptionswidget.h b/buildtools/custommakefiles/custombuildoptionswidget.h index 1b049574..c89d6f23 100644 --- a/buildtools/custommakefiles/custombuildoptionswidget.h +++ b/buildtools/custommakefiles/custombuildoptionswidget.h @@ -13,7 +13,7 @@ #define _CUSTOMBUILDOPTIONSWIDGET_H_ #include "custombuildoptionswidgetbase.h" -#include <qdom.h> +#include <tqdom.h> class QTabWidget; @@ -23,10 +23,10 @@ class CustomBuildOptionsWidget : public CustomBuildOptionsWidgetBase Q_OBJECT public: - CustomBuildOptionsWidget( QDomDocument &dom, QWidget *parent=0, const char *name=0 ); + CustomBuildOptionsWidget( TQDomDocument &dom, TQWidget *parent=0, const char *name=0 ); ~CustomBuildOptionsWidget(); - void setMakeOptionsWidget(QTabWidget *tw, QWidget *mow, QWidget *oow); + void setMakeOptionsWidget(TQTabWidget *tw, TQWidget *mow, TQWidget *oow); public slots: void accept(); @@ -35,10 +35,10 @@ private: virtual void makeToggled(bool b); virtual void otherToggled(bool b); - QDomDocument &m_dom; - QTabWidget *m_tabWidget; - QWidget *m_makeOptions; - QWidget *m_otherOptions; + TQDomDocument &m_dom; + TQTabWidget *m_tabWidget; + TQWidget *m_makeOptions; + TQWidget *m_otherOptions; }; #endif diff --git a/buildtools/custommakefiles/custommakeconfigwidget.cpp b/buildtools/custommakefiles/custommakeconfigwidget.cpp index 2af0d137..b47ef3ff 100644 --- a/buildtools/custommakefiles/custommakeconfigwidget.cpp +++ b/buildtools/custommakefiles/custommakeconfigwidget.cpp @@ -11,24 +11,24 @@ #include "custommakeconfigwidget.h" #include <custombuildoptionswidgetbase.h> #include <customprojectpart.h> -#include <qcombobox.h> -#include <qdir.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qspinbox.h> -#include <qlistview.h> -#include <qgroupbox.h> -#include <qvalidator.h> +#include <tqcombobox.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqspinbox.h> +#include <tqlistview.h> +#include <tqgroupbox.h> +#include <tqvalidator.h> #include <klineedit.h> #include <kdebug.h> #include <klocale.h> #include <environmentvariableswidget.h> -CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const QString& configGroup, QWidget* parent) +CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent) : CustomMakeConfigWidgetBase(parent), m_part(part), m_configGroup(configGroup), m_dom( *part->projectDom() ) { @@ -43,7 +43,7 @@ CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const QS defaultTarget_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/make/defaulttarget")); makeoptions_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/make/makeoptions")); - envs_combo->setValidator(new QRegExpValidator(QRegExp("^\\D[^\\s]*"), this)); + envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D[^\\s]*"), this)); m_allEnvironments = m_part->allMakeEnvironments(); m_currentEnvironment = m_part->currentMakeEnvironment(); env_var_group->setColumnLayout( 1, Qt::Vertical ); @@ -58,9 +58,9 @@ CustomMakeConfigWidget::~CustomMakeConfigWidget() } -void CustomMakeConfigWidget::envNameChanged(const QString& envName) +void CustomMakeConfigWidget::envNameChanged(const TQString& envName) { - QStringList allEnvNames = m_part->allMakeEnvironments(); + TQStringList allEnvNames = m_part->allMakeEnvironments(); bool canAdd = !allEnvNames.contains(envName) && !envName.contains("/") && !envName.isEmpty(); bool canRemove = allEnvNames.contains(envName) && allEnvNames.count() > 1; addenvs_button->setEnabled(canAdd); @@ -68,7 +68,7 @@ void CustomMakeConfigWidget::envNameChanged(const QString& envName) removeenvs_button->setEnabled(canRemove); } -void CustomMakeConfigWidget::envChanged(const QString& envName) +void CustomMakeConfigWidget::envChanged(const TQString& envName) { if (envName == m_currentEnvironment || !m_allEnvironments.contains(envName)) return; @@ -84,7 +84,7 @@ void CustomMakeConfigWidget::envChanged(const QString& envName) void CustomMakeConfigWidget::envAdded() { - QString env = envs_combo->currentText(); + TQString env = envs_combo->currentText(); m_allEnvironments.append(env); envs_combo->clear(); @@ -94,19 +94,19 @@ void CustomMakeConfigWidget::envAdded() void CustomMakeConfigWidget::envRemoved() { - QString env = envs_combo->currentText(); - QDomNode node = DomUtil::elementByPath(m_dom, m_configGroup + "/make/environments"); + TQString env = envs_combo->currentText(); + TQDomNode node = DomUtil::elementByPath(m_dom, m_configGroup + "/make/environments"); node.removeChild(node.namedItem(env)); m_allEnvironments.remove(env); envs_combo->clear(); envs_combo->insertStringList(m_allEnvironments); - m_currentEnvironment = QString::null; + m_currentEnvironment = TQString::null; envChanged( m_allEnvironments[0] ); } void CustomMakeConfigWidget::envCopied() { - QString env = envs_combo->currentText(); + TQString env = envs_combo->currentText(); m_allEnvironments.append(env); envs_combo->clear(); envs_combo->insertStringList(m_allEnvironments); diff --git a/buildtools/custommakefiles/custommakeconfigwidget.h b/buildtools/custommakefiles/custommakeconfigwidget.h index ae8376c1..5a94e669 100644 --- a/buildtools/custommakefiles/custommakeconfigwidget.h +++ b/buildtools/custommakefiles/custommakeconfigwidget.h @@ -26,7 +26,7 @@ class CustomMakeConfigWidget : public CustomMakeConfigWidgetBase Q_OBJECT public: - CustomMakeConfigWidget(CustomProjectPart* part, const QString& configGroup, QWidget* parent); + CustomMakeConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent); ~CustomMakeConfigWidget(); @@ -35,16 +35,16 @@ public slots: protected: CustomProjectPart* m_part; - QString m_configGroup; - QDomDocument& m_dom; + TQString m_configGroup; + TQDomDocument& m_dom; - QStringList m_allEnvironments; - QString m_currentEnvironment; + TQStringList m_allEnvironments; + TQString m_currentEnvironment; EnvironmentVariablesWidget* m_envWidget; - virtual void envNameChanged(const QString& envName); - virtual void envChanged(const QString& envName); + virtual void envNameChanged(const TQString& envName); + virtual void envChanged(const TQString& envName); virtual void envAdded(); virtual void envRemoved(); virtual void envCopied(); diff --git a/buildtools/custommakefiles/custommanagerwidget.cpp b/buildtools/custommakefiles/custommanagerwidget.cpp index 9001480e..84278a69 100644 --- a/buildtools/custommakefiles/custommanagerwidget.cpp +++ b/buildtools/custommakefiles/custommanagerwidget.cpp @@ -11,11 +11,11 @@ #include "custommanagerwidget.h" -#include <qstringlist.h> -#include <qlayout.h> -#include <qlistbox.h> -#include <qwhatsthis.h> -#include <qtooltip.h> +#include <tqstringlist.h> +#include <tqlayout.h> +#include <tqlistbox.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> #include <ktextedit.h> #include <kurlrequester.h> @@ -28,13 +28,13 @@ #include "customprojectpart.h" #include "domutil.h" -CustomManagerWidget::CustomManagerWidget( CustomProjectPart* part, QWidget* parent ) +CustomManagerWidget::CustomManagerWidget( CustomProjectPart* part, TQWidget* parent ) : CustomManagerWidgetBase( parent ), m_part( part), m_dom( *part->projectDom() ) { m_filetypes->insertStringList( DomUtil::readListEntry( m_dom, "kdevcustomproject/filetypes", "filetype" ) ); KURLRequester* urlselector = new KURLRequester( ); urlselector->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); - urlselector->setURL( QString::null ); + urlselector->setURL( TQString::null ); urlselector->completionObject() ->setDir( part->projectDirectory() ); urlselector->fileDialog() ->setURL( KURL( part->projectDirectory() ) ); m_blacklistBox = new KEditListBox( i18n("blacklisted files and directories are not" @@ -44,17 +44,17 @@ CustomManagerWidget::CustomManagerWidget( CustomProjectPart* part, QWidget* pare m_blacklistBox->setButtons( KEditListBox::Add | KEditListBox::Remove ); m_blacklistBox->insertStringList( DomUtil::readListEntry( m_dom, "kdevcustomproject/blacklist","path") ); grid->addWidget( m_blacklistBox, 0, 1 ); - connect(m_blacklistBox, SIGNAL(added(const QString&)), this, SLOT(checkUrl(const QString&))); + connect(m_blacklistBox, TQT_SIGNAL(added(const TQString&)), this, TQT_SLOT(checkUrl(const TQString&))); } -void CustomManagerWidget::checkUrl(const QString& url) +void CustomManagerWidget::checkUrl(const TQString& url) { kdDebug(9025) << "got file:" << url << endl; - if( !QFileInfo(url).isRelative() ) + if( !TQFileInfo(url).isRelative() ) { kdDebug(9025) << "seems to be non-relative" << endl; - QString relpath = m_part->relativeToProject( url ); - QListBoxItem* item = m_blacklistBox->listBox()->findItem( url ); + TQString relpath = m_part->relativeToProject( url ); + TQListBoxItem* item = m_blacklistBox->listBox()->findItem( url ); m_blacklistBox->listBox()->takeItem( item ); kdDebug(9025) << "relative path:" << relpath << endl; if( !relpath.isEmpty() ) diff --git a/buildtools/custommakefiles/custommanagerwidget.h b/buildtools/custommakefiles/custommanagerwidget.h index 4f15f156..ce12805b 100644 --- a/buildtools/custommakefiles/custommanagerwidget.h +++ b/buildtools/custommakefiles/custommanagerwidget.h @@ -15,7 +15,7 @@ #include "custommanagerwidgetbase.h" -#include <qdom.h> +#include <tqdom.h> class CustomProjectPart; class KEditListBox; @@ -25,14 +25,14 @@ class CustomManagerWidget : public CustomManagerWidgetBase Q_OBJECT public: - CustomManagerWidget( CustomProjectPart* part, QWidget* parent ); + CustomManagerWidget( CustomProjectPart* part, TQWidget* parent ); ~CustomManagerWidget(); public slots: - void checkUrl(const QString& url); + void checkUrl(const TQString& url); void accept(); private: CustomProjectPart* m_part; - QDomDocument& m_dom; + TQDomDocument& m_dom; KEditListBox* m_blacklistBox; }; diff --git a/buildtools/custommakefiles/customotherconfigwidget.cpp b/buildtools/custommakefiles/customotherconfigwidget.cpp index 47fe4b4d..d40c55d2 100644 --- a/buildtools/custommakefiles/customotherconfigwidget.cpp +++ b/buildtools/custommakefiles/customotherconfigwidget.cpp @@ -11,25 +11,25 @@ #include "customotherconfigwidget.h" #include <custombuildoptionswidgetbase.h> #include <customprojectpart.h> -#include <qcombobox.h> -#include <qdir.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qlineedit.h> -#include <qspinbox.h> -#include <qlistview.h> -#include <qgroupbox.h> -#include <qvalidator.h> +#include <tqcombobox.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqlineedit.h> +#include <tqspinbox.h> +#include <tqlistview.h> +#include <tqgroupbox.h> +#include <tqvalidator.h> #include <kdebug.h> #include <klocale.h> #include <environmentvariableswidget.h> -CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const QString& configGroup, QWidget* parent) +CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent) : CustomOtherConfigWidgetBase(parent), m_part(part), m_configGroup(configGroup), m_dom( *part->projectDom() ) { @@ -38,7 +38,7 @@ CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const defaultTarget_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/other/defaulttarget")); makeoptions_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/other/otheroptions")); - envs_combo->setValidator(new QRegExpValidator(QRegExp("^\\D.*"), this)); + envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); m_allEnvironments = m_part->allMakeEnvironments(); m_currentEnvironment = m_part->currentMakeEnvironment(); env_var_group->setColumnLayout( 1, Qt::Vertical ); @@ -53,9 +53,9 @@ CustomOtherConfigWidget::~CustomOtherConfigWidget() } -void CustomOtherConfigWidget::envNameChanged(const QString& envName) +void CustomOtherConfigWidget::envNameChanged(const TQString& envName) { - QStringList allEnvNames = m_part->allMakeEnvironments(); + TQStringList allEnvNames = m_part->allMakeEnvironments(); bool canAdd = !allEnvNames.contains(envName) && !envName.contains("/") && !envName.isEmpty(); bool canRemove = allEnvNames.contains(envName) && allEnvNames.count() > 1; addenvs_button->setEnabled(canAdd); @@ -63,7 +63,7 @@ void CustomOtherConfigWidget::envNameChanged(const QString& envName) removeenvs_button->setEnabled(canRemove); } -void CustomOtherConfigWidget::envChanged(const QString& envName) +void CustomOtherConfigWidget::envChanged(const TQString& envName) { if (envName == m_currentEnvironment || !m_allEnvironments.contains(envName)) return; @@ -79,7 +79,7 @@ void CustomOtherConfigWidget::envChanged(const QString& envName) void CustomOtherConfigWidget::envAdded() { - QString env = envs_combo->currentText(); + TQString env = envs_combo->currentText(); m_allEnvironments.append(env); envs_combo->clear(); @@ -89,19 +89,19 @@ void CustomOtherConfigWidget::envAdded() void CustomOtherConfigWidget::envRemoved() { - QString env = envs_combo->currentText(); - QDomNode node = DomUtil::elementByPath(m_dom, m_configGroup + "/other/environments"); + TQString env = envs_combo->currentText(); + TQDomNode node = DomUtil::elementByPath(m_dom, m_configGroup + "/other/environments"); node.removeChild(node.namedItem(env)); m_allEnvironments.remove(env); envs_combo->clear(); envs_combo->insertStringList(m_allEnvironments); - m_currentEnvironment = QString::null; + m_currentEnvironment = TQString::null; envChanged( m_allEnvironments[0] ); } void CustomOtherConfigWidget::envCopied() { - QString env = envs_combo->currentText(); + TQString env = envs_combo->currentText(); m_allEnvironments.append(env); envs_combo->clear(); envs_combo->insertStringList(m_allEnvironments); diff --git a/buildtools/custommakefiles/customotherconfigwidget.h b/buildtools/custommakefiles/customotherconfigwidget.h index 755df98b..c786635c 100644 --- a/buildtools/custommakefiles/customotherconfigwidget.h +++ b/buildtools/custommakefiles/customotherconfigwidget.h @@ -26,7 +26,7 @@ class CustomOtherConfigWidget : public CustomOtherConfigWidgetBase Q_OBJECT public: - CustomOtherConfigWidget(CustomProjectPart* part, const QString& configGroup, QWidget* parent); + CustomOtherConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent); ~CustomOtherConfigWidget(); @@ -35,16 +35,16 @@ public slots: protected: CustomProjectPart* m_part; - QString m_configGroup; - QDomDocument& m_dom; + TQString m_configGroup; + TQDomDocument& m_dom; - QStringList m_allEnvironments; - QString m_currentEnvironment; + TQStringList m_allEnvironments; + TQString m_currentEnvironment; EnvironmentVariablesWidget* m_envWidget; - virtual void envNameChanged(const QString& envName); - virtual void envChanged(const QString& envName); + virtual void envNameChanged(const TQString& envName); + virtual void envChanged(const TQString& envName); virtual void envAdded(); virtual void envRemoved(); virtual void envCopied(); diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index f061dadc..b25a69d7 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -13,18 +13,18 @@ #include "customprojectpart.h" -#include <qapplication.h> +#include <tqapplication.h> #include <kapplication.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qpopupmenu.h> -#include <qregexp.h> -#include <qstringlist.h> -#include <qtabwidget.h> -#include <qvaluestack.h> -#include <qvbox.h> -#include <qwhatsthis.h> -#include <qdom.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqpopupmenu.h> +#include <tqregexp.h> +#include <tqstringlist.h> +#include <tqtabwidget.h> +#include <tqvaluestack.h> +#include <tqvbox.h> +#include <tqwhatsthis.h> +#include <tqdom.h> #include <kaction.h> #include <kconfig.h> @@ -65,7 +65,7 @@ typedef KDevGenericFactory<CustomProjectPart> CustomProjectFactory; static const KDevPluginInfo data( "kdevcustomproject" ); K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( data ) ) -CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const QStringList & ) +CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TQStringList & ) : KDevBuildTool( &data, parent, name ? name : "CustomProjectPart" ) , m_lastCompilationFailed( false ), m_recursive( false ), m_first_recursive( false ) { @@ -76,12 +76,12 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q KAction *action; - action = new KAction( i18n( "Re-Populate Project" ), 0, this, SLOT( populateProject() ), actionCollection(), "repopulate_project" ); + action = new KAction( i18n( "Re-Populate Project" ), 0, this, TQT_SLOT( populateProject() ), actionCollection(), "repopulate_project" ); action->setToolTip( i18n( "Re-Populate Project" ) ); action->setWhatsThis( i18n( "<b>Re-Populate Project</b><p>Re-Populates the project, searching through the project directory and adding all files that match one of the wildcards set in the custom manager options of the project filelist." ) ); action = new KAction( i18n( "&Build Project" ), "make_kdevelop", Key_F8, - this, SLOT( slotBuild() ), + this, TQT_SLOT( slotBuild() ), actionCollection(), "build_build" ); action->setToolTip( i18n( "Build project" ) ); action->setWhatsThis( i18n( "<b>Build project</b><p>Runs <b>make</b> from the project directory.<br>" @@ -89,7 +89,7 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q "in the project settings dialog, <b>Build Options</b> tab." ) ); action = new KAction( i18n( "&Build Active Directory" ), "make_kdevelop", Key_F7, - this, SLOT( slotBuildActiveDir() ), + this, TQT_SLOT( slotBuildActiveDir() ), actionCollection(), "build_buildactivetarget" ); action->setToolTip( i18n( "Build active directory" ) ); action->setWhatsThis( i18n( "<b>Build active directory</b><p>Constructs a series of make commands to build the active directory. " @@ -97,7 +97,7 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q "in the project settings dialog, <b>Make Options</b> tab." ) ); action = new KAction( i18n( "Compile &File" ), "make_kdevelop", - this, SLOT( slotCompileFile() ), + this, TQT_SLOT( slotCompileFile() ), actionCollection(), "build_compilefile" ); action->setToolTip( i18n( "Compile file" ) ); action->setWhatsThis( i18n( "<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory where 'filename' is the name of currently opened file.<br>" @@ -105,7 +105,7 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q "in the project settings dialog, <b>Build Options</b> tab." ) ); action = new KAction( i18n( "Install" ), 0, - this, SLOT( slotInstall() ), + this, TQT_SLOT( slotInstall() ), actionCollection(), "build_install" ); action->setToolTip( i18n( "Install" ) ); action->setWhatsThis( i18n( "<b>Install</b><p>Runs <b>make install</b> command from the project directory.<br>" @@ -113,7 +113,7 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q "in the project settings dialog, <b>Make Options</b> tab." ) ); action = new KAction( i18n( "Install Active Directory" ), 0, - this, SLOT( slotInstallActiveDir() ), + this, TQT_SLOT( slotInstallActiveDir() ), actionCollection(), "build_installactivetarget" ); action->setToolTip( i18n( "Install active directory" ) ); action->setWhatsThis( i18n( "<b>Install active directory</b><p>Runs <b>make install</b> command from the active directory.<br>" @@ -121,7 +121,7 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q "in the project settings dialog, <b>Make Options</b> tab." ) ); action = new KAction( i18n( "Install (as root user)" ), 0, - this, SLOT( slotInstallWithKdesu() ), + this, TQT_SLOT( slotInstallWithKdesu() ), actionCollection(), "build_install_kdesu" ); action->setToolTip( i18n( "Install as root user" ) ); action->setWhatsThis( i18n( "<b>Install</b><p>Runs <b>make install</b> command from the project directory with root privileges.<br>" @@ -130,7 +130,7 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q "in the project settings dialog, <b>Make Options</b> tab." ) ); action = new KAction( i18n( "&Clean Project" ), 0, - this, SLOT( slotClean() ), + this, TQT_SLOT( slotClean() ), actionCollection(), "build_clean" ); action->setToolTip( i18n( "Clean project" ) ); action->setWhatsThis( i18n( "<b>Clean project</b><p>Runs <b>make clean</b> command from the project directory.<br>" @@ -138,7 +138,7 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q "in the project settings dialog, <b>Build Options</b> tab." ) ); action = new KAction( i18n( "Execute Program" ), "exec", 0, - this, SLOT( slotExecute() ), + this, TQT_SLOT( slotExecute() ), actionCollection(), "build_execute" ); action->setToolTip( i18n( "Execute program" ) ); action->setWhatsThis( i18n( "<b>Execute program</b><p>Executes the main program specified in project settings, <b>Run Options</b> tab. " @@ -152,8 +152,8 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q "Environment variables and make arguments can be specified " "in the project settings dialog, <b>Build Options</b> tab." ) ); - m_targetObjectFilesMenu = new QPopupMenu(); - m_targetOtherFilesMenu = new QPopupMenu(); + m_targetObjectFilesMenu = new TQPopupMenu(); + m_targetOtherFilesMenu = new TQPopupMenu(); m_makeEnvironmentsSelector = new KSelectAction( i18n( "Make &Environment" ), 0, actionCollection(), "build_make_environment" ); @@ -162,27 +162,27 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q "Environment variables can be specified in the project " "settings dialog, <b>Build Options</b> tab." ) ); - connect( m_targetMenu, SIGNAL( aboutToShow() ), - this, SLOT( updateTargetMenu() ) ); - connect( m_targetMenu, SIGNAL( activated( int ) ), - this, SLOT( targetMenuActivated( int ) ) ); - connect( m_targetObjectFilesMenu, SIGNAL( activated( int ) ), - this, SLOT( targetObjectFilesMenuActivated( int ) ) ); - connect( m_targetOtherFilesMenu, SIGNAL( activated( int ) ), - this, SLOT( targetOtherFilesMenuActivated( int ) ) ); - connect( m_makeEnvironmentsSelector->popupMenu(), SIGNAL( aboutToShow() ), - this, SLOT( updateMakeEnvironmentsMenu() ) ); - connect( m_makeEnvironmentsSelector->popupMenu(), SIGNAL( activated( int ) ), - this, SLOT( makeEnvironmentsMenuActivated( int ) ) ); - connect( core(), SIGNAL( projectConfigWidget( KDialogBase* ) ), - this, SLOT( projectConfigWidget( KDialogBase* ) ) ); - connect( core(), SIGNAL( contextMenu( QPopupMenu *, const Context * ) ), - this, SLOT( contextMenu( QPopupMenu *, const Context * ) ) ); - - connect( makeFrontend(), SIGNAL( commandFinished( const QString& ) ), - this, SLOT( slotCommandFinished( const QString& ) ) ); - connect( makeFrontend(), SIGNAL( commandFailed( const QString& ) ), - this, SLOT( slotCommandFailed( const QString& ) ) ); + connect( m_targetMenu, TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( updateTargetMenu() ) ); + connect( m_targetMenu, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( targetMenuActivated( int ) ) ); + connect( m_targetObjectFilesMenu, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( targetObjectFilesMenuActivated( int ) ) ); + connect( m_targetOtherFilesMenu, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( targetOtherFilesMenuActivated( int ) ) ); + connect( m_makeEnvironmentsSelector->popupMenu(), TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( updateMakeEnvironmentsMenu() ) ); + connect( m_makeEnvironmentsSelector->popupMenu(), TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( makeEnvironmentsMenuActivated( int ) ) ); + connect( core(), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), + this, TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core(), TQT_SIGNAL( contextMenu( TQPopupMenu *, const Context * ) ), + this, TQT_SLOT( contextMenu( TQPopupMenu *, const Context * ) ) ); + + connect( makeFrontend(), TQT_SIGNAL( commandFinished( const TQString& ) ), + this, TQT_SLOT( slotCommandFinished( const TQString& ) ) ); + connect( makeFrontend(), TQT_SIGNAL( commandFailed( const TQString& ) ), + this, TQT_SLOT( slotCommandFailed( const TQString& ) ) ); } @@ -192,34 +192,34 @@ CustomProjectPart::~CustomProjectPart() void CustomProjectPart::projectConfigWidget( KDialogBase *dlg ) { - QVBox *vbox; + TQVBox *vbox; vbox = dlg->addVBoxPage( i18n( "Custom Manager" ), i18n( "Custom Manager" ), BarIcon( "make", KIcon::SizeMedium ) ); CustomManagerWidget *w0 = new CustomManagerWidget( this, vbox ); - connect( dlg, SIGNAL( okClicked() ), w0, SLOT( accept() ) ); + connect( dlg, TQT_SIGNAL( okClicked() ), w0, TQT_SLOT( accept() ) ); vbox = dlg->addVBoxPage( i18n( "Run Options" ), i18n( "Run Options" ), BarIcon( "make", KIcon::SizeMedium ) ); RunOptionsWidget *w1 = new RunOptionsWidget( *projectDom(), "/kdevcustomproject", buildDirectory(), vbox ); - connect( dlg, SIGNAL( okClicked() ), w1, SLOT( accept() ) ); + connect( dlg, TQT_SIGNAL( okClicked() ), w1, TQT_SLOT( accept() ) ); vbox = dlg->addVBoxPage( i18n( "Build Options" ), i18n( "Build Options" ), BarIcon( "make", KIcon::SizeMedium ) ); - QTabWidget *buildtab = new QTabWidget( vbox ); + TQTabWidget *buildtab = new TQTabWidget( vbox ); CustomBuildOptionsWidget *w2 = new CustomBuildOptionsWidget( *projectDom(), buildtab ); - connect( dlg, SIGNAL( okClicked() ), w2, SLOT( accept() ) ); + connect( dlg, TQT_SIGNAL( okClicked() ), w2, TQT_SLOT( accept() ) ); buildtab->addTab( w2, i18n( "&Build" ) ); CustomOtherConfigWidget *w4 = new CustomOtherConfigWidget( this, "/kdevcustomproject", buildtab ); - connect( dlg, SIGNAL( okClicked() ), w4, SLOT( accept() ) ); + connect( dlg, TQT_SIGNAL( okClicked() ), w4, TQT_SLOT( accept() ) ); buildtab->addTab( w4, i18n( "&Other" ) ); CustomMakeConfigWidget *w3 = new CustomMakeConfigWidget( this, "/kdevcustomproject", buildtab ); buildtab->addTab( w3, i18n( "Ma&ke" ) ); w2->setMakeOptionsWidget( buildtab, w3, w4 ); - connect( dlg, SIGNAL( okClicked() ), w3, SLOT( accept() ) ); + connect( dlg, TQT_SIGNAL( okClicked() ), w3, TQT_SLOT( accept() ) ); } -void CustomProjectPart::contextMenu( QPopupMenu *popup, const Context *context ) +void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context ) { if ( !context->hasType( Context::FileContext ) ) return; @@ -229,9 +229,9 @@ void CustomProjectPart::contextMenu( QPopupMenu *popup, const Context *context ) m_contextAddFiles.clear(); m_contextRemoveFiles.clear(); - QString popupstr = fcontext->urls().first().fileName(); + TQString popupstr = fcontext->urls().first().fileName(); - if ( popupstr == QString::null ) + if ( popupstr == TQString::null ) popupstr = "."; if ( fcontext->urls().size() == 1 && URLUtil::isDirectory( fcontext->urls().first() ) && !isInBlacklist( fcontext->urls().first().path() ) ) @@ -241,7 +241,7 @@ void CustomProjectPart::contextMenu( QPopupMenu *popup, const Context *context ) m_contextDirName = fcontext->urls().first().path(); m_contextDirName = m_contextDirName.mid( project()->projectDirectory().length() + 1 ); int id = popup->insertItem( i18n( "Make Active Directory" ), - this, SLOT( slotChooseActiveDirectory() ) ); + this, TQT_SLOT( slotChooseActiveDirectory() ) ); popup->setWhatsThis( id, i18n( "<b>Make active directory</b><p>" "Chooses this directory as the destination for new files created using wizards " "like the <i>New Class</i> wizard." ) ); @@ -257,7 +257,7 @@ void CustomProjectPart::contextMenu( QPopupMenu *popup, const Context *context ) if ( isInBlacklist( m_contextDirName ) ) { id = popup->insertItem( i18n( "Remove from blacklist" ), - this, SLOT( slotChangeBlacklist() ) ); + this, TQT_SLOT( slotChangeBlacklist() ) ); popup->setWhatsThis( id, i18n( "<b>Remove from blacklist</b><p>" "Removes the given file or directory from the " "blacklist if it is already in it.<br>The blacklist contains files and" @@ -267,7 +267,7 @@ void CustomProjectPart::contextMenu( QPopupMenu *popup, const Context *context ) else { id = popup->insertItem( i18n( "Add to blacklist" ), - this, SLOT( slotChangeBlacklist() ) ); + this, TQT_SLOT( slotChangeBlacklist() ) ); popup->setWhatsThis( id, i18n( "<b>Add to blacklist</b><p>" "Adds the given file or directory to the blacklist.<br>The blacklist contains files and" " directories that should be ignored even if they match a project filetype " @@ -283,8 +283,8 @@ void CustomProjectPart::contextMenu( QPopupMenu *popup, const Context *context ) for ( KURL::List::ConstIterator it = urls.begin(); it != urls.end(); ++it ) { kdDebug( 9025 ) << "Checking URL: " << *it << endl; - QString canPath( URLUtil::canonicalPath(( *it ).path() ) ); - QString relPath = relativeToProject( canPath ); + TQString canPath( URLUtil::canonicalPath(( *it ).path() ) ); + TQString relPath = relativeToProject( canPath ); kdDebug( 9025 ) << "relpath: " << relPath << "|canpath: " << canPath << endl; if ( isInBlacklist( relPath ) ) continue; @@ -295,7 +295,7 @@ void CustomProjectPart::contextMenu( QPopupMenu *popup, const Context *context ) if ( !project()->isProjectFile( canPath ) ) m_contextAddFiles << relPath; } - if ( QFileInfo(( *it ).path() ).isDir() ) + if ( TQFileInfo(( *it ).path() ).isDir() ) { if ( containsProjectFiles( canPath ) || project()->isProjectFile( canPath ) ) { @@ -317,13 +317,13 @@ void CustomProjectPart::contextMenu( QPopupMenu *popup, const Context *context ) if ( m_contextAddFiles.size() > 0 ) { int id = popup->insertItem( i18n( "Add Selected File/Dir(s) to Project" ), - this, SLOT( slotAddToProject() ) ); + this, TQT_SLOT( slotAddToProject() ) ); popup->setWhatsThis( id, i18n( "<b>Add to project</b><p>Adds selected file/dir(s) to the list of files in the project. " "Note that the files should be manually added to the corresponding makefile or build.xml." ) ); if ( dirAddRecursive ) { int id = popup->insertItem( i18n( "Add Selected Dir(s) to Project (recursive)" ), - this, SLOT( slotAddToProjectRecursive() ) ); + this, TQT_SLOT( slotAddToProjectRecursive() ) ); popup->setWhatsThis( id, i18n( "<b>Add to project</b><p>Recursively adds selected dir(s) to the list of files in the project. " "Note that the files should be manually added to the corresponding makefile or build.xml." ) ); } @@ -332,14 +332,14 @@ void CustomProjectPart::contextMenu( QPopupMenu *popup, const Context *context ) if ( m_contextRemoveFiles.size() > 0 ) { int id = popup->insertItem( i18n( "Remove Selected File/Dir(s) From Project" ), - this, SLOT( slotRemoveFromProject() ) ); + this, TQT_SLOT( slotRemoveFromProject() ) ); popup->setWhatsThis( id, i18n( "<b>Remove from project</b><p>Removes selected file/dir(s) from the list of files in the project. " "Note that the files should be manually excluded from the corresponding makefile or build.xml." ) ); if ( dirDelRecursive ) { int id = popup->insertItem( i18n( "Remove Selected Dir(s) From Project (recursive)" ), - this, SLOT( slotRemoveFromProjectRecursive() ) ); + this, TQT_SLOT( slotRemoveFromProjectRecursive() ) ); popup->setWhatsThis( id, i18n( "<b>Remove from project</b><p>Recursively removes selected dir(s) from the list of files in the project. " "Note that the files should be manually excluded from the corresponding makefile or build.xml." ) ); } @@ -385,19 +385,19 @@ void CustomProjectPart::slotChangeBlacklist() void CustomProjectPart::slotChooseActiveDirectory() { - QString olddir = activeDirectory(); - QDomDocument &dom = *projectDom(); + TQString olddir = activeDirectory(); + TQDomDocument &dom = *projectDom(); DomUtil::writeEntry( dom, "/kdevcustomproject/general/activedir", m_contextDirName ); emit activeDirectoryChanged( olddir, activeDirectory() ); } -void CustomProjectPart::openProject( const QString &dirName, const QString &projectName ) +void CustomProjectPart::openProject( const TQString &dirName, const TQString &projectName ) { m_projectDirectory = dirName; m_projectName = projectName; - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); // Set the default directory radio to "executable" if ( DomUtil::readEntry( dom, "/kdevcustomproject/run/directoryradio" ) == "" ) { @@ -406,7 +406,7 @@ void CustomProjectPart::openProject( const QString &dirName, const QString &proj if ( filetypes().isEmpty() ) { - QStringList types; + TQStringList types; types << "*.java" << "*.h" << "*.H" << "*.hh" << "*.hxx" << "*.hpp" << "*.c" << "*.C" << "*.cc" << "*.cpp" << "*.c++" << "*.cxx" << "Makefile" << "CMakeLists.txt"; DomUtil::writeListEntry( dom, "/kdevcustomproject/filetypes", "filetype", types ); @@ -420,33 +420,33 @@ void CustomProjectPart::openProject( const QString &dirName, const QString &proj if ( m_filelistDir.isEmpty() ) m_filelistDir = dirName; - if ( QFileInfo( m_filelistDir + "/" + projectName.lower() + + if ( TQFileInfo( m_filelistDir + "/" + projectName.lower() + ".kdevelop.filelist" ).exists() ) { - QDir( m_filelistDir ).rename( + TQDir( m_filelistDir ).rename( projectName.lower() + ".kdevelop.filelist", projectName + ".kdevelop.filelist" ); } - QFile f( m_filelistDir + "/" + projectName + ".kdevelop.filelist" ); + TQFile f( m_filelistDir + "/" + projectName + ".kdevelop.filelist" ); if ( f.open( IO_ReadOnly ) ) { - QTextStream stream( &f ); + TQTextStream stream( &f ); while ( !stream.atEnd() ) { - QString s = stream.readLine(); + TQString s = stream.readLine(); // Skip comments. if ( s.isEmpty() || s.startsWith( "#" ) ) continue; // Skip non-existent files. - if ( ! QFileInfo( projectDirectory() + "/" + s ).exists() ) + if ( ! TQFileInfo( projectDirectory() + "/" + s ).exists() ) continue; // Do not bother with files already in project or on blacklist. if ( isInProject( s ) || isInBlacklist( s ) ) continue; addToProject( s ); } - QStringList newfiles; + TQStringList newfiles; findNewFiles( dirName, newfiles ); if ( newfiles.count() > 0 ) @@ -460,19 +460,19 @@ void CustomProjectPart::openProject( const QString &dirName, const QString &proj int r = KMessageBox::questionYesNo( mainWindow()->main(), i18n( "This project does not contain any files yet.\n" "Populate it with all C/C++/Java files below " - "the project directory?" ), QString::null, i18n( "Populate" ), i18n( "Do Not Populate" ) ); + "the project directory?" ), TQString::null, i18n( "Populate" ), i18n( "Do Not Populate" ) ); if ( r == KMessageBox::Yes ) populateProject(); } // check if there is an old envvars entry (from old project file with single make environment) - QString buildtool = DomUtil::readEntry( dom , "/kdevcustomproject/build/buildtool" ); - QDomElement el = + TQString buildtool = DomUtil::readEntry( dom , "/kdevcustomproject/build/buildtool" ); + TQDomElement el = DomUtil::elementByPath( dom , "/kdevcustomproject/" + buildtool + "/envvars" ); if ( !el.isNull() ) { - QDomElement envs = DomUtil::createElementByPath( dom , "/kdevcustomproject/" + buildtool + "/environments" ); + TQDomElement envs = DomUtil::createElementByPath( dom , "/kdevcustomproject/" + buildtool + "/environments" ); DomUtil::makeEmpty( envs ); el.setTagName( "default" ); envs.appendChild( el ); @@ -490,23 +490,23 @@ void CustomProjectPart::openProject( const QString &dirName, const QString &proj * @param dir directory to scan (and recurse) for potential project files. * @param[out] fileList the list of files found. */ -void CustomProjectPart::findNewFiles( const QString& dir, QStringList& filelist ) const +void CustomProjectPart::findNewFiles( const TQString& dir, TQStringList& filelist ) const { if ( dir.isEmpty() ) return; - QStringList fileentries = QDir( dir ).entryList( filetypes().join( ";" ) ); - QStringList dirs = QDir( dir ).entryList( QDir::Dirs ); - QStringList entries = fileentries + dirs; - QString relpath = relativeToProject( dir ); + TQStringList fileentries = TQDir( dir ).entryList( filetypes().join( ";" ) ); + TQStringList dirs = TQDir( dir ).entryList( TQDir::Dirs ); + TQStringList entries = fileentries + dirs; + TQString relpath = relativeToProject( dir ); if ( !relpath.isEmpty() ) relpath += "/"; - for ( QStringList::const_iterator it = entries.begin(); it != entries.end(); ++it ) + for ( TQStringList::const_iterator it = entries.begin(); it != entries.end(); ++it ) { // Only process genuine entries - files and directories. if (( *it == "." ) || ( *it == ".." ) ) continue; // If the entry (be it a file or a directory) is already part of this project, proceed to next one. - const QString relativeEntry( relpath + *it ); + const TQString relativeEntry( relpath + *it ); if ( isInProject( relativeEntry ) ) continue; // If the entry is blacklisted, proceed to next one. @@ -519,24 +519,24 @@ void CustomProjectPart::findNewFiles( const QString& dir, QStringList& filelist continue; // We have a new, non-blacklisted entry. // Recurse into it (a directory) or add it to the potential list of new project files. - const QString absoluteEntry( dir + "/" + *it ); - if ( QFileInfo( absoluteEntry ).isFile() ) + const TQString absoluteEntry( dir + "/" + *it ); + if ( TQFileInfo( absoluteEntry ).isFile() ) { filelist << relativeEntry; } - else if ( QFileInfo( absoluteEntry ).isDir() ) + else if ( TQFileInfo( absoluteEntry ).isDir() ) { bool searchRecursive = true; - QFileInfo fi( absoluteEntry ); + TQFileInfo fi( absoluteEntry ); if( fi.isSymLink() ) { - QString realDir = fi.readLink(); - if( QFileInfo( realDir ).exists() ) + TQString realDir = fi.readLink(); + if( TQFileInfo( realDir ).exists() ) { - for( QStringList::const_iterator it = filelist.constBegin(); it != filelist.constEnd(); ++it ) + for( TQStringList::const_iterator it = filelist.constBegin(); it != filelist.constEnd(); ++it ) { - if( QFileInfo(projectDirectory()+"/"+*it).absFilePath().startsWith( realDir ) ) + if( TQFileInfo(projectDirectory()+"/"+*it).absFilePath().startsWith( realDir ) ) { searchRecursive = false; } @@ -559,24 +559,24 @@ void CustomProjectPart::populateProject() KDialogBase* dlg = new KDialogBase( mainWindow()->main(), "typeselector", true, "Select filetypes of project", KDialogBase::Ok | KDialogBase::Cancel ); - QVBox* box = dlg->makeVBoxMainWidget(); + TQVBox* box = dlg->makeVBoxMainWidget(); KEditListBox* lb = new KEditListBox( "Filetypes in the project", box, "selecttypes", false, KEditListBox::Add | KEditListBox::Remove ); lb->setItems( filetypes() ); - if ( dlg->exec() == QDialog::Accepted ) + if ( dlg->exec() == TQDialog::Accepted ) { setFiletypes( lb->items() ); } - QApplication::setOverrideCursor( Qt::waitCursor ); + TQApplication::setOverrideCursor( Qt::waitCursor ); removeFiles( allFiles() ); - updateBlacklist( QStringList() ); + updateBlacklist( TQStringList() ); - QStringList newlist; + TQStringList newlist; findNewFiles( projectDirectory(), newlist ); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); addNewFilesToProject( newlist ); } @@ -588,11 +588,11 @@ void CustomProjectPart::closeProject() void CustomProjectPart::saveProject() { - QFile f( m_filelistDir + "/" + m_projectName + ".kdevelop.filelist" ); + TQFile f( m_filelistDir + "/" + m_projectName + ".kdevelop.filelist" ); if ( !f.open( IO_WriteOnly ) ) return; - QTextStream stream( &f ); + TQTextStream stream( &f ); stream << "# KDevelop Custom Project File List" << endl; ProjectFilesSet::ConstIterator it; @@ -602,13 +602,13 @@ void CustomProjectPart::saveProject() } -QString CustomProjectPart::projectDirectory() const +TQString CustomProjectPart::projectDirectory() const { return m_projectDirectory; } -QString CustomProjectPart::projectName() const +TQString CustomProjectPart::projectName() const { return m_projectName; } @@ -630,9 +630,9 @@ DomUtil::PairList CustomProjectPart::runEnvironmentVars() const * if run/directoryradio == custom * The custom directory absolute path */ -QString CustomProjectPart::runDirectory() const +TQString CustomProjectPart::runDirectory() const { - QString cwd = defaultRunDirectory( "kdevcustomproject" ); + TQString cwd = defaultRunDirectory( "kdevcustomproject" ); if ( cwd.isEmpty() ) cwd = buildDirectory(); return cwd; @@ -648,15 +648,15 @@ QString CustomProjectPart::runDirectory() const * if run/directoryradio == custom or relative == false * The absolute path to executable */ -QString CustomProjectPart::mainProgram() const +TQString CustomProjectPart::mainProgram() const { - QDomDocument * dom = projectDom(); + TQDomDocument * dom = projectDom(); - if ( !dom ) return QString(); + if ( !dom ) return TQString(); - QString DomMainProgram = DomUtil::readEntry( *dom, "/kdevcustomproject/run/mainprogram" ); + TQString DomMainProgram = DomUtil::readEntry( *dom, "/kdevcustomproject/run/mainprogram" ); - if ( DomMainProgram.isEmpty() ) return QString(); + if ( DomMainProgram.isEmpty() ) return TQString(); if ( DomMainProgram.startsWith( "/" ) ) // assume absolute path { @@ -667,48 +667,48 @@ QString CustomProjectPart::mainProgram() const return projectDirectory() + "/" + DomMainProgram; } - return QString(); + return TQString(); } -/** Retuns a QString with the debug command line arguments */ -QString CustomProjectPart::debugArguments() const +/** Retuns a TQString with the debug command line arguments */ +TQString CustomProjectPart::debugArguments() const { return DomUtil::readEntry( *projectDom(), "/kdevcustomproject/run/globaldebugarguments" ); } -/** Retuns a QString with the run command line arguments */ -QString CustomProjectPart::runArguments() const +/** Retuns a TQString with the run command line arguments */ +TQString CustomProjectPart::runArguments() const { return DomUtil::readEntry( *projectDom(), "/kdevcustomproject/run/programargs" ); } -QString CustomProjectPart::activeDirectory() const +TQString CustomProjectPart::activeDirectory() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); return DomUtil::readEntry( dom, "/kdevcustomproject/general/activedir", "." ); } -QStringList CustomProjectPart::allFiles() const +TQStringList CustomProjectPart::allFiles() const { return m_sourceFilesSet.keys(); } -void CustomProjectPart::addFile( const QString &fileName ) +void CustomProjectPart::addFile( const TQString &fileName ) { - QStringList fileList; + TQStringList fileList; fileList.append( fileName ); this->addFiles( fileList ); } -void CustomProjectPart::addFiles( const QStringList& fileList ) +void CustomProjectPart::addFiles( const TQStringList& fileList ) { - QStringList::ConstIterator it; - QStringList addedFiles; - QStringList myfileList = fileList; + TQStringList::ConstIterator it; + TQStringList addedFiles; + TQStringList myfileList = fileList; kdDebug( 9025 ) << "Adding files: " << myfileList << endl; myfileList.remove( "." ); myfileList.remove( "" ); @@ -717,9 +717,9 @@ void CustomProjectPart::addFiles( const QStringList& fileList ) { if ( isInBlacklist( *it ) ) continue; - QString relpath; + TQString relpath; kdDebug( 9025 ) << "Checking path: " << *it << endl; - if ( QDir::isRelativePath( *it ) ) + if ( TQDir::isRelativePath( *it ) ) { kdDebug( 9025 ) << *it << " is relative" << endl; relpath = *it; @@ -730,17 +730,17 @@ void CustomProjectPart::addFiles( const QStringList& fileList ) relpath = relativeToProject( *it ); } - if ( !QFileInfo( projectDirectory() + "/" + relpath ).exists() ) + if ( !TQFileInfo( projectDirectory() + "/" + relpath ).exists() ) continue; - if ( QFileInfo( projectDirectory() + "/" + relpath ).isDir() && ( m_recursive || m_first_recursive ) ) + if ( TQFileInfo( projectDirectory() + "/" + relpath ).isDir() && ( m_recursive || m_first_recursive ) ) { kdDebug( 9025 ) << "is a dir and " << m_recursive << "|" << m_first_recursive << endl; m_first_recursive = false; - QStringList fileentries = QDir( projectDirectory() + "/" + relpath ).entryList( filetypes().join( ";" ) ); - QStringList dirs = QDir( projectDirectory() + "/" + relpath ).entryList( QDir::Dirs ); - QStringList subentries = fileentries + dirs; - for ( QStringList::iterator subit = subentries.begin(); subit != subentries.end(); ++subit ) + TQStringList fileentries = TQDir( projectDirectory() + "/" + relpath ).entryList( filetypes().join( ";" ) ); + TQStringList dirs = TQDir( projectDirectory() + "/" + relpath ).entryList( TQDir::Dirs ); + TQStringList subentries = fileentries + dirs; + for ( TQStringList::iterator subit = subentries.begin(); subit != subentries.end(); ++subit ) { if ( *subit != "." && *subit != ".." ) *subit = relpath + "/" + ( *subit ); @@ -752,12 +752,12 @@ void CustomProjectPart::addFiles( const QStringList& fileList ) addToProject( relpath ); m_first_recursive = true; } - else if ( isProjectFileType( QFileInfo( relpath ).fileName() ) && ( ! isInProject( relpath ) ) ) + else if ( isProjectFileType( TQFileInfo( relpath ).fileName() ) && ( ! isInProject( relpath ) ) ) { - QStringList paths = QStringList::split( "/", relpath ); + TQStringList paths = TQStringList::split( "/", relpath ); paths.pop_back(); - QString path; - for ( QStringList::const_iterator it = paths.begin(); it != paths.end(); ++it ) + TQString path; + for ( TQStringList::const_iterator it = paths.begin(); it != paths.end(); ++it ) { path += *it; if ( ! isInProject( path ) ) @@ -782,39 +782,39 @@ void CustomProjectPart::addFiles( const QStringList& fileList ) emit addedFilesToProject( addedFiles ); } -void CustomProjectPart::removeFile( const QString &fileName ) +void CustomProjectPart::removeFile( const TQString &fileName ) { - QStringList fileList; + TQStringList fileList; fileList.append( fileName ); this->removeFiles( fileList ); } -void CustomProjectPart::removeFiles( const QStringList& fileList ) +void CustomProjectPart::removeFiles( const TQStringList& fileList ) { kdDebug( 9025 ) << "Emitting removedFilesFromProject" << fileList << endl; - QStringList removedFiles; - QStringList myfileList = fileList; - QStringList::ConstIterator it; + TQStringList removedFiles; + TQStringList myfileList = fileList; + TQStringList::ConstIterator it; myfileList.remove( "." ); myfileList.remove( ".." ); myfileList.remove( "" ); for ( it = myfileList.begin(); it != myfileList.end(); ++it ) { - QString relpath; - if ( QDir::isRelativePath( *it ) ) + TQString relpath; + if ( TQDir::isRelativePath( *it ) ) relpath = *it; else relpath = relativeToProject( *it ); - if ( QFileInfo( projectDirectory() + "/" + relpath ).isDir() && ( m_recursive || m_first_recursive ) ) + if ( TQFileInfo( projectDirectory() + "/" + relpath ).isDir() && ( m_recursive || m_first_recursive ) ) { m_first_recursive = false; - QStringList fileentries = QDir( projectDirectory() + "/" + relpath ).entryList( filetypes().join( ";" ) ); - QStringList dirs = QDir( projectDirectory() + "/" + relpath ).entryList( QDir::Dirs ); - QStringList subentries = fileentries + dirs; - for ( QStringList::iterator subit = subentries.begin(); subit != subentries.end(); ++subit ) + TQStringList fileentries = TQDir( projectDirectory() + "/" + relpath ).entryList( filetypes().join( ";" ) ); + TQStringList dirs = TQDir( projectDirectory() + "/" + relpath ).entryList( TQDir::Dirs ); + TQStringList subentries = fileentries + dirs; + for ( TQStringList::iterator subit = subentries.begin(); subit != subentries.end(); ++subit ) if ( *subit != "." && *subit != ".." ) *subit = relpath + "/" + ( *subit ); removeFiles( subentries ); @@ -829,13 +829,13 @@ void CustomProjectPart::removeFiles( const QStringList& fileList ) { removedFiles << relpath; removeFromProject( relpath ); - QStringList paths = QStringList::split( "/", relpath ); - QString lastsubentry = paths[paths.size()-1]; + TQStringList paths = TQStringList::split( "/", relpath ); + TQString lastsubentry = paths[paths.size()-1]; paths.pop_back(); while ( paths.size() > 0 ) { - QString dir = paths.join( "/" ); - QStringList projectentries = projectFilesInDir( dir ); + TQString dir = paths.join( "/" ); + TQStringList projectentries = projectFilesInDir( dir ); if ( projectentries.size() == 0 ) { removedFiles << dir; @@ -853,28 +853,28 @@ void CustomProjectPart::removeFiles( const QStringList& fileList ) emit removedFilesFromProject( removedFiles ); } -QString CustomProjectPart::buildDirectory() const +TQString CustomProjectPart::buildDirectory() const { - QString dir = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/builddir" ); + TQString dir = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/builddir" ); if ( dir.isEmpty() ) return projectDirectory(); - if ( QFileInfo( dir ).isRelative() ) - return QDir::cleanDirPath( projectDirectory() + "/" + dir ); + if ( TQFileInfo( dir ).isRelative() ) + return TQDir::cleanDirPath( projectDirectory() + "/" + dir ); return dir; } -QString CustomProjectPart::makeEnvironment() const +TQString CustomProjectPart::makeEnvironment() const { // Get the make environment variables pairs into the environstr string // in the form of: "ENV_VARIABLE=ENV_VALUE" // Note that we quote the variable value due to the possibility of // embedded spaces - QString buildtool = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/buildtool" ); + TQString buildtool = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/buildtool" ); DomUtil::PairList envvars = DomUtil::readPairListEntry( *projectDom(), "/kdevcustomproject/" + buildtool + "/environments/" + currentMakeEnvironment(), "envvar", "name", "value" ); - QString environstr; + TQString environstr; DomUtil::PairList::ConstIterator it; for ( it = envvars.begin(); it != envvars.end(); ++it ) { @@ -892,15 +892,15 @@ QString CustomProjectPart::makeEnvironment() const } -void CustomProjectPart::startMakeCommand( const QString &dir, const QString &target, bool withKdesu ) +void CustomProjectPart::startMakeCommand( const TQString &dir, const TQString &target, bool withKdesu ) { if ( partController()->saveAllFiles() == false ) return; //user cancelled - QDomDocument &dom = *projectDom(); - QString buildtool = DomUtil::readEntry( dom, "/kdevcustomproject/build/buildtool" ); + TQDomDocument &dom = *projectDom(); + TQString buildtool = DomUtil::readEntry( dom, "/kdevcustomproject/build/buildtool" ); - QString cmdline; + TQString cmdline; if ( buildtool == "ant" ) { cmdline = "ant"; @@ -925,7 +925,7 @@ void CustomProjectPart::startMakeCommand( const QString &dir, const QString &tar if ( jobs != 0 ) { cmdline += " -j"; - cmdline += QString::number( jobs ); + cmdline += TQString::number( jobs ); } if ( DomUtil::readBoolEntry( dom, "/kdevcustomproject/make/dontact" ) ) cmdline += " -n"; @@ -936,15 +936,15 @@ void CustomProjectPart::startMakeCommand( const QString &dir, const QString &tar if ( !target.isEmpty() ) cmdline += KProcess::quote( target ); - QString dircmd = "cd "; + TQString dircmd = "cd "; dircmd += KProcess::quote( dir ); dircmd += " && "; int prio = DomUtil::readIntEntry( dom, "/kdevcustomproject/" + buildtool + "/prio" ); - QString nice; + TQString nice; if ( prio != 0 ) { - nice = QString( "nice -n%1 " ).arg( prio ); + nice = TQString( "nice -n%1 " ).arg( prio ); } cmdline.prepend( nice ); @@ -963,7 +963,7 @@ void CustomProjectPart::startMakeCommand( const QString &dir, const QString &tar void CustomProjectPart::slotBuild() { m_lastCompilationFailed = false; - QString buildtool = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/buildtool" ); + TQString buildtool = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/buildtool" ); startMakeCommand( buildDirectory(), DomUtil::readEntry( *projectDom(), "/kdevcustomproject/" + buildtool + "/defaulttarget" ) ); } @@ -971,7 +971,7 @@ void CustomProjectPart::slotBuild() void CustomProjectPart::slotBuildActiveDir() { m_lastCompilationFailed = false; - QString buildtool = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/buildtool" ); + TQString buildtool = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/buildtool" ); startMakeCommand( buildDirectory() + "/" + activeDirectory(), DomUtil::readEntry( *projectDom(), "/kdevcustomproject/" + buildtool + "/defaulttarget" ) ); } @@ -983,10 +983,10 @@ void CustomProjectPart::slotCompileFile() if ( !part || !part->url().isLocalFile() ) return; - QString fileName = part->url().path(); - QFileInfo fi( fileName ); - QString sourceDir = fi.dirPath(); - QString baseName = fi.baseName( true ); + TQString fileName = part->url().path(); + TQFileInfo fi( fileName ); + TQString sourceDir = fi.dirPath(); + TQString baseName = fi.baseName( true ); kdDebug( 9025 ) << "Compiling " << fileName << "in dir " << sourceDir << " with baseName " << baseName << endl; @@ -994,16 +994,16 @@ void CustomProjectPart::slotCompileFile() // What would be nice: In case of non-recursive build system, climb up from // the source dir until a Makefile is found - QString buildDir = sourceDir; - QString target = baseName + ".o"; + TQString buildDir = sourceDir; + TQString target = baseName + ".o"; - QString buildtool = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/buildtool" ); + TQString buildtool = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/buildtool" ); //if there is no Makefile in the directory of the source file //try to build it from the main build dir //this works e.g. for non-recursive cmake Makefiles, Alex - if ( buildtool == "make" && ( QFile::exists( sourceDir + "/Makefile" ) == false ) - && ( QFile::exists( sourceDir + "/makefile" ) == false ) ) + if ( buildtool == "make" && ( TQFile::exists( sourceDir + "/Makefile" ) == false ) + && ( TQFile::exists( sourceDir + "/makefile" ) == false ) ) { buildDir = buildDirectory(); } @@ -1013,12 +1013,12 @@ void CustomProjectPart::slotCompileFile() void CustomProjectPart::slotInstallActiveDir() { - startMakeCommand( buildDirectory() + "/" + activeDirectory(), QString::fromLatin1( "install" ) ); + startMakeCommand( buildDirectory() + "/" + activeDirectory(), TQString::fromLatin1( "install" ) ); } void CustomProjectPart::slotInstall() { - startMakeCommand( buildDirectory(), QString::fromLatin1( "install" ) ); + startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ) ); } @@ -1029,12 +1029,12 @@ void CustomProjectPart::slotInstallWithKdesu() slotBuild(); // After that issue "make install" with the root user - startMakeCommand( buildDirectory(), QString::fromLatin1( "install" ), true ); + startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ), true ); } void CustomProjectPart::slotClean() { - startMakeCommand( buildDirectory(), QString::fromLatin1( "clean" ) ); + startMakeCommand( buildDirectory(), TQString::fromLatin1( "clean" ) ); } @@ -1043,20 +1043,20 @@ void CustomProjectPart::slotExecute() partController()->saveAllFiles(); bool _auto = false; - if ( DomUtil::readBoolEntry( *projectDom(), "/kdevcustomproject/run/autocompile", true ) && ( isDirty() || !QFileInfo( mainProgram() ).exists() ) ) + if ( DomUtil::readBoolEntry( *projectDom(), "/kdevcustomproject/run/autocompile", true ) && ( isDirty() || !TQFileInfo( mainProgram() ).exists() ) ) { m_executeAfterBuild = true; slotBuild(); _auto = true; } - if ( DomUtil::readBoolEntry( *projectDom(), "/kdevcustomproject/run/autoinstall", false ) && ( isDirty() || !QFileInfo( mainProgram() ).exists() ) ) + if ( DomUtil::readBoolEntry( *projectDom(), "/kdevcustomproject/run/autoinstall", false ) && ( isDirty() || !TQFileInfo( mainProgram() ).exists() ) ) { m_executeAfterBuild = true; // Use kdesu?? if ( DomUtil::readBoolEntry( *projectDom(), "/kdevcustomproject/run/autokdesu", false ) ) //slotInstallWithKdesu assumes that it hasn't just been build... - _auto ? slotInstallWithKdesu() : startMakeCommand( buildDirectory(), QString::fromLatin1( "install" ), true ); + _auto ? slotInstallWithKdesu() : startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ), true ); else slotInstall(); _auto = true; @@ -1070,7 +1070,7 @@ void CustomProjectPart::slotExecute() // Note that we quote the variable value due to the possibility of // embedded spaces DomUtil::PairList envvars = runEnvironmentVars(); - QString environstr; + TQString environstr; DomUtil::PairList::ConstIterator it; for ( it = envvars.begin(); it != envvars.end(); ++it ) { @@ -1084,7 +1084,7 @@ void CustomProjectPart::slotExecute() // Do not execute non executable targets return; - QString program = environstr; + TQString program = environstr; program += mainProgram(); program += " " + runArguments(); @@ -1107,18 +1107,18 @@ void CustomProjectPart::updateTargetMenu() m_targetObjectFilesMenu->clear(); m_targetOtherFilesMenu->clear(); - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); bool ant = DomUtil::readEntry( dom, "/kdevcustomproject/build/buildtool" ) == "ant"; if ( ant ) { - QFile f( buildDirectory() + "/build.xml" ); + TQFile f( buildDirectory() + "/build.xml" ); if ( !f.open( IO_ReadOnly ) ) { kdDebug( 9025 ) << "No build file" << endl; return; } - QDomDocument dom; + TQDomDocument dom; if ( !dom.setContent( &f ) ) { kdDebug( 9025 ) << "Build script not valid xml" << endl; @@ -1127,7 +1127,7 @@ void CustomProjectPart::updateTargetMenu() } f.close(); - QDomNode node = dom.documentElement().firstChild(); + TQDomNode node = dom.documentElement().firstChild(); while ( !node.isNull() ) { if ( node.toElement().tagName() == "target" ) @@ -1162,7 +1162,7 @@ void CustomProjectPart::updateTargetMenu() m_targetMenu->insertItem( i18n( "Other Files" ), m_targetOtherFilesMenu ); int id = 0; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = m_targets.begin(); it != m_targets.end(); ++it ) m_targetMenu->insertItem( *it, id++ ); @@ -1184,31 +1184,31 @@ void CustomProjectPart::putEnvVarsInVarMap() m_makefileVars[( *it ).first] = ( *it ).second; //is qouting here required as in makeEnvironment() ?? } -void CustomProjectPart::parseMakefile( const QString& filename ) +void CustomProjectPart::parseMakefile( const TQString& filename ) { if ( m_parsedMakefiles.contains( filename ) ) return; m_parsedMakefiles.insert( filename, 1 ); - QString absFilename = filename; + TQString absFilename = filename; if ( !filename.startsWith( "/" ) ) absFilename = buildDirectory() + "/" + filename; - QFile f( absFilename ); + TQFile f( absFilename ); if ( !f.open( IO_ReadOnly ) ) { kdDebug( 9025 ) << "could not open " << absFilename << endl; return; } - QRegExp targetRe( "^ *([^\\t$.#]\\S+) *:.*$" ); + TQRegExp targetRe( "^ *([^\\t$.#]\\S+) *:.*$" ); targetRe.setMinimal( true ); - QRegExp variablesRe( "\\$\\(\\s*([^\\)\\s]+)\\s*\\)" ); - QRegExp assignmentRe( "^\\s*(\\S+)\\s*[:\\?]?=\\s*(\\S+)\\s*(#.*)?$" ); + TQRegExp variablesRe( "\\$\\(\\s*([^\\)\\s]+)\\s*\\)" ); + TQRegExp assignmentRe( "^\\s*(\\S+)\\s*[:\\?]?=\\s*(\\S+)\\s*(#.*)?$" ); - QRegExp includedMakefilesRe( "^include\\s+(\\S+)" ); - QString str = ""; + TQRegExp includedMakefilesRe( "^include\\s+(\\S+)" ); + TQString str = ""; while ( !f.atEnd() ) { f.readLine( str, 200 ); @@ -1217,7 +1217,7 @@ void CustomProjectPart::parseMakefile( const QString& filename ) int offset = -1; while (( offset = variablesRe.search( str, offset + 1 ) ) != -1 ) { - QString variableName = variablesRe.cap( 1 ).simplifyWhiteSpace(); + TQString variableName = variablesRe.cap( 1 ).simplifyWhiteSpace(); if ( m_makefileVars.contains( variableName ) ) { str.replace( variablesRe.cap( 0 ), m_makefileVars[variableName] ); @@ -1237,12 +1237,12 @@ void CustomProjectPart::parseMakefile( const QString& filename ) } else if ( includedMakefilesRe.search( str ) != -1 ) { - QString includedMakefile = includedMakefilesRe.cap( 1 ).simplifyWhiteSpace(); + TQString includedMakefile = includedMakefilesRe.cap( 1 ).simplifyWhiteSpace(); m_makefilesToParse.push( includedMakefile ); } else if ( targetRe.search( str ) != -1 ) { - QString tmpTarget = targetRe.cap( 1 ).simplifyWhiteSpace(); + TQString tmpTarget = targetRe.cap( 1 ).simplifyWhiteSpace(); if ( tmpTarget.endsWith( ".o" ) ) { if ( m_targetsObjectFiles.find( tmpTarget ) == m_targetsObjectFiles.end() ) @@ -1265,29 +1265,29 @@ void CustomProjectPart::parseMakefile( const QString& filename ) void CustomProjectPart::targetMenuActivated( int id ) { - QString target = m_targets[id]; + TQString target = m_targets[id]; startMakeCommand( buildDirectory(), target ); } void CustomProjectPart::targetObjectFilesMenuActivated( int id ) { - QString target = m_targetsObjectFiles[id]; + TQString target = m_targetsObjectFiles[id]; startMakeCommand( buildDirectory(), target ); } void CustomProjectPart::targetOtherFilesMenuActivated( int id ) { - QString target = m_targetsOtherFiles[id]; + TQString target = m_targetsOtherFiles[id]; startMakeCommand( buildDirectory(), target ); } void CustomProjectPart::updateMakeEnvironmentsMenu() { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); bool makeUsed = ( DomUtil::readEntry( dom, "/kdevcustomproject/build/buildtool" ) == "make" ); if ( makeUsed ) { - QStringList l = allMakeEnvironments(); + TQStringList l = allMakeEnvironments(); m_makeEnvironmentsSelector->setItems( l ); m_makeEnvironmentsSelector->setCurrentItem( l.findIndex( currentMakeEnvironment() ) ); } @@ -1297,10 +1297,10 @@ void CustomProjectPart::updateMakeEnvironmentsMenu() } /* m_makeEnvironmentsMenu->clear(); - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); - QStringList environments = allMakeEnvironments(); - QStringList::ConstIterator it; + TQStringList environments = allMakeEnvironments(); + TQStringList::ConstIterator it; int id = 0; for (it = environments.begin(); it != environments.end(); ++it) m_makeEnvironmentsMenu->insertItem(*it, id++); @@ -1310,29 +1310,29 @@ void CustomProjectPart::updateMakeEnvironmentsMenu() void CustomProjectPart::makeEnvironmentsMenuActivated( int id ) { - QDomDocument &dom = *projectDom(); - QString environment = allMakeEnvironments()[id]; + TQDomDocument &dom = *projectDom(); + TQString environment = allMakeEnvironments()[id]; DomUtil::writeEntry( dom, "/kdevcustomproject/make/selectedenvironment", environment ); } -void CustomProjectPart::slotCommandFinished( const QString& command ) +void CustomProjectPart::slotCommandFinished( const TQString& command ) { kdDebug( 9025 ) << "CustomProjectPart::slotProcessFinished()" << endl; if ( m_buildCommand != command ) return; - m_buildCommand = QString::null; + m_buildCommand = TQString::null; m_timestamp.clear(); - QStringList fileList = allFiles(); - QStringList::Iterator it = fileList.begin(); + TQStringList fileList = allFiles(); + TQStringList::Iterator it = fileList.begin(); while ( it != fileList.end() ) { - QString fileName = *it; + TQString fileName = *it; ++it; - m_timestamp[ fileName ] = QFileInfo( projectDirectory(), fileName ).lastModified(); + m_timestamp[ fileName ] = TQFileInfo( projectDirectory(), fileName ).lastModified(); } emit projectCompiled(); @@ -1344,7 +1344,7 @@ void CustomProjectPart::slotCommandFinished( const QString& command ) } } -void CustomProjectPart::slotCommandFailed( const QString& /*command*/ ) +void CustomProjectPart::slotCommandFailed( const TQString& /*command*/ ) { m_lastCompilationFailed = true; m_executeAfterBuild = false; @@ -1354,15 +1354,15 @@ bool CustomProjectPart::isDirty() { if ( m_lastCompilationFailed ) return true; - QStringList fileList = allFiles(); - QStringList::Iterator it = fileList.begin(); + TQStringList fileList = allFiles(); + TQStringList::Iterator it = fileList.begin(); while ( it != fileList.end() ) { - QString fileName = *it; + TQString fileName = *it; ++it; - QMap<QString, QDateTime>::Iterator it = m_timestamp.find( fileName ); - QDateTime t = QFileInfo( projectDirectory(), fileName ).lastModified(); + TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( fileName ); + TQDateTime t = TQFileInfo( projectDirectory(), fileName ).lastModified(); if ( it == m_timestamp.end() || *it != t ) { return true; @@ -1373,19 +1373,19 @@ bool CustomProjectPart::isDirty() } -QStringList CustomProjectPart::allMakeEnvironments() const +TQStringList CustomProjectPart::allMakeEnvironments() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); - QStringList allConfigs; + TQStringList allConfigs; - QDomNode node = + TQDomNode node = DomUtil::elementByPath( dom , "/kdevcustomproject/make/environments" ); // extract the names of the different make environments - QDomElement childEl = node.firstChild().toElement(); + TQDomElement childEl = node.firstChild().toElement(); while ( !childEl.isNull() ) { - QString config = childEl.tagName(); + TQString config = childEl.tagName(); allConfigs.append( config ); childEl = childEl.nextSibling().toElement(); } @@ -1396,11 +1396,11 @@ QStringList CustomProjectPart::allMakeEnvironments() const } -QString CustomProjectPart::currentMakeEnvironment() const +TQString CustomProjectPart::currentMakeEnvironment() const { - QStringList allEnvs = allMakeEnvironments(); - QDomDocument &dom = *projectDom(); - QString environment = DomUtil::readEntry( dom, "/kdevcustomproject/make/selectedenvironment" ); + TQStringList allEnvs = allMakeEnvironments(); + TQDomDocument &dom = *projectDom(); + TQString environment = DomUtil::readEntry( dom, "/kdevcustomproject/make/selectedenvironment" ); if ( environment.isEmpty() || !allEnvs.contains( environment ) ) environment = allEnvs[0]; return environment; @@ -1409,30 +1409,30 @@ QString CustomProjectPart::currentMakeEnvironment() const /*! \fn CustomProjectPart::distFiles() const */ -QStringList CustomProjectPart::distFiles() const +TQStringList CustomProjectPart::distFiles() const { - QStringList sourceList = allFiles(); + TQStringList sourceList = allFiles(); // Scan current source directory for any .pro files. - QString projectDir = projectDirectory(); - QDir dir( projectDir ); - QStringList files = dir.entryList( "*README*" ); + TQString projectDir = projectDirectory(); + TQDir dir( projectDir ); + TQStringList files = dir.entryList( "*README*" ); return sourceList + files; } -bool CustomProjectPart::containsNonProjectFiles( const QString& dir ) +bool CustomProjectPart::containsNonProjectFiles( const TQString& dir ) { if ( isInBlacklist( dir ) ) return false; - QStringList fileentries = QDir( dir ).entryList( filetypes().join( ";" ) ); - QStringList dirs = QDir( dir ).entryList( QDir::Dirs ); - QStringList subentries = fileentries + dirs; + TQStringList fileentries = TQDir( dir ).entryList( filetypes().join( ";" ) ); + TQStringList dirs = TQDir( dir ).entryList( TQDir::Dirs ); + TQStringList subentries = fileentries + dirs; subentries.remove( "." ); subentries.remove( ".." ); - for ( QStringList::const_iterator it = subentries.begin(); it != subentries.end(); ++it ) + for ( TQStringList::const_iterator it = subentries.begin(); it != subentries.end(); ++it ) { if ( isInBlacklist( *it ) ) continue; - if ( QFileInfo( dir + "/" + *it ).isDir() && !isInBlacklist( *it ) ) + if ( TQFileInfo( dir + "/" + *it ).isDir() && !isInBlacklist( *it ) ) { if ( containsNonProjectFiles( dir + "/" + *it ) ) { @@ -1448,22 +1448,22 @@ bool CustomProjectPart::containsNonProjectFiles( const QString& dir ) return false; } -bool CustomProjectPart::containsProjectFiles( const QString& dir ) +bool CustomProjectPart::containsProjectFiles( const TQString& dir ) { if ( isInBlacklist( dir ) ) return false; - QStringList fileentries = QDir( dir ).entryList( filetypes().join( ";" ) ); - QStringList dirs = QDir( dir ).entryList( QDir::Dirs ); - QStringList subentries = fileentries + dirs; + TQStringList fileentries = TQDir( dir ).entryList( filetypes().join( ";" ) ); + TQStringList dirs = TQDir( dir ).entryList( TQDir::Dirs ); + TQStringList subentries = fileentries + dirs; subentries.remove( "." ); subentries.remove( ".." ); - for ( QStringList::const_iterator it = subentries.begin(); it != subentries.end(); ++it ) + for ( TQStringList::const_iterator it = subentries.begin(); it != subentries.end(); ++it ) { if ( isInBlacklist( *it ) ) continue; - if ( QFileInfo( dir + "/" + *it ).isDir() && !isInBlacklist( *it ) ) + if ( TQFileInfo( dir + "/" + *it ).isDir() && !isInBlacklist( *it ) ) { if ( containsProjectFiles( dir + "/" + *it ) ) { @@ -1478,15 +1478,15 @@ bool CustomProjectPart::containsProjectFiles( const QString& dir ) return false; } -QStringList CustomProjectPart::projectFilesInDir( const QString& dir ) +TQStringList CustomProjectPart::projectFilesInDir( const TQString& dir ) { - QStringList result; - QStringList fileentries = QDir( projectDirectory() + "/" + dir ).entryList( filetypes().join( ";" ) ); - QStringList dirs = QDir( projectDirectory() + "/" + dir ).entryList( QDir::Dirs ); - QStringList subentries = fileentries + dirs; + TQStringList result; + TQStringList fileentries = TQDir( projectDirectory() + "/" + dir ).entryList( filetypes().join( ";" ) ); + TQStringList dirs = TQDir( projectDirectory() + "/" + dir ).entryList( TQDir::Dirs ); + TQStringList subentries = fileentries + dirs; subentries.remove( "." ); subentries.remove( ".." ); - for ( QStringList::const_iterator it = subentries.begin(); it != subentries.end(); ++it ) + for ( TQStringList::const_iterator it = subentries.begin(); it != subentries.end(); ++it ) { if ( isInProject( dir + "/" + *it ) ) { @@ -1496,16 +1496,16 @@ QStringList CustomProjectPart::projectFilesInDir( const QString& dir ) return result; } -QStringList CustomProjectPart::filetypes( ) const +TQStringList CustomProjectPart::filetypes( ) const { return DomUtil::readListEntry( *projectDom(), "/kdevcustomproject/filetypes", "filetype" ); } -bool CustomProjectPart::isProjectFileType( const QString& filename ) const +bool CustomProjectPart::isProjectFileType( const TQString& filename ) const { - QStringList types = filetypes(); - QRegExp re( "", true, true ); - for ( QStringList::const_iterator it = types.begin(); it != types.end(); ++it ) + TQStringList types = filetypes(); + TQRegExp re( "", true, true ); + for ( TQStringList::const_iterator it = types.begin(); it != types.end(); ++it ) { re.setPattern( *it ); int pos = re.search( filename ); @@ -1520,9 +1520,9 @@ bool CustomProjectPart::isProjectFileType( const QString& filename ) const return false; } -void CustomProjectPart::switchBlacklistEntry( const QString& path ) +void CustomProjectPart::switchBlacklistEntry( const TQString& path ) { - QStringList blacklist = this->blacklist(); + TQStringList blacklist = this->blacklist(); kdDebug( 9025 ) << "Switching path " << path << endl; if ( !isInBlacklist( path ) ) { @@ -1538,9 +1538,9 @@ void CustomProjectPart::switchBlacklistEntry( const QString& path ) updateBlacklist( blacklist ); } -QString CustomProjectPart::relativeToProject( const QString& abspath ) const +TQString CustomProjectPart::relativeToProject( const TQString& abspath ) const { - QString path = abspath.mid( projectDirectory().length() + 1 ); + TQString path = abspath.mid( projectDirectory().length() + 1 ); kdDebug( 9025 ) << "abspath: " << "|project dir: " << projectDirectory() << "|path: " << path << endl; if ( path.endsWith( "/" ) ) path = path.mid( 0, path.length() - 1 ); @@ -1549,17 +1549,17 @@ QString CustomProjectPart::relativeToProject( const QString& abspath ) const return path; } -bool CustomProjectPart::isInBlacklist( const QString& path ) const +bool CustomProjectPart::isInBlacklist( const TQString& path ) const { - QString relpath = path; - QStringList blacklist = this->blacklist(); - if ( !QFileInfo( relpath ).isRelative() ) + TQString relpath = path; + TQStringList blacklist = this->blacklist(); + if ( !TQFileInfo( relpath ).isRelative() ) relpath = relativeToProject( path ); if ( blacklist.find( relpath ) != blacklist.end() ) return true; - QStringList paths = QStringList::split( "/", relpath ); - QString parentpath; - for ( QStringList::const_iterator it = paths.begin(); it != paths.end(); ++it ) + TQStringList paths = TQStringList::split( "/", relpath ); + TQString parentpath; + for ( TQStringList::const_iterator it = paths.begin(); it != paths.end(); ++it ) { parentpath += *it; if ( blacklist.find( parentpath ) != blacklist.end() ) @@ -1569,22 +1569,22 @@ bool CustomProjectPart::isInBlacklist( const QString& path ) const return false; } -void CustomProjectPart::updateBlacklist( const QStringList& l ) +void CustomProjectPart::updateBlacklist( const TQStringList& l ) { DomUtil::writeListEntry( *projectDom(), "kdevcustomproject/blacklist", "path", l ); } -QStringList CustomProjectPart::blacklist() const +TQStringList CustomProjectPart::blacklist() const { return DomUtil::readListEntry( *projectDom(), "kdevcustomproject/blacklist", "path" ); } -void CustomProjectPart::addNewFilesToProject( const QStringList& filelist ) +void CustomProjectPart::addNewFilesToProject( const TQStringList& filelist ) { - QStringList addfiles; - for ( QStringList::const_iterator it = filelist.begin(); it != filelist.end(); ++it ) + TQStringList addfiles; + for ( TQStringList::const_iterator it = filelist.begin(); it != filelist.end(); ++it ) { - if (( ! isInProject( *it ) ) && ( isProjectFileType( *it ) || QFileInfo( projectDirectory() + "/" + *it ).isDir() ) && !isInBlacklist( *it ) ) + if (( ! isInProject( *it ) ) && ( isProjectFileType( *it ) || TQFileInfo( projectDirectory() + "/" + *it ).isDir() ) && !isInBlacklist( *it ) ) { addfiles << *it; } @@ -1598,12 +1598,12 @@ void CustomProjectPart::addNewFilesToProject( const QStringList& filelist ) { m_first_recursive = false; m_recursive = false; - QStringList blacklist = this->blacklist(); - QStringList excludelist = dlg->excludedPaths(); - QStringList removeFromExcludes; - for ( QStringList::const_iterator it = excludelist.begin(); it != excludelist.end(); ++it ) + TQStringList blacklist = this->blacklist(); + TQStringList excludelist = dlg->excludedPaths(); + TQStringList removeFromExcludes; + for ( TQStringList::const_iterator it = excludelist.begin(); it != excludelist.end(); ++it ) { - if ( QFileInfo( projectDirectory() + "/" + *it ).isDir() ) + if ( TQFileInfo( projectDirectory() + "/" + *it ).isDir() ) { for ( ProjectFilesSet::ConstIterator it2 = m_sourceFilesSet.constBegin(); it2 != m_sourceFilesSet.constEnd(); ++it2 ) { @@ -1614,7 +1614,7 @@ void CustomProjectPart::addNewFilesToProject( const QStringList& filelist ) } } } - for ( QStringList::const_iterator it = removeFromExcludes.begin(); it != removeFromExcludes.end(); ++it ) + for ( TQStringList::const_iterator it = removeFromExcludes.begin(); it != removeFromExcludes.end(); ++it ) { excludelist.remove( *it ); } @@ -1624,7 +1624,7 @@ void CustomProjectPart::addNewFilesToProject( const QStringList& filelist ) } } -void CustomProjectPart::setFiletypes( const QStringList& l ) +void CustomProjectPart::setFiletypes( const TQStringList& l ) { DomUtil::writeListEntry( *projectDom(), "kdevcustomproject/filetypes", "filetype", l ); } @@ -1635,7 +1635,7 @@ void CustomProjectPart::setFiletypes( const QStringList& l ) * * @param fileName */ -bool CustomProjectPart::isInProject( const QString& fileName ) const +bool CustomProjectPart::isInProject( const TQString& fileName ) const { return m_sourceFilesSet.contains( fileName ); } @@ -1648,7 +1648,7 @@ bool CustomProjectPart::isInProject( const QString& fileName ) const * * @see removeFromProject() */ -void CustomProjectPart::addToProject( const QString& fileName ) +void CustomProjectPart::addToProject( const TQString& fileName ) { m_sourceFilesSet.insert( fileName, false ); } @@ -1659,7 +1659,7 @@ void CustomProjectPart::addToProject( const QString& fileName ) * * @param fileName */ -void CustomProjectPart::removeFromProject( const QString& fileName ) +void CustomProjectPart::removeFromProject( const TQString& fileName ) { m_sourceFilesSet.remove( fileName ); } diff --git a/buildtools/custommakefiles/customprojectpart.h b/buildtools/custommakefiles/customprojectpart.h index f3fb9ec4..67b5088b 100644 --- a/buildtools/custommakefiles/customprojectpart.h +++ b/buildtools/custommakefiles/customprojectpart.h @@ -14,11 +14,11 @@ #ifndef _CUSTOMPROJECTPART_H_ #define _CUSTOMPROJECTPART_H_ -#include <qdict.h> -#include <qguardedptr.h> -#include <qmap.h> -#include <qdatetime.h> -#include <qvaluestack.h> +#include <tqdict.h> +#include <tqguardedptr.h> +#include <tqmap.h> +#include <tqdatetime.h> +#include <tqvaluestack.h> #include <kdevbuildtool.h> @@ -35,44 +35,44 @@ class CustomProjectPart : public KDevBuildTool Q_OBJECT public: - CustomProjectPart( QObject *parent, const char *name, const QStringList & ); + CustomProjectPart( TQObject *parent, const char *name, const TQStringList & ); ~CustomProjectPart(); - QStringList allMakeEnvironments() const; - QString currentMakeEnvironment() const; + TQStringList allMakeEnvironments() const; + TQString currentMakeEnvironment() const; bool isDirty(); - QStringList distFiles() const; + TQStringList distFiles() const; - virtual void openProject( const QString &dirName, const QString &projectName ); + virtual void openProject( const TQString &dirName, const TQString &projectName ); virtual void closeProject(); - virtual QString projectDirectory() const; - virtual QString projectName() const; - virtual QString mainProgram() const; - virtual QString activeDirectory() const; - virtual QStringList allFiles() const; - virtual void addFile( const QString &fileName ); - virtual void addFiles( const QStringList& fileList ); - virtual void removeFile( const QString &fileName ); - virtual void removeFiles( const QStringList &fileList ); - virtual QString buildDirectory() const; - virtual QString runDirectory() const; - virtual QString debugArguments() const; - virtual QString runArguments() const; + virtual TQString projectDirectory() const; + virtual TQString projectName() const; + virtual TQString mainProgram() const; + virtual TQString activeDirectory() const; + virtual TQStringList allFiles() const; + virtual void addFile( const TQString &fileName ); + virtual void addFiles( const TQStringList& fileList ); + virtual void removeFile( const TQString &fileName ); + virtual void removeFiles( const TQStringList &fileList ); + virtual TQString buildDirectory() const; + virtual TQString runDirectory() const; + virtual TQString debugArguments() const; + virtual TQString runArguments() const; virtual DomUtil::PairList runEnvironmentVars() const; - QString relativeToProject( const QString& ) const; + TQString relativeToProject( const TQString& ) const; private slots: void populateProject(); void projectConfigWidget( KDialogBase *dlg ); - void contextMenu( QPopupMenu *popup, const Context *context ); + void contextMenu( TQPopupMenu *popup, const Context *context ); void slotAddToProject(); void slotRemoveFromProject(); void slotAddToProjectRecursive(); void slotRemoveFromProjectRecursive(); - void addNewFilesToProject( const QStringList& ); + void addNewFilesToProject( const TQStringList& ); void slotChangeBlacklist(); void slotChooseActiveDirectory(); void slotBuild(); @@ -89,32 +89,32 @@ private slots: void targetOtherFilesMenuActivated( int id ); void updateMakeEnvironmentsMenu(); void makeEnvironmentsMenuActivated( int id ); - void slotCommandFinished( const QString& command ); - void slotCommandFailed( const QString& command ); + void slotCommandFinished( const TQString& command ); + void slotCommandFailed( const TQString& command ); private: - bool containsNonProjectFiles( const QString& url ); - QStringList projectFilesInDir( const QString& dir ); - bool containsProjectFiles( const QString& url ); - bool isProjectFileType( const QString& absFile ) const; - bool isInBlacklist( const QString& ) const; + bool containsNonProjectFiles( const TQString& url ); + TQStringList projectFilesInDir( const TQString& dir ); + bool containsProjectFiles( const TQString& url ); + bool isProjectFileType( const TQString& absFile ) const; + bool isInBlacklist( const TQString& ) const; void cleanFileList(); - void setFiletypes( const QStringList& ); - void findNewFiles( const QString& dir, QStringList& list) const; + void setFiletypes( const TQStringList& ); + void findNewFiles( const TQString& dir, TQStringList& list) const; - QStringList filetypes() const; - QStringList blacklist() const; - void updateBlacklist( const QStringList& ); + TQStringList filetypes() const; + TQStringList blacklist() const; + void updateBlacklist( const TQStringList& ); void saveProject(); - void startMakeCommand( const QString &dir, const QString &target, bool withKdesu = false ); - void parseMakefile( const QString& file ); - QString makeEnvironment() const; + void startMakeCommand( const TQString &dir, const TQString &target, bool withKdesu = false ); + void parseMakefile( const TQString& file ); + TQString makeEnvironment() const; void putEnvVarsInVarMap(); - void switchBlacklistEntry(const QString& ); + void switchBlacklistEntry(const TQString& ); - bool isInProject( const QString& fileName ) const; - void addToProject( const QString& fileName ); - void removeFromProject( const QString& fileName ); + bool isInProject( const TQString& fileName ) const; + void addToProject( const TQString& fileName ); + void removeFromProject( const TQString& fileName ); /** * @brief Set of all the project's files. @@ -125,31 +125,31 @@ private: * keyed by the file name, * as a set-container replacement. */ - typedef QMap<QString, bool> ProjectFilesSet; + typedef TQMap<TQString, bool> ProjectFilesSet; - QString m_projectDirectory; - QString m_projectName; - QString m_filelistDir; + TQString m_projectDirectory; + TQString m_projectName; + TQString m_filelistDir; /** All the sources (files and directories) of this project. */ ProjectFilesSet m_sourceFilesSet; - QPopupMenu *m_targetMenu; - QPopupMenu *m_targetObjectFilesMenu; - QPopupMenu *m_targetOtherFilesMenu; + TQPopupMenu *m_targetMenu; + TQPopupMenu *m_targetObjectFilesMenu; + TQPopupMenu *m_targetOtherFilesMenu; KSelectAction *m_makeEnvironmentsSelector; - QStringList m_targets; - QStringList m_targetsObjectFiles; - QStringList m_targetsOtherFiles; - QStringList m_contextAddFiles; - QStringList m_contextRemoveFiles; - QString m_contextDirName; - - QMap<QString, QDateTime> m_timestamp; + TQStringList m_targets; + TQStringList m_targetsObjectFiles; + TQStringList m_targetsOtherFiles; + TQStringList m_contextAddFiles; + TQStringList m_contextRemoveFiles; + TQString m_contextDirName; + + TQMap<TQString, TQDateTime> m_timestamp; bool m_executeAfterBuild; - QString m_buildCommand; + TQString m_buildCommand; bool m_lastCompilationFailed; - QMap<QString, int> m_parsedMakefiles; - QValueStack<QString> m_makefilesToParse; - QMap<QString, QString> m_makefileVars; + TQMap<TQString, int> m_parsedMakefiles; + TQValueStack<TQString> m_makefilesToParse; + TQMap<TQString, TQString> m_makefileVars; bool m_recursive; bool m_first_recursive; }; diff --git a/buildtools/custommakefiles/selectnewfilesdialog.cpp b/buildtools/custommakefiles/selectnewfilesdialog.cpp index cfcb84e6..a4c0db99 100644 --- a/buildtools/custommakefiles/selectnewfilesdialog.cpp +++ b/buildtools/custommakefiles/selectnewfilesdialog.cpp @@ -12,21 +12,21 @@ #include "selectnewfilesdialog.h" -#include <qlistview.h> +#include <tqlistview.h> #include <klistview.h> -#include <qheader.h> -#include <qstringlist.h> +#include <tqheader.h> +#include <tqstringlist.h> #include <klocale.h> #include <kdebug.h> #include "selectnewfilesdialogbase.h" -SelectNewFilesDialog::SelectNewFilesDialog( QStringList paths, QWidget* parent, const char* name ) +SelectNewFilesDialog::SelectNewFilesDialog( TQStringList paths, TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n("Add newly created files to project"), KDialogBase::Ok|KDialogBase::Cancel ) { m_widget = new SelectNewFilesDialogBase(this); m_widget->fileView->header()->hide(); m_widget->fileView->addColumn(i18n("Path") ); - for( QStringList::const_iterator it = paths.begin(); it != paths.end(); ++it) + for( TQStringList::const_iterator it = paths.begin(); it != paths.end(); ++it) { addPath(0, *it); } @@ -44,84 +44,84 @@ void SelectNewFilesDialog::slotCancel() KDialogBase::slotCancel(); } -void SelectNewFilesDialog::checkItem( QCheckListItem* item, const QString& curpath ) +void SelectNewFilesDialog::checkItem( TQCheckListItem* item, const TQString& curpath ) { if( !item ) return; - QString path = curpath + item->text(); - if( item->state() != QCheckListItem::Off ) + TQString path = curpath + item->text(); + if( item->state() != TQCheckListItem::Off ) includePaths << path; else excludePaths << path; if( item->firstChild() ) { - checkItem( static_cast<QCheckListItem*>(item->firstChild()), path+"/" ); + checkItem( static_cast<TQCheckListItem*>(item->firstChild()), path+"/" ); } if( item->nextSibling() ) { - checkItem( static_cast<QCheckListItem*>(item->nextSibling()), curpath ); + checkItem( static_cast<TQCheckListItem*>(item->nextSibling()), curpath ); } } void SelectNewFilesDialog::slotOk() { - QCheckListItem* item = static_cast<QCheckListItem*> (m_widget->fileView->firstChild()); + TQCheckListItem* item = static_cast<TQCheckListItem*> (m_widget->fileView->firstChild()); checkItem( item, "" ); kdDebug(9025) << "Inc List:" << includePaths << endl; kdDebug(9025) << "Exc List:" << excludePaths << endl; KDialogBase::slotOk(); } -void SelectNewFilesDialog::addPath( QCheckListItem* item, const QString& path ) +void SelectNewFilesDialog::addPath( TQCheckListItem* item, const TQString& path ) { if( path.isEmpty() ) return; - QStringList parts = QStringList::split("/", path ); - QString name = parts.first(); + TQStringList parts = TQStringList::split("/", path ); + TQString name = parts.first(); parts.pop_front(); - QCheckListItem* i = createItem( item, name, parts.size() ); - i->setState( QCheckListItem::On ); + TQCheckListItem* i = createItem( item, name, parts.size() ); + i->setState( TQCheckListItem::On ); i->setTristate( true ); addPath(i, parts.join("/") ); } -QCheckListItem* SelectNewFilesDialog::createItem( QCheckListItem* parent, const QString& name, int count ) +TQCheckListItem* SelectNewFilesDialog::createItem( TQCheckListItem* parent, const TQString& name, int count ) { - QCheckListItem::Type t = QCheckListItem::CheckBox; + TQCheckListItem::Type t = TQCheckListItem::CheckBox; if( count > 0 ) - t = QCheckListItem::CheckBoxController; + t = TQCheckListItem::CheckBoxController; if( parent == 0 ) { - QListViewItem* item = m_widget->fileView->firstChild(); + TQListViewItem* item = m_widget->fileView->firstChild(); while( item ) { if( item->text( 0 ) == name ) - return static_cast<QCheckListItem*>(item); + return static_cast<TQCheckListItem*>(item); item = item->nextSibling(); } - return new QCheckListItem( m_widget->fileView, name, t ); + return new TQCheckListItem( m_widget->fileView, name, t ); }else { - QListViewItem* item = parent->firstChild(); + TQListViewItem* item = parent->firstChild(); while( item ) { if( item->text( 0 ) == name ) - return static_cast<QCheckListItem*>(item); + return static_cast<TQCheckListItem*>(item); item = item->nextSibling(); } - return new QCheckListItem( parent, name, t ); + return new TQCheckListItem( parent, name, t ); } } -QStringList SelectNewFilesDialog::excludedPaths() const +TQStringList SelectNewFilesDialog::excludedPaths() const { return excludePaths; } -QStringList SelectNewFilesDialog::includedPaths() const +TQStringList SelectNewFilesDialog::includedPaths() const { return includePaths; } diff --git a/buildtools/custommakefiles/selectnewfilesdialog.h b/buildtools/custommakefiles/selectnewfilesdialog.h index b970dc7d..966cfaa4 100644 --- a/buildtools/custommakefiles/selectnewfilesdialog.h +++ b/buildtools/custommakefiles/selectnewfilesdialog.h @@ -23,11 +23,11 @@ class SelectNewFilesDialog : public KDialogBase Q_OBJECT public: - SelectNewFilesDialog( QStringList paths, QWidget* parent = 0, const char* name = 0 ); + SelectNewFilesDialog( TQStringList paths, TQWidget* parent = 0, const char* name = 0 ); ~SelectNewFilesDialog(); - QStringList excludedPaths() const; - QStringList includedPaths() const; + TQStringList excludedPaths() const; + TQStringList includedPaths() const; public slots: /*$PUBLIC_SLOTS$*/ @@ -40,12 +40,12 @@ protected slots: virtual void slotCancel(); virtual void slotOk(); private: - void addPath( QCheckListItem* , const QString& ); - void checkItem( QCheckListItem* item, const QString& curpath ); - QCheckListItem* createItem( QCheckListItem*, const QString&, int ); + void addPath( TQCheckListItem* , const TQString& ); + void checkItem( TQCheckListItem* item, const TQString& curpath ); + TQCheckListItem* createItem( TQCheckListItem*, const TQString&, int ); SelectNewFilesDialogBase* m_widget; - QStringList excludePaths; - QStringList includePaths; + TQStringList excludePaths; + TQStringList includePaths; }; #endif diff --git a/buildtools/lib/base/kdevbuildtool.cpp b/buildtools/lib/base/kdevbuildtool.cpp index 27ddf692..2dfc3d84 100644 --- a/buildtools/lib/base/kdevbuildtool.cpp +++ b/buildtools/lib/base/kdevbuildtool.cpp @@ -21,7 +21,7 @@ #include <kdevmakefrontend.h> #include <kdevappfrontend.h> -KDevBuildTool::KDevBuildTool(const KDevPluginInfo* info, QObject* parent, const char* name) +KDevBuildTool::KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name) :KDevProject(info, parent, name) { } diff --git a/buildtools/lib/base/kdevbuildtool.h b/buildtools/lib/base/kdevbuildtool.h index 79db5f6e..ff1abcc0 100644 --- a/buildtools/lib/base/kdevbuildtool.h +++ b/buildtools/lib/base/kdevbuildtool.h @@ -29,7 +29,7 @@ class KDevAppFrontend; class KDevBuildTool: public KDevProject { public: - KDevBuildTool(const KDevPluginInfo* info, QObject* parent, const char* name); + KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name); /**@return The make frontend.*/ KDevMakeFrontend *makeFrontend(); diff --git a/buildtools/lib/parsers/autotools/autotools_yacc.cpp b/buildtools/lib/parsers/autotools/autotools_yacc.cpp index 827cf4bc..93cdb733 100644 --- a/buildtools/lib/parsers/autotools/autotools_yacc.cpp +++ b/buildtools/lib/parsers/autotools/autotools_yacc.cpp @@ -150,7 +150,7 @@ noinst_HEADERS = foo.h #regognize me @fixme 1 shift/reduce conflict in "line_body" rule */ -#include <qvaluestack.h> +#include <tqvaluestack.h> #include "autotoolsast.h" #define YYSTYPE_IS_DECLARED @@ -164,7 +164,7 @@ struct Result { Result(): node(0) {} /**Type of semantic value for simple grammar rules.*/ - QString value; + TQString value; /**Type of semantic value for grammar rules which are parts of AST.*/ AST *node; /**Type of semantic value for "multiline_values" grammar rule. @@ -183,7 +183,7 @@ struct Result { foo3.cpp foo4.cpp </pre> */ - QStringList values; + TQStringList values; }; typedef Result YYSTYPE; @@ -206,7 +206,7 @@ When a scope or function scope statement is parsed, the child ProjectAST is crea and pushed onto the stack. Therefore all statements which belong to the scope or function scope are added as childs to their direct parent (scope or function scope). */ -QValueStack<ProjectAST*> projects; +TQValueStack<ProjectAST*> projects; /** The current depth of AST node is stored here. @@ -1381,7 +1381,7 @@ yyreduce: { AssignmentAST *node = new AssignmentAST(); node->scopedID = yyvsp[-1].value; - node->values = QStringList(yyvsp[0].value); + node->values = TQStringList(yyvsp[0].value); yyval.node = node; ;} break; diff --git a/buildtools/lib/parsers/autotools/autotoolsast.cpp b/buildtools/lib/parsers/autotools/autotoolsast.cpp index 757f4699..ddcbddc3 100644 --- a/buildtools/lib/parsers/autotools/autotoolsast.cpp +++ b/buildtools/lib/parsers/autotools/autotoolsast.cpp @@ -28,7 +28,7 @@ namespace AutoTools { AST::~AST() { - for (QValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it) { AST *node = *it; delete node; @@ -40,9 +40,9 @@ void AST::addChildAST(AST *node) m_children.append(node); } -void AST::writeBack(QString &buffer) +void AST::writeBack(TQString &buffer) { - for (QValueList<AST*>::const_iterator it = m_children.constBegin(); + for (TQValueList<AST*>::const_iterator it = m_children.constBegin(); it != m_children.constEnd(); ++it) { if (*it) @@ -50,9 +50,9 @@ void AST::writeBack(QString &buffer) } } -QString AST::indentation() +TQString AST::indentation() { - QString result; + TQString result; for (int i = 0; i < depth(); i++) result += '\t'; return result; @@ -63,14 +63,14 @@ bool AST::hasChildren() const return !m_children.isEmpty(); } -QValueList<AST*> AST::children() const +TQValueList<AST*> AST::children() const { return m_children; } //ProjectAST -void ProjectAST::writeBack(QString &buffer) +void ProjectAST::writeBack(TQString &buffer) { if ( isRule() ) buffer += scopedID; @@ -87,27 +87,27 @@ void ProjectAST::addChildAST(AST *node) AST::addChildAST(node); } -void AssignmentAST::writeBack(QString &buffer) +void AssignmentAST::writeBack(TQString &buffer) { buffer += indentation() + scopedID + " " + op + values.join(""); } -void AutomakeTargetAST::writeBack( QString& buffer ) +void AutomakeTargetAST::writeBack( TQString& buffer ) { buffer += target + ":" + deps.join(""); } -void ConditionAST::writeBack( QString& buffer ) +void ConditionAST::writeBack( TQString& buffer ) { buffer += indentation() + type + " " + conditionName; } -void NewLineAST::writeBack(QString &buffer) +void NewLineAST::writeBack(TQString &buffer) { buffer += "\n"; } -void CommentAST::writeBack(QString &buffer) +void CommentAST::writeBack(TQString &buffer) { buffer += indentation() + comment; } diff --git a/buildtools/lib/parsers/autotools/autotoolsast.h b/buildtools/lib/parsers/autotools/autotoolsast.h index 9c7ae66a..768e3e07 100644 --- a/buildtools/lib/parsers/autotools/autotoolsast.h +++ b/buildtools/lib/parsers/autotools/autotoolsast.h @@ -23,7 +23,7 @@ #ifndef AUTOTOOLSAST_H #define AUTOTOOLSAST_H -#include <qstringlist.h> +#include <tqstringlist.h> /** @file autotools.h @@ -71,7 +71,7 @@ public: * This is a default implementation which iterates over child nodes * and calls writeBack for each child node. */ - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /** @return The type of the node.*/ virtual NodeType nodeType() const { return m_nodeType; } @@ -83,7 +83,7 @@ public: int depth() const { return m_depth; } /** @return The indentation string based on node depth.*/ - virtual QString indentation(); + virtual TQString indentation(); //! \return true if this AST has children bool hasChildren() const; @@ -92,13 +92,13 @@ public: * Get the children of this ast * \return the list of this ast's childre */ - QValueList<AST*> children() const; + TQValueList<AST*> children() const; protected: NodeType m_nodeType; - QValueList<AST*> m_children; + TQValueList<AST*> m_children; private: int m_depth; @@ -135,7 +135,7 @@ public: /** Constructs a project node of given @p kind. */ ProjectAST(Kind kind = Project): AST(AST::ProjectAST), m_kind(kind) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); virtual void addChildAST(AST *node); /** @return true if this node is a project.*/ @@ -150,16 +150,16 @@ public: bool isEmpty() const { return m_kind == Empty; } /**Scoped identifier (scope name or rule).*/ - QString scopedID; + TQString scopedID; /**Function arguments. Empty for other kinds of projects.*/ - QString args; + TQString args; /** The automake conditional has an else attached */ bool hasElse; /**List of statements.*/ - QValueList<AutoTools::AST*> statements; + TQValueList<AutoTools::AST*> statements; private: Kind m_kind; @@ -192,16 +192,16 @@ class AssignmentAST: public AST public: AssignmentAST(): AST(AST::AssignmentAST) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /**Scoped name of the variable.*/ - QString scopedID; + TQString scopedID; /**Operator.*/ - QString op; + TQString op; /**List of values.*/ - QStringList values; + TQStringList values; }; class AutomakeTargetAST : public AST @@ -209,13 +209,13 @@ class AutomakeTargetAST : public AST public: AutomakeTargetAST() : AST(AST::TargetAST) {} - virtual void writeBack( QString& buffer ); + virtual void writeBack( TQString& buffer ); /// The name of the target - QString target; + TQString target; /// The dependencies for the target, if any - QStringList deps; + TQStringList deps; }; class ConditionAST : public AST @@ -223,13 +223,13 @@ class ConditionAST : public AST public: ConditionAST() : AST( AST::MakefileConditionalAST ) {} - virtual void writeBack( QString& buffer ); + virtual void writeBack( TQString& buffer ); /// The keyword for the condition (if, else, endif) - QString type; + TQString type; /// The name of the condition - QString conditionName; + TQString conditionName; }; /** @@ -241,7 +241,7 @@ class NewLineAST: public AST public: NewLineAST(): AST(AST::NewLineAST) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); }; @@ -255,10 +255,10 @@ class CommentAST: public AST public: CommentAST(): AST(AST::CommentAST) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /**Comment text.*/ - QString comment; + TQString comment; }; diff --git a/buildtools/lib/parsers/autotools/autotoolsdriver.cpp b/buildtools/lib/parsers/autotools/autotoolsdriver.cpp index a3d53151..05734c3f 100644 --- a/buildtools/lib/parsers/autotools/autotoolsdriver.cpp +++ b/buildtools/lib/parsers/autotools/autotoolsdriver.cpp @@ -24,13 +24,13 @@ #include "autotoolsast.h" #include <stdio.h> -#include <qvaluestack.h> +#include <tqvaluestack.h> #include <kio/netaccess.h> extern FILE *yyin, *yyout; extern int yyparse(); //extern int yydebug; -extern QValueStack<AutoTools::ProjectAST *> projects; +extern TQValueStack<AutoTools::ProjectAST *> projects; namespace AutoTools { @@ -49,14 +49,14 @@ int Driver::parseFile(const char *fileName, ProjectAST **ast) return ret; } -int Driver::parseFile(QString fileName, ProjectAST **ast) +int Driver::parseFile(TQString fileName, ProjectAST **ast) { return parseFile(fileName.ascii(), ast); } int Driver::parseFile(KURL fileName, ProjectAST **ast) { - QString tmpFile; + TQString tmpFile; int ret = 0; if (KIO::NetAccess::download(fileName, tmpFile, 0)) ret = parseFile(tmpFile, ast); diff --git a/buildtools/lib/parsers/autotools/autotoolsdriver.h b/buildtools/lib/parsers/autotools/autotoolsdriver.h index 4e52c6ec..5f6ac7e7 100644 --- a/buildtools/lib/parsers/autotools/autotoolsdriver.h +++ b/buildtools/lib/parsers/autotools/autotoolsdriver.h @@ -23,7 +23,7 @@ #ifndef QMAKEQMAKEDRIVER_H #define QMAKEQMAKEDRIVER_H -#include <qvaluelist.h> +#include <tqvaluelist.h> #include <kurl.h> namespace AutoTools { @@ -49,14 +49,14 @@ public: * @return The result of parsing. Result is 0 on success and <> 0 on failure. */ static int parseFile(const char *fileName, ProjectAST **ast); - static int parseFile(QString fileName, ProjectAST **ast); + static int parseFile(TQString fileName, ProjectAST **ast); static int parseFile(KURL fileName, ProjectAST **ast); /* template<class Op> static void walkAST(Op &op, const ProjectAST *ast) { // op(ast); - for (QValueList<QMake::AST*>::const_iterator it = ast->statements.constBegin(); + for (TQValueList<QMake::AST*>::const_iterator it = ast->statements.constBegin(); it != ast->statements.constEnd(); ++it) { const AST *child = *it; diff --git a/buildtools/lib/parsers/autotools/tests/viewer.cpp b/buildtools/lib/parsers/autotools/tests/viewer.cpp index 24d6aea4..0dc8e733 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer.cpp +++ b/buildtools/lib/parsers/autotools/tests/viewer.cpp @@ -19,61 +19,61 @@ ***************************************************************************/ #include "viewer.h" -#include <qdir.h> -#include <qlineedit.h> -#include <qlistbox.h> -#include <qfiledialog.h> -#include <qtextedit.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qlistview.h> -#include <qtabwidget.h> +#include <tqdir.h> +#include <tqlineedit.h> +#include <tqlistbox.h> +#include <tqfiledialog.h> +#include <tqtextedit.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqlistview.h> +#include <tqtabwidget.h> #include <autotoolsast.h> #include <autotoolsdriver.h> using namespace AutoTools; -Viewer::Viewer(QWidget *parent, const char *name) +Viewer::Viewer(TQWidget *parent, const char *name) :ViewerBase(parent, name) { - if (QFile::exists(QDir::currentDirPath() + "/" + "qtlist")) + if (TQFile::exists(TQDir::currentDirPath() + "/" + "qtlist")) { - QFile f(QDir::currentDirPath() + "/" + "qtlist"); + TQFile f(TQDir::currentDirPath() + "/" + "qtlist"); f.open(IO_ReadOnly); - QTextStream str(&f); + TQTextStream str(&f); while (!str.eof()) files->insertItem(str.readLine()); } ast->setSorting(-1); - parentProject.push((QListViewItem*)0); + parentProject.push((TQListViewItem*)0); } void Viewer::addAll_clicked() { if (allLocation->text().isEmpty()) return; - QDir d(allLocation->text()); - QStringList l = d.entryList("*.am"); - for (QStringList::iterator it = l.begin(); it != l.end(); ++it) - (*it) = QDir::cleanDirPath(allLocation->text() + "/" + (*it)); + TQDir d(allLocation->text()); + TQStringList l = d.entryList("*.am"); + for (TQStringList::iterator it = l.begin(); it != l.end(); ++it) + (*it) = TQDir::cleanDirPath(allLocation->text() + "/" + (*it)); files->insertStringList(l); } void Viewer::choose_clicked() { - QString fileName = QFileDialog::getOpenFileName(QDir::currentDirPath(), "*.am", this); + TQString fileName = TQFileDialog::getOpenFileName(TQDir::currentDirPath(), "*.am", this); if (!fileName.isEmpty()) files->insertItem(fileName); } -void Viewer::files_currentChanged(QListBoxItem* item) +void Viewer::files_currentChanged(TQListBoxItem* item) { ast->clear(); - QFile f(item->text()); + TQFile f(item->text()); f.open(IO_ReadOnly); - QTextStream str(&f); + TQTextStream str(&f); source->setText(str.read()); f.close(); @@ -86,30 +86,30 @@ void Viewer::files_currentChanged(QListBoxItem* item) tabWidget2_selected("Source to be written back"); } -void Viewer::tabWidget2_selected(const QString& text) +void Viewer::tabWidget2_selected(const TQString& text) { if ((text == "Source to be written back") && projectAST) { - QString buffer; + TQString buffer; projectAST->writeBack(buffer); writeBack->setText(buffer); } } -void Viewer::processAST(ProjectAST *projectAST, QListViewItem *globAfter) +void Viewer::processAST(ProjectAST *projectAST, TQListViewItem *globAfter) { - QListViewItem *projectIt; + TQListViewItem *projectIt; if (!parentProject.top()) - projectIt = new QListViewItem(ast, "Project"); + projectIt = new TQListViewItem(ast, "Project"); else { if ( projectAST->isConditionalScope() || projectAST->isRule() ) - projectIt = new QListViewItem(parentProject.top(), globAfter, projectAST->scopedID); + projectIt = new TQListViewItem(parentProject.top(), globAfter, projectAST->scopedID); } projectIt->setOpen(true); - QListViewItem *after = 0; - for (QValueList<AST*>::const_iterator it = projectAST->statements.constBegin(); + TQListViewItem *after = 0; + for (TQValueList<AST*>::const_iterator it = projectAST->statements.constBegin(); it != projectAST->statements.constEnd(); ++it) { AST *ast = *it; @@ -118,7 +118,7 @@ void Viewer::processAST(ProjectAST *projectAST, QListViewItem *globAfter) switch (ast->nodeType()) { case AST::AssignmentAST: { AssignmentAST *assignmentAST = static_cast<AssignmentAST*>(ast); - QListViewItem *item = new QListViewItem(projectIt, after, + TQListViewItem *item = new TQListViewItem(projectIt, after, assignmentAST->scopedID, assignmentAST->op, assignmentAST->values.join("")); item->setMultiLinesEnabled(true); after = item; } @@ -127,25 +127,25 @@ void Viewer::processAST(ProjectAST *projectAST, QListViewItem *globAfter) case AST::TargetAST: { AutomakeTargetAST* ata = static_cast<AutomakeTargetAST*>(ast); - QListViewItem* item = new QListViewItem(projectIt, after, - ata->target, QString::null, ata->deps.join("")); + TQListViewItem* item = new TQListViewItem(projectIt, after, + ata->target, TQString::null, ata->deps.join("")); after = item; } break; case AST::NewLineAST: -// after = new QListViewItem(projectIt, after, "<newline>"); +// after = new TQListViewItem(projectIt, after, "<newline>"); break; case AST::CommentAST: -// after = new QListViewItem(projectIt, after, "<comment>"); +// after = new TQListViewItem(projectIt, after, "<comment>"); break; case AST::MakefileConditionalAST: { ConditionAST* ata = static_cast<ConditionAST*>(ast); - QListViewItem* item = new QListViewItem(projectIt, after, - ata->type, ata->conditionName, QString::null ); + TQListViewItem* item = new TQListViewItem(projectIt, after, + ata->type, ata->conditionName, TQString::null ); after = item; } case AST::ProjectAST: { diff --git a/buildtools/lib/parsers/autotools/tests/viewer.h b/buildtools/lib/parsers/autotools/tests/viewer.h index f46cec46..3b0443f7 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer.h +++ b/buildtools/lib/parsers/autotools/tests/viewer.h @@ -20,7 +20,7 @@ #ifndef VIEWER_H #define VIEWER_H -#include <qvaluestack.h> +#include <tqvaluestack.h> #include "viewerbase.h" @@ -31,16 +31,16 @@ class QListViewItem; class Viewer: public ViewerBase { Q_OBJECT public: - Viewer(QWidget *parent = 0, const char *name = 0); - void processAST(AutoTools::ProjectAST *projectAST, QListViewItem *globAfter = 0); + Viewer(TQWidget *parent = 0, const char *name = 0); + void processAST(AutoTools::ProjectAST *projectAST, TQListViewItem *globAfter = 0); public slots: - virtual void tabWidget2_selected(const QString&); - virtual void files_currentChanged(QListBoxItem*); + virtual void tabWidget2_selected(const TQString&); + virtual void files_currentChanged(TQListBoxItem*); virtual void choose_clicked(); virtual void addAll_clicked(); private: AutoTools::ProjectAST *projectAST; - QValueStack<QListViewItem *> parentProject; + TQValueStack<TQListViewItem *> parentProject; }; #endif diff --git a/buildtools/lib/parsers/autotools/tests/viewer_main.cpp b/buildtools/lib/parsers/autotools/tests/viewer_main.cpp index 707a1364..380767a9 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer_main.cpp +++ b/buildtools/lib/parsers/autotools/tests/viewer_main.cpp @@ -17,12 +17,12 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <qapplication.h> +#include <tqapplication.h> #include "viewer.h" int main(int argc, char **argv) { - QApplication app(argc, argv); + TQApplication app(argc, argv); Viewer viewer; app.setMainWidget(&viewer); diff --git a/buildtools/lib/parsers/qmake/qmake_lex.cpp b/buildtools/lib/parsers/qmake/qmake_lex.cpp index a428b163..9fe37664 100644 --- a/buildtools/lib/parsers/qmake/qmake_lex.cpp +++ b/buildtools/lib/parsers/qmake/qmake_lex.cpp @@ -953,7 +953,7 @@ case 2: YY_RULE_SETUP #line 83 "qmake.ll" { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::LIST_WS; } YY_BREAK @@ -963,7 +963,7 @@ YY_RULE_SETUP #line 88 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::CONT; } YY_BREAK @@ -973,7 +973,7 @@ YY_RULE_SETUP #line 94 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::COMMENT_CONT; } YY_BREAK @@ -981,7 +981,7 @@ case 5: YY_RULE_SETUP #line 100 "qmake.ll" { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return (Parser::token::token::ID_SIMPLE); } YY_BREAK @@ -989,7 +989,7 @@ case 6: YY_RULE_SETUP #line 105 "qmake.ll" { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); mylval->value = mylval->value.mid(0, mylval->value.length()-1); unput(')'); BEGIN(INITIAL); @@ -1001,7 +1001,7 @@ YY_RULE_SETUP #line 113 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::VARIABLE_VALUE; } YY_BREAK @@ -1010,7 +1010,7 @@ YY_RULE_SETUP #line 119 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::QUOTED_VARIABLE_VALUE; } YY_BREAK @@ -1019,7 +1019,7 @@ YY_RULE_SETUP #line 125 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::EQ; } YY_BREAK @@ -1028,7 +1028,7 @@ YY_RULE_SETUP #line 131 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::PLUSEQ; } YY_BREAK @@ -1037,7 +1037,7 @@ YY_RULE_SETUP #line 137 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::MINUSEQ; } YY_BREAK @@ -1046,7 +1046,7 @@ YY_RULE_SETUP #line 143 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::STAREQ; } YY_BREAK @@ -1055,7 +1055,7 @@ YY_RULE_SETUP #line 149 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::TILDEEQ; } YY_BREAK @@ -1100,7 +1100,7 @@ case 19: YY_RULE_SETUP #line 177 "qmake.ll" { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::COLON; } YY_BREAK @@ -1110,7 +1110,7 @@ YY_RULE_SETUP #line 183 "qmake.ll" { BEGIN(INITIAL); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); setLineEndingFromString( mylval->value ); return Parser::token::token::NEWLINE; } @@ -1121,7 +1121,7 @@ YY_RULE_SETUP #line 190 "qmake.ll" { BEGIN(INITIAL); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); setLineEndingFromString( mylval->value ); return Parser::token::token::NEWLINE; } @@ -1132,7 +1132,7 @@ YY_RULE_SETUP #line 197 "qmake.ll" { BEGIN(INITIAL); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return (Parser::token::token::COMMENT); } YY_BREAK @@ -2215,7 +2215,7 @@ namespace QMake return yylex(); } - void Lexer::setLineEndingFromString( const QString& str ) + void Lexer::setLineEndingFromString( const TQString& str ) { if( str.endsWith("\r\n") && m_lineEnding == None ) m_lineEnding = Windows; diff --git a/buildtools/lib/parsers/qmake/qmake_lex.h b/buildtools/lib/parsers/qmake/qmake_lex.h index 1b91e747..242cec2a 100644 --- a/buildtools/lib/parsers/qmake/qmake_lex.h +++ b/buildtools/lib/parsers/qmake/qmake_lex.h @@ -36,7 +36,7 @@ namespace QMake Lexer( std::istream* argin = 0, std::ostream* argout = 0 ); int yylex( QMake::Parser::semantic_type* yylval ); int yylex(); - void setLineEndingFromString( const QString& ); + void setLineEndingFromString( const TQString& ); LineEnding lineending(); private: QMake::Parser::semantic_type* mylval; diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.cpp b/buildtools/lib/parsers/qmake/qmake_yacc.cpp index 9cd09ebe..32722979 100644 --- a/buildtools/lib/parsers/qmake/qmake_yacc.cpp +++ b/buildtools/lib/parsers/qmake/qmake_yacc.cpp @@ -144,7 +144,7 @@ namespace QMake #endif /// Build a parser object. - Parser::Parser (QMake::Lexer* lexer_yyarg, QValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg) + Parser::Parser (QMake::Lexer* lexer_yyarg, TQValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg) : yydebug_ (false), yycdebug_ (&std::cerr), lexer (lexer_yyarg), @@ -584,7 +584,7 @@ namespace QMake case 26: #line 293 "qmake.yy" { - (yyval.values) = QStringList(); + (yyval.values) = TQStringList(); (yyval.values).append( (yysemantic_stack_[(2) - (1)].value) ); (yyval.values).append( (yysemantic_stack_[(2) - (2)].value) ); ;} @@ -611,8 +611,8 @@ namespace QMake case 30: #line 312 "qmake.yy" { - (yyval.value) = QString(); - (yyval.indent) = QString(); + (yyval.value) = TQString(); + (yyval.indent) = TQString(); ;} break; diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.hpp b/buildtools/lib/parsers/qmake/qmake_yacc.hpp index 60030b3c..91583cd3 100644 --- a/buildtools/lib/parsers/qmake/qmake_yacc.hpp +++ b/buildtools/lib/parsers/qmake/qmake_yacc.hpp @@ -85,9 +85,9 @@ SOURCES = foo #regognize me @fixme 1 shift/reduce conflict in "line_body" rule */ -#include <qvaluestack.h> +#include <tqvaluestack.h> #include "qmakeast.h" -#include <qregexp.h> +#include <tqregexp.h> #define YYSTYPE_IS_DECLARED @@ -102,7 +102,7 @@ struct Result { Result(): node(0) {} /**Type of semantic value for simple grammar rules.*/ - QString value; + TQString value; /**Type of semantic value for grammar rules which are parts of AST.*/ AST *node; /**Type of semantic value for "multiline_values" grammar rule. @@ -121,8 +121,8 @@ struct Result { foo3.cpp foo4.cpp </pre> */ - QStringList values; - QString indent; + TQStringList values; + TQString indent; }; #define YYSTYPE Result @@ -143,7 +143,7 @@ When a scope or function scope statement is parsed, the child ProjectAST is crea and pushed onto the stack. Therefore all statements which belong to the scope or function scope are added as childs to their direct parent (scope or function scope). */ -//QValueStack<ProjectAST*> projects; +//TQValueStack<ProjectAST*> projects; /** The current depth of AST node is stored here. @@ -249,7 +249,7 @@ namespace QMake typedef token::yytokentype token_type; /// Build a parser object. - Parser (QMake::Lexer* lexer_yyarg, QValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg); + Parser (QMake::Lexer* lexer_yyarg, TQValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg); virtual ~Parser (); /// Parse. @@ -409,7 +409,7 @@ namespace QMake /* User arguments. */ QMake::Lexer* lexer; - QValueStack<ProjectAST*>& projects; + TQValueStack<ProjectAST*>& projects; int depth; }; } diff --git a/buildtools/lib/parsers/qmake/qmakeast.cpp b/buildtools/lib/parsers/qmake/qmakeast.cpp index a60e9a53..91e48d2d 100644 --- a/buildtools/lib/parsers/qmake/qmakeast.cpp +++ b/buildtools/lib/parsers/qmake/qmakeast.cpp @@ -27,7 +27,7 @@ namespace QMake { AST::~AST() { - for (QValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it) { AST *node = *it; delete node; @@ -45,9 +45,9 @@ void AST::removeChildAST(AST *node) m_children.remove(node); } -void AST::writeBack(QString &buffer) +void AST::writeBack(TQString &buffer) { - for (QValueList<AST*>::const_iterator it = m_children.constBegin(); + for (TQValueList<AST*>::const_iterator it = m_children.constBegin(); it != m_children.constEnd(); ++it) { if (*it) @@ -57,9 +57,9 @@ void AST::writeBack(QString &buffer) } } -QString AST::indentation() +TQString AST::indentation() { - QString result; + TQString result; for (int i = 0; i < depth(); i++) result += " "; return result; @@ -67,10 +67,10 @@ QString AST::indentation() //ProjectAST -void ProjectAST::writeBack(QString &buffer) +void ProjectAST::writeBack(TQString &buffer) { bool hasActualStatements = false; - for (QValueList<QMake::AST*>::const_iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList<QMake::AST*>::const_iterator it = m_children.begin(); it != m_children.end(); ++it) { if ((*it)->nodeType() != AST::IncludeAST) { @@ -128,7 +128,7 @@ AssignmentAST::~AssignmentAST() { } -void AssignmentAST::writeBack(QString &buffer) +void AssignmentAST::writeBack(TQString &buffer) { if( !buffer.endsWith(": ") ) buffer += indentation(); @@ -141,7 +141,7 @@ void AssignmentAST::writeBack(QString &buffer) //NewLineAST -void NewLineAST::writeBack(QString &buffer) +void NewLineAST::writeBack(TQString &buffer) { buffer += "\n"; } @@ -149,7 +149,7 @@ void NewLineAST::writeBack(QString &buffer) //CommentAST -void CommentAST::writeBack(QString &buffer) +void CommentAST::writeBack(TQString &buffer) { if( !buffer.endsWith(": ") ) buffer += indentation(); @@ -159,7 +159,7 @@ void CommentAST::writeBack(QString &buffer) //IncludeAST -void IncludeAST::writeBack(QString &/*buffer*/) +void IncludeAST::writeBack(TQString &/*buffer*/) { } diff --git a/buildtools/lib/parsers/qmake/qmakeast.h b/buildtools/lib/parsers/qmake/qmakeast.h index 35612fc1..45aedb2e 100644 --- a/buildtools/lib/parsers/qmake/qmakeast.h +++ b/buildtools/lib/parsers/qmake/qmakeast.h @@ -20,7 +20,7 @@ #ifndef QMAKEQMAKEAST_H #define QMAKEQMAKEAST_H -#include <qstringlist.h> +#include <tqstringlist.h> /** @file qmakeast.h @@ -66,7 +66,7 @@ public: /**Writes information stored in the AST into the @p buffer. This is a default implementation which iterates over child nodes and calls writeBack for each child node.*/ - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /**@return The type of the node.*/ virtual NodeType nodeType() const { return m_nodeType; } @@ -76,10 +76,10 @@ public: /**@return The depth of the node in AST.*/ int depth() const { return m_depth; } /**@return The indentation string based on node depth.*/ - virtual QString indentation(); + virtual TQString indentation(); /**The list of child AST nodes.*/ - QValueList<AST*> m_children; + TQValueList<AST*> m_children; protected: NodeType m_nodeType; @@ -122,7 +122,7 @@ public: /**Constructs a project node of given @p kind.*/ ProjectAST(Kind kind = Project): AST(AST::ProjectAST), m_kind(kind) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /**@return true if this node is a project.*/ bool isProject() const { return m_kind == Project; } @@ -133,20 +133,20 @@ public: /**@return true if this node is empty.*/ bool isEmpty() const { return m_kind == Empty; } - void setFileName(const QString& fileName) { m_fileName = fileName; } - QString fileName() const { return m_fileName; } + void setFileName(const TQString& fileName) { m_fileName = fileName; } + TQString fileName() const { return m_fileName; } void setLineEnding( LineEnding ); LineEnding lineEnding(); /**Scoped identifier (scope name or function name).*/ - QString scopedID; + TQString scopedID; /**Function arguments. Empty for other kinds of projects.*/ - QString args; + TQString args; private: Kind m_kind; - QString m_fileName; + TQString m_fileName; LineEnding m_lineEnding; }; @@ -176,16 +176,16 @@ public: AssignmentAST(): AST(AST::AssignmentAST){} ~AssignmentAST(); - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /**Scoped name of the variable.*/ - QString scopedID; + TQString scopedID; /**Operator.*/ - QString op; + TQString op; /**List of values.*/ - QStringList values; + TQStringList values; /**Indentation of multiline values*/ - QString indent; + TQString indent; }; @@ -197,7 +197,7 @@ class NewLineAST: public AST { public: NewLineAST(): AST(AST::NewLineAST) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); }; @@ -210,10 +210,10 @@ class CommentAST: public AST { public: CommentAST(): AST(AST::CommentAST) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /**Comment text.*/ - QString comment; + TQString comment; }; @@ -226,9 +226,9 @@ class IncludeAST: public AST { public: IncludeAST(): AST(AST::IncludeAST) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); - QString projectName; + TQString projectName; }; } diff --git a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp index 052f5f00..1f7e6cb6 100644 --- a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp +++ b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp @@ -29,7 +29,7 @@ void ASTVisitor::processProject(ProjectAST *project) enterScope(project); else if (project->isFunctionScope()) enterFunctionScope(project); - for (QValueList<QMake::AST*>::const_iterator it = project->m_children.constBegin(); + for (TQValueList<QMake::AST*>::const_iterator it = project->m_children.constBegin(); it != project->m_children.constEnd(); ++it) { AST *ast = *it; diff --git a/buildtools/lib/parsers/qmake/qmakedriver.cpp b/buildtools/lib/parsers/qmake/qmakedriver.cpp index 1b7aece6..e2d93ef8 100644 --- a/buildtools/lib/parsers/qmake/qmakedriver.cpp +++ b/buildtools/lib/parsers/qmake/qmakedriver.cpp @@ -20,7 +20,7 @@ #include "qmakedriver.h" #include "qmakeast.h" -#include <qvaluestack.h> +#include <tqvaluestack.h> #include <kio/netaccess.h> #include <iostream> @@ -44,7 +44,7 @@ int Driver::parseFile(const char *fileName, ProjectAST **ast, int debug) Lexer l(&inf); l.set_debug(debug); int depth = 0; - QValueStack<ProjectAST*> stack; + TQValueStack<ProjectAST*> stack; Parser p(&l, stack, depth); p.set_debug_level(debug); int ret = p.parse(); @@ -66,14 +66,14 @@ int Driver::parseFile(const char *fileName, ProjectAST **ast, int debug) return ret; } -int Driver::parseFile(QString fileName, ProjectAST **ast, int debug) +int Driver::parseFile(TQString fileName, ProjectAST **ast, int debug) { return parseFile(fileName.ascii(), ast, debug); } int Driver::parseFile(KURL fileName, ProjectAST **ast, int debug) { - QString tmpFile; + TQString tmpFile; int ret = 0; if (KIO::NetAccess::download(fileName, tmpFile, 0)) ret = parseFile(tmpFile, ast, debug); @@ -88,7 +88,7 @@ int Driver::parseString( const char* string, ProjectAST **ast, int debug ) Lexer l(&ins); l.set_debug(debug); int depth = 0; - QValueStack<ProjectAST*> stack; + TQValueStack<ProjectAST*> stack; Parser p(&l, stack, depth); p.set_debug_level(debug); int ret = p.parse(); diff --git a/buildtools/lib/parsers/qmake/qmakedriver.h b/buildtools/lib/parsers/qmake/qmakedriver.h index 37441bf8..daa06057 100644 --- a/buildtools/lib/parsers/qmake/qmakedriver.h +++ b/buildtools/lib/parsers/qmake/qmakedriver.h @@ -44,7 +44,7 @@ public: @return The result of parsing. Result is 0 on success and <> 0 on failure. */ static int parseFile(const char *fileName, ProjectAST **ast, int debug); - static int parseFile(QString fileName, ProjectAST **ast, int debug); + static int parseFile(TQString fileName, ProjectAST **ast, int debug); static int parseFile(KURL fileName, ProjectAST **ast, int debug); static int parseString(const char* string, ProjectAST **ast, int debug); diff --git a/buildtools/lib/parsers/qmake/tests/runner.cpp b/buildtools/lib/parsers/qmake/tests/runner.cpp index 140b39f4..6f1d5956 100644 --- a/buildtools/lib/parsers/qmake/tests/runner.cpp +++ b/buildtools/lib/parsers/qmake/tests/runner.cpp @@ -24,7 +24,7 @@ #include "qmakedriver.h" #include "qmakeastvisitor.h" -#include <qstring.h> +#include <tqstring.h> #include <kdebug.h> #include <kcmdlineargs.h> @@ -93,7 +93,7 @@ private: QMake::ASTVisitor::leaveFunctionScope(p); } - QString replaceWs(QString s) + TQString replaceWs(TQString s) { return s.replace("\n", "%nl").replace("\t", "%tab").replace(" ", "%spc"); } @@ -122,9 +122,9 @@ private: QMake::ASTVisitor::processInclude(a); } - QString getIndent() + TQString getIndent() { - QString ind; + TQString ind; for( int i = 0 ; i < indent ; i++) ind += " "; return ind; @@ -159,7 +159,7 @@ int main(int argc, char *argv[]) if ( !silent ) { pa.processProject(projectAST); - QString profile; + TQString profile; projectAST->writeBack(profile); kdDebug(9024) << "QMake file written back:\n" << profile << endl; } diff --git a/buildtools/lib/parsers/qmake/tests/viewer.cpp b/buildtools/lib/parsers/qmake/tests/viewer.cpp index a550a426..4583ab11 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer.cpp +++ b/buildtools/lib/parsers/qmake/tests/viewer.cpp @@ -19,15 +19,15 @@ ***************************************************************************/ #include "viewer.h" -#include <qdir.h> -#include <qlineedit.h> -#include <qlistbox.h> -#include <qfiledialog.h> -#include <qtextedit.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qlistview.h> -#include <qtabwidget.h> +#include <tqdir.h> +#include <tqlineedit.h> +#include <tqlistbox.h> +#include <tqfiledialog.h> +#include <tqtextedit.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqlistview.h> +#include <tqtabwidget.h> #include <qmakeast.h> #include <qmakedriver.h> @@ -35,46 +35,46 @@ using namespace QMake; -Viewer::Viewer(QWidget *parent, const char *name) +Viewer::Viewer(TQWidget *parent, const char *name) :ViewerBase(parent, name), projectAST(0) { - if (QFile::exists(QDir::currentDirPath() + "/" + "qtlist")) + if (TQFile::exists(TQDir::currentDirPath() + "/" + "qtlist")) { - QFile f(QDir::currentDirPath() + "/" + "qtlist"); + TQFile f(TQDir::currentDirPath() + "/" + "qtlist"); f.open(IO_ReadOnly); - QTextStream str(&f); + TQTextStream str(&f); while (!str.eof()) files->insertItem(str.readLine()); } ast->setSorting(-1); -// parentProject.push((QListViewItem*)0); +// parentProject.push((TQListViewItem*)0); } void Viewer::addAll_clicked() { if (allLocation->text().isEmpty()) return; - QDir d(allLocation->text()); - QStringList l = d.entryList("*.pro *.pri"); - for (QStringList::iterator it = l.begin(); it != l.end(); ++it) - (*it) = QDir::cleanDirPath(allLocation->text() + "/" + (*it)); + TQDir d(allLocation->text()); + TQStringList l = d.entryList("*.pro *.pri"); + for (TQStringList::iterator it = l.begin(); it != l.end(); ++it) + (*it) = TQDir::cleanDirPath(allLocation->text() + "/" + (*it)); files->insertStringList(l); } void Viewer::choose_clicked() { - QString fileName = QFileDialog::getOpenFileName(QDir::currentDirPath(), "*.pro *.pri", this); + TQString fileName = TQFileDialog::getOpenFileName(TQDir::currentDirPath(), "*.pro *.pri", this); if (!fileName.isEmpty()) files->insertItem(fileName); } -void Viewer::files_currentChanged(QListBoxItem* item) +void Viewer::files_currentChanged(TQListBoxItem* item) { ast->clear(); - QFile f(item->text()); + TQFile f(item->text()); f.open(IO_ReadOnly); - QTextStream str(&f); + TQTextStream str(&f); source->setText(str.read()); f.close(); @@ -87,11 +87,11 @@ void Viewer::files_currentChanged(QListBoxItem* item) tabWidget2_selected("Source to be written back"); } -void Viewer::tabWidget2_selected(const QString& text) +void Viewer::tabWidget2_selected(const TQString& text) { if ((text == "Source to Be Written Back") && projectAST) { - QString buffer; + TQString buffer; projectAST->writeBack(buffer); writeBack->setText(buffer); } @@ -102,7 +102,7 @@ public: ViewerVisitor(Viewer *v): ASTVisitor() { this->v = v; - parentProject.push((QListViewItem*)0); + parentProject.push((TQListViewItem*)0); } virtual void processProject(ProjectAST *project) @@ -112,10 +112,10 @@ public: virtual void enterRealProject(ProjectAST *project) { - QListViewItem *projectIt; + TQListViewItem *projectIt; if (!parentProject.top()) { - projectIt = new QListViewItem(v->ast, "Project"); + projectIt = new TQListViewItem(v->ast, "Project"); projectIt->setOpen(true); parentProject.push(projectIt); } @@ -124,7 +124,7 @@ public: } virtual void enterScope(ProjectAST *scope) { - QListViewItem *projectIt = new QListViewItem(parentProject.top(), scope->scopedID, "scope"); + TQListViewItem *projectIt = new TQListViewItem(parentProject.top(), scope->scopedID, "scope"); parentProject.push(projectIt); ASTVisitor::enterScope(scope); } @@ -134,7 +134,7 @@ public: } virtual void enterFunctionScope(ProjectAST *fscope) { - QListViewItem *projectIt = new QListViewItem(parentProject.top(), + TQListViewItem *projectIt = new TQListViewItem(parentProject.top(), fscope->scopedID + "(" + fscope->args + ")", "function scope"); parentProject.push(projectIt); ASTVisitor::enterFunctionScope(fscope); @@ -145,7 +145,7 @@ public: } virtual void processAssignment(AssignmentAST *assignment) { - QListViewItem *item = new QListViewItem(parentProject.top(), + TQListViewItem *item = new TQListViewItem(parentProject.top(), assignment->scopedID, assignment->op, assignment->values.join("|"), "assignment"); item->setMultiLinesEnabled(true); @@ -154,26 +154,26 @@ public: } virtual void processNewLine(NewLineAST *newline) { - new QListViewItem(parentProject.top(), "<newline>"); + new TQListViewItem(parentProject.top(), "<newline>"); ASTVisitor::processNewLine(newline); } virtual void processComment(CommentAST *comment) { - new QListViewItem(parentProject.top(), "<comment>"); + new TQListViewItem(parentProject.top(), "<comment>"); ASTVisitor::processComment(comment); } virtual void processInclude(IncludeAST *include) { - new QListViewItem(parentProject.top(), "<include>", include->projectName); + new TQListViewItem(parentProject.top(), "<include>", include->projectName); QMake::ASTVisitor::processInclude(include); } Viewer *v; - QValueStack<QListViewItem *> parentProject; + TQValueStack<TQListViewItem *> parentProject; }; -void Viewer::processAST(QMake::ProjectAST *projectAST, QListViewItem *globAfter) +void Viewer::processAST(QMake::ProjectAST *projectAST, TQListViewItem *globAfter) { ViewerVisitor visitor(this); visitor.processProject(projectAST); diff --git a/buildtools/lib/parsers/qmake/tests/viewer.h b/buildtools/lib/parsers/qmake/tests/viewer.h index b22632a1..07e91da1 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer.h +++ b/buildtools/lib/parsers/qmake/tests/viewer.h @@ -20,7 +20,7 @@ #ifndef VIEWER_H #define VIEWER_H -#include <qvaluestack.h> +#include <tqvaluestack.h> #include "viewerbase.h" @@ -33,11 +33,11 @@ class QListViewItem; class Viewer: public ViewerBase { Q_OBJECT public: - Viewer(QWidget *parent = 0, const char *name = 0); - void processAST(QMake::ProjectAST *projectAST, QListViewItem *globAfter = 0); + Viewer(TQWidget *parent = 0, const char *name = 0); + void processAST(QMake::ProjectAST *projectAST, TQListViewItem *globAfter = 0); public slots: - virtual void tabWidget2_selected(const QString&); - virtual void files_currentChanged(QListBoxItem*); + virtual void tabWidget2_selected(const TQString&); + virtual void files_currentChanged(TQListBoxItem*); virtual void choose_clicked(); virtual void addAll_clicked(); private: diff --git a/buildtools/lib/parsers/qmake/tests/viewer_main.cpp b/buildtools/lib/parsers/qmake/tests/viewer_main.cpp index d2a8a1ad..c31ea02c 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer_main.cpp +++ b/buildtools/lib/parsers/qmake/tests/viewer_main.cpp @@ -17,12 +17,12 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <qapplication.h> +#include <tqapplication.h> #include "viewer.h" int main(int argc, char **argv) { - QApplication app(argc, argv); + TQApplication app(argc, argv); Viewer viewer; app.setMainWidget(&viewer); diff --git a/buildtools/lib/widgets/addenvvardlg.cpp b/buildtools/lib/widgets/addenvvardlg.cpp index 2264d5f2..89d7f655 100644 --- a/buildtools/lib/widgets/addenvvardlg.cpp +++ b/buildtools/lib/widgets/addenvvardlg.cpp @@ -17,9 +17,9 @@ Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> #include <kbuttonbox.h> #include <klocale.h> #include <kstdguiitem.h> @@ -28,45 +28,45 @@ #include "addenvvardlg.h" -AddEnvvarDialog::AddEnvvarDialog(QWidget *parent, const char *name) - : QDialog(parent, name, true) +AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name) + : TQDialog(parent, name, true) { setCaption(i18n("Add Environment Variable")); - QLabel *varname_label = new QLabel(i18n("&Name:"), this); + TQLabel *varname_label = new TQLabel(i18n("&Name:"), this); varname_edit = new KLineEdit(this); varname_edit->setFocus(); varname_label->setBuddy(varname_edit); - connect( varname_edit, SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotTextChanged() ) ); - QLabel *value_label = new QLabel(i18n("&Value:"), this); + connect( varname_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); + TQLabel *value_label = new TQLabel(i18n("&Value:"), this); value_edit = new KLineEdit(this); value_label->setBuddy(value_edit); - QFontMetrics fm(value_edit->fontMetrics()); + TQFontMetrics fm(value_edit->fontMetrics()); value_edit->setMinimumWidth(fm.width('X')*35); - connect( value_edit, SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotTextChanged() ) ); + connect( value_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); - QVBoxLayout *layout = new QVBoxLayout(this, 10); + TQVBoxLayout *layout = new TQVBoxLayout(this, 10); - QGridLayout *grid = new QGridLayout(2, 2); + TQGridLayout *grid = new TQGridLayout(2, 2); layout->addLayout(grid); grid->addWidget(varname_label, 0, 0); grid->addWidget(varname_edit, 0, 1); grid->addWidget(value_label, 1, 0); grid->addWidget(value_edit, 1, 1); - QFrame *frame = new QFrame(this); - frame->setFrameStyle(QFrame::HLine | QFrame::Sunken); + TQFrame *frame = new TQFrame(this); + frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); layout->addWidget(frame, 0); KButtonBox *buttonbox = new KButtonBox(this); buttonbox->addStretch(); m_pOk = buttonbox->addButton( KStdGuiItem::ok()); - QPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); + TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); m_pOk->setDefault(true); - connect( m_pOk, SIGNAL(clicked()), this, SLOT(accept()) ); - connect( cancel, SIGNAL(clicked()), this, SLOT(reject()) ); + connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); buttonbox->layout(); layout->addWidget(buttonbox, 0); slotTextChanged(); diff --git a/buildtools/lib/widgets/addenvvardlg.h b/buildtools/lib/widgets/addenvvardlg.h index 06daa33b..5f2a5ea6 100644 --- a/buildtools/lib/widgets/addenvvardlg.h +++ b/buildtools/lib/widgets/addenvvardlg.h @@ -20,7 +20,7 @@ #ifndef _ADDENVVARDLG_H_ #define _ADDENVVARDLG_H_ -#include <qdialog.h> +#include <tqdialog.h> #include <klineedit.h> class QPushButton; @@ -32,23 +32,23 @@ class AddEnvvarDialog : public QDialog Q_OBJECT public: - AddEnvvarDialog( QWidget *parent=0, const char *name=0 ); + AddEnvvarDialog( TQWidget *parent=0, const char *name=0 ); ~AddEnvvarDialog(); - QString varname() const + TQString varname() const { return varname_edit->text(); } - QString value() const + TQString value() const { return value_edit->text(); } - void setvarname(const QString name) const + void setvarname(const TQString name) const { varname_edit->setText(name); } - void setvalue(const QString value) const + void setvalue(const TQString value) const { value_edit->setText(value); } private slots: void slotTextChanged(); private: KLineEdit *varname_edit; KLineEdit *value_edit; - QPushButton *m_pOk; + TQPushButton *m_pOk; }; #endif diff --git a/buildtools/lib/widgets/addfilesdialog.cpp b/buildtools/lib/widgets/addfilesdialog.cpp index 569b822f..f5a1fa92 100644 --- a/buildtools/lib/widgets/addfilesdialog.cpp +++ b/buildtools/lib/widgets/addfilesdialog.cpp @@ -19,24 +19,24 @@ #include <klocale.h> #include <kapplication.h> -#include <qcombobox.h> +#include <tqcombobox.h> #include "addfilesdialog.h" #include "addfilesdialog.moc" -AddFilesDialog::AddFilesDialog(const QString& startDir, const QString& filter, - QWidget *parent, const char *name, bool modal): +AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, + TQWidget *parent, const char *name, bool modal): KFileDialog(startDir, filter, parent, name, modal) { KConfig *config = kapp->config(); config->setGroup("Add Files Dialog"); - m_extraWidget = new QComboBox(false, this); + m_extraWidget = new TQComboBox(false, this); m_extraWidget->insertItem(i18n("Copy File(s)"), 0); m_extraWidget->insertItem(i18n("Create Symbolic Link(s)"), 1); m_extraWidget->insertItem(i18n("Add Relative Path(s)"), 2); m_extraWidget->setCurrentItem(config->readNumEntry("Mode")); - connect(m_extraWidget, SIGNAL(activated(int)), this, SLOT(storePreferred(int))); + connect(m_extraWidget, TQT_SIGNAL(activated(int)), this, TQT_SLOT(storePreferred(int))); setPreviewWidget(m_extraWidget); @@ -44,8 +44,8 @@ AddFilesDialog::AddFilesDialog(const QString& startDir, const QString& filter, } -AddFilesDialog::AddFilesDialog(const QString& startDir, const QString& filter, - QWidget *parent, const char *name, bool modal, QComboBox *extraWidget): +AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, + TQWidget *parent, const char *name, bool modal, TQComboBox *extraWidget): KFileDialog(startDir, filter, parent, name, modal, extraWidget), m_extraWidget(extraWidget) { KConfig *config = kapp->config(); @@ -55,7 +55,7 @@ AddFilesDialog::AddFilesDialog(const QString& startDir, const QString& filter, m_extraWidget->insertItem(i18n("Create Symbolic Link(s)"), 1); m_extraWidget->insertItem(i18n("Add Relative Path(s)"), 2); m_extraWidget->setCurrentItem(config->readNumEntry("Mode")); - connect(m_extraWidget, SIGNAL(activated(int)), this, SLOT(storePreferred(int))); + connect(m_extraWidget, TQT_SIGNAL(activated(int)), this, TQT_SLOT(storePreferred(int))); setOperationMode(Opening); } diff --git a/buildtools/lib/widgets/addfilesdialog.h b/buildtools/lib/widgets/addfilesdialog.h index ddc6dd60..51415cc6 100644 --- a/buildtools/lib/widgets/addfilesdialog.h +++ b/buildtools/lib/widgets/addfilesdialog.h @@ -37,18 +37,18 @@ class AddFilesDialog : public KFileDialog public: enum Mode { Copy, Link, Relative }; - AddFilesDialog(const QString& startDir, const QString& filter, - QWidget *parent, const char *name, bool modal); + AddFilesDialog(const TQString& startDir, const TQString& filter, + TQWidget *parent, const char *name, bool modal); - AddFilesDialog(const QString& startDir, const QString& filter, - QWidget *parent, const char *name, bool modal, QComboBox *extraWidget); + AddFilesDialog(const TQString& startDir, const TQString& filter, + TQWidget *parent, const char *name, bool modal, TQComboBox *extraWidget); virtual ~AddFilesDialog(); virtual AddFilesDialog::Mode mode(); private: - QComboBox * m_extraWidget; + TQComboBox * m_extraWidget; private slots: void storePreferred(int index); diff --git a/buildtools/lib/widgets/environmentdisplaydialog.cpp b/buildtools/lib/widgets/environmentdisplaydialog.cpp index dcec00d7..1a809459 100644 --- a/buildtools/lib/widgets/environmentdisplaydialog.cpp +++ b/buildtools/lib/widgets/environmentdisplaydialog.cpp @@ -19,16 +19,16 @@ #include <unistd.h> #include <klistview.h> -#include <qstringlist.h> +#include <tqstringlist.h> #include "environmentdisplaydialog.h" extern char **environ; -EnvironmentDisplayDialog::EnvironmentDisplayDialog(QWidget* parent, const char* name, bool modal, WFlags fl) +EnvironmentDisplayDialog::EnvironmentDisplayDialog(TQWidget* parent, const char* name, bool modal, WFlags fl) : EnvironmentDisplayDialogBase(parent,name, modal,fl) { - QStringList environment; + TQStringList environment; char ** e = ::environ; while ( *e ) @@ -37,13 +37,13 @@ EnvironmentDisplayDialog::EnvironmentDisplayDialog(QWidget* parent, const char* e++; } - QStringList::ConstIterator it = environment.begin(); + TQStringList::ConstIterator it = environment.begin(); while( it !=environment.end() ) { - QStringList pair = QStringList::split( QChar('='), *it ); + TQStringList pair = TQStringList::split( TQChar('='), *it ); if ( pair.count() == 2 ) { - new QListViewItem( environmentListView, pair.first(), pair.last() ); + new TQListViewItem( environmentListView, pair.first(), pair.last() ); } ++it; } diff --git a/buildtools/lib/widgets/environmentdisplaydialog.h b/buildtools/lib/widgets/environmentdisplaydialog.h index 277919c2..3458ba78 100644 --- a/buildtools/lib/widgets/environmentdisplaydialog.h +++ b/buildtools/lib/widgets/environmentdisplaydialog.h @@ -28,7 +28,7 @@ class EnvironmentDisplayDialog : public EnvironmentDisplayDialogBase Q_OBJECT public: - EnvironmentDisplayDialog(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + EnvironmentDisplayDialog(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); }; #endif diff --git a/buildtools/lib/widgets/environmentvariableswidget.cpp b/buildtools/lib/widgets/environmentvariableswidget.cpp index e47142f5..3c3e448f 100644 --- a/buildtools/lib/widgets/environmentvariableswidget.cpp +++ b/buildtools/lib/widgets/environmentvariableswidget.cpp @@ -21,10 +21,10 @@ #include "environmentvariableswidget.h" #include "environmentdisplaydialog.h" -#include <qcheckbox.h> -#include <qlineedit.h> -#include <qspinbox.h> -#include <qlistview.h> +#include <tqcheckbox.h> +#include <tqlineedit.h> +#include <tqspinbox.h> +#include <tqlistview.h> #include "domutil.h" #include "addenvvardlg.h" @@ -32,7 +32,7 @@ void EnvironmentVariablesWidget::addVarClicked() { AddEnvvarDialog dlg( this, "add env dialog" ) ; - if (QListViewItem *Item = listview->selectedItem()) + if (TQListViewItem *Item = listview->selectedItem()) { dlg.setvarname(Item->text(0)); dlg.setvalue(Item->text(1)); @@ -40,14 +40,14 @@ void EnvironmentVariablesWidget::addVarClicked() if (!dlg.exec()) return; - (void) new QListViewItem(listview, dlg.varname(), dlg.value()); + (void) new TQListViewItem(listview, dlg.varname(), dlg.value()); } void EnvironmentVariablesWidget::editVarClicked() { AddEnvvarDialog dlg( this, "edit env dialog" ); - QListViewItem *item = listview->selectedItem(); + TQListViewItem *item = listview->selectedItem(); if ( !item ) return; dlg.setvarname(item->text(0)); @@ -66,20 +66,20 @@ void EnvironmentVariablesWidget::removeVarClicked() } -EnvironmentVariablesWidget::EnvironmentVariablesWidget(QDomDocument &dom, const QString &configGroup, - QWidget *parent, const char *name) +EnvironmentVariablesWidget::EnvironmentVariablesWidget(TQDomDocument &dom, const TQString &configGroup, + TQWidget *parent, const char *name) : EnvironmentVariablesWidgetBase(parent, name), m_dom(dom), m_configGroup(configGroup) { readEnvironment(dom, configGroup); - connect( listview, SIGNAL( doubleClicked ( QListViewItem *, const QPoint &, int ) ), this, SLOT( editVarClicked() ) ); + connect( listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( editVarClicked() ) ); } EnvironmentVariablesWidget::~EnvironmentVariablesWidget() {} -void EnvironmentVariablesWidget::readEnvironment(QDomDocument &dom, const QString &configGroup) +void EnvironmentVariablesWidget::readEnvironment(TQDomDocument &dom, const TQString &configGroup) { m_dom = dom; m_configGroup = configGroup; @@ -89,18 +89,18 @@ void EnvironmentVariablesWidget::readEnvironment(QDomDocument &dom, const QStrin DomUtil::PairList list = DomUtil::readPairListEntry(dom, m_configGroup, "envvar", "name", "value"); - QListViewItem *lastItem = 0; + TQListViewItem *lastItem = 0; DomUtil::PairList::ConstIterator it; for (it = list.begin(); it != list.end(); ++it) { - QListViewItem *newItem = new QListViewItem(listview, (*it).first, (*it).second); + TQListViewItem *newItem = new TQListViewItem(listview, (*it).first, (*it).second); if (lastItem) newItem->moveItem(lastItem); lastItem = newItem; } } -void EnvironmentVariablesWidget::changeConfigGroup( const QString &configGroup) +void EnvironmentVariablesWidget::changeConfigGroup( const TQString &configGroup) { m_configGroup = configGroup; } @@ -108,7 +108,7 @@ void EnvironmentVariablesWidget::changeConfigGroup( const QString &configGroup) void EnvironmentVariablesWidget::accept() { DomUtil::PairList list; - QListViewItem *item = listview->firstChild(); + TQListViewItem *item = listview->firstChild(); while (item) { list << DomUtil::Pair(item->text(0), item->text(1)); item = item->nextSibling(); diff --git a/buildtools/lib/widgets/environmentvariableswidget.h b/buildtools/lib/widgets/environmentvariableswidget.h index c42076a8..f2c00b52 100644 --- a/buildtools/lib/widgets/environmentvariableswidget.h +++ b/buildtools/lib/widgets/environmentvariableswidget.h @@ -23,7 +23,7 @@ #include "environmentvariableswidgetbase.h" -#include <qdom.h> +#include <tqdom.h> /** Environment variables widget. @@ -33,15 +33,15 @@ class EnvironmentVariablesWidget : public EnvironmentVariablesWidgetBase Q_OBJECT public: - EnvironmentVariablesWidget( QDomDocument &dom, const QString &configGroup, - QWidget *parent=0, const char *name=0 ); + EnvironmentVariablesWidget( TQDomDocument &dom, const TQString &configGroup, + TQWidget *parent=0, const char *name=0 ); ~EnvironmentVariablesWidget(); /// read in a set of environment variables from the DOM document - void readEnvironment(QDomDocument &dom, const QString &configGroup); + void readEnvironment(TQDomDocument &dom, const TQString &configGroup); /// changes the path in the DOM structure where the environment variables are stored - void changeConfigGroup( const QString &configGroup); + void changeConfigGroup( const TQString &configGroup); public slots: void accept(); @@ -52,8 +52,8 @@ private: virtual void editVarClicked(); virtual void environmentClicked(); - QDomDocument &m_dom; - QString m_configGroup; + TQDomDocument &m_dom; + TQString m_configGroup; }; #endif diff --git a/buildtools/lib/widgets/envvartools.cpp b/buildtools/lib/widgets/envvartools.cpp index 8f69e93c..71c44377 100644 --- a/buildtools/lib/widgets/envvartools.cpp +++ b/buildtools/lib/widgets/envvartools.cpp @@ -18,12 +18,12 @@ */ #include "envvartools.h" -#include <qregexp.h> +#include <tqregexp.h> -QString EnvVarTools::quote( const QString & arg ) +TQString EnvVarTools::quote( const TQString & arg ) { - QString res = arg; - res.replace(QRegExp(QString::fromLatin1("'")), QString::fromLatin1("'\\''")); + TQString res = arg; + res.replace(TQRegExp(TQString::fromLatin1("'")), TQString::fromLatin1("'\\''")); res.prepend("\""); res.append("\""); return res; diff --git a/buildtools/lib/widgets/envvartools.h b/buildtools/lib/widgets/envvartools.h index 042fe326..3a4802c6 100644 --- a/buildtools/lib/widgets/envvartools.h +++ b/buildtools/lib/widgets/envvartools.h @@ -16,13 +16,13 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qstring.h> +#include <tqstring.h> /**Environment support functions.*/ namespace EnvVarTools{ /**Quotes the argument using double quotes ("). Created as a replacement for KShellProcess::quote.*/ - QString quote(const QString &arg); + TQString quote(const TQString &arg); } diff --git a/buildtools/lib/widgets/makeoptionswidget.cpp b/buildtools/lib/widgets/makeoptionswidget.cpp index 834e275c..ef901cc8 100644 --- a/buildtools/lib/widgets/makeoptionswidget.cpp +++ b/buildtools/lib/widgets/makeoptionswidget.cpp @@ -19,17 +19,17 @@ #include "makeoptionswidget.h" -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <klineedit.h> -#include <qspinbox.h> -#include <qlistview.h> -#include <qgroupbox.h> +#include <tqspinbox.h> +#include <tqlistview.h> +#include <tqgroupbox.h> #include "domutil.h" #include "environmentvariableswidget.h" -MakeOptionsWidget::MakeOptionsWidget(QDomDocument &dom, const QString &configGroup, - QWidget *parent, const char *name) +MakeOptionsWidget::MakeOptionsWidget(TQDomDocument &dom, const TQString &configGroup, + TQWidget *parent, const char *name) : MakeOptionsWidgetBase(parent, name), m_dom(dom), m_configGroup(configGroup) { diff --git a/buildtools/lib/widgets/makeoptionswidget.h b/buildtools/lib/widgets/makeoptionswidget.h index 1754cd91..0cd962c3 100644 --- a/buildtools/lib/widgets/makeoptionswidget.h +++ b/buildtools/lib/widgets/makeoptionswidget.h @@ -22,7 +22,7 @@ #include "makeoptionswidgetbase.h" -#include <qdom.h> +#include <tqdom.h> class EnvironmentVariablesWidget; @@ -34,16 +34,16 @@ class MakeOptionsWidget : public MakeOptionsWidgetBase Q_OBJECT public: - MakeOptionsWidget( QDomDocument &dom, const QString &configGroup, - QWidget *parent=0, const char *name=0 ); + MakeOptionsWidget( TQDomDocument &dom, const TQString &configGroup, + TQWidget *parent=0, const char *name=0 ); ~MakeOptionsWidget(); public slots: void accept(); private: - QDomDocument &m_dom; - QString m_configGroup; + TQDomDocument &m_dom; + TQString m_configGroup; EnvironmentVariablesWidget* m_environmentVariablesWidget; }; diff --git a/buildtools/lib/widgets/removesubprojectdialog.cpp b/buildtools/lib/widgets/removesubprojectdialog.cpp index aef16a0c..4a41ff88 100644 --- a/buildtools/lib/widgets/removesubprojectdialog.cpp +++ b/buildtools/lib/widgets/removesubprojectdialog.cpp @@ -16,11 +16,11 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qcheckbox.h> -#include <qlabel.h> +#include <tqcheckbox.h> +#include <tqlabel.h> #include "removesubprojectdialog.h" -RemoveSubprojectDialog::RemoveSubprojectDialog(QString caption, QString question, QWidget* parent, const char* name, bool modal, WFlags fl) +RemoveSubprojectDialog::RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* parent, const char* name, bool modal, WFlags fl) : RemoveSubprojectDlgBase(parent,name, modal,fl) { setCaption(caption); @@ -34,12 +34,12 @@ RemoveSubprojectDialog::~RemoveSubprojectDialog() /*$SPECIALIZATION$*/ void RemoveSubprojectDialog::reject() { - QDialog::reject(); + TQDialog::reject(); } void RemoveSubprojectDialog::accept() { - QDialog::accept(); + TQDialog::accept(); } bool RemoveSubprojectDialog::removeFromDisk( ) diff --git a/buildtools/lib/widgets/removesubprojectdialog.h b/buildtools/lib/widgets/removesubprojectdialog.h index 0a20b4ad..593309fe 100644 --- a/buildtools/lib/widgets/removesubprojectdialog.h +++ b/buildtools/lib/widgets/removesubprojectdialog.h @@ -30,7 +30,7 @@ class RemoveSubprojectDialog : public RemoveSubprojectDlgBase Q_OBJECT public: - RemoveSubprojectDialog(QString caption, QString question, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~RemoveSubprojectDialog(); /*$PUBLIC_FUNCTIONS$*/ bool removeFromDisk(); diff --git a/buildtools/lib/widgets/runoptionswidget.cpp b/buildtools/lib/widgets/runoptionswidget.cpp index f0cb94b4..9aecbe17 100644 --- a/buildtools/lib/widgets/runoptionswidget.cpp +++ b/buildtools/lib/widgets/runoptionswidget.cpp @@ -26,20 +26,20 @@ #include <klineedit.h> #include <urlutil.h> -#include <qlistview.h> -#include <qgroupbox.h> -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qpushbutton.h> -#include <qbuttongroup.h> -#include <qlabel.h> +#include <tqlistview.h> +#include <tqgroupbox.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqpushbutton.h> +#include <tqbuttongroup.h> +#include <tqlabel.h> #include "domutil.h" #include "environmentvariableswidget.h" -RunOptionsWidget::RunOptionsWidget(QDomDocument &dom, const QString &configGroup, - const QString &buildDirectory, QWidget *parent, const char *name) +RunOptionsWidget::RunOptionsWidget(TQDomDocument &dom, const TQString &configGroup, + const TQString &buildDirectory, TQWidget *parent, const char *name) : RunOptionsWidgetBase(parent, name), m_dom(dom), m_configGroup(configGroup) { @@ -49,37 +49,37 @@ RunOptionsWidget::RunOptionsWidget(QDomDocument &dom, const QString &configGroup mainprogram_edit->completionObject()->setMode(KURLCompletion::FileCompletion); mainprogram_edit->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); - if( DomUtil::readEntry(dom, configGroup + "/run/mainprogram").isEmpty() && QFileInfo( buildDirectory ).exists() ) + if( DomUtil::readEntry(dom, configGroup + "/run/mainprogram").isEmpty() && TQFileInfo( buildDirectory ).exists() ) { mainprogram_edit->setURL( buildDirectory ); mainprogram_edit->fileDialog()->setURL( KURL::fromPathOrURL(buildDirectory) ); - }else if ( QFileInfo( DomUtil::readEntry(dom, configGroup + "/run/mainprogram") ).exists() ) + }else if ( TQFileInfo( DomUtil::readEntry(dom, configGroup + "/run/mainprogram") ).exists() ) { - QString program = DomUtil::readEntry(dom, configGroup + "/run/mainprogram"); - if( QDir::isRelativePath(program) ) + TQString program = DomUtil::readEntry(dom, configGroup + "/run/mainprogram"); + if( TQDir::isRelativePath(program) ) program = buildDirectory + "/" + program; mainprogram_edit->setURL(program); mainprogram_edit->fileDialog()->setURL( program ); }else { - mainprogram_edit->setURL(QString()); - mainprogram_edit->fileDialog()->setURL(QString()); + mainprogram_edit->setURL(TQString()); + mainprogram_edit->fileDialog()->setURL(TQString()); } cwd_edit->completionObject()->setMode(KURLCompletion::DirCompletion); cwd_edit->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - if( DomUtil::readEntry(dom, configGroup + "/run/globalcwd").isEmpty() && QFileInfo( buildDirectory ).exists() ) + if( DomUtil::readEntry(dom, configGroup + "/run/globalcwd").isEmpty() && TQFileInfo( buildDirectory ).exists() ) { cwd_edit->setURL( buildDirectory ); cwd_edit->fileDialog()->setURL( KURL::fromPathOrURL(buildDirectory) ); - }else if( QFileInfo( DomUtil::readEntry(dom, configGroup + "/run/globalcwd") ).exists() ) + }else if( TQFileInfo( DomUtil::readEntry(dom, configGroup + "/run/globalcwd") ).exists() ) { cwd_edit->setURL(DomUtil::readEntry(dom, configGroup + "/run/globalcwd")); cwd_edit->fileDialog()->setURL( KURL::fromPathOrURL( DomUtil::readEntry(dom, configGroup + "/run/globalcwd") ) ); }else { - cwd_edit->setURL(QString()); - cwd_edit->fileDialog()->setURL(QString()); + cwd_edit->setURL(TQString()); + cwd_edit->fileDialog()->setURL(TQString()); } if( configGroup == "/kdevautoproject" || configGroup == "/kdevtrollproject" ) @@ -127,7 +127,7 @@ void RunOptionsWidget::mainProgramChanged( ) if( mainProgramGroupBox->isChecked() && mainprogram_edit->url().isEmpty() ) { - mainprogram_label->setPaletteForegroundColor(QColor("#ff0000")); + mainprogram_label->setPaletteForegroundColor(TQColor("#ff0000")); } else { diff --git a/buildtools/lib/widgets/runoptionswidget.h b/buildtools/lib/widgets/runoptionswidget.h index df27079d..02c38f35 100644 --- a/buildtools/lib/widgets/runoptionswidget.h +++ b/buildtools/lib/widgets/runoptionswidget.h @@ -22,7 +22,7 @@ #include "runoptionswidgetbase.h" -#include <qdom.h> +#include <tqdom.h> #include <kurl.h> class EnvironmentVariablesWidget; @@ -35,10 +35,10 @@ class RunOptionsWidget : public RunOptionsWidgetBase Q_OBJECT public: - RunOptionsWidget( QDomDocument &dom, //!< document DOM - const QString &configGroup, //!< configuration group - const QString &buildDirectory, //!< project build directory - QWidget *parent=0, //!< parent widget + RunOptionsWidget( TQDomDocument &dom, //!< document DOM + const TQString &configGroup, //!< configuration group + const TQString &buildDirectory, //!< project build directory + TQWidget *parent=0, //!< parent widget const char *name=0 //!< widget's name ); ~RunOptionsWidget(); @@ -49,8 +49,8 @@ public slots: private: virtual void mainProgramChanged( ); - QDomDocument &m_dom; - QString m_configGroup; + TQDomDocument &m_dom; + TQString m_configGroup; EnvironmentVariablesWidget* m_environmentVariablesWidget; }; diff --git a/buildtools/lib/widgets/subclassesdlg.cpp b/buildtools/lib/widgets/subclassesdlg.cpp index 2ec12f48..4dde898b 100644 --- a/buildtools/lib/widgets/subclassesdlg.cpp +++ b/buildtools/lib/widgets/subclassesdlg.cpp @@ -16,12 +16,12 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlistbox.h> +#include <tqlistbox.h> #include <kurlrequester.h> #include "subclassesdlg.h" #include "subclassesdlg.moc" -SubclassesDlg::SubclassesDlg(QString form, DomUtil::PairList &config, QString projectDir, QWidget* parent, const char* name, bool modal, WFlags fl) +SubclassesDlg::SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* parent, const char* name, bool modal, WFlags fl) : SubclassesDlgBase(parent,name, modal,fl), m_form(form), m_config(config), m_projectDir(projectDir) { subclass_url->setEnabled(false); @@ -41,7 +41,7 @@ SubclassesDlg::~SubclassesDlg() /*$SPECIALIZATION$*/ void SubclassesDlg::accept() { - QPtrList<DomUtil::Pair> pairsToRemove; + TQPtrList<DomUtil::Pair> pairsToRemove; DomUtil::PairList::iterator it; for ( it = m_config.begin(); it != m_config.end(); ++it ) @@ -81,7 +81,7 @@ void SubclassesDlg::removeRelation() { if (subclasses_box->currentItem() > -1) { - QListBoxItem *item = subclasses_box->item(subclasses_box->currentItem()); + TQListBoxItem *item = subclasses_box->item(subclasses_box->currentItem()); int itemIdx = subclasses_box->currentItem(); if (item->prev()) @@ -103,7 +103,7 @@ void SubclassesDlg::removeRelation() } } -void SubclassesDlg::changeCurrentURL(const QString &str) +void SubclassesDlg::changeCurrentURL(const TQString &str) { if ( subclasses_box->currentItem() > -1 ) { @@ -111,7 +111,7 @@ void SubclassesDlg::changeCurrentURL(const QString &str) } } -void SubclassesDlg::currentRelationChanged( QListBoxItem * item ) +void SubclassesDlg::currentRelationChanged( TQListBoxItem * item ) { if (item) { diff --git a/buildtools/lib/widgets/subclassesdlg.h b/buildtools/lib/widgets/subclassesdlg.h index ed799b85..adfdc7d4 100644 --- a/buildtools/lib/widgets/subclassesdlg.h +++ b/buildtools/lib/widgets/subclassesdlg.h @@ -30,7 +30,7 @@ class SubclassesDlg : public SubclassesDlgBase Q_OBJECT public: - SubclassesDlg(QString form, DomUtil::PairList &config, QString projectDir, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SubclassesDlg(); /*$PUBLIC_FUNCTIONS$*/ @@ -45,13 +45,13 @@ protected slots: /*$PROTECTED_SLOTS$*/ virtual void newRelation(); virtual void removeRelation(); - virtual void changeCurrentURL(const QString &str); - virtual void currentRelationChanged(QListBoxItem *item); + virtual void changeCurrentURL(const TQString &str); + virtual void currentRelationChanged(TQListBoxItem *item); private: - QString m_form; + TQString m_form; DomUtil::PairList &m_config; - QString m_projectDir; + TQString m_projectDir; }; #endif diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp index a710db19..c2c32f9e 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.cpp +++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp @@ -8,10 +8,10 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include <qlayout.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qcombobox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqcombobox.h> #include <kurlrequester.h> #include <kdebug.h> @@ -23,7 +23,7 @@ #include "pascalproject_part.h" #include "pascalglobaloptionsdlg.h" -PascalGlobalOptionsDlg::PascalGlobalOptionsDlg(PascalProjectPart *part, QWidget* parent, const char* name, WFlags fl) +PascalGlobalOptionsDlg::PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget* parent, const char* name, WFlags fl) :PascalProjectOptionsDlgBase(parent,name,fl), m_part(part) { delete config_label; @@ -47,7 +47,7 @@ PascalGlobalOptionsDlg::PascalGlobalOptionsDlg(PascalProjectPart *part, QWidget* if (offers.isEmpty()) options_button->setEnabled(false); - currentCompiler = QString::null; + currentCompiler = TQString::null; /*kdDebug() << ServiceComboBox::defaultCompiler() << endl; kdDebug() << ServiceComboBox::itemForText(ServiceComboBox::defaultCompiler(), service_names) << endl; @@ -63,17 +63,17 @@ PascalGlobalOptionsDlg::~PascalGlobalOptionsDlg() void PascalGlobalOptionsDlg::optionsButtonClicked() { - QString name = ServiceComboBox::currentText(compiler_box, service_names); + TQString name = ServiceComboBox::currentText(compiler_box, service_names); KDevCompilerOptions *plugin = m_part->createCompilerOptions(name); if (plugin) { - QString flags = plugin->exec(this, options_edit->text()); + TQString flags = plugin->exec(this, options_edit->text()); options_edit->setText(flags); delete plugin; } } -void PascalGlobalOptionsDlg::compiler_box_activated(const QString& text) +void PascalGlobalOptionsDlg::compiler_box_activated(const TQString& text) { kdDebug() << "text changed from " << currentCompiler << " to " << text << endl; if (currentCompiler == text) @@ -91,14 +91,14 @@ void PascalGlobalOptionsDlg::accept() saveConfigCache(); } -void PascalGlobalOptionsDlg::saveCompilerOpts( QString compiler ) +void PascalGlobalOptionsDlg::saveCompilerOpts( TQString compiler ) { configCache[compiler] = options_edit->text(); } -void PascalGlobalOptionsDlg::readCompilerOpts( QString compiler ) +void PascalGlobalOptionsDlg::readCompilerOpts( TQString compiler ) { - QString settings = configCache[compiler]; + TQString settings = configCache[compiler]; if (settings.isEmpty()) { KConfig *config = KGlobal::config(); @@ -114,7 +114,7 @@ void PascalGlobalOptionsDlg::readConfigCache( ) /* KConfig *config = KGlobal::config(); config->setGroup("Pascal Compiler"); - QMap<QString, QString> settings = config->entryMap("Pascal Compiler"); + TQMap<TQString, TQString> settings = config->entryMap("Pascal Compiler"); */ } @@ -123,7 +123,7 @@ void PascalGlobalOptionsDlg::saveConfigCache( ) KConfig *config = KGlobal::config(); config->setGroup("Pascal Compiler"); - for (QMap<QString, QString>::iterator it = configCache.begin(); it != configCache.end(); ++it) + for (TQMap<TQString, TQString>::iterator it = configCache.begin(); it != configCache.end(); ++it) { config->writeEntry(it.key(), it.data()); } diff --git a/buildtools/pascal/pascalglobaloptionsdlg.h b/buildtools/pascal/pascalglobaloptionsdlg.h index 14da2221..b0c19e0e 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.h +++ b/buildtools/pascal/pascalglobaloptionsdlg.h @@ -11,7 +11,7 @@ #ifndef PASCALGLOBALOPTIONSDLG_H #define PASCALGLOBALOPTIONSDLG_H -#include <qmap.h> +#include <tqmap.h> #include <ktrader.h> @@ -24,7 +24,7 @@ class PascalGlobalOptionsDlg : public PascalProjectOptionsDlgBase Q_OBJECT public: - PascalGlobalOptionsDlg(PascalProjectPart *part, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~PascalGlobalOptionsDlg(); public slots: @@ -32,18 +32,18 @@ public slots: protected slots: virtual void optionsButtonClicked(); - virtual void compiler_box_activated(const QString& text); + virtual void compiler_box_activated(const TQString& text); private: PascalProjectPart *m_part; KTrader::OfferList offers; - QString currentCompiler; - QStringList service_names; - QStringList service_execs; - QMap<QString, QString> configCache; + TQString currentCompiler; + TQStringList service_names; + TQStringList service_execs; + TQMap<TQString, TQString> configCache; - void saveCompilerOpts(QString compiler); - void readCompilerOpts(QString compiler); + void saveCompilerOpts(TQString compiler); + void readCompilerOpts(TQString compiler); void readConfigCache(); void saveConfigCache(); diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index 3fe09420..2ed25fc0 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -10,13 +10,13 @@ ***************************************************************************/ #include "pascalproject_part.h" -#include <qdom.h> -#include <qfileinfo.h> -#include <qdir.h> -#include <qvaluestack.h> -#include <qregexp.h> -#include <qvbox.h> -#include <qlabel.h> +#include <tqdom.h> +#include <tqfileinfo.h> +#include <tqdir.h> +#include <tqvaluestack.h> +#include <tqregexp.h> +#include <tqvbox.h> +#include <tqlabel.h> #include <kiconloader.h> #include <klocale.h> @@ -52,7 +52,7 @@ typedef KDevGenericFactory<PascalProjectPart> PascalProjectFactory; static const KDevPluginInfo data("kdevpascalproject"); K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( data ) ) -PascalProjectPart::PascalProjectPart(QObject *parent, const char *name, const QStringList& ) +PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const TQStringList& ) :KDevBuildTool(&data, parent, name ? name : "PascalProjectPart" ) { setInstance(PascalProjectFactory::instance()); @@ -60,27 +60,27 @@ PascalProjectPart::PascalProjectPart(QObject *parent, const char *name, const QS KAction *action; action = new KAction( i18n("&Build Project"), "make_kdevelop", Key_F8, - this, SLOT(slotBuild()), + this, TQT_SLOT(slotBuild()), actionCollection(), "build_build" ); action->setToolTip(i18n("Build project")); action->setWhatsThis(i18n("<b>Build project</b><p>Runs the compiler on a main source file of the project. " "The compiler and the main source file can be set in project settings, <b>Pascal Compiler</b> tab.")); action = new KAction( i18n("Execute Program"), "exec", 0, - this, SLOT(slotExecute()), + this, TQT_SLOT(slotExecute()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Execute program")); action->setWhatsThis(i18n("<b>Execute program</b><p>Executes the main program specified in project settings, <b>Run options</b> tab. " "If nothing is set, the binary file with the same name as the main source file name is executed.")); - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), SIGNAL(configWidget(KDialogBase*)), - this, SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), + this, TQT_SLOT(configWidget(KDialogBase*)) ); // m_widget = new PascalProjectWidget(this); -// QWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); +// TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); // now you decide what should happen to the widget. Take a look at kdevcore.h // or at other plugins how to embed it. @@ -101,11 +101,11 @@ PascalProjectPart::~PascalProjectPart() * @todo This should really be merged with FileTreeWidget::matchesHidePattern() * and put in its own class. Currently this is repeated in scriptprojectpart.cpp, pascalproject_part.cpp, adaproject_part.cpp */ -static bool matchesPattern(const QString &fileName, const QStringList &patternList) +static bool matchesPattern(const TQString &fileName, const TQStringList &patternList) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = patternList.begin(); it != patternList.end(); ++it) { - QRegExp re(*it, true, true); + TQRegExp re(*it, true, true); if (re.search(fileName) == 0 && re.matchedLength() == (int)fileName.length()) return true; } @@ -113,13 +113,13 @@ static bool matchesPattern(const QString &fileName, const QStringList &patternLi return false; } -void PascalProjectPart::openProject(const QString &dirName, const QString &projectName) +void PascalProjectPart::openProject(const TQString &dirName, const TQString &projectName) { m_buildDir = dirName; m_projectDir = dirName; m_projectName = projectName; - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); // Set the default directory radio to "executable" if (DomUtil::readEntry(dom, "/kdevpascalproject/run/directoryradio") == "" ) { DomUtil::writeEntry(dom, "/kdevpascalproject/run/directoryradio", "executable"); @@ -128,11 +128,11 @@ void PascalProjectPart::openProject(const QString &dirName, const QString &proje loadProjectConfig(); // Put all files from all subdirectories into file list - QValueStack<QString> s; + TQValueStack<TQString> s; int prefixlen = m_projectDir.length()+1; s.push(m_projectDir); - QStringList includepatternList; + TQStringList includepatternList; if ( languageSupport() ) { KMimeType::List list = languageSupport()->mimeTypes(); @@ -142,20 +142,20 @@ void PascalProjectPart::openProject(const QString &dirName, const QString &proje ++it; } } - QString excludepatterns = "*~"; - QStringList excludepatternList = QStringList::split(",", excludepatterns); + TQString excludepatterns = "*~"; + TQStringList excludepatternList = TQStringList::split(",", excludepatterns); - QDir dir; + TQDir dir; do { dir.setPath(s.pop()); kdDebug(9033) << "Examining: " << dir.path() << endl; const QFileInfoList *dirEntries = dir.entryInfoList(); - QPtrListIterator<QFileInfo> it(*dirEntries); + TQPtrListIterator<TQFileInfo> it(*dirEntries); for (; it.current(); ++it) { - QString fileName = it.current()->fileName(); + TQString fileName = it.current()->fileName(); if (fileName == "." || fileName == "..") continue; - QString path = it.current()->absFilePath(); + TQString path = it.current()->absFilePath(); if (it.current()->isDir()) { kdDebug(9033) << "Pushing: " << path << endl; s.push(path); @@ -195,9 +195,9 @@ DomUtil::PairList PascalProjectPart::runEnvironmentVars() const * if run/directoryradio == custom * The custom directory absolute path */ -QString PascalProjectPart::runDirectory() const +TQString PascalProjectPart::runDirectory() const { - QString cwd = defaultRunDirectory("kdevpascalproject"); + TQString cwd = defaultRunDirectory("kdevpascalproject"); if (cwd.isEmpty()) cwd = buildDirectory(); return cwd; @@ -213,15 +213,15 @@ QString PascalProjectPart::runDirectory() const * if run/directoryradio == custom or relative == false * The absolute path to executable */ -QString PascalProjectPart::mainProgram() const +TQString PascalProjectPart::mainProgram() const { - QDomDocument * dom = projectDom(); + TQDomDocument * dom = projectDom(); - if ( !dom ) return QString(); + if ( !dom ) return TQString(); - QString DomMainProgram = DomUtil::readEntry( *dom, "/kdevpascalproject/run/mainprogram"); + TQString DomMainProgram = DomUtil::readEntry( *dom, "/kdevpascalproject/run/mainprogram"); - if ( DomMainProgram.isEmpty() ) return QString(); + if ( DomMainProgram.isEmpty() ) return TQString(); if ( DomMainProgram.startsWith("/") ) // assume absolute path { @@ -232,63 +232,63 @@ QString PascalProjectPart::mainProgram() const return projectDirectory() + "/" + DomMainProgram; } - return QString(); + return TQString(); } -/** Retuns a QString with the debug command line arguments */ -QString PascalProjectPart::debugArguments() const +/** Retuns a TQString with the debug command line arguments */ +TQString PascalProjectPart::debugArguments() const { return DomUtil::readEntry(*projectDom(), "/kdevpascalproject/run/globaldebugarguments"); } -/** Retuns a QString with the run command line arguments */ -QString PascalProjectPart::runArguments() const +/** Retuns a TQString with the run command line arguments */ +TQString PascalProjectPart::runArguments() const { return DomUtil::readEntry(*projectDom(), "/kdevpascalproject/run/programargs"); } -QString PascalProjectPart::mainSource() const +TQString PascalProjectPart::mainSource() const { return projectDirectory() + "/" + m_mainSource; } -void PascalProjectPart::setMainSource(QString fullPath) +void PascalProjectPart::setMainSource(TQString fullPath) { - QString olddir = activeDirectory(); - m_mainSource = fullPath.replace(QRegExp(QString(projectDirectory() + QString("/"))),""); + TQString olddir = activeDirectory(); + m_mainSource = fullPath.replace(TQRegExp(TQString(projectDirectory() + TQString("/"))),""); emit activeDirectoryChanged( olddir, activeDirectory() ); } -QString PascalProjectPart::projectDirectory() const +TQString PascalProjectPart::projectDirectory() const { return m_projectDir; } -QString PascalProjectPart::projectName() const +TQString PascalProjectPart::projectName() const { return m_projectName; } -QString PascalProjectPart::activeDirectory() const +TQString PascalProjectPart::activeDirectory() const { - QFileInfo fi(mainSource()); - return fi.dirPath(true).replace(QRegExp(projectDirectory()),""); + TQFileInfo fi(mainSource()); + return fi.dirPath(true).replace(TQRegExp(projectDirectory()),""); } -QString PascalProjectPart::buildDirectory() const +TQString PascalProjectPart::buildDirectory() const { - QFileInfo fi(mainSource()); + TQFileInfo fi(mainSource()); return fi.dirPath(true); } -void PascalProjectPart::listOfFiles(QStringList &result, QString path) const +void PascalProjectPart::listOfFiles(TQStringList &result, TQString path) const { - QDir d(path); + TQDir d(path); if (!d.exists()) return; - QFileInfoList *entries = const_cast<QFileInfoList*>(d.entryInfoList(QDir::Dirs | QDir::Files | QDir::Hidden)); - for (QFileInfo *it = entries->first(); it; it = entries->next()) + QFileInfoList *entries = const_cast<QFileInfoList*>(d.entryInfoList(TQDir::Dirs | TQDir::Files | TQDir::Hidden)); + for (TQFileInfo *it = entries->first(); it; it = entries->next()) { if ((it->isDir()) && (it->filePath() != path)) { @@ -303,9 +303,9 @@ void PascalProjectPart::listOfFiles(QStringList &result, QString path) const } } -QStringList PascalProjectPart::allFiles() const +TQStringList PascalProjectPart::allFiles() const { -// QStringList files; +// TQStringList files; // listOfFiles(files, projectDirectory()); @@ -313,19 +313,19 @@ QStringList PascalProjectPart::allFiles() const return m_sourceFiles; } -void PascalProjectPart::addFile(const QString& /*fileName*/) +void PascalProjectPart::addFile(const TQString& /*fileName*/) { } -void PascalProjectPart::addFiles(const QStringList& /*fileList*/) +void PascalProjectPart::addFiles(const TQStringList& /*fileList*/) { } -void PascalProjectPart::removeFile(const QString& /*fileName*/) +void PascalProjectPart::removeFile(const TQString& /*fileName*/) { } -void PascalProjectPart::removeFiles(const QStringList& /*fileList*/) +void PascalProjectPart::removeFiles(const TQStringList& /*fileList*/) { } @@ -334,7 +334,7 @@ void PascalProjectPart::slotBuild() if (partController()->saveAllFiles()==false) return; //user cancelled - QString cmdline = m_compilerExec + " " + m_compilerOpts + " "; + TQString cmdline = m_compilerExec + " " + m_compilerOpts + " "; if (cmdline.isEmpty()) { @@ -342,10 +342,10 @@ void PascalProjectPart::slotBuild() return; } - QFileInfo fi(mainSource()); + TQFileInfo fi(mainSource()); cmdline += fi.fileName(); - QString dircmd = "cd "; + TQString dircmd = "cd "; dircmd += KProcess::quote(buildDirectory()); dircmd += " && "; @@ -356,7 +356,7 @@ void PascalProjectPart::slotExecute() { partController()->saveAllFiles(); - QDomDocument &dom = *(projectDom()); + TQDomDocument &dom = *(projectDom()); bool runInTerminal = DomUtil::readBoolEntry(dom, "/kdevpascalproject/run/terminal", true); // Get the run environment variables pairs into the environstr string @@ -366,7 +366,7 @@ void PascalProjectPart::slotExecute() DomUtil::PairList envvars = DomUtil::readPairListEntry(*projectDom(), "/kdevpascalproject/run/envvars", "envvar", "name", "value"); - QString environstr; + TQString environstr; DomUtil::PairList::ConstIterator it; for (it = envvars.begin(); it != envvars.end(); ++it) { environstr += (*it).first; @@ -375,50 +375,50 @@ void PascalProjectPart::slotExecute() environstr += " "; } - QString program = mainProgram(); + TQString program = mainProgram(); program.prepend(environstr); program += " " + DomUtil::readEntry(*projectDom(), "/kdevpascalproject/run/programargs"); appFrontend()->startAppCommand(buildDirectory(), program, runInTerminal); } -void PascalProjectPart::changedFiles( const QStringList & fileList ) +void PascalProjectPart::changedFiles( const TQStringList & fileList ) { KDevProject::changedFiles(fileList); } -void PascalProjectPart::changedFile( const QString & fileName ) +void PascalProjectPart::changedFile( const TQString & fileName ) { KDevProject::changedFile(fileName); } void PascalProjectPart::projectConfigWidget( KDialogBase * dlg ) { - QVBox *vbox; + TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Pascal Compiler")); PascalProjectOptionsDlg *w = new PascalProjectOptionsDlg(this, vbox); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); - connect( dlg, SIGNAL(okClicked()), this, SLOT(loadProjectConfig()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(loadProjectConfig()) ); vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "make", KIcon::SizeMedium )); RunOptionsWidget *w3 = new RunOptionsWidget(*projectDom(), "/kdevpascalproject", buildDirectory(), vbox); - connect( dlg, SIGNAL(okClicked()), w3, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w3, TQT_SLOT(accept()) ); } void PascalProjectPart::loadProjectConfig( ) { - QDomDocument &dom = *(projectDom()); + TQDomDocument &dom = *(projectDom()); - QString config = DomUtil::readEntry(dom, "/kdevpascalproject/general/useconfiguration", "default"); - m_mainSource = DomUtil::readEntry(dom, QString("/kdevpascalproject/configurations/") + config + QString("/mainsource") ); - m_compilerOpts = DomUtil::readEntry(dom, QString("/kdevpascalproject/configurations/") + config + QString("/compileroptions")); - m_compilerExec = DomUtil::readEntry(dom, QString("/kdevpascalproject/configurations/") + config + QString("/compilerexec")); + TQString config = DomUtil::readEntry(dom, "/kdevpascalproject/general/useconfiguration", "default"); + m_mainSource = DomUtil::readEntry(dom, TQString("/kdevpascalproject/configurations/") + config + TQString("/mainsource") ); + m_compilerOpts = DomUtil::readEntry(dom, TQString("/kdevpascalproject/configurations/") + config + TQString("/compileroptions")); + m_compilerExec = DomUtil::readEntry(dom, TQString("/kdevpascalproject/configurations/") + config + TQString("/compilerexec")); if (m_compilerExec.isEmpty()) { KTrader::OfferList offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Pascal'"); - QValueList<KService::Ptr>::ConstIterator it; + TQValueList<KService::Ptr>::ConstIterator it; for (it = offers.begin(); it != offers.end(); ++it) { if ((*it)->property("X-KDevelop-Default").toBool()) { m_compilerExec = (*it)->exec(); @@ -430,13 +430,13 @@ void PascalProjectPart::loadProjectConfig( ) void PascalProjectPart::configWidget( KDialogBase * dlg ) { - QVBox *vbox; + TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Pascal Compiler")); PascalGlobalOptionsDlg *w = new PascalGlobalOptionsDlg(this, vbox); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } -KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const QString &name) +KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &name) { KService::Ptr service = KService::serviceByDesktopName(name); if (!service) { @@ -444,20 +444,20 @@ KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const QString &nam return 0; } - KLibFactory *factory = KLibLoader::self()->factory(QFile::encodeName(service->library())); + KLibFactory *factory = KLibLoader::self()->factory(TQFile::encodeName(service->library())); if (!factory) { - QString errorMessage = KLibLoader::self()->lastErrorMessage(); + TQString errorMessage = KLibLoader::self()->lastErrorMessage(); KMessageBox::error(0, i18n("There was an error loading the module %1.\n" "The diagnostics is:\n%2").arg(service->name()).arg(errorMessage)); exit(1); } - QStringList args; - QVariant prop = service->property("X-KDevelop-Args"); + TQStringList args; + TQVariant prop = service->property("X-KDevelop-Args"); if (prop.isValid()) - args = QStringList::split(" ", prop.toString()); + args = TQStringList::split(" ", prop.toString()); - QObject *obj = factory->create(this, service->name().latin1(), + TQObject *obj = factory->create(this, service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) { @@ -469,7 +469,7 @@ KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const QString &nam return dlg; } -QString PascalProjectPart::defaultOptions( const QString compiler ) const +TQString PascalProjectPart::defaultOptions( const TQString compiler ) const { KConfig *config = KGlobal::config(); config->setGroup("Pascal Compiler"); @@ -482,12 +482,12 @@ QString PascalProjectPart::defaultOptions( const QString compiler ) const /*! \fn PascalProjectPart::distFiles() const */ -QStringList PascalProjectPart::distFiles() const +TQStringList PascalProjectPart::distFiles() const { - QStringList sourceList = allFiles(); + TQStringList sourceList = allFiles(); // Scan current source directory for any .pro files. - QString projectDir = projectDirectory(); - QDir dir(projectDir); - QStringList files = dir.entryList( "Makefile"); + TQString projectDir = projectDirectory(); + TQDir dir(projectDir); + TQStringList files = dir.entryList( "Makefile"); return sourceList + files; } diff --git a/buildtools/pascal/pascalproject_part.h b/buildtools/pascal/pascalproject_part.h index 3273011d..944250e4 100644 --- a/buildtools/pascal/pascalproject_part.h +++ b/buildtools/pascal/pascalproject_part.h @@ -11,7 +11,7 @@ #ifndef __KDEVPART_PASCALPROJECT_H__ #define __KDEVPART_PASCALPROJECT_H__ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include "kdevbuildtool.h" @@ -23,47 +23,47 @@ class PascalProjectPart : public KDevBuildTool { Q_OBJECT public: - PascalProjectPart(QObject *parent, const char *name, const QStringList &); + PascalProjectPart(TQObject *parent, const char *name, const TQStringList &); ~PascalProjectPart(); - virtual void openProject(const QString &dirName, const QString &projectName); + virtual void openProject(const TQString &dirName, const TQString &projectName); virtual void closeProject(); /**Returns the name of the main source file without extension. All pascal compilers call the binary by that way*/ - virtual QString mainProgram() const; + virtual TQString mainProgram() const; /**Main source file (like src/main.pp)*/ - virtual QString mainSource() const; - virtual void setMainSource(QString fullPath); + virtual TQString mainSource() const; + virtual void setMainSource(TQString fullPath); - virtual QString projectDirectory() const; - virtual QString projectName() const; - virtual QString activeDirectory() const; + virtual TQString projectDirectory() const; + virtual TQString projectName() const; + virtual TQString activeDirectory() const; /**The location of the main source file*/ - virtual QString buildDirectory() const; - virtual QString runDirectory() const; - virtual QString debugArguments() const; - virtual QString runArguments() const; + virtual TQString buildDirectory() const; + virtual TQString runDirectory() const; + virtual TQString debugArguments() const; + virtual TQString runArguments() const; virtual DomUtil::PairList runEnvironmentVars() const; /**Returns everything in the project directory*/ - virtual QStringList allFiles() const; + virtual TQStringList allFiles() const; /**This does absolutelly nothing*/ - virtual void addFile(const QString &fileName); + virtual void addFile(const TQString &fileName); /**This does absolutelly nothing*/ - virtual void addFiles(const QStringList &fileList); + virtual void addFiles(const TQStringList &fileList); /**This does absolutelly nothing*/ - virtual void removeFile(const QString &fileName); + virtual void removeFile(const TQString &fileName); /**This does absolutelly nothing*/ - virtual void removeFiles(const QStringList &fileList); + virtual void removeFiles(const TQStringList &fileList); - virtual void changedFiles( const QStringList & fileList ); - virtual void changedFile( const QString & fileName ); + virtual void changedFiles( const TQStringList & fileList ); + virtual void changedFile( const TQString & fileName ); - KDevCompilerOptions *createCompilerOptions(const QString &name); + KDevCompilerOptions *createCompilerOptions(const TQString &name); - virtual QString defaultOptions(const QString compiler) const; - QStringList distFiles() const; + virtual TQString defaultOptions(const TQString compiler) const; + TQStringList distFiles() const; public slots: /**loads config from project file*/ @@ -76,20 +76,20 @@ private slots: void configWidget(KDialogBase *dlg); private: - QGuardedPtr<PascalProjectWidget> m_widget; + TQGuardedPtr<PascalProjectWidget> m_widget; - void listOfFiles(QStringList &result, QString path) const; + void listOfFiles(TQStringList &result, TQString path) const; - QString m_buildDir; - QString m_projectDir; - QString m_projectName; + TQString m_buildDir; + TQString m_projectDir; + TQString m_projectName; - QString m_mainProg; - QString m_mainSource; - QString m_compilerExec; - QString m_compilerOpts; + TQString m_mainProg; + TQString m_mainSource; + TQString m_compilerExec; + TQString m_compilerOpts; - QStringList m_sourceFiles; + TQStringList m_sourceFiles; }; #endif diff --git a/buildtools/pascal/pascalproject_widget.cpp b/buildtools/pascal/pascalproject_widget.cpp index 039c97e6..9e0c533c 100644 --- a/buildtools/pascal/pascalproject_widget.cpp +++ b/buildtools/pascal/pascalproject_widget.cpp @@ -12,7 +12,7 @@ PascalProjectWidget::PascalProjectWidget(PascalProjectPart *part) - : QWidget(0, "PascalProject widget") + : TQWidget(0, "PascalProject widget") { Q_UNUSED( part ); } diff --git a/buildtools/pascal/pascalproject_widget.h b/buildtools/pascal/pascalproject_widget.h index 198cf794..bfd9c328 100644 --- a/buildtools/pascal/pascalproject_widget.h +++ b/buildtools/pascal/pascalproject_widget.h @@ -2,8 +2,8 @@ #define __PASCALPROJECT_WIDGET_H__ -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> class KDevProject; diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp index 7a97cea3..6bbff084 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.cpp +++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp @@ -14,10 +14,10 @@ #include <kmessagebox.h> #include <klocale.h> -#include <qlineedit.h> -#include <qcombobox.h> -#include <qregexp.h> -#include <qvalidator.h> +#include <tqlineedit.h> +#include <tqcombobox.h> +#include <tqregexp.h> +#include <tqvalidator.h> #include "domutil.h" #include "kdevcompileroptions.h" @@ -26,10 +26,10 @@ #include "pascalproject_part.h" #include "pascalprojectoptionsdlg.h" -PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, QWidget* parent, const char* name, WFlags fl) +PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* parent, const char* name, WFlags fl) : PascalProjectOptionsDlgBase(parent,name, fl), m_part(part) { - config_combo->setValidator(new QRegExpValidator(QRegExp("^\\D.*"), this)); + config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Pascal'"); @@ -43,8 +43,8 @@ PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, QWidge dirty = false; - QDomDocument &dom = *(m_part->projectDom()); - currentConfig = QString::null; + TQDomDocument &dom = *(m_part->projectDom()); + currentConfig = TQString::null; configChanged(DomUtil::readEntry(dom, "/kdevpascalproject/general/useconfiguration", "default")); } @@ -52,17 +52,17 @@ PascalProjectOptionsDlg::~PascalProjectOptionsDlg() { } -QStringList PascalProjectOptionsDlg::allBuildConfigs() +TQStringList PascalProjectOptionsDlg::allBuildConfigs() { - QDomDocument &dom = *(m_part->projectDom()); + TQDomDocument &dom = *(m_part->projectDom()); - QStringList allConfigs; + TQStringList allConfigs; allConfigs.append("default"); - QDomNode node = dom.documentElement().namedItem("kdevpascalproject").namedItem("configurations"); - QDomElement childEl = node.firstChild().toElement(); + TQDomNode node = dom.documentElement().namedItem("kdevpascalproject").namedItem("configurations"); + TQDomElement childEl = node.firstChild().toElement(); while (!childEl.isNull()) { - QString config = childEl.tagName(); + TQString config = childEl.tagName(); kdDebug() << "Found config " << config << endl; if (config != "default") allConfigs.append(config); @@ -81,35 +81,35 @@ void PascalProjectOptionsDlg::accept() } } -void PascalProjectOptionsDlg::compiler_box_activated( const QString& /*s*/ ) +void PascalProjectOptionsDlg::compiler_box_activated( const TQString& /*s*/ ) { - QString exec = ServiceComboBox::currentText(compiler_box, service_execs); + TQString exec = ServiceComboBox::currentText(compiler_box, service_execs); exec_edit->setText(exec); } -void PascalProjectOptionsDlg::saveConfig( QString config ) +void PascalProjectOptionsDlg::saveConfig( TQString config ) { - QDomDocument dom = *m_part->projectDom(); - QString prefix = "/kdevpascalproject/configurations/" + config + "/"; + TQDomDocument dom = *m_part->projectDom(); + TQString prefix = "/kdevpascalproject/configurations/" + config + "/"; DomUtil::writeEntry(dom, prefix + "compiler", ServiceComboBox::currentText(compiler_box, service_names)); DomUtil::writeEntry(dom, prefix + "compileroptions", options_edit->text()); DomUtil::writeEntry(dom, prefix + "compilerexec", exec_edit->text()); - DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().replace(QRegExp(m_part->projectDirectory() + QString("/")),"")); + DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().replace(TQRegExp(m_part->projectDirectory() + TQString("/")),"")); } -void PascalProjectOptionsDlg::readConfig( QString config ) +void PascalProjectOptionsDlg::readConfig( TQString config ) { - QDomDocument dom = *m_part->projectDom(); - QString prefix = "/kdevpascalproject/configurations/" + config + "/"; + TQDomDocument dom = *m_part->projectDom(); + TQString prefix = "/kdevpascalproject/configurations/" + config + "/"; - QString compiler = DomUtil::readEntry(dom, prefix + "compiler", ""); + TQString compiler = DomUtil::readEntry(dom, prefix + "compiler", ""); if (compiler.isEmpty()) { offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Pascal'"); - QValueList<KService::Ptr>::ConstIterator it; + TQValueList<KService::Ptr>::ConstIterator it; for (it = offers.begin(); it != offers.end(); ++it) { if ((*it)->property("X-KDevelop-Default").toBool()) { compiler = (*it)->name(); @@ -120,7 +120,7 @@ void PascalProjectOptionsDlg::readConfig( QString config ) } ServiceComboBox::setCurrentText(compiler_box, compiler, service_names); - QString exec = DomUtil::readEntry(dom, prefix + "compilerexec", ""); + TQString exec = DomUtil::readEntry(dom, prefix + "compilerexec", ""); if (exec.isEmpty()) exec = ServiceComboBox::currentText(compiler_box, service_execs); exec_edit->setText(exec); @@ -128,7 +128,7 @@ void PascalProjectOptionsDlg::readConfig( QString config ) mainSourceUrl->setURL(m_part->projectDirectory() + "/" + DomUtil::readEntry(dom, prefix + "mainsource")); } -void PascalProjectOptionsDlg::configComboTextChanged(const QString &config) +void PascalProjectOptionsDlg::configComboTextChanged(const TQString &config) { bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty(); bool canRemove = allConfigs.contains(config) && config != "default"; @@ -137,7 +137,7 @@ void PascalProjectOptionsDlg::configComboTextChanged(const QString &config) } -void PascalProjectOptionsDlg::configChanged(const QString &config) +void PascalProjectOptionsDlg::configChanged(const TQString &config) { if (config == currentConfig || !allConfigs.contains(config)) return; @@ -157,7 +157,7 @@ void PascalProjectOptionsDlg::configChanged(const QString &config) void PascalProjectOptionsDlg::configAdded() { - QString config = config_combo->currentText(); + TQString config = config_combo->currentText(); allConfigs.append(config); @@ -170,27 +170,27 @@ void PascalProjectOptionsDlg::configAdded() void PascalProjectOptionsDlg::configRemoved() { - QString config = config_combo->currentText(); + TQString config = config_combo->currentText(); - QDomDocument dom = *m_part->projectDom(); - QDomNode node = dom.documentElement().namedItem("kdevpascalproject").namedItem("configurations"); + TQDomDocument dom = *m_part->projectDom(); + TQDomNode node = dom.documentElement().namedItem("kdevpascalproject").namedItem("configurations"); node.removeChild(node.namedItem(config)); allConfigs.remove(config); config_combo->clear(); config_combo->insertStringList(allConfigs); - currentConfig = QString::null; + currentConfig = TQString::null; configChanged("default"); } void PascalProjectOptionsDlg::optionsButtonClicked( ) { - QString name = ServiceComboBox::currentText(compiler_box, service_names); + TQString name = ServiceComboBox::currentText(compiler_box, service_names); KDevCompilerOptions *plugin = m_part->createCompilerOptions(name); if (plugin) { - QString flags = plugin->exec(this, options_edit->text()); + TQString flags = plugin->exec(this, options_edit->text()); options_edit->setText(flags); delete plugin; } diff --git a/buildtools/pascal/pascalprojectoptionsdlg.h b/buildtools/pascal/pascalprojectoptionsdlg.h index 70e911de..6e483338 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.h +++ b/buildtools/pascal/pascalprojectoptionsdlg.h @@ -23,16 +23,16 @@ class PascalProjectOptionsDlg : public PascalProjectOptionsDlgBase Q_OBJECT public: - PascalProjectOptionsDlg(PascalProjectPart *part, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~PascalProjectOptionsDlg(); public slots: virtual void accept(); protected slots: - virtual void compiler_box_activated(const QString &s); - void configComboTextChanged(const QString &config); - void configChanged(const QString &config); + virtual void compiler_box_activated(const TQString &s); + void configComboTextChanged(const TQString &config); + void configChanged(const TQString &config); void configAdded(); void configRemoved(); void optionsButtonClicked(); @@ -40,19 +40,19 @@ protected slots: void setDefaultOptions(); private: - QStringList allConfigs; - QString currentConfig; + TQStringList allConfigs; + TQString currentConfig; bool dirty; KTrader::OfferList offers; - QStringList service_names; - QStringList service_execs; + TQStringList service_names; + TQStringList service_execs; PascalProjectPart *m_part; - void saveConfig(QString config); - void readConfig(QString config); - QStringList allBuildConfigs(); + void saveConfig(TQString config); + void readConfig(TQString config); + TQStringList allBuildConfigs(); }; #endif diff --git a/buildtools/pascal/service.cpp b/buildtools/pascal/service.cpp index c678f916..ea3846b2 100644 --- a/buildtools/pascal/service.cpp +++ b/buildtools/pascal/service.cpp @@ -10,8 +10,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include <qcombobox.h> -#include <qvaluelist.h> +#include <tqcombobox.h> +#include <tqvaluelist.h> #include <kservice.h> #include <kdebug.h> @@ -19,10 +19,10 @@ #include "service.h" -void ServiceComboBox::insertStringList(QComboBox *combo, const QValueList<KService::Ptr> &list, - QStringList *names, QStringList *execs) +void ServiceComboBox::insertStringList(TQComboBox *combo, const TQValueList<KService::Ptr> &list, + TQStringList *names, TQStringList *execs) { - QValueList<KService::Ptr>::ConstIterator it; + TQValueList<KService::Ptr>::ConstIterator it; for (it = list.begin(); it != list.end(); ++it) { combo->insertItem((*it)->comment()); (*names) << (*it)->desktopEntryName(); @@ -31,16 +31,16 @@ void ServiceComboBox::insertStringList(QComboBox *combo, const QValueList<KServi } } -QString ServiceComboBox::currentText(QComboBox *combo, const QStringList &names) +TQString ServiceComboBox::currentText(TQComboBox *combo, const TQStringList &names) { if (combo->currentItem() == -1) - return QString::null; + return TQString::null; return names[combo->currentItem()]; } -void ServiceComboBox::setCurrentText(QComboBox *combo, const QString &str, const QStringList &names) +void ServiceComboBox::setCurrentText(TQComboBox *combo, const TQString &str, const TQStringList &names) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; int i = 0; for (it = names.begin(); it != names.end(); ++it) { if (*it == str) { @@ -51,9 +51,9 @@ void ServiceComboBox::setCurrentText(QComboBox *combo, const QString &str, const } } -int ServiceComboBox::itemForText(const QString &str, const QStringList &names) +int ServiceComboBox::itemForText(const TQString &str, const TQStringList &names) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; int i = 0; for (it = names.begin(); it != names.end(); ++it) { if (*it == str) { @@ -64,10 +64,10 @@ int ServiceComboBox::itemForText(const QString &str, const QStringList &names) return 0; } -QString ServiceComboBox::defaultCompiler() +TQString ServiceComboBox::defaultCompiler() { KTrader::OfferList offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Pascal'"); - QValueList<KService::Ptr>::ConstIterator it; + TQValueList<KService::Ptr>::ConstIterator it; for (it = offers.begin(); it != offers.end(); ++it) { if ((*it)->property("X-KDevelop-Default").toBool()) { return (*it)->name();; diff --git a/buildtools/pascal/service.h b/buildtools/pascal/service.h index 30bb142b..26c302fd 100644 --- a/buildtools/pascal/service.h +++ b/buildtools/pascal/service.h @@ -18,12 +18,12 @@ class ServiceComboBox { public: - static void insertStringList(QComboBox *combo, const QValueList<KService::Ptr> &list, - QStringList *names, QStringList *execs); - static QString currentText(QComboBox *combo, const QStringList &names); - static void setCurrentText(QComboBox *combo, const QString &str, const QStringList &names); - static int itemForText(const QString &str, const QStringList &names); - static QString defaultCompiler(); + static void insertStringList(TQComboBox *combo, const TQValueList<KService::Ptr> &list, + TQStringList *names, TQStringList *execs); + static TQString currentText(TQComboBox *combo, const TQStringList &names); + static void setCurrentText(TQComboBox *combo, const TQString &str, const TQStringList &names); + static int itemForText(const TQString &str, const TQStringList &names); + static TQString defaultCompiler(); }; #endif diff --git a/buildtools/qmake/choosesubprojectdlg.cpp b/buildtools/qmake/choosesubprojectdlg.cpp index 20264144..63da84f8 100644 --- a/buildtools/qmake/choosesubprojectdlg.cpp +++ b/buildtools/qmake/choosesubprojectdlg.cpp @@ -15,10 +15,10 @@ #include "choosesubprojectdlg.h" #include "scope.h" -ChooseSubprojectDlg::ChooseSubprojectDlg(TrollProjectWidget *widget, QWidget* parent, const char* name, bool modal, WFlags fl) +ChooseSubprojectDlg::ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* parent, const char* name, bool modal, WFlags fl) : ChooseSubprojectDlgBase(parent,name, modal,fl), m_widget(widget) { - connect(subprojects_view, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(itemSelected(QListViewItem *))); + connect(subprojects_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(itemSelected(TQListViewItem *))); if( m_widget->m_rootSubproject) { ChooseItem *it = new ChooseItem(m_widget->m_rootSubproject, subprojects_view, m_widget->m_rootSubproject->text(0)); @@ -44,15 +44,15 @@ void ChooseSubprojectDlg::accept() if ( item->subproject()->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) return; - QDialog::accept(); + TQDialog::accept(); } -ChooseItem::ChooseItem( QMakeScopeItem * spitem, QListViewItem * parent, QString text ) +ChooseItem::ChooseItem( QMakeScopeItem * spitem, TQListViewItem * parent, TQString text ) :KListViewItem(parent, text), m_spitem(spitem) { } -ChooseItem::ChooseItem( QMakeScopeItem * spitem, QListView * parent, QString text ) +ChooseItem::ChooseItem( QMakeScopeItem * spitem, TQListView * parent, TQString text ) :KListViewItem(parent, text), m_spitem(spitem) { } @@ -67,7 +67,7 @@ void ChooseSubprojectDlg::fillSubprojectsView( ChooseItem *item ) if (!item->subproject()) return; - QListViewItem * sub_spitem = item->subproject()->firstChild(); + TQListViewItem * sub_spitem = item->subproject()->firstChild(); while( sub_spitem ) { QMakeScopeItem *spitem = dynamic_cast<QMakeScopeItem *>(sub_spitem); if ( spitem && spitem->scope->scopeType() == Scope::ProjectScope ) @@ -82,7 +82,7 @@ void ChooseSubprojectDlg::fillSubprojectsView( ChooseItem *item ) } } -void ChooseSubprojectDlg::itemSelected( QListViewItem * it ) +void ChooseSubprojectDlg::itemSelected( TQListViewItem * it ) { if (!it) return; diff --git a/buildtools/qmake/choosesubprojectdlg.h b/buildtools/qmake/choosesubprojectdlg.h index 689fe8b3..2101d3cd 100644 --- a/buildtools/qmake/choosesubprojectdlg.h +++ b/buildtools/qmake/choosesubprojectdlg.h @@ -22,8 +22,8 @@ class TrollProjectWidget; class ChooseItem: public KListViewItem { public: - ChooseItem(QMakeScopeItem *spitem, QListViewItem *parent, QString text); - ChooseItem(QMakeScopeItem *spitem, QListView *parent, QString text); + ChooseItem(QMakeScopeItem *spitem, TQListViewItem *parent, TQString text); + ChooseItem(QMakeScopeItem *spitem, TQListView *parent, TQString text); QMakeScopeItem *subproject(); @@ -36,7 +36,7 @@ class ChooseSubprojectDlg : public ChooseSubprojectDlgBase Q_OBJECT public: - ChooseSubprojectDlg(TrollProjectWidget *widget, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~ChooseSubprojectDlg(); /*$PUBLIC_FUNCTIONS$*/ @@ -52,7 +52,7 @@ protected: protected slots: /*$PROTECTED_SLOTS$*/ virtual void accept(); - virtual void itemSelected(QListViewItem *it); + virtual void itemSelected(TQListViewItem *it); private: void fillSubprojectsView(ChooseItem *item); diff --git a/buildtools/qmake/createscopedlg.cpp b/buildtools/qmake/createscopedlg.cpp index 439ddd70..4f65dd17 100644 --- a/buildtools/qmake/createscopedlg.cpp +++ b/buildtools/qmake/createscopedlg.cpp @@ -13,7 +13,7 @@ #include <klineedit.h> #include <kurlrequester.h> -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <kfile.h> #include <kcombobox.h> #include <kmessagebox.h> @@ -26,12 +26,12 @@ #include "scope.h" #include "trollprojectwidget.h" -CreateScopeDlg::CreateScopeDlg( QMakeScopeItem* item, QWidget* parent, const char* name, bool modal, WFlags fl ) +CreateScopeDlg::CreateScopeDlg( QMakeScopeItem* item, TQWidget* parent, const char* name, bool modal, WFlags fl ) : CreateScopeDlgBase( parent, name, modal, fl ), m_item( item ) { incUrl->setMode( KFile::File | KFile::LocalOnly ); incUrl->setCaption( i18n( "Choose existing .pri file or give a new filename for creation" ) ); - incUrl->setURL( QString("") ); + incUrl->setURL( TQString("") ); incUrl->completionObject() ->setDir( item->scope->projectDir() ); incUrl->fileDialog()->setURL( KURL::fromPathOrURL( item->scope->projectDir() ) ); } @@ -55,15 +55,15 @@ void CreateScopeDlg::accept() case 2: if ( !incUrl->url().isEmpty() ) { - QString file = incUrl->url(); + TQString file = incUrl->url(); if ( !incUrl->url().endsWith( ".pri" ) ) file += ".pri"; if( file.find("/") == -1 ) file = m_item->scope->projectDir()+"/"+file; // We need to create the file, because getRelativePath checks for existent paths - if( !QFile::exists(file) ) + if( !TQFile::exists(file) ) { - QFile temp(file); + TQFile temp(file); if( temp.open(IO_WriteOnly) ) temp.close(); } @@ -78,20 +78,20 @@ void CreateScopeDlg::accept() new QMakeScopeItem( m_item, s->scopeName(), s ); else { - QListViewItem* item = m_item->firstChild(); + TQListViewItem* item = m_item->firstChild(); while( item->nextSibling() ) item = item->nextSibling(); QMakeScopeItem* newitem = new QMakeScopeItem( m_item, s->scopeName(), s ); newitem->moveItem( item ); } - QDialog::accept(); + TQDialog::accept(); } else { if ( KMessageBox::warningYesNo( this, i18n( "You did not specify all needed information. " "The scope will not be created.<br>Do you want to abort the scope creation?" ), i18n( "Missing information" ) ) == KMessageBox:: Yes ) - QDialog::reject(); + TQDialog::reject(); } } diff --git a/buildtools/qmake/createscopedlg.h b/buildtools/qmake/createscopedlg.h index c8ed86ef..675143b1 100644 --- a/buildtools/qmake/createscopedlg.h +++ b/buildtools/qmake/createscopedlg.h @@ -22,7 +22,7 @@ class CreateScopeDlg : public CreateScopeDlgBase Q_OBJECT public: - CreateScopeDlg( QMakeScopeItem* item, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CreateScopeDlg( QMakeScopeItem* item, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~CreateScopeDlg(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/buildtools/qmake/disablesubprojectdlg.cpp b/buildtools/qmake/disablesubprojectdlg.cpp index 335bf33f..c05c70c9 100644 --- a/buildtools/qmake/disablesubprojectdlg.cpp +++ b/buildtools/qmake/disablesubprojectdlg.cpp @@ -11,16 +11,16 @@ #include "disablesubprojectdlg.h" #include <klistview.h> -#include <qstringlist.h> +#include <tqstringlist.h> #include "scope.h" #include "qmakescopeitem.h" -DisableSubprojectDlg::DisableSubprojectDlg( const QStringList& projects, QWidget* parent, const char* name, WFlags fl ) +DisableSubprojectDlg::DisableSubprojectDlg( const TQStringList& projects, TQWidget* parent, const char* name, WFlags fl ) : DisableSubprojectDlgBase( parent, name, fl ) { - for( QStringList::const_iterator it = projects.begin(); it != projects.end(); ++it ) + for( TQStringList::const_iterator it = projects.begin(); it != projects.end(); ++it ) { - new QCheckListItem(subprojects_view, *it, QCheckListItem::CheckBox); + new TQCheckListItem(subprojects_view, *it, TQCheckListItem::CheckBox); } } @@ -28,13 +28,13 @@ DisableSubprojectDlg::~DisableSubprojectDlg() { } -QStringList DisableSubprojectDlg::selectedProjects() +TQStringList DisableSubprojectDlg::selectedProjects() { - QStringList result; - QListViewItem* item = subprojects_view->firstChild(); + TQStringList result; + TQListViewItem* item = subprojects_view->firstChild(); while( item ) { - QCheckListItem* ci = dynamic_cast<QCheckListItem*>(item); + TQCheckListItem* ci = dynamic_cast<TQCheckListItem*>(item); if( ci && ci->isOn() ) { result << ci->text(0); diff --git a/buildtools/qmake/disablesubprojectdlg.h b/buildtools/qmake/disablesubprojectdlg.h index 13a27468..00602f28 100644 --- a/buildtools/qmake/disablesubprojectdlg.h +++ b/buildtools/qmake/disablesubprojectdlg.h @@ -19,11 +19,11 @@ class DisableSubprojectDlg : public DisableSubprojectDlgBase Q_OBJECT public: - DisableSubprojectDlg( const QStringList& projects, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + DisableSubprojectDlg( const TQStringList& projects, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~DisableSubprojectDlg(); /*$PUBLIC_FUNCTIONS$*/ - QStringList selectedProjects(); + TQStringList selectedProjects(); public slots: /*$PUBLIC_SLOTS$*/ diff --git a/buildtools/qmake/newwidgetdlg.cpp b/buildtools/qmake/newwidgetdlg.cpp index 7be62acd..44dd7588 100644 --- a/buildtools/qmake/newwidgetdlg.cpp +++ b/buildtools/qmake/newwidgetdlg.cpp @@ -10,22 +10,22 @@ ***************************************************************************/ #include "newwidgetdlg.h" -#include <qradiobutton.h> -#include <qstringlist.h> -#include <qcheckbox.h> -#include <qmessagebox.h> +#include <tqradiobutton.h> +#include <tqstringlist.h> +#include <tqcheckbox.h> +#include <tqmessagebox.h> #include <kfiledialog.h> #include <klineedit.h> #include <kpushbutton.h> #include <domutil.h> -#include <qdom.h> +#include <tqdom.h> #include <kstdguiitem.h> #define WIDGET_CAPTION_NAME "widget/property|name=caption/string" #define WIDGET_CLASS_NAME "class" #define WIDGET_SLOTS "slots" -NewWidgetDlg::NewWidgetDlg(QStringList &newFileNames,QWidget* parent, const char* name, bool modal, WFlags fl) +NewWidgetDlg::NewWidgetDlg(TQStringList &newFileNames,TQWidget* parent, const char* name, bool modal, WFlags fl) : NewWidgetDlgBase(parent,name,modal,fl), m_newFileNames(newFileNames) //================================================= @@ -45,34 +45,34 @@ NewWidgetDlg::~NewWidgetDlg() void NewWidgetDlg::subclassingPressed() //===================================== { - QMessageBox::information(0,"subclassing",""); + TQMessageBox::information(0,"subclassing",""); } void NewWidgetDlg::templateSelChanged() //===================================== { - QMessageBox::information(0,"template",""); + TQMessageBox::information(0,"template",""); } void NewWidgetDlg::accept() //========================= { - QDomDocument doc; + TQDomDocument doc; DomUtil::openDOMFile(doc,"/home/jsgaarde/programming/kdevelop/domapp/clean_dialog.ui"); DomUtil::replaceText(doc,WIDGET_CLASS_NAME,"TestClass"); DomUtil::replaceText(doc,WIDGET_CAPTION_NAME,"Test Dialog"); - QDomElement slotsElem = DomUtil::elementByPathExt(doc,WIDGET_SLOTS); - QDomNodeList slotnodes = slotsElem.childNodes(); + TQDomElement slotsElem = DomUtil::elementByPathExt(doc,WIDGET_SLOTS); + TQDomNodeList slotnodes = slotsElem.childNodes(); for (unsigned int i=0; i<slotnodes.count();i++) { - QString msg; - QDomElement slotelem = slotnodes.item(i).toElement(); + TQString msg; + TQDomElement slotelem = slotnodes.item(i).toElement(); msg.sprintf("Slotname: %s\nReturns: %s\nAccess: %s", slotelem.text().ascii(), slotelem.attributeNode("returnType").value().ascii(), slotelem.attributeNode("access").value().ascii()); - QMessageBox::information(0,"Slots",msg); + TQMessageBox::information(0,"Slots",msg); } DomUtil::saveDOMFile(doc,"/home/jsgaarde/programming/kdevelop/domapp/clean_dialog2.ui"); NewWidgetDlgBase::accept(); diff --git a/buildtools/qmake/newwidgetdlg.h b/buildtools/qmake/newwidgetdlg.h index e8420df2..874b502f 100644 --- a/buildtools/qmake/newwidgetdlg.h +++ b/buildtools/qmake/newwidgetdlg.h @@ -21,7 +21,7 @@ class QDomDocument; class NewWidgetDlg : public NewWidgetDlgBase { public: - NewWidgetDlg(QStringList &newFileNames,QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + NewWidgetDlg(TQStringList &newFileNames,TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~NewWidgetDlg(); @@ -31,7 +31,7 @@ public slots: virtual void accept(); protected: - QStringList &m_newFileNames; + TQStringList &m_newFileNames; }; #endif diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp index b76fc3a5..7c646e62 100644 --- a/buildtools/qmake/projectconfigurationdlg.cpp +++ b/buildtools/qmake/projectconfigurationdlg.cpp @@ -16,10 +16,10 @@ ***************************************************************************/ #include "projectconfigurationdlg.h" -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qmessagebox.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqmessagebox.h> #include <kfiledialog.h> #include <knotifyclient.h> #include <klineedit.h> @@ -31,15 +31,15 @@ #include <kiconloader.h> #include <ktextedit.h> -#include <qdialog.h> -#include <qpushbutton.h> -#include <qbuttongroup.h> -#include <qlistview.h> -#include <qlabel.h> +#include <tqdialog.h> +#include <tqpushbutton.h> +#include <tqbuttongroup.h> +#include <tqlistview.h> +#include <tqlabel.h> #include <iostream> -#include <qregexp.h> -#include <qvalidator.h> -#include <qtabwidget.h> +#include <tqregexp.h> +#include <tqvalidator.h> +#include <tqtabwidget.h> #include <kpushbutton.h> #include <kcombobox.h> #include <klocale.h> @@ -51,17 +51,17 @@ #include "scope.h" #include "urlutil.h" -InsideCheckListItem::InsideCheckListItem( QListView *parent, QMakeScopeItem *item, ProjectConfigurationDlg *config ) : - QCheckListItem( parent, item->relativePath().endsWith("/") ? item->relativePath().right( item->relativePath().length() - 1 ) : item->relativePath(), QCheckListItem::CheckBox ) +InsideCheckListItem::InsideCheckListItem( TQListView *parent, QMakeScopeItem *item, ProjectConfigurationDlg *config ) : + TQCheckListItem( parent, item->relativePath().endsWith("/") ? item->relativePath().right( item->relativePath().length() - 1 ) : item->relativePath(), TQCheckListItem::CheckBox ) { prjItem = item; m_config = config; } -InsideCheckListItem::InsideCheckListItem( QListView *parent, QListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config ) : - QCheckListItem( parent, +InsideCheckListItem::InsideCheckListItem( TQListView *parent, TQListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config ) : + TQCheckListItem( parent, after, - item->relativePath(), QCheckListItem::CheckBox ) + item->relativePath(), TQCheckListItem::CheckBox ) { prjItem = item; m_config = config; @@ -72,7 +72,7 @@ void InsideCheckListItem::stateChange( bool state ) { if ( listView() == m_config->insidelib_listview ) { - QListViewItemIterator it( m_config->intDeps_view ); + TQListViewItemIterator it( m_config->intDeps_view ); while ( it.current() ) { InsideCheckListItem * chi = dynamic_cast<InsideCheckListItem*>( it.current() ); @@ -84,7 +84,7 @@ void InsideCheckListItem::stateChange( bool state ) } } -CustomVarListItem::CustomVarListItem(QListView* parent, unsigned int id, QMap<QString, QString> var) +CustomVarListItem::CustomVarListItem(TQListView* parent, unsigned int id, TQMap<TQString, TQString> var) : KListViewItem(parent), m_key(id) { setText(0, var["var"]); @@ -92,21 +92,21 @@ CustomVarListItem::CustomVarListItem(QListView* parent, unsigned int id, QMap<QS setText(2, var["values"]); } -QString CustomVarListItem::key(int column, bool ascending) const +TQString CustomVarListItem::key(int column, bool ascending) const { if( column == 0) - return QString::number(m_key); + return TQString::number(m_key); return KListViewItem::key(column, ascending); } -ProjectConfigurationDlg::ProjectConfigurationDlg( QListView *_prjList, TrollProjectWidget* _prjWidget, QWidget* parent, const char* name, bool modal, WFlags fl ) +ProjectConfigurationDlg::ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* parent, const char* name, bool modal, WFlags fl ) : ProjectConfigurationDlgBase( parent, name, modal, fl | Qt::WStyle_Tool ), myProjectItem(0) { prjList = _prjList; prjWidget = _prjWidget; // m_projectConfiguration = conf; - m_targetLibraryVersion->setValidator( new QRegExpValidator( - QRegExp( "\\d+(\\.\\d+)?(\\.\\d+)" ), this ) ); + m_targetLibraryVersion->setValidator( new TQRegExpValidator( + TQRegExp( "\\d+(\\.\\d+)?(\\.\\d+)" ), this ) ); customVariables->setSortColumn(0); customVariables->setSortOrder(Qt::Ascending); mocdir_url->completionObject()->setMode(KURLCompletion::DirCompletion); @@ -170,7 +170,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) myProjectItem->scope->removeFromPlusOp( "CONFIG", "dll" ); myProjectItem->setPixmap( 0, SmallIcon( "qmake_app" ) ); - QString targetname = prjWidget->getCurrentOutputFilename(); + TQString targetname = prjWidget->getCurrentOutputFilename(); if( targetname.findRev("/") != -1 ) targetname = targetname.right( targetname.length() - targetname.findRev("/") - 1 ); DomUtil::writeEntry( *prjWidget->m_part->projectDom(), @@ -410,9 +410,9 @@ void ProjectConfigurationDlg::updateProjectConfiguration() myProjectItem->removeValue( "QT", "phonon" ); } - QStringList confValues = myProjectItem->scope->variableValues( "CONFIG" ); - QStringList extraValues = QStringList::split( " ", editConfigExtra->text() ); - for ( QStringList::iterator it = confValues.begin() ; it != confValues.end() ; ++it ) + TQStringList confValues = myProjectItem->scope->variableValues( "CONFIG" ); + TQStringList extraValues = TQStringList::split( " ", editConfigExtra->text() ); + for ( TQStringList::iterator it = confValues.begin() ; it != confValues.end() ; ++it ) { if ( Scope::KnownConfigValues.findIndex( *it ) == -1 && extraValues.findIndex( *it ) == -1 ) { @@ -420,51 +420,51 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } } - for ( QStringList::iterator it = extraValues.begin() ; it != extraValues.end() ; ++it ) + for ( TQStringList::iterator it = extraValues.begin() ; it != extraValues.end() ; ++it ) { if ( confValues.findIndex( *it ) == -1 ) myProjectItem->scope->addToPlusOp( "CONFIG", *it ); } - QString targetpath = m_targetPath->url(); -// if( !QFileInfo( targetpath ).isRelative() ) + TQString targetpath = m_targetPath->url(); +// if( !TQFileInfo( targetpath ).isRelative() ) // targetpath = URLUtil::getRelativePath( myProjectItem->scope->projectDir(), targetpath ); if( myProjectItem->scope->scopeType() == Scope::FunctionScope || myProjectItem->scope->scopeType() == Scope::SimpleScope ) { if( myProjectItem->scope->variableValues("TARGET").findIndex( m_targetOutputFile->text() ) == -1 ) - myProjectItem->scope->setEqualOp( "TARGET", QStringList( m_targetOutputFile->text() ) ); + myProjectItem->scope->setEqualOp( "TARGET", TQStringList( m_targetOutputFile->text() ) ); if( myProjectItem->scope->variableValues("DESTDIR").findIndex( targetpath ) == -1 ) - myProjectItem->scope->setEqualOp( "DESTDIR", QStringList( targetpath ) ); + myProjectItem->scope->setEqualOp( "DESTDIR", TQStringList( targetpath ) ); }else { - myProjectItem->scope->setEqualOp( "TARGET", QStringList( m_targetOutputFile->text() ) ); - myProjectItem->scope->setEqualOp( "DESTDIR", QStringList( targetpath ) ); + myProjectItem->scope->setEqualOp( "TARGET", TQStringList( m_targetOutputFile->text() ) ); + myProjectItem->scope->setEqualOp( "DESTDIR", TQStringList( targetpath ) ); } - myProjectItem->updateValues( "DEFINES", QStringList::split( " ", m_defines->text() ) ); - myProjectItem->updateValues( "QMAKE_CXXFLAGS_DEBUG", QStringList::split( " ", m_debugFlags->text() ) ); - myProjectItem->updateValues( "QMAKE_CXXFLAGS_RELEASE", QStringList::split( " ", m_releaseFlags->text() ) ); + myProjectItem->updateValues( "DEFINES", TQStringList::split( " ", m_defines->text() ) ); + myProjectItem->updateValues( "QMAKE_CXXFLAGS_DEBUG", TQStringList::split( " ", m_debugFlags->text() ) ); + myProjectItem->updateValues( "QMAKE_CXXFLAGS_RELEASE", TQStringList::split( " ", m_releaseFlags->text() ) ); //add selected includes - QStringList values; + TQStringList values; InsideCheckListItem *insideItem = ( InsideCheckListItem * ) insideinc_listview->firstChild(); while ( insideItem ) { if ( insideItem->isOn() ) { - QString tmpInc = insideItem->prjItem->getIncAddPath( myProjectItem->scope->projectDir() ); - tmpInc = QDir::cleanDirPath( tmpInc ); + TQString tmpInc = insideItem->prjItem->getIncAddPath( myProjectItem->scope->projectDir() ); + tmpInc = TQDir::cleanDirPath( tmpInc ); values << tmpInc; } insideItem = ( InsideCheckListItem* ) insideItem->itemBelow(); } - QCheckListItem *outsideItem = ( QCheckListItem * ) outsideinc_listview->firstChild(); + TQCheckListItem *outsideItem = ( TQCheckListItem * ) outsideinc_listview->firstChild(); while ( outsideItem ) { values << outsideItem->text( 0 ); - outsideItem = ( QCheckListItem* ) outsideItem->itemBelow(); + outsideItem = ( TQCheckListItem* ) outsideItem->itemBelow(); } // myProjectItem->removeValues( "INCLUDEPATH", values ); myProjectItem->updateValues( "INCLUDEPATH", values ); @@ -473,7 +473,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() if ( checkInstallTarget->isChecked() == true ) { myProjectItem->addValue( "INSTALLS", "target" ); - myProjectItem->scope->setEqualOp( "target.path", QStringList( m_InstallTargetPath->text() ) ); + myProjectItem->scope->setEqualOp( "target.path", TQStringList( m_InstallTargetPath->text() ) ); } else { @@ -482,12 +482,12 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } //makefile - myProjectItem->scope->setEqualOp( "MAKEFILE", QStringList( makefile_url->url() ) ); + myProjectItem->scope->setEqualOp( "MAKEFILE", TQStringList( makefile_url->url() ) ); //add libs to link values.clear(); - QStringList libPaths; + TQStringList libPaths; //inside libs to link insideItem = ( InsideCheckListItem * ) insidelib_listview->firstChild(); @@ -496,11 +496,11 @@ void ProjectConfigurationDlg::updateProjectConfiguration() if ( insideItem->isOn() ) { - QString tmpLib = insideItem->prjItem->getLibAddObject( myProjectItem->scope->projectDir() ); + TQString tmpLib = insideItem->prjItem->getLibAddObject( myProjectItem->scope->projectDir() ); if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) { //add path if shared lib is linked - QString tmpPath = insideItem->prjItem->getLibAddPath( + TQString tmpPath = insideItem->prjItem->getLibAddPath( myProjectItem->scope->projectDir() ); if ( tmpPath != "" ) { @@ -514,7 +514,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } //extra lib paths - QListViewItem *lvItem = outsidelibdir_listview->firstChild(); + TQListViewItem *lvItem = outsidelibdir_listview->firstChild(); while ( lvItem ) { values << ( "-L"+lvItem->text( 0 ) ); @@ -523,11 +523,11 @@ void ProjectConfigurationDlg::updateProjectConfiguration() //outside libs to link - outsideItem = ( QCheckListItem * ) outsidelib_listview->firstChild(); + outsideItem = ( TQCheckListItem * ) outsidelib_listview->firstChild(); while ( outsideItem ) { values << outsideItem->text( 0 ); - outsideItem = ( QCheckListItem* ) outsideItem->itemBelow(); + outsideItem = ( TQCheckListItem* ) outsideItem->itemBelow(); } @@ -537,7 +537,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() values.clear(); //external project dependencies - QListViewItem *depItem = extDeps_view->firstChild(); + TQListViewItem *depItem = extDeps_view->firstChild(); while ( depItem ) { values << depItem->text( 0 ); @@ -601,19 +601,19 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } // intermediate locations - myProjectItem->scope->setEqualOp( "OBJECTS_DIR", QStringList( objdir_url->url() ) ); - myProjectItem->scope->setEqualOp( "UI_DIR", QStringList( uidir_url->url() ) ); - myProjectItem->scope->setEqualOp( "MOC_DIR", QStringList( mocdir_url->url() ) ); - myProjectItem->scope->setEqualOp( "RCC_DIR", QStringList( rccdir_url->url() ) ); + myProjectItem->scope->setEqualOp( "OBJECTS_DIR", TQStringList( objdir_url->url() ) ); + myProjectItem->scope->setEqualOp( "UI_DIR", TQStringList( uidir_url->url() ) ); + myProjectItem->scope->setEqualOp( "MOC_DIR", TQStringList( mocdir_url->url() ) ); + myProjectItem->scope->setEqualOp( "RCC_DIR", TQStringList( rccdir_url->url() ) ); //CORBA - myProjectItem->scope->setEqualOp( "IDL_COMPILER", QStringList( idlCmdEdit->url() ) ); - myProjectItem->updateValues( "IDL_OPTIONS", QStringList::split( " ", idlCmdOptionsEdit->text() ) ); + myProjectItem->scope->setEqualOp( "IDL_COMPILER", TQStringList( idlCmdEdit->url() ) ); + myProjectItem->updateValues( "IDL_OPTIONS", TQStringList::split( " ", idlCmdOptionsEdit->text() ) ); - QListViewItemIterator iter(customVariables); + TQListViewItemIterator iter(customVariables); for( ; iter.current() ; iter++ ) { - QListViewItem* item = iter.current(); + TQListViewItem* item = iter.current(); myProjectItem->scope->updateCustomVariable( item->key(0, true).toUInt(), item->text(0), item->text(1), item->text(2) ); } } @@ -623,13 +623,13 @@ void ProjectConfigurationDlg::accept() if( buttonApply->isEnabled() ) apply(); myProjectItem = 0; - QDialog::accept(); + TQDialog::accept(); } void ProjectConfigurationDlg::reject() { myProjectItem = 0; - QDialog::reject(); + TQDialog::reject(); } @@ -644,8 +644,8 @@ void ProjectConfigurationDlg::updateControls() groupTemplate->setEnabled( true ); //cache the value of the some variables - QStringList configValues = myProjectItem->scope->variableValues( "CONFIG" ); - QStringList templateValues = myProjectItem->scope->variableValues( "TEMPLATE" ); + TQStringList configValues = myProjectItem->scope->variableValues( "CONFIG" ); + TQStringList templateValues = myProjectItem->scope->variableValues( "TEMPLATE" ); //if( !myProjectItem->isScope ) //{ if ( templateValues.findIndex( "lib" ) != -1 ) @@ -708,13 +708,13 @@ void ProjectConfigurationDlg::updateControls() { checkConsole->setChecked( true ); } - QString targetname = prjWidget->getCurrentOutputFilename(); + TQString targetname = prjWidget->getCurrentOutputFilename(); if( targetname.findRev("/") != -1 ) targetname = targetname.right( targetname.length() - targetname.findRev("/") - 1 ); m_editRunArguments->setText( DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/runarguments/"+targetname, "" ) ); - QString dir = DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/cwd/"+targetname, "" ); - if( QFileInfo(dir).isRelative() ) + TQString dir = DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/cwd/"+targetname, "" ); + if( TQFileInfo(dir).isRelative() ) { m_CWDEdit->completionObject()->setDir( myProjectItem->scope->projectDir() ); m_CWDEdit->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -728,7 +728,7 @@ void ProjectConfigurationDlg::updateControls() if( m_CWDEdit->url().isEmpty() ) { - QString destdir = myProjectItem->m_widget->getCurrentDestDir(); + TQString destdir = myProjectItem->m_widget->getCurrentDestDir(); if( !destdir.startsWith( "/" ) ) destdir = myProjectItem->m_widget->projectDirectory()+"/"+destdir; m_CWDEdit->setURL( destdir.left( destdir.findRev("/") ) ); @@ -834,7 +834,7 @@ void ProjectConfigurationDlg::updateControls() else checkQtHelp->setChecked( false ); - QStringList qtLibs = myProjectItem->scope->variableValues( "QT" ); + TQStringList qtLibs = myProjectItem->scope->variableValues( "QT" ); if ( qtLibs.findIndex( "core" ) != -1 ) checkQt4Core->setChecked( true ); else @@ -892,8 +892,8 @@ void ProjectConfigurationDlg::updateControls() } //fill the custom config edit - QStringList extraValues; - for ( QStringList::const_iterator it = configValues.begin() ; it != configValues.end() ; ++it ) + TQStringList extraValues; + for ( TQStringList::const_iterator it = configValues.begin() ; it != configValues.end() ; ++it ) { if ( Scope::KnownConfigValues.findIndex( *it ) == -1 ) { @@ -902,8 +902,8 @@ void ProjectConfigurationDlg::updateControls() } editConfigExtra->setText( extraValues.join( " " ) ); - QString dir = myProjectItem->scope->variableValues( "MAKEFILE" ).front(); - if( QFileInfo(dir).isRelative() ) + TQString dir = myProjectItem->scope->variableValues( "MAKEFILE" ).front(); + if( TQFileInfo(dir).isRelative() ) { makefile_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); makefile_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -929,7 +929,7 @@ void ProjectConfigurationDlg::updateControls() m_targetOutputFile->setText( myProjectItem->scope->variableValues( "TARGET" ).front() ); dir = myProjectItem->scope->variableValues( "DESTDIR" ).front(); - if( QFileInfo(dir).isRelative() ) + if( TQFileInfo(dir).isRelative() ) { m_targetPath->completionObject()->setDir( myProjectItem->scope->projectDir() ); m_targetPath->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -950,7 +950,7 @@ void ProjectConfigurationDlg::updateControls() updateDependenciesControl(); dir = myProjectItem->scope->variableValues( "OBJECTS_DIR" ).front(); - if( QFileInfo(dir).isRelative() ) + if( TQFileInfo(dir).isRelative() ) { objdir_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); objdir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -961,7 +961,7 @@ void ProjectConfigurationDlg::updateControls() } objdir_url->setURL( dir ); dir = myProjectItem->scope->variableValues( "UI_DIR" ).front(); - if( QFileInfo(dir).isRelative() ) + if( TQFileInfo(dir).isRelative() ) { uidir_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); uidir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -972,7 +972,7 @@ void ProjectConfigurationDlg::updateControls() } uidir_url->setURL( dir ); dir = myProjectItem->scope->variableValues( "MOC_DIR" ).front(); - if( QFileInfo(dir).isRelative() ) + if( TQFileInfo(dir).isRelative() ) { mocdir_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); mocdir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -983,7 +983,7 @@ void ProjectConfigurationDlg::updateControls() } mocdir_url->setURL( dir ); dir = myProjectItem->scope->variableValues( "RC_DIR" ).front(); - if( QFileInfo(dir).isRelative() ) + if( TQFileInfo(dir).isRelative() ) { rccdir_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); rccdir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -996,7 +996,7 @@ void ProjectConfigurationDlg::updateControls() dir = myProjectItem->scope->variableValues( "IDL_COMPILER" ).front(); - if( QFileInfo(dir).isRelative() ) + if( TQFileInfo(dir).isRelative() ) { idlCmdEdit->completionObject()->setDir( myProjectItem->scope->projectDir() ); idlCmdEdit->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -1012,8 +1012,8 @@ void ProjectConfigurationDlg::updateControls() customVariableName->setText(""); customVariableData->setText(""); customVariableOp->setCurrentItem( 0 ); - QMap<unsigned int, QMap<QString, QString> > customvars = myProjectItem->scope->customVariables(); - QMap<unsigned int, QMap<QString, QString> >::iterator idx = customvars.begin(); + TQMap<unsigned int, TQMap<TQString, TQString> > customvars = myProjectItem->scope->customVariables(); + TQMap<unsigned int, TQMap<TQString, TQString> >::iterator idx = customvars.begin(); for ( ; idx != customvars.end(); ++idx ) { CustomVarListItem* item = new CustomVarListItem( customVariables, idx.key(), idx.data() ); @@ -1023,9 +1023,9 @@ void ProjectConfigurationDlg::updateControls() groupTemplateChanged(0); } -QPtrList<QMakeScopeItem> ProjectConfigurationDlg::getAllProjects() +TQPtrList<QMakeScopeItem> ProjectConfigurationDlg::getAllProjects() { - QPtrList <QMakeScopeItem> tmpPrjList; + TQPtrList <QMakeScopeItem> tmpPrjList; QMakeScopeItem *item = static_cast<QMakeScopeItem*>( prjList->firstChild() ); while ( item ) { @@ -1040,7 +1040,7 @@ QPtrList<QMakeScopeItem> ProjectConfigurationDlg::getAllProjects() return ( tmpPrjList ); } -void ProjectConfigurationDlg::getAllSubProjects( QMakeScopeItem *item, QPtrList <QMakeScopeItem> *itemList ) +void ProjectConfigurationDlg::getAllSubProjects( QMakeScopeItem *item, TQPtrList <QMakeScopeItem> *itemList ) { QMakeScopeItem * subItem = static_cast<QMakeScopeItem*>( item->firstChild() ); @@ -1063,18 +1063,18 @@ void ProjectConfigurationDlg::updateIncludeControl() insideinc_listview->clear(); outsideinc_listview->clear(); - QStringList incList = myProjectItem->scope->variableValues( "INCLUDEPATH" ); - QStringList intIncList = incList; - QMap<QString, InsideCheckListItem*> items; - QPtrList <QMakeScopeItem> itemList = getAllProjects(); + TQStringList incList = myProjectItem->scope->variableValues( "INCLUDEPATH" ); + TQStringList intIncList = incList; + TQMap<TQString, InsideCheckListItem*> items; + TQPtrList <QMakeScopeItem> itemList = getAllProjects(); QMakeScopeItem *item = itemList.first(); while ( item ) { if ( item->scope->variableValues( "TEMPLATE" ).findIndex( "lib" ) != -1 || item->scope->variableValues( "TEMPLATE" ).findIndex( "app" ) != -1 ) { - QString tmpInc = item->getIncAddPath( myProjectItem->scope->projectDir() ); - tmpInc = QDir::cleanDirPath( tmpInc ); + TQString tmpInc = item->getIncAddPath( myProjectItem->scope->projectDir() ); + tmpInc = TQDir::cleanDirPath( tmpInc ); InsideCheckListItem *newItem = new InsideCheckListItem( insideinc_listview, insideinc_listview->lastItem(), item, this ); @@ -1092,18 +1092,18 @@ void ProjectConfigurationDlg::updateIncludeControl() //all other in incList are outside incs outsideinc_listview->clear(); - QStringList::Iterator it1 = incList.begin(); + TQStringList::Iterator it1 = incList.begin(); for ( ;it1 != incList.end();++it1 ) { intIncList.remove(*it1); - new QListViewItem( outsideinc_listview, outsideinc_listview->lastItem(), ( *it1 ) ); + new TQListViewItem( outsideinc_listview, outsideinc_listview->lastItem(), ( *it1 ) ); } - for( QStringList::const_iterator it = intIncList.begin(); it != intIncList.end(); ++it ) + for( TQStringList::const_iterator it = intIncList.begin(); it != intIncList.end(); ++it ) { insideinc_listview->insertItem( items[*it] ); items.remove(*it); } - for( QMap<QString,InsideCheckListItem*>::ConstIterator it3 = items.begin(); it3 != items.end(); it3++ ) + for( TQMap<TQString,InsideCheckListItem*>::ConstIterator it3 = items.begin(); it3 != items.end(); it3++ ) { insideinc_listview->insertItem( it3.data() ); } @@ -1112,7 +1112,7 @@ void ProjectConfigurationDlg::updateIncludeControl() void ProjectConfigurationDlg::updateLibControls() { - QPtrList <QMakeScopeItem> itemList = getAllProjects(); + TQPtrList <QMakeScopeItem> itemList = getAllProjects(); insidelib_listview->setSorting( -1, false ); outsidelib_listview->setSorting( -1, false ); @@ -1122,9 +1122,9 @@ void ProjectConfigurationDlg::updateLibControls() outsidelibdir_listview->clear(); //update librarys //temp strlist - QStringList libList = myProjectItem->scope->variableValues( "LIBS" ); - QStringList intLibList = libList; - QMap<QString, InsideCheckListItem*> items; + TQStringList libList = myProjectItem->scope->variableValues( "LIBS" ); + TQStringList intLibList = libList; + TQMap<TQString, InsideCheckListItem*> items; QMakeScopeItem* item = itemList.first(); while ( item ) { @@ -1133,13 +1133,13 @@ void ProjectConfigurationDlg::updateLibControls() if ( item != myProjectItem ) { // create lib string - QString tmpLib = item->getLibAddObject( myProjectItem->scope->projectDir() ); + TQString tmpLib = item->getLibAddObject( myProjectItem->scope->projectDir() ); InsideCheckListItem * newItem = new InsideCheckListItem( insidelib_listview, insidelib_listview->lastItem(), item, this ); insidelib_listview->takeItem( newItem ); items[tmpLib] = newItem; - QString tmpLibDir = item->getLibAddPath( myProjectItem->scope->projectDir() ); + TQString tmpLibDir = item->getLibAddPath( myProjectItem->scope->projectDir() ); kdDebug(9024) << "lib:" << tmpLib << " dir:" << tmpLibDir << "|" << libList << endl; if ( libList.findIndex( "-L" + tmpLibDir ) != -1 ) { @@ -1156,28 +1156,28 @@ void ProjectConfigurationDlg::updateLibControls() } //all other in libList are outside libs - QStringList::Iterator it1 = libList.begin(); + TQStringList::Iterator it1 = libList.begin(); for ( ;it1 != libList.end();++it1 ) { intLibList.remove( *it1 ); if ( ( *it1 ).startsWith( "-L" ) ) - new QListViewItem( outsidelibdir_listview, outsidelibdir_listview->lastItem(), ( *it1 ).mid( 2 ) ); + new TQListViewItem( outsidelibdir_listview, outsidelibdir_listview->lastItem(), ( *it1 ).mid( 2 ) ); else { - new QListViewItem( outsidelib_listview, outsidelib_listview->lastItem(), ( *it1 ) ); + new TQListViewItem( outsidelib_listview, outsidelib_listview->lastItem(), ( *it1 ) ); } } - for( QStringList::const_iterator it = intLibList.begin(); it != intLibList.end(); ++it ) + for( TQStringList::const_iterator it = intLibList.begin(); it != intLibList.end(); ++it ) { - QString lib = *it; + TQString lib = *it; if( !lib.startsWith( "-L" ) ) { insidelib_listview->insertItem( items[lib] ); items.remove(lib); } } - for( QMap<QString,InsideCheckListItem*>::ConstIterator it3 = items.begin(); it3 != items.end(); it3++ ) + for( TQMap<TQString,InsideCheckListItem*>::ConstIterator it3 = items.begin(); it3 != items.end(); it3++ ) { insidelib_listview->insertItem( it3.data() ); } @@ -1185,25 +1185,25 @@ void ProjectConfigurationDlg::updateLibControls() void ProjectConfigurationDlg::updateDependenciesControl( ) { - QPtrList <QMakeScopeItem> itemList = getAllProjects(); + TQPtrList <QMakeScopeItem> itemList = getAllProjects(); intDeps_view->setSorting( -1, false ); extDeps_view->setSorting( -1, false ); intDeps_view->clear(); extDeps_view->clear(); - QStringList depsList = myProjectItem->scope->variableValues( "TARGETDEPS" ); - QStringList intDepList = depsList; - QMap<QString,InsideCheckListItem*> items; + TQStringList depsList = myProjectItem->scope->variableValues( "TARGETDEPS" ); + TQStringList intDepList = depsList; + TQMap<TQString,InsideCheckListItem*> items; QMakeScopeItem *item = itemList.first(); while ( item ) { - QStringList templateval = item->scope->variableValues( "TEMPLATE" ); + TQStringList templateval = item->scope->variableValues( "TEMPLATE" ); if ( templateval.findIndex( "lib" ) != -1 || templateval.findIndex( "app" ) != -1 ) { - QString tmpLib; - QStringList values = item->scope->variableValues( "CONFIG" ); + TQString tmpLib; + TQStringList values = item->scope->variableValues( "CONFIG" ); if ( templateval.findIndex( "lib" ) != -1 && values.findIndex( "dll" ) != -1 ) tmpLib = item->getSharedLibAddObject( myProjectItem->scope->projectDir() ); else if ( templateval.findIndex( "lib" ) != -1 ) @@ -1225,20 +1225,20 @@ void ProjectConfigurationDlg::updateDependenciesControl( ) //add all other prj in itemList unchecked extDeps_view->clear(); - for ( QStringList::Iterator it1 = depsList.begin();it1 != depsList.end();++it1 ) + for ( TQStringList::Iterator it1 = depsList.begin();it1 != depsList.end();++it1 ) { intDepList << *it1; - new QListViewItem( extDeps_view, extDeps_view->lastItem(), ( *it1 ) ); + new TQListViewItem( extDeps_view, extDeps_view->lastItem(), ( *it1 ) ); } - for( QStringList::const_iterator it = intDepList.begin(); it != intDepList.end(); ++it ) + for( TQStringList::const_iterator it = intDepList.begin(); it != intDepList.end(); ++it ) { intDeps_view->insertItem( items[*it] ); items.remove(*it); } - for( QMap<QString,InsideCheckListItem*>::ConstIterator it2 = items.begin(); it2 != items.end(); it2++ ) + for( TQMap<TQString,InsideCheckListItem*>::ConstIterator it2 = items.begin(); it2 != items.end(); it2++ ) { intDeps_view->insertItem( it2.data() ); } @@ -1251,7 +1251,7 @@ void ProjectConfigurationDlg::updateBuildOrderControl() if ( myProjectItem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) != -1 ) { - QPtrList <QMakeScopeItem> itemList; + TQPtrList <QMakeScopeItem> itemList; QMakeScopeItem *item = static_cast<QMakeScopeItem*>( myProjectItem->firstChild() ); while ( item ) @@ -1263,8 +1263,8 @@ void ProjectConfigurationDlg::updateBuildOrderControl() incaddTab->setEnabled( false ); buildorder_listview->setSorting( -1, false ); buildorder_listview->clear(); - QStringList buildList = myProjectItem->scope->variableValues( "SUBDIRS" ); - QStringList::Iterator it1 = buildList.begin(); + TQStringList buildList = myProjectItem->scope->variableValues( "SUBDIRS" ); + TQStringList::Iterator it1 = buildList.begin(); for ( ;it1 != buildList.end();++it1 ) { item = itemList.first(); @@ -1274,7 +1274,7 @@ void ProjectConfigurationDlg::updateBuildOrderControl() { if ( item->text( 0 ) == ( *it1 ) ) { - new QListViewItem( buildorder_listview, buildorder_listview->lastItem(), item->text( 0 ) ); + new TQListViewItem( buildorder_listview, buildorder_listview->lastItem(), item->text( 0 ) ); itemList.take(); break; } @@ -1295,7 +1295,7 @@ void ProjectConfigurationDlg::buildorderMoveUpClicked() return ; } - QListViewItem *item = buildorder_listview->firstChild(); + TQListViewItem *item = buildorder_listview->firstChild(); while ( item->nextSibling() != buildorder_listview->currentItem() ) item = item->nextSibling(); item->moveItem( buildorder_listview->currentItem() ); @@ -1325,7 +1325,7 @@ void ProjectConfigurationDlg::insideIncMoveUpClicked() return ; } - QListViewItem *item = insideinc_listview->firstChild(); + TQListViewItem *item = insideinc_listview->firstChild(); while ( item->nextSibling() != insideinc_listview->currentItem() ) item = item->nextSibling(); item->moveItem( insideinc_listview->currentItem() ); @@ -1354,7 +1354,7 @@ void ProjectConfigurationDlg::outsideIncMoveUpClicked() return ; } - QListViewItem *item = outsideinc_listview->firstChild(); + TQListViewItem *item = outsideinc_listview->firstChild(); while ( item->nextSibling() != outsideinc_listview->currentItem() ) item = item->nextSibling(); item->moveItem( outsideinc_listview->currentItem() ); @@ -1379,15 +1379,15 @@ void ProjectConfigurationDlg::outsideIncAddClicked() { KURLRequesterDlg dialog( "", i18n( "Add include directory:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - dialog.urlRequester() ->setURL( QString::null ); + dialog.urlRequester() ->setURL( TQString::null ); dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString dir = dialog.urlRequester() ->url(); + TQString dir = dialog.urlRequester() ->url(); if ( !dir.isEmpty() ) { - new QListViewItem( outsideinc_listview, dir ); + new TQListViewItem( outsideinc_listview, dir ); activateApply( 0 ); } } @@ -1408,7 +1408,7 @@ void ProjectConfigurationDlg::insideLibMoveUpClicked() return ; } - QListViewItem *item = insidelib_listview->firstChild(); + TQListViewItem *item = insidelib_listview->firstChild(); while ( item->nextSibling() != insidelib_listview->currentItem() ) item = item->nextSibling(); item->moveItem( insidelib_listview->currentItem() ); @@ -1437,7 +1437,7 @@ void ProjectConfigurationDlg::outsideLibMoveUpClicked() return ; } - QListViewItem *item = outsidelib_listview->firstChild(); + TQListViewItem *item = outsidelib_listview->firstChild(); while ( item->nextSibling() != outsidelib_listview->currentItem() ) item = item->nextSibling(); item->moveItem( outsidelib_listview->currentItem() ); @@ -1463,40 +1463,40 @@ void ProjectConfigurationDlg::outsideLibAddClicked() KURLRequesterDlg dialog( "", i18n( "Add Library: Either choose the .a/.so file or give -l<libname>" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); dialog.urlRequester() ->setFilter( "*.so|"+i18n("Shared Library (*.so)")+"\n*.a|"+i18n("Static Library (*.a)") ); - dialog.urlRequester() ->setURL( QString::null ); + dialog.urlRequester() ->setURL( TQString::null ); dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString file = dialog.urlRequester() ->url(); + TQString file = dialog.urlRequester() ->url(); if ( !file.isEmpty() ) { if( file.startsWith("-l") ) { - new QListViewItem( outsidelib_listview, file ); + new TQListViewItem( outsidelib_listview, file ); activateApply( 0 ); } else { - QFileInfo fi(file); + TQFileInfo fi(file); if( !fi.exists() ) { - new QListViewItem( outsidelib_listview, file );; + new TQListViewItem( outsidelib_listview, file );; activateApply( 0 ); } if( fi.extension(false) == "a" ) { - new QListViewItem( outsidelib_listview, file ); + new TQListViewItem( outsidelib_listview, file ); activateApply( 0 ); }else if ( fi.extension(false) == "so" ) { - QString path = fi.dirPath( true ); - QString name = fi.fileName(); + TQString path = fi.dirPath( true ); + TQString name = fi.fileName(); if( name.startsWith( "lib" ) ) name = name.mid(3); name = "-l"+name.left( name.length() - 3 ); - new QListViewItem( outsidelib_listview, name ); - new QListViewItem( outsidelibdir_listview, path ); + new TQListViewItem( outsidelib_listview, name ); + new TQListViewItem( outsidelibdir_listview, path ); activateApply( 0 ); }else return; @@ -1521,7 +1521,7 @@ void ProjectConfigurationDlg::outsideLibDirMoveUpClicked() return ; } - QListViewItem *item = outsidelibdir_listview->firstChild(); + TQListViewItem *item = outsidelibdir_listview->firstChild(); while ( item->nextSibling() != outsidelibdir_listview->currentItem() ) item = item->nextSibling(); item->moveItem( outsidelibdir_listview->currentItem() ); @@ -1546,15 +1546,15 @@ void ProjectConfigurationDlg::outsideLibDirAddClicked() { KURLRequesterDlg dialog( "", i18n( "Add library directory:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - dialog.urlRequester() ->setURL( QString::null ); + dialog.urlRequester() ->setURL( TQString::null ); dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString dir = dialog.urlRequester() ->url(); + TQString dir = dialog.urlRequester() ->url(); if ( !dir.isEmpty() ) { - new QListViewItem( outsidelibdir_listview, dir ); + new TQListViewItem( outsidelibdir_listview, dir ); activateApply( 0 ); } } @@ -1568,13 +1568,13 @@ void ProjectConfigurationDlg::outsideLibDirRemoveClicked() void ProjectConfigurationDlg::outsideIncEditClicked() { - QListViewItem * item = outsideinc_listview->currentItem(); + TQListViewItem * item = outsideinc_listview->currentItem(); if ( item == NULL ) return ; - QString text = item->text( 0 ); + TQString text = item->text( 0 ); KURLRequesterDlg dialog( text, i18n( "Change include directory:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - if( QFileInfo(text).isRelative() ) + if( TQFileInfo(text).isRelative() ) { dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir()+"/"+text ) ); @@ -1585,9 +1585,9 @@ void ProjectConfigurationDlg::outsideIncEditClicked() dialog.urlRequester() ->fileDialog() ->setURL( KURL( text ) ); } dialog.urlRequester() ->setURL( text ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString dir = dialog.urlRequester() ->url(); + TQString dir = dialog.urlRequester() ->url(); if ( !dir.isEmpty() ) { item->setText( 0, dir ); @@ -1597,13 +1597,13 @@ void ProjectConfigurationDlg::outsideIncEditClicked() void ProjectConfigurationDlg::outsideLibEditClicked() { - QListViewItem *item = outsidelib_listview->currentItem(); + TQListViewItem *item = outsidelib_listview->currentItem(); if ( item == NULL ) return ; - QString text = item->text( 0 ); + TQString text = item->text( 0 ); KURLRequesterDlg dialog( text, i18n( "Change Library:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); - if( QFileInfo(text).isRelative() ) + if( TQFileInfo(text).isRelative() ) { dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir()+"/"+text ) ); @@ -1613,9 +1613,9 @@ void ProjectConfigurationDlg::outsideLibEditClicked() dialog.urlRequester() ->fileDialog() ->setURL( KURL( text ) ); } dialog.urlRequester() ->setURL( text ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString file = dialog.urlRequester() ->url(); + TQString file = dialog.urlRequester() ->url(); if ( !file.isEmpty() ) { if( file.startsWith("-l") ) @@ -1625,7 +1625,7 @@ void ProjectConfigurationDlg::outsideLibEditClicked() } else { - QFileInfo fi(file); + TQFileInfo fi(file); if( !fi.exists() ) { item->setText( 0, file ); @@ -1637,13 +1637,13 @@ void ProjectConfigurationDlg::outsideLibEditClicked() activateApply( 0 ); }else if ( fi.extension(false) == "so" ) { - QString path = fi.dirPath( true ); - QString name = fi.fileName(); + TQString path = fi.dirPath( true ); + TQString name = fi.fileName(); if( name.startsWith( "lib" ) ) name = name.mid(3); name = "-l"+name.left( name.length() - 3 ); item->setText( 0, name ); - new QListViewItem( outsidelibdir_listview, path ); + new TQListViewItem( outsidelibdir_listview, path ); activateApply( 0 ); }else return; @@ -1653,14 +1653,14 @@ void ProjectConfigurationDlg::outsideLibEditClicked() void ProjectConfigurationDlg::outsideLibDirEditClicked() { - QListViewItem * item = outsidelibdir_listview->currentItem(); + TQListViewItem * item = outsidelibdir_listview->currentItem(); if ( item == NULL ) return ; - QString text = item->text( 0 ); + TQString text = item->text( 0 ); KURLRequesterDlg dialog( text, i18n( "Change library directory:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - if( QFileInfo(text).isRelative() ) + if( TQFileInfo(text).isRelative() ) { dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir()+"/"+text ) ); @@ -1671,9 +1671,9 @@ void ProjectConfigurationDlg::outsideLibDirEditClicked() dialog.urlRequester() ->fileDialog() ->setURL( KURL( text ) ); } dialog.urlRequester() ->setURL( text ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString dir = dialog.urlRequester() ->url(); + TQString dir = dialog.urlRequester() ->url(); if ( !dir.isEmpty() ) { item->setText( 0, dir ); @@ -1686,28 +1686,28 @@ void ProjectConfigurationDlg::extAdd_button_clicked( ) { KURLRequesterDlg dialog( "", i18n( "Add target:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::File | KFile::LocalOnly ); - dialog.urlRequester() ->setURL( QString::null ); + dialog.urlRequester() ->setURL( TQString::null ); dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString path = dialog.urlRequester() ->url(); + TQString path = dialog.urlRequester() ->url(); if ( !path.isEmpty() ) { - new QListViewItem( extDeps_view, path ); + new TQListViewItem( extDeps_view, path ); activateApply( 0 ); } } void ProjectConfigurationDlg::extEdit_button_clicked( ) { - QListViewItem * item = extDeps_view->currentItem(); + TQListViewItem * item = extDeps_view->currentItem(); if ( item == NULL ) return ; - QString text = item->text( 0 ); + TQString text = item->text( 0 ); KURLRequesterDlg dialog( text, i18n( "Change target:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::File | KFile::LocalOnly ); - if( QFileInfo(text).isRelative() ) + if( TQFileInfo(text).isRelative() ) { dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir()+"/"+text ) ); @@ -1718,9 +1718,9 @@ void ProjectConfigurationDlg::extEdit_button_clicked( ) dialog.urlRequester() ->fileDialog() ->setURL( KURL( text ) ); } dialog.urlRequester() ->setURL( text ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString path = dialog.urlRequester() ->url(); + TQString path = dialog.urlRequester() ->url(); if ( !path.isEmpty() ) { item->setText( 0, path ); @@ -1748,7 +1748,7 @@ void ProjectConfigurationDlg::extMoveUp_button_clicked( ) return ; } - QListViewItem *item = extDeps_view->firstChild(); + TQListViewItem *item = extDeps_view->firstChild(); while ( item->nextSibling() != extDeps_view->currentItem() ) item = item->nextSibling(); item->moveItem( extDeps_view->currentItem() ); @@ -1781,7 +1781,7 @@ void ProjectConfigurationDlg::intMoveUp_button_clicked( ) return ; } - QListViewItem *item = intDeps_view->firstChild(); + TQListViewItem *item = intDeps_view->firstChild(); while ( item->nextSibling() != intDeps_view->currentItem() ) item = item->nextSibling(); item->moveItem( intDeps_view->currentItem() ); @@ -1790,7 +1790,7 @@ void ProjectConfigurationDlg::intMoveUp_button_clicked( ) void ProjectConfigurationDlg::addCustomValueClicked() { - QMap<QString, QString> customvar; + TQMap<TQString, TQString> customvar; customvar["var"] = i18n("Name"); customvar["op"] = "="; customvar["values"] = i18n("Value"); @@ -1804,7 +1804,7 @@ void ProjectConfigurationDlg::addCustomValueClicked() } void ProjectConfigurationDlg::removeCustomValueClicked() { - QListViewItem * item = customVariables->currentItem(); + TQListViewItem * item = customVariables->currentItem(); if ( item ) { myProjectItem->scope->removeCustomVariable( item->key(0, true).toUInt() ); @@ -1829,7 +1829,7 @@ void ProjectConfigurationDlg::removeCustomValueClicked() void ProjectConfigurationDlg::upCustomValueClicked() { // custom vars - QListViewItem * item = customVariables->firstChild(); + TQListViewItem * item = customVariables->firstChild(); if ( customVariables->currentItem() == item ) { KNotifyClient::beep(); @@ -1857,7 +1857,7 @@ void ProjectConfigurationDlg::newCustomVariableActive( ) customVariableOp->blockSignals(true); customVariableName->blockSignals(true); customVariableData->blockSignals(true); - QListViewItem * item = customVariables->currentItem(); + TQListViewItem * item = customVariables->currentItem(); if ( item ) { customVariableName->setText( item->text( 0 ) ); @@ -2021,26 +2021,26 @@ void ProjectConfigurationDlg::activateApply( int ) { buttonApply->setEnabled( true ); } -void ProjectConfigurationDlg::activateApply( const QString& ) +void ProjectConfigurationDlg::activateApply( const TQString& ) { buttonApply->setEnabled( true ); } -void ProjectConfigurationDlg::activateApply( QListViewItem* ) +void ProjectConfigurationDlg::activateApply( TQListViewItem* ) { buttonApply->setEnabled( true ); } void ProjectConfigurationDlg::removeSharedLibDeps() { - QListViewItemIterator it(myProjectItem->listView()); + TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; - QMap<QString, QString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); + TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); if( prjItem->scope->variableValues("LIBS").findIndex(infos["shared_lib"]) != -1 ) prjItem->scope->removeFromPlusOp("LIBS", infos["shared_lib"]); @@ -2057,14 +2057,14 @@ void ProjectConfigurationDlg::removeSharedLibDeps() void ProjectConfigurationDlg::addStaticLibDeps() { - QListViewItemIterator it(myProjectItem->listView()); + TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; - QMap<QString, QString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); + TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1 ) @@ -2078,7 +2078,7 @@ void ProjectConfigurationDlg::addStaticLibDeps() void ProjectConfigurationDlg::removeStaticLibDeps() { - QListViewItemIterator it(myProjectItem->listView()); + TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() ); @@ -2086,7 +2086,7 @@ void ProjectConfigurationDlg::removeStaticLibDeps() continue; - QMap<QString, QString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); + TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); if( prjItem->scope->variableValues("LIBS").findIndex(infos["static_lib"]) != -1 ) prjItem->scope->removeFromPlusOp("LIBS", infos["static_lib"]); @@ -2100,14 +2100,14 @@ void ProjectConfigurationDlg::removeStaticLibDeps() void ProjectConfigurationDlg::addSharedLibDeps() { - QListViewItemIterator it(myProjectItem->listView()); + TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; - QMap<QString, QString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); + TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 ) { @@ -2121,14 +2121,14 @@ void ProjectConfigurationDlg::addSharedLibDeps() void ProjectConfigurationDlg::removeAppDeps() { - QListViewItemIterator it(myProjectItem->listView()); + TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; - QMap<QString, QString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); + TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 ) { @@ -2140,14 +2140,14 @@ void ProjectConfigurationDlg::removeAppDeps() void ProjectConfigurationDlg::addAppDeps() { - QListViewItemIterator it(myProjectItem->listView()); + TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; - QMap<QString, QString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); + TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1 || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 ) @@ -2161,7 +2161,7 @@ void ProjectConfigurationDlg::addAppDeps() void ProjectConfigurationDlg::customVarChanged() { - QListViewItem * item = customVariables->currentItem(); + TQListViewItem * item = customVariables->currentItem(); if ( item ) { item->setText( 0, customVariableName->text() ); diff --git a/buildtools/qmake/projectconfigurationdlg.h b/buildtools/qmake/projectconfigurationdlg.h index 246fb388..313882c4 100644 --- a/buildtools/qmake/projectconfigurationdlg.h +++ b/buildtools/qmake/projectconfigurationdlg.h @@ -21,9 +21,9 @@ #include "projectconfigurationdlgbase.h" //#include "trollprojectwidget.h" #include <kdeversion.h> -#include <qlistview.h> +#include <tqlistview.h> #include <klistview.h> -#include <qmap.h> +#include <tqmap.h> class QMakeScopeItem; class KListViewItem; @@ -34,9 +34,9 @@ class TrollProjectWidget; class InsideCheckListItem : public QCheckListItem { public: - InsideCheckListItem( QListView *parent, QMakeScopeItem *item, ProjectConfigurationDlg *config ); + InsideCheckListItem( TQListView *parent, QMakeScopeItem *item, ProjectConfigurationDlg *config ); - InsideCheckListItem( QListView *parent, QListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config ); + InsideCheckListItem( TQListView *parent, TQListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config ); QMakeScopeItem *prjItem; ProjectConfigurationDlg *m_config; @@ -47,8 +47,8 @@ protected: class CustomVarListItem : public KListViewItem { public: - CustomVarListItem( QListView*, unsigned int, QMap<QString, QString> ); - QString key(int column, bool ascending) const; + CustomVarListItem( TQListView*, unsigned int, TQMap<TQString, TQString> ); + TQString key(int column, bool ascending) const; private: unsigned int m_key; }; @@ -56,7 +56,7 @@ class CustomVarListItem : public KListViewItem class ProjectConfigurationDlg : public ProjectConfigurationDlgBase { public: - ProjectConfigurationDlg( QListView *_prjList, TrollProjectWidget* _prjWidget, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~ProjectConfigurationDlg(); void updateControls(); void updateSubproject( QMakeScopeItem* _item ); @@ -114,22 +114,22 @@ public slots: virtual void reject(); virtual void apply(); virtual void activateApply( int ); - virtual void activateApply( const QString& ); + virtual void activateApply( const TQString& ); void updateIncludeControl(); void updateLibControls(); void updateBuildOrderControl(); void updateDependenciesControl(); - virtual void activateApply(QListViewItem*); + virtual void activateApply(TQListViewItem*); virtual void customVarChanged(); protected: - QListView *prjList; + TQListView *prjList; QMakeScopeItem *myProjectItem; - QPtrList <QMakeScopeItem> getAllProjects(); + TQPtrList <QMakeScopeItem> getAllProjects(); TrollProjectWidget* prjWidget; - void getAllSubProjects( QMakeScopeItem *item, QPtrList<QMakeScopeItem> *itemList ); + void getAllSubProjects( QMakeScopeItem *item, TQPtrList<QMakeScopeItem> *itemList ); private: void removeSharedLibDeps(); diff --git a/buildtools/qmake/qmakedefaultopts.cpp b/buildtools/qmake/qmakedefaultopts.cpp index 14ca7aa0..fa7711c9 100644 --- a/buildtools/qmake/qmakedefaultopts.cpp +++ b/buildtools/qmake/qmakedefaultopts.cpp @@ -13,7 +13,7 @@ #include <kdebug.h> #include <ktempfile.h> -#include <qregexp.h> +#include <tqregexp.h> #include <kprocess.h> #include <blockingkprocess.h> @@ -23,7 +23,7 @@ QMakeDefaultOpts::QMakeDefaultOpts() } -void QMakeDefaultOpts::readVariables( const QString& qmake, const QString& projdir ) +void QMakeDefaultOpts::readVariables( const TQString& qmake, const TQString& projdir ) { KTempFile makefile (projdir+"/", ".mf"); KTempFile qmakefile(projdir+"/", ".pro"); @@ -53,16 +53,16 @@ void QMakeDefaultOpts::readVariables( const QString& qmake, const QString& projd { makefile.unlink(); qmakefile.unlink(); - QStringList lines = QStringList::split( "\n", proc.stdErr() ); + TQStringList lines = TQStringList::split( "\n", proc.stdErr() ); kdDebug(9024) << "Got " << lines.count() << " lines" << endl; - for ( QStringList::const_iterator it = lines.begin(); it != lines.end(); ++it) + for ( TQStringList::const_iterator it = lines.begin(); it != lines.end(); ++it) { - QString line = *it; - QRegExp re( "DEBUG 1: ([^ =:]+) === (.*)" ); + TQString line = *it; + TQRegExp re( "DEBUG 1: ([^ =:]+) === (.*)" ); if ( re.exactMatch( line ) ) { - QString var = re.cap( 1 ); - QStringList values = QStringList::split( " :: ", re.cap( 2 ) ); + TQString var = re.cap( 1 ); + TQStringList values = TQStringList::split( " :: ", re.cap( 2 ) ); m_variables[var] = values; m_keys.append( var ); } @@ -75,15 +75,15 @@ QMakeDefaultOpts::~QMakeDefaultOpts() { } -const QStringList QMakeDefaultOpts::variableValues( const QString& var ) const +const TQStringList QMakeDefaultOpts::variableValues( const TQString& var ) const { -// QStringList result; +// TQStringList result; if ( m_variables.contains(var) ) return m_variables[var]; - return QStringList(); + return TQStringList(); } -const QStringList& QMakeDefaultOpts::variables() const +const TQStringList& QMakeDefaultOpts::variables() const { return m_keys; } diff --git a/buildtools/qmake/qmakedefaultopts.h b/buildtools/qmake/qmakedefaultopts.h index 63bab54b..f95d5608 100644 --- a/buildtools/qmake/qmakedefaultopts.h +++ b/buildtools/qmake/qmakedefaultopts.h @@ -12,9 +12,9 @@ #ifndef QMAKEDEFAULTOPTS_H #define QMAKEDEFAULTOPTS_H -#include <qmap.h> -#include <qstringlist.h> -// #include <qobject.h> +#include <tqmap.h> +#include <tqstringlist.h> +// #include <tqobject.h> // class KTempFile; // class BlockingKProcess; @@ -26,10 +26,10 @@ public: ~QMakeDefaultOpts(); - void readVariables( const QString& qtdir, const QString& projdir ); + void readVariables( const TQString& qtdir, const TQString& projdir ); - const QStringList variableValues( const QString& ) const; - const QStringList& variables() const; + const TQStringList variableValues( const TQString& ) const; + const TQStringList& variables() const; // signals: // void variablesRead(); @@ -39,8 +39,8 @@ public: // void slotFinished( KProcess* ); private: - QMap<QString, QStringList> m_variables; - QStringList m_keys; + TQMap<TQString, TQStringList> m_variables; + TQStringList m_keys; }; #endif diff --git a/buildtools/qmake/qmakeoptionswidget.cpp b/buildtools/qmake/qmakeoptionswidget.cpp index 89f63c1e..c2f4cfdd 100644 --- a/buildtools/qmake/qmakeoptionswidget.cpp +++ b/buildtools/qmake/qmakeoptionswidget.cpp @@ -11,16 +11,16 @@ #include "qmakeoptionswidget.h" -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <kcombobox.h> -#include <qbuttongroup.h> +#include <tqbuttongroup.h> #include <kurlrequester.h> #include <domutil.h> #include <kdebug.h> -QMakeOptionsWidget::QMakeOptionsWidget( const QString& projectdir, QDomDocument &dom, const QString &configGroup, - QWidget *parent, const char *name ) +QMakeOptionsWidget::QMakeOptionsWidget( const TQString& projectdir, TQDomDocument &dom, const TQString &configGroup, + TQWidget *parent, const char *name ) : QMakeOptionsWidgetBase( parent, name ), m_dom( dom ), m_configGroup( configGroup ), m_projectDir( projectdir ) { @@ -53,8 +53,8 @@ void QMakeOptionsWidget::accept() DomUtil::writeBoolEntry( m_dom, m_configGroup + "/qmake/enableFilenamesOnly", checkFilenamesOnly->isChecked() ); DomUtil::writeBoolEntry( m_dom, m_configGroup + "/qmake/showVariablesInTree", showVariablesInTree->isChecked() ); DomUtil::writeBoolEntry( m_dom, m_configGroup + "/qmake/showParseErrors", checkShowParseErrors->isChecked() ); - QString projfile = qmakeProjectFile->url(); - if( projfile != m_projectDir && QFileInfo( projfile ).isFile() && ( projfile.endsWith( ".pro" ) || projfile.endsWith( ".pri" ) ) ) + TQString projfile = qmakeProjectFile->url(); + if( projfile != m_projectDir && TQFileInfo( projfile ).isFile() && ( projfile.endsWith( ".pro" ) || projfile.endsWith( ".pri" ) ) ) DomUtil::writeEntry( m_dom, m_configGroup + "/qmake/projectfile", projfile ); } diff --git a/buildtools/qmake/qmakeoptionswidget.h b/buildtools/qmake/qmakeoptionswidget.h index c50e4b44..ee50fde6 100644 --- a/buildtools/qmake/qmakeoptionswidget.h +++ b/buildtools/qmake/qmakeoptionswidget.h @@ -14,22 +14,22 @@ #include "qmakeoptionswidgetbase.h" -#include <qdom.h> +#include <tqdom.h> class QMakeOptionsWidget : public QMakeOptionsWidgetBase { Q_OBJECT public: - QMakeOptionsWidget( const QString& projectdir, QDomDocument &dom, const QString &configGroup, - QWidget *parent = 0, const char *name = 0 ); + QMakeOptionsWidget( const TQString& projectdir, TQDomDocument &dom, const TQString &configGroup, + TQWidget *parent = 0, const char *name = 0 ); ~QMakeOptionsWidget(); public slots: void accept(); private: - QDomDocument &m_dom; - QString m_configGroup; - QString m_projectDir; + TQDomDocument &m_dom; + TQString m_configGroup; + TQString m_projectDir; }; #endif diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp index 66fa3c3f..73edf730 100644 --- a/buildtools/qmake/qmakescopeitem.cpp +++ b/buildtools/qmake/qmakescopeitem.cpp @@ -13,8 +13,8 @@ #include "qmakescopeitem.h" -#include <qdir.h> -#include <qregexp.h> +#include <tqdir.h> +#include <tqregexp.h> #include <kiconloader.h> #include <klocale.h> @@ -28,13 +28,13 @@ * Class qProjectItem */ -qProjectItem::qProjectItem( Type type, QListView *parent, const QString &text ) - : QListViewItem( parent, text ), typ( type ) +qProjectItem::qProjectItem( Type type, TQListView *parent, const TQString &text ) + : TQListViewItem( parent, text ), typ( type ) {} -qProjectItem::qProjectItem( Type type, qProjectItem *parent, const QString &text ) - : QListViewItem( parent, text ), typ( type ) +qProjectItem::qProjectItem( Type type, qProjectItem *parent, const TQString &text ) + : TQListViewItem( parent, text ), typ( type ) {} @@ -43,7 +43,7 @@ qProjectItem::qProjectItem( Type type, qProjectItem *parent, const QString &text * Class GroupItem */ -GroupItem::GroupItem( QListView *lv, GroupType type, const QString &text, QMakeScopeItem* spitem ) +GroupItem::GroupItem( TQListView *lv, GroupType type, const TQString &text, QMakeScopeItem* spitem ) : qProjectItem( Group, lv, text ) { this->owner = spitem; @@ -52,7 +52,7 @@ GroupItem::GroupItem( QListView *lv, GroupType type, const QString &text, QMakeS setPixmap( 0, SmallIcon( "tar" ) ); } -GroupItem::GroupType GroupItem::groupTypeForExtension( const QString &ext ) +GroupItem::GroupType GroupItem::groupTypeForExtension( const TQString &ext ) { if ( ext == "cpp" || ext == "cc" || ext == "c" || ext == "C" || ext == "c++" || ext == "cxx" || ext == "ocl" ) return Sources; @@ -76,7 +76,7 @@ GroupItem::GroupType GroupItem::groupTypeForExtension( const QString &ext ) return Distfiles; } -void GroupItem::groupTypeMeanings( GroupItem::GroupType type, QString& title, QString& ext ) +void GroupItem::groupTypeMeanings( GroupItem::GroupType type, TQString& title, TQString& ext ) { switch ( type ) { @@ -135,22 +135,22 @@ void GroupItem::groupTypeMeanings( GroupItem::GroupType type, QString& title, QS } } -void GroupItem::paintCell( QPainter* p, const QColorGroup& c, int column, int width, int align ) +void GroupItem::paintCell( TQPainter* p, const TQColorGroup& c, int column, int width, int align ) { - QColorGroup cg( c ); + TQColorGroup cg( c ); if ( !firstChild() ) { - cg.setColor( QColorGroup::Text, cg.mid() ); + cg.setColor( TQColorGroup::Text, cg.mid() ); } qProjectItem::paintCell( p, cg, column, width, align ); } -void GroupItem::addFileToScope( const QString& filename ) +void GroupItem::addFileToScope( const TQString& filename ) { - QString file = filename; + TQString file = filename; - QPtrListIterator<FileItem> it( files ); + TQPtrListIterator<FileItem> it( files ); while ( it.current() != 0 ) { if ( it.current() ->text( 0 ) == file ) //File already exists in this subproject @@ -160,7 +160,7 @@ void GroupItem::addFileToScope( const QString& filename ) FileItem *fitem = owner->createFileItem( file ); - fitem->uiFileLink = owner->m_widget->getUiFileLink( owner->relativePath() + QString( QChar( QDir::separator() ) ), owner->scope->resolveVariables( filename ) ); + fitem->uiFileLink = owner->m_widget->getUiFileLink( owner->relativePath() + TQString( TQChar( TQDir::separator() ) ), owner->scope->resolveVariables( filename ) ); files.append( fitem ); switch ( groupType ) { @@ -206,11 +206,11 @@ void GroupItem::addFileToScope( const QString& filename ) owner->scope->saveToFile(); } -void GroupItem::removeFileFromScope( const QString& filename ) +void GroupItem::removeFileFromScope( const TQString& filename ) { - QString filePath; + TQString filePath; - QPtrListIterator<FileItem> it( files ); + TQPtrListIterator<FileItem> it( files ); while ( it.current() != 0 ) { if ( it.current() ->text( 0 ) == filename ) //File already exists in this subproject @@ -271,7 +271,7 @@ void GroupItem::removeFileFromScope( const QString& filename ) owner->scope->saveToFile(); } -void GroupItem::addInstallObject( const QString& objectname ) +void GroupItem::addInstallObject( const TQString& objectname ) { GroupItem * objitem = owner->createGroupItem( GroupItem::InstallObject, objectname, owner ); owner->addValue( "INSTALLS", objectname ); @@ -291,7 +291,7 @@ void GroupItem::removeInstallObject( GroupItem* item ) * Class FileItem */ -FileItem::FileItem( QListView *lv, const QString &text ) +FileItem::FileItem( TQListView *lv, const TQString &text ) : qProjectItem( File, lv, text ), uiFileLink( "" ) { // if excluded is set the file is excluded in the subproject/project. @@ -305,7 +305,7 @@ FileItem::FileItem( QListView *lv, const QString &text ) * Class QMakeScopeItem */ -QMakeScopeItem::QMakeScopeItem( QListView *parent, const QString &text, Scope* s, TrollProjectWidget* widget ) +QMakeScopeItem::QMakeScopeItem( TQListView *parent, const TQString &text, Scope* s, TrollProjectWidget* widget ) : qProjectItem( Subproject, parent, text ), scope( s ), m_widget( widget ) { // configuration.m_template = QTMP_APPLICATION; @@ -313,7 +313,7 @@ QMakeScopeItem::QMakeScopeItem( QListView *parent, const QString &text, Scope* s } -QMakeScopeItem::QMakeScopeItem( QMakeScopeItem *parent, const QString &text, Scope* s ) +QMakeScopeItem::QMakeScopeItem( QMakeScopeItem *parent, const TQString &text, Scope* s ) : qProjectItem( Subproject, parent, text ), scope( s ), m_widget( parent->m_widget ) { init(); @@ -321,7 +321,7 @@ QMakeScopeItem::QMakeScopeItem( QMakeScopeItem *parent, const QString &text, Sco QMakeScopeItem::~QMakeScopeItem() { - QMap<GroupItem::GroupType, GroupItem*>::iterator it; + TQMap<GroupItem::GroupType, GroupItem*>::iterator it; for ( it = groups.begin() ; it != groups.end() ; ++it ) { GroupItem* s = it.data(); @@ -331,7 +331,7 @@ QMakeScopeItem::~QMakeScopeItem() } -QString QMakeScopeItem::relativePath() +TQString QMakeScopeItem::relativePath() { if( !scope || !scope->parent() ) return ""; @@ -352,39 +352,39 @@ QString QMakeScopeItem::relativePath() // return scope->scopeName(); // else if ( scope->scopeType() == Scope::ProjectScope ) // return ( static_cast<QMakeScopeItem*>( parent() ) ->relativePath() -// + QString( QChar( QDir::separator() ) ) + scope->scopeName() ); +// + TQString( TQChar( TQDir::separator() ) ) + scope->scopeName() ); // else // return ( static_cast<QMakeScopeItem*>( parent() ) ->relativePath() ); } -QString QMakeScopeItem::getSharedLibAddObject( QString basePath ) +TQString QMakeScopeItem::getSharedLibAddObject( TQString basePath ) { if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) { - QString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); + TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); if ( !scope->variableValues( "DESTDIR" ).front().isEmpty() ) { - if ( QDir::isRelativePath( scope->variableValues( "DESTDIR" ).front() ) ) - tmpPath += QString( QChar( QDir::separator() ) ) + scope->variableValues( "DESTDIR" ).front(); + if ( TQDir::isRelativePath( scope->variableValues( "DESTDIR" ).front() ) ) + tmpPath += TQString( TQChar( TQDir::separator() ) ) + scope->variableValues( "DESTDIR" ).front(); else tmpPath = scope->variableValues( "DESTDIR" ).front(); } else { - tmpPath += QString( QChar( QDir::separator() ) ); + tmpPath += TQString( TQChar( TQDir::separator() ) ); } - tmpPath = QDir::cleanDirPath( tmpPath ); + tmpPath = TQDir::cleanDirPath( tmpPath ); - QString libString; + TQString libString; if ( !scope->variableValues( "TARGET" ).front().isEmpty() ) { - libString = tmpPath + QString( QChar( QDir::separator() ) ) + "lib" + scope->variableValues( "TARGET" ).front() + ".so"; + libString = tmpPath + TQString( TQChar( TQDir::separator() ) ) + "lib" + scope->variableValues( "TARGET" ).front() + ".so"; } else { - libString = tmpPath + QString( QChar( QDir::separator() ) ) + "lib" + scope->projectName() + ".so"; + libString = tmpPath + TQString( TQChar( TQDir::separator() ) ) + "lib" + scope->projectName() + ".so"; } return ( libString ); @@ -392,38 +392,38 @@ QString QMakeScopeItem::getSharedLibAddObject( QString basePath ) return ""; } -QString QMakeScopeItem::getApplicationObject( QString basePath ) +TQString QMakeScopeItem::getApplicationObject( TQString basePath ) { - QString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); - QString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() ); + TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); + TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() ); if ( !destdir.isEmpty() ) { - if ( QDir::isRelativePath( destdir ) ) - tmpPath += QString( QChar( QDir::separator() ) ) + destdir; + if ( TQDir::isRelativePath( destdir ) ) + tmpPath += TQString( TQChar( TQDir::separator() ) ) + destdir; else tmpPath = destdir; } else { - tmpPath += QString( QChar( QDir::separator() ) ); + tmpPath += TQString( TQChar( TQDir::separator() ) ); } - tmpPath = QDir::cleanDirPath( tmpPath ); + tmpPath = TQDir::cleanDirPath( tmpPath ); - QString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() ); + TQString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() ); if ( target.isEmpty() ) - return tmpPath + QString( QChar( QDir::separator() ) ) + scope->projectName(); + return tmpPath + TQString( TQChar( TQDir::separator() ) ) + scope->projectName(); else - return tmpPath + QString( QChar( QDir::separator() ) ) + target; + return tmpPath + TQString( TQChar( TQDir::separator() ) ) + target; } -QString QMakeScopeItem::getLibAddObject( QString basePath ) +TQString QMakeScopeItem::getLibAddObject( TQString basePath ) { if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) { - QString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() ); + TQString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() ); if ( !target.isEmpty() ) { return ( "-l" + target ); @@ -436,32 +436,32 @@ QString QMakeScopeItem::getLibAddObject( QString basePath ) else if ( scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 || scope->variableValues("TEMPLATE").findIndex("lib") != -1 ) { - QString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); - QString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() ); + TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); + TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() ); if ( !destdir.isEmpty() ) { - if ( QDir::isRelativePath( destdir ) ) - tmpPath += QString( QChar( QDir::separator() ) ) + destdir; + if ( TQDir::isRelativePath( destdir ) ) + tmpPath += TQString( TQChar( TQDir::separator() ) ) + destdir; else tmpPath = destdir; } else { - tmpPath += QString( QChar( QDir::separator() ) ); + tmpPath += TQString( TQChar( TQDir::separator() ) ); } - tmpPath = QDir::cleanDirPath( tmpPath ); + tmpPath = TQDir::cleanDirPath( tmpPath ); - QString libString; - QString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() ); + TQString libString; + TQString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() ); if ( !target.isEmpty() ) { - libString = tmpPath + QString( QChar( QDir::separator() ) ) + "lib" + target + ".a"; + libString = tmpPath + TQString( TQChar( TQDir::separator() ) ) + "lib" + target + ".a"; } else { - libString = tmpPath + QString( QChar( QDir::separator() ) ) + "lib" + scope->projectName() + ".a"; + libString = tmpPath + TQString( TQChar( TQDir::separator() ) ) + "lib" + scope->projectName() + ".a"; } return ( libString ); @@ -469,47 +469,47 @@ QString QMakeScopeItem::getLibAddObject( QString basePath ) return ( "" ); } -QString QMakeScopeItem::getLibAddPath( QString basePath ) +TQString QMakeScopeItem::getLibAddPath( TQString basePath ) { //PATH only add if shared lib if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) == -1 ) return ( "" ); - QString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); - QString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() ); + TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); + TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() ); if ( !destdir.isEmpty() ) { - if ( QDir::isRelativePath( destdir ) ) - tmpPath += QString( QChar( QDir::separator() ) ) + destdir; + if ( TQDir::isRelativePath( destdir ) ) + tmpPath += TQString( TQChar( TQDir::separator() ) ) + destdir; else tmpPath = destdir; } else { - tmpPath += QString( QChar( QDir::separator() ) ); + tmpPath += TQString( TQChar( TQDir::separator() ) ); } - tmpPath = QDir::cleanDirPath( tmpPath ); + tmpPath = TQDir::cleanDirPath( tmpPath ); return ( tmpPath ); } -QString QMakeScopeItem::getIncAddPath( QString basePath ) +TQString QMakeScopeItem::getIncAddPath( TQString basePath ) { - QString tmpPath = URLUtil::getRelativePath( basePath, scope->projectDir() ); - tmpPath = QDir::cleanDirPath( tmpPath ); + TQString tmpPath = URLUtil::getRelativePath( basePath, scope->projectDir() ); + tmpPath = TQDir::cleanDirPath( tmpPath ); return ( tmpPath ); } void QMakeScopeItem::buildSubTree() { - QValueList<Scope*>::const_iterator it; + TQValueList<Scope*>::const_iterator it; sortChildItems( 0, false ); - QValueList<Scope*> scopes = scope->scopesInOrder(); + TQValueList<Scope*> scopes = scope->scopesInOrder(); for ( it = scopes.begin(); it != scopes.end(); ++it ) { @@ -537,7 +537,7 @@ void QMakeScopeItem::init() } else { - QStringList tmp = scope->variableValues( "TEMPLATE" ); + TQStringList tmp = scope->variableValues( "TEMPLATE" ); if( scope->isEnabled() ) { if ( tmp.findIndex( "subdirs" ) != -1 ) @@ -565,19 +565,19 @@ void QMakeScopeItem::init() } } -GroupItem* QMakeScopeItem::createGroupItem( GroupItem::GroupType type, const QString& label, QMakeScopeItem* scopeitem ) +GroupItem* QMakeScopeItem::createGroupItem( GroupItem::GroupType type, const TQString& label, QMakeScopeItem* scopeitem ) { GroupItem * item = new GroupItem( scopeitem->listView(), type, label, scopeitem ); scopeitem->listView() ->takeItem( item ); return item; } -FileItem* QMakeScopeItem::createFileItem( const QString& name ) +FileItem* QMakeScopeItem::createFileItem( const TQString& name ) { - QString display = name; + TQString display = name; if( m_widget->showFilenamesOnly() ) { - int dirSepPos = name.findRev( QChar( QDir::separator() ) ); + int dirSepPos = name.findRev( TQChar( TQDir::separator() ) ); if ( dirSepPos != - 1 ) display = name.mid( dirSepPos + 1 ); } @@ -597,10 +597,10 @@ void QMakeScopeItem::buildGroups() { if( scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) return; - QStringList values; + TQStringList values; GroupItem* item; - QStringList::iterator it; + TQStringList::iterator it; values = scope->variableValues( "INSTALLS" ); item = createGroupItem( GroupItem::InstallRoot, "INSTALLS", this ); @@ -610,13 +610,13 @@ void QMakeScopeItem::buildGroups() if ( ( *it ) == "target" ) continue; - QString path = scope->variableValues( *it + ".path" ).front(); + TQString path = scope->variableValues( *it + ".path" ).front(); GroupItem* installitem = createGroupItem( GroupItem::InstallObject, *it, this ); item->installs.append( installitem ); - QStringList files = scope -> variableValues( *it + ".files" ); + TQStringList files = scope -> variableValues( *it + ".files" ); if ( !files.isEmpty() ) { - QStringList::iterator filesit = files.begin(); + TQStringList::iterator filesit = files.begin(); for ( ;filesit != files.end(); ++filesit ) { installitem->files.append( createFileItem( *filesit ) ); @@ -704,7 +704,7 @@ void QMakeScopeItem::buildGroups() for ( it = values.begin(); it != values.end(); ++it ) { FileItem* fitem = createFileItem( *it ); - fitem->uiFileLink = m_widget->getUiFileLink( relativePath() + QString( QChar( QDir::separator() ) ), scope->resolveVariables( *it ) ); + fitem->uiFileLink = m_widget->getUiFileLink( relativePath() + TQString( TQChar( TQDir::separator() ) ), scope->resolveVariables( *it ) ); item->files.append( fitem ); } @@ -714,78 +714,78 @@ void QMakeScopeItem::buildGroups() for ( it = values.begin(); it != values.end(); ++it ) { FileItem* fitem = createFileItem( *it ); - fitem->uiFileLink = m_widget->getUiFileLink( relativePath() + QString( QChar( QDir::separator() ) ), scope->resolveVariables( *it ) ); + fitem->uiFileLink = m_widget->getUiFileLink( relativePath() + TQString( TQChar( TQDir::separator() ) ), scope->resolveVariables( *it ) ); item->files.append( fitem ); } } -void QMakeScopeItem::removeValues( const QString& var, const QStringList& values ) +void QMakeScopeItem::removeValues( const TQString& var, const TQStringList& values ) { - for( QStringList::const_iterator it = values.begin() ; it != values.end(); ++it ) + for( TQStringList::const_iterator it = values.begin() ; it != values.end(); ++it ) { removeValue( var, *it ); } } -void QMakeScopeItem::addValues( const QString& var, const QStringList& values ) +void QMakeScopeItem::addValues( const TQString& var, const TQStringList& values ) { - for( QStringList::const_iterator it = values.begin() ; it != values.end(); ++it ) + for( TQStringList::const_iterator it = values.begin() ; it != values.end(); ++it ) { addValue( var, *it ); } } -void QMakeScopeItem::removeValue( const QString& var, const QString& value ) +void QMakeScopeItem::removeValue( const TQString& var, const TQString& value ) { if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).findIndex( value ) != -1 ) { if( scope->variableValuesForOp( var, "+=" ).findIndex(value) != -1 ) { - scope->removeFromPlusOp( var, QStringList( value ) ); + scope->removeFromPlusOp( var, TQStringList( value ) ); if( scope->variableValues( var ).findIndex( value ) != -1 ) { - scope->addToMinusOp( var, QStringList( value ) ); + scope->addToMinusOp( var, TQStringList( value ) ); } }else - scope->addToMinusOp( var, QStringList( value ) ); + scope->addToMinusOp( var, TQStringList( value ) ); }else if( scope->scopeType() == Scope::IncludeScope ) { - scope->addToMinusOp( var, QStringList( value ) ); + scope->addToMinusOp( var, TQStringList( value ) ); } } -void QMakeScopeItem::addValue( const QString& var, const QString& value ) +void QMakeScopeItem::addValue( const TQString& var, const TQString& value ) { if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).findIndex( value ) == -1 ) { if( scope->variableValuesForOp( var, "-=" ).findIndex(value) != -1 ) - scope->removeFromMinusOp( var, QStringList( value ) ); + scope->removeFromMinusOp( var, TQStringList( value ) ); else - scope->addToPlusOp( var, QStringList( value ) ); + scope->addToPlusOp( var, TQStringList( value ) ); }else if( scope->scopeType() == Scope::IncludeScope ) { - scope->addToPlusOp( var, QStringList( value ) ); + scope->addToPlusOp( var, TQStringList( value ) ); } } -void QMakeScopeItem::updateValues( const QString& var, const QStringList& values ) +void QMakeScopeItem::updateValues( const TQString& var, const TQStringList& values ) { - QStringList curValues = scope->variableValues( var, (scope->scopeType() != Scope::IncludeScope) ); - QStringList scopeValues = scope->variableValuesForOp( var, "+=" ); - for( QStringList::const_iterator it = curValues.begin(); it != curValues.end(); ++it ) + TQStringList curValues = scope->variableValues( var, (scope->scopeType() != Scope::IncludeScope) ); + TQStringList scopeValues = scope->variableValuesForOp( var, "+=" ); + for( TQStringList::const_iterator it = curValues.begin(); it != curValues.end(); ++it ) { if ( values.findIndex( *it ) == -1 ) { if( scopeValues.findIndex( *it ) != -1 ) { - scope->removeFromPlusOp( var, QStringList( *it ) ); + scope->removeFromPlusOp( var, TQStringList( *it ) ); scopeValues.remove( *it ); }else - scope->addToMinusOp( var, QStringList( *it ) ); + scope->addToMinusOp( var, TQStringList( *it ) ); } } - for( QStringList::const_iterator it = values.begin(); it != values.end(); ++it ) + for( TQStringList::const_iterator it = values.begin(); it != values.end(); ++it ) { if ( scopeValues.findIndex( *it ) != -1 ) { @@ -797,7 +797,7 @@ void QMakeScopeItem::updateValues( const QString& var, const QStringList& values scopeValues += values; // kdDebug(9024) << "values: " << values << "| scope:" << scopeValues << endl; scope->setPlusOp( var, scopeValues ); -// QStringList tmp = scope->variableValuesForOp( var, "+=" ); +// TQStringList tmp = scope->variableValuesForOp( var, "+=" ); // kdDebug(9024) << "result:" << tmp << endl; // kdDebug(9024) << "---------------------------------------" << endl; } @@ -816,18 +816,18 @@ QMakeScopeItem* QMakeScopeItem::projectFileItem() void QMakeScopeItem::reloadProject() { kdDebug(9024) << "Reloading Project" << endl; - QListViewItem* item = firstChild(); + TQListViewItem* item = firstChild(); while( item ) { - QListViewItem* olditem = item; + TQListViewItem* olditem = item; item = olditem->nextSibling(); delete olditem; } - QMap<GroupItem::GroupType, GroupItem*>::iterator it; + TQMap<GroupItem::GroupType, GroupItem*>::iterator it; for ( it = groups.begin() ; it != groups.end() ; ++it ) { GroupItem* s = it.data(); - QListView* l = s->listView(); + TQListView* l = s->listView(); if(l) l->removeItem(s); delete s; @@ -837,9 +837,9 @@ void QMakeScopeItem::reloadProject() init(); } -void QMakeScopeItem::disableSubprojects( const QStringList& dirs ) +void QMakeScopeItem::disableSubprojects( const TQStringList& dirs ) { - QStringList::const_iterator it = dirs.begin(); + TQStringList::const_iterator it = dirs.begin(); for( ; it != dirs.end() ; ++it) { if( scope->variableValues("SUBDIRS").findIndex(*it) != -1 ) @@ -850,7 +850,7 @@ void QMakeScopeItem::disableSubprojects( const QStringList& dirs ) else { QMakeScopeItem* newitem = new QMakeScopeItem( this, s->scopeName(), s ); - QListViewItem* lastitem = firstChild(); + TQListViewItem* lastitem = firstChild(); while( lastitem && lastitem->nextSibling() ) lastitem = lastitem->nextSibling(); if( lastitem ) @@ -861,7 +861,7 @@ void QMakeScopeItem::disableSubprojects( const QStringList& dirs ) } -int QMakeScopeItem::compare( QListViewItem* i, int , bool ) const +int QMakeScopeItem::compare( TQListViewItem* i, int , bool ) const { QMakeScopeItem* other = dynamic_cast<QMakeScopeItem*>(i); if( !i ) @@ -874,52 +874,52 @@ int QMakeScopeItem::compare( QListViewItem* i, int , bool ) const return 0; } -QMap<QString, QString> QMakeScopeItem::getLibInfos( QString basePath ) +TQMap<TQString, TQString> QMakeScopeItem::getLibInfos( TQString basePath ) { - QMap<QString, QString> result; + TQMap<TQString, TQString> result; if ( scope->variableValues( "TARGET" ).front().isEmpty() ) result["shared_lib"] = "-l"+scope->projectName(); else result["shared_lib"] = "-l"+scope->variableValues( "TARGET" ).front(); - QString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); + TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); if ( !scope->variableValues( "DESTDIR" ).front().isEmpty() ) { - if ( QDir::isRelativePath( scope->variableValues( "DESTDIR" ).front() ) ) - tmpPath += QString( QChar( QDir::separator() ) ) + scope->variableValues( "DESTDIR" ).front(); + if ( TQDir::isRelativePath( scope->variableValues( "DESTDIR" ).front() ) ) + tmpPath += TQString( TQChar( TQDir::separator() ) ) + scope->variableValues( "DESTDIR" ).front(); else tmpPath = scope->variableValues( "DESTDIR" ).front(); } else { - tmpPath += QString( QChar( QDir::separator() ) ); + tmpPath += TQString( TQChar( TQDir::separator() ) ); } - tmpPath = QDir::cleanDirPath( tmpPath ); + tmpPath = TQDir::cleanDirPath( tmpPath ); result["shared_libdir"] = "-L"+tmpPath; if ( scope->variableValues( "TARGET" ).front().isEmpty() ) - result["shared_depend"] = tmpPath+QString(QChar(QDir::separator()))+"lib"+scope->projectName()+".so"; + result["shared_depend"] = tmpPath+TQString(TQChar(TQDir::separator()))+"lib"+scope->projectName()+".so"; else - result["shared_depend"] = tmpPath+QString(QChar(QDir::separator()))+"lib"+scope->variableValues( "TARGET" ).front()+".so"; + result["shared_depend"] = tmpPath+TQString(TQChar(TQDir::separator()))+"lib"+scope->variableValues( "TARGET" ).front()+".so"; if ( scope->variableValues( "TARGET" ).front().isEmpty() ) - result["static_lib"] = tmpPath+QString(QChar(QDir::separator()))+"lib"+scope->projectName()+".a"; + result["static_lib"] = tmpPath+TQString(TQChar(TQDir::separator()))+"lib"+scope->projectName()+".a"; else - result["static_lib"] = tmpPath+QString(QChar(QDir::separator()))+"lib"+scope->variableValues( "TARGET" ).front()+".a"; + result["static_lib"] = tmpPath+TQString(TQChar(TQDir::separator()))+"lib"+scope->variableValues( "TARGET" ).front()+".a"; result["static_depend"] = result["static_lib"]; if ( scope->variableValues( "TARGET" ).front().isEmpty() ) - result["app_depend"] = tmpPath + QString( QChar( QDir::separator() ) ) + scope->projectName(); + result["app_depend"] = tmpPath + TQString( TQChar( TQDir::separator() ) ) + scope->projectName(); else - result["app_depend"] = tmpPath + QString( QChar( QDir::separator() ) ) + scope->variableValues( "TARGET" ).front(); + result["app_depend"] = tmpPath + TQString( TQChar( TQDir::separator() ) ) + scope->variableValues( "TARGET" ).front(); - QString map; - for( QMap<QString, QString>::const_iterator it = result.begin(); it != result.end(); ++it ) + TQString map; + for( TQMap<TQString, TQString>::const_iterator it = result.begin(); it != result.end(); ++it ) map += "["+it.key() + "=>" +it.data() + "],"; kdDebug(9024) << "Running getLibInfo for" << scope->projectName() << "|" << map << endl; return result; diff --git a/buildtools/qmake/qmakescopeitem.h b/buildtools/qmake/qmakescopeitem.h index b2c84345..7c02a33a 100644 --- a/buildtools/qmake/qmakescopeitem.h +++ b/buildtools/qmake/qmakescopeitem.h @@ -12,8 +12,8 @@ #ifndef _QMAKESCOPEITEM_H_ #define _QMAKESCOPEITEM_H_ -#include <qlistview.h> -#include <qstring.h> +#include <tqlistview.h> +#include <tqstring.h> class Scope; class QMakeScopeItem; @@ -28,10 +28,10 @@ class qProjectItem : public QListViewItem public: enum Type { Subproject, Group, File }; - qProjectItem( Type type, QListView *parent, const QString &text ); - qProjectItem( Type type, qProjectItem *parent, const QString &text ); + qProjectItem( Type type, TQListView *parent, const TQString &text ); + qProjectItem( Type type, qProjectItem *parent, const TQString &text ); - QString scopeString; + TQString scopeString; Type type() { return typ; } @@ -47,28 +47,28 @@ class GroupItem : public qProjectItem public: enum GroupType {NoType, Sources, Headers, Forms, Distfiles, Images, Resources, Lexsources, Yaccsources, Translations, IDLs, InstallRoot, InstallObject, MaxTypeEnum }; - static GroupType groupTypeForExtension( const QString &ext ); - static void groupTypeMeanings( GroupItem::GroupType type, QString& title, QString& ext ); + static GroupType groupTypeForExtension( const TQString &ext ); + static void groupTypeMeanings( GroupItem::GroupType type, TQString& title, TQString& ext ); - GroupItem( QListView *lv, GroupType type, const QString &text, QMakeScopeItem* spitem ); + GroupItem( TQListView *lv, GroupType type, const TQString &text, QMakeScopeItem* spitem ); - void removeFileFromScope( const QString& filename); - void addFileToScope( const QString& filename); - void addInstallObject( const QString& objectname); + void removeFileFromScope( const TQString& filename); + void addFileToScope( const TQString& filename); + void addInstallObject( const TQString& objectname); void removeInstallObject( GroupItem* item ); // qmake INSTALLS support - QPtrList<GroupItem> installs; - QPtrList<FileItem> files; + TQPtrList<GroupItem> installs; + TQPtrList<FileItem> files; -// QStringList str_files; -// QStringList str_files_exclude; +// TQStringList str_files; +// TQStringList str_files_exclude; // end qmake INSTALLS support GroupType groupType; QMakeScopeItem* owner; protected: - void paintCell( QPainter* p, const QColorGroup& cg, int column, int width, int align ); + void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align ); }; @@ -76,10 +76,10 @@ protected: class FileItem : public qProjectItem { public: - FileItem( QListView *lv, const QString &text ); + FileItem( TQListView *lv, const TQString &text ); - QString uiFileLink; - QString localFilePath; + TQString uiFileLink; + TQString localFilePath; }; /** @@ -88,30 +88,30 @@ public: class QMakeScopeItem : public qProjectItem { public: - QMakeScopeItem( QListView *parent, const QString &text, Scope *s, TrollProjectWidget* widget ); - QMakeScopeItem( QMakeScopeItem *parent, const QString &text, Scope* ); - void updateValues( const QString& var, const QStringList& values ); - void addValue( const QString& var, const QString& value ); - void removeValue( const QString& var, const QString& value ); - void addValues( const QString& var, const QStringList& values ); - void removeValues( const QString& var, const QStringList& values ); - void disableSubprojects( const QStringList& ); + QMakeScopeItem( TQListView *parent, const TQString &text, Scope *s, TrollProjectWidget* widget ); + QMakeScopeItem( QMakeScopeItem *parent, const TQString &text, Scope* ); + void updateValues( const TQString& var, const TQStringList& values ); + void addValue( const TQString& var, const TQString& value ); + void removeValue( const TQString& var, const TQString& value ); + void addValues( const TQString& var, const TQStringList& values ); + void removeValues( const TQString& var, const TQStringList& values ); + void disableSubprojects( const TQStringList& ); void reloadProject(); - int compare( QListViewItem* i, int col, bool ascending ) const; + int compare( TQListViewItem* i, int col, bool ascending ) const; ~QMakeScopeItem(); - QMap<GroupItem::GroupType, GroupItem*> groups; + TQMap<GroupItem::GroupType, GroupItem*> groups; Scope* scope; - QString relativePath(); - QString getLibAddPath( QString ); - QString getLibAddObject( QString ); - QString getSharedLibAddObject( QString ); - QString getApplicationObject( QString ); - QString getIncAddPath( QString downDirs ); - FileItem* createFileItem(const QString& file); - GroupItem* createGroupItem(GroupItem::GroupType type, const QString& name, QMakeScopeItem* scopeitem); - QMap<QString, QString> getLibInfos( QString ); + TQString relativePath(); + TQString getLibAddPath( TQString ); + TQString getLibAddObject( TQString ); + TQString getSharedLibAddObject( TQString ); + TQString getApplicationObject( TQString ); + TQString getIncAddPath( TQString downDirs ); + FileItem* createFileItem(const TQString& file); + GroupItem* createGroupItem(GroupItem::GroupType type, const TQString& name, QMakeScopeItem* scopeitem); + TQMap<TQString, TQString> getLibInfos( TQString ); QMakeScopeItem* projectFileItem(); diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp index c090861b..3f182ded 100644 --- a/buildtools/qmake/scope.cpp +++ b/buildtools/qmake/scope.cpp @@ -13,13 +13,13 @@ #include <kdebug.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qdir.h> -#include <qpair.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqdir.h> +#include <tqpair.h> #include <qmakedriver.h> -#include <qregexp.h> -#include <qtimer.h> +#include <tqregexp.h> +#include <tqtimer.h> #include <kdirwatch.h> @@ -31,16 +31,16 @@ #include "trollprojectpart.h" #include "qmakedefaultopts.h" -const QStringList Scope::KnownVariables = QStringList() << "QT" << "CONFIG" << "TEMPLATE" << "SUBDIRS" << "VERSION" << "LIBS" << "target.path" << "INSTALLS" << "MAKEFILE" << "TARGETDEPS" << "INCLUDEPATH" << "TARGET" << "DESTDIR" << "DEFINES" << "QMAKE_CXXFLAGS_DEBUG" << "QMAKE_CXXFLAGS_RELEASE" << "OBJECTS_DIR" << "UI_DIR" << "MOC_DIR" << "IDL_COMPILER" << "IDL_OPTIONS" << "RCC_DIR" << "IDLS" << "RESOURCES" << "IMAGES" << "LEXSOURCES" << "DISTFILES" << "YACCSOURCES" << "TRANSLATIONS" << "HEADERS" << "SOURCES" << "INTERFACES" << "FORMS" ; +const TQStringList Scope::KnownVariables = TQStringList() << "QT" << "CONFIG" << "TEMPLATE" << "SUBDIRS" << "VERSION" << "LIBS" << "target.path" << "INSTALLS" << "MAKEFILE" << "TARGETDEPS" << "INCLUDEPATH" << "TARGET" << "DESTDIR" << "DEFINES" << "QMAKE_CXXFLAGS_DEBUG" << "QMAKE_CXXFLAGS_RELEASE" << "OBJECTS_DIR" << "UI_DIR" << "MOC_DIR" << "IDL_COMPILER" << "IDL_OPTIONS" << "RCC_DIR" << "IDLS" << "RESOURCES" << "IMAGES" << "LEXSOURCES" << "DISTFILES" << "YACCSOURCES" << "TRANSLATIONS" << "HEADERS" << "SOURCES" << "INTERFACES" << "FORMS" ; -const QStringList Scope::KnownConfigValues = QStringList() << "debug" << "release" << "debug_and_release" << "warn_on" << "warn_off" << "staticlib" << "dll" << "plugin" << "designer" << "create_pkgconf" << "create_libtool" << "qt" << "console" << "windows" << "x11" << "thread" << "exceptions" << "stl" << "rtti" << "opengl" << "thread" << "ordered" << "precompile_header" << "qtestlib" << "uitools" << "dbus" << "assistant" << "build_all" << "help"; +const TQStringList Scope::KnownConfigValues = TQStringList() << "debug" << "release" << "debug_and_release" << "warn_on" << "warn_off" << "staticlib" << "dll" << "plugin" << "designer" << "create_pkgconf" << "create_libtool" << "qt" << "console" << "windows" << "x11" << "thread" << "exceptions" << "stl" << "rtti" << "opengl" << "thread" << "ordered" << "precompile_header" << "qtestlib" << "uitools" << "dbus" << "assistant" << "build_all" << "help"; -Scope::Scope( const QMap<QString, QString>& env, const QString &filename, TrollProjectPart* part ) +Scope::Scope( const TQMap<TQString, TQString>& env, const TQString &filename, TrollProjectPart* part ) : m_root( 0 ), m_incast( 0 ), m_parent( 0 ), m_num(0), m_isEnabled( true ), m_part(part), m_defaultopts(0), m_environment( env ) { if ( !loadFromFile( filename ) ) { - if( !QFileInfo( filename ).exists() ) + if( !TQFileInfo( filename ).exists() ) { m_root = new QMake::ProjectAST(); m_root->setFileName( filename ); @@ -60,7 +60,7 @@ Scope::Scope( const QMap<QString, QString>& env, const QString &filename, TrollP Scope::~Scope() { - QMap<unsigned int, Scope*>::iterator it; + TQMap<unsigned int, Scope*>::iterator it; for ( it = m_scopes.begin() ; it != m_scopes.end() ; ++it ) { Scope* s = it.data(); @@ -80,7 +80,7 @@ Scope::~Scope() } // Simple/Function Scopes -Scope::Scope( const QMap<QString, QString>& env, unsigned int num, Scope* parent, QMake::ProjectAST* scope, +Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, QMake::ProjectAST* scope, QMakeDefaultOpts* defaultopts, TrollProjectPart* part ) : m_root( scope ), m_incast( 0 ), m_parent( parent ), m_num(num), m_isEnabled( true ), m_part(part), m_defaultopts(defaultopts), m_environment( env ) @@ -89,14 +89,14 @@ Scope::Scope( const QMap<QString, QString>& env, unsigned int num, Scope* parent } //Subdirs -Scope::Scope( const QMap<QString, QString>& env, unsigned int num, Scope* parent, const QString& filename, +Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, const TQString& filename, TrollProjectPart* part, bool isEnabled ) : m_root( 0 ), m_incast( 0 ), m_parent( parent ), m_num(num), m_isEnabled( isEnabled ), m_part(part), m_defaultopts(0), m_environment( env ) { if ( !loadFromFile( filename ) ) { - if( !QFileInfo( filename ).exists() && QFileInfo( QFileInfo( filename ).dirPath( true ) ).exists() ) + if( !TQFileInfo( filename ).exists() && TQFileInfo( TQFileInfo( filename ).dirPath( true ) ).exists() ) { m_root = new QMake::ProjectAST(); m_root->setFileName( filename ); @@ -114,27 +114,27 @@ Scope::Scope( const QMap<QString, QString>& env, unsigned int num, Scope* parent } //Include Scope -Scope::Scope( const QMap<QString, QString>& env, unsigned int num, Scope* parent, QMake::IncludeAST* incast, const QString& path, - const QString& incfile, QMakeDefaultOpts* defaultopts, TrollProjectPart* part ) +Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, QMake::IncludeAST* incast, const TQString& path, + const TQString& incfile, QMakeDefaultOpts* defaultopts, TrollProjectPart* part ) : m_root( 0 ), m_incast( incast ), m_parent( parent ), m_num(num), m_isEnabled( true ), m_part(part), m_defaultopts(defaultopts), m_environment( env ) { - QString absfilename; - QString tmp = incfile.stripWhiteSpace(); + TQString absfilename; + TQString tmp = incfile.stripWhiteSpace(); if( tmp.contains(")" ) ) tmp = tmp.mid(0, tmp.find(")") ); if( tmp.startsWith( "\"" ) ) tmp = tmp.mid( 1, tmp.length()-2 ); - if( QFileInfo(tmp).isRelative() ) + if( TQFileInfo(tmp).isRelative() ) { - absfilename = QDir::cleanDirPath( path + QString( QChar( QDir::separator() ) ) + tmp ); + absfilename = TQDir::cleanDirPath( path + TQString( TQChar( TQDir::separator() ) ) + tmp ); }else - absfilename = QDir::cleanDirPath( tmp ); + absfilename = TQDir::cleanDirPath( tmp ); if ( !loadFromFile( absfilename ) ) { - if( !QFileInfo( absfilename ).exists() && QFileInfo( QFileInfo( absfilename ).dirPath( true ) ).exists() ) + if( !TQFileInfo( absfilename ).exists() && TQFileInfo( TQFileInfo( absfilename ).dirPath( true ) ).exists() ) { m_root = new QMake::ProjectAST(); m_root->setFileName( absfilename ); @@ -150,9 +150,9 @@ Scope::Scope( const QMap<QString, QString>& env, unsigned int num, Scope* parent init(); } -bool Scope::loadFromFile( const QString& filename ) +bool Scope::loadFromFile( const TQString& filename ) { - if ( !QFileInfo(filename).exists() || QMake::Driver::parseFile( filename, &m_root, 0 ) != 0 ) + if ( !TQFileInfo(filename).exists() || QMake::Driver::parseFile( filename, &m_root, 0 ) != 0 ) { kdDebug( 9024 ) << "Couldn't parse project: " << filename << endl; if( DomUtil::readBoolEntry( *m_part->projectDom(), @@ -179,20 +179,20 @@ void Scope::saveToFile() const return; } - QString filename; + TQString filename; if ( scopeType() == ProjectScope ) filename = m_root->fileName() ; else if ( scopeType() == IncludeScope ) - filename = m_parent->projectDir() + QString( QChar( QDir::separator() ) ) + m_incast->projectName; + filename = m_parent->projectDir() + TQString( TQChar( TQDir::separator() ) ) + m_incast->projectName; if ( filename.isEmpty() ) return ; m_part->dirWatch()->stopScan(); - QFile file( filename ); + TQFile file( filename ); if ( file.open( IO_WriteOnly ) ) { - QTextStream out( &file ); - QString astbuffer; + TQTextStream out( &file ); + TQString astbuffer; m_root->writeBack( astbuffer ); out << astbuffer; file.close(); @@ -208,7 +208,7 @@ void Scope::saveToFile() const m_part->dirWatch()->startScan(); } -void Scope::addToPlusOp( const QString& variable, const QStringList& values ) +void Scope::addToPlusOp( const TQString& variable, const TQStringList& values ) { if ( !m_root ) return ; @@ -216,7 +216,7 @@ void Scope::addToPlusOp( const QString& variable, const QStringList& values ) updateVariable( variable, "+=", values, false ); } -void Scope::removeFromPlusOp( const QString& variable, const QStringList& values ) +void Scope::removeFromPlusOp( const TQString& variable, const TQStringList& values ) { if ( !m_root ) return ; @@ -225,7 +225,7 @@ void Scope::removeFromPlusOp( const QString& variable, const QStringList& values } -void Scope::addToMinusOp( const QString& variable, const QStringList& values ) +void Scope::addToMinusOp( const TQString& variable, const TQStringList& values ) { if ( !m_root ) return ; @@ -233,7 +233,7 @@ void Scope::addToMinusOp( const QString& variable, const QStringList& values ) updateVariable( variable, "-=", values, false ); } -void Scope::removeFromMinusOp( const QString& variable, const QStringList& values ) +void Scope::removeFromMinusOp( const TQString& variable, const TQStringList& values ) { if ( !m_root ) return ; @@ -241,7 +241,7 @@ void Scope::removeFromMinusOp( const QString& variable, const QStringList& value updateVariable( variable, "-=", values, true ); } -void Scope::addToEqualOp( const QString& variable, const QStringList& values ) +void Scope::addToEqualOp( const TQString& variable, const TQStringList& values ) { if ( !m_root ) return ; @@ -249,7 +249,7 @@ void Scope::addToEqualOp( const QString& variable, const QStringList& values ) updateVariable( variable, "=", values, false ); } -void Scope::removeFromEqualOp( const QString& variable, const QStringList& values ) +void Scope::removeFromEqualOp( const TQString& variable, const TQStringList& values ) { if ( !m_root ) return ; @@ -257,7 +257,7 @@ void Scope::removeFromEqualOp( const QString& variable, const QStringList& value updateVariable( variable, "=", values, true ); } -void Scope::setPlusOp( const QString& variable, const QStringList& values ) +void Scope::setPlusOp( const TQString& variable, const TQStringList& values ) { if( !m_root || Scope::listsEqual(values, variableValuesForOp(variable, "+=") ) ) return; @@ -266,7 +266,7 @@ void Scope::setPlusOp( const QString& variable, const QStringList& values ) updateVariable( variable, "+=", values, false ); } -void Scope::setEqualOp( const QString& variable, const QStringList& values ) +void Scope::setEqualOp( const TQString& variable, const TQStringList& values ) { if( !m_root || Scope::listsEqual(values, variableValuesForOp(variable, "=") ) ) return; @@ -275,7 +275,7 @@ void Scope::setEqualOp( const QString& variable, const QStringList& values ) updateVariable( variable, "=", values, false ); } -void Scope::setMinusOp( const QString& variable, const QStringList& values ) +void Scope::setMinusOp( const TQString& variable, const TQStringList& values ) { if( !m_root || Scope::listsEqual(values, variableValuesForOp(variable, "-=") ) ) return; @@ -284,14 +284,14 @@ void Scope::setMinusOp( const QString& variable, const QStringList& values ) updateVariable( variable, "-=", values, false ); } -QStringList Scope::variableValuesForOp( const QString& variable , const QString& op ) const +TQStringList Scope::variableValuesForOp( const TQString& variable , const TQString& op ) const { - QStringList result; + TQStringList result; if( !m_root ) return result; - QValueList<QMake::AST*>::const_iterator it; + TQValueList<QMake::AST*>::const_iterator it; for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it ) { QMake::AST* ast = *it; @@ -308,9 +308,9 @@ QStringList Scope::variableValuesForOp( const QString& variable , const QString& return result; } -QStringList Scope::variableValues( const QString& variable, bool checkIncParent, bool fetchFromParent, bool evaluateSubScopes ) +TQStringList Scope::variableValues( const TQString& variable, bool checkIncParent, bool fetchFromParent, bool evaluateSubScopes ) { - QStringList result; + TQStringList result; if ( !m_root ) return result; @@ -329,7 +329,7 @@ QStringList Scope::variableValues( const QString& variable, bool checkIncParent, return result; } -void Scope::calcValuesFromStatements( const QString& variable, QStringList& result, bool checkIncParent, QMake::AST* stopHere, bool fetchFromParent, bool setDefault, bool evaluateSubScopes ) const +void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& result, bool checkIncParent, QMake::AST* stopHere, bool fetchFromParent, bool setDefault, bool evaluateSubScopes ) const { if( !m_root ) return; @@ -351,7 +351,7 @@ void Scope::calcValuesFromStatements( const QString& variable, QStringList& resu m_parent->calcValuesFromStatements( variable, result, true, this->m_incast, fetchFromParent, setDefault, evaluateSubScopes ); } - QValueList<QMake::AST*>::const_iterator it; + TQValueList<QMake::AST*>::const_iterator it; for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it ) { if ( stopHere && *it == stopHere ) @@ -368,7 +368,7 @@ void Scope::calcValuesFromStatements( const QString& variable, QStringList& resu } else if ( assign->op == "+=" ) { - for ( QStringList::const_iterator sit = assign->values.begin(); sit != assign->values.end() ; ++sit ) + for ( TQStringList::const_iterator sit = assign->values.begin(); sit != assign->values.end() ; ++sit ) { if ( result.findIndex( *sit ) == -1 ) result.append( *sit ); @@ -376,7 +376,7 @@ void Scope::calcValuesFromStatements( const QString& variable, QStringList& resu } else if ( assign->op == "-=" ) { - for ( QStringList::const_iterator sit = assign->values.begin(); sit != assign->values.end() ; ++sit ) + for ( TQStringList::const_iterator sit = assign->values.begin(); sit != assign->values.end() ; ++sit ) { if ( result.findIndex( *sit ) != -1 ) result.remove( *sit ); @@ -388,7 +388,7 @@ void Scope::calcValuesFromStatements( const QString& variable, QStringList& resu if( ast->nodeType() == QMake::AST::IncludeAST ) { QMake::IncludeAST* iast = static_cast<QMake::IncludeAST*>(ast); - QValueList<unsigned int> l = m_scopes.keys(); + TQValueList<unsigned int> l = m_scopes.keys(); for( unsigned int i = 0; i < l.count(); ++i ) { int num = l[ i ]; @@ -408,7 +408,7 @@ void Scope::calcValuesFromStatements( const QString& variable, QStringList& resu QMake::ProjectAST* past = static_cast<QMake::ProjectAST*>(ast); if( past->isFunctionScope() || past->isScope() ) { - QValueList<unsigned int> l = m_scopes.keys(); + TQValueList<unsigned int> l = m_scopes.keys(); for( unsigned int i = 0; i < l.count(); ++i ) { int num = l[ i ]; @@ -445,7 +445,7 @@ Scope::ScopeType Scope::scopeType() const return InvalidScope; } -QString Scope::scopeName() const +TQString Scope::scopeName() const { if ( !m_root ) return ""; @@ -457,31 +457,31 @@ QString Scope::scopeName() const return m_root->scopedID; else if ( m_root->isProject() ) { - if( m_parent && QDir::cleanDirPath( m_parent->projectDir() ) != QDir::cleanDirPath( projectDir() ) ) + if( m_parent && TQDir::cleanDirPath( m_parent->projectDir() ) != TQDir::cleanDirPath( projectDir() ) ) { return URLUtil::getRelativePath( m_parent->projectDir(), projectDir() ); - }else if ( m_parent && QDir::cleanDirPath( m_parent->projectDir() ) == QDir::cleanDirPath( projectDir() ) ) + }else if ( m_parent && TQDir::cleanDirPath( m_parent->projectDir() ) == TQDir::cleanDirPath( projectDir() ) ) { return fileName(); }else - return QFileInfo( projectDir() ).fileName() ; + return TQFileInfo( projectDir() ).fileName() ; } - return QString(); + return TQString(); } -QString Scope::fileName() const +TQString Scope::fileName() const { if( !m_root ) return ""; if ( m_incast ) return m_incast->projectName; else if ( m_root->isProject() ) - return QFileInfo( m_root->fileName() ).fileName(); + return TQFileInfo( m_root->fileName() ).fileName(); else return m_parent->fileName(); } -Scope* Scope::createFunctionScope( const QString& funcName, const QString& args ) +Scope* Scope::createFunctionScope( const TQString& funcName, const TQString& args ) { if ( !m_root ) return 0; @@ -503,7 +503,7 @@ Scope* Scope::createFunctionScope( const QString& funcName, const QString& args return 0; } -Scope* Scope::createSimpleScope( const QString& scopename ) +Scope* Scope::createSimpleScope( const TQString& scopename ) { if ( !m_root ) return 0; @@ -516,7 +516,7 @@ Scope* Scope::createSimpleScope( const QString& scopename ) m_root->addChildAST( new QMake::NewLineAST() ); /* We can't unconditionally add the scope name to CONFIG, scope might be win32 which may only be in CONFIG under windows. if ( m_part->isQt4Project() ) - addToPlusOp( "CONFIG", QStringList( scopename ) ); + addToPlusOp( "CONFIG", TQStringList( scopename ) ); */ Scope* simpleScope = new Scope( m_environment, getNextScopeNum(), this, ast, m_defaultopts, m_part ); @@ -530,7 +530,7 @@ Scope* Scope::createSimpleScope( const QString& scopename ) } -Scope* Scope::createIncludeScope( const QString& includeFile, bool negate ) +Scope* Scope::createIncludeScope( const TQString& includeFile, bool negate ) { if ( !m_root ) return 0; @@ -566,7 +566,7 @@ Scope* Scope::createIncludeScope( const QString& includeFile, bool negate ) } -Scope* Scope::createSubProject( const QString& projname ) +Scope* Scope::createSubProject( const TQString& projname ) { if( !m_root ) return 0; @@ -574,30 +574,30 @@ Scope* Scope::createSubProject( const QString& projname ) if( variableValuesForOp( "SUBDIRS", "-=").findIndex( projname ) != -1 ) removeFromMinusOp( "SUBDIRS", projname ); - QString realprojname = resolveVariables(projname); + TQString realprojname = resolveVariables(projname); if( variableValuesForOp( "SUBDIRS", "-=").findIndex( realprojname ) != -1 ) removeFromMinusOp( "SUBDIRS", realprojname ); - QDir curdir( projectDir() ); + TQDir curdir( projectDir() ); if ( variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 ) { - QString filename; + TQString filename; if( !realprojname.endsWith(".pro") ) { if ( !curdir.exists( realprojname ) ) if ( !curdir.mkdir( realprojname ) ) return 0; curdir.cd( realprojname ); - QStringList entries = curdir.entryList("*.pro", QDir::Files); + TQStringList entries = curdir.entryList("*.pro", TQDir::Files); if ( !entries.isEmpty() && entries.findIndex( curdir.dirName()+".pro" ) == -1 ) - filename = curdir.absPath() + QString(QChar(QDir::separator()))+entries.first(); + filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+entries.first(); else - filename = curdir.absPath() + QString(QChar(QDir::separator()))+curdir.dirName()+".pro"; + filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+curdir.dirName()+".pro"; }else - filename = curdir.absPath() + QString(QChar(QDir::separator())) + realprojname; + filename = curdir.absPath() + TQString(TQChar(TQDir::separator())) + realprojname; kdDebug( 9024 ) << "Creating subproject with filename:" << filename << endl; @@ -606,9 +606,9 @@ Scope* Scope::createSubProject( const QString& projname ) if ( s->scopeType() != InvalidScope ) { if( s->variableValues("TEMPLATE").isEmpty() ) - s->setEqualOp("TEMPLATE", QStringList("app")); + s->setEqualOp("TEMPLATE", TQStringList("app")); s->saveToFile(); - addToPlusOp( "SUBDIRS", QStringList( realprojname ) ); + addToPlusOp( "SUBDIRS", TQStringList( realprojname ) ); m_scopes.insert( getNextScopeNum(), s ); return s; } else @@ -685,7 +685,7 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir ) if ( !m_root || !m_scopes.contains( num ) ) return false; - QValueList<QMake::AST*>::iterator it = findExistingVariable( "TEMPLATE" ); + TQValueList<QMake::AST*>::iterator it = findExistingVariable( "TEMPLATE" ); if ( it != m_root->m_children.end() ) { QMake::AssignmentAST * tempast = static_cast<QMake::AssignmentAST*>( *it ); @@ -695,18 +695,18 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir ) if( !project ) return false; - QString projdir = project->scopeName(); + TQString projdir = project->scopeName(); if ( deleteSubdir ) { - QDir projdir = QDir( projectDir() ); - QString dir = project->scopeName(); + TQDir projdir = TQDir( projectDir() ); + TQString dir = project->scopeName(); if( !dir.endsWith(".pro") ) { - QDir subdir = QDir( projectDir() + QString( QChar( QDir::separator() ) ) + dir ); + TQDir subdir = TQDir( projectDir() + TQString( TQChar( TQDir::separator() ) ) + dir ); if ( subdir.exists() ) { - QStringList entries = subdir.entryList(); - for ( QStringList::iterator eit = entries.begin() ; eit != entries.end() ; ++eit ) + TQStringList entries = subdir.entryList(); + for ( TQStringList::iterator eit = entries.begin() ; eit != entries.end() ; ++eit ) { if( *eit == "." || *eit == ".." ) continue; @@ -718,15 +718,15 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir ) } }else { - QDir d( project->projectDir() ); + TQDir d( project->projectDir() ); kdDebug(9024) << "removed subproject?:" << d.remove( dir ) << endl; } } - QValueList<QMake::AST*>::iterator foundit = findExistingVariable( "SUBDIRS" ); + TQValueList<QMake::AST*>::iterator foundit = findExistingVariable( "SUBDIRS" ); if ( foundit != m_root->m_children.end() ) { QMake::AssignmentAST * ast = static_cast<QMake::AssignmentAST*>( *foundit ); - updateValues( ast->values, QStringList( projdir ), true, ast->indent ); + updateValues( ast->values, TQStringList( projdir ), true, ast->indent ); if( m_varCache.contains( "SUBDIRS" ) ) m_varCache.erase( "SUBDIRS" ); }else @@ -739,12 +739,12 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir ) return false; } -void Scope::updateValues( QStringList& origValues, const QStringList& newValues, bool remove, QString indent ) +void Scope::updateValues( TQStringList& origValues, const TQStringList& newValues, bool remove, TQString indent ) { if( !m_root ) return; - for ( QStringList::const_iterator it = newValues.begin(); it != newValues.end() ; ++it ) + for ( TQStringList::const_iterator it = newValues.begin(); it != newValues.end() ; ++it ) { if ( origValues.findIndex( *it ) == -1 && !remove ) { @@ -767,8 +767,8 @@ void Scope::updateValues( QStringList& origValues, const QStringList& newValues, origValues.append( indent ); }else if ( origValues.isEmpty() ) origValues.append(" "); - QString newval = *it; - QRegExp re("([^$])\\$([^$\\(\\)\\{\\} /]*)( |\\)|/)"); + TQString newval = *it; + TQRegExp re("([^$])\\$([^$\\(\\)\\{\\} /]*)( |\\)|/)"); newval.replace(re, "\\1$(\\2)\\3"); if( (newval).contains(" ") || (newval).contains("\t") || (newval).contains( getLineEndingString() ) || (newval).contains("#") ) origValues.append( "\""+newval+"\"" ); @@ -777,9 +777,9 @@ void Scope::updateValues( QStringList& origValues, const QStringList& newValues, origValues.append( getLineEndingString() ); } else if ( origValues.findIndex( *it ) != -1 && remove ) { - QStringList::iterator posit = origValues.find( *it ); + TQStringList::iterator posit = origValues.find( *it ); posit = origValues.remove( posit ); - while( posit != origValues.end() && ( (*posit).find( QRegExp("\\\\[\\s]*"+getLineEndingString() ) ) != -1 + while( posit != origValues.end() && ( (*posit).find( TQRegExp("\\\\[\\s]*"+getLineEndingString() ) ) != -1 || (*posit).stripWhiteSpace() == "" ) ) { posit = origValues.remove( posit ); @@ -790,13 +790,13 @@ void Scope::updateValues( QStringList& origValues, const QStringList& newValues, || origValues.last() == getLineEndingString() || origValues.last().stripWhiteSpace() == "" ) && !origValues.isEmpty() ) origValues.pop_back(); - if( !origValues.isEmpty() && origValues.last().find( QRegExp("\\\\[ \t]*#") ) != -1 ) + if( !origValues.isEmpty() && origValues.last().find( TQRegExp("\\\\[ \t]*#") ) != -1 ) origValues[origValues.count()-1] = origValues[origValues.count()-1].mid(origValues[origValues.count()-1].find( "#") ); if( !origValues.isEmpty() && origValues.last().find( getLineEndingString() ) == -1 ) origValues.append(getLineEndingString()); } -void Scope::updateVariable( const QString& variable, const QString& op, const QStringList& values, bool removeFromOp ) +void Scope::updateVariable( const TQString& variable, const TQString& op, const TQStringList& values, bool removeFromOp ) { if ( !m_root || listIsEmpty( values ) ) return ; @@ -821,7 +821,7 @@ void Scope::updateVariable( const QString& variable, const QString& op, const QS } else if ( assignment->scopedID == variable && !Scope::isCompatible( assignment->op, op ) ) { - for ( QStringList::const_iterator it = values.begin() ; it != values.end() ; ++it ) + for ( TQStringList::const_iterator it = values.begin() ; it != values.end() ; ++it ) { if ( op == "+=" && !removeFromOp && assignment->values.findIndex( *it ) != -1 ) { @@ -832,7 +832,7 @@ void Scope::updateVariable( const QString& variable, const QString& op, const QS } else if ( assignment->op == "-=" ) { - updateValues( assignment->values, QStringList( *it ), true, assignment->indent ); + updateValues( assignment->values, TQStringList( *it ), true, assignment->indent ); if ( listIsEmpty( assignment->values ) ) { m_root->removeChildAST( assignment ); @@ -843,7 +843,7 @@ void Scope::updateVariable( const QString& variable, const QString& op, const QS } else if ( op == "-=" && !removeFromOp && assignment->values.findIndex( *it ) != -1 ) { - updateValues( assignment->values, QStringList( *it ), true, assignment->indent ); + updateValues( assignment->values, TQStringList( *it ), true, assignment->indent ); if ( listIsEmpty( assignment->values ) ) { m_root->removeChildAST( assignment ); @@ -860,7 +860,7 @@ void Scope::updateVariable( const QString& variable, const QString& op, const QS } else if ( assignment->op == "+=" && assignment->values.findIndex( *it ) != -1 ) { - updateValues( assignment->values, QStringList( *it ), true, assignment->indent ); + updateValues( assignment->values, TQStringList( *it ), true, assignment->indent ); if ( listIsEmpty( assignment->values ) ) { m_root->removeChildAST( assignment ); @@ -892,10 +892,10 @@ void Scope::updateVariable( const QString& variable, const QString& op, const QS } } -QValueList<QMake::AST*>::iterator Scope::findExistingVariable( const QString& variable ) +TQValueList<QMake::AST*>::iterator Scope::findExistingVariable( const TQString& variable ) { - QValueList<QMake::AST*>::iterator it; - QStringList ops; + TQValueList<QMake::AST*>::iterator it; + TQStringList ops; ops << "=" << "+="; for ( it = m_root->m_children.begin(); it != m_root->m_children.end() ; ++it ) @@ -920,7 +920,7 @@ void Scope::init() kdDebug(9024) << "Initializing Scope: " << scopeName() << this << endl; m_maxCustomVarNum = 1; - QValueList<QMake::AST*>::const_iterator it; + TQValueList<QMake::AST*>::const_iterator it; for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it ) { if ( ( *it ) ->nodeType() == QMake::AST::ProjectAST ) @@ -931,7 +931,7 @@ void Scope::init() else if ( ( *it ) ->nodeType() == QMake::AST::IncludeAST ) { QMake::IncludeAST * i = static_cast<QMake::IncludeAST*>( *it ); - QString filename = i->projectName; + TQString filename = i->projectName; if( i->projectName.stripWhiteSpace().startsWith("$") ) { filename = resolveVariables(i->projectName, *it); @@ -944,36 +944,36 @@ void Scope::init() // Check wether TEMPLATE==subdirs here too! if ( m->scopedID == "SUBDIRS" && variableValues("TEMPLATE").findIndex("subdirs") != -1 ) { - for ( QStringList::const_iterator sit = m->values.begin() ; sit != m->values.end(); ++sit ) + for ( TQStringList::const_iterator sit = m->values.begin() ; sit != m->values.end(); ++sit ) { - QString str = *sit; + TQString str = *sit; if ( containsContinue( str ) || isComment( str ) || str == getLineEndingString() || str == "." || str == "./" || (str).stripWhiteSpace() == "" ) continue; - QDir subproject; - QString projectfile; + TQDir subproject; + TQString projectfile; kdDebug(9024) << "reading subproject: " << str << endl; if( str.startsWith("$") ) str = resolveVariables(str, *it); if( str.endsWith(".pro") ) { - subproject = QDir( projectDir(), "*.pro", QDir::Name | QDir::IgnoreCase, QDir::Files ); + subproject = TQDir( projectDir(), "*.pro", TQDir::Name | TQDir::IgnoreCase, TQDir::Files ); projectfile = str; }else { - QString dir = str; - if( QFileInfo( dir ).isRelative() ) - dir = projectDir() + QString( QChar( QDir::separator() ) ) + dir; - subproject = QDir( dir, - "*.pro", QDir::Name | QDir::IgnoreCase, QDir::Files ); + TQString dir = str; + if( TQFileInfo( dir ).isRelative() ) + dir = projectDir() + TQString( TQChar( TQDir::separator() ) ) + dir; + subproject = TQDir( dir, + "*.pro", TQDir::Name | TQDir::IgnoreCase, TQDir::Files ); if( !subproject.exists() ) { kdDebug(9024) << "Project Dir doesn't exist, trying to find name.subdir variable:" << str << endl; if( !variableValues(str+".subdir").isEmpty() ) { kdDebug(9024) << "Found name.subdir variable for " << str << endl; - subproject = QDir( projectDir() + QString( QChar( QDir::separator() ) ) + subproject = TQDir( projectDir() + TQString( TQChar( TQDir::separator() ) ) + variableValues(str+".subdir").first(), - "*.pro", QDir::Name | QDir::IgnoreCase, QDir::Files ); + "*.pro", TQDir::Name | TQDir::IgnoreCase, TQDir::Files ); }else continue; } @@ -1012,21 +1012,21 @@ void Scope::init() } } -QString Scope::projectName() const +TQString Scope::projectName() const { if( !m_root ) return ""; - return QFileInfo( projectDir() ).fileName(); + return TQFileInfo( projectDir() ).fileName(); } -QString Scope::projectDir() const +TQString Scope::projectDir() const { if( !m_root ) return ""; if ( m_root->isProject() ) { - return QFileInfo( m_root->fileName() ).dirPath( true ); + return TQFileInfo( m_root->fileName() ).dirPath( true ); } else { @@ -1034,16 +1034,16 @@ QString Scope::projectDir() const } } -const QMap<unsigned int, QMap<QString, QString> > Scope::customVariables() const +const TQMap<unsigned int, TQMap<TQString, TQString> > Scope::customVariables() const { - QMap<unsigned int, QMap<QString, QString> > result; + TQMap<unsigned int, TQMap<TQString, TQString> > result; if( !m_root ) return result; - QMap<unsigned int, QMake::AssignmentAST*>::const_iterator it = m_customVariables.begin(); + TQMap<unsigned int, QMake::AssignmentAST*>::const_iterator it = m_customVariables.begin(); for ( ; it != m_customVariables.end(); ++it ) { - QMap<QString,QString> temp; + TQMap<TQString,TQString> temp; temp[ "var" ] = it.data()->scopedID; temp[ "op" ] = it.data()->op; temp[ "values" ] = it.data()->values.join("").stripWhiteSpace(); @@ -1052,7 +1052,7 @@ const QMap<unsigned int, QMap<QString, QString> > Scope::customVariables() const return result; } -void Scope::updateCustomVariable( unsigned int id, const QString& name, const QString& newop, const QString& newvalues ) +void Scope::updateCustomVariable( unsigned int id, const TQString& name, const TQString& newop, const TQString& newvalues ) { if( !m_root ) return; @@ -1067,7 +1067,7 @@ void Scope::updateCustomVariable( unsigned int id, const QString& name, const QS } } -unsigned int Scope::addCustomVariable( const QString& var, const QString& op, const QString& values ) +unsigned int Scope::addCustomVariable( const TQString& var, const TQString& op, const TQString& values ) { QMake::AssignmentAST* newast = new QMake::AssignmentAST(); newast->scopedID = var; @@ -1092,12 +1092,12 @@ void Scope::removeCustomVariable( unsigned int id ) } } -bool Scope::isVariableReset( const QString& var ) +bool Scope::isVariableReset( const TQString& var ) { bool result = false; if( !m_root ) return result; - QValueList<QMake::AST*>::const_iterator it = m_root->m_children.begin(); + TQValueList<QMake::AST*>::const_iterator it = m_root->m_children.begin(); for ( ; it != m_root->m_children.end(); ++it ) { if ( ( *it ) ->nodeType() == QMake::AST::AssignmentAST ) @@ -1113,14 +1113,14 @@ bool Scope::isVariableReset( const QString& var ) return result; } -void Scope::removeVariable( const QString& var, const QString& op ) +void Scope::removeVariable( const TQString& var, const TQString& op ) { if ( !m_root ) return ; QMake::AssignmentAST* ast = 0; - QValueList<QMake::AST*>::iterator it = m_root->m_children.begin(); + TQValueList<QMake::AST*>::iterator it = m_root->m_children.begin(); for ( ; it != m_root->m_children.end(); ++it ) { if ( ( *it ) ->nodeType() == QMake::AST::AssignmentAST ) @@ -1135,11 +1135,11 @@ void Scope::removeVariable( const QString& var, const QString& op ) } } -bool Scope::listIsEmpty( const QStringList& values ) +bool Scope::listIsEmpty( const TQStringList& values ) { if ( values.size() < 1 ) return true; - for ( QStringList::const_iterator it = values.begin(); it != values.end(); ++it ) + for ( TQStringList::const_iterator it = values.begin(); it != values.end(); ++it ) { if ( ( *it ).stripWhiteSpace() != "" && ( *it ).stripWhiteSpace() != "\\" ) return false; @@ -1147,7 +1147,7 @@ bool Scope::listIsEmpty( const QStringList& values ) return true; } -bool Scope::isCompatible( const QString& op1, const QString& op2) +bool Scope::isCompatible( const TQString& op1, const TQString& op2) { if( op1 == "+=" ) return ( op2 == "+=" || op2 == "=" ); @@ -1158,21 +1158,21 @@ bool Scope::isCompatible( const QString& op1, const QString& op2) return false; } -bool Scope::listsEqual(const QStringList& l1, const QStringList& l2) +bool Scope::listsEqual(const TQStringList& l1, const TQStringList& l2) { - QStringList left = l1; - QStringList right = l2; + TQStringList left = l1; + TQStringList right = l2; // left.sort(); // right.sort(); return (left == right); } -QStringList Scope::cleanStringList(const QStringList& list) const +TQStringList Scope::cleanStringList(const TQStringList& list) const { - QStringList result; - for( QStringList::const_iterator it = list.begin(); it != list.end(); ++it ) + TQStringList result; + for( TQStringList::const_iterator it = list.begin(); it != list.end(); ++it ) { - QString s = *it; + TQString s = *it; if( s.stripWhiteSpace() != "" && !containsContinue(s) && s.stripWhiteSpace() != getLineEndingString() @@ -1192,8 +1192,8 @@ void Scope::reloadProject() if ( !m_root || !m_root->isProject() ) return; - QString filename = m_root->fileName(); - QMap<unsigned int, Scope*>::iterator it; + TQString filename = m_root->fileName(); + TQMap<unsigned int, Scope*>::iterator it; for ( it = m_scopes.begin() ; it != m_scopes.end() ; ++it ) { Scope* s = it.data(); @@ -1207,7 +1207,7 @@ void Scope::reloadProject() if ( m_root->isProject() ) delete m_root; - if ( !loadFromFile( filename ) && !QFileInfo( filename ).exists() ) + if ( !loadFromFile( filename ) && !TQFileInfo( filename ).exists() ) { m_root = new QMake::ProjectAST(); m_root->setFileName( filename ); @@ -1215,7 +1215,7 @@ void Scope::reloadProject() init(); } -Scope* Scope::disableSubproject( const QString& dir) +Scope* Scope::disableSubproject( const TQString& dir) { if( !m_root || ( m_root->isProject() && !m_incast ) ) return 0; @@ -1225,23 +1225,23 @@ Scope* Scope::disableSubproject( const QString& dir) else if( scopeType() != Scope::IncludeScope ) removeFromPlusOp( "SUBDIRS", dir ); - QDir curdir( projectDir() ); + TQDir curdir( projectDir() ); if ( variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 ) { curdir.cd(dir); - QString filename; - QStringList entries = curdir.entryList("*.pro", QDir::Files); + TQString filename; + TQStringList entries = curdir.entryList("*.pro", TQDir::Files); if ( !entries.isEmpty() && entries.findIndex( curdir.dirName()+".pro" ) != -1 ) - filename = curdir.absPath() + QString(QChar(QDir::separator()))+entries.first(); + filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+entries.first(); else - filename = curdir.absPath() + QString(QChar(QDir::separator()))+curdir.dirName()+".pro"; + filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+curdir.dirName()+".pro"; kdDebug( 9024 ) << "Disabling subproject with filename:" << filename << endl; Scope* s = new Scope( m_environment, getNextScopeNum(), this, filename, m_part, false ); - addToMinusOp( "SUBDIRS", QStringList( dir ) ); + addToMinusOp( "SUBDIRS", TQStringList( dir ) ); m_scopes.insert( getNextScopeNum(), s ); return s; } @@ -1249,20 +1249,20 @@ Scope* Scope::disableSubproject( const QString& dir) return 0; } -QString Scope::resolveVariables( const QString& value ) const +TQString Scope::resolveVariables( const TQString& value ) const { - return resolveVariables(QStringList(value), 0).front(); + return resolveVariables(TQStringList(value), 0).front(); } -QString Scope::resolveVariables( const QString& value, QMake::AST* stopHere ) const +TQString Scope::resolveVariables( const TQString& value, QMake::AST* stopHere ) const { - return resolveVariables(QStringList(value), stopHere).front(); + return resolveVariables(TQStringList(value), stopHere).front(); } -QStringList Scope::variableValues( const QString& variable, QMake::AST* stopHere, bool fetchFromParent ) const +TQStringList Scope::variableValues( const TQString& variable, QMake::AST* stopHere, bool fetchFromParent ) const { - QStringList result; + TQStringList result; if ( !m_root ) return result; @@ -1272,13 +1272,13 @@ QStringList Scope::variableValues( const QString& variable, QMake::AST* stopHere return result; } -QStringList Scope::resolveVariables( const QStringList& values, QMake::AST* stopHere ) const +TQStringList Scope::resolveVariables( const TQStringList& values, QMake::AST* stopHere ) const { - QStringList result = values; - QMap<QString, QStringList> variables; - for( QStringList::iterator it = result.begin(); it != result.end(); ++it ) + TQStringList result = values; + TQMap<TQString, TQStringList> variables; + for( TQStringList::iterator it = result.begin(); it != result.end(); ++it ) { - QRegExp re("\\$\\$([^{}\\) /]*)( |\\)|/|$)"); + TQRegExp re("\\$\\$([^{}\\) /]*)( |\\)|/|$)"); int pos = 0; while( pos >= 0 ) { @@ -1290,13 +1290,13 @@ QStringList Scope::resolveVariables( const QStringList& values, QMake::AST* stop variables[re.cap(1)] = resolveVariables( variableValues( re.cap(1), stopHere ) ); if( variables[re.cap(1)].isEmpty() && re.cap(1) == "TARGET" ) { - variables[re.cap(1)] = QFileInfo( fileName() ).baseName(); + variables[re.cap(1)] = TQFileInfo( fileName() ).baseName(); } } pos += re.matchedLength(); } } - re = QRegExp("\\$\\$\\{([^\\)\\}]*)\\}"); + re = TQRegExp("\\$\\$\\{([^\\)\\}]*)\\}"); pos = 0; while( pos >= 0 ) { @@ -1308,15 +1308,15 @@ QStringList Scope::resolveVariables( const QStringList& values, QMake::AST* stop variables[re.cap(1)] = resolveVariables( variableValues( re.cap(1), stopHere ) ); if( variables[re.cap(1)].isEmpty() && re.cap(1) == "TARGET" ) { - variables[re.cap(1)] = QFileInfo( fileName() ).baseName(); + variables[re.cap(1)] = TQFileInfo( fileName() ).baseName(); } } pos += re.matchedLength(); } } - re = QRegExp("\\$\\$\\(([^\\)\\}]*)\\)"); + re = TQRegExp("\\$\\$\\(([^\\)\\}]*)\\)"); pos = 0; - QMap<QString, QString> envvars; + TQMap<TQString, TQString> envvars; while( pos >= 0 ) { pos = re.search( (*it), pos ); @@ -1326,17 +1326,17 @@ QStringList Scope::resolveVariables( const QStringList& values, QMake::AST* stop if( m_environment.contains( re.cap(1) ) != -1 ) envvars[re.cap(1)] = m_environment[ re.cap(1) ]; else if ( ::getenv( re.cap(1).local8Bit() ) != 0 ) - envvars[re.cap(1)] = QString::fromLocal8Bit( ::getenv( re.cap(1).local8Bit() ) ); + envvars[re.cap(1)] = TQString::fromLocal8Bit( ::getenv( re.cap(1).local8Bit() ) ); pos += re.matchedLength(); } } - for( QMap<QString, QString>::const_iterator it2 = envvars.begin(); it2 != envvars.end(); ++it2 ) + for( TQMap<TQString, TQString>::const_iterator it2 = envvars.begin(); it2 != envvars.end(); ++it2 ) { (*it).replace("$$("+it2.key()+")", it2.data() ); } - for( QMap<QString, QStringList>::const_iterator it2 = variables.begin(); it2 != variables.end(); ++it2 ) + for( TQMap<TQString, TQStringList>::const_iterator it2 = variables.begin(); it2 != variables.end(); ++it2 ) { - for( QStringList::const_iterator it3 = it2.data().begin(); it3 != it2.data().end(); ++it3 ) + for( TQStringList::const_iterator it3 = it2.data().begin(); it3 != it2.data().end(); ++it3 ) { (*it).replace("$$"+it2.key(), *it3 ); (*it).replace("$${"+it2.key()+"}", *it3 ); @@ -1346,43 +1346,43 @@ QStringList Scope::resolveVariables( const QStringList& values, QMake::AST* stop return result; } -void Scope::allFiles( const QString& projectDirectory, std::set<QString>& res ) +void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res ) { - QString myRelPath = URLUtil::getRelativePath( projectDirectory, projectDir() ); - QString file; - QStringList values; - QString header = ""; + TQString myRelPath = URLUtil::getRelativePath( projectDirectory, projectDir() ); + TQString file; + TQStringList values; + TQString header = ""; if( variableValues("TEMPLATE",false ).findIndex("subdirs") == -1 ) { values = variableValues( "INSTALLS" ,false, false ); - QStringList::const_iterator it; + TQStringList::const_iterator it; for ( it = values.begin(); it != values.end(); ++it ) { if ( ( *it ) == "target" ) continue; - QStringList files = variableValues( *it + ".files" ,false, false ); - QStringList::iterator filesit = files.begin(); + TQStringList files = variableValues( *it + ".files" ,false, false ); + TQStringList::iterator filesit = files.begin(); for ( ;filesit != files.end(); ++filesit ) { - file = myRelPath + QString(QChar(QDir::separator())) + *filesit; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *filesit; file = resolveVariables( file ); if( file.contains("*") ) { - QFileInfo fi( projectDirectory + QString( QChar( QDir::separator() ) ) + file ); - QDir absDir = fi.dir( true ); + TQFileInfo fi( projectDirectory + TQString( TQChar( TQDir::separator() ) ) + file ); + TQDir absDir = fi.dir( true ); absDir.setNameFilter( fi.fileName() ); - absDir.setFilter( QDir::Files | QDir::Readable | QDir::NoSymLinks ); - QStringList list = absDir.entryList(); - for( QStringList::const_iterator it = list.begin(); it != list.end(); ++it ) + absDir.setFilter( TQDir::Files | TQDir::Readable | TQDir::NoSymLinks ); + TQStringList list = absDir.entryList(); + for( TQStringList::const_iterator it = list.begin(); it != list.end(); ++it ) { - res.insert( QDir::cleanDirPath( URLUtil::getRelativePath( projectDirectory, absDir.path()+QString( QChar( QDir::separator() ) )+*it ) ) ); + res.insert( TQDir::cleanDirPath( URLUtil::getRelativePath( projectDirectory, absDir.path()+TQString( TQChar( TQDir::separator() ) )+*it ) ) ); } } else { - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } } } @@ -1390,39 +1390,39 @@ void Scope::allFiles( const QString& projectDirectory, std::set<QString>& res ) values = variableValues( "LEXSOURCES" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } values = variableValues( "YACCSOURCES" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } values = variableValues( "DISTFILES" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); if( file.contains("*") ) { - QFileInfo fi( projectDirectory + QString( QChar( QDir::separator() ) ) + file ); - QDir absDir = fi.dir( true ); + TQFileInfo fi( projectDirectory + TQString( TQChar( TQDir::separator() ) ) + file ); + TQDir absDir = fi.dir( true ); absDir.setNameFilter( fi.fileName() ); - absDir.setFilter( QDir::Files | QDir::Readable | QDir::NoSymLinks ); - QStringList list = absDir.entryList(); - for( QStringList::const_iterator it = list.begin(); it != list.end(); ++it ) + absDir.setFilter( TQDir::Files | TQDir::Readable | TQDir::NoSymLinks ); + TQStringList list = absDir.entryList(); + for( TQStringList::const_iterator it = list.begin(); it != list.end(); ++it ) { - res.insert( QDir::cleanDirPath( URLUtil::getRelativePath( projectDirectory, absDir.path()+QString( QChar( QDir::separator() ) )+*it ) ) ); + res.insert( TQDir::cleanDirPath( URLUtil::getRelativePath( projectDirectory, absDir.path()+TQString( TQChar( TQDir::separator() ) )+*it ) ) ); } } else { - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } } @@ -1431,33 +1431,33 @@ void Scope::allFiles( const QString& projectDirectory, std::set<QString>& res ) values = variableValues( "RESOURCES" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } } values = variableValues( "IMAGES" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } values = variableValues( "TRANSLATIONS" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } values = variableValues( "IDLS" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } if ( m_part->isTMakeProject() ) @@ -1465,11 +1465,11 @@ void Scope::allFiles( const QString& projectDirectory, std::set<QString>& res ) values = variableValues( "INTERFACES" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); - if( QFileInfo(projectDir()+QString(QChar(QDir::separator())) + *it+".h").exists() ) - res.insert( QDir::cleanDirPath( file+".h" ) ); + res.insert( TQDir::cleanDirPath( file ) ); + if( TQFileInfo(projectDir()+TQString(TQChar(TQDir::separator())) + *it+".h").exists() ) + res.insert( TQDir::cleanDirPath( file+".h" ) ); } } else @@ -1477,25 +1477,25 @@ void Scope::allFiles( const QString& projectDirectory, std::set<QString>& res ) values = variableValues( "FORMS" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); if( !m_part->isQt4Project()) { - header = projectDir()+QString(QChar(QDir::separator())) + *it+".h"; - if( QFileInfo(header).exists() ) - res.insert( QDir::cleanDirPath( header ) ); - header = projectDir()+QString(QChar(QDir::separator())) + *it+".cpp"; - if( QFileInfo(header).exists() ) - res.insert( QDir::cleanDirPath( header ) ); + header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".h"; + if( TQFileInfo(header).exists() ) + res.insert( TQDir::cleanDirPath( header ) ); + header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".cpp"; + if( TQFileInfo(header).exists() ) + res.insert( TQDir::cleanDirPath( header ) ); } else { - header = projectDir()+QString(QChar(QDir::separator())) + "ui_" +*it; - header.replace(QRegExp("\\.ui$"),".h"); - if( QFileInfo(header).exists() ) - res.insert( QDir::cleanDirPath( header ) ); + header = projectDir()+TQString(TQChar(TQDir::separator())) + "ui_" +*it; + header.replace(TQRegExp("\\.ui$"),".h"); + if( TQFileInfo(header).exists() ) + res.insert( TQDir::cleanDirPath( header ) ); } } } @@ -1504,44 +1504,44 @@ void Scope::allFiles( const QString& projectDirectory, std::set<QString>& res ) kdDebug(9024) << "scope:" << scopeType() << " found values: " << values << endl; for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } values = variableValues( "HEADERS" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } } - QMap<unsigned int, Scope*>::const_iterator it = m_scopes.begin(); + TQMap<unsigned int, Scope*>::const_iterator it = m_scopes.begin(); for( ; it != m_scopes.end(); ++it ) { it.data()->allFiles( projectDirectory, res ); } } -QStringList Scope::allFiles( const QString& projectDir ) +TQStringList Scope::allFiles( const TQString& projectDir ) { - QStringList result; - std::set<QString> files; + TQStringList result; + std::set<TQString> files; allFiles( projectDir, files ); - for( std::set<QString>::const_iterator it = files.begin(); it != files.end() ; ++it ) + for( std::set<TQString>::const_iterator it = files.begin(); it != files.end() ; ++it ) result.append( *it ); kdDebug(9024) << "all files: " << result << endl; return result; } -QString Scope::findCustomVarForPath( const QString& path ) +TQString Scope::findCustomVarForPath( const TQString& path ) { - QString result; + TQString result; if( !m_root ) return result; - QMap<unsigned int, QMake::AssignmentAST*>::const_iterator it = m_customVariables.begin(); + TQMap<unsigned int, QMake::AssignmentAST*>::const_iterator it = m_customVariables.begin(); for( ; it != m_customVariables.end(); ++it ) { kdDebug(9024) << "Checking " << path << " against " << cleanStringList(it.data()->values) << endl; @@ -1564,12 +1564,12 @@ void Scope::loadDefaultOpts() m_defaultopts = new QMakeDefaultOpts(); if( DomUtil::readBoolEntry( *m_part->projectDom(), "/kdevtrollproject/qmake/disableDefaultOpts", true ) ) { - m_defaultopts->readVariables( m_part->qmakePath(), QFileInfo( m_root->fileName() ).dirPath( true ) ); + m_defaultopts->readVariables( m_part->qmakePath(), TQFileInfo( m_root->fileName() ).dirPath( true ) ); } } } -QString Scope::getLineEndingString() const +TQString Scope::getLineEndingString() const { if( scopeType() == ProjectScope ) @@ -1577,13 +1577,13 @@ QString Scope::getLineEndingString() const switch( m_root->lineEnding() ) { case QMake::ProjectAST::Windows: - return QString("\r\n"); + return TQString("\r\n"); break; case QMake::ProjectAST::MacOS: - return QString("\r"); + return TQString("\r"); break; case QMake::ProjectAST::Unix: - return QString("\n"); + return TQString("\n"); break; } }else if( m_parent ) @@ -1593,18 +1593,18 @@ QString Scope::getLineEndingString() const return "\n"; } -QString Scope::replaceWs(QString s) +TQString Scope::replaceWs(TQString s) { return s.replace( getLineEndingString(), "%nl").replace("\t", "%tab").replace(" ", "%spc"); } -bool Scope::containsContinue(const QString& s ) const +bool Scope::containsContinue(const TQString& s ) const { - return( s.find( QRegExp( "\\\\\\s*"+getLineEndingString() ) ) != -1 - || s.find( QRegExp( "\\\\\\s*#" ) ) != -1 ); + return( s.find( TQRegExp( "\\\\\\s*"+getLineEndingString() ) ) != -1 + || s.find( TQRegExp( "\\\\\\s*#" ) ) != -1 ); } -bool Scope::isComment( const QString& s) const +bool Scope::isComment( const TQString& s) const { return s.startsWith("#"); } @@ -1668,7 +1668,7 @@ void Scope::PrintAST::leaveFunctionScope( QMake::ProjectAST* p ) QMake::ASTVisitor::leaveFunctionScope(p); } -QString Scope::PrintAST::replaceWs(QString s) +TQString Scope::PrintAST::replaceWs(TQString s) { return s.replace("\n", "%nl").replace("\t", "%tab").replace(" ", "%spc"); } @@ -1698,9 +1698,9 @@ void Scope::PrintAST::processInclude( QMake::IncludeAST* a) QMake::ASTVisitor::processInclude(a); } -QString Scope::PrintAST::getIndent() +TQString Scope::PrintAST::getIndent() { - QString ind; + TQString ind; for( int i = 0 ; i < indent ; i++) ind += " "; return ind; diff --git a/buildtools/qmake/scope.h b/buildtools/qmake/scope.h index e8f40eb9..5cc609ce 100644 --- a/buildtools/qmake/scope.h +++ b/buildtools/qmake/scope.h @@ -12,9 +12,9 @@ #ifndef _SCOPE_H_ #define _SCOPE_H_ -#include <qstring.h> -#include <qstringlist.h> -#include <qmap.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqmap.h> #include <set> #include "qmakeast.h" @@ -38,68 +38,68 @@ public: IncludeScope, InvalidScope }; - static const QStringList KnownVariables; - static const QStringList KnownConfigValues; + static const TQStringList KnownVariables; + static const TQStringList KnownConfigValues; - Scope( const QMap<QString, QString>& env, const QString &filename, TrollProjectPart* part ); + Scope( const TQMap<TQString, TQString>& env, const TQString &filename, TrollProjectPart* part ); ~Scope(); void saveToFile() const; // Changing variable values - void addToPlusOp( const QString& variable, const QStringList& values ); - void removeFromPlusOp( const QString& variable, const QStringList& values ); - void addToMinusOp( const QString& variable, const QStringList& values ); - void removeFromMinusOp( const QString& variable, const QStringList& values ); - void addToEqualOp( const QString& variable, const QStringList& values ); - void removeFromEqualOp( const QString& variable, const QStringList& values ); - void setPlusOp( const QString& variable, const QStringList& values ); - void setEqualOp( const QString& variable, const QStringList& values ); - void setMinusOp( const QString& variable, const QStringList& values ); + void addToPlusOp( const TQString& variable, const TQStringList& values ); + void removeFromPlusOp( const TQString& variable, const TQStringList& values ); + void addToMinusOp( const TQString& variable, const TQStringList& values ); + void removeFromMinusOp( const TQString& variable, const TQStringList& values ); + void addToEqualOp( const TQString& variable, const TQStringList& values ); + void removeFromEqualOp( const TQString& variable, const TQStringList& values ); + void setPlusOp( const TQString& variable, const TQStringList& values ); + void setEqualOp( const TQString& variable, const TQStringList& values ); + void setMinusOp( const TQString& variable, const TQStringList& values ); // Checks wether a line like VAR = exists in this subscope - bool isVariableReset( const QString& var ); + bool isVariableReset( const TQString& var ); // Fetch the valuelist for the variable op combination inside this scope - QStringList variableValuesForOp( const QString& variable, const QString& op ) const; + TQStringList variableValuesForOp( const TQString& variable, const TQString& op ) const; // Fetch the variable values by running over the statements and adding/removing/setting // as the encountered op's say, begin with the parent projects variableValues list - QStringList variableValues( const QString& variable, bool checkIncParent = true, bool fetchFromParent = true, bool evaluateSubScopes = false ); + TQStringList variableValues( const TQString& variable, bool checkIncParent = true, bool fetchFromParent = true, bool evaluateSubScopes = false ); // Remove a variable+Op combination from the scope, if existant - void removeVariable( const QString& var, const QString& op ); + void removeVariable( const TQString& var, const TQString& op ); // Getting to know what type of scope this is ScopeType scopeType() const; // This returns the function+args, the scopename or the pro/pri file // depending on the type of scope - QString scopeName() const; + TQString scopeName() const; // Returns the projectName for this scope, this is equal to the last part of the projectDir() - QString projectName() const; + TQString projectName() const; // Returns just the filename of this project's .pro file - QString fileName() const; + TQString fileName() const; // Returns the absolute path of the dir containing the .pro file - QString projectDir() const; + TQString projectDir() const; // get the parent Scope Scope* parent() const { return m_parent; } // Fetching sub-scopes - const QValueList<Scope*> scopesInOrder() const { return m_scopes.values(); } + const TQValueList<Scope*> scopesInOrder() const { return m_scopes.values(); } // Working on SubScopes /* * creates a new function scope at the end of this (Sub-)AST and returns the Scope wrapping it */ - Scope* createFunctionScope( const QString& funcName, const QString& args ); + Scope* createFunctionScope( const TQString& funcName, const TQString& args ); /* * creates a new simple scope at the end of this (Sub-)AST and returns the Scope wrapping it */ - Scope* createSimpleScope( const QString& scopename ); + Scope* createSimpleScope( const TQString& scopename ); /* * creates a new function scope at the end of this (Sub-)AST @@ -107,14 +107,14 @@ public: * It returns the Scope wrapping the include-AST, the function scope AST * can be accessed easily using the parent() method. */ - Scope* createIncludeScope( const QString& includeFile, bool negate = false ); + Scope* createIncludeScope( const TQString& includeFile, bool negate = false ); /* * creates a new subproject in dir (create's dir if necessary) * If this scope is not a project scope the subproject will be added to this * Scope only, i.e. it is not seen in the project-files list of subdirs */ - Scope* createSubProject( const QString& dir ); + Scope* createSubProject( const TQString& dir ); /* delete the given function scope */ bool deleteFunctionScope( unsigned int ); @@ -129,38 +129,38 @@ public: bool isQt4Project() const ; /* Provide a Map of Custom variables */ - const QMap<unsigned int, QMap<QString, QString> > customVariables() const; + const TQMap<unsigned int, TQMap<TQString, TQString> > customVariables() const; - unsigned int addCustomVariable( const QString& var, const QString& op, const QString& values ); + unsigned int addCustomVariable( const TQString& var, const TQString& op, const TQString& values ); /* Removes the variable with the given id if it exists */ void removeCustomVariable( unsigned int ); /* Update the values of the variable/operation combo var+op to values */ - void updateCustomVariable( unsigned int, const QString&, const QString& , const QString& ); + void updateCustomVariable( unsigned int, const TQString&, const TQString& , const TQString& ); - // Checks wether a QStringList contains any values that are not whitespace or \\n - static bool listIsEmpty( const QStringList& values ); + // Checks wether a TQStringList contains any values that are not whitespace or \\n + static bool listIsEmpty( const TQStringList& values ); /* returns wether this is an enabled subproject or a disabled one */ bool isEnabled() { return m_isEnabled; } - QStringList cleanStringList(const QStringList& list) const; + TQStringList cleanStringList(const TQStringList& list) const; /* Reload a project scope */ void reloadProject(); /* creates a new disabled Scope child and add SUBDIRS -= dir to this scope */ - Scope* disableSubproject( const QString& ); + Scope* disableSubproject( const TQString& ); /* return the "position" of this scope in the list of scopes */ unsigned int getNum() { return m_num; } - QStringList allFiles( const QString& ); + TQStringList allFiles( const TQString& ); - QString resolveVariables( const QString& ) const; + TQString resolveVariables( const TQString& ) const; - QString findCustomVarForPath( const QString& ); + TQString findCustomVarForPath( const TQString& ); #ifdef DEBUG void printTree(); @@ -183,77 +183,77 @@ private: * if op is -= removes values from any occurence of = and += * if op is = removes values frmo any occurence of -= */ - void updateVariable( const QString& variable, const QString& op, const QStringList& values, bool removeFromOp ); + void updateVariable( const TQString& variable, const TQString& op, const TQStringList& values, bool removeFromOp ); /* * Helper Function to change the origValues list with the values from newValues * depending on the state of "remove" either adds or removes all entries from newValues * to origValues if they didn't exist there yet */ - void updateValues( QStringList& origValues, const QStringList& newValues, bool remove = false, QString indent = " " ); + void updateValues( TQStringList& origValues, const TQStringList& newValues, bool remove = false, TQString indent = " " ); /* * Finds an existing variable, returns the end() of the statemenst if it is not found */ - QValueList<QMake::AST*>::iterator findExistingVariable( const QString& variable ); + TQValueList<QMake::AST*>::iterator findExistingVariable( const TQString& variable ); // Private constructors for easier subscope creation /* * just initializes the lists from the scope */ - Scope( const QMap<QString, QString>& env, unsigned int num, Scope* parent, QMake::ProjectAST* root, QMakeDefaultOpts*, TrollProjectPart* part ); + Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, QMake::ProjectAST* root, QMakeDefaultOpts*, TrollProjectPart* part ); /* * reads the given filename and parses it. If it doesn't exist creates an empty * ProjectAST with the given filename */ - Scope( const QMap<QString, QString>& env, unsigned int num, Scope* parent, const QString& filename, TrollProjectPart* part, bool isEnabled = true ); + Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, const TQString& filename, TrollProjectPart* part, bool isEnabled = true ); /* * Creates a scope for an include statement, parses the file and initializes the Scope * Create an empty ProjectAST if the file cannot be found or parsed. */ - Scope( const QMap<QString, QString>& env, unsigned int num, Scope* parent, QMake::IncludeAST* incast, const QString& path, const QString& incfile, QMakeDefaultOpts*, TrollProjectPart* part ); + Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, QMake::IncludeAST* incast, const TQString& path, const TQString& incfile, QMakeDefaultOpts*, TrollProjectPart* part ); // runs through the statements until stopHere is found (or the end is reached, if stopHere is 0), // using the given list as startvalue // Changes the list using the +=, -=, = operations accordingly - void calcValuesFromStatements( const QString& variable, QStringList& result, bool, QMake::AST* stopHere = 0, bool fetchFromParent = true, bool setDefault = true, bool evaluateSubScopes = false ) const; + void calcValuesFromStatements( const TQString& variable, TQStringList& result, bool, QMake::AST* stopHere = 0, bool fetchFromParent = true, bool setDefault = true, bool evaluateSubScopes = false ) const; // Check wether the two operators are compatible - static bool isCompatible( const QString& op1, const QString& op2); + static bool isCompatible( const TQString& op1, const TQString& op2); // Check wether the 2 lists are equal, regardless of element order. - static bool listsEqual(const QStringList& , const QStringList& ); + static bool listsEqual(const TQStringList& , const TQStringList& ); // Load and Save project files, these only work on ProjectScope's - bool loadFromFile( const QString& filename ); + bool loadFromFile( const TQString& filename ); - QString funcScopeKey( QMake::ProjectAST* funcast ) const { return funcast->scopedID + "(" + funcast->args + ")"; } + TQString funcScopeKey( QMake::ProjectAST* funcast ) const { return funcast->scopedID + "(" + funcast->args + ")"; } unsigned int getNextScopeNum() { if( m_scopes.isEmpty() ) return 0; else return (m_scopes.keys().last()+1); } - QStringList lookupVariable( const QString& var ); + TQStringList lookupVariable( const TQString& var ); - QStringList resolveVariables( const QStringList&, QMake::AST* = 0 ) const; - QStringList variableValues( const QString& variable, QMake::AST*, bool fetchFromParent = true ) const; - QString resolveVariables( const QString& , QMake::AST* ) const; + TQStringList resolveVariables( const TQStringList&, QMake::AST* = 0 ) const; + TQStringList variableValues( const TQString& variable, QMake::AST*, bool fetchFromParent = true ) const; + TQString resolveVariables( const TQString& , QMake::AST* ) const; // This function determines the currently used String for fileending, it can be \n, \r or \r\n - QString getLineEndingString() const; - bool isComment( const QString& ) const; - bool containsContinue( const QString& ) const; - void allFiles( const QString&, std::set<QString>& ); + TQString getLineEndingString() const; + bool isComment( const TQString& ) const; + bool containsContinue( const TQString& ) const; + void allFiles( const TQString&, std::set<TQString>& ); void loadDefaultOpts(); QMake::ProjectAST* m_root; QMake::IncludeAST* m_incast; - QMap<unsigned int, QMake::AssignmentAST*> m_customVariables; - QMap<unsigned int, Scope*> m_scopes; + TQMap<unsigned int, QMake::AssignmentAST*> m_customVariables; + TQMap<unsigned int, Scope*> m_scopes; Scope* m_parent; unsigned int m_maxCustomVarNum; - QString replaceWs(QString); + TQString replaceWs(TQString); // The "position" inside the parent scope that this scope starts at @@ -261,8 +261,8 @@ private: bool m_isEnabled; TrollProjectPart* m_part; QMakeDefaultOpts* m_defaultopts; - QMap<QString, QStringList> m_varCache; - QMap<QString,QString> m_environment; + TQMap<TQString, TQStringList> m_varCache; + TQMap<TQString,TQString> m_environment; #ifdef DEBUG class PrintAST : QMake::ASTVisitor @@ -291,10 +291,10 @@ private: virtual void processInclude( QMake::IncludeAST* a); - QString replaceWs(QString); + TQString replaceWs(TQString); private: - QString getIndent(); + TQString getIndent(); int indent; }; diff --git a/buildtools/qmake/trolllistview.cpp b/buildtools/qmake/trolllistview.cpp index 2c91251b..3bf99a0e 100644 --- a/buildtools/qmake/trolllistview.cpp +++ b/buildtools/qmake/trolllistview.cpp @@ -20,7 +20,7 @@ #include "trolllistview.h" -TrollListView::TrollListView(TrollProjectWidget *widget, QWidget *parent, +TrollListView::TrollListView(TrollProjectWidget *widget, TQWidget *parent, TrollProjectWidget::TrollProjectView view, const char *name) :KListView(parent, name), m_widget(widget), m_view(view) { @@ -30,7 +30,7 @@ TrollListView::~TrollListView() { } -void TrollListView::focusOutEvent( QFocusEvent */* e*/ ) +void TrollListView::focusOutEvent( TQFocusEvent */* e*/ ) { m_widget->setLastFocusedView(m_view); } diff --git a/buildtools/qmake/trolllistview.h b/buildtools/qmake/trolllistview.h index 66f70960..5fd79b30 100644 --- a/buildtools/qmake/trolllistview.h +++ b/buildtools/qmake/trolllistview.h @@ -28,10 +28,10 @@ class TrollListView : public KListView { Q_OBJECT public: - TrollListView(TrollProjectWidget *widget, QWidget *parent, TrollProjectWidget::TrollProjectView view, const char *name = 0); + TrollListView(TrollProjectWidget *widget, TQWidget *parent, TrollProjectWidget::TrollProjectView view, const char *name = 0); ~TrollListView(); protected: - virtual void focusOutEvent(QFocusEvent *e); + virtual void focusOutEvent(TQFocusEvent *e); private: TrollProjectWidget *m_widget; diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 6d2f5b3a..d59c5b4b 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -15,9 +15,9 @@ #include "trollprojectpart.h" -#include <qdir.h> -#include <qfileinfo.h> -#include <qwhatsthis.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqwhatsthis.h> #include <kdeversion.h> #include <kdebug.h> #include <kdialogbase.h> @@ -26,7 +26,7 @@ #include <kmessagebox.h> #include <kdirwatch.h> #include <kstatusbar.h> -#include <qmessagebox.h> +#include <tqmessagebox.h> #include <kdevgenericfactory.h> #include <kaction.h> #include <kparts/part.h> @@ -60,7 +60,7 @@ typedef KDevGenericFactory<TrollProjectPart> TrollProjectFactory; static const KDevPluginInfo data("kdevtrollproject"); K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) ) -TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStringList& args ) +TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args ) : KDevBuildTool(&data, parent, name ? name : "TrollProjectPart") { setInstance(TrollProjectFactory::instance()); @@ -80,7 +80,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr m_widget = new TrollProjectWidget(this); m_widget->setIcon(SmallIcon("qmakerun")); m_widget->setCaption(i18n("QMake Manager")); - QWhatsThis::add(m_widget, i18n("<b>QMake manager</b><p>" + TQWhatsThis::add(m_widget, i18n("<b>QMake manager</b><p>" "The QMake manager project tree consists of two parts. The 'overview' " "in the upper half shows the subprojects, each one having a " ".pro file. The 'details' view in the lower half shows the " @@ -90,9 +90,9 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr KAction *action; - const QIconSet icon(SmallIcon("compfile")); + const TQIconSet icon(SmallIcon("compfile")); action = new KAction( i18n("Compile &File"), "compfile", 0, - m_widget, SLOT(slotBuildOpenFile()), + m_widget, TQT_SLOT(slotBuildOpenFile()), actionCollection(),"build_compilefile" ); action->setToolTip(i18n("Compile file")); action->setWhatsThis(i18n("<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory where 'filename' is the name of currently opened file.<br>" @@ -101,7 +101,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr action = new KAction( i18n("&Build Project"), "make_kdevelop", Key_F8, - m_widget, SLOT(slotBuildProject()), + m_widget, TQT_SLOT(slotBuildProject()), actionCollection(), "build_build_project" ); action->setToolTip(i18n("Build project")); action->setWhatsThis(i18n("<b>Build project</b><p>Runs <b>make</b> from the project directory.<br>" @@ -109,7 +109,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, <b>Make Options</b> tab.")); action = new KAction( i18n("&Rebuild Project"),"rebuild" , 0, - m_widget, SLOT(slotRebuildProject()), + m_widget, TQT_SLOT(slotRebuildProject()), actionCollection(),"build_rebuild_project" ); action->setToolTip(i18n("Rebuild project")); action->setWhatsThis(i18n("<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from the project directory.<br>" @@ -117,7 +117,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, <b>Make Options</b> tab.")); action = new KAction( i18n("&Install Project"),"install" , 0, - m_widget, SLOT(slotInstallProject()), + m_widget, TQT_SLOT(slotInstallProject()), actionCollection(),"build_install_project" ); action->setToolTip(i18n("Install project")); action->setWhatsThis(i18n("<b>Install project</b><p>Runs <b>make install</b> from the project directory.<br>" @@ -125,7 +125,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, <b>Make Options</b> tab.")); action = new KAction( i18n("&Clean Project"), 0, - m_widget, SLOT(slotCleanProject()), + m_widget, TQT_SLOT(slotCleanProject()), actionCollection(), "build_clean_project" ); action->setToolTip(i18n("Clean project")); action->setWhatsThis(i18n("<b>Clean project</b><p>Runs <b>make clean</b> command from the project directory.<br>" @@ -133,7 +133,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, <b>Make Options</b> tab.")); action = new KAction( i18n("&Dist-Clean Project"), 0, - m_widget, SLOT(slotDistCleanProject()), + m_widget, TQT_SLOT(slotDistCleanProject()), actionCollection(), "build_distclean_project" ); action->setToolTip(i18n("Dist-Clean project")); action->setWhatsThis(i18n("<b>Dist-Clean project</b><p>Runs <b>make distclean</b> command from the " @@ -141,13 +141,13 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, <b>Make Options</b> tab.")); action = new KAction( i18n("Execute Main Program"), "exec", SHIFT+Key_F9, - this, SLOT(slotBuildAndExecuteProject()), + this, TQT_SLOT(slotBuildAndExecuteProject()), actionCollection(), "build_execute_project" ); action->setToolTip(i18n("Execute main program")); action->setWhatsThis(i18n("<b>Execute program</b><p>Executes the currently selected subproject if it is an application or the program specified in project settings, <b>Run Options</b> tab.")); action = new KAction( i18n("&Build Subproject"), "make_kdevelop", Key_F7, - m_widget, SLOT(slotBuildTarget()), + m_widget, TQT_SLOT(slotBuildTarget()), actionCollection(), "build_build_target" ); action->setToolTip(i18n("Build subproject")); action->setWhatsThis(i18n("<b>Build subproject</b><p>Runs <b>make</b> from the current subproject directory. " @@ -156,7 +156,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, <b>Make Options</b> tab.")); action = new KAction( i18n("&Rebuild Subproject"), "rebuild", 0, - m_widget, SLOT(slotRebuildTarget()), + m_widget, TQT_SLOT(slotRebuildTarget()), actionCollection(),"build_rebuild_target" ); action->setToolTip(i18n("Rebuild subproject")); action->setWhatsThis(i18n("<b>Rebuild subproject</b><p>Runs <b>make clean</b> and then <b>make</b> from the current subproject directory. " @@ -165,7 +165,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, <b>Make Options</b> tab.")); action = new KAction( i18n("&Install Subproject"), "install", 0, - m_widget, SLOT(slotInstallTarget()), + m_widget, TQT_SLOT(slotInstallTarget()), actionCollection(),"build_install_target" ); action->setToolTip(i18n("Install subproject")); action->setWhatsThis(i18n("<b>Install subproject</b><p>Runs <b>make install</b> from the current subproject directory. " @@ -174,7 +174,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, <b>Make Options</b> tab.")); action = new KAction( i18n("&Clean Subproject"), 0, - m_widget, SLOT(slotCleanTarget()), + m_widget, TQT_SLOT(slotCleanTarget()), actionCollection(), "build_clean_target" ); action->setToolTip(i18n("Clean subproject")); action->setWhatsThis(i18n("<b>Clean subproject</b><p>Runs <b>make clean</b> from the current subproject directory. " @@ -183,7 +183,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, <b>Make Options</b> tab.")); action = new KAction( i18n("&Dist-Clean Subproject"), 0, - m_widget, SLOT(slotDistCleanTarget()), + m_widget, TQT_SLOT(slotDistCleanTarget()), actionCollection(), "build_distclean_target" ); action->setToolTip(i18n("Dist-Clean subproject")); action->setWhatsThis(i18n("<b>Dist-Clean subproject</b><p>Runs <b>make distclean</b> from the current" @@ -192,22 +192,22 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, <b>Make Options</b> tab.")); action = new KAction( i18n("Execute Subproject"), "exec", 0, - this, SLOT(slotBuildAndExecuteTarget()), + this, TQT_SLOT(slotBuildAndExecuteTarget()), actionCollection(), "build_execute_target" ); action->setToolTip(i18n("Execute subproject")); action->setWhatsThis(i18n("<b>Execute subproject</b><p>Executes the target program for the currently selected subproject. " "This action is allowed only if a type of the subproject is 'application'. The type of the subproject can be " "defined in <b>Subproject Settings</b> dialog (open it from the subproject context menu).")); - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( makeFrontend(), SIGNAL(commandFinished(const QString&)), - this, SLOT(slotCommandFinished(const QString&)) ); + connect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), + this, TQT_SLOT(slotCommandFinished(const TQString&)) ); - QString m_defaultQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); - QString m_qmakePath = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", ""); - QString qtversion = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/version", "3"); + TQString m_defaultQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); + TQString m_qmakePath = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", ""); + TQString qtversion = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/version", "3"); if( m_defaultQtDir.isEmpty() || !isValidQtDir( m_defaultQtDir ) ) { @@ -233,7 +233,7 @@ TrollProjectPart::~TrollProjectPart() delete m_widget; } -QString TrollProjectPart::makeEnvironment() +TQString TrollProjectPart::makeEnvironment() { // Get the make environment variables pairs into the environstr string // in the form of: "ENV_VARIABLE=ENV_VALUE" @@ -242,7 +242,7 @@ QString TrollProjectPart::makeEnvironment() DomUtil::PairList envvars = DomUtil::readPairListEntry(*projectDom(), "/kdevtrollproject/make/envvars", "envvar", "name", "value"); - QString environstr; + TQString environstr; DomUtil::PairList::ConstIterator it; bool hasQtDir = false; for (it = envvars.begin(); it != envvars.end(); ++it) { @@ -257,7 +257,7 @@ QString TrollProjectPart::makeEnvironment() if( !hasQtDir && !isQt4Project() && !DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) { - environstr += QString( "QTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + QString( " PATH=$QTDIR/bin:$PATH " ); + environstr += TQString( "QTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$QTDIR/bin:$PATH " ); } KConfigGroup grp( kapp->config(), "MakeOutputView" ); @@ -269,7 +269,7 @@ QString TrollProjectPart::makeEnvironment() void TrollProjectPart::projectConfigWidget(KDialogBase *dlg) { - QVBox *vbox; + TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "make", KIcon::SizeMedium )); RunOptionsWidget *optdlg = new RunOptionsWidget(*projectDom(), "/kdevtrollproject", buildDirectory(), vbox); @@ -280,32 +280,32 @@ void TrollProjectPart::projectConfigWidget(KDialogBase *dlg) QMakeOptionsWidget *qm = new QMakeOptionsWidget( projectDirectory(), *projectDom(), "/kdevtrollproject", vbox); - connect( dlg, SIGNAL(okClicked()), w4, SLOT(accept()) ); - connect( dlg, SIGNAL(okClicked()), qm, SLOT(accept()) ); - connect( dlg, SIGNAL(okClicked()), optdlg, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w4, TQT_SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), qm, TQT_SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), optdlg, TQT_SLOT(accept()) ); } -void TrollProjectPart::openProject(const QString &dirName, const QString &projectName) +void TrollProjectPart::openProject(const TQString &dirName, const TQString &projectName) { mainWindow()->statusBar()->message( i18n("Loading Project...") ); - QString defaultQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); + TQString defaultQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); if( !isQt4Project() && ( defaultQtDir.isEmpty() || !isValidQtDir( defaultQtDir ) ) ) { bool doask = true; while( doask ) { KURLRequesterDlg dlg( i18n("Choose Qt3 directory"), - i18n("Choose the Qt3 directory to use. This directory needs to have an include directory containing qt.h.") + i18n("Choose the Qt3 directory to use. This directory needs to have an include directory containing tqt.h.") , m_widget, 0); dlg.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - dlg.urlRequester() ->setURL( QString::null ); + dlg.urlRequester() ->setURL( TQString::null ); dlg.urlRequester() ->completionObject() ->setDir( "/" ); - if ( dlg.exec() == QDialog::Accepted && !dlg.urlRequester() ->url().isEmpty() ) + if ( dlg.exec() == TQDialog::Accepted && !dlg.urlRequester() ->url().isEmpty() ) { - QString qtdir = dlg.urlRequester()->url(); + TQString qtdir = dlg.urlRequester()->url(); if( !isValidQtDir( qtdir ) ) { if( KMessageBox::warningYesNo( m_widget, @@ -313,7 +313,7 @@ void TrollProjectPart::openProject(const QString &dirName, const QString &projec "project might not work properly without one.\nPlease make " "sure you give a directory that contains a bin with the " "qmake binary in it and for Qt3 project also contains an " - "include directory with qt.h in it.\nDo you want to try " + "include directory with tqt.h in it.\nDo you want to try " "setting a Qt directory again?"), i18n("Wrong Qt directory given")) == KMessageBox::Yes @@ -342,7 +342,7 @@ void TrollProjectPart::openProject(const QString &dirName, const QString &projec } } } - QString qmakePath = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", ""); + TQString qmakePath = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", ""); if( qmakePath.isEmpty() || !isExecutable( qmakePath ) ) { bool doask = true; @@ -351,12 +351,12 @@ void TrollProjectPart::openProject(const QString &dirName, const QString &projec KURLRequesterDlg dlg( i18n("Choose QMake executable"), i18n("Choose the QMake binary to use. QMake is used to generate Makefiles from the project files."), m_widget, 0); dlg.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - dlg.urlRequester() ->setURL( QString::null ); + dlg.urlRequester() ->setURL( TQString::null ); dlg.urlRequester() ->completionObject() ->setDir( "/" ); - if ( dlg.exec() == QDialog::Accepted && !dlg.urlRequester() ->url().isEmpty() ) + if ( dlg.exec() == TQDialog::Accepted && !dlg.urlRequester() ->url().isEmpty() ) { - QString qmake = dlg.urlRequester()->url(); + TQString qmake = dlg.urlRequester()->url(); if( !isExecutable( qmake ) ) { if( KMessageBox::warningYesNo( m_widget, @@ -399,7 +399,7 @@ void TrollProjectPart::openProject(const QString &dirName, const QString &projec m_widget->openProject(dirName); - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); // Set the default directory radio to "executable" if (DomUtil::readEntry(dom, "/kdevtrollproject/run/directoryradio") == "" ) { DomUtil::writeEntry(dom, "/kdevtrollproject/run/directoryradio", "executable"); @@ -415,18 +415,18 @@ void TrollProjectPart::closeProject() } -QString TrollProjectPart::projectDirectory() const +TQString TrollProjectPart::projectDirectory() const { return m_widget->projectDirectory(); } -QString TrollProjectPart::buildDirectory() const +TQString TrollProjectPart::buildDirectory() const { return m_widget->projectDirectory(); } -QString TrollProjectPart::projectName() const +TQString TrollProjectPart::projectName() const { return m_projectName; } @@ -468,27 +468,27 @@ void TrollProjectPart::slotBuildAndExecuteTarget() * if run/directoryradio == custom * The custom directory absolute path */ -QString TrollProjectPart::runDirectory() const +TQString TrollProjectPart::runDirectory() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); - QString cwd; + TQString cwd; if( DomUtil::readBoolEntry(dom, "/kdevtrollproject/run/useglobalprogram", true) ) { cwd = defaultRunDirectory("kdevtrollproject"); }else { - QString name = m_widget->getCurrentOutputFilename(); + TQString name = m_widget->getCurrentOutputFilename(); if( name.findRev("/") != -1 ) name = name.right( name.length()-name.findRev("/")-1 ); cwd = DomUtil::readEntry( dom, "/kdevtrollproject/run/cwd/" + name ); } if( cwd.isEmpty() ) { - QString destpath = m_widget->getCurrentTarget(); - if( QDir::isRelativePath( destpath ) ) + TQString destpath = m_widget->getCurrentTarget(); + if( TQDir::isRelativePath( destpath ) ) { - destpath = m_widget->subprojectDirectory() + QString( QChar( QDir::separator() ) ) + destpath; + destpath = m_widget->subprojectDirectory() + TQString( TQChar( TQDir::separator() ) ) + destpath; } destpath = destpath.left( destpath.findRev("/") ); cwd = destpath; @@ -509,16 +509,16 @@ QString TrollProjectPart::runDirectory() const */ -QString TrollProjectPart::mainProgram() const +TQString TrollProjectPart::mainProgram() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); if( DomUtil::readBoolEntry(dom, "/kdevtrollproject/run/useglobalprogram", false) ) { - QString DomMainProgram = DomUtil::readEntry(dom, "/kdevtrollproject/run/mainprogram"); + TQString DomMainProgram = DomUtil::readEntry(dom, "/kdevtrollproject/run/mainprogram"); - if ( DomMainProgram.isEmpty() ) return QString(); + if ( DomMainProgram.isEmpty() ) return TQString(); if ( DomMainProgram.startsWith("/") ) // assume absolute path { @@ -535,7 +535,7 @@ QString TrollProjectPart::mainProgram() const KMessageBox::error( m_widget, "There's no selected subproject!\n" "Unable to determine the main program", "No selected subproject found" ); kdDebug ( 9020 ) << k_funcinfo << "Error! : There's no active target! -> Unable to determine the main program in TrollProjectPart::mainProgram()" << endl; - return QString::null; + return TQString::null; } if ( m_widget->currentSubproject()->scope->variableValues("TEMPLATE").findIndex("app") == -1 ) @@ -545,19 +545,19 @@ QString TrollProjectPart::mainProgram() const "to be the selected subproject, set a main program under\n" "Project -> Project Options -> Run Options", "Selected subproject is not a library" ); kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << m_widget->currentSubproject()->scope->variableValues("TEMPLATE").join(" ") << ") ! -> Unable to determine the main program in TrollProjectPart::mainProgram()" << endl; - return QString::null; + return TQString::null; } - QString destpath = m_widget->getCurrentTarget(); - if( QDir::isRelativePath( destpath ) ) + TQString destpath = m_widget->getCurrentTarget(); + if( TQDir::isRelativePath( destpath ) ) { - destpath = m_widget->subprojectDirectory() + QString( QChar( QDir::separator() ) ) + destpath; + destpath = m_widget->subprojectDirectory() + TQString( TQChar( TQDir::separator() ) ) + destpath; } return destpath; } } -QString TrollProjectPart::debugArguments() const +TQString TrollProjectPart::debugArguments() const { if( DomUtil::readBoolEntry(*projectDom(), "/kdevtrollproject/run/useglobalprogram", true ) ) { @@ -568,8 +568,8 @@ QString TrollProjectPart::debugArguments() const } } -/** Retuns a QString with the run command line arguments */ -QString TrollProjectPart::runArguments() const +/** Retuns a TQString with the run command line arguments */ +TQString TrollProjectPart::runArguments() const { if( DomUtil::readBoolEntry(*projectDom(), "/kdevtrollproject/run/useglobalprogram", true) ) { @@ -581,34 +581,34 @@ QString TrollProjectPart::runArguments() const } -QString TrollProjectPart::activeDirectory() const +TQString TrollProjectPart::activeDirectory() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); return DomUtil::readEntry(dom, "/kdevtrollproject/general/activedir"); } -QStringList TrollProjectPart::allFiles() const +TQStringList TrollProjectPart::allFiles() const { return m_widget->allFiles(); } -void TrollProjectPart::addFile(const QString &fileName) +void TrollProjectPart::addFile(const TQString &fileName) { - QStringList fileList; + TQStringList fileList; fileList.append ( fileName ); - this->addFiles ( QStringList( fileName ) ); + this->addFiles ( TQStringList( fileName ) ); } -void TrollProjectPart::addFiles ( const QStringList &fileList ) +void TrollProjectPart::addFiles ( const TQStringList &fileList ) { - QStringList files = fileList; - for (QStringList::iterator it = files.begin(); it != files.end(); ++it) + TQStringList files = fileList; + for (TQStringList::iterator it = files.begin(); it != files.end(); ++it) { - if( !QFileInfo( *it ).isRelative() ) + if( !TQFileInfo( *it ).isRelative() ) { *it = URLUtil::relativePathToFile( projectDirectory(), *it ); } @@ -617,19 +617,19 @@ void TrollProjectPart::addFiles ( const QStringList &fileList ) } -void TrollProjectPart::removeFile(const QString & /* fileName */) +void TrollProjectPart::removeFile(const TQString & /* fileName */) { /// \FIXME -/* QStringList fileList; +/* TQStringList fileList; fileList.append ( fileName ); this->removeFiles ( fileList );*/ } -void TrollProjectPart::removeFiles ( const QStringList& fileList ) +void TrollProjectPart::removeFiles ( const TQStringList& fileList ) { /// \FIXME missing remove files functionality -// QStringList::ConstIterator it; +// TQStringList::ConstIterator it; // // it = fileList.begin(); // @@ -641,33 +641,33 @@ void TrollProjectPart::removeFiles ( const QStringList& fileList ) emit removedFilesFromProject ( fileList ); } /* -void TrollProjectPart::startMakeCommand(const QString &dir, const QString &target) +void TrollProjectPart::startMakeCommand(const TQString &dir, const TQString &target) { partController()->saveAllFiles(); - QFileInfo fi(dir + "/Makefile"); + TQFileInfo fi(dir + "/Makefile"); if (!fi.exists()) { - int r = KMessageBox::questionYesNo(m_widget, i18n("There is no Makefile in this directory. Run qmake first?"), QString::null, i18n("Run qmake"), i18n("Do Not Run")); + int r = KMessageBox::questionYesNo(m_widget, i18n("There is no Makefile in this directory. Run qmake first?"), TQString::null, i18n("Run qmake"), i18n("Do Not Run")); if (r == KMessageBox::No) return; startQMakeCommand(dir); } - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); if (target=="clean") { - QString cmdline = DomUtil::readEntry(dom, "/kdevtrollproject/make/makebin"); + TQString cmdline = DomUtil::readEntry(dom, "/kdevtrollproject/make/makebin"); if (cmdline.isEmpty()) cmdline = MAKE_COMMAND; cmdline += " clean"; - QString dircmd = "cd "; + TQString dircmd = "cd "; dircmd += dir; dircmd += " && "; cmdline.prepend(makeEnvironment()); makeFrontend()->queueCommand(dir, dircmd + cmdline); } - QString cmdline = DomUtil::readEntry(dom, "/kdevtrollproject/make/makebin"); + TQString cmdline = DomUtil::readEntry(dom, "/kdevtrollproject/make/makebin"); if (cmdline.isEmpty()) cmdline = MAKE_COMMAND; if (!DomUtil::readBoolEntry(dom, "/kdevtrollproject/make/abortonerror")) @@ -675,7 +675,7 @@ void TrollProjectPart::startMakeCommand(const QString &dir, const QString &targe int jobs = DomUtil::readIntEntry(dom, "/kdevtrollproject/make/numberofjobs"); if (jobs != 0) { cmdline += " -j"; - cmdline += QString::number(jobs); + cmdline += TQString::number(jobs); } if (DomUtil::readBoolEntry(dom, "/kdevtrollproject/make/dontact")) cmdline += " -n"; @@ -683,7 +683,7 @@ void TrollProjectPart::startMakeCommand(const QString &dir, const QString &targe cmdline += " "; cmdline += target; - QString dircmd = "cd "; + TQString dircmd = "cd "; dircmd += dir; dircmd += " && "; @@ -692,10 +692,10 @@ void TrollProjectPart::startMakeCommand(const QString &dir, const QString &targe } */ -void TrollProjectPart::startQMakeCommand(const QString &dir, bool recursive) +void TrollProjectPart::startQMakeCommand(const TQString &dir, bool recursive) { - QFileInfo fi(dir); - QString cmdline; + TQFileInfo fi(dir); + TQString cmdline; if ( isTMakeProject() ) { @@ -710,10 +710,10 @@ void TrollProjectPart::startQMakeCommand(const QString &dir, bool recursive) cmdline += " -recursive "; } - //QString cmdline = QString::fromLatin1( isTMakeProject() ? "tmake " : "qmake " ); + //TQString cmdline = TQString::fromLatin1( isTMakeProject() ? "tmake " : "qmake " ); // cmdline += fi.baseName() + ".pro"; - QDir d(dir); - QStringList l = d.entryList("*.pro"); + TQDir d(dir); + TQStringList l = d.entryList("*.pro"); if( l.isEmpty() || ( l.count() && l.findIndex( projectName() + ".pro" ) != -1 ) ) cmdline += projectName()+".pro"; @@ -722,9 +722,9 @@ void TrollProjectPart::startQMakeCommand(const QString &dir, bool recursive) else cmdline += l[0]; -// cmdline += QString::fromLatin1( " -o Makefile" ); +// cmdline += TQString::fromLatin1( " -o Makefile" ); - QString dircmd = "cd "; + TQString dircmd = "cd "; dircmd += KProcess::quote(dir); dircmd += " && "; @@ -732,28 +732,28 @@ void TrollProjectPart::startQMakeCommand(const QString &dir, bool recursive) makeFrontend()->queueCommand(dir, dircmd + cmdline); } -void TrollProjectPart::queueCmd(const QString &dir, const QString &cmd) +void TrollProjectPart::queueCmd(const TQString &dir, const TQString &cmd) { makeFrontend()->queueCommand(dir, cmd); } -void TrollProjectPart::slotCommandFinished( const QString& command ) +void TrollProjectPart::slotCommandFinished( const TQString& command ) { Q_UNUSED( command ); // if( m_buildCommand != command ) // return; // -// m_buildCommand = QString::null; +// m_buildCommand = TQString::null; m_timestamp.clear(); - QStringList fileList = allFiles(); - QStringList::Iterator it = fileList.begin(); + TQStringList fileList = allFiles(); + TQStringList::Iterator it = fileList.begin(); while( it != fileList.end() ){ - QString fileName = *it; + TQString fileName = *it; ++it; - m_timestamp[ fileName ] = QFileInfo( projectDirectory(), fileName ).lastModified(); + m_timestamp[ fileName ] = TQFileInfo( projectDirectory(), fileName ).lastModified(); } emit projectCompiled(); @@ -772,14 +772,14 @@ void TrollProjectPart::slotCommandFinished( const QString& command ) bool TrollProjectPart::isDirty() { - QStringList fileList = allFiles(); - QStringList::Iterator it = fileList.begin(); + TQStringList fileList = allFiles(); + TQStringList::Iterator it = fileList.begin(); while( it != fileList.end() ){ - QString fileName = *it; + TQString fileName = *it; ++it; - QMap<QString, QDateTime>::Iterator it = m_timestamp.find( fileName ); - QDateTime t = QFileInfo( projectDirectory(), fileName ).lastModified(); + TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( fileName ); + TQDateTime t = TQFileInfo( projectDirectory(), fileName ).lastModified(); if( it == m_timestamp.end() || *it != t ){ return true; } @@ -793,46 +793,46 @@ KDevProject::Options TrollProjectPart::options( ) const return UsesQMakeBuildSystem; } -bool TrollProjectPart::isValidQtDir( const QString& path ) const +bool TrollProjectPart::isValidQtDir( const TQString& path ) const { - QFileInfo inc( path + QString( QChar( QDir::separator() ) )+ - "include"+QString( QChar( QDir::separator() ) )+ - "qt.h" ); + TQFileInfo inc( path + TQString( TQChar( TQDir::separator() ) )+ + "include"+TQString( TQChar( TQDir::separator() ) )+ + "tqt.h" ); return ( isQt4Project() || ( !isQt4Project() && inc.exists() ) ); } -void TrollProjectPart::buildBinDirs( QStringList & dirs ) const +void TrollProjectPart::buildBinDirs( TQStringList & dirs ) const { if( !isQt4Project() ) { - QString m_defaultQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); + TQString m_defaultQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); if( !m_defaultQtDir.isEmpty() ) - dirs << (m_defaultQtDir + QString( QChar( QDir::separator() ) ) + "bin" ); - dirs << ( ::getenv("QTDIR") + QString( QChar( QDir::separator() ) ) + "bin" ); + dirs << (m_defaultQtDir + TQString( TQChar( TQDir::separator() ) ) + "bin" ); + dirs << ( ::getenv("QTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin" ); } - QStringList paths = QStringList::split(":",::getenv("PATH")); + TQStringList paths = TQStringList::split(":",::getenv("PATH")); dirs += paths; - QString binpath = QDir::rootDirPath() + "bin"; + TQString binpath = TQDir::rootDirPath() + "bin"; if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; - binpath = QDir::rootDirPath() + "usr" + QString( QChar( QDir::separator() ) ) + "bin"; + binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "bin"; if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; - binpath = QDir::rootDirPath() + "usr" + QString( QChar( QDir::separator() ) ) + "local" + QString( QChar( QDir::separator() ) ) + "bin"; + binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "local" + TQString( TQChar( TQDir::separator() ) ) + "bin"; if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; } -QString TrollProjectPart::findExecutable( const QString& execname ) const +TQString TrollProjectPart::findExecutable( const TQString& execname ) const { - QStringList dirs; + TQStringList dirs; buildBinDirs( dirs ); - for( QStringList::Iterator it=dirs.begin(); it!=dirs.end(); ++it ) + for( TQStringList::Iterator it=dirs.begin(); it!=dirs.end(); ++it ) { - QString designer = *it + QString( QChar( QDir::separator() ) ) + execname; + TQString designer = *it + TQString( TQChar( TQDir::separator() ) ) + execname; if( !designer.isEmpty() && isExecutable( designer ) ) { return designer; @@ -841,26 +841,26 @@ QString TrollProjectPart::findExecutable( const QString& execname ) const return ""; } -bool TrollProjectPart::isExecutable( const QString& path ) const +bool TrollProjectPart::isExecutable( const TQString& path ) const { - QFileInfo fi(path); + TQFileInfo fi(path); return( fi.exists() && fi.isExecutable() ); } -QString TrollProjectPart::findQtDir() +TQString TrollProjectPart::findQtDir() { - QStringList qtdirs; + TQStringList qtdirs; if( !isQt4Project() ) qtdirs.push_back( ::getenv("QTDIR") ); - qtdirs.push_back( QDir::rootDirPath()+"usr"+QString( QChar( QDir::separator() ) )+"lib"+QString( QChar( QDir::separator() ) )+"qt"+QString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); - qtdirs.push_back( QDir::rootDirPath()+"usr"+QString( QChar( QDir::separator() ) )+"lib"+QString( QChar( QDir::separator() ) )+"qt"+QString( QChar( QDir::separator() ) )+QString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); - qtdirs.push_back( QDir::rootDirPath()+"usr"+QString( QChar( QDir::separator() ) )+"share"+QString( QChar( QDir::separator() ) )+"qt"+QString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); - qtdirs.push_back( QDir::rootDirPath()+"usr" ); - qtdirs.push_back( QDir::rootDirPath()+"usr"+QString( QChar( QDir::separator() ) )+"lib"+QString( QChar( QDir::separator() ) )+"qt" ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr" ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt" ); - for( QStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it ) + for( TQStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it ) { - QString qtdir = *it; + TQString qtdir = *it; if( !qtdir.isEmpty() && isValidQtDir(qtdir) ) { return qtdir; @@ -870,25 +870,25 @@ QString TrollProjectPart::findQtDir() } -QStringList recursiveProFind( const QString &currDir, const QString &baseDir ) +TQStringList recursiveProFind( const TQString &currDir, const TQString &baseDir ) { - QStringList fileList; + TQStringList fileList; - if( !currDir.contains( QString( QChar ( QDir::separator() ) ) +".." ) - && !currDir.contains( QString( QChar( QDir::separator() ) )+".") ) + if( !currDir.contains( TQString( TQChar ( TQDir::separator() ) ) +".." ) + && !currDir.contains( TQString( TQChar( TQDir::separator() ) )+".") ) { - QDir dir(currDir); - QStringList dirList = dir.entryList(QDir::Dirs ); - QStringList::Iterator idx = dirList.begin(); + TQDir dir(currDir); + TQStringList dirList = dir.entryList(TQDir::Dirs ); + TQStringList::Iterator idx = dirList.begin(); for( ; idx != dirList.end(); ++idx ) { - fileList += recursiveProFind( currDir + QString( QChar( QDir::separator() ) ) + (*idx),baseDir ); + fileList += recursiveProFind( currDir + TQString( TQChar( TQDir::separator() ) ) + (*idx),baseDir ); } - QStringList newFiles = dir.entryList("*.pro *.PRO"); + TQStringList newFiles = dir.entryList("*.pro *.PRO"); idx = newFiles.begin(); for( ; idx != newFiles.end(); ++idx ) { - QString file = currDir + QString( QChar( QDir::separator() ) ) + (*idx); + TQString file = currDir + TQString( TQChar( TQDir::separator() ) ) + (*idx); fileList.append( file.remove( baseDir ) ); } } @@ -900,12 +900,12 @@ QStringList recursiveProFind( const QString &currDir, const QString &baseDir ) /*! \fn TrollProjectPart::distFiles() const */ -QStringList TrollProjectPart::distFiles() const +TQStringList TrollProjectPart::distFiles() const { - QStringList sourceList = allFiles(); + TQStringList sourceList = allFiles(); // Scan current source directory for any .pro files. - QString projectDir = projectDirectory(); - QStringList files = recursiveProFind( projectDir, projectDir + QString( QChar( QDir::separator() ) ) ); + TQString projectDir = projectDirectory(); + TQStringList files = recursiveProFind( projectDir, projectDir + TQString( TQChar( TQDir::separator() ) ) ); return sourceList + files; } diff --git a/buildtools/qmake/trollprojectpart.h b/buildtools/qmake/trollprojectpart.h index 3e571e85..945fb10a 100644 --- a/buildtools/qmake/trollprojectpart.h +++ b/buildtools/qmake/trollprojectpart.h @@ -16,10 +16,10 @@ #ifndef _TROLLPROJECTPART_H_ #define _TROLLPROJECTPART_H_ -#include <qdict.h> -#include <qguardedptr.h> -#include <qmap.h> -#include <qdatetime.h> +#include <tqdict.h> +#include <tqguardedptr.h> +#include <tqmap.h> +#include <tqdatetime.h> #include "kdevbuildtool.h" @@ -33,7 +33,7 @@ class TrollProjectPart : public KDevBuildTool Q_OBJECT public: - TrollProjectPart( QObject *parent, const char *name, const QStringList &args ); + TrollProjectPart( TQObject *parent, const char *name, const TQStringList &args ); ~TrollProjectPart(); bool isTMakeProject() const { return m_tmakeProject; } @@ -41,26 +41,26 @@ public: bool isDirty(); KDirWatch* dirWatch(); virtual Options options() const; - QStringList distFiles() const; - inline QString qmakePath() const { return DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", "");; } + TQStringList distFiles() const; + inline TQString qmakePath() const { return DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", "");; } protected: - virtual void openProject(const QString &dirName, const QString &projectName); + virtual void openProject(const TQString &dirName, const TQString &projectName); virtual void closeProject(); - virtual QString projectDirectory() const; - virtual QString projectName() const; - virtual QString mainProgram() const; - virtual QString activeDirectory() const; - virtual QStringList allFiles() const; - virtual void addFile(const QString &fileName); - virtual void addFiles ( const QStringList &fileList ); - virtual void removeFile(const QString &fileName); - virtual void removeFiles ( const QStringList &fileList ); - virtual QString buildDirectory() const; - virtual QString runDirectory() const; - virtual QString debugArguments() const; - virtual QString runArguments() const; + virtual TQString projectDirectory() const; + virtual TQString projectName() const; + virtual TQString mainProgram() const; + virtual TQString activeDirectory() const; + virtual TQStringList allFiles() const; + virtual void addFile(const TQString &fileName); + virtual void addFiles ( const TQStringList &fileList ); + virtual void removeFile(const TQString &fileName); + virtual void removeFiles ( const TQStringList &fileList ); + virtual TQString buildDirectory() const; + virtual TQString runDirectory() const; + virtual TQString debugArguments() const; + virtual TQString runArguments() const; virtual DomUtil::PairList runEnvironmentVars() const; private slots: @@ -68,31 +68,31 @@ private slots: void slotBuild(); // void slotClean(); // void slotExecute(); - void slotCommandFinished( const QString& command ); + void slotCommandFinished( const TQString& command ); void slotBuildAndExecuteProject(); void slotBuildAndExecuteTarget(); private: -// void startMakeCommand(const QString &dir, const QString &target); - void startQMakeCommand(const QString &dir, bool recursive = false ); -// void execute(const QString &directory, const QString &command); - void queueCmd(const QString &dir, const QString &cmd); - QString makeEnvironment(); - - QString findQtDir(); - QString findExecutable( const QString& path ) const; - void buildBinDirs( QStringList& ) const; - bool isValidQtDir( const QString& path ) const; - bool isExecutable( const QString& path ) const; - - QGuardedPtr<TrollProjectWidget> m_widget; - QString m_projectName; +// void startMakeCommand(const TQString &dir, const TQString &target); + void startQMakeCommand(const TQString &dir, bool recursive = false ); +// void execute(const TQString &directory, const TQString &command); + void queueCmd(const TQString &dir, const TQString &cmd); + TQString makeEnvironment(); + + TQString findQtDir(); + TQString findExecutable( const TQString& path ) const; + void buildBinDirs( TQStringList& ) const; + bool isValidQtDir( const TQString& path ) const; + bool isExecutable( const TQString& path ) const; + + TQGuardedPtr<TrollProjectWidget> m_widget; + TQString m_projectName; bool m_tmakeProject; - QMap<QString, QDateTime> m_timestamp; + TQMap<TQString, TQDateTime> m_timestamp; bool m_executeProjectAfterBuild; bool m_executeTargetAfterBuild; - QString m_buildCommand; + TQString m_buildCommand; KDirWatch* m_dirWatch; diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 7668dbd7..087367bd 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -25,29 +25,29 @@ #include <config.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qheader.h> -#include <qsplitter.h> -#include <qptrstack.h> -#include <qtextstream.h> -#include <qcombobox.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqheader.h> +#include <tqsplitter.h> +#include <tqptrstack.h> +#include <tqtextstream.h> +#include <tqcombobox.h> #include <kprocess.h> -#include <qtimer.h> -#include <qdir.h> -#include <qregexp.h> -#include <qinputdialog.h> -#include <qwhatsthis.h> -#include <qvaluestack.h> +#include <tqtimer.h> +#include <tqdir.h> +#include <tqregexp.h> +#include <tqinputdialog.h> +#include <tqwhatsthis.h> +#include <tqvaluestack.h> #include <kfiledialog.h> -#include <qtooltip.h> +#include <tqtooltip.h> #include <kdebug.h> #include <klistview.h> #include <kmessagebox.h> #include <kpopupmenu.h> #include <kregexp.h> #include <kurl.h> -#include <qmessagebox.h> +#include <tqmessagebox.h> #include <iostream> #include <kparts/part.h> #include <kaction.h> @@ -80,105 +80,105 @@ #include <kapplication.h> TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) - : QVBox( 0, "troll project widget" ), m_shownSubproject( 0 ), m_rootSubproject( 0 ), + : TQVBox( 0, "troll project widget" ), m_shownSubproject( 0 ), m_rootSubproject( 0 ), m_rootScope ( 0 ), m_part ( part ), m_configDlg( 0 ), m_filesCached(false) { - QSplitter * splitter = new QSplitter( Vertical, this ); + TQSplitter * splitter = new TQSplitter( Vertical, this ); ////////////////// // PROJECT VIEW // ////////////////// - overviewContainer = new QVBox( splitter, "Projects" ); + overviewContainer = new TQVBox( splitter, "Projects" ); overviewContainer->setMargin ( 2 ); overviewContainer->setSpacing ( 2 ); - // overviewContainer->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); - // splitter->setResizeMode(overviewContainer, QSplitter::FollowSizeHint); + // overviewContainer->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); + // splitter->setResizeMode(overviewContainer, TQSplitter::FollowSizeHint); - projectTools = new QHBox( overviewContainer, "Project buttons" ); + projectTools = new TQHBox( overviewContainer, "Project buttons" ); projectTools->setMargin ( 2 ); projectTools->setSpacing ( 2 ); // Add subdir - addSubdirButton = new QToolButton ( projectTools, "Add subproject button" ); + addSubdirButton = new TQToolButton ( projectTools, "Add subproject button" ); addSubdirButton->setPixmap ( SmallIcon ( "folder_new" ) ); - addSubdirButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, addSubdirButton->sizePolicy().hasHeightForWidth() ) ); + addSubdirButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addSubdirButton->sizePolicy().hasHeightForWidth() ) ); addSubdirButton->setEnabled ( true ); - QToolTip::add( addSubdirButton, i18n( "Add subproject" ) ); - QWhatsThis::add( addSubdirButton, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently selected subproject. " + TQToolTip::add( addSubdirButton, i18n( "Add subproject" ) ); + TQWhatsThis::add( addSubdirButton, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently selected subproject. " "This action is allowed only if a type of the subproject is 'subdirectories'. The type of the subproject can be " "defined in <b>Subproject Settings</b> dialog (open it from the subproject context menu)." ) ); // Create scope - createScopeButton = new QToolButton ( projectTools, "Create scope button" ); + createScopeButton = new TQToolButton ( projectTools, "Create scope button" ); createScopeButton->setPixmap ( SmallIcon ( "qmake_scopenew" ) ); - createScopeButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, createScopeButton->sizePolicy().hasHeightForWidth() ) ); + createScopeButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, createScopeButton->sizePolicy().hasHeightForWidth() ) ); createScopeButton->setEnabled ( true ); - QToolTip::add( createScopeButton, i18n( "Create scope" ) ); - QWhatsThis::add( createScopeButton, i18n( "<b>Create scope</b><p>Creates QMake scope in the project file in case the subproject is selected or creates nested scope in case the scope is selected." ) ); + TQToolTip::add( createScopeButton, i18n( "Create scope" ) ); + TQWhatsThis::add( createScopeButton, i18n( "<b>Create scope</b><p>Creates QMake scope in the project file in case the subproject is selected or creates nested scope in case the scope is selected." ) ); // build - buildProjectButton = new QToolButton ( projectTools, "Make button" ); + buildProjectButton = new TQToolButton ( projectTools, "Make button" ); buildProjectButton->setPixmap ( SmallIcon ( "make_kdevelop" ) ); - buildProjectButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, buildProjectButton->sizePolicy().hasHeightForWidth() ) ); + buildProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildProjectButton->sizePolicy().hasHeightForWidth() ) ); buildProjectButton->setEnabled ( true ); - QToolTip::add( buildProjectButton, i18n( "Build project" ) ); - QWhatsThis::add( buildProjectButton, i18n( "<b>Build project</b><p>Runs <b>make</b> from the project directory.<br>" + TQToolTip::add( buildProjectButton, i18n( "Build project" ) ); + TQWhatsThis::add( buildProjectButton, i18n( "<b>Build project</b><p>Runs <b>make</b> from the project directory.<br>" "Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab." ) ); // rebuild - rebuildProjectButton = new QToolButton ( projectTools, "Rebuild button" ); + rebuildProjectButton = new TQToolButton ( projectTools, "Rebuild button" ); rebuildProjectButton->setPixmap ( SmallIcon ( "rebuild" ) ); - rebuildProjectButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, rebuildProjectButton->sizePolicy().hasHeightForWidth() ) ); + rebuildProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildProjectButton->sizePolicy().hasHeightForWidth() ) ); rebuildProjectButton->setEnabled ( true ); - QToolTip::add( rebuildProjectButton, i18n( "Rebuild project" ) ); - QWhatsThis::add( rebuildProjectButton, i18n( "<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from the project directory.<br>" + TQToolTip::add( rebuildProjectButton, i18n( "Rebuild project" ) ); + TQWhatsThis::add( rebuildProjectButton, i18n( "<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from the project directory.<br>" "Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab." ) ); // run - executeProjectButton = new QToolButton ( projectTools, "Run button" ); + executeProjectButton = new TQToolButton ( projectTools, "Run button" ); executeProjectButton->setPixmap ( SmallIcon ( "exec" ) ); - executeProjectButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, executeProjectButton->sizePolicy().hasHeightForWidth() ) ); + executeProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeProjectButton->sizePolicy().hasHeightForWidth() ) ); executeProjectButton->setEnabled ( true ); - QToolTip::add( executeProjectButton, i18n( "Execute main program" ) ); - QWhatsThis::add( executeProjectButton, i18n( "<b>Execute main program</b><p>Executes the main program specified in project settings, <b>Run Options</b> tab." ) ); + TQToolTip::add( executeProjectButton, i18n( "Execute main program" ) ); + TQWhatsThis::add( executeProjectButton, i18n( "<b>Execute main program</b><p>Executes the main program specified in project settings, <b>Run Options</b> tab." ) ); // spacer - QWidget *spacer = new QWidget( projectTools ); + TQWidget *spacer = new TQWidget( projectTools ); projectTools->setStretchFactor( spacer, 1 ); // Project configuration - projectconfButton = new QToolButton ( projectTools, "Project configuration button" ); + projectconfButton = new TQToolButton ( projectTools, "Project configuration button" ); projectconfButton->setPixmap ( SmallIcon ( "configure" ) ); - projectconfButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, projectconfButton->sizePolicy().hasHeightForWidth() ) ); + projectconfButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, projectconfButton->sizePolicy().hasHeightForWidth() ) ); projectconfButton->setEnabled ( true ); - QToolTip::add( projectconfButton, i18n( "Subproject settings" ) ); - QWhatsThis::add( projectconfButton, i18n( "<b>Subproject settings</b><p>Opens <b>QMake Subproject Configuration</b> dialog for the currently selected subproject. " + TQToolTip::add( projectconfButton, i18n( "Subproject settings" ) ); + TQWhatsThis::add( projectconfButton, i18n( "<b>Subproject settings</b><p>Opens <b>QMake Subproject Configuration</b> dialog for the currently selected subproject. " "It provides settings for:<br>subproject type and configuration,<br>include and library paths,<br>lists of dependencies and " "external libraries,<br>build order,<br>intermediate files locations,<br>compiler options." ) ); // Project button connections - connect ( addSubdirButton, SIGNAL ( clicked () ), this, SLOT ( slotAddSubproject () ) ); - connect ( createScopeButton, SIGNAL ( clicked () ), this, SLOT ( slotCreateScope () ) ); + connect ( addSubdirButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddSubproject () ) ); + connect ( createScopeButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotCreateScope () ) ); - connect ( buildProjectButton, SIGNAL ( clicked () ), this, SLOT ( slotBuildProject () ) ); - connect ( rebuildProjectButton, SIGNAL ( clicked () ), this, SLOT ( slotRebuildProject () ) ); - connect ( executeProjectButton, SIGNAL ( clicked () ), m_part, SLOT ( slotBuildAndExecuteProject () ) ); + connect ( buildProjectButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotBuildProject () ) ); + connect ( rebuildProjectButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRebuildProject () ) ); + connect ( executeProjectButton, TQT_SIGNAL ( clicked () ), m_part, TQT_SLOT ( slotBuildAndExecuteProject () ) ); - connect ( projectconfButton, SIGNAL ( clicked () ), this, SLOT ( slotConfigureProject () ) ); + connect ( projectconfButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotConfigureProject () ) ); // Project tree overview = new TrollListView( this, overviewContainer, SubprojectView, "project overview widget" ); -// overview->setResizeMode( QListView::LastColumn ); +// overview->setResizeMode( TQListView::LastColumn ); overview->setSorting( -1 ); overview->header() ->hide(); - overview->addColumn( QString::null ); + overview->addColumn( TQString::null ); // Project tree connections - connect( overview, SIGNAL( selectionChanged( QListViewItem* ) ), - this, SLOT( slotOverviewSelectionChanged( QListViewItem* ) ) ); - connect( overview, SIGNAL( contextMenu( KListView*, QListViewItem*, const QPoint& ) ), - this, SLOT( slotOverviewContextMenu( KListView*, QListViewItem*, const QPoint& ) ) ); + connect( overview, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQT_SLOT( slotOverviewSelectionChanged( TQListViewItem* ) ) ); + connect( overview, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( slotOverviewContextMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); ///////////////// @@ -186,128 +186,128 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) ///////////////// // Details tree - detailContainer = new QVBox( splitter, "Details" ); + detailContainer = new TQVBox( splitter, "Details" ); detailContainer->setMargin ( 2 ); detailContainer->setSpacing ( 2 ); - // detailContainer->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); + // detailContainer->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); // Details Toolbar - fileTools = new QHBox( detailContainer, "Detail buttons" ); + fileTools = new TQHBox( detailContainer, "Detail buttons" ); fileTools->setMargin ( 2 ); fileTools->setSpacing ( 2 ); // Add new file button - newfileButton = new QToolButton ( fileTools, "Create new file" ); + newfileButton = new TQToolButton ( fileTools, "Create new file" ); newfileButton->setPixmap ( SmallIcon ( "filenew" ) ); - newfileButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, newfileButton->sizePolicy().hasHeightForWidth() ) ); + newfileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, newfileButton->sizePolicy().hasHeightForWidth() ) ); newfileButton->setEnabled ( true ); - QToolTip::add( newfileButton, i18n( "Create new file" ) ); - QWhatsThis::add( newfileButton, i18n( "<b>Create new file</b><p>Creates a new file and adds it to a currently selected group." ) ); + TQToolTip::add( newfileButton, i18n( "Create new file" ) ); + TQWhatsThis::add( newfileButton, i18n( "<b>Create new file</b><p>Creates a new file and adds it to a currently selected group." ) ); // Add existing files button - addfilesButton = new QToolButton ( fileTools, "Add existing files" ); + addfilesButton = new TQToolButton ( fileTools, "Add existing files" ); addfilesButton->setPixmap ( SmallIcon ( "fileimport" ) ); - addfilesButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, addfilesButton->sizePolicy().hasHeightForWidth() ) ); + addfilesButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addfilesButton->sizePolicy().hasHeightForWidth() ) ); addfilesButton->setEnabled ( true ); - QToolTip::add( addfilesButton, i18n( "Add existing files" ) ); - QWhatsThis::add( addfilesButton, i18n( "<b>Add existing files</b><p>Adds existing files to a currently selected group. It is " + TQToolTip::add( addfilesButton, i18n( "Add existing files" ) ); + TQWhatsThis::add( addfilesButton, i18n( "<b>Add existing files</b><p>Adds existing files to a currently selected group. It is " "possible to copy files to a current subproject directory, create symbolic links or " "add them with the relative path." ) ); // remove file button - removefileButton = new QToolButton ( fileTools, "Remove file" ); + removefileButton = new TQToolButton ( fileTools, "Remove file" ); removefileButton->setPixmap ( SmallIcon ( "button_cancel" ) ); - removefileButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, removefileButton->sizePolicy().hasHeightForWidth() ) ); + removefileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, removefileButton->sizePolicy().hasHeightForWidth() ) ); removefileButton->setEnabled ( true ); - QToolTip::add( removefileButton, i18n( "Remove file" ) ); - QWhatsThis::add( removefileButton, i18n( "<b>Remove file</b><p>Removes file from a current group. Does not remove file from disk." ) ); + TQToolTip::add( removefileButton, i18n( "Remove file" ) ); + TQWhatsThis::add( removefileButton, i18n( "<b>Remove file</b><p>Removes file from a current group. Does not remove file from disk." ) ); // build selected file - buildFileButton = new QToolButton ( fileTools, "Make file button" ); + buildFileButton = new TQToolButton ( fileTools, "Make file button" ); buildFileButton->setPixmap ( SmallIcon ( "compfile" ) ); - buildFileButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, buildFileButton->sizePolicy().hasHeightForWidth() ) ); + buildFileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildFileButton->sizePolicy().hasHeightForWidth() ) ); buildFileButton->setEnabled ( true ); - QToolTip::add( buildFileButton, i18n( "Compile file" ) ); - QWhatsThis::add( buildFileButton, i18n( "<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory where 'filename' is the name of currently opened file.<br>" + TQToolTip::add( buildFileButton, i18n( "Compile file" ) ); + TQWhatsThis::add( buildFileButton, i18n( "<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory where 'filename' is the name of currently opened file.<br>" "Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab." ) ); // build - buildTargetButton = new QToolButton ( fileTools, "Make sp button" ); + buildTargetButton = new TQToolButton ( fileTools, "Make sp button" ); buildTargetButton->setPixmap ( SmallIcon ( "make_kdevelop" ) ); - buildTargetButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, buildTargetButton->sizePolicy().hasHeightForWidth() ) ); + buildTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildTargetButton->sizePolicy().hasHeightForWidth() ) ); buildTargetButton->setEnabled ( true ); - QToolTip::add( buildTargetButton, i18n( "Build subproject" ) ); - QWhatsThis::add( buildTargetButton, i18n( "<b>Build subproject</b><p>Runs <b>make</b> from the current subproject directory. " + TQToolTip::add( buildTargetButton, i18n( "Build subproject" ) ); + TQWhatsThis::add( buildTargetButton, i18n( "<b>Build subproject</b><p>Runs <b>make</b> from the current subproject directory. " "Current subproject is a subproject selected in <b>QMake manager</b> 'overview' window.<br>" "Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab." ) ); // rebuild - rebuildTargetButton = new QToolButton ( fileTools, "Rebuild sp button" ); + rebuildTargetButton = new TQToolButton ( fileTools, "Rebuild sp button" ); rebuildTargetButton->setPixmap ( SmallIcon ( "rebuild" ) ); - rebuildTargetButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, rebuildTargetButton->sizePolicy().hasHeightForWidth() ) ); + rebuildTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildTargetButton->sizePolicy().hasHeightForWidth() ) ); rebuildTargetButton->setEnabled ( true ); - QToolTip::add( rebuildTargetButton, i18n( "Rebuild subproject" ) ); - QWhatsThis::add( rebuildTargetButton, i18n( "<b>Rebuild subproject</b><p>Runs <b>make clean</b> and then <b>make</b> from the current subproject directory. " + TQToolTip::add( rebuildTargetButton, i18n( "Rebuild subproject" ) ); + TQWhatsThis::add( rebuildTargetButton, i18n( "<b>Rebuild subproject</b><p>Runs <b>make clean</b> and then <b>make</b> from the current subproject directory. " "Current subproject is a subproject selected in <b>QMake manager</b> 'overview' window.<br>" "Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab." ) ); // run - executeTargetButton = new QToolButton ( fileTools, "Run sp button" ); + executeTargetButton = new TQToolButton ( fileTools, "Run sp button" ); executeTargetButton->setPixmap ( SmallIcon ( "exec" ) ); - executeTargetButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, executeTargetButton->sizePolicy().hasHeightForWidth() ) ); + executeTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeTargetButton->sizePolicy().hasHeightForWidth() ) ); executeTargetButton->setEnabled ( true ); - QToolTip::add( executeTargetButton, i18n( "Execute subproject" ) ); - QWhatsThis::add( executeTargetButton, i18n( "<b>Execute subproject</b><p>Executes the target program for the currently selected subproject. " + TQToolTip::add( executeTargetButton, i18n( "Execute subproject" ) ); + TQWhatsThis::add( executeTargetButton, i18n( "<b>Execute subproject</b><p>Executes the target program for the currently selected subproject. " "This action is allowed only if a type of the subproject is 'application'. The type of the subproject can be " "defined in <b>Subproject Settings</b> dialog (open it from the subproject context menu)." ) ); // spacer - spacer = new QWidget( fileTools ); + spacer = new TQWidget( fileTools ); projectTools->setStretchFactor( spacer, 1 ); // Configure file button - excludeFileFromScopeButton = new QToolButton ( fileTools, "Exclude file" ); + excludeFileFromScopeButton = new TQToolButton ( fileTools, "Exclude file" ); excludeFileFromScopeButton->setPixmap ( SmallIcon ( "configure_file" ) ); - excludeFileFromScopeButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, excludeFileFromScopeButton->sizePolicy().hasHeightForWidth() ) ); + excludeFileFromScopeButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, excludeFileFromScopeButton->sizePolicy().hasHeightForWidth() ) ); excludeFileFromScopeButton->setEnabled ( true ); - QToolTip::add( excludeFileFromScopeButton , i18n( "Exclude file" ) ); - QWhatsThis::add( excludeFileFromScopeButton , i18n( "<b>Exclude file</b><p>Exclude the selected file from this scope." ) ); + TQToolTip::add( excludeFileFromScopeButton , i18n( "Exclude file" ) ); + TQWhatsThis::add( excludeFileFromScopeButton , i18n( "<b>Exclude file</b><p>Exclude the selected file from this scope." ) ); // detail tree details = new TrollListView( this, detailContainer, DetailsView, "details widget" ); details->setRootIsDecorated( true ); - details->setResizeMode( QListView::LastColumn ); + details->setResizeMode( TQListView::LastColumn ); details->setSorting( -1 ); details->header() ->hide(); - details->addColumn( QString::null ); + details->addColumn( TQString::null ); // Detail button connections - connect ( addfilesButton, SIGNAL ( clicked () ), this, SLOT ( slotAddFiles () ) ); - connect ( newfileButton, SIGNAL ( clicked () ), this, SLOT ( slotNewFile () ) ); - connect ( removefileButton, SIGNAL ( clicked () ), this, SLOT ( slotRemoveFile () ) ); - connect ( buildFileButton, SIGNAL ( clicked () ), this, SLOT ( slotBuildSelectedFile () ) ); - connect ( excludeFileFromScopeButton, SIGNAL ( clicked () ), this, SLOT ( slotExcludeFileFromScopeButton() ) ); + connect ( addfilesButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddFiles () ) ); + connect ( newfileButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotNewFile () ) ); + connect ( removefileButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveFile () ) ); + connect ( buildFileButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotBuildSelectedFile () ) ); + connect ( excludeFileFromScopeButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotExcludeFileFromScopeButton() ) ); // Detail tree connections - connect( details, SIGNAL( selectionChanged( QListViewItem* ) ), - this, SLOT( slotDetailsSelectionChanged( QListViewItem* ) ) ); - connect( details, SIGNAL( executed( QListViewItem* ) ), - this, SLOT( slotDetailsExecuted( QListViewItem* ) ) ); - connect( details, SIGNAL( contextMenu( KListView*, QListViewItem*, const QPoint& ) ), - this, SLOT( slotDetailsContextMenu( KListView*, QListViewItem*, const QPoint& ) ) ); - - connect ( buildTargetButton, SIGNAL ( clicked () ), this, SLOT ( slotBuildTarget () ) ); - connect ( rebuildTargetButton, SIGNAL ( clicked () ), this, SLOT ( slotRebuildTarget () ) ); - connect ( executeTargetButton, SIGNAL ( clicked () ), m_part, SLOT ( slotBuildAndExecuteTarget () ) ); + connect( details, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQT_SLOT( slotDetailsSelectionChanged( TQListViewItem* ) ) ); + connect( details, TQT_SIGNAL( executed( TQListViewItem* ) ), + this, TQT_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); + connect( details, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( slotDetailsContextMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); + + connect ( buildTargetButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotBuildTarget () ) ); + connect ( rebuildTargetButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRebuildTarget () ) ); + connect ( executeTargetButton, TQT_SIGNAL ( clicked () ), m_part, TQT_SLOT ( slotBuildAndExecuteTarget () ) ); buildTargetButton->setEnabled( false ); rebuildTargetButton->setEnabled( false ); executeTargetButton->setEnabled( false ); m_configDlg = new ProjectConfigurationDlg( overview, this, this ); - connect( m_part->dirWatch(), SIGNAL( dirty(const QString&) ), this, SLOT( slotProjectDirty(const QString&) ) ); + connect( m_part->dirWatch(), TQT_SIGNAL( dirty(const TQString&) ), this, TQT_SLOT( slotProjectDirty(const TQString&) ) ); } @@ -317,28 +317,28 @@ TrollProjectWidget::~TrollProjectWidget() } -void TrollProjectWidget::openProject( const QString &dirName ) +void TrollProjectWidget::openProject( const TQString &dirName ) { - QDomDocument & dom = *( m_part->projectDom() ); + TQDomDocument & dom = *( m_part->projectDom() ); m_subclasslist = DomUtil::readPairListEntry( dom, "/kdevtrollproject/subclassing" , "subclass", "sourcefile", "uifile" ); - QString projectfile = DomUtil::readEntry( dom, "/kdevtrollproject/qmake/projectfile", "" ); + TQString projectfile = DomUtil::readEntry( dom, "/kdevtrollproject/qmake/projectfile", "" ); m_showFilenamesOnly = DomUtil::readBoolEntry( *m_part->projectDom(), "/kdevtrollproject/qmake/enableFilenamesOnly", false ); m_showVariablesInTree = DomUtil::readBoolEntry( *m_part->projectDom(), "/kdevtrollproject/qmake/showVariablesInTree", true ); - QString proname; + TQString proname; if( projectfile.isEmpty() ) { - QFileInfo fi( dirName ); - QDir dir( dirName ); - // QString proname = item->path + "/" + fi.baseName() + ".pro"; + TQFileInfo fi( dirName ); + TQDir dir( dirName ); + // TQString proname = item->path + "/" + fi.baseName() + ".pro"; - QStringList l = dir.entryList( "*.pro" ); + TQStringList l = dir.entryList( "*.pro" ); - QString profile; + TQString profile; if( l.count() && l.findIndex( m_part->projectName() + ".pro") != -1 ) profile = m_part->projectName()+".pro"; else if( l.isEmpty() || ( l.count() && l.findIndex( fi.baseName() + ".pro") != -1 ) ) @@ -346,7 +346,7 @@ void TrollProjectWidget::openProject( const QString &dirName ) else profile = l[0]; - proname = dirName + QString( QChar( QDir::separator() ) ) + profile; + proname = dirName + TQString( TQChar( TQDir::separator() ) ) + profile; } else { proname = projectfile; @@ -393,10 +393,10 @@ void TrollProjectWidget::closeProject() delete m_rootScope; } -QStringList TrollProjectWidget::allFiles() +TQStringList TrollProjectWidget::allFiles() { if( !m_rootScope ) - return QStringList(); + return TQStringList(); if( m_filesCached ) return m_allFilesCache; m_allFilesCache = m_rootScope->allFiles( m_rootScope->projectDir() ); @@ -404,19 +404,19 @@ QStringList TrollProjectWidget::allFiles() return m_allFilesCache; } -QString TrollProjectWidget::projectDirectory() +TQString TrollProjectWidget::projectDirectory() { if ( !m_rootScope ) - return QString::null; //confused + return TQString::null; //confused return m_rootScope->projectDir(); } -QString TrollProjectWidget::subprojectDirectory() +TQString TrollProjectWidget::subprojectDirectory() { if ( !m_shownSubproject ) - return QString::null; + return TQString::null; return m_shownSubproject->scope->projectDir(); } @@ -431,7 +431,7 @@ void TrollProjectWidget::setupContext() bool hasSourceFiles = true; bool hasSubdirs = false; - QStringList tmpl = m_shownSubproject->scope->variableValues( "TEMPLATE" ); + TQStringList tmpl = m_shownSubproject->scope->variableValues( "TEMPLATE" ); if ( tmpl.findIndex( "lib" ) != -1 ) { @@ -471,9 +471,9 @@ void TrollProjectWidget::setupContext() details->setEnabled( hasSourceFiles ); } -void TrollProjectWidget::slotOverviewSelectionChanged( QListViewItem *item ) +void TrollProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item ) { - QString olddir = m_part->activeDirectory(); + TQString olddir = m_part->activeDirectory(); if ( !item ) { kdDebug(9024) << "Trying to select a non-existing item" << endl; @@ -484,7 +484,7 @@ void TrollProjectWidget::slotOverviewSelectionChanged( QListViewItem *item ) setupContext(); buildProjectDetailTree( m_shownSubproject, details ); - QDomDocument &dom = *( m_part->projectDom() ); + TQDomDocument &dom = *( m_part->projectDom() ); DomUtil::writeEntry( dom, "/kdevtrollproject/general/activedir", m_shownSubproject->relativePath() ); if ( m_configDlg && m_configDlg->isShown() ) { @@ -493,33 +493,33 @@ void TrollProjectWidget::slotOverviewSelectionChanged( QListViewItem *item ) emit m_part->activeDirectoryChanged( olddir, m_part->activeDirectory() ); } -QString TrollProjectWidget::getCurrentTarget() +TQString TrollProjectWidget::getCurrentTarget() { if ( !m_shownSubproject ) return ""; - QString destdir = getCurrentDestDir(); + TQString destdir = getCurrentDestDir(); if ( destdir.isEmpty() ) return getCurrentOutputFilename(); else - return destdir + QString( QChar( QDir::separator() ) ) + getCurrentOutputFilename(); + return destdir + TQString( TQChar( TQDir::separator() ) ) + getCurrentOutputFilename(); } -QString TrollProjectWidget::getCurrentDestDir() +TQString TrollProjectWidget::getCurrentDestDir() { if ( !m_shownSubproject ) return ""; - QStringList destdir = m_shownSubproject->scope->variableValues( "DESTDIR", true, true, true ); + TQStringList destdir = m_shownSubproject->scope->variableValues( "DESTDIR", true, true, true ); return m_shownSubproject->scope->resolveVariables(m_shownSubproject->scope->variableValues( "DESTDIR", true, true, true ).front()); } -QString TrollProjectWidget::getCurrentOutputFilename() +TQString TrollProjectWidget::getCurrentOutputFilename() { if ( !m_shownSubproject ) return ""; if ( m_shownSubproject->scope->variableValues( "TARGET", true, true, true ).isEmpty() ) { - QString exe = m_shownSubproject->scope->resolveVariables(m_shownSubproject->scope->fileName()); - return exe.replace( QRegExp( "\\.pro$" ), "" ); + TQString exe = m_shownSubproject->scope->resolveVariables(m_shownSubproject->scope->fileName()); + return exe.replace( TQRegExp( "\\.pro$" ), "" ); } else { @@ -533,14 +533,14 @@ void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item ) // it is a subdir template if ( item && details->childCount() ) { - QListViewItem* i = details->firstChild(); + TQListViewItem* i = details->firstChild(); while( i ) { - QListViewItem* old = i; + TQListViewItem* old = i; i = i->nextSibling(); details->takeItem(old); } -// QMapIterator<GroupItem::GroupType, GroupItem*> it1 = item->groups.begin() ; +// TQMapIterator<GroupItem::GroupType, GroupItem*> it1 = item->groups.begin() ; // for ( ; it1 != item->groups.end(); ++it1 ) // { // // After AddTargetDialog, it can happen that an @@ -560,8 +560,8 @@ void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView if ( !listviewControl || item->scope->variableValues( "TEMPLATE" ).findIndex("subdirs") != -1 ) return ; - QMapIterator<GroupItem::GroupType, GroupItem*> it2 = item->groups.begin(); - QListViewItem* lastItem = 0; + TQMapIterator<GroupItem::GroupType, GroupItem*> it2 = item->groups.begin(); + TQListViewItem* lastItem = 0; for ( ; it2 != item->groups.end(); ++it2 ) { listviewControl->insertItem( it2.data() ); @@ -570,16 +570,16 @@ void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView lastItem = it2.data(); if ( it2.key() == GroupItem::InstallRoot ) { - QListViewItem* lastinstallitem = 0; - QPtrListIterator<GroupItem> it3( it2.data() ->installs ); + TQListViewItem* lastinstallitem = 0; + TQPtrListIterator<GroupItem> it3( it2.data() ->installs ); for ( ; it3.current(); ++it3 ) { it2.data() ->insertItem( *it3 ); if ( lastinstallitem ) it3.current()->moveItem(lastinstallitem); lastinstallitem = it3.current(); - QPtrListIterator<FileItem> it4( ( *it3 ) ->files ); - QListViewItem* lastfileitem = 0; + TQPtrListIterator<FileItem> it4( ( *it3 ) ->files ); + TQListViewItem* lastfileitem = 0; for ( ; it4.current(); ++it4 ) { ( *it3 ) ->insertItem( *it4 ); @@ -595,8 +595,8 @@ void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView } else { - QPtrListIterator<FileItem> it3( it2.data() ->files ); - QListViewItem* lastfileitem = 0; + TQPtrListIterator<FileItem> it3( it2.data() ->files ); + TQListViewItem* lastfileitem = 0; for ( ; it3.current(); ++it3 ) { it2.data() ->insertItem( *it3 ); @@ -612,7 +612,7 @@ void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView listviewControl->setCurrentItem( 0 ); } -void TrollProjectWidget::slotDetailsExecuted( QListViewItem *item ) +void TrollProjectWidget::slotDetailsExecuted( TQListViewItem *item ) { if ( !item ) return ; @@ -625,7 +625,7 @@ void TrollProjectWidget::slotDetailsExecuted( QListViewItem *item ) FileItem *fitem = static_cast<FileItem*>( pvitem ); - QString filePath; + TQString filePath; if( m_shownSubproject->scope->scopeType() == Scope::IncludeScope ) { filePath = m_shownSubproject->scope->parent()->projectDir(); @@ -633,9 +633,9 @@ void TrollProjectWidget::slotDetailsExecuted( QListViewItem *item ) { filePath = m_shownSubproject->scope->projectDir(); } - filePath += QChar( QDir::separator() ) + m_shownSubproject->scope->resolveVariables( fitem->localFilePath ); + filePath += TQChar( TQDir::separator() ) + m_shownSubproject->scope->resolveVariables( fitem->localFilePath ); - bool isUiFile = QFileInfo( fitem->text( 0 ) ).extension() == "ui"; + bool isUiFile = TQFileInfo( fitem->text( 0 ) ).extension() == "ui"; kdDebug(9024) << "Opening file: " << filePath << endl; if ( isTMakeProject() && isUiFile ) { @@ -686,10 +686,10 @@ void TrollProjectWidget::slotExecuteTarget() } - QString program = KProcess::quote( "." + QString( QChar( QDir::separator() ) ) + getCurrentOutputFilename() ); + TQString program = KProcess::quote( "." + TQString( TQChar( TQDir::separator() ) ) + getCurrentOutputFilename() ); // Build environment variables to prepend to the executable path - QString runEnvVars = QString::null; + TQString runEnvVars = TQString::null; DomUtil::PairList list = DomUtil::readPairListEntry( *( m_part->projectDom() ), "/kdevtrollproject/run/envvars", "envvar", "name", "value" ); @@ -709,7 +709,7 @@ void TrollProjectWidget::slotExecuteTarget() bool inTerminal = DomUtil::readBoolEntry( *m_part->projectDom(), "/kdevtrollproject/run/terminal" ); - m_part->appFrontend() ->startAppCommand( subprojectDirectory() + QString( QChar( QDir::separator() ) ) + getCurrentDestDir(), program, inTerminal ); + m_part->appFrontend() ->startAppCommand( subprojectDirectory() + TQString( TQChar( TQDir::separator() ) ) + getCurrentDestDir(), program, inTerminal ); } @@ -718,7 +718,7 @@ void TrollProjectWidget::slotBuildProject() if ( m_part->partController() ->saveAllFiles() == false ) return ; //user cancelled - QString dir = projectDirectory(); + TQString dir = projectDirectory(); if ( !m_rootSubproject ) return ; @@ -726,8 +726,8 @@ void TrollProjectWidget::slotBuildProject() createMakefileIfMissing( dir, m_rootSubproject ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - QString dircmd = "cd " + KProcess::quote( dir ) + " && " ; - QString buildcmd = constructMakeCommandLine( m_rootSubproject->scope ); + TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString buildcmd = constructMakeCommandLine( m_rootSubproject->scope ); m_part->queueCmd( dir, dircmd + buildcmd ); } @@ -736,7 +736,7 @@ void TrollProjectWidget::slotInstallProject() if ( m_part->partController() ->saveAllFiles() == false ) return ; //user cancelled - QString dir = projectDirectory(); + TQString dir = projectDirectory(); if ( !m_rootSubproject ) return ; @@ -744,8 +744,8 @@ void TrollProjectWidget::slotInstallProject() createMakefileIfMissing( dir, m_rootSubproject ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - QString dircmd = "cd " + KProcess::quote( dir ) + " && " ; - QString buildcmd = constructMakeCommandLine( m_rootSubproject->scope ) + " install"; + TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString buildcmd = constructMakeCommandLine( m_rootSubproject->scope ) + " install"; m_part->queueCmd( dir, dircmd + buildcmd ); } @@ -758,12 +758,12 @@ void TrollProjectWidget::slotBuildTarget() // can't build from scope if ( m_shownSubproject->scope->scopeType() != Scope::ProjectScope ) return ; - QString dir = subprojectDirectory(); + TQString dir = subprojectDirectory(); createMakefileIfMissing( dir, m_shownSubproject ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - QString dircmd = "cd " + KProcess::quote( dir ) + " && " ; - QString buildcmd = constructMakeCommandLine( m_shownSubproject->scope ); + TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString buildcmd = constructMakeCommandLine( m_shownSubproject->scope ); m_part->queueCmd( dir, dircmd + buildcmd ); } @@ -776,19 +776,19 @@ void TrollProjectWidget::slotInstallTarget() // can't build from scope if ( m_shownSubproject->scope->scopeType() != Scope::ProjectScope ) return ; - QString dir = subprojectDirectory(); + TQString dir = subprojectDirectory(); createMakefileIfMissing( dir, m_shownSubproject ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - QString dircmd = "cd " + KProcess::quote( dir ) + " && " ; - QString buildcmd = constructMakeCommandLine( m_shownSubproject->scope ) + " install"; + TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString buildcmd = constructMakeCommandLine( m_shownSubproject->scope ) + " install"; m_part->queueCmd( dir, dircmd + buildcmd ); } void TrollProjectWidget::slotRebuildProject() { m_part->partController() ->saveAllFiles(); - QString dir = this-> projectDirectory(); + TQString dir = this-> projectDirectory(); if ( !m_rootSubproject ) return ; @@ -796,8 +796,8 @@ void TrollProjectWidget::slotRebuildProject() createMakefileIfMissing( dir, m_rootSubproject ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - QString dircmd = "cd " + KProcess::quote( dir ) + " && " ; - QString rebuildcmd = constructMakeCommandLine( m_rootSubproject->scope ) + " clean && " + constructMakeCommandLine( m_rootSubproject->scope ); + TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString rebuildcmd = constructMakeCommandLine( m_rootSubproject->scope ) + " clean && " + constructMakeCommandLine( m_rootSubproject->scope ); m_part->queueCmd( dir, dircmd + rebuildcmd ); } @@ -811,12 +811,12 @@ void TrollProjectWidget::slotRebuildTarget() if ( m_shownSubproject->scope->scopeType() != Scope::ProjectScope ) return ; - QString dir = subprojectDirectory(); + TQString dir = subprojectDirectory(); createMakefileIfMissing( dir, m_shownSubproject ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - QString dircmd = "cd " + KProcess::quote( dir ) + " && " ; - QString rebuildcmd = constructMakeCommandLine( m_shownSubproject->scope ) + " clean && " + constructMakeCommandLine( m_shownSubproject->scope ); + TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString rebuildcmd = constructMakeCommandLine( m_shownSubproject->scope ) + " clean && " + constructMakeCommandLine( m_shownSubproject->scope ); m_part->queueCmd( dir, dircmd + rebuildcmd ); } @@ -827,7 +827,7 @@ void TrollProjectWidget::slotCreateScope( QMakeScopeItem *spitem ) else spitem = m_shownSubproject; CreateScopeDlg dlg( spitem, this ); - if ( dlg.exec() == QDialog::Accepted ) + if ( dlg.exec() == TQDialog::Accepted ) { spitem->scope->saveToFile( ); spitem->sortChildItems( 0, true ); @@ -845,31 +845,31 @@ void TrollProjectWidget::slotAddSubproject( QMakeScopeItem *spitem ) m_filesCached = false; m_allFilesCache.clear(); - QString projectdir = spitem->scope->projectDir(); + TQString projectdir = spitem->scope->projectDir(); KURLRequesterDlg dialog( i18n( "Add Subproject" ), i18n( "Please enter a name for the subproject: " ), this, 0 ); KURLRequester* req = dialog.urlRequester(); req->setMode( KFile::Directory | KFile::File | KFile::LocalOnly ); req->setFilter( "*.pro|QMake Project Files (*.pro)" ); - req->setURL( QString() ); + req->setURL( TQString() ); req->fileDialog()->setURL( KURL::fromPathOrURL( projectdir ) ); req->completionObject() ->setDir( projectdir ); - if ( dialog.exec() == QDialog::Accepted && !dialog.urlRequester() ->url().isEmpty() ) + if ( dialog.exec() == TQDialog::Accepted && !dialog.urlRequester() ->url().isEmpty() ) { - QString subdirname; - if ( !QDir::isRelativePath( dialog.urlRequester() ->url() ) ) + TQString subdirname; + if ( !TQDir::isRelativePath( dialog.urlRequester() ->url() ) ) subdirname = URLUtil::getRelativePath( projectdir, dialog.urlRequester()->url() ); else subdirname = dialog.urlRequester()->url(); - while( subdirname.endsWith( QString(QChar(QDir::separator())) ) ) + while( subdirname.endsWith( TQString(TQChar(TQDir::separator())) ) ) subdirname = subdirname.left(subdirname.length()-1); if( !subdirname.endsWith(".pro") ) { kdDebug(9024) << "Cleaned subdirname: " << subdirname << endl; - QDir dir( projectdir ); - QString realdir = spitem->scope->resolveVariables( subdirname ); + TQDir dir( projectdir ); + TQString realdir = spitem->scope->resolveVariables( subdirname ); if ( !dir.exists( realdir ) ) { if ( !dir.mkdir( realdir ) ) @@ -880,15 +880,15 @@ void TrollProjectWidget::slotAddSubproject( QMakeScopeItem *spitem ) return ; }else { - QFile f( dir.absPath()+"/"+realdir+"/"+realdir+".pro" ); + TQFile f( dir.absPath()+"/"+realdir+"/"+realdir+".pro" ); f.open( IO_WriteOnly ); f.close(); } } }else { - QString realdir = spitem->scope->resolveVariables( subdirname ); - QFile f( projectdir+"/"+realdir ); + TQString realdir = spitem->scope->resolveVariables( subdirname ); + TQFile f( projectdir+"/"+realdir ); f.open( IO_WriteOnly ); f.close(); } @@ -898,9 +898,9 @@ void TrollProjectWidget::slotAddSubproject( QMakeScopeItem *spitem ) } } -void TrollProjectWidget::addSubprojectToItem( QMakeScopeItem* spitem, const QString& subdirname ) +void TrollProjectWidget::addSubprojectToItem( QMakeScopeItem* spitem, const TQString& subdirname ) { - QListViewItem* item = spitem->firstChild(); + TQListViewItem* item = spitem->firstChild(); while( item ) { QMakeScopeItem* sitem = static_cast<QMakeScopeItem*>(item); @@ -924,7 +924,7 @@ void TrollProjectWidget::addSubprojectToItem( QMakeScopeItem* spitem, const QStr if( subproject ) { new QMakeScopeItem( spitem, subproject->scopeName(), subproject ); -// QListViewItem* lastitem = spitem->firstChild(); +// TQListViewItem* lastitem = spitem->firstChild(); // while( lastitem->nextSibling() != 0 ) // lastitem = lastitem->nextSibling(); // newitem->moveItem( lastitem ); @@ -966,7 +966,7 @@ void TrollProjectWidget::slotRemoveSubproject( QMakeScopeItem *spitem ) } } -void TrollProjectWidget::slotOverviewContextMenu( KListView *, QListViewItem *item, const QPoint &p ) +void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) { if ( !item ) return ; @@ -1066,7 +1066,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, QListViewItem *it int r = popup.exec( p ); - QString relpath = spitem->relativePath(); + TQString relpath = spitem->relativePath(); if ( r == idAddSubproject ) { slotAddSubproject( spitem ); @@ -1090,12 +1090,12 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, QListViewItem *it else if ( r == idBuild ) { slotBuildTarget(); - // m_part->startMakeCommand(projectDirectory() + relpath, QString::fromLatin1("")); + // m_part->startMakeCommand(projectDirectory() + relpath, TQString::fromLatin1("")); } else if ( r == idInstall ) { slotInstallTarget(); - // m_part->startMakeCommand(projectDirectory() + relpath, QString::fromLatin1("")); + // m_part->startMakeCommand(projectDirectory() + relpath, TQString::fromLatin1("")); } else if ( r == idRebuild ) { @@ -1112,7 +1112,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, QListViewItem *it else if ( r == idQmake ) { - m_part->startQMakeCommand( projectDirectory() + QString(QChar(QDir::separator())) + relpath ); + m_part->startQMakeCommand( projectDirectory() + TQString(TQChar(TQDir::separator())) + relpath ); } else if ( r == idQmakeRecursive ) { @@ -1126,7 +1126,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, QListViewItem *it } } -void TrollProjectWidget::addFileToCurrentSubProject( GroupItem *titem, const QString &filename ) +void TrollProjectWidget::addFileToCurrentSubProject( GroupItem *titem, const TQString &filename ) { m_filesCached = false; @@ -1134,7 +1134,7 @@ void TrollProjectWidget::addFileToCurrentSubProject( GroupItem *titem, const QSt titem->addFileToScope( filename ); } -void TrollProjectWidget::addFileToCurrentSubProject( GroupItem::GroupType gtype, const QString &filename ) +void TrollProjectWidget::addFileToCurrentSubProject( GroupItem::GroupType gtype, const TQString &filename ) { if ( !m_shownSubproject ) return ; @@ -1157,7 +1157,7 @@ void TrollProjectWidget::addFileToCurrentSubProject( GroupItem::GroupType gtype, * Method adds a file to the current project by grouped * by file extension */ -void TrollProjectWidget::addFiles( QStringList &files, bool relativeToProjectRoot ) +void TrollProjectWidget::addFiles( TQStringList &files, bool relativeToProjectRoot ) { if ( !m_shownSubproject ) return ; @@ -1165,22 +1165,22 @@ void TrollProjectWidget::addFiles( QStringList &files, bool relativeToProjectRoo m_filesCached = false; m_allFilesCache.clear(); - for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) + for ( TQStringList::Iterator it = files.begin(); it != files.end(); ++it ) { - QString fileName = *it; + TQString fileName = *it; kdDebug(9024) << "Adding file:" << fileName << " " << relativeToProjectRoot << endl; if ( m_shownSubproject->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) != -1 && !fileName.endsWith(".pro") ) { ChooseSubprojectDlg dlg( this, false ); - if ( dlg.exec() == QDialog::Accepted ) + if ( dlg.exec() == TQDialog::Accepted ) { if ( dlg.selectedSubproject() && dlg.selectedSubproject()->scope->variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 ) { fileName = URLUtil::getRelativePath( dlg.selectedSubproject()->scope->projectDir() , - QDir::cleanDirPath( + TQDir::cleanDirPath( m_shownSubproject->scope->projectDir()+ - QString(QChar(QDir::separator()))+ + TQString(TQChar(TQDir::separator()))+ fileName ) ); overview->setCurrentItem( dlg.selectedSubproject() ); @@ -1192,21 +1192,21 @@ void TrollProjectWidget::addFiles( QStringList &files, bool relativeToProjectRoo } } - QFileInfo info( fileName ); - QString ext = info.extension( false ).simplifyWhiteSpace(); + TQFileInfo info( fileName ); + TQString ext = info.extension( false ).simplifyWhiteSpace(); - QString noPathFileName; + TQString noPathFileName; if( relativeToProjectRoot ) - noPathFileName = URLUtil::getRelativePath( m_shownSubproject->scope->projectDir(), QDir::cleanDirPath(projectDirectory()+QString(QChar(QDir::separator()))+fileName ) ); + noPathFileName = URLUtil::getRelativePath( m_shownSubproject->scope->projectDir(), TQDir::cleanDirPath(projectDirectory()+TQString(TQChar(TQDir::separator()))+fileName ) ); else - noPathFileName = URLUtil::getRelativePath( m_shownSubproject->scope->projectDir(), QDir::cleanDirPath(m_shownSubproject->scope->projectDir()+QString(QChar(QDir::separator()))+fileName ) ); + noPathFileName = URLUtil::getRelativePath( m_shownSubproject->scope->projectDir(), TQDir::cleanDirPath(m_shownSubproject->scope->projectDir()+TQString(TQChar(TQDir::separator()))+fileName ) ); if( DomUtil::readBoolEntry( *m_part->projectDom(), "/kdevtrollproject/qmake/replacePaths", false ) ) { - QString var = m_shownSubproject->scope->findCustomVarForPath( QFileInfo( noPathFileName ).dirPath() ); + TQString var = m_shownSubproject->scope->findCustomVarForPath( TQFileInfo( noPathFileName ).dirPath() ); if( !var.isEmpty() ) { - noPathFileName = "$${"+var+"}"+QString( QChar( QDir::separator() ) )+QFileInfo( noPathFileName ).fileName(); + noPathFileName = "$${"+var+"}"+TQString( TQChar( TQDir::separator() ) )+TQFileInfo( noPathFileName ).fileName(); } } @@ -1219,16 +1219,16 @@ void TrollProjectWidget::addFiles( QStringList &files, bool relativeToProjectRoo if( ext == "pro" ) { - addSubprojectToItem( findSubprojectForPath( QFileInfo( fileName ).dirPath() ), QFileInfo( fileName ).fileName() ); + addSubprojectToItem( findSubprojectForPath( TQFileInfo( fileName ).dirPath() ), TQFileInfo( fileName ).fileName() ); }else { addFileToCurrentSubProject( GroupItem::groupTypeForExtension( ext ), noPathFileName ); slotOverviewSelectionChanged( m_shownSubproject ); kdDebug(9024) << "emitting" << relativeToProjectRoot << " " << fileName << endl; if( relativeToProjectRoot ) - emitAddedFile ( projectDirectory()+QString( QChar( QDir::separator() ) ) + fileName ); + emitAddedFile ( projectDirectory()+TQString( TQChar( TQDir::separator() ) ) + fileName ); else - emitAddedFile ( m_shownSubproject->scope->projectDir()+QString( QChar( QDir::separator() ) ) + fileName ); + emitAddedFile ( m_shownSubproject->scope->projectDir()+TQString( TQChar( TQDir::separator() ) ) + fileName ); } } @@ -1238,9 +1238,9 @@ void TrollProjectWidget::addFiles( QStringList &files, bool relativeToProjectRoo void TrollProjectWidget::slotAddFiles() { static KURL lastVisited; - QString cleanSubprojectDir = QDir::cleanDirPath( m_shownSubproject->scope->projectDir() ); - QString title, filter; - QString otherTitle, otherFilter; + TQString cleanSubprojectDir = TQDir::cleanDirPath( m_shownSubproject->scope->projectDir() ); + TQString title, filter; + TQString otherTitle, otherFilter; GroupItem* item = dynamic_cast<GroupItem*>( details->selectedItem() ); GroupItem::GroupType type = item ? item->groupType : GroupItem::NoType; @@ -1265,7 +1265,7 @@ void TrollProjectWidget::slotAddFiles() filter, this, "Insert existing files", - true, new QComboBox( false ) ); + true, new TQComboBox( false ) ); dialog->setMode( KFile::Files | KFile::ExistingOnly | KFile::LocalOnly ); @@ -1275,7 +1275,7 @@ void TrollProjectWidget::slotAddFiles() } dialog->exec(); - QStringList files = dialog->selectedFiles(); + TQStringList files = dialog->selectedFiles(); lastVisited = dialog->baseURL(); for ( unsigned int i = 0; i < files.count(); i++ ) @@ -1286,13 +1286,13 @@ void TrollProjectWidget::slotAddFiles() { // Copy selected files to current subproject folder // and add them to the filelist - QString filename = KURL( files[ i ] ).fileName(); - KIO::NetAccess::file_copy( files[ i ], cleanSubprojectDir + QString( QChar( QDir::separator() ) ) + filename, -1, false, false, this ); - QFile testExist( cleanSubprojectDir + QString( QChar( QDir::separator() ) ) + filename ); + TQString filename = KURL( files[ i ] ).fileName(); + KIO::NetAccess::file_copy( files[ i ], cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename, -1, false, false, this ); + TQFile testExist( cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename ); if ( testExist.exists() ) { - QStringList files( filename ); + TQStringList files( filename ); addFiles( files, false ); } } @@ -1307,12 +1307,12 @@ void TrollProjectWidget::slotAddFiles() *proc << files[ i ]; *proc << cleanSubprojectDir; proc->start(KProcess::Block); - QString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 ); + TQString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 ); // and add them to the filelist - QFile testExist( cleanSubprojectDir + QString( QChar( QDir::separator() ) ) + filename ); + TQFile testExist( cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename ); if ( testExist.exists() ) { - QStringList files( filename ); + TQStringList files( filename ); addFiles( files, false ); } } @@ -1321,8 +1321,8 @@ void TrollProjectWidget::slotAddFiles() case AddFilesDialog::Relative: { // Form relative path to current subproject folder - QString theFile = files[ i ]; - QStringList files( URLUtil::relativePathToFile( cleanSubprojectDir , theFile ) + TQString theFile = files[ i ]; + TQStringList files( URLUtil::relativePathToFile( cleanSubprojectDir , theFile ) ); addFiles( files, false ); } @@ -1338,12 +1338,12 @@ GroupItem* TrollProjectWidget::getInstallRoot( QMakeScopeItem* item ) return 0; } -GroupItem* TrollProjectWidget::getInstallObject( QMakeScopeItem* item, const QString& objectname ) +GroupItem* TrollProjectWidget::getInstallObject( QMakeScopeItem* item, const TQString& objectname ) { GroupItem * instroot = getInstallRoot( item ); if ( !instroot ) return 0; - QPtrListIterator<GroupItem> it( instroot->installs ); + TQPtrListIterator<GroupItem> it( instroot->installs ); for ( ;it.current();++it ) { if ( ( *it ) ->groupType == GroupItem::InstallObject && @@ -1370,13 +1370,13 @@ void TrollProjectWidget::slotNewFile() { if ( gitem->groupType == GroupItem::InstallObject ) { - // QString relpath = m_shownSubproject->path.mid(projectDirectory().length()); + // TQString relpath = m_shownSubproject->path.mid(projectDirectory().length()); bool ok = FALSE; - QString filepattern = KInputDialog::getText( + TQString filepattern = KInputDialog::getText( i18n( "Insert New Filepattern" ), i18n( "Please enter a filepattern relative the current " "subproject (example docs/*.html):" ), - QString::null, &ok, this ); + TQString::null, &ok, this ); if ( ok && !filepattern.isEmpty() ) { addFileToCurrentSubProject( gitem, filepattern ); @@ -1386,12 +1386,12 @@ void TrollProjectWidget::slotNewFile() } if ( gitem->groupType == GroupItem::InstallRoot ) { - // QString relpath = m_shownSubproject->path.mid(projectDirectory().length()); + // TQString relpath = m_shownSubproject->path.mid(projectDirectory().length()); bool ok = FALSE; - QString install_obj = KInputDialog::getText( + TQString install_obj = KInputDialog::getText( i18n( "Insert New Install Object" ), i18n( "Please enter a name for the new object:" ), - QString::null, &ok, this ); + TQString::null, &ok, this ); if ( ok && !install_obj.isEmpty() ) { gitem->addInstallObject( install_obj ); @@ -1404,7 +1404,7 @@ void TrollProjectWidget::slotNewFile() } } KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>( "KDevelop/CreateFile" ); - QString fcext; + TQString fcext; if( gitem ) { switch ( gitem->groupType ) @@ -1434,16 +1434,16 @@ void TrollProjectWidget::slotNewFile() fcext = "qrc"; break; default: - fcext = QString::null; + fcext = TQString::null; } } KDevCreateFile::CreatedFile crFile = - createFileSupport->createNewFile( fcext, projectDirectory() + QString(QChar(QDir::separator()))+ m_shownSubproject->relativePath() ); + createFileSupport->createNewFile( fcext, projectDirectory() + TQString(TQChar(TQDir::separator()))+ m_shownSubproject->relativePath() ); } void TrollProjectWidget::slotRemoveFile() { - QListViewItem * selectedItem = details->currentItem(); + TQListViewItem * selectedItem = details->currentItem(); if ( !selectedItem ) return ; @@ -1460,7 +1460,7 @@ void TrollProjectWidget::slotRemoveFile() void TrollProjectWidget::slotExcludeFileFromScopeButton() { - QListViewItem * selectedItem = details->currentItem(); + TQListViewItem * selectedItem = details->currentItem(); if ( !selectedItem ) return ; qProjectItem *pvitem = static_cast<qProjectItem*>( selectedItem ); @@ -1474,7 +1474,7 @@ void TrollProjectWidget::slotExcludeFileFromScopeButton() gitem->removeFileFromScope( fitem->text( 0 ) ); } -void TrollProjectWidget::slotDetailsSelectionChanged( QListViewItem *item ) +void TrollProjectWidget::slotDetailsSelectionChanged( TQListViewItem *item ) { if ( !item ) { @@ -1516,7 +1516,7 @@ void TrollProjectWidget::slotDetailsSelectionChanged( QListViewItem *item ) } } -void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *item, const QPoint &p ) +void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) { if ( !item ) return ; @@ -1525,7 +1525,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite if ( pvitem->type() == qProjectItem::Group ) { GroupItem * titem = static_cast<GroupItem*>( pvitem ); - QString title, ext; + TQString title, ext; GroupItem::groupTypeMeanings( titem->groupType, title, ext ); KPopupMenu popup( this ); @@ -1583,7 +1583,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite "add them with the relative path." ) ); } int r = popup.exec( p ); - QString cleanSubprojectPath = QDir::cleanDirPath( m_shownSubproject->scope->projectDir() ); + TQString cleanSubprojectPath = TQDir::cleanDirPath( m_shownSubproject->scope->projectDir() ); if ( r == idSetInstObjPath ) { @@ -1591,7 +1591,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite "(example /usr/local/share/... ):" ), this, 0 ); dialog.urlRequester() ->setMode( KFile::Directory ); dialog.urlRequester() ->setURL( titem->owner->scope->variableValues( titem->text( 0 ) + ".path" ).front() ); - if ( dialog.exec() == QDialog::Accepted ) + if ( dialog.exec() == TQDialog::Accepted ) { titem->owner->scope->setEqualOp( titem->text( 0 ) + ".path", dialog.urlRequester() ->url() ); titem->owner->scope->saveToFile( ); @@ -1600,11 +1600,11 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite else if ( r == idInsNewFilepatternItem ) { bool ok = FALSE; - QString filepattern = KInputDialog::getText( + TQString filepattern = KInputDialog::getText( i18n( "Add Pattern of Files to Install" ), i18n( "Enter a pattern relative to the current " "subproject (example docs/*.html):" ), - QString::null, &ok, this ); + TQString::null, &ok, this ); if ( ok && !filepattern.isEmpty() ) { addFileToCurrentSubProject( titem, filepattern ); @@ -1617,11 +1617,11 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite ext + "|" + title + " (" + ext + ")", this, "Add existing files", - true, new QComboBox( false ) ); + true, new TQComboBox( false ) ); dialog->setMode( KFile::Files | KFile::ExistingOnly | KFile::LocalOnly ); - if ( dialog->exec() == QDialog::Rejected ) + if ( dialog->exec() == TQDialog::Rejected ) return ; - QStringList files = dialog->selectedFiles(); + TQStringList files = dialog->selectedFiles(); for ( unsigned int i = 0;i < files.count();++i ) { switch ( dialog->mode() ) @@ -1630,13 +1630,13 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite { // Copy selected files to current subproject folder // and add them to the filelist - QString filename = KURL( files[ i ] ).fileName(); - KIO::NetAccess::file_copy( files[ i ], cleanSubprojectPath + QString( QChar( QDir::separator() ) ) + filename, -1, false, false, this ); - QFile testExist( cleanSubprojectPath + QString( QChar( QDir::separator() ) ) + filename ); + TQString filename = KURL( files[ i ] ).fileName(); + KIO::NetAccess::file_copy( files[ i ], cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename, -1, false, false, this ); + TQFile testExist( cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename ); if ( testExist.exists() ) { - QStringList files( filename ); + TQStringList files( filename ); addFiles( files, false ); } } @@ -1651,12 +1651,12 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite *proc << files[ i ]; *proc << cleanSubprojectPath; proc->start(KProcess::Block); - QString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 ); + TQString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 ); // and add them to the filelist - QFile testExist( cleanSubprojectPath + QString( QChar( QDir::separator() ) ) + filename ); + TQFile testExist( cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename ); if ( testExist.exists() ) { - QStringList files( filename ); + TQStringList files( filename ); addFiles( files, false ); } } @@ -1665,8 +1665,8 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite case AddFilesDialog::Relative: { // Form relative path to current subproject folder - QString theFile = files[ i ]; - QStringList files( URLUtil::relativePathToFile( cleanSubprojectPath, theFile ) + TQString theFile = files[ i ]; + TQStringList files( URLUtil::relativePathToFile( cleanSubprojectPath, theFile ) ); addFiles( files, false ); } @@ -1684,7 +1684,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite else if ( r == idInsNewFile ) { KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>( "KDevelop/CreateFile" ); - QString fcext; + TQString fcext; switch ( titem->groupType ) { case GroupItem::Sources: @@ -1712,7 +1712,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite fcext = "qrc"; break; default: - fcext = QString::null; + fcext = TQString::null; } KDevCreateFile::CreatedFile crFile = createFileSupport->createNewFile( fcext, cleanSubprojectPath ); @@ -1721,10 +1721,10 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite else if ( r == idInsInstallObject ) { bool ok = FALSE; - QString install_obj = KInputDialog::getText( + TQString install_obj = KInputDialog::getText( i18n( "Add Install Object" ), i18n( "Enter a name for the new object:" ), - QString::null, &ok, this ); + TQString::null, &ok, this ); if ( ok && !install_obj.isEmpty() ) { titem->addInstallObject( install_obj ); @@ -1733,13 +1733,13 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite } else if ( r == idLUpdate ) { - QString cmd = "lupdate "; + TQString cmd = "lupdate "; cmd += m_shownSubproject->scope->fileName(); m_part->appFrontend() ->startAppCommand( m_shownSubproject->scope->projectDir(), cmd, false ); } else if ( r == idLRelease ) { - QString cmd = "lrelease "; + TQString cmd = "lrelease "; cmd += m_shownSubproject->scope->fileName(); m_part->appFrontend() ->startAppCommand( m_shownSubproject->scope->projectDir(), cmd, false ); }else if( r == idRemoveFile ) @@ -1808,7 +1808,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite if ( !( gitem->groupType == GroupItem::InstallObject ) ) { KURL::List urls; - urls.append( m_shownSubproject->scope->projectDir() + QChar( QDir::separator() ) + m_shownSubproject->scope->resolveVariables( fitem->localFilePath ) ); + urls.append( m_shownSubproject->scope->projectDir() + TQChar( TQDir::separator() ) + m_shownSubproject->scope->resolveVariables( fitem->localFilePath ) ); FileContext context( urls ); m_part->core() ->fillContextMenu( &popup, &context ); } @@ -1828,29 +1828,29 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite else if ( r == idViewUIH ) { kdDebug(9024) << "Opening:" << fitem->text(0) << ";" << fitem->text(0).replace(".ui","") << endl; - m_part->partController() ->editDocument( KURL( m_shownSubproject->scope->projectDir() + QChar( QDir::separator() ) + + m_part->partController() ->editDocument( KURL( m_shownSubproject->scope->projectDir() + TQChar( TQDir::separator() ) + fitem->localFilePath.replace(".ui","") + ".h" ) ); } else if ( r == idSubclassWidget ) { - QStringList newFileNames; - newFileNames = m_part->languageSupport() ->subclassWidget( m_shownSubproject->scope->projectDir() + QChar( QDir::separator() ) + fitem->localFilePath ); + TQStringList newFileNames; + newFileNames = m_part->languageSupport() ->subclassWidget( m_shownSubproject->scope->projectDir() + TQChar( TQDir::separator() ) + fitem->localFilePath ); kdDebug(9024) << "got new filenames: " << newFileNames << endl; if ( !newFileNames.empty() ) { - QDomDocument & dom = *( m_part->projectDom() ); + TQDomDocument & dom = *( m_part->projectDom() ); for ( uint i = 0; i < newFileNames.count(); ++i ) { - QString srcfile_relpath = URLUtil::getRelativePath( m_shownSubproject->scope->projectDir(), newFileNames[ i ] ) ; + TQString srcfile_relpath = URLUtil::getRelativePath( m_shownSubproject->scope->projectDir(), newFileNames[ i ] ) ; newFileNames[i] = URLUtil::getRelativePath( projectDirectory(), newFileNames[ i ] ) ; - QString uifile_relpath = m_shownSubproject->relativePath() + QChar( QDir::separator() ) + fitem->localFilePath; + TQString uifile_relpath = m_shownSubproject->relativePath() + TQChar( TQDir::separator() ) + fitem->localFilePath; DomUtil::PairList list = DomUtil::readPairListEntry( dom, "/kdevtrollproject/subclassing" , "subclass", "sourcefile", "uifile" ); list << DomUtil::Pair( srcfile_relpath, uifile_relpath ); DomUtil::writePairListEntry( dom, "/kdevtrollproject/subclassing", "subclass", "sourcefile", "uifile", list ); - // newFileNames[i] = newFileNames[i].replace(QRegExp(projectDirectory()+"/"),""); + // newFileNames[i] = newFileNames[i].replace(TQRegExp(projectDirectory()+"/"),""); qWarning( "new file: %s", newFileNames[ i ].latin1() ); } m_subclasslist = DomUtil::readPairListEntry( dom, "/kdevtrollproject/subclassing" , @@ -1861,30 +1861,30 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite } else if ( r == idUpdateWidgetclass ) { - QString noext = fitem->text( 0 ); + TQString noext = fitem->text( 0 ); if ( noext.findRev( '.' ) > -1 ) noext = noext.left( noext.findRev( '.' ) ); - QStringList dummy; - QString uifile = fitem->uiFileLink; - if ( uifile.findRev( QString( QChar( QDir::separator() ) ) ) > -1 ) + TQStringList dummy; + TQString uifile = fitem->uiFileLink; + if ( uifile.findRev( TQString( TQChar( TQDir::separator() ) ) ) > -1 ) { - QStringList uisplit = QStringList::split( QString( QChar( QDir::separator() ) ), uifile ); + TQStringList uisplit = TQStringList::split( TQString( TQChar( TQDir::separator() ) ), uifile ); uifile = uisplit[ uisplit.count() - 1 ]; } - m_part->languageSupport() ->updateWidget( m_shownSubproject->scope->projectDir() + QString( QChar( QDir::separator() ) ) + uifile, noext ); + m_part->languageSupport() ->updateWidget( m_shownSubproject->scope->projectDir() + TQString( TQChar( TQDir::separator() ) ) + uifile, noext ); } else if ( r == idUISubclasses ) { - QDomDocument & dom = *( m_part->projectDom() ); + TQDomDocument & dom = *( m_part->projectDom() ); DomUtil::PairList list = DomUtil::readPairListEntry( dom, "/kdevtrollproject/subclassing" , "subclass", "sourcefile", "uifile" ); - SubclassesDlg *sbdlg = new SubclassesDlg( m_shownSubproject->relativePath() + QChar( QDir::separator() ) + fitem->localFilePath, + SubclassesDlg *sbdlg = new SubclassesDlg( m_shownSubproject->relativePath() + TQChar( TQDir::separator() ) + fitem->localFilePath, list, projectDirectory() ); if ( sbdlg->exec() ) { - QDomElement el = DomUtil::elementByPath( dom, "/kdevtrollproject" ); - QDomElement el2 = DomUtil::elementByPath( dom, "/kdevtrollproject/subclassing" ); + TQDomElement el = DomUtil::elementByPath( dom, "/kdevtrollproject" ); + TQDomElement el2 = DomUtil::elementByPath( dom, "/kdevtrollproject/subclassing" ); if ( ( !el.isNull() ) && ( !el2.isNull() ) ) { el.removeChild( el2 ); @@ -1901,7 +1901,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite GroupItem * titem = static_cast<GroupItem*>( item->parent() ); bool ok = FALSE; - QString filepattern = KInputDialog::getText( + TQString filepattern = KInputDialog::getText( i18n( "Edit Pattern" ), i18n( "Enter a pattern relative to the current " "subproject (example docs/*.html):" ), @@ -1928,7 +1928,7 @@ void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem ) m_filesCached = false; m_allFilesCache.clear(); - QString realfilename = spitem->scope->resolveVariables( fitem->localFilePath ); + TQString realfilename = spitem->scope->resolveVariables( fitem->localFilePath ); if ( KMessageBox::warningYesNo( this, "<qt>" + i18n( "Do you want to delete the file <strong>%1</strong> from the project and your disk?" ) @@ -1942,24 +1942,24 @@ void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem ) return; }else { - kdDebug(9024) << "Deleting file as the user wished: " << spitem->scope->projectDir() + QString( QChar( QDir::separator() ) ) + realfilename << endl; - KIO::NetAccess::del( KURL::fromPathOrURL( spitem->scope->projectDir() + QString( QChar( QDir::separator() ) ) + realfilename ), 0 ); + kdDebug(9024) << "Deleting file as the user wished: " << spitem->scope->projectDir() + TQString( TQChar( TQDir::separator() ) ) + realfilename << endl; + KIO::NetAccess::del( KURL::fromPathOrURL( spitem->scope->projectDir() + TQString( TQChar( TQDir::separator() ) ) + realfilename ), 0 ); } if ( gitem->groupType != GroupItem::InstallObject ) { - QString removedFileName = spitem->relativePath() + QString( QChar( QDir::separator() ) ) + realfilename; - if ( removedFileName.startsWith( QDir::rootDirPath() ) ) + TQString removedFileName = spitem->relativePath() + TQString( TQChar( TQDir::separator() ) ) + realfilename; + if ( removedFileName.startsWith( TQDir::rootDirPath() ) ) removedFileName = removedFileName.mid( 1 ); emitRemovedFile( removedFileName ); } //remove subclassing info - QDomDocument &dom = *( m_part->projectDom() ); + TQDomDocument &dom = *( m_part->projectDom() ); DomUtil::PairList list = DomUtil::readPairListEntry( dom, "/kdevtrollproject/subclassing" , "subclass", "sourcefile", "uifile" ); - QPtrList<DomUtil::Pair> pairsToRemove; + TQPtrList<DomUtil::Pair> pairsToRemove; DomUtil::PairList::iterator it; for ( it = list.begin(); it != list.end(); ++it ) { @@ -1973,8 +1973,8 @@ void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem ) { list.remove( *pair ); } - QDomElement el = DomUtil::elementByPath( dom, "/kdevtrollproject" ); - QDomElement el2 = DomUtil::elementByPath( dom, "/kdevtrollproject/subclassing" ); + TQDomElement el = DomUtil::elementByPath( dom, "/kdevtrollproject" ); + TQDomElement el2 = DomUtil::elementByPath( dom, "/kdevtrollproject/subclassing" ); if ( ( !el.isNull() ) && ( !el2.isNull() ) ) { el.removeChild( el2 ); @@ -1984,19 +1984,19 @@ void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem ) gitem->removeFileFromScope( fitem->text( 0 ) ); } -void TrollProjectWidget::emitAddedFile( const QString &fileName ) +void TrollProjectWidget::emitAddedFile( const TQString &fileName ) { - emit m_part->addedFilesToProject( QStringList( fileName ) ); + emit m_part->addedFilesToProject( TQStringList( fileName ) ); } -void TrollProjectWidget::emitRemovedFile( const QString &fileName ) +void TrollProjectWidget::emitRemovedFile( const TQString &fileName ) { - emit m_part->removedFilesFromProject( QStringList( fileName ) ); + emit m_part->removedFilesFromProject( TQStringList( fileName ) ); } -QString TrollProjectWidget::getUiFileLink( const QString &relpath, const QString& filename ) +TQString TrollProjectWidget::getUiFileLink( const TQString &relpath, const TQString& filename ) { DomUtil::PairList::iterator it; for ( it = m_subclasslist.begin();it != m_subclasslist.end(); ++it ) @@ -2013,28 +2013,28 @@ void TrollProjectWidget::slotBuildOpenFile() if ( !part || !part->url().isLocalFile() ) return ; - QString fileName = part->url().path(); - QFileInfo fi( fileName ); - QString sourceDir = fi.dirPath(); - QString baseName = fi.baseName( true ); + TQString fileName = part->url().path(); + TQFileInfo fi( fileName ); + TQString sourceDir = fi.dirPath(); + TQString baseName = fi.baseName( true ); kdDebug( 9024 ) << "Compiling " << fileName << "in dir " << sourceDir << " with baseName " << baseName << endl; - QString buildDir = sourceDir; - QString target = baseName + ".o"; + TQString buildDir = sourceDir; + TQString target = baseName + ".o"; m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); // m_part->startMakeCommand(buildDir, target); - QPtrList<QMakeScopeItem> list = findSubprojectForFile( fi ); + TQPtrList<QMakeScopeItem> list = findSubprojectForFile( fi ); QMakeScopeItem *spitem; for ( spitem = list.first(); spitem; spitem = list.next() ) { - QString buildcmd = constructMakeCommandLine( spitem->scope ); - QString dircmd = "cd " + KProcess::quote( spitem->scope->projectDir() ) + " && " ; + TQString buildcmd = constructMakeCommandLine( spitem->scope ); + TQString dircmd = "cd " + KProcess::quote( spitem->scope->projectDir() ) + " && " ; kdDebug( 9024 ) << "builddir " << spitem->scope->projectDir() << ", cmd " << dircmd + buildcmd + " " + target << endl; m_part->queueCmd( spitem->scope->projectDir(), dircmd + buildcmd + " " + target ); } @@ -2046,7 +2046,7 @@ void TrollProjectWidget::slotBuildOpenFile() void TrollProjectWidget::slotExecuteProject() { - QString program = m_part->mainProgram(); + TQString program = m_part->mainProgram(); if ( program.isEmpty() ) { KMessageBox::sorry( this, i18n( "Please specify the executable name in the " @@ -2067,12 +2067,12 @@ void TrollProjectWidget::slotExecuteProject() } } - if ( !program.startsWith( QDir::rootDirPath() ) ) - program.prepend( "." + QString( QChar( QDir::separator() ) ) ); + if ( !program.startsWith( TQDir::rootDirPath() ) ) + program.prepend( "." + TQString( TQChar( TQDir::separator() ) ) ); // Build environment variables to prepend to the executable path - QString runEnvVars = QString::null; + TQString runEnvVars = TQString::null; DomUtil::PairList list = DomUtil::readPairListEntry( *( m_part->projectDom() ), "/kdevtrollproject/run/envvars", "envvar", "name", "value" ); @@ -2112,7 +2112,7 @@ void TrollProjectWidget::slotDistCleanTarget() runClean(m_shownSubproject, "distclean"); } -void TrollProjectWidget::runClean( QMakeScopeItem* item, const QString& cleantargetname ) +void TrollProjectWidget::runClean( QMakeScopeItem* item, const TQString& cleantargetname ) { // no subproject selected m_part->partController() ->saveAllFiles(); @@ -2122,24 +2122,24 @@ void TrollProjectWidget::runClean( QMakeScopeItem* item, const QString& cleantar if ( item->scope->scopeType() != Scope::ProjectScope ) return ; - QString dir = item->scope->projectDir(); + TQString dir = item->scope->projectDir(); createMakefileIfMissing( dir, item ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - QString dircmd = "cd " + KProcess::quote( dir ) + " && " ; - QString rebuildcmd = constructMakeCommandLine( item->scope ) + " "+cleantargetname; + TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString rebuildcmd = constructMakeCommandLine( item->scope ) + " "+cleantargetname; m_part->queueCmd( dir, dircmd + rebuildcmd ); } -QString TrollProjectWidget::constructMakeCommandLine( Scope* s ) +TQString TrollProjectWidget::constructMakeCommandLine( Scope* s ) { - QString makeFileName; + TQString makeFileName; if ( s ) makeFileName = s->resolveVariables( s->variableValues( "MAKEFILE", true, true, true ).front() ); - QDomDocument & dom = *( m_part->projectDom() ); + TQDomDocument & dom = *( m_part->projectDom() ); - QString cmdline = DomUtil::readEntry( dom, "/kdevtrollproject/make/makebin" ); + TQString cmdline = DomUtil::readEntry( dom, "/kdevtrollproject/make/makebin" ); if ( cmdline.isEmpty() ) cmdline = MAKE_COMMAND; if ( !makeFileName.isEmpty() ) @@ -2153,7 +2153,7 @@ QString TrollProjectWidget::constructMakeCommandLine( Scope* s ) if ( jobs != 0 && runmultiple ) { cmdline += " -j"; - cmdline += QString::number( jobs ); + cmdline += TQString::number( jobs ); } if ( DomUtil::readBoolEntry( dom, "/kdevtrollproject/make/dontact" ) ) cmdline += " -n"; @@ -2165,44 +2165,44 @@ QString TrollProjectWidget::constructMakeCommandLine( Scope* s ) } -void TrollProjectWidget::createMakefileIfMissing( const QString &dir, QMakeScopeItem *item ) +void TrollProjectWidget::createMakefileIfMissing( const TQString &dir, QMakeScopeItem *item ) { - QFileInfo fi; - QFileInfo fi2; + TQFileInfo fi; + TQFileInfo fi2; kdDebug(9024) << "Makefile:" << item->scope->variableValues( "MAKEFILE", true, true, true ) << endl; if ( item->scope->variableValues( "MAKEFILE", true, true, true ).isEmpty() ) { - fi.setFile( dir + QString( QChar( QDir::separator() ) ) + "Makefile" ); - fi2.setFile( dir + QString( QChar( QDir::separator() ) ) + "makefile" ); + fi.setFile( dir + TQString( TQChar( TQDir::separator() ) ) + "Makefile" ); + fi2.setFile( dir + TQString( TQChar( TQDir::separator() ) ) + "makefile" ); } else { - QString realmf = item->scope->resolveVariables( item->scope->variableValues( "MAKEFILE", true, true, true ).front() ); + TQString realmf = item->scope->resolveVariables( item->scope->variableValues( "MAKEFILE", true, true, true ).front() ); fi.setFile( realmf ); - fi2.setFile( dir + QString( QChar( QDir::separator() ) ) + realmf ); + fi2.setFile( dir + TQString( TQChar( TQDir::separator() ) ) + realmf ); } if ( !fi.exists() && !fi2.exists() ) { - int r = KMessageBox::questionYesNo( this, i18n( "There is no Makefile in this directory. Run qmake first?" ), QString::null, i18n( "Run qmake" ), i18n( "Do Not Run" ) ); + int r = KMessageBox::questionYesNo( this, i18n( "There is no Makefile in this directory. Run qmake first?" ), TQString::null, i18n( "Run qmake" ), i18n( "Do Not Run" ) ); if ( r == KMessageBox::No ) return ; m_part->startQMakeCommand( dir ); } } -QMakeScopeItem* TrollProjectWidget::findSubprojectForPath( const QString& relPath ) +QMakeScopeItem* TrollProjectWidget::findSubprojectForPath( const TQString& relPath ) { if( !m_rootSubproject ) return 0; - QStringList dirs = QStringList::split("/", relPath); + TQStringList dirs = TQStringList::split("/", relPath); QMakeScopeItem* pitem = static_cast<QMakeScopeItem*>(m_rootSubproject); - for( QStringList::iterator it = dirs.begin(); it != dirs.end(); ++it) + for( TQStringList::iterator it = dirs.begin(); it != dirs.end(); ++it) { - QListViewItem* item = pitem->firstChild(); + TQListViewItem* item = pitem->firstChild(); while( item ) { QMakeScopeItem* sitem = static_cast<QMakeScopeItem*>(item); - if( QFileInfo( sitem->scope->projectDir() ).fileName() == *it ) + if( TQFileInfo( sitem->scope->projectDir() ).fileName() == *it ) { pitem = sitem; break; @@ -2212,37 +2212,37 @@ QMakeScopeItem* TrollProjectWidget::findSubprojectForPath( const QString& relPat return pitem; } -QPtrList<QMakeScopeItem> TrollProjectWidget::findSubprojectForFile( QFileInfo fi ) +TQPtrList<QMakeScopeItem> TrollProjectWidget::findSubprojectForFile( TQFileInfo fi ) { - QPtrList<QMakeScopeItem> list; + TQPtrList<QMakeScopeItem> list; findSubprojectForFile( list, m_rootSubproject, fi.absFilePath() ); return list; } -void TrollProjectWidget::findSubprojectForFile( QPtrList<QMakeScopeItem> &list, QMakeScopeItem * item, QString absFilePath ) +void TrollProjectWidget::findSubprojectForFile( TQPtrList<QMakeScopeItem> &list, QMakeScopeItem * item, TQString absFilePath ) { if( !item ) return; - QDir d( item->scope->projectDir() ); + TQDir d( item->scope->projectDir() ); - QStringList vars = item->scope->variableValues( "SOURCES" ); - for ( QStringList::Iterator it = vars.begin(); it != vars.end(); ++it ) + TQStringList vars = item->scope->variableValues( "SOURCES" ); + for ( TQStringList::Iterator it = vars.begin(); it != vars.end(); ++it ) { - QFileInfo fi2( d, item->scope->resolveVariables( *it ) ); + TQFileInfo fi2( d, item->scope->resolveVariables( *it ) ); if ( absFilePath == fi2.absFilePath() ) list.append( item ); } vars = item->scope->variableValues( "HEADERS" ); - for ( QStringList::Iterator it = vars.begin(); it != vars.end(); ++it ) + for ( TQStringList::Iterator it = vars.begin(); it != vars.end(); ++it ) { - QFileInfo fi2( d, item->scope->resolveVariables( *it ) ); + TQFileInfo fi2( d, item->scope->resolveVariables( *it ) ); if ( absFilePath == fi2.absFilePath() ) list.append( item ); } - QListViewItem * child = item->firstChild(); + TQListViewItem * child = item->firstChild(); while ( child ) { QMakeScopeItem * spitem = dynamic_cast<QMakeScopeItem*>( child ); @@ -2320,7 +2320,7 @@ QMakeScopeItem * TrollProjectWidget::findSubprojectForScope( QMakeScopeItem * sc return findSubprojectForScope( dynamic_cast<QMakeScopeItem *>( scope->parent() ) ); } -void TrollProjectWidget::focusInEvent( QFocusEvent * /*e*/ ) +void TrollProjectWidget::focusInEvent( TQFocusEvent * /*e*/ ) { switch ( m_lastFocusedView ) { @@ -2360,7 +2360,7 @@ void TrollProjectWidget::runQMakeRecursive( QMakeScopeItem* proj ) void TrollProjectWidget::slotBuildSelectedFile() { - QListViewItem * selectedItem = details->currentItem(); + TQListViewItem * selectedItem = details->currentItem(); if ( !selectedItem ) return ; qProjectItem *pvitem = static_cast<qProjectItem*>( selectedItem ); @@ -2373,24 +2373,24 @@ void TrollProjectWidget::slotBuildSelectedFile() void TrollProjectWidget::buildFile( QMakeScopeItem* spitem, FileItem* fitem ) { - QFileInfo fi( spitem->scope->projectDir() + QChar( QDir::separator() ) + spitem->scope->resolveVariables( fitem->localFilePath ) ); - QString sourceDir = fi.dirPath(); - QString baseName = fi.baseName( true ); + TQFileInfo fi( spitem->scope->projectDir() + TQChar( TQDir::separator() ) + spitem->scope->resolveVariables( fitem->localFilePath ) ); + TQString sourceDir = fi.dirPath(); + TQString baseName = fi.baseName( true ); kdDebug( 9024 ) << "Compiling " << spitem->scope->resolveVariables( fitem->text( 0 ) ) << "in dir " << sourceDir << " with baseName " << baseName << endl; - QString buildDir = sourceDir; - QString target = baseName + ".o"; + TQString buildDir = sourceDir; + TQString target = baseName + ".o"; if( !spitem->scope->variableValues("OBJECTS_DIR").isEmpty() ) - target = spitem->scope->resolveVariables( spitem->scope->variableValues("OBJECTS_DIR").first() )+ QString( QChar( QDir::separator() ) )+target; + target = spitem->scope->resolveVariables( spitem->scope->variableValues("OBJECTS_DIR").first() )+ TQString( TQChar( TQDir::separator() ) )+target; kdDebug( 9024 ) << "builddir " << buildDir << ", target " << target << endl; m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); // m_part->startMakeCommand(buildDir, target); - QString buildcmd = constructMakeCommandLine( spitem->scope ); - QString dircmd = "cd " + KProcess::quote( spitem->scope->projectDir() ) + " && " ; + TQString buildcmd = constructMakeCommandLine( spitem->scope ); + TQString dircmd = "cd " + KProcess::quote( spitem->scope->projectDir() ) + " && " ; kdDebug( 9024 ) << "builddir " << spitem->scope->projectDir() << ", cmd " << dircmd + buildcmd + " " + target << endl; m_part->queueCmd( spitem->scope->projectDir(), dircmd + buildcmd + " " + target ); @@ -2428,12 +2428,12 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem ) if( spitem->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) { - QStringList subdirs = spitem->scope->variableValues( "SUBDIRS" ); + TQStringList subdirs = spitem->scope->variableValues( "SUBDIRS" ); DisableSubprojectDlg dlg( subdirs ); if( dlg.exec() ) { - QStringList values = dlg.selectedProjects(); - QListViewItem* item = spitem->firstChild(); + TQStringList values = dlg.selectedProjects(); + TQListViewItem* item = spitem->firstChild(); while( item ) { if( values.findIndex( item->text(0) ) != -1 ) @@ -2448,7 +2448,7 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem ) }else { QMakeScopeItem* parent = static_cast<QMakeScopeItem*>(spitem->parent()); - parent->disableSubprojects( QStringList( spitem->scope->scopeName() ) ); + parent->disableSubprojects( TQStringList( spitem->scope->scopeName() ) ); delete spitem; parent->scope->saveToFile(); m_shownSubproject = parent; @@ -2456,21 +2456,21 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem ) } } -void TrollProjectWidget::slotProjectDirty(const QString& path) +void TrollProjectWidget::slotProjectDirty(const TQString& path) { kdDebug(9024) << "File is dirty:" << path << " using method " << endl; if( KMessageBox::warningYesNo(this, i18n("The project file \"%1\" has changed on disk\n(Or you have \"%2\" opened in the editor, which also triggers a reload when you change something in the QMake Manager).\n\nDo you want to reload it?").arg(path).arg(path), i18n("Project File Changed"), i18n("Reload"), i18n("Do Not Reload"), "trollproject_reload_project_file" ) != KMessageBox::No ) { m_part->dirWatch()->stopScan(); - QListViewItemIterator it(m_rootSubproject); - QValueList<QMakeScopeItem*> itemstoreload; + TQListViewItemIterator it(m_rootSubproject); + TQValueList<QMakeScopeItem*> itemstoreload; while( it.current() ) { QMakeScopeItem* projectitem = static_cast<QMakeScopeItem*>( it.current() ); if( projectitem->scope->scopeType() == Scope::ProjectScope || projectitem->scope->scopeType() == Scope::IncludeScope ) { - QString projectfile = projectitem->scope->projectDir() + QString(QChar(QDir::separator())) + projectitem->scope->fileName(); + TQString projectfile = projectitem->scope->projectDir() + TQString(TQChar(TQDir::separator())) + projectitem->scope->fileName(); if( projectfile == path ) { itemstoreload.append(projectitem); @@ -2479,7 +2479,7 @@ void TrollProjectWidget::slotProjectDirty(const QString& path) it++; } - QValueList<QMakeScopeItem*>::const_iterator reloadit = itemstoreload.begin(); + TQValueList<QMakeScopeItem*>::const_iterator reloadit = itemstoreload.begin(); for( ; reloadit != itemstoreload.end() ; ++reloadit ) { (*reloadit)->reloadProject(); @@ -2517,13 +2517,13 @@ bool TrollProjectWidget::showVariablesInTree() const } -QMap<QString,QString> TrollProjectWidget::qmakeEnvironment() const +TQMap<TQString,TQString> TrollProjectWidget::qmakeEnvironment() const { - QMap<QString,QString> map; + TQMap<TQString,TQString> map; DomUtil::PairList envvars = DomUtil::readPairListEntry(*m_part->projectDom(), "/kdevtrollproject/make/envvars", "envvar", "name", "value"); - QString environstr; + TQString environstr; DomUtil::PairList::ConstIterator it; bool hasQtDir = false; for (it = envvars.begin(); it != envvars.end(); ++it) { diff --git a/buildtools/qmake/trollprojectwidget.h b/buildtools/qmake/trollprojectwidget.h index 19595f78..7983f4d7 100644 --- a/buildtools/qmake/trollprojectwidget.h +++ b/buildtools/qmake/trollprojectwidget.h @@ -20,18 +20,18 @@ #ifndef _TROLLPROJECTWIDGET_H_ #define _TROLLPROJECTWIDGET_H_ -#include <qdict.h> -#include <qlistview.h> -#include <qmap.h> -#include <qstrlist.h> -#include <qvbox.h> -#include <qtoolbutton.h> +#include <tqdict.h> +#include <tqlistview.h> +#include <tqmap.h> +#include <tqstrlist.h> +#include <tqvbox.h> +#include <tqtoolbutton.h> #include <kiconloader.h> #include <klocale.h> #include <kdeversion.h> -#include <qbutton.h> -#include <qfileinfo.h> -#include <qptrlist.h> +#include <tqbutton.h> +#include <tqfileinfo.h> +#include <tqptrlist.h> #include "choosesubprojectdlg.h" #include "newwidgetdlg.h" #include "domutil.h" @@ -49,45 +49,45 @@ public: TrollProjectWidget( TrollProjectPart *part ); ~TrollProjectWidget(); - void openProject( const QString &dirName ); + void openProject( const TQString &dirName ); void closeProject(); /** * A list of the (relative) names of all subprojects (== subdirectories). */ - //QStringList allSubprojects(); + //TQStringList allSubprojects(); /** * A list of the (relative) names of all libraries. */ - QStringList allLibraries(); + TQStringList allLibraries(); /** * A list of all files that belong to the project. **/ - QStringList allFiles(); + TQStringList allFiles(); /** * The top level directory of the project. **/ - QString projectDirectory(); + TQString projectDirectory(); /** * The directory of the currently active subproject. */ - QString subprojectDirectory(); + TQString subprojectDirectory(); /** * The directory of the currently active subproject. */ - QString getCurrentTarget(); + TQString getCurrentTarget(); - QString getCurrentDestDir(); + TQString getCurrentDestDir(); - QString getCurrentOutputFilename(); + TQString getCurrentOutputFilename(); - void addFileToCurrentSubProject( GroupItem *titem, const QString &filename ); - void addFileToCurrentSubProject( GroupItem::GroupType gtype, const QString &filename ); - void addFiles( QStringList &files, bool relativeToProjectRoot = true ); - void emitAddedFile( const QString &name ); - void emitRemovedFile( const QString &name ); + void addFileToCurrentSubProject( GroupItem *titem, const TQString &filename ); + void addFileToCurrentSubProject( GroupItem::GroupType gtype, const TQString &filename ); + void addFiles( TQStringList &files, bool relativeToProjectRoot = true ); + void emitAddedFile( const TQString &name ); + void emitRemovedFile( const TQString &name ); - QString getUiFileLink( const QString &path, const QString& filename ); + TQString getUiFileLink( const TQString &path, const TQString& filename ); bool isTMakeProject(); enum TrollProjectView { SubprojectView, DetailsView }; @@ -122,78 +122,78 @@ public slots: void slotRemoveFile(); protected: - virtual void focusInEvent( QFocusEvent *e ); + virtual void focusInEvent( TQFocusEvent *e ); private slots: - void slotOverviewSelectionChanged( QListViewItem *item ); - void slotOverviewContextMenu( KListView *, QListViewItem *item, const QPoint &p ); - void slotDetailsSelectionChanged( QListViewItem* ); - void slotDetailsExecuted( QListViewItem *item ); - void slotDetailsContextMenu( KListView *, QListViewItem *item, const QPoint &p ); + void slotOverviewSelectionChanged( TQListViewItem *item ); + void slotOverviewContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ); + void slotDetailsSelectionChanged( TQListViewItem* ); + void slotDetailsExecuted( TQListViewItem *item ); + void slotDetailsContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ); void slotExcludeFileFromScopeButton(); void slotAddSubproject( QMakeScopeItem *spitem = 0 ); void slotRemoveSubproject( QMakeScopeItem *spitem = 0 ); void slotCreateScope( QMakeScopeItem *spitem = 0 ); void slotRemoveScope( QMakeScopeItem *spitem = 0 ); void slotDisableSubproject( QMakeScopeItem* spitem = 0 ); - void slotProjectDirty( const QString& ); + void slotProjectDirty( const TQString& ); void createQMakeScopeItems(); private: void cleanDetailView( QMakeScopeItem *item ); - void runClean( QMakeScopeItem*, const QString& ); + void runClean( QMakeScopeItem*, const TQString& ); void buildProjectDetailTree( QMakeScopeItem *item, KListView *listviewControl ); void removeFile( QMakeScopeItem *spitem, FileItem *fitem ); - void addSubprojectToItem( QMakeScopeItem*, const QString& ); + void addSubprojectToItem( QMakeScopeItem*, const TQString& ); void setupContext(); - // void parseScope(QMakeScopeItem *item,QString scopeString, Scope *scope); + // void parseScope(QMakeScopeItem *item,TQString scopeString, Scope *scope); GroupItem* getInstallRoot( QMakeScopeItem *item ); - GroupItem* getInstallObject( QMakeScopeItem *item, const QString& objectname ); - QString constructMakeCommandLine( Scope* s = 0 ); + GroupItem* getInstallObject( QMakeScopeItem *item, const TQString& objectname ); + TQString constructMakeCommandLine( Scope* s = 0 ); - void createMakefileIfMissing( const QString &dir, QMakeScopeItem *item ); + void createMakefileIfMissing( const TQString &dir, QMakeScopeItem *item ); void runQMakeRecursive( QMakeScopeItem* proj); void buildFile( QMakeScopeItem* spitem, FileItem* fitem); - /*fileName: full base file name like QFileInfo::baseName ( true )*/ - QPtrList<QMakeScopeItem> findSubprojectForFile( QFileInfo fi ); - void findSubprojectForFile( QPtrList<QMakeScopeItem> &list, QMakeScopeItem * item, QString absFilePath ); - QMakeScopeItem* findSubprojectForPath( const QString& ); - // QString makeEnvironment(); + /*fileName: full base file name like TQFileInfo::baseName ( true )*/ + TQPtrList<QMakeScopeItem> findSubprojectForFile( TQFileInfo fi ); + void findSubprojectForFile( TQPtrList<QMakeScopeItem> &list, QMakeScopeItem * item, TQString absFilePath ); + QMakeScopeItem* findSubprojectForPath( const TQString& ); + // TQString makeEnvironment(); TrollProjectWidget::SaveType dialogSaveBehaviour() const; QMakeScopeItem *findSubprojectForScope( QMakeScopeItem *scope ); void reloadProjectFromFile( QMakeScopeItem* item ); - QMap<QString,QString> qmakeEnvironment() const; + TQMap<TQString,TQString> qmakeEnvironment() const; - QVBox *overviewContainer; + TQVBox *overviewContainer; KListView *overview; - QHBox *projectTools; - QToolButton *addSubdirButton; - QToolButton *createScopeButton; + TQHBox *projectTools; + TQToolButton *addSubdirButton; + TQToolButton *createScopeButton; - QToolButton *buildProjectButton; - QToolButton *rebuildProjectButton; - QToolButton *executeProjectButton; + TQToolButton *buildProjectButton; + TQToolButton *rebuildProjectButton; + TQToolButton *executeProjectButton; - QToolButton *buildTargetButton; - QToolButton *rebuildTargetButton; - QToolButton *executeTargetButton; + TQToolButton *buildTargetButton; + TQToolButton *rebuildTargetButton; + TQToolButton *executeTargetButton; - QToolButton *buildFileButton; - QToolButton *projectconfButton; + TQToolButton *buildFileButton; + TQToolButton *projectconfButton; - QVBox *detailContainer; + TQVBox *detailContainer; KListView *details; - QHBox *fileTools; - QToolButton *addfilesButton; - QToolButton *newfileButton; - QToolButton *removefileButton; - QToolButton *excludeFileFromScopeButton; + TQHBox *fileTools; + TQToolButton *addfilesButton; + TQToolButton *newfileButton; + TQToolButton *removefileButton; + TQToolButton *excludeFileFromScopeButton; DomUtil::PairList m_subclasslist; QMakeScopeItem *m_shownSubproject; @@ -207,7 +207,7 @@ private: bool m_filesCached; bool m_showFilenamesOnly; bool m_showVariablesInTree; - QStringList m_allFilesCache; + TQStringList m_allFilesCache; friend class ChooseSubprojectDlg; friend class ProjectConfigurationDlg; diff --git a/buildtools/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp index 336187d3..3bfeeee7 100644 --- a/buildtools/script/scriptnewfiledlg.cpp +++ b/buildtools/script/scriptnewfiledlg.cpp @@ -11,13 +11,13 @@ #include "scriptnewfiledlg.h" -#include <qcheckbox.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqcheckbox.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <klineedit.h> -#include <qpushbutton.h> +#include <tqpushbutton.h> #include <kbuttonbox.h> #include <kdebug.h> #include <klocale.h> @@ -30,35 +30,35 @@ ScriptNewFileDialog::ScriptNewFileDialog(ScriptProjectPart *part, - QWidget *parent, const char *name) - : QDialog(parent, name, true) + TQWidget *parent, const char *name) + : TQDialog(parent, name, true) { setCaption(i18n("New File")); - QLabel *filename_label = new QLabel(i18n("&File name:"), this); + TQLabel *filename_label = new TQLabel(i18n("&File name:"), this); filename_edit = new KLineEdit(this); filename_edit->setFocus(); filename_label->setBuddy(this); - QFontMetrics fm(filename_edit->fontMetrics()); + TQFontMetrics fm(filename_edit->fontMetrics()); filename_edit->setMinimumWidth(fm.width('X')*35); - usetemplate_box = new QCheckBox(i18n("&Use file template"), this); + usetemplate_box = new TQCheckBox(i18n("&Use file template"), this); usetemplate_box->setChecked(true); - QFrame *frame = new QFrame(this); - frame->setFrameStyle(QFrame::HLine | QFrame::Sunken); + TQFrame *frame = new TQFrame(this); + frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); KButtonBox *buttonbox = new KButtonBox(this); buttonbox->addStretch(); - QPushButton *ok_button = buttonbox->addButton(KStdGuiItem::ok()); - QPushButton *cancel_button = buttonbox->addButton(KStdGuiItem::cancel()); + TQPushButton *ok_button = buttonbox->addButton(KStdGuiItem::ok()); + TQPushButton *cancel_button = buttonbox->addButton(KStdGuiItem::cancel()); ok_button->setDefault(true); - connect( ok_button, SIGNAL(clicked()), this, SLOT(accept()) ); - connect( cancel_button, SIGNAL(clicked()), this, SLOT(reject()) ); + connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); buttonbox->layout(); - QVBoxLayout *layout = new QVBoxLayout(this, 10, 4); + TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4); layout->addWidget(filename_label); layout->addWidget(filename_edit); layout->addWidget(usetemplate_box); @@ -75,7 +75,7 @@ ScriptNewFileDialog::~ScriptNewFileDialog() void ScriptNewFileDialog::accept() { - QString fileName = filename_edit->text(); + TQString fileName = filename_edit->text(); if (fileName.find('/') != -1) { KMessageBox::sorry(this, i18n("Please enter the file name without '/' and so on.")); return; @@ -84,9 +84,9 @@ void ScriptNewFileDialog::accept() KDevProject *project = m_part->project(); if (!project->activeDirectory().isEmpty()) fileName.prepend(project->activeDirectory() + "/"); - QString destpath = project->projectDirectory() + "/" + fileName; + TQString destpath = project->projectDirectory() + "/" + fileName; - if (QFileInfo(destpath).exists()) { + if (TQFileInfo(destpath).exists()) { KMessageBox::sorry(this, i18n("A file with this name already exists.")); return; } @@ -94,14 +94,14 @@ void ScriptNewFileDialog::accept() bool success = false; if (usetemplate_box->isChecked()) { - QString extension = QFileInfo(destpath).extension(); + TQString extension = TQFileInfo(destpath).extension(); if (!FileTemplate::exists(m_part, extension)) { KMessageBox::sorry(this, i18n("A file template for this extension does not exist.")); return; } success = FileTemplate::copy(m_part, extension, destpath); } else { - QFile f(destpath); + TQFile f(destpath); success = f.open(IO_WriteOnly); if (success) f.close(); @@ -113,7 +113,7 @@ void ScriptNewFileDialog::accept() kdDebug(9015) << "AddFile1: " << fileName << endl; m_part->addFile(fileName); - QDialog::accept(); + TQDialog::accept(); } #include "scriptnewfiledlg.moc" diff --git a/buildtools/script/scriptnewfiledlg.h b/buildtools/script/scriptnewfiledlg.h index b3c73713..990fc663 100644 --- a/buildtools/script/scriptnewfiledlg.h +++ b/buildtools/script/scriptnewfiledlg.h @@ -12,7 +12,7 @@ #ifndef _SCRIPTNEWFILEDLG_H_ #define _SCRIPTNEWFILEDLG_H_ -#include <qdialog.h> +#include <tqdialog.h> class QCheckBox; class KLineEdit; @@ -24,14 +24,14 @@ class ScriptNewFileDialog : public QDialog Q_OBJECT public: - ScriptNewFileDialog( ScriptProjectPart *part, QWidget *parent=0, const char *name=0 ); + ScriptNewFileDialog( ScriptProjectPart *part, TQWidget *parent=0, const char *name=0 ); ~ScriptNewFileDialog(); protected: virtual void accept(); private: - QCheckBox *usetemplate_box; + TQCheckBox *usetemplate_box; KLineEdit *filename_edit; ScriptProjectPart *m_part; }; diff --git a/buildtools/script/scriptoptionswidget.cpp b/buildtools/script/scriptoptionswidget.cpp index c1660b00..d80cd501 100644 --- a/buildtools/script/scriptoptionswidget.cpp +++ b/buildtools/script/scriptoptionswidget.cpp @@ -11,27 +11,27 @@ #include "scriptoptionswidget.h" -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <klineedit.h> -#include <qradiobutton.h> -#include <qtabwidget.h> +#include <tqradiobutton.h> +#include <tqtabwidget.h> #include "domutil.h" #include "kdevlanguagesupport.h" ScriptOptionsWidget::ScriptOptionsWidget(KDevPlugin *part, - QWidget *parent, const char *name) + TQWidget *parent, const char *name) : ScriptOptionsWidgetBase(parent, name) { m_part = part; - QDomDocument &dom = *m_part->projectDom(); + TQDomDocument &dom = *m_part->projectDom(); - QString includepatterns + TQString includepatterns = DomUtil::readEntry(dom, "/kdevscriptproject/general/includepatterns"); if (includepatterns.isNull() && part->languageSupport()){ - QStringList includepatternList; + TQStringList includepatternList; KMimeType::List list = part->languageSupport()->mimeTypes(); KMimeType::List::Iterator it = list.begin(); while( it != list.end() ){ @@ -41,7 +41,7 @@ ScriptOptionsWidget::ScriptOptionsWidget(KDevPlugin *part, includepatterns = includepatternList.join( "," ); } - QString excludepatterns + TQString excludepatterns = DomUtil::readEntry(dom, "/kdevscriptproject/general/excludepatterns"); if (excludepatterns.isNull()) excludepatterns = "*~"; @@ -57,10 +57,10 @@ ScriptOptionsWidget::~ScriptOptionsWidget() void ScriptOptionsWidget::accept() { - QDomDocument &dom = *m_part->projectDom(); + TQDomDocument &dom = *m_part->projectDom(); - QString includepatterns = includepatterns_edit->text(); - QString excludepatterns = excludepatterns_edit->text(); + TQString includepatterns = includepatterns_edit->text(); + TQString excludepatterns = excludepatterns_edit->text(); DomUtil::writeEntry(dom, "/kdevscriptproject/general/includepatterns", includepatterns); DomUtil::writeEntry(dom, "/kdevscriptproject/general/excludepatterns", excludepatterns); diff --git a/buildtools/script/scriptoptionswidget.h b/buildtools/script/scriptoptionswidget.h index c33d099d..3dc03058 100644 --- a/buildtools/script/scriptoptionswidget.h +++ b/buildtools/script/scriptoptionswidget.h @@ -22,7 +22,7 @@ class ScriptOptionsWidget : public ScriptOptionsWidgetBase Q_OBJECT public: - ScriptOptionsWidget( KDevPlugin *part, QWidget *parent=0, const char *name=0 ); + ScriptOptionsWidget( KDevPlugin *part, TQWidget *parent=0, const char *name=0 ); ~ScriptOptionsWidget(); public slots: diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp index ff560f23..2bc19135 100644 --- a/buildtools/script/scriptprojectpart.cpp +++ b/buildtools/script/scriptprojectpart.cpp @@ -11,12 +11,12 @@ #include "scriptprojectpart.h" -#include <qdir.h> -#include <qregexp.h> -#include <qstringlist.h> -#include <qvaluestack.h> -#include <qvbox.h> -#include <qwhatsthis.h> +#include <tqdir.h> +#include <tqregexp.h> +#include <tqstringlist.h> +#include <tqvaluestack.h> +#include <tqvbox.h> +#include <tqwhatsthis.h> #include <kaction.h> #include <kdebug.h> #include <kdialogbase.h> @@ -40,7 +40,7 @@ typedef KDevGenericFactory<ScriptProjectPart> ScriptProjectFactory; static const KDevPluginInfo data("kdevscriptproject"); K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( data ) ) -ScriptProjectPart::ScriptProjectPart(QObject *parent, const char *name, const QStringList &) +ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const TQStringList &) : KDevBuildTool(&data, parent, name ? name : "ScriptProjectPart") { setInstance(ScriptProjectFactory::instance()); @@ -51,17 +51,17 @@ ScriptProjectPart::ScriptProjectPart(QObject *parent, const char *name, const QS if (!extension<KDevCreateFile>("KDevelop/CreateFile")) { KAction *action; action = new KAction( i18n("New File..."), 0, - this, SLOT(slotNewFile()), + this, TQT_SLOT(slotNewFile()), actionCollection(), "file_newfile" ); action->setWhatsThis( i18n("<b>New file</b><p>Creates a new file.") ); action->setToolTip( i18n("Create a new file") ); } new KAction( i18n("Rescan Project"), 0, CTRL+ALT+Key_R, - this, SLOT(rescan()), + this, TQT_SLOT(rescan()), actionCollection(), "rescan" ); - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); } @@ -71,10 +71,10 @@ ScriptProjectPart::~ScriptProjectPart() void ScriptProjectPart::projectConfigWidget(KDialogBase *dlg) { - QVBox *vbox; + TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Script Project Options"), i18n("Script Project Options"), BarIcon("kdevelop", KIcon::SizeMedium)); ScriptOptionsWidget *w = new ScriptOptionsWidget(this, vbox); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } @@ -82,11 +82,11 @@ void ScriptProjectPart::projectConfigWidget(KDialogBase *dlg) * @todo This should really be merged with FileTreeWidget::matchesHidePattern() * and put in its own class. Currently this is repeated in scriptprojectpart.cpp, pascalproject_part.cpp, adaproject_part.cpp */ -static bool matchesPattern(const QString &fileName, const QStringList &patternList) +static bool matchesPattern(const TQString &fileName, const TQStringList &patternList) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = patternList.begin(); it != patternList.end(); ++it) { - QRegExp re(*it, true, true); + TQRegExp re(*it, true, true); if (re.search(fileName) == 0 && re.matchedLength() == (int)fileName.length()) return true; } @@ -95,7 +95,7 @@ static bool matchesPattern(const QString &fileName, const QStringList &patternLi } -void ScriptProjectPart::openProject(const QString &dirName, const QString &projectName) +void ScriptProjectPart::openProject(const TQString &dirName, const TQString &projectName) { if (!languageSupport()) kdDebug(9015) << "ScriptProjectPart::openProject: no language support found!" << endl; @@ -103,7 +103,7 @@ void ScriptProjectPart::openProject(const QString &dirName, const QString &proje m_projectDirectory = dirName; m_projectName = projectName; - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); // Set the default directory radio to "executable" if (DomUtil::readEntry(dom, "/kdevscriptproject/run/directoryradio") == "" ) { @@ -111,28 +111,28 @@ void ScriptProjectPart::openProject(const QString &dirName, const QString &proje } // Put all files from all subdirectories into file list - QValueStack<QString> s; + TQValueStack<TQString> s; int prefixlen = m_projectDirectory.length()+1; s.push(m_projectDirectory); - QDir dir; + TQDir dir; do { dir.setPath(s.pop()); kdDebug(9015) << "Examining: " << dir.path() << endl; const QFileInfoList *dirEntries = dir.entryInfoList(); if ( dirEntries ) { - QPtrListIterator<QFileInfo> it(*dirEntries); + TQPtrListIterator<TQFileInfo> it(*dirEntries); for (; it.current(); ++it) { - QString fileName = it.current()->fileName(); + TQString fileName = it.current()->fileName(); if (fileName == "." || fileName == "..") continue; - QString path = it.current()->absFilePath(); + TQString path = it.current()->absFilePath(); if (it.current()->isDir()) { //do not follow symlinks which point to the themselves if (it.current()->isSymLink()) { - QString symLink = it.current()->readLink(); + TQString symLink = it.current()->readLink(); if ((symLink == path) || (symLink == "./")) continue; } else if (canAddDirectoryToProject(path)) { @@ -157,18 +157,18 @@ void ScriptProjectPart::closeProject() } -QString ScriptProjectPart::projectDirectory() const +TQString ScriptProjectPart::projectDirectory() const { return m_projectDirectory; } -QString ScriptProjectPart::buildDirectory() const +TQString ScriptProjectPart::buildDirectory() const { return m_projectDirectory; } -QString ScriptProjectPart::projectName() const +TQString ScriptProjectPart::projectName() const { return m_projectName; } @@ -190,9 +190,9 @@ DomUtil::PairList ScriptProjectPart::runEnvironmentVars() const * if run/directoryradio == custom * The custom directory absolute path */ -QString ScriptProjectPart::runDirectory() const +TQString ScriptProjectPart::runDirectory() const { - QString cwd = defaultRunDirectory("kdevscriptproject"); + TQString cwd = defaultRunDirectory("kdevscriptproject"); if (cwd.isEmpty()) cwd = buildDirectory(); return cwd; @@ -208,15 +208,15 @@ QString ScriptProjectPart::runDirectory() const * if run/directoryradio == custom or relative == false * The absolute path to executable */ -QString ScriptProjectPart::mainProgram() const +TQString ScriptProjectPart::mainProgram() const { - QDomDocument * dom = projectDom(); + TQDomDocument * dom = projectDom(); - if ( !dom ) return QString(); + if ( !dom ) return TQString(); - QString DomMainProgram = DomUtil::readEntry( *dom, "/kdevscriptproject/run/mainprogram"); + TQString DomMainProgram = DomUtil::readEntry( *dom, "/kdevscriptproject/run/mainprogram"); - if ( DomMainProgram.isEmpty() ) return QString(); + if ( DomMainProgram.isEmpty() ) return TQString(); if ( DomMainProgram.startsWith("/") ) // assume absolute path { @@ -227,36 +227,36 @@ QString ScriptProjectPart::mainProgram() const return projectDirectory() + "/" + DomMainProgram; } - return QString(); + return TQString(); } -/** Retuns a QString with the debug command line arguments */ -QString ScriptProjectPart::debugArguments() const +/** Retuns a TQString with the debug command line arguments */ +TQString ScriptProjectPart::debugArguments() const { return DomUtil::readEntry(*projectDom(), "/kdevscriptproject/run/globaldebugarguments"); } -/** Retuns a QString with the run command line arguments */ -QString ScriptProjectPart::runArguments() const +/** Retuns a TQString with the run command line arguments */ +TQString ScriptProjectPart::runArguments() const { return DomUtil::readEntry(*projectDom(), "/kdevscriptproject/run/programargs"); } -QString ScriptProjectPart::activeDirectory() const +TQString ScriptProjectPart::activeDirectory() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); return DomUtil::readEntry(dom, "/kdevscriptproject/general/activedir"); } -QStringList ScriptProjectPart::allFiles() const +TQStringList ScriptProjectPart::allFiles() const { -/* QStringList res; +/* TQStringList res; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = m_sourceFiles.begin(); it != m_sourceFiles.end(); ++it) res += (m_projectDirectory + "/" + (*it)); @@ -266,19 +266,19 @@ QStringList ScriptProjectPart::allFiles() const return m_sourceFiles; } -void ScriptProjectPart::addFile(const QString &fileName) +void ScriptProjectPart::addFile(const TQString &fileName) { kdDebug(9015) << "AddFile2" << fileName << endl; - QStringList fileList; + TQStringList fileList; fileList.append ( fileName ); this->addFiles ( fileList ); } -void ScriptProjectPart::addFiles ( const QStringList& fileList ) +void ScriptProjectPart::addFiles ( const TQStringList& fileList ) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { @@ -288,19 +288,19 @@ void ScriptProjectPart::addFiles ( const QStringList& fileList ) emit addedFilesToProject ( fileList ); } -void ScriptProjectPart::removeFile(const QString &fileName) +void ScriptProjectPart::removeFile(const TQString &fileName) { - QStringList fileList; + TQStringList fileList; fileList.append ( fileName ); this->addFiles ( fileList ); } -void ScriptProjectPart::removeFiles ( const QStringList& fileList ) +void ScriptProjectPart::removeFiles ( const TQStringList& fileList ) { emit removedFilesFromProject ( fileList ); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { @@ -317,13 +317,13 @@ void ScriptProjectPart::slotNewFile() /*! \fn ScriptProjectPart::distFiles() const */ -QStringList ScriptProjectPart::distFiles() const +TQStringList ScriptProjectPart::distFiles() const { - QStringList sourceList = allFiles(); + TQStringList sourceList = allFiles(); // Scan current source directory for any .pro files. - QString projectDir = projectDirectory(); - QDir dir(projectDir); - QStringList files = dir.entryList( "*README*"); + TQString projectDir = projectDirectory(); + TQDir dir(projectDir); + TQStringList files = dir.entryList( "*README*"); return sourceList + files; } @@ -332,28 +332,28 @@ void ScriptProjectPart::rescan() // kdDebug() << "Directory " << path << " changed, scanning for new files in the project" << endl; // Put all files from all subdirectories into file list - QValueStack<QString> s; + TQValueStack<TQString> s; int prefixlen = m_projectDirectory.length()+1; s.push(m_projectDirectory); - QDir dir; + TQDir dir; do { dir.setPath(s.pop()); kdDebug(9015) << "Examining: " << dir.path() << endl; const QFileInfoList *dirEntries = dir.entryInfoList(); if ( dirEntries ) { - QPtrListIterator<QFileInfo> it(*dirEntries); + TQPtrListIterator<TQFileInfo> it(*dirEntries); for (; it.current(); ++it) { - QString fileName = it.current()->fileName(); + TQString fileName = it.current()->fileName(); if (fileName == "." || fileName == "..") continue; - QString path = it.current()->absFilePath(); + TQString path = it.current()->absFilePath(); if (it.current()->isDir()) { //do not follow symlinks which point to the themselves if (it.current()->isSymLink()) { - QString symLink = it.current()->readLink(); + TQString symLink = it.current()->readLink(); if ((symLink == path) || (symLink == "./")) continue; } else if (canAddDirectoryToProject(path)) { @@ -370,18 +370,18 @@ void ScriptProjectPart::rescan() } } while (!s.isEmpty()); -/* const QFileInfoList *dirEntries = QDir(path).entryInfoList(); +/* const QFileInfoList *dirEntries = TQDir(path).entryInfoList(); if ( dirEntries ) { kdDebug() << "1" << endl; - QPtrListIterator<QFileInfo> it(*dirEntries); + TQPtrListIterator<TQFileInfo> it(*dirEntries); for (; it.current(); ++it) { kdDebug() << "2" << endl; - QString fileName = it.current()->fileName(); + TQString fileName = it.current()->fileName(); if (fileName == "." || fileName == "..") continue; kdDebug() << "3" << endl; - QString filePath = it.current()->absFilePath(); + TQString filePath = it.current()->absFilePath(); if (!it.current()->isDir() && canAddToProject(filePath) && !isProjectFile(filePath)) { kdDebug() << "=== adding " << filePath << endl; addFile(filePath); @@ -390,12 +390,12 @@ void ScriptProjectPart::rescan() }*/ } -bool ScriptProjectPart::canAddToProject(const QString & path) +bool ScriptProjectPart::canAddToProject(const TQString & path) { - QDomDocument &dom = *projectDom(); - QString includepatterns + TQDomDocument &dom = *projectDom(); + TQString includepatterns = DomUtil::readEntry(dom, "/kdevscriptproject/general/includepatterns"); - QStringList includepatternList; + TQStringList includepatternList; if ( includepatterns.isNull() ) { if ( languageSupport() ){ KMimeType::List list = languageSupport()->mimeTypes(); @@ -406,14 +406,14 @@ bool ScriptProjectPart::canAddToProject(const QString & path) } } } else { - includepatternList = QStringList::split(",", includepatterns); + includepatternList = TQStringList::split(",", includepatterns); } - QString excludepatterns + TQString excludepatterns = DomUtil::readEntry(dom, "/kdevscriptproject/general/excludepatterns"); if (excludepatterns.isNull()) excludepatterns = "*~"; - QStringList excludepatternList = QStringList::split(",", excludepatterns); + TQStringList excludepatternList = TQStringList::split(",", excludepatterns); if (matchesPattern(path, includepatternList) && !matchesPattern(path, excludepatternList)) { @@ -425,15 +425,15 @@ bool ScriptProjectPart::canAddToProject(const QString & path) } } -bool ScriptProjectPart::canAddDirectoryToProject(const QString & path) +bool ScriptProjectPart::canAddDirectoryToProject(const TQString & path) { - QDomDocument &dom = *projectDom(); - QString excludepatterns + TQDomDocument &dom = *projectDom(); + TQString excludepatterns = DomUtil::readEntry(dom, "/kdevscriptproject/general/excludepatterns"); if (excludepatterns.isNull()) { return true; } - QStringList excludepatternList = QStringList::split(",", excludepatterns); + TQStringList excludepatternList = TQStringList::split(",", excludepatterns); if (!matchesPattern(path, excludepatternList)) { return true; diff --git a/buildtools/script/scriptprojectpart.h b/buildtools/script/scriptprojectpart.h index b16c4ffb..b886bd46 100644 --- a/buildtools/script/scriptprojectpart.h +++ b/buildtools/script/scriptprojectpart.h @@ -12,8 +12,8 @@ #ifndef _SCRIPTPROJECTPART_H_ #define _SCRIPTPROJECTPART_H_ -#include <qdict.h> -#include <qguardedptr.h> +#include <tqdict.h> +#include <tqguardedptr.h> #include "kdevbuildtool.h" @@ -27,31 +27,31 @@ class ScriptProjectPart : public KDevBuildTool Q_OBJECT public: - ScriptProjectPart( QObject *parent, const char *name, const QStringList &args ); + ScriptProjectPart( TQObject *parent, const char *name, const TQStringList &args ); ~ScriptProjectPart(); - QStringList distFiles() const; + TQStringList distFiles() const; protected: - virtual void openProject(const QString &dirName, const QString &projectName); + virtual void openProject(const TQString &dirName, const TQString &projectName); virtual void closeProject(); - virtual QString projectDirectory() const; - virtual QString projectName() const; - virtual QString mainProgram() const; - virtual QString activeDirectory() const; - virtual QStringList allFiles() const; - virtual void addFile(const QString &fileName); - virtual void addFiles ( const QStringList& fileList ); - virtual void removeFile(const QString &fileName); - virtual void removeFiles ( const QStringList& fileList ); - virtual QString buildDirectory() const; - virtual QString runDirectory() const; - virtual QString debugArguments() const; - virtual QString runArguments() const; + virtual TQString projectDirectory() const; + virtual TQString projectName() const; + virtual TQString mainProgram() const; + virtual TQString activeDirectory() const; + virtual TQStringList allFiles() const; + virtual void addFile(const TQString &fileName); + virtual void addFiles ( const TQStringList& fileList ); + virtual void removeFile(const TQString &fileName); + virtual void removeFiles ( const TQStringList& fileList ); + virtual TQString buildDirectory() const; + virtual TQString runDirectory() const; + virtual TQString debugArguments() const; + virtual TQString runArguments() const; virtual DomUtil::PairList runEnvironmentVars() const; - bool canAddToProject(const QString &path); - bool canAddDirectoryToProject(const QString &path); + bool canAddToProject(const TQString &path); + bool canAddDirectoryToProject(const TQString &path); private slots: void projectConfigWidget(KDialogBase *dlg); @@ -59,9 +59,9 @@ private slots: void rescan(); private: - QString m_projectDirectory; - QString m_projectName; - QStringList m_sourceFiles; + TQString m_projectDirectory; + TQString m_projectName; + TQStringList m_sourceFiles; friend class ScriptNewFileDialog; }; |