diff options
Diffstat (limited to 'buildtools/autotools')
58 files changed, 1758 insertions, 1758 deletions
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: |