diff options
Diffstat (limited to 'kate')
60 files changed, 622 insertions, 583 deletions
diff --git a/kate/cppsymbolviewer/cpp_parser.cpp b/kate/cppsymbolviewer/cpp_parser.cpp index b666983..c99d455 100644 --- a/kate/cppsymbolviewer/cpp_parser.cpp +++ b/kate/cppsymbolviewer/cpp_parser.cpp @@ -3,7 +3,7 @@ ------------------- begin : Apr 2 2003 author : 2003 Massimo Callegari - email : [email protected] + email : [email protected] ***************************************************************************/ /*************************************************************************** * * @@ -67,21 +67,21 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) cl = cl.stripWhiteSpace(); func_close = 0; if(cl.at(0) == '/' && cl.at(1) == '/') continue; - if(cl.find("/*") == 0 && (cl.find("*/") == ((signed)cl.length() - 2)) && graph == 0) continue; // workaround :( - if(cl.find("/*") >= 0 && graph == 0) comment = 1; - if(cl.find("*/") >= 0 && graph == 0) comment = 0; - if(cl.find("#") >= 0 && graph == 0 ) macro = 1; + if(cl.tqfind("/*") == 0 && (cl.tqfind("*/") == ((signed)cl.length() - 2)) && graph == 0) continue; // workaround :( + if(cl.tqfind("/*") >= 0 && graph == 0) comment = 1; + if(cl.tqfind("*/") >= 0 && graph == 0) comment = 0; + if(cl.tqfind("#") >= 0 && graph == 0 ) macro = 1; if (comment != 1) { /* *********************** MACRO PARSING *****************************/ if(macro == 1) { - //macro_pos = cl.find("#"); + //macro_pos = cl.tqfind("#"); for (j = 0; j < cl.length(); j++) { if(cl.at(j)=='/' && cl.at(j+1)=='/') { macro = 4; break; } - if( (uint)cl.find("define") == j && - !((uint)cl.find("defined") == j)) + if( (uint)cl.tqfind("define") == j && + !((uint)cl.tqfind("defined") == j)) { macro = 2; j += 6; // skip the word "define" @@ -99,7 +99,7 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) if(j == cl.length() && macro == 1) macro = 0; if(macro == 4) { - //stripped.replace(0x9, " "); + //stripped.tqreplace(0x9, " "); stripped = stripped.stripWhiteSpace(); if (macro_on == true) { @@ -129,7 +129,7 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) /* ******************************************************************** */ - if ((cl.find("class") >= 0 && graph == 0 && block == 0)) + if ((cl.tqfind("class") >= 0 && graph == 0 && block == 0)) { mclass = 1; for (j = 0; j < cl.length(); j++) @@ -158,19 +158,19 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) } if (mclass == 3) { - if (cl.find('{') >= 0) + if (cl.tqfind('{') >= 0) { - cl = cl.right(cl.find('{')); + cl = cl.right(cl.tqfind('{')); mclass = 4; } } - if(cl.find("(") >= 0 && cl.at(0) != '#' && block == 0 && comment != 2) + if(cl.tqfind("(") >= 0 && cl.at(0) != '#' && block == 0 && comment != 2) { structure = false; block = 1; } - if((cl.find("typedef") >= 0 || cl.find("struct") >= 0) && + if((cl.tqfind("typedef") >= 0 || cl.tqfind("struct") >= 0) && graph == 0 && block == 0) { structure = true; block = 2; stripped = ""; } - //if(cl.find(";") >= 0 && graph == 0) + //if(cl.tqfind(";") >= 0 && graph == 0) // block = 0; if(block > 0 && mclass != 1 ) @@ -216,21 +216,21 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) break; } - if(cl.at(j)=='{' && structure == false && cl.find(";") < 0 || - cl.at(j)=='{' && structure == false && cl.find('}') > (int)j) + if(cl.at(j)=='{' && structure == false && cl.tqfind(";") < 0 || + cl.at(j)=='{' && structure == false && cl.tqfind('}') > (int)j) { - stripped.replace(0x9, " "); + stripped.tqreplace(0x9, " "); if(func_on == true) { if (types_on == false) { - while (stripped.find('(') >= 0) - stripped = stripped.left(stripped.find('(')); - while (stripped.find("::") >= 0) - stripped = stripped.mid(stripped.find("::") + 2); + while (stripped.tqfind('(') >= 0) + stripped = stripped.left(stripped.tqfind('(')); + while (stripped.tqfind("::") >= 0) + stripped = stripped.mid(stripped.tqfind("::") + 2); stripped = stripped.stripWhiteSpace(); - while (stripped.find(0x20) >= 0) - stripped = stripped.mid(stripped.find(0x20, 0) + 1); + while (stripped.tqfind(0x20) >= 0) + stripped = stripped.mid(stripped.tqfind(0x20, 0) + 1); } //kdDebug(13000)<<"Function -- Inserted: "<<stripped<<" at row: "<<tmpPos<<" mclass: "<<(uint)mclass<<endl; if (treeMode) @@ -290,9 +290,9 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) { if(cl.at(j) == ';') { - //stripped.replace(0x9, " "); + //stripped.tqreplace(0x9, " "); stripped.remove('{'); - stripped.replace('}', " "); + stripped.tqreplace('}', " "); if(struct_on == true) { if (treeMode) @@ -319,9 +319,9 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) } // BLOCK > 0 if (mclass == 4 && block == 0 && func_close == 0) { - if (cl.find('}') >= 0) + if (cl.tqfind('}') >= 0) { - cl = cl.right(cl.find('}')); + cl = cl.right(cl.tqfind('}')); mclass = 0; } } diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp index 9165878..5bf0906 100644 --- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp +++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp @@ -3,7 +3,7 @@ * ------------------- * begin : Apr 2 2003 * author : 2003 Massimo Callegari - * email : [email protected] + * email : [email protected] * * Changes: * Nov 09 2004 v.1.3 - For changelog please refer to KDE CVS @@ -133,7 +133,7 @@ void KatePluginSymbolViewerView::slotInsertSymbol() //connect(symbols, TQT_SIGNAL(resizeEvent(TQResizeEvent *)), this, TQT_SLOT(slotViewChanged(TQResizeEvent *))); m_Active = true; - //symbols->addColumn(i18n("Symbols"), symbols->parentWidget()->width()); + //symbols->addColumn(i18n("Symbols"), symbols->tqparentWidget()->width()); symbols->addColumn(i18n("Symbols")); symbols->addColumn(i18n("Position")); symbols->setColumnWidthMode(1, TQListView::Manual); @@ -192,7 +192,7 @@ void KatePluginSymbolViewerView::slotDocChanged() void KatePluginSymbolViewerView::slotViewChanged(TQResizeEvent *) { kdDebug(13000)<<"View changed !!!!"<<endl; - symbols->setColumnWidth(0, symbols->parentWidget()->width()); + symbols->setColumnWidth(0, symbols->tqparentWidget()->width()); } void KatePluginSymbolViewerView::slotShowContextMenu(TQListViewItem *, const TQPoint &p, int) @@ -241,8 +241,8 @@ void KatePluginSymbolViewerView::goToSymbol(TQListViewItem *it) kv->gotoLineNumber(it->text(1).toInt(NULL, 10)); } -KatePluginSymbolViewer::KatePluginSymbolViewer( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application*)parent, name ), +KatePluginSymbolViewer::KatePluginSymbolViewer( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application*)tqparent, name ), pConfig("katecppsymbolviewerpluginrc") { pConfig.setGroup("global"); @@ -307,8 +307,8 @@ void KatePluginSymbolViewer::applyConfig( KatePluginSymbolViewerConfigPage* p ) // BEGIN KatePluginSymbolViewerConfigPage KatePluginSymbolViewerConfigPage::KatePluginSymbolViewerConfigPage( - TQObject* /*parent*/ /*= 0L*/, TQWidget *parentWidget /*= 0L*/) - : Kate::PluginConfigPage( parentWidget ) + TQObject* /*tqparent*/ /*= 0L*/, TQWidget *tqparentWidget /*= 0L*/) + : Kate::PluginConfigPage( tqparentWidget ) { TQVBoxLayout* top = new TQVBoxLayout(this, 0, KDialogBase::spacingHint()); diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.h b/kate/cppsymbolviewer/plugin_katesymbolviewer.h index e8ac0e0..d247852 100644 --- a/kate/cppsymbolviewer/plugin_katesymbolviewer.h +++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.h @@ -3,7 +3,7 @@ ------------------- begin : Apr 2 2003 author : 2003 Massimo Callegari - email : [email protected] + email : [email protected] ***************************************************************************/ /*************************************************************************** @@ -46,6 +46,7 @@ class KatePluginSymbolViewerView : public TQObject, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: KatePluginSymbolViewerView (Kate::MainWindow *w); @@ -88,11 +89,12 @@ class KatePluginSymbolViewerView : public TQObject, public KXMLGUIClient class KatePluginSymbolViewerConfigPage : public Kate::PluginConfigPage { Q_OBJECT + TQ_OBJECT friend class KatePluginSymbolViewer; public: - KatePluginSymbolViewerConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L); + KatePluginSymbolViewerConfigPage (TQObject* tqparent = 0L, TQWidget *tqparentWidget = 0L); ~KatePluginSymbolViewerConfigPage (); /** @@ -123,9 +125,10 @@ class KatePluginSymbolViewerConfigPage : public Kate::PluginConfigPage class KatePluginSymbolViewer : public Kate::Plugin, Kate::PluginViewInterface, Kate::PluginConfigInterfaceExtension { Q_OBJECT + TQ_OBJECT public: - KatePluginSymbolViewer( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginSymbolViewer( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~KatePluginSymbolViewer(); void addView (Kate::MainWindow *win); diff --git a/kate/cppsymbolviewer/tcl_parser.cpp b/kate/cppsymbolviewer/tcl_parser.cpp index c2eae61..fca2a5d 100644 --- a/kate/cppsymbolviewer/tcl_parser.cpp +++ b/kate/cppsymbolviewer/tcl_parser.cpp @@ -3,7 +3,7 @@ ------------------- begin : Apr 2 2003 author : 2003 Massimo Callegari - email : [email protected] + email : [email protected] ***************************************************************************/ /*************************************************************************** * * @@ -80,8 +80,8 @@ void KatePluginSymbolViewerView::parseTclSymbols(void) { stripped = currline.right(currline.length() - 3); stripped = stripped.simplifyWhiteSpace(); - int fnd = stripped.find(' '); - //fnd = stripped.find(";"); + int fnd = stripped.tqfind(' '); + //fnd = stripped.tqfind(";"); if(fnd > 0) stripped = stripped.left(fnd); if (treeMode) diff --git a/kate/filelistloader/katefll_initplugin.cpp b/kate/filelistloader/katefll_initplugin.cpp index 8fb8061..5d70f46 100644 --- a/kate/filelistloader/katefll_initplugin.cpp +++ b/kate/filelistloader/katefll_initplugin.cpp @@ -30,8 +30,8 @@ K_EXPORT_COMPONENT_FACTORY( katefll_initplugin, KGenericFactory<InitPluginKateFileListLoader>( "katefll_loader" ) ) -InitPluginKateFileListLoader::InitPluginKateFileListLoader (TQObject * parent, const char *name, const TQStringList datalist) - :InitPlugin((Kate::Application*)parent,name) +InitPluginKateFileListLoader::InitPluginKateFileListLoader (TQObject * tqparent, const char *name, const TQStringList datalist) + :InitPlugin((Kate::Application*)tqparent,name) { } @@ -83,11 +83,11 @@ int InitPluginKateFileListLoader::initKate() updateInit(); disconnect(this,TQT_SIGNAL(updateInit()),pl,TQT_SLOT(updateInit())); -/* int id = pl->metaObject()->findSlot( TQT_SLOT(updateInit()) ); +/* int id = pl->tqmetaObject()->findSlot( TQT_SLOT(updateInit()) ); if ( id != -1 ) { kdDebug()<<"Action slot was found, it will be called now"<<endl; - QUObject o[ 1 ]; + TQUObject o[ 1 ]; mod->module->qt_invoke( id, o ); } */ } diff --git a/kate/filelistloader/katefll_initplugin.h b/kate/filelistloader/katefll_initplugin.h index 55ac1a9..19a15d3 100644 --- a/kate/filelistloader/katefll_initplugin.h +++ b/kate/filelistloader/katefll_initplugin.h @@ -31,6 +31,7 @@ class InitPluginKateFileListLoader : public Kate::InitPlugin { Q_OBJECT + TQ_OBJECT public: InitPluginKateFileListLoader (TQObject * =0, const char * =0, const TQStringList =TQStringList()); diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp index b10464f..0c50e6b 100644 --- a/kate/filelistloader/katefll_plugin.cpp +++ b/kate/filelistloader/katefll_plugin.cpp @@ -42,8 +42,8 @@ class PluginView : public KXMLGUIClient KRecentFilesAction *recentFiles; }; -PluginKateFileListLoader::PluginKateFileListLoader (TQObject * parent, const char *name, const TQStringList) - : Plugin((Kate::Application*)parent,name), PluginViewInterface(), +PluginKateFileListLoader::PluginKateFileListLoader (TQObject * tqparent, const char *name, const TQStringList) + : Plugin((Kate::Application*)tqparent,name), PluginViewInterface(), m_config( new KConfig("katefilelistpluginrc") ) { m_config->setGroup("General"); @@ -133,7 +133,7 @@ void PluginKateFileListLoader::removeURLFromList(const KURL& url) void PluginKateFileListLoader::slotOpenList() { - KURL url = KFileDialog::getOpenURL(TQString::null, + KURL url = KFileDialog::getOpenURL(TQString(), "*.katefl|Kate File List (*.katefl)"); if (url.isValid()) // cancel pressed? slotOpenList(url); @@ -190,7 +190,7 @@ void PluginKateFileListLoader::slotSaveList() { /* if (m_oldInitURL!=application()->initPluginManager()->initScript()) { - switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Since the last time you saved the file list, Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").arg(m_saveURL.prettyURL()),TQString::null,KStdGuiItem::save(),KStdGuiItem::discard())) + switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Since the last time you saved the file list, Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").tqarg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard())) { case KMessageBox::Yes: save(); break; case KMessageBox::No: slotSaveListAs(); break; @@ -203,7 +203,7 @@ void PluginKateFileListLoader::slotSaveList() { /*if (m_saveURL!=application()->initPluginManager()->initScript()) { - switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").arg(m_saveURL.prettyURL()),TQString::null,KStdGuiItem::save(),KStdGuiItem::discard())) + switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").tqarg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard())) { case KMessageBox::Yes: save(); break; case KMessageBox::No: slotSaveListAs(); break; @@ -230,7 +230,7 @@ void PluginKateFileListLoader::save() void PluginKateFileListLoader::slotSaveListAs() { - KURL url=KFileDialog::getSaveURL(TQString::null,"*.katefl|Kate File List (*.katefl)"); + KURL url=KFileDialog::getSaveURL(TQString(),"*.katefl|Kate File List (*.katefl)"); if (url.isValid()) { m_oldInitURL="";//application()->initPluginManager()->initScript(); diff --git a/kate/filelistloader/katefll_plugin.h b/kate/filelistloader/katefll_plugin.h index e40f996..6a4553a 100644 --- a/kate/filelistloader/katefll_plugin.h +++ b/kate/filelistloader/katefll_plugin.h @@ -33,6 +33,7 @@ class PluginKateFileListLoader : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: PluginKateFileListLoader (TQObject * =0, const char * =0, const TQStringList =TQStringList()); diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp index 90b64c9..5d6649a 100644 --- a/kate/filetemplates/plugin/filetemplates.cpp +++ b/kate/filetemplates/plugin/filetemplates.cpp @@ -98,9 +98,9 @@ KatePluginFactory::~KatePluginFactory() delete s_instance; } -TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) +TQObject* KatePluginFactory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & ) { - return new KateFileTemplates( parent, name ); + return new KateFileTemplates( tqparent, name ); } KInstance* KatePluginFactory::s_instance = 0L; @@ -125,8 +125,8 @@ class TemplateInfo //END TemplateInfo //BEGIN KateFileTemplates -KateFileTemplates::KateFileTemplates( TQObject* parent, const char* name ) - : Kate::Plugin ( (Kate::Application*)parent, name ), +KateFileTemplates::KateFileTemplates( TQObject* tqparent, const char* name ) + : Kate::Plugin ( (Kate::Application*)tqparent, name ), m_actionCollection( new KActionCollection( this, "template_actions", new KInstance("kate") ) ) { // create actions, so that they are shared. @@ -192,7 +192,7 @@ void KateFileTemplates::updateTemplateDirs(const TQString &d) TQString fname = (*it).section( '/', -1 ); // skip if hidden - if ( hidden.contains( fname ) ) + if ( hidden.tqcontains( fname ) ) continue; // Read the first line of the file, to get the group/name @@ -284,7 +284,7 @@ TQStringList KateFileTemplates::groups() for ( uint i = 0; i < m_templates.count(); i++ ) { s = m_templates.at( i )->group; - if ( ! l.contains( s ) ) + if ( ! l.tqcontains( s ) ) l.append( s ); } @@ -303,7 +303,7 @@ void KateFileTemplates::refreshMenu( PluginView *v ) m_acRecentTemplates->plug( m ); m->insertSeparator(); - TQDict<TQPopupMenu> submenus; // ### QMAP + TQDict<TQPopupMenu> submenus; // ### TQMAP for ( uint i = 0; i < m_templates.count(); i++ ) { if ( ! submenus[ m_templates.at( i )->group ] ) @@ -332,7 +332,7 @@ void KateFileTemplates::refreshMenu( PluginView *v ) w.prepend( "<p>" ); if ( ! w.isEmpty() ) - submenus[m_templates.at( i )->group]->findItem( i )->setWhatsThis( w ); + submenus[m_templates.at( i )->group]->tqfindItem( i )->setWhatsThis( w ); } } @@ -348,7 +348,7 @@ void KateFileTemplates::slotAny() // get a URL and pass that to slotOpenTemplate TQString fn = KFileDialog::getOpenFileName( "katefiletemplate", - TQString::null, + TQString(), application()->activeMainWindow()->viewManager()->activeView(), i18n("Open as Template") ); if ( ! fn.isEmpty() ) @@ -381,7 +381,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) if ( ! file.open( IO_ReadOnly ) ) { KMessageBox::sorry( application()->activeMainWindow()->viewManager()->activeView(), - i18n("<qt>Error opening the file<br><strong>%1</strong><br>for reading. The document will not be created.</qt>").arg(filename), + i18n("<qt>Error opening the file<br><strong>%1</strong><br>for reading. The document will not be created.</qt>").tqarg(filename), i18n("Template Plugin"), 0 ); KIO::NetAccess::removeTempFile( tmpfile ); return; @@ -412,7 +412,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) if ( reName.search( tmp ) > -1 ) { docname = reName.cap( 1 ); - docname = docname.replace( "%N", "%1" ); + docname = docname.tqreplace( "%N", "%1" ); doneheader |= 1; } } @@ -458,7 +458,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) if ( ! isTemplate ) { - int d = filename.findRev('.'); + int d = filename.tqfindRev('.'); docname = i18n("Untitled %1"); if ( d > 0 ) docname += filename.mid( d ); } else if ( docname.isEmpty() ) @@ -467,8 +467,8 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) // check for other documents matching this naming scheme, // and do a count before chosing a name for this one TQString p = docname; - p.replace( "%1", "\\d+" ); - p.replace( ".", "\\." ); + p.tqreplace( "%1", "\\d+" ); + p.tqreplace( ".", "\\." ); p.prepend( "^" ); p.append( "$" ); TQRegExp reName( p ); @@ -478,8 +478,8 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) if ( ( reName.search ( application()->documentManager()->document( i )->docName() ) > -1 ) ) count++; - if ( docname.contains( "%1" ) ) - docname = docname.arg( count ); + if ( docname.tqcontains( "%1" ) ) + docname = docname.tqarg( count ); doc->setDocName( docname ); @@ -504,7 +504,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) } -TQWidget *KateFileTemplates::parentWindow() +TQWidget *KateFileTemplates::tqparentWindow() { return dynamic_cast<TQWidget*>(application()->activeMainWindow()); } @@ -523,7 +523,7 @@ TQWidget *KateFileTemplates::parentWindow() // and edit the file as she wants to... void KateFileTemplates::slotCreateTemplate() { - KateTemplateWizard w( parentWindow(), this ); + KateTemplateWizard w( tqparentWindow(), this ); w.exec(); updateTemplateDirs(); @@ -536,7 +536,7 @@ void KateFileTemplates::slotCreateTemplate() // * Set the URL to a writable one if required void KateFileTemplates::slotEditTemplate() { - KDialogBase dlg( parentWindow(), "templatemanager", false, i18n("Manage File Templates"), KDialogBase::Close); + KDialogBase dlg( tqparentWindow(), "templatemanager", false, i18n("Manage File Templates"), KDialogBase::Close); dlg.setMainWidget( new KateTemplateManager( this, &dlg ) ); dlg.exec(); } @@ -544,8 +544,8 @@ void KateFileTemplates::slotEditTemplate() //BEGIN KateTemplateInfoWidget // This widget can be used to change the data of a TemplateInfo object -KateTemplateInfoWidget::KateTemplateInfoWidget( TQWidget *parent, TemplateInfo *info, KateFileTemplates *kft ) - : TQWidget( parent ), +KateTemplateInfoWidget::KateTemplateInfoWidget( TQWidget *tqparent, TemplateInfo *info, KateFileTemplates *kft ) + : TQWidget( tqparent ), info( info ), kft( kft ) { @@ -578,7 +578,7 @@ KateTemplateInfoWidget::KateTemplateInfoWidget( TQWidget *parent, TemplateInfo * l->setBuddy( leDocumentName ); TQWhatsThis::add( leDocumentName, i18n("<p>This string will be used to set a name " "for the new document, to display in the title bar and file list.</p>" - "<p>If the string contains '%N', that will be replaced with a number " + "<p>If the string tqcontains '%N', that will be replaced with a number " "increasing with each similarly named file.</p><p> For example, if the " "Document Name is 'New shellscript (%N).sh', the first document will be " "named 'New shellscript (1).sh', the second 'New shellscipt (2).sh', and " @@ -659,8 +659,8 @@ void KateTemplateInfoWidget::slotHlSet( int id ) //BEGIN KateTemplateWizard // A simple wizard to help create a new template :-) -KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft ) - : KWizard( parent ), +KateTemplateWizard::KateTemplateWizard( TQWidget *tqparent, KateFileTemplates *kft ) + : KWizard( tqparent ), kft( kft ) { // Hide the help button for now @@ -687,7 +687,7 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft rb = new TQRadioButton( i18n("Use an existing file:"), page ); bgOrigin->insert( rb, 2 ); glo->addMultiCellWidget( rb, 3, 3, 1, 2 ); - int marg = rb->style().subRect( TQStyle::SR_RadioButtonIndicator, rb ).width(); + int marg = rb->tqstyle().subRect( TQStyle::SR_RadioButtonIndicator, rb ).width(); glo->addItem( new TQSpacerItem( marg, 1, TQSizePolicy::Fixed ), 4, 1 ); urOrigin = new KURLRequester( page ); glo->addWidget( urOrigin, 4, 2 ); @@ -733,7 +733,7 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft map[ "fullname" ] = ""; map[ "email" ] = ""; - KTextEditor::TemplateInterface::expandMacros( map, parent ); + KTextEditor::TemplateInterface::expandMacros( map, tqparent ); TQString sFullname = map["fullname"]; TQString sEmail = map["email"]; TQString _s = sFullname; @@ -795,12 +795,12 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft "edit the data in the KDE email information."), page ) ); cbRRealname = new TQCheckBox( i18n("Replace full name '%1' with the " - "'%{fullname}' macro").arg( sFullname ), page ); + "'%{fullname}' macro").tqarg( sFullname ), page ); cbRRealname->setEnabled( ! sFullname.isEmpty() ); lo->addWidget( cbRRealname ); cbREmail = new TQCheckBox( i18n("Replace email address '%1' with the " - "'%email' macro").arg( sEmail ), page); + "'%email' macro").tqarg( sEmail ), page); cbREmail->setEnabled( ! sEmail.isEmpty() ); lo->addWidget( cbREmail ); @@ -908,7 +908,7 @@ void KateTemplateWizard::accept() else suggestion = kti->leTemplate->text(); - suggestion.replace(" ", ""); + suggestion.tqreplace(" ", ""); if ( ! suggestion.endsWith(".katetemplate") ) suggestion.append(".katetemplate"); @@ -922,7 +922,7 @@ void KateTemplateWizard::accept() if ( KMessageBox::warningContinueCancel( this, i18n( "<p>The file <br><strong>'%1'</strong><br> already exists; if you " "do not want to overwrite it, change the template file name to " - "something else.").arg( templateUrl.prettyURL() ), + "something else.").tqarg( templateUrl.prettyURL() ), i18n("File Exists"), i18n("Overwrite") ) == KMessageBox::Cancel ) return; @@ -976,7 +976,7 @@ void KateTemplateWizard::accept() { KMessageBox::sorry( this, i18n( "<qt>Error opening the file<br><strong>%1</strong><br>for reading. " - "The document will not be created</qt>").arg(u.prettyURL()), + "The document will not be created</qt>").tqarg(u.prettyURL()), i18n("Template Plugin"), 0 ); KIO::NetAccess::removeTempFile( tmpfile ); @@ -1005,16 +1005,16 @@ void KateTemplateWizard::accept() { // 3) if the file is not already a template, escape any "%" and "^" in it, // and try do do some replacement of the authors username, name and email. - tmp.replace( TQRegExp("%(?=\\{[^}]+\\})"), "\\%" ); - tmp.replace( TQRegExp("\\$(?=\\{[^}]+\\})"), "\\$" ); - //tmp.replace( "^", "\\^" ); + tmp.tqreplace( TQRegExp("%(?=\\{[^}]+\\})"), "\\%" ); + tmp.tqreplace( TQRegExp("\\$(?=\\{[^}]+\\})"), "\\$" ); + //tmp.tqreplace( "^", "\\^" ); if ( cbRRealname->isChecked() && ! sFullname.isEmpty() ) - tmp.replace( sFullname, "%{realname}" ); + tmp.tqreplace( sFullname, "%{realname}" ); if ( cbREmail->isChecked() && ! sEmail.isEmpty() ) - tmp.replace( sEmail, "%{email}" ); + tmp.tqreplace( sEmail, "%{email}" ); } str += tmp; @@ -1055,7 +1055,7 @@ void KateTemplateWizard::accept() { KMessageBox::sorry( this, i18n( "Unable to save the template to '%1'.\n\nThe template will be opened, " - "so you can save it from the editor.").arg( templateUrl.prettyURL() ), + "so you can save it from the editor.").tqarg( templateUrl.prettyURL() ), i18n("Save Failed") ); kft->application()->activeMainWindow()->viewManager()->openURL( KURL() ); @@ -1072,8 +1072,8 @@ void KateTemplateWizard::accept() class KateTemplateItem : public KListViewItem { public: - KateTemplateItem( KListViewItem *parent, TemplateInfo *templateinfo ) - : KListViewItem( parent, templateinfo->tmplate ), templateinfo( templateinfo ) + KateTemplateItem( KListViewItem *tqparent, TemplateInfo *templateinfo ) + : KListViewItem( tqparent, templateinfo->tmplate ), templateinfo( templateinfo ) { } TemplateInfo *templateinfo; @@ -1083,7 +1083,7 @@ class KateTemplateItem : public KListViewItem //BEGIN KFTNewStuff class KFTNewStuff : public KNewStuff { public: - KFTNewStuff( const TQString &type, TQWidget *parent=0 ) : KNewStuff( type, parent ), m_win( parent ) {} + KFTNewStuff( const TQString &type, TQWidget *tqparent=0 ) : KNewStuff( type, tqparent ), m_win( tqparent ) {} ~KFTNewStuff() {} bool install( const TQString &/*filename*/ ) { return true; } bool createUploadFile( const TQString &/*filename*/ ) { return false; } @@ -1099,8 +1099,8 @@ class KFTNewStuff : public KNewStuff { //END KTNewStuff //BEGIN KateTemplateManager -KateTemplateManager::KateTemplateManager( KateFileTemplates *kft, TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +KateTemplateManager::KateTemplateManager( KateFileTemplates *kft, TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) , kft( kft ) { TQGridLayout *lo = new TQGridLayout( this, 2, 6 ); @@ -1146,7 +1146,7 @@ void KateTemplateManager::reload() { lvTemplates->clear(); - TQDict<KListViewItem> groupitems; // FIXME QMAP + TQDict<KListViewItem> groupitems; // FIXME TQMAP for ( uint i = 0; i < kft->templates().count(); i++ ) { if ( ! groupitems[ kft->templates().at( i )->group ] ) @@ -1216,7 +1216,7 @@ void KateTemplateManager::slotRemoveTemplate() // for this template, so the template is installable again. // ### This assumes that the knewstuff name is similar to the template name. kdDebug()<<"trying to remove knewstuff key '"<<item->templateinfo->tmplate<<"'"<<endl; - config->setGroup("KNewStuffStatus"); + config->setGroup("KNewStufftqStatus"); config->deleteEntry( item->templateinfo->tmplate ); @@ -1233,7 +1233,7 @@ void KateTemplateManager::slotUpload() if ( item ) { KFTNewStuff *ns = new KFTNewStuff( "katefiletemplates/template", this ); - ns->upload( item->templateinfo->filename, TQString::null ); + ns->upload( item->templateinfo->filename, TQString() ); } } @@ -1249,6 +1249,6 @@ void KateTemplateManager::slotDownload() //END KateTemplateManager -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; #include "filetemplates.moc" diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h index 11734d5..6bcffce 100644 --- a/kate/filetemplates/plugin/filetemplates.h +++ b/kate/filetemplates/plugin/filetemplates.h @@ -39,12 +39,13 @@ class KatePluginFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: KatePluginFactory(); virtual ~KatePluginFactory(); - virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; @@ -73,9 +74,10 @@ class KatePluginFactory : public KLibFactory class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - KateFileTemplates( TQObject* parent = 0, const char* name = 0 ); + KateFileTemplates( TQObject* tqparent = 0, const char* name = 0 ); virtual ~KateFileTemplates(); void addView (Kate::MainWindow *win); @@ -100,14 +102,14 @@ class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface /** * @return a a pointer to the active main window */ - TQWidget * parentWindow(); + TQWidget * tqparentWindow(); public slots: /** * Update the template collection by rereading the template * directories. Also updates the menu. */ - void updateTemplateDirs(const TQString &s=TQString::null); + void updateTemplateDirs(const TQString &s=TQString()); private slots: /** @@ -154,11 +156,12 @@ class TemplateInfo; /** * This widget provide a GUI for editing template properties. */ -class KateTemplateInfoWidget : public QWidget +class KateTemplateInfoWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KateTemplateInfoWidget( TQWidget *parent=0, TemplateInfo *info=0, KateFileTemplates *kft=0 ); + KateTemplateInfoWidget( TQWidget *tqparent=0, TemplateInfo *info=0, KateFileTemplates *kft=0 ); ~KateTemplateInfoWidget() {} TemplateInfo *info; @@ -191,8 +194,9 @@ class KateTemplateWizard : public KWizard { friend class KateFileTemplates; Q_OBJECT + TQ_OBJECT public: - KateTemplateWizard( TQWidget* parent, KateFileTemplates *ktf ); + KateTemplateWizard( TQWidget* tqparent, KateFileTemplates *ktf ); ~KateTemplateWizard() {} public slots: @@ -227,11 +231,12 @@ class KateTemplateWizard : public KWizard class TQCheckBox *cbOpenTemplate; }; -class KateTemplateManager : public QWidget +class KateTemplateManager : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KateTemplateManager( KateFileTemplates *kft=0, TQWidget *parent=0, const char *name=0 ); + KateTemplateManager( KateFileTemplates *kft=0, TQWidget *tqparent=0, const char *name=0 ); ~KateTemplateManager() {} public slots: @@ -255,4 +260,4 @@ class KateTemplateManager : public QWidget }; #endif // _PLUGIN_KATE_FILETEMPLATES_H_ -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; diff --git a/kate/filetemplates/plugin/katetemplate.xml b/kate/filetemplates/plugin/katetemplate.xml index 0748481..78647d4 100644 --- a/kate/filetemplates/plugin/katetemplate.xml +++ b/kate/filetemplates/plugin/katetemplate.xml @@ -84,4 +84,4 @@ <keywords casesensitive="0"/> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> +<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; --> diff --git a/kate/filetemplates/templates/language.xml.katetemplate b/kate/filetemplates/templates/language.xml.katetemplate index 420ba84..65d677a 100644 --- a/kate/filetemplates/templates/language.xml.katetemplate +++ b/kate/filetemplates/templates/language.xml.katetemplate @@ -57,4 +57,4 @@ katetemplate: Description=This template will create the basics of a kate highlig --> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; indent-mode xml; --> +<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; indent-mode xml; --> diff --git a/kate/helloworld/plugin_katehelloworld.cpp b/kate/helloworld/plugin_katehelloworld.cpp index 3031f51..216071e 100644 --- a/kate/helloworld/plugin_katehelloworld.cpp +++ b/kate/helloworld/plugin_katehelloworld.cpp @@ -16,8 +16,8 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -KatePluginHelloWorld::KatePluginHelloWorld( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application*)parent, name ) +KatePluginHelloWorld::KatePluginHelloWorld( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application*)tqparent, name ) { } diff --git a/kate/helloworld/plugin_katehelloworld.h b/kate/helloworld/plugin_katehelloworld.h index 7760169..7c71b01 100644 --- a/kate/helloworld/plugin_katehelloworld.h +++ b/kate/helloworld/plugin_katehelloworld.h @@ -12,9 +12,10 @@ class KatePluginHelloWorld : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - KatePluginHelloWorld( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginHelloWorld( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~KatePluginHelloWorld(); void addView (Kate::MainWindow *win); diff --git a/kate/htmltools/plugin_katehtmltools.cpp b/kate/htmltools/plugin_katehtmltools.cpp index f66ef8e..a71c91c 100644 --- a/kate/htmltools/plugin_katehtmltools.cpp +++ b/kate/htmltools/plugin_katehtmltools.cpp @@ -36,8 +36,8 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -PluginKateHtmlTools::PluginKateHtmlTools( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)parent, name ) +PluginKateHtmlTools::PluginKateHtmlTools( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)tqparent, name ) { } @@ -103,7 +103,7 @@ TQString PluginKateHtmlTools::KatePrompt // TODO: Make this a "memory edit" field with a combo box // containing prior entries - KLineEditDlg dlg(strPrompt, TQString::null, that); + KLineEditDlg dlg(strPrompt, TQString(), that); dlg.setCaption(strTitle); if (dlg.exec()) @@ -142,7 +142,7 @@ void PluginKateHtmlTools::slipInHTMLtag (Kate::View & view, TQString text) // // when we try to reselect. TODO: fix those bugs, and we can // un-break this if... - if (preDeleteLine == line && -1 == marked.find ('\n')) + if (preDeleteLine == line && -1 == marked.tqfind ('\n')) if (preDeleteLine == line && preDeleteCol == col) { view.setCursorPosition (line, col + pre.length () + marked.length () - 1); diff --git a/kate/htmltools/plugin_katehtmltools.h b/kate/htmltools/plugin_katehtmltools.h index 695211c..f517b99 100644 --- a/kate/htmltools/plugin_katehtmltools.h +++ b/kate/htmltools/plugin_katehtmltools.h @@ -31,9 +31,10 @@ class PluginKateHtmlTools : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - PluginKateHtmlTools( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateHtmlTools( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateHtmlTools(); void addView (Kate::MainWindow *win); diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp index fb42c3f..cc88a5b 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.cpp +++ b/kate/insertcommand/plugin_kateinsertcommand.cpp @@ -57,8 +57,8 @@ class PluginView : public KXMLGUIClient //END //BEGIN PluginKateInsertCommand -PluginKateInsertCommand::PluginKateInsertCommand( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)parent, name ), +PluginKateInsertCommand::PluginKateInsertCommand( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)tqparent, name ), kv ( 0 ), sh ( 0 ) { @@ -169,11 +169,11 @@ void PluginKateInsertCommand::slotInsertCommand() *sh << "cd" << d->wd() << "&&"; config->writePathEntry("Last WD", d->wd()); } - *sh << TQFile::encodeName(d->command()); + *sh << TQFile::encodeName(d->command()).data(); sh->start( KProcess::NotifyOnExit, KProcess::All ); // add command to history - if ( cmdhist.contains( d->command() ) ) { + if ( cmdhist.tqcontains( d->command() ) ) { cmdhist.remove( d->command() ); } cmdhist.prepend( d->command() ); @@ -208,7 +208,7 @@ void PluginKateInsertCommand::slotShowWaitDlg() { if ( sh->isRunning() ) { wdlg = new WaitDlg( (TQWidget*)kv, i18n( - "Executing command:\n%1\n\nPress 'Cancel' to abort.").arg(cmd) ); + "Executing command:\n%1\n\nPress 'Cancel' to abort.").tqarg(cmd) ); connect(wdlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotAbort()) ); } if ( sh->isRunning() ) // we may have finished while creating the dialog. @@ -277,13 +277,13 @@ void PluginKateInsertCommand::applyConfig( InsertCommandConfigPage *p ) //BEGIN CmdPrompt // This is a simple dialog to retrieve a command and decide if // stdErr should be included in the text inserted. -CmdPrompt::CmdPrompt(TQWidget* parent, +CmdPrompt::CmdPrompt(TQWidget* tqparent, const char* name, const TQStringList& cmdhist, const TQString& dir, const TQString& /*docdir*/, int settings) - : KDialogBase (parent, name, true, i18n("Insert Command"), Ok|Cancel, Ok, true) + : KDialogBase (tqparent, name, true, i18n("Insert Command"), Ok|Cancel, Ok, true) { TQWidget *page = new TQWidget( this ); setMainWidget(page); @@ -345,14 +345,14 @@ void CmdPrompt::slotTextChanged(const TQString &text) //BEGIN WaitDlg implementation // This is a dialog that is displayed while a command is running, // with a cancel button to allow the user to kill the command -WaitDlg::WaitDlg(TQWidget* parent, const TQString& text, const TQString& title) - : KDialogBase( parent, "wait dialog", true, title, Cancel, Cancel, true ) +WaitDlg::WaitDlg(TQWidget* tqparent, const TQString& text, const TQString& title) + : KDialogBase( tqparent, "wait dialog", true, title, Cancel, Cancel, true ) { TQWidget *page = new TQWidget( this ); setMainWidget( page ); TQHBoxLayout *lo = new TQHBoxLayout( page, 0, spacingHint() ); - KAnimWidget *aw = new KAnimWidget( TQString::fromLatin1("kde"), 48, page ); + KAnimWidget *aw = new KAnimWidget( TQString::tqfromLatin1("kde"), 48, page ); lo->addWidget(aw); TQLabel *l = new TQLabel( text, page ); lo->addWidget( l ); @@ -366,9 +366,9 @@ WaitDlg::~WaitDlg() //BEGIN InsertCommandConfigPage // This is the config page for this plugin. -InsertCommandConfigPage::InsertCommandConfigPage(TQObject* /*parent*/, - TQWidget *parentWidget) - : Kate::PluginConfigPage( parentWidget ) +InsertCommandConfigPage::InsertCommandConfigPage(TQObject* /*tqparent*/, + TQWidget *tqparentWidget) + : Kate::PluginConfigPage( tqparentWidget ) { TQVBoxLayout* lo = new TQVBoxLayout( this ); lo->setSpacing(KDialogBase::spacingHint()); @@ -414,4 +414,4 @@ void InsertCommandConfigPage::apply() emit configPageApplyRequest( this ); } //END InsertCommandConfigPage -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; diff --git a/kate/insertcommand/plugin_kateinsertcommand.h b/kate/insertcommand/plugin_kateinsertcommand.h index 03a1415..ff3a584 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.h +++ b/kate/insertcommand/plugin_kateinsertcommand.h @@ -55,9 +55,10 @@ class PluginKateInsertCommand : public Kate::Plugin, Kate::PluginConfigInterfaceExtension { Q_OBJECT + TQ_OBJECT public: - PluginKateInsertCommand( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateInsertCommand( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateInsertCommand(); void addView (Kate::MainWindow *win); @@ -103,12 +104,13 @@ class PluginKateInsertCommand : public Kate::Plugin, class CmdPrompt : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CmdPrompt(TQWidget* parent=0, + CmdPrompt(TQWidget* tqparent=0, const char* name=0, const TQStringList& cmdhist=TQStringList(), - const TQString& dir=TQString::null, - const TQString& docdir=TQString::null, + const TQString& dir=TQString(), + const TQString& docdir=TQString(), int settings=0); ~CmdPrompt(); TQString command()const { return cmb_cmd->currentText(); } @@ -130,8 +132,8 @@ private slots: class WaitDlg : public KDialogBase { public: - WaitDlg(TQWidget* parent, - const TQString& text=TQString::null, + WaitDlg(TQWidget* tqparent, + const TQString& text=TQString(), const TQString& title=i18n("Please Wait")); ~WaitDlg(); }; @@ -140,10 +142,11 @@ class WaitDlg : public KDialogBase class InsertCommandConfigPage : public Kate::PluginConfigPage { Q_OBJECT + TQ_OBJECT friend class PluginKateInsertCommand; public: - InsertCommandConfigPage(TQObject* parent = 0L, TQWidget *parentWidget = 0L); + InsertCommandConfigPage(TQObject* tqparent = 0L, TQWidget *tqparentWidget = 0L); ~InsertCommandConfigPage() {} /** Reimplemented from Kate::PluginConfigPage @@ -167,4 +170,4 @@ class InsertCommandConfigPage : public Kate::PluginConfigPage }; #endif // _PLUGIN_KATE_INSERT_COMMAND_H_ -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; diff --git a/kate/kjswrapper/bindings.cpp b/kate/kjswrapper/bindings.cpp index 1bb56eb..aeddbbc 100644 --- a/kate/kjswrapper/bindings.cpp +++ b/kate/kjswrapper/bindings.cpp @@ -17,7 +17,7 @@ using namespace Kate::JS; -Bindings::Bindings(TQObject *parent): KJSEmbed::Bindings::JSBindingPlugin(parent,"KateAppBindings",TQStringList()) { +Bindings::Bindings(TQObject *tqparent): KJSEmbed::Bindings::JSBindingPlugin(tqparent,"KateAppBindings",TQStringList()) { } Bindings::~Bindings() { @@ -74,11 +74,11 @@ void DocumentManager::addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectProxy object.put(exec, "closeAllDocument", KJS::Object(new DocumentManager( exec, CloseAllDocuments, proxy,dict ))); } -DocumentManager::DocumentManager( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent, RefCountedObjectDict *dict ):KJSEmbed::JSProxyImp(exec) { +DocumentManager::DocumentManager( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *tqparent, RefCountedObjectDict *dict ):KJSEmbed::JSProxyImp(exec) { m_dict=dict; m_dict->incRef(); m_id=id; - m_proxy=parent; + m_proxy=tqparent; } DocumentManager::~DocumentManager() { @@ -143,7 +143,7 @@ KJS::Value DocumentManager::call( KJS::ExecState *exec, KJS::Object &self, const if (args.size()==1) { KURL url = TQString( args[0].toString(exec).qstring() ); if (exec->hadException()) break; - (void)dm->openURL(url,TQString::null,&docID); + (void)dm->openURL(url,TQString(),&docID); return KJS::Number(docID); } else if (args.size()==2) { KURL url = TQString( args[0].toString(exec).qstring() ); @@ -178,7 +178,7 @@ KJS::Value DocumentManager::call( KJS::ExecState *exec, KJS::Object &self, const kdDebug()<<"calling illegal method of DocumentManager"<<endl; return KJS::Null(); } - TQString msg = i18n("Method %1 called with wrong signature").arg(mdesc); + TQString msg = i18n("Method %1 called with wrong signature").tqarg(mdesc); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); exec->setException( err ); return KJS::Undefined(); @@ -231,7 +231,7 @@ KJS::Value Kate::JS::Management::call( KJS::ExecState *exec, KJS::Object &self, } void Kate::JS::Application::addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectProxy *proxy,KJS::Object &object){ - PluginKateKJSWrapper *wrap=static_cast<PluginKateKJSWrapper*>(proxy->part()->parent()); + PluginKateKJSWrapper *wrap=static_cast<PluginKateKJSWrapper*>(proxy->part()->tqparent()); KJS::Object ToolView(new Application( exec, ToolView, proxy ,wrap)); ToolView.put(exec,KJS::Identifier("Left"),KJS::Number(KDockWidget::DockLeft) ,KJS::ReadOnly | KJS::DontDelete); ToolView.put(exec,KJS::Identifier("Top"),KJS::Number(KDockWidget::DockTop) ,KJS::ReadOnly | KJS::DontDelete); @@ -262,10 +262,10 @@ void Kate::JS::Application::addBindings(KJS::ExecState *exec, KJSEmbed::JSObject } -Kate::JS::Application::Application( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent,PluginKateKJSWrapper *plugin):KJSEmbed::JSProxyImp(exec) { +Kate::JS::Application::Application( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *tqparent,PluginKateKJSWrapper *plugin):KJSEmbed::JSProxyImp(exec) { kdDebug()<<"Kate::JS::Application::Application"<<endl; m_id=id; - m_proxy=parent; + m_proxy=tqparent; m_plugin=plugin; } @@ -310,7 +310,7 @@ KJS::Value Kate::JS::Application::call( KJS::ExecState *exec, KJS::Object &self, } - TQString msg = i18n("Method %1 called with wrong signature").arg(mdesc); + TQString msg = i18n("Method %1 called with wrong signature").tqarg(mdesc); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); exec->setException( err ); return KJS::Undefined(); @@ -390,7 +390,7 @@ void Kate::JS::RefCountedObjectDict::decRef() { } KJS::Object Kate::JS::RefCountedObjectDict::jsObject(KJS::ExecState *exec, TQObject *obj, KJSEmbed::JSObjectProxy *proxy) { - ObjectEntry *oe=find(obj); + ObjectEntry *oe=tqfind(obj); if (oe==0) { oe=new ObjectEntry; oe->obj=proxy->part()->factory()->createProxy(exec,obj,proxy); @@ -417,7 +417,7 @@ void Kate::JS::MainWindow::addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectP if (!mw) return; kdDebug()<<"Kate::JS::MainWindow::addBindings - 3"<<endl; - PluginKateKJSWrapper *wrap=static_cast<PluginKateKJSWrapper*>(proxy->part()->parent()); + PluginKateKJSWrapper *wrap=static_cast<PluginKateKJSWrapper*>(proxy->part()->tqparent()); if (!wrap) return; kdDebug()<<"Kate::JS::MainWindow::addBindings - 4"<<endl; @@ -427,10 +427,10 @@ void Kate::JS::MainWindow::addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectP -Kate::JS::MainWindow::MainWindow( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent,PluginKateKJSWrapper *plugin):KJSEmbed::JSProxyImp(exec) { +Kate::JS::MainWindow::MainWindow( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *tqparent,PluginKateKJSWrapper *plugin):KJSEmbed::JSProxyImp(exec) { kdDebug()<<"Kate::JS::MainWindow::MainWindow"<<endl; m_id=id; - m_proxy=parent; + m_proxy=tqparent; m_plugin=plugin; } @@ -458,7 +458,7 @@ KJS::Value Kate::JS::MainWindow::call( KJS::ExecState *exec, KJS::Object &self, default: return KJS::Undefined(); } - TQString msg = i18n("Method %1 called with wrong signature").arg(mdesc); + TQString msg = i18n("Method %1 called with wrong signature").tqarg(mdesc); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); exec->setException( err ); return KJS::Undefined(); diff --git a/kate/kjswrapper/bindings.h b/kate/kjswrapper/bindings.h index f33418f..4fc8449 100644 --- a/kate/kjswrapper/bindings.h +++ b/kate/kjswrapper/bindings.h @@ -19,6 +19,7 @@ namespace Kate { class RefCountedObjectDict: public TQObject, public TQPtrDict<ObjectEntry> { Q_OBJECT + TQ_OBJECT public: RefCountedObjectDict(int size); void incRef(); @@ -33,7 +34,7 @@ namespace Kate { class Bindings: public KJSEmbed::Bindings::JSBindingPlugin { public: - Bindings(TQObject *parent); + Bindings(TQObject *tqparent); virtual ~Bindings(); KJS::Object createBinding(KJSEmbed::KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const; void addBindings(KJS::ExecState *exec, KJS::Object &target) const; @@ -56,7 +57,7 @@ namespace Kate { virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); static void addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectProxy *proxy,KJS::Object &target); private: - DocumentManager( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent, RefCountedObjectDict *dict ); + DocumentManager( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *tqparent, RefCountedObjectDict *dict ); virtual ~DocumentManager(); private: RefCountedObjectDict *m_dict; @@ -97,7 +98,7 @@ namespace Kate { virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); static void addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectProxy *proxy,KJS::Object &target); private: - Application( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent, PluginKateKJSWrapper *plugin ); + Application( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *tqparent, PluginKateKJSWrapper *plugin ); ~Application(); private: int m_id; @@ -135,7 +136,7 @@ namespace Kate { virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); static void addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectProxy *proxy,KJS::Object &target); private: - MainWindow( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent, PluginKateKJSWrapper *plugin ); + MainWindow( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *tqparent, PluginKateKJSWrapper *plugin ); ~MainWindow(); private: int m_id; diff --git a/kate/kjswrapper/plugin_katekjswrapper.cpp b/kate/kjswrapper/plugin_katekjswrapper.cpp index 8fc4ae5..4ebac34 100644 --- a/kate/kjswrapper/plugin_katekjswrapper.cpp +++ b/kate/kjswrapper/plugin_katekjswrapper.cpp @@ -53,8 +53,8 @@ void PluginKateKJSWrapperView::removeFromWindow() { win->guiFactory()->removeClient (this); } -PluginKateKJSWrapper::PluginKateKJSWrapper( TQObject* parent, const char* name, const TQStringList& list) - : Kate::Plugin ( (Kate::Application *)parent, name ) { +PluginKateKJSWrapper::PluginKateKJSWrapper( TQObject* tqparent, const char* name, const TQStringList& list) + : Kate::Plugin ( (Kate::Application *)tqparent, name ) { m_views.setAutoDelete(true); m_scriptname=list[0]; m_kateAppBindings=new Kate::JS::Bindings(this); @@ -65,15 +65,15 @@ PluginKateKJSWrapper::PluginKateKJSWrapper( TQObject* parent, const char* name, KJSEmbed::JSFactory *factory=m_part->factory(); /* factories for kate app classes */ - factory->addQObjectPlugin("Kate::Application",m_kateAppBindings); - factory->addQObjectPlugin("Kate::DocumentManager",m_kateAppBindings); - factory->addQObjectPlugin("Kate::MainWindow",m_kateAppBindings); - factory->addQObjectPlugin("Kate::PluginManager",m_kateAppBindings); - factory->addQObjectPlugin("Kate::InitPluginManager",m_kateAppBindings); - factory->addQObjectPlugin("Kate::ProjectManager",m_kateAppBindings); - factory->addQObjectPlugin("Kate::Project",m_kateAppBindings); - factory->addQObjectPlugin("Kate::ViewManager",m_kateAppBindings); - factory->addQObjectPlugin("Kate::View",m_kateAppBindings); + factory->addTQObjectPlugin("Kate::Application",m_kateAppBindings); + factory->addTQObjectPlugin("Kate::DocumentManager",m_kateAppBindings); + factory->addTQObjectPlugin("Kate::MainWindow",m_kateAppBindings); + factory->addTQObjectPlugin("Kate::PluginManager",m_kateAppBindings); + factory->addTQObjectPlugin("Kate::InitPluginManager",m_kateAppBindings); + factory->addTQObjectPlugin("Kate::ProjectManager",m_kateAppBindings); + factory->addTQObjectPlugin("Kate::Project",m_kateAppBindings); + factory->addTQObjectPlugin("Kate::ViewManager",m_kateAppBindings); + factory->addTQObjectPlugin("Kate::View",m_kateAppBindings); /* toplevel objects*/ KJS::Object appobj=m_part->addObject(Kate::application(),"KATE"); js->globalObject().put( js->globalExec(), "addConfigPage", KJS::Object(new Kate::JS::Management(js->globalExec(),Kate::JS::Management::AddConfigPage,this ))); @@ -86,7 +86,7 @@ PluginKateKJSWrapper::PluginKateKJSWrapper( TQObject* parent, const char* name, w->show(); //w->show();*/ kdDebug()<<"m_scriptname="<<m_scriptname<<endl; - m_part->runFile(locate("appdata",TQString("plugins/%1/%2.js").arg(m_scriptname).arg(m_scriptname))); + m_part->runFile(locate("appdata",TQString("plugins/%1/%2.js").tqarg(m_scriptname).tqarg(m_scriptname))); //"/home/jowenn/development/kde/cvs/kdeaddons/kate/kjswrapper/samples/test1.js"); } @@ -343,7 +343,7 @@ void PluginKateKJSWrapper::addView(Kate::MainWindow *win) if (exec->hadException()) kdDebug()<<"void PluginKateKJSWrapper::addView(Kate::MainWindow *win): exec had an exception - 2"<<endl; view->setInstance (new KInstance("kate")); - view->setXMLFile(TQString("plugins/%1/%2.rc").arg(m_scriptname).arg(m_scriptname)); + view->setXMLFile(TQString("plugins/%1/%2.rc").tqarg(m_scriptname).tqarg(m_scriptname)); win->guiFactory()->addClient (view); } @@ -370,18 +370,18 @@ void PluginKateKJSWrapper::applyConfig( KateKJSWrapperConfigPage *p ) #endif } -KateKJSWrapperConfigPage::KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* parent, - TQWidget *parentWidget) - : Kate::PluginConfigPage( parentWidget ),m_plugin(parent) +KateKJSWrapperConfigPage::KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* tqparent, + TQWidget *tqparentWidget) + : Kate::PluginConfigPage( tqparentWidget ),m_plugin(tqparent) { TQVBoxLayout *l=new TQVBoxLayout(this); l->setAutoAdd(true); l->activate(); - KJS::Interpreter *js = parent->m_part->interpreter(); + KJS::Interpreter *js = tqparent->m_part->interpreter(); KJS::ExecState *exec = js->globalExec(); exec->clearException(); KJS::List param; - param.append(parent->m_part->factory()->createProxy(exec,this,0)); + param.append(tqparent->m_part->factory()->createProxy(exec,this,0)); m_pageObject=pageConstructor.construct(exec,param); } diff --git a/kate/kjswrapper/plugin_katekjswrapper.h b/kate/kjswrapper/plugin_katekjswrapper.h index 9256b4c..ee6a311 100644 --- a/kate/kjswrapper/plugin_katekjswrapper.h +++ b/kate/kjswrapper/plugin_katekjswrapper.h @@ -73,9 +73,10 @@ class PluginKateKJSWrapper : public Kate::Plugin, Kate::PluginConfigInterfaceExtension { Q_OBJECT + TQ_OBJECT public: - PluginKateKJSWrapper( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateKJSWrapper( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateKJSWrapper(); void addView (Kate::MainWindow *win); @@ -117,10 +118,11 @@ class PluginKateKJSWrapper : public Kate::Plugin, class KateKJSWrapperConfigPage : public Kate::PluginConfigPage { Q_OBJECT + TQ_OBJECT friend class PluginKateKJSWrapper; public: - KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* parent = 0L, TQWidget *parentWidget = 0L); + KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* tqparent = 0L, TQWidget *tqparentWidget = 0L); ~KateKJSWrapperConfigPage() {}; /** Reimplemented from Kate::PluginConfigPage @@ -166,6 +168,7 @@ namespace Kate { namespace JS { class ToolView: public TQVBox { Q_OBJECT + TQ_OBJECT public: ToolView(KJS::Object constr, KJS::ExecState *exec, KJSEmbed::JSFactory *factory, KJS::List parameters, const char * name); virtual ~ToolView(); diff --git a/kate/kjswrapper/samples/katekjstest1.js b/kate/kjswrapper/samples/katekjstest1.js index 7e4e041..a8b061b 100644 --- a/kate/kjswrapper/samples/katekjstest1.js +++ b/kate/kjswrapper/samples/katekjstest1.js @@ -1,7 +1,7 @@ /**************************************************************** First configuration page ****************************************************************/ -function Page1 (parentWidget) { +function Page1 (tqparentWidget) { this.defaults=function() { alert("Defaults has been called"); } @@ -11,7 +11,7 @@ function Page1 (parentWidget) { this.reset=function() { alert("Reset defaults has been called"); } - box=new QVBox(parentWidget); + box=new QVBox(tqparentWidget); this.button1=new QPushButton(box); this.button1.text="P1 Button 1"; this.button1.show(); @@ -27,8 +27,8 @@ Page1.fullName="Test1/Page1"; Second configuration page ****************************************************************/ -function Page2 (parentWidget) { - box=new QVBox(parentWidget); +function Page2 (tqparentWidget) { + box=new QVBox(tqparentWidget); this.button1=new QPushButton(box); this.button1.text="P2 Button 1"; this.button1.show(); @@ -44,8 +44,8 @@ Page2.fullName="Test1/Page2"; Third configuration page ****************************************************************/ -function Page3 (parentWidget) { - box=new QVBox(parentWidget); +function Page3 (tqparentWidget) { + box=new QVBox(tqparentWidget); this.button1=new QPushButton(box); this.button1.text="P3 Button 1"; this.button1.show(); @@ -62,11 +62,11 @@ Page3.fullName="Test1/Page3"; First toolview ****************************************************************/ -function MyToolView1 (mainwindow,parentwidget) { - parentwidget.caption="This is my first JS Toolview"; - parentwidget.icon=StdIcons.BarIcon("yes"); +function MyToolView1 (mainwindow,tqparentwidget) { + tqparentwidget.caption="This is my first JS Toolview"; + tqparentwidget.icon=StdIcons.BarIcon("yes"); - this.lv = new KListView( parentwidget ); + this.lv = new KListView( tqparentwidget ); this.lv.addColumn('Pix'); this.lv.addColumn('One'); @@ -99,11 +99,11 @@ MyToolView1.name="myfirstjstoolview" Second toolview ****************************************************************/ -function MyToolView2 (mainwindow,parentwidget) { - parentwidget.caption="This is my second JS Toolview"; - parentwidget.icon=StdIcons.BarIcon("no"); +function MyToolView2 (mainwindow,tqparentwidget) { + tqparentwidget.caption="This is my second JS Toolview"; + tqparentwidget.icon=StdIcons.BarIcon("no"); - this.lb=new QListBox(parentwidget); + this.lb=new QListBox(tqparentwidget); this.mainwindow=mainwindow; this.cleanup=function() { alert("Cleanup MyToolView2"); @@ -121,11 +121,11 @@ MyToolView2.name="mysecondjstoolview" function newWindowCallBack(mainwindow) { alert("New Window has been created"); /* - anotherToolView = function (mainwindow,parentwidget) { - parentwidget.caption="This is my third JS Toolview"; - parentwidget.icon=StdIcons.BarIcon("kate"); + anotherToolView = function (mainwindow,tqparentwidget) { + tqparentwidget.caption="This is my third JS Toolview"; + tqparentwidget.icon=StdIcons.BarIcon("kate"); - this.lb=new QListBox(parentwidget); + this.lb=new QListBox(tqparentwidget); this.mainwindow=mainwindow; this.cleanup=function() { alert("Cleanup MyToolView3"); diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp index 183e1e7..5d2c268 100644 --- a/kate/kpybrowser/kpybrowser.cpp +++ b/kate/kpybrowser/kpybrowser.cpp @@ -181,8 +181,8 @@ getOpenNodes (TQValueList < TQString > *open_nodes, PyBrowseNode * node) } -KPyBrowser::KPyBrowser (TQWidget * parent, const char *name): -KListView (parent, name) +KPyBrowser::KPyBrowser (TQWidget * tqparent, const char *name): +KListView (tqparent, name) { addColumn(i18n("Name")); @@ -286,11 +286,11 @@ KPyBrowser::parseText (TQString & pytext) line = &(*iter); if (class_rx.search(*line) >= 0) { - //KMessageBox::information(this, *line, TQString("Found class on line %1").arg(line_no)); + //KMessageBox::information(this, *line, TQString("Found class on line %1").tqarg(line_no)); //strip out the beginning class and ending colon class_sig = line->stripWhiteSpace ().mid (6); class_sig = class_sig.left (class_sig.length () - 1); - paren_i = class_sig.find ("("); + paren_i = class_sig.tqfind ("("); class_name = class_sig.left (paren_i); last_class_node = @@ -305,8 +305,8 @@ KPyBrowser::parseText (TQString & pytext) { //strip off the leading def and the ending colon method_sig = line->stripWhiteSpace ().mid (4); - method_sig = method_sig.left (method_sig.find (":")); - paren_i = method_sig.find ("("); + method_sig = method_sig.left (method_sig.tqfind (":")); + paren_i = method_sig.tqfind ("("); method_name = method_sig.left (paren_i); last_method_node = new PyBrowseNode (last_class_node, method_name, method_sig, @@ -318,10 +318,10 @@ KPyBrowser::parseText (TQString & pytext) } if ((function_rx.search(*line) >= 0)) { - //KMessageBox::information(this, *line, TQString("Found function on line %1").arg(line_no)); + //KMessageBox::information(this, *line, TQString("Found function on line %1").tqarg(line_no)); function_sig = line->stripWhiteSpace ().mid (4); - function_sig = function_sig.left (function_sig.find (":")); - paren_i = function_sig.find ("("); + function_sig = function_sig.left (function_sig.tqfind (":")); + paren_i = function_sig.tqfind ("("); function_name = function_sig.left (paren_i); last_function_node = new PyBrowseNode (function_root, function_name, function_sig, @@ -359,7 +359,7 @@ KPyBrowser::tip (const TQPoint & p, TQRect & r, TQString & str) str = ""; return; } - r = itemRect (item); + r = tqitemRect (item); //r.setY(r.y() + 10); PyBrowseNode *browse_node = dynamic_cast < PyBrowseNode * >(item); @@ -380,7 +380,7 @@ KPyBrowser::tip (const TQPoint & p, TQRect & r, TQString & str) ///////////////////////////////////////////////////////////////////// // KateFileList::KFLToolTip implementation -KPyBrowser::KPBToolTip::KPBToolTip (TQWidget * parent):TQToolTip (parent) +KPyBrowser::KPBToolTip::KPBToolTip (TQWidget * tqparent):TQToolTip (tqparent) { } @@ -390,7 +390,7 @@ KPyBrowser::KPBToolTip::maybeTip (const TQPoint & p) TQString str; TQRect r; - ((KPyBrowser *) parentWidget ())->tip (p, r, str); + ((KPyBrowser *) tqparentWidget ())->tip (p, r, str); if (!str.isEmpty () && r.isValid ()) tip (r, str); diff --git a/kate/kpybrowser/kpybrowser.h b/kate/kpybrowser/kpybrowser.h index 5f73c31..ea0c43f 100644 --- a/kate/kpybrowser/kpybrowser.h +++ b/kate/kpybrowser/kpybrowser.h @@ -35,9 +35,10 @@ class KPyBrowser : public KListView { Q_OBJECT + TQ_OBJECT public: /** construtor */ - KPyBrowser(TQWidget* parent=0, const char *name=0); + KPyBrowser(TQWidget* tqparent=0, const char *name=0); /** destructor */ ~KPyBrowser(); void parseText(TQString &pytext); @@ -56,10 +57,10 @@ class KPyBrowser : public KListView signals: void selected(TQString, int); private: - class KPBToolTip : public QToolTip + class KPBToolTip : public TQToolTip { public: - KPBToolTip(TQWidget *parent); + KPBToolTip(TQWidget *tqparent); protected: void maybeTip( const TQPoint & ); }; diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp index 4b8490c..bd9f791 100644 --- a/kate/kpybrowser/pybrowse_part.cpp +++ b/kate/kpybrowser/pybrowse_part.cpp @@ -82,7 +82,7 @@ void PluginViewPyBrowse::slotSelected(TQString name, int line) done = 1; if (forward_line < numlines) { - if (doc->textLine(forward_line).find(name) > -1) + if (doc->textLine(forward_line).tqfind(name) > -1) { apiline = forward_line; break; @@ -92,7 +92,7 @@ void PluginViewPyBrowse::slotSelected(TQString name, int line) } if (backward_line > -1) { - if (doc->textLine(backward_line).find(name) > -1) + if (doc->textLine(backward_line).tqfind(name) > -1) { apiline = backward_line; break; @@ -104,7 +104,7 @@ void PluginViewPyBrowse::slotSelected(TQString name, int line) if (apiline == -1) { KMessageBox::information(0, - i18n("Could not find method/class %1.").arg(name), i18n("Selection")); + i18n("Could not find method/class %1.").tqarg(name), i18n("Selection")); } else { @@ -130,8 +130,8 @@ void PluginViewPyBrowse::slotShowPyBrowser() //TO DO implement this later so that you can turn the browser off and on } -KatePluginPyBrowse::KatePluginPyBrowse( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)parent, name ) +KatePluginPyBrowse::KatePluginPyBrowse( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)tqparent, name ) { } diff --git a/kate/kpybrowser/pybrowse_part.h b/kate/kpybrowser/pybrowse_part.h index 3769661..f649170 100644 --- a/kate/kpybrowser/pybrowse_part.h +++ b/kate/kpybrowser/pybrowse_part.h @@ -36,6 +36,7 @@ class PluginViewPyBrowse : public TQObject, KXMLGUIClient { Q_OBJECT + TQ_OBJECT friend class KatePluginPyBrowse; @@ -57,9 +58,10 @@ class PluginViewPyBrowse : public TQObject, KXMLGUIClient class KatePluginPyBrowse : public Kate::Plugin, public Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - KatePluginPyBrowse( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginPyBrowse( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); ~KatePluginPyBrowse(); void addView(Kate::MainWindow *win); diff --git a/kate/kpybrowser/pybrowsenode.cpp b/kate/kpybrowser/pybrowsenode.cpp index 81c59e5..9310478 100644 --- a/kate/kpybrowser/pybrowsenode.cpp +++ b/kate/kpybrowser/pybrowsenode.cpp @@ -99,16 +99,16 @@ static const char *py_function_xpm[] = { }; -PyBrowseNode::PyBrowseNode (TQListViewItem * parent, const TQString &name, +PyBrowseNode::PyBrowseNode (TQListViewItem * tqparent, const TQString &name, const TQString &signature, int nodeType): -TQListViewItem (parent, signature) +TQListViewItem (tqparent, signature) { init (name, signature, nodeType); } -PyBrowseNode::PyBrowseNode (TQListView * parent, const TQString &name, +PyBrowseNode::PyBrowseNode (TQListView * tqparent, const TQString &name, const TQString &signature, int nodeType): -TQListViewItem (parent, signature) +TQListViewItem (tqparent, signature) { init (name, signature, nodeType); } @@ -140,7 +140,7 @@ PyBrowseNode::setName (const TQString &a_name) setText (0, name); } -QString +TQString PyBrowseNode::getName ()const { return name; @@ -153,7 +153,7 @@ PyBrowseNode::setSig (const TQString &a_signature) } -QString +TQString PyBrowseNode::getSig ()const { return signature; @@ -190,13 +190,13 @@ PyBrowseNode::setClass (const TQString &a_method_class) node_class = a_method_class; } -QString +TQString PyBrowseNode::getClass ()const { return node_class; } -QString +TQString PyBrowseNode::getQualifiedName ()const { if (node_type == PYCLASS) diff --git a/kate/kpybrowser/pybrowsenode.h b/kate/kpybrowser/pybrowsenode.h index 373547c..8b18fc1 100644 --- a/kate/kpybrowser/pybrowsenode.h +++ b/kate/kpybrowser/pybrowsenode.h @@ -37,8 +37,8 @@ class PyBrowseNode : public TQListViewItem { public: TQPixmap *pyClassPixmap; - PyBrowseNode(TQListView *parent, const TQString &a_name, const TQString &a_signature, int type); - PyBrowseNode(TQListViewItem *parent, const TQString &a_name, const TQString &a_signature, int type); + PyBrowseNode(TQListView *tqparent, const TQString &a_name, const TQString &a_signature, int type); + PyBrowseNode(TQListViewItem *tqparent, const TQString &a_name, const TQString &a_signature, int type); ~PyBrowseNode(); void init(const TQString &a_name, const TQString &a_signature, int nodeType); diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp index e78bda9..6cfa9e8 100644 --- a/kate/make/plugin_katemake.cpp +++ b/kate/make/plugin_katemake.cpp @@ -62,8 +62,8 @@ K_EXPORT_COMPONENT_FACTORY( katemakeplugin, KGenericFactory<PluginKateMake>( "ka // #define FUNCTIONSETUP kdDebug() << k_funcinfo << endl; #define FUNCTIONSETUP -PluginKateMake::PluginKateMake( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)parent, name ) +PluginKateMake::PluginKateMake( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)tqparent, name ) { FUNCTIONSETUP; } @@ -82,7 +82,7 @@ void PluginKateMake::addView(Kate::MainWindow *win) Kate::ToolViewManager *viewmanager = win->toolViewManager(); TQWidget *w = viewmanager->createToolView("kate_plugin_make", Kate::ToolViewManager::Bottom, - SmallIcon(TQString::fromLatin1("misc")), + SmallIcon(TQString::tqfromLatin1("misc")), i18n("Make Output")); PluginKateMakeView *view = new PluginKateMakeView (w,win, "katemakeview"); @@ -120,24 +120,24 @@ void PluginKateMake::removeView(Kate::MainWindow *win) #define COL_MSG (2) -class ErrorMessage : public QListViewItem +class ErrorMessage : public TQListViewItem { public: - ErrorMessage(TQListView *parent, + ErrorMessage(TQListView *tqparent, const TQString &filename, int lineno, const TQString &message) : - TQListViewItem(parent, + TQListViewItem(tqparent, filename, - (lineno > 0 ? TQString::number(lineno) : TQString::null), + (lineno > 0 ? TQString::number(lineno) : TQString()), message) { - m_isError = !message.contains(TQString::fromLatin1("warning")); + m_isError = !message.tqcontains(TQString::tqfromLatin1("warning")); m_lineno = lineno; m_serial = s_serial++; } - ErrorMessage(TQListView *parent,const TQString &message) : - TQListViewItem(parent,TQString::null,TQString::null,TQString::null) + ErrorMessage(TQListView *tqparent,const TQString &message) : + TQListViewItem(tqparent,TQString(),TQString(),TQString()) { TQString m(message); m.remove('\n'); @@ -149,8 +149,8 @@ public: m_serial = s_serial++; setSelectable(false); } - ErrorMessage(TQListView *parent, bool start) : - TQListViewItem(parent,TQString::null) + ErrorMessage(TQListView *tqparent, bool start) : + TQListViewItem(tqparent,TQString()) { m_isError=false; m_lineno=-1; @@ -192,22 +192,22 @@ protected: TQString ErrorMessage::caption() const { - return TQString::fromLatin1("%1:%2").arg(text(COL_FILE)).arg(line()); + return TQString::tqfromLatin1("%1:%2").tqarg(text(COL_FILE)).tqarg(line()); } TQString ErrorMessage::fancyMessage() const { - TQString msg = TQString::fromLatin1("<qt>"); + TQString msg = TQString::tqfromLatin1("<qt>"); if (isError()) { - msg.append(TQString::fromLatin1("<font color=\"red\">")); + msg.append(TQString::tqfromLatin1("<font color=\"red\">")); } msg.append(message()); if (isError()) { - msg.append(TQString::fromLatin1("</font>")); + msg.append(TQString::tqfromLatin1("</font>")); } - msg.append(TQString::fromLatin1("<qt>")); + msg.append(TQString::tqfromLatin1("<qt>")); return msg; } @@ -261,7 +261,7 @@ TQString ErrorMessage::fancyMessage() const class LinePopup : public KPassivePopup { protected: - LinePopup( TQWidget *parent=0, const char *name=0, WFlags f=0 ); + LinePopup( TQWidget *tqparent=0, const char *name=0, WFlags f=0 ); virtual ~LinePopup(); public: @@ -292,12 +292,12 @@ LinePopup::~LinePopup() one=0L; } -/* static */ LinePopup *LinePopup::message(TQWidget *parent, +/* static */ LinePopup *LinePopup::message(TQWidget *tqparent, const TQPoint &p, ErrorMessage *e) { if (one) delete one; - LinePopup *pop = new LinePopup( parent ); + LinePopup *pop = new LinePopup( tqparent ); pop->setAutoDelete( true ); @@ -321,10 +321,10 @@ LinePopup::~LinePopup() } } -PluginKateMakeView::PluginKateMakeView(TQWidget *parent, +PluginKateMakeView::PluginKateMakeView(TQWidget *tqparent, Kate::MainWindow *mainwin, const char* name) : - TQListView(parent,name), + TQListView(tqparent,name), KXMLGUIClient(), win(mainwin), filenameDetector(0L), @@ -334,26 +334,26 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent, m_proc=0; (void) new KAction ( i18n("Next Error"), KShortcut(ALT+CTRL+Key_Right), - this, TQT_SLOT( slotNext() ), + TQT_TQOBJECT(this), TQT_SLOT( slotNext() ), actionCollection(), "make_right" ); (void) new KAction ( i18n("Previous Error"), KShortcut(ALT+CTRL+Key_Left), - this, TQT_SLOT( slotPrev() ), + TQT_TQOBJECT(this), TQT_SLOT( slotPrev() ), actionCollection(), "make_left" ); (void) new KAction ( i18n("Make"), KShortcut(ALT+Key_R), - this, TQT_SLOT( slotValidate() ), + TQT_TQOBJECT(this), TQT_SLOT( slotValidate() ), actionCollection(), "make_check" ); (void) new KAction ( i18n("Configure..."), KShortcut(), - this, TQT_SLOT( slotConfigure() ), + TQT_TQOBJECT(this), TQT_SLOT( slotConfigure() ), actionCollection(), "make_settings" ); setInstance(new KInstance("kate")); - setXMLFile(TQString::fromLatin1("plugins/katemake/ui.rc")); + setXMLFile(TQString::tqfromLatin1("plugins/katemake/ui.rc")); - setFocusPolicy(TQWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); setSorting(COL_LINE); addColumn(i18n("File"), -1); @@ -368,18 +368,18 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent, connect(m_proc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcExited(KProcess*))); connect(m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - this, TQT_SLOT(slotReceivedProcStderr(KProcess*, char*, int))); + TQT_TQOBJECT(this), TQT_SLOT(slotReceivedProcStderr(KProcess*, char*, int))); KConfig c("katemakepluginrc"); c.setGroup("Prefixes"); - source_prefix = c.readEntry("Source",TQString::null); - build_prefix = c.readEntry("Build",TQString::null); + source_prefix = c.readEntry("Source",TQString()); + build_prefix = c.readEntry("Build",TQString()); // if (source_prefix.isEmpty()) { filenameDetector = new TQRegExp( - TQString::fromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); + TQString::tqfromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); } // else { @@ -403,21 +403,21 @@ void PluginKateMakeView::processLine(const TQString &l) kdDebug() << "Got line " << l ; - if (!filenameDetector && l.find(source_prefix)!=0) + if (!filenameDetector && l.tqfind(source_prefix)!=0) { /* ErrorMessage *e = */ (void) new ErrorMessage(this,l); return; } - if (filenameDetector && l.find(*filenameDetector)<0) + if (filenameDetector && l.tqfind(*filenameDetector)<0) { ErrorMessage *e = new ErrorMessage(this,l); kdDebug() << "Got message(1) #" << e->serial() << endl; return; } - int ofs1 = l.find(':'); - int ofs2 = l.find(':',ofs1+1); + int ofs1 = l.tqfind(':'); + int ofs2 = l.tqfind(':',ofs1+1); // TQString m = l.mid(ofs2+1); m.remove('\n'); @@ -452,7 +452,7 @@ void PluginKateMakeView::slotReceivedProcStderr(KProcess *, char *result, int le output_line += l; int nl_p = -1; - while ((nl_p = output_line.find('\n')) > 1) + while ((nl_p = output_line.tqfind('\n')) > 1) { processLine(output_line.left(nl_p+1)); output_line.remove(0,nl_p+1); @@ -504,8 +504,8 @@ void PluginKateMakeView::slotProcExited(KProcess *p) this); clear(); #if 0 - TQListViewItem *i = new TQListViewItem(this,TQString::null, - TQString::null, + TQListViewItem *i = new TQListViewItem(this,TQString(), + TQString(), i18n("No Errors.")); i->setSelectable(false); #else @@ -557,7 +557,7 @@ void PluginKateMakeView::slotClicked(TQListViewItem *item) << globalPos.x() << "," << globalPos.y() << endl; #if 0 KPassivePopup::message( - TQString::fromLatin1("%1:%2").arg(filename).arg(lineno), + TQString::tqfromLatin1("%1:%2").tqarg(filename).tqarg(lineno), msg, this); #else @@ -632,7 +632,7 @@ bool PluginKateMakeView::slotValidate() doc->save(); KURL url(doc->url()); - output_line = TQString::null; + output_line = TQString(); ErrorMessage::resetSerial(); found_error=false; @@ -644,12 +644,12 @@ bool PluginKateMakeView::slotValidate() KMessageBox::sorry(0, i18n("The file <i>%1</i> is not a local file. " "Non-local files cannot be compiled.") - .arg(url.path())); + .tqarg(url.path())); return false; } document_dir = TQFileInfo(url.path()).dirPath(true) + - TQString::fromLatin1("/"); + TQString::tqfromLatin1("/"); if (document_dir.startsWith(source_prefix)) { @@ -662,7 +662,7 @@ bool PluginKateMakeView::slotValidate() make = KStandardDirs::findExe("make"); *m_proc << make; if( make.isEmpty() || ! m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) ) { - KMessageBox::error(0, i18n("<b>Error:</b> Failed to run %1.").arg(make.isEmpty() ? + KMessageBox::error(0, i18n("<b>Error:</b> Failed to run %1.").tqarg(make.isEmpty() ? "make" : make)); return false; } @@ -674,7 +674,7 @@ bool PluginKateMakeView::slotValidate() class Settings : public KDialogBase { public: - Settings( TQWidget *parent, + Settings( TQWidget *tqparent, const TQString &src, const TQString &bld); KLineEdit *edit_src,*edit_bld; @@ -717,7 +717,7 @@ void PluginKateMakeView::slotConfigure() if (!filenameDetector) { filenameDetector = new TQRegExp( - TQString::fromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); + TQString::tqfromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); } } //else diff --git a/kate/make/plugin_katemake.h b/kate/make/plugin_katemake.h index 21014be..f39ba88 100644 --- a/kate/make/plugin_katemake.h +++ b/kate/make/plugin_katemake.h @@ -27,8 +27,8 @@ ** MA 02110-1301, USA. */ -// #define QT_NO_CAST_ASCII (1) -// #define QT_NO_ASCII_CAST (1) +// #define TQT_NO_CAST_ASCII (1) +// #define TQT_NO_ASCII_CAST (1) class TQRegExp; @@ -51,9 +51,10 @@ class TQRegExp; class PluginKateMakeView : public TQListView, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: - PluginKateMakeView(TQWidget *parent, + PluginKateMakeView(TQWidget *tqparent, Kate::MainWindow *mainwin, const char* name); virtual ~PluginKateMakeView(); @@ -92,9 +93,10 @@ protected: class PluginKateMake : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - PluginKateMake( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateMake( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateMake(); void addView (Kate::MainWindow *win); diff --git a/kate/modeline/ModelinePlugin.cpp b/kate/modeline/ModelinePlugin.cpp index 9184f6a..e3d22a1 100644 --- a/kate/modeline/ModelinePlugin.cpp +++ b/kate/modeline/ModelinePlugin.cpp @@ -41,8 +41,8 @@ class PluginView : public KXMLGUIClient K_EXPORT_COMPONENT_FACTORY( katemodelineplugin, KGenericFactory<ModelinePlugin>( "katemodeline" ) ) -ModelinePlugin::ModelinePlugin( TQObject* parent, const char* name, const TQStringList &args ) - : Kate::Plugin ( (Kate::Application *) parent, name ) +ModelinePlugin::ModelinePlugin( TQObject* tqparent, const char* name, const TQStringList &args ) + : Kate::Plugin ( (Kate::Application *) tqparent, name ) { } @@ -97,25 +97,25 @@ void ModelinePlugin::applyModeline() options = vim2.cap(1); } else if( doc->searchText( 0, 0, vim1, &foundAtLine, &foundAtCol, &matchLen ) ) { options = vim1.cap(1); - options.replace( TQRegExp( ":" ), " " ); + options.tqreplace( TQRegExp( ":" ), " " ); } uint configFlags = doc->configFlags(); kdDebug() << "Found modeline: " << options << endl; - if( options.find( TQRegExp( "\\bnoet\\b" ) ) >= 0 ) { + if( options.tqfind( TQRegExp( "\\bnoet\\b" ) ) >= 0 ) { kdDebug() << "Clearing replace tabs" << endl; configFlags &= ~Kate::Document::cfReplaceTabs; - } else if( options.find( TQRegExp( "\\bet\\b" ) ) >= 0 ) { + } else if( options.tqfind( TQRegExp( "\\bet\\b" ) ) >= 0 ) { kdDebug() << "Setting replace tabs" << endl; configFlags |= Kate::Document::cfReplaceTabs; } TQRegExp ts( "ts=(\\d+)" ); - if( options.find( ts ) >= 0 ) { + if( options.tqfind( ts ) >= 0 ) { uint tabWidth = ts.cap(1).toUInt(); kdDebug() << "Setting tab width " << tabWidth << endl; view->setTabWidth( tabWidth ); } TQRegExp tw( "tw=(\\d+)" ); - if( options.find( tw ) >= 0 ) { + if( options.tqfind( tw ) >= 0 ) { uint textWidth = tw.cap(1).toUInt(); kdDebug() << "Setting text width " << textWidth << endl; doc->setWordWrap( true ); diff --git a/kate/modeline/ModelinePlugin.h b/kate/modeline/ModelinePlugin.h index 2f8e2d6..c9ff37f 100644 --- a/kate/modeline/ModelinePlugin.h +++ b/kate/modeline/ModelinePlugin.h @@ -23,9 +23,10 @@ class ModelinePlugin : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - ModelinePlugin( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); + ModelinePlugin( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); virtual ~ModelinePlugin(); void addView (Kate::MainWindow *win); diff --git a/kate/openheader/plugin_kateopenheader.cpp b/kate/openheader/plugin_kateopenheader.cpp index 61cd592..15dbb77 100644 --- a/kate/openheader/plugin_kateopenheader.cpp +++ b/kate/openheader/plugin_kateopenheader.cpp @@ -36,8 +36,8 @@ class PluginView : public KXMLGUIClient K_EXPORT_COMPONENT_FACTORY( kateopenheaderplugin, KGenericFactory<PluginKateOpenHeader>( "kateopenheader" ) ) -PluginKateOpenHeader::PluginKateOpenHeader( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)parent, name ) +PluginKateOpenHeader::PluginKateOpenHeader( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)tqparent, name ) { } @@ -91,9 +91,9 @@ void PluginKateOpenHeader::slotOpenHeader () TQStringList headers( TQStringList() << "h" << "H" << "hh" << "hpp" ); TQStringList sources( TQStringList() << "c" << "cpp" << "cc" << "cp" << "cxx" ); - if( sources.find( extension ) != sources.end() ) { + if( sources.tqfind( extension ) != sources.end() ) { tryOpen( url, headers ); - } else if ( headers.find( extension ) != headers.end() ) { + } else if ( headers.tqfind( extension ) != headers.end() ) { tryOpen( url, sources ); } } diff --git a/kate/openheader/plugin_kateopenheader.h b/kate/openheader/plugin_kateopenheader.h index b198a9f..0556735 100644 --- a/kate/openheader/plugin_kateopenheader.h +++ b/kate/openheader/plugin_kateopenheader.h @@ -31,9 +31,10 @@ class PluginKateOpenHeader : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - PluginKateOpenHeader( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateOpenHeader( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateOpenHeader(); void addView (Kate::MainWindow *win); diff --git a/kate/snippets/CWidgetSnippetsBase.ui b/kate/snippets/CWidgetSnippetsBase.ui index 7f370f9..b694158 100644 --- a/kate/snippets/CWidgetSnippetsBase.ui +++ b/kate/snippets/CWidgetSnippetsBase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>CWidgetSnippetsBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CWidgetSnippetsBase</cstring> </property> @@ -29,14 +29,14 @@ <property name="margin"> <number>0</number> </property> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter13</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Snippet</string> @@ -91,9 +91,9 @@ <string>A list of Snippets, what else</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <vbox> <property name="name"> @@ -102,9 +102,9 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -113,7 +113,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>btnNew</cstring> </property> @@ -124,7 +124,7 @@ <iconset>image1</iconset> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>btnSave</cstring> </property> @@ -135,7 +135,7 @@ <iconset>image2</iconset> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>btnDelete</cstring> </property> @@ -156,7 +156,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>200</width> <height>20</height> @@ -165,7 +165,7 @@ </spacer> </hbox> </widget> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>teSnippetText</cstring> </property> @@ -201,14 +201,14 @@ <includes> <include location="local" impldecl="in implementation">CWidgetSnippetsBase.ui.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>lalala()</signal> -</signals> -<slots> +</Q_SIGNALS> +<Q_SLOTS> <slot>init()</slot> -</slots> +</Q_SLOTS> <functions> - <function returnType="QListViewItem *">insertItem( const QString& name, bool bRename )</function> + <function returnType="TQListViewItem *">insertItem( const TQString& name, bool bRename )</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kate/snippets/CWidgetSnippetsBase.ui.h b/kate/snippets/CWidgetSnippetsBase.ui.h index 539442a..4fdd814 100644 --- a/kate/snippets/CWidgetSnippetsBase.ui.h +++ b/kate/snippets/CWidgetSnippetsBase.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/kate/snippets/csnippet.cpp b/kate/snippets/csnippet.cpp index 2aebb5d..c873949 100644 --- a/kate/snippets/csnippet.cpp +++ b/kate/snippets/csnippet.cpp @@ -9,8 +9,8 @@ ***************************************************************************/ #include "csnippet.h" -CSnippet::CSnippet(TQString sKey, TQString sValue, TQListViewItem *lvi, TQObject *parent, const char *name) - : TQObject(parent, name), _sKey(sKey), _sValue(sValue), _lvi(lvi) {} +CSnippet::CSnippet(TQString sKey, TQString sValue, TQListViewItem *lvi, TQObject *tqparent, const char *name) + : TQObject(tqparent, name), _sKey(sKey), _sValue(sValue), _lvi(lvi) {} CSnippet::~CSnippet() {} diff --git a/kate/snippets/csnippet.h b/kate/snippets/csnippet.h index 3c75db4..ae9bef6 100644 --- a/kate/snippets/csnippet.h +++ b/kate/snippets/csnippet.h @@ -21,8 +21,9 @@ class CSnippet : public TQObject { Q_OBJECT + TQ_OBJECT public: - CSnippet(TQString sKey, TQString sValue, TQListViewItem *lvi, TQObject *parent = 0, const char *name = 0); + CSnippet(TQString sKey, TQString sValue, TQListViewItem *lvi, TQObject *tqparent = 0, const char *name = 0); ~CSnippet(); TQString getKey() { return _sKey; } TQString getValue() { return _sValue; } diff --git a/kate/snippets/cwidgetsnippets.cpp b/kate/snippets/cwidgetsnippets.cpp index e58c15f..819bcaf 100644 --- a/kate/snippets/cwidgetsnippets.cpp +++ b/kate/snippets/cwidgetsnippets.cpp @@ -9,8 +9,8 @@ ***************************************************************************/ #include "cwidgetsnippets.h" -CWidgetSnippets::CWidgetSnippets( TQWidget* parent, const char* name, WFlags fl) - : CWidgetSnippetsBase(parent, name, fl) +CWidgetSnippets::CWidgetSnippets( TQWidget* tqparent, const char* name, WFlags fl) + : CWidgetSnippetsBase(tqparent, name, fl) { } diff --git a/kate/snippets/cwidgetsnippets.h b/kate/snippets/cwidgetsnippets.h index 831f335..f3962e1 100644 --- a/kate/snippets/cwidgetsnippets.h +++ b/kate/snippets/cwidgetsnippets.h @@ -17,7 +17,7 @@ */ class CWidgetSnippets : public CWidgetSnippetsBase { public: - CWidgetSnippets( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + CWidgetSnippets( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~CWidgetSnippets(); diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp index fd594e1..8e0d6cb 100644 --- a/kate/snippets/plugin_katesnippets.cpp +++ b/kate/snippets/plugin_katesnippets.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Stephan M�res <[email protected]> + * Copyright (C) 2004 Stephan M�res <[email protected]> */ #include "plugin_katesnippets.h" @@ -95,12 +95,12 @@ KatePluginSnippetsView::~ KatePluginSnippetsView() { /** * ctor KatePluginSnippets - * @param parent + * @param tqparent * @param name * @return */ -KatePluginSnippets::KatePluginSnippets( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application*)parent, name ) {} +KatePluginSnippets::KatePluginSnippets( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application*)tqparent, name ) {} /** * dtor KatePluginSnippets @@ -170,9 +170,9 @@ void KatePluginSnippetsView::slot_lvSnippetsClicked (TQListViewItem * item) { kv->keyDelete(); } - sText.replace( TQRegExp("<mark/>"), sSelection ); - sText.replace( TQRegExp("<date/>"), TQDate::currentDate().toString(Qt::LocalDate) ); - sText.replace( TQRegExp("<time/>"), TQTime::currentTime().toString(Qt::LocalDate) ); + sText.tqreplace( TQRegExp("<mark/>"), sSelection ); + sText.tqreplace( TQRegExp("<date/>"), TQDate::tqcurrentDate().toString(Qt::LocalDate) ); + sText.tqreplace( TQRegExp("<time/>"), TQTime::currentTime().toString(Qt::LocalDate) ); kv->insertText ( sText ); } kv->setFocus(); @@ -254,7 +254,7 @@ void KatePluginSnippetsView::readConfig() { lvi = insertItem(sKey, false); - lSnippets.append( new CSnippet(sKey, sValue, lvi, this) ); + lSnippets.append( new CSnippet(sKey, sValue, lvi, TQT_TQOBJECT(this)) ); } // <defaults> @@ -262,12 +262,12 @@ void KatePluginSnippetsView::readConfig() { sKey = "DEBUG variable"; sValue = "## < DEBUG >\nout \"<pre>\\$<mark/> : \\\"$<mark/>\\\"\\n</pre>\"\n## </DEBUG >\n"; lvi = insertItem(sKey, false); - lSnippets.append( new CSnippet(sKey, sValue, lvi, this) ); + lSnippets.append( new CSnippet(sKey, sValue, lvi, TQT_TQOBJECT(this)) ); sKey = "proc-header"; sValue = "## [created : <date/>, <time/>]\n## Description:\n## ============\n## The function \"<mark/>\" ...\n##\n##\n##\n##\n## Input:\n## ======\n##\n##\n##\nproc <mark/> {args} {\n\n ## add your code here\n\n return \"\"\n}\n"; lvi = insertItem(sKey, false); - lSnippets.append( new CSnippet(sKey, sValue, lvi, this) ); + lSnippets.append( new CSnippet(sKey, sValue, lvi, TQT_TQOBJECT(this)) ); } // </defaults> diff --git a/kate/snippets/plugin_katesnippets.h b/kate/snippets/plugin_katesnippets.h index aac5049..0aca230 100644 --- a/kate/snippets/plugin_katesnippets.h +++ b/kate/snippets/plugin_katesnippets.h @@ -31,6 +31,7 @@ class KatePluginSnippetsView : public CWidgetSnippets, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT friend class KatePluginSnippets; @@ -62,9 +63,10 @@ public: class KatePluginSnippets : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - KatePluginSnippets( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginSnippets( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~KatePluginSnippets(); void addView (Kate::MainWindow *win); diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp index cfc4619..e789c20 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.cpp +++ b/kate/tabbarextension/plugin_katetabbarextension.cpp @@ -73,17 +73,17 @@ KatePluginFactory::~KatePluginFactory() } TQObject* KatePluginFactory::createObject( - TQObject* parent, const char* name, const char*, const TQStringList & ) + TQObject* tqparent, const char* name, const char*, const TQStringList & ) { - return new KatePluginTabBarExtension( parent, name ); + return new KatePluginTabBarExtension( tqparent, name ); } KInstance* KatePluginFactory::s_instance = 0L; // BEGIN KatePluginTabBarExtension KatePluginTabBarExtension::KatePluginTabBarExtension( - TQObject* parent, const char* name ) - : Kate::Plugin ( (Kate::Application*)parent, name ), + TQObject* tqparent, const char* name ) + : Kate::Plugin ( (Kate::Application*)tqparent, name ), pConfig(new KConfig("katetabbarextensionpluginrc")) { pConfig->setGroup("global"); @@ -122,8 +122,8 @@ void KatePluginTabBarExtension::addView(Kate::MainWindow *win) KToolBar* toolbar = dynamic_cast<KToolBar*> (win->guiFactory()->container("tabbarExtensionToolBar", view)); if (toolbar) { - connect(toolbar, TQT_SIGNAL( orientationChanged(Orientation) ), - view->tabbar, TQT_SLOT( slotMoved(Orientation) )); + connect(toolbar, TQT_SIGNAL( orientationChanged(Qt::Orientation) ), + view->tabbar, TQT_SLOT( slotMoved(Qt::Orientation) )); } } @@ -175,8 +175,8 @@ void KatePluginTabBarExtension::applyConfig( KateTabBarExtensionConfigPage* p ) // BEGIN KateTabBarButton KateTabBarButton::KateTabBarButton(Kate::ViewManager* pViewManager, - Kate::Document *pDoc, TQWidget * parent, const char * name) - : TQPushButton(parent, name), + Kate::Document *pDoc, TQWidget * tqparent, const char * name) + : TQPushButton(tqparent, name), modified(false), myDocID(pDoc->documentNumber()), doc(pDoc), @@ -184,7 +184,7 @@ KateTabBarButton::KateTabBarButton(Kate::ViewManager* pViewManager, { setFlat(true); setToggleButton(true); - setFocusPolicy(TQWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); setText(pDoc->docName()); @@ -264,8 +264,8 @@ void KateTabBarButton::setOn(bool on) // BEGIN KateTabBarExtension KateTabBarExtension::KateTabBarExtension( Kate::DocumentManager *pDocManager, Kate::MainWindow *win, bool bHorizOrientation, bool bSort, - TQWidget* parent, const char* name, WFlags f ) - : TQWidget(parent, name, f), + TQWidget* tqparent, const char* name, WFlags f ) + : TQWidget(tqparent, name, f), pCurrentTab(0), m_win(win), m_docManager(pDocManager), m_sort(false) { if (bHorizOrientation) { @@ -295,7 +295,7 @@ KateTabBarExtension::KateTabBarExtension( Kate::DocumentManager *pDocManager, KateTabBarExtension::~KateTabBarExtension() {} -void KateTabBarExtension::slotMoved(Orientation o) +void KateTabBarExtension::slotMoved(Qt::Orientation o) { // the tabbar moved (top, right, bottom, left or fluently) switch (o) { @@ -475,8 +475,8 @@ void KateTabBarExtension::slotViewChanged () // BEGIN KateTabBarExtensionConfigPage KateTabBarExtensionConfigPage::KateTabBarExtensionConfigPage( - TQObject* /*parent*/ /*= 0L*/, TQWidget *parentWidget /*= 0L*/) - : Kate::PluginConfigPage( parentWidget ) + TQObject* /*tqparent*/ /*= 0L*/, TQWidget *tqparentWidget /*= 0L*/) + : Kate::PluginConfigPage( tqparentWidget ) { TQVBoxLayout* top = new TQVBoxLayout(this, 0, KDialogBase::spacingHint()); diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h index ca668ba..1655e18 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.h +++ b/kate/tabbarextension/plugin_katetabbarextension.h @@ -61,13 +61,14 @@ class MyPtrList : public TQPtrList <KateTabBarButton> class KatePluginFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: KatePluginFactory(); virtual ~KatePluginFactory(); - virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, - const char* name = "TQObject", const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, + const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; @@ -77,20 +78,21 @@ class KatePluginFactory : public KLibFactory * This class implements a single tab. Every tab represents a document and shows * the current flag (modified: true or false). */ -class KateTabBarButton: public QPushButton +class KateTabBarButton: public TQPushButton { Q_OBJECT + TQ_OBJECT public: /** * constructor * @param pViewManager pointer to kate's the view manager * @param pDoc pointer to the document, that the tab button represents - * @param parent parent widget + * @param tqparent tqparent widget * @param name name of the tab button */ KateTabBarButton(Kate::ViewManager* pViewManager, Kate::Document *pDoc, - TQWidget* parent = 0, const char * name = 0); + TQWidget* tqparent = 0, const char * name = 0); /** * standard destructor (emtpy) @@ -150,9 +152,10 @@ class KateTabBarButton: public QPushButton /** * This class handels all tabs and implements a full-featured "tabbar". */ -class KateTabBarExtension : public QWidget +class KateTabBarExtension : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** @@ -161,13 +164,13 @@ class KateTabBarExtension : public QWidget * @param win pinter to the main window * @param bHorizOrientation true, if orientation is Qt::Horizontal * @param bSort true, if orientation is Qt::Horizontal - * @param parent parent widget + * @param tqparent tqparent widget * @param name name of widget * @param f widget flags */ KateTabBarExtension( Kate::DocumentManager *pDocManager, Kate::MainWindow *win, bool bHorizOrientation, bool bSort, - TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); + TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); /** standard destructor */ ~KateTabBarExtension(); @@ -241,11 +244,11 @@ class KateTabBarExtension : public QWidget * called whenever the toolbar's orientation changes * @param o new orientation [Qt::Horizontal or Qt::Vertical] */ - void slotMoved(Orientation o); + void slotMoved(Qt::Orientation o); private: KateTabBarButton* pCurrentTab; ///< pointer to the current tab - TQBoxLayout* top; ///< layout that contains all tabs + TQBoxLayout* top; ///< tqlayout that contains all tabs Kate::MainWindow* m_win; ///< pointer to the main window Kate::DocumentManager* m_docManager; ///< pointer to the document manager // TQPtrList <KateTabBarButton> m_tabs; ///< list containing all tabs @@ -260,11 +263,12 @@ class KateTabBarExtension : public QWidget class KateTabBarExtensionConfigPage : public Kate::PluginConfigPage { Q_OBJECT + TQ_OBJECT friend class KatePluginTabBarExtension; public: - KateTabBarExtensionConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L); + KateTabBarExtensionConfigPage (TQObject* tqparent = 0L, TQWidget *tqparentWidget = 0L); ~KateTabBarExtensionConfigPage (); /** @@ -294,9 +298,10 @@ class KateTabBarExtensionConfigPage : public Kate::PluginConfigPage class KatePluginTabBarExtension : public Kate::Plugin, Kate::PluginViewInterface, Kate::PluginConfigInterfaceExtension { Q_OBJECT + TQ_OBJECT public: - KatePluginTabBarExtension( TQObject* parent = 0, const char* name = 0 ); + KatePluginTabBarExtension( TQObject* tqparent = 0, const char* name = 0 ); virtual ~KatePluginTabBarExtension(); void addView (Kate::MainWindow *win); diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp index 2d8e446..c003beb 100644 --- a/kate/textfilter/plugin_katetextfilter.cpp +++ b/kate/textfilter/plugin_katetextfilter.cpp @@ -44,8 +44,8 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -PluginKateTextFilter::PluginKateTextFilter( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)parent, name ), +PluginKateTextFilter::PluginKateTextFilter( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)tqparent, name ), Kate::Command(), m_pFilterShellProcess (NULL) { @@ -95,7 +95,7 @@ splitString (TQString q, char c, TQStringList &list) // PCP int pos; TQString item; - while ( (pos = q.find(c)) >= 0) + while ( (pos = q.tqfind(c)) >= 0) { item = q.left(pos); list.append(item); @@ -130,7 +130,7 @@ slipInNewText (Kate::View & view, TQString pre, TQString marked, TQString post, // TODO: fix OnceAndOnlyOnce between this module and plugin_katehtmltools.cpp - if (reselect && preDeleteLine == line && -1 == marked.find ('\n')) + if (reselect && preDeleteLine == line && -1 == marked.tqfind ('\n')) if (preDeleteLine == line && preDeleteCol == col) { view.setCursorPosition (line, col + pre.length () + marked.length () - 1); @@ -161,7 +161,7 @@ KatePrompt // TODO: Make this a "memory edit" field with a combo box // containing prior entries - KLineEditDlg dlg(strPrompt, TQString::null, that); + KLineEditDlg dlg(strPrompt, TQString(), that); dlg.setCaption(strTitle); KCompletion *comple=dlg.lineEdit()->completionObject(); comple->setItems(*completionList); @@ -333,4 +333,4 @@ bool PluginKateTextFilter::exec( Kate::View *v, const TQString &cmd, TQString &m return true; } //END -// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; diff --git a/kate/textfilter/plugin_katetextfilter.h b/kate/textfilter/plugin_katetextfilter.h index 2d5678d..a3aed2c 100644 --- a/kate/textfilter/plugin_katetextfilter.h +++ b/kate/textfilter/plugin_katetextfilter.h @@ -33,9 +33,10 @@ class PluginKateTextFilter : public Kate::Plugin, public Kate::PluginViewInterface, public Kate::Command { Q_OBJECT + TQ_OBJECT public: - PluginKateTextFilter( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateTextFilter( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateTextFilter(); void addView (Kate::MainWindow *win); @@ -62,4 +63,4 @@ class PluginKateTextFilter : public Kate::Plugin, public Kate::PluginViewInterfa }; #endif // _PLUGIN_KANT_TEXTFILTER_H -// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp index 253c9d0..2f94759 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.cpp +++ b/kate/xmlcheck/plugin_katexmlcheck.cpp @@ -54,8 +54,8 @@ K_EXPORT_COMPONENT_FACTORY( katexmlcheckplugin, KGenericFactory<PluginKateXMLCheck>( "katexmlcheck" ) ) -PluginKateXMLCheck::PluginKateXMLCheck( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)parent, name ) +PluginKateXMLCheck::PluginKateXMLCheck( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)tqparent, name ) { } @@ -94,12 +94,12 @@ void PluginKateXMLCheck::removeView(Kate::MainWindow *win) //--------------------------------- -PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow *mainwin,const char* name) - :TQListView(parent,name),KXMLGUIClient(),win(mainwin) +PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *tqparent,Kate::MainWindow *mainwin,const char* name) + :TQListView(tqparent,name),KXMLGUIClient(),win(mainwin) { m_tmp_file=0; m_proc=0; - (void) new KAction ( i18n("Validate XML"), 0, this, + (void) new KAction ( i18n("Validate XML"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotValidate() ), actionCollection(), "xml_check" ); // TODO?: //(void) new KAction ( i18n("Indent XML"), 0, this, @@ -109,7 +109,7 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow setXMLFile("plugins/katexmlcheck/ui.rc"); - setFocusPolicy(TQWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); addColumn(i18n("#"), -1); addColumn(i18n("Line"), -1); setColumnAlignment(1, AlignRight); @@ -120,7 +120,7 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow setResizeMode(TQListView::LastColumn); connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotClicked(TQListViewItem *))); -/* TODO?: invalidate the listview when document has changed +/* TODO?: tqinvalidate the listview when document has changed Kate::View *kv = application()->activeMainWindow()->viewManager()->activeView(); if( ! kv ) { kdDebug() << "Warning: no Kate::View" << endl; @@ -189,10 +189,10 @@ void PluginKateXMLCheckView::slotProcExited(KProcess*) for(TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) { TQString line = *it; line_count++; - int semicolon_1 = line.find(':'); - int semicolon_2 = line.find(':', semicolon_1+1); - int semicolon_3 = line.find(':', semicolon_2+2); - int caret_pos = line.find('^'); + int semicolon_1 = line.tqfind(':'); + int semicolon_2 = line.tqfind(':', semicolon_1+1); + int semicolon_3 = line.tqfind(':', semicolon_2+2); + int caret_pos = line.tqfind('^'); if( semicolon_1 != -1 && semicolon_2 != -1 && semicolon_3 != -1 ) { linenumber = line.mid(semicolon_1+1, semicolon_2-semicolon_1-1).stripWhiteSpace(); linenumber = linenumber.rightJustify(6, ' '); // for sorting numbers @@ -280,7 +280,7 @@ bool PluginKateXMLCheckView::slotValidate() if( m_tmp_file->status() != 0 ) { kdDebug() << "Error (slotValidate()): could not create '" << m_tmp_file->name() << "': " << m_tmp_file->status() << endl; KMessageBox::error(0, i18n("<b>Error:</b> Could not create " - "temporary file '%1'.").arg(m_tmp_file->name())); + "temporary file '%1'.").tqarg(m_tmp_file->name())); delete m_tmp_file; m_tmp_file=0L; return false; @@ -317,7 +317,7 @@ bool PluginKateXMLCheckView::slotValidate() // and needs to be ignored then): TQRegExp re("<!--.*-->"); re.setMinimal(true); - text_start.replace(re, ""); + text_start.tqreplace(re, ""); TQRegExp re_doctype("<!DOCTYPE\\s+(.*)\\s+(?:PUBLIC\\s+[\"'].*[\"']\\s+[\"'](.*)[\"']|SYSTEM\\s+[\"'](.*)[\"'])", false); re_doctype.setMinimal(true); @@ -336,7 +336,7 @@ bool PluginKateXMLCheckView::slotValidate() m_validating = true; *m_proc << "--valid"; } - } else if( text_start.find("<!DOCTYPE") != -1 ) { + } else if( text_start.tqfind("<!DOCTYPE") != -1 ) { // DTD is inside the XML file m_validating = true; *m_proc << "--valid"; diff --git a/kate/xmlcheck/plugin_katexmlcheck.h b/kate/xmlcheck/plugin_katexmlcheck.h index b078f59..89c6c59 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.h +++ b/kate/xmlcheck/plugin_katexmlcheck.h @@ -44,9 +44,10 @@ class PluginKateXMLCheckView : public TQListView, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: - PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow *mainwin,const char* name); + PluginKateXMLCheckView(TQWidget *tqparent,Kate::MainWindow *mainwin,const char* name); virtual ~PluginKateXMLCheckView(); Kate::MainWindow *win; @@ -72,9 +73,10 @@ class PluginKateXMLCheckView : public TQListView, public KXMLGUIClient class PluginKateXMLCheck : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - PluginKateXMLCheck( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateXMLCheck( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateXMLCheck(); void addView (Kate::MainWindow *win); diff --git a/kate/xmltools/html4-loose.dtd.xml b/kate/xmltools/html4-loose.dtd.xml index f7b48d0..03505ae 100644 --- a/kate/xmltools/html4-loose.dtd.xml +++ b/kate/xmltools/html4-loose.dtd.xml @@ -689,11 +689,11 @@ type="param" > <text-expanded>align (left|center|right|justify|char) #IMPLIED - char CDATA #IMPLIED -- alignment char, e.g. char=':' -- - charoff CDATA #IMPLIED -- offset for alignment char --</text-expanded> + char CDATA #IMPLIED -- tqalignment char, e.g. char=':' -- + charoff CDATA #IMPLIED -- offset for tqalignment char --</text-expanded> <text>align (left|center|right|justify|char) #IMPLIED - char %Character; #IMPLIED -- alignment char, e.g. char=':' -- - charoff %Length; #IMPLIED -- offset for alignment char --</text> + char %Character; #IMPLIED -- tqalignment char, e.g. char=':' -- + charoff %Length; #IMPLIED -- offset for tqalignment char --</text> </entity> <entity name="pre.exclusion" @@ -3621,8 +3621,8 @@ %attrs; -- %coreattrs, %i18n, %events -- span NUMBER 1 -- default number of columns in group -- width %MultiLength; #IMPLIED -- default width for enclosed COLs -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- </attdecl> <attribute name="onmouseout" type="#IMPLIED" @@ -4909,8 +4909,8 @@ <attlist name="TBODY"> <attdecl> -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- </attdecl> <attribute name="onmouseout" type="#IMPLIED" @@ -5086,7 +5086,7 @@ name CDATA #IMPLIED -- allows applets to find each other -- width %Length; #REQUIRED -- initial width -- height %Length; #REQUIRED -- initial height -- - align %IAlign; #IMPLIED -- vertical or horizontal alignment -- + align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- hspace %Pixels; #IMPLIED -- horizontal gutter -- vspace %Pixels; #IMPLIED -- vertical gutter -- </attdecl> @@ -5170,8 +5170,8 @@ <attlist name="TFOOT"> <attdecl> -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- </attdecl> <attribute name="onmouseout" type="#IMPLIED" @@ -5683,8 +5683,8 @@ %attrs; -- %coreattrs, %i18n, %events -- span NUMBER 1 -- COL attributes affect N columns -- width %MultiLength; #IMPLIED -- column width specification -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- </attdecl> <attribute name="onmouseout" type="#IMPLIED" @@ -6457,7 +6457,7 @@ width %Length; #IMPLIED -- override width -- usemap %URI; #IMPLIED -- use client-side image map -- ismap (ismap) #IMPLIED -- use server-side image map -- - align %IAlign; #IMPLIED -- vertical or horizontal alignment -- + align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- border %Pixels; #IMPLIED -- link border width -- hspace %Pixels; #IMPLIED -- horizontal gutter -- vspace %Pixels; #IMPLIED -- vertical gutter -- @@ -6648,7 +6648,7 @@ rel %LinkTypes; #IMPLIED -- forward link types -- rev %LinkTypes; #IMPLIED -- reverse link types -- accesskey %Character; #IMPLIED -- accessibility key character -- - shape %Shape; rect -- for use with client-side image maps -- + tqshape %Shape; rect -- for use with client-side image maps -- coords %Coords; #IMPLIED -- for use with client-side image maps -- tabindex NUMBER #IMPLIED -- position in tabbing order -- onfocus %Script; #IMPLIED -- the element got the focus -- @@ -6742,7 +6742,7 @@ type="#IMPLIED" value="CDATA" default=""/> -<attribute name="shape" +<attribute name="tqshape" type="" enumeration="yes" value="rect circle poly default" @@ -6956,7 +6956,7 @@ <attlist name="H1"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text alignment -- + %align; -- align, text tqalignment -- </attdecl> <attribute name="title" type="#IMPLIED" @@ -7085,7 +7085,7 @@ <attlist name="H2"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text alignment -- + %align; -- align, text tqalignment -- </attdecl> <attribute name="title" type="#IMPLIED" @@ -7214,7 +7214,7 @@ <attlist name="H3"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text alignment -- + %align; -- align, text tqalignment -- </attdecl> <attribute name="title" type="#IMPLIED" @@ -7439,7 +7439,7 @@ <attlist name="H4"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text alignment -- + %align; -- align, text tqalignment -- </attdecl> <attribute name="title" type="#IMPLIED" @@ -7716,7 +7716,7 @@ <attlist name="H5"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text alignment -- + %align; -- align, text tqalignment -- </attdecl> <attribute name="title" type="#IMPLIED" @@ -8002,7 +8002,7 @@ <attlist name="H6"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text alignment -- + %align; -- align, text tqalignment -- </attdecl> <attribute name="title" type="#IMPLIED" @@ -8645,7 +8645,7 @@ <attlist name="P"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text alignment -- + %align; -- align, text tqalignment -- </attdecl> <attribute name="title" type="#IMPLIED" @@ -9871,7 +9871,7 @@ <attlist name="DIV"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text alignment -- + %align; -- align, text tqalignment -- %reserved; -- reserved for possible future use -- </attdecl> <attribute name="title" @@ -10579,7 +10579,7 @@ usemap %URI; #IMPLIED -- use client-side image map -- name CDATA #IMPLIED -- submit as part of form -- tabindex NUMBER #IMPLIED -- position in tabbing order -- - align %IAlign; #IMPLIED -- vertical or horizontal alignment -- + align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- border %Pixels; #IMPLIED -- link border width -- hspace %Pixels; #IMPLIED -- horizontal gutter -- vspace %Pixels; #IMPLIED -- vertical gutter -- @@ -10824,8 +10824,8 @@ <attlist name="THEAD"> <attdecl> -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- </attdecl> <attribute name="onmouseout" type="#IMPLIED" @@ -11505,7 +11505,7 @@ marginwidth %Pixels; #IMPLIED -- margin widths in pixels -- marginheight %Pixels; #IMPLIED -- margin height in pixels -- scrolling (yes|no|auto) auto -- scrollbar or none -- - align %IAlign; #IMPLIED -- vertical or horizontal alignment -- + align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- height %Length; #IMPLIED -- frame height -- width %Length; #IMPLIED -- frame width -- </attdecl> @@ -11742,7 +11742,7 @@ <attlist name="AREA"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - shape %Shape; rect -- controls interpretation of coords -- + tqshape %Shape; rect -- controls interpretation of coords -- coords %Coords; #IMPLIED -- comma-separated list of lengths -- href %URI; #IMPLIED -- URI for linked resource -- target %FrameTarget; #IMPLIED -- render in this frame -- @@ -11817,7 +11817,7 @@ type="#IMPLIED" value="CDATA" default=""/> -<attribute name="shape" +<attribute name="tqshape" type="" enumeration="yes" value="rect circle poly default" @@ -12054,8 +12054,8 @@ scope %Scope; #IMPLIED -- scope covered by header cells -- rowspan NUMBER 1 -- number of rows spanned by cell -- colspan NUMBER 1 -- number of cols spanned by cell -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- nowrap (nowrap) #IMPLIED -- suppress word wrap -- bgcolor %Color; #IMPLIED -- cell background color -- width %Length; #IMPLIED -- width for cell -- @@ -12476,8 +12476,8 @@ scope %Scope; #IMPLIED -- scope covered by header cells -- rowspan NUMBER 1 -- number of rows spanned by cell -- colspan NUMBER 1 -- number of cols spanned by cell -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- nowrap (nowrap) #IMPLIED -- suppress word wrap -- bgcolor %Color; #IMPLIED -- cell background color -- width %Length; #IMPLIED -- width for cell -- @@ -13024,8 +13024,8 @@ <attlist name="TR"> <attdecl> -- table row -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- bgcolor %Color; #IMPLIED -- background color for row -- </attdecl> <attribute name="onmouseout" @@ -13339,7 +13339,7 @@ onselect %Script; #IMPLIED -- some text was selected -- onchange %Script; #IMPLIED -- the element value was changed -- accept %ContentTypes; #IMPLIED -- list of MIME types for file upload -- - align %IAlign; #IMPLIED -- vertical or horizontal alignment -- + align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- %reserved; -- reserved for possible future use -- </attdecl> <attribute name="accesskey" diff --git a/kate/xmltools/html4-strict.dtd.xml b/kate/xmltools/html4-strict.dtd.xml index bbcf853..063051f 100644 --- a/kate/xmltools/html4-strict.dtd.xml +++ b/kate/xmltools/html4-strict.dtd.xml @@ -594,11 +594,11 @@ type="param" > <text-expanded>align (left|center|right|justify|char) #IMPLIED - char CDATA #IMPLIED -- alignment char, e.g. char=':' -- - charoff CDATA #IMPLIED -- offset for alignment char --</text-expanded> + char CDATA #IMPLIED -- tqalignment char, e.g. char=':' -- + charoff CDATA #IMPLIED -- offset for tqalignment char --</text-expanded> <text>align (left|center|right|justify|char) #IMPLIED - char %Character; #IMPLIED -- alignment char, e.g. char=':' -- - charoff %Length; #IMPLIED -- offset for alignment char --</text> + char %Character; #IMPLIED -- tqalignment char, e.g. char=':' -- + charoff %Length; #IMPLIED -- offset for tqalignment char --</text> </entity> <entity name="pre.exclusion" @@ -3127,8 +3127,8 @@ %attrs; -- %coreattrs, %i18n, %events -- span NUMBER 1 -- default number of columns in group -- width %MultiLength; #IMPLIED -- default width for enclosed COLs -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- </attdecl> <attribute name="onmouseout" type="#IMPLIED" @@ -4148,8 +4148,8 @@ <attlist name="TBODY"> <attdecl> -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- </attdecl> <attribute name="onmouseout" type="#IMPLIED" @@ -4253,8 +4253,8 @@ <attlist name="TFOOT"> <attdecl> -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- </attdecl> <attribute name="onmouseout" type="#IMPLIED" @@ -4734,8 +4734,8 @@ %attrs; -- %coreattrs, %i18n, %events -- span NUMBER 1 -- COL attributes affect N columns -- width %MultiLength; #IMPLIED -- column width specification -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- </attdecl> <attribute name="onmouseout" type="#IMPLIED" @@ -5636,7 +5636,7 @@ rel %LinkTypes; #IMPLIED -- forward link types -- rev %LinkTypes; #IMPLIED -- reverse link types -- accesskey %Character; #IMPLIED -- accessibility key character -- - shape %Shape; rect -- for use with client-side image maps -- + tqshape %Shape; rect -- for use with client-side image maps -- coords %Coords; #IMPLIED -- for use with client-side image maps -- tabindex NUMBER #IMPLIED -- position in tabbing order -- onfocus %Script; #IMPLIED -- the element got the focus -- @@ -5726,7 +5726,7 @@ type="#IMPLIED" value="CDATA" default=""/> -<attribute name="shape" +<attribute name="tqshape" type="" enumeration="yes" value="rect circle poly default" @@ -8923,8 +8923,8 @@ <attlist name="THEAD"> <attdecl> -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- </attdecl> <attribute name="onmouseout" type="#IMPLIED" @@ -9624,7 +9624,7 @@ <attlist name="AREA"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - shape %Shape; rect -- controls interpretation of coords -- + tqshape %Shape; rect -- controls interpretation of coords -- coords %Coords; #IMPLIED -- comma-separated list of lengths -- href %URI; #IMPLIED -- URI for linked resource -- nohref (nohref) #IMPLIED -- this region has no action -- @@ -9694,7 +9694,7 @@ type="#IMPLIED" value="CDATA" default=""/> -<attribute name="shape" +<attribute name="tqshape" type="" enumeration="yes" value="rect circle poly default" @@ -9919,8 +9919,8 @@ scope %Scope; #IMPLIED -- scope covered by header cells -- rowspan NUMBER 1 -- number of rows spanned by cell -- colspan NUMBER 1 -- number of cols spanned by cell -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- </attdecl> <attribute name="onmouseout" type="#IMPLIED" @@ -10250,8 +10250,8 @@ scope %Scope; #IMPLIED -- scope covered by header cells -- rowspan NUMBER 1 -- number of rows spanned by cell -- colspan NUMBER 1 -- number of cols spanned by cell -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- </attdecl> <attribute name="onmouseout" type="#IMPLIED" @@ -10751,8 +10751,8 @@ <attlist name="TR"> <attdecl> -- table row -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- </attdecl> <attribute name="onmouseout" type="#IMPLIED" diff --git a/kate/xmltools/kde-docbook.dtd.xml b/kate/xmltools/kde-docbook.dtd.xml index bf01b59..65130e9 100644 --- a/kate/xmltools/kde-docbook.dtd.xml +++ b/kate/xmltools/kde-docbook.dtd.xml @@ -845,7 +845,7 @@ <entity name="ulcorn" type="gen"> <text-expanded>&#x231C;</text-expanded> </entity> -<entity name="kfind" type="gen"> +<entity name="ktqfind" type="gen"> <text-expanded> <application>KFind</application> </text-expanded> @@ -4451,7 +4451,7 @@ <element-name name="segmentedlist"/> <element-name name="simplelist"/> <element-name name="variablelist"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -4881,7 +4881,7 @@ <attribute name="align" type="#IMPLIED" enumeration="yes" value="left right center" default=""/> <attribute name="role" type="#IMPLIED" value="CDATA" default=""/> </attlist> -<element name="literallayout"> +<element name="literaltqlayout"> <content-model-expanded> <or-group occurrence="*"> @@ -4989,7 +4989,7 @@ </or-group> </content-model-expanded> </element> -<attlist name="literallayout"> +<attlist name="literaltqlayout"> <attribute name="lang" type="#IMPLIED" enumeration="yes" value="af az bg bo br bs ca cs cy da de el en en-GB en-US eo es et eu fa fi fo fr ga gl he hi hr hu id is it ja kn ko lt lv mi mk mt nl no nb nn nso oc pl pt pt-BR pt-PT ro ru si sk sl sr st sv ta te tg th tr uk vi x-wa xh zh zh-CN zh-TW zu" default=""/> <attribute name="width" type="#IMPLIED" value="CDATA" default=""/> <attribute name="format" type="" enumeration="notation" value="linespecific" default="linespecific"/> @@ -5048,7 +5048,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -5267,7 +5267,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -5488,7 +5488,7 @@ <sequence-group> <or-group occurrence="+"> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -5549,7 +5549,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -5668,7 +5668,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -7472,7 +7472,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -7665,7 +7665,7 @@ <element-name name="segmentedlist"/> <element-name name="simplelist"/> <element-name name="variablelist"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -7779,7 +7779,7 @@ <element-name name="segmentedlist"/> <element-name name="simplelist"/> <element-name name="variablelist"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -8025,7 +8025,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -8228,7 +8228,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -8326,7 +8326,7 @@ <attribute name="xreflabel" type="#IMPLIED" value="CDATA" default=""/> <attribute name="status" type="#IMPLIED" value="CDATA" default=""/> <attribute name="lang" type="#IMPLIED" enumeration="yes" value="af az bg bo br bs ca cs cy da de el en en-GB en-US eo es et eu fa fi fo fr ga gl he hi hr hu id is it ja kn ko lt lv mi mk mt nl no nb nn nso oc pl pt pt-BR pt-PT ro ru si sk sl sr st sv ta te tg th tr uk vi x-wa xh zh zh-CN zh-TW zu" default=""/> -<attribute name="parentbook" type="#IMPLIED" value="IDREF" default=""/> +<attribute name="tqparentbook" type="#IMPLIED" value="IDREF" default=""/> <attribute name="class" type="#IMPLIED" enumeration="yes" value="journalarticle productsheet whitepaper techreport specification faq" default=""/> <attribute name="id" type="#IMPLIED" value="ID" default=""/> <attribute name="role" type="#IMPLIED" value="CDATA" default=""/> @@ -8754,7 +8754,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -8900,7 +8900,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -9601,7 +9601,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -9673,7 +9673,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -9754,7 +9754,7 @@ <element-name name="titleabbrev" occurrence="?"/> </sequence-group> <or-group occurrence="+"> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -10513,7 +10513,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -10641,7 +10641,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -10703,7 +10703,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -10768,7 +10768,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -11281,7 +11281,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -11602,7 +11602,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -12033,7 +12033,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -12701,7 +12701,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -12847,7 +12847,7 @@ <element-name name="segmentedlist"/> <element-name name="simplelist"/> <element-name name="variablelist"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -13607,7 +13607,7 @@ <element-name name="segmentedlist"/> <element-name name="simplelist"/> <element-name name="variablelist"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -13758,7 +13758,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -13863,7 +13863,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -14187,7 +14187,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -14679,7 +14679,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -14795,7 +14795,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -14911,7 +14911,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -15027,7 +15027,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -15143,7 +15143,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -15237,7 +15237,7 @@ <element-name name="segmentedlist"/> <element-name name="simplelist"/> <element-name name="variablelist"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -16199,7 +16199,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -16287,7 +16287,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -16372,7 +16372,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -17314,7 +17314,7 @@ <element-name name="segmentedlist"/> <element-name name="simplelist"/> <element-name name="variablelist"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -17401,7 +17401,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -17478,7 +17478,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -17764,7 +17764,7 @@ <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> @@ -17811,7 +17811,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -18170,7 +18170,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -18403,7 +18403,7 @@ <element-name name="segmentedlist"/> <element-name name="simplelist"/> <element-name name="variablelist"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -18671,7 +18671,7 @@ <element-name name="simplelist"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> @@ -18776,7 +18776,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -19127,7 +19127,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -19517,7 +19517,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -19620,7 +19620,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -19897,7 +19897,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -20298,7 +20298,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -20626,7 +20626,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -21006,7 +21006,7 @@ <element-name name="segmentedlist"/> <element-name name="simplelist"/> <element-name name="variablelist"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -21077,7 +21077,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp index 182aeaf..fe5c9f4 100644 --- a/kate/xmltools/plugin_katexmltools.cpp +++ b/kate/xmltools/plugin_katexmltools.cpp @@ -52,7 +52,7 @@ FIXME: TODO: -check for mem leaks --add "Go to opening/parent tag"? +-add "Go to opening/tqparent tag"? -check doctype to get top-level element -can undo behaviour be improved?, e.g. the plugins internal deletions of text don't have to be an extra step @@ -63,7 +63,7 @@ TODO: but then at <xsl:template match="/"><html> it will only show you HTML elements! =>So better "Assign meta DTD" and "Add meta DTD", the latter will expand the current meta DTD -Option to insert empty element in <empty/> form --Show expanded entities with TQChar::TQChar( int rc ) + unicode font +-Show expanded entities with TQChar::TQChar( int rc ) + tqunicode font -Don't ignore entities defined in the document's prologue -Only offer 'valid' elements, i.e. don't take the elements as a set but check if the DTD is matched ( order, number of occurences, ... ) @@ -113,8 +113,8 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -PluginKateXMLTools::PluginKateXMLTools( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application*)parent, name ) +PluginKateXMLTools::PluginKateXMLTools( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application*)tqparent, name ) { //kdDebug() << "PluginKateXMLTools constructor called" << endl; @@ -132,7 +132,7 @@ PluginKateXMLTools::PluginKateXMLTools( TQObject* parent, const char* name, cons m_dtds.setAutoDelete( true ); - m_documentManager = ((Kate::Application*)parent)->documentManager(); + m_documentManager = ((Kate::Application*)tqparent)->documentManager(); // connect( m_documentManager, TQT_SIGNAL(documentCreated()), // this, TQT_SLOT(slotDocumentCreated()) ); @@ -239,7 +239,7 @@ void PluginKateXMLTools::backspacePressed() void PluginKateXMLTools::emptyKeyEvent() { - keyEvent( 0, 0, TQString::null ); + keyEvent( 0, 0, TQString() ); } void PluginKateXMLTools::keyEvent( int, int, const TQString &/*s*/ ) @@ -282,12 +282,12 @@ void PluginKateXMLTools::keyEvent( int, int, const TQString &/*s*/ ) else if( leftCh == "<" ) { kdDebug() << "*outside tag -> get elements" << endl; - TQString parentElement = getParentElement( *kv, true ); - kdDebug() << "parent: " << parentElement << endl; - allowed = m_docDtds[docNumber]->allowedElements(parentElement ); + TQString tqparentElement = getParentElement( *kv, true ); + kdDebug() << "tqparent: " << tqparentElement << endl; + allowed = m_docDtds[docNumber]->allowedElements(tqparentElement ); m_mode = elements; } - // TODO: optionally close parent tag if not left=="/>" + // TODO: optionally close tqparent tag if not left=="/>" else if( leftCh == " " || (isQuote(leftCh) && secondLeftCh == "=") ) { // TODO: check secondLeftChar, too?! then you don't need to trigger @@ -330,7 +330,7 @@ void PluginKateXMLTools::keyEvent( int, int, const TQString &/*s*/ ) if( allowed.count() >= 1 && allowed[0] != "__EMPTY" ) { - allowed = sortQStringList( allowed ); + allowed = sortTQStringList( allowed ); connectSlots( kv ); kv->showCompletionBox( stringListToCompletionEntryList( allowed ), 0, false ); m_popupOpenCol = col; @@ -440,8 +440,8 @@ void PluginKateXMLTools::getDTD() else if ( doctype == "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" ) filename = "kde-docbook.dtd.xml"; } - else if( documentStart.find("<xsl:stylesheet" ) != -1 && - documentStart.find( "xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"") != -1 ) + else if( documentStart.tqfind("<xsl:stylesheet" ) != -1 && + documentStart.tqfind( "xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"") != -1 ) { /* XSLT doesn't have a doctype/DTD. We look for an xsl:stylesheet tag instead. Example: @@ -466,9 +466,9 @@ void PluginKateXMLTools::getDTD() url.setFileName( defaultDir + filename ); KMessageBox::information(0, i18n("The current file has been identified " "as a document of type \"%1\". The meta DTD for this document type " - "will now be loaded.").arg( doctype ), + "will now be loaded.").tqarg( doctype ), i18n( "Loading XML Meta DTD" ), - TQString::fromLatin1( "DTDAssigned") ); + TQString::tqfromLatin1( "DTDAssigned") ); } if( url.isEmpty() ) @@ -503,7 +503,7 @@ void PluginKateXMLTools::slotFinished( KIO::Job *job ) { // catch failed loading loading via http: KMessageBox::error(0, i18n("The file '%1' could not be opened. " - "The server returned an error.").arg( m_urlString ), + "The server returned an error.").tqarg( m_urlString ), i18n( "XML Plugin Error") ); } else @@ -528,7 +528,7 @@ void PluginKateXMLTools::slotData( KIO::Job *, const TQByteArray &data ) void PluginKateXMLTools::assignDTD( PseudoDTD *dtd, KTextEditor::Document *doc ) { - m_docDtds.replace( doc->documentNumber(), dtd ); + m_docDtds.tqreplace( doc->documentNumber(), dtd ); connect( doc, TQT_SIGNAL(charactersInteractivelyInserted(int,int,const TQString&) ), this, TQT_SLOT(keyEvent(int,int,const TQString&)) ); @@ -555,11 +555,11 @@ void PluginKateXMLTools::slotInsertElement() } PseudoDTD *dtd = m_docDtds[kv->document()->documentNumber()]; - TQString parentElement = getParentElement( *kv, false ); + TQString tqparentElement = getParentElement( *kv, false ); TQStringList allowed; if( dtd ) - allowed = dtd->allowedElements(parentElement ); + allowed = dtd->allowedElements(tqparentElement ); InsertElement *dialog = new InsertElement( ( TQWidget *)application()->activeMainWindow()->viewManager()->activeView(), "insertXml" ); @@ -579,7 +579,7 @@ void PluginKateXMLTools::slotInsertElement() if ( dtd && dtd->allowedAttributes(list[0]).count() ) adjust++; // the ">" - if ( dtd && dtd->allowedElements(list[0]).contains("__EMPTY") ) + if ( dtd && dtd->allowedElements(list[0]).tqcontains("__EMPTY") ) { pre = "<" + text + "/>"; if ( adjust ) @@ -603,7 +603,7 @@ void PluginKateXMLTools::slotInsertElement() } /** - * Insert a closing tag for the nearest not-closed parent element. + * Insert a closing tag for the nearest not-closed tqparent element. */ void PluginKateXMLTools::slotCloseElement() { @@ -616,11 +616,11 @@ void PluginKateXMLTools::slotCloseElement() kdDebug() << "Warning: no Kate::View" << endl; return; } - TQString parentElement = getParentElement( *kv, false ); + TQString tqparentElement = getParentElement( *kv, false ); - //kdDebug() << "parentElement: '" << parentElement << "'" << endl; - TQString closeTag = "</" + parentElement + ">"; - if( ! parentElement.isEmpty() ) + //kdDebug() << "tqparentElement: '" << tqparentElement << "'" << endl; + TQString closeTag = "</" + tqparentElement + ">"; + if( ! tqparentElement.isEmpty() ) kv->insertText( closeTag ); } @@ -708,7 +708,7 @@ void PluginKateXMLTools::filterInsertString( KTextEditor::CompletionEntry *ce, T // anders: if the tag is marked EMPTY, insert in form <tagname/> TQString str; int docNumber = kv->document()->documentNumber(); - bool isEmptyTag =m_docDtds[docNumber]->allowedElements(ce->text).contains( "__EMPTY" ); + bool isEmptyTag =m_docDtds[docNumber]->allowedElements(ce->text).tqcontains( "__EMPTY" ); if ( isEmptyTag ) str = "/>"; else @@ -895,10 +895,10 @@ TQString PluginKateXMLTools::insideAttribute( Kate::View &kv ) } /** - * Find the parent element for the current cursor position. That is, + * Find the tqparent element for the current cursor position. That is, * go left and find the first opening element that's not closed yet, * ignoring empty elements. - * Examples: If cursor is at "X", the correct parent element is "p": + * Examples: If cursor is at "X", the correct tqparent element is "p": * <p> <a x="xyz"> foo <i> test </i> bar </a> X * <p> <a x="xyz"> foo bar </a> X * <p> foo <img/> bar X @@ -930,14 +930,14 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle { do { - if( !line-- ) return TQString::null; // reached start of document + if( !line-- ) return TQString(); // reached start of document str = kv.getDoc()->textLine(line ); col = str.length(); } while( !col ); --col; } - ushort ch = str.at( col).unicode(); + ushort ch = str.tqat( col).tqunicode(); switch( parseState ) { @@ -950,7 +950,7 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle { case '<': // hmm... we were actually inside an element - return TQString::null; + return TQString(); case '>': // we just hit an element boundary @@ -981,7 +981,7 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle TQString tag = str.mid( col + 1 ); for( uint pos = 0, len = tag.length(); pos < len; ++pos ) { - ch = tag.at( pos).unicode(); + ch = tag.tqat( pos).tqunicode(); if( ch == ' ' || ch == '\t' || ch == '>' ) { tag.truncate( pos ); break; @@ -1069,14 +1069,14 @@ bool PluginKateXMLTools::isQuote( TQString ch ) // Tools: /** Sort a TQStringList case-insensitively. Static. TODO: make it more simple. */ -TQStringList PluginKateXMLTools::sortQStringList( TQStringList list ) { - // Sort list case-insensitive. This looks complicated but using a QMap - // is even suggested by the Qt documentation. +TQStringList PluginKateXMLTools::sortTQStringList( TQStringList list ) { + // Sort list case-insensitive. This looks complicated but using a TQMap + // is even suggested by the TQt documentation. TQMap<TQString,TQString> mapList; for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { TQString str = *it; - if( mapList.contains(str.lower()) ) + if( mapList.tqcontains(str.lower()) ) { // do not override a previous value, e.g. "Auml" and "auml" are two different // entities, but they should be sorted next to each other. @@ -1091,7 +1091,7 @@ TQStringList PluginKateXMLTools::sortQStringList( TQStringList list ) { list.clear(); TQMap<TQString,TQString>::Iterator it; - // Qt doc: "the items are alphabetically sorted [by key] when iterating over the map": + // TQt doc: "the items are alphabetically sorted [by key] when iterating over the map": for( it = mapList.begin(); it != mapList.end(); ++it ) list.append( it.data() ); @@ -1099,8 +1099,8 @@ TQStringList PluginKateXMLTools::sortQStringList( TQStringList list ) { } //BEGIN InsertElement dialog -InsertElement::InsertElement( TQWidget *parent, const char *name ) - :KDialogBase( parent, name, true, i18n("Insert XML Element" ), +InsertElement::InsertElement( TQWidget *tqparent, const char *name ) + :KDialogBase( tqparent, name, true, i18n("Insert XML Element" ), KDialogBase::Ok|KDialogBase::Cancel) { } @@ -1135,7 +1135,7 @@ TQString InsertElement::showDialog( TQStringList &completions ) if( exec() ) return combo->currentText(); - return TQString::null; + return TQString(); } //END InsertElement dialog -// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; diff --git a/kate/xmltools/plugin_katexmltools.h b/kate/xmltools/plugin_katexmltools.h index 843ab15..e3a6c51 100644 --- a/kate/xmltools/plugin_katexmltools.h +++ b/kate/xmltools/plugin_katexmltools.h @@ -49,10 +49,11 @@ class PluginKateXMLTools : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - PluginKateXMLTools( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateXMLTools( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateXMLTools(); void addView ( Kate::MainWindow *win ); void removeView( Kate::MainWindow *win ); @@ -80,7 +81,7 @@ class PluginKateXMLTools : public Kate::Plugin, Kate::PluginViewInterface protected: - static TQStringList sortQStringList( TQStringList list ); + static TQStringList sortTQStringList( TQStringList list ); //bool eventFilter( TQObject *object, TQEvent *event ); TQString insideTag( Kate::View &kv ); @@ -136,9 +137,10 @@ class InsertElement : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - InsertElement( TQWidget *parent, const char *name ); + InsertElement( TQWidget *tqparent, const char *name ); ~InsertElement(); TQString showDialog( TQStringList &completions ); private slots: @@ -147,4 +149,4 @@ class InsertElement : public KDialogBase }; #endif // _PLUGIN_KANT_XMLTOOLS_H -// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp index 05ac58a..b6cc9b0 100644 --- a/kate/xmltools/pseudo_dtd.cpp +++ b/kate/xmltools/pseudo_dtd.cpp @@ -46,7 +46,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd ) if ( ! doc.setContent( metaDtd) ) { KMessageBox::error(0, i18n("The file '%1' could not be parsed. " - "Please check that the file is well-formed XML.").arg( metaDtdUrl ), + "Please check that the file is well-formed XML.").tqarg( metaDtdUrl ), i18n( "XML Plugin Error") ); return; } @@ -57,7 +57,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd ) "Please check that the file is of this type:\n" "-//Norman Walsh//DTD DTDParse V2.0//EN\n" "You can produce such files with dtdparse. " - "See the Kate Plugin documentation for more information.").arg( metaDtdUrl ), + "See the Kate Plugin documentation for more information.").tqarg( metaDtdUrl ), i18n("XML Plugin Error") ); return; } @@ -73,7 +73,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd ) progress.setMinimumDuration( 400 ); progress.setProgress(0); - // Get information from meta DTD and put it in Qt data structures for fast access: + // Get information from meta DTD and put it in TQt data structures for fast access: if( ! parseEntities( &doc, &progress ) ) return; @@ -116,7 +116,7 @@ bool PseudoDTD::parseElements( TQDomDocument *doc, TQProgressDialog *progress ) progress->setProgress( progress->progress()+1 ); // FIXME!: - //qApp->processEvents(); + //tqApp->processEvents(); subelementList.clear(); TQDomNode node = list.item( i ); @@ -169,7 +169,7 @@ bool PseudoDTD::parseElements( TQDomDocument *doc, TQProgressDialog *progress ) TQDomElement subElem = subNode.toElement(); if( !subElem.isNull() ) { - TQMap<TQString,bool>::Iterator it = subelementList.find( subElem.attribute( "name" ) ); + TQMap<TQString,bool>::Iterator it = subelementList.tqfind( subElem.attribute( "name" ) ); if( it != subelementList.end() ) subelementList.remove(it); } @@ -192,11 +192,11 @@ bool PseudoDTD::parseElements( TQDomDocument *doc, TQProgressDialog *progress ) } /** - * Check which elements are allowed inside a parent element. This returns + * Check which elements are allowed inside a tqparent element. This returns * a list of allowed elements, but it doesn't care about order or if only a certain * number of occurences is allowed. */ -TQStringList PseudoDTD::allowedElements( TQString parentElement ) +TQStringList PseudoDTD::allowedElements( TQString tqparentElement ) { if( m_sgmlSupport ) { @@ -204,12 +204,12 @@ TQStringList PseudoDTD::allowedElements( TQString parentElement ) TQMap<TQString,TQStringList>::Iterator it; for( it = m_elementsList.begin(); it != m_elementsList.end(); ++it ) { - if( it.key().lower() == parentElement.lower() ) + if( it.key().lower() == tqparentElement.lower() ) return it.data(); } } - else if( m_elementsList.contains(parentElement) ) - return m_elementsList[parentElement]; + else if( m_elementsList.tqcontains(tqparentElement) ) + return m_elementsList[tqparentElement]; return TQStringList(); } @@ -232,7 +232,7 @@ bool PseudoDTD::parseAttributes( TQDomDocument *doc, TQProgressDialog *progress progress->setProgress( progress->progress()+1 ); // FIXME!! - //qApp->processEvents(); + //tqApp->processEvents(); ElementAttributes attrs; TQDomNode node = list.item(i); @@ -248,7 +248,7 @@ bool PseudoDTD::parseAttributes( TQDomDocument *doc, TQProgressDialog *progress if( ! attributeElem.isNull() ) { - if ( attributeElem.attribute("type") == "#REQUIRED" ) + if ( attributeElem.attribute("type") == "#RETQUIRED" ) attrs.requiredAttributes.append( attributeElem.attribute("name") ); else attrs.optionalAttributes.append( attributeElem.attribute("name") ); @@ -275,7 +275,7 @@ TQStringList PseudoDTD::allowedAttributes( TQString element ) } } } - else if( m_attributesList.contains(element) ) + else if( m_attributesList.tqcontains(element) ) return m_attributesList[element].optionalAttributes + m_attributesList[element].requiredAttributes; return TQStringList(); @@ -292,7 +292,7 @@ TQStringList PseudoDTD::requiredAttributes( const TQString &element ) const return it.data().requiredAttributes; } } - else if( m_attributesList.contains(element) ) + else if( m_attributesList.tqcontains(element) ) return m_attributesList[element].requiredAttributes; return TQStringList(); @@ -316,7 +316,7 @@ bool PseudoDTD::parseAttributeValues( TQDomDocument *doc, TQProgressDialog *prog progress->setProgress( progress->progress()+1 ); // FIXME! - //qApp->processEvents(); + //tqApp->processEvents(); attributevaluesTmp.clear(); TQDomNode node = list.item(i); @@ -369,10 +369,10 @@ TQStringList PseudoDTD::attributeValues( TQString element, TQString attribute ) } } } - else if( m_attributevaluesList.contains(element) ) + else if( m_attributevaluesList.tqcontains(element) ) { TQMap<TQString,TQStringList> attrVals = m_attributevaluesList[element]; - if( attrVals.contains(attribute) ) + if( attrVals.tqcontains(attribute) ) return attrVals[attribute]; } @@ -397,7 +397,7 @@ bool PseudoDTD::parseEntities( TQDomDocument *doc, TQProgressDialog *progress ) progress->setProgress( progress->progress()+1 ); //FIXME!! - //qApp->processEvents(); + //tqApp->processEvents(); TQDomNode node = list.item(i); TQDomElement elem = node.toElement(); if( !elem.isNull() @@ -410,15 +410,15 @@ bool PseudoDTD::parseEntities( TQDomDocument *doc, TQProgressDialog *progress ) { TQString exp = expandedElem.text(); // TODO: support more than one &#...; in the expanded text - /* TODO include do this when the unicode font problem is solved: - if( exp.contains(TQRegExp("^&#x[a-zA-Z0-9]+;$")) ) { + /* TODO include do this when the tqunicode font problem is solved: + if( exp.tqcontains(TQRegExp("^&#x[a-zA-Z0-9]+;$")) ) { // hexadecimal numbers, e.g. "ȶ" - uint end = exp.find( ";" ); + uint end = exp.tqfind( ";" ); exp = exp.mid( 3, end-3 ); exp = TQChar(); - } else if( exp.contains(TQRegExp("^&#[0-9]+;$")) ) { + } else if( exp.tqcontains(TQRegExp("^&#[0-9]+;$")) ) { // decimal numbers, e.g. "ì" - uint end = exp.find( ";" ); + uint end = exp.tqfind( ";" ); exp = exp.mid( 2, end-2 ); exp = TQChar( exp.toInt() ); } @@ -445,7 +445,7 @@ TQStringList PseudoDTD::entities( TQString start ) if( (*it).startsWith(start) ) { TQString str = it.key(); - /* TODO: show entities as unicode character + /* TODO: show entities as tqunicode character if( !it.data().isEmpty() ) { //str += " -- " + it.data(); TQRegExp re( "&#(\\d+);" ); @@ -463,4 +463,4 @@ TQStringList PseudoDTD::entities( TQString start ) return entities; } -// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; diff --git a/kate/xmltools/pseudo_dtd.h b/kate/xmltools/pseudo_dtd.h index 5da444c..f798bea 100644 --- a/kate/xmltools/pseudo_dtd.h +++ b/kate/xmltools/pseudo_dtd.h @@ -46,11 +46,11 @@ class PseudoDTD void analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd ); - TQStringList allowedElements( TQString parentElement ); - TQStringList allowedAttributes( TQString parentElement ); + TQStringList allowedElements( TQString tqparentElement ); + TQStringList allowedAttributes( TQString tqparentElement ); TQStringList attributeValues( TQString element, TQString attribute ); TQStringList entities( TQString start ); - TQStringList requiredAttributes( const TQString &parentElement ) const; + TQStringList requiredAttributes( const TQString &tqparentElement ) const; protected: @@ -73,4 +73,4 @@ class PseudoDTD }; #endif // _PLUGIN_KANT_XMLTOOLS_DTD_H -// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; diff --git a/kate/xmltools/testcases.xml b/kate/xmltools/testcases.xml index aa1e7dd..9828751 100644 --- a/kate/xmltools/testcases.xml +++ b/kate/xmltools/testcases.xml @@ -40,7 +40,7 @@ the current cursor position, replacing the old value: <td align=""> center, char, justify, left, right <td valign=""> baseline, bottom, middle, top <td valign="foobar"> -- "foobar" should be replaced - <area shape=""> circle, default, poly, rect + <area tqshape=""> circle, default, poly, rect <area foobar=""> (no predefined values) 6. Type "&". A list with named entities should appear. Select one and @@ -62,7 +62,7 @@ it should be inserted, including the trailing semicolon. <a href="foo"> blah <em>X -- <a> inside <a> is not allowed, but this limitation is not part of the DTD, so the plugin will incorrectly claim that <a> is allowed at "X". <head><title> foobar</title> X -- <title> is only allowed once, but the plugin - only looks for the parent element (<head> in this case) and ignores the existing <title>. + only looks for the tqparent element (<head> in this case) and ignores the existing <title>. <a href="foo" X > -- an attribute may only appear once, but "href" is listed by the plugin although it's used already. <td align = "X"> -- whitespace around '=' is not recognized although it's legal. diff --git a/kate/xmltools/xhtml1-frameset.dtd.xml b/kate/xmltools/xhtml1-frameset.dtd.xml index 6530334..73bf4bc 100644 --- a/kate/xmltools/xhtml1-frameset.dtd.xml +++ b/kate/xmltools/xhtml1-frameset.dtd.xml @@ -7533,7 +7533,7 @@ <attdecl> %attrs; %focus; - shape %Shape; "rect" + tqshape %Shape; "rect" coords %Coords; #IMPLIED href %URI; #IMPLIED nohref (nohref) #IMPLIED @@ -7608,7 +7608,7 @@ type="#IMPLIED" value="CDATA" default=""/> -<attribute name="shape" +<attribute name="tqshape" type="" enumeration="yes" value="rect circle poly default" @@ -12001,7 +12001,7 @@ hreflang %LanguageCode; #IMPLIED rel %LinkTypes; #IMPLIED rev %LinkTypes; #IMPLIED - shape %Shape; "rect" + tqshape %Shape; "rect" coords %Coords; #IMPLIED target %FrameTarget; #IMPLIED </attdecl> @@ -12097,7 +12097,7 @@ type="#IMPLIED" value="CDATA" default=""/> -<attribute name="shape" +<attribute name="tqshape" type="" enumeration="yes" value="rect circle poly default" diff --git a/kate/xmltools/xhtml1-strict.dtd.xml b/kate/xmltools/xhtml1-strict.dtd.xml index 907cd86..850de19 100644 --- a/kate/xmltools/xhtml1-strict.dtd.xml +++ b/kate/xmltools/xhtml1-strict.dtd.xml @@ -6190,7 +6190,7 @@ <attdecl> %attrs; %focus; - shape %Shape; "rect" + tqshape %Shape; "rect" coords %Coords; #IMPLIED href %URI; #IMPLIED nohref (nohref) #IMPLIED @@ -6260,7 +6260,7 @@ type="#IMPLIED" value="CDATA" default=""/> -<attribute name="shape" +<attribute name="tqshape" type="" enumeration="yes" value="rect circle poly default" @@ -9838,7 +9838,7 @@ hreflang %LanguageCode; #IMPLIED rel %LinkTypes; #IMPLIED rev %LinkTypes; #IMPLIED - shape %Shape; "rect" + tqshape %Shape; "rect" coords %Coords; #IMPLIED </attdecl> <attribute name="rev" @@ -9929,7 +9929,7 @@ type="#IMPLIED" value="CDATA" default=""/> -<attribute name="shape" +<attribute name="tqshape" type="" enumeration="yes" value="rect circle poly default" diff --git a/kate/xmltools/xhtml1-transitional.dtd.xml b/kate/xmltools/xhtml1-transitional.dtd.xml index 9506803..5f04e87 100644 --- a/kate/xmltools/xhtml1-transitional.dtd.xml +++ b/kate/xmltools/xhtml1-transitional.dtd.xml @@ -7600,7 +7600,7 @@ <attdecl> %attrs; %focus; - shape %Shape; "rect" + tqshape %Shape; "rect" coords %Coords; #IMPLIED href %URI; #IMPLIED nohref (nohref) #IMPLIED @@ -7675,7 +7675,7 @@ type="#IMPLIED" value="CDATA" default=""/> -<attribute name="shape" +<attribute name="tqshape" type="" enumeration="yes" value="rect circle poly default" @@ -11940,7 +11940,7 @@ hreflang %LanguageCode; #IMPLIED rel %LinkTypes; #IMPLIED rev %LinkTypes; #IMPLIED - shape %Shape; "rect" + tqshape %Shape; "rect" coords %Coords; #IMPLIED target %FrameTarget; #IMPLIED </attdecl> @@ -12036,7 +12036,7 @@ type="#IMPLIED" value="CDATA" default=""/> -<attribute name="shape" +<attribute name="tqshape" type="" enumeration="yes" value="rect circle poly default" |