From 6c79d50fa9fbdff7f69ca57a8ab5fcc942375593 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- quanta/components/csseditor/colorrequester.cpp | 2 +- quanta/components/csseditor/colorrequester.h | 2 +- quanta/components/csseditor/colorslider.cpp | 6 +- quanta/components/csseditor/colorslider.h | 6 +- quanta/components/csseditor/csseditor.cpp | 22 +- quanta/components/csseditor/csseditor.h | 8 +- quanta/components/csseditor/csseditor_globals.cpp | 4 +- quanta/components/csseditor/csseditor_globals.h | 4 +- quanta/components/csseditor/cssselector.cpp | 2 +- quanta/components/csseditor/cssselector.h | 2 +- quanta/components/csseditor/doubleeditors.cpp | 8 +- quanta/components/csseditor/doubleeditors.h | 8 +- quanta/components/csseditor/encodingselector.cpp | 2 +- quanta/components/csseditor/encodingselector.h | 2 +- quanta/components/csseditor/fontfamilychooser.cpp | 2 +- quanta/components/csseditor/fontfamilychooser.h | 2 +- quanta/components/csseditor/minieditor.h | 2 +- quanta/components/csseditor/percentageeditor.cpp | 2 +- quanta/components/csseditor/percentageeditor.h | 2 +- quanta/components/csseditor/propertysetter.cpp | 2 +- quanta/components/csseditor/propertysetter.h | 2 +- quanta/components/csseditor/specialsb.cpp | 10 +- quanta/components/csseditor/specialsb.h | 10 +- quanta/components/csseditor/styleeditor.cpp | 2 +- quanta/components/csseditor/styleeditor.h | 2 +- quanta/components/csseditor/tlpeditors.cpp | 6 +- quanta/components/csseditor/tlpeditors.h | 6 +- quanta/components/debugger/backtracelistview.cpp | 4 +- quanta/components/debugger/backtracelistview.h | 2 +- .../debugger/dbgp/quantadebuggerdbgp.cpp | 34 +-- .../components/debugger/dbgp/quantadebuggerdbgp.h | 4 +- .../components/debugger/debuggerbreakpointview.cpp | 4 +- .../components/debugger/debuggerbreakpointview.h | 2 +- quanta/components/debugger/debuggermanager.cpp | 4 +- quanta/components/debugger/debuggermanager.h | 2 +- quanta/components/debugger/debuggerui.cpp | 8 +- quanta/components/debugger/debuggerui.h | 2 +- .../debugger/gubed/quantadebuggergubed.cpp | 38 +-- .../debugger/gubed/quantadebuggergubed.h | 4 +- .../debugger/interfaces/debuggerclient.cpp | 6 +- .../debugger/interfaces/debuggerclient.h | 2 +- .../debugger/interfaces/debuggerinterface.cpp | 4 +- .../debugger/interfaces/debuggerinterface.h | 2 +- quanta/components/debugger/pathmapper.cpp | 4 +- quanta/components/debugger/pathmapper.h | 2 +- .../debugger/quantadebuggerinterface.cpp | 6 +- .../components/debugger/quantadebuggerinterface.h | 2 +- quanta/components/debugger/variableslistview.cpp | 4 +- quanta/components/debugger/variableslistview.h | 2 +- quanta/components/framewizard/framewizard.cpp | 2 +- quanta/components/framewizard/framewizard.h | 2 +- quanta/components/framewizard/selectablearea.cpp | 2 +- quanta/components/framewizard/selectablearea.h | 2 +- quanta/components/framewizard/treenode.cpp | 8 +- quanta/components/framewizard/treenode.h | 2 +- .../components/framewizard/visualframeeditor.cpp | 34 +-- quanta/components/framewizard/visualframeeditor.h | 6 +- quanta/components/tableeditor/tableeditor.cpp | 4 +- quanta/components/tableeditor/tableeditor.h | 2 +- quanta/dialogs/actionconfigdialog.cpp | 26 +- quanta/dialogs/actionconfigdialog.h | 2 +- quanta/dialogs/dirtydlg.cpp | 2 +- quanta/dialogs/dirtydlg.h | 2 +- quanta/dialogs/dtepeditdlg.cpp | 4 +- quanta/dialogs/dtepeditdlg.h | 2 +- quanta/dialogs/dtepeditdlgs.ui | 4 +- quanta/dialogs/dtepstructureeditdlgs.ui | 8 +- quanta/dialogs/filecombo.cpp | 8 +- quanta/dialogs/filecombo.h | 4 +- quanta/dialogs/settings/abbreviation.cpp | 4 +- quanta/dialogs/settings/abbreviation.h | 2 +- quanta/dialogs/settings/filemasks.cpp | 6 +- quanta/dialogs/settings/filemasks.h | 4 +- quanta/dialogs/settings/parseroptions.cpp | 6 +- quanta/dialogs/settings/parseroptions.h | 2 +- quanta/dialogs/settings/previewoptions.cpp | 4 +- quanta/dialogs/settings/previewoptions.h | 2 +- quanta/dialogs/specialchardialog.cpp | 4 +- quanta/dialogs/specialchardialog.h | 2 +- quanta/dialogs/tagdialogs/colorcombo.cpp | 6 +- quanta/dialogs/tagdialogs/colorcombo.h | 2 +- quanta/dialogs/tagdialogs/corewidgetdlg.cpp | 4 +- quanta/dialogs/tagdialogs/listdlg.cpp | 4 +- quanta/dialogs/tagdialogs/listdlg.h | 2 +- quanta/dialogs/tagdialogs/pictureview.cpp | 2 +- quanta/dialogs/tagdialogs/pictureview.h | 2 +- quanta/dialogs/tagdialogs/tagattr.cpp | 4 +- quanta/dialogs/tagdialogs/tagattr.h | 2 +- quanta/dialogs/tagdialogs/tagimgdlg.cpp | 4 +- quanta/dialogs/tagdialogs/tagimgdlg.h | 2 +- quanta/dialogs/tagdialogs/tagmaildlg.cpp | 4 +- quanta/dialogs/tagdialogs/tagmaildlg.h | 2 +- quanta/dialogs/tagdialogs/tagmiscdlg.cpp | 4 +- quanta/dialogs/tagdialogs/tagmiscdlg.h | 2 +- quanta/dialogs/tagdialogs/tagquicklistdlg.cpp | 4 +- quanta/dialogs/tagdialogs/tagquicklistdlg.h | 2 +- quanta/dialogs/tagdialogs/tagwidget.cpp | 4 +- quanta/dialogs/tagdialogs/tagwidget.h | 2 +- quanta/dialogs/tagdialogs/tagxml.cpp | 8 +- quanta/dialogs/tagdialogs/tagxml.h | 4 +- quanta/messages/annotationoutput.cpp | 8 +- quanta/messages/annotationoutput.h | 2 +- quanta/messages/messageoutput.cpp | 4 +- quanta/messages/messageoutput.h | 2 +- quanta/parsers/dtd/dtdparser.cpp | 8 +- quanta/parsers/node.cpp | 44 ++-- quanta/parsers/node.h | 22 +- quanta/parsers/parser.cpp | 142 +++++------ quanta/parsers/parsercommon.cpp | 8 +- quanta/parsers/parsercommon.h | 6 +- quanta/parsers/qtag.h | 4 +- quanta/parsers/sagroupparser.cpp | 10 +- quanta/parsers/sagroupparser.h | 2 +- quanta/parsers/saparser.cpp | 12 +- quanta/parts/kafka/domtreeview.cpp | 6 +- quanta/parts/kafka/domtreeview.h | 4 +- quanta/parts/kafka/htmldocumentproperties.cpp | 12 +- quanta/parts/kafka/htmldocumentproperties.h | 2 +- quanta/parts/kafka/htmlenhancer.cpp | 2 +- quanta/parts/kafka/htmlenhancer.h | 2 +- quanta/parts/kafka/kafkacommon.cpp | 276 ++++++++++----------- quanta/parts/kafka/kafkacommon.h | 116 ++++----- quanta/parts/kafka/kafkahtmlpart.cpp | 30 +-- quanta/parts/kafka/kafkahtmlpart.h | 10 +- quanta/parts/kafka/kafkasyncoptions.cpp | 4 +- quanta/parts/kafka/kafkasyncoptions.h | 2 +- quanta/parts/kafka/nodeenhancer.h | 2 +- quanta/parts/kafka/undoredo.cpp | 26 +- quanta/parts/kafka/wkafkapart.cpp | 112 ++++----- quanta/parts/kafka/wkafkapart.h | 18 +- quanta/parts/preview/whtmlpart.cpp | 12 +- quanta/parts/preview/whtmlpart.h | 4 +- quanta/plugins/quantaplugin.h | 2 +- quanta/plugins/quantaplugininterface.cpp | 6 +- quanta/plugins/quantaplugininterface.h | 6 +- quanta/project/eventconfigurationdlg.cpp | 4 +- quanta/project/eventconfigurationdlg.h | 2 +- quanta/project/eventeditordlg.cpp | 4 +- quanta/project/eventeditordlg.h | 2 +- quanta/project/membereditdlg.cpp | 4 +- quanta/project/membereditdlg.h | 2 +- quanta/project/project.cpp | 6 +- quanta/project/project.h | 6 +- quanta/project/projectnewfinal.cpp | 4 +- quanta/project/projectnewfinal.h | 2 +- quanta/project/projectnewgeneral.cpp | 4 +- quanta/project/projectnewgeneral.h | 2 +- quanta/project/projectnewlocal.cpp | 16 +- quanta/project/projectnewlocal.h | 2 +- quanta/project/projectnewlocals.ui | 8 +- quanta/project/projectnewweb.cpp | 14 +- quanta/project/projectnewweb.h | 2 +- quanta/project/projectprivate.cpp | 104 ++++---- quanta/project/projectprivate.h | 4 +- quanta/project/projectupload.cpp | 6 +- quanta/project/rescanprj.cpp | 4 +- quanta/project/rescanprj.h | 2 +- quanta/project/teammembersdlg.cpp | 4 +- quanta/project/teammembersdlg.h | 2 +- quanta/quanta_uml.xmi | 98 ++++---- quanta/src/document.cpp | 24 +- quanta/src/document.h | 2 +- quanta/src/dtds.cpp | 14 +- quanta/src/dtds.h | 6 +- quanta/src/quanta.cpp | 22 +- quanta/src/quanta.h | 4 +- quanta/src/quantadoc.cpp | 2 +- quanta/src/quantadoc.h | 2 +- quanta/src/quantaview.cpp | 14 +- quanta/src/quantaview.h | 2 +- quanta/src/viewmanager.cpp | 2 +- quanta/src/viewmanager.h | 6 +- quanta/treeviews/basetreeview.cpp | 40 +-- quanta/treeviews/basetreeview.h | 12 +- quanta/treeviews/docfolder.cpp | 8 +- quanta/treeviews/docfolder.h | 4 +- quanta/treeviews/docitem.cpp | 8 +- quanta/treeviews/docitem.h | 4 +- quanta/treeviews/doctreeview.cpp | 4 +- quanta/treeviews/doctreeview.h | 2 +- quanta/treeviews/filestreeview.cpp | 4 +- quanta/treeviews/filestreeview.h | 2 +- quanta/treeviews/newtemplatedirdlg.cpp | 2 +- quanta/treeviews/newtemplatedirdlg.h | 2 +- quanta/treeviews/projecttreeview.cpp | 20 +- quanta/treeviews/projecttreeview.h | 12 +- quanta/treeviews/quantapropertiespage.ui | 2 +- quanta/treeviews/scripttreeview.cpp | 4 +- quanta/treeviews/scripttreeview.h | 2 +- quanta/treeviews/servertreeview.cpp | 20 +- quanta/treeviews/servertreeview.h | 8 +- quanta/treeviews/structtreetag.cpp | 24 +- quanta/treeviews/structtreetag.h | 6 +- quanta/treeviews/structtreeview.cpp | 34 +-- quanta/treeviews/structtreeview.h | 12 +- quanta/treeviews/tagattributeitems.cpp | 42 ++-- quanta/treeviews/tagattributeitems.h | 24 +- quanta/treeviews/tagattributetree.cpp | 36 +-- quanta/treeviews/tagattributetree.h | 8 +- quanta/treeviews/templatedirform.ui | 2 +- quanta/treeviews/templatestreeview.cpp | 32 +-- quanta/treeviews/templatestreeview.h | 10 +- quanta/treeviews/uploadtreefile.cpp | 10 +- quanta/treeviews/uploadtreefile.h | 4 +- quanta/treeviews/uploadtreefolder.cpp | 10 +- quanta/treeviews/uploadtreefolder.h | 4 +- quanta/treeviews/uploadtreeview.cpp | 4 +- quanta/treeviews/uploadtreeview.h | 2 +- quanta/utility/qpevents.cpp | 4 +- quanta/utility/qpevents.h | 6 +- quanta/utility/quantabookmarks.cpp | 6 +- quanta/utility/quantabookmarks.h | 2 +- quanta/utility/quantacommon.cpp | 2 +- quanta/utility/tagaction.cpp | 12 +- quanta/utility/tagactionmanager.cpp | 10 +- quanta/utility/tagactionmanager.h | 2 +- quanta/utility/tagactionset.cpp | 24 +- quanta/utility/tagactionset.h | 12 +- quanta/utility/toolbartabwidget.cpp | 32 +-- quanta/utility/toolbartabwidget.h | 8 +- 220 files changed, 1191 insertions(+), 1191 deletions(-) (limited to 'quanta') diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp index 3dfd357b..1e2a1b8b 100644 --- a/quanta/components/csseditor/colorrequester.cpp +++ b/quanta/components/csseditor/colorrequester.cpp @@ -34,7 +34,7 @@ class colorRequester::colorRequesterPrivate{ void connectSignals( TQObject *receiver ) { connect( edit, TQT_SIGNAL( textChanged( const TQString& )),receiver, TQT_SIGNAL( textChanged( const TQString& ))); } }; -colorRequester::colorRequester(TQWidget *tqparent, const char* name) : miniEditor(tqparent,name){ +colorRequester::colorRequester(TQWidget *parent, const char* name) : miniEditor(parent,name){ d = new colorRequesterPrivate; init(); } diff --git a/quanta/components/csseditor/colorrequester.h b/quanta/components/csseditor/colorrequester.h index ceb28f6b..c78bee77 100644 --- a/quanta/components/csseditor/colorrequester.h +++ b/quanta/components/csseditor/colorrequester.h @@ -27,7 +27,7 @@ class colorRequester : public miniEditor{ Q_OBJECT TQ_OBJECT public: - colorRequester(TQWidget *tqparent, const char* name=0); + colorRequester(TQWidget *parent, const char* name=0); ~colorRequester(); KLineEdit * lineEdit() const; KPushButton * button() const { return myButton; } diff --git a/quanta/components/csseditor/colorslider.cpp b/quanta/components/csseditor/colorslider.cpp index b57649bd..58e67d0f 100644 --- a/quanta/components/csseditor/colorslider.cpp +++ b/quanta/components/csseditor/colorslider.cpp @@ -29,7 +29,7 @@ -colorSlider::colorSlider(const TQString& fn,const TQString& l,const TQString& c,const TQString& r,TQWidget *tqparent, const char *name) : miniEditor(tqparent,name) { +colorSlider::colorSlider(const TQString& fn,const TQString& l,const TQString& c,const TQString& r,TQWidget *parent, const char *name) : miniEditor(parent,name) { m_functionName = fn; TQVBox *leftBox = new TQVBox(this); TQVBox *centerBox = new TQVBox(this); @@ -74,11 +74,11 @@ void colorSlider::convertRightValue(int i){ emit valueChanged(m_functionName + "(" + TQString::number(m_leftValue->value(),10) + "," + TQString::number(m_centerValue->value(),10) + "," + TQString::number(i,10) +")"); } -RGBcolorSlider::RGBcolorSlider(TQWidget *tqparent, const char *name) : colorSlider("rgb",i18n("Red"),i18n("Green"),i18n("Blue"),tqparent,name){ +RGBcolorSlider::RGBcolorSlider(TQWidget *parent, const char *name) : colorSlider("rgb",i18n("Red"),i18n("Green"),i18n("Blue"),parent,name){ } //FOR CSS3 -/*HSLcolorSlider::HSLcolorSlider(TQWidget *tqparent, const char *name) : colorSlider("hsl",i18n("Hue"),i18n("Saturation"),i18n("Lightness"),tqparent,name){ +/*HSLcolorSlider::HSLcolorSlider(TQWidget *parent, const char *name) : colorSlider("hsl",i18n("Hue"),i18n("Saturation"),i18n("Lightness"),parent,name){ } */ diff --git a/quanta/components/csseditor/colorslider.h b/quanta/components/csseditor/colorslider.h index 202020a6..acff130c 100644 --- a/quanta/components/csseditor/colorslider.h +++ b/quanta/components/csseditor/colorslider.h @@ -38,7 +38,7 @@ class colorSlider : public miniEditor { *m_centerValue, *m_rightValue; public: - colorSlider(const TQString& functionName,const TQString& l=TQString(),const TQString& c=TQString(),const TQString& r=TQString(),TQWidget *tqparent=0, const char *name=0); + colorSlider(const TQString& functionName,const TQString& l=TQString(),const TQString& c=TQString(),const TQString& r=TQString(),TQWidget *parent=0, const char *name=0); virtual ~colorSlider(); virtual void connectToPropertySetter(propertySetter* p); @@ -55,7 +55,7 @@ class RGBcolorSlider : public colorSlider { Q_OBJECT TQ_OBJECT public: - RGBcolorSlider(TQWidget *tqparent=0, const char *name=0); + RGBcolorSlider(TQWidget *parent=0, const char *name=0); ~RGBcolorSlider(){} }; @@ -64,7 +64,7 @@ class RGBcolorSlider : public colorSlider { Q_OBJECT TQ_OBJECT public: - HSLcolorSlider(TQWidget *tqparent=0, const char *name=0); + HSLcolorSlider(TQWidget *parent=0, const char *name=0); ~HSLcolorSlider(); };*/ diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp index 07fc1815..e548d7d9 100644 --- a/quanta/components/csseditor/csseditor.cpp +++ b/quanta/components/csseditor/csseditor.cpp @@ -47,11 +47,11 @@ -myCheckListItem::myCheckListItem(TQListView * tqparent, const TQString & text):TQCheckListItem(tqparent, text, TQCheckListItem::CheckBox),m_checkedChildren(0){ +myCheckListItem::myCheckListItem(TQListView * parent, const TQString & text):TQCheckListItem(parent, text, TQCheckListItem::CheckBox),m_checkedChildren(0){ m_sig = new TQSignal; } -myCheckListItem::myCheckListItem(TQCheckListItem * tqparent, const TQString & text):TQCheckListItem(tqparent, text, TQCheckListItem::CheckBox),m_checkedChildren(0){ +myCheckListItem::myCheckListItem(TQCheckListItem * parent, const TQString & text):TQCheckListItem(parent, text, TQCheckListItem::CheckBox),m_checkedChildren(0){ m_sig = new TQSignal; } @@ -85,8 +85,8 @@ void myCheckListItem::stateChange (bool b){ m_checkedChildren = 0; } else { - if(tqparent()){ - myCheckListItem *p = static_cast(tqparent()); + if(parent()){ + myCheckListItem *p = static_cast(parent()); while( p ) { if( p->m_checkedChildren != 1) { p->m_checkedChildren--; @@ -99,7 +99,7 @@ void myCheckListItem::stateChange (bool b){ m_sig->activate(); p->setOn(false); } - p = static_cast(p->tqparent()); + p = static_cast(p->parent()); } } else { @@ -109,7 +109,7 @@ void myCheckListItem::stateChange (bool b){ } } else { - if(tqparent()) static_cast(tqparent())->addCheckedChild(); + if(parent()) static_cast(parent())->addCheckedChild(); } } @@ -152,10 +152,10 @@ void CSSEditor::setCurrentPropOn(const TQString& s){ m_currentProp->setOn(true); if( m_currentProp && m_currentProp->depth() ) { - myCheckListItem *p = static_cast(m_currentProp->tqparent()); + myCheckListItem *p = static_cast(m_currentProp->parent()); while(p) { p->setOn(true); - p=static_cast(p->tqparent()); + p=static_cast(p->parent()); } } } @@ -296,7 +296,7 @@ void CSSEditor::toggleShortendForm() m_config->sync(); } -CSSEditor::CSSEditor(TQListViewItem *i, TQWidget *tqparent, const char *name) : CSSEditorS(tqparent, name){ +CSSEditor::CSSEditor(TQListViewItem *i, TQWidget *parent, const char *name) : CSSEditorS(parent, name){ m_selectorName = i->text(0); m_initialProperties = i->text(1); } @@ -491,10 +491,10 @@ void CSSEditor::checkProperty(const TQString& v){ m_currentProp->setOn(true); if( m_currentProp->depth() ){ - myCheckListItem *p = static_cast(m_currentProp->tqparent()); + myCheckListItem *p = static_cast(m_currentProp->parent()); while(p){ p->setOn(true); - p=static_cast(p->tqparent()); + p=static_cast(p->parent()); } } diff --git a/quanta/components/csseditor/csseditor.h b/quanta/components/csseditor/csseditor.h index d1f2ec7f..e7cadebb 100644 --- a/quanta/components/csseditor/csseditor.h +++ b/quanta/components/csseditor/csseditor.h @@ -41,8 +41,8 @@ class myCheckListItem : public TQCheckListItem unsigned int m_checkedChildren; public : - myCheckListItem(TQCheckListItem * tqparent, const TQString & text); - myCheckListItem(TQListView * tqparent, const TQString & text); + myCheckListItem(TQCheckListItem * parent, const TQString & text); + myCheckListItem(TQListView * parent, const TQString & text); ~myCheckListItem(); void connect( TQObject *receiver, const char *member ); void addCheckedChild(); @@ -98,8 +98,8 @@ class CSSEditor : public CSSEditorS public: - CSSEditor(TQWidget* tqparent=0, const char *name=0): CSSEditorS(tqparent, name), m_config(0L){} - CSSEditor( TQListViewItem * i, TQWidget* tqparent=0, const char *name=0); + CSSEditor(TQWidget* parent=0, const char *name=0): CSSEditorS(parent, name), m_config(0L){} + CSSEditor( TQListViewItem * i, TQWidget* parent=0, const char *name=0); ~CSSEditor(); void initialize(); void setSelectors( const TQString& s) { m_Selectors = s; } diff --git a/quanta/components/csseditor/csseditor_globals.cpp b/quanta/components/csseditor/csseditor_globals.cpp index bd0eac48..c2be79c0 100644 --- a/quanta/components/csseditor/csseditor_globals.cpp +++ b/quanta/components/csseditor/csseditor_globals.cpp @@ -18,12 +18,12 @@ #include #include "csseditor_globals.h" -mySpinBox::mySpinBox(TQWidget * tqparent , const char * name ) : TQSpinBox (tqparent, name){ +mySpinBox::mySpinBox(TQWidget * parent , const char * name ) : TQSpinBox (parent, name){ connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(checkSuffix( const TQString & ))); connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(valueChanged( const TQString & ))); } -mySpinBox::mySpinBox( int minValue, int maxValue, int step, TQWidget * tqparent, const char * name ) : TQSpinBox( minValue, maxValue, step, tqparent,name ){ +mySpinBox::mySpinBox( int minValue, int maxValue, int step, TQWidget * parent, const char * name ) : TQSpinBox( minValue, maxValue, step, parent,name ){ connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(checkSuffix( const TQString & ))); connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(valueChanged( const TQString & ))); } diff --git a/quanta/components/csseditor/csseditor_globals.h b/quanta/components/csseditor/csseditor_globals.h index edf9add3..8efbe4c5 100644 --- a/quanta/components/csseditor/csseditor_globals.h +++ b/quanta/components/csseditor/csseditor_globals.h @@ -53,8 +53,8 @@ class mySpinBox : public TQSpinBox{ Q_OBJECT TQ_OBJECT public: - mySpinBox(TQWidget * tqparent = 0, const char * name = 0 ); - mySpinBox( int minValue, int maxValue, int step = 1, TQWidget * tqparent = 0, const char * name = 0 ); + mySpinBox(TQWidget * parent = 0, const char * name = 0 ); + mySpinBox( int minValue, int maxValue, int step = 1, TQWidget * parent = 0, const char * name = 0 ); ~mySpinBox(); public slots: void checkSuffix(const TQString&); diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp index 316a8db4..7e61cf02 100644 --- a/quanta/components/csseditor/cssselector.cpp +++ b/quanta/components/csseditor/cssselector.cpp @@ -39,7 +39,7 @@ #include "stylesheetparser.h" -CSSSelector::CSSSelector(TQWidget *tqparent, const char* name) : CSSSelectorS (tqparent,name),m_orderNumber(0),m_stopProcessingStylesheet(false) { +CSSSelector::CSSSelector(TQWidget *parent, const char* name) : CSSSelectorS (parent,name),m_orderNumber(0),m_stopProcessingStylesheet(false) { m_currentItem = 0L; diff --git a/quanta/components/csseditor/cssselector.h b/quanta/components/csseditor/cssselector.h index 7d5c40da..9f3d293e 100644 --- a/quanta/components/csseditor/cssselector.h +++ b/quanta/components/csseditor/cssselector.h @@ -46,7 +46,7 @@ class CSSSelector : public CSSSelectorS { void Connect(); public: - CSSSelector(TQWidget *tqparent=0, const char* name=0); + CSSSelector(TQWidget *parent=0, const char* name=0); ~CSSSelector(); void loadCSSContent(const TQString& s); void setHeader(const TQString& h) { m_header = h; } diff --git a/quanta/components/csseditor/doubleeditors.cpp b/quanta/components/csseditor/doubleeditors.cpp index 0bc85eee..e877e2ac 100644 --- a/quanta/components/csseditor/doubleeditors.cpp +++ b/quanta/components/csseditor/doubleeditors.cpp @@ -23,7 +23,7 @@ -doubleEditorBase::doubleEditorBase(TQWidget *tqparent, const char *name) : miniEditor(tqparent,name){ +doubleEditorBase::doubleEditorBase(TQWidget *parent, const char *name) : miniEditor(parent,name){ } void doubleEditorBase::sxValueSlot(const TQString& v){ @@ -36,7 +36,7 @@ void doubleEditorBase::dxValueSlot(const TQString& v){ emit valueChanged( m_sxValue +" " + m_dxValue); } - doubleLengthEditor::doubleLengthEditor(TQWidget *tqparent, const char *name) : doubleEditorBase(tqparent,name){ + doubleLengthEditor::doubleLengthEditor(TQWidget *parent, const char *name) : doubleEditorBase(parent,name){ m_ssbSx = new specialSB(this); m_ssbSx->insertItem("cm"); @@ -76,7 +76,7 @@ void doubleLengthEditor::setInitialValue(const TQString& sx, const TQString& dx) m_ssbDx->setInitialValue(dx); } -doubleComboBoxEditor::doubleComboBoxEditor(TQWidget *tqparent, const char *name) : doubleEditorBase(tqparent,name){ +doubleComboBoxEditor::doubleComboBoxEditor(TQWidget *parent, const char *name) : doubleEditorBase(parent,name){ m_cbSx = new TQComboBox(this); m_cbDx = new TQComboBox(this); connect(m_cbSx, TQT_SIGNAL(activated ( const TQString & )), this, TQT_SLOT(sxValueSlot(const TQString&))); @@ -92,7 +92,7 @@ void doubleComboBoxEditor::connectToPropertySetter(propertySetter* p){ connect(this, TQT_SIGNAL(valueChanged(const TQString&)), p ,TQT_SIGNAL(valueChanged(const TQString&))); } -doublePercentageEditor::doublePercentageEditor(TQWidget *tqparent, const char *name) : doubleEditorBase(tqparent,name){ +doublePercentageEditor::doublePercentageEditor(TQWidget *parent, const char *name) : doubleEditorBase(parent,name){ m_sbSx = new mySpinBox(this); m_sbDx = new mySpinBox(this); m_sbSx->setSuffix("%"); diff --git a/quanta/components/csseditor/doubleeditors.h b/quanta/components/csseditor/doubleeditors.h index 3bae8456..4c293e4f 100644 --- a/quanta/components/csseditor/doubleeditors.h +++ b/quanta/components/csseditor/doubleeditors.h @@ -31,7 +31,7 @@ class doubleEditorBase : public miniEditor { m_dxValue; public: - doubleEditorBase(TQWidget *tqparent=0, const char *name=0); + doubleEditorBase(TQWidget *parent=0, const char *name=0); virtual ~doubleEditorBase(){} virtual void setInitialValue(){} virtual void connectToPropertySetter(propertySetter* /*p*/){} @@ -52,7 +52,7 @@ class doublePercentageEditor : public doubleEditorBase { *m_sbDx; public: - doublePercentageEditor(TQWidget *tqparent=0, const char *name=0); + doublePercentageEditor(TQWidget *parent=0, const char *name=0); virtual ~doublePercentageEditor(); virtual void setInitialValue(const TQString& sx, const TQString& dx); virtual void connectToPropertySetter(propertySetter* p); @@ -66,7 +66,7 @@ class doubleComboBoxEditor : public doubleEditorBase { *m_cbDx; public: - doubleComboBoxEditor(TQWidget *tqparent=0, const char *name=0); + doubleComboBoxEditor(TQWidget *parent=0, const char *name=0); virtual ~doubleComboBoxEditor(); TQComboBox* cbSx() const { return m_cbSx;} TQComboBox* cbDx() const { return m_cbDx;} @@ -81,7 +81,7 @@ class doubleLengthEditor : public doubleEditorBase { *m_ssbDx; public: - doubleLengthEditor(TQWidget *tqparent=0, const char *name=0); + doubleLengthEditor(TQWidget *parent=0, const char *name=0); virtual ~doubleLengthEditor(); virtual void setInitialValue(const TQString& sx, const TQString& dx); virtual void connectToPropertySetter(propertySetter* p); diff --git a/quanta/components/csseditor/encodingselector.cpp b/quanta/components/csseditor/encodingselector.cpp index fb0272a0..f8ba4ac6 100644 --- a/quanta/components/csseditor/encodingselector.cpp +++ b/quanta/components/csseditor/encodingselector.cpp @@ -26,7 +26,7 @@ *@author gulmini luciano */ -encodingSelector::encodingSelector(TQWidget *tqparent, const char* name) : encodingSelectorS(tqparent,name){ +encodingSelector::encodingSelector(TQWidget *parent, const char* name) : encodingSelectorS(parent,name){ TQStringList encodings (KGlobal::charsets()->availableEncodingNames()); int insert = 0; for (uint i=0; i < encodings.count(); i++) { diff --git a/quanta/components/csseditor/encodingselector.h b/quanta/components/csseditor/encodingselector.h index 9c2db48c..fcca20c6 100644 --- a/quanta/components/csseditor/encodingselector.h +++ b/quanta/components/csseditor/encodingselector.h @@ -31,7 +31,7 @@ class encodingSelector : public encodingSelectorS { TQ_OBJECT public: - encodingSelector(TQWidget *tqparent=0, const char* name=0); + encodingSelector(TQWidget *parent=0, const char* name=0); ~encodingSelector(); TQString encodingSet() const { return cbEncoding->currentText();} diff --git a/quanta/components/csseditor/fontfamilychooser.cpp b/quanta/components/csseditor/fontfamilychooser.cpp index fe494713..273c5a4c 100644 --- a/quanta/components/csseditor/fontfamilychooser.cpp +++ b/quanta/components/csseditor/fontfamilychooser.cpp @@ -32,7 +32,7 @@ #include -fontFamilyChooser::fontFamilyChooser(TQWidget* tqparent, const char *name) : fontFamilyChooserS(tqparent,name){ +fontFamilyChooser::fontFamilyChooser(TQWidget* parent, const char *name) : fontFamilyChooserS(parent,name){ TQFont tmpFont( KGlobalSettings::generalFont().family(), 64, TQFont::Black ); lePreview->setMinimumHeight( lePreview->fontMetrics().lineSpacing() ); diff --git a/quanta/components/csseditor/fontfamilychooser.h b/quanta/components/csseditor/fontfamilychooser.h index 9cb8af54..2b18e30f 100644 --- a/quanta/components/csseditor/fontfamilychooser.h +++ b/quanta/components/csseditor/fontfamilychooser.h @@ -44,7 +44,7 @@ class fontFamilyChooser : public fontFamilyChooserS void moveFontDown(); public: - fontFamilyChooser(TQWidget* tqparent, const char *name=0); + fontFamilyChooser(TQWidget* parent, const char *name=0); ~fontFamilyChooser(); TQStringList fontList(); void setInitialValue(const TQString& s); diff --git a/quanta/components/csseditor/minieditor.h b/quanta/components/csseditor/minieditor.h index 0d668529..3a7fa1bf 100644 --- a/quanta/components/csseditor/minieditor.h +++ b/quanta/components/csseditor/minieditor.h @@ -28,7 +28,7 @@ class propertySetter; class miniEditor : public TQHBox{ public: - miniEditor(TQWidget *tqparent=0, const char *name=0):TQHBox(tqparent,name){} + miniEditor(TQWidget *parent=0, const char *name=0):TQHBox(parent,name){} ~miniEditor(){} virtual void connectToPropertySetter(propertySetter* p)=0; }; diff --git a/quanta/components/csseditor/percentageeditor.cpp b/quanta/components/csseditor/percentageeditor.cpp index cd0eec23..b02a1615 100644 --- a/quanta/components/csseditor/percentageeditor.cpp +++ b/quanta/components/csseditor/percentageeditor.cpp @@ -17,7 +17,7 @@ #include "percentageeditor.h" #include "propertysetter.h" -percentageEditor::percentageEditor(const TQString& initialValue, TQWidget *tqparent, const char *name) : miniEditor(tqparent,name) +percentageEditor::percentageEditor(const TQString& initialValue, TQWidget *parent, const char *name) : miniEditor(parent,name) { TQString temp(initialValue); m_sb = new mySpinBox(0,9999,1,this); diff --git a/quanta/components/csseditor/percentageeditor.h b/quanta/components/csseditor/percentageeditor.h index 31a0d6ef..d4cacecd 100644 --- a/quanta/components/csseditor/percentageeditor.h +++ b/quanta/components/csseditor/percentageeditor.h @@ -42,7 +42,7 @@ class percentageEditor : public miniEditor { private: mySpinBox *m_sb; public: - percentageEditor(const TQString& initialValue="0",TQWidget *tqparent=0, const char *name=0); + percentageEditor(const TQString& initialValue="0",TQWidget *parent=0, const char *name=0); ~percentageEditor(); virtual void connectToPropertySetter(propertySetter* p); signals: diff --git a/quanta/components/csseditor/propertysetter.cpp b/quanta/components/csseditor/propertysetter.cpp index 894a9562..f1e1c101 100644 --- a/quanta/components/csseditor/propertysetter.cpp +++ b/quanta/components/csseditor/propertysetter.cpp @@ -36,7 +36,7 @@ #include "csseditor_globals.h" #include "minieditor.h" -propertySetter::propertySetter(TQWidget *tqparent, const char *name ) : TQHBox(tqparent,name) { +propertySetter::propertySetter(TQWidget *parent, const char *name ) : TQHBox(parent,name) { m_ind = 0; m_cb = 0L; m_list.setAutoDelete(true); diff --git a/quanta/components/csseditor/propertysetter.h b/quanta/components/csseditor/propertysetter.h index df9c29bc..3f1c5af4 100644 --- a/quanta/components/csseditor/propertysetter.h +++ b/quanta/components/csseditor/propertysetter.h @@ -42,7 +42,7 @@ class propertySetter : public TQHBox { KPushButton *m_pb; public: - propertySetter(TQWidget *tqparent=0, const char *name=0); + propertySetter(TQWidget *parent=0, const char *name=0); ~propertySetter(); void installMiniEditor(miniEditor *m); diff --git a/quanta/components/csseditor/specialsb.cpp b/quanta/components/csseditor/specialsb.cpp index e59fca51..6edf110c 100644 --- a/quanta/components/csseditor/specialsb.cpp +++ b/quanta/components/csseditor/specialsb.cpp @@ -21,7 +21,7 @@ #include -specialSB::specialSB(TQWidget *tqparent, const char *name, bool useLineEdit ) : miniEditor(tqparent,name) { +specialSB::specialSB(TQWidget *parent, const char *name, bool useLineEdit ) : miniEditor(parent,name) { if (useLineEdit) { m_lineEdit = new KLineEdit(this); @@ -87,13 +87,13 @@ TQStringList specialSB::cbValueList(){ return l; } -frequencyEditor::frequencyEditor(TQWidget *tqparent, const char *name ) : specialSB(tqparent,name) { +frequencyEditor::frequencyEditor(TQWidget *parent, const char *name ) : specialSB(parent,name) { m_cb->insertItem("Hz"); m_cb->insertItem("kHz"); m_sb->setMaxValue(9999); } -angleEditor::angleEditor(TQWidget *tqparent, const char *name) : specialSB(tqparent,name){ +angleEditor::angleEditor(TQWidget *parent, const char *name) : specialSB(parent,name){ m_cb->insertItem("deg"); m_cb->insertItem("grad"); m_cb->insertItem("rad"); @@ -101,13 +101,13 @@ angleEditor::angleEditor(TQWidget *tqparent, const char *name) : specialSB(tqpar m_sb->setMaxValue(400); } -timeEditor::timeEditor(TQWidget *tqparent, const char *name ) : specialSB(tqparent,name) { +timeEditor::timeEditor(TQWidget *parent, const char *name ) : specialSB(parent,name) { m_cb->insertItem("ms"); m_cb->insertItem("s"); m_sb->setMaxValue(99999); } -lengthEditor::lengthEditor(TQWidget *tqparent, const char *name ) : specialSB(tqparent,name, true) { +lengthEditor::lengthEditor(TQWidget *parent, const char *name ) : specialSB(parent,name, true) { m_cb->insertItem("px"); m_cb->insertItem("em"); m_cb->insertItem("ex"); diff --git a/quanta/components/csseditor/specialsb.h b/quanta/components/csseditor/specialsb.h index 6df3fc9d..1536c5fe 100644 --- a/quanta/components/csseditor/specialsb.h +++ b/quanta/components/csseditor/specialsb.h @@ -36,7 +36,7 @@ class specialSB : public miniEditor { KLineEdit *m_lineEdit; public: - specialSB(TQWidget *tqparent=0, const char *name=0, bool useLineEdit = false); + specialSB(TQWidget *parent=0, const char *name=0, bool useLineEdit = false); ~specialSB(); void insertItem(const TQString& s){ m_cb->insertItem(s); } void setInitialValue(const TQString& s); @@ -57,28 +57,28 @@ class angleEditor : public specialSB { Q_OBJECT TQ_OBJECT public: - angleEditor(TQWidget *tqparent=0, const char *name=0); + angleEditor(TQWidget *parent=0, const char *name=0); }; class frequencyEditor : public specialSB { Q_OBJECT TQ_OBJECT public: - frequencyEditor(TQWidget *tqparent=0, const char *name=0); + frequencyEditor(TQWidget *parent=0, const char *name=0); }; class timeEditor : public specialSB { Q_OBJECT TQ_OBJECT public: - timeEditor(TQWidget *tqparent=0, const char *name=0); + timeEditor(TQWidget *parent=0, const char *name=0); }; class lengthEditor : public specialSB { Q_OBJECT TQ_OBJECT public: - lengthEditor(TQWidget *tqparent=0, const char *name=0); + lengthEditor(TQWidget *parent=0, const char *name=0); }; #endif diff --git a/quanta/components/csseditor/styleeditor.cpp b/quanta/components/csseditor/styleeditor.cpp index fff108d1..b94bdbcd 100644 --- a/quanta/components/csseditor/styleeditor.cpp +++ b/quanta/components/csseditor/styleeditor.cpp @@ -39,7 +39,7 @@ #include "viewmanager.h" #include "csseditor.h" -StyleEditor::StyleEditor(TQWidget *tqparent, const char* name) : TLPEditor(tqparent,name){ +StyleEditor::StyleEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name){ connect(m_pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(openCSSEditor())); setToolTip(i18n("Open css dialog")); TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("stylesheet")); diff --git a/quanta/components/csseditor/styleeditor.h b/quanta/components/csseditor/styleeditor.h index 49f4fd3c..16f7c855 100644 --- a/quanta/components/csseditor/styleeditor.h +++ b/quanta/components/csseditor/styleeditor.h @@ -30,7 +30,7 @@ class StyleEditor : public TLPEditor{ int m_iconWidth, m_iconHeight; public: - StyleEditor(TQWidget *tqparent=0, const char* name=0); + StyleEditor(TQWidget *parent=0, const char* name=0); virtual void setButtonIcon(int width, int height); public slots: diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp index a674a209..7a35ee23 100644 --- a/quanta/components/csseditor/tlpeditors.cpp +++ b/quanta/components/csseditor/tlpeditors.cpp @@ -34,7 +34,7 @@ #include "fontfamilychooser.h" #include "project.h" -TLPEditor::TLPEditor(TQWidget *tqparent, const char* name) : miniEditor(tqparent,name){ +TLPEditor::TLPEditor(TQWidget *parent, const char* name) : miniEditor(parent,name){ m_label = new TQLabel(this); m_le = new TQLineEdit(this); m_pb = new KPushButton(this); @@ -66,7 +66,7 @@ void TLPEditor::setWhatsThis(TQString s){ TQWhatsThis::add(m_le,s); } -URIEditor::URIEditor(TQWidget *tqparent, const char* name) : TLPEditor(tqparent,name){ +URIEditor::URIEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name){ TQString whatsthis =i18n("With this line edit you can insert the URI of the resource you want to reach"); setWhatsThis(whatsthis); setLabelText(" Uri :"); @@ -150,7 +150,7 @@ void URIEditor::openFileDialog(){ } } -fontEditor::fontEditor(TQWidget *tqparent, const char* name) : TLPEditor(tqparent,name), m_initialValue(TQString()){ +fontEditor::fontEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name), m_initialValue(TQString()){ TQString whatsthis =i18n("With this line edit you can insert the name of the font you want to use"); setWhatsThis(whatsthis); setLabelText(i18n("Font family:")); diff --git a/quanta/components/csseditor/tlpeditors.h b/quanta/components/csseditor/tlpeditors.h index 80d5899b..3ff7bbef 100644 --- a/quanta/components/csseditor/tlpeditors.h +++ b/quanta/components/csseditor/tlpeditors.h @@ -39,7 +39,7 @@ class TLPEditor : public miniEditor { //editor with a line text and a button cal KPushButton *m_pb; public: - TLPEditor(TQWidget *tqparent, const char* name=0); + TLPEditor(TQWidget *parent, const char* name=0); virtual ~TLPEditor(); virtual void setButtonIcon(TQString); void setToolTip(TQString); @@ -61,7 +61,7 @@ class fontEditor : public TLPEditor{ TQString m_initialValue; public: - fontEditor(TQWidget *tqparent, const char* name=0); + fontEditor(TQWidget *parent, const char* name=0); virtual void setInitialValue(const TQString& s) { m_initialValue = s; } virtual void connectToPropertySetter(propertySetter* p); @@ -81,7 +81,7 @@ class URIEditor : public TLPEditor { URIResourceType m_resourceType; public: - URIEditor(TQWidget *tqparent, const char* name=0); + URIEditor(TQWidget *parent, const char* name=0); void setMode(const mode& m); void setResourceType(const URIResourceType& r) { m_resourceType = r ; } virtual void setInitialValue(const TQString& /*s*/){} diff --git a/quanta/components/debugger/backtracelistview.cpp b/quanta/components/debugger/backtracelistview.cpp index 6c2d8679..57aa7933 100644 --- a/quanta/components/debugger/backtracelistview.cpp +++ b/quanta/components/debugger/backtracelistview.cpp @@ -49,8 +49,8 @@ BacktraceListviewItem::BacktraceListviewItem(BacktraceListview* view) } -BacktraceListview::BacktraceListview(TQWidget *tqparent, const char *name) - : KListView(tqparent, name) +BacktraceListview::BacktraceListview(TQWidget *parent, const char *name) + : KListView(parent, name) { int charwidth = this->fontMetrics().width("0"); // If you change the order here, change the BacktraceListviewColumns enums above diff --git a/quanta/components/debugger/backtracelistview.h b/quanta/components/debugger/backtracelistview.h index 495130f0..e90226e8 100644 --- a/quanta/components/debugger/backtracelistview.h +++ b/quanta/components/debugger/backtracelistview.h @@ -75,7 +75,7 @@ class BacktraceListview : public KListView public: - BacktraceListview(TQWidget *tqparent = 0, const char *name = 0); + BacktraceListview(TQWidget *parent = 0, const char *name = 0); ~BacktraceListview(); void backtraceShow(int level, BacktraceType type, const TQString& filename, long line, const TQString& func); diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp index 44071116..0680a0c0 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp @@ -49,11 +49,11 @@ K_EXPORT_COMPONENT_FACTORY( quantadebuggerdbgp, const char QuantaDebuggerDBGp::protocolversion[] = "1.0"; -QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *tqparent, const char*, const TQStringList&) - : DebuggerClient (tqparent, "DBGp") +QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *parent, const char*, const TQStringList&) + : DebuggerClient (parent, "DBGp") { // Create a socket object and set up its signals - m_errortqmask = 1794; + m_errormask = 1794; m_supportsasync = false; m_defaultExecutionState = Starting; setExecutionState(m_defaultExecutionState); @@ -649,9 +649,9 @@ void QuantaDebuggerDBGp::readConfig(TQDomNode node) valuenode = node.namedItem("useproxy"); m_useproxy = valuenode.firstChild().nodeValue() == "1"; - valuenode = node.namedItem("errortqmask"); - m_errortqmask = valuenode.firstChild().nodeValue().toLong(); - kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl; + valuenode = node.namedItem("errormask"); + m_errormask = valuenode.firstChild().nodeValue().toLong(); + kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl; // Profiler valuenode = node.namedItem("profilerfilename"); @@ -687,11 +687,11 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) else set.comboDefaultExecutionState->setCurrentItem(1); - set.checkBreakOnNotice->setChecked(QuantaDebuggerDBGp::Notice & m_errortqmask); - set.checkBreakOnWarning->setChecked(QuantaDebuggerDBGp::Warning & m_errortqmask); - set.checkBreakOnUserNotice->setChecked(QuantaDebuggerDBGp::User_Notice & m_errortqmask); - set.checkBreakOnUserWarning->setChecked(QuantaDebuggerDBGp::User_Warning & m_errortqmask); - set.checkBreakOnUserError->setChecked(QuantaDebuggerDBGp::User_Error & m_errortqmask); + set.checkBreakOnNotice->setChecked(QuantaDebuggerDBGp::Notice & m_errormask); + set.checkBreakOnWarning->setChecked(QuantaDebuggerDBGp::Warning & m_errormask); + set.checkBreakOnUserNotice->setChecked(QuantaDebuggerDBGp::User_Notice & m_errormask); + set.checkBreakOnUserWarning->setChecked(QuantaDebuggerDBGp::User_Warning & m_errormask); + set.checkBreakOnUserError->setChecked(QuantaDebuggerDBGp::User_Error & m_errormask); set.lineProfilerFilename->setText(m_profilerFilename); if(m_profilerAutoOpen) @@ -774,18 +774,18 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) } - el = node.namedItem("errortqmask").toElement(); + el = node.namedItem("errormask").toElement(); if (!el.isNull()) el.parentNode().removeChild(el); - el = node.ownerDocument().createElement("errortqmask"); + el = node.ownerDocument().createElement("errormask"); node.appendChild( el ); - m_errortqmask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerDBGp::Notice : 0) + m_errormask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerDBGp::Notice : 0) + (set.checkBreakOnWarning->isChecked() ? QuantaDebuggerDBGp::Warning : 0) + (set.checkBreakOnUserNotice->isChecked() ? QuantaDebuggerDBGp::User_Notice : 0) + (set.checkBreakOnUserWarning->isChecked() ? QuantaDebuggerDBGp::User_Warning : 0) + (set.checkBreakOnUserError->isChecked() ? QuantaDebuggerDBGp::User_Error : 0); - kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl; - el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errortqmask))); + kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl; + el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errormask))); // Profiler el = node.namedItem("profilerfilename").toElement(); @@ -1015,7 +1015,7 @@ void QuantaDebuggerDBGp::handleError(const TQDomNode & statusnode ) { // Managable error long error = attribute(errornode, "code").toLong(); - if(!(error & m_errortqmask)) + if(!(error & m_errormask)) { setExecutionState(Running); } diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h index 52ec17bc..8e5b667f 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h @@ -35,7 +35,7 @@ class QuantaDebuggerDBGp : public DebuggerClient TQ_OBJECT public: - QuantaDebuggerDBGp(TQObject *tqparent, const char* name, const TQStringList&); + QuantaDebuggerDBGp(TQObject *parent, const char* name, const TQStringList&); ~QuantaDebuggerDBGp(); // Execution states @@ -122,7 +122,7 @@ class QuantaDebuggerDBGp : public DebuggerClient bool m_profilerAutoOpen; bool m_profilerMapFilename; State m_executionState, m_defaultExecutionState; - long m_errortqmask; + long m_errormask; long m_displaydelay; bool m_supportsasync; diff --git a/quanta/components/debugger/debuggerbreakpointview.cpp b/quanta/components/debugger/debuggerbreakpointview.cpp index bf4911ad..c6b3b45e 100644 --- a/quanta/components/debugger/debuggerbreakpointview.cpp +++ b/quanta/components/debugger/debuggerbreakpointview.cpp @@ -52,8 +52,8 @@ DebuggerBreakpointViewItem::DebuggerBreakpointViewItem(DebuggerBreakpointView* v } -DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *tqparent, const char *name) - : KListView(tqparent, name) +DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *parent, const char *name) + : KListView(parent, name) { // If you change here, change the DebuggerBreakpointViewColumns enums above addColumn(i18n("Expression")); diff --git a/quanta/components/debugger/debuggerbreakpointview.h b/quanta/components/debugger/debuggerbreakpointview.h index e593a815..f5b0d487 100644 --- a/quanta/components/debugger/debuggerbreakpointview.h +++ b/quanta/components/debugger/debuggerbreakpointview.h @@ -47,7 +47,7 @@ class DebuggerBreakpointView : public KListView TQ_OBJECT public: - DebuggerBreakpointView(TQWidget *tqparent = 0, const char *name = 0); + DebuggerBreakpointView(TQWidget *parent = 0, const char *name = 0); ~DebuggerBreakpointView(); void showBreakpoint(const DebuggerBreakpoint& bp); diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp index 1380c26a..0e65ee5c 100644 --- a/quanta/components/debugger/debuggermanager.cpp +++ b/quanta/components/debugger/debuggermanager.cpp @@ -49,8 +49,8 @@ // dialogs #include "debuggervariablesets.h" -DebuggerManager::DebuggerManager(TQObject *mytqparent) - : TQObject(mytqparent) +DebuggerManager::DebuggerManager(TQObject *myparent) + : TQObject(myparent) { initActions(); diff --git a/quanta/components/debugger/debuggermanager.h b/quanta/components/debugger/debuggermanager.h index ad3c8739..8fae5864 100644 --- a/quanta/components/debugger/debuggermanager.h +++ b/quanta/components/debugger/debuggermanager.h @@ -54,7 +54,7 @@ class DebuggerManager : public TQObject long m_currentLine; public: - DebuggerManager(TQObject *mytqparent); + DebuggerManager(TQObject *myparent); ~DebuggerManager(); // Access to memebers diff --git a/quanta/components/debugger/debuggerui.cpp b/quanta/components/debugger/debuggerui.cpp index ae88b3e9..d2f710b6 100644 --- a/quanta/components/debugger/debuggerui.cpp +++ b/quanta/components/debugger/debuggerui.cpp @@ -36,8 +36,8 @@ #include "resource.h" #include "whtmlpart.h" -DebuggerUI::DebuggerUI(TQObject *tqparent, const char *name) - : TQObject(tqparent, name), m_variablesListView(0) +DebuggerUI::DebuggerUI(TQObject *parent, const char *name) + : TQObject(parent, name), m_variablesListView(0) { // Variable watch tree @@ -69,9 +69,9 @@ DebuggerUI::DebuggerUI(TQObject *tqparent, const char *name) // Show debugger toolbar quantaApp->toolBar("debugger_toolbar")->show(); - connect(m_variablesListView, TQT_SIGNAL(removeVariable(DebuggerVariable* )), tqparent, TQT_SLOT(slotRemoveVariable(DebuggerVariable* ))); + connect(m_variablesListView, TQT_SIGNAL(removeVariable(DebuggerVariable* )), parent, TQT_SLOT(slotRemoveVariable(DebuggerVariable* ))); - connect(m_debuggerBreakpointView, TQT_SIGNAL(removeBreakpoint(DebuggerBreakpoint* )), tqparent, TQT_SLOT(slotRemoveBreakpoint(DebuggerBreakpoint* ))); + connect(m_debuggerBreakpointView, TQT_SIGNAL(removeBreakpoint(DebuggerBreakpoint* )), parent, TQT_SLOT(slotRemoveBreakpoint(DebuggerBreakpoint* ))); showMenu(); } diff --git a/quanta/components/debugger/debuggerui.h b/quanta/components/debugger/debuggerui.h index 3a438f11..de939315 100644 --- a/quanta/components/debugger/debuggerui.h +++ b/quanta/components/debugger/debuggerui.h @@ -50,7 +50,7 @@ class DebuggerUI : public TQObject HaltedOnBreakpoint }; - DebuggerUI(TQObject *tqparent = 0, const char *name = 0); + DebuggerUI(TQObject *parent = 0, const char *name = 0); ~DebuggerUI(); // Watches diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp index 7b84380d..8ba9f7ca 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp +++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp @@ -47,13 +47,13 @@ K_EXPORT_COMPONENT_FACTORY( quantadebuggergubed, const char QuantaDebuggerGubed::protocolversion[] = "0.0.12"; -QuantaDebuggerGubed::QuantaDebuggerGubed (TQObject *tqparent, const char* name, const TQStringList&) - : DebuggerClient (tqparent, name) +QuantaDebuggerGubed::QuantaDebuggerGubed (TQObject *parent, const char* name, const TQStringList&) + : DebuggerClient (parent, name) { // Create a socket object and set up its signals m_socket = NULL; m_server = NULL; - m_errortqmask = 1794; + m_errormask = 1794; m_defaultExecutionState = Pause; setExecutionState(m_defaultExecutionState); @@ -437,7 +437,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) else if(m_executionState == Trace) sendCommand("trace", (char*)0L); - sendCommand("seterrortqmask", "errortqmask", TQString::number(m_errortqmask).ascii(), (char*)0L); + sendCommand("seterrormask", "errormask", TQString::number(m_errormask).ascii(), (char*)0L); } // Just some status info, display on status line else if(m_command == "status") @@ -481,9 +481,9 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) // Put the line number first so double clicking will jump to the corrrect line debuggerInterface()->showtqStatus(i18n("Error occurred: Line %1, Code %2 (%3) in %4").tqarg(args["line"]).tqarg(args["errnum"]).tqarg(args["errmsg"]).tqarg(args["filename"]), true); - // Filter to get error code only and match it with out tqmask + // Filter to get error code only and match it with out mask long error = args["errnum"].toLong(); - if(m_errortqmask & error) + if(m_errormask & error) setExecutionState(Pause); else if(m_executionState == Trace) setExecutionState(Trace); @@ -843,9 +843,9 @@ void QuantaDebuggerGubed::readConfig(TQDomNode node) valuenode = node.namedItem("displaydelay"); m_displaydelay = valuenode.firstChild().nodeValue().toLong(); - valuenode = node.namedItem("errortqmask"); - m_errortqmask = valuenode.firstChild().nodeValue().toLong(); - kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl; + valuenode = node.namedItem("errormask"); + m_errormask = valuenode.firstChild().nodeValue().toLong(); + kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl; } @@ -866,11 +866,11 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) set.lineStartSession->setText(m_startsession); set.comboDefaultExecutionState->setCurrentItem((int)m_defaultExecutionState); - set.checkBreakOnNotice->setChecked(QuantaDebuggerGubed::Notice & m_errortqmask); - set.checkBreakOnWarning->setChecked(QuantaDebuggerGubed::Warning & m_errortqmask); - set.checkBreakOnUserNotice->setChecked(QuantaDebuggerGubed::User_Notice & m_errortqmask); - set.checkBreakOnUserWarning->setChecked(QuantaDebuggerGubed::User_Warning & m_errortqmask); - set.checkBreakOnUserError->setChecked(QuantaDebuggerGubed::User_Error & m_errortqmask); + set.checkBreakOnNotice->setChecked(QuantaDebuggerGubed::Notice & m_errormask); + set.checkBreakOnWarning->setChecked(QuantaDebuggerGubed::Warning & m_errormask); + set.checkBreakOnUserNotice->setChecked(QuantaDebuggerGubed::User_Notice & m_errormask); + set.checkBreakOnUserWarning->setChecked(QuantaDebuggerGubed::User_Warning & m_errormask); + set.checkBreakOnUserError->setChecked(QuantaDebuggerGubed::User_Error & m_errormask); if(set.exec() == TQDialog::Accepted ) { @@ -953,18 +953,18 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) m_displaydelay = set.sliderDisplayDelay->value(); el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_displaydelay))); - el = node.namedItem("errortqmask").toElement(); + el = node.namedItem("errormask").toElement(); if (!el.isNull()) el.parentNode().removeChild(el); - el = node.ownerDocument().createElement("errortqmask"); + el = node.ownerDocument().createElement("errormask"); node.appendChild( el ); - m_errortqmask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerGubed::Notice : 0) + m_errormask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerGubed::Notice : 0) + (set.checkBreakOnWarning->isChecked() ? QuantaDebuggerGubed::Warning : 0) + (set.checkBreakOnUserNotice->isChecked() ? QuantaDebuggerGubed::User_Notice : 0) + (set.checkBreakOnUserWarning->isChecked() ? QuantaDebuggerGubed::User_Warning : 0) + (set.checkBreakOnUserError->isChecked() ? QuantaDebuggerGubed::User_Error : 0); - kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl; - el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errortqmask))); + kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl; + el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errormask))); } } diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.h b/quanta/components/debugger/gubed/quantadebuggergubed.h index b30bbe5c..4663d9fa 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.h +++ b/quanta/components/debugger/gubed/quantadebuggergubed.h @@ -34,7 +34,7 @@ class QuantaDebuggerGubed : public DebuggerClient TQ_OBJECT public: - QuantaDebuggerGubed(TQObject *tqparent, const char* name, const TQStringList&); + QuantaDebuggerGubed(TQObject *parent, const char* name, const TQStringList&); ~QuantaDebuggerGubed(); // Execution states @@ -110,7 +110,7 @@ class QuantaDebuggerGubed : public DebuggerClient TQString m_listenPort; bool m_useproxy; State m_executionState, m_defaultExecutionState; - long m_errortqmask; + long m_errormask; long m_displaydelay; WatchList m_watchlist; diff --git a/quanta/components/debugger/interfaces/debuggerclient.cpp b/quanta/components/debugger/interfaces/debuggerclient.cpp index 03b024f0..88b5460e 100644 --- a/quanta/components/debugger/interfaces/debuggerclient.cpp +++ b/quanta/components/debugger/interfaces/debuggerclient.cpp @@ -23,8 +23,8 @@ // CTor -DebuggerClient::DebuggerClient(TQObject *tqparent, const char* name) - : TQObject(tqparent, name) +DebuggerClient::DebuggerClient(TQObject *parent, const char* name) + : TQObject(parent, name) { m_active = false; } @@ -32,7 +32,7 @@ DebuggerClient::DebuggerClient(TQObject *tqparent, const char* name) DebuggerInterface* DebuggerClient::debuggerInterface() { - return static_cast( tqparent()->child( 0, "DebuggerInterface" ) ); + return static_cast( parent()->child( 0, "DebuggerInterface" ) ); } // Active state of session diff --git a/quanta/components/debugger/interfaces/debuggerclient.h b/quanta/components/debugger/interfaces/debuggerclient.h index 20d5b604..317ff3e3 100644 --- a/quanta/components/debugger/interfaces/debuggerclient.h +++ b/quanta/components/debugger/interfaces/debuggerclient.h @@ -67,7 +67,7 @@ class DebuggerClient : public TQObject private: protected: - DebuggerClient(TQObject *tqparent, const char* name); + DebuggerClient(TQObject *parent, const char* name); bool m_active; diff --git a/quanta/components/debugger/interfaces/debuggerinterface.cpp b/quanta/components/debugger/interfaces/debuggerinterface.cpp index 013aeb15..4d7beda6 100644 --- a/quanta/components/debugger/interfaces/debuggerinterface.cpp +++ b/quanta/components/debugger/interfaces/debuggerinterface.cpp @@ -17,8 +17,8 @@ #include "debuggerinterface.h" -DebuggerInterface::DebuggerInterface (TQObject *tqparent, const char* name) - : TQObject(tqparent, name) +DebuggerInterface::DebuggerInterface (TQObject *parent, const char* name) + : TQObject(parent, name) { } diff --git a/quanta/components/debugger/interfaces/debuggerinterface.h b/quanta/components/debugger/interfaces/debuggerinterface.h index a93fee50..dabd685d 100644 --- a/quanta/components/debugger/interfaces/debuggerinterface.h +++ b/quanta/components/debugger/interfaces/debuggerinterface.h @@ -37,7 +37,7 @@ class DebuggerInterface : public TQObject public: - DebuggerInterface(TQObject *tqparent, const char* name); + DebuggerInterface(TQObject *parent, const char* name); // Breakpoints virtual void haveBreakpoint (const TQString& file, int line) = 0; diff --git a/quanta/components/debugger/pathmapper.cpp b/quanta/components/debugger/pathmapper.cpp index 41d5053e..96e4f628 100644 --- a/quanta/components/debugger/pathmapper.cpp +++ b/quanta/components/debugger/pathmapper.cpp @@ -27,8 +27,8 @@ #include #include -PathMapper::PathMapper(TQObject *tqparent, const char *name) - : TQObject(tqparent, name) +PathMapper::PathMapper(TQObject *parent, const char *name) + : TQObject(parent, name) { } diff --git a/quanta/components/debugger/pathmapper.h b/quanta/components/debugger/pathmapper.h index 92a761ac..b504ced9 100644 --- a/quanta/components/debugger/pathmapper.h +++ b/quanta/components/debugger/pathmapper.h @@ -31,7 +31,7 @@ class PathMapper : public TQObject TQ_OBJECT public: - PathMapper(TQObject *tqparent = 0, const char *name = 0); + PathMapper(TQObject *parent = 0, const char *name = 0); PathMapper(); virtual TQString mapLocalPathToServer(const TQString &localpath); virtual TQString mapServerPathToLocal(const TQString &serverpath); diff --git a/quanta/components/debugger/quantadebuggerinterface.cpp b/quanta/components/debugger/quantadebuggerinterface.cpp index 83eb582c..385849a5 100644 --- a/quanta/components/debugger/quantadebuggerinterface.cpp +++ b/quanta/components/debugger/quantadebuggerinterface.cpp @@ -32,10 +32,10 @@ class DebuggerBreakpoint; -QuantaDebuggerInterface::QuantaDebuggerInterface (TQObject *mytqparent, const char* name) - : DebuggerInterface(mytqparent, name) +QuantaDebuggerInterface::QuantaDebuggerInterface (TQObject *myparent, const char* name) + : DebuggerInterface(myparent, name) { - m_manager = static_cast(tqparent()); + m_manager = static_cast(parent()); } QuantaDebuggerInterface::~QuantaDebuggerInterface () diff --git a/quanta/components/debugger/quantadebuggerinterface.h b/quanta/components/debugger/quantadebuggerinterface.h index ba637307..9c2ba724 100644 --- a/quanta/components/debugger/quantadebuggerinterface.h +++ b/quanta/components/debugger/quantadebuggerinterface.h @@ -34,7 +34,7 @@ class QuantaDebuggerInterface : public DebuggerInterface DebuggerManager *m_manager; public: - QuantaDebuggerInterface(TQObject *mytqparent, const char* name); + QuantaDebuggerInterface(TQObject *myparent, const char* name); ~QuantaDebuggerInterface(); // Breakpoints diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp index 9c7263bb..442cce89 100644 --- a/quanta/components/debugger/variableslistview.cpp +++ b/quanta/components/debugger/variableslistview.cpp @@ -47,8 +47,8 @@ namespace VariablesListViewColumns }; } -VariablesListView::VariablesListView(TQWidget *tqparent, const char *name) - : KListView(tqparent, name) +VariablesListView::VariablesListView(TQWidget *parent, const char *name) + : KListView(parent, name) { // If you change here, change the VariablesListViewColumns enums above addColumn(i18n("Name")); diff --git a/quanta/components/debugger/variableslistview.h b/quanta/components/debugger/variableslistview.h index b4f3d9bc..9a8f7347 100644 --- a/quanta/components/debugger/variableslistview.h +++ b/quanta/components/debugger/variableslistview.h @@ -39,7 +39,7 @@ class VariablesListView : public KListView }; public: - VariablesListView(TQWidget *tqparent = 0, const char *name = 0); + VariablesListView(TQWidget *parent = 0, const char *name = 0); ~VariablesListView(); void addVariable(DebuggerVariable* variable); diff --git a/quanta/components/framewizard/framewizard.cpp b/quanta/components/framewizard/framewizard.cpp index 0eabb061..7a2223fe 100644 --- a/quanta/components/framewizard/framewizard.cpp +++ b/quanta/components/framewizard/framewizard.cpp @@ -28,7 +28,7 @@ static const TQString info1=i18n("You must select an area."), info2=i18n("Before editing a frame you must save the file."); -FrameWizard::FrameWizard(TQWidget *tqparent, const char *name) : FrameWizardS(tqparent, name), +FrameWizard::FrameWizard(TQWidget *parent, const char *name) : FrameWizardS(parent, name), m_hasSelected(false),m_saved(false) { m_hasSelected = false; diff --git a/quanta/components/framewizard/framewizard.h b/quanta/components/framewizard/framewizard.h index 177c6c6b..906319c8 100644 --- a/quanta/components/framewizard/framewizard.h +++ b/quanta/components/framewizard/framewizard.h @@ -36,7 +36,7 @@ class FrameWizard : public FrameWizardS TQString m_currSA; public: - FrameWizard( TQWidget* tqparent=0, const char *name=0); + FrameWizard( TQWidget* parent=0, const char *name=0); ~FrameWizard(); private slots: diff --git a/quanta/components/framewizard/selectablearea.cpp b/quanta/components/framewizard/selectablearea.cpp index 40f76ae2..80c7aa00 100644 --- a/quanta/components/framewizard/selectablearea.cpp +++ b/quanta/components/framewizard/selectablearea.cpp @@ -20,7 +20,7 @@ //#include #include "fwglobal.h" -SelectableArea::SelectableArea(TQWidget *tqparent, const char *name ) : KHTMLPart(tqparent,name) { +SelectableArea::SelectableArea(TQWidget *parent, const char *name ) : KHTMLPart(parent,name) { view()->setFrameShape(TQFrame::NoFrame); view()->setMinimumSize(TQSize(1,1)); view()->installEventFilter(this); diff --git a/quanta/components/framewizard/selectablearea.h b/quanta/components/framewizard/selectablearea.h index 3df3200a..ffdd9c20 100644 --- a/quanta/components/framewizard/selectablearea.h +++ b/quanta/components/framewizard/selectablearea.h @@ -32,7 +32,7 @@ class SelectableArea : public KHTMLPart { TQ_OBJECT public : - SelectableArea(TQWidget *tqparent=0, const char *name=0); + SelectableArea(TQWidget *parent=0, const char *name=0); ~SelectableArea(); TQString idLabel() const { return m_idLabel; } void setIdLabel(const TQString &i) { m_idLabel = i; } diff --git a/quanta/components/framewizard/treenode.cpp b/quanta/components/framewizard/treenode.cpp index 592d33d5..2faaf3d6 100644 --- a/quanta/components/framewizard/treenode.cpp +++ b/quanta/components/framewizard/treenode.cpp @@ -114,13 +114,13 @@ TQString tree::addChildNode(const TQString &l){ } bool tree::insertChildNode(const TQString &l){ - TQString tqparent = findNode(l)->parentLabel(); - int pos=findNode( tqparent )->childPosition( findNode(l) ); + TQString parent = findNode(l)->parentLabel(); + int pos=findNode( parent )->childPosition( findNode(l) ); ++nodeId; - treeNode *newNode = new treeNode(TQString::number(nodeId,10),tqparent); + treeNode *newNode = new treeNode(TQString::number(nodeId,10),parent); newNode->atts()->setAttribute( "src",findNode(l)->atts()->src() ); m_nodeList.insert(TQString::number(nodeId,10),newNode); - return findNode( tqparent )->insertChild(pos,newNode); + return findNode( parent )->insertChild(pos,newNode); } void tree::reset(){ diff --git a/quanta/components/framewizard/treenode.h b/quanta/components/framewizard/treenode.h index 428a381f..c96d9b17 100644 --- a/quanta/components/framewizard/treenode.h +++ b/quanta/components/framewizard/treenode.h @@ -77,7 +77,7 @@ class tree{ treeNode* root() const { return m_root; } TQString addChildNode(const TQString &l); bool insertChildNode(const TQString &L); - void removeChildNode(const TQString &pl,const TQString &l,bool autoDelete);//tqparent node,child node + void removeChildNode(const TQString &pl,const TQString &l,bool autoDelete);//parent node,child node treeNode* findNode(const TQString &L); areaAttribute* findAreaAttribute(const TQString &l){ return findNode(l)->atts(); }; void reset(); diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp index 215bdf63..e822d7e0 100644 --- a/quanta/components/framewizard/visualframeeditor.cpp +++ b/quanta/components/framewizard/visualframeeditor.cpp @@ -32,7 +32,7 @@ TQMap > SIZES; static int splitterIdNumber = 0; -VisualFrameEditor::VisualFrameEditor(TQWidget * tqparent, const char * name) : TQHBox(tqparent,name){ +VisualFrameEditor::VisualFrameEditor(TQWidget * parent, const char * name) : TQHBox(parent,name){ m_internalTree = new tree; m_internalTree->root()->atts()->setGeometry(TQRect(0,0,510,422)); m_firstInsertedSA = 0L; @@ -136,21 +136,21 @@ TQStringList VisualFrameEditor::convertAsterisks(const TQString &s,int d){ return list; } -void VisualFrameEditor::buildInternalTree(const TQString &tqparent){ +void VisualFrameEditor::buildInternalTree(const TQString &parent){ TQString line = m_existingStructure.first(); if(line.contains("findNode(tqparent)->atts()->tqgeometry(); + TQRect dummy=m_internalTree->findNode(parent)->atts()->tqgeometry(); TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.height()); int dummyDimension=dummy.height()-cancelledPixels(line.contains(",")+1); - TQPtrList list=m_internalTree->findNode(tqparent)->tqchildrenList(); + TQPtrList list=m_internalTree->findNode(parent)->tqchildrenList(); TQPtrListIterator it( list ); treeNode *node; while ( (node = it.current()) != 0 ) { @@ -167,16 +167,16 @@ void VisualFrameEditor::buildInternalTree(const TQString &tqparent){ } else if(line.contains("cols")) { - split(tqparent,(line.contains(",")+1),VERTICAL); + split(parent,(line.contains(",")+1),VERTICAL); TQRegExp pattern("cols\\s*=\"([\\s\\d%,\\*]*)\""); pattern.search(line); - TQRect dummy=m_internalTree->findNode(tqparent)->atts()->tqgeometry(); + TQRect dummy=m_internalTree->findNode(parent)->atts()->tqgeometry(); TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.width()); int dummyDimension=dummy.width()-cancelledPixels(line.contains(",")+1); - TQPtrList list=m_internalTree->findNode(tqparent)->tqchildrenList(); + TQPtrList list=m_internalTree->findNode(parent)->tqchildrenList(); TQPtrListIterator it( list ); treeNode *node; while ( (node = it.current()) != 0 ) { @@ -193,10 +193,10 @@ void VisualFrameEditor::buildInternalTree(const TQString &tqparent){ } m_existingStructure.pop_front(); - m_internalTree->findNode(tqparent)->firstChild(); - while(m_internalTree->findNode(tqparent)->currentChild()) { - buildInternalTree(m_internalTree->findNode(tqparent)->currentChild()->label()); - m_internalTree->findNode(tqparent)->nextChild(); + m_internalTree->findNode(parent)->firstChild(); + while(m_internalTree->findNode(parent)->currentChild()) { + buildInternalTree(m_internalTree->findNode(parent)->currentChild()->label()); + m_internalTree->findNode(parent)->nextChild(); } } else { @@ -221,7 +221,7 @@ void VisualFrameEditor::buildInternalTree(const TQString &tqparent){ attributeMap[ pattern.cap(1).section( TQRegExp("=\\s*\"") ,0,0) ] = pattern.cap(1).section(TQRegExp("=\\s*\""),1,1).remove("\""); if ( pos >= 0 ) pos += pattern.matchedLength(); } - m_internalTree->findNode(tqparent)->atts()->setAllAttributes(attributeMap); + m_internalTree->findNode(parent)->atts()->setAllAttributes(attributeMap); m_existingStructure.pop_front(); } } @@ -283,10 +283,10 @@ void VisualFrameEditor::removeNode(const TQString &l){ } } -void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* tqparent){ +void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){ if(n->hasChildren()) { TQString splitterName("splitter"+TQString::number(++splitterIdNumber,10)); - TQSplitter *splitter = new TQSplitter(tqparent,splitterName.ascii()); + TQSplitter *splitter = new TQSplitter(parent,splitterName.ascii()); if(SIZES.contains(splitterName)) splitter->setSizes( SIZES[splitterName] ); switch( n->splitType() ){ case VERTICAL : splitter->setOrientation(Qt::Horizontal);break; @@ -300,8 +300,8 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* tqparent){ } } else { - SelectableArea *sa=new SelectableArea(tqparent,n->label().ascii()); - if(tqparent->isA(TQSPLITTER_OBJECT_NAME_STRING)) dynamic_cast(tqparent)->setResizeMode(sa->view(),TQSplitter::KeepSize ); + SelectableArea *sa=new SelectableArea(parent,n->label().ascii()); + if(parent->isA(TQSPLITTER_OBJECT_NAME_STRING)) dynamic_cast(parent)->setResizeMode(sa->view(),TQSplitter::KeepSize ); else if(!m_firstInsertedSA) m_firstInsertedSA = sa; sa->view()->setGeometry(n->atts()->tqgeometry()); diff --git a/quanta/components/framewizard/visualframeeditor.h b/quanta/components/framewizard/visualframeeditor.h index c3b28b7b..c7338128 100644 --- a/quanta/components/framewizard/visualframeeditor.h +++ b/quanta/components/framewizard/visualframeeditor.h @@ -37,9 +37,9 @@ class VisualFrameEditor : public TQHBox { TQStringList m_existingStructure; MarkupLanguage m_markupLanguage; - void buildInternalTree(const TQString &tqparent); + void buildInternalTree(const TQString &parent); void setGeometries(const TQString &l); - void drawGUI(treeNode *n, TQWidget* tqparent); + void drawGUI(treeNode *n, TQWidget* parent); TQStringList convertAsterisks(const TQString &s, int d); TQString createFrameTag(areaAttribute *a); @@ -48,7 +48,7 @@ class VisualFrameEditor : public TQHBox { void createStructure(treeNode* n); public: - VisualFrameEditor( TQWidget * tqparent = 0, const char * name = 0); + VisualFrameEditor( TQWidget * parent = 0, const char * name = 0); ~VisualFrameEditor(); void draw() { tqrepaint(); } void loadExistingStructure(const TQStringList &list); diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp index c49d2be0..a94c15e4 100644 --- a/quanta/components/tableeditor/tableeditor.cpp +++ b/quanta/components/tableeditor/tableeditor.cpp @@ -48,8 +48,8 @@ int newNum; -TableEditor::TableEditor(TQWidget* tqparent, const char* name) - : TableEditorS(tqparent, name) +TableEditor::TableEditor(TQWidget* parent, const char* name) + : TableEditorS(parent, name) { m_popup = new KPopupMenu(); m_cellEditId = m_popup->insertItem(i18n("&Edit Cell Properties"), this ,TQT_SLOT(slotEditCell())); diff --git a/quanta/components/tableeditor/tableeditor.h b/quanta/components/tableeditor/tableeditor.h index f8e7cf40..2368d9d7 100644 --- a/quanta/components/tableeditor/tableeditor.h +++ b/quanta/components/tableeditor/tableeditor.h @@ -50,7 +50,7 @@ class TableEditor : public TableEditorS TQ_OBJECT public: - TableEditor( TQWidget* tqparent = 0, const char* name = 0 ); + TableEditor( TQWidget* parent = 0, const char* name = 0 ); ~TableEditor(); virtual bool setTableArea( int bLine, int bCol, int eLine, int eCol, Parser * docParser ); diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp index 562d74ed..e4ef5ee2 100644 --- a/quanta/dialogs/actionconfigdialog.cpp +++ b/quanta/dialogs/actionconfigdialog.cpp @@ -50,10 +50,10 @@ #include "tagaction.h" #include "toolbartabwidget.h" -ActionConfigDialog::ActionConfigDialog(const TQDict &toolbarList, KMainWindow* tqparent, const char* name, bool modal, WFlags fl, const TQString& defaultAction ) - :ActionConfigDialogS( tqparent, name, modal, fl ) +ActionConfigDialog::ActionConfigDialog(const TQDict &toolbarList, KMainWindow* parent, const char* name, bool modal, WFlags fl, const TQString& defaultAction ) + :ActionConfigDialogS( parent, name, modal, fl ) { - m_mainWindow = tqparent; + m_mainWindow = parent; m_toolbarList = toolbarList; buttonOk->setIconSet(SmallIconSet("button_ok")); buttonCancel->setIconSet(SmallIconSet("button_cancel")); @@ -171,8 +171,8 @@ void ActionConfigDialog::slotAddToolbar() if (!actionTreeView->findItem(toolbarName, 0)) { item = actionTreeView->lastItem(); - if (item->tqparent()) - item = item->tqparent(); + if (item->parent()) + item = item->parent(); new KListViewItem(actionTreeView, item, i18n(toolbarName.utf8())); break; } @@ -183,9 +183,9 @@ void ActionConfigDialog::slotRemoveToolbar() { TQListViewItem *item = actionTreeView->currentItem(); TQString s = item->text(0); - if (item->tqparent()) + if (item->parent()) { - item = item->tqparent(); + item = item->parent(); s = item->text(0); } if (s != i18n("All")) @@ -213,8 +213,8 @@ void ActionConfigDialog::slotEditToolbar() TQString toolbarId; TQListViewItem *oldItem; TQListViewItem *item = actionTreeView->currentItem(); - if (item->tqparent()) - item = item->tqparent(); + if (item->parent()) + item = item->parent(); toolbarName = item->text(0); if ( toolbarName != i18n("All")) { @@ -344,7 +344,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item) node.toElement().attribute("name") == el.attribute("name")) { toolbarListBox->insertItem(toolbarName); - if (item->tqparent()->text(0) == toolbarName) + if (item->parent()->text(0) == toolbarName) current = count; count++; } @@ -635,7 +635,7 @@ void ActionConfigDialog::saveCurrentAction() while (iter.current()) { listItem = iter.current(); - if (listItem->depth() > 0 && listItem->tqparent()->text(0) == toolbarName + if (listItem->depth() > 0 && listItem->parent()->text(0) == toolbarName && listItem->text(2) == el.attribute("name")) { delete listItem; @@ -811,12 +811,12 @@ void ActionConfigDialog::slotNewAction() item->setText(0, actionText); item->setPixmap(0, SmallIcon("ball")); allActionsItem->sortChildItems(0, true); - if (currentItem->tqparent() && currentItem->tqparent() == allActionsItem) + if (currentItem->parent() && currentItem->parent() == allActionsItem) { actionTreeView->setCurrentItem(item); } else { - TQListViewItem *parentItem = currentItem->tqparent(); + TQListViewItem *parentItem = currentItem->parent(); if (!parentItem) parentItem = currentItem; diff --git a/quanta/dialogs/actionconfigdialog.h b/quanta/dialogs/actionconfigdialog.h index cbe44d1d..0187390e 100644 --- a/quanta/dialogs/actionconfigdialog.h +++ b/quanta/dialogs/actionconfigdialog.h @@ -46,7 +46,7 @@ class ActionConfigDialog: public ActionConfigDialogS public: - ActionConfigDialog(const TQDict &toolbarList, KMainWindow* tqparent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 , const TQString& defaultAction = TQString()); + ActionConfigDialog(const TQDict &toolbarList, KMainWindow* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 , const TQString& defaultAction = TQString()); ~ActionConfigDialog(); void createScriptAction(const TQString& a_name, const TQString& a_script); diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp index 61940d1c..972c4828 100644 --- a/quanta/dialogs/dirtydlg.cpp +++ b/quanta/dialogs/dirtydlg.cpp @@ -34,7 +34,7 @@ #include "resource.h" #include "qextfileinfo.h" -DirtyDlg::DirtyDlg(const TQString& srcName, const TQString& destName, bool createBackup, TQWidget *tqparent, const char *name ) : KDialogBase(tqparent, name, true, i18n("File Changed"), KDialogBase::Ok) +DirtyDlg::DirtyDlg(const TQString& srcName, const TQString& destName, bool createBackup, TQWidget *parent, const char *name ) : KDialogBase(parent, name, true, i18n("File Changed"), KDialogBase::Ok) { m_src.setPath(srcName); m_dest.setPath(destName); diff --git a/quanta/dialogs/dirtydlg.h b/quanta/dialogs/dirtydlg.h index c850ab25..b14fe23e 100644 --- a/quanta/dialogs/dirtydlg.h +++ b/quanta/dialogs/dirtydlg.h @@ -31,7 +31,7 @@ class DirtyDlg : public KDialogBase { TQ_OBJECT public: - DirtyDlg(const TQString& srcName, const TQString& destName, bool createBackup = false, TQWidget *tqparent=0, const char *name=0); + DirtyDlg(const TQString& srcName, const TQString& destName, bool createBackup = false, TQWidget *parent=0, const char *name=0); ~DirtyDlg(); protected slots: // Protected slots diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp index 7a6120e4..28f00ce3 100644 --- a/quanta/dialogs/dtepeditdlg.cpp +++ b/quanta/dialogs/dtepeditdlg.cpp @@ -40,8 +40,8 @@ #include "resource.h" #include "quantacommon.h" -DTEPEditDlg::DTEPEditDlg(const TQString& descriptionFile, TQWidget *tqparent, const char *name) - : DTEPEditDlgS(tqparent, name) +DTEPEditDlg::DTEPEditDlg(const TQString& descriptionFile, TQWidget *parent, const char *name) + : DTEPEditDlgS(parent, name) { nameEdit->setFocus(); m_descriptionFile = descriptionFile; diff --git a/quanta/dialogs/dtepeditdlg.h b/quanta/dialogs/dtepeditdlg.h index a1b9357c..148af592 100644 --- a/quanta/dialogs/dtepeditdlg.h +++ b/quanta/dialogs/dtepeditdlg.h @@ -58,7 +58,7 @@ class DTEPEditDlg : public DTEPEditDlgS Q_OBJECT TQ_OBJECT public: - DTEPEditDlg(const TQString& descriptionFile, TQWidget *tqparent = 0, const char *name = 0); + DTEPEditDlg(const TQString& descriptionFile, TQWidget *parent = 0, const char *name = 0); ~DTEPEditDlg(); void saveResult(); void slotFamilyChanged(int family); diff --git a/quanta/dialogs/dtepeditdlgs.ui b/quanta/dialogs/dtepeditdlgs.ui index 8c223417..163ebdb8 100644 --- a/quanta/dialogs/dtepeditdlgs.ui +++ b/quanta/dialogs/dtepeditdlgs.ui @@ -1212,7 +1212,7 @@ Example:<b>script(language)</b> means that any <b>&lt;scri Tags and attributes defining this DTEP - Comma separated list of tags that define this DTEP. The format used is <i>tagname(attribute[defaultvalue])</i>. If the tqparent (a real) DTEP has a tag with <i>tagname</i> and + Comma separated list of tags that define this DTEP. The format used is <i>tagname(attribute[defaultvalue])</i>. If the parent (a real) DTEP has a tag with <i>tagname</i> and the <i>attribute value</i> of this tag is equal with the name of this DTEP, the tag area is parsed according to the rules of this DTEP.<br> If <i>[defaultvalue]</i> is present, it means that if the attribute is not present in the tag it is taken as present with <i>value = defaultvalue</i>.<br> @@ -1335,7 +1335,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> Tags and attributes defining this DTEP - Comma separated list of tags that define this DTEP. The format used is <i>tagname(attribute[defaultvalue])</i>. If the tqparent (a real) DTEP has a tag with <i>tagname</i> and + Comma separated list of tags that define this DTEP. The format used is <i>tagname(attribute[defaultvalue])</i>. If the parent (a real) DTEP has a tag with <i>tagname</i> and the <i>attribute value</i> of this tag is equal with the name of this DTEP, the tag area is parsed according to the rules of this DTEP.<br> If <i>[defaultvalue]</i> is present, it means that if the attribute is not present in the tag it is taken as present with <i>value = defaultvalue</i>.<br> diff --git a/quanta/dialogs/dtepstructureeditdlgs.ui b/quanta/dialogs/dtepstructureeditdlgs.ui index bcec6363..059c783d 100644 --- a/quanta/dialogs/dtepstructureeditdlgs.ui +++ b/quanta/dialogs/dtepstructureeditdlgs.ui @@ -350,10 +350,10 @@ Example 3:<br> Parent group: - The name of the group that may be the tqparent of this + The name of the group that may be the parent of this - The name of the group that may be the tqparent of this. For example <b>classes</b> might be a tqparent of <b>functions</b> in case of member functions. This entry indicates this possible relationship and is used to provide functionality like member autocompletion. + The name of the group that may be the parent of this. For example <b>classes</b> might be a parent of <b>functions</b> in case of member functions. This entry indicates this possible relationship and is used to provide functionality like member autocompletion. @@ -361,10 +361,10 @@ Example 3:<br> parentGroupEdit - The name of the group that may be the tqparent of this + The name of the group that may be the parent of this - The name of the group that may be the tqparent of this. For example <b>classes</b> might be a tqparent of <b>functions</b> in case of member functions. This entry indicates this possible relationship and is used to provide functionality like member autocompletion. + The name of the group that may be the parent of this. For example <b>classes</b> might be a parent of <b>functions</b> in case of member functions. This entry indicates this possible relationship and is used to provide functionality like member autocompletion. diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp index b0eae65c..636559ce 100644 --- a/quanta/dialogs/filecombo.cpp +++ b/quanta/dialogs/filecombo.cpp @@ -29,8 +29,8 @@ #include "filecombo.h" #include "qextfileinfo.h" -FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *tqparent, const char *name ) - :TQWidget(tqparent,name) +FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name ) + :TQWidget(parent,name) { baseURL = a_baseURL; m_absolutePath = false; @@ -53,8 +53,8 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *tqparent, const char *name setFocusProxy(combo); } -FileCombo::FileCombo( TQWidget *tqparent, const char *name ) - :TQWidget( tqparent, name ) +FileCombo::FileCombo( TQWidget *parent, const char *name ) + :TQWidget( parent, name ) { baseURL.setPath("."); diff --git a/quanta/dialogs/filecombo.h b/quanta/dialogs/filecombo.h index e8610816..dbab2ed8 100644 --- a/quanta/dialogs/filecombo.h +++ b/quanta/dialogs/filecombo.h @@ -33,8 +33,8 @@ class FileCombo : public TQWidget { Q_OBJECT TQ_OBJECT public: - FileCombo(const KURL& a_baseURL, TQWidget *tqparent=0, const char *name=0); - FileCombo(TQWidget *tqparent=0, const char *name=0); + FileCombo(const KURL& a_baseURL, TQWidget *parent=0, const char *name=0); + FileCombo(TQWidget *parent=0, const char *name=0); ~FileCombo(); TQString text() const; diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp index f41a98a1..46805d0e 100644 --- a/quanta/dialogs/settings/abbreviation.cpp +++ b/quanta/dialogs/settings/abbreviation.cpp @@ -41,8 +41,8 @@ #include "dtds.h" -AbbreviationDlg::AbbreviationDlg(TQWidget *tqparent, const char *name): - AbbreviationDlgS(tqparent, name) +AbbreviationDlg::AbbreviationDlg(TQWidget *parent, const char *name): + AbbreviationDlgS(parent, name) { m_oldItem = 0L; m_currentAbbrev = 0L; diff --git a/quanta/dialogs/settings/abbreviation.h b/quanta/dialogs/settings/abbreviation.h index 949ad663..3199881f 100644 --- a/quanta/dialogs/settings/abbreviation.h +++ b/quanta/dialogs/settings/abbreviation.h @@ -29,7 +29,7 @@ class AbbreviationDlg : public AbbreviationDlgS Q_OBJECT TQ_OBJECT public: - AbbreviationDlg(TQWidget *tqparent, const char *name = 0); + AbbreviationDlg(TQWidget *parent, const char *name = 0); ~AbbreviationDlg(); void saveTemplates(); diff --git a/quanta/dialogs/settings/filemasks.cpp b/quanta/dialogs/settings/filemasks.cpp index 58a601e8..fee135f8 100644 --- a/quanta/dialogs/settings/filemasks.cpp +++ b/quanta/dialogs/settings/filemasks.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filestqmask.cpp - description + filesmask.cpp - description ------------------- begin : Fri May 19 2000 copyright : (C) 2000 by Yacovlev Alexander & Dmitry Poplavsky @@ -23,8 +23,8 @@ //kde includes #include -FileMasks::FileMasks(TQWidget *tqparent, const char *name) - :FileMasksS(tqparent,name) +FileMasks::FileMasks(TQWidget *parent, const char *name) + :FileMasksS(parent,name) { connect(buttonDefault, TQT_SIGNAL(clicked()), this, TQT_SLOT(setToDefault())); } diff --git a/quanta/dialogs/settings/filemasks.h b/quanta/dialogs/settings/filemasks.h index cc596259..10191919 100644 --- a/quanta/dialogs/settings/filemasks.h +++ b/quanta/dialogs/settings/filemasks.h @@ -1,5 +1,5 @@ /*************************************************************************** - filestqmask.h - description + filesmask.h - description ------------------- begin : Fri May 19 2000 copyright : (C) 2000 by Yacovlev Alexander & Dmitry Poplavsky @@ -26,7 +26,7 @@ class FileMasks : public FileMasksS Q_OBJECT TQ_OBJECT public: - FileMasks(TQWidget *tqparent=0, const char *name=0); + FileMasks(TQWidget *parent=0, const char *name=0); ~FileMasks(); public slots: diff --git a/quanta/dialogs/settings/parseroptions.cpp b/quanta/dialogs/settings/parseroptions.cpp index c38e2875..f3fad631 100644 --- a/quanta/dialogs/settings/parseroptions.cpp +++ b/quanta/dialogs/settings/parseroptions.cpp @@ -22,11 +22,11 @@ #include /* - * Constructs a ParserOptions which is a child of 'tqparent', with the + * Constructs a ParserOptions which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -ParserOptions::ParserOptions( KConfig *a_config, TQWidget* tqparent, const char* name ) - : ParserOptionsUI( tqparent, name ) +ParserOptions::ParserOptions( KConfig *a_config, TQWidget* parent, const char* name ) + : ParserOptionsUI( parent, name ) { config = a_config; config->setGroup("Parser options"); diff --git a/quanta/dialogs/settings/parseroptions.h b/quanta/dialogs/settings/parseroptions.h index 55710161..7d7cbd69 100644 --- a/quanta/dialogs/settings/parseroptions.h +++ b/quanta/dialogs/settings/parseroptions.h @@ -26,7 +26,7 @@ class ParserOptions : public ParserOptionsUI TQ_OBJECT public: - ParserOptions( KConfig *config, TQWidget* tqparent = 0, const char* name = 0); + ParserOptions( KConfig *config, TQWidget* parent = 0, const char* name = 0); ~ParserOptions(); void updateConfig(); diff --git a/quanta/dialogs/settings/previewoptions.cpp b/quanta/dialogs/settings/previewoptions.cpp index 3c0e3c1b..e1df2225 100644 --- a/quanta/dialogs/settings/previewoptions.cpp +++ b/quanta/dialogs/settings/previewoptions.cpp @@ -23,8 +23,8 @@ #include #include -PreviewOptions::PreviewOptions(TQWidget *tqparent, const char *name) - : PreviewOptionsS(tqparent,name) +PreviewOptions::PreviewOptions(TQWidget *parent, const char *name) + : PreviewOptionsS(parent,name) { } diff --git a/quanta/dialogs/settings/previewoptions.h b/quanta/dialogs/settings/previewoptions.h index ebddcc32..24f1a765 100644 --- a/quanta/dialogs/settings/previewoptions.h +++ b/quanta/dialogs/settings/previewoptions.h @@ -26,7 +26,7 @@ class PreviewOptions : public PreviewOptionsS { Q_OBJECT TQ_OBJECT public: - PreviewOptions(TQWidget *tqparent=0, const char *name=0); + PreviewOptions(TQWidget *parent=0, const char *name=0); ~PreviewOptions(); TQString position(); diff --git a/quanta/dialogs/specialchardialog.cpp b/quanta/dialogs/specialchardialog.cpp index f8697123..200b5afe 100644 --- a/quanta/dialogs/specialchardialog.cpp +++ b/quanta/dialogs/specialchardialog.cpp @@ -28,8 +28,8 @@ #include "specialchardialog.h" #include "resource.h" -SpecialCharDialog::SpecialCharDialog( TQWidget* tqparent, const char* name, bool modal, WFlags fl) - :SpecialCharDialogS( tqparent, name, modal, fl ) +SpecialCharDialog::SpecialCharDialog( TQWidget* parent, const char* name, bool modal, WFlags fl) + :SpecialCharDialogS( parent, name, modal, fl ) { connect ( FilterLineEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(filterChars(const TQString&)) ); diff --git a/quanta/dialogs/specialchardialog.h b/quanta/dialogs/specialchardialog.h index dec3320e..e6562706 100644 --- a/quanta/dialogs/specialchardialog.h +++ b/quanta/dialogs/specialchardialog.h @@ -28,7 +28,7 @@ class SpecialCharDialog : public SpecialCharDialogS public: - SpecialCharDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = true, WFlags fl = 0); + SpecialCharDialog( TQWidget* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0); ~SpecialCharDialog(); TQString selection(); diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp index 10ea4273..b3af1391 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.cpp +++ b/quanta/dialogs/tagdialogs/colorcombo.cpp @@ -21,7 +21,7 @@ // // 1999-09-27 Espen Sand // KColorDialog is now subclassed from KDialogBase. I have also extended -// KColorDialog::getColor() so that in contains a tqparent argument. This +// KColorDialog::getColor() so that in contains a parent argument. This // improves centering capability. // // tqlayout management added Oct 1997 by Mario Weilguni @@ -66,8 +66,8 @@ #define STANDARD_PAL_SIZE 17 -ColorCombo::ColorCombo( TQWidget *tqparent, const char *name ) - : TQComboBox( tqparent, name ) +ColorCombo::ColorCombo( TQWidget *parent, const char *name ) + : TQComboBox( parent, name ) { customColor.setRgb( 255, 255, 255 ); internalcolor.setRgb( 255, 255, 255 ); diff --git a/quanta/dialogs/tagdialogs/colorcombo.h b/quanta/dialogs/tagdialogs/colorcombo.h index a1f92a31..398ddca4 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.h +++ b/quanta/dialogs/tagdialogs/colorcombo.h @@ -42,7 +42,7 @@ class ColorCombo : public TQComboBox Q_OBJECT TQ_OBJECT public: - ColorCombo( TQWidget *tqparent = 0L, const char *name = 0L ); + ColorCombo( TQWidget *parent = 0L, const char *name = 0L ); ~ColorCombo(); void setColor( const TQColor &col ); diff --git a/quanta/dialogs/tagdialogs/corewidgetdlg.cpp b/quanta/dialogs/tagdialogs/corewidgetdlg.cpp index 815ecdf2..8e52ae01 100644 --- a/quanta/dialogs/tagdialogs/corewidgetdlg.cpp +++ b/quanta/dialogs/tagdialogs/corewidgetdlg.cpp @@ -21,8 +21,8 @@ #include #include -CoreWidgetDlg::CoreWidgetDlg(TQWidget *tqparent, const char *name) - :CoreWidgetDlgS(tqparent,name), TagWidget(tqparent,name) +CoreWidgetDlg::CoreWidgetDlg(TQWidget *parent, const char *name) + :CoreWidgetDlgS(parent,name), TagWidget(parent,name) { } diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp index a7954793..0d6de8ed 100644 --- a/quanta/dialogs/tagdialogs/listdlg.cpp +++ b/quanta/dialogs/tagdialogs/listdlg.cpp @@ -24,8 +24,8 @@ #include #include -ListDlg::ListDlg(TQStringList &entryList,TQWidget* tqparent, const char *name ) - :KDialogBase(tqparent,name), listbox(new KListBox(this)) +ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name ) + :KDialogBase(parent,name), listbox(new KListBox(this)) { Q_CHECK_PTR(listbox); setMainWidget(listbox); diff --git a/quanta/dialogs/tagdialogs/listdlg.h b/quanta/dialogs/tagdialogs/listdlg.h index 4615e495..87da2c57 100644 --- a/quanta/dialogs/tagdialogs/listdlg.h +++ b/quanta/dialogs/tagdialogs/listdlg.h @@ -34,7 +34,7 @@ class ListDlg : public KDialogBase { Q_OBJECT TQ_OBJECT public: - ListDlg(TQStringList &entryList,TQWidget* tqparent=0, const char *name =0); + ListDlg(TQStringList &entryList,TQWidget* parent=0, const char *name =0); ~ListDlg(); TQString getEntry(); int getEntryNum(); diff --git a/quanta/dialogs/tagdialogs/pictureview.cpp b/quanta/dialogs/tagdialogs/pictureview.cpp index 7579c47a..07123b7c 100644 --- a/quanta/dialogs/tagdialogs/pictureview.cpp +++ b/quanta/dialogs/tagdialogs/pictureview.cpp @@ -20,7 +20,7 @@ #include "tqpainter.h" #include -PictureView::PictureView(TQWidget *tqparent, char *file, const char *name ) : TQFrame(tqparent,name) +PictureView::PictureView(TQWidget *parent, char *file, const char *name ) : TQFrame(parent,name) { if ( file ) { pix = new TQImage(file); diff --git a/quanta/dialogs/tagdialogs/pictureview.h b/quanta/dialogs/tagdialogs/pictureview.h index e8fadc31..414cbf7c 100644 --- a/quanta/dialogs/tagdialogs/pictureview.h +++ b/quanta/dialogs/tagdialogs/pictureview.h @@ -31,7 +31,7 @@ class PictureView : public TQFrame { Q_OBJECT TQ_OBJECT public: - PictureView(TQWidget *tqparent=0, char *file=0, const char *name=0); + PictureView(TQWidget *parent=0, char *file=0, const char *name=0); /** try scale image */ void scale(); public slots: // Public slots diff --git a/quanta/dialogs/tagdialogs/tagattr.cpp b/quanta/dialogs/tagdialogs/tagattr.cpp index be05c44f..08e4a42d 100644 --- a/quanta/dialogs/tagdialogs/tagattr.cpp +++ b/quanta/dialogs/tagdialogs/tagattr.cpp @@ -87,9 +87,9 @@ void Attr_list::setValue(const TQString &value) } -TQDomNode findChild( TQDomNode &tqparent, const TQString &name ) +TQDomNode findChild( TQDomNode &parent, const TQString &name ) { - for ( TQDomNode n = tqparent.firstChild(); !n.isNull(); n = n.nextSibling() ) + for ( TQDomNode n = parent.firstChild(); !n.isNull(); n = n.nextSibling() ) if ( n.nodeName() == name ) return n; return TQDomNode(); diff --git a/quanta/dialogs/tagdialogs/tagattr.h b/quanta/dialogs/tagdialogs/tagattr.h index 2206f896..0f7f7a7d 100644 --- a/quanta/dialogs/tagdialogs/tagattr.h +++ b/quanta/dialogs/tagdialogs/tagattr.h @@ -37,7 +37,7 @@ class TQWidget; class TQTag; -TQDomNode findChild( TQDomNode &tqparent, const TQString &name ); +TQDomNode findChild( TQDomNode &parent, const TQString &name ); class Attr diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp index 95c41e4e..17285d96 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp @@ -35,8 +35,8 @@ #include "tagimgdlg.moc" -TagImgDlg::TagImgDlg(const DTDStruct *dtd, TQWidget *tqparent, const char *name) - : TQWidget(tqparent,name), TagWidget(TQT_TQOBJECT(tqparent),name) +TagImgDlg::TagImgDlg(const DTDStruct *dtd, TQWidget *parent, const char *name) + : TQWidget(parent,name), TagWidget(TQT_TQOBJECT(parent),name) { m_dtd = dtd; img = 0L; diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.h b/quanta/dialogs/tagdialogs/tagimgdlg.h index 488d2377..ac1e9a58 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.h +++ b/quanta/dialogs/tagdialogs/tagimgdlg.h @@ -42,7 +42,7 @@ class TagImgDlg : public TQWidget, TagWidget { Q_OBJECT TQ_OBJECT public: - TagImgDlg(const DTDStruct *dtd, TQWidget *tqparent=0, const char *name=0); + TagImgDlg(const DTDStruct *dtd, TQWidget *parent=0, const char *name=0); ~TagImgDlg(); public: diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.cpp b/quanta/dialogs/tagdialogs/tagmaildlg.cpp index 96cef91e..3ed62c57 100644 --- a/quanta/dialogs/tagdialogs/tagmaildlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmaildlg.cpp @@ -34,8 +34,8 @@ #include -TagMailDlg::TagMailDlg(TQWidget *tqparent, const char *name) - :TagMail(tqparent, name) +TagMailDlg::TagMailDlg(TQWidget *parent, const char *name) + :TagMail(parent, name) { setCaption(name); setModal(true); diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.h b/quanta/dialogs/tagdialogs/tagmaildlg.h index 1b739954..19940583 100644 --- a/quanta/dialogs/tagdialogs/tagmaildlg.h +++ b/quanta/dialogs/tagdialogs/tagmaildlg.h @@ -26,7 +26,7 @@ class TagMailDlg : public TagMail { Q_OBJECT TQ_OBJECT public: - TagMailDlg(TQWidget *tqparent=0, const char *name=0); + TagMailDlg(TQWidget *parent=0, const char *name=0); ~TagMailDlg(); private slots: // Private slots /** Select a mail address, using the KABC */ diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp index 70c5600c..9313bb08 100644 --- a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp @@ -19,8 +19,8 @@ #include #include -TagMiscDlg::TagMiscDlg( TQWidget* tqparent, const char* name, bool addClosingTag, const TQString &element ) - :KDialogBase( tqparent, name, true, i18n("Misc. Tag"), KDialogBase::Ok | KDialogBase::Cancel ) +TagMiscDlg::TagMiscDlg( TQWidget* parent, const char* name, bool addClosingTag, const TQString &element ) + :KDialogBase( parent, name, true, i18n("Misc. Tag"), KDialogBase::Ok | KDialogBase::Cancel ) { miscWidget = new TagMisc(this); connect( miscWidget->elementName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotMiscTagChanged(const TQString & ) ) ); diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.h b/quanta/dialogs/tagdialogs/tagmiscdlg.h index 4ac7c2a8..5561292d 100644 --- a/quanta/dialogs/tagdialogs/tagmiscdlg.h +++ b/quanta/dialogs/tagdialogs/tagmiscdlg.h @@ -27,7 +27,7 @@ class TagMiscDlg : public KDialogBase TQ_OBJECT public: - TagMiscDlg( TQWidget* tqparent = 0, const char* name = 0, bool addClosingTag=true, const TQString &element=TQString() ); + TagMiscDlg( TQWidget* parent = 0, const char* name = 0, bool addClosingTag=true, const TQString &element=TQString() ); ~TagMiscDlg(); TQString elementTagName() const; diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp index 2b116855..7a9edbdb 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp @@ -23,8 +23,8 @@ #include #include -TagQuickListDlg::TagQuickListDlg(TQWidget *tqparent, const char *name) - : TQDialog(tqparent,name,true) +TagQuickListDlg::TagQuickListDlg(TQWidget *parent, const char *name) + : TQDialog(parent,name,true) { setCaption(name); diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlg.h b/quanta/dialogs/tagdialogs/tagquicklistdlg.h index e9c13189..9831a2d2 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlg.h +++ b/quanta/dialogs/tagdialogs/tagquicklistdlg.h @@ -35,7 +35,7 @@ class TagQuickListDlg : public TQDialog { Q_OBJECT TQ_OBJECT public: - TagQuickListDlg(TQWidget *tqparent=0, const char *name=0); + TagQuickListDlg(TQWidget *parent=0, const char *name=0); ~TagQuickListDlg(); public: diff --git a/quanta/dialogs/tagdialogs/tagwidget.cpp b/quanta/dialogs/tagdialogs/tagwidget.cpp index f461e3a9..014549bc 100644 --- a/quanta/dialogs/tagdialogs/tagwidget.cpp +++ b/quanta/dialogs/tagdialogs/tagwidget.cpp @@ -30,9 +30,9 @@ #include "tagdialog.h" #include "resource.h" -TagWidget::TagWidget(TQObject *tqparent, const char *) +TagWidget::TagWidget(TQObject *parent, const char *) { - baseURL = ((TagDialog *)tqparent)->baseURL(); + baseURL = ((TagDialog *)parent)->baseURL(); } TagWidget::~TagWidget(){ diff --git a/quanta/dialogs/tagdialogs/tagwidget.h b/quanta/dialogs/tagdialogs/tagwidget.h index 38f67877..b73c6782 100644 --- a/quanta/dialogs/tagdialogs/tagwidget.h +++ b/quanta/dialogs/tagdialogs/tagwidget.h @@ -33,7 +33,7 @@ class KURL; class TagWidget { public: - TagWidget(TQObject *tqparent=0, const char *name=0); + TagWidget(TQObject *parent=0, const char *name=0); virtual ~TagWidget(); virtual void readAttributes(TQDict *) {}; diff --git a/quanta/dialogs/tagdialogs/tagxml.cpp b/quanta/dialogs/tagdialogs/tagxml.cpp index 0015c35e..2b126d26 100644 --- a/quanta/dialogs/tagdialogs/tagxml.cpp +++ b/quanta/dialogs/tagdialogs/tagxml.cpp @@ -29,14 +29,14 @@ #include "styleeditor.h" -Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, TQWidget *tqparent, const char *name) - :TQWidget(tqparent,name), TagWidget(TQT_TQOBJECT(tqparent),name), doc(d) +Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, TQWidget *parent, const char *name) + :TQWidget(parent,name), TagWidget(TQT_TQOBJECT(parent),name), doc(d) { initialize(d, dtdTag); } -Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, const TQString& selection, TQWidget *tqparent, const char *name) - : TQWidget(tqparent,name), TagWidget(TQT_TQOBJECT(tqparent),name), doc(d), m_selection(selection) +Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, const TQString& selection, TQWidget *parent, const char *name) + : TQWidget(parent,name), TagWidget(TQT_TQOBJECT(parent),name), doc(d), m_selection(selection) { initialize(d, dtdTag); } diff --git a/quanta/dialogs/tagdialogs/tagxml.h b/quanta/dialogs/tagdialogs/tagxml.h index c08853a0..d4cc6ce3 100644 --- a/quanta/dialogs/tagdialogs/tagxml.h +++ b/quanta/dialogs/tagdialogs/tagxml.h @@ -31,8 +31,8 @@ class Tagxml : public TQWidget, TagWidget { TQ_OBJECT public: /** construtor */ - Tagxml(TQDomNode &d, TQTag *dtdTag, TQWidget* tqparent=0, const char *name=0); - Tagxml(TQDomNode &d, TQTag *dtdTag, const TQString& selection, TQWidget* tqparent=0, const char *name=0); + Tagxml(TQDomNode &d, TQTag *dtdTag, TQWidget* parent=0, const char *name=0); + Tagxml(TQDomNode &d, TQTag *dtdTag, const TQString& selection, TQWidget* parent=0, const char *name=0); /** destructor */ ~Tagxml(); diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp index 57a8e84c..543fe734 100644 --- a/quanta/messages/annotationoutput.cpp +++ b/quanta/messages/annotationoutput.cpp @@ -35,8 +35,8 @@ #include "quantacommon.h" #include "viewmanager.h" -AnnotationOutput::AnnotationOutput(TQWidget *tqparent, const char *name) - : KTabWidget(tqparent, name) +AnnotationOutput::AnnotationOutput(TQWidget *parent, const char *name) + : KTabWidget(parent, name) { m_currentFileAnnotations = new MessageOutput(this); addTab(m_currentFileAnnotations, i18n("Current File")); @@ -261,7 +261,7 @@ void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap (item->tqparent()) != m_allAnnotations) + if (dynamic_cast (item->parent()) != m_allAnnotations) { emit clicked(m_fileNames[item], m_lines[item], 0); } else @@ -270,7 +270,7 @@ void AnnotationOutput::allAnnotationsItemExecuted(TQListViewItem *item) void AnnotationOutput::yourAnnotationsItemExecuted(TQListViewItem *item) { - if (dynamic_cast (item->tqparent()) != m_yourAnnotations) + if (dynamic_cast (item->parent()) != m_yourAnnotations) { emit clicked(m_yourFileNames[item], m_yourLines[item], 0); } else diff --git a/quanta/messages/annotationoutput.h b/quanta/messages/annotationoutput.h index ac87d705..beb1925c 100644 --- a/quanta/messages/annotationoutput.h +++ b/quanta/messages/annotationoutput.h @@ -39,7 +39,7 @@ class AnnotationOutput : public KTabWidget Q_OBJECT TQ_OBJECT public: - AnnotationOutput(TQWidget *tqparent = 0, const char *name = 0); + AnnotationOutput(TQWidget *parent = 0, const char *name = 0); ~AnnotationOutput(); MessageOutput *currentFileAnnotations() const {return m_currentFileAnnotations;} diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp index 43050d55..94bfecfb 100644 --- a/quanta/messages/messageoutput.cpp +++ b/quanta/messages/messageoutput.cpp @@ -32,8 +32,8 @@ #include "messageoutput.h" #include "messageitem.h" -MessageOutput::MessageOutput(TQWidget *tqparent, const char *name ) - : TQListBox(tqparent,name) +MessageOutput::MessageOutput(TQWidget *parent, const char *name ) + : TQListBox(parent,name) { m_maxItems = 2000; diff --git a/quanta/messages/messageoutput.h b/quanta/messages/messageoutput.h index b90198f7..c24e371d 100644 --- a/quanta/messages/messageoutput.h +++ b/quanta/messages/messageoutput.h @@ -34,7 +34,7 @@ class MessageOutput : public TQListBox { Q_OBJECT TQ_OBJECT public: - MessageOutput(TQWidget *tqparent=0, const char *name=0); + MessageOutput(TQWidget *parent=0, const char *name=0); ~MessageOutput(); // Return whole content as a single string with EOLs TQString content(); diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp index 72e7ea18..b384e456 100644 --- a/quanta/parsers/dtd/dtdparser.cpp +++ b/quanta/parsers/dtd/dtdparser.cpp @@ -154,7 +154,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) file.close(); } else { - KMessageBox::error(0L, i18n("Cannot create the
%1 file.
Check that you have write permission in the tqparent folder.") + KMessageBox::error(0L, i18n("Cannot create the
%1 file.
Check that you have write permission in the parent folder.") .tqarg(file.name())); return false; } @@ -325,14 +325,14 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf) { if (content_ptr == el_ptr->content) break; - if (content_ptr->tqparent) + if (content_ptr->parent) { - if (content_ptr == content_ptr->tqparent->c1) + if (content_ptr == content_ptr->parent->c1) content_ptr->c1 = 0L; else content_ptr->c2 = 0L; } - content_ptr = content_ptr->tqparent; + content_ptr = content_ptr->parent; } } stream << "" << endl; diff --git a/quanta/parsers/node.cpp b/quanta/parsers/node.cpp index 591b557e..0589855a 100644 --- a/quanta/parsers/node.cpp +++ b/quanta/parsers/node.cpp @@ -33,9 +33,9 @@ int NN = 0; //for debugging purposes: count the Node objects GroupElementMapList globalGroupMap; -Node::Node(Node *tqparent) +Node::Node(Node *parent) { - this->tqparent = tqparent; + this->parent = parent; prev = next = child = 0L; tag = 0L; mainListItem = 0L; @@ -89,8 +89,8 @@ Node::~Node() nodes.erase(this); if (prev && prev->next == this) prev->next = 0L; - if (tqparent && tqparent->child == this) - tqparent->child = 0L; + if (parent && parent->child == this) + parent->child = 0L; if (removeAll) { deleteNode(child); @@ -101,8 +101,8 @@ Node::~Node() { if (next && next->prev == this) next->prev = 0L; - if (child && child->tqparent == this) - child->tqparent = 0L; + if (child && child->parent == this) + child->parent = 0L; } delete tag; @@ -174,13 +174,13 @@ bool Node::load(TQDomElement const& element) { next = new Node(0); next->prev = this; - next->tqparent = this->tqparent; + next->parent = this->parent; next->load(e); } else if(e.tagName() == "nodeChild") { child = new Node(0); - child->tqparent = this; + child->parent = this; child->load(e); } else if(e.tagName() == "nodeClosing") @@ -225,14 +225,14 @@ Node *Node::nextSibling() Node *n = this; while (n) { - if (n->tqparent && n->tqparent->next) + if (n->parent && n->parent->next) { - result = n->tqparent->next; + result = n->parent->next; break; } else { - n = n->tqparent; + n = n->parent; } } } @@ -257,7 +257,7 @@ Node *Node::previousSibling() } else { - result = tqparent; + result = parent; } return result; @@ -272,14 +272,14 @@ Node *Node::nextNotChild() Node *n = this; while (n) { - if (n->tqparent && n->tqparent->next) + if (n->parent && n->parent->next) { - n = n->tqparent->next; + n = n->parent->next; break; } else { - n = n->tqparent; + n = n->parent; } } @@ -358,15 +358,15 @@ Node *Node::SPrev() Node *node = prev; int bCol, bLine, eCol, eLine, col, line; - if(tqparent) + if(parent) { - tqparent->tag->beginPos(bLine, bCol); - tqparent->tag->endPos(eLine, eCol); + parent->tag->beginPos(bLine, bCol); + parent->tag->endPos(eLine, eCol); } while(node && node->tag->type != Tag::XmlTag && node->tag->type != Tag::Text) { - if (tqparent && node->tag->type == Tag::ScriptTag) + if (parent && node->tag->type == Tag::ScriptTag) { //Check if it is an embedded ScriptTag. If it is, continue. node->tag->beginPos(line, col); @@ -384,7 +384,7 @@ Node *Node::SNext() Node *node = next; int bCol, bLine, eCol, eLine, col, line; - if(tqparent) + if(parent) { tag->beginPos(bLine, bCol); tag->endPos(eLine, eCol); @@ -392,7 +392,7 @@ Node *Node::SNext() while(node && node->tag->type != Tag::XmlTag && node->tag->type != Tag::Text) { - if (tqparent && node->tag->type == Tag::ScriptTag) + if (parent && node->tag->type == Tag::ScriptTag) { //Check if it is an embedded ScriptTag. If it is, continue. node->tag->beginPos(line, col); @@ -509,7 +509,7 @@ void Node::operator =(Node* node) (*this) = (*node); prev = 0L; next = 0L; - tqparent = 0L; + parent = 0L; child = 0L; mainListItem = 0L; m_groupElements.clear(); diff --git a/quanta/parsers/node.h b/quanta/parsers/node.h index d2007482..4e3451af 100644 --- a/quanta/parsers/node.h +++ b/quanta/parsers/node.h @@ -36,7 +36,7 @@ struct GroupElement{ Node *node; /* The tag which point to the actual place in the node */ Tag *tag; - /*The tqparent node indicating the beginning of a structure */ + /*The parent node indicating the beginning of a structure */ Node *parentNode; bool global; bool deleted; @@ -48,7 +48,7 @@ typedef TQValueList GroupElementList; typedef TQMap GroupElementMapList; /** - * A Node is a basic unit of a Tree. It keeps track of his tqparent, his left neighbour, his right neighbour + * A Node is a basic unit of a Tree. It keeps track of his parent, his left neighbour, his right neighbour * and his first child. * It contains some functions to navigate through the tree, but some more are located at kafkacommon.h * (and should be moved here...) @@ -61,7 +61,7 @@ typedef TQMap GroupElementMapList; class Node { public: - Node( Node *tqparent ); + Node( Node *parent ); ~Node(); /** @@ -73,7 +73,7 @@ public: static bool deleteNode(Node *node); /** - * Copy everything from node except prev, next, child, tqparent, listItem, group, groupTag, which are set to Null + * Copy everything from node except prev, next, child, parent, listItem, group, groupTag, which are set to Null * The groupElementsList is cleared. */ void operator =(Node* node); @@ -84,22 +84,22 @@ public: Node *next; Node *prev; - Node *tqparent; + Node *parent; Node *child; - /** Returns the child if available, else the next node, else the next node of the first tqparent which has one, else 0L. + /** Returns the child if available, else the next node, else the next node of the first parent which has one, else 0L. WARNING: it doesn't behave like DOM::Node::nextSibling() which give the next Node, or 0L if there is no next Node */ Node *nextSibling(); Node *previousSibling(); - /** Returns the next node, or the tqparent's next, if next doesn't exists, - or the grantqparent's next, if tqparent's next doesn't exists, etc. */ + /** Returns the next node, or the parent's next, if next doesn't exists, + or the granparent's next, if parent's next doesn't exists, etc. */ Node *nextNotChild(); /** DOM like functions cf dom/dom_node.h */ TQString nodeName(); TQString nodeValue(); void setNodeValue(const TQString &value); - Node* parentNode() {return tqparent;} + Node* parentNode() {return parent;} Node* firstChild() {return child;} Node* lastChild(); Node* DOMpreviousSibling() {return prev;} @@ -113,7 +113,7 @@ public: /** Others functions. */ // check if Node has node in its child subtree (and grand-child,...) bool hasForChild(Node *node); - void setParent(Node *nodeParent) {tqparent = nodeParent;} + void setParent(Node *nodeParent) {parent = nodeParent;} //If Node is of type XmlTag or ScriptTag, return the corresponding XmlTagEnd if available Node *getClosingNode(); //If Node is of type XmlTagEnd, return the corresponding XmlTag or ScriptTag if available @@ -130,7 +130,7 @@ public: Node *lastChildNE(); /** - * The main problem manipulating the default links prev/next/tqparent/child is that we often want + * The main problem manipulating the default links prev/next/parent/child is that we often want * to manipulate only the "significant" Nodes e.g. XmlTag, Text, ScriptNode, like in a DOM::Node tree. * These functions, prefixed with "S" which stands for "simplified" or "significant", will only return * and manipulate XmlTag, Text and ScriptNode. diff --git a/quanta/parsers/parser.cpp b/quanta/parsers/parser.cpp index b8e5e619..8206ac29 100644 --- a/quanta/parsers/parser.cpp +++ b/quanta/parsers/parser.cpp @@ -119,7 +119,7 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No Node *currentNode = a_node; if (currentNode && (currentNode->tag->type != Tag::XmlTag || currentNode->tag->single)) - parentNode = currentNode->tqparent; + parentNode = currentNode->parent; Tag *tag = 0L; TQTag *qTag = 0L; textLine.append(write->text(startLine, startCol, startLine, write->editIf->lineLength(startLine))); @@ -151,7 +151,7 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No //create a toplevel node for the special area AreaStruct area(line, specialStartPos, line, specialStartPos + foundText.length() - 1); Node *node = ParserCommon::createScriptTagNode(write, area, foundText, m_dtd, parentNode, currentNode); - if (node->tqparent && node->prev == node->tqparent) //some strange cases, but it's possible, eg.: + if (node->parent && node->prev == node->parent) //some strange cases, but it's possible, eg.: { node->prev->next = 0L; node->prev = 0L; @@ -329,7 +329,7 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No searchFor.remove('/'); if ( qTag->stoppingTags.contains(searchFor)) { - parentNode->tag->closingMissing = true; //tqparent is single... + parentNode->tag->closingMissing = true; //parent is single... goUp = true; } } @@ -353,16 +353,16 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No //handle cases like
if (tag->type == Tag::XmlTagEnd && !QuantaCommon::closesTag(parentNode->tag, tag)) { - while ( parentNode->tqparent && - QuantaCommon::closesTag(parentNode->tqparent->tag, tag) + while ( parentNode->parent && + QuantaCommon::closesTag(parentNode->parent->tag, tag) ) { - parentNode = parentNode->tqparent; + parentNode = parentNode->parent; } } else if (qTag && tag->type != Tag::XmlTagEnd) { - //handle the case when a tag is a stopping tag for tqparent, and grandtqparent and so on. + //handle the case when a tag is a stopping tag for parent, and grandparent and so on. Node *n = parentNode; TQString searchFor = (m_dtd->caseSensitive)?tag->name:tag->name.upper(); while (qTag && n) @@ -372,10 +372,10 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No { if ( qTag->stoppingTags.contains(searchFor) ) { - n->tag->closingMissing = true; //tqparent is single... - if (n->tqparent) + n->tag->closingMissing = true; //parent is single... + if (n->parent) parentNode = n; - n = n->tqparent; + n = n->parent; } else { break; @@ -384,11 +384,11 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No } } - node = new Node(parentNode->tqparent); + node = new Node(parentNode->parent); nodeNum++; node->prev = parentNode; parentNode->next = node; - parentNode = parentNode->tqparent; + parentNode = parentNode->parent; node->closesPrevious = true; } else { @@ -621,13 +621,13 @@ Node *Parser::nodeAt(int line, int col, bool findDeepest, bool exact) node = node->child; } else { - if (node->tqparent) + if (node->parent) { int parentEl, parentEc; - node->tqparent->tag->endPos(parentEl, parentEc); + node->parent->tag->endPos(parentEl, parentEc); if (!exact && QuantaCommon::isBetween(line, col, bl, bc, parentEl, parentEc) == 0) { - node = node->tqparent; + node = node->parent; } } break; //we found the node @@ -635,8 +635,8 @@ Node *Parser::nodeAt(int line, int col, bool findDeepest, bool exact) } else if (result == -1) { - if (node->tqparent) - node = node->tqparent; + if (node->parent) + node = node->parent; break; //we found the node } else { @@ -653,9 +653,9 @@ Node *Parser::nodeAt(int line, int col, bool findDeepest, bool exact) if (node && node->tag->type == Tag::Empty && (findDeepest || (bl == el && ec < bc)) ) { - if (node->tqparent) + if (node->parent) { - node = node->tqparent; + node = node->parent; } else if (node->prev) { @@ -807,7 +807,7 @@ bool Parser::invalidArea(Document *w, AreaStruct &area, Node **firstNode, Node * void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) { - Node *nextNode, *child, *tqparent, *next, *prev; + Node *nextNode, *child, *parent, *next, *prev; int i, j; Node *node = firstNode; bool closesPrevious = false; @@ -819,7 +819,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) nextNode = node->nextSibling(); node->removeAll = false; child = node->child; - tqparent = node->tqparent; + parent = node->parent; next = node->next; prev = node->prev; closesPrevious = node->closesPrevious; @@ -827,9 +827,9 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) { nextNode->prev = prev; } - if (nextNode && nextNode->tqparent == node) + if (nextNode && nextNode->parent == node) { - nextNode->tqparent = tqparent; + nextNode->parent = parent; } if (next) next->prev = prev; @@ -845,9 +845,9 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) modif->setLocation(kafkaCommon::getLocation(node)); if (prev && prev->next == node) prev->next = 0L; - if(tqparent && tqparent->child == node) - tqparent->child = 0L; - node->tqparent = 0L; + if(parent && parent->child == node) + parent->child = 0L; + node->parent = 0L; node->next = 0L; node->prev = 0L; @@ -866,11 +866,11 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) while (n) { m = n; - n->tqparent = tqparent; + n->parent = parent; n = n->next; i++; } - //connect the first child to the tree (after prev, or as the first child of the tqparent) + //connect the first child to the tree (after prev, or as the first child of the parent) if (prev && child) { prev->next = child; @@ -882,7 +882,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) } } else { - if (!child) //when there is no child, connect the next as the first child of the tqparent + if (!child) //when there is no child, connect the next as the first child of the parent child = next; else if (next) @@ -893,14 +893,14 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) n->next = next; next->prev = n; } - if (tqparent && !tqparent->child) + if (parent && !parent->child) { - tqparent->child = child; + parent->child = child; } } } else { - //change the tqparent of tqchildren, so the prev will be the new tqparent + //change the parent of tqchildren, so the prev will be the new parent if (child) { Node *n = child; @@ -908,7 +908,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) while (n) { m = n; - n->tqparent = prev; + n->parent = prev; n = n->next; i++; } @@ -953,7 +953,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) Node *n = next; while (n) { - n->tqparent = prev; + n->parent = prev; n = n->next; j++; } @@ -1053,8 +1053,8 @@ Node *Parser::rebuild(Document *w) { if (lastNode->prev ) lastNode->prev->next = 0L; - if (lastNode->tqparent && lastNode->tqparent->child == lastNode) - lastNode->tqparent->child = 0L; + if (lastNode->parent && lastNode->parent->child == lastNode) + lastNode->parent->child = 0L; } Node::deleteNode(lastNode); nodeNum--; @@ -1077,7 +1077,7 @@ Node *Parser::rebuild(Document *w) lastNode->prev = lastInserted->prev; if (lastInserted->prev) lastInserted->prev->next = lastNode; - lastNode->tqparent = lastInserted->tqparent; + lastNode->parent = lastInserted->parent; lastInserted->tag->beginPos(area.bLine, area.bCol); lastNode->tag->endPos(area.eLine, area.eCol); Tag *_tag = new Tag(*(lastNode->tag)); @@ -1091,9 +1091,9 @@ Node *Parser::rebuild(Document *w) { lastNode->tag->type = Tag::Empty; } - if (lastInserted->tqparent && lastInserted->tqparent->child == lastInserted) - //lastInserted->tqparent->child = lastInserted->next; lastInserted has no next! - lastInserted->tqparent->child = lastNode; + if (lastInserted->parent && lastInserted->parent->child == lastInserted) + //lastInserted->parent->child = lastInserted->next; lastInserted has no next! + lastInserted->parent->child = lastNode; //here, lastNode is at the pos of lastInserted. modif = new NodeModif(); @@ -1102,11 +1102,11 @@ Node *Parser::rebuild(Document *w) if(lastInserted->prev) lastInserted->prev->next = 0L; - if(lastInserted->tqparent && lastInserted->tqparent->child == lastInserted) - lastInserted->tqparent->child = 0L; + if(lastInserted->parent && lastInserted->parent->child == lastInserted) + lastInserted->parent->child = 0L; lastInserted->prev = 0L; lastInserted->next = 0L; - lastInserted->tqparent = 0L; + lastInserted->parent = 0L; lastInserted->child = 0L; // delete lastInserted; @@ -1132,46 +1132,46 @@ Node *Parser::rebuild(Document *w) { // kdDebug(24000) << "lastNode6: " << lastNode << " " << lastNode->tag << endl; qTag = 0L; - goUp = ( node->tqparent && - ( (lastNode->tag->type == Tag::XmlTagEnd && QuantaCommon::closesTag(node->tqparent->tag, lastNode->tag) ) || - node->tqparent->tag->single ) + goUp = ( node->parent && + ( (lastNode->tag->type == Tag::XmlTagEnd && QuantaCommon::closesTag(node->parent->tag, lastNode->tag) ) || + node->parent->tag->single ) ); - if (node->tqparent && !goUp) + if (node->parent && !goUp) { - qTag = QuantaCommon::tagFromDTD(m_dtd, node->tqparent->tag->name); + qTag = QuantaCommon::tagFromDTD(m_dtd, node->parent->tag->name); if ( qTag ) { TQString searchFor = (m_dtd->caseSensitive)?lastNode->tag->name:lastNode->tag->name.upper(); searchFor.remove('/'); if ( qTag->stoppingTags.contains( searchFor ) ) { - node->tqparent->tag->closingMissing = true; //tqparent is single... + node->parent->tag->closingMissing = true; //parent is single... goUp = true; } } } if (goUp && - ( (m_dtd->caseSensitive && node->tag->name == node->tqparent->tag->name) || - (!m_dtd->caseSensitive && node->tag->name.lower() == node->tqparent->tag->name.lower())) ) - goUp = false; //it can happen that the tag closes the previous and not the tqparent + ( (m_dtd->caseSensitive && node->tag->name == node->parent->tag->name) || + (!m_dtd->caseSensitive && node->tag->name.lower() == node->parent->tag->name.lower())) ) + goUp = false; //it can happen that the tag closes the previous and not the parent - if (goUp) //lastnode closes the node->tqparent + if (goUp) //lastnode closes the node->parent { //handle cases like
if (lastNode->tag->type == Tag::XmlTagEnd && - !QuantaCommon::closesTag(node->tqparent->tag, lastNode->tag)) + !QuantaCommon::closesTag(node->parent->tag, lastNode->tag)) { - while ( node->tqparent->tqparent && - QuantaCommon::closesTag(node->tqparent->tqparent->tag, lastNode->tag) + while ( node->parent->parent && + QuantaCommon::closesTag(node->parent->parent->tag, lastNode->tag) ) { - node = node->tqparent; + node = node->parent; } } else if (qTag && lastNode->tag->type != Tag::XmlTagEnd) { - //handle the case when a tag is a stopping tag for tqparent, and grandtqparent and so on. I'm not sure it's needed here, but anyway... - Node *n = node->tqparent; + //handle the case when a tag is a stopping tag for parent, and grandparent and so on. I'm not sure it's needed here, but anyway... + Node *n = node->parent; TQString searchFor = (m_dtd->caseSensitive) ? lastNode->tag->name : lastNode->tag->name.upper(); while (qTag && n) { @@ -1180,10 +1180,10 @@ Node *Parser::rebuild(Document *w) { if ( qTag->stoppingTags.contains(searchFor) ) { - n->tag->closingMissing = true; //tqparent is single... - if (n->tqparent) + n->tag->closingMissing = true; //parent is single... + if (n->parent) node = n; - n = n->tqparent; + n = n->parent; } else { break; @@ -1193,15 +1193,15 @@ Node *Parser::rebuild(Document *w) } if (lastNode->prev && lastNode->prev->next == lastNode) lastNode->prev->next = 0L; - if (lastNode->tqparent && lastNode->tqparent->child == lastNode) - lastNode->tqparent->child = 0L; - if (node->tqparent) - node->tqparent->next = lastNode; - lastNode->prev = node->tqparent; - if (node->tqparent) - lastNode->tqparent = node->tqparent->tqparent; + if (lastNode->parent && lastNode->parent->child == lastNode) + lastNode->parent->child = 0L; + if (node->parent) + node->parent->next = lastNode; + lastNode->prev = node->parent; + if (node->parent) + lastNode->parent = node->parent->parent; else - lastNode->tqparent = 0L; + lastNode->parent = 0L; node->next = 0L; lastNode->closesPrevious = true; } else @@ -1210,7 +1210,7 @@ Node *Parser::rebuild(Document *w) lastNode->prev->next = 0L; node->next = lastNode; lastNode->prev = node; - lastNode->tqparent = node->tqparent; + lastNode->parent = node->parent; // kdDebug(24000) << "lastNode7: " << lastNode << " " << lastNode->tag << endl; } node = lastNode; diff --git a/quanta/parsers/parsercommon.cpp b/quanta/parsers/parsercommon.cpp index 860b46e0..9d1f9d0d 100644 --- a/quanta/parsers/parsercommon.cpp +++ b/quanta/parsers/parsercommon.cpp @@ -112,11 +112,11 @@ Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *par if (parentNode && parentNode->tag->single) { - textNode = new Node(parentNode->tqparent); + textNode = new Node(parentNode->parent); nodeNum++; textNode->prev = parentNode; parentNode->next = textNode; - parentNode = parentNode->tqparent; + parentNode = parentNode->parent; } else { if ( node && @@ -220,7 +220,7 @@ void coutTree(Node *node, int indent) else output+= node->tag->tagStr().replace('\n'," "); kdDebug(24000) << output <<" (" << node->tag->type << ") at pos " << - bLine << ":" << bCol << " - " << eLine << ":" << eCol << " This: "<< node << " Parent: " << node->tqparent << " Prev: " << node->prev << " Next: " << node->next << " Child: " << node->child << " Tag:" << node->tag << endl; + bLine << ":" << bCol << " - " << eLine << ":" << eCol << " This: "<< node << " Parent: " << node->parent << " Prev: " << node->prev << " Next: " << node->next << " Child: " << node->child << " Tag:" << node->tag << endl; /* for(j = 0; j < node->tag->attrCount(); j++) { kdDebug(24000)<< " attr" << j << " " << @@ -245,7 +245,7 @@ void verifyTree(Node *node) if (!node->tag) { kdDebug(24000) << "Bad node: " << node << endl; - kdDebug(24000) << "Parent: " << node->tqparent << " " << node->tqparent->tag->tagStr() << endl; + kdDebug(24000) << "Parent: " << node->parent << " " << node->parent->tag->tagStr() << endl; } if (node->child) verifyTree(node->child); diff --git a/quanta/parsers/parsercommon.h b/quanta/parsers/parsercommon.h index d1c76092..9b0c01f4 100644 --- a/quanta/parsers/parsercommon.h +++ b/quanta/parsers/parsercommon.h @@ -43,9 +43,9 @@ namespace ParserCommon{ /** Creates a head node for special areas. area: the area belonging to this node areaName: the special area name (type) - dtd: the tqparent DTD - parentNode: the tqparent of the node - currentNode: the last child of the tqparent, if it exists + dtd: the parent DTD + parentNode: the parent of the node + currentNode: the last child of the parent, if it exists */ Node* createScriptTagNode(Document *write, const AreaStruct &area, const TQString &areaName, const DTDStruct *dtd, Node *parentNode, Node *currentNode); diff --git a/quanta/parsers/qtag.h b/quanta/parsers/qtag.h index ed4b594a..f19bcf5d 100644 --- a/quanta/parsers/qtag.h +++ b/quanta/parsers/qtag.h @@ -58,7 +58,7 @@ class XMLStructGroup { bool hasFileName; /// parents(); /** No descriptions */ diff --git a/quanta/parsers/sagroupparser.cpp b/quanta/parsers/sagroupparser.cpp index c6c6b57a..000ba002 100644 --- a/quanta/parsers/sagroupparser.cpp +++ b/quanta/parsers/sagroupparser.cpp @@ -35,14 +35,14 @@ extern GroupElementMapList globalGroupMap; -SAGroupParser::SAGroupParser(SAParser *tqparent, Document *write, Node *startNode, Node *endNode, bool synchronous, bool parsingLastNode, bool paringLastGroup) +SAGroupParser::SAGroupParser(SAParser *parent, Document *write, Node *startNode, Node *endNode, bool synchronous, bool parsingLastNode, bool paringLastGroup) { g_node = startNode; g_endNode = endNode; m_synchronous = synchronous; m_lastGroupParsed = paringLastGroup; m_parsingLastNode = parsingLastNode; - m_parent = tqparent; + m_parent = parent; m_write = write; m_count = 0; m_parseForGroupTimer = new TQTimer(this); @@ -178,7 +178,7 @@ void SAGroupParser::parseForScriptGroup(Node *node) Node *tmpNode = node; while (tmpNode && tmpNode->tag->dtd() == dtd && tmpNode->tag->type != Tag::ScriptStructureBegin) { - tmpNode = tmpNode->tqparent; + tmpNode = tmpNode->parent; } if (tmpNode && tmpNode->tag->type == Tag::ScriptStructureBegin) { @@ -188,7 +188,7 @@ void SAGroupParser::parseForScriptGroup(Node *node) groupElement->parentNode = 0L; } groupElement->global = true; - tmpNode = node->tqparent; + tmpNode = node->parent; while (tmpNode && tmpNode->tag->dtd() == dtd) { if ( tmpNode->tag->type == Tag::ScriptStructureBegin && tmpNode->tag->dtd()->localScopeKeywordsRx.search(tmpNode->tag->cleanStr) != -1) @@ -197,7 +197,7 @@ void SAGroupParser::parseForScriptGroup(Node *node) groupElement->parentNode = tmpNode; break; } - tmpNode = tmpNode->tqparent; + tmpNode = tmpNode->parent; } if (group.appendToTags) diff --git a/quanta/parsers/sagroupparser.h b/quanta/parsers/sagroupparser.h index 35e8d1f9..082bf3d7 100644 --- a/quanta/parsers/sagroupparser.h +++ b/quanta/parsers/sagroupparser.h @@ -35,7 +35,7 @@ Q_OBJECT TQ_OBJECT public: public: - SAGroupParser(SAParser *tqparent, Document *write, Node *startNode, Node *endNode, bool synchronous, bool parsingLastNode, bool paringLastGroup); + SAGroupParser(SAParser *parent, Document *write, Node *startNode, Node *endNode, bool synchronous, bool parsingLastNode, bool paringLastGroup); ~SAGroupParser() {}; TQTimer *m_parseForGroupTimer; diff --git a/quanta/parsers/saparser.cpp b/quanta/parsers/saparser.cpp index aa9bbd55..1dab9ccc 100644 --- a/quanta/parsers/saparser.cpp +++ b/quanta/parsers/saparser.cpp @@ -363,7 +363,7 @@ bool SAParser::slotParseOneLine() tag->single = true; //at this point s_parentNode = the opening node of the special area (eg. tqparent); + Node *node = new Node(s_parentNode->parent); nodeNum++; s_parentNode->next = node; node->prev = s_parentNode; @@ -575,13 +575,13 @@ bool SAParser::slotParseOneLine() node->tag = tag; node->insideSpecial = true; node->specialInsideXml = m_specialInsideXml; - if (s_currentNode && s_currentNode != node->tqparent) + if (s_currentNode && s_currentNode != node->parent) { s_currentNode->next = node; node->prev = s_currentNode; } else - if (node->tqparent && !node->tqparent->child) - node->tqparent->child = node; + if (node->parent && !node->parent->child) + node->parent->child = node; s_currentNode = node; } s_previousContext = s_contextStack.pop(); @@ -657,8 +657,8 @@ Node* SAParser::parseArea(const AreaStruct &specialArea, if (s_parentNode && !areaStartString.isEmpty()) { const DTDStruct *parentDTD = m_dtd; - if (s_parentNode->tqparent) - parentDTD = s_parentNode->tqparent->tag->dtd(); + if (s_parentNode->parent) + parentDTD = s_parentNode->parent->tag->dtd(); s_dtd = DTDs::ref()->find(parentDTD->specialAreaNames[areaStartString]); s_areaEndString = parentDTD->specialAreas[areaStartString]; s_searchForAreaEnd = true; diff --git a/quanta/parts/kafka/domtreeview.cpp b/quanta/parts/kafka/domtreeview.cpp index 33ad81ac..c8d4c6c9 100644 --- a/quanta/parts/kafka/domtreeview.cpp +++ b/quanta/parts/kafka/domtreeview.cpp @@ -27,7 +27,7 @@ #include "domtreeview.moc" -DOMTreeView::DOMTreeView(TQWidget *tqparent, KHTMLPart *currentpart, const char * name) : KListView(tqparent, name) +DOMTreeView::DOMTreeView(TQWidget *parent, KHTMLPart *currentpart, const char * name) : KListView(parent, name) { setCaption(name); setRootIsDecorated(true); @@ -137,8 +137,8 @@ void DOMTreeView::slotItemClicked(TQListViewItem *cur_item) } } -KafkaDOMTreeDialog::KafkaDOMTreeDialog(TQWidget *tqparent, KHTMLPart *part, const char* name, bool modal, WFlags fl ) - : TQDialog(tqparent, name, modal, fl) +KafkaDOMTreeDialog::KafkaDOMTreeDialog(TQWidget *parent, KHTMLPart *part, const char* name, bool modal, WFlags fl ) + : TQDialog(parent, name, modal, fl) { tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, sizePolicy().hasHeightForWidth() ) ); DialogLayout = new TQGridLayout( this, 1, 1, 11, 6, "DialogLayout"); diff --git a/quanta/parts/kafka/domtreeview.h b/quanta/parts/kafka/domtreeview.h index 2f3ea65a..7c18dc60 100644 --- a/quanta/parts/kafka/domtreeview.h +++ b/quanta/parts/kafka/domtreeview.h @@ -40,7 +40,7 @@ class DOMTreeView : public KListView Q_OBJECT TQ_OBJECT public: - DOMTreeView(TQWidget *tqparent, KHTMLPart *part, const char * name = 0); + DOMTreeView(TQWidget *parent, KHTMLPart *part, const char * name = 0); ~DOMTreeView(); void setTitle(const TQString &str); void recursive(const DOM::Node &pNode, const DOM::Node &node); @@ -69,7 +69,7 @@ class KafkaDOMTreeDialog : public TQDialog Q_OBJECT TQ_OBJECT public: - KafkaDOMTreeDialog(TQWidget *tqparent = 0, KHTMLPart *part = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KafkaDOMTreeDialog(TQWidget *parent = 0, KHTMLPart *part = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~KafkaDOMTreeDialog(); DOMTreeView *domview; TQGridLayout *DialogLayout; diff --git a/quanta/parts/kafka/htmldocumentproperties.cpp b/quanta/parts/kafka/htmldocumentproperties.cpp index d6b38cb7..9d23cada 100644 --- a/quanta/parts/kafka/htmldocumentproperties.cpp +++ b/quanta/parts/kafka/htmldocumentproperties.cpp @@ -44,9 +44,9 @@ #include "viewmanager.h" -htmlDocumentProperties::htmlDocumentProperties( TQWidget* tqparent, bool forceInsertionOfBasicNodes, const char* name, +htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInsertionOfBasicNodes, const char* name, bool modal, WFlags fl) : - htmlDocumentPropertiesui(tqparent, name, modal, fl), titleNode( 0L ), htmlNode( 0L ), + htmlDocumentPropertiesui(parent, name, modal, fl), titleNode( 0L ), htmlNode( 0L ), headNode( 0L ), linkNode( 0L ), bodyNode( 0L), doctypeNode( 0L ), CSSNode ( 0L ), xmlNode( 0L ), titleDirty(false), linkDirty(false) { @@ -651,7 +651,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs) htmlNode->child = allTheNodes; while(allTheNodes) { - allTheNodes->tqparent = htmlNode; + allTheNodes->parent = htmlNode; allTheNodes = allTheNodes->next; } htmlNodeCreated = true; @@ -685,7 +685,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs) if(qHead->isChild(allTheNodes)) { /*//TODO:LOG this into the modif!! - allTheNodes->tqparent = headNode; + allTheNodes->parent = headNode; if(lastHeadChild) { lastHeadChild->next = allTheNodes; @@ -701,7 +701,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs) else if(bodyNodeCreated && htmlNodeCreated && qBody->isChild(allTheNodes)) { //TODO:log!! - /**allTheNodes->tqparent = bodyNode; + /**allTheNodes->parent = bodyNode; if(lastBodyChild) { lastBodyChild->next = allTheNodes; @@ -717,7 +717,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs) else { //TODO:log? no. - /**allTheNodes->tqparent = htmlNode; + /**allTheNodes->parent = htmlNode; lastHtmlChild->next = allTheNodes; allTheNodes->prev = lastHtmlChild; lastHtmlChild = allTheNodes;*/ diff --git a/quanta/parts/kafka/htmldocumentproperties.h b/quanta/parts/kafka/htmldocumentproperties.h index bc0c9423..799e75db 100644 --- a/quanta/parts/kafka/htmldocumentproperties.h +++ b/quanta/parts/kafka/htmldocumentproperties.h @@ -51,7 +51,7 @@ public: * @param forceInsertionOfBasicNodes Force the insertion of the basic Nodes (HTML, BODY, HEAD, ...) if pressing OK * without having made any changes. */ - htmlDocumentProperties( TQWidget* tqparent = 0, bool forceInsertionOfBasicNodes = false, + htmlDocumentProperties( TQWidget* parent = 0, bool forceInsertionOfBasicNodes = false, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~htmlDocumentProperties(); diff --git a/quanta/parts/kafka/htmlenhancer.cpp b/quanta/parts/kafka/htmlenhancer.cpp index daffd656..4a1d7c38 100644 --- a/quanta/parts/kafka/htmlenhancer.cpp +++ b/quanta/parts/kafka/htmlenhancer.cpp @@ -288,7 +288,7 @@ void HTMLEnhancer::postEnhanceNode(DOM::Node domNode) if(domNode.isNull()) return; - //If domNode is a Block and there is no text around, and if domNode's tqparent can handle + //If domNode is a Block and there is no text around, and if domNode's parent can handle //text or a P tag, add an empty text DOM::Node // so that the user can access this area. qTag = QuantaCommon::tagFromDTD(m_wkafkapart->getCurrentDoc()->defaultDTD(), diff --git a/quanta/parts/kafka/htmlenhancer.h b/quanta/parts/kafka/htmlenhancer.h index 065654a4..29ebe82f 100644 --- a/quanta/parts/kafka/htmlenhancer.h +++ b/quanta/parts/kafka/htmlenhancer.h @@ -47,7 +47,7 @@ public: * The DOM::Node must be built before calling this * function. * @param node The Node we want to enhance. - * @param parentDNode the tqparent DOM::Node of the root DOM::Node of node. + * @param parentDNode the parent DOM::Node of the root DOM::Node of node. * @param nextDNode the DOM::Node next to the root DOM::Node of node. */ virtual bool enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node nextDNode); diff --git a/quanta/parts/kafka/kafkacommon.cpp b/quanta/parts/kafka/kafkacommon.cpp index 8ed413f4..9d0c7cdf 100644 --- a/quanta/parts/kafka/kafkacommon.cpp +++ b/quanta/parts/kafka/kafkacommon.cpp @@ -52,9 +52,9 @@ Node *kafkaCommon::getNextNode(Node *node, bool &goUp, Node *endNode) } else { - if(node->tqparent == endNode) + if(node->parent == endNode) return 0L; - return getNextNode(node->tqparent, goUp); + return getNextNode(node->parent, goUp); } } else @@ -74,9 +74,9 @@ Node *kafkaCommon::getNextNode(Node *node, bool &goUp, Node *endNode) else { goUp = true; - if(node->tqparent == endNode) + if(node->parent == endNode) return 0L; - return getNextNode(node->tqparent, goUp); + return getNextNode(node->parent, goUp); } } } @@ -119,7 +119,7 @@ Node* kafkaCommon::getPrevNode(Node *node, Node *endNode) } else { - n = n->tqparent; + n = n->parent; if(n == endNode) return 0L; } @@ -171,13 +171,13 @@ Node* kafkaCommon::DTDGetCommonParent(Node* startNode, Node* endNode, if(commonParent && (commonParent->tag->type == Tag::Text || commonParent->tag->type == Tag::Empty)) { Node* oldCommonParent = commonParent; - commonParent = commonParent->tqparent; + commonParent = commonParent->parent; commonParentStartChild = oldCommonParent; commonParentEndChild = oldCommonParent; } //startNode or endNode can't be the commonParent. else if(commonParent && (itStart == startNodeLocation.end() || itEnd == endNodeLocation.end())) - commonParent = commonParent->tqparent; + commonParent = commonParent->parent; commonParentStartChildLocation = getLocation(commonParentStartChild); commonParentEndChildLocation = getLocation(commonParentEndChild); @@ -222,18 +222,18 @@ Node* kafkaCommon::DTDGetNonInlineCommonParent(Node* startNode, Node* endNode, commonParent->tag->type == Tag::Text || commonParent->tag->type == Tag::Empty)) { Node* oldCommonParent = commonParent; - commonParent = commonParent->tqparent; + commonParent = commonParent->parent; while(commonParent && isInline(commonParent->tag->name)) { oldCommonParent = commonParent; - commonParent = commonParent->tqparent; + commonParent = commonParent->parent; } commonParentStartChild = oldCommonParent; commonParentEndChild = oldCommonParent; } //startNode or endNode can't be the commonParent. else if(commonParent && (itStart == startNodeLocation.end() || itEnd == endNodeLocation.end())) - commonParent = commonParent->tqparent; + commonParent = commonParent->parent; commonParentStartChildLocation = getLocation(commonParentStartChild); commonParentEndChildLocation = getLocation(commonParentEndChild); @@ -365,7 +365,7 @@ void kafkaCommon::applyIndentation(Node *node, int nbOfSpaces, int nbOfTabs, Nod kdDebug(25001)<< "kafkaCommon::applyIndentation()" << endl; #endif - Node *tqparent, *nextNE, *prevNE, *realPrevNE, *realNextNE, *realPrev, *realNext, *prev, *next; + Node *parent, *nextNE, *prevNE, *realPrevNE, *realNextNE, *realPrev, *realNext, *prev, *next; int nonInlineDepth = 0, nonInlineDepth2 = 0, i; bool b = false; TQString indentation1, indentation2, text; @@ -383,10 +383,10 @@ void kafkaCommon::applyIndentation(Node *node, int nbOfSpaces, int nbOfTabs, Nod realNext = node->next; if(inlineNodeIndentation && - !node->prev && getNodeDisplay(node->tqparent, true) == kafkaCommon::blockDisplay) + !node->prev && getNodeDisplay(node->parent, true) == kafkaCommon::blockDisplay) { AreaStruct node_area = node->tag->area(); - AreaStruct parent_area = node->tqparent->tag->area(); + AreaStruct parent_area = node->parent->tag->area(); if(node_area.bLine == parent_area.bLine) { @@ -400,30 +400,30 @@ void kafkaCommon::applyIndentation(Node *node, int nbOfSpaces, int nbOfTabs, Nod setTagString(node, removeUnnecessaryWhitespaces(node->tag->tagStr()), modifs); //compute the "non-inline depth" of the Node and of the next NE (not Empty) Node - // i.e. we count how many non-inline tqparent they have. - tqparent = node->tqparent; - while(tqparent) + // i.e. we count how many non-inline parent they have. + parent = node->parent; + while(parent) { - if(getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay) + if(getNodeDisplay(parent, true) == kafkaCommon::blockDisplay) ++nonInlineDepth; - tqparent = tqparent->tqparent; + parent = parent->parent; } //compute the "non-inline depth" of the next non-empty Node. if (nextNE) - tqparent = nextNE->tqparent; + parent = nextNE->parent; else - tqparent = 0L; - while(tqparent) + parent = 0L; + while(parent) { - if(getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay) + if(getNodeDisplay(parent, true) == kafkaCommon::blockDisplay) ++nonInlineDepth2; - tqparent = tqparent->tqparent; + parent = parent->parent; } - tqparent = node->tqparent; + parent = node->parent; - if(!tqparent || getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay) + if(!parent || getNodeDisplay(parent, true) == kafkaCommon::blockDisplay) { //prepare the indentation indentation1 = "\n"; @@ -507,7 +507,7 @@ void kafkaCommon::applyIndentation(Node *node, int nbOfSpaces, int nbOfTabs, Nod } else { - //The tqparent is inline, so no indentation. + //The parent is inline, so no indentation. //Nothing to do. } node->tag->setIndentationDone(true); @@ -519,7 +519,7 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs) kdDebug(25001)<< "kafkaCommon::fitIndentationNodes()" << endl; #endif - Node *tqparent, *child, *node, *emptyNode = 0L, *emptyNode2 = 0L; + Node *parent, *child, *node, *emptyNode = 0L, *emptyNode2 = 0L; int nbEmptyNodes = 0, n1Depth, n2Depth; bool lastChild = false, firstChild = false; @@ -534,16 +534,16 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs) if(n1Depth > n2Depth) { child = n1; - tqparent = n2; + parent = n2; } else { child = n2; - tqparent = n1; + parent = n1; } - if(child->tqparent->firstChildNE() == child) + if(child->parent->firstChildNE() == child) firstChild = true; - if(child->tqparent->lastChildNE() == child) + if(child->parent->lastChildNE() == child) lastChild = true; //counting the Empty Nodes and deleting them to have only one empty node. @@ -591,11 +591,11 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs) //adding/deleting a empty node if necessary if(firstChild) { - if(getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay) + if(getNodeDisplay(parent, true) == kafkaCommon::blockDisplay) { if(child->tag->type != Tag::Text && !emptyNode) { - createAndInsertNode("", "", Tag::Empty, n2->tag->write(), child->tqparent, + createAndInsertNode("", "", Tag::Empty, n2->tag->write(), child->parent, child, child, modifs); } } @@ -610,11 +610,11 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs) if(lastChild) { - if(getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay) + if(getNodeDisplay(parent, true) == kafkaCommon::blockDisplay) { if(child->tag->type != Tag::Text && !emptyNode2) { - createAndInsertNode("", "", Tag::Empty, n2->tag->write(), child->tqparent, + createAndInsertNode("", "", Tag::Empty, n2->tag->write(), child->parent, 0L, 0L, modifs); } } @@ -654,8 +654,8 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs) } //adding/deleting a empty node if necessary - tqparent = n1->tqparent; - if(!tqparent || getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay) + parent = n1->parent; + if(!parent || getNodeDisplay(parent, true) == kafkaCommon::blockDisplay) { if(getNodeDisplay(n1, true) == kafkaCommon::blockDisplay && n1->tag->type != Tag::Text) @@ -672,7 +672,7 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs) } else { - createAndInsertNode("", "", Tag::Empty, n2->tag->write(), tqparent, n2, n2, modifs); + createAndInsertNode("", "", Tag::Empty, n2->tag->write(), parent, n2, n2, modifs); } } } @@ -694,7 +694,7 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs) } else { - createAndInsertNode("", "", Tag::Empty, n2->tag->write(), tqparent, n2, n2, modifs); + createAndInsertNode("", "", Tag::Empty, n2->tag->write(), parent, n2, n2, modifs); } } } @@ -1028,7 +1028,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling, nodeIsFirstChild = true; parentNode->child = node; } - node->tqparent = parentNode; + node->parent = parentNode; if(nextSibling && nextSibling->prev) { @@ -1129,7 +1129,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling, N nodeIsFirstChild = true; parentNode->child = node; } - node->tqparent = parentNode; + node->parent = parentNode; if(nextSibling && nextSibling->prev) { @@ -1186,7 +1186,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling, N return node; } -Node *kafkaCommon::insertNode(Node *newNode, Node *tqparent, Node *nextSibling, Node *nextEndSibling, +Node *kafkaCommon::insertNode(Node *newNode, Node *parent, Node *nextSibling, Node *nextEndSibling, NodeModifsSet *modifs, bool merge) { #ifdef LIGHT_DEBUG @@ -1199,7 +1199,7 @@ Node *kafkaCommon::insertNode(Node *newNode, Node *tqparent, Node *nextSibling, return 0L; //place the new Node. - newNode = insertNode(newNode, tqparent, nextSibling, modifs, merge); + newNode = insertNode(newNode, parent, nextSibling, modifs, merge); if(!newNode->tag->single && newNode->tag->type == Tag::XmlTag) { @@ -1208,7 +1208,7 @@ Node *kafkaCommon::insertNode(Node *newNode, Node *tqparent, Node *nextSibling, nodeEnd->closesPrevious = true; //place the new closing Node. - nodeEnd = insertNode(nodeEnd, tqparent, nextEndSibling, modifs, merge); + nodeEnd = insertNode(nodeEnd, parent, nextEndSibling, modifs, merge); } //If nextSibling != nextEndSibling, move all Nodes between node and nodeEnd as child of node @@ -1222,7 +1222,7 @@ Node *kafkaCommon::insertNode(Node *newNode, Node *tqparent, Node *nextSibling, return newNode; } -Node* kafkaCommon::insertNode(Node *newNode, Node *tqparent, Node *startNodeToSurround, +Node* kafkaCommon::insertNode(Node *newNode, Node *parent, Node *startNodeToSurround, Node *endNodeToSurround, int startOffset, int endOffset, NodeModifsSet *modifs) { #ifdef LIGHT_DEBUG @@ -1246,7 +1246,7 @@ Node* kafkaCommon::insertNode(Node *newNode, Node *tqparent, Node *startNodeToSu endNodeToSurround = endNodeToSurround->next; //Then create and insert the new Node. - return insertNode(newNode, tqparent, startNodeToSurround, + return insertNode(newNode, parent, startNodeToSurround, endNodeToSurround, modifs); } @@ -1389,13 +1389,13 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti { *cursorNode = newNode; cursorOffset = newNode->tag->tagStr().length(); - return insertNodeSubtree(newNode, startNode->tqparent, endNode, modifs); + return insertNodeSubtree(newNode, startNode->parent, endNode, modifs); } //Then we "split" the lastValidStartParent - startNode subtree into two : the first part is untouched // and the second will be surrounded by the new Node. Same thing for endNode. Node* node = startNode; - Node* parentNode = startNode->tqparent; + Node* parentNode = startNode->parent; Node* newParentNode = 0, *child = 0, *next = 0; while(parentNode && commonParent && parentNode != commonParent) { @@ -1433,13 +1433,13 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti } //commonParentStartChild = parentNode; node = parentNode; - parentNode = parentNode->tqparent; + parentNode = parentNode->parent; } if(endNode) { node = endNode; - parentNode = endNode->tqparent; + parentNode = endNode->parent; while(parentNode && commonParent && parentNode != commonParent) { if(true/*node != parentNode->firstChild()*/) @@ -1464,7 +1464,7 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti commonParentStartChild = newParentNode; node = parentNode; Node* aux = parentNode; - parentNode = parentNode->tqparent; + parentNode = parentNode->parent; // Remove node subtree if empty if(!aux->hasChildNodes()) extractAndDeleteNode(aux, modifs); @@ -1527,8 +1527,8 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset, return false; } - //Then search for the common tqparent of startNode and endNode (commonParent) - //and for the childs of commonParent which are tqparent of startNode and endNode + //Then search for the common parent of startNode and endNode (commonParent) + //and for the childs of commonParent which are parent of startNode and endNode //(commonParentStartChild && commonParentEndChild) //CommonParent will be the limit (startNode -- commonNode) where Nodes can //be splitted in order to insert the newNode. @@ -1559,25 +1559,25 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset, commonParent->tag->type == Tag::Text || commonParent->tag->type == Tag::Empty)) { oldCommonParent = commonParent; - commonParent = commonParent->tqparent; + commonParent = commonParent->parent; while(commonParent && isInline(commonParent->tag->name)) { oldCommonParent = commonParent; - commonParent = commonParent->tqparent; + commonParent = commonParent->parent; } commonParentStartChild = oldCommonParent; commonParentEndChild = oldCommonParent; } //startNode or endNode can't be the commonParent. else if(commonParent && (itStart == startNodeLocation.end() || itEnd == endNodeLocation.end())) - commonParent = commonParent->tqparent; + commonParent = commonParent->parent; - //Now look if at least one of the tqparent Nodes between startNode and commonParent + //Now look if at least one of the parent Nodes between startNode and commonParent //can have nodeName as child. If so for startNode and endNode, let's find the last - //tqparent Nodes which can have nodeName as child. - parentNode = startNode->tqparent; + //parent Nodes which can have nodeName as child. + parentNode = startNode->parent; oldParentNode = startNode; - while(parentNode && commonParent && parentNode != commonParent->tqparent) + while(parentNode && commonParent && parentNode != commonParent->parent) { parentNodeTQTag = QuantaCommon::tagFromDTD(parentNode); if(parentNodeTQTag && parentNodeTQTag->isChild(newNode) && @@ -1588,11 +1588,11 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset, //else if(!newNodeIsInline && isInline(parentNode)), we continue : BLOCK element can //cut some inline tag in order to be inserted. oldParentNode = parentNode; - parentNode = parentNode->tqparent; + parentNode = parentNode->parent; } - parentNode = endNode->tqparent; + parentNode = endNode->parent; oldParentNode = endNode; - while(parentNode && commonParent && parentNode != commonParent->tqparent) + while(parentNode && commonParent && parentNode != commonParent->parent) { parentNodeTQTag = QuantaCommon::tagFromDTD(parentNode); if(parentNodeTQTag && parentNodeTQTag->isChild(newNode) && @@ -1603,7 +1603,7 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset, //else if(!newNodeIsInline && isInline(parentNode)), we continue : BLOCK element can //cut some inline tag in order to be inserted. oldParentNode = parentNode; - parentNode = parentNode->tqparent; + parentNode = parentNode->parent; } /**if(!lastValidEndParent || !lastValidStartParent) @@ -1662,7 +1662,7 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset, node = startNode; if (!startNode) //Andras: it can happen. return false; - parentNode = startNode->tqparent; + parentNode = startNode->parent; while(lastValidStartParent && parentNode && parentNode != lastValidStartParent) { if(node != parentNode->firstChild()) @@ -1683,10 +1683,10 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset, } } node = parentNode; - parentNode = parentNode->tqparent; + parentNode = parentNode->parent; } node = endNode; - parentNode = endNode->tqparent; + parentNode = endNode->parent; while(lastValidEndParent && parentNode && parentNode != lastValidEndParent) { if(node != parentNode->lastChild()) @@ -1717,7 +1717,7 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset, } } node = parentNode; - parentNode = parentNode->tqparent; + parentNode = parentNode->parent; } //Now if startNode is after endNode, this means that a selectionless insertion is being done. @@ -1732,7 +1732,7 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset, else if((signed)startNode->tag->tagStr().length() == startOffset && startNode->tag->type == Tag::XmlTag) parentNodeTQTag = QuantaCommon::tagFromDTD(startNode); else if((signed)startNode->tag->tagStr().length() == startOffset && startNode->tag->type == Tag::XmlTagEnd) - parentNodeTQTag = QuantaCommon::tagFromDTD(startNode->tqparent); + parentNodeTQTag = QuantaCommon::tagFromDTD(startNode->parent); if(!parentNodeTQTag || (parentNodeTQTag && parentNodeTQTag->isChild(newNode))) { if(isAfter) @@ -1740,7 +1740,7 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset, else if((signed)startNode->tag->tagStr().length() == startOffset && startNode->tag->type == Tag::XmlTag) insertNodeSubtree(newNode, startNode, 0L, modifs); else if((signed)startNode->tag->tagStr().length() == startOffset && startNode->tag->type == Tag::XmlTagEnd) - insertNodeSubtree(newNode, startNode->tqparent, startNode->next, modifs); + insertNodeSubtree(newNode, startNode->parent, startNode->next, modifs); // (*cursorNode) = lastNewNode; cursorOffset = 0; @@ -1798,7 +1798,7 @@ bool kafkaCommon::DTDinsertRemoveNode(Node *newNode, Node *startNode, int startO } Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString &tagString, - int nodeType, Document *doc, Node* tqparent, Node* nextSibling, NodeModifsSet *modifs, + int nodeType, Document *doc, Node* parent, Node* nextSibling, NodeModifsSet *modifs, bool merge) { #ifdef LIGHT_DEBUG @@ -1812,13 +1812,13 @@ Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString node = createNode(nodeName, tagString, nodeType, doc); //insert the new Node. - insertNode(node, tqparent, nextSibling, modifs, merge); + insertNode(node, parent, nextSibling, modifs, merge); return node; } Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString &tagString, - int nodeType, Document *doc, Node *tqparent, Node *nextSibling, Node *nextEndSibling, + int nodeType, Document *doc, Node *parent, Node *nextSibling, Node *nextEndSibling, NodeModifsSet *modifs) { #ifdef LIGHT_DEBUG @@ -1832,13 +1832,13 @@ Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString node = createNode(nodeName, tagString, nodeType, doc); //insert the new Node. - insertNode(node, tqparent, nextSibling, nextEndSibling, modifs); + insertNode(node, parent, nextSibling, nextEndSibling, modifs); return node; } Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString &tagString, - int nodeType, Document *doc, Node *tqparent, Node *startNodeToSurround, + int nodeType, Document *doc, Node *parent, Node *startNodeToSurround, Node *endNodeToSurround, int startOffset, int endOffset, NodeModifsSet *modifs) { #ifdef LIGHT_DEBUG @@ -1855,7 +1855,7 @@ Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString node = createNode(nodeName, tagString, nodeType, doc); //insert the new Node. - insertNode(node, tqparent, startNodeToSurround, endNodeToSurround, startOffset, endOffset, + insertNode(node, parent, startNodeToSurround, endNodeToSurround, startOffset, endOffset, modifs); return node; @@ -1899,9 +1899,9 @@ bool kafkaCommon::addNodeRecursively(Node *newNode, Node *leafNode, if(!leafNodeTQTag) return false; - if(currentNode && currentNode->tqparent) + if(currentNode && currentNode->parent) { - currentNodeParentTQTag = QuantaCommon::tagFromDTD(currentNode->tqparent); + currentNodeParentTQTag = QuantaCommon::tagFromDTD(currentNode->parent); if(currentNodeParentTQTag && currentNodeParentTQTag->isChild(newNode)) validCurNodeParent = true; } @@ -2184,7 +2184,7 @@ Node *kafkaCommon::duplicateNodeSubtree(Node *node, bool childAndClosingTagOnly) newPrev = 0L; for(link = nodeLinkList.first(); link; link = nodeLinkList.next()) { - if(link->m_n1 == currentNode->tqparent) + if(link->m_n1 == currentNode->parent) newParent = link->m_n2; else if(link->m_n1 == currentNode->next) newNext = link->m_n2; @@ -2217,7 +2217,7 @@ Node* kafkaCommon::extractNode(Node *node, NodeModifsSet *modifs, bool extractCh { NodeModif *modif = 0, *modifChild; Node *lastChild, *curNode; - Node *tqparent, *next, *child, *n; + Node *parent, *next, *child, *n; //Node *prev; bool isSingle; int type; @@ -2231,7 +2231,7 @@ Node* kafkaCommon::extractNode(Node *node, NodeModifsSet *modifs, bool extractCh if(!node->child) extractChildren = true; - tqparent = node->tqparent; + parent = node->parent; next = node->next; //prev = node->prev; //Should this be used at all? child = node->child; @@ -2284,18 +2284,18 @@ Node* kafkaCommon::extractNode(Node *node, NodeModifsSet *modifs, bool extractCh curNode = node->child; while(curNode) { - curNode->tqparent = node->tqparent; + curNode->parent = node->parent; curNode = curNode->next; } } - if(node->tqparent && node->tqparent->child == node) + if(node->parent && node->parent->child == node) { if(extractChildren) - node->tqparent->child = node->next; + node->parent->child = node->next; else - node->tqparent->child = node->child; + node->parent->child = node->child; } - node->tqparent = 0L; + node->parent = 0L; if(node->prev) { if(extractChildren) @@ -2671,7 +2671,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s if(startNode == endNode && startOffset == endOffset) return kafkaCommon::extractionBadParameters; - //Then, process startNode and endNode : look if a nodeName tqparent is one of + //Then, process startNode and endNode : look if a nodeName parent is one of //startNode/endNode's inline parents and if it is the case, split the necessary Nodes. //The comparaison is made in lowercase, even in xml : it could be strange, for an user, to have //its nodes not removed because there are in the wrong case. @@ -2681,7 +2681,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s { if(node->tag->name.lower() == nodeName.lower()) lastNodeNameStartNode = node; - node = node->tqparent; + node = node->parent; } node = endNode; lastNodeNameEndNode = 0L; @@ -2689,7 +2689,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s { if(node->tag->name.lower() == nodeName.lower()) lastNodeNameEndNode = node; - node = node->tqparent; + node = node->parent; } if(startNode->tag->type == Tag::Text) @@ -2724,8 +2724,8 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s if(lastNodeNameStartNode) { node = startNode; - parentNode = startNode->tqparent; - while(parentNode && parentNode != lastNodeNameStartNode->tqparent) + parentNode = startNode->parent; + while(parentNode && parentNode != lastNodeNameStartNode->parent) { if(node != parentNode->firstChild()) { @@ -2740,14 +2740,14 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s } } node = parentNode; - parentNode = parentNode->tqparent; + parentNode = parentNode->parent; } } if(lastNodeNameEndNode) { node = endNode; - parentNode = endNode->tqparent; - while(parentNode && parentNode != lastNodeNameEndNode->tqparent) + parentNode = endNode->parent; + while(parentNode && parentNode != lastNodeNameEndNode->parent) { if(node != parentNode->SLastChild()) { @@ -2770,7 +2770,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s } } node = parentNode; - parentNode = parentNode->tqparent; + parentNode = parentNode->parent; } } @@ -2782,7 +2782,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s next = getNextNode(node, goUp); if(node->tag->type == Tag::XmlTag && node->tag->name.lower() == nodeName.lower()) { - parentTQTag = QuantaCommon::tagFromDTD(node->tqparent); + parentTQTag = QuantaCommon::tagFromDTD(node->parent); if(parentTQTag) { child = node->firstChild(); @@ -2927,10 +2927,10 @@ bool kafkaCommon::splitNode(Node *n, int offset, NodeModifsSet *modifs) if(n->tag->type == Tag::Text) node = createAndInsertNode("#text", tagStr.right(tagStr.length() - offset), Tag::Text, n->tag->write(), - n->tqparent, n->next, modifs, false); + n->parent, n->next, modifs, false); else node = createAndInsertNode("", tagStr.right(tagStr.length() - offset), Tag::Empty, n->tag->write(), - n->tqparent, n->next, modifs, false); + n->parent, n->next, modifs, false); //Node's string is a part of n's clean string node->tag->setCleanStrBuilt(true); @@ -2944,7 +2944,7 @@ void kafkaCommon::splitStartNodeSubtree(Node* startNode, Node* commonParent, //Then we "split" the lastValidStartParent - startNode subtree into two : the first part is untouched // and the second will be surrounded by the new Node. Same thing for endNode. Node* node = startNode; - Node* parentNode = startNode->tqparent; + Node* parentNode = startNode->parent; Node* commonParentStartChild = 0; while(parentNode && commonParent && parentNode != commonParent) { @@ -2962,7 +2962,7 @@ void kafkaCommon::splitStartNodeSubtree(Node* startNode, Node* commonParent, } commonParentStartChild = parentNode; node = parentNode; - parentNode = parentNode->tqparent; + parentNode = parentNode->parent; } if(commonParentStartChild) @@ -2975,7 +2975,7 @@ void kafkaCommon::splitEndNodeSubtree(Node* endNode, Node* commonParent, bool subTree, NodeModifsSet* modifs) { Node* node = endNode; - Node* parentNode = endNode->tqparent; + Node* parentNode = endNode->parent; Node* aux = 0; if(subTree) @@ -3009,7 +3009,7 @@ void kafkaCommon::splitEndNodeSubtree(Node* endNode, Node* commonParent, } } node = parentNode; - parentNode = parentNode->tqparent; + parentNode = parentNode->parent; } commonParentStartChildLocation = getLocation(commonParentStartChild); commonParentEndChildLocation = getLocation(commonParentEndChild); @@ -3029,11 +3029,11 @@ void kafkaCommon::splitStartAndEndNodeSubtree(Node*& startNode, int startOffset, startNode = getCorrectStartNode(startNode, startOffset); endNode = getCorrectEndNode(endNode, endOffset); - // look for common tqparent + // look for common parent if(!commonParent) { if(extractInlineParentNodes) - // get the non inline common tqparent + // get the non inline common parent commonParent = DTDGetNonInlineCommonParent(startNode, endNode, commonParentStartChildLocation, commonParentEndChildLocation, subTree); else @@ -3075,7 +3075,7 @@ void kafkaCommon::splitStartAndEndNodeSubtree(Node*& startNode, int startOffset, } splitNode(endNode, endOffset, modifs); - // split start and end nodes subtree in function of common tqparent + // split start and end nodes subtree in function of common parent commonParentStartChildLocation = kafkaCommon::getLocation(commonParentStartChild); splitStartNodeSubtree(startNode, commonParent, commonParentStartChildLocation, modifs); @@ -3208,21 +3208,21 @@ bool kafkaCommon::mergeNodes(Node *n, Node *n2, NodeSelection& cursorHolder, Nod void kafkaCommon::mergeInlineNode(Node *startNode, Node *endNode, Node **cursorNode, long &cursorOffset, NodeModifsSet *modifs) { - Node *startNodeLastInlineParent, *tqparent, *node, *next; + Node *startNodeLastInlineParent, *parent, *node, *next; bool goUp, success, isCursorNode, isEndNode; int nodeLength; if(!startNode || !endNode) return; - //first search for the last inline tqparent of startNode, and then its last prev neighbour + //first search for the last inline parent of startNode, and then its last prev neighbour // which is also inline : the merge will start from this Node. startNodeLastInlineParent = startNode; - tqparent = startNode->tqparent; - while(tqparent && isInline(tqparent->tag->name)) + parent = startNode->parent; + while(parent && isInline(parent->tag->name)) { - startNodeLastInlineParent = tqparent; - tqparent = tqparent->tqparent; + startNodeLastInlineParent = parent; + parent = parent->parent; } if(startNodeLastInlineParent->prev) { @@ -3420,7 +3420,7 @@ TQValueList kafkaCommon::getLocation(Node * node) node = node->prev; } loc.prepend(i); - node = node->tqparent; + node = node->parent; } return loc; } @@ -3634,11 +3634,11 @@ int kafkaCommon::nodeDepth(Node *node) if(!node) return -1; - node = node->tqparent; + node = node->parent; while(node) { depth++; - node = node->tqparent; + node = node->parent; } return depth; @@ -3646,12 +3646,12 @@ int kafkaCommon::nodeDepth(Node *node) Node* kafkaCommon::hasParent(Node *node, const TQString &name) { - node = node->tqparent; + node = node->parent; while(node) { if(node->tag->name.lower() == name.lower()) return node; - node = node->tqparent; + node = node->parent; } return 0L; @@ -3673,31 +3673,31 @@ Node* kafkaCommon::hasParent(Node* startNode, Node* endNode, const TQString &nam { if(node->tag->name.lower() == name.lower()) return node; - node = node->tqparent; + node = node->parent; } return 0; } -bool kafkaCommon::insertDomNode(DOM::Node node, DOM::Node tqparent, DOM::Node nextSibling, +bool kafkaCommon::insertDomNode(DOM::Node node, DOM::Node parent, DOM::Node nextSibling, DOM::Node rootNode) { if(node.isNull()) return false; - if(tqparent.isNull()) + if(parent.isNull()) { if(rootNode.isNull()) return false; - tqparent = rootNode; + parent = rootNode; } //Andras: avoid exceptions - if (!nextSibling.isNull() && nextSibling.parentNode() != tqparent) + if (!nextSibling.isNull() && nextSibling.parentNode() != parent) { kdDebug(25001)<< "kafkaCommon::insertDomNode() - invalid nextSibling!" << endl; return false; } - if (node.ownerDocument() != tqparent.ownerDocument()) + if (node.ownerDocument() != parent.ownerDocument()) { kdDebug(25001)<< "kafkaCommon::insertDomNode() - ownerDocument is different!" << endl; return false; @@ -3705,7 +3705,7 @@ bool kafkaCommon::insertDomNode(DOM::Node node, DOM::Node tqparent, DOM::Node ne try { - tqparent.insertBefore(node, nextSibling); + parent.insertBefore(node, nextSibling); } catch(DOM::DOMException e) { @@ -3716,12 +3716,12 @@ bool kafkaCommon::insertDomNode(DOM::Node node, DOM::Node tqparent, DOM::Node ne bool kafkaCommon::removeDomNode(DOM::Node node) { - DOM::Node tqparent = node.parentNode(); + DOM::Node parent = node.parentNode(); - if(tqparent.isNull()) + if(parent.isNull()) return false; - tqparent.removeChild(node); + parent.removeChild(node); return true; } @@ -3908,16 +3908,16 @@ bool kafkaCommon::isInline(DOM::Node domNode) return isInline(domNode.nodeName().string()); } -bool kafkaCommon::parentSupports(DOM::Node tqparent, DOM::Node startNode, DOM::Node endNode, +bool kafkaCommon::parentSupports(DOM::Node parent, DOM::Node startNode, DOM::Node endNode, const DTDStruct* dtd) { TQTag *parentTQTag; DOM::Node child; - if(!dtd || tqparent.isNull()) + if(!dtd || parent.isNull()) return false; - parentTQTag = QuantaCommon::tagFromDTD(dtd, tqparent.nodeName().string()); + parentTQTag = QuantaCommon::tagFromDTD(dtd, parent.nodeName().string()); if(!parentTQTag) return false; @@ -3984,7 +3984,7 @@ void kafkaCommon::coutDomTree(DOM::Node, int) kdDebug(25001) << output <<" (" << node.nodeType() << ") "<< node.handle() << endl; kdDebug(25001)<< dots << " +++ prev " << node.previousSibling().handle() << " next " << - node.nextSibling().handle() << " tqparent " << + node.nextSibling().handle() << " parent " << node.parentNode().handle() << " child " << node.firstChild().handle() << endl; for(j = 0; j < (int)node.attributes().length(); ++j) { @@ -4026,8 +4026,8 @@ void kafkaCommon::coutTree(Node *node, int indent) kdDebug(25001) << output <<" (" << node->tag->type << ", " << node->tag->cleanStrBuilt() << ", " << node->tag->indentationDone() << ") "<< node << " at pos " << bLine << ":" << bCol << " - " << eLine << ":" << eCol << endl; - kdDebug(25001)<< dots << " +++ prev " << node->prev << " next " << node->next << " tqparent " << - node->tqparent << " child " << node->child << endl; + kdDebug(25001)<< dots << " +++ prev " << node->prev << " next " << node->next << " parent " << + node->parent << " child " << node->child << endl; for(j = 0; j < node->tag->attrCount(); ++j) { kdDebug(25001)<< dots << " *** attr" << j << " " << @@ -4069,13 +4069,13 @@ int kafkaCommon::isInsideTag(Node* start_node, Node* end_node, TQString const& t tag_start = hasParent(start_node, tag_name); if(tag_start) - return 0; // only start_node has tag_name as tqparent + return 0; // only start_node has tag_name as parent tag_start = hasParent(end_node, tag_name); if(tag_start) - return 0; // only end_node has tag_name as tqparent + return 0; // only end_node has tag_name as parent - return -1; // neither the nodes have tag_name as tqparent + return -1; // neither the nodes have tag_name as parent } int kafkaCommon::isInsideTag(Node* start_node, Node* end_node, TQString const& tag_name, @@ -4092,13 +4092,13 @@ int kafkaCommon::isInsideTag(Node* start_node, Node* end_node, TQString const& t tag_start = hasParent(start_node, tag_name); if(tag_start && tag_start->tag->hasAttribute(attribute_name) && tag_start->tag->attributeValue(attribute_name, true) == attribute_value) - return 0; // only start_node has tag_name as tqparent + return 0; // only start_node has tag_name as parent tag_start = hasParent(end_node, tag_name); if(tag_start && tag_start->tag->hasAttribute(attribute_name) && tag_start->tag->attributeValue(attribute_name, true) == attribute_value) - return 0; // only end_node has tag_name as tqparent + return 0; // only end_node has tag_name as parent - return -1; // neither the nodes have tag_name as tqparent + return -1; // neither the nodes have tag_name as parent } bool kafkaCommon::isBetweenWords(Node* node, int offset) diff --git a/quanta/parts/kafka/kafkacommon.h b/quanta/parts/kafka/kafkacommon.h index fdec2aef..c3d76488 100644 --- a/quanta/parts/kafka/kafkacommon.h +++ b/quanta/parts/kafka/kafkacommon.h @@ -58,7 +58,7 @@ public: /** * This function returns the next Node after node : the first child of * node if available, else its next sibling if available, else the next - * available next sibling of a tqparent of node. + * available next sibling of a parent of node. * @param _node It is the Node from which we want the next Node. * @param goUp This boolean specifies if we should go up (torwards the root Node) * i.e. not looking at the childs of node, or make a standart iteration. @@ -87,20 +87,20 @@ public: /** - * Returns the first common tqparent to startNode and endNode that isn't inline. + * Returns the first common parent to startNode and endNode that isn't inline. * @param startNode Start node. * @param endNode End node. - * @param commonParentStartChildLocation Is the child of commonParent which is tqparent of startNode - * @param commonParentEndChildLocation Is the child of commonParent which is tqparent of endNode + * @param commonParentStartChildLocation Is the child of commonParent which is parent of startNode + * @param commonParentEndChildLocation Is the child of commonParent which is parent of endNode * @param nodeSubtree When startNode and endNode doesn't belong to the current document tree. Pass 0 if they do. - * @return The first, non inline, common tqparent of startNode and endNode. + * @return The first, non inline, common parent of startNode and endNode. */ static Node* DTDGetNonInlineCommonParent(Node* startNode, Node* endNode, TQValueList& commonParentStartChildLocation, TQValueList& commonParentEndChildLocation, Node* nodeSubtree); /** - * Same as above, only that the common tqparent can be inline. + * Same as above, only that the common parent can be inline. */ static Node* DTDGetCommonParent(Node* startNode, Node* endNode, TQValueList& commonParentStartChildLocation, @@ -109,14 +109,14 @@ public: /** * This function returns the next DOM::Node after node : the first child of * DOM::Node if available, else its next sibling if available, else the next - * available next sibling of a tqparent of node. + * available next sibling of a parent of node. * @param node The DOM::Node the search starts from. * @param goUp This boolean specifies if we should go up or down in the tree. * For a normal use, It must be set to false at the * beginning and then the same boolean must be used when using * several times this function. * @param returnParentNode Specifies if there are no child and next sibling, if - * we should return the tqparent. + * we should return the parent. * @param endNode Specifies at which DOM::Node the search should end. It is useful * when setting returnParentNode to false. * @return the next Node. @@ -153,7 +153,7 @@ public: static Node* getCorrectEndNode(Node* endNode, int& endOffset); /** - * Get the first child of commonParent which is tqparent of node + * Get the first child of commonParent which is parent of node * @param node * @param commonParent * @return @@ -186,7 +186,7 @@ public: * generated by the undoRedo system. The undoRedo system can't create itself these Nodes * because it will create them only during the synchronization, making all the TQValueList * Nodes location wrong. - * WARNING n1 and n2 must be siblings or tqparent-child. If there are sibling and n1 is a XmlTag, + * WARNING n1 and n2 must be siblings or parent-child. If there are sibling and n1 is a XmlTag, * n1 should not have non empty childs. * @param n1 The start node. * @param n2 The end node. @@ -290,7 +290,7 @@ public: * WARNING : baseNode is used as the rootNode. * It will also try to merge text/Empty Nodes. * @param node The node to insert. - * @param parentNode This Node will be the tqparent of node. + * @param parentNode This Node will be the parent of node. * @param nextSibling This Node will be the next Sibling of Node. If null, node will be appended at * the child list of parentNode. * TODO: @param rootNode The rootNode of the tree we want to insert the Node (usually &baseNode). @@ -308,11 +308,11 @@ public: /** * It behaves essentially like the above function except that it can "surround" a set of Nodes with the * new Node. Thus, the closing Node is created if necessary. - * nextSibling and nextEndSibling MUST have the same tqparent. If not, use the + * nextSibling and nextEndSibling MUST have the same parent. If not, use the * DTDinsertNode. * This function does not try to know if the location of the new Node is DTD valid. * @param newNode The new Node to insert. - * @param tqparent The tqparent of the Node. + * @param parent The parent of the Node. * @param nextSibling The next sibling of the Node. * @param nextEndSibling The next sibling of the closing Node if created. If nextEndSibling == * nextSibling, the closing Node will be placed at the right of the newly created Node. @@ -320,13 +320,13 @@ public: * @param modifs The changes made are logged into modifs. * @return Returns a pointer to the node inserted. */ - static Node *insertNode(Node *newNode, Node *tqparent, Node *nextSibling, Node *nextEndSibling, + static Node *insertNode(Node *newNode, Node *parent, Node *nextSibling, Node *nextEndSibling, NodeModifsSet *modifs, bool merge = true); /** * It behaves essentially like the above function except that it can split the endNodeToSurround and * startNodeToSurround if necessary, according to the offsets. - * startNodeToSurround et endNodeToSurround MUST have the same tqparent. If not, use the last + * startNodeToSurround et endNodeToSurround MUST have the same parent. If not, use the last * DTDinsertNode. * This function does not try to know if the location of the new Node is valid. * @param startNodeToSurround The first Node which will be enclosed by the new Node. @@ -334,7 +334,7 @@ public: * @param startOffset The first Node will be splitted at offset startOffset, the right part will be enclosed. * @param endOffset The last Node will be splitted at offset endOffset, the left part will be enclosed. */ - static Node* insertNode(Node *newNode, Node *tqparent, Node *startNodeToSurround, + static Node* insertNode(Node *newNode, Node *parent, Node *startNodeToSurround, Node *endNodeToSurround, int startOffset, int endOffset, NodeModifsSet *modifs); /** @@ -353,7 +353,7 @@ public: * @param cursorNode The cursor is inside cursorNode. * @param cursorOffset The offset of the cursor inside cursorNode. * - * @return Returns false if it wasn't possible to insert the tag because e.g. of an invalid tqparent. + * @return Returns false if it wasn't possible to insert the tag because e.g. of an invalid parent. */ static bool DTDinsertNode(Node *newNode, Node *startNode, int startOffset, Node *endNode, int endOffset, Document *doc, Node **cursorNode, long &cursorOffset, NodeModifsSet *modifs); @@ -373,7 +373,7 @@ public: * WARNING : baseNode is used as the rootNode. * It will also try to merge text/Empty Nodes. * @param node The root node of the Node subtree to insert. - * @param parentNode This Node will be the tqparent of node. + * @param parentNode This Node will be the parent of node. * @param nextSibling This Node will be the next Sibling of Node. If null, node will be appended at * the child list of parentNode. * @param modifs The changes made are logged into modifs. Put 0L if you don't want to log @@ -387,12 +387,12 @@ public: /** * It behaves essentially like the above function except that it can "surround" a set of Nodes with the * new Node. Thus, the closing Node is created if necessary. - * nextSibling and nextEndSibling MUST have the same tqparent. If not, use the + * nextSibling and nextEndSibling MUST have the same parent. If not, use the * DTDinsertNode. - * The Node Subtree MUST be a single-Node-per-tqparent subtree. + * The Node Subtree MUST be a single-Node-per-parent subtree. * This function does not try to know if the location of the new Node is DTD valid. * @param node The root node of the Node subtree to insert. - * @param tqparent The tqparent of the Node. + * @param parent The parent of the Node. * @param nextSibling The next sibling of the Node. * @param nextEndSibling The next sibling of the closing Node if created. If nextEndSibling == * nextSibling, the closing Node will be placed at the right of the newly created Node. @@ -425,17 +425,17 @@ public: * @param tagString The string of the tag. * @param nodeType The type of the Node cf Tag::TokenType. * @param doc The Node belongs to this Document. - * @param tqparent The tqparent of the Node. + * @param parent The parent of the Node. * @param nextSibling The next sibling of the Node. * @return Returns a pointer to the newly created Node. */ static Node *createAndInsertNode(const TQString &nodeName, const TQString &tagString, int nodeType, - Document *doc, Node* tqparent, Node* nextSibling, NodeModifsSet *modifs, bool merge = true); + Document *doc, Node* parent, Node* nextSibling, NodeModifsSet *modifs, bool merge = true); /** * It behaves essentially like the above function except that it reate its closing Node if necessary - * and then insert them with tqparent as Node's tqparent. - * nextSibling and nextEndSibling MUST have the same tqparent. If not, use the + * and then insert them with parent as Node's parent. + * nextSibling and nextEndSibling MUST have the same parent. If not, use the * DTDcreateAndInsertNode. * @param nextEndSibling The next sibling of the closing Node if created. If nextEndSibling == * nextSibling, the closing Node will be placed at the right of the newly created Node. @@ -443,11 +443,11 @@ public: * @param modifs The changes made are logged into modifs. */ static Node *createAndInsertNode(const TQString &nodeName, const TQString &tagString, int nodeType, - Document *doc, Node *tqparent, Node *nextSibling, Node *nextEndSibling, NodeModifsSet *modifs); + Document *doc, Node *parent, Node *nextSibling, Node *nextEndSibling, NodeModifsSet *modifs); /** * It behaves essentially like the above function except that if necessary, it will split the Nodes. - * startNodeToSurround et endNodeToSurround MUST have the same tqparent. If not, use the + * startNodeToSurround et endNodeToSurround MUST have the same parent. If not, use the * DTDcreateAndInsertNode. * This function does not try to know if the location of the new Node is valid. * @param startNodeToSurround The first Node which will be enclosed by the new Node. @@ -456,7 +456,7 @@ public: * @param endOffset The last Node will be splitted at offset endOffset, the left part will be enclosed. */ static Node *createAndInsertNode(const TQString &nodeName, const TQString &tagString, - int nodeType, Document *doc, Node *tqparent, Node *startNodeToSurround, + int nodeType, Document *doc, Node *parent, Node *startNodeToSurround, Node *endNodeToSurround, int startOffset, int endOffset, NodeModifsSet *modifs); /** @@ -470,7 +470,7 @@ public: * @param startOffset If firstNode is a text, specify at which offset the new Node must begin to surround. * @param endNode The last Node which must be surrounded by the new Node. * @param endOffset If endNode is a text, specify at which offset the new Node must stop to surround. - * @return Returns false if it wasn't possible to insert the tag because e.g. of an invalid tqparent. + * @return Returns false if it wasn't possible to insert the tag because e.g. of an invalid parent. */ static bool DTDcreateAndInsertNode(const TQString &nodeName, const TQString &tagString, int nodeType, Document *doc, Node *startNode, int startOffset, Node *endNode, int endOffset, @@ -523,7 +523,7 @@ public: * @param node The node to delete. * @param modifs The changes made are logged into modifs. * @param extractChilds If we extract or move up the tqchildren. WARNING: it don't check - * if the tqchildren of node are legal childs of the tqparent of node. + * if the tqchildren of node are legal childs of the parent of node. * @param removeClosingTag Extract the closingTag if node isn't single and is Tag::XmlTag. * TODO: @param removeEmbeddedTags Specifies if we delete the embedded Nodes e.g. * : the PHP block is an embedded block. @@ -593,7 +593,7 @@ public: //The node to extract was not found. nothingExtracted = 0, //The extract operation stopped because of a DTD error : if the node was removed, the child - //weren't able to be childs of the node's tqparent, according to the DTD. Should not occur + //weren't able to be childs of the node's parent, according to the DTD. Should not occur //except really bad HTML. extractionStoppedDueToBadNodes, //everything has gone fine @@ -628,7 +628,7 @@ public: /** * Moves a Node somewhere else. * @param nodeToMove The node to move :-) - * @param newParent The new tqparent of nodeToMove. + * @param newParent The new parent of nodeToMove. * @param newNextSibling The new next Sibling of nodeToMove. If null, node will be appended at * the child list of parentNode. * @param modifs The changes made are logged into modifs. @@ -695,10 +695,10 @@ public: * @param startOffset * @param endNode The node where a selection ends, for example. * @param endOffset - * @param commonParent This is the common tqparent between start and end node. + * @param commonParent This is the common parent between start and end node. * If 0, it tries to find the commonParent, else it uses the passed node. - * @param commonParentStartChildLocation The first child of commonParent which is tqparent of startNode is stored here. - * @param commonParentEndChildLocation The first child of commonParent which is tqparent of endNode is stored here. + * @param commonParentStartChildLocation The first child of commonParent which is parent of startNode is stored here. + * @param commonParentEndChildLocation The first child of commonParent which is parent of endNode is stored here. * @param cursorNode The cursor node is stored here. * @param cursorOffset The cursor offset is stored here. * @param subTree The node corresponding to the start of a subtree that doesn't belong to the current document, or 0. @@ -809,8 +809,8 @@ public: /** * Get the node corresponding to a sublocation. * @param loc A location of a Node. - * @locOffset We want the (totalNumberOfParent - locOffset)th tqparent of Node. - * @return Returns a tqparent of the node pointed by loc. + * @locOffset We want the (totalNumberOfParent - locOffset)th parent of Node. + * @return Returns a parent of the node pointed by loc. */ static Node* getNodeFromSubLocation(TQValueList loc, int locOffset); @@ -856,18 +856,18 @@ public: * Get the node's depth in the tree. * @param node The node we want the depth. * @return Returns the depth of node. It is basically the number of parents of node. - * It will return 0 if node has no tqparent Nodes, and -1 if node doesn't exists. + * It will return 0 if node has no parent Nodes, and -1 if node doesn't exists. */ static int nodeDepth(Node *node); /** - * Looks if node has a tqparent which is named name. - * @return Returns the first tqparent which is named name or 0L if not found. + * Looks if node has a parent which is named name. + * @return Returns the first parent which is named name or 0L if not found. */ static Node* hasParent(Node *node, const TQString &name); /** - * Tries to find the common tqparent to startNode and endNode, in the same conditions as above. + * Tries to find the common parent to startNode and endNode, in the same conditions as above. */ static Node* hasParent(Node* startNode, Node* endNode, const TQString &name); @@ -879,12 +879,12 @@ public: * WARNING : The postEnhancement is not done (cf htmlenhancer.h) * Prefer using KafkaDocument::insertDomNode() * @param node The node to insert. - * @param tqparent The new tqparent of node. If null, insert node at the top level. + * @param parent The new parent of node. If null, insert node at the top level. * @param nextSibling The new next sibling of node. If null, append node at the end of the child list. - * @param rootNode The root DOM::Node of the DOM::Node tree. Useful when no tqparent is provided. + * @param rootNode The root DOM::Node of the DOM::Node tree. Useful when no parent is provided. * @return Returns true if the operation was successfull. */ - static bool insertDomNode(DOM::Node node, DOM::Node tqparent = DOM::Node(), + static bool insertDomNode(DOM::Node node, DOM::Node parent = DOM::Node(), DOM::Node nextSibling = DOM::Node(), DOM::Node rootNode = DOM::Node()); @@ -978,21 +978,21 @@ public: const TQString &attrName, const TQString &attrValue, DOM::Document rootNode); /** - * Looks if domNode has a tqparent which is named name. - * @return Returns the first tqparent which is named name or an empty DOM::Node if not found. + * Looks if domNode has a parent which is named name. + * @return Returns the first parent which is named name or an empty DOM::Node if not found. */ static DOM::Node hasParent(DOM::Node domNode, const TQString &name); /** * Returns the position of the child domNode. * @param domNode This is the DOM::Node we want the position. - * @return Returns the position of domNode inside domNode's tqparent's tqchildren or -1 if not found. + * @return Returns the position of domNode inside domNode's parent's tqchildren or -1 if not found. */ static int childPosition(DOM::Node domNode); /** * Returns the position'th child of parentNode. - * @param parentNode The tqparent Node of the node to return. + * @param parentNode The parent Node of the node to return. * @param position We return the position'th child Node. * @param fallback If set to true, it will always return a valid Node (except if there is no child!!) */ @@ -1005,10 +1005,10 @@ public: static bool isInline(DOM::Node domNode); /** - * Specify if tqparent supports the siblings DOM::Nodes starting from startNode to endNode + * Specify if parent supports the siblings DOM::Nodes starting from startNode to endNode * according to the DTD dtd. */ - static bool parentSupports(DOM::Node tqparent, DOM::Node startNode, DOM::Node endNode, + static bool parentSupports(DOM::Node parent, DOM::Node startNode, DOM::Node endNode, const DTDStruct* dtd); @@ -1030,7 +1030,7 @@ public: /** * Prints in stdout the current Node tree. * @param node The startNode - * @param indent The number of little dots per tqparent relationship. + * @param indent The number of little dots per parent relationship. */ static void coutTree(Node *node, int indent); @@ -1085,7 +1085,7 @@ public: private: /** - * Split the last valid start tqparent (commonParentStartChild) into two. + * Split the last valid start parent (commonParentStartChild) into two. * This and the method above are related and are used in sequence. * The following tree: * @@ -1120,14 +1120,14 @@ private: * * * @param startNode The node where a selection starts, for example. - * @param commonParent This is the common tqparent between start and end node. - * @param commonParentStartChildLocation The first child of commonParent which is tqparent of startNode + * @param commonParent This is the common parent between start and end node. + * @param commonParentStartChildLocation The first child of commonParent which is parent of startNode * @param modifs The changes made are logged into modifs. */ static void splitStartNodeSubtree(Node* startNode, Node* commonParent, TQValueList& commonParentStartChildLocation, NodeModifsSet* modifs); /** - * Split the last valid start tqparent (commonParentStartChild) into two. + * Split the last valid start parent (commonParentStartChild) into two. * The following tree: * * --> commonParent @@ -1162,9 +1162,9 @@ private: * * * @param endNode The node where a selection ends, for example. - * @param commonParent This is the common tqparent between start and end node. - * @param commonParentStartChildLocation The first child of commonParent which is tqparent of startNode. - * @param commonParentEndChildLocation The first child of commonParent which is tqparent of endNode. + * @param commonParent This is the common parent between start and end node. + * @param commonParentStartChildLocation The first child of commonParent which is parent of startNode. + * @param commonParentEndChildLocation The first child of commonParent which is parent of endNode. * @param subTree True if we are dealing with a tree that doesn't belong to the current document. * @param modifs The changes made are logged into modifs. */ diff --git a/quanta/parts/kafka/kafkahtmlpart.cpp b/quanta/parts/kafka/kafkahtmlpart.cpp index ed31f049..20a583e8 100644 --- a/quanta/parts/kafka/kafkahtmlpart.cpp +++ b/quanta/parts/kafka/kafkahtmlpart.cpp @@ -83,9 +83,9 @@ public: #endif }; -KafkaWidget::KafkaWidget(TQWidget *tqparent, TQWidget *widgetParent, KafkaDocument *part, +KafkaWidget::KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument *part, const char *name) - : KHTMLPart(widgetParent, name, TQT_TQOBJECT(tqparent), name), + : KHTMLPart(widgetParent, name, TQT_TQOBJECT(parent), name), w(part) { m_contextPopupMenu = new TQPopupMenu(); @@ -205,10 +205,10 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position) else if(position == 0) { DOM::Text textNode = document().createTextNode(text); - DOM::Node tqparent = node.parentNode(); -//FIXME: Andras: safety checks, as tqparent can be null. Maybe it just hides the error... - if (!tqparent.isNull()) - tqparent.insertBefore(textNode, node); + DOM::Node parent = node.parentNode(); +//FIXME: Andras: safety checks, as parent can be null. Maybe it just hides the error... + if (!parent.isNull()) + parent.insertBefore(textNode, node); else node.appendChild(textNode); m_currentNode = textNode; @@ -223,15 +223,15 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position) else if(position == 3 || (position == 1 && (focus == kNodeAttrs::singleNodeAndItself))) { DOM::Text textNode = document().createTextNode(text); - DOM::Node tqparent = node.parentNode(); -//FIXME: Andras: safety checks, as tqparent and node.nextSibling can be null. Maybe it just hides the error... + DOM::Node parent = node.parentNode(); +//FIXME: Andras: safety checks, as parent and node.nextSibling can be null. Maybe it just hides the error... //Also it seems that position can be 3 and node is "body". See bug 112733. - if (node.nodeName().string().lower() != "body" && !tqparent.isNull()) + if (node.nodeName().string().lower() != "body" && !parent.isNull()) { if (!node.nextSibling().isNull()) - tqparent.insertBefore(textNode, node.nextSibling()); + parent.insertBefore(textNode, node.nextSibling()); else - tqparent.insertBefore(textNode, node); + parent.insertBefore(textNode, node); } else node.appendChild(textNode); @@ -947,7 +947,7 @@ void KafkaWidget::keyDelete() #endif _nodeParent = _nodeNext.parentNode(); - //If this empty text contains the cursor, change node to its tqparent. + //If this empty text contains the cursor, change node to its parent. if(_nodeNext == _node && _nodeParent.firstChild() == _nodeNext && _nodeNext.nextSibling().isNull()) { @@ -964,7 +964,7 @@ void KafkaWidget::keyDelete() //Else if the current Node is a BLOCK which can be entered/leaved e.g. H1 else if(attrs->chCurFoc() == kNodeAttrs::blockNode) { - //First look if it is one of _node's tqparent + //First look if it is one of _node's parent isParent = false; temp = _node; while(!temp.isNull()) @@ -1127,7 +1127,7 @@ void KafkaWidget::keyDelete() #endif _nodeParent = _nodeNext.parentNode(); - //If this block is used to define the cursor pos, change node to its tqparent. + //If this block is used to define the cursor pos, change node to its parent. if(_nodeNext == _node && _nodeParent.firstChild() == _nodeNext && _nodeNext.nextSibling().isNull()) { @@ -1392,7 +1392,7 @@ void KafkaWidget::keyBackspace() //Else if the current Node if a BLOCK which can be entered/leaved e.g. H1, P else if(attrs->chCurFoc() == kNodeAttrs::blockNode) { - //First look if it is one of _node's tqparent + //First look if it is one of _node's parent isParent = false; temp = _node; while(!temp.isNull()) diff --git a/quanta/parts/kafka/kafkahtmlpart.h b/quanta/parts/kafka/kafkahtmlpart.h index c0c1012f..c8ff05f0 100644 --- a/quanta/parts/kafka/kafkahtmlpart.h +++ b/quanta/parts/kafka/kafkahtmlpart.h @@ -48,7 +48,7 @@ class KafkaWidget : public KHTMLPart Q_OBJECT TQ_OBJECT public: - KafkaWidget(TQWidget *tqparent, TQWidget *widgetParent, KafkaDocument *part, + KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument *part, const char *name = 0); ~KafkaWidget(); @@ -85,7 +85,7 @@ public: * @param goUp A needed boolean for several consecutive call to * this function. Setting it to false by default, or to true if we don't want to go through * the childs of _node. - * @param skipParentNodes Specifies if we should skip the tqparent Node when going up : + * @param skipParentNodes Specifies if we should skip the parent Node when going up : * this implies that Nodes will not be returned two times. * @param dontBlock Specifies if the search should or not be blocked by BlockingTags. * @param _endNode Specifies at which DOM::Node the search should end. It is useful @@ -115,7 +115,7 @@ public: /** * It will move DOM::Nodes from startNode to endNode as tqchildren of newParent. It does NOT check * if the move is valid, so it may crash. Please check before with kafkaCommon::parentSupports(). - * @param newParent The new tqparent of the DOM::Nodes. + * @param newParent The new parent of the DOM::Nodes. * @param startNode The first node to move. * @param endNode Starting from endNode, the last sibling to move. * @param refNode The reference DOM::Node. @@ -151,7 +151,7 @@ public slots: * sections, and entity references) separates Text nodes, i.e., there are * neither adjacent Text nodes nor empty Text nodes. * Should be used instead of DOM::Node::normalize(). - * @param _node This node is the tqparent node of the childs normalized + * @param _node This node is the parent node of the childs normalized */ void normalize(DOM::Node _node); @@ -211,7 +211,7 @@ signals: /** * Is emitted whenever a DOM::Node is about to be moved in the tree. * @param node The DOM::Node which will be moved. - * @param newParent The new tqparent of domNode. + * @param newParent The new parent of domNode. * @param before domNode will be placed before before. * @param modifs The changes made are logged into modifs. */ diff --git a/quanta/parts/kafka/kafkasyncoptions.cpp b/quanta/parts/kafka/kafkasyncoptions.cpp index 45170859..e7066187 100644 --- a/quanta/parts/kafka/kafkasyncoptions.cpp +++ b/quanta/parts/kafka/kafkasyncoptions.cpp @@ -25,8 +25,8 @@ #include "kafkasyncoptions.h" #include "kafkasyncoptions.moc" -KafkaSyncOptions::KafkaSyncOptions( KConfig *a_config, TQWidget* tqparent, const char* name ) - : KafkaSyncOptionsUI( tqparent, name ) +KafkaSyncOptions::KafkaSyncOptions( KConfig *a_config, TQWidget* parent, const char* name ) + : KafkaSyncOptionsUI( parent, name ) { config = a_config; diff --git a/quanta/parts/kafka/kafkasyncoptions.h b/quanta/parts/kafka/kafkasyncoptions.h index 85a1eb88..63e58552 100644 --- a/quanta/parts/kafka/kafkasyncoptions.h +++ b/quanta/parts/kafka/kafkasyncoptions.h @@ -28,7 +28,7 @@ class KafkaSyncOptions : public KafkaSyncOptionsUI TQ_OBJECT public: - KafkaSyncOptions( KConfig *config, TQWidget* tqparent = 0, const char* name = 0); + KafkaSyncOptions( KConfig *config, TQWidget* parent = 0, const char* name = 0); ~KafkaSyncOptions(); void updateConfig(); diff --git a/quanta/parts/kafka/nodeenhancer.h b/quanta/parts/kafka/nodeenhancer.h index 6e8bc44c..376379f1 100644 --- a/quanta/parts/kafka/nodeenhancer.h +++ b/quanta/parts/kafka/nodeenhancer.h @@ -45,7 +45,7 @@ public: * The DOM::Node must be built before calling this * function. * @param node The Node we want to enhance. - * @param parentDNode the tqparent DOM::Node of the root DOM::Node of node. + * @param parentDNode the parent DOM::Node of the root DOM::Node of node. * @param nextDNode the DOM::Node next to the root DOM::Node of node. */ virtual bool enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node nextDNode) = 0; diff --git a/quanta/parts/kafka/undoredo.cpp b/quanta/parts/kafka/undoredo.cpp index 85f23398..647709b1 100644 --- a/quanta/parts/kafka/undoredo.cpp +++ b/quanta/parts/kafka/undoredo.cpp @@ -59,7 +59,7 @@ NodeModif::~NodeModif() { if(m_node) { - m_node->tqparent = 0L; + m_node->parent = 0L; m_node->next = 0L; m_node->prev = 0L; if(m_type == NodeRemoved) @@ -87,7 +87,7 @@ void NodeModif::setNode(Node *node) m_node = node; if(m_node) { - m_node->tqparent = 0L; + m_node->parent = 0L; m_node->next = 0L; m_node->prev = 0L; if(m_type == NodeRemoved) @@ -544,14 +544,14 @@ bool undoRedo::undoNodeModif(NodeModif *nodeModif) node = kafkaCommon::getNodeFromLocation(nodeModif->location()); if(!node) { - // No node at this location, getting the tqparent Node and appending newNode after - // the last child of the tqparent. + // No node at this location, getting the parent Node and appending newNode after + // the last child of the parent. ref = nodeModif->location(); TQValueList loc(ref); loc.remove(loc.fromLast()); if(loc.empty()) { - // No tqparent, adding it on top of the tree. + // No parent, adding it on top of the tree. kafkaCommon::insertNode(newNode, 0L, 0L, 0L, false); } else @@ -568,7 +568,7 @@ bool undoRedo::undoNodeModif(NodeModif *nodeModif) else { // A node is already here. Moving it to the right and adding newNode here. - kafkaCommon::insertNode(newNode, node->tqparent, node, 0L, false); + kafkaCommon::insertNode(newNode, node->parent, node, 0L, false); } } if(nodeModif->type() == NodeModif::NodeTreeRemoved) @@ -756,7 +756,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/) while(n->next) n = n->next; } - if(n->tqparent->_leafNode.isNull()) + if(n->parent->_leafNode.isNull()) { dm = domNode.nextSibling(); goUp = false; @@ -771,7 +771,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/) } else { - domNode2 = n->tqparent->_leafNode; + domNode2 = n->parent->_leafNode; while(!domNode.nextSibling().isNull()) { //try{ @@ -968,15 +968,15 @@ void undoRedo::reloadQuantaEditor(bool force, bool syncQuantaCursor, bool encode while(node) { //kdDebug(25001)<< "CurNode : " << _node->tag->name << " - " << _node->tag->tagStr() << endl; - if(node->tqparent) + if(node->parent) { - node->tqparent->tag->beginPos(bLine3, bCol3); - node->tqparent->tag->endPos(eLine3, eCol3); + node->parent->tag->beginPos(bLine3, bCol3); + node->parent->tag->endPos(eLine3, eCol3); } node->tag->beginPos(bLine2, bCol2); //if we are in a Script inside a tag e.g. , skip it - if(node->tag->type == Tag::ScriptTag && node->tqparent && + if(node->tag->type == Tag::ScriptTag && node->parent && QuantaCommon::isBetween(bLine2, bCol2, bLine3, bCol3, eLine3,eCol3) == 0) { goUp = true; @@ -990,7 +990,7 @@ void undoRedo::reloadQuantaEditor(bool force, bool syncQuantaCursor, bool encode allText += node->tag->tagStr(); //If a child is a Script inside this Tag e.g. , make - //its position fits inside the tqparent + //its position fits inside the parent node->tag->beginPos(bLine3, bCol3); node->tag->endPos(eLine3, eCol3); child = node->firstChild(); diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp index 735e8c51..3ed2c464 100644 --- a/quanta/parts/kafka/wkafkapart.cpp +++ b/quanta/parts/kafka/wkafkapart.cpp @@ -61,7 +61,7 @@ KafkaWidget *kafkaWidget; KafkaDocument *kafkaDoc; -KafkaDocument::KafkaDocument(TQWidget *tqparent, TQWidget *widgetParent, const char *name) +KafkaDocument::KafkaDocument(TQWidget *parent, TQWidget *widgetParent, const char *name) :domNodeProps(1021), _docLoaded(false) { // i18n reserve @@ -88,7 +88,7 @@ TQString ab = i18n("Ident all"); kafkaDoc = this; - m_kafkaPart = new KafkaWidget(tqparent, widgetParent,this, name); + m_kafkaPart = new KafkaWidget(parent, widgetParent,this, name); kafkaWidget = m_kafkaPart; //m_kafkaPart->showDomTree(); m_currentDoc = 0L; @@ -513,7 +513,7 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode) DOM::Node newNode, newNode2, attr, nextNode, parentNode, *ptDomNode; bool removeLeftWhitespaces, removeRightWhitespaces; TQString str, nodeValue; - Node *n, *tqparent; + Node *n, *parent; int i; // Don't create DOM::Nodes from Quanta empty nodes outside the body or inside other not allowed element, or KHTML @@ -526,7 +526,7 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode) else canInsertEmptyNode = kafkaCommon::hasParent(node, "body"); - Node* parent_node = node->tqparent; + Node* parent_node = node->parent; TQTag* parent_node_description_tag = QuantaCommon::tagFromDTD(parent_node); if(parent_node_description_tag && !parent_node_description_tag->isChild(node, false, true)) canInsertEmptyNode = false; @@ -540,7 +540,7 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode) //The basics DOM::Nodes HTML, HEAD and BODY are loaded anyway, but we must now // link the real HTML,... to their Nodes. //A basic Common tree is !doctype<-html<-(head, body) - if(!node->tqparent) + if(!node->parent) {//FIXME:html, head and body are HTML-specific tag, for others DTDs it might result to some pbs. if(str == "html") { @@ -575,30 +575,30 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode) } } } - else if(str == "html" && (!node->tqparent || (node->tqparent && !node->tqparent->tqparent))) + else if(str == "html" && (!node->parent || (node->parent && !node->parent->parent))) { if(!html.isNull())//delete the empty Node disconnectDomNodeFromQuantaNode(html); newNode = html; insertNode = false; } - else if(str == "body" && ((node->tqparent && !node->tqparent->tqparent) || (node->tqparent && - node->tqparent->tqparent && !node->tqparent->tqparent->tqparent))) + else if(str == "body" && ((node->parent && !node->parent->parent) || (node->parent && + node->parent->parent && !node->parent->parent->parent))) { if(!body.isNull()) disconnectDomNodeFromQuantaNode(body); newNode = body; insertNode = false; } - else if(str == "head" && ((node->tqparent && !node->tqparent->tqparent) || (node->tqparent && - node->tqparent->tqparent && !node->tqparent->tqparent->tqparent))) + else if(str == "head" && ((node->parent && !node->parent->parent) || (node->parent && + node->parent->parent && !node->parent->parent->parent))) { if(!head.isNull()) disconnectDomNodeFromQuantaNode(head); newNode = head; insertNode = false; } - /** else if(node->tqparent->tag->str == "html")*/ + /** else if(node->parent->tag->str == "html")*/ else { if(node->tag->type == Tag::Text || node->tag->type == Tag::Empty) @@ -631,16 +631,16 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode) //- It is the last child of a BLOCK removeLeftWhitespaces = false; n = node; - tqparent = node->tqparent; - while(tqparent && tqparent->SFirstChild() == n) + parent = node->parent; + while(parent && parent->SFirstChild() == n) { - if(!kafkaCommon::isInline(tqparent->tag->name)) + if(!kafkaCommon::isInline(parent->tag->name)) { removeLeftWhitespaces = true; break; } - n = tqparent; - tqparent = tqparent->tqparent; + n = parent; + parent = parent->parent; } if(!removeLeftWhitespaces) { @@ -661,16 +661,16 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode) removeRightWhitespaces = false; n = node; - tqparent = node->tqparent; - while(tqparent && tqparent->SLastChild() == n) + parent = node->parent; + while(parent && parent->SLastChild() == n) { - if(!kafkaCommon::isInline(tqparent->tag->name)) + if(!kafkaCommon::isInline(parent->tag->name)) { removeRightWhitespaces = true; break; } - n = tqparent; - tqparent = tqparent->tqparent; + n = parent; + parent = parent->parent; } nodeValue = node->tag->tagStr(); @@ -714,11 +714,11 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode) break; } } - if(node->tqparent && node->tqparent->leafNode()) - parentNode = *node->tqparent->leafNode(); - else if(node->tqparent && !node->tqparent->leafNode()) + if(node->parent && node->parent->leafNode()) + parentNode = *node->parent->leafNode(); + else if(node->parent && !node->parent->leafNode()) { - //the tqparent tag was invalid and khtml refuse to insert it + //the parent tag was invalid and khtml refuse to insert it //so impossible to inser the current node disconnectDomNodeFromQuantaNode(newNode); if(node->rootNode()) @@ -774,8 +774,8 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode) } else { - if(node->tqparent && node->tqparent->leafNode()) - parentNode = *node->tqparent->leafNode(); + if(node->parent && node->parent->leafNode()) + parentNode = *node->parent->leafNode(); else parentNode = body; n = node; @@ -1697,13 +1697,13 @@ void KafkaDocument::translateNodeIntoQuantaCursorPosition(Node *node, int offset } } -bool KafkaDocument::insertDomNode(DOM::Node node, DOM::Node tqparent, +bool KafkaDocument::insertDomNode(DOM::Node node, DOM::Node parent, DOM::Node nextSibling, DOM::Node rootNode) { DOM::Node siblingNSpecial; //First insert the node - if(!kafkaCommon::insertDomNode(node, tqparent, nextSibling, rootNode)) + if(!kafkaCommon::insertDomNode(node, parent, nextSibling, rootNode)) return false; //Then unEnhance and reEnhance the nearest non special nodes so that everything's fine. @@ -1728,12 +1728,12 @@ bool KafkaDocument::insertDomNode(DOM::Node node, DOM::Node tqparent, bool KafkaDocument::removeDomNode(DOM::Node node) { - DOM::Node nextSiblingNSpecial, prevSiblingNSpecial, tqparent; + DOM::Node nextSiblingNSpecial, prevSiblingNSpecial, parent; //First remove the node prevSiblingNSpecial = getPrevSiblingNSpecial(node); nextSiblingNSpecial = getNextSiblingNSpecial(node); - tqparent = node.parentNode(); + parent = node.parentNode(); if(!kafkaCommon::removeDomNode(node)) return false; @@ -1748,8 +1748,8 @@ bool KafkaDocument::removeDomNode(DOM::Node node) mainEnhancer->postUnenhanceNode(nextSiblingNSpecial); mainEnhancer->postEnhanceNode(nextSiblingNSpecial); } - mainEnhancer->postUnenhanceNode(tqparent); - mainEnhancer->postEnhanceNode(tqparent); + mainEnhancer->postUnenhanceNode(parent); + mainEnhancer->postEnhanceNode(parent); return true; } @@ -2080,13 +2080,13 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC //If we are deleting a PHP Node which is embedded into a tag e.g. > //We must regenerate the tag string. - if(_node->tag->type == Tag::ScriptTag && _node->tqparent) + if(_node->tag->type == Tag::ScriptTag && _node->parent) { - _node->tqparent->tag->beginPos(bLine, bCol); - _node->tqparent->tag->endPos(eLine, eCol); + _node->parent->tag->beginPos(bLine, bCol); + _node->parent->tag->endPos(eLine, eCol); _node->tag->beginPos(bLine2, bCol2); if(QuantaCommon::isBetween(bLine2, bCol2, bLine, bCol, eLine,eCol) == 0) - _node->tqparent->tag->setCleanStrBuilt(false); + _node->parent->tag->setCleanStrBuilt(false); } if(_node->prev) @@ -2099,15 +2099,15 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC modif = new NodeModif(); modif->setType(NodeModif::NodeRemoved); modif->setLocation(kafkaCommon::getLocation(_node)); - if(_node->tqparent && _node->tqparent->child == _node) - _node->tqparent->child = _node->next; + if(_node->parent && _node->parent->child == _node) + _node->parent->child = _node->next; if(_node->prev) _node->prev->next = _node->next; if(_node->next) _node->next->prev = _node->prev; if(_node == baseNode) baseNode = _node->next; - _node->tqparent = 0L; + _node->parent = 0L; _node->prev = 0L; _node->next = 0L; _node->child = 0L; @@ -2131,8 +2131,8 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC hasClosingNode = false; //_node->removeAll = false; - if(_node->tqparent && _node->tqparent->child == _node) - _node->tqparent->child = _node->next; + if(_node->parent && _node->parent->child == _node) + _node->parent->child = _node->next; if(_node->next) _node->next->prev = _node->prev; if(_node->prev) @@ -2155,15 +2155,15 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC } else if(_node->child)// && !deleteChilds { - if(_node->tqparent && !_node->tqparent->child) - _node->tqparent->child = _node->child; + if(_node->parent && !_node->parent->child) + _node->parent->child = _node->child; if(_node->prev) _node->prev->next = _node->child; _tmpNode = _node->child; while(_tmpNode) { i++; - _tmpNode->tqparent = _node->tqparent; + _tmpNode->parent = _node->parent; n = _tmpNode; _tmpNode = _tmpNode->next; if(!_tmpNode) @@ -2181,7 +2181,7 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC disconnectDomNodeFromQuantaNode(*_node->rootNode()); if(_node->leafNode()) disconnectDomNodeFromQuantaNode(*_node->leafNode()); - _node->tqparent = 0L; + _node->parent = 0L; _nodeNext = _node->next; _node->next = 0L; _node->prev = 0L; @@ -2195,13 +2195,13 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC if(hasClosingNode) { //delete the closing Node if present - if(_node->tqparent && _node->tqparent->child == _node) - _node->tqparent->child = _node->next; + if(_node->parent && _node->parent->child == _node) + _node->parent->child = _node->next; if(_node->prev) _node->prev->next = _node->next; if(_node->next) _node->next->prev = _node->prev; - _node->tqparent = 0L; + _node->parent = 0L; _nodeNext = _node->next; _node->next = 0L; _node->prev = 0L; @@ -2221,13 +2221,13 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC modif = new NodeModif(); modif->setType(NodeModif::NodeRemoved); modif->setLocation(kafkaCommon::getLocation(_node)); - if(_node->tqparent && _node->tqparent->child == _node) - _node->tqparent->child = _node->next; + if(_node->parent && _node->parent->child == _node) + _node->parent->child = _node->next; if(_node->prev) _node->prev->next = _node->next; if(_node->next) _node->next->prev = _node->prev; - _node->tqparent = 0L; + _node->parent = 0L; _nodeNext = _node->next; _node->prev = 0L; _node->next = 0L; @@ -2251,13 +2251,13 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC void KafkaDocument::slotDomNodeIsAboutToBeMoved(DOM::Node domNode, DOM::Node newParent, DOM::Node before, NodeModifsSet* modifs) { - Node *node, *tqparent, *nextSibling, *closingNode; + Node *node, *parent, *nextSibling, *closingNode; if(domNode.isNull()) return; node = getNode(domNode); - tqparent = getNode(newParent); + parent = getNode(newParent); nextSibling = getNode(before); if(!node) @@ -2265,10 +2265,10 @@ void KafkaDocument::slotDomNodeIsAboutToBeMoved(DOM::Node domNode, DOM::Node new closingNode = node->getClosingNode(); - kafkaCommon::moveNode(node, tqparent, nextSibling, modifs, false); + kafkaCommon::moveNode(node, parent, nextSibling, modifs, false); if(closingNode) - kafkaCommon::moveNode(closingNode, tqparent, nextSibling, modifs, false); + kafkaCommon::moveNode(closingNode, parent, nextSibling, modifs, false); } diff --git a/quanta/parts/kafka/wkafkapart.h b/quanta/parts/kafka/wkafkapart.h index 3c0ca23c..bdab7ede 100644 --- a/quanta/parts/kafka/wkafkapart.h +++ b/quanta/parts/kafka/wkafkapart.h @@ -53,10 +53,10 @@ Q_OBJECT TQ_OBJECT public: /** Returns a reference to the KafkaDocument object */ - static KafkaDocument* const ref(TQWidget *tqparent = 0L, TQWidget *widgetParent = 0L, const char *name = 0L) + static KafkaDocument* const ref(TQWidget *parent = 0L, TQWidget *widgetParent = 0L, const char *name = 0L) { static KafkaDocument *m_ref; - if (!m_ref) m_ref = new KafkaDocument(tqparent, widgetParent, name); + if (!m_ref) m_ref = new KafkaDocument(parent, widgetParent, name); return m_ref; } @@ -161,7 +161,7 @@ public: * and thus make them its childs. Usefull when adding a Node on a selected range of Nodes. * It also create empty Nodes between Nodes. * @param domNode The Node returned is synchronized from this DOM::Node. - * @param nodeParent The tqparent Node of the Node returned. + * @param nodeParent The parent Node of the Node returned. * @param beginNode The new Node will be placed before or within _beginNode. * @param beginOffset NOT IMLEMENTED If set to 0 or -1, the new Node will be placed before _beginNode, * else _beginNode will be splitted at offset #beginOffset and the new Node will be placed @@ -309,12 +309,12 @@ public: * Insert a DOM::Node in the DOM::Node tree. It takes care to handle the exceptions and * to postEnhance (cf htmlenhancer.h) * @param node The node to insert. - * @param tqparent The new tqparent of node. If null, insert node at the top level. + * @param parent The new parent of node. If null, insert node at the top level. * @param nextSibling The new next sibling of node. If null, append node at the end of the child list. - * @param rootNode The root DOM::Node of the DOM::Node tree. Useful when no tqparent is provided. + * @param rootNode The root DOM::Node of the DOM::Node tree. Useful when no parent is provided. * @return Returns true if the operation was successfull. */ - bool insertDomNode(DOM::Node node, DOM::Node tqparent = DOM::Node(), + bool insertDomNode(DOM::Node node, DOM::Node parent = DOM::Node(), DOM::Node nextSibling = DOM::Node(), DOM::Node rootNode = DOM::Node()); @@ -369,7 +369,7 @@ public: /** * Prints in stdout the current Node tree + Node->DOM::Node->Node relationship. * @node The startNode - * @indent The number of little dots per tqparent relationship. + * @indent The number of little dots per parent relationship. */ void coutLinkTree(Node *node, int indent); @@ -433,7 +433,7 @@ public slots: /** * Called whenever a DOM::Node is moved. * @param domNode The DOM::Node to move. - * @param newParent The new tqparent DOM::Node of domNode. + * @param newParent The new parent DOM::Node of domNode. * @param before domNode will be inserted before before. * @param modifs The changes made are logged into modifs. */ @@ -460,7 +460,7 @@ private: /** * Create a KafkaWidget. */ - KafkaDocument(TQWidget *tqparent, TQWidget *widgetParent, const char *name); + KafkaDocument(TQWidget *parent, TQWidget *widgetParent, const char *name); TQMap decodedChars; TQMap encodedChars; diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp index bfac210f..3979bb8b 100644 --- a/quanta/parts/preview/whtmlpart.cpp +++ b/quanta/parts/preview/whtmlpart.cpp @@ -34,10 +34,10 @@ #include "resource.h" WHTMLPart::WHTMLPart(TQWidget *parentWidget, const char *widgetName, bool enableViewSource, - TQObject *tqparent, const char *name, GUIProfile prof) - : KHTMLPart(parentWidget, widgetName, tqparent, name, prof), m_contextMenu(0) + TQObject *parent, const char *name, GUIProfile prof) + : KHTMLPart(parentWidget, widgetName, parent, name, prof), m_contextMenu(0) { - //kdDebug(24000) << "WHTMLPart: " << parentWidget << " " << widgetName << " " << tqparent << " " << name << this << endl; + //kdDebug(24000) << "WHTMLPart: " << parentWidget << " " << widgetName << " " << parent << " " << name << this << endl; hpos = 0; // get settings from konq. KConfig konqConfig("konquerorrc"); @@ -150,12 +150,12 @@ bool WHTMLPart::forwardEnable() } KParts::ReadOnlyPart *WHTMLPart::createPart( TQWidget * parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const TQString &, TQString &, TQStringList &, const TQStringList &) { - //kdDebug(24000) << "Create WHTMLPart: " << parentWidget << " " << widgetName << " " << tqparent << " " << name << endl; - return new WHTMLPart(parentWidget, widgetName, m_enableViewSource, tqparent, name); + //kdDebug(24000) << "Create WHTMLPart: " << parentWidget << " " << widgetName << " " << parent << " " << name << endl; + return new WHTMLPart(parentWidget, widgetName, m_enableViewSource, parent, name); } bool WHTMLPart::eventFilter(TQObject *watched, TQEvent *e) diff --git a/quanta/parts/preview/whtmlpart.h b/quanta/parts/preview/whtmlpart.h index 91f88b1e..2ec05dfe 100644 --- a/quanta/parts/preview/whtmlpart.h +++ b/quanta/parts/preview/whtmlpart.h @@ -32,7 +32,7 @@ class WHTMLPart : public KHTMLPart { TQ_OBJECT public: WHTMLPart(TQWidget *parentWidget = 0, const char *widgetname = 0, bool enableViewSource = false, - TQObject *tqparent = 0, const char *name = 0, GUIProfile prof = DefaultGUI ); + TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI ); virtual ~WHTMLPart(); /** Specify the URL where the preview was started */ @@ -62,7 +62,7 @@ signals: protected: virtual void urlSelected( const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args = KParts::URLArgs()); virtual KParts::ReadOnlyPart *createPart( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const TQString &mimetype, TQString &serviceName, TQStringList &serviceTypes, const TQStringList ¶ms); diff --git a/quanta/plugins/quantaplugin.h b/quanta/plugins/quantaplugin.h index 969268da..e4c13822 100644 --- a/quanta/plugins/quantaplugin.h +++ b/quanta/plugins/quantaplugin.h @@ -123,7 +123,7 @@ protected: private: // Private attributes TQString m_standardName; KMdiToolViewAccessor* m_pluginToolView; - TQWidget *m_targetWidget; //this will be the tqparent, used only to make the plugin widget hidden until addWidget is called + TQWidget *m_targetWidget; //this will be the parent, used only to make the plugin widget hidden until addWidget is called }; #endif diff --git a/quanta/plugins/quantaplugininterface.cpp b/quanta/plugins/quantaplugininterface.cpp index 0c93d2ca..68d276bb 100644 --- a/quanta/plugins/quantaplugininterface.cpp +++ b/quanta/plugins/quantaplugininterface.cpp @@ -38,12 +38,12 @@ #include "resource.h" #include "quantacommon.h" -QuantaPluginInterface::QuantaPluginInterface(TQWidget *tqparent) +QuantaPluginInterface::QuantaPluginInterface(TQWidget *parent) { - m_parent = tqparent; + m_parent = parent; (void) new KAction( i18n( "Configure &Plugins..." ), 0, 0, this, TQT_SLOT( slotPluginsEdit() ), - ((KMainWindow*)tqparent)->actionCollection(), "configure_plugins" ); + ((KMainWindow*)parent)->actionCollection(), "configure_plugins" ); m_pluginMenu = 0L; // m_plugins.setAutoDelete(true); } diff --git a/quanta/plugins/quantaplugininterface.h b/quanta/plugins/quantaplugininterface.h index 6711e9e0..3e83846e 100644 --- a/quanta/plugins/quantaplugininterface.h +++ b/quanta/plugins/quantaplugininterface.h @@ -46,10 +46,10 @@ public: * the parameters are only used at the first call to create the class * */ - static QuantaPluginInterface* const ref(TQWidget *tqparent = 0L) + static QuantaPluginInterface* const ref(TQWidget *parent = 0L) { static QuantaPluginInterface *m_ref; - if (!m_ref) m_ref = new QuantaPluginInterface (tqparent); + if (!m_ref) m_ref = new QuantaPluginInterface (parent); return m_ref; } @@ -77,7 +77,7 @@ private: * If you need the class use QuantaPluginInterface::ref() for * construction and reference */ - QuantaPluginInterface(TQWidget *tqparent); + QuantaPluginInterface(TQWidget *parent); protected slots: /** slot for the menu: validate */ diff --git a/quanta/project/eventconfigurationdlg.cpp b/quanta/project/eventconfigurationdlg.cpp index d50eb1e0..3c4e0024 100644 --- a/quanta/project/eventconfigurationdlg.cpp +++ b/quanta/project/eventconfigurationdlg.cpp @@ -29,8 +29,8 @@ #include "eventeditordlg.h" #include "qpevents.h" -EventConfigurationDlg::EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* tqparent, const char* name, WFlags fl) -: EventConfigurationDlgS(tqparent,name,fl) +EventConfigurationDlg::EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl) +: EventConfigurationDlgS(parent,name,fl) { m_actionCollection = actionCollection; } diff --git a/quanta/project/eventconfigurationdlg.h b/quanta/project/eventconfigurationdlg.h index 0d8a305b..db1933f0 100644 --- a/quanta/project/eventconfigurationdlg.h +++ b/quanta/project/eventconfigurationdlg.h @@ -30,7 +30,7 @@ class EventConfigurationDlg : public EventConfigurationDlgS TQ_OBJECT public: - EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~EventConfigurationDlg(); void initEvents(EventActions *events); void saveEvents(TQDomDocument dom); diff --git a/quanta/project/eventeditordlg.cpp b/quanta/project/eventeditordlg.cpp index 1bba3655..ddd22837 100644 --- a/quanta/project/eventeditordlg.cpp +++ b/quanta/project/eventeditordlg.cpp @@ -35,8 +35,8 @@ extern TQString taskLeaderStr; extern TQString teamLeaderStr; extern TQString subprojectLeaderStr; -EventEditorDlg::EventEditorDlg(KActionCollection *actionCollection, TQWidget* tqparent, const char* name, WFlags fl) -: EventEditorDlgS(tqparent,name,fl) +EventEditorDlg::EventEditorDlg(KActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl) +: EventEditorDlgS(parent,name,fl) { m_actionCollection = actionCollection; eventCombo->insertStringList(QPEvents::ref()->eventNames()); diff --git a/quanta/project/eventeditordlg.h b/quanta/project/eventeditordlg.h index 73897b39..8cb4f10b 100644 --- a/quanta/project/eventeditordlg.h +++ b/quanta/project/eventeditordlg.h @@ -30,7 +30,7 @@ class EventEditorDlg : public EventEditorDlgS TQ_OBJECT public: - EventEditorDlg(KActionCollection *actionCollection, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + EventEditorDlg(KActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~EventEditorDlg(); void setEvent(const TQString &name); void setAction(const TQString &name); diff --git a/quanta/project/membereditdlg.cpp b/quanta/project/membereditdlg.cpp index 075f40c3..b7111b5b 100644 --- a/quanta/project/membereditdlg.cpp +++ b/quanta/project/membereditdlg.cpp @@ -38,8 +38,8 @@ TQString teamLeaderStr = I18N_NOOP("Team Leader"); TQString subprojectLeaderStr = I18N_NOOP("Subproject Leader"); -MemberEditDlg::MemberEditDlg(TQWidget *tqparent, const char *name) - : MemberEditDlgS(tqparent, name) +MemberEditDlg::MemberEditDlg(TQWidget *parent, const char *name) + : MemberEditDlgS(parent, name) { TQValueList *subprojects = Project::ref()->subprojects(); for (TQValueList::ConstIterator it = subprojects->constBegin(); it != subprojects->constEnd(); ++it) diff --git a/quanta/project/membereditdlg.h b/quanta/project/membereditdlg.h index c4173e91..2cecefb2 100644 --- a/quanta/project/membereditdlg.h +++ b/quanta/project/membereditdlg.h @@ -27,7 +27,7 @@ class MemberEditDlg : public MemberEditDlgS Q_OBJECT TQ_OBJECT public: - MemberEditDlg(TQWidget *tqparent = 0, const char *name = 0); + MemberEditDlg(TQWidget *parent = 0, const char *name = 0); ~MemberEditDlg(); void selectMember(const TQString &name); diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index 3cc29461..ebc16264 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -68,15 +68,15 @@ extern TQString taskLeaderStr; extern TQString teamLeaderStr; extern TQString subprojectLeaderStr; -Project::Project(KMainWindow *tqparent) +Project::Project(KMainWindow *parent) : TQObject() { d = new ProjectPrivate(this); connect(d, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); - d->m_mainWindow = tqparent; + d->m_mainWindow = parent; d->m_uploadDialog = 0L; keepPasswd = true; - d->initActions(tqparent->actionCollection()); + d->initActions(parent->actionCollection()); } Project::~Project() diff --git a/quanta/project/project.h b/quanta/project/project.h index 62b71889..8c25ccf9 100644 --- a/quanta/project/project.h +++ b/quanta/project/project.h @@ -64,10 +64,10 @@ public: * the parameter is only used at the first call to create the class * */ - static Project* const ref(KMainWindow *tqparent = 0L) + static Project* const ref(KMainWindow *parent = 0L) { static Project *m_ref; - if (!m_ref) m_ref = new Project(tqparent); + if (!m_ref) m_ref = new Project(parent); return m_ref; } @@ -212,7 +212,7 @@ private: * If you need the class use Project::ref() for * construction and reference */ - Project(KMainWindow *tqparent); + Project(KMainWindow *parent); ProjectPrivate *d; bool m_projectToolbarVisible; diff --git a/quanta/project/projectnewfinal.cpp b/quanta/project/projectnewfinal.cpp index 033df99e..05dd7cf4 100644 --- a/quanta/project/projectnewfinal.cpp +++ b/quanta/project/projectnewfinal.cpp @@ -26,8 +26,8 @@ #include "projectnewfinal.h" #include "projectnewfinal.moc" -ProjectNewFinal::ProjectNewFinal(TQWidget *tqparent, const char *name ) - : ProjectNewFinalS(tqparent,name) +ProjectNewFinal::ProjectNewFinal(TQWidget *parent, const char *name ) + : ProjectNewFinalS(parent,name) { imagelabel->setPixmap( UserIcon("wiznewprjfin") ); } diff --git a/quanta/project/projectnewfinal.h b/quanta/project/projectnewfinal.h index 578aaa47..67888701 100644 --- a/quanta/project/projectnewfinal.h +++ b/quanta/project/projectnewfinal.h @@ -28,7 +28,7 @@ class ProjectNewFinal : public ProjectNewFinalS { Q_OBJECT TQ_OBJECT public: - ProjectNewFinal(TQWidget *tqparent=0, const char *name=0); + ProjectNewFinal(TQWidget *parent=0, const char *name=0); ~ProjectNewFinal(); void setMargin(int); diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp index 565785d6..08a2cc7f 100644 --- a/quanta/project/projectnewgeneral.cpp +++ b/quanta/project/projectnewgeneral.cpp @@ -39,8 +39,8 @@ #include "quantacommon.h" #include "qextfileinfo.h" -ProjectNewGeneral::ProjectNewGeneral(TQWidget *tqparent, const char *name ) - : ProjectNewGeneralS(tqparent,name) +ProjectNewGeneral::ProjectNewGeneral(TQWidget *parent, const char *name ) + : ProjectNewGeneralS(parent,name) { imagelabel->setPixmap( UserIcon("wiznewprjglb") ); linePrjName->setFocus(); diff --git a/quanta/project/projectnewgeneral.h b/quanta/project/projectnewgeneral.h index 21c594f3..450183d2 100644 --- a/quanta/project/projectnewgeneral.h +++ b/quanta/project/projectnewgeneral.h @@ -30,7 +30,7 @@ class ProjectNewGeneral : public ProjectNewGeneralS { Q_OBJECT TQ_OBJECT public: - ProjectNewGeneral(TQWidget *tqparent=0, const char *name=0); + ProjectNewGeneral(TQWidget *parent=0, const char *name=0); ~ProjectNewGeneral(); TQString type(); diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp index 9c81cb51..47661767 100644 --- a/quanta/project/projectnewlocal.cpp +++ b/quanta/project/projectnewlocal.cpp @@ -45,8 +45,8 @@ #include "resource.h" #include "quantacommon.h" -ProjectNewLocal::ProjectNewLocal(TQWidget *tqparent, const char *name ) - : ProjectNewLocalS(tqparent,name) +ProjectNewLocal::ProjectNewLocal(TQWidget *parent, const char *name ) + : ProjectNewLocalS(parent,name) { imagelabel->setPixmap( UserIcon("wiznewprjloc") ); @@ -55,7 +55,7 @@ ProjectNewLocal::ProjectNewLocal(TQWidget *tqparent, const char *name ) listView->removeColumn(2); listView->removeColumn(2); - tqmask->setText("*"); + mask->setText("*"); checkInsertWeb->setChecked( true ); @@ -116,13 +116,13 @@ KURL::List ProjectNewLocal::projectFiles() !baseURL.path().endsWith("/") || !checkInsert->isChecked() ) return list; - TQString ftqmask = "*"; + TQString fmask = "*"; if ( checkInsertWeb->isChecked() ) { KMimeType::List list = KMimeType::allMimeTypes(); KMimeType::List::iterator it; TQString name; - ftqmask = ""; + fmask = ""; for ( it = list.begin(); it != list.end(); ++it ) { name = (*it)->name(); @@ -133,16 +133,16 @@ KURL::List ProjectNewLocal::projectFiles() TQStringList patterns = (*it)->patterns(); for (uint i = 0 ; i < patterns.count(); i++) { - ftqmask = ftqmask+patterns[i]+" "; + fmask = fmask+patterns[i]+" "; } } } } else { - ftqmask = tqmask->text(); + fmask = mask->text(); } - list = QExtFileInfo::allFilesRelative(baseURL, ftqmask, this, false); + list = QExtFileInfo::allFilesRelative(baseURL, fmask, this, false); return list; } diff --git a/quanta/project/projectnewlocal.h b/quanta/project/projectnewlocal.h index b1a984c9..4e3fd6d5 100644 --- a/quanta/project/projectnewlocal.h +++ b/quanta/project/projectnewlocal.h @@ -32,7 +32,7 @@ class ProjectNewLocal : public ProjectNewLocalS { Q_OBJECT TQ_OBJECT public: - ProjectNewLocal(TQWidget *tqparent=0, const char *name=0); + ProjectNewLocal(TQWidget *parent=0, const char *name=0); ~ProjectNewLocal(); KURL::List files(); diff --git a/quanta/project/projectnewlocals.ui b/quanta/project/projectnewlocals.ui index 56ca7775..5b737924 100644 --- a/quanta/project/projectnewlocals.ui +++ b/quanta/project/projectnewlocals.ui @@ -156,12 +156,12 @@ checkInsertWithMask - Insert files with the following &tqmask: + Insert files with the following &mask: - tqmask + mask false @@ -319,7 +319,7 @@ checkInsertWithMask toggled(bool) - tqmask + mask setEnabled(bool) @@ -332,7 +332,7 @@ checkInsert checkInsertWeb - tqmask + mask addFiles addFolder clearList diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp index f4d4d765..a087497c 100644 --- a/quanta/project/projectnewweb.cpp +++ b/quanta/project/projectnewweb.cpp @@ -38,8 +38,8 @@ #include "quantacommon.h" #include "uploadtreeview.h" -ProjectNewWeb::ProjectNewWeb(TQWidget *tqparent, const char *name ) - : ProjectNewWebS(tqparent,name) +ProjectNewWeb::ProjectNewWeb(TQWidget *parent, const char *name ) + : ProjectNewWebS(parent,name) { button->setEnabled(false); siteUrl->setFocus(); @@ -126,7 +126,7 @@ void ProjectNewWeb::slotStart() { start = true; button->setText( i18n("Stop") ); - emit enableNextButton((TQWidget *)this->tqparent(),false); + emit enableNextButton((TQWidget *)this->parent(),false); } else { KMessageBox::error(this, i18n("There was an error while trying to run the \"wget\" application.\ @@ -138,14 +138,14 @@ void ProjectNewWeb::slotStart() KMessageBox::sorry(this,i18n("This feature is available only if the project lies on a local disk.")); start = false; button->setText( i18n("Start") ); - emit enableNextButton((TQWidget *)this->tqparent(),true); + emit enableNextButton((TQWidget *)this->parent(),true); } } else { QuantaCommon::dirCreationError(this, baseURL); start = false; button->setText( i18n("Start") ); - emit enableNextButton((TQWidget *)this->tqparent(),true); + emit enableNextButton((TQWidget *)this->parent(),true); } } else { @@ -155,7 +155,7 @@ void ProjectNewWeb::slotStart() start = false; button->setText( i18n("Start") ); - emit enableNextButton((TQWidget *)this->tqparent(),true); + emit enableNextButton((TQWidget *)this->parent(),true); } } @@ -166,7 +166,7 @@ void ProjectNewWeb::slotGetWgetExited(KProcess*) start = false; button->setText( i18n("Start") ); emit messages(i18n("wget finished...\n")); - emit enableNextButton((TQWidget *)this->tqparent(),true); + emit enableNextButton((TQWidget *)this->parent(),true); } void ProjectNewWeb::slotGetWgetOutput(KProcess *, char *buffer, int buflen) diff --git a/quanta/project/projectnewweb.h b/quanta/project/projectnewweb.h index 4e9c7088..596d1fe4 100644 --- a/quanta/project/projectnewweb.h +++ b/quanta/project/projectnewweb.h @@ -36,7 +36,7 @@ class ProjectNewWeb : public ProjectNewWebS { Q_OBJECT TQ_OBJECT public: - ProjectNewWeb(TQWidget *tqparent=0, const char *name=0); + ProjectNewWeb(TQWidget *parent=0, const char *name=0); ~ProjectNewWeb(); public slots: diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index aee0dbec..52879849 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -65,7 +65,7 @@ ProjectPrivate::ProjectPrivate(Project *p) : TQObject(), config(0L), m_dirWatch(0L), tempFile(0L), sessionTempFile(0L) { - tqparent = p; + parent = p; m_projectFiles.setAutoDelete(true); m_showUploadTreeviews = true; m_eventsEnabled = true; @@ -90,7 +90,7 @@ void ProjectPrivate::initActions(KActionCollection *ac) this, TQT_SLOT( slotOpenProject() ), ac, "project_open" ); m_projectRecent = - KStdAction::openRecent(tqparent, TQT_SLOT(slotOpenProject(const KURL&)), + KStdAction::openRecent(parent, TQT_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent"); m_projectRecent->setText(i18n("Open Recent Project")); m_projectRecent->setIcon("project_open"); @@ -131,15 +131,15 @@ void ProjectPrivate::initActions(KActionCollection *ac) ac, "project_insert_directory" ); rescanPrjDirAction = new KAction( i18n( "&Rescan Project Folder..." ), "reload", 0, - tqparent, TQT_SLOT( slotRescanPrjDir() ), + parent, TQT_SLOT( slotRescanPrjDir() ), ac, "project_rescan" ); uploadProjectAction = new KAction( i18n( "&Upload Project..." ), "up", Key_F8, - tqparent, TQT_SLOT( slotUpload() ), + parent, TQT_SLOT( slotUpload() ), ac, "project_upload" ); projectOptionAction = new KAction( i18n( "&Project Properties" ), "configure", SHIFT + Key_F7, - tqparent, TQT_SLOT( slotOptions() ), + parent, TQT_SLOT( slotOptions() ), ac, "project_options" ); saveAsProjectTemplateAction = @@ -157,7 +157,7 @@ void ProjectPrivate::initActions(KActionCollection *ac) void ProjectPrivate::adjustActions() { - bool projectExists = tqparent->hasProject(); + bool projectExists = parent->hasProject(); closeprjAction->setEnabled(projectExists); openPrjViewAction->setEnabled(projectExists); savePrjViewAction->setEnabled(projectExists); @@ -173,7 +173,7 @@ void ProjectPrivate::adjustActions() saveSelectionAsProjectTemplateAction->setEnabled(projectExists); adjustViewActions(); - tqparent->slotShowProjectToolbar(projectExists); + parent->slotShowProjectToolbar(projectExists); } @@ -263,19 +263,19 @@ void ProjectPrivate::openCurrentView() } else { if (el2.nodeName() == "viewtoolbar") { - tqparent->loadToolbarFile(url); + parent->loadToolbarFile(url); } } } // first we open what we want, might be that a wanted file is already open! - tqparent->openFiles(urlsToOpen, m_defaultEncoding); + parent->openFiles(urlsToOpen, m_defaultEncoding); // second we close what we don't want KURL::List openURLs = ViewManager::ref()->openedFiles(true); // get open urls KURL::List::Iterator it; for ( it = openURLs.begin(); it != openURLs.end(); ++it ) { if (urlsInView.findIndex( *it ) == -1) - tqparent->closeFile (*it); + parent->closeFile (*it); } break; } @@ -299,7 +299,7 @@ void ProjectPrivate::insertFiles( KURL::List files ) { TQDomElement el; TQDomNodeList nl = dom.elementsByTagName("item"); - tqparent->statusMsg( i18n("Adding files to the project...") ); + parent->statusMsg( i18n("Adding files to the project...") ); progressBar->setTotalSteps(2 * files.count() - 2); progressBar->setValue(0); progressBar->setTextEnabled(true); @@ -350,19 +350,19 @@ void ProjectPrivate::insertFiles( KURL::List files ) progressBar->setValue(0); progressBar->setTextEnabled(false); - tqparent->reloadTree(&(m_projectFiles), false, TQStringList()); - tqparent->newtqStatus(); - tqparent->statusMsg(TQString()); + parent->reloadTree(&(m_projectFiles), false, TQStringList()); + parent->newtqStatus(); + parent->statusMsg(TQString()); } /** insert files from dir recursive */ -void ProjectPrivate::insertFiles(const KURL& pathURL, const TQString& tqmask ) +void ProjectPrivate::insertFiles(const KURL& pathURL, const TQString& mask ) { KURL::List list; list.append(pathURL); - list += QExtFileInfo::allFiles(pathURL, tqmask, m_mainWindow); + list += QExtFileInfo::allFiles(pathURL, mask, m_mainWindow); insertFiles(list); } @@ -371,7 +371,7 @@ void ProjectPrivate::loadProjectXML() { //TODO: Optimize reading. For example iterate through all the nodes and handle them //according to the found node type - tqparent->statusMsg( i18n("Reading the project file...") ); + parent->statusMsg( i18n("Reading the project file...") ); TQDomNode no; TQDomElement el; KURL url; @@ -380,7 +380,7 @@ void ProjectPrivate::loadProjectXML() if ( projectNode.isNull() || projectName.isEmpty() ) { - tqparent->hideSplash(); + parent->hideSplash(); KMessageBox::sorry(m_mainWindow, i18n("Invalid project file.") ); adjustActions(); return; @@ -696,10 +696,10 @@ void ProjectPrivate::loadProjectXML() } - tqparent->statusMsg(TQString()); - tqparent->newProjectLoaded(projectName, baseURL, templateURL); - tqparent->reloadTree(&(m_projectFiles), true, treeStatusFromXML()); - tqparent->newtqStatus(); + parent->statusMsg(TQString()); + parent->newProjectLoaded(projectName, baseURL, templateURL); + parent->reloadTree(&(m_projectFiles), true, treeStatusFromXML()); + parent->newtqStatus(); adjustActions(); } @@ -723,7 +723,7 @@ void ProjectPrivate::slotAcceptCreateProject() /* it is important to set the fields only if there is some input otherwise you set them to an empty string and the treeview will - not recognize it as tqparent url because: + not recognize it as parent url because: TQString::Null != "" */ if (!png->lineHost->text().isEmpty()) @@ -806,7 +806,7 @@ void ProjectPrivate::slotAcceptCreateProject() { KURL url; QuantaCommon::setUrl(url, qConfig.globalDataDir + resourceDir + "templates/"); - tqparent->slotAddDirectory(url, false); + parent->slotAddDirectory(url, false); QuantaCommon::setUrl(templateURL, "templates/"); createTemplateDir = false; } @@ -814,7 +814,7 @@ void ProjectPrivate::slotAcceptCreateProject() { KURL url; QuantaCommon::setUrl(url, locateLocal("data", resourceDir + "templates/")); - tqparent->slotAddDirectory(url, false); + parent->slotAddDirectory(url, false); QuantaCommon::setUrl(templateURL, "templates/"); createTemplateDir = false; } @@ -890,7 +890,7 @@ void ProjectPrivate::slotDeleteProjectView(const TQString &view) node.parentNode().removeChild(node); if (currentProjectView == view) currentProjectView = ""; - tqparent->setModified(); + parent->setModified(); adjustViewActions(); break; } @@ -945,7 +945,7 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName) } KURL::List toolbarList; - tqparent->getUserToolbarFiles(&toolbarList); + parent->getUserToolbarFiles(&toolbarList); for (uint i =0 ; i < toolbarList.count(); i++) { item = dom.createElement("viewtoolbar"); @@ -956,7 +956,7 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName) } dom.firstChild().firstChild().appendChild( el ); - tqparent->setModified(); + parent->setModified(); adjustViewActions(); } @@ -1055,7 +1055,7 @@ bool ProjectPrivate::createEmptyDom() if (!result) { - tqparent->hideSplash(); + parent->hideSplash(); KMessageBox::sorry(m_mainWindow, i18n("Cannot open file %1 for writing.").tqarg(projectURL.prettyURL(0, KURL::StripFileProtocol))); delete tempFile; tempFile = 0L; @@ -1099,7 +1099,7 @@ void ProjectPrivate::getStatusFromTree() i--; } TQStringList folderList; - tqparent->getTreetqStatus( &folderList ); + parent->getTreetqStatus( &folderList ); // toplevel folder is always open in a project and QExtFileInfo::toRelative // creates strange output -> we remove the toplevel folder if (folderList.count() > 0) @@ -1159,9 +1159,9 @@ void ProjectPrivate::slotNewProject() connect(wiz, TQT_SIGNAL(helpClicked()), TQT_SLOT(slotNewProjectHelpClicked())); connect( pnw, TQT_SIGNAL(enableMessagesWidget()), - tqparent, TQT_SIGNAL(enableMessageWidget())); + parent, TQT_SIGNAL(enableMessageWidget())); connect( pnw, TQT_SIGNAL(messages(const TQString&)), - tqparent, TQT_SLOT (slotGetMessages(const TQString&))); + parent, TQT_SLOT (slotGetMessages(const TQString&))); connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), wiz, TQT_SLOT(setNextEnabled(TQWidget*,bool))); connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), @@ -1197,15 +1197,15 @@ void ProjectPrivate::slotNewProject() delete wiz; adjustActions(); - tqparent->newtqStatus(); + parent->newtqStatus(); } /** close project and edited files */ void ProjectPrivate::slotCloseProject() { - if (!tqparent->hasProject()) return; + if (!parent->hasProject()) return; connect(ViewManager::ref(), TQT_SIGNAL(filesClosed(bool)), this, TQT_SLOT(slotProceedWithCloseProject(bool))); - tqparent->closeFiles(); + parent->closeFiles(); } void ProjectPrivate::slotProceedWithCloseProject(bool success) @@ -1226,11 +1226,11 @@ void ProjectPrivate::slotProceedWithCloseProject(bool success) config->setGroup("Projects"); config->writePathEntry("Last Project", TQString()); init(); - tqparent->newProjectLoaded(projectName, baseURL, templateURL); - tqparent->reloadTree( &(m_projectFiles), true, TQStringList()); + parent->newProjectLoaded(projectName, baseURL, templateURL); + parent->reloadTree( &(m_projectFiles), true, TQStringList()); adjustActions(); m_projectRecent->setCurrentItem(-1); - tqparent->newtqStatus(); + parent->newtqStatus(); kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); } @@ -1252,7 +1252,7 @@ void ProjectPrivate::slotOpenProject() /* save project file */ bool ProjectPrivate::saveProject() { - if ( !tqparent->hasProject() ) return false; + if ( !parent->hasProject() ) return false; bool result = true; // remove old opened files TQDomElement el; @@ -1284,10 +1284,10 @@ bool ProjectPrivate::saveProject() f.close(); } m_modified = false; - tqparent->statusMsg(i18n( "Wrote project file %1" ).tqarg(m_tmpProjectFile)); + parent->statusMsg(i18n( "Wrote project file %1" ).tqarg(m_tmpProjectFile)); } else { - tqparent->hideSplash(); + parent->hideSplash(); KMessageBox::error(m_mainWindow, i18n("Cannot open the file %1 for writing.").tqarg(m_tmpProjectFile)); result = false; } @@ -1338,7 +1338,7 @@ void ProjectPrivate::loadProjectFromTemp(const KURL &url, const TQString &tempFi writeConfig(); } else { - tqparent->hideSplash(); + parent->hideSplash(); KMessageBox::error(m_mainWindow, i18n("Cannot open the file %1 for reading.").tqarg(tempFile)); } } @@ -1350,13 +1350,13 @@ bool ProjectPrivate::loadProject(const KURL &url) return true; if (!url.isValid()) { - tqparent->hideSplash(); + parent->hideSplash(); KMessageBox::sorry(m_mainWindow, i18n("Malformed URL: %1").tqarg(url.prettyURL())); return false; } if ( projectAlreadyOpen(url.url()) ) { - tqparent->hideSplash(); + parent->hideSplash(); if (KMessageBox::warningContinueCancel(m_mainWindow, i18n("The project
%1
seems to be used by another Quanta instance.
You may end up with data loss if you open the same project in two instances, modify and save them in both.

Do you want to proceed with open?").tqarg(url.prettyURL()), TQString(), KStdGuiItem::open()) == KMessageBox::Cancel) return false; } @@ -1367,7 +1367,7 @@ bool ProjectPrivate::loadProject(const KURL &url) if (KIO::NetAccess::exists(url, false, m_mainWindow) && KIO::NetAccess::download(url, projectTmpFile, m_mainWindow)) { - if (tqparent->hasProject()) + if (parent->hasProject()) { slotCloseProject(); } @@ -1415,7 +1415,7 @@ bool ProjectPrivate::loadProject(const KURL &url) loadProjectFromTemp(url, projectTmpFile, sessionTmpFile); } else { - tqparent->hideSplash(); + parent->hideSplash(); KMessageBox::error(m_mainWindow, i18n("Cannot access the project file %1.").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); return false; } @@ -1448,7 +1448,7 @@ void ProjectPrivate::slotAddFiles() CopyTo *dlg = new CopyTo( baseURL); connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo*)), TQT_SLOT (slotDeleteCopytoDlg(CopyTo*))); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), tqparent, + connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), parent, TQT_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); list = dlg->copy( list, destination ); return; @@ -1470,7 +1470,7 @@ void ProjectPrivate::slotAddFiles() } } - tqparent->reloadTree( &(m_projectFiles), false, TQStringList()); + parent->reloadTree( &(m_projectFiles), false, TQStringList()); } } @@ -1487,7 +1487,7 @@ void ProjectPrivate::slotAddDirectory() KURL url = KURL(); url = KFileDialog::getExistingURL(baseURL.prettyURL(), m_mainWindow, i18n("Insert Folder in Project")); - tqparent->slotAddDirectory(url); + parent->slotAddDirectory(url); } @@ -1531,7 +1531,7 @@ void ProjectPrivate::slotDebuggerOptions() } else { - tqparent->hideSplash(); + parent->hideSplash(); KMessageBox::error(NULL, i18n("Unable to load the debugger plugin, error code %1 was returned: %2.").tqarg(errCode).tqarg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); } } @@ -1639,7 +1639,7 @@ bool ProjectPrivate::uploadProjectFile() { removeFromConfig(projectURL.url()); // remove the project from the list of open projects if (quantaApp) - tqparent->statusMsg(i18n( "Uploaded project file %1" ).tqarg( projectURL.prettyURL())); + parent->statusMsg(i18n( "Uploaded project file %1" ).tqarg( projectURL.prettyURL())); // delete all temp files we used // first the one from creating a new project delete tempFile; @@ -1659,7 +1659,7 @@ bool ProjectPrivate::uploadProjectFile() { if (quantaApp) { - tqparent->statusMsg(TQString() ); + parent->statusMsg(TQString() ); KMessageBox::error(m_mainWindow, KIO::NetAccess::lastErrorString()); } return false; diff --git a/quanta/project/projectprivate.h b/quanta/project/projectprivate.h index 6c5adf12..d3eeec0b 100644 --- a/quanta/project/projectprivate.h +++ b/quanta/project/projectprivate.h @@ -57,7 +57,7 @@ public: ~ProjectPrivate(); - Project *tqparent; + Project *parent; /** Point to the .webprj file */ KURL projectURL; TQString projectName; @@ -148,7 +148,7 @@ upload.*/ void insertFiles( KURL::List files ); /** insert files from dir recursive */ - void insertFiles(const KURL& pathURL, const TQString& tqmask ); + void insertFiles(const KURL& pathURL, const TQString& mask ); void loadProjectXML(); diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp index dbd21dbf..ba267753 100644 --- a/quanta/project/projectupload.cpp +++ b/quanta/project/projectupload.cpp @@ -800,10 +800,10 @@ void ProjectUpload::loadRemoteUploadInfo() void ProjectUpload::saveRemoteUploadInfo() { - TQDomNode tqparent = m_currentProfileElement.parentNode(); + TQDomNode parent = m_currentProfileElement.parentNode(); TQDomNode profileNode = m_currentProfileElement.cloneNode(false); - tqparent.removeChild(m_currentProfileElement); - tqparent.appendChild(profileNode); + parent.removeChild(m_currentProfileElement); + parent.appendChild(profileNode); TQMap::ConstIterator it; for (it = m_uploadTimeList.constBegin(); it != m_uploadTimeList.constEnd(); ++it) { diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp index 2b4cc8e4..9904cdf2 100644 --- a/quanta/project/rescanprj.cpp +++ b/quanta/project/rescanprj.cpp @@ -40,8 +40,8 @@ RescanPrj::RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, const TQRegExp &p_excludeRx, - TQWidget *tqparent, const char *name, bool modal ) - : RescanPrjDir(tqparent,name,modal) + TQWidget *parent, const char *name, bool modal ) + : RescanPrjDir(parent,name,modal) { setCaption(name); diff --git a/quanta/project/rescanprj.h b/quanta/project/rescanprj.h index 39a03bb0..0f0df657 100644 --- a/quanta/project/rescanprj.h +++ b/quanta/project/rescanprj.h @@ -37,7 +37,7 @@ class RescanPrj : public RescanPrjDir { TQ_OBJECT public: RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, const TQRegExp &p_excludeRx, - TQWidget *tqparent=0, const char *name=0, bool modal = true); + TQWidget *parent=0, const char *name=0, bool modal = true); ~RescanPrj(); public slots: diff --git a/quanta/project/teammembersdlg.cpp b/quanta/project/teammembersdlg.cpp index f2fe6ad2..6d4ffa69 100644 --- a/quanta/project/teammembersdlg.cpp +++ b/quanta/project/teammembersdlg.cpp @@ -42,8 +42,8 @@ extern TQString taskLeaderStr; extern TQString teamLeaderStr; extern TQString subprojectLeaderStr; -TeamMembersDlg::TeamMembersDlg(TQWidget *tqparent, const char *name) - : TeamMembersDlgS(tqparent, name) +TeamMembersDlg::TeamMembersDlg(TQWidget *parent, const char *name) + : TeamMembersDlgS(parent, name) { m_yourself = ""; } diff --git a/quanta/project/teammembersdlg.h b/quanta/project/teammembersdlg.h index 2884fb1c..9a97ac0a 100644 --- a/quanta/project/teammembersdlg.h +++ b/quanta/project/teammembersdlg.h @@ -27,7 +27,7 @@ class TeamMembersDlg : public TeamMembersDlgS Q_OBJECT TQ_OBJECT public: - TeamMembersDlg(TQWidget *tqparent = 0, const char *name = 0); + TeamMembersDlg(TQWidget *parent = 0, const char *name = 0); ~TeamMembersDlg(); void setYourself(const TQString &name); diff --git a/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi index 19542589..b6b4ee96 100644 --- a/quanta/quanta_uml.xmi +++ b/quanta/quanta_uml.xmi @@ -13,7 +13,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -238,7 +238,7 @@ - + @@ -420,7 +420,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -621,14 +621,14 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + - + @@ -866,7 +866,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1001,7 +1001,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1017,7 +1017,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1074,7 +1074,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1089,7 +1089,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1128,12 +1128,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + - + @@ -1151,12 +1151,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + - + @@ -1169,13 +1169,13 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + - + @@ -1195,12 +1195,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + - + @@ -1223,7 +1223,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1256,7 +1256,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1265,7 +1265,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1276,7 +1276,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1319,7 +1319,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1366,13 +1366,13 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + - + @@ -1392,7 +1392,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1420,17 +1420,17 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + - + - + @@ -1438,7 +1438,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1459,11 +1459,11 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + - + @@ -1494,7 +1494,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1537,7 +1537,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1561,7 +1561,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1574,7 +1574,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1587,7 +1587,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1597,7 +1597,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1611,7 +1611,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1628,7 +1628,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1690,7 +1690,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1721,7 +1721,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1769,7 +1769,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1790,7 +1790,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1798,12 +1798,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + - + @@ -2689,7 +2689,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index 4e715a4a..b2663e27 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -93,8 +93,8 @@ extern GroupElementMapList globalGroupMap; Document::Document(KTextEditor::Document *doc, - TQWidget *tqparent, const char *name, WFlags f ) - : TQWidget(tqparent, name, f) + TQWidget *parent, const char *name, WFlags f ) + : TQWidget(parent, name, f) { m_dirty = false; busy = false; @@ -102,7 +102,7 @@ Document::Document(KTextEditor::Document *doc, m_md5sum = ""; m_doc = doc; m_view = 0L; //needed, because createView() calls processEvents() and the "this" may be deleted before m_view gets a value => crash on delete m_view; - m_view = m_doc->createView(tqparent, 0L); + m_view = m_doc->createView(parent, 0L); completionInProgress = false; argHintVisible = false; completionRequested = false; @@ -978,9 +978,9 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string) if (string == "/" && s.endsWith("nodeAt(line, column, false); - if (node && node->tqparent ) + if (node && node->parent ) { - node = node->tqparent; + node = node->parent; if (node->tag->type == Tag::XmlTag && (!node->next || !QuantaCommon::closesTag(node->tag, node->next->tag))) { TQString name = node->tag->name; @@ -1135,7 +1135,7 @@ TQValueList* Document::getGroupCompletions(Node *n Node *n = node; while (n && n != elementList[i]->parentNode) { - n = n->tqparent; + n = n->parent; } if (n == elementList[i]->parentNode) { @@ -1205,12 +1205,12 @@ TQValueList* Document::getTagCompletions(int line, } Node *node = parser->nodeAt(line, col); if (node && node->tag->type != Tag::XmlTag) - node = node->tqparent; + node = node->parent; if (node && node->tag->type != Tag::XmlTag) node = 0L; TQTag *parentTQTag= 0L; - if (node && node->tqparent) - parentTQTag = QuantaCommon::tagFromDTD(node->tqparent); + if (node && node->parent) + parentTQTag = QuantaCommon::tagFromDTD(node->parent); TQString textLine = editIf->textLine(line).left(col); TQString word = findWordRev(textLine, completionDTD).upper(); TQString classStr = ""; @@ -1260,7 +1260,7 @@ TQValueList* Document::getTagCompletions(int line, it = n->m_groupElements.erase(it); } delete gParser; - n = n->tqparent; + n = n->parent; } } else { @@ -1759,8 +1759,8 @@ bool Document::scriptAutoCompletion(int line, int column, const TQString& insert if (node->prev) node = node->prev; else - if (node->tqparent) - node = node->tqparent; + if (node->parent) + node = node->parent; int bl, bc; node->tag->beginPos(bl, bc); diff --git a/quanta/src/document.h b/quanta/src/document.h index 360b9a4c..ff76fbb3 100644 --- a/quanta/src/document.h +++ b/quanta/src/document.h @@ -72,7 +72,7 @@ class Document : public TQWidget{ public: Document(KTextEditor::Document *doc, - TQWidget *tqparent = 0, const char *name = 0, WFlags f=0); + TQWidget *parent = 0, const char *name = 0, WFlags f=0); ~Document(); KURL url(); diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp index 7b26bc7a..abf0a292 100644 --- a/quanta/src/dtds.cpp +++ b/quanta/src/dtds.cpp @@ -56,12 +56,12 @@ const TQString m_rcFilename("description.rc"); This constructor reads the dictionary of known dtd's, the attributes and tags will be loaded on the first access to one dtd. */ -DTDs::DTDs(TQObject *tqparent) - :TQObject(tqparent) +DTDs::DTDs(TQObject *parent) + :TQObject(parent) { - connect(this, TQT_SIGNAL(hideSplash()), tqparent, TQT_SLOT(slotHideSplash())); - connect(this, TQT_SIGNAL(enableIdleTimer(bool)), tqparent, TQT_SLOT(slotEnableIdleTimer(bool))); - connect(this, TQT_SIGNAL(loadToolbarForDTD(const TQString&)), tqparent, TQT_SLOT(slotLoadToolbarForDTD(const TQString&))); + connect(this, TQT_SIGNAL(hideSplash()), parent, TQT_SLOT(slotHideSplash())); + connect(this, TQT_SIGNAL(enableIdleTimer(bool)), parent, TQT_SLOT(slotEnableIdleTimer(bool))); + connect(this, TQT_SIGNAL(loadToolbarForDTD(const TQString&)), parent, TQT_SLOT(slotLoadToolbarForDTD(const TQString&))); // kdDebug(24000) << "dtds::dtds" << endl; m_dict = new TQDict(119, false); //optimized for max 119 DTD. This should be enough. m_dict->setAutoDelete(true); @@ -620,8 +620,8 @@ void DTDs::resolveInherited (DTDStruct *dtd) //Resolve the inheritence if (!dtd->inheritsTagsFrom.isEmpty()) { - DTDStruct *tqparent = (DTDStruct *) find(dtd->inheritsTagsFrom); // this loads the dtd, if not present in memory - TQDictIterator tag_it(*(tqparent->tagsList)); + DTDStruct *parent = (DTDStruct *) find(dtd->inheritsTagsFrom); // this loads the dtd, if not present in memory + TQDictIterator tag_it(*(parent->tagsList)); for ( ; tag_it.current(); ++tag_it) { TQTag *tag = tag_it.current(); diff --git a/quanta/src/dtds.h b/quanta/src/dtds.h index 0ecf30cb..4bc5f2f4 100644 --- a/quanta/src/dtds.h +++ b/quanta/src/dtds.h @@ -57,10 +57,10 @@ public: * since this class is a singleton you must use this function to access it * @return the class pointer */ - static DTDs* ref(TQObject *tqparent = 0L) + static DTDs* ref(TQObject *parent = 0L) { static DTDs *m_ref; - if (!m_ref) m_ref = new DTDs(tqparent); + if (!m_ref) m_ref = new DTDs(parent); return m_ref; } @@ -179,7 +179,7 @@ private: * If you need the class use DTDs::ref() for * construction and reference */ - DTDs(TQObject *tqparent); + DTDs(TQObject *parent); /** Reads the tag files and the description.rc from tagDir in order to diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index 27391537..11747dee 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -1781,7 +1781,7 @@ void QuantaApp::slotShowAnnotationView() makeDockVisible(dynamic_cast(m_annotationOutputView->wrapperWidget())); } -TQWidget* QuantaApp::createContainer( TQWidget *tqparent, int index, const TQDomElement &element, int &id ) +TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id ) { TQString tabname = element.attribute( "i18ntabname", "" ); @@ -1822,18 +1822,18 @@ TQWidget* QuantaApp::createContainer( TQWidget *tqparent, int index, const TQDom return tb; } - return KMainWindow::createContainer( tqparent, index, element, id ); + return KMainWindow::createContainer( parent, index, element, id ); } -void QuantaApp::removeContainer( TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id ) +void QuantaApp::removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id ) { if (dynamic_cast(container)) { ToolbarTabWidget::ref()->removePage(container); } else - KMainWindow::removeContainer( container, tqparent, element, id ); + KMainWindow::removeContainer( container, parent, element, id ); } void QuantaApp::slotBack() @@ -4442,21 +4442,21 @@ void QuantaApp::slotInsertCSS() if (styleNode->tag->type == Tag::XmlTagEnd && styleNode->prev) styleNode = styleNode->prev; - while (styleNode && styleNode->tqparent && styleNode->tag->name.lower() != "style" && styleNode->tag->dtd()->name == "text/css") - styleNode = styleNode->tqparent; + while (styleNode && styleNode->parent && styleNode->tag->name.lower() != "style" && styleNode->tag->dtd()->name == "text/css") + styleNode = styleNode->parent; Node *parentNode = node; if (parentNode->tag->type == Tag::XmlTagEnd && parentNode->prev) parentNode = parentNode->prev; else - while (parentNode && parentNode->tqparent && + while (parentNode && parentNode->parent && parentNode->tag->type != Tag::XmlTag) - parentNode = parentNode->tqparent; + parentNode = parentNode->parent; TQString fullDocument = w->editIf->text().stripWhiteSpace(); - if (styleNode->tag->name.lower() == "comment block" && styleNode->tqparent) { - if (styleNode->tqparent->tag->name.lower() == "style") { - styleNode = styleNode->tqparent; + if (styleNode->tag->name.lower() == "comment block" && styleNode->parent) { + if (styleNode->parent->tag->name.lower() == "style") { + styleNode = styleNode->parent; } } diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h index 811fa60c..7d9c2867 100644 --- a/quanta/src/quanta.h +++ b/quanta/src/quanta.h @@ -132,8 +132,8 @@ public: DebuggerManager *debugger() const {return m_debugger;} KParts::PartManager *partManager() {return m_partManager;} - TQWidget* createContainer(TQWidget *tqparent, int index, const TQDomElement &element, int &id ); - void removeContainer(TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id ); + TQWidget* createContainer(TQWidget *parent, int index, const TQDomElement &element, int &id ); + void removeContainer(TQWidget *container, TQWidget *parent, TQDomElement &element, int id ); /** Returns the project's base URL if it exists, the HOME dir if there is no project and no opened document (or the current opened document was not saved yet), and the base URL of the opened document, if it is saved somewhere. maps to the same function in Project*/ diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp index aba09d7d..9884d01a 100644 --- a/quanta/src/quantadoc.cpp +++ b/quanta/src/quantadoc.cpp @@ -76,7 +76,7 @@ #include "tagactionmanager.h" #include "tagactionset.h" -QuantaDoc::QuantaDoc(TQWidget *tqparent, const char *name) : TQObject(tqparent, name) +QuantaDoc::QuantaDoc(TQWidget *parent, const char *name) : TQObject(parent, name) { fileWatcher = new KDirWatch(this); diff --git a/quanta/src/quantadoc.h b/quanta/src/quantadoc.h index 48c3b631..0da3ff5e 100644 --- a/quanta/src/quantadoc.h +++ b/quanta/src/quantadoc.h @@ -32,7 +32,7 @@ class QuantaDoc : public TQObject public: - QuantaDoc(TQWidget *tqparent, const char *name=0); + QuantaDoc(TQWidget *parent, const char *name=0); ~QuantaDoc(); bool newDocument(const KURL&, bool switchToExisting = true); diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp index dbbb6578..fcfe0871 100644 --- a/quanta/src/quantaview.cpp +++ b/quanta/src/quantaview.cpp @@ -76,8 +76,8 @@ extern int NN; extern TQValueList nodes; -QuantaView::QuantaView(TQWidget *tqparent, const char *name, const TQString &caption ) - : KMdiChildView(tqparent, name) +QuantaView::QuantaView(TQWidget *parent, const char *name, const TQString &caption ) + : KMdiChildView(parent, name) , m_document(0L) , m_plugin(0L) , m_customWidget(0L) @@ -833,11 +833,11 @@ void QuantaView::insertOutputInTheNodeTree(const TQString &str1, const TQString nodeParent = nodeCursor; if (nodeParent->tag->type == Tag::Text) - nodeParent = nodeParent->tqparent; + nodeParent = nodeParent->parent; - //Checking if at least one tqparent of node can have a Text Node as child, otherwise + //Checking if at least one parent of node can have a Text Node as child, otherwise //it is impossible for the - //user to add this node. In that case, try to insert the Node in the closest tqparent accepting it. + //user to add this node. In that case, try to insert the Node in the closest parent accepting it. //e.g. TR : a normal insertion would require to have the caret in the TABLE Node, but it is //impossible nodeTQTag = QuantaCommon::tagFromDTD(m_document->defaultDTD(), @@ -904,7 +904,7 @@ void QuantaView::insertOutputInTheNodeTree(const TQString &str1, const TQString nodeTreeModified = false; if (specialTagInsertion) { - //let's try to insert this node in the closest tqparent accepting it. + //let's try to insert this node in the closest parent accepting it. while (nodeParent) { nodeParentTQTag = @@ -919,7 +919,7 @@ void QuantaView::insertOutputInTheNodeTree(const TQString &str1, const TQString nodeTreeModified = true; break; } - nodeParent = nodeParent->tqparent; + nodeParent = nodeParent->parent; } } else if (hasSelection && !nodeTQTag->isSingle()) diff --git a/quanta/src/quantaview.h b/quanta/src/quantaview.h index dc6d7414..bf80aff1 100644 --- a/quanta/src/quantaview.h +++ b/quanta/src/quantaview.h @@ -68,7 +68,7 @@ class QuantaView : public KMdiChildView public: - QuantaView(TQWidget *tqparent = 0, const char *name=0, const TQString &caption = TQString()); + QuantaView(TQWidget *parent = 0, const char *name=0, const TQString &caption = TQString()); ~QuantaView(); /** returns true if the view can be removed, false otherwise */ diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp index eb7ef971..6a6294e3 100644 --- a/quanta/src/viewmanager.cpp +++ b/quanta/src/viewmanager.cpp @@ -61,7 +61,7 @@ #define UPLOAD_ID 12 #define DELETE_ID 13 -ViewManager::ViewManager(TQObject *tqparent, const char *name) : TQObject(tqparent, name) +ViewManager::ViewManager(TQObject *parent, const char *name) : TQObject(parent, name) { m_lastActiveView = 0L; m_lastActiveEditorView = 0L; diff --git a/quanta/src/viewmanager.h b/quanta/src/viewmanager.h index 9b600d00..31f0a761 100644 --- a/quanta/src/viewmanager.h +++ b/quanta/src/viewmanager.h @@ -35,10 +35,10 @@ class ViewManager : public TQObject TQ_OBJECT public: /** Returns a reference to the viewmanager object */ - static ViewManager* const ref(TQObject *tqparent = 0L, const char *name = 0L) + static ViewManager* const ref(TQObject *parent = 0L, const char *name = 0L) { static ViewManager *m_ref; - if (!m_ref) m_ref = new ViewManager(tqparent, name); + if (!m_ref) m_ref = new ViewManager(parent, name); return m_ref; } /** The destructor. */ @@ -124,7 +124,7 @@ private slots: private: /** Private constructor for the singleton object. */ - ViewManager(TQObject * tqparent = 0, const char * name = 0); + ViewManager(TQObject * parent = 0, const char * name = 0); /** Returns true if there isn't any opened view holding an editor */ bool allEditorsClosed(); diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index 7145ab69..baf6bbe5 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -70,7 +70,7 @@ class BaseTreeViewToolTip : public TQToolTip { public: - BaseTreeViewToolTip( TQWidget *tqparent, BaseTreeView *lv ); + BaseTreeViewToolTip( TQWidget *parent, BaseTreeView *lv ); void maybeTip( const TQPoint &pos ); @@ -79,8 +79,8 @@ private: }; -BaseTreeViewToolTip::BaseTreeViewToolTip( TQWidget *tqparent, BaseTreeView *lv ) - : TQToolTip( tqparent ), m_view( lv ) +BaseTreeViewToolTip::BaseTreeViewToolTip( TQWidget *parent, BaseTreeView *lv ) + : TQToolTip( parent ), m_view( lv ) { } @@ -111,8 +111,8 @@ void BaseTreeViewToolTip::maybeTip( const TQPoint &pos ) //BaseTreeViewItem implementation -BaseTreeViewItem::BaseTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch ) -: KFileTreeViewItem( tqparent, item, brnch) +BaseTreeViewItem::BaseTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch ) +: KFileTreeViewItem( parent, item, brnch) { } @@ -163,11 +163,11 @@ void BaseTreeViewItem::refreshIcon() //BaseTreeBranch implementation -BaseTreeBranch::BaseTreeBranch(KFileTreeView *tqparent, const KURL& url, +BaseTreeBranch::BaseTreeBranch(KFileTreeView *parent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden , KFileTreeViewItem *branchRoot) - : KFileTreeBranch(tqparent, url, name, pix, showHidden, branchRoot) + : KFileTreeBranch(parent, url, name, pix, showHidden, branchRoot) { bool localFile = url.isLocalFile(); setAutoUpdate(localFile); @@ -184,13 +184,13 @@ bool BaseTreeBranch::matchesFilter(const KFileItem *item) const return KFileTreeBranch::matchesFilter(item); } -KFileTreeViewItem* BaseTreeBranch::createTreeViewItem(KFileTreeViewItem *tqparent, +KFileTreeViewItem* BaseTreeBranch::createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem) { BaseTreeViewItem *tvi = 0; - if( tqparent && fileItem) + if( parent && fileItem) { - tvi = new BaseTreeViewItem(tqparent, fileItem, this); + tvi = new BaseTreeViewItem(parent, fileItem, this); // we assume there are childs if (tvi) { @@ -198,7 +198,7 @@ KFileTreeViewItem* BaseTreeBranch::createTreeViewItem(KFileTreeViewItem *tqparen } } else - kdDebug(24000) << "createTreeViewItem: Have no tqparent" << endl; + kdDebug(24000) << "createTreeViewItem: Have no parent" << endl; return tvi; } @@ -230,7 +230,7 @@ void BaseTreeBranch::addOpenFolder(TQStringList* openFolder) } else { - item = dynamic_cast(item->tqparent()); + item = dynamic_cast(item->parent()); } } if (item == root()) @@ -276,7 +276,7 @@ void BaseTreeBranch::updateOpenFolder() }; // go up if no sibling available if (! item->nextSibling()) - item = dynamic_cast(item->tqparent()); + item = dynamic_cast(item->parent()); if (item == root()) break; if (item) @@ -291,10 +291,10 @@ void BaseTreeBranch::updateOpenFolder() // //////////////////////////////////////////////////////////////////////////////////// -BaseTreeView::BaseTreeView(TQWidget *tqparent, const char *name) -: KFileTreeView(tqparent, name), fileInfoDlg(0), m_saveOpenFolder(false), m_openWithMenu(0L), m_openWithMenuId(-1) +BaseTreeView::BaseTreeView(TQWidget *parent, const char *name) +: KFileTreeView(parent, name), fileInfoDlg(0), m_saveOpenFolder(false), m_openWithMenu(0L), m_openWithMenuId(-1) { - m_parent = tqparent; + m_parent = parent; TQToolTip::remove(viewport()); // remove the tooltip from TQListView m_tooltip = new BaseTreeViewToolTip(viewport(), this); setFrameStyle( Panel | Sunken ); @@ -923,16 +923,16 @@ void BaseTreeView::slotDropped (TQWidget *, TQDropEvent * /*e*/, KURL::List& fil } -void BaseTreeView::findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after) +void BaseTreeView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after) { TQPoint p (contentsToViewport(pos)); TQListViewItem *atpos = itemAt(p); -// if (atpos && atpos->tqparent()) { +// if (atpos && atpos->parent()) { // after = atpos; -// tqparent = atpos->tqparent(); +// parent = atpos->parent(); // } else { after = atpos; - tqparent = atpos; + parent = atpos; // } } diff --git a/quanta/treeviews/basetreeview.h b/quanta/treeviews/basetreeview.h index 47dc5158..18ff5ae0 100644 --- a/quanta/treeviews/basetreeview.h +++ b/quanta/treeviews/basetreeview.h @@ -54,7 +54,7 @@ class QuantaPlugin; class BaseTreeViewItem : public KFileTreeViewItem { public: - BaseTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch ); + BaseTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch ); /** sorts folders separate from files @@ -87,13 +87,13 @@ class BaseTreeBranch : public KFileTreeBranch { TQ_OBJECT public: - BaseTreeBranch(KFileTreeView *tqparent, const KURL& url, + BaseTreeBranch(KFileTreeView *parent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden = false, KFileTreeViewItem *branchRoot = 0); /** get the BaseTreeViewItem */ - virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem *tqparent, + virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem *parent, KFileItem *fileItem ); /** does custom filtering @@ -137,7 +137,7 @@ class BaseTreeView : public KFileTreeView { TQ_OBJECT public: - BaseTreeView(TQWidget *tqparent = 0L, const char *name = 0L); + BaseTreeView(TQWidget *parent = 0L, const char *name = 0L); virtual ~BaseTreeView(); /** @@ -307,7 +307,7 @@ protected: */ bool expandArchiv (KFileTreeViewItem *item); bool acceptDrag(TQDropEvent* e ) const; - void findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after); + void findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after); /** this is for project and template tree to reduce includes there @@ -326,7 +326,7 @@ protected: TQString m_projectName; KURL m_projectBaseURL; FileInfoDlg* fileInfoDlg; - /** the tqparent of the treeview + /** the parent of the treeview the passwords are cached there */ TQWidget * m_parent; diff --git a/quanta/treeviews/docfolder.cpp b/quanta/treeviews/docfolder.cpp index 8ecf9c0f..0a1d941d 100644 --- a/quanta/treeviews/docfolder.cpp +++ b/quanta/treeviews/docfolder.cpp @@ -28,8 +28,8 @@ #include "docfolder.h" #include "docitem.h" -DocFolder::DocFolder(TQListViewItem *tqparent, const TQString &_name, KConfig *config, const TQString &basePath) - : KListViewItem(tqparent) +DocFolder::DocFolder(TQListViewItem *parent, const TQString &_name, KConfig *config, const TQString &basePath) + : KListViewItem(parent) { name = _name; topLevel = false; @@ -59,8 +59,8 @@ DocFolder::DocFolder(TQListViewItem *tqparent, const TQString &_name, KConfig *c } } -DocFolder::DocFolder(TQListView *tqparent, const TQString &_name, KConfig *config, const TQString &basePath) - : KListViewItem(tqparent) +DocFolder::DocFolder(TQListView *parent, const TQString &_name, KConfig *config, const TQString &basePath) + : KListViewItem(parent) { name = _name; topLevel = false; diff --git a/quanta/treeviews/docfolder.h b/quanta/treeviews/docfolder.h index 945fa786..f3c8db87 100644 --- a/quanta/treeviews/docfolder.h +++ b/quanta/treeviews/docfolder.h @@ -33,8 +33,8 @@ class KConfig; class DocFolder : public KListViewItem { public: - DocFolder(TQListViewItem *tqparent, const TQString &_name, KConfig *config, const TQString &basePath); - DocFolder(TQListView *tqparent, const TQString &_name, KConfig *config, const TQString &basePath); + DocFolder(TQListViewItem *parent, const TQString &_name, KConfig *config, const TQString &basePath); + DocFolder(TQListView *parent, const TQString &_name, KConfig *config, const TQString &basePath); ~DocFolder(); TQString text( int column ) const; void setup(); diff --git a/quanta/treeviews/docitem.cpp b/quanta/treeviews/docitem.cpp index 782d6140..f24c3bb9 100644 --- a/quanta/treeviews/docitem.cpp +++ b/quanta/treeviews/docitem.cpp @@ -21,15 +21,15 @@ #include "docitem.h" -DocItem::DocItem(TQListViewItem *tqparent, const TQString &_name, const TQString &_url) - : KListViewItem(tqparent) +DocItem::DocItem(TQListViewItem *parent, const TQString &_name, const TQString &_url) + : KListViewItem(parent) { url = _url; name = _name; } -DocItem::DocItem(TQListView *tqparent, const TQString &_name, const TQString &_url) - : KListViewItem(tqparent) +DocItem::DocItem(TQListView *parent, const TQString &_name, const TQString &_url) + : KListViewItem(parent) { url = _url; name = _name; diff --git a/quanta/treeviews/docitem.h b/quanta/treeviews/docitem.h index 7c261012..59b126a1 100644 --- a/quanta/treeviews/docitem.h +++ b/quanta/treeviews/docitem.h @@ -31,8 +31,8 @@ class KConfig; class DocItem : public KListViewItem { public: - DocItem(TQListViewItem *tqparent, const TQString &_name, const TQString &_url); - DocItem(TQListView *tqparent, const TQString &_name, const TQString &_url); + DocItem(TQListViewItem *parent, const TQString &_name, const TQString &_url); + DocItem(TQListView *parent, const TQString &_name, const TQString &_url); ~DocItem(); TQString text( int column ) const; diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp index 99f1f4bd..dbd7c11a 100644 --- a/quanta/treeviews/doctreeview.cpp +++ b/quanta/treeviews/doctreeview.cpp @@ -35,8 +35,8 @@ #include "docfolder.h" #include "docitem.h" -DocTreeView::DocTreeView(TQWidget *tqparent, const char *name ) - : KListView(tqparent,name) +DocTreeView::DocTreeView(TQWidget *parent, const char *name ) + : KListView(parent,name) { contextHelpDict = new TQDict( 101, false ); diff --git a/quanta/treeviews/doctreeview.h b/quanta/treeviews/doctreeview.h index bba36a04..5be36ec5 100644 --- a/quanta/treeviews/doctreeview.h +++ b/quanta/treeviews/doctreeview.h @@ -37,7 +37,7 @@ class DocTreeView : public KListView { Q_OBJECT TQ_OBJECT public: - DocTreeView(TQWidget *tqparent=0, const char *name=0); + DocTreeView(TQWidget *parent=0, const char *name=0); ~DocTreeView(); TQString *contextHelp(const TQString &keyword); diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp index 4008d408..bebac21d 100644 --- a/quanta/treeviews/filestreeview.cpp +++ b/quanta/treeviews/filestreeview.cpp @@ -40,8 +40,8 @@ //FilesTreeView implementation -FilesTreeView::FilesTreeView(KConfig *config, TQWidget *tqparent, const char *name) - : BaseTreeView(tqparent, name) +FilesTreeView::FilesTreeView(KConfig *config, TQWidget *parent, const char *name) + : BaseTreeView(parent, name) { setAcceptDrops(true); setDragEnabled(true); diff --git a/quanta/treeviews/filestreeview.h b/quanta/treeviews/filestreeview.h index dfef213c..29b547f0 100644 --- a/quanta/treeviews/filestreeview.h +++ b/quanta/treeviews/filestreeview.h @@ -36,7 +36,7 @@ class FilesTreeView : public BaseTreeView { TQ_OBJECT public: - FilesTreeView(KConfig *config, TQWidget *tqparent, const char *name = 0L); + FilesTreeView(KConfig *config, TQWidget *parent, const char *name = 0L); virtual ~FilesTreeView(); KURL::List topURLList; TQMap topURLAliases; diff --git a/quanta/treeviews/newtemplatedirdlg.cpp b/quanta/treeviews/newtemplatedirdlg.cpp index cf960923..48fd6b5e 100644 --- a/quanta/treeviews/newtemplatedirdlg.cpp +++ b/quanta/treeviews/newtemplatedirdlg.cpp @@ -17,7 +17,7 @@ #include "newtemplatedirdlg.h" #include "newtemplatedirdlg.moc" -NewTemplateDirDlg::NewTemplateDirDlg(TQWidget *tqparent, const char *name ) : TemplateDirForm(tqparent,name) +NewTemplateDirDlg::NewTemplateDirDlg(TQWidget *parent, const char *name ) : TemplateDirForm(parent,name) { setCaption(name); connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); diff --git a/quanta/treeviews/newtemplatedirdlg.h b/quanta/treeviews/newtemplatedirdlg.h index 56dbba5c..fb496eb8 100644 --- a/quanta/treeviews/newtemplatedirdlg.h +++ b/quanta/treeviews/newtemplatedirdlg.h @@ -27,7 +27,7 @@ class NewTemplateDirDlg : public TemplateDirForm { Q_OBJECT TQ_OBJECT public: - NewTemplateDirDlg(TQWidget *tqparent=0, const char *name=0); + NewTemplateDirDlg(TQWidget *parent=0, const char *name=0); ~NewTemplateDirDlg(); }; diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp index 8508b452..8fba1282 100644 --- a/quanta/treeviews/projecttreeview.cpp +++ b/quanta/treeviews/projecttreeview.cpp @@ -46,8 +46,8 @@ #endif //ProjectTreeViewItem implementation -ProjectTreeViewItem::ProjectTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch ) -: BaseTreeViewItem( tqparent, item, brnch) +ProjectTreeViewItem::ProjectTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch ) +: BaseTreeViewItem( parent, item, brnch) { } @@ -70,21 +70,21 @@ void ProjectTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, } //ProjectTreeBranch implementation -ProjectTreeBranch::ProjectTreeBranch(KFileTreeView *tqparent, const KURL& url, +ProjectTreeBranch::ProjectTreeBranch(KFileTreeView *parent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden, KFileTreeViewItem *branchRoot) - : BaseTreeBranch(tqparent, url, name, pix, showHidden, branchRoot) + : BaseTreeBranch(parent, url, name, pix, showHidden, branchRoot) { } -KFileTreeViewItem* ProjectTreeBranch::createTreeViewItem(KFileTreeViewItem *tqparent, +KFileTreeViewItem* ProjectTreeBranch::createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem ) { BaseTreeViewItem *tvi = 0; - if( tqparent && fileItem ) + if( parent && fileItem ) { - tvi = new ProjectTreeViewItem( tqparent, fileItem, this ); + tvi = new ProjectTreeViewItem( parent, fileItem, this ); if (tvi) { // we assume there are childs @@ -95,13 +95,13 @@ KFileTreeViewItem* ProjectTreeBranch::createTreeViewItem(KFileTreeViewItem *tqpa } } else - kdDebug(24000) << "ProjectTreeBranch::createTreeViewItem: Have no tqparent" << endl; + kdDebug(24000) << "ProjectTreeBranch::createTreeViewItem: Have no parent" << endl; return tvi; } //ProjectTreeView implementation -ProjectTreeView::ProjectTreeView(TQWidget *tqparent, const char *name ) - : BaseTreeView(tqparent,name), m_projectFiles(0) +ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) + : BaseTreeView(parent,name), m_projectFiles(0) { //setSelectionModeExt(KListView::Extended); setRootIsDecorated(false); diff --git a/quanta/treeviews/projecttreeview.h b/quanta/treeviews/projecttreeview.h index dafa3a2f..1e290328 100644 --- a/quanta/treeviews/projecttreeview.h +++ b/quanta/treeviews/projecttreeview.h @@ -28,7 +28,7 @@ class ProjectList; class ProjectTreeViewItem : public BaseTreeViewItem { public: - ProjectTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch ); + ProjectTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch ); /** makes document root italics */ void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align); }; @@ -36,12 +36,12 @@ public: class ProjectTreeBranch : public BaseTreeBranch { public: - ProjectTreeBranch(KFileTreeView *tqparent, const KURL& url, + ProjectTreeBranch(KFileTreeView *parent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden = false, KFileTreeViewItem *branchRoot = 0L); /** check for CVS and visible*/ - virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *tqparent, + virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem ); /** only files in list will be shown */ @@ -61,10 +61,10 @@ public: * the parameters are only used at the first call to create the class * */ - static ProjectTreeView* const ref(TQWidget *tqparent = 0L, const char *name = 0L) + static ProjectTreeView* const ref(TQWidget *parent = 0L, const char *name = 0L) { static ProjectTreeView *m_ref; - if (!m_ref) m_ref = new ProjectTreeView(tqparent, name); + if (!m_ref) m_ref = new ProjectTreeView(parent, name); return m_ref; } @@ -116,7 +116,7 @@ private: * If you need the class use ProjectTreeView::ref() for * construction and reference */ - ProjectTreeView(TQWidget *tqparent, const char *name); + ProjectTreeView(TQWidget *parent, const char *name); ProjectTreeBranch *m_projectDir; KPopupMenu *m_fileMenu; diff --git a/quanta/treeviews/quantapropertiespage.ui b/quanta/treeviews/quantapropertiespage.ui index 97c666b6..109caf2f 100644 --- a/quanta/treeviews/quantapropertiespage.ui +++ b/quanta/treeviews/quantapropertiespage.ui @@ -62,7 +62,7 @@ parentAttr - &Inherit type from tqparent (nothing) + &Inherit type from parent (nothing) diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp index 55b36c81..02eda9ce 100644 --- a/quanta/treeviews/scripttreeview.cpp +++ b/quanta/treeviews/scripttreeview.cpp @@ -58,8 +58,8 @@ extern int xmlLoadExtDtdDefaultValue; -ScriptTreeView::ScriptTreeView(TQWidget *tqparent, const char *name ) - : BaseTreeView(tqparent,name) +ScriptTreeView::ScriptTreeView(TQWidget *parent, const char *name ) + : BaseTreeView(parent,name) { setSaveOpenFolder(true); addColumn(i18n("Scripts"), -1); diff --git a/quanta/treeviews/scripttreeview.h b/quanta/treeviews/scripttreeview.h index d5d69ea9..d09cdf60 100644 --- a/quanta/treeviews/scripttreeview.h +++ b/quanta/treeviews/scripttreeview.h @@ -45,7 +45,7 @@ class ScriptTreeView : public BaseTreeView { public: - ScriptTreeView(TQWidget *tqparent, const char *name = 0L); + ScriptTreeView(TQWidget *parent, const char *name = 0L); ~ScriptTreeView(); protected slots: diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp index 22c2407d..1618d588 100644 --- a/quanta/treeviews/servertreeview.cpp +++ b/quanta/treeviews/servertreeview.cpp @@ -36,8 +36,8 @@ #include "qextfileinfo.h" -ServerTreeViewItem::ServerTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch ) -: BaseTreeViewItem( tqparent, item, brnch) +ServerTreeViewItem::ServerTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch ) +: BaseTreeViewItem( parent, item, brnch) { } @@ -63,22 +63,22 @@ void ServerTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, } //ServerTreeBranch implementation -ServerTreeBranch::ServerTreeBranch(KFileTreeView *tqparent, const KURL& url, +ServerTreeBranch::ServerTreeBranch(KFileTreeView *parent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden, KFileTreeViewItem *branchRoot) - : BaseTreeBranch(tqparent, url, name, pix, showHidden, branchRoot) + : BaseTreeBranch(parent, url, name, pix, showHidden, branchRoot) { } -KFileTreeViewItem* ServerTreeBranch::createTreeViewItem(KFileTreeViewItem *tqparent, KFileItem *fileItem ) +KFileTreeViewItem* ServerTreeBranch::createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem ) { BaseTreeViewItem *tvi = 0; - if( tqparent && fileItem ) + if( parent && fileItem ) { - tvi = new ServerTreeViewItem( tqparent, fileItem, this ); + tvi = new ServerTreeViewItem( parent, fileItem, this ); } else - kdDebug(24000) << "ServerTreeBranch::createTreeViewItem: Have no tqparent" << endl; + kdDebug(24000) << "ServerTreeBranch::createTreeViewItem: Have no parent" << endl; return tvi; } @@ -87,8 +87,8 @@ KFileTreeViewItem* ServerTreeBranch::createTreeViewItem(KFileTreeViewItem *tqpar // ServerTreeView implementation // // -ServerTreeView::ServerTreeView(KConfig *config, TQWidget *tqparent, const KURL &url, const char *name) - : BaseTreeView(tqparent, name) +ServerTreeView::ServerTreeView(KConfig *config, TQWidget *parent, const KURL &url, const char *name) + : BaseTreeView(parent, name) { setAcceptDrops(true); setDragEnabled(true); diff --git a/quanta/treeviews/servertreeview.h b/quanta/treeviews/servertreeview.h index af5c0afa..5c36771b 100644 --- a/quanta/treeviews/servertreeview.h +++ b/quanta/treeviews/servertreeview.h @@ -35,7 +35,7 @@ class ProjectList; class ServerTreeViewItem : public BaseTreeViewItem { public: - ServerTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch ); + ServerTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch ); /** makes document not in project lighter */ void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align); }; @@ -47,12 +47,12 @@ public: class ServerTreeBranch : public BaseTreeBranch { public: - ServerTreeBranch(KFileTreeView *tqparent, const KURL& url, + ServerTreeBranch(KFileTreeView *parent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden = false, KFileTreeViewItem *branchRoot = 0L); /** check for CVS and visible*/ - virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *tqparent, + virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem ); }; @@ -62,7 +62,7 @@ class ServerTreeView : public BaseTreeView { TQ_OBJECT public: - ServerTreeView(KConfig *config, TQWidget *tqparent, const KURL &url, const char *name = 0L); + ServerTreeView(KConfig *config, TQWidget *parent, const KURL &url, const char *name = 0L); virtual ~ServerTreeView(); protected slots: diff --git a/quanta/treeviews/structtreetag.cpp b/quanta/treeviews/structtreetag.cpp index fb0573a4..e897d14c 100644 --- a/quanta/treeviews/structtreetag.cpp +++ b/quanta/treeviews/structtreetag.cpp @@ -31,20 +31,20 @@ #include "document.h" #include "resource.h" -StructTreeTag::StructTreeTag(TQListView *tqparent, TQString a_title) - : KListViewItem(tqparent, a_title) +StructTreeTag::StructTreeTag(TQListView *parent, TQString a_title) + : KListViewItem(parent, a_title) { node = 0L; hasOpenFileMenu = false; groupTag = 0L; - parentTree = static_cast(tqparent); + parentTree = static_cast(parent); } -StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQString a_title, +StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString a_title, TQListViewItem *after ) -: KListViewItem(tqparent, after, a_title) +: KListViewItem(parent, after, a_title) { - parentTree = tqparent->parentTree; + parentTree = parent->parentTree; hasOpenFileMenu = false; groupTag = 0L; static const TQString space = " "; @@ -106,8 +106,8 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQStri if (!typingInProgress) { TQTag *parentTQTag = 0L; - if (node->tqparent) - parentTQTag = QuantaCommon::tagFromDTD(node->tqparent); + if (node->parent) + parentTQTag = QuantaCommon::tagFromDTD(node->parent); TQString qTagName = node->tag->dtd()->caseSensitive ? node->tag->name : node->tag->name.upper(); int line, col; node->tag->beginPos(line, col); @@ -115,7 +115,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQStri !parentTQTag->childTags.isEmpty()) { node->tag->write()->setErrorMark(line); - TQString parentTagName = node->tag->dtd()->caseSensitive ? node->tqparent->tag->name : node->tqparent->tag->name.upper(); + TQString parentTagName = node->tag->dtd()->caseSensitive ? node->parent->tag->name : node->parent->tag->name.upper(); parentTree->showMessage(i18n("Line %1: %2 is not a possible child of %3.\n").tqarg(line + 1).tqarg(qTagName).tqarg(parentTagName)); } TQString nextTagName; @@ -201,13 +201,13 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQStri } } -StructTreeTag::StructTreeTag(StructTreeTag *tqparent, TQString a_title ) -: KListViewItem(tqparent, a_title) +StructTreeTag::StructTreeTag(StructTreeTag *parent, TQString a_title ) +: KListViewItem(parent, a_title) { node = 0L; hasOpenFileMenu = false; groupTag = 0L; - parentTree = tqparent->parentTree; + parentTree = parent->parentTree; } diff --git a/quanta/treeviews/structtreetag.h b/quanta/treeviews/structtreetag.h index 6170870d..2f408707 100644 --- a/quanta/treeviews/structtreetag.h +++ b/quanta/treeviews/structtreetag.h @@ -30,9 +30,9 @@ class StructTreeView; class StructTreeTag : public KListViewItem { public: - StructTreeTag(TQListView *tqparent, const TQString a_title = TQString() ); - StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQString a_title = TQString(), TQListViewItem *after = 0L); - StructTreeTag(StructTreeTag *tqparent, const TQString a_title = TQString() ); + StructTreeTag(TQListView *parent, const TQString a_title = TQString() ); + StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString a_title = TQString(), TQListViewItem *after = 0L); + StructTreeTag(StructTreeTag *parent, const TQString a_title = TQString() ); ~StructTreeTag(); Node *node; diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp index c6c23fde..24f48174 100644 --- a/quanta/treeviews/structtreeview.cpp +++ b/quanta/treeviews/structtreeview.cpp @@ -57,8 +57,8 @@ #include "structtreeview.moc" extern GroupElementMapList globalGroupMap; -StructTreeView::StructTreeView(TQWidget *tqparent, const char *name ) - : KListView(tqparent,name), m_marker(0), m_draggedItem(0)/*, m_thisWidget(0)*/ +StructTreeView::StructTreeView(TQWidget *parent, const char *name ) + : KListView(parent,name), m_marker(0), m_draggedItem(0)/*, m_thisWidget(0)*/ { for (int i = 0; i < 15; i++) groupOpened.append(false); @@ -276,27 +276,27 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly) currentItem = item; } else { - //go up some levels, to the tqparent, if the node has no child or next + //go up some levels, to the parent, if the node has no child or next while (currentNode) { level--; - //parentItem = dynamic_cast(parentItem->tqparent()); - if (currentNode->tqparent && currentNode->tqparent->next) + //parentItem = dynamic_cast(parentItem->parent()); + if (currentNode->parent && currentNode->parent->next) { - currentNode = currentNode->tqparent->next; + currentNode = currentNode->parent->next; break; } else { - currentNode = currentNode->tqparent; + currentNode = currentNode->parent; } } if (!groupOnly && currentNode) { if (currentNode->prev) currentItem = static_cast(currentNode->prev->mainListItem); - if (currentNode->tqparent) + if (currentNode->parent) { - parentItem = static_cast(currentNode->tqparent->mainListItem); + parentItem = static_cast(currentNode->parent->mainListItem); if (!parentItem) { parentItem = top; @@ -800,7 +800,7 @@ bool StructTreeView::acceptDrag(TQDropEvent* e) const kdDebug(25001) << "PROIBIDO! #2" << endl; return false; } - TQTag* nodeTQTag = QuantaCommon::tagFromDTD(after_node->tqparent); + TQTag* nodeTQTag = QuantaCommon::tagFromDTD(after_node->parent); bool is_child = (nodeTQTag && nodeTQTag->isChild(dragged_node)); if(!is_child) @@ -818,7 +818,7 @@ bool StructTreeView::acceptDrag(TQDropEvent* e) const return is_child; } -void StructTreeView::slotDropped(TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after) +void StructTreeView::slotDropped(TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after) { if(!e) return; @@ -837,10 +837,10 @@ void StructTreeView::slotDropped(TQDropEvent* e, TQListViewItem* tqparent, TQLis switch(id) { case DRAG_COPY: - copySelectedItems(tqparent, after); + copySelectedItems(parent, after); break; case DRAG_MOVE: - moveSelectedItems(tqparent, after); + moveSelectedItems(parent, after); break; case DRAG_CANCEL: // cancelled by menuitem break; @@ -875,9 +875,9 @@ void StructTreeView::contentsMousePressEvent(TQMouseEvent* e) KListView::contentsMousePressEvent(e); } -void StructTreeView::copySelectedItems(TQListViewItem* tqparent, TQListViewItem* after) +void StructTreeView::copySelectedItems(TQListViewItem* parent, TQListViewItem* after) { - StructTreeTag* parent_item = dynamic_cast (tqparent); + StructTreeTag* parent_item = dynamic_cast (parent); StructTreeTag* after_item = dynamic_cast (after); if(!parent_item/* || !after_item*/) // can happen if the element is inserted as the first child return; @@ -913,9 +913,9 @@ void StructTreeView::copySelectedItems(TQListViewItem* tqparent, TQListViewItem* write->docUndoRedo->addNewModifsSet(modifs, undoRedo::NodeTreeModif, 0, false); } -void StructTreeView::moveSelectedItems(TQListViewItem* tqparent, TQListViewItem* after) +void StructTreeView::moveSelectedItems(TQListViewItem* parent, TQListViewItem* after) { - StructTreeTag* parent_item = dynamic_cast (tqparent); + StructTreeTag* parent_item = dynamic_cast (parent); StructTreeTag* after_item = dynamic_cast (after); if(!parent_item || !after_item) return; diff --git a/quanta/treeviews/structtreeview.h b/quanta/treeviews/structtreeview.h index 09a95a07..66c6b68e 100644 --- a/quanta/treeviews/structtreeview.h +++ b/quanta/treeviews/structtreeview.h @@ -49,10 +49,10 @@ public: * the parameters are only used at the first call to create the class * */ - static StructTreeView* const ref(TQWidget *tqparent = 0L, const char *name = 0L) + static StructTreeView* const ref(TQWidget *parent = 0L, const char *name = 0L) { static StructTreeView *m_ref; - if (!m_ref) m_ref = new StructTreeView (tqparent, name); + if (!m_ref) m_ref = new StructTreeView (parent, name); return m_ref; } @@ -113,7 +113,7 @@ private: * If you need the class use StructTreeView::ref() for * construction and reference */ - StructTreeView(TQWidget *tqparent=0, const char *name=0); + StructTreeView(TQWidget *parent=0, const char *name=0); /** builds the structure tree */ void buildTree(Node *baseNode, int openLevel, bool groupOnly); /** Do the recursive opening or closing of the trees */ @@ -122,8 +122,8 @@ private: /** Make ctrl have the same behavior has shift */ void setContiguousSelectedItems(); - void copySelectedItems(TQListViewItem* tqparent, TQListViewItem* after); - void moveSelectedItems(TQListViewItem* tqparent, TQListViewItem* after); + void copySelectedItems(TQListViewItem* parent, TQListViewItem* after); + void moveSelectedItems(TQListViewItem* parent, TQListViewItem* after); private: @@ -167,7 +167,7 @@ protected slots: // Protected slots void slotDTDChanged(int id); void slotMouseClickedVPL(int button, TQListViewItem*, const TQPoint&, int); - virtual void slotDropped(TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after); + virtual void slotDropped(TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after); protected: // Protected attributes Document *write; diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp index 1483e98d..50e4825e 100644 --- a/quanta/treeviews/tagattributeitems.cpp +++ b/quanta/treeviews/tagattributeitems.cpp @@ -40,13 +40,13 @@ #include "qextfileinfo.h" #include "styleeditor.h" -TopLevelItem::TopLevelItem(KListView* tqparent, const TQString &title) -: KListViewItem(tqparent, title) +TopLevelItem::TopLevelItem(KListView* parent, const TQString &title) +: KListViewItem(parent, title) { } -TopLevelItem::TopLevelItem(KListView* tqparent, TQListViewItem* after, const TQString &title) -: KListViewItem(tqparent, after, title) +TopLevelItem::TopLevelItem(KListView* parent, TQListViewItem* after, const TQString &title) +: KListViewItem(parent, after, title) { } @@ -62,7 +62,7 @@ void TopLevelItem::paintCell(TQPainter *p, const TQColorGroup &cg, return; // make toplevel item names bold - if (column == 0 && !tqparent()) + if (column == 0 && !parent()) { TQFont f = p->font(); f.setBold(true); @@ -76,8 +76,8 @@ void TopLevelItem::paintCell(TQPainter *p, const TQColorGroup &cg, } } -ParentItem::ParentItem(TagAttributeTree *listView, TQListViewItem* tqparent) -: KListViewItem(tqparent) +ParentItem::ParentItem(TagAttributeTree *listView, TQListViewItem* parent) +: KListViewItem(parent) { m_listView = listView; comboBox = new TQComboBox(false, m_listView->viewport() ); @@ -143,15 +143,15 @@ void ParentItem::showList(bool show) } //Generic attribute item -AttributeItem::AttributeItem(TQListViewItem* tqparent, const TQString &title, const TQString& title2) -: KListViewItem(tqparent, title, title2) +AttributeItem::AttributeItem(TQListViewItem* parent, const TQString &title, const TQString& title2) +: KListViewItem(parent, title, title2) { lin = 0L; lin2 = 0L; } -AttributeItem::AttributeItem(EditableTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2) -: KListViewItem(tqparent, title, title2) +AttributeItem::AttributeItem(EditableTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2) +: KListViewItem(parent, title, title2) { m_listView = listView; lin = new TQLineEdit( m_listView->viewport() ); @@ -284,8 +284,8 @@ void AttributeItem::placeEditor( TQWidget *w, int column) } //Boolean attribute item -AttributeBoolItem::AttributeBoolItem(TagAttributeTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2) -: AttributeItem(tqparent, title, title2) +AttributeBoolItem::AttributeBoolItem(TagAttributeTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2) +: AttributeItem(parent, title, title2) { m_listView = listView; combo = new TQComboBox( m_listView->viewport() ); @@ -324,8 +324,8 @@ void AttributeBoolItem::hideEditor(int) } //Boolean attribute item -AttributeUrlItem::AttributeUrlItem(TagAttributeTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2) -: AttributeItem(tqparent, title, title2) +AttributeUrlItem::AttributeUrlItem(TagAttributeTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2) +: AttributeItem(parent, title, title2) { m_listView = listView; urlRequester = new KURLRequester( m_listView->viewport() ); @@ -375,8 +375,8 @@ void AttributeUrlItem::hideEditor(int) //editable listbox //Boolean attribute item -AttributeListItem::AttributeListItem(EditableTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2, Attribute *attr) -: AttributeItem(tqparent, title, title2) +AttributeListItem::AttributeListItem(EditableTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2, Attribute *attr) +: AttributeItem(parent, title, title2) { m_listView = listView; combo = new TQComboBox( m_listView->viewport() ); @@ -455,8 +455,8 @@ void AttributeListItem::hideEditor(int) } //editable color combobox -AttributeColorItem::AttributeColorItem(EditableTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2) -: AttributeItem(tqparent, title, title2) +AttributeColorItem::AttributeColorItem(EditableTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2) +: AttributeItem(parent, title, title2) { m_listView = listView; combo = new KColorCombo( m_listView->viewport() ); @@ -499,8 +499,8 @@ void AttributeColorItem::hideEditor(int) } //editable style combobox -AttributeStyleItem::AttributeStyleItem(EditableTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2) -: AttributeItem(tqparent, title, title2) +AttributeStyleItem::AttributeStyleItem(EditableTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2) +: AttributeItem(parent, title, title2) { m_listView = listView; m_se = new StyleEditor( m_listView->viewport() ); diff --git a/quanta/treeviews/tagattributeitems.h b/quanta/treeviews/tagattributeitems.h index 6992e14e..81f5cb43 100644 --- a/quanta/treeviews/tagattributeitems.h +++ b/quanta/treeviews/tagattributeitems.h @@ -35,8 +35,8 @@ class TopLevelItem : public KListViewItem { public: - TopLevelItem(KListView *tqparent, const TQString& title); - TopLevelItem(KListView *tqparent, TQListViewItem* after, const TQString& title); + TopLevelItem(KListView *parent, const TQString& title); + TopLevelItem(KListView *parent, TQListViewItem* after, const TQString& title); virtual ~TopLevelItem(); @@ -50,7 +50,7 @@ class ParentItem : public KListViewItem { public: - ParentItem(TagAttributeTree *listView, TQListViewItem *tqparent); + ParentItem(TagAttributeTree *listView, TQListViewItem *parent); virtual ~ParentItem(); Node *node(int index); @@ -71,8 +71,8 @@ private: class AttributeItem : public KListViewItem { public: - AttributeItem(TQListViewItem* tqparent, const TQString& title, const TQString& title2); - AttributeItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2); + AttributeItem(TQListViewItem* parent, const TQString& title, const TQString& title2); + AttributeItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2); AttributeItem(EditableTree *listView, const TQString& title, const TQString& title2); AttributeItem(EditableTree *listView, const TQString& title, const TQString& title2, TQListViewItem* after); @@ -97,8 +97,8 @@ protected: class AttributeNameSpaceItem:public AttributeItem { public: - AttributeNameSpaceItem(TQListViewItem* tqparent, const TQString& title, const TQString& title2): AttributeItem(tqparent, title, title2){}; - AttributeNameSpaceItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2):AttributeItem(listView, tqparent, title, title2){}; + AttributeNameSpaceItem(TQListViewItem* parent, const TQString& title, const TQString& title2): AttributeItem(parent, title, title2){}; + AttributeNameSpaceItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2):AttributeItem(listView, parent, title, title2){}; virtual ~AttributeNameSpaceItem(){}; }; @@ -106,7 +106,7 @@ public: class AttributeBoolItem : public AttributeItem { public: - AttributeBoolItem(TagAttributeTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2); + AttributeBoolItem(TagAttributeTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2); virtual ~AttributeBoolItem(); virtual void showEditor(int column = 1); @@ -120,7 +120,7 @@ private: class AttributeUrlItem : public AttributeItem { public: - AttributeUrlItem(TagAttributeTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2); + AttributeUrlItem(TagAttributeTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2); virtual ~AttributeUrlItem(); virtual void showEditor(int column = 1); @@ -134,7 +134,7 @@ private: class AttributeListItem : public AttributeItem { public: - AttributeListItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2, Attribute *attr = 0L); + AttributeListItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2, Attribute *attr = 0L); virtual ~AttributeListItem(); virtual void showEditor(int column = 1); @@ -148,7 +148,7 @@ private: class AttributeColorItem : public AttributeItem { public: - AttributeColorItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2); + AttributeColorItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2); virtual ~AttributeColorItem(); virtual void showEditor(int column = 1); @@ -162,7 +162,7 @@ private: class AttributeStyleItem : public AttributeItem { public: - AttributeStyleItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2); + AttributeStyleItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2); virtual ~AttributeStyleItem(); virtual void showEditor(int column = 1); diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp index d143caa7..0ef63151 100644 --- a/quanta/treeviews/tagattributetree.cpp +++ b/quanta/treeviews/tagattributetree.cpp @@ -50,8 +50,8 @@ #include "viewmanager.h" -EditableTree::EditableTree(TQWidget *tqparent, const char *name) -: KListView(tqparent, name) +EditableTree::EditableTree(TQWidget *parent, const char *name) +: KListView(parent, name) { m_editable = true; } @@ -100,8 +100,8 @@ void EditableTree::focusOutEvent(TQFocusEvent *) }*/ } -DualEditableTree::DualEditableTree(TQWidget *tqparent, const char *name) -: EditableTree(tqparent, name) +DualEditableTree::DualEditableTree(TQWidget *parent, const char *name) +: EditableTree(parent, name) { curCol = 0; setFocusPolicy(TQ_ClickFocus); @@ -216,8 +216,8 @@ void DualEditableTree::itemClicked(TQListViewItem *item, const TQPoint &, int co } } -TagAttributeTree::TagAttributeTree(TQWidget *tqparent, const char *name) -: EditableTree(tqparent, name) +TagAttributeTree::TagAttributeTree(TQWidget *parent, const char *name) +: EditableTree(parent, name) { setRootIsDecorated( true ); setSorting(-1); @@ -247,9 +247,9 @@ void TagAttributeTree::setCurrentNode(Node *node) return; clear(); m_parentItem = 0L; - //We don't want to be able to edit the text node but it's tqparent. + //We don't want to be able to edit the text node but it's parent. if (node && node->tag->type == Tag::Text) - m_node = node = node->tqparent; + m_node = node = node->parent; if (!node) return; #ifdef HEAVY_DEBUG @@ -260,7 +260,7 @@ void TagAttributeTree::setCurrentNode(Node *node) TopLevelItem *group = 0L; TQString attrName; TQTag *qTag = QuantaCommon::tagFromDTD(node); - Node *n = node->tqparent; + Node *n = node->parent; while (n) { if (n->tag->type == Tag::XmlTag) @@ -272,7 +272,7 @@ void TagAttributeTree::setCurrentNode(Node *node) } m_parentItem->addNode(n); } - n = n->tqparent; + n = n->parent; } if (m_parentItem) @@ -429,13 +429,13 @@ void TagAttributeTree::slotParentSelected(int index) void TagAttributeTree::slotCollapsed(TQListViewItem *item) { - if (m_parentItem && item == m_parentItem->tqparent()) + if (m_parentItem && item == m_parentItem->parent()) m_parentItem->showList(false); } void TagAttributeTree::slotExpanded(TQListViewItem *item) { - if (m_parentItem && item == m_parentItem->tqparent()) + if (m_parentItem && item == m_parentItem->parent()) m_parentItem->showList(true); } @@ -451,8 +451,8 @@ void TagAttributeTree::slotDelayedSetCurrentNode() } } -EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *tqparent, const char *name) -: TQWidget(tqparent, name) +EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char *name) +: TQWidget(parent, name) { widgetLayout = new TQGridLayout( this, 1, 1, 11, 6, "MainLayout"); @@ -501,9 +501,9 @@ void EnhancedTagAttributeTree::setCurrentNode(Node *node) void EnhancedTagAttributeTree::NodeSelected(Node *node) { curNode = node; - //We don't want to be able to edit the text node but it's tqparent. + //We don't want to be able to edit the text node but it's parent. if (node && node->tag->type == Tag::Text) - curNode = node = node->tqparent; + curNode = node = node->parent; showCaption(); emit newNodeSelected(node); } @@ -614,14 +614,14 @@ void EnhancedTagAttributeTree::deleteNode() //remove the Nodes oldCurNode = curNode; - oldCurNodeParent = curNode->tqparent; + oldCurNodeParent = curNode->parent; curNode = 0L; attrTree->setCurrentNode(curNode); modifs = new NodeModifsSet(); kafkaCommon::extractAndDeleteNode(oldCurNode, modifs, false); - //Then we see if the new tqparent - child relationships are valid, and if not, delete the child and restart + //Then we see if the new parent - child relationships are valid, and if not, delete the child and restart if(oldCurNodeParent) { oldCurNodeParentTQTag = QuantaCommon::tagFromDTD(oldCurNodeParent); diff --git a/quanta/treeviews/tagattributetree.h b/quanta/treeviews/tagattributetree.h index 32dea87a..c36c3406 100644 --- a/quanta/treeviews/tagattributetree.h +++ b/quanta/treeviews/tagattributetree.h @@ -36,7 +36,7 @@ Q_OBJECT TQ_OBJECT public: - EditableTree(TQWidget *tqparent = 0, const char *name = 0); + EditableTree(TQWidget *parent = 0, const char *name = 0); virtual ~EditableTree(); virtual void setCurrentItem( TQListViewItem *i); @@ -58,7 +58,7 @@ class DualEditableTree : public EditableTree Q_OBJECT TQ_OBJECT public: - DualEditableTree(TQWidget *tqparent = 0, const char *name = 0); + DualEditableTree(TQWidget *parent = 0, const char *name = 0); virtual ~DualEditableTree(); virtual void setCurrentItem ( TQListViewItem *i); @@ -86,7 +86,7 @@ class TagAttributeTree : public EditableTree { TQ_OBJECT public: - TagAttributeTree(TQWidget *tqparent=0, const char *name=0); + TagAttributeTree(TQWidget *parent=0, const char *name=0); virtual ~TagAttributeTree(); void setCurrentNode(Node *node); @@ -118,7 +118,7 @@ class EnhancedTagAttributeTree : public TQWidget Q_OBJECT TQ_OBJECT public: - EnhancedTagAttributeTree(TQWidget *tqparent = 0, const char *name = 0); + EnhancedTagAttributeTree(TQWidget *parent = 0, const char *name = 0); virtual ~EnhancedTagAttributeTree(); void setCurrentNode(Node *node); diff --git a/quanta/treeviews/templatedirform.ui b/quanta/treeviews/templatedirform.ui index 54e8637b..d08f6b28 100644 --- a/quanta/treeviews/templatedirform.ui +++ b/quanta/treeviews/templatedirform.ui @@ -60,7 +60,7 @@ parentAttr - &Inherit tqparent attribute + &Inherit parent attribute diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp index 51928bcf..ae828dcb 100644 --- a/quanta/treeviews/templatestreeview.cpp +++ b/quanta/treeviews/templatestreeview.cpp @@ -79,22 +79,22 @@ TQMap i18nToType; //TemplatesTreeBranch implementation -TemplatesTreeBranch::TemplatesTreeBranch(KFileTreeView *tqparent, const KURL& url, +TemplatesTreeBranch::TemplatesTreeBranch(KFileTreeView *parent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden, KFileTreeViewItem *branchRoot) - : BaseTreeBranch(tqparent, url, name, pix, showHidden, branchRoot) + : BaseTreeBranch(parent, url, name, pix, showHidden, branchRoot) { } -KFileTreeViewItem* TemplatesTreeBranch::createTreeViewItem(KFileTreeViewItem *tqparent, +KFileTreeViewItem* TemplatesTreeBranch::createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem ) { BaseTreeViewItem *tvi = 0; - if( tqparent && fileItem ) + if( parent && fileItem ) { KURL url = fileItem->url(); - tvi = new BaseTreeViewItem( tqparent, fileItem, this ); + tvi = new BaseTreeViewItem( parent, fileItem, this ); if (tvi && fileItem->isDir()) { if (url.isLocalFile()) @@ -106,7 +106,7 @@ KFileTreeViewItem* TemplatesTreeBranch::createTreeViewItem(KFileTreeViewItem *tq } } else { - url = static_cast(tqparent)->url(); + url = static_cast(parent)->url(); } TQFileInfo dotFileInfo(url.path() + "/.dirinfo"); while ((!dotFileInfo.exists()) && (dotFileInfo.dirPath() != "/")) @@ -123,14 +123,14 @@ KFileTreeViewItem* TemplatesTreeBranch::createTreeViewItem(KFileTreeViewItem *tq } else - kdDebug(24000) << "TemplatesTreeBranch::createTreeViewItem: Have no tqparent" << endl; + kdDebug(24000) << "TemplatesTreeBranch::createTreeViewItem: Have no parent" << endl; return tvi; } -TemplatesTreeView::TemplatesTreeView(KMainWindow *tqparent, const char *name ) - : BaseTreeView(tqparent,name), m_projectDir(0), m_mainWindow(tqparent) +TemplatesTreeView::TemplatesTreeView(KMainWindow *parent, const char *name ) + : BaseTreeView(parent,name), m_projectDir(0), m_mainWindow(parent) { typeToi18n["text/all"] = i18n("Text Snippet"); typeToi18n["file/all"] = i18n("Binary File"); @@ -383,10 +383,10 @@ void TemplatesTreeView::slotNewDir() if (m_dirInfo.mimeType.isEmpty()) { - createDirDlg->parentAttr->setText(i18n("&Inherit tqparent attribute (nothing)")); + createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (nothing)")); } else { - createDirDlg->parentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_dirInfo.mimeType])); + createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (%1)").tqarg(typeToi18n[m_dirInfo.mimeType])); } if (createDirDlg->exec()) { @@ -616,10 +616,10 @@ void TemplatesTreeView::slotProperties() } if (m_parentDirInfo.mimeType.isEmpty()) { - m_quantaProperties->parentAttr->setText(i18n("&Inherit tqparent attribute (nothing)")); + m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (nothing)")); } else { - m_quantaProperties->parentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_parentDirInfo.mimeType])); + m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (%1)").tqarg(typeToi18n[m_parentDirInfo.mimeType])); } m_quantaProperties->preTextEdit->setText(m_dirInfo.preText); m_quantaProperties->postTextEdit->setText(m_dirInfo.postText); @@ -709,10 +709,10 @@ void TemplatesTreeView::slotPropertiesApplied() bool result = writeDirInfo(); KFileTreeViewItem *item = currentKFileTreeViewItem(); if (item && !item->isDir()) - item = static_cast(item->tqparent()); + item = static_cast(item->parent()); if (result && item && !typeString.isEmpty()) { - if (item->tqparent() && item->isDir()) + if (item->parent() && item->isDir()) item->setText(1, typeString); updateTypeDescription(item, typeString); } @@ -723,7 +723,7 @@ void TemplatesTreeView::slotPropertiesApplied() void TemplatesTreeView::updateTypeDescription(KFileTreeViewItem *item, const TQString &typeString) { - if (item->tqparent() && item->isDir()) + if (item->parent() && item->isDir()) item->setText(1, typeString); KFileTreeViewItem *curItem = static_cast(item->firstChild()); while (curItem && curItem != static_cast(item->nextSibling())) diff --git a/quanta/treeviews/templatestreeview.h b/quanta/treeviews/templatestreeview.h index efccc56a..017d3c06 100644 --- a/quanta/treeviews/templatestreeview.h +++ b/quanta/treeviews/templatestreeview.h @@ -27,12 +27,12 @@ class KMainWindow; class TemplatesTreeBranch : public BaseTreeBranch { public: - TemplatesTreeBranch(KFileTreeView *tqparent, const KURL& url, + TemplatesTreeBranch(KFileTreeView *parent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden = false, KFileTreeViewItem *branchRoot = 0L); /** read the mimetype */ - virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *tqparent, + virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem ); }; @@ -49,10 +49,10 @@ public: * the parameter are only used at the first call to create the class * */ - static TemplatesTreeView* const ref(KMainWindow *tqparent = 0L, const char *name = 0L) + static TemplatesTreeView* const ref(KMainWindow *parent = 0L, const char *name = 0L) { static TemplatesTreeView *m_ref; - if (!m_ref) m_ref = new TemplatesTreeView (tqparent, name); + if (!m_ref) m_ref = new TemplatesTreeView (parent, name); return m_ref; } @@ -119,7 +119,7 @@ private: * If you need the class use TemplatesTreeView::ref() for * construction and reference */ - TemplatesTreeView(KMainWindow *tqparent, const char *name = 0L); + TemplatesTreeView(KMainWindow *parent, const char *name = 0L); /** Filters the template through and action, and returns the modified/filtered template file */ KURL filterTemplate(); diff --git a/quanta/treeviews/uploadtreefile.cpp b/quanta/treeviews/uploadtreefile.cpp index b4ad6845..c4c40197 100644 --- a/quanta/treeviews/uploadtreefile.cpp +++ b/quanta/treeviews/uploadtreefile.cpp @@ -27,12 +27,12 @@ #include "uploadtreefile.h" #include "resource.h" -UploadTreeFile::UploadTreeFile( UploadTreeFolder *tqparent, const KURL &a_url, const KFileItem &a_fileItem) - : KListViewItem( tqparent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString()) +UploadTreeFile::UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, const KFileItem &a_fileItem) + : KListViewItem( parent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString()) { m_url = a_url; isDir = false; - parentFolder = tqparent; + parentFolder = parent; m_fileItem = new KFileItem(a_fileItem); m_confirm = false; @@ -40,8 +40,8 @@ UploadTreeFile::UploadTreeFile( UploadTreeFolder *tqparent, const KURL &a_url, c setText(0, m_url.fileName()); } -UploadTreeFile::UploadTreeFile( TQListView *tqparent, const KURL &a_url, const KFileItem &a_fileItem) - : KListViewItem( tqparent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString()) +UploadTreeFile::UploadTreeFile( TQListView *parent, const KURL &a_url, const KFileItem &a_fileItem) + : KListViewItem( parent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString()) { m_url = a_url; isDir = false; diff --git a/quanta/treeviews/uploadtreefile.h b/quanta/treeviews/uploadtreefile.h index 246b3fe0..736a3a88 100644 --- a/quanta/treeviews/uploadtreefile.h +++ b/quanta/treeviews/uploadtreefile.h @@ -28,8 +28,8 @@ class KFileItem; class UploadTreeFile : public KListViewItem { public: - UploadTreeFile( UploadTreeFolder *tqparent, const KURL &a_url, const KFileItem &a_fileItem); - UploadTreeFile( TQListView *tqparent, const KURL &a_url, const KFileItem &a_fileItem); + UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, const KFileItem &a_fileItem); + UploadTreeFile( TQListView *parent, const KURL &a_url, const KFileItem &a_fileItem); ~UploadTreeFile(); void setWhichPixmap(const TQString& pixmap); diff --git a/quanta/treeviews/uploadtreefolder.cpp b/quanta/treeviews/uploadtreefolder.cpp index 7e719912..123eaf35 100644 --- a/quanta/treeviews/uploadtreefolder.cpp +++ b/quanta/treeviews/uploadtreefolder.cpp @@ -27,10 +27,10 @@ #include "uploadtreefile.h" #include "resource.h" -UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * tqparent, const char * name ) - : KListViewItem( tqparent, name, "", "", "" ) +UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * parent, const char * name ) + : KListViewItem( parent, name, "", "", "" ) { - parentFolder = tqparent; + parentFolder = parent; m_url = a_url; m_url.adjustPath(1); @@ -40,8 +40,8 @@ UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * tqparen } -UploadTreeFolder::UploadTreeFolder(const KURL &a_url, TQListView * tqparent, const char * name ) - : KListViewItem( tqparent, name, "", "", "" ) +UploadTreeFolder::UploadTreeFolder(const KURL &a_url, TQListView * parent, const char * name ) + : KListViewItem( parent, name, "", "", "" ) { parentFolder = 0L; m_url = a_url; diff --git a/quanta/treeviews/uploadtreefolder.h b/quanta/treeviews/uploadtreefolder.h index fd08276f..d6959ab3 100644 --- a/quanta/treeviews/uploadtreefolder.h +++ b/quanta/treeviews/uploadtreefolder.h @@ -32,8 +32,8 @@ class KURL; class UploadTreeFolder : public KListViewItem { public: - UploadTreeFolder( const KURL &a_url, TQListView * tqparent, const char * name); - UploadTreeFolder( const KURL &a_url, UploadTreeFolder * tqparent, const char * name ); + UploadTreeFolder( const KURL &a_url, TQListView * parent, const char * name); + UploadTreeFolder( const KURL &a_url, UploadTreeFolder * parent, const char * name ); virtual ~UploadTreeFolder(); /** used for sorting */ diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp index 4318a096..8f5457e2 100644 --- a/quanta/treeviews/uploadtreeview.cpp +++ b/quanta/treeviews/uploadtreeview.cpp @@ -23,8 +23,8 @@ #include "uploadtreeview.h" #include "quantacommon.h" -UploadTreeView::UploadTreeView( TQWidget *tqparent, const char *name ) : - KListView(tqparent, name) +UploadTreeView::UploadTreeView( TQWidget *parent, const char *name ) : + KListView(parent, name) { setRootIsDecorated( true ); setSorting( 0 ); diff --git a/quanta/treeviews/uploadtreeview.h b/quanta/treeviews/uploadtreeview.h index 19d487db..56f4bff0 100644 --- a/quanta/treeviews/uploadtreeview.h +++ b/quanta/treeviews/uploadtreeview.h @@ -33,7 +33,7 @@ class UploadTreeView : public KListView { Q_OBJECT TQ_OBJECT public: - UploadTreeView( TQWidget *tqparent, const char *name=0L ); + UploadTreeView( TQWidget *parent, const char *name=0L ); ~UploadTreeView(); UploadTreeFile* addItem( const KURL &a_url, const KFileItem &a_fileItem); TQListViewItem* findItem( const TQString& ); diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp index f41384c1..b4d43f48 100644 --- a/quanta/utility/qpevents.cpp +++ b/quanta/utility/qpevents.cpp @@ -36,8 +36,8 @@ #include "tagaction.h" //TODO: Better create a class for each internal event action -QPEvents::QPEvents(TQObject *tqparent, const char *name) - : TQObject(tqparent, name) +QPEvents::QPEvents(TQObject *parent, const char *name) + : TQObject(parent, name) { m_eventNames["before_save"] = i18n("Before Document Save"); m_eventNames["after_save"] = i18n("After Document Save"); diff --git a/quanta/utility/qpevents.h b/quanta/utility/qpevents.h index b46770ef..6d7372a2 100644 --- a/quanta/utility/qpevents.h +++ b/quanta/utility/qpevents.h @@ -55,10 +55,10 @@ class QPEvents : public TQObject Q_OBJECT TQ_OBJECT public: - static QPEvents* const ref(TQObject *tqparent = 0L) + static QPEvents* const ref(TQObject *parent = 0L) { static QPEvents *m_ref; - if (!m_ref) m_ref = new QPEvents(tqparent); + if (!m_ref) m_ref = new QPEvents(parent); return m_ref; } ~QPEvents(); @@ -74,7 +74,7 @@ public slots: void slotEventHappened(const TQString& name, const TQString& argument1, const TQString& argument2); private: - QPEvents(TQObject *tqparent = 0, const char *name = 0); + QPEvents(TQObject *parent = 0, const char *name = 0); /** Calls the action associated with an event. Returns true if the call succeeded, false otherwise. The call might fail if: - the action type is unknown diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp index ad0f3327..3208a874 100644 --- a/quanta/utility/quantabookmarks.cpp +++ b/quanta/utility/quantabookmarks.cpp @@ -61,12 +61,12 @@ static void ssort( TQMemArray &a, int max ) // TODO add a insort() or bubble_sort - more efficient for aboutToShow() ? -QuantaBookmarks::QuantaBookmarks(ViewManager *tqparent,Sorting sort, bool onlyFromActualDocument ) - : TQObject( tqparent, "bookmarks" ) +QuantaBookmarks::QuantaBookmarks(ViewManager *parent,Sorting sort, bool onlyFromActualDocument ) + : TQObject( parent, "bookmarks" ) , m_sorting(sort) , m_onlyFromActualDocument(onlyFromActualDocument) { - m_viewManager = tqparent; + m_viewManager = parent; _tries=0; m_bookmarksMenu = 0L; m_doc = 0L; diff --git a/quanta/utility/quantabookmarks.h b/quanta/utility/quantabookmarks.h index a613aa9c..fa9f00cd 100644 --- a/quanta/utility/quantabookmarks.h +++ b/quanta/utility/quantabookmarks.h @@ -47,7 +47,7 @@ class QuantaBookmarks : public TQObject public: enum Sorting { Position, Creation }; - QuantaBookmarks(ViewManager *tqparent, Sorting sort=Position, bool onlyFromActualDocument = false ); + QuantaBookmarks(ViewManager *parent, Sorting sort=Position, bool onlyFromActualDocument = false ); virtual ~QuantaBookmarks(); void createActions( KActionCollection* ); diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp index bc279dc9..e50e55da 100644 --- a/quanta/utility/quantacommon.cpp +++ b/quanta/utility/quantacommon.cpp @@ -381,7 +381,7 @@ TQString QuantaCommon::qUrl(const KURL &url) /** No descriptions */ void QuantaCommon::dirCreationError(TQWidget *widget, const KURL& url) { - KMessageBox::error(widget, i18n("Cannot create folder
%1.
Check that you have write permission in the tqparent folder or that the connection to
%2
is valid.") + KMessageBox::error(widget, i18n("Cannot create folder
%1.
Check that you have write permission in the parent folder or that the connection to
%2
is valid.") .tqarg(url.prettyURL(0, KURL::StripFileProtocol)) .tqarg(url.protocol()+"://"+url.user()+"@"+url.host()));} diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp index a4a58a43..4a559962 100644 --- a/quanta/utility/tagaction.cpp +++ b/quanta/utility/tagaction.cpp @@ -1055,11 +1055,11 @@ void TagAction::applyTagInSelection(Node* start_node, int start_offset, Node* en Node* nodeCursor = start_node; Node* nodeParent = start_node; if (nodeParent->tag->type == Tag::Text) - nodeParent = nodeParent->tqparent; + nodeParent = nodeParent->parent; - //Checking if at least one tqparent of node can have a Text Node as child, otherwise + //Checking if at least one parent of node can have a Text Node as child, otherwise //it is impossible for the - //user to add this node. In that case, try to insert the Node in the closest tqparent accepting it. + //user to add this node. In that case, try to insert the Node in the closest parent accepting it. //e.g. TR : a normal insertion would require to have the caret in the TABLE Node, but it is //impossible TQTag* nodeTQTag = QuantaCommon::tagFromDTD(w->defaultDTD(), node->tag->name); @@ -1080,7 +1080,7 @@ void TagAction::applyTagInSelection(Node* start_node, int start_offset, Node* en if (specialTagInsertion) // Attention: not smartTagInsertion { - //let's try to insert this node in the closest tqparent accepting it. + //let's try to insert this node in the closest parent accepting it. while (nodeParent) { TQTag* nodeParentTQTag = QuantaCommon::tagFromDTD(w->defaultDTD(), nodeParent->tag->name); @@ -1092,7 +1092,7 @@ void TagAction::applyTagInSelection(Node* start_node, int start_offset, Node* en nodeTreeModified = true; break; } - nodeParent = nodeParent->tqparent; + nodeParent = nodeParent->parent; } } else if(!nodeTQTag->isSingle()) @@ -1248,7 +1248,7 @@ void TagAction::deapplyTagInSelection(Node* start_node, int start_offset, Node* Node* common_parent_start_child = kafkaCommon::getCommonParentChild(start_node, tag_parent); Node* common_parent_end_child = kafkaCommon::getCommonParentChild(end_node, tag_parent); - Node* parent_of_tag_parent = tag_parent->tqparent; + Node* parent_of_tag_parent = tag_parent->parent; if(common_parent_end_child == common_parent_start_child) common_parent_end_child = 0; if(!common_parent_start_child) diff --git a/quanta/utility/tagactionmanager.cpp b/quanta/utility/tagactionmanager.cpp index 88eb0d08..3733aaaf 100644 --- a/quanta/utility/tagactionmanager.cpp +++ b/quanta/utility/tagactionmanager.cpp @@ -54,18 +54,18 @@ TagActionManager* TagActionManager::self() return s_mSelf; } -void TagActionManager::initActions(TQWidget* tqparent) +void TagActionManager::initActions(TQWidget* parent) { - Q_ASSERT(tqparent); + Q_ASSERT(parent); - m_actionCollection = new KActionCollection(tqparent); + m_actionCollection = new KActionCollection(parent); TagActionSet* general(new TagActionSet()); - general->initActions(tqparent); + general->initActions(parent); m_tagActionSets.append(general); TableTagActionSet* table(new TableTagActionSet()); - table->initActions(tqparent); + table->initActions(parent); m_tagActionSets.append(table); } diff --git a/quanta/utility/tagactionmanager.h b/quanta/utility/tagactionmanager.h index 77f7ad23..0977d32c 100644 --- a/quanta/utility/tagactionmanager.h +++ b/quanta/utility/tagactionmanager.h @@ -62,7 +62,7 @@ private: TagActionManager(TagActionManager const&) {} - void initActions(TQWidget* tqparent); + void initActions(TQWidget* parent); private: static TagActionManager* s_mSelf; diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp index 7d85aaba..d74a2ca9 100644 --- a/quanta/utility/tagactionset.cpp +++ b/quanta/utility/tagactionset.cpp @@ -40,8 +40,8 @@ #include "resource.h" -TagActionSetAbstract::TagActionSetAbstract(TQObject *tqparent, const char *name) - : TQObject(tqparent, name), m_currentNode(0) +TagActionSetAbstract::TagActionSetAbstract(TQObject *parent, const char *name) + : TQObject(parent, name), m_currentNode(0) {} TagActionSetAbstract::~TagActionSetAbstract() @@ -53,7 +53,7 @@ Node* TagActionSetAbstract::parentTag(Node* node, TQString const& tagName) Node* aux = node; while(aux && aux->nodeName().lower() != tagName) - aux = aux->tqparent; + aux = aux->parent; return aux; } @@ -81,8 +81,8 @@ bool TagActionSetAbstract::fillWithTagActions(TQWidget* /*widget*/, DOM::Node co //_____________________________________________________________________________ -TagActionSet::TagActionSet(TQObject *tqparent, const char *name) - : TagActionSetAbstract(tqparent, name), m_separator(0) +TagActionSet::TagActionSet(TQObject *parent, const char *name) + : TagActionSetAbstract(parent, name), m_separator(0) { m_separator = new KActionSeparator(); } @@ -96,7 +96,7 @@ void TagActionSet::initActionMenus(TQWidget* /*widget*/) { } -void TagActionSet::initActions(TQWidget* /*tqparent*/) +void TagActionSet::initActions(TQWidget* /*parent*/) { KActionCollection* ac(TagActionManager::self()->actionCollection()); @@ -266,8 +266,8 @@ void TagActionSet::slotCutDivElement() //_____________________________________________________________________________ -TableTagActionSet::TableTagActionSet(TQObject *tqparent, const char *name) - : TagActionSetAbstract(tqparent, name), m_separator(0), m_tableActionMenu_0(0), m_insertActionMenu_1(0) +TableTagActionSet::TableTagActionSet(TQObject *parent, const char *name) + : TagActionSetAbstract(parent, name), m_separator(0), m_tableActionMenu_0(0), m_insertActionMenu_1(0) { m_separator = new KActionSeparator(); } @@ -287,10 +287,10 @@ void TableTagActionSet::initActionMenus(TQWidget* widget) } -void TableTagActionSet::initActions(TQWidget* tqparent) +void TableTagActionSet::initActions(TQWidget* parent) { if(!m_tableActionMenu_0) - initActionMenus(tqparent); + initActionMenus(parent); KActionCollection* ac(TagActionManager::self()->actionCollection()); @@ -587,7 +587,7 @@ void TableTagActionSet::slotInsertRowAbove() if(!nearRow) return; - Node* nodeParent= nearRow->tqparent; + Node* nodeParent= nearRow->parent; QuantaView* view = ViewManager::ref()->activeView(); NodeModifsSet *modifs = new NodeModifsSet(); @@ -619,7 +619,7 @@ void TableTagActionSet::slotInsertRowBelow() if(!nearRow) return; - Node* nodeParent= nearRow->tqparent; + Node* nodeParent= nearRow->parent; Node* nextSibling = nearRow->SNext(); QuantaView* view = ViewManager::ref()->activeView(); diff --git a/quanta/utility/tagactionset.h b/quanta/utility/tagactionset.h index ad51a917..49d49b6a 100644 --- a/quanta/utility/tagactionset.h +++ b/quanta/utility/tagactionset.h @@ -40,7 +40,7 @@ class TagActionSetAbstract : public TQObject Q_OBJECT TQ_OBJECT public: - TagActionSetAbstract(TQObject *tqparent = 0, const char *name = 0); + TagActionSetAbstract(TQObject *parent = 0, const char *name = 0); virtual ~TagActionSetAbstract(); DOM::Node const& currentDomNode() const {return m_currentDomNode;} @@ -49,7 +49,7 @@ public: static Node* firstChildTag(Node* node, TQString const& tagName); virtual bool isInTagContext(/*DOM::Node const& node*/) const = 0; - virtual void initActions(TQWidget* tqparent) = 0; + virtual void initActions(TQWidget* parent) = 0; virtual bool fillWithTagActions(TQWidget* widget, DOM::Node const& node); virtual void unplugAllActions(TQWidget* widget) const = 0; @@ -69,11 +69,11 @@ class TagActionSet : public TagActionSetAbstract Q_OBJECT TQ_OBJECT public: - TagActionSet(TQObject *tqparent = 0, const char *name = 0); + TagActionSet(TQObject *parent = 0, const char *name = 0); virtual ~TagActionSet() {} virtual bool isInTagContext() const; - virtual void initActions(TQWidget* tqparent); + virtual void initActions(TQWidget* parent); virtual bool fillWithTagActions(TQWidget* widget, DOM::Node const& node); virtual void unplugAllActions(TQWidget* widget) const; @@ -98,12 +98,12 @@ class TableTagActionSet : public TagActionSetAbstract Q_OBJECT TQ_OBJECT public: - TableTagActionSet(TQObject *tqparent = 0, const char *name = 0); + TableTagActionSet(TQObject *parent = 0, const char *name = 0); virtual ~TableTagActionSet() {} virtual bool isInTagContext(/*DOM::Node const& node*/) const; - virtual void initActions(TQWidget* tqparent); + virtual void initActions(TQWidget* parent); virtual bool fillWithTagActions(TQWidget* widget, DOM::Node const& node); virtual void unplugAllActions(TQWidget* widget) const; diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp index d519faf3..05061762 100644 --- a/quanta/utility/toolbartabwidget.cpp +++ b/quanta/utility/toolbartabwidget.cpp @@ -38,28 +38,28 @@ //app includes #include "toolbartabwidget.h" -ToolbarTabWidget::ToolbarTabWidget(TQWidget * tqparent, const char * name, WFlags f) -:TQTabWidget(tqparent, name, f) +ToolbarTabWidget::ToolbarTabWidget(TQWidget * parent, const char * name, WFlags f) +:TQTabWidget(parent, name, f) { m_popupMenu = new KPopupMenu(this); m_popupMenu->insertTitle(i18n("Toolbar Menu"), 1); - m_popupMenu->insertItem(i18n("New Action..."), tqparent, TQT_SLOT(slotNewAction())); + m_popupMenu->insertItem(i18n("New Action..."), parent, TQT_SLOT(slotNewAction())); m_popupMenu->insertSeparator(); - m_popupMenu->insertItem(i18n("New Toolbar..."), tqparent, TQT_SLOT(slotAddToolbar())); + m_popupMenu->insertItem(i18n("New Toolbar..."), parent, TQT_SLOT(slotAddToolbar())); m_popupMenu->insertItem(i18n("Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar())); m_popupMenu->insertItem(i18n("Rename Toolbar..."), this, TQT_SLOT(slotRenameToolbar())); m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), this, TQT_SLOT(slotEditToolbar())); connect(this, TQT_SIGNAL(removeToolbar(const TQString&)), - tqparent, TQT_SLOT(slotRemoveToolbar(const TQString&))); + parent, TQT_SLOT(slotRemoveToolbar(const TQString&))); connect(this, TQT_SIGNAL(renameToolbar(const TQString&)), - tqparent, TQT_SLOT(slotRenameToolbar(const TQString&))); + parent, TQT_SLOT(slotRenameToolbar(const TQString&))); connect(this, TQT_SIGNAL(editToolbar(const TQString&)), - tqparent, TQT_SLOT(slotConfigureToolbars(const TQString&))); + parent, TQT_SLOT(slotConfigureToolbars(const TQString&))); connect(this, TQT_SIGNAL(newAction()), - tqparent, TQT_SLOT(slotNewAction())); + parent, TQT_SLOT(slotNewAction())); connect(this, TQT_SIGNAL(addToolbar()), - tqparent, TQT_SLOT(slotAddToolbar())); + parent, TQT_SLOT(slotAddToolbar())); KAcceleratorManager::setNoAccel(this); } @@ -124,10 +124,10 @@ TQWidget* ToolbarTabWidget::page(const TQString& id) void ToolbarTabWidget::removePage(TQWidget * w) { - TQWidget *tqparent = w->parentWidget(); - if (w->inherits("KToolBar") && tqparent) + TQWidget *parent = w->parentWidget(); + if (w->inherits("KToolBar") && parent) { - TQTabWidget::removePage(tqparent); + TQTabWidget::removePage(parent); for (TQMap::ConstIterator it = toolbarList.constBegin(); it != toolbarList.constEnd(); ++it) { if (it.data() == w) @@ -136,7 +136,7 @@ void ToolbarTabWidget::removePage(TQWidget * w) break; } } - delete tqparent; + delete parent; } } @@ -223,11 +223,11 @@ int ToolbarTabWidget::tabHeight() const } -QuantaToolBar::QuantaToolBar(TQWidget *tqparent, const char *name, bool honor_style, bool readConfig) -:KToolBar (tqparent, name=0, honor_style, readConfig) +QuantaToolBar::QuantaToolBar(TQWidget *parent, const char *name, bool honor_style, bool readConfig) +:KToolBar (parent, name=0, honor_style, readConfig) { m_popupMenu = new KPopupMenu(this); - m_toolbarTab = dynamic_cast(tqparent->parentWidget()); + m_toolbarTab = dynamic_cast(parent->parentWidget()); currentActionName = ""; m_iconTextMenu = new KPopupMenu(this); m_iconTextMenu->setCheckable(true); diff --git a/quanta/utility/toolbartabwidget.h b/quanta/utility/toolbartabwidget.h index 11318394..7fd47031 100644 --- a/quanta/utility/toolbartabwidget.h +++ b/quanta/utility/toolbartabwidget.h @@ -31,10 +31,10 @@ class ToolbarTabWidget: public TQTabWidget public: TQWidgetStack *m_widgetStack; - static ToolbarTabWidget* const ref(TQWidget *tqparent = 0L, const char *name = 0L) + static ToolbarTabWidget* const ref(TQWidget *parent = 0L, const char *name = 0L) { static ToolbarTabWidget *m_ref; - if (!m_ref) m_ref = new ToolbarTabWidget (tqparent, name); + if (!m_ref) m_ref = new ToolbarTabWidget (parent, name); return m_ref; } virtual ~ToolbarTabWidget(){}; @@ -77,7 +77,7 @@ protected: TQMap toolbarList; private: - ToolbarTabWidget(TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0); + ToolbarTabWidget(TQWidget * parent = 0, const char * name = 0, WFlags f = 0); KToolBar::IconText m_iconText; }; @@ -88,7 +88,7 @@ class QuantaToolBar: public KToolBar TQ_OBJECT public: - QuantaToolBar (TQWidget *tqparent, const char *name=0, bool honor_style=FALSE, bool readConfig=TRUE); + QuantaToolBar (TQWidget *parent, const char *name=0, bool honor_style=FALSE, bool readConfig=TRUE); virtual ~QuantaToolBar() {}; private slots: -- cgit v1.2.1