diff options
Diffstat (limited to 'parts')
342 files changed, 6850 insertions, 6850 deletions
diff --git a/parts/abbrev/abbrevconfigwidget.cpp b/parts/abbrev/abbrevconfigwidget.cpp index d7729249..6e174603 100644 --- a/parts/abbrev/abbrevconfigwidget.cpp +++ b/parts/abbrev/abbrevconfigwidget.cpp @@ -18,25 +18,25 @@ #include <kconfig.h> #include <kiconloader.h> -#include <qlistview.h> -#include <qmultilineedit.h> -#include <qcheckbox.h> +#include <tqlistview.h> +#include <tqmultilineedit.h> +#include <tqcheckbox.h> #include "addtemplatedlg.h" #include "abbrevpart.h" -AbbrevConfigWidget::AbbrevConfigWidget(AbbrevPart *part, QWidget *parent, const char *name) +AbbrevConfigWidget::AbbrevConfigWidget(AbbrevPart *part, TQWidget *parent, const char *name) : AbbrevConfigWidgetBase(parent, name) { m_part = part; qWarning("creating abbrevconfigwidget for %d abbrevs", part->templates().allTemplates().count()); - QPtrList<CodeTemplate> templates = part->templates().allTemplates(); + TQPtrList<CodeTemplate> templates = part->templates().allTemplates(); CodeTemplate *templ; for (templ = templates.first(); templ; templ = templates.next()) { qWarning("creating item for code template "); - QListViewItem *it = new QListViewItem( listTemplates, + TQListViewItem *it = new TQListViewItem( listTemplates, templ->name, templ->description, templ->suffixes, @@ -56,15 +56,15 @@ AbbrevConfigWidget::~AbbrevConfigWidget() void AbbrevConfigWidget::addTemplate() { - QStringList suffixesList = m_part->templates().suffixes(); + TQStringList suffixesList = m_part->templates().suffixes(); AddTemplateDialog dlg( suffixesList, this ); if( dlg.exec() ){ - QString templ = dlg.templ(); - QString description = dlg.description(); - QString suffixes = dlg.suffixes(); + TQString templ = dlg.templ(); + TQString description = dlg.description(); + TQString suffixes = dlg.suffixes(); if( !(templ.isEmpty() || description.isEmpty()) || suffixes.isEmpty()) { - QListViewItem* item = new QListViewItem( listTemplates, templ, description, suffixes ); + TQListViewItem* item = new TQListViewItem( listTemplates, templ, description, suffixes ); listTemplates->setSelected( item, true ); editCode->setFocus(); } @@ -82,7 +82,7 @@ void AbbrevConfigWidget::removeTemplate() void AbbrevConfigWidget::selectionChanged() { - QListViewItem* item = listTemplates->selectedItem(); + TQListViewItem* item = listTemplates->selectedItem(); if( item ){ editCode->setText( item->text(3) ); } @@ -91,7 +91,7 @@ void AbbrevConfigWidget::selectionChanged() void AbbrevConfigWidget::codeChanged() { - QListViewItem* item = listTemplates->selectedItem(); + TQListViewItem* item = listTemplates->selectedItem(); if( item ){ item->setText( 3, editCode->text() ); if (item->text(3) == item->text(4)) @@ -106,7 +106,7 @@ void AbbrevConfigWidget::accept() { m_part->clearTemplates(); - QListViewItem* item = listTemplates->firstChild(); + TQListViewItem* item = listTemplates->firstChild(); while( item ){ m_part->addTemplate( item->text(0), item->text(1), diff --git a/parts/abbrev/abbrevconfigwidget.h b/parts/abbrev/abbrevconfigwidget.h index b8cc1983..818aa3ba 100644 --- a/parts/abbrev/abbrevconfigwidget.h +++ b/parts/abbrev/abbrevconfigwidget.h @@ -25,7 +25,7 @@ class AbbrevConfigWidget : public AbbrevConfigWidgetBase Q_OBJECT public: - AbbrevConfigWidget(AbbrevPart *part, QWidget *parent=0, const char *name=0); + AbbrevConfigWidget(AbbrevPart *part, TQWidget *parent=0, const char *name=0); ~AbbrevConfigWidget(); public slots: diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp index 181606f4..a86d98f8 100644 --- a/parts/abbrev/abbrevpart.cpp +++ b/parts/abbrev/abbrevpart.cpp @@ -15,10 +15,10 @@ #include "abbrevpart.h" -#include <qfile.h> -#include <qfileinfo.h> -#include <qregexp.h> -#include <qvbox.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqregexp.h> +#include <tqvbox.h> #include <kdebug.h> #include <kdialogbase.h> #include <klocale.h> @@ -65,26 +65,26 @@ public: K_EXPORT_COMPONENT_FACTORY( libkdevabbrev, AbbrevFactory ) -AbbrevPart::AbbrevPart(QObject *parent, const char *name, const QStringList &) +AbbrevPart::AbbrevPart(TQObject *parent, const char *name, const TQStringList &) : KDevPlugin(&data, parent, name ? name : "AbbrevPart") { setInstance(AbbrevFactory::instance()); setXMLFile("kdevabbrev.rc"); - connect(partController(), SIGNAL(activePartChanged(KParts::Part*)), - this, SLOT(slotActivePartChanged(KParts::Part*)) ); + connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); - connect(core(), SIGNAL(configWidget(KDialogBase*)), this, SLOT(configWidget(KDialogBase*))); + connect(core(), TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(configWidget(KDialogBase*))); KAction *action; action = new KAction( i18n("Expand Text"), CTRL + Key_J, - this, SLOT(slotExpandText()), + this, TQT_SLOT(slotExpandText()), actionCollection(), "edit_expandtext" ); action->setToolTip( i18n("Expand current word") ); action->setWhatsThis( i18n("<b>Expand current word</b><p>Current word can be completed using the list of similar words in source files.") ); action = new KAction( i18n("Expand Abbreviation"), CTRL + Key_L, - this, SLOT(slotExpandAbbrev()), + this, TQT_SLOT(slotExpandAbbrev()), actionCollection(), "edit_expandabbrev" ); action->setToolTip( i18n("Expand abbreviation") ); action->setWhatsThis( i18n("<b>Expand abbreviation</b><p>Enable and configure abbreviations in <b>KDevelop Settings</b>, <b>Abbreviations</b> tab.") ); @@ -140,56 +140,56 @@ void AbbrevPart::setAutoWordCompletionEnabled( bool enabled ) disconnect( docIface->widget(), 0, this, 0 ); if( m_autoWordCompletionEnabled ){ - connect( docIface->widget(), SIGNAL(completionAborted()), - this, SLOT(slotCompletionAborted()) ); - connect( docIface->widget(), SIGNAL(completionDone()), - this, SLOT(slotCompletionDone()) ); - connect( docIface->widget(), SIGNAL(aboutToShowCompletionBox()), - this, SLOT(slotAboutToShowCompletionBox()) ); - - connect( docIface, SIGNAL(textChanged()), this, SLOT(slotTextChanged()) ); + connect( docIface->widget(), TQT_SIGNAL(completionAborted()), + this, TQT_SLOT(slotCompletionAborted()) ); + connect( docIface->widget(), TQT_SIGNAL(completionDone()), + this, TQT_SLOT(slotCompletionDone()) ); + connect( docIface->widget(), TQT_SIGNAL(aboutToShowCompletionBox()), + this, TQT_SLOT(slotAboutToShowCompletionBox()) ); + + connect( docIface, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); } } void AbbrevPart::load() { KStandardDirs *dirs = AbbrevFactory::instance()->dirs(); - QString localTemplatesFile = locateLocal("codetemplates", "templates", AbbrevFactory::instance()); - QStringList files; - if (QFileInfo(localTemplatesFile).exists()) + TQString localTemplatesFile = locateLocal("codetemplates", "templates", AbbrevFactory::instance()); + TQStringList files; + if (TQFileInfo(localTemplatesFile).exists()) files << localTemplatesFile; else - files = dirs->findAllResources("codetemplates", QString::null, false, true); + files = dirs->findAllResources("codetemplates", TQString::null, false, true); - QString localSourcesFile = locateLocal("sources", "sources", AbbrevFactory::instance()); - QStringList sourceFiles; - if (QFileInfo(localSourcesFile).exists()) + TQString localSourcesFile = locateLocal("sources", "sources", AbbrevFactory::instance()); + TQStringList sourceFiles; + if (TQFileInfo(localSourcesFile).exists()) sourceFiles << localSourcesFile; else - sourceFiles = dirs->findAllResources("sources", QString::null, false, true); + sourceFiles = dirs->findAllResources("sources", TQString::null, false, true); kdDebug(9028) << "=========> sourceFiles: " << sourceFiles.join(" ") << endl; - this->m_completionFile = QString::null; - for( QStringList::Iterator it=sourceFiles.begin(); it!=sourceFiles.end(); ++it ) { - QString fn = *it; + this->m_completionFile = TQString::null; + for( TQStringList::Iterator it=sourceFiles.begin(); it!=sourceFiles.end(); ++it ) { + TQString fn = *it; kdDebug(9028) << "===> load file: " << fn << endl; - QFile f( fn ); + TQFile f( fn ); if ( f.open(IO_ReadOnly) ) { - QTextStream stream( &f ); - m_completionFile += ( stream.read() + QString("\n") ); + TQTextStream stream( &f ); + m_completionFile += ( stream.read() + TQString("\n") ); f.close(); } } - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = files.begin(); it != files.end(); ++it) { - QString fn = *it; + TQString fn = *it; kdDebug(9028) << "fn = " << fn << endl; - QFile f( fn ); + TQFile f( fn ); if ( f.open(IO_ReadOnly) ) { - QDomDocument doc; + TQDomDocument doc; doc.setContent( &f ); - QDomElement root = doc.firstChild().toElement(); - QDomElement e = root.firstChild().toElement(); + TQDomElement root = doc.firstChild().toElement(); + TQDomElement e = root.firstChild().toElement(); while ( !e.isNull() ){ addTemplate( e.attribute("name"), e.attribute("description"), @@ -205,18 +205,18 @@ void AbbrevPart::load() void AbbrevPart::save() { - QString fn = AbbrevFactory::instance()->dirs()->saveLocation("codetemplates", "", true); + TQString fn = AbbrevFactory::instance()->dirs()->saveLocation("codetemplates", "", true); kdDebug(9028) << "fn = " << fn << endl; - QDomDocument doc( "Templates" ); - QDomElement root = doc.createElement( "Templates" ); + TQDomDocument doc( "Templates" ); + TQDomElement root = doc.createElement( "Templates" ); doc.appendChild( root ); - QPtrList<CodeTemplate> templates = m_templates.allTemplates(); + TQPtrList<CodeTemplate> templates = m_templates.allTemplates(); CodeTemplate *templ; for (templ = templates.first(); templ; templ = templates.next()) { - QDomElement e = doc.createElement( "Template" ); + TQDomElement e = doc.createElement( "Template" ); e.setAttribute( "name", templ->name ); e.setAttribute( "description", templ->description ); e.setAttribute( "suffixes", templ->suffixes ); @@ -224,16 +224,16 @@ void AbbrevPart::save() root.appendChild( e ); } - QFile f( fn + "templates" ); + TQFile f( fn + "templates" ); if( f.open(IO_WriteOnly) ){ - QTextStream stream( &f ); + TQTextStream stream( &f ); stream << doc.toString(); f.close(); } } -QString AbbrevPart::currentWord() const +TQString AbbrevPart::currentWord() const { return KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); } @@ -241,9 +241,9 @@ QString AbbrevPart::currentWord() const void AbbrevPart::configWidget(KDialogBase *dlg) { - QVBox *vbox = dlg->addVBoxPage(i18n("Abbreviations"), i18n("Abbreviations"), BarIcon( info()->icon(), KIcon::SizeMedium) ); + TQVBox *vbox = dlg->addVBoxPage(i18n("Abbreviations"), i18n("Abbreviations"), BarIcon( info()->icon(), KIcon::SizeMedium) ); AbbrevConfigWidget *w = new AbbrevConfigWidget(this, vbox, "abbrev config widget"); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); } @@ -252,17 +252,17 @@ void AbbrevPart::slotExpandText() if( !editIface || !completionIface || !viewCursorIface ) return; - QString word = currentWord(); + TQString word = currentWord(); if (word.isEmpty()) return; - QValueList<KTextEditor::CompletionEntry> entries = findAllWords(editIface->text(), word); + TQValueList<KTextEditor::CompletionEntry> entries = findAllWords(editIface->text(), word); if (entries.count() == 0) { ; // some statusbar message? // } else if (entries.count() == 1) { // uint line, col; // viewCursorIface->cursorPositionReal(&line, &col); -// QString txt = entries[0].text.mid(word.length()); +// TQString txt = entries[0].text.mid(word.length()); // editIface->insertText( line, col, txt ); // viewCursorIface->setCursorPositionReal( line, col + txt.length() ); } else { @@ -272,32 +272,32 @@ void AbbrevPart::slotExpandText() } -QValueList<KTextEditor::CompletionEntry> AbbrevPart::findAllWords(const QString &text, const QString &prefix) +TQValueList<KTextEditor::CompletionEntry> AbbrevPart::findAllWords(const TQString &text, const TQString &prefix) { - QValueList<KTextEditor::CompletionEntry> entries; + TQValueList<KTextEditor::CompletionEntry> entries; KParts::ReadWritePart *part = dynamic_cast<KParts::ReadWritePart*>(partController()->activePart()); - QWidget *view = partController()->activeWidget(); + TQWidget *view = partController()->activeWidget(); if (!part || !view) { kdDebug(9028) << "no rw part" << endl; return entries; } - QString suffix = part->url().url(); + TQString suffix = part->url().url(); int pos = suffix.findRev('.'); if (pos != -1) suffix.remove(0, pos+1); kdDebug(9028) << "AbbrevPart::findAllWords with suffix " << suffix << endl; - QMap<QString, bool> map; - QRegExp rx( QString("\\b") + prefix + "[a-zA-Z0-9_]+\\b" ); + TQMap<TQString, bool> map; + TQRegExp rx( TQString("\\b") + prefix + "[a-zA-Z0-9_]+\\b" ); int idx = 0; pos = 0; int len = 0; while ( (pos = rx.search(text, idx)) != -1 ) { len = rx.matchedLength(); - QString word = text.mid(pos, len); + TQString word = text.mid(pos, len); if (map.find(word) == map.end()) { KTextEditor::CompletionEntry e; e.text = word; @@ -312,7 +312,7 @@ QValueList<KTextEditor::CompletionEntry> AbbrevPart::findAllWords(const QString len = 0; while ( (pos = rx.search(m_completionFile, idx)) != -1 ) { len = rx.matchedLength(); - QString word = m_completionFile.mid(pos, len); + TQString word = m_completionFile.mid(pos, len); if (map.find(word) == map.end()) { KTextEditor::CompletionEntry e; e.text = word; @@ -323,8 +323,8 @@ QValueList<KTextEditor::CompletionEntry> AbbrevPart::findAllWords(const QString } - QMap<QString, CodeTemplate*> m = m_templates[suffix]; - for (QMap<QString, CodeTemplate*>::const_iterator it = m.begin(); it != m.end() ; ++it) { + TQMap<TQString, CodeTemplate*> m = m_templates[suffix]; + for (TQMap<TQString, CodeTemplate*>::const_iterator it = m.begin(); it != m.end() ; ++it) { KTextEditor::CompletionEntry e; e.text = it.data()->description + " <abbrev>"; e.userdata = it.key(); @@ -338,13 +338,13 @@ QValueList<KTextEditor::CompletionEntry> AbbrevPart::findAllWords(const QString void AbbrevPart::slotExpandAbbrev() { KParts::ReadWritePart *part = dynamic_cast<KParts::ReadWritePart*>(partController()->activePart()); - QWidget *view = partController()->activeWidget(); + TQWidget *view = partController()->activeWidget(); if (!part || !view) { kdDebug(9028) << "no rw part" << endl; return; } - QString suffix = part->url().url(); + TQString suffix = part->url().url(); int pos = suffix.findRev('.'); if (pos != -1) suffix.remove(0, pos+1); @@ -362,18 +362,18 @@ void AbbrevPart::slotExpandAbbrev() return; } - QString word = currentWord(); + TQString word = currentWord(); kdDebug(9028) << "Expanding word " << word << " with suffix " << suffix << "." << endl; - QMap<QString, CodeTemplate*> m = m_templates[suffix]; - for (QMap<QString, CodeTemplate*>::const_iterator it = m.begin(); it != m.end() ; ++it) { + TQMap<TQString, CodeTemplate*> m = m_templates[suffix]; + for (TQMap<TQString, CodeTemplate*>::const_iterator it = m.begin(); it != m.end() ; ++it) { if (it.key() != word) continue; uint line, col; cursoriface->cursorPositionReal(&line, &col); - QString linestr = editIface->textLine(line); + TQString linestr = editIface->textLine(line); int startPos = QMAX( QMIN( (int)col, (int)linestr.length()-1 ), 0 ); int endPos = startPos; startPos--; @@ -388,15 +388,15 @@ void AbbrevPart::slotExpandAbbrev() } -void AbbrevPart::insertChars( const QString &chars ) +void AbbrevPart::insertChars( const TQString &chars ) { unsigned line=0, col=0; viewCursorIface->cursorPositionReal( &line, &col ); unsigned int currentLine=line, currentCol=col; - QString spaces; - QString s = editIface->textLine( currentLine ); + TQString spaces; + TQString s = editIface->textLine( currentLine ); uint i=0; while( i<s.length() && s[ i ].isSpace() ){ spaces += s[ i ]; @@ -404,13 +404,13 @@ void AbbrevPart::insertChars( const QString &chars ) } bool foundPipe = false; - QString str; - QTextStream stream( &str, IO_WriteOnly ); - QStringList lines = QStringList::split( "\n", chars ); - QStringList::Iterator it = lines.begin(); + TQString str; + TQTextStream stream( &str, IO_WriteOnly ); + TQStringList lines = TQStringList::split( "\n", chars ); + TQStringList::Iterator it = lines.begin(); line = currentLine; while( it != lines.end() ){ - QString lineText = *it; + TQString lineText = *it; if( it != lines.begin() ){ stream << spaces; if( !foundPipe ) @@ -444,16 +444,16 @@ void AbbrevPart::insertChars( const QString &chars ) viewCursorIface->setCursorPositionReal( currentLine, currentCol ); } -void AbbrevPart::addTemplate( const QString& templ, - const QString& descr, - const QString& suffixes, - const QString& code) +void AbbrevPart::addTemplate( const TQString& templ, + const TQString& descr, + const TQString& suffixes, + const TQString& code) { m_templates.insert(templ, descr, code, suffixes); } -void AbbrevPart::removeTemplate( const QString &suffixes, const QString &name ) +void AbbrevPart::removeTemplate( const TQString &suffixes, const TQString &name ) { m_templates.remove( suffixes, name ); } @@ -502,14 +502,14 @@ void AbbrevPart::slotActivePartChanged( KParts::Part* part ) disconnect( part->widget(), 0, this, 0 ); disconnect( doc, 0, this, 0 ); - connect( part->widget(), SIGNAL(filterInsertString(KTextEditor::CompletionEntry*, QString*)), - this, SLOT(slotFilterInsertString(KTextEditor::CompletionEntry*, QString*)) ); + connect( part->widget(), TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*, TQString*)), + this, TQT_SLOT(slotFilterInsertString(KTextEditor::CompletionEntry*, TQString*)) ); if( autoWordCompletionEnabled() ){ - connect( part->widget(), SIGNAL(completionAborted()), this, SLOT(slotCompletionAborted()) ); - connect( part->widget(), SIGNAL(completionDone()), this, SLOT(slotCompletionDone()) ); - connect( part->widget(), SIGNAL(aboutToShowCompletionBox()), this, SLOT(slotAboutToShowCompletionBox()) ); - connect( doc, SIGNAL(textChanged()), this, SLOT(slotTextChanged()) ); + connect( part->widget(), TQT_SIGNAL(completionAborted()), this, TQT_SLOT(slotCompletionAborted()) ); + connect( part->widget(), TQT_SIGNAL(completionDone()), this, TQT_SLOT(slotCompletionDone()) ); + connect( part->widget(), TQT_SIGNAL(aboutToShowCompletionBox()), this, TQT_SLOT(slotAboutToShowCompletionBox()) ); + connect( doc, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); } m_prevLine = -1; @@ -533,11 +533,11 @@ void AbbrevPart::slotTextChanged() return; } - QString textLine = editIface->textLine( line ); - QChar ch = textLine[ col-1 ]; - QChar currentChar = textLine[ col ]; + TQString textLine = editIface->textLine( line ); + TQChar ch = textLine[ col-1 ]; + TQChar currentChar = textLine[ col ]; - if( currentChar.isLetterOrNumber() || currentChar == QChar('_') || !(ch.isLetterOrNumber() || ch == QChar('_')) ){ + if( currentChar.isLetterOrNumber() || currentChar == TQChar('_') || !(ch.isLetterOrNumber() || ch == TQChar('_')) ){ // reset m_prevLine = -1; return; @@ -551,17 +551,17 @@ void AbbrevPart::slotTextChanged() m_prevColumn = col; } -void AbbrevPart::slotFilterInsertString( KTextEditor::CompletionEntry* entry, QString* text ) +void AbbrevPart::slotFilterInsertString( KTextEditor::CompletionEntry* entry, TQString* text ) { kdDebug(9028) << "AbbrevPart::slotFilterInsertString()" << endl; KParts::ReadWritePart *part = dynamic_cast<KParts::ReadWritePart*>(partController()->activePart()); - QWidget *view = partController()->activeWidget(); + TQWidget *view = partController()->activeWidget(); if (!part || !view) { kdDebug(9028) << "no rw part" << endl; return; } - QString suffix = part->url().url(); + TQString suffix = part->url().url(); int pos = suffix.findRev('.'); if (pos != -1) suffix.remove(0, pos+1); @@ -570,9 +570,9 @@ void AbbrevPart::slotFilterInsertString( KTextEditor::CompletionEntry* entry, QS if( !entry || !text || !viewCursorIface || !editIface ) return; - QString expand( " <abbrev>" ); + TQString expand( " <abbrev>" ); if( !entry->userdata.isNull() && entry->text.endsWith(expand) ){ - QString macro = entry->text.left( entry->text.length() - expand.length() ); + TQString macro = entry->text.left( entry->text.length() - expand.length() ); *text = ""; uint line, col; viewCursorIface->cursorPositionReal( &line, &col ); @@ -614,19 +614,19 @@ CodeTemplateList::~ CodeTemplateList( ) { } -QMap< QString, CodeTemplate * > CodeTemplateList::operator [ ]( QString suffix ) +TQMap< TQString, CodeTemplate * > CodeTemplateList::operator [ ]( TQString suffix ) { kdDebug(9028) << "CodeTemplateList::operator []" << endl; - QMap< QString, CodeTemplate * > selectedTemplates; - for (QMap<QString, QMap<QString, CodeTemplate* > >::const_iterator it = templates.begin(); it != templates.end(); ++it) + TQMap< TQString, CodeTemplate * > selectedTemplates; + for (TQMap<TQString, TQMap<TQString, CodeTemplate* > >::const_iterator it = templates.begin(); it != templates.end(); ++it) { kdDebug(9028) << "CodeTemplateList::operator [] - suffixes " << it.key() << endl; - if (QStringList::split(",", it.key()).contains(suffix)) + if (TQStringList::split(",", it.key()).contains(suffix)) { kdDebug(9028) << "CodeTemplateList::operator [] - suffixes " << it.key() << " contains " << suffix << endl; - QMap<QString, CodeTemplate* > m = it.data(); - for (QMap<QString, CodeTemplate* >::const_iterator itt = m.begin(); itt != m.end(); ++itt) + TQMap<TQString, CodeTemplate* > m = it.data(); + for (TQMap<TQString, CodeTemplate* >::const_iterator itt = m.begin(); itt != m.end(); ++itt) { kdDebug(9028) << "x" << endl; selectedTemplates[itt.key()] = itt.data(); @@ -636,10 +636,10 @@ QMap< QString, CodeTemplate * > CodeTemplateList::operator [ ]( QString suffix ) return selectedTemplates; } -void CodeTemplateList::insert( QString name, QString description, QString code, QString suffixes ) +void CodeTemplateList::insert( TQString name, TQString description, TQString code, TQString suffixes ) { - QString origSuffixes = suffixes; -// QStringList suffixList; + TQString origSuffixes = suffixes; +// TQStringList suffixList; int pos = suffixes.find('('); if (pos == -1) return; @@ -648,7 +648,7 @@ void CodeTemplateList::insert( QString name, QString description, QString code, if (pos == -1) return; suffixes.remove(pos, suffixes.length()-pos); -// suffixList = QStringList::split(",", suffixes); +// suffixList = TQStringList::split(",", suffixes); CodeTemplate *t; if (templates.contains(suffixes) && templates[suffixes].contains(name)) @@ -671,12 +671,12 @@ void CodeTemplateList::insert( QString name, QString description, QString code, m_suffixes.append(origSuffixes); } -QPtrList< CodeTemplate > CodeTemplateList::allTemplates( ) const +TQPtrList< CodeTemplate > CodeTemplateList::allTemplates( ) const { return allCodeTemplates; } -void CodeTemplateList::remove( const QString & suffixes, const QString & name ) +void CodeTemplateList::remove( const TQString & suffixes, const TQString & name ) { allCodeTemplates.remove(templates[suffixes][name]); templates[suffixes].remove(name); @@ -688,7 +688,7 @@ void CodeTemplateList::clear( ) allCodeTemplates.clear(); } -QStringList CodeTemplateList::suffixes( ) +TQStringList CodeTemplateList::suffixes( ) { return m_suffixes; } diff --git a/parts/abbrev/abbrevpart.h b/parts/abbrev/abbrevpart.h index f0029b51..d1c1bc7c 100644 --- a/parts/abbrev/abbrevpart.h +++ b/parts/abbrev/abbrevpart.h @@ -16,8 +16,8 @@ #ifndef _ABBREVPART_H_ #define _ABBREVPART_H_ -#include <qmap.h> -#include <qptrlist.h> +#include <tqmap.h> +#include <tqptrlist.h> #include "kdevplugin.h" #include <ktexteditor/codecompletioninterface.h> @@ -35,10 +35,10 @@ namespace KTextEditor{ } struct CodeTemplate { - QString name; - QString description; - QString code; - QString suffixes; + TQString name; + TQString description; + TQString code; + TQString suffixes; }; class CodeTemplateList { @@ -46,18 +46,18 @@ public: CodeTemplateList(); ~CodeTemplateList(); - QMap<QString, CodeTemplate* > operator[](QString suffix); - void insert(QString name, QString description, QString code, QString suffixes); - void remove(const QString &suffixes, const QString &name); + TQMap<TQString, CodeTemplate* > operator[](TQString suffix); + void insert(TQString name, TQString description, TQString code, TQString suffixes); + void remove(const TQString &suffixes, const TQString &name); void clear(); - QStringList suffixes(); + TQStringList suffixes(); - QPtrList<CodeTemplate> allTemplates() const; + TQPtrList<CodeTemplate> allTemplates() const; private: - QMap<QString, QMap<QString, CodeTemplate* > > templates; - QPtrList<CodeTemplate> allCodeTemplates; - QStringList m_suffixes; + TQMap<TQString, TQMap<TQString, CodeTemplate* > > templates; + TQPtrList<CodeTemplate> allCodeTemplates; + TQStringList m_suffixes; }; class AbbrevPart : public KDevPlugin @@ -65,15 +65,15 @@ class AbbrevPart : public KDevPlugin Q_OBJECT public: - AbbrevPart( QObject *parent, const char *name, const QStringList & ); + AbbrevPart( TQObject *parent, const char *name, const TQStringList & ); ~AbbrevPart(); bool autoWordCompletionEnabled() const; void setAutoWordCompletionEnabled( bool enabled ); - void addTemplate(const QString &templ, const QString &descr, - const QString &suffixes, const QString &code); - void removeTemplate(const QString &suffixes, const QString &name); + void addTemplate(const TQString &templ, const TQString &descr, + const TQString &suffixes, const TQString &code); + void removeTemplate(const TQString &suffixes, const TQString &name); void clearTemplates(); CodeTemplateList templates() const; @@ -85,24 +85,24 @@ private slots: void slotTextChanged(); void slotCompletionAborted(); void slotCompletionDone(); - void slotFilterInsertString( KTextEditor::CompletionEntry*, QString* ); + void slotFilterInsertString( KTextEditor::CompletionEntry*, TQString* ); void slotAboutToShowCompletionBox(); private: void updateActions(); void load(); void save(); - QString currentWord() const; - QValueList<KTextEditor::CompletionEntry> findAllWords(const QString &text, const QString &prefix); - void insertChars( const QString &chars ); -// QAsciiDict<CodeTemplate> m_templates; + TQString currentWord() const; + TQValueList<KTextEditor::CompletionEntry> findAllWords(const TQString &text, const TQString &prefix); + void insertChars( const TQString &chars ); +// TQAsciiDict<CodeTemplate> m_templates; CodeTemplateList m_templates; bool m_inCompletion; int m_prevLine; int m_prevColumn; int m_sequenceLength; bool m_autoWordCompletionEnabled; - QString m_completionFile; + TQString m_completionFile; KTextEditor::Document* docIface; KTextEditor::EditInterface* editIface; diff --git a/parts/abbrev/addtemplatedlg.cpp b/parts/abbrev/addtemplatedlg.cpp index 35342ffe..a837c08a 100644 --- a/parts/abbrev/addtemplatedlg.cpp +++ b/parts/abbrev/addtemplatedlg.cpp @@ -18,17 +18,17 @@ * */ #include "addtemplatedlg.h" -#include <qcombobox.h> +#include <tqcombobox.h> #include <klineedit.h> -#include <qpushbutton.h> +#include <tqpushbutton.h> -AddTemplateDialog::AddTemplateDialog( QStringList suffixesList, QWidget *parent, const char *name ) +AddTemplateDialog::AddTemplateDialog( TQStringList suffixesList, TQWidget *parent, const char *name ) : AddTemplateDialogBase( parent, name ) { setFocusProxy( editTemplate ); comboSuffixes->insertStringList(suffixesList); - connect( editTemplate, SIGNAL(textChanged ( const QString & )), this, SLOT( textChanged())); - connect( editDescription, SIGNAL(textChanged ( const QString & )), this, SLOT( textChanged())); + connect( editTemplate, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT( textChanged())); + connect( editDescription, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT( textChanged())); buttonOk->setEnabled(false); } @@ -41,17 +41,17 @@ void AddTemplateDialog::textChanged() buttonOk->setEnabled( !editTemplate->text().isEmpty() && !editDescription->text().isEmpty() ); } -QString AddTemplateDialog::templ() const +TQString AddTemplateDialog::templ() const { return editTemplate->text(); } -QString AddTemplateDialog::description() const +TQString AddTemplateDialog::description() const { return editDescription->text(); } -QString AddTemplateDialog::suffixes() const +TQString AddTemplateDialog::suffixes() const { return comboSuffixes->currentText(); } diff --git a/parts/abbrev/addtemplatedlg.h b/parts/abbrev/addtemplatedlg.h index 9a20479e..64bcc24e 100644 --- a/parts/abbrev/addtemplatedlg.h +++ b/parts/abbrev/addtemplatedlg.h @@ -28,12 +28,12 @@ class AddTemplateDialog: public AddTemplateDialogBase Q_OBJECT public: - AddTemplateDialog( QStringList suffixesList, QWidget *parent=0, const char *name=0 ); + AddTemplateDialog( TQStringList suffixesList, TQWidget *parent=0, const char *name=0 ); virtual ~AddTemplateDialog(); - QString templ() const; - QString description() const; - QString suffixes() const; + TQString templ() const; + TQString description() const; + TQString suffixes() const; private slots: void textChanged(); }; diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index 816786ff..3d854ba0 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -13,26 +13,26 @@ #include "appwizarddlg.h" -#include <qvbox.h> -#include <qbuttongroup.h> -#include <qcombobox.h> -#include <qtabwidget.h> -#include <qwidgetstack.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qgrid.h> -#include <qheader.h> -#include <qmap.h> -#include <qmultilineedit.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qregexp.h> -#include <qtextstream.h> -#include <qtextview.h> -#include <qtoolbutton.h> -#include <qtooltip.h> -#include <qvalidator.h> -#include <qtimer.h> +#include <tqvbox.h> +#include <tqbuttongroup.h> +#include <tqcombobox.h> +#include <tqtabwidget.h> +#include <tqwidgetstack.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqgrid.h> +#include <tqheader.h> +#include <tqmap.h> +#include <tqmultilineedit.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqregexp.h> +#include <tqtextstream.h> +#include <tqtextview.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> +#include <tqvalidator.h> +#include <tqtimer.h> #include <klistview.h> #include <kiconview.h> #include <kconfig.h> @@ -53,7 +53,7 @@ #include <ktrader.h> #include <kparts/componentfactory.h> #include <kio/netaccess.h> -#include <qfile.h> +#include <tqfile.h> #include <kmacroexpander.h> #include <karchive.h> #include <ktar.h> @@ -61,7 +61,7 @@ #include <kfileitem.h> #include <kio/chmodjob.h> -#include <qlayout.h> +#include <tqlayout.h> #include "domutil.h" #include "kdevversioncontrol.h" @@ -90,7 +90,7 @@ #include "propeditor/propertylist.h" #include "propeditor/propertyeditor.h" -AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const char *name) +AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const char *name) : AppWizardDialogBase(parent, name,true), m_pCurrentAppInfo(0), m_profileSupport(new ProfileSupport(part)) { @@ -98,17 +98,17 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha m_customOptions = 0L; loadLicenses(); - connect( this, SIGNAL( selected( const QString & ) ), this, SLOT( pageChanged() ) ); + connect( this, TQT_SIGNAL( selected( const TQString & ) ), this, TQT_SLOT( pageChanged() ) ); helpButton()->hide(); templates_listview->header()->hide(); - templates_listview->setColumnWidthMode(0, QListView::Maximum); //to provide horiz scrollbar. + templates_listview->setColumnWidthMode(0, TQListView::Maximum); //to provide horiz scrollbar. m_templatesMenu = new KPopupMenu(templates_listview); - m_templatesMenu->insertItem(i18n("&Add to Favorites"), this, SLOT(addTemplateToFavourites())); + m_templatesMenu->insertItem(i18n("&Add to Favorites"), this, TQT_SLOT(addTemplateToFavourites())); m_favouritesMenu = new KPopupMenu(favourites_iconview); - m_favouritesMenu->insertItem(i18n("&Remove Favorite"), this, SLOT(removeFavourite())); + m_favouritesMenu->insertItem(i18n("&Remove Favorite"), this, TQT_SLOT(removeFavourite())); m_pathIsValid=false; m_part = part; @@ -122,15 +122,15 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha //templates_tabwidget->setCurrentPage(config->readNumEntry("CurrentTab", 0)); config->setGroup("General Options"); - QString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", QDir::homeDirPath()+"/"); + TQString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/"); KStandardDirs *dirs = AppWizardFactory::instance()->dirs(); - QStringList m_templateNames = dirs->findAllResources("apptemplates", QString::null, false, true); + TQStringList m_templateNames = dirs->findAllResources("apptemplates", TQString::null, false, true); kdDebug(9010) << "Templates: " << endl; - QStringList categories; + TQStringList categories; - QStringList::Iterator it; + TQStringList::Iterator it; for (it = m_templateNames.begin(); it != m_templateNames.end(); ++it) { kdDebug(9010) << (*it) << endl; @@ -147,10 +147,10 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha info->comment = templateConfig.readEntry("Comment"); info->fileTemplates = templateConfig.readEntry("FileTemplates"); info->openFilesAfterGeneration = templateConfig.readListEntry("ShowFilesAfterGeneration"); - QString destDir = templateConfig.readPathEntry("DefaultDestinatonDir", defaultProjectsDir); - destDir.replace(QRegExp("HOMEDIR"), QDir::homeDirPath()); + TQString destDir = templateConfig.readPathEntry("DefaultDestinatonDir", defaultProjectsDir); + destDir.replace(TQRegExp("HOMEDIR"), TQDir::homeDirPath()); info->defaultDestDir = destDir; - QString category = templateConfig.readEntry("Category"); + TQString category = templateConfig.readEntry("Category"); // format category to a unique status if (category.right(1) == "/") category.remove(category.length()-1, 1); // remove / @@ -161,13 +161,13 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha info->sourceArchive = templateConfig.readEntry("Archive"); // Grab includes list - QStringList groups = templateConfig.groupList(); + TQStringList groups = templateConfig.groupList(); groups.remove("General"); - QStringList::Iterator group = groups.begin(); + TQStringList::Iterator group = groups.begin(); for( ; group != groups.end(); ++group) { templateConfig.setGroup( (*group) ); - QString type = templateConfig.readEntry("Type").lower(); + TQString type = templateConfig.readEntry("Type").lower(); if( type == "include" ) // Add value { info->includes.append( templateConfig.readEntry( "File" ) ); @@ -176,16 +176,16 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha } // Build builtins map to bootstrap. - QString source = kdevRoot( info->templateName ); + TQString source = kdevRoot( info->templateName ); info->subMap.insert("kdevelop", source ); // Add includes to the main template... - QStringList::Iterator include = info->includes.begin(); + TQStringList::Iterator include = info->includes.begin(); for( ; include != info->includes.end(); ++include) { if( !(*include).isEmpty() ) { - QString file = KMacroExpander::expandMacros( ( *include ), info->subMap); + TQString file = KMacroExpander::expandMacros( ( *include ), info->subMap); KConfig tmpCfg( file ); tmpCfg.copyTo( "", &templateConfig); kdDebug(9010) << "Merging: " << tmpCfg.name() << endl; @@ -197,15 +197,15 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha for( ; group != groups.end(); ++group) { templateConfig.setGroup( (*group) ); - QString type = templateConfig.readEntry("Type", "value").lower(); + TQString type = templateConfig.readEntry("Type", "value").lower(); kdDebug(9010) << "Reading " << (*group) << " of type " << type << endl; if( type == "value" ) // Add value { - QString name = templateConfig.readEntry( "Value" ); - QString label = templateConfig.readEntry( "Comment" ); - QString type = templateConfig.readEntry( "ValueType", "String" ); - QVariant::Type variantType = QVariant::nameToType( type.latin1()); - QVariant value = templateConfig.readPropertyEntry( "Default", variantType ); + TQString name = templateConfig.readEntry( "Value" ); + TQString label = templateConfig.readEntry( "Comment" ); + TQString type = templateConfig.readEntry( "ValueType", "String" ); + TQVariant::Type variantType = TQVariant::nameToType( type.latin1()); + TQVariant value = templateConfig.readPropertyEntry( "Default", variantType ); value.cast( variantType ); // fix this in kdelibs... if( !name.isEmpty() && !label.isEmpty() ) info->propValues->addProperty( new PropertyLib::Property( (int)variantType, name, label, value ) ); @@ -245,7 +245,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha } else if( type == "ui") { - QString name = templateConfig.readPathEntry("File"); + TQString name = templateConfig.readPathEntry("File"); info->customUI = name; } else if( type == "message" ) @@ -264,9 +264,9 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha insertCategoryIntoTreeView(*it); // Insert items into list view - QPtrListIterator<ApplicationInfo> ait(m_appsInfo); + TQPtrListIterator<ApplicationInfo> ait(m_appsInfo); for (; ait.current(); ++ait) { - QListViewItem *item = m_categoryMap.find(ait.current()->category); + TQListViewItem *item = m_categoryMap.find(ait.current()->category); if (item) { item = new KListViewItem(item, ait.current()->name); @@ -281,11 +281,11 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha //Load favourites from config populateFavourites(); - QString author, email; + TQString author, email; AppWizardUtil::guessAuthorAndEmail(&author, &email); author_edit->setText(author); email_edit->setText(email); - QToolTip::add( dest_edit->button(), i18n("Choose projects directory") ); + TQToolTip::add( dest_edit->button(), i18n("Choose projects directory") ); dest_edit->setURL(defaultProjectsDir); dest_edit->setMode(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly); @@ -297,20 +297,20 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha setNextEnabled(generalPage, false); -// QRegExp appname_regexp ("[a-zA-Z][a-zA-Z0-9_]*"); //Non-Unicode version +// TQRegExp appname_regexp ("[a-zA-Z][a-zA-Z0-9_]*"); //Non-Unicode version /* appname will start with a letter, and will contain letters, digits or underscores. */ - QRegExp appname_regexp ("[a-zA-Z][a-zA-Z0-9_]*"); + TQRegExp appname_regexp ("[a-zA-Z][a-zA-Z0-9_]*"); // How about names like "__" or "123" for project name? Are they legal? - QRegExpValidator *appname_edit_validator; - appname_edit_validator = new QRegExpValidator (appname_regexp, + TQRegExpValidator *appname_edit_validator; + appname_edit_validator = new TQRegExpValidator (appname_regexp, appname_edit, "AppNameValidator"); appname_edit->setValidator(appname_edit_validator); // insert the licenses into the license_combo - QDict< KDevLicense > lics( licenses() ); - QDictIterator< KDevLicense > dit(lics); + TQDict< KDevLicense > lics( licenses() ); + TQDictIterator< KDevLicense > dit(lics); int idx=1; for( ; dit.current(); ++dit ) { @@ -319,9 +319,9 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha license_combo->setCurrentItem( idx - 1 ); } - connect( license_combo, SIGNAL(activated(int)), this, SLOT(licenseChanged()) ); + connect( license_combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(licenseChanged()) ); - m_custom_options_layout = new QHBoxLayout( custom_options ); + m_custom_options_layout = new TQHBoxLayout( custom_options ); m_custom_options_layout->setAutoAdd(true); showTemplates(false); @@ -347,15 +347,15 @@ void AppWizardDialog::loadVcs() kdDebug(9010) << "AppWizardDialog::loadVcs: creating vcs integrator " << service->name() << endl; - 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(9010) << "There was an error loading the module " << service->name() << endl << "The diagnostics is:" << endl << errorMessage << endl; continue; } - QStringList args; - QObject *obj = factory->create(0, service->name().latin1(), + TQStringList args; + TQObject *obj = factory->create(0, service->name().latin1(), "KDevVCSIntegrator", args); KDevVCSIntegrator *integrator = (KDevVCSIntegrator*) obj; @@ -365,7 +365,7 @@ void AppWizardDialog::loadVcs() { kdDebug(9010) << " success" << endl; - QString vcsName = service->property("X-KDevelop-VCS").toString(); + TQString vcsName = service->property("X-KDevelop-VCS").toString(); m_vcsForm->combo->insertItem(vcsName, i); m_integrators.insert(vcsName, integrator); @@ -373,7 +373,7 @@ void AppWizardDialog::loadVcs() if (vcs) { m_integratorDialogs[i] = vcs; - QWidget *w = vcs->self(); + TQWidget *w = vcs->self(); if (w) m_vcsForm->stack->addWidget(w, i++); else @@ -409,19 +409,19 @@ void AppWizardDialog::textChanged() void AppWizardDialog::licenseChanged() { - QValueList<AppWizardFileTemplate>::Iterator it; + TQValueList<AppWizardFileTemplate>::Iterator it; if( license_combo->currentItem() == 0 ) { for (it = m_fileTemplates.begin(); it != m_fileTemplates.end(); ++it) { - QMultiLineEdit *edit = (*it).edit; - edit->setText( QString::null ); + TQMultiLineEdit *edit = (*it).edit; + edit->setText( TQString::null ); } } else { KDevLicense* lic = licenses()[ license_combo->currentText() ]; for (it = m_fileTemplates.begin(); it != m_fileTemplates.end(); ++it) { - QString style = (*it).style; - QMultiLineEdit *edit = (*it).edit; + TQString style = (*it).style; + TQMultiLineEdit *edit = (*it).edit; KDevFile::CommentingStyle commentStyle = KDevFile::CPPStyle; if (style == "PStyle") { @@ -434,25 +434,25 @@ void AppWizardDialog::licenseChanged() commentStyle = KDevFile::XMLStyle; } - QString text; + TQString text; text = lic->assemble( commentStyle, author_edit->text(), email_edit->text() , 0 ); edit->setText(text); } } } -QString AppWizardDialog::kdevRoot(const QString &templateName ) const +TQString AppWizardDialog::kdevRoot(const TQString &templateName ) const { - QString source; - QFileInfo finfo(templateName); - QDir dir(finfo.dir()); + TQString source; + TQFileInfo finfo(templateName); + TQDir dir(finfo.dir()); dir.cdUp(); return dir.absPath(); } void AppWizardDialog::accept() { - QFileInfo fi(finalLoc_label->text()); + TQFileInfo fi(finalLoc_label->text()); // check /again/ whether the dir already exists; maybe users create it in the meantime if (fi.exists() ) { KMessageBox::sorry(this, i18n("The directory you have chosen as the location for " @@ -463,7 +463,7 @@ void AppWizardDialog::accept() return; } - if( !QFileInfo(dest_edit->url()).isWritable() ){ + if( !TQFileInfo(dest_edit->url()).isWritable() ){ KMessageBox::sorry(this, i18n("The directory you have chosen as the location for " "the project is not writeable.")); showPage(generalPage); @@ -472,7 +472,7 @@ void AppWizardDialog::accept() return; } - QString source = kdevRoot( m_pCurrentAppInfo->templateName ); + TQString source = kdevRoot( m_pCurrentAppInfo->templateName ); // Unpack template archive to temp dir, and get the name kdDebug(9010) << "Unpacking archive to temp dir" << endl; @@ -503,18 +503,18 @@ void AppWizardDialog::accept() m_pCurrentAppInfo->subMap.insert("dest", finalLoc_label->text() ); m_pCurrentAppInfo->subMap.insert("APPNAME", appname_edit->text() ); m_pCurrentAppInfo->subMap.insert("APPNAMELC", appname_edit->text().lower() ); - m_pCurrentAppInfo->subMap.insert("APPNAMESC", QString(appname_edit->text()[0]).upper() + appname_edit->text().mid(1)); + m_pCurrentAppInfo->subMap.insert("APPNAMESC", TQString(appname_edit->text()[0]).upper() + appname_edit->text().mid(1)); m_pCurrentAppInfo->subMap.insert("APPNAMEUC", appname_edit->text().upper() ); m_pCurrentAppInfo->subMap.insert("AUTHOR", author_edit->text() ); m_pCurrentAppInfo->subMap.insert("EMAIL", email_edit->text() ); m_pCurrentAppInfo->subMap.insert("VERSION", version_edit->text()); m_pCurrentAppInfo->subMap.insert( "I18N", "i18n" ); - m_pCurrentAppInfo->subMap.insert("YEAR", QString::number( QDate::currentDate().year() ) ); + m_pCurrentAppInfo->subMap.insert("YEAR", TQString::number( TQDate::currentDate().year() ) ); // This isn't too pretty, but we have several templates that use KAboutData::License_${LICENSE} // and unsurprisingly, KAboutData doesn't cover every imaginable case. // These are the licenses known to KDE-3.2 KAboutData, KDevelop doesn't have all of these as prepared options today - QString license = license_combo->currentText(); + TQString license = license_combo->currentText(); if ( license == "GPL" || license == "GPL_V2" || license == "LGPL" || license == "LGPL_V2"|| license == "BSD" || license == "NCSA" || license == "MIT" || license == "Artistic" || license == "QPL" || license == "QPL_V1_0" ) @@ -527,7 +527,7 @@ void AppWizardDialog::accept() } - QStringList cleanUpSubstMap; + TQStringList cleanUpSubstMap; cleanUpSubstMap << "src" << "I18N" << "kdevelop"; @@ -542,37 +542,37 @@ void AppWizardDialog::accept() m_pCurrentAppInfo->dirList.prepend( baseDir ); // This is too silly for words, but it's either this or reimplementing FileTemplate - QString tempProjectDomSource = "<!DOCTYPE kdevelop><kdevelop><general><author>%1</author><email>%2</email><version>%3</version></general></kdevelop>"; + TQString tempProjectDomSource = "<!DOCTYPE kdevelop><kdevelop><general><author>%1</author><email>%2</email><version>%3</version></general></kdevelop>"; tempProjectDomSource = tempProjectDomSource.arg( author_edit->text() ).arg( email_edit->text() ).arg( version_edit->text() ); - QDomDocument tempProjectDom; + TQDomDocument tempProjectDom; tempProjectDom.setContent( tempProjectDomSource ); - QValueList<AppWizardFileTemplate>::Iterator it; + TQValueList<AppWizardFileTemplate>::Iterator it; for (it = m_fileTemplates.begin(); it != m_fileTemplates.end(); ++it) { KTempFile *tempFile = new KTempFile(); m_tempFiles.append(tempFile); - QString templateText( FileTemplate::makeSubstitutions( tempProjectDom, (*it).edit->text() ) ); - QFile f; + TQString templateText( FileTemplate::makeSubstitutions( tempProjectDom, (*it).edit->text() ) ); + TQFile f; f.open(IO_WriteOnly, tempFile->handle()); - QTextStream temps(&f); - temps.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream temps(&f); + temps.setEncoding(TQTextStream::UnicodeUTF8); temps << templateText; f.flush(); - QString templateName( QString( "%1_TEMPLATE" ).arg( (*it).suffix ).upper() ); + TQString templateName( TQString( "%1_TEMPLATE" ).arg( (*it).suffix ).upper() ); cleanUpSubstMap << templateName; m_pCurrentAppInfo->subMap.insert( templateName, KMacroExpander::expandMacros(templateText , m_pCurrentAppInfo->subMap) ); installFile file; file.source = tempFile->name(); - file.dest = QString( "%{dest}/templates/%1" ).arg( (*it).suffix ); + file.dest = TQString( "%{dest}/templates/%1" ).arg( (*it).suffix ); file.process = true; file.isXML = false; m_pCurrentAppInfo->fileList.append( file ); } // Add license file to the file list - QString licenseFile, licenseName = i18n("Custom"); + TQString licenseFile, licenseName = i18n("Custom"); if( license_combo->currentItem() != 0 ) { @@ -580,13 +580,13 @@ void AppWizardDialog::accept() KDevLicense* lic = licenses()[ licenseName ]; if( lic ) { - QStringList files( lic->copyFiles() ); - QStringList::Iterator it = files.begin(); + TQStringList files( lic->copyFiles() ); + TQStringList::Iterator it = files.begin(); for( ; it != files.end(); ++it ) { installFile file; - file.source = QString( "%{kdevelop}/template-common/%1" ).arg( *it ); - file.dest = QString("%{dest}/%1").arg( *it ); + file.source = TQString( "%{kdevelop}/template-common/%1" ).arg( *it ); + file.dest = TQString("%{dest}/%1").arg( *it ); file.process = true; file.isXML = false; m_pCurrentAppInfo->fileList.append( file ); @@ -597,7 +597,7 @@ void AppWizardDialog::accept() } // Run macro expander on both the dir map and file maps - QValueList<installFile>::Iterator fileIt = m_pCurrentAppInfo->fileList.begin(); + TQValueList<installFile>::Iterator fileIt = m_pCurrentAppInfo->fileList.begin(); for( ; fileIt != m_pCurrentAppInfo->fileList.end(); ++fileIt) { (*fileIt).source = KMacroExpander::expandMacros((*fileIt).source , m_pCurrentAppInfo->subMap); @@ -605,14 +605,14 @@ void AppWizardDialog::accept() (*fileIt).dest = KMacroExpander::expandMacros((*fileIt).dest , m_pCurrentAppInfo->subMap); } - QValueList<installArchive>::Iterator archIt = m_pCurrentAppInfo->archList.begin(); + TQValueList<installArchive>::Iterator archIt = m_pCurrentAppInfo->archList.begin(); for( ; archIt != m_pCurrentAppInfo->archList.end(); ++archIt) { (*archIt).source = KMacroExpander::expandMacros((*archIt).source , m_pCurrentAppInfo->subMap); (*archIt).dest = KMacroExpander::expandMacros((*archIt).dest , m_pCurrentAppInfo->subMap); } - QValueList<installDir>::Iterator dirIt = m_pCurrentAppInfo->dirList.begin(); + TQValueList<installDir>::Iterator dirIt = m_pCurrentAppInfo->dirList.begin(); for( ; dirIt != m_pCurrentAppInfo->dirList.end(); ++dirIt) { (*dirIt).dir = KMacroExpander::expandMacros((*dirIt).dir , m_pCurrentAppInfo->subMap); @@ -626,10 +626,10 @@ void AppWizardDialog::accept() m_pCurrentAppInfo->finishCmdDir, m_pCurrentAppInfo->subMap ); } - QMap<QString,QString>::Iterator mapIt( m_pCurrentAppInfo->subMap.begin() ); + TQMap<TQString,TQString>::Iterator mapIt( m_pCurrentAppInfo->subMap.begin() ); for( ; mapIt != m_pCurrentAppInfo->subMap.end(); ++mapIt ) { - QString escaped( mapIt.data() ); + TQString escaped( mapIt.data() ); escaped.replace( "&", "&" ); escaped.replace( "<", "<" ); escaped.replace( ">", ">" ); @@ -698,7 +698,7 @@ void AppWizardDialog::accept() // KMessageBox::information(this, KMacroExpander::expandMacros(m_pCurrentAppInfo->message, m_pCurrentAppInfo->subMap)); - QStringList::Iterator cleanIt = cleanUpSubstMap.begin(); + TQStringList::Iterator cleanIt = cleanUpSubstMap.begin(); for(;cleanIt != cleanUpSubstMap.end(); ++cleanIt ) { m_pCurrentAppInfo->subMap.remove( *cleanIt ); @@ -737,7 +737,7 @@ void AppWizardDialog::accept() kdDebug(9010) << "vcs integrator wasn't selected" << endl; openAfterGeneration(); - QWizard::accept(); + TQWizard::accept(); } bool AppWizardDialog::copyFile( const installFile& file ) @@ -751,23 +751,23 @@ bool AppWizardDialog::copyFile( const installFile& file ) #include <sys/stat.h> #include <unistd.h> -bool AppWizardDialog::copyFile( const QString &source, const QString &dest, bool isXML, bool process ) +bool AppWizardDialog::copyFile( const TQString &source, const TQString &dest, bool isXML, bool process ) { kdDebug( 9010 ) << "Copy: " << source << " to " << dest << endl; if( process ) { // Process the file and save it at the destFile location - QFile inputFile( source); - QFile outputFile( dest ); + TQFile inputFile( source); + TQFile outputFile( dest ); - const QMap<QString,QString> &subMap = isXML ? + const TQMap<TQString,TQString> &subMap = isXML ? m_pCurrentAppInfo->subMapXML : m_pCurrentAppInfo->subMap; if( inputFile.open( IO_ReadOnly ) && outputFile.open(IO_WriteOnly) ) { - QTextStream input( &inputFile ); - input.setEncoding(QTextStream::UnicodeUTF8); - QTextStream output( &outputFile ); - output.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream input( &inputFile ); + input.setEncoding(TQTextStream::UnicodeUTF8); + TQTextStream output( &outputFile ); + output.setEncoding(TQTextStream::UnicodeUTF8); while( !input.atEnd() ) output << KMacroExpander::expandMacros(input.readLine(), subMap) << "\n"; // Preserve file mode... @@ -791,16 +791,16 @@ bool AppWizardDialog::copyFile( const QString &source, const QString &dest, bool return true; } -void AppWizardDialog::unpackArchive( const KArchiveDirectory *dir, const QString &dest, bool process ) +void AppWizardDialog::unpackArchive( const KArchiveDirectory *dir, const TQString &dest, bool process ) { KIO::NetAccess::mkdir( dest , this ); kdDebug(9010) << "Dir : " << dir->name() << " at " << dest << endl; - QStringList entries = dir->entries(); + TQStringList entries = dir->entries(); kdDebug(9010) << "Entries : " << entries.join(",") << endl; KTempDir tdir; - QStringList::Iterator entry = entries.begin(); + TQStringList::Iterator entry = entries.begin(); for( ; entry != entries.end(); ++entry ) { @@ -822,7 +822,7 @@ void AppWizardDialog::unpackArchive( const KArchiveDirectory *dir, const QString file->copyTo(tdir.name()); // assume that an archive does not contain XML files // ( where should we currently get that info from? ) - if ( !copyFile( QDir::cleanDirPath(tdir.name()+"/"+file->name()), dest + "/" + file->name(), false, process ) ) + if ( !copyFile( TQDir::cleanDirPath(tdir.name()+"/"+file->name()), dest + "/" + file->name(), false, process ) ) { KMessageBox::sorry(this, i18n("The file %1 cannot be created.").arg( dest) ); return; @@ -834,14 +834,14 @@ void AppWizardDialog::unpackArchive( const KArchiveDirectory *dir, const QString tdir.unlink(); } -void AppWizardDialog::templatesTreeViewClicked(QListViewItem *item) +void AppWizardDialog::templatesTreeViewClicked(TQListViewItem *item) { if( m_customOptions ) delete m_customOptions; // Delete old file template pages while (!m_fileTemplates.isEmpty()) { - QMultiLineEdit *edit = m_fileTemplates.first().edit; + TQMultiLineEdit *edit = m_fileTemplates.first().edit; removePage(edit); delete edit; m_fileTemplates.remove(m_fileTemplates.begin()); @@ -852,10 +852,10 @@ void AppWizardDialog::templatesTreeViewClicked(QListViewItem *item) if (info) { m_pCurrentAppInfo = info; if (!info->icon.isEmpty()) { - QFileInfo fi(info->templateName); - QDir dir(fi.dir()); + TQFileInfo fi(info->templateName); + TQDir dir(fi.dir()); dir.cdUp(); - QPixmap pm; + TQPixmap pm; pm.load(dir.filePath(info->icon)); icon_label->setPixmap(pm); } else { @@ -872,11 +872,11 @@ void AppWizardDialog::templatesTreeViewClicked(QListViewItem *item) // Create new file template pages - QStringList l = QStringList::split(",", info->fileTemplates); + TQStringList l = TQStringList::split(",", info->fileTemplates); if (l.empty()) //if the app template doesn't show file templates, we need to set another m_lastPage, aleXXX m_lastPage=m_vcsForm; - QStringList::ConstIterator it = l.begin(); + TQStringList::ConstIterator it = l.begin(); while (it != l.end()) { AppWizardFileTemplate fileTemplate; fileTemplate.suffix = *it; @@ -887,8 +887,8 @@ void AppWizardDialog::templatesTreeViewClicked(QListViewItem *item) } else fileTemplate.style = ""; - QMultiLineEdit *edit = new QMultiLineEdit(this); - edit->setWordWrap(QTextEdit::NoWrap); + TQMultiLineEdit *edit = new TQMultiLineEdit(this); + edit->setWordWrap(TQTextEdit::NoWrap); edit->setFont(KGlobalSettings::fixedFont()); if (it == l.end()) m_lastPage = edit; @@ -908,15 +908,15 @@ void AppWizardDialog::templatesTreeViewClicked(QListViewItem *item) } -void AppWizardDialog::destButtonClicked(const QString& dir) +void AppWizardDialog::destButtonClicked(const TQString& dir) { if(!dir.isEmpty()) { // set new location as default project dir? KConfig *config = kapp->config(); config->setGroup("General Options"); - QDir defPrjDir( config->readPathEntry("DefaultProjectsDir", QDir::homeDirPath()) ); - QDir newDir (dir); + TQDir defPrjDir( config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()) ); + TQDir newDir (dir); kdDebug(9010) << "DevPrjDir == newdir?: " << defPrjDir.absPath() << " == " << newDir.absPath() << endl; if (defPrjDir != newDir) { if (KMessageBox::questionYesNo(this, i18n("Set default project location to: %1?").arg( newDir.absPath() ), @@ -941,8 +941,8 @@ void AppWizardDialog::projectLocationChanged() // Jakob Simon-Gaarde: Got tired of the anoying bug with the appname/location confussion. // This version insures WYSIWYG and checks pathvalidity finalLoc_label->setText(dest_edit->url() + (dest_edit->url().right(1)=="/" ? "":"/") + appname_edit->text()); - QDir qd(dest_edit->url()); - QFileInfo fi(dest_edit->url() + "/" + appname_edit->text()); + TQDir qd(dest_edit->url()); + TQFileInfo fi(dest_edit->url() + "/" + appname_edit->text()); if (!qd.exists() || appname_edit->displayText().isEmpty()||fi.exists()) { if (!fi.exists() || appname_edit->displayText().isEmpty()) { @@ -958,17 +958,17 @@ void AppWizardDialog::projectLocationChanged() } -void AppWizardDialog::insertCategoryIntoTreeView(const QString &completeCategoryPath) +void AppWizardDialog::insertCategoryIntoTreeView(const TQString &completeCategoryPath) { kdDebug(9010) << "TemplateCategory: " << completeCategoryPath << endl; - QStringList categories = QStringList::split("/", completeCategoryPath); - QString category =""; - QListViewItem* pParentItem=0; + TQStringList categories = TQStringList::split("/", completeCategoryPath); + TQString category =""; + TQListViewItem* pParentItem=0; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = categories.begin(); it != categories.end(); ++it) { category = category + "/" + *it; - QListViewItem *item = m_categoryMap.find(category); + TQListViewItem *item = m_categoryMap.find(category); if (!item) { // not found, create it if (!pParentItem) pParentItem = new KListViewItem(templates_listview,*it); @@ -987,9 +987,9 @@ void AppWizardDialog::insertCategoryIntoTreeView(const QString &completeCategory } -ApplicationInfo *AppWizardDialog::templateForItem(QListViewItem *item) +ApplicationInfo *AppWizardDialog::templateForItem(TQListViewItem *item) { - QPtrListIterator<ApplicationInfo> it(m_appsInfo); + TQPtrListIterator<ApplicationInfo> it(m_appsInfo); for (; it.current(); ++it) if (it.current()->item == item) return it.current(); @@ -999,16 +999,16 @@ ApplicationInfo *AppWizardDialog::templateForItem(QListViewItem *item) void AppWizardDialog::openAfterGeneration() { - QString projectFile( finalLoc_label->text() + "/" + appname_edit->text().lower() + ".kdevelop" ); + TQString projectFile( finalLoc_label->text() + "/" + appname_edit->text().lower() + ".kdevelop" ); // Read the DOM of the newly created project - QFile file( projectFile ); + TQFile file( projectFile ); if( !file.open( IO_ReadOnly ) ) return; - QDomDocument projectDOM; + TQDomDocument projectDOM; int errorLine, errorCol; - QString errorMsg; + TQString errorMsg; bool success = projectDOM.setContent( &file, &errorMsg, &errorLine, &errorCol); file.close(); if ( !success ) @@ -1023,7 +1023,7 @@ void AppWizardDialog::openAfterGeneration() DomUtil::writeMapEntry( projectDOM, "substmap", m_pCurrentAppInfo->subMap ); //save the selected vcs - KTrader::OfferList offers = KTrader::self()->query("KDevelop/VCSIntegrator", QString("[X-KDevelop-VCS]=='%1'").arg(m_vcsForm->combo->currentText())); + KTrader::OfferList offers = KTrader::self()->query("KDevelop/VCSIntegrator", TQString("[X-KDevelop-VCS]=='%1'").arg(m_vcsForm->combo->currentText())); if (offers.count() == 1) { KService::Ptr service = offers.first(); @@ -1031,11 +1031,11 @@ void AppWizardDialog::openAfterGeneration() } // figure out what plugins we should disable by default - QString profileName = DomUtil::readEntry( projectDOM, "general/profile" ); + TQString profileName = DomUtil::readEntry( projectDOM, "general/profile" ); if ( profileName.isEmpty() ) { - QString language = DomUtil::readEntry( projectDOM, "general/primarylanguage" ); - QStringList keywords = DomUtil::readListEntry( projectDOM, "general/keywords", "keyword" ); + TQString language = DomUtil::readEntry( projectDOM, "general/primarylanguage" ); + TQStringList keywords = DomUtil::readListEntry( projectDOM, "general/keywords", "keyword" ); profileName = Settings::profileByAttributes( language, keywords ); } @@ -1043,14 +1043,14 @@ void AppWizardDialog::openAfterGeneration() ProfileEngine & engine = m_part->pluginController()->engine(); Profile * profile = engine.findProfile( profileName ); - QStringList disableList; + TQStringList disableList; Profile::EntryList disableEntryList = profile->list( Profile::ExplicitDisable ); for ( Profile::EntryList::const_iterator it = disableEntryList.constBegin(); it != disableEntryList.constEnd(); ++it ) { disableList << (*it).name; } - QStringList projectIgnoreparts = DomUtil::readListEntry( projectDOM, "/general/ignoreparts", "part" ); + TQStringList projectIgnoreparts = DomUtil::readListEntry( projectDOM, "/general/ignoreparts", "part" ); projectIgnoreparts += disableList; DomUtil::writeListEntry( projectDOM, "/general/ignoreparts", "part", projectIgnoreparts ); @@ -1059,8 +1059,8 @@ void AppWizardDialog::openAfterGeneration() // write the dom back if( !file.open( IO_WriteOnly ) ) return; - QTextStream ts( &file ); - ts.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream ts( &file ); + ts.setEncoding(TQTextStream::UnicodeUTF8); ts << projectDOM.toString(2); file.close(); @@ -1071,10 +1071,10 @@ void AppWizardDialog::openAfterGeneration() // timer to queue opening (so that files will not be opened before the project // which is also queued by ProjectManager ) KURL::List urlsToOpen; - QStringList::Iterator it = m_pCurrentAppInfo->openFilesAfterGeneration.begin(); + TQStringList::Iterator it = m_pCurrentAppInfo->openFilesAfterGeneration.begin(); for( ; it != m_pCurrentAppInfo->openFilesAfterGeneration.end(); ++it ) { - QString fileName( *it ); + TQString fileName( *it ); if ( !fileName.isNull() ) { fileName = KMacroExpander::expandMacros(fileName, m_pCurrentAppInfo->subMap); @@ -1093,7 +1093,7 @@ void AppWizardDialog::pageChanged() //it is possible that project name was changed - we need to update all vcs integrator dialogs - for (QMap<int, VCSDialog*>::iterator it = m_integratorDialogs.begin(); + for (TQMap<int, VCSDialog*>::iterator it = m_integratorDialogs.begin(); it != m_integratorDialogs.end(); ++it) (*it)->init(getProjectName(), getProjectLocation()); } @@ -1103,7 +1103,7 @@ void AppWizardDialog::addTemplateToFavourites() addFavourite(templates_listview->currentItem()); } -void AppWizardDialog::addFavourite(QListViewItem* item, QString favouriteName) +void AppWizardDialog::addFavourite(TQListViewItem* item, TQString favouriteName) { if(item->childCount()) return; @@ -1120,9 +1120,9 @@ void AppWizardDialog::addFavourite(QListViewItem* item, QString favouriteName) } } -ApplicationInfo* AppWizardDialog::findFavouriteInfo(QIconViewItem* item) +ApplicationInfo* AppWizardDialog::findFavouriteInfo(TQIconViewItem* item) { - QPtrListIterator<ApplicationInfo> info(m_appsInfo); + TQPtrListIterator<ApplicationInfo> info(m_appsInfo); for (; info.current(); ++info) if (info.current()->favourite == item) return info.current(); @@ -1130,7 +1130,7 @@ ApplicationInfo* AppWizardDialog::findFavouriteInfo(QIconViewItem* item) return 0; } -void AppWizardDialog::favouritesIconViewClicked( QIconViewItem* item) +void AppWizardDialog::favouritesIconViewClicked( TQIconViewItem* item) { ApplicationInfo* info = findFavouriteInfo(item); templatesTreeViewClicked(info->item); @@ -1138,10 +1138,10 @@ void AppWizardDialog::favouritesIconViewClicked( QIconViewItem* item) void AppWizardDialog::removeFavourite() { - QIconViewItem* curFavourite = favourites_iconview->currentItem(); + TQIconViewItem* curFavourite = favourites_iconview->currentItem(); //remove reference to favourite from associated appinfo - QPtrListIterator<ApplicationInfo> info(m_appsInfo); + TQPtrListIterator<ApplicationInfo> info(m_appsInfo); for (; info.current(); ++info) { if(info.current()->favourite && info.current()->favourite == curFavourite) @@ -1163,14 +1163,14 @@ void AppWizardDialog::populateFavourites() //favourites are stored in config as a list of templates and a seperate //list of icon names. - QStringList templatesList = config->readPathListEntry("FavTemplates"); - QStringList iconNamesList = config->readListEntry("FavNames"); + TQStringList templatesList = config->readPathListEntry("FavTemplates"); + TQStringList iconNamesList = config->readListEntry("FavNames"); - QStringList::Iterator curTemplate = templatesList.begin(); - QStringList::Iterator curIconName = iconNamesList.begin(); + TQStringList::Iterator curTemplate = templatesList.begin(); + TQStringList::Iterator curIconName = iconNamesList.begin(); while(curTemplate != templatesList.end()) { - QPtrListIterator<ApplicationInfo> info(m_appsInfo); + TQPtrListIterator<ApplicationInfo> info(m_appsInfo); for (; info.current(); ++info) { if(info.current()->templateName == *curTemplate) @@ -1190,11 +1190,11 @@ void AppWizardDialog::done(int r) //it's icon name. We have a one list for the templates //and one for the names. - QStringList templatesList; - QStringList iconNamesList; + TQStringList templatesList; + TQStringList iconNamesList; //Built the stringlists for each template that has a favourite. - QPtrListIterator<ApplicationInfo> it(m_appsInfo); + TQPtrListIterator<ApplicationInfo> it(m_appsInfo); for (; it.current(); ++it) { if(it.current()->favourite) @@ -1211,24 +1211,24 @@ void AppWizardDialog::done(int r) //config->writeEntry("CurrentTab", templates_tabwidget->currentPageIndex()); config->sync(); - QDialog::done(r); + TQDialog::done(r); } -void AppWizardDialog::templatesContextMenu(QListViewItem* item, const QPoint& point, int) +void AppWizardDialog::templatesContextMenu(TQListViewItem* item, const TQPoint& point, int) { if(item && !item->childCount()) m_templatesMenu->popup(point); } -void AppWizardDialog::favouritesContextMenu(QIconViewItem* item, const QPoint& point) +void AppWizardDialog::favouritesContextMenu(TQIconViewItem* item, const TQPoint& point) { if(item) m_favouritesMenu->popup(point); } -void AppWizardDialog::setPermissions(const KArchiveFile *source, QString dest) +void AppWizardDialog::setPermissions(const KArchiveFile *source, TQString dest) { - kdDebug(9010) << "AppWizardDialog::setPermissions(const KArchiveFile *source, QString dest)" << endl; + kdDebug(9010) << "AppWizardDialog::setPermissions(const KArchiveFile *source, TQString dest)" << endl; kdDebug(9010) << " dest: " << dest << endl; if (source->permissions() & 00100) @@ -1273,7 +1273,7 @@ void AppWizardDialog::setPermissions(const installFile &file) } } -QDict<KDevLicense> AppWizardDialog::licenses() +TQDict<KDevLicense> AppWizardDialog::licenses() { return m_licenses; } @@ -1283,14 +1283,14 @@ void AppWizardDialog::loadLicenses() // kdDebug(9010) << "======================== Entering loadLicenses" << endl; KStandardDirs* dirs = KGlobal::dirs(); dirs->addResourceType( "licenses", KStandardDirs::kde_default( "data" ) + "kdevelop/licenses/" ); - QStringList licNames = dirs->findAllResources( "licenses", QString::null, false, true ); + TQStringList licNames = dirs->findAllResources( "licenses", TQString::null, false, true ); - QStringList::Iterator it; + TQStringList::Iterator it; for (it = licNames.begin(); it != licNames.end(); ++it) { - QString licPath( dirs->findResource( "licenses", *it ) ); + TQString licPath( dirs->findResource( "licenses", *it ) ); kdDebug(9010) << "Loading license file: " << licPath << endl; - QString licName = licPath.mid( licPath.findRev('/') + 1 ); + TQString licName = licPath.mid( licPath.findRev('/') + 1 ); KDevLicense* lic = new KDevLicense( licName, licPath ); m_licenses.insert( licName, lic ); } @@ -1301,7 +1301,7 @@ void AppWizardDialog::showTemplates(bool all) { if (all) { - QListViewItemIterator it(templates_listview); + TQListViewItemIterator it(templates_listview); while ( it.current() ) { it.current()->setVisible(true); ++it; @@ -1309,19 +1309,19 @@ void AppWizardDialog::showTemplates(bool all) } else { - QPtrListIterator<ApplicationInfo> ait(m_appsInfo); + TQPtrListIterator<ApplicationInfo> ait(m_appsInfo); for (; ait.current(); ++ait) { ait.current()->item->setVisible(m_profileSupport->isInTemplateList(ait.current()->templateName)); } - QDictIterator<QListViewItem> dit(m_categoryMap); + TQDictIterator<TQListViewItem> dit(m_categoryMap); for (; dit.current(); ++dit) { //checking whether all children are not visible kdDebug(9010) << "check: " << dit.current()->text(0) << endl; bool visible = false; - QListViewItemIterator it(dit.current()); + TQListViewItemIterator it(dit.current()); while ( it.current() ) { if ((it.current()->childCount() == 0) && it.current()->isVisible()) { @@ -1337,9 +1337,9 @@ void AppWizardDialog::showTemplates(bool all) } } -void AppWizardDialog::checkAndHideItems(QListView *view) +void AppWizardDialog::checkAndHideItems(TQListView *view) { - QListViewItem *item = view->firstChild(); + TQListViewItem *item = view->firstChild(); while (item) { if (!m_categoryItems.contains(item)) @@ -1349,11 +1349,11 @@ void AppWizardDialog::checkAndHideItems(QListView *view) } } -bool AppWizardDialog::checkAndHideItems(QListViewItem *item) +bool AppWizardDialog::checkAndHideItems(TQListViewItem *item) { if (!m_categoryItems.contains(item)) return !item->isVisible(); - QListViewItem *child = item->firstChild(); + TQListViewItem *child = item->firstChild(); bool hide = true; while (child) { diff --git a/parts/appwizard/appwizarddlg.h b/parts/appwizard/appwizarddlg.h index 7ce8c2ff..d69d069c 100644 --- a/parts/appwizard/appwizarddlg.h +++ b/parts/appwizard/appwizarddlg.h @@ -25,11 +25,11 @@ class QHBoxLayout; class KArchiveDirectory; class KArchiveFile; class ProfileSupport; -#include <qptrlist.h> -#include <qdict.h> +#include <tqptrlist.h> +#include <tqdict.h> #include <klineedit.h> -#include <qlabel.h> -#include <qstringlist.h> +#include <tqlabel.h> +#include <tqstringlist.h> #include <klistview.h> #include <kiconview.h> #include "kdevversioncontrol.h" @@ -46,60 +46,60 @@ namespace PropertyLib { struct installFile { - QString source; - QString dest; - QString option; + TQString source; + TQString dest; + TQString option; bool process; bool isXML; }; struct installArchive { - QString source; - QString dest; - QString option; + TQString source; + TQString dest; + TQString option; bool process; }; struct installDir { - QString dir; - QString option; + TQString dir; + TQString option; int perms; }; struct ApplicationInfo { - QString templateName; - QString name; - QString comment; - QString icon; - QString category; - QString defaultDestDir; - QString fileTemplates; - QStringList openFilesAfterGeneration; - QString templateFile; - QMap<QString,QString> subMap; - QMap<QString,QString> subMapXML; - QStringList includes; - - //QMap<autoKey,QVariant> subValues; + TQString templateName; + TQString name; + TQString comment; + TQString icon; + TQString category; + TQString defaultDestDir; + TQString fileTemplates; + TQStringList openFilesAfterGeneration; + TQString templateFile; + TQMap<TQString,TQString> subMap; + TQMap<TQString,TQString> subMapXML; + TQStringList includes; + + //TQMap<autoKey,TQVariant> subValues; PropertyLib::PropertyList *propValues; - QValueList<installFile> fileList; - QValueList<installArchive> archList; - QValueList<installDir> dirList; - QString customUI; - QString message; - QString finishCmd; - QString finishCmdDir; - QString sourceArchive; + TQValueList<installFile> fileList; + TQValueList<installArchive> archList; + TQValueList<installDir> dirList; + TQString customUI; + TQString message; + TQString finishCmd; + TQString finishCmdDir; + TQString sourceArchive; //! item pointer to the listview - QListViewItem *item; + TQListViewItem *item; //! pointer to favourite icon (NULL if there isn't one) - QIconViewItem *favourite; + TQIconViewItem *favourite; ApplicationInfo() : item( 0 ), favourite( 0 ) @@ -108,9 +108,9 @@ struct ApplicationInfo struct AppWizardFileTemplate { - QString suffix; - QString style; - QMultiLineEdit *edit; + TQString suffix; + TQString style; + TQMultiLineEdit *edit; AppWizardFileTemplate() : edit( 0 ) @@ -123,27 +123,27 @@ class AppWizardDialog : public AppWizardDialogBase Q_OBJECT public: - AppWizardDialog( AppWizardPart *part, QWidget *parent=0, const char *name=0 ); + AppWizardDialog( AppWizardPart *part, TQWidget *parent=0, const char *name=0 ); ~AppWizardDialog(); - QString getProjectName() { return appname_edit->text(); } - QString getProjectLocation() { return finalLoc_label->text(); } + TQString getProjectName() { return appname_edit->text(); } + TQString getProjectLocation() { return finalLoc_label->text(); } protected: virtual void accept(); - virtual QDict<KDevLicense> licenses(); + virtual TQDict<KDevLicense> licenses(); void loadLicenses(); protected slots: - virtual void templatesTreeViewClicked(QListViewItem*); + virtual void templatesTreeViewClicked(TQListViewItem*); virtual void textChanged(); virtual void licenseChanged(); - virtual void destButtonClicked(const QString&); + virtual void destButtonClicked(const TQString&); virtual void projectNameChanged(); virtual void projectLocationChanged(); - virtual void favouritesIconViewClicked( QIconViewItem * ); - virtual void templatesContextMenu(QListViewItem*, const QPoint&, int); - virtual void favouritesContextMenu(QIconViewItem* item, const QPoint& point); + virtual void favouritesIconViewClicked( TQIconViewItem * ); + virtual void templatesContextMenu(TQListViewItem*, const TQPoint&, int); + virtual void favouritesContextMenu(TQIconViewItem* item, const TQPoint& point); virtual void addTemplateToFavourites(); virtual void done(int r); virtual void removeFavourite(); @@ -151,42 +151,42 @@ protected slots: private: //methods - ApplicationInfo *templateForItem(QListViewItem *item); - void insertCategoryIntoTreeView(const QString &completeCategoryPath); + ApplicationInfo *templateForItem(TQListViewItem *item); + void insertCategoryIntoTreeView(const TQString &completeCategoryPath); void loadVcs(); void updateNextButtons(); void populateFavourites(); - void addFavourite(QListViewItem* item, QString favouriteName=""); - ApplicationInfo* findFavouriteInfo(QIconViewItem* item); + void addFavourite(TQListViewItem* item, TQString favouriteName=""); + ApplicationInfo* findFavouriteInfo(TQIconViewItem* item); - void unpackArchive( const KArchiveDirectory *dir, const QString &dest, bool process ); + void unpackArchive( const KArchiveDirectory *dir, const TQString &dest, bool process ); bool copyFile( const installFile& file ); - bool copyFile( const QString &source, const QString &dest, bool isXML, bool process ); - QString kdevRoot(const QString &templateName ) const; + bool copyFile( const TQString &source, const TQString &dest, bool isXML, bool process ); + TQString kdevRoot(const TQString &templateName ) const; void openAfterGeneration(); - void setPermissions(const KArchiveFile *source, QString dest); + void setPermissions(const KArchiveFile *source, TQString dest); void setPermissions(const installFile &file); - void checkAndHideItems(QListView *view); - bool checkAndHideItems(QListViewItem *item); + void checkAndHideItems(TQListView *view); + bool checkAndHideItems(TQListViewItem *item); private: //data - QPtrList<ApplicationInfo> m_appsInfo; - QValueList<AppWizardFileTemplate> m_fileTemplates; + TQPtrList<ApplicationInfo> m_appsInfo; + TQValueList<AppWizardFileTemplate> m_fileTemplates; //! Store the category name and the pointer in the treeview - QDict<QListViewItem> m_categoryMap; - QValueList<QListViewItem*> m_categoryItems; + TQDict<TQListViewItem> m_categoryMap; + TQValueList<TQListViewItem*> m_categoryItems; //! A list of currently available version control systems -// QDict<KDevVersionControl> m_availVcs; +// TQDict<KDevVersionControl> m_availVcs; - QHBoxLayout *m_custom_options_layout; + TQHBoxLayout *m_custom_options_layout; PropertyLib::PropertyEditor *m_customOptions; AppWizardPart *m_part; - QWidget *m_lastPage; - QPtrList<KTempFile> m_tempFiles; + TQWidget *m_lastPage; + TQPtrList<KTempFile> m_tempFiles; ApplicationInfo* m_pCurrentAppInfo; bool m_projectLocationWasChanged; VcsForm *m_vcsForm; @@ -194,9 +194,9 @@ private: //data KPopupMenu* m_favouritesMenu; KPopupMenu* m_templatesMenu; - QDict<KDevLicense> m_licenses; - QDict<KDevVCSIntegrator> m_integrators; - QMap<int, VCSDialog*> m_integratorDialogs; + TQDict<KDevLicense> m_licenses; + TQDict<KDevVCSIntegrator> m_integrators; + TQMap<int, VCSDialog*> m_integratorDialogs; ProfileSupport *m_profileSupport; diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp index 8a19f548..6b57b320 100644 --- a/parts/appwizard/appwizardpart.cpp +++ b/parts/appwizard/appwizardpart.cpp @@ -9,9 +9,9 @@ * * ***************************************************************************/ -#include <qdir.h> -#include <qwidget.h> -#include <qtimer.h> +#include <tqdir.h> +#include <tqwidget.h> +#include <tqtimer.h> #include "appwizardpart.h" @@ -23,7 +23,7 @@ #include <kgenericfactory.h> #include <kstandarddirs.h> #include <kaction.h> -#include <qmessagebox.h> +#include <tqmessagebox.h> #include "importdlg.h" #include "appwizarddlg.h" @@ -34,7 +34,7 @@ #include <kdevcore.h> #include <codemodel.h> -AppWizardPart::AppWizardPart(QObject *parent, const char *name, const QStringList &) +AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringList &) : KDevPlugin(AppWizardFactory::info(), parent, name ? name : "AppWizardPart") { setInstance(AppWizardFactory::instance()); @@ -43,7 +43,7 @@ AppWizardPart::AppWizardPart(QObject *parent, const char *name, const QStringLis KAction *action; action = new KAction( i18n("&New Project..."), "window_new", 0, - this, SLOT(slotNewProject()), + this, TQT_SLOT(slotNewProject()), actionCollection(), "project_new" ); action->setToolTip( i18n("Generate a new project from a template") ); action->setWhatsThis( i18n("<b>New project</b><p>" @@ -52,7 +52,7 @@ AppWizardPart::AppWizardPart(QObject *parent, const char *name, const QStringLis "application from a set of templates.") ); action = new KAction( i18n("&Import Existing Project..."),"wizard", 0, - this, SLOT(slotImportProject()), + this, TQT_SLOT(slotImportProject()), actionCollection(), "project_import" ); action->setToolTip( i18n("Import existing project") ); action->setWhatsThis( i18n("<b>Import existing project</b><p>Creates a project file for a given directory.") ); @@ -82,7 +82,7 @@ void AppWizardPart::slotImportProject() void AppWizardPart::openFilesAfterGeneration(const KURL::List urlsToOpen) { m_urlsToOpen = urlsToOpen; - connect( core(), SIGNAL( projectOpened() ), this, SLOT( openFilesAfterGeneration() ) ); + connect( core(), TQT_SIGNAL( projectOpened() ), this, TQT_SLOT( openFilesAfterGeneration() ) ); } void AppWizardPart::openFilesAfterGeneration() @@ -90,7 +90,7 @@ void AppWizardPart::openFilesAfterGeneration() for (KURL::List::const_iterator it = m_urlsToOpen.begin(); it != m_urlsToOpen.end(); ++it) partController()->editDocument(*it); m_urlsToOpen.clear(); - disconnect( core(), SIGNAL( projectOpened() ), this, SLOT( openFilesAfterGeneration() ) ); + disconnect( core(), TQT_SIGNAL( projectOpened() ), this, TQT_SLOT( openFilesAfterGeneration() ) ); } #include "appwizardpart.moc" diff --git a/parts/appwizard/appwizardpart.h b/parts/appwizard/appwizardpart.h index 0678d04a..5b434ebf 100644 --- a/parts/appwizard/appwizardpart.h +++ b/parts/appwizard/appwizardpart.h @@ -12,10 +12,10 @@ #ifndef _APPWIZARDPART_H_ #define _APPWIZARDPART_H_ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include "kdevplugin.h" -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <kurl.h> class AppWizardDialog; @@ -26,7 +26,7 @@ class AppWizardPart : public KDevPlugin Q_OBJECT public: - AppWizardPart( QObject *parent, const char *name, const QStringList & ); + AppWizardPart( TQObject *parent, const char *name, const TQStringList & ); ~AppWizardPart(); void openFilesAfterGeneration(const KURL::List urlsToOpen); diff --git a/parts/appwizard/filepropspage.cpp b/parts/appwizard/filepropspage.cpp index 8b60e369..e7436d04 100644 --- a/parts/appwizard/filepropspage.cpp +++ b/parts/appwizard/filepropspage.cpp @@ -1,18 +1,18 @@ #include "filepropspage.h" -#include <qlistbox.h> +#include <tqlistbox.h> #include <klineedit.h> -#include <qtextview.h> +#include <tqtextview.h> #include <klocale.h> -#include <qlabel.h> -#include <qmultilineedit.h> +#include <tqlabel.h> +#include <tqmultilineedit.h> /* * Constructs a FilePropsPage which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -FilePropsPage::FilePropsPage( QWidget* parent, const char* name, WFlags fl ) +FilePropsPage::FilePropsPage( TQWidget* parent, const char* name, WFlags fl ) : FilePropsPageBase( parent, name, fl ){ - m_props = new QPtrList<ClassFileProp>; + m_props = new TQPtrList<ClassFileProp>; m_current_class = 9999; // no current } @@ -60,7 +60,7 @@ void FilePropsPage::slotSelectionChanged() m_current_class = item; } -void FilePropsPage::setClassFileProps(QPtrList<ClassFileProp> props,bool different_header_impl){ +void FilePropsPage::setClassFileProps(TQPtrList<ClassFileProp> props,bool different_header_impl){ *m_props = props; m_different_header_impl = different_header_impl; if (!m_different_header_impl){ @@ -78,10 +78,10 @@ void FilePropsPage::setClassFileProps(QPtrList<ClassFileProp> props,bool differe slotSelectionChanged(); } -QPtrList<ClassFileProp> FilePropsPage::getClassFileProps(){ +TQPtrList<ClassFileProp> FilePropsPage::getClassFileProps(){ return *m_props; } -void FilePropsPage::slotClassnameChanged(const QString& text){ +void FilePropsPage::slotClassnameChanged(const TQString& text){ classes_listbox->changeItem(text, classes_listbox->currentItem()); } diff --git a/parts/appwizard/filepropspage.h b/parts/appwizard/filepropspage.h index 3435dfa2..a0c923ed 100644 --- a/parts/appwizard/filepropspage.h +++ b/parts/appwizard/filepropspage.h @@ -1,19 +1,19 @@ #ifndef FILEPROPSPAGE_H #define FILEPROPSPAGE_H #include "filepropspagebase.h" -#include <qstring.h> -#include <qptrlist.h> +#include <tqstring.h> +#include <tqptrlist.h> class ClassFileProp { public: - QString m_classname; - QString m_implfile; - QString m_headerfile; - QString m_baseclass; - QString m_description; // rich text + TQString m_classname; + TQString m_implfile; + TQString m_headerfile; + TQString m_baseclass; + TQString m_description; // rich text /** to idetify this object*/ - QString m_key; + TQString m_key; bool m_change_baseclass; }; @@ -22,17 +22,17 @@ class FilePropsPage : public FilePropsPageBase Q_OBJECT public: - FilePropsPage( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + FilePropsPage( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~FilePropsPage(); - void setClassFileProps(QPtrList<ClassFileProp> props,bool different_header_impl=true); - QPtrList<ClassFileProp> getClassFileProps(); + void setClassFileProps(TQPtrList<ClassFileProp> props,bool different_header_impl=true); + TQPtrList<ClassFileProp> getClassFileProps(); public slots: void slotSelectionChanged(); - virtual void slotClassnameChanged(const QString&); + virtual void slotClassnameChanged(const TQString&); protected: - QPtrList<ClassFileProp>* m_props; + TQPtrList<ClassFileProp>* m_props; bool m_different_header_impl; uint m_current_class; diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp index b900181d..9cb9838a 100644 --- a/parts/appwizard/importdlg.cpp +++ b/parts/appwizard/importdlg.cpp @@ -11,17 +11,17 @@ #include "importdlg.h" #include <stdlib.h> -#include <qcombobox.h> -#include <qdir.h> -#include <qfile.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqcombobox.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <klineedit.h> -#include <qpushbutton.h> -#include <qregexp.h> -#include <qtextstream.h> -#include <qtooltip.h> -#include <qcheckbox.h> +#include <tqpushbutton.h> +#include <tqregexp.h> +#include <tqtextstream.h> +#include <tqtooltip.h> +#include <tqcheckbox.h> #include <kbuttonbox.h> #include <kdebug.h> #include <kdialog.h> @@ -51,25 +51,25 @@ #include "misc.h" -ImportDialog::ImportDialog(AppWizardPart *part, QWidget *parent, const char *name) +ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *parent, const char *name) : ImportDialogBase(parent, name, true), m_part(part) { - QString author, email; + TQString author, email; AppWizardUtil::guessAuthorAndEmail(&author, &email); author_edit->setText(author); email_edit->setText(email); - QToolTip::add( urlinput_edit->button(), i18n("Choose directory to import") ); + TQToolTip::add( urlinput_edit->button(), i18n("Choose directory to import") ); urlinput_edit->setMode(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly); KStandardDirs *dirs = AppWizardFactory::instance()->dirs(); - importNames = dirs->findAllResources("appimports", QString::null, false, true); + importNames = dirs->findAllResources("appimports", TQString::null, false, true); importNames.sort(); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = importNames.begin(); it != importNames.end(); ++it) { KConfig config(KGlobal::dirs()->findResource("appimports", *it)); config.setGroup("General"); - QString type = config.readEntry("Comment"); + TQString type = config.readEntry("Comment"); project_combo->insertItem(type); if (config.hasGroup("Infrastructure")) @@ -86,12 +86,12 @@ ImportDialog::ImportDialog(AppWizardPart *part, QWidget *parent, const char *nam infrastructureBox->setEnabled(false); setProjectType("c"); - connect( name_edit, SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotProjectNameChanged( const QString & ) ) ); + connect( name_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotProjectNameChanged( const TQString & ) ) ); // scanAvailableVCS(); - connect( fetchModuleButton, SIGNAL(clicked()), - this, SLOT(slotFetchModulesFromRepository()) ); - connect(urlinput_edit, SIGNAL(urlSelected(const QString& )), this, SLOT(dirChanged())); - connect(urlinput_edit, SIGNAL(returnPressed(const QString& )), this, SLOT(dirChanged())); + connect( fetchModuleButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotFetchModulesFromRepository()) ); + connect(urlinput_edit, TQT_SIGNAL(urlSelected(const TQString& )), this, TQT_SLOT(dirChanged())); + connect(urlinput_edit, TQT_SIGNAL(returnPressed(const TQString& )), this, TQT_SLOT(dirChanged())); slotProjectNameChanged( name_edit->text() ); } @@ -99,20 +99,20 @@ ImportDialog::ImportDialog(AppWizardPart *part, QWidget *parent, const char *nam ImportDialog::~ImportDialog() {} -void ImportDialog::slotProjectNameChanged( const QString &_text ) +void ImportDialog::slotProjectNameChanged( const TQString &_text ) { - ok_button->setEnabled( !_text.isEmpty() && !urlinput_edit->url().contains( QRegExp("\\s") ) ); + ok_button->setEnabled( !_text.isEmpty() && !urlinput_edit->url().contains( TQRegExp("\\s") ) ); } void ImportDialog::accept() { - QDir dir(urlinput_edit->url()); + TQDir dir(urlinput_edit->url()); if (urlinput_edit->url().isEmpty() || !dir.exists()) { KMessageBox::sorry(this, i18n("You have to choose a directory.")); return; } - QString projectName = name_edit->text(); + TQString projectName = name_edit->text(); if (projectName.isEmpty()) { KMessageBox::sorry(this, i18n("You have to choose a project name.")); return; @@ -127,13 +127,13 @@ void ImportDialog::accept() if (infrastructureBox->isVisible() && infrastructureBox->isChecked()) createProjectInfrastructure(); -// QString author = author_edit->text(); -// QString email = email_edit->text(); +// TQString author = author_edit->text(); +// TQString email = email_edit->text(); - QFileInfo finfo(importNames[project_combo->currentItem()]); - QDir importdir(finfo.dir()); + TQFileInfo finfo(importNames[project_combo->currentItem()]); + TQDir importdir(finfo.dir()); importdir.cdUp(); - QFile src(importdir.filePath("importfiles/" + finfo.fileName() + ".kdevelop")); + TQFile src(importdir.filePath("importfiles/" + finfo.fileName() + ".kdevelop")); kdDebug(9010) << "Import template " << src.name() << endl; if (!src.open(IO_ReadOnly)) { KMessageBox::sorry(this, i18n("Cannot open project template.")); @@ -141,10 +141,10 @@ void ImportDialog::accept() } // Read the DOM of the newly created project - QDomDocument projectDOM; + TQDomDocument projectDOM; int errorLine, errorCol; - QString errorMsg; + TQString errorMsg; bool success = projectDOM.setContent( &src, &errorMsg, &errorLine, &errorCol); src.close(); if ( !success ) @@ -165,11 +165,11 @@ void ImportDialog::accept() } // figure out what plugins we should disable by default - QString profileName = DomUtil::readEntry( projectDOM, "general/profile" ); + TQString profileName = DomUtil::readEntry( projectDOM, "general/profile" ); if ( profileName.isEmpty() ) { - QString language = DomUtil::readEntry( projectDOM, "general/primarylanguage" ); - QStringList keywords = DomUtil::readListEntry( projectDOM, "general/keywords", "keyword" ); + TQString language = DomUtil::readEntry( projectDOM, "general/primarylanguage" ); + TQStringList keywords = DomUtil::readListEntry( projectDOM, "general/keywords", "keyword" ); profileName = Settings::profileByAttributes( language, keywords ); } @@ -177,7 +177,7 @@ void ImportDialog::accept() ProfileEngine & engine = m_part->pluginController()->engine(); Profile * profile = engine.findProfile( profileName ); - QStringList disableList; + TQStringList disableList; Profile::EntryList disableEntryList = profile->list( Profile::ExplicitDisable ); for ( Profile::EntryList::const_iterator it = disableEntryList.constBegin(); it != disableEntryList.constEnd(); ++it ) { @@ -188,25 +188,25 @@ void ImportDialog::accept() // write the dom back - QFile dest(dir.filePath(projectName + ".kdevelop")); + TQFile dest(dir.filePath(projectName + ".kdevelop")); if (!dest.open(IO_WriteOnly)) { KMessageBox::sorry(this, i18n("Cannot write the project file.")); return; } - QTextStream ts( &dest ); - ts.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream ts( &dest ); + ts.setEncoding(TQTextStream::UnicodeUTF8); ts << projectDOM.toString(2); dest.close(); -// QTextStream srcstream(&src); -// QTextStream deststream(&dest); +// TQTextStream srcstream(&src); +// TQTextStream deststream(&dest); // // while (!srcstream.atEnd()) { -// QString line = srcstream.readLine(); -// line.replace(QRegExp("\\$APPNAMELC\\$"), projectName); -// line.replace(QRegExp("\\$AUTHOR\\$"), author); -// line.replace(QRegExp("\\$EMAIL\\$"), email); +// TQString line = srcstream.readLine(); +// line.replace(TQRegExp("\\$APPNAMELC\\$"), projectName); +// line.replace(TQRegExp("\\$AUTHOR\\$"), author); +// line.replace(TQRegExp("\\$EMAIL\\$"), email); // deststream << line << endl; // } // @@ -217,31 +217,31 @@ void ImportDialog::accept() kdDebug(9010) << "OPENING PROJECT: " << dir.filePath(projectName + ".kdevelop") << endl; - QDialog::accept(); + TQDialog::accept(); } // Checks if the directory dir and all of its subdirectories // (one level recursion) have files that follow patterns // patterns is comma-separated -static bool dirHasFiles(QDir &dir, const QString &patterns) +static bool dirHasFiles(TQDir &dir, const TQString &patterns) { - QStringList::ConstIterator pit, sit; + TQStringList::ConstIterator pit, sit; - QStringList patternList = QStringList::split(",", patterns); + TQStringList patternList = TQStringList::split(",", patterns); for (pit = patternList.begin(); pit != patternList.end(); ++pit) { - if (!dir.entryList(*pit, QDir::Files).isEmpty()) { + if (!dir.entryList(*pit, TQDir::Files).isEmpty()) { kdDebug(9010) << "Has files " << (*pit) << endl; return true; } } - QStringList subdirList = dir.entryList("*", QDir::Dirs); + TQStringList subdirList = dir.entryList("*", TQDir::Dirs); for (sit = subdirList.begin(); sit != subdirList.end(); ++sit) { - QDir subdir(dir); + TQDir subdir(dir); subdir.cd(*sit); for (pit = patternList.begin(); pit != patternList.end(); ++pit) { - if (!subdir.entryList(*pit, QDir::Files).isEmpty()) { + if (!subdir.entryList(*pit, TQDir::Files).isEmpty()) { kdDebug(9010) << "Has files " << (*pit) << " in " << (*sit) << endl; return true; } @@ -255,12 +255,12 @@ static bool dirHasFiles(QDir &dir, const QString &patterns) void ImportDialog::dirChanged() { kdDebug(9010) << "ImportDialog::dirChanged" << endl; - QString dirName = urlinput_edit->url(); - QDir dir(dirName); + TQString dirName = urlinput_edit->url(); + TQDir dir(dirName); if (!dir.exists()) return; - if ( dirName.contains( QRegExp("\\s") ) ) + if ( dirName.contains( TQRegExp("\\s") ) ) { ok_button->setEnabled( false ); return; @@ -270,7 +270,7 @@ void ImportDialog::dirChanged() } // KDevelop legacy project? - QStringList files = dir.entryList("*.kdevprj"); + TQStringList files = dir.entryList("*.kdevprj"); if (!files.isEmpty()) { scanLegacyKDevelopProject(dir.absFilePath(files.first())); return; @@ -290,7 +290,7 @@ void ImportDialog::dirChanged() } // Remove any characters from the dirName that would be invalid in a project name - QString projectName(dir.dirName().replace(QRegExp("[^a-zA-Z0-9_]"), "_")); + TQString projectName(dir.dirName().replace(TQRegExp("[^a-zA-Z0-9_]"), "_")); // Set the project name name_edit->setText(projectName); @@ -328,7 +328,7 @@ void ImportDialog::dirChanged() } -void ImportDialog::scanLegacyKDevelopProject(const QString &fileName) +void ImportDialog::scanLegacyKDevelopProject(const TQString &fileName) { kdDebug(9010) << "Scanning legacy KDevelop project file " << fileName << endl; @@ -338,8 +338,8 @@ void ImportDialog::scanLegacyKDevelopProject(const QString &fileName) email_edit->setText(config.readEntry("email")); name_edit->setText(config.readEntry("project_name")); - QString legacyType = config.readEntry("project_type"); - if (QStringList::split(",", "normal_kde,normal_kde2,kde2_normal,mdi_kde2").contains(legacyType)) + TQString legacyType = config.readEntry("project_type"); + if (TQStringList::split(",", "normal_kde,normal_kde2,kde2_normal,mdi_kde2").contains(legacyType)) setProjectType("kde"); else if (legacyType == "normal_gnome") setProjectType("gnome"); @@ -350,7 +350,7 @@ void ImportDialog::scanLegacyKDevelopProject(const QString &fileName) } -void ImportDialog::scanLegacyStudioProject(const QString &fileName) +void ImportDialog::scanLegacyStudioProject(const TQString &fileName) { kdDebug(9010) << "Scanning legacy studio project file " << fileName << endl; @@ -361,15 +361,15 @@ void ImportDialog::scanLegacyStudioProject(const QString &fileName) } -void ImportDialog::scanAutomakeProject(const QString &dirName) +void ImportDialog::scanAutomakeProject(const TQString &dirName) { kdDebug(9010) << "Scanning automake project directory " << dirName << endl; bool stop = false; - if (QFile::exists(dirName + "/admin/am_edit")) { + if (TQFile::exists(dirName + "/admin/am_edit")) { setProjectType("kde"); stop = true; - } else if (QFile::exists(dirName + "/macros/gnome.m4")) { + } else if (TQFile::exists(dirName + "/macros/gnome.m4")) { setProjectType("gnome"); stop = true; } else { @@ -377,13 +377,13 @@ void ImportDialog::scanAutomakeProject(const QString &dirName) } // if we get an authors file, use it. - QFile af(dirName + "/AUTHORS"); + TQFile af(dirName + "/AUTHORS"); if (af.open(IO_ReadOnly)){ - QTextStream astream(&af); + TQTextStream astream(&af); - QRegExp authorre("(.*)<(.*)>"); + TQRegExp authorre("(.*)<(.*)>"); while (!astream.atEnd()) { - QString s = astream.readLine(); + TQString s = astream.readLine(); if (authorre.search(s) != -1) { author_edit->setText(authorre.cap(1).stripWhiteSpace()); email_edit->setText(authorre.cap(2).stripWhiteSpace()); @@ -396,30 +396,30 @@ void ImportDialog::scanAutomakeProject(const QString &dirName) // we ignore old AC_INIT that had no version.. // only match the if there is a comma and at least two args.. // AC_INIT (package, version, [bug-report], [tarname]) - QRegExp ac_init("^AC_INIT\\s*\\(\\s*([^,]+),([^,\\)]+)(.*)"); + TQRegExp ac_init("^AC_INIT\\s*\\(\\s*([^,]+),([^,\\)]+)(.*)"); // AM_INIT_AUTOMAKE([OPTIONS]) // example: AM_INIT_AUTOMAKE([gnits 1.5 no-define dist-bzip2]) - QRegExp am_autoSpace("^AM_INIT_AUTOMAKE\\s{0,}\\(\\s{0,}([\\[\\s]{0,}[^\\s]+)\\s+([^\\s\\)\\]]+)(.*)"); + TQRegExp am_autoSpace("^AM_INIT_AUTOMAKE\\s{0,}\\(\\s{0,}([\\[\\s]{0,}[^\\s]+)\\s+([^\\s\\)\\]]+)(.*)"); // AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) - QRegExp am_autoComma("^AM_INIT_AUTOMAKE\\s*\\(\\s*([^,]+),([^,\\)]+)(.*)"); + TQRegExp am_autoComma("^AM_INIT_AUTOMAKE\\s*\\(\\s*([^,]+),([^,\\)]+)(.*)"); // look for version in a define. // AC_DEFINE(VERSION, "5.6") - QRegExp ac_define("^AC_DEFINE\\s*\\(\\s*[^,]+,([^\\)]+)"); - QRegExp version("(\\bversion\\b)"); + TQRegExp ac_define("^AC_DEFINE\\s*\\(\\s*[^,]+,([^\\)]+)"); + TQRegExp version("(\\bversion\\b)"); version.setCaseSensitive(FALSE); - QTextStream cstream; + TQTextStream cstream; // try for configure.in.in, configure.in, then configure.ac - QFile configInIn(dirName + "/configure.in.in"); - QFile configIn(dirName+"/configure.in"); - QFile configAc(dirName+"/configure.ac"); + TQFile configInIn(dirName + "/configure.in.in"); + TQFile configIn(dirName+"/configure.in"); + TQFile configAc(dirName+"/configure.ac"); if (configInIn.open(IO_ReadOnly)){ cstream.setDevice(&configInIn); while (!cstream.atEnd()) { - QString line = cstream.readLine(); + TQString line = cstream.readLine(); if ( ac_init.search(line) >= 0){ projectVersion=ac_init.cap(2).stripWhiteSpace(); } @@ -448,11 +448,11 @@ void ImportDialog::scanAutomakeProject(const QString &dirName) } } - QRegExp namere("\\s*AM_INIT_AUTOMAKE\\((.*),.*\\).*"); - QRegExp cppre("\\s*AC_PROG_CXX"); - QRegExp f77re("\\s*AC_PROG_F77"); + TQRegExp namere("\\s*AM_INIT_AUTOMAKE\\((.*),.*\\).*"); + TQRegExp cppre("\\s*AC_PROG_CXX"); + TQRegExp f77re("\\s*AC_PROG_F77"); while (!cstream.atEnd()) { - QString line = cstream.readLine(); + TQString line = cstream.readLine(); if ( ac_init.search(line) >= 0){ projectVersion=ac_init.cap(2).stripWhiteSpace(); } @@ -481,14 +481,14 @@ void ImportDialog::scanAutomakeProject(const QString &dirName) } -void ImportDialog::setProjectType(const QString &type) +void ImportDialog::setProjectType(const TQString &type) { kdDebug(9010) << "Setting project type " << type << endl; - QString suffix = "/" + type; + TQString suffix = "/" + type; int suffixLength = suffix.length(); int i=0; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = importNames.begin(); it != importNames.end(); ++it) { if ((*it).right(suffixLength) == suffix) { project_combo->setCurrentItem(i); @@ -512,7 +512,7 @@ void ImportDialog::scanAvailableVCS() } */ /* -void ImportDialog::slotFinishedCheckout( QString destinationDir ) +void ImportDialog::slotFinishedCheckout( TQString destinationDir ) { urlinput_edit->setURL( destinationDir ); @@ -531,8 +531,8 @@ void ImportDialog::slotFetchModulesFromRepository() setCursor( KCursor::waitCursor() ); // setEnabled( false ); - connect( vcs, SIGNAL(finishedFetching(QString)), - this, SLOT(slotFinishedCheckout(QString)) ); + connect( vcs, TQT_SIGNAL(finishedFetching(TQString)), + this, TQT_SLOT(slotFinishedCheckout(TQString)) ); //restore cursor if we can't fetch repository if ( !vcs->fetchFromRepository() ) @@ -540,7 +540,7 @@ void ImportDialog::slotFetchModulesFromRepository() } */ -void ImportDialog::projectTypeChanged( const QString &type ) +void ImportDialog::projectTypeChanged( const TQString &type ) { if (m_infrastructure[type].isOn) { @@ -561,14 +561,14 @@ void ImportDialog::createProjectInfrastructure( ) if (!cmd.isOn) return; - QDir dir (urlinput_edit->url()); - QStringList files = dir.entryList(cmd.existingPattern); + TQDir dir (urlinput_edit->url()); + TQStringList files = dir.entryList(cmd.existingPattern); if (!files.isEmpty()) { - if (KMessageBox::questionYesNo(this, i18n("Project infrastrucure already exists in target directory.\nGenerate new project infrastructure and overwrite old?"), QString::null, i18n("Generate"), i18n("Do Not Generate")) == KMessageBox::No) + if (KMessageBox::questionYesNo(this, i18n("Project infrastrucure already exists in target directory.\nGenerate new project infrastructure and overwrite old?"), TQString::null, i18n("Generate"), i18n("Do Not Generate")) == KMessageBox::No) return; } - QString command = "cd " + urlinput_edit->url() + " && " + cmd.command; + TQString command = "cd " + urlinput_edit->url() + " && " + cmd.command; kdDebug(9010) << "executing " << command.ascii() << endl; system(command.ascii()); } diff --git a/parts/appwizard/importdlg.h b/parts/appwizard/importdlg.h index daa136b6..35772133 100644 --- a/parts/appwizard/importdlg.h +++ b/parts/appwizard/importdlg.h @@ -13,16 +13,16 @@ #define _IMPORTDLG_H_ #include "importdlgbase.h" -#include <qstringlist.h> +#include <tqstringlist.h> class AppWizardPart; struct InfrastructureCmd{ bool isOn; - QString comment; - QString command; - QString existingPattern; + TQString comment; + TQString command; + TQString existingPattern; }; class ImportDialog : public ImportDialogBase @@ -30,7 +30,7 @@ class ImportDialog : public ImportDialogBase Q_OBJECT public: - ImportDialog( AppWizardPart *part, QWidget *parent=0, const char *name=0 ); + ImportDialog( AppWizardPart *part, TQWidget *parent=0, const char *name=0 ); ~ImportDialog(); protected: @@ -38,27 +38,27 @@ protected: protected slots: virtual void dirChanged(); - virtual void projectTypeChanged(const QString &type); + virtual void projectTypeChanged(const TQString &type); virtual void projectTypeChanged(int type); private slots: -// void slotFinishedCheckout( QString destinationDir ); +// void slotFinishedCheckout( TQString destinationDir ); // void slotFetchModulesFromRepository(); - void slotProjectNameChanged( const QString &_text ); + void slotProjectNameChanged( const TQString &_text ); private: // void scanAvailableVCS(); - void scanLegacyKDevelopProject(const QString &fileName); - void scanLegacyStudioProject(const QString &fileName); - void scanAutomakeProject(const QString &dirName); - void setProjectType(const QString &type); + void scanLegacyKDevelopProject(const TQString &fileName); + void scanLegacyStudioProject(const TQString &fileName); + void scanAutomakeProject(const TQString &dirName); + void setProjectType(const TQString &type); void createProjectInfrastructure(); - QStringList importNames; + TQStringList importNames; AppWizardPart *m_part; - QString projectVersion; + TQString projectVersion; - QMap<QString, InfrastructureCmd> m_infrastructure; + TQMap<TQString, InfrastructureCmd> m_infrastructure; }; #endif diff --git a/parts/appwizard/kdevfile.cpp b/parts/appwizard/kdevfile.cpp index 12e4826f..4edb62c7 100644 --- a/parts/appwizard/kdevfile.cpp +++ b/parts/appwizard/kdevfile.cpp @@ -40,7 +40,7 @@ static struct MimeTypeMapping { NULL, KDevFile::NoCommenting } }; -KDevFile::CommentingStyle KDevFile::commentingStyleFromMimeType( const QString& mimeType ) +KDevFile::CommentingStyle KDevFile::commentingStyleFromMimeType( const TQString& mimeType ) { int idx = 0; while( mimeTypeMapping[idx].szMimeType ) diff --git a/parts/appwizard/kdevfile.h b/parts/appwizard/kdevfile.h index ea822357..6b2e2699 100644 --- a/parts/appwizard/kdevfile.h +++ b/parts/appwizard/kdevfile.h @@ -47,7 +47,7 @@ public: public: /**@return A commenting style for a given mime type. @param mimeType A string which defines a mime type (like "text/x-c+++src").*/ - static CommentingStyle commentingStyleFromMimeType(const QString& mimeType); + static CommentingStyle commentingStyleFromMimeType(const TQString& mimeType); /**@return A commenting style for a given mime type. @param mimeType The mime type.*/ diff --git a/parts/appwizard/kdevlicense.cpp b/parts/appwizard/kdevlicense.cpp index 6987a54d..5e189422 100644 --- a/parts/appwizard/kdevlicense.cpp +++ b/parts/appwizard/kdevlicense.cpp @@ -18,23 +18,23 @@ */ #include "kdevlicense.h" -#include <qfile.h> -#include <qdatetime.h> -#include <qregexp.h> +#include <tqfile.h> +#include <tqdatetime.h> +#include <tqregexp.h> -KDevLicense::KDevLicense( const QString& name, const QString& fileName ) +KDevLicense::KDevLicense( const TQString& name, const TQString& fileName ) : m_name( name ) { readFile( fileName ); } -void KDevLicense::readFile( const QString& fileName ) +void KDevLicense::readFile( const TQString& fileName ) { - QFile f(fileName); + TQFile f(fileName); if (!f.open(IO_ReadOnly)) return; - QTextStream stream(&f); - QString str; + TQTextStream stream(&f); + TQString str; enum { readingText, readingFiles } mode = readingText; for(;;) { @@ -57,25 +57,25 @@ void KDevLicense::readFile( const QString& fileName ) } -QString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const QString& author, const QString& email, int leadingSpaces ) +TQString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces ) { // first, build a CPP Style license - QString strFill; + TQString strFill; strFill.fill( ' ', leadingSpaces ); - QString str = + TQString str = strFill + "/***************************************************************************\n" + strFill + " * Copyright (C) $YEAR$ by $AUTHOR$ *\n" + strFill + " * $EMAIL$ *\n" + strFill + " * *\n"; -// str = str.arg(QDate::currentDate().year()).arg(author.left(45),-45).arg(email.left(67),-67); +// str = str.arg(TQDate::currentDate().year()).arg(author.left(45),-45).arg(email.left(67),-67); - QStringList::Iterator it; + TQStringList::Iterator it; for( it = m_rawLines.begin(); it != m_rawLines.end(); ++it ) { - str += QString( "%1 * %2 *\n").arg( strFill ).arg( *it, -69 ); + str += TQString( "%1 * %2 *\n").arg( strFill ).arg( *it, -69 ); } str += strFill + " ***************************************************************************/\n"; @@ -87,28 +87,28 @@ QString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const return str; case KDevFile::PascalStyle: - str.replace(QRegExp("/\\**\n \\*"), "{\n "); - str.replace(QRegExp("\\*\n \\*"), " \n "); - str.replace(QRegExp(" *\\**/\n"), "}\n"); + str.replace(TQRegExp("/\\**\n \\*"), "{\n "); + str.replace(TQRegExp("\\*\n \\*"), " \n "); + str.replace(TQRegExp(" *\\**/\n"), "}\n"); return str; case KDevFile::AdaStyle: - str.replace(QRegExp("/\\*"), "--"); - str.replace(QRegExp(" \\*"), "--"); - str.replace(QRegExp("\\*/"), "*"); + str.replace(TQRegExp("/\\*"), "--"); + str.replace(TQRegExp(" \\*"), "--"); + str.replace(TQRegExp("\\*/"), "*"); return str; case KDevFile::BashStyle: - str.replace(QRegExp("\\*|/"), "#"); - str.replace(QRegExp("\n ##"), "\n##"); - str.replace(QRegExp("\n #"), "\n# "); + str.replace(TQRegExp("\\*|/"), "#"); + str.replace(TQRegExp("\n ##"), "\n##"); + str.replace(TQRegExp("\n #"), "\n# "); return str; case KDevFile::XMLStyle: - str.replace(QRegExp("/\\*"), "<!--"); - str.replace(QRegExp("\n \\*"), "\n<!--"); - str.replace(QRegExp("\\*/?\n"), "-->\n"); - str.replace(QRegExp("\\*"), "_"); + str.replace(TQRegExp("/\\*"), "<!--"); + str.replace(TQRegExp("\n \\*"), "\n<!--"); + str.replace(TQRegExp("\\*/?\n"), "-->\n"); + str.replace(TQRegExp("\\*"), "_"); return str; } diff --git a/parts/appwizard/kdevlicense.h b/parts/appwizard/kdevlicense.h index 0f8a41ce..2e81c9ec 100644 --- a/parts/appwizard/kdevlicense.h +++ b/parts/appwizard/kdevlicense.h @@ -24,7 +24,7 @@ The interface to installed licenses. */ -#include <qstringlist.h> +#include <tqstringlist.h> #include "kdevfile.h" @@ -35,41 +35,41 @@ public: /**Constructs a KDevLicense and loads the given license template file. @param name The name of this license. @param fileName The file name where license template text is kept.*/ - KDevLicense(const QString& name, const QString& fileName); + KDevLicense(const TQString& name, const TQString& fileName); public: /**Assembles the license to a string suitable for replacement of a %{LICENSE} .*/ - QString assemble(KDevFile::CommentingStyle commentingStyle, const QString& author, const QString& email, int leadingSpaces ); + TQString assemble(KDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces ); /** * returns the name of this license. */ - QString name() const { return m_name; } + TQString name() const { return m_name; } /** * returns list of files tat must be present in the project's root directory * if any source files uses this license. */ - QStringList copyFiles(){ return m_copyFiles; } + TQStringList copyFiles(){ return m_copyFiles; } private: - void readFile( const QString& fileName ); + void readFile( const TQString& fileName ); private: /** * Name of this license */ - QString m_name; + TQString m_name; /** * Raw lines of the license. Should contain no spaces at * the start or end of each line. */ - QStringList m_rawLines; + TQStringList m_rawLines; /** * List of files that must be added to the project, if any * file in the project uses this license. */ - QStringList m_copyFiles; + TQStringList m_copyFiles; }; #endif diff --git a/parts/appwizard/misc.cpp b/parts/appwizard/misc.cpp index 3590b589..63d670b5 100644 --- a/parts/appwizard/misc.cpp +++ b/parts/appwizard/misc.cpp @@ -11,7 +11,7 @@ #include "misc.h" -#include <qstring.h> +#include <tqstring.h> #include <kemailsettings.h> #include <pwd.h> @@ -21,12 +21,12 @@ #include <kstandarddirs.h> #include <kconfig.h> -void AppWizardUtil::guessAuthorAndEmail(QString *author, QString *email) +void AppWizardUtil::guessAuthorAndEmail(TQString *author, TQString *email) { KEMailSettings emailConfig; emailConfig.setProfile( emailConfig.defaultProfileName() ); - QString fromAddr = emailConfig.getSetting( KEMailSettings::EmailAddress ); - QString name = emailConfig.getSetting( KEMailSettings::RealName ); + TQString fromAddr = emailConfig.getSetting( KEMailSettings::EmailAddress ); + TQString name = emailConfig.getSetting( KEMailSettings::RealName ); if ( !fromAddr.isEmpty() && !name.isEmpty() ) { *author = name; @@ -45,11 +45,11 @@ void AppWizardUtil::guessAuthorAndEmail(QString *author, QString *email) (void) ::gethostname(hostname, sizeof hostname); if ( name.isEmpty() ) - *author = QString::fromLocal8Bit( pw->pw_gecos ); + *author = TQString::fromLocal8Bit( pw->pw_gecos ); else *author = name; if ( fromAddr.isEmpty() ) - *email = QString(pw->pw_name) + "@" + hostname; + *email = TQString(pw->pw_name) + "@" + hostname; else *email = fromAddr; } diff --git a/parts/appwizard/misc.h b/parts/appwizard/misc.h index 1378943b..8d9402b3 100644 --- a/parts/appwizard/misc.h +++ b/parts/appwizard/misc.h @@ -12,12 +12,12 @@ #ifndef _MISC_H_ #define _MISC_H_ -#include <qstring.h> +#include <tqstring.h> class AppWizardUtil { public: - static void guessAuthorAndEmail(QString *author, QString *email); + static void guessAuthorAndEmail(TQString *author, TQString *email); }; #endif diff --git a/parts/appwizard/profilesupport.cpp b/parts/appwizard/profilesupport.cpp index e50e5535..084156f5 100644 --- a/parts/appwizard/profilesupport.cpp +++ b/parts/appwizard/profilesupport.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "profilesupport.h" -#include <qfileinfo.h> +#include <tqfileinfo.h> #include <kdebug.h> #include <kconfig.h> @@ -38,7 +38,7 @@ ProfileSupport::ProfileSupport(KDevPlugin *parent) } } -bool ProfileSupport::isInTemplateList(const QString &templateUrl) +bool ProfileSupport::isInTemplateList(const TQString &templateUrl) { - return m_templateList.contains(QFileInfo(templateUrl).baseName()); + return m_templateList.contains(TQFileInfo(templateUrl).baseName()); } diff --git a/parts/appwizard/profilesupport.h b/parts/appwizard/profilesupport.h index f3b89ac8..b18a9620 100644 --- a/parts/appwizard/profilesupport.h +++ b/parts/appwizard/profilesupport.h @@ -25,10 +25,10 @@ class ProfileSupport{ public: ProfileSupport(KDevPlugin *parent); - bool isInTemplateList(const QString &templateUrl); + bool isInTemplateList(const TQString &templateUrl); private: - QStringList m_templateList; + TQStringList m_templateList; }; #endif diff --git a/parts/astyle/astyle_adaptor.cpp b/parts/astyle/astyle_adaptor.cpp index 124da96e..6d6d44b6 100644 --- a/parts/astyle/astyle_adaptor.cpp +++ b/parts/astyle/astyle_adaptor.cpp @@ -4,19 +4,19 @@ #include <string> -#include <qradiobutton.h> -#include <qspinbox.h> -#include <qcheckbox.h> +#include <tqradiobutton.h> +#include <tqspinbox.h> +#include <tqcheckbox.h> #include <kdebug.h> #include <kapplication.h> #include <kconfig.h> -ASStringIterator::ASStringIterator(const QString &text) +ASStringIterator::ASStringIterator(const TQString &text) : ASSourceIterator(), _content(text) { - _is = new QTextStream(&_content, IO_ReadOnly); + _is = new TQTextStream(&_content, IO_ReadOnly); } @@ -38,9 +38,9 @@ string ASStringIterator::nextLine() } -KDevFormatter::KDevFormatter(const QMap<QString, QVariant>& options) +KDevFormatter::KDevFormatter(const TQMap<TQString, TQVariant>& options) { -// for ( QMap<QString, QVariant>::ConstIterator iter = options.begin();iter != options.end();iter++ ) +// for ( TQMap<TQString, TQVariant>::ConstIterator iter = options.begin();iter != options.end();iter++ ) // { // kdDebug ( 9009 ) << "format: " << iter.key() << "=" << iter.data() << endl; // } @@ -48,7 +48,7 @@ KDevFormatter::KDevFormatter(const QMap<QString, QVariant>& options) setCStyle(); // style - QString s = options["FStyle"].toString(); + TQString s = options["FStyle"].toString(); if ( predefinedStyle( s ) ) { return; @@ -215,7 +215,7 @@ KDevFormatter::KDevFormatter( AStyleWidget * widget ) setSingleStatementsMode( !widget->Keep_Statements->isChecked() ); } -bool KDevFormatter::predefinedStyle( const QString & style ) +bool KDevFormatter::predefinedStyle( const TQString & style ) { if (style == "ANSI") { diff --git a/parts/astyle/astyle_adaptor.h b/parts/astyle/astyle_adaptor.h index 2367c4d7..21398fbb 100644 --- a/parts/astyle/astyle_adaptor.h +++ b/parts/astyle/astyle_adaptor.h @@ -2,10 +2,10 @@ #define __ASTYLE_ADAPTOR_H__ -#include <qstring.h> -#include <qtextstream.h> -#include <qmap.h> -#include <qvariant.h> +#include <tqstring.h> +#include <tqtextstream.h> +#include <tqmap.h> +#include <tqvariant.h> #include "astyle.h" @@ -17,7 +17,7 @@ class ASStringIterator : public astyle::ASSourceIterator { public: - ASStringIterator(const QString &string); + ASStringIterator(const TQString &string); virtual ~ASStringIterator(); virtual bool hasMoreLines() const; @@ -26,8 +26,8 @@ public: private: - QString _content; - QTextStream *_is; + TQString _content; + TQTextStream *_is; }; @@ -37,18 +37,18 @@ class KDevFormatter : public astyle::ASFormatter { public: - KDevFormatter(const QMap<QString, QVariant>& options); + KDevFormatter(const TQMap<TQString, TQVariant>& options); KDevFormatter( AStyleWidget * widget ); - QString indentString() const + TQString indentString() const { return m_indentString; } private: - bool predefinedStyle( const QString & style ); + bool predefinedStyle( const TQString & style ); private: - QString m_indentString; + TQString m_indentString; }; diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index 526af170..f89c2b95 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -1,9 +1,9 @@ #include "astyle_part.h" -#include <qwhatsthis.h> -#include <qvbox.h> -#include <qtextstream.h> -#include <qpopupmenu.h> +#include <tqwhatsthis.h> +#include <tqvbox.h> +#include <tqtextstream.h> +#include <tqpopupmenu.h> #include <kdeversion.h> #include <kdebug.h> #include <kdialogbase.h> @@ -27,8 +27,8 @@ #include <kfiledialog.h> #include <klocale.h> #include <kmessagebox.h> -#include <qlineedit.h> -#include <qregexp.h> +#include <tqlineedit.h> +#include <tqregexp.h> #include "astyle_widget.h" #include "astyle_adaptor.h" @@ -43,20 +43,20 @@ namespace { typedef KDevGenericFactory<AStylePart> AStyleFactory; K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( data ) ) -AStylePart::AStylePart(QObject *parent, const char *name, const QStringList &) +AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) : KDevSourceFormatter(&data, parent, name ? name : "AStylePart") { setInstance(AStyleFactory::instance()); setXMLFile("kdevpart_astyle.rc"); - formatTextAction = new KAction(i18n("&Reformat Source"), 0, this, SLOT(beautifySource()), actionCollection(), "edit_astyle"); + formatTextAction = new KAction(i18n("&Reformat Source"), 0, this, TQT_SLOT(beautifySource()), actionCollection(), "edit_astyle"); formatTextAction->setEnabled(false); formatTextAction->setToolTip(i18n("Reformat source")); formatTextAction->setWhatsThis(i18n("<b>Reformat source</b><p>Source reformatting functionality using <b>astyle</b> library. " "Also available in <b>New Class</b> and <b>Subclassing</b> wizards.")); - formatFileAction = new KAction(i18n("Format files"), 0, this, SLOT(formatFilesSelect()), actionCollection(), "tools_astyle"); + formatFileAction = new KAction(i18n("Format files"), 0, this, TQT_SLOT(formatFilesSelect()), actionCollection(), "tools_astyle"); formatFileAction->setEnabled(false); formatFileAction->setToolTip(i18n("Format files")); formatFileAction->setWhatsThis(i18n("<b>Fomat files</b><p>Formatting functionality using <b>astyle</b> library. " @@ -68,11 +68,11 @@ AStylePart::AStylePart(QObject *parent, const char *name, const QStringList &) m_configProxy->createProjectConfigPage(i18n("Formatting"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, SIGNAL(insertConfigWidget(const KDialogBase* ,QWidget*,unsigned int)), this, SLOT(insertConfigWidget(const KDialogBase*,QWidget*,unsigned int))); + connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase* ,TQWidget*,unsigned int)), this, TQT_SLOT(insertConfigWidget(const KDialogBase*,TQWidget*,unsigned int))); - connect(partController(), SIGNAL(activePartChanged(KParts::Part*)), this, SLOT(activePartChanged(KParts::Part*))); + connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(activePartChanged(KParts::Part*))); - connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), this, SLOT(contextMenu(QPopupMenu *, const Context *)) ); + connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); loadGlobal(); //use the globals first, project level will override later.. @@ -90,18 +90,18 @@ void AStylePart::loadGlobal() // kdDebug(9009) << "Load global"<<endl; KConfig *config = kapp->config(); config->setGroup("AStyle"); - QString options = config->readEntry("Options","BlockBreak=0,BlockBreakAll=0,BlockIfElse=0,Brackets=Break,BracketsCloseHeaders=0,FStyle=UserDefined,Fill=Tabs,FillCount=4,FillEmptyLines=0,FillForce=0,IndentBlocks=0,IndentBrackets=0,IndentCases=0,IndentClasses=1,IndentLabels=1,IndentNamespaces=1,IndentPreprocessors=0,IndentSwitches=1,KeepBlocks=1,KeepStatements=1,MaxStatement=40,MinConditional=-1,PadOperators=0,PadParenthesesIn=1,PadParenthesesOut=1,PadParenthesesUn=1,"); - m_globalExtensions=QStringList::split(",",config->readEntry("Extensions",defaultFormatExtensions)); + TQString options = config->readEntry("Options","BlockBreak=0,BlockBreakAll=0,BlockIfElse=0,Brackets=Break,BracketsCloseHeaders=0,FStyle=UserDefined,Fill=Tabs,FillCount=4,FillEmptyLines=0,FillForce=0,IndentBlocks=0,IndentBrackets=0,IndentCases=0,IndentClasses=1,IndentLabels=1,IndentNamespaces=1,IndentPreprocessors=0,IndentSwitches=1,KeepBlocks=1,KeepStatements=1,MaxStatement=40,MinConditional=-1,PadOperators=0,PadParenthesesIn=1,PadParenthesesOut=1,PadParenthesesUn=1,"); + m_globalExtensions=TQStringList::split(",",config->readEntry("Extensions",defaultFormatExtensions)); - QStringList pairs = QStringList::split( ",", options); - QStringList::Iterator it; + TQStringList pairs = TQStringList::split( ",", options); + TQStringList::Iterator it; for ( it = pairs.begin(); it != pairs.end(); ++it ) { - QStringList bits = QStringList::split( "=", (*it) ); + TQStringList bits = TQStringList::split( "=", (*it) ); m_global[bits[0]] = bits[1]; } -// for (QMap<QString, QVariant>::iterator iter = m_global.begin();iter != m_global.end();iter++) +// for (TQMap<TQString, TQVariant>::iterator iter = m_global.begin();iter != m_global.end();iter++) // { // kdDebug(9009) << "load: " <<iter.key() << "="<< iter.data() << endl; // } @@ -109,8 +109,8 @@ void AStylePart::loadGlobal() void AStylePart::saveGlobal() { - QString options; - for (QMap<QString, QVariant>::iterator iter = m_global.begin();iter != m_global.end();iter++) + TQString options; + for (TQMap<TQString, TQVariant>::iterator iter = m_global.begin();iter != m_global.end();iter++) { // kdDebug(9009) <<"saveGlobal" <<iter.key() << "="<< iter.data() << endl; options += iter.key(); @@ -118,7 +118,7 @@ void AStylePart::saveGlobal() options += iter.data().toString(); options += ","; } -// for (QMap<QString, QVariant>::iterator iter = m_project.begin();iter != m_project.end();iter++) +// for (TQMap<TQString, TQVariant>::iterator iter = m_project.begin();iter != m_project.end();iter++) // { // kdDebug(9009) << "project before: " <<iter.key() << "="<< iter.data() << endl; // } @@ -129,11 +129,11 @@ void AStylePart::saveGlobal() config->writeEntry("Extensions",m_globalExtensions.join(",")); config->sync(); -// for (QMap<QString, QVariant>::iterator iter = m_global.begin();iter != m_global.end();iter++) +// for (TQMap<TQString, TQVariant>::iterator iter = m_global.begin();iter != m_global.end();iter++) // { // kdDebug(9009) << "global after: " <<iter.key() << "="<< iter.data() << endl; // } -// for (QMap<QString, QVariant>::iterator iter = m_project.begin();iter != m_project.end();iter++) +// for (TQMap<TQString, TQVariant>::iterator iter = m_project.begin();iter != m_project.end();iter++) // { // kdDebug(9009) << "project after: " <<iter.key() << "="<< iter.data() << endl; // } @@ -165,19 +165,19 @@ void AStylePart::beautifySource() formatter.init(&is); - QString output; - QTextStream os(&output, IO_WriteOnly); + TQString output; + TQTextStream os(&output, IO_WriteOnly); // put the selection back to the same indent level. // taking note of the config options. unsigned int indentCount=0; - QString indentWith(""); + TQString indentWith(""); if ( has_selection){ - QString original = sel_iface->selection(); + TQString original = sel_iface->selection(); for (;indentCount<original.length();indentCount++){ - QChar ch = original[indentCount]; + TQChar ch = original[indentCount]; if ( ch.isSpace()){ - if ( ch == QChar('\n') || ch == QChar('\r')){ + if ( ch == TQChar('\n') || ch == TQChar('\r')){ indentWith=""; } else{ @@ -193,21 +193,21 @@ void AStylePart::beautifySource() if (m_project["Fill"].toString() == "Tabs") { // tabs and wsCount spaces to be a tab - QString replace; + TQString replace; for (int i =0;i<wsCount;i++) replace+=' '; - indentWith=indentWith.replace(replace, QChar('\t')); + indentWith=indentWith.replace(replace, TQChar('\t')); indentWith=indentWith.remove(' '); } else { if ( m_project["FillForce"].toBool()){ //convert tabs to spaces - QString replace; + TQString replace; for (int i =0;i<wsCount;i++) replace+=' '; - indentWith=indentWith.replace(QChar('\t'),replace); + indentWith=indentWith.replace(TQChar('\t'),replace); } } } @@ -216,7 +216,7 @@ void AStylePart::beautifySource() if ( has_selection ){ os << indentWith; } - os << QString::fromUtf8(formatter.nextLine().c_str()) << endl; + os << TQString::fromUtf8(formatter.nextLine().c_str()) << endl; } uint col = 0; @@ -242,31 +242,31 @@ void AStylePart::beautifySource() setCursorPos( partController()->activePart(), col, line ); } -void AStylePart::insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo) +void AStylePart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo) { switch (pageNo) { case GLOBALDOC_OPTIONS: { AStyleWidget *w = new AStyleWidget(this, true, page, "astyle config widget"); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { AStyleWidget *w = new AStyleWidget(this, false, page, "astyle config widget"); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); break; } } } -QString AStylePart::getGlobalExtensions(){ - QString values = m_globalExtensions.join("\n"); +TQString AStylePart::getGlobalExtensions(){ + TQString values = m_globalExtensions.join("\n"); return values.stripWhiteSpace(); } -QString AStylePart::getProjectExtensions(){ - QString values = m_projectExtensions.join("\n"); +TQString AStylePart::getProjectExtensions(){ + TQString values = m_projectExtensions.join("\n"); return values.stripWhiteSpace(); } @@ -277,21 +277,21 @@ QString AStylePart::getProjectExtensions(){ * end up at the top * @param ext */ -void AStylePart::setExtensions ( QString ext, bool global ) +void AStylePart::setExtensions ( TQString ext, bool global ) { kdDebug(9009) << "setExtensions " << ext<<endl; if ( global){ m_globalExtensions.clear(); - m_globalExtensions=QStringList::split ( QRegExp("\n"), ext ); + m_globalExtensions=TQStringList::split ( TQRegExp("\n"), ext ); } else{ m_searchExtensions.clear(); m_projectExtensions.clear(); - m_projectExtensions = QStringList::split ( QRegExp("\n"), ext ); - QStringList bits = QStringList::split(QRegExp("\\s+"),ext); - for ( QStringList::Iterator iter = bits.begin(); iter != bits.end(); iter++ ) + m_projectExtensions = TQStringList::split ( TQRegExp("\n"), ext ); + TQStringList bits = TQStringList::split(TQRegExp("\\s+"),ext); + for ( TQStringList::Iterator iter = bits.begin(); iter != bits.end(); iter++ ) { - QString ending=*iter; + TQString ending=*iter; if ( ending.startsWith ( "*" ) ) { if (ending.length() ==1 ){ @@ -325,7 +325,7 @@ void AStylePart::activePartChanged ( KParts::Part *part ) // check for the everything case.. if ( m_searchExtensions.find ( "*" ) == m_searchExtensions.end() ) { - QString extension = rw_part->url().path(); + TQString extension = rw_part->url().path(); int pos = extension.findRev ( '.' ); if ( pos >= 0 ) { @@ -343,18 +343,18 @@ void AStylePart::activePartChanged ( KParts::Part *part ) formatTextAction->setEnabled ( enabled ); } -QString AStylePart::formatSource( const QString text, AStyleWidget * widget, const QMap<QString, QVariant>& options ) +TQString AStylePart::formatSource( const TQString text, AStyleWidget * widget, const TQMap<TQString, TQVariant>& options ) { ASStringIterator is(text); KDevFormatter * formatter = ( widget)? new KDevFormatter( widget ) : new KDevFormatter(options); formatter->init(&is); - QString output; - QTextStream os(&output, IO_WriteOnly); + TQString output; + TQTextStream os(&output, IO_WriteOnly); while ( formatter->hasMoreLines() ) - os << QString::fromUtf8( formatter->nextLine().c_str() ) << endl; + os << TQString::fromUtf8( formatter->nextLine().c_str() ) << endl; delete formatter; @@ -383,23 +383,23 @@ void AStylePart::setCursorPos( KParts::Part *part, uint line, uint col ) } } -QString AStylePart::formatSource( const QString text ) +TQString AStylePart::formatSource( const TQString text ) { return formatSource(text, 0, m_project); } -QString AStylePart::indentString( ) const +TQString AStylePart::indentString( ) const { KDevFormatter formatter(m_project); return formatter.indentString(); } -void AStylePart::contextMenu(QPopupMenu *popup, const Context *context) +void AStylePart::contextMenu(TQPopupMenu *popup, const Context *context) { if (context->hasType( Context::EditorContext )) { popup->insertSeparator(); - int id = popup->insertItem( i18n("Format selection"), this, SLOT(beautifySource()) ); + int id = popup->insertItem( i18n("Format selection"), this, TQT_SLOT(beautifySource()) ); popup->setWhatsThis(id, i18n("<b>Format</b><p>Formats the current selection, if possible")); } else if ( context->hasType( Context::FileContext )){ @@ -407,16 +407,16 @@ void AStylePart::contextMenu(QPopupMenu *popup, const Context *context) m_urls = ctx->urls(); popup->insertSeparator(); - int id = popup->insertItem( i18n("Format files"), this, SLOT(formatFiles()) ); + int id = popup->insertItem( i18n("Format files"), this, TQT_SLOT(formatFiles()) ); popup->setWhatsThis(id, i18n("<b>Format files</b><p>Formats selected files if possible")); } } -void AStylePart::restorePartialProjectSession(const QDomElement * el) +void AStylePart::restorePartialProjectSession(const TQDomElement * el) { kdDebug(9009) << "Load project" << endl; - QDomElement style = el->namedItem("AStyle").toElement(); + TQDomElement style = el->namedItem("AStyle").toElement(); if (style.attribute("FStyle", "GLOBAL") == "GLOBAL") { @@ -426,36 +426,36 @@ void AStylePart::restorePartialProjectSession(const QDomElement * el) } else { - for (QMap<QString, QVariant>::iterator iter = m_global.begin();iter != m_global.end();iter++) + for (TQMap<TQString, TQVariant>::iterator iter = m_global.begin();iter != m_global.end();iter++) { m_project[iter.key()] = style.attribute(iter.key(),iter.data().toString()); } - QDomElement exten = el->namedItem("Extensions").toElement(); - QString ext = exten.attribute("ext").simplifyWhiteSpace(); + TQDomElement exten = el->namedItem("Extensions").toElement(); + TQString ext = exten.attribute("ext").simplifyWhiteSpace(); if ( ext.isEmpty()){ ext=defaultFormatExtensions; } - setExtensions(ext.replace(QChar(','), QChar('\n')),false); + setExtensions(ext.replace(TQChar(','), TQChar('\n')),false); } } -void AStylePart::savePartialProjectSession(QDomElement * el) +void AStylePart::savePartialProjectSession(TQDomElement * el) { - QDomDocument domDoc = el->ownerDocument(); + TQDomDocument domDoc = el->ownerDocument(); if (domDoc.isNull()) return; - QDomElement style = domDoc.createElement("AStyle"); + TQDomElement style = domDoc.createElement("AStyle"); style.setAttribute("FStyle", m_project["FStyle"].toString()); if (m_project["FStyle"] != "GLOBAL") { - for (QMap<QString, QVariant>::iterator iter = m_project.begin();iter != m_project.end();iter++) + for (TQMap<TQString, TQVariant>::iterator iter = m_project.begin();iter != m_project.end();iter++) { style.setAttribute(iter.key(),iter.data().toString()); } - QDomElement exten = domDoc.createElement ( "Extensions" ); + TQDomElement exten = domDoc.createElement ( "Extensions" ); exten.setAttribute ( "ext", m_projectExtensions.join(",").simplifyWhiteSpace() ); el->appendChild(exten); } @@ -464,9 +464,9 @@ void AStylePart::savePartialProjectSession(QDomElement * el) void AStylePart::formatFilesSelect(){ m_urls.clear(); - QStringList filenames = KFileDialog::getOpenFileNames ( QString::null, getProjectExtensions(),0,"Select files to format" ); + TQStringList filenames = KFileDialog::getOpenFileNames ( TQString::null, getProjectExtensions(),0,"Select files to format" ); - for(QStringList::Iterator it = filenames.begin(); it != filenames.end();it++){ + for(TQStringList::Iterator it = filenames.begin(); it != filenames.end();it++){ m_urls << *it; } formatFiles(); @@ -488,12 +488,12 @@ void AStylePart::formatFiles() uint processed = 0; for ( uint fileCount = 0; fileCount < m_urls.size(); fileCount++ ) { - QString fileName = m_urls[fileCount].pathOrURL(); + TQString fileName = m_urls[fileCount].pathOrURL(); bool found = false; - for ( QMap<QString, QString>::Iterator it = m_searchExtensions.begin(); it != m_searchExtensions.end(); ++it ) + for ( TQMap<TQString, TQString>::Iterator it = m_searchExtensions.begin(); it != m_searchExtensions.end(); ++it ) { - QRegExp re ( it.data(), true, true ); + TQRegExp re ( it.data(), true, true ); if ( re.search ( fileName ) == 0 && ( uint ) re.matchedLength() == fileName.length() ) { found = true; @@ -503,19 +503,19 @@ void AStylePart::formatFiles() if ( found ) { - QString backup = fileName + "#"; - QFile fin ( fileName ); - QFile fout ( backup ); + TQString backup = fileName + "#"; + TQFile fin ( fileName ); + TQFile fout ( backup ); if ( fin.open ( IO_ReadOnly ) ) { if ( fout.open ( IO_WriteOnly ) ) { - QString fileContents ( fin.readAll() ); + TQString fileContents ( fin.readAll() ); fin.close(); - QTextStream outstream ( &fout ); + TQTextStream outstream ( &fout ); outstream << formatSource ( fileContents ); fout.close(); - QDir().rename ( backup, fileName ); + TQDir().rename ( backup, fileName ); processed++; } else diff --git a/parts/astyle/astyle_part.h b/parts/astyle/astyle_part.h index bf572dcc..377a2b85 100644 --- a/parts/astyle/astyle_part.h +++ b/parts/astyle/astyle_part.h @@ -12,8 +12,8 @@ class KDialogBase; #include <kparts/part.h> #include <kdevplugin.h> #include <kdebug.h> -#include <qmap.h> -#include <qvariant.h> +#include <tqmap.h> +#include <tqvariant.h> class AStyleWidget; class QPopupMenu; @@ -26,21 +26,21 @@ class AStylePart : public KDevSourceFormatter public: - AStylePart(QObject *parent, const char *name, const QStringList &); + AStylePart(TQObject *parent, const char *name, const TQStringList &); ~AStylePart(); - QString formatSource(const QString text, AStyleWidget * widget, const QMap<QString, QVariant>& options); - virtual QString formatSource(const QString text); - QString indentString() const; + TQString formatSource(const TQString text, AStyleWidget * widget, const TQMap<TQString, TQVariant>& options); + virtual TQString formatSource(const TQString text); + TQString indentString() const; void saveGlobal(); - void setExtensions(QString ext, bool global); - QString getProjectExtensions(); - QString getGlobalExtensions(); - void restorePartialProjectSession(const QDomElement * el); - void savePartialProjectSession(QDomElement * el); + void setExtensions(TQString ext, bool global); + TQString getProjectExtensions(); + TQString getGlobalExtensions(); + void restorePartialProjectSession(const TQDomElement * el); + void savePartialProjectSession(TQDomElement * el); - QMap<QString, QVariant>& getProjectOptions(){return m_project;} - QMap<QString, QVariant>& getGlobalOptions(){return m_global;} + TQMap<TQString, TQVariant>& getProjectOptions(){return m_project;} + TQMap<TQString, TQVariant>& getGlobalOptions(){return m_global;} private slots: @@ -49,8 +49,8 @@ private slots: void beautifySource(); void formatFiles(); void formatFilesSelect(); - void insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo); - void contextMenu(QPopupMenu *popup, const Context *context); + void insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo); + void contextMenu(TQPopupMenu *popup, const Context *context); private: @@ -64,11 +64,11 @@ private: KAction *formatFileAction; // the configurable options. - QMap<QString, QVariant> m_project; - QMap<QString, QVariant> m_global; - QStringList m_projectExtensions; - QStringList m_globalExtensions; - QMap<QString, QString> m_searchExtensions; + TQMap<TQString, TQVariant> m_project; + TQMap<TQString, TQVariant> m_global; + TQStringList m_projectExtensions; + TQStringList m_globalExtensions; + TQMap<TQString, TQString> m_searchExtensions; KURL::List m_urls; }; diff --git a/parts/astyle/astyle_widget.cpp b/parts/astyle/astyle_widget.cpp index 0622b91b..0cb26abb 100644 --- a/parts/astyle/astyle_widget.cpp +++ b/parts/astyle/astyle_widget.cpp @@ -1,59 +1,59 @@ #include "astyle_part.h" #include "astyle_widget.h" -#include <qradiobutton.h> -#include <qtabwidget.h> -#include <qmultilineedit.h> -#include <qbuttongroup.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qspinbox.h> +#include <tqradiobutton.h> +#include <tqtabwidget.h> +#include <tqmultilineedit.h> +#include <tqbuttongroup.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqspinbox.h> #include <kapplication.h> #include <kdebug.h> #include <kdevcore.h> -AStyleWidget::AStyleWidget(AStylePart * part, bool global, QWidget *parent, const char *name) +AStyleWidget::AStyleWidget(AStylePart * part, bool global, TQWidget *parent, const char *name) : AStyleConfig(parent, name), m_part(part), isGlobalWidget(global) { // which style changed - disable the other pages. - connect(StyleGroup, SIGNAL(clicked(int)), this, SLOT(styleChanged())); - connect(ConfigTabs, SIGNAL(currentChanged(QWidget*)), this, SLOT(styleChanged()) ); + connect(StyleGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged())); + connect(ConfigTabs, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(styleChanged()) ); - connect(FillingGroup, SIGNAL(clicked(int)), this, SLOT(styleChanged())); - connect(Fill_ForceTabs, SIGNAL(clicked()), this, SLOT(styleChanged())); - connect(Fill_TabCount, SIGNAL(valueChanged(int)), this, SLOT(styleChanged())); - connect(Fill_SpaceCount, SIGNAL(valueChanged(int)), this, SLOT(styleChanged())); + connect(FillingGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged())); + connect(Fill_ForceTabs, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); + connect(Fill_TabCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); + connect(Fill_SpaceCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); - connect(BracketGroup, SIGNAL(clicked(int)), this, SLOT(styleChanged())); - connect(Brackets_CloseHeaders, SIGNAL(clicked()), this, SLOT(styleChanged())); + connect(BracketGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged())); + connect(Brackets_CloseHeaders, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Switches, SIGNAL(clicked()), this, SLOT(styleChanged())); - connect(Indent_Cases, SIGNAL(clicked()), this, SLOT(styleChanged())); - connect(Indent_Classes, SIGNAL(clicked()), this, SLOT(styleChanged())); - connect(Indent_Brackets, SIGNAL(clicked()), this, SLOT(styleChanged())); - connect(Indent_Namespaces, SIGNAL(clicked()), this, SLOT(styleChanged())); - connect(Indent_Labels, SIGNAL(clicked()), this, SLOT(styleChanged())); - connect(Indent_Blocks, SIGNAL(clicked()), this, SLOT(styleChanged())); - connect(Indent_Preprocessors, SIGNAL(clicked()), this, SLOT(styleChanged())); + connect(Indent_Switches, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); + connect(Indent_Cases, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); + connect(Indent_Classes, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); + connect(Indent_Brackets, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); + connect(Indent_Namespaces, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); + connect(Indent_Labels, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); + connect(Indent_Blocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); + connect(Indent_Preprocessors, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Continue_MaxStatement, SIGNAL(valueChanged(int)), this, SLOT(styleChanged())); - connect(Continue_MinConditional, SIGNAL(valueChanged(int)), this, SLOT(styleChanged())); + connect(Continue_MaxStatement, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); + connect(Continue_MinConditional, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); - connect(Block_Break, SIGNAL(clicked()), this, SLOT(styleChanged())); - connect(Block_BreakAll, SIGNAL(clicked()), this, SLOT(styleChanged())); - connect(Block_IfElse, SIGNAL(clicked()), this, SLOT(styleChanged())); + connect(Block_Break, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); + connect(Block_BreakAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); + connect(Block_IfElse, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Pad_ParenthesesIn, SIGNAL(clicked()), this, SLOT(styleChanged())); - connect(Pad_ParenthesesOut, SIGNAL(clicked()), this, SLOT(styleChanged())); - connect(Pad_ParenthesesUn, SIGNAL(clicked()), this, SLOT(styleChanged())); - connect(Pad_Operators, SIGNAL(clicked()), this, SLOT(styleChanged())); + connect(Pad_ParenthesesIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); + connect(Pad_ParenthesesOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); + connect(Pad_ParenthesesUn, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); + connect(Pad_Operators, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Keep_Statements, SIGNAL(clicked()), this, SLOT(styleChanged())); - connect(Keep_Blocks, SIGNAL(clicked()), this, SLOT(styleChanged())); + connect(Keep_Statements, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); + connect(Keep_Blocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - QMap<QString, QVariant> option; + TQMap<TQString, TQVariant> option; if ( isGlobalWidget){ Style_Global->hide(); option = m_part->getGlobalOptions(); @@ -64,7 +64,7 @@ AStyleWidget::AStyleWidget(AStylePart * part, bool global, QWidget *parent, cons } // style - QString s = option["FStyle"].toString(); + TQString s = option["FStyle"].toString(); // fake the id so we disable the other pages. int id=0; if (s == "ANSI") id=1; @@ -172,7 +172,7 @@ AStyleWidget::~AStyleWidget() void AStyleWidget::accept() { - QMap<QString, QVariant>* m_option; + TQMap<TQString, TQVariant>* m_option; if ( isGlobalWidget){ m_option = &(m_part->getGlobalOptions()); m_part->setExtensions(GeneralExtension->text(),true); @@ -195,8 +195,8 @@ void AStyleWidget::accept() else if (Style_JAVA->isChecked()) (*m_option)["FStyle"] = "JAVA"; else if (Style_Global->isChecked()){ - QMap<QString,QVariant>& global = m_part->getGlobalOptions(); - QMap<QString,QVariant>& project = m_part->getProjectOptions(); + TQMap<TQString,TQVariant>& global = m_part->getGlobalOptions(); + TQMap<TQString,TQVariant>& project = m_part->getProjectOptions(); project=global; project["FStyle"]="GLOBAL"; } @@ -264,7 +264,7 @@ void AStyleWidget::accept() } if ( isGlobalWidget){ - QMap<QString, QVariant>& project = m_part->getProjectOptions(); + TQMap<TQString, TQVariant>& project = m_part->getProjectOptions(); if ( project["FStyle"] == "GLOBAL"){ project = m_part->getGlobalOptions(); project["FStyle"] = "GLOBAL"; @@ -272,7 +272,7 @@ void AStyleWidget::accept() m_part->saveGlobal(); } -// for ( QMap<QString, QVariant>::ConstIterator iter = m_option->begin();iter != m_option->end();iter++ ) +// for ( TQMap<TQString, TQVariant>::ConstIterator iter = m_option->begin();iter != m_option->end();iter++ ) // { // kdDebug ( 9009 ) << "widget: " << iter.key() << "=" << iter.data() << endl; // } @@ -296,13 +296,13 @@ void AStyleWidget::styleChanged( ) StyleExample->clear(); - QString bracketSample = "namespace foospace {\n\tint Foo(){\n\tif (isBar)\n{\nbar(); \n\treturn 1; } else \nreturn 0;}}\n\nvoid test(){\n\tif (isFoo){\n\tbar();\n} else\n{\n\tbar();\n}\n}\n"; + TQString bracketSample = "namespace foospace {\n\tint Foo(){\n\tif (isBar)\n{\nbar(); \n\treturn 1; } else \nreturn 0;}}\n\nvoid test(){\n\tif (isFoo){\n\tbar();\n} else\n{\n\tbar();\n}\n}\n"; - QString indentSample = "#define foobar(A)\\\n{Foo();Bar();}\n#define anotherFoo(B)\\\nreturn Bar()\n\nnamespace Bar\n{\nclass Foo\n{public:\nFoo();\nvirtual ~Foo();\n};\nswitch (foo)\n{\ncase 1:\na+=1;\nbreak;\ncase 2:\n{\na += 2;\n break;\n}\n}\nif (isFoo)\n{\nbar();\n}\nelse\n{\nanotherBar();\n}\nint foo()\n\twhile(isFoo)\n\t\t{\n\t\t\t...\n\t\t\tgoto error;\n\t\t....\n\t\terror:\n\t\t\t...\n\t\t}\n\t}\nfooArray[]={ red,\n\tgreen,\n\tdarkblue};\nfooFunction(barArg1,\n\tbarArg2,\n\tbarArg3);\n"; + TQString indentSample = "#define foobar(A)\\\n{Foo();Bar();}\n#define anotherFoo(B)\\\nreturn Bar()\n\nnamespace Bar\n{\nclass Foo\n{public:\nFoo();\nvirtual ~Foo();\n};\nswitch (foo)\n{\ncase 1:\na+=1;\nbreak;\ncase 2:\n{\na += 2;\n break;\n}\n}\nif (isFoo)\n{\nbar();\n}\nelse\n{\nanotherBar();\n}\nint foo()\n\twhile(isFoo)\n\t\t{\n\t\t\t...\n\t\t\tgoto error;\n\t\t....\n\t\terror:\n\t\t\t...\n\t\t}\n\t}\nfooArray[]={ red,\n\tgreen,\n\tdarkblue};\nfooFunction(barArg1,\n\tbarArg2,\n\tbarArg3);\n"; - QString formattingSample = "void func(){\n\tif(isFoo(a,b))\n\tbar(a,b);\nif(isFoo)\n\ta=bar((b-c)*a,*d--);\nif( isFoo( a,b ) )\n\tbar(a, b);\nif (isFoo) {isFoo=false;cat << isFoo <<endl;}\nif(isFoo)DoBar();if (isFoo){\n\tbar();\n}\n\telse if(isBar()){\n\tannotherBar();\n}\n}\n"; + TQString formattingSample = "void func(){\n\tif(isFoo(a,b))\n\tbar(a,b);\nif(isFoo)\n\ta=bar((b-c)*a,*d--);\nif( isFoo( a,b ) )\n\tbar(a, b);\nif (isFoo) {isFoo=false;cat << isFoo <<endl;}\nif(isFoo)DoBar();if (isFoo){\n\tbar();\n}\n\telse if(isBar()){\n\tannotherBar();\n}\n}\n"; - QString styleSample = "\t//Tabs & Brackets\nnamespace foo{\n" + bracketSample + "}\n\t// Indentation\n" + indentSample + "\t// Formatting\n" + formattingSample; + TQString styleSample = "\t//Tabs & Brackets\nnamespace foo{\n" + bracketSample + "}\n\t// Indentation\n" + indentSample + "\t// Formatting\n" + formattingSample; switch(id){ case 1: diff --git a/parts/astyle/astyle_widget.h b/parts/astyle/astyle_widget.h index ac779985..0d379fc0 100644 --- a/parts/astyle/astyle_widget.h +++ b/parts/astyle/astyle_widget.h @@ -13,7 +13,7 @@ class AStyleWidget : public AStyleConfig public: - AStyleWidget( AStylePart * part, bool global, QWidget *parent=0, const char *name=0 ); + AStyleWidget( AStylePart * part, bool global, TQWidget *parent=0, const char *name=0 ); ~AStyleWidget(); @@ -28,7 +28,7 @@ private slots: private: AStylePart * m_part; bool isGlobalWidget; - QString m_lastExt; + TQString m_lastExt; bool globalOptions; }; diff --git a/parts/bookmarks/bookmarks_config.cpp b/parts/bookmarks/bookmarks_config.cpp index 095c3f83..939dc6c2 100644 --- a/parts/bookmarks/bookmarks_config.cpp +++ b/parts/bookmarks/bookmarks_config.cpp @@ -125,12 +125,12 @@ void BookmarksConfig::setToolTip( bool tooltip ) _tooltip = tooltip; } -QString BookmarksConfig::token( ) +TQString BookmarksConfig::token( ) { return _token; } -void BookmarksConfig::setToken( QString const & token ) +void BookmarksConfig::setToken( TQString const & token ) { _token = token; } diff --git a/parts/bookmarks/bookmarks_config.h b/parts/bookmarks/bookmarks_config.h index c372eb51..38a3f0e9 100644 --- a/parts/bookmarks/bookmarks_config.h +++ b/parts/bookmarks/bookmarks_config.h @@ -34,8 +34,8 @@ public: unsigned int context(); void setContext( unsigned int ); - QString token(); - void setToken( QString const & ); + TQString token(); + void setToken( TQString const & ); void readConfig(); void writeConfig(); @@ -44,7 +44,7 @@ private: bool _tooltip; CodeLineType _codeline; unsigned int _context; - QString _token; + TQString _token; }; diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp index f23863af..50830723 100644 --- a/parts/bookmarks/bookmarks_part.cpp +++ b/parts/bookmarks/bookmarks_part.cpp @@ -9,11 +9,11 @@ * * ***************************************************************************/ -#include <qwhatsthis.h> -#include <qvbox.h> -#include <qtimer.h> -#include <qtextstream.h> -#include <qfile.h> +#include <tqwhatsthis.h> +#include <tqvbox.h> +#include <tqtimer.h> +#include <tqtextstream.h> +#include <tqfile.h> #include <kdebug.h> #include <kiconloader.h> @@ -44,7 +44,7 @@ typedef KDevGenericFactory<BookmarksPart> BookmarksFactory; static const KDevPluginInfo data("kdevbookmarks"); K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( data ) ) -BookmarksPart::BookmarksPart(QObject *parent, const char *name, const QStringList& ) +BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringList& ) : KDevPlugin(&data, parent, name ? name : "BookmarksPart" ) { setInstance(BookmarksFactory::instance()); @@ -54,9 +54,9 @@ BookmarksPart::BookmarksPart(QObject *parent, const char *name, const QStringLis _widget->setCaption(i18n("Bookmarks")); _widget->setIcon(SmallIcon( info()->icon() )); - _marksChangeTimer = new QTimer( this ); + _marksChangeTimer = new TQTimer( this ); - QWhatsThis::add(_widget, i18n("<b>Bookmarks</b><p>" + TQWhatsThis::add(_widget, i18n("<b>Bookmarks</b><p>" "The bookmark viewer shows all the source bookmarks in the project.")); mainWindow()->embedSelectView(_widget, i18n("Bookmarks"), i18n("Source bookmarks")); @@ -64,19 +64,19 @@ BookmarksPart::BookmarksPart(QObject *parent, const char *name, const QStringLis _editorMap.setAutoDelete( true ); _settingMarks = false; - connect( partController(), SIGNAL( partAdded( KParts::Part * ) ), this, SLOT( partAdded( KParts::Part * ) ) ); + connect( partController(), TQT_SIGNAL( partAdded( KParts::Part * ) ), this, TQT_SLOT( partAdded( KParts::Part * ) ) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("Bookmarks"), BOOKMARKSETTINGSPAGE, 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( _widget, SIGNAL( removeAllBookmarksForURL( const KURL & ) ), - this, SLOT( removeAllBookmarksForURL( const KURL & ) ) ); - connect( _widget, SIGNAL( removeBookmarkForURL( const KURL &, int ) ), - this, SLOT( removeBookmarkForURL( const KURL &, int ) ) ); + connect( _widget, TQT_SIGNAL( removeAllBookmarksForURL( const KURL & ) ), + this, TQT_SLOT( removeAllBookmarksForURL( const KURL & ) ) ); + connect( _widget, TQT_SIGNAL( removeBookmarkForURL( const KURL &, int ) ), + this, TQT_SLOT( removeBookmarkForURL( const KURL &, int ) ) ); - connect( _marksChangeTimer, SIGNAL( timeout() ), this, SLOT( marksChanged() ) ); + connect( _marksChangeTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( marksChanged() ) ); _config = new BookmarksConfig; _config->readConfig(); @@ -112,10 +112,10 @@ void BookmarksPart::partAdded( KParts::Part * part ) // connect to this editor KTextEditor::Document * doc = static_cast<KTextEditor::Document*>( ro_part ); - connect( doc, SIGNAL( marksChanged() ), this, SLOT( marksEvent() ) ); + connect( doc, TQT_SIGNAL( marksChanged() ), this, TQT_SLOT( marksEvent() ) ); // workaround for a katepart oddity where it drops all bookmarks on 'reload' - connect( doc, SIGNAL( completed() ), this, SLOT( reload() ) ); + connect( doc, TQT_SIGNAL( completed() ), this, TQT_SLOT( reload() ) ); } } } @@ -124,7 +124,7 @@ void BookmarksPart::reload() { //kdDebug(0) << "BookmarksPart::reload()" << endl; - QObject * senderobj = const_cast<QObject*>( sender() ); + TQObject * senderobj = const_cast<TQObject*>( sender() ); if ( KParts::ReadOnlyPart * ro_part = dynamic_cast<KParts::ReadOnlyPart *>( senderobj ) ) { if ( partIsSane( ro_part ) ) @@ -140,7 +140,7 @@ void BookmarksPart::marksEvent() if ( ! _settingMarks ) { - QObject * senderobj = const_cast<QObject*>( sender() ); + TQObject * senderobj = const_cast<TQObject*>( sender() ); KParts::ReadOnlyPart * ro_part = dynamic_cast<KParts::ReadOnlyPart *>( senderobj ); if ( partIsSane( ro_part ) && !_dirtyParts.contains( ro_part ) ) @@ -155,7 +155,7 @@ void BookmarksPart::marksChanged() { //kdDebug(0) << "BookmarksPart::marksChanged()" << endl; - QValueListIterator<KParts::ReadOnlyPart*> it = _dirtyParts.begin(); + TQValueListIterator<KParts::ReadOnlyPart*> it = _dirtyParts.begin(); while ( it != _dirtyParts.end() ) { KParts::ReadOnlyPart * ro_part = *it; @@ -179,31 +179,31 @@ void BookmarksPart::marksChanged() _dirtyParts.clear(); } -void BookmarksPart::restorePartialProjectSession( const QDomElement * el ) +void BookmarksPart::restorePartialProjectSession( const TQDomElement * el ) { //kdDebug(0) << "BookmarksPart::restorePartialProjectSession()" << endl; if ( ! el ) return; - QDomElement bookmarksList = el->namedItem( "bookmarks" ).toElement(); + TQDomElement bookmarksList = el->namedItem( "bookmarks" ).toElement(); if ( bookmarksList.isNull() ) return; - QDomElement bookmark = bookmarksList.firstChild().toElement(); + TQDomElement bookmark = bookmarksList.firstChild().toElement(); while ( ! bookmark.isNull() ) { - QString path = bookmark.attribute( "url" ); - if ( path != QString::null ) + TQString path = bookmark.attribute( "url" ); + if ( path != TQString::null ) { EditorData * data = new EditorData; data->url.setPath( path ); - QDomElement mark = bookmark.firstChild().toElement(); + TQDomElement mark = bookmark.firstChild().toElement(); while ( ! mark.isNull() ) { - QString line = mark.attribute( "line" ); - if ( line != QString::null ) + TQString line = mark.attribute( "line" ); + if ( line != TQString::null ) { - data->marks.append( qMakePair( line.toInt(), QString() ) ); + data->marks.append( qMakePair( line.toInt(), TQString() ) ); } mark = mark.nextSibling().toElement(); } @@ -224,28 +224,28 @@ void BookmarksPart::restorePartialProjectSession( const QDomElement * el ) _widget->update( _editorMap ); } -void BookmarksPart::savePartialProjectSession( QDomElement * el ) +void BookmarksPart::savePartialProjectSession( TQDomElement * el ) { //kdDebug(0) << "BookmarksPart::savePartialProjectSession()" << endl; if ( ! el ) return; - QDomDocument domDoc = el->ownerDocument(); + TQDomDocument domDoc = el->ownerDocument(); if ( domDoc.isNull() ) return; - QDomElement bookmarksList = domDoc.createElement( "bookmarks" ); + TQDomElement bookmarksList = domDoc.createElement( "bookmarks" ); - QDictIterator<EditorData> it( _editorMap ); + TQDictIterator<EditorData> it( _editorMap ); while ( it.current() ) { - QDomElement bookmark = domDoc.createElement( "bookmark" ); + TQDomElement bookmark = domDoc.createElement( "bookmark" ); bookmark.setAttribute( "url", it.current()->url.path() ); bookmarksList.appendChild( bookmark ); - QValueListIterator< QPair<int,QString> > it2 = it.current()->marks.begin(); + TQValueListIterator< QPair<int,TQString> > it2 = it.current()->marks.begin(); while ( it2 != it.current()->marks.end() ) { - QDomElement line = domDoc.createElement( "mark" ); + TQDomElement line = domDoc.createElement( "mark" ); line.setAttribute( "line", (*it2).first ); bookmark.appendChild( line ); ++it2; @@ -275,7 +275,7 @@ void BookmarksPart::removeBookmarkForURL( KURL const & url, int line ) if ( EditorData * data = _editorMap.find( url.path() ) ) { - QValueListIterator< QPair<int,QString> > it = data->marks.begin(); + TQValueListIterator< QPair<int,TQString> > it = data->marks.begin(); while ( it != data->marks.end() ) { if ( (*it).first == line ) @@ -309,7 +309,7 @@ void BookmarksPart::updateContextStringForURL( KParts::ReadOnlyPart * ro_part ) if ( ! ( data && ed ) ) return; - QValueListIterator< QPair<int,QString> > it = data->marks.begin(); + TQValueListIterator< QPair<int,TQString> > it = data->marks.begin(); while ( it != data->marks.end() ) { (*it).second = ed->textLine( (*it).first ); @@ -324,7 +324,7 @@ void BookmarksPart::updateContextStringForURL( KURL const & url ) void BookmarksPart::updateContextStringForAll() { - QDictIterator<EditorData> it( _editorMap ); + TQDictIterator<EditorData> it( _editorMap ); while ( it.current() ) { if ( ! it.current()->marks.isEmpty() ) @@ -347,7 +347,7 @@ bool BookmarksPart::setBookmarksForURL( KParts::ReadOnlyPart * ro_part ) { // we've seen this one before, apply stored bookmarks - QValueListIterator< QPair<int,QString> > it = data->marks.begin(); + TQValueListIterator< QPair<int,TQString> > it = data->marks.begin(); while ( it != data->marks.end() ) { mi->addMark( (*it).first, KTextEditor::MarkInterface::markType01 ); @@ -371,8 +371,8 @@ bool BookmarksPart::clearBookmarksForURL( KParts::ReadOnlyPart * ro_part ) { _settingMarks = true; - QPtrList<KTextEditor::Mark> marks = mi->marks(); - QPtrListIterator<KTextEditor::Mark> it( marks ); + TQPtrList<KTextEditor::Mark> marks = mi->marks(); + TQPtrListIterator<KTextEditor::Mark> it( marks ); while ( it.current() ) { if ( it.current()->type & KTextEditor::MarkInterface::markType01 ) @@ -402,14 +402,14 @@ EditorData * BookmarksPart::storeBookmarksForURL( KParts::ReadOnlyPart * ro_part // removing previous data for this url, if any _editorMap.remove( data->url.path() ); - QPtrList<KTextEditor::Mark> marks = mi->marks(); - QPtrListIterator<KTextEditor::Mark> it( marks ); + TQPtrList<KTextEditor::Mark> marks = mi->marks(); + TQPtrListIterator<KTextEditor::Mark> it( marks ); while ( it.current() ) { if ( it.current()->type & KTextEditor::MarkInterface::markType01 ) { int line = it.current()->line; - data->marks.append( qMakePair( line, QString() ) ); + data->marks.append( qMakePair( line, TQString() ) ); } ++it; } @@ -430,9 +430,9 @@ EditorData * BookmarksPart::storeBookmarksForURL( KParts::ReadOnlyPart * ro_part void BookmarksPart::setBookmarksForAllURLs() { - if( const QPtrList<KParts::Part> * partlist = partController()->parts() ) + if( const TQPtrList<KParts::Part> * partlist = partController()->parts() ) { - QPtrListIterator<KParts::Part> it( *partlist ); + TQPtrListIterator<KParts::Part> it( *partlist ); while ( KParts::Part* part = it.current() ) { if ( KParts::ReadOnlyPart * ro_part = dynamic_cast<KParts::ReadOnlyPart *>( part ) ) @@ -446,9 +446,9 @@ void BookmarksPart::setBookmarksForAllURLs() void BookmarksPart::storeBookmarksForAllURLs() { - if( const QPtrList<KParts::Part> * partlist = partController()->parts() ) + if( const TQPtrList<KParts::Part> * partlist = partController()->parts() ) { - QPtrListIterator<KParts::Part> it( *partlist ); + TQPtrListIterator<KParts::Part> it( *partlist ); while ( KParts::Part* part = it.current() ) { if ( KParts::ReadOnlyPart * ro_part = dynamic_cast<KParts::ReadOnlyPart *>( part ) ) @@ -463,7 +463,7 @@ void BookmarksPart::storeBookmarksForAllURLs() // reimplemented from PartController::partForURL to avoid linking KParts::ReadOnlyPart * BookmarksPart::partForURL( KURL const & url ) { - QPtrListIterator<KParts::Part> it( *partController()->parts() ); + TQPtrListIterator<KParts::Part> it( *partController()->parts() ); while( it.current() ) { KParts::ReadOnlyPart *ro_part = dynamic_cast<KParts::ReadOnlyPart*>(it.current()); @@ -483,20 +483,20 @@ bool BookmarksPart::partIsSane( KParts::ReadOnlyPart * ro_part ) !ro_part->url().path().isEmpty(); } -void BookmarksPart::insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int pagenumber ) +void BookmarksPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber ) { kdDebug() << k_funcinfo << endl; if ( pagenumber == BOOKMARKSETTINGSPAGE ) { BookmarkSettings * w = new BookmarkSettings( this, page ); - connect( dlg, SIGNAL(okClicked()), w, SLOT(slotAccept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); } } //////////////////////////////////////////// -QStringList BookmarksPart::getContextFromStream( QTextStream & istream, unsigned int line, unsigned int context ) +TQStringList BookmarksPart::getContextFromStream( TQTextStream & istream, unsigned int line, unsigned int context ) { kdDebug() << k_funcinfo << endl; @@ -504,10 +504,10 @@ QStringList BookmarksPart::getContextFromStream( QTextStream & istream, unsigned int endline = line + context; int n = 0; - QStringList list; + TQStringList list; while ( !istream.atEnd() ) { - QString templine = istream.readLine(); + TQString templine = istream.readLine(); if ( (n >= startline) && ( n <= endline ) ) { list << templine; @@ -531,31 +531,31 @@ QStringList BookmarksPart::getContextFromStream( QTextStream & istream, unsigned return list; } -QStringList BookmarksPart::getContext( KURL const & url, unsigned int line, unsigned int context ) +TQStringList BookmarksPart::getContext( KURL const & url, unsigned int line, unsigned int context ) { // if the file is open - get the line from the editor buffer if ( KTextEditor::EditInterface * ei = dynamic_cast<KTextEditor::EditInterface*>( partForURL( url ) ) ) { kdDebug() << "the file is open - get the line from the editor buffer" << endl; - QString ibuffer = ei->text(); - QTextStream istream( &ibuffer, IO_ReadOnly ); + TQString ibuffer = ei->text(); + TQTextStream istream( &ibuffer, IO_ReadOnly ); return getContextFromStream( istream, line, context ); } else if ( url.isLocalFile() ) // else the file is not open - get the line from the file on disk { kdDebug() << "the file is not open - get the line from the file on disk" << endl; - QFile file( url.path() ); - QString buffer; + TQFile file( url.path() ); + TQString buffer; if ( file.open( IO_ReadOnly ) ) { - QTextStream istream( &file ); + TQTextStream istream( &file ); return getContextFromStream( istream, line, context ); } } - return QStringList( i18n("Could not find file") ); + return TQStringList( i18n("Could not find file") ); } BookmarksConfig * BookmarksPart::config( ) diff --git a/parts/bookmarks/bookmarks_part.h b/parts/bookmarks/bookmarks_part.h index 32a105ad..7abfeb9e 100644 --- a/parts/bookmarks/bookmarks_part.h +++ b/parts/bookmarks/bookmarks_part.h @@ -14,10 +14,10 @@ #define __KDEVPART_BOOKMARKS_H__ -#include <qguardedptr.h> -#include <qvaluelist.h> -#include <qdict.h> -#include <qpair.h> +#include <tqguardedptr.h> +#include <tqvaluelist.h> +#include <tqdict.h> +#include <tqpair.h> #include <kparts/part.h> #include <kurl.h> @@ -32,7 +32,7 @@ class ConfigWidgetProxy; struct EditorData { KURL url; - QValueList< QPair<int,QString> > marks; + TQValueList< QPair<int,TQString> > marks; }; class BookmarksWidget; @@ -44,16 +44,16 @@ class BookmarksPart : public KDevPlugin public: - BookmarksPart(QObject *parent, const char *name, const QStringList &); + BookmarksPart(TQObject *parent, const char *name, const TQStringList &); ~BookmarksPart(); // reimplemented from KDevPlugin - void restorePartialProjectSession( const QDomElement * el ); - void savePartialProjectSession( QDomElement * el ); + void restorePartialProjectSession( const TQDomElement * el ); + void savePartialProjectSession( TQDomElement * el ); BookmarksConfig * config(); - QStringList getContext( KURL const & url, unsigned int line, unsigned int context ); + TQStringList getContext( KURL const & url, unsigned int line, unsigned int context ); private slots: // connected to partcontroller @@ -72,7 +72,7 @@ private slots: void removeAllBookmarksForURL( const KURL & ); void removeBookmarkForURL( const KURL &, int ); - void insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int ); + void insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int ); private: bool setBookmarksForURL( KParts::ReadOnlyPart * ); @@ -86,21 +86,21 @@ private: void updateContextStringForURL( KURL const & url ); void updateContextStringForAll(); - QStringList getContextFromStream( QTextStream & istream, unsigned int line, unsigned int context ); + TQStringList getContextFromStream( TQTextStream & istream, unsigned int line, unsigned int context ); KParts::ReadOnlyPart * partForURL( KURL const & url ); bool partIsSane( KParts::ReadOnlyPart * ); - QGuardedPtr<BookmarksWidget> _widget; - QDict<EditorData> _editorMap; + TQGuardedPtr<BookmarksWidget> _widget; + TQDict<EditorData> _editorMap; bool _settingMarks; // are we currently in the process of setting bookmarks? BookmarksConfig * _config; ConfigWidgetProxy * _configProxy; - QTimer * _marksChangeTimer; - QValueList<KParts::ReadOnlyPart*> _dirtyParts; + TQTimer * _marksChangeTimer; + TQValueList<KParts::ReadOnlyPart*> _dirtyParts; }; diff --git a/parts/bookmarks/bookmarks_settings.cpp b/parts/bookmarks/bookmarks_settings.cpp index 235ec261..58369d92 100644 --- a/parts/bookmarks/bookmarks_settings.cpp +++ b/parts/bookmarks/bookmarks_settings.cpp @@ -9,9 +9,9 @@ * * ***************************************************************************/ -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qspinbox.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqspinbox.h> #include <klineedit.h> #include "bookmarks_part.h" @@ -19,7 +19,7 @@ #include "bookmarks_settings.h" -BookmarkSettings::BookmarkSettings( BookmarksPart * part, QWidget* parent, const char* name, WFlags fl ) +BookmarkSettings::BookmarkSettings( BookmarksPart * part, TQWidget* parent, const char* name, WFlags fl ) : BookmarkSettingsBase( parent, name, fl ), m_part( part ) { m_part->config()->readConfig(); diff --git a/parts/bookmarks/bookmarks_settings.h b/parts/bookmarks/bookmarks_settings.h index 3fa6c5e9..699941ca 100644 --- a/parts/bookmarks/bookmarks_settings.h +++ b/parts/bookmarks/bookmarks_settings.h @@ -21,7 +21,7 @@ class BookmarkSettings : public BookmarkSettingsBase Q_OBJECT public: - BookmarkSettings( BookmarksPart * part, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + BookmarkSettings( BookmarksPart * part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~BookmarkSettings(); public slots: diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp index 683c32e1..20ab2cd9 100644 --- a/parts/bookmarks/bookmarks_widget.cpp +++ b/parts/bookmarks/bookmarks_widget.cpp @@ -9,11 +9,11 @@ * * ***************************************************************************/ -#include <qdict.h> -#include <qheader.h> -#include <qtooltip.h> -#include <qpair.h> -#include <qstylesheet.h> +#include <tqdict.h> +#include <tqheader.h> +#include <tqtooltip.h> +#include <tqpair.h> +#include <tqstylesheet.h> #include <kparts/part.h> #include <klibloader.h> @@ -59,13 +59,13 @@ static const char* const bookmark_xpm[]={ class BookmarkItem : public QListViewItem { public: - BookmarkItem( QListView * parent, KURL const & url ) - : QListViewItem( parent, url.fileName() ), + BookmarkItem( TQListView * parent, KURL const & url ) + : TQListViewItem( parent, url.fileName() ), _url( url ), _line( -1 ), _isBookmark( false ) {} - BookmarkItem( QListViewItem * parent, KURL const & url, QPair<int,QString> mark ) - : QListViewItem( parent, QString::number( mark.first +1 ).rightJustify( 5 ) ), + BookmarkItem( TQListViewItem * parent, KURL const & url, QPair<int,TQString> mark ) + : TQListViewItem( parent, TQString::number( mark.first +1 ).rightJustify( 5 ) ), _url( url ), _line( mark.first ), _isBookmark( true ) { BookmarksWidget * lv = static_cast<BookmarksWidget*>( listView() ); @@ -97,17 +97,17 @@ public: return _line; } - QString tipText() + TQString tipText() { if ( _isBookmark ) { BookmarksWidget * w = static_cast<BookmarksWidget*> ( listView() ); - QStringList list = w->getContext( _url, _line ); + TQStringList list = w->getContext( _url, _line ); - QString code = "<qt><table><tr><td><pre>"; + TQString code = "<qt><table><tr><td><pre>"; for ( uint i = 0; i < list.count(); i++) { - QString temp = QStyleSheet::escape( list[i] ); + TQString temp = TQStyleSheet::escape( list[i] ); if ( i == (list.count() / 2) ) // count() is always odd { @@ -134,40 +134,40 @@ private: KURL _url; int _line; bool _isBookmark; - QString _code; + TQString _code; }; BookmarksWidget::BookmarksWidget(BookmarksPart *part) - : KListView(0, "bookmarks widget"), QToolTip( viewport() ), + : KListView(0, "bookmarks widget"), TQToolTip( viewport() ), _part( part ) { - addColumn( QString::null ); + addColumn( TQString::null ); header()->hide(); setRootIsDecorated( true ); - setResizeMode( QListView::LastColumn ); + setResizeMode( TQListView::LastColumn ); setAllColumnsShowFocus( true ); // setSortColumn( -1 ); - connect( this, SIGNAL( executed( QListViewItem * ) ), this, SLOT( itemClicked( QListViewItem * ) ) ); - connect( this, SIGNAL( returnPressed( QListViewItem * ) ), this, SLOT( itemClicked( QListViewItem * ) ) ); - connect( this, SIGNAL( contextMenuRequested ( QListViewItem *, const QPoint & , int ) ), - this, SLOT( popupMenu(QListViewItem *, const QPoint & , int ) ) ); + connect( this, TQT_SIGNAL( executed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), + this, TQT_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) ); } BookmarksWidget::~BookmarksWidget() {} -void BookmarksWidget::maybeTip(const QPoint &p) +void BookmarksWidget::maybeTip(const TQPoint &p) { // kdDebug(0) << "ToolTip::maybeTip()" << endl; if ( ! _part->config()->toolTip() ) return; BookmarkItem * item = dynamic_cast<BookmarkItem*>( itemAt( p ) ); - QRect r = itemRect( item ); + TQRect r = itemRect( item ); if ( item && r.isValid() ) { @@ -175,13 +175,13 @@ void BookmarksWidget::maybeTip(const QPoint &p) } } -void BookmarksWidget::update( QDict<EditorData> const & map ) +void BookmarksWidget::update( TQDict<EditorData> const & map ) { // kdDebug(0) << "BookmarksWidget::update()" << endl; - QListView::clear(); + TQListView::clear(); - QDictIterator<EditorData> it( map ); + TQDictIterator<EditorData> it( map ); while ( it.current() ) { if ( ! it.current()->marks.isEmpty() ) @@ -209,15 +209,15 @@ void BookmarksWidget::createURL( EditorData * data ) if ( data ) { - QListViewItem * file = new BookmarkItem( this, data->url ); + TQListViewItem * file = new BookmarkItem( this, data->url ); file->setOpen( true ); file->setPixmap( 0, SmallIcon( "document" ) ); - QValueListIterator< QPair<int,QString> > it = data->marks.begin(); + TQValueListIterator< QPair<int,TQString> > it = data->marks.begin(); while ( it != data->marks.end() ) { - QListViewItem * item = new BookmarkItem( file, data->url, *it ); - item->setPixmap( 0, QPixmap((const char**)bookmark_xpm) ); + TQListViewItem * item = new BookmarkItem( file, data->url, *it ); + item->setPixmap( 0, TQPixmap((const char**)bookmark_xpm) ); ++it; } } @@ -227,7 +227,7 @@ bool BookmarksWidget::removeURL( KURL const & url ) { // kdDebug(0) << "BookmarksWidget::removeURL()" << endl; - QListViewItem * item = firstChild(); + TQListViewItem * item = firstChild(); while ( item ) { BookmarkItem * bm = static_cast<BookmarkItem*>(item); @@ -255,7 +255,7 @@ void BookmarksWidget::doEmitRemoveBookMark() } } -void BookmarksWidget::popupMenu( QListViewItem * item, const QPoint & p, int ) +void BookmarksWidget::popupMenu( TQListViewItem * item, const TQPoint & p, int ) { // kdDebug(0) << "BookmarksWidget::contextMenuRequested()" << endl; @@ -268,27 +268,27 @@ void BookmarksWidget::popupMenu( QListViewItem * item, const QPoint & p, int ) if ( _selectedItem->isBookmark() ) { popup.insertTitle( _selectedItem->url().fileName() + i18n(", line ") - + QString::number( _selectedItem->line() +1 ) ); + + TQString::number( _selectedItem->line() +1 ) ); - popup.insertItem( i18n("Remove This Bookmark"), this, SLOT( doEmitRemoveBookMark() ) ); + popup.insertItem( i18n("Remove This Bookmark"), this, TQT_SLOT( doEmitRemoveBookMark() ) ); } else { popup.insertTitle( _selectedItem->url().fileName() + i18n( ", All" ) ); - popup.insertItem( i18n("Remove These Bookmarks"), this, SLOT( doEmitRemoveBookMark() ) ); + popup.insertItem( i18n("Remove These Bookmarks"), this, TQT_SLOT( doEmitRemoveBookMark() ) ); } popup.insertSeparator(); - popup.insertItem( i18n( "Collapse All" ), this, SLOT(collapseAll()) ); - popup.insertItem( i18n( "Expand All" ), this, SLOT(expandAll()) ); + popup.insertItem( i18n( "Collapse All" ), this, TQT_SLOT(collapseAll()) ); + popup.insertItem( i18n( "Expand All" ), this, TQT_SLOT(expandAll()) ); popup.exec(p); } } -void BookmarksWidget::itemClicked( QListViewItem * clickedItem ) +void BookmarksWidget::itemClicked( TQListViewItem * clickedItem ) { // kdDebug(0) << "BookmarksWidget::itemClicked()" << endl; @@ -305,14 +305,14 @@ BookmarksConfig * BookmarksWidget::config( ) return _part->config(); } -QStringList BookmarksWidget::getContext( KURL const & url, unsigned int line ) +TQStringList BookmarksWidget::getContext( KURL const & url, unsigned int line ) { return _part->getContext( url, line, config()->context() ); } void BookmarksWidget::collapseAll( ) { - QListViewItem * it = firstChild(); + TQListViewItem * it = firstChild(); while( it ) { it->setOpen( false ); @@ -322,7 +322,7 @@ void BookmarksWidget::collapseAll( ) void BookmarksWidget::expandAll( ) { - QListViewItem * it = firstChild(); + TQListViewItem * it = firstChild(); while( it ) { it->setOpen( true ); diff --git a/parts/bookmarks/bookmarks_widget.h b/parts/bookmarks/bookmarks_widget.h index 96bfe046..6af0b563 100644 --- a/parts/bookmarks/bookmarks_widget.h +++ b/parts/bookmarks/bookmarks_widget.h @@ -13,10 +13,10 @@ #define __BOOKMARKS_WIDGET_H__ -#include <qwidget.h> -#include <qstring.h> -//#include <qlistview.h> -#include <qtooltip.h> +#include <tqwidget.h> +#include <tqstring.h> +//#include <tqlistview.h> +#include <tqtooltip.h> #include <klistview.h> @@ -34,23 +34,23 @@ public: BookmarksWidget( BookmarksPart * ); ~BookmarksWidget(); - void update( QDict<EditorData> const & ); + void update( TQDict<EditorData> const & ); void updateURL( EditorData * ); bool removeURL( KURL const & ); BookmarksConfig * config(); - QStringList getContext( KURL const &, unsigned int ); + TQStringList getContext( KURL const &, unsigned int ); signals: void removeAllBookmarksForURL( const KURL & ); void removeBookmarkForURL( const KURL &, int ); protected: - void maybeTip( QPoint const & ); + void maybeTip( TQPoint const & ); private slots: - void itemClicked( QListViewItem * ); - void popupMenu( QListViewItem * , const QPoint & , int ); + void itemClicked( TQListViewItem * ); + void popupMenu( TQListViewItem * , const TQPoint & , int ); void collapseAll(); void expandAll(); void doEmitRemoveBookMark(); diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp index 91ed28fc..df51f6f4 100644 --- a/parts/classview/classtooldlg.cpp +++ b/parts/classview/classtooldlg.cpp @@ -13,9 +13,9 @@ #include "classtooldlg.h" -#include <qlistbox.h> -#include <qpushbutton.h> -#include <qtooltip.h> +#include <tqlistbox.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> #include <kdialog.h> #include <kiconloader.h> #include <klocale.h> @@ -27,54 +27,54 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) - : QWidget(0, "class tool dialog") + : TQWidget(0, "class tool dialog") { currentOperation = ViewNone; comboAccess = (PIAccess)-1; currentClass = 0; m_part = part; - class_combo = new QComboBox(false, this); + class_combo = new TQComboBox(false, this); - QPushButton *close_button = new KPushButton(KStdGuiItem::close(), this); + TQPushButton *close_button = new KPushButton(KStdGuiItem::close(), this); - parents_button = new QToolButton(this); + parents_button = new TQToolButton(this); parents_button->setPixmap( UserIcon("CTparents", KIcon::DefaultState, ClassViewFactory::instance()) ); parents_button->setToggleButton(true); parents_button->setFixedSize(parents_button->sizeHint()); - QToolTip::add(parents_button, i18n("Show parents")); + TQToolTip::add(parents_button, i18n("Show parents")); - children_button = new QToolButton(this); + children_button = new TQToolButton(this); children_button->setPixmap( UserIcon("CTchildren", KIcon::DefaultState, ClassViewFactory::instance()) ); children_button->setToggleButton(true); children_button->setFixedSize(children_button->sizeHint()); - QToolTip::add(children_button, i18n("Show children")); + TQToolTip::add(children_button, i18n("Show children")); - clients_button = new QToolButton(this); + clients_button = new TQToolButton(this); clients_button->setPixmap( UserIcon("CTclients", KIcon::DefaultState, ClassViewFactory::instance()) ); clients_button->setToggleButton(true); clients_button->setFixedSize(clients_button->sizeHint()); - QToolTip::add(clients_button, i18n("Show clients")); + TQToolTip::add(clients_button, i18n("Show clients")); - suppliers_button = new QToolButton(this); + suppliers_button = new TQToolButton(this); suppliers_button->setPixmap( UserIcon("CTsuppliers", KIcon::DefaultState, ClassViewFactory::instance()) ); suppliers_button->setToggleButton(true); suppliers_button->setFixedSize(suppliers_button->sizeHint()); - QToolTip::add(suppliers_button, i18n("Show suppliers")); + TQToolTip::add(suppliers_button, i18n("Show suppliers")); - methods_button = new QToolButton(this); + methods_button = new TQToolButton(this); methods_button->setPixmap( UserIcon("CVpublic_meth", KIcon::DefaultState, ClassViewFactory::instance()) ); methods_button->setToggleButton(true); methods_button->setFixedSize(methods_button->sizeHint()); - QToolTip::add(methods_button, i18n("Show methods")); + TQToolTip::add(methods_button, i18n("Show methods")); - attributes_button = new QToolButton(this); + attributes_button = new TQToolButton(this); attributes_button->setPixmap( UserIcon("CVpublic_var", KIcon::DefaultState, ClassViewFactory::instance()) ); attributes_button->setToggleButton(true); attributes_button->setFixedSize(attributes_button->sizeHint()); - QToolTip::add(attributes_button, i18n("Show attributes")); + TQToolTip::add(attributes_button, i18n("Show attributes")); - access_combo = new QComboBox(false, this, "access combo"); + access_combo = new TQComboBox(false, this, "access combo"); access_combo->setMinimumWidth(100); access_combo->setSizeLimit(10); access_combo->insertItem(i18n("member access","All")); @@ -86,9 +86,9 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) class_tree = new ClassToolWidget(part, this); // classTree->setMinimumSize( 500, 400 ); - QVBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - QHBoxLayout *firstrowLayout = new QHBoxLayout(); - QHBoxLayout *secondrowLayout = new QHBoxLayout(); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQHBoxLayout *firstrowLayout = new TQHBoxLayout(); + TQHBoxLayout *secondrowLayout = new TQHBoxLayout(); layout->addLayout(firstrowLayout); layout->addLayout(secondrowLayout); @@ -106,21 +106,21 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) layout->addWidget(class_tree, 10); - connect( class_combo, SIGNAL(activated(const QString&)), - this, SLOT(slotClassComboChoice(const QString&)) ); - connect( close_button, SIGNAL(clicked()), - this, SLOT(slotClose()) ); - connect( access_combo, SIGNAL(activated(const QString&)), - this, SLOT(slotAccessComboChoice(const QString&)) ); - connect( parents_button, SIGNAL(clicked()), SLOT(viewParents())); - connect( children_button, SIGNAL(clicked()), SLOT(viewChildren())); - connect( clients_button, SIGNAL(clicked()), SLOT(viewClients())); - connect( suppliers_button, SIGNAL(clicked()), SLOT(viewSuppliers())); - connect( methods_button, SIGNAL(clicked()), SLOT(viewMethods())); - connect( attributes_button, SIGNAL(clicked()), SLOT(viewAttributes())); - - connect( part, SIGNAL(setLanguageSupport(KDevLanguageSupport*)), - this, SLOT(setLanguageSupport(KDevLanguageSupport*)) ); + connect( class_combo, TQT_SIGNAL(activated(const TQString&)), + this, TQT_SLOT(slotClassComboChoice(const TQString&)) ); + connect( close_button, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotClose()) ); + connect( access_combo, TQT_SIGNAL(activated(const TQString&)), + this, TQT_SLOT(slotAccessComboChoice(const TQString&)) ); + connect( parents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents())); + connect( children_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren())); + connect( clients_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewClients())); + connect( suppliers_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewSuppliers())); + connect( methods_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewMethods())); + connect( attributes_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewAttributes())); + + connect( part, TQT_SIGNAL(setLanguageSupport(KDevLanguageSupport*)), + this, TQT_SLOT(setLanguageSupport(KDevLanguageSupport*)) ); m_part->registerClassToolDialog(this); } @@ -136,7 +136,7 @@ void ClassToolDialog::setLanguageSupport(KDevLanguageSupport *ls) { if (ls) { disconnect(ls, 0, this, 0); - connect(ls, SIGNAL(updatedSourceInfo()), this, SLOT(refresh())); + connect(ls, TQT_SIGNAL(updatedSourceInfo()), this, TQT_SLOT(refresh())); } else refresh(); @@ -144,11 +144,11 @@ void ClassToolDialog::setLanguageSupport(KDevLanguageSupport *ls) } -void ClassToolDialog::setClassName(const QString &name) +void ClassToolDialog::setClassName(const TQString &name) { if ( class_combo->count() == 0 ) refresh(); - QListBox *lb = class_combo->listBox(); + TQListBox *lb = class_combo->listBox(); for (int i=0; i < (int)lb->count(); ++i) if (lb->text(i) == name) { @@ -218,7 +218,7 @@ void ClassToolDialog::viewAttributes() } -void ClassToolDialog::slotAccessComboChoice(const QString &str) +void ClassToolDialog::slotAccessComboChoice(const TQString &str) { if( str == i18n("member access","All") ) comboAccess = (PIAccess)-1; @@ -240,7 +240,7 @@ void ClassToolDialog::slotAccessComboChoice(const QString &str) void ClassToolDialog::slotClose() { delete this; - // QTimer::singleShot(0, this, SLOT(delayedClose())); + // TQTimer::singleShot(0, this, TQT_SLOT(delayedClose())); } @@ -250,7 +250,7 @@ void ClassToolDialog::delayedClose() } -void ClassToolDialog::slotClassComboChoice(const QString &str) +void ClassToolDialog::slotClassComboChoice(const TQString &str) { setClassName(str); refresh(); @@ -262,10 +262,10 @@ void ClassToolDialog::refresh() // Clear the combo box and fill it with the new items. // Try to select the previously selected class - QString oldName = class_combo->currentText(); + TQString oldName = class_combo->currentText(); class_combo->clear(); - QStringList list = m_part->classStore()->getSortedClassNameList(); + TQStringList list = m_part->classStore()->getSortedClassNameList(); class_combo->insertStringList(list); setClassName(oldName); @@ -277,8 +277,8 @@ void ClassToolDialog::refresh() /** Change the caption depending on the current operation. */ void ClassToolDialog::updateCaptionAndButtons() { - QString caption; - QToolButton *button; + TQString caption; + TQToolButton *button; switch (currentOperation) { @@ -343,19 +343,19 @@ void ClassToolDialog::buildTree() break; case ViewChildren: { - QValueList<ParsedClass*> list = m_part->classStore()->getClassesByParent(currentClass->name()); + TQValueList<ParsedClass*> list = m_part->classStore()->getClassesByParent(currentClass->name()); class_tree->insertClassAndClasses(currentClass, list); } break; case ViewClients: { - QValueList<ParsedClass*> list = m_part->classStore()->getClassClients(currentClass->name()); + TQValueList<ParsedClass*> list = m_part->classStore()->getClassClients(currentClass->name()); class_tree->insertClassAndClasses(currentClass, list); } break; case ViewSuppliers: { - QValueList<ParsedClass*> list = m_part->classStore()->getClassSuppliers(currentClass->name()); + TQValueList<ParsedClass*> list = m_part->classStore()->getClassSuppliers(currentClass->name()); class_tree->insertClassAndClasses(currentClass, list); } break; diff --git a/parts/classview/classtooldlg.h b/parts/classview/classtooldlg.h index 1ab8b5c1..01c86f3b 100644 --- a/parts/classview/classtooldlg.h +++ b/parts/classview/classtooldlg.h @@ -14,11 +14,11 @@ #ifndef _CLASSTOOLDLG_H_ #define _CLASSTOOLDLG_H_ -#include <qdialog.h> -#include <qlabel.h> -#include <qtoolbutton.h> -#include <qcombobox.h> -#include <qlayout.h> +#include <tqdialog.h> +#include <tqlabel.h> +#include <tqtoolbutton.h> +#include <tqcombobox.h> +#include <tqlayout.h> #include "classtoolwidget.h" #include "parseditem.h" @@ -38,7 +38,7 @@ public: ClassToolDialog( ClassViewPart *part ); ~ClassToolDialog(); - void setClassName(const QString &name); + void setClassName(const TQString &name); public slots: @@ -63,8 +63,8 @@ private slots: void delayedClose(); void slotClose(); - void slotAccessComboChoice(const QString &str); - void slotClassComboChoice(const QString &str); + void slotAccessComboChoice(const TQString &str); + void slotClassComboChoice(const TQString &str); private: @@ -72,15 +72,15 @@ private: void buildTree(); ClassToolWidget *class_tree; - QComboBox *class_combo; + TQComboBox *class_combo; - QToolButton *parents_button; - QToolButton *children_button; - QToolButton *clients_button; - QToolButton *suppliers_button; - QToolButton *methods_button; - QToolButton *attributes_button; - QComboBox *access_combo; + TQToolButton *parents_button; + TQToolButton *children_button; + TQToolButton *clients_button; + TQToolButton *suppliers_button; + TQToolButton *methods_button; + TQToolButton *attributes_button; + TQComboBox *access_combo; /** Store that holds all classes in the system. */ ClassStore *m_store; diff --git a/parts/classview/classtoolwidget.cpp b/parts/classview/classtoolwidget.cpp index f800bd15..5aefe6e5 100644 --- a/parts/classview/classtoolwidget.cpp +++ b/parts/classview/classtoolwidget.cpp @@ -20,7 +20,7 @@ #include "classstore.h" -ClassToolWidget::ClassToolWidget(ClassViewPart *part, QWidget *parent) +ClassToolWidget::ClassToolWidget(ClassViewPart *part, TQWidget *parent) : ClassTreeBase(part, parent, "class tool widget") {} @@ -41,13 +41,13 @@ KPopupMenu *ClassToolWidget::createPopup() } -void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, QValueList<ParsedClass*> classList) +void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, TQValueList<ParsedClass*> classList) { ClassTreeItem *root = new ClassTreeClassItem(this, 0, parsedClass); ClassTreeItem *lastItem = 0; - QValueList<ParsedClass*>::ConstIterator it; + TQValueList<ParsedClass*>::ConstIterator it; for (it = classList.begin(); it != classList.end(); ++it) { lastItem = new ClassTreeClassItem(root, lastItem, *it); lastItem->setExpandable(false); @@ -60,13 +60,13 @@ void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, QValueList } -void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, const QPtrList<ParsedParent> &parentList) +void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList<ParsedParent> &parentList) { ClassTreeItem *root = new ClassTreeClassItem(this, 0, parsedClass); ClassTreeItem *lastItem = 0; - QPtrListIterator<ParsedParent> it(parentList); + TQPtrListIterator<ParsedParent> it(parentList); for (; it.current(); ++it) { ParsedClass *parentClass = m_part->classStore()->getClassByName((*it)->name()); lastItem = new ClassTreeClassItem(root, lastItem, parentClass); @@ -86,8 +86,8 @@ void ClassToolWidget::addClassAndAttributes(ParsedClass *parsedClass, PIAccess f ClassTreeItem *ilastItem = 0; - QValueList<ParsedAttribute*> attrList = parsedClass->getSortedAttributeList(); - QValueList<ParsedAttribute*>::ConstIterator it; + TQValueList<ParsedAttribute*> attrList = parsedClass->getSortedAttributeList(); + TQValueList<ParsedAttribute*>::ConstIterator it; for (it = attrList.begin(); it != attrList.end(); ++it) { if (filter == (PIAccess)-1 || filter == (*it)->access()) ilastItem = new ClassTreeAttrItem(*lastItem, ilastItem, *it); @@ -106,8 +106,8 @@ void ClassToolWidget::addClassAndMethods(ParsedClass *parsedClass, PIAccess filt ClassTreeItem *ilastItem = 0; - QValueList<ParsedMethod*> methodList = parsedClass->getSortedMethodList(); - QValueList<ParsedMethod*>::ConstIterator it; + TQValueList<ParsedMethod*> methodList = parsedClass->getSortedMethodList(); + TQValueList<ParsedMethod*>::ConstIterator it; for (it = methodList.begin(); it != methodList.end(); ++it) { if (filter == (PIAccess)-1 || filter == (*it)->access()) ilastItem = new ClassTreeMethodItem(*lastItem, ilastItem, *it); diff --git a/parts/classview/classtoolwidget.h b/parts/classview/classtoolwidget.h index 75119e8f..4d7d8036 100644 --- a/parts/classview/classtoolwidget.h +++ b/parts/classview/classtoolwidget.h @@ -22,11 +22,11 @@ class ClassToolWidget : public ClassTreeBase Q_OBJECT public: - ClassToolWidget(ClassViewPart *part, QWidget *parent=0); + ClassToolWidget(ClassViewPart *part, TQWidget *parent=0); ~ClassToolWidget(); - void insertClassAndClasses(ParsedClass *parsedClass, QValueList<ParsedClass*> classList); - void insertClassAndClasses(ParsedClass *parsedClass, const QPtrList<ParsedParent> &parentList); + void insertClassAndClasses(ParsedClass *parsedClass, TQValueList<ParsedClass*> classList); + void insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList<ParsedParent> &parentList); void insertAllClassMethods(ParsedClass *parsedClass, PIAccess filter); void insertAllClassAttributes(ParsedClass *parsedClass, PIAccess filter); diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp index f5c0f4b9..c6d2770e 100644 --- a/parts/classview/classtreebase.cpp +++ b/parts/classview/classtreebase.cpp @@ -13,9 +13,9 @@ #include "classtreebase.h" -#include <qtooltip.h> -#include <qheader.h> -#include <qregexp.h> +#include <tqtooltip.h> +#include <tqheader.h> +#include <tqregexp.h> #include <kdebug.h> #include <kconfig.h> #include <kpopupmenu.h> @@ -40,11 +40,11 @@ KPopupMenu *ClassTreeItem::createPopup() KPopupMenu *popup = new KPopupMenu(); if (features & KDevLanguageSupport::Declarations) - popup->insertItem( i18n("Go to Declaration"), classTree(), SLOT(slotGotoDeclaration()) ); + popup->insertItem( i18n("Go to Declaration"), classTree(), TQT_SLOT(slotGotoDeclaration()) ); if (m_item->itemType() == PIT_METHOD) - popup->insertItem( i18n("Go to Definition"), classTree(), SLOT(slotGotoImplementation()) ); + popup->insertItem( i18n("Go to Definition"), classTree(), TQT_SLOT(slotGotoImplementation()) ); - QString title; + TQString title; switch(m_item->itemType()) { case PIT_CLASS: { @@ -52,13 +52,13 @@ KPopupMenu *ClassTreeItem::createPopup() bool hasAddMethod = features & KDevLanguageSupport::AddMethod; bool hasAddAttribute = features & KDevLanguageSupport::AddAttribute; if (hasAddMethod) - popup->insertItem( i18n("Add Method..."), classTree(), SLOT(slotAddMethod())); + popup->insertItem( i18n("Add Method..."), classTree(), TQT_SLOT(slotAddMethod())); if (hasAddAttribute) - popup->insertItem( i18n("Add Attribute..."), classTree(), SLOT(slotAddAttribute())); + popup->insertItem( i18n("Add Attribute..."), classTree(), TQT_SLOT(slotAddAttribute())); popup->insertSeparator(); - popup->insertItem( i18n("Parent Classes..."), classTree(), SLOT(slotClassBaseClasses())); - popup->insertItem( i18n("Child Classes..."), classTree(), SLOT(slotClassDerivedClasses())); - popup->insertItem( i18n("Class Tool..."), classTree(), SLOT(slotClassTool())); + popup->insertItem( i18n("Parent Classes..."), classTree(), TQT_SLOT(slotClassBaseClasses())); + popup->insertItem( i18n("Child Classes..."), classTree(), TQT_SLOT(slotClassDerivedClasses())); + popup->insertItem( i18n("Class Tool..."), classTree(), TQT_SLOT(slotClassTool())); } break; case PIT_STRUCT: @@ -90,16 +90,16 @@ KPopupMenu *ClassTreeItem::createPopup() } -QString ClassTreeItem::scopedText() const +TQString ClassTreeItem::scopedText() const { if (m_item) return m_item->path(); - return QString::null; + return TQString::null; } -void ClassTreeItem::getDeclaration(QString *toFile, int *toLine) +void ClassTreeItem::getDeclaration(TQString *toFile, int *toLine) { if (m_item) { *toFile = m_item->declaredInFile(); @@ -108,7 +108,7 @@ void ClassTreeItem::getDeclaration(QString *toFile, int *toLine) } -void ClassTreeItem::getImplementation(QString *toFile, int *toLine) +void ClassTreeItem::getImplementation(TQString *toFile, int *toLine) { if (m_item) { *toFile = m_item->definedInFile(); @@ -117,15 +117,15 @@ void ClassTreeItem::getImplementation(QString *toFile, int *toLine) } -QString ClassTreeItem::text( int ) const +TQString ClassTreeItem::text( int ) const { if (m_item) return m_item->asString(); - return QString::null; + return TQString::null; } -QString ClassTreeItem::tipText() const +TQString ClassTreeItem::tipText() const { // Purposefully avoid virtual dispatch here return ClassTreeItem::text(0); @@ -146,10 +146,10 @@ void ClassTreeScopeItem::init() } -QString ClassTreeScopeItem::text( int col ) const +TQString ClassTreeScopeItem::text( int col ) const { if (!m_item) - return QString::null; + return TQString::null; if (m_item->name().isEmpty()) return i18n("Global"); return ClassTreeItem::text( col ); @@ -171,39 +171,39 @@ void ClassTreeScopeItem::setOpen(bool o) KDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features(); // Add namespaces - QValueList<ParsedScopeContainer*> scopeList = pScope->getSortedScopeList(); - QValueList<ParsedScopeContainer*>::ConstIterator it; + TQValueList<ParsedScopeContainer*> scopeList = pScope->getSortedScopeList(); + TQValueList<ParsedScopeContainer*>::ConstIterator it; for (it = scopeList.begin(); it != scopeList.end(); ++it) lastItem = new ClassTreeScopeItem(this, lastItem, *it); if (features & KDevLanguageSupport::Classes) { // Add classes - QValueList<ParsedClass*> classList = pScope->getSortedClassList(); - QValueList<ParsedClass*>::ConstIterator it; + TQValueList<ParsedClass*> classList = pScope->getSortedClassList(); + TQValueList<ParsedClass*>::ConstIterator it; for (it = classList.begin(); it != classList.end(); ++it) lastItem = new ClassTreeClassItem(this, lastItem, *it); } if (features & KDevLanguageSupport::Structs) { // Add structs - QValueList<ParsedClass*> structList = pScope->getSortedStructList(); - QValueList<ParsedClass*>::ConstIterator it; + TQValueList<ParsedClass*> structList = pScope->getSortedStructList(); + TQValueList<ParsedClass*>::ConstIterator it; for (it = structList.begin(); it != structList.end(); ++it) lastItem = new ClassTreeClassItem(this, lastItem, *it, true); } if (features & KDevLanguageSupport::Functions) { // Add functions - QValueList<ParsedMethod*> methodList = pScope->getSortedMethodList(); - QValueList<ParsedMethod*>::ConstIterator it; + TQValueList<ParsedMethod*> methodList = pScope->getSortedMethodList(); + TQValueList<ParsedMethod*>::ConstIterator it; for (it = methodList.begin(); it != methodList.end(); ++it) lastItem = new ClassTreeMethodItem(this, lastItem, *it); } if (features & KDevLanguageSupport::Variables) { // Add attributes - QValueList<ParsedAttribute*> attrList = pScope->getSortedAttributeList(); - QValueList<ParsedAttribute*>::ConstIterator it; + TQValueList<ParsedAttribute*> attrList = pScope->getSortedAttributeList(); + TQValueList<ParsedAttribute*>::ConstIterator it; for (it = attrList.begin(); it != attrList.end(); ++it) lastItem = new ClassTreeAttrItem(this, lastItem, *it); } @@ -232,38 +232,38 @@ void ClassTreeClassItem::setOpen(bool o) ClassTreeItem *lastItem = 0; // Add nested classes - QValueList<ParsedClass*> classList = pClass->getSortedClassList(); - QValueList<ParsedClass*>::ConstIterator classIt; + TQValueList<ParsedClass*> classList = pClass->getSortedClassList(); + TQValueList<ParsedClass*>::ConstIterator classIt; for (classIt = classList.begin(); classIt != classList.end(); ++classIt) lastItem = new ClassTreeClassItem(this, lastItem, *classIt); // Add nested structs - QValueList<ParsedClass*> structList = pClass->getSortedStructList(); - QValueList<ParsedClass*>::ConstIterator structIt; + TQValueList<ParsedClass*> structList = pClass->getSortedStructList(); + TQValueList<ParsedClass*>::ConstIterator structIt; for (structIt = structList.begin(); structIt != structList.end(); ++structIt) lastItem = new ClassTreeClassItem(this, lastItem, *structIt, true); // Add methods - QValueList<ParsedMethod*> methodList = pClass->getSortedMethodList(); - QValueList<ParsedMethod*>::ConstIterator methodIt; + TQValueList<ParsedMethod*> methodList = pClass->getSortedMethodList(); + TQValueList<ParsedMethod*>::ConstIterator methodIt; for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt) lastItem = new ClassTreeMethodItem(this, lastItem, *methodIt); // Add slots - QValueList<ParsedMethod*> slotList = pClass->getSortedSlotList(); - QValueList<ParsedMethod*>::ConstIterator slotIt; + TQValueList<ParsedMethod*> slotList = pClass->getSortedSlotList(); + TQValueList<ParsedMethod*>::ConstIterator slotIt; for (slotIt = slotList.begin(); slotIt != slotList.end(); ++slotIt) lastItem = new ClassTreeMethodItem(this, lastItem, *slotIt); // Add signals - QValueList<ParsedMethod*> signalList = pClass->getSortedSignalList(); - QValueList<ParsedMethod*>::ConstIterator signalIt; + TQValueList<ParsedMethod*> signalList = pClass->getSortedSignalList(); + TQValueList<ParsedMethod*>::ConstIterator signalIt; for (signalIt = signalList.begin(); signalIt != signalList.end(); ++signalIt) lastItem = new ClassTreeMethodItem(this, lastItem, *signalIt); // Add attributes - QValueList<ParsedAttribute*> attrList = pClass->getSortedAttributeList(); - QValueList<ParsedAttribute*>::ConstIterator attrIt; + TQValueList<ParsedAttribute*> attrList = pClass->getSortedAttributeList(); + TQValueList<ParsedAttribute*>::ConstIterator attrIt; for (attrIt = attrList.begin(); attrIt != attrList.end(); ++attrIt) lastItem = new ClassTreeAttrItem(this, lastItem, *attrIt); @@ -276,7 +276,7 @@ ClassTreeMethodItem::ClassTreeMethodItem(ClassTreeItem *parent, ClassTreeItem *l ParsedMethod *parsedMethod) : ClassTreeItem(parent, lastSibling, parsedMethod) { - QString icon; + TQString icon; if ( !parsedMethod ) return; @@ -305,12 +305,12 @@ ClassTreeMethodItem::ClassTreeMethodItem(ClassTreeItem *parent, ClassTreeItem *l setPixmap(0, UserIcon(icon, KIcon::DefaultState, ClassViewFactory::instance())); } -QString ClassTreeMethodItem::text( int ) const +TQString ClassTreeMethodItem::text( int ) const { - QString str; + TQString str; if ( !m_item ) - return QString::null; + return TQString::null; ParsedMethod* method = static_cast<ParsedMethod*>(m_item); @@ -340,7 +340,7 @@ ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *parent, ClassTreeItem *lastS ParsedAttribute *parsedAttr) : ClassTreeItem(parent, lastSibling, parsedAttr) { - QString icon; + TQString icon; if ( !parsedAttr ) return; @@ -360,10 +360,10 @@ ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *parent, ClassTreeItem *lastS } -QString ClassTreeAttrItem::text( int ) const +TQString ClassTreeAttrItem::text( int ) const { if ( !m_item ) - return QString::null; + return TQString::null; return m_item->name(); } @@ -371,7 +371,7 @@ ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *parent, ClassTreeItem *l ParsedScript *parsedScript) : ClassTreeItem(parent, lastSibling, parsedScript) { - QString icon; + TQString icon; if ( !parsedScript ) return; @@ -384,10 +384,10 @@ ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *parent, ClassTreeItem *l } -QString ClassTreeScriptItem::text( int ) const +TQString ClassTreeScriptItem::text( int ) const { if ( !m_item ) - return QString::null; + return TQString::null; return m_item->name(); } @@ -402,14 +402,14 @@ void ClassTreeScriptItem::setOpen(bool o) ClassTreeItem *lastItem = 0; // Add methods - QValueList<ParsedMethod*> methodList = pClass->getSortedMethodList(); - QValueList<ParsedMethod*>::ConstIterator methodIt; + TQValueList<ParsedMethod*> methodList = pClass->getSortedMethodList(); + TQValueList<ParsedMethod*>::ConstIterator methodIt; for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt) lastItem = new ClassTreeMethodItem(this, lastItem, *methodIt); // Add attributes - QValueList<ParsedAttribute*> attrList = pClass->getSortedAttributeList(); - QValueList<ParsedAttribute*>::ConstIterator attrIt; + TQValueList<ParsedAttribute*> attrList = pClass->getSortedAttributeList(); + TQValueList<ParsedAttribute*>::ConstIterator attrIt; for (attrIt = attrList.begin(); attrIt != attrList.end(); ++attrIt) lastItem = new ClassTreeAttrItem(this, lastItem, *attrIt); @@ -422,51 +422,51 @@ void ClassTreeScriptItem::setOpen(bool o) class ClassToolTip : public QToolTip { public: - ClassToolTip( QWidget *parent ) - : QToolTip(parent) + ClassToolTip( TQWidget *parent ) + : TQToolTip(parent) {} protected: - void maybeTip(const QPoint &p); + void maybeTip(const TQPoint &p); }; -void ClassToolTip::maybeTip(const QPoint &p) +void ClassToolTip::maybeTip(const TQPoint &p) { ClassTreeBase *ctw = static_cast<ClassTreeBase*>(parentWidget()); - QListViewItem *item = ctw->itemAt(p); - QRect r = ctw->itemRect(item); + TQListViewItem *item = ctw->itemAt(p); + TQRect r = ctw->itemRect(item); if (item && r.isValid()) { ClassTreeItem *ctitem = static_cast<ClassTreeItem*>(item); - QString str = ctitem->tipText(); + TQString str = ctitem->tipText(); if (!str.isEmpty()) tip(r, str); } } -ClassTreeBase::ClassTreeBase(ClassViewPart *part, QWidget *parent, const char *name) +ClassTreeBase::ClassTreeBase(ClassViewPart *part, TQWidget *parent, const char *name) : KListView(parent, name) { setFocusPolicy(ClickFocus); setRootIsDecorated(true); - setResizeMode(QListView::LastColumn); + setResizeMode(TQListView::LastColumn); setSorting(-1); header()->hide(); - addColumn(QString::null); + addColumn(TQString::null); (void) new ClassToolTip(this); - connect( this, SIGNAL(executed(QListViewItem*)), - this, SLOT(slotItemExecuted(QListViewItem*)) ); - connect( this, SIGNAL(mouseButtonPressed(int, QListViewItem*, const QPoint&, int)), - this, SLOT(slotItemPressed(int, QListViewItem*)) ); - connect( this, SIGNAL(returnPressed( QListViewItem*)), - SLOT( slotItemExecuted(QListViewItem*)) ); - connect( this, SIGNAL(contextMenuRequested(QListViewItem*, const QPoint&, int)), - this, SLOT(slotContextMenuRequested(QListViewItem*, const QPoint&)) ); + connect( this, TQT_SIGNAL(executed(TQListViewItem*)), + this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQT_SLOT(slotItemPressed(int, TQListViewItem*)) ); + connect( this, TQT_SIGNAL(returnPressed( TQListViewItem*)), + TQT_SLOT( slotItemExecuted(TQListViewItem*)) ); + connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) ); m_part = part; } @@ -481,11 +481,11 @@ ClassTreeBase::TreeState ClassTreeBase::treeState() const TreeState state; ClassTreeBase *that = const_cast<ClassTreeBase*>(this); - QListViewItemIterator it(that); + TQListViewItemIterator it(that); for (; it.current(); ++it) if (it.current()->isOpen()) { - QStringList path; - QListViewItem *item = it.current(); + TQStringList path; + TQListViewItem *item = it.current(); while (item) { path.prepend(item->text(0)); item = item->parent(); @@ -501,10 +501,10 @@ void ClassTreeBase::setTreeState(TreeState state) { TreeStateIterator tsit; for (tsit = state.begin(); tsit != state.end(); ++tsit) { - QListViewItemIterator it(this); + TQListViewItemIterator it(this); for (; it.current(); ++it) { - QStringList path; - QListViewItem *item = it.current(); + TQStringList path; + TQListViewItem *item = it.current(); while (item) { path.prepend(item->text(0)); item = item->parent(); @@ -520,7 +520,7 @@ void ClassTreeBase::setTreeState(TreeState state) -void ClassTreeBase::slotItemExecuted( QListViewItem* item ) +void ClassTreeBase::slotItemExecuted( TQListViewItem* item ) { if (!item) return; @@ -535,7 +535,7 @@ void ClassTreeBase::slotItemExecuted( QListViewItem* item ) if (ctitem->isOrganizer()) return; - QString toFile; + TQString toFile; int toLine = -1; if (dynamic_cast<ClassTreeClassItem*>(item)) { ctitem->getDeclaration(&toFile, &toLine); @@ -548,7 +548,7 @@ void ClassTreeBase::slotItemExecuted( QListViewItem* item ) } -void ClassTreeBase::slotItemPressed(int button, QListViewItem *item) +void ClassTreeBase::slotItemPressed(int button, TQListViewItem *item) { if (!item) return; @@ -560,7 +560,7 @@ void ClassTreeBase::slotItemPressed(int button, QListViewItem *item) return; if (button == MidButton) { - QString toFile; + TQString toFile; int toLine = -1; ctitem->getDeclaration(&toFile, &toLine); m_part->partController()->editDocument(toFile, toLine); @@ -568,7 +568,7 @@ void ClassTreeBase::slotItemPressed(int button, QListViewItem *item) } } -void ClassTreeBase::slotContextMenuRequested(QListViewItem *item, const QPoint &p) +void ClassTreeBase::slotContextMenuRequested(TQListViewItem *item, const TQPoint &p) { contextItem = static_cast<ClassTreeItem*>(item); @@ -579,7 +579,7 @@ void ClassTreeBase::slotContextMenuRequested(QListViewItem *item, const QPoint & void ClassTreeBase::slotGotoDeclaration() { - QString toFile; + TQString toFile; int toLine = -1; contextItem->getDeclaration(&toFile, &toLine); @@ -589,7 +589,7 @@ void ClassTreeBase::slotGotoDeclaration() void ClassTreeBase::slotGotoImplementation() { - QString toFile; + TQString toFile; int toLine = -1; contextItem->getImplementation(&toFile, &toLine); diff --git a/parts/classview/classtreebase.h b/parts/classview/classtreebase.h index e019bcc2..91ac8054 100644 --- a/parts/classview/classtreebase.h +++ b/parts/classview/classtreebase.h @@ -32,12 +32,12 @@ class ClassTreeBase : public KListView Q_OBJECT public: - ClassTreeBase( ClassViewPart *part, QWidget *parent=0, const char *name=0 ); + ClassTreeBase( ClassViewPart *part, TQWidget *parent=0, const char *name=0 ); ~ClassTreeBase(); protected: - typedef QValueList<QStringList> TreeState; - typedef QValueList<QStringList>::Iterator TreeStateIterator; + typedef TQValueList<TQStringList> TreeState; + typedef TQValueList<TQStringList>::Iterator TreeStateIterator; TreeState treeState() const; void setTreeState(TreeState state); @@ -45,9 +45,9 @@ protected: virtual KPopupMenu *createPopup() = 0; private slots: - void slotItemExecuted(QListViewItem*); - void slotItemPressed(int button, QListViewItem *item); - void slotContextMenuRequested(QListViewItem *item, const QPoint &p); + void slotItemExecuted(TQListViewItem*); + void slotItemPressed(int button, TQListViewItem *item); + void slotContextMenuRequested(TQListViewItem *item, const TQPoint &p); void slotGotoDeclaration(); void slotGotoImplementation(); void slotAddMethod(); @@ -63,21 +63,21 @@ protected: }; -class ClassTreeItem : public QListViewItem, public NotifyClient +class ClassTreeItem : public TQListViewItem, public NotifyClient { public: ClassTreeItem( ClassTreeBase *parent, ClassTreeItem *lastSibling, ParsedItem *parsedItem ) - : QListViewItem(parent, lastSibling), NotifyClient(), m_item(parsedItem) + : TQListViewItem(parent, lastSibling), NotifyClient(), m_item(parsedItem) { init(); } ClassTreeItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, ParsedItem *parsedItem ) - : QListViewItem(parent, lastSibling), NotifyClient(), m_item(parsedItem) + : TQListViewItem(parent, lastSibling), NotifyClient(), m_item(parsedItem) { init(); } ClassTreeItem( const ClassTreeItem& other ) - : QListViewItem( other.parent(), other.nextSibling()), NotifyClient() + : TQListViewItem( other.parent(), other.nextSibling()), NotifyClient() { m_item = other.m_item; init(); @@ -105,12 +105,12 @@ public: m_item->registerNotifyClient( (NotifyClient*)this ); } - void getDeclaration(QString *toFile, int *toLine); - void getImplementation(QString *toFile, int *toLine); + void getDeclaration(TQString *toFile, int *toLine); + void getImplementation(TQString *toFile, int *toLine); - virtual QString scopedText() const; - virtual QString text( int ) const; - virtual QString tipText() const; + virtual TQString scopedText() const; + virtual TQString text( int ) const; + virtual TQString tipText() const; protected: ClassTreeBase *classTree() @@ -123,22 +123,22 @@ class ClassTreeOrganizerItem : public ClassTreeItem { public: ClassTreeOrganizerItem( ClassTreeBase *parent, ClassTreeItem *lastSibling, - const QString &text ) + const TQString &text ) : ClassTreeItem(parent, lastSibling, 0 ) , m_text( text ) { init(); } ClassTreeOrganizerItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, - const QString &text ) + const TQString &text ) : ClassTreeItem(parent, lastSibling, 0 ) , m_text( text ) { init(); } ~ClassTreeOrganizerItem() {} - virtual QString text( int ) const { return m_text; } + virtual TQString text( int ) const { return m_text; } private: - QString m_text; + TQString m_text; void init(); }; @@ -163,7 +163,7 @@ public: { } - virtual QString text( int ) const; + virtual TQString text( int ) const; virtual void setOpen(bool o); private: @@ -209,7 +209,7 @@ public: { } - virtual QString text( int ) const; + virtual TQString text( int ) const; }; @@ -222,7 +222,7 @@ public: { } - virtual QString text( int ) const; + virtual TQString text( int ) const; }; class ClassTreeScriptItem : public ClassTreeItem @@ -234,7 +234,7 @@ public: { } - virtual QString text( int ) const; + virtual TQString text( int ) const; virtual void setOpen(bool o); }; diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp index 42410fbe..24163bf4 100644 --- a/parts/classview/classviewpart.cpp +++ b/parts/classview/classviewpart.cpp @@ -19,10 +19,10 @@ * */ -#include <qwhatsthis.h> -#include <qlistview.h> -#include <qfileinfo.h> -#include <qlineedit.h> +#include <tqwhatsthis.h> +#include <tqlistview.h> +#include <tqfileinfo.h> +#include <tqlineedit.h> #include <kiconloader.h> #include <klocale.h> @@ -63,13 +63,13 @@ class FunctionCompletion : public CustomCompleter { FunctionCompletion() { setOrder( Insertion ); }; - typedef QMap<QString, QString> FuncMap; + typedef TQMap<TQString, TQString> FuncMap; FuncMap nameMap; /// real -> short FuncMap revNameMap; /// short -> real - static const QString processName( QString function ) { - QString args; - QString fScope; + static const TQString processName( TQString function ) { + TQString args; + TQString fScope; int cutpos; if((cutpos = function.find('(')) != -1) { @@ -86,10 +86,10 @@ class FunctionCompletion : public CustomCompleter { return function; } - virtual void addItem ( const QString &item ) { - QString newItemName = item; + virtual void addItem ( const TQString &item ) { + TQString newItemName = item; KCompletion::addItem(newItemName); - QString tx = processName( item ); + TQString tx = processName( item ); tx += " \"" + item + "\""; nameMap[item] = tx; revNameMap[tx] = item; @@ -102,7 +102,7 @@ class FunctionCompletion : public CustomCompleter { KCompletion::addItem( item ); } - virtual void removeItem ( const QString &item ) { + virtual void removeItem ( const TQString &item ) { FuncMap::iterator it = nameMap.find( item ); if( it != nameMap.end() ) { KCompletion::removeItem( *it ); @@ -117,15 +117,15 @@ class FunctionCompletion : public CustomCompleter { KCompletion::clear(); } - virtual void postProcessMatch ( QString *match ) const { + virtual void postProcessMatch ( TQString *match ) const { FuncMap::const_iterator it = revNameMap.find( *match ); if( it != revNameMap.end() ) { *match = *it; } }; - virtual void postProcessMatches ( QStringList *matches ) const { - QStringList::iterator it = matches->begin(); + virtual void postProcessMatches ( TQStringList *matches ) const { + TQStringList::iterator it = matches->begin(); while( it != matches->end() ) { postProcessMatch( &(*it) ); @@ -142,7 +142,7 @@ typedef KDevGenericFactory<ClassViewPart> ClassViewFactory; static const KDevPluginInfo data("kdevclassview"); K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( data ) ) -ClassViewPart::ClassViewPart(QObject *parent, const char *name, const QStringList& ) +ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringList& ) :/// KDevPlugin( &data, parent, name ? name : "ClassViewPart" ), KDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ), m_activeDocument(0), m_activeView(0), m_activeSelection(0), m_activeEditor(0), m_activeViewCursor(0), m_hierarchyDlg(0) @@ -158,14 +158,14 @@ ClassViewPart::ClassViewPart(QObject *parent, const char *name, const QStringLis m_widget->setIcon( SmallIcon("view_tree") ); m_widget->setCaption(i18n("Class Browser")); mainWindow()->embedSelectView( m_widget, i18n("Classes"), i18n("Class browser") ); - QWhatsThis::add(m_widget, i18n("<b>Class browser</b><p>" + TQWhatsThis::add(m_widget, i18n("<b>Class browser</b><p>" "The class browser shows all namespaces, classes and namespace and class members in a project.")); - connect( core(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(slotProjectClosed()) ); - connect( core(), SIGNAL(languageChanged()), this, SLOT(slotProjectOpened()) ); - connect( partController(), SIGNAL(activePartChanged(KParts::Part*)), - this, SLOT(activePartChanged(KParts::Part*))); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); + connect( core(), TQT_SIGNAL(languageChanged()), this, TQT_SLOT(slotProjectOpened()) ); + connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(activePartChanged(KParts::Part*))); } bool ClassViewPart::jumpedToItem( ItemDom item ) { @@ -182,34 +182,34 @@ ClassViewPart::~ClassViewPart() void ClassViewPart::slotProjectOpened( ) { - connect( languageSupport(), SIGNAL(updatedSourceInfo()), navigator, SLOT(refresh()) ); - connect( languageSupport(), SIGNAL(addedSourceInfo(const QString& )), navigator, SLOT(addFile(const QString& ))); + connect( languageSupport(), TQT_SIGNAL(updatedSourceInfo()), navigator, TQT_SLOT(refresh()) ); + connect( languageSupport(), TQT_SIGNAL(addedSourceInfo(const TQString& )), navigator, TQT_SLOT(addFile(const TQString& ))); navigator->refresh(); } void ClassViewPart::slotProjectClosed( ) { // navigator->refresh(); -// disconnect( languageSupport(), SIGNAL(updatedSourceInfo()), navigator, SLOT(refresh()) ); +// disconnect( languageSupport(), TQT_SIGNAL(updatedSourceInfo()), navigator, TQT_SLOT(refresh()) ); } void ClassViewPart::setupActions( ) { m_functionsnav = new KListViewAction( new KComboView(true, 150, 0, "m_functionsnav_combo", new FunctionCompletion() ), i18n("Functions Navigation"), 0, 0, 0, actionCollection(), "functionsnav_combo", true ); - connect(m_functionsnav->view(), SIGNAL(activated(QListViewItem*)), navigator, SLOT(selectFunctionNav(QListViewItem*))); + connect(m_functionsnav->view(), TQT_SIGNAL(activated(TQListViewItem*)), navigator, TQT_SLOT(selectFunctionNav(TQListViewItem*))); // m_functionsnav->view()->setEditable(false); - connect(m_functionsnav->view(), SIGNAL(focusGranted()), navigator, SLOT(functionNavFocused())); - connect(m_functionsnav->view(), SIGNAL(focusLost()), navigator, SLOT(functionNavUnFocused())); + connect(m_functionsnav->view(), TQT_SIGNAL(focusGranted()), navigator, TQT_SLOT(functionNavFocused())); + connect(m_functionsnav->view(), TQT_SIGNAL(focusLost()), navigator, TQT_SLOT(functionNavUnFocused())); m_functionsnav->setToolTip(i18n("Functions in file")); m_functionsnav->setWhatsThis(i18n("<b>Function navigator</b><p>Navigates over functions contained in the file.")); // m_functionsnav->view()->setCurrentText(NAV_NODEFINITION); m_functionsnav->view()->setDefaultText(NAV_NODEFINITION); - new KAction( i18n("Focus Navigator"), 0, this, SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" ); + new KAction( i18n("Focus Navigator"), 0, this, TQT_SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" ); if (langHasFeature(KDevLanguageSupport::Classes)) { - KAction *ac = new KAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, SLOT(graphicalClassView()), actionCollection(), "inheritance_dia"); + KAction *ac = new KAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, TQT_SLOT(graphicalClassView()), actionCollection(), "inheritance_dia"); ac->setToolTip(i18n("Class inheritance diagram")); ac->setWhatsThis(i18n("<b>Class inheritance diagram</b><p>Displays inheritance relationship between classes in project. " "Note, it does not display classes outside inheritance hierarchy.")); @@ -242,8 +242,8 @@ void ClassViewPart::activePartChanged( KParts::Part * part) navigator->stopTimer(); if (m_activeView) { - disconnect(m_activeView, SIGNAL(cursorPositionChanged()), - navigator, SLOT(slotCursorPositionChanged())); + disconnect(m_activeView, TQT_SIGNAL(cursorPositionChanged()), + navigator, TQT_SLOT(slotCursorPositionChanged())); } kdDebug() << "ClassViewPart::activePartChanged()" << endl; @@ -254,7 +254,7 @@ void ClassViewPart::activePartChanged( KParts::Part * part) m_activeSelection = dynamic_cast<KTextEditor::SelectionInterface*>( part ); m_activeViewCursor = part ? dynamic_cast<KTextEditor::ViewCursorInterface*>( m_activeView ) : 0; - m_activeFileName = QString::null; + m_activeFileName = TQString::null; if (m_activeDocument) { @@ -263,12 +263,12 @@ void ClassViewPart::activePartChanged( KParts::Part * part) navigator->syncFunctionNavDelayed(200); /* if ( languageSupport()->mimeTypes().find( KMimeType::findByPath(m_activeFileName)) != languageSupport()->mimeTypes().end() ) - m_activeFileName = QString::null;*/ + m_activeFileName = TQString::null;*/ } if( m_activeViewCursor ) { - connect(m_activeView, SIGNAL(cursorPositionChanged()), - navigator, SLOT(slotCursorPositionChanged()) ); + connect(m_activeView, TQT_SIGNAL(cursorPositionChanged()), + navigator, TQT_SLOT(slotCursorPositionChanged()) ); } } void ClassViewPart::slotFocusNavbar() diff --git a/parts/classview/classviewpart.h b/parts/classview/classviewpart.h index 0f4aa115..ffa1cc1f 100644 --- a/parts/classview/classviewpart.h +++ b/parts/classview/classviewpart.h @@ -24,8 +24,8 @@ #include "kdevlanguagesupport.h" #include "viewcombos.h" -#include <qguardedptr.h> -#include <qmap.h> +#include <tqguardedptr.h> +#include <tqmap.h> #include <kdevplugin.h> @@ -56,7 +56,7 @@ class ClassViewPart : public Extensions::KDevCodeBrowserFrontend { Q_OBJECT public: - ClassViewPart(QObject *parent, const char *name, const QStringList &); + ClassViewPart(TQObject *parent, const char *name, const TQStringList &); virtual ~ClassViewPart(); bool langHasFeature(KDevLanguageSupport::Features feature); @@ -82,9 +82,9 @@ private slots: private: void setupActions(); - QGuardedPtr<ClassViewWidget> m_widget; + TQGuardedPtr<ClassViewWidget> m_widget; - QString m_activeFileName; + TQString m_activeFileName; KTextEditor::Document* m_activeDocument; KTextEditor::View* m_activeView; KTextEditor::SelectionInterface* m_activeSelection; diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp index 0ab90856..64079546 100644 --- a/parts/classview/classviewwidget.cpp +++ b/parts/classview/classviewwidget.cpp @@ -41,15 +41,15 @@ #include <klocale.h> #include <kdebug.h> -#include <qheader.h> -#include <qdir.h> -#include <qstylesheet.h> -#include <qstringlist.h> +#include <tqheader.h> +#include <tqdir.h> +#include <tqstylesheet.h> +#include <tqstringlist.h> // namespace ?!? ClassViewWidget::ClassViewWidget( ClassViewPart * part ) - : KListView( 0, "ClassViewWidget" ), QToolTip( viewport() ), m_part( part ), m_projectDirectoryLength( 0 ) + : KListView( 0, "ClassViewWidget" ), TQToolTip( viewport() ), m_part( part ), m_projectDirectoryLength( 0 ) { addColumn( "" ); header()->hide(); @@ -59,40 +59,40 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part ) m_projectItem = 0; - connect( this, SIGNAL(returnPressed(QListViewItem*)), this, SLOT(slotExecuted(QListViewItem*)) ); - connect( this, SIGNAL(executed(QListViewItem*)), this, SLOT(slotExecuted(QListViewItem*)) ); - connect( m_part->core(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) ); - connect( m_part->core(), SIGNAL(projectClosed()), this, SLOT(slotProjectClosed()) ); - connect( m_part->core(), SIGNAL(languageChanged()), this, SLOT(slotProjectOpened()) ); + connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*)) ); + connect( this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*)) ); + connect( m_part->core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); + connect( m_part->core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); + connect( m_part->core(), TQT_SIGNAL(languageChanged()), this, TQT_SLOT(slotProjectOpened()) ); - QStringList lst; + TQStringList lst; lst << i18n( "Group by Directories" ) << i18n( "Plain List" ) << i18n( "Java Like Mode" ); m_actionViewMode = new KSelectAction( i18n("View Mode"), KShortcut(), m_part->actionCollection(), "classview_mode" ); m_actionViewMode->setItems( lst ); m_actionViewMode->setWhatsThis(i18n("<b>View mode</b><p>Class browser items can be grouped by directories, listed in a plain or java like view.")); - m_actionNewClass = new KAction( i18n("New Class..."), KShortcut(), this, SLOT(slotNewClass()), + m_actionNewClass = new KAction( i18n("New Class..."), KShortcut(), this, TQT_SLOT(slotNewClass()), m_part->actionCollection(), "classview_new_class" ); m_actionNewClass->setWhatsThis(i18n("<b>New class</b><p>Calls the <b>New Class</b> wizard.")); - m_actionCreateAccessMethods = new KAction( i18n("Create get/set Methods"), KShortcut(), this, SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" ); + m_actionCreateAccessMethods = new KAction( i18n("Create get/set Methods"), KShortcut(), this, TQT_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" ); - m_actionAddMethod = new KAction( i18n("Add Method..."), KShortcut(), this, SLOT(slotAddMethod()), + m_actionAddMethod = new KAction( i18n("Add Method..."), KShortcut(), this, TQT_SLOT(slotAddMethod()), m_part->actionCollection(), "classview_add_method" ); m_actionAddMethod->setWhatsThis(i18n("<b>Add method</b><p>Calls the <b>New Method</b> wizard.")); - m_actionAddAttribute = new KAction( i18n("Add Attribute..."), KShortcut(), this, SLOT(slotAddAttribute()), + m_actionAddAttribute = new KAction( i18n("Add Attribute..."), KShortcut(), this, TQT_SLOT(slotAddAttribute()), m_part->actionCollection(), "classview_add_attribute" ); m_actionAddAttribute->setWhatsThis(i18n("<b>Add attribute</b><p>Calls the <b>New Attribute</b> wizard.")); - m_actionOpenDeclaration = new KAction( i18n("Open Declaration"), KShortcut(), this, SLOT(slotOpenDeclaration()), + m_actionOpenDeclaration = new KAction( i18n("Open Declaration"), KShortcut(), this, TQT_SLOT(slotOpenDeclaration()), m_part->actionCollection(), "classview_open_declaration" ); m_actionOpenDeclaration->setWhatsThis(i18n("<b>Open declaration</b><p>Opens a file where the selected item is declared and jumps to the declaration line.")); - m_actionOpenImplementation = new KAction( i18n("Open Implementation"), KShortcut(), this, SLOT(slotOpenImplementation()), + m_actionOpenImplementation = new KAction( i18n("Open Implementation"), KShortcut(), this, TQT_SLOT(slotOpenImplementation()), m_part->actionCollection(), "classview_open_implementation" ); m_actionOpenImplementation->setWhatsThis(i18n("<b>Open implementation</b><p>Opens a file where the selected item is defined (implemented) and jumps to the definition line.")); - m_actionFollowEditor = new KToggleAction( i18n("Follow Editor"), KShortcut(), this, SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" ); + m_actionFollowEditor = new KToggleAction( i18n("Follow Editor"), KShortcut(), this, TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" ); KConfig* config = m_part->instance()->config(); config->setGroup( "General" ); @@ -110,13 +110,13 @@ ClassViewWidget::~ClassViewWidget( ) } template <class ModelType, class ListItemType> - static bool selectItemG( ItemDom item, const QMap<KSharedPtr<ModelType>, ListItemType*>& map ) + static bool selectItemG( ItemDom item, const TQMap<KSharedPtr<ModelType>, ListItemType*>& map ) { ModelType* c = dynamic_cast<ModelType*>( &(*item) ); if( c ) { KSharedPtr<ModelType> d( c ); - typename QMap<KSharedPtr<ModelType>, ListItemType*>::ConstIterator it = map.find(d); + typename TQMap<KSharedPtr<ModelType>, ListItemType*>::ConstIterator it = map.find(d); if( it != map.end() ) { ( *it )->select(); return true; @@ -126,7 +126,7 @@ template <class ModelType, class ListItemType> } -void ClassViewWidget::slotExecuted( QListViewItem* item ) +void ClassViewWidget::slotExecuted( TQListViewItem* item ) { if( ClassViewItem* cbitem = dynamic_cast<ClassViewItem*>( item ) ){ if( cbitem->hasImplementation() ) @@ -143,7 +143,7 @@ void ClassViewWidget::clear( ) m_projectItem = 0; } -void restoreOpenNodes( QStringList & list, QListViewItem * item ) +void restoreOpenNodes( TQStringList & list, TQListViewItem * item ) { if ( item && !list.isEmpty() ) { @@ -160,13 +160,13 @@ void restoreOpenNodes( QStringList & list, QListViewItem * item ) } } -void storeOpenNodes( QValueList<QStringList> & openNodes, QStringList const & list, QListViewItem * item ) +void storeOpenNodes( TQValueList<TQStringList> & openNodes, TQStringList const & list, TQListViewItem * item ) { if ( item ) { if ( item->isOpen() ) { - QStringList mylist( list ); + TQStringList mylist( list ); mylist << item->text( 0 ); openNodes << mylist; storeOpenNodes( openNodes, mylist, item->firstChild() ); @@ -180,8 +180,8 @@ void ClassViewWidget::refresh() if( !m_part->project() ) return; - QValueList<QStringList> openNodes; - storeOpenNodes( openNodes, QStringList(), firstChild() ); + TQValueList<TQStringList> openNodes; + storeOpenNodes( openNodes, TQStringList(), firstChild() ); int scrollbarPos = verticalScrollBar()->value(); clear(); @@ -196,7 +196,7 @@ void ClassViewWidget::refresh() ++it; } - QValueList<QStringList>::iterator itt = openNodes.begin(); + TQValueList<TQStringList>::iterator itt = openNodes.begin(); while ( itt != openNodes.end() ) { restoreOpenNodes ( *itt, firstChild() ); @@ -218,12 +218,12 @@ void ClassViewWidget::slotProjectOpened( ) m_projectDirectoryLength = m_projectDirectory.length() + 1; - connect( m_part->languageSupport(), SIGNAL(updatedSourceInfo()), - this, SLOT(refresh()) ); - connect( m_part->languageSupport(), SIGNAL(aboutToRemoveSourceInfo(const QString&)), - this, SLOT(removeFile(const QString&)) ); - connect( m_part->languageSupport(), SIGNAL(addedSourceInfo(const QString&)), - this, SLOT(insertFile(const QString&)) ); + connect( m_part->languageSupport(), TQT_SIGNAL(updatedSourceInfo()), + this, TQT_SLOT(refresh()) ); + connect( m_part->languageSupport(), TQT_SIGNAL(aboutToRemoveSourceInfo(const TQString&)), + this, TQT_SLOT(removeFile(const TQString&)) ); + connect( m_part->languageSupport(), TQT_SIGNAL(addedSourceInfo(const TQString&)), + this, TQT_SLOT(insertFile(const TQString&)) ); } void ClassViewWidget::slotProjectClosed( ) @@ -231,9 +231,9 @@ void ClassViewWidget::slotProjectClosed( ) } -void ClassViewWidget::insertFile( const QString& fileName ) +void ClassViewWidget::insertFile( const TQString& fileName ) { - QString fn = URLUtil::canonicalPath( fileName ); + TQString fn = URLUtil::canonicalPath( fileName ); //kdDebug() << "======================== insertFile(" << fn << ")" << endl; FileDom dom = m_part->codeModel()->fileByName( fn ); @@ -241,13 +241,13 @@ void ClassViewWidget::insertFile( const QString& fileName ) return; fn = URLUtil::relativePathToFile(m_part->project()->projectDirectory(), fn); - QStringList path; + TQStringList path; switch( viewMode() ) { case KDevelop3ViewMode: { - path = QStringList::split( "/", fn ); + path = TQStringList::split( "/", fn ); path.pop_back(); } break; @@ -259,10 +259,10 @@ void ClassViewWidget::insertFile( const QString& fileName ) case JavaLikeViewMode: { - QStringList l = QStringList::split( "/", fn ); + TQStringList l = TQStringList::split( "/", fn ); l.pop_back(); - QString package = l.join("."); + TQString package = l.join("."); if( !package.isEmpty() ) path.push_back( package ); } @@ -272,9 +272,9 @@ void ClassViewWidget::insertFile( const QString& fileName ) m_projectItem->processFile( dom, path ); } -void ClassViewWidget::removeFile( const QString& fileName ) +void ClassViewWidget::removeFile( const TQString& fileName ) { - QString fn = URLUtil::canonicalPath( fileName ); + TQString fn = URLUtil::canonicalPath( fileName ); //kdDebug() << "======================== removeFile(" << fn << ")" << endl; FileDom dom = m_part->codeModel()->fileByName( fn ); @@ -282,13 +282,13 @@ void ClassViewWidget::removeFile( const QString& fileName ) return; fn = URLUtil::relativePathToFile(m_part->project()->projectDirectory(), fn); - QStringList path; + TQStringList path; switch( viewMode() ) { case KDevelop3ViewMode: { - path = QStringList::split( "/", fn ); + path = TQStringList::split( "/", fn ); path.pop_back(); } break; @@ -300,10 +300,10 @@ void ClassViewWidget::removeFile( const QString& fileName ) case JavaLikeViewMode: { - QStringList l = QStringList::split( "/", fn ); + TQStringList l = TQStringList::split( "/", fn ); l.pop_back(); - QString package = l.join("."); + TQString package = l.join("."); if( !package.isEmpty() ) path.push_back( package ); } @@ -313,7 +313,7 @@ void ClassViewWidget::removeFile( const QString& fileName ) m_projectItem->processFile( dom, path, true ); } -void ClassViewWidget::contentsContextMenuEvent( QContextMenuEvent * ev ) +void ClassViewWidget::contentsContextMenuEvent( TQContextMenuEvent * ev ) { KPopupMenu menu( this ); @@ -376,14 +376,14 @@ int ClassViewWidget::viewMode( ) const return m_actionViewMode->currentItem(); } -QString ClassViewItem::comment() { - return QString(); +TQString ClassViewItem::comment() { + return TQString(); } void ClassViewItem::select( ) { setOpen(true); listView()->setCurrentItem(this); - QListViewItem* c = firstChild(); + TQListViewItem* c = firstChild(); int size = 0; if(c != 0) { while(c->nextSibling()) { @@ -411,7 +411,7 @@ bool ClassViewWidget::selectItem( ItemDom item ) { } -QString NamespaceDomBrowserItem::comment() { +TQString NamespaceDomBrowserItem::comment() { return m_dom->comment(); } @@ -437,17 +437,17 @@ bool FolderBrowserItem::selectItem(ItemDom item) ///searching for namespaces is currently not supported and not useful } - for( QMap<ClassDom, ClassDomBrowserItem*>::Iterator it = m_classes.begin(); it != m_classes.end(); ++it ) { + for( TQMap<ClassDom, ClassDomBrowserItem*>::Iterator it = m_classes.begin(); it != m_classes.end(); ++it ) { if( (*it)->selectItem(item) ) return true; } - for( QMap<QString, NamespaceDomBrowserItem*>::Iterator it = m_namespaces.begin(); it != m_namespaces.end(); ++it ) { + for( TQMap<TQString, NamespaceDomBrowserItem*>::Iterator it = m_namespaces.begin(); it != m_namespaces.end(); ++it ) { if( (*it)->selectItem(item) ) return true; } - for( QMap<QString, FolderBrowserItem*>::Iterator it = m_folders.begin(); it != m_folders.end(); ++it ) { + for( TQMap<TQString, FolderBrowserItem*>::Iterator it = m_folders.begin(); it != m_folders.end(); ++it ) { if( (*it)->selectItem(item) ) { return true; } @@ -456,7 +456,7 @@ bool FolderBrowserItem::selectItem(ItemDom item) } -void FolderBrowserItem::processFile( FileDom file, QStringList& path, bool remove ) +void FolderBrowserItem::processFile( FileDom file, TQStringList& path, bool remove ) { if( path.isEmpty() ){ NamespaceList namespaceList = file->namespaceList(); @@ -479,7 +479,7 @@ void FolderBrowserItem::processFile( FileDom file, QStringList& path, bool remov return; } - QString current = path.front(); + TQString current = path.front(); path.pop_front(); FolderBrowserItem* item = m_folders.contains( current ) ? m_folders[ current ] : 0; @@ -664,12 +664,12 @@ bool NamespaceDomBrowserItem::selectItem( ItemDom item) ///currently not neccessary.. } - for(QMap<ClassDom, ClassDomBrowserItem*>::Iterator it = m_classes.begin(); it != m_classes.end(); ++it) { + for(TQMap<ClassDom, ClassDomBrowserItem*>::Iterator it = m_classes.begin(); it != m_classes.end(); ++it) { if( (*it)->selectItem(item) ) return true; } - for(QMap<QString, NamespaceDomBrowserItem*>::Iterator it = m_namespaces.begin(); it != m_namespaces.end(); ++it) { + for(TQMap<TQString, NamespaceDomBrowserItem*>::Iterator it = m_namespaces.begin(); it != m_namespaces.end(); ++it) { if( (*it)->selectItem(item) ) return true; } @@ -834,7 +834,7 @@ bool ClassDomBrowserItem::selectItem(ItemDom item) if( selectItemG ( item, m_variables ) ) return true; } - for(QMap<ClassDom, ClassDomBrowserItem*>::Iterator it = m_classes.begin(); it != m_classes.end(); ++it) { + for(TQMap<ClassDom, ClassDomBrowserItem*>::Iterator it = m_classes.begin(); it != m_classes.end(); ++it) { if( (*it)->selectItem(item) ) return true; } @@ -951,7 +951,7 @@ void NamespaceDomBrowserItem::setup( ) setPixmap( 0, UserIcon("CVnamespace", KIcon::DefaultState, listView()->m_part->instance()) ); setExpandable( true ); - QString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true); + TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true); setText( 0, txt ); } @@ -961,7 +961,7 @@ void ClassDomBrowserItem::setup( ) setPixmap( 0, UserIcon("CVclass", KIcon::DefaultState, listView()->m_part->instance()) ); setExpandable( true ); - QString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true); + TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true); setText( 0, txt ); } @@ -971,7 +971,7 @@ void TypeAliasDomBrowserItem::setup( ) setPixmap( 0, UserIcon("CVtypedef", KIcon::DefaultState, listView()->m_part->instance()) ); setExpandable( false ); - QString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true); + TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true); setText( 0, txt ); } @@ -979,8 +979,8 @@ void FunctionDomBrowserItem::setup( ) { ClassViewItem::setup(); - QString iconName; - QString methodType; + TQString iconName; + TQString methodType; if ( m_dom->isSignal() ) methodType = "signal"; @@ -998,7 +998,7 @@ void FunctionDomBrowserItem::setup( ) setPixmap( 0, UserIcon(iconName, KIcon::DefaultState, listView()->m_part->instance()) ); - QString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true); + TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true); item() = highlightFunctionName(txt, 1, m_styles); } @@ -1020,13 +1020,13 @@ void FunctionDomBrowserItem::openImplementation() return; FunctionDefinitionDom fun; - QFileInfo fileInfo( m_dom->fileName() ); - QString path = fileInfo.dirPath( true ); + TQFileInfo fileInfo( m_dom->fileName() ); + TQString path = fileInfo.dirPath( true ); for( FunctionDefinitionList::Iterator it=lst.begin(); it!=lst.end(); ++it ) { - QFileInfo defFileInfo( (*it)->fileName() ); - QString defPath = defFileInfo.dirPath( true ); + TQFileInfo defFileInfo( (*it)->fileName() ); + TQString defPath = defFileInfo.dirPath( true ); if( path != defPath ) continue; @@ -1050,7 +1050,7 @@ void FunctionDomBrowserItem::openImplementation() void VariableDomBrowserItem::setup( ) { ClassViewItem::setup(); - QString iconName; + TQString iconName; if( m_dom->access() == CodeModelItem::Private ) iconName = "CVprivate_var"; else if( m_dom->access() == CodeModelItem::Protected ) @@ -1060,7 +1060,7 @@ void VariableDomBrowserItem::setup( ) setPixmap( 0, UserIcon(iconName, KIcon::DefaultState, listView()->m_part->instance()) ); - QString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true); + TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true); setText( 0, txt ); } @@ -1076,32 +1076,32 @@ void VariableDomBrowserItem::openImplementation() { } -QString FolderBrowserItem::key( int , bool ) const +TQString FolderBrowserItem::key( int , bool ) const { return "0 " + text( 0 ); } -QString NamespaceDomBrowserItem::key( int , bool ) const +TQString NamespaceDomBrowserItem::key( int , bool ) const { return "1 " + text( 0 ); } -QString ClassDomBrowserItem::key( int , bool ) const +TQString ClassDomBrowserItem::key( int , bool ) const { return "2 " + text( 0 ); } -QString TypeAliasDomBrowserItem::key( int , bool ) const +TQString TypeAliasDomBrowserItem::key( int , bool ) const { return "3 " + text( 0 ); } -QString FunctionDomBrowserItem::key( int , bool ) const +TQString FunctionDomBrowserItem::key( int , bool ) const { return "4 " + text( 0 ); } -QString VariableDomBrowserItem::key( int , bool ) const +TQString VariableDomBrowserItem::key( int , bool ) const { return "5 " + text( 0 ); } @@ -1165,12 +1165,12 @@ bool FunctionDomBrowserItem::hasImplementation() const return !lst.isEmpty(); } -void ClassViewWidget::maybeTip( QPoint const & p ) +void ClassViewWidget::maybeTip( TQPoint const & p ) { ClassViewItem * item = dynamic_cast<ClassViewItem*>( itemAt( p ) ); if ( !item ) return; - QString tooltip; + TQString tooltip; if ( item->isNamespace() ) { @@ -1195,7 +1195,7 @@ void ClassViewWidget::maybeTip( QPoint const & p ) FunctionDomBrowserItem * fitem = dynamic_cast<FunctionDomBrowserItem*>( item ); if ( fitem ) { - QString access; + TQString access; if ( fitem->dom()->access() == CodeModelItem::Private ) access = "[private] "; else if ( fitem->dom()->access() == CodeModelItem::Protected ) @@ -1203,7 +1203,7 @@ void ClassViewWidget::maybeTip( QPoint const & p ) else if ( fitem->dom()->access() == CodeModelItem::Public ) access = "[public] "; - QStringList arguments; + TQStringList arguments; ArgumentList const & list = fitem->dom()->argumentList(); ArgumentList::ConstIterator it( list.begin() ); while ( it != list.end() ) @@ -1212,13 +1212,13 @@ void ClassViewWidget::maybeTip( QPoint const & p ) ++it; } - QString strstatic = fitem->dom()->isStatic() ? QString( "[static] " ) : QString::null; - QString strsignal = fitem->dom()->isSignal() ? QString( "[signal] " ) : QString::null; - QString strslot = fitem->dom()->isSlot() ? QString( "[slot] " ) : QString::null; - QString strresult = !fitem->dom()->resultType().isEmpty() ? fitem->dom()->resultType() + " " : QString::null; + TQString strstatic = fitem->dom()->isStatic() ? TQString( "[static] " ) : TQString::null; + TQString strsignal = fitem->dom()->isSignal() ? TQString( "[signal] " ) : TQString::null; + TQString strslot = fitem->dom()->isSlot() ? TQString( "[slot] " ) : TQString::null; + TQString strresult = !fitem->dom()->resultType().isEmpty() ? fitem->dom()->resultType() + " " : TQString::null; - QString strconstant = fitem->dom()->isConstant() ? QString( " [const]" ) : QString::null; - QString strabstract = fitem->dom()->isAbstract() ? QString( " [abstract]" ) : QString::null; + TQString strconstant = fitem->dom()->isConstant() ? TQString( " [const]" ) : TQString::null; + TQString strabstract = fitem->dom()->isAbstract() ? TQString( " [abstract]" ) : TQString::null; tooltip = access + strstatic + strsignal + strslot + strresult + fitem->dom()->scope().join("::") + "::" + fitem->dom()->name() @@ -1230,7 +1230,7 @@ void ClassViewWidget::maybeTip( QPoint const & p ) VariableDomBrowserItem * vitem = dynamic_cast<VariableDomBrowserItem*>( item ); if ( vitem ) { - QString access; + TQString access; if ( vitem->dom()->access() == CodeModelItem::Private ) access = "[private] "; else if ( vitem->dom()->access() == CodeModelItem::Protected ) @@ -1238,7 +1238,7 @@ void ClassViewWidget::maybeTip( QPoint const & p ) else if ( vitem->dom()->access() == CodeModelItem::Public ) access = "[public] "; - QString strstatic = vitem->dom()->isStatic() ? QString( "[static] " ) : QString::null; + TQString strstatic = vitem->dom()->isStatic() ? TQString( "[static] " ) : TQString::null; tooltip = access + strstatic + vitem->dom()->type() + " " + vitem->dom()->name(); } } @@ -1246,7 +1246,7 @@ void ClassViewWidget::maybeTip( QPoint const & p ) { if( TypeAliasDomBrowserItem * titem = dynamic_cast<TypeAliasDomBrowserItem*>( item ) ) { - tooltip = QString( "[Type] " ) + titem->dom()->type() + " " + titem->dom()->name(); + tooltip = TQString( "[Type] " ) + titem->dom()->type() + " " + titem->dom()->name(); } } @@ -1259,11 +1259,11 @@ void ClassViewWidget::maybeTip( QPoint const & p ) kdDebug(0) << tooltip << endl; - QRect r = itemRect( item ); + TQRect r = itemRect( item ); if ( item && r.isValid() && !tooltip.isEmpty() ) { - tip( r, QString("<qt><pre>") + QStyleSheet::escape( tooltip ) + QString("</pre></qt>") ); + tip( r, TQString("<qt><pre>") + TQStyleSheet::escape( tooltip ) + TQString("</pre></qt>") ); } } diff --git a/parts/classview/classviewwidget.h b/parts/classview/classviewwidget.h index 975f6e09..0ace5692 100644 --- a/parts/classview/classviewwidget.h +++ b/parts/classview/classviewwidget.h @@ -23,10 +23,10 @@ #define __CLASSVIEW_WIDGET_H__ #include <klistview.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qmap.h> -#include <qtooltip.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqmap.h> +#include <tqtooltip.h> #include <codemodel.h> #include <fancylistviewitem.h> #include <navigator.h> @@ -80,21 +80,21 @@ private slots: void slotFollowEditor(); protected: - void contentsContextMenuEvent( QContextMenuEvent* ); - void maybeTip( QPoint const & ); + void contentsContextMenuEvent( TQContextMenuEvent* ); + void maybeTip( TQPoint const & ); private slots: void slotProjectOpened(); void slotProjectClosed(); void refresh(); - void insertFile( const QString& fileName ); - void removeFile( const QString& fileName ); - void slotExecuted( QListViewItem* item ); + void insertFile( const TQString& fileName ); + void removeFile( const TQString& fileName ); + void slotExecuted( TQListViewItem* item ); private: ClassViewPart* m_part; - QStringList removedText; - QString m_projectDirectory; + TQStringList removedText; + TQString m_projectDirectory; int m_projectDirectoryLength; FolderBrowserItem* m_projectItem; KSelectAction* m_actionViewMode; @@ -120,9 +120,9 @@ class ClassViewItem: public FancyListViewItem { private: public: - ClassViewItem( QListView* parent, const QString& text=QString::null ) + ClassViewItem( TQListView* parent, const TQString& text=TQString::null ) : FancyListViewItem( static_cast<ClassViewWidget*>( parent )->m_paintStyles, parent, text ) {} - ClassViewItem( QListViewItem* parent, const QString& text=QString::null ) + ClassViewItem( TQListViewItem* parent, const TQString& text=TQString::null ) : FancyListViewItem( static_cast<ClassViewWidget*>( parent->listView() )->m_paintStyles, parent, text ) {} virtual const CodeModelItem* model() const { return 0; } @@ -143,26 +143,26 @@ public: void select(); - virtual QString comment(); + virtual TQString comment(); - ClassViewWidget* listView() { return static_cast<ClassViewWidget*>( QListViewItem::listView() ); } - const ClassViewWidget* listView() const { return static_cast<ClassViewWidget*>( QListViewItem::listView() ); } + ClassViewWidget* listView() { return static_cast<ClassViewWidget*>( TQListViewItem::listView() ); } + const ClassViewWidget* listView() const { return static_cast<ClassViewWidget*>( TQListViewItem::listView() ); } }; class FolderBrowserItem: public ClassViewItem { public: - FolderBrowserItem( ClassViewWidget* widget, QListView* parent, const QString& name=QString::null ) + FolderBrowserItem( ClassViewWidget* widget, TQListView* parent, const TQString& name=TQString::null ) : ClassViewItem( parent, name ), m_widget(widget) {} - FolderBrowserItem( ClassViewWidget* widget, QListViewItem* parent, const QString& name=QString::null ) + FolderBrowserItem( ClassViewWidget* widget, TQListViewItem* parent, const TQString& name=TQString::null ) : ClassViewItem( parent, name ), m_widget(widget) {} virtual bool isFolder() const { return true; } void setup(); - QString key( int, bool ) const; + TQString key( int, bool ) const; - void processFile( FileDom file, QStringList& path, bool remove=false ); + void processFile( FileDom file, TQStringList& path, bool remove=false ); void processNamespace( NamespaceDom ns, bool remove=false ); void processClass( ClassDom klass, bool remove=false ); void processTypeAlias( TypeAliasDom typeAlias, bool remove=false ); @@ -171,12 +171,12 @@ public: bool selectItem(ItemDom item); private: - QMap<QString, FolderBrowserItem*> m_folders; - QMap<QString, NamespaceDomBrowserItem*> m_namespaces; - QMap<ClassDom, ClassDomBrowserItem*> m_classes; - QMap<TypeAliasDom, TypeAliasDomBrowserItem*> m_typeAliases; - QMap<FunctionDom, FunctionDomBrowserItem*> m_functions; - QMap<VariableDom, VariableDomBrowserItem*> m_variables; + TQMap<TQString, FolderBrowserItem*> m_folders; + TQMap<TQString, NamespaceDomBrowserItem*> m_namespaces; + TQMap<ClassDom, ClassDomBrowserItem*> m_classes; + TQMap<TypeAliasDom, TypeAliasDomBrowserItem*> m_typeAliases; + TQMap<FunctionDom, FunctionDomBrowserItem*> m_functions; + TQMap<VariableDom, VariableDomBrowserItem*> m_variables; ClassViewWidget* m_widget; }; @@ -184,9 +184,9 @@ private: class NamespaceDomBrowserItem: public ClassViewItem { public: - NamespaceDomBrowserItem( QListView* parent, NamespaceDom dom ) + NamespaceDomBrowserItem( TQListView* parent, NamespaceDom dom ) : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} - NamespaceDomBrowserItem( QListViewItem* parent, NamespaceDom dom ) + NamespaceDomBrowserItem( TQListViewItem* parent, NamespaceDom dom ) : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } @@ -194,7 +194,7 @@ public: virtual bool isNamespace() const { return true; } void setup(); - QString key( int, bool ) const; + TQString key( int, bool ) const; void processNamespace( NamespaceDom ns, bool remove=false ); void processClass( ClassDom klass, bool remove=false ); @@ -202,25 +202,25 @@ public: void processFunction( FunctionDom fun, bool remove=false ); void processVariable( VariableDom var, bool remove=false ); bool selectItem( ItemDom item ); - virtual QString comment(); + virtual TQString comment(); NamespaceDom dom() { return m_dom; } private: NamespaceDom m_dom; - QMap<QString, NamespaceDomBrowserItem*> m_namespaces; - QMap<ClassDom, ClassDomBrowserItem*> m_classes; - QMap<TypeAliasDom, TypeAliasDomBrowserItem*> m_typeAliases; - QMap<FunctionDom, FunctionDomBrowserItem*> m_functions; - QMap<VariableDom, VariableDomBrowserItem*> m_variables; + TQMap<TQString, NamespaceDomBrowserItem*> m_namespaces; + TQMap<ClassDom, ClassDomBrowserItem*> m_classes; + TQMap<TypeAliasDom, TypeAliasDomBrowserItem*> m_typeAliases; + TQMap<FunctionDom, FunctionDomBrowserItem*> m_functions; + TQMap<VariableDom, VariableDomBrowserItem*> m_variables; }; class ClassDomBrowserItem: public ClassViewItem { public: - ClassDomBrowserItem( QListView* parent, ClassDom dom ) + ClassDomBrowserItem( TQListView* parent, ClassDom dom ) : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} - ClassDomBrowserItem( QListViewItem* parent, ClassDom dom ) + ClassDomBrowserItem( TQListViewItem* parent, ClassDom dom ) : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } @@ -230,14 +230,14 @@ public: virtual void openDeclaration(); void setup(); - QString key( int, bool ) const; + TQString key( int, bool ) const; void processClass( ClassDom klass, bool remove=false ); void processTypeAlias( TypeAliasDom typeAlias, bool remove=false ); void processFunction( FunctionDom fun, bool remove=false ); void processVariable( VariableDom var, bool remove=false ); - virtual QString comment() { + virtual TQString comment() { if( !m_dom ) return ""; return m_dom->comment(); } @@ -247,18 +247,18 @@ public: private: ClassDom m_dom; - QMap<ClassDom, ClassDomBrowserItem*> m_classes; - QMap<TypeAliasDom, TypeAliasDomBrowserItem*> m_typeAliases; - QMap<FunctionDom, FunctionDomBrowserItem*> m_functions; - QMap<VariableDom, VariableDomBrowserItem*> m_variables; + TQMap<ClassDom, ClassDomBrowserItem*> m_classes; + TQMap<TypeAliasDom, TypeAliasDomBrowserItem*> m_typeAliases; + TQMap<FunctionDom, FunctionDomBrowserItem*> m_functions; + TQMap<VariableDom, VariableDomBrowserItem*> m_variables; }; class TypeAliasDomBrowserItem: public ClassViewItem { public: - TypeAliasDomBrowserItem( QListView* parent, TypeAliasDom dom ) + TypeAliasDomBrowserItem( TQListView* parent, TypeAliasDom dom ) : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} - TypeAliasDomBrowserItem( QListViewItem* parent, TypeAliasDom dom ) + TypeAliasDomBrowserItem( TQListViewItem* parent, TypeAliasDom dom ) : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } @@ -267,13 +267,13 @@ public: virtual bool hasDeclaration() const { return true; } virtual void openDeclaration(); - virtual QString comment() { + virtual TQString comment() { if( !m_dom ) return ""; return m_dom->comment(); } void setup(); - QString key( int, bool ) const; + TQString key( int, bool ) const; TypeAliasDom dom() { return m_dom; } @@ -284,9 +284,9 @@ private: class FunctionDomBrowserItem: public ClassViewItem { public: - FunctionDomBrowserItem( QListView* parent, FunctionDom dom ) + FunctionDomBrowserItem( TQListView* parent, FunctionDom dom ) : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} - FunctionDomBrowserItem( QListViewItem* parent, FunctionDom dom ) + FunctionDomBrowserItem( TQListViewItem* parent, FunctionDom dom ) : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } @@ -298,13 +298,13 @@ public: virtual void openDeclaration(); virtual void openImplementation(); - virtual QString comment() { + virtual TQString comment() { if( !m_dom ) return ""; return m_dom->comment(); } void setup(); - QString key( int, bool ) const; + TQString key( int, bool ) const; FunctionDom dom() { return m_dom; } @@ -315,9 +315,9 @@ private: class VariableDomBrowserItem: public ClassViewItem { public: - VariableDomBrowserItem( QListView* parent, VariableDom dom ) + VariableDomBrowserItem( TQListView* parent, VariableDom dom ) : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} - VariableDomBrowserItem( QListViewItem* parent, VariableDom dom ) + VariableDomBrowserItem( TQListViewItem* parent, VariableDom dom ) : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } @@ -326,7 +326,7 @@ public: virtual bool hasDeclaration() const { return true; } virtual bool hasImplementation() const { return false; } - virtual QString comment() { + virtual TQString comment() { if( !m_dom ) return ""; return m_dom->comment(); } @@ -335,7 +335,7 @@ public: virtual void openImplementation(); void setup(); - QString key( int, bool ) const; + TQString key( int, bool ) const; VariableDom dom() { return m_dom; } @@ -355,8 +355,8 @@ struct FindOp2 ///a template would look nicer if( m_dom->isConstant() != m_dom->isConstant() ) return false; - QString scope1 = QString("::") + m_dom->scope().join("::"); - QString scope2 = QString("::") + def->scope().join("::"); + TQString scope1 = TQString("::") + m_dom->scope().join("::"); + TQString scope2 = TQString("::") + def->scope().join("::"); if( !scope1.endsWith(scope2) ) return false; @@ -389,8 +389,8 @@ struct FindOp if( m_dom->isConstant() != m_dom->isConstant() ) return false; - QString scope1 = QString("::") + m_dom->scope().join("::"); - QString scope2 = QString("::") + def->scope().join("::"); + TQString scope1 = TQString("::") + m_dom->scope().join("::"); + TQString scope2 = TQString("::") + def->scope().join("::"); if( !scope1.endsWith(scope2) ) return false; diff --git a/parts/classview/digraphview.cpp b/parts/classview/digraphview.cpp index b566757f..8bb8e963 100644 --- a/parts/classview/digraphview.cpp +++ b/parts/classview/digraphview.cpp @@ -13,10 +13,10 @@ #include <math.h> #include <stdlib.h> -#include <qapplication.h> -#include <qpainter.h> -#include <qpaintdevicemetrics.h> -#include <qtextstream.h> +#include <tqapplication.h> +#include <tqpainter.h> +#include <tqpaintdevicemetrics.h> +#include <tqtextstream.h> #include <kglobal.h> #include <klocale.h> #include <kmessagebox.h> @@ -33,22 +33,22 @@ struct DigraphNode int y; int w; int h; - QString name; + TQString name; }; struct DigraphEdge { - QPointArray points; + TQPointArray points; }; -DigraphView::DigraphView(QWidget *parent, const char *name) - : QScrollView(parent, name, WRepaintNoErase|WStaticContents|WResizeNoErase) +DigraphView::DigraphView(TQWidget *parent, const char *name) + : TQScrollView(parent, name, WRepaintNoErase|WStaticContents|WResizeNoErase) { viewport()->setBackgroundMode(PaletteBase); - QPaintDeviceMetrics m(this); + TQPaintDeviceMetrics m(this); xscale = m.logicalDpiX(); yscale = m.logicalDpiY(); @@ -86,7 +86,7 @@ void DigraphView::setRenderedExtent(double w, double h) } -void DigraphView::addRenderedNode(const QString &name, +void DigraphView::addRenderedNode(const TQString &name, double x, double y, double w, double h) { DigraphNode *node = new DigraphNode; @@ -99,8 +99,8 @@ void DigraphView::addRenderedNode(const QString &name, } -void DigraphView::addRenderedEdge(const QString &/*name1*/, const QString &/*name2*/, - QMemArray<double> coords) +void DigraphView::addRenderedEdge(const TQString &/*name1*/, const TQString &/*name2*/, + TQMemArray<double> coords) { if (coords.count() < 4) return; @@ -109,15 +109,15 @@ void DigraphView::addRenderedEdge(const QString &/*name1*/, const QString &/*nam edge->points.resize(coords.count()/2); for (uint i = 0; i < edge->points.count(); ++i) - edge->points[i] = QPoint(toXPixel(coords[2*i]), toYPixel(coords[2*i+1])); + edge->points[i] = TQPoint(toXPixel(coords[2*i]), toYPixel(coords[2*i+1])); edges.append(edge); } -void DigraphView::addEdge(const QString &name1, const QString &name2) +void DigraphView::addEdge(const TQString &name1, const TQString &name2) { - QString line; + TQString line; line = "\""; line += name1; line += "\" -> \""; @@ -139,9 +139,9 @@ void DigraphView::clear() } -void DigraphView::setSelected(const QString &name) +void DigraphView::setSelected(const TQString &name) { - QPtrListIterator<DigraphNode> it(nodes); + TQPtrListIterator<DigraphNode> it(nodes); for (; it.current(); ++it) { if (it.current()->name == name) { updateContents(selNode->x-selNode->w/2, selNode->y-selNode->h/2, @@ -155,21 +155,21 @@ void DigraphView::setSelected(const QString &name) } -void DigraphView::ensureVisible(const QString &name) +void DigraphView::ensureVisible(const TQString &name) { - QPtrListIterator<DigraphNode> it(nodes); + TQPtrListIterator<DigraphNode> it(nodes); for (; it.current(); ++it) { if (it.current()->name == name) { - QScrollView::ensureVisible((*it)->x, (*it)->y, (*it)->w, (*it)->h); + TQScrollView::ensureVisible((*it)->x, (*it)->y, (*it)->w, (*it)->h); return; } } } -QStringList DigraphView::splitLine(QString str) +TQStringList DigraphView::splitLine(TQString str) { - QStringList result; + TQStringList result; while (!str.isEmpty()) { if (str[0] == '"') { @@ -193,11 +193,11 @@ QStringList DigraphView::splitLine(QString str) } -void DigraphView::parseDotResults(const QStringList &list) +void DigraphView::parseDotResults(const TQStringList &list) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = list.begin(); it != list.end(); ++it) { - QStringList tokens = splitLine(*it); + TQStringList tokens = splitLine(*it); if (tokens.count() == 0) continue; if (tokens[0] == "graph") { @@ -212,7 +212,7 @@ void DigraphView::parseDotResults(const QStringList &list) } else if (tokens[0] == "edge") { if (tokens.count() < 8) continue; - QMemArray<double> coords(tokens.count()-6); + TQMemArray<double> coords(tokens.count()-6); for (uint i=0; i != tokens.count()-6; ++i) coords[i] = tokens[i+4].toDouble(); addRenderedEdge(tokens[1], tokens[2], coords); @@ -221,22 +221,22 @@ void DigraphView::parseDotResults(const QStringList &list) } -void DigraphView::process( const QString& file, const QString& ext ) +void DigraphView::process( const TQString& file, const TQString& ext ) { - QString cmd = KGlobal::dirs()->findExe("dot"); + TQString cmd = KGlobal::dirs()->findExe("dot"); if (cmd.isEmpty()) { KMessageBox::sorry(0, i18n("You do not have 'dot' installed.\nIt can be downloaded from www.graphviz.org.")); return; } - QStringList results; + TQStringList results; KTempFile ifile, ofile; - QTextStream &is = *ifile.textStream(); + TQTextStream &is = *ifile.textStream(); is << "digraph G {" << endl; is << "rankdir=LR;" << endl; is << "node [shape=box,fontname=Helvetica,fontsize=12];" << endl; - QStringList::Iterator it; + TQStringList::Iterator it; for (it = inputs.begin(); it != inputs.end(); ++it) is << (*it) << endl; is << "}" << endl; @@ -245,8 +245,8 @@ void DigraphView::process( const QString& file, const QString& ext ) KProcess proc; if( !file.isEmpty() && !ext.isEmpty() ) { - proc << cmd << QString("-T")+ext << ifile.name() << "-o" << file; - kdDebug() << "Executing: " << cmd <<" "<<QString("-T")+ext <<" "<< ifile.name() << "-o"<<file << endl; + proc << cmd << TQString("-T")+ext << ifile.name() << "-o" << file; + kdDebug() << "Executing: " << cmd <<" "<<TQString("-T")+ext <<" "<< ifile.name() << "-o"<<file << endl; }else { proc << cmd << "-Tplain" << ifile.name() << "-o" << ofile.name(); @@ -258,7 +258,7 @@ void DigraphView::process( const QString& file, const QString& ext ) return; } - QTextStream &os = *ofile.textStream(); + TQTextStream &os = *ofile.textStream(); while (!os.atEnd()) results << os.readLine(); ofile.close(); @@ -271,61 +271,61 @@ void DigraphView::process( const QString& file, const QString& ext ) viewport()->update(); } -void DigraphView::drawContents(QPainter* p, int clipx, int clipy, int clipw, int cliph) +void DigraphView::drawContents(TQPainter* p, int clipx, int clipy, int clipw, int cliph) { - QRect clipRect(clipx, clipy, clipw, cliph); + TQRect clipRect(clipx, clipy, clipw, cliph); p->eraseRect(clipRect); p->setFont(KGlobalSettings::generalFont()); - QPtrListIterator<DigraphNode> it1(nodes); + TQPtrListIterator<DigraphNode> it1(nodes); for (; it1.current(); ++it1) { - QRect r((*it1)->x-(*it1)->w/2, (*it1)->y-(*it1)->h/2, (*it1)->w, (*it1)->h); + TQRect r((*it1)->x-(*it1)->w/2, (*it1)->y-(*it1)->h/2, (*it1)->w, (*it1)->h); if (r.intersects(clipRect)) { if (it1.current() == selNode) - p->fillRect(r, QBrush(lightGray, SolidPattern)); + p->fillRect(r, TQBrush(lightGray, SolidPattern)); else p->drawRect(r); p->drawText(r, AlignCenter, (*it1)->name); } } - p->setBrush(QBrush(black, SolidPattern)); - QPtrListIterator<DigraphEdge> it2(edges); + p->setBrush(TQBrush(black, SolidPattern)); + TQPtrListIterator<DigraphEdge> it2(edges); for (; it2.current(); ++it2) { int n = (*it2)->points.count(); for (int i=0; i+3 < n; i+=3) { - QPointArray a(4); - QPointArray &b = (*it2)->points; + TQPointArray a(4); + TQPointArray &b = (*it2)->points; for (int j=0; j<4; ++j) a.setPoint(j, b.point(i+j)); if (a.boundingRect().intersects(clipRect)) p->drawCubicBezier((*it2)->points, i); } - QPoint p1 = (*it2)->points[n-2]; - QPoint p2 = (*it2)->points[n-1]; - QPoint d = p1-p2; + TQPoint p1 = (*it2)->points[n-2]; + TQPoint p2 = (*it2)->points[n-1]; + TQPoint d = p1-p2; double l = sqrt(d.x()*d.x()+d.y()*d.y()); double d11 = (10.0)/l*d.x(); double d12 = (10.0)/l*d.y(); double d21 = -(3.0/l)*d.y(); double d22 = (3.0/l)*d.x(); - QPointArray triangle(3); - triangle[0] = p2 + QPoint((int)(d11+d21),(int)(d12+d22)); - triangle[1] = p2 + QPoint((int)(d11-d21),(int)(d12-d22)); + TQPointArray triangle(3); + triangle[0] = p2 + TQPoint((int)(d11+d21),(int)(d12+d22)); + triangle[1] = p2 + TQPoint((int)(d11-d21),(int)(d12-d22)); triangle[2] = p2; p->drawPolygon(triangle, true); } } -void DigraphView::contentsMousePressEvent(QMouseEvent *e) +void DigraphView::contentsMousePressEvent(TQMouseEvent *e) { - QPtrListIterator<DigraphNode> it1(nodes); + TQPtrListIterator<DigraphNode> it1(nodes); for (; it1.current(); ++it1) { - QRect r((*it1)->x-(*it1)->w/2, (*it1)->y-(*it1)->h/2, (*it1)->w, (*it1)->h); + TQRect r((*it1)->x-(*it1)->w/2, (*it1)->y-(*it1)->h/2, (*it1)->w, (*it1)->h); if (r.contains(e->pos())) { if (selNode) { - QRect oldr(selNode->x-selNode->w/2, selNode->y-selNode->h/2, + TQRect oldr(selNode->x-selNode->w/2, selNode->y-selNode->h/2, selNode->w, selNode->h); updateContents(oldr); } @@ -338,21 +338,21 @@ void DigraphView::contentsMousePressEvent(QMouseEvent *e) } -QSize DigraphView::sizeHint() const +TQSize DigraphView::sizeHint() const { if (width == -1) - return QSize(100, 100); // arbitrary + return TQSize(100, 100); // arbitrary - QSize dsize = KGlobalSettings::desktopGeometry(viewport()).size(); + TQSize dsize = KGlobalSettings::desktopGeometry(viewport()).size(); kdDebug(9003) << "sizehint for inheritance diagram" << dsize << " " << width << " " << height << endl; - return QSize(width, height).boundedTo(QSize(dsize.width()*2/3, dsize.height()*2/3)); + return TQSize(width, height).boundedTo(TQSize(dsize.width()*2/3, dsize.height()*2/3)); } #if 0 int main(int argc, char **argv) { - QApplication app(argc, argv); + TQApplication app(argc, argv); DigraphView *dw = new DigraphView(0, "dot widget"); dw->addEdge( "5th Edition", "6th Edition"); diff --git a/parts/classview/digraphview.h b/parts/classview/digraphview.h index c5fb2a28..b7215075 100644 --- a/parts/classview/digraphview.h +++ b/parts/classview/digraphview.h @@ -12,10 +12,10 @@ #ifndef _DIGRAPHVIEW_H_ #define _DIGRAPHVIEW_H_ -#include <qptrlist.h> -#include <qscrollview.h> -#include <qstringlist.h> -#include <qimage.h> +#include <tqptrlist.h> +#include <tqscrollview.h> +#include <tqstringlist.h> +#include <tqimage.h> class DigraphNode; class DigraphEdge; @@ -26,40 +26,40 @@ class DigraphView : public QScrollView Q_OBJECT public: - DigraphView(QWidget *parent, const char *name); + DigraphView(TQWidget *parent, const char *name); ~DigraphView(); - void addEdge(const QString &name1, const QString &name2); - void process(const QString& file = "", const QString& ext = ""); + void addEdge(const TQString &name1, const TQString &name2); + void process(const TQString& file = "", const TQString& ext = ""); void clear(); - void setSelected(const QString &name); - void ensureVisible(const QString &name); + void setSelected(const TQString &name); + void ensureVisible(const TQString &name); signals: - void selected(const QString &name); + void selected(const TQString &name); protected: - virtual void drawContents(QPainter* p, int clipx, int clipy, int clipw, int cliph); - virtual void contentsMousePressEvent(QMouseEvent *e); - virtual QSize sizeHint() const; + virtual void drawContents(TQPainter* p, int clipx, int clipy, int clipw, int cliph); + virtual void contentsMousePressEvent(TQMouseEvent *e); + virtual TQSize sizeHint() const; private: int toXPixel(double x); int toYPixel(double x); void setRenderedExtent(double w, double h); - void addRenderedNode(const QString &name, + void addRenderedNode(const TQString &name, double x, double y, double w, double h); - void addRenderedEdge(const QString &name1, const QString &name2, - QMemArray<double> coords); - static QStringList splitLine(QString str); - void parseDotResults(const QStringList &list); + void addRenderedEdge(const TQString &name1, const TQString &name2, + TQMemArray<double> coords); + static TQStringList splitLine(TQString str); + void parseDotResults(const TQStringList &list); double xscale, yscale; int width, height; - QStringList inputs; - QPtrList<DigraphNode> nodes; - QPtrList<DigraphEdge> edges; + TQStringList inputs; + TQPtrList<DigraphNode> nodes; + TQPtrList<DigraphEdge> edges; DigraphNode *selNode; }; diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp index 21a54031..a1f2c763 100644 --- a/parts/classview/hierarchydlg.cpp +++ b/parts/classview/hierarchydlg.cpp @@ -22,11 +22,11 @@ #include <kmessagebox.h> #include <kdebug.h> -#include <qlayout.h> -#include <qfileinfo.h> -#include <qlistview.h> -#include <qapplication.h> -#include <qsplitter.h> +#include <tqlayout.h> +#include <tqfileinfo.h> +#include <tqlistview.h> +#include <tqapplication.h> +#include <tqsplitter.h> #include "kdevlanguagesupport.h" #include "kcomboview.h" @@ -38,25 +38,25 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part ) - : QDialog(0, "hierarchy dialog", false) + : TQDialog(0, "hierarchy dialog", false) { class_combo = new KComboView(true, 150, this); - class_combo->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ); + class_combo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); // class_combo->setMinimumWidth(150); namespace_combo = new KComboView(true, 150, this); - namespace_combo->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ); + namespace_combo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); // namespace_combo->setMinimumWidth(150); - QPushButton *close_button = new KPushButton(KStdGuiItem::close(), this); - QPushButton *save_button = new KPushButton(KStdGuiItem::save(), this); - QPushButton *refresh_button = new KPushButton(i18n("Refresh"), this); + TQPushButton *close_button = new KPushButton(KStdGuiItem::close(), this); + TQPushButton *save_button = new KPushButton(KStdGuiItem::save(), this); + TQPushButton *refresh_button = new KPushButton(i18n("Refresh"), this); - QSplitter *splitter = new QSplitter(Vertical, this); + TQSplitter *splitter = new TQSplitter(Vertical, this); digraph = new DigraphView(splitter, "digraph view"); // member_tree = new ClassToolWidget(part, splitter); - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - QBoxLayout *combo_layout = new QHBoxLayout(); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *combo_layout = new TQHBoxLayout(); layout->addLayout(combo_layout); combo_layout->addWidget(namespace_combo); combo_layout->addWidget(class_combo); @@ -66,22 +66,22 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part ) combo_layout->addWidget(close_button); layout->addWidget(splitter); - connect( namespace_combo, SIGNAL(activated(QListViewItem*)), - this, SLOT(slotNamespaceComboChoice(QListViewItem*)) ); - connect( class_combo, SIGNAL(activated(QListViewItem*)), - this, SLOT(slotClassComboChoice(QListViewItem*)) ); - connect( namespace_combo, SIGNAL(textChanged(const QString&)), - this, SLOT(slotNamespaceComboChoice(const QString&)) ); - connect( class_combo, SIGNAL(textChanged(const QString&)), - this, SLOT(slotClassComboChoice(const QString&)) ); - connect( close_button, SIGNAL(clicked()), - this, SLOT(hide()) ); - connect( save_button, SIGNAL(clicked()), - this, SLOT(save()) ); - connect( refresh_button, SIGNAL(clicked()), - this, SLOT(refresh()) ); - connect( digraph, SIGNAL(selected(const QString&)), - this, SLOT(classSelected(const QString&)) ); + connect( namespace_combo, TQT_SIGNAL(activated(TQListViewItem*)), + this, TQT_SLOT(slotNamespaceComboChoice(TQListViewItem*)) ); + connect( class_combo, TQT_SIGNAL(activated(TQListViewItem*)), + this, TQT_SLOT(slotClassComboChoice(TQListViewItem*)) ); + connect( namespace_combo, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(slotNamespaceComboChoice(const TQString&)) ); + connect( class_combo, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(slotClassComboChoice(const TQString&)) ); + connect( close_button, TQT_SIGNAL(clicked()), + this, TQT_SLOT(hide()) ); + connect( save_button, TQT_SIGNAL(clicked()), + this, TQT_SLOT(save()) ); + connect( refresh_button, TQT_SIGNAL(clicked()), + this, TQT_SLOT(refresh()) ); + connect( digraph, TQT_SIGNAL(selected(const TQString&)), + this, TQT_SLOT(classSelected(const TQString&)) ); m_part = part; // m_part->registerHierarchyDialog(this); @@ -96,33 +96,33 @@ HierarchyDialog::~HierarchyDialog() void HierarchyDialog::save() { - KURLRequesterDlg dlg(QString::null, this, "save_inheritance"); + KURLRequesterDlg dlg(TQString::null, this, "save_inheritance"); dlg.fileDialog()->setFilter("image/png image/jpeg image/bmp image/svg+xml"); dlg.fileDialog()->setOperationMode( KFileDialog::Saving ); dlg.fileDialog()->setMode( KFile::File | KFile::LocalOnly ); dlg.urlRequester()->setMode( KFile::File | KFile::LocalOnly ); if(dlg.exec() && dlg.selectedURL().isLocalFile()) { - QFileInfo fi(dlg.selectedURL().pathOrURL()); - QApplication::setOverrideCursor( Qt::waitCursor ); + TQFileInfo fi(dlg.selectedURL().pathOrURL()); + TQApplication::setOverrideCursor( Qt::waitCursor ); KDevLanguageSupport *ls = m_part->languageSupport(); - for (QMap<QString, ClassDom>::const_iterator it = classes.begin(); it != classes.end(); ++it) + for (TQMap<TQString, ClassDom>::const_iterator it = classes.begin(); it != classes.end(); ++it) { kdDebug(9003) << "Adding class to graph: " << it.key() << endl; - QString formattedName = ls->formatClassName(it.key()); - QStringList baseClasses = it.data()->baseClassList(); - for (QStringList::const_iterator bit = baseClasses.begin(); bit != baseClasses.end(); ++bit) + TQString formattedName = ls->formatClassName(it.key()); + TQStringList baseClasses = it.data()->baseClassList(); + for (TQStringList::const_iterator bit = baseClasses.begin(); bit != baseClasses.end(); ++bit) { - QMap<QString, QString>::const_iterator baseIt = uclasses.find(*bit); + TQMap<TQString, TQString>::const_iterator baseIt = uclasses.find(*bit); if (baseIt != uclasses.end()) { - QString formattedParentName = ls->formatClassName(baseIt.data()); + TQString formattedParentName = ls->formatClassName(baseIt.data()); digraph->addEdge(formattedParentName, formattedName); } } } digraph->process(fi.absFilePath(), fi.extension()); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } } @@ -136,17 +136,17 @@ void HierarchyDialog::refresh() KDevLanguageSupport *ls = m_part->languageSupport(); - for (QMap<QString, ClassDom>::const_iterator it = classes.begin(); it != classes.end(); ++it) + for (TQMap<TQString, ClassDom>::const_iterator it = classes.begin(); it != classes.end(); ++it) { kdDebug(9003) << "Adding class to graph: " << it.key() << endl; - QString formattedName = ls->formatClassName(it.key()); - QStringList baseClasses = it.data()->baseClassList(); - for (QStringList::const_iterator bit = baseClasses.begin(); bit != baseClasses.end(); ++bit) + TQString formattedName = ls->formatClassName(it.key()); + TQStringList baseClasses = it.data()->baseClassList(); + for (TQStringList::const_iterator bit = baseClasses.begin(); bit != baseClasses.end(); ++bit) { - QMap<QString, QString>::const_iterator baseIt = uclasses.find(*bit); + TQMap<TQString, TQString>::const_iterator baseIt = uclasses.find(*bit); if (baseIt != uclasses.end()) { - QString formattedParentName = ls->formatClassName(baseIt.data()); + TQString formattedParentName = ls->formatClassName(baseIt.data()); digraph->addEdge(formattedParentName, formattedName); } } @@ -157,13 +157,13 @@ void HierarchyDialog::refresh() void HierarchyDialog::setLanguageSupport(KDevLanguageSupport *ls) { if (ls) - connect(ls, SIGNAL(updatedSourceInfo()), this, SLOT(refresh())); + connect(ls, TQT_SIGNAL(updatedSourceInfo()), this, TQT_SLOT(refresh())); else refresh(); } -void HierarchyDialog::slotClassComboChoice(QListViewItem * item) +void HierarchyDialog::slotClassComboChoice(TQListViewItem * item) { ClassItem *ci = dynamic_cast<ClassItem*>(item); if (!ci) @@ -171,15 +171,15 @@ void HierarchyDialog::slotClassComboChoice(QListViewItem * item) KDevLanguageSupport *ls = m_part->languageSupport(); - QString className = ls->formatClassName(uclasses[item->text(0)]); + TQString className = ls->formatClassName(uclasses[item->text(0)]); digraph->setSelected(className); digraph->ensureVisible(className); classSelected(className); } -void HierarchyDialog::slotClassComboChoice( const QString& itemText ) +void HierarchyDialog::slotClassComboChoice( const TQString& itemText ) { - QListViewItem* item = class_combo->listView()->firstChild(); + TQListViewItem* item = class_combo->listView()->firstChild(); while( item ) { if( item->text(0) == itemText ) @@ -190,7 +190,7 @@ void HierarchyDialog::slotClassComboChoice( const QString& itemText ) KDevLanguageSupport *ls = m_part->languageSupport(); - QString className = ls->formatClassName(uclasses[item->text(0)]); + TQString className = ls->formatClassName(uclasses[item->text(0)]); digraph->setSelected(className); digraph->ensureVisible(className); classSelected(className); @@ -200,7 +200,7 @@ void HierarchyDialog::slotClassComboChoice( const QString& itemText ) } } -void HierarchyDialog::classSelected(const QString &/*className*/) +void HierarchyDialog::classSelected(const TQString &/*className*/) { /* ParsedClass *currentClass = m_part->classStore()->getClassByName(className); member_tree->clear(); @@ -213,7 +213,7 @@ void HierarchyDialog::classSelected(const QString &/*className*/) }*/ } -void HierarchyDialog::slotNamespaceComboChoice( QListViewItem * item ) +void HierarchyDialog::slotNamespaceComboChoice( TQListViewItem * item ) { NamespaceItem *ni = dynamic_cast<NamespaceItem*>(item); if (!ni) @@ -221,9 +221,9 @@ void HierarchyDialog::slotNamespaceComboChoice( QListViewItem * item ) ViewCombosOp::refreshClasses(m_part, class_combo, ni->dom()->name()); } -void HierarchyDialog::slotNamespaceComboChoice( const QString& itemText ) +void HierarchyDialog::slotNamespaceComboChoice( const TQString& itemText ) { - QListViewItem* item = namespace_combo->listView()->firstChild(); + TQListViewItem* item = namespace_combo->listView()->firstChild(); while( item ) { if( item->text(0) == itemText ) @@ -238,11 +238,11 @@ void HierarchyDialog::slotNamespaceComboChoice( const QString& itemText ) } } -void HierarchyDialog::processNamespace( QString prefix, NamespaceDom dom ) +void HierarchyDialog::processNamespace( TQString prefix, NamespaceDom dom ) { qWarning("processNamespace: prefix %s", prefix.latin1()); - QString prefixInc = prefix.isEmpty() ? "" : "."; -// QString nsprefix = dom->name().isEmpty() ? QString("") : prefixInc + dom->name(); + TQString prefixInc = prefix.isEmpty() ? "" : "."; +// TQString nsprefix = dom->name().isEmpty() ? TQString("") : prefixInc + dom->name(); NamespaceList namespaceList = dom->namespaceList(); for (NamespaceList::const_iterator it = namespaceList.begin(); it != namespaceList.end(); ++it) @@ -258,11 +258,11 @@ void HierarchyDialog::processNamespace( QString prefix, NamespaceDom dom ) } } -void HierarchyDialog::processClass( QString prefix, ClassDom dom ) +void HierarchyDialog::processClass( TQString prefix, ClassDom dom ) { qWarning("processClass: prefix %s class %s", prefix.latin1(), dom->name().latin1()); - QString prefixInc = prefix.isEmpty() ? "" : "."; + TQString prefixInc = prefix.isEmpty() ? "" : "."; classes[prefix + prefixInc + dom->name()] = dom; uclasses[dom->name()] = prefix + prefixInc + dom->name(); diff --git a/parts/classview/hierarchydlg.h b/parts/classview/hierarchydlg.h index 82cf2d4a..79a6d470 100644 --- a/parts/classview/hierarchydlg.h +++ b/parts/classview/hierarchydlg.h @@ -12,7 +12,7 @@ #ifndef _HIERARCHYDLG_H_ #define _HIERARCHYDLG_H_ -#include <qdialog.h> +#include <tqdialog.h> #include "codemodel.h" @@ -35,21 +35,21 @@ public slots: private slots: void setLanguageSupport(KDevLanguageSupport *ls); - void slotClassComboChoice(QListViewItem *item); - void slotNamespaceComboChoice(QListViewItem *item); - void slotClassComboChoice(const QString&); - void slotNamespaceComboChoice(const QString&); - void classSelected(const QString &className); + void slotClassComboChoice(TQListViewItem *item); + void slotNamespaceComboChoice(TQListViewItem *item); + void slotClassComboChoice(const TQString&); + void slotNamespaceComboChoice(const TQString&); + void classSelected(const TQString &className); void save(); private: - void processNamespace(QString prefix, NamespaceDom dom); - void processClass(QString prefix, ClassDom dom); + void processNamespace(TQString prefix, NamespaceDom dom); + void processClass(TQString prefix, ClassDom dom); - QMap<QString, ClassDom> classes; - //QMap<class name, fully qualified class name> + TQMap<TQString, ClassDom> classes; + //TQMap<class name, fully qualified class name> //like MyClass - MyNamespace.MyClass - QMap<QString, QString> uclasses; + TQMap<TQString, TQString> uclasses; KComboView *namespace_combo; KComboView *class_combo; diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp index 596b5786..fa83a4ff 100644 --- a/parts/classview/navigator.cpp +++ b/parts/classview/navigator.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ #include "navigator.h" -#include <qtimer.h> +#include <tqtimer.h> #include <kconfig.h> #include <kdebug.h> @@ -46,10 +46,10 @@ namespace { template<class T> - QValueList<T> QValueList_reversed ( const QValueList<T> & list ) + TQValueList<T> QValueList_reversed ( const TQValueList<T> & list ) { - QValueList<T> rList; - typename QValueList<T>::ConstIterator it = list.begin(); + TQValueList<T> rList; + typename TQValueList<T>::ConstIterator it = list.begin(); while ( it != list.end() ) { rList.push_front ( *it ); @@ -61,7 +61,7 @@ namespace struct NavOp { - NavOp(Navigator *navigator, const QString &fullName) + NavOp(Navigator *navigator, const TQString &fullName) :m_navigator(navigator), m_fullName(fullName) {} bool operator() ( const FunctionDefinitionDom& def ) const @@ -75,7 +75,7 @@ struct NavOp private: Navigator *m_navigator; - QString m_fullName; + TQString m_fullName; }; @@ -85,9 +85,9 @@ private: public: enum Type { Declaration, Definition }; - FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, QListView *parent, QString name, Type type) + FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListView *parent, TQString name, Type type) :FancyListViewItem(styles, parent, name, ""), m_part(part), m_type(type) {} - FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, QListViewItem *parent, QString name, Type type) + FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListViewItem *parent, TQString name, Type type) :FancyListViewItem(styles, parent, name, ""), m_part(part), m_type(type) {} ~FunctionNavItem() {} @@ -105,31 +105,31 @@ private: Navigator::Navigator(ClassViewPart *parent, const char *name) - : QObject(parent, name), m_part(parent) + : TQObject(parent, name), m_part(parent) { m_state = GoToDefinitions; m_navNoDefinition = true; m_actionSyncWithEditor = new KAction( i18n("Sync ClassView"), "view_tree", KShortcut(), this, - SLOT(slotSyncWithEditor()), m_part->actionCollection(), "classview_sync_with_editor" ); + TQT_SLOT(slotSyncWithEditor()), m_part->actionCollection(), "classview_sync_with_editor" ); KAction * action = new KAction( i18n("Jump to next function"), CTRL+ALT+Key_PageDown, this, - SLOT(slotJumpToNextFunction()), m_part->actionCollection(), "navigator_jump_to_next_function" ); + TQT_SLOT(slotJumpToNextFunction()), m_part->actionCollection(), "navigator_jump_to_next_function" ); action->plug( &m_dummyActionWidget ); action = new KAction( i18n("Jump to previous function"), CTRL+ALT+Key_PageUp, this, - SLOT(slotJumpToPreviousFunction()), m_part->actionCollection(), "navigator_jump_to_previous_function" ); + TQT_SLOT(slotJumpToPreviousFunction()), m_part->actionCollection(), "navigator_jump_to_previous_function" ); action->plug( &m_dummyActionWidget ); - m_syncTimer = new QTimer(this); - connect(m_syncTimer, SIGNAL(timeout()), this, SLOT(syncFunctionNav())); + m_syncTimer = new TQTimer(this); + connect(m_syncTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(syncFunctionNav())); } Navigator::~Navigator() { } -void Navigator::selectFunctionNav(QListViewItem *item) +void Navigator::selectFunctionNav(TQListViewItem *item) { FunctionNavItem *nav = dynamic_cast<FunctionNavItem*>(item); if (!nav) @@ -247,7 +247,7 @@ void Navigator::syncFunctionNav() m_part->m_functionsnav->view()->setCurrentText(NAV_NODEFINITION); } -void Navigator::refreshNavBars(const QString &activeFileName, bool clear) +void Navigator::refreshNavBars(const TQString &activeFileName, bool clear) { kdDebug(9003) << k_funcinfo << endl; if (clear) @@ -261,13 +261,13 @@ void Navigator::refreshNavBars(const QString &activeFileName, bool clear) if (!file) return; - QStringList toLeave; + TQStringList toLeave; FunctionList list1 = CodeModelUtils::allFunctionsExhaustive(file); FunctionList::const_iterator flEnd = list1.end(); for (FunctionList::const_iterator it = list1.begin(); it != flEnd; ++it) { - QString fullName = fullFunctionDeclarationName(*it); + TQString fullName = fullFunctionDeclarationName(*it); if (clear || !m_functionNavDecls[fullName] && m_part->m_functionsnav->view()->listView()) { @@ -284,10 +284,10 @@ void Navigator::refreshNavBars(const QString &activeFileName, bool clear) kdDebug(9003) << k_funcinfo << "leave list: " << toLeave << endl; //remove items not in toLeave list - QMap<QString, QListViewItem*>::iterator it = m_functionNavDecls.begin(); + TQMap<TQString, TQListViewItem*>::iterator it = m_functionNavDecls.begin(); while ( it != m_functionNavDecls.end() ) { - QMap<QString, QListViewItem*>::iterator it2 = it; + TQMap<TQString, TQListViewItem*>::iterator it2 = it; ++it; if ( !toLeave.contains( it2.key() ) ) { @@ -303,7 +303,7 @@ void Navigator::refreshNavBars(const QString &activeFileName, bool clear) FunctionDefinitionList list = CodeModelUtils::allFunctionDefinitionsExhaustive(file); for (FunctionDefinitionList::const_iterator it = list.begin(); it != list.end(); ++it) { - QString fullName = fullFunctionDefinitionName(*it); + TQString fullName = fullFunctionDefinitionName(*it); if (clear || !m_functionNavDefs[fullName]) { @@ -326,10 +326,10 @@ void Navigator::refreshNavBars(const QString &activeFileName, bool clear) kdDebug(9003) << k_funcinfo << "leave list: " << toLeave << endl; //remove items not in toLeave list - QMap<QString, QListViewItem*>::iterator itt = m_functionNavDefs.begin(); + TQMap<TQString, TQListViewItem*>::iterator itt = m_functionNavDefs.begin(); while ( itt != m_functionNavDefs.end() ) { - QMap<QString, QListViewItem*>::iterator it2 = itt; + TQMap<TQString, TQListViewItem*>::iterator it2 = itt; ++itt; if ( !toLeave.contains( it2.key() ) ) { @@ -347,7 +347,7 @@ void Navigator::refresh() refreshNavBars(m_part->m_activeFileName, true); } -void Navigator::addFile(const QString & file) +void Navigator::addFile(const TQString & file) { kdDebug(9003) << k_funcinfo << "file: " << file << endl; if (file == m_part->m_activeFileName) @@ -374,16 +374,16 @@ FunctionDom Navigator::currentFunction() ///Some time this might be moved into the language-support-part, so each language ///can highlight as it likes -TextPaintItem highlightFunctionName(QString function, int type, TextPaintStyleStore& styles) { +TextPaintItem highlightFunctionName(TQString function, int type, TextPaintStyleStore& styles) { TextPaintItem ret; if( !styles.hasStyle( type ) ) { - QFont font = styles.getStyle( 0 ).font; + TQFont font = styles.getStyle( 0 ).font; switch(type) { case 1: default: - font.setWeight( QFont::DemiBold ); + font.setWeight( TQFont::DemiBold ); ///since bold makes the font a little bigger, make it smaller again #ifdef BOLDFONTSMALLER font.setPointSize( (font.pointSize() * 9) / 10 ); @@ -393,8 +393,8 @@ TextPaintItem highlightFunctionName(QString function, int type, TextPaintStyleSt styles.addStyle( type, font ); } - QString args; - QString fScope; + TQString args; + TQString fScope; int cutpos; if((cutpos = function.find('(')) != -1) { @@ -419,8 +419,8 @@ template <class DomType> TextPaintItem Navigator::fullFunctionItem(DomType fun) { - QStringList scope = fun->scope(); - QString function = scope.join("."); + TQStringList scope = fun->scope(); + TQString function = scope.join("."); if (!function.isEmpty()) function += "."; function += m_part->languageSupport()->formatModelItem(fun, true); @@ -429,10 +429,10 @@ TextPaintItem Navigator::fullFunctionItem(DomType fun) return highlightFunctionName(function, 1, m_styles); } -QString Navigator::fullFunctionDefinitionName(FunctionDefinitionDom fun) +TQString Navigator::fullFunctionDefinitionName(FunctionDefinitionDom fun) { - QStringList scope = fun->scope(); - QString funName = scope.join("."); + TQStringList scope = fun->scope(); + TQString funName = scope.join("."); if (!funName.isEmpty()) funName += "."; funName += m_part->languageSupport()->formatModelItem(fun, true); @@ -441,10 +441,10 @@ QString Navigator::fullFunctionDefinitionName(FunctionDefinitionDom fun) return funName; } -QString Navigator::fullFunctionDeclarationName(FunctionDom fun) +TQString Navigator::fullFunctionDeclarationName(FunctionDom fun) { - QStringList scope = fun->scope(); - QString funName = scope.join("."); + TQStringList scope = fun->scope(); + TQString funName = scope.join("."); if (!funName.isEmpty()) funName += "."; funName += m_part->languageSupport()->formatModelItem(fun, true); @@ -474,10 +474,10 @@ void Navigator::slotJumpToNextFunction() unsigned int currentLine, currentCol; m_part->m_activeViewCursor->cursorPositionReal ( ¤tLine, ¤tCol ); - QValueList<int> lines = functionStartLines(); + TQValueList<int> lines = functionStartLines(); if ( lines.isEmpty() ) return; - QValueList<int>::iterator it = lines.begin(); + TQValueList<int>::iterator it = lines.begin(); while ( it != lines.end() ) { if ( *it > currentLine ) @@ -499,10 +499,10 @@ void Navigator::slotJumpToPreviousFunction() unsigned int currentLine, currentCol; m_part->m_activeViewCursor->cursorPositionReal ( ¤tLine, ¤tCol ); - QValueList<int> lines = QValueList_reversed<int> ( functionStartLines() ); + TQValueList<int> lines = QValueList_reversed<int> ( functionStartLines() ); if ( lines.isEmpty() ) return; - QValueList<int>::iterator it = lines.begin(); + TQValueList<int>::iterator it = lines.begin(); while ( it != lines.end() ) { if ( *it < currentLine ) @@ -516,12 +516,12 @@ void Navigator::slotJumpToPreviousFunction() } } -QValueList<int> Navigator::functionStartLines() +TQValueList<int> Navigator::functionStartLines() { FileDom file = m_part->codeModel()->fileByName ( m_part->m_activeFileName ); - if ( !file ) return QValueList<int>(); + if ( !file ) return TQValueList<int>(); - QValueList<int> lines; + TQValueList<int> lines; FunctionDefinitionList list = CodeModelUtils::allFunctionDefinitionsExhaustive ( file ); FunctionDefinitionList::const_iterator it = list.begin(); while ( it != list.end() ) diff --git a/parts/classview/navigator.h b/parts/classview/navigator.h index 6953c55d..48470f19 100644 --- a/parts/classview/navigator.h +++ b/parts/classview/navigator.h @@ -20,9 +20,9 @@ #ifndef NAVIGATOR_H #define NAVIGATOR_H -#include <qobject.h> +#include <tqobject.h> #include <codemodel.h> -#include <qfont.h> +#include <tqfont.h> #include <fancylistviewitem.h> class TextPaintStyleStore; @@ -34,7 +34,7 @@ class KAction; #define NAV_NODEFINITION "(no function)" class TextPaintItem; -TextPaintItem highlightFunctionName( QString function, int type, TextPaintStyleStore& styles ); +TextPaintItem highlightFunctionName( TQString function, int type, TextPaintStyleStore& styles ); class Navigator : public QObject { @@ -46,23 +46,23 @@ public: ~Navigator(); void stopTimer(); - void refreshNavBars(const QString &activeFileName, bool clear = true); + void refreshNavBars(const TQString &activeFileName, bool clear = true); - QString fullFunctionDefinitionName(FunctionDefinitionDom fun); - QString fullFunctionDeclarationName(FunctionDom fun); + TQString fullFunctionDefinitionName(FunctionDefinitionDom fun); + TQString fullFunctionDeclarationName(FunctionDom fun); template <class DomType> TextPaintItem fullFunctionItem(DomType fun); public slots: - void selectFunctionNav(QListViewItem *item); + void selectFunctionNav(TQListViewItem *item); void syncFunctionNav(); void syncFunctionNavDelayed(int delay); void functionNavFocused(); void functionNavUnFocused(); void slotCursorPositionChanged(); void refresh(); - void addFile(const QString &file); + void addFile(const TQString &file); void slotSyncWithEditor(); void slotJumpToNextFunction(); void slotJumpToPreviousFunction(); @@ -70,20 +70,20 @@ public slots: protected: FunctionDom currentFunction(); - QValueList<int> functionStartLines(); + TQValueList<int> functionStartLines(); private: ClassViewPart *m_part; - QTimer *m_syncTimer; + TQTimer *m_syncTimer; NavigationState m_state; - QWidget m_dummyActionWidget; + TQWidget m_dummyActionWidget; KAction* m_actionSyncWithEditor; bool m_navNoDefinition; - QMap<QString, QListViewItem*> m_functionNavDefs; - QMap<QString, QListViewItem*> m_functionNavDecls; + TQMap<TQString, TQListViewItem*> m_functionNavDefs; + TQMap<TQString, TQListViewItem*> m_functionNavDecls; TextPaintStyleStore m_styles; }; diff --git a/parts/classview/viewcombos.cpp b/parts/classview/viewcombos.cpp index 63e861c6..bb7bf01d 100644 --- a/parts/classview/viewcombos.cpp +++ b/parts/classview/viewcombos.cpp @@ -27,13 +27,13 @@ #include "viewcombos.h" #include "classviewpart.h" -NamespaceItem::NamespaceItem(ClassViewPart *part, QListView *parent, QString name, NamespaceDom dom) - :QListViewItem(parent, name), m_dom(dom), m_part(part) +NamespaceItem::NamespaceItem(ClassViewPart *part, TQListView *parent, TQString name, NamespaceDom dom) + :TQListViewItem(parent, name), m_dom(dom), m_part(part) { } -NamespaceItem::NamespaceItem(ClassViewPart *part, QListViewItem *parent, QString name, NamespaceDom dom) - :QListViewItem(parent, name), m_dom(dom), m_part(part) +NamespaceItem::NamespaceItem(ClassViewPart *part, TQListViewItem *parent, TQString name, NamespaceDom dom) + :TQListViewItem(parent, name), m_dom(dom), m_part(part) { } @@ -48,18 +48,18 @@ NamespaceDom NamespaceItem::dom() const void NamespaceItem::setup() { - QListViewItem::setup(); + TQListViewItem::setup(); setPixmap( 0, UserIcon("CVnamespace", KIcon::DefaultState, m_part->instance()) ); } -ClassItem::ClassItem(ClassViewPart *part, QListView *parent, QString name, ClassDom dom) - :QListViewItem(parent, name), m_dom(dom), m_part(part) +ClassItem::ClassItem(ClassViewPart *part, TQListView *parent, TQString name, ClassDom dom) + :TQListViewItem(parent, name), m_dom(dom), m_part(part) { } -ClassItem::ClassItem(ClassViewPart *part, QListViewItem *parent, QString name, ClassDom dom) - :QListViewItem(parent, name), m_dom(dom), m_part(part) +ClassItem::ClassItem(ClassViewPart *part, TQListViewItem *parent, TQString name, ClassDom dom) + :TQListViewItem(parent, name), m_dom(dom), m_part(part) { } @@ -74,18 +74,18 @@ ClassDom ClassItem::dom() const void ClassItem::setup() { - QListViewItem::setup(); + TQListViewItem::setup(); setPixmap( 0, UserIcon("CVclass", KIcon::DefaultState, m_part->instance()) ); } -FunctionItem::FunctionItem(ClassViewPart *part, QListView *parent, QString name, FunctionDom dom) - :QListViewItem(parent, name), m_dom(dom), m_part(part) +FunctionItem::FunctionItem(ClassViewPart *part, TQListView *parent, TQString name, FunctionDom dom) + :TQListViewItem(parent, name), m_dom(dom), m_part(part) { } -FunctionItem::FunctionItem(ClassViewPart *part, QListViewItem *parent, QString name, FunctionDom dom) - :QListViewItem(parent, name), m_dom(dom), m_part(part) +FunctionItem::FunctionItem(ClassViewPart *part, TQListViewItem *parent, TQString name, FunctionDom dom) + :TQListViewItem(parent, name), m_dom(dom), m_part(part) { } @@ -100,8 +100,8 @@ FunctionDom FunctionItem::dom() const void FunctionItem::setup() { - QListViewItem::setup(); - QString iconName; + TQListViewItem::setup(); + TQString iconName; if( m_dom->access() == CodeModelItem::Private ) iconName = "CVprivate_meth"; else if( m_dom->access() == CodeModelItem::Protected ) @@ -131,7 +131,7 @@ void refreshNamespaces(ClassViewPart *part, KComboView *view) view->setCurrentActiveItem(global_item); } -void refreshClasses(ClassViewPart *part, KComboView *view, const QString &dom) +void refreshClasses(ClassViewPart *part, KComboView *view, const TQString &dom) { view->clear(); @@ -168,7 +168,7 @@ void refreshFunctions(ClassViewPart *part, KComboView *view, const ClassDom & do } } -void refreshFunctions(ClassViewPart *part, KComboView *view, const QString & dom) +void refreshFunctions(ClassViewPart *part, KComboView *view, const TQString & dom) { view->clear(); @@ -194,7 +194,7 @@ void refreshFunctions(ClassViewPart *part, KComboView *view, const QString & dom } -NamespaceDom ViewCombosOp::namespaceByName( NamespaceDom dom, QString name ) +NamespaceDom ViewCombosOp::namespaceByName( NamespaceDom dom, TQString name ) { NamespaceDom result; diff --git a/parts/classview/viewcombos.h b/parts/classview/viewcombos.h index 7c63ccd8..7525a5d8 100644 --- a/parts/classview/viewcombos.h +++ b/parts/classview/viewcombos.h @@ -22,20 +22,20 @@ #include <klocale.h> -#include <qlistview.h> +#include <tqlistview.h> #include "codemodel.h" class ClassViewPart; class KComboView; -const QString EmptyClasses = i18n("(Classes)"); -const QString EmptyFunctions = i18n("(Functions)"); +const TQString EmptyClasses = i18n("(Classes)"); +const TQString EmptyFunctions = i18n("(Functions)"); class NamespaceItem: public QListViewItem{ public: - NamespaceItem(ClassViewPart *part, QListView *parent, QString name, NamespaceDom dom); - NamespaceItem(ClassViewPart *part, QListViewItem *parent, QString name, NamespaceDom dom); + NamespaceItem(ClassViewPart *part, TQListView *parent, TQString name, NamespaceDom dom); + NamespaceItem(ClassViewPart *part, TQListViewItem *parent, TQString name, NamespaceDom dom); ~NamespaceItem(); NamespaceDom dom() const; virtual void setup(); @@ -46,8 +46,8 @@ private: class ClassItem: public QListViewItem{ public: - ClassItem(ClassViewPart *part, QListView *parent, QString name, ClassDom dom); - ClassItem(ClassViewPart *part, QListViewItem *parent, QString name, ClassDom dom); + ClassItem(ClassViewPart *part, TQListView *parent, TQString name, ClassDom dom); + ClassItem(ClassViewPart *part, TQListViewItem *parent, TQString name, ClassDom dom); ~ClassItem(); ClassDom dom() const; virtual void setup(); @@ -58,8 +58,8 @@ private: class FunctionItem: public QListViewItem{ public: - FunctionItem(ClassViewPart *part, QListView *parent, QString name, FunctionDom dom); - FunctionItem(ClassViewPart *part, QListViewItem *parent, QString name, FunctionDom dom); + FunctionItem(ClassViewPart *part, TQListView *parent, TQString name, FunctionDom dom); + FunctionItem(ClassViewPart *part, TQListViewItem *parent, TQString name, FunctionDom dom); ~FunctionItem(); FunctionDom dom() const; virtual void setup(); @@ -73,11 +73,11 @@ namespace ViewCombosOp{ enum ProcessType {Refresh, Reload}; void refreshNamespaces(ClassViewPart *part, KComboView *view); -void refreshClasses(ClassViewPart *part, KComboView *view, const QString &dom); +void refreshClasses(ClassViewPart *part, KComboView *view, const TQString &dom); void refreshFunctions(ClassViewPart *part, KComboView *view, const ClassDom & dom); -void refreshFunctions(ClassViewPart *part, KComboView *view, const QString & dom); +void refreshFunctions(ClassViewPart *part, KComboView *view, const TQString & dom); -NamespaceDom namespaceByName(NamespaceDom dom, QString name); +NamespaceDom namespaceByName(NamespaceDom dom, TQString name); } diff --git a/parts/ctags2/ctags2_createtagfile.cpp b/parts/ctags2/ctags2_createtagfile.cpp index b1ced0dd..5193d8cd 100644 --- a/parts/ctags2/ctags2_createtagfile.cpp +++ b/parts/ctags2/ctags2_createtagfile.cpp @@ -16,7 +16,7 @@ #include "ctags2_part.h" -CreateTagFile::CreateTagFile(QWidget* parent, const char* name, bool modal, WFlags fl) +CreateTagFile::CreateTagFile(TQWidget* parent, const char* name, bool modal, WFlags fl) : CTags2CreateTagFileBase( parent, name, modal, fl ) { dirToTag->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly); @@ -35,17 +35,17 @@ void CreateTagFile::validate() createTagFileButton->setEnabled( valid ); } -QString CreateTagFile::name( ) +TQString CreateTagFile::name( ) { return displayName->text(); } -QString CreateTagFile::tagsfilePath( ) +TQString CreateTagFile::tagsfilePath( ) { return newTagFilePath->url(); } -QString CreateTagFile::directory( ) +TQString CreateTagFile::directory( ) { return dirToTag->url(); } diff --git a/parts/ctags2/ctags2_createtagfile.h b/parts/ctags2/ctags2_createtagfile.h index 93b530d4..068c1815 100644 --- a/parts/ctags2/ctags2_createtagfile.h +++ b/parts/ctags2/ctags2_createtagfile.h @@ -21,11 +21,11 @@ class CreateTagFile : public CTags2CreateTagFileBase { Q_OBJECT public: - CreateTagFile(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CreateTagFile(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~CreateTagFile(); - QString name(); - QString tagsfilePath(); - QString directory(); + TQString name(); + TQString tagsfilePath(); + TQString directory(); private: diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp index 29b564e6..b05a12a4 100644 --- a/parts/ctags2/ctags2_part.cpp +++ b/parts/ctags2/ctags2_part.cpp @@ -9,11 +9,11 @@ * * ***************************************************************************/ -#include <qwhatsthis.h> -#include <qpopupmenu.h> -#include <qtextstream.h> -#include <qfile.h> -#include <qregexp.h> +#include <tqwhatsthis.h> +#include <tqpopupmenu.h> +#include <tqtextstream.h> +#include <tqfile.h> +#include <tqregexp.h> #include <klineedit.h> #include <klistview.h> @@ -58,41 +58,41 @@ typedef KDevGenericFactory<CTags2Part> CTags2Factory; static const KDevPluginInfo data("kdevctags2"); K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( data ) ) -CTags2Part::CTags2Part(QObject *parent, const char *name, const QStringList& ) +CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& ) : KDevPlugin(&data, parent, name ? name : "ctags2Part" ) { setInstance(CTags2Factory::instance()); setXMLFile("kdevpart_ctags2.rc"); - QDomDocument & dom = *projectDom(); - QString customTagFile = DomUtil::readEntry( dom, "/ctagspart/customTagfilePath" ); + TQDomDocument & dom = *projectDom(); + TQString customTagFile = DomUtil::readEntry( dom, "/ctagspart/customTagfilePath" ); if ( customTagFile.isEmpty() ) { customTagFile = project()->projectDirectory() + "/tags"; } - QStringList tagFiles = DomUtil::readListEntry(dom, "/ctagspart/activeTagsFiles", "file"); + TQStringList tagFiles = DomUtil::readListEntry(dom, "/ctagspart/activeTagsFiles", "file"); tagFiles.push_front(customTagFile); Tags::setTagFiles(tagFiles); m_widget = new CTags2Widget(this); - QWhatsThis::add(m_widget, i18n("<b>CTags</b><p>Result view for a tag lookup. Click a line to go to the corresponding place in the code.")); + TQWhatsThis::add(m_widget, i18n("<b>CTags</b><p>Result view for a tag lookup. Click a line to go to the corresponding place in the code.")); m_widget->setCaption(i18n("CTags Lookup")); mainWindow()->embedOutputView( m_widget, i18n( "CTags" ), i18n( "CTags lookup results" ) ); - connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), this, SLOT(contextMenu(QPopupMenu *, const Context *)) ); + connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("CTags"), CTAGSSETTINGSPAGE, info()->icon() ); - connect( _configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )), - this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )) ); - - new KAction( i18n("Lookup Current Text"), 0, CTRL+Key_Underscore, this, SLOT(slotLookup()), actionCollection(), "ctags_lookup_shortcut"); - new KAction( i18n("Lookup Current Text as Declaration"), 0, CTRL+Key_Semicolon, this, SLOT(slotLookupDeclaration()), actionCollection(), "ctags_declaration_shortcut"); - new KAction( i18n("Lookup Current Text as Definition"), 0, CTRL+Key_Colon, this, SLOT(slotLookupDefinition()), actionCollection(), "ctags_definition_shortcut"); - new KAction( i18n("Jump to Next Match"), 0, 0, this, SLOT(slotGoToNext()), actionCollection(), "ctags_jump_to_next"); - new KAction( i18n("Open Lookup Dialog"), 0, 0, this, SLOT(slotOpenLookup()), actionCollection(), "ctags_input_shortcut"); + connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + + new KAction( i18n("Lookup Current Text"), 0, CTRL+Key_Underscore, this, TQT_SLOT(slotLookup()), actionCollection(), "ctags_lookup_shortcut"); + new KAction( i18n("Lookup Current Text as Declaration"), 0, CTRL+Key_Semicolon, this, TQT_SLOT(slotLookupDeclaration()), actionCollection(), "ctags_declaration_shortcut"); + new KAction( i18n("Lookup Current Text as Definition"), 0, CTRL+Key_Colon, this, TQT_SLOT(slotLookupDefinition()), actionCollection(), "ctags_definition_shortcut"); + new KAction( i18n("Jump to Next Match"), 0, 0, this, TQT_SLOT(slotGoToNext()), actionCollection(), "ctags_jump_to_next"); + new KAction( i18n("Open Lookup Dialog"), 0, 0, this, TQT_SLOT(slotOpenLookup()), actionCollection(), "ctags_input_shortcut"); } @@ -106,17 +106,17 @@ CTags2Part::~CTags2Part() delete _configProxy; } -void CTags2Part::insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int pagenumber ) +void CTags2Part::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber ) { if ( pagenumber == CTAGSSETTINGSPAGE ) { CTags2SettingsWidget * w = new CTags2SettingsWidget( this, page ); - connect( dlg, SIGNAL(okClicked()), w, SLOT(slotAccept()) ); - connect( w, SIGNAL(newTagsfileName(const QString& )), this, SLOT(updateTagsfileName(const QString& )) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); + connect( w, TQT_SIGNAL(newTagsfileName(const TQString& )), this, TQT_SLOT(updateTagsfileName(const TQString& )) ); } } -void CTags2Part::updateTagsfileName( const QString & ) +void CTags2Part::updateTagsfileName( const TQString & ) { m_widget->updateDBDateLabel(); } @@ -125,14 +125,14 @@ void CTags2Part::updateTagsfileName( const QString & ) bool CTags2Part::createTagsFile() { // check if user specified a custom tag file name - QDomDocument & dom = *projectDom(); - QString tagsFileCustom = DomUtil::readEntry( dom, "/ctagspart/customTagfilePath" ).stripWhiteSpace(); + TQDomDocument & dom = *projectDom(); + TQString tagsFileCustom = DomUtil::readEntry( dom, "/ctagspart/customTagfilePath" ).stripWhiteSpace(); return createTagsFile(tagsFileCustom, project()->projectDirectory()); } // creates a new tag file with the specified name for the specified source directory -bool CTags2Part::createTagsFile(const QString& tagFile, const QString& dir) +bool CTags2Part::createTagsFile(const TQString& tagFile, const TQString& dir) { /* KProcess proc; @@ -149,18 +149,18 @@ bool CTags2Part::createTagsFile(const QString& tagFile, const QString& dir) // get name of the ctags binary KConfig * config = kapp->config(); config->setGroup( "CTAGS" ); - QString ctagsBinary = config->readEntry( "ctags binary" ).stripWhiteSpace(); + TQString ctagsBinary = config->readEntry( "ctags binary" ).stripWhiteSpace(); if ( ctagsBinary.isEmpty() ) { ctagsBinary = "ctags"; } // set a default argument list - QString argsDefault = "-R --c++-types=+px --excmd=pattern --exclude=Makefile --exclude=."; + TQString argsDefault = "-R --c++-types=+px --excmd=pattern --exclude=Makefile --exclude=."; - QDomDocument & dom = *projectDom(); - QString argsCustom = DomUtil::readEntry( dom, "/ctagspart/customArguments" ).stripWhiteSpace(); - QString commandline = ctagsBinary + " " + ( argsCustom.isEmpty() ? argsDefault : argsCustom ) + ( tagFile.isEmpty() ? "" : " -f " + tagFile ); + TQDomDocument & dom = *projectDom(); + TQString argsCustom = DomUtil::readEntry( dom, "/ctagspart/customArguments" ).stripWhiteSpace(); + TQString commandline = ctagsBinary + " " + ( argsCustom.isEmpty() ? argsDefault : argsCustom ) + ( tagFile.isEmpty() ? "" : " -f " + tagFile ); commandline += " "; commandline += dir; @@ -170,13 +170,13 @@ bool CTags2Part::createTagsFile(const QString& tagFile, const QString& dir) return true; } -void CTags2Part::contextMenu(QPopupMenu *popup, const Context *context) +void CTags2Part::contextMenu(TQPopupMenu *popup, const Context *context) { if (!context->hasType( Context::EditorContext )) return; const EditorContext *econtext = static_cast<const EditorContext*>(context); - QString ident = econtext->currentWord(); + TQString ident = econtext->currentWord(); if (ident.isEmpty()) return; @@ -189,18 +189,18 @@ void CTags2Part::contextMenu(QPopupMenu *popup, const Context *context) if ( Tags::hasTag( ident ) && ( showDefinition || showDeclaration || showLookup ) ) { m_contextString = ident; - QString squeezed = KStringHandler::csqueeze(ident, 30); + TQString squeezed = KStringHandler::csqueeze(ident, 30); popup->insertSeparator(); if ( showDeclaration ) - popup->insertItem( i18n("CTags - Go to Declaration: %1").arg(squeezed), this, SLOT(slotGotoDeclaration()) ); + popup->insertItem( i18n("CTags - Go to Declaration: %1").arg(squeezed), this, TQT_SLOT(slotGotoDeclaration()) ); if ( showDefinition ) - popup->insertItem( i18n("CTags - Go to Definition: %1").arg(squeezed), this, SLOT(slotGotoDefinition()) ); + popup->insertItem( i18n("CTags - Go to Definition: %1").arg(squeezed), this, TQT_SLOT(slotGotoDefinition()) ); if ( showLookup ) - popup->insertItem( i18n("CTags - Lookup: %1").arg(squeezed), this, SLOT(slotGotoTag()) ); + popup->insertItem( i18n("CTags - Lookup: %1").arg(squeezed), this, TQT_SLOT(slotGotoTag()) ); } } @@ -217,7 +217,7 @@ void CTags2Part::slotGotoTag( ) showHits( Tags::getExactMatches( m_contextString ) ); } -void CTags2Part::gotoTagForTypes( QStringList const & types ) +void CTags2Part::gotoTagForTypes( TQStringList const & types ) { Tags::TagList list = Tags::getMatches( m_contextString, false, types ); @@ -231,7 +231,7 @@ void CTags2Part::gotoTagForTypes( QStringList const & types ) { Tags::TagEntry tag = list.first(); KURL url; - QString fileWithTagInside; + TQString fileWithTagInside; // assume relative path to project directory if path does not start with slash if (tag.file[0] != '/') { fileWithTagInside = project()->projectDirectory() + "/" + tag.file; @@ -251,25 +251,25 @@ void CTags2Part::gotoTagForTypes( QStringList const & types ) void CTags2Part::slotGotoDefinition( ) { - QStringList types; + TQStringList types; types << "S" << "d" << "f" << "t" << "v"; gotoTagForTypes( types ); } void CTags2Part::slotGotoDeclaration( ) { - QStringList types; + TQStringList types; types << "L" << "c" << "e" << "g" << "m" << "n" << "p" << "s" << "u" << "x"; gotoTagForTypes( types ); } -int CTags2Part::getFileLineFromStream( QTextStream & istream, QString const & pattern ) +int CTags2Part::getFileLineFromStream( TQTextStream & istream, TQString const & pattern ) { if ( pattern.isEmpty() ) return -1; // ctags interestingly escapes "/", but apparently nothing else. lets revert that - QString unescaped = pattern; + TQString unescaped = pattern; unescaped.replace( "\\/", "/" ); // most of the time, the ctags pattern has the form /^foo$/ @@ -277,21 +277,21 @@ int CTags2Part::getFileLineFromStream( QTextStream & istream, QString const & pa // where the form is only /^foo/ // I have no idea if this is a ctags bug or not, but we have to deal with it - QString reduced, escaped, re_string; + TQString reduced, escaped, re_string; if ( unescaped.endsWith( "$/" ) ) { reduced = unescaped.mid( 2, unescaped.length() -4 ); - escaped = QRegExp::escape( reduced ); - re_string = QString( "^" + escaped + "$" ); + escaped = TQRegExp::escape( reduced ); + re_string = TQString( "^" + escaped + "$" ); } else { reduced = unescaped.mid( 2, unescaped.length() -3 ); - escaped = QRegExp::escape( reduced ); - re_string = QString( "^" + escaped ); + escaped = TQRegExp::escape( reduced ); + re_string = TQString( "^" + escaped ); } - QRegExp re( re_string ); + TQRegExp re( re_string ); int n = 0; while ( !istream.atEnd() ) @@ -305,23 +305,23 @@ int CTags2Part::getFileLineFromStream( QTextStream & istream, QString const & pa return -1; } -int CTags2Part::getFileLineFromPattern( KURL const & url, QString const & pattern ) +int CTags2Part::getFileLineFromPattern( KURL const & url, TQString const & pattern ) { // if the file is open - get the line from the editor buffer if ( KTextEditor::EditInterface * ei = dynamic_cast<KTextEditor::EditInterface*>( partController()->partForURL( url ) ) ) { - QString ibuffer = ei->text(); - QTextStream istream( &ibuffer, IO_ReadOnly ); + TQString ibuffer = ei->text(); + TQTextStream istream( &ibuffer, IO_ReadOnly ); return getFileLineFromStream( istream, pattern ); } else // else the file is not open - get the line from the file on disk { - QFile file( url.path() ); - QString buffer; + TQFile file( url.path() ); + TQString buffer; if ( file.open( IO_ReadOnly ) ) { - QTextStream istream( &file ); + TQTextStream istream( &file ); return getFileLineFromStream( istream, pattern ); } } diff --git a/parts/ctags2/ctags2_part.h b/parts/ctags2/ctags2_part.h index 77725500..b602ca35 100644 --- a/parts/ctags2/ctags2_part.h +++ b/parts/ctags2/ctags2_part.h @@ -12,8 +12,8 @@ #ifndef __KDEVPART_CTAGS2_H__ #define __KDEVPART_CTAGS2_H__ -#include <qguardedptr.h> -#include <qstring.h> +#include <tqguardedptr.h> +#include <tqstring.h> #include <kdevplugin.h> #include "tags.h" @@ -32,12 +32,12 @@ class CTags2Part : public KDevPlugin public: - CTags2Part(QObject *parent, const char *name, const QStringList &); + CTags2Part(TQObject *parent, const char *name, const TQStringList &); ~CTags2Part(); - int getFileLineFromPattern( KURL const & url, QString const & pattern); + int getFileLineFromPattern( KURL const & url, TQString const & pattern); bool createTagsFile(); - bool createTagsFile(const QString& tagFile, const QString& dir); + bool createTagsFile(const TQString& tagFile, const TQString& dir); private slots: void slotLookupDeclaration(); @@ -48,17 +48,17 @@ private slots: void slotGotoDefinition(); void slotGotoDeclaration(); void slotGotoTag(); - void contextMenu(QPopupMenu *, const Context *); - void insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int ); - void updateTagsfileName( const QString & name ); + void contextMenu(TQPopupMenu *, const Context *); + void insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int ); + void updateTagsfileName( const TQString & name ); private: - int getFileLineFromStream( QTextStream & stream, QString const & pattern); - void gotoTagForTypes( QStringList const & types ); + int getFileLineFromStream( TQTextStream & stream, TQString const & pattern); + void gotoTagForTypes( TQStringList const & types ); void showHits( Tags::TagList const & tags ); - QGuardedPtr<CTags2Widget> m_widget; - QString m_contextString ; + TQGuardedPtr<CTags2Widget> m_widget; + TQString m_contextString ; ConfigWidgetProxy * _configProxy; }; diff --git a/parts/ctags2/ctags2_selecttagfile.cpp b/parts/ctags2/ctags2_selecttagfile.cpp index d9ae94be..adb3ee78 100644 --- a/parts/ctags2/ctags2_selecttagfile.cpp +++ b/parts/ctags2/ctags2_selecttagfile.cpp @@ -15,7 +15,7 @@ #include "ctags2_selecttagfile.h" -SelectTagFile::SelectTagFile( QWidget* parent, const char* name, bool modal, WFlags fl) +SelectTagFile::SelectTagFile( TQWidget* parent, const char* name, bool modal, WFlags fl) : SelectTagFileBase( parent, name, modal, fl ) { tagFile->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); @@ -33,12 +33,12 @@ void SelectTagFile::validate() okButton->setEnabled( valid ); } -QString SelectTagFile::name( ) +TQString SelectTagFile::name( ) { return displayName->text(); } -QString SelectTagFile::tagsfilePath( ) +TQString SelectTagFile::tagsfilePath( ) { return tagFile->url(); } diff --git a/parts/ctags2/ctags2_selecttagfile.h b/parts/ctags2/ctags2_selecttagfile.h index 103ba98c..d4f4f5f9 100644 --- a/parts/ctags2/ctags2_selecttagfile.h +++ b/parts/ctags2/ctags2_selecttagfile.h @@ -18,10 +18,10 @@ class SelectTagFile : public SelectTagFileBase { Q_OBJECT public: - SelectTagFile( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + SelectTagFile( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SelectTagFile(); - QString name(); - QString tagsfilePath(); + TQString name(); + TQString tagsfilePath(); public slots: virtual void validate(); diff --git a/parts/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp index 4bcdb122..d7458a85 100644 --- a/parts/ctags2/ctags2_settingswidget.cpp +++ b/parts/ctags2/ctags2_settingswidget.cpp @@ -9,9 +9,9 @@ * * ***************************************************************************/ -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qheader.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqheader.h> #include <klineedit.h> #include <klistview.h> @@ -30,7 +30,7 @@ #include "ctags2_createtagfile.h" -CTags2SettingsWidget::CTags2SettingsWidget( CTags2Part * part, QWidget* parent, const char* name, WFlags fl ) +CTags2SettingsWidget::CTags2SettingsWidget( CTags2Part * part, TQWidget* parent, const char* name, WFlags fl ) : CTags2SettingsWidgetBase( parent, name, fl ), m_part( part ) { binaryPath->completionObject()->setMode( KURLCompletion::FileCompletion ); @@ -55,23 +55,23 @@ CTags2SettingsWidget::~CTags2SettingsWidget() void CTags2SettingsWidget::loadSettings() { - QDomDocument & dom = *m_part->projectDom(); + TQDomDocument & dom = *m_part->projectDom(); - QString customArgs = DomUtil::readEntry( dom, "/ctagspart/customArguments" ); + TQString customArgs = DomUtil::readEntry( dom, "/ctagspart/customArguments" ); if ( !customArgs.isEmpty() ) { tagfileCustomBox->setChecked( true ); tagfileCustomEdit->setText( customArgs ); } - QString customTagfile = DomUtil::readEntry( dom, "/ctagspart/customTagfilePath" ); + TQString customTagfile = DomUtil::readEntry( dom, "/ctagspart/customTagfilePath" ); if (customTagfile.isEmpty()) { customTagfile = m_part->project()->projectDirectory() + "/tags"; } tagfilePath->setURL(customTagfile); - QStringList activeTagsFiles = DomUtil::readListEntry(dom, "/ctagspart/activeTagsFiles", "file"); + TQStringList activeTagsFiles = DomUtil::readListEntry(dom, "/ctagspart/activeTagsFiles", "file"); KConfig * config = kapp->config(); config->setGroup( "CTAGS" ); @@ -79,18 +79,18 @@ void CTags2SettingsWidget::loadSettings() showDefinitionBox->setChecked( config->readBoolEntry( "ShowDefinition", true ) ); showLookupBox->setChecked( config->readBoolEntry( "ShowLookup", true ) ); jumpToFirstBox->setChecked( config->readBoolEntry( "JumpToFirst", false ) ); - QString ctagsBinary = config->readEntry( "ctags binary" ).stripWhiteSpace(); + TQString ctagsBinary = config->readEntry( "ctags binary" ).stripWhiteSpace(); if ( !ctagsBinary.isEmpty() ) { binaryPath->setURL( ctagsBinary ); } config->setGroup( "CTAGS-tagsfiles" ); - QMap<QString,QString> entryMap = config->entryMap( "CTAGS-tagsfiles" ); - QMap<QString,QString>::const_iterator it = entryMap.begin(); + TQMap<TQString,TQString> entryMap = config->entryMap( "CTAGS-tagsfiles" ); + TQMap<TQString,TQString>::const_iterator it = entryMap.begin(); while ( it != entryMap.end() ) { - QString file = config->readPathEntry( it.key() ); + TQString file = config->readPathEntry( it.key() ); new TagsItem( otherTagFiles, it.key(), file, activeTagsFiles.contains( file ) ); ++it; } @@ -98,7 +98,7 @@ void CTags2SettingsWidget::loadSettings() void CTags2SettingsWidget::storeSettings() { - QDomDocument & dom = *m_part->projectDom(); + TQDomDocument & dom = *m_part->projectDom(); DomUtil::writeEntry( dom, "/ctagspart/customArguments", tagfileCustomEdit->text() ); DomUtil::writeEntry( dom, "/ctagspart/customTagfilePath", tagfilePath->url() ); @@ -113,7 +113,7 @@ void CTags2SettingsWidget::storeSettings() config->deleteGroup( "CTAGS-tagsfiles" ); config->setGroup( "CTAGS-tagsfiles" ); - QStringList activeTagsFiles; + TQStringList activeTagsFiles; TagsItem * item = static_cast<TagsItem*>( otherTagFiles->firstChild() ); while ( item ) { @@ -142,7 +142,7 @@ void CTags2SettingsWidget::slotAccept( ) void CTags2SettingsWidget::createNewTagSlot() { CreateTagFile* dlg = new CreateTagFile; - if ( dlg->exec() == QDialog::Accepted ) + if ( dlg->exec() == TQDialog::Accepted ) { m_part->createTagsFile( dlg->tagsfilePath(), dlg->directory() ); new TagsItem( otherTagFiles, dlg->name(), dlg->tagsfilePath(), true ); @@ -153,7 +153,7 @@ void CTags2SettingsWidget::addNewTagFile() { SelectTagFile* dlg = new SelectTagFile; - if ( dlg->exec() == QDialog::Accepted ) + if ( dlg->exec() == TQDialog::Accepted ) { new TagsItem( otherTagFiles, dlg->name(), dlg->tagsfilePath(), true ); } diff --git a/parts/ctags2/ctags2_settingswidget.h b/parts/ctags2/ctags2_settingswidget.h index ac208ad4..5a9d5c71 100644 --- a/parts/ctags2/ctags2_settingswidget.h +++ b/parts/ctags2/ctags2_settingswidget.h @@ -12,7 +12,7 @@ #ifndef CTAGS2_SETTINGSWIDGET_H #define CTAGS2_SETTINGSWIDGET_H -#include <qlistview.h> +#include <tqlistview.h> #include "ctags2_settingswidgetbase.h" @@ -21,18 +21,18 @@ class CTags2Part; class TagsItem : public QCheckListItem { public: - TagsItem( QListView * parent, QString name, QString tagsfilePath, bool active ) - : QCheckListItem( parent, name, QCheckListItem::CheckBox ), m_name( name ), m_tagsfilePath( tagsfilePath ) + TagsItem( TQListView * parent, TQString name, TQString tagsfilePath, bool active ) + : TQCheckListItem( parent, name, TQCheckListItem::CheckBox ), m_name( name ), m_tagsfilePath( tagsfilePath ) { setOn( active ); setText( 1, tagsfilePath ); } - QString name() { return m_name; } - QString tagsfilePath() { return m_tagsfilePath; } + TQString name() { return m_name; } + TQString tagsfilePath() { return m_tagsfilePath; } private: - QString m_name; - QString m_tagsfilePath; + TQString m_name; + TQString m_tagsfilePath; }; @@ -42,11 +42,11 @@ class CTags2SettingsWidget : public CTags2SettingsWidgetBase Q_OBJECT public: - CTags2SettingsWidget( CTags2Part * part, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + CTags2SettingsWidget( CTags2Part * part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~CTags2SettingsWidget(); signals: - void newTagsfileName( const QString & name ); + void newTagsfileName( const TQString & name ); public slots: void slotAccept(); diff --git a/parts/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp index 7196ed1b..ab277966 100644 --- a/parts/ctags2/ctags2_widget.cpp +++ b/parts/ctags2/ctags2_widget.cpp @@ -9,11 +9,11 @@ * * ***************************************************************************/ -#include <qtimer.h> -#include <qlabel.h> -#include <qfileinfo.h> -#include <qdatetime.h> -#include <qfocusdata.h> +#include <tqtimer.h> +#include <tqlabel.h> +#include <tqfileinfo.h> +#include <tqdatetime.h> +#include <tqfocusdata.h> #include <klineedit.h> #include <klistview.h> @@ -31,31 +31,31 @@ class TagItem : public QListViewItem { public: - TagItem(QListView * lv, QString const & tag, QString const & type, QString const & file, QString const & pattern ); + TagItem(TQListView * lv, TQString const & tag, TQString const & type, TQString const & file, TQString const & pattern ); - QString tag; - QString type; - QString file; - QString pattern; + TQString tag; + TQString type; + TQString file; + TQString pattern; }; -TagItem::TagItem( QListView * lv, QString const & tag, QString const & type, QString const & file, QString const & pattern ) - : QListViewItem( lv, tag, type, file ), tag(tag), type(type), file(file), pattern(pattern) +TagItem::TagItem( TQListView * lv, TQString const & tag, TQString const & type, TQString const & file, TQString const & pattern ) + : TQListViewItem( lv, tag, type, file ), tag(tag), type(type), file(file), pattern(pattern) { } CTags2Widget::CTags2Widget( CTags2Part * part, const char* name, WFlags fl) : CTags2WidgetBase(0,name,fl), _part(part) { - output_view->setColumnWidthMode(0,QListView::Maximum); - output_view->setColumnWidthMode(1,QListView::Maximum); - output_view->setColumnWidthMode(2,QListView::Maximum); + output_view->setColumnWidthMode(0,TQListView::Maximum); + output_view->setColumnWidthMode(1,TQListView::Maximum); + output_view->setColumnWidthMode(2,TQListView::Maximum); - _typeTimeout = new QTimer( this ); - connect( _typeTimeout, SIGNAL(timeout()), this, SLOT(line_edit_changed()) ); + _typeTimeout = new TQTimer( this ); + connect( _typeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(line_edit_changed()) ); - connect( output_view, SIGNAL(executed(QListViewItem*)), this, SLOT(itemExecuted(QListViewItem*)) ); - connect( output_view, SIGNAL(returnPressed(QListViewItem*)), this, SLOT(itemExecuted(QListViewItem*)) ); + connect( output_view, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(itemExecuted(TQListViewItem*)) ); + connect( output_view, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(itemExecuted(TQListViewItem*)) ); updateDBDateLabel(); } @@ -112,12 +112,12 @@ int CTags2Widget::calculateHitCount( ) return Tags::numberOfPartialMatches( input_edit->text() ) ; } -void CTags2Widget::itemExecuted( QListViewItem * item ) +void CTags2Widget::itemExecuted( TQListViewItem * item ) { TagItem * tagItem = static_cast<TagItem*>( item ); KURL url; - QString fileWithTagInside; + TQString fileWithTagInside; // assume relative path to project directory if path does not start with slash if (tagItem->file[0] != '/') { fileWithTagInside = _part->project()->projectDirectory() + "/" + tagItem->file; @@ -133,19 +133,19 @@ void CTags2Widget::itemExecuted( QListViewItem * item ) void CTags2Widget::regeneratebutton_clicked() { - QApplication::setOverrideCursor(Qt::waitCursor); + TQApplication::setOverrideCursor(Qt::waitCursor); _part->createTagsFile(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); updateDBDateLabel(); } void CTags2Widget::updateDBDateLabel( ) { - QStringList tagFiles = Tags::getTagFiles(); - QFileInfo tagsdb(tagFiles[0]); + TQStringList tagFiles = Tags::getTagFiles(); + TQFileInfo tagsdb(tagFiles[0]); if ( tagsdb.exists() ) { datetime_label->setText( tagsdb.created().date().toString( Qt::ISODate ) ); @@ -156,7 +156,7 @@ void CTags2Widget::updateDBDateLabel( ) } } -void CTags2Widget::focusInEvent( QFocusEvent* ) +void CTags2Widget::focusInEvent( TQFocusEvent* ) { updateDBDateLabel(); input_edit->setFocus(); @@ -164,7 +164,7 @@ void CTags2Widget::focusInEvent( QFocusEvent* ) void CTags2Widget::goToNext( ) { - QListViewItem * item = output_view->firstChild(); + TQListViewItem * item = output_view->firstChild(); while( item ) { if ( item->isSelected() ) diff --git a/parts/ctags2/ctags2_widget.h b/parts/ctags2/ctags2_widget.h index 2a4423a4..758e73b1 100644 --- a/parts/ctags2/ctags2_widget.h +++ b/parts/ctags2/ctags2_widget.h @@ -34,20 +34,20 @@ public: void goToNext(); protected: - void focusInEvent( QFocusEvent *e ); + void focusInEvent( TQFocusEvent *e ); private slots: virtual void line_edit_changed(); virtual void line_edit_changed_delayed(); virtual void regeneratebutton_clicked(); - void itemExecuted( QListViewItem * ); + void itemExecuted( TQListViewItem * ); private: void showHitCount( int ); int calculateHitCount(); CTags2Part * _part; - QTimer * _typeTimeout; + TQTimer * _typeTimeout; }; diff --git a/parts/ctags2/ctagskinds.cpp b/parts/ctags2/ctagskinds.cpp index c8d5ef93..e198c577 100644 --- a/parts/ctags2/ctagskinds.cpp +++ b/parts/ctags2/ctagskinds.cpp @@ -273,7 +273,7 @@ static CTagsExtensionMapping extensionMapping[] = { }; -static CTagsKindMapping *findKindMapping(const QString &extension) +static CTagsKindMapping *findKindMapping(const TQString &extension) { const char *pextension = extension.latin1(); @@ -288,9 +288,9 @@ static CTagsKindMapping *findKindMapping(const QString &extension) } -QString CTagsKinds::findKind( const char * kindChar, const QString &extension ) +TQString CTagsKinds::findKind( const char * kindChar, const TQString &extension ) { - if ( kindChar == 0 ) return QString::null; + if ( kindChar == 0 ) return TQString::null; CTagsKindMapping *kindMapping = findKindMapping(extension); if (kindMapping) { @@ -302,5 +302,5 @@ QString CTagsKinds::findKind( const char * kindChar, const QString &extension ) } } - return QString::null; + return TQString::null; } diff --git a/parts/ctags2/ctagskinds.h b/parts/ctags2/ctagskinds.h index de695319..7bf76a09 100644 --- a/parts/ctags2/ctagskinds.h +++ b/parts/ctags2/ctagskinds.h @@ -12,13 +12,13 @@ #ifndef _CTAGSKINDS_H_ #define _CTAGSKINDS_H_ -#include <qstring.h> +#include <tqstring.h> class CTagsKinds { public: - static QString findKind( const char * kindChar, const QString &extension); + static TQString findKind( const char * kindChar, const TQString &extension); }; #endif diff --git a/parts/ctags2/tagitem.cpp b/parts/ctags2/tagitem.cpp index e2ddf158..36220db5 100644 --- a/parts/ctags2/tagitem.cpp +++ b/parts/ctags2/tagitem.cpp @@ -11,8 +11,8 @@ #include "tagitem.h" -TagItem::TagItem( QListView * lv, QString const & tag, QString const & type, QString const & file, QString const & pattern ) - : QListViewItem( lv ), tag(tag), type(type), file(file), pattern(pattern) +TagItem::TagItem( TQListView * lv, TQString const & tag, TQString const & type, TQString const & file, TQString const & pattern ) + : TQListViewItem( lv ), tag(tag), type(type), file(file), pattern(pattern) {} TagItem::~TagItem() diff --git a/parts/ctags2/tagitem.h b/parts/ctags2/tagitem.h index fddb823d..19bc0a59 100644 --- a/parts/ctags2/tagitem.h +++ b/parts/ctags2/tagitem.h @@ -12,18 +12,18 @@ #ifndef TAGITEM_H #define TAGITEM_H -#include <qlistview.h> +#include <tqlistview.h> class TagItem : public QListViewItem { public: - TagItem(QListView * lv, QString const & tag, QString const & type, QString const & file, QString const & pattern ); + TagItem(TQListView * lv, TQString const & tag, TQString const & type, TQString const & file, TQString const & pattern ); ~TagItem(); - QString tag; - QString type; - QString file; - QString pattern; + TQString tag; + TQString type; + TQString file; + TQString pattern; }; #endif diff --git a/parts/ctags2/tags.cpp b/parts/ctags2/tags.cpp index 3ba98159..19993823 100644 --- a/parts/ctags2/tags.cpp +++ b/parts/ctags2/tags.cpp @@ -18,18 +18,18 @@ namespace ctags #include "tags.h" -QStringList Tags::_tagFiles; +TQStringList Tags::_tagFiles; Tags::TagEntry::TagEntry() {} -Tags::TagEntry::TagEntry( const QString & tag, const QString & type, const QString & file, const QString & pattern ) +Tags::TagEntry::TagEntry( const TQString & tag, const TQString & type, const TQString & file, const TQString & pattern ) : tag(tag), type(type), file(file), pattern(pattern) {} -bool Tags::hasTag(const QString & tag ) +bool Tags::hasTag(const TQString & tag ) { - QStringList::iterator it; + TQStringList::iterator it; for (it = _tagFiles.begin(); it != _tagFiles.end() ; it++) { if (hasTag((*it).ascii(), tag)) return true; @@ -38,7 +38,7 @@ bool Tags::hasTag(const QString & tag ) return false; } -bool Tags::hasTag(const char* tagFile, const QString & tag ) +bool Tags::hasTag(const char* tagFile, const TQString & tag ) { ctags::tagFileInfo info; ctags::tagFile * file = ctags::tagsOpen(tagFile, &info ); @@ -51,10 +51,10 @@ bool Tags::hasTag(const char* tagFile, const QString & tag ) return found; } -unsigned int Tags::numberOfMatches( const QString & tagpart, bool partial ) +unsigned int Tags::numberOfMatches( const TQString & tagpart, bool partial ) { unsigned int n = 0; - QStringList::iterator it; + TQStringList::iterator it; for (it = _tagFiles.begin(); it != _tagFiles.end(); it++) { n += numberOfMatches( (*it).ascii(), tagpart, partial ); @@ -63,7 +63,7 @@ unsigned int Tags::numberOfMatches( const QString & tagpart, bool partial ) return n; } -unsigned int Tags::numberOfMatches(const char* tagFile, const QString & tagpart, bool partial ) +unsigned int Tags::numberOfMatches(const char* tagFile, const TQString & tagpart, bool partial ) { unsigned int n = 0; @@ -88,12 +88,12 @@ unsigned int Tags::numberOfMatches(const char* tagFile, const QString & tagpart, } -Tags::TagList Tags::getMatches( const QString & tagpart, bool partial, const QStringList & types ) +Tags::TagList Tags::getMatches( const TQString & tagpart, bool partial, const TQStringList & types ) { Tags::TagList list; // build a compound tag list from all the configured tag files - QStringList::iterator it; + TQStringList::iterator it; for ( it = _tagFiles.begin(); it != _tagFiles.end(); it++ ) { list += getMatches((*it).ascii(), tagpart, partial, types); @@ -102,7 +102,7 @@ Tags::TagList Tags::getMatches( const QString & tagpart, bool partial, const QSt return list; } -Tags::TagList Tags::getMatches(const char* tagFile, const QString & tagpart, bool partial, const QStringList & types ) +Tags::TagList Tags::getMatches(const char* tagFile, const TQString & tagpart, bool partial, const TQStringList & types ) { Tags::TagList list; @@ -116,8 +116,8 @@ Tags::TagList Tags::getMatches(const char* tagFile, const QString & tagpart, boo { do { - QString type( CTagsKinds::findKind( entry.kind, QString( entry.file ).section( '.', -1 ) ) ); - QString file( entry.file ); + TQString type( CTagsKinds::findKind( entry.kind, TQString( entry.file ).section( '.', -1 ) ) ); + TQString file( entry.file ); if ( type.isEmpty() && file.endsWith( "Makefile" ) ) { @@ -125,7 +125,7 @@ Tags::TagList Tags::getMatches(const char* tagFile, const QString & tagpart, boo } if ( types.isEmpty() || types.contains( entry.kind ) ) { - list << TagEntry( QString( entry.name ), type, file, QString( entry.address.pattern ) ); + list << TagEntry( TQString( entry.name ), type, file, TQString( entry.address.pattern ) ); } } while ( ctags::tagsFindNext( file, &entry ) == ctags::TagSuccess ); @@ -136,32 +136,32 @@ Tags::TagList Tags::getMatches(const char* tagFile, const QString & tagpart, boo return list; } -void Tags::setTagFiles(const QStringList& tagFiles ) +void Tags::setTagFiles(const TQStringList& tagFiles ) { _tagFiles = tagFiles; } -QStringList Tags::getTagFiles( ) +TQStringList Tags::getTagFiles( ) { return _tagFiles; } -unsigned int Tags::numberOfPartialMatches( const QString & tagpart ) +unsigned int Tags::numberOfPartialMatches( const TQString & tagpart ) { return numberOfMatches( tagpart, true ); } -unsigned int Tags::numberOfExactMatches( const QString & tagpart ) +unsigned int Tags::numberOfExactMatches( const TQString & tagpart ) { return numberOfMatches( tagpart, false ); } -Tags::TagList Tags::getPartialMatches( const QString & tagpart ) +Tags::TagList Tags::getPartialMatches( const TQString & tagpart ) { return getMatches( tagpart, true ); } -Tags::TagList Tags::getExactMatches( const QString & tag ) +Tags::TagList Tags::getExactMatches( const TQString & tag ) { return getMatches( tag, false ); } diff --git a/parts/ctags2/tags.h b/parts/ctags2/tags.h index 1d7e3604..22b7e7ea 100644 --- a/parts/ctags2/tags.h +++ b/parts/ctags2/tags.h @@ -12,10 +12,10 @@ #ifndef TAGS_H #define TAGS_H -#include <qvaluelist.h> -#include <qcstring.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqvaluelist.h> +#include <tqcstring.h> +#include <tqstring.h> +#include <tqstringlist.h> class Tags { @@ -24,49 +24,49 @@ public: struct TagEntry { TagEntry(); - TagEntry( const QString & tag, const QString & type, const QString & file, const QString & pattern ); + TagEntry( const TQString & tag, const TQString & type, const TQString & file, const TQString & pattern ); - QString tag; - QString type; - QString file; - QString pattern; + TQString tag; + TQString type; + TQString file; + TQString pattern; }; - typedef QValueList<TagEntry> TagList; + typedef TQValueList<TagEntry> TagList; /** * Method to set the tag database filename * @param file the tag database filename */ - static void setTagFiles(const QStringList& tagFiles); + static void setTagFiles(const TQStringList& tagFiles); - static QStringList getTagFiles(); + static TQStringList getTagFiles(); /** * Method to check if the tag database contains a specific tag * @param tag Tag to look up * @return returns true if tag database contains 'tag' */ - static bool hasTag( const QString & tag ); + static bool hasTag( const TQString & tag ); - static unsigned int numberOfPartialMatches( const QString & tagpart ); - static unsigned int numberOfExactMatches( const QString & tag ); - static unsigned int numberOfMatches( const QString & tagpart, bool partial ); + static unsigned int numberOfPartialMatches( const TQString & tagpart ); + static unsigned int numberOfExactMatches( const TQString & tag ); + static unsigned int numberOfMatches( const TQString & tagpart, bool partial ); - static TagList getPartialMatches( const QString & tagpart ); - static TagList getExactMatches( const QString & tag ); - static TagList getMatches( const QString & tagpart, bool partial, const QStringList & types = QStringList() ); + static TagList getPartialMatches( const TQString & tagpart ); + static TagList getExactMatches( const TQString & tag ); + static TagList getMatches( const TQString & tagpart, bool partial, const TQStringList & types = TQStringList() ); private: static Tags::TagList getMatches(const char* tagFile, - const QString & tagpart, + const TQString & tagpart, bool partial, - const QStringList & types ); + const TQStringList & types ); static unsigned int numberOfMatches(const char* tagFile, - const QString & tagpart, + const TQString & tagpart, bool partial ); - static bool hasTag(const char* tagFile, const QString & tag ); - static QStringList _tagFiles; + static bool hasTag(const char* tagFile, const TQString & tag ); + static TQStringList _tagFiles; }; #endif diff --git a/parts/diff/diffdlg.cpp b/parts/diff/diffdlg.cpp index 049a3d60..e5a8c74d 100644 --- a/parts/diff/diffdlg.cpp +++ b/parts/diff/diffdlg.cpp @@ -9,20 +9,20 @@ * * ***************************************************************************/ -#include <qlayout.h> +#include <tqlayout.h> #include <klocale.h> #include "diffdlg.h" #include "diffwidget.h" -DiffDlg::DiffDlg( QWidget *parent, const char *name ): +DiffDlg::DiffDlg( TQWidget *parent, const char *name ): KDialogBase( parent, name, true, i18n("Difference Viewer"), Ok ) { diffWidget = new DiffWidget( this, "Main Diff Widget" ); setMainWidget( diffWidget ); - QVBoxLayout* layout = new QVBoxLayout( this, 0, spacingHint() ); + TQVBoxLayout* layout = new TQVBoxLayout( this, 0, spacingHint() ); layout->addWidget( diffWidget ); } @@ -35,7 +35,7 @@ void DiffDlg::slotClear() diffWidget->slotClear(); } -void DiffDlg::setDiff( const QString& diff ) +void DiffDlg::setDiff( const TQString& diff ) { diffWidget->setDiff( diff ); } diff --git a/parts/diff/diffdlg.h b/parts/diff/diffdlg.h index 6f47dcf2..a25a3957 100644 --- a/parts/diff/diffdlg.h +++ b/parts/diff/diffdlg.h @@ -22,14 +22,14 @@ class DiffDlg : public KDialogBase Q_OBJECT public: - DiffDlg( QWidget *parent = 0, const char *name = 0 ); + DiffDlg( TQWidget *parent = 0, const char *name = 0 ); virtual ~DiffDlg(); public slots: /** The URL has to point to a diff file */ void openURL( const KURL& url ); /** Pass a diff file in here */ - void setDiff( const QString& diff ); + void setDiff( const TQString& diff ); /** clears the difference viewer */ void slotClear(); diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp index 8f04b060..fab596ad 100644 --- a/parts/diff/diffpart.cpp +++ b/parts/diff/diffpart.cpp @@ -12,8 +12,8 @@ #include <sys/stat.h> -#include <qwhatsthis.h> -#include <qpopupmenu.h> +#include <tqwhatsthis.h> +#include <tqpopupmenu.h> #include <klocale.h> #include <kdevgenericfactory.h> @@ -41,7 +41,7 @@ static const KDevPluginInfo data("kdevdiff"); typedef KDevGenericFactory<DiffPart> DiffFactory; K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( data ) ) -DiffPart::DiffPart(QObject *parent, const char *name, const QStringList &) +DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &) : KDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0) { setInstance(DiffFactory::instance()); @@ -49,22 +49,22 @@ DiffPart::DiffPart(QObject *parent, const char *name, const QStringList &) diffWidget = new DiffWidget(this, 0, "diffWidget"); diffWidget->setIcon( SmallIcon("editcopy") ); - QString nm( i18n( "Diff" ) ); + TQString nm( i18n( "Diff" ) ); diffWidget->setCaption( i18n( "Diff Output" ) ); - QWhatsThis::add(diffWidget, i18n("<b>Difference viewer</b><p>Shows output of the diff format. " + TQWhatsThis::add(diffWidget, i18n("<b>Difference viewer</b><p>Shows output of the diff format. " "Can utilize every installed component that is able to show diff output. " "For example if you have Kompare installed, Difference Viewer can use its graphical diff view.")); mainWindow()->embedOutputView( diffWidget, nm, i18n("Output of the diff command") ); mainWindow()->setViewAvailable( diffWidget, false ); KAction *action = new KAction( i18n("Difference Viewer..."), 0, - this, SLOT(slotExecDiff()), + this, TQT_SLOT(slotExecDiff()), actionCollection(), "tools_diff" ); action->setToolTip(i18n("Difference viewer")); action->setWhatsThis(i18n("<b>Difference viewer</b><p>Shows the contents of a patch file.")); - connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *)) ); + connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); } static bool urlIsEqual(const KURL &a, const KURL &b) @@ -73,8 +73,8 @@ static bool urlIsEqual(const KURL &a, const KURL &b) { struct stat aStat, bStat; - if ((::stat(QFile::encodeName(a.fileName()), &aStat) == 0) - && (::stat(QFile::encodeName(b.fileName()), &bStat) == 0)) + if ((::stat(TQFile::encodeName(a.fileName()), &aStat) == 0) + && (::stat(TQFile::encodeName(b.fileName()), &bStat) == 0)) { return (aStat.st_dev == bStat.st_dev) && (aStat.st_ino == bStat.st_ino); } @@ -87,7 +87,7 @@ static KParts::ReadWritePart* partForURL(const KURL &url, KDevPartController* pc { if ( !pc ) return 0; - QPtrListIterator<KParts::Part> it(*(pc->parts())); + TQPtrListIterator<KParts::Part> it(*(pc->parts())); for ( ; it.current(); ++it) { KParts::ReadWritePart *rw_part = dynamic_cast<KParts::ReadWritePart*>(it.current()); @@ -98,7 +98,7 @@ static KParts::ReadWritePart* partForURL(const KURL &url, KDevPartController* pc return 0; } -void DiffPart::contextMenu( QPopupMenu* popup, const Context* context ) +void DiffPart::contextMenu( TQPopupMenu* popup, const Context* context ) { if ( context->hasType( Context::EditorContext ) ) { @@ -121,7 +121,7 @@ void DiffPart::contextMenu( QPopupMenu* popup, const Context* context ) if ( partController()->documentState( rw_part->url() ) != Clean ) { int id = popup->insertItem( i18n( "Difference to Disk File" ), - this, SLOT(localDiff()) ); + this, TQT_SLOT(localDiff()) ); popup->setWhatsThis(id, i18n("<b>Difference to disk file</b><p>Shows the difference between " "the file contents in this editor and the file contents on disk.")); } @@ -146,7 +146,7 @@ void DiffPart::localDiff() if ( !editIface ) return; buffer = editIface->text().local8Bit(); - resultBuffer = resultErr = QString::null; + resultBuffer = resultErr = TQString::null; delete proc; proc = new KProcess(); @@ -155,14 +155,14 @@ void DiffPart::localDiff() *proc << "-u" << popupFile.path() << "-"; proc->setWorkingDirectory( popupFile.directory() ); - connect( proc, SIGNAL(processExited( KProcess* )), - this, SLOT(processExited( KProcess* )) ); - connect( proc, SIGNAL(receivedStdout( KProcess*, char*, int )), - this, SLOT(receivedStdout( KProcess*, char*, int )) ); - connect( proc, SIGNAL(receivedStderr( KProcess*, char*, int )), - this, SLOT(receivedStderr( KProcess*, char*, int )) ); - connect( proc, SIGNAL(wroteStdin( KProcess* )), - this, SLOT(wroteStdin( KProcess* )) ); + connect( proc, TQT_SIGNAL(processExited( KProcess* )), + this, TQT_SLOT(processExited( KProcess* )) ); + connect( proc, TQT_SIGNAL(receivedStdout( KProcess*, char*, int )), + this, TQT_SLOT(receivedStdout( KProcess*, char*, int )) ); + connect( proc, TQT_SIGNAL(receivedStderr( KProcess*, char*, int )), + this, TQT_SLOT(receivedStderr( KProcess*, char*, int )) ); + connect( proc, TQT_SIGNAL(wroteStdin( KProcess* )), + this, TQT_SLOT(wroteStdin( KProcess* )) ); if ( !proc->start( KProcess::NotifyOnExit, KProcess::All ) ) { KMessageBox::error( 0, i18n( "Could not invoke the \"diff\" command." ) ); @@ -184,20 +184,20 @@ void DiffPart::processExited( KProcess* p ) } else { KMessageBox::error( 0, i18n("Diff command failed (%1):\n").arg( p->exitStatus() ) + resultErr ); } - resultBuffer = resultErr = QString::null; + resultBuffer = resultErr = TQString::null; delete proc; proc = 0; } void DiffPart::receivedStdout( KProcess* /* p */, char* buf, int buflen ) { - resultBuffer += QString::fromLocal8Bit( buf, buflen ); + resultBuffer += TQString::fromLocal8Bit( buf, buflen ); } void DiffPart::receivedStderr( KProcess* /* p */, char* buf, int buflen ) { - kdDebug(9033) << "received Stderr: " << QString::fromLocal8Bit( buf, buflen ) << endl; - resultErr += QString::fromLocal8Bit( buf, buflen ); + kdDebug(9033) << "received Stderr: " << TQString::fromLocal8Bit( buf, buflen ) << endl; + resultErr += TQString::fromLocal8Bit( buf, buflen ); } void DiffPart::wroteStdin( KProcess* p ) @@ -220,7 +220,7 @@ void DiffPart::openURL( const KURL& url ) */ } -void DiffPart::showDiff( const QString& diff ) +void DiffPart::showDiff( const TQString& diff ) { diffWidget->slotClear(); diffWidget->setDiff( diff ); @@ -237,7 +237,7 @@ void DiffPart::showDiff( const QString& diff ) void DiffPart::slotExecDiff() { - KURL url = KFileDialog::getOpenURL( QString::null, QString::null, 0, i18n("Please Select Patch File") ); + KURL url = KFileDialog::getOpenURL( TQString::null, TQString::null, 0, i18n("Please Select Patch File") ); if ( url.isEmpty() ) return; diff --git a/parts/diff/diffpart.h b/parts/diff/diffpart.h index f89d0d18..dff5ba0c 100644 --- a/parts/diff/diffpart.h +++ b/parts/diff/diffpart.h @@ -12,8 +12,8 @@ #ifndef _DIFFPART_H_ #define _DIFFPART_H_ -#include <qguardedptr.h> -#include <qcstring.h> +#include <tqguardedptr.h> +#include <tqcstring.h> #include "kdevplugin.h" #include "kdevdifffrontend.h" @@ -29,18 +29,18 @@ class DiffPart : public KDevDiffFrontend Q_OBJECT public: - DiffPart( QObject *parent, const char *name, const QStringList & ); + DiffPart( TQObject *parent, const char *name, const TQStringList & ); virtual ~DiffPart(); void openURL( const KURL& url ); - void showDiff( const QString& diff ); + void showDiff( const TQString& diff ); void showDiff( const KURL &, const KURL & ) { /** @todo */ } public slots: void slotExecDiff(); private slots: - void contextMenu( QPopupMenu* popup, const Context* context ); + void contextMenu( TQPopupMenu* popup, const Context* context ); void localDiff(); void processExited( KProcess* p ); void receivedStdout( KProcess* p, char* buf, int buflen ); @@ -48,12 +48,12 @@ private slots: void wroteStdin( KProcess* p ); private: - QGuardedPtr<DiffWidget> diffWidget; + TQGuardedPtr<DiffWidget> diffWidget; KURL popupFile; KProcess* proc; - QCString buffer; - QString resultBuffer; - QString resultErr; + TQCString buffer; + TQString resultBuffer; + TQString resultErr; }; #endif diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp index 0b3399ab..7d403e46 100644 --- a/parts/diff/diffwidget.cpp +++ b/parts/diff/diffwidget.cpp @@ -9,11 +9,11 @@ * * ***************************************************************************/ -#include <qlayout.h> -#include <qtextedit.h> -#include <qpopupmenu.h> -#include <qcursor.h> -#include <qfile.h> +#include <tqlayout.h> +#include <tqtextedit.h> +#include <tqpopupmenu.h> +#include <tqcursor.h> +#include <tqfile.h> #include <kconfig.h> #include <kapplication.h> @@ -39,10 +39,10 @@ // yup, magic value for the popupmenu-id static const int POPUP_BASE = 130977; -QStringList KDiffTextEdit::extParts; -QStringList KDiffTextEdit::extPartsTranslated; +TQStringList KDiffTextEdit::extParts; +TQStringList KDiffTextEdit::extPartsTranslated; -KDiffTextEdit::KDiffTextEdit( QWidget* parent, const char* name ): QTextEdit( parent, name ) +KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name ) { KConfig* config = kapp->config(); config->setGroup( "Diff" ); @@ -59,51 +59,51 @@ KDiffTextEdit::~KDiffTextEdit() config->writeEntry( "Highlight", _highlight ); } -QPopupMenu* KDiffTextEdit::createPopupMenu() +TQPopupMenu* KDiffTextEdit::createPopupMenu() { - return createPopupMenu( QPoint() ); + return createPopupMenu( TQPoint() ); } -QPopupMenu* KDiffTextEdit::createPopupMenu( const QPoint& p ) +TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p ) { - QPopupMenu* popup = QTextEdit::createPopupMenu( p ); + TQPopupMenu* popup = TQTextEdit::createPopupMenu( p ); if ( !popup ) - popup = new QPopupMenu( this ); + popup = new TQPopupMenu( this ); int i = 0; - for ( QStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) { + for ( TQStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) { popup->insertItem( i18n( "Show in %1" ).arg( *it ), i + POPUP_BASE, i ); i++; } if ( !extPartsTranslated.isEmpty() ) popup->insertSeparator( i ); - connect( popup, SIGNAL(activated(int)), this, SLOT(popupActivated(int)) ); + connect( popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupActivated(int)) ); - popup->insertItem( SmallIconSet( "filesaveas" ), i18n( "&Save As..." ), this, SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); + popup->insertItem( SmallIconSet( "filesaveas" ), i18n( "&Save As..." ), this, TQT_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); popup->setItemEnabled( POPUP_BASE - 2, length() > 0 ); popup->insertSeparator( 1 ); - popup->insertItem( i18n( "Highlight Syntax" ), this, SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); + popup->insertItem( i18n( "Highlight Syntax" ), this, TQT_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); popup->setItemChecked( POPUP_BASE - 1, _highlight ); popup->insertSeparator( 3 ); popup->insertSeparator(); - popup->insertItem( i18n("Hide view"), parent(), SLOT(hideView()) ); + popup->insertItem( i18n("Hide view"), parent(), TQT_SLOT(hideView()) ); return popup; } void KDiffTextEdit::saveAs() { - QString fName = KFileDialog::getSaveFileName(); + TQString fName = KFileDialog::getSaveFileName(); if ( fName.isEmpty() ) return; - QFile f( fName ); + TQFile f( fName ); if ( f.open( IO_WriteOnly ) ) { - QTextStream stream( &f ); + TQTextStream stream( &f ); int pCount = paragraphs(); for ( int i = 0; i < pCount; ++i ) stream << text( i ) << "\n"; @@ -125,15 +125,15 @@ void KDiffTextEdit::toggleSyntaxHighlight() void KDiffTextEdit::applySyntaxHighlight() { // the diff has been loaded so we apply a simple highlighting - static QColor cAdded( 190, 190, 237); - static QColor cRemoved( 190, 237, 190 ); + static TQColor cAdded( 190, 190, 237); + static TQColor cRemoved( 190, 237, 190 ); if ( !_highlight ) return; int paragCount = paragraphs(); for ( int i = 0; i < paragCount; ++i ) { - QString txt = text( i ); + TQString txt = text( i ); if ( txt.length() > 0 ) { if ( txt.startsWith( "+" ) || txt.startsWith( ">" ) ) { setParagraphBackgroundColor( i, cAdded ); @@ -180,19 +180,19 @@ void KDiffTextEdit::popupActivated( int id ) emit externalPartRequested( extParts[ id ] ); } -DiffWidget::DiffWidget( DiffPart * part, QWidget *parent, const char *name, WFlags f ): - QWidget( parent, name, f ), m_part( part ), tempFile( 0 ) +DiffWidget::DiffWidget( DiffPart * part, TQWidget *parent, const char *name, WFlags f ): + TQWidget( parent, name, f ), m_part( part ), tempFile( 0 ) { job = 0; extPart = 0; te = new KDiffTextEdit( this, "Main Diff Viewer" ); te->setReadOnly( true ); - te->setTextFormat( QTextEdit::PlainText ); + te->setTextFormat( TQTextEdit::PlainText ); // te->setMinimumSize( 300, 200 ); - connect( te, SIGNAL(externalPartRequested(const QString&)), this, SLOT(loadExtPart(const QString&)) ); + connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) ); - QVBoxLayout* layout = new QVBoxLayout( this ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); layout->addWidget( te ); } @@ -217,7 +217,7 @@ void DiffWidget::setExtPartVisible( bool visible ) } } -void DiffWidget::loadExtPart( const QString& partName ) +void DiffWidget::loadExtPart( const TQString& partName ) { if ( extPart ) { setExtPartVisible( false ); @@ -243,22 +243,22 @@ void DiffWidget::loadExtPart( const QString& partName ) void DiffWidget::slotClear() { - rawDiff = QString(); + rawDiff = TQString(); te->clear(); if ( extPart ) extPart->closeURL(); } // internally for the TextEdit only! -void DiffWidget::slotAppend( const QString& str ) +void DiffWidget::slotAppend( const TQString& str ) { te->append( str ); } // internally for the TextEdit only! -void DiffWidget::slotAppend( KIO::Job*, const QByteArray& ba ) +void DiffWidget::slotAppend( KIO::Job*, const TQByteArray& ba ) { - slotAppend( QString( ba ) ); + slotAppend( TQString( ba ) ); } void DiffWidget::populateExtPart() @@ -292,7 +292,7 @@ void DiffWidget::slotFinished() populateExtPart(); } -void DiffWidget::setDiff( const QString& diff ) +void DiffWidget::setDiff( const TQString& diff ) { slotClear(); rawDiff = diff; @@ -309,24 +309,24 @@ void DiffWidget::openURL( const KURL& url ) if ( !job ) return; - connect( job, SIGNAL(data( KIO::Job *, const QByteArray & )), - this, SLOT(slotAppend( KIO::Job*, const QByteArray& )) ); - connect( job, SIGNAL(result( KIO::Job * )), - this, SLOT(slotFinished()) ); + connect( job, TQT_SIGNAL(data( KIO::Job *, const TQByteArray & )), + this, TQT_SLOT(slotAppend( KIO::Job*, const TQByteArray& )) ); + connect( job, TQT_SIGNAL(result( KIO::Job * )), + this, TQT_SLOT(slotFinished()) ); } -void DiffWidget::contextMenuEvent( QContextMenuEvent* /* e */ ) +void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ ) { - QPopupMenu* popup = new QPopupMenu( this ); + TQPopupMenu* popup = new TQPopupMenu( this ); if ( !te->isVisible() ) { - popup->insertItem( i18n("Display &Raw Output"), this, SLOT(showTextEdit()) ); + popup->insertItem( i18n("Display &Raw Output"), this, TQT_SLOT(showTextEdit()) ); popup->insertSeparator(); - popup->insertItem( i18n("Hide view"), this, SLOT(hideView()) ); + popup->insertItem( i18n("Hide view"), this, TQT_SLOT(hideView()) ); } - popup->exec( QCursor::pos() ); + popup->exec( TQCursor::pos() ); delete popup; } diff --git a/parts/diff/diffwidget.h b/parts/diff/diffwidget.h index 665b1110..dc8568c2 100644 --- a/parts/diff/diffwidget.h +++ b/parts/diff/diffwidget.h @@ -12,9 +12,9 @@ #ifndef _DIFFWIDGET_H_ #define _DIFFWIDGET_H_ -#include <qwidget.h> -#include <qtextedit.h> -#include <qstringlist.h> +#include <tqwidget.h> +#include <tqtextedit.h> +#include <tqstringlist.h> #include <kurl.h> @@ -34,17 +34,17 @@ class KDiffTextEdit: public QTextEdit { Q_OBJECT public: - KDiffTextEdit( QWidget* parent = 0, const char* name = 0 ); + KDiffTextEdit( TQWidget* parent = 0, const char* name = 0 ); virtual ~KDiffTextEdit(); void applySyntaxHighlight(); void clearSyntaxHighlight(); signals: - void externalPartRequested( const QString& partName ); + void externalPartRequested( const TQString& partName ); protected: - virtual QPopupMenu* createPopupMenu( const QPoint& ); - virtual QPopupMenu* createPopupMenu(); + virtual TQPopupMenu* createPopupMenu( const TQPoint& ); + virtual TQPopupMenu* createPopupMenu(); private slots: void popupActivated( int ); @@ -53,8 +53,8 @@ private slots: private: static void searchExtParts(); - static QStringList extParts; - static QStringList extPartsTranslated; + static TQStringList extParts; + static TQStringList extPartsTranslated; bool _highlight; }; @@ -63,33 +63,33 @@ class DiffWidget : public QWidget Q_OBJECT public: - DiffWidget( DiffPart * part, QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); + DiffWidget( DiffPart * part, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); virtual ~DiffWidget(); public slots: /** The URL has to point to a diff file */ void openURL( const KURL& url ); /** Pass a diff file in here */ - void setDiff( const QString& diff ); + void setDiff( const TQString& diff ); /** clears the difference viewer */ void slotClear(); private slots: /** appends a piece of "diff" */ - void slotAppend( const QString& str ); + void slotAppend( const TQString& str ); /** overloaded for convenience */ - void slotAppend( KIO::Job*, const QByteArray& ba ); + void slotAppend( KIO::Job*, const TQByteArray& ba ); /** call this when the whole "diff" has been sent. * Don't call slotAppend afterwards! */ void slotFinished(); void showExtPart(); void showTextEdit(); - void loadExtPart( const QString& partName ); + void loadExtPart( const TQString& partName ); void hideView(); protected: - void contextMenuEvent( QContextMenuEvent* e ); + void contextMenuEvent( TQContextMenuEvent* e ); private: void setExtPartVisible( bool visible ); @@ -101,7 +101,7 @@ private: KIO::Job* job; KParts::ReadOnlyPart* extPart; KTempFile* tempFile; - QString rawDiff; + TQString rawDiff; }; #endif diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp index badd4782..77e69705 100644 --- a/parts/distpart/distpart_part.cpp +++ b/parts/distpart/distpart_part.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "distpart_part.h" -#include <qwhatsthis.h> +#include <tqwhatsthis.h> #include <kiconloader.h> #include <klocale.h> @@ -37,7 +37,7 @@ typedef KDevGenericFactory<DistpartPart> DistpartFactory; static const KDevPluginInfo data("kdevdistpart"); K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( data ) ) -DistpartPart::DistpartPart(QObject *parent, const char *name, const QStringList &) +DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringList &) : KDevPlugin(&data, parent, name ? name : "DistpartPart") { kdDebug(9007) << "DistpartPart::DistpartPart()" << endl; @@ -46,20 +46,20 @@ DistpartPart::DistpartPart(QObject *parent, const char *name, const QStringList setXMLFile("kdevpart_distpart.rc"); m_action = new KAction( i18n("Distribution && Publishing"), "package", 0, - this, SLOT(show()), + this, TQT_SLOT(show()), actionCollection(), "make_dist" ); m_action->setToolTip(i18n("Make source and binary distribution")); m_action->setWhatsThis(i18n("<b>Project distribution & publishing</b><p>Helps users package and publish their software.")); - //QWhatsThis::add(m_widget, i18n("This will help users package and publish their software.")); + //TQWhatsThis::add(m_widget, i18n("This will help users package and publish their software.")); m_dlg = new KDialogBase( 0 , "dist_part", false, i18n("Distribution & Publishing"), KDialogBase::Ok|KDialogBase::Cancel); m_dialog = new DistpartDialog(this, m_dlg ); m_dlg->setMainWidget(m_dialog); - connect( m_dlg, SIGNAL(okClicked()), m_dialog, SLOT(slotokayPushButtonPressed())); - connect( m_dlg, SIGNAL(cancelClicked()), m_dialog, SLOT(slotcancelPushButtonPressed())); + connect( m_dlg, TQT_SIGNAL(okClicked()), m_dialog, TQT_SLOT(slotokayPushButtonPressed())); + connect( m_dlg, TQT_SIGNAL(cancelClicked()), m_dialog, TQT_SLOT(slotcancelPushButtonPressed())); // Package types //RpmPackage = new SpecSupport(this); //LsmPackage = new LsmSupport(this); diff --git a/parts/distpart/distpart_part.h b/parts/distpart/distpart_part.h index 562974e0..d380d4fd 100644 --- a/parts/distpart/distpart_part.h +++ b/parts/distpart/distpart_part.h @@ -23,7 +23,7 @@ #define __KDEVPART_DISTPART_H__ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kdevplugin.h> #include <kaction.h> @@ -37,7 +37,7 @@ class DistpartPart : public KDevPlugin { public: - DistpartPart(QObject *parent, const char *name, const QStringList &); + DistpartPart(TQObject *parent, const char *name, const TQStringList &); ~DistpartPart(); public slots: @@ -46,9 +46,9 @@ public slots: private: packageBase *RpmPackage, *LsmPackage; - QGuardedPtr<DistpartDialog> m_dialog; + TQGuardedPtr<DistpartDialog> m_dialog; KAction *m_action; - QGuardedPtr<KDialogBase> m_dlg; + TQGuardedPtr<KDialogBase> m_dlg; }; diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp index 7942776a..eebbbe36 100644 --- a/parts/distpart/distpart_widget.cpp +++ b/parts/distpart/distpart_widget.cpp @@ -33,61 +33,61 @@ #include <kmessagebox.h> #include <kdevcore.h> -#include <qgroupbox.h> -#include <qlayout.h> -#include <qnetwork.h> -#include <qurloperator.h> -#include <qmessagebox.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqnetwork.h> +#include <tqurloperator.h> +#include <tqmessagebox.h> #include "distpart_part.h" -#include <qdir.h> -#include <qfile.h> -#include <qregexp.h> -#include <qstringlist.h> -#include <qtabwidget.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqregexp.h> +#include <tqstringlist.h> +#include <tqtabwidget.h> #include "kdevmakefrontend.h" #include <kprogress.h> -#include <qerrormessage.h> +#include <tqerrormessage.h> #include "specsupport.h" #include "lsmsupport.h" -DistpartDialog::DistpartDialog(DistpartPart *part, QWidget *parent) +DistpartDialog::DistpartDialog(DistpartPart *part, TQWidget *parent) :distpart_ui(parent, "dist_widget"), m_part(part) { m_spec = new SpecSupport(m_part); - connect( customProjectCheckBox, SIGNAL(toggled(bool) ), - this, SLOT(slotcustomProjectCheckBoxChanged())); - connect( uploadCustomCheckBox, SIGNAL(toggled(bool)), - this, SLOT(slotuploadCustomCheckBoxChanged())); - -// connect( okayPushButton, SIGNAL(clicked()), -// this, SLOT(slotokayPushButtonPressed())); -// connect( cancelPushButton, SIGNAL(clicked()), -// this, SLOT(slotcancelPushButtonPressed())); -/* connect(help_PushButton, SIGNAL(clicked()), - this, SLOT(slothelp_PushButtonPressed()));*/ - connect( createSrcArchPushButton, SIGNAL(clicked()), - this, SLOT(slotcreateSrcArchPushButtonPressed())); - connect( resetSrcPushButton, SIGNAL(clicked()), - this, SLOT(slotresetSrcPushButtonPressed())); - - connect( genHTMLPushButton, SIGNAL(clicked()), - this, SLOT(slotgenHTMLPushButtonPressed())); - connect( resetHTMLPushButton, SIGNAL(clicked()), - this, SLOT(slotresetHTMLPushButtonPressed())); - connect( uploadSubmitPushButton, SIGNAL(clicked()), - this, SLOT(slotuploadSubmitPushButtonPressed())); - connect( uploadResetPushButton, SIGNAL(clicked()), - this, SLOT(slotuploadResetPushButtonPressed())); - connect( uploadAddFileToolButton, SIGNAL(clicked()), - this, SLOT(slotuploadAddFileToolButtonPressed())); - connect( uploadRemoveToolButton, SIGNAL(clicked()), - this, SLOT(slotuploadRemoveToolButtonPressed())); - connect ( srcDistFileListBox, SIGNAL(clicked(QListBoxItem *item)), this, SLOT(slotRemoveFile(QListBoxItem *item))); -// connect( buildAllPushButton, SIGNAL( clicked() ), this, SLOT( slotbuildAllPushButtonPressed() )); -// connect( exportSPECPushButton, SIGNAL( clicked() ), this, SLOT( slotexportSPECPushButtonPressed( ) ) ); -// connect( srcPackagePushButton, SIGNAL( clicked() ), this, SLOT( slotsrcPackagePushButtonPressed() ) ); -// connect( importSPECPushButton, SIGNAL( clicked() ), this, SLOT( slotimportSPECPushButtonPressed() ) ); + connect( customProjectCheckBox, TQT_SIGNAL(toggled(bool) ), + this, TQT_SLOT(slotcustomProjectCheckBoxChanged())); + connect( uploadCustomCheckBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotuploadCustomCheckBoxChanged())); + +// connect( okayPushButton, TQT_SIGNAL(clicked()), +// this, TQT_SLOT(slotokayPushButtonPressed())); +// connect( cancelPushButton, TQT_SIGNAL(clicked()), +// this, TQT_SLOT(slotcancelPushButtonPressed())); +/* connect(help_PushButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slothelp_PushButtonPressed()));*/ + connect( createSrcArchPushButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotcreateSrcArchPushButtonPressed())); + connect( resetSrcPushButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotresetSrcPushButtonPressed())); + + connect( genHTMLPushButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotgenHTMLPushButtonPressed())); + connect( resetHTMLPushButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotresetHTMLPushButtonPressed())); + connect( uploadSubmitPushButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotuploadSubmitPushButtonPressed())); + connect( uploadResetPushButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotuploadResetPushButtonPressed())); + connect( uploadAddFileToolButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotuploadAddFileToolButtonPressed())); + connect( uploadRemoveToolButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotuploadRemoveToolButtonPressed())); + connect ( srcDistFileListBox, TQT_SIGNAL(clicked(TQListBoxItem *item)), this, TQT_SLOT(slotRemoveFile(TQListBoxItem *item))); +// connect( buildAllPushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotbuildAllPushButtonPressed() )); +// connect( exportSPECPushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotexportSPECPushButtonPressed( ) ) ); +// connect( srcPackagePushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotsrcPackagePushButtonPressed() ) ); +// connect( importSPECPushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotimportSPECPushButtonPressed() ) ); loadSettings(); @@ -103,39 +103,39 @@ DistpartDialog::DistpartDialog(DistpartPart *part, QWidget *parent) DistpartDialog::~DistpartDialog() { } -// QPushButton* okayPushButton; +// TQPushButton* okayPushButton; void DistpartDialog::slotokayPushButtonPressed() { storeSettings(); // accept(); } -// QPushButton* cancelPushButton; +// TQPushButton* cancelPushButton; void DistpartDialog::slotcancelPushButtonPressed() { // reject(); } -// QPushButton* help_PushButton; +// TQPushButton* help_PushButton; /*void DistpartDialog::slothelp_PushButtonPressed() { - QMessageBox::about(this,i18n("Distpart Help"),i18n("In order to build a RPM package :\n\t1) Create a source archive\n\t2) Generate a SPEC File\n\t3) Build the package")); + TQMessageBox::about(this,i18n("Distpart Help"),i18n("In order to build a RPM package :\n\t1) Create a source archive\n\t2) Generate a SPEC File\n\t3) Build the package")); }*/ -// QPushButton* createSrcArchPushButton; +// TQPushButton* createSrcArchPushButton; void DistpartDialog::slotcreateSrcArchPushButtonPressed() { kdDebug() << "Starting archive..." << endl; - QString dist = (getcustomProjectCheckBoxState() && getbzipCheckBoxState()) ? "application/x-bzip2" : "application/x-gzip"; + TQString dist = (getcustomProjectCheckBoxState() && getbzipCheckBoxState()) ? "application/x-bzip2" : "application/x-gzip"; - QString filename = m_part->project()->projectDirectory() + "/" + getSourceName(); + TQString filename = m_part->project()->projectDirectory() + "/" + getSourceName(); KTar tar(filename, dist); if ( tar.open(IO_WriteOnly) ) { - //QStringList files = m_part->project()->distFiles(); + //TQStringList files = m_part->project()->distFiles(); KProgressDialog *prog = new KProgressDialog( 0, "dialog", i18n("Building Package"), "", true ); prog->show(); for( uint idx = 0; idx < srcDistFileListBox->numRows(); ++idx) { - QString file = srcDistFileListBox->text(idx); + TQString file = srcDistFileListBox->text(idx); if ( !tar.addLocalFile( m_part->project()->projectDirectory() + "/" + file, getappNameFormatLineEditText() + "/" + file) ) { kdDebug() << "Failed to write file " << file << endl; @@ -159,7 +159,7 @@ void DistpartDialog::slotcreateSrcArchPushButtonPressed() { } -// QPushButton* resetSrcPushButton; +// TQPushButton* resetSrcPushButton; void DistpartDialog::slotresetSrcPushButtonPressed() { srcDistFileListBox->clear(); loadSettings(); @@ -167,24 +167,24 @@ void DistpartDialog::slotresetSrcPushButtonPressed() { -// QPushButton* genHTMLPushButton; +// TQPushButton* genHTMLPushButton; void DistpartDialog::slotgenHTMLPushButtonPressed() {} -// QPushButton* resetHTMLPushButton; +// TQPushButton* resetHTMLPushButton; void DistpartDialog::slotresetHTMLPushButtonPressed() {} -// QToolButton* uploadAddFileToolButton; +// TQToolButton* uploadAddFileToolButton; void DistpartDialog::slotuploadAddFileToolButtonPressed() { uploadFileListBox->insertStringList(KFileDialog::getOpenFileNames()); } -// QToolButton* uploadRemoveToolButton; +// TQToolButton* uploadRemoveToolButton; void DistpartDialog::slotuploadRemoveToolButtonPressed() { for(unsigned int i=0; i< uploadFileListBox->count(); i++) if ( uploadFileListBox->isSelected(i)) uploadFileListBox->removeItem(i); } -// QPushButton* uploadSubmitPushButton; +// TQPushButton* uploadSubmitPushButton; void DistpartDialog::slotuploadSubmitPushButtonPressed() { if(getuploadftpkdeorgCheckBoxState() || getuploadAppsKDEcomCheckBoxState()) @@ -192,11 +192,11 @@ void DistpartDialog::slotuploadSubmitPushButtonPressed() { else { for(unsigned int i=0; i< uploadFileListBox->count(); i++) KIO::NetAccess::copy(KURL::fromPathOrURL( uploadFileListBox->text(i) ), - KURL::fromPathOrURL( getuploadURLLineEditText() + uploadFileListBox->text(i).replace(QRegExp("[^/]*/"),"") )); + KURL::fromPathOrURL( getuploadURLLineEditText() + uploadFileListBox->text(i).replace(TQRegExp("[^/]*/"),"") )); } } -// QPushButton* uploadResetPushButton; +// TQPushButton* uploadResetPushButton; void DistpartDialog::slotuploadResetPushButtonPressed() { uploadFileListBox->clear(); } @@ -205,7 +205,7 @@ void DistpartDialog::slotuploadResetPushButtonPressed() { // accessors and mutators -// QCheckBox* customProjectCheckBox; +// TQCheckBox* customProjectCheckBox; void DistpartDialog::slotcustomProjectCheckBoxChanged() { kdDebug () << "New State" << customProjectCheckBox->isChecked() << endl; sourceOptionsGroupBox->setEnabled( customProjectCheckBox->isChecked()); @@ -219,7 +219,7 @@ void DistpartDialog::setcustomProjectCheckBoxState(bool state) { customProjectCheckBox->setChecked(state); } -// QCheckBox* uploadCustomCheckBox; +// TQCheckBox* uploadCustomCheckBox; void DistpartDialog::slotuploadCustomCheckBoxChanged() { uploadURLLineEdit->setEnabled( uploadCustomCheckBox->isChecked()); } @@ -234,7 +234,7 @@ void DistpartDialog::setuploadCustomCheckBoxState(bool state) { // Add accessors and mutators for the following -// QCheckBox* bzipCheckBox; +// TQCheckBox* bzipCheckBox; bool DistpartDialog::getbzipCheckBoxState() { return bzipCheckBox->isChecked(); } @@ -243,7 +243,7 @@ void DistpartDialog::setbzipCheckBoxState(bool state) { bzipCheckBox->setChecked(state); } -// QCheckBox* appIconCheckBox; +// TQCheckBox* appIconCheckBox; bool DistpartDialog::getappIconCheckBoxState() { return appIconCheckBox->isChecked(); } @@ -252,7 +252,7 @@ void DistpartDialog::setappIconCheckBoxState(bool state) { appIconCheckBox->setChecked(state); } -// QCheckBox* genHTMLCheckBox; +// TQCheckBox* genHTMLCheckBox; bool DistpartDialog::getgenHTMLCheckBoxState() { return genHTMLCheckBox->isChecked(); } @@ -261,7 +261,7 @@ void DistpartDialog::setgenHTMLCheckBoxState(bool state) { genHTMLCheckBox->setChecked(state); } -// QCheckBox* useRPMInfoCheckBox; +// TQCheckBox* useRPMInfoCheckBox; bool DistpartDialog::getuseRPMInfoCheckBoxState() { return useRPMInfoCheckBox->isChecked(); } @@ -270,7 +270,7 @@ void DistpartDialog::setuseRPMInfoCheckBoxState(bool state) { useRPMInfoCheckBox->setChecked(state); } -// QCheckBox* uploadAppsKDEcomCheckBox; +// TQCheckBox* uploadAppsKDEcomCheckBox; bool DistpartDialog::getuploadAppsKDEcomCheckBoxState() { return uploadAppsKDEcomCheckBox->isChecked(); } @@ -279,7 +279,7 @@ void DistpartDialog::setuploadAppsKDEcomCheckBoxState(bool state) { uploadAppsKDEcomCheckBox->setChecked(state); } -// QCheckBox* uploadftpkdeorgCheckBox; +// TQCheckBox* uploadftpkdeorgCheckBox; bool DistpartDialog::getuploadftpkdeorgCheckBoxState() { return uploadftpkdeorgCheckBox->isChecked(); } @@ -288,7 +288,7 @@ void DistpartDialog::setuploadftpkdeorgCheckBoxState(bool state) { uploadftpkdeorgCheckBox->setChecked(state); } -// QCheckBox* devPackageCheckBox; +// TQCheckBox* devPackageCheckBox; bool DistpartDialog::getdevPackageCheckBoxState() { return devPackageCheckBox->isChecked(); } @@ -297,7 +297,7 @@ void DistpartDialog::setdevPackageCheckBoxState(bool state) { devPackageCheckBox->setChecked(state); } -// QCheckBox* docsPackageCheckBox; +// TQCheckBox* docsPackageCheckBox; bool DistpartDialog::getdocsPackageCheckBoxState() { return docsPackageCheckBox->isChecked(); } @@ -306,98 +306,98 @@ void DistpartDialog::setdocsPackageCheckBoxState(bool state) { docsPackageCheckBox->setChecked(state); } -// QLineEdit* archNameFormatLineEdit; -QString DistpartDialog::getarchNameFormatLineEditText() { +// TQLineEdit* archNameFormatLineEdit; +TQString DistpartDialog::getarchNameFormatLineEditText() { return archNameFormatLineEdit->text(); } -void DistpartDialog::setarchNameFormatLineEditText(QString text) { +void DistpartDialog::setarchNameFormatLineEditText(TQString text) { archNameFormatLineEdit->setText(text); } -// QLineEdit* appNameLineEdit; -QString DistpartDialog::getappNameFormatLineEditText() { +// TQLineEdit* appNameLineEdit; +TQString DistpartDialog::getappNameFormatLineEditText() { return appNameLineEdit->text(); } -void DistpartDialog::setappNameFormatLineEditText(QString text) { +void DistpartDialog::setappNameFormatLineEditText(TQString text) { appNameLineEdit->setText(text); } -// QLineEdit* summaryLineEdit; -QString DistpartDialog::getsummaryLineEditText() { +// TQLineEdit* summaryLineEdit; +TQString DistpartDialog::getsummaryLineEditText() { return summaryLineEdit->text(); } -void DistpartDialog::setsummaryLineEditText(QString text) { +void DistpartDialog::setsummaryLineEditText(TQString text) { summaryLineEdit->setText(text); } -// QLineEdit* groupLineEdit; -QString DistpartDialog::getgroupLineEditText() { +// TQLineEdit* groupLineEdit; +TQString DistpartDialog::getgroupLineEditText() { return groupLineEdit->text(); } -void DistpartDialog::setgroupLineEditText(QString text) { +void DistpartDialog::setgroupLineEditText(TQString text) { groupLineEdit->setText(text); } -// QLineEdit* releaseLineEdit; -QString DistpartDialog::getreleaseLineEditText() { +// TQLineEdit* releaseLineEdit; +TQString DistpartDialog::getreleaseLineEditText() { return releaseLineEdit->text(); } -void DistpartDialog::setreleaseLineEditText(QString text) { +void DistpartDialog::setreleaseLineEditText(TQString text) { releaseLineEdit->setText(text); } -// QLineEdit* VersionLineEdit; -QString DistpartDialog::getversionLineEditText() { +// TQLineEdit* VersionLineEdit; +TQString DistpartDialog::getversionLineEditText() { return versionLineEdit->text(); } -void DistpartDialog::setversionLineEditText(QString text) { +void DistpartDialog::setversionLineEditText(TQString text) { versionLineEdit->setText( text ); } -// QLineEdit* VendorLineEdit; -QString DistpartDialog::getvendorLineEditText() { +// TQLineEdit* VendorLineEdit; +TQString DistpartDialog::getvendorLineEditText() { return vendorLineEdit->text(); } -void DistpartDialog::setvendorLineEditText(QString text) { +void DistpartDialog::setvendorLineEditText(TQString text) { vendorLineEdit->setText(text); } -// QLineEdit* LicenseLineEdit; -QString DistpartDialog::getlicenseLineEditText() { +// TQLineEdit* LicenseLineEdit; +TQString DistpartDialog::getlicenseLineEditText() { return licenseLineEdit->text(); } -void DistpartDialog::setlicenseLineEditText(QString text) { +void DistpartDialog::setlicenseLineEditText(TQString text) { licenseLineEdit->setText(text); } -// QLineEdit* uploadURLLineEdit; -QString DistpartDialog::getuploadURLLineEditText() { +// TQLineEdit* uploadURLLineEdit; +TQString DistpartDialog::getuploadURLLineEditText() { return uploadURLLineEdit->text(); } -void DistpartDialog::setuploadURLLineEditText(QString text) { +void DistpartDialog::setuploadURLLineEditText(TQString text) { uploadURLLineEdit->setText(text); } -// QLineEdit* PackagerLineEdit; -QString DistpartDialog::getpackagerLineEditText() { +// TQLineEdit* PackagerLineEdit; +TQString DistpartDialog::getpackagerLineEditText() { return packagerLineEdit->text(); } -void DistpartDialog::setpackagerLineEditText(QString text) { +void DistpartDialog::setpackagerLineEditText(TQString text) { packagerLineEdit->setText(text); } -// QComboBox* archComboBox; -QString DistpartDialog::getarchComboBoxText() { +// TQComboBox* archComboBox; +TQString DistpartDialog::getarchComboBoxText() { return archComboBox->currentText(); } @@ -409,8 +409,8 @@ void DistpartDialog::setarchComboBoxItem(int item) { archComboBox->setCurrentItem( item ); } -// QListBox* uploadFileListBox; -QString DistpartDialog::getuploadFileListBoxText() { +// TQListBox* uploadFileListBox; +TQString DistpartDialog::getuploadFileListBoxText() { return uploadFileListBox->currentText(); } @@ -422,8 +422,8 @@ void DistpartDialog::setuploadFileListBoxItem(int item) { uploadFileListBox->setCurrentItem( item); } -// QListBox* srcDistFileListBox; -QString DistpartDialog::getsrcDistFileListBoxText() { +// TQListBox* srcDistFileListBox; +TQString DistpartDialog::getsrcDistFileListBoxText() { return srcDistFileListBox->currentText (); } @@ -435,33 +435,33 @@ void DistpartDialog::setsrcDistFileListBoxItem(int item) { srcDistFileListBox->setCurrentItem( item ); } -// QMultiLineEdit* projectDescriptionMultilineEdit; -QString DistpartDialog::getprojectDescriptionMultilineEditText() { +// TQMultiLineEdit* projectDescriptionMultilineEdit; +TQString DistpartDialog::getprojectDescriptionMultilineEditText() { return projectDescriptionMultilineEdit->text(); } -void DistpartDialog::setprojectDescriptionMultilineEditText(QString text) { +void DistpartDialog::setprojectDescriptionMultilineEditText(TQString text) { projectDescriptionMultilineEdit->setText(text); } -QString DistpartDialog::getprojectChangelogMultilineEditText() { +TQString DistpartDialog::getprojectChangelogMultilineEditText() { return projectChangelogMultilineEdit->text(); } -void DistpartDialog::setprojectChangelogMultilineEditText(QString text) { +void DistpartDialog::setprojectChangelogMultilineEditText(TQString text) { projectChangelogMultilineEdit->setText(text); } -QString DistpartDialog::getSourceName() { - QString name = (getcustomProjectCheckBoxState()) ? getarchNameFormatLineEditText() : QString("%n-%v"); +TQString DistpartDialog::getSourceName() { + TQString name = (getcustomProjectCheckBoxState()) ? getarchNameFormatLineEditText() : TQString("%n-%v"); name += (getcustomProjectCheckBoxState() && getbzipCheckBoxState()) ? ".tar.bz2" : ".tar.gz"; - return name.replace(QRegExp("%n"),getappNameFormatLineEditText()) - .replace(QRegExp("%v"),getversionLineEditText()) - .replace(QRegExp("%d"),QDate::currentDate().toString("yyyyMMdd")); + return name.replace(TQRegExp("%n"),getappNameFormatLineEditText()) + .replace(TQRegExp("%v"),getversionLineEditText()) + .replace(TQRegExp("%d"),TQDate::currentDate().toString("yyyyMMdd")); } void DistpartDialog::loadSettings() { - QDomDocument &dom = *m_part->projectDom(); + TQDomDocument &dom = *m_part->projectDom(); srcDistFileListBox->insertStringList( m_part->project()->distFiles() ); @@ -499,7 +499,7 @@ void DistpartDialog::loadSettings() { } void DistpartDialog::storeSettings() { - QDomDocument &dom = *m_part->projectDom(); + TQDomDocument &dom = *m_part->projectDom(); // First Tab DomUtil::writeBoolEntry(dom,"/dist/custom",getcustomProjectCheckBoxState()); @@ -584,14 +584,14 @@ void DistpartDialog::slotsrcPackagePushButtonPressed( ) void DistpartDialog::slotAddFileButtonPressed(){ - QStringList filenames = KFileDialog::getOpenFileNames(); + TQStringList filenames = KFileDialog::getOpenFileNames(); for(uint count =0; count< filenames.size(); count++){ - QString base = m_part->project()->projectDirectory() +"/"; + TQString base = m_part->project()->projectDirectory() +"/"; srcDistFileListBox->insertItem(filenames[count].remove(base)); } } -void DistpartDialog::slotRemoveFile(QListBoxItem *item){ +void DistpartDialog::slotRemoveFile(TQListBoxItem *item){ if ( KMessageBox::Yes == KMessageBox::warningYesNo( this, i18n("Remove %1").arg( item->text() ), i18n("Remove File") )){ for(uint count =0; count< srcDistFileListBox->numRows(); count++){ if ( item == srcDistFileListBox->item(count)){ diff --git a/parts/distpart/distpart_widget.h b/parts/distpart/distpart_widget.h index 36d3f9ba..87e2c2fd 100644 --- a/parts/distpart/distpart_widget.h +++ b/parts/distpart/distpart_widget.h @@ -21,16 +21,16 @@ #define __DISTPART_WIDGET_H__ -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> #include "distpart_ui.h" #include <klistbox.h> -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <kpushbutton.h> #include <klineedit.h> #include <ktextedit.h> -#include <qcombobox.h> -#include <qprogressbar.h> +#include <tqcombobox.h> +#include <tqprogressbar.h> class KDevProject; class DistpartPart; @@ -49,7 +49,7 @@ class DistpartDialog : public distpart_ui { public: - DistpartDialog(DistpartPart *part, QWidget *parent); + DistpartDialog(DistpartPart *part, TQWidget *parent); ~DistpartDialog(); signals: @@ -72,37 +72,37 @@ signals: public slots: - // QPushButton* okayPushButton; + // TQPushButton* okayPushButton; void slotokayPushButtonPressed(); - // QPushButton* cancelPushButton; + // TQPushButton* cancelPushButton; void slotcancelPushButtonPressed(); - // QPushButton* help_PushButton; + // TQPushButton* help_PushButton; // void slothelp_PushButtonPressed(); - // QPushButton* createSrcArchPushButton; + // TQPushButton* createSrcArchPushButton; void slotcreateSrcArchPushButtonPressed(); - // QPushButton* resetSrcPushButton; + // TQPushButton* resetSrcPushButton; void slotresetSrcPushButtonPressed(); - // QPushButton* genHTMLPushButton; + // TQPushButton* genHTMLPushButton; void slotgenHTMLPushButtonPressed(); - // QPushButton* resetHTMLPushButton; + // TQPushButton* resetHTMLPushButton; void slotresetHTMLPushButtonPressed(); - // QToolButton* uploadAddFileToolButton; + // TQToolButton* uploadAddFileToolButton; void slotuploadAddFileToolButtonPressed(); - // QToolButton* uploadRemoveToolButton; + // TQToolButton* uploadRemoveToolButton; void slotuploadRemoveToolButtonPressed(); - // QPushButton* uploadSubmitPushButton; + // TQPushButton* uploadSubmitPushButton; void slotuploadSubmitPushButtonPressed(); - // QPushButton* uploadResetPushButton; + // TQPushButton* uploadResetPushButton; void slotuploadResetPushButtonPressed(); // Connect Slots to the following widgets and add // accessors and mutators - // QCheckBox* customProjectCheckBox; + // TQCheckBox* customProjectCheckBox; void slotcustomProjectCheckBoxChanged(); - // QCheckBox* uploadCustomCheckBox; + // TQCheckBox* uploadCustomCheckBox; void slotuploadCustomCheckBoxChanged(); void slotbuildAllPushButtonPressed(); @@ -110,7 +110,7 @@ public slots: void slotimportSPECPushButtonPressed(); void slotsrcPackagePushButtonPressed(); void slotAddFileButtonPressed(); - void slotRemoveFile(QListBoxItem *item); + void slotRemoveFile(TQListBoxItem *item); public: bool getcustomProjectCheckBoxState(); @@ -120,80 +120,80 @@ public: // Add accessors and mutators for the following - // QCheckBox* bzipCheckBox; + // TQCheckBox* bzipCheckBox; bool getbzipCheckBoxState(); void setbzipCheckBoxState(bool state); - // QCheckBox* appIconCheckBox; + // TQCheckBox* appIconCheckBox; bool getappIconCheckBoxState(); void setappIconCheckBoxState(bool state); - // QCheckBox* genHTMLCheckBox; + // TQCheckBox* genHTMLCheckBox; bool getgenHTMLCheckBoxState(); void setgenHTMLCheckBoxState(bool state); - // QCheckBox* useRPMInfoCheckBox; + // TQCheckBox* useRPMInfoCheckBox; bool getuseRPMInfoCheckBoxState(); void setuseRPMInfoCheckBoxState(bool state); - // QCheckBox* uploadAppsKDEcomCheckBox; + // TQCheckBox* uploadAppsKDEcomCheckBox; bool getuploadAppsKDEcomCheckBoxState(); void setuploadAppsKDEcomCheckBoxState(bool state); - // QCheckBox* uploadftpkdeorgCheckBox; + // TQCheckBox* uploadftpkdeorgCheckBox; bool getuploadftpkdeorgCheckBoxState(); void setuploadftpkdeorgCheckBoxState(bool state); - // QCheckBox* devPackageCheckBox; + // TQCheckBox* devPackageCheckBox; bool getdevPackageCheckBoxState(); void setdevPackageCheckBoxState(bool state); - // QCheckBox* docsPackageCheckBox; + // TQCheckBox* docsPackageCheckBox; bool getdocsPackageCheckBoxState(); void setdocsPackageCheckBoxState(bool state); - // QLineEdit* archNameFormatLineEdit; - QString getarchNameFormatLineEditText(); - void setarchNameFormatLineEditText(QString text); - // QLineEdit* appNameLineEdit; - QString getappNameFormatLineEditText(); - void setappNameFormatLineEditText(QString text); - // QLineEdit* summaryLineEdit; - QString getsummaryLineEditText(); - void setsummaryLineEditText(QString text); - // QLineEdit* groupLineEdit; - QString getgroupLineEditText(); - void setgroupLineEditText(QString text); - // QLineEdit* releaseLineEdit; - QString getreleaseLineEditText(); - void setreleaseLineEditText(QString text); - // QLineEdit* VersionLineEdit; - QString getversionLineEditText(); - void setversionLineEditText(QString text); - // QLineEdit* VendorLineEdit; - QString getvendorLineEditText(); - void setvendorLineEditText(QString text); - // QLineEdit* LicenseLineEdit; - QString getlicenseLineEditText(); - void setlicenseLineEditText(QString text); - // QLineEdit* uploadURLLineEdit; - QString getuploadURLLineEditText(); - void setuploadURLLineEditText(QString text); - // QLineEdit* PackagerLineEdit; - QString getpackagerLineEditText(); - void setpackagerLineEditText(QString text); - // QComboBox* archComboBox; - QString getarchComboBoxText(); + // TQLineEdit* archNameFormatLineEdit; + TQString getarchNameFormatLineEditText(); + void setarchNameFormatLineEditText(TQString text); + // TQLineEdit* appNameLineEdit; + TQString getappNameFormatLineEditText(); + void setappNameFormatLineEditText(TQString text); + // TQLineEdit* summaryLineEdit; + TQString getsummaryLineEditText(); + void setsummaryLineEditText(TQString text); + // TQLineEdit* groupLineEdit; + TQString getgroupLineEditText(); + void setgroupLineEditText(TQString text); + // TQLineEdit* releaseLineEdit; + TQString getreleaseLineEditText(); + void setreleaseLineEditText(TQString text); + // TQLineEdit* VersionLineEdit; + TQString getversionLineEditText(); + void setversionLineEditText(TQString text); + // TQLineEdit* VendorLineEdit; + TQString getvendorLineEditText(); + void setvendorLineEditText(TQString text); + // TQLineEdit* LicenseLineEdit; + TQString getlicenseLineEditText(); + void setlicenseLineEditText(TQString text); + // TQLineEdit* uploadURLLineEdit; + TQString getuploadURLLineEditText(); + void setuploadURLLineEditText(TQString text); + // TQLineEdit* PackagerLineEdit; + TQString getpackagerLineEditText(); + void setpackagerLineEditText(TQString text); + // TQComboBox* archComboBox; + TQString getarchComboBoxText(); int getarchComboBoxItem(); void setarchComboBoxItem(int item); - // QListBox* uploadFileListBox; - QString getuploadFileListBoxText(); + // TQListBox* uploadFileListBox; + TQString getuploadFileListBoxText(); int getuploadFileListBoxItem(); void setuploadFileListBoxItem(int item); - // QListBox* srcDistFileListBox; - QString getsrcDistFileListBoxText(); + // TQListBox* srcDistFileListBox; + TQString getsrcDistFileListBoxText(); int getsrcDistFileListBoxItem(); void setsrcDistFileListBoxItem(int item); - // QMultiLineEdit* projectDescriptionMultilineEdit; - QString getprojectDescriptionMultilineEditText(); - void setprojectDescriptionMultilineEditText(QString text); + // TQMultiLineEdit* projectDescriptionMultilineEdit; + TQString getprojectDescriptionMultilineEditText(); + void setprojectDescriptionMultilineEditText(TQString text); - QString getprojectChangelogMultilineEditText(); - void setprojectChangelogMultilineEditText(QString text); + TQString getprojectChangelogMultilineEditText(); + void setprojectChangelogMultilineEditText(TQString text); - QString getSourceName(); + TQString getSourceName(); private: void loadSettings(); @@ -203,7 +203,7 @@ private: SpecSupport *m_spec; DistpartPart *m_part; - QString dir; + TQString dir; }; diff --git a/parts/distpart/lsmsupport.cpp b/parts/distpart/lsmsupport.cpp index b9a71e8b..5e3fcd89 100644 --- a/parts/distpart/lsmsupport.cpp +++ b/parts/distpart/lsmsupport.cpp @@ -26,7 +26,7 @@ LsmSupport::LsmSupport() : packageBase() { LsmSupport::~LsmSupport() { } -QString LsmSupport::generatePackage( ) +TQString LsmSupport::generatePackage( ) { return ""; } diff --git a/parts/distpart/lsmsupport.h b/parts/distpart/lsmsupport.h index 4d13bc8a..ce52194b 100644 --- a/parts/distpart/lsmsupport.h +++ b/parts/distpart/lsmsupport.h @@ -29,7 +29,7 @@ class LsmSupport : public packageBase public: LsmSupport(); virtual ~LsmSupport(); -QString generatePackage( ); +TQString generatePackage( ); }; #endif diff --git a/parts/distpart/packagebase.cpp b/parts/distpart/packagebase.cpp index 797c2613..f0c2db37 100644 --- a/parts/distpart/packagebase.cpp +++ b/parts/distpart/packagebase.cpp @@ -6,112 +6,112 @@ packageBase::packageBase() { packageBase::~packageBase() {} -QString packageBase::getAppName() { +TQString packageBase::getAppName() { return AppName; } -QString packageBase::getAppVersion() { +TQString packageBase::getAppVersion() { return AppVersion; } -QString packageBase::getAppRevision() { +TQString packageBase::getAppRevision() { return AppRevision; } -QString packageBase::getAppGroup() { +TQString packageBase::getAppGroup() { return AppGroup; } -QString packageBase::getAppPackager() { +TQString packageBase::getAppPackager() { return AppPackager; } -QString packageBase::getAppURL() { +TQString packageBase::getAppURL() { return AppURL; } -QString packageBase::getAppSummary() { +TQString packageBase::getAppSummary() { return AppSummary; } -QString packageBase::getAppVendor() { +TQString packageBase::getAppVendor() { return AppVendor; } -QString packageBase::getAppLicense() { +TQString packageBase::getAppLicense() { return AppLicense; } -QString packageBase::getAppArch() { +TQString packageBase::getAppArch() { return AppArch; } -QString packageBase::getAppDescription() { +TQString packageBase::getAppDescription() { return AppDescription; } -QString packageBase::getAppChangelog() { +TQString packageBase::getAppChangelog() { return AppChangelog; } -QString packageBase::getAppSource() { +TQString packageBase::getAppSource() { return AppSource; } -QStringList packageBase::getAppFileList() { +TQStringList packageBase::getAppFileList() { return AppFileList; } -void packageBase::setAppName(const QString& name) { +void packageBase::setAppName(const TQString& name) { AppName = name; } -void packageBase::setAppVersion(const QString& version){ +void packageBase::setAppVersion(const TQString& version){ AppVersion = version; } -void packageBase::setAppRevision(const QString& revision){ +void packageBase::setAppRevision(const TQString& revision){ AppRevision = revision; } -void packageBase::setAppGroup(const QString& group){ +void packageBase::setAppGroup(const TQString& group){ AppGroup = group; } -void packageBase::setAppPackager(const QString& packager){ +void packageBase::setAppPackager(const TQString& packager){ AppPackager = packager; } -void packageBase::setAppURL(const QString& url) +void packageBase::setAppURL(const TQString& url) { AppURL = url; } -void packageBase::setAppSummary(const QString& summary){ +void packageBase::setAppSummary(const TQString& summary){ AppSummary = summary; } -void packageBase::setAppVendor(const QString& vendor){ +void packageBase::setAppVendor(const TQString& vendor){ AppVendor = vendor; } -void packageBase::setAppLicense(const QString& licence){ +void packageBase::setAppLicense(const TQString& licence){ AppLicense = licence; } -void packageBase::setAppArch(const QString& arch){ +void packageBase::setAppArch(const TQString& arch){ AppArch = arch; } -void packageBase::setAppDescription(const QString& description){ +void packageBase::setAppDescription(const TQString& description){ AppDescription = description; } -void packageBase::setAppChangelog(const QString& changelog){ +void packageBase::setAppChangelog(const TQString& changelog){ AppChangelog = changelog; } -void packageBase::setAppFileList( const QStringList & list ) +void packageBase::setAppFileList( const TQStringList & list ) { AppFileList = list; } diff --git a/parts/distpart/packagebase.h b/parts/distpart/packagebase.h index 95d7d813..b3ba172e 100644 --- a/parts/distpart/packagebase.h +++ b/parts/distpart/packagebase.h @@ -21,7 +21,7 @@ #define __PACKAGEBASE_H__ #include <kurl.h> -#include <qstringlist.h> +#include <tqstringlist.h> class packageBase { @@ -31,54 +31,54 @@ public: virtual ~packageBase(); // Generic accessors and mutators for child classes - virtual QString generatePackage( ) = 0 ; + virtual TQString generatePackage( ) = 0 ; //virtual bool loadFile(KURL theFile) = 0; //virtual bool saveFile(KURL theFile) = 0; - virtual QString getAppName(); - virtual QString getAppVersion(); - virtual QString getAppRevision(); - virtual QString getAppGroup(); - virtual QString getAppPackager(); - virtual QString getAppURL(); - virtual QString getAppSummary(); - virtual QString getAppVendor(); - virtual QString getAppLicense(); - virtual QString getAppArch(); - virtual QString getAppDescription(); - virtual QString getAppChangelog(); - virtual QString getAppSource(); - virtual QStringList getAppFileList(); + virtual TQString getAppName(); + virtual TQString getAppVersion(); + virtual TQString getAppRevision(); + virtual TQString getAppGroup(); + virtual TQString getAppPackager(); + virtual TQString getAppURL(); + virtual TQString getAppSummary(); + virtual TQString getAppVendor(); + virtual TQString getAppLicense(); + virtual TQString getAppArch(); + virtual TQString getAppDescription(); + virtual TQString getAppChangelog(); + virtual TQString getAppSource(); + virtual TQStringList getAppFileList(); - virtual void setAppName(const QString&); - virtual void setAppVersion(const QString&); - virtual void setAppRevision(const QString&); - virtual void setAppGroup(const QString&); - virtual void setAppPackager(const QString&); - virtual void setAppURL(const QString&); - virtual void setAppSummary(const QString&); - virtual void setAppVendor(const QString&); - virtual void setAppLicense(const QString&); - virtual void setAppArch(const QString&); - virtual void setAppDescription(const QString&); - virtual void setAppChangelog(const QString&); - virtual void setAppFileList(const QStringList &list); + virtual void setAppName(const TQString&); + virtual void setAppVersion(const TQString&); + virtual void setAppRevision(const TQString&); + virtual void setAppGroup(const TQString&); + virtual void setAppPackager(const TQString&); + virtual void setAppURL(const TQString&); + virtual void setAppSummary(const TQString&); + virtual void setAppVendor(const TQString&); + virtual void setAppLicense(const TQString&); + virtual void setAppArch(const TQString&); + virtual void setAppDescription(const TQString&); + virtual void setAppChangelog(const TQString&); + virtual void setAppFileList(const TQStringList &list); private: - QString AppName; - QString AppVersion; - QString AppRevision; - QString AppGroup; - QString AppPackager; - QString AppURL; - QString AppSummary; - QString AppVendor; - QString AppLicense; - QString AppArch; - QString AppDescription; - QString AppChangelog; - QString AppSource; - QStringList AppFileList; + TQString AppName; + TQString AppVersion; + TQString AppRevision; + TQString AppGroup; + TQString AppPackager; + TQString AppURL; + TQString AppSummary; + TQString AppVendor; + TQString AppLicense; + TQString AppArch; + TQString AppDescription; + TQString AppChangelog; + TQString AppSource; + TQStringList AppFileList; }; #endif diff --git a/parts/distpart/specsupport.cpp b/parts/distpart/specsupport.cpp index e3ca8a65..ab4d684f 100644 --- a/parts/distpart/specsupport.cpp +++ b/parts/distpart/specsupport.cpp @@ -27,25 +27,25 @@ #include <kfiledialog.h> #include <klocale.h> #include <kprocess.h> -#include <qfile.h> -#include <qdir.h> -#include <qerrormessage.h> -#include <qregexp.h> -#include <qpushbutton.h> -//#include <qvbox.h> -#include <qgroupbox.h> -#include <qtabwidget.h> -#include <qmessagebox.h> +#include <tqfile.h> +#include <tqdir.h> +#include <tqerrormessage.h> +#include <tqregexp.h> +#include <tqpushbutton.h> +//#include <tqvbox.h> +#include <tqgroupbox.h> +#include <tqtabwidget.h> +#include <tqmessagebox.h> /// \FIXME This is at least the fifth place in the kdevelop code something like this exists -QString QRegExp_escape(const QString& str ) +TQString QRegExp_escape(const TQString& str ) { #if QT_VERSION >= 0x030100 - return QRegExp::escape(str); + return TQRegExp::escape(str); #else // this block is copyrighted by Trolltech AS (GPL) static const char meta[] = "$()*+.?[\\]^{|}"; - QString quoted = str; + TQString quoted = str; int i = 0; while ( i < (int) quoted.length() ) { @@ -60,21 +60,21 @@ QString QRegExp_escape(const QString& str ) SpecSupport::SpecSupport(DistpartPart *part) : packageBase(), m_part(part) { dir = ""; -// srcPackagePushButton = new QPushButton(i18n("Src Package"),area()); -// buildAllPushButton = new QPushButton(i18n("Src/Binary Packages"),area()); -// exportSPECPushButton = new QPushButton(i18n("Export SPEC File"),area()); -// importSPECPushButton = new QPushButton(i18n("Import SPEC File"),area()); +// srcPackagePushButton = new TQPushButton(i18n("Src Package"),area()); +// buildAllPushButton = new TQPushButton(i18n("Src/Binary Packages"),area()); +// exportSPECPushButton = new TQPushButton(i18n("Export SPEC File"),area()); +// importSPECPushButton = new TQPushButton(i18n("Import SPEC File"),area()); // // // -// connect(buildAllPushButton, SIGNAL(clicked()), -// this, SLOT(slotbuildAllPushButtonPressed())); -// connect(exportSPECPushButton, SIGNAL(clicked()), -// this, SLOT(slotexportSPECPushButtonPressed())); -// connect(importSPECPushButton, SIGNAL(clicked()), -// this, SLOT(slotimportSPECPushButtonPressed())); -// connect(srcPackagePushButton, SIGNAL(clicked()), -// this, SLOT(slotsrcPackagePushButtonPressed())); +// connect(buildAllPushButton, TQT_SIGNAL(clicked()), +// this, TQT_SLOT(slotbuildAllPushButtonPressed())); +// connect(exportSPECPushButton, TQT_SIGNAL(clicked()), +// this, TQT_SLOT(slotexportSPECPushButtonPressed())); +// connect(importSPECPushButton, TQT_SIGNAL(clicked()), +// this, TQT_SLOT(slotimportSPECPushButtonPressed())); +// connect(srcPackagePushButton, TQT_SIGNAL(clicked()), +// this, TQT_SLOT(slotsrcPackagePushButtonPressed())); parseDotRpmmacros(); } @@ -82,14 +82,14 @@ SpecSupport::SpecSupport(DistpartPart *part) : packageBase(), m_part(part) { SpecSupport::~SpecSupport() { } -// QPushButton* buildAllPushButton; +// TQPushButton* buildAllPushButton; void SpecSupport::slotbuildAllPushButtonPressed() { - QMap<QString,QString>::Iterator it; - QFile file1(dir + "/" + getAppSource()); - QFile file2(*(map.find("_sourcedir")) + "/" + getAppSource()); + TQMap<TQString,TQString>::Iterator it; + TQFile file1(dir + "/" + getAppSource()); + TQFile file2(*(map.find("_sourcedir")) + "/" + getAppSource()); if (!file2.exists()) { if (!file1.exists()) { - QMessageBox::critical(0 ,i18n("Error"),i18n("You need to create a source archive first.")); + TQMessageBox::critical(0 ,i18n("Error"),i18n("You need to create a source archive first.")); return; } else @@ -102,15 +102,15 @@ void SpecSupport::slotbuildAllPushButtonPressed() { " && rpmbuild -ba " + m_part->project()->projectName() + ".spec"); } -// QPushButton* exportSPECPushButton; +// TQPushButton* exportSPECPushButton; void SpecSupport::slotexportSPECPushButtonPressed() { - QMap<QString,QString>::Iterator it; - QString specname = ((it = map.find("_specdir")) != map.end()) ? (*it) : (m_part->project()->projectDirectory()); + TQMap<TQString,TQString>::Iterator it; + TQString specname = ((it = map.find("_specdir")) != map.end()) ? (*it) : (m_part->project()->projectDirectory()); specname += ("/" + m_part->project()->projectName() + ".spec"); - QFile file(specname); + TQFile file(specname); if(file.open(IO_WriteOnly)) { - QTextStream stream(&file); + TQTextStream stream(&file); stream << generatePackage(); file.close(); } else { @@ -118,26 +118,26 @@ void SpecSupport::slotexportSPECPushButtonPressed() { } } -QString SpecSupport::getInfo(QString s, QString motif) { - QRegExp re(motif + "[ \t]*([^ \t].*[^ \t])[ \t]*"); +TQString SpecSupport::getInfo(TQString s, TQString motif) { + TQRegExp re(motif + "[ \t]*([^ \t].*[^ \t])[ \t]*"); if (re.exactMatch(s)) return re.cap(1); - return QString::null; + return TQString::null; } -// QPushButton* importSPECPushButton; +// TQPushButton* importSPECPushButton; void SpecSupport::slotimportSPECPushButtonPressed() { - QString fileName = KFileDialog::getOpenFileName(dir,"*.spec"); + TQString fileName = KFileDialog::getOpenFileName(dir,"*.spec"); if( fileName.isEmpty()) return; - QFile file(fileName); + TQFile file(fileName); if(file.open(IO_ReadOnly)) { - QTextStream stream(&file); + TQTextStream stream(&file); while (!stream.atEnd()) { - QString s = stream.readLine(); - QString info; + TQString s = stream.readLine(); + TQString info; if (!(info = getInfo(s,"Name:")).isEmpty()) setAppName(info); else if (!(info = getInfo(s,"Version:")).isEmpty()) @@ -155,18 +155,18 @@ void SpecSupport::slotimportSPECPushButtonPressed() { else if (!(info = getInfo(s,"Packager:")).isEmpty()) setAppPackager(info); else if (s.startsWith("%description")) { - QString desc; + TQString desc; while (!stream.atEnd()) { - QString str = stream.readLine(); + TQString str = stream.readLine(); if (str.startsWith("%")) break; else desc += str + "\n"; } setAppDescription(desc); } else if (s.startsWith("%changelog")) { - QString change; + TQString change; while (!stream.atEnd()) { - QString str = stream.readLine(); + TQString str = stream.readLine(); if (str.startsWith("%")) break; else change += str + "\n"; } @@ -177,18 +177,18 @@ void SpecSupport::slotimportSPECPushButtonPressed() { } void SpecSupport::slotAddFileButtonPressed(){ -QString filename = KFileDialog::getOpenFileName (); +TQString filename = KFileDialog::getOpenFileName (); } -// QPushButton* srcPackagePushButton; +// TQPushButton* srcPackagePushButton; void SpecSupport::slotsrcPackagePushButtonPressed() { - QMap<QString,QString>::Iterator it; + TQMap<TQString,TQString>::Iterator it; - QFile file1(dir + "/" + getAppSource()); - QFile file2(*(map.find("_sourcedir")) + "/" + getAppSource()); + TQFile file1(dir + "/" + getAppSource()); + TQFile file2(*(map.find("_sourcedir")) + "/" + getAppSource()); if (!file2.exists()) { if (!file1.exists()) { - QMessageBox::critical(0,i18n("Error"),i18n("You need to create a source archive first.")); + TQMessageBox::critical(0,i18n("Error"),i18n("You need to create a source archive first.")); return; } else @@ -202,15 +202,15 @@ void SpecSupport::slotsrcPackagePushButtonPressed() { } void SpecSupport::parseDotRpmmacros() { - QFile dotfile(QDir::homeDirPath() + "/.rpmmacros"); + TQFile dotfile(TQDir::homeDirPath() + "/.rpmmacros"); if (!dotfile.open(IO_ReadOnly)) { -// QErrorMessage * msg = new QErrorMessage(this); +// TQErrorMessage * msg = new TQErrorMessage(this); // msg->message("It seems you don't have a ~/.rpmmacros\nYou may experience problems building packages.\n"); // msg->exec(); return; } - QTextStream stream(&dotfile); + TQTextStream stream(&dotfile); // Perhaps will it appear as a necessity to parse the global rpm config file? @@ -219,14 +219,14 @@ void SpecSupport::parseDotRpmmacros() { // .rpmmacros parsing : while (!stream.atEnd()) { - QString s = stream.readLine(); - QRegExp re("%([^ \t]*)[ \t][ \t]*([^\t]*)$"); + TQString s = stream.readLine(); + TQRegExp re("%([^ \t]*)[ \t][ \t]*([^\t]*)$"); if(re.exactMatch(s)) { - QRegExp subst("%\\{([^%]*)\\}"); - QString value = re.cap(2).stripWhiteSpace(); + TQRegExp subst("%\\{([^%]*)\\}"); + TQString value = re.cap(2).stripWhiteSpace(); while(subst.search(value) != -1) { - value.replace(QRegExp("%\\{"+ QRegExp_escape( subst.cap(1) ) +"\\}"),*map.find(subst.cap(1))); + value.replace(TQRegExp("%\\{"+ QRegExp_escape( subst.cap(1) ) +"\\}"),*map.find(subst.cap(1))); } map.insert(re.cap(1),value); } @@ -243,18 +243,18 @@ void SpecSupport::parseDotRpmmacros() { createRpmDirectoryFromMacro("_srcrpmdir"); } -bool SpecSupport::createRpmDirectoryFromMacro(const QString & name) { - QMap<QString,QString>::Iterator it; +bool SpecSupport::createRpmDirectoryFromMacro(const TQString & name) { + TQMap<TQString,TQString>::Iterator it; if((it = map.find(name)) != map.end()) { - QDir dir(*it); + TQDir dir(*it); if (!dir.exists()) return dir.mkdir(*it); } return false; } -QString SpecSupport::generatePackage( ) +TQString SpecSupport::generatePackage( ) { - QString spec; + TQString spec; spec += "# This spec file was generated by KDevelop \n"; spec += "# Please report any problem to KDevelop Team <kdevelop-devel@kdevelop.org> \n"; spec += "# Thanks to Matthias Saou for his explanations on http://freshrpms.net/docs/fight.html\n\n"; diff --git a/parts/distpart/specsupport.h b/parts/distpart/specsupport.h index 3689771c..aeaca906 100644 --- a/parts/distpart/specsupport.h +++ b/parts/distpart/specsupport.h @@ -20,8 +20,8 @@ #ifndef __SPECSUPPORT_H__ #define __SPECSUPPORT_H__ -#include <qstring.h> -#include <qmap.h> +#include <tqstring.h> +#include <tqmap.h> #include "packagebase.h" #include "distpart_part.h" #include "distpart_widget.h" @@ -33,7 +33,7 @@ public: ~SpecSupport(); public: - QString generatePackage(); + TQString generatePackage(); void slotbuildAllPushButtonPressed(); void slotexportSPECPushButtonPressed(); void slotimportSPECPushButtonPressed(); @@ -42,13 +42,13 @@ public: private: void parseDotRpmmacros(); - bool createRpmDirectoryFromMacro(const QString & name); + bool createRpmDirectoryFromMacro(const TQString & name); - QString getInfo(QString s, QString motif); + TQString getInfo(TQString s, TQString motif); - QString dir; + TQString dir; DistpartPart *m_part; - QMap<QString,QString> map; + TQMap<TQString,TQString> map; }; #endif diff --git a/parts/documentation/KDevDocumentationIface.cpp b/parts/documentation/KDevDocumentationIface.cpp index 2d64f193..329b8474 100644 --- a/parts/documentation/KDevDocumentationIface.cpp +++ b/parts/documentation/KDevDocumentationIface.cpp @@ -22,7 +22,7 @@ #include "documentation_part.h" KDevDocumentationIface::KDevDocumentationIface(DocumentationPart *part) - :QObject(part), DCOPObject("KDevDocumentation"), m_part(part) + :TQObject(part), DCOPObject("KDevDocumentation"), m_part(part) { } @@ -30,17 +30,17 @@ KDevDocumentationIface::~KDevDocumentationIface() { } -void KDevDocumentationIface::lookupInIndex(QString term) +void KDevDocumentationIface::lookupInIndex(TQString term) { m_part->lookInDocumentationIndex(term); } -void KDevDocumentationIface::findInFinder(QString term) +void KDevDocumentationIface::findInFinder(TQString term) { m_part->findInDocumentation(term); } -void KDevDocumentationIface::searchInDocumentation(QString term) +void KDevDocumentationIface::searchInDocumentation(TQString term) { m_part->searchInDocumentation(term); } @@ -55,12 +55,12 @@ void KDevDocumentationIface::searchInDocumentation() m_part->searchInDocumentation(); } -void KDevDocumentationIface::manPage(QString term) +void KDevDocumentationIface::manPage(TQString term) { m_part->manPage(term); } -void KDevDocumentationIface::infoPage(QString term) +void KDevDocumentationIface::infoPage(TQString term) { m_part->infoPage(term); } diff --git a/parts/documentation/KDevDocumentationIface.h b/parts/documentation/KDevDocumentationIface.h index 35cd17fb..e398e89d 100644 --- a/parts/documentation/KDevDocumentationIface.h +++ b/parts/documentation/KDevDocumentationIface.h @@ -20,12 +20,12 @@ #ifndef KDEVDOCUMENTATIONIFACE_H #define KDEVDOCUMENTATIONIFACE_H -#include <qobject.h> +#include <tqobject.h> #include <dcopobject.h> class DocumentationPart; -class KDevDocumentationIface : public QObject, public DCOPObject { +class KDevDocumentationIface : public TQObject, public DCOPObject { Q_OBJECT K_DCOP public: @@ -33,11 +33,11 @@ public: ~KDevDocumentationIface(); k_dcop: - void lookupInIndex(QString term); - void findInFinder(QString term); - void searchInDocumentation(QString term); - void manPage(QString term); - void infoPage(QString term); + void lookupInIndex(TQString term); + void findInFinder(TQString term); + void searchInDocumentation(TQString term); + void manPage(TQString term); + void infoPage(TQString term); void lookupInIndex(); void findInFinder(); diff --git a/parts/documentation/addcatalogdlg.cpp b/parts/documentation/addcatalogdlg.cpp index 867f6f6b..21913089 100644 --- a/parts/documentation/addcatalogdlg.cpp +++ b/parts/documentation/addcatalogdlg.cpp @@ -20,8 +20,8 @@ #include "addcatalogdlg.h" -#include <qlabel.h> -#include <qcombobox.h> +#include <tqlabel.h> +#include <tqcombobox.h> #include <klineedit.h> #include <kurlrequester.h> @@ -31,23 +31,23 @@ #include "docutils.h" #include "kdevdocumentationplugin.h" -AddCatalogDlg::AddCatalogDlg( QValueList<DocumentationPlugin*> const & plugins, - QWidget* parent, const char* name, bool modal, WFlags fl) +AddCatalogDlg::AddCatalogDlg( TQValueList<DocumentationPlugin*> const & plugins, + TQWidget* parent, const char* name, bool modal, WFlags fl) :AddCatalogDlgBase(parent,name, modal,fl), m_plugins( plugins ) { - for (QValueList<DocumentationPlugin*>::const_iterator it = m_plugins.constBegin(); it != m_plugins.constEnd(); ++it) + for (TQValueList<DocumentationPlugin*>::const_iterator it = m_plugins.constBegin(); it != m_plugins.constEnd(); ++it) { docTypeCombo->insertItem( (*it)->pluginName() ); } - docTypeChanged( QString() ); + docTypeChanged( TQString() ); } AddCatalogDlg::~AddCatalogDlg() { } -void AddCatalogDlg::locationURLChanged(const QString &text) +void AddCatalogDlg::locationURLChanged(const TQString &text) { DocumentationPlugin * plugin = this->plugin(); if ( !plugin ) return; @@ -57,32 +57,32 @@ void AddCatalogDlg::locationURLChanged(const QString &text) void AddCatalogDlg::accept() { - QDialog::accept(); + TQDialog::accept(); } -QString AddCatalogDlg::title() const +TQString AddCatalogDlg::title() const { return titleEdit->text(); } -QString AddCatalogDlg::url() const +TQString AddCatalogDlg::url() const { return DocUtils::envURL(locationURL); } -void AddCatalogDlg::setTitle(const QString &title) +void AddCatalogDlg::setTitle(const TQString &title) { titleEdit->setText(title); } -void AddCatalogDlg::setURL(const QString &url) +void AddCatalogDlg::setURL(const TQString &url) { locationURL->setURL(url); } DocumentationPlugin * AddCatalogDlg::plugin( ) { - for (QValueList<DocumentationPlugin*>::const_iterator it = m_plugins.constBegin(); it != m_plugins.constEnd(); ++it) + for (TQValueList<DocumentationPlugin*>::const_iterator it = m_plugins.constBegin(); it != m_plugins.constEnd(); ++it) { if ( docTypeCombo->currentText() == (*it)->pluginName() ) { @@ -92,7 +92,7 @@ DocumentationPlugin * AddCatalogDlg::plugin( ) return 0; } -void AddCatalogDlg::docTypeChanged( const QString & ) +void AddCatalogDlg::docTypeChanged( const TQString & ) { kdDebug() << k_funcinfo << endl; diff --git a/parts/documentation/addcatalogdlg.h b/parts/documentation/addcatalogdlg.h index 4599dc8d..0a437294 100644 --- a/parts/documentation/addcatalogdlg.h +++ b/parts/documentation/addcatalogdlg.h @@ -21,7 +21,7 @@ #ifndef ADDCATALOGDLG_H #define ADDCATALOGDLG_H -#include <qvaluelist.h> +#include <tqvaluelist.h> #include "addcatalogdlgbase.h" class DocumentationPlugin; @@ -30,24 +30,24 @@ class AddCatalogDlg: public AddCatalogDlgBase { Q_OBJECT public: - AddCatalogDlg( QValueList<DocumentationPlugin*> const & plugins, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + AddCatalogDlg( TQValueList<DocumentationPlugin*> const & plugins, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~AddCatalogDlg(); - QString title() const; - void setTitle(const QString &title); - QString url() const; - void setURL(const QString &url); + TQString title() const; + void setTitle(const TQString &title); + TQString url() const; + void setURL(const TQString &url); DocumentationPlugin * plugin(); public slots: - virtual void locationURLChanged(const QString &text); - virtual void docTypeChanged( const QString & ); + virtual void locationURLChanged(const TQString &text); + virtual void docTypeChanged( const TQString & ); protected slots: virtual void accept(); private: - QValueList<DocumentationPlugin*> const & m_plugins; + TQValueList<DocumentationPlugin*> const & m_plugins; }; #endif diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp index 742c300a..ff2bbece 100644 --- a/parts/documentation/bookmarkview.cpp +++ b/parts/documentation/bookmarkview.cpp @@ -19,9 +19,9 @@ ***************************************************************************/ #include "bookmarkview.h" -#include <qlayout.h> -#include <qheader.h> -#include <qpoint.h> +#include <tqlayout.h> +#include <tqheader.h> +#include <tqpoint.h> #include <klineedit.h> #include <kstandarddirs.h> @@ -54,21 +54,21 @@ DocBookmarkOwner::DocBookmarkOwner(DocumentationPart *part) { } -void DocBookmarkOwner::openBookmarkURL(const QString &_url) +void DocBookmarkOwner::openBookmarkURL(const TQString &_url) { m_part->partController()->showDocument(KURL(_url)); } -QString DocBookmarkOwner::currentURL() const +TQString DocBookmarkOwner::currentURL() const { KParts::ReadOnlyPart *activePart = dynamic_cast<KParts::ReadOnlyPart*>(m_part->partController()->activePart()); if (activePart) return activePart->url().url(); else - return QString::null; + return TQString::null; } -QString DocBookmarkOwner::currentTitle() const +TQString DocBookmarkOwner::currentTitle() const { KParts::ReadOnlyPart *activePart = dynamic_cast<KParts::ReadOnlyPart*>(m_part->partController()->activePart()); if (activePart) @@ -79,20 +79,20 @@ QString DocBookmarkOwner::currentTitle() const return activePart->url().prettyURL(); } else - return QString::null; + return TQString::null; } class DocBookmarkItem: public DocumentationItem { public: - DocBookmarkItem(Type type, KListView *parent, const QString &name) + DocBookmarkItem(Type type, KListView *parent, const TQString &name) :DocumentationItem(type, parent, name) { } - DocBookmarkItem(Type type, KListView *parent, DocumentationItem *after, const QString &name) + DocBookmarkItem(Type type, KListView *parent, DocumentationItem *after, const TQString &name) :DocumentationItem(type, parent, after, name) { } - DocBookmarkItem(Type type, DocumentationItem *parent, const QString &name) + DocBookmarkItem(Type type, DocumentationItem *parent, const TQString &name) :DocumentationItem(type, parent, name) { } @@ -108,41 +108,41 @@ private: //class BookmarkView BookmarkView::BookmarkView(DocumentationWidget *parent, const char *name) - :QWidget(parent, name), m_widget(parent) + :TQWidget(parent, name), m_widget(parent) { m_bmManager = new DocBookmarkManager(m_widget->part()); m_bmOwner = new DocBookmarkOwner(m_widget->part()); - QVBoxLayout *l = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint()); m_view = new KListView(this); m_view->addColumn(i18n("Title")); m_view->setSorting(-1); m_view->header()->hide(); - m_view->setResizeMode(QListView::AllColumns); + m_view->setResizeMode(TQListView::AllColumns); m_view->setAllColumnsShowFocus( true ); l->addWidget(m_view); - QHBoxLayout *l2 = new QHBoxLayout(l, KDialog::spacingHint()); + TQHBoxLayout *l2 = new TQHBoxLayout(l, KDialog::spacingHint()); m_addButton = new KPushButton(i18n("Add"), this); m_editButton = new KPushButton(i18n("Edit..."), this); m_removeButton = new KPushButton(i18n("Remove"), this); l2->addWidget(m_addButton); l2->addWidget(m_editButton); l2->addWidget(m_removeButton); - l2->addItem(new QSpacerItem(1, 1, QSizePolicy::Expanding, QSizePolicy::Fixed)); + l2->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Expanding, TQSizePolicy::Fixed)); l->addSpacing(2); showBookmarks(); - connect(m_view, SIGNAL(executed(QListViewItem*, const QPoint&, int )), - this, SLOT(itemExecuted(QListViewItem*, const QPoint&, int ))); - connect(m_addButton, SIGNAL(pressed()), this, SLOT(addBookmark())); - connect(m_editButton, SIGNAL(clicked()), this, SLOT(editBookmark())); - connect(m_removeButton, SIGNAL(clicked()), this, SLOT(removeBookmark())); + connect(m_view, TQT_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )), + this, TQT_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int ))); + connect(m_addButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(addBookmark())); + connect(m_editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editBookmark())); + connect(m_removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeBookmark())); - connect(m_widget->part(), SIGNAL(bookmarkLocation(const QString&, const KURL& )), - this, SLOT(addBookmark(const QString&, const KURL& ))); - connect(m_view, SIGNAL(mouseButtonPressed(int, QListViewItem*, const QPoint&, int )), - this, SLOT(itemMouseButtonPressed(int, QListViewItem*, const QPoint&, int ))); + connect(m_widget->part(), TQT_SIGNAL(bookmarkLocation(const TQString&, const KURL& )), + this, TQT_SLOT(addBookmark(const TQString&, const KURL& ))); + connect(m_view, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), + this, TQT_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); } BookmarkView::~BookmarkView() @@ -166,7 +166,7 @@ void BookmarkView::showBookmarks() } } -void BookmarkView::itemExecuted(QListViewItem *item, const QPoint &// p +void BookmarkView::itemExecuted(TQListViewItem *item, const TQPoint &// p , int // col ) { @@ -212,8 +212,8 @@ void BookmarkView::editBookmark() void BookmarkView::addBookmark() { - QString title = m_bmOwner->currentTitle(); - QString url = m_bmOwner->currentURL(); + TQString title = m_bmOwner->currentTitle(); + TQString url = m_bmOwner->currentURL(); KPopupMenu menu; bool useMenu = false; @@ -227,7 +227,7 @@ void BookmarkView::addBookmark() if (useMenu) { m_addButton->setDown(true); - mode = menu.exec(mapToGlobal(QPoint(m_addButton->x(), m_addButton->y()+m_addButton->height()))); + mode = menu.exec(mapToGlobal(TQPoint(m_addButton->x(), m_addButton->y()+m_addButton->height()))); m_addButton->setDown(false); } @@ -249,7 +249,7 @@ void BookmarkView::addBookmark() } } -void BookmarkView::addBookmark(const QString &title, const KURL &url) +void BookmarkView::addBookmark(const TQString &title, const KURL &url) { KBookmark bm = m_bmManager->root().addBookmark(m_bmManager, title, url); m_bmManager->save(); @@ -265,7 +265,7 @@ void BookmarkView::addBookmark(const QString &title, const KURL &url) item->setBookmark(bm); } -void BookmarkView::itemMouseButtonPressed(int button, QListViewItem *item, const QPoint &pos, int // c +void BookmarkView::itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int // c ) { if ((button != Qt::RightButton) || (!item)) @@ -277,7 +277,7 @@ void BookmarkView::itemMouseButtonPressed(int button, QListViewItem *item, const DocUtils::docItemPopup(m_widget->part(), docItem, pos, false, true); } -void BookmarkView::focusInEvent(QFocusEvent */*e*/) +void BookmarkView::focusInEvent(TQFocusEvent */*e*/) { m_view->setFocus(); } diff --git a/parts/documentation/bookmarkview.h b/parts/documentation/bookmarkview.h index 82bcaf4b..aaae4a29 100644 --- a/parts/documentation/bookmarkview.h +++ b/parts/documentation/bookmarkview.h @@ -20,7 +20,7 @@ #ifndef BOOKMARKVIEW_H #define BOOKMARKVIEW_H -#include <qwidget.h> +#include <tqwidget.h> #include <kbookmarkmanager.h> @@ -39,9 +39,9 @@ class DocBookmarkOwner: public KBookmarkOwner { public: DocBookmarkOwner(DocumentationPart *part); - virtual void openBookmarkURL(const QString &_url); - virtual QString currentTitle() const; - virtual QString currentURL() const; + virtual void openBookmarkURL(const TQString &_url); + virtual TQString currentTitle() const; + virtual TQString currentURL() const; private: DocumentationPart *m_part; @@ -55,18 +55,18 @@ public: ~BookmarkView(); public slots: - void addBookmark(const QString &title, const KURL &url); + void addBookmark(const TQString &title, const KURL &url); protected: void showBookmarks(); - virtual void focusInEvent(QFocusEvent *e); + virtual void focusInEvent(TQFocusEvent *e); protected slots: - void itemExecuted(QListViewItem *item, const QPoint &p, int col); + void itemExecuted(TQListViewItem *item, const TQPoint &p, int col); void addBookmark(); void editBookmark(); void removeBookmark(); - void itemMouseButtonPressed(int button, QListViewItem *item, const QPoint &pos, int c); + void itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int c); private: DocumentationWidget *m_widget; diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp index b2725e1c..2581f5a0 100644 --- a/parts/documentation/contentsview.cpp +++ b/parts/documentation/contentsview.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "contentsview.h" -#include <qheader.h> -#include <qlayout.h> +#include <tqheader.h> +#include <tqlayout.h> #include <kdebug.h> #include <klistview.h> @@ -34,23 +34,23 @@ #include "docutils.h" ContentsView::ContentsView(DocumentationWidget *parent, const char *name) - :QWidget(parent, name), m_widget(parent) + :TQWidget(parent, name), m_widget(parent) { - QVBoxLayout *cl = new QVBoxLayout(this, 0, 0); + TQVBoxLayout *cl = new TQVBoxLayout(this, 0, 0); m_view = new KListView(this); cl->addWidget(m_view); m_view->addColumn(i18n( "Contents" )); m_view->header()->hide(); - m_view->setResizeMode(QListView::AllColumns); + m_view->setResizeMode(TQListView::AllColumns); m_view->setRootIsDecorated(true); m_view->setSorting(-1); m_view->setAllColumnsShowFocus( true ); - connect(m_view, SIGNAL(executed(QListViewItem*, const QPoint&, int )), - this, SLOT(itemExecuted(QListViewItem*, const QPoint&, int ))); - connect(m_view, SIGNAL(mouseButtonPressed(int, QListViewItem*, const QPoint&, int )), - this, SLOT(itemMouseButtonPressed(int, QListViewItem*, const QPoint&, int ))); + connect(m_view, TQT_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )), + this, TQT_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int ))); + connect(m_view, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), + this, TQT_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); } ContentsView::~ContentsView() @@ -59,7 +59,7 @@ ContentsView::~ContentsView() m_widget->index()->clear(); } -void ContentsView::itemExecuted(QListViewItem *item, const QPoint &// p +void ContentsView::itemExecuted(TQListViewItem *item, const TQPoint &// p , int // col ) { @@ -72,7 +72,7 @@ void ContentsView::itemExecuted(QListViewItem *item, const QPoint &// p m_widget->part()->partController()->showDocument(url); } -void ContentsView::itemMouseButtonPressed(int button, QListViewItem *item, const QPoint &pos, int // c +void ContentsView::itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int // c ) { if ((button != Qt::RightButton) || (!item)) @@ -84,7 +84,7 @@ void ContentsView::itemMouseButtonPressed(int button, QListViewItem *item, const DocUtils::docItemPopup(m_widget->part(), docItem, pos, true, true); } -void ContentsView::focusInEvent(QFocusEvent */*e*/) +void ContentsView::focusInEvent(TQFocusEvent */*e*/) { m_view->setFocus(); } diff --git a/parts/documentation/contentsview.h b/parts/documentation/contentsview.h index 54c16486..35595bca 100644 --- a/parts/documentation/contentsview.h +++ b/parts/documentation/contentsview.h @@ -20,7 +20,7 @@ #ifndef CONTENTSVIEW_H #define CONTENTSVIEW_H -#include <qwidget.h> +#include <tqwidget.h> class FindDocumentation; class DocumentationWidget; @@ -37,11 +37,11 @@ public: KListView *view() const { return m_view; } protected slots: - void itemExecuted(QListViewItem *item, const QPoint &p, int col); - void itemMouseButtonPressed(int button, QListViewItem *item, const QPoint &pos, int c); + void itemExecuted(TQListViewItem *item, const TQPoint &p, int col); + void itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int c); protected: - virtual void focusInEvent(QFocusEvent *e); + virtual void focusInEvent(TQFocusEvent *e); private: DocumentationWidget *m_widget; diff --git a/parts/documentation/docconfiglistview.cpp b/parts/documentation/docconfiglistview.cpp index f09a860b..b8d6071c 100644 --- a/parts/documentation/docconfiglistview.cpp +++ b/parts/documentation/docconfiglistview.cpp @@ -23,7 +23,7 @@ #include "kdevdocumentationplugin.h" -DocConfigListView::DocConfigListView(QWidget *parent, const char *name) +DocConfigListView::DocConfigListView(TQWidget *parent, const char *name) :KListView(parent, name) { // setSorting(-1); @@ -32,23 +32,23 @@ DocConfigListView::DocConfigListView(QWidget *parent, const char *name) addColumn(i18n("Search")); addColumn(i18n("Title")); // addColumn(i18n("URL")); - setColumnWidthMode(0, QListView::Maximum); - setColumnWidthMode(1, QListView::Maximum); - setColumnWidthMode(2, QListView::Maximum); - setColumnWidthMode(3, QListView::Maximum); -// setColumnWidthMode(4, QListView::Maximum); + setColumnWidthMode(0, TQListView::Maximum); + setColumnWidthMode(1, TQListView::Maximum); + setColumnWidthMode(2, TQListView::Maximum); + setColumnWidthMode(3, TQListView::Maximum); +// setColumnWidthMode(4, TQListView::Maximum); setAllColumnsShowFocus(true); - setResizeMode( QListView::LastColumn ); + setResizeMode( TQListView::LastColumn ); - connect(this, SIGNAL(clicked(QListViewItem*, const QPoint&, int)), - this, SLOT(clickedItem(QListViewItem*, const QPoint&, int ))); + connect(this, TQT_SIGNAL(clicked(TQListViewItem*, const TQPoint&, int)), + this, TQT_SLOT(clickedItem(TQListViewItem*, const TQPoint&, int ))); } DocConfigListView::~DocConfigListView() { } -void DocConfigListView::clickedItem(QListViewItem *item, const QPoint &// pnt +void DocConfigListView::clickedItem(TQListViewItem *item, const TQPoint &// pnt , int c) { if (!item) diff --git a/parts/documentation/docconfiglistview.h b/parts/documentation/docconfiglistview.h index 0f320099..a7c0aea0 100644 --- a/parts/documentation/docconfiglistview.h +++ b/parts/documentation/docconfiglistview.h @@ -26,11 +26,11 @@ class DocConfigListView : public KListView { Q_OBJECT public: - DocConfigListView(QWidget *parent = 0, const char *name = 0); + DocConfigListView(TQWidget *parent = 0, const char *name = 0); ~DocConfigListView(); protected slots: - void clickedItem(QListViewItem *item, const QPoint &pnt, int c); + void clickedItem(TQListViewItem *item, const TQPoint &pnt, int c); }; #endif diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index 5cd6ff31..0184c4c9 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -23,10 +23,10 @@ ***************************************************************************/ #include "docglobalconfigwidget.h" -#include <qlayout.h> -#include <qtoolbox.h> -#include <qcheckbox.h> -#include <qwidgetstack.h> +#include <tqlayout.h> +#include <tqtoolbox.h> +#include <tqcheckbox.h> +#include <tqwidgetstack.h> #include <kdebug.h> #include <kconfig.h> @@ -51,13 +51,13 @@ #include "docutils.h" DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, - DocumentationWidget *widget, QWidget *parent, const char *name, WFlags fl) + DocumentationWidget *widget, TQWidget *parent, const char *name, WFlags fl) :DocGlobalConfigWidgetBase(parent, name, fl), m_part(part), m_widget(widget) { m_View = new DocConfigListView( viewHolder ); viewHolder->addWidget( m_View ); viewHolder->raiseWidget( m_View ); - for (QValueList<DocumentationPlugin*>::const_iterator it = m_part->m_plugins.constBegin(); + for (TQValueList<DocumentationPlugin*>::const_iterator it = m_part->m_plugins.constBegin(); it != m_part->m_plugins.constEnd(); ++it) { (*it)->loadCatalogConfiguration( m_View ); @@ -66,7 +66,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, KConfig *config = m_part->config(); //read full text search settings config->setGroup("htdig"); - QString databaseDir = kapp->dirs()->saveLocation("data", + TQString databaseDir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); databaseDirEdit->setURL(config->readPathEntry("databaseDir", databaseDir)); htdigbinEdit->setURL(config->readPathEntry("htdigbin", kapp->dirs()->findExe("htdig"))); @@ -74,15 +74,15 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, htsearchbinEdit->setURL(config->readPathEntry("htsearchbin", kapp->dirs()->findExe("htsearch"))); if (config->readBoolEntry("IsSetup", false) == false) { - QFileInfo fi(htsearchbinEdit->url()); + TQFileInfo fi(htsearchbinEdit->url()); if (!fi.exists()) { //try to guess htsearch location on Debian - QFileInfo fi("/usr/lib/cgi-bin/htsearch"); + TQFileInfo fi("/usr/lib/cgi-bin/htsearch"); if (!fi.exists()) { //try to guess htsearch location on SuSE - QFileInfo fi("/srv/www/cgi-bin/htsearch"); + TQFileInfo fi("/srv/www/cgi-bin/htsearch"); if (fi.exists()) htsearchbinEdit->setURL("/srv/www/cgi-bin/htsearch"); } @@ -165,12 +165,12 @@ KListView *DocGlobalConfigWidget::activeView() void DocGlobalConfigWidget::accept() { //write catalog settings - for (QValueList<DocumentationPlugin*>::const_iterator it = m_part->m_plugins.constBegin(); + for (TQValueList<DocumentationPlugin*>::const_iterator it = m_part->m_plugins.constBegin(); it != m_part->m_plugins.constEnd(); ++it) { (*it)->saveCatalogConfiguration( m_View ); //@todo: take restrictions into account - (*it)->reinit(m_widget->contents(), m_widget->index(), QStringList()); + (*it)->reinit(m_widget->contents(), m_widget->index(), TQStringList()); } KConfig *config = m_part->config(); @@ -182,17 +182,17 @@ void DocGlobalConfigWidget::accept() config->writePathEntry("htsearchbin", DocUtils::envURL(htsearchbinEdit)); //write full text search locations file - QString ftsLocationsFile = locateLocal("data", "kdevdocumentation/search/locations.txt"); - QFile f(ftsLocationsFile); - QStringList locs; + TQString ftsLocationsFile = locateLocal("data", "kdevdocumentation/search/locations.txt"); + TQFile f(ftsLocationsFile); + TQStringList locs; if (f.open(IO_ReadWrite | IO_Truncate)) { - QTextStream str(&f); - for (QValueList<DocumentationPlugin*>::const_iterator it = m_part->m_plugins.constBegin(); + TQTextStream str(&f); + for (TQValueList<DocumentationPlugin*>::const_iterator it = m_part->m_plugins.constBegin(); it != m_part->m_plugins.constEnd(); ++ it) { - QStringList app = (*it)->fullTextSearchLocations(); - for (QStringList::const_iterator it2 = app.constBegin(); + TQStringList app = (*it)->fullTextSearchLocations(); + for (TQStringList::const_iterator it2 = app.constBegin(); it2 != app.constEnd(); ++it2) { if (!locs.contains(*it2)) diff --git a/parts/documentation/docglobalconfigwidget.h b/parts/documentation/docglobalconfigwidget.h index 41b0ba85..afef5730 100644 --- a/parts/documentation/docglobalconfigwidget.h +++ b/parts/documentation/docglobalconfigwidget.h @@ -22,7 +22,7 @@ #include "docglobalconfigwidgetbase.h" -#include <qmap.h> +#include <tqmap.h> class DocumentationPart; class DocumentationWidget; @@ -34,7 +34,7 @@ class DocGlobalConfigWidget : public DocGlobalConfigWidgetBase Q_OBJECT public: DocGlobalConfigWidget(DocumentationPart *part, DocumentationWidget *widget, - QWidget *parent = 0, const char *name = 0, WFlags fl = 0); + TQWidget *parent = 0, const char *name = 0, WFlags fl = 0); ~DocGlobalConfigWidget(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/parts/documentation/docprojectconfigwidget.cpp b/parts/documentation/docprojectconfigwidget.cpp index 90950a80..a37ad5cb 100644 --- a/parts/documentation/docprojectconfigwidget.cpp +++ b/parts/documentation/docprojectconfigwidget.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "docprojectconfigwidget.h" -#include <qdir.h> -#include <qcombobox.h> +#include <tqdir.h> +#include <tqcombobox.h> #include <kdebug.h> #include <kurlrequester.h> @@ -33,10 +33,10 @@ #include "documentation_part.h" #include "documentation_widget.h" -DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, QWidget *parent, const char *name) +DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, TQWidget *parent, const char *name) :DocProjectConfigWidgetBase(parent, name), m_part(part) { - for (QValueList<DocumentationPlugin*>::const_iterator it = m_part->m_plugins.constBegin(); + for (TQValueList<DocumentationPlugin*>::const_iterator it = m_part->m_plugins.constBegin(); it != m_part->m_plugins.constEnd(); ++it) { if ((*it)->hasCapability(DocumentationPlugin::ProjectDocumentation)) @@ -45,7 +45,7 @@ DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, QWidget m_plugins[(*it)->pluginName()] = *it; } } - QString projectDocSystem = DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/docsystem"); + TQString projectDocSystem = DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/docsystem"); bool hasProjectDoc = false; for (int i = 0; i < docSystemCombo->count(); ++i) @@ -67,7 +67,7 @@ DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, QWidget manualURL->setURL(DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/usermanualurl")); } -void DocProjectConfigWidget::changeDocSystem(const QString &text) +void DocProjectConfigWidget::changeDocSystem(const TQString &text) { if (text.isEmpty()) return; @@ -79,9 +79,9 @@ void DocProjectConfigWidget::changeDocSystem(const QString &text) catalogURL->setMode(plugin->catalogLocatorProps().first); catalogURL->setFilter(plugin->catalogLocatorProps().second); - QString projectDocURL = DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/docurl"); + TQString projectDocURL = DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/docurl"); if (!projectDocURL.isEmpty()) - projectDocURL = QDir::cleanDirPath(m_part->project()->projectDirectory() + "/" + projectDocURL); + projectDocURL = TQDir::cleanDirPath(m_part->project()->projectDirectory() + "/" + projectDocURL); catalogURL->setURL(projectDocURL); catalogURL->setEnabled(true); @@ -104,7 +104,7 @@ void DocProjectConfigWidget::accept() delete m_part->m_userManualPlugin; m_part->m_userManualPlugin = 0; } - for (QValueList<DocumentationPlugin*>::const_iterator it = m_part->m_plugins.constBegin(); + for (TQValueList<DocumentationPlugin*>::const_iterator it = m_part->m_plugins.constBegin(); it != m_part->m_plugins.constEnd(); ++it) { if ((*it)->hasCapability(DocumentationPlugin::ProjectUserManual)) diff --git a/parts/documentation/docprojectconfigwidget.h b/parts/documentation/docprojectconfigwidget.h index df64f31b..c5d904b5 100644 --- a/parts/documentation/docprojectconfigwidget.h +++ b/parts/documentation/docprojectconfigwidget.h @@ -28,14 +28,14 @@ class DocumentationPlugin; class DocProjectConfigWidget: public DocProjectConfigWidgetBase { Q_OBJECT public: - DocProjectConfigWidget(DocumentationPart *part, QWidget *parent = 0, const char *name = 0); + DocProjectConfigWidget(DocumentationPart *part, TQWidget *parent = 0, const char *name = 0); public slots: - virtual void changeDocSystem(const QString &text); + virtual void changeDocSystem(const TQString &text); virtual void accept(); private: DocumentationPart *m_part; - QMap<QString, DocumentationPlugin*> m_plugins; + TQMap<TQString, DocumentationPlugin*> m_plugins; }; #endif diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index 9e978f09..32e57d9e 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -21,13 +21,13 @@ #include <unistd.h> -#include <qtimer.h> -#include <qdir.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qpopupmenu.h> -#include <qtabwidget.h> -#include <qapplication.h> +#include <tqtimer.h> +#include <tqdir.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqpopupmenu.h> +#include <tqtabwidget.h> +#include <tqapplication.h> #include <kapplication.h> #include <dcopclient.h> @@ -76,7 +76,7 @@ static const KDevPluginInfo data("kdevdocumentation"); typedef KDevGenericFactory<DocumentationPart> DocumentationFactory; K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( data ) ) -DocumentationPart::DocumentationPart(QObject *parent, const char *name, const QStringList& ) +DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const TQStringList& ) :KDevPlugin(&data, parent, name ? name : "DocumentationPart" ), m_projectDocumentationPlugin(0), m_userManualPlugin(0), m_hasIndex(false) { @@ -86,17 +86,17 @@ DocumentationPart::DocumentationPart(QObject *parent, const char *name, const QS m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("Documentation"), GLOBALDOC_OPTIONS, info()->icon() ); m_configProxy->createProjectConfigPage(i18n("Project Documentation"), PROJECTDOC_OPTIONS, info()->icon() ); - connect(m_configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )), this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int))); - connect(core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *))); - connect(core(), SIGNAL(projectOpened()), this, SLOT(projectOpened())); - connect(core(), SIGNAL(projectClosed()), this, SLOT(projectClosed())); + connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); + connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); + connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); m_widget = new DocumentationWidget(this); m_widget->setIcon(SmallIcon( info()->icon() )); m_widget->setCaption(i18n("Documentation")); - QWhatsThis::add(m_widget, i18n("<b>Documentation browser</b><p>" + TQWhatsThis::add(m_widget, i18n("<b>Documentation browser</b><p>" "The documentation browser gives access to various " "documentation sources (Qt DCF, Doxygen, KDoc, KDevelopTOC and DevHelp " "documentation) and the KDevelop manuals. It also provides documentation index " @@ -107,7 +107,7 @@ DocumentationPart::DocumentationPart(QObject *parent, const char *name, const QS setupActions(); - QTimer::singleShot(0, this, SLOT(init())); + TQTimer::singleShot(0, this, TQT_SLOT(init())); new KDevDocumentationIface(this); } @@ -125,8 +125,8 @@ DocumentationPart::~DocumentationPart() void DocumentationPart::loadDocumentationPlugins() { KTrader::OfferList docPluginOffers = - KTrader::self()->query(QString::fromLatin1("KDevelop/DocumentationPlugins"), - QString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION)); + KTrader::self()->query(TQString::fromLatin1("KDevelop/DocumentationPlugins"), + TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION)); KTrader::OfferList::ConstIterator serviceIt = docPluginOffers.begin(); for ( ; serviceIt != docPluginOffers.end(); ++serviceIt ) @@ -139,14 +139,14 @@ void DocumentationPart::loadDocumentationPlugins() int error; DocumentationPlugin *docPlugin = KParts::ComponentFactory ::createInstanceFromService<DocumentationPlugin>(docPluginService, 0, - docPluginService->name().latin1(), QStringList(), &error); + docPluginService->name().latin1(), TQStringList(), &error); if (!docPlugin) kdDebug() << " failed to create doc plugin " << docPluginService->name() << endl; else { kdDebug() << " success" << endl; docPlugin->init(m_widget->contents()); - connect(this, SIGNAL(indexSelected(IndexBox* )), docPlugin, SLOT(createIndex(IndexBox* ))); + connect(this, TQT_SIGNAL(indexSelected(IndexBox* )), docPlugin, TQT_SLOT(createIndex(IndexBox* ))); m_plugins.append(docPlugin); } } @@ -156,28 +156,28 @@ void DocumentationPart::emitIndexSelected(IndexBox *indexBox) { if (!m_hasIndex) { - QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); + TQApplication::setOverrideCursor(TQCursor(Qt::WaitCursor)); emit indexSelected(indexBox); indexBox->fill(); m_hasIndex = true; - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } } -void DocumentationPart::insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo) +void DocumentationPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo) { switch (pageNo) { case GLOBALDOC_OPTIONS: { DocGlobalConfigWidget *w1 = new DocGlobalConfigWidget(this, m_widget, page, "doc config widget"); - connect(dlg, SIGNAL(okClicked()), w1, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), w1, TQT_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { DocProjectConfigWidget *w1 = new DocProjectConfigWidget(this, page, "doc project config"); - connect(dlg, SIGNAL(okClicked()), w1, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), w1, TQT_SLOT(accept())); break; } } @@ -194,12 +194,12 @@ bool DocumentationPart::configure(int page) KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, m_widget, "docsettings dialog"); - QVBoxLayout *l = new QVBoxLayout(dlg.plainPage(), 0, 0); + TQVBoxLayout *l = new TQVBoxLayout(dlg.plainPage(), 0, 0); DocGlobalConfigWidget *w1 = new DocGlobalConfigWidget(this, m_widget, dlg.plainPage()); l->addWidget(w1); w1->docTab->setCurrentPage(page); - connect(&dlg, SIGNAL(okClicked()), w1, SLOT(accept())); - return (dlg.exec() == QDialog::Accepted); + connect(&dlg, TQT_SIGNAL(okClicked()), w1, TQT_SLOT(accept())); + return (dlg.exec() == TQDialog::Accepted); } void DocumentationPart::setupActions() @@ -210,7 +210,7 @@ void DocumentationPart::setupActions() KAction *action; action = new KAction(i18n("&Search in Documentation..."), CTRL+ALT+Key_S, - this, SLOT(searchInDocumentation()), + this, TQT_SLOT(searchInDocumentation()), actionCollection(), "help_search_in_doc" ); action->setToolTip(i18n("Full text search in the documentation")); action->setWhatsThis(i18n("<b>Search in documentation</b><p>" @@ -221,7 +221,7 @@ void DocumentationPart::setupActions() "configuration dialog of the documentation plugin.")); action = new KAction(i18n("&Look in Documentation Index..."), CTRL+ALT+Key_I, - this, SLOT(lookInDocumentationIndex()), + this, TQT_SLOT(lookInDocumentationIndex()), actionCollection(), "help_look_in_index" ); action->setToolTip(i18n("Look in the documentation index")); action->setWhatsThis(i18n("<b>Look in documentation index</b><p>" @@ -230,19 +230,19 @@ void DocumentationPart::setupActions() "the documentation index.")); action = new KAction(i18n("Man Page..."), 0, - this, SLOT(manPage()), + this, TQT_SLOT(manPage()), actionCollection(), "help_manpage" ); action->setToolTip(i18n("Show a manpage")); action->setWhatsThis(i18n("<b>Show a manpage</b><p>Opens a man page using embedded viewer.")); action = new KAction(i18n("Info Page..."), 0, - this, SLOT(infoPage()), + this, TQT_SLOT(infoPage()), actionCollection(), "help_infopage"); action->setToolTip(i18n("Show an infopage")); action->setWhatsThis(i18n("<b>Show an infopage</b><p>Opens an info page using embedded viewer.")); action = new KAction(i18n("Find Documentation..."), 0, - this, SLOT(findInDocumentation()), + this, TQT_SLOT(findInDocumentation()), actionCollection(), "help_find_documentation"); action->setToolTip(i18n("Find Documentation")); action->setWhatsThis(i18n("<b>Find documentation</b><p>" @@ -252,14 +252,14 @@ void DocumentationPart::setupActions() "Google, etc.")); } -void DocumentationPart::emitBookmarkLocation(const QString &title, const KURL &url) +void DocumentationPart::emitBookmarkLocation(const TQString &title, const KURL &url) { emit bookmarkLocation(title, url); } void DocumentationPart::searchInDocumentation() { - QString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); + TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); if ( word.isEmpty() ) { @@ -274,7 +274,7 @@ void DocumentationPart::searchInDocumentation() else { if ( isAssistantUsed() ) - callAssistant ( "KDevDocumentation", "searchInDocumentation(QString)", word ); + callAssistant ( "KDevDocumentation", "searchInDocumentation(TQString)", word ); else { mainWindow()->raiseView ( m_widget ); @@ -283,7 +283,7 @@ void DocumentationPart::searchInDocumentation() } } -void DocumentationPart::searchInDocumentation(const QString &term) +void DocumentationPart::searchInDocumentation(const TQString &term) { mainWindow()->raiseView(m_widget); m_widget->searchInDocumentation(term); @@ -292,14 +292,14 @@ void DocumentationPart::searchInDocumentation(const QString &term) void DocumentationPart::contextSearchInDocumentation() { if (isAssistantUsed()) - callAssistant("KDevDocumentation", "searchInDocumentation(QString)", m_contextStr); + callAssistant("KDevDocumentation", "searchInDocumentation(TQString)", m_contextStr); else searchInDocumentation(m_contextStr); } void DocumentationPart::manPage() { - QString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); + TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); if ( isAssistantUsed() ) { @@ -309,13 +309,13 @@ void DocumentationPart::manPage() } else { - callAssistant ( "KDevDocumentation", "manPage(QString)", word ); + callAssistant ( "KDevDocumentation", "manPage(TQString)", word ); } } else { bool ok; - QString manpage = KInputDialog::getText ( i18n ( "Show Manual Page" ), i18n ( "Show manpage on:" ), word, &ok, 0 ); + TQString manpage = KInputDialog::getText ( i18n ( "Show Manual Page" ), i18n ( "Show manpage on:" ), word, &ok, 0 ); if ( ok && !manpage.isEmpty() ) manPage ( manpage ); } @@ -323,7 +323,7 @@ void DocumentationPart::manPage() void DocumentationPart::infoPage() { - QString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); + TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); if ( isAssistantUsed() ) { @@ -333,34 +333,34 @@ void DocumentationPart::infoPage() } else { - callAssistant ( "KDevDocumentation", "infoPage(QString)", word ); + callAssistant ( "KDevDocumentation", "infoPage(TQString)", word ); } } else { bool ok; - QString infopage = KInputDialog::getText ( i18n ( "Show Info Page" ), i18n ( "Show infopage on:" ), word, &ok, 0 ); + TQString infopage = KInputDialog::getText ( i18n ( "Show Info Page" ), i18n ( "Show infopage on:" ), word, &ok, 0 ); if ( ok && !infopage.isEmpty() ) infoPage ( infopage ); } } -void DocumentationPart::manPage(const QString &term) +void DocumentationPart::manPage(const TQString &term) { - QString url = QString::fromLatin1("man:/%1").arg(term); + TQString url = TQString::fromLatin1("man:/%1").arg(term); partController()->showDocument(KURL(url)); } -void DocumentationPart::infoPage(const QString &term) +void DocumentationPart::infoPage(const TQString &term) { - QString url = QString::fromLatin1("info:/%1").arg(term); + TQString url = TQString::fromLatin1("info:/%1").arg(term); partController()->showDocument(KURL(url)); } void DocumentationPart::contextManPage() { if (isAssistantUsed()) - callAssistant("KDevDocumentation", "manPage(QString)", m_contextStr); + callAssistant("KDevDocumentation", "manPage(TQString)", m_contextStr); else manPage(m_contextStr); } @@ -368,7 +368,7 @@ void DocumentationPart::contextManPage() void DocumentationPart::contextInfoPage() { if (isAssistantUsed()) - callAssistant("KDevDocumentation", "infoPage(QString)", m_contextStr); + callAssistant("KDevDocumentation", "infoPage(TQString)", m_contextStr); else infoPage(m_contextStr); } @@ -376,14 +376,14 @@ void DocumentationPart::contextInfoPage() void DocumentationPart::contextFindDocumentation() { if (isAssistantUsed()) - callAssistant("KDevDocumentation", "findInFinder(QString)", m_contextStr); + callAssistant("KDevDocumentation", "findInFinder(TQString)", m_contextStr); else findInDocumentation(m_contextStr); } void DocumentationPart::findInDocumentation() { - QString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); + TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); if ( word.isEmpty() ) { @@ -398,7 +398,7 @@ void DocumentationPart::findInDocumentation() else { if ( isAssistantUsed() ) - callAssistant ( "KDevDocumentation", "findInFinder(QString)", word ); + callAssistant ( "KDevDocumentation", "findInFinder(TQString)", word ); else { mainWindow()->raiseView ( m_widget ); @@ -407,7 +407,7 @@ void DocumentationPart::findInDocumentation() } } -void DocumentationPart::findInDocumentation(const QString &term) +void DocumentationPart::findInDocumentation(const TQString &term) { mainWindow()->raiseView(m_widget); m_widget->findInDocumentation(term); @@ -415,7 +415,7 @@ void DocumentationPart::findInDocumentation(const QString &term) void DocumentationPart::lookInDocumentationIndex() { - QString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); + TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); if ( word.isEmpty() ) { @@ -430,7 +430,7 @@ void DocumentationPart::lookInDocumentationIndex() else { if ( isAssistantUsed() ) - callAssistant ( "KDevDocumentation", "lookupInIndex(QString)", word ); + callAssistant ( "KDevDocumentation", "lookupInIndex(TQString)", word ); else { mainWindow()->raiseView ( m_widget ); @@ -439,7 +439,7 @@ void DocumentationPart::lookInDocumentationIndex() } } -void DocumentationPart::lookInDocumentationIndex(const QString &term) +void DocumentationPart::lookInDocumentationIndex(const TQString &term) { mainWindow()->raiseView(m_widget); m_widget->lookInDocumentationIndex(term); @@ -448,25 +448,25 @@ void DocumentationPart::lookInDocumentationIndex(const QString &term) void DocumentationPart::contextLookInDocumentationIndex() { if (isAssistantUsed()) - callAssistant("KDevDocumentation", "lookupInIndex(QString)", m_contextStr); + callAssistant("KDevDocumentation", "lookupInIndex(TQString)", m_contextStr); else lookInDocumentationIndex(m_contextStr); } -void DocumentationPart::contextMenu(QPopupMenu *popup, const Context *context) +void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) { if (context->hasType(Context::EditorContext)) { const EditorContext *econtext = static_cast<const EditorContext*>(context); - QString ident = econtext->currentWord(); + TQString ident = econtext->currentWord(); if (!ident.isEmpty()) { m_contextStr = ident; - QString squeezed = KStringHandler::csqueeze(m_contextStr, 30); + TQString squeezed = KStringHandler::csqueeze(m_contextStr, 30); int id = -1; if (hasContextFeature(Finder)) { id = popup->insertItem(i18n("Find Documentation: %1").arg(squeezed), - this, SLOT(contextFindDocumentation())); + this, TQT_SLOT(contextFindDocumentation())); popup->setWhatsThis(id, i18n("<b>Find documentation</b><p>" "Opens the documentation finder tab and searches " "all possible sources of documentation like " @@ -475,7 +475,7 @@ void DocumentationPart::contextMenu(QPopupMenu *popup, const Context *context) } if (hasContextFeature(IndexLookup)) { id = popup->insertItem(i18n("Look in Documentation Index: %1").arg(squeezed), - this, SLOT(contextLookInDocumentationIndex())); + this, TQT_SLOT(contextLookInDocumentationIndex())); popup->setWhatsThis(id, i18n("<b>Look in documentation index</b><p>" "Opens the documentation index tab. It allows " "a term to be entered which will be looked for in " @@ -483,7 +483,7 @@ void DocumentationPart::contextMenu(QPopupMenu *popup, const Context *context) } if (hasContextFeature(FullTextSearch)) { id = popup->insertItem(i18n("Search in Documentation: %1").arg(squeezed), - this, SLOT(contextSearchInDocumentation())); + this, TQT_SLOT(contextSearchInDocumentation())); popup->setWhatsThis(id, i18n("<b>Search in documentation</b><p>Searches " "for a term under the cursor in " "the documentation. For this to work, " @@ -492,12 +492,12 @@ void DocumentationPart::contextMenu(QPopupMenu *popup, const Context *context) } if (hasContextFeature(GotoMan)) { id = popup->insertItem(i18n("Goto Manpage: %1").arg(squeezed), - this, SLOT(contextManPage())); + this, TQT_SLOT(contextManPage())); popup->setWhatsThis(id, i18n("<b>Goto manpage</b><p>Tries to open a man page for the term under the cursor.")); } if (hasContextFeature(GotoInfo)) { id = popup->insertItem( i18n("Goto Infopage: %1").arg(squeezed), - this, SLOT(contextInfoPage()) ); + this, TQT_SLOT(contextInfoPage()) ); popup->setWhatsThis(id, i18n("<b>Goto infopage</b><p>Tries to open an info page for the term under the cursor.")); } if (id != -1) @@ -509,7 +509,7 @@ void DocumentationPart::contextMenu(QPopupMenu *popup, const Context *context) bool DocumentationPart::hasContextFeature(ContextFeature feature) { KConfig *config = DocumentationFactory::instance()->config(); - QString group = config->group(); + TQString group = config->group(); config->setGroup("Context Features"); switch (feature) { @@ -536,9 +536,9 @@ bool DocumentationPart::hasContextFeature(ContextFeature feature) void DocumentationPart::setContextFeature(ContextFeature feature, bool b) { KConfig *config = DocumentationFactory::instance()->config(); - QString group = config->group(); + TQString group = config->group(); config->setGroup("Context Features"); - QString key; + TQString key; switch (feature) { case Finder: @@ -564,13 +564,13 @@ void DocumentationPart::setContextFeature(ContextFeature feature, bool b) void DocumentationPart::projectOpened() { - QString projectDocSystem = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docsystem"); - QString projectDocURL = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docurl"); + TQString projectDocSystem = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docsystem"); + TQString projectDocURL = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docurl"); if (!projectDocURL.isEmpty()) - projectDocURL = QDir::cleanDirPath(project()->projectDirectory() + "/" + projectDocURL); - QString userManualURL = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/usermanualurl"); + projectDocURL = TQDir::cleanDirPath(project()->projectDirectory() + "/" + projectDocURL); + TQString userManualURL = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/usermanualurl"); - for (QValueList<DocumentationPlugin*>::const_iterator it = m_plugins.constBegin(); + for (TQValueList<DocumentationPlugin*>::const_iterator it = m_plugins.constBegin(); it != m_plugins.constEnd(); ++it) { if ((*it)->hasCapability(DocumentationPlugin::ProjectDocumentation) && @@ -604,7 +604,7 @@ void DocumentationPart::saveProjectDocumentationInfo() { DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docsystem", m_projectDocumentationPlugin->pluginName()); - QString relPath = URLUtil::extractPathNameRelative(project()->projectDirectory(), + TQString relPath = URLUtil::extractPathNameRelative(project()->projectDirectory(), m_projectDocumentationPlugin->catalogURL()); DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docurl", relPath); } @@ -619,21 +619,21 @@ void DocumentationPart::saveProjectDocumentationInfo() DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/usermanualurl", ""); } -QCString DocumentationPart::startAssistant() +TQCString DocumentationPart::startAssistant() { - static QCString lastAssistant = ""; + static TQCString lastAssistant = ""; if (!lastAssistant.isEmpty() && KApplication::dcopClient()->isApplicationRegistered(lastAssistant)) return lastAssistant; const char *function = 0; - QString app = "kdevassistant"; - function = "start_service_by_desktop_name(QString,QStringList)"; - QStringList URLs; + TQString app = "kdevassistant"; + function = "start_service_by_desktop_name(TQString,TQStringList)"; + TQStringList URLs; - QByteArray data, replyData; - QCString replyType; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data, replyData; + TQCString replyType; + TQDataStream arg(data, IO_WriteOnly); arg << app << URLs; if (!KApplication::dcopClient()->call("klauncher", "klauncher", function, data, replyType, replyData)) @@ -643,7 +643,7 @@ QCString DocumentationPart::startAssistant() } else { - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); if ( replyType != "serviceResult" ) { @@ -651,8 +651,8 @@ QCString DocumentationPart::startAssistant() lastAssistant = ""; } int result; - QCString dcopName; - QString error; + TQCString dcopName; + TQString error; reply >> result >> dcopName >> error; if (result != 0) { @@ -692,40 +692,40 @@ void DocumentationPart::setAssistantUsed(bool b) config->writeEntry("UseAssistant", isAssistantUsed()); } -void DocumentationPart::activateAssistantWindow(const QCString &ref) +void DocumentationPart::activateAssistantWindow(const TQCString &ref) { kdDebug() << "DocumentationPart::activateAssistantWindow" << endl; - QByteArray data, replyData; - QCString replyType; + TQByteArray data, replyData; + TQCString replyType; if (KApplication::dcopClient()->call(ref, "MainWindow", "getWinID()", data, replyType, replyData)) { kdDebug() << " call successful " << endl; - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); int winId; reply >> winId; kdDebug() << "Win ID: " << winId << endl; KWin::forceActiveWindow(winId); - KApplication::dcopClient()->send(ref, "MainWindow", "show()", QByteArray()); + KApplication::dcopClient()->send(ref, "MainWindow", "show()", TQByteArray()); } } -void DocumentationPart::callAssistant(const QCString &interface, const QCString &method) +void DocumentationPart::callAssistant(const TQCString &interface, const TQCString &method) { - QCString ref = startAssistant(); - QByteArray data; + TQCString ref = startAssistant(); + TQByteArray data; if (KApplication::dcopClient()->send(ref, interface, method, data)) activateAssistantWindow(ref); else kdDebug() << "problem communicating with: " << ref; } -void DocumentationPart::callAssistant(const QCString &interface, const QCString &method, const QString &dataStr) +void DocumentationPart::callAssistant(const TQCString &interface, const TQCString &method, const TQString &dataStr) { - QCString ref = startAssistant(); - QByteArray data; - QDataStream arg(data, IO_WriteOnly); + TQCString ref = startAssistant(); + TQByteArray data; + TQDataStream arg(data, IO_WriteOnly); arg << dataStr; if (KApplication::dcopClient()->send(ref, interface, method, data)) activateAssistantWindow(ref); @@ -739,7 +739,7 @@ void DocumentationPart::loadSettings() config->setGroup("Documentation"); m_assistantUsed = config->readBoolEntry("UseAssistant", false); - if (QString(KGlobal::instance()->aboutData()->appName()) == "kdevassistant") + if (TQString(KGlobal::instance()->aboutData()->appName()) == "kdevassistant") { int page = config->readNumEntry("LastPage", 0); switch (page) diff --git a/parts/documentation/documentation_part.h b/parts/documentation/documentation_part.h index 9f08029f..a3f761ab 100644 --- a/parts/documentation/documentation_part.h +++ b/parts/documentation/documentation_part.h @@ -20,7 +20,7 @@ #ifndef __KDEVPART_DOCUMENTATION_H__ #define __KDEVPART_DOCUMENTATION_H__ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kdevplugin.h> @@ -45,11 +45,11 @@ class DocumentationPart : public KDevPlugin public: enum ContextFeature { Finder, IndexLookup, FullTextSearch, GotoMan, GotoInfo }; - DocumentationPart(QObject *parent, const char *name, const QStringList &); + DocumentationPart(TQObject *parent, const char *name, const TQStringList &); ~DocumentationPart(); void emitIndexSelected(IndexBox *indexBox); - void emitBookmarkLocation(const QString &title, const KURL &url); + void emitBookmarkLocation(const TQString &title, const KURL &url); bool configure(int page = 0); bool hasContextFeature(ContextFeature feature); @@ -60,26 +60,26 @@ public: public slots: void lookInDocumentationIndex(); - void lookInDocumentationIndex(const QString &term); + void lookInDocumentationIndex(const TQString &term); void contextLookInDocumentationIndex(); void contextFindDocumentation(); void findInDocumentation(); - void findInDocumentation(const QString &term); + void findInDocumentation(const TQString &term); void searchInDocumentation(); - void searchInDocumentation(const QString &term); + void searchInDocumentation(const TQString &term); void contextSearchInDocumentation(); void manPage(); - void manPage(const QString &term); + void manPage(const TQString &term); void contextManPage(); void infoPage(); - void infoPage(const QString &term); + void infoPage(const TQString &term); void contextInfoPage(); void projectOpened(); void projectClosed(); signals: void indexSelected(IndexBox *indexBox); - void bookmarkLocation(const QString &title, const KURL &url); + void bookmarkLocation(const TQString &title, const KURL &url); protected: void loadDocumentationPlugins(); @@ -88,27 +88,27 @@ protected: void loadSettings(); void saveProjectDocumentationInfo(); - QCString startAssistant(); - void activateAssistantWindow(const QCString &ref); - void callAssistant(const QCString &interface, const QCString &method); - void callAssistant(const QCString &interface, const QCString &method, const QString &dataStr); + TQCString startAssistant(); + void activateAssistantWindow(const TQCString &ref); + void callAssistant(const TQCString &interface, const TQCString &method); + void callAssistant(const TQCString &interface, const TQCString &method, const TQString &dataStr); protected slots: - void insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo); - void contextMenu(QPopupMenu *popup, const Context *context); + void insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo); + void contextMenu(TQPopupMenu *popup, const Context *context); private slots: void init(); private: - QGuardedPtr<DocumentationWidget> m_widget; + TQGuardedPtr<DocumentationWidget> m_widget; ConfigWidgetProxy *m_configProxy; - QValueList<DocumentationPlugin*> m_plugins; + TQValueList<DocumentationPlugin*> m_plugins; ProjectDocumentationPlugin *m_projectDocumentationPlugin; ProjectDocumentationPlugin *m_userManualPlugin; - QString m_contextStr; + TQString m_contextStr; bool m_hasIndex; bool m_assistantUsed; diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp index 6a19e896..90cd6234 100644 --- a/parts/documentation/documentation_widget.cpp +++ b/parts/documentation/documentation_widget.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "documentation_widget.h" -#include <qlayout.h> -#include <qtoolbox.h> +#include <tqlayout.h> +#include <tqtoolbox.h> #include <klineedit.h> #include <kparts/part.h> @@ -42,11 +42,11 @@ #include "find_documentation.h" DocumentationWidget::DocumentationWidget(DocumentationPart *part) - :QWidget(0, "documentation widget"), m_part(part) + :TQWidget(0, "documentation widget"), m_part(part) { - QVBoxLayout *l = new QVBoxLayout(this, 0, 0); + TQVBoxLayout *l = new TQVBoxLayout(this, 0, 0); - m_tab = new QToolBox(this); + m_tab = new TQToolBox(this); l->addWidget(m_tab); m_contents = new ContentsView(this); @@ -64,7 +64,7 @@ DocumentationWidget::DocumentationWidget(DocumentationPart *part) m_bookmarks = new BookmarkView(this); m_tab->addItem(m_bookmarks, i18n("Bookmarks")); - connect(m_tab, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int))); + connect(m_tab, TQT_SIGNAL(currentChanged(int)), this, TQT_SLOT(tabChanged(int))); } DocumentationWidget::~DocumentationWidget() @@ -94,7 +94,7 @@ void DocumentationWidget::searchInDocumentation() m_search->askSearchTerm(); } -void DocumentationWidget::searchInDocumentation(const QString &term) +void DocumentationWidget::searchInDocumentation(const TQString &term) { m_tab->setCurrentItem(m_search); m_search->setSearchTerm(term); @@ -107,7 +107,7 @@ void DocumentationWidget::lookInDocumentationIndex() m_index->askSearchTerm(); } -void DocumentationWidget::lookInDocumentationIndex(const QString &term) +void DocumentationWidget::lookInDocumentationIndex(const TQString &term) { m_tab->setCurrentItem(m_index); m_index->setSearchTerm(term); @@ -115,7 +115,7 @@ void DocumentationWidget::lookInDocumentationIndex(const QString &term) // m_index->searchInIndex(); } -void DocumentationWidget::findInDocumentation(const QString &term) +void DocumentationWidget::findInDocumentation(const TQString &term) { m_tab->setCurrentItem(m_finder); m_finder->setSearchTerm(term); @@ -128,7 +128,7 @@ void DocumentationWidget::findInDocumentation() m_finder->search_term->setFocus(); } -void DocumentationWidget::focusInEvent(QFocusEvent */*e*/) +void DocumentationWidget::focusInEvent(TQFocusEvent */*e*/) { if (m_tab->currentItem()) m_tab->currentItem()->setFocus(); diff --git a/parts/documentation/documentation_widget.h b/parts/documentation/documentation_widget.h index 0bc5fd4a..0043a78a 100644 --- a/parts/documentation/documentation_widget.h +++ b/parts/documentation/documentation_widget.h @@ -20,7 +20,7 @@ #ifndef __DOCUMENTATION_WIDGET_H__ #define __DOCUMENTATION_WIDGET_H__ -#include <qwidget.h> +#include <tqwidget.h> class FindDocumentation; class KDevProject; @@ -48,14 +48,14 @@ public: public slots: void lookInDocumentationIndex(); - void lookInDocumentationIndex(const QString &term); + void lookInDocumentationIndex(const TQString &term); void searchInDocumentation(); - void searchInDocumentation(const QString &term); + void searchInDocumentation(const TQString &term); void findInDocumentation(); - void findInDocumentation(const QString &term); + void findInDocumentation(const TQString &term); protected: - virtual void focusInEvent(QFocusEvent *e); + virtual void focusInEvent(TQFocusEvent *e); protected slots: void tabChanged(int t); @@ -67,7 +67,7 @@ private: SearchView *m_search; BookmarkView *m_bookmarks; FindDocumentation *m_finder; - QToolBox *m_tab; + TQToolBox *m_tab; friend class FindDocumentation; }; diff --git a/parts/documentation/docutils.cpp b/parts/documentation/docutils.cpp index f0a00e4e..79fa9915 100644 --- a/parts/documentation/docutils.cpp +++ b/parts/documentation/docutils.cpp @@ -32,21 +32,21 @@ #include "kdevdocumentationplugin.h" #include "documentation_part.h" -QString DocUtils::noEnvURL(const QString &url) +TQString DocUtils::noEnvURL(const TQString &url) { return KURLCompletion::replacedPath(url, true, true); } KURL DocUtils::noEnvURL(const KURL &url) { - QString replaced = KURLCompletion::replacedPath(url.url(), true, true); + TQString replaced = KURLCompletion::replacedPath(url.url(), true, true); KURL kurl(replaced); kurl.setQuery(url.query()); kurl.setRef(url.ref()); return kurl; } -QString DocUtils::envURL(KURLRequester *req) +TQString DocUtils::envURL(KURLRequester *req) { if (req->lineEdit()) return req->lineEdit()->text(); @@ -57,12 +57,12 @@ QString DocUtils::envURL(KURLRequester *req) } void DocUtils::docItemPopup(DocumentationPart *part, DocumentationItem *docItem, - const QPoint &pos, bool showBookmark, bool showSearch, int titleCol) + const TQPoint &pos, bool showBookmark, bool showSearch, int titleCol) { docItemPopup(part, docItem->text(titleCol), docItem->url(), pos, showBookmark, showSearch); } -void DocUtils::docItemPopup(DocumentationPart *part, IndexItem *docItem, const QPoint &pos, +void DocUtils::docItemPopup(DocumentationPart *part, IndexItem *docItem, const TQPoint &pos, bool showBookmark, bool showSearch) { //FIXME: index item can have more than one url, what to do? @@ -72,8 +72,8 @@ void DocUtils::docItemPopup(DocumentationPart *part, IndexItem *docItem, const Q docItemPopup(part, docItem->text(), url, pos, showBookmark, showSearch); } -void DocUtils::docItemPopup(DocumentationPart *part, const QString &title, const KURL &url, - const QPoint &pos, bool showBookmark, bool showSearch) +void DocUtils::docItemPopup(DocumentationPart *part, const TQString &title, const KURL &url, + const TQPoint &pos, bool showBookmark, bool showSearch) { KPopupMenu menu; menu.insertTitle(i18n("Documentation")); @@ -87,7 +87,7 @@ void DocUtils::docItemPopup(DocumentationPart *part, const QString &title, const if (showSearch) { menu.insertSeparator(); - menu.insertItem(QString("%1: %2").arg(i18n("Search")).arg(KStringHandler::csqueeze(title,20)), 4); + menu.insertItem(TQString("%1: %2").arg(i18n("Search")).arg(KStringHandler::csqueeze(title,20)), 4); } switch (menu.exec(pos)) diff --git a/parts/documentation/docutils.h b/parts/documentation/docutils.h index b4870809..e4d93e1d 100644 --- a/parts/documentation/docutils.h +++ b/parts/documentation/docutils.h @@ -20,7 +20,7 @@ #ifndef DOC_UTILS_H #define DOC_UTILS_H -#include <qstring.h> +#include <tqstring.h> class KURLRequester; class KPopupMenu; @@ -34,18 +34,18 @@ namespace DocUtils{ /**Returns an url selected in KURLRequester but does not resolve environment variables.*/ -QString envURL(KURLRequester *req); +TQString envURL(KURLRequester *req); /**Resolves environment variables in url.*/ -QString noEnvURL(const QString &url); +TQString noEnvURL(const TQString &url); /**Resolves environment variables in url.*/ KURL noEnvURL(const KURL &url); -void docItemPopup(DocumentationPart *part, DocumentationItem *docItem, const QPoint &pos, +void docItemPopup(DocumentationPart *part, DocumentationItem *docItem, const TQPoint &pos, bool showBookmark = false, bool showSearch = false, int titleCol = 0); -void docItemPopup(DocumentationPart *part, IndexItem *docItem, const QPoint &pos, +void docItemPopup(DocumentationPart *part, IndexItem *docItem, const TQPoint &pos, bool showBookmark = false, bool showSearch = false); -void docItemPopup(DocumentationPart *part, const QString &title, const KURL &url, - const QPoint &pos, bool showBookmark = false, bool showSearch = false); +void docItemPopup(DocumentationPart *part, const TQString &title, const KURL &url, + const TQPoint &pos, bool showBookmark = false, bool showSearch = false); } #endif diff --git a/parts/documentation/editcatalogdlg.cpp b/parts/documentation/editcatalogdlg.cpp index 9e83a7ba..8bdc19d5 100644 --- a/parts/documentation/editcatalogdlg.cpp +++ b/parts/documentation/editcatalogdlg.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "editcatalogdlg.h" -#include <qlabel.h> +#include <tqlabel.h> #include <klineedit.h> #include <kurlrequester.h> @@ -28,7 +28,7 @@ #include "docutils.h" #include "kdevdocumentationplugin.h" -EditCatalogDlg::EditCatalogDlg(DocumentationPlugin *plugin, QWidget* parent, +EditCatalogDlg::EditCatalogDlg(DocumentationPlugin *plugin, TQWidget* parent, const char* name, bool modal, WFlags fl) :EditCatalogBase(parent,name, modal,fl), m_plugin(plugin) { @@ -46,32 +46,32 @@ EditCatalogDlg::~EditCatalogDlg() } /*$SPECIALIZATION$*/ -void EditCatalogDlg::locationURLChanged(const QString &text) +void EditCatalogDlg::locationURLChanged(const TQString &text) { titleEdit->setText(m_plugin->catalogTitle(DocUtils::noEnvURL(text))); } void EditCatalogDlg::accept() { - QDialog::accept(); + TQDialog::accept(); } -QString EditCatalogDlg::title() const +TQString EditCatalogDlg::title() const { return titleEdit->text(); } -QString EditCatalogDlg::url() const +TQString EditCatalogDlg::url() const { return DocUtils::envURL(locationURL); } -void EditCatalogDlg::setTitle(const QString &title) +void EditCatalogDlg::setTitle(const TQString &title) { titleEdit->setText(title); } -void EditCatalogDlg::setURL(const QString &url) +void EditCatalogDlg::setURL(const TQString &url) { locationURL->setURL(url); } diff --git a/parts/documentation/editcatalogdlg.h b/parts/documentation/editcatalogdlg.h index 7d31244c..f8f1fabf 100644 --- a/parts/documentation/editcatalogdlg.h +++ b/parts/documentation/editcatalogdlg.h @@ -29,18 +29,18 @@ class EditCatalogDlg : public EditCatalogBase Q_OBJECT public: EditCatalogDlg(DocumentationPlugin *plugin, - QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~EditCatalogDlg(); /*$PUBLIC_FUNCTIONS$*/ - QString title() const; - void setTitle(const QString &title); - QString url() const; - void setURL(const QString &url); + TQString title() const; + void setTitle(const TQString &title); + TQString url() const; + void setURL(const TQString &url); public slots: /*$PUBLIC_SLOTS$*/ - virtual void locationURLChanged(const QString &text); + virtual void locationURLChanged(const TQString &text); protected: /*$PROTECTED_FUNCTIONS$*/ diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp index 1ca9e81a..782ef467 100644 --- a/parts/documentation/find_documentation.cpp +++ b/parts/documentation/find_documentation.cpp @@ -20,10 +20,10 @@ #include "find_documentation.h" #include <stdlib.h> -#include <qcheckbox.h> -#include <qheader.h> -#include <qapplication.h> -#include <qstringlist.h> +#include <tqcheckbox.h> +#include <tqheader.h> +#include <tqapplication.h> +#include <tqstringlist.h> #include <klineedit.h> #include <kprocess.h> @@ -46,20 +46,20 @@ FindDocumentation::FindDocumentation(DocumentationWidget* parent, const char* na man_item(0), info_item(0), index_item(0), google_item(0), contents_item(0), last_item(0), m_widget(parent) { - QWidget* tmp = QApplication::desktop(); + TQWidget* tmp = TQApplication::desktop(); setGeometry(tmp->width()/2 - width()/2, tmp->height()/2 - height()/2, width(), height()); proc_man = new KProcess( this ); proc_info = new KProcess( this ); - connect( proc_man, SIGNAL(processExited( KProcess* )), - this, SLOT(procManExited( KProcess* )) ); - connect( proc_man, SIGNAL(receivedStdout( KProcess*, char*, int)), - this, SLOT(procManReadStdout( KProcess*, char*, int)) ); + connect( proc_man, TQT_SIGNAL(processExited( KProcess* )), + this, TQT_SLOT(procManExited( KProcess* )) ); + connect( proc_man, TQT_SIGNAL(receivedStdout( KProcess*, char*, int)), + this, TQT_SLOT(procManReadStdout( KProcess*, char*, int)) ); - connect( proc_info, SIGNAL(processExited( KProcess* )), - this, SLOT(procInfoExited( KProcess* )) ); - connect( proc_info, SIGNAL(receivedStdout( KProcess*, char*, int)), - this, SLOT(procInfoReadStdout( KProcess*, char*, int)) ); + connect( proc_info, TQT_SIGNAL(processExited( KProcess* )), + this, TQT_SLOT(procInfoExited( KProcess* )) ); + connect( proc_info, TQT_SIGNAL(receivedStdout( KProcess*, char*, int)), + this, TQT_SLOT(procInfoReadStdout( KProcess*, char*, int)) ); result_list->header()->hide(); result_list->setSorting(-1); @@ -72,7 +72,7 @@ FindDocumentation::~FindDocumentation() } /*$SPECIALIZATION$*/ -void FindDocumentation::buttonPressedOnItem( int button, QListViewItem * item, const QPoint & pos, int // c +void FindDocumentation::buttonPressedOnItem( int button, TQListViewItem * item, const TQPoint & pos, int // c ) { if ((button != Qt::RightButton) || (!item)) @@ -84,7 +84,7 @@ void FindDocumentation::buttonPressedOnItem( int button, QListViewItem * item, c DocUtils::docItemPopup(m_widget->part(), docItem->text(0), docItem->url(), pos, true, false); } -void FindDocumentation::clickOnItem( QListViewItem * item ) +void FindDocumentation::clickOnItem( TQListViewItem * item ) { if(!item) return; @@ -106,8 +106,8 @@ void FindDocumentation::procInfoExited( KProcess* ) { if (proc_info->normalExit() && proc_info->exitStatus() == 0) { - QStringList lines = QStringList::split("\n", proc_info_out); - for( QStringList::const_iterator it = lines.begin(); it != lines.end(); ++it ) + TQStringList lines = TQStringList::split("\n", proc_info_out); + for( TQStringList::const_iterator it = lines.begin(); it != lines.end(); ++it ) { if( (*it) == "*") break; @@ -129,8 +129,8 @@ void FindDocumentation::procManExited( KProcess* ) { if (proc_man->normalExit() && proc_man->exitStatus() == 0) { - QStringList lines = QStringList::split("\n", proc_man_out); - for( QStringList::const_iterator it = lines.begin(); it != lines.end(); ++it ) + TQStringList lines = TQStringList::split("\n", proc_man_out); + for( TQStringList::const_iterator it = lines.begin(); it != lines.end(); ++it ) { DocumentationItem* newitem = new DocumentationItem(DocumentationItem::Document, man_item, search_term->text()); newitem->setURL(KURL("man://" + *it)); @@ -147,12 +147,12 @@ void FindDocumentation::procManExited( KProcess* ) void FindDocumentation::procInfoReadStdout( KProcess*, char* buf, int len) { - proc_info_out += QString::fromLatin1( buf, len ); + proc_info_out += TQString::fromLatin1( buf, len ); } void FindDocumentation::procManReadStdout( KProcess*, char* buf, int len) { - proc_man_out += QString::fromLatin1( buf, len ); + proc_man_out += TQString::fromLatin1( buf, len ); } void FindDocumentation::searchInInfo() @@ -217,7 +217,7 @@ void FindDocumentation::searchInContents() contents_item->setOpen(true); last_item = contents_item; - QListViewItemIterator it( m_widget->m_contents->m_view ); + TQListViewItemIterator it( m_widget->m_contents->m_view ); while ( it.current() ) { DocumentationItem *docItem = dynamic_cast<DocumentationItem*>(it.current()); @@ -266,7 +266,7 @@ void FindDocumentation::searchInIndex() IndexItem::List urls = item->urls(); for (IndexItem::List::const_iterator it = urls.begin(); it != urls.end(); ++it) { - QString text = item->text(); + TQString text = item->text(); if (urls.count() > 1) text = (*it).first; if(newitem) @@ -299,19 +299,19 @@ void FindDocumentation::startSearch() last_item = NULL; first_match_found = false; - QListViewItem* item = m_options->source_list->firstChild(); + TQListViewItem* item = m_options->source_list->firstChild(); while ( item && ( !m_options->goto_first_match->isOn() || !first_match_found )) { - if ( m_options->isMan(dynamic_cast<QCheckListItem*>(item)) ) + if ( m_options->isMan(dynamic_cast<TQCheckListItem*>(item)) ) searchInMan(); - else if ( m_options->isInfo(dynamic_cast<QCheckListItem*>(item)) ) + else if ( m_options->isInfo(dynamic_cast<TQCheckListItem*>(item)) ) searchInInfo(); - else if ( m_options->isIndex(dynamic_cast<QCheckListItem*>(item)) ) + else if ( m_options->isIndex(dynamic_cast<TQCheckListItem*>(item)) ) searchInIndex(); - else if ( m_options->isGoogle(dynamic_cast<QCheckListItem*>(item)) ) + else if ( m_options->isGoogle(dynamic_cast<TQCheckListItem*>(item)) ) searchInGoogle(); - else if ( m_options->isContents(dynamic_cast<QCheckListItem*>(item)) ) + else if ( m_options->isContents(dynamic_cast<TQCheckListItem*>(item)) ) searchInContents(); item = item->itemBelow(); @@ -325,20 +325,20 @@ void FindDocumentation::startSearch() } -void FindDocumentation::setSearchTerm( const QString & term ) +void FindDocumentation::setSearchTerm( const TQString & term ) { search_term->setText(term); } void FindDocumentation::clickOptions() { - if( m_options->exec() == QDialog::Accepted ) + if( m_options->exec() == TQDialog::Accepted ) m_options->writeOptions(); else m_options->readOptions(); } -void FindDocumentation::focusInEvent( QFocusEvent * // e +void FindDocumentation::focusInEvent( TQFocusEvent * // e ) { search_term->setFocus(); diff --git a/parts/documentation/find_documentation.h b/parts/documentation/find_documentation.h index c02e1249..0a9a3e0a 100644 --- a/parts/documentation/find_documentation.h +++ b/parts/documentation/find_documentation.h @@ -38,8 +38,8 @@ public: public slots: /*$PUBLIC_SLOTS$*/ - virtual void buttonPressedOnItem( int button, QListViewItem * item, const QPoint & pos, int c ); - virtual void clickOnItem( QListViewItem * item ); + virtual void buttonPressedOnItem( int button, TQListViewItem * item, const TQPoint & pos, int c ); + virtual void clickOnItem( TQListViewItem * item ); virtual void procInfoExited( KProcess* ); virtual void procManExited( KProcess* ); virtual void procManReadStdout( KProcess*, char*, int ); @@ -50,12 +50,12 @@ public slots: virtual void searchInContents(); virtual void searchInIndex(); virtual void startSearch(); - virtual void setSearchTerm( const QString & term ); + virtual void setSearchTerm( const TQString & term ); virtual void clickOptions(); protected: /*$PROTECTED_FUNCTIONS$*/ - virtual void focusInEvent(QFocusEvent *e); + virtual void focusInEvent(TQFocusEvent *e); protected slots: /*$PROTECTED_SLOTS$*/ @@ -63,8 +63,8 @@ protected slots: private: KProcess* proc_man; KProcess* proc_info; - QString proc_man_out; - QString proc_info_out; + TQString proc_man_out; + TQString proc_info_out; KListViewItem* man_item; KListViewItem* info_item; KListViewItem* index_item; diff --git a/parts/documentation/find_documentation_options.cpp b/parts/documentation/find_documentation_options.cpp index 68f37791..df04ca81 100644 --- a/parts/documentation/find_documentation_options.cpp +++ b/parts/documentation/find_documentation_options.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "find_documentation_options.h" -#include <qheader.h> -#include <qcheckbox.h> +#include <tqheader.h> +#include <tqcheckbox.h> #include <klistview.h> #include <klocale.h> @@ -28,7 +28,7 @@ #include <kconfig.h> #include <kapplication.h> -FindDocumentationOptions::FindDocumentationOptions(QWidget* parent, const char* name, bool modal) +FindDocumentationOptions::FindDocumentationOptions(TQWidget* parent, const char* name, bool modal) :FindDocumentationOptionsBase(parent,name, modal), m_man_item(0), m_info_item(0), m_index_item(0), m_google_item(0), m_contents_item(0) { @@ -43,7 +43,7 @@ FindDocumentationOptions::~FindDocumentationOptions() } /*$SPECIALIZATION$*/ -bool FindDocumentationOptions::isContents( QCheckListItem * item ) +bool FindDocumentationOptions::isContents( TQCheckListItem * item ) { if ( item == m_contents_item && m_contents_item->isOn() ) return true; @@ -51,7 +51,7 @@ bool FindDocumentationOptions::isContents( QCheckListItem * item ) return false; } -bool FindDocumentationOptions::isGoogle( QCheckListItem * item ) +bool FindDocumentationOptions::isGoogle( TQCheckListItem * item ) { if ( item == m_google_item && m_google_item->isOn() ) return true; @@ -59,7 +59,7 @@ bool FindDocumentationOptions::isGoogle( QCheckListItem * item ) return false; } -bool FindDocumentationOptions::isIndex( QCheckListItem * item ) +bool FindDocumentationOptions::isIndex( TQCheckListItem * item ) { if ( item == m_index_item && m_index_item->isOn() ) return true; @@ -67,7 +67,7 @@ bool FindDocumentationOptions::isIndex( QCheckListItem * item ) return false; } -bool FindDocumentationOptions::isInfo( QCheckListItem * item ) +bool FindDocumentationOptions::isInfo( TQCheckListItem * item ) { if ( item == m_info_item && m_info_item->isOn() ) return true; @@ -75,7 +75,7 @@ bool FindDocumentationOptions::isInfo( QCheckListItem * item ) return false; } -bool FindDocumentationOptions::isMan( QCheckListItem * item ) +bool FindDocumentationOptions::isMan( TQCheckListItem * item ) { if ( item == m_man_item && m_man_item->isOn() ) return true; @@ -100,7 +100,7 @@ void FindDocumentationOptions::sourceMoveUp() if (source_list->currentItem() == source_list->firstChild()) return; - QListViewItem *item = source_list->firstChild(); + TQListViewItem *item = source_list->firstChild(); while (item->nextSibling() != source_list->currentItem()) item = item->nextSibling(); item->moveItem( source_list->currentItem()); @@ -113,7 +113,7 @@ void FindDocumentationOptions::writeOptions() config->writeEntry("goto_first_match", goto_first_match->isChecked()); - QListViewItemIterator it( source_list ); + TQListViewItemIterator it( source_list ); int i = 0; while ( it.current() ) { @@ -160,27 +160,27 @@ void FindDocumentationOptions::readOptions() { if( config->readPropertyEntry( "Manpage" , 0 ) == i) { - m_man_item = new QCheckListItem( source_list, i18n("Manual"), QCheckListItem::CheckBox ); + m_man_item = new TQCheckListItem( source_list, i18n("Manual"), TQCheckListItem::CheckBox ); m_man_item->setOn(config->readBoolEntry( "ManpageEnabled" , true)); } if( config->readPropertyEntry( "Info" , 1 ) == i) { - m_info_item = new QCheckListItem( source_list, i18n("Info"), QCheckListItem::CheckBox ); + m_info_item = new TQCheckListItem( source_list, i18n("Info"), TQCheckListItem::CheckBox ); m_info_item->setOn(config->readBoolEntry( "InfoEnabled" , true)); } if( config->readPropertyEntry( "Index" , 2 ) == i) { - m_index_item = new QCheckListItem( source_list, i18n("Index"), QCheckListItem::CheckBox ); + m_index_item = new TQCheckListItem( source_list, i18n("Index"), TQCheckListItem::CheckBox ); m_index_item->setOn(config->readBoolEntry( "IndexEnabled" , true)); } if( config->readPropertyEntry( "Google" , 3 ) == i) { - m_google_item = new QCheckListItem( source_list, i18n("Google"), QCheckListItem::CheckBox ); + m_google_item = new TQCheckListItem( source_list, i18n("Google"), TQCheckListItem::CheckBox ); m_google_item->setOn(config->readBoolEntry( "GoogleEnabled" , false)); } if( config->readPropertyEntry( "Contents" , 4 ) == i) { - m_contents_item = new QCheckListItem( source_list, i18n("Contents"), QCheckListItem::CheckBox ); + m_contents_item = new TQCheckListItem( source_list, i18n("Contents"), TQCheckListItem::CheckBox ); m_contents_item->setOn(config->readBoolEntry( "ContentsEnabled" , false)); } } diff --git a/parts/documentation/find_documentation_options.h b/parts/documentation/find_documentation_options.h index e3da05be..c67206cb 100644 --- a/parts/documentation/find_documentation_options.h +++ b/parts/documentation/find_documentation_options.h @@ -30,14 +30,14 @@ class FindDocumentationOptions : public FindDocumentationOptionsBase { Q_OBJECT public: - FindDocumentationOptions(QWidget* parent = 0, const char* name = 0, bool modal = FALSE); + FindDocumentationOptions(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE); ~FindDocumentationOptions(); /*$PUBLIC_FUNCTIONS$*/ - virtual bool isContents( QCheckListItem * item ); - virtual bool isGoogle( QCheckListItem * item ); - virtual bool isIndex( QCheckListItem * item ); - virtual bool isInfo( QCheckListItem * item ); - virtual bool isMan( QCheckListItem * item ); + virtual bool isContents( TQCheckListItem * item ); + virtual bool isGoogle( TQCheckListItem * item ); + virtual bool isIndex( TQCheckListItem * item ); + virtual bool isInfo( TQCheckListItem * item ); + virtual bool isMan( TQCheckListItem * item ); public slots: /*$PUBLIC_SLOTS$*/ @@ -53,11 +53,11 @@ protected slots: /*$PROTECTED_SLOTS$*/ private: - QCheckListItem *m_man_item; - QCheckListItem *m_info_item; - QCheckListItem *m_index_item; - QCheckListItem *m_google_item; - QCheckListItem *m_contents_item; + TQCheckListItem *m_man_item; + TQCheckListItem *m_info_item; + TQCheckListItem *m_index_item; + TQCheckListItem *m_google_item; + TQCheckListItem *m_contents_item; KConfig* config; }; diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp index 29f0d9d5..6a7eddcf 100644 --- a/parts/documentation/indexview.cpp +++ b/parts/documentation/indexview.cpp @@ -19,10 +19,10 @@ ***************************************************************************/ #include "indexview.h" -#include <qapplication.h> -#include <qevent.h> -#include <qlayout.h> -#include <qlabel.h> +#include <tqapplication.h> +#include <tqevent.h> +#include <tqlayout.h> +#include <tqlabel.h> #include <klineedit.h> #include <kiconloader.h> @@ -39,24 +39,24 @@ #include "documentation_widget.h" IndexView::IndexView(DocumentationWidget *parent, const char *name) - :QWidget(parent, name), m_widget(parent) + :TQWidget(parent, name), m_widget(parent) { - QVBoxLayout *l = new QVBoxLayout(this, 0, 0); + TQVBoxLayout *l = new TQVBoxLayout(this, 0, 0); - QHBoxLayout *hl = new QHBoxLayout(this, 0, 0); + TQHBoxLayout *hl = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - hl->addWidget(new QLabel(m_edit, i18n("&Look for:"), this)); + hl->addWidget(new TQLabel(m_edit, i18n("&Look for:"), this)); hl->addWidget(m_edit); l->addLayout(hl); m_index = new IndexBox(this); l->addWidget(m_index); - connect(m_index, SIGNAL(executed(QListBoxItem* )), this, SLOT(searchInIndex(QListBoxItem* ))); - connect(m_index, SIGNAL(mouseButtonPressed(int, QListBoxItem*, const QPoint& )), - this, SLOT(itemMouseButtonPressed(int, QListBoxItem*, const QPoint& ))); - connect(m_edit, SIGNAL(returnPressed()), this, SLOT(searchInIndex())); - connect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(showIndex(const QString&))); + connect(m_index, TQT_SIGNAL(executed(TQListBoxItem* )), this, TQT_SLOT(searchInIndex(TQListBoxItem* ))); + connect(m_index, TQT_SIGNAL(mouseButtonPressed(int, TQListBoxItem*, const TQPoint& )), + this, TQT_SLOT(itemMouseButtonPressed(int, TQListBoxItem*, const TQPoint& ))); + connect(m_edit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(searchInIndex())); + connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(showIndex(const TQString&))); m_edit->installEventFilter(this); } @@ -71,7 +71,7 @@ void IndexView::searchInIndex() searchInIndex(m_index->item(m_index->currentItem())); } -void IndexView::searchInIndex(QListBoxItem *item) +void IndexView::searchInIndex(TQListBoxItem *item) { kdDebug() << "IndexView::searchInIndex" << endl; IndexItem *indexItem = dynamic_cast<IndexItem*>(item); @@ -92,13 +92,13 @@ void IndexView::searchInIndex(QListBoxItem *item) } } -void IndexView::showIndex(const QString &term) +void IndexView::showIndex(const TQString &term) { - QListBoxItem *i = m_index->firstItem(); - QString sl = term.lower(); + TQListBoxItem *i = m_index->firstItem(); + TQString sl = term.lower(); while (i) { - QString t = i->text(); + TQString t = i->text(); if ((t.length() >= sl.length()) && (i->text().left(term.length()).lower() == sl)) { m_index->setCurrentItem(i); @@ -118,14 +118,14 @@ void IndexView::showIndex(const QString &term) }*/ } -bool IndexView::eventFilter(QObject *watched, QEvent *e) +bool IndexView::eventFilter(TQObject *watched, TQEvent *e) { if (!watched || !e) return true; - if ((watched == m_edit) && (e->type() == QEvent::KeyPress)) + if ((watched == m_edit) && (e->type() == TQEvent::KeyPress)) { - QKeyEvent *ke = (QKeyEvent*)e; + TQKeyEvent *ke = (TQKeyEvent*)e; if (ke->key() == Key_Up) { int i = m_index->currentItem(); @@ -150,17 +150,17 @@ bool IndexView::eventFilter(QObject *watched, QEvent *e) return true; } else if ((ke->key() == Key_Next) || (ke->key() == Key_Prior)) { - QApplication::sendEvent(m_index, e); + TQApplication::sendEvent(m_index, e); m_edit->blockSignals(true); m_edit->setText(m_index->currentText()); m_edit->blockSignals(false); } } - return QWidget::eventFilter(watched, e); + return TQWidget::eventFilter(watched, e); } -void IndexView::itemMouseButtonPressed(int button, QListBoxItem *item, const QPoint &pos) +void IndexView::itemMouseButtonPressed(int button, TQListBoxItem *item, const TQPoint &pos) { if ((button != Qt::RightButton) || (!item)) return; @@ -171,7 +171,7 @@ void IndexView::itemMouseButtonPressed(int button, QListBoxItem *item, const QPo DocUtils::docItemPopup(m_widget->part(), docItem, pos, false, true); } -void IndexView::setSearchTerm(const QString &term) +void IndexView::setSearchTerm(const TQString &term) { m_edit->setFocus(); m_edit->setText(term); @@ -182,7 +182,7 @@ void IndexView::askSearchTerm( ) m_edit->setFocus(); } -void IndexView::focusInEvent(QFocusEvent */*e*/) +void IndexView::focusInEvent(TQFocusEvent */*e*/) { m_edit->setFocus(); } diff --git a/parts/documentation/indexview.h b/parts/documentation/indexview.h index 4a2f336a..af403891 100644 --- a/parts/documentation/indexview.h +++ b/parts/documentation/indexview.h @@ -20,7 +20,7 @@ #ifndef INDEXVIEW_H #define INDEXVIEW_H -#include <qwidget.h> +#include <tqwidget.h> class IndexBox; class KLineEdit; @@ -35,22 +35,22 @@ public: IndexView(DocumentationWidget *parent = 0, const char *name = 0); ~IndexView(); - virtual bool eventFilter(QObject *watched, QEvent *e); + virtual bool eventFilter(TQObject *watched, TQEvent *e); IndexBox *indexBox() const { return m_index; } public slots: void searchInIndex(); - void setSearchTerm(const QString &term); + void setSearchTerm(const TQString &term); void askSearchTerm(); protected slots: - void searchInIndex(QListBoxItem *item); - void showIndex(const QString &term); + void searchInIndex(TQListBoxItem *item); + void showIndex(const TQString &term); - void itemMouseButtonPressed(int button, QListBoxItem *item, const QPoint &pos); + void itemMouseButtonPressed(int button, TQListBoxItem *item, const TQPoint &pos); protected: - virtual void focusInEvent(QFocusEvent *e); + virtual void focusInEvent(TQFocusEvent *e); private: DocumentationWidget *m_widget; diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp index fc63d9e8..3364f71a 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp +++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp @@ -18,11 +18,11 @@ */ #include "kdevdocumentationplugin.h" -#include <qfile.h> -#include <qpainter.h> -#include <qstyle.h> -#include <qheader.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqheader.h> +#include <tqtextstream.h> #include <kstandarddirs.h> #include <kiconloader.h> @@ -34,28 +34,28 @@ //class DocumentationItem DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *parent, - const QString &name) + const TQString &name) :KListViewItem(parent, name), m_type(type) { init(); } DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem *parent, - const QString &name) + const TQString &name) :KListViewItem(parent, name), m_type(type) { init(); } DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *parent, - KListViewItem *after, const QString &name) + KListViewItem *after, const TQString &name) :KListViewItem(parent, after, name), m_type(type) { init(); } DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem * parent, - KListViewItem * after, const QString & name ) + KListViewItem * after, const TQString & name ) :KListViewItem(parent, after, name), m_type(type) { init(); @@ -64,7 +64,7 @@ DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem void DocumentationItem::init( ) { - QString icon; + TQString icon; switch (m_type) { @@ -90,7 +90,7 @@ void DocumentationItem::init( ) DocumentationCatalogItem::DocumentationCatalogItem(DocumentationPlugin* plugin, - KListView *parent, const QString &name) + KListView *parent, const TQString &name) :DocumentationItem(DocumentationItem::Catalog, parent, name), m_plugin(plugin), isLoaded(false), isActivated(false), m_isProjectDocumentationItem(false) { @@ -99,7 +99,7 @@ DocumentationCatalogItem::DocumentationCatalogItem(DocumentationPlugin* plugin, } DocumentationCatalogItem::DocumentationCatalogItem(DocumentationPlugin* plugin, - DocumentationItem *parent, const QString &name) + DocumentationItem *parent, const TQString &name) :DocumentationItem(DocumentationItem::Catalog, parent, name), m_plugin(plugin), isLoaded(false), isActivated(false), m_isProjectDocumentationItem(false) { @@ -146,7 +146,7 @@ void DocumentationCatalogItem::activate() //class IndexItemProto IndexItemProto::IndexItemProto(DocumentationPlugin *plugin, DocumentationCatalogItem *catalog, - IndexBox *listbox, const QString &text, const QString &description) + IndexBox *listbox, const TQString &text, const TQString &description) : m_listbox(listbox), m_text(text), m_description(description) { plugin->indexes[catalog].append(this); @@ -161,16 +161,16 @@ IndexItemProto::~IndexItemProto() //class IndexItem -IndexItem::IndexItem(IndexBox *listbox, const QString &text) - :QListBoxText(listbox, text), m_listbox(listbox) +IndexItem::IndexItem(IndexBox *listbox, const TQString &text) + :TQListBoxText(listbox, text), m_listbox(listbox) { } IndexItem::List IndexItem::urls() const { List urlList; - QValueList<IndexItemProto*> itemProtos = m_listbox->items[text()]; - for (QValueList<IndexItemProto*>::const_iterator it = itemProtos.begin(); + TQValueList<IndexItemProto*> itemProtos = m_listbox->items[text()]; + for (TQValueList<IndexItemProto*>::const_iterator it = itemProtos.begin(); it != itemProtos.end(); ++it) urlList.append(qMakePair((*it)->description(), (*it)->url())); return urlList; @@ -181,9 +181,9 @@ IndexItem::List IndexItem::urls() const //class ConfigurationItem -ConfigurationItem::ConfigurationItem(QListView *parent, DocumentationPlugin * plugin, const QString &title, const QString &url, +ConfigurationItem::ConfigurationItem(TQListView *parent, DocumentationPlugin * plugin, const TQString &title, const TQString &url, bool indexPossible, bool fullTextSearchPossible) - :QCheckListItem(parent, "", QCheckListItem::CheckBox), m_title(title), m_url(url), + :TQCheckListItem(parent, "", TQCheckListItem::CheckBox), m_title(title), m_url(url), m_origTitle(title), m_contents(true), m_index(false), m_fullTextSearch(false), m_indexPossible(indexPossible), m_fullTextSearchPossible(fullTextSearchPossible), m_docPlugin( plugin ) @@ -192,7 +192,7 @@ ConfigurationItem::ConfigurationItem(QListView *parent, DocumentationPlugin * pl setText(4, m_url); } -void ConfigurationItem::paintCell(QPainter *p, const QColorGroup &cg, int column, +void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align) { if ( (column == 0) || (column == 1) || (column == 2) ) @@ -200,25 +200,25 @@ void ConfigurationItem::paintCell(QPainter *p, const QColorGroup &cg, int column if ( !p ) return; - QListView *lv = listView(); + TQListView *lv = listView(); if ( !lv ) return; const BackgroundMode bgmode = lv->viewport()->backgroundMode(); - const QColorGroup::ColorRole crole = QPalette::backgroundRoleFromMode( bgmode ); + const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); p->fillRect(0, 0, width, height(), cg.brush(crole)); - QFontMetrics fm(lv->fontMetrics()); - int boxsize = lv->style().pixelMetric(QStyle::PM_CheckListButtonSize, lv); + TQFontMetrics fm(lv->fontMetrics()); + int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv); int marg = lv->itemMargin(); - int styleflags = QStyle::Style_Default; + int styleflags = TQStyle::Style_Default; if (((column == 0) && m_contents) || ((column == 1) && m_index) || ((column == 2) && m_fullTextSearch)) - styleflags |= QStyle::Style_On; + styleflags |= TQStyle::Style_On; else - styleflags |= QStyle::Style_Off; + styleflags |= TQStyle::Style_Off; if ((column == 0) || ((column == 1) && m_indexPossible) || ((column == 2) && m_fullTextSearchPossible)) - styleflags |= QStyle::Style_Enabled; + styleflags |= TQStyle::Style_Enabled; int x = 0; int y = 0; @@ -228,20 +228,20 @@ void ConfigurationItem::paintCell(QPainter *p, const QColorGroup &cg, int column else y = (fm.height() + 2 + marg - boxsize) / 2; - QStyleOption opt(this); - lv->style().drawPrimitive(QStyle::PE_CheckListIndicator, p, - QRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, opt); + TQStyleOption opt(this); + lv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p, + TQRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, opt); return; } - QListViewItem::paintCell(p, cg, column, width, align); + TQListViewItem::paintCell(p, cg, column, width, align); } -int ConfigurationItem::width(const QFontMetrics &fm, const QListView *lv, int c) const +int ConfigurationItem::width(const TQFontMetrics &fm, const TQListView *lv, int c) const { if ((c == 0) || (c == 1) || (c == 2)) - return lv->style().pixelMetric(QStyle::PM_CheckListButtonSize, lv) + 4; - return QListViewItem::width(fm, lv, c); + return lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4; + return TQListViewItem::width(fm, lv, c); } @@ -253,8 +253,8 @@ int ConfigurationItem::width(const QFontMetrics &fm, const QListView *lv, int c) //class DocumentationPlugin -DocumentationPlugin::DocumentationPlugin(KConfig *pluginConfig, QObject *parent, const char *name) - :QObject(parent, name), config(pluginConfig), m_indexCreated(false) +DocumentationPlugin::DocumentationPlugin(KConfig *pluginConfig, TQObject *parent, const char *name) + :TQObject(parent, name), config(pluginConfig), m_indexCreated(false) { } @@ -277,7 +277,7 @@ void DocumentationPlugin::autoSetup() void DocumentationPlugin::reload() { clear(); - for (QValueList<DocumentationCatalogItem *>::iterator it = catalogs.begin(); + for (TQValueList<DocumentationCatalogItem *>::iterator it = catalogs.begin(); it != catalogs.end(); ++it) { createTOC(*it); @@ -286,7 +286,7 @@ void DocumentationPlugin::reload() void DocumentationPlugin::clear() { - for (QValueList<DocumentationCatalogItem *>::iterator it = catalogs.begin(); + for (TQValueList<DocumentationCatalogItem *>::iterator it = catalogs.begin(); it != catalogs.end(); ++it) { clearCatalog(*it); @@ -296,7 +296,7 @@ void DocumentationPlugin::clear() void DocumentationPlugin::clearCatalog(DocumentationCatalogItem *item) { //clear named catalog map - for (QMap<QString, DocumentationCatalogItem*>::iterator it = namedCatalogs.begin(); + for (TQMap<TQString, DocumentationCatalogItem*>::iterator it = namedCatalogs.begin(); it != namedCatalogs.end(); ++it) { if (it.data() == item) @@ -306,8 +306,8 @@ void DocumentationPlugin::clearCatalog(DocumentationCatalogItem *item) } } //clear indexes for catalog - QValueList<IndexItemProto *> idx = indexes[item]; - for (QValueList<IndexItemProto *>::iterator it = idx.begin(); it != idx.end(); ++it) + TQValueList<IndexItemProto *> idx = indexes[item]; + for (TQValueList<IndexItemProto *>::iterator it = idx.begin(); it != idx.end(); ++it) { delete *it; } @@ -322,7 +322,7 @@ void DocumentationPlugin::createIndex(IndexBox *index) if (m_indexCreated) return; - for (QValueList<DocumentationCatalogItem *>::iterator it = catalogs.begin(); + for (TQValueList<DocumentationCatalogItem *>::iterator it = catalogs.begin(); it != catalogs.end(); ++it) { loadIndex(index, *it); @@ -334,17 +334,17 @@ void DocumentationPlugin::cacheIndex(DocumentationCatalogItem *item) { kdDebug() << "Creating index cache for " << item->text(0) << endl; - QString cacheName = locateLocal("data", QString("kdevdocumentation/index/cache_") + item->text(0)); - QFile cacheFile(cacheName); + TQString cacheName = locateLocal("data", TQString("kdevdocumentation/index/cache_") + item->text(0)); + TQFile cacheFile(cacheName); if (!cacheFile.open(IO_WriteOnly)) return; - QTextStream str(&cacheFile); - str.setEncoding(QTextStream::Unicode); + TQTextStream str(&cacheFile); + str.setEncoding(TQTextStream::Unicode); str << CACHE_VERSION << endl; - QValueList<IndexItemProto*> catalogIndexes = indexes[item]; - for (QValueList<IndexItemProto*>::const_iterator it = catalogIndexes.constBegin(); + TQValueList<IndexItemProto*> catalogIndexes = indexes[item]; + for (TQValueList<IndexItemProto*>::const_iterator it = catalogIndexes.constBegin(); it != catalogIndexes.constEnd(); ++it) { str << (*it)->text() << endl; @@ -357,26 +357,26 @@ void DocumentationPlugin::cacheIndex(DocumentationCatalogItem *item) bool DocumentationPlugin::loadCachedIndex(IndexBox *index, DocumentationCatalogItem *item) { - QString cacheName = locateLocal("data", QString("kdevdocumentation/index/cache_") + item->cacheVersion() + item->text(0)); - QFile cacheFile(cacheName); + TQString cacheName = locateLocal("data", TQString("kdevdocumentation/index/cache_") + item->cacheVersion() + item->text(0)); + TQFile cacheFile(cacheName); if (!cacheFile.open(IO_ReadOnly)) return false; kdDebug() << "Using cached index for item: " << item->text(0) << endl; - QTextStream str(&cacheFile); - str.setEncoding(QTextStream::Unicode); - QString cache = str.read(); - QStringList cacheList = QStringList::split("\n", cache, true); - QString ver = cacheList.first(); + TQTextStream str(&cacheFile); + str.setEncoding(TQTextStream::Unicode); + TQString cache = str.read(); + TQStringList cacheList = TQStringList::split("\n", cache, true); + TQString ver = cacheList.first(); if (ver != CACHE_VERSION) { kdDebug() << "Wrong cache version: " << ver << endl; return false; } - QStringList::const_iterator it = cacheList.begin(); + TQStringList::const_iterator it = cacheList.begin(); it++; - QString s[3]; int c = 0; + TQString s[3]; int c = 0; for (; it != cacheList.end(); ++it) { s[c] = *it; @@ -397,18 +397,18 @@ void DocumentationPlugin::addCatalog(DocumentationCatalogItem *item) { catalogs.append(item); namedCatalogs[item->text(0)] = item; -// indexes[item] = QValueList<IndexItem*>(); +// indexes[item] = TQValueList<IndexItem*>(); } void DocumentationPlugin::addCatalogConfiguration(KListView *configurationView, - const QString &title, const QString &url) + const TQString &title, const TQString &url) { new ConfigurationItem(configurationView, this, title, url, hasCapability(Index), hasCapability(FullTextSearch)); } void DocumentationPlugin::editCatalogConfiguration(ConfigurationItem *configurationItem, - const QString &title, const QString &url) + const TQString &title, const TQString &url) { configurationItem->setTitle(title); configurationItem->setURL(url); @@ -422,8 +422,8 @@ void DocumentationPlugin::deleteCatalogConfiguration(const ConfigurationItem *co void DocumentationPlugin::clearCatalogIndex(DocumentationCatalogItem *item) { //clear indexes for catalog - QValueList<IndexItemProto *> idx = indexes[item]; - for (QValueList<IndexItemProto *>::iterator it = idx.begin(); it != idx.end(); ++it) + TQValueList<IndexItemProto *> idx = indexes[item]; + for (TQValueList<IndexItemProto *>::iterator it = idx.begin(); it != idx.end(); ++it) { delete *it; } @@ -443,9 +443,9 @@ void DocumentationPlugin::loadIndex(IndexBox *index, DocumentationCatalogItem *i void DocumentationPlugin::init(KListView *contents) { config->setGroup("Locations"); - QMap<QString, QString> entryMap = config->entryMap("Locations"); + TQMap<TQString, TQString> entryMap = config->entryMap("Locations"); - for (QMap<QString, QString>::const_iterator it = entryMap.begin(); + for (TQMap<TQString, TQString>::const_iterator it = entryMap.begin(); it != entryMap.end(); ++it) { if (catalogEnabled(it.key())) @@ -453,13 +453,13 @@ void DocumentationPlugin::init(KListView *contents) } } -void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, QStringList restrictions) +void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, TQStringList restrictions) { config->setGroup("Locations"); - QMap<QString, QString> entryMap = config->entryMap("Locations"); + TQMap<TQString, TQString> entryMap = config->entryMap("Locations"); //remove deleted in configuration catalogs - for (QStringList::const_iterator it = deletedConfigurationItems.constBegin(); + for (TQStringList::const_iterator it = deletedConfigurationItems.constBegin(); it != deletedConfigurationItems.constEnd(); ++it) { if (namedCatalogs.contains(*it)) @@ -468,7 +468,7 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, QStringLi deletedConfigurationItems.clear(); //update configuration - for (QMap<QString, QString>::const_iterator it = entryMap.begin(); + for (TQMap<TQString, TQString>::const_iterator it = entryMap.begin(); it != entryMap.end(); ++it) { config->setGroup("Locations"); @@ -507,9 +507,9 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, QStringLi void DocumentationPlugin::loadCatalogConfiguration(KListView *configurationView) { config->setGroup("Locations"); - QMap<QString, QString> entryMap = config->entryMap("Locations"); + TQMap<TQString, TQString> entryMap = config->entryMap("Locations"); - for (QMap<QString, QString>::const_iterator it = entryMap.begin(); + for (TQMap<TQString, TQString>::const_iterator it = entryMap.begin(); it != entryMap.end(); ++it) { if (namedCatalogs.contains(it.key()) @@ -533,13 +533,13 @@ void DocumentationPlugin::saveCatalogConfiguration(KListView *configurationView) { config->setGroup("Locations"); - for (QStringList::const_iterator it = deletedConfigurationItems.constBegin(); + for (TQStringList::const_iterator it = deletedConfigurationItems.constBegin(); it != deletedConfigurationItems.constEnd(); ++it) { config->deleteEntry(*it); } - QListViewItemIterator it(configurationView); + TQListViewItemIterator it(configurationView); while (it.current()) { ConfigurationItem *confItem = dynamic_cast<ConfigurationItem*>(it.current()); @@ -576,7 +576,7 @@ void DocumentationPlugin::saveCatalogConfiguration(KListView *configurationView) void DocumentationPlugin::setIndexEnabled( DocumentationCatalogItem * item, bool e ) { - QString group = config->group(); + TQString group = config->group(); config->setGroup("Index Settings"); config->writeEntry(item->text(0), e); config->setGroup(group); @@ -584,25 +584,25 @@ void DocumentationPlugin::setIndexEnabled( DocumentationCatalogItem * item, bool bool DocumentationPlugin::indexEnabled( DocumentationCatalogItem * item ) const { - QString group = config->group(); + TQString group = config->group(); config->setGroup("Index Settings"); bool b = config->readBoolEntry(item->text(0), false); config->setGroup(group); return b; } -bool DocumentationPlugin::catalogEnabled(const QString &name) const +bool DocumentationPlugin::catalogEnabled(const TQString &name) const { - QString group = config->group(); + TQString group = config->group(); config->setGroup("TOC Settings"); bool b = config->readBoolEntry(name, true); config->setGroup(group); return b; } -void DocumentationPlugin::setCatalogEnabled(const QString &name, bool e) +void DocumentationPlugin::setCatalogEnabled(const TQString &name, bool e) { - QString group = config->group(); + TQString group = config->group(); config->setGroup("TOC Settings"); config->writeEntry(name, e); config->setGroup(group); @@ -613,7 +613,7 @@ void DocumentationPlugin::setCatalogEnabled(const QString &name, bool e) //class IndexBox -IndexBox::IndexBox(QWidget *parent, const char *name) +IndexBox::IndexBox(TQWidget *parent, const char *name) :KListBox(parent, name), m_dirty(false) { } @@ -625,12 +625,12 @@ void IndexBox::addIndexItem(IndexItemProto *item) void IndexBox::removeIndexItem(IndexItemProto *item) { - QString text = item->text(); + TQString text = item->text(); items[text].remove(item); if (items[text].count() == 0) { items.remove(text); - QListBoxItem *item = findItem(text, Qt::CaseSensitive | Qt::ExactMatch); + TQListBoxItem *item = findItem(text, Qt::CaseSensitive | Qt::ExactMatch); if (item) delete item; } @@ -638,7 +638,7 @@ void IndexBox::removeIndexItem(IndexItemProto *item) void IndexBox::fill() { - for (QMap<QString, QValueList<IndexItemProto*> >::const_iterator it = items.begin(); + for (TQMap<TQString, TQValueList<IndexItemProto*> >::const_iterator it = items.begin(); it != items.end(); ++it) { new IndexItem(this, it.key()); @@ -662,12 +662,12 @@ void IndexBox::refill() ProjectDocumentationPlugin::ProjectDocumentationPlugin(DocumentationPlugin *docPlugin, DocumentationPlugin::ProjectDocType type) - :QObject(0, 0), m_docPlugin(docPlugin), m_catalog(0), m_type(type), m_contents(0), m_index(0) + :TQObject(0, 0), m_docPlugin(docPlugin), m_catalog(0), m_type(type), m_contents(0), m_index(0) { kdDebug() << "ProjectDocumentationPlugin::ProjectDocumentationPlugin for type " << type << endl; m_watch = new KDirWatch(this); - connect(m_watch, SIGNAL(dirty(const QString&)), this, SLOT(reinit())); + connect(m_watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(reinit())); m_watch->startScan(); } @@ -676,7 +676,7 @@ ProjectDocumentationPlugin::~ProjectDocumentationPlugin() deinit(); } -void ProjectDocumentationPlugin::init(KListView *contents, IndexBox *index, const QString &url) +void ProjectDocumentationPlugin::init(KListView *contents, IndexBox *index, const TQString &url) { m_contents = contents; m_index = index; @@ -708,12 +708,12 @@ void ProjectDocumentationPlugin::deinit() m_catalog = 0; } -QString ProjectDocumentationPlugin::pluginName() const +TQString ProjectDocumentationPlugin::pluginName() const { return m_docPlugin->pluginName(); } -QString ProjectDocumentationPlugin::catalogURL() const +TQString ProjectDocumentationPlugin::catalogURL() const { return m_url; } diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h index 5d905085..658a4e7a 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.h +++ b/parts/documentation/interfaces/kdevdocumentationplugin.h @@ -19,9 +19,9 @@ #ifndef KDEV_DOC_PLUGIN_H #define KDEV_DOC_PLUGIN_H -#include <qmap.h> -#include <qvaluelist.h> -#include <qpair.h> +#include <tqmap.h> +#include <tqvaluelist.h> +#include <tqpair.h> #include <klistbox.h> #include <klistview.h> @@ -43,10 +43,10 @@ public: Document /**<Document.*/ }; - DocumentationItem(Type type, KListView *parent, const QString &name); - DocumentationItem(Type type, KListView *parent, KListViewItem *after, const QString &name); - DocumentationItem(Type type, KListViewItem *parent, const QString &name); - DocumentationItem(Type type, KListViewItem *parent, KListViewItem *after, const QString &name); + DocumentationItem(Type type, KListView *parent, const TQString &name); + DocumentationItem(Type type, KListView *parent, KListViewItem *after, const TQString &name); + DocumentationItem(Type type, KListViewItem *parent, const TQString &name); + DocumentationItem(Type type, KListViewItem *parent, KListViewItem *after, const TQString &name); virtual void setURL(const KURL &url) { m_url = url; } virtual KURL url() const { return m_url; } @@ -72,8 +72,8 @@ class DocumentationPlugin; class DocumentationCatalogItem: public DocumentationItem { public: - DocumentationCatalogItem(DocumentationPlugin* plugin, KListView *parent, const QString &name); - DocumentationCatalogItem(DocumentationPlugin* plugin, DocumentationItem *parent, const QString &name); + DocumentationCatalogItem(DocumentationPlugin* plugin, KListView *parent, const TQString &name); + DocumentationCatalogItem(DocumentationPlugin* plugin, DocumentationItem *parent, const TQString &name); virtual ~DocumentationCatalogItem(); DocumentationPlugin* plugin() const { return m_plugin; } @@ -84,7 +84,7 @@ public: virtual bool isProjectDocumentationItem() const { return m_isProjectDocumentationItem; } virtual void setProjectDocumentationItem(bool b) { m_isProjectDocumentationItem = b; } - virtual QString cacheVersion() const { return ""; } /// should return a short string that identifies the version of the catalog + virtual TQString cacheVersion() const { return ""; } /// should return a short string that identifies the version of the catalog protected: virtual void activate(); @@ -104,28 +104,28 @@ class IndexItemProto { public: IndexItemProto(DocumentationPlugin *plugin, DocumentationCatalogItem *catalog, IndexBox *listbox, - const QString &text, const QString &description); + const TQString &text, const TQString &description); ~IndexItemProto(); void addURL(const KURL &url) { m_url = url; } KURL url() const { return m_url; } - QString text() const { return m_text; } - QString description() const { return m_description; } + TQString text() const { return m_text; } + TQString description() const { return m_description; } private: KURL m_url; IndexBox *m_listbox; - QString m_text; - QString m_description; + TQString m_text; + TQString m_description; }; /**Documentation index item.*/ -class IndexItem: public QListBoxText { +class IndexItem: public TQListBoxText { public: - typedef QPair<QString, KURL> URL; - typedef QValueList<URL> List; + typedef QPair<TQString, KURL> URL; + typedef TQValueList<URL> List; - IndexItem(IndexBox *listbox, const QString &text); + IndexItem(IndexBox *listbox, const TQString &text); List urls() const; @@ -136,17 +136,17 @@ private: /**Documentation index view.*/ class IndexBox: public KListBox{ public: - IndexBox(QWidget *parent = 0, const char *name = 0); + IndexBox(TQWidget *parent = 0, const char *name = 0); virtual void addIndexItem(IndexItemProto *item); virtual void removeIndexItem(IndexItemProto *item); virtual void fill(); virtual void refill(); virtual void setDirty(bool dirty); -// virtual void refill(QValueList<IndexItemProto*> &items); +// virtual void refill(TQValueList<IndexItemProto*> &items); private: - QMap<QString, QValueList<IndexItemProto*> > items; + TQMap<TQString, TQValueList<IndexItemProto*> > items; friend class IndexItem; bool m_dirty; @@ -161,19 +161,19 @@ class DocumentationPlugin; class ConfigurationItem: public QCheckListItem { public: - ConfigurationItem(QListView *parent, DocumentationPlugin * plugin, const QString &title, const QString &url, + ConfigurationItem(TQListView *parent, DocumentationPlugin * plugin, const TQString &title, const TQString &url, bool indexPossible, bool fullTextSearchPossible); - virtual QString title() const { return m_title; } - virtual void setTitle(const QString title) { setText(3, m_title = title); } - virtual QString url() const { return m_url; } - virtual void setURL(const QString url) { setText(4, m_url = url); } + virtual TQString title() const { return m_title; } + virtual void setTitle(const TQString title) { setText(3, m_title = title); } + virtual TQString url() const { return m_url; } + virtual void setURL(const TQString url) { setText(4, m_url = url); } virtual bool isChanged() const { return m_title == m_origTitle; } - virtual QString origTitle() const {return m_origTitle; } + virtual TQString origTitle() const {return m_origTitle; } - virtual void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align); - virtual int width(const QFontMetrics &fm, const QListView *lv, int c) const; + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align); + virtual int width(const TQFontMetrics &fm, const TQListView *lv, int c) const; bool contents() const { return m_contents; } void setContents(bool contents) { m_contents = contents; } @@ -188,9 +188,9 @@ public: DocumentationPlugin * docPlugin() { return m_docPlugin; } private: - QString m_title; - QString m_url; - QString m_origTitle; + TQString m_title; + TQString m_url; + TQString m_origTitle; bool m_contents; bool m_index; @@ -233,14 +233,14 @@ public: setCapabilities(Index | FullTextSearch); @endcode */ - DocumentationPlugin(KConfig *pluginConfig, QObject *parent =0, const char *name =0); + DocumentationPlugin(KConfig *pluginConfig, TQObject *parent =0, const char *name =0); virtual ~DocumentationPlugin(); /**Returns the i18n name of the plugin.*/ - virtual QString pluginName() const = 0; + virtual TQString pluginName() const = 0; /**Creates documentation catalog with given title and url.*/ - virtual DocumentationCatalogItem *createCatalog(KListView *contents, const QString &title, const QString &url) = 0; + virtual DocumentationCatalogItem *createCatalog(KListView *contents, const TQString &title, const TQString &url) = 0; /**Initialize a list of catalogs. @param contents the listview to fill with catalogs @@ -252,7 +252,7 @@ public: @param index the listbox with index to update @param restrictions the list of catalogs names to remove */ - virtual void reinit(KListView *contents, IndexBox *index, QStringList restrictions); + virtual void reinit(KListView *contents, IndexBox *index, TQStringList restrictions); /**Initializes plugin configuration. Documentation plugins should be able to initialize the default configuration on startup without any user interaction. Call this in the constructor of your plugin.*/ @@ -263,9 +263,9 @@ public: /**Indicates if a catalog with specified name is enabled. Documentation plugin should check this and do not load catalogs disabled in configuration. All catalogs are enabled by default.*/ - virtual bool catalogEnabled(const QString &name) const; + virtual bool catalogEnabled(const TQString &name) const; /**Enables or disables documentation catalog.*/ - virtual void setCatalogEnabled(const QString &name, bool e); + virtual void setCatalogEnabled(const TQString &name, bool e); /**Indicates if an index of given catalog should be rebuilt. This method is used by index caching algorythm to make a descision to rebuild index @@ -292,7 +292,7 @@ public: clicks the documentation item. If it is too much overhead to determine the documentation catalog url in @ref createCatalog method then you can set it here.*/ virtual void setCatalogURL(DocumentationCatalogItem *item) = 0; - virtual QStringList fullTextSearchLocations() = 0; + virtual TQStringList fullTextSearchLocations() = 0; /**Loads catalog configuration and fills configurationView with ConfigurationItem objects.*/ virtual void loadCatalogConfiguration(KListView *configurationView); @@ -302,17 +302,17 @@ public: virtual void saveCatalogConfiguration(KListView *configurationView); /**Adds new catalog to a configuration.*/ virtual void addCatalogConfiguration(KListView *configurationView, - const QString &title, const QString &url); + const TQString &title, const TQString &url); /**Edits catalog configuration.*/ virtual void editCatalogConfiguration(ConfigurationItem *configurationItem, - const QString &title, const QString &url); + const TQString &title, const TQString &url); /**Removes catalog from configuration. configurationItem should not be removed here.*/ virtual void deleteCatalogConfiguration(const ConfigurationItem *const configurationItem); /**Returns a mode and a filter for catalog locator dialogs.*/ - virtual QPair<KFile::Mode, QString> catalogLocatorProps() = 0; + virtual QPair<KFile::Mode, TQString> catalogLocatorProps() = 0; /**Returns a title of catalog defined by an url parameter.*/ - virtual QString catalogTitle(const QString &url) = 0; + virtual TQString catalogTitle(const TQString &url) = 0; /**Reloads documentation catalogs and indices.*/ virtual void reload(); @@ -347,11 +347,11 @@ public slots: protected: /**A list of loaded documentation catalogs.*/ - QValueList<DocumentationCatalogItem*> catalogs; + TQValueList<DocumentationCatalogItem*> catalogs; /**A map of names of loaded documentation catalogs.*/ - QMap<QString, DocumentationCatalogItem*> namedCatalogs; + TQMap<TQString, DocumentationCatalogItem*> namedCatalogs; /**A map of indices of loaded documentation catalogs.*/ - QMap<DocumentationCatalogItem*, QValueList<IndexItemProto*> > indexes; + TQMap<DocumentationCatalogItem*, TQValueList<IndexItemProto*> > indexes; /**Sets capabilities of documentation plugin.*/ void setCapabilities(int caps) { m_capabilities = caps; } @@ -362,7 +362,7 @@ protected: /**Stores items deleted from configuration. @ref saveCatalogConfiguration uses this to remove entries from configuration file.*/ - QStringList deletedConfigurationItems; + TQStringList deletedConfigurationItems; /**Configuration object used by a plugin.*/ KConfig *config; @@ -387,19 +387,19 @@ friend class DocumentationCatalogItem; Represents functionality to display project documentation catalog and index in documentation browser. */ -class ProjectDocumentationPlugin: public QObject { +class ProjectDocumentationPlugin: public TQObject { Q_OBJECT public: ProjectDocumentationPlugin(DocumentationPlugin *docPlugin, DocumentationPlugin::ProjectDocType type); virtual ~ProjectDocumentationPlugin(); /**Initializes project documentation plugin - creates documentation catalog.*/ - virtual void init(KListView *contents, IndexBox *index, const QString &url); + virtual void init(KListView *contents, IndexBox *index, const TQString &url); /**Deinitializes project documentation plugin - removes documentation catalog.*/ virtual void deinit(); - QString pluginName() const; - QString catalogURL() const; + TQString pluginName() const; + TQString catalogURL() const; public slots: /**Performs reinitialization if project documentation has changed (after building api documentation).*/ @@ -415,7 +415,7 @@ private: class KDirWatch *m_watch; class KListView *m_contents; class IndexBox *m_index; - QString m_url; + TQString m_url; }; #endif diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp index e2a4172e..e0b19de9 100644 --- a/parts/documentation/plugins/chm/docchmplugin.cpp +++ b/parts/documentation/plugins/chm/docchmplugin.cpp @@ -27,10 +27,10 @@ #include <kio/netaccess.h> #include <iostream> #include <fstream> -#include <qvaluevector.h> +#include <tqvaluevector.h> #include <kdevgenericfactory.h> #include <kdevplugininfo.h> -#include <qregexp.h> +#include <tqregexp.h> #include "../../../../config.h" @@ -38,7 +38,7 @@ static const KDevPluginInfo data("docchmplugin"); typedef KDevGenericFactory<DocCHMPlugin> DocCHMPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocchmplugin, DocCHMPluginFactory(data) ) -DocCHMPlugin::DocCHMPlugin(QObject* parent, const char* name, QStringList // args +DocCHMPlugin::DocCHMPlugin(TQObject* parent, const char* name, TQStringList // args ) :DocumentationPlugin(DocCHMPluginFactory::instance()->config(), parent, name) { @@ -51,7 +51,7 @@ DocCHMPlugin::~DocCHMPlugin() } -DocumentationCatalogItem* DocCHMPlugin::createCatalog(KListView* contents, const QString& title, const QString& url) +DocumentationCatalogItem* DocCHMPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url) { DocumentationCatalogItem *item = new DocumentationCatalogItem(this, contents, title); item->setURL(KURL(url)); @@ -59,29 +59,29 @@ DocumentationCatalogItem* DocCHMPlugin::createCatalog(KListView* contents, const return item; } -QPair<KFile::Mode, QString> DocCHMPlugin::catalogLocatorProps() +QPair<KFile::Mode, TQString> DocCHMPlugin::catalogLocatorProps() { - return QPair<KFile::Mode, QString>(KFile::File, "*.chm"); + return QPair<KFile::Mode, TQString>(KFile::File, "*.chm"); } -QString DocCHMPlugin::catalogTitle(const QString& // url +TQString DocCHMPlugin::catalogTitle(const TQString& // url ) { - return QString::null; + return TQString::null; } -QString DocCHMPlugin::pluginName() const +TQString DocCHMPlugin::pluginName() const { return i18n("CHM Documentation Collection"); } -QString DocCHMPlugin::getSpecialData(const QString& name, KURL url) { - QString ret = ""; +TQString DocCHMPlugin::getSpecialData(const TQString& name, KURL url) { + TQString ret = ""; url.setProtocol("ms-its"); url.addPath("/:" + name); - QString tmpFile; + TQString tmpFile; if( KIO::NetAccess::download( url, tmpFile, 0 ) ) { std::filebuf fb; @@ -102,10 +102,10 @@ QString DocCHMPlugin::getSpecialData(const QString& name, KURL url) { ///this currently is useless, because htdig cannot use kioslaves -QStringList DocCHMPlugin::fullTextSearchLocations() +TQStringList DocCHMPlugin::fullTextSearchLocations() { - //return QStringList::split( '\n', getSpecialData("contents", m_url)); - return QStringList(); + //return TQStringList::split( '\n', getSpecialData("contents", m_url)); + return TQStringList(); } bool DocCHMPlugin::needRefreshIndex(DocumentationCatalogItem* // item @@ -137,12 +137,12 @@ static KListViewItem* chainEnd(KListViewItem *parent) { return ret; } -static QString decodeHTML(const QString& s) { - QRegExp rx(QString::fromLatin1("&#(\\d+);| ")); - QString out = s; +static TQString decodeHTML(const TQString& s) { + TQRegExp rx(TQString::fromLatin1("&#(\\d+);| ")); + TQString out = s; int pos = rx.search(out); while(pos > -1) { - QString found = rx.cap(0); + TQString found = rx.cap(0); if(found != " ") { out.replace(pos, found.length(), static_cast<char>(rx.cap(1).toInt())); }else{ @@ -156,12 +156,12 @@ static QString decodeHTML(const QString& s) { void DocCHMPlugin::createTOC(DocumentationCatalogItem* item) { - QStringList lines = QStringList::split("\n", getSpecialData("catalog", item->url()) ); + TQStringList lines = TQStringList::split("\n", getSpecialData("catalog", item->url()) ); if(lines.count() % 4 != 0) { kdDebug(9002) << "DocCHMPlugin::createTOC: wrong count of strings"; return;} - QValueVector<DocumentationItem*> items; + TQValueVector<DocumentationItem*> items; items.push_back(item); - for(QStringList::Iterator it = lines.begin(); it != lines.end();) { + for(TQStringList::Iterator it = lines.begin(); it != lines.end();) { bool ok1 = true, ok2 = true; int parent = (*it).toInt(&ok1); ++it; @@ -172,7 +172,7 @@ void DocCHMPlugin::createTOC(DocumentationCatalogItem* item) break; } - QString& name(*it); + TQString& name(*it); ++it; KURL url(*it); ++it; diff --git a/parts/documentation/plugins/chm/docchmplugin.h b/parts/documentation/plugins/chm/docchmplugin.h index 8db470b0..ca90a978 100644 --- a/parts/documentation/plugins/chm/docchmplugin.h +++ b/parts/documentation/plugins/chm/docchmplugin.h @@ -26,25 +26,25 @@ class DocCHMPlugin :public DocumentationPlugin { Q_OBJECT public: - DocCHMPlugin(QObject* parent, const char* name, QStringList args = QStringList()); + DocCHMPlugin(TQObject* parent, const char* name, TQStringList args = TQStringList()); ~DocCHMPlugin(); - virtual QString pluginName() const; + virtual TQString pluginName() const; virtual void setCatalogURL(DocumentationCatalogItem* item); - virtual QString catalogTitle(const QString& url); - virtual QPair<KFile::Mode, QString> catalogLocatorProps(); - virtual DocumentationCatalogItem* createCatalog(KListView* contents, const QString& title, const QString& url); + virtual TQString catalogTitle(const TQString& url); + virtual QPair<KFile::Mode, TQString> catalogLocatorProps(); + virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url); virtual void createTOC(DocumentationCatalogItem* item); virtual void createIndex(IndexBox* index, DocumentationCatalogItem* item); virtual bool needRefreshIndex(DocumentationCatalogItem* item); - virtual QStringList fullTextSearchLocations(); + virtual TQStringList fullTextSearchLocations(); virtual void autoSetupPlugin(); protected: - QString getSpecialData(const QString& name, KURL url); + TQString getSpecialData(const TQString& name, KURL url); }; #endif diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp index 9fa5ad99..ae95aff1 100644 --- a/parts/documentation/plugins/custom/doccustomplugin.cpp +++ b/parts/documentation/plugins/custom/doccustomplugin.cpp @@ -32,7 +32,7 @@ static const KDevPluginInfo data("doccustomplugin"); typedef KDevGenericFactory<DocCustomPlugin> DocCustomPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdoccustomplugin, DocCustomPluginFactory(data) ) -DocCustomPlugin::DocCustomPlugin(QObject* parent, const char* name, const QStringList // args +DocCustomPlugin::DocCustomPlugin(TQObject* parent, const char* name, const TQStringList // args ) :DocumentationPlugin(DocCustomPluginFactory::instance()->config(), parent, name) { @@ -50,31 +50,31 @@ bool DocCustomPlugin::needRefreshIndex(DocumentationCatalogItem* // item return false; } -QString DocCustomPlugin::pluginName() const +TQString DocCustomPlugin::pluginName() const { return i18n("Custom Documentation Collection"); } -DocumentationCatalogItem* DocCustomPlugin::createCatalog(KListView* contents, const QString& title, const QString& url) +DocumentationCatalogItem* DocCustomPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url) { DocumentationCatalogItem *item = new DocumentationCatalogItem(this, contents, title); item->setURL(KURL(url)); return item; } -QPair<KFile::Mode, QString> DocCustomPlugin::catalogLocatorProps() +QPair<KFile::Mode, TQString> DocCustomPlugin::catalogLocatorProps() { - return QPair<KFile::Mode, QString>(KFile::File, "all/allfiles"); + return QPair<KFile::Mode, TQString>(KFile::File, "all/allfiles"); } -QString DocCustomPlugin::catalogTitle(const QString& /*url*/) +TQString DocCustomPlugin::catalogTitle(const TQString& /*url*/) { - return QString::null; + return TQString::null; } -QStringList DocCustomPlugin::fullTextSearchLocations() +TQStringList DocCustomPlugin::fullTextSearchLocations() { - return QStringList(); + return TQStringList(); } diff --git a/parts/documentation/plugins/custom/doccustomplugin.h b/parts/documentation/plugins/custom/doccustomplugin.h index e72261a6..77bc9750 100644 --- a/parts/documentation/plugins/custom/doccustomplugin.h +++ b/parts/documentation/plugins/custom/doccustomplugin.h @@ -24,12 +24,12 @@ class DocCustomPlugin : public DocumentationPlugin { public: - DocCustomPlugin(QObject* parent, const char* name, const QStringList args = QStringList()); + DocCustomPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~DocCustomPlugin(); - virtual QString pluginName() const; + virtual TQString pluginName() const; - virtual DocumentationCatalogItem* createCatalog(KListView* contents, const QString& title, const QString& url); + virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url); virtual void createTOC(DocumentationCatalogItem* item); virtual void setCatalogURL(DocumentationCatalogItem* item); @@ -37,10 +37,10 @@ public: virtual bool needRefreshIndex(DocumentationCatalogItem* item); virtual void createIndex(IndexBox* index, DocumentationCatalogItem* item); - virtual QStringList fullTextSearchLocations(); + virtual TQStringList fullTextSearchLocations(); - virtual QPair<KFile::Mode, QString> catalogLocatorProps(); - virtual QString catalogTitle(const QString& url); + virtual QPair<KFile::Mode, TQString> catalogLocatorProps(); + virtual TQString catalogTitle(const TQString& url); virtual void autoSetupPlugin(); diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp index 95c404ae..11c2b6a7 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp @@ -21,10 +21,10 @@ #include <unistd.h> -#include <qdom.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qdialog.h> +#include <tqdom.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqdialog.h> #include <kurl.h> #include <kaboutdata.h> @@ -40,32 +40,32 @@ class DevHelpDocumentationCatalogItem: public DocumentationCatalogItem { public: - DevHelpDocumentationCatalogItem(const QString &devHelpFile, DocumentationPlugin* plugin, - KListView *parent, const QString &name) + DevHelpDocumentationCatalogItem(const TQString &devHelpFile, DocumentationPlugin* plugin, + KListView *parent, const TQString &name) :DocumentationCatalogItem(plugin, parent, name), m_devHelpFile(devHelpFile) { } - DevHelpDocumentationCatalogItem(const QString &devHelpFile, DocumentationPlugin* plugin, - DocumentationItem *parent, const QString &name) + DevHelpDocumentationCatalogItem(const TQString &devHelpFile, DocumentationPlugin* plugin, + DocumentationItem *parent, const TQString &name) :DocumentationCatalogItem(plugin, parent, name), m_devHelpFile(devHelpFile) { } - QString devHelpFile() const { return m_devHelpFile; } + TQString devHelpFile() const { return m_devHelpFile; } - virtual QString cacheVersion() const { + virtual TQString cacheVersion() const { unsigned int checksum=0; for(int a=0;a<m_devHelpFile.length(); a++) { checksum += (a+1) * (int)m_devHelpFile[a]; } - QString str; - QTextOStream( &str ) << checksum; + TQString str; + TQTextOStream( &str ) << checksum; return str; } protected: private: - QString m_devHelpFile; + TQString m_devHelpFile; }; @@ -73,8 +73,8 @@ static const KDevPluginInfo data("docdevhelpplugin"); typedef KDevGenericFactory<DocDevHelpPlugin> DocDevHelpPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdevhelpplugin, DocDevHelpPluginFactory(data) ) -DocDevHelpPlugin::DocDevHelpPlugin(QObject* parent, const char* name, - const QStringList /*args*/) +DocDevHelpPlugin::DocDevHelpPlugin(TQObject* parent, const char* name, + const TQStringList /*args*/) :DocumentationPlugin(DocDevHelpPluginFactory::instance()->config(), parent, name) { setCapabilities(Index | FullTextSearch | ProjectDocumentation); @@ -85,55 +85,55 @@ DocDevHelpPlugin::~DocDevHelpPlugin() { } -DocumentationCatalogItem* DocDevHelpPlugin::createCatalog(KListView* contents, const QString& title, const QString& url) +DocumentationCatalogItem* DocDevHelpPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url) { return new DevHelpDocumentationCatalogItem(url, this, contents, title); } -QPair<KFile::Mode, QString> DocDevHelpPlugin::catalogLocatorProps() +QPair<KFile::Mode, TQString> DocDevHelpPlugin::catalogLocatorProps() { - return QPair<KFile::Mode, QString>(KFile::File, "*.devhelp"); + return QPair<KFile::Mode, TQString>(KFile::File, "*.devhelp"); } -QString DocDevHelpPlugin::catalogTitle(const QString& url) +TQString DocDevHelpPlugin::catalogTitle(const TQString& url) { - QFileInfo fi(url); + TQFileInfo fi(url); if (!fi.exists()) - return QString::null; + return TQString::null; - QFile f(url); + TQFile f(url); if (!f.open(IO_ReadOnly)) - return QString::null; + return TQString::null; - QDomDocument doc; + TQDomDocument doc; if (!doc.setContent(&f)) - return QString::null; + return TQString::null; f.close(); - QDomElement docEl = doc.documentElement(); + TQDomElement docEl = doc.documentElement(); - return docEl.attribute("title", QString::null); + return docEl.attribute("title", TQString::null); } -QString DocDevHelpPlugin::pluginName() const +TQString DocDevHelpPlugin::pluginName() const { return i18n("Devhelp Documentation Collection"); } -QStringList DocDevHelpPlugin::fullTextSearchLocations() +TQStringList DocDevHelpPlugin::fullTextSearchLocations() { - QStringList locs; + TQStringList locs; - QMap<QString, QString> entryMap = config->entryMap("Locations"); + TQMap<TQString, TQString> entryMap = config->entryMap("Locations"); - for (QMap<QString, QString>::const_iterator it = entryMap.begin(); + for (TQMap<TQString, TQString>::const_iterator it = entryMap.begin(); it != entryMap.end(); ++it) { config->setGroup("Search Settings"); if (config->readBoolEntry(it.key(), false)) { config->setGroup("Locations"); - QFileInfo fi(config->readPathEntry(it.key())); + TQFileInfo fi(config->readPathEntry(it.key())); locs << fi.dirPath(true); } } @@ -147,9 +147,9 @@ bool DocDevHelpPlugin::needRefreshIndex(DocumentationCatalogItem* item) if (!dhItem) return false; - QFileInfo fi(dhItem->devHelpFile()); + TQFileInfo fi(dhItem->devHelpFile()); config->setGroup("Index"); - if (fi.lastModified() > config->readDateTimeEntry(dhItem->text(0), new QDateTime())) + if (fi.lastModified() > config->readDateTimeEntry(dhItem->text(0), new TQDateTime())) { kdDebug() << "need rebuild index for " << dhItem->text(0) << endl; config->writeEntry(item->text(0), fi.lastModified()); @@ -161,16 +161,16 @@ bool DocDevHelpPlugin::needRefreshIndex(DocumentationCatalogItem* item) void DocDevHelpPlugin::autoSetupPlugin() { - QValueStack<QString> scanStack; + TQValueStack<TQString> scanStack; pushToScanStack(scanStack, getenv("DEVHELP_SEARCH_PATH")); - pushToScanStack(scanStack, QString(getenv("HOME")) + "/.devhelp/books"); + pushToScanStack(scanStack, TQString(getenv("HOME")) + "/.devhelp/books"); - QString dhexepath = DocDevHelpPluginFactory::instance()->dirs()->findExe("devhelp"); + TQString dhexepath = DocDevHelpPluginFactory::instance()->dirs()->findExe("devhelp"); if (!dhexepath.isEmpty()) { - QFileInfo fi(dhexepath); - QString path = KURL(fi.dirPath(true)).upURL().path(1); + TQFileInfo fi(dhexepath); + TQString path = KURL(fi.dirPath(true)).upURL().path(1); pushToScanStack(scanStack, path + "share/devhelp/books"); pushToScanStack(scanStack, path + "share/gtk-doc/html"); } @@ -185,8 +185,8 @@ void DocDevHelpPlugin::autoSetupPlugin() pushToScanStack(scanStack, "/opt/gnome2/share/gtk-doc/html"); //fill the list of scan dirs (with subdirectories) - QStringList scanList; - QDir dir; + TQStringList scanList; + TQDir dir; do { dir.setPath(scanStack.pop()); @@ -196,13 +196,13 @@ void DocDevHelpPlugin::autoSetupPlugin() const QFileInfoList *dirEntries = dir.entryInfoList(); if ( !dirEntries ) continue; - QPtrListIterator<QFileInfo> it(*dirEntries); + TQPtrListIterator<TQFileInfo> it(*dirEntries); for (; it.current(); ++it) { - QString fileName = it.current()->fileName(); + TQString fileName = it.current()->fileName(); if (fileName == "." || fileName == "..") continue; - QString path = it.current()->absFilePath(); + TQString path = it.current()->absFilePath(); if (it.current()->isDir()) { scanStack.push(path); @@ -210,23 +210,23 @@ void DocDevHelpPlugin::autoSetupPlugin() } } while (!scanStack.isEmpty()); - for (QStringList::const_iterator it = scanList.begin(); it != scanList.end(); ++it) + for (TQStringList::const_iterator it = scanList.begin(); it != scanList.end(); ++it) { scanDevHelpDir(*it); } } -void DocDevHelpPlugin::scanDevHelpDir(const QString &path) +void DocDevHelpPlugin::scanDevHelpDir(const TQString &path) { - QDir d(path); + TQDir d(path); if (! d.exists() || !d.isReadable()) return; - d.setFilter(QDir::Files); + d.setFilter(TQDir::Files); //scan for *.devhelp files const QFileInfoList *list = d.entryInfoList(); QFileInfoListIterator it( *list ); - QFileInfo *fi; + TQFileInfo *fi; while ( (fi = it.current()) != 0 ) { if (fi->extension() == "devhelp") @@ -238,7 +238,7 @@ void DocDevHelpPlugin::scanDevHelpDir(const QString &path) } } -void DocDevHelpPlugin::pushToScanStack(QValueStack<QString> &stack, const QString &value) +void DocDevHelpPlugin::pushToScanStack(TQValueStack<TQString> &stack, const TQString &value) { if ( (!value.isEmpty()) && (!stack.contains(value)) ) { @@ -253,16 +253,16 @@ void DocDevHelpPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it if (!dhItem) return; - QFileInfo fi(dhItem->devHelpFile()); + TQFileInfo fi(dhItem->devHelpFile()); - QFile f(dhItem->devHelpFile()); + TQFile f(dhItem->devHelpFile()); if (!f.open(IO_ReadOnly)) { kdDebug(9002) << "Could not read" << dhItem->devHelpFile() << endl; return; } - QDomDocument doc; + TQDomDocument doc; if (!doc.setContent(&f)) { kdDebug() << "Not a valid devhelp file: " << dhItem->devHelpFile() << endl; @@ -270,17 +270,17 @@ void DocDevHelpPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it } f.close(); - QString baseUrl = KURL(dhItem->devHelpFile()).directory(); + TQString baseUrl = KURL(dhItem->devHelpFile()).directory(); - QDomElement docEl = doc.documentElement(); - QDomElement chaptersEl = docEl.namedItem("functions").toElement(); - QDomElement childEl = chaptersEl.firstChild().toElement(); + TQDomElement docEl = doc.documentElement(); + TQDomElement chaptersEl = docEl.namedItem("functions").toElement(); + TQDomElement childEl = chaptersEl.firstChild().toElement(); while (!childEl.isNull()) { if (childEl.tagName() == "function") { - QString name = childEl.attribute("name"); - QString url = childEl.attribute("link"); + TQString name = childEl.attribute("name"); + TQString url = childEl.attribute("link"); IndexItemProto *ii = new IndexItemProto(this, item, index, name, item->text(0)); ii->addURL(KURL(baseUrl+"/"+url)); @@ -295,16 +295,16 @@ void DocDevHelpPlugin::createTOC(DocumentationCatalogItem* item) if (!dhItem) return; - QFileInfo fi(dhItem->devHelpFile()); + TQFileInfo fi(dhItem->devHelpFile()); - QFile f(dhItem->devHelpFile()); + TQFile f(dhItem->devHelpFile()); if (!f.open(IO_ReadOnly)) { kdDebug(9002) << "Could not read" << dhItem->devHelpFile() << endl; return; } - QDomDocument doc; + TQDomDocument doc; if (!doc.setContent(&f)) { kdDebug() << "Not a valid devhelp file: " << dhItem->devHelpFile() << endl; @@ -312,23 +312,23 @@ void DocDevHelpPlugin::createTOC(DocumentationCatalogItem* item) } f.close(); - QDomElement docEl = doc.documentElement(); - QDomElement chaptersEl = docEl.namedItem("chapters").toElement(); + TQDomElement docEl = doc.documentElement(); + TQDomElement chaptersEl = docEl.namedItem("chapters").toElement(); - QDomElement childEl = chaptersEl.lastChild().toElement(); - QString baseUrl = KURL(dhItem->devHelpFile()).directory(); + TQDomElement childEl = chaptersEl.lastChild().toElement(); + TQString baseUrl = KURL(dhItem->devHelpFile()).directory(); addTocSect(dhItem, childEl, baseUrl, true); } -void DocDevHelpPlugin::addTocSect(DocumentationItem *parent, QDomElement childEl, - QString baseUrl, bool book) +void DocDevHelpPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, + TQString baseUrl, bool book) { while (!childEl.isNull()) { if ( (childEl.tagName() == "sub") || (childEl.tagName() == "chapter")) { - QString name = childEl.attribute("name"); - QString url = childEl.attribute("link"); + TQString name = childEl.attribute("name"); + TQString url = childEl.attribute("link"); if (name.isEmpty() && url.contains("ix")) name = "Index"; @@ -337,7 +337,7 @@ void DocDevHelpPlugin::addTocSect(DocumentationItem *parent, QDomElement childEl book ? DocumentationItem::Book : DocumentationItem::Document, parent, name); item->setURL(KURL(baseUrl+"/"+url)); - QDomElement grandchildEl = childEl.lastChild().toElement(); + TQDomElement grandchildEl = childEl.lastChild().toElement(); addTocSect(item, grandchildEl, baseUrl); } childEl = childEl.previousSibling().toElement(); @@ -350,15 +350,15 @@ void DocDevHelpPlugin::setCatalogURL(DocumentationCatalogItem* item) if (!dhItem) return; - QFileInfo fi(dhItem->devHelpFile()); + TQFileInfo fi(dhItem->devHelpFile()); - QFile f(dhItem->devHelpFile()); + TQFile f(dhItem->devHelpFile()); if (!f.open(IO_ReadOnly)) { kdDebug(9002) << "Could not read" << dhItem->devHelpFile() << endl; return; } - QDomDocument doc; + TQDomDocument doc; if (!doc.setContent(&f)) { kdDebug(9002) << "Not a valid Devhelp file: " << dhItem->devHelpFile() << endl; @@ -366,12 +366,12 @@ void DocDevHelpPlugin::setCatalogURL(DocumentationCatalogItem* item) } f.close(); - QDomElement docEl = doc.documentElement(); - QDomElement titleEl = docEl.namedItem("book").toElement(); + TQDomElement docEl = doc.documentElement(); + TQDomElement titleEl = docEl.namedItem("book").toElement(); if (item->url().isEmpty()) { - KURL url(fi.dirPath(true) + "/" + docEl.attribute("link", QString::null)); + KURL url(fi.dirPath(true) + "/" + docEl.attribute("link", TQString::null)); item->setURL(url); } } diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.h b/parts/documentation/plugins/devhelp/docdevhelpplugin.h index 3d73cb63..9e4df5c2 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.h +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.h @@ -20,8 +20,8 @@ #ifndef DOCDEVHELPPLUGIN_H #define DOCDEVHELPPLUGIN_H -#include <qvaluestack.h> -#include <qdom.h> +#include <tqvaluestack.h> +#include <tqdom.h> #include <kdevdocumentationplugin.h> @@ -29,32 +29,32 @@ class DocDevHelpPlugin: public DocumentationPlugin { Q_OBJECT public: - DocDevHelpPlugin(QObject* parent, const char* name, const QStringList args = QStringList()); + DocDevHelpPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~DocDevHelpPlugin(); - virtual QString pluginName() const; + virtual TQString pluginName() const; - virtual QString catalogTitle(const QString& url); + virtual TQString catalogTitle(const TQString& url); virtual void setCatalogURL(DocumentationCatalogItem* item); virtual void createTOC(DocumentationCatalogItem* item); - virtual DocumentationCatalogItem* createCatalog(KListView* contents, const QString& title, const QString& url); + virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url); virtual bool needRefreshIndex(DocumentationCatalogItem* item); virtual void createIndex(IndexBox* index, DocumentationCatalogItem* item); - virtual QStringList fullTextSearchLocations(); + virtual TQStringList fullTextSearchLocations(); virtual void autoSetupPlugin(); - virtual QPair<KFile::Mode, QString> catalogLocatorProps(); + virtual QPair<KFile::Mode, TQString> catalogLocatorProps(); virtual ProjectDocumentationPlugin *projectDocumentationPlugin(ProjectDocType type); protected: - void pushToScanStack(QValueStack<QString> &stack, const QString &value); - void scanDevHelpDir(const QString &path); - void addTocSect(DocumentationItem *parent, QDomElement childEl, QString baseUrl, bool book=false); + void pushToScanStack(TQValueStack<TQString> &stack, const TQString &value); + void scanDevHelpDir(const TQString &path); + void addTocSect(DocumentationItem *parent, TQDomElement childEl, TQString baseUrl, bool book=false); }; #endif diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp index 2dcaae62..f9761155 100644 --- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp +++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp @@ -31,7 +31,7 @@ static const KAboutData data("docdjvuplugin", I18N_NOOP("Djvu documentation plug typedef KDevGenericFactory<DocDjvuPlugin> DocDjvuPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdjvuplugin, DocDjvuPluginFactory(&data) ) -DocDjvuPlugin::DocDjvuPlugin(QObject* parent, const char* name, const QStringList args) +DocDjvuPlugin::DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args) :DocumentationPlugin(DocDjvuPluginFactory::instance()->config(), parent, name) { setCapabilities(CustomDocumentationTitles | ProjectUserManual); @@ -47,31 +47,31 @@ bool DocDjvuPlugin::needRefreshIndex(DocumentationCatalogItem* item) return false; } -QString DocDjvuPlugin::pluginName() const +TQString DocDjvuPlugin::pluginName() const { return i18n("Djvu Documentation Collection"); } -DocumentationCatalogItem* DocDjvuPlugin::createCatalog(KListView* contents, const QString& title, const QString& url) +DocumentationCatalogItem* DocDjvuPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url) { DocumentationCatalogItem *item = new DocumentationCatalogItem(this, contents, title); item->setURL(KURL(url)); return item; } -QPair<KFile::Mode, QString> DocDjvuPlugin::catalogLocatorProps() +QPair<KFile::Mode, TQString> DocDjvuPlugin::catalogLocatorProps() { - return QPair<KFile::Mode, QString>(KFile::File, "all/allfiles"); + return QPair<KFile::Mode, TQString>(KFile::File, "all/allfiles"); } -QString DocDjvuPlugin::catalogTitle(const QString& /*url*/) +TQString DocDjvuPlugin::catalogTitle(const TQString& /*url*/) { - return QString::null; + return TQString::null; } -QStringList DocDjvuPlugin::fullTextSearchLocations() +TQStringList DocDjvuPlugin::fullTextSearchLocations() { - return QStringList(); + return TQStringList(); } diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.h b/parts/documentation/plugins/djvu/docdjvuplugin.h index e9fdb30a..05689bd8 100644 --- a/parts/documentation/plugins/djvu/docdjvuplugin.h +++ b/parts/documentation/plugins/djvu/docdjvuplugin.h @@ -24,12 +24,12 @@ class DocDjvuPlugin : public DocumentationPlugin { public: - DocDjvuPlugin(QObject* parent, const char* name, const QStringList args = QStringList()); + DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~DocDjvuPlugin(); - virtual QString pluginName() const; + virtual TQString pluginName() const; - virtual DocumentationCatalogItem* createCatalog(KListView* contents, const QString& title, const QString& url); + virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url); virtual void createTOC(DocumentationCatalogItem* item); virtual void setCatalogURL(DocumentationCatalogItem* item); @@ -37,10 +37,10 @@ public: virtual bool needRefreshIndex(DocumentationCatalogItem* item); virtual void createIndex(IndexBox* index, DocumentationCatalogItem* item); - virtual QStringList fullTextSearchLocations(); + virtual TQStringList fullTextSearchLocations(); - virtual QPair<KFile::Mode, QString> catalogLocatorProps(); - virtual QString catalogTitle(const QString& url); + virtual QPair<KFile::Mode, TQString> catalogLocatorProps(); + virtual TQString catalogTitle(const TQString& url); virtual void autoSetupPlugin(); diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp index 3fa7d5cb..a92eb60f 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp @@ -21,12 +21,12 @@ #include <unistd.h> -#include <qdom.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qdialog.h> -#include <qregexp.h> -#include <qvaluestack.h> +#include <tqdom.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqdialog.h> +#include <tqregexp.h> +#include <tqvaluestack.h> #include <kurl.h> #include <kaboutdata.h> @@ -43,20 +43,20 @@ class DoxyDocumentationCatalogItem: public DocumentationCatalogItem { public: - DoxyDocumentationCatalogItem(const QString &origUrl, DocumentationPlugin* plugin, - KListView *parent, const QString &name) + DoxyDocumentationCatalogItem(const TQString &origUrl, DocumentationPlugin* plugin, + KListView *parent, const TQString &name) :DocumentationCatalogItem(plugin, parent, name), m_origUrl(origUrl) { } - DoxyDocumentationCatalogItem(const QString &origUrl, DocumentationPlugin* plugin, - DocumentationItem *parent, const QString &name) + DoxyDocumentationCatalogItem(const TQString &origUrl, DocumentationPlugin* plugin, + DocumentationItem *parent, const TQString &name) :DocumentationCatalogItem(plugin, parent, name), m_origUrl(origUrl) { } - QString origUrl() const { return m_origUrl; } + TQString origUrl() const { return m_origUrl; } private: - QString m_origUrl; + TQString m_origUrl; }; @@ -64,7 +64,7 @@ static const KDevPluginInfo data("docdoxygenplugin"); typedef KDevGenericFactory<DocDoxygenPlugin> DocDoxygenPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdoxygenplugin, DocDoxygenPluginFactory(data) ) -DocDoxygenPlugin::DocDoxygenPlugin(QObject* parent, const char* name, const QStringList) +DocDoxygenPlugin::DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList) :DocumentationPlugin(DocDoxygenPluginFactory::instance()->config(), parent, name) { setCapabilities(Index | FullTextSearch | ProjectDocumentation | CustomDocumentationTitles ); @@ -75,71 +75,71 @@ DocDoxygenPlugin::~DocDoxygenPlugin() { } -QPair<KFile::Mode, QString> DocDoxygenPlugin::catalogLocatorProps() +QPair<KFile::Mode, TQString> DocDoxygenPlugin::catalogLocatorProps() { - return QPair<KFile::Mode, QString>(KFile::File, "index.html *.tag"); + return QPair<KFile::Mode, TQString>(KFile::File, "index.html *.tag"); } -QString DocDoxygenPlugin::catalogTitle(const QString& url) +TQString DocDoxygenPlugin::catalogTitle(const TQString& url) { - QFileInfo fi(url); + TQFileInfo fi(url); if (!fi.exists()) - return QString::null; + return TQString::null; if (fi.extension(false) == "html") { - QFile f(url); + TQFile f(url); if (!f.open(IO_ReadOnly)) - return QString::null; + return TQString::null; - QTextStream ts(&f); - QString contents = ts.read(); - QRegExp re(".*<title>(.*)</title>.*"); + TQTextStream ts(&f); + TQString contents = ts.read(); + TQRegExp re(".*<title>(.*)</title>.*"); re.setCaseSensitive(false); re.search(contents); return re.cap(1); } else if (fi.extension(false) == "tag") { - QFile *f = 0; - QFile f1(fi.dirPath(true) + "/html/index.html"); + TQFile *f = 0; + TQFile f1(fi.dirPath(true) + "/html/index.html"); if (f1.open(IO_ReadOnly)) f = &f1; - QFile f2(fi.dirPath(true) + "/index.html"); + TQFile f2(fi.dirPath(true) + "/index.html"); if (f2.open(IO_ReadOnly)) f = &f2; if (f != 0) { - QTextStream ts(f); - QString contents = ts.read(); - QRegExp re(".*<title>(.*)</title>.*"); + TQTextStream ts(f); + TQString contents = ts.read(); + TQRegExp re(".*<title>(.*)</title>.*"); re.setCaseSensitive(false); re.search(contents); return re.cap(1); } } - return QString::null; + return TQString::null; } -QString DocDoxygenPlugin::pluginName() const +TQString DocDoxygenPlugin::pluginName() const { return i18n("Doxygen Documentation Collection"); } -QStringList DocDoxygenPlugin::fullTextSearchLocations() +TQStringList DocDoxygenPlugin::fullTextSearchLocations() { - QStringList locs; + TQStringList locs; - QMap<QString, QString> entryMap = config->entryMap("Locations"); + TQMap<TQString, TQString> entryMap = config->entryMap("Locations"); - for (QMap<QString, QString>::const_iterator it = entryMap.begin(); + for (TQMap<TQString, TQString>::const_iterator it = entryMap.begin(); it != entryMap.end(); ++it) { config->setGroup("Search Settings"); if (config->readBoolEntry(it.key(), false)) { config->setGroup("Locations"); - QFileInfo fi(config->readPathEntry(it.key())); + TQFileInfo fi(config->readPathEntry(it.key())); locs << fi.dirPath(true); } } @@ -151,13 +151,13 @@ void DocDoxygenPlugin::setCatalogURL(DocumentationCatalogItem* item) { if (item->url().url().endsWith("tag")) { - QFileInfo fi(item->url().directory(false) + "html/index.html"); + TQFileInfo fi(item->url().directory(false) + "html/index.html"); if (fi.exists()) { item->setURL(KURL::fromPathOrURL(fi.absFilePath())); return; } - QFileInfo fi2(item->url().directory(false) + "index.html"); + TQFileInfo fi2(item->url().directory(false) + "index.html"); if (fi2.exists()) { item->setURL(KURL::fromPathOrURL(fi2.absFilePath())); @@ -173,9 +173,9 @@ bool DocDoxygenPlugin::needRefreshIndex(DocumentationCatalogItem* item) if (!doxyItem) return false; - QFileInfo fi(doxyItem->origUrl()); + TQFileInfo fi(doxyItem->origUrl()); config->setGroup("Index"); - if (fi.lastModified() > config->readDateTimeEntry(item->text(0), new QDateTime())) + if (fi.lastModified() > config->readDateTimeEntry(item->text(0), new TQDateTime())) { kdDebug() << "need rebuild index for " << item->text(0) << endl; config->writeEntry(item->text(0), fi.lastModified()); @@ -192,19 +192,19 @@ void DocDoxygenPlugin::autoSetupPlugin() } -void DocDoxygenPlugin::autoSetupDocs(const QString &defaultDir, const QString &searchDir, - const QString &name) +void DocDoxygenPlugin::autoSetupDocs(const TQString &defaultDir, const TQString &searchDir, + const TQString &name) { - QString doxyDocDir(defaultDir); + TQString doxyDocDir(defaultDir); doxyDocDir = URLUtil::envExpand(doxyDocDir); if (doxyDocDir.isEmpty()) { - QStringList apiDirs = DocDoxygenPluginFactory::instance()->dirs()->findDirs("html", searchDir); - for (QStringList::const_iterator it = apiDirs.begin(); it != apiDirs.end(); ++it ) + TQStringList apiDirs = DocDoxygenPluginFactory::instance()->dirs()->findDirs("html", searchDir); + for (TQStringList::const_iterator it = apiDirs.begin(); it != apiDirs.end(); ++it ) { doxyDocDir = *it; - QString indexFile = doxyDocDir + "index.html"; - if (QFile::exists(indexFile)) + TQString indexFile = doxyDocDir + "index.html"; + if (TQFile::exists(indexFile)) { doxyDocDir = doxyDocDir + "/" + searchDir; break; @@ -219,13 +219,13 @@ void DocDoxygenPlugin::autoSetupDocs(const QString &defaultDir, const QString &s config->setGroup("Index Settings"); config->writeEntry(name, true); config->setGroup("Locations"); - config->writePathEntry(name, doxyDocDir + QString("/index.html")); + config->writePathEntry(name, doxyDocDir + TQString("/index.html")); } } void DocDoxygenPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* item) { - QFileInfo fi(item->url().path()); + TQFileInfo fi(item->url().path()); if (!fi.exists()) return; @@ -236,11 +236,11 @@ void DocDoxygenPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it //doxygen documentation mode (if catalog points to a .tag) if (doxyItem->origUrl().endsWith("tag")) { - QString htmlUrl; - QFileInfo fi2(item->url().directory(false) + "index.html"); + TQString htmlUrl; + TQFileInfo fi2(item->url().directory(false) + "index.html"); if (fi2.exists()) htmlUrl = fi2.dirPath(true) + "/"; - QFileInfo fi(item->url().directory(false) + "html/index.html"); + TQFileInfo fi(item->url().directory(false) + "html/index.html"); if (fi.exists()) htmlUrl = fi.dirPath(true) + "/"; @@ -248,8 +248,8 @@ void DocDoxygenPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it } //KDE doxygen documentation mode (if catalog points to a index.html) - QDir d; - QValueStack<QString> dirStack; + TQDir d; + TQValueStack<TQString> dirStack; dirStack.push(fi.dirPath(true)); do { d.setPath(dirStack.pop()); @@ -258,24 +258,24 @@ void DocDoxygenPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it const QFileInfoList *dirEntries = d.entryInfoList(); if (!dirEntries) continue; - QPtrListIterator<QFileInfo> it(*dirEntries); + TQPtrListIterator<TQFileInfo> it(*dirEntries); for (; it.current(); ++it) { - QString fileName = it.current()->fileName(); + TQString fileName = it.current()->fileName(); if (fileName == "." || fileName == ".." || fileName == "common" || fileName == "html") continue; if (it.current()->isDir()) dirStack.push(it.current()->absFilePath()); } - if (QFile::exists(d.absPath() + "/html/index.html")) + if (TQFile::exists(d.absPath() + "/html/index.html")) createBookIndex(d.absPath() + "/" + d.dirName() + ".tag", index, item); } while (!dirStack.isEmpty()); } void DocDoxygenPlugin::createTOC(DocumentationCatalogItem* item) { - QFileInfo fi(item->url().path()); + TQFileInfo fi(item->url().path()); if (!fi.exists()) return; @@ -286,11 +286,11 @@ void DocDoxygenPlugin::createTOC(DocumentationCatalogItem* item) //doxygen documentation mode (if catalog points to a .tag) if (doxyItem->origUrl().endsWith("tag")) { - QString htmlUrl; - QFileInfo fi2(item->url().directory(false) + "index.html"); + TQString htmlUrl; + TQFileInfo fi2(item->url().directory(false) + "index.html"); if (fi2.exists()) htmlUrl = fi2.dirPath(true) + "/"; - QFileInfo fi(item->url().directory(false) + "html/index.html"); + TQFileInfo fi(item->url().directory(false) + "html/index.html"); if (fi.exists()) htmlUrl = fi.dirPath(true) + "/"; if (!htmlUrl.isEmpty()) @@ -298,8 +298,8 @@ void DocDoxygenPlugin::createTOC(DocumentationCatalogItem* item) } //KDE doxygen documentation mode (if catalog points to a index.html) - QDir d; - QValueStack<QString> dirStack; + TQDir d; + TQValueStack<TQString> dirStack; dirStack.push(fi.dirPath(true)); do { d.setPath(dirStack.pop()); @@ -308,17 +308,17 @@ void DocDoxygenPlugin::createTOC(DocumentationCatalogItem* item) const QFileInfoList *dirEntries = d.entryInfoList(); if (!dirEntries) continue; - QPtrListIterator<QFileInfo> it(*dirEntries); + TQPtrListIterator<TQFileInfo> it(*dirEntries); for (; it.current(); ++it) { - QString fileName = it.current()->fileName(); + TQString fileName = it.current()->fileName(); if (fileName == "." || fileName == ".." || fileName == "common" || fileName == "html") continue; if (it.current()->isDir()) dirStack.push(it.current()->absFilePath()); } - if (QFile::exists(d.absPath() + "/html/index.html")) + if (TQFile::exists(d.absPath() + "/html/index.html")) { DocumentationItem *docItem = new DocumentationItem(DocumentationItem::Book, item, d.dirName()); docItem->setURL(KURL(d.absPath() + "/html/index.html")); @@ -328,7 +328,7 @@ void DocDoxygenPlugin::createTOC(DocumentationCatalogItem* item) } while (!dirStack.isEmpty()); } -DocumentationCatalogItem *DocDoxygenPlugin::createCatalog(KListView *contents, const QString &title, const QString &url) +DocumentationCatalogItem *DocDoxygenPlugin::createCatalog(KListView *contents, const TQString &title, const TQString &url) { kdDebug() << "DocDoxygenPlugin::createCatalog: url=" << url << endl; DocumentationCatalogItem *item = new DoxyDocumentationCatalogItem(url, this, contents, title); @@ -336,41 +336,41 @@ DocumentationCatalogItem *DocDoxygenPlugin::createCatalog(KListView *contents, c return item; } -void DocDoxygenPlugin::createBookTOC(DocumentationItem *item, const QString &tagUrl, const QString &baseHtmlUrl) +void DocDoxygenPlugin::createBookTOC(DocumentationItem *item, const TQString &tagUrl, const TQString &baseHtmlUrl) { - QString tagName; + TQString tagName; if (tagUrl.isEmpty()) tagName = item->url().upURL().directory(false) + item->text(0) + ".tag"; else tagName = tagUrl; - QString baseUrl; + TQString baseUrl; if (baseHtmlUrl.isEmpty()) baseUrl = item->url().directory(false); else baseUrl = baseHtmlUrl; //@todo list html files in the directory if tag was not found - if (!QFile::exists(tagName)) + if (!TQFile::exists(tagName)) return; - QStringList tagFileList; + TQStringList tagFileList; if (tagName.endsWith(".tag")) - tagFileList = tagFiles(QFileInfo(tagName).dirPath() + "/"); + tagFileList = tagFiles(TQFileInfo(tagName).dirPath() + "/"); else tagFileList += tagName; - QStringList::ConstIterator end = tagFileList.constEnd(); - for (QStringList::ConstIterator it = tagFileList.constBegin(); it != end; ++it) + TQStringList::ConstIterator end = tagFileList.constEnd(); + for (TQStringList::ConstIterator it = tagFileList.constBegin(); it != end; ++it) { - QFile f(*it); + TQFile f(*it); if (!f.open(IO_ReadOnly)) { kdDebug(9002) << "Could not open tag file: " << f.name() << endl; return; } - QDomDocument dom; + TQDomDocument dom; if (!dom.setContent(&f) || dom.documentElement().nodeName() != "tagfile") { kdDebug(9002) << "No valid tag file" << endl; @@ -378,17 +378,17 @@ void DocDoxygenPlugin::createBookTOC(DocumentationItem *item, const QString &tag } f.close(); - QDomElement docEl = dom.documentElement(); + TQDomElement docEl = dom.documentElement(); - QDomElement childEl = docEl.lastChild().toElement(); + TQDomElement childEl = docEl.lastChild().toElement(); while (!childEl.isNull()) { if (childEl.tagName() == "compound" && childEl.attribute("kind") == "class") { - QString classname = childEl.namedItem("name").firstChild().toText().data(); - QString filename = childEl.namedItem("filename").firstChild().toText().data(); + TQString classname = childEl.namedItem("name").firstChild().toText().data(); + TQString filename = childEl.namedItem("filename").firstChild().toText().data(); - if (QFile::exists(baseUrl + filename)) + if (TQFile::exists(baseUrl + filename)) { DocumentationItem *docItem = new DocumentationItem(DocumentationItem::Document, item, classname); @@ -400,27 +400,27 @@ void DocDoxygenPlugin::createBookTOC(DocumentationItem *item, const QString &tag } } -void DocDoxygenPlugin::createBookIndex(const QString &tagfile, IndexBox* index, DocumentationCatalogItem* item, const QString &baseHtmlUrl) +void DocDoxygenPlugin::createBookIndex(const TQString &tagfile, IndexBox* index, DocumentationCatalogItem* item, const TQString &baseHtmlUrl) { - QString tagName = tagfile; + TQString tagName = tagfile; kdDebug() << tagfile << endl; - if (!QFile::exists(tagName)) + if (!TQFile::exists(tagName)) return; - QString prefix = baseHtmlUrl.isEmpty() ? KURL(tagfile).directory(false) + "html/" : baseHtmlUrl; + TQString prefix = baseHtmlUrl.isEmpty() ? KURL(tagfile).directory(false) + "html/" : baseHtmlUrl; - QStringList tagFileList = tagFiles(QFileInfo(tagName).dirPath() + "/"); + TQStringList tagFileList = tagFiles(TQFileInfo(tagName).dirPath() + "/"); - QStringList::ConstIterator end = tagFileList.constEnd(); - for (QStringList::ConstIterator it = tagFileList.constBegin(); it != end; ++it) + TQStringList::ConstIterator end = tagFileList.constEnd(); + for (TQStringList::ConstIterator it = tagFileList.constBegin(); it != end; ++it) { - QFile f(*it); + TQFile f(*it); if (!f.open(IO_ReadOnly)) { kdDebug(9002) << "Could not open tag file: " << f.name() << endl; return; } - QDomDocument dom; + TQDomDocument dom; if (!dom.setContent(&f) || dom.documentElement().nodeName() != "tagfile") { kdDebug(9002) << "No valid tag file" << endl; @@ -428,17 +428,17 @@ void DocDoxygenPlugin::createBookIndex(const QString &tagfile, IndexBox* index, } f.close(); - QDomElement docEl = dom.documentElement(); + TQDomElement docEl = dom.documentElement(); createIndexFromTag(dom, index, item, docEl, prefix); } } -void DocDoxygenPlugin::createIndexFromTag(QDomDocument &dom, IndexBox *index, - DocumentationCatalogItem *item, QDomElement &parentEl, const QString &prefix) +void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index, + DocumentationCatalogItem *item, TQDomElement &parentEl, const TQString &prefix) { - QDomElement docEl = parentEl; + TQDomElement docEl = parentEl; - QDomElement childEl = docEl.firstChild().toElement(); + TQDomElement childEl = docEl.firstChild().toElement(); while (!childEl.isNull()) { if (childEl.tagName() == "compound" && @@ -446,8 +446,8 @@ void DocDoxygenPlugin::createIndexFromTag(QDomDocument &dom, IndexBox *index, || (childEl.attribute("kind") == "struct") || (childEl.attribute("kind") == "namespace") )) { - QString classname = childEl.namedItem("name").firstChild().toText().data(); - QString filename = childEl.namedItem("filename").firstChild().toText().data(); + TQString classname = childEl.namedItem("name").firstChild().toText().data(); + TQString filename = childEl.namedItem("filename").firstChild().toText().data(); IndexItemProto *indexItem = new IndexItemProto(this, item, index, classname, i18n("%1 Class Reference").arg(classname)); @@ -460,10 +460,10 @@ void DocDoxygenPlugin::createIndexFromTag(QDomDocument &dom, IndexBox *index, || (childEl.attribute("kind") == "slot") || (childEl.attribute("kind") == "signal") )) { - QString classname = parentEl.namedItem("name").firstChild().toText().data(); - QString membername = childEl.namedItem("name").firstChild().toText().data(); - QString anchor = childEl.namedItem("anchor").firstChild().toText().data(); - QString arglist = childEl.namedItem("arglist").firstChild().toText().data(); + TQString classname = parentEl.namedItem("name").firstChild().toText().data(); + TQString membername = childEl.namedItem("name").firstChild().toText().data(); + TQString anchor = childEl.namedItem("anchor").firstChild().toText().data(); + TQString arglist = childEl.namedItem("arglist").firstChild().toText().data(); if (classname != membername) { @@ -482,44 +482,44 @@ ProjectDocumentationPlugin *DocDoxygenPlugin::projectDocumentationPlugin(Project return DocumentationPlugin::projectDocumentationPlugin(type); } -QStringList DocDoxygenPlugin::tagFiles(const QString& path, int level) +TQStringList DocDoxygenPlugin::tagFiles(const TQString& path, int level) { - QStringList r; - QDir dir(path); + TQStringList r; + TQDir dir(path); if (level > 10) return r; if (!dir.isReadable()) return r; if (!dir.exists()) return r; - QStringList dirList; - QStringList fileList; - QStringList::Iterator it; + TQStringList dirList; + TQStringList fileList; + TQStringList::Iterator it; - dir.setFilter ( QDir::Dirs); + dir.setFilter ( TQDir::Dirs); dirList = dir.entryList(); dirList.remove("."); dirList.remove(".."); - dir.setFilter(QDir::Files | QDir::Hidden | QDir::System); + dir.setFilter(TQDir::Files | TQDir::Hidden | TQDir::System); fileList = dir.entryList(); - QStringList::Iterator end = dirList.end(); + TQStringList::Iterator end = dirList.end(); for ( it = dirList.begin(); it != end; ++it ) { - QString name = *it; - if (QFileInfo( dir, *it ).isSymLink()) + TQString name = *it; + if (TQFileInfo( dir, *it ).isSymLink()) continue; r += tagFiles(path + name + "/", level + 1 ); } - QStringList::Iterator fend = fileList.end(); + TQStringList::Iterator fend = fileList.end(); for ( it = fileList.begin(); it != fend; ++it ) { - QString name = *it; - QFileInfo fi( dir, *it ); + TQString name = *it; + TQFileInfo fi( dir, *it ); if (fi.isSymLink() || !fi.isFile()) continue; - if (QDir::match(QString("*.tag"), name)) + if (TQDir::match(TQString("*.tag"), name)) r += (path+name); } diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.h b/parts/documentation/plugins/doxygen/docdoxygenplugin.h index 75d36787..a272b8df 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.h +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.h @@ -29,12 +29,12 @@ class DocDoxygenPlugin: public DocumentationPlugin { Q_OBJECT public: - DocDoxygenPlugin(QObject* parent, const char* name, const QStringList args = QStringList()); + DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~DocDoxygenPlugin(); - virtual QString pluginName() const; + virtual TQString pluginName() const; - virtual DocumentationCatalogItem *createCatalog(KListView *contents, const QString &title, const QString &url); + virtual DocumentationCatalogItem *createCatalog(KListView *contents, const TQString &title, const TQString &url); virtual void createTOC(DocumentationCatalogItem* item); virtual void setCatalogURL(DocumentationCatalogItem* item); @@ -42,25 +42,25 @@ public: virtual bool needRefreshIndex(DocumentationCatalogItem* item); virtual void createIndex(IndexBox* index, DocumentationCatalogItem* item); - virtual QStringList fullTextSearchLocations(); + virtual TQStringList fullTextSearchLocations(); - virtual QPair<KFile::Mode, QString> catalogLocatorProps(); - virtual QString catalogTitle(const QString& url); + virtual QPair<KFile::Mode, TQString> catalogLocatorProps(); + virtual TQString catalogTitle(const TQString& url); virtual void autoSetupPlugin(); virtual ProjectDocumentationPlugin *projectDocumentationPlugin(ProjectDocType type); protected: - void createBookTOC(DocumentationItem* item, const QString &tagUrl = QString::null, - const QString &baseHtmlUrl = QString::null); - void createBookIndex(const QString &tagfile, IndexBox* index, DocumentationCatalogItem* item, const QString &baseHtmlUrl = QString::null); + void createBookTOC(DocumentationItem* item, const TQString &tagUrl = TQString::null, + const TQString &baseHtmlUrl = TQString::null); + void createBookIndex(const TQString &tagfile, IndexBox* index, DocumentationCatalogItem* item, const TQString &baseHtmlUrl = TQString::null); - void createIndexFromTag(QDomDocument &dom, IndexBox* index, DocumentationCatalogItem* item, - QDomElement &parentEl, const QString &prefix); + void createIndexFromTag(TQDomDocument &dom, IndexBox* index, DocumentationCatalogItem* item, + TQDomElement &parentEl, const TQString &prefix); - void autoSetupDocs(const QString &defaultDir, const QString &searchDir, - const QString &name); + void autoSetupDocs(const TQString &defaultDir, const TQString &searchDir, + const TQString &name); /** * Returns all the tag files from a directory and its subdirectories. @@ -68,7 +68,7 @@ protected: * @param level the depth of the current search * @return a list with the absolute path to the ".tag" files in startDir */ - QStringList tagFiles(const QString &startDir, int level = 0); + TQStringList tagFiles(const TQString &startDir, int level = 0); }; diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp index a4480cbf..6dd73707 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp @@ -21,10 +21,10 @@ #include <unistd.h> -#include <qdom.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qdialog.h> +#include <tqdom.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqdialog.h> #include <kurl.h> #include <kaboutdata.h> @@ -42,20 +42,20 @@ class TOCDocumentationCatalogItem: public DocumentationCatalogItem { public: - TOCDocumentationCatalogItem(const QString &tocFile, DocumentationPlugin* plugin, - KListView *parent, const QString &name) + TOCDocumentationCatalogItem(const TQString &tocFile, DocumentationPlugin* plugin, + KListView *parent, const TQString &name) :DocumentationCatalogItem(plugin, parent, name), m_tocFile(tocFile) { } - TOCDocumentationCatalogItem(const QString &tocFile, DocumentationPlugin* plugin, - DocumentationItem *parent, const QString &name) + TOCDocumentationCatalogItem(const TQString &tocFile, DocumentationPlugin* plugin, + DocumentationItem *parent, const TQString &name) :DocumentationCatalogItem(plugin, parent, name), m_tocFile(tocFile) { } - QString tocFile() const { return m_tocFile; } + TQString tocFile() const { return m_tocFile; } private: - QString m_tocFile; + TQString m_tocFile; }; @@ -63,8 +63,8 @@ static const KDevPluginInfo data("dockdevtocplugin"); typedef KDevGenericFactory<DocKDevTOCPlugin> DocKDevTOCPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdockdevtocplugin, DocKDevTOCPluginFactory(data) ) -DocKDevTOCPlugin::DocKDevTOCPlugin(QObject* parent, const char* name, - const QStringList /*args*/) +DocKDevTOCPlugin::DocKDevTOCPlugin(TQObject* parent, const char* name, + const TQStringList /*args*/) :DocumentationPlugin(DocKDevTOCPluginFactory::instance()->config(), parent, name) { setCapabilities(Index); @@ -75,45 +75,45 @@ DocKDevTOCPlugin::~DocKDevTOCPlugin() { } -QString DocKDevTOCPlugin::pluginName() const +TQString DocKDevTOCPlugin::pluginName() const { return i18n("KDevelopTOC Documentation Collection"); } -DocumentationCatalogItem* DocKDevTOCPlugin::createCatalog(KListView* contents, const QString& title, const QString& url) +DocumentationCatalogItem* DocKDevTOCPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url) { return new TOCDocumentationCatalogItem(url, this, contents, title); } -QPair<KFile::Mode, QString> DocKDevTOCPlugin::catalogLocatorProps() +QPair<KFile::Mode, TQString> DocKDevTOCPlugin::catalogLocatorProps() { - return QPair<KFile::Mode, QString>(KFile::File, "*.toc"); + return QPair<KFile::Mode, TQString>(KFile::File, "*.toc"); } -QString DocKDevTOCPlugin::catalogTitle(const QString& url) +TQString DocKDevTOCPlugin::catalogTitle(const TQString& url) { - QFileInfo fi(url); + TQFileInfo fi(url); if (!fi.exists()) - return QString::null; + return TQString::null; - QFile f(url); + TQFile f(url); if (!f.open(IO_ReadOnly)) - return QString::null; + return TQString::null; - QDomDocument doc; + TQDomDocument doc; if (!doc.setContent(&f) || (doc.doctype().name() != "kdeveloptoc")) - return QString::null; + return TQString::null; f.close(); - QDomElement titleEl = doc.documentElement().namedItem("title").toElement(); + TQDomElement titleEl = doc.documentElement().namedItem("title").toElement(); return titleEl.firstChild().toText().data(); } -QStringList DocKDevTOCPlugin::fullTextSearchLocations() +TQStringList DocKDevTOCPlugin::fullTextSearchLocations() { - return QStringList(); + return TQStringList(); } bool DocKDevTOCPlugin::needRefreshIndex(DocumentationCatalogItem* /*item*/) @@ -123,9 +123,9 @@ bool DocKDevTOCPlugin::needRefreshIndex(DocumentationCatalogItem* /*item*/) void DocKDevTOCPlugin::autoSetupPlugin() { - QStringList tocsDir = DocKDevTOCPluginFactory::instance()->dirs()->findAllResources("data", "kdevdocumentation/tocs/*.toc"); + TQStringList tocsDir = DocKDevTOCPluginFactory::instance()->dirs()->findAllResources("data", "kdevdocumentation/tocs/*.toc"); - for (QStringList::const_iterator it = tocsDir.begin(); it != tocsDir.end(); ++it) + for (TQStringList::const_iterator it = tocsDir.begin(); it != tocsDir.end(); ++it) { config->setGroup("Locations"); config->writePathEntry(catalogTitle(*it), *it); @@ -138,15 +138,15 @@ void DocKDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it if (!tocItem) return; - QFileInfo fi(tocItem->tocFile()); + TQFileInfo fi(tocItem->tocFile()); - QFile f(tocItem->tocFile()); + TQFile f(tocItem->tocFile()); if (!f.open(IO_ReadOnly)) { kdDebug(9002) << "Could not read" << tocItem->tocFile() << endl; return; } - QDomDocument doc; + TQDomDocument doc; if (!doc.setContent(&f) || doc.doctype().name() != "kdeveloptoc") { kdDebug(9002) << "Not a valid kdeveloptoc file: " << tocItem->tocFile() << endl; @@ -154,21 +154,21 @@ void DocKDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it } f.close(); - QDomElement docEl = doc.documentElement(); - QDomElement baseEl = docEl.namedItem("base").toElement(); + TQDomElement docEl = doc.documentElement(); + TQDomElement baseEl = docEl.namedItem("base").toElement(); - QString base; + TQString base; if (!baseEl.isNull()) - base = baseEl.attribute("href", QString::null); + base = baseEl.attribute("href", TQString::null); - QDomElement indexEl = docEl.namedItem("index").toElement(); - QDomElement childEl = indexEl.firstChild().toElement(); + TQDomElement indexEl = docEl.namedItem("index").toElement(); + TQDomElement childEl = indexEl.firstChild().toElement(); while (!childEl.isNull()) { if (childEl.tagName() == "entry") { - QString name = childEl.attribute("name"); - QString url = childEl.attribute("url"); + TQString name = childEl.attribute("name"); + TQString url = childEl.attribute("url"); IndexItemProto *ii = new IndexItemProto(this, item, index, name, item->text(0)); ii->addURL(KURL(constructURL(base, url))); @@ -183,15 +183,15 @@ void DocKDevTOCPlugin::createTOC(DocumentationCatalogItem* item) if (!tocItem) return; - QFileInfo fi(tocItem->tocFile()); + TQFileInfo fi(tocItem->tocFile()); - QFile f(tocItem->tocFile()); + TQFile f(tocItem->tocFile()); if (!f.open(IO_ReadOnly)) { kdDebug(9002) << "Could not read" << tocItem->tocFile() << endl; return; } - QDomDocument doc; + TQDomDocument doc; if (!doc.setContent(&f) || doc.doctype().name() != "kdeveloptoc") { kdDebug(9002) << "Not a valid kdeveloptoc file: " << tocItem->tocFile() << endl; @@ -199,30 +199,30 @@ void DocKDevTOCPlugin::createTOC(DocumentationCatalogItem* item) } f.close(); - QDomElement docEl = doc.documentElement(); - QDomElement baseEl = docEl.namedItem("base").toElement(); + TQDomElement docEl = doc.documentElement(); + TQDomElement baseEl = docEl.namedItem("base").toElement(); - QString base; + TQString base; if (!baseEl.isNull()) - base = baseEl.attribute("href", QString::null); + base = baseEl.attribute("href", TQString::null); - QDomElement childEl = docEl.lastChild().toElement(); + TQDomElement childEl = docEl.lastChild().toElement(); addTocSect(tocItem, childEl, base, 1); } -void DocKDevTOCPlugin::addTocSect(DocumentationItem *parent, QDomElement childEl, const QString &base, uint level) +void DocKDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level) { while (!childEl.isNull()) { - if (childEl.tagName() == QString("tocsect%1").arg(level)) + if (childEl.tagName() == TQString("tocsect%1").arg(level)) { - QString name = childEl.attribute("name"); - QString url = childEl.attribute("url"); + TQString name = childEl.attribute("name"); + TQString url = childEl.attribute("url"); DocumentationItem *item = new DocumentationItem(level == 1 ? DocumentationItem::Book : DocumentationItem::Document, parent, name); item->setURL(KURL(constructURL(base, url))); - QDomElement grandchildEl = childEl.lastChild().toElement(); + TQDomElement grandchildEl = childEl.lastChild().toElement(); addTocSect(item, grandchildEl, base, level+1); } childEl = childEl.previousSibling().toElement(); @@ -235,15 +235,15 @@ void DocKDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item) if (!tocItem) return; - QFileInfo fi(tocItem->tocFile()); + TQFileInfo fi(tocItem->tocFile()); - QFile f(tocItem->tocFile()); + TQFile f(tocItem->tocFile()); if (!f.open(IO_ReadOnly)) { kdDebug(9002) << "Could not read" << tocItem->tocFile() << endl; return; } - QDomDocument doc; + TQDomDocument doc; if (!doc.setContent(&f) || doc.doctype().name() != "kdeveloptoc") { kdDebug(9002) << "Not a valid kdeveloptoc file: " << tocItem->tocFile() << endl; @@ -251,20 +251,20 @@ void DocKDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item) } f.close(); - QDomElement docEl = doc.documentElement(); - QDomElement baseEl = docEl.namedItem("base").toElement(); + TQDomElement docEl = doc.documentElement(); + TQDomElement baseEl = docEl.namedItem("base").toElement(); if (item->url().isEmpty()) { if (baseEl.isNull()) item->setURL(KURL()); else - item->setURL(KURL(constructURL(baseEl.attribute("href", QString::null), - baseEl.attribute("url", QString::null)))); + item->setURL(KURL(constructURL(baseEl.attribute("href", TQString::null), + baseEl.attribute("url", TQString::null)))); } } -QString DocKDevTOCPlugin::constructURL(const QString &base, const QString &url) +TQString DocKDevTOCPlugin::constructURL(const TQString &base, const TQString &url) { if (base.isEmpty() && !url.isEmpty()) return url; diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h index 68bfd0e2..626848b9 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h @@ -20,7 +20,7 @@ #ifndef DOCKDEVTOCPLUGIN_H #define DOCKDEVTOCPLUGIN_H -#include <qdom.h> +#include <tqdom.h> #include <kdevdocumentationplugin.h> @@ -28,27 +28,27 @@ class DocKDevTOCPlugin : public DocumentationPlugin { Q_OBJECT public: - DocKDevTOCPlugin(QObject* parent, const char* name, const QStringList args = QStringList()); + DocKDevTOCPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~DocKDevTOCPlugin(); - virtual QString pluginName() const; + virtual TQString pluginName() const; - virtual QString catalogTitle(const QString& url); - virtual DocumentationCatalogItem* createCatalog(KListView* contents, const QString& title, const QString& url); + virtual TQString catalogTitle(const TQString& url); + virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url); virtual void createTOC(DocumentationCatalogItem* item); virtual void setCatalogURL(DocumentationCatalogItem* item); virtual bool needRefreshIndex(DocumentationCatalogItem* item); virtual void createIndex(IndexBox* index, DocumentationCatalogItem* item); - virtual QStringList fullTextSearchLocations(); + virtual TQStringList fullTextSearchLocations(); - virtual QPair<KFile::Mode, QString > catalogLocatorProps(); + virtual QPair<KFile::Mode, TQString > catalogLocatorProps(); virtual void autoSetupPlugin(); protected: - void addTocSect(DocumentationItem *parent, QDomElement childEl, const QString &base, uint level); - static QString constructURL(const QString &base, const QString &url) ; + void addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level); + static TQString constructURL(const TQString &base, const TQString &url) ; }; #endif diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp index 901eeffe..8fdc4643 100644 --- a/parts/documentation/plugins/pdb/docpdbplugin.cpp +++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp @@ -31,7 +31,7 @@ static const KAboutData data("docpdbplugin", I18N_NOOP("PalmDoc documentation pl typedef KDevGenericFactory<DocPDBPlugin> DocPDBPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocpdbplugin, DocPDBPluginFactory(&data) ) -DocPDBPlugin::DocPDBPlugin(QObject* parent, const char* name, const QStringList args) +DocPDBPlugin::DocPDBPlugin(TQObject* parent, const char* name, const TQStringList args) :DocumentationPlugin(DocPDBPluginFactory::instance()->config(), parent, name) { setCapabilities(CustomDocumentationTitles | ProjectUserManual); @@ -47,31 +47,31 @@ bool DocPDBPlugin::needRefreshIndex(DocumentationCatalogItem* item) return false; } -QString DocPDBPlugin::pluginName() const +TQString DocPDBPlugin::pluginName() const { return i18n("PalmDoc Documentation Collection"); } -DocumentationCatalogItem* DocPDBPlugin::createCatalog(KListView* contents, const QString& title, const QString& url) +DocumentationCatalogItem* DocPDBPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url) { DocumentationCatalogItem *item = new DocumentationCatalogItem(this, contents, title); item->setURL(KURL(url)); return item; } -QPair<KFile::Mode, QString> DocPDBPlugin::catalogLocatorProps() +QPair<KFile::Mode, TQString> DocPDBPlugin::catalogLocatorProps() { - return QPair<KFile::Mode, QString>(KFile::File, "all/allfiles"); + return QPair<KFile::Mode, TQString>(KFile::File, "all/allfiles"); } -QString DocPDBPlugin::catalogTitle(const QString& /*url*/) +TQString DocPDBPlugin::catalogTitle(const TQString& /*url*/) { - return QString::null; + return TQString::null; } -QStringList DocPDBPlugin::fullTextSearchLocations() +TQStringList DocPDBPlugin::fullTextSearchLocations() { - return QStringList(); + return TQStringList(); } diff --git a/parts/documentation/plugins/pdb/docpdbplugin.h b/parts/documentation/plugins/pdb/docpdbplugin.h index f639e0cf..b9544a7b 100644 --- a/parts/documentation/plugins/pdb/docpdbplugin.h +++ b/parts/documentation/plugins/pdb/docpdbplugin.h @@ -24,12 +24,12 @@ class DocPDBPlugin : public DocumentationPlugin { public: - DocPDBPlugin(QObject* parent, const char* name, const QStringList args = QStringList()); + DocPDBPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~DocPDBPlugin(); - virtual QString pluginName() const; + virtual TQString pluginName() const; - virtual DocumentationCatalogItem* createCatalog(KListView* contents, const QString& title, const QString& url); + virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url); virtual void createTOC(DocumentationCatalogItem* item); virtual void setCatalogURL(DocumentationCatalogItem* item); @@ -37,10 +37,10 @@ public: virtual bool needRefreshIndex(DocumentationCatalogItem* item); virtual void createIndex(IndexBox* index, DocumentationCatalogItem* item); - virtual QStringList fullTextSearchLocations(); + virtual TQStringList fullTextSearchLocations(); - virtual QPair<KFile::Mode, QString> catalogLocatorProps(); - virtual QString catalogTitle(const QString& url); + virtual QPair<KFile::Mode, TQString> catalogLocatorProps(); + virtual TQString catalogTitle(const TQString& url); virtual void autoSetupPlugin(); diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp index 5d8b7a78..79dab511 100644 --- a/parts/documentation/plugins/pdf/docpdfplugin.cpp +++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp @@ -31,7 +31,7 @@ static const KAboutData data("docpdfplugin", I18N_NOOP("PDF documentation plugin typedef KDevGenericFactory<DocPDFPlugin> DocPDFPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocpdfplugin, DocPDFPluginFactory(&data) ) -DocPDFPlugin::DocPDFPlugin(QObject* parent, const char* name, const QStringList args) +DocPDFPlugin::DocPDFPlugin(TQObject* parent, const char* name, const TQStringList args) :DocumentationPlugin(DocPDFPluginFactory::instance()->config(), parent, name) { setCapabilities(CustomDocumentationTitles | ProjectUserManual); @@ -47,31 +47,31 @@ bool DocPDFPlugin::needRefreshIndex(DocumentationCatalogItem* item) return false; } -QString DocPDFPlugin::pluginName() const +TQString DocPDFPlugin::pluginName() const { return i18n("PDF Documentation Collection"); } -DocumentationCatalogItem* DocPDFPlugin::createCatalog(KListView* contents, const QString& title, const QString& url) +DocumentationCatalogItem* DocPDFPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url) { DocumentationCatalogItem *item = new DocumentationCatalogItem(this, contents, title); item->setURL(KURL(url)); return item; } -QPair<KFile::Mode, QString> DocPDFPlugin::catalogLocatorProps() +QPair<KFile::Mode, TQString> DocPDFPlugin::catalogLocatorProps() { - return QPair<KFile::Mode, QString>(KFile::File, "*.pdf"); + return QPair<KFile::Mode, TQString>(KFile::File, "*.pdf"); } -QString DocPDFPlugin::catalogTitle(const QString& /*url*/) +TQString DocPDFPlugin::catalogTitle(const TQString& /*url*/) { - return QString::null; + return TQString::null; } -QStringList DocPDFPlugin::fullTextSearchLocations() +TQStringList DocPDFPlugin::fullTextSearchLocations() { - return QStringList(); + return TQStringList(); } diff --git a/parts/documentation/plugins/pdf/docpdfplugin.h b/parts/documentation/plugins/pdf/docpdfplugin.h index c78325d4..b7e8b26b 100644 --- a/parts/documentation/plugins/pdf/docpdfplugin.h +++ b/parts/documentation/plugins/pdf/docpdfplugin.h @@ -24,12 +24,12 @@ class DocPDFPlugin : public DocumentationPlugin { public: - DocPDFPlugin(QObject* parent, const char* name, const QStringList args = QStringList()); + DocPDFPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~DocPDFPlugin(); - virtual QString pluginName() const; + virtual TQString pluginName() const; - virtual DocumentationCatalogItem* createCatalog(KListView* contents, const QString& title, const QString& url); + virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url); virtual void createTOC(DocumentationCatalogItem* item); virtual void setCatalogURL(DocumentationCatalogItem* item); @@ -37,10 +37,10 @@ public: virtual bool needRefreshIndex(DocumentationCatalogItem* item); virtual void createIndex(IndexBox* index, DocumentationCatalogItem* item); - virtual QStringList fullTextSearchLocations(); + virtual TQStringList fullTextSearchLocations(); - virtual QPair<KFile::Mode, QString> catalogLocatorProps(); - virtual QString catalogTitle(const QString& url); + virtual QPair<KFile::Mode, TQString> catalogLocatorProps(); + virtual TQString catalogTitle(const TQString& url); virtual void autoSetupPlugin(); diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp index 90237b7c..b4118f97 100644 --- a/parts/documentation/plugins/qt/docqtplugin.cpp +++ b/parts/documentation/plugins/qt/docqtplugin.cpp @@ -21,9 +21,9 @@ #include <unistd.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qdialog.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqdialog.h> #include <kurl.h> #include <kaboutdata.h> @@ -40,27 +40,27 @@ class QtDocumentationCatalogItem: public DocumentationCatalogItem { public: - QtDocumentationCatalogItem(const QString &dcfFile, DocumentationPlugin* plugin, - KListView *parent, const QString &name) + QtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin, + KListView *parent, const TQString &name) :DocumentationCatalogItem(plugin, parent, name), m_dcfFile(dcfFile) { } - QtDocumentationCatalogItem(const QString &dcfFile, DocumentationPlugin* plugin, - DocumentationItem *parent, const QString &name) + QtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin, + DocumentationItem *parent, const TQString &name) :DocumentationCatalogItem(plugin, parent, name), m_dcfFile(dcfFile) { } - QString dcfFile() const { return m_dcfFile; } + TQString dcfFile() const { return m_dcfFile; } private: - QString m_dcfFile; + TQString m_dcfFile; }; static const KDevPluginInfo data("docqtplugin"); typedef KDevGenericFactory<DocQtPlugin> DocQtPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocQtPluginFactory(data) ) -DocQtPlugin::DocQtPlugin(QObject* parent, const char* name, const QStringList) +DocQtPlugin::DocQtPlugin(TQObject* parent, const char* name, const TQStringList) :DocumentationPlugin(DocQtPluginFactory::instance()->config(), parent, name) { setCapabilities(Index | FullTextSearch | CustomDocumentationTitles); @@ -77,15 +77,15 @@ void DocQtPlugin::createTOC(DocumentationCatalogItem *item) if (!qtItem) return; - QFileInfo fi(qtItem->dcfFile()); + TQFileInfo fi(qtItem->dcfFile()); - QFile f(qtItem->dcfFile()); + TQFile f(qtItem->dcfFile()); if (!f.open(IO_ReadOnly)) { kdDebug(9002) << "Could not read" << qtItem->dcfFile() << endl; return; } - QDomDocument doc; + TQDomDocument doc; if (!doc.setContent(&f) || doc.doctype().name() != "DCF") { kdDebug(9002) << "Not a valid DCF file: " << qtItem->dcfFile() << endl; @@ -93,28 +93,28 @@ void DocQtPlugin::createTOC(DocumentationCatalogItem *item) } f.close(); - QDomElement docEl = doc.documentElement(); - QDomElement titleEl = docEl.namedItem("DCF").toElement(); + TQDomElement docEl = doc.documentElement(); + TQDomElement titleEl = docEl.namedItem("DCF").toElement(); - QDomElement childEl = docEl.lastChild().toElement(); + TQDomElement childEl = docEl.lastChild().toElement(); while (!childEl.isNull()) { if (childEl.tagName() == "section") { - QString ref = childEl.attribute("ref"); - QString title = childEl.attribute("title"); + TQString ref = childEl.attribute("ref"); + TQString title = childEl.attribute("title"); DocumentationItem *sectionItem = new DocumentationItem(DocumentationItem::Book, item, title); KURL sectionUrl(fi.dirPath(true) + "/" + ref); sectionItem->setURL(sectionUrl); - QDomElement grandChild = childEl.lastChild().toElement(); + TQDomElement grandChild = childEl.lastChild().toElement(); while(!grandChild.isNull()) { if (grandChild.tagName() == "keyword") { - QString keyRef = grandChild.attribute("ref"); - QString keyTitle = grandChild.text(); + TQString keyRef = grandChild.attribute("ref"); + TQString keyTitle = grandChild.text(); DocumentationItem *keyItem = new DocumentationItem(DocumentationItem::Document, sectionItem, keyTitle); KURL keyUrl(fi.dirPath(true) + "/" + keyRef); @@ -122,8 +122,8 @@ void DocQtPlugin::createTOC(DocumentationCatalogItem *item) } if (grandChild.tagName() == "section") { - QString keyRef = grandChild.attribute("ref"); - QString keyTitle = grandChild.attribute("title"); + TQString keyRef = grandChild.attribute("ref"); + TQString keyTitle = grandChild.attribute("title"); DocumentationItem *keyItem = new DocumentationItem(DocumentationItem::Book, sectionItem, keyTitle); KURL keyUrl(fi.dirPath(true) + "/" + keyRef); keyItem->setURL(keyUrl); @@ -137,7 +137,7 @@ void DocQtPlugin::createTOC(DocumentationCatalogItem *item) void DocQtPlugin::autoSetupPlugin() { - QString qtDocDir(QT_DOCDIR); + TQString qtDocDir(QT_DOCDIR); qtDocDir = URLUtil::envExpand(qtDocDir); if (qtDocDir.isEmpty()) { @@ -150,11 +150,11 @@ void DocQtPlugin::autoSetupPlugin() config->setGroup("Index Settings"); config->writeEntry("Qt Reference Documentation", true); config->setGroup("Locations"); - config->writePathEntry("Qt Reference Documentation", qtDocDir + QString("/qt.dcf")); - config->writePathEntry("Qt Assistant Manual", qtDocDir + QString("/assistant.dcf")); - config->writePathEntry("Qt Designer Manual", qtDocDir + QString("/designer.dcf")); - config->writePathEntry("Guide to the Qt Translation Tools", qtDocDir + QString("/linguist.dcf")); - config->writePathEntry("qmake User Guide", qtDocDir + QString("/qmake.dcf")); + config->writePathEntry("Qt Reference Documentation", qtDocDir + TQString("/qt.dcf")); + config->writePathEntry("Qt Assistant Manual", qtDocDir + TQString("/assistant.dcf")); + config->writePathEntry("Qt Designer Manual", qtDocDir + TQString("/designer.dcf")); + config->writePathEntry("Guide to the Qt Translation Tools", qtDocDir + TQString("/linguist.dcf")); + config->writePathEntry("qmake User Guide", qtDocDir + TQString("/qmake.dcf")); } } @@ -164,15 +164,15 @@ void DocQtPlugin::setCatalogURL(DocumentationCatalogItem *item) if (!qtItem) return; - QFileInfo fi(qtItem->dcfFile()); + TQFileInfo fi(qtItem->dcfFile()); - QFile f(qtItem->dcfFile()); + TQFile f(qtItem->dcfFile()); if (!f.open(IO_ReadOnly)) { kdDebug(9002) << "Could not read" << qtItem->dcfFile() << endl; return; } - QDomDocument doc; + TQDomDocument doc; if (!doc.setContent(&f) || doc.doctype().name() != "DCF") { kdDebug(9002) << "Not a valid DCF file: " << qtItem->dcfFile() << endl; @@ -180,17 +180,17 @@ void DocQtPlugin::setCatalogURL(DocumentationCatalogItem *item) } f.close(); - QDomElement docEl = doc.documentElement(); - QDomElement titleEl = docEl.namedItem("DCF").toElement(); + TQDomElement docEl = doc.documentElement(); + TQDomElement titleEl = docEl.namedItem("DCF").toElement(); if (item->url().isEmpty()) { - KURL url(fi.dirPath(true) + "/" + docEl.attribute("ref", QString::null)); + KURL url(fi.dirPath(true) + "/" + docEl.attribute("ref", TQString::null)); item->setURL(url); } } -QString DocQtPlugin::pluginName() const +TQString DocQtPlugin::pluginName() const { return i18n("Qt Documentation Collection"); } @@ -201,9 +201,9 @@ bool DocQtPlugin::needRefreshIndex(DocumentationCatalogItem *item) if (!qtItem) return false; - QFileInfo fi(qtItem->dcfFile()); + TQFileInfo fi(qtItem->dcfFile()); config->setGroup("Index"); - if (fi.lastModified() > config->readDateTimeEntry(qtItem->text(0), new QDateTime())) + if (fi.lastModified() > config->readDateTimeEntry(qtItem->text(0), new TQDateTime())) { kdDebug() << "need rebuild index for " << qtItem->text(0) << endl; config->writeEntry(item->text(0), fi.lastModified()); @@ -219,15 +219,15 @@ void DocQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item) if (!qtItem) return; - QFileInfo fi(qtItem->dcfFile()); + TQFileInfo fi(qtItem->dcfFile()); - QFile f(qtItem->dcfFile()); + TQFile f(qtItem->dcfFile()); if (!f.open(IO_ReadOnly)) { kdDebug(9002) << "Could not read" << qtItem->dcfFile() << endl; return; } - QDomDocument doc; + TQDomDocument doc; if (!doc.setContent(&f) || doc.doctype().name() != "DCF") { kdDebug(9002) << "Not a valid DCF file: " << qtItem->dcfFile() << endl; @@ -235,10 +235,10 @@ void DocQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item) } f.close(); - QDomElement docEl = doc.documentElement(); - QDomElement titleEl = docEl.namedItem("DCF").toElement(); + TQDomElement docEl = doc.documentElement(); + TQDomElement titleEl = docEl.namedItem("DCF").toElement(); - QDomElement childEl = docEl.firstChild().toElement(); + TQDomElement childEl = docEl.firstChild().toElement(); while (!childEl.isNull()) { if (childEl.tagName() == "section") @@ -249,26 +249,26 @@ void DocQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item) } } -void DocQtPlugin::createSectionIndex(QFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item, - QDomElement section) +void DocQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item, + TQDomElement section) { //adymo: do not load section to index for Qt reference documentation - QString title = section.attribute("title"); + TQString title = section.attribute("title"); if (fi.fileName() != "qt.dcf") { - QString ref = section.attribute("ref"); + TQString ref = section.attribute("ref"); IndexItemProto *ii = new IndexItemProto(this, item, index, title, item->text(0)); ii->addURL(KURL(fi.dirPath(true) + "/" + ref)); } - QDomElement grandChild = section.firstChild().toElement(); + TQDomElement grandChild = section.firstChild().toElement(); while(!grandChild.isNull()) { if (grandChild.tagName() == "keyword") { - QString keyRef = grandChild.attribute("ref"); - QString keyTitle = grandChild.text(); + TQString keyRef = grandChild.attribute("ref"); + TQString keyTitle = grandChild.text(); //adymo: a little hack to avoid unwanted elements if (keyRef != "qdir-example.html") @@ -285,20 +285,20 @@ void DocQtPlugin::createSectionIndex(QFileInfo &fi, IndexBox *index, Documentati } } -QStringList DocQtPlugin::fullTextSearchLocations() +TQStringList DocQtPlugin::fullTextSearchLocations() { - QStringList locs; + TQStringList locs; - QMap<QString, QString> entryMap = config->entryMap("Locations"); + TQMap<TQString, TQString> entryMap = config->entryMap("Locations"); - for (QMap<QString, QString>::const_iterator it = entryMap.begin(); + for (TQMap<TQString, TQString>::const_iterator it = entryMap.begin(); it != entryMap.end(); ++it) { config->setGroup("Search Settings"); if (config->readBoolEntry(it.key(), false)) { config->setGroup("Locations"); - QFileInfo fi(config->readPathEntry(it.key())); + TQFileInfo fi(config->readPathEntry(it.key())); locs << fi.dirPath(true); } } @@ -306,32 +306,32 @@ QStringList DocQtPlugin::fullTextSearchLocations() return locs; } -QPair<KFile::Mode, QString> DocQtPlugin::catalogLocatorProps() +QPair<KFile::Mode, TQString> DocQtPlugin::catalogLocatorProps() { - return QPair<KFile::Mode, QString>(KFile::File, "*.xml *.dcf"); + return QPair<KFile::Mode, TQString>(KFile::File, "*.xml *.dcf"); } -QString DocQtPlugin::catalogTitle(const QString &url) +TQString DocQtPlugin::catalogTitle(const TQString &url) { - QFileInfo fi(url); + TQFileInfo fi(url); if (!fi.exists()) - return QString::null; + return TQString::null; - QFile f(url); + TQFile f(url); if (!f.open(IO_ReadOnly)) - return QString::null; + return TQString::null; - QDomDocument doc; + TQDomDocument doc; if (!doc.setContent(&f) || (doc.doctype().name() != "DCF")) - return QString::null; + return TQString::null; f.close(); - QDomElement docEl = doc.documentElement(); + TQDomElement docEl = doc.documentElement(); - return docEl.attribute("title", QString::null); + return docEl.attribute("title", TQString::null); } -DocumentationCatalogItem *DocQtPlugin::createCatalog(KListView *contents, const QString &title, const QString &url) +DocumentationCatalogItem *DocQtPlugin::createCatalog(KListView *contents, const TQString &title, const TQString &url) { return new QtDocumentationCatalogItem(url, this, contents, title); } diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h index 551a6ac7..e09ce7a5 100644 --- a/parts/documentation/plugins/qt/docqtplugin.h +++ b/parts/documentation/plugins/qt/docqtplugin.h @@ -21,7 +21,7 @@ #define DOCQTPLUGIN_H #include <kdevdocumentationplugin.h> -#include <qdom.h> +#include <tqdom.h> class KConfig; @@ -29,25 +29,25 @@ class DocQtPlugin : public DocumentationPlugin { Q_OBJECT public: - DocQtPlugin(QObject* parent, const char* name, const QStringList args = QStringList()); + DocQtPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~DocQtPlugin(); - virtual QString pluginName() const; + virtual TQString pluginName() const; - virtual DocumentationCatalogItem *createCatalog(KListView *contents, const QString &title, const QString &url); + virtual DocumentationCatalogItem *createCatalog(KListView *contents, const TQString &title, const TQString &url); virtual void createTOC(DocumentationCatalogItem *item); virtual void setCatalogURL(DocumentationCatalogItem *item); virtual bool needRefreshIndex(DocumentationCatalogItem *item); virtual void createIndex(IndexBox *index, DocumentationCatalogItem *item); - virtual void createSectionIndex(QFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item, - QDomElement section); + virtual void createSectionIndex(TQFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item, + TQDomElement section); - virtual QStringList fullTextSearchLocations(); + virtual TQStringList fullTextSearchLocations(); - virtual QPair<KFile::Mode, QString> catalogLocatorProps(); - virtual QString catalogTitle(const QString &url); + virtual QPair<KFile::Mode, TQString> catalogLocatorProps(); + virtual TQString catalogTitle(const TQString &url); virtual void autoSetupPlugin(); diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp index 4f9ecf73..1d7543c3 100644 --- a/parts/documentation/protocols/chm/chm.cpp +++ b/parts/documentation/protocols/chm/chm.cpp @@ -14,10 +14,10 @@ Boston, MA 02110-1301, USA. */ -#include <qcstring.h> -#include <qbitarray.h> -#include <qfile.h> -#include <qregexp.h> +#include <tqcstring.h> +#include <tqbitarray.h> +#include <tqfile.h> +#include <tqregexp.h> #include <stack> #include <stdlib.h> @@ -58,7 +58,7 @@ extern "C" } } -ChmProtocol::ChmProtocol(const QCString &pool_socket, const QCString &app_socket) +ChmProtocol::ChmProtocol(const TQCString &pool_socket, const TQCString &app_socket) : SlaveBase("kio_chm", pool_socket, app_socket) { kdDebug() << "ChmProtocol::ChmProtocol()" << endl; @@ -84,21 +84,21 @@ void ChmProtocol::get( const KURL& url ) bool catalog = false; bool contents = false; - QString bigpath = url.path(); + TQString bigpath = url.path(); if(bigpath.endsWith(":catalog")) { catalog = true; - int len = QString(":catalog").length(); + int len = TQString(":catalog").length(); bigpath.remove(bigpath.length() - len, len); ///strip :catalog from the end } if(bigpath.endsWith(":contents")) { contents = true; - int len = QString(":contents").length(); + int len = TQString(":contents").length(); bigpath.remove(bigpath.length() - len, len); ///strip :catalog from the end } - QString path; + TQString path; if ( !checkNewFile( bigpath, path ) ) { error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); return; @@ -110,23 +110,23 @@ void ChmProtocol::get( const KURL& url ) return; } - QByteArray theData; + TQByteArray theData; //init.. //added by lucida lucida@users.sf.net - QString fname = QString(); - QString chmpath = QString(); + TQString fname = TQString(); + TQString chmpath = TQString(); KTempFile f("",".html"); fname = f.name(); - QTextStream *t = f.textStream(); - QString firstPage = QString(""); - QString m_strIndex = QString(""); - QString tmpstr = QString(""); + TQTextStream *t = f.textStream(); + TQString firstPage = TQString(""); + TQString m_strIndex = TQString(""); + TQString tmpstr = TQString(""); bool m_bIndex = 0; if(contents) { - QString output; + TQString output; KURL u = url; ChmDirectoryMap::Iterator it; @@ -163,19 +163,19 @@ void ChmProtocol::get( const KURL& url ) int offset = m_dirMap["/@contents"].offset; int length = m_dirMap["/@contents"].length; theData.setRawData(&m_contents[offset], length); - QString s(theData); - QString output; + TQString s(theData); + TQString output; - QRegExp object("<OBJECT type=\"text/sitemap\">(.*)</OBJECT>", false); + TQRegExp object("<OBJECT type=\"text/sitemap\">(.*)</OBJECT>", false); object.setMinimal(true); - QRegExp nameParam("<param name=\"Name\" value=\"(.*)\">", false); + TQRegExp nameParam("<param name=\"Name\" value=\"(.*)\">", false); nameParam.setMinimal(true); - QRegExp localParam("<param name=\"Local\" value=\"(.*)\">", false); + TQRegExp localParam("<param name=\"Local\" value=\"(.*)\">", false); localParam.setMinimal(true); - QRegExp mergeParam("<param name=\"Merge\" value=\"(.*)\">", false); + TQRegExp mergeParam("<param name=\"Merge\" value=\"(.*)\">", false); mergeParam.setMinimal(true); std::stack<int> parents; @@ -186,8 +186,8 @@ void ChmProtocol::get( const KURL& url ) while ((pos = s.find(object, pos)) != -1) { if(htmlOutput) output += s.mid(old, pos - old); if(catalog) { - QRegExp ex("<UL>|</UL>", false); ex.setMinimal(true); - QString ms = s.mid(old, pos - old); + TQRegExp ex("<UL>|</UL>", false); ex.setMinimal(true); + TQString ms = s.mid(old, pos - old); int pos = 0; while( (pos = ms.find(ex, pos)) != -1) { if(ms.mid(pos, 4) == "<UL>") { @@ -204,8 +204,8 @@ void ChmProtocol::get( const KURL& url ) } pos += object.matchedLength(); old = pos; - QString obj = object.cap(1); - QString name, local; + TQString obj = object.cap(1); + TQString name, local; if (obj.find(nameParam) != -1) { name = nameParam.cap(1); if (obj.find(localParam) != -1) { @@ -220,12 +220,12 @@ void ChmProtocol::get( const KURL& url ) ++counter; KURL u = url; u.setPath(bigpath + local); - QString str; + TQString str; output += str.sprintf("%i\n%i\n", parents.top(), current); output += name + "\n" + u.prettyURL() + "\n"; } m_bIndex = 1; - if (firstPage == "") firstPage = url.url()+QString::fromLocal8Bit(local.latin1()); + if (firstPage == "") firstPage = url.url()+TQString::fromLocal8Bit(local.latin1()); } else if(htmlOutput) output += name; @@ -234,43 +234,43 @@ void ChmProtocol::get( const KURL& url ) } } if (obj.find(mergeParam) != -1 && htmlOutput) { - QString link = mergeParam.cap(1); - QString href = link.left(link.find("::")); - QString path = m_chmFile.left(m_chmFile.findRev("/") + 1); + TQString link = mergeParam.cap(1); + TQString href = link.left(link.find("::")); + TQString path = m_chmFile.left(m_chmFile.findRev("/") + 1); //output += " (<a href=\"" + path + href + "\">link</a>)"; m_bIndex = 1; output += " (<a target=\"browse\" href=\"" + url.url() + path + href + "\">link</a>)"; - if (firstPage == "") firstPage = url.url()+QString::fromLocal8Bit(local.latin1()); + if (firstPage == "") firstPage = url.url()+TQString::fromLocal8Bit(local.latin1()); } } if(htmlOutput) output += s.mid(old); //set left pane //added by lucida, lucida@users.sf.net - QString lframe = QString("</HEAD><FRAMESET COLS=\"25%,*\">\n"); + TQString lframe = TQString("</HEAD><FRAMESET COLS=\"25%,*\">\n"); lframe += "<FRAME NAME=\"index\" src=\"file:"+ fname+"\"" + " marginwidth=\"0\"></FRAME>\n"; if (!m_bIndex) { lframe = "</HEAD><FRAMESET>"; - firstPage = url.url() + QString::fromLocal8Bit(m_strIndex.latin1()); + firstPage = url.url() + TQString::fromLocal8Bit(m_strIndex.latin1()); } theData.resetRawData(&m_contents[offset], length); //KMimeMagicResult * result = KMimeMagic::self()->findBufferFileType( output, path ); //kdDebug() << "Emitting mimetype " << result->mimeType() << endl; //mimeType( result->mimeType() ); -/* QCString output1 = (QCString)(output.latin1()); +/* TQCString output1 = (TQCString)(output.latin1()); data(output1); processedSize(output1.length());*/ //construct the frame //added by lucida lucida@users.sf.net - QString framestr = QString("<HTML><HEAD>\n"); + TQString framestr = TQString("<HTML><HEAD>\n"); framestr += lframe; framestr += "<FRAME NAME=\"browse\" src=\"" + firstPage + "\">\n"; framestr += "</FRAME>\n"; framestr += "</FRAMESET></HTML>"; //write index file //added by lucida lucida@users.sf.net - *t << QString::fromLocal8Bit(output.latin1()) << endl; + *t << TQString::fromLocal8Bit(output.latin1()) << endl; if(catalog) { data(output.local8Bit()); @@ -297,11 +297,11 @@ void ChmProtocol::get( const KURL& url ) } /* --------------------------------------------------------------------------- */ -bool ChmProtocol::checkNewFile( QString fullPath, QString& path ) +bool ChmProtocol::checkNewFile( TQString fullPath, TQString& path ) { //kdDebug() << "ChmProtocol::checkNewFile " << fullPath << endl; - fullPath = fullPath.replace(QRegExp("::"), ""); + fullPath = fullPath.replace(TQRegExp("::"), ""); // Are we already looking at that file ? if ( !m_chmFile.isEmpty() && fullPath.startsWith(m_chmFile) ) @@ -316,7 +316,7 @@ bool ChmProtocol::checkNewFile( QString fullPath, QString& path ) // Find where the chm file is in the full path int pos = 0; - QString chmFile; + TQString chmFile; path = ""; int len = fullPath.length(); @@ -326,10 +326,10 @@ bool ChmProtocol::checkNewFile( QString fullPath, QString& path ) //kdDebug() << "the full path is " << fullPath << endl; while ( (pos=fullPath.find( '/', pos+1 )) != -1 ) { - QString tryPath = fullPath.left( pos ); + TQString tryPath = fullPath.left( pos ); //kdDebug() << fullPath << " trying " << tryPath << endl; struct stat statbuf; - if ( ::stat( QFile::encodeName(tryPath), &statbuf ) == 0 && !S_ISDIR(statbuf.st_mode) ) + if ( ::stat( TQFile::encodeName(tryPath), &statbuf ) == 0 && !S_ISDIR(statbuf.st_mode) ) { chmFile = tryPath; path = fullPath.mid( pos ).lower(); @@ -342,7 +342,7 @@ bool ChmProtocol::checkNewFile( QString fullPath, QString& path ) } else { - path = QString::fromLatin1("/"); + path = TQString::fromLatin1("/"); } kdDebug() << "Found. chmFile=" << chmFile << " path=" << path << endl; break; diff --git a/parts/documentation/protocols/chm/chm.h b/parts/documentation/protocols/chm/chm.h index ff4bb391..1a1e80ba 100644 --- a/parts/documentation/protocols/chm/chm.h +++ b/parts/documentation/protocols/chm/chm.h @@ -17,8 +17,8 @@ #ifndef __chm_h__ #define __chm_h__ -#include <qstring.h> -#include <qcstring.h> +#include <tqstring.h> +#include <tqcstring.h> #include <kurl.h> #include <kio/global.h> #include <kio/slavebase.h> @@ -29,16 +29,16 @@ class QCString; class ChmProtocol : public KIO::SlaveBase { public: - ChmProtocol( const QCString&, const QCString& ); + ChmProtocol( const TQCString&, const TQCString& ); ~ChmProtocol(); void get( const KURL& ); private: - bool checkNewFile( QString, QString& ); + bool checkNewFile( TQString, TQString& ); ChmDirectoryMap m_dirMap; - QByteArray m_contents; - QString m_chmFile; + TQByteArray m_contents; + TQString m_chmFile; Chm m_chm; }; diff --git a/parts/documentation/protocols/chm/chmfile.cpp b/parts/documentation/protocols/chm/chmfile.cpp index 6106d83d..43ae8877 100644 --- a/parts/documentation/protocols/chm/chmfile.cpp +++ b/parts/documentation/protocols/chm/chmfile.cpp @@ -14,11 +14,11 @@ Boston, MA 02110-1301, USA. */ -#include <qfile.h> +#include <tqfile.h> #include "chmfile.h" #include "decompress.h" -uint Chm::getEncInt(QFile& f, uint &value) const +uint Chm::getEncInt(TQFile& f, uint &value) const { int c; uint result = 0; @@ -36,32 +36,32 @@ uint Chm::getEncInt(QFile& f, uint &value) const return count; } -uint Chm::getName(QFile& f, QString& name) const +uint Chm::getName(TQFile& f, TQString& name) const { int len = f.getch(); char *buf = new char[len]; f.readBlock(buf, len); - name = QString::fromUtf8(buf, len); + name = TQString::fromUtf8(buf, len); if (name.startsWith("/")) name = name.lower(); delete [] buf; return len + 1; } -uint Chm::getIntel32(QFile& f) const +uint Chm::getIntel32(TQFile& f) const { uint value = f.getch() | f.getch() << 8 | f.getch() << 16 | f.getch() << 24; return value; } -uint Chm::getIntel64(QFile& f) const +uint Chm::getIntel64(TQFile& f) const { uint value = getIntel32(f); f.at(f.at() + 4); return value; } -bool Chm::getChunk(QFile& f, uint chunkSize, ChmDirectoryMap& directoryMap) const +bool Chm::getChunk(TQFile& f, uint chunkSize, ChmDirectoryMap& directoryMap) const { char tag[4]; if (f.readBlock(tag, 4) != 4) return false; @@ -75,7 +75,7 @@ bool Chm::getChunk(QFile& f, uint chunkSize, ChmDirectoryMap& directoryMap) cons while (pos < chunkSize - quickref_length) { uint section, offset, length; - QString name; + TQString name; pos += getName(f, name); pos += getEncInt(f, section); pos += getEncInt(f, offset); @@ -98,9 +98,9 @@ bool Chm::getChunk(QFile& f, uint chunkSize, ChmDirectoryMap& directoryMap) cons } } -bool Chm::read(const QString& fileSpec, ChmDirectoryMap& dirMap, QByteArray& contents) const +bool Chm::read(const TQString& fileSpec, ChmDirectoryMap& dirMap, TQByteArray& contents) const { - QFile f(fileSpec); + TQFile f(fileSpec); if (!f.open(IO_ReadOnly)) return false; // read CHM file header diff --git a/parts/documentation/protocols/chm/chmfile.h b/parts/documentation/protocols/chm/chmfile.h index af89f55a..20e0ea67 100644 --- a/parts/documentation/protocols/chm/chmfile.h +++ b/parts/documentation/protocols/chm/chmfile.h @@ -18,8 +18,8 @@ #define __chmfile_h__ #include <cstdio> -#include <qmap.h> -#include <qstring.h> +#include <tqmap.h> +#include <tqstring.h> class QFile; @@ -34,19 +34,19 @@ struct ChmDirTableEntry uint length; }; -typedef QMap<QString, ChmDirTableEntry> ChmDirectoryMap; +typedef TQMap<TQString, ChmDirTableEntry> ChmDirectoryMap; class Chm { public: - bool read( const QString&, ChmDirectoryMap&, QByteArray& ) const; + bool read( const TQString&, ChmDirectoryMap&, TQByteArray& ) const; private: - bool getChunk( QFile&, uint, ChmDirectoryMap& ) const; - uint getEncInt( QFile&, uint& ) const; - uint getName( QFile&, QString& ) const; - uint getIntel32( QFile& ) const; - uint getIntel64( QFile& ) const; + bool getChunk( TQFile&, uint, ChmDirectoryMap& ) const; + uint getEncInt( TQFile&, uint& ) const; + uint getName( TQFile&, TQString& ) const; + uint getIntel32( TQFile& ) const; + uint getIntel64( TQFile& ) const; }; #endif // __chmfile_h__ diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp index ff6dc9ba..b1d9d166 100644 --- a/parts/documentation/protocols/chm/kchmpart.cpp +++ b/parts/documentation/protocols/chm/kchmpart.cpp @@ -15,7 +15,7 @@ */ #include "kchmpart.h" -#include <qstring.h> +#include <tqstring.h> #include <kinstance.h> #include <kglobal.h> @@ -35,7 +35,7 @@ extern "C" KInstance* KChmPartFactory::s_instance = 0L; KAboutData* KChmPartFactory::s_about = 0L; -KChmPartFactory::KChmPartFactory( QObject* parent, const char* name ) +KChmPartFactory::KChmPartFactory( TQObject* parent, const char* name ) : KParts::Factory( parent, name ) { } @@ -47,8 +47,8 @@ KChmPartFactory::~KChmPartFactory() delete s_about; } -KParts::Part* KChmPartFactory::createPartObject( QWidget *parentWidget, const char *, QObject *, - const char *name, const char *, const QStringList & ) +KParts::Part* KChmPartFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *, + const char *name, const char *, const TQStringList & ) { KChmPart* part = new KChmPart( parentWidget, name ); return part; @@ -66,7 +66,7 @@ KInstance* KChmPartFactory::instance() } -KChmPart::KChmPart( QWidget * parent, const char * name ) +KChmPart::KChmPart( TQWidget * parent, const char * name ) : KDevHTMLPart( ), m_job(0) { KInstance * instance = new KInstance( "kchmpart" ); @@ -100,13 +100,13 @@ bool KChmPart::openFile() m_htmlData.truncate(0); - m_job = KIO::get( QString("chm:")+m_file+"/", true, false ); - connect( m_job, SIGNAL( data( KIO::Job *, const QByteArray &) ), SLOT( readData( KIO::Job *, const QByteArray &) ) ); - connect( m_job, SIGNAL( result( KIO::Job * ) ), SLOT( jobDone( KIO::Job * ) ) ); + m_job = KIO::get( TQString("chm:")+m_file+"/", true, false ); + connect( m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray &) ), TQT_SLOT( readData( KIO::Job *, const TQByteArray &) ) ); + connect( m_job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( jobDone( KIO::Job * ) ) ); return true; } -void KChmPart::readData(KIO::Job * , const QByteArray & data) +void KChmPart::readData(KIO::Job * , const TQByteArray & data) { m_htmlData += data; } @@ -115,7 +115,7 @@ void KChmPart::jobDone( KIO::Job *) { m_job=0; begin(); - write(QString::fromLocal8Bit(m_htmlData)); + write(TQString::fromLocal8Bit(m_htmlData)); end(); } */ diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h index 28041bc3..023f8ed9 100644 --- a/parts/documentation/protocols/chm/kchmpart.h +++ b/parts/documentation/protocols/chm/kchmpart.h @@ -25,7 +25,7 @@ #include <kio/jobclasses.h> #include <kdevhtmlpart.h> -#include <qcstring.h> +#include <tqcstring.h> class KInstance; class KAboutData; @@ -34,13 +34,13 @@ class KChmPartFactory: public KParts::Factory { Q_OBJECT public: - KChmPartFactory( QObject *parent = 0, const char *name = 0 ); + KChmPartFactory( TQObject *parent = 0, const char *name = 0 ); virtual ~KChmPartFactory(); virtual KParts::Part* createPartObject( - QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const char *classname, const QStringList &args ); + TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, + const char *classname, const TQStringList &args ); static KInstance *instance(); @@ -55,14 +55,14 @@ class KChmPart : public KDevHTMLPart { Q_OBJECT public: - KChmPart( QWidget *, const char * = 0 ); + KChmPart( TQWidget *, const char * = 0 ); KParts::BrowserExtension * extension() { return m_extension; } public slots: virtual bool openURL( const KURL & ); /* protected slots: - void readData(KIO::Job * , const QByteArray & data); + void readData(KIO::Job * , const TQByteArray & data); void jobDone( KIO::Job *); */ protected: @@ -70,7 +70,7 @@ class KChmPart : public KDevHTMLPart KInstance *m_instance; KParts::BrowserExtension *m_extension; KIO::TransferJob *m_job; - QCString m_htmlData; + TQCString m_htmlData; protected slots: virtual void slotDuplicate(); diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index 66ac48f7..c7b2305a 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -23,12 +23,12 @@ ***************************************************************************/ #include "searchview.h" -#include <qlayout.h> -#include <qlabel.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qdir.h> -#include <qregexp.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqdir.h> +#include <tqregexp.h> #include <kpushbutton.h> #include <klistview.h> @@ -49,66 +49,66 @@ #include "documentation_part.h" #include "docutils.h" -SearchView::SearchView(DocumentationPart *part, QWidget *parent, const char *name) - :QWidget(parent, name), m_part(part) +SearchView::SearchView(DocumentationPart *part, TQWidget *parent, const char *name) + :TQWidget(parent, name), m_part(part) { - QVBoxLayout *l = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint()); - QVBoxLayout *l2 = new QVBoxLayout(l, 0); - QLabel *editLabel = new QLabel(i18n("Wor&ds to search:"), this); + TQVBoxLayout *l2 = new TQVBoxLayout(l, 0); + TQLabel *editLabel = new TQLabel(i18n("Wor&ds to search:"), this); l2->addWidget(editLabel); - QHBoxLayout *l21 = new QHBoxLayout(l2, 0); + TQHBoxLayout *l21 = new TQHBoxLayout(l2, 0); m_edit = new KLineEdit(this); editLabel->setBuddy(m_edit); m_goSearchButton = new KPushButton(i18n("Se&arch"), this); l21->addWidget(m_edit); l21->addWidget(m_goSearchButton); - QGridLayout *l3 = new QGridLayout(l, 2, 2, 0); + TQGridLayout *l3 = new TQGridLayout(l, 2, 2, 0); m_searchMethodBox = new KComboBox(this); m_searchMethodBox->insertItem(i18n("and")); m_searchMethodBox->insertItem(i18n("or")); - QLabel *smLabel = new QLabel(m_searchMethodBox, i18n("&Method:"), this); + TQLabel *smLabel = new TQLabel(m_searchMethodBox, i18n("&Method:"), this); m_sortMethodBox = new KComboBox(this); m_sortMethodBox->insertItem(i18n("Score")); m_sortMethodBox->insertItem(i18n("Title")); m_sortMethodBox->insertItem(i18n("Date")); - QLabel *rmLabel = new QLabel(m_sortMethodBox, i18n("S&ort by:"), this); + TQLabel *rmLabel = new TQLabel(m_sortMethodBox, i18n("S&ort by:"), this); l3->addWidget(smLabel, 0, 0); l3->addWidget(m_searchMethodBox, 0, 1); l3->addWidget(rmLabel, 1, 0); l3->addWidget(m_sortMethodBox, 1, 1); - QVBoxLayout *l4 = new QVBoxLayout(l, 0); + TQVBoxLayout *l4 = new TQVBoxLayout(l, 0); m_view = new KListView(this); - QLabel *vLabel = new QLabel(m_view, i18n("Search &results:"), this); + TQLabel *vLabel = new TQLabel(m_view, i18n("Search &results:"), this); l4->addWidget(vLabel); l4->addWidget(m_view); - QHBoxLayout *l5 = new QHBoxLayout(l, KDialog::spacingHint()); + TQHBoxLayout *l5 = new TQHBoxLayout(l, KDialog::spacingHint()); m_configButton = new KPushButton(i18n("Update Config"), this); m_indexButton = new KPushButton(i18n("Update Index"), this); l5->addWidget(m_configButton); l5->addWidget(m_indexButton); - l5->addItem(new QSpacerItem(1, 1, QSizePolicy::Expanding, QSizePolicy::Fixed)); + l5->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Expanding, TQSizePolicy::Fixed)); l->addSpacing(2); m_view->setSorting(-1); m_view->addColumn(i18n("Relevance")); m_view->addColumn(i18n("Title")); - m_view->setColumnWidthMode(0, QListView::Maximum); - m_view->setColumnWidthMode(1, QListView::Maximum); + m_view->setColumnWidthMode(0, TQListView::Maximum); + m_view->setColumnWidthMode(1, TQListView::Maximum); m_view->setAllColumnsShowFocus(true); - m_view->setResizeMode( QListView::LastColumn ); - - connect(m_configButton, SIGNAL(clicked()), this, SLOT(updateConfig())); - connect(m_indexButton, SIGNAL(clicked()), this, SLOT(updateIndex())); - connect(m_edit, SIGNAL(returnPressed()), this, SLOT(search())); - connect(m_goSearchButton, SIGNAL(clicked()), this, SLOT(search())); - connect(m_view, SIGNAL(executed(QListViewItem*)), this, SLOT(executed(QListViewItem*))); - connect(m_view, SIGNAL(mouseButtonPressed(int, QListViewItem*, const QPoint&, int )), - this, SLOT(itemMouseButtonPressed(int, QListViewItem*, const QPoint&, int ))); + m_view->setResizeMode( TQListView::LastColumn ); + + connect(m_configButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateConfig())); + connect(m_indexButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateIndex())); + connect(m_edit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(search())); + connect(m_goSearchButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(search())); + connect(m_view, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(executed(TQListViewItem*))); + connect(m_view, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), + this, TQT_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); } SearchView::~SearchView() @@ -129,15 +129,15 @@ void SearchView::updateIndex() config->sync(); } -void SearchView::runHtdig(const QString &arg) +void SearchView::runHtdig(const TQString &arg) { KProcess proc; proc << "kdevelop-htdig" << arg; proc.start(KProcess::DontCare); } -void qt_enter_modal(QWidget *widget); -void qt_leave_modal(QWidget *widget); +void qt_enter_modal(TQWidget *widget); +void qt_leave_modal(TQWidget *widget); void SearchView::search() { @@ -152,7 +152,7 @@ void SearchView::search() updateIndex(); return; } - QString exe = config->readPathEntry("htsearchbin", kapp->dirs()->findExe("htsearch")); + TQString exe = config->readPathEntry("htsearchbin", kapp->dirs()->findExe("htsearch")); if (exe.isEmpty()) { KMessageBox::error(this, i18n("Cannot find the htsearch executable.\nIt is part of the ht://Dig package that is used by KDevelop to perform full text search. Please install ht://Dig and use Documentation page in Configure KDevelop dialog to set the htsearch location.")); @@ -160,16 +160,16 @@ void SearchView::search() return; } - QString indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); - QDir d; - if (indexdir.isEmpty() || !QFile::exists(indexdir + "/htdig.conf")) + TQString indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); + TQDir d; + if (indexdir.isEmpty() || !TQFile::exists(indexdir + "/htdig.conf")) { - if (QFile::exists("/var/lib/kdevelop3/helpindex/htdig.conf")) + if (TQFile::exists("/var/lib/kdevelop3/helpindex/htdig.conf")) indexdir = "/var/lib/kdevelop3/helpindex"; - else if (QFile::exists("/var/lib/kdevelop/helpindex/htdig.conf")) + else if (TQFile::exists("/var/lib/kdevelop/helpindex/htdig.conf")) indexdir = "/var/lib/kdevelop/helpindex"; - if (!QFile::exists(indexdir + "/htdig.conf")) + if (!TQFile::exists(indexdir + "/htdig.conf")) { KMessageBox::error(this, i18n("Cannot find the htdig configuration file.")); kdDebug() << "Cannot find the htdig configuration file" << endl; @@ -177,11 +177,11 @@ void SearchView::search() } } - QString savedir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); + TQString savedir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); if (!d.exists(savedir)) d.mkdir(savedir); - QString query = QString("words=%1;method=%2;matchesperpage=%3;format=%4;sort=%5") + TQString query = TQString("words=%1;method=%2;matchesperpage=%3;format=%4;sort=%5") .arg(m_edit->text()) .arg(m_searchMethodBox->currentItem()==1? "or" : "and") .arg(50) @@ -191,14 +191,14 @@ void SearchView::search() kdDebug(9002) << "starting kprocess" << endl; kdDebug(9002) << "htdig line:" << exe << " -c " << (indexdir + "/htdig.conf ") << query << endl; KProcess *proc = new KProcess; - QString picdir = kapp->dirs()->findResourceDir("data", "kdevdocumentation/pics/htdig.png"); + TQString picdir = kapp->dirs()->findResourceDir("data", "kdevdocumentation/pics/htdig.png"); proc->setEnvironment("PICDIR", picdir); *proc << exe << "-c" << (indexdir + "/htdig.conf") << query; - connect( proc, SIGNAL(receivedStdout(KProcess *,char*,int)), - this, SLOT(htsearchStdout(KProcess *,char*,int)) ); - connect( proc, SIGNAL(processExited(KProcess *)), - this, SLOT(htsearchExited(KProcess *)) ); + connect( proc, TQT_SIGNAL(receivedStdout(KProcess *,char*,int)), + this, TQT_SLOT(htsearchStdout(KProcess *,char*,int)) ); + connect( proc, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(htsearchExited(KProcess *)) ); searchResult = ""; @@ -214,7 +214,7 @@ void SearchView::search() // to block the user interface, but still get repaint // events. Hack taken from NetAccess... kapp->setOverrideCursor(waitCursor); - QWidget blocker(0, 0, WType_Dialog | WShowModal); + TQWidget blocker(0, 0, WType_Dialog | WShowModal); qt_enter_modal(&blocker); kapp->enter_loop(); qt_leave_modal(&blocker); @@ -230,14 +230,14 @@ void SearchView::search() delete proc; // modify the search result - searchResult = searchResult.replace(QRegExp("http://localhost/"), "file:/"); - searchResult = searchResult.replace(QRegExp("Content-type: text/html"), ""); + searchResult = searchResult.replace(TQRegExp("http://localhost/"), "file:/"); + searchResult = searchResult.replace(TQRegExp("Content-type: text/html"), ""); // dump the search result - QFile f(savedir + "/results.html"); + TQFile f(savedir + "/results.html"); if (f.open(IO_WriteOnly)) { - QTextStream ts(&f); + TQTextStream ts(&f); ts << searchResult << endl; f.close(); } @@ -249,7 +249,7 @@ void SearchView::search() void SearchView::htsearchStdout(KProcess *, char *buffer, int len) { - searchResult += QString::fromLocal8Bit(buffer, len); + searchResult += TQString::fromLocal8Bit(buffer, len); } void SearchView::htsearchExited(KProcess *) @@ -260,23 +260,23 @@ void SearchView::htsearchExited(KProcess *) void SearchView::analyseSearchResults() { m_view->clear(); - QTextStream str(searchResult, IO_ReadOnly); + TQTextStream str(searchResult, IO_ReadOnly); DocumentationItem *former = 0; while (!str.eof()) { - QString line = str.readLine(); + TQString line = str.readLine(); - QRegExp starsExp("alt=\"\\*\""); + TQRegExp starsExp("alt=\"\\*\""); starsExp.setMinimal(true); int stars = line.contains(starsExp); - QRegExp urlExp("<strong><a href=\"(.*)\">(.*)</a></strong>"); + TQRegExp urlExp("<strong><a href=\"(.*)\">(.*)</a></strong>"); if (urlExp.search(line)==-1) continue; - QString url = urlExp.cap(1); - QString title = urlExp.cap(2); + TQString url = urlExp.cap(1); + TQString title = urlExp.cap(2); - QString starsStr; + TQString starsStr; for (int i = 0; i < stars; ++i) starsStr += "*"; @@ -291,7 +291,7 @@ void SearchView::analyseSearchResults() executed( m_view->firstChild() ); } -void SearchView::executed(QListViewItem *item) +void SearchView::executed(TQListViewItem *item) { DocumentationItem *d = dynamic_cast<DocumentationItem*>(item); if (!d) @@ -300,7 +300,7 @@ void SearchView::executed(QListViewItem *item) m_part->partController()->showDocument(d->url()); } -void SearchView::itemMouseButtonPressed(int button, QListViewItem *item, const QPoint &pos, int // c +void SearchView::itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int // c ) { if ((button != Qt::RightButton) || (!item)) @@ -312,7 +312,7 @@ void SearchView::itemMouseButtonPressed(int button, QListViewItem *item, const Q DocUtils::docItemPopup(m_part, docItem, pos, true, false, 1); } -void SearchView::setSearchTerm(const QString &term) +void SearchView::setSearchTerm(const TQString &term) { m_edit->setText(term); } @@ -322,7 +322,7 @@ void SearchView::askSearchTerm() m_edit->setFocus(); } -void SearchView::focusInEvent(QFocusEvent */*e*/) +void SearchView::focusInEvent(TQFocusEvent */*e*/) { m_edit->setFocus(); } diff --git a/parts/documentation/searchview.h b/parts/documentation/searchview.h index a57ddd83..32b5f310 100644 --- a/parts/documentation/searchview.h +++ b/parts/documentation/searchview.h @@ -20,7 +20,7 @@ #ifndef SEARCHVIEW_H #define SEARCHVIEW_H -#include <qwidget.h> +#include <tqwidget.h> class DocumentationPart; class KLineEdit; @@ -34,12 +34,12 @@ class SearchView: public QWidget { Q_OBJECT public: - SearchView(DocumentationPart *part, QWidget *parent = 0, const char *name = 0); + SearchView(DocumentationPart *part, TQWidget *parent = 0, const char *name = 0); ~SearchView(); public slots: void search(); - void setSearchTerm(const QString &term); + void setSearchTerm(const TQString &term); void askSearchTerm(); protected slots: @@ -48,14 +48,14 @@ protected slots: void htsearchStdout(KProcess *, char *buffer, int len); void htsearchExited(KProcess *); - void executed(QListViewItem *item); + void executed(TQListViewItem *item); - void itemMouseButtonPressed(int button, QListViewItem *item, const QPoint &pos, int c); + void itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int c); protected: - virtual void focusInEvent(QFocusEvent *e); + virtual void focusInEvent(TQFocusEvent *e); - void runHtdig(const QString &arg); + void runHtdig(const TQString &arg); void analyseSearchResults(); private: @@ -69,7 +69,7 @@ private: KPushButton *m_indexButton; KPushButton *m_goSearchButton; - QString searchResult; + TQString searchResult; }; #endif diff --git a/parts/documentation/selecttopic.cpp b/parts/documentation/selecttopic.cpp index da3fd2e7..4dab4d83 100644 --- a/parts/documentation/selecttopic.cpp +++ b/parts/documentation/selecttopic.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "selecttopic.h" -SelectTopic::SelectTopic(IndexItem::List &urls, QWidget *parent, const char *name) +SelectTopic::SelectTopic(IndexItem::List &urls, TQWidget *parent, const char *name) :SelectTopicBase(parent, name), m_urls(urls) { for (IndexItem::List::const_iterator it = m_urls.begin(); it != m_urls.end(); ++it) @@ -36,7 +36,7 @@ void SelectTopic::accept() if (topicBox->currentItem() == -1) return; else - return QDialog::accept(); + return TQDialog::accept(); } KURL SelectTopic::selectedURL() diff --git a/parts/documentation/selecttopic.h b/parts/documentation/selecttopic.h index ef66ccd7..fdddbf4c 100644 --- a/parts/documentation/selecttopic.h +++ b/parts/documentation/selecttopic.h @@ -27,7 +27,7 @@ class SelectTopic: public SelectTopicBase{ Q_OBJECT public: - SelectTopic(IndexItem::List &urls, QWidget *parent = 0, const char *name = 0); + SelectTopic(IndexItem::List &urls, TQWidget *parent = 0, const char *name = 0); KURL selectedURL(); public slots: diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index 80161301..63e21888 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -16,13 +16,13 @@ #include <iostream> -#include <qapplication.h> -#include <qdir.h> -#include <qfile.h> -#include <qlayout.h> -#include <qtextstream.h> -#include <qtimer.h> -#include <qlabel.h> +#include <tqapplication.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqlayout.h> +#include <tqtextstream.h> +#include <tqtimer.h> +#include <tqlabel.h> #include <kaboutdata.h> #include <kapplication.h> @@ -39,14 +39,14 @@ #define INDEXER -ProgressDialog::ProgressDialog(bool index, QWidget *parent, const char *name) +ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name) :KDialogBase(KDialogBase::Plain, i18n("Generating Search Index"), Cancel | Ok, Close, parent, name, false) { proc = 0; indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); - QDir d; d.mkdir(indexdir); + TQDir d; d.mkdir(indexdir); KConfig config("kdevdocumentation", true); config.setGroup("htdig"); @@ -58,39 +58,39 @@ ProgressDialog::ProgressDialog(bool index, QWidget *parent, const char *name) d.mkdir( databaseDir ); showButtonOK( false ); - QGridLayout *grid = new QGridLayout(plainPage(), 5,3, spacingHint()); + TQGridLayout *grid = new TQGridLayout(plainPage(), 5,3, spacingHint()); - QLabel *l = new QLabel(i18n("Scanning for files"), plainPage()); + TQLabel *l = new TQLabel(i18n("Scanning for files"), plainPage()); grid->addMultiCellWidget(l, 0, 0, 1, 2); - filesLabel = new QLabel(plainPage()); + filesLabel = new TQLabel(plainPage()); grid->addWidget(filesLabel, 1, 2); setFilesScanned(0); - check1 = new QLabel(plainPage()); + check1 = new TQLabel(plainPage()); grid->addWidget(check1, 0, 0); - l = new QLabel(i18n("Extracting search terms"), plainPage()); + l = new TQLabel(i18n("Extracting search terms"), plainPage()); grid->addMultiCellWidget(l, 2,2, 1,2); bar = new KProgress(plainPage()); grid->addWidget(bar, 3,2); - check2 = new QLabel(plainPage()); + check2 = new TQLabel(plainPage()); grid->addWidget(check2, 2,0); - l = new QLabel(i18n("Generating index..."), plainPage()); + l = new TQLabel(i18n("Generating index..."), plainPage()); grid->addMultiCellWidget(l, 4,4, 1,2); - check3 = new QLabel(plainPage()); + check3 = new TQLabel(plainPage()); grid->addWidget(check3, 4,0); setState(0); setMinimumWidth(300); - connect(this, SIGNAL(cancelClicked()), this, SLOT(cancelClicked())); - connect(this, SIGNAL(okClicked()), this, SLOT(okClicked())); - QTimer::singleShot(0, this, SLOT(slotDelayedStart())); + connect(this, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked())); + connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); + TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedStart())); } ProgressDialog::~ProgressDialog() @@ -137,8 +137,8 @@ void ProgressDialog::setFilesDigged(int n) void ProgressDialog::setState(int n) { - QPixmap unchecked = QPixmap(locate("data", "kdevdocumentation/pics/unchecked.xpm")); - QPixmap checked = QPixmap(locate("data", "kdevdocumentation/pics/checked.xpm")); + TQPixmap unchecked = TQPixmap(locate("data", "kdevdocumentation/pics/unchecked.xpm")); + TQPixmap checked = TQPixmap(locate("data", "kdevdocumentation/pics/checked.xpm")); check1->setPixmap( n > 0 ? checked : unchecked); check2->setPixmap( n > 1 ? checked : unchecked); @@ -146,13 +146,13 @@ void ProgressDialog::setState(int n) } -void ProgressDialog::addDir(const QString &dir) +void ProgressDialog::addDir(const TQString &dir) { kdDebug(9002) << "Add dir : " << dir << endl; - QDir d(dir, "*.html", QDir::Name|QDir::IgnoreCase, QDir::Files | QDir::Readable); - QStringList list = d.entryList(); + TQDir d(dir, "*.html", TQDir::Name|TQDir::IgnoreCase, TQDir::Files | TQDir::Readable); + TQStringList list = d.entryList(); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it=list.begin(); it!=list.end(); ++it ) { if( (*it).right( 12 ).lower( ) == "-source.html" ) @@ -162,8 +162,8 @@ void ProgressDialog::addDir(const QString &dir) setFilesScanned(++filesScanned); } - QDir d2(dir, QString::null, QDir::Name|QDir::IgnoreCase, QDir::Dirs); - QStringList dlist = d2.entryList(); + TQDir d2(dir, TQString::null, TQDir::Name|TQDir::IgnoreCase, TQDir::Dirs); + TQStringList dlist = d2.entryList(); for ( it=dlist.begin(); it != dlist.end(); ++it ) { @@ -182,21 +182,21 @@ void ProgressDialog::addDir(const QString &dir) void ProgressDialog::scanDirectories() { - QString ftsLocationsFile = locateLocal("data", "kdevdocumentation/search/locations.txt"); + TQString ftsLocationsFile = locateLocal("data", "kdevdocumentation/search/locations.txt"); - QFile f(ftsLocationsFile); + TQFile f(ftsLocationsFile); if (!f.open(IO_ReadOnly)) return; - QTextStream str(&f); + TQTextStream str(&f); filesScanned = 0; while (!str.eof()) { - QString loc = str.readLine(); + TQString loc = str.readLine(); if (loc.isEmpty()) continue; - QFileInfo fi(loc); + TQFileInfo fi(loc); if (fi.isDir()) addDir(loc); else if (fi.isFile()) @@ -210,27 +210,27 @@ void ProgressDialog::scanDirectories() bool ProgressDialog::createConfig() { // locate the common dir - QString language = KGlobal::locale()->language(); + TQString language = KGlobal::locale()->language(); if (language == "C") language = "en"; - QString wrapper = locate("data", QString("kdevdocumentation/%1/wrapper.html").arg(language)); + TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").arg(language)); if (wrapper.isEmpty()) - wrapper = locate("data", QString("kdevdocumentation/en/wrapper.html")); + wrapper = locate("data", TQString("kdevdocumentation/en/wrapper.html")); if (wrapper.isEmpty()) return false; wrapper = wrapper.left(wrapper.length()-12); // locate the image dir - QString images = locate("data", "kdevdocumentation/pics/star.png"); + TQString images = locate("data", "kdevdocumentation/pics/star.png"); if (images.isEmpty()) return false; images = images.left(images.length()-8); - QFile f(indexdir + "/htdig.conf"); + TQFile f(indexdir + "/htdig.conf"); if (f.open(IO_WriteOnly)) { - QTextStream ts(&f); + TQTextStream ts(&f); ts << "database_dir:\t\t" << databaseDir << endl; ts << "start_url:\t\t`" << indexdir << "/files`" << endl; @@ -268,19 +268,19 @@ void ProgressDialog::startHtdigProcess(bool initial) if (initial) { *proc << "-i"; } - connect(proc, SIGNAL(processExited(KProcess *)), - this, SLOT(htdigExited(KProcess *))); + connect(proc, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(htdigExited(KProcess *))); htdigRunning = true; // write out file - QFile f(indexdir+"/files"); + TQFile f(indexdir+"/files"); if (!f.open(IO_WriteOnly)) { kdDebug(9002) << "Could not open `files` for writing" << endl; done(1); return; } - QTextStream ts(&f); + TQTextStream ts(&f); for (int i=0; i<CHUNK_SIZE; ++i, ++count) { if (count >= filesToDig) { procdone = true; @@ -313,14 +313,14 @@ bool ProgressDialog::generateIndex() setFilesToDig(filesToDig); filesDigged = 0; - // QDir d; d.mkdir(indexdir); + // TQDir d; d.mkdir(indexdir); startHtdigProcess(true); return true; } void ProgressDialog::htdigStdout(KProcess *, char *buffer, int len) { - QString line = QString(buffer).left(len); + TQString line = TQString(buffer).left(len); int cnt=0, index=-1; while ( (index = line.find("http://", index+1)) > 0) @@ -387,8 +387,8 @@ void ProgressDialog::startHtmergeProcess() kdDebug(9002) << "Running htmerge" << endl; - connect(proc, SIGNAL(processExited(KProcess *)), - this, SLOT(htmergeExited(KProcess *))); + connect(proc, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(htmergeExited(KProcess *))); htmergeRunning = true; diff --git a/parts/documentation/tools/htdig/htdigindex.h b/parts/documentation/tools/htdig/htdigindex.h index eec8b595..d9fc3232 100644 --- a/parts/documentation/tools/htdig/htdigindex.h +++ b/parts/documentation/tools/htdig/htdigindex.h @@ -26,10 +26,10 @@ class ProgressDialog : public KDialogBase { Q_OBJECT public: - ProgressDialog(bool index, QWidget *parent=0, const char *name=0); + ProgressDialog(bool index, TQWidget *parent=0, const char *name=0); ~ProgressDialog(); - void addDir(const QString &dir); + void addDir(const TQString &dir); void scanDirectories(); bool createConfig(); bool generateIndex(); @@ -51,15 +51,15 @@ private: void startHtdigProcess(bool initial); void startHtmergeProcess(); - QLabel *filesLabel, *check1, *check2, *check3; + TQLabel *filesLabel, *check1, *check2, *check3; KProgress *bar; int count; bool procdone; - QString databaseDir; - QString indexdir; - QString exe; - QStringList files; + TQString databaseDir; + TQString indexdir; + TQString exe; + TQStringList files; KProcess *proc; volatile int filesToDig, filesDigged, filesScanned; bool htdigRunning, htmergeRunning; diff --git a/parts/doxygen/config.cpp b/parts/doxygen/config.cpp index a36cf682..de582013 100644 --- a/parts/doxygen/config.cpp +++ b/parts/doxygen/config.cpp @@ -547,12 +547,12 @@ char *yytext; #include <ctype.h> #include <stdarg.h> -#include <qfileinfo.h> -#include <qfile.h> -#include <qdir.h> -#include <qtextstream.h> -#include <qregexp.h> -#include <qptrstack.h> +#include <tqfileinfo.h> +#include <tqfile.h> +#include <tqdir.h> +#include <tqtextstream.h> +#include <tqregexp.h> +#include <tqptrstack.h> #include "config.h" #include "version.h" @@ -593,14 +593,14 @@ void config_warn(const char *fmt, ...) /* ----------------------------------------------------------------- */ -QCString ConfigOption::convertToComment(const QCString &s) +TQCString ConfigOption::convertToComment(const TQCString &s) { - QCString result; + TQCString result; if (s.isEmpty()) return result; else { result+="# "; - QCString tmp=s.stripWhiteSpace(); + TQCString tmp=s.stripWhiteSpace(); char *p=tmp.data(); char c; while ((c=*p++)) @@ -613,17 +613,17 @@ QCString ConfigOption::convertToComment(const QCString &s) return result; } -void ConfigOption::writeBoolValue(QTextStream &t,bool v) +void ConfigOption::writeBoolValue(TQTextStream &t,bool v) { if (v) t << "YES"; else t << "NO"; } -void ConfigOption::writeIntValue(QTextStream &t,int i) +void ConfigOption::writeIntValue(TQTextStream &t,int i) { t << i; } -void ConfigOption::writeStringValue(QTextStream &t,QCString &s) +void ConfigOption::writeStringValue(TQTextStream &t,TQCString &s) { const char *p=s.data(); char c; @@ -650,13 +650,13 @@ void ConfigOption::writeStringValue(QTextStream &t,QCString &s) } } -void ConfigOption::writeStringList(QTextStream &t,QStrList &l) +void ConfigOption::writeStringList(TQTextStream &t,TQStrList &l) { const char *p = l.first(); bool first=TRUE; while (p) { - QCString s=p; + TQCString s=p; if (!first) t << " "; first=FALSE; writeStringValue(t,s); @@ -687,7 +687,7 @@ void ConfigInt::convertStrToVal() void ConfigBool::convertStrToVal() { - QCString val = m_valueString.stripWhiteSpace().lower(); + TQCString val = m_valueString.stripWhiteSpace().lower(); if (!val.isEmpty()) { if (val=="yes" || val=="true" || val=="1") @@ -706,7 +706,7 @@ void ConfigBool::convertStrToVal() } } -QCString &Config::getString(const char *fileName,int num,const char *name) const +TQCString &Config::getString(const char *fileName,int num,const char *name) const { ConfigOption *opt = m_dict->find(name); if (opt==0) @@ -722,7 +722,7 @@ QCString &Config::getString(const char *fileName,int num,const char *name) const return *((ConfigString *)opt)->valueRef(); } -QStrList &Config::getList(const char *fileName,int num,const char *name) const +TQStrList &Config::getList(const char *fileName,int num,const char *name) const { ConfigOption *opt = m_dict->find(name); if (opt==0) @@ -738,7 +738,7 @@ QStrList &Config::getList(const char *fileName,int num,const char *name) const return *((ConfigList *)opt)->valueRef(); } -QCString &Config::getEnum(const char *fileName,int num,const char *name) const +TQCString &Config::getEnum(const char *fileName,int num,const char *name) const { ConfigOption *opt = m_dict->find(name); if (opt==0) @@ -797,31 +797,31 @@ struct ConfigFileState FILE *filePtr; YY_BUFFER_STATE oldState; YY_BUFFER_STATE newState; - QCString fileName; + TQCString fileName; }; static const char *inputString; static int inputPosition; static int yyLineNr; -static QCString yyFileName; -static QCString tmpString; -static QCString *s=0; +static TQCString yyFileName; +static TQCString tmpString; +static TQCString *s=0; static bool *b=0; -static QStrList *l=0; +static TQStrList *l=0; static int lastState; -static QCString elemStr; -static QCString includeName; -static QStrList includePathList; -static QPtrStack<ConfigFileState> includeStack; +static TQCString elemStr; +static TQCString includeName; +static TQStrList includePathList; +static TQPtrStack<ConfigFileState> includeStack; static int includeDepth; -static QCString tabSizeString; -static QCString maxInitLinesString; -static QCString colsInAlphaIndexString; -static QCString enumValuesPerLineString; -static QCString treeViewWidthString; -static QCString maxDotGraphWidthString; -static QCString maxDotGraphHeightString; +static TQCString tabSizeString; +static TQCString maxInitLinesString; +static TQCString colsInAlphaIndexString; +static TQCString enumValuesPerLineString; +static TQCString treeViewWidthString; +static TQCString maxDotGraphWidthString; +static TQCString maxDotGraphHeightString; static Config *config; @@ -854,8 +854,8 @@ static int yyread(char *buf,int max_size) static FILE *tryPath(const char *path,const char *fileName) { - QCString absName=(path ? (QCString)path+"/"+fileName : (QCString)fileName); - QFileInfo fi(absName); + TQCString absName=(path ? (TQCString)path+"/"+fileName : (TQCString)fileName); + TQFileInfo fi(absName); if (fi.exists() && fi.isFile()) { FILE *f=fopen(absName,"r"); @@ -865,8 +865,8 @@ static FILE *tryPath(const char *path,const char *fileName) return 0; } -static void substEnvVarsInStrList(QStrList &sl); -static void substEnvVarsInString(QCString &s); +static void substEnvVarsInStrList(TQStrList &sl); +static void substEnvVarsInString(TQCString &s); static bool isAbsolute(const char * fileName) { @@ -909,7 +909,7 @@ static void readIncludeFile(const char *incName) exit(1); } - QCString inc = incName; + TQCString inc = incName; substEnvVarsInString(inc); inc = inc.stripWhiteSpace(); uint incLen = inc.length(); @@ -1217,7 +1217,7 @@ YY_RULE_SETUP case 3: YY_RULE_SETUP #line 429 "config.l" -{ QCString cmd=yytext; +{ TQCString cmd=yytext; cmd=cmd.left(cmd.length()-1).stripWhiteSpace(); ConfigOption *option = config->get(cmd); if (option==0) // oops not known @@ -1273,7 +1273,7 @@ YY_RULE_SETUP case 4: YY_RULE_SETUP #line 481 "config.l" -{ QCString cmd=yytext; +{ TQCString cmd=yytext; cmd=cmd.left(cmd.length()-2).stripWhiteSpace(); ConfigOption *option = config->get(cmd); if (option==0) // oops not known @@ -1446,7 +1446,7 @@ case 17: YY_RULE_SETUP #line 590 "config.l" { - QCString bs=yytext; + TQCString bs=yytext; bs=bs.upper(); if (bs=="YES" || bs=="1") *b=TRUE; @@ -2388,17 +2388,17 @@ int main() */ #if 0 -static void writeBoolValue(QTextStream &t,bool v) +static void writeBoolValue(TQTextStream &t,bool v) { if (v) t << "YES"; else t << "NO"; } -static void writeIntValue(QTextStream &t,int i) +static void writeIntValue(TQTextStream &t,int i) { t << i; } -static void writeStringValue(QTextStream &t,QCString &s) +static void writeStringValue(TQTextStream &t,TQCString &s) { const char *p=s.data(); char c; @@ -2413,7 +2413,7 @@ static void writeStringValue(QTextStream &t,QCString &s) } } -static void writeStringList(QTextStream &t,QStrList &l) +static void writeStringList(TQTextStream &t,TQStrList &l) { const char *p = l.first(); bool first=TRUE; @@ -2432,7 +2432,7 @@ static void writeStringList(QTextStream &t,QStrList &l) } #endif -void Config::writeTemplate(QTextStream &t,bool sl,bool upd) +void Config::writeTemplate(TQTextStream &t,bool sl,bool upd) { t << "# Doxyfile " << versionString << endl << endl; if (!sl) @@ -2465,9 +2465,9 @@ void Config::convertStrToVal() } } -static void substEnvVarsInString(QCString &s) +static void substEnvVarsInString(TQCString &s) { - static QRegExp re("\\$\\([a-z_A-Z0-9]+\\)"); + static TQRegExp re("\\$\\([a-z_A-Z0-9]+\\)"); if (s.isEmpty()) return; int p=0; int i,l; @@ -2476,7 +2476,7 @@ static void substEnvVarsInString(QCString &s) { l = re.matchedLength(); //printf("Found environment var s.mid(%d,%d)=`%s'\n",i+2,l-3,s.mid(i+2,l-3).data()); - QCString env=getenv(s.mid(i+2,l-3)); + TQCString env=getenv(s.mid(i+2,l-3)); substEnvVarsInString(env); // recursively expand variables if needed. s = s.left(i)+env+s.right(s.length()-i-l); p=i+env.length(); // next time start at the end of the expanded string @@ -2486,12 +2486,12 @@ static void substEnvVarsInString(QCString &s) //printf("substEnvVarInString(%s) end\n",s.data()); } -static void substEnvVarsInStrList(QStrList &sl) +static void substEnvVarsInStrList(TQStrList &sl) { char *s = sl.first(); while (s) { - QCString result(s); + TQCString result(s); // an argument with quotes will have an extra space at the end, so wasQuoted will be TRUE. bool wasQuoted = (result.find(' ')!=-1) || (result.find('\t')!=-1); // here we strip the quote again @@ -2605,7 +2605,7 @@ void Config::substituteEnvironmentVars() } } -static void cleanUpPaths(QStrList &str) +static void cleanUpPaths(TQStrList &str) { char *sfp = str.first(); while (sfp) @@ -2620,20 +2620,20 @@ static void cleanUpPaths(QStrList &str) p++; } } - QCString path = sfp; + TQCString path = sfp; if ((path.at(0)!='/' && (path.length()<=2 || path.at(1)!=':')) || path.at(path.length()-1)!='/' ) { - QFileInfo fi(path); + TQFileInfo fi(path); if (fi.exists() && fi.isDir()) { int i = str.at(); str.remove(); if (str.at()==i) // did not remove last item - str.insert(i,QFile::encodeName(fi.absFilePath()+"/")); + str.insert(i,TQFile::encodeName(fi.absFilePath()+"/")); else - str.append(QFile::encodeName(fi.absFilePath()+"/")); + str.append(TQFile::encodeName(fi.absFilePath()+"/")); } } sfp = str.next(); @@ -2647,7 +2647,7 @@ void Config::check() // projectName[0]=toupper(projectName[0]); //} - QCString &warnFormat = Config_getString("WARN_FORMAT"); + TQCString &warnFormat = Config_getString("WARN_FORMAT"); if (warnFormat.stripWhiteSpace().isEmpty()) { warnFormat="$file:$line $text"; @@ -2668,7 +2668,7 @@ void Config::check() } } - QCString &manExtension = Config_getString("MAN_EXTENSION"); + TQCString &manExtension = Config_getString("MAN_EXTENSION"); // set default man page extension if non is given by the user if (manExtension.isEmpty()) @@ -2676,7 +2676,7 @@ void Config::check() manExtension=".3"; } - QCString &paperType = Config_getEnum("PAPER_TYPE"); + TQCString &paperType = Config_getEnum("PAPER_TYPE"); paperType=paperType.lower().stripWhiteSpace(); if (paperType.isEmpty()) { @@ -2688,14 +2688,14 @@ void Config::check() config_err("Error: Unknown page type specified"); } - QCString &outputLanguage=Config_getEnum("OUTPUT_LANGUAGE"); + TQCString &outputLanguage=Config_getEnum("OUTPUT_LANGUAGE"); outputLanguage=outputLanguage.stripWhiteSpace(); if (outputLanguage.isEmpty()) { outputLanguage = "English"; } - QCString &htmlFileExtension=Config_getString("HTML_FILE_EXTENSION"); + TQCString &htmlFileExtension=Config_getString("HTML_FILE_EXTENSION"); htmlFileExtension=htmlFileExtension.stripWhiteSpace(); if (htmlFileExtension.isEmpty()) { @@ -2703,11 +2703,11 @@ void Config::check() } // expand the relative stripFromPath values - QStrList &stripFromPath = Config_getList("STRIP_FROM_PATH"); + TQStrList &stripFromPath = Config_getList("STRIP_FROM_PATH"); char *sfp = stripFromPath.first(); if (sfp==0) // by default use the current path { - stripFromPath.append(QFile::encodeName(QDir::currentDirPath()+"/")); + stripFromPath.append(TQFile::encodeName(TQDir::currentDirPath()+"/")); } else { @@ -2715,14 +2715,14 @@ void Config::check() } // expand the relative stripFromPath values - QStrList &stripFromIncPath = Config_getList("STRIP_FROM_INC_PATH"); + TQStrList &stripFromIncPath = Config_getList("STRIP_FROM_INC_PATH"); cleanUpPaths(stripFromIncPath); // Test to see if HTML header is valid - QCString &headerFile = Config_getString("HTML_HEADER"); + TQCString &headerFile = Config_getString("HTML_HEADER"); if (!headerFile.isEmpty()) { - QFileInfo fi(headerFile); + TQFileInfo fi(headerFile); if (!fi.exists()) { config_err("Error: tag HTML_HEADER: header file `%s' " @@ -2731,10 +2731,10 @@ void Config::check() } } // Test to see if HTML footer is valid - QCString &footerFile = Config_getString("HTML_FOOTER"); + TQCString &footerFile = Config_getString("HTML_FOOTER"); if (!footerFile.isEmpty()) { - QFileInfo fi(footerFile); + TQFileInfo fi(footerFile); if (!fi.exists()) { config_err("Error: tag HTML_FOOTER: footer file `%s' " @@ -2743,10 +2743,10 @@ void Config::check() } } // Test to see if LaTeX header is valid - QCString &latexHeaderFile = Config_getString("LATEX_HEADER"); + TQCString &latexHeaderFile = Config_getString("LATEX_HEADER"); if (!latexHeaderFile.isEmpty()) { - QFileInfo fi(latexHeaderFile); + TQFileInfo fi(latexHeaderFile); if (!fi.exists()) { config_err("Error: tag LATEX_HEADER: header file `%s' " @@ -2755,24 +2755,24 @@ void Config::check() } } // check include path - QStrList &includePath = Config_getList("INCLUDE_PATH"); + TQStrList &includePath = Config_getList("INCLUDE_PATH"); char *s=includePath.first(); while (s) { - QFileInfo fi(s); + TQFileInfo fi(s); if (!fi.exists()) config_err("Warning: tag INCLUDE_PATH: include path `%s' " "does not exist\n",s); s=includePath.next(); } // check aliases - QStrList &aliasList = Config_getList("ALIASES"); + TQStrList &aliasList = Config_getList("ALIASES"); s=aliasList.first(); while (s) { - QRegExp re1("[a-z_A-Z][a-z_A-Z0-9]*[ \t]*="); // alias without argument - QRegExp re2("[a-z_A-Z][a-z_A-Z0-9]*{[0-9]*}[ \t]*="); // alias with argument - QCString alias=s; + TQRegExp re1("[a-z_A-Z][a-z_A-Z0-9]*[ \t]*="); // alias without argument + TQRegExp re2("[a-z_A-Z][a-z_A-Z0-9]*{[0-9]*}[ \t]*="); // alias with argument + TQCString alias=s; alias=alias.stripWhiteSpace(); if (alias.find(re1)!=0 && alias.find(re2)!=0) { @@ -2783,7 +2783,7 @@ void Config::check() } // check dot image format - QCString &dotImageFormat=Config_getEnum("DOT_IMAGE_FORMAT"); + TQCString &dotImageFormat=Config_getEnum("DOT_IMAGE_FORMAT"); dotImageFormat=dotImageFormat.stripWhiteSpace(); if (dotImageFormat.isEmpty()) { @@ -2797,10 +2797,10 @@ void Config::check() // check dot path - QCString &dotPath = Config_getString("DOT_PATH"); + TQCString &dotPath = Config_getString("DOT_PATH"); if (!dotPath.isEmpty()) { - QFileInfo dp(dotPath+"/dot"+portable_commandExtension()); + TQFileInfo dp(dotPath+"/dot"+portable_commandExtension()); if (!dp.exists() || !dp.isFile()) { config_err("Warning: the dot tool could not be found at %s\n",dotPath.data()); @@ -2808,7 +2808,7 @@ void Config::check() } else { - dotPath=QFile::encodeName( dp.dirPath(TRUE)+"/" ); + dotPath=TQFile::encodeName( dp.dirPath(TRUE)+"/" ); #if defined(_WIN32) // convert slashes uint i=0,l=dotPath.length(); for (i=0;i<l;i++) if (dotPath.at(i)=='/') dotPath.at(i)='\\'; @@ -2821,10 +2821,10 @@ void Config::check() } // check mscgen path - QCString &mscgenPath = Config_getString("MSCGEN_PATH"); + TQCString &mscgenPath = Config_getString("MSCGEN_PATH"); if (!mscgenPath.isEmpty()) { - QFileInfo dp(mscgenPath+"/mscgen"+portable_commandExtension()); + TQFileInfo dp(mscgenPath+"/mscgen"+portable_commandExtension()); if (!dp.exists() || !dp.isFile()) { config_err("Warning: the mscgen tool could not be found at %s\n",mscgenPath.data()); @@ -2832,7 +2832,7 @@ void Config::check() } else { - mscgenPath=QFile::encodeName( dp.dirPath(TRUE)+"/" ); + mscgenPath=TQFile::encodeName( dp.dirPath(TRUE)+"/" ); #if defined(_WIN32) // convert slashes uint i=0,l=mscgenPath.length(); for (i=0;i<l;i++) if (mscgenPath.at(i)=='/') mscgenPath.at(i)='\\'; @@ -2846,18 +2846,18 @@ void Config::check() // check input - QStrList &inputSources=Config_getList("INPUT"); + TQStrList &inputSources=Config_getList("INPUT"); if (inputSources.count()==0) { // use current dir as the default - inputSources.append(QFile::encodeName( QDir::currentDirPath() )); + inputSources.append(TQFile::encodeName( TQDir::currentDirPath() )); } else { s=inputSources.first(); while (s) { - QFileInfo fi(s); + TQFileInfo fi(s); if (!fi.exists()) { config_err("Warning: tag INPUT: input source `%s' does not exist\n",s); @@ -2867,7 +2867,7 @@ void Config::check() } // add default pattern if needed - QStrList &filePatternList = Config_getList("FILE_PATTERNS"); + TQStrList &filePatternList = Config_getList("FILE_PATTERNS"); if (filePatternList.isEmpty()) { filePatternList.append("*.c"); @@ -2926,7 +2926,7 @@ void Config::check() } // add default pattern if needed - QStrList &examplePatternList = Config_getList("EXAMPLE_PATTERNS"); + TQStrList &examplePatternList = Config_getList("EXAMPLE_PATTERNS"); if (examplePatternList.isEmpty()) { examplePatternList.append("*"); @@ -3033,7 +3033,7 @@ void Config::check() // add default words if needed - QStrList &annotationFromBrief = Config_getList("ABBREVIATE_BRIEF"); + TQStrList &annotationFromBrief = Config_getList("ABBREVIATE_BRIEF"); if (annotationFromBrief.isEmpty()) { annotationFromBrief.append("The $name class"); @@ -5080,10 +5080,10 @@ void Config::create() // The IMAGE_PATTERNS tag is now officially obsolete. } -static QCString configFileToString(const char *name) +static TQCString configFileToString(const char *name) { if (name==0 || name[0]==0) return 0; - QFile f; + TQFile f; bool fileOpened=FALSE; if (name[0]=='-' && name[1]==0) // read from stdin @@ -5092,7 +5092,7 @@ static QCString configFileToString(const char *name) if (fileOpened) { const int bSize=4096; - QCString contents(bSize); + TQCString contents(bSize); int totalSize=0; int size; while ((size=f.readBlock(contents.data()+totalSize,bSize))==bSize) @@ -5109,7 +5109,7 @@ static QCString configFileToString(const char *name) } else // read from file { - QFileInfo fi(name); + TQFileInfo fi(name); if (!fi.exists() || !fi.isFile()) { config_err("Error: file `%s' not found\n",name); @@ -5120,7 +5120,7 @@ static QCString configFileToString(const char *name) if (fileOpened) { int fsize=f.size(); - QCString contents(fsize+2); + TQCString contents(fsize+2); f.readBlock(contents.data(),fsize); f.close(); if (fsize==0 || contents[fsize-1]=='\n') diff --git a/parts/doxygen/config.h b/parts/doxygen/config.h index a72002c1..2486956e 100644 --- a/parts/doxygen/config.h +++ b/parts/doxygen/config.h @@ -1,11 +1,11 @@ #ifndef CONFIG_H #define CONFIG_H -#include <qstrlist.h> -#include <qfile.h> -#include <qdict.h> -#include <qptrlist.h> -#include <qtextstream.h> +#include <tqstrlist.h> +#include <tqfile.h> +#include <tqdict.h> +#include <tqptrlist.h> +#include <tqtextstream.h> /*! \brief Abstract base class for any configuration option. * @@ -44,30 +44,30 @@ class ConfigOption /*! returns the kind of option this is. */ OptionType kind() const { return m_kind; } - QCString name() const { return m_name; } - QCString docs() const { return m_doc; } + TQCString name() const { return m_name; } + TQCString docs() const { return m_doc; } - QCString dependsOn() const { return m_dependency; } + TQCString dependsOn() const { return m_dependency; } void addDependency(const char *dep) { m_dependency = dep; } - void setEncoding(const QCString &e) { m_encoding = e; } + void setEncoding(const TQCString &e) { m_encoding = e; } protected: - virtual void writeTemplate(QTextStream &t,bool sl,bool upd) = 0; + virtual void writeTemplate(TQTextStream &t,bool sl,bool upd) = 0; virtual void convertStrToVal() {} virtual void substEnvVars() = 0; virtual void init() {} - QCString convertToComment(const QCString &s); - void writeBoolValue(QTextStream &t,bool v); - void writeIntValue(QTextStream &t,int i); - void writeStringValue(QTextStream &t,QCString &s); - void writeStringList(QTextStream &t,QStrList &l); - - QCString m_spaces; - QCString m_name; - QCString m_doc; - QCString m_dependency; - QCString m_encoding; + TQCString convertToComment(const TQCString &s); + void writeBoolValue(TQTextStream &t,bool v); + void writeIntValue(TQTextStream &t,int i); + void writeStringValue(TQTextStream &t,TQCString &s); + void writeStringList(TQTextStream &t,TQStrList &l); + + TQCString m_spaces; + TQCString m_name; + TQCString m_doc; + TQCString m_dependency; + TQCString m_encoding; OptionType m_kind; }; @@ -83,7 +83,7 @@ class ConfigInfo : public ConfigOption m_name = name; m_doc = doc; } - void writeTemplate(QTextStream &t, bool sl,bool) + void writeTemplate(TQTextStream &t, bool sl,bool) { if (!sl) { @@ -113,8 +113,8 @@ class ConfigList : public ConfigOption void addValue(const char *v) { m_value.append(v); } void setWidgetType(WidgetType w) { m_widgetType = w; } WidgetType widgetType() const { return m_widgetType; } - QStrList *valueRef() { return &m_value; } - void writeTemplate(QTextStream &t,bool sl,bool) + TQStrList *valueRef() { return &m_value; } + void writeTemplate(TQTextStream &t,bool sl,bool) { if (!sl) { @@ -129,7 +129,7 @@ class ConfigList : public ConfigOption void substEnvVars(); void init() { m_value.clear(); } private: - QStrList m_value; + TQStrList m_value; WidgetType m_widgetType; }; @@ -148,13 +148,13 @@ class ConfigEnum : public ConfigOption m_defValue = defVal; } void addValue(const char *v) { m_valueRange.append(v); } - QStrListIterator iterator() + TQStrListIterator iterator() { - return QStrListIterator(m_valueRange); + return TQStrListIterator(m_valueRange); } - QCString *valueRef() { return &m_value; } + TQCString *valueRef() { return &m_value; } void substEnvVars(); - void writeTemplate(QTextStream &t,bool sl,bool) + void writeTemplate(TQTextStream &t,bool sl,bool) { if (!sl) { @@ -169,9 +169,9 @@ class ConfigEnum : public ConfigOption void init() { m_value = m_defValue.copy(); } private: - QStrList m_valueRange; - QCString m_value; - QCString m_defValue; + TQStrList m_valueRange; + TQCString m_value; + TQCString m_defValue; }; /*! \brief Option of the string type. @@ -194,8 +194,8 @@ class ConfigString : public ConfigOption void setWidgetType(WidgetType w) { m_widgetType = w; } WidgetType widgetType() const { return m_widgetType; } void setDefaultValue(const char *v) { m_defValue = v; } - QCString *valueRef() { return &m_value; } - void writeTemplate(QTextStream &t,bool sl,bool) + TQCString *valueRef() { return &m_value; } + void writeTemplate(TQTextStream &t,bool sl,bool) { if (!sl) { @@ -211,8 +211,8 @@ class ConfigString : public ConfigOption void init() { m_value = m_defValue.copy(); } private: - QCString m_value; - QCString m_defValue; + TQCString m_value; + TQCString m_defValue; WidgetType m_widgetType; }; @@ -232,13 +232,13 @@ class ConfigInt : public ConfigOption m_minVal = minVal; m_maxVal = maxVal; } - QCString *valueStringRef() { return &m_valueString; } + TQCString *valueStringRef() { return &m_valueString; } int *valueRef() { return &m_value; } int minVal() const { return m_minVal; } int maxVal() const { return m_maxVal; } void convertStrToVal(); void substEnvVars(); - void writeTemplate(QTextStream &t,bool sl,bool upd) + void writeTemplate(TQTextStream &t,bool sl,bool upd) { if (!sl) { @@ -263,7 +263,7 @@ class ConfigInt : public ConfigOption int m_defValue; int m_minVal; int m_maxVal; - QCString m_valueString; + TQCString m_valueString; }; /*! \brief Option of the boolean type. @@ -280,12 +280,12 @@ class ConfigBool : public ConfigOption m_value = defVal; m_defValue = defVal; } - QCString *valueStringRef() { return &m_valueString; } + TQCString *valueStringRef() { return &m_valueString; } bool *valueRef() { return &m_value; } void convertStrToVal(); void substEnvVars(); - void setValueString(const QCString &v) { m_valueString = v; } - void writeTemplate(QTextStream &t,bool sl,bool upd) + void setValueString(const TQCString &v) { m_valueString = v; } + void writeTemplate(TQTextStream &t,bool sl,bool upd) { if (!sl) { @@ -308,7 +308,7 @@ class ConfigBool : public ConfigOption private: bool m_value; bool m_defValue; - QCString m_valueString; + TQCString m_valueString; }; /*! \brief Section marker for obsolete options @@ -318,7 +318,7 @@ class ConfigObsolete : public ConfigOption { public: ConfigObsolete(OptionType t) : ConfigOption(t) {} - void writeTemplate(QTextStream &,bool,bool) {} + void writeTemplate(TQTextStream &,bool,bool) {} void substEnvVars() {} }; @@ -364,9 +364,9 @@ class Config /*! Returns an iterator that can by used to iterate over the * configuration options. */ - QPtrListIterator<ConfigOption> iterator() + TQPtrListIterator<ConfigOption> iterator() { - return QPtrListIterator<ConfigOption>(*m_options); + return TQPtrListIterator<ConfigOption>(*m_options); } /*! @@ -378,19 +378,19 @@ class Config * The arguments \a num and \a name are for debugging purposes only. * There is a convenience function Config_getString() for this. */ - QCString &getString(const char *fileName,int num,const char *name) const; + TQCString &getString(const char *fileName,int num,const char *name) const; /*! Returns the value of the list option with name \a fileName. * The arguments \a num and \a name are for debugging purposes only. * There is a convenience function Config_getList() for this. */ - QStrList &getList(const char *fileName,int num,const char *name) const; + TQStrList &getList(const char *fileName,int num,const char *name) const; /*! Returns the value of the enum option with name \a fileName. * The arguments \a num and \a name are for debugging purposes only. * There is a convenience function Config_getEnum() for this. */ - QCString &getEnum(const char *fileName,int num,const char *name) const; + TQCString &getEnum(const char *fileName,int num,const char *name) const; /*! Returns the value of the integer option with name \a fileName. * The arguments \a num and \a name are for debugging purposes only. @@ -508,7 +508,7 @@ class Config * is \c TRUE the description of each configuration option will * be omitted. */ - void writeTemplate(QTextStream &t,bool shortIndex,bool updateOnly); + void writeTemplate(TQTextStream &t,bool shortIndex,bool updateOnly); ///////////////////////////// // internal API @@ -553,9 +553,9 @@ class Config Config() { - m_options = new QPtrList<ConfigOption>; - m_obsolete = new QPtrList<ConfigOption>; - m_dict = new QDict<ConfigOption>(257); + m_options = new TQPtrList<ConfigOption>; + m_obsolete = new TQPtrList<ConfigOption>; + m_dict = new TQDict<ConfigOption>(257); m_options->setAutoDelete(TRUE); m_obsolete->setAutoDelete(TRUE); m_initialized = FALSE; @@ -569,9 +569,9 @@ class Config } private: - QPtrList<ConfigOption> *m_options; - QPtrList<ConfigOption> *m_obsolete; - QDict<ConfigOption> *m_dict; + TQPtrList<ConfigOption> *m_options; + TQPtrList<ConfigOption> *m_obsolete; + TQDict<ConfigOption> *m_dict; static Config *m_instance; bool m_initialized; }; diff --git a/parts/doxygen/doxygenconfigwidget.cpp b/parts/doxygen/doxygenconfigwidget.cpp index 27f39863..8269bf0e 100644 --- a/parts/doxygen/doxygenconfigwidget.cpp +++ b/parts/doxygen/doxygenconfigwidget.cpp @@ -13,10 +13,10 @@ #include "doxygenconfigwidget.h" -#include <qscrollview.h> -#include <qvbox.h> -#include <qwhatsthis.h> -#include <qtextstream.h> +#include <tqscrollview.h> +#include <tqvbox.h> +#include <tqwhatsthis.h> +#include <tqtextstream.h> #include <klocale.h> #include <kdebug.h> @@ -27,30 +27,30 @@ #include "messages.h" -DoxygenConfigWidget::DoxygenConfigWidget(const QString &fileName, QWidget *parent, const char *name) - : QTabWidget(parent, name) +DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *parent, const char *name) + : TQTabWidget(parent, name) { m_hasChanged = false; - m_dependencies = new QDict< QPtrList<IInput> >(257); + m_dependencies = new TQDict< TQPtrList<IInput> >(257); m_dependencies->setAutoDelete(true); - m_inputWidgets = new QDict< IInput >; - m_switches = new QDict< QObject >; + m_inputWidgets = new TQDict< IInput >; + m_switches = new TQDict< TQObject >; - QPtrListIterator<ConfigOption> options = Config::instance()->iterator(); - QScrollView *page = 0; - QVBox *pagebox = 0; + TQPtrListIterator<ConfigOption> options = Config::instance()->iterator(); + TQScrollView *page = 0; + TQVBox *pagebox = 0; ConfigOption *option = 0; for (options.toFirst(); (option=options.current()); ++options) { switch(option->kind()) { case ConfigOption::O_Info: - page = new QScrollView(this, option->name()); + page = new TQScrollView(this, option->name()); page->viewport()->setBackgroundMode(PaletteBackground); - pagebox = new QVBox(0); + pagebox = new TQVBox(0); Q_ASSERT(pagebox!=0); page->addChild(pagebox); addTab(page, message(option->name())); - QWhatsThis::add(page, option->docs().simplifyWhiteSpace() ); + TQWhatsThis::add(page, option->docs().simplifyWhiteSpace() ); break; case ConfigOption::O_String: { @@ -67,8 +67,8 @@ DoxygenConfigWidget::DoxygenConfigWidget(const QString &fileName, QWidget *paren *((ConfigString *)option)->valueRef(), // variable sm // type ); - QWhatsThis::add(inputString, option->docs().simplifyWhiteSpace()); - connect(inputString, SIGNAL(changed()), this, SLOT(changed())); + TQWhatsThis::add(inputString, option->docs().simplifyWhiteSpace()); + connect(inputString, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); m_inputWidgets->insert(option->name(), inputString); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -82,11 +82,11 @@ DoxygenConfigWidget::DoxygenConfigWidget(const QString &fileName, QWidget *paren *((ConfigEnum *)option)->valueRef(), // variable InputString::StringFixed // type ); - QStrListIterator sli=((ConfigEnum *)option)->iterator(); + TQStrListIterator sli=((ConfigEnum *)option)->iterator(); for (sli.toFirst(); sli.current(); ++sli) inputString->addValue(sli.current()); - QWhatsThis::add(inputString, option->docs().simplifyWhiteSpace()); - connect(inputString, SIGNAL(changed()), this, SLOT(changed())); + TQWhatsThis::add(inputString, option->docs().simplifyWhiteSpace()); + connect(inputString, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); m_inputWidgets->insert(option->name(),inputString); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -108,8 +108,8 @@ DoxygenConfigWidget::DoxygenConfigWidget(const QString &fileName, QWidget *paren *((ConfigList *)option)->valueRef(), // variable lm // type ); - QWhatsThis::add(inputStrList, option->docs().simplifyWhiteSpace()); - connect(inputStrList, SIGNAL(changed()), this, SLOT(changed())); + TQWhatsThis::add(inputStrList, option->docs().simplifyWhiteSpace()); + connect(inputStrList, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); m_inputWidgets->insert(option->name(),inputStrList); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -123,8 +123,8 @@ DoxygenConfigWidget::DoxygenConfigWidget(const QString &fileName, QWidget *paren pagebox, // widget *((ConfigBool *)option)->valueRef() // variable ); - QWhatsThis::add(inputBool, option->docs().simplifyWhiteSpace()); - connect(inputBool, SIGNAL(changed()), this, SLOT(changed())); + TQWhatsThis::add(inputBool, option->docs().simplifyWhiteSpace()); + connect(inputBool, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); m_inputWidgets->insert(option->name(), inputBool); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -139,8 +139,8 @@ DoxygenConfigWidget::DoxygenConfigWidget(const QString &fileName, QWidget *paren ((ConfigInt *)option)->minVal(), // min value ((ConfigInt *)option)->maxVal() // max value ); - QWhatsThis::add(inputInt, option->docs().simplifyWhiteSpace()); - connect(inputInt, SIGNAL(changed()), this, SLOT(changed())); + TQWhatsThis::add(inputInt, option->docs().simplifyWhiteSpace()); + connect(inputInt, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); m_inputWidgets->insert(option->name(), inputInt); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -150,10 +150,10 @@ DoxygenConfigWidget::DoxygenConfigWidget(const QString &fileName, QWidget *paren } } - QDictIterator<QObject> di(*m_switches); + TQDictIterator<TQObject> di(*m_switches); for (; di.current(); ++di) { - QObject *obj = di.current(); - connect(obj, SIGNAL(toggle(const QString&, bool)), this, SLOT(toggle(const QString&, bool))); + TQObject *obj = di.current(); + connect(obj, TQT_SIGNAL(toggle(const TQString&, bool)), this, TQT_SLOT(toggle(const TQString&, bool))); // UGLY HACK: assumes each item depends on a boolean without checking! emit toggle(di.currentKey(), ((InputBool *)obj)->getState()); } @@ -171,15 +171,15 @@ DoxygenConfigWidget::~DoxygenConfigWidget() } -QSize DoxygenConfigWidget::sizeHint() const +TQSize DoxygenConfigWidget::sizeHint() const { // without this the whole dialog becomes much too large - return QSize(QTabWidget::sizeHint().width(), 1); + return TQSize(TQTabWidget::sizeHint().width(), 1); } -void DoxygenConfigWidget::addDependency(QDict<QObject> *switches, - const QCString &dep, const QCString &name) +void DoxygenConfigWidget::addDependency(TQDict<TQObject> *switches, + const TQCString &dep, const TQCString &name) { if (dep.isEmpty()) return; @@ -190,18 +190,18 @@ void DoxygenConfigWidget::addDependency(QDict<QObject> *switches, Q_ASSERT(child!=0); if (!switches->find(dep)) switches->insert(dep, parent->qobject()); - QPtrList<IInput> *list = m_dependencies->find(dep); + TQPtrList<IInput> *list = m_dependencies->find(dep); if (!list) { - list = new QPtrList<IInput>; + list = new TQPtrList<IInput>; m_dependencies->insert(dep, list); } list->append(child); } -void DoxygenConfigWidget::toggle(const QString &name, bool state) +void DoxygenConfigWidget::toggle(const TQString &name, bool state) { - QPtrList<IInput> *inputs = m_dependencies->find(name); + TQPtrList<IInput> *inputs = m_dependencies->find(name); Q_ASSERT(inputs!=0); IInput *input = inputs->first(); while (input) { @@ -219,14 +219,14 @@ void DoxygenConfigWidget::changed() void DoxygenConfigWidget::init() { - QDictIterator<IInput> di(*m_inputWidgets); + TQDictIterator<IInput> di(*m_inputWidgets); for (; di.current(); ++di) di.current()->init(); - QDictIterator<QObject> dio(*m_switches); + TQDictIterator<TQObject> dio(*m_switches); for (; dio.current(); ++dio) { - QObject *obj = dio.current(); - connect(obj, SIGNAL(toggle(const QString&, bool)), this, SLOT(toggle(const QString&, bool))); + TQObject *obj = dio.current(); + connect(obj, TQT_SIGNAL(toggle(const TQString&, bool)), this, TQT_SLOT(toggle(const TQString&, bool))); // UGLY HACK: assumes each item depends on a boolean without checking! emit toggle(dio.currentKey(), ((InputBool *)obj)->getState()); } @@ -237,11 +237,11 @@ void DoxygenConfigWidget::loadFile() { Config::instance()->init(); - QFile f(m_fileName); + TQFile f(m_fileName); if (f.open(IO_ReadOnly)) { - QTextStream is(&f); + TQTextStream is(&f); - Config::instance()->parse(QFile::encodeName(m_fileName)); + Config::instance()->parse(TQFile::encodeName(m_fileName)); Config::instance()->convertStrToVal(); f.close(); @@ -253,11 +253,11 @@ void DoxygenConfigWidget::loadFile() void DoxygenConfigWidget::saveFile() { - QFile f(m_fileName); + TQFile f(m_fileName); if (!f.open(IO_WriteOnly)) { KMessageBox::information(0, i18n("Cannot write Doxyfile.")); } else { - QTextStream t(&f); + TQTextStream t(&f); Config::instance()->writeTemplate(t, true, false); diff --git a/parts/doxygen/doxygenconfigwidget.h b/parts/doxygen/doxygenconfigwidget.h index be75e203..4dd68178 100644 --- a/parts/doxygen/doxygenconfigwidget.h +++ b/parts/doxygen/doxygenconfigwidget.h @@ -14,9 +14,9 @@ #ifndef _DOXYGENCONFIGWIDGET_H_ #define _DOXYGENCONFIGWIDGET_H_ -#include <qtabwidget.h> -#include <qdict.h> -#include <qptrlist.h> +#include <tqtabwidget.h> +#include <tqdict.h> +#include <tqptrlist.h> class IInput; @@ -26,29 +26,29 @@ class DoxygenConfigWidget : public QTabWidget Q_OBJECT public: - DoxygenConfigWidget( const QString &fileName, QWidget *parent=0, const char *name=0 ); + DoxygenConfigWidget( const TQString &fileName, TQWidget *parent=0, const char *name=0 ); ~DoxygenConfigWidget(); public slots: void accept(); private slots: - void toggle(const QString&, bool); + void toggle(const TQString&, bool); void changed(); private: - QSize sizeHint() const; + TQSize sizeHint() const; void loadFile(); void saveFile(); void init(); - void addDependency(QDict<QObject> *switches, - const QCString &dep, const QCString &name); + void addDependency(TQDict<TQObject> *switches, + const TQCString &dep, const TQCString &name); - QString m_fileName; + TQString m_fileName; bool m_hasChanged; - QDict<IInput> *m_inputWidgets; - QDict< QPtrList<IInput> > *m_dependencies; - QDict<QObject> *m_switches; + TQDict<IInput> *m_inputWidgets; + TQDict< TQPtrList<IInput> > *m_dependencies; + TQDict<TQObject> *m_switches; }; #endif diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp index 5582371b..833f4938 100644 --- a/parts/doxygen/doxygenpart.cpp +++ b/parts/doxygen/doxygenpart.cpp @@ -39,11 +39,11 @@ #include <kdialogbase.h> #include <kdevplugininfo.h> -#include <qvbox.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qpopupmenu.h> -#include <qfileinfo.h> +#include <tqvbox.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqpopupmenu.h> +#include <tqfileinfo.h> #define PROJECTOPTIONS 1 @@ -51,7 +51,7 @@ typedef KDevGenericFactory<DoxygenPart> DoxygenFactory; static const KDevPluginInfo data("kdevdoxygen"); K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( data ) ) -DoxygenPart::DoxygenPart(QObject *parent, const char *name, const QStringList &) +DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList &) : KDevPlugin(&data, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0) { setInstance(DoxygenFactory::instance()); @@ -59,44 +59,44 @@ DoxygenPart::DoxygenPart(QObject *parent, const char *name, const QStringList &) KAction *action; action = new KAction( i18n("Build API Documentation"), 0, - this, SLOT(slotDoxygen()), + this, TQT_SLOT(slotDoxygen()), actionCollection(), "build_doxygen" ); action->setToolTip(i18n("Build API documentation")); action->setWhatsThis(i18n("<b>Build API documentation</b><p>Runs doxygen on a project Doxyfile to generate API documentation. " "If the search engine is enabled in Doxyfile, this also runs doxytag to create it.")); action = new KAction( i18n("Clean API Documentation"), 0, - this, SLOT(slotDoxClean()), + this, TQT_SLOT(slotDoxClean()), actionCollection(), "clean_doxygen" ); action->setToolTip(i18n("Clean API documentation")); action->setWhatsThis(i18n("<b>Clean API documentation</b><p>Removes all generated by doxygen files.")); -// 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("Doxygen"), PROJECTOPTIONS, 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 )) ); - m_actionDocumentFunction = new KAction(i18n("Document Current Function"), 0, CTRL+SHIFT+Key_S, this, SLOT(slotDocumentFunction()), actionCollection(), "edit_document_function"); + m_actionDocumentFunction = new KAction(i18n("Document Current Function"), 0, CTRL+SHIFT+Key_S, this, TQT_SLOT(slotDocumentFunction()), actionCollection(), "edit_document_function"); m_actionDocumentFunction->setToolTip( i18n("Create a documentation template above a function")); m_actionDocumentFunction->setWhatsThis(i18n("<b>Document Current Function</b><p>Creates a documentation template according to a function's signature above a function definition/declaration.")); m_tmpDir.setAutoDelete(true); - connect( partController(), SIGNAL(activePartChanged(KParts::Part*)), this, SLOT(slotActivePartChanged(KParts::Part* ))); - m_actionPreview = new KAction(i18n("Preview Doxygen Output"), 0, CTRL+ALT+Key_P, this, SLOT(slotRunPreview()), actionCollection(), "show_preview_doxygen_output"); + connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part* ))); + m_actionPreview = new KAction(i18n("Preview Doxygen Output"), 0, CTRL+ALT+Key_P, this, TQT_SLOT(slotRunPreview()), actionCollection(), "show_preview_doxygen_output"); m_actionPreview->setToolTip( i18n("Show a preview of the Doxygen output of this file") ); m_actionPreview->setWhatsThis( i18n("<b>Preview Doxygen output</b><p>Runs Doxygen over the current file and shows the created index.html.") ); //read Doxygen configuration, if none exists yet, create it with some defaults adjustDoxyfile(); - QString fileName = project()->projectDirectory() + "/Doxyfile"; + TQString fileName = project()->projectDirectory() + "/Doxyfile"; - QFile file(fileName); + TQFile file(fileName); if (file.open(IO_ReadOnly)) { - QTextStream is(&file); + TQTextStream is(&file); - Config::instance()->parse(QFile::encodeName(fileName)); + Config::instance()->parse(TQFile::encodeName(fileName)); Config::instance()->convertStrToVal(); file.close(); @@ -109,14 +109,14 @@ DoxygenPart::~DoxygenPart() delete _configProxy; } -void DoxygenPart::insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int pagenumber ) +void DoxygenPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber ) { if ( pagenumber == PROJECTOPTIONS ) { adjustDoxyfile(); DoxygenConfigWidget *w = new DoxygenConfigWidget(project()->projectDirectory() + "/Doxyfile", page ); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } } @@ -125,8 +125,8 @@ void DoxygenPart::insertConfigWidget( const KDialogBase * dlg, QWidget * page, u */ void DoxygenPart::adjustDoxyfile() { - QString fileName = project()->projectDirectory() + "/Doxyfile"; - if (QFile::exists(fileName)) + TQString fileName = project()->projectDirectory() + "/Doxyfile"; + if (TQFile::exists(fileName)) return; // Initialize configuration @@ -156,7 +156,7 @@ void DoxygenPart::adjustDoxyfile() if (input_files) { input_files->init(); - input_files->addValue(QFile::encodeName(project()->projectDirectory())); + input_files->addValue(TQFile::encodeName(project()->projectDirectory())); } // insert file patterns into "Input/FILE_PATTERNS" @@ -195,17 +195,17 @@ void DoxygenPart::adjustDoxyfile() ConfigString *gen_tag = dynamic_cast<ConfigString*>(Config::instance()->get("GENERATE_TAGFILE")); if (gen_tag) { - gen_tag->setDefaultValue(QString(project()->projectName()+".tag").latin1()); + gen_tag->setDefaultValue(TQString(project()->projectName()+".tag").latin1()); gen_tag->init(); } // write doxy file - QFile f2(fileName); + TQFile f2(fileName); if (!f2.open(IO_WriteOnly)) KMessageBox::information(mainWindow()->main(), i18n("Cannot write Doxyfile.")); else { - QTextStream ts_file(&f2); + TQTextStream ts_file(&f2); Config::instance()->writeTemplate(ts_file, true, true); @@ -219,21 +219,21 @@ void DoxygenPart::slotDoxygen() if ( !partController()->saveAllFiles() ) return; bool searchDatabase = false; - QString outputDirectory; - QString htmlDirectory; + TQString outputDirectory; + TQString htmlDirectory; adjustDoxyfile(); - QString fileName = project()->projectDirectory() + "/Doxyfile"; + TQString fileName = project()->projectDirectory() + "/Doxyfile"; Config::instance()->init(); - QFile f(fileName); + TQFile f(fileName); if (f.open(IO_ReadOnly)) { - QTextStream is(&f); + TQTextStream is(&f); - Config::instance()->parse(QFile::encodeName(fileName)); + Config::instance()->parse(TQFile::encodeName(fileName)); Config::instance()->convertStrToVal(); f.close(); @@ -258,8 +258,8 @@ void DoxygenPart::slotDoxygen() } } - QString dir = project()->projectDirectory(); - QString cmdline = "cd "; + TQString dir = project()->projectDirectory(); + TQString cmdline = "cd "; cmdline += KShellProcess::quote( dir ); cmdline += " && doxygen Doxyfile"; if (searchDatabase) @@ -281,15 +281,15 @@ void DoxygenPart::slotDoxClean() { bool could_be_dirty = false; - QString outputDirectory = Config_getString("OUTPUT_DIRECTORY"); + TQString outputDirectory = Config_getString("OUTPUT_DIRECTORY"); if ( outputDirectory.isEmpty() ) outputDirectory = project()->projectDirectory(); if ( outputDirectory.right(1) != "/" ) outputDirectory += "/"; - QString cmdline = "cd " + KShellProcess::quote( outputDirectory ); + TQString cmdline = "cd " + KShellProcess::quote( outputDirectory ); if ( Config_getBool("GENERATE_HTML") ) { - QString htmlDirectory = Config_getString("HTML_OUTPUT"); + TQString htmlDirectory = Config_getString("HTML_OUTPUT"); if ( htmlDirectory.isEmpty() ) htmlDirectory = "html"; if ( htmlDirectory.right(1) != "/" ) @@ -299,7 +299,7 @@ void DoxygenPart::slotDoxClean() } if ( Config_getBool("GENERATE_LATEX") ) { - QString latexDirectory = Config_getString("LATEX_OUTPUT"); + TQString latexDirectory = Config_getString("LATEX_OUTPUT"); if ( latexDirectory.isEmpty() ) latexDirectory = "latex"; if ( latexDirectory.right(1) != "/" ) @@ -309,7 +309,7 @@ void DoxygenPart::slotDoxClean() } if ( Config_getBool("GENERATE_RTF") ) { - QString rtfDirectory = Config_getString("RTF_OUTPUT"); + TQString rtfDirectory = Config_getString("RTF_OUTPUT"); if ( rtfDirectory.isEmpty() ) rtfDirectory = "rtf"; if ( rtfDirectory.right(1) != "/" ) @@ -319,7 +319,7 @@ void DoxygenPart::slotDoxClean() } if ( Config_getBool("GENERATE_MAN") ) { - QString manDirectory = Config_getString("MAN_OUTPUT"); + TQString manDirectory = Config_getString("MAN_OUTPUT"); if ( manDirectory.isEmpty() ) manDirectory = "man"; if ( manDirectory.right(1) != "/" ) @@ -329,7 +329,7 @@ void DoxygenPart::slotDoxClean() } if ( Config_getBool("GENERATE_XML") ) { - QString xmlDirectory = Config_getString("XML_OUTPUT"); + TQString xmlDirectory = Config_getString("XML_OUTPUT"); if ( xmlDirectory.isEmpty() ) xmlDirectory = "xml"; if ( xmlDirectory.right(1) != "/" ) @@ -384,16 +384,16 @@ void DoxygenPart::slotRunPreview( ) ConfigString* pStyle = dynamic_cast<ConfigString*>(config->get("HTML_STYLESHEET")); //store config values to restore them later | override config values to get only the current file processed - QCString dirVal; + TQCString dirVal; if (poDir != 0) { dirVal = *poDir->valueRef(); *poDir->valueRef() = m_tmpDir.name().ascii(); } - QStrList inputVal; + TQStrList inputVal; if (pInput != 0) { inputVal = *pInput->valueRef(); - QStrList xl; + TQStrList xl; xl.append(m_file.ascii()); *pInput->valueRef() = xl; } else { @@ -402,44 +402,44 @@ void DoxygenPart::slotRunPreview( ) "# directories like \"/usr/src/myproject\". Separate the files or directories\n" "# with spaces."); pInput = dynamic_cast<ConfigList*>(config->get("INPUT")); //pinput now has to be != 0 - QStrList xl; + TQStrList xl; xl.append(m_file.ascii()); *pInput->valueRef() = xl; } - QCString header; - QCString footer; - QCString stylesheet; + TQCString header; + TQCString footer; + TQCString stylesheet; //if header/footer/stylesheets are set, make sure they get found in the doxygen run - QString projectDir = project()->projectDirectory(); + TQString projectDir = project()->projectDirectory(); if (pHeader != 0 && !pHeader->valueRef()->isEmpty()){ header = *pHeader->valueRef(); - QFileInfo info (header); + TQFileInfo info (header); if (info.isRelative()) - *pHeader->valueRef() = QString(projectDir + "/" + QString(header)).ascii(); + *pHeader->valueRef() = TQString(projectDir + "/" + TQString(header)).ascii(); else header = 0; } if (pFooter != 0 && !pFooter->valueRef()->isEmpty()){ footer = *pFooter->valueRef(); - QFileInfo info (footer); + TQFileInfo info (footer); if (info.isRelative()) - *pFooter->valueRef() = QString(projectDir + "/" + QString(footer)).ascii(); + *pFooter->valueRef() = TQString(projectDir + "/" + TQString(footer)).ascii(); else footer = 0; } if (pStyle != 0 && !pStyle->valueRef()->isEmpty()){ stylesheet = *pStyle->valueRef(); - QFileInfo info (stylesheet); + TQFileInfo info (stylesheet); if (info.isRelative()) - *pStyle->valueRef() = QString(projectDir +"/" + QString(stylesheet)).ascii(); + *pStyle->valueRef() = TQString(projectDir +"/" + TQString(stylesheet)).ascii(); else stylesheet = 0; } - QFile file(m_tmpDir.name() +"PreviewDoxyfile"); //file gets deleted automatically 'cause of tempdir + TQFile file(m_tmpDir.name() +"PreviewDoxyfile"); //file gets deleted automatically 'cause of tempdir if (!file.open(IO_WriteOnly)){ //restore config values if (pInput != 0) @@ -452,13 +452,13 @@ void DoxygenPart::slotRunPreview( ) return; } - QTextStream ts_file(&file); + TQTextStream ts_file(&file); config->writeTemplate(ts_file, false, false); file.close(); if (inputVal.count() == 0) //pInput is always != 0 - *pInput->valueRef() = QStrList(); + *pInput->valueRef() = TQStrList(); else *pInput->valueRef() = inputVal; @@ -474,7 +474,7 @@ void DoxygenPart::slotRunPreview( ) if (pStyle != 0 && !stylesheet.isNull()) *pStyle->valueRef() = stylesheet; - connect(appFrontend, SIGNAL(processExited()), this, SLOT(slotPreviewProcessExited())); + connect(appFrontend, TQT_SIGNAL(processExited()), this, TQT_SLOT(slotPreviewProcessExited())); appFrontend->startAppCommand("", "doxygen \"" + file.name() + "\"", false); } @@ -485,7 +485,7 @@ void DoxygenPart::slotActivePartChanged( KParts::Part * part ) if (doc != 0) m_file = doc->url().path(); else - m_file = QString::null; + m_file = TQString::null; // <- m_activeEditor = dynamic_cast<KTextEditor::EditInterface*>(part); m_cursor = part ? dynamic_cast<KTextEditor::ViewCursorInterface*>(part->widget()) : 0; @@ -532,16 +532,16 @@ void DoxygenPart::slotDocumentFunction(){ functionDef->getStartPosition(&line, &col); else return; - QString funcLine = m_activeEditor->textLine(line); + TQString funcLine = m_activeEditor->textLine(line); unsigned int pos = 0; unsigned int length = funcLine.length(); while (pos < length && funcLine.at(pos).isSpace()) ++pos; //store chars used for indenting the line and put it in front of every created doc line - QString indentChars = funcLine.left(pos); - QString text = indentChars + "/**\n" + indentChars + " * \n"; + TQString indentChars = funcLine.left(pos); + TQString text = indentChars + "/**\n" + indentChars + " * \n"; ArgumentList args; - QString resultType; + TQString resultType; if (function != 0) { args = function->argumentList(); resultType = function->resultType(); diff --git a/parts/doxygen/doxygenpart.h b/parts/doxygen/doxygenpart.h index 49fb87e8..4b2ed0bf 100644 --- a/parts/doxygen/doxygenpart.h +++ b/parts/doxygen/doxygenpart.h @@ -14,11 +14,11 @@ #ifndef _DOXYGENPART_H_ #define _DOXYGENPART_H_ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kdialogbase.h> #include <kprocess.h> #include <ktempdir.h> -#include <qstring.h> +#include <tqstring.h> #include "kdevplugin.h" @@ -42,7 +42,7 @@ class DoxygenPart : public KDevPlugin Q_OBJECT public: - DoxygenPart( QObject *parent, const char *name, const QStringList & ); + DoxygenPart( TQObject *parent, const char *name, const TQStringList & ); ~DoxygenPart(); private slots: @@ -53,7 +53,7 @@ private slots: * in the project root. */ // void projectConfigWidget(KDialogBase *dlg); - void insertConfigWidget( const KDialogBase* dlg, QWidget * page, unsigned int ); + void insertConfigWidget( const KDialogBase* dlg, TQWidget * page, unsigned int ); /** run doxygen to generate API documentation */ void slotDoxygen(); @@ -99,7 +99,7 @@ private: ConfigWidgetProxy * _configProxy; //needed for doxygen preview - QString m_file; + TQString m_file; KTempDir m_tmpDir; KAction* m_action; diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp index d5745bad..e316d69e 100644 --- a/parts/doxygen/input.cpp +++ b/parts/doxygen/input.cpp @@ -11,13 +11,13 @@ * * ***************************************************************************/ -#include <qlabel.h> -#include <qlayout.h> -#include <qcombobox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqcombobox.h> #include <klineedit.h> -#include <qpushbutton.h> -#include <qspinbox.h> -#include <qtooltip.h> +#include <tqpushbutton.h> +#include <tqspinbox.h> +#include <tqtooltip.h> #include <klocale.h> #include <kfiledialog.h> #include <kglobal.h> @@ -110,18 +110,18 @@ static const char* const update_xpm_data[] = const char **update_xpm = (const char **)update_xpm_data; -InputBool::InputBool(const QCString &k, const QString &text, QWidget * parent, bool &flag) - : QWidget(parent), state(flag), key(k) +InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * parent, bool &flag) + : TQWidget(parent), state(flag), key(k) { - QHBoxLayout *layout = new QHBoxLayout(this); - cb = new QCheckBox(text,this); + TQHBoxLayout *layout = new TQHBoxLayout(this); + cb = new TQCheckBox(text,this); init(); layout->addWidget(cb); layout->addStretch(1); - connect( cb, SIGNAL(toggled(bool)), this, SLOT(valueChanged(bool))); + connect( cb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(valueChanged(bool))); } @@ -151,13 +151,13 @@ void InputBool::setEnabled(bool b) } -InputInt::InputInt(const QString &label, QWidget *parent, int &val, int minVal, int maxVal) - : QWidget(parent), m_val(val), m_minVal(minVal), m_maxVal(maxVal) +InputInt::InputInt(const TQString &label, TQWidget *parent, int &val, int minVal, int maxVal) + : TQWidget(parent), m_val(val), m_minVal(minVal), m_maxVal(maxVal) { - QHBoxLayout *layout = new QHBoxLayout(this, 5); + TQHBoxLayout *layout = new TQHBoxLayout(this, 5); - sp = new QSpinBox(minVal, maxVal, 1, this); - lab = new QLabel(sp, label+":", this); + sp = new TQSpinBox(minVal, maxVal, 1, this); + lab = new TQLabel(sp, label+":", this); init(); @@ -165,7 +165,7 @@ InputInt::InputInt(const QString &label, QWidget *parent, int &val, int minVal, layout->addWidget(sp); layout->addStretch(1); - connect(sp, SIGNAL(valueChanged(int)), this, SLOT(valueChanged(int))); + connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); } @@ -196,43 +196,43 @@ void InputInt::setEnabled(bool state) } -InputString::InputString(const QString & label, - QWidget *parent, QCString &s, StringMode m) - : QWidget(parent), str(s), sm(m), m_values(0), m_index(0) +InputString::InputString(const TQString & label, + TQWidget *parent, TQCString &s, StringMode m) + : TQWidget(parent), str(s), sm(m), m_values(0), m_index(0) { le = 0; br = 0; com = 0; if (m == StringFixed) { - QHBoxLayout *layout = new QHBoxLayout(this, 5); - com = new QComboBox(this); - lab = new QLabel(com,label+":", this); + TQHBoxLayout *layout = new TQHBoxLayout(this, 5); + com = new TQComboBox(this); + lab = new TQLabel(com,label+":", this); layout->addWidget(lab); layout->addWidget(com); layout->addStretch(1); } else { - QGridLayout *layout = new QGridLayout(this, 1, m==StringFree? 1 : 3, 5); + TQGridLayout *layout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5); le = new KLineEdit(this); - lab = new QLabel(le,label+":", this); + lab = new TQLabel(le,label+":", this); layout->addWidget(lab, 0, 0); le->setText(s); layout->addWidget(le, 0, 1); if (m == StringFile || m == StringDir) { - br = new QPushButton(this); + br = new TQPushButton(this); br->setPixmap(SmallIcon(m==StringFile? "document" : "folder")); - QToolTip::add(br, m==StringFile? i18n("Browse to a file") : i18n("Browse to a folder")); + TQToolTip::add(br, m==StringFile? i18n("Browse to a file") : i18n("Browse to a folder")); layout->addWidget(br, 0, 2); } } if (le) - connect( le, SIGNAL(textChanged(const QString&)), - this, SLOT(textChanged(const QString&)) ); + connect( le, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(textChanged(const TQString&)) ); if (br) - connect( br, SIGNAL(clicked()), this, SLOT(browse()) ); + connect( br, TQT_SIGNAL(clicked()), this, TQT_SLOT(browse()) ); if (com) - connect( com, SIGNAL(activated(const QString &)), - this, SLOT(textChanged(const QString &)) ); + connect( com, TQT_SIGNAL(activated(const TQString &)), + this, TQT_SLOT(textChanged(const TQString &)) ); } InputString::~InputString() @@ -259,7 +259,7 @@ void InputString::addValue(const char *s) { if (sm == StringFixed) { if (!m_values) - m_values = new QDict<int>; + m_values = new TQDict<int>; m_values->setAutoDelete(true); m_values->insert(s, new int(m_index++)); com->insertItem(s); @@ -277,7 +277,7 @@ void InputString::clear() } -void InputString::textChanged(const QString &s) +void InputString::textChanged(const TQString &s) { if (str!=s.latin1()) { str = s.latin1(); @@ -300,7 +300,7 @@ void InputString::setEnabled(bool state) void InputString::browse() { if (sm == StringFile) { - QString fileName = KFileDialog::getOpenFileName(); + TQString fileName = KFileDialog::getOpenFileName(); if (!fileName.isNull()) { le->setText(fileName); @@ -310,7 +310,7 @@ void InputString::browse() } } } else { // sm==StringDir - QString dirName = KFileDialog::getExistingDirectory(); + TQString dirName = KFileDialog::getExistingDirectory(); if (!dirName.isNull()) { le->setText( dirName ); @@ -323,75 +323,75 @@ void InputString::browse() } -InputStrList::InputStrList(const QString & label, - QWidget *parent, QStrList &sl, ListMode lm) - : QWidget(parent), strList(sl) +InputStrList::InputStrList(const TQString & label, + TQWidget *parent, TQStrList &sl, ListMode lm) + : TQWidget(parent), strList(sl) { - QGridLayout *layout = new QGridLayout(this, 2, 2, 5); + TQGridLayout *layout = new TQGridLayout(this, 2, 2, 5); - QWidget *dw = new QWidget(this); /* dummy widget used for layouting */ - QHBoxLayout *boxlayout = new QHBoxLayout(dw, 0, 5); + TQWidget *dw = new TQWidget(this); /* dummy widget used for layouting */ + TQHBoxLayout *boxlayout = new TQHBoxLayout(dw, 0, 5); le = new KLineEdit(dw); - lab = new QLabel(le,label+":", this ); + lab = new TQLabel(le,label+":", this ); layout->addWidget(lab, 0, 0); boxlayout->addWidget(le, 1); - add = new QPushButton(dw); - add->setPixmap(QPixmap( add_xpm )); - QToolTip::add(add, i18n("Add item")); + add = new TQPushButton(dw); + add->setPixmap(TQPixmap( add_xpm )); + TQToolTip::add(add, i18n("Add item")); boxlayout->addWidget(add); - del = new QPushButton(dw); - del->setPixmap(QPixmap( del_xpm )); - QToolTip::add(del, i18n("Delete selected item")); + del = new TQPushButton(dw); + del->setPixmap(TQPixmap( del_xpm )); + TQToolTip::add(del, i18n("Delete selected item")); boxlayout->addWidget(del); - upd = new QPushButton(dw); - upd->setPixmap(QPixmap( update_xpm )); - QToolTip::add(upd, i18n("Update selected item")); + upd = new TQPushButton(dw); + upd->setPixmap(TQPixmap( update_xpm )); + TQToolTip::add(upd, i18n("Update selected item")); boxlayout->addWidget(upd); - lb = new QListBox(this); + lb = new TQListBox(this); lb->setMinimumSize(400, 100); init(); - lb->setVScrollBarMode(QScrollView::Auto); - lb->setHScrollBarMode(QScrollView::Auto); + lb->setVScrollBarMode(TQScrollView::Auto); + lb->setHScrollBarMode(TQScrollView::Auto); brFile = 0; brDir = 0; if (lm != ListString) { if (lm & ListFile) { - brFile = new QPushButton(dw); + brFile = new TQPushButton(dw); brFile->setPixmap(SmallIcon("document")); - QToolTip::add(brFile, i18n("Browse to a file")); + TQToolTip::add(brFile, i18n("Browse to a file")); boxlayout->addWidget(brFile); } if (lm & ListDir) { - brDir = new QPushButton(dw); + brDir = new TQPushButton(dw); brDir->setPixmap(SmallIcon("folder")); - QToolTip::add(brDir, i18n("Browse to a folder")); + TQToolTip::add(brDir, i18n("Browse to a folder")); boxlayout->addWidget(brDir); } } layout->addWidget(dw, 0, 1); layout->addWidget(lb, 1, 1); - connect( le, SIGNAL(returnPressed()), - this, SLOT(addString()) ); - connect( add, SIGNAL(clicked()), - this, SLOT(addString()) ); - connect( del, SIGNAL(clicked()), - this, SLOT(delString()) ); - connect( upd, SIGNAL(clicked()), - this, SLOT(updateString()) ); + connect( le, TQT_SIGNAL(returnPressed()), + this, TQT_SLOT(addString()) ); + connect( add, TQT_SIGNAL(clicked()), + this, TQT_SLOT(addString()) ); + connect( del, TQT_SIGNAL(clicked()), + this, TQT_SLOT(delString()) ); + connect( upd, TQT_SIGNAL(clicked()), + this, TQT_SLOT(updateString()) ); if (brFile) - connect( brFile, SIGNAL(clicked()), - this, SLOT(browseFiles()) ); + connect( brFile, TQT_SIGNAL(clicked()), + this, TQT_SLOT(browseFiles()) ); if (brDir) - connect( brDir, SIGNAL(clicked()), - this, SLOT(browseDir()) ); - connect( lb, SIGNAL(selected(const QString &)), - this, SLOT(selectText(const QString &)) ); + connect( brDir, TQT_SIGNAL(clicked()), + this, TQT_SLOT(browseDir()) ); + connect( lb, TQT_SIGNAL(selected(const TQString &)), + this, TQT_SLOT(selectText(const TQString &)) ); strList = sl; } @@ -446,7 +446,7 @@ void InputStrList::updateString() } -void InputStrList::selectText(const QString &s) +void InputStrList::selectText(const TQString &s) { le->setText(s); } @@ -469,10 +469,10 @@ void InputStrList::setEnabled(bool state) void InputStrList::browseFiles() { - QStringList fileNames = KFileDialog::getOpenFileNames(); + TQStringList fileNames = KFileDialog::getOpenFileNames(); if (!fileNames.isEmpty()) { - QStringList::Iterator it; + TQStringList::Iterator it; for (it = fileNames.begin(); it != fileNames.end(); ++it) { lb->insertItem(*it); strList.append(( *it ).latin1()); @@ -485,7 +485,7 @@ void InputStrList::browseFiles() void InputStrList::browseDir() { - QString dirName = KFileDialog::getExistingDirectory(); + TQString dirName = KFileDialog::getExistingDirectory(); if (!dirName.isNull()) { lb->insertItem(dirName); diff --git a/parts/doxygen/input.h b/parts/doxygen/input.h index 15c3a263..473d94dd 100644 --- a/parts/doxygen/input.h +++ b/parts/doxygen/input.h @@ -14,8 +14,8 @@ #ifndef _INPUT_H #define _INPUT_H -#include <qcheckbox.h> -#include <qdict.h> +#include <tqcheckbox.h> +#include <tqdict.h> class QComboBox; class QLabel; @@ -29,49 +29,49 @@ class IInput public: virtual void init() = 0; virtual void setEnabled(bool) = 0; - virtual QObject *qobject() = 0; + virtual TQObject *qobject() = 0; }; -class InputBool : public QWidget, public IInput +class InputBool : public TQWidget, public IInput { Q_OBJECT public: - InputBool(const QCString &key, const QString &text, QWidget *parent, bool &flag); + InputBool(const TQCString &key, const TQString &text, TQWidget *parent, bool &flag); ~InputBool(); void init(); virtual void setEnabled(bool b); - virtual QObject *qobject() { return this; } + virtual TQObject *qobject() { return this; } virtual bool getState() const { return state; } signals: void changed(); - void toggle(const QString &, bool); + void toggle(const TQString &, bool); private slots: void valueChanged(bool); private: bool &state; - QCString key; - QCheckBox *cb; + TQCString key; + TQCheckBox *cb; }; -class InputInt : public QWidget, public IInput +class InputInt : public TQWidget, public IInput { Q_OBJECT public: - InputInt(const QString &text, QWidget *parent, + InputInt(const TQString &text, TQWidget *parent, int &val, int minVal, int maxVal); ~InputInt(); void init(); virtual void setEnabled(bool); - QObject *qobject() { return this; } + TQObject *qobject() { return this; } signals: void changed(); @@ -80,15 +80,15 @@ private slots: void valueChanged(int val); private: - QLabel *lab; - QSpinBox *sp; + TQLabel *lab; + TQSpinBox *sp; int &m_val; int m_minVal; int m_maxVal; }; -class InputString : public QWidget, public IInput +class InputString : public TQWidget, public IInput { Q_OBJECT @@ -99,36 +99,36 @@ public: StringFixed=3 }; - InputString(const QString &text, QWidget *parent, - QCString &s, StringMode m=StringFree); + InputString(const TQString &text, TQWidget *parent, + TQCString &s, StringMode m=StringFree); ~InputString(); void init(); void addValue(const char *s); void setEnabled(bool); - QObject *qobject() { return this; } + TQObject *qobject() { return this; } signals: void changed(); private slots: - void textChanged(const QString&); + void textChanged(const TQString&); void browse(); void clear(); private: - QLabel *lab; + TQLabel *lab; KLineEdit *le; - QPushButton *br; - QComboBox *com; - QCString &str; + TQPushButton *br; + TQComboBox *com; + TQCString &str; StringMode sm; - QDict<int> *m_values; + TQDict<int> *m_values; int m_index; }; -class InputStrList : public QWidget, public IInput +class InputStrList : public TQWidget, public IInput { Q_OBJECT @@ -139,13 +139,13 @@ public: ListFileDir=ListFile|ListDir }; - InputStrList(const QString &text, QWidget *parent, - QStrList &sl, ListMode v=ListString); + InputStrList(const TQString &text, TQWidget *parent, + TQStrList &sl, ListMode v=ListString); ~InputStrList(); void init(); void setEnabled(bool); - QObject *qobject() { return this; } + TQObject *qobject() { return this; } signals: void changed(); @@ -154,20 +154,20 @@ private slots: void addString(); void delString(); void updateString(); - void selectText(const QString &s); + void selectText(const TQString &s); void browseFiles(); void browseDir(); private: - QLabel *lab; + TQLabel *lab; KLineEdit *le; - QPushButton *add; - QPushButton *del; - QPushButton *upd; - QPushButton *brFile; - QPushButton *brDir; - QListBox *lb; - QStrList &strList; + TQPushButton *add; + TQPushButton *del; + TQPushButton *upd; + TQPushButton *brFile; + TQPushButton *brDir; + TQListBox *lb; + TQStrList &strList; }; #endif diff --git a/parts/doxygen/messages.cpp b/parts/doxygen/messages.cpp index 050e1ba6..8819b109 100644 --- a/parts/doxygen/messages.cpp +++ b/parts/doxygen/messages.cpp @@ -1,23 +1,23 @@ -#include <qmap.h> +#include <tqmap.h> #include <kdebug.h> #include <klocale.h> -static QMap<QCString,QString> sMessages; +static TQMap<TQCString,TQString> sMessages; // Note: this function seems to be completely unnecessary, but messages.insert // is a template function, so doing the template expansion just once reduced // the compile time of this trivial file from >5m to <30s on my machine. mhk. -static void addMessage(const QCString key, const QString &message) +static void addMessage(const TQCString key, const TQString &message) { sMessages.insert(key, message); } -QString message(const QCString &key) +TQString message(const TQCString &key) { static bool initialized = false; diff --git a/parts/doxygen/messages.h b/parts/doxygen/messages.h index 38ad6b84..ab8de52d 100644 --- a/parts/doxygen/messages.h +++ b/parts/doxygen/messages.h @@ -2,10 +2,10 @@ #define __DOXYGEN_MESSAGES_H__ -#include <qstring.h> +#include <tqstring.h> -QString message(const QCString &key); +TQString message(const TQCString &key); #endif diff --git a/parts/filecreate/addglobaldlg.cpp b/parts/filecreate/addglobaldlg.cpp index 0757d220..11a0f2a6 100644 --- a/parts/filecreate/addglobaldlg.cpp +++ b/parts/filecreate/addglobaldlg.cpp @@ -10,13 +10,13 @@ #include "addglobaldlg.h" -#include <qvariant.h> -#include <qheader.h> -#include <qlistview.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqvariant.h> +#include <tqheader.h> +#include <tqlistview.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> #include <klocale.h> @@ -27,21 +27,21 @@ * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -AddGlobalDlg::AddGlobalDlg( QWidget* parent, const char* name, bool modal, WFlags fl ) - : QDialog( parent, name, modal, fl ) +AddGlobalDlg::AddGlobalDlg( TQWidget* parent, const char* name, bool modal, WFlags fl ) + : TQDialog( parent, name, modal, fl ) { if ( !name ) setName( "AddGlobalDlg" ); setSizeGripEnabled( TRUE ); - AddGlobalDlgLayout = new QGridLayout( this, 1, 1, 11, 6, "AddGlobalDlgLayout"); + AddGlobalDlgLayout = new TQGridLayout( this, 1, 1, 11, 6, "AddGlobalDlgLayout"); - Layout1 = new QHBoxLayout( 0, 0, 6, "Layout1"); + Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1"); buttonHelp = new KPushButton( this, "buttonHelp" ); buttonHelp->setAutoDefault( TRUE ); Layout1->addWidget( buttonHelp ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); Layout1->addItem( spacer ); buttonOk = new KPushButton( this, "buttonOk" ); @@ -55,24 +55,24 @@ AddGlobalDlg::AddGlobalDlg( QWidget* parent, const char* name, bool modal, WFlag AddGlobalDlgLayout->addLayout( Layout1, 1, 0 ); - fcglobal_view = new QListView( this, "fcglobal_view" ); + fcglobal_view = new TQListView( this, "fcglobal_view" ); fcglobal_view->addColumn( i18n( "Type Extension" ) ); fcglobal_view->addColumn( i18n( "Type Name" ) ); fcglobal_view->addColumn( i18n( "Template Location" ) ); fcglobal_view->addColumn( i18n( "Icon" ) ); fcglobal_view->addColumn( i18n( "Description" ) ); - fcglobal_view->setResizePolicy( QListView::AutoOne ); + fcglobal_view->setResizePolicy( TQListView::AutoOne ); fcglobal_view->setAllColumnsShowFocus( TRUE ); fcglobal_view->setRootIsDecorated( TRUE ); - fcglobal_view->setResizeMode( QListView::AllColumns ); + fcglobal_view->setResizeMode( TQListView::AllColumns ); AddGlobalDlgLayout->addWidget( fcglobal_view, 0, 0 ); languageChange(); - resize( QSize(511, 282).expandedTo(minimumSizeHint()) ); + resize( TQSize(511, 282).expandedTo(minimumSizeHint()) ); // signals and slots connections - connect( buttonOk, SIGNAL( clicked() ), this, SLOT( accept() ) ); - connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) ); + connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); + connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); } /* @@ -91,11 +91,11 @@ void AddGlobalDlg::languageChange() { setCaption( i18n( "Select Global File Types" ) ); buttonHelp->setGuiItem( KStdGuiItem::help() ); - buttonHelp->setAccel( QKeySequence( tr2i18n( "F1" ) ) ); + buttonHelp->setAccel( TQKeySequence( tr2i18n( "F1" ) ) ); buttonOk->setGuiItem( KStdGuiItem::ok() ); - buttonOk->setAccel( QKeySequence( QString::null ) ); + buttonOk->setAccel( TQKeySequence( TQString::null ) ); buttonCancel->setGuiItem( KStdGuiItem::cancel() ); - buttonCancel->setAccel( QKeySequence( QString::null ) ); + buttonCancel->setAccel( TQKeySequence( TQString::null ) ); fcglobal_view->header()->setLabel( 0, i18n( "Type extension:" ) ); fcglobal_view->header()->setLabel( 1, i18n( "Type name:" ) ); fcglobal_view->header()->setLabel( 2, i18n( "Template location:" ) ); diff --git a/parts/filecreate/addglobaldlg.h b/parts/filecreate/addglobaldlg.h index 0ec8e588..55660853 100644 --- a/parts/filecreate/addglobaldlg.h +++ b/parts/filecreate/addglobaldlg.h @@ -10,8 +10,8 @@ #ifndef ADDGLOBALDLG_H #define ADDGLOBALDLG_H -#include <qvariant.h> -#include <qdialog.h> +#include <tqvariant.h> +#include <tqdialog.h> class QVBoxLayout; class QHBoxLayout; @@ -25,17 +25,17 @@ class AddGlobalDlg : public QDialog Q_OBJECT public: - AddGlobalDlg( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + AddGlobalDlg( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddGlobalDlg(); - QPushButton* buttonHelp; - QPushButton* buttonOk; - QPushButton* buttonCancel; - QListView* fcglobal_view; + TQPushButton* buttonHelp; + TQPushButton* buttonOk; + TQPushButton* buttonCancel; + TQListView* fcglobal_view; protected: - QGridLayout* AddGlobalDlgLayout; - QHBoxLayout* Layout1; + TQGridLayout* AddGlobalDlgLayout; + TQHBoxLayout* Layout1; protected slots: virtual void languageChange(); diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp index 480d38e0..df4963fa 100644 --- a/parts/filecreate/fcconfigwidget.cpp +++ b/parts/filecreate/fcconfigwidget.cpp @@ -8,17 +8,17 @@ * (at your option) any later version. * ***************************************************************************/ -#include <qlistview.h> -#include <qpushbutton.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qtabwidget.h> -#include <qdom.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qcheckbox.h> +#include <tqlistview.h> +#include <tqpushbutton.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqtabwidget.h> +#include <tqdom.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqcheckbox.h> #include <klineedit.h> -#include <qlabel.h> +#include <tqlabel.h> #include <kstandarddirs.h> #include <kio/netaccess.h> @@ -39,7 +39,7 @@ #include "kdevpartcontroller.h" -FCConfigWidget::FCConfigWidget(FileCreatePart * part, bool global, QWidget *parent, const char *name): +FCConfigWidget::FCConfigWidget(FileCreatePart * part, bool global, TQWidget *parent, const char *name): FCConfigWidgetBase(parent, name), m_part(part), m_global(global) { fc_view->setSorting(-1, FALSE); @@ -82,16 +82,16 @@ void FCConfigWidget::accept() m_part->m_filetypes.clear(); m_part->slotProjectOpened(); - for (QValueList<KURL>::iterator it = urlsToEdit.begin(); it != urlsToEdit.end(); ++it ) + for (TQValueList<KURL>::iterator it = urlsToEdit.begin(); it != urlsToEdit.end(); ++it ) { m_part->partController()->editDocument(*it); } } -void FCConfigWidget::loadGlobalConfig(QListView *view, bool checkmarks) +void FCConfigWidget::loadGlobalConfig(TQListView *view, bool checkmarks) { - QString globalXMLFile = ::locate("data", "kdevfilecreate/template-info.xml"); - QDomDocument globalDom; + TQString globalXMLFile = ::locate("data", "kdevfilecreate/template-info.xml"); + TQDomDocument globalDom; if (!globalXMLFile.isNull() && DomUtil::openDOMFile(globalDom,globalXMLFile)) { m_part->readTypes(globalDom, m_globalfiletypes, false); @@ -102,55 +102,55 @@ void FCConfigWidget::loadGlobalConfig(QListView *view, bool checkmarks) if (checkmarks) { - QDomElement useGlobalTypes = + TQDomElement useGlobalTypes = DomUtil::elementByPath(*(m_part->projectDom()),"/kdevfilecreate/useglobaltypes"); - for(QDomNode node = useGlobalTypes.firstChild(); !node.isNull();node=node.nextSibling()) + for(TQDomNode node = useGlobalTypes.firstChild(); !node.isNull();node=node.nextSibling()) { if (node.isElement() && node.nodeName()=="type") { - QDomElement element = node.toElement(); - QString ext = element.attribute("ext"); - QString subtyperef = element.attribute("subtyperef"); + TQDomElement element = node.toElement(); + TQString ext = element.attribute("ext"); + TQString subtyperef = element.attribute("subtyperef"); if (subtyperef.isNull()) { - QListViewItem *it = view->findItem(ext, 0); + TQListViewItem *it = view->findItem(ext, 0); if (it) { - ((QCheckListItem*)it)->setOn(true); + ((TQCheckListItem*)it)->setOn(true); - QListViewItem *lastChild = it->firstChild(); + TQListViewItem *lastChild = it->firstChild(); while ( lastChild ) { - ((QCheckListItem*)lastChild)->setOn(true); + ((TQCheckListItem*)lastChild)->setOn(true); lastChild = lastChild->nextSibling(); } } } else { - QListViewItem *it = view->findItem(subtyperef, 0); + TQListViewItem *it = view->findItem(subtyperef, 0); if (it) - ((QCheckListItem*)it)->setOn(true); + ((TQCheckListItem*)it)->setOn(true); } } } } } -void FCConfigWidget::loadProjectConfig(QListView *view) +void FCConfigWidget::loadProjectConfig(TQListView *view) { m_part->readTypes( *(m_part->projectDom()), m_projectfiletypes, false ); loadFileTypes(m_projectfiletypes, view, false); } -void FCConfigWidget::loadProjectTemplates(QListView *view) +void FCConfigWidget::loadProjectTemplates(TQListView *view) { - QDir templDir( m_part->project()->projectDirectory() + "/templates/" ); - templDir.setFilter( QDir::Files ); + TQDir templDir( m_part->project()->projectDirectory() + "/templates/" ); + templDir.setFilter( TQDir::Files ); const QFileInfoList * list = templDir.entryInfoList(); if( list ){ QFileInfoListIterator it( *list ); - QFileInfo *fi; + TQFileInfo *fi; while ( (fi = it.current()) != 0 ) { FileType * filetype; filetype = new FileType; @@ -168,19 +168,19 @@ void FCConfigWidget::loadProjectTemplates(QListView *view) void FCConfigWidget::saveGlobalConfig() { - QDomDocument globalDom; - QDomElement element = globalDom.createElement("kdevelop" ); + TQDomDocument globalDom; + TQDomElement element = globalDom.createElement("kdevelop" ); globalDom.appendChild(element); - QDomElement apPart = globalDom.createElement("kdevfilecreate"); + TQDomElement apPart = globalDom.createElement("kdevfilecreate"); element.appendChild(apPart); - QDomElement fileTypes = globalDom.createElement( "filetypes" ); + TQDomElement fileTypes = globalDom.createElement( "filetypes" ); apPart.appendChild( fileTypes ); saveConfiguration(globalDom, fileTypes, true); - QFile config( KGlobal::dirs()->saveLocation("data", "kdevfilecreate/", true) + "template-info.xml" ); + TQFile config( KGlobal::dirs()->saveLocation("data", "kdevfilecreate/", true) + "template-info.xml" ); config.open(IO_WriteOnly | IO_Truncate); - QTextStream stream(&config); + TQTextStream stream(&config); stream << "<?xml version = '1.0'?>"; stream << globalDom.toString(); config.close(); @@ -188,9 +188,9 @@ void FCConfigWidget::saveGlobalConfig() void FCConfigWidget::saveProjectConfig() { - QDomDocument dom = *m_part->projectDom( ); - QDomElement element = dom.documentElement( ); - QDomElement apPart = element.namedItem( "kdevfilecreate" ).toElement( ); + TQDomDocument dom = *m_part->projectDom( ); + TQDomElement element = dom.documentElement( ); + TQDomElement apPart = element.namedItem( "kdevfilecreate" ).toElement( ); if( apPart.isNull( ) ) { apPart = dom.createElement( "kdevfilecreate" ); @@ -200,7 +200,7 @@ void FCConfigWidget::saveProjectConfig() // project template configuration - QDomElement projectTypes = apPart.namedItem( "filetypes" ).toElement( ); + TQDomElement projectTypes = apPart.namedItem( "filetypes" ).toElement( ); apPart.removeChild(projectTypes); projectTypes = dom.createElement( "filetypes" ); apPart.appendChild( projectTypes ); @@ -210,32 +210,32 @@ void FCConfigWidget::saveProjectConfig() // global template usage - QDomElement globalTypes = apPart.namedItem( "useglobaltypes" ).toElement( ); + TQDomElement globalTypes = apPart.namedItem( "useglobaltypes" ).toElement( ); apPart.removeChild(globalTypes); globalTypes = dom.createElement( "useglobaltypes" ); apPart.appendChild( globalTypes ); - QListViewItemIterator it( fcglobal_view ); + TQListViewItemIterator it( fcglobal_view ); for( ; it.current( ); ++it ){ if (!it.current()->parent()) { - QCheckListItem *chit = dynamic_cast<QCheckListItem*>(it.current()); + TQCheckListItem *chit = dynamic_cast<TQCheckListItem*>(it.current()); if ( !chit ) continue; if (chit->isOn()) { - QDomElement type = dom.createElement( "type" ); + TQDomElement type = dom.createElement( "type" ); type.setAttribute( "ext", chit->text(0) ); globalTypes.appendChild( type ); } else { - QListViewItem *lastChild = chit->firstChild(); + TQListViewItem *lastChild = chit->firstChild(); while ( lastChild ) { - QCheckListItem *chsit = dynamic_cast<QCheckListItem*>(lastChild); + TQCheckListItem *chsit = dynamic_cast<TQCheckListItem*>(lastChild); if ( (chsit) && (chsit->isOn())) { - QDomElement type = dom.createElement( "type" ); + TQDomElement type = dom.createElement( "type" ); type.setAttribute( "ext", chit->text(0) ); type.setAttribute( "subtyperef", chsit->text(0) ); globalTypes.appendChild( type ); @@ -251,15 +251,15 @@ void FCConfigWidget::saveProjectConfig() // project template files //check for new templates and those with location changed - QListViewItemIterator it2(fctemplates_view); + TQListViewItemIterator it2(fctemplates_view); while (it2.current()) { if (!it2.current()->text(1).isEmpty()) { - QString dest; + TQString dest; dest = m_part->project()->projectDirectory() + "/templates/"; if (it2.current()->text(1) == "create") - copyTemplate(QString::null, dest, it2.current()->text(0)); + copyTemplate(TQString::null, dest, it2.current()->text(0)); else copyTemplate(it2.current()->text(1), dest, it2.current()->text(0)); } @@ -267,13 +267,13 @@ void FCConfigWidget::saveProjectConfig() } } -void FCConfigWidget::saveConfiguration(QDomDocument &dom, QDomElement &element, bool global) +void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element, bool global) { - QListViewItemIterator it( fc_view ); + TQListViewItemIterator it( fc_view ); for( ; it.current( ); ++it ){ if (!it.current()->parent()) { - QDomElement type = dom.createElement( "type" ); + TQDomElement type = dom.createElement( "type" ); type.setAttribute( "ext", it.current()->text(0) ); type.setAttribute( "name", it.current()->text(1) ); if (it.current()->childCount() > 0) @@ -282,47 +282,47 @@ void FCConfigWidget::saveConfiguration(QDomDocument &dom, QDomElement &element, type.setAttribute( "create", "template"); type.setAttribute( "icon", it.current()->text(2) ); - QDomElement edescr = dom.createElement("descr"); + TQDomElement edescr = dom.createElement("descr"); type.appendChild(edescr); - QDomText descr = dom.createTextNode( it.current()->text(3) ); + TQDomText descr = dom.createTextNode( it.current()->text(3) ); edescr.appendChild(descr); if (!it.current()->text(4).isEmpty()) { - QString dest; + TQString dest; if (global) dest = KGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true); else dest = m_part->project()->projectDirectory() + "/templates/"; if (it.current()->text(4) == "create") - copyTemplate(QString::null, dest, it.current()->text(0)); + copyTemplate(TQString::null, dest, it.current()->text(0)); else copyTemplate(it.current()->text(4), dest, it.current()->text(0)); } - QListViewItem *lastChild = it.current()->firstChild(); + TQListViewItem *lastChild = it.current()->firstChild(); while ( lastChild ) { - QDomElement subtype = dom.createElement( "subtype" ); + TQDomElement subtype = dom.createElement( "subtype" ); subtype.setAttribute( "ref", lastChild->text(0) ); subtype.setAttribute( "name", lastChild->text(1) ); subtype.setAttribute( "icon", lastChild->text(2) ); - QDomElement edescr = dom.createElement("descr"); + TQDomElement edescr = dom.createElement("descr"); subtype.appendChild(edescr); - QDomText descr = dom.createTextNode( lastChild->text(3) ); + TQDomText descr = dom.createTextNode( lastChild->text(3) ); edescr.appendChild(descr); if (!lastChild->text(4).isEmpty()) { - QString dest; + TQString dest; if (global) dest = KGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true); else dest = m_part->project()->projectDirectory() + "/templates/"; if (lastChild->text(4) == "create") - copyTemplate(QString::null, dest, it.current()->text(0) + "-" + lastChild->text(0)); + copyTemplate(TQString::null, dest, it.current()->text(0) + "-" + lastChild->text(0)); else copyTemplate(lastChild->text(4), dest, it.current()->text(0) + "-" + lastChild->text(0)); } @@ -336,15 +336,15 @@ void FCConfigWidget::saveConfiguration(QDomDocument &dom, QDomElement &element, } } -void FCConfigWidget::copyTemplate(QString templateUrl, QString dest, QString destName) +void FCConfigWidget::copyTemplate(TQString templateUrl, TQString dest, TQString destName) { if (templateUrl.isEmpty()) { - QDir d(dest); + TQDir d(dest); if (!d.exists()) d.mkdir(dest); - QFile f(dest + destName); + TQFile f(dest + destName); f.open(IO_WriteOnly); f.close(); } @@ -362,7 +362,7 @@ void FCConfigWidget::copyTemplate(QString templateUrl, QString dest, QString des } } -void FCConfigWidget::loadFileTypes(QPtrList<FileCreate::FileType> list, QListView *view, bool checkmarks) +void FCConfigWidget::loadFileTypes(TQPtrList<FileCreate::FileType> list, TQListView *view, bool checkmarks) { FileType *ft; @@ -371,11 +371,11 @@ void FCConfigWidget::loadFileTypes(QPtrList<FileCreate::FileType> list, QListVie { if ( (ft = list.at(i)) ) { - QListViewItem *it; + TQListViewItem *it; if (!checkmarks) - it = new QListViewItem(view); + it = new TQListViewItem(view); else - it = new QCheckListItem(view, "", QCheckListItem::CheckBox); + it = new TQCheckListItem(view, "", TQCheckListItem::CheckBox); it->setText(0, ft->ext()); it->setText(1, ft->name()); @@ -388,11 +388,11 @@ void FCConfigWidget::loadFileTypes(QPtrList<FileCreate::FileType> list, QListVie { if ( (sft = ft->subtypes().at(j)) ) { - QListViewItem *sit; + TQListViewItem *sit; if (!checkmarks) - sit = new QListViewItem(it); + sit = new TQListViewItem(it); else - sit = new QCheckListItem(it, "", QCheckListItem::CheckBox); + sit = new TQCheckListItem(it, "", TQCheckListItem::CheckBox); sit->setText(0, sft->subtypeRef()); sit->setText(1, sft->name()); @@ -412,7 +412,7 @@ void FCConfigWidget::removetemplate_button_clicked( ) KURL removedTemplate; removedTemplate.setPath(m_part->project()->projectDirectory() + "/templates/" + fctemplates_view->currentItem()->text(0)); KIO::NetAccess::del(removedTemplate); - QListViewItem *it = fctemplates_view->currentItem(); + TQListViewItem *it = fctemplates_view->currentItem(); if (it->itemBelow()) { fc_view->setSelected(it->itemBelow(), true); @@ -429,49 +429,49 @@ void FCConfigWidget::removetemplate_button_clicked( ) void FCConfigWidget::copyToProject_button_clicked() { - QListViewItem *it = fcglobal_view->currentItem(); + TQListViewItem *it = fcglobal_view->currentItem(); if (it) { - QListViewItem *it_copy_parent = 0; - QString destParent; + TQListViewItem *it_copy_parent = 0; + TQString destParent; if (it->parent()) { - it_copy_parent = new QListViewItem(fc_view, it->parent()->text(0), + it_copy_parent = new TQListViewItem(fc_view, it->parent()->text(0), it->parent()->text(1), it->parent()->text(2), it->parent()->text(3), locate("data", "kdevfilecreate/file-templates/"+ it->parent()->text(0))); destParent += it->parent()->text(0) + "-"; - QCheckListItem *chk = dynamic_cast<QCheckListItem*>(it->parent()); + TQCheckListItem *chk = dynamic_cast<TQCheckListItem*>(it->parent()); if (chk) chk->setOn(false); } - QListViewItem *it_copy = 0; + TQListViewItem *it_copy = 0; if (it_copy_parent) - it_copy = new QListViewItem(it_copy_parent, it->text(0), + it_copy = new TQListViewItem(it_copy_parent, it->text(0), it->text(1), it->text(2), it->text(3), locate("data", "kdevfilecreate/file-templates/"+destParent + it->text(0))); else - it_copy = new QListViewItem(fc_view, it->text(0), + it_copy = new TQListViewItem(fc_view, it->text(0), it->text(1), it->text(2), it->text(3), locate("data", "kdevfilecreate/file-templates/" +destParent+ it->text(0))); - QCheckListItem *chk = dynamic_cast<QCheckListItem*>(it); + TQCheckListItem *chk = dynamic_cast<TQCheckListItem*>(it); if (chk) chk->setOn(false); fc_view->setSelected(it_copy, true); fc_view->setCurrentItem(it_copy); - QListViewItem * it_child = it->firstChild(); + TQListViewItem * it_child = it->firstChild(); while( it_child ) { - new QListViewItem(it_copy, it_child->text(0), + new TQListViewItem(it_copy, it_child->text(0), it_child->text(1), it_child->text(2), it_child->text(3), locate("data", "kdevfilecreate/file-templates/"+ it_copy->text(0) + "-" + it_child->text(0))); - QCheckListItem *chk_child = dynamic_cast<QCheckListItem*>(it_child); + TQCheckListItem *chk_child = dynamic_cast<TQCheckListItem*>(it_child); if (chk_child) chk_child->setOn(false); it_child = it_child->nextSibling(); @@ -482,13 +482,13 @@ void FCConfigWidget::copyToProject_button_clicked() void FCConfigWidget::newtype_button_clicked() { FCTypeEdit *te = new FCTypeEdit(); - if (te->exec() == QDialog::Accepted ) + if (te->exec() == TQDialog::Accepted ) { - QListViewItem *it = new QListViewItem(fc_view, te->typeext_edit->text(), + TQListViewItem *it = new TQListViewItem(fc_view, te->typeext_edit->text(), te->typename_edit->text(), te->icon_url->icon(), te->typedescr_edit->text(), - te->template_url->url().isEmpty() ? QString("create") : te->template_url->url()); + te->template_url->url().isEmpty() ? TQString("create") : te->template_url->url()); fc_view->setSelected(it, true); fc_view->setCurrentItem(it); } @@ -500,14 +500,14 @@ void FCConfigWidget::newsubtype_button_clicked() if (fc_view->currentItem() && (!fc_view->currentItem()->parent())) { FCTypeEdit *te = new FCTypeEdit(this); - if (te->exec() == QDialog::Accepted ) + if (te->exec() == TQDialog::Accepted ) { - /*QListViewItem *it =*/(void) new QListViewItem(fc_view->currentItem(), + /*TQListViewItem *it =*/(void) new TQListViewItem(fc_view->currentItem(), te->typeext_edit->text(), te->typename_edit->text(), te->icon_url->icon(), te->typedescr_edit->text(), - te->template_url->url().isEmpty() ? QString("create") : te->template_url->url()); + te->template_url->url().isEmpty() ? TQString("create") : te->template_url->url()); fc_view->currentItem()->setOpen(true); } delete te; @@ -518,7 +518,7 @@ void FCConfigWidget::remove_button_clicked() { if (fc_view->currentItem()) { - QListViewItem *it = fc_view->currentItem(); + TQListViewItem *it = fc_view->currentItem(); if (it->itemBelow()) { fc_view->setSelected(it->itemBelow(), true); @@ -536,12 +536,12 @@ void FCConfigWidget::remove_button_clicked() void FCConfigWidget::moveup_button_clicked() { - QListViewItem *i = fc_view->currentItem(); + TQListViewItem *i = fc_view->currentItem(); if ( !i ) return; - QListViewItemIterator it( i ); - QListViewItem *parent = i->parent(); + TQListViewItemIterator it( i ); + TQListViewItem *parent = i->parent(); --it; while ( it.current() ) { if ( it.current()->parent() == parent ) @@ -551,7 +551,7 @@ void FCConfigWidget::moveup_button_clicked() if ( !it.current() ) return; - QListViewItem *other = it.current(); + TQListViewItem *other = it.current(); other->moveItem( i ); } @@ -559,12 +559,12 @@ void FCConfigWidget::moveup_button_clicked() void FCConfigWidget::movedown_button_clicked() { - QListViewItem *i = fc_view->currentItem(); + TQListViewItem *i = fc_view->currentItem(); if ( !i ) return; - QListViewItemIterator it( i ); - QListViewItem *parent = i->parent(); + TQListViewItemIterator it( i ); + TQListViewItem *parent = i->parent(); it++; while ( it.current() ) { if ( it.current()->parent() == parent ) @@ -574,7 +574,7 @@ void FCConfigWidget::movedown_button_clicked() if ( !it.current() ) return; - QListViewItem *other = it.current(); + TQListViewItem *other = it.current(); i->moveItem( other ); } @@ -582,7 +582,7 @@ void FCConfigWidget::movedown_button_clicked() void FCConfigWidget::edittype_button_clicked() { - QListViewItem *it = fc_view->currentItem(); + TQListViewItem *it = fc_view->currentItem(); if ( it ) { FCTypeEdit *te = new FCTypeEdit(this); @@ -594,7 +594,7 @@ void FCConfigWidget::edittype_button_clicked() if (it->text(4) != "create") te->template_url->setURL(it->text(4)); - if (te->exec() == QDialog::Accepted ) + if (te->exec() == TQDialog::Accepted ) { it->setText(0, te->typeext_edit->text()); it->setText(1, te->typename_edit->text()); @@ -612,23 +612,23 @@ void FCConfigWidget::edittype_button_clicked() void FCConfigWidget::newtemplate_button_clicked() { FCTemplateEdit *te = new FCTemplateEdit; - if (te->exec() == QDialog::Accepted) + if (te->exec() == TQDialog::Accepted) { - /*QListViewItem *it =*/(void) new QListViewItem(fctemplates_view, te->templatename_edit->text(), - te->template_url->url().isEmpty() ? QString("create") : te->template_url->url()); + /*TQListViewItem *it =*/(void) new TQListViewItem(fctemplates_view, te->templatename_edit->text(), + te->template_url->url().isEmpty() ? TQString("create") : te->template_url->url()); } } void FCConfigWidget::edittemplate_button_clicked() { - QListViewItem *it; + TQListViewItem *it; if ( (it = fctemplates_view->currentItem()) ) { FCTemplateEdit *te = new FCTemplateEdit; te->templatename_edit->setText(it->text(0)); te->templatename_edit->setEnabled(false); - if (te->exec() == QDialog::Accepted) + if (te->exec() == TQDialog::Accepted) { if ((te->template_url->url() == "") && ((it->text(1) == "create"))) it->setText(1, "create"); @@ -642,14 +642,14 @@ void FCConfigWidget::edit_template_content_button_clicked( ) { if (fctemplates_view->currentItem()) { - QFileInfo fi(m_part->project()->projectDirectory() + "/templates/" + fctemplates_view->currentItem()->text(0)); + TQFileInfo fi(m_part->project()->projectDirectory() + "/templates/" + fctemplates_view->currentItem()->text(0)); KURL content; content.setPath(m_part->project()->projectDirectory() + "/templates/" + fctemplates_view->currentItem()->text(0)); if (fi.exists()) m_part->partController()->editDocument(content); else { - KMessageBox::information(this, i18n("Requested template does not exist yet.\nIt will be opened immediately after accepting the configuration dialog."), QString::null, "Edit template content warning"); + KMessageBox::information(this, i18n("Requested template does not exist yet.\nIt will be opened immediately after accepting the configuration dialog."), TQString::null, "Edit template content warning"); fctemplates_view->currentItem()->setPixmap(0, SmallIcon("edit")); urlsToEdit.append(content); } @@ -660,13 +660,13 @@ void FCConfigWidget::edit_type_content_button_clicked( ) { if (!fc_view->currentItem()) return; - QListViewItem *it = fc_view->currentItem(); - QString type_name = it->text(0); + TQListViewItem *it = fc_view->currentItem(); + TQString type_name = it->text(0); if (it->parent()) type_name.prepend(it->parent()->text(0) + "-"); if (!m_global) { - QString typePath = m_part->project()->projectDirectory() + "/templates/" + type_name; + TQString typePath = m_part->project()->projectDirectory() + "/templates/" + type_name; KURL content; content.setPath(typePath); if (it->text(4).isEmpty()) @@ -674,22 +674,22 @@ void FCConfigWidget::edit_type_content_button_clicked( ) else { if (it->text(4) == "create") - KMessageBox::information(this, i18n("Template for the selected file type does not exist yet.\nIt will be opened immediately after accepting the configuration dialog."), QString::null, "Edit type template content warning"); + KMessageBox::information(this, i18n("Template for the selected file type does not exist yet.\nIt will be opened immediately after accepting the configuration dialog."), TQString::null, "Edit type template content warning"); else - KMessageBox::information(this, i18n("Template for the selected file type has been changed.\nIt will be opened immediately after accepting the configuration dialog."), QString::null, "Edit type template content warning"); + KMessageBox::information(this, i18n("Template for the selected file type has been changed.\nIt will be opened immediately after accepting the configuration dialog."), TQString::null, "Edit type template content warning"); fc_view->currentItem()->setPixmap(0, SmallIcon("edit")); urlsToEdit.append(content); } } else { - QString dest = KGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true); - QString typePath = dest + type_name; + TQString dest = KGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true); + TQString typePath = dest + type_name; KURL content; content.setPath(typePath); if (it->text(4).isEmpty()) { - QFileInfo fi(dest+type_name); + TQFileInfo fi(dest+type_name); if (!fi.exists()) copyTemplate(locate("data", "kdevfilecreate/file-templates/" + type_name), dest, type_name); m_part->partController()->editDocument(content); @@ -697,9 +697,9 @@ void FCConfigWidget::edit_type_content_button_clicked( ) else { if (it->text(4) == "create") - KMessageBox::information(this, i18n("Template for the selected file type does not exist yet.\nIt will be opened immediately after accepting the configuration dialog."), QString::null, "Edit global type template content warning"); + KMessageBox::information(this, i18n("Template for the selected file type does not exist yet.\nIt will be opened immediately after accepting the configuration dialog."), TQString::null, "Edit global type template content warning"); else - KMessageBox::information(this, i18n("Template for the selected file type has been changed.\nIt will be opened immediately after accepting the configuration dialog."), QString::null, "Edit global type template content warning"); + KMessageBox::information(this, i18n("Template for the selected file type has been changed.\nIt will be opened immediately after accepting the configuration dialog."), TQString::null, "Edit global type template content warning"); fc_view->currentItem()->setPixmap(0, SmallIcon("edit")); urlsToEdit.append(content); } diff --git a/parts/filecreate/fcconfigwidget.h b/parts/filecreate/fcconfigwidget.h index 52acd29c..c3f5b2ab 100644 --- a/parts/filecreate/fcconfigwidget.h +++ b/parts/filecreate/fcconfigwidget.h @@ -11,8 +11,8 @@ #ifndef FCCONFIGWIDGET_H #define FCCONFIGWIDGET_H -#include <qwidget.h> -#include <qvaluelist.h> +#include <tqwidget.h> +#include <tqvaluelist.h> #include <kurl.h> #include "fcconfigwidgetbase.h" @@ -30,7 +30,7 @@ class FCConfigWidget : public FCConfigWidgetBase { Q_OBJECT public: - FCConfigWidget(FileCreatePart * part, bool global, QWidget *parent, const char *name); + FCConfigWidget(FileCreatePart * part, bool global, TQWidget *parent, const char *name); ~FCConfigWidget(); @@ -50,23 +50,23 @@ public slots: void edit_type_content_button_clicked(); protected: - void loadGlobalConfig(QListView *view, bool checkmarks = false); - void loadProjectConfig(QListView *view); - void loadProjectTemplates(QListView *view); + void loadGlobalConfig(TQListView *view, bool checkmarks = false); + void loadProjectConfig(TQListView *view); + void loadProjectTemplates(TQListView *view); void saveGlobalConfig(); void saveProjectConfig(); - void loadFileTypes(QPtrList<FileCreate::FileType> list, QListView *view, bool checkmarks = false); - void copyTemplate(QString templateUrl, QString dest, QString destName); - void saveConfiguration(QDomDocument &dom, QDomElement &element, bool global); + void loadFileTypes(TQPtrList<FileCreate::FileType> list, TQListView *view, bool checkmarks = false); + void copyTemplate(TQString templateUrl, TQString dest, TQString destName); + void saveConfiguration(TQDomDocument &dom, TQDomElement &element, bool global); private: FileCreatePart * m_part; - QPtrList<FileCreate::FileType> m_globalfiletypes; - QPtrList<FileCreate::FileType> m_projectfiletypes; - QPtrList<FileCreate::FileType> m_projectfiletemplates; + TQPtrList<FileCreate::FileType> m_globalfiletypes; + TQPtrList<FileCreate::FileType> m_projectfiletypes; + TQPtrList<FileCreate::FileType> m_projectfiletemplates; bool m_global; - QValueList<KURL> urlsToEdit; + TQValueList<KURL> urlsToEdit; }; #endif diff --git a/parts/filecreate/fctemplateedit.cpp b/parts/filecreate/fctemplateedit.cpp index fc495fd5..b019ddb9 100644 --- a/parts/filecreate/fctemplateedit.cpp +++ b/parts/filecreate/fctemplateedit.cpp @@ -9,13 +9,13 @@ ***************************************************************************/ #include <klineedit.h> #include "fctemplateedit.h" -#include <qpushbutton.h> +#include <tqpushbutton.h> -FCTemplateEdit::FCTemplateEdit(QWidget *parent, const char *name): +FCTemplateEdit::FCTemplateEdit(TQWidget *parent, const char *name): FCTemplateEditBase(parent, name) { - connect( templatename_edit, SIGNAL(textChanged ( const QString & )), - this, SLOT( slotTemplateNameChanged( ))); + connect( templatename_edit, TQT_SIGNAL(textChanged ( const TQString & )), + this, TQT_SLOT( slotTemplateNameChanged( ))); slotTemplateNameChanged(); } diff --git a/parts/filecreate/fctemplateedit.h b/parts/filecreate/fctemplateedit.h index 0209c3b0..8ecf7a81 100644 --- a/parts/filecreate/fctemplateedit.h +++ b/parts/filecreate/fctemplateedit.h @@ -11,14 +11,14 @@ #ifndef FCTEMPLATEEDIT_H #define FCTEMPLATEEDIT_H -#include <qwidget.h> +#include <tqwidget.h> #include "fctemplateeditbase.h" class FCTemplateEdit : public FCTemplateEditBase { Q_OBJECT public: - FCTemplateEdit(QWidget *parent=0, const char *name=0); + FCTemplateEdit(TQWidget *parent=0, const char *name=0); ~FCTemplateEdit(); diff --git a/parts/filecreate/fctemplateeditbase.ui.h b/parts/filecreate/fctemplateeditbase.ui.h index 6f2b9223..f4fcfa05 100644 --- a/parts/filecreate/fctemplateeditbase.ui.h +++ b/parts/filecreate/fctemplateeditbase.ui.h @@ -17,10 +17,10 @@ ** place of a destructor. *****************************************************************************/ -#include <qvalidator.h> -#include <qregexp.h> +#include <tqvalidator.h> +#include <tqregexp.h> void FCTemplateEditBase::init() { - templatename_edit->setValidator(new QRegExpValidator(QRegExp("^\\S*$"), this)); + templatename_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), this)); } diff --git a/parts/filecreate/fctypeedit.cpp b/parts/filecreate/fctypeedit.cpp index 310453ea..5ee4eb0d 100644 --- a/parts/filecreate/fctypeedit.cpp +++ b/parts/filecreate/fctypeedit.cpp @@ -9,15 +9,15 @@ ***************************************************************************/ #include <klineedit.h> -#include <qpushbutton.h> +#include <tqpushbutton.h> #include "fctypeedit.h" -FCTypeEdit::FCTypeEdit(QWidget *parent, char *name) +FCTypeEdit::FCTypeEdit(TQWidget *parent, char *name) : FCTypeEditBase(parent, name) { - connect( typeext_edit, SIGNAL( textChanged ( const QString & )),this, SLOT( slotTypeEditTextChanged())); - connect( typename_edit, SIGNAL( textChanged ( const QString & )),this, SLOT( slotTypeEditTextChanged( ))); + connect( typeext_edit, TQT_SIGNAL( textChanged ( const TQString & )),this, TQT_SLOT( slotTypeEditTextChanged())); + connect( typename_edit, TQT_SIGNAL( textChanged ( const TQString & )),this, TQT_SLOT( slotTypeEditTextChanged( ))); slotTypeEditTextChanged( ); } diff --git a/parts/filecreate/fctypeedit.h b/parts/filecreate/fctypeedit.h index 92c34e3f..f5a9bf7b 100644 --- a/parts/filecreate/fctypeedit.h +++ b/parts/filecreate/fctypeedit.h @@ -18,7 +18,7 @@ class FCTypeEdit : public FCTypeEditBase { Q_OBJECT public: - FCTypeEdit(QWidget *parent = 0, char *name = 0); + FCTypeEdit(TQWidget *parent = 0, char *name = 0); ~FCTypeEdit(); diff --git a/parts/filecreate/fctypeeditbase.ui.h b/parts/filecreate/fctypeeditbase.ui.h index e65a2ba7..b9ec29b5 100644 --- a/parts/filecreate/fctypeeditbase.ui.h +++ b/parts/filecreate/fctypeeditbase.ui.h @@ -17,10 +17,10 @@ ** place of a destructor. *****************************************************************************/ -#include <qvalidator.h> -#include <qregexp.h> +#include <tqvalidator.h> +#include <tqregexp.h> void FCTypeEditBase::init() { - typeext_edit->setValidator(new QRegExpValidator(QRegExp("^\\S*$"), this)); + typeext_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), this)); } diff --git a/parts/filecreate/filecreate_filedialog.cpp b/parts/filecreate/filecreate_filedialog.cpp index 81d711cf..ecc8df42 100644 --- a/parts/filecreate/filecreate_filedialog.cpp +++ b/parts/filecreate/filecreate_filedialog.cpp @@ -10,7 +10,7 @@ #include "filecreate_filedialog.h" -#include <qfileinfo.h> +#include <tqfileinfo.h> #include <kdeversion.h> #include <kurlcombobox.h> #include <kdebug.h> @@ -20,9 +20,9 @@ namespace FileCreate { - FileDialog::FileDialog(const QString& startDir, const QString& filter, - QWidget *parent, const char *name, - bool modal, QWidget * extraWidget) : + FileDialog::FileDialog(const TQString& startDir, const TQString& filter, + TQWidget *parent, const char *name, + bool modal, TQWidget * extraWidget) : KFileDialog(startDir, filter, parent, name, modal, extraWidget) { setOperationMode(Saving); @@ -30,8 +30,8 @@ namespace FileCreate { m_extraWidget = extraWidget; m_typeChooser = dynamic_cast<TypeChooser*>(extraWidget); - connect(this, SIGNAL(filterChanged(const QString &)), this, SLOT(slotActionFilterChanged(const QString &)) ); - connect(locationEdit, SIGNAL(textChanged(const QString &)), this, SLOT(slotActionTextChanged(const QString &)) ); + connect(this, TQT_SIGNAL(filterChanged(const TQString &)), this, TQT_SLOT(slotActionFilterChanged(const TQString &)) ); + connect(locationEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotActionTextChanged(const TQString &)) ); } @@ -43,13 +43,13 @@ namespace FileCreate { KFileDialog::initGUI(); } - void FileDialog::slotActionFilterChanged(const QString & /*filter*/) { + void FileDialog::slotActionFilterChanged(const TQString & /*filter*/) { } - void FileDialog::slotActionTextChanged(const QString & text) { + void FileDialog::slotActionTextChanged(const TQString & text) { kdDebug(9034) << "slotActionTextChanged - " << text << endl; if (!m_typeChooser) return; - QString ext = QFileInfo(text).extension(); + TQString ext = TQFileInfo(text).extension(); kdDebug(9034) << "Extension is: " << ext << endl; FileType * filetype = m_typeChooser->part()->getType(ext); if (!filetype) return; diff --git a/parts/filecreate/filecreate_filedialog.h b/parts/filecreate/filecreate_filedialog.h index 04e40111..b1523648 100644 --- a/parts/filecreate/filecreate_filedialog.h +++ b/parts/filecreate/filecreate_filedialog.h @@ -23,20 +23,20 @@ namespace FileCreate { Q_OBJECT public: - FileDialog(const QString& startDir, const QString& filter, - QWidget *parent, const char *name, - bool modal, QWidget * extraWidget); + FileDialog(const TQString& startDir, const TQString& filter, + TQWidget *parent, const char *name, + bool modal, TQWidget * extraWidget); virtual ~FileDialog(); virtual void initGUI(); protected: - QWidget * m_extraWidget; + TQWidget * m_extraWidget; TypeChooser * m_typeChooser; protected slots: - void slotActionFilterChanged(const QString & filter); - void slotActionTextChanged(const QString & text); + void slotActionFilterChanged(const TQString & filter); + void slotActionTextChanged(const TQString & text); }; diff --git a/parts/filecreate/filecreate_filetype.h b/parts/filecreate/filecreate_filetype.h index 9b8e039c..4b050708 100644 --- a/parts/filecreate/filecreate_filetype.h +++ b/parts/filecreate/filecreate_filetype.h @@ -11,8 +11,8 @@ #ifndef __FILECREATE_FILETYPE_H__ #define __FILECREATE_FILETYPE_H__ -#include <qstring.h> -#include <qptrlist.h> +#include <tqstring.h> +#include <tqptrlist.h> namespace FileCreate { @@ -24,37 +24,37 @@ public: m_subtypes.setAutoDelete(true); } - void setName(const QString & name) { m_name = name; } - QString name() const { return m_name; } - void setExt(const QString & ext) { m_ext = ext; } - QString ext() const { return m_ext; } - void setCreateMethod(const QString & createMethod) { m_createMethod = createMethod; } - QString createMethod() const { return m_createMethod; } - void setSubtypeRef(const QString & subtypeRef) { m_subtypeRef = subtypeRef; } - QString subtypeRef() const { return m_subtypeRef; } - void setIcon(const QString & iconName) { m_iconName = iconName; } - QString icon() const { return m_iconName; } - void setDescr(const QString & descr) { m_descr = descr; } - QString descr() const { return m_descr; } + void setName(const TQString & name) { m_name = name; } + TQString name() const { return m_name; } + void setExt(const TQString & ext) { m_ext = ext; } + TQString ext() const { return m_ext; } + void setCreateMethod(const TQString & createMethod) { m_createMethod = createMethod; } + TQString createMethod() const { return m_createMethod; } + void setSubtypeRef(const TQString & subtypeRef) { m_subtypeRef = subtypeRef; } + TQString subtypeRef() const { return m_subtypeRef; } + void setIcon(const TQString & iconName) { m_iconName = iconName; } + TQString icon() const { return m_iconName; } + void setDescr(const TQString & descr) { m_descr = descr; } + TQString descr() const { return m_descr; } void setEnabled(bool on) { m_enabled = on; } bool enabled() const { return m_enabled; } void setSubtypesEnabled(bool enabled = true); void addSubtype(const FileType * subtype) { m_subtypes.append(subtype); } - QPtrList<FileType> subtypes() const { return m_subtypes; } + TQPtrList<FileType> subtypes() const { return m_subtypes; } private: - QString m_name; - QString m_ext; - QString m_createMethod; - QString m_subtypeRef; - QString m_iconName; - QString m_descr; + TQString m_name; + TQString m_ext; + TQString m_createMethod; + TQString m_subtypeRef; + TQString m_iconName; + TQString m_descr; bool m_enabled; - QPtrList<FileType> m_subtypes; + TQPtrList<FileType> m_subtypes; }; diff --git a/parts/filecreate/filecreate_listitem.cpp b/parts/filecreate/filecreate_listitem.cpp index 4b33514f..b6467505 100644 --- a/parts/filecreate/filecreate_listitem.cpp +++ b/parts/filecreate/filecreate_listitem.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * Copyright (C) 2003 by Julian Rockey * * linux@jrockey.com * - * thanks: Roberto Raggi for QSimpleRichText stuff * + * thanks: Roberto Raggi for TQSimpleRichText stuff * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -15,12 +15,12 @@ #include <kglobal.h> #include <kiconloader.h> -#include <qsimplerichtext.h> -#include <qpixmap.h> +#include <tqsimplerichtext.h> +#include <tqpixmap.h> namespace FileCreate { - ListItem::ListItem(QListView * listview, const FileType * filetype) : + ListItem::ListItem(TQListView * listview, const FileType * filetype) : KListViewItem(listview), m_filetype(filetype), m_filetypeRenderer(NULL) { @@ -43,7 +43,7 @@ namespace FileCreate { void ListItem::setup() { if (m_filetypeRenderer) delete m_filetypeRenderer; - m_filetypeRenderer = new QSimpleRichText( text(1), listView()->font() ); + m_filetypeRenderer = new TQSimpleRichText( text(1), listView()->font() ); m_filetypeRenderer->setWidth(listView()->columnWidth(1)); setHeight(m_filetypeRenderer->height()); KListViewItem::setup(); @@ -61,15 +61,15 @@ namespace FileCreate { } } - void ListItem::paintCell( QPainter* p, const QColorGroup& cg, int column, int width, int align ) + void ListItem::paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align ) { - QBrush brush( isSelected() ? cg.highlight() : backgroundColor() ); + TQBrush brush( isSelected() ? cg.highlight() : backgroundColor() ); if( column == 1 ){ // m_filetypeRenderer->setWidth(width); // setHeight(m_filetypeRenderer->height()); - m_filetypeRenderer->draw( p, 0, 0, QRect(0, 0, width, height()), cg, &brush ); + m_filetypeRenderer->draw( p, 0, 0, TQRect(0, 0, width, height()), cg, &brush ); return; } @@ -79,11 +79,11 @@ namespace FileCreate { void ListItem::init() { m_iconHeight = 0; - setText(0, m_filetype->ext()!="" ? QString("." + m_filetype->ext()) : QString("") ); + setText(0, m_filetype->ext()!="" ? TQString("." + m_filetype->ext()) : TQString("") ); setText(1, "<qt><b>"+m_filetype->name()+"</b>. " + m_filetype->descr() ); KIconLoader * loader = KGlobal::iconLoader(); - QPixmap iconPix = loader->loadIcon(m_filetype->icon(), KIcon::Desktop, + TQPixmap iconPix = loader->loadIcon(m_filetype->icon(), KIcon::Desktop, KIcon::SizeMedium, KIcon::DefaultState, NULL, true); diff --git a/parts/filecreate/filecreate_listitem.h b/parts/filecreate/filecreate_listitem.h index 3b2702d3..41651850 100644 --- a/parts/filecreate/filecreate_listitem.h +++ b/parts/filecreate/filecreate_listitem.h @@ -1,7 +1,7 @@ /*************************************************************************** * Copyright (C) 2003 by Julian Rockey * * linux@jrockey.com * - * thanks: Roberto Raggi for QSimpleRichText stuff * + * thanks: Roberto Raggi for TQSimpleRichText stuff * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -13,7 +13,7 @@ #define __FILECREATE_LISTITEM_H__ #include <klistview.h> -#include <qobject.h> +#include <tqobject.h> #include "filecreate_filetype.h" @@ -24,7 +24,7 @@ namespace FileCreate { class ListItem : public KListViewItem { public: - ListItem(QListView *listview, const FileType *filetype); + ListItem(TQListView *listview, const FileType *filetype); ListItem(ListItem *listitem, const FileType *filetype); virtual ~ListItem(); @@ -32,14 +32,14 @@ public: virtual void setup(); virtual void setHeight( int height ); - virtual void paintCell( QPainter* p, const QColorGroup& gc, int column, int width, int align ); + virtual void paintCell( TQPainter* p, const TQColorGroup& gc, int column, int width, int align ); virtual void prepareResize(); private: const FileType *m_filetype; int m_iconHeight; void init(); - QSimpleRichText *m_filetypeRenderer; + TQSimpleRichText *m_filetypeRenderer; }; diff --git a/parts/filecreate/filecreate_newfile.cpp b/parts/filecreate/filecreate_newfile.cpp index 2077556c..b4b84de1 100644 --- a/parts/filecreate/filecreate_newfile.cpp +++ b/parts/filecreate/filecreate_newfile.cpp @@ -12,13 +12,13 @@ #include "filecreate_newfile.moc" -#include <qvbox.h> -#include <qgrid.h> +#include <tqvbox.h> +#include <tqgrid.h> -#include <qhbox.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qlabel.h> +#include <tqhbox.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqlabel.h> #include <klineedit.h> #include <kurlrequester.h> #include <kcombobox.h> @@ -29,31 +29,31 @@ namespace FileCreate { - NewFileChooser::NewFileChooser(QWidget * parent) : + NewFileChooser::NewFileChooser(TQWidget * parent) : KDialogBase(KDialogBase::Plain, i18n("New file dialog (title)", "New File"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, parent, "New file", true) { - QVBoxLayout* lay = new QVBoxLayout( plainPage(), 5, 5 ); + TQVBoxLayout* lay = new TQVBoxLayout( plainPage(), 5, 5 ); - lay->addWidget( new QLabel( i18n("<b>New File Creation</b>"), plainPage() ) ); + lay->addWidget( new TQLabel( i18n("<b>New File Creation</b>"), plainPage() ) ); - QGridLayout* grid = new QGridLayout(lay, 2, 2, 5 ); - QLabel * l = new QLabel(i18n("&Directory:"), plainPage() ); + TQGridLayout* grid = new TQGridLayout(lay, 2, 2, 5 ); + TQLabel * l = new TQLabel(i18n("&Directory:"), plainPage() ); grid->addWidget(l, 0, 0); m_urlreq = new KURLRequester( plainPage(), "url request" ); grid->addWidget(m_urlreq, 0, 1); l->setBuddy(m_urlreq); - l = new QLabel(i18n("&File name:"), plainPage() ); + l = new TQLabel(i18n("&File name:"), plainPage() ); grid->addWidget(l, 1, 0); m_filename = new KLineEdit( plainPage() ); grid->addWidget(m_filename, 1, 1); l->setBuddy(m_filename); // lay->addWidget( grid ); - QHBoxLayout* hbox = new QHBoxLayout( lay, 5 ); + TQHBoxLayout* hbox = new TQHBoxLayout( lay, 5 ); m_filetypes = new KComboBox( plainPage(), "combo" ); hbox->addWidget(m_filetypes); - m_addToProject = new QCheckBox( i18n("Add to project (on checkbox)", "&Add to project"), plainPage(), "addproject" ); + m_addToProject = new TQCheckBox( i18n("Add to project (on checkbox)", "&Add to project"), plainPage(), "addproject" ); hbox->addWidget(m_addToProject); lay->addStretch(20); @@ -62,19 +62,19 @@ namespace FileCreate { m_addToProject->setChecked( true ); m_urlreq->setMode((int) KFile::Directory); - connect( m_filename, SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotFileNameChanged(const QString & ) ) ); + connect( m_filename, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotFileNameChanged(const TQString & ) ) ); slotFileNameChanged( m_filename->text() ); } NewFileChooser::~NewFileChooser() { } - void NewFileChooser::slotFileNameChanged(const QString & _text) + void NewFileChooser::slotFileNameChanged(const TQString & _text) { enableButtonOK( !_text.isEmpty() ); } - void NewFileChooser::setFileTypes(QPtrList<FileType> filetypes) { + void NewFileChooser::setFileTypes(TQPtrList<FileType> filetypes) { for(FileType * filetype = filetypes.first(); filetype; filetype=filetypes.next()) { @@ -84,7 +84,7 @@ namespace FileCreate { if (filetype->subtypes().count()==0) addType(filetype); - QPtrList<FileType> subtypes = filetype->subtypes(); + TQPtrList<FileType> subtypes = filetype->subtypes(); for(FileType * subtype = subtypes.first(); subtype; subtype=subtypes.next()) { @@ -118,12 +118,12 @@ namespace FileCreate { void NewFileChooser::addType(const FileType * filetype) { m_typeInCombo[m_filetypes->count()]=filetype; m_filetypes->insertItem( filetype->name() + - (filetype->ext()!="" ? QString(" (." + filetype->ext() + ")") : QString("") ) ); + (filetype->ext()!="" ? TQString(" (." + filetype->ext() + ")") : TQString("") ) ); } void NewFileChooser::setCurrent(const FileType *filetype) { int changeToRow = -1; - QMap<int,const FileType*>::Iterator it; + TQMap<int,const FileType*>::Iterator it; for ( it = m_typeInCombo.begin(); it != m_typeInCombo.end() && changeToRow==-1; ++it ) { if (it.data()==filetype) changeToRow=it.key(); @@ -131,11 +131,11 @@ namespace FileCreate { if (changeToRow>-1) m_filetypes->setCurrentItem(changeToRow); } - void NewFileChooser::setDirectory(const QString & url) { + void NewFileChooser::setDirectory(const TQString & url) { m_urlreq->setURL(url); } - void NewFileChooser::setName(const QString & name) { + void NewFileChooser::setName(const TQString & name) { m_filename->setText(name); } @@ -147,9 +147,9 @@ namespace FileCreate { void NewFileChooser::accept() { - QString fullPath = url().path(); + TQString fullPath = url().path(); if ( !selectedType()->ext().isEmpty() && !fullPath.endsWith("." + selectedType()->ext())) fullPath+="." + selectedType()->ext(); - QFileInfo file( fullPath ); + TQFileInfo file( fullPath ); if ( file.exists() ) { KMessageBox::sorry( this, i18n("A file with this name already exists"), i18n("File Exists") ); diff --git a/parts/filecreate/filecreate_newfile.h b/parts/filecreate/filecreate_newfile.h index 5123c7d9..54a4462e 100644 --- a/parts/filecreate/filecreate_newfile.h +++ b/parts/filecreate/filecreate_newfile.h @@ -10,8 +10,8 @@ #ifndef FILECREATE_NEWFILE_H #define FILECREATE_NEWFILE_H -#include <qptrlist.h> -#include <qmap.h> +#include <tqptrlist.h> +#include <tqmap.h> #include <kurl.h> #include <kdialogbase.h> @@ -27,30 +27,30 @@ namespace FileCreate { class NewFileChooser : public KDialogBase { Q_OBJECT public: - NewFileChooser(QWidget *parent=0); + NewFileChooser(TQWidget *parent=0); virtual ~NewFileChooser(); - void setFileTypes(QPtrList<FileType> typelist); + void setFileTypes(TQPtrList<FileType> typelist); KURL url() const; bool addToProject() const; const FileType *selectedType() const; void setCurrent(const FileType *filetype); - void setDirectory(const QString & url); - void setName(const QString & name); + void setDirectory(const TQString & url); + void setName(const TQString & name); void setInProjectMode(bool m); private slots: - void slotFileNameChanged(const QString &); + void slotFileNameChanged(const TQString &); protected: void addType(const FileType * filetype); void accept(); - QGridLayout *m_grid; + TQGridLayout *m_grid; KURLRequester *m_urlreq; KComboBox *m_filetypes; - QCheckBox *m_addToProject; + TQCheckBox *m_addToProject; KLineEdit *m_filename; - QMap<int,const FileType*> m_typeInCombo; + TQMap<int,const FileType*> m_typeInCombo; }; diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp index 3733753a..e07656b9 100644 --- a/parts/filecreate/filecreate_part.cpp +++ b/parts/filecreate/filecreate_part.cpp @@ -9,12 +9,12 @@ ***************************************************************************/ #include "filecreate_part.h" -#include <qwhatsthis.h> -#include <qdom.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qvbox.h> -#include <qtimer.h> +#include <tqwhatsthis.h> +#include <tqdom.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqvbox.h> +#include <tqtimer.h> #include <kdeversion.h> #include <kiconloader.h> @@ -61,30 +61,30 @@ K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( data ) ) using namespace FileCreate; -FileCreatePart::FileCreatePart(QObject *parent, const char *name, const QStringList & ) +FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStringList & ) // : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0) : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0) { setInstance(FileCreateFactory::instance()); setXMLFile("kdevpart_filecreate.rc"); - connect( core(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(slotProjectClosed()) ); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("File Templates"), PROJECTSETTINGSPAGE, info()->icon() ); _configProxy->createGlobalConfigPage( i18n("File Templates"), GLOBALSETTINGSPAGE, 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 )) ); - KToolBarPopupAction * newAction = new KToolBarPopupAction( i18n("&New"), "filenew", CTRL+Qt::Key_N, this, SLOT(slotNewFile()), actionCollection(), "file_new"); + KToolBarPopupAction * newAction = new KToolBarPopupAction( i18n("&New"), "filenew", CTRL+Qt::Key_N, this, TQT_SLOT(slotNewFile()), actionCollection(), "file_new"); newAction->setWhatsThis( i18n("<b>New file</b><p>Creates a new file. Also adds it the project if the <b>Add to project</b> checkbox is turned on.") ); newAction->setToolTip( i18n("Create a new file") ); m_newPopupMenu = newAction->popupMenu(); - connect(m_newPopupMenu, SIGNAL(aboutToShow()), this, SLOT(slotAboutToShowNewPopupMenu())); + connect(m_newPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShowNewPopupMenu())); - QTimer::singleShot( 0, this, SLOT(slotGlobalInitialize()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotGlobalInitialize()) ); } @@ -96,7 +96,7 @@ FileCreatePart::~FileCreatePart() delete m_subPopups; } -void FileCreatePart::insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int pagenumber ) +void FileCreatePart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber ) { kdDebug() << k_funcinfo << endl; @@ -105,14 +105,14 @@ void FileCreatePart::insertConfigWidget( const KDialogBase * dlg, QWidget * page case PROJECTSETTINGSPAGE: { FCConfigWidget* w = new FCConfigWidget( this, false, page, "filecreate config widget" ); - connect( dlg, SIGNAL( okClicked( ) ), w, SLOT( accept( ) ) ); + connect( dlg, TQT_SIGNAL( okClicked( ) ), w, TQT_SLOT( accept( ) ) ); } break; case GLOBALSETTINGSPAGE: { FCConfigWidget *w = new FCConfigWidget( this, true, page, "filecreate config widget" ); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); } break; } @@ -132,26 +132,26 @@ void FileCreatePart::slotAboutToShowNewPopupMenu() { if (filetype->subtypes().count()==0) { - QPixmap iconPix = m_iconLoader->loadIcon( + TQPixmap iconPix = m_iconLoader->loadIcon( filetype->icon(), KIcon::Desktop, KIcon::SizeSmall, KIcon::DefaultState, NULL, true); m_newPopupMenu->insertItem(iconPix, filetype->name(), this, - SLOT(slotNewFilePopup(int)), 0, ++id ); + TQT_SLOT(slotNewFilePopup(int)), 0, ++id ); m_newPopupMenu->setItemParameter( id, (long)filetype ); } else { KPopupMenu* subMenu = NULL; - QPtrList<FileType> subtypes = filetype->subtypes(); + TQPtrList<FileType> subtypes = filetype->subtypes(); for(FileType * subtype = subtypes.first(); subtype; subtype=subtypes.next()) { if (subtype->enabled()){ if( !subMenu ) subMenu = new KPopupMenu(0,0); - QPixmap iconPix = m_iconLoader->loadIcon( + TQPixmap iconPix = m_iconLoader->loadIcon( subtype->icon(), KIcon::Desktop, KIcon::SizeSmall, KIcon::DefaultState, NULL, true); subMenu->insertItem(iconPix, subtype->name(), this, - SLOT(slotNewFilePopup(int)), 0, ++id ); + TQT_SLOT(slotNewFilePopup(int)), 0, ++id ); subMenu->setItemParameter( id, (long)subtype ); } } @@ -159,7 +159,7 @@ void FileCreatePart::slotAboutToShowNewPopupMenu() { if( !m_subPopups ) { - m_subPopups = new QPtrList<KPopupMenu>; + m_subPopups = new TQPtrList<KPopupMenu>; m_subPopups->setAutoDelete(true); } m_subPopups->append( subMenu ); @@ -187,10 +187,10 @@ void FileCreatePart::slotNewFile() { } void FileCreatePart::slotProjectOpened() { - QTimer::singleShot( 0, this, SLOT(slotInitialize()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotInitialize()) ); } -void FileCreatePart::addFileType(const QString & filename) { +void FileCreatePart::addFileType(const TQString & filename) { FileType * filetype = getType(filename); if (!filetype) { filetype = new FileType; @@ -204,14 +204,14 @@ void FileCreatePart::addFileType(const QString & filename) { void FileCreatePart::slotProjectClosed() { m_filetypes.clear(); - QTimer::singleShot( 0, this, SLOT(slotGlobalInitialize()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotGlobalInitialize()) ); } void FileCreatePart::slotFiletypeSelected(const FileType * filetype) { KDevCreateFile::CreatedFile createdFile = createNewFile(filetype->ext(), - QString::null, - QString::null, + TQString::null, + TQString::null, filetype->subtypeRef()); openCreatedFile(createdFile); @@ -226,14 +226,14 @@ void FileCreatePart::openCreatedFile(const KDevCreateFile::CreatedFile & created } } -int FileCreatePart::readTypes(const QDomDocument & dom, QPtrList<FileType> &m_filetypes, bool enable) { +int FileCreatePart::readTypes(const TQDomDocument & dom, TQPtrList<FileType> &m_filetypes, bool enable) { int numRead = 0; - QDomElement fileTypes = DomUtil::elementByPath(dom,"/kdevfilecreate/filetypes"); + TQDomElement fileTypes = DomUtil::elementByPath(dom,"/kdevfilecreate/filetypes"); if (!fileTypes.isNull()) { - for(QDomNode node = fileTypes.firstChild();!node.isNull();node=node.nextSibling()) { + for(TQDomNode node = fileTypes.firstChild();!node.isNull();node=node.nextSibling()) { if (node.isElement() && node.nodeName()=="type") { - QDomElement element = node.toElement(); + TQDomElement element = node.toElement(); FileType * filetype = new FileType; filetype->setName( element.attribute("name") ); filetype->setExt( element.attribute("ext") ); @@ -248,10 +248,10 @@ int FileCreatePart::readTypes(const QDomDocument & dom, QPtrList<FileType> &m_fi kdDebug(9034) << "node: " << filetype->name().latin1() << endl; if (node.hasChildNodes()) { - for(QDomNode subnode = node.firstChild();!subnode.isNull();subnode=subnode.nextSibling()) { + for(TQDomNode subnode = node.firstChild();!subnode.isNull();subnode=subnode.nextSibling()) { kdDebug(9034) << "subnode: " << subnode.nodeName().latin1() << endl; if (subnode.isElement() && subnode.nodeName()=="subtype") { - QDomElement subelement = subnode.toElement(); + TQDomElement subelement = subnode.toElement(); FileType * subtype = new FileType; subtype->setExt( filetype->ext() ); subtype->setCreateMethod( filetype->createMethod() ); @@ -270,23 +270,23 @@ int FileCreatePart::readTypes(const QDomDocument & dom, QPtrList<FileType> &m_fi return numRead; } -FileType * FileCreatePart::getType(const QString & ex, const QString subtRef) { +FileType * FileCreatePart::getType(const TQString & ex, const TQString subtRef) { - QString subtypeRef = subtRef; - QString ext = ex; + TQString subtypeRef = subtRef; + TQString ext = ex; int dashPos = ext.find('-'); if (dashPos>-1 && subtRef.isNull()) { ext = ex.left(dashPos); subtypeRef = ex.mid(dashPos+1); } - QPtrList<FileType> filetypes = getFileTypes(); + TQPtrList<FileType> filetypes = getFileTypes(); for(FileType * filetype = filetypes.first(); filetype; filetype=filetypes.next()) { if (filetype->ext()==ext) { if (subtypeRef.isNull()) return filetype; - QPtrList<FileType> subtypes = filetype->subtypes(); + TQPtrList<FileType> subtypes = filetype->subtypes(); for(FileType * subtype = subtypes.first(); subtype; subtype=subtypes.next()) { @@ -297,23 +297,23 @@ FileType * FileCreatePart::getType(const QString & ex, const QString subtRef) { return NULL; } -FileType * FileCreatePart::getEnabledType(const QString & ex, const QString subtRef) { +FileType * FileCreatePart::getEnabledType(const TQString & ex, const TQString subtRef) { - QString subtypeRef = subtRef; - QString ext = ex; + TQString subtypeRef = subtRef; + TQString ext = ex; int dashPos = ext.find('-'); if (dashPos>-1 && subtRef.isNull()) { ext = ex.left(dashPos); subtypeRef = ex.mid(dashPos+1); } - QPtrList<FileType> filetypes = getFileTypes(); + TQPtrList<FileType> filetypes = getFileTypes(); for(FileType * filetype = filetypes.first(); filetype; filetype=filetypes.next()) { if (filetype->ext()==ext) { if ( (subtypeRef.isNull()) && (filetype->enabled()) ) return filetype; - QPtrList<FileType> subtypes = filetype->subtypes(); + TQPtrList<FileType> subtypes = filetype->subtypes(); for(FileType * subtype = subtypes.first(); subtype; subtype=subtypes.next()) { @@ -326,7 +326,7 @@ FileType * FileCreatePart::getEnabledType(const QString & ex, const QString subt // KDevFileCreate interface -KDevCreateFile::CreatedFile FileCreatePart::createNewFile(QString ext, QString dir, QString name, QString subtype) +KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString dir, TQString name, TQString subtype) { KDevCreateFile::CreatedFile result; @@ -358,10 +358,10 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(QString ext, QString d if (!dir.isNull()) dialog.setDirectory(dir); else if (!project()) - dialog.setDirectory(QDir::currentDirPath()); + dialog.setDirectory(TQDir::currentDirPath()); else { - QString activeDir = project()->activeDirectory(); + TQString activeDir = project()->activeDirectory(); dialog.setDirectory( project()->projectDirectory() + ( activeDir[0] == '/' ? "" : "/" ) + activeDir ); @@ -369,7 +369,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(QString ext, QString d if (!name.isNull()) dialog.setName(name); if (filetype) dialog.setCurrent(filetype); - dialog.setInitialSize(QSize(500, 200)); + dialog.setInitialSize(TQSize(500, 200)); int dialogResult = dialog.exec(); if (dialogResult == KDialogBase::Rejected) { @@ -393,11 +393,11 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(QString ext, QString d subtype = selectedFileType->subtypeRef(); } - QString fullPath = selectedURL.path(); + TQString fullPath = selectedURL.path(); // add appropriate extension, if not already there if ( !ext.isEmpty() && !fullPath.endsWith("." + ext)) fullPath+="." + ext; - QString filename = URLUtil::filename(fullPath); + TQString filename = URLUtil::filename(fullPath); kdDebug(9034) << "full path = " << fullPath << endl; // add in subtype, if specified @@ -410,7 +410,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(QString ext, QString d created = FileTemplate::copy(this, ext, fullPath); else { // no template, create a blank file instead - QFile f(fullPath); + TQFile f(fullPath); created = f.open( IO_WriteOnly ); f.close(); } @@ -423,8 +423,8 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(QString ext, QString d if (dialog.addToProject()) { // work out the path relative to the project directory -// QString relToProj = URLUtil::relativePath(projectURL, selectedURL, URLUtil::SLASH_PREFIX ); - QString relToProj; +// TQString relToProj = URLUtil::relativePath(projectURL, selectedURL, URLUtil::SLASH_PREFIX ); + TQString relToProj; if( project()->options() & KDevProject::UsesQMakeBuildSystem ) { relToProj = URLUtil::relativePathToFile( project()->projectDirectory(), fullPath ); @@ -440,7 +440,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(QString ext, QString d url.setPath(fullPath); partController()->editDocument(url); - QString fileName = URLUtil::filename(fullPath); + TQString fileName = URLUtil::filename(fullPath); kdDebug(9034) << "file name = " << filename << endl; result.filename = fileName; @@ -451,7 +451,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(QString ext, QString d } void FileCreatePart::slotNoteFiletype(const FileType * filetype) { - kdDebug(9034) << "Noting file type: " << (filetype ? filetype->ext() : QString::fromLatin1("Null") ) << endl; + kdDebug(9034) << "Noting file type: " << (filetype ? filetype->ext() : TQString::fromLatin1("Null") ) << endl; m_filedialogFiletype = filetype; } @@ -463,15 +463,15 @@ void FileCreatePart::slotInitialize( ) slotGlobalInitialize(); // read in which global templates are to be used for this project - QDomElement useGlobalTypes = + TQDomElement useGlobalTypes = DomUtil::elementByPath(*projectDom(),"/kdevfilecreate/useglobaltypes"); - for(QDomNode node = useGlobalTypes.firstChild(); + for(TQDomNode node = useGlobalTypes.firstChild(); !node.isNull();node=node.nextSibling()) { if (node.isElement() && node.nodeName()=="type") { - QDomElement element = node.toElement(); - QString ext = element.attribute("ext"); - QString subtyperef = element.attribute("subtyperef"); + TQDomElement element = node.toElement(); + TQString ext = element.attribute("ext"); + TQString subtyperef = element.attribute("subtyperef"); // if an extension has been specified as enabled, ensure it // and all its subtypes are enabled if (subtyperef.isNull()) { @@ -498,13 +498,13 @@ void FileCreatePart::slotInitialize( ) if ( project() && readTypes( *projectDom(), m_filetypes, true )==0 ) { // default by scanning the templates directory if no template info // found in project file - QDir templDir( project()->projectDirectory() + "/templates/" ); + TQDir templDir( project()->projectDirectory() + "/templates/" ); if (templDir.exists()) { - templDir.setFilter( QDir::Files ); + templDir.setFilter( TQDir::Files ); const QFileInfoList * list = templDir.entryInfoList(); if( list ){ QFileInfoListIterator it( *list ); - QFileInfo *fi; + TQFileInfo *fi; while ( (fi = it.current()) != 0 ) { addFileType(fi->fileName()); ++it; @@ -520,16 +520,16 @@ void FileCreatePart::slotInitialize( ) } } -QString FileCreatePart::findGlobalXMLFile() const +TQString FileCreatePart::findGlobalXMLFile() const { int version = 0; - QString filename; - QStringList filenames = KGlobal::instance()->dirs()->findAllResources("data", "kdevfilecreate/template-info.xml"); - for( QStringList::const_iterator it = filenames.begin(); it != filenames.end(); ++it ) + TQString filename; + TQStringList filenames = KGlobal::instance()->dirs()->findAllResources("data", "kdevfilecreate/template-info.xml"); + for( TQStringList::const_iterator it = filenames.begin(); it != filenames.end(); ++it ) { - QDomDocument globalDom; + TQDomDocument globalDom; DomUtil::openDOMFile(globalDom,*it); - QDomElement e = globalDom.documentElement(); + TQDomElement e = globalDom.documentElement(); if( !e.hasAttribute( "version" ) && e.attribute( "version" ).toInt() < version ) { continue; @@ -545,9 +545,9 @@ QString FileCreatePart::findGlobalXMLFile() const void FileCreatePart::slotGlobalInitialize( ) { // read in global template information - QString globalXMLFile = findGlobalXMLFile(); + TQString globalXMLFile = findGlobalXMLFile(); kdDebug(9034) << "Found global template info info " << globalXMLFile << endl; - QDomDocument globalDom; + TQDomDocument globalDom; if (!globalXMLFile.isNull() && DomUtil::openDOMFile(globalDom,globalXMLFile)) { kdDebug(9034) << "Reading global template info..." << endl; diff --git a/parts/filecreate/filecreate_part.h b/parts/filecreate/filecreate_part.h index 3cbc9909..605f6fbf 100644 --- a/parts/filecreate/filecreate_part.h +++ b/parts/filecreate/filecreate_part.h @@ -14,10 +14,10 @@ #define __KDEVPART_FILECREATE_H__ -#include <qguardedptr.h> -#include <qptrlist.h> +#include <tqguardedptr.h> +#include <tqptrlist.h> -#include <qwidget.h> +#include <tqwidget.h> #include <kdevplugin.h> #include <kdevcreatefile.h> @@ -42,36 +42,36 @@ class FileCreatePart : public KDevCreateFile friend class FCConfigWidget; public: - FileCreatePart(QObject *parent, const char *name, const QStringList &); + FileCreatePart(TQObject *parent, const char *name, const TQStringList &); virtual ~FileCreatePart(); /** * Returns the list of available file types. */ - QPtrList<FileType> getFileTypes() const { return m_filetypes; } + TQPtrList<FileType> getFileTypes() const { return m_filetypes; } /** * Call this method to create a new file, within or without the project. Supply as - * much information as you know. Leave what you don't know as QString::null. + * much information as you know. Leave what you don't know as TQString::null. * The user will be prompted as necessary for the missing information, and the * file created, and added to the project as necessary. */ - virtual KDevCreateFile::CreatedFile createNewFile(QString ext = QString::null, - QString dir = QString::null, - QString name = QString::null, - QString subtype = QString::null); + virtual KDevCreateFile::CreatedFile createNewFile(TQString ext = TQString::null, + TQString dir = TQString::null, + TQString name = TQString::null, + TQString subtype = TQString::null); /** * Finds the file type object for a given extension and optionally subtype. * You can omit the subtype and specify the extension as ext-subtype if you wish. */ - FileType * getType(const QString & ext, const QString subtype = QString::null); + FileType * getType(const TQString & ext, const TQString subtype = TQString::null); /** * Finds the file type object for a given extension and optionally subtype. * You can omit the subtype and specify the extension as ext-subtype if you wish. * Returns only enabled type (i.e. used in the project). */ - FileType * getEnabledType(const QString & ext, const QString subtype = QString::null); + FileType * getEnabledType(const TQString & ext, const TQString subtype = TQString::null); public slots: @@ -99,7 +99,7 @@ public slots: protected slots: void slotNoteFiletype(const FileType * filetype); void slotAboutToShowNewPopupMenu(); - void insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int ); + void insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int ); private: /** @@ -112,22 +112,22 @@ private: * to the file type list. If enable is true, sets them all to * enabled=true by default. */ - int readTypes(const QDomDocument & dom, QPtrList<FileType> &m_filetypes, bool enable); + int readTypes(const TQDomDocument & dom, TQPtrList<FileType> &m_filetypes, bool enable); /** * Add a file type */ - void addFileType(const QString & filename); + void addFileType(const TQString & filename); /** * Finds the global XML file that has the same version as KDevelop */ - QString findGlobalXMLFile() const; + TQString findGlobalXMLFile() const; /** * List of file types from which the user can choose */ - QPtrList<FileType> m_filetypes; + TQPtrList<FileType> m_filetypes; /** * The file type selected by the new file dialog, if appropriate. @@ -137,7 +137,7 @@ private: ConfigWidgetProxy * _configProxy; KPopupMenu* m_newPopupMenu; - QPtrList<KPopupMenu>* m_subPopups; + TQPtrList<KPopupMenu>* m_subPopups; }; diff --git a/parts/filecreate/filecreate_typechoosersig.h b/parts/filecreate/filecreate_typechoosersig.h index 7f16208a..233afe70 100644 --- a/parts/filecreate/filecreate_typechoosersig.h +++ b/parts/filecreate/filecreate_typechoosersig.h @@ -1,17 +1,17 @@ #ifndef __FILECREATE_TYPECHOOSERSIG_H__ #define __FILECREATE_TYPECHOOSERSIG_H__ -#include <qobject.h> +#include <tqobject.h> namespace FileCreate { class FileType; -class Signaller : public QObject { +class Signaller : public TQObject { Q_OBJECT public: - Signaller() : QObject() { } + Signaller() : TQObject() { } virtual ~Signaller() { } virtual void signal(const FileType * filetype ) { diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp index c8e6d051..10816904 100644 --- a/parts/filecreate/filecreate_widget2.cpp +++ b/parts/filecreate/filecreate_widget2.cpp @@ -8,9 +8,9 @@ * (at your option) any later version. * ***************************************************************************/ -#include <qptrlist.h> -#include <qtimer.h> -#include <qwhatsthis.h> +#include <tqptrlist.h> +#include <tqtimer.h> +#include <tqwhatsthis.h> #include <kparts/part.h> #include <klibloader.h> @@ -30,7 +30,7 @@ namespace FileCreate { FriendlyWidget::FriendlyWidget(FileCreatePart *part) - : QTable(0,4,0), TypeChooser(part), m_selected(NULL) + : TQTable(0,4,0), TypeChooser(part), m_selected(NULL) { setReadOnly(true); @@ -45,7 +45,7 @@ namespace FileCreate { m_iconLoader = KGlobal::iconLoader(); - QWhatsThis::add(this, i18n("Use this to create new files within your project.")); + TQWhatsThis::add(this, i18n("Use this to create new files within your project.")); setDefaultColumnWidths(); @@ -58,7 +58,7 @@ namespace FileCreate { void FriendlyWidget::setCurrent(const FileType * current) { int changeToRow = -1; - QMap<int,FileType*>::Iterator it; + TQMap<int,FileType*>::Iterator it; kdDebug(9034) << "Checking " << current->descr() << " for matches in row..." << endl; for ( it = typeForRow.begin(); it != typeForRow.end() && changeToRow==-1; ++it ) { kdDebug(9034) << "Checking: " << it.data()->descr() << endl; @@ -88,12 +88,12 @@ namespace FileCreate { void FriendlyWidget::refresh() { - disconnect( this, SIGNAL(currentChanged(int,int)), this, SLOT(slotCellSelected(int,int)) ); + disconnect( this, TQT_SIGNAL(currentChanged(int,int)), this, TQT_SLOT(slotCellSelected(int,int)) ); empty(); int row = 0; - QPtrList<FileType> filetypes = m_part->getFileTypes(); + TQPtrList<FileType> filetypes = m_part->getFileTypes(); for(FileType * filetype = filetypes.first(); filetype; filetype=filetypes.next()) { @@ -103,7 +103,7 @@ namespace FileCreate { if (filetype->subtypes().count()==0) setRow(row++, filetype); - QPtrList<FileType> subtypes = filetype->subtypes(); + TQPtrList<FileType> subtypes = filetype->subtypes(); for(FileType * subtype = subtypes.first(); subtype; subtype=subtypes.next()) { @@ -117,7 +117,7 @@ namespace FileCreate { resizeCells(); if (currentSelection()>-1) removeSelection(currentSelection()); - connect( this, SIGNAL(currentChanged(int,int)), this, SLOT(slotCellSelected(int,int)) ); + connect( this, TQT_SIGNAL(currentChanged(int,int)), this, TQT_SLOT(slotCellSelected(int,int)) ); } @@ -130,7 +130,7 @@ namespace FileCreate { item(row,1)->setWordWrap(true); item(row,3)->setWordWrap(true); //setRowStretchable(row,true); - QPixmap iconPix = m_iconLoader->loadIcon(filetype->icon(), KIcon::Desktop, KIcon::SizeMedium, + TQPixmap iconPix = m_iconLoader->loadIcon(filetype->icon(), KIcon::Desktop, KIcon::SizeMedium, KIcon::DefaultState, NULL, true); if (!iconPix.isNull()) { @@ -165,7 +165,7 @@ namespace FileCreate { } m_selected = typeForRow.contains(row) ? typeForRow[row] : NULL; - QTimer::singleShot(0, this, SLOT(slotDoSelection()) ); + TQTimer::singleShot(0, this, TQT_SLOT(slotDoSelection()) ); } @@ -187,11 +187,11 @@ namespace FileCreate { int maxHeight = 0; for(int c=0;c<numCols();c++) { - QTableItem* i = item( row, c ); + TQTableItem* i = item( row, c ); if( !i ) continue; - QSize size = i->sizeHint(); + TQSize size = i->sizeHint(); maxHeight = size.height()>maxHeight ? size.height() : maxHeight; } setRowHeight(row,maxHeight+2); // bit of extra room @@ -202,11 +202,11 @@ namespace FileCreate { int maxWidth = 0; for(int r=0;r<numRows();r++) { - QTableItem* i = item( r, col ); + TQTableItem* i = item( r, col ); if( !i ) continue; - QSize size = item(r,col)->sizeHint(); + TQSize size = item(r,col)->sizeHint(); maxWidth = size.width()>maxWidth ? size.width() : maxWidth; } setColumnWidth(col,maxWidth+2); // bit of extra room @@ -215,7 +215,7 @@ namespace FileCreate { #if QT_VERSION < 0x030100 void FriendlyWidget::selectRow(int row) { if (numCols()>0 && row<numRows()) { - QTableSelection sel; + TQTableSelection sel; sel.init(row,0); sel.expandTo(row,numCols()); addSelection(sel); diff --git a/parts/filecreate/filecreate_widget2.h b/parts/filecreate/filecreate_widget2.h index 8b3d14e8..0e909d41 100644 --- a/parts/filecreate/filecreate_widget2.h +++ b/parts/filecreate/filecreate_widget2.h @@ -12,9 +12,9 @@ #define __FILECREATE_WIDGET2_H__ #include <kdeversion.h> -#include <qtable.h> -#include <qstring.h> -#include <qmap.h> +#include <tqtable.h> +#include <tqstring.h> +#include <tqmap.h> //#include <klistview.h> @@ -28,7 +28,7 @@ namespace FileCreate { class FileType; - class FriendlyWidget : public QTable, public TypeChooser + class FriendlyWidget : public TQTable, public TypeChooser { Q_OBJECT @@ -86,7 +86,7 @@ namespace FileCreate { /** * A mapping of each row number to a file type. */ - QMap<int,FileType*> typeForRow; + TQMap<int,FileType*> typeForRow; /** * The currently selected file type, or null if none. */ diff --git a/parts/filecreate/filecreate_widget3.cpp b/parts/filecreate/filecreate_widget3.cpp index f766cbcf..5d307bff 100644 --- a/parts/filecreate/filecreate_widget3.cpp +++ b/parts/filecreate/filecreate_widget3.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * Copyright (C) 2003 by Julian Rockey * * linux@jrockey.com * - * thanks: Roberto Raggi for QSimpleRichText stuff * + * thanks: Roberto Raggi for TQSimpleRichText stuff * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -9,8 +9,8 @@ * (at your option) any later version. * ***************************************************************************/ -#include <qptrlist.h> -#include <qwhatsthis.h> +#include <tqptrlist.h> +#include <tqwhatsthis.h> #include <kparts/part.h> #include <klibloader.h> @@ -41,12 +41,12 @@ namespace FileCreate { addColumn(""); addColumn(""); - QWhatsThis::add(this, i18n("<b>New file</b><p>This part makes the creation of new files easier. Select a type in the list to create a file. " + TQWhatsThis::add(this, i18n("<b>New file</b><p>This part makes the creation of new files easier. Select a type in the list to create a file. " "The list of project file types can be configured in project settings dialog, <b>New File Wizard</b> tab. " "Globally available file types are listed and can be configured in KDevelop settings dialog, <b>New File Wizard</b> tab.")); - connect( this, SIGNAL(clicked(QListViewItem*)), this, SLOT(slotTypeSelected(QListViewItem*)) ); + connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotTypeSelected(TQListViewItem*)) ); } @@ -57,7 +57,7 @@ namespace FileCreate { void ListWidget::setCurrent(const FileType * current) { bool found = false; - QListViewItem * lvi = firstChild(); + TQListViewItem * lvi = firstChild(); while(lvi && !found) { ListItem * li = dynamic_cast<ListItem*>(lvi); if (li) { @@ -76,7 +76,7 @@ namespace FileCreate { } - void ListWidget::resizeEvent(QResizeEvent *event) { + void ListWidget::resizeEvent(TQResizeEvent *event) { ListItem *li = dynamic_cast<ListItem*>(firstChild()); while(li) { li->prepareResize(); @@ -87,12 +87,12 @@ namespace FileCreate { void ListWidget::refresh() { clear(); - QPtrList<FileType> filetypes = m_part->getFileTypes(); + TQPtrList<FileType> filetypes = m_part->getFileTypes(); for(FileType * filetype = filetypes.first(); filetype!=NULL; filetype=filetypes.next()) { if (filetype->enabled()) { - QPtrList<FileType> subtypes = filetype->subtypes(); + TQPtrList<FileType> subtypes = filetype->subtypes(); if (subtypes.count()==0) new ListItem( this, filetype ); for(FileType * subtype = subtypes.first(); @@ -105,7 +105,7 @@ namespace FileCreate { } } - void ListWidget::slotTypeSelected(QListViewItem * item) { + void ListWidget::slotTypeSelected(TQListViewItem * item) { ListItem * fileitem = dynamic_cast<ListItem*>(item); if (!fileitem) return; diff --git a/parts/filecreate/filecreate_widget3.h b/parts/filecreate/filecreate_widget3.h index 58fc5129..cc2c836e 100644 --- a/parts/filecreate/filecreate_widget3.h +++ b/parts/filecreate/filecreate_widget3.h @@ -12,8 +12,8 @@ #define __FILECREATE_WIDGET3_H__ -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> #include <klistview.h> @@ -38,10 +38,10 @@ namespace FileCreate { virtual void refresh(); virtual void setCurrent(const FileType * current); - virtual void resizeEvent(QResizeEvent *event); + virtual void resizeEvent(TQResizeEvent *event); public slots: - void slotTypeSelected(QListViewItem * item); + void slotTypeSelected(TQListViewItem * item); }; diff --git a/parts/filelist/fileinfo.h b/parts/filelist/fileinfo.h index 845e68e4..8c0e06d5 100644 --- a/parts/filelist/fileinfo.h +++ b/parts/filelist/fileinfo.h @@ -23,7 +23,7 @@ struct FileInfo { FileInfo() {url = KURL(); line = -1; col = -1; encoding = "";}; - FileInfo(const KURL & _url, int _line = -1, int _col = -1, QString _encoding = "") + FileInfo(const KURL & _url, int _line = -1, int _col = -1, TQString _encoding = "") {url = _url; line = _line; col = _col; encoding = _encoding;}; bool operator==(const FileInfo & f) const {return (f.url == url) /*&& (f.line == line) && (f.col ==col)*/;}; @@ -31,7 +31,7 @@ struct FileInfo KURL url; int line; int col; - QString encoding; + TQString encoding; }; -typedef QValueList<FileInfo> FileInfoList; +typedef TQValueList<FileInfo> FileInfoList; diff --git a/parts/filelist/filelist_item.cpp b/parts/filelist/filelist_item.cpp index d528cc2c..07817479 100644 --- a/parts/filelist/filelist_item.cpp +++ b/parts/filelist/filelist_item.cpp @@ -10,8 +10,8 @@ ***************************************************************************/ #include <kiconloader.h> -#include <qfontmetrics.h> -#include <qfileinfo.h> +#include <tqfontmetrics.h> +#include <tqfileinfo.h> #include "filelist_item.h" @@ -20,8 +20,8 @@ FileListItem * FileListItem::s_activeItem = 0; -FileListItem::FileListItem( QListView * parent, KURL const & url, DocumentState state ) - : QListViewItem( parent, url.fileName() ), +FileListItem::FileListItem( TQListView * parent, KURL const & url, DocumentState state ) + : TQListViewItem( parent, url.fileName() ), _url( url ) { @@ -64,19 +64,19 @@ void FileListItem::setState( DocumentState state ) void FileListItem::setHeight( int ) { - QListViewItem::setHeight( KIcon::SizeSmall > listView()->fontMetrics().height() ? KIcon::SizeSmall : listView()->fontMetrics().height() ); + TQListViewItem::setHeight( KIcon::SizeSmall > listView()->fontMetrics().height() ? KIcon::SizeSmall : listView()->fontMetrics().height() ); } -void FileListItem::paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int align ) +void FileListItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ) { - QColorGroup mcg = cg; + TQColorGroup mcg = cg; if ( isActive() ) { - mcg.setColor( QColorGroup::Base, Qt::yellow ); + mcg.setColor( TQColorGroup::Base, Qt::yellow ); } - QListViewItem::paintCell( p, mcg, column, width, align ); + TQListViewItem::paintCell( p, mcg, column, width, align ); } bool FileListItem::isActive( ) @@ -90,10 +90,10 @@ void FileListItem::setActive( FileListItem * item ) s_activeItem = item; } -int FileListItem::compare( QListViewItem * i, int col, bool ascending ) const +int FileListItem::compare( TQListViewItem * i, int col, bool ascending ) const { - QFileInfo info1( key( col, ascending ) ); //this - QFileInfo info2( i->key( col, ascending ) ); //that + TQFileInfo info1( key( col, ascending ) ); //this + TQFileInfo info2( i->key( col, ascending ) ); //that int fileComp = info1.fileName().compare( info2.fileName() ); if ( fileComp != 0 ) return fileComp; diff --git a/parts/filelist/filelist_item.h b/parts/filelist/filelist_item.h index 2b4019b8..7f9f7965 100644 --- a/parts/filelist/filelist_item.h +++ b/parts/filelist/filelist_item.h @@ -13,8 +13,8 @@ #define __FILELIST_ITEM_H__ -#include <qlistview.h> -#include <qpixmap.h> +#include <tqlistview.h> +#include <tqpixmap.h> #include <kurl.h> @@ -23,7 +23,7 @@ class FileListItem : public QListViewItem { public: - FileListItem( QListView * parent, KURL const & url, DocumentState = Clean ); + FileListItem( TQListView * parent, KURL const & url, DocumentState = Clean ); KURL url(); @@ -33,14 +33,14 @@ public: bool isActive(); static void setActive( FileListItem * item ); - virtual int compare( QListViewItem * i, int col, bool ascending ) const; + virtual int compare( TQListViewItem * i, int col, bool ascending ) const; private: - virtual void setHeight( int ); // override of QListViewItem::setHeight() - virtual void paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int align ); // override of QListViewItem::paintCell() + virtual void setHeight( int ); // override of TQListViewItem::setHeight() + virtual void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ); // override of TQListViewItem::paintCell() KURL _url; DocumentState _state; - QPixmap _icon; + TQPixmap _icon; static FileListItem * s_activeItem; diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp index 2ef03968..6f494f93 100644 --- a/parts/filelist/filelist_widget.cpp +++ b/parts/filelist/filelist_widget.cpp @@ -11,8 +11,8 @@ * * ***************************************************************************/ -#include <qheader.h> -#include <qpixmap.h> +#include <tqheader.h> +#include <tqpixmap.h> #include <kparts/part.h> #include <klibloader.h> @@ -34,37 +34,37 @@ * @param part * @return */ -FileListWidget::FileListWidget(ProjectviewPart *part, QWidget *parent) - : KListView(parent), QToolTip( viewport() ), _part( part ) +FileListWidget::FileListWidget(ProjectviewPart *part, TQWidget *parent) + : KListView(parent), TQToolTip( viewport() ), _part( part ) { addColumn( "" ); header()->hide(); setRootIsDecorated( false ); - setResizeMode( QListView::LastColumn ); + setResizeMode( TQListView::LastColumn ); setAllColumnsShowFocus( true ); - setSelectionMode( QListView::Extended ); + setSelectionMode( TQListView::Extended ); -// connect( _part->partController(), SIGNAL( partAdded(KParts::Part*) ), this, SLOT(partAdded(KParts::Part*)) ); -// connect( _part->partController(), SIGNAL( partRemoved(KParts::Part*) ), this, SLOT(partRemoved()) ); - connect( _part->partController(), SIGNAL( partAdded(KParts::Part*) ), this, SLOT(startRefreshTimer()) ); - connect( _part->partController(), SIGNAL( partRemoved(KParts::Part*) ), this, SLOT(startRefreshTimer()) ); - connect( _part->partController(), SIGNAL( activePartChanged(KParts::Part*) ), this, SLOT( activePartChanged(KParts::Part* )) ); +// connect( _part->partController(), TQT_SIGNAL( partAdded(KParts::Part*) ), this, TQT_SLOT(partAdded(KParts::Part*)) ); +// connect( _part->partController(), TQT_SIGNAL( partRemoved(KParts::Part*) ), this, TQT_SLOT(partRemoved()) ); + connect( _part->partController(), TQT_SIGNAL( partAdded(KParts::Part*) ), this, TQT_SLOT(startRefreshTimer()) ); + connect( _part->partController(), TQT_SIGNAL( partRemoved(KParts::Part*) ), this, TQT_SLOT(startRefreshTimer()) ); + connect( _part->partController(), TQT_SIGNAL( activePartChanged(KParts::Part*) ), this, TQT_SLOT( activePartChanged(KParts::Part* )) ); - connect( this, SIGNAL( executed( QListViewItem * ) ), this, SLOT( itemClicked( QListViewItem * ) ) ); - connect( this, SIGNAL( returnPressed( QListViewItem * ) ), this, SLOT( itemClicked( QListViewItem * ) ) ); + connect( this, TQT_SIGNAL( executed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); - connect( this, SIGNAL( contextMenuRequested ( QListViewItem *, const QPoint & , int ) ), - this, SLOT( popupMenu(QListViewItem *, const QPoint & , int ) ) ); + connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), + this, TQT_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) ); - connect( _part->partController(), SIGNAL(documentChangedState(const KURL &, DocumentState)), - this, SLOT(documentChangedState(const KURL&, DocumentState )) ); + connect( _part->partController(), TQT_SIGNAL(documentChangedState(const KURL &, DocumentState)), + this, TQT_SLOT(documentChangedState(const KURL&, DocumentState )) ); - connect( _part->partController(), SIGNAL(partURLChanged(KParts::ReadOnlyPart * )), this, SLOT(refreshFileList()) ); + connect( _part->partController(), TQT_SIGNAL(partURLChanged(KParts::ReadOnlyPart * )), this, TQT_SLOT(refreshFileList()) ); setItemMargin(10); - connect( &m_refreshTimer, SIGNAL(timeout()), this, SLOT(refreshFileList()) ); + connect( &m_refreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(refreshFileList()) ); startRefreshTimer(); } @@ -78,17 +78,17 @@ void FileListWidget::startRefreshTimer( ) m_refreshTimer.start( 100, true ); } -void FileListWidget::maybeTip( QPoint const & p ) +void FileListWidget::maybeTip( TQPoint const & p ) { FileListItem * item = static_cast<FileListItem*>( itemAt( p ) ); - QRect r = itemRect( item ); + TQRect r = itemRect( item ); if ( item && r.isValid() ) { - const QPixmap * pixmap = item->pixmap(0); + const TQPixmap * pixmap = item->pixmap(0); if ( pixmap && ( p.x() <= pixmap->width() ) ) { - QString message; + TQString message; switch( item->state() ) { case Modified: @@ -129,13 +129,13 @@ FileListItem * FileListWidget::itemForURL( KURL const & url ) void FileListWidget::refreshFileList( ) { - QStringList selections = storeSelections(); + TQStringList selections = storeSelections(); int scrollbarPos = verticalScrollBar()->value(); KListView::clear(); KURL::List list = _part->partController()->openURLs(); - QValueListIterator<KURL> it = list.begin(); + TQValueListIterator<KURL> it = list.begin(); while ( it != list.end() ) { FileListItem * item = new FileListItem( this, *it ); @@ -184,7 +184,7 @@ void FileListWidget::partRemoved() } */ -void FileListWidget::itemClicked( QListViewItem * item ) +void FileListWidget::itemClicked( TQListViewItem * item ) { if ( !item ) return; @@ -220,15 +220,15 @@ void FileListWidget::documentChangedState( const KURL & url, DocumentState state } } -void FileListWidget::popupMenu( QListViewItem * item, const QPoint & p, int ) +void FileListWidget::popupMenu( TQListViewItem * item, const TQPoint & p, int ) { if ( item ) { KPopupMenu popup; popup.insertTitle( i18n("File List") ); - popup.insertItem( i18n("Close Selected"), this, SLOT(closeSelectedFiles()) ); - popup.insertItem( i18n("Save Selected"), this, SLOT(saveSelectedFiles()) ); - popup.insertItem( i18n("Reload Selected"), this, SLOT(reloadSelectedFiles()) ); + popup.insertItem( i18n("Close Selected"), this, TQT_SLOT(closeSelectedFiles()) ); + popup.insertItem( i18n("Save Selected"), this, TQT_SLOT(saveSelectedFiles()) ); + popup.insertItem( i18n("Reload Selected"), this, TQT_SLOT(reloadSelectedFiles()) ); FileContext context( getSelectedURLs() ); _part->core()->fillContextMenu( &popup, &context ); @@ -267,10 +267,10 @@ void FileListWidget::reloadSelectedFiles( ) _part->partController()->revertFiles( getSelectedURLs() ); } -QStringList FileListWidget::storeSelections() +TQStringList FileListWidget::storeSelections() { - QStringList list; - QListViewItem * item = firstChild(); + TQStringList list; + TQListViewItem * item = firstChild(); while ( item ) { if ( item->isSelected() ) @@ -282,9 +282,9 @@ QStringList FileListWidget::storeSelections() return list; } -void FileListWidget::restoreSelections(const QStringList & list) +void FileListWidget::restoreSelections(const TQStringList & list) { - QListViewItem * item = firstChild(); + TQListViewItem * item = firstChild(); while ( item ) { if ( list.contains( item->text(0) ) ) diff --git a/parts/filelist/filelist_widget.h b/parts/filelist/filelist_widget.h index 5895103b..d30aa6f6 100644 --- a/parts/filelist/filelist_widget.h +++ b/parts/filelist/filelist_widget.h @@ -19,9 +19,9 @@ #include <kurl.h> #include <kdevpartcontroller.h> // for DocumentState -#include <qstring.h> -#include <qtooltip.h> -#include <qtimer.h> +#include <tqstring.h> +#include <tqtooltip.h> +#include <tqtimer.h> #include "projectviewpart.h" @@ -36,32 +36,32 @@ class FileListWidget : public KListView, public QToolTip public: - FileListWidget(ProjectviewPart *part, QWidget *parent=0); + FileListWidget(ProjectviewPart *part, TQWidget *parent=0); ~FileListWidget(); protected: - void maybeTip( QPoint const & ); + void maybeTip( TQPoint const & ); private slots: // void partAdded(KParts::Part*); // void partRemoved(); void activePartChanged(KParts::Part*); - void itemClicked( QListViewItem * ); - void popupMenu( QListViewItem * , const QPoint & , int ); + void itemClicked( TQListViewItem * ); + void popupMenu( TQListViewItem * , const TQPoint & , int ); void closeSelectedFiles(); void saveSelectedFiles(); void reloadSelectedFiles(); void documentChangedState( const KURL &, DocumentState ); void refreshFileList(); void startRefreshTimer(); - QStringList storeSelections(); - void restoreSelections( const QStringList & list ); + TQStringList storeSelections(); + void restoreSelections( const TQStringList & list ); private: KURL::List getSelectedURLs(); FileListItem * itemForURL( KURL const & url ); - QTimer m_refreshTimer; + TQTimer m_refreshTimer; ProjectviewPart * _part; }; diff --git a/parts/filelist/projectviewconfig.cpp b/parts/filelist/projectviewconfig.cpp index 2c1ca9b8..0f138e1a 100644 --- a/parts/filelist/projectviewconfig.cpp +++ b/parts/filelist/projectviewconfig.cpp @@ -19,13 +19,13 @@ ***************************************************************************/ #include "projectviewconfig.h" -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <kconfig.h> #include <kapplication.h> -ProjectviewConfig::ProjectviewConfig(QWidget *parent, const char *name) +ProjectviewConfig::ProjectviewConfig(TQWidget *parent, const char *name) : ProjectviewConfigBase(parent, name) { KConfig * config = kapp->config(); diff --git a/parts/filelist/projectviewconfig.h b/parts/filelist/projectviewconfig.h index 447e645b..44195ab0 100644 --- a/parts/filelist/projectviewconfig.h +++ b/parts/filelist/projectviewconfig.h @@ -28,7 +28,7 @@ class ProjectviewConfig: public ProjectviewConfigBase { Q_OBJECT public: - ProjectviewConfig(QWidget *parent = 0, const char *name = 0); + ProjectviewConfig(TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp index 9313e7ef..91b46b53 100644 --- a/parts/filelist/projectviewpart.cpp +++ b/parts/filelist/projectviewpart.cpp @@ -24,17 +24,17 @@ #include "filelist_widget.h" #include "toolbarguibuilder.h" -#include <qtimer.h> -#include <qpopupmenu.h> -#include <qwhatsthis.h> -#include <qvaluelist.h> -#include <qmap.h> -#include <qdir.h> -#include <qdom.h> -#include <qvbox.h> -#include <qhbox.h> -#include <qpoint.h> -#include <qlayout.h> +#include <tqtimer.h> +#include <tqpopupmenu.h> +#include <tqwhatsthis.h> +#include <tqvaluelist.h> +#include <tqmap.h> +#include <tqdir.h> +#include <tqdom.h> +#include <tqvbox.h> +#include <tqhbox.h> +#include <tqpoint.h> +#include <tqlayout.h> #include <kmainwindow.h> #include <kinputdialog.h> @@ -68,7 +68,7 @@ K_EXPORT_COMPONENT_FACTORY(libkdevfilelist, projectviewFactory(data)) #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -ProjectviewPart::ProjectviewPart(QObject *parent, const char *name, const QStringList &/*args*/) +ProjectviewPart::ProjectviewPart(TQObject *parent, const char *name, const TQStringList &/*args*/) : KDevPlugin(&data, parent, name ? name : "FileListPart") { setInstance(projectviewFactory::instance()); @@ -79,26 +79,26 @@ ProjectviewPart::ProjectviewPart(QObject *parent, const char *name, const QStrin m_configProxy->createGlobalConfigPage(i18n("File List"), GLOBALDOC_OPTIONS, info()->icon()); m_configProxy->createProjectConfigPage(i18n("File List"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int)), - this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int))); + connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int)), + this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - connect(core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *))); + connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect(core(), SIGNAL(projectOpened()), this, SLOT(projectOpened())); - connect(core(), SIGNAL(projectClosed()), this, SLOT(projectClosed())); + connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); + connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); KConfig * config = kapp->config(); config->setGroup("File List Plugin"); if (config->readBoolEntry("ToolbarInToolview", true)) { - m_toolbarWidget = new QVBox(0, "toolbarContainer"); + m_toolbarWidget = new TQVBox(0, "toolbarContainer"); m_toolbarWidget->setHidden(true); m_guibuilder = new ToolbarGUIBuilder(m_toolbarWidget, mainWindow()->main()); setClientBuilder(m_guibuilder); } m_restored = false; - QTimer::singleShot(0, this, SLOT(init())); + TQTimer::singleShot(0, this, TQT_SLOT(init())); } ProjectviewPart::~ProjectviewPart() @@ -111,7 +111,7 @@ ProjectviewPart::~ProjectviewPart() } } -void ProjectviewPart::restorePartialProjectSession(const QDomElement * el) +void ProjectviewPart::restorePartialProjectSession(const TQDomElement * el) { m_projectViews.clear(); // remove the global views m_restored = true; @@ -120,7 +120,7 @@ void ProjectviewPart::restorePartialProjectSession(const QDomElement * el) return; } // get the base of the project - QString urlStr = project()->projectDirectory(); + TQString urlStr = project()->projectDirectory(); if (KURL::isRelativeURL(urlStr)) { m_projectBase.setProtocol("file"); @@ -132,28 +132,28 @@ void ProjectviewPart::restorePartialProjectSession(const QDomElement * el) m_projectBase.adjustPath(+1); // just in case // read all the views - QDomNodeList domList = el->elementsByTagName("projectview"); + TQDomNodeList domList = el->elementsByTagName("projectview"); uint len = domList.length(); for (uint i = 0; i < len; ++i) { - const QDomElement viewEl = domList.item(i).toElement(); + const TQDomElement viewEl = domList.item(i).toElement(); if (viewEl.isNull()) { continue; } FileInfoList urlList; - QDomNodeList fileList = viewEl.elementsByTagName("file"); + TQDomNodeList fileList = viewEl.elementsByTagName("file"); uint len2 = fileList.length(); for (uint i2 = 0; i2 < len2; ++i2) { - const QDomElement fileEl = fileList.item(i2).toElement(); + const TQDomElement fileEl = fileList.item(i2).toElement(); if (!fileEl.isNull()) { bool ok; int line = -1; - QString attr = fileEl.attribute("line"); + TQString attr = fileEl.attribute("line"); if (! attr.isNull()) { line = attr.toInt(&ok); @@ -168,13 +168,13 @@ void ProjectviewPart::restorePartialProjectSession(const QDomElement * el) if (!ok) col = -1; } - QString encoding = ""; + TQString encoding = ""; attr = fileEl.attribute("encoding"); if (! attr.isNull()) { encoding = attr; } - QString urlStr = fileEl.attribute("url"); + TQString urlStr = fileEl.attribute("url"); if (KURL::isRelativeURL(urlStr)) { KURL url = m_projectBase; @@ -201,13 +201,13 @@ void ProjectviewPart::restorePartialProjectSession(const QDomElement * el) } } -void ProjectviewPart::savePartialProjectSession(QDomElement * el) +void ProjectviewPart::savePartialProjectSession(TQDomElement * el) { if (!el || m_projectViews.empty()) { return; } - QDomDocument domDoc = el->ownerDocument(); + TQDomDocument domDoc = el->ownerDocument(); if (domDoc.isNull()) { return; @@ -217,12 +217,12 @@ void ProjectviewPart::savePartialProjectSession(QDomElement * el) for (it = m_projectViews.constBegin(); it != m_projectViews.constEnd(); ++it) { // we create the view even if there is no file inside, might be wanted by the user - QDomElement viewEl = domDoc.createElement("projectview"); + TQDomElement viewEl = domDoc.createElement("projectview"); viewEl.setAttribute("name", it.key()); el->appendChild(viewEl); for (FileInfoList::ConstIterator it2 = it.data().constBegin(); it2 != it.data().constEnd(); ++it2) { - QDomElement urlEl = domDoc.createElement("file"); + TQDomElement urlEl = domDoc.createElement("file"); if (m_projectBase.isParentOf((*it2).url)) urlEl.setAttribute("url", KURL::relativeURL(m_projectBase, (*it2).url)); @@ -235,7 +235,7 @@ void ProjectviewPart::savePartialProjectSession(QDomElement * el) } } // write the default view - QDomElement defaultEl = domDoc.createElement("defaultview"); + TQDomElement defaultEl = domDoc.createElement("defaultview"); defaultEl.setAttribute("name", m_defaultProjectView); el->appendChild(defaultEl); } @@ -246,24 +246,24 @@ void ProjectviewPart::init() // delayed initialization stuff goes here // create the toolview - m_widget = new QWidget(0, "filelist widget"); + m_widget = new TQWidget(0, "filelist widget"); m_widget->setIcon( SmallIcon(info()->icon()) ); m_widget->setCaption(i18n("File List")); - QBoxLayout * l = new QVBoxLayout(m_widget); + TQBoxLayout * l = new TQVBoxLayout(m_widget); // create the toolbar if needed if (m_guibuilder) { - m_toolbarWidget->reparent(m_widget, QPoint(0, 0), true); + m_toolbarWidget->reparent(m_widget, TQPoint(0, 0), true); l->addWidget(m_toolbarWidget); - QWhatsThis::add(m_toolbarWidget, i18n("<b>View Session Toolbar</b><p>This allows to create and work with view sessions. A view session is a set of open documents.</p>")); + TQWhatsThis::add(m_toolbarWidget, i18n("<b>View Session Toolbar</b><p>This allows to create and work with view sessions. A view session is a set of open documents.</p>")); } // create the listview - QWidget * fileListWidget = new FileListWidget(this, m_widget); + TQWidget * fileListWidget = new FileListWidget(this, m_widget); fileListWidget->setCaption(i18n("File List")); - QWhatsThis::add(fileListWidget, i18n("<b>File List</b><p>This is the list of opened files.</p>")); + TQWhatsThis::add(fileListWidget, i18n("<b>File List</b><p>This is the list of opened files.</p>")); l->addWidget(fileListWidget); m_widget->setFocusProxy(fileListWidget); @@ -277,28 +277,28 @@ void ProjectviewPart::setupActions() { m_openPrjViewAction = new KSelectAction(i18n("Open Session..."), 0, actionCollection(), "viewsession_open"); - connect(m_openPrjViewAction, SIGNAL(activated(const QString &)), this, SLOT(slotOpenProjectView(const QString &))); + connect(m_openPrjViewAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotOpenProjectView(const TQString &))); m_openPrjViewAction->setToolTip(i18n("Open Session")); - m_savePrjViewAction = new KAction(i18n("Save Session"), "filesave", 0, this, SLOT(slotSaveProjectView()), actionCollection(), "viewsession_save"); + m_savePrjViewAction = new KAction(i18n("Save Session"), "filesave", 0, this, TQT_SLOT(slotSaveProjectView()), actionCollection(), "viewsession_save"); - m_newPrjViewAction = new KAction(i18n("New Session..."), "filenew", 0, this, SLOT(slotSaveAsProjectView()), actionCollection(), "viewsession_new"); + m_newPrjViewAction = new KAction(i18n("New Session..."), "filenew", 0, this, TQT_SLOT(slotSaveAsProjectView()), actionCollection(), "viewsession_new"); m_deletePrjViewAction = new KSelectAction(i18n("Delete Session"), "editdelete", 0, actionCollection(), "viewsession_delete"); - connect(m_deletePrjViewAction, SIGNAL(activated(const QString &)), this, SLOT(slotDeleteProjectView(const QString &))); + connect(m_deletePrjViewAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotDeleteProjectView(const TQString &))); m_deletePrjViewAction->setToolTip(i18n("Delete Session")); - m_deleteCurrentPrjViewAction = new KAction(i18n("Delete Session"), "editdelete", 0, this, SLOT(slotDeleteProjectViewCurent()), actionCollection(), "viewsession_deletecurrent"); + m_deleteCurrentPrjViewAction = new KAction(i18n("Delete Session"), "editdelete", 0, this, TQT_SLOT(slotDeleteProjectViewCurent()), actionCollection(), "viewsession_deletecurrent"); m_deleteCurrentPrjViewAction->setToolTip(i18n("Delete Session")); adjustViewActions(); } -void ProjectviewPart::insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo) +void ProjectviewPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo) { // create configuraton dialogs here switch (pageNo) @@ -306,19 +306,19 @@ void ProjectviewPart::insertConfigWidget(const KDialogBase *dlg, QWidget *page, case PROJECTDOC_OPTIONS: { ProjectviewProjectConfig *w = new ProjectviewProjectConfig(this, page, "project config"); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); break; } case GLOBALDOC_OPTIONS: { ProjectviewConfig *w = new ProjectviewConfig(page, "global config"); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); break; } } } -void ProjectviewPart::contextMenu(QPopupMenu */*popup*/, const Context */*context*/) +void ProjectviewPart::contextMenu(TQPopupMenu */*popup*/, const Context */*context*/) { // put actions into the context menu here // if (context->hasType(Context::EditorContext)) @@ -332,7 +332,7 @@ void ProjectviewPart::contextMenu(QPopupMenu */*popup*/, const Context */*contex // // or create menu items on the fly // // int id = -1; // // id = popup->insertItem(i18n("Do Something Here"), -// // this, SLOT(doSomething())); +// // this, TQT_SLOT(doSomething())); // // popup->setWhatsThis(id, i18n("<b>Do something here</b><p>Describe here what does this action do." // } // else if (context->hasType(Context::FileContext)) @@ -380,7 +380,7 @@ void ProjectviewPart::projectClosed() readConfig(); // read the global project views } -void ProjectviewPart::slotOpenProjectView(const QString &view) +void ProjectviewPart::slotOpenProjectView(const TQString &view) { KConfig * config = kapp->config(); config->setGroup("File List Plugin"); @@ -435,7 +435,7 @@ void ProjectviewPart::slotSaveProjectView() void ProjectviewPart::adjustViewActions() { - QStringList viewList = getViewList(); + TQStringList viewList = getViewList(); m_openPrjViewAction->clear(); m_openPrjViewAction->setItems(viewList); @@ -462,7 +462,7 @@ void ProjectviewPart::slotDeleteProjectViewCurent() slotDeleteProjectView(m_currentProjectView); } -void ProjectviewPart::slotDeleteProjectView(const QString& view) +void ProjectviewPart::slotDeleteProjectView(const TQString& view) { m_projectViews.remove(view); @@ -484,14 +484,14 @@ void ProjectviewPart::slotSaveAsProjectView(bool askForName) if (askForName) { bool ok; - QString newProjectView = KInputDialog::getText(i18n("Save View Session As"), i18n("Enter the name of the session:"), "", &ok, mainWindow()->main()); + TQString newProjectView = KInputDialog::getText(i18n("Save View Session As"), i18n("Enter the name of the session:"), "", &ok, mainWindow()->main()); if (!ok) { return; } newProjectView = newProjectView.remove("="); // we use this string in config files and = would confuse it if (m_projectViews.contains(newProjectView) > 0 && - KMessageBox::warningContinueCancel(mainWindow()->main(), i18n("<qt>A view session named <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").arg(newProjectView), QString::null, i18n("Overwrite")) != KMessageBox::Continue) + KMessageBox::warningContinueCancel(mainWindow()->main(), i18n("<qt>A view session named <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").arg(newProjectView), TQString::null, i18n("Overwrite")) != KMessageBox::Continue) { return; } @@ -509,10 +509,10 @@ void ProjectviewPart::slotSaveAsProjectView(bool askForName) KTextEditor::ViewCursorInterface* cursorIf = dynamic_cast<KTextEditor::ViewCursorInterface*>(ro_part->widget()); if (cursorIf) { - QString encoding; + TQString encoding; if ( KTextEditor::EncodingInterface * ei = dynamic_cast<KTextEditor::EncodingInterface*>( ro_part ) ) { - QString temp = ei->encoding(); + TQString temp = ei->encoding(); if ( !temp.isNull() ) { encoding = temp; @@ -544,7 +544,7 @@ void ProjectviewPart::writeConfig() for (it = m_projectViews.constBegin(); it != m_projectViews.constEnd(); ++it) { // we create the view even if there is no file inside, might be wanted by the user - QStringList urls; + TQStringList urls; for (FileInfoList::ConstIterator it2 = it.data().constBegin(); it2 != it.data().constEnd(); ++it2) { if ((*it2).encoding.isEmpty()) @@ -560,18 +560,18 @@ void ProjectviewPart::writeConfig() void ProjectviewPart::readConfig() { KConfig * config = kapp->config(); - QMap<QString, QString> entries = config->entryMap("ProjectViews"); + TQMap<TQString, TQString> entries = config->entryMap("ProjectViews"); m_projectViews.clear(); - QMap<QString, QString>::ConstIterator it; + TQMap<TQString, TQString>::ConstIterator it; for (it = entries.constBegin(); it != entries.constEnd(); ++it) { FileInfoList urlList; - QStringList urls = QStringList::split(",", it.data()); - for (QStringList::Iterator it2 = urls.begin(); it2 != urls.end(); ++it2 ) + TQStringList urls = TQStringList::split(",", it.data()); + for (TQStringList::Iterator it2 = urls.begin(); it2 != urls.end(); ++it2 ) { // search the encoding. The entry can be like: fileURL;encoding - QStringList file = QStringList::split(";", *it2); + TQStringList file = TQStringList::split(";", *it2); if (file.count() == 1) urlList.append(FileInfo(KURL::fromPathOrURL(*it2))); else diff --git a/parts/filelist/projectviewpart.h b/parts/filelist/projectviewpart.h index dd928f8b..741c4534 100644 --- a/parts/filelist/projectviewpart.h +++ b/parts/filelist/projectviewpart.h @@ -23,9 +23,9 @@ #include "fileinfo.h" -#include <qvaluelist.h> -#include <qmap.h> -#include <qguardedptr.h> +#include <tqvaluelist.h> +#include <tqmap.h> +#include <tqguardedptr.h> #include <kdevplugin.h> #include <kurl.h> @@ -58,40 +58,40 @@ class ProjectviewPart: public KDevPlugin Q_OBJECT public: - typedef QMap<QString, FileInfoList> ViewMap; -// typedef QMap<KURL, FileInfo> FileInfoMap; + typedef TQMap<TQString, FileInfoList> ViewMap; +// typedef TQMap<KURL, FileInfo> FileInfoMap; - ProjectviewPart(QObject *parent, const char *name, const QStringList &args); + ProjectviewPart(TQObject *parent, const char *name, const TQStringList &args); ~ProjectviewPart(); // reimplemented from KDevPlugin - void restorePartialProjectSession(const QDomElement * el); - void savePartialProjectSession(QDomElement * el); + void restorePartialProjectSession(const TQDomElement * el); + void savePartialProjectSession(TQDomElement * el); /** * * @return the current defaut view */ - inline QString getDefaultView() const {return m_defaultProjectView;}; + inline TQString getDefaultView() const {return m_defaultProjectView;}; /** * * @param view new default view */ - inline void setDefaultView(const QString& view) {m_defaultProjectView = view;}; + inline void setDefaultView(const TQString& view) {m_defaultProjectView = view;}; /** * get all current views - * @return QStringList of defined views + * @return TQStringList of defined views */ - inline QStringList getViewList() const {return m_projectViews.keys();}; + inline TQStringList getViewList() const {return m_projectViews.keys();}; private slots: void init(); - void insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo); - void contextMenu(QPopupMenu *popup, const Context *context); + void insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo); + void contextMenu(TQPopupMenu *popup, const Context *context); void projectOpened(); void projectClosed(); @@ -99,7 +99,7 @@ private slots: * * @param view name of the project view */ - void slotDeleteProjectView(const QString &view); + void slotDeleteProjectView(const TQString &view); /** * Deletes the current project view @@ -121,7 +121,7 @@ private slots: * * @param view name of the project view */ - void slotOpenProjectView(const QString &view); + void slotOpenProjectView(const TQString &view); private: /** @@ -152,15 +152,15 @@ private: KSelectAction *m_openPrjViewAction; KSelectAction *m_deletePrjViewAction; - QString m_currentProjectView; - QString m_defaultProjectView; // load this after project loaded + TQString m_currentProjectView; + TQString m_defaultProjectView; // load this after project loaded KURL m_projectBase; // project base folder ConfigWidgetProxy *m_configProxy; - QGuardedPtr<QWidget> m_widget; - QGuardedPtr<ToolbarGUIBuilder> m_guibuilder; - QWidget * m_toolbarWidget; + TQGuardedPtr<TQWidget> m_widget; + TQGuardedPtr<ToolbarGUIBuilder> m_guibuilder; + TQWidget * m_toolbarWidget; bool m_restored; }; diff --git a/parts/filelist/projectviewprojectconfig.cpp b/parts/filelist/projectviewprojectconfig.cpp index 5bcd2427..b411dbbd 100644 --- a/parts/filelist/projectviewprojectconfig.cpp +++ b/parts/filelist/projectviewprojectconfig.cpp @@ -24,7 +24,7 @@ #include "projectviewpart.h" -ProjectviewProjectConfig::ProjectviewProjectConfig(ProjectviewPart *part, QWidget *parent, const char *name) +ProjectviewProjectConfig::ProjectviewProjectConfig(ProjectviewPart *part, TQWidget *parent, const char *name) : ProjectviewProjectConfigBase(parent, name), m_part(part) { kComboDefault->clear(); diff --git a/parts/filelist/projectviewprojectconfig.h b/parts/filelist/projectviewprojectconfig.h index 848f4673..0c36db2f 100644 --- a/parts/filelist/projectviewprojectconfig.h +++ b/parts/filelist/projectviewprojectconfig.h @@ -29,7 +29,7 @@ class ProjectviewProjectConfig: public ProjectviewProjectConfigBase { Q_OBJECT public: - ProjectviewProjectConfig(ProjectviewPart *part, QWidget *parent = 0, const char *name = 0); + ProjectviewProjectConfig(ProjectviewPart *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/parts/filelist/toolbarguibuilder.cpp b/parts/filelist/toolbarguibuilder.cpp index c48e7496..b4e1a993 100644 --- a/parts/filelist/toolbarguibuilder.cpp +++ b/parts/filelist/toolbarguibuilder.cpp @@ -22,7 +22,7 @@ #include <ktoolbar.h> -ToolbarGUIBuilder::ToolbarGUIBuilder(QWidget *parent, QWidget *widget) +ToolbarGUIBuilder::ToolbarGUIBuilder(TQWidget *parent, TQWidget *widget) : KXMLGUIBuilder(widget), KToolBar(parent, "ToolbarGUIbuilder"), m_parent(parent) { // setHidden(true); @@ -34,11 +34,11 @@ ToolbarGUIBuilder::~ToolbarGUIBuilder() { } -QWidget * ToolbarGUIBuilder::createContainer(QWidget *parent, int index, const QDomElement &element, int &id) +TQWidget * ToolbarGUIBuilder::createContainer(TQWidget *parent, int index, const TQDomElement &element, int &id) { if (element.tagName().lower() == "toolbar") { - reparent(m_parent, QPoint(0, 0), true); + reparent(m_parent, TQPoint(0, 0), true); return this; } else { @@ -46,12 +46,12 @@ QWidget * ToolbarGUIBuilder::createContainer(QWidget *parent, int index, const Q } } -void ToolbarGUIBuilder::removeContainer(QWidget *container, QWidget *parent, QDomElement &element, int id) +void ToolbarGUIBuilder::removeContainer(TQWidget *container, TQWidget *parent, TQDomElement &element, int id) { if (container == this) { // i need to reparent to prevent a crash - reparent(0, QPoint(0, 0)); + reparent(0, TQPoint(0, 0)); } else KXMLGUIBuilder::removeContainer(container, parent, element, id); diff --git a/parts/filelist/toolbarguibuilder.h b/parts/filelist/toolbarguibuilder.h index 183389dc..ec02c371 100644 --- a/parts/filelist/toolbarguibuilder.h +++ b/parts/filelist/toolbarguibuilder.h @@ -34,23 +34,23 @@ class ToolbarGUIBuilder : public KXMLGUIBuilder, public KToolBar { public: - ToolbarGUIBuilder(QWidget *parent, QWidget *widget); + ToolbarGUIBuilder(TQWidget *parent, TQWidget *widget); virtual ~ToolbarGUIBuilder(); /** * Called when a new XML gui client is added to the gui factory. */ - virtual QWidget *createContainer(QWidget *parent, int index, const QDomElement &element, int &id); + virtual TQWidget *createContainer(TQWidget *parent, int index, const TQDomElement &element, int &id); /** * Called when a XML gui client is removed the gui factory. * Reimplemented from KXMLGUIBuilder in order to remove our custom toolbar. */ - virtual void removeContainer(QWidget *container, QWidget *parent, QDomElement &element, int id); + virtual void removeContainer(TQWidget *container, TQWidget *parent, TQDomElement &element, int id); private: - QWidget * m_parent; + TQWidget * m_parent; }; diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp index 20a3d27a..4e30fe50 100644 --- a/parts/fileselector/fileselector_part.cpp +++ b/parts/fileselector/fileselector_part.cpp @@ -1,10 +1,10 @@ #include "fileselector_part.h" -#include <qwhatsthis.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qslider.h> -#include <qvbox.h> +#include <tqwhatsthis.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqslider.h> +#include <tqvbox.h> #include <kiconloader.h> #include <klocale.h> @@ -34,27 +34,27 @@ typedef KDevGenericFactory<FileSelectorPart> FileSelectorFactory; static const KDevPluginInfo data("kdevfileselector"); K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( data ) ) -FileSelectorPart::FileSelectorPart(QObject *parent, const char *name, const QStringList &) +FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQStringList &) : KDevPlugin(&data, parent, name ? name : "FileSelectorPart") { setInstance(FileSelectorFactory::instance()); m_filetree = new KDevFileSelector( this, mainWindow(), partController(), 0, "fileselectorwidget" ); - connect( m_filetree->dirOperator(), SIGNAL(fileSelected(const KFileItem*)), - this, SLOT(fileSelected(const KFileItem*))); - connect( core(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) ); + connect( m_filetree->dirOperator(), TQT_SIGNAL(fileSelected(const KFileItem*)), + this, TQT_SLOT(fileSelected(const KFileItem*))); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( core(), SIGNAL(configWidget(KDialogBase*)), this, SLOT(slotConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(slotConfigWidget(KDialogBase*)) ); m_filetree->setCaption( i18n("File Selector") ); m_filetree->setIcon( SmallIcon( info()->icon() ) ); mainWindow()->embedSelectView( m_filetree, i18n("File Selector"), i18n("File selector") ); - QWhatsThis::add(m_filetree, i18n("<b>File selector</b><p>This file selector lists directory contents and provides some file management functions.")); + TQWhatsThis::add(m_filetree, i18n("<b>File selector</b><p>This file selector lists directory contents and provides some file management functions.")); m_filetree->readConfig( instance()->config(), "fileselector" ); - m_newFileAction = new KAction(i18n("New File..."), CTRL+ALT+SHIFT+Key_N, this, SLOT(newFile()), this); + m_newFileAction = new KAction(i18n("New File..."), CTRL+ALT+SHIFT+Key_N, this, TQT_SLOT(newFile()), this); } FileSelectorPart::~FileSelectorPart() @@ -82,9 +82,9 @@ void FileSelectorPart::slotProjectOpened() void FileSelectorPart::slotConfigWidget( KDialogBase * dlg ) { - QVBox* vbox = dlg->addVBoxPage( i18n("File Selector"), i18n("File Selector"), BarIcon( info()->icon(), KIcon::SizeMedium) ); + TQVBox* vbox = dlg->addVBoxPage( i18n("File Selector"), i18n("File Selector"), BarIcon( info()->icon(), KIcon::SizeMedium) ); KFSConfigPage* page = new KFSConfigPage( vbox, 0, m_filetree ); - connect( dlg, SIGNAL( okClicked( ) ), page, SLOT( apply( ) ) ); + connect( dlg, TQT_SIGNAL( okClicked( ) ), page, TQT_SLOT( apply( ) ) ); // ### implement reload } diff --git a/parts/fileselector/fileselector_part.h b/parts/fileselector/fileselector_part.h index d12befb2..ae8012ea 100644 --- a/parts/fileselector/fileselector_part.h +++ b/parts/fileselector/fileselector_part.h @@ -6,7 +6,7 @@ #include <kdialogbase.h> #include <kfileitem.h> -#include <qguardedptr.h> +#include <tqguardedptr.h> class KDevFileSelector; class KDialogBase; @@ -15,7 +15,7 @@ class FileSelectorPart : public KDevPlugin { Q_OBJECT public: - FileSelectorPart(QObject *parent, const char *name, const QStringList &); + FileSelectorPart(TQObject *parent, const char *name, const TQStringList &); virtual ~FileSelectorPart(); KAction *newFileAction() const { return m_newFileAction; } @@ -32,7 +32,7 @@ private slots: void slotConfigWidget( KDialogBase * ); private: - QGuardedPtr<KDevFileSelector> m_filetree; + TQGuardedPtr<KDevFileSelector> m_filetree; KAction *m_newFileAction; }; diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index 8996a0d1..804270e1 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -30,23 +30,23 @@ #include <kdevmainwindow.h> #include <kdevpartcontroller.h> -#include <qlayout.h> -#include <qtoolbutton.h> -#include <qhbox.h> -#include <qvbox.h> -#include <qlabel.h> -#include <qstrlist.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qapplication.h> -#include <qlistbox.h> -#include <qscrollbar.h> -#include <qspinbox.h> -#include <qgroupbox.h> -#include <qcheckbox.h> -#include <qregexp.h> -#include <qdockarea.h> -#include <qtimer.h> +#include <tqlayout.h> +#include <tqtoolbutton.h> +#include <tqhbox.h> +#include <tqvbox.h> +#include <tqlabel.h> +#include <tqstrlist.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqapplication.h> +#include <tqlistbox.h> +#include <tqscrollbar.h> +#include <tqspinbox.h> +#include <tqgroupbox.h> +#include <tqcheckbox.h> +#include <tqregexp.h> +#include <tqdockarea.h> +#include <tqtimer.h> #include <ktexteditor/document.h> @@ -62,7 +62,7 @@ #include <kaction.h> #include <kmessagebox.h> #include <ktoolbarbutton.h> -#include <qtoolbar.h> +#include <tqtoolbar.h> #include <kpopupmenu.h> #include <kdialog.h> #include <kio/netaccess.h> @@ -76,7 +76,7 @@ static void silenceQToolBar(QtMsgType, const char *) {} -KDevFileSelectorToolBar::KDevFileSelectorToolBar(QWidget *parent) +KDevFileSelectorToolBar::KDevFileSelectorToolBar(TQWidget *parent) : KToolBar( parent, "KDev FileSelector Toolbar", true ) { setMinimumWidth(10); @@ -91,8 +91,8 @@ void KDevFileSelectorToolBar::setMovingEnabled( bool) } -KDevFileSelectorToolBarParent::KDevFileSelectorToolBarParent(QWidget *parent) - :QFrame(parent),m_tb(0) +KDevFileSelectorToolBarParent::KDevFileSelectorToolBarParent(TQWidget *parent) + :TQFrame(parent),m_tb(0) {} KDevFileSelectorToolBarParent::~KDevFileSelectorToolBarParent() {} @@ -101,7 +101,7 @@ void KDevFileSelectorToolBarParent::setToolBar(KDevFileSelectorToolBar *tb) m_tb=tb; } -void KDevFileSelectorToolBarParent::resizeEvent ( QResizeEvent * ) +void KDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * ) { if (m_tb) { @@ -115,15 +115,15 @@ void KDevFileSelectorToolBarParent::resizeEvent ( QResizeEvent * ) KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow, KDevPartController *partController, - QWidget * parent, const char * name ) - : QWidget(parent, name), + TQWidget * parent, const char * name ) + : TQWidget(parent, name), m_part(part), mainwin(mainWindow), partController(partController) { mActionCollection = new KActionCollection( this ); - QVBoxLayout* lo = new QVBoxLayout(this); + TQVBoxLayout* lo = new TQVBoxLayout(this); QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar ); @@ -136,7 +136,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main qInstallMsgHandler( oldHandler ); 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(KURLCompletion::DirCompletion); cmbPath->setCompletionObject( cmpl ); lo->addWidget(cmbPath); @@ -165,65 +165,65 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main bookmarkHandler = new KBookmarkHandler( this, acmBookmarks->popupMenu() ); - QHBox* filterBox = new QHBox(this); + TQHBox* filterBox = new TQHBox(this); - btnFilter = new QToolButton( filterBox ); + btnFilter = new TQToolButton( filterBox ); btnFilter->setIconSet( SmallIconSet("filter" ) ); btnFilter->setToggleButton( true ); filter = new KHistoryCombo( true, filterBox, "filter"); - filter->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed )); + filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(filter, 2); - connect( btnFilter, SIGNAL( clicked() ), this, SLOT( btnFilterClick() ) ); + connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) ); lo->addWidget(filterBox); - connect( filter, SIGNAL( activated(const QString&) ), - SLOT( slotFilterChange(const QString&) ) ); + connect( filter, TQT_SIGNAL( activated(const TQString&) ), + TQT_SLOT( slotFilterChange(const TQString&) ) ); - connect( filter, SIGNAL( textChanged(const QString&) ), - SLOT( slotFilterChange(const QString&) ) ); - connect( filter, SIGNAL( returnPressed(const QString&) ), - filter, SLOT( addToHistory(const QString&) ) ); + connect( filter, TQT_SIGNAL( textChanged(const TQString&) ), + TQT_SLOT( slotFilterChange(const TQString&) ) ); + connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ), + filter, TQT_SLOT( addToHistory(const TQString&) ) ); // kaction for the dir sync method acSyncDir = new KAction( i18n("Current Document Directory"), "dirsynch", 0, - this, SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); + this, TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); toolbar->setIconText( KToolBar::IconOnly ); toolbar->setIconSize( 16 ); toolbar->setEnableContextMenu( false ); - 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()) ); // enable dir sync button if current doc has a valid URL - connect ( partController, SIGNAL(activePartChanged(KParts::Part*) ), - this, SLOT(viewChanged() ) ); + connect ( partController, TQT_SIGNAL(activePartChanged(KParts::Part*) ), + this, TQT_SLOT(viewChanged() ) ); // Connect the bookmark handler - connect( bookmarkHandler, SIGNAL( openURL( const QString& )), - this, SLOT( setDir( const QString& ) ) ); + connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), + this, TQT_SLOT( setDir( const TQString& ) ) ); - waitingUrl = QString::null; + waitingUrl = TQString::null; // whatsthis help - QWhatsThis::add + TQWhatsThis::add ( cmbPath, i18n("<p>Here you can enter a path for a directory to display." "<p>To go to a directory previously entered, press the arrow on " "the right and choose one. <p>The entry has directory " "completion. Right-click to choose how completion should behave.") ); - QWhatsThis::add + TQWhatsThis::add ( filter, i18n("<p>Here you can enter a name filter to limit which files are displayed." "<p>To clear the filter, toggle off the filter button to the left." "<p>To reapply the last filter used, toggle on the filter button." ) ); - QWhatsThis::add + TQWhatsThis::add ( btnFilter, i18n("<p>This button clears the name filter when toggled off, or " "reapplies the last filter used when toggled on.") ); @@ -237,7 +237,7 @@ KDevFileSelector::~KDevFileSelector() //BEGIN Public Methods -void KDevFileSelector::readConfig(KConfig *config, const QString & name) +void KDevFileSelector::readConfig(KConfig *config, const TQString & name) { dir->readConfig(config, name + ":dir"); dir->setView( KFile::Default ); @@ -252,11 +252,11 @@ void KDevFileSelector::readConfig(KConfig *config, const QString & name) // if we restore history if ( config->readBoolEntry( "restore location", true ) || kapp->isRestored() ) { - QString loc( config->readPathEntry( "location" ) ); + TQString loc( config->readPathEntry( "location" ) ); if ( ! loc.isEmpty() ) { waitingDir = loc; - QTimer::singleShot(0, this, SLOT(initialDirChangeHack())); + TQTimer::singleShot(0, this, TQT_SLOT(initialDirChangeHack())); } } @@ -265,7 +265,7 @@ void KDevFileSelector::readConfig(KConfig *config, const QString & name) filter->setMaxCount( config->readNumEntry( "filter history len", 9 ) ); filter->setHistoryItems( config->readListEntry("filter history"), true ); lastFilter = config->readEntry( "last filter" ); - QString flt(""); + TQString flt(""); if ( config->readBoolEntry( "restore last filter", true ) || kapp->isRestored() ) flt = config->readEntry("current filter"); filter->lineEdit()->setText( flt ); @@ -275,11 +275,11 @@ void KDevFileSelector::readConfig(KConfig *config, const QString & name) // connect events as needed /// @todo - solve startup problem: no need to set location for each doc opened! if ( autoSyncEvents & DocumentChanged ) - connect( partController, SIGNAL( viewChanged() ), this, SLOT( autoSync() ) ); + connect( partController, TQT_SIGNAL( viewChanged() ), this, TQT_SLOT( autoSync() ) ); if ( autoSyncEvents & DocumentOpened ) - connect( partController, SIGNAL( partAdded(KParts::Part*) ), - this, SLOT( autoSync(KParts::Part*) ) ); + connect( partController, TQT_SIGNAL( partAdded(KParts::Part*) ), + this, TQT_SLOT( autoSync(KParts::Part*) ) ); } @@ -291,7 +291,7 @@ void KDevFileSelector::initialDirChangeHack() void KDevFileSelector::setupToolbar( KConfig *config ) { toolbar->clear(); - QStringList tbactions = config->readListEntry( "toolbar actions", ',' ); + TQStringList tbactions = config->readListEntry( "toolbar actions", ',' ); if ( tbactions.isEmpty() ) { // resonable collection for default toolbar @@ -300,7 +300,7 @@ void KDevFileSelector::setupToolbar( KConfig *config ) "bookmarks" << "sync_dir"; } KAction *ac; - for ( QStringList::Iterator it=tbactions.begin(); it != tbactions.end(); ++it ) + for ( TQStringList::Iterator it=tbactions.begin(); it != tbactions.end(); ++it ) { if ( *it == "bookmarks" || *it == "sync_dir" ) ac = mActionCollection->action( (*it).latin1() ); @@ -311,13 +311,13 @@ void KDevFileSelector::setupToolbar( KConfig *config ) } } -void KDevFileSelector::writeConfig(KConfig *config, const QString & name) +void KDevFileSelector::writeConfig(KConfig *config, const TQString & name) { dir->writeConfig(config,name + ":dir"); config->setGroup( name ); config->writeEntry( "pathcombo history len", cmbPath->maxItems() ); - QStringList l; + TQStringList l; for (int i = 0; i < cmbPath->count(); i++) { l.append( cmbPath->text( i ) ); @@ -341,18 +341,18 @@ void KDevFileSelector::setView(KFile::FileView view) //BEGIN Public Slots -void KDevFileSelector::slotFilterChange( const QString & nf ) +void KDevFileSelector::slotFilterChange( const TQString & nf ) { - QToolTip::remove( btnFilter ); - QString f = nf.stripWhiteSpace(); + TQToolTip::remove( btnFilter ); + TQString f = nf.stripWhiteSpace(); bool empty = f.isEmpty() || f == "*"; if ( empty ) { dir->clearFilter(); - filter->lineEdit()->setText( QString::null ); - QToolTip::add + filter->lineEdit()->setText( TQString::null ); + TQToolTip::add ( btnFilter, - QString( i18n("Apply last filter (\"%1\")") ).arg( lastFilter ) ); + TQString( i18n("Apply last filter (\"%1\")") ).arg( lastFilter ) ); } else { @@ -362,7 +362,7 @@ void KDevFileSelector::slotFilterChange( const QString & nf ) f.append( '*' ); dir->setNameFilter( f ); lastFilter = f; - QToolTip::add + TQToolTip::add ( btnFilter, i18n("Clear filter") ); } btnFilter->setOn( !empty ); @@ -385,9 +385,9 @@ void KDevFileSelector::cmbPathActivated( const KURL& u ) cmbPathReturnPressed( u.url() ); } -void KDevFileSelector::cmbPathReturnPressed( const QString& u ) +void KDevFileSelector::cmbPathReturnPressed( const TQString& u ) { - QStringList urls = cmbPath->urls(); + TQStringList urls = cmbPath->urls(); urls.remove( u ); urls.prepend( u ); cmbPath->setURLs( urls, KURLComboBox::RemoveBottom ); @@ -415,7 +415,7 @@ void KDevFileSelector::btnFilterClick() { if ( !btnFilter->isOn() ) { - slotFilterChange( QString::null ); + slotFilterChange( TQString::null ); } else { @@ -432,7 +432,7 @@ void KDevFileSelector::autoSync() if ( isVisible() ) { setActiveDocumentDir(); - waitingUrl = QString::null; + waitingUrl = TQString::null; } // else set waiting url else @@ -454,13 +454,13 @@ void KDevFileSelector::autoSync( KParts::Part *part ) KURL u ( doc->url() ); if ( u.isEmpty() ) { - waitingUrl = QString::null; + waitingUrl = TQString::null; return; } if ( isVisible() ) { setDir( u.directory() ); - waitingUrl = QString::null; + waitingUrl = TQString::null; } else { @@ -487,39 +487,39 @@ void KDevFileSelector::viewChanged() //BEGIN Protected -void KDevFileSelector::focusInEvent( QFocusEvent * ) +void KDevFileSelector::focusInEvent( TQFocusEvent * ) { dir->setFocus(); } -void KDevFileSelector::showEvent( QShowEvent * ) +void KDevFileSelector::showEvent( TQShowEvent * ) { // sync if we should if ( autoSyncEvents & GotVisible ) { kdDebug()<<"syncing fs on show"<<endl; setActiveDocumentDir(); - waitingUrl = QString::null; + waitingUrl = TQString::null; } // else, if we have a waiting URL set it else if ( ! waitingUrl.isEmpty() ) { setDir( waitingUrl ); - waitingUrl = QString::null; + waitingUrl = TQString::null; } } -bool KDevFileSelector::eventFilter( QObject* o, QEvent *e ) +bool KDevFileSelector::eventFilter( TQObject* o, TQEvent *e ) { /* This is rather unfortunate, but: - QComboBox does not support setting the size of the listbox to something + TQComboBox does not support setting the size of the listbox to something resonable. Even using listbox->setVariableWidth() does not yeld a satisfying result, something is wrong with the handling of the sizehint. And the popup is rather useless, if the paths are only partly visible. */ - QListBox *lb = cmbPath->listBox(); - if ( o == lb && e->type() == QEvent::Show ) + TQListBox *lb = cmbPath->listBox(); + if ( o == lb && e->type() == TQEvent::Show ) { int add = lb->height() < lb->contentsHeight() ? lb->verticalScrollBar()->width() : 0; @@ -530,7 +530,7 @@ bool KDevFileSelector::eventFilter( QObject* o, QEvent *e ) /// are changed. } /// @todo - same thing for the completion popup? - return QWidget::eventFilter( o, e ); + return TQWidget::eventFilter( o, e ); } //END Protected @@ -543,20 +543,20 @@ bool KDevFileSelector::eventFilter( QObject* o, QEvent *e ) class ActionLBItem : public QListBoxPixmap { public: - ActionLBItem( QListBox *lb=0, - const QPixmap &pm = QPixmap(), - const QString &text=QString::null, - const QString &str=QString::null ) : - QListBoxPixmap( lb, pm, text ), + ActionLBItem( TQListBox *lb=0, + const TQPixmap &pm = TQPixmap(), + const TQString &text=TQString::null, + const TQString &str=TQString::null ) : + TQListBoxPixmap( lb, pm, text ), _str(str) {} ; - QString idstring() + TQString idstring() { return _str; }; private: - QString _str; + TQString _str; }; KURL KDevFileSelector::activeDocumentUrl( ) @@ -575,88 +575,88 @@ KURL KDevFileSelector::activeDocumentUrl( ) //////////////////////////////////////////////////////////////////////////////// // KFSConfigPage implementation //////////////////////////////////////////////////////////////////////////////// -KFSConfigPage::KFSConfigPage( QWidget *parent, const char *name, KDevFileSelector *kfs ) - : QWidget( parent, name ), +KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelector *kfs ) + : TQWidget( parent, name ), fileSelector( kfs ), bDirty( false ) { - QVBoxLayout *lo = new QVBoxLayout( this ); + TQVBoxLayout *lo = new TQVBoxLayout( this ); int spacing = KDialog::spacingHint(); lo->setSpacing( spacing ); // Toolbar - a lot for a little... - QGroupBox *gbToolbar = new QGroupBox( 1, Qt::Vertical, i18n("Toolbar"), this ); + TQGroupBox *gbToolbar = new TQGroupBox( 1, Qt::Vertical, i18n("Toolbar"), this ); acSel = new KActionSelector( gbToolbar ); acSel->setAvailableLabel( i18n("A&vailable actions:") ); acSel->setSelectedLabel( i18n("S&elected actions:") ); lo->addWidget( gbToolbar ); - connect( acSel, SIGNAL( added( QListBoxItem * ) ), this, SLOT( slotChanged() ) ); - connect( acSel, SIGNAL( removed( QListBoxItem * ) ), this, SLOT( slotChanged() ) ); - connect( acSel, SIGNAL( movedUp( QListBoxItem * ) ), this, SLOT( slotChanged() ) ); - connect( acSel, SIGNAL( movedDown( QListBoxItem * ) ), this, SLOT( slotChanged() ) ); + connect( acSel, TQT_SIGNAL( added( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) ); + connect( acSel, TQT_SIGNAL( removed( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) ); + connect( acSel, TQT_SIGNAL( movedUp( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) ); + connect( acSel, TQT_SIGNAL( movedDown( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) ); // Sync - QGroupBox *gbSync = new QGroupBox( 1, Qt::Horizontal, i18n("Auto Synchronization"), this ); - cbSyncActive = new QCheckBox( i18n("When a docu&ment becomes active"), gbSync ); - cbSyncOpen = new QCheckBox( i18n("When a document is o&pened"), gbSync ); - cbSyncShow = new QCheckBox( i18n("When the file selector becomes visible"), gbSync ); + TQGroupBox *gbSync = new TQGroupBox( 1, Qt::Horizontal, i18n("Auto Synchronization"), this ); + cbSyncActive = new TQCheckBox( i18n("When a docu&ment becomes active"), gbSync ); + cbSyncOpen = new TQCheckBox( i18n("When a document is o&pened"), gbSync ); + cbSyncShow = new TQCheckBox( i18n("When the file selector becomes visible"), gbSync ); lo->addWidget( gbSync ); - connect( cbSyncActive, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) ); - connect( cbSyncOpen, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) ); - connect( cbSyncShow, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) ); + connect( cbSyncActive, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); + connect( cbSyncOpen, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); + connect( cbSyncShow, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); // Histories - QHBox *hbPathHist = new QHBox ( this ); - QLabel *lbPathHist = new QLabel( i18n("Remember &locations:"), hbPathHist ); - sbPathHistLength = new QSpinBox( hbPathHist ); + TQHBox *hbPathHist = new TQHBox ( this ); + TQLabel *lbPathHist = new TQLabel( i18n("Remember &locations:"), hbPathHist ); + sbPathHistLength = new TQSpinBox( hbPathHist ); lbPathHist->setBuddy( sbPathHistLength ); lo->addWidget( hbPathHist ); - connect( sbPathHistLength, SIGNAL( valueChanged ( int ) ), this, SLOT( slotChanged() ) ); + connect( sbPathHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); - QHBox *hbFilterHist = new QHBox ( this ); - QLabel *lbFilterHist = new QLabel( i18n("Remember &filters:"), hbFilterHist ); - sbFilterHistLength = new QSpinBox( hbFilterHist ); + TQHBox *hbFilterHist = new TQHBox ( this ); + TQLabel *lbFilterHist = new TQLabel( i18n("Remember &filters:"), hbFilterHist ); + sbFilterHistLength = new TQSpinBox( hbFilterHist ); lbFilterHist->setBuddy( sbFilterHistLength ); lo->addWidget( hbFilterHist ); - connect( sbFilterHistLength, SIGNAL( valueChanged ( int ) ), this, SLOT( slotChanged() ) ); + connect( sbFilterHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); // Session - QGroupBox *gbSession = new QGroupBox( 1, Qt::Horizontal, i18n("Session"), this ); - cbSesLocation = new QCheckBox( i18n("Restore loca&tion"), gbSession ); - cbSesFilter = new QCheckBox( i18n("Restore last f&ilter"), gbSession ); + TQGroupBox *gbSession = new TQGroupBox( 1, Qt::Horizontal, i18n("Session"), this ); + cbSesLocation = new TQCheckBox( i18n("Restore loca&tion"), gbSession ); + cbSesFilter = new TQCheckBox( i18n("Restore last f&ilter"), gbSession ); lo->addWidget( gbSession ); - connect( cbSesLocation, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) ); - connect( cbSesFilter, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) ); + connect( cbSesLocation, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); + connect( cbSesFilter, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); // make it look nice lo->addStretch( 1 ); // be helpfull /* - QWhatsThis::add( lbAvailableActions, i18n( + TQWhatsThis::add( lbAvailableActions, i18n( "<p>Available actions for the toolbar. To add an action, select it here " "and press the add (<strong>-></strong>) button" ) ); - QWhatsThis::add( lbUsedActions, i18n( + TQWhatsThis::add( lbUsedActions, i18n( "<p>Actions used in the toolbar. To remove an action, select it and " "press the remove (<strong><-</strong>) button." "<p>To change the order of the actions, use the Up and Down buttons to " "move the selected action.") ); */ - QString lhwt( i18n( + TQString lhwt( i18n( "<p>Decides how many locations to keep in the history of the location " "combo box") ); - QWhatsThis::add + TQWhatsThis::add ( lbPathHist, lhwt ); - QWhatsThis::add + TQWhatsThis::add ( sbPathHistLength, lhwt ); - QString fhwt( i18n( + TQString fhwt( i18n( "<p>Decides how many filters to keep in the history of the filter " "combo box") ); - QWhatsThis::add + TQWhatsThis::add ( lbFilterHist, fhwt ); - QWhatsThis::add + TQWhatsThis::add ( sbFilterHistLength, fhwt ); - QString synwt( i18n( + TQString synwt( i18n( "<p>These options allow you to have the File Selector automatically " "change location to the directory of the active document on certain " "events." @@ -664,14 +664,14 @@ KFSConfigPage::KFSConfigPage( QWidget *parent, const char *name, KDevFileSelecto "effect until the file selector is visible." "<p>None of these are enabled by default, but you can always sync the " "location by pressing the sync button in the toolbar.") ); - QWhatsThis::add + TQWhatsThis::add ( gbSync, synwt ); - QWhatsThis::add + TQWhatsThis::add ( cbSesLocation, i18n( "<p>If this option is enabled (default), the location will be restored " "when you start KDev.<p><strong>Note</strong> that if the session is " "handled by the KDE session manager, the location is always restored.") ); - QWhatsThis::add + TQWhatsThis::add ( cbSesFilter, i18n( "<p>If this option is enabled (default), the current filter will be " "restored when you start KDev.<p><strong>Note</strong> that if the " @@ -689,8 +689,8 @@ void KFSConfigPage::apply() KConfig *config = fileSelector->m_part->instance()->config(); config->setGroup( "fileselector" ); // toolbar - QStringList l; - QListBoxItem *item = acSel->selectedListBox()->firstItem(); + TQStringList l; + TQListBoxItem *item = acSel->selectedListBox()->firstItem(); ActionLBItem *aItem; while ( item ) { @@ -713,16 +713,16 @@ void KFSConfigPage::apply() s |= KDevFileSelector::GotVisible; fileSelector->autoSyncEvents = s; // reset connections - disconnect( fileSelector->partController, 0, fileSelector, SLOT( autoSync() ) ); + disconnect( fileSelector->partController, 0, fileSelector, TQT_SLOT( autoSync() ) ); disconnect( fileSelector->partController, 0, - fileSelector, SLOT( autoSync( KParts::Part *) ) ); + fileSelector, TQT_SLOT( autoSync( KParts::Part *) ) ); if ( s & KDevFileSelector::DocumentChanged ) - connect( fileSelector->partController, SIGNAL( viewChanged() ), - fileSelector, SLOT( autoSync() ) ); + connect( fileSelector->partController, TQT_SIGNAL( viewChanged() ), + fileSelector, TQT_SLOT( autoSync() ) ); if ( s & KDevFileSelector::DocumentOpened ) connect( fileSelector->partController, - SIGNAL( partAdded(KParts::Part *) ), - fileSelector, SLOT( autoSync(KParts::Part *) ) ); + TQT_SIGNAL( partAdded(KParts::Part *) ), + fileSelector, TQT_SLOT( autoSync(KParts::Part *) ) ); // histories fileSelector->cmbPath->setMaxItems( sbPathHistLength->value() ); @@ -744,23 +744,23 @@ void KFSConfigPage::init() KConfig *config = fileSelector->m_part->instance()->config(); config->setGroup( "fileselector" ); // toolbar - QStringList l = config->readListEntry( "toolbar actions", ',' ); + TQStringList l = config->readListEntry( "toolbar actions", ',' ); if ( l.isEmpty() ) // default toolbar l << "up" << "back" << "forward" << "home" << "short view" << "detailed view" << "bookmarks" << "sync_dir"; // actions from diroperator + two of our own - QStringList allActions; + TQStringList allActions; allActions << "up" << "back" << "forward" << "home" << "reload" << "mkdir" << "delete" << "short view" << "detailed view" /*<< "view menu" << "show hidden" << "properties"*/ << "bookmarks" << "sync_dir"; - QRegExp re("&(?=[^&])"); + TQRegExp re("&(?=[^&])"); KAction *ac; - QListBox *lb; - for ( QStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it ) + TQListBox *lb; + for ( TQStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it ) { lb = l.contains( *it ) ? acSel->selectedListBox() : acSel->availableListBox(); if ( *it == "bookmarks" || *it == "sync_dir" ) @@ -793,7 +793,7 @@ void KFSConfigPage::slotChanged() //BEGIN KDevDirOperator -void KDevDirOperator::activatedMenu( const KFileItem *fi, const QPoint & pos ) +void KDevDirOperator::activatedMenu( const KFileItem *fi, const TQPoint & pos ) { setupMenu(); updateSelectionDependentActions(); diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h index d39fd25d..4811c398 100644 --- a/parts/fileselector/fileselector_widget.h +++ b/parts/fileselector/fileselector_widget.h @@ -22,11 +22,11 @@ #ifndef FILESELECTOR_WIDGET_H #define FILESELECTOR_WIDGET_H -#include <qwidget.h> +#include <tqwidget.h> #include <kfile.h> #include <kurl.h> #include <ktoolbar.h> -#include <qframe.h> +#include <tqframe.h> #include <kdiroperator.h> class KDevMainWindow; @@ -61,7 +61,7 @@ class KDevFileSelectorToolBar: public KToolBar { Q_OBJECT public: - KDevFileSelectorToolBar(QWidget *parent); + KDevFileSelectorToolBar(TQWidget *parent); virtual ~KDevFileSelectorToolBar(); virtual void setMovingEnabled( bool b ); @@ -71,7 +71,7 @@ class KDevFileSelectorToolBarParent: public QFrame { Q_OBJECT public: - KDevFileSelectorToolBarParent(QWidget *parent); + KDevFileSelectorToolBarParent(TQWidget *parent); ~KDevFileSelectorToolBarParent(); void setToolBar(KDevFileSelectorToolBar *tb); @@ -79,20 +79,20 @@ private: KDevFileSelectorToolBar *m_tb; protected: - virtual void resizeEvent ( QResizeEvent * ); + virtual void resizeEvent ( TQResizeEvent * ); }; class KDevDirOperator: public KDirOperator { Q_OBJECT public: - KDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), QWidget *parent=0, const char *name=0) + KDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *parent=0, const char *name=0) :KDirOperator(urlName, parent, name), m_part(part) { } protected slots: - virtual void activatedMenu (const KFileItem *fi, const QPoint &pos); + virtual void activatedMenu (const KFileItem *fi, const TQPoint &pos); private: FileSelectorPart *m_part; @@ -109,24 +109,24 @@ public: enum AutoSyncEvent { DocumentChanged=1, DocumentOpened=2, GotVisible=4 }; KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow=0, KDevPartController *partController=0, - QWidget * parent = 0, const char * name = 0 ); + TQWidget * parent = 0, const char * name = 0 ); ~KDevFileSelector(); - void readConfig( KConfig *, const QString & ); - void writeConfig( KConfig *, const QString & ); + void readConfig( KConfig *, const TQString & ); + void writeConfig( KConfig *, const TQString & ); void setupToolbar( KConfig * ); void setView( KFile::FileView ); KDevDirOperator *dirOperator(){ return dir; } KActionCollection *actionCollection() { return mActionCollection; }; public slots: - void slotFilterChange(const QString&); + void slotFilterChange(const TQString&); void setDir(KURL); - void setDir( const QString& url ) { setDir( KURL( url ) ); }; + void setDir( const TQString& url ) { setDir( KURL( url ) ); }; 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 setActiveDocumentDir(); @@ -136,9 +136,9 @@ private slots: void autoSync( KParts::Part * ); void initialDirChangeHack(); protected: - void focusInEvent( QFocusEvent * ); - void showEvent( QShowEvent * ); - bool eventFilter( QObject *, QEvent * ); + void focusInEvent( TQFocusEvent * ); + void showEvent( TQShowEvent * ); + bool eventFilter( TQObject *, TQEvent * ); KURL activeDocumentUrl(); private: @@ -149,16 +149,16 @@ private: KDevDirOperator * dir; class KAction *acSyncDir; KHistoryCombo * filter; - class QToolButton *btnFilter; + class TQToolButton *btnFilter; FileSelectorPart *m_part; KDevMainWindow *mainwin; KDevPartController *partController; - QString lastFilter; + TQString lastFilter; int autoSyncEvents; // enabled autosync events - QString waitingUrl; // maybe display when we gets visible - QString waitingDir; + TQString waitingUrl; // maybe display when we gets visible + TQString waitingDir; }; /* @todo anders @@ -178,7 +178,7 @@ class KFSConfigPage : public QWidget { Q_OBJECT public: - KFSConfigPage( QWidget* parent=0, const char *name=0, KDevFileSelector *kfs=0); + KFSConfigPage( TQWidget* parent=0, const char *name=0, KDevFileSelector *kfs=0); virtual ~KFSConfigPage() {}; public slots: @@ -191,11 +191,11 @@ private: KDevFileSelector *fileSelector; bool bDirty; - //class QListBox *lbAvailableActions, *lbUsedActions; + //class TQListBox *lbAvailableActions, *lbUsedActions; KActionSelector *acSel; - class QSpinBox *sbPathHistLength, *sbFilterHistLength; - class QCheckBox *cbSyncOpen, *cbSyncActive, *cbSyncShow; - class QCheckBox *cbSesLocation, *cbSesFilter; + class TQSpinBox *sbPathHistLength, *sbFilterHistLength; + class TQCheckBox *cbSyncOpen, *cbSyncActive, *cbSyncShow; + class TQCheckBox *cbSesLocation, *cbSesFilter; }; diff --git a/parts/fileselector/kactionselector.cpp b/parts/fileselector/kactionselector.cpp index eec95a6d..a3c4034d 100644 --- a/parts/fileselector/kactionselector.cpp +++ b/parts/fileselector/kactionselector.cpp @@ -23,38 +23,38 @@ #include <kiconloader.h> #include <kdialog.h> // for spacingHint() #include <kdebug.h> -#include <qapplication.h> +#include <tqapplication.h> -#include <qlistbox.h> -#include <qtoolbutton.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qevent.h> -#include <qwhatsthis.h> +#include <tqlistbox.h> +#include <tqtoolbutton.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqevent.h> +#include <tqwhatsthis.h> class KActionSelectorPrivate { public: - QListBox *availableListBox, *selectedListBox; - QToolButton *btnAdd, *btnRemove, *btnUp, *btnDown; - QLabel *lAvailable, *lSelected; + TQListBox *availableListBox, *selectedListBox; + TQToolButton *btnAdd, *btnRemove, *btnUp, *btnDown; + TQLabel *lAvailable, *lSelected; bool moveOnDoubleClick, keyboardEnabled; KActionSelector::ButtonIconSize iconSize; - QString addIcon, removeIcon, upIcon, downIcon; + TQString addIcon, removeIcon, upIcon, downIcon; KActionSelector::InsertionPolicy availableInsertionPolicy, selectedInsertionPolicy; bool showUpDownButtons; }; //BEGIN Constructor/destructor -KActionSelector::KActionSelector( QWidget *parent, const char *name ) - : QWidget( parent, name ) +KActionSelector::KActionSelector( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { d = new KActionSelectorPrivate(); d->moveOnDoubleClick = true; d->keyboardEnabled = true; d->iconSize = SmallIcon; - d->addIcon = QApplication::reverseLayout() ? "back" : "forward"; - d->removeIcon = QApplication::reverseLayout() ? "forward" : "back"; + d->addIcon = TQApplication::reverseLayout() ? "back" : "forward"; + d->removeIcon = TQApplication::reverseLayout() ? "forward" : "back"; d->upIcon = "up"; d->downIcon = "down"; d->availableInsertionPolicy = Sorted; @@ -63,53 +63,53 @@ KActionSelector::KActionSelector( QWidget *parent, const char *name ) //int isz = IconSize( KIcon::Small ); - QHBoxLayout *lo = new QHBoxLayout( this ); + TQHBoxLayout *lo = new TQHBoxLayout( this ); lo->setSpacing( KDialog::spacingHint() ); - QVBoxLayout *loAv = new QVBoxLayout( lo ); - d->lAvailable = new QLabel( i18n("&Available:"), this ); + TQVBoxLayout *loAv = new TQVBoxLayout( lo ); + d->lAvailable = new TQLabel( i18n("&Available:"), this ); loAv->addWidget( d->lAvailable ); - d->availableListBox = new QListBox( this ); + d->availableListBox = new TQListBox( this ); loAv->addWidget( d->availableListBox ); d->lAvailable->setBuddy( d->availableListBox ); - QVBoxLayout *loHBtns = new QVBoxLayout( lo ); + TQVBoxLayout *loHBtns = new TQVBoxLayout( lo ); loHBtns->addStretch( 1 ); - d->btnAdd = new QToolButton( this ); + d->btnAdd = new TQToolButton( this ); loHBtns->addWidget( d->btnAdd ); - d->btnRemove = new QToolButton( this ); + d->btnRemove = new TQToolButton( this ); loHBtns->addWidget( d->btnRemove ); loHBtns->addStretch( 1 ); - QVBoxLayout *loS = new QVBoxLayout( lo ); - d->lSelected = new QLabel( i18n("&Selected:"), this ); + TQVBoxLayout *loS = new TQVBoxLayout( lo ); + d->lSelected = new TQLabel( i18n("&Selected:"), this ); loS->addWidget( d->lSelected ); - d->selectedListBox = new QListBox( this ); + d->selectedListBox = new TQListBox( this ); loS->addWidget( d->selectedListBox ); d->lSelected->setBuddy( d->selectedListBox ); - QVBoxLayout *loVBtns = new QVBoxLayout( lo ); + TQVBoxLayout *loVBtns = new TQVBoxLayout( lo ); loVBtns->addStretch( 1 ); - d->btnUp = new QToolButton( this ); + d->btnUp = new TQToolButton( this ); loVBtns->addWidget( d->btnUp ); - d->btnDown = new QToolButton( this ); + d->btnDown = new TQToolButton( this ); loVBtns->addWidget( d->btnDown ); loVBtns->addStretch( 1 ); loadIcons(); - connect( d->btnAdd, SIGNAL(clicked()), this, SLOT(buttonAddClicked()) ); - connect( d->btnRemove, SIGNAL(clicked()), this, SLOT(buttonRemoveClicked()) ); - connect( d->btnUp, SIGNAL(clicked()), this, SLOT(buttonUpClicked()) ); - connect( d->btnDown, SIGNAL(clicked()), this, SLOT(buttonDownClicked()) ); - connect( d->availableListBox, SIGNAL(doubleClicked(QListBoxItem*)), - this, SLOT(itemDoubleClicked(QListBoxItem*)) ); - connect( d->selectedListBox, SIGNAL(doubleClicked(QListBoxItem*)), - this, SLOT(itemDoubleClicked(QListBoxItem*)) ); - connect( d->availableListBox, SIGNAL(currentChanged(QListBoxItem*)), - this, SLOT(slotCurrentChanged(QListBoxItem *)) ); - connect( d->selectedListBox, SIGNAL(currentChanged(QListBoxItem*)), - this, SLOT(slotCurrentChanged(QListBoxItem *)) ); + connect( d->btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonAddClicked()) ); + connect( d->btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonRemoveClicked()) ); + connect( d->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonUpClicked()) ); + connect( d->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonDownClicked()) ); + connect( d->availableListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), + this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) ); + connect( d->selectedListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), + this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) ); + connect( d->availableListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) ); + connect( d->selectedListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) ); d->availableListBox->installEventFilter( this ); d->selectedListBox->installEventFilter( this ); @@ -124,17 +124,17 @@ KActionSelector::~KActionSelector() //BEGIN Public Methods -QListBox *KActionSelector::availableListBox() +TQListBox *KActionSelector::availableListBox() { return d->availableListBox; } -QListBox *KActionSelector::selectedListBox() +TQListBox *KActionSelector::selectedListBox() { return d->selectedListBox; } -void KActionSelector::setButtonIcon( const QString &icon, MoveButton button ) +void KActionSelector::setButtonIcon( const TQString &icon, MoveButton button ) { switch ( button ) { @@ -159,7 +159,7 @@ void KActionSelector::setButtonIcon( const QString &icon, MoveButton button ) } } -void KActionSelector::setButtonIconSet( const QIconSet &iconset, MoveButton button ) +void KActionSelector::setButtonIconSet( const TQIconSet &iconset, MoveButton button ) { switch ( button ) { @@ -180,7 +180,7 @@ void KActionSelector::setButtonIconSet( const QIconSet &iconset, MoveButton butt } } -void KActionSelector::setButtonTooltip( const QString &tip, MoveButton button ) +void KActionSelector::setButtonTooltip( const TQString &tip, MoveButton button ) { switch ( button ) { @@ -201,21 +201,21 @@ void KActionSelector::setButtonTooltip( const QString &tip, MoveButton button ) } } -void KActionSelector::setButtonWhatsThis( const QString &text, MoveButton button ) +void KActionSelector::setButtonWhatsThis( const TQString &text, MoveButton button ) { switch ( button ) { case ButtonAdd: - QWhatsThis::add( d->btnAdd, text ); + TQWhatsThis::add( d->btnAdd, text ); break; case ButtonRemove: - QWhatsThis::add( d->btnRemove, text ); + TQWhatsThis::add( d->btnRemove, text ); break; case ButtonUp: - QWhatsThis::add( d->btnUp, text ); + TQWhatsThis::add( d->btnUp, text ); break; case ButtonDown: - QWhatsThis::add( d->btnDown, text ); + TQWhatsThis::add( d->btnDown, text ); break; default: kdDebug()<<"KActionSelector::setButtonWhatsThis: DAINBREAD!"<<endl; @@ -255,22 +255,22 @@ void KActionSelector::setKeyboardEnabled( bool b ) d->keyboardEnabled = b; } -QString KActionSelector::availableLabel() const +TQString KActionSelector::availableLabel() const { return d->lAvailable->text(); } -void KActionSelector::setAvailableLabel( const QString &text ) +void KActionSelector::setAvailableLabel( const TQString &text ) { d->lAvailable->setText( text ); } -QString KActionSelector::selectedLabel() const +TQString KActionSelector::selectedLabel() const { return d->lSelected->text(); } -void KActionSelector::setSelectedLabel( const QString &text ) +void KActionSelector::setSelectedLabel( const TQString &text ) { d->lSelected->setText( text ); } @@ -339,7 +339,7 @@ void KActionSelector::polish() //END Public Slots //BEGIN Protected -void KActionSelector::keyPressEvent( QKeyEvent *e ) +void KActionSelector::keyPressEvent( TQKeyEvent *e ) { if ( ! d->keyboardEnabled ) return; if ( (e->state() & Qt::ControlButton) ) @@ -365,13 +365,13 @@ void KActionSelector::keyPressEvent( QKeyEvent *e ) } } -bool KActionSelector::eventFilter( QObject *o, QEvent *e ) +bool KActionSelector::eventFilter( TQObject *o, TQEvent *e ) { - if ( d->keyboardEnabled && e->type() == QEvent::KeyPress ) + if ( d->keyboardEnabled && e->type() == TQEvent::KeyPress ) { - if ( (((QKeyEvent*)e)->state() & Qt::ControlButton) ) + if ( (((TQKeyEvent*)e)->state() & Qt::ControlButton) ) { - switch ( ((QKeyEvent*)e)->key() ) + switch ( ((TQKeyEvent*)e)->key() ) { case Key_Right: buttonAddClicked(); @@ -386,18 +386,18 @@ bool KActionSelector::eventFilter( QObject *o, QEvent *e ) buttonDownClicked(); break; default: - return QWidget::eventFilter( o, e ); + return TQWidget::eventFilter( o, e ); break; } return true; } - else if ( o->inherits( "QListBox" ) ) + else if ( o->inherits( "TQListBox" ) ) { - switch ( ((QKeyEvent*)e)->key() ) + switch ( ((TQKeyEvent*)e)->key() ) { case Key_Return: case Key_Enter: - QListBox *lb = (QListBox*)o; + TQListBox *lb = (TQListBox*)o; int index = lb->currentItem(); if ( index < 0 ) break; moveItem( lb->item( index ) ); @@ -405,7 +405,7 @@ bool KActionSelector::eventFilter( QObject *o, QEvent *e ) } } } - return QWidget::eventFilter( o, e ); + return TQWidget::eventFilter( o, e ); } //END Protected @@ -415,7 +415,7 @@ bool KActionSelector::eventFilter( QObject *o, QEvent *e ) void KActionSelector::buttonAddClicked() { // move all selected items from available to selected listbox - QListBoxItem *item = d->availableListBox->firstItem(); + TQListBoxItem *item = d->availableListBox->firstItem(); while ( item ) { if ( item->isSelected() ) { d->availableListBox->takeItem( item ); @@ -433,7 +433,7 @@ void KActionSelector::buttonAddClicked() void KActionSelector::buttonRemoveClicked() { // move all selected items from selected to available listbox - QListBoxItem *item = d->selectedListBox->firstItem(); + TQListBoxItem *item = d->selectedListBox->firstItem(); while ( item ) { if ( item->isSelected() ) { d->selectedListBox->takeItem( item ); @@ -452,7 +452,7 @@ void KActionSelector::buttonUpClicked() { int c = d->selectedListBox->currentItem(); if ( c < 0 ) return; - QListBoxItem *item = d->selectedListBox->item( c ); + TQListBoxItem *item = d->selectedListBox->item( c ); d->selectedListBox->takeItem( item ); d->selectedListBox->insertItem( item, c-1 ); d->selectedListBox->setCurrentItem( item ); @@ -463,14 +463,14 @@ void KActionSelector::buttonDownClicked() { int c = d->selectedListBox->currentItem(); if ( c < 0 ) return; - QListBoxItem *item = d->selectedListBox->item( c ); + TQListBoxItem *item = d->selectedListBox->item( c ); d->selectedListBox->takeItem( item ); d->selectedListBox->insertItem( item, c+1 ); d->selectedListBox->setCurrentItem( item ); emit movedDown( item ); } -void KActionSelector::itemDoubleClicked( QListBoxItem *item ) +void KActionSelector::itemDoubleClicked( TQListBoxItem *item ) { if ( d->moveOnDoubleClick ) moveItem( item ); @@ -488,10 +488,10 @@ void KActionSelector::loadIcons() d->btnDown->setIconSet( SmallIconSet( d->downIcon, d->iconSize ) ); } -void KActionSelector::moveItem( QListBoxItem *item ) +void KActionSelector::moveItem( TQListBoxItem *item ) { - QListBox *lbFrom = item->listBox(); - QListBox *lbTo; + TQListBox *lbFrom = item->listBox(); + TQListBox *lbTo; if ( lbFrom == d->availableListBox ) lbTo = d->selectedListBox; else if ( lbFrom == d->selectedListBox ) @@ -515,7 +515,7 @@ void KActionSelector::moveItem( QListBoxItem *item ) emit removed( item ); } -int KActionSelector::insertionIndex( QListBox *lb, InsertionPolicy policy ) +int KActionSelector::insertionIndex( TQListBox *lb, InsertionPolicy policy ) { int index; switch ( policy ) diff --git a/parts/fileselector/kactionselector.h b/parts/fileselector/kactionselector.h index b8d54e97..74e6575d 100644 --- a/parts/fileselector/kactionselector.h +++ b/parts/fileselector/kactionselector.h @@ -19,7 +19,7 @@ #ifndef _KACTION_SELECTOR_H_ #define _KACTION_SELECTOR_H_ -#include <qwidget.h> +#include <tqwidget.h> class QListBox; class QListBoxItem; @@ -45,13 +45,13 @@ class KActionSelectorPrivate; see keyboardEnabled. Note that this may conflist with keyboard selection in the selected list box, - if you set that to anything else than QListBox::Single (which is the default). + if you set that to anything else than TQListBox::Single (which is the default). To use it, simply construct an instance and then add items to the two listboxes, available through lbAvailable() and lbSelected(). Whenever you want, you can retrieve - the selected options using QListBox methods on lbSelected(). + the selected options using TQListBox methods on lbSelected(). - This way, you can use your own QListBoxItem class, allowing you to easily + This way, you can use your own TQListBoxItem class, allowing you to easily store object data in those. When an item is moved to a listbox, it is placed below the current item @@ -73,31 +73,31 @@ class KActionSelectorPrivate; @author Anders Lund <anders@alweb.dk> */ -class KActionSelector : public QWidget { +class KActionSelector : public TQWidget { Q_OBJECT Q_ENUMS( ButtonIconSize InsertionPolicy ) Q_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick ) Q_PROPERTY( bool keyboardEnabled READ keyboardEnabled WRITE setKeyboardEnabled ) - Q_PROPERTY( QString availableLabel READ availableLabel WRITE setAvailableLabel ) - Q_PROPERTY( QString selectedLabel READ selectedLabel WRITE setSelectedLabel ) + Q_PROPERTY( TQString availableLabel READ availableLabel WRITE setAvailableLabel ) + Q_PROPERTY( TQString selectedLabel READ selectedLabel WRITE setSelectedLabel ) Q_PROPERTY( ButtonIconSize buttonIconSize READ buttonIconSize WRITE setButtonIconSize ) Q_PROPERTY( InsertionPolicy availableInsertionPolicy READ availableInsertionPolicy WRITE setAvailableInsertionPolicy ) Q_PROPERTY( InsertionPolicy selectedInsertionPolicy READ selectedInsertionPolicy WRITE setSelectedInsertionPolicy ) Q_PROPERTY( bool showUpDownButtons READ showUpDownButtons WRITE setShowUpDownButtons ) public: - KActionSelector( QWidget *parent=0, const char *name=0 ); + KActionSelector( TQWidget *parent=0, const char *name=0 ); ~KActionSelector(); /** - @return The QListBox holding the available actions + @return The TQListBox holding the available actions */ - QListBox *availableListBox(); + TQListBox *availableListBox(); /** - @return The QListBox holding the selected actions + @return The TQListBox holding the selected actions */ - QListBox *selectedListBox(); + TQListBox *selectedListBox(); /** This enum indentifies the moving buttons @@ -190,7 +190,7 @@ public: /** @return The text of the label for the available items listbox. */ - QString availableLabel() const; + TQString availableLabel() const; /** Sets the label for the available items listbox to @p text. @@ -198,12 +198,12 @@ public: if you have a single ampersand in the text, the following character will become the accellerator to focus te listbox. */ - void setAvailableLabel( const QString & text ); + void setAvailableLabel( const TQString & text ); /** @return the label of the selected items listbox. */ - QString selectedLabel() const; + TQString selectedLabel() const; /** Sets the label for the selected items listbox to @p text. @@ -211,7 +211,7 @@ public: if you have a single ampersand in the text, the following character will become the accellerator to focus te listbox. */ - void setSelectedLabel( const QString & text ); + void setSelectedLabel( const TQString & text ); /** @return the current ButtonIconSize. @@ -265,25 +265,25 @@ public: Sets the pixmap of the button @p button to @p icon. It calls SmallIconSet(pm) to generate the icon set. */ - void setButtonIcon( const QString &icon, MoveButton button ); + void setButtonIcon( const TQString &icon, MoveButton button ); /** Sets the iconset for button @p button to @p iconset. You can use this method to et a costum icon set. Either - created by @ref QIconSet, or use the application instance of + created by @ref TQIconSet, or use the application instance of @ref KIconLoader (recommended). */ - void setButtonIconSet( const QIconSet &iconset, MoveButton button ); + void setButtonIconSet( const TQIconSet &iconset, MoveButton button ); /** Sets the tooltip for the button @p button to @p tip. */ - void setButtonTooltip( const QString &tip, MoveButton button ); + void setButtonTooltip( const TQString &tip, MoveButton button ); /** Sets the whatsthis help for button @p button to @p text. */ - void setButtonWhatsThis( const QString &text, MoveButton button ); + void setButtonWhatsThis( const TQString &text, MoveButton button ); /** Sets the enabled state of all moving buttons to reflect the current @@ -298,27 +298,27 @@ signals: /** Emitted when an item is moved to the "selected" listbox. */ - void added( QListBoxItem *item ); + void added( TQListBoxItem *item ); /** Emitted when an item is moved out of the "selected" listbox. */ - void removed( QListBoxItem *item ); + void removed( TQListBoxItem *item ); /** Emitted when an item is moved upwards in the "selected" listbox. */ - void movedUp( QListBoxItem *item ); + void movedUp( TQListBoxItem *item ); /** Emitted when an item is moved downwards in the "selected" listbox. */ - void movedDown( QListBoxItem *item ); + void movedDown( TQListBoxItem *item ); /** Emitted when an item is moved to the "selected" listbox. */ -// void addedToSelection( QListBoxItem *item ); +// void addedToSelection( TQListBoxItem *item ); public slots: /** @@ -331,12 +331,12 @@ protected: /** Reimplamented for internal reasons. */ - void keyPressEvent( QKeyEvent * ); + void keyPressEvent( TQKeyEvent * ); /** Reimplemented for internal reasons. */ - bool eventFilter( QObject *, QEvent * ); + bool eventFilter( TQObject *, TQEvent * ); private slots: /** @@ -362,19 +362,19 @@ private slots: /** Moves the item @p item to the other listbox if moveOnDoubleClick is enabled. */ - void itemDoubleClicked( QListBoxItem *item ); + void itemDoubleClicked( TQListBoxItem *item ); /** connected to both list boxes to set the buttons enabled */ - void slotCurrentChanged( QListBoxItem * ) { setButtonsEnabled(); }; + void slotCurrentChanged( TQListBoxItem * ) { setButtonsEnabled(); }; private: /** Move item @p item to the other listbox */ - void moveItem( QListBoxItem *item ); + void moveItem( TQListBoxItem *item ); /** loads the icons for the move buttons. @@ -388,7 +388,7 @@ private: Note that if policy is Sorted, this will return -1. Sort the listbox after inserting the item in that case. */ - int insertionIndex( QListBox *lb, InsertionPolicy policy ); + int insertionIndex( TQListBox *lb, InsertionPolicy policy ); /** Private data storage diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp index d4fbc4ee..6467b83f 100644 --- a/parts/fileselector/kbookmarkhandler.cpp +++ b/parts/fileselector/kbookmarkhandler.cpp @@ -21,7 +21,7 @@ #include <stdio.h> #include <stdlib.h> -#include <qtextstream.h> +#include <tqtextstream.h> #include <kxmlguiclient.h> #include <kbookmarkimporter.h> @@ -36,7 +36,7 @@ KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, KPopupMenu* kpopupmenu ) - : QObject( parent, "KBookmarkHandler" ), + : TQObject( parent, "KBookmarkHandler" ), KBookmarkOwner(), mParent( parent ), m_menu( kpopupmenu ), @@ -45,7 +45,7 @@ KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, KPopupMenu* kpopup if (!m_menu) m_menu = new KPopupMenu( parent, "bookmark menu" ); - QString file = locate( "data", "kdevfileselector/fsbookmarks.xml" ); + TQString file = locate( "data", "kdevfileselector/fsbookmarks.xml" ); if ( file.isEmpty() ) file = locateLocal( "data", "kdevfileselector/fsbookmarks.xml" ); @@ -61,24 +61,24 @@ KBookmarkHandler::~KBookmarkHandler() // delete m_bookmarkMenu; ### } -QString KBookmarkHandler::currentURL() const +TQString KBookmarkHandler::currentURL() const { return mParent->dirOperator()->url().url(); } -void KBookmarkHandler::slotNewBookmark( const QString& text, - const QCString& url, - const QString& additionalInfo ) +void KBookmarkHandler::slotNewBookmark( const TQString& text, + const TQCString& url, + const TQString& additionalInfo ) { Q_UNUSED( text ); *m_importStream << "<bookmark icon=\"" << KMimeType::iconForURL( KURL( url ) ); - *m_importStream << "\" href=\"" << QString::fromUtf8(url) << "\">\n"; - *m_importStream << "<title>" << (additionalInfo.isEmpty() ? QString::fromUtf8(url) : additionalInfo) << "</title>\n</bookmark>\n"; + *m_importStream << "\" href=\"" << TQString::fromUtf8(url) << "\">\n"; + *m_importStream << "<title>" << (additionalInfo.isEmpty() ? TQString::fromUtf8(url) : additionalInfo) << "</title>\n</bookmark>\n"; } -void KBookmarkHandler::slotNewFolder( const QString& text, bool /*open*/, - const QString& /*additionalInfo*/ ) +void KBookmarkHandler::slotNewFolder( const TQString& text, bool /*open*/, + const TQString& /*additionalInfo*/ ) { *m_importStream << "<folder icon=\"bookmark_folder\">\n<title=\""; *m_importStream << text << "\">\n"; diff --git a/parts/fileselector/kbookmarkhandler.h b/parts/fileselector/kbookmarkhandler.h index e0a16c60..9b8f5042 100644 --- a/parts/fileselector/kbookmarkhandler.h +++ b/parts/fileselector/kbookmarkhandler.h @@ -28,7 +28,7 @@ class QTextStream; class KPopupMenu; class KActionMenu; -class KBookmarkHandler : public QObject, public KBookmarkOwner +class KBookmarkHandler : public TQObject, public KBookmarkOwner { Q_OBJECT @@ -37,19 +37,19 @@ public: ~KBookmarkHandler(); // KBookmarkOwner interface: - virtual void openBookmarkURL( const QString& url ) { emit openURL( url ); } - virtual QString currentURL() const; + virtual void openBookmarkURL( const TQString& url ) { emit openURL( url ); } + virtual TQString currentURL() const; KPopupMenu *menu() const { return m_menu; } signals: - void openURL( const QString& url ); + void openURL( const TQString& url ); private slots: - void slotNewBookmark( const QString& text, const QCString& url, - const QString& additionalInfo ); - void slotNewFolder( const QString& text, bool open, - const QString& additionalInfo ); + void slotNewBookmark( const TQString& text, const TQCString& url, + const TQString& additionalInfo ); + void slotNewFolder( const TQString& text, bool open, + const TQString& additionalInfo ); void newSeparator(); void endFolder(); @@ -61,7 +61,7 @@ private: KPopupMenu *m_menu; KBookmarkMenu *m_bookmarkMenu; - QTextStream *m_importStream; + TQTextStream *m_importStream; //class KBookmarkHandlerPrivate *d; }; diff --git a/parts/fileview/addfilegroupdlg.cpp b/parts/fileview/addfilegroupdlg.cpp index ef194da1..b59f2ad2 100644 --- a/parts/fileview/addfilegroupdlg.cpp +++ b/parts/fileview/addfilegroupdlg.cpp @@ -9,9 +9,9 @@ * * ***************************************************************************/ -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> #include <kbuttonbox.h> #include <klocale.h> #include <kstdguiitem.h> @@ -20,42 +20,42 @@ #include "addfilegroupdlg.h" -AddFileGroupDialog::AddFileGroupDialog(const QString& old_title, const QString& old_pattern, QWidget *parent, const char *name) - : QDialog(parent, name, true) +AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString& old_pattern, TQWidget *parent, const char *name) + : TQDialog(parent, name, true) { - QLabel *title_label = new QLabel(i18n("&Title:"), this); + TQLabel *title_label = new TQLabel(i18n("&Title:"), this); title_edit = new KLineEdit(old_title, this); title_edit->setFocus(); title_label->setBuddy(title_edit); - connect( title_edit, SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotTextChanged() ) ); + connect( title_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); - QLabel *pattern_label = new QLabel(i18n("&Pattern:"), this); + TQLabel *pattern_label = new TQLabel(i18n("&Pattern:"), this); pattern_edit = new KLineEdit(old_pattern, this); pattern_label->setBuddy(pattern_edit); - QFontMetrics fm(pattern_edit->fontMetrics()); + TQFontMetrics fm(pattern_edit->fontMetrics()); pattern_edit->setMinimumWidth(fm.width('X')*35); - connect( pattern_edit, SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotTextChanged() ) ); - QVBoxLayout *layout = new QVBoxLayout(this, 10); + connect( pattern_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); + TQVBoxLayout *layout = new TQVBoxLayout(this, 10); - QGridLayout *grid = new QGridLayout(2, 2); + TQGridLayout *grid = new TQGridLayout(2, 2); layout->addLayout(grid); grid->addWidget(title_label, 0, 0); grid->addWidget(title_edit, 0, 1); grid->addWidget(pattern_label, 1, 0); grid->addWidget(pattern_edit, 1, 1); - QFrame *frame = new QFrame(this); - frame->setFrameStyle(QFrame::HLine | QFrame::Sunken); + TQFrame *frame = new TQFrame(this); + frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); layout->addWidget(frame, 0); KButtonBox *buttonbox = new KButtonBox(this); buttonbox->addStretch(); m_pOk = buttonbox->addButton(KStdGuiItem::ok()); - QPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); + TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); m_pOk->setDefault(true); - connect( m_pOk, SIGNAL(clicked()), this, SLOT(accept()) ); - connect( cancel, SIGNAL(clicked()), this, SLOT(reject()) ); + connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); buttonbox->layout(); layout->addWidget(buttonbox, 0); slotTextChanged(); diff --git a/parts/fileview/addfilegroupdlg.h b/parts/fileview/addfilegroupdlg.h index f72a2007..fbc0f6ab 100644 --- a/parts/fileview/addfilegroupdlg.h +++ b/parts/fileview/addfilegroupdlg.h @@ -12,7 +12,7 @@ #ifndef _ADDFILEGROUPDLG_H_ #define _ADDFILEGROUPDLG_H_ -#include <qdialog.h> +#include <tqdialog.h> #include <klineedit.h> class QPushButton; @@ -21,19 +21,19 @@ class AddFileGroupDialog : public QDialog Q_OBJECT public: - AddFileGroupDialog( const QString& old_title="", const QString& old_pattern="", QWidget *parent=0, const char *name=0 ); + AddFileGroupDialog( const TQString& old_title="", const TQString& old_pattern="", TQWidget *parent=0, const char *name=0 ); ~AddFileGroupDialog(); - QString title() const + TQString title() const { return title_edit->text(); } - QString pattern() const + TQString pattern() const { return pattern_edit->text(); } private slots: void slotTextChanged(); private: KLineEdit *title_edit; KLineEdit *pattern_edit; - QPushButton *m_pOk; + TQPushButton *m_pOk; }; #endif diff --git a/parts/fileview/filegroupsconfigwidget.cpp b/parts/fileview/filegroupsconfigwidget.cpp index 28a0441b..c1a4f5bc 100644 --- a/parts/fileview/filegroupsconfigwidget.cpp +++ b/parts/fileview/filegroupsconfigwidget.cpp @@ -11,7 +11,7 @@ #include "filegroupsconfigwidget.h" -#include <qlistview.h> +#include <tqlistview.h> #include <knotifyclient.h> #include <klocale.h> @@ -21,7 +21,7 @@ FileGroupsConfigWidget::FileGroupsConfigWidget(FileGroupsPart *part, - QWidget *parent, const char *name) + TQWidget *parent, const char *name) : FileGroupsConfigWidgetBase(parent, name) { m_part = part; @@ -38,15 +38,15 @@ FileGroupsConfigWidget::~FileGroupsConfigWidget() void FileGroupsConfigWidget::readConfig() { - QDomDocument &dom = *m_part->projectDom(); + TQDomDocument &dom = *m_part->projectDom(); DomUtil::PairList list = DomUtil::readPairListEntry(dom, "/kdevfileview/groups", "group", "name", "pattern"); - QListViewItem *lastItem = 0; + TQListViewItem *lastItem = 0; DomUtil::PairList::ConstIterator it; for (it = list.begin(); it != list.end(); ++it) { - QListViewItem *newItem = new QListViewItem(listview, (*it).first, (*it).second); + TQListViewItem *newItem = new TQListViewItem(listview, (*it).first, (*it).second); if (lastItem) newItem->moveItem(lastItem); lastItem = newItem; @@ -58,7 +58,7 @@ void FileGroupsConfigWidget::storeConfig() { DomUtil::PairList list; - QListViewItem *item = listview->firstChild(); + TQListViewItem *item = listview->firstChild(); while (item) { list << DomUtil::Pair(item->text(0), item->text(1)); item = item->nextSibling(); @@ -76,7 +76,7 @@ void FileGroupsConfigWidget::addGroup() if (!dlg.exec()) return; - (void) new QListViewItem(listview, dlg.title(), dlg.pattern()); + (void) new TQListViewItem(listview, dlg.title(), dlg.pattern()); } @@ -106,7 +106,7 @@ void FileGroupsConfigWidget::moveUp() return; } - QListViewItem *item = listview->firstChild(); + TQListViewItem *item = listview->firstChild(); while (item->nextSibling() != listview->currentItem()) item = item->nextSibling(); item->moveItem(listview->currentItem()); diff --git a/parts/fileview/filegroupsconfigwidget.h b/parts/fileview/filegroupsconfigwidget.h index b9b5c574..7c2759cb 100644 --- a/parts/fileview/filegroupsconfigwidget.h +++ b/parts/fileview/filegroupsconfigwidget.h @@ -22,7 +22,7 @@ class FileGroupsConfigWidget : public FileGroupsConfigWidgetBase Q_OBJECT public: - FileGroupsConfigWidget( FileGroupsPart *widget, QWidget *parent, const char *name=0 ); + FileGroupsConfigWidget( FileGroupsPart *widget, TQWidget *parent, const char *name=0 ); ~FileGroupsConfigWidget(); public slots: diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp index 1c6a5abf..4451ff2a 100644 --- a/parts/fileview/filegroupspart.cpp +++ b/parts/fileview/filegroupspart.cpp @@ -12,9 +12,9 @@ #include "filegroupspart.h" #include "filegroupspart.moc" -#include <qwhatsthis.h> -#include <qvbox.h> -#include <qtimer.h> +#include <tqwhatsthis.h> +#include <tqvbox.h> +#include <tqtimer.h> #include <kaction.h> #include <kdebug.h> #include <kiconloader.h> @@ -36,7 +36,7 @@ typedef KDevGenericFactory<FileGroupsPart> FileGroupsFactory; static const KDevPluginInfo data("kdevfilegroups"); K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( data ) ) -FileGroupsPart::FileGroupsPart(QObject *parent, const char *name, const QStringList &) +FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStringList &) : KDevPlugin(&data, parent, name ? name : "FileGroupsPart") { deleteRequested = false; @@ -45,26 +45,26 @@ FileGroupsPart::FileGroupsPart(QObject *parent, const char *name, const QStringL m_filegroups = new FileGroupsWidget(this); m_filegroups->setCaption(i18n("File Group View")); m_filegroups->setIcon(SmallIcon( info()->icon() ) ); - QWhatsThis::add(m_filegroups, i18n("<b>File group view</b><p>" + TQWhatsThis::add(m_filegroups, i18n("<b>File group view</b><p>" "The file group viewer shows all files of the project, " "in groups which can be configured in project settings dialog, <b>File Groups</b> tab.")); mainWindow()->embedSelectView(m_filegroups, i18n("File Groups"), i18n("File groups in the project directory")); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("File Groups"), FILEGROUPS_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 )) ); // File groups - connect( project(), SIGNAL(addedFilesToProject(const QStringList&)), - m_filegroups, SLOT(addFiles(const QStringList&)) ); - connect( project(), SIGNAL(removedFilesFromProject(const QStringList&)), - m_filegroups, SLOT(removeFiles(const QStringList&)) ); -/* connect( project(), SIGNAL(addedFileToProject(const QString&)), - m_filegroups, SLOT(addFile(const QString&)) ); - connect( project(), SIGNAL(removedFileFromProject(const QString&)), - m_filegroups, SLOT(removeFile(const QString&)) );*/ + connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), + m_filegroups, TQT_SLOT(addFiles(const TQStringList&)) ); + connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), + m_filegroups, TQT_SLOT(removeFiles(const TQStringList&)) ); +/* connect( project(), TQT_SIGNAL(addedFileToProject(const TQString&)), + m_filegroups, TQT_SLOT(addFile(const TQString&)) ); + connect( project(), TQT_SIGNAL(removedFileFromProject(const TQString&)), + m_filegroups, TQT_SLOT(removeFile(const TQString&)) );*/ m_filegroups->refresh(); } @@ -84,14 +84,14 @@ void FileGroupsPart::refresh() // This method may be called from m_filetree's slot, // so we make sure not to modify the list view during // the execution of the slot - QTimer::singleShot(0, m_filegroups, SLOT(refresh())); + TQTimer::singleShot(0, m_filegroups, TQT_SLOT(refresh())); } -void FileGroupsPart::insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int pagenumber ) +void FileGroupsPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber ) { if ( pagenumber == FILEGROUPS_OPTIONS ) { FileGroupsConfigWidget *w = new FileGroupsConfigWidget(this, page, "file groups config widget"); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } } diff --git a/parts/fileview/filegroupspart.h b/parts/fileview/filegroupspart.h index 8e712b4b..22cb055e 100644 --- a/parts/fileview/filegroupspart.h +++ b/parts/fileview/filegroupspart.h @@ -12,7 +12,7 @@ #ifndef _FILEGROUPSPART_H_ #define _FILEGROUPSPART_H_ -#include <qguardedptr.h> +#include <tqguardedptr.h> //#include <kdialogbase.h> #include <configwidgetproxy.h> #include "kdevplugin.h" @@ -25,17 +25,17 @@ class FileGroupsPart : public KDevPlugin Q_OBJECT public: - FileGroupsPart( QObject *parent, const char *name, const QStringList & ); + FileGroupsPart( TQObject *parent, const char *name, const TQStringList & ); ~FileGroupsPart(); public slots: void refresh(); private slots: - void insertConfigWidget( const KDialogBase* dlg, QWidget * page, unsigned int ); + void insertConfigWidget( const KDialogBase* dlg, TQWidget * page, unsigned int ); private: - QGuardedPtr<FileGroupsWidget> m_filegroups; + TQGuardedPtr<FileGroupsWidget> m_filegroups; bool deleteRequested; ConfigWidgetProxy * _configProxy; }; diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp index 9f32460d..a31cb963 100644 --- a/parts/fileview/filegroupswidget.cpp +++ b/parts/fileview/filegroupswidget.cpp @@ -11,12 +11,12 @@ #include "filegroupswidget.h" -#include <qfileinfo.h> -#include <qdir.h> -#include <qheader.h> -#include <qtimer.h> -#include <qvbox.h> -#include <qregexp.h> +#include <tqfileinfo.h> +#include <tqdir.h> +#include <tqheader.h> +#include <tqtimer.h> +#include <tqvbox.h> +#include <tqregexp.h> #include <kdebug.h> #include <kdialogbase.h> @@ -49,53 +49,53 @@ class FileComparator { public: virtual ~FileComparator(){ }; - virtual bool matches(const QString& name) const = 0; + virtual bool matches(const TQString& name) const = 0; }; class RegExpComparator : public FileComparator { public: - RegExpComparator(const QString& pattern) : m_exp(pattern, true, true){ + RegExpComparator(const TQString& pattern) : m_exp(pattern, true, true){ } - bool matches(const QString& name) const{ + bool matches(const TQString& name) const{ return m_exp.exactMatch(name); } private: - const QRegExp m_exp; + const TQRegExp m_exp; }; class EndingComparator : public FileComparator { public: - EndingComparator(const QString& pattern) : m_pattern ( pattern){ + EndingComparator(const TQString& pattern) : m_pattern ( pattern){ } - bool matches(const QString& name) const{ + bool matches(const TQString& name) const{ return name.endsWith(m_pattern); } private: - const QString m_pattern; + const TQString m_pattern; }; class FileViewFolderItem : public QListViewItem { public: - FileViewFolderItem(QListView *parent, const QString &name, const QString &pattern); - bool matches(const QString &fileName); + FileViewFolderItem(TQListView *parent, const TQString &name, const TQString &pattern); + bool matches(const TQString &fileName); private: - QPtrList<FileComparator> m_patterns; + TQPtrList<FileComparator> m_patterns; }; -FileViewFolderItem::FileViewFolderItem(QListView *parent, const QString &name, const QString &pattern) - : QListViewItem(parent, name) +FileViewFolderItem::FileViewFolderItem(TQListView *parent, const TQString &name, const TQString &pattern) + : TQListViewItem(parent, name) { setPixmap(0, SmallIcon("folder")); m_patterns.setAutoDelete(true); - QStringList patternstring = QStringList::split(';', pattern); - QStringList::ConstIterator theend = patternstring.end(); - for (QStringList::ConstIterator ci = patternstring.begin(); ci != theend; ++ci) + TQStringList patternstring = TQStringList::split(';', pattern); + TQStringList::ConstIterator theend = patternstring.end(); + for (TQStringList::ConstIterator ci = patternstring.begin(); ci != theend; ++ci) { - QString pattern = *ci; - QString tail = pattern.right( pattern.length() - 1 ); + TQString pattern = *ci; + TQString tail = pattern.right( pattern.length() - 1 ); if ( (tail).contains('*') || pattern.contains('?') || pattern.contains('[') || pattern.contains(']') ) { @@ -116,13 +116,13 @@ FileViewFolderItem::FileViewFolderItem(QListView *parent, const QString &name, c } -bool FileViewFolderItem::matches(const QString &fileName) +bool FileViewFolderItem::matches(const TQString &fileName) { // Test with the file path, so that "*ClientServer/*.h" patterns work - QString fName = QFileInfo(fileName).filePath(); + TQString fName = TQFileInfo(fileName).filePath(); - QPtrList<FileComparator>::ConstIterator theend = m_patterns.end(); - for (QPtrList<FileComparator>::ConstIterator ci = m_patterns.begin(); ci != theend; ++ci) + TQPtrList<FileComparator>::ConstIterator theend = m_patterns.end(); + for (TQPtrList<FileComparator>::ConstIterator ci = m_patterns.begin(); ci != theend; ++ci) if ((*ci)->matches(fName)) return true; @@ -133,20 +133,20 @@ bool FileViewFolderItem::matches(const QString &fileName) class FileGroupsFileItem : public QListViewItem { public: - FileGroupsFileItem(QListViewItem *parent, const QString &fileName); - QString fileName() const + FileGroupsFileItem(TQListViewItem *parent, const TQString &fileName); + TQString fileName() const { return fullname; } private: - QString fullname; + TQString fullname; }; -FileGroupsFileItem::FileGroupsFileItem(QListViewItem *parent, const QString &fileName) - : QListViewItem(parent), fullname(fileName) +FileGroupsFileItem::FileGroupsFileItem(TQListViewItem *parent, const TQString &fileName) + : TQListViewItem(parent), fullname(fileName) { setPixmap(0, SmallIcon("document")); - QFileInfo fi(fileName); + TQFileInfo fi(fileName); setText(0, fi.fileName()); setText(1, "./" + fi.dirPath()); } @@ -164,33 +164,33 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part) setFocusPolicy(ClickFocus); setRootIsDecorated(true); - setResizeMode(QListView::LastColumn); + setResizeMode(TQListView::LastColumn); setSorting(-1); addColumn(i18n("Name")); setAllColumnsShowFocus( true ); // addColumn(i18n("Location")); - connect( this, SIGNAL(executed(QListViewItem*)), - this, SLOT(slotItemExecuted(QListViewItem*)) ); - connect( this, SIGNAL(returnPressed(QListViewItem*)), - this, SLOT(slotItemExecuted(QListViewItem*)) ); - connect( this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(slotContextMenu(KListView*, QListViewItem*, const QPoint&)) ); + connect( this, TQT_SIGNAL(executed(TQListViewItem*)), + this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), + this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); m_actionToggleShowNonProjectFiles = new KToggleAction( i18n("Show Non Project Files"), KShortcut(), - this, SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" ); + this, TQT_SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" ); m_actionToggleShowNonProjectFiles->setCheckedState(i18n("Hide Non Project Files")); m_actionToggleShowNonProjectFiles->setWhatsThis(i18n("<b>Show non project files</b><p>Shows files that do not belong to a project in a file tree.")); m_actionToggleDisplayLocation = new KToggleAction( i18n("Display Location Column"), KShortcut(), - this, SLOT(slotToggleDisplayLocation()), this, "actiontoggleshowlocation" ); + this, TQT_SLOT(slotToggleDisplayLocation()), this, "actiontoggleshowlocation" ); m_actionToggleDisplayLocation->setWhatsThis(i18n("<b>Display the Location Column</b><p>Displays a column with the location of the files.")); m_part = part; (void) translations; // supress compiler warning - QDomDocument &dom = *m_part->projectDom(); + TQDomDocument &dom = *m_part->projectDom(); m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/kdevfileview/groups/hidenonprojectfiles") ); m_actionToggleDisplayLocation->setChecked( !DomUtil::readBoolEntry(dom, "/kdevfileview/groups/hidenonlocation") ); } @@ -198,13 +198,13 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part) FileGroupsWidget::~FileGroupsWidget() { - QDomDocument &dom = *m_part->projectDom(); + TQDomDocument &dom = *m_part->projectDom(); DomUtil::writeBoolEntry( dom, "/kdevfileview/groups/hidenonprojectfiles", !m_actionToggleShowNonProjectFiles->isChecked() ); DomUtil::writeBoolEntry( dom, "/kdevfileview/groups/hidenonlocation", !m_actionToggleDisplayLocation->isChecked() ); } -void FileGroupsWidget::slotItemExecuted(QListViewItem *item) +void FileGroupsWidget::slotItemExecuted(TQListViewItem *item) { if (!item) return; @@ -222,7 +222,7 @@ void FileGroupsWidget::slotItemExecuted(QListViewItem *item) } -void FileGroupsWidget::slotContextMenu(KListView *, QListViewItem *item, const QPoint &p) +void FileGroupsWidget::slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &p) { KPopupMenu popup(i18n("File Groups"), this); /// @todo Add, remove groups @@ -232,15 +232,15 @@ void FileGroupsWidget::slotContextMenu(KListView *, QListViewItem *item, const Q if (item->parent()) { // Not for group items FileGroupsFileItem *fvfitem = static_cast<FileGroupsFileItem*>(item); - QString pathName = m_part->project()->projectDirectory() + QDir::separator() + fvfitem->fileName(); + TQString pathName = m_part->project()->projectDirectory() + TQDir::separator() + fvfitem->fileName(); KURL::List urls; urls.append(pathName); FileContext context(urls); m_part->core()->fillContextMenu(&popup, &context); } else{ - QStringList file_list; - QListViewItem* i = item->firstChild(); + TQStringList file_list; + TQListViewItem* i = item->firstChild(); while(i){ FileGroupsFileItem *fvgitem = static_cast<FileGroupsFileItem*>(i); file_list << fvgitem->fileName(); @@ -258,21 +258,21 @@ void FileGroupsWidget::slotContextMenu(KListView *, QListViewItem *item, const Q KDialogBase dlg(KDialogBase::TreeList, i18n("Customize File Groups"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, this, "customization dialog"); - QVBox *vbox = dlg.addVBoxPage(i18n("File Groups")); + TQVBox *vbox = dlg.addVBoxPage(i18n("File Groups")); FileGroupsConfigWidget *w = new FileGroupsConfigWidget(m_part, vbox, "file groups config widget"); - connect(&dlg, SIGNAL(okClicked()), w, SLOT(accept())); + connect(&dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); dlg.exec(); } } -QStringList FileGroupsWidget::allFilesRecursively( QString const & dir ) +TQStringList FileGroupsWidget::allFilesRecursively( TQString const & dir ) { - QStringList filelist; - QString reldir = dir.mid( m_part->project()->projectDirectory().length() +1 ); + TQStringList filelist; + TQString reldir = dir.mid( m_part->project()->projectDirectory().length() +1 ); // recursively fetch all files in subdirectories - QStringList subdirs = QDir( dir ).entryList( QDir::Dirs ); - QValueListIterator<QString> it = subdirs.begin(); + TQStringList subdirs = TQDir( dir ).entryList( TQDir::Dirs ); + TQValueListIterator<TQString> it = subdirs.begin(); while ( it != subdirs.end() ) { if ( *it != "." && *it != ".." ) @@ -283,8 +283,8 @@ QStringList FileGroupsWidget::allFilesRecursively( QString const & dir ) } // append the project relative directory path to all files in the current directory - QStringList dirlist = QDir( dir ).entryList( QDir::Files ); - QValueListIterator<QString> itt = dirlist.begin(); + TQStringList dirlist = TQDir( dir ).entryList( TQDir::Files ); + TQValueListIterator<TQString> itt = dirlist.begin(); while ( itt != dirlist.end() ) { if ( reldir.isEmpty() ) @@ -316,7 +316,7 @@ void FileGroupsWidget::refresh() if (LocationID!=-1) removeColumn(LocationID); } - QDomDocument &dom = *m_part->projectDom(); + TQDomDocument &dom = *m_part->projectDom(); DomUtil::PairList list = DomUtil::readPairListEntry(dom, "/kdevfileview/groups", "group", "name", "pattern"); @@ -330,7 +330,7 @@ void FileGroupsWidget::refresh() lastGroup = newItem; } - QStringList allFiles; + TQStringList allFiles; if (m_actionToggleShowNonProjectFiles->isChecked()) { // get all files in the project directory allFiles = allFilesRecursively( m_part->project()->projectDirectory() ); @@ -339,9 +339,9 @@ void FileGroupsWidget::refresh() // get all project files allFiles = m_part->project()->allFiles(); } - QStringList::ConstIterator fit; + TQStringList::ConstIterator fit; for (fit = allFiles.begin(); fit != allFiles.end(); ++fit) { - QListViewItem *item = firstChild(); + TQListViewItem *item = firstChild(); while (item) { FileViewFolderItem *fvgitem = static_cast<FileViewFolderItem*>(item); if (fvgitem->matches(*fit)) { @@ -352,7 +352,7 @@ void FileGroupsWidget::refresh() } } - QListViewItem *item = firstChild(); + TQListViewItem *item = firstChild(); while (item) { item->sortChildItems(0, true); item = item->nextSibling(); @@ -360,16 +360,16 @@ void FileGroupsWidget::refresh() } -void FileGroupsWidget::addFile(const QString &fileName) +void FileGroupsWidget::addFile(const TQString &fileName) { kdDebug(9017) << "FileView add " << fileName << endl; - QListViewItem *item = firstChild(); + TQListViewItem *item = firstChild(); while (item) { FileViewFolderItem *fvgitem = static_cast<FileViewFolderItem*>(item); if (fvgitem->matches(fileName)) { - QString f = fileName; + TQString f = fileName; if (fileName.contains(m_part->project()->projectDirectory())) f = fileName.mid(m_part->project()->projectDirectory().length()+1); (void) new FileGroupsFileItem(fvgitem, f); @@ -380,9 +380,9 @@ void FileGroupsWidget::addFile(const QString &fileName) } } -void FileGroupsWidget::addFiles ( const QStringList& fileList ) +void FileGroupsWidget::addFiles ( const TQStringList& fileList ) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { @@ -391,15 +391,15 @@ void FileGroupsWidget::addFiles ( const QStringList& fileList ) sort(); } -void FileGroupsWidget::removeFile(const QString &fileName) +void FileGroupsWidget::removeFile(const TQString &fileName) { kdDebug(9017) << "FileView remove " << fileName << endl; - QListViewItem *item = firstChild(); + TQListViewItem *item = firstChild(); while (item) { FileViewFolderItem *fvgitem = static_cast<FileViewFolderItem*>(item); - QListViewItem *childItem = fvgitem->firstChild(); + TQListViewItem *childItem = fvgitem->firstChild(); while (childItem) { FileGroupsFileItem *fgfitem = static_cast<FileGroupsFileItem*>(childItem); @@ -417,9 +417,9 @@ void FileGroupsWidget::removeFile(const QString &fileName) } } -void FileGroupsWidget::removeFiles ( const QStringList& fileList ) +void FileGroupsWidget::removeFiles ( const TQStringList& fileList ) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { diff --git a/parts/fileview/filegroupswidget.h b/parts/fileview/filegroupswidget.h index 7bdbf78b..cd7b2f63 100644 --- a/parts/fileview/filegroupswidget.h +++ b/parts/fileview/filegroupswidget.h @@ -28,21 +28,21 @@ public: public slots: void refresh(); - void addFiles ( const QStringList& fileList ); - void removeFiles ( const QStringList& fileList ); + void addFiles ( const TQStringList& fileList ); + void removeFiles ( const TQStringList& fileList ); private slots: - void slotItemExecuted(QListViewItem *item); - void slotContextMenu(KListView *, QListViewItem *item, const QPoint &p); + void slotItemExecuted(TQListViewItem *item); + void slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &p); void slotToggleShowNonProjectFiles(); void slotToggleDisplayLocation(); protected: - void addFile(const QString &fileName); - void removeFile(const QString &fileName); + void addFile(const TQString &fileName); + void removeFile(const TQString &fileName); private: - QStringList allFilesRecursively( QString const & ); + TQStringList allFilesRecursively( TQString const & ); FileGroupsPart *m_part; class KToggleAction *m_actionToggleShowNonProjectFiles; diff --git a/parts/fileview/fileitemfactory.cpp b/parts/fileview/fileitemfactory.cpp index 614f535c..3ccf5921 100644 --- a/parts/fileview/fileitemfactory.cpp +++ b/parts/fileview/fileitemfactory.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include <qpainter.h> +#include <tqpainter.h> #include <kdebug.h> #include "filetreewidget.h" @@ -23,7 +23,7 @@ using namespace filetreeview; FileTreeWidget* FileTreeViewItem::listView() const { - return static_cast<FileTreeWidget*>( QListViewItem::listView() ); + return static_cast<FileTreeWidget*>( TQListViewItem::listView() ); } /////////////////////////////////////////////////////////////////////////////// @@ -41,7 +41,7 @@ void FileTreeViewItem::hideOrShow() } } -bool FileTreeViewItem::changeActiveDir( const QString& olddir, const QString& newdir, bool foundolddir, bool foundnewdir ) +bool FileTreeViewItem::changeActiveDir( const TQString& olddir, const TQString& newdir, bool foundolddir, bool foundnewdir ) { kdDebug( 9017 ) << "FileTreeViewItem::changeActiveDir(): " + olddir << " new: " << newdir << " for: " << path() << endl; @@ -77,7 +77,7 @@ bool FileTreeViewItem::changeActiveDir( const QString& olddir, const QString& ne /////////////////////////////////////////////////////////////////////////////// -bool FileTreeViewItem::setProjectFile( QString const & path, bool pf ) +bool FileTreeViewItem::setProjectFile( TQString const & path, bool pf ) { if ( this->path() == path && isProjectFile() != pf ) @@ -102,30 +102,30 @@ bool FileTreeViewItem::setProjectFile( QString const & path, bool pf ) /////////////////////////////////////////////////////////////////////////////// -void FileTreeViewItem::paintCell(QPainter *p, const QColorGroup &cg, +void FileTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { if ( listView()->showNonProjectFiles() && isProjectFile() ) { - QFont font( p->font() ); + TQFont font( p->font() ); font.setBold( true ); p->setFont( font ); } if( isActiveDir() ) { - QFont font( p->font() ); + TQFont font( p->font() ); font.setItalic( true ); p->setFont( font ); } - QListViewItem::paintCell( p, cg, column, width, alignment ); + TQListViewItem::paintCell( p, cg, column, width, alignment ); } /////////////////////////////////////////////////////////////////////////////// -int FileTreeViewItem::compare( QListViewItem *i, int col, bool ascending ) const +int FileTreeViewItem::compare( TQListViewItem *i, int col, bool ascending ) const { KFileTreeViewItem* rhs = dynamic_cast<KFileTreeViewItem*>( i ); if (rhs) @@ -137,7 +137,7 @@ int FileTreeViewItem::compare( QListViewItem *i, int col, bool ascending ) const return (ascending) ? -1 : 1; } - return QListViewItem::compare( i, col, ascending ); + return TQListViewItem::compare( i, col, ascending ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/parts/fileview/fileitemfactory.h b/parts/fileview/fileitemfactory.h index f87ae39a..065591d7 100644 --- a/parts/fileview/fileitemfactory.h +++ b/parts/fileview/fileitemfactory.h @@ -41,16 +41,16 @@ namespace filetreeview virtual ~FileTreeViewItem() {} public: - virtual void paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int alignment ); + virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ); FileTreeWidget* listView() const; void hideOrShow(); bool isProjectFile() const { return m_isProjectFile; } - bool setProjectFile( QString const &path, bool pf ); + bool setProjectFile( TQString const &path, bool pf ); bool isActiveDir() const { return m_isActiveDir; } - bool changeActiveDir( const QString &, const QString&, bool foundolddir = false, bool foundnewdir = false ); + bool changeActiveDir( const TQString &, const TQString&, bool foundolddir = false, bool foundnewdir = false ); protected: - virtual int compare( QListViewItem *i, int col, bool ascending ) const; + virtual int compare( TQListViewItem *i, int col, bool ascending ) const; private: bool m_isProjectFile; @@ -63,7 +63,7 @@ namespace filetreeview class FileTreeBranchItem : public KFileTreeBranch { protected: - FileTreeBranchItem( KFileTreeView* view, const KURL& url, const QString& name, const QPixmap& pix ) + FileTreeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix ) : KFileTreeBranch( view, url, name, pix, false, new FileTreeViewItem( view, new KFileItem( url, "inode/directory", S_IFDIR ), this ) ) { @@ -82,7 +82,7 @@ namespace filetreeview class BranchItemFactory { public: - virtual FileTreeBranchItem *makeBranchItem( KFileTreeView* view, const KURL& url, const QString& name, const QPixmap& pix ) = 0; + virtual FileTreeBranchItem *makeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix ) = 0; }; } diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp index 9e40a3bb..02b7be86 100644 --- a/parts/fileview/filetreeviewwidgetimpl.cpp +++ b/parts/fileview/filetreeviewwidgetimpl.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include <qpopupmenu.h> +#include <tqpopupmenu.h> #include <kxmlguiclient.h> #include <kdebug.h> #include <kaction.h> @@ -31,19 +31,19 @@ using namespace filetreeview; /////////////////////////////////////////////////////////////////////////////// FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *parent, const char *name ) - : QObject( parent, name ), m_branchItemFactory( 0 ), + : TQObject( parent, name ), m_branchItemFactory( 0 ), m_part( parent->part() ), m_isReloadingTree( false ) { kdDebug(9017) << "FileTreeViewWidgetImpl::FileTreeViewWidgetImpl()" << endl; // Actions m_actionToggleShowNonProjectFiles = new KToggleAction( i18n("Show Non Project Files"), KShortcut(), - this, SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" ); + this, TQT_SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" ); m_actionToggleShowNonProjectFiles->setCheckedState(i18n("Hide Non Project Files")); m_actionToggleShowNonProjectFiles->setWhatsThis(i18n("<b>Show non project files</b><p>Shows files that do not belong to a project in a file tree.")); // Reload good ol' settings - QDomDocument &dom = *m_part->projectDom(); + TQDomDocument &dom = *m_part->projectDom(); m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/kdevfileview/tree/hidenonprojectfiles") ); } @@ -55,7 +55,7 @@ FileTreeViewWidgetImpl::~FileTreeViewWidgetImpl() delete m_branchItemFactory; - QDomDocument &dom = *m_part->projectDom(); + TQDomDocument &dom = *m_part->projectDom(); DomUtil::writeBoolEntry( dom, "/kdevfileview/tree/hidenonprojectfiles", !showNonProjectFiles() ); } @@ -68,14 +68,14 @@ FileTreeWidget *FileTreeViewWidgetImpl::fileTree() const /////////////////////////////////////////////////////////////////////////////// -QDomDocument &FileTreeViewWidgetImpl::projectDom() const +TQDomDocument &FileTreeViewWidgetImpl::projectDom() const { return *part()->projectDom(); } /////////////////////////////////////////////////////////////////////////////// -QString FileTreeViewWidgetImpl::projectDirectory() const +TQString FileTreeViewWidgetImpl::projectDirectory() const { return part()->project()->projectDirectory(); } @@ -89,14 +89,14 @@ bool FileTreeViewWidgetImpl::showNonProjectFiles() const /////////////////////////////////////////////////////////////////////////////// -void FileTreeViewWidgetImpl::fillPopupMenu( QPopupMenu *popupMenu, QListViewItem *item ) const +void FileTreeViewWidgetImpl::fillPopupMenu( TQPopupMenu *popupMenu, TQListViewItem *item ) const { // Show the "reload tree" menu-item only if it is requested for the root object // and we don't have a sync-with-repository operation pending (which otherwise will // kill the call-back's from working) if (item == fileTree()->firstChild() && canReloadTree()) { - int id = popupMenu->insertItem( i18n( "Reload Tree"), this, SLOT( slotReloadTree() ) ); + int id = popupMenu->insertItem( i18n( "Reload Tree"), this, TQT_SLOT( slotReloadTree() ) ); popupMenu->setWhatsThis( id, i18n("<b>Reload tree</b><p>Reloads the project files tree.") ); } @@ -111,8 +111,8 @@ KURL::List FileTreeViewWidgetImpl::selectedPathUrls() KURL::List urlList; - QValueList<QListViewItem*> list = allSelectedItems( fileTree()->firstChild() ); - QValueList<QListViewItem*>::Iterator it = list.begin(); + TQValueList<TQListViewItem*> list = allSelectedItems( fileTree()->firstChild() ); + TQValueList<TQListViewItem*>::Iterator it = list.begin(); while( it != list.end() ) { FileTreeViewItem * item = static_cast<FileTreeViewItem*>( *it ); @@ -130,9 +130,9 @@ KURL::List FileTreeViewWidgetImpl::selectedPathUrls() /////////////////////////////////////////////////////////////////////////////// -QValueList<QListViewItem*> FileTreeViewWidgetImpl::allSelectedItems( QListViewItem * item ) const +TQValueList<TQListViewItem*> FileTreeViewWidgetImpl::allSelectedItems( TQListViewItem * item ) const { - QValueList<QListViewItem*> list; + TQValueList<TQListViewItem*> list; if ( item ) { @@ -141,7 +141,7 @@ QValueList<QListViewItem*> FileTreeViewWidgetImpl::allSelectedItems( QListViewIt list << item; } - QListViewItem * it = item->firstChild(); + TQListViewItem * it = item->firstChild(); while( it ) { list += allSelectedItems( it ); diff --git a/parts/fileview/filetreeviewwidgetimpl.h b/parts/fileview/filetreeviewwidgetimpl.h index fae4b248..52a95fc1 100644 --- a/parts/fileview/filetreeviewwidgetimpl.h +++ b/parts/fileview/filetreeviewwidgetimpl.h @@ -12,10 +12,10 @@ #ifndef FILETREEVIEWWIDGETIMPL_H #define FILETREEVIEWWIDGETIMPL_H -#include <qobject.h> -#include <qvaluelist.h> +#include <tqobject.h> +#include <tqvaluelist.h> #include <kfiletreeview.h> -#include <qdom.h> +#include <tqdom.h> #include "fileitemfactory.h" @@ -47,8 +47,8 @@ public: KURL::List selectedPathUrls(); // shortcuts FileTreeWidget *fileTree() const; - QDomDocument &projectDom() const; - QHeader *header() const { return fileTree()->header(); } + TQDomDocument &projectDom() const; + TQHeader *header() const { return fileTree()->header(); } void setColumnWidth( int column, int w ) { fileTree()->setColumnWidth( column, w ); } int contentsWidth() const { return fileTree()->contentsWidth(); } void triggerUpdate() { fileTree()->triggerUpdate(); } @@ -68,9 +68,9 @@ public: * Here the popup menu is filled: by standard only the "reload tree" (only if the above function * returns true) and "show project files" options are added * @param popupMenu the menu to fill - * @param item the QListViewItem which this menu has been requested upon + * @param item the TQListViewItem which this menu has been requested upon */ - virtual void fillPopupMenu( QPopupMenu *popupMenu, QListViewItem *item ) const; + virtual void fillPopupMenu( TQPopupMenu *popupMenu, TQListViewItem *item ) const; /** * @return true if non project files are to be shown, false otherwise */ @@ -89,10 +89,10 @@ private slots: protected: void setBranchItemFactory( filetreeview::BranchItemFactory *aFactory ) { m_branchItemFactory = aFactory; } - QString projectDirectory() const; + TQString projectDirectory() const; private: - QValueList<QListViewItem*> allSelectedItems( QListViewItem * item ) const; + TQValueList<TQListViewItem*> allSelectedItems( TQListViewItem * item ) const; filetreeview::BranchItemFactory *m_branchItemFactory; FileViewPart *m_part; diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp index e0d7538b..6f049370 100644 --- a/parts/fileview/filetreewidget.cpp +++ b/parts/fileview/filetreewidget.cpp @@ -13,11 +13,11 @@ #include "filetreewidget.h" -#include <qheader.h> -#include <qpainter.h> -#include <qregexp.h> -#include <qstringlist.h> -#include <qcolor.h> +#include <tqheader.h> +#include <tqpainter.h> +#include <tqregexp.h> +#include <tqstringlist.h> +#include <tqcolor.h> #include <kdebug.h> #include <klocale.h> @@ -51,7 +51,7 @@ using namespace filetreeview; // class FileTreeWidget /////////////////////////////////////////////////////////////////////////////// -FileTreeWidget::FileTreeWidget( FileViewPart *part, QWidget *parent, KDevVCSFileInfoProvider *infoProvider ) +FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider ) : KFileTreeView( parent, "filetreewidget" ), m_part( part ), m_rootBranch( 0 ) { kdDebug(9017) << "Requested FileTree for: " << projectDirectory() << endl; @@ -63,32 +63,32 @@ FileTreeWidget::FileTreeWidget( FileViewPart *part, QWidget *parent, KDevVCSFile else m_impl = new StdFileTreeWidgetImpl( this ); - //setResizeMode( QListView::LastColumn ); + //setResizeMode( TQListView::LastColumn ); setSorting( 0 ); setAllColumnsShowFocus( true ); - setSelectionMode( QListView::Extended ); // Enable multiple items selection by use of Ctrl/Shift + setSelectionMode( TQListView::Extended ); // Enable multiple items selection by use of Ctrl/Shift setDragEnabled( false ); // Slot connections - connect( this, SIGNAL(executed(QListViewItem*)), this, SLOT(slotItemExecuted(QListViewItem*)) ); - connect( this, SIGNAL(returnPressed(QListViewItem*)), this, SLOT(slotItemExecuted(QListViewItem*)) ); - connect( this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(slotContextMenu(KListView*, QListViewItem*, const QPoint&)) ); + connect( this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); // Intercepts KDevelop core signals and VCS notifications (if available) - connect( m_part->project(), SIGNAL( activeDirectoryChanged( const QString&, const QString& ) ), - this, SLOT( changeActiveDirectory( const QString&, const QString& ) ) ); - connect( m_part->project(), SIGNAL( addedFilesToProject( const QStringList & ) ), - this, SLOT( addProjectFiles( const QStringList & ) ) ); - connect( m_part->project(), SIGNAL( removedFilesFromProject( const QStringList & ) ), - this, SLOT( removeProjectFiles( const QStringList & ) ) ); + connect( m_part->project(), TQT_SIGNAL( activeDirectoryChanged( const TQString&, const TQString& ) ), + this, TQT_SLOT( changeActiveDirectory( const TQString&, const TQString& ) ) ); + connect( m_part->project(), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ), + this, TQT_SLOT( addProjectFiles( const TQStringList & ) ) ); + connect( m_part->project(), TQT_SIGNAL( removedFilesFromProject( const TQStringList & ) ), + this, TQT_SLOT( removeProjectFiles( const TQStringList & ) ) ); // Safeguard against VCS plug-in unloading at run-time - connect( m_impl, SIGNAL(implementationInvalidated()), this, SLOT(slotImplementationInvalidated()) ); + connect( m_impl, TQT_SIGNAL(implementationInvalidated()), this, TQT_SLOT(slotImplementationInvalidated()) ); // Hide pattern for files - QDomDocument &dom = *m_part->projectDom(); - QString defaultHidePattern = "*.o,*.lo,CVS"; - QString hidePattern = DomUtil::readEntry( dom, "/kdevfileview/tree/hidepatterns", defaultHidePattern ); - m_hidePatterns = QStringList::split( ",", hidePattern ); + TQDomDocument &dom = *m_part->projectDom(); + TQString defaultHidePattern = "*.o,*.lo,CVS"; + TQString hidePattern = DomUtil::readEntry( dom, "/kdevfileview/tree/hidepatterns", defaultHidePattern ); + m_hidePatterns = TQStringList::split( ",", hidePattern ); } /////////////////////////////////////////////////////////////////////////////// @@ -97,7 +97,7 @@ FileTreeWidget::~FileTreeWidget() { kdDebug(9017) << "FileTreeWidget::~FileTreeWidget()" << endl; - QDomDocument &dom = *m_part->projectDom(); + TQDomDocument &dom = *m_part->projectDom(); DomUtil::writeEntry( dom, "/kdevfileview/tree/hidepatterns", hidePatterns() ); // delete m_impl; @@ -105,14 +105,14 @@ FileTreeWidget::~FileTreeWidget() /////////////////////////////////////////////////////////////////////////////// -void FileTreeWidget::openDirectory( const QString& dirName ) +void FileTreeWidget::openDirectory( const TQString& dirName ) { kdDebug(9017) << "FileTreeWidget::openDirectory(): " + dirName << endl; // if we're reloading if (m_rootBranch) { - disconnect( m_rootBranch, SIGNAL(populateFinished(KFileTreeViewItem*)), this, SLOT(finishPopulate(KFileTreeViewItem*)) ); + disconnect( m_rootBranch, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)), this, TQT_SLOT(finishPopulate(KFileTreeViewItem*)) ); removeBranch( m_rootBranch ); m_projectFiles.clear(); } @@ -120,7 +120,7 @@ void FileTreeWidget::openDirectory( const QString& dirName ) addProjectFiles( m_part->project()->allFiles(), true ); KURL url = KURL::fromPathOrURL( dirName ); - const QPixmap& pix = KMimeType::mimeType("inode/directory")->pixmap( KIcon::Small ); + const TQPixmap& pix = KMimeType::mimeType("inode/directory")->pixmap( KIcon::Small ); // this is a bit odd, but the order of these calls seems to be important //FileTreeBranch *b = new FileTreeBranch( this, url, url.prettyURL(), pix ); @@ -128,7 +128,7 @@ void FileTreeWidget::openDirectory( const QString& dirName ) b->setChildRecurse( false ); m_rootBranch = addBranch( b ); m_rootBranch->setOpen( true ); - connect( m_rootBranch, SIGNAL(populateFinished(KFileTreeViewItem*)), this, SLOT(finishPopulate(KFileTreeViewItem*)) ); + connect( m_rootBranch, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)), this, TQT_SLOT(finishPopulate(KFileTreeViewItem*)) ); } /////////////////////////////////////////////////////////////////////////////// @@ -142,11 +142,11 @@ bool FileTreeWidget::shouldBeShown( KFileTreeViewItem* item ) /////////////////////////////////////////////////////////////////////////////// -bool FileTreeWidget::matchesHidePattern(const QString &fileName) +bool FileTreeWidget::matchesHidePattern(const TQString &fileName) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = m_hidePatterns.begin(); it != m_hidePatterns.end(); ++it) { - QRegExp re(*it, true, true); + TQRegExp re(*it, true, true); if (re.search(fileName) == 0 && (uint)re.matchedLength() == fileName.length()) return true; } @@ -184,7 +184,7 @@ void FileTreeWidget::finishPopulate(KFileTreeViewItem* item) /////////////////////////////////////////////////////////////////////////////// -void FileTreeWidget::slotItemExecuted( QListViewItem* item ) +void FileTreeWidget::slotItemExecuted( TQListViewItem* item ) { if (!item) return; @@ -199,7 +199,7 @@ void FileTreeWidget::slotItemExecuted( QListViewItem* item ) /////////////////////////////////////////////////////////////////////////////// -void FileTreeWidget::slotContextMenu( KListView *, QListViewItem* item, const QPoint &p ) +void FileTreeWidget::slotContextMenu( KListView *, TQListViewItem* item, const TQPoint &p ) { kdDebug(9017) << "FileTreeWidget::slotContextMenu(...)" << endl; @@ -219,7 +219,7 @@ void FileTreeWidget::slotContextMenu( KListView *, QListViewItem* item, const QP /////////////////////////////////////////////////////////////////////////////// -QString FileTreeWidget::projectDirectory() +TQString FileTreeWidget::projectDirectory() { return m_part->project()->projectDirectory(); } @@ -231,7 +231,7 @@ QString FileTreeWidget::projectDirectory() * * @param fileName or directory to test for presence. */ -bool FileTreeWidget::isInProject(const QString &fileName) const +bool FileTreeWidget::isInProject(const TQString &fileName) const { return m_projectFiles.contains(fileName); } @@ -250,22 +250,22 @@ bool FileTreeWidget::isInProject(const QString &fileName) const * * @see m_projectFiles */ -void FileTreeWidget::addProjectFiles( QStringList const & fileList, bool constructing ) +void FileTreeWidget::addProjectFiles( TQStringList const & fileList, bool constructing ) { kdDebug(9017) << "files added to project: " << fileList << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { if( (*it).isEmpty() ) continue; kdDebug(9017) << "adding file: " << *it << endl; - const QString file = projectDirectory() + "/" + ( *it ); + const TQString file = projectDirectory() + "/" + ( *it ); if ( !m_projectFiles.contains( file ) ) { // We got a new file to add to this project. // Ensure all the parent directories are part of the project set, too. - QStringList paths = QStringList::split( "/", *it); + TQStringList paths = TQStringList::split( "/", *it); paths.pop_back(); while( !paths.isEmpty() ) { @@ -274,7 +274,7 @@ void FileTreeWidget::addProjectFiles( QStringList const & fileList, bool constru // Whenever we find out that a directory is already recorded as part of our project, // we may stop adding, because its parent directories were already added - // in some previous addition. - QString joinedPaths = paths.join("/"); + TQString joinedPaths = paths.join("/"); if( m_projectFiles.contains( joinedPaths ) ) break; m_projectFiles.insert( projectDirectory() + "/" + joinedPaths, true ); @@ -297,14 +297,14 @@ void FileTreeWidget::addProjectFiles( QStringList const & fileList, bool constru /////////////////////////////////////////////////////////////////////////////// -void FileTreeWidget::removeProjectFiles( QStringList const & fileList ) +void FileTreeWidget::removeProjectFiles( TQStringList const & fileList ) { kdDebug(9017) << "files removed from project: " << fileList.count() << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { - QString file = m_part->project()->projectDirectory() + "/" + ( *it ); + TQString file = m_part->project()->projectDirectory() + "/" + ( *it ); m_projectFiles.remove( file ); kdDebug(9017) << "file removed: " << file << endl; @@ -316,7 +316,7 @@ void FileTreeWidget::removeProjectFiles( QStringList const & fileList ) } } -void FileTreeWidget::changeActiveDirectory( const QString& olddir, const QString& newdir ) +void FileTreeWidget::changeActiveDirectory( const TQString& olddir, const TQString& newdir ) { FileTreeViewItem* item = static_cast<FileTreeViewItem*>(firstChild()); if( item ) @@ -327,15 +327,15 @@ void FileTreeWidget::changeActiveDirectory( const QString& olddir, const QString /////////////////////////////////////////////////////////////////////////////// -void FileTreeWidget::applyHidePatterns( const QString &hidePatterns ) +void FileTreeWidget::applyHidePatterns( const TQString &hidePatterns ) { - m_hidePatterns = QStringList::split( ",", hidePatterns ); + m_hidePatterns = TQStringList::split( ",", hidePatterns ); hideOrShow(); } /////////////////////////////////////////////////////////////////////////////// -QString FileTreeWidget::hidePatterns() const +TQString FileTreeWidget::hidePatterns() const { return m_hidePatterns.join( "," ); } diff --git a/parts/fileview/filetreewidget.h b/parts/fileview/filetreewidget.h index 53dc77d3..f9608029 100644 --- a/parts/fileview/filetreewidget.h +++ b/parts/fileview/filetreewidget.h @@ -14,7 +14,7 @@ #ifndef _FILETREEWIDGET_H_ #define _FILETREEWIDGET_H_ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kfiletreeview.h> #include <kdevversioncontrol.h> @@ -48,20 +48,20 @@ class FileTreeWidget : public KFileTreeView { Q_OBJECT public: - FileTreeWidget( FileViewPart *part, QWidget *parent, KDevVCSFileInfoProvider *infoProvider ); + FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider ); virtual ~FileTreeWidget(); - void openDirectory(const QString &dirName); + void openDirectory(const TQString &dirName); bool shouldBeShown( KFileTreeViewItem* item ); - QString projectDirectory(); - bool isInProject(const QString &fileName) const; + TQString projectDirectory(); + bool isInProject(const TQString &fileName) const; FileViewPart *part() const { return m_part; } //KDevVCSFileInfoProvider *vcsFileInfoProvider() const; - void applyHidePatterns( const QString &hidePatterns ); - QString hidePatterns() const; + void applyHidePatterns( const TQString &hidePatterns ); + TQString hidePatterns() const; bool showNonProjectFiles() const; @@ -70,23 +70,23 @@ public slots: private slots: - void slotItemExecuted(QListViewItem *item); - void slotContextMenu(KListView *, QListViewItem *item, const QPoint &p); + void slotItemExecuted(TQListViewItem *item); + void slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &p); - void changeActiveDirectory( const QString&, const QString& ); + void changeActiveDirectory( const TQString&, const TQString& ); void finishPopulate(KFileTreeViewItem* item); - void addProjectFiles( QStringList const & fileList, bool constructing = false ); - void removeProjectFiles( QStringList const & fileList ); + void addProjectFiles( TQStringList const & fileList, bool constructing = false ); + void removeProjectFiles( TQStringList const & fileList ); //! We must guard against unloading the used VCS plug-in when using it: we //! fall back to the implementation (a file view without VCS fields, only filenames) void slotImplementationInvalidated(); private: - bool matchesHidePattern(const QString &fileName); + bool matchesHidePattern(const TQString &fileName); KDevVersionControl *versionControl() const; - QStringList m_hidePatterns; + TQStringList m_hidePatterns; /** * @brief Set of all the files in this project. * @@ -99,13 +99,13 @@ private: * but rather a map with next-to-useless element value, * keyed by names of files. * QT3 does not seem to have a set datatype, - * thus we use the QMap type instead. + * thus we use the TQMap type instead. */ - QMap<QString, bool> m_projectFiles; + TQMap<TQString, bool> m_projectFiles; FileViewPart *m_part; KFileTreeBranch *m_rootBranch; - QGuardedPtr<FileTreeViewWidgetImpl> m_impl; + TQGuardedPtr<FileTreeViewWidgetImpl> m_impl; }; #endif diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp index d6d6691d..0e3758c9 100644 --- a/parts/fileview/fileviewpart.cpp +++ b/parts/fileview/fileviewpart.cpp @@ -13,12 +13,12 @@ #include "fileviewpart.h" -#include <qwhatsthis.h> -#include <qvbox.h> -#include <qtoolbutton.h> -#include <qdom.h> +#include <tqwhatsthis.h> +#include <tqvbox.h> +#include <tqtoolbutton.h> +#include <tqdom.h> #include <kcombobox.h> -#include <qtimer.h> +#include <tqtimer.h> #include <kaction.h> #include <kdebug.h> #include <kiconloader.h> @@ -57,7 +57,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( data ) ) // class FileTreeWidget /////////////////////////////////////////////////////////////////////////////// -FileViewPart::FileViewPart(QObject *parent, const char *name, const QStringList &) +FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringList &) : KDevPlugin(&data, parent, name ? name : "FileViewPart"), m_widget( 0 ) { @@ -66,10 +66,10 @@ FileViewPart::FileViewPart(QObject *parent, const char *name, const QStringList _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("File Tree"), FILETREE_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 )) ); - QTimer::singleShot( 1000, this, SLOT(init()) ); + TQTimer::singleShot( 1000, this, TQT_SLOT(init()) ); } /////////////////////////////////////////////////////////////////////////////// @@ -102,15 +102,15 @@ FileViewPart::~FileViewPart() void FileViewPart::loadSettings() { - const QColor added = QColor( "#CCFF99" ), - updated = QColor( "#FFFFCC" ), - modified = QColor( "#CCCCFF" ), - conflict = QColor( "#FF6666" ), - sticky = QColor( "#FFCCCC" ), - needsPatch = QColor( "#FFCCFF" ), - needsCheckout = QColor( "#FFCCFF" ), - unknown = QColor( white ), - defaultColor = QColor( white ); + const TQColor added = TQColor( "#CCFF99" ), + updated = TQColor( "#FFFFCC" ), + modified = TQColor( "#CCCCFF" ), + conflict = TQColor( "#FF6666" ), + sticky = TQColor( "#FFCCCC" ), + needsPatch = TQColor( "#FFCCFF" ), + needsCheckout = TQColor( "#FFCCFF" ), + unknown = TQColor( white ), + defaultColor = TQColor( white ); KConfig *cfg = instance()->config(); @@ -144,12 +144,12 @@ void FileViewPart::storeSettings() cfg->writeEntry( "DefaultColor", vcsColors.defaultColor ); } -void FileViewPart::insertConfigWidget( const KDialogBase* dlg, QWidget * page, unsigned int pagenumber ) +void FileViewPart::insertConfigWidget( const KDialogBase* dlg, TQWidget * page, unsigned int pagenumber ) { if ( pagenumber == FILETREE_OPTIONS ) { VCSColorsConfigWidget *w = new VCSColorsConfigWidget( this, vcsColors, page, "vcscolorsconfigwidget" ); - connect( dlg, SIGNAL(okClicked()), w, SLOT(slotAccept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); } } diff --git a/parts/fileview/fileviewpart.h b/parts/fileview/fileviewpart.h index 9c9a03da..01f84d32 100644 --- a/parts/fileview/fileviewpart.h +++ b/parts/fileview/fileviewpart.h @@ -12,7 +12,7 @@ #ifndef _FILEVIEWPART_H_ #define _FILEVIEWPART_H_ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <configwidgetproxy.h> #include "kdevplugin.h" #include "vcscolorsconfigwidget.h" @@ -26,7 +26,7 @@ class FileViewPart : public KDevPlugin Q_OBJECT public: - FileViewPart( QObject *parent, const char *name, const QStringList & ); + FileViewPart( TQObject *parent, const char *name, const TQStringList & ); virtual ~FileViewPart(); //! Colors to use for VCS visual feed-back @@ -35,14 +35,14 @@ public: KDevVersionControl *versionControl(); private slots: - void insertConfigWidget( const KDialogBase* dlg, QWidget * page, unsigned int ); + void insertConfigWidget( const KDialogBase* dlg, TQWidget * page, unsigned int ); void init(); private: void loadSettings(); void storeSettings(); - QGuardedPtr<PartWidget> m_widget; + TQGuardedPtr<PartWidget> m_widget; ConfigWidgetProxy * _configProxy; }; diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp index b3f9baf0..db921fb1 100644 --- a/parts/fileview/partwidget.cpp +++ b/parts/fileview/partwidget.cpp @@ -10,11 +10,11 @@ ***************************************************************************/ #include "partwidget.h" -#include <qwhatsthis.h> -#include <qvbox.h> -#include <qlayout.h> -#include <qtoolbutton.h> -#include <qdom.h> +#include <tqwhatsthis.h> +#include <tqvbox.h> +#include <tqlayout.h> +#include <tqtoolbutton.h> +#include <tqdom.h> #include <kxmlguiclient.h> #include <kcombobox.h> #include <kaction.h> @@ -34,8 +34,8 @@ // class PartWidget /////////////////////////////////////////////////////////////////////////////// -PartWidget::PartWidget( FileViewPart *part, QWidget *parent ) - : QVBox( parent, "fileviewpartwidget" ), m_filetree( 0 ), +PartWidget::PartWidget( FileViewPart *part, TQWidget *parent ) + : TQVBox( parent, "fileviewpartwidget" ), m_filetree( 0 ), m_filter( 0 ), m_btnFilter( 0 ), m_part( part ) { Q_ASSERT( part && parent ); @@ -48,29 +48,29 @@ PartWidget::PartWidget( FileViewPart *part, QWidget *parent ) setCaption(i18n("File Tree")); m_filetree->setCaption(i18n("File Tree")); m_filetree->setIcon(SmallIcon("folder")); - QWhatsThis::add(m_filetree, i18n("<b>File tree</b><p>" + TQWhatsThis::add(m_filetree, i18n("<b>File tree</b><p>" "The file viewer shows all files of the project " "in a tree layout.")); - QHBox* filterBox = new QHBox( this ); - m_btnFilter = new QToolButton( filterBox ); + TQHBox* filterBox = new TQHBox( this ); + m_btnFilter = new TQToolButton( filterBox ); m_btnFilter->setIconSet( SmallIconSet("filter" ) ); m_btnFilter->setToggleButton( true ); m_filter = new KHistoryCombo( true, filterBox, "filter"); - m_filter->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed )); + m_filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(m_filter, 2); - connect( m_btnFilter, SIGNAL( clicked() ), this, SLOT( slotBtnFilterClick() ) ); - connect( m_filter, SIGNAL( activated(const QString&) ), this, SLOT( slotFilterChange(const QString&) ) ); - connect( m_filter, SIGNAL( returnPressed(const QString&) ), - m_filter, SLOT( addToHistory(const QString&) ) ); + connect( m_btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBtnFilterClick() ) ); + connect( m_filter, TQT_SIGNAL( activated(const TQString&) ), this, TQT_SLOT( slotFilterChange(const TQString&) ) ); + connect( m_filter, TQT_SIGNAL( returnPressed(const TQString&) ), + m_filter, TQT_SLOT( addToHistory(const TQString&) ) ); - QWhatsThis::add + TQWhatsThis::add ( m_filter, i18n("<p>Here you can enter a name filter to limit which files are <b>not displayed</b>." "<p>To clear the filter, toggle off the filter button to the left." "<p>To reapply the last filter used, toggle on the filter button." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_btnFilter, i18n("<p>This button clears the name filter when toggled off, or " "reapplies the last filter used when toggled on.") ); @@ -94,19 +94,19 @@ void PartWidget::showProjectFiles() /////////////////////////////////////////////////////////////////////////////// -void PartWidget::slotFilterChange( const QString & nf ) +void PartWidget::slotFilterChange( const TQString & nf ) { - QString f = nf.stripWhiteSpace(); + TQString f = nf.stripWhiteSpace(); bool empty = f.isEmpty() || f == "*"; if ( empty ) { - m_filter->lineEdit()->setText( QString::null ); - QToolTip::add( m_btnFilter, i18n("Apply last filter (\"%1\")").arg( m_lastFilter ) ); + m_filter->lineEdit()->setText( TQString::null ); + TQToolTip::add( m_btnFilter, i18n("Apply last filter (\"%1\")").arg( m_lastFilter ) ); } else { m_lastFilter = f; - QToolTip::add( m_btnFilter, i18n("Clear filter") ); + TQToolTip::add( m_btnFilter, i18n("Clear filter") ); } m_btnFilter->setOn( !empty ); // this will be never true after the m_filter has been used;) @@ -127,7 +127,7 @@ void PartWidget::slotBtnFilterClick() { if ( !m_btnFilter->isOn() ) { - slotFilterChange( QString::null ); + slotFilterChange( TQString::null ); } else { @@ -136,7 +136,7 @@ void PartWidget::slotBtnFilterClick() } } -void PartWidget::focusInEvent( QFocusEvent * ) +void PartWidget::focusInEvent( TQFocusEvent * ) { m_filetree->setFocus(); } diff --git a/parts/fileview/partwidget.h b/parts/fileview/partwidget.h index e9d62665..03090e2b 100644 --- a/parts/fileview/partwidget.h +++ b/parts/fileview/partwidget.h @@ -12,7 +12,7 @@ #ifndef _FILEVIEWPARTWIDGET_H_ #define _FILEVIEWPARTWIDGET_H_ -#include <qvbox.h> +#include <tqvbox.h> class FileViewPart; @@ -20,26 +20,26 @@ class PartWidget : public QVBox { Q_OBJECT public: - PartWidget( FileViewPart *part, QWidget *parent = 0 ); + PartWidget( FileViewPart *part, TQWidget *parent = 0 ); virtual ~PartWidget(); class FileTreeWidget *m_filetree; // Support for filters class KHistoryCombo *m_filter; - class QToolButton *m_btnFilter; + class TQToolButton *m_btnFilter; void showProjectFiles(); protected: - virtual void focusInEvent( QFocusEvent * ); + virtual void focusInEvent( TQFocusEvent * ); private slots: - void slotFilterChange( const QString & nf ); + void slotFilterChange( const TQString & nf ); void slotBtnFilterClick(); private: FileViewPart *m_part; - QString m_lastFilter; + TQString m_lastFilter; }; #endif diff --git a/parts/fileview/stdfiletreewidgetimpl.cpp b/parts/fileview/stdfiletreewidgetimpl.cpp index b680f2a8..67a8da28 100644 --- a/parts/fileview/stdfiletreewidgetimpl.cpp +++ b/parts/fileview/stdfiletreewidgetimpl.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ - #include <qheader.h> + #include <tqheader.h> #include <kdebug.h> #include "fileitemfactory.h" @@ -36,7 +36,7 @@ public: class StdFileTreeBranchItem : public filetreeview::FileTreeBranchItem { public: - StdFileTreeBranchItem( KFileTreeView* view, const KURL& url, const QString& name, const QPixmap& pix ) + StdFileTreeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix ) : FileTreeBranchItem( view, url, name, pix ) {} virtual ~StdFileTreeBranchItem() {} virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem ); @@ -64,7 +64,7 @@ KFileTreeViewItem* StdFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* class StdBranchItemFactory : public filetreeview::BranchItemFactory { public: - virtual filetreeview::FileTreeBranchItem *makeBranchItem( KFileTreeView* view, const KURL& url, const QString& name, const QPixmap& pix ) + virtual filetreeview::FileTreeBranchItem *makeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix ) { return new StdFileTreeBranchItem( view, url, name, pix ); } @@ -81,7 +81,7 @@ StdFileTreeWidgetImpl::StdFileTreeWidgetImpl( FileTreeWidget *parent ) setBranchItemFactory( new StdBranchItemFactory ); - parent->addColumn( QString::null ); + parent->addColumn( TQString::null ); header()->hide(); } diff --git a/parts/fileview/vcscolorsconfigwidget.cpp b/parts/fileview/vcscolorsconfigwidget.cpp index 29de36fe..63067c04 100644 --- a/parts/fileview/vcscolorsconfigwidget.cpp +++ b/parts/fileview/vcscolorsconfigwidget.cpp @@ -51,7 +51,7 @@ VCSColors &VCSColors::operator=( const VCSColors &others ) /////////////////////////////////////////////////////////////////////////////// VCSColorsConfigWidget::VCSColorsConfigWidget(FileViewPart *part, const VCSColors &vcsColors, - QWidget* parent, const char* name, WFlags fl) + TQWidget* parent, const char* name, WFlags fl) : VCSColorsConfigWidgetBase( parent, name, fl ), m_part( part ) { setColors( vcsColors ); diff --git a/parts/fileview/vcscolorsconfigwidget.h b/parts/fileview/vcscolorsconfigwidget.h index 60cd4f52..b86038fa 100644 --- a/parts/fileview/vcscolorsconfigwidget.h +++ b/parts/fileview/vcscolorsconfigwidget.h @@ -12,7 +12,7 @@ #ifndef VCSCOLORSCONFIGWIDGET_H #define VCSCOLORSCONFIGWIDGET_H -#include <qcolor.h> +#include <tqcolor.h> #include "vcscolorsconfigwidgetbase.h" class FileViewPart; @@ -23,15 +23,15 @@ struct VCSColors VCSColors( const VCSColors &others ); VCSColors &operator=( const VCSColors &others ); - QColor modified; - QColor added; - QColor updated; - QColor sticky; - QColor conflict; - QColor needsPatch; - QColor needsCheckout; - QColor unknown; - QColor defaultColor; + TQColor modified; + TQColor added; + TQColor updated; + TQColor sticky; + TQColor conflict; + TQColor needsPatch; + TQColor needsCheckout; + TQColor unknown; + TQColor defaultColor; }; class VCSColorsConfigWidget : public VCSColorsConfigWidgetBase @@ -40,7 +40,7 @@ class VCSColorsConfigWidget : public VCSColorsConfigWidgetBase public: VCSColorsConfigWidget( FileViewPart *part, const VCSColors &vcsColors, - QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); virtual ~VCSColorsConfigWidget(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp index 1db873ed..131c2b4f 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.cpp +++ b/parts/fileview/vcsfiletreewidgetimpl.cpp @@ -9,9 +9,9 @@ * * ***************************************************************************/ -#include <qpainter.h> -#include <qheader.h> -#include <qpopupmenu.h> +#include <tqpainter.h> +#include <tqheader.h> +#include <tqpopupmenu.h> #include <kxmlguiclient.h> #include <kaction.h> #include <klocale.h> @@ -46,26 +46,26 @@ public: : FileTreeViewItem( parent, item, branch, pf ), m_statusColor( &FileViewPart::vcsColors.unknown ) {} VCSFileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch ) : FileTreeViewItem( parent, item, branch ), m_statusColor( &FileViewPart::vcsColors.unknown ) {} - virtual void paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int alignment ) + virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ) { // paint cell in a different color depending on VCS state - QColorGroup mycg( cg ); - mycg.setColor( QColorGroup::Base, *m_statusColor ); + TQColorGroup mycg( cg ); + mycg.setColor( TQColorGroup::Base, *m_statusColor ); FileTreeViewItem::paintCell( p, mycg, column, width, alignment ); } void setVCSInfo( const VCSFileInfo &info ); - QString fileName() const { return text( FILENAME_COLUMN ); } - QString workingRev() const { return text( WORKREVISION_COLUMN ); } - QString repositoryRev() const { return text( REPOREVISION_COLUMN ); } - QString status() const { return text( STATUS_COLUMN ); } - void setFileName( const QString &p ) { setText( FILENAME_COLUMN, p ); } - void setWorkingRev( const QString &p ) { setText( WORKREVISION_COLUMN, p ); } - void setRepositoryRev( const QString &p ) { setText( REPOREVISION_COLUMN, p ); } + TQString fileName() const { return text( FILENAME_COLUMN ); } + TQString workingRev() const { return text( WORKREVISION_COLUMN ); } + TQString repositoryRev() const { return text( REPOREVISION_COLUMN ); } + TQString status() const { return text( STATUS_COLUMN ); } + void setFileName( const TQString &p ) { setText( FILENAME_COLUMN, p ); } + void setWorkingRev( const TQString &p ) { setText( WORKREVISION_COLUMN, p ); } + void setRepositoryRev( const TQString &p ) { setText( REPOREVISION_COLUMN, p ); } void setStatus( const VCSFileInfo::FileState status ); private: - QColor *m_statusColor; // cached + TQColor *m_statusColor; // cached }; /////////////////////////////////////////////////////////////////////////////// @@ -126,7 +126,7 @@ void VCSFileTreeViewItem::setStatus( const VCSFileInfo::FileState status ) class VCSFileTreeBranchItem : public filetreeview::FileTreeBranchItem { public: - VCSFileTreeBranchItem( KFileTreeView* view, const KURL& url, const QString& name, const QPixmap& pix, + VCSFileTreeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix, KDevVCSFileInfoProvider *vcsInfoProvider ) : FileTreeBranchItem( view, url, name, pix ), m_vcsInfoProvider( vcsInfoProvider ) {} // virtual ~VCSFileTreeBranchItem() {} @@ -150,8 +150,8 @@ KFileTreeViewItem* VCSFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* VCSFileTreeViewItem *newItem = new VCSFileTreeViewItem( parent, fileItem, this, isDirectory ); -// QString fileName = fileURL.fileName(); -// QString dirName = URLUtil::extractPathNameRelative( lv->projectDirectory(), fileURL.directory() ); +// TQString fileName = fileURL.fileName(); +// TQString dirName = URLUtil::extractPathNameRelative( lv->projectDirectory(), fileURL.directory() ); // const VCSFileInfoMap &vcsFiles = *m_vcsInfoProvider->status( dirName ); // kdDebug(9017) << "Dir has " << vcsFiles.count() << " registered files!" << endl; @@ -170,7 +170,7 @@ class VCSBranchItemFactory : public filetreeview::BranchItemFactory { public: VCSBranchItemFactory( KDevVCSFileInfoProvider *vcsInfoProvider ) : m_vcsInfoProvider( vcsInfoProvider ) {} - virtual filetreeview::FileTreeBranchItem *makeBranchItem( KFileTreeView* view, const KURL& url, const QString& name, const QPixmap& pix ) + virtual filetreeview::FileTreeBranchItem *makeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix ) { return new VCSFileTreeBranchItem( view, url, name, pix, m_vcsInfoProvider ); } @@ -198,27 +198,27 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFil parent->addColumn( "Work" ); parent->addColumn( "Repo" ); - connect( m_vcsInfoProvider, SIGNAL(statusReady(const VCSFileInfoMap&, void *)), - this, SLOT(vcsDirStatusReady(const VCSFileInfoMap&, void*)) ); + connect( m_vcsInfoProvider, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void *)), + this, TQT_SLOT(vcsDirStatusReady(const VCSFileInfoMap&, void*)) ); // Harakiri itself if the infoProvider object is destroyed since we cannot work anymore :-( - connect( m_vcsInfoProvider, SIGNAL(destroyed()), SIGNAL(implementationInvalidated()) ); + connect( m_vcsInfoProvider, TQT_SIGNAL(destroyed()), TQT_SIGNAL(implementationInvalidated()) ); m_actionToggleShowVCSFields = new KToggleAction( i18n("Show VCS Fields"), KShortcut(), this, "actiontoggleshowvcsfieldstoggleaction" ); m_actionToggleShowVCSFields->setCheckedState(i18n("Hide VCS Fields")); - QString aboutAction = i18n("<b>Show VCS fields</b><p>Shows <b>Revision</b> and <b>Timestamp</b> for each file contained in VCS repository."); + TQString aboutAction = i18n("<b>Show VCS fields</b><p>Shows <b>Revision</b> and <b>Timestamp</b> for each file contained in VCS repository."); m_actionToggleShowVCSFields->setWhatsThis( aboutAction ); - connect( m_actionToggleShowVCSFields, SIGNAL(toggled(bool)), this, SLOT(slotToggleShowVCSFields(bool)) ); + connect( m_actionToggleShowVCSFields, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleShowVCSFields(bool)) ); m_actionSyncWithRepository = new KAction( i18n( "Sync with Repository"), KShortcut(), - this, SLOT(slotSyncWithRepository()), this, "actionsyncwithrepository" ); + this, TQT_SLOT(slotSyncWithRepository()), this, "actionsyncwithrepository" ); aboutAction = i18n("<b>Sync with repository</b><p>Synchronize file status with remote repository."); m_actionSyncWithRepository->setWhatsThis( aboutAction ); - QDomDocument &dom = projectDom(); + TQDomDocument &dom = projectDom(); m_actionToggleShowVCSFields->setChecked( DomUtil::readBoolEntry(dom, "/kdevfileview/tree/showvcsfields") ); slotToggleShowVCSFields( showVCSFields() ); // show or hide fields depending on read settings - connect( parent, SIGNAL(expanded(QListViewItem*)), this, SLOT(slotDirectoryExpanded(QListViewItem*))); + connect( parent, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotDirectoryExpanded(TQListViewItem*))); } /////////////////////////////////////////////////////////////////////////////// @@ -227,7 +227,7 @@ VCSFileTreeWidgetImpl::~VCSFileTreeWidgetImpl() { kdDebug(9017) << "VCSFileTreeWidgetImpl::~VCSFileTreeWidgetImpl()" << endl; - QDomDocument &dom = projectDom(); + TQDomDocument &dom = projectDom(); DomUtil::writeBoolEntry( dom, "/kdevfileview/tree/showvcsfields", showVCSFields() ); } @@ -240,7 +240,7 @@ bool VCSFileTreeWidgetImpl::canReloadTree() const /////////////////////////////////////////////////////////////////////////////// -void VCSFileTreeWidgetImpl::fillPopupMenu( QPopupMenu *popupMenu, QListViewItem *item ) const +void VCSFileTreeWidgetImpl::fillPopupMenu( TQPopupMenu *popupMenu, TQListViewItem *item ) const { FileTreeViewWidgetImpl::fillPopupMenu( popupMenu, item ); @@ -306,7 +306,7 @@ void VCSFileTreeWidgetImpl::vcsDirStatusReady( const VCSFileInfoMap &modifiedFil item = static_cast<VCSFileTreeViewItem*>( item->firstChild() ); while (item) { - const QString fileName = item->fileName(); + const TQString fileName = item->fileName(); kdDebug(9017) << "Widget item filename is: " << fileName << endl; if (modifiedFiles.contains( fileName )) { @@ -329,7 +329,7 @@ void VCSFileTreeWidgetImpl::slotSyncWithRepository() { kdDebug(9017) << "VCSFileTreeWidgetImpl::slotSyncWithRepository()" << endl; const VCSFileTreeViewItem *myFileItem = static_cast<VCSFileTreeViewItem *>( m_vcsStatusRequestedItem ); - const QString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), myFileItem->fileItem()->url().path() ); + const TQString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), myFileItem->fileItem()->url().path() ); kdDebug(9017) << "VCS Info requested for: " << relDirPath << endl; m_vcsInfoProvider->requestStatus( relDirPath, m_vcsStatusRequestedItem ); m_isSyncingWithRepository = true; @@ -337,12 +337,12 @@ void VCSFileTreeWidgetImpl::slotSyncWithRepository() /////////////////////////////////////////////////////////////////////////////// -void VCSFileTreeWidgetImpl::slotDirectoryExpanded( QListViewItem* aItem ) +void VCSFileTreeWidgetImpl::slotDirectoryExpanded( TQListViewItem* aItem ) { VCSFileTreeViewItem *item = static_cast<VCSFileTreeViewItem *>( aItem ); if( !item ) return; - const QString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), item->fileItem()->url().path() ); + const TQString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), item->fileItem()->url().path() ); kdDebug(9017) << "ASync VCS Info requested for: " << relDirPath << endl; m_vcsInfoProvider->requestStatus( relDirPath, item, false, false ); diff --git a/parts/fileview/vcsfiletreewidgetimpl.h b/parts/fileview/vcsfiletreewidgetimpl.h index de4dc8c1..7a6761a9 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.h +++ b/parts/fileview/vcsfiletreewidgetimpl.h @@ -37,7 +37,7 @@ public: /* * Add "sync with repository" and "show VCS fields" options to the context menu. */ - virtual void fillPopupMenu( QPopupMenu *popupMenu, QListViewItem *item ) const; + virtual void fillPopupMenu( TQPopupMenu *popupMenu, TQListViewItem *item ) const; private slots: //! show/hide the header and the additional fields (status and versions) @@ -50,7 +50,7 @@ private slots: //! the items which are childs of the @see filetreeview::FileTreeViewItem stored in //! @p callerData. void vcsDirStatusReady( const VCSFileInfoMap &modifiedFiles, void *callerData ); - void slotDirectoryExpanded( QListViewItem* ); + void slotDirectoryExpanded( TQListViewItem* ); private: bool showVCSFields() const; diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp index 8804e701..dbb0dfc6 100644 --- a/parts/filter/filterpart.cpp +++ b/parts/filter/filterpart.cpp @@ -29,7 +29,7 @@ static const KDevPluginInfo data("kdevfilter"); K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( data ) ) -FilterPart::FilterPart(QObject *parent, const char *name, const QStringList &) +FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &) : KDevPlugin(&data, parent, name ? name : "FilterPart") { setInstance(FilterFactory::instance()); @@ -38,13 +38,13 @@ FilterPart::FilterPart(QObject *parent, const char *name, const QStringList &) KAction *action; action = new KAction( i18n("Execute Command..."), 0, - this, SLOT(slotShellInsert()), + this, TQT_SLOT(slotShellInsert()), actionCollection(), "tools_insertshell" ); action->setToolTip(i18n("Execute shell command")); action->setWhatsThis(i18n("<b>Execute shell command</b><p>Executes a shell command and outputs its result into the current document.")); action = new KAction( i18n("Filter Selection Through Command..."), 0, - this, SLOT(slotShellFilter()), + this, TQT_SLOT(slotShellFilter()), actionCollection(), "tools_filtershell" ); action->setToolTip(i18n("Filter selection through a shell command")); action->setWhatsThis(i18n("<b>Filter selection through shell command</b><p>Filters selection through a shell command and outputs its result into the current document.")); @@ -70,7 +70,7 @@ void FilterPart::slotShellInsert() KParts::ReadWritePart *part = dynamic_cast<KParts::ReadWritePart*>(partController()->activePart()); - QWidget *view = partController()->activeWidget(); + TQWidget *view = partController()->activeWidget(); if (!part || !view) { kdDebug(9029) << "no rw part" << endl; return; @@ -109,7 +109,7 @@ void FilterPart::slotShellFilter() KParts::ReadWritePart *part = dynamic_cast<KParts::ReadWritePart*>(partController()->activePart()); - QWidget *view = partController()->activeWidget(); + TQWidget *view = partController()->activeWidget(); if (!part || !view) { kdDebug(9029) << "no rw part" << endl; return; diff --git a/parts/filter/filterpart.h b/parts/filter/filterpart.h index ec731f12..55b89dbc 100644 --- a/parts/filter/filterpart.h +++ b/parts/filter/filterpart.h @@ -24,7 +24,7 @@ class FilterPart : public KDevPlugin Q_OBJECT public: - FilterPart( QObject *parent, const char *name, const QStringList & ); + FilterPart( TQObject *parent, const char *name, const TQStringList & ); ~FilterPart(); public slots: diff --git a/parts/filter/kdevfilterIface.cpp b/parts/filter/kdevfilterIface.cpp index 55a0421a..3df749a4 100644 --- a/parts/filter/kdevfilterIface.cpp +++ b/parts/filter/kdevfilterIface.cpp @@ -14,7 +14,7 @@ #include "filterpart.h" KDevFilterIface::KDevFilterIface( FilterPart* part ) - : QObject( part ), DCOPObject( "KDevFilter" ), m_part( part ) + : TQObject( part ), DCOPObject( "KDevFilter" ), m_part( part ) { } diff --git a/parts/filter/kdevfilterIface.h b/parts/filter/kdevfilterIface.h index 46a14277..d51acdbc 100644 --- a/parts/filter/kdevfilterIface.h +++ b/parts/filter/kdevfilterIface.h @@ -2,12 +2,12 @@ #ifndef KDEVFILTERIFACE_H #define KDEVFILTERIFACE_H -#include <qobject.h> +#include <tqobject.h> #include <dcopobject.h> class FilterPart; -class KDevFilterIface : public QObject, public DCOPObject +class KDevFilterIface : public TQObject, public DCOPObject { Q_OBJECT K_DCOP diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp index 7e967cda..484cb4cc 100644 --- a/parts/filter/shellfilterdlg.cpp +++ b/parts/filter/shellfilterdlg.cpp @@ -11,9 +11,9 @@ #include "shellfilterdlg.h" -#include <qcombobox.h> -#include <qlayout.h> -#include <qpushbutton.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqpushbutton.h> #include <kbuttonbox.h> #include <kconfig.h> #include <kdebug.h> @@ -29,11 +29,11 @@ ShellFilterDialog::ShellFilterDialog() - : QDialog(0, "shell filter dialog", true) + : TQDialog(0, "shell filter dialog", true) { - QVBoxLayout *layout = new QVBoxLayout(this, 10, 4); + TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4); - combo = new QComboBox(true, this); + combo = new TQComboBox(true, this); combo->setDuplicatesEnabled(false); layout->addWidget(combo); @@ -44,10 +44,10 @@ ShellFilterDialog::ShellFilterDialog() buttonbox->layout(); layout->addWidget(buttonbox); - connect( start_button, SIGNAL(clicked()), - this, SLOT(slotStartClicked()) ); - connect( cancel_button, SIGNAL(clicked()), - this, SLOT(reject()) ); + connect( start_button, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotStartClicked()) ); + connect( cancel_button, TQT_SIGNAL(clicked()), + this, TQT_SLOT(reject()) ); m_proc = 0; @@ -62,8 +62,8 @@ ShellFilterDialog::~ShellFilterDialog() kdDebug(9029) << "~ShellFilterDialog" << endl; delete m_proc; - // QComboBox API is a bit incomplete :-( - QStringList list; + // TQComboBox API is a bit incomplete :-( + TQStringList list; for (int i=0; i < combo->count(); ++i) list << combo->text(i); @@ -76,17 +76,17 @@ ShellFilterDialog::~ShellFilterDialog() void ShellFilterDialog::slotStartClicked() { start_button->setEnabled(false); - m_outstr = QCString(); + m_outstr = TQCString(); delete m_proc; m_proc = new KShellProcess("/bin/sh"); (*m_proc) << combo->currentText(); - connect( m_proc, SIGNAL(receivedStdout(KProcess*, char *, int)), - this, SLOT(slotReceivedStdout(KProcess*, char *, int)) ); - connect( m_proc, SIGNAL(wroteStdin(KProcess*)), - this, SLOT(slotWroteStdin(KProcess*)) ); - connect( m_proc, SIGNAL(processExited(KProcess*)), - this, SLOT(slotProcessExited(KProcess*)) ); + connect( m_proc, TQT_SIGNAL(receivedStdout(KProcess*, char *, int)), + this, TQT_SLOT(slotReceivedStdout(KProcess*, char *, int)) ); + connect( m_proc, TQT_SIGNAL(wroteStdin(KProcess*)), + this, TQT_SLOT(slotWroteStdin(KProcess*)) ); + connect( m_proc, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotProcessExited(KProcess*)) ); m_proc->start(KProcess::NotifyOnExit, KProcess::All); m_proc->writeStdin(m_instr, m_instr.length()); } @@ -95,13 +95,13 @@ void ShellFilterDialog::slotStartClicked() int ShellFilterDialog::exec() { start_button->setEnabled(true); - return QDialog::exec(); + return TQDialog::exec(); } void ShellFilterDialog::slotReceivedStdout(KProcess *, char *text, int len) { - m_outstr += QString::fromLocal8Bit(text, len+1); + m_outstr += TQString::fromLocal8Bit(text, len+1); kdDebug(9029) << "outstr " << m_outstr << endl; } diff --git a/parts/filter/shellfilterdlg.h b/parts/filter/shellfilterdlg.h index 3307c060..6642eb92 100644 --- a/parts/filter/shellfilterdlg.h +++ b/parts/filter/shellfilterdlg.h @@ -12,7 +12,7 @@ #ifndef _SHELLFILTERDLG_H_ #define _SHELLFILTERDLG_H_ -#include <qdialog.h> +#include <tqdialog.h> class QComboBox; class QPushButton; @@ -30,9 +30,9 @@ public: virtual int exec(); - void setText(const QString &str) + void setText(const TQString &str) { m_instr = str.local8Bit(); } - QString text() const + TQString text() const { return m_outstr; } private slots: @@ -42,11 +42,11 @@ private slots: void slotProcessExited(KProcess *); private: - QPushButton *start_button, *cancel_button; - QComboBox *combo; + TQPushButton *start_button, *cancel_button; + TQComboBox *combo; KProcess *m_proc; - QCString m_instr; - QString m_outstr; + TQCString m_instr; + TQString m_outstr; }; #endif diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp index a1474ed2..e36278b5 100644 --- a/parts/filter/shellinsertdlg.cpp +++ b/parts/filter/shellinsertdlg.cpp @@ -11,9 +11,9 @@ #include "shellinsertdlg.h" -#include <qcombobox.h> -#include <qlayout.h> -#include <qpushbutton.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqpushbutton.h> #include <kconfig.h> #include <kbuttonbox.h> #include <kdebug.h> @@ -30,11 +30,11 @@ ShellInsertDialog::ShellInsertDialog() - : QDialog(0, "shell filter dialog", true) + : TQDialog(0, "shell filter dialog", true) { - QVBoxLayout *layout = new QVBoxLayout(this, 10, 4); + TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4); - combo = new QComboBox(true, this); + combo = new TQComboBox(true, this); combo->setDuplicatesEnabled(false); layout->addWidget(combo); @@ -45,16 +45,16 @@ ShellInsertDialog::ShellInsertDialog() buttonbox->layout(); layout->addWidget(buttonbox); - connect( start_button, SIGNAL(clicked()), - this, SLOT(slotStartClicked()) ); - connect( cancel_button, SIGNAL(clicked()), - this, SLOT(reject()) ); - connect( combo->lineEdit(), SIGNAL(textChanged( const QString &)), this, SLOT(executeTextChanged( const QString &))); + connect( start_button, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotStartClicked()) ); + connect( cancel_button, TQT_SIGNAL(clicked()), + this, TQT_SLOT(reject()) ); + connect( combo->lineEdit(), TQT_SIGNAL(textChanged( const TQString &)), this, TQT_SLOT(executeTextChanged( const TQString &))); m_proc = 0; KConfig *config = FilterFactory::instance()->config(); config->setGroup("General"); - QStringList items = config->readListEntry("InsertItems"); + TQStringList items = config->readListEntry("InsertItems"); combo->insertStringList(items); executeTextChanged( combo->lineEdit()->text()); @@ -66,8 +66,8 @@ ShellInsertDialog::~ShellInsertDialog() kdDebug(9029) << "~ShellInsertDialog" << endl; delete m_proc; - // QComboBox API is a bit incomplete :-( - QStringList list; + // TQComboBox API is a bit incomplete :-( + TQStringList list; for (int i=0; i < combo->count(); ++i) list << combo->text(i); @@ -77,7 +77,7 @@ ShellInsertDialog::~ShellInsertDialog() } -void ShellInsertDialog::executeTextChanged( const QString &text) +void ShellInsertDialog::executeTextChanged( const TQString &text) { start_button->setEnabled(!text.isEmpty()); } @@ -85,29 +85,29 @@ void ShellInsertDialog::executeTextChanged( const QString &text) int ShellInsertDialog::exec() { start_button->setEnabled(true); - return QDialog::exec(); + return TQDialog::exec(); } void ShellInsertDialog::slotStartClicked() { start_button->setEnabled(false); - m_str = QCString(); + m_str = TQCString(); delete m_proc; m_proc = new KShellProcess("/bin/sh"); (*m_proc) << combo->currentText(); - connect( m_proc, SIGNAL(receivedStdout(KProcess*, char *, int)), - this, SLOT(slotReceivedStdout(KProcess*, char *, int)) ); - connect( m_proc, SIGNAL(processExited(KProcess*)), - this, SLOT(slotProcessExited(KProcess*)) ); + connect( m_proc, TQT_SIGNAL(receivedStdout(KProcess*, char *, int)), + this, TQT_SLOT(slotReceivedStdout(KProcess*, char *, int)) ); + connect( m_proc, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotProcessExited(KProcess*)) ); m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput); } void ShellInsertDialog::slotReceivedStdout(KProcess *, char *text, int len) { - m_str += QCString(text, len+1); + m_str += TQCString(text, len+1); } diff --git a/parts/filter/shellinsertdlg.h b/parts/filter/shellinsertdlg.h index c6f0696b..cb0992c9 100644 --- a/parts/filter/shellinsertdlg.h +++ b/parts/filter/shellinsertdlg.h @@ -12,7 +12,7 @@ #ifndef _SHELLINSERTDLG_H_ #define _SHELLINSERTDLG_H_ -#include <qdialog.h> +#include <tqdialog.h> class QComboBox; class QPushButton; @@ -30,20 +30,20 @@ public: virtual int exec(); - QString text() const - { return QString::fromLocal8Bit(m_str); } + TQString text() const + { return TQString::fromLocal8Bit(m_str); } private slots: void slotStartClicked(); void slotReceivedStdout(KProcess *, char *text, int len); void slotProcessExited(KProcess *); - void executeTextChanged( const QString &text); + void executeTextChanged( const TQString &text); private: - QPushButton *start_button, *cancel_button; - QComboBox *combo; + TQPushButton *start_button, *cancel_button; + TQComboBox *combo; KProcess *m_proc; - QCString m_str; + TQCString m_str; }; #endif diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp index 20e046f1..b3c2240f 100644 --- a/parts/fullscreen/fullscreen_part.cpp +++ b/parts/fullscreen/fullscreen_part.cpp @@ -27,7 +27,7 @@ static const KDevPluginInfo data("kdevfullscreen"); typedef KDevGenericFactory<FullScreenPart> FullScreenFactory; K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( data ) ) -FullScreenPart::FullScreenPart(QObject *parent, const char *name, const QStringList& ) +FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStringList& ) : KDevPlugin(&data, parent, name ? name : "FullScreenPart" ) { setInstance(FullScreenFactory::instance()); @@ -40,7 +40,7 @@ FullScreenPart::FullScreenPart(QObject *parent, const char *name, const QStringL m_bFullScreen = false; - m_pFullScreen = KStdAction::fullScreen(this, SLOT(slotToggleFullScreen()), actionCollection(), mainWindow()->main()); + m_pFullScreen = KStdAction::fullScreen(this, TQT_SLOT(slotToggleFullScreen()), actionCollection(), mainWindow()->main()); } FullScreenPart::~FullScreenPart() diff --git a/parts/fullscreen/fullscreen_part.h b/parts/fullscreen/fullscreen_part.h index a7ce3c0a..1b5fe53e 100644 --- a/parts/fullscreen/fullscreen_part.h +++ b/parts/fullscreen/fullscreen_part.h @@ -12,7 +12,7 @@ #ifndef __KDEVPART_FULLSCREEN_H__ #define __KDEVPART_FULLSCREEN_H__ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kdevplugin.h> class KAction; @@ -21,7 +21,7 @@ class FullScreenPart : public KDevPlugin { Q_OBJECT public: - FullScreenPart(QObject *parent, const char *name, const QStringList &); + FullScreenPart(TQObject *parent, const char *name, const TQStringList &); virtual ~FullScreenPart(); public slots: diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp index 9c62510e..80264a92 100644 --- a/parts/grepview/grepdlg.cpp +++ b/parts/grepview/grepdlg.cpp @@ -11,13 +11,13 @@ #include "grepdlg.h" -#include <qlayout.h> -#include <qpushbutton.h> -#include <qregexp.h> -#include <qhbox.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qstringlist.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqregexp.h> +#include <tqhbox.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqstringlist.h> #include <kfiledialog.h> #include <kbuttonbox.h> #include <kpushbutton.h> @@ -28,7 +28,7 @@ #include <kmessagebox.h> #include <kdebug.h> #include <kdeversion.h> -#include <qlabel.h> +#include <tqlabel.h> #include <kcombobox.h> #include <kurlcompletion.h> #include <kurlrequester.h> @@ -80,32 +80,32 @@ const char *filepatterns[] = { }; -GrepDialog::GrepDialog( GrepViewPart * part, QWidget *parent, const char *name ) - : QDialog(parent, name, false), m_part( part ) +GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name ) + : TQDialog(parent, name, false), m_part( part ) { setCaption(i18n("Find in Files")); config = GrepViewFactory::instance()->config(); config->setGroup("GrepDialog"); - QGridLayout *layout = new QGridLayout(this, 9, 2, 10, 4); + TQGridLayout *layout = new TQGridLayout(this, 9, 2, 10, 4); layout->setColStretch(0, 0); layout->setColStretch(1, 20); - QLabel *pattern_label = new QLabel(i18n("&Pattern:"), this); + TQLabel *pattern_label = new TQLabel(i18n("&Pattern:"), this); layout->addWidget(pattern_label, 0, 0, AlignRight | AlignVCenter); pattern_combo = new KHistoryCombo(true, this); pattern_label->setBuddy(pattern_combo); pattern_combo->setFocus(); pattern_combo->setHistoryItems(config->readListEntry("LastSearchItems"), true); - pattern_combo->setInsertionPolicy(QComboBox::NoInsertion); + pattern_combo->setInsertionPolicy(TQComboBox::NoInsertion); layout->addWidget(pattern_combo, 0, 1); - QLabel *template_label = new QLabel(i18n("&Template:"), this); + TQLabel *template_label = new TQLabel(i18n("&Template:"), this); layout->addWidget(template_label, 1, 0, AlignRight | AlignVCenter); - QBoxLayout *template_layout = new QHBoxLayout(4); + TQBoxLayout *template_layout = new TQHBoxLayout(4); layout->addLayout(template_layout, 1, 1); template_edit = new KLineEdit(this); @@ -117,28 +117,28 @@ GrepDialog::GrepDialog( GrepViewPart * part, QWidget *parent, const char *name ) template_combo->insertStrList(template_desc); template_layout->addWidget(template_combo, 0); - QBoxLayout *search_opts_layout = new QHBoxLayout(15); + TQBoxLayout *search_opts_layout = new TQHBoxLayout(15); layout->addLayout(search_opts_layout, 2, 1); - regexp_box = new QCheckBox(i18n("&Regular Expression"), this); + regexp_box = new TQCheckBox(i18n("&Regular Expression"), this); regexp_box->setChecked(config->readBoolEntry("regexp", false )); search_opts_layout->addWidget(regexp_box); - case_sens_box = new QCheckBox(i18n("C&ase sensitive"), this); - case_sens_box->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + case_sens_box = new TQCheckBox(i18n("C&ase sensitive"), this); + case_sens_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); case_sens_box->setChecked(config->readBoolEntry("case_sens", true)); search_opts_layout->addWidget(case_sens_box); - QLabel *dir_label = new QLabel(i18n("&Directory:"), this); + TQLabel *dir_label = new TQLabel(i18n("&Directory:"), this); layout->addWidget(dir_label, 3, 0, AlignRight | AlignVCenter); - QBoxLayout *dir_layout = new QHBoxLayout(4); + TQBoxLayout *dir_layout = new TQHBoxLayout(4); layout->addLayout(dir_layout, 3, 1); dir_combo = new KComboBox( true, this ); dir_combo->insertStringList(config->readPathListEntry("LastSearchPaths")); - dir_combo->setInsertionPolicy(QComboBox::NoInsertion); - dir_combo->setEditText(QDir::homeDirPath()); + dir_combo->setInsertionPolicy(TQComboBox::NoInsertion); + dir_combo->setEditText(TQDir::homeDirPath()); url_requester = new KURLRequester( dir_combo, this ); url_requester->completionObject()->setMode(KURLCompletion::DirCompletion); @@ -149,27 +149,27 @@ GrepDialog::GrepDialog( GrepViewPart * part, QWidget *parent, const char *name ) dir_layout->addWidget( url_requester, 10 ); synch_button = new KPushButton( this ); - QIconSet set = SmallIconSet( "dirsynch" ); - QPixmap pix = set.pixmap( QIconSet::Small, QIconSet::Normal ); + TQIconSet set = SmallIconSet( "dirsynch" ); + TQPixmap pix = set.pixmap( TQIconSet::Small, TQIconSet::Normal ); synch_button->setFixedSize( pix.width()+8, pix.height()+8 ); synch_button->setIconSet( set ); - synch_button->setAccel( QKeySequence( "Alt+y") ); - QToolTip::add( synch_button, i18n("Set directory to that of the current file (Alt+Y)") ); + synch_button->setAccel( TQKeySequence( "Alt+y") ); + TQToolTip::add( synch_button, i18n("Set directory to that of the current file (Alt+Y)") ); dir_layout->addWidget( synch_button ); - QBoxLayout *dir_opts_layout = new QHBoxLayout(15); + TQBoxLayout *dir_opts_layout = new TQHBoxLayout(15); layout->addLayout(dir_opts_layout, 4, 1); - recursive_box = new QCheckBox(i18n("Rec&ursive"), this); + recursive_box = new TQCheckBox(i18n("Rec&ursive"), this); recursive_box->setChecked(config->readBoolEntry("recursive", true)); dir_opts_layout->addWidget(recursive_box); - use_project_box = new QCheckBox(i18n("Limit search to &project files"), this); - use_project_box->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + use_project_box = new TQCheckBox(i18n("Limit search to &project files"), this); + use_project_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); use_project_box->setChecked(config->readBoolEntry("search_project_files", true)); dir_opts_layout->addWidget(use_project_box); - QLabel *files_label = new QLabel(i18n("&Files:"), this); + TQLabel *files_label = new TQLabel(i18n("&Files:"), this); layout->addWidget(files_label, 5, 0, AlignRight | AlignVCenter); files_combo = new KComboBox(true, this); @@ -177,10 +177,10 @@ GrepDialog::GrepDialog( GrepViewPart * part, QWidget *parent, const char *name ) files_combo->insertStrList(filepatterns); layout->addWidget(files_combo, 5, 1); - QLabel *exclude_label = new QLabel(i18n("&Exclude:"), this); + TQLabel *exclude_label = new TQLabel(i18n("&Exclude:"), this); layout->addWidget(exclude_label, 6, 0, AlignRight | AlignVCenter); - QStringList exclude_list = config->readListEntry("exclude_patterns"); + TQStringList exclude_list = config->readListEntry("exclude_patterns"); exclude_combo = new KComboBox(true, this); exclude_label->setBuddy(files_combo->focusProxy()); if (exclude_list.count()) { @@ -193,19 +193,19 @@ GrepDialog::GrepDialog( GrepViewPart * part, QWidget *parent, const char *name ) } layout->addWidget(exclude_combo, 6, 1); - QBoxLayout *other_opts_layout = new QHBoxLayout(15); + TQBoxLayout *other_opts_layout = new TQHBoxLayout(15); layout->addLayout(other_opts_layout, 7, 1); - keep_output_box = new QCheckBox(i18n("New view"), this); + keep_output_box = new TQCheckBox(i18n("New view"), this); keep_output_box->setChecked(config->readBoolEntry("new_view", true)); other_opts_layout->addWidget(keep_output_box); - no_find_err_box = new QCheckBox(i18n("&Suppress find errors"), this); - no_find_err_box->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + no_find_err_box = new TQCheckBox(i18n("&Suppress find errors"), this); + no_find_err_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); no_find_err_box->setChecked(config->readBoolEntry("no_find_errs", true)); other_opts_layout->addWidget(no_find_err_box); - QBoxLayout *button_layout = new QHBoxLayout(4); + TQBoxLayout *button_layout = new TQHBoxLayout(4); layout->addLayout(button_layout, 8, 1); search_button = new KPushButton(KGuiItem(i18n("Sea&rch"),"grep"), this); search_button->setDefault(true); @@ -216,7 +216,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, QWidget *parent, const char *name ) resize(sizeHint()); - QWhatsThis::add(pattern_combo, + TQWhatsThis::add(pattern_combo, i18n("<qt>Enter the regular expression you want to search for here.<p>" "Possible meta characters are:" "<ul>" @@ -240,31 +240,31 @@ GrepDialog::GrepDialog( GrepViewPart * part, QWidget *parent, const char *name ) "Furthermore, backreferences to bracketed subexpressions are " "available via the notation \\<i>n</i>.</qt>" )); - QWhatsThis::add(files_combo, + TQWhatsThis::add(files_combo, i18n("Enter the file name pattern of the files to search here. " "You may give several patterns separated by commas")); - QWhatsThis::add(template_edit, + TQWhatsThis::add(template_edit, i18n("You can choose a template for the pattern from the combo box " "and edit it here. The string %s in the template is replaced " "by the pattern input field, resulting in the regular expression " "to search for.")); - connect( template_combo, SIGNAL(activated(int)), - SLOT(templateActivated(int)) ); - connect( search_button, SIGNAL(clicked()), - SLOT(slotSearchClicked()) ); - connect( done_button, SIGNAL(clicked()), - SLOT(hide()) ); - connect( pattern_combo->lineEdit(), SIGNAL( textChanged ( const QString & ) ), - SLOT( slotPatternChanged( const QString & ) ) ); - connect( synch_button, SIGNAL(clicked()), this, SLOT(slotSynchDirectory()) ); + connect( template_combo, TQT_SIGNAL(activated(int)), + TQT_SLOT(templateActivated(int)) ); + connect( search_button, TQT_SIGNAL(clicked()), + TQT_SLOT(slotSearchClicked()) ); + connect( done_button, TQT_SIGNAL(clicked()), + TQT_SLOT(hide()) ); + connect( pattern_combo->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), + TQT_SLOT( slotPatternChanged( const TQString & ) ) ); + connect( synch_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSynchDirectory()) ); slotPatternChanged( pattern_combo->currentText() ); } -// Returns the contents of a QComboBox as a QStringList -static QStringList qCombo2StringList( QComboBox* combo ) +// Returns the contents of a TQComboBox as a QStringList +static TQStringList qCombo2StringList( TQComboBox* combo ) { - QStringList list; + TQStringList list; if (!combo) return list; for (int i = 0; i < combo->count(); ++i ) { @@ -288,7 +288,7 @@ GrepDialog::~GrepDialog() config->writeEntry("exclude_patterns", qCombo2StringList(exclude_combo)); } -void GrepDialog::slotPatternChanged( const QString & _text ) +void GrepDialog::slotPatternChanged( const TQString & _text ) { search_button->setEnabled( !_text.isEmpty() ); } @@ -299,7 +299,7 @@ void GrepDialog::templateActivated(int index) } // Find out whether the string s is already contained in combo -static bool qComboContains( const QString& s, QComboBox* combo ) +static bool qComboContains( const TQString& s, TQComboBox* combo ) { if (!combo) return false; @@ -348,15 +348,15 @@ void GrepDialog::show() // managers and Qt versions if (isVisible()) hide(); -// QDialog::hide(); - QDialog::show(); +// TQDialog::hide(); + TQDialog::show(); pattern_combo->setFocus(); } void GrepDialog::hide() { pattern_combo->setFocus(); - QDialog::hide(); + TQDialog::hide(); } void GrepDialog::slotSynchDirectory( ) diff --git a/parts/grepview/grepdlg.h b/parts/grepview/grepdlg.h index c24332bd..11b8d275 100644 --- a/parts/grepview/grepdlg.h +++ b/parts/grepview/grepdlg.h @@ -12,9 +12,9 @@ #ifndef _GREPDLG_H_ #define _GREPDLG_H_ -#include <qdialog.h> -#include <qcombobox.h> -#include <qcheckbox.h> +#include <tqdialog.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> #include <kcombobox.h> #include <klineedit.h> @@ -30,24 +30,24 @@ class GrepDialog : public QDialog Q_OBJECT public: - GrepDialog( GrepViewPart * part, QWidget *parent=0, const char *name=0 ); + GrepDialog( GrepViewPart * part, TQWidget *parent=0, const char *name=0 ); ~GrepDialog(); - void setPattern(const QString &pattern) + void setPattern(const TQString &pattern) { pattern_combo->setEditText(pattern); } - void setDirectory(const QString &dir) + void setDirectory(const TQString &dir) { dir_combo->setEditText(dir); } void setEnableProjectBox(bool enable); - QString patternString() const + TQString patternString() const { return pattern_combo->currentText(); } - QString templateString() const + TQString templateString() const { return template_edit->text(); } - QString filesString() const + TQString filesString() const { return files_combo->currentText(); } - QString excludeString() const + TQString excludeString() const { return exclude_combo->currentText(); } - QString directoryString() const + TQString directoryString() const { return dir_combo->currentText(); } bool useProjectFilesFlag() const @@ -72,7 +72,7 @@ signals: private slots: void templateActivated(int index); void slotSearchClicked(); - void slotPatternChanged( const QString &); + void slotPatternChanged( const TQString &); void slotSynchDirectory(); private: @@ -83,15 +83,15 @@ private: KComboBox * dir_combo; KURLRequester * url_requester; - QCheckBox *regexp_box; - QCheckBox *recursive_box; - QCheckBox *use_project_box; - QCheckBox *no_find_err_box; - QCheckBox *case_sens_box; - QCheckBox *keep_output_box; + TQCheckBox *regexp_box; + TQCheckBox *recursive_box; + TQCheckBox *use_project_box; + TQCheckBox *no_find_err_box; + TQCheckBox *case_sens_box; + TQCheckBox *keep_output_box; KConfig* config; - QPushButton *search_button; - QPushButton *synch_button; + TQPushButton *search_button; + TQPushButton *synch_button; GrepViewPart * m_part; }; diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp index 7b1f75d9..6765f87f 100644 --- a/parts/grepview/grepviewpart.cpp +++ b/parts/grepview/grepviewpart.cpp @@ -11,9 +11,9 @@ #include "grepviewpart.h" -#include <qpopupmenu.h> -#include <qvbox.h> -#include <qwhatsthis.h> +#include <tqpopupmenu.h> +#include <tqvbox.h> +#include <tqwhatsthis.h> #include <kdebug.h> #include <klocale.h> #include <kaction.h> @@ -34,24 +34,24 @@ static const KDevPluginInfo data("kdevgrepview"); K_EXPORT_COMPONENT_FACTORY(libkdevgrepview, GrepViewFactory(data)) -GrepViewPart::GrepViewPart( QObject *parent, const char *name, const QStringList & ) +GrepViewPart::GrepViewPart( TQObject *parent, const char *name, const TQStringList & ) : KDevPlugin( &data, parent, name ? name : "GrepViewPart" ) { setInstance(GrepViewFactory::instance()); setXMLFile("kdevgrepview.rc"); - connect( core(), SIGNAL(stopButtonClicked(KDevPlugin*)), - this, SLOT(stopButtonClicked(KDevPlugin*)) ); - connect( core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(projectClosed()) ); - connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *)) ); + connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQT_SLOT(stopButtonClicked(KDevPlugin*)) ); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); + connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); m_widget = new GrepViewWidget(this); m_widget->setIcon(SmallIcon("grep")); m_widget->setCaption(i18n("Grep Output")); - QWhatsThis::add(m_widget, i18n("<b>Find in files</b><p>" + TQWhatsThis::add(m_widget, i18n("<b>Find in files</b><p>" "This window contains the output of a grep " "command. Clicking on an item in the list " "will automatically open the corresponding " @@ -63,7 +63,7 @@ GrepViewPart::GrepViewPart( QObject *parent, const char *name, const QStringList KAction *action; action = new KAction(i18n("Find in Fi&les..."), "grep", CTRL+ALT+Key_F, - this, SLOT(slotGrep()), + this, TQT_SLOT(slotGrep()), actionCollection(), "edit_grep"); action->setToolTip( i18n("Search for expressions over several files") ); action->setWhatsThis( i18n("<b>Find in files</b><p>" @@ -105,19 +105,19 @@ void GrepViewPart::projectClosed() } -void GrepViewPart::contextMenu(QPopupMenu *popup, const Context *context) +void GrepViewPart::contextMenu(TQPopupMenu *popup, const Context *context) { kdDebug(9001) << "context in grepview" << endl; if (!context->hasType( Context::EditorContext )) return; const EditorContext *econtext = static_cast<const EditorContext*>(context); - QString ident = econtext->currentWord(); + TQString ident = econtext->currentWord(); if (!ident.isEmpty()) { m_popupstr = ident; - QString squeezed = KStringHandler::csqueeze(ident, 30); + TQString squeezed = KStringHandler::csqueeze(ident, 30); int id = popup->insertItem( i18n("Grep: %1").arg(squeezed), - this, SLOT(slotContextGrep()) ); + this, TQT_SLOT(slotContextGrep()) ); popup->setWhatsThis(id, i18n("<b>Grep</b><p>Opens the find in files dialog " "and sets the pattern to the text under the cursor.")); popup->insertSeparator(); @@ -129,7 +129,7 @@ void GrepViewPart::slotGrep() { if ( !m_widget->isRunning() ) { - QString contextString = KDevEditorUtil::currentSelection( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); + TQString contextString = KDevEditorUtil::currentSelection( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); if ( contextString.isEmpty() ) { contextString = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); diff --git a/parts/grepview/grepviewpart.h b/parts/grepview/grepviewpart.h index c6031a3b..256b44d0 100644 --- a/parts/grepview/grepviewpart.h +++ b/parts/grepview/grepviewpart.h @@ -12,7 +12,7 @@ #ifndef _GREPVIEWPART_H_ #define _GREPVIEWPART_H_ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kdevgenericfactory.h> #include "kdevplugin.h" @@ -27,21 +27,21 @@ class GrepViewPart : public KDevPlugin Q_OBJECT public: - GrepViewPart( QObject *parent, const char *name, const QStringList & ); + GrepViewPart( TQObject *parent, const char *name, const TQStringList & ); ~GrepViewPart(); private slots: void stopButtonClicked(KDevPlugin *which); void projectOpened(); void projectClosed(); - void contextMenu(QPopupMenu *popup, const Context *context); + void contextMenu(TQPopupMenu *popup, const Context *context); void slotGrep(); void slotContextGrep(); private: - QGuardedPtr<GrepViewWidget> m_widget; - QString m_popupstr; + TQGuardedPtr<GrepViewWidget> m_widget; + TQString m_popupstr; friend class GrepViewWidget; }; diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp index 326e2897..78aa4224 100644 --- a/parts/grepview/grepviewwidget.cpp +++ b/parts/grepview/grepviewwidget.cpp @@ -9,11 +9,11 @@ * * ***************************************************************************/ -#include <qdir.h> -#include <qlayout.h> -#include <qregexp.h> -#include <qpainter.h> -#include <qtoolbutton.h> +#include <tqdir.h> +#include <tqlayout.h> +#include <tqregexp.h> +#include <tqpainter.h> +#include <tqtoolbutton.h> #include <kdialogbase.h> #include <klocale.h> #include <kprocess.h> @@ -40,26 +40,26 @@ using namespace KTextEditor; class GrepListBoxItem : public ProcessListBoxItem { public: - GrepListBoxItem(const QString &fileName, const QString &lineNumber, const QString &text, bool showFilename); - QString filename() + GrepListBoxItem(const TQString &fileName, const TQString &lineNumber, const TQString &text, bool showFilename); + TQString filename() { return fileName; } int linenumber() { return lineNumber.toInt(); } virtual bool isCustomItem(); private: - virtual void paint(QPainter *p); - QString fileName, lineNumber, text; + virtual void paint(TQPainter *p); + TQString fileName, lineNumber, text; bool show; }; -GrepListBoxItem::GrepListBoxItem(const QString &fileName, const QString &lineNumber, const QString &text, bool showFilename) - : ProcessListBoxItem( QString::null, Normal), +GrepListBoxItem::GrepListBoxItem(const TQString &fileName, const TQString &lineNumber, const TQString &text, bool showFilename) + : ProcessListBoxItem( TQString::null, Normal), fileName(fileName), lineNumber(lineNumber), text(text.stripWhiteSpace()), show(showFilename) { - this->text.replace( QChar('\t'), QString(" ") ); + this->text.replace( TQChar('\t'), TQString(" ") ); } @@ -69,11 +69,11 @@ bool GrepListBoxItem::isCustomItem() } -void GrepListBoxItem::paint(QPainter *p) +void GrepListBoxItem::paint(TQPainter *p) { - QColor base, dim, result, bkground; + TQColor base, dim, result, bkground; if (listBox()) { - const QColorGroup& group = listBox()->palette().active(); + const TQColorGroup& group = listBox()->palette().active(); if (isSelected()) { bkground = group.button(); base = group.buttonText(); @@ -96,11 +96,11 @@ void GrepListBoxItem::paint(QPainter *p) else bkground = Qt::white; } - QFontMetrics fm = p->fontMetrics(); - QString stx = lineNumber + ": "; + TQFontMetrics fm = p->fontMetrics(); + TQString stx = lineNumber + ": "; int y = fm.ascent()+fm.leading()/2; int x = 3; - p->fillRect(p->window(), QBrush(bkground)); + p->fillRect(p->window(), TQBrush(bkground)); if (show) { p->setPen(dim); @@ -110,8 +110,8 @@ void GrepListBoxItem::paint(QPainter *p) else { p->setPen(base); - QFont font1(p->font()); - QFont font2(font1); + TQFont font1(p->font()); + TQFont font2(font1); font2.setBold(true); p->setFont(font2); p->drawText(x, y, stx); @@ -124,9 +124,9 @@ void GrepListBoxItem::paint(QPainter *p) } -GrepViewWidget::GrepViewWidget(GrepViewPart *part) : QWidget(0, "grepview widget") +GrepViewWidget::GrepViewWidget(GrepViewPart *part) : TQWidget(0, "grepview widget") { - m_layout = new QHBoxLayout(this, 0, -1, "greplayout"); + m_layout = new TQHBoxLayout(this, 0, -1, "greplayout"); m_tabWidget = new KTabWidget(this); @@ -137,25 +137,25 @@ GrepViewWidget::GrepViewWidget(GrepViewPart *part) : QWidget(0, "grepview widge m_tabWidget->addTab(m_curOutput, i18n("Search Results")); grepdlg = new GrepDialog( part, this, "grep widget"); - connect( grepdlg, SIGNAL(searchClicked()), this, SLOT(searchActivated()) ); - connect( m_curOutput, SIGNAL(processExited(KProcess* )), this, SLOT(slotSearchProcessExited()) ); + connect( grepdlg, TQT_SIGNAL(searchClicked()), this, TQT_SLOT(searchActivated()) ); + connect( m_curOutput, TQT_SIGNAL(processExited(KProcess* )), this, TQT_SLOT(slotSearchProcessExited()) ); - connect( m_tabWidget, SIGNAL(currentChanged(QWidget*)), this, SLOT(slotOutputTabChanged()) ); + connect( m_tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotOutputTabChanged()) ); - connect( m_curOutput, SIGNAL(clicked(QListBoxItem*)), - this, SLOT(slotExecuted(QListBoxItem*)) ); - connect( m_curOutput, SIGNAL(returnPressed(QListBoxItem*)), - this, SLOT(slotExecuted(QListBoxItem*)) ); + connect( m_curOutput, TQT_SIGNAL(clicked(TQListBoxItem*)), + this, TQT_SLOT(slotExecuted(TQListBoxItem*)) ); + connect( m_curOutput, TQT_SIGNAL(returnPressed(TQListBoxItem*)), + this, TQT_SLOT(slotExecuted(TQListBoxItem*)) ); - connect( m_curOutput, SIGNAL(contextMenuRequested( QListBoxItem*, const QPoint&)), this, SLOT(popupMenu(QListBoxItem*, const QPoint&))); + connect( m_curOutput, TQT_SIGNAL(contextMenuRequested( TQListBoxItem*, const TQPoint&)), this, TQT_SLOT(popupMenu(TQListBoxItem*, const TQPoint&))); m_part = part; - m_closeButton = new QToolButton(m_tabWidget);//@todo change text/icon + m_closeButton = new TQToolButton(m_tabWidget);//@todo change text/icon m_closeButton->setIconSet(SmallIconSet("tab_remove")); m_closeButton->setEnabled(false); - connect (m_closeButton, SIGNAL(clicked()), this, SLOT(slotCloseCurrentOutput())); + connect (m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCloseCurrentOutput())); m_tabWidget->setCornerWidget(m_closeButton); } @@ -173,7 +173,7 @@ void GrepViewWidget::showDialog() SelectionInterface *selectIface = dynamic_cast<SelectionInterface*>(ro_part); if(selectIface && selectIface->hasSelection()) { - QString selText = selectIface->selection(); + TQString selText = selectIface->selection(); if(!selText.contains('\n')) { grepdlg->setPattern(selText); @@ -194,10 +194,10 @@ void GrepViewWidget::showDialog() } // @todo - put this somewhere common - or just use Qt if possible -static QString escape(const QString &str) +static TQString escape(const TQString &str) { - QString escaped("[]{}()\\^$?.+-*|"); - QString res; + TQString escaped("[]{}()\\^$?.+-*|"); + TQString res; for (uint i=0; i < str.length(); ++i) { @@ -210,7 +210,7 @@ static QString escape(const QString &str) } -void GrepViewWidget::showDialogWithPattern(QString pattern) +void GrepViewWidget::showDialogWithPattern(TQString pattern) { // Before anything, this removes line feeds from the // beginning and the end. @@ -248,47 +248,47 @@ void GrepViewWidget::searchActivated() m_curOutput->setLastFileName(""); m_curOutput->setMatchCount( 0 ); - QString command, files; + TQString command, files; // waba: code below breaks on filenames containing a ',' !!! - QStringList filelist = QStringList::split(",", grepdlg->filesString()); + TQStringList filelist = TQStringList::split(",", grepdlg->filesString()); if (grepdlg->useProjectFilesFlag()) { KDevProject *openProject = m_part->project(); if (openProject) { - QString tmpFilePath; - QStringList projectFiles = openProject->allFiles(); + TQString tmpFilePath; + TQStringList projectFiles = openProject->allFiles(); if (!projectFiles.isEmpty()) { - tmpFilePath = openProject->projectDirectory() + QChar(QDir::separator()) + ".grep.tmp"; - QString dir = grepdlg->directoryString(), file; - QValueList<QRegExp> regExpList; + tmpFilePath = openProject->projectDirectory() + TQChar(TQDir::separator()) + ".grep.tmp"; + TQString dir = grepdlg->directoryString(), file; + TQValueList<TQRegExp> regExpList; - if (dir.endsWith(QChar(QDir::separator()))) + if (dir.endsWith(TQChar(TQDir::separator()))) dir.truncate(dir.length() - 1); if (!filelist.isEmpty()) { - for (QStringList::Iterator it = filelist.begin(); it != filelist.end(); ++it) - regExpList.append(QRegExp(*it, true, true)); + for (TQStringList::Iterator it = filelist.begin(); it != filelist.end(); ++it) + regExpList.append(TQRegExp(*it, true, true)); } m_tempFile.setName(tmpFilePath); if (m_tempFile.open(IO_WriteOnly)) { - QTextStream out(&m_tempFile); - for (QStringList::Iterator it = projectFiles.begin(); it != projectFiles.end(); ++it) + TQTextStream out(&m_tempFile); + for (TQStringList::Iterator it = projectFiles.begin(); it != projectFiles.end(); ++it) { - file = QDir::cleanDirPath(openProject->projectDirectory() + QChar(QDir::separator()) + *it); + file = TQDir::cleanDirPath(openProject->projectDirectory() + TQChar(TQDir::separator()) + *it); - QFileInfo info(file); + TQFileInfo info(file); if (grepdlg->recursiveFlag() && !info.dirPath(true).startsWith(dir)) continue; if (!grepdlg->recursiveFlag() && info.dirPath(true) != dir) continue; bool matchOne = regExpList.count() == 0; - for (QValueList<QRegExp>::Iterator it2 = regExpList.begin(); it2 != regExpList.end() && !matchOne; ++it2) + for (TQValueList<TQRegExp>::Iterator it2 = regExpList.begin(); it2 != regExpList.end() && !matchOne; ++it2) matchOne = (*it2).exactMatch(file); if (matchOne) @@ -312,14 +312,14 @@ void GrepViewWidget::searchActivated() { if (!filelist.isEmpty()) { - QStringList::Iterator it(filelist.begin()); + TQStringList::Iterator it(filelist.begin()); files = KShellProcess::quote(*it); ++it; for (; it != filelist.end(); ++it) files += " -o -name " + KShellProcess::quote(*it); } - QString filepattern = "find "; + TQString filepattern = "find "; filepattern += KShellProcess::quote(grepdlg->directoryString()); if (!grepdlg->recursiveFlag()) filepattern += " -maxdepth 1"; @@ -332,10 +332,10 @@ void GrepViewWidget::searchActivated() command = filepattern + " " ; } - QStringList excludelist = QStringList::split(",", grepdlg->excludeString()); + TQStringList excludelist = TQStringList::split(",", grepdlg->excludeString()); if (!excludelist.isEmpty()) { - QStringList::Iterator it(excludelist.begin()); + TQStringList::Iterator it(excludelist.begin()); command += "| grep -v "; for (; it != excludelist.end(); ++it) command += "-e " + KShellProcess::quote(*it) + " "; @@ -364,11 +364,11 @@ void GrepViewWidget::searchActivated() command += "-e "; m_lastPattern = grepdlg->patternString(); - QString pattern = grepdlg->templateString(); + TQString pattern = grepdlg->templateString(); if (grepdlg->regexpFlag()) - pattern.replace(QRegExp("%s"), grepdlg->patternString()); + pattern.replace(TQRegExp("%s"), grepdlg->patternString()); else - pattern.replace(QRegExp("%s"), escape( grepdlg->patternString() ) ); + pattern.replace(TQRegExp("%s"), escape( grepdlg->patternString() ) ); command += KShellProcess::quote(pattern); m_curOutput->startJob("", command); @@ -377,7 +377,7 @@ void GrepViewWidget::searchActivated() } -void GrepViewWidget::slotExecuted(QListBoxItem* item) +void GrepViewWidget::slotExecuted(TQListBoxItem* item) { ProcessListBoxItem *i = static_cast<ProcessListBoxItem*>(item); if (!i || !i->isCustomItem()) @@ -388,19 +388,19 @@ void GrepViewWidget::slotExecuted(QListBoxItem* item) } -void GrepViewProcessWidget::insertStdoutLine(const QCString &line) +void GrepViewProcessWidget::insertStdoutLine(const TQCString &line) { int pos; - QString filename, linenumber, rest; + TQString filename, linenumber, rest; - QString str; + TQString str; if( !grepbuf.isEmpty() ) { - str = QString::fromLocal8Bit( grepbuf+line ); + str = TQString::fromLocal8Bit( grepbuf+line ); grepbuf.truncate( 0 ); }else { - str = QString::fromLocal8Bit( line ); + str = TQString::fromLocal8Bit( line ); } if ( (pos = str.find(':')) != -1) { @@ -432,11 +432,11 @@ void GrepViewProcessWidget::insertStdoutLine(const QCString &line) void GrepViewWidget::projectChanged(KDevProject *project) { - QString dir = project? project->projectDirectory() : QDir::homeDirPath(); + TQString dir = project? project->projectDirectory() : TQDir::homeDirPath(); grepdlg->setDirectory(dir); } -void GrepViewWidget::popupMenu(QListBoxItem*, const QPoint& p) +void GrepViewWidget::popupMenu(TQListBoxItem*, const TQPoint& p) { if(m_curOutput->isRunning()) return; @@ -452,17 +452,17 @@ void GrepViewWidget::popupMenu(QListBoxItem*, const QPoint& p) void GrepViewWidget::slotKeepOutput( ) { - if ( m_lastPattern == QString::null ) return; + if ( m_lastPattern == TQString::null ) return; m_tabWidget->changeTab(m_curOutput, m_lastPattern); m_curOutput = new GrepViewProcessWidget(m_tabWidget); m_tabWidget->insertTab(m_curOutput, i18n("Search Results"), 0); - connect( m_curOutput, SIGNAL(clicked(QListBoxItem*)), this, SLOT(slotExecuted(QListBoxItem*)) ); - connect( m_curOutput, SIGNAL(returnPressed(QListBoxItem*)), this, SLOT(slotExecuted(QListBoxItem*)) ); - connect( m_curOutput, SIGNAL(processExited(KProcess* )), this, SLOT(slotSearchProcessExited()) ); - connect( m_curOutput, SIGNAL(contextMenuRequested( QListBoxItem*, const QPoint&)), this, SLOT(popupMenu(QListBoxItem*, const QPoint&))); + connect( m_curOutput, TQT_SIGNAL(clicked(TQListBoxItem*)), this, TQT_SLOT(slotExecuted(TQListBoxItem*)) ); + connect( m_curOutput, TQT_SIGNAL(returnPressed(TQListBoxItem*)), this, TQT_SLOT(slotExecuted(TQListBoxItem*)) ); + connect( m_curOutput, TQT_SIGNAL(processExited(KProcess* )), this, TQT_SLOT(slotSearchProcessExited()) ); + connect( m_curOutput, TQT_SIGNAL(contextMenuRequested( TQListBoxItem*, const TQPoint&)), this, TQT_SLOT(popupMenu(TQListBoxItem*, const TQPoint&))); } void GrepViewWidget::slotCloseCurrentOutput( ) @@ -526,7 +526,7 @@ void GrepViewProcessWidget::childFinished( bool normal, int status ) ProcessWidget::childFinished(normal, status); } -void GrepViewProcessWidget::addPartialStdoutLine(const QCString & line) +void GrepViewProcessWidget::addPartialStdoutLine(const TQCString & line) { grepbuf += line; } diff --git a/parts/grepview/grepviewwidget.h b/parts/grepview/grepviewwidget.h index bf3fca4b..04206973 100644 --- a/parts/grepview/grepviewwidget.h +++ b/parts/grepview/grepviewwidget.h @@ -13,8 +13,8 @@ #define _GREPVIEWWIDGET_H_ #include "processwidget.h" -#include <qwidget.h> -#include <qfile.h> +#include <tqwidget.h> +#include <tqfile.h> class GrepDialog; class GrepViewPart; @@ -26,7 +26,7 @@ class GrepViewProcessWidget : public ProcessWidget { Q_OBJECT public: - GrepViewProcessWidget(QWidget* parent) : ProcessWidget(parent) {}; + GrepViewProcessWidget(TQWidget* parent) : ProcessWidget(parent) {}; ~GrepViewProcessWidget(){}; void setMatchCount(int newCount) { @@ -38,22 +38,22 @@ public: m_matchCount += amount; } - void setLastFileName(const QString& lastFileName) + void setLastFileName(const TQString& lastFileName) { _lastfilename = lastFileName; } public slots: - virtual void insertStdoutLine(const QCString &line); - virtual void addPartialStdoutLine( const QCString &line ); + virtual void insertStdoutLine(const TQCString &line); + virtual void addPartialStdoutLine( const TQCString &line ); protected: virtual void childFinished(bool normal, int status); private: int m_matchCount; - QString _lastfilename; - QCString grepbuf; + TQString _lastfilename; + TQCString grepbuf; }; class GrepViewWidget : public QWidget @@ -70,7 +70,7 @@ public: public slots: void showDialog(); - void showDialogWithPattern(QString pattern); + void showDialogWithPattern(TQString pattern); private slots: void searchActivated(); @@ -78,8 +78,8 @@ private slots: * If item is a valid result of a search run, it opens the file at the position, where the stuff was found. * @param item item containing filename and linenumber of the file to open. */ - void slotExecuted(QListBoxItem *item); - void popupMenu(QListBoxItem*, const QPoint& p); + void slotExecuted(TQListBoxItem *item); + void popupMenu(TQListBoxItem*, const TQPoint& p); /** * Creates a new tab containing the current output in the main tab and clears the main tab. */ @@ -98,14 +98,14 @@ private slots: private: - QHBoxLayout* m_layout; + TQHBoxLayout* m_layout; KTabWidget* m_tabWidget; GrepViewProcessWidget* m_curOutput; GrepDialog *grepdlg; GrepViewPart *m_part; - QToolButton* m_closeButton; - QString m_lastPattern; - QFile m_tempFile; + TQToolButton* m_closeButton; + TQString m_lastPattern; + TQFile m_tempFile; }; #endif diff --git a/parts/konsole/konsoleviewpart.cpp b/parts/konsole/konsoleviewpart.cpp index 8d7892a5..c103a3a8 100644 --- a/parts/konsole/konsoleviewpart.cpp +++ b/parts/konsole/konsoleviewpart.cpp @@ -11,7 +11,7 @@ #include "konsoleviewpart.h" -#include <qwhatsthis.h> +#include <tqwhatsthis.h> #include <kdevgenericfactory.h> #include <kiconloader.h> @@ -28,14 +28,14 @@ typedef KDevGenericFactory<KonsoleViewPart> KonsoleViewFactory; static const KDevPluginInfo data("kdevkonsoleview"); K_EXPORT_COMPONENT_FACTORY(libkdevkonsoleview, KonsoleViewFactory(data)) -KonsoleViewPart::KonsoleViewPart(QObject *parent, const char *name, const QStringList &) +KonsoleViewPart::KonsoleViewPart(TQObject *parent, const char *name, const TQStringList &) : KDevPlugin(&data, parent, name ? name : "KonsoleViewPart") { setInstance( KonsoleViewFactory::instance() ); m_widget = new KDevShellWidget( 0, "konsole widget" ); - QWhatsThis::add(m_widget, i18n("<b>Konsole</b><p>" + TQWhatsThis::add(m_widget, i18n("<b>Konsole</b><p>" "This window contains an embedded konsole window. It will try to follow you when " "you navigate in the source directories") ); @@ -48,7 +48,7 @@ KonsoleViewPart::KonsoleViewPart(QObject *parent, const char *name, const QStrin mainWindow()->embedOutputView(m_widget, i18n("Konsole"), i18n("Embedded console window")); - connect(core(), SIGNAL(projectOpened()), this, SLOT(projectOpened())); + connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); } @@ -61,7 +61,7 @@ KonsoleViewPart::~KonsoleViewPart() void KonsoleViewPart::projectOpened() { - QString cd_projectdir = QString("cd ") + project()->projectDirectory() + "\n"; + TQString cd_projectdir = TQString("cd ") + project()->projectDirectory() + "\n"; m_widget->sendInput( cd_projectdir ); } diff --git a/parts/konsole/konsoleviewpart.h b/parts/konsole/konsoleviewpart.h index b7cea9d8..89047a2d 100644 --- a/parts/konsole/konsoleviewpart.h +++ b/parts/konsole/konsoleviewpart.h @@ -13,7 +13,7 @@ #define __KONSOLEVIEWPART_H__ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include "kdevplugin.h" @@ -23,14 +23,14 @@ class KonsoleViewPart : public KDevPlugin { Q_OBJECT public: - KonsoleViewPart(QObject *parent, const char *name, const QStringList &); + KonsoleViewPart(TQObject *parent, const char *name, const TQStringList &); virtual ~KonsoleViewPart(); private slots: void projectOpened(); private: - QGuardedPtr<KDevShellWidget> m_widget; + TQGuardedPtr<KDevShellWidget> m_widget; }; #endif diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp index e7a84d94..1604a321 100644 --- a/parts/konsole/konsoleviewwidget.cpp +++ b/parts/konsole/konsoleviewwidget.cpp @@ -9,9 +9,9 @@ * * ***************************************************************************/ -#include <qlayout.h> -#include <qframe.h> -#include <qdir.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqdir.h> #include <kparts/part.h> #include <klibloader.h> @@ -28,10 +28,10 @@ #include "konsoleviewwidget.h" KonsoleViewWidget::KonsoleViewWidget(KonsoleViewPart *part) - : QWidget(0, "konsole widget"), part(0), owner( part ) + : TQWidget(0, "konsole widget"), part(0), owner( part ) { - connect(part->partController(), SIGNAL(activePartChanged(KParts::Part*)), this, SLOT(activePartChanged(KParts::Part*))); - vbox = new QVBoxLayout(this); + connect(part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(activePartChanged(KParts::Part*))); + vbox = new TQVBoxLayout(this); } KonsoleViewWidget::~KonsoleViewWidget() @@ -41,7 +41,7 @@ KonsoleViewWidget::~KonsoleViewWidget() void KonsoleViewWidget::show() { activate(); - QWidget::show(); + TQWidget::show(); } void KonsoleViewWidget::activate() @@ -58,19 +58,19 @@ void KonsoleViewWidget::activate() if (!part) return; - part->widget()->setFocusPolicy(QWidget::WheelFocus); + part->widget()->setFocusPolicy(TQWidget::WheelFocus); setFocusProxy(part->widget()); part->widget()->setFocus(); - if (part->widget()->inherits("QFrame")) - ((QFrame*)part->widget())->setFrameStyle(QFrame::Panel|QFrame::Sunken); + if (part->widget()->inherits("TQFrame")) + ((TQFrame*)part->widget())->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); vbox->addWidget(part->widget()); // this->activePartChanged( owner->partController()->activePart() ); part->widget()->show(); - connect(part, SIGNAL(destroyed()), this, SLOT(partDestroyed())); + connect(part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(partDestroyed())); } @@ -84,7 +84,7 @@ void KonsoleViewWidget::activePartChanged(KParts::Part *activatedPart) kdDebug(9035) << k_funcinfo << "part is null or not local" << endl; return; } - QString dir; + TQString dir; if (ro_part) dir = ro_part->url().directory(); else if (owner->project()) diff --git a/parts/konsole/konsoleviewwidget.h b/parts/konsole/konsoleviewwidget.h index 0236dee4..50e17ff5 100644 --- a/parts/konsole/konsoleviewwidget.h +++ b/parts/konsole/konsoleviewwidget.h @@ -13,8 +13,8 @@ #define __KONSOLEVIEWWIDGET_H__ -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> class KDevProject; @@ -47,7 +47,7 @@ private: void activate(); KParts::ReadOnlyPart *part; - QVBoxLayout *vbox; + TQVBoxLayout *vbox; KonsoleViewPart *owner; }; diff --git a/parts/openwith/openwithpart.cpp b/parts/openwith/openwithpart.cpp index 4ff33ffb..2f45f867 100644 --- a/parts/openwith/openwithpart.cpp +++ b/parts/openwith/openwithpart.cpp @@ -1,6 +1,6 @@ #include "openwithpart.h" -#include <qfile.h> +#include <tqfile.h> #include <kpopupmenu.h> #include <kdevgenericfactory.h> @@ -21,13 +21,13 @@ typedef KDevGenericFactory<OpenWithPart> OpenWithFactory; static const KDevPluginInfo data("kdevopenwith"); K_EXPORT_COMPONENT_FACTORY(libkdevopenwith, OpenWithFactory(data)) -OpenWithPart::OpenWithPart(QObject *parent, const char *name, const QStringList &) +OpenWithPart::OpenWithPart(TQObject *parent, const char *name, const TQStringList &) : KDevPlugin(&data, parent, name ? name : "OpenWithPart") { setInstance( OpenWithFactory::instance() ); - connect(core(), SIGNAL(contextMenu(QPopupMenu*,const Context *)), - this, SLOT(fillContextMenu(QPopupMenu*,const Context *))); + connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu*,const Context *)), + this, TQT_SLOT(fillContextMenu(TQPopupMenu*,const Context *))); } @@ -36,7 +36,7 @@ OpenWithPart::~OpenWithPart() } -void OpenWithPart::fillContextMenu(QPopupMenu *popup, const Context *context) +void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) { if ( !context->hasType( Context::FileContext ) ) return; @@ -45,20 +45,20 @@ void OpenWithPart::fillContextMenu(QPopupMenu *popup, const Context *context) popup->insertSeparator(); - popup->insertItem( i18n("Open as UTF-8"), this, SLOT(openAsUtf8()) ); + popup->insertItem( i18n("Open as UTF-8"), this, TQT_SLOT(openAsUtf8()) ); KPopupMenu * openAsPopup = new KPopupMenu( popup ); int id = popup->insertItem( i18n("Open As"), openAsPopup ); popup->setWhatsThis(id, i18n("<b>Open As</b><p>Lists all encodings that can be used to open the selected file.")); - QStringList encodings = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames(); int i = 0; - QStringList::const_iterator it = encodings.constBegin(); + TQStringList::const_iterator it = encodings.constBegin(); while ( it != encodings.constEnd() ) { - openAsPopup->insertItem( *it, this, SLOT(openAsEncoding(int)), 0, i ); + openAsPopup->insertItem( *it, this, TQT_SLOT(openAsEncoding(int)), 0, i ); ++it; i++; } @@ -66,15 +66,15 @@ void OpenWithPart::fillContextMenu(QPopupMenu *popup, const Context *context) KPopupMenu * openWithPopup = new KPopupMenu( popup ); // hmmm.. what to do here? open every different mimetype seperately? Just go with the first for now.. - QString mimeType = KMimeType::findByURL(m_urls.first(), 0, true, true)->name(); + TQString mimeType = KMimeType::findByURL(m_urls.first(), 0, true, true)->name(); KTrader::OfferList offers = KTrader::self()->query(mimeType, "Type == 'Application'"); if (offers.count() > 0) { KTrader::OfferList::Iterator it; for (it = offers.begin(); it != offers.end(); ++it) { - KAction *action = new KAction((*it)->name(), (*it)->icon(), 0, 0, QFile::encodeName( (*it)->desktopEntryPath() ).data()); - connect(action, SIGNAL(activated()), this, SLOT(openWithService())); + KAction *action = new KAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName( (*it)->desktopEntryPath() ).data()); + connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(openWithService())); action->plug( openWithPopup ); } } @@ -85,7 +85,7 @@ void OpenWithPart::fillContextMenu(QPopupMenu *popup, const Context *context) openWithPopup->insertSeparator(); // make sure the generic "Open with ..." entry gets appended to the submenu - id = openWithPopup->insertItem(i18n("Open With..."), this, SLOT(openWithDialog())); + id = openWithPopup->insertItem(i18n("Open With..."), this, TQT_SLOT(openWithDialog())); openWithPopup->setWhatsThis(id, i18n("<b>Open With...</b><p>Provides a dialog to choose the application to open the selected file.")); } @@ -108,8 +108,8 @@ void OpenWithPart::openWithDialog() void OpenWithPart::openAsEncoding( int id ) { - QStringList encodings = KGlobal::charsets()->descriptiveEncodingNames(); - QString encoding; + TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames(); + TQString encoding; if ( id <= encodings.count() && id >= 0 ) { encoding = KGlobal::charsets()->encodingForName( encodings[ id ] ); diff --git a/parts/openwith/openwithpart.h b/parts/openwith/openwithpart.h index c79ad164..74add82a 100644 --- a/parts/openwith/openwithpart.h +++ b/parts/openwith/openwithpart.h @@ -15,13 +15,13 @@ class OpenWithPart : public KDevPlugin public: - OpenWithPart(QObject *parent, const char *name, const QStringList &); + OpenWithPart(TQObject *parent, const char *name, const TQStringList &); ~OpenWithPart(); private slots: - void fillContextMenu(QPopupMenu *popup, const Context *context); + void fillContextMenu(TQPopupMenu *popup, const Context *context); void openWithService(); void openWithDialog(); diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp index 79a62471..a21cf7db 100644 --- a/parts/outputviews/appoutputviewpart.cpp +++ b/parts/outputviews/appoutputviewpart.cpp @@ -11,8 +11,8 @@ #include "appoutputviewpart.h" -#include <qwhatsthis.h> -#include <qdir.h> +#include <tqwhatsthis.h> +#include <tqdir.h> #include <kdebug.h> #include <klocale.h> #include <kaction.h> @@ -33,7 +33,7 @@ static const KDevPluginInfo data("kdevappoutputview"); typedef KDevGenericFactory< AppOutputViewPart > AppViewFactory; K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( data ) ) -AppOutputViewPart::AppOutputViewPart(QObject *parent, const char *name, const QStringList &) +AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const TQStringList &) : KDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart") { setInstance(AppViewFactory::instance()); @@ -43,7 +43,7 @@ AppOutputViewPart::AppOutputViewPart(QObject *parent, const char *name, const QS m_widget = new AppOutputWidget(this); m_widget->setIcon( SmallIcon("openterm") ); m_widget->setCaption(i18n("Application Output")); - QWhatsThis::add(m_widget, i18n("<b>Application output</b><p>" + TQWhatsThis::add(m_widget, i18n("<b>Application output</b><p>" "The stdout/stderr output window is a replacement for " "terminal-based application communication. Running terminal " "applications use this instead of a terminal window.")); @@ -51,10 +51,10 @@ AppOutputViewPart::AppOutputViewPart(QObject *parent, const char *name, const QS mainWindow()->embedOutputView(m_widget, i18n("Application"), i18n("Output of the executed user program")); hideView(); - connect( core(), SIGNAL(stopButtonClicked(KDevPlugin*)), - this, SLOT(slotStopButtonClicked(KDevPlugin*)) ); - connect(m_widget, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited())); - connect(m_widget, SIGNAL(processExited(KProcess*)), SIGNAL(processExited())); + connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect(m_widget, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited())); + connect(m_widget, TQT_SIGNAL(processExited(KProcess*)), TQT_SIGNAL(processExited())); } @@ -92,15 +92,15 @@ void AppOutputViewPart::slotProcessExited() * If inTerminal is true, the program is started in an external * konsole. */ -void AppOutputViewPart::startAppCommand(const QString &directory, const QString &program, bool inTerminal) +void AppOutputViewPart::startAppCommand(const TQString &directory, const TQString &program, bool inTerminal) { - QString cmd; + TQString cmd; if (inTerminal) { cmd = Settings::terminalEmulatorName( *kapp->config() ); if ( cmd == "konsole" && !directory.isNull() ) { // isn't setting the working directory below enough? // If a directory was specified, use it - cmd += QString(" --workdir '%1'").arg(directory); + cmd += TQString(" --workdir '%1'").arg(directory); } cmd += " -e /bin/sh -c '"; cmd += program; @@ -114,7 +114,7 @@ void AppOutputViewPart::startAppCommand(const QString &directory, const QString if ( directory.isNull() ) // use the user's home directory - m_widget->startJob(QDir::homeDirPath(), cmd); + m_widget->startJob(TQDir::homeDirPath(), cmd); else // use the supplied directory m_widget->startJob(directory, cmd); @@ -132,13 +132,13 @@ bool AppOutputViewPart::isRunning() } -void AppOutputViewPart::insertStdoutLine(const QCString &line) +void AppOutputViewPart::insertStdoutLine(const TQCString &line) { m_widget->insertStdoutLine(line); } -void AppOutputViewPart::insertStderrLine(const QCString &line) +void AppOutputViewPart::insertStderrLine(const TQCString &line) { m_widget->insertStderrLine(line); } @@ -165,12 +165,12 @@ bool AppOutputViewPart::isViewVisible() return m_viewIsVisible; } -void AppOutputViewPart::addPartialStderrLine(const QCString & line) +void AppOutputViewPart::addPartialStderrLine(const TQCString & line) { m_widget->addPartialStderrLine(line); } -void AppOutputViewPart::addPartialStdoutLine(const QCString & line) +void AppOutputViewPart::addPartialStdoutLine(const TQCString & line) { m_widget->addPartialStdoutLine(line); } diff --git a/parts/outputviews/appoutputviewpart.h b/parts/outputviews/appoutputviewpart.h index 76d708f9..b0b0982a 100644 --- a/parts/outputviews/appoutputviewpart.h +++ b/parts/outputviews/appoutputviewpart.h @@ -12,7 +12,7 @@ #ifndef _APPOUTPUTVIEWSPART_H_ #define _APPOUTPUTVIEWSPART_H_ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include "kdevappfrontend.h" #include "KDevAppFrontendIface.h" @@ -25,16 +25,16 @@ class AppOutputViewPart : public KDevAppFrontend Q_OBJECT public: - AppOutputViewPart( QObject *parent, const char *name, const QStringList & ); + AppOutputViewPart( TQObject *parent, const char *name, const TQStringList & ); ~AppOutputViewPart(); - virtual void startAppCommand(const QString &directory, const QString &command, bool inTerminal); + virtual void startAppCommand(const TQString &directory, const TQString &command, bool inTerminal); virtual void stopApplication(); virtual bool isRunning(); - virtual void insertStdoutLine(const QCString &line); - virtual void insertStderrLine(const QCString &line); - virtual void addPartialStdoutLine(const QCString &line); - virtual void addPartialStderrLine(const QCString &line); + virtual void insertStdoutLine(const TQCString &line); + virtual void insertStderrLine(const TQCString &line); + virtual void addPartialStdoutLine(const TQCString &line); + virtual void addPartialStderrLine(const TQCString &line); virtual void clearView(); void hideView(); void showView(); @@ -48,7 +48,7 @@ private slots: void slotProcessExited(); private: - QGuardedPtr<AppOutputWidget> m_widget; + TQGuardedPtr<AppOutputWidget> m_widget; KDevAppFrontendIface *m_dcop; bool m_viewIsVisible; }; diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp index e3c3810a..c58065a2 100644 --- a/parts/outputviews/appoutputwidget.cpp +++ b/parts/outputviews/appoutputwidget.cpp @@ -14,13 +14,13 @@ #include "appoutputwidget.h" -#include <qregexp.h> -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qclipboard.h> +#include <tqregexp.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqclipboard.h> #include <klocale.h> #include <kdebug.h> @@ -40,13 +40,13 @@ AppOutputWidget::AppOutputWidget(AppOutputViewPart* part) : ProcessWidget(0, "app output widget"), m_part(part) { - connect(this, SIGNAL(executed(QListBoxItem*)), SLOT(slotRowSelected(QListBoxItem*))); - connect(this, SIGNAL(rightButtonClicked( QListBoxItem *, const QPoint & )), - SLOT(slotContextMenu( QListBoxItem *, const QPoint & ))); + connect(this, TQT_SIGNAL(executed(TQListBoxItem*)), TQT_SLOT(slotRowSelected(TQListBoxItem*))); + connect(this, TQT_SIGNAL(rightButtonClicked( TQListBoxItem *, const TQPoint & )), + TQT_SLOT(slotContextMenu( TQListBoxItem *, const TQPoint & ))); KConfig *config = kapp->config(); config->setGroup("General Options"); setFont(config->readFontEntry("OutputViewFont")); - setSelectionMode(QListBox::Extended); + setSelectionMode(TQListBox::Extended); } void AppOutputWidget::clearViewAndContents() @@ -70,11 +70,11 @@ void AppOutputWidget::childFinished(bool normal, int status) } -void AppOutputWidget::slotRowSelected(QListBoxItem* row) +void AppOutputWidget::slotRowSelected(TQListBoxItem* row) { - static QRegExp assertMatch("ASSERT: \\\"([^\\\"]+)\\\" in ([^\\( ]+) \\(([\\d]+)\\)"); - static QRegExp lineInfoMatch("\\[([^:]+):([\\d]+)\\]"); - static QRegExp rubyErrorMatch("([^:\\s]+\\.rb):([\\d]+):?.*$"); + static TQRegExp assertMatch("ASSERT: \\\"([^\\\"]+)\\\" in ([^\\( ]+) \\(([\\d]+)\\)"); + static TQRegExp lineInfoMatch("\\[([^:]+):([\\d]+)\\]"); + static TQRegExp rubyErrorMatch("([^:\\s]+\\.rb):([\\d]+):?.*$"); if (row) { if (assertMatch.exactMatch(row->text())) { @@ -87,7 +87,7 @@ void AppOutputWidget::slotRowSelected(QListBoxItem* row) m_part->mainWindow()->statusBar()->message(row->text(), 10000); m_part->mainWindow()->lowerView(this); } else if (rubyErrorMatch.search(row->text()) != -1) { - QString file; + TQString file; if (rubyErrorMatch.cap(1).startsWith("/")) { file = rubyErrorMatch.cap(1); } else { @@ -101,7 +101,7 @@ void AppOutputWidget::slotRowSelected(QListBoxItem* row) } -void AppOutputWidget::insertStdoutLine(const QCString &line) +void AppOutputWidget::insertStdoutLine(const TQCString &line) { // kdDebug(9004) << k_funcinfo << line << endl; @@ -110,17 +110,17 @@ void AppOutputWidget::insertStdoutLine(const QCString &line) m_part->showView(); } - QString sline; + TQString sline; if( !stdoutbuf.isEmpty() ) { - sline = QString::fromLocal8Bit( stdoutbuf+line ); + sline = TQString::fromLocal8Bit( stdoutbuf+line ); stdoutbuf.truncate( 0 ); }else { - sline = QString::fromLocal8Bit( line ); + sline = TQString::fromLocal8Bit( line ); } - m_contentList.append(QString("o-")+sline); + m_contentList.append(TQString("o-")+sline); if ( filterSingleLine( sline ) ) { ProcessWidget::insertStdoutLine( sline.local8Bit() ); @@ -128,7 +128,7 @@ void AppOutputWidget::insertStdoutLine(const QCString &line) } -void AppOutputWidget::insertStderrLine(const QCString &line) +void AppOutputWidget::insertStderrLine(const TQCString &line) { // kdDebug(9004) << k_funcinfo << line << endl; @@ -138,17 +138,17 @@ void AppOutputWidget::insertStderrLine(const QCString &line) } - QString sline; + TQString sline; if( !stderrbuf.isEmpty() ) { - sline = QString::fromLocal8Bit( stderrbuf+line ); + sline = TQString::fromLocal8Bit( stderrbuf+line ); stderrbuf.truncate( 0 ); }else { - sline = QString::fromLocal8Bit( line ); + sline = TQString::fromLocal8Bit( line ); } - m_contentList.append(QString("e-")+sline); + m_contentList.append(TQString("e-")+sline); if ( filterSingleLine( sline ) ) { ProcessWidget::insertStderrLine( sline.local8Bit() ); @@ -162,7 +162,7 @@ void AppOutputWidget::editFilter() dlg.regularExpression->setChecked( m_filter.m_isRegExp ); dlg.filterString->setText( m_filter.m_filterString ); - if ( dlg.exec() == QDialog::Accepted ) + if ( dlg.exec() == TQDialog::Accepted ) { m_filter.m_caseSensitive = dlg.caseSensitive->isChecked(); m_filter.m_isRegExp = dlg.regularExpression->isChecked(); @@ -174,13 +174,13 @@ void AppOutputWidget::editFilter() } } -bool AppOutputWidget::filterSingleLine(const QString & line) +bool AppOutputWidget::filterSingleLine(const TQString & line) { if ( !m_filter.m_isActive ) return true; if ( m_filter.m_isRegExp ) { - return ( line.find( QRegExp( m_filter.m_filterString, m_filter.m_caseSensitive, false ) ) != -1 ); + return ( line.find( TQRegExp( m_filter.m_filterString, m_filter.m_caseSensitive, false ) ) != -1 ); } else { @@ -192,7 +192,7 @@ void AppOutputWidget::reinsertAndFilter() { //copy the first item from the listbox //if a programm was started, this contains the issued command - QString issuedCommand; + TQString issuedCommand; if ( count() > 0 ) { setTopItem(0); @@ -208,12 +208,12 @@ void AppOutputWidget::reinsertAndFilter() } //grep through the list for items matching the filter... - QStringList strListFound; + TQStringList strListFound; if ( m_filter.m_isActive ) { if ( m_filter.m_isRegExp ) { - strListFound = m_contentList.grep( QRegExp(m_filter.m_filterString, m_filter.m_caseSensitive, false ) ); + strListFound = m_contentList.grep( TQRegExp(m_filter.m_filterString, m_filter.m_caseSensitive, false ) ); } else { @@ -226,7 +226,7 @@ void AppOutputWidget::reinsertAndFilter() } //... and reinsert the found items into the listbox - for ( QStringList::Iterator it = strListFound.begin(); it != strListFound.end(); ++it ) + for ( TQStringList::Iterator it = strListFound.begin(); it != strListFound.end(); ++it ) { if ((*it).startsWith("o-")) { @@ -247,28 +247,28 @@ void AppOutputWidget::clearFilter() reinsertAndFilter(); } -void AppOutputWidget::slotContextMenu( QListBoxItem *, const QPoint &p ) +void AppOutputWidget::slotContextMenu( TQListBoxItem *, const TQPoint &p ) { KPopupMenu popup(this, "filter output"); - int id = popup.insertItem( i18n("Clear output"), this, SLOT(clearViewAndContents()) ); + int id = popup.insertItem( i18n("Clear output"), this, TQT_SLOT(clearViewAndContents()) ); popup.setItemEnabled( id, m_contentList.size() > 0 ); - popup.insertItem( i18n("Copy selected lines"), this, SLOT(copySelected()) ); + popup.insertItem( i18n("Copy selected lines"), this, TQT_SLOT(copySelected()) ); popup.insertSeparator(); - popup.insertItem( i18n("Save unfiltered"), this, SLOT(saveAll()) ); - id = popup.insertItem( i18n("Save filtered output"), this, SLOT(saveFiltered()) ); + popup.insertItem( i18n("Save unfiltered"), this, TQT_SLOT(saveAll()) ); + id = popup.insertItem( i18n("Save filtered output"), this, TQT_SLOT(saveFiltered()) ); popup.setItemEnabled( id, m_filter.m_isActive ); popup.insertSeparator(); - id = popup.insertItem( i18n("Clear filter"), this, SLOT(clearFilter()) ); + id = popup.insertItem( i18n("Clear filter"), this, TQT_SLOT(clearFilter()) ); popup.setItemEnabled( id, m_filter.m_isActive ); - popup.insertItem( i18n("Edit filter"), this, SLOT(editFilter() ) ); + popup.insertItem( i18n("Edit filter"), this, TQT_SLOT(editFilter() ) ); popup.insertSeparator(); - popup.insertItem( i18n("Hide view"), this, SLOT(hideView()) ); + popup.insertItem( i18n("Hide view"), this, TQT_SLOT(hideView()) ); popup.exec(p); } @@ -290,16 +290,16 @@ void AppOutputWidget::saveFiltered() void AppOutputWidget::saveOutputToFile(bool useFilter) { - QString filename = KFileDialog::getSaveFileName(); + TQString filename = KFileDialog::getSaveFileName(); if ( filename.isEmpty() ) return; - QStringList contents; + TQStringList contents; if ( useFilter && m_filter.m_isActive ) { if ( m_filter.m_isRegExp ) { - contents = m_contentList.grep( QRegExp(m_filter.m_filterString, m_filter.m_caseSensitive, false ) ); + contents = m_contentList.grep( TQRegExp(m_filter.m_filterString, m_filter.m_caseSensitive, false ) ); } else { @@ -311,14 +311,14 @@ void AppOutputWidget::saveOutputToFile(bool useFilter) contents = m_contentList; } - QFile file( filename ); + TQFile file( filename ); if ( file.open( IO_WriteOnly ) ) { - QTextStream ostream( &file ); - QStringList::ConstIterator it = contents.begin(); + TQTextStream ostream( &file ); + TQStringList::ConstIterator it = contents.begin(); while( it != contents.end() ) { - QString line = *it; + TQString line = *it; if ( line.startsWith("o-") || line.startsWith("e-") ) { line.remove( 0, 2 ); @@ -333,7 +333,7 @@ void AppOutputWidget::saveOutputToFile(bool useFilter) void AppOutputWidget::copySelected() { uint n = count(); - QString buffer; + TQString buffer; for (uint i = 0; i < n; i++) { if (isSelected(i)) @@ -342,12 +342,12 @@ void AppOutputWidget::copySelected() kapp->clipboard()->setText(buffer, QClipboard::Clipboard); } -void AppOutputWidget::addPartialStderrLine(const QCString & line) +void AppOutputWidget::addPartialStderrLine(const TQCString & line) { stderrbuf += line; } -void AppOutputWidget::addPartialStdoutLine(const QCString & line) +void AppOutputWidget::addPartialStdoutLine(const TQCString & line) { stdoutbuf += line; } diff --git a/parts/outputviews/appoutputwidget.h b/parts/outputviews/appoutputwidget.h index 9a0d1e71..0673f106 100644 --- a/parts/outputviews/appoutputwidget.h +++ b/parts/outputviews/appoutputwidget.h @@ -12,7 +12,7 @@ #ifndef _APPOUTPUTWIDGET_H_ #define _APPOUTPUTWIDGET_H_ -#include <qstringlist.h> +#include <tqstringlist.h> #include <kregexp.h> #include "processwidget.h" @@ -29,12 +29,12 @@ public: // clears our own store and the one of our base ProcessWidget public slots: - void slotRowSelected(QListBoxItem* row); - void insertStdoutLine(const QCString &line); - void insertStderrLine(const QCString &line); - void addPartialStdoutLine(const QCString &line); - void addPartialStderrLine(const QCString &line); - void slotContextMenu(QListBoxItem *, const QPoint &); + void slotRowSelected(TQListBoxItem* row); + void insertStdoutLine(const TQCString &line); + void insertStderrLine(const TQCString &line); + void addPartialStdoutLine(const TQCString &line); + void addPartialStderrLine(const TQCString &line); + void slotContextMenu(TQListBoxItem *, const TQPoint &); void hideView(); void clearViewAndContents(); void clearFilter(); @@ -47,9 +47,9 @@ private: virtual void childFinished(bool normal, int status); void saveOutputToFile( bool useFilter ); void reinsertAndFilter(); - bool filterSingleLine( const QString & line ); + bool filterSingleLine( const TQString & line ); - QStringList m_contentList; + TQStringList m_contentList; struct OutputFilter { @@ -57,13 +57,13 @@ private: bool m_isActive; bool m_isRegExp; bool m_caseSensitive; - QString m_filterString; + TQString m_filterString; }; AppOutputViewPart* m_part; OutputFilter m_filter; - QCString stdoutbuf; - QCString stderrbuf; + TQCString stdoutbuf; + TQCString stderrbuf; }; #endif diff --git a/parts/outputviews/commandcontinuationfilter.cpp b/parts/outputviews/commandcontinuationfilter.cpp index 474cec15..e33a7a6a 100644 --- a/parts/outputviews/commandcontinuationfilter.cpp +++ b/parts/outputviews/commandcontinuationfilter.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "commandcontinuationfilter.h" -#include <qregexp.h> +#include <tqregexp.h> #include <kdebug.h> CommandContinuationFilter::CommandContinuationFilter( OutputFilter& next ) @@ -18,7 +18,7 @@ CommandContinuationFilter::CommandContinuationFilter( OutputFilter& next ) { } -void CommandContinuationFilter::processLine( const QString& line ) +void CommandContinuationFilter::processLine( const TQString& line ) { int index=line.length()-1; while (index>=0) diff --git a/parts/outputviews/commandcontinuationfilter.h b/parts/outputviews/commandcontinuationfilter.h index d0239caf..fff8e5aa 100644 --- a/parts/outputviews/commandcontinuationfilter.h +++ b/parts/outputviews/commandcontinuationfilter.h @@ -13,17 +13,17 @@ #define CommandContinuationFilter_h #include "outputfilter.h" -#include <qstring.h> +#include <tqstring.h> class CommandContinuationFilter : public OutputFilter { public: CommandContinuationFilter( OutputFilter& ); - void processLine( const QString& line ); + void processLine( const TQString& line ); private: - QString m_text; + TQString m_text; }; #endif diff --git a/parts/outputviews/compileerrorfilter.cpp b/parts/outputviews/compileerrorfilter.cpp index f8246346..9d48f1c8 100644 --- a/parts/outputviews/compileerrorfilter.cpp +++ b/parts/outputviews/compileerrorfilter.cpp @@ -23,7 +23,7 @@ CompileErrorFilter::ErrorFormat::ErrorFormat( const char * regExp, int file, int { } -CompileErrorFilter::ErrorFormat::ErrorFormat( const char * regExp, int file, int line, int text, QString comp ) +CompileErrorFilter::ErrorFormat::ErrorFormat( const char * regExp, int file, int line, int text, TQString comp ) : expression( regExp ) , fileGroup( file ) , lineGroup( line ) @@ -75,13 +75,13 @@ CompileErrorFilter::ErrorFormat* CompileErrorFilter::errorFormats() } -void CompileErrorFilter::processLine( const QString& line ) +void CompileErrorFilter::processLine( const TQString& line ) { bool hasmatch = false; - QString file; + TQString file; int lineNum = 0; - QString text; - QString compiler; + TQString text; + TQString compiler; int i = 0; bool isWarning = false; bool isInstantiationInfo = false; @@ -89,7 +89,7 @@ void CompileErrorFilter::processLine( const QString& line ) ErrorFormat* format = &errFormats[i]; while( !format->expression.isEmpty() ) { - QRegExp& regExp = format->expression; + TQRegExp& regExp = format->expression; if ( regExp.search( line ) != -1 ) { hasmatch = true; @@ -97,7 +97,7 @@ void CompileErrorFilter::processLine( const QString& line ) lineNum = regExp.cap( format->lineGroup ).toInt() - 1; text = regExp.cap( format->textGroup ); compiler = format->compiler; - QString cap = regExp.cap(3); + TQString cap = regExp.cap(3); if (cap.contains("warning:", false) || cap.contains("Warnung:", false)) isWarning = true; if (regExp.cap(3).contains("instantiated from", false)) { @@ -112,8 +112,8 @@ void CompileErrorFilter::processLine( const QString& line ) if( hasmatch ) { // Add hacks for error strings you want excluded here - if( text.find( QString::fromLatin1("(Each undeclared identifier is reported only once") ) >= 0 - || text.find( QString::fromLatin1("for each function it appears in.)") ) >= 0 ) + if( text.find( TQString::fromLatin1("(Each undeclared identifier is reported only once") ) >= 0 + || text.find( TQString::fromLatin1("for each function it appears in.)") ) >= 0 ) hasmatch = false; } diff --git a/parts/outputviews/compileerrorfilter.h b/parts/outputviews/compileerrorfilter.h index d07495cf..2f67adaf 100644 --- a/parts/outputviews/compileerrorfilter.h +++ b/parts/outputviews/compileerrorfilter.h @@ -12,14 +12,14 @@ #ifndef CompileErrorFilter_h #define CompileErrorFilter_h -#include <qobject.h> -#include <qregexp.h> -#include <qvaluelist.h> +#include <tqobject.h> +#include <tqregexp.h> +#include <tqvaluelist.h> #include "outputfilter.h" class MakeItem; -class CompileErrorFilter : public QObject, public OutputFilter +class CompileErrorFilter : public TQObject, public OutputFilter { Q_OBJECT @@ -30,16 +30,16 @@ public: { ErrorFormat() {} ErrorFormat( const char *, int, int, int ); - ErrorFormat( const char *, int, int, int, QString ); - QRegExp expression; + ErrorFormat( const char *, int, int, int, TQString ); + TQRegExp expression; int fileGroup; int lineGroup; int textGroup; - QString compiler; + TQString compiler; }; static ErrorFormat* errorFormats(); - void processLine( const QString& line ); + void processLine( const TQString& line ); signals: void item( MakeItem* ); diff --git a/parts/outputviews/directorystatusmessagefilter.cpp b/parts/outputviews/directorystatusmessagefilter.cpp index 5738f41d..02629797 100644 --- a/parts/outputviews/directorystatusmessagefilter.cpp +++ b/parts/outputviews/directorystatusmessagefilter.cpp @@ -13,7 +13,7 @@ #include "directorystatusmessagefilter.moc" #include "makeitem.h" -#include <qregexp.h> +#include <tqregexp.h> #include <kdebug.h> DirectoryStatusMessageFilter::DirectoryStatusMessageFilter( OutputFilter& next ) @@ -21,9 +21,9 @@ DirectoryStatusMessageFilter::DirectoryStatusMessageFilter( OutputFilter& next ) { } -void DirectoryStatusMessageFilter::processLine( const QString& line ) +void DirectoryStatusMessageFilter::processLine( const TQString& line ) { - QString dir; + TQString dir; if ( matchEnterDir( line, dir ) ) { emit item( new EnteringDirectoryItem( dir, line ) ); @@ -40,7 +40,7 @@ void DirectoryStatusMessageFilter::processLine( const QString& line ) // simple helper function - checks whether we entered a new directory // (locale and Utf8 aware) -bool DirectoryStatusMessageFilter::matchEnterDir( const QString& line, QString& dir ) +bool DirectoryStatusMessageFilter::matchEnterDir( const TQString& line, TQString& dir ) { // make outputs localised strings in Utf8 for entering/leaving directories... static const unsigned short fr_enter[] = @@ -70,28 +70,28 @@ bool DirectoryStatusMessageFilter::matchEnterDir( const QString& line, QString& 0x412,0x445,0x43e,0x434,0x20,0x432,0x20,0x43a,0x430,0x442,0x430,0x43b,0x43e,0x433 }; - static const QString fr_e( (const QChar*)fr_enter, sizeof(fr_enter) / 2 ); - static const QString pl_e( (const QChar*)pl_enter, sizeof(pl_enter) / 2 ); - static const QString ja_e( (const QChar*)ja_enter, sizeof(ja_enter) / 2 ); - static const QString ko_e( (const QChar*)ko_enter, sizeof(ko_enter) / 2 ); - static const QString ko_b( (const QChar*)ko_behind, sizeof(ko_behind) / 2 ); - static const QString pt_br_e( (const QChar*)pt_br_enter, sizeof(pt_br_enter) / 2 ); - static const QString ru_e( (const QChar*)ru_enter, sizeof(ru_enter) / 2 ); - static const QString en_e("Entering directory"); - static const QString de_e1("Wechsel in das Verzeichnis Verzeichnis"); - static const QString de_e2("Wechsel in das Verzeichnis"); - static const QString es_e("Cambiando a directorio"); - static const QString nl_e("Binnengaan van directory"); + static const TQString fr_e( (const TQChar*)fr_enter, sizeof(fr_enter) / 2 ); + static const TQString pl_e( (const TQChar*)pl_enter, sizeof(pl_enter) / 2 ); + static const TQString ja_e( (const TQChar*)ja_enter, sizeof(ja_enter) / 2 ); + static const TQString ko_e( (const TQChar*)ko_enter, sizeof(ko_enter) / 2 ); + static const TQString ko_b( (const TQChar*)ko_behind, sizeof(ko_behind) / 2 ); + static const TQString pt_br_e( (const TQChar*)pt_br_enter, sizeof(pt_br_enter) / 2 ); + static const TQString ru_e( (const TQChar*)ru_enter, sizeof(ru_enter) / 2 ); + static const TQString en_e("Entering directory"); + static const TQString de_e1("Wechsel in das Verzeichnis Verzeichnis"); + static const TQString de_e2("Wechsel in das Verzeichnis"); + static const TQString es_e("Cambiando a directorio"); + static const TQString nl_e("Binnengaan van directory"); //@todo: other translations! - // we need a QRegExp because KRegExp is not Utf8 aware. + // we need a TQRegExp because KRegExp is not Utf8 aware. // 0x00AB is LEFT-POINTING DOUBLE ANGLE QUOTATION MARK // 0X00BB is RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK - static QRegExp dirChange(QString::fromLatin1(".*: (.+) (`|") + QChar(0x00BB) + QString::fromLatin1(")(.*)('|") + QChar(0x00AB) + QString::fromLatin1(")(.*)")); - static QRegExp enEnter(QString::fromLatin1(".*: Entering directory")); + static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)")); + static TQRegExp enEnter(TQString::fromLatin1(".*: Entering directory")); kdDebug(9004) << "Directory filter line " << line << endl; - // avoid QRegExp if possible. This regex performs VERY badly with large inputs, + // avoid TQRegExp if possible. This regex performs VERY badly with large inputs, // and the input required is very short if these strings match. if(line.find(en_e) > -1 || line.find(fr_e) > -1 || @@ -118,7 +118,7 @@ bool DirectoryStatusMessageFilter::matchEnterDir( const QString& line, QString& // simple helper function - checks whether we left a directory // (locale and Utf8 aware). -bool DirectoryStatusMessageFilter::matchLeaveDir( const QString& line, QString& dir ) +bool DirectoryStatusMessageFilter::matchLeaveDir( const TQString& line, TQString& dir ) { static const unsigned short fr_leave[] = { 'Q','u','i','t','t','e',' ','l','e',' ','r',0xe9,'p','e','r','t','o','i','r','e' @@ -143,26 +143,26 @@ bool DirectoryStatusMessageFilter::matchLeaveDir( const QString& line, QString& 0x20,0xb514,0xb809,0xd1a0,0xb9ac }; - static const QString fr_l( (const QChar*)fr_leave, sizeof(fr_leave) / 2 ); - static const QString ja_l( (const QChar*)ja_leave, sizeof(ja_leave) / 2 ); - static const QString ko_l( (const QChar*)ko_leave, sizeof(ko_leave) / 2 ); - static const QString ko_b( (const QChar*)ko_behind, sizeof(ko_behind) / 2 ); - static const QString pt_br_l( (const QChar*)pt_br_leave, sizeof(pt_br_leave) / 2 ); - static const QString ru_l( (const QChar*)ru_leave, sizeof(ru_leave) / 2 ); - static const QString en_l("Leaving directory"); - static const QString de_l1("Verlassen des Verzeichnisses Verzeichnis"); - static const QString de_l2("Verlassen des Verzeichnisses"); - static const QString es_l("Saliendo directorio"); - static const QString nl_l("Verdwijnen uit directory"); - static const QString po_l("Opuszczam katalog"); + static const TQString fr_l( (const TQChar*)fr_leave, sizeof(fr_leave) / 2 ); + static const TQString ja_l( (const TQChar*)ja_leave, sizeof(ja_leave) / 2 ); + static const TQString ko_l( (const TQChar*)ko_leave, sizeof(ko_leave) / 2 ); + static const TQString ko_b( (const TQChar*)ko_behind, sizeof(ko_behind) / 2 ); + static const TQString pt_br_l( (const TQChar*)pt_br_leave, sizeof(pt_br_leave) / 2 ); + static const TQString ru_l( (const TQChar*)ru_leave, sizeof(ru_leave) / 2 ); + static const TQString en_l("Leaving directory"); + static const TQString de_l1("Verlassen des Verzeichnisses Verzeichnis"); + static const TQString de_l2("Verlassen des Verzeichnisses"); + static const TQString es_l("Saliendo directorio"); + static const TQString nl_l("Verdwijnen uit directory"); + static const TQString po_l("Opuszczam katalog"); - // we need a QRegExp because KRegExp is not Utf8 aware. + // we need a TQRegExp because KRegExp is not Utf8 aware. // 0x00AB is LEFT-POINTING DOUBLE ANGLE QUOTATION MARK // 0X00BB is RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK - static QRegExp dirChange(QString::fromLatin1(".*: (.+) (`|") + QChar(0x00BB) + QString::fromLatin1(")(.*)('|") + QChar(0x00AB) + QString::fromLatin1(")(.*)")); + static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)")); - // avoid QRegExp if possible. This regex performs VERY badly with large inputs, + // avoid TQRegExp if possible. This regex performs VERY badly with large inputs, // and the input required is very short if these strings match. if(line.find(en_l) > -1 || line.find(fr_l) > -1 || diff --git a/parts/outputviews/directorystatusmessagefilter.h b/parts/outputviews/directorystatusmessagefilter.h index 18972487..0d57e52d 100644 --- a/parts/outputviews/directorystatusmessagefilter.h +++ b/parts/outputviews/directorystatusmessagefilter.h @@ -12,28 +12,28 @@ #ifndef DirectoryStatusMessageFilter_h #define DirectoryStatusMessageFilter_h -#include <qobject.h> +#include <tqobject.h> #include "outputfilter.h" class EnteringDirectoryItem; class ExitingDirectoryItem; -class DirectoryStatusMessageFilter : public QObject, public OutputFilter +class DirectoryStatusMessageFilter : public TQObject, public OutputFilter { Q_OBJECT public: DirectoryStatusMessageFilter( OutputFilter& ); - void processLine( const QString& line ); + void processLine( const TQString& line ); signals: void item( EnteringDirectoryItem* ); void item( ExitingDirectoryItem* ); private: - bool matchEnterDir( const QString& line, QString& dir ); - bool matchLeaveDir( const QString& line, QString& dir ); + bool matchEnterDir( const TQString& line, TQString& dir ); + bool matchLeaveDir( const TQString& line, TQString& dir ); }; #endif diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp index bbcc61fb..4edaae2b 100644 --- a/parts/outputviews/makeactionfilter.cpp +++ b/parts/outputviews/makeactionfilter.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include <qdatetime.h> +#include <tqdatetime.h> #include <kdebug.h> #include "makeactionfilter.h" @@ -20,7 +20,7 @@ //#define DEBUG -MakeActionFilter::ActionFormat::ActionFormat( const QString& _action, const QString& _tool, const char * regExp, int file ) +MakeActionFilter::ActionFormat::ActionFormat( const TQString& _action, const TQString& _tool, const char * regExp, int file ) : m_action( _action ) , m_expression( regExp ) , m_tool( _tool ) @@ -29,7 +29,7 @@ MakeActionFilter::ActionFormat::ActionFormat( const QString& _action, const QStr { } -MakeActionFilter::ActionFormat::ActionFormat( const QString& _action, int tool, int file, const char * regExp) +MakeActionFilter::ActionFormat::ActionFormat( const TQString& _action, int tool, int file, const char * regExp) : m_action( _action ) , m_expression( regExp ) , m_tool() @@ -38,19 +38,19 @@ MakeActionFilter::ActionFormat::ActionFormat( const QString& _action, int tool, { } -QString MakeActionFilter::ActionFormat::tool() +TQString MakeActionFilter::ActionFormat::tool() { if (m_toolGroup==-1) return m_tool; return m_expression.cap(m_toolGroup); } -QString MakeActionFilter::ActionFormat::file() +TQString MakeActionFilter::ActionFormat::file() { return m_expression.cap(m_fileGroup); } -bool MakeActionFilter::ActionFormat::matches(const QString& line) +bool MakeActionFilter::ActionFormat::matches(const TQString& line) { return ( m_expression.search( line ) != -1 ); } @@ -96,13 +96,13 @@ MakeActionFilter::ActionFormat* MakeActionFilter::actionFormats() ActionFormat( i18n("compiling"), "dcopidl2cpp", "dcopidl2cpp (?:\\S* )*([^\\s;]+)", 1 ), ActionFormat( i18n("installing"), 1, 1, "-- Installing (.*)" ), //cmake - ActionFormat( QString::null, QString::null, 0, 0 ) + ActionFormat( TQString::null, TQString::null, 0, 0 ) }; return formats; } -void MakeActionFilter::processLine( const QString& line ) +void MakeActionFilter::processLine( const TQString& line ) { ActionItem* actionItem = matchLine( line ); if ( actionItem != NULL ) @@ -115,10 +115,10 @@ void MakeActionFilter::processLine( const QString& line ) } } -ActionItem* MakeActionFilter::matchLine( const QString& line ) +ActionItem* MakeActionFilter::matchLine( const TQString& line ) { #ifdef DEBUG - QTime t; + TQTime t; t.start(); #endif /// \FIXME This is very slow, possibly due to the regexr matching. It can take @@ -148,23 +148,23 @@ ActionItem* MakeActionFilter::matchLine( const QString& line ) struct TestItem { TestItem() {} - TestItem( const QString& _line, const QString& _action, const QString& _tool, const QString& _file ) + TestItem( const TQString& _line, const TQString& _action, const TQString& _tool, const TQString& _file ) : line( _line ) , action( _action ) , tool( _tool ) , file( _file ) {} - QString line; - QString action; - QString tool; - QString file; + TQString line; + TQString action; + TQString tool; + TQString file; }; #ifdef DEBUG void MakeActionFilter::test() { - static QValueList<TestItem> testItems = QValueList<TestItem>() + static TQValueList<TestItem> testItems = TQValueList<TestItem>() << TestItem( // simple qmake compile "g++ -c -pipe -Wall -W -O2 -DQT_NO_DEBUG -I/home/john/src/kde/qt-copy/mkspecs/default -I. " @@ -282,7 +282,7 @@ void MakeActionFilter::test() "compiling", "g++", "quanta_init.cpp") ; - QValueList<TestItem>::const_iterator it = testItems.begin(); + TQValueList<TestItem>::const_iterator it = testItems.begin(); for( ; it != testItems.end(); ++it ) { ActionItem* actionItem = matchLine( (*it).line ); diff --git a/parts/outputviews/makeactionfilter.h b/parts/outputviews/makeactionfilter.h index 66de7a3b..4f3a0e68 100644 --- a/parts/outputviews/makeactionfilter.h +++ b/parts/outputviews/makeactionfilter.h @@ -12,15 +12,15 @@ #ifndef MakeActionFilter_h #define MakeActionFilter_h -#include <qobject.h> -#include <qregexp.h> -#include <qvaluelist.h> +#include <tqobject.h> +#include <tqregexp.h> +#include <tqvaluelist.h> #include "outputfilter.h" class MakeItem; class ActionItem; -class MakeActionFilter : public QObject, public OutputFilter +class MakeActionFilter : public TQObject, public OutputFilter { Q_OBJECT @@ -35,28 +35,28 @@ public: { public: ActionFormat():m_toolGroup(-1) {} - ActionFormat( const QString&, const QString&, const char * regExp, int file); - ActionFormat( const QString&, int tool, int file, const char * regExp); - QString tool(); - QString file(); - const QString& action() const {return m_action;} - bool matches(const QString& line); + ActionFormat( const TQString&, const TQString&, const char * regExp, int file); + ActionFormat( const TQString&, int tool, int file, const char * regExp); + TQString tool(); + TQString file(); + const TQString& action() const {return m_action;} + bool matches(const TQString& line); private: - QString m_action; - QRegExp m_expression; - QString m_tool; + TQString m_action; + TQRegExp m_expression; + TQString m_tool; int m_toolGroup; int m_fileGroup; }; static ActionFormat* actionFormats(); - void processLine( const QString& line ); + void processLine( const TQString& line ); signals: void item( MakeItem* ); private: - static ActionItem* matchLine( const QString& line ); + static ActionItem* matchLine( const TQString& line ); }; #endif diff --git a/parts/outputviews/makeitem.cpp b/parts/outputviews/makeitem.cpp index c4d5a04c..218bb894 100644 --- a/parts/outputviews/makeitem.cpp +++ b/parts/outputviews/makeitem.cpp @@ -11,7 +11,7 @@ #include "makeitem.h" -#include <qstylesheet.h> +#include <tqstylesheet.h> #include <kdebug.h> #include <klocale.h> @@ -22,7 +22,7 @@ MakeItem::MakeItem() { } -MakeItem::MakeItem( const QString& text ) +MakeItem::MakeItem( const TQString& text ) : m_text( text ) { } @@ -31,7 +31,7 @@ MakeItem::~MakeItem() { } -QString MakeItem::color( bool bright_bg ) +TQString MakeItem::color( bool bright_bg ) { switch ( type() ) { @@ -46,7 +46,7 @@ QString MakeItem::color( bool bright_bg ) } } -QString MakeItem::icon() +TQString MakeItem::icon() { switch ( type() ) { @@ -60,14 +60,14 @@ QString MakeItem::icon() } } -QString MakeItem::text( EOutputLevel ) +TQString MakeItem::text( EOutputLevel ) { - return QStyleSheet::escape( m_text ); + return TQStyleSheet::escape( m_text ); } -QString MakeItem::formattedText( EOutputLevel level, bool bright_bg ) +TQString MakeItem::formattedText( EOutputLevel level, bool bright_bg ) { - QString txt = text(level); + TQString txt = text(level); if (txt.isEmpty()) return "<br>"; if ( level == eFull ) @@ -76,24 +76,24 @@ QString MakeItem::formattedText( EOutputLevel level, bool bright_bg ) } else { - return QString("<code>") + return TQString("<code>") .append( icon() ).append("<font color=\"").append( color( bright_bg) ).append("\">") .append( txt ).append("</font></code>").append( br() ); } } -QString MakeItem::br() +TQString MakeItem::br() { // Qt >= 3.1 doesn't need a <br>. #if QT_VERSION < 0x040000 - static const QString br = QString::fromLatin1( qVersion() ).section( ".", 1, 1 ).toInt() > 0 ? "" : "<br>"; + static const TQString br = TQString::fromLatin1( qVersion() ).section( ".", 1, 1 ).toInt() > 0 ? "" : "<br>"; #else - static const QString br; + static const TQString br; #endif return br; } -ErrorItem::ErrorItem( const QString& fn, int ln, const QString& tx, const QString& line, bool isWarning, bool isInstatiationInfo, const QString& compiler ) +ErrorItem::ErrorItem( const TQString& fn, int ln, const TQString& tx, const TQString& line, bool isWarning, bool isInstatiationInfo, const TQString& compiler ) : MakeItem( line ) , fileName(fn) , lineNum(ln) @@ -107,7 +107,7 @@ ErrorItem::~ErrorItem() { } -bool ErrorItem::append( const QString& text ) +bool ErrorItem::append( const TQString& text ) { if ( !text.startsWith(" ") ) return false; @@ -133,34 +133,34 @@ ExitStatusItem::ExitStatusItem( bool normalExit, int exitStatus ) m_text = i18n("*** Success ***"); } -QString ExitStatusItem::text( EOutputLevel ) +TQString ExitStatusItem::text( EOutputLevel ) { return m_text; } bool DirectoryItem::m_showDirectoryMessages = true; -QString EnteringDirectoryItem::text( EOutputLevel outputLevel ) +TQString EnteringDirectoryItem::text( EOutputLevel outputLevel ) { if ( outputLevel < eFull ) return i18n("Entering directory %1").arg( directory ); return m_text; } -QString ExitingDirectoryItem::text( EOutputLevel outputLevel ) +TQString ExitingDirectoryItem::text( EOutputLevel outputLevel ) { if ( outputLevel < eFull ) return i18n("Leaving directory %1").arg( directory ); return m_text; } -QString ActionItem::text( EOutputLevel outputLevel ) +TQString ActionItem::text( EOutputLevel outputLevel ) { if ( outputLevel < eFull ) { if ( m_tool.isEmpty() ) - return QString(m_action).append(" <b>").append(m_file).append("</b>"); - return QString(m_action).append(" <b>").append(m_file).append("</b>").append(" (").append(m_tool).append(")"); + return TQString(m_action).append(" <b>").append(m_file).append("</b>"); + return TQString(m_action).append(" <b>").append(m_file).append("</b>").append(" (").append(m_tool).append(")"); } return MakeItem::text( outputLevel ); } diff --git a/parts/outputviews/makeitem.h b/parts/outputviews/makeitem.h index e95dd4df..94acc3e2 100644 --- a/parts/outputviews/makeitem.h +++ b/parts/outputviews/makeitem.h @@ -12,7 +12,7 @@ #ifndef MakeItem_h #define MakeItem_h -#include <qstring.h> +#include <tqstring.h> enum EOutputLevel { @@ -27,7 +27,7 @@ class MakeItem public: enum Type { Normal, Error, Warning, Diagnostic }; MakeItem(); - MakeItem( const QString& text ); + MakeItem( const TQString& text ); virtual ~MakeItem(); enum DisplayModes @@ -37,23 +37,23 @@ public: Append = 2 // item's text can be appended (append has been overloaded) }; virtual int displayMode() const { return ImmDisplay; } - virtual bool append( const QString& ) { return false; } + virtual bool append( const TQString& ) { return false; } virtual Type type() { return Diagnostic; } virtual bool visible( EOutputLevel level ) { return level > eVeryShort; } - virtual QString text( EOutputLevel ); - virtual QString formattedText( EOutputLevel, bool bright_bg ); - QString icon(); - QString color( bool bright_bg ); + virtual TQString text( EOutputLevel ); + virtual TQString formattedText( EOutputLevel, bool bright_bg ); + TQString icon(); + TQString color( bool bright_bg ); - static QString br(); + static TQString br(); - QString m_text; + TQString m_text; }; class CommandItem : public MakeItem { public: - CommandItem(const QString command) + CommandItem(const TQString command) : MakeItem( command ) {} @@ -68,7 +68,7 @@ public: Type type() { return m_normalExit && m_exitStatus == 0 ? Diagnostic : Error; } virtual bool visible( EOutputLevel ) { return true; } - QString text( EOutputLevel level ); + TQString text( EOutputLevel level ); private: bool m_normalExit; @@ -78,7 +78,7 @@ private: class DirectoryItem : public MakeItem { public: - DirectoryItem( const QString& dir, const QString& text ) + DirectoryItem( const TQString& dir, const TQString& text ) : MakeItem( text ) , directory( dir ) {} @@ -88,7 +88,7 @@ public: static void setShowDirectoryMessages( bool show ) { m_showDirectoryMessages = show; } static bool getShowDirectoryMessages() { return m_showDirectoryMessages; } - QString directory; + TQString directory; protected: static bool m_showDirectoryMessages; @@ -97,7 +97,7 @@ protected: class EnteringDirectoryItem : public DirectoryItem { public: - EnteringDirectoryItem( const QString& dir, const QString& text ) + EnteringDirectoryItem( const TQString& dir, const TQString& text ) : DirectoryItem( dir, text ) {} bool visible( EOutputLevel ) @@ -105,13 +105,13 @@ public: return m_showDirectoryMessages; } - virtual QString text( EOutputLevel ); + virtual TQString text( EOutputLevel ); }; class ExitingDirectoryItem : public DirectoryItem { public: - ExitingDirectoryItem( const QString& dir, const QString& text ) + ExitingDirectoryItem( const TQString& dir, const TQString& text ) : DirectoryItem( dir, text ) {} bool visible( EOutputLevel level ) @@ -119,7 +119,7 @@ public: return m_showDirectoryMessages && level > eVeryShort; } - virtual QString text( EOutputLevel ); + virtual TQString text( EOutputLevel ); }; namespace KTextEditor { class Cursor; class Document; } @@ -127,26 +127,26 @@ namespace KTextEditor { class Cursor; class Document; } class ErrorItem : public MakeItem { public: - ErrorItem( const QString& fn, int ln, const QString& tx, const QString& line, bool isWarning, bool isInstatiationInfo, const QString& compiler ); + ErrorItem( const TQString& fn, int ln, const TQString& tx, const TQString& line, bool isWarning, bool isInstatiationInfo, const TQString& compiler ); virtual ~ErrorItem(); - virtual bool append( const QString& text ); + virtual bool append( const TQString& text ); virtual int displayMode() const { return DelayedDisplay | Append; } Type type() { return m_isInstatiationInfo ? Diagnostic : (m_isWarning ? Warning : Error); } virtual bool visible( EOutputLevel ) { return true; } - QString fileName; + TQString fileName; int lineNum; - QString m_error; + TQString m_error; bool m_isWarning; bool m_isInstatiationInfo; ///this also implies isWarning - QString m_compiler; + TQString m_compiler; }; class ActionItem : public MakeItem { public: - ActionItem( const QString& action, const QString& file, const QString& tool, const QString& line ) + ActionItem( const TQString& action, const TQString& file, const TQString& tool, const TQString& line ) : MakeItem( line ) , m_action( action ) , m_file( file ) @@ -154,11 +154,11 @@ public: {} virtual bool visible( EOutputLevel ) { return true; } - virtual QString text( EOutputLevel level ); + virtual TQString text( EOutputLevel level ); - QString m_action; - QString m_file; - QString m_tool; + TQString m_action; + TQString m_file; + TQString m_tool; }; #endif diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp index 3f2ebbd8..7c9dcb79 100644 --- a/parts/outputviews/makeviewpart.cpp +++ b/parts/outputviews/makeviewpart.cpp @@ -11,8 +11,8 @@ #include "makeviewpart.h" -#include <qwhatsthis.h> -#include <qdir.h> +#include <tqwhatsthis.h> +#include <tqdir.h> #include <kdebug.h> #include <klocale.h> #include <kaction.h> @@ -30,7 +30,7 @@ static const KDevPluginInfo data("kdevmakeview"); typedef KDevGenericFactory< MakeViewPart > MakeViewFactory; K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( data ) ) -MakeViewPart::MakeViewPart(QObject *parent, const char *name, const QStringList &) +MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringList &) : KDevMakeFrontend(&data, parent, name) { setInstance(MakeViewFactory::instance()); @@ -42,7 +42,7 @@ MakeViewPart::MakeViewPart(QObject *parent, const char *name, const QStringList m_widget = new MakeWidget(this); m_widget->setIcon( SmallIcon("exec") ); m_widget->setCaption(i18n("Messages Output")); - QWhatsThis::add(m_widget, i18n("<b>Messages output</b><p>" + TQWhatsThis::add(m_widget, i18n("<b>Messages output</b><p>" "The messages window shows the output of the compiler and " "used build tools like make, ant, uic, dcopidl etc. " "For compiler error messages, click on the error message. " @@ -52,17 +52,17 @@ MakeViewPart::MakeViewPart(QObject *parent, const char *name, const QStringList mainWindow()->embedOutputView(m_widget, i18n("Messages"), i18n("Compiler output messages")); KAction *action; - action = new KAction( i18n("&Next Error"), Key_F4, m_widget, SLOT(nextError()), + action = new KAction( i18n("&Next Error"), Key_F4, m_widget, TQT_SLOT(nextError()), actionCollection(), "view_next_error"); action->setToolTip( i18n("Go to the next error") ); action->setWhatsThis(i18n("<b>Next error</b><p>Switches to the file and line where the next error was reported from.")); - action = new KAction( i18n("&Previous Error"), SHIFT+Key_F4, m_widget, SLOT(prevError()), + action = new KAction( i18n("&Previous Error"), SHIFT+Key_F4, m_widget, TQT_SLOT(prevError()), actionCollection(), "view_previous_error"); action->setToolTip( i18n("Go to the previous error") ); action->setWhatsThis(i18n("<b>Previous error</b><p>Switches to the file and line where the previous error was reported from.")); - connect( core(), SIGNAL(stopButtonClicked(KDevPlugin*)), - this, SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); } @@ -81,7 +81,7 @@ void MakeViewPart::slotStopButtonClicked(KDevPlugin* which) m_widget->killJob(); } -void MakeViewPart::queueCommand(const QString &dir, const QString &command) +void MakeViewPart::queueCommand(const TQString &dir, const TQString &command) { m_widget->queueJob(dir, command); } @@ -92,7 +92,7 @@ bool MakeViewPart::isRunning() return m_widget->isRunning(); } -QWidget* MakeViewPart::widget() +TQWidget* MakeViewPart::widget() { return m_widget.operator->(); } diff --git a/parts/outputviews/makeviewpart.h b/parts/outputviews/makeviewpart.h index 78f969ff..808a9208 100644 --- a/parts/outputviews/makeviewpart.h +++ b/parts/outputviews/makeviewpart.h @@ -12,7 +12,7 @@ #ifndef _MAKEVIEWPART_H_ #define _MAKEVIEWPART_H_ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include "kdevmakefrontend.h" #include "KDevMakeFrontendIface.h" @@ -25,20 +25,20 @@ class MakeViewPart : public KDevMakeFrontend Q_OBJECT public: - MakeViewPart( QObject *parent, const char *name, const QStringList & ); + MakeViewPart( TQObject *parent, const char *name, const TQStringList & ); ~MakeViewPart(); - virtual QWidget* widget(); + virtual TQWidget* widget(); virtual void updateSettingsFromConfig(); private slots: void slotStopButtonClicked(KDevPlugin*); protected: - virtual void queueCommand(const QString &dir, const QString &command); + virtual void queueCommand(const TQString &dir, const TQString &command); virtual bool isRunning(); private: - QGuardedPtr<MakeWidget> m_widget; + TQGuardedPtr<MakeWidget> m_widget; KDevMakeFrontendIface *m_dcop; friend class MakeWidget; }; diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index 554713c4..3ccc4608 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -33,15 +33,15 @@ #include <kapplication.h> #include <kconfig.h> -#include <qmessagebox.h> -#include <qapplication.h> -#include <qdir.h> -#include <qimage.h> -#include <qstylesheet.h> -#include <qtimer.h> -#include <qfileinfo.h> -#include <qclipboard.h> -#include <qpopupmenu.h> +#include <tqmessagebox.h> +#include <tqapplication.h> +#include <tqdir.h> +#include <tqimage.h> +#include <tqstylesheet.h> +#include <tqtimer.h> +#include <tqfileinfo.h> +#include <tqclipboard.h> +#include <tqpopupmenu.h> #include <private/qrichtext_p.h> #include <stdlib.h> @@ -116,7 +116,7 @@ static const char *const message_xpm[] = class SelectionPreserver { public: - SelectionPreserver( QTextEdit& textEdit, bool stayAtEnd ) + SelectionPreserver( TQTextEdit& textEdit, bool stayAtEnd ) : m_textEdit( textEdit ) , m_atEnd( false ) { @@ -136,18 +136,18 @@ public: if ( m_atEnd ) { - m_textEdit.moveCursor(QTextEdit::MoveEnd, false); - m_textEdit.moveCursor(QTextEdit::MoveLineStart, false);//if linewrap is off we must avoid the jumping of the vertical scrollbar + m_textEdit.moveCursor(TQTextEdit::MoveEnd, false); + m_textEdit.moveCursor(TQTextEdit::MoveLineStart, false);//if linewrap is off we must avoid the jumping of the vertical scrollbar } } - QTextEdit& m_textEdit; + TQTextEdit& m_textEdit; bool m_atEnd; int paraFrom, indexFrom, paraTo, indexTo; }; MakeWidget::MakeWidget(MakeViewPart *part) - : QTextEdit(0, "make widget") + : TQTextEdit(0, "make widget") , m_directoryStatusFilter( m_errorFilter ) , m_errorFilter( m_continuationFilter ) , m_continuationFilter( m_actionFilter ) @@ -171,51 +171,51 @@ MakeWidget::MakeWidget(MakeViewPart *part) setWrapPolicy(Anywhere); setReadOnly(true); - setMimeSourceFactory(new QMimeSourceFactory); - mimeSourceFactory()->setImage("error", QImage((const char**)error_xpm)); - mimeSourceFactory()->setImage("warning", QImage((const char**)warning_xpm)); - mimeSourceFactory()->setImage("message", QImage((const char**)message_xpm)); + setMimeSourceFactory(new TQMimeSourceFactory); + mimeSourceFactory()->setImage("error", TQImage((const char**)error_xpm)); + mimeSourceFactory()->setImage("warning", TQImage((const char**)warning_xpm)); + mimeSourceFactory()->setImage("message", TQImage((const char**)message_xpm)); dirstack.setAutoDelete(true); childproc = new KProcess(this); procLineMaker = new ProcessLineMaker( childproc ); - connect( procLineMaker, SIGNAL(receivedStdoutLine(const QCString&)), - this, SLOT(insertStdoutLine(const QCString&) )); - connect( procLineMaker, SIGNAL(receivedStderrLine(const QCString&)), - this, SLOT(insertStderrLine(const QCString&) )); - connect( procLineMaker, SIGNAL(receivedPartialStdoutLine(const QCString&)), - this, SLOT(storePartialStdoutLine(const QCString&) )); - connect( procLineMaker, SIGNAL(receivedPartialStderrLine(const QCString&)), - this, SLOT(storePartialStderrLine(const QCString&) )); - - connect( childproc, SIGNAL(processExited(KProcess*)), - this, SLOT(slotProcessExited(KProcess*) )) ; - - connect( &m_directoryStatusFilter, SIGNAL(item(EnteringDirectoryItem*)), - this, SLOT(slotEnteredDirectory(EnteringDirectoryItem*)) ); - connect( &m_directoryStatusFilter, SIGNAL(item(ExitingDirectoryItem*)), - this, SLOT(slotExitedDirectory(ExitingDirectoryItem*)) ); - connect( &m_errorFilter, SIGNAL(item(MakeItem*)), - this, SLOT(insertItem(MakeItem*)) ); - connect( &m_actionFilter, SIGNAL(item(MakeItem*)), - this, SLOT(insertItem(MakeItem*)) ); - connect( &m_otherFilter, SIGNAL(item(MakeItem*)), - this, SLOT(insertItem(MakeItem*)) ); - - connect( verticalScrollBar(), SIGNAL(sliderPressed()), - this, SLOT(verticScrollingOn()) ); - connect( verticalScrollBar(), SIGNAL(sliderReleased()), - this, SLOT(verticScrollingOff()) ); - connect( horizontalScrollBar(), SIGNAL(sliderPressed()), - this, SLOT(horizScrollingOn()) ); - connect( horizontalScrollBar(), SIGNAL(sliderReleased()), - this, SLOT(horizScrollingOff()) ); + connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), + this, TQT_SLOT(insertStdoutLine(const TQCString&) )); + connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)), + this, TQT_SLOT(insertStderrLine(const TQCString&) )); + connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)), + this, TQT_SLOT(storePartialStdoutLine(const TQCString&) )); + connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), + this, TQT_SLOT(storePartialStderrLine(const TQCString&) )); + + connect( childproc, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotProcessExited(KProcess*) )) ; + + connect( &m_directoryStatusFilter, TQT_SIGNAL(item(EnteringDirectoryItem*)), + this, TQT_SLOT(slotEnteredDirectory(EnteringDirectoryItem*)) ); + connect( &m_directoryStatusFilter, TQT_SIGNAL(item(ExitingDirectoryItem*)), + this, TQT_SLOT(slotExitedDirectory(ExitingDirectoryItem*)) ); + connect( &m_errorFilter, TQT_SIGNAL(item(MakeItem*)), + this, TQT_SLOT(insertItem(MakeItem*)) ); + connect( &m_actionFilter, TQT_SIGNAL(item(MakeItem*)), + this, TQT_SLOT(insertItem(MakeItem*)) ); + connect( &m_otherFilter, TQT_SIGNAL(item(MakeItem*)), + this, TQT_SLOT(insertItem(MakeItem*)) ); + + connect( verticalScrollBar(), TQT_SIGNAL(sliderPressed()), + this, TQT_SLOT(verticScrollingOn()) ); + connect( verticalScrollBar(), TQT_SIGNAL(sliderReleased()), + this, TQT_SLOT(verticScrollingOff()) ); + connect( horizontalScrollBar(), TQT_SIGNAL(sliderPressed()), + this, TQT_SLOT(horizScrollingOn()) ); + connect( horizontalScrollBar(), TQT_SIGNAL(sliderReleased()), + this, TQT_SLOT(horizScrollingOff()) ); // this slot doesn't exist anymore -// connect( m_part->partController(), SIGNAL(loadedFile(const KURL&)), -// this, SLOT(slotDocumentOpened(const KURL&)) ); +// connect( m_part->partController(), TQT_SIGNAL(loadedFile(const KURL&)), +// this, TQT_SLOT(slotDocumentOpened(const KURL&)) ); } MakeWidget::~MakeWidget() @@ -225,7 +225,7 @@ MakeWidget::~MakeWidget() delete procLineMaker; } -void MakeWidget::queueJob(const QString &dir, const QString &command) +void MakeWidget::queueJob(const TQString &dir, const TQString &command) { commandList.append(command); dirList.append(dir); @@ -240,7 +240,7 @@ void MakeWidget::queueJob(const QString &dir, const QString &command) void MakeWidget::startNextJob() { - QStringList::Iterator it = commandList.begin(); + TQStringList::Iterator it = commandList.begin(); if ( it == commandList.end() ) return; @@ -254,7 +254,7 @@ void MakeWidget::startNextJob() m_bCompiling = false; else { - QString s = currentCommand.right(currentCommand.length() - i); + TQString s = currentCommand.right(currentCommand.length() - i); if ( s.contains("configure ") || s.contains(" Makefile.cvs") || s.contains(" clean") || @@ -270,12 +270,12 @@ void MakeWidget::startNextJob() } it = dirList.begin(); - QString dir = *it; + TQString dir = *it; m_lastBuildDir = dir; dirList.remove(it); clear(); // clear the widget - for ( QValueVector<MakeItem*>::iterator it = m_items.begin(); it != m_items.end(); ++it ) + for ( TQValueVector<MakeItem*>::iterator it = m_items.begin(); it != m_items.end(); ++it ) delete *it; m_items.clear(); m_paragraphToItem.clear(); @@ -290,7 +290,7 @@ void MakeWidget::startNextJob() childproc->start(KProcess::OwnGroup, KProcess::AllOutput); dirstack.clear(); - dirstack.push(new QString(dir)); + dirstack.push(new TQString(dir)); m_part->mainWindow()->raiseView(this); m_part->core()->running(m_part, true); @@ -317,7 +317,7 @@ void MakeWidget::copy() return; } - QString selection; + TQString selection; for(int i = parafrom; i<=parato; i++) selection += text(i) + "\n"; @@ -325,7 +325,7 @@ void MakeWidget::copy() if(m_compilerOutputLevel == eShort || m_compilerOutputLevel == eVeryShort ) { - QRegExp regexp("<.*>"); + TQRegExp regexp("<.*>"); regexp.setMinimal(true); selection.remove(regexp); } @@ -390,15 +390,15 @@ void MakeWidget::prevError() KNotifyClient::beep(); } -void MakeWidget::contentsMouseReleaseEvent( QMouseEvent* e ) +void MakeWidget::contentsMouseReleaseEvent( TQMouseEvent* e ) { - QTextEdit::contentsMouseReleaseEvent(e); + TQTextEdit::contentsMouseReleaseEvent(e); if ( e->button() != LeftButton ) return; searchItem(paragraphAt(e->pos())); } -void MakeWidget::keyPressEvent(QKeyEvent *e) +void MakeWidget::keyPressEvent(TQKeyEvent *e) { if (e->key() == Key_Return || e->key() == Key_Enter) { @@ -407,15 +407,15 @@ void MakeWidget::keyPressEvent(QKeyEvent *e) searchItem(parag); } else - QTextEdit::keyPressEvent(e); + TQTextEdit::keyPressEvent(e); } // returns the current directory for parag -QString MakeWidget::directory(int parag) const +TQString MakeWidget::directory(int parag) const { - QValueVector<MakeItem*>::const_iterator it = qFind( m_items.begin(), m_items.end(), m_paragraphToItem[parag] ); + TQValueVector<MakeItem*>::const_iterator it = qFind( m_items.begin(), m_items.end(), m_paragraphToItem[parag] ); if ( it == m_items.end() ) - return QString::null; + return TQString::null; // run backwards over directories and figure out where we are while ( it != m_items.begin() ) { --it; @@ -423,24 +423,24 @@ QString MakeWidget::directory(int parag) const if ( edi ) return edi->directory + "/"; } - return QString::null; + return TQString::null; } // hackish function that will return true and put string "file" in "fName" if the file // exists -static bool checkFileExists( const QString& file, QString& fName ) +static bool checkFileExists( const TQString& file, TQString& fName ) { - if ( QFile::exists( file ) ) { + if ( TQFile::exists( file ) ) { fName = file; return true; } return false; } -void MakeWidget::specialCheck( const QString& file, QString& fName ) const +void MakeWidget::specialCheck( const TQString& file, TQString& fName ) const { - QString firstLine = text(0); - QRegExp rx("cd \\'(.*)\\'.*"); + TQString firstLine = text(0); + TQRegExp rx("cd \\'(.*)\\'.*"); if (rx.search(firstLine) != -1) { KURL url(rx.cap(1)+"/", file); @@ -454,8 +454,8 @@ void MakeWidget::specialCheck( const QString& file, QString& fName ) const } // Ok the "worst case", lets see if we can find a file in the project that has the same name // obviously this will pick always the wrong file when you've got the same filename multiple times. - QStringList files = m_part->project()->allFiles(); - for( QStringList::iterator it = files.begin() ; it != files.end(); ++it) + TQStringList files = m_part->project()->allFiles(); + for( TQStringList::iterator it = files.begin() ; it != files.end(); ++it) { if( (*it).contains( file ) ) { @@ -464,13 +464,13 @@ void MakeWidget::specialCheck( const QString& file, QString& fName ) const } } -QString MakeWidget::guessFileName( const QString& fName, int parag ) const +TQString MakeWidget::guessFileName( const TQString& fName, int parag ) const { // pathological case if ( ! m_part->project() ) return fName; - QString name; - QString dir = directory( parag ); + TQString name; + TQString dir = directory( parag ); if ( fName.startsWith( "/" ) ) { @@ -497,12 +497,12 @@ QString MakeWidget::guessFileName( const QString& fName, int parag ) const // GNU make resolves symlinks. if "name" is a real path to a file the // project know by symlink path, we need to return the symlink path -// QStringList projectFiles = m_part->project()->allFiles(); - QStringList projectFiles = m_part->project()->symlinkProjectFiles(); - QStringList::iterator it = projectFiles.begin(); +// TQStringList projectFiles = m_part->project()->allFiles(); + TQStringList projectFiles = m_part->project()->symlinkProjectFiles(); + TQStringList::iterator it = projectFiles.begin(); while ( it != projectFiles.end() ) { - QString file = m_part->project()->projectDirectory() + "/" + *it; + TQString file = m_part->project()->projectDirectory() + "/" + *it; if ( name == URLUtil::canonicalPath( file ) ) { kdDebug(9004) << "Found file in project - " << file << " == " << name << endl; @@ -528,31 +528,31 @@ void MakeWidget::searchItem(int parag) } } -void MakeWidget::insertStdoutLine( const QCString& line ) +void MakeWidget::insertStdoutLine( const TQCString& line ) { - QString sline; + TQString sline; bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); if( forceCLocale ) - sline = QString::fromAscii( stdoutbuf+line ); + sline = TQString::fromAscii( stdoutbuf+line ); else - sline = QString::fromLocal8Bit( stdoutbuf+line ); + sline = TQString::fromLocal8Bit( stdoutbuf+line ); if ( !appendToLastLine( sline ) ) m_directoryStatusFilter.processLine( sline ); stdoutbuf.truncate(0); } -void MakeWidget::insertStderrLine( const QCString& line ) +void MakeWidget::insertStderrLine( const TQCString& line ) { - QString sline; + TQString sline; bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); if( forceCLocale ) { - sline = QString( stderrbuf+line ); + sline = TQString( stderrbuf+line ); } else - sline = QString::fromLocal8Bit( stderrbuf+line ); + sline = TQString::fromLocal8Bit( stderrbuf+line ); if ( !appendToLastLine( sline ) ) m_errorFilter.processLine( sline ); @@ -584,7 +584,7 @@ void MakeWidget::slotProcessExited(KProcess *) insertItem( item ); displayPendingItem(); - m_part->mainWindow()->statusBar()->message( QString("%1: %2").arg(currentCommand).arg(item->m_text), 3000); + m_part->mainWindow()->statusBar()->message( TQString("%1: %2").arg(currentCommand).arg(item->m_text), 3000); m_part->core()->running(m_part, false); // Defensive programming: We emit this with a single shot timer so that we go once again @@ -592,7 +592,7 @@ void MakeWidget::slotProcessExited(KProcess *) // and its KProcess object can be reused. if (childproc->normalExit() && !childproc->exitStatus()) { - QTimer::singleShot(0, this, SLOT(startNextJob())); + TQTimer::singleShot(0, this, TQT_SLOT(startNextJob())); // if (commandList.isEmpty()) // The last command on the list was successful so restore the // output view to what it had before the compilation process started @@ -608,16 +608,16 @@ void MakeWidget::slotProcessExited(KProcess *) void MakeWidget::slotEnteredDirectory( EnteringDirectoryItem* item ) { // kdDebug(9004) << "Entering dir: " << item->directory << endl; - QString* dir = new QString( item->directory ); + TQString* dir = new TQString( item->directory ); dirstack.push( dir ); insertItem( item ); } void MakeWidget::slotExitedDirectory( ExitingDirectoryItem* item ) { - QString eDir = item->directory; + TQString eDir = item->directory; // kdDebug(9004) << "Leaving dir: " << eDir << endl; - QString *dir = dirstack.pop(); + TQString *dir = dirstack.pop(); if (!dir) { kdWarning(9004) << "Left more directories than entered: " << eDir; @@ -652,7 +652,7 @@ void MakeWidget::displayPendingItem() append( m_pendingItem->formattedText( m_compilerOutputLevel, brightBg() ) ); } -bool MakeWidget::appendToLastLine( const QString& text ) +bool MakeWidget::appendToLastLine( const TQString& text ) { if ( !m_pendingItem ) return false; if ( !m_pendingItem->append( text ) ) @@ -696,29 +696,29 @@ bool MakeWidget::brightBg() return (v > 127); } -QPopupMenu* MakeWidget::createPopupMenu( const QPoint& pos ) +TQPopupMenu* MakeWidget::createPopupMenu( const TQPoint& pos ) { - QPopupMenu* pMenu = QTextEdit::createPopupMenu(pos); + TQPopupMenu* pMenu = TQTextEdit::createPopupMenu(pos); pMenu->setCheckable(true); pMenu->insertSeparator(); - int id = pMenu->insertItem(i18n("Line Wrapping"), this, SLOT(toggleLineWrapping()) ); + int id = pMenu->insertItem(i18n("Line Wrapping"), this, TQT_SLOT(toggleLineWrapping()) ); pMenu->setItemChecked(id, m_bLineWrapping); pMenu->setWhatsThis(id, i18n("<b>Line wrapping</b><p>Enables or disables wrapping of command lines displayed.")); pMenu->insertSeparator(); - id = pMenu->insertItem(i18n("Very Short Compiler Output"), this, SLOT(slotVeryShortCompilerOutput()) ); + id = pMenu->insertItem(i18n("Very Short Compiler Output"), this, TQT_SLOT(slotVeryShortCompilerOutput()) ); pMenu->setWhatsThis(id, i18n("<b>Very short compiler output</b><p>Displays only warnings, errors and the file names which are compiled.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eVeryShort); - id = pMenu->insertItem(i18n("Short Compiler Output"), this, SLOT(slotShortCompilerOutput()) ); + id = pMenu->insertItem(i18n("Short Compiler Output"), this, TQT_SLOT(slotShortCompilerOutput()) ); pMenu->setWhatsThis(id, i18n("<b>Short compiler output</b><p>Suppresses all the compiler flags and formats to something readable.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eShort); - id = pMenu->insertItem(i18n("Full Compiler Output"), this, SLOT(slotFullCompilerOutput()) ); + id = pMenu->insertItem(i18n("Full Compiler Output"), this, TQT_SLOT(slotFullCompilerOutput()) ); pMenu->setWhatsThis(id, i18n("<b>Full compiler output</b><p>Displays unmodified compiler output.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eFull); pMenu->insertSeparator(); - id = pMenu->insertItem(i18n("Show Directory Navigation Messages"), this, SLOT(toggleShowDirNavigMessages())); + id = pMenu->insertItem(i18n("Show Directory Navigation Messages"), this, TQT_SLOT(toggleShowDirNavigMessages())); pMenu->setWhatsThis(id, i18n("<b>Show directory navigation messages</b><p>Shows <b>cd</b> commands that are executed while building.")); pMenu->setItemChecked(id, DirectoryItem::getShowDirectoryMessages()); @@ -784,7 +784,7 @@ void MakeWidget::updateSettingsFromConfig() { KConfig *pConfig = kapp->config(); pConfig->setGroup("General Options"); - QFont outputFont = pConfig->readFontEntry("OutputViewFont"); + TQFont outputFont = pConfig->readFontEntry("OutputViewFont"); setFont(outputFont); pConfig->setGroup("MakeOutputView"); m_bLineWrapping = pConfig->readBoolEntry("LineWrapping", true); @@ -834,12 +834,12 @@ bool MakeWidget::scanErrorBackward( int parag ) return false; } -void MakeWidget::storePartialStderrLine(const QCString & line) +void MakeWidget::storePartialStderrLine(const TQCString & line) { stderrbuf += line; } -void MakeWidget::storePartialStdoutLine(const QCString & line) +void MakeWidget::storePartialStdoutLine(const TQCString & line) { stdoutbuf += line; } diff --git a/parts/outputviews/makewidget.h b/parts/outputviews/makewidget.h index ff65eb5e..bdc7d451 100644 --- a/parts/outputviews/makewidget.h +++ b/parts/outputviews/makewidget.h @@ -12,11 +12,11 @@ #ifndef _MAKEWIDGET_H_ #define _MAKEWIDGET_H_ -#include <qptrstack.h> -#include <qregexp.h> -#include <qtextedit.h> -#include <qvaluevector.h> -#include <qintdict.h> +#include <tqptrstack.h> +#include <tqregexp.h> +#include <tqtextedit.h> +#include <tqvaluevector.h> +#include <tqintdict.h> #include "outputfilter.h" #include "directorystatusmessagefilter.h" @@ -42,10 +42,10 @@ public: MakeWidget(MakeViewPart *part); ~MakeWidget(); - void queueJob(const QString &dir, const QString &command); + void queueJob(const TQString &dir, const TQString &command); bool isRunning(); void updateSettingsFromConfig(); - void processLine( const QString& line ); + void processLine( const TQString& line ); public slots: void startNextJob(); @@ -55,14 +55,14 @@ public slots: void copy(); protected: - virtual QPopupMenu *createPopupMenu( const QPoint& pos ); - virtual void contentsMouseReleaseEvent( QMouseEvent* e ); + virtual TQPopupMenu *createPopupMenu( const TQPoint& pos ); + virtual void contentsMouseReleaseEvent( TQMouseEvent* e ); private slots: - void insertStdoutLine(const QCString& line); - void insertStderrLine(const QCString& line); - void storePartialStdoutLine(const QCString& line); - void storePartialStderrLine(const QCString& line); + void insertStdoutLine(const TQCString& line); + void insertStderrLine(const TQCString& line); + void storePartialStdoutLine(const TQCString& line); + void storePartialStderrLine(const TQCString& line); void slotProcessExited(KProcess *); void verticScrollingOn() { m_vertScrolling = true; } void verticScrollingOff() { m_vertScrolling = false; } @@ -78,11 +78,11 @@ private slots: void insertItem( MakeItem* ); private: - void specialCheck( const QString& file, QString& fName ) const; - virtual void keyPressEvent(QKeyEvent *e); + void specialCheck( const TQString& file, TQString& fName ) const; + virtual void keyPressEvent(TQKeyEvent *e); void searchItem(int parag); - QString guessFileName( const QString& fName, int parag ) const; - QString directory(int parag) const; + TQString guessFileName( const TQString& fName, int parag ) const; + TQString directory(int parag) const; bool brightBg(); void refill(); void createCursor(ErrorItem* e, KTextEditor::Document* doc); @@ -98,19 +98,19 @@ private: void setPendingItem(MakeItem* new_item); void displayPendingItem(); - bool appendToLastLine( const QString& text ); + bool appendToLastLine( const TQString& text ); void setCompilerOutputLevel(EOutputLevel level); - QStringList commandList; - QStringList dirList; - QString m_lastBuildDir; //stores directory of last build, for the case we don't have proper path information - QString currentCommand; + TQStringList commandList; + TQStringList dirList; + TQString m_lastBuildDir; //stores directory of last build, for the case we don't have proper path information + TQString currentCommand; KProcess *childproc; ProcessLineMaker* procLineMaker; - QPtrStack<QString> dirstack; + TQPtrStack<TQString> dirstack; MakeItem* m_pendingItem; - QValueVector<MakeItem*> m_items; - QIntDict<MakeItem> m_paragraphToItem; + TQValueVector<MakeItem*> m_items; + TQIntDict<MakeItem> m_paragraphToItem; long m_paragraphs; int m_lastErrorSelected; @@ -119,8 +119,8 @@ private: bool m_vertScrolling, m_horizScrolling; bool m_bCompiling; - QCString stderrbuf; - QCString stdoutbuf; + TQCString stderrbuf; + TQCString stdoutbuf; bool m_bLineWrapping; EOutputLevel m_compilerOutputLevel; diff --git a/parts/outputviews/otherfilter.cpp b/parts/outputviews/otherfilter.cpp index 5f14937c..cd3287c3 100644 --- a/parts/outputviews/otherfilter.cpp +++ b/parts/outputviews/otherfilter.cpp @@ -20,7 +20,7 @@ OtherFilter::OtherFilter() { } -void OtherFilter::processLine( const QString& line ) +void OtherFilter::processLine( const TQString& line ) { emit item( new MakeItem( line ) ); } diff --git a/parts/outputviews/otherfilter.h b/parts/outputviews/otherfilter.h index 9a2c6c17..3494de84 100644 --- a/parts/outputviews/otherfilter.h +++ b/parts/outputviews/otherfilter.h @@ -14,18 +14,18 @@ #include "outputfilter.h" -#include <qobject.h> +#include <tqobject.h> class MakeItem; -class OtherFilter : public QObject, public OutputFilter +class OtherFilter : public TQObject, public OutputFilter { Q_OBJECT public: OtherFilter(); - virtual void processLine( const QString& line ); + virtual void processLine( const TQString& line ); signals: void item( MakeItem* ); diff --git a/parts/outputviews/outputfilter.cpp b/parts/outputviews/outputfilter.cpp index 5692efce..1ea92c5f 100644 --- a/parts/outputviews/outputfilter.cpp +++ b/parts/outputviews/outputfilter.cpp @@ -18,7 +18,7 @@ OutputFilter::OutputFilter( OutputFilter& next ) { } -void OutputFilter::processLine( const QString& line ) +void OutputFilter::processLine( const TQString& line ) { m_next.processLine( line ); } diff --git a/parts/outputviews/outputfilter.h b/parts/outputviews/outputfilter.h index dd84f7d7..227f793d 100644 --- a/parts/outputviews/outputfilter.h +++ b/parts/outputviews/outputfilter.h @@ -12,7 +12,7 @@ #ifndef OutputFilter_h #define OutputFilter_h -#include <qstring.h> +#include <tqstring.h> class OutputFilter { @@ -20,7 +20,7 @@ public: OutputFilter( OutputFilter& ); virtual ~OutputFilter() {} - virtual void processLine( const QString& line ); + virtual void processLine( const TQString& line ); private: OutputFilter& m_next; diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp index 92aaf696..dbf2b554 100644 --- a/parts/partexplorer/partexplorer_plugin.cpp +++ b/parts/partexplorer/partexplorer_plugin.cpp @@ -28,7 +28,7 @@ static const KDevPluginInfo data("kdevpartexplorer"); typedef KDevGenericFactory<PartExplorerPlugin> PartExplorerPluginFactory; K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( data ) ) -PartExplorerPlugin::PartExplorerPlugin( QObject *parent, const char *name, const QStringList & ) +PartExplorerPlugin::PartExplorerPlugin( TQObject *parent, const char *name, const TQStringList & ) : KDevPlugin( &data, parent, name ? name : "PartExplorerPlugin" ) { // we need an instance @@ -40,7 +40,7 @@ PartExplorerPlugin::PartExplorerPlugin( QObject *parent, const char *name, cons m_widget = new PartExplorerForm( mainWindow()->main() ); // mainWindow()->embedSelectView( m_widget, i18n("PartExplorer"), i18n("Query system services")); - KAction *action = new KAction( i18n("&Part Explorer"), 0, this, SLOT(slotShowForm()), + KAction *action = new KAction( i18n("&Part Explorer"), 0, this, TQT_SLOT(slotShowForm()), actionCollection(), "show_partexplorerform" ); action->setToolTip(i18n("KTrader query execution")); action->setWhatsThis(i18n("<b>Part explorer</b><p>Shows a dialog for KTrader query execution. Search your KDE documentation for more information about KDE services and KTrader.")); diff --git a/parts/partexplorer/partexplorer_plugin.h b/parts/partexplorer/partexplorer_plugin.h index 28f3cd95..8e2accbd 100644 --- a/parts/partexplorer/partexplorer_plugin.h +++ b/parts/partexplorer/partexplorer_plugin.h @@ -12,7 +12,7 @@ #ifndef _PARTEXPLORERPLUGIN_H_ #define _PARTEXPLORERPLUGIN_H_ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include "kdevplugin.h" @@ -28,7 +28,7 @@ public: /** * Default constructor */ - PartExplorerPlugin( QObject *parent, const char *name, const QStringList & ); + PartExplorerPlugin( TQObject *parent, const char *name, const TQStringList & ); /** * Destructor @@ -42,7 +42,7 @@ private: /** * The dialog for user interaction, so the plugin is usable too ;) */ - QGuardedPtr<PartExplorerForm> m_widget; + TQGuardedPtr<PartExplorerForm> m_widget; }; #endif // _PARTEXPLORERPLUGIN_H_ diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp index f3a1caad..f944b393 100644 --- a/parts/partexplorer/partexplorerform.cpp +++ b/parts/partexplorer/partexplorerform.cpp @@ -9,13 +9,13 @@ * * ***************************************************************************/ -#include <qlineedit.h> -#include <qtextedit.h> -#include <qpushbutton.h> -#include <qtooltip.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qlabel.h> +#include <tqlineedit.h> +#include <tqtextedit.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqlabel.h> #include <klistview.h> #include <klocale.h> @@ -35,8 +35,8 @@ namespace PartExplorer{ class PropertyItem : public KListViewItem { public: - PropertyItem( KListViewItem *parent, const QString &propertyName, - const QString &propertyType, const QString &propertyValue ) + PropertyItem( KListViewItem *parent, const TQString &propertyName, + const TQString &propertyType, const TQString &propertyValue ) : KListViewItem( parent ) { setText( 0, propertyName ); @@ -44,9 +44,9 @@ public: setText( 2, propertyValue ); } - QString tipText() const + TQString tipText() const { - QString tip = i18n("Name: %1 | Type: %2 | Value: %3"); + TQString tip = i18n("Name: %1 | Type: %2 | Value: %3"); return tip.arg( text(0) ).arg( text(1) ).arg( text(2) ); } }; @@ -62,7 +62,7 @@ class ResultsToolTip: public QToolTip { public: ResultsToolTip( ResultsList* parent ); - virtual void maybeTip( const QPoint& p ); + virtual void maybeTip( const TQPoint& p ); private: ResultsList* m_resultsList; @@ -71,7 +71,7 @@ private: class ResultsList : public KListView { public: - ResultsList( QWidget *parent ) + ResultsList( TQWidget *parent ) : KListView( parent, "resultslist" ) { this->setShowToolTips( false ); @@ -87,16 +87,16 @@ public: }; ResultsToolTip::ResultsToolTip( ResultsList* parent ) - : QToolTip( parent->viewport() ), m_resultsList( parent ) + : TQToolTip( parent->viewport() ), m_resultsList( parent ) { } -void ResultsToolTip::maybeTip( const QPoint& p ) +void ResultsToolTip::maybeTip( const TQPoint& p ) { PartExplorer::PropertyItem *item = dynamic_cast<PartExplorer::PropertyItem*>( m_resultsList->itemAt( p ) ); if ( item ) { - QRect r = m_resultsList->itemRect( item ); + TQRect r = m_resultsList->itemRect( item ); if ( r.isValid() ) tip( r, item->tipText() ); } @@ -107,7 +107,7 @@ void ResultsToolTip::maybeTip( const QPoint& p ) // class PartExplorerForm /////////////////////////////////////////////////////////////////////////////// -PartExplorerForm::PartExplorerForm( QWidget *parent ) +PartExplorerForm::PartExplorerForm( TQWidget *parent ) : KDialogBase( parent, "parteplorerform", false, i18n("Part Explorer - A Services Lister"), User1 | Close, User1, true ) { @@ -116,10 +116,10 @@ PartExplorerForm::PartExplorerForm( QWidget *parent ) m_resultsList->addColumn( i18n( "Property" ) ); m_resultsList->addColumn( i18n( "Type" ) ); m_resultsList->addColumn( i18n( "Value" ) ); - m_resultsList->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, - (QSizePolicy::SizeType)3, 0, 0, + m_resultsList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, + (TQSizePolicy::SizeType)3, 0, 0, m_resultsList->sizePolicy().hasHeightForWidth() ) ); - QWhatsThis::add( m_resultsList, i18n("<b>Matching services</b><p>Results (if any) are shown grouped by matching service name.") ); + TQWhatsThis::add( m_resultsList, i18n("<b>Matching services</b><p>Results (if any) are shown grouped by matching service name.") ); m_base->resultsLabel->setBuddy(m_resultsList); m_base->layout()->add( m_resultsList ); setMainWidget( m_base ); @@ -131,16 +131,16 @@ PartExplorerForm::PartExplorerForm( QWidget *parent ) // Resize dialog resize( 480, 512 ); -// connect( m_base->typeCombo->lineEdit(), SIGNAL(returnPressed()), this, SLOT(slotSearchRequested()) ); -// connect( m_base->constraintsText, SIGNAL(returnPressed()), this, SLOT(slotSearchRequested()) ); +// connect( m_base->typeCombo->lineEdit(), TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSearchRequested()) ); +// connect( m_base->constraintsText, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSearchRequested()) ); - connect( actionButton(User1), SIGNAL(clicked()), this, SLOT(slotSearchRequested()) ); -// connect( m_base->typeCombo->lineEdit(), SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotServicetypeChanged( const QString& ) ) ); + connect( actionButton(User1), TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSearchRequested()) ); +// connect( m_base->typeCombo->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotServicetypeChanged( const TQString& ) ) ); // slotServicetypeChanged( m_base->typeCombo->lineEdit()->text() ); // populating with all known servicetypes KServiceType::List serviceList = KServiceType::allServiceTypes(); - QStringList list; + TQStringList list; KServiceType::List::Iterator it = serviceList.begin(); while( it != serviceList.end() ) { @@ -161,8 +161,8 @@ PartExplorerForm::~PartExplorerForm() void PartExplorerForm::slotSearchRequested() { - QString serviceType = m_base->typeCombo->lineEdit()->text(); - QString constraints = m_base->constraintsText->text(); + TQString serviceType = m_base->typeCombo->lineEdit()->text(); + TQString constraints = m_base->constraintsText->text(); kdDebug(9000) << "===> PartExplorerForm::slotSearchRequested(): " << " serviceType = " << serviceType << ", constraints = " << constraints << endl; @@ -174,7 +174,7 @@ void PartExplorerForm::slotSearchRequested() /////////////////////////////////////////////////////////////////////////////// -void PartExplorerForm::slotDisplayError( QString errorMessage ) +void PartExplorerForm::slotDisplayError( TQString errorMessage ) { if (errorMessage.isEmpty()) { @@ -205,21 +205,21 @@ void PartExplorerForm::fillServiceList( const KTrader::OfferList &services ) KService::Ptr service = (*it); KListViewItem *serviceItem = new KListViewItem( this->m_resultsList, rootItem, service->name() ); - QStringList propertyNames = service->propertyNames(); - for ( QStringList::const_iterator it = propertyNames.begin(); it != propertyNames.end(); ++it ) + TQStringList propertyNames = service->propertyNames(); + for ( TQStringList::const_iterator it = propertyNames.begin(); it != propertyNames.end(); ++it ) { - QString propertyName = (*it); - QVariant property = service->property( propertyName ); - QString propertyType = property.typeName(); - QString propertyValue; - if (propertyType == "QStringList") { + TQString propertyName = (*it); + TQVariant property = service->property( propertyName ); + TQString propertyType = property.typeName(); + TQString propertyValue; + if (propertyType == "TQStringList") { propertyValue = property.toStringList().join(", "); } else { propertyValue = property.toString(); } - QString dProperty = " *** Found property < %1, %2, %3 >"; + TQString dProperty = " *** Found property < %1, %2, %3 >"; dProperty = dProperty.arg( propertyName ).arg( propertyType ).arg( propertyValue ); kdDebug( 9000 ) << dProperty << endl; diff --git a/parts/partexplorer/partexplorerform.h b/parts/partexplorer/partexplorerform.h index 21fe2fba..7ccc140d 100644 --- a/parts/partexplorer/partexplorerform.h +++ b/parts/partexplorer/partexplorerform.h @@ -27,7 +27,7 @@ class PartExplorerForm : public KDialogBase { Q_OBJECT public: - PartExplorerForm( QWidget *parent = 0 ); + PartExplorerForm( TQWidget *parent = 0 ); virtual ~PartExplorerForm(); /** @@ -36,7 +36,7 @@ public: void fillServiceList( const KTrader::OfferList &services ); public slots: - void slotDisplayError( QString ); + void slotDisplayError( TQString ); protected slots: void slotSearchRequested(); diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp index 66b18df2..2c1de0ce 100644 --- a/parts/quickopen/quickopen_part.cpp +++ b/parts/quickopen/quickopen_part.cpp @@ -49,33 +49,33 @@ K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( data ) ) using namespace KTextEditor; -QuickOpenPart::QuickOpenPart(QObject *parent, const char *name, const QStringList& ) +QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringList& ) : KDevQuickOpen(&data, parent, name ? name : "QuickOpenPart" ) { setInstance(QuickOpenFactory::instance()); setXMLFile("kdevpart_quickopen.rc"); m_actionQuickOpen = new KAction( i18n("Quick Open File..."), CTRL + ALT + Key_O, - this, SLOT(slotQuickFileOpen()), + this, TQT_SLOT(slotQuickFileOpen()), actionCollection(), "quick_open" ); m_actionQuickOpen->setToolTip(i18n("Quick open file in project")); m_actionQuickOpen->setWhatsThis(i18n("<b>Quick open</b><p>Provides a file name input form with completion listbox to quickly open file in a project.")); m_actionQuickOpenClass = new KAction( i18n("Quick Open Class..."), CTRL + ALT + Key_C, - this, SLOT(slotQuickOpenClass()), + this, TQT_SLOT(slotQuickOpenClass()), actionCollection(), "quick_open_class" ); m_actionQuickOpenClass->setToolTip(i18n("Find class in project")); m_actionQuickOpenClass->setWhatsThis(i18n("<b>Find class</b><p>Provides a class name input form with completion listbox to quickly open a file where the class is defined.")); - m_actionFunctionOpen = new KAction( i18n("Quick Open Method..."), CTRL + ALT + Key_M, this, SLOT(slotQuickOpenFunction()), actionCollection(), "quick_open_function" ); + m_actionFunctionOpen = new KAction( i18n("Quick Open Method..."), CTRL + ALT + Key_M, this, TQT_SLOT(slotQuickOpenFunction()), actionCollection(), "quick_open_function" ); m_actionFunctionOpen->setToolTip(i18n("Quick open function in project")); - m_switchToAction = new KAction(i18n("Switch To..."), KShortcut("CTRL+/"), this, SLOT(slotSwitchTo()), actionCollection(), "file_switchto"); + m_switchToAction = new KAction(i18n("Switch To..."), KShortcut("CTRL+/"), this, TQT_SLOT(slotSwitchTo()), actionCollection(), "file_switchto"); m_switchToAction->setToolTip(i18n("Switch to")); m_switchToAction->setWhatsThis(i18n("<b>Switch to</b><p>Prompts to enter the name of previously opened file to switch to.")); - connect( core(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(slotProjectClosed()) ); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); } diff --git a/parts/quickopen/quickopen_part.h b/parts/quickopen/quickopen_part.h index 92dac902..19d92222 100644 --- a/parts/quickopen/quickopen_part.h +++ b/parts/quickopen/quickopen_part.h @@ -21,7 +21,7 @@ #ifndef __KDEVPART_QUICKOPEN_H__ #define __KDEVPART_QUICKOPEN_H__ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kdevquickopen.h> #include <codemodel.h> @@ -31,7 +31,7 @@ class QuickOpenPart : public KDevQuickOpen { Q_OBJECT public: - QuickOpenPart(QObject *parent, const char *name, const QStringList &); + QuickOpenPart(TQObject *parent, const char *name, const TQStringList &); virtual ~QuickOpenPart(); void selectItem( ItemDom item ); diff --git a/parts/quickopen/quickopenclassdialog.cpp b/parts/quickopen/quickopenclassdialog.cpp index 0d5b2251..b97e47a3 100644 --- a/parts/quickopen/quickopenclassdialog.cpp +++ b/parts/quickopen/quickopenclassdialog.cpp @@ -28,14 +28,14 @@ #include <kcompletion.h> #include <klineedit.h> -#include <qregexp.h> -#include <qlabel.h> +#include <tqregexp.h> +#include <tqlabel.h> #include "quickopenclassdialog.h" #include "quickopen_part.h" #include "quickopenfunctionchooseform.h" -QuickOpenClassDialog::QuickOpenClassDialog(QuickOpenPart* part, QWidget* parent, const char* name, bool modal, WFlags fl) +QuickOpenClassDialog::QuickOpenClassDialog(QuickOpenPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl) : QuickOpenDialog( part, parent, name, modal, fl ) { nameLabel->setText( i18n("Class &name:") ); @@ -54,14 +54,14 @@ QuickOpenClassDialog::~QuickOpenClassDialog() { } -void QuickOpenClassDialog::slotExecuted( QListBoxItem* /*item*/ ) +void QuickOpenClassDialog::slotExecuted( TQListBoxItem* /*item*/ ) { accept(); } void QuickOpenClassDialog::accept() { - if( QListBoxItem* item = itemList->selectedItem() ) + if( TQListBoxItem* item = itemList->selectedItem() ) { ClassList klasses = findClass( item->text() ); if( klasses.count() == 1 ) @@ -75,7 +75,7 @@ void QuickOpenClassDialog::accept() else if (klasses.count() > 1 ) { //several classes with the same name found - QString fileStr; + TQString fileStr; QuickOpenFunctionChooseForm fdlg( this, "" ); fdlg.setCaption(i18n("Select The Location of Class %1").arg(klasses.first()->name())); @@ -85,7 +85,7 @@ void QuickOpenClassDialog::accept() { ClassDom klass = *it; //assemble class name to display (maybe with scope info and specialization) - QString classStr = m_part->languageSupport()->formatModelItem(klass); + TQString classStr = m_part->languageSupport()->formatModelItem(klass); if(klass->hasSpecializationDeclaration()) classStr += klass->getSpecializationDeclaration(); if(!klass->scope().isEmpty()) @@ -106,14 +106,14 @@ void QuickOpenClassDialog::accept() int line, col; model->getStartPosition( &line, &col ); selectClassViewItem( ItemDom(&(*model)) ); - QString fileNameStr = model->fileName(); + TQString fileNameStr = model->fileName(); m_part->partController()->editDocument( KURL(fileNameStr), line ); } } } } - QDialog::accept(); + TQDialog::accept(); } void QuickOpenClassDialog::slotReturnPressed( ) @@ -122,14 +122,14 @@ void QuickOpenClassDialog::slotReturnPressed( ) accept(); } -void QuickOpenClassDialog::findAllClasses( QStringList& lst ) +void QuickOpenClassDialog::findAllClasses( TQStringList& lst ) { findAllClasses( lst, m_part->codeModel()->globalNamespace() ); } -void QuickOpenClassDialog::findAllClasses( QStringList& lst, const ClassDom klass ) +void QuickOpenClassDialog::findAllClasses( TQStringList& lst, const ClassDom klass ) { - QStringList fullName = klass->scope(); + TQStringList fullName = klass->scope(); fullName << klass->name(); lst << fullName.join( "::" ); @@ -138,7 +138,7 @@ void QuickOpenClassDialog::findAllClasses( QStringList& lst, const ClassDom klas findAllClasses( lst, *it ); } -void QuickOpenClassDialog::findAllClasses( QStringList& lst, const NamespaceDom ns ) +void QuickOpenClassDialog::findAllClasses( TQStringList& lst, const NamespaceDom ns ) { const NamespaceList namespaceList = ns->namespaceList(); for( NamespaceList::ConstIterator it=namespaceList.begin(); it!=namespaceList.end(); ++it ) @@ -149,19 +149,19 @@ void QuickOpenClassDialog::findAllClasses( QStringList& lst, const NamespaceDom findAllClasses( lst, *it ); } -ClassList QuickOpenClassDialog::findClass( const QString& name ) +ClassList QuickOpenClassDialog::findClass( const TQString& name ) { - QStringList path = QStringList::split( "::", name ); + TQStringList path = TQStringList::split( "::", name ); return findClass( path, m_part->codeModel()->globalNamespace() ); } -ClassList QuickOpenClassDialog::findClass( QStringList& path, const NamespaceDom ns ) +ClassList QuickOpenClassDialog::findClass( TQStringList& path, const NamespaceDom ns ) { ClassList list; if( path.isEmpty() ) return list; - QString current = path.front(); + TQString current = path.front(); if( ns->hasNamespace(current) ) { path.pop_front(); @@ -178,7 +178,7 @@ ClassList QuickOpenClassDialog::findClass( QStringList& path, const NamespaceDom return list; } -ClassList QuickOpenClassDialog::findClass( QStringList& path, const ClassList klasses ) +ClassList QuickOpenClassDialog::findClass( TQStringList& path, const ClassList klasses ) { ClassList list; if( path.isEmpty() ) @@ -195,7 +195,7 @@ ClassList QuickOpenClassDialog::findClass( QStringList& path, const ClassList kl return list; } -ClassList QuickOpenClassDialog::findClass( QStringList &path, const ClassDom klass ) +ClassList QuickOpenClassDialog::findClass( TQStringList &path, const ClassDom klass ) { ClassList list; if( path.isEmpty() ) @@ -204,7 +204,7 @@ ClassList QuickOpenClassDialog::findClass( QStringList &path, const ClassDom kla return list; } - QString current = path.front(); + TQString current = path.front(); if( klass->hasClass(current) ) { path.pop_front(); diff --git a/parts/quickopen/quickopenclassdialog.h b/parts/quickopen/quickopenclassdialog.h index a93125c4..fd01fe25 100644 --- a/parts/quickopen/quickopenclassdialog.h +++ b/parts/quickopen/quickopenclassdialog.h @@ -23,7 +23,7 @@ #include "quickopendialog.h" #include <codemodel.h> -#include <qstringlist.h> +#include <tqstringlist.h> class QuickOpenPart; @@ -31,22 +31,22 @@ class QuickOpenClassDialog : public QuickOpenDialog { Q_OBJECT public: - QuickOpenClassDialog(QuickOpenPart* part, QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); + QuickOpenClassDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); virtual ~QuickOpenClassDialog(); public slots: - virtual void slotExecuted( QListBoxItem* ); + virtual void slotExecuted( TQListBoxItem* ); virtual void slotReturnPressed(); protected: - void findAllClasses( QStringList& classList ); - void findAllClasses( QStringList& classList, const ClassDom klass ); - void findAllClasses( QStringList& classList, const NamespaceDom ns ); - - ClassList findClass( const QString& name ); - ClassList findClass( QStringList& path, const NamespaceDom ns ); - ClassList findClass( QStringList& path, const ClassList klasses ); - ClassList findClass( QStringList& path, const ClassDom klass ); + void findAllClasses( TQStringList& classList ); + void findAllClasses( TQStringList& classList, const ClassDom klass ); + void findAllClasses( TQStringList& classList, const NamespaceDom ns ); + + ClassList findClass( const TQString& name ); + ClassList findClass( TQStringList& path, const NamespaceDom ns ); + ClassList findClass( TQStringList& path, const ClassList klasses ); + ClassList findClass( TQStringList& path, const ClassDom klass ); protected slots: virtual void accept(); diff --git a/parts/quickopen/quickopendialog.cpp b/parts/quickopen/quickopendialog.cpp index b18ab980..e0d40295 100644 --- a/parts/quickopen/quickopendialog.cpp +++ b/parts/quickopen/quickopendialog.cpp @@ -18,8 +18,8 @@ * */ -#include <qapplication.h> -#include <qregexp.h> +#include <tqapplication.h> +#include <tqregexp.h> #include <klistbox.h> #include <klineedit.h> @@ -28,18 +28,18 @@ #include "quickopendialog.h" #include "quickopen_part.h" -QuickOpenDialog::QuickOpenDialog(QuickOpenPart* part, QWidget* parent, const char* name, bool modal, WFlags fl) +QuickOpenDialog::QuickOpenDialog(QuickOpenPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl) : QuickOpenDialogBase( parent, name, modal, fl ), m_part( part ) { nameEdit->installEventFilter(this); - connect( &m_typeTimeout, SIGNAL(timeout()), this, SLOT(slotTextChangedDelayed()) ); + connect( &m_typeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTextChangedDelayed()) ); } QuickOpenDialog::~QuickOpenDialog() { } -void QuickOpenDialog::slotTextChanged(const QString &) +void QuickOpenDialog::slotTextChanged(const TQString &) { m_typeTimeout.start( 100, true ); } @@ -58,8 +58,8 @@ void QuickOpenDialog::setFirstItemSelected() itemList->setCurrentItem(0); // We are doing this indirectly because the event handler does things for multiple // selections we cannot do through the public interface. - QKeyEvent e(QEvent::KeyPress, Qt::Key_Home, 0, 0); - QApplication::sendEvent(itemList, &e); + TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Home, 0, 0); + TQApplication::sendEvent(itemList, &e); } void QuickOpenDialog::slotTextChangedDelayed() @@ -69,38 +69,38 @@ void QuickOpenDialog::slotTextChangedDelayed() setFirstItemSelected(); } -bool QuickOpenDialog::eventFilter( QObject * watched, QEvent * e ) +bool QuickOpenDialog::eventFilter( TQObject * watched, TQEvent * e ) { if (!watched || !e) return true; - if ((watched == nameEdit) && (e->type() == QEvent::KeyPress)) + if ((watched == nameEdit) && (e->type() == TQEvent::KeyPress)) { - QKeyEvent *ke = (QKeyEvent*)e; + TQKeyEvent *ke = (TQKeyEvent*)e; if (ke->key() == Key_Up) { - QApplication::sendEvent(itemList, e); + TQApplication::sendEvent(itemList, e); nameEdit->blockSignals(true); itemSelectionChanged(); nameEdit->blockSignals(false); return true; } else if (ke->key() == Key_Down) { - QApplication::sendEvent(itemList, e); + TQApplication::sendEvent(itemList, e); nameEdit->blockSignals(true); itemSelectionChanged(); nameEdit->blockSignals(false); return true; } else if ((ke->key() == Key_Next) || (ke->key() == Key_Prior)) { - QApplication::sendEvent(itemList, e); + TQApplication::sendEvent(itemList, e); nameEdit->blockSignals(true); itemSelectionChanged(); nameEdit->blockSignals(false); } } - return QWidget::eventFilter(watched, e); + return TQWidget::eventFilter(watched, e); } void QuickOpenDialog::selectClassViewItem(ItemDom item) @@ -108,13 +108,13 @@ void QuickOpenDialog::selectClassViewItem(ItemDom item) m_part->selectItem( item ); } -QStringList QuickOpenDialog::wildCardCompletion(const QString & text) +TQStringList QuickOpenDialog::wildCardCompletion(const TQString & text) { if ( text.isEmpty() ) return m_items; - QRegExp re( text, false, true ); - QStringList matches; - QStringList::const_iterator it = m_items.begin(); + TQRegExp re( text, false, true ); + TQStringList matches; + TQStringList::const_iterator it = m_items.begin(); while( it != m_items.end() ) { if ( (*it).find( re ) != -1 ) @@ -127,14 +127,14 @@ QStringList QuickOpenDialog::wildCardCompletion(const QString & text) return matches; } -void QuickOpenDialog::QStringList_unique( QStringList & list ) +void QuickOpenDialog::QStringList_unique( TQStringList & list ) { if ( list.size() < 2 ) return; list.sort(); - QStringList::iterator it = list.begin(); - QStringList::iterator it2 = it; + TQStringList::iterator it = list.begin(); + TQStringList::iterator it2 = it; while ( it2 != list.end() ) { ++it2; diff --git a/parts/quickopen/quickopendialog.h b/parts/quickopen/quickopendialog.h index 00149bc4..6d441684 100644 --- a/parts/quickopen/quickopendialog.h +++ b/parts/quickopen/quickopendialog.h @@ -21,8 +21,8 @@ #ifndef QUICKOPENDIALOG_H #define QUICKOPENDIALOG_H -#include <qstringlist.h> -#include <qtimer.h> +#include <tqstringlist.h> +#include <tqtimer.h> #include <codemodel.h> @@ -36,26 +36,26 @@ class QuickOpenDialog : public QuickOpenDialogBase Q_OBJECT public: - QuickOpenDialog(QuickOpenPart* part, QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); + QuickOpenDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); virtual ~QuickOpenDialog(); - virtual bool eventFilter(QObject *watched, QEvent *e); + virtual bool eventFilter(TQObject *watched, TQEvent *e); void selectClassViewItem(ItemDom item); public slots: - virtual void slotTextChanged(const QString&); + virtual void slotTextChanged(const TQString&); virtual void slotTextChangedDelayed(); protected: void maybeUpdateSelection(); void setFirstItemSelected(); virtual void itemSelectionChanged(); - void QStringList_unique( QStringList & list ); - QStringList wildCardCompletion( const QString & text ); - QStringList m_items; + void QStringList_unique( TQStringList & list ); + TQStringList wildCardCompletion( const TQString & text ); + TQStringList m_items; QuickOpenPart* m_part; - QTimer m_typeTimeout; + TQTimer m_typeTimeout; }; diff --git a/parts/quickopen/quickopenfiledialog.cpp b/parts/quickopen/quickopenfiledialog.cpp index a03236b4..adc4a919 100644 --- a/parts/quickopen/quickopenfiledialog.cpp +++ b/parts/quickopen/quickopenfiledialog.cpp @@ -29,13 +29,13 @@ #include <klineedit.h> -#include <qregexp.h> -#include <qlabel.h> +#include <tqregexp.h> +#include <tqlabel.h> #include "quickopenfiledialog.h" #include "quickopen_part.h" -QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, QWidget* parent, const char* name, bool modal, WFlags fl) +QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl) : QuickOpenDialog( part, parent, name, modal, fl ), m_hasFullPaths( false ) { nameLabel->setText( i18n("File &name:") ); @@ -45,12 +45,12 @@ QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, QWidget* parent, c nameEdit->setFocus(); - itemList->setSelectionMode( QListBox::Extended ); + itemList->setSelectionMode( TQListBox::Extended ); itemList->insertStringList( m_items ); setFirstItemSelected(); } -QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, const KURL::List & urls, QWidget* parent, const char* name, bool modal, WFlags fl) +QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, const KURL::List & urls, TQWidget* parent, const char* name, bool modal, WFlags fl) : QuickOpenDialog( part, parent, name, modal, fl ), m_hasFullPaths( true ) { nameLabel->setText( i18n("File &name:") ); @@ -63,8 +63,8 @@ QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, const KURL::List & { for (unsigned int i = 0; i < m_items.count(); ++i) { - QString url = m_items[i]; - QString projectUrl = "file://" + m_part->project()->projectDirectory(); + TQString url = m_items[i]; + TQString projectUrl = "file://" + m_part->project()->projectDirectory(); if (url.startsWith(projectUrl)) m_items[i] = url.mid(projectUrl.length() + 1); } @@ -72,7 +72,7 @@ QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, const KURL::List & nameEdit->setFocus(); - itemList->setSelectionMode( QListBox::Extended ); + itemList->setSelectionMode( TQListBox::Extended ); itemList->insertStringList( m_items ); setFirstItemSelected(); } @@ -81,7 +81,7 @@ QuickOpenFileDialog::~QuickOpenFileDialog() { } -void QuickOpenFileDialog::slotExecuted( QListBoxItem* item ) +void QuickOpenFileDialog::slotExecuted( TQListBoxItem* item ) { if ( !item ) return; diff --git a/parts/quickopen/quickopenfiledialog.h b/parts/quickopen/quickopenfiledialog.h index 105b5efd..852f0f5b 100644 --- a/parts/quickopen/quickopenfiledialog.h +++ b/parts/quickopen/quickopenfiledialog.h @@ -22,7 +22,7 @@ #define QUICKOPENFILEDIALOG_H #include "quickopendialog.h" -#include <qstringlist.h> +#include <tqstringlist.h> #include <kurl.h> @@ -33,12 +33,12 @@ class QuickOpenFileDialog : public QuickOpenDialog { Q_OBJECT public: - QuickOpenFileDialog(QuickOpenPart* part, QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); - QuickOpenFileDialog(QuickOpenPart* part, const KURL::List &, QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); + QuickOpenFileDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); + QuickOpenFileDialog(QuickOpenPart* part, const KURL::List &, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); virtual ~QuickOpenFileDialog(); public slots: - virtual void slotExecuted( QListBoxItem* ); + virtual void slotExecuted( TQListBoxItem* ); virtual void slotReturnPressed(); private: diff --git a/parts/quickopen/quickopenfunctionchooseform.cpp b/parts/quickopen/quickopenfunctionchooseform.cpp index a2c50776..a8853417 100644 --- a/parts/quickopen/quickopenfunctionchooseform.cpp +++ b/parts/quickopen/quickopenfunctionchooseform.cpp @@ -28,7 +28,7 @@ #include "quickopenfunctionchooseform.h" -QuickOpenFunctionChooseForm::QuickOpenFunctionChooseForm(QWidget* parent, const char* name, bool modal, WFlags fl) +QuickOpenFunctionChooseForm::QuickOpenFunctionChooseForm(TQWidget* parent, const char* name, bool modal, WFlags fl) : QuickOpenFunctionChooseFormBase(parent,name, modal,fl) { setCaption( i18n("Select One Argument or File of Function %1").arg( name ) ); diff --git a/parts/quickopen/quickopenfunctionchooseform.h b/parts/quickopen/quickopenfunctionchooseform.h index 9048c24f..b8d462a5 100644 --- a/parts/quickopen/quickopenfunctionchooseform.h +++ b/parts/quickopen/quickopenfunctionchooseform.h @@ -23,24 +23,24 @@ #include "quickopenfunctionchooseformbase.h" -#include <qmap.h> +#include <tqmap.h> class QuickOpenFunctionChooseForm : public QuickOpenFunctionChooseFormBase { Q_OBJECT public: - QuickOpenFunctionChooseForm(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + QuickOpenFunctionChooseForm(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~QuickOpenFunctionChooseForm(); - void setRelativePath(int id, const QString &path) { m_relPaths[id] = path; } + void setRelativePath(int id, const TQString &path) { m_relPaths[id] = path; } public slots: virtual void slotArgsChange( int id ); virtual void slotFileChange( int id ); private: - QMap<int, QString> m_relPaths; + TQMap<int, TQString> m_relPaths; }; diff --git a/parts/quickopen/quickopenfunctiondialog.cpp b/parts/quickopen/quickopenfunctiondialog.cpp index d8691d92..8b877b8b 100644 --- a/parts/quickopen/quickopenfunctiondialog.cpp +++ b/parts/quickopen/quickopenfunctiondialog.cpp @@ -19,8 +19,8 @@ */ #include <klocale.h> -#include <qlabel.h> -#include <qvaluelist.h> +#include <tqlabel.h> +#include <tqvaluelist.h> #include <kcompletion.h> #include <kdebug.h> @@ -33,13 +33,13 @@ #include <kdevpartcontroller.h> #include <kdevproject.h> #include <kdevlanguagesupport.h> -#include <qregexp.h> +#include <tqregexp.h> #include "quickopenfunctionchooseform.h" #include "quickopenfunctiondialog.h" -QuickOpenFunctionDialog::QuickOpenFunctionDialog( QuickOpenPart *part, QWidget* parent, const char* name, bool modal, WFlags fl) +QuickOpenFunctionDialog::QuickOpenFunctionDialog( QuickOpenPart *part, TQWidget* parent, const char* name, bool modal, WFlags fl) : QuickOpenDialog(part, parent, name, modal, fl) { nameLabel->setText( i18n("Function &name:") ); @@ -81,7 +81,7 @@ QuickOpenFunctionDialog::~QuickOpenFunctionDialog() { } -void QuickOpenFunctionDialog::gotoFile( QString name ) +void QuickOpenFunctionDialog::gotoFile( TQString name ) { FunctionModel *fmodel; FunctionList funcList; @@ -97,14 +97,14 @@ void QuickOpenFunctionDialog::gotoFile( QString name ) if( funcList.count() == 1 ){ fdom = funcList.first(); fmodel = fdom.data(); - QString fileNameStr = fmodel->fileName(); + TQString fileNameStr = fmodel->fileName(); int startline, startcol; fmodel->getStartPosition( &startline, &startcol ); m_part->partController()->editDocument( KURL( fileNameStr), startline, startcol ); selectClassViewItem( ItemDom(&(*fmodel)) ); }else if( funcList.count() > 1 ){ - QString fileStr; + TQString fileStr; QuickOpenFunctionChooseForm fdlg( this, name.ascii() ); @@ -127,7 +127,7 @@ void QuickOpenFunctionDialog::gotoFile( QString name ) int line, col; model->getStartPosition( &line, &col ); selectClassViewItem( ItemDom(&(*model)) ); - QString fileNameStr = model->fileName(); + TQString fileNameStr = model->fileName(); m_part->partController()->editDocument( KURL(fileNameStr), line ); } } @@ -139,21 +139,21 @@ void QuickOpenFunctionDialog::gotoFile( QString name ) accept(); } -void QuickOpenFunctionDialog::slotExecuted(QListBoxItem* item) +void QuickOpenFunctionDialog::slotExecuted(TQListBoxItem* item) { if( item ){ gotoFile( item->text() ); } } -void QuickOpenFunctionDialog::executed(QListBoxItem*) +void QuickOpenFunctionDialog::executed(TQListBoxItem*) { } void QuickOpenFunctionDialog::itemSelectionChanged() { - QString text = nameEdit->text(); - QString txt = text; - QStringList parts = QStringList::split("::", text); + TQString text = nameEdit->text(); + TQString txt = text; + TQStringList parts = TQStringList::split("::", text); if( !text.endsWith( "::" ) && !parts.isEmpty() ) parts.pop_back(); parts << itemList->currentText(); @@ -161,21 +161,21 @@ void QuickOpenFunctionDialog::itemSelectionChanged() { } void QuickOpenFunctionDialog::slotTextChangedDelayed() { - QString text = nameEdit->text(); - QString txt = text; - QStringList parts = QStringList::split("::", text); + TQString text = nameEdit->text(); + TQString txt = text; + TQStringList parts = TQStringList::split("::", text); if(text.endsWith("::") || parts.isEmpty()) { txt = ""; }else{ txt = parts.back(); parts.pop_back(); } - QValueList<QRegExp> regExpParts; - for( QStringList::const_iterator it = parts.begin(); it != parts.end(); ++it ) { - regExpParts << QRegExp( *it, false, true ); + TQValueList<TQRegExp> regExpParts; + for( TQStringList::const_iterator it = parts.begin(); it != parts.end(); ++it ) { + regExpParts << TQRegExp( *it, false, true ); } - QString scope = parts.join("::"); + TQString scope = parts.join("::"); if( m_scope != scope ) { if( !scope.startsWith(m_scope) ) { ///Not a specialization, so reload all function-definitions @@ -184,12 +184,12 @@ void QuickOpenFunctionDialog::slotTextChangedDelayed() { if(!parts.isEmpty()) { FunctionList accepted; - QStringList acceptedItems; + TQStringList acceptedItems; FunctionList::iterator it = m_functionDefList.begin(); while(it != m_functionDefList.end()) { - QStringList scope = (*it)->scope(); - QValueList<QRegExp>::iterator mit = regExpParts.begin(); - QStringList::iterator sit = scope.begin(); + TQStringList scope = (*it)->scope(); + TQValueList<TQRegExp>::iterator mit = regExpParts.begin(); + TQStringList::iterator sit = scope.begin(); bool fail = false; while(mit != regExpParts.end()) { while(sit != scope.end() && !(*mit).exactMatch( *sit ) ) ++sit; @@ -221,7 +221,7 @@ void QuickOpenFunctionDialog::slotTextChangedDelayed() { void QuickOpenFunctionDialog::slotReturnPressed() { maybeUpdateSelection(); - QListBoxItem *listboxItem = itemList->selectedItem(); + TQListBoxItem *listboxItem = itemList->selectedItem(); slotExecuted( listboxItem ); } diff --git a/parts/quickopen/quickopenfunctiondialog.h b/parts/quickopen/quickopenfunctiondialog.h index 93bb9b12..c02a9296 100644 --- a/parts/quickopen/quickopenfunctiondialog.h +++ b/parts/quickopen/quickopenfunctiondialog.h @@ -34,25 +34,25 @@ class QuickOpenFunctionDialog : public QuickOpenDialog Q_OBJECT public: - QuickOpenFunctionDialog( QuickOpenPart* part, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + QuickOpenFunctionDialog( QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~QuickOpenFunctionDialog(); - void gotoFile( QString name ); + void gotoFile( TQString name ); QuickOpenPart* part(){ return m_part; }; public slots: - virtual void slotExecuted(QListBoxItem*);//itemList executed, returnPressed - virtual void executed(QListBoxItem*); // + virtual void slotExecuted(TQListBoxItem*);//itemList executed, returnPressed + virtual void executed(TQListBoxItem*); // virtual void slotReturnPressed(); //buttonOk clicked, nameEdit returnPressed virtual void slotTextChangedDelayed(); virtual void itemSelectionChanged(); protected: void fillItemList(); - QString m_scope; + TQString m_scope; FunctionList m_functionDefList; - QStringList m_functionStrList; + TQStringList m_functionStrList; }; diff --git a/parts/regexptest/regexptestdlg.cpp b/parts/regexptest/regexptestdlg.cpp index a211a797..834b7a1e 100644 --- a/parts/regexptest/regexptestdlg.cpp +++ b/parts/regexptest/regexptestdlg.cpp @@ -15,11 +15,11 @@ #include <string.h> #include <stdlib.h> #include <regex.h> -#include <qlabel.h> -#include <qlistview.h> -#include <qradiobutton.h> -#include <qpushbutton.h> -#include <qregexp.h> +#include <tqlabel.h> +#include <tqlistview.h> +#include <tqradiobutton.h> +#include <tqpushbutton.h> +#include <tqregexp.h> #include <klineedit.h> #include <kdeversion.h> #include <kregexp.h> @@ -52,7 +52,7 @@ RegexpTestDialog::~RegexpTestDialog() {} -void RegexpTestDialog::showEvent(QShowEvent *) +void RegexpTestDialog::showEvent(TQShowEvent *) { KParts::ReadWritePart *rwpart = dynamic_cast<KParts::ReadWritePart*> (m_part->partController()->activePart()); @@ -75,7 +75,7 @@ void RegexpTestDialog::somethingChanged() void RegexpTestDialog::checkQRegExp() { - QRegExp rx( pattern_edit->text() ); + TQRegExp rx( pattern_edit->text() ); rx.setMinimal( qregexp_min_button->isChecked() ); if ( !rx.isValid() ) { #if QT_VERSION >= 0x030100 @@ -96,7 +96,7 @@ void RegexpTestDialog::checkQRegExp() int numCaptures = 10; #endif for ( int i = 0; i < numCaptures; ++i ) { - new QListViewItem( subgroups_listview, QString::number( i ), rx.cap( i ) ); + new TQListViewItem( subgroups_listview, TQString::number( i ), rx.cap( i ) ); } } @@ -115,7 +115,7 @@ void RegexpTestDialog::checkKRegExp() for ( int i = 0; i <= 9; ++i ) { const char* grp = rx.group( i ); if ( grp ) - new QListViewItem( subgroups_listview, QString::number( i ), QString( grp ) ); + new TQListViewItem( subgroups_listview, TQString::number( i ), TQString( grp ) ); } } @@ -124,10 +124,10 @@ void RegexpTestDialog::checkPOSIX() regex_t compiledPattern; regmatch_t matches[20]; int cflags = extendedposix_button->isChecked()? REG_EXTENDED : 0; - QCString regexp = pattern_edit->text().local8Bit(); + TQCString regexp = pattern_edit->text().local8Bit(); int res = regcomp(&compiledPattern, regexp, cflags); if (res != 0) { - QString regcompMessage; + TQString regcompMessage; switch (res) { case REG_BADRPT: @@ -181,7 +181,7 @@ void RegexpTestDialog::checkPOSIX() matches[i].rm_eo = -1; } - QCString testString = teststring_edit->text().local8Bit(); + TQCString testString = teststring_edit->text().local8Bit(); res = regexec(&compiledPattern, testString, 20, matches, 0); if (res != 0) { success_label->setText(i18n("No match")); @@ -194,8 +194,8 @@ void RegexpTestDialog::checkPOSIX() if (matches[i].rm_so >= 0 && matches[i].rm_so <= len && matches[i].rm_eo >= 0 && matches[i].rm_eo <= len && matches[i].rm_so <= matches[i].rm_eo) { - QCString subGroup = testString.mid(matches[i].rm_so, matches[i].rm_eo - matches[i].rm_so); - new QListViewItem(subgroups_listview, QString::number(i), subGroup); + TQCString subGroup = testString.mid(matches[i].rm_so, matches[i].rm_eo - matches[i].rm_so); + new TQListViewItem(subgroups_listview, TQString::number(i), subGroup); } } regfree(&compiledPattern); @@ -204,13 +204,13 @@ void RegexpTestDialog::checkPOSIX() void RegexpTestDialog::insertQuoted() { - QString rawstr = pattern_edit->text(); + TQString rawstr = pattern_edit->text(); - QString str; + TQString str; int len = rawstr.length(); for (int i=0; i < len; ++i) { - QChar ch = rawstr[i]; + TQChar ch = rawstr[i]; if (ch == '"') str += "\\\""; else if (ch == '\\') @@ -221,7 +221,7 @@ void RegexpTestDialog::insertQuoted() KParts::ReadWritePart *rwpart = dynamic_cast<KParts::ReadWritePart*>(m_part->partController()->activePart()); - QWidget *view = m_part->partController()->activeWidget(); + TQWidget *view = m_part->partController()->activeWidget(); KTextEditor::EditInterface *editiface = dynamic_cast<KTextEditor::EditInterface*>(rwpart); @@ -244,7 +244,7 @@ void RegexpTestDialog::insertQuoted() void RegexpTestDialog::showRegExpEditor( ) { - _regexp_dialog = KParts::ComponentFactory::createInstanceFromQuery<QDialog>( "KRegExpEditor/KRegExpEditor" ); + _regexp_dialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor" ); if ( _regexp_dialog ) { @@ -253,7 +253,7 @@ void RegexpTestDialog::showRegExpEditor( ) editor->setRegExp( pattern_edit->text() ); - if ( _regexp_dialog->exec() == QDialog::Accepted ) + if ( _regexp_dialog->exec() == TQDialog::Accepted ) { pattern_edit->setText( editor->regExp() ); } diff --git a/parts/regexptest/regexptestdlg.h b/parts/regexptest/regexptestdlg.h index e1c1a4e3..6b02ea02 100644 --- a/parts/regexptest/regexptestdlg.h +++ b/parts/regexptest/regexptestdlg.h @@ -26,7 +26,7 @@ public: ~RegexpTestDialog(); protected: - virtual void showEvent(QShowEvent *e); + virtual void showEvent(TQShowEvent *e); protected slots: void showRegExpEditor(); @@ -40,7 +40,7 @@ private: KDevPlugin *m_part; - QDialog * _regexp_dialog; + TQDialog * _regexp_dialog; }; #endif diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp index 7b6b5193..8a3c8bd5 100644 --- a/parts/regexptest/regexptestpart.cpp +++ b/parts/regexptest/regexptestpart.cpp @@ -24,7 +24,7 @@ static const KDevPluginInfo data("kdevregexptest"); typedef KDevGenericFactory<RegexpTestPart> RegexpTestFactory; K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( data ) ) -RegexpTestPart::RegexpTestPart(QObject *parent, const char *name, const QStringList &) +RegexpTestPart::RegexpTestPart(TQObject *parent, const char *name, const TQStringList &) : KDevPlugin(&data, parent, name ? name : "RegexpTestPart") { setInstance(RegexpTestFactory::instance()); @@ -33,12 +33,12 @@ RegexpTestPart::RegexpTestPart(QObject *parent, const char *name, const QStringL KAction *action; action = new KAction( i18n("Debug Regular Expression..."), 0, - this, SLOT(slotRegexpTest()), + this, TQT_SLOT(slotRegexpTest()), actionCollection(), "tools_regexptest" ); action->setToolTip(i18n("Debug regular expression")); action->setWhatsThis(i18n("<b>Debug regular expression</b><p>Allows to enter a regular expression " "and validate it. It is possible to check syntax of basic POSIX, extended POSIX " - "regular expressions and also syntax allowed by QRegExp and KRegExp classes.")); + "regular expressions and also syntax allowed by TQRegExp and KRegExp classes.")); m_dialog = 0; } diff --git a/parts/regexptest/regexptestpart.h b/parts/regexptest/regexptestpart.h index 7eabeffc..d0446cef 100644 --- a/parts/regexptest/regexptestpart.h +++ b/parts/regexptest/regexptestpart.h @@ -12,7 +12,7 @@ #ifndef _REGEXPTESTPART_H_ #define _REGEXPTESTPART_H_ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kdialogbase.h> #include "kdevplugin.h" @@ -24,7 +24,7 @@ class RegexpTestPart : public KDevPlugin Q_OBJECT public: - RegexpTestPart( QObject *parent, const char *name, const QStringList & ); + RegexpTestPart( TQObject *parent, const char *name, const TQStringList & ); ~RegexpTestPart(); private slots: diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp index 6e1312ed..7a64cac8 100644 --- a/parts/replace/replace_part.cpp +++ b/parts/replace/replace_part.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "replace_part.h" -#include <qwhatsthis.h> +#include <tqwhatsthis.h> #include <kaction.h> #include <kiconloader.h> @@ -29,7 +29,7 @@ static const KDevPluginInfo data("kdevreplace"); typedef KDevGenericFactory<ReplacePart> ReplaceFactory; K_EXPORT_COMPONENT_FACTORY(libkdevreplace, ReplaceFactory(data)) -ReplacePart::ReplacePart(QObject *parent, const char *name, const QStringList& ) +ReplacePart::ReplacePart(TQObject *parent, const char *name, const TQStringList& ) : KDevPlugin( &data, parent, name ? name : "ReplacePart" ) { setInstance(ReplaceFactory::instance()); @@ -39,7 +39,7 @@ ReplacePart::ReplacePart(QObject *parent, const char *name, const QStringList& ) m_widget->setIcon( SmallIcon("filefind") ); m_widget->setCaption(i18n("Replace")); - QWhatsThis::add + TQWhatsThis::add (m_widget, i18n("<b>Replace</b><p>" "This window shows a preview of a string replace " "operation. Uncheck a line to exclude that replacement. " @@ -53,7 +53,7 @@ ReplacePart::ReplacePart(QObject *parent, const char *name, const QStringList& ) mainWindow()->setViewAvailable( m_widget, false ); action = new KAction(i18n("Find-Select-Replace..."), 0, - CTRL+SHIFT+Key_R, this, SLOT(slotReplace()), actionCollection(), "edit_replace_across"); + CTRL+SHIFT+Key_R, this, TQT_SLOT(slotReplace()), actionCollection(), "edit_replace_across"); action->setToolTip( i18n("Project wide string replacement") ); action->setWhatsThis( i18n("<b>Find-Select-Replace</b><p>" "Opens the project wide string replacement dialog. There you " @@ -62,9 +62,9 @@ ReplacePart::ReplacePart(QObject *parent, const char *name, const QStringList& ) "you specify. Matches will be displayed in the <b>Replace</b> window, you " "can replace them with the specified string, exclude them from replace operation or cancel the whole replace.") ); - connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), this, SLOT(contextMenu(QPopupMenu *, const Context *)) ); - connect( core(), SIGNAL(projectOpened()), this, SLOT(enableAction())); - connect( core(), SIGNAL(projectClosed()), this, SLOT(disableAction())); + connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(enableAction())); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(disableAction())); } void ReplacePart::enableAction() @@ -89,18 +89,18 @@ void ReplacePart::slotReplace() m_widget->showDialog(); } -void ReplacePart::contextMenu(QPopupMenu *popup, const Context *context) +void ReplacePart::contextMenu(TQPopupMenu *popup, const Context *context) { if (!context->hasType( Context::EditorContext )) return; const EditorContext *econtext = static_cast<const EditorContext*>(context); - QString ident = econtext->currentWord(); + TQString ident = econtext->currentWord(); if (!ident.isEmpty()) { m_popupstr = ident; - QString squeezed = KStringHandler::csqueeze(ident, 30); + TQString squeezed = KStringHandler::csqueeze(ident, 30); int id = popup->insertItem( i18n("Replace Project Wide: %1").arg(squeezed), - this, SLOT(slotReplace()) ); + this, TQT_SLOT(slotReplace()) ); popup->setWhatsThis(id, i18n("<b>Replace Project Wide</b><p>Opens the find in files dialog " "and sets the pattern to the text under the cursor.")); popup->insertSeparator(); diff --git a/parts/replace/replace_part.h b/parts/replace/replace_part.h index 35a293ab..8fb6f5e3 100644 --- a/parts/replace/replace_part.h +++ b/parts/replace/replace_part.h @@ -13,9 +13,9 @@ #define __KDEVPART_REPLACE_H__ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kdevplugin.h> -#include <qpopupmenu.h> +#include <tqpopupmenu.h> class ReplaceWidget; @@ -27,17 +27,17 @@ class ReplacePart : public KDevPlugin Q_OBJECT public: - ReplacePart(QObject *parent, const char *name, const QStringList &); + ReplacePart(TQObject *parent, const char *name, const TQStringList &); ~ReplacePart(); public slots: void slotReplace(); - void contextMenu(QPopupMenu *popup, const Context *context); + void contextMenu(TQPopupMenu *popup, const Context *context); void enableAction(); void disableAction(); private: - QGuardedPtr<ReplaceWidget> m_widget; - QString m_popupstr; + TQGuardedPtr<ReplaceWidget> m_widget; + TQString m_popupstr; KAction* action; }; diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp index 24078943..c20c3bbc 100644 --- a/parts/replace/replace_widget.cpp +++ b/parts/replace/replace_widget.cpp @@ -35,18 +35,18 @@ #include <klocale.h> #include <kstdguiitem.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qlineedit.h> -#include <qradiobutton.h> -#include <qstringlist.h> -#include <qptrlist.h> -#include <qregexp.h> -#include <qdialog.h> -#include <qfile.h> -#include <qdir.h> -#include <qtextstream.h> -#include <qdatastream.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqlineedit.h> +#include <tqradiobutton.h> +#include <tqstringlist.h> +#include <tqptrlist.h> +#include <tqregexp.h> +#include <tqdialog.h> +#include <tqfile.h> +#include <tqdir.h> +#include <tqtextstream.h> +#include <tqdatastream.h> #include <sys/types.h> #include <unistd.h> @@ -60,13 +60,13 @@ //END Includes ReplaceWidget::ReplaceWidget(ReplacePart *part) - : QWidget(0, "replace widget"), m_part( part ), + : TQWidget(0, "replace widget"), m_part( part ), m_dialog( new ReplaceDlgImpl( this, "replace widget" ) ), _terminateOperation( false ) { // setup outputview - QVBoxLayout * layout = new QVBoxLayout( this ); - QHBoxLayout * buttonlayout = new QHBoxLayout( layout ); + TQVBoxLayout * layout = new TQVBoxLayout( this ); + TQHBoxLayout * buttonlayout = new TQHBoxLayout( layout ); _cancel = new KPushButton( KStdGuiItem::cancel(), this ); _replace = new KPushButton( KGuiItem(i18n("Replace"),"filefind"), this ); @@ -81,13 +81,13 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part) layout->addWidget( _listview ); // setup signals - connect( m_dialog->find_button, SIGNAL( clicked() ), SLOT( find() ) ); + connect( m_dialog->find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( find() ) ); - connect( _replace, SIGNAL( clicked() ), SLOT( replace() ) ); - connect( _cancel, SIGNAL( clicked() ), SLOT( clear() ) ); - connect( _listview, SIGNAL( editDocument( const QString &, int ) ), SLOT( editDocument( const QString &, int ) ) ); + connect( _replace, TQT_SIGNAL( clicked() ), TQT_SLOT( replace() ) ); + connect( _cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( clear() ) ); + connect( _listview, TQT_SIGNAL( editDocument( const TQString &, int ) ), TQT_SLOT( editDocument( const TQString &, int ) ) ); - connect( m_part->core(), SIGNAL( stopButtonClicked( KDevPlugin * ) ), SLOT( stopButtonClicked( KDevPlugin * ) ) ); + connect( m_part->core(), TQT_SIGNAL( stopButtonClicked( KDevPlugin * ) ), TQT_SLOT( stopButtonClicked( KDevPlugin * ) ) ); } //BEGIN Slots @@ -97,7 +97,7 @@ void ReplaceWidget::showDialog() if ( ! m_part->project() ) return; /// @todo feedback? - QString currentWord; + TQString currentWord; KParts::ReadOnlyPart *part = dynamic_cast<KParts::ReadOnlyPart*> ( m_part->partController()->activePart() ); if ( part ) { @@ -107,7 +107,7 @@ void ReplaceWidget::showDialog() cursorPos ( part, &calledCol, &calledLine ); KTextEditor::EditInterface* editIface = dynamic_cast<KTextEditor::EditInterface*>( m_part->partController()->activePart() ); - QString str = editIface->textLine ( calledCol ); + TQString str = editIface->textLine ( calledCol ); int i; uint start, end; @@ -179,7 +179,7 @@ void ReplaceWidget::clear() m_part->mainWindow()->setViewAvailable( this, false ); } -void ReplaceWidget::editDocument( QString const & file, int line ) +void ReplaceWidget::editDocument( TQString const & file, int line ) { m_part->partController()->editDocument( KURL( file ), line ); } @@ -203,10 +203,10 @@ bool ReplaceWidget::showReplacements() bool completed = true; _terminateOperation = false; - QStringList files = workFiles(); - QStringList openfiles = openProjectFiles(); + TQStringList files = workFiles(); + TQStringList openfiles = openProjectFiles(); - QStringList::ConstIterator it = files.begin(); + TQStringList::ConstIterator it = files.begin(); while ( it != files.end() ) { if ( shouldTerminate() ) @@ -219,17 +219,17 @@ bool ReplaceWidget::showReplacements() { if ( KTextEditor::EditInterface * ei = getEditInterfaceForFile( *it ) ) { - QString buffer = ei->text(); - QTextIStream stream( &buffer ); + TQString buffer = ei->text(); + TQTextIStream stream( &buffer ); _listview->showReplacementsForFile( stream, *it ); } } else { - QFile file( *it ); + TQFile file( *it ); if ( file.open ( IO_ReadOnly ) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); _listview->showReplacementsForFile( stream, *it ); } } @@ -280,24 +280,24 @@ bool ReplaceWidget::makeReplacements() bool completed = true; _terminateOperation = false; - QStringList openfiles = openProjectFiles(); - QStringList changedFiles; + TQStringList openfiles = openProjectFiles(); + TQStringList changedFiles; ReplaceItem const * fileitem = _listview->firstChild(); while ( fileitem ) { if ( fileitem->isOn() ) { - QString currentfile = fileitem->file(); + TQString currentfile = fileitem->file(); if ( openfiles.contains( currentfile ) ) { if ( KTextEditor::EditInterface * ei = getEditInterfaceForFile( currentfile ) ) { - QString ibuffer = ei->text(); - QString obuffer; - QTextStream istream( &ibuffer, IO_ReadOnly ); - QTextStream ostream( &obuffer, IO_WriteOnly ); + TQString ibuffer = ei->text(); + TQString obuffer; + TQTextStream istream( &ibuffer, IO_ReadOnly ); + TQTextStream ostream( &obuffer, IO_WriteOnly ); _listview->makeReplacementsForFile( istream, ostream, fileitem ); @@ -306,13 +306,13 @@ bool ReplaceWidget::makeReplacements() } else { - QFile file( currentfile ); - QString buffer; + TQFile file( currentfile ); + TQString buffer; if ( file.open( IO_ReadOnly ) ) { - QTextStream istream( &file ); - QTextStream buffer_stream( &buffer, IO_WriteOnly ); + TQTextStream istream( &file ); + TQTextStream buffer_stream( &buffer, IO_WriteOnly ); _listview->makeReplacementsForFile( istream, buffer_stream, fileitem ); @@ -320,7 +320,7 @@ bool ReplaceWidget::makeReplacements() if ( file.open( IO_WriteOnly ) ) { - QTextStream ostream( &file ); + TQTextStream ostream( &file ); ostream << buffer; file.close(); } @@ -343,7 +343,7 @@ bool ReplaceWidget::makeReplacements() m_part->core()->running( m_part, false ); - if ( calledUrl != QString::null ) + if ( calledUrl != TQString::null ) { m_part->partController()->editDocument( calledUrl, calledLine ); setCursorPos( m_part->partController()->activePart(), calledCol, calledLine ); @@ -357,7 +357,7 @@ bool ReplaceWidget::makeReplacements() //BEGIN Helpers -QStringList ReplaceWidget::workFiles() +TQStringList ReplaceWidget::workFiles() { if ( m_dialog->files_all_radio->isChecked() ) { @@ -370,9 +370,9 @@ QStringList ReplaceWidget::workFiles() return subProjectFiles( m_dialog->path_urlreq->lineEdit()->text() ); } -QString ReplaceWidget::relativeProjectPath( QString path ) +TQString ReplaceWidget::relativeProjectPath( TQString path ) { - QString project = m_part->project()->projectDirectory() + "/"; + TQString project = m_part->project()->projectDirectory() + "/"; if ( path.left( project.length() ) == project ) { path = path.mid( project.length() ); @@ -380,9 +380,9 @@ QString ReplaceWidget::relativeProjectPath( QString path ) return path; } -QString ReplaceWidget::fullProjectPath( QString path ) +TQString ReplaceWidget::fullProjectPath( TQString path ) { - QString project = m_part->project()->projectDirectory() + "/"; + TQString project = m_part->project()->projectDirectory() + "/"; if ( path.left( project.length() ) != project ) { path = project + path; @@ -391,11 +391,11 @@ QString ReplaceWidget::fullProjectPath( QString path ) } -QStringList ReplaceWidget::allProjectFiles() +TQStringList ReplaceWidget::allProjectFiles() { - QStringList allfiles = m_part->project()->allFiles(); + TQStringList allfiles = m_part->project()->allFiles(); - QStringList::iterator it = allfiles.begin(); + TQStringList::iterator it = allfiles.begin(); while ( it != allfiles.end() ) { *it = fullProjectPath( *it ); @@ -404,11 +404,11 @@ QStringList ReplaceWidget::allProjectFiles() return allfiles; } -QStringList ReplaceWidget::subProjectFiles( QString const & subpath ) +TQStringList ReplaceWidget::subProjectFiles( TQString const & subpath ) { - QStringList projectfiles = allProjectFiles(); + TQStringList projectfiles = allProjectFiles(); - QStringList::Iterator it = projectfiles.begin(); + TQStringList::Iterator it = projectfiles.begin(); while ( it != projectfiles.end() ) { if ( (*it).left( subpath.length() ) != subpath) @@ -423,20 +423,20 @@ QStringList ReplaceWidget::subProjectFiles( QString const & subpath ) return projectfiles; } -QStringList ReplaceWidget::openProjectFiles() +TQStringList ReplaceWidget::openProjectFiles() { - QStringList projectfiles = allProjectFiles(); - QStringList openfiles; + TQStringList projectfiles = allProjectFiles(); + TQStringList openfiles; - if( const QPtrList<KParts::Part> * partlist = m_part-> + if( const TQPtrList<KParts::Part> * partlist = m_part-> partController()->parts() ) { - QPtrListIterator<KParts::Part> it( *partlist ); + TQPtrListIterator<KParts::Part> it( *partlist ); while ( KParts::Part* part = it.current() ) { if ( KTextEditor::Editor * ed = dynamic_cast<KTextEditor::Editor *>( part ) ) { - QString editorpath = ed->url().path(); + TQString editorpath = ed->url().path(); if ( projectfiles.contains( editorpath ) ) { openfiles.append( editorpath ); @@ -448,12 +448,12 @@ QStringList ReplaceWidget::openProjectFiles() return openfiles; } -KTextEditor::EditInterface * ReplaceWidget::getEditInterfaceForFile( QString const & file ) +KTextEditor::EditInterface * ReplaceWidget::getEditInterfaceForFile( TQString const & file ) { - if( const QPtrList<KParts::Part> * partlist = m_part-> + if( const TQPtrList<KParts::Part> * partlist = m_part-> partController()->parts() ) { - QPtrListIterator<KParts::Part> it( *partlist ); + TQPtrListIterator<KParts::Part> it( *partlist ); while ( KParts::Part* part = it.current() ) { if ( KTextEditor::Editor * ed = dynamic_cast<KTextEditor::Editor *>( part ) ) @@ -476,7 +476,7 @@ bool ReplaceWidget::shouldTerminate() return b; } -void ReplaceWidget::focusInEvent( QFocusEvent * /* e*/ ) +void ReplaceWidget::focusInEvent( TQFocusEvent * /* e*/ ) { _listview->setFocus(); } diff --git a/parts/replace/replace_widget.h b/parts/replace/replace_widget.h index fa5809d5..bbadce37 100644 --- a/parts/replace/replace_widget.h +++ b/parts/replace/replace_widget.h @@ -14,8 +14,8 @@ #include <ktexteditor/editinterface.h> -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> class QPushButton; class QListViewItem; @@ -38,13 +38,13 @@ public slots: void stopButtonClicked( KDevPlugin * ); protected: - virtual void focusInEvent(QFocusEvent *e); + virtual void focusInEvent(TQFocusEvent *e); private slots: void find(); void replace(); void clear(); - void editDocument( const QString & ,int ); + void editDocument( const TQString & ,int ); void setCursorPos( KParts::Part *part, uint line, uint col ); void cursorPos( KParts::Part *part, uint * line, uint * col ); @@ -53,26 +53,26 @@ private: bool makeReplacements(); bool shouldTerminate(); - QString relativeProjectPath( QString ); - QString fullProjectPath( QString ); + TQString relativeProjectPath( TQString ); + TQString fullProjectPath( TQString ); - QStringList workFiles(); - QStringList allProjectFiles(); - QStringList subProjectFiles( QString const & ); - QStringList openProjectFiles(); + TQStringList workFiles(); + TQStringList allProjectFiles(); + TQStringList subProjectFiles( TQString const & ); + TQStringList openProjectFiles(); - KTextEditor::EditInterface * getEditInterfaceForFile( QString const & file ); + KTextEditor::EditInterface * getEditInterfaceForFile( TQString const & file ); ReplacePart * m_part; ReplaceDlgImpl * m_dialog; ReplaceView * _listview; - QPushButton * _cancel; - QPushButton * _replace; + TQPushButton * _cancel; + TQPushButton * _replace; uint calledCol; uint calledLine; - QString calledUrl; + TQString calledUrl; bool _terminateOperation; }; diff --git a/parts/replace/replacedlgimpl.cpp b/parts/replace/replacedlgimpl.cpp index 59eee128..b0c5bffd 100644 --- a/parts/replace/replacedlgimpl.cpp +++ b/parts/replace/replacedlgimpl.cpp @@ -1,8 +1,8 @@ -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qstring.h> -#include <qregexp.h> -#include <qlabel.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqstring.h> +#include <tqregexp.h> +#include <tqlabel.h> #include <ktrader.h> #include <kparts/componentfactory.h> @@ -20,10 +20,10 @@ namespace /// @todo This is the same function as in ../grepview/grepviewwidget.cpp and /// should probably be placed in a common place. For now it seemed like too /// little code to bother with. -QString escape(const QString &str) +TQString escape(const TQString &str) { - QString escaped("[]{}()\\^$?.+-*"); - QString res; + TQString escaped("[]{}()\\^$?.+-*"); + TQString res; for (uint i=0; i < str.length(); ++i) { @@ -37,17 +37,17 @@ QString escape(const QString &str) } -ReplaceDlgImpl::ReplaceDlgImpl(QWidget* parent, const char* name, bool modal, WFlags fl) +ReplaceDlgImpl::ReplaceDlgImpl(TQWidget* parent, const char* name, bool modal, WFlags fl) : ReplaceDlg(parent,name, modal,fl), _regexp_dialog( 0 ) { - connect( find_button, SIGNAL( clicked() ), SLOT( saveComboHistories() ) ); - connect( regexp_button, SIGNAL( clicked() ), SLOT( showRegExpEditor() ) ); - connect( find_combo, SIGNAL( textChanged( const QString & ) ), - SLOT( validateFind( const QString & ) ) ); - connect( regexp_combo, SIGNAL( textChanged ( const QString & ) ), - SLOT( validateExpression( const QString & ) ) ); - connect( strings_regexp_radio, SIGNAL( toggled( bool ) ), SLOT( toggleExpression( bool ) ) ); + connect( find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( saveComboHistories() ) ); + connect( regexp_button, TQT_SIGNAL( clicked() ), TQT_SLOT( showRegExpEditor() ) ); + connect( find_combo, TQT_SIGNAL( textChanged( const TQString & ) ), + TQT_SLOT( validateFind( const TQString & ) ) ); + connect( regexp_combo, TQT_SIGNAL( textChanged ( const TQString & ) ), + TQT_SLOT( validateExpression( const TQString & ) ) ); + connect( strings_regexp_radio, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggleExpression( bool ) ) ); // disable the editor button if the regexp editor isn't installed if ( KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) @@ -64,7 +64,7 @@ ReplaceDlgImpl::ReplaceDlgImpl(QWidget* parent, const char* name, bool modal, WF ReplaceDlgImpl::~ReplaceDlgImpl() {} -void ReplaceDlgImpl::show( QString const & path ) +void ReplaceDlgImpl::show( TQString const & path ) { path_urlreq->lineEdit()->setText( path ); @@ -77,13 +77,13 @@ void ReplaceDlgImpl::show( QString const & path ) find_button->setEnabled( false ); - QDialog::show(); + TQDialog::show(); } void ReplaceDlgImpl::showRegExpEditor() { - _regexp_dialog = KParts::ComponentFactory::createInstanceFromQuery<QDialog>( "KRegExpEditor/KRegExpEditor" ); + _regexp_dialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor" ); if ( _regexp_dialog ) { @@ -92,14 +92,14 @@ void ReplaceDlgImpl::showRegExpEditor() editor->setRegExp( regexp_combo->currentText() ); - if ( _regexp_dialog->exec() == QDialog::Accepted ) + if ( _regexp_dialog->exec() == TQDialog::Accepted ) { regexp_combo->setCurrentText( editor->regExp() ); } } } -void ReplaceDlgImpl::validateFind( const QString & ) +void ReplaceDlgImpl::validateFind( const TQString & ) { //kdDebug(0) << "ReplaceWidget::validateFind()" << endl; @@ -107,12 +107,12 @@ void ReplaceDlgImpl::validateFind( const QString & ) find_button->setEnabled( !x ); } -void ReplaceDlgImpl::validateExpression( const QString & ) +void ReplaceDlgImpl::validateExpression( const TQString & ) { //kdDebug(0) << "ReplaceWidget::validateExpression()" << endl; - QString pattern = regexp_combo->currentText(); - QRegExp re( pattern ); + TQString pattern = regexp_combo->currentText(); + TQRegExp re( pattern ); if ( pattern.isEmpty() || !re.isValid() ) { @@ -130,7 +130,7 @@ void ReplaceDlgImpl::toggleExpression( bool on ) { if ( on ) { - validateExpression( QString() ); + validateExpression( TQString() ); } else { @@ -157,11 +157,11 @@ void ReplaceDlgImpl::saveComboHistories() } } -QRegExp ReplaceDlgImpl::expressionPattern() +TQRegExp ReplaceDlgImpl::expressionPattern() { - QString pattern = escape( find_combo->currentText() ); + TQString pattern = escape( find_combo->currentText() ); - QRegExp re; + TQRegExp re; re.setCaseSensitive( case_box->isChecked() ); re.setMinimal( true ); @@ -179,7 +179,7 @@ QRegExp ReplaceDlgImpl::expressionPattern() return re; } -QString ReplaceDlgImpl::replacementString() +TQString ReplaceDlgImpl::replacementString() { return replacement_combo->currentText(); } diff --git a/parts/replace/replacedlgimpl.h b/parts/replace/replacedlgimpl.h index 38938bed..d67908ff 100644 --- a/parts/replace/replacedlgimpl.h +++ b/parts/replace/replacedlgimpl.h @@ -11,26 +11,26 @@ class ReplaceDlgImpl : public ReplaceDlg Q_OBJECT public: - ReplaceDlgImpl(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ReplaceDlgImpl(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~ReplaceDlgImpl(); - QRegExp expressionPattern(); - QString replacementString(); + TQRegExp expressionPattern(); + TQString replacementString(); public slots: - void show( QString const & path ); + void show( TQString const & path ); protected: protected slots: void showRegExpEditor(); - void validateExpression( const QString & ); - void validateFind( const QString & ); + void validateExpression( const TQString & ); + void validateFind( const TQString & ); void toggleExpression( bool ); void saveComboHistories(); private: - QDialog * _regexp_dialog; + TQDialog * _regexp_dialog; }; diff --git a/parts/replace/replaceitem.cpp b/parts/replace/replaceitem.cpp index bc33211f..d810e2ad 100644 --- a/parts/replace/replaceitem.cpp +++ b/parts/replace/replaceitem.cpp @@ -9,10 +9,10 @@ * * ***************************************************************************/ -#include <qpainter.h> -#include <qstyle.h> -#include <qpalette.h> -#include <qcheckbox.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqpalette.h> +#include <tqcheckbox.h> #include "replaceitem.h" @@ -69,41 +69,41 @@ void ReplaceItem::setChecked( bool checked ) } } -// code mostly lifted from QCheckListItem::paintCell() -void ReplaceItem::paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int align ) +// code mostly lifted from TQCheckListItem::paintCell() +void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ) { if ( !p ) return; - QListView *lvv = listView(); + TQListView *lvv = listView(); if ( !lvv ) return; ReplaceView * lv = static_cast<ReplaceView*>(lvv); const BackgroundMode bgmode = lv->viewport()->backgroundMode(); - const QColorGroup::ColorRole crole = QPalette::backgroundRoleFromMode( bgmode ); + const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) ) p->fillRect( 0, 0, width, height(), cg.brush( crole ) ); else - lv->paintEmptyArea( p, QRect( 0, 0, width, height() ) ); + lv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) ); - QFontMetrics fm( lv->fontMetrics() ); - int boxsize = lv->style().pixelMetric(QStyle::PM_CheckListButtonSize, lv); + TQFontMetrics fm( lv->fontMetrics() ); + int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv); int marg = lv->itemMargin(); int r = marg; // Draw controller / checkbox / radiobutton --------------------- - int styleflags = QStyle::Style_Default; + int styleflags = TQStyle::Style_Default; if ( isOn() ) - styleflags |= QStyle::Style_On; + styleflags |= TQStyle::Style_On; else - styleflags |= QStyle::Style_Off; + styleflags |= TQStyle::Style_Off; if ( isSelected() ) - styleflags |= QStyle::Style_Selected; + styleflags |= TQStyle::Style_Selected; if ( isEnabled() && lv->isEnabled() ) - styleflags |= QStyle::Style_Enabled; + styleflags |= TQStyle::Style_Enabled; int x = 0; int y = 0; @@ -116,30 +116,30 @@ void ReplaceItem::paintCell( QPainter * p, const QColorGroup & cg, int column, i else y = (fm.height() + 2 + marg - boxsize) / 2; - lv->style().drawPrimitive(QStyle::PE_CheckListIndicator, p, - QRect(x, y, boxsize, + lv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p, + TQRect(x, y, boxsize, fm.height() + 2 + marg), - cg, styleflags, QStyleOption(this)); + cg, styleflags, TQStyleOption(this)); r += boxsize + 4; // Draw text ---------------------------------------------------- p->translate( r, 0 ); - p->setPen( QPen( cg.text() ) ); + p->setPen( TQPen( cg.text() ) ); - QColorGroup mcg = cg; - mcg.setColor( QColorGroup::Text, ( isFile() ? Qt::darkGreen : Qt::blue ) ); - mcg.setColor( QColorGroup::HighlightedText, ( isFile() ? Qt::darkGreen : Qt::blue ) ); + TQColorGroup mcg = cg; + mcg.setColor( TQColorGroup::Text, ( isFile() ? Qt::darkGreen : Qt::blue ) ); + mcg.setColor( TQColorGroup::HighlightedText, ( isFile() ? Qt::darkGreen : Qt::blue ) ); - QListViewItem::paintCell( p, mcg, column, width - r, align ); + TQListViewItem::paintCell( p, mcg, column, width - r, align ); } -void ReplaceItem::activate( int, QPoint const & localPos ) +void ReplaceItem::activate( int, TQPoint const & localPos ) { - QListView * lv = listView(); - QCheckBox cb(0); + TQListView * lv = listView(); + TQCheckBox cb(0); int boxsize = cb.sizeHint().width(); -//that's KDE-3.1 only int boxsize = lv->style().pixelMetric(QStyle::PM_CheckListButtonSize, lv); +//that's KDE-3.1 only int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv); int rightside = lv->itemMargin() + boxsize + ( isFile() ? 0 : lv->treeStepSize() ); // _lineclicked indicates if the click was on the line or in the checkbox diff --git a/parts/replace/replaceitem.h b/parts/replace/replaceitem.h index a6bc8ffb..4cea682c 100644 --- a/parts/replace/replaceitem.h +++ b/parts/replace/replaceitem.h @@ -22,10 +22,10 @@ class ReplaceItem : public QCheckListItem { public: // the file item - ReplaceItem( ReplaceView * parent, ReplaceItem * after, QString file ) : - QCheckListItem( parent, + ReplaceItem( ReplaceView * parent, ReplaceItem * after, TQString file ) : + TQCheckListItem( parent, after, - file, QCheckListItem::CheckBox ), + file, TQCheckListItem::CheckBox ), _file( file ), _string( file ), _line( 0 ), _isfile( true ), _lineclicked( false ), _clicked( true ) { @@ -34,17 +34,17 @@ public: } // the line item - ReplaceItem( ReplaceItem * parent, ReplaceItem * after, QString file, QString string, int line ) : - QCheckListItem( parent, + ReplaceItem( ReplaceItem * parent, ReplaceItem * after, TQString file, TQString string, int line ) : + TQCheckListItem( parent, after, - QString::number( line + 1 ) + ": " + string, QCheckListItem::CheckBox ), + TQString::number( line + 1 ) + ": " + string, TQCheckListItem::CheckBox ), _file( file ), _string( string ), _line( line ), _isfile( false ), _lineclicked( false ), _clicked( true ) { setOn( true ); } - QString const & file() const + TQString const & file() const { return _file; } @@ -54,7 +54,7 @@ public: return _line; } - QString const & string() const + TQString const & string() const { return _string; } @@ -78,31 +78,31 @@ public: ReplaceItem * parent() const { - return static_cast<ReplaceItem*>( QListViewItem::parent() ); + return static_cast<ReplaceItem*>( TQListViewItem::parent() ); } ReplaceItem * firstChild() const { - return static_cast<ReplaceItem*>( QListViewItem::firstChild() ); + return static_cast<ReplaceItem*>( TQListViewItem::firstChild() ); } ReplaceItem * nextSibling() const { - return static_cast<ReplaceItem*>( QListViewItem::nextSibling() ); + return static_cast<ReplaceItem*>( TQListViewItem::nextSibling() ); } - void activate( int column, QPoint const & localPos ); + void activate( int column, TQPoint const & localPos ); bool hasCheckedChildren() const; virtual void stateChange( bool state ); static bool s_listview_done; private: - void paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int align ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ); void setChecked( bool checked ); - QString _file; - QString _string; + TQString _file; + TQString _string; int _line; bool const _isfile; bool _lineclicked; diff --git a/parts/replace/replaceview.cpp b/parts/replace/replaceview.cpp index 7a7505d7..6730971a 100644 --- a/parts/replace/replaceview.cpp +++ b/parts/replace/replaceview.cpp @@ -9,12 +9,12 @@ * * ***************************************************************************/ -#include <qheader.h> -#include <qtextstream.h> -#include <qdir.h> -#include <qstringlist.h> -#include <qregexp.h> -#include <qpalette.h> +#include <tqheader.h> +#include <tqtextstream.h> +#include <tqdir.h> +#include <tqstringlist.h> +#include <tqregexp.h> +#include <tqpalette.h> #include "replaceitem.h" #include "replaceview.h" @@ -23,29 +23,29 @@ ReplaceItem * ReplaceView::firstChild() const { - return static_cast<ReplaceItem*>( QListView::firstChild() ); + return static_cast<ReplaceItem*>( TQListView::firstChild() ); } -ReplaceView::ReplaceView( QWidget * parent ) : KListView( parent ), _latestfile( 0 ) +ReplaceView::ReplaceView( TQWidget * parent ) : KListView( parent ), _latestfile( 0 ) { setSorting( -1 ); addColumn( "" ); header()->hide(); setFullWidth(true); - QPalette pal = palette(); - QColorGroup cg = pal.active(); - cg.setColor( QColorGroup::Highlight, Qt::lightGray ); + TQPalette pal = palette(); + TQColorGroup cg = pal.active(); + cg.setColor( TQColorGroup::Highlight, Qt::lightGray ); pal.setActive( cg ); setPalette( pal ); - connect( this, SIGNAL( clicked( QListViewItem * ) ), SLOT( slotClicked( QListViewItem * ) ) ); - connect( this, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint &, int) ), - SLOT( slotMousePressed(int, QListViewItem *, const QPoint &, int) ) ); + connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ), TQT_SLOT( slotClicked( TQListViewItem * ) ) ); + connect( this, TQT_SIGNAL( mouseButtonPressed( int, TQListViewItem *, const TQPoint &, int) ), + TQT_SLOT( slotMousePressed(int, TQListViewItem *, const TQPoint &, int) ) ); } -void ReplaceView::makeReplacementsForFile( QTextStream & istream, QTextStream & ostream, ReplaceItem const * fileitem ) +void ReplaceView::makeReplacementsForFile( TQTextStream & istream, TQTextStream & ostream, ReplaceItem const * fileitem ) { int line = 0; @@ -73,7 +73,7 @@ void ReplaceView::makeReplacementsForFile( QTextStream & istream, QTextStream & } } -void ReplaceView::showReplacementsForFile( QTextStream & stream, QString const & file ) +void ReplaceView::showReplacementsForFile( TQTextStream & stream, TQString const & file ) { ReplaceItem * latestitem = 0; @@ -82,7 +82,7 @@ void ReplaceView::showReplacementsForFile( QTextStream & stream, QString const & while ( !stream.atEnd() ) { - QString s = stream.readLine(); + TQString s = stream.readLine(); if ( s.contains( _regexp ) > 0 ) { @@ -100,13 +100,13 @@ void ReplaceView::showReplacementsForFile( QTextStream & stream, QString const & } } -void ReplaceView::setReplacementData( QRegExp const & re, QString const & replacement ) +void ReplaceView::setReplacementData( TQRegExp const & re, TQString const & replacement ) { _regexp = re; _replacement = replacement; } -void ReplaceView::slotMousePressed(int btn, QListViewItem* i, const QPoint& pos, int col) +void ReplaceView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& pos, int col) { kdDebug(0) << "ReplaceView::slotMousePressed()" << endl; @@ -119,12 +119,12 @@ void ReplaceView::slotMousePressed(int btn, QListViewItem* i, const QPoint& pos, else if ( btn == Qt::LeftButton ) { // map pos to item/column and call ReplacetItem::activate(pos) - item->activate( col, viewport()->mapFromGlobal( pos ) - QPoint( 0, itemRect(item).top() ) ); + item->activate( col, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(item).top() ) ); } } } -void ReplaceView::slotClicked( QListViewItem * item ) +void ReplaceView::slotClicked( TQListViewItem * item ) { kdDebug(0) << "ReplaceView::slotClicked()" << endl; diff --git a/parts/replace/replaceview.h b/parts/replace/replaceview.h index 02ba60c9..31dcc4cd 100644 --- a/parts/replace/replaceview.h +++ b/parts/replace/replaceview.h @@ -14,8 +14,8 @@ #include <klistview.h> -#include <qstring.h> -#include <qregexp.h> +#include <tqstring.h> +#include <tqregexp.h> class QTextStream; class QWidget; @@ -26,22 +26,22 @@ class ReplaceView : public KListView Q_OBJECT signals: - void editDocument( const QString &, int ); + void editDocument( const TQString &, int ); public: - ReplaceView( QWidget *); + ReplaceView( TQWidget *); ReplaceItem * firstChild() const; - void setReplacementData( QRegExp const &, QString const & ); - void showReplacementsForFile( QTextStream &, QString const & ); - void makeReplacementsForFile( QTextStream & istream, QTextStream & ostream, ReplaceItem const * fileitem ); + void setReplacementData( TQRegExp const &, TQString const & ); + void showReplacementsForFile( TQTextStream &, TQString const & ); + void makeReplacementsForFile( TQTextStream & istream, TQTextStream & ostream, ReplaceItem const * fileitem ); private slots: - void slotMousePressed(int, QListViewItem *, const QPoint &, int); - void slotClicked( QListViewItem * ); + void slotMousePressed(int, TQListViewItem *, const TQPoint &, int); + void slotClicked( TQListViewItem * ); private: - QRegExp _regexp; - QString _replacement; + TQRegExp _regexp; + TQString _replacement; ReplaceItem * _latestfile; friend class ReplaceItem; diff --git a/parts/scripting/scriptingglobalconfig.cpp b/parts/scripting/scriptingglobalconfig.cpp index e4076d15..78749465 100644 --- a/parts/scripting/scriptingglobalconfig.cpp +++ b/parts/scripting/scriptingglobalconfig.cpp @@ -24,12 +24,12 @@ #include <keditlistbox.h> #include <kapplication.h> #include <kconfig.h> -scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, QWidget *parent, const char *name) +scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *parent, const char *name) : scriptingGlobalConfigBase(parent, name), m_part(part) { // read kconfig and post list to the m_dirs KConfig *cfg = kapp->config(); - QStringList searchDirs = cfg->readListEntry("SearchDirs"); + TQStringList searchDirs = cfg->readListEntry("SearchDirs"); m_dirs->clear(); m_dirs->insertStringList(searchDirs); } @@ -39,7 +39,7 @@ void scriptingGlobalConfig::accept() // read mdirs and save to kconfig KConfig *cfg = kapp->config(); if( !m_dirs->isEnabled() ) - cfg->writeEntry("SearchDirs", QStringList() ); + cfg->writeEntry("SearchDirs", TQStringList() ); else cfg->writeEntry("SearchDirs", m_dirs->items() ); m_part->setupActions(); diff --git a/parts/scripting/scriptingglobalconfig.h b/parts/scripting/scriptingglobalconfig.h index af6750d0..85343e33 100644 --- a/parts/scripting/scriptingglobalconfig.h +++ b/parts/scripting/scriptingglobalconfig.h @@ -29,7 +29,7 @@ class scriptingGlobalConfig: public scriptingGlobalConfigBase { Q_OBJECT public: - scriptingGlobalConfig(scriptingPart *part, QWidget *parent = 0, const char *name = 0); + scriptingGlobalConfig(scriptingPart *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp index adc8f581..496746b2 100644 --- a/parts/scripting/scriptingpart.cpp +++ b/parts/scripting/scriptingpart.cpp @@ -20,9 +20,9 @@ #include "scriptingpart.h" -#include <qtimer.h> -#include <qpopupmenu.h> -#include <qwhatsthis.h> +#include <tqtimer.h> +#include <tqpopupmenu.h> +#include <tqwhatsthis.h> #include <klocale.h> #include <kaction.h> @@ -47,7 +47,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( data ) ) #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -scriptingPart::scriptingPart(QObject *parent, const char *name, const QStringList &/*args*/) +scriptingPart::scriptingPart(TQObject *parent, const char *name, const TQStringList &/*args*/) : KDevPlugin(&data, parent, name ? name : "scriptingPart"), m_scripts(0L) { setInstance(scriptingFactory::instance()); @@ -55,12 +55,12 @@ scriptingPart::scriptingPart(QObject *parent, const char *name, const QStringLis m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("Scripting"), GLOBALDOC_OPTIONS, info()->icon()); - connect(m_configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )), - this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int))); + connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - QTimer::singleShot(0, this, SLOT(init())); + TQTimer::singleShot(0, this, TQT_SLOT(init())); } scriptingPart::~scriptingPart() @@ -80,17 +80,17 @@ void scriptingPart::setupActions() { kdDebug() << "Load plugins" << endl; // Read KConfig and get the list of custom directories. - QStringList searchDirs; + TQStringList searchDirs; searchDirs += "kate/scripts"; KConfig *cfg = kapp->config(); searchDirs += cfg->readListEntry("SearchDirs"); - unplugActionList(QString::fromLatin1( "script_actions" )); - plugActionList( QString::fromLatin1( "script_actions" ), m_scripts->scripts(core(),searchDirs)); + unplugActionList(TQString::fromLatin1( "script_actions" )); + plugActionList( TQString::fromLatin1( "script_actions" ), m_scripts->scripts(core(),searchDirs)); } -void scriptingPart::insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo) +void scriptingPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo) { // create configuraton dialogs here switch (pageNo) @@ -98,7 +98,7 @@ void scriptingPart::insertConfigWidget(const KDialogBase *dlg, QWidget *page, un case GLOBALDOC_OPTIONS: { scriptingGlobalConfig *w = new scriptingGlobalConfig(this, page, "global config"); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); break; } } diff --git a/parts/scripting/scriptingpart.h b/parts/scripting/scriptingpart.h index abfbde24..7f929891 100644 --- a/parts/scripting/scriptingpart.h +++ b/parts/scripting/scriptingpart.h @@ -23,7 +23,7 @@ #include <kdevplugin.h> -#include <qguardedptr.h> +#include <tqguardedptr.h> class QPopupMenu; class KAction; @@ -38,14 +38,14 @@ class scriptingPart: public KDevPlugin { Q_OBJECT public: - scriptingPart(QObject *parent, const char *name, const QStringList &args); + scriptingPart(TQObject *parent, const char *name, const TQStringList &args); ~scriptingPart(); public slots: void setupActions(); private slots: void init(); - void insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo); + void insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo); diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp index f7564109..eb1c47ac 100644 --- a/parts/snippet/snippet_part.cpp +++ b/parts/snippet/snippet_part.cpp @@ -7,17 +7,17 @@ */ #include "snippet_part.h" -#include <qwhatsthis.h> +#include <tqwhatsthis.h> #include <kaction.h> #include <kiconloader.h> #include <klocale.h> #include <kaboutdata.h> -#include <qvbox.h> +#include <tqvbox.h> #include <kdialogbase.h> #include <klineedit.h> -#include <qcheckbox.h> -#include <qbuttongroup.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> #include <ktrader.h> #include "kdevcore.h" @@ -37,7 +37,7 @@ static const KDevPluginInfo data("kdevsnippet"); typedef KDevGenericFactory<SnippetPart> snippetFactory; K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( data ) ) -SnippetPart::SnippetPart(QObject *parent, const char *name, const QStringList& ) +SnippetPart::SnippetPart(TQObject *parent, const char *name, const TQStringList& ) : KDevPlugin(&data, parent, name ? name : "SnippetPart" ) { setInstance(snippetFactory::instance()); @@ -47,16 +47,16 @@ SnippetPart::SnippetPart(QObject *parent, const char *name, const QStringList& ) m_widget->setCaption(i18n("Code Snippets")); m_widget->setIcon(SmallIcon( info()->icon() )); - QWhatsThis::add(m_widget, i18n("<b>Code Snippet</b><p>This is a list of available snippets.")); + TQWhatsThis::add(m_widget, i18n("<b>Code Snippet</b><p>This is a list of available snippets.")); mainWindow()->embedSelectViewRight( m_widget, i18n("Code Snippets"), i18n("Insert a code snippet") ); - connect( core(), SIGNAL( configWidget( KDialogBase * ) ), this, SLOT( slotConfigWidget( KDialogBase * ) ) ); + connect( core(), TQT_SIGNAL( configWidget( KDialogBase * ) ), this, TQT_SLOT( slotConfigWidget( KDialogBase * ) ) ); /*The next two connects are used to check if certain SnippetGroups need to be opened according to the languages supported by this project*/ - connect( core(), SIGNAL( projectOpened() ), m_widget, SLOT( languageChanged() ) ); - connect( core(), SIGNAL( languageChanged() ), m_widget, SLOT( languageChanged() ) ); + connect( core(), TQT_SIGNAL( projectOpened() ), m_widget, TQT_SLOT( languageChanged() ) ); + connect( core(), TQT_SIGNAL( languageChanged() ), m_widget, TQT_SLOT( languageChanged() ) ); setupActions(); } @@ -73,7 +73,7 @@ SnippetPart::~SnippetPart() void SnippetPart::setupActions() { - new KAction( i18n("Show Snippet Tree"), CTRL+ALT+SHIFT+Key_S, this, SLOT(slotShowView()), actionCollection(), "snippet_showview"); + new KAction( i18n("Show Snippet Tree"), CTRL+ALT+SHIFT+Key_S, this, TQT_SLOT(slotShowView()), actionCollection(), "snippet_showview"); } /*! @@ -97,7 +97,7 @@ KAboutData* SnippetPart::aboutData() */ void SnippetPart::slotConfigWidget( KDialogBase *dlg ) { - QVBox *vbox = dlg->addVBoxPage( i18n("Code Snippets"), i18n("Code Snippets"), BarIcon( info()->icon(), KIcon::SizeMedium ) ); + TQVBox *vbox = dlg->addVBoxPage( i18n("Code Snippets"), i18n("Code Snippets"), BarIcon( info()->icon(), KIcon::SizeMedium ) ); SnippetSettings * w = new SnippetSettings( m_widget, vbox ); @@ -105,22 +105,22 @@ void SnippetPart::slotConfigWidget( KDialogBase *dlg ) w->leDelimiter->setText(m_widget->getSnippetConfig()->getDelimiter()); w->cbToolTip->setChecked(m_widget->getSnippetConfig()->useToolTips()); w->btnGroupAutoOpen->setButton(m_widget->getSnippetConfig()->getAutoOpenGroups()); - connect( dlg, SIGNAL(okClicked()), w, SLOT(slotOKClicked()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotOKClicked()) ); } -QStringList SnippetPart::getAllLanguages() +TQStringList SnippetPart::getAllLanguages() { KTrader::OfferList languageSupportOffers = - KTrader::self()->query(QString::fromLatin1("KDevelop/LanguageSupport"), - QString::fromLatin1("[X-KDevelop-Version] == %1" + KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"), + TQString::fromLatin1("[X-KDevelop-Version] == %1" ).arg( KDEVELOP_PLUGIN_VERSION )); - QStringList languages; + TQStringList languages; for (KTrader::OfferList::ConstIterator it = languageSupportOffers.begin(); it != languageSupportOffers.end(); ++it) { - QString language = (*it)->property("X-KDevelop-Language").toString(); + TQString language = (*it)->property("X-KDevelop-Language").toString(); languages.append(language); kdDebug(9035) << "Found language: " << (*it)->property("X-KDevelop-Language").toString() << endl << @@ -132,13 +132,13 @@ QStringList SnippetPart::getAllLanguages() } -QStringList SnippetPart::getProjectLanguages() +TQStringList SnippetPart::getProjectLanguages() { - QStringList languages; + TQStringList languages; if (!projectDom()) return languages; - QDomDocument m_projectDom = *projectDom(); + TQDomDocument m_projectDom = *projectDom(); if (m_widget->getSnippetConfig()->getAutoOpenGroups() == 1) languages = DomUtil::readListEntry(m_projectDom, "/general/secondaryLanguages", "language"); diff --git a/parts/snippet/snippet_part.h b/parts/snippet/snippet_part.h index 98c3b252..c62950fc 100644 --- a/parts/snippet/snippet_part.h +++ b/parts/snippet/snippet_part.h @@ -11,7 +11,7 @@ #define __KDEVPART_SNIPPET_H__ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kdevplugin.h> @@ -30,16 +30,16 @@ class SnippetPart : public KDevPlugin public: - SnippetPart(QObject *parent, const char *name, const QStringList &); + SnippetPart(TQObject *parent, const char *name, const TQStringList &); ~SnippetPart(); KAboutData * aboutData(); - QStringList getAllLanguages(); - QStringList getProjectLanguages(); + TQStringList getAllLanguages(); + TQStringList getProjectLanguages(); private: void setupActions(); - QGuardedPtr<SnippetWidget> m_widget; + TQGuardedPtr<SnippetWidget> m_widget; public slots: void slotConfigWidget( KDialogBase *dlg ); diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp index 98d61505..2c35d5c5 100644 --- a/parts/snippet/snippet_widget.cpp +++ b/parts/snippet/snippet_widget.cpp @@ -11,28 +11,28 @@ #include <kurl.h> #include <kdebug.h> #include <klocale.h> -#include <qlayout.h> +#include <tqlayout.h> #include <kpushbutton.h> #include <klistview.h> -#include <qheader.h> +#include <tqheader.h> #include <klineedit.h> #include <ktextedit.h> #include <kmessagebox.h> -#include <qsplitter.h> +#include <tqsplitter.h> #include <ktexteditor/editinterface.h> #include <ktexteditor/editor.h> #include <ktexteditor/viewcursorinterface.h> #include <ktexteditor/document.h> #include <kconfig.h> -#include <qtooltip.h> +#include <tqtooltip.h> #include <kpopupmenu.h> -#include <qregexp.h> -#include <qinputdialog.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qwhatsthis.h> -#include <qdragobject.h> -#include <qtimer.h> +#include <tqregexp.h> +#include <tqinputdialog.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqwhatsthis.h> +#include <tqdragobject.h> +#include <tqtimer.h> #include <kcombobox.h> #include <kdeversion.h> @@ -47,7 +47,7 @@ #include "snippet_widget.h" SnippetWidget::SnippetWidget(SnippetPart *part) - : KListView(0, "snippet widget"), QToolTip( viewport() ), + : KListView(0, "snippet widget"), TQToolTip( viewport() ), m_part( part ) { // init the QPtrList @@ -64,20 +64,20 @@ SnippetWidget::SnippetWidget(SnippetPart *part) setRootIsDecorated(true); //connect the signals - connect( this, SIGNAL( contextMenuRequested ( QListViewItem *, const QPoint & , int ) ), - this, SLOT( showPopupMenu(QListViewItem *, const QPoint & , int ) ) ); + connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), + this, TQT_SLOT( showPopupMenu(TQListViewItem *, const TQPoint & , int ) ) ); - connect( this, SIGNAL( executed (QListViewItem *) ), - this, SLOT( slotExecuted( QListViewItem *) ) ); - connect( this, SIGNAL( returnPressed (QListViewItem *) ), - this, SLOT( slotExecuted( QListViewItem *) ) ); + connect( this, TQT_SIGNAL( executed (TQListViewItem *) ), + this, TQT_SLOT( slotExecuted( TQListViewItem *) ) ); + connect( this, TQT_SIGNAL( returnPressed (TQListViewItem *) ), + this, TQT_SLOT( slotExecuted( TQListViewItem *) ) ); - connect( this, SIGNAL( dropped(QDropEvent *, QListViewItem *) ), - this, SLOT( slotDropped(QDropEvent *, QListViewItem *) ) ); + connect( this, TQT_SIGNAL( dropped(TQDropEvent *, TQListViewItem *) ), + this, TQT_SLOT( slotDropped(TQDropEvent *, TQListViewItem *) ) ); _cfg = 0; - QTimer::singleShot(0, this, SLOT(initConfig())); + TQTimer::singleShot(0, this, TQT_SLOT(initConfig())); } SnippetWidget::~SnippetWidget() @@ -121,7 +121,7 @@ void SnippetWidget::slotAdd() } dlg.cbGroup->setCurrentText(group->getName()); - if (dlg.exec() == QDialog::Accepted) { + if (dlg.exec() == TQDialog::Accepted) { group = dynamic_cast<SnippetGroup*>(SnippetItem::findItemByName(dlg.cbGroup->currentText(), _list)); _list.append( new SnippetItem(group, dlg.snippetName->text(), dlg.snippetText->text()) ); } @@ -144,7 +144,7 @@ void SnippetWidget::slotAddGroup() dlg.cbGroup->setCurrentText(i18n("All")); dlg.textLabelGroup->setText(i18n("Language:")); - if (dlg.exec() == QDialog::Accepted) { + if (dlg.exec() == TQDialog::Accepted) { _list.append( new SnippetGroup(this, dlg.snippetName->text(), SnippetGroup::getMaxId(), dlg.cbGroup->currentText()) ); } } @@ -157,7 +157,7 @@ void SnippetWidget::slotAddGroup() void SnippetWidget::slotRemove() { //get current data - QListViewItem * item = currentItem(); + TQListViewItem * item = currentItem(); SnippetItem *snip = dynamic_cast<SnippetItem*>( item ); SnippetGroup *group = dynamic_cast<SnippetGroup*>( item ); if (!snip) @@ -165,7 +165,7 @@ void SnippetWidget::slotRemove() if (group) { if (group->childCount() > 0 && - KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove this group and all its snippets?"),QString::null,KStdGuiItem::del()) + KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove this group and all its snippets?"),TQString::null,KStdGuiItem::del()) == KMessageBox::Cancel) return; @@ -190,7 +190,7 @@ void SnippetWidget::slotRemove() void SnippetWidget::slotEdit() { //get current data - QListViewItem * item = currentItem(); + TQListViewItem * item = currentItem(); SnippetGroup *pGroup = dynamic_cast<SnippetGroup*>(item); SnippetItem *pSnippet = dynamic_cast<SnippetItem*>( item ); @@ -212,7 +212,7 @@ void SnippetWidget::slotEdit() } dlg.cbGroup->setCurrentText(SnippetItem::findGroupById(pSnippet->getParent(), _list)->getName()); - if (dlg.exec() == QDialog::Accepted) { + if (dlg.exec() == TQDialog::Accepted) { //update the KListView and the SnippetItem item->setText( 0, dlg.snippetName->text() ); pSnippet->setName( dlg.snippetName->text() ); @@ -237,7 +237,7 @@ void SnippetWidget::slotEdit() void SnippetWidget::slotEditGroup() { //get current data - QListViewItem * item = currentItem(); + TQListViewItem * item = currentItem(); SnippetGroup *pGroup = dynamic_cast<SnippetGroup*>( item ); if (!pGroup) /*selected item MUST be a SnippetGroup*/ @@ -255,7 +255,7 @@ void SnippetWidget::slotEditGroup() dlg.cbGroup->setCurrentText(pGroup->getLanguage()); dlg.textLabelGroup->setText(i18n("Language:")); - if (dlg.exec() == QDialog::Accepted) { + if (dlg.exec() == TQDialog::Accepted) { //update the KListView and the SnippetGroup item->setText( 0, dlg.snippetName->text() ); pGroup->setName( dlg.snippetName->text() ); @@ -265,7 +265,7 @@ void SnippetWidget::slotEditGroup() } } -void SnippetWidget::slotExecuted(QListViewItem * item) +void SnippetWidget::slotExecuted(TQListViewItem * item) { SnippetItem *pSnippet = dynamic_cast<SnippetItem*>( item ); if (!pSnippet || dynamic_cast<SnippetGroup*>(item)) @@ -277,10 +277,10 @@ void SnippetWidget::slotExecuted(QListViewItem * item) /*! - \fn SnippetWidget::insertIntoActiveView(QString text) + \fn SnippetWidget::insertIntoActiveView(TQString text) Inserts the parameter text into the activ view */ -void SnippetWidget::insertIntoActiveView(QString text) +void SnippetWidget::insertIntoActiveView(TQString text) { //get the interfaces for the KTexteditor parts KTextEditor::ViewCursorInterface *cursorIface @@ -315,9 +315,9 @@ void SnippetWidget::writeConfig() _cfg->setGroup("SnippetPart"); SnippetItem *item; - QString strKeyName=""; - QString strKeyText=""; - QString strKeyId=""; + TQString strKeyName=""; + TQString strKeyText=""; + TQString strKeyId=""; int iSnipCount = 0; int iGroupCount = 0; @@ -327,9 +327,9 @@ void SnippetWidget::writeConfig() SnippetGroup * group = dynamic_cast<SnippetGroup*>(item); if (group) { kdDebug(9035) << "-->GROUP " << item->getName() << group->getId() << " " << iGroupCount<< endl; - strKeyName=QString("snippetGroupName_%1").arg(iGroupCount); - strKeyId=QString("snippetGroupId_%1").arg(iGroupCount); - strKeyText=QString("snippetGroupLang_%1").arg(iGroupCount); + strKeyName=TQString("snippetGroupName_%1").arg(iGroupCount); + strKeyId=TQString("snippetGroupId_%1").arg(iGroupCount); + strKeyText=TQString("snippetGroupLang_%1").arg(iGroupCount); _cfg->writeEntry(strKeyName, group->getName()); _cfg->writeEntry(strKeyId, group->getId()); @@ -337,9 +337,9 @@ void SnippetWidget::writeConfig() iGroupCount++; } else if (dynamic_cast<SnippetItem*>(item)) { kdDebug(9035) << "-->ITEM " << item->getName() << item->getParent() << " " << iSnipCount << endl; - strKeyName=QString("snippetName_%1").arg(iSnipCount); - strKeyText=QString("snippetText_%1").arg(iSnipCount); - strKeyId=QString("snippetParent_%1").arg(iSnipCount); + strKeyName=TQString("snippetName_%1").arg(iSnipCount); + strKeyText=TQString("snippetText_%1").arg(iSnipCount); + strKeyId=TQString("snippetParent_%1").arg(iSnipCount); _cfg->writeEntry(strKeyName, item->getName()); _cfg->writeEntry(strKeyText, item->getText()); @@ -353,12 +353,12 @@ void SnippetWidget::writeConfig() _cfg->writeEntry("snippetGroupCount", iGroupCount); int iCount = 1; - QMap<QString, QString>::Iterator it; + TQMap<TQString, TQString>::Iterator it; for ( it = _mapSaved.begin(); it != _mapSaved.end(); ++it ) { //write the saved variable values if (it.data().length()<=0) continue; //is the saved value has no length -> no need to save it - strKeyName=QString("snippetSavedName_%1").arg(iCount); - strKeyText=QString("snippetSavedVal_%1").arg(iCount); + strKeyName=TQString("snippetSavedName_%1").arg(iCount); + strKeyText=TQString("snippetSavedVal_%1").arg(iCount); _cfg->writeEntry(strKeyName, it.key()); _cfg->writeEntry(strKeyText, it.data()); @@ -391,14 +391,14 @@ void SnippetWidget::initConfigOldVersion(KConfig *cfg) _list.append(group); int iCount = cfg->readNumEntry("snippetCount", 0); - QString strKeyName=""; - QString strKeyText=""; + TQString strKeyName=""; + TQString strKeyText=""; for ( int i=0; i<iCount; i++) { //read the snippet-list - strKeyName=QString("snippetName_%1").arg(i); - strKeyText=QString("snippetText_%1").arg(i); + strKeyName=TQString("snippetName_%1").arg(i); + strKeyText=TQString("snippetText_%1").arg(i); - QString strNameVal=""; - QString strTextVal=""; + TQString strNameVal=""; + TQString strTextVal=""; strNameVal = cfg->readEntry(strKeyName, ""); strTextVal = cfg->readEntry(strKeyText, ""); @@ -422,9 +422,9 @@ void SnippetWidget::initConfig() _cfg->setGroup("SnippetPart"); - QString strKeyName=""; - QString strKeyText=""; - QString strKeyId=""; + TQString strKeyName=""; + TQString strKeyText=""; + TQString strKeyId=""; SnippetItem *item; SnippetGroup *group; @@ -434,13 +434,13 @@ void SnippetWidget::initConfig() int iCount = _cfg->readNumEntry("snippetGroupCount", -1); for ( int i=0; i<iCount; i++) { //read the group-list - strKeyName=QString("snippetGroupName_%1").arg(i); - strKeyId=QString("snippetGroupId_%1").arg(i); - strKeyText=QString("snippetGroupLang_%1").arg(i); + strKeyName=TQString("snippetGroupName_%1").arg(i); + strKeyId=TQString("snippetGroupId_%1").arg(i); + strKeyText=TQString("snippetGroupLang_%1").arg(i); - QString strNameVal=""; + TQString strNameVal=""; int iIdVal=-1; - QString strLangVal=""; + TQString strLangVal=""; strNameVal = _cfg->readEntry(strKeyName, ""); iIdVal = _cfg->readNumEntry(strKeyId, -1); @@ -465,12 +465,12 @@ void SnippetWidget::initConfig() if (iCount != -1) { iCount = _cfg->readNumEntry("snippetCount", 0); for ( int i=0; i<iCount; i++) { //read the snippet-list - strKeyName=QString("snippetName_%1").arg(i); - strKeyText=QString("snippetText_%1").arg(i); - strKeyId=QString("snippetParent_%1").arg(i); + strKeyName=TQString("snippetName_%1").arg(i); + strKeyText=TQString("snippetText_%1").arg(i); + strKeyId=TQString("snippetParent_%1").arg(i); - QString strNameVal=""; - QString strTextVal=""; + TQString strNameVal=""; + TQString strTextVal=""; int iParentVal = -1; strNameVal = _cfg->readEntry(strKeyName, ""); @@ -492,11 +492,11 @@ void SnippetWidget::initConfig() iCount = _cfg->readNumEntry("snippetSavedCount", 0); for ( int i=1; i<=iCount; i++) { //read the saved-values and store in QMap - strKeyName=QString("snippetSavedName_%1").arg(i); - strKeyText=QString("snippetSavedVal_%1").arg(i); + strKeyName=TQString("snippetSavedName_%1").arg(i); + strKeyText=TQString("snippetSavedVal_%1").arg(i); - QString strNameVal=""; - QString strTextVal=""; + TQString strNameVal=""; + TQString strTextVal=""; strNameVal = _cfg->readEntry(strKeyName, ""); strTextVal = _cfg->readEntry(strKeyText, ""); @@ -517,16 +517,16 @@ void SnippetWidget::initConfig() } /*! - \fn SnippetWidget::maybeTip( const QPoint & p ) + \fn SnippetWidget::maybeTip( const TQPoint & p ) Shows the Snippet-Text as ToolTip */ -void SnippetWidget::maybeTip( const QPoint & p ) +void SnippetWidget::maybeTip( const TQPoint & p ) { SnippetItem * item = dynamic_cast<SnippetItem*>( itemAt( p ) ); if (!item) return; - QRect r = itemRect( item ); + TQRect r = itemRect( item ); if (r.isValid() && _SnippetConfig.useToolTips() ) @@ -540,10 +540,10 @@ void SnippetWidget::maybeTip( const QPoint & p ) } /*! - \fn SnippetWidget::showPopupMenu( QListViewItem * item, const QPoint & p, int ) + \fn SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int ) Shows the Popup-Menu depending item is a valid pointer */ -void SnippetWidget::showPopupMenu( QListViewItem * item, const QPoint & p, int ) +void SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int ) { KPopupMenu popup; @@ -551,45 +551,45 @@ void SnippetWidget::showPopupMenu( QListViewItem * item, const QPoint & p, int ) if ( item ) { popup.insertTitle( selectedItem->getName() ); - popup.insertItem( i18n("Add Item..."), this, SLOT( slotAdd() ) ); - popup.insertItem( i18n("Add Group..."), this, SLOT( slotAddGroup() ) ); + popup.insertItem( i18n("Add Item..."), this, TQT_SLOT( slotAdd() ) ); + popup.insertItem( i18n("Add Group..."), this, TQT_SLOT( slotAddGroup() ) ); if (dynamic_cast<SnippetGroup*>(item)) { - popup.insertItem( i18n("Edit..."), this, SLOT( slotEditGroup() ) ); + popup.insertItem( i18n("Edit..."), this, TQT_SLOT( slotEditGroup() ) ); } else { - popup.insertItem( i18n("Edit..."), this, SLOT( slotEdit() ) ); + popup.insertItem( i18n("Edit..."), this, TQT_SLOT( slotEdit() ) ); } - popup.insertItem( i18n("Remove"), this, SLOT( slotRemove() ) ); + popup.insertItem( i18n("Remove"), this, TQT_SLOT( slotRemove() ) ); } else { popup.insertTitle(i18n("Code Snippets")); - popup.insertItem( i18n("Add Group..."), this, SLOT( slotAddGroup() ) ); + popup.insertItem( i18n("Add Group..."), this, TQT_SLOT( slotAddGroup() ) ); } popup.exec(p); } -// fn SnippetWidget::parseText(QString text, QString del) +// fn SnippetWidget::parseText(TQString text, TQString del) /*! - This function is used to parse the given QString for variables. If found the user will be prompted + This function is used to parse the given TQString for variables. If found the user will be prompted for a replacement value. It returns the string text with all replacements made */ -QString SnippetWidget::parseText(QString text, QString del) +TQString SnippetWidget::parseText(TQString text, TQString del) { - QString str = text; - QString strName = ""; - QString strNew = ""; - QString strMsg=""; + TQString str = text; + TQString strName = ""; + TQString strNew = ""; + TQString strMsg=""; int iFound = -1; int iEnd = -1; - QMap<QString, QString> mapVar; + TQMap<TQString, TQString> mapVar; int iInMeth = _SnippetConfig.getInputMethod(); - QRect rSingle = _SnippetConfig.getSingleRect(); - QRect rMulti = _SnippetConfig.getMultiRect(); + TQRect rSingle = _SnippetConfig.getSingleRect(); + TQRect rMulti = _SnippetConfig.getMultiRect(); do { - iFound = text.find(QRegExp("\\"+del+"[A-Za-z-_0-9\\s]*\\"+del), iEnd+1); //find the next variable by this QRegExp + iFound = text.find(TQRegExp("\\"+del+"[A-Za-z-_0-9\\s]*\\"+del), iEnd+1); //find the next variable by this QRegExp if (iFound >= 0) { iEnd = text.find(del, iFound+1)+1; strName = text.mid(iFound, iEnd-iFound); @@ -625,7 +625,7 @@ QString SnippetWidget::parseText(QString text, QString del) bh = rMulti.height(); oh = rMulti.top(); if (showMultiVarDialog( &mapVar, &_mapSaved, w, bh, oh )) { //generate and show the dialog - QMap<QString, QString>::Iterator it; + TQMap<TQString, TQString>::Iterator it; for ( it = mapVar.begin(); it != mapVar.end(); ++it ) { //walk through the map and do the replacement str.replace(it.key(), it.data()); } @@ -652,7 +652,7 @@ QString SnippetWidget::parseText(QString text, QString del) variable that is stored in the given map except the double-delimiter entry It return true if everything was ok and false if the user hit cancel */ -bool SnippetWidget::showMultiVarDialog(QMap<QString, QString> * map, QMap<QString, QString> * mapSave, +bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQString, TQString> * mapSave, int & iWidth, int & iBasicHeight, int & iOneHeight) { //if no var -> no need to show @@ -660,28 +660,28 @@ bool SnippetWidget::showMultiVarDialog(QMap<QString, QString> * map, QMap<QStrin return true; //if only var is the double-delimiter -> no need to show - QMap<QString, QString>::Iterator it = map->begin(); + TQMap<TQString, TQString>::Iterator it = map->begin(); if ( map->count() == 1 && it.data()==_SnippetConfig.getDelimiter()+_SnippetConfig.getDelimiter() ) return true; - QMap<QString, KTextEdit *> mapVar2Te; //this map will help keeping track which TEXTEDIT goes with which variable - QMap<QString, QCheckBox *> mapVar2Cb; //this map will help keeping track which CHECKBOX goes with which variable + TQMap<TQString, KTextEdit *> mapVar2Te; //this map will help keeping track which TEXTEDIT goes with which variable + TQMap<TQString, TQCheckBox *> mapVar2Cb; //this map will help keeping track which CHECKBOX goes with which variable // --BEGIN-- building a dynamic dialog - QDialog dlg(this); + TQDialog dlg(this); dlg.setCaption(i18n("Enter Values for Variables")); - QGridLayout * layout = new QGridLayout( &dlg, 1, 1, 11, 6, "layout"); - QGridLayout * layoutTop = new QGridLayout( 0, 1, 1, 0, 6, "layoutTop"); - QGridLayout * layoutVar = new QGridLayout( 0, 1, 1, 0, 6, "layoutVar"); - QGridLayout * layoutBtn = new QGridLayout( 0, 1, 1, 0, 6, "layoutBtn"); + TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout"); + TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop"); + TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar"); + TQGridLayout * layoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "layoutBtn"); KTextEdit *te = NULL; - QLabel * labTop = NULL; - QCheckBox * cb = NULL; + TQLabel * labTop = NULL; + TQCheckBox * cb = NULL; - labTop = new QLabel( &dlg, "label" ); - labTop->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, + labTop = new TQLabel( &dlg, "label" ); + labTop->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, labTop->sizePolicy().hasHeightForWidth() ) ); labTop->setText(i18n("Enter the replacement values for these variables:")); layoutTop->addWidget(labTop, 0, 0); @@ -693,7 +693,7 @@ bool SnippetWidget::showMultiVarDialog(QMap<QString, QString> * map, QMap<QStrin if (it.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter()) continue; - cb = new QCheckBox( &dlg, "cbVar" ); + cb = new TQCheckBox( &dlg, "cbVar" ); cb->setChecked( FALSE ); cb->setText(it.key()); layoutVar->addWidget( cb, i ,0, Qt::AlignTop ); @@ -709,8 +709,8 @@ bool SnippetWidget::showMultiVarDialog(QMap<QString, QString> * map, QMap<QStrin mapVar2Te[it.key()] = te; mapVar2Cb[it.key()] = cb; - QToolTip::add( cb, i18n("Enable this to save the value entered to the right as the default value for this variable") ); - QWhatsThis::add( cb, i18n("If you enable this option, the value entered to the right will be saved. " + TQToolTip::add( cb, i18n("Enable this to save the value entered to the right as the default value for this variable") ); + TQWhatsThis::add( cb, i18n("If you enable this option, the value entered to the right will be saved. " "If you use the same variable later, even in another snippet, the value entered to the right " "will be the default value for that variable.") ); @@ -720,37 +720,37 @@ bool SnippetWidget::showMultiVarDialog(QMap<QString, QString> * map, QMap<QStrin KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" ); btn1->setText(i18n("&Cancel")); - btn1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, + btn1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btn1->sizePolicy().hasHeightForWidth() ) ); layoutBtn->addWidget( btn1, 0, 0 ); KPushButton * btn2 = new KPushButton( &dlg, "pushButton2" ); btn2->setText(i18n("&Apply")); btn2->setDefault( TRUE ); - btn2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, + btn2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btn2->sizePolicy().hasHeightForWidth() ) ); layoutBtn->addWidget( btn2, 0, 1 ); layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); // --END-- building a dynamic dialog - //connect the buttons to the QDialog default slots - connect(btn1, SIGNAL(clicked()), &dlg, SLOT(reject()) ); - connect(btn2, SIGNAL(clicked()), &dlg, SLOT(accept()) ); + //connect the buttons to the TQDialog default slots + connect(btn1, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(reject()) ); + connect(btn2, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(accept()) ); //prepare to execute the dialog bool bReturn = false; //resize the textedits if (iWidth > 1) { - QRect r = dlg.geometry(); + TQRect r = dlg.geometry(); r.setHeight(iBasicHeight + iOneHeight*mapVar2Te.count()); r.setWidth(iWidth); dlg.setGeometry(r); } if ( i > 0 && // only if there are any variables - dlg.exec() == QDialog::Accepted ) { + dlg.exec() == TQDialog::Accepted ) { - QMap<QString, KTextEdit *>::Iterator it2; + TQMap<TQString, KTextEdit *>::Iterator it2; for ( it2 = mapVar2Te.begin(); it2 != mapVar2Te.end(); ++it2 ) { if (it2.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter()) continue; @@ -769,11 +769,11 @@ bool SnippetWidget::showMultiVarDialog(QMap<QString, QString> * map, QMap<QStrin } //do some cleanup - QMap<QString, KTextEdit *>::Iterator it1; + TQMap<TQString, KTextEdit *>::Iterator it1; for (it1 = mapVar2Te.begin(); it1 != mapVar2Te.end(); ++it1) delete it1.data(); mapVar2Te.clear(); - QMap<QString, QCheckBox *>::Iterator it2; + TQMap<TQString, TQCheckBox *>::Iterator it2; for (it2 = mapVar2Cb.begin(); it2 != mapVar2Cb.end(); ++it2) delete it2.data(); mapVar2Cb.clear(); @@ -789,33 +789,33 @@ bool SnippetWidget::showMultiVarDialog(QMap<QString, QString> * map, QMap<QStrin } -// fn SnippetWidget::showSingleVarDialog(QString var, QMap<QString, QString> * mapSave) +// fn SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQString> * mapSave) /*! This function constructs a dialog which contains a label and a linedit for the given variable It return either the entered value or an empty string if the user hit cancel */ -QString SnippetWidget::showSingleVarDialog(QString var, QMap<QString, QString> * mapSave, QRect & dlgSize) +TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQString> * mapSave, TQRect & dlgSize) { // --BEGIN-- building a dynamic dialog - QDialog dlg(this); + TQDialog dlg(this); dlg.setCaption(i18n("Enter Values for Variables")); - QGridLayout * layout = new QGridLayout( &dlg, 1, 1, 11, 6, "layout"); - QGridLayout * layoutTop = new QGridLayout( 0, 1, 1, 0, 6, "layoutTop"); - QGridLayout * layoutVar = new QGridLayout( 0, 1, 1, 0, 6, "layoutVar"); - QGridLayout * layoutBtn = new QGridLayout( 0, 2, 1, 0, 6, "layoutBtn"); + TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout"); + TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop"); + TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar"); + TQGridLayout * layoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "layoutBtn"); KTextEdit *te = NULL; - QLabel * labTop = NULL; - QCheckBox * cb = NULL; + TQLabel * labTop = NULL; + TQCheckBox * cb = NULL; - labTop = new QLabel( &dlg, "label" ); + labTop = new TQLabel( &dlg, "label" ); layoutTop->addWidget(labTop, 0, 0); labTop->setText(i18n("Enter the replacement values for %1:").arg( var )); layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); - cb = new QCheckBox( &dlg, "cbVar" ); + cb = new TQCheckBox( &dlg, "cbVar" ); cb->setChecked( FALSE ); cb->setText(i18n( "Make value &default" )); @@ -827,8 +827,8 @@ QString SnippetWidget::showSingleVarDialog(QString var, QMap<QString, QString> * te->setText((*mapSave)[var]); } - QToolTip::add( cb, i18n("Enable this to save the value entered to the right as the default value for this variable") ); - QWhatsThis::add( cb, i18n("If you enable this option, the value entered to the right will be saved. " + TQToolTip::add( cb, i18n("Enable this to save the value entered to the right as the default value for this variable") ); + TQWhatsThis::add( cb, i18n("If you enable this option, the value entered to the right will be saved. " "If you use the same variable later, even in another snippet, the value entered to the right " "will be the default value for that variable.") ); @@ -847,15 +847,15 @@ QString SnippetWidget::showSingleVarDialog(QString var, QMap<QString, QString> * te->setFocus(); // --END-- building a dynamic dialog - //connect the buttons to the QDialog default slots - connect(btn1, SIGNAL(clicked()), &dlg, SLOT(reject()) ); - connect(btn2, SIGNAL(clicked()), &dlg, SLOT(accept()) ); + //connect the buttons to the TQDialog default slots + connect(btn1, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(reject()) ); + connect(btn2, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(accept()) ); //execute the dialog - QString strReturn = ""; + TQString strReturn = ""; if (dlgSize.isValid()) dlg.setGeometry(dlgSize); - if ( dlg.exec() == QDialog::Accepted ) { + if ( dlg.exec() == TQDialog::Accepted ) { if (cb->isChecked()) //if the checkbox is on; save the values for later (*mapSave)[var] = te->text(); else @@ -880,21 +880,21 @@ QString SnippetWidget::showSingleVarDialog(QString var, QMap<QString, QString> * return strReturn; } -// fn SnippetWidget::acceptDrag (QDropEvent *event) const +// fn SnippetWidget::acceptDrag (TQDropEvent *event) const /*! Reimplementation from KListView. Check here if the data the user is about to drop fits our restrictions. We only accept dropps of plaintext, because from the dropped text we will create a snippet. */ -bool SnippetWidget::acceptDrag (QDropEvent *event) const +bool SnippetWidget::acceptDrag (TQDropEvent *event) const { kdDebug(9035) << "Format: " << event->format() << "" << event->pos() << endl; - QListViewItem * item = itemAt(event->pos()); + TQListViewItem * item = itemAt(event->pos()); if (item && - QString(event->format()).startsWith("text/plain") && + TQString(event->format()).startsWith("text/plain") && static_cast<SnippetWidget *>(event->source()) != this) { kdDebug(9035) << "returning TRUE " << endl; return TRUE; @@ -905,25 +905,25 @@ bool SnippetWidget::acceptDrag (QDropEvent *event) const } } -// fn SnippetWidget::slotDropped(QDropEvent *e, QListViewItem *after) +// fn SnippetWidget::slotDropped(TQDropEvent *e, TQListViewItem *after) /*! This slot is connected to the dropped signal. If it is emitted, we need to construct a new snippet entry with the data given */ -void SnippetWidget::slotDropped(QDropEvent *e, QListViewItem *) +void SnippetWidget::slotDropped(TQDropEvent *e, TQListViewItem *) { - QListViewItem * item2 = itemAt(e->pos()); + TQListViewItem * item2 = itemAt(e->pos()); SnippetGroup *group = dynamic_cast<SnippetGroup *>(item2); if (!group) group = dynamic_cast<SnippetGroup *>(item2->parent()); - QCString dropped; - QByteArray data = e->encodedData("text/plain"); + TQCString dropped; + TQByteArray data = e->encodedData("text/plain"); if ( e->provides("text/plain") && data.size()>0 ) { //get the data from the event... - QString encData(data.data()); + TQString encData(data.data()); kdDebug(9035) << "encData: " << encData << endl; //... then fill the dialog with the given data @@ -939,7 +939,7 @@ void SnippetWidget::slotDropped(QDropEvent *e, QListViewItem *) } dlg.cbGroup->setCurrentText(group->getName()); - if (dlg.exec() == QDialog::Accepted) { + if (dlg.exec() == TQDialog::Accepted) { /* get the group that the user selected with the combobox */ group = dynamic_cast<SnippetGroup*>(SnippetItem::findItemByName(dlg.cbGroup->currentText(), _list)); _list.append( new SnippetItem(group, dlg.snippetName->text(), dlg.snippetText->text()) ); @@ -953,7 +953,7 @@ void SnippetWidget::slotDropped(QDropEvent *e, QListViewItem *) */ void SnippetWidget::languageChanged() { - QStringList langs = m_part->getProjectLanguages(); + TQStringList langs = m_part->getProjectLanguages(); for (SnippetItem *it=_list.first(); it; it=_list.next()) { SnippetGroup * group = dynamic_cast<SnippetGroup*>(it); diff --git a/parts/snippet/snippet_widget.h b/parts/snippet/snippet_widget.h index 84df7a6f..d8cf7756 100644 --- a/parts/snippet/snippet_widget.h +++ b/parts/snippet/snippet_widget.h @@ -9,11 +9,11 @@ #ifndef __SNIPPET_WIDGET_H__ #define __SNIPPET_WIDGET_H__ -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> #include <klistview.h> -#include <qtooltip.h> -#include <qrect.h> +#include <tqtooltip.h> +#include <tqrect.h> #include <ktexteditor/editinterface.h> #include <ktexteditor/view.h> @@ -33,7 +33,7 @@ class KConfig; /** This is the widget which gets added to the right TreeToolView. -It inherits KListView and QToolTip which is needed for showing the +It inherits KListView and TQToolTip which is needed for showing the tooltips which contains the text of the snippet @author Robert Gruber */ @@ -46,7 +46,7 @@ class SnippetWidget : public KListView, public QToolTip public: SnippetWidget(SnippetPart *part); ~SnippetWidget(); - QPtrList<SnippetItem> * getList() { return (&_list); } + TQPtrList<SnippetItem> * getList() { return (&_list); } void writeConfig(); void initConfigOldVersion(KConfig *cfg); SnippetConfig * getSnippetConfig() { return (&_SnippetConfig); } @@ -58,18 +58,18 @@ private slots: protected: SnippetPart * m_part; - void maybeTip( const QPoint & ); - bool acceptDrag (QDropEvent *event) const; + void maybeTip( const TQPoint & ); + bool acceptDrag (TQDropEvent *event) const; private: - void insertIntoActiveView(QString text); - QString parseText(QString text, QString del="$"); - bool showMultiVarDialog(QMap<QString, QString> * map, QMap<QString, QString> * mapSave, + void insertIntoActiveView(TQString text); + TQString parseText(TQString text, TQString del="$"); + bool showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQString, TQString> * mapSave, int & iWidth, int & iBasicHeight, int & iOneHeight); - QString showSingleVarDialog(QString var, QMap<QString, QString> * mapSave, QRect & dlgSize); + TQString showSingleVarDialog(TQString var, TQMap<TQString, TQString> * mapSave, TQRect & dlgSize); - QPtrList<SnippetItem> _list; - QMap<QString, QString> _mapSaved; + TQPtrList<SnippetItem> _list; + TQMap<TQString, TQString> _mapSaved; KConfig * _cfg; SnippetConfig _SnippetConfig; @@ -81,9 +81,9 @@ public slots: void slotAddGroup(); protected slots: - void showPopupMenu( QListViewItem * item, const QPoint & p, int ); - void slotExecuted(QListViewItem * item); - void slotDropped(QDropEvent *e, QListViewItem *after); + void showPopupMenu( TQListViewItem * item, const TQPoint & p, int ); + void slotExecuted(TQListViewItem * item); + void slotDropped(TQDropEvent *e, TQListViewItem *after); }; diff --git a/parts/snippet/snippetconfig.h b/parts/snippet/snippetconfig.h index 89fe00e0..b1f089f4 100644 --- a/parts/snippet/snippetconfig.h +++ b/parts/snippet/snippetconfig.h @@ -9,8 +9,8 @@ #ifndef SNIPPETCONFIG_H #define SNIPPETCONFIG_H -#include <qstring.h> -#include <qrect.h> +#include <tqstring.h> +#include <tqrect.h> /** @@ -26,28 +26,28 @@ public: bool useToolTips() { return (bToolTip); }; int getInputMethod() { return (iInputMethod); }; - QString getDelimiter() { return (strDelimiter); }; - QRect getSingleRect() { return (rSingle); }; - QRect getMultiRect() { return (rMulti); }; + TQString getDelimiter() { return (strDelimiter); }; + TQRect getSingleRect() { return (rSingle); }; + TQRect getMultiRect() { return (rMulti); }; int getAutoOpenGroups() { return iAutoOpenGroups; } void setToolTips(bool b) { bToolTip=b; }; void setInputMethod(int i) { iInputMethod=i; }; - void setDelimiter(QString s) { strDelimiter=s; }; - void setSingleRect(QRect r) { - rSingle = (r.isValid())?r:QRect(); + void setDelimiter(TQString s) { strDelimiter=s; }; + void setSingleRect(TQRect r) { + rSingle = (r.isValid())?r:TQRect(); } - void setMultiRect(QRect r) { - rMulti = (r.isValid())?r:QRect(); + void setMultiRect(TQRect r) { + rMulti = (r.isValid())?r:TQRect(); } void setAutoOpenGroups(int autoopen) { iAutoOpenGroups = autoopen; } protected: bool bToolTip; int iInputMethod; - QString strDelimiter; - QRect rSingle; - QRect rMulti; + TQString strDelimiter; + TQRect rSingle; + TQRect rMulti; int iMultiBasicHeight; int iMultiCount; int iAutoOpenGroups; diff --git a/parts/snippet/snippetitem.cpp b/parts/snippet/snippetitem.cpp index 7548ad16..e2f08a2b 100644 --- a/parts/snippet/snippetitem.cpp +++ b/parts/snippet/snippetitem.cpp @@ -6,21 +6,21 @@ * Copyright: See COPYING file that comes with this distribution */ -#include <qstring.h> +#include <tqstring.h> #include "snippetitem.h" -SnippetItem::SnippetItem(QListView * parent, QString name, QString text ) - : QListViewItem( parent, name ) +SnippetItem::SnippetItem(TQListView * parent, TQString name, TQString text ) + : TQListViewItem( parent, name ) { strName = name; strText = text; iParent = -1; } -SnippetItem::SnippetItem(QListViewItem * parent, QString name, QString text) - : QListViewItem( parent, name ) +SnippetItem::SnippetItem(TQListViewItem * parent, TQString name, TQString text) + : TQListViewItem( parent, name ) { strName = name; strText = text; @@ -35,7 +35,7 @@ SnippetItem::~SnippetItem() /*! \fn SnippetItem::getName() */ -QString SnippetItem::getName() +TQString SnippetItem::getName() { return strName; } @@ -44,25 +44,25 @@ QString SnippetItem::getName() /*! \fn SnippetItem::getText */ -QString SnippetItem::getText() +TQString SnippetItem::getText() { return strText; } /*! - \fn SnippetItem::setText(QString text) + \fn SnippetItem::setText(TQString text) */ -void SnippetItem::setText(QString text) +void SnippetItem::setText(TQString text) { strText = text; } /*! - \fn SnippetItem::setName(QString name) + \fn SnippetItem::setName(TQString name) */ -void SnippetItem::setName(QString name) +void SnippetItem::setName(TQString name) { strName = name; } @@ -74,7 +74,7 @@ void SnippetItem::resetParent() iParent = group->getId(); } -SnippetItem * SnippetItem::findItemByName(QString name, QPtrList<SnippetItem> &list) +SnippetItem * SnippetItem::findItemByName(TQString name, TQPtrList<SnippetItem> &list) { for ( SnippetItem * item = list.first(); item; item = list.next() ) { //write the snippet-list if (item->getName() == name) @@ -83,7 +83,7 @@ SnippetItem * SnippetItem::findItemByName(QString name, QPtrList<SnippetItem> &l return NULL; } -SnippetGroup * SnippetItem::findGroupById(int id, QPtrList<SnippetItem> &list) +SnippetGroup * SnippetItem::findGroupById(int id, TQPtrList<SnippetItem> &list) { for ( SnippetItem * item = list.first(); item; item = list.next() ) { //write the snippet-list SnippetGroup * group = dynamic_cast<SnippetGroup*>(item); @@ -100,7 +100,7 @@ Deklaration for class SnippetGroup int SnippetGroup::iMaxId = 1; -SnippetGroup::SnippetGroup(QListView * parent, QString name, int id, QString lang) +SnippetGroup::SnippetGroup(TQListView * parent, TQString name, int id, TQString lang) : SnippetItem(parent, name, "GROUP") { if (id > 0) { diff --git a/parts/snippet/snippetitem.h b/parts/snippet/snippetitem.h index ac6fb416..9cfe2ccf 100644 --- a/parts/snippet/snippetitem.h +++ b/parts/snippet/snippetitem.h @@ -21,50 +21,50 @@ This class represents one CodeSnippet-Item in the listview. It also holds the needed data for one snippet. @author Robert Gruber */ -class SnippetItem : public QListViewItem { +class SnippetItem : public TQListViewItem { friend class SnippetGroup; public: - SnippetItem(QListViewItem * parent, QString name, QString text); + SnippetItem(TQListViewItem * parent, TQString name, TQString text); ~SnippetItem(); - QString getName(); - QString getText(); + TQString getName(); + TQString getText(); int getParent() { return iParent; } void resetParent(); - void setText(QString text); - void setName(QString name); - static SnippetItem * findItemByName(QString name, QPtrList<SnippetItem> &list); - static SnippetGroup * findGroupById(int id, QPtrList<SnippetItem> &list); + void setText(TQString text); + void setName(TQString name); + static SnippetItem * findItemByName(TQString name, TQPtrList<SnippetItem> &list); + static SnippetGroup * findGroupById(int id, TQPtrList<SnippetItem> &list); private: - SnippetItem(QListView * parent, QString name, QString text); - QString strName; - QString strText; + SnippetItem(TQListView * parent, TQString name, TQString text); + TQString strName; + TQString strText; int iParent; }; /** This class represents one group in the listview. It is derived from SnippetItem in order to allow storing -it in the main QPtrList<SnippetItem>. +it in the main TQPtrList<SnippetItem>. @author Robert Gruber */ class SnippetGroup : public SnippetItem { public: - SnippetGroup(QListView * parent, QString name, int id, QString lang=i18n("All")); + SnippetGroup(TQListView * parent, TQString name, int id, TQString lang=i18n("All")); ~SnippetGroup(); int getId() { return iId; } static int getMaxId() { return iMaxId; } - QString getLanguage() { return strLanguage; } + TQString getLanguage() { return strLanguage; } void setId(int id); - void setLanguage(QString lang) { strLanguage = lang; } + void setLanguage(TQString lang) { strLanguage = lang; } private: static int iMaxId; int iId; - QString strLanguage; + TQString strLanguage; }; #endif diff --git a/parts/snippet/snippetsettings.cpp b/parts/snippet/snippetsettings.cpp index f0f9348b..8e559ba5 100644 --- a/parts/snippet/snippetsettings.cpp +++ b/parts/snippet/snippetsettings.cpp @@ -6,22 +6,22 @@ * Copyright: See COPYING file that comes with this distribution */ -#include <qstring.h> +#include <tqstring.h> #include <klineedit.h> -#include <qcheckbox.h> -#include <qbuttongroup.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> #include "snippetsettings.h" #include "snippet_widget.h" -SnippetSettings::SnippetSettings(QWidget *parent, const char *name) +SnippetSettings::SnippetSettings(TQWidget *parent, const char *name) : SnippetSettingsBase(parent, name) { _widget = NULL; } -SnippetSettings::SnippetSettings(SnippetWidget * w, QWidget *parent, const char *name) +SnippetSettings::SnippetSettings(SnippetWidget * w, TQWidget *parent, const char *name) : SnippetSettingsBase(parent, name) { _cfg = w->getSnippetConfig(); diff --git a/parts/snippet/snippetsettings.h b/parts/snippet/snippetsettings.h index ef4a019a..2f51a823 100644 --- a/parts/snippet/snippetsettings.h +++ b/parts/snippet/snippetsettings.h @@ -25,8 +25,8 @@ class SnippetSettings : public SnippetSettingsBase { Q_OBJECT public: - SnippetSettings(QWidget *parent = 0, const char *name = 0); - SnippetSettings(SnippetWidget * w, QWidget *parent = 0, const char *name = 0); + SnippetSettings(TQWidget *parent = 0, const char *name = 0); + SnippetSettings(SnippetWidget * w, TQWidget *parent = 0, const char *name = 0); ~SnippetSettings(); diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp index 7eb439da..332d97e3 100644 --- a/parts/texttools/texttoolspart.cpp +++ b/parts/texttools/texttoolspart.cpp @@ -11,7 +11,7 @@ #include "texttoolspart.h" -#include <qwhatsthis.h> +#include <tqwhatsthis.h> #include <kdebug.h> #include <klocale.h> #include <kdevgenericfactory.h> @@ -28,7 +28,7 @@ typedef KDevGenericFactory<TextToolsPart> TextToolsFactory; static const KDevPluginInfo data("kdevtexttools"); K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( data ) ) -TextToolsPart::TextToolsPart(QObject *parent, const char *name, const QStringList &) +TextToolsPart::TextToolsPart(TQObject *parent, const char *name, const TQStringList &) : KDevPlugin(&data, parent, name ? name : "TextToolsPart") { setInstance(TextToolsFactory::instance()); @@ -36,8 +36,8 @@ TextToolsPart::TextToolsPart(QObject *parent, const char *name, const QStringLis m_widget = 0; - connect( partController(), SIGNAL(activePartChanged(KParts::Part*)), - this, SLOT(activePartChanged(KParts::Part*)) ); + connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(activePartChanged(KParts::Part*)) ); } @@ -59,7 +59,7 @@ void TextToolsPart::createWidget() m_widget = new TextToolsWidget(this); m_widget->setCaption(i18n("Text Structure")); - QWhatsThis::add(m_widget, i18n("<b>Text Structure</b><p>" + TQWhatsThis::add(m_widget, i18n("<b>Text Structure</b><p>" "This browser shows the structure of the text.")); mainWindow()->embedSelectView(m_widget, i18n("Text Structure"), i18n("Text structure")); } @@ -75,7 +75,7 @@ void TextToolsPart::activePartChanged(KParts::Part *part) KParts::ReadWritePart *rwpart = dynamic_cast<KParts::ReadWritePart*>(part); if (!rwpart) return; - QString url = rwpart->url().url(); + TQString url = rwpart->url().url(); if (url.endsWith(".html")) { kdDebug(9030) << "set mode html" << endl; diff --git a/parts/texttools/texttoolspart.h b/parts/texttools/texttoolspart.h index 7e7bf9c5..ce348f6d 100644 --- a/parts/texttools/texttoolspart.h +++ b/parts/texttools/texttoolspart.h @@ -12,7 +12,7 @@ #ifndef _TEXTTOOLSPART_H_ #define _TEXTTOOLSPART_H_ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kparts/part.h> #include "kdevplugin.h" @@ -24,7 +24,7 @@ class TextToolsPart : public KDevPlugin Q_OBJECT public: - TextToolsPart( QObject *parent, const char *name, const QStringList & ); + TextToolsPart( TQObject *parent, const char *name, const TQStringList & ); ~TextToolsPart(); private slots: @@ -33,7 +33,7 @@ private slots: private: void createWidget(); - QGuardedPtr<TextToolsWidget> m_widget; + TQGuardedPtr<TextToolsWidget> m_widget; }; #endif diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp index ff85d0f0..630609c5 100644 --- a/parts/texttools/texttoolswidget.cpp +++ b/parts/texttools/texttoolswidget.cpp @@ -11,9 +11,9 @@ #include "texttoolswidget.h" -#include <qheader.h> -#include <qregexp.h> -#include <qtimer.h> +#include <tqheader.h> +#include <tqregexp.h> +#include <tqtimer.h> #include <kdebug.h> #include <klocale.h> #include <kparts/part.h> @@ -30,52 +30,52 @@ class TextStructItem : public QListViewItem { public: - TextStructItem(QListView *parent) - : QListViewItem(parent) + TextStructItem(TQListView *parent) + : TQListViewItem(parent) {} - TextStructItem(QListViewItem *parent) - : QListViewItem(parent) + TextStructItem(TQListViewItem *parent) + : TQListViewItem(parent) { - QListViewItem *item = this; + TQListViewItem *item = this; while (item->nextSibling()) item = item->nextSibling(); if (item != this) moveItem(item); } - QString text(int) const + TQString text(int) const { - return extra.isNull()? tag : QString("%1: %2").arg(tag).arg(extra); + return extra.isNull()? tag : TQString("%1: %2").arg(tag).arg(extra); } TextStructItem *parentStructItem() { return static_cast<TextStructItem*>(parent()); } - QString tag; - QString extra; + TQString tag; + TQString extra; int pos; int endpos; }; -TextToolsWidget::TextToolsWidget(TextToolsPart *part, QWidget *parent, const char *name) +TextToolsWidget::TextToolsWidget(TextToolsPart *part, TQWidget *parent, const char *name) : KListView(parent, name) { - setResizeMode(QListView::LastColumn); + setResizeMode(TQListView::LastColumn); setSorting(-1); header()->hide(); - addColumn(QString::null); + addColumn(TQString::null); m_part = part; - m_timer = new QTimer(this); - connect( this, SIGNAL(mouseButtonPressed(int, QListViewItem*, const QPoint&, int)), - this, SLOT(slotItemPressed(int,QListViewItem*)) ); - // connect( this, SIGNAL(doubleClicked(QListViewItem*)), - // this, SLOT(slotItemPressed(int,QListViewItem*)) ); - connect( this, SIGNAL(returnPressed(QListViewItem*)), - this, SLOT(slotReturnPressed(QListViewItem*)) ); - connect( this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(slotContextMenu(KListView*, QListViewItem*, const QPoint&)) ); + m_timer = new TQTimer(this); + connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQT_SLOT(slotItemPressed(int,TQListViewItem*)) ); + // connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), + // this, TQT_SLOT(slotItemPressed(int,TQListViewItem*)) ); + connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), + this, TQT_SLOT(slotReturnPressed(TQListViewItem*)) ); + connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); } @@ -83,7 +83,7 @@ TextToolsWidget::~TextToolsWidget() {} -void TextToolsWidget::slotItemPressed(int button, QListViewItem *item) +void TextToolsWidget::slotItemPressed(int button, TQListViewItem *item) { if (!item) return; @@ -107,7 +107,7 @@ void TextToolsWidget::slotItemPressed(int button, QListViewItem *item) } if (pos == searchedEndpos) break; - QChar ch = m_cachedText[pos]; + TQChar ch = m_cachedText[pos]; if (ch == '\n') { ++endline; endcol = 0; @@ -119,7 +119,7 @@ void TextToolsWidget::slotItemPressed(int button, QListViewItem *item) KParts::Part *rwpart = dynamic_cast<KParts::Part*>(m_part->partController()->activePart()); - QWidget *view = m_part->partController()->activeWidget(); + TQWidget *view = m_part->partController()->activeWidget(); KTextEditor::ViewCursorInterface *cursorIface = dynamic_cast<KTextEditor::ViewCursorInterface*>(view); @@ -142,13 +142,13 @@ void TextToolsWidget::slotItemPressed(int button, QListViewItem *item) } -void TextToolsWidget::slotReturnPressed(QListViewItem *item) +void TextToolsWidget::slotReturnPressed(TQListViewItem *item) { slotItemPressed(LeftButton, item); } -void TextToolsWidget::slotContextMenu(KListView *, QListViewItem *item, const QPoint &) +void TextToolsWidget::slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &) { if (!item) return; @@ -165,14 +165,14 @@ void TextToolsWidget::stop() disconnect( m_timer ); m_relevantTags.clear(); m_emptyTags.clear(); - m_cachedText = QString::null; + m_cachedText = TQString::null; } void TextToolsWidget::setMode(Mode mode, KParts::Part *part) { - connect( part, SIGNAL(textChanged()), - this, SLOT(startTimer()) ); + connect( part, TQT_SIGNAL(textChanged()), + this, TQT_SLOT(startTimer()) ); m_editIface = dynamic_cast<KTextEditor::EditInterface*>(part); switch (mode) { @@ -181,18 +181,18 @@ void TextToolsWidget::setMode(Mode mode, KParts::Part *part) << "table" << "tr"; m_emptyTags << "br" << "hr" << "img" << "input" << "p" << "meta"; - connect( m_timer, SIGNAL(timeout()), - this, SLOT(parseXML()) ); + connect( m_timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(parseXML()) ); break; case Docbook: m_relevantTags << "chapter" << "sect1" << "sect2" << "para" << "formalpara"; - connect( m_timer, SIGNAL(timeout()), - this, SLOT(parseXML()) ); + connect( m_timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(parseXML()) ); break; case LaTeX: - connect( m_timer, SIGNAL(timeout()), - this, SLOT(parseLaTeX()) ); + connect( m_timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(parseLaTeX()) ); break; default: ; } @@ -212,7 +212,7 @@ void TextToolsWidget::parseXML() { kdDebug(9030) << "Starting to parse XML" << endl; clear(); - QString text = m_editIface->text(); + TQString text = m_editIface->text(); m_cachedText = text; TextStructItem *currentItem = new TextStructItem(this); @@ -222,18 +222,18 @@ void TextToolsWidget::parseXML() int len = text.length(); for (int pos=0; pos+1 < len; ++pos) { - QChar ch1 = text[pos]; - QChar ch2 = text[pos+1]; + TQChar ch1 = text[pos]; + TQChar ch2 = text[pos+1]; if (ch1 == '<' && ch2 == '?') { // PHP and other similar stuff - QString tag; + TQString tag; int endpos = pos+2; bool foundspace = false; while (endpos+1 < len) { - QChar ch3 = text[endpos]; - QChar ch4 = text[endpos+1]; + TQChar ch3 = text[endpos]; + TQChar ch4 = text[endpos+1]; if ((ch3 == ' ' || ch3 == '\t' || ch3 == '\n') && !foundspace) { tag = text.mid(pos+2, endpos-pos-2).lower(); foundspace = true; @@ -255,11 +255,11 @@ void TextToolsWidget::parseXML() } else if (ch1 == '<' && ch2 == '!') { // Processing instructions like !DOCTYPE - QString tag; + TQString tag; int endpos = pos+2; bool foundspace = false; while (endpos+1 < len) { - QChar ch3 = text[endpos]; + TQChar ch3 = text[endpos]; if ((ch3 == ' ' || ch3 == '\t' || ch3 == '\n') && !foundspace) { tag = text.mid(pos+2, endpos-pos-2).lower(); foundspace = true; @@ -280,10 +280,10 @@ void TextToolsWidget::parseXML() } else if (ch1 == '<' && ch2 == '/') { - QString tag; + TQString tag; int endpos = pos+2; while (endpos < len) { - QChar ch3 = text[endpos]; + TQChar ch3 = text[endpos]; if (ch3 == '>') { tag = text.mid(pos+2, endpos-pos-2).lower(); break; @@ -310,11 +310,11 @@ void TextToolsWidget::parseXML() } else if (ch1 == '<') { - QString tag; + TQString tag; int endpos = pos+1; bool foundspace = false; while (endpos < len) { - QChar ch3 = text[endpos]; + TQChar ch3 = text[endpos]; if ((ch3 == ' ' || ch3 == '\t' || ch3 == '\n') && !foundspace) { tag = text.mid(pos+1, endpos-pos-1).lower(); foundspace = true; @@ -347,7 +347,7 @@ void TextToolsWidget::parseXML() } // firstChild()->setOpen(true); - QListViewItemIterator it(this); + TQListViewItemIterator it(this); for (; it.current(); ++it) it.current()->setOpen(true); } @@ -357,7 +357,7 @@ void TextToolsWidget::parseLaTeX() { kdDebug(9030) << "Starting to parse LaTeX" << endl; clear(); - QString text = m_editIface->text(); + TQString text = m_editIface->text(); m_cachedText = text; TextStructItem *currentItem = new TextStructItem(this); @@ -365,16 +365,16 @@ void TextToolsWidget::parseLaTeX() currentItem->pos = -1; currentItem->endpos = -1; - QString hierarchyLevels = "Root,chapter,section,subsection,subsubsection"; - QRegExp re("\n[ \t]*s*\\\\(chapter|section|subsection|subsubsection)\\{([^}]*)\\}"); + TQString hierarchyLevels = "Root,chapter,section,subsection,subsubsection"; + TQRegExp re("\n[ \t]*s*\\\\(chapter|section|subsection|subsubsection)\\{([^}]*)\\}"); int pos=0; for (;;) { pos = re.search(text, pos); if (pos == -1) break; - QString tag = re.cap(1); - QString title = re.cap(2); + TQString tag = re.cap(1); + TQString title = re.cap(2); kdDebug(9030) << "Match with " << tag << " and title " << title << endl; int level = hierarchyLevels.find(tag); while (currentItem->parent() && level <= hierarchyLevels.find(currentItem->tag)) @@ -392,7 +392,7 @@ void TextToolsWidget::parseLaTeX() pos = pos+re.matchedLength(); } - QListViewItemIterator it(this); + TQListViewItemIterator it(this); for (; it.current(); ++it) it.current()->setOpen(true); } diff --git a/parts/texttools/texttoolswidget.h b/parts/texttools/texttoolswidget.h index 680adb34..4db3d2fe 100644 --- a/parts/texttools/texttoolswidget.h +++ b/parts/texttools/texttoolswidget.h @@ -13,7 +13,7 @@ #define _TEXTTOOLSWIDGET_H_ #include <klistview.h> -#include <qstringlist.h> +#include <tqstringlist.h> class TextToolsPart; class QTimer; @@ -28,16 +28,16 @@ class TextToolsWidget : public KListView public: enum Mode { HTML, Docbook, LaTeX }; - TextToolsWidget( TextToolsPart *part, QWidget *parent=0, const char *name=0 ); + TextToolsWidget( TextToolsPart *part, TQWidget *parent=0, const char *name=0 ); ~TextToolsWidget(); void setMode(Mode mode, KParts::Part *part); void stop(); private slots: - void slotItemPressed(int button, QListViewItem *item); - void slotReturnPressed(QListViewItem *item); - void slotContextMenu(KListView *, QListViewItem *item, const QPoint &p); + void slotItemPressed(int button, TQListViewItem *item); + void slotReturnPressed(TQListViewItem *item); + void slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &p); void startTimer(); void parseXML(); @@ -45,10 +45,10 @@ private slots: private: TextToolsPart *m_part; - QTimer *m_timer; - QString m_cachedText; + TQTimer *m_timer; + TQString m_cachedText; KTextEditor::EditInterface *m_editIface; - QStringList m_relevantTags, m_emptyTags; + TQStringList m_relevantTags, m_emptyTags; }; #endif diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp index fefdcd39..e1de784a 100644 --- a/parts/tipofday/tipofday_part.cpp +++ b/parts/tipofday/tipofday_part.cpp @@ -1,8 +1,8 @@ #include "tipofday_part.h" -#include <qcheckbox.h> -#include <qpushbutton.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> +#include <tqwhatsthis.h> #include <kaboutdata.h> #include <kaction.h> @@ -24,7 +24,7 @@ static const KDevPluginInfo data("kdevtipofday"); typedef KDevGenericFactory<TipOfDayPart> TipOfDayFactory; K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( data ) ) -TipOfDayPart::TipOfDayPart(QObject *parent, const char *name, const QStringList &) +TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringList &) : KDevPlugin(&data, parent, name ? name : "TipOfDayPart") { setInstance(TipOfDayFactory::instance()); @@ -34,17 +34,17 @@ TipOfDayPart::TipOfDayPart(QObject *parent, const char *name, const QStringList KAction *action; action = new KAction(i18n("&Tip of the Day"), "idea", 0, - this, SLOT(showTip()), actionCollection(), "help_tipofday"); + this, TQT_SLOT(showTip()), actionCollection(), "help_tipofday"); action->setToolTip(i18n("A tip how to use KDevelop")); action->setWhatsThis(i18n("<b>Tip of the day</b><p>" "Will display another good tip \n" "contributed by KDevelop users.")); - connect(core(), SIGNAL(coreInitialized()), this, SLOT(showOnStart())); + connect(core(), TQT_SIGNAL(coreInitialized()), this, TQT_SLOT(showOnStart())); } -QString TipOfDayPart::getFilename() +TQString TipOfDayPart::getFilename() { KConfig * config = KApplication::kApplication()->config(); config->setGroup("Tip of day plugin"); diff --git a/parts/tipofday/tipofday_part.h b/parts/tipofday/tipofday_part.h index 50eedadd..a60856e8 100644 --- a/parts/tipofday/tipofday_part.h +++ b/parts/tipofday/tipofday_part.h @@ -16,7 +16,7 @@ class TipOfDayPart : public KDevPlugin public: - TipOfDayPart(QObject *parent, const char *name, const QStringList &); + TipOfDayPart(TQObject *parent, const char *name, const TQStringList &); public slots: @@ -25,7 +25,7 @@ public slots: void showOnStart(); private: - QString getFilename(); + TQString getFilename(); }; diff --git a/parts/tools/addtooldlg.ui.h b/parts/tools/addtooldlg.ui.h index d01c4da7..045e7809 100644 --- a/parts/tools/addtooldlg.ui.h +++ b/parts/tools/addtooldlg.ui.h @@ -6,22 +6,22 @@ ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ -#include <qheader.h> +#include <tqheader.h> #include <kurlrequester.h> #include "kapplicationtree.h" void AddToolDialog::init() { - connect( tree, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(treeSelectionChanged(QListViewItem*)) ); + connect( tree, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(treeSelectionChanged(TQListViewItem*)) ); tree->header()->hide(); } -QString AddToolDialog::getApp() +TQString AddToolDialog::getApp() { return execEdit->url() + " " + paramEdit->text(); } -void AddToolDialog::treeSelectionChanged( QListViewItem * lvi ) +void AddToolDialog::treeSelectionChanged( TQListViewItem * lvi ) { KDevAppTreeListItem* item = dynamic_cast<KDevAppTreeListItem*> ( lvi ); if ( !item || item->isDirectory() ) diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp index cbe3f3b4..c6517d8f 100644 --- a/parts/tools/kapplicationtree.cpp +++ b/parts/tools/kapplicationtree.cpp @@ -21,17 +21,17 @@ Boston, MA 02110-1301, USA. */ -#include <qfile.h> -#include <qdir.h> -#include <qdialog.h> -#include <qpixmap.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qtoolbutton.h> -#include <qcheckbox.h> -#include <qtooltip.h> -#include <qstyle.h> +#include <tqfile.h> +#include <tqdir.h> +#include <tqdialog.h> +#include <tqpixmap.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqtoolbutton.h> +#include <tqcheckbox.h> +#include <tqtooltip.h> +#include <tqstyle.h> #include <kapplication.h> #include <kbuttonbox.h> @@ -58,16 +58,16 @@ #include "kapplicationtree.h" -template class QPtrList<QString>; +template class TQPtrList<TQString>; -#define SORT_SPEC (QDir::DirsFirst | QDir::Name | QDir::IgnoreCase) +#define SORT_SPEC (TQDir::DirsFirst | TQDir::Name | TQDir::IgnoreCase) // ---------------------------------------------------------------------- -KDevAppTreeListItem::KDevAppTreeListItem( KListView* parent, const QString & name, - const QPixmap& pixmap, bool parse, bool dir, const QString& p, const QString& c, const QString& dE ) - : QListViewItem( parent, name ) +KDevAppTreeListItem::KDevAppTreeListItem( KListView* parent, const TQString & name, + const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE ) + : TQListViewItem( parent, name ) { init(pixmap, parse, dir, p, c, dE); } @@ -75,9 +75,9 @@ KDevAppTreeListItem::KDevAppTreeListItem( KListView* parent, const QString & nam // ---------------------------------------------------------------------- -KDevAppTreeListItem::KDevAppTreeListItem( QListViewItem* parent, const QString & name, - const QPixmap& pixmap, bool parse, bool dir, const QString& p, const QString& c, const QString& dE ) - : QListViewItem( parent, name ) +KDevAppTreeListItem::KDevAppTreeListItem( TQListViewItem* parent, const TQString & name, + const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE ) + : TQListViewItem( parent, name ) { init(pixmap, parse, dir, p, c, dE); } @@ -85,7 +85,7 @@ KDevAppTreeListItem::KDevAppTreeListItem( QListViewItem* parent, const QString & // ---------------------------------------------------------------------- -void KDevAppTreeListItem::init(const QPixmap& pixmap, bool parse, bool dir, const QString& _path, const QString& _exec, const QString& _dEntry) +void KDevAppTreeListItem::init(const TQPixmap& pixmap, bool parse, bool dir, const TQString& _path, const TQString& _exec, const TQString& _dEntry) { setPixmap(0, pixmap); parsed = parse; @@ -101,10 +101,10 @@ void KDevAppTreeListItem::init(const QPixmap& pixmap, bool parse, bool dir, cons // ---------------------------------------------------------------------- // Ensure that dirs are sorted in front of files and case is ignored -QString KDevAppTreeListItem::key(int column, bool /*ascending*/) const +TQString KDevAppTreeListItem::key(int column, bool /*ascending*/) const { if (directory) - return QString::fromLatin1(" ") + text(column).upper(); + return TQString::fromLatin1(" ") + text(column).upper(); else return text(column).upper(); } @@ -121,7 +121,7 @@ void KDevAppTreeListItem::setOpen( bool o ) ((KDevApplicationTree *) parent())->addDesktopGroup( path, this ); parsed = true; } - QListViewItem::setOpen( o ); + TQListViewItem::setOpen( o ); } bool KDevAppTreeListItem::isDirectory() @@ -131,16 +131,16 @@ bool KDevAppTreeListItem::isDirectory() // ---------------------------------------------------------------------- -KDevApplicationTree::KDevApplicationTree( QWidget *parent, const char* name ) +KDevApplicationTree::KDevApplicationTree( TQWidget *parent, const char* name ) : KListView( parent, name ), currentitem(0) { addColumn( i18n("Known Applications") ); setRootIsDecorated( true ); - addDesktopGroup( QString::null ); + addDesktopGroup( TQString::null ); - connect( this, SIGNAL( currentChanged(QListViewItem*) ), SLOT( slotItemHighlighted(QListViewItem*) ) ); - connect( this, SIGNAL( selectionChanged(QListViewItem*) ), SLOT( slotSelectionChanged(QListViewItem*) ) ); + connect( this, TQT_SIGNAL( currentChanged(TQListViewItem*) ), TQT_SLOT( slotItemHighlighted(TQListViewItem*) ) ); + connect( this, TQT_SIGNAL( selectionChanged(TQListViewItem*) ), TQT_SLOT( slotSelectionChanged(TQListViewItem*) ) ); } // ---------------------------------------------------------------------- @@ -153,7 +153,7 @@ bool KDevApplicationTree::isDirSel() // ---------------------------------------------------------------------- -void KDevApplicationTree::addDesktopGroup( QString relPath, KDevAppTreeListItem *item) +void KDevApplicationTree::addDesktopGroup( TQString relPath, KDevAppTreeListItem *item) { KServiceGroup::Ptr root = KServiceGroup::group(relPath); KServiceGroup::List list = root->entries(); @@ -162,11 +162,11 @@ void KDevApplicationTree::addDesktopGroup( QString relPath, KDevAppTreeListItem for( KServiceGroup::List::ConstIterator it = list.begin(); it != list.end(); it++) { - QString icon; - QString text; - QString relPath; - QString exec; - QString dEntry; + TQString icon; + TQString text; + TQString relPath; + TQString exec; + TQString dEntry; bool isDir = false; KSycocaEntry *p = (*it); if (p->isType(KST_KService)) @@ -197,7 +197,7 @@ void KDevApplicationTree::addDesktopGroup( QString relPath, KDevAppTreeListItem continue; } - QPixmap pixmap = SmallIcon( icon ); + TQPixmap pixmap = SmallIcon( icon ); if (item) newItem = new KDevAppTreeListItem( item, text, pixmap, false, isDir, @@ -213,7 +213,7 @@ void KDevApplicationTree::addDesktopGroup( QString relPath, KDevAppTreeListItem // ---------------------------------------------------------------------- -void KDevApplicationTree::slotItemHighlighted(QListViewItem* i) +void KDevApplicationTree::slotItemHighlighted(TQListViewItem* i) { // i may be 0 (see documentation) if(!i) @@ -230,7 +230,7 @@ void KDevApplicationTree::slotItemHighlighted(QListViewItem* i) // ---------------------------------------------------------------------- -void KDevApplicationTree::slotSelectionChanged(QListViewItem* i) +void KDevApplicationTree::slotSelectionChanged(TQListViewItem* i) { // i may be 0 (see documentation) if(!i) @@ -246,9 +246,9 @@ void KDevApplicationTree::slotSelectionChanged(QListViewItem* i) // ---------------------------------------------------------------------- -void KDevApplicationTree::resizeEvent( QResizeEvent * e) +void KDevApplicationTree::resizeEvent( TQResizeEvent * e) { - setColumnWidth(0, width()-QApplication::style().pixelMetric(QStyle::PM_ScrollBarExtent)); + setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent)); KListView::resizeEvent(e); } diff --git a/parts/tools/kapplicationtree.h b/parts/tools/kapplicationtree.h index 2e376ba7..60a35ac6 100644 --- a/parts/tools/kapplicationtree.h +++ b/parts/tools/kapplicationtree.h @@ -40,24 +40,24 @@ class KDevAppTreeListItem : public QListViewItem { bool parsed; bool directory; - QString path; - QString exec; - QString dEntry; + TQString path; + TQString exec; + TQString dEntry; protected: - QString key(int column, bool ascending) const; + TQString key(int column, bool ascending) const; - void init(const QPixmap& pixmap, bool parse, bool dir, const QString& _path, const QString& _exec, const QString& _dEntry); + void init(const TQPixmap& pixmap, bool parse, bool dir, const TQString& _path, const TQString& _exec, const TQString& _dEntry); public: - KDevAppTreeListItem( KListView* parent, const QString & name, const QPixmap& pixmap, - bool parse, bool dir, const QString& p, const QString& c, const QString& dE ); - KDevAppTreeListItem( QListViewItem* parent, const QString & name, const QPixmap& pixmap, - bool parse, bool dir, const QString& p, const QString& c, const QString& dE ); + KDevAppTreeListItem( KListView* parent, const TQString & name, const TQPixmap& pixmap, + bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE ); + KDevAppTreeListItem( TQListViewItem* parent, const TQString & name, const TQPixmap& pixmap, + bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE ); bool isDirectory(); - QString desktopEntryPath() const { return dEntry; } - QString executable() const { return exec; } + TQString desktopEntryPath() const { return dEntry; } + TQString executable() const { return exec; } protected: virtual void activate(); @@ -75,26 +75,26 @@ class KDevApplicationTree : public KListView { Q_OBJECT public: - KDevApplicationTree( QWidget *parent, const char* name = 0 ); + KDevApplicationTree( TQWidget *parent, const char* name = 0 ); /** * Add a group of .desktop/.kdelnk entries */ - void addDesktopGroup( QString relPath, KDevAppTreeListItem *item = 0 ); + void addDesktopGroup( TQString relPath, KDevAppTreeListItem *item = 0 ); bool isDirSel(); protected: - void resizeEvent( QResizeEvent *_ev ); + void resizeEvent( TQResizeEvent *_ev ); KDevAppTreeListItem* currentitem; public slots: - void slotItemHighlighted(QListViewItem* i); - void slotSelectionChanged(QListViewItem* i); + void slotItemHighlighted(TQListViewItem* i); + void slotSelectionChanged(TQListViewItem* i); signals: - void selected( const QString& _name, const QString& _exec ); - void highlighted( const QString& _name, const QString& _exec ); + void selected( const TQString& _name, const TQString& _exec ); + void highlighted( const TQString& _name, const TQString& _exec ); }; /* ------------------------------------------------------------------------- */ diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp index f4285546..f04e4ae3 100644 --- a/parts/tools/tools_part.cpp +++ b/parts/tools/tools_part.cpp @@ -1,11 +1,11 @@ #include "tools_part.h" -#include <qfile.h> -#include <qpopupmenu.h> -#include <qregexp.h> -#include <qtimer.h> -#include <qvbox.h> -#include <qwhatsthis.h> +#include <tqfile.h> +#include <tqpopupmenu.h> +#include <tqregexp.h> +#include <tqtimer.h> +#include <tqvbox.h> +#include <tqwhatsthis.h> #include <kaction.h> #include <kapplication.h> @@ -37,9 +37,9 @@ static const KDevPluginInfo data("kdevtools"); K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( data ) ) -QMap<int, QString> externalToolMenuEntries; +TQMap<int, TQString> externalToolMenuEntries; -ToolsPart::ToolsPart(QObject *parent, const char *name, const QStringList &) +ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &) : KDevPlugin( &data, parent, name ? name : "ToolsPart") { setInstance(ToolsFactory::instance()); @@ -49,17 +49,17 @@ ToolsPart::ToolsPart(QObject *parent, const char *name, const QStringList &) m_configProxy = new ConfigWidgetProxy( core() ); m_configProxy->createGlobalConfigPage( i18n("Tools Menu"), TOOLSSETTINGS, info()->icon() ); m_configProxy->createGlobalConfigPage( i18n("External Tools"), EXTRATOOLSSETTINGS, info()->icon() ); - connect( m_configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )), - this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )) ); + connect( m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - connect(core(), SIGNAL(coreInitialized()), this, SLOT(updateMenu())); + connect(core(), TQT_SIGNAL(coreInitialized()), this, TQT_SLOT(updateMenu())); - connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *)) ); + connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); // Apparently action lists can only be plugged after the // xmlgui client has been registered - QTimer::singleShot(0, this, SLOT(updateToolsMenu())); + TQTimer::singleShot(0, this, TQT_SLOT(updateToolsMenu())); } @@ -68,42 +68,42 @@ ToolsPart::~ToolsPart() delete m_configProxy; } -void ToolsPart::insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int pagenumber ) +void ToolsPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber ) { if ( pagenumber == TOOLSSETTINGS ) { ToolsConfig *w = new ToolsConfig( page, "tools config widget" ); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); - connect(dlg, SIGNAL(destroyed()), this, SLOT(updateMenu())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(updateMenu())); } else if ( pagenumber == EXTRATOOLSSETTINGS ) { ToolsConfigWidget *w2 = new ToolsConfigWidget( page, "tools config widget" ); - connect(dlg, SIGNAL(okClicked()), w2, SLOT(accept())); - connect(dlg, SIGNAL(destroyed()), this, SLOT(updateToolsMenu())); + connect(dlg, TQT_SIGNAL(okClicked()), w2, TQT_SLOT(accept())); + connect(dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(updateToolsMenu())); } } void ToolsPart::updateMenu() { - QPtrList<KAction> actions; + TQPtrList<KAction> actions; unplugActionList("tools_list"); KConfig *config = ToolsFactory::instance()->config(); config->setGroup("Tools"); - QStringList list = config->readListEntry("Tools"); - for (QStringList::Iterator it = list.begin(); it != list.end(); ++it) + TQStringList list = config->readListEntry("Tools"); + for (TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { - QString name = *it; + TQString name = *it; KDesktopFile df(name, true); if (df.readName().isNull()) continue; KAction *action = new KAction(df.readName(), df.readIcon(), 0, - this, SLOT(slotToolActivated()), (QObject*)0, name.latin1()); + this, TQT_SLOT(slotToolActivated()), (TQObject*)0, name.latin1()); actions.append(action); } @@ -113,48 +113,48 @@ void ToolsPart::updateMenu() void ToolsPart::slotToolActivated() { - QString df = sender()->name(); + TQString df = sender()->name(); kapp->startServiceByDesktopPath(df); } -void ToolsPart::startCommand(QString cmdline, bool captured, QString fileName) +void ToolsPart::startCommand(TQString cmdline, bool captured, TQString fileName) { KTextEditor::Document * doc = dynamic_cast<KTextEditor::Document*>( partController()->activePart() ); if ( fileName.isNull() && doc ) fileName = doc->url().path(); - QString projectDirectory; + TQString projectDirectory; if (project()) projectDirectory = project()->projectDirectory(); - QString selection = KDevEditorUtil::currentSelection( doc ); + TQString selection = KDevEditorUtil::currentSelection( doc ); if ( !selection.isEmpty() ) selection = KShellProcess::quote( selection ); - QString word = KDevEditorUtil::currentWord( doc ); + TQString word = KDevEditorUtil::currentWord( doc ); // This should really be checked before inserting into the popup if (cmdline.contains("%D") && projectDirectory.isNull()) return; - cmdline.replace(QRegExp("%D"), projectDirectory); + cmdline.replace(TQRegExp("%D"), projectDirectory); if (cmdline.contains("%S") && fileName.isNull()) return; - cmdline.replace(QRegExp("%S"), fileName); + cmdline.replace(TQRegExp("%S"), fileName); if (cmdline.contains("%T") && selection.isNull()) return; - cmdline.replace(QRegExp("%T"), selection); + cmdline.replace(TQRegExp("%T"), selection); if (cmdline.contains("%W") && word.isNull()) return; - cmdline.replace(QRegExp("%W"), word); + cmdline.replace(TQRegExp("%W"), word); if (captured) { if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("KDevelop/AppFrontend")) - appFrontend->startAppCommand(QString::QString(), cmdline, false); + appFrontend->startAppCommand(TQString::TQString(), cmdline, false); } else { @@ -169,19 +169,19 @@ void ToolsPart::updateToolsMenu() { KConfig *config = ToolsFactory::instance()->config(); config->setGroup("External Tools"); - QStringList l = config->readListEntry("Tool Menu"); + TQStringList l = config->readListEntry("Tool Menu"); - QPtrList<KAction> actions; - QStringList::ConstIterator it; + TQPtrList<KAction> actions; + TQStringList::ConstIterator it; for (it = l.begin(); it != l.end(); ++it) { - QString menutext = *it; + TQString menutext = *it; KConfig *config = ToolsFactory::instance()->config(); config->setGroup("Tool Menu " + menutext); bool isdesktopfile = config->readBoolEntry("DesktopFile"); KAction *action = new KAction(*it, 0, - this, SLOT(toolsMenuActivated()), - (QObject*) 0, menutext.utf8()); + this, TQT_SLOT(toolsMenuActivated()), + (TQObject*) 0, menutext.utf8()); if (isdesktopfile) { KDesktopFile df(config->readPathEntry("CommandLine")); action->setIcon(df.readIcon()); @@ -194,7 +194,7 @@ void ToolsPart::updateToolsMenu() } -void ToolsPart::contextMenu(QPopupMenu *popup, const Context *context) +void ToolsPart::contextMenu(TQPopupMenu *popup, const Context *context) { if (!context->hasType( Context::FileContext )) return; @@ -206,28 +206,28 @@ void ToolsPart::contextMenu(QPopupMenu *popup, const Context *context) KConfig *config = ToolsFactory::instance()->config(); config->setGroup("External Tools"); - QStringList filecontextList = config->readListEntry("File Context"); + TQStringList filecontextList = config->readListEntry("File Context"); if (URLUtil::isDirectory(m_contextFileName)) { - QStringList l = config->readListEntry("Dir Context"); - QStringList::ConstIterator it; + TQStringList l = config->readListEntry("Dir Context"); + TQStringList::ConstIterator it; for (it = l.begin(); it != l.end(); ++it) - externalToolMenuEntries.insert( popup->insertItem( (*it), this, SLOT(dirContextActivated(int)) ), (*it) ); + externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQT_SLOT(dirContextActivated(int)) ), (*it) ); } else { - QStringList l = config->readListEntry("File Context"); - QStringList::ConstIterator it; + TQStringList l = config->readListEntry("File Context"); + TQStringList::ConstIterator it; for (it = l.begin(); it != l.end(); ++it) - externalToolMenuEntries.insert( popup->insertItem( (*it), this, SLOT(fileContextActivated(int)) ), (*it) ); + externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQT_SLOT(fileContextActivated(int)) ), (*it) ); } } void ToolsPart::toolsMenuActivated() { - QString menutext = sender()->name(); + TQString menutext = sender()->name(); KConfig *config = ToolsFactory::instance()->config(); config->setGroup("Tool Menu " + menutext); - QString cmdline = config->readPathEntry("CommandLine"); + TQString cmdline = config->readPathEntry("CommandLine"); bool isdesktopfile = config->readBoolEntry("DesktopFile"); bool captured = config->readBoolEntry("Captured"); kdDebug() << "tools:" << "activating " << menutext @@ -236,17 +236,17 @@ void ToolsPart::toolsMenuActivated() if (isdesktopfile) kapp->startServiceByDesktopPath(cmdline); else - startCommand(cmdline, captured, QString::null); + startCommand(cmdline, captured, TQString::null); } void ToolsPart::fileContextActivated(int id) { - QString menutext = externalToolMenuEntries[ id ]; + TQString menutext = externalToolMenuEntries[ id ]; KConfig *config = ToolsFactory::instance()->config(); config->setGroup("File Context " + menutext); - QString cmdline = config->readPathEntry("CommandLine"); + TQString cmdline = config->readPathEntry("CommandLine"); bool captured = config->readBoolEntry("Captured"); kdDebug() << "filecontext:" << "activating " << menutext << " with cmdline " << cmdline @@ -257,11 +257,11 @@ void ToolsPart::fileContextActivated(int id) void ToolsPart::dirContextActivated(int id) { - QString menutext = externalToolMenuEntries[ id ]; + TQString menutext = externalToolMenuEntries[ id ]; KConfig *config = ToolsFactory::instance()->config(); config->setGroup("Dir Context " + menutext); - QString cmdline = config->readPathEntry("CommandLine"); + TQString cmdline = config->readPathEntry("CommandLine"); bool captured = config->readBoolEntry("Captured"); kdDebug() << "dircontext:" << "activating " << menutext << "with cmdline " << cmdline diff --git a/parts/tools/tools_part.h b/parts/tools/tools_part.h index b0d82c99..172b11b6 100644 --- a/parts/tools/tools_part.h +++ b/parts/tools/tools_part.h @@ -7,7 +7,7 @@ #define __KDEVPART_TOOLS_H__ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kdevplugin.h> #include <kdevgenericfactory.h> @@ -26,27 +26,27 @@ class ToolsPart : public KDevPlugin public: - ToolsPart( QObject *parent, const char *name, const QStringList & ); + ToolsPart( TQObject *parent, const char *name, const TQStringList & ); ~ToolsPart(); private slots: - void insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int pagenumber ); + void insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber ); void updateMenu(); void slotToolActivated(); - void contextMenu(QPopupMenu *popup, const Context *context); + void contextMenu(TQPopupMenu *popup, const Context *context); void updateToolsMenu(); void toolsMenuActivated(); void fileContextActivated(int id); void dirContextActivated(int id); private: - void startCommand(QString cmdline, bool captured, QString fileName); + void startCommand(TQString cmdline, bool captured, TQString fileName); - QPopupMenu *m_contextPopup; - QString m_contextFileName; + TQPopupMenu *m_contextPopup; + TQString m_contextFileName; ConfigWidgetProxy * m_configProxy; }; diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp index 523fe388..c8b4566f 100644 --- a/parts/tools/toolsconfig.cpp +++ b/parts/tools/toolsconfig.cpp @@ -1,11 +1,11 @@ #include "toolsconfig.h" -#include <qapplication.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlistbox.h> -#include <qpushbutton.h> -#include <qheader.h> +#include <tqapplication.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlistbox.h> +#include <tqpushbutton.h> +#include <tqheader.h> #include <kapplication.h> #include <kdesktopfile.h> @@ -17,63 +17,63 @@ #include "kapplicationtree.h" -ToolsConfig::ToolsConfig(QWidget *parent, const char *name) - : QWidget(parent, name), _tree(0) +ToolsConfig::ToolsConfig(TQWidget *parent, const char *name) + : TQWidget(parent, name), _tree(0) { _entries.setAutoDelete(true); } -void ToolsConfig::showEvent(QShowEvent *e) +void ToolsConfig::showEvent(TQShowEvent *e) { - QWidget::showEvent(e); + TQWidget::showEvent(e); if (!_tree) { - QApplication::setOverrideCursor(Qt::waitCursor); + TQApplication::setOverrideCursor(Qt::waitCursor); - QHBoxLayout *hbox = new QHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQHBoxLayout *hbox = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - QVBoxLayout *vbox = new QVBoxLayout(hbox); + TQVBoxLayout *vbox = new TQVBoxLayout(hbox); _tree = new KDevApplicationTree(this); _tree->header()->hide(); - QLabel *l = new QLabel(_tree, i18n("&Applications:"), this); + TQLabel *l = new TQLabel(_tree, i18n("&Applications:"), this); l->show(); _tree->show(); vbox->addWidget(l); vbox->addWidget(_tree); - vbox = new QVBoxLayout(hbox); + vbox = new TQVBoxLayout(hbox); - _toList = new QPushButton(QApplication::reverseLayout() ? "<<" : ">>", this); + _toList = new TQPushButton(TQApplication::reverseLayout() ? "<<" : ">>", this); _toList->show(); vbox->addWidget(_toList); - connect(_toList, SIGNAL(clicked()), this, SLOT(toList())); + connect(_toList, TQT_SIGNAL(clicked()), this, TQT_SLOT(toList())); - _toTree = new QPushButton(QApplication::reverseLayout() ? ">>" : "<<", this); + _toTree = new TQPushButton(TQApplication::reverseLayout() ? ">>" : "<<", this); _toTree->show(); vbox->addWidget(_toTree); - connect(_toTree, SIGNAL(clicked()), this, SLOT(toTree())); + connect(_toTree, TQT_SIGNAL(clicked()), this, TQT_SLOT(toTree())); - vbox = new QVBoxLayout(hbox); - _list = new QListBox(this); - l = new QLabel(_list, i18n("&Tools menu:"), this); + vbox = new TQVBoxLayout(hbox); + _list = new TQListBox(this); + l = new TQLabel(_list, i18n("&Tools menu:"), this); l->show(); _list->show(); vbox->addWidget(l); vbox->addWidget(_list); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } fill(); checkButtons(); - connect(_tree, SIGNAL(selectionChanged()), this, SLOT(checkButtons())); - connect(_list, SIGNAL(selectionChanged()), this, SLOT(checkButtons())); + connect(_tree, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(checkButtons())); + connect(_list, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(checkButtons())); } @@ -91,14 +91,14 @@ void ToolsConfig::fill() KConfig *config = ToolsFactory::instance()->config(); config->setGroup("Tools"); - QStringList list = config->readListEntry("Tools"); + TQStringList list = config->readListEntry("Tools"); - for (QStringList::Iterator it = list.begin(); it != list.end(); ++it) + for (TQStringList::Iterator it = list.begin(); it != list.end(); ++it) add(*it); } -void ToolsConfig::add(const QString &desktopFile) +void ToolsConfig::add(const TQString &desktopFile) { KDesktopFile df(desktopFile, true); if (df.readName().isEmpty()) @@ -141,8 +141,8 @@ void ToolsConfig::accept() KConfig *config = ToolsFactory::instance()->config(); config->setGroup("Tools"); - QStringList l; - QPtrListIterator<Entry> it(_entries); + TQStringList l; + TQPtrListIterator<Entry> it(_entries); for ( ; it.current(); ++it) l.append(it.current()->desktopFile); @@ -157,7 +157,7 @@ void ToolsConfig::updateList() _list->clear(); - QPtrListIterator<Entry> it(_entries); + TQPtrListIterator<Entry> it(_entries); for ( ; it.current(); ++it) _list->insertItem(it.current()->icon, it.current()->name); diff --git a/parts/tools/toolsconfig.h b/parts/tools/toolsconfig.h index 5dc87d70..46855256 100644 --- a/parts/tools/toolsconfig.h +++ b/parts/tools/toolsconfig.h @@ -2,9 +2,9 @@ #define __TOOLS_CONFIG_H__ -#include <qwidget.h> -#include <qptrlist.h> -#include <qpixmap.h> +#include <tqwidget.h> +#include <tqptrlist.h> +#include <tqpixmap.h> class QListBox; @@ -17,9 +17,9 @@ public: Entry() {}; - QString name; - QString desktopFile; - QPixmap icon; + TQString name; + TQString desktopFile; + TQPixmap icon; }; @@ -30,7 +30,7 @@ class ToolsConfig : public QWidget public: - ToolsConfig(QWidget *parent = 0, const char *name = 0); + ToolsConfig(TQWidget *parent = 0, const char *name = 0); public slots: @@ -40,11 +40,11 @@ public slots: protected: - void showEvent(QShowEvent *); + void showEvent(TQShowEvent *); void fill(); - void add(const QString &desktopFile); - void remove(const QString &desktopFile); + void add(const TQString &desktopFile); + void remove(const TQString &desktopFile); private slots: @@ -60,10 +60,10 @@ private slots: private: KDevApplicationTree *_tree; - QListBox *_list; - QPushButton *_toList, *_toTree; + TQListBox *_list; + TQPushButton *_toList, *_toTree; - QPtrList<Entry> _entries; + TQPtrList<Entry> _entries; }; diff --git a/parts/tools/toolsconfigwidget.cpp b/parts/tools/toolsconfigwidget.cpp index 72b102be..b4643b26 100644 --- a/parts/tools/toolsconfigwidget.cpp +++ b/parts/tools/toolsconfigwidget.cpp @@ -11,9 +11,9 @@ #include "toolsconfigwidget.h" -#include <qcheckbox.h> -#include <qlistbox.h> -#include <qtimer.h> +#include <tqcheckbox.h> +#include <tqlistbox.h> +#include <tqtimer.h> #include <klineedit.h> #include <kconfig.h> @@ -31,8 +31,8 @@ struct ToolsConfigEntry { - QString menutext; - QString cmdline; + TQString menutext; + TQString cmdline; bool isdesktopfile; bool captured; bool isEmpty() const { @@ -41,7 +41,7 @@ struct ToolsConfigEntry }; -ToolsConfigWidget::ToolsConfigWidget(QWidget *parent, const char *name) +ToolsConfigWidget::ToolsConfigWidget(TQWidget *parent, const char *name) : ToolsConfigWidgetBase(parent, name) { m_toolsmenuEntries.setAutoDelete(true); @@ -61,16 +61,16 @@ ToolsConfigWidget::~ToolsConfigWidget() {} -void ToolsConfigWidget::readGroup(const QString &group, QDict<ToolsConfigEntry> *entryDict) +void ToolsConfigWidget::readGroup(const TQString &group, TQDict<ToolsConfigEntry> *entryDict) { KConfig *config = ToolsFactory::instance()->config(); config->setGroup("External Tools"); - QStringList list = config->readListEntry(group); + TQStringList list = config->readListEntry(group); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = list.begin(); it != list.end(); ++it) { config->setGroup(group + " " + (*it)); - QString cmdline = config->readPathEntry("CommandLine"); + TQString cmdline = config->readPathEntry("CommandLine"); bool isdesktopfile = config->readBoolEntry("DesktopFile"); bool captured = config->readBoolEntry("Captured"); ToolsConfigEntry *entry = new ToolsConfigEntry; @@ -83,13 +83,13 @@ void ToolsConfigWidget::readGroup(const QString &group, QDict<ToolsConfigEntry> } -void ToolsConfigWidget::storeGroup(const QString &group, const QDict<ToolsConfigEntry> &entryDict) +void ToolsConfigWidget::storeGroup(const TQString &group, const TQDict<ToolsConfigEntry> &entryDict) { KConfig *config = ToolsFactory::instance()->config(); - QStringList list; + TQStringList list; - QDictIterator<ToolsConfigEntry> it(entryDict); + TQDictIterator<ToolsConfigEntry> it(entryDict); for (; it.current(); ++it) { ToolsConfigEntry *entry = it.current(); list << entry->menutext; @@ -105,11 +105,11 @@ void ToolsConfigWidget::storeGroup(const QString &group, const QDict<ToolsConfig -void ToolsConfigWidget::fillListBox(QListBox *lb, const QDict<ToolsConfigEntry> &entryDict) +void ToolsConfigWidget::fillListBox(TQListBox *lb, const TQDict<ToolsConfigEntry> &entryDict) { lb->clear(); - QDictIterator<ToolsConfigEntry> it(entryDict); + TQDictIterator<ToolsConfigEntry> it(entryDict); for (; it.current(); ++it) { ToolsConfigEntry *entry = it.current(); if (entry->isdesktopfile) { @@ -122,9 +122,9 @@ void ToolsConfigWidget::fillListBox(QListBox *lb, const QDict<ToolsConfigEntry> } -bool ToolsConfigWidget::addEntry(ToolsConfigEntry *entry, QDict<ToolsConfigEntry> *entryDict) +bool ToolsConfigWidget::addEntry(ToolsConfigEntry *entry, TQDict<ToolsConfigEntry> *entryDict) { - QString menutext = entry->menutext; + TQString menutext = entry->menutext; if (entryDict->find(menutext)) { delete entry; KMessageBox::sorry(this, i18n("An entry with this title exists already.")); @@ -185,7 +185,7 @@ void ToolsConfigWidget::toolsmenuaddClicked() void ToolsConfigWidget::toolsmenuremoveClicked() { - QString menutext = toolsmenuBox->currentText(); + TQString menutext = toolsmenuBox->currentText(); m_toolsmenuEntries.remove(menutext); updateListBoxes(); } @@ -213,7 +213,7 @@ void ToolsConfigWidget::filecontextaddClicked() void ToolsConfigWidget::filecontextremoveClicked() { - QString menutext = filecontextBox->currentText(); + TQString menutext = filecontextBox->currentText(); m_filecontextEntries.remove(menutext); updateListBoxes(); } @@ -240,21 +240,21 @@ void ToolsConfigWidget::dircontextaddClicked() void ToolsConfigWidget::dircontextremoveClicked() { - QString menutext = dircontextBox->currentText(); + TQString menutext = dircontextBox->currentText(); m_dircontextEntries.remove(menutext); updateListBoxes(); } -bool ToolsConfigWidget::eventFilter(QObject *o, QEvent *e) +bool ToolsConfigWidget::eventFilter(TQObject *o, TQEvent *e) { - if (e->type() == QEvent::DragEnter || e->type() == QEvent::DragMove) { - QDragMoveEvent *dme = static_cast<QDragMoveEvent*>(e); + if (e->type() == TQEvent::DragEnter || e->type() == TQEvent::DragMove) { + TQDragMoveEvent *dme = static_cast<TQDragMoveEvent*>(e); if (KURLDrag::canDecode(dme)) dme->accept(); return true; - } else if (e->type() == QEvent::Drop) { - QDropEvent *de = static_cast<QDropEvent*>(e); + } else if (e->type() == TQEvent::Drop) { + TQDropEvent *de = static_cast<TQDropEvent*>(e); KURL::List fileList; if (KURLDrag::decode(de, fileList)) { KURL::List::ConstIterator it; diff --git a/parts/tools/toolsconfigwidget.h b/parts/tools/toolsconfigwidget.h index 51e1b005..b58c9ea4 100644 --- a/parts/tools/toolsconfigwidget.h +++ b/parts/tools/toolsconfigwidget.h @@ -14,7 +14,7 @@ #include "toolsconfigwidgetbase.h" #include "tools_part.h" -#include <qdict.h> +#include <tqdict.h> struct ToolsConfigEntry; @@ -25,7 +25,7 @@ class ToolsConfigWidget : public ToolsConfigWidgetBase Q_OBJECT public: - ToolsConfigWidget(QWidget *parent=0, const char *name=0); + ToolsConfigWidget(TQWidget *parent=0, const char *name=0); ~ToolsConfigWidget(); public slots: @@ -39,20 +39,20 @@ private: virtual void dircontextaddClicked(); virtual void dircontextremoveClicked(); - virtual bool eventFilter(QObject *o, QEvent *e); + virtual bool eventFilter(TQObject *o, TQEvent *e); - void readGroup(const QString &group, QDict<ToolsConfigEntry> *entryDict); - void storeGroup(const QString &group, const QDict<ToolsConfigEntry> &entryDict); - void fillListBox(QListBox *lb, const QDict<ToolsConfigEntry> &entryDict); - bool addEntry(ToolsConfigEntry *entry, QDict<ToolsConfigEntry> *entryDict); + void readGroup(const TQString &group, TQDict<ToolsConfigEntry> *entryDict); + void storeGroup(const TQString &group, const TQDict<ToolsConfigEntry> &entryDict); + void fillListBox(TQListBox *lb, const TQDict<ToolsConfigEntry> &entryDict); + bool addEntry(ToolsConfigEntry *entry, TQDict<ToolsConfigEntry> *entryDict); void readConfig(); void storeConfig(); void updateListBoxes(); - QDict<ToolsConfigEntry> m_toolsmenuEntries; - QDict<ToolsConfigEntry> m_filecontextEntries; - QDict<ToolsConfigEntry> m_dircontextEntries; + TQDict<ToolsConfigEntry> m_toolsmenuEntries; + TQDict<ToolsConfigEntry> m_filecontextEntries; + TQDict<ToolsConfigEntry> m_dircontextEntries; ToolsPart *m_part; }; diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp index 914c03ba..855f4daf 100644 --- a/parts/uimode/uichooser_part.cpp +++ b/parts/uimode/uichooser_part.cpp @@ -1,6 +1,6 @@ #include "uichooser_part.h" -#include <qvbox.h> +#include <tqvbox.h> #include <kdialogbase.h> #include <kdevgenericfactory.h> @@ -18,15 +18,15 @@ typedef KDevGenericFactory<UIChooserPart> UIChooserFactory; static const KDevPluginInfo data("kdevuichooser"); K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( data ) ) -UIChooserPart::UIChooserPart(QObject *parent, const char *name, const QStringList &) +UIChooserPart::UIChooserPart(TQObject *parent, const char *name, const TQStringList &) : KDevPlugin( &data, parent, name ? name : "UIChooserPart") { setInstance(UIChooserFactory::instance()); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createGlobalConfigPage( i18n("User Interface"), UICHOOSERSETTINGSPAGE, 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 )) ); } @@ -35,14 +35,14 @@ UIChooserPart::~UIChooserPart() delete _configProxy; } -void UIChooserPart::insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int pagenumber ) +void UIChooserPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber ) { kdDebug() << k_funcinfo << endl; if ( pagenumber == UICHOOSERSETTINGSPAGE ) { UIChooserWidget * w = new UIChooserWidget( this, page, "UIChooser widget" ); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } } diff --git a/parts/uimode/uichooser_part.h b/parts/uimode/uichooser_part.h index e4633441..5f0826fa 100644 --- a/parts/uimode/uichooser_part.h +++ b/parts/uimode/uichooser_part.h @@ -17,11 +17,11 @@ class UIChooserPart : public KDevPlugin Q_OBJECT public: - UIChooserPart(QObject *parent, const char *name, const QStringList &); + UIChooserPart(TQObject *parent, const char *name, const TQStringList &); ~UIChooserPart(); private slots: - void insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int ); + void insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int ); private: ConfigWidgetProxy * _configProxy; diff --git a/parts/uimode/uichooser_widget.cpp b/parts/uimode/uichooser_widget.cpp index 5e6ffbf7..2fe6b919 100644 --- a/parts/uimode/uichooser_widget.cpp +++ b/parts/uimode/uichooser_widget.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qcheckbox.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> #include <kapplication.h> #include <kconfig.h> #include <kdebug.h> @@ -27,7 +27,7 @@ #include "kdevmainwindow.h" #include "uichooser_widget.h" -UIChooserWidget::UIChooserWidget( UIChooserPart * part, QWidget *parent, const char *name) +UIChooserWidget::UIChooserWidget( UIChooserPart * part, TQWidget *parent, const char *name) : UIChooser(parent, name) ,m_part(part), _lastMode(0L) { diff --git a/parts/uimode/uichooser_widget.h b/parts/uimode/uichooser_widget.h index 5faba3af..e9f7a7ed 100644 --- a/parts/uimode/uichooser_widget.h +++ b/parts/uimode/uichooser_widget.h @@ -2,7 +2,7 @@ #define __UICHOOSER_WIDGET_H__ -#include <qwidget.h> +#include <tqwidget.h> #include "uichooser.h" @@ -20,7 +20,7 @@ public: _NeverShowTabs = 2 }; - UIChooserWidget( UIChooserPart * part, QWidget *parent=0, const char *name=0 ); + UIChooserWidget( UIChooserPart * part, TQWidget *parent=0, const char *name=0 ); public slots: void accept(); @@ -35,7 +35,7 @@ private slots: private: UIChooserPart* m_part; - QWidget * _lastMode; + TQWidget * _lastMode; }; diff --git a/parts/valgrind/valgrind_dialog.cpp b/parts/valgrind/valgrind_dialog.cpp index 405d78dd..67c05c56 100644 --- a/parts/valgrind/valgrind_dialog.cpp +++ b/parts/valgrind/valgrind_dialog.cpp @@ -1,7 +1,7 @@ -#include <qlayout.h> -#include <qcheckbox.h> -#include <qregexp.h> -#include <qwidgetstack.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqregexp.h> +#include <tqwidgetstack.h> #include <kprocess.h> #include <klocale.h> @@ -16,7 +16,7 @@ #include "valgrind_dialog.moc" -ValgrindDialog::ValgrindDialog( Type type, QWidget* parent ) +ValgrindDialog::ValgrindDialog( Type type, TQWidget* parent ) : KDialogBase( parent, "valgrind dialog", true, i18n("Valgrind Memory Check"), Ok|Cancel ), m_type(type) { @@ -25,10 +25,10 @@ ValgrindDialog::ValgrindDialog( Type type, QWidget* parent ) w->executableEdit->setFocus(); w->stack->raiseWidget(m_type); setMainWidget( w ); - connect( w->executableEdit->lineEdit(), SIGNAL( textChanged( const QString &)), this, SLOT( valgrindTextChanged())); - connect( w->valExecutableEdit->lineEdit(), SIGNAL( textChanged( const QString &)), this, SLOT( valgrindTextChanged())); - connect( w->ctExecutableEdit->lineEdit(), SIGNAL( textChanged( const QString &)), this, SLOT( valgrindTextChanged())); - connect( w->kcExecutableEdit->lineEdit(), SIGNAL( textChanged( const QString &)), this, SLOT( valgrindTextChanged())); + connect( w->executableEdit->lineEdit(), TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged())); + connect( w->valExecutableEdit->lineEdit(), TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged())); + connect( w->ctExecutableEdit->lineEdit(), TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged())); + connect( w->kcExecutableEdit->lineEdit(), TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged())); enableButtonOK( false ); } @@ -45,34 +45,34 @@ void ValgrindDialog::valgrindTextChanged() enableButtonOK( !w->executableEdit->lineEdit()->text().isEmpty() && !w->ctExecutableEdit->lineEdit()->text().isEmpty() && !w->kcExecutableEdit->lineEdit()->text().isEmpty() ); } -QString ValgrindDialog::executableName() const +TQString ValgrindDialog::executableName() const { return w->executableEdit->url(); } -void ValgrindDialog::setExecutable( const QString& url ) +void ValgrindDialog::setExecutable( const TQString& url ) { w->executableEdit->setURL( url ); } -QString ValgrindDialog::valExecutable() const +TQString ValgrindDialog::valExecutable() const { return w->valExecutableEdit->url(); } -QString ValgrindDialog::parameters() const +TQString ValgrindDialog::parameters() const { return w->paramEdit->text(); } -void ValgrindDialog::setParameters( const QString& params ) +void ValgrindDialog::setParameters( const TQString& params ) { w->paramEdit->setText( params ); } -void ValgrindDialog::setValExecutable( const QString& ve ) +void ValgrindDialog::setValExecutable( const TQString& ve ) { - QString vUrl = ve; + TQString vUrl = ve; if ( vUrl.isEmpty() ) { vUrl = KStandardDirs::findExe( "valgrind" ); } @@ -86,14 +86,14 @@ void ValgrindDialog::setValExecutable( const QString& ve ) } } -static const QString memCheckParam( "--tool=memcheck" ); -static const QString leakCheckParam( "--leak-check=yes" ); -static const QString reachableParam( "--show-reachable=yes" ); -static const QString childrenParam( "--trace-children=yes" ); +static const TQString memCheckParam( "--tool=memcheck" ); +static const TQString leakCheckParam( "--leak-check=yes" ); +static const TQString reachableParam( "--show-reachable=yes" ); +static const TQString childrenParam( "--trace-children=yes" ); -QString ValgrindDialog::valParams() const +TQString ValgrindDialog::valParams() const { - QString params = w->valParamEdit->text(); + TQString params = w->valParamEdit->text(); if (isNewValgrindVersion()) params += " " + memCheckParam; if ( w->memleakBox->isChecked() ) @@ -106,9 +106,9 @@ QString ValgrindDialog::valParams() const return params; } -void ValgrindDialog::setValParams( const QString& params ) +void ValgrindDialog::setValParams( const TQString& params ) { - QString myParams = params; + TQString myParams = params; if ( myParams.contains( leakCheckParam ) ) w->memleakBox->setChecked( true ); if ( myParams.contains( reachableParam ) ) @@ -117,22 +117,22 @@ void ValgrindDialog::setValParams( const QString& params ) w->childrenBox->setChecked( true ); w->init(); - myParams = myParams.replace( QRegExp( memCheckParam ), "" ); - myParams = myParams.replace( QRegExp( leakCheckParam ), "" ); - myParams = myParams.replace( QRegExp( reachableParam ), "" ); - myParams = myParams.replace( QRegExp( childrenParam ), "" ); + myParams = myParams.replace( TQRegExp( memCheckParam ), "" ); + myParams = myParams.replace( TQRegExp( leakCheckParam ), "" ); + myParams = myParams.replace( TQRegExp( reachableParam ), "" ); + myParams = myParams.replace( TQRegExp( childrenParam ), "" ); myParams = myParams.stripWhiteSpace(); w->valParamEdit->setText( myParams ); } -QString ValgrindDialog::ctExecutable() const +TQString ValgrindDialog::ctExecutable() const { return w->ctExecutableEdit->url(); } -void ValgrindDialog::setCtExecutable( const QString& ce ) +void ValgrindDialog::setCtExecutable( const TQString& ce ) { - QString vUrl = ce; + TQString vUrl = ce; if ( vUrl.isEmpty() ) { vUrl = KStandardDirs::findExe( "valgrind" ); } @@ -146,18 +146,18 @@ void ValgrindDialog::setCtExecutable( const QString& ce ) } } -QString ValgrindDialog::ctParams() const +TQString ValgrindDialog::ctParams() const { - QString params = w->ctParamEdit->text(); + TQString params = w->ctParamEdit->text(); if ( w->ctChildrenBox->isChecked() ) params += " " + childrenParam; return params; } -void ValgrindDialog::setCtParams( const QString& params ) +void ValgrindDialog::setCtParams( const TQString& params ) { - QString myParams = params; + TQString myParams = params; //force --tool=callgrind if no params are given if (myParams.isEmpty()) myParams = "--tool=callgrind"; @@ -165,19 +165,19 @@ void ValgrindDialog::setCtParams( const QString& params ) w->ctChildrenBox->setChecked( true ); w->init(); - myParams = myParams.replace( QRegExp( childrenParam ), "" ); + myParams = myParams.replace( TQRegExp( childrenParam ), "" ); myParams = myParams.stripWhiteSpace(); w->ctParamEdit->setText( myParams ); } -QString ValgrindDialog::kcExecutable( ) const +TQString ValgrindDialog::kcExecutable( ) const { return w->kcExecutableEdit->url(); } -void ValgrindDialog::setKcExecutable( const QString& ke ) +void ValgrindDialog::setKcExecutable( const TQString& ke ) { - QString vUrl = ke; + TQString vUrl = ke; if ( vUrl.isEmpty() ) { vUrl = KStandardDirs::findExe( "kcachegrind" ); } diff --git a/parts/valgrind/valgrind_dialog.h b/parts/valgrind/valgrind_dialog.h index 41c25afc..a57d4529 100644 --- a/parts/valgrind/valgrind_dialog.h +++ b/parts/valgrind/valgrind_dialog.h @@ -17,36 +17,36 @@ class ValgrindDialog : public KDialogBase public: enum Type { Memcheck = 0, Calltree = 1 }; - ValgrindDialog( Type type, QWidget* parent = 0 ); + ValgrindDialog( Type type, TQWidget* parent = 0 ); ~ValgrindDialog(); // the app to check - QString executableName() const; - void setExecutable( const QString& url ); + TQString executableName() const; + void setExecutable( const TQString& url ); // command line parameters for the app - QString parameters() const; - void setParameters( const QString& params ); + TQString parameters() const; + void setParameters( const TQString& params ); // name and/or path to the valgrind executable - QString valExecutable() const; - void setValExecutable( const QString& ve ); + TQString valExecutable() const; + void setValExecutable( const TQString& ve ); // command line parameters for valgrind - QString valParams() const; - void setValParams( const QString& params ); + TQString valParams() const; + void setValParams( const TQString& params ); // name and/or path to the calltree executable - QString ctExecutable() const; - void setCtExecutable( const QString& ce ); + TQString ctExecutable() const; + void setCtExecutable( const TQString& ce ); // command line parameters for calltree - QString ctParams() const; - void setCtParams( const QString& params ); + TQString ctParams() const; + void setCtParams( const TQString& params ); // name and/or path to the kcachegrind executable - QString kcExecutable() const; - void setKcExecutable( const QString& ke ); + TQString kcExecutable() const; + void setKcExecutable( const TQString& ke ); protected: bool isNewValgrindVersion() const; diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp index 868faf28..801d1c2a 100644 --- a/parts/valgrind/valgrind_part.cpp +++ b/parts/valgrind/valgrind_part.cpp @@ -1,8 +1,8 @@ #include "valgrind_part.h" -#include <qwhatsthis.h> -#include <qregexp.h> -#include <qfile.h> +#include <tqwhatsthis.h> +#include <tqregexp.h> +#include <tqfile.h> #include <kiconloader.h> #include <klocale.h> @@ -26,29 +26,29 @@ typedef KDevGenericFactory<ValgrindPart> ValgrindFactory; static const KDevPluginInfo data("kdevvalgrind"); K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( data ) ) -ValgrindPart::ValgrindPart( QObject *parent, const char *name, const QStringList& ) +ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringList& ) : KDevPlugin( &data, parent, name ? name : "ValgrindPart" ) { setInstance( ValgrindFactory::instance() ); setXMLFile( "kdevpart_valgrind.rc" ); proc = new KShellProcess(); - connect( proc, SIGNAL(receivedStdout( KProcess*, char*, int )), - this, SLOT(receivedStdout( KProcess*, char*, int )) ); - connect( proc, SIGNAL(receivedStderr( KProcess*, char*, int )), - this, SLOT(receivedStderr( KProcess*, char*, int )) ); - connect( proc, SIGNAL(processExited( KProcess* )), - this, SLOT(processExited( KProcess* )) ); - connect( core(), SIGNAL(stopButtonClicked(KDevPlugin*)), - this, SLOT(slotStopButtonClicked(KDevPlugin*)) ); - connect( core(), SIGNAL(projectOpened()), - this, SLOT(projectOpened()) ); + connect( proc, TQT_SIGNAL(receivedStdout( KProcess*, char*, int )), + this, TQT_SLOT(receivedStdout( KProcess*, char*, int )) ); + connect( proc, TQT_SIGNAL(receivedStderr( KProcess*, char*, int )), + this, TQT_SLOT(receivedStderr( KProcess*, char*, int )) ); + connect( proc, TQT_SIGNAL(processExited( KProcess* )), + this, TQT_SLOT(processExited( KProcess* )) ); + connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect( core(), TQT_SIGNAL(projectOpened()), + this, TQT_SLOT(projectOpened()) ); m_widget = new ValgrindWidget( this ); m_widget->setIcon( SmallIcon("fork") ); m_widget->setCaption(i18n("Valgrind Output")); - QWhatsThis::add( m_widget, i18n( "<b>Valgrind</b><p>Shows the output of the valgrind. Valgrind detects<br>" + TQWhatsThis::add( m_widget, i18n( "<b>Valgrind</b><p>Shows the output of the valgrind. Valgrind detects<br>" "use of uninitialized memory<br>" "reading/writing memory after it has been free'd<br>" "reading/writing off the end of malloc'd blocks<br>" @@ -59,12 +59,12 @@ ValgrindPart::ValgrindPart( QObject *parent, const char *name, const QStringList "some abuses of the POSIX pthread API." ) ); KAction* action = new KAction( i18n("&Valgrind Memory Leak Check"), 0, this, - SLOT(slotExecValgrind()), actionCollection(), "tools_valgrind" ); + TQT_SLOT(slotExecValgrind()), actionCollection(), "tools_valgrind" ); action->setToolTip(i18n("Valgrind memory leak check")); action->setWhatsThis(i18n("<b>Valgrind memory leak check</b><p>Runs Valgrind - a tool to help you find memory-management problems in your programs.")); action = new KAction( i18n("P&rofile with KCachegrind"), 0, this, - SLOT(slotExecCalltree()), actionCollection(), "tools_calltree" ); + TQT_SLOT(slotExecCalltree()), actionCollection(), "tools_calltree" ); action->setToolTip(i18n("Profile with KCachegrind")); action->setWhatsThis(i18n("<b>Profile with KCachegrind</b><p>Runs your program in calltree and then displays profiler information in KCachegrind.")); @@ -87,11 +87,11 @@ void ValgrindPart::projectOpened() void ValgrindPart::loadOutput() { - QString fName = KFileDialog::getOpenFileName(QString::null, "*", 0, i18n("Open Valgrind Output")); + TQString fName = KFileDialog::getOpenFileName(TQString::null, "*", 0, i18n("Open Valgrind Output")); if ( fName.isEmpty() ) return; - QFile f( fName ); + TQFile f( fName ); if ( !f.open( IO_ReadOnly ) ) { KMessageBox::sorry( 0, i18n("Could not open valgrind output: %1").arg(fName) ); return; @@ -100,7 +100,7 @@ void ValgrindPart::loadOutput() clear(); getActiveFiles(); - QTextStream stream( &f ); + TQTextStream stream( &f ); while ( !stream.atEnd() ) { receivedString( stream.readLine() + "\n" ); } @@ -111,10 +111,10 @@ void ValgrindPart::getActiveFiles() { activeFiles.clear(); if ( project() ) { - QStringList projectFiles = project()->allFiles(); - QString projectDirectory = project()->projectDirectory(); + TQStringList projectFiles = project()->allFiles(); + TQString projectDirectory = project()->projectDirectory(); KURL url; - for ( QStringList::Iterator it = projectFiles.begin(); it != projectFiles.end(); ++it ) { + for ( TQStringList::Iterator it = projectFiles.begin(); it != projectFiles.end(); ++it ) { KURL url( projectDirectory + "/" + (*it) ); url.cleanPath( true ); activeFiles += url.path(); @@ -123,13 +123,13 @@ void ValgrindPart::getActiveFiles() } } -static void guessActiveItem( ValgrindItem& item, const QStringList activeFiles ) +static void guessActiveItem( ValgrindItem& item, const TQStringList activeFiles ) { if ( activeFiles.isEmpty() && item.backtrace().isEmpty() ) return; for ( ValgrindItem::BacktraceList::Iterator it = item.backtrace().begin(); it != item.backtrace().end(); ++it ) { // active: first line of backtrace that lies in project source file - for ( QStringList::ConstIterator it2 = activeFiles.begin(); it2 != activeFiles.end(); ++it2 ) { + for ( TQStringList::ConstIterator it2 = activeFiles.begin(); it2 != activeFiles.end(); ++it2 ) { if ( (*it).url() == (*it2) ) { (*it).setHighlighted( true ); return; @@ -138,7 +138,7 @@ static void guessActiveItem( ValgrindItem& item, const QStringList activeFiles ) } } -void ValgrindPart::appendMessage( const QString& message ) +void ValgrindPart::appendMessage( const TQString& message ) { if ( message.isEmpty() ) return; @@ -162,7 +162,7 @@ void ValgrindPart::slotExecValgrind() kcInfo.runKc = false; _lastValExec = dlg->valExecutable(); _lastValParams = dlg->valParams(); - if ( dlg->exec() == QDialog::Accepted ) { + if ( dlg->exec() == TQDialog::Accepted ) { runValgrind( dlg->executableName(), dlg->parameters(), dlg->valExecutable(), dlg->valParams() ); } } @@ -182,7 +182,7 @@ void ValgrindPart::slotExecCalltree() kcInfo.runKc = true; kcInfo.kcPath = dlg->kcExecutable(); // kcInfo.kcWorkDir = KURL(dlg->executableName()).directory(); - if ( dlg->exec() == QDialog::Accepted ) { + if ( dlg->exec() == TQDialog::Accepted ) { runValgrind( dlg->executableName(), dlg->parameters(), dlg->ctExecutable(), dlg->ctParams() ); } _lastKcExec = dlg->kcExecutable(); @@ -206,12 +206,12 @@ void ValgrindPart::slotStopButtonClicked( KDevPlugin* which ) void ValgrindPart::clear() { m_widget->clear(); - currentMessage = QString::null; + currentMessage = TQString::null; currentPid = -1; - lastPiece = QString::null; + lastPiece = TQString::null; } -void ValgrindPart::runValgrind( const QString& exec, const QString& params, const QString& valExec, const QString& valParams ) +void ValgrindPart::runValgrind( const TQString& exec, const TQString& params, const TQString& valExec, const TQString& valParams ) { if ( proc->isRunning() ) { KMessageBox::sorry( 0, i18n( "There is already an instance of valgrind running." ) ); @@ -230,11 +230,11 @@ void ValgrindPart::runValgrind( const QString& exec, const QString& params, cons if (project()) run_envvars = project()->runEnvironmentVars(); - QStringList envVarList; + TQStringList envVarList; DomUtil::PairList::ConstIterator it; for (it = run_envvars.begin(); it != run_envvars.end(); ++it) { - envVarList << QString("%1=\"%2\" ").arg((*it).first).arg((*it).second); + envVarList << TQString("%1=\"%2\" ").arg((*it).first).arg((*it).second); } *proc << envVarList.join("") << valExec << valParams << exec << params; @@ -248,20 +248,20 @@ void ValgrindPart::runValgrind( const QString& exec, const QString& params, cons void ValgrindPart::receivedStdout( KProcess*, char* /* msg */, int /* len */ ) { - //kdDebug() << "got StdOut: " <<QString::fromLocal8Bit( msg, len ) << endl; + //kdDebug() << "got StdOut: " <<TQString::fromLocal8Bit( msg, len ) << endl; } void ValgrindPart::receivedStderr( KProcess*, char* msg, int len ) { - receivedString( QString::fromLocal8Bit( msg, len ) ); + receivedString( TQString::fromLocal8Bit( msg, len ) ); } -void ValgrindPart::receivedString( const QString& str ) +void ValgrindPart::receivedString( const TQString& str ) { - QString rmsg = lastPiece + str; - QStringList lines = QStringList::split( "\n", rmsg ); + TQString rmsg = lastPiece + str; + TQStringList lines = TQStringList::split( "\n", rmsg ); -// kdDebug() << "got: " << QString::fromLocal8Bit( msg, len ) << endl; +// kdDebug() << "got: " << TQString::fromLocal8Bit( msg, len ) << endl; if ( !rmsg.endsWith( "\n" ) ) { // the last message is trucated, we'll receive @@ -269,16 +269,16 @@ void ValgrindPart::receivedString( const QString& str ) lastPiece = lines.back(); lines.pop_back(); } else { - lastPiece = QString::null; + lastPiece = TQString::null; } appendMessages( lines ); } -void ValgrindPart::appendMessages( const QStringList& lines ) +void ValgrindPart::appendMessages( const TQStringList& lines ) { - QRegExp valRe( "==(\\d+)== (.*)" ); + TQRegExp valRe( "==(\\d+)== (.*)" ); - for ( QStringList::ConstIterator it = lines.begin(); it != lines.end(); ++it ) { + for ( TQStringList::ConstIterator it = lines.begin(); it != lines.end(); ++it ) { if ( valRe.search( *it ) < 0 ) continue; @@ -286,7 +286,7 @@ void ValgrindPart::appendMessages( const QStringList& lines ) if ( valRe.cap( 2 ).isEmpty() ) { appendMessage( currentMessage ); - currentMessage = QString::null; + currentMessage = TQString::null; } else if ( cPid != currentPid ) { appendMessage( currentMessage ); currentMessage = *it; @@ -303,8 +303,8 @@ void ValgrindPart::processExited( KProcess* p ) { if ( p == proc ) { appendMessage( currentMessage + lastPiece ); - currentMessage = QString::null; - lastPiece = QString::null; + currentMessage = TQString::null; + lastPiece = TQString::null; core()->running( this, false ); if (kcInfo.runKc) @@ -312,49 +312,49 @@ void ValgrindPart::processExited( KProcess* p ) KProcess *kcProc = new KProcess; // kcProc->setWorkingDirectory(kcInfo.kcWorkDir); *kcProc << kcInfo.kcPath; - *kcProc << QString("callgrind.out.%1").arg(p->pid()); + *kcProc << TQString("callgrind.out.%1").arg(p->pid()); kcProc->start(KProcess::DontCare); } } } -void ValgrindPart::restorePartialProjectSession( const QDomElement* el ) +void ValgrindPart::restorePartialProjectSession( const TQDomElement* el ) { - QDomElement execElem = el->namedItem( "executable" ).toElement(); + TQDomElement execElem = el->namedItem( "executable" ).toElement(); _lastExec = execElem.attribute( "path", "" ); _lastParams = execElem.attribute( "params", "" ); - QDomElement valElem = el->namedItem( "valgrind" ).toElement(); + TQDomElement valElem = el->namedItem( "valgrind" ).toElement(); _lastValExec = valElem.attribute( "path", "" ); _lastValParams = valElem.attribute( "params", "" ); - QDomElement ctElem = el->namedItem( "calltree" ).toElement(); + TQDomElement ctElem = el->namedItem( "calltree" ).toElement(); _lastCtExec = ctElem.attribute( "path", "" ); _lastCtParams = ctElem.attribute( "params", "" ); - QDomElement kcElem = el->namedItem( "kcachegrind" ).toElement(); + TQDomElement kcElem = el->namedItem( "kcachegrind" ).toElement(); _lastKcExec = kcElem.attribute( "path", "" ); } -void ValgrindPart::savePartialProjectSession( QDomElement* el ) +void ValgrindPart::savePartialProjectSession( TQDomElement* el ) { - QDomDocument domDoc = el->ownerDocument(); + TQDomDocument domDoc = el->ownerDocument(); if ( domDoc.isNull() ) return; - QDomElement execElem = domDoc.createElement( "executable" ); + TQDomElement execElem = domDoc.createElement( "executable" ); execElem.setAttribute( "path", _lastExec ); execElem.setAttribute( "params", _lastParams ); - QDomElement valElem = domDoc.createElement( "valgrind" ); + TQDomElement valElem = domDoc.createElement( "valgrind" ); valElem.setAttribute( "path", _lastValExec ); valElem.setAttribute( "params", _lastValParams ); - QDomElement ctElem = domDoc.createElement( "calltree" ); + TQDomElement ctElem = domDoc.createElement( "calltree" ); ctElem.setAttribute( "path", _lastCtExec ); ctElem.setAttribute( "params", _lastCtParams ); - QDomElement kcElem = domDoc.createElement( "kcachegrind" ); + TQDomElement kcElem = domDoc.createElement( "kcachegrind" ); kcElem.setAttribute( "path", _lastKcExec ); el->appendChild( execElem ); diff --git a/parts/valgrind/valgrind_part.h b/parts/valgrind/valgrind_part.h index 097eb8f8..6453dd8f 100644 --- a/parts/valgrind/valgrind_part.h +++ b/parts/valgrind/valgrind_part.h @@ -5,9 +5,9 @@ #ifndef __KDEVPART_VALGRIND_H__ #define __KDEVPART_VALGRIND_H__ -#include <qguardedptr.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqguardedptr.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <kdevplugin.h> class ValgrindWidget; @@ -18,13 +18,13 @@ class ValgrindPart : public KDevPlugin Q_OBJECT public: - ValgrindPart( QObject *parent, const char *name, const QStringList & ); + ValgrindPart( TQObject *parent, const char *name, const TQStringList & ); ~ValgrindPart(); - void runValgrind( const QString& exec, const QString& parameters, const QString& valExec, const QString& valParameters ); + void runValgrind( const TQString& exec, const TQString& parameters, const TQString& valExec, const TQString& valParameters ); - void savePartialProjectSession( QDomElement* el ); - void restorePartialProjectSession( const QDomElement* el ); + void savePartialProjectSession( TQDomElement* el ); + void restorePartialProjectSession( const TQDomElement* el ); private slots: void slotExecValgrind(); @@ -39,22 +39,22 @@ private slots: private: void getActiveFiles(); - void appendMessage( const QString& message ); - void appendMessages( const QStringList& lines ); - void receivedString( const QString& str ); + void appendMessage( const TQString& message ); + void appendMessages( const TQStringList& lines ); + void receivedString( const TQString& str ); void clear(); - QString _lastExec, _lastParams, _lastValExec, _lastValParams, + TQString _lastExec, _lastParams, _lastValExec, _lastValParams, _lastCtExec, _lastCtParams, _lastKcExec; KProcess* proc; - QString currentMessage; - QString lastPiece; - QStringList activeFiles; + TQString currentMessage; + TQString lastPiece; + TQStringList activeFiles; int currentPid; - QGuardedPtr<ValgrindWidget> m_widget; + TQGuardedPtr<ValgrindWidget> m_widget; struct { bool runKc; - QString kcPath; -// QString kcWorkDir; + TQString kcPath; +// TQString kcWorkDir; } kcInfo; }; diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp index 356d97bf..39c51094 100644 --- a/parts/valgrind/valgrind_widget.cpp +++ b/parts/valgrind/valgrind_widget.cpp @@ -1,6 +1,6 @@ -#include <qlayout.h> -#include <qpainter.h> -#include <qpopupmenu.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqpopupmenu.h> #include <kparts/part.h> #include <klibloader.h> @@ -24,16 +24,16 @@ class ValListViewItem: public QListViewItem { public: - ValListViewItem( QListView* parent, int key, int pid, const QString& message ): - QListViewItem( parent, QString::number( key ), QString::number( pid ), message ), + ValListViewItem( TQListView* parent, int key, int pid, const TQString& message ): + TQListViewItem( parent, TQString::number( key ), TQString::number( pid ), message ), _key( key ), _pid ( pid ), backtrace( false ), _line( -1 ), _active( false ) {} - ValListViewItem( ValListViewItem* parent, int key, int pid, const QString& message, const QString& filename, int line, bool active ): - QListViewItem( parent, QString::number( key ), QString::null, message ), + ValListViewItem( ValListViewItem* parent, int key, int pid, const TQString& message, const TQString& filename, int line, bool active ): + TQListViewItem( parent, TQString::number( key ), TQString::null, message ), _key( key ), _pid( pid ), backtrace( true ), _filename( filename ), _line( line ), _active( active ) { if ( parent->_pid != _pid && _pid > 0 ) - setText( 1, QString::number( _pid ) ); + setText( 1, TQString::number( _pid ) ); } virtual ~ValListViewItem(); @@ -48,39 +48,39 @@ public: return 0; } - int compare( QListViewItem* i, int col, bool ascending ) const + int compare( TQListViewItem* i, int col, bool ascending ) const { if ( !i || i->rtti() != VALLISTVIEWITEMRTTI ) - return QListViewItem::compare( i, col, ascending ); + return TQListViewItem::compare( i, col, ascending ); switch ( col ) { case 0 : return intCompare( ((ValListViewItem*)i)->_key, _key ); case 1 : return intCompare( ((ValListViewItem*)i)->_pid, _pid ); - default: return QListViewItem::compare( i, col, ascending ); + default: return TQListViewItem::compare( i, col, ascending ); } } - void paintCell( QPainter* p, const QColorGroup& cg, int column, int width, int align ) + void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align ) { if ( _active ) { - QFont fnt = p->font(); + TQFont fnt = p->font(); fnt.setBold( true ); p->setFont( fnt ); } - QListViewItem::paintCell( p, cg, column, width, align ); + TQListViewItem::paintCell( p, cg, column, width, align ); } int rtti() const { return VALLISTVIEWITEMRTTI; } - QString fileName() const { return _filename; } + TQString fileName() const { return _filename; } int line() const { return _line; } - QString message() const { return text( 2 ); } + TQString message() const { return text( 2 ); } bool isHighlighted() const { return _active; } private: int _key; int _pid; bool backtrace; - QString _filename; + TQString _filename; int _line; bool _active; }; @@ -88,9 +88,9 @@ private: ValListViewItem::~ValListViewItem() {} ValgrindWidget::ValgrindWidget( ValgrindPart *part ) - : QWidget(0, "valgrind widget"), _part( part ) + : TQWidget(0, "valgrind widget"), _part( part ) { - QVBoxLayout* vbl = new QVBoxLayout( this ); + TQVBoxLayout* vbl = new TQVBoxLayout( this ); lv = new KListView( this ); lv->addColumn( i18n( "No." ) ); lv->addColumn( i18n( "Thread" ) ); @@ -100,18 +100,18 @@ ValgrindWidget::ValgrindWidget( ValgrindPart *part ) lv->setAllColumnsShowFocus( true ); vbl->addWidget( lv ); - popup = new QPopupMenu( lv, "valPopup" ); - popup->insertItem( i18n( "&Open Valgrind Output..." ), _part, SLOT(loadOutput()), 0, 0 ); + popup = new TQPopupMenu( lv, "valPopup" ); + popup->insertItem( i18n( "&Open Valgrind Output..." ), _part, TQT_SLOT(loadOutput()), 0, 0 ); popup->insertSeparator(); - popup->insertItem( i18n( "Expand All Items" ), this, SLOT(expandAll()), 0, 2 ); - popup->insertItem( i18n( "Collapse All Items" ), this, SLOT(collapseAll()), 0, 3 ); - - connect( popup, SIGNAL(aboutToShow()), - this, SLOT(aboutToShowPopup()) ); - connect( lv, SIGNAL(executed(QListViewItem*)), - this, SLOT(executed(QListViewItem*)) ); - connect( lv, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(slotContextMenu(KListView*, QListViewItem*, const QPoint&)) ); + popup->insertItem( i18n( "Expand All Items" ), this, TQT_SLOT(expandAll()), 0, 2 ); + popup->insertItem( i18n( "Collapse All Items" ), this, TQT_SLOT(collapseAll()), 0, 3 ); + + connect( popup, TQT_SIGNAL(aboutToShow()), + this, TQT_SLOT(aboutToShowPopup()) ); + connect( lv, TQT_SIGNAL(executed(TQListViewItem*)), + this, TQT_SLOT(executed(TQListViewItem*)) ); + connect( lv, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); } @@ -127,8 +127,8 @@ void ValgrindWidget::clear() void ValgrindWidget::addMessage( const ValgrindItem& vi ) { - QStringList projectFiles; - QString projectDirectory; + TQStringList projectFiles; + TQString projectDirectory; ValListViewItem* lvi = new ValListViewItem( lv, msgNumber++, vi.pid(), vi.message() ); lvi->setMultiLinesEnabled( true ); @@ -142,7 +142,7 @@ void ValgrindWidget::addMessage( const ValgrindItem& vi ) } } -void ValgrindWidget::executed( QListViewItem* lvi ) +void ValgrindWidget::executed( TQListViewItem* lvi ) { Q_ASSERT( _part ); Q_ASSERT( _part->partController() ); @@ -155,7 +155,7 @@ void ValgrindWidget::executed( QListViewItem* lvi ) vli = (ValListViewItem*)lvi; } else if ( lvi->isExpandable() ) { // find the memleak position - QListViewItemIterator it( lv ); + TQListViewItemIterator it( lv ); while ( vli == 0 && it.current() ) { if ( it.current()->rtti() == VALLISTVIEWITEMRTTI && ((ValListViewItem*)it.current())->isHighlighted() ) vli = (ValListViewItem*)it.current(); @@ -171,7 +171,7 @@ void ValgrindWidget::executed( QListViewItem* lvi ) void ValgrindWidget::expandAll() { - QListViewItem* child = lv->firstChild(); + TQListViewItem* child = lv->firstChild(); while ( child ) { child->setOpen( true ); child = child->nextSibling(); @@ -180,7 +180,7 @@ void ValgrindWidget::expandAll() void ValgrindWidget::collapseAll() { - QListViewItem* child = lv->firstChild(); + TQListViewItem* child = lv->firstChild(); while ( child ) { child->setOpen( false ); child = child->nextSibling(); @@ -194,7 +194,7 @@ void ValgrindWidget::aboutToShowPopup() popup->setItemEnabled( 3, en ); } -void ValgrindWidget::slotContextMenu( KListView* l, QListViewItem* /*i*/, const QPoint& p ) +void ValgrindWidget::slotContextMenu( KListView* l, TQListViewItem* /*i*/, const TQPoint& p ) { if ( l != lv ) return; diff --git a/parts/valgrind/valgrind_widget.h b/parts/valgrind/valgrind_widget.h index 1777e183..e55e3a1c 100644 --- a/parts/valgrind/valgrind_widget.h +++ b/parts/valgrind/valgrind_widget.h @@ -1,9 +1,9 @@ #ifndef __VALGRIND_WIDGET_H__ #define __VALGRIND_WIDGET_H__ -#include <qwidget.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqwidget.h> +#include <tqstring.h> +#include <tqstringlist.h> #include "valgrinditem.h" @@ -24,11 +24,11 @@ public: void clear(); signals: - void jumpToFile( const QString& url, int line ); + void jumpToFile( const TQString& url, int line ); private slots: - void executed( QListViewItem* item ); - void slotContextMenu( KListView* l, QListViewItem* i, const QPoint& p ); + void executed( TQListViewItem* item ); + void slotContextMenu( KListView* l, TQListViewItem* i, const TQPoint& p ); void expandAll(); void collapseAll(); void aboutToShowPopup(); @@ -37,7 +37,7 @@ private: KListView* lv; int msgNumber; ValgrindPart* _part; - QPopupMenu* popup; + TQPopupMenu* popup; }; diff --git a/parts/valgrind/valgrinditem.cpp b/parts/valgrind/valgrinditem.cpp index 318254d3..0ae6f1e0 100644 --- a/parts/valgrind/valgrinditem.cpp +++ b/parts/valgrind/valgrinditem.cpp @@ -1,15 +1,15 @@ #include "valgrinditem.h" -#include <qregexp.h> -#include <qstringlist.h> +#include <tqregexp.h> +#include <tqstringlist.h> #include <kdebug.h> -ValgrindBacktraceItem::ValgrindBacktraceItem( const QString& rawOutput ): _rawOutput( rawOutput ), _highlight( false ) +ValgrindBacktraceItem::ValgrindBacktraceItem( const TQString& rawOutput ): _rawOutput( rawOutput ), _highlight( false ) { - QRegExp re1( "^==(\\d+)==\\s+(by|at) (0x[\\dABCDEF]+): (.*) \\((.*):(\\d+)\\)$" ); - QRegExp re2( "^==(\\d+)==\\s+(by|at) (0x[\\dABCDEF]+): (.*) \\(in (.*)\\)$" ); - QRegExp valRe( "==(\\d+)== (.*)" ); + TQRegExp re1( "^==(\\d+)==\\s+(by|at) (0x[\\dABCDEF]+): (.*) \\((.*):(\\d+)\\)$" ); + TQRegExp re2( "^==(\\d+)==\\s+(by|at) (0x[\\dABCDEF]+): (.*) \\(in (.*)\\)$" ); + TQRegExp valRe( "==(\\d+)== (.*)" ); if ( valRe.search( _rawOutput ) >= 0 ) _message = valRe.cap( 2 ); if ( re1.search( _rawOutput ) >= 0 ) { @@ -38,13 +38,13 @@ ValgrindBacktraceItem::~ValgrindBacktraceItem() } -ValgrindItem::ValgrindItem( const QString& message ): _pid(-1) +ValgrindItem::ValgrindItem( const TQString& message ): _pid(-1) { - QRegExp valRe( "==(\\d+)== (.*)" ); - QStringList lines = QStringList::split( "\n", message ); - QString curMsg; + TQRegExp valRe( "==(\\d+)== (.*)" ); + TQStringList lines = TQStringList::split( "\n", message ); + TQString curMsg; - for ( QStringList::ConstIterator it = lines.begin(); it != lines.end(); ++it ) { + for ( TQStringList::ConstIterator it = lines.begin(); it != lines.end(); ++it ) { if ( valRe.search( *it ) < 0 ) { kdDebug() << "ValgrindItem: got unrecognizable line '" << *it << "'" << endl; continue; // not of interest diff --git a/parts/valgrind/valgrinditem.h b/parts/valgrind/valgrinditem.h index 12784c42..14e3bb07 100644 --- a/parts/valgrind/valgrinditem.h +++ b/parts/valgrind/valgrinditem.h @@ -1,20 +1,20 @@ #ifndef _VALGRINDITEM_H_ #define _VALGRINDITEM_H_ -#include <qvaluelist.h> -#include <qstring.h> +#include <tqvaluelist.h> +#include <tqstring.h> class ValgrindBacktraceItem { public: enum Type { Unknown, SourceCode, Library }; - ValgrindBacktraceItem( const QString& rawOutput = QString::null ); + ValgrindBacktraceItem( const TQString& rawOutput = TQString::null ); ~ValgrindBacktraceItem(); - QString message() const { return _message; } - QString address() const { return _address; } - QString url() const { return _url; } - QString function() const { return _function; } + TQString message() const { return _message; } + TQString address() const { return _address; } + TQString url() const { return _url; } + TQString function() const { return _function; } int line() const { return _line; } int pid() const { return _pid; } Type type() const { return _type; } @@ -22,7 +22,7 @@ public: void setHighlighted( bool h ) { _highlight = h; } private: - QString _rawOutput, _address, _url, _function, _message; + TQString _rawOutput, _address, _url, _function, _message; int _line; int _pid; Type _type; @@ -32,18 +32,18 @@ private: class ValgrindItem { public: - ValgrindItem( const QString& message ); + ValgrindItem( const TQString& message ); ~ValgrindItem(); - typedef QValueList<ValgrindBacktraceItem> BacktraceList; + typedef TQValueList<ValgrindBacktraceItem> BacktraceList; BacktraceList& backtrace() { return _backtrace; } const BacktraceList& backtrace() const { return _backtrace; } - QString message() const { return _message; } + TQString message() const { return _message; } int pid() const { return _pid; } private: BacktraceList _backtrace; - QString _message; + TQString _message; int _pid; }; diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp index a13239a4..58ef9444 100644 --- a/parts/vcsmanager/vcsmanagerpart.cpp +++ b/parts/vcsmanager/vcsmanagerpart.cpp @@ -20,9 +20,9 @@ #include "vcsmanagerpart.h" -#include <qtimer.h> -#include <qpopupmenu.h> -#include <qwhatsthis.h> +#include <tqtimer.h> +#include <tqpopupmenu.h> +#include <tqwhatsthis.h> #include <klocale.h> #include <kaction.h> @@ -48,7 +48,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( data ) ) #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -VCSManagerPart::VCSManagerPart(QObject *parent, const char *name, const QStringList &/*args*/) +VCSManagerPart::VCSManagerPart(TQObject *parent, const char *name, const TQStringList &/*args*/) : KDevPlugin(&data, parent, name ? name : "VCSManagerPart") { kdDebug() << " ********** VCSManagerPart::VCSManagerPart() ************** " << endl; @@ -58,10 +58,10 @@ VCSManagerPart::VCSManagerPart(QObject *parent, const char *name, const QStringL m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createProjectConfigPage(i18n("Version Control"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )), - this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int))); + connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - connect(core(), SIGNAL(projectOpened()), this, SLOT(projectOpened())); + connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); } VCSManagerPart::~VCSManagerPart() @@ -69,14 +69,14 @@ VCSManagerPart::~VCSManagerPart() delete m_configProxy; } -void VCSManagerPart::insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo) +void VCSManagerPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo) { switch (pageNo) { case PROJECTDOC_OPTIONS: { VCSManagerProjectConfig *w = new VCSManagerProjectConfig(this, page, "project config"); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); break; } } @@ -91,11 +91,11 @@ void VCSManagerPart::loadVCSPlugin() { unloadVCSPlugin(); - QDomDocument & dom = *projectDom(); + TQDomDocument & dom = *projectDom(); m_vcsPluginName = DomUtil::readEntry( dom, "/general/versioncontrol" ).stripWhiteSpace(); if ( m_vcsPluginName.isEmpty() ) return; - QString constraint = QString( "DesktopEntryName=='%1'" ).arg( m_vcsPluginName ); + TQString constraint = TQString( "DesktopEntryName=='%1'" ).arg( m_vcsPluginName ); pluginController()->loadPlugin( "KDevelop/VersionControl", constraint ); } @@ -107,7 +107,7 @@ void VCSManagerPart::unloadVCSPlugin() } } -QString VCSManagerPart::vcsPlugin() +TQString VCSManagerPart::vcsPlugin() { return m_vcsPluginName; } diff --git a/parts/vcsmanager/vcsmanagerpart.h b/parts/vcsmanager/vcsmanagerpart.h index 9570944c..eabff928 100644 --- a/parts/vcsmanager/vcsmanagerpart.h +++ b/parts/vcsmanager/vcsmanagerpart.h @@ -23,7 +23,7 @@ #include <kdevplugin.h> -#include <qguardedptr.h> +#include <tqguardedptr.h> class QPopupMenu; class KAction; @@ -39,18 +39,18 @@ class VCSManagerPart: public KDevPlugin { Q_OBJECT public: - VCSManagerPart(QObject *parent, const char *name, const QStringList &args); + VCSManagerPart(TQObject *parent, const char *name, const TQStringList &args); ~VCSManagerPart(); - QString vcsPlugin(); + TQString vcsPlugin(); void loadVCSPlugin(); void unloadVCSPlugin(); private slots: - void insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo); + void insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo); void projectOpened(); private: - QString m_vcsPluginName; + TQString m_vcsPluginName; ConfigWidgetProxy *m_configProxy; }; diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.cpp b/parts/vcsmanager/vcsmanagerprojectconfig.cpp index a3dbeab2..9a081f3a 100644 --- a/parts/vcsmanager/vcsmanagerprojectconfig.cpp +++ b/parts/vcsmanager/vcsmanagerprojectconfig.cpp @@ -17,8 +17,8 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <qcombobox.h> -#include <qstring.h> +#include <tqcombobox.h> +#include <tqstring.h> #include <ktrader.h> #include <klocale.h> @@ -28,7 +28,7 @@ #include "vcsmanagerprojectconfig.h" #include "vcsmanagerpart.h" -VCSManagerProjectConfig::VCSManagerProjectConfig( VCSManagerPart *part, QWidget *parent, const char *name ) +VCSManagerProjectConfig::VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *parent, const char *name ) : VCSManagerProjectConfigBase( parent, name ), m_part( part ) { setup(); @@ -36,9 +36,9 @@ VCSManagerProjectConfig::VCSManagerProjectConfig( VCSManagerPart *part, QWidget void VCSManagerProjectConfig::accept() { - QString vcsPluginName = *m_vcsPluginNames.at( vcsCombo->currentItem() ); + TQString vcsPluginName = *m_vcsPluginNames.at( vcsCombo->currentItem() ); - QDomDocument & dom = *m_part->projectDom(); + TQDomDocument & dom = *m_part->projectDom(); DomUtil::writeEntry( dom, "/general/versioncontrol", vcsPluginName ); m_part->loadVCSPlugin(); @@ -51,7 +51,7 @@ void VCSManagerProjectConfig::setup( ) int current = 0; - QString constraint = QString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION); + TQString constraint = TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION); KTrader::OfferList offers = KTrader::self()->query("KDevelop/VersionControl", constraint ); KTrader::OfferList::const_iterator it = offers.begin(); for ( int i = 1; it != offers.end(); ++it, ++i ) diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.h b/parts/vcsmanager/vcsmanagerprojectconfig.h index 50db9ce7..c452ac41 100644 --- a/parts/vcsmanager/vcsmanagerprojectconfig.h +++ b/parts/vcsmanager/vcsmanagerprojectconfig.h @@ -30,7 +30,7 @@ class VCSManagerProjectConfig: public VCSManagerProjectConfigBase { Q_OBJECT public: - VCSManagerProjectConfig( VCSManagerPart *part, QWidget *parent = 0, const char *name = 0); + VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); @@ -39,7 +39,7 @@ private: void setup(); VCSManagerPart * m_part; - QStringList m_vcsPluginNames; + TQStringList m_vcsPluginNames; }; #endif |