From 395a904bff7b4d6ead445c342f7ac0c5fbf29121 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 18 Jun 2011 17:00:31 +0000 Subject: TQt4 port kdeaddons This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1237404 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kate/cppsymbolviewer/cpp_parser.cpp | 56 +++++----- kate/cppsymbolviewer/plugin_katesymbolviewer.cpp | 14 +-- kate/cppsymbolviewer/plugin_katesymbolviewer.h | 9 +- kate/cppsymbolviewer/tcl_parser.cpp | 6 +- kate/filelistloader/katefll_initplugin.cpp | 8 +- kate/filelistloader/katefll_initplugin.h | 1 + kate/filelistloader/katefll_plugin.cpp | 12 +-- kate/filelistloader/katefll_plugin.h | 1 + kate/filetemplates/plugin/filetemplates.cpp | 92 ++++++++-------- kate/filetemplates/plugin/filetemplates.h | 25 +++-- kate/filetemplates/plugin/katetemplate.xml | 2 +- .../templates/language.xml.katetemplate | 2 +- kate/helloworld/plugin_katehelloworld.cpp | 4 +- kate/helloworld/plugin_katehelloworld.h | 3 +- kate/htmltools/plugin_katehtmltools.cpp | 8 +- kate/htmltools/plugin_katehtmltools.h | 3 +- kate/insertcommand/plugin_kateinsertcommand.cpp | 28 ++--- kate/insertcommand/plugin_kateinsertcommand.h | 19 ++-- kate/kjswrapper/bindings.cpp | 28 ++--- kate/kjswrapper/bindings.h | 9 +- kate/kjswrapper/plugin_katekjswrapper.cpp | 36 +++---- kate/kjswrapper/plugin_katekjswrapper.h | 7 +- kate/kjswrapper/samples/katekjstest1.js | 36 +++---- kate/kpybrowser/kpybrowser.cpp | 24 ++--- kate/kpybrowser/kpybrowser.h | 7 +- kate/kpybrowser/pybrowse_part.cpp | 10 +- kate/kpybrowser/pybrowse_part.h | 4 +- kate/kpybrowser/pybrowsenode.cpp | 16 +-- kate/kpybrowser/pybrowsenode.h | 4 +- kate/make/plugin_katemake.cpp | 92 ++++++++-------- kate/make/plugin_katemake.h | 10 +- kate/modeline/ModelinePlugin.cpp | 14 +-- kate/modeline/ModelinePlugin.h | 3 +- kate/openheader/plugin_kateopenheader.cpp | 8 +- kate/openheader/plugin_kateopenheader.h | 3 +- kate/snippets/CWidgetSnippetsBase.ui | 36 +++---- kate/snippets/CWidgetSnippetsBase.ui.h | 2 +- kate/snippets/csnippet.cpp | 4 +- kate/snippets/csnippet.h | 3 +- kate/snippets/cwidgetsnippets.cpp | 4 +- kate/snippets/cwidgetsnippets.h | 2 +- kate/snippets/plugin_katesnippets.cpp | 20 ++-- kate/snippets/plugin_katesnippets.h | 4 +- .../tabbarextension/plugin_katetabbarextension.cpp | 28 ++--- kate/tabbarextension/plugin_katetabbarextension.h | 29 ++--- kate/textfilter/plugin_katetextfilter.cpp | 12 +-- kate/textfilter/plugin_katetextfilter.h | 5 +- kate/xmlcheck/plugin_katexmlcheck.cpp | 28 ++--- kate/xmlcheck/plugin_katexmlcheck.h | 6 +- kate/xmltools/html4-loose.dtd.xml | 74 ++++++------- kate/xmltools/html4-strict.dtd.xml | 48 ++++----- kate/xmltools/kde-docbook.dtd.xml | 118 ++++++++++----------- kate/xmltools/plugin_katexmltools.cpp | 82 +++++++------- kate/xmltools/plugin_katexmltools.h | 10 +- kate/xmltools/pseudo_dtd.cpp | 50 ++++----- kate/xmltools/pseudo_dtd.h | 8 +- kate/xmltools/testcases.xml | 4 +- kate/xmltools/xhtml1-frameset.dtd.xml | 8 +- kate/xmltools/xhtml1-strict.dtd.xml | 8 +- kate/xmltools/xhtml1-transitional.dtd.xml | 8 +- 60 files changed, 622 insertions(+), 583 deletions(-) (limited to 'kate') 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 : massimocallegari@yahoo.it + email : massitqmocallegari@yahoo.it ***************************************************************************/ /*************************************************************************** * * @@ -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: "< 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 : massimocallegari@yahoo.it + * email : massitqmocallegari@yahoo.it * * 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 !!!!"<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 : massimocallegari@yahoo.it + email : massitqmocallegari@yahoo.it ***************************************************************************/ /*************************************************************************** @@ -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 : massimocallegari@yahoo.it + email : massitqmocallegari@yahoo.it ***************************************************************************/ /*************************************************************************** * * @@ -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( "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"<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("Since the last time you saved the file list, Kate has been reinitialized by another plugin other than the File List Loader. Do you still want to save the list to %1?").arg(m_saveURL.prettyURL()),TQString::null,KStdGuiItem::save(),KStdGuiItem::discard())) + switch (KMessageBox::questionYesNoCancel(0,i18n("Since the last time you saved the file list, Kate has been reinitialized by another plugin other than the File List Loader. Do you still want to save the list to %1?").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("Kate has been reinitialized by another plugin other than the File List Loader. Do you still want to save the list to %1?").arg(m_saveURL.prettyURL()),TQString::null,KStdGuiItem::save(),KStdGuiItem::discard())) + switch (KMessageBox::questionYesNoCancel(0,i18n("Kate has been reinitialized by another plugin other than the File List Loader. Do you still want to save the list to %1?").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 submenus; // ### QMAP + TQDict 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( "

" ); 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("Error opening the file
%1
for reading. The document will not be created.").arg(filename), + i18n("Error opening the file
%1
for reading. The document will not be created.").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(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("

This string will be used to set a name " "for the new document, to display in the title bar and file list.

" - "

If the string contains '%N', that will be replaced with a number " + "

If the string tqcontains '%N', that will be replaced with a number " "increasing with each similarly named file.

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( "

The file
'%1'
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( "Error opening the file
%1
for reading. " - "The document will not be created").arg(u.prettyURL()), + "The document will not be created").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 groupitems; // FIXME QMAP + TQDict 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 '"<templateinfo->tmplate<<"'"<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 @@ - + 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 --> - + 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"<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(proxy->part()->parent()); + PluginKateKJSWrapper *wrap=static_cast(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"<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"<(proxy->part()->parent()); + PluginKateKJSWrapper *wrap=static_cast(proxy->part()->tqparent()); if (!wrap) return; kdDebug()<<"Kate::JS::MainWindow::addBindings - 4"<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 { 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="<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"<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( "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(""); + TQString msg = TQString::tqfromLatin1(""); if (isError()) { - msg.append(TQString::fromLatin1("")); + msg.append(TQString::tqfromLatin1("")); } msg.append(message()); if (isError()) { - msg.append(TQString::fromLatin1("")); + msg.append(TQString::tqfromLatin1("")); } - msg.append(TQString::fromLatin1("")); + msg.append(TQString::tqfromLatin1("")); 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 %1 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("Error: Failed to run %1.").arg(make.isEmpty() ? + KMessageBox::error(0, i18n("Error: 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( "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( "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 @@ CWidgetSnippetsBase - + CWidgetSnippetsBase @@ -29,14 +29,14 @@ 0 - + splitter13 Vertical - + Snippet @@ -91,9 +91,9 @@ A list of Snippets, what else - + - layout24 + tqlayout24 @@ -102,9 +102,9 @@ 0 - + - layout11 + tqlayout11 @@ -113,7 +113,7 @@ 0 - + btnNew @@ -124,7 +124,7 @@ image1 - + btnSave @@ -135,7 +135,7 @@ image2 - + btnDelete @@ -156,7 +156,7 @@ Expanding - + 200 20 @@ -165,7 +165,7 @@ - + teSnippetText @@ -201,14 +201,14 @@ CWidgetSnippetsBase.ui.h - + lalala() - - + + init() - + - insertItem( const QString& name, bool bRename ) + insertItem( const TQString& name, bool bRename ) - + 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 + * Copyright (C) 2004 Stephan M�res */ #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(""), sSelection ); - sText.replace( TQRegExp(""), TQDate::currentDate().toString(Qt::LocalDate) ); - sText.replace( TQRegExp("

\\$ : \\\"$\\\"\\n
\"\n## \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 : ,