diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | 90363652674deb94cd07057428b24fcb1735dbce (patch) | |
tree | 35013223cb731f194f8584cc1c06a023c3c75c85 /kate | |
parent | 627b091fad9df13695f249588e8a58f524eda0fa (diff) | |
download | tdeaddons-90363652674deb94cd07057428b24fcb1735dbce.tar.gz tdeaddons-90363652674deb94cd07057428b24fcb1735dbce.zip |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kate')
44 files changed, 152 insertions, 152 deletions
diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp index 8931bce..fc3bd57 100644 --- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp +++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp @@ -241,8 +241,8 @@ void KatePluginSymbolViewerView::goToSymbol(TQListViewItem *it) kv->gotoLineNumber(it->text(1).toInt(NULL, 10)); } -KatePluginSymbolViewer::KatePluginSymbolViewer( TQObject* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application*)tqparent, name ), +KatePluginSymbolViewer::KatePluginSymbolViewer( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application*)parent, name ), pConfig("katecppsymbolviewerpluginrc") { pConfig.setGroup("global"); @@ -307,7 +307,7 @@ void KatePluginSymbolViewer::applyConfig( KatePluginSymbolViewerConfigPage* p ) // BEGIN KatePluginSymbolViewerConfigPage KatePluginSymbolViewerConfigPage::KatePluginSymbolViewerConfigPage( - TQObject* /*tqparent*/ /*= 0L*/, TQWidget *parentWidget /*= 0L*/) + TQObject* /*parent*/ /*= 0L*/, TQWidget *parentWidget /*= 0L*/) : Kate::PluginConfigPage( parentWidget ) { TQVBoxLayout* top = new TQVBoxLayout(this, 0, diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.h b/kate/cppsymbolviewer/plugin_katesymbolviewer.h index 9d0779f..1c1e3f8 100644 --- a/kate/cppsymbolviewer/plugin_katesymbolviewer.h +++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.h @@ -94,7 +94,7 @@ class KatePluginSymbolViewerConfigPage : public Kate::PluginConfigPage friend class KatePluginSymbolViewer; public: - KatePluginSymbolViewerConfigPage (TQObject* tqparent = 0L, TQWidget *parentWidget = 0L); + KatePluginSymbolViewerConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L); ~KatePluginSymbolViewerConfigPage (); /** @@ -128,7 +128,7 @@ class KatePluginSymbolViewer : public Kate::Plugin, Kate::PluginViewInterface, K TQ_OBJECT public: - KatePluginSymbolViewer( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginSymbolViewer( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~KatePluginSymbolViewer(); void addView (Kate::MainWindow *win); diff --git a/kate/filelistloader/katefll_initplugin.cpp b/kate/filelistloader/katefll_initplugin.cpp index 5d70f46..882ff70 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 * tqparent, const char *name, const TQStringList datalist) - :InitPlugin((Kate::Application*)tqparent,name) +InitPluginKateFileListLoader::InitPluginKateFileListLoader (TQObject * parent, const char *name, const TQStringList datalist) + :InitPlugin((Kate::Application*)parent,name) { } diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp index 0c50e6b..a499ef2 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 * tqparent, const char *name, const TQStringList) - : Plugin((Kate::Application*)tqparent,name), PluginViewInterface(), +PluginKateFileListLoader::PluginKateFileListLoader (TQObject * parent, const char *name, const TQStringList) + : Plugin((Kate::Application*)parent,name), PluginViewInterface(), m_config( new KConfig("katefilelistpluginrc") ) { m_config->setGroup("General"); diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp index 2bae5f8..2ed6036 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* tqparent, const char* name, const char*, const TQStringList & ) +TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) { - return new KateFileTemplates( tqparent, name ); + return new KateFileTemplates( parent, name ); } KInstance* KatePluginFactory::s_instance = 0L; @@ -125,8 +125,8 @@ class TemplateInfo //END TemplateInfo //BEGIN KateFileTemplates -KateFileTemplates::KateFileTemplates( TQObject* tqparent, const char* name ) - : Kate::Plugin ( (Kate::Application*)tqparent, name ), +KateFileTemplates::KateFileTemplates( TQObject* parent, const char* name ) + : Kate::Plugin ( (Kate::Application*)parent, name ), m_actionCollection( new KActionCollection( this, "template_actions", new KInstance("kate") ) ) { // create actions, so that they are shared. @@ -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 *tqparent, TemplateInfo *info, KateFileTemplates *kft ) - : TQWidget( tqparent ), +KateTemplateInfoWidget::KateTemplateInfoWidget( TQWidget *parent, TemplateInfo *info, KateFileTemplates *kft ) + : TQWidget( parent ), info( info ), kft( kft ) { @@ -659,8 +659,8 @@ void KateTemplateInfoWidget::slotHlSet( int id ) //BEGIN KateTemplateWizard // A simple wizard to help create a new template :-) -KateTemplateWizard::KateTemplateWizard( TQWidget *tqparent, KateFileTemplates *kft ) - : KWizard( tqparent ), +KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft ) + : KWizard( parent ), kft( kft ) { // Hide the help button for now @@ -733,7 +733,7 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *tqparent, KateFileTemplates *k map[ "fullname" ] = ""; map[ "email" ] = ""; - KTextEditor::TemplateInterface::expandMacros( map, tqparent ); + KTextEditor::TemplateInterface::expandMacros( map, parent ); TQString sFullname = map["fullname"]; TQString sEmail = map["email"]; TQString _s = sFullname; @@ -1072,8 +1072,8 @@ void KateTemplateWizard::accept() class KateTemplateItem : public KListViewItem { public: - KateTemplateItem( KListViewItem *tqparent, TemplateInfo *templateinfo ) - : KListViewItem( tqparent, templateinfo->tmplate ), templateinfo( templateinfo ) + KateTemplateItem( KListViewItem *parent, TemplateInfo *templateinfo ) + : KListViewItem( parent, 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 *tqparent=0 ) : KNewStuff( type, tqparent ), m_win( tqparent ) {} + KFTNewStuff( const TQString &type, TQWidget *parent=0 ) : KNewStuff( type, parent ), m_win( parent ) {} ~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 *tqparent, const char *name ) - : TQWidget( tqparent, name ) +KateTemplateManager::KateTemplateManager( KateFileTemplates *kft, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) , kft( kft ) { TQGridLayout *lo = new TQGridLayout( this, 2, 6 ); diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h index ec3134c..ce8ccff 100644 --- a/kate/filetemplates/plugin/filetemplates.h +++ b/kate/filetemplates/plugin/filetemplates.h @@ -45,7 +45,7 @@ class KatePluginFactory : public KLibFactory KatePluginFactory(); virtual ~KatePluginFactory(); - virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; @@ -77,7 +77,7 @@ class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface TQ_OBJECT public: - KateFileTemplates( TQObject* tqparent = 0, const char* name = 0 ); + KateFileTemplates( TQObject* parent = 0, const char* name = 0 ); virtual ~KateFileTemplates(); void addView (Kate::MainWindow *win); @@ -161,7 +161,7 @@ class KateTemplateInfoWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - KateTemplateInfoWidget( TQWidget *tqparent=0, TemplateInfo *info=0, KateFileTemplates *kft=0 ); + KateTemplateInfoWidget( TQWidget *parent=0, TemplateInfo *info=0, KateFileTemplates *kft=0 ); ~KateTemplateInfoWidget() {} TemplateInfo *info; @@ -196,7 +196,7 @@ class KateTemplateWizard : public KWizard Q_OBJECT TQ_OBJECT public: - KateTemplateWizard( TQWidget* tqparent, KateFileTemplates *ktf ); + KateTemplateWizard( TQWidget* parent, KateFileTemplates *ktf ); ~KateTemplateWizard() {} public slots: @@ -236,7 +236,7 @@ class KateTemplateManager : public TQWidget Q_OBJECT TQ_OBJECT public: - KateTemplateManager( KateFileTemplates *kft=0, TQWidget *tqparent=0, const char *name=0 ); + KateTemplateManager( KateFileTemplates *kft=0, TQWidget *parent=0, const char *name=0 ); ~KateTemplateManager() {} public slots: diff --git a/kate/helloworld/plugin_katehelloworld.cpp b/kate/helloworld/plugin_katehelloworld.cpp index 216071e..3031f51 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* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application*)tqparent, name ) +KatePluginHelloWorld::KatePluginHelloWorld( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application*)parent, name ) { } diff --git a/kate/helloworld/plugin_katehelloworld.h b/kate/helloworld/plugin_katehelloworld.h index 7c71b01..8dec264 100644 --- a/kate/helloworld/plugin_katehelloworld.h +++ b/kate/helloworld/plugin_katehelloworld.h @@ -15,7 +15,7 @@ class KatePluginHelloWorld : public Kate::Plugin, Kate::PluginViewInterface TQ_OBJECT public: - KatePluginHelloWorld( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginHelloWorld( TQObject* parent = 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 ba7c530..edf2ef1 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* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)tqparent, name ) +PluginKateHtmlTools::PluginKateHtmlTools( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)parent, name ) { } diff --git a/kate/htmltools/plugin_katehtmltools.h b/kate/htmltools/plugin_katehtmltools.h index f517b99..321e98b 100644 --- a/kate/htmltools/plugin_katehtmltools.h +++ b/kate/htmltools/plugin_katehtmltools.h @@ -34,7 +34,7 @@ class PluginKateHtmlTools : public Kate::Plugin, Kate::PluginViewInterface TQ_OBJECT public: - PluginKateHtmlTools( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateHtmlTools( TQObject* parent = 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 74f857e..813b36a 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* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)tqparent, name ), +PluginKateInsertCommand::PluginKateInsertCommand( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)parent, name ), kv ( 0 ), sh ( 0 ) { @@ -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* tqparent, +CmdPrompt::CmdPrompt(TQWidget* parent, const char* name, const TQStringList& cmdhist, const TQString& dir, const TQString& /*docdir*/, int settings) - : KDialogBase (tqparent, name, true, i18n("Insert Command"), Ok|Cancel, Ok, true) + : KDialogBase (parent, name, true, i18n("Insert Command"), Ok|Cancel, Ok, true) { TQWidget *page = new TQWidget( this ); setMainWidget(page); @@ -345,8 +345,8 @@ 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* tqparent, const TQString& text, const TQString& title) - : KDialogBase( tqparent, "wait dialog", true, title, Cancel, Cancel, true ) +WaitDlg::WaitDlg(TQWidget* parent, const TQString& text, const TQString& title) + : KDialogBase( parent, "wait dialog", true, title, Cancel, Cancel, true ) { TQWidget *page = new TQWidget( this ); setMainWidget( page ); @@ -366,7 +366,7 @@ WaitDlg::~WaitDlg() //BEGIN InsertCommandConfigPage // This is the config page for this plugin. -InsertCommandConfigPage::InsertCommandConfigPage(TQObject* /*tqparent*/, +InsertCommandConfigPage::InsertCommandConfigPage(TQObject* /*parent*/, TQWidget *parentWidget) : Kate::PluginConfigPage( parentWidget ) { diff --git a/kate/insertcommand/plugin_kateinsertcommand.h b/kate/insertcommand/plugin_kateinsertcommand.h index 9a33cbe..c5bd551 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.h +++ b/kate/insertcommand/plugin_kateinsertcommand.h @@ -58,7 +58,7 @@ class PluginKateInsertCommand : public Kate::Plugin, TQ_OBJECT public: - PluginKateInsertCommand( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateInsertCommand( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateInsertCommand(); void addView (Kate::MainWindow *win); @@ -106,7 +106,7 @@ class CmdPrompt : public KDialogBase Q_OBJECT TQ_OBJECT public: - CmdPrompt(TQWidget* tqparent=0, + CmdPrompt(TQWidget* parent=0, const char* name=0, const TQStringList& cmdhist=TQStringList(), const TQString& dir=TQString(), @@ -132,7 +132,7 @@ private slots: class WaitDlg : public KDialogBase { public: - WaitDlg(TQWidget* tqparent, + WaitDlg(TQWidget* parent, const TQString& text=TQString(), const TQString& title=i18n("Please Wait")); ~WaitDlg(); @@ -146,7 +146,7 @@ class InsertCommandConfigPage : public Kate::PluginConfigPage friend class PluginKateInsertCommand; public: - InsertCommandConfigPage(TQObject* tqparent = 0L, TQWidget *parentWidget = 0L); + InsertCommandConfigPage(TQObject* parent = 0L, TQWidget *parentWidget = 0L); ~InsertCommandConfigPage() {} /** Reimplemented from Kate::PluginConfigPage diff --git a/kate/kjswrapper/bindings.cpp b/kate/kjswrapper/bindings.cpp index bf6ec28..9f49bcb 100644 --- a/kate/kjswrapper/bindings.cpp +++ b/kate/kjswrapper/bindings.cpp @@ -17,7 +17,7 @@ using namespace Kate::JS; -Bindings::Bindings(TQObject *tqparent): KJSEmbed::Bindings::JSBindingPlugin(tqparent,"KateAppBindings",TQStringList()) { +Bindings::Bindings(TQObject *parent): KJSEmbed::Bindings::JSBindingPlugin(parent,"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 *tqparent, RefCountedObjectDict *dict ):KJSEmbed::JSProxyImp(exec) { +DocumentManager::DocumentManager( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent, RefCountedObjectDict *dict ):KJSEmbed::JSProxyImp(exec) { m_dict=dict; m_dict->incRef(); m_id=id; - m_proxy=tqparent; + m_proxy=parent; } DocumentManager::~DocumentManager() { @@ -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()->tqparent()); + PluginKateKJSWrapper *wrap=static_cast<PluginKateKJSWrapper*>(proxy->part()->parent()); 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 *tqparent,PluginKateKJSWrapper *plugin):KJSEmbed::JSProxyImp(exec) { +Kate::JS::Application::Application( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent,PluginKateKJSWrapper *plugin):KJSEmbed::JSProxyImp(exec) { kdDebug()<<"Kate::JS::Application::Application"<<endl; m_id=id; - m_proxy=tqparent; + m_proxy=parent; m_plugin=plugin; } @@ -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()->tqparent()); + PluginKateKJSWrapper *wrap=static_cast<PluginKateKJSWrapper*>(proxy->part()->parent()); 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 *tqparent,PluginKateKJSWrapper *plugin):KJSEmbed::JSProxyImp(exec) { +Kate::JS::MainWindow::MainWindow( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent,PluginKateKJSWrapper *plugin):KJSEmbed::JSProxyImp(exec) { kdDebug()<<"Kate::JS::MainWindow::MainWindow"<<endl; m_id=id; - m_proxy=tqparent; + m_proxy=parent; m_plugin=plugin; } diff --git a/kate/kjswrapper/bindings.h b/kate/kjswrapper/bindings.h index 4fc8449..a9859c8 100644 --- a/kate/kjswrapper/bindings.h +++ b/kate/kjswrapper/bindings.h @@ -34,7 +34,7 @@ namespace Kate { class Bindings: public KJSEmbed::Bindings::JSBindingPlugin { public: - Bindings(TQObject *tqparent); + Bindings(TQObject *parent); 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; @@ -57,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 *tqparent, RefCountedObjectDict *dict ); + DocumentManager( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent, RefCountedObjectDict *dict ); virtual ~DocumentManager(); private: RefCountedObjectDict *m_dict; @@ -98,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 *tqparent, PluginKateKJSWrapper *plugin ); + Application( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent, PluginKateKJSWrapper *plugin ); ~Application(); private: int m_id; @@ -136,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 *tqparent, PluginKateKJSWrapper *plugin ); + MainWindow( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent, PluginKateKJSWrapper *plugin ); ~MainWindow(); private: int m_id; diff --git a/kate/kjswrapper/plugin_katekjswrapper.cpp b/kate/kjswrapper/plugin_katekjswrapper.cpp index 521024c..926b184 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* tqparent, const char* name, const TQStringList& list) - : Kate::Plugin ( (Kate::Application *)tqparent, name ) { +PluginKateKJSWrapper::PluginKateKJSWrapper( TQObject* parent, const char* name, const TQStringList& list) + : Kate::Plugin ( (Kate::Application *)parent, name ) { m_views.setAutoDelete(true); m_scriptname=list[0]; m_kateAppBindings=new Kate::JS::Bindings(this); @@ -370,18 +370,18 @@ void PluginKateKJSWrapper::applyConfig( KateKJSWrapperConfigPage *p ) #endif } -KateKJSWrapperConfigPage::KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* tqparent, +KateKJSWrapperConfigPage::KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* parent, TQWidget *parentWidget) - : Kate::PluginConfigPage( parentWidget ),m_plugin(tqparent) + : Kate::PluginConfigPage( parentWidget ),m_plugin(parent) { TQVBoxLayout *l=new TQVBoxLayout(this); l->setAutoAdd(true); l->activate(); - KJS::Interpreter *js = tqparent->m_part->interpreter(); + KJS::Interpreter *js = parent->m_part->interpreter(); KJS::ExecState *exec = js->globalExec(); exec->clearException(); KJS::List param; - param.append(tqparent->m_part->factory()->createProxy(exec,this,0)); + param.append(parent->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 31300d9..496f783 100644 --- a/kate/kjswrapper/plugin_katekjswrapper.h +++ b/kate/kjswrapper/plugin_katekjswrapper.h @@ -76,7 +76,7 @@ class PluginKateKJSWrapper : public Kate::Plugin, TQ_OBJECT public: - PluginKateKJSWrapper( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateKJSWrapper( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateKJSWrapper(); void addView (Kate::MainWindow *win); @@ -122,7 +122,7 @@ class KateKJSWrapperConfigPage : public Kate::PluginConfigPage friend class PluginKateKJSWrapper; public: - KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* tqparent = 0L, TQWidget *parentWidget = 0L); + KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* parent = 0L, TQWidget *parentWidget = 0L); ~KateKJSWrapperConfigPage() {}; /** Reimplemented from Kate::PluginConfigPage diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp index e69205f..3ee96e5 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 * tqparent, const char *name): -KListView (tqparent, name) +KPyBrowser::KPyBrowser (TQWidget * parent, const char *name): +KListView (parent, name) { addColumn(i18n("Name")); @@ -380,7 +380,7 @@ KPyBrowser::tip (const TQPoint & p, TQRect & r, TQString & str) ///////////////////////////////////////////////////////////////////// // KateFileList::KFLToolTip implementation -KPyBrowser::KPBToolTip::KPBToolTip (TQWidget * tqparent):TQToolTip (tqparent) +KPyBrowser::KPBToolTip::KPBToolTip (TQWidget * parent):TQToolTip (parent) { } diff --git a/kate/kpybrowser/kpybrowser.h b/kate/kpybrowser/kpybrowser.h index ea0c43f..eafe0af 100644 --- a/kate/kpybrowser/kpybrowser.h +++ b/kate/kpybrowser/kpybrowser.h @@ -38,7 +38,7 @@ class KPyBrowser : public KListView TQ_OBJECT public: /** construtor */ - KPyBrowser(TQWidget* tqparent=0, const char *name=0); + KPyBrowser(TQWidget* parent=0, const char *name=0); /** destructor */ ~KPyBrowser(); void parseText(TQString &pytext); @@ -60,7 +60,7 @@ class KPyBrowser : public KListView class KPBToolTip : public TQToolTip { public: - KPBToolTip(TQWidget *tqparent); + KPBToolTip(TQWidget *parent); protected: void maybeTip( const TQPoint & ); }; diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp index 1cff538..4cd379c 100644 --- a/kate/kpybrowser/pybrowse_part.cpp +++ b/kate/kpybrowser/pybrowse_part.cpp @@ -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* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)tqparent, name ) +KatePluginPyBrowse::KatePluginPyBrowse( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)parent, name ) { } diff --git a/kate/kpybrowser/pybrowse_part.h b/kate/kpybrowser/pybrowse_part.h index f649170..66c71b1 100644 --- a/kate/kpybrowser/pybrowse_part.h +++ b/kate/kpybrowser/pybrowse_part.h @@ -61,7 +61,7 @@ class KatePluginPyBrowse : public Kate::Plugin, public Kate::PluginViewInterface TQ_OBJECT public: - KatePluginPyBrowse( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginPyBrowse( TQObject* parent = 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 9310478..fa49d5c 100644 --- a/kate/kpybrowser/pybrowsenode.cpp +++ b/kate/kpybrowser/pybrowsenode.cpp @@ -99,16 +99,16 @@ static const char *py_function_xpm[] = { }; -PyBrowseNode::PyBrowseNode (TQListViewItem * tqparent, const TQString &name, +PyBrowseNode::PyBrowseNode (TQListViewItem * parent, const TQString &name, const TQString &signature, int nodeType): -TQListViewItem (tqparent, signature) +TQListViewItem (parent, signature) { init (name, signature, nodeType); } -PyBrowseNode::PyBrowseNode (TQListView * tqparent, const TQString &name, +PyBrowseNode::PyBrowseNode (TQListView * parent, const TQString &name, const TQString &signature, int nodeType): -TQListViewItem (tqparent, signature) +TQListViewItem (parent, signature) { init (name, signature, nodeType); } diff --git a/kate/kpybrowser/pybrowsenode.h b/kate/kpybrowser/pybrowsenode.h index 8b18fc1..373547c 100644 --- a/kate/kpybrowser/pybrowsenode.h +++ b/kate/kpybrowser/pybrowsenode.h @@ -37,8 +37,8 @@ class PyBrowseNode : public TQListViewItem { public: TQPixmap *pyClassPixmap; - 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(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(); 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 f61cfe0..bda41f5 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* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)tqparent, name ) +PluginKateMake::PluginKateMake( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)parent, name ) { FUNCTIONSETUP; } @@ -123,11 +123,11 @@ void PluginKateMake::removeView(Kate::MainWindow *win) class ErrorMessage : public TQListViewItem { public: - ErrorMessage(TQListView *tqparent, + ErrorMessage(TQListView *parent, const TQString &filename, int lineno, const TQString &message) : - TQListViewItem(tqparent, + TQListViewItem(parent, filename, (lineno > 0 ? TQString::number(lineno) : TQString()), message) @@ -136,8 +136,8 @@ public: m_lineno = lineno; m_serial = s_serial++; } - ErrorMessage(TQListView *tqparent,const TQString &message) : - TQListViewItem(tqparent,TQString(),TQString(),TQString()) + ErrorMessage(TQListView *parent,const TQString &message) : + TQListViewItem(parent,TQString(),TQString(),TQString()) { TQString m(message); m.remove('\n'); @@ -149,8 +149,8 @@ public: m_serial = s_serial++; setSelectable(false); } - ErrorMessage(TQListView *tqparent, bool start) : - TQListViewItem(tqparent,TQString()) + ErrorMessage(TQListView *parent, bool start) : + TQListViewItem(parent,TQString()) { m_isError=false; m_lineno=-1; @@ -261,7 +261,7 @@ TQString ErrorMessage::fancyMessage() const class LinePopup : public KPassivePopup { protected: - LinePopup( TQWidget *tqparent=0, const char *name=0, WFlags f=0 ); + LinePopup( TQWidget *parent=0, const char *name=0, WFlags f=0 ); virtual ~LinePopup(); public: @@ -292,12 +292,12 @@ LinePopup::~LinePopup() one=0L; } -/* static */ LinePopup *LinePopup::message(TQWidget *tqparent, +/* static */ LinePopup *LinePopup::message(TQWidget *parent, const TQPoint &p, ErrorMessage *e) { if (one) delete one; - LinePopup *pop = new LinePopup( tqparent ); + LinePopup *pop = new LinePopup( parent ); pop->setAutoDelete( true ); @@ -321,10 +321,10 @@ LinePopup::~LinePopup() } } -PluginKateMakeView::PluginKateMakeView(TQWidget *tqparent, +PluginKateMakeView::PluginKateMakeView(TQWidget *parent, Kate::MainWindow *mainwin, const char* name) : - TQListView(tqparent,name), + TQListView(parent,name), KXMLGUIClient(), win(mainwin), filenameDetector(0L), @@ -674,7 +674,7 @@ bool PluginKateMakeView::slotValidate() class Settings : public KDialogBase { public: - Settings( TQWidget *tqparent, + Settings( TQWidget *parent, const TQString &src, const TQString &bld); KLineEdit *edit_src,*edit_bld; diff --git a/kate/make/plugin_katemake.h b/kate/make/plugin_katemake.h index f39ba88..0d3721d 100644 --- a/kate/make/plugin_katemake.h +++ b/kate/make/plugin_katemake.h @@ -54,7 +54,7 @@ class PluginKateMakeView : public TQListView, public KXMLGUIClient TQ_OBJECT public: - PluginKateMakeView(TQWidget *tqparent, + PluginKateMakeView(TQWidget *parent, Kate::MainWindow *mainwin, const char* name); virtual ~PluginKateMakeView(); @@ -96,7 +96,7 @@ class PluginKateMake : public Kate::Plugin, Kate::PluginViewInterface TQ_OBJECT public: - PluginKateMake( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateMake( TQObject* parent = 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 3cf73c4..9184f6a 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* tqparent, const char* name, const TQStringList &args ) - : Kate::Plugin ( (Kate::Application *) tqparent, name ) +ModelinePlugin::ModelinePlugin( TQObject* parent, const char* name, const TQStringList &args ) + : Kate::Plugin ( (Kate::Application *) parent, name ) { } diff --git a/kate/modeline/ModelinePlugin.h b/kate/modeline/ModelinePlugin.h index c9ff37f..a8cc884 100644 --- a/kate/modeline/ModelinePlugin.h +++ b/kate/modeline/ModelinePlugin.h @@ -26,7 +26,7 @@ class ModelinePlugin : public Kate::Plugin, Kate::PluginViewInterface TQ_OBJECT public: - ModelinePlugin( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); + ModelinePlugin( TQObject* parent = 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 eade8e8..61cd592 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* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)tqparent, name ) +PluginKateOpenHeader::PluginKateOpenHeader( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)parent, name ) { } diff --git a/kate/openheader/plugin_kateopenheader.h b/kate/openheader/plugin_kateopenheader.h index 0556735..b40b92a 100644 --- a/kate/openheader/plugin_kateopenheader.h +++ b/kate/openheader/plugin_kateopenheader.h @@ -34,7 +34,7 @@ class PluginKateOpenHeader : public Kate::Plugin, Kate::PluginViewInterface TQ_OBJECT public: - PluginKateOpenHeader( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateOpenHeader( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateOpenHeader(); void addView (Kate::MainWindow *win); diff --git a/kate/snippets/csnippet.cpp b/kate/snippets/csnippet.cpp index c873949..2aebb5d 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 *tqparent, const char *name) - : TQObject(tqparent, name), _sKey(sKey), _sValue(sValue), _lvi(lvi) {} +CSnippet::CSnippet(TQString sKey, TQString sValue, TQListViewItem *lvi, TQObject *parent, const char *name) + : TQObject(parent, name), _sKey(sKey), _sValue(sValue), _lvi(lvi) {} CSnippet::~CSnippet() {} diff --git a/kate/snippets/csnippet.h b/kate/snippets/csnippet.h index ae9bef6..cee992c 100644 --- a/kate/snippets/csnippet.h +++ b/kate/snippets/csnippet.h @@ -23,7 +23,7 @@ class CSnippet : public TQObject { Q_OBJECT TQ_OBJECT public: - CSnippet(TQString sKey, TQString sValue, TQListViewItem *lvi, TQObject *tqparent = 0, const char *name = 0); + CSnippet(TQString sKey, TQString sValue, TQListViewItem *lvi, TQObject *parent = 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 819bcaf..e58c15f 100644 --- a/kate/snippets/cwidgetsnippets.cpp +++ b/kate/snippets/cwidgetsnippets.cpp @@ -9,8 +9,8 @@ ***************************************************************************/ #include "cwidgetsnippets.h" -CWidgetSnippets::CWidgetSnippets( TQWidget* tqparent, const char* name, WFlags fl) - : CWidgetSnippetsBase(tqparent, name, fl) +CWidgetSnippets::CWidgetSnippets( TQWidget* parent, const char* name, WFlags fl) + : CWidgetSnippetsBase(parent, name, fl) { } diff --git a/kate/snippets/cwidgetsnippets.h b/kate/snippets/cwidgetsnippets.h index f3962e1..831f335 100644 --- a/kate/snippets/cwidgetsnippets.h +++ b/kate/snippets/cwidgetsnippets.h @@ -17,7 +17,7 @@ */ class CWidgetSnippets : public CWidgetSnippetsBase { public: - CWidgetSnippets( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + CWidgetSnippets( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~CWidgetSnippets(); diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp index 018faf8..649b45d 100644 --- a/kate/snippets/plugin_katesnippets.cpp +++ b/kate/snippets/plugin_katesnippets.cpp @@ -95,12 +95,12 @@ KatePluginSnippetsView::~ KatePluginSnippetsView() { /** * ctor KatePluginSnippets - * @param tqparent + * @param parent * @param name * @return */ -KatePluginSnippets::KatePluginSnippets( TQObject* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application*)tqparent, name ) {} +KatePluginSnippets::KatePluginSnippets( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application*)parent, name ) {} /** * dtor KatePluginSnippets diff --git a/kate/snippets/plugin_katesnippets.h b/kate/snippets/plugin_katesnippets.h index 0aca230..25c49a0 100644 --- a/kate/snippets/plugin_katesnippets.h +++ b/kate/snippets/plugin_katesnippets.h @@ -66,7 +66,7 @@ class KatePluginSnippets : public Kate::Plugin, Kate::PluginViewInterface { TQ_OBJECT public: - KatePluginSnippets( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginSnippets( TQObject* parent = 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 ece507f..2fd9378 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.cpp +++ b/kate/tabbarextension/plugin_katetabbarextension.cpp @@ -73,17 +73,17 @@ KatePluginFactory::~KatePluginFactory() } TQObject* KatePluginFactory::createObject( - TQObject* tqparent, const char* name, const char*, const TQStringList & ) + TQObject* parent, const char* name, const char*, const TQStringList & ) { - return new KatePluginTabBarExtension( tqparent, name ); + return new KatePluginTabBarExtension( parent, name ); } KInstance* KatePluginFactory::s_instance = 0L; // BEGIN KatePluginTabBarExtension KatePluginTabBarExtension::KatePluginTabBarExtension( - TQObject* tqparent, const char* name ) - : Kate::Plugin ( (Kate::Application*)tqparent, name ), + TQObject* parent, const char* name ) + : Kate::Plugin ( (Kate::Application*)parent, name ), pConfig(new KConfig("katetabbarextensionpluginrc")) { pConfig->setGroup("global"); @@ -175,8 +175,8 @@ void KatePluginTabBarExtension::applyConfig( KateTabBarExtensionConfigPage* p ) // BEGIN KateTabBarButton KateTabBarButton::KateTabBarButton(Kate::ViewManager* pViewManager, - Kate::Document *pDoc, TQWidget * tqparent, const char * name) - : TQPushButton(tqparent, name), + Kate::Document *pDoc, TQWidget * parent, const char * name) + : TQPushButton(parent, name), modified(false), myDocID(pDoc->documentNumber()), doc(pDoc), @@ -264,8 +264,8 @@ void KateTabBarButton::setOn(bool on) // BEGIN KateTabBarExtension KateTabBarExtension::KateTabBarExtension( Kate::DocumentManager *pDocManager, Kate::MainWindow *win, bool bHorizOrientation, bool bSort, - TQWidget* tqparent, const char* name, WFlags f ) - : TQWidget(tqparent, name, f), + TQWidget* parent, const char* name, WFlags f ) + : TQWidget(parent, name, f), pCurrentTab(0), m_win(win), m_docManager(pDocManager), m_sort(false) { if (bHorizOrientation) { @@ -475,7 +475,7 @@ void KateTabBarExtension::slotViewChanged () // BEGIN KateTabBarExtensionConfigPage KateTabBarExtensionConfigPage::KateTabBarExtensionConfigPage( - TQObject* /*tqparent*/ /*= 0L*/, TQWidget *parentWidget /*= 0L*/) + TQObject* /*parent*/ /*= 0L*/, TQWidget *parentWidget /*= 0L*/) : Kate::PluginConfigPage( parentWidget ) { TQVBoxLayout* top = new TQVBoxLayout(this, 0, diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h index e74a73e..8fcf398 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.h +++ b/kate/tabbarextension/plugin_katetabbarextension.h @@ -67,7 +67,7 @@ class KatePluginFactory : public KLibFactory KatePluginFactory(); virtual ~KatePluginFactory(); - virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: @@ -88,11 +88,11 @@ class KateTabBarButton: public TQPushButton * constructor * @param pViewManager pointer to kate's the view manager * @param pDoc pointer to the document, that the tab button represents - * @param tqparent tqparent widget + * @param parent parent widget * @param name name of the tab button */ KateTabBarButton(Kate::ViewManager* pViewManager, Kate::Document *pDoc, - TQWidget* tqparent = 0, const char * name = 0); + TQWidget* parent = 0, const char * name = 0); /** * standard destructor (emtpy) @@ -164,13 +164,13 @@ class KateTabBarExtension : public TQWidget * @param win pinter to the main window * @param bHorizOrientation true, if orientation is Qt::Horizontal * @param bSort true, if orientation is Qt::Horizontal - * @param tqparent tqparent widget + * @param parent parent widget * @param name name of widget * @param f widget flags */ KateTabBarExtension( Kate::DocumentManager *pDocManager, Kate::MainWindow *win, bool bHorizOrientation, bool bSort, - TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); + TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); /** standard destructor */ ~KateTabBarExtension(); @@ -268,7 +268,7 @@ class KateTabBarExtensionConfigPage : public Kate::PluginConfigPage friend class KatePluginTabBarExtension; public: - KateTabBarExtensionConfigPage (TQObject* tqparent = 0L, TQWidget *parentWidget = 0L); + KateTabBarExtensionConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L); ~KateTabBarExtensionConfigPage (); /** @@ -301,7 +301,7 @@ class KatePluginTabBarExtension : public Kate::Plugin, Kate::PluginViewInterface TQ_OBJECT public: - KatePluginTabBarExtension( TQObject* tqparent = 0, const char* name = 0 ); + KatePluginTabBarExtension( TQObject* parent = 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 0b53f45..97d28c2 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* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)tqparent, name ), +PluginKateTextFilter::PluginKateTextFilter( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)parent, name ), Kate::Command(), m_pFilterShellProcess (NULL) { diff --git a/kate/textfilter/plugin_katetextfilter.h b/kate/textfilter/plugin_katetextfilter.h index 772a30d..0f9c973 100644 --- a/kate/textfilter/plugin_katetextfilter.h +++ b/kate/textfilter/plugin_katetextfilter.h @@ -36,7 +36,7 @@ class PluginKateTextFilter : public Kate::Plugin, public Kate::PluginViewInterfa TQ_OBJECT public: - PluginKateTextFilter( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateTextFilter( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateTextFilter(); void addView (Kate::MainWindow *win); diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp index 1345d46..b1a0ea3 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* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)tqparent, name ) +PluginKateXMLCheck::PluginKateXMLCheck( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)parent, name ) { } @@ -94,8 +94,8 @@ void PluginKateXMLCheck::removeView(Kate::MainWindow *win) //--------------------------------- -PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *tqparent,Kate::MainWindow *mainwin,const char* name) - :TQListView(tqparent,name),KXMLGUIClient(),win(mainwin) +PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow *mainwin,const char* name) + :TQListView(parent,name),KXMLGUIClient(),win(mainwin) { m_tmp_file=0; m_proc=0; diff --git a/kate/xmlcheck/plugin_katexmlcheck.h b/kate/xmlcheck/plugin_katexmlcheck.h index 89c6c59..8e0577a 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.h +++ b/kate/xmlcheck/plugin_katexmlcheck.h @@ -47,7 +47,7 @@ class PluginKateXMLCheckView : public TQListView, public KXMLGUIClient TQ_OBJECT public: - PluginKateXMLCheckView(TQWidget *tqparent,Kate::MainWindow *mainwin,const char* name); + PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow *mainwin,const char* name); virtual ~PluginKateXMLCheckView(); Kate::MainWindow *win; @@ -76,7 +76,7 @@ class PluginKateXMLCheck : public Kate::Plugin, Kate::PluginViewInterface TQ_OBJECT public: - PluginKateXMLCheck( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateXMLCheck( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateXMLCheck(); void addView (Kate::MainWindow *win); diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp index e8936b8..ce53476 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/tqparent tag"? +-add "Go to opening/parent 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 @@ -113,8 +113,8 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -PluginKateXMLTools::PluginKateXMLTools( TQObject* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application*)tqparent, name ) +PluginKateXMLTools::PluginKateXMLTools( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application*)parent, name ) { //kdDebug() << "PluginKateXMLTools constructor called" << endl; @@ -132,7 +132,7 @@ PluginKateXMLTools::PluginKateXMLTools( TQObject* tqparent, const char* name, co m_dtds.setAutoDelete( true ); - m_documentManager = ((Kate::Application*)tqparent)->documentManager(); + m_documentManager = ((Kate::Application*)parent)->documentManager(); // connect( m_documentManager, TQT_SIGNAL(documentCreated()), // this, TQT_SLOT(slotDocumentCreated()) ); @@ -283,11 +283,11 @@ void PluginKateXMLTools::keyEvent( int, int, const TQString &/*s*/ ) { kdDebug() << "*outside tag -> get elements" << endl; TQString parentElement = getParentElement( *kv, true ); - kdDebug() << "tqparent: " << parentElement << endl; + kdDebug() << "parent: " << parentElement << endl; allowed = m_docDtds[docNumber]->allowedElements(parentElement ); m_mode = elements; } - // TODO: optionally close tqparent tag if not left=="/>" + // TODO: optionally close parent tag if not left=="/>" else if( leftCh == " " || (isQuote(leftCh) && secondLeftCh == "=") ) { // TODO: check secondLeftChar, too?! then you don't need to trigger @@ -603,7 +603,7 @@ void PluginKateXMLTools::slotInsertElement() } /** - * Insert a closing tag for the nearest not-closed tqparent element. + * Insert a closing tag for the nearest not-closed parent element. */ void PluginKateXMLTools::slotCloseElement() { @@ -895,10 +895,10 @@ TQString PluginKateXMLTools::insideAttribute( Kate::View &kv ) } /** - * Find the tqparent element for the current cursor position. That is, + * Find the parent 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 tqparent element is "p": + * Examples: If cursor is at "X", the correct parent 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 @@ -1099,8 +1099,8 @@ TQStringList PluginKateXMLTools::sortTQStringList( TQStringList list ) { } //BEGIN InsertElement dialog -InsertElement::InsertElement( TQWidget *tqparent, const char *name ) - :KDialogBase( tqparent, name, true, i18n("Insert XML Element" ), +InsertElement::InsertElement( TQWidget *parent, const char *name ) + :KDialogBase( parent, name, true, i18n("Insert XML Element" ), KDialogBase::Ok|KDialogBase::Cancel) { } diff --git a/kate/xmltools/plugin_katexmltools.h b/kate/xmltools/plugin_katexmltools.h index 892a142..651ba7b 100644 --- a/kate/xmltools/plugin_katexmltools.h +++ b/kate/xmltools/plugin_katexmltools.h @@ -53,7 +53,7 @@ class PluginKateXMLTools : public Kate::Plugin, Kate::PluginViewInterface public: - PluginKateXMLTools( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateXMLTools( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateXMLTools(); void addView ( Kate::MainWindow *win ); void removeView( Kate::MainWindow *win ); @@ -140,7 +140,7 @@ class InsertElement : public KDialogBase TQ_OBJECT public: - InsertElement( TQWidget *tqparent, const char *name ); + InsertElement( TQWidget *parent, const char *name ); ~InsertElement(); TQString showDialog( TQStringList &completions ); private slots: diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp index 51d1fe3..99de846 100644 --- a/kate/xmltools/pseudo_dtd.cpp +++ b/kate/xmltools/pseudo_dtd.cpp @@ -192,7 +192,7 @@ bool PseudoDTD::parseElements( TQDomDocument *doc, TQProgressDialog *progress ) } /** - * Check which elements are allowed inside a tqparent element. This returns + * Check which elements are allowed inside a parent 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. */ diff --git a/kate/xmltools/testcases.xml b/kate/xmltools/testcases.xml index 9828751..e66fc60 100644 --- a/kate/xmltools/testcases.xml +++ b/kate/xmltools/testcases.xml @@ -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 tqparent element (<head> in this case) and ignores the existing <title>. + only looks for the parent 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. |