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 +- 59 files changed, 167 insertions(+), 167 deletions(-) (limited to 'quanta/components') 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 ); -- cgit v1.2.1