diff options
482 files changed, 2504 insertions, 2504 deletions
diff --git a/kfilereplace/kaddstringdlg.cpp b/kfilereplace/kaddstringdlg.cpp index 87750a9b..9c555ee6 100644 --- a/kfilereplace/kaddstringdlg.cpp +++ b/kfilereplace/kaddstringdlg.cpp @@ -37,7 +37,7 @@ using namespace whatthisNameSpace; -KAddStringDlg::KAddStringDlg(RCOptions* info, bool wantEdit, TQWidget *tqparent, const char *name) : KAddStringDlgS(tqparent,name,true) +KAddStringDlg::KAddStringDlg(RCOptions* info, bool wantEdit, TQWidget *parent, const char *name) : KAddStringDlgS(parent,name,true) { m_option = info; m_wantEdit = wantEdit; diff --git a/kfilereplace/kaddstringdlg.h b/kfilereplace/kaddstringdlg.h index 0a3ee320..2f20c56c 100644 --- a/kfilereplace/kaddstringdlg.h +++ b/kfilereplace/kaddstringdlg.h @@ -36,7 +36,7 @@ class KAddStringDlg : public KAddStringDlgS bool m_wantEdit; public: //Constructors - KAddStringDlg(RCOptions* info, bool wantEdit, TQWidget *tqparent=0, const char *name=0); + KAddStringDlg(RCOptions* info, bool wantEdit, TQWidget *parent=0, const char *name=0); private slots: void slotOK(); diff --git a/kfilereplace/kfilereplacepart.cpp b/kfilereplace/kfilereplacepart.cpp index d6a5aa6d..e805d3ea 100644 --- a/kfilereplace/kfilereplacepart.cpp +++ b/kfilereplace/kfilereplacepart.cpp @@ -60,7 +60,7 @@ typedef KParts::GenericFactory<KFileReplacePart> FileReplaceFactory; K_EXPORT_COMPONENT_FACTORY( libkfilereplacepart, FileReplaceFactory ) -KFileReplacePart::KFileReplacePart(TQWidget* parentWidget, const char* , TQObject* tqparent, const char* name, const TQStringList & ) : KParts::ReadOnlyPart(tqparent,name) +KFileReplacePart::KFileReplacePart(TQWidget* parentWidget, const char* , TQObject* parent, const char* name, const TQStringList & ) : KParts::ReadOnlyPart(parent,name) { setInstance(FileReplaceFactory::instance()); KGlobal::locale()->insertCatalogue("kfilereplace"); diff --git a/kfilereplace/kfilereplacepart.h b/kfilereplace/kfilereplacepart.h index d0cdb443..920d45c9 100644 --- a/kfilereplace/kfilereplacepart.h +++ b/kfilereplace/kfilereplacepart.h @@ -49,7 +49,7 @@ class KFileReplacePart: public KParts::ReadOnlyPart public://Constructors KFileReplacePart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, + TQObject *parent, const char *name, const TQStringList &args); ~KFileReplacePart(); diff --git a/kfilereplace/kfilereplaceview.cpp b/kfilereplace/kfilereplaceview.cpp index 10867844..9800f119 100644 --- a/kfilereplace/kfilereplaceview.cpp +++ b/kfilereplace/kfilereplaceview.cpp @@ -43,7 +43,7 @@ using namespace whatthisNameSpace; -KFileReplaceView::KFileReplaceView(RCOptions* info, TQWidget *tqparent,const char *name):KFileReplaceViewWdg(tqparent,name) +KFileReplaceView::KFileReplaceView(RCOptions* info, TQWidget *parent,const char *name):KFileReplaceViewWdg(parent,name) { m_option = info; @@ -65,8 +65,8 @@ TQString KFileReplaceView::currentPath() if(! m_lviCurrent) lvi = m_rv->currentItem(); else lvi = (TQListViewItem*) m_lviCurrent; - while (lvi->tqparent()) - lvi = lvi->tqparent(); + while (lvi->parent()) + lvi = lvi->parent(); return TQString(lvi->text(1)+"/"+lvi->text(0)); } @@ -562,7 +562,7 @@ coord KFileReplaceView::extractWordCoordinates(TQListViewItem* lvi) c.column = 0; TQString s = lvi->text(0); //qWarning("WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW=%s",s.latin1()); - /* if(lvi->tqparent()) s = lvi->text(0); + /* if(lvi->parent()) s = lvi->text(0); else return c;*/ TQString temp; diff --git a/kfilereplace/kfilereplaceview.h b/kfilereplace/kfilereplaceview.h index 1402c0a7..07a346e6 100644 --- a/kfilereplace/kfilereplaceview.h +++ b/kfilereplace/kfilereplaceview.h @@ -66,7 +66,7 @@ class KFileReplaceView : public KFileReplaceViewWdg * m_sv; public://Constructors - KFileReplaceView(RCOptions* info, TQWidget *tqparent,const char *name); + KFileReplaceView(RCOptions* info, TQWidget *parent,const char *name); public: TQString currentPath(); diff --git a/kfilereplace/knewprojectdlg.cpp b/kfilereplace/knewprojectdlg.cpp index 5aa5abc8..e7587f01 100644 --- a/kfilereplace/knewprojectdlg.cpp +++ b/kfilereplace/knewprojectdlg.cpp @@ -51,7 +51,7 @@ using namespace whatthisNameSpace; -KNewProjectDlg::KNewProjectDlg(RCOptions* info, TQWidget *tqparent, const char *name) : KNewProjectDlgS(tqparent, name) +KNewProjectDlg::KNewProjectDlg(RCOptions* info, TQWidget *parent, const char *name) : KNewProjectDlgS(parent, name) { m_searchNowFlag = ""; m_option = info; diff --git a/kfilereplace/knewprojectdlg.h b/kfilereplace/knewprojectdlg.h index b0af6ff2..cd428266 100644 --- a/kfilereplace/knewprojectdlg.h +++ b/kfilereplace/knewprojectdlg.h @@ -36,7 +36,7 @@ class KNewProjectDlg : public KNewProjectDlgS RCOptions* m_option; public: - KNewProjectDlg(RCOptions* info, TQWidget *tqparent=0, const char *name=0); + KNewProjectDlg(RCOptions* info, TQWidget *parent=0, const char *name=0); ~KNewProjectDlg(); public: diff --git a/kfilereplace/koptionsdlg.cpp b/kfilereplace/koptionsdlg.cpp index 84492238..35f0a3da 100644 --- a/kfilereplace/koptionsdlg.cpp +++ b/kfilereplace/koptionsdlg.cpp @@ -41,7 +41,7 @@ using namespace whatthisNameSpace; -KOptionsDlg::KOptionsDlg(RCOptions* info, TQWidget *tqparent, const char *name) : KOptionsDlgS(tqparent,name,true) +KOptionsDlg::KOptionsDlg(RCOptions* info, TQWidget *parent, const char *name) : KOptionsDlgS(parent,name,true) { m_config = new KConfig("kfilereplacerc"); m_option = info; diff --git a/kfilereplace/koptionsdlg.h b/kfilereplace/koptionsdlg.h index 4faec9f0..ec120ea1 100644 --- a/kfilereplace/koptionsdlg.h +++ b/kfilereplace/koptionsdlg.h @@ -35,7 +35,7 @@ class KOptionsDlg : public KOptionsDlgS Q_OBJECT TQ_OBJECT public: - KOptionsDlg(RCOptions* info, TQWidget *tqparent, const char *name); + KOptionsDlg(RCOptions* info, TQWidget *parent, const char *name); ~KOptionsDlg(); private: diff --git a/kimagemapeditor/arealistview.cpp b/kimagemapeditor/arealistview.cpp index a92eb567..203a741f 100644 --- a/kimagemapeditor/arealistview.cpp +++ b/kimagemapeditor/arealistview.cpp @@ -31,8 +31,8 @@ #include "arealistview.h" -AreaListView::AreaListView(TQWidget *tqparent, const char *name) - : TQVBox(tqparent, name) +AreaListView::AreaListView(TQWidget *parent, const char *name) + : TQVBox(parent, name) { listView = new KListView(this); listView->addColumn(i18n("Areas")); diff --git a/kimagemapeditor/arealistview.h b/kimagemapeditor/arealistview.h index 8b640828..4010f51d 100644 --- a/kimagemapeditor/arealistview.h +++ b/kimagemapeditor/arealistview.h @@ -36,7 +36,7 @@ class AreaListView : public TQVBox TQ_OBJECT public: - AreaListView(TQWidget *tqparent, const char *name); + AreaListView(TQWidget *parent, const char *name); ~AreaListView(); KListView* listView; diff --git a/kimagemapeditor/drawzone.cpp b/kimagemapeditor/drawzone.cpp index 275fb86f..ba1ea48d 100644 --- a/kimagemapeditor/drawzone.cpp +++ b/kimagemapeditor/drawzone.cpp @@ -37,8 +37,8 @@ #include "kimecommon.h" -DrawZone::DrawZone(TQWidget *tqparent,KImageMapEditor* _imageMapEditor) - : TQScrollView(tqparent) +DrawZone::DrawZone(TQWidget *parent,KImageMapEditor* _imageMapEditor) + : TQScrollView(parent) { imageMapEditor=_imageMapEditor; // setPicture(TQImage()); @@ -175,7 +175,7 @@ void DrawZone::setZoom(double z) pix.convertFromImage(image); // if the picture has transparent areas, // fill them with Gimp like background - if (pix.tqmask()) { + if (pix.mask()) { TQPixmap backPix(32,32); TQPainter p2(&backPix); p2.fillRect(0,0,32,32,TQColor(156,149,156)); diff --git a/kimagemapeditor/drawzone.h b/kimagemapeditor/drawzone.h index 35838619..0bd03dc6 100644 --- a/kimagemapeditor/drawzone.h +++ b/kimagemapeditor/drawzone.h @@ -38,7 +38,7 @@ class Area; class DrawZone : public TQScrollView { public: - DrawZone(TQWidget *tqparent,KImageMapEditor* _imageMapEditor); + DrawZone(TQWidget *parent,KImageMapEditor* _imageMapEditor); ~DrawZone(); TQImage picture() const; diff --git a/kimagemapeditor/imagemap.cpp b/kimagemapeditor/imagemap.cpp index c332ea26..04c1908e 100644 --- a/kimagemapeditor/imagemap.cpp +++ b/kimagemapeditor/imagemap.cpp @@ -28,8 +28,8 @@ int round(double d) { return ((int) d)+1; } -ImageMap::ImageMap(TQWidget *tqparent,KImageMapEditor* _imageMapEditor) - : TQScrollView(tqparent) +ImageMap::ImageMap(TQWidget *parent,KImageMapEditor* _imageMapEditor) + : TQScrollView(parent) { imageMapEditor=_imageMapEditor; // setPicture(TQImage()); @@ -63,7 +63,7 @@ void ImageMap::setZoom(double z) { pix.convertFromImage(image); // if the picture has transparent areas, // fill them with Gimp like background - if (pix.tqmask()) { + if (pix.mask()) { TQPixmap backPix(32,32); TQPainter p2(&backPix); p2.fillRect(0,0,32,32,TQColor(156,149,156)); diff --git a/kimagemapeditor/imagemap.h b/kimagemapeditor/imagemap.h index eb31cc1c..fe14c9d4 100644 --- a/kimagemapeditor/imagemap.h +++ b/kimagemapeditor/imagemap.h @@ -51,7 +51,7 @@ private: KImageMapEditor *imageMapEditor; double _zoom; public: - ImageMap(TQWidget *tqparent,KImageMapEditor* _imageMapEditor); + ImageMap(TQWidget *parent,KImageMapEditor* _imageMapEditor); ~ImageMap(); void setZoom(double z); void setPicture(const TQImage &_image); diff --git a/kimagemapeditor/imageslistview.cpp b/kimagemapeditor/imageslistview.cpp index c62dffdd..7db15e1e 100644 --- a/kimagemapeditor/imageslistview.cpp +++ b/kimagemapeditor/imageslistview.cpp @@ -26,8 +26,8 @@ // locale #include "imageslistview.h" -ImagesListViewItem::ImagesListViewItem(ImagesListView* tqparent, ImageTag* tag) - : TQListViewItem(tqparent) +ImagesListViewItem::ImagesListViewItem(ImagesListView* parent, ImageTag* tag) + : TQListViewItem(parent) { _imageTag = tag; update(); @@ -51,8 +51,8 @@ ImageTag* ImagesListViewItem::imageTag() { } -ImagesListView::ImagesListView(TQWidget *tqparent, const char *name) - : KListView(tqparent, name) +ImagesListView::ImagesListView(TQWidget *parent, const char *name) + : KListView(parent, name) { addColumn(i18n("Images")); addColumn(i18n("Usemap")); diff --git a/kimagemapeditor/imageslistview.h b/kimagemapeditor/imageslistview.h index 5155bfc4..5b4aa4d8 100644 --- a/kimagemapeditor/imageslistview.h +++ b/kimagemapeditor/imageslistview.h @@ -50,7 +50,7 @@ class ImagesListView : public KListView TQ_OBJECT public: - ImagesListView(TQWidget *tqparent, const char *name); + ImagesListView(TQWidget *parent, const char *name); virtual ~ImagesListView(); /** diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index 5a08d551..5a57b250 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -85,8 +85,8 @@ typedef KParts::GenericFactory<KImageMapEditor> KimeFactory; K_EXPORT_COMPONENT_FACTORY( libkimagemapeditor , KimeFactory ) KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *, - TQObject *tqparent, const char *name, const TQStringList & ) - : KParts::ReadWritePart(tqparent,name) + TQObject *parent, const char *name, const TQStringList & ) + : KParts::ReadWritePart(parent,name) { setInstance( KimeFactory::instance() ); @@ -94,7 +94,7 @@ KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *, // Test if the MainWindow can handle DockWindows, if so create DockWidgets // instead of a Splitter - mainDock = dynamic_cast<KDockMainWindow*>(tqparent) ; + mainDock = dynamic_cast<KDockMainWindow*>(parent) ; TQSplitter * splitter = 0L; tabWidget = 0L; @@ -333,7 +333,7 @@ void KImageMapEditor::setModified(bool modified) else save->setEnabled(false); - // in any event, we want our tqparent to do it's thing + // in any event, we want our parent to do it's thing ReadWritePart::setModified(modified); } diff --git a/kimagemapeditor/kimagemapeditor.h b/kimagemapeditor/kimagemapeditor.h index f2dd74c1..e3a3655a 100644 --- a/kimagemapeditor/kimagemapeditor.h +++ b/kimagemapeditor/kimagemapeditor.h @@ -135,7 +135,7 @@ public : enum ToolType { Selection, Rectangle, Circle, Polygon, Freehand, AddPoint, RemovePoint }; KImageMapEditor(TQWidget *parentWidget, const char *, - TQObject *tqparent, const char *name, const TQStringList & args = TQStringList()); + TQObject *parent, const char *name, const TQStringList & args = TQStringList()); virtual ~KImageMapEditor(); static KAboutData *createAboutData(); diff --git a/kimagemapeditor/kimearea.cpp b/kimagemapeditor/kimearea.cpp index e3cb169f..52cccf9f 100644 --- a/kimagemapeditor/kimearea.cpp +++ b/kimagemapeditor/kimearea.cpp @@ -477,12 +477,12 @@ TQPixmap Area::cutOut(const TQImage & image) return dummyPix; } - // Get the tqmask from the subclasses - TQBitmap tqmask=getMask(); + // Get the mask from the subclasses + TQBitmap mask=getMask(); // The rectangle which is part of the image TQRect partOfImage=rect(); - TQRect partOfMask(0,0,tqmask.width(),tqmask.height()); + TQRect partOfMask(0,0,mask.width(),mask.height()); // If the area is outside of the image make the @@ -507,8 +507,8 @@ TQPixmap Area::cutOut(const TQImage & image) partOfMask.setY(myabs(rect().y())); } - TQImage tempImage=tqmask.convertToImage().copy(partOfMask); - tqmask.convertFromImage(tempImage); + TQImage tempImage=mask.convertToImage().copy(partOfMask); + mask.convertFromImage(tempImage); // partOfImage = partOfImage.normalize(); TQImage cut=image.copy(partOfImage); @@ -521,23 +521,23 @@ TQPixmap Area::cutOut(const TQImage & image) << partOfMask.width() << "," << partOfMask.height() << "," << endl; /* - TQBitmap tqmask2(partOfMask.width(), partOfMask.height()); - TQPainter p4(&tqmask2); - p4.drawPixmap( TQPoint(0,0) ,tqmask,partOfMask); + TQBitmap mask2(partOfMask.width(), partOfMask.height()); + TQPainter p4(&mask2); + p4.drawPixmap( TQPoint(0,0) ,mask,partOfMask); p4.flush(); p4.end(); */ pix.convertFromImage(cut); - setHighlightedPixmap(cut, tqmask); + setHighlightedPixmap(cut, mask); TQPixmap retPix(pix.width(),pix.height()); TQPainter p3(&retPix); // if transparent image fill the background // with gimp-like rectangles - if (pix.tqmask()) { + if (pix.mask()) { TQPixmap backPix(32,32); // Gimp like transparent rectangle @@ -555,7 +555,7 @@ TQPixmap Area::cutOut(const TQImage & image) p3.drawPixmap(TQPoint(0,0),pix); p3.flush(); p3.end(); - retPix.setMask(tqmask); + retPix.setMask(mask); return retPix; } @@ -566,7 +566,7 @@ TQBitmap Area::getMask() const return b; } -void Area::setHighlightedPixmap( TQImage & im, TQBitmap & tqmask ) +void Area::setHighlightedPixmap( TQImage & im, TQBitmap & mask ) { if (!Area::highlightArea) return; @@ -598,7 +598,7 @@ void Area::setHighlightedPixmap( TQImage & im, TQBitmap & tqmask ) _highlightedPixmap = new TQPixmap(); _highlightedPixmap->convertFromImage( image ); - _highlightedPixmap->setMask( tqmask ); + _highlightedPixmap->setMask( mask ); if (_highlightedPixmap->isNull()) kdDebug() << "HighlightedPixmap is null" << endl; @@ -659,17 +659,17 @@ void RectArea::draw(TQPainter & p) TQBitmap RectArea::getMask() const { - TQBitmap tqmask(rect().width(),rect().height()); + TQBitmap mask(rect().width(),rect().height()); - tqmask.fill(TQt::color0); - TQPainter p(&tqmask); + mask.fill(TQt::color0); + TQPainter p(&mask); p.setBackgroundColor(TQt::color0); p.setPen(TQt::color1); p.setBrush(TQt::color1); - tqmask.fill(TQt::color1); + mask.fill(TQt::color1); p.end(); - return tqmask; + return mask; } TQString RectArea::coordsToString() const @@ -815,10 +815,10 @@ void CircleArea::draw(TQPainter & p) TQBitmap CircleArea::getMask() const { - TQBitmap tqmask(_rect.width(),_rect.height()); + TQBitmap mask(_rect.width(),_rect.height()); - tqmask.fill(TQt::color0); - TQPainter p(&tqmask); + mask.fill(TQt::color0); + TQPainter p(&mask); p.setBackgroundColor(TQt::color0); p.setPen(TQt::color1); p.setBrush(TQt::color1); @@ -827,7 +827,7 @@ TQBitmap CircleArea::getMask() const p.end(); - return tqmask; + return mask; } @@ -1009,10 +1009,10 @@ void PolyArea::draw(TQPainter & p) TQBitmap PolyArea::getMask() const { - TQBitmap tqmask(_rect.width(),_rect.height()); + TQBitmap mask(_rect.width(),_rect.height()); - tqmask.fill(TQt::color0); - TQPainter p(&tqmask); + mask.fill(TQt::color0); + TQPainter p(&mask); p.setBackgroundColor(TQt::color0); p.setPen(TQt::color1); p.setBrush(TQt::color1); @@ -1024,7 +1024,7 @@ TQBitmap PolyArea::getMask() const p.flush(); p.end(); - return tqmask; + return mask; } TQString PolyArea::coordsToString() const diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp index cd7999f0..c2e50c7c 100644 --- a/kimagemapeditor/kimedialogs.cpp +++ b/kimagemapeditor/kimedialogs.cpp @@ -47,8 +47,8 @@ // LOCAL #include "kimedialogs.h" -CoordsEdit::CoordsEdit(TQWidget *tqparent, Area* a) - : TQWidget(tqparent) +CoordsEdit::CoordsEdit(TQWidget *parent, Area* a) + : TQWidget(parent) { area=a; } @@ -66,8 +66,8 @@ CoordsEdit::~CoordsEdit() { } -RectCoordsEdit::RectCoordsEdit(TQWidget *tqparent, Area* a) - : CoordsEdit(tqparent,a) +RectCoordsEdit::RectCoordsEdit(TQWidget *parent, Area* a) + : CoordsEdit(parent,a) { TQGridLayout *tqlayout= new TQGridLayout(this,5,2,5,5); @@ -127,8 +127,8 @@ void RectCoordsEdit::applyChanges() { area->setRect(r); } -CircleCoordsEdit::CircleCoordsEdit(TQWidget *tqparent, Area* a) - : CoordsEdit(tqparent,a) +CircleCoordsEdit::CircleCoordsEdit(TQWidget *parent, Area* a) + : CoordsEdit(parent,a) { TQGridLayout *tqlayout= new TQGridLayout(this,4,2,5,5); @@ -180,8 +180,8 @@ void CircleCoordsEdit::applyChanges() { area->setRect(r); } -PolyCoordsEdit::PolyCoordsEdit(TQWidget *tqparent, Area* a) - : CoordsEdit(tqparent,a) +PolyCoordsEdit::PolyCoordsEdit(TQWidget *parent, Area* a) + : CoordsEdit(parent,a) { if (!a) return; TQVBoxLayout *tqlayout= new TQVBoxLayout(this); @@ -274,8 +274,8 @@ void PolyCoordsEdit::applyChanges() { } } -SelectionCoordsEdit::SelectionCoordsEdit(TQWidget *tqparent, Area* a) - : CoordsEdit(tqparent,a) +SelectionCoordsEdit::SelectionCoordsEdit(TQWidget *parent, Area* a) + : CoordsEdit(parent,a) { TQGridLayout *tqlayout= new TQGridLayout(this,2,2); @@ -308,11 +308,11 @@ void SelectionCoordsEdit::applyChanges() { -TQLineEdit* AreaDialog::createLineEdit(TQWidget* tqparent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name) +TQLineEdit* AreaDialog::createLineEdit(TQWidget* parent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name) { - TQLineEdit* edit=new TQLineEdit(value,tqparent); + TQLineEdit* edit=new TQLineEdit(value,parent); tqlayout->addWidget(edit,y,2); - TQLabel* lbl=new TQLabel(name,tqparent); + TQLabel* lbl=new TQLabel(name,parent); lbl->setBuddy(edit); tqlayout->addWidget(lbl,y,1); @@ -408,17 +408,17 @@ TQWidget* AreaDialog::createButtonBar() } -AreaDialog::AreaDialog(KImageMapEditor* tqparent,Area * a) - : KDialog(tqparent->widget(),"",true) -// : KDialogBase(Tabbed,i18n("Area Tag Editor"),Ok|Apply|Cancel,Ok,tqparent,"") -// : KDialogBase(tqparent,"",true,"Area Tag Editor",Ok|Apply|Cancel,Ok,true) +AreaDialog::AreaDialog(KImageMapEditor* parent,Area * a) + : KDialog(parent->widget(),"",true) +// : KDialogBase(Tabbed,i18n("Area Tag Editor"),Ok|Apply|Cancel,Ok,parent,"") +// : KDialogBase(parent,"",true,"Area Tag Editor",Ok|Apply|Cancel,Ok,true) { if (!a) { slotCancel(); return; } - _document=tqparent; + _document=parent; setCaption(i18n("Area Tag Editor")); @@ -485,23 +485,23 @@ AreaDialog::~AreaDialog() { delete oldArea; } -CoordsEdit* AreaDialog::createCoordsEdit(TQWidget *tqparent, Area *a) { +CoordsEdit* AreaDialog::createCoordsEdit(TQWidget *parent, Area *a) { if (!a) return 0; switch (a->type()) { case Area::Rectangle : - return new RectCoordsEdit(tqparent,a); + return new RectCoordsEdit(parent,a); break; case Area::Circle : - return new CircleCoordsEdit(tqparent,a); + return new CircleCoordsEdit(parent,a); break; case Area::Polygon : - return new PolyCoordsEdit(tqparent,a); + return new PolyCoordsEdit(parent,a); break; case Area::Selection : - return new SelectionCoordsEdit(tqparent,a); + return new SelectionCoordsEdit(parent,a); break; - case Area::Default : return new CoordsEdit(tqparent,a); break; - default : return new CoordsEdit(tqparent,a);break; + case Area::Default : return new CoordsEdit(parent,a); break; + default : return new CoordsEdit(parent,a);break; } } @@ -570,8 +570,8 @@ void AreaDialog::slotUpdateArea() { oldArea->setRect(area->rect()); } -ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* tqparent,TQPtrList<MapTag> *_maps,TQPtrList<ImageTag> *_images,const KURL & _baseUrl) - : KDialogBase(tqparent,"",true,i18n( "Choose Map & Image to Edit" ),Ok,Ok,true) +ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* parent,TQPtrList<MapTag> *_maps,TQPtrList<ImageTag> *_images,const KURL & _baseUrl) + : KDialogBase(parent,"",true,i18n( "Choose Map & Image to Edit" ),Ok,Ok,true) { baseUrl=_baseUrl; maps=_maps; @@ -648,29 +648,29 @@ ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* tqparent,TQPtrList<MapTag> resize(510,460); } -void ImageMapChooseDialog::initImageListTable(TQWidget* tqparent) { +void ImageMapChooseDialog::initImageListTable(TQWidget* parent) { if (images->isEmpty()) { - imageListTable= new TQTable(1,1,tqparent); + imageListTable= new TQTable(1,1,parent); imageListTable->setText(0,0,i18n("No images found")); imageListTable->setEnabled(false); imageListTable->horizontalHeader()->hide(); imageListTable->setTopMargin(0); imageListTable->setColumnStretchable(0,true); } else { - imageListTable= new TQTable(images->count(),2,tqparent); + imageListTable= new TQTable(images->count(),2,parent); imageListTable->setColumnStretchable(0,true); } imageListTable->verticalHeader()->hide(); imageListTable->setLeftMargin(0); - TQLabel *lbl= new TQLabel(i18n("&Images"),tqparent); + TQLabel *lbl= new TQLabel(i18n("&Images"),parent); lbl->setBuddy(imageListTable); - tqparent->tqlayout()->add(lbl); - tqparent->tqlayout()->add(imageListTable); + parent->tqlayout()->add(lbl); + parent->tqlayout()->add(imageListTable); if (images->isEmpty()) return; @@ -749,8 +749,8 @@ void ImageMapChooseDialog::slotMapChanged(int i) { selectImageWithUsemap(currentMap->name); } -PreferencesDialog::PreferencesDialog(TQWidget *tqparent, KConfig* conf) - : KDialogBase(tqparent,"",true,i18n("Preferences"),Ok|Apply|Cancel,Ok,true) +PreferencesDialog::PreferencesDialog(TQWidget *parent, KConfig* conf) + : KDialogBase(parent,"",true,i18n("Preferences"),Ok|Apply|Cancel,Ok,true) { config = conf; TQVBox *page=new TQVBox(this); @@ -836,8 +836,8 @@ void PreferencesDialog::slotApply( void ) { emit applyClicked(); } -HTMLPreviewDialog::HTMLPreviewDialog(TQWidget* tqparent, KURL url, const TQString & htmlCode) - : KDialogBase(tqparent, "", true, i18n("Preview"), KDialogBase::Ok) +HTMLPreviewDialog::HTMLPreviewDialog(TQWidget* parent, KURL url, const TQString & htmlCode) + : KDialogBase(parent, "", true, i18n("Preview"), KDialogBase::Ok) { tempFile = new KTempFile(url.directory(false), ".html"); tempFile->setAutoDelete(true); diff --git a/kimagemapeditor/kimedialogs.h b/kimagemapeditor/kimedialogs.h index 90b445a2..d829193c 100644 --- a/kimagemapeditor/kimedialogs.h +++ b/kimagemapeditor/kimedialogs.h @@ -35,7 +35,7 @@ class CoordsEdit : public TQWidget { Q_OBJECT TQ_OBJECT public : - CoordsEdit(TQWidget *tqparent, Area* a); + CoordsEdit(TQWidget *parent, Area* a); virtual ~CoordsEdit(); virtual void applyChanges(); protected: @@ -48,7 +48,7 @@ Q_OBJECT class RectCoordsEdit : public CoordsEdit { public: - RectCoordsEdit(TQWidget *tqparent, Area* a); + RectCoordsEdit(TQWidget *parent, Area* a); virtual void applyChanges(); private: TQSpinBox *topXSpin; @@ -59,7 +59,7 @@ class RectCoordsEdit : public CoordsEdit { class CircleCoordsEdit : public CoordsEdit { public: - CircleCoordsEdit(TQWidget *tqparent, Area* a); + CircleCoordsEdit(TQWidget *parent, Area* a); virtual void applyChanges(); private: TQSpinBox *centerXSpin; @@ -73,7 +73,7 @@ class PolyCoordsEdit : public CoordsEdit { Q_OBJECT TQ_OBJECT public: - PolyCoordsEdit(TQWidget *tqparent, Area* a); + PolyCoordsEdit(TQWidget *parent, Area* a); ~PolyCoordsEdit(); virtual void applyChanges(); private: @@ -89,7 +89,7 @@ class SelectionCoordsEdit : public CoordsEdit { Q_OBJECT TQ_OBJECT public: - SelectionCoordsEdit(TQWidget *tqparent, Area* a); + SelectionCoordsEdit(TQWidget *parent, Area* a); virtual void applyChanges(); private: TQSpinBox *topXSpin; @@ -122,13 +122,13 @@ class AreaDialog : public KDialog { TQLineEdit *onMouseOutEdit; CoordsEdit *coordsEdit; - CoordsEdit* createCoordsEdit(TQWidget *tqparent, Area *a); + CoordsEdit* createCoordsEdit(TQWidget *parent, Area *a); TQCheckBox *defaultAreaChk; KImageMapEditor *_document; public: - AreaDialog(KImageMapEditor* tqparent,Area * a); + AreaDialog(KImageMapEditor* parent,Area * a); ~AreaDialog(); protected slots: virtual void slotOk(); @@ -137,7 +137,7 @@ class AreaDialog : public KDialog { void slotChooseHref(); void slotUpdateArea(); - TQLineEdit* createLineEdit(TQWidget* tqparent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name); + TQLineEdit* createLineEdit(TQWidget* parent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name); TQWidget* createGeneralPage(); TQWidget* createCoordsPage(); TQWidget* createJavascriptPage(); @@ -164,7 +164,7 @@ class ImageMapChooseDialog : public KDialogBase { KURL baseUrl; void initImageListTable(TQWidget*); public: - ImageMapChooseDialog(TQWidget* tqparent,TQPtrList<MapTag> *_maps,TQPtrList<ImageTag> *_images, const KURL & _baseUrl); + ImageMapChooseDialog(TQWidget* parent,TQPtrList<MapTag> *_maps,TQPtrList<ImageTag> *_images, const KURL & _baseUrl); ~ImageMapChooseDialog(); KURL pixUrl; MapTag* currentMap; @@ -181,7 +181,7 @@ class PreferencesDialog : public KDialogBase { Q_OBJECT TQ_OBJECT public: - PreferencesDialog(TQWidget *tqparent,KConfig*); + PreferencesDialog(TQWidget *parent,KConfig*); ~PreferencesDialog(); protected slots: virtual void slotDefault( void ); diff --git a/kimagemapeditor/mapslistview.cpp b/kimagemapeditor/mapslistview.cpp index b3a2758d..252afdb8 100644 --- a/kimagemapeditor/mapslistview.cpp +++ b/kimagemapeditor/mapslistview.cpp @@ -23,8 +23,8 @@ #include "mapslistview.h" -MapsListView::MapsListView(TQWidget *tqparent, const char *name) -: TQVBox(tqparent, name) { +MapsListView::MapsListView(TQWidget *parent, const char *name) +: TQVBox(parent, name) { _listView = new KListView(this); _listView->addColumn(i18n("Maps")); _listView->setFullWidth(true); diff --git a/kimagemapeditor/mapslistview.h b/kimagemapeditor/mapslistview.h index ca1707af..af4d3653 100644 --- a/kimagemapeditor/mapslistview.h +++ b/kimagemapeditor/mapslistview.h @@ -33,7 +33,7 @@ class MapsListView : public TQVBox Q_OBJECT TQ_OBJECT public: - MapsListView(TQWidget *tqparent, const char *name); + MapsListView(TQWidget *parent, const char *name); ~MapsListView(); /** diff --git a/kimagemapeditor/qextfileinfo.cpp b/kimagemapeditor/qextfileinfo.cpp index c3aad2a7..f1aac09e 100644 --- a/kimagemapeditor/qextfileinfo.cpp +++ b/kimagemapeditor/qextfileinfo.cpp @@ -105,16 +105,16 @@ KURL QExtFileInfo::toAbsolute(const KURL& urlToConvert,const KURL& baseURL) This is needed for empty directory adding/handling. (Andras) Currently works only for local directories */ -KURL::List QExtFileInfo::allFiles( const KURL& path, const TQString& tqmask) +KURL::List QExtFileInfo::allFiles( const KURL& path, const TQString& mask) { QExtFileInfo internalFileInfo; - return internalFileInfo.allFilesInternal(path, tqmask); + return internalFileInfo.allFilesInternal(path, mask); } -KURL::List QExtFileInfo::allFilesRelative( const KURL& path, const TQString& tqmask) +KURL::List QExtFileInfo::allFilesRelative( const KURL& path, const TQString& mask) { QExtFileInfo internalFileInfo; - KURL::List r = internalFileInfo.allFilesInternal( path, tqmask); + KURL::List r = internalFileInfo.allFilesInternal( path, mask); KURL::List::Iterator it; for ( it = r.begin(); it != r.end(); ++it ) @@ -206,7 +206,7 @@ bool QExtFileInfo::copy( const KURL& src, const KURL& target, int permissions, } /** No descriptions */ -KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& tqmask) +KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& mask) { dirListItems.clear(); if (internalExists(startURL)) @@ -214,7 +214,7 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& lstFilters.setAutoDelete(true); lstFilters.clear(); // Split on white space - TQStringList list = TQStringList::split( ' ', tqmask ); + TQStringList list = TQStringList::split( ' ', mask ); for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) lstFilters.append( new TQRegExp(*it, false, true ) ); diff --git a/kimagemapeditor/qextfileinfo.h b/kimagemapeditor/qextfileinfo.h index 00643915..59cabb14 100644 --- a/kimagemapeditor/qextfileinfo.h +++ b/kimagemapeditor/qextfileinfo.h @@ -34,8 +34,8 @@ public: /** convert relative filename to absolute */ static KURL toAbsolute(const KURL& urlToConvert,const KURL& baseURL); /** recurse function for all files in dir */ - static KURL::List allFiles( const KURL& path, const TQString &tqmask); - static KURL::List allFilesRelative( const KURL& path, const TQString &tqmask); + static KURL::List allFiles( const KURL& path, const TQString &mask); + static KURL::List allFilesRelative( const KURL& path, const TQString &mask); /** create dir if don't exists */ static bool createDir(const KURL & path ); static KURL cdUp(const KURL &dir); @@ -60,7 +60,7 @@ private: TQPtrList<TQRegExp> lstFilters; /** No descriptions */ - KURL::List allFilesInternal(const KURL& startURL, const TQString& tqmask); + KURL::List allFilesInternal(const KURL& startURL, const TQString& mask); // friend class I_like_this_class; diff --git a/klinkstatus/FEATURES b/klinkstatus/FEATURES index 11ed0bf0..33a328e4 100644 --- a/klinkstatus/FEATURES +++ b/klinkstatus/FEATURES @@ -14,5 +14,5 @@ - Tabbed checking (allow multiple sessions at the same time) - Filter checked links (good, broken, malformed and undetermined) - Configurable number of simultaneous connections (performance tunning) -- Other configurable options like "check external links", "check tqparent folders", "timeout" +- Other configurable options like "check external links", "check parent folders", "timeout" - Good integration with Quanta+
\ No newline at end of file diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp index 94506ea3..2f74369d 100644 --- a/klinkstatus/src/actionmanager.cpp +++ b/klinkstatus/src/actionmanager.cpp @@ -63,8 +63,8 @@ public: SessionWidget* sessionWidget; }; -ActionManager::ActionManager(TQObject *tqparent, const char *name) - : TQObject(tqparent, name), d(new ActionManagerPrivate) +ActionManager::ActionManager(TQObject *parent, const char *name) + : TQObject(parent, name), d(new ActionManagerPrivate) {} ActionManager::~ActionManager() diff --git a/klinkstatus/src/actionmanager.h b/klinkstatus/src/actionmanager.h index b2426d8d..bd9fdd7f 100644 --- a/klinkstatus/src/actionmanager.h +++ b/klinkstatus/src/actionmanager.h @@ -39,7 +39,7 @@ class ActionManager : public TQObject Q_OBJECT TQ_OBJECT public: - ActionManager(TQObject* tqparent=0, const char* name=0); + ActionManager(TQObject* parent=0, const char* name=0); virtual ~ActionManager(); static ActionManager* getInstance(); diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp index 7efe5a45..bf54a59b 100644 --- a/klinkstatus/src/engine/linkchecker.cpp +++ b/klinkstatus/src/engine/linkchecker.cpp @@ -44,8 +44,8 @@ int LinkChecker::count_ = 0; LinkChecker::LinkChecker(LinktqStatus* linkstatus, int time_out, - TQObject *tqparent, const char *name) - : TQObject(tqparent, name), search_manager_(0), + TQObject *parent, const char *name) + : TQObject(parent, name), search_manager_(0), linkstatus_(linkstatus), t_job_(0), time_out_(time_out), checker_(0), document_charset_(), redirection_(false), header_checked_(false), finnished_(false), parsing_(false), is_charset_checked_(false), has_defined_charset_(false) @@ -84,8 +84,8 @@ void LinkChecker::check() t_job_->addMetaData("PropagateHttpHeader", "true"); // to have the http header - if (linkstatus_->tqparent()) { - t_job_->addMetaData("referrer", linkstatus_->tqparent()->absoluteUrl().prettyURL()); + if (linkstatus_->parent()) { + t_job_->addMetaData("referrer", linkstatus_->parent()->absoluteUrl().prettyURL()); } if(search_manager_->sendIdentification()) @@ -550,7 +550,7 @@ void LinkChecker::checkRef() int i_ref = -1; if(linktqStatus()->originalUrl().startsWith("#")) - ls_parent = linktqStatus()->tqparent(); + ls_parent = linktqStatus()->parent(); else { diff --git a/klinkstatus/src/engine/linkchecker.h b/klinkstatus/src/engine/linkchecker.h index 74cf9eb9..9b13d210 100644 --- a/klinkstatus/src/engine/linkchecker.h +++ b/klinkstatus/src/engine/linkchecker.h @@ -43,7 +43,7 @@ class LinkChecker : public TQObject TQ_OBJECT public: LinkChecker(LinktqStatus* linkstatus, int time_out = 50, - TQObject *tqparent = 0, const char *name = 0); + TQObject *parent = 0, const char *name = 0); ~LinkChecker(); //virtual void run(); diff --git a/klinkstatus/src/engine/linkstatus.cpp b/klinkstatus/src/engine/linkstatus.cpp index d95c7860..ac70b73e 100644 --- a/klinkstatus/src/engine/linkstatus.cpp +++ b/klinkstatus/src/engine/linkstatus.cpp @@ -101,7 +101,7 @@ TQString const LinktqStatus::toString() const if(!is_root_) { Q_ASSERT(parent_); - aux += i18n( "Parent: %1" ).tqarg( tqparent()->absoluteUrl().prettyURL() ) + "\n"; + aux += i18n( "Parent: %1" ).tqarg( parent()->absoluteUrl().prettyURL() ) + "\n"; } Q_ASSERT(!original_url_.isNull()); diff --git a/klinkstatus/src/engine/linkstatus.h b/klinkstatus/src/engine/linkstatus.h index a74282f8..dddf320e 100644 --- a/klinkstatus/src/engine/linkstatus.h +++ b/klinkstatus/src/engine/linkstatus.h @@ -61,7 +61,7 @@ public: LinktqStatus(); LinktqStatus(KURL const& absolute_url); - LinktqStatus(Node* node, LinktqStatus* tqparent); + LinktqStatus(Node* node, LinktqStatus* parent); ~LinktqStatus(); void save(TQDomElement& element) const; @@ -70,7 +70,7 @@ public: void setRootUrl(KURL const& url); void settqStatus(tqStatus status); void setDepth(uint depth); - void setParent(LinktqStatus* tqparent); + void setParent(LinktqStatus* parent); void setOriginalUrl(TQString const& url_original); void setLabel(TQString const& label); void setAbsoluteUrl(KURL const& url_absoluto); @@ -106,7 +106,7 @@ public: uint depth() const; bool local() const; // linkstatus.paradigma.co.pt == paradigma.co.pt bool isLocalRestrict() const; // linkstatus.paradigma.co.pt != paradigma.co.pt - LinktqStatus const* tqparent() const; + LinktqStatus const* parent() const; TQString const& originalUrl() const; TQString const& label() const; KURL const& absoluteUrl() const; @@ -142,7 +142,7 @@ public: private: /** - Load some atributes in function of his tqparent node. + Load some atributes in function of his parent node. */ void loadNode(); diff --git a/klinkstatus/src/engine/linkstatus_impl.h b/klinkstatus/src/engine/linkstatus_impl.h index a29bcdcc..3b1b3062 100644 --- a/klinkstatus/src/engine/linkstatus_impl.h +++ b/klinkstatus/src/engine/linkstatus_impl.h @@ -36,7 +36,7 @@ inline LinktqStatus::LinktqStatus(KURL const& absolute_url) setAbsoluteUrl(absolute_url); } -inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* tqparent) +inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* parent) : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false), error_occurred_(false), is_redirection_(false), parent_(0), redirection_(0), checked_(false), only_check_header_(true), malformed_(false), @@ -45,9 +45,9 @@ inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* tqparent) { loadNode(); - setDepth(tqparent->depth() + 1); - setParent(tqparent); - setRootUrl(tqparent->rootUrl()); + setDepth(parent->depth() + 1); + setParent(parent); + setRootUrl(parent->rootUrl()); } inline void LinktqStatus::setRootUrl(KURL const& url) @@ -65,12 +65,12 @@ inline void LinktqStatus::setDepth(uint depth) depth_ = depth; } -inline void LinktqStatus::setParent(LinktqStatus* tqparent) +inline void LinktqStatus::setParent(LinktqStatus* parent) { - Q_ASSERT(tqparent); + Q_ASSERT(parent); - parent_ = tqparent; - addReferrer(tqparent->absoluteUrl()); + parent_ = parent; + addReferrer(parent->absoluteUrl()); } inline void LinktqStatus::setAbsoluteUrl(KURL const& url_absoluto) @@ -176,7 +176,7 @@ inline void LinktqStatus::setBaseURI(KURL const& base_url) if(!base_url.isValid()) { kdWarning(23100) << "base url not valid: " << endl - << "tqparent: " << tqparent()->absoluteUrl().prettyURL() << endl + << "parent: " << parent()->absoluteUrl().prettyURL() << endl << "url: " << absoluteUrl().prettyURL() << endl << "base url resolved: " << base_url.prettyURL() << endl; } @@ -261,7 +261,7 @@ inline bool LinktqStatus::isLocalRestrict() const return is_local_restrict_; } -inline LinktqStatus const* LinktqStatus::tqparent() const +inline LinktqStatus const* LinktqStatus::parent() const { return parent_; } diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp index 82c7350a..6ba9a1ba 100644 --- a/klinkstatus/src/engine/searchmanager.cpp +++ b/klinkstatus/src/engine/searchmanager.cpp @@ -37,8 +37,8 @@ SearchManager::SearchManager(int max_simultaneous_connections, int time_out, - TQObject *tqparent, const char *name) - : TQObject(tqparent, name), + TQObject *parent, const char *name) + : TQObject(parent, name), max_simultaneous_connections_(max_simultaneous_connections), has_document_root_(false), depth_(-1), current_depth_(0), external_domain_depth_(0), current_node_(0), current_index_(0), links_being_checked_(0), diff --git a/klinkstatus/src/engine/searchmanager.h b/klinkstatus/src/engine/searchmanager.h index e977eae4..bee819da 100644 --- a/klinkstatus/src/engine/searchmanager.h +++ b/klinkstatus/src/engine/searchmanager.h @@ -55,7 +55,7 @@ public: }; SearchManager(int max_simultaneous_connections = 3, int time_out = 50, - TQObject *tqparent = 0, const char *name = 0); + TQObject *parent = 0, const char *name = 0); ~SearchManager(); TQString toXML() const; diff --git a/klinkstatus/src/global.cpp b/klinkstatus/src/global.cpp index 9fe9d96d..89a852a7 100644 --- a/klinkstatus/src/global.cpp +++ b/klinkstatus/src/global.cpp @@ -40,8 +40,8 @@ Global* Global::self() return m_self_; } -Global::Global(TQObject *tqparent, const char *name) - : TQObject(tqparent, name), loop_started_(false) +Global::Global(TQObject *parent, const char *name) + : TQObject(parent, name), loop_started_(false) { m_self_ = this; dcop_client_ = kapp->dcopClient(); diff --git a/klinkstatus/src/global.h b/klinkstatus/src/global.h index 1e465404..27832ab1 100644 --- a/klinkstatus/src/global.h +++ b/klinkstatus/src/global.h @@ -40,7 +40,7 @@ public: static void openQuanta(TQStringList const& args); private: - Global(TQObject *tqparent = 0, const char *name = 0); + Global(TQObject *parent = 0, const char *name = 0); static void execCommand(TQString const& command); private slots: diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp index 54b08f0b..6d8df6a8 100644 --- a/klinkstatus/src/klinkstatus_part.cpp +++ b/klinkstatus/src/klinkstatus_part.cpp @@ -56,9 +56,9 @@ typedef KParts::GenericFactory<KLinkStatusPart> KLinkStatusFactory; K_EXPORT_COMPONENT_FACTORY( libklinkstatuspart, KLinkStatusFactory ) KLinkStatusPart::KLinkStatusPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const TQStringList & /*string_list*/) - : KParts::ReadOnlyPart(tqparent, name), m_dlgAbout(0) + : KParts::ReadOnlyPart(parent, name), m_dlgAbout(0) { setInstance(KLinkStatusFactory::instance()); diff --git a/klinkstatus/src/klinkstatus_part.h b/klinkstatus/src/klinkstatus_part.h index 8d9eaf2e..60988054 100644 --- a/klinkstatus/src/klinkstatus_part.h +++ b/klinkstatus/src/klinkstatus_part.h @@ -40,7 +40,7 @@ class KLinkStatusPart: public KParts::ReadOnlyPart TQ_OBJECT public: KLinkStatusPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const TQStringList& args); virtual ~KLinkStatusPart(); diff --git a/klinkstatus/src/parser/url.cpp b/klinkstatus/src/parser/url.cpp index 90a6e4e6..8ba29138 100644 --- a/klinkstatus/src/parser/url.cpp +++ b/klinkstatus/src/parser/url.cpp @@ -294,7 +294,7 @@ bool Url::localDomain(KURL const& url1, KURL const& url2, bool restrict) } /** - Returns true if url2 is a tqparent of url1. + Returns true if url2 is a parent of url1. */ bool Url::parentDir(KURL const& url1, KURL const& url2) { diff --git a/klinkstatus/src/ui/documentrootdialog.cpp b/klinkstatus/src/ui/documentrootdialog.cpp index 622faedf..8c55519e 100644 --- a/klinkstatus/src/ui/documentrootdialog.cpp +++ b/klinkstatus/src/ui/documentrootdialog.cpp @@ -28,8 +28,8 @@ #include <tqlabel.h> -DocumentRootDialog::DocumentRootDialog(TQWidget *tqparent, TQString const& url) - : KDialogBase(tqparent, "DocumentRootDialog", true, "Choose a Document Root", +DocumentRootDialog::DocumentRootDialog(TQWidget *parent, TQString const& url) + : KDialogBase(parent, "DocumentRootDialog", true, "Choose a Document Root", KDialogBase::Ok, KDialogBase::Ok, true), m_url(url) { diff --git a/klinkstatus/src/ui/documentrootdialog.h b/klinkstatus/src/ui/documentrootdialog.h index cf531e51..a78d7009 100644 --- a/klinkstatus/src/ui/documentrootdialog.h +++ b/klinkstatus/src/ui/documentrootdialog.h @@ -32,7 +32,7 @@ class DocumentRootDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - DocumentRootDialog(TQWidget *tqparent, TQString const& url); + DocumentRootDialog(TQWidget *parent, TQString const& url); ~DocumentRootDialog(); void setUrl(const TQString& theValue) { m_url = theValue; } diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp index f342faa7..7ca1e533 100644 --- a/klinkstatus/src/ui/klshistorycombo.cpp +++ b/klinkstatus/src/ui/klshistorycombo.cpp @@ -24,8 +24,8 @@ bool KLSHistoryCombo::items_saved_ = false; -KLSHistoryCombo::KLSHistoryCombo(TQWidget *tqparent, const char *name) - : KHistoryCombo(tqparent, name) +KLSHistoryCombo::KLSHistoryCombo(TQWidget *parent, const char *name) + : KHistoryCombo(parent, name) { setMaxCount(KLSConfig::maxCountComboUrl()); diff --git a/klinkstatus/src/ui/klshistorycombo.h b/klinkstatus/src/ui/klshistorycombo.h index 4627f55a..26c0e652 100644 --- a/klinkstatus/src/ui/klshistorycombo.h +++ b/klinkstatus/src/ui/klshistorycombo.h @@ -25,7 +25,7 @@ class KLSHistoryCombo : public KHistoryCombo TQ_OBJECT public: - KLSHistoryCombo(TQWidget* tqparent, const char* name); + KLSHistoryCombo(TQWidget* parent, const char* name); ~KLSHistoryCombo(); void init(); diff --git a/klinkstatus/src/ui/resultssearchbar.cpp b/klinkstatus/src/ui/resultssearchbar.cpp index 8d039558..10d47fda 100644 --- a/klinkstatus/src/ui/resultssearchbar.cpp +++ b/klinkstatus/src/ui/resultssearchbar.cpp @@ -54,8 +54,8 @@ public: int m_lastComboIndex; }; -ResultsSearchBar::ResultsSearchBar(TQWidget* tqparent, const char* name) - : TQWidget(tqparent, name), d(new ResultsSearchBar::ResultsSearchBarPrivate) +ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name) + : TQWidget(parent, name), d(new ResultsSearchBar::ResultsSearchBarPrivate) { tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); diff --git a/klinkstatus/src/ui/resultssearchbar.h b/klinkstatus/src/ui/resultssearchbar.h index a51c3f72..c177c5aa 100644 --- a/klinkstatus/src/ui/resultssearchbar.h +++ b/klinkstatus/src/ui/resultssearchbar.h @@ -35,7 +35,7 @@ class ResultsSearchBar : public TQWidget Q_OBJECT TQ_OBJECT public: - ResultsSearchBar(TQWidget *tqparent = 0, const char *name = 0); + ResultsSearchBar(TQWidget *parent = 0, const char *name = 0); ~ResultsSearchBar(); TQString const& text() const; diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp index 26123b6b..970ec7c6 100644 --- a/klinkstatus/src/ui/sessionwidget.cpp +++ b/klinkstatus/src/ui/sessionwidget.cpp @@ -66,8 +66,8 @@ SessionWidget::SessionWidget(int max_simultaneous_connections, int time_out, - TQWidget* tqparent, const char* name, WFlags f) - : SessionWidgetBase(tqparent, name, f), search_manager_(0), + TQWidget* parent, const char* name, WFlags f) + : SessionWidgetBase(parent, name, f), search_manager_(0), action_manager_(ActionManager::getInstance()), ready_(true), to_start_(false), to_pause_(false), to_stop_(false), in_progress_(false), paused_(false), stopped_(true), @@ -392,7 +392,7 @@ void SessionWidget::slotLinkChecked(LinktqStatus const* linkstatus, LinkChecker if(linkstatus->checked()) { TreeViewItem* tree_view_item = 0; - TreeViewItem* parent_item = linkstatus->tqparent()->treeViewItem(); + TreeViewItem* parent_item = linkstatus->parent()->treeViewItem(); bool match = resultsSearchBar->currentLinkMatcher().matches(*linkstatus); if(tree_display_) diff --git a/klinkstatus/src/ui/sessionwidget.h b/klinkstatus/src/ui/sessionwidget.h index a10df805..93fdca70 100644 --- a/klinkstatus/src/ui/sessionwidget.h +++ b/klinkstatus/src/ui/sessionwidget.h @@ -50,7 +50,7 @@ class SessionWidget: public SessionWidgetBase public: SessionWidget(int max_simultaneous_connections = 3, int time_out = 50, - TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0); + TQWidget* parent = 0, const char* name = 0, WFlags f = 0); ~SessionWidget(); diff --git a/klinkstatus/src/ui/sessionwidgetbase.ui b/klinkstatus/src/ui/sessionwidgetbase.ui index 7cf9819a..43d6029e 100644 --- a/klinkstatus/src/ui/sessionwidgetbase.ui +++ b/klinkstatus/src/ui/sessionwidgetbase.ui @@ -212,7 +212,7 @@ <bool>true</bool> </property> <property name="text"> - <string>Do &not check tqparent folders</string> + <string>Do &not check parent folders</string> </property> </widget> <spacer> diff --git a/klinkstatus/src/ui/settings/configidentificationdialog.cpp b/klinkstatus/src/ui/settings/configidentificationdialog.cpp index 28f00d81..f2675d81 100644 --- a/klinkstatus/src/ui/settings/configidentificationdialog.cpp +++ b/klinkstatus/src/ui/settings/configidentificationdialog.cpp @@ -29,8 +29,8 @@ #include "../cfg/klsconfig.h" -ConfigIdentificationDialog::ConfigIdentificationDialog(TQWidget *tqparent, const char *name) - : ConfigIdentificationDialogUi(tqparent, name) +ConfigIdentificationDialog::ConfigIdentificationDialog(TQWidget *parent, const char *name) + : ConfigIdentificationDialogUi(parent, name) { if(KLSConfig::userAgent().isEmpty()) { diff --git a/klinkstatus/src/ui/settings/configidentificationdialog.h b/klinkstatus/src/ui/settings/configidentificationdialog.h index 033a74c5..da260180 100644 --- a/klinkstatus/src/ui/settings/configidentificationdialog.h +++ b/klinkstatus/src/ui/settings/configidentificationdialog.h @@ -31,7 +31,7 @@ class ConfigIdentificationDialog : public ConfigIdentificationDialogUi Q_OBJECT TQ_OBJECT public: - ConfigIdentificationDialog(TQWidget *tqparent = 0, const char *name = 0); + ConfigIdentificationDialog(TQWidget *parent = 0, const char *name = 0); ~ConfigIdentificationDialog(); private slots: diff --git a/klinkstatus/src/ui/settings/configsearchdialog.ui b/klinkstatus/src/ui/settings/configsearchdialog.ui index 4c63274b..62553ffb 100644 --- a/klinkstatus/src/ui/settings/configsearchdialog.ui +++ b/klinkstatus/src/ui/settings/configsearchdialog.ui @@ -149,7 +149,7 @@ <cstring>kcfg_CheckParentFolders</cstring> </property> <property name="text"> - <string>Check tqparent folders</string> + <string>Check parent folders</string> </property> <property name="checked"> <bool>true</bool> diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp index 9fbd3b31..7f35d1f2 100644 --- a/klinkstatus/src/ui/tablelinkstatus.cpp +++ b/klinkstatus/src/ui/tablelinkstatus.cpp @@ -46,11 +46,11 @@ */ -TableLinkstatus::TableLinkstatus(TQWidget * tqparent, const char * name, +TableLinkstatus::TableLinkstatus(TQWidget * parent, const char * name, int column_index_status, int column_index_label, int column_index_URL) - : TQTable(tqparent, name), + : TQTable(parent, name), ResultView(column_index_status, column_index_label, column_index_URL) //context_table_menu_(this, "context_table_menu") { @@ -321,7 +321,7 @@ void TableLinkstatus::slotCopyUrlToClipboard() const void TableLinkstatus::slotCopyParentUrlToClipboard() const { TableItem* _item = myItem(currentRow(), currentColumn()); - TQString content(_item->linktqStatus()->tqparent()->absoluteUrl().prettyURL()); + TQString content(_item->linktqStatus()->parent()->absoluteUrl().prettyURL()); TQClipboard* cb = kapp->clipboard(); cb->setText(content); } @@ -420,7 +420,7 @@ void TableLinkstatus::slotViewParentUrlInBrowser() } else { - LinktqStatus const* ls_parent = _item->linktqStatus()->tqparent(); + LinktqStatus const* ls_parent = _item->linktqStatus()->parent(); Q_ASSERT(ls_parent); KURL url = ls_parent->absoluteUrl(); diff --git a/klinkstatus/src/ui/tablelinkstatus.h b/klinkstatus/src/ui/tablelinkstatus.h index 70f6fd41..a8aebf8d 100644 --- a/klinkstatus/src/ui/tablelinkstatus.h +++ b/klinkstatus/src/ui/tablelinkstatus.h @@ -49,7 +49,7 @@ class TableLinkstatus: public TQTable, public ResultView TQ_OBJECT public: - TableLinkstatus(TQWidget * tqparent = 0, const char * name = 0, + TableLinkstatus(TQWidget * parent = 0, const char * name = 0, int column_index_status = 1, int column_index_label = 2, int column_index_URL = 3); diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp index 24c89d0f..fedbe573 100644 --- a/klinkstatus/src/ui/tabwidgetsession.cpp +++ b/klinkstatus/src/ui/tabwidgetsession.cpp @@ -42,8 +42,8 @@ #include <kiconloader.h> -TabWidgetSession::TabWidgetSession(TQWidget* tqparent, const char* name, WFlags f) - : KTabWidget(tqparent, name, f) // tabs_ is initialized with size 17 +TabWidgetSession::TabWidgetSession(TQWidget* parent, const char* name, WFlags f) + : KTabWidget(parent, name, f) // tabs_ is initialized with size 17 { setFocusPolicy(TQ_NoFocus); setMargin(0); diff --git a/klinkstatus/src/ui/tabwidgetsession.h b/klinkstatus/src/ui/tabwidgetsession.h index 4b315a85..1632fc9a 100644 --- a/klinkstatus/src/ui/tabwidgetsession.h +++ b/klinkstatus/src/ui/tabwidgetsession.h @@ -41,7 +41,7 @@ class TabWidgetSession : public KTabWidget TQ_OBJECT public: - TabWidgetSession(TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0); + TabWidgetSession(TQWidget * parent = 0, const char * name = 0, WFlags f = 0); ~TabWidgetSession(); /** Set the URL in the current session widget */ diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp index b5d42143..1d8f546e 100644 --- a/klinkstatus/src/ui/treeview.cpp +++ b/klinkstatus/src/ui/treeview.cpp @@ -39,8 +39,8 @@ #include "../cfg/klsconfig.h" -TreeView::TreeView(TQWidget *tqparent, const char *name) - : KListView(tqparent, name), +TreeView::TreeView(TQWidget *parent, const char *name) + : KListView(parent, name), ResultView(), current_column_(0) { @@ -130,20 +130,20 @@ void TreeView::show(ResultView::tqStatus const& status) item->setVisible(true); //item->setEnabled(true); /* - if(KLSConfig::displayTreeView() && status != ResultView::good && item->tqparent()) + if(KLSConfig::displayTreeView() && status != ResultView::good && item->parent()) { - TreeViewItem* tqparent = myItem(item->tqparent()); - while(tqparent) + TreeViewItem* parent = myItem(item->parent()); + while(parent) { - kdDebug(23100) << "Show: " << tqparent->linktqStatus()->absoluteUrl().url() << endl; + kdDebug(23100) << "Show: " << parent->linktqStatus()->absoluteUrl().url() << endl; - tqparent->setVisible(true); - //tqparent->setEnabled(false); + parent->setVisible(true); + //parent->setEnabled(false); - if(tqparent->tqparent()) - tqparent = myItem(tqparent->tqparent()); + if(parent->parent()) + parent = myItem(parent->parent()); else - tqparent = 0; + parent = 0; } } */ @@ -226,7 +226,7 @@ void TreeView::slotCopyUrlToClipboard() const void TreeView::slotCopyParentUrlToClipboard() const { TreeViewItem* _item = myItem(currentItem()); - TQString content(_item->linktqStatus()->tqparent()->absoluteUrl().prettyURL()); + TQString content(_item->linktqStatus()->parent()->absoluteUrl().prettyURL()); TQClipboard* cb = kapp->tqclipboard(); cb->setText(content); } @@ -326,7 +326,7 @@ void TreeView::slotViewParentUrlInBrowser() } else { - LinktqStatus const* ls_parent = _item->linktqStatus()->tqparent(); + LinktqStatus const* ls_parent = _item->linktqStatus()->parent(); Q_ASSERT(ls_parent); KURL url = ls_parent->absoluteUrl(); @@ -392,10 +392,10 @@ TreeViewItem* TreeView::myItem(TQListViewItem* item) const /* ******************************* TreeViewItem ******************************* */ -TreeViewItem::TreeViewItem(TreeView* tqparent, TQListViewItem* after, +TreeViewItem::TreeViewItem(TreeView* parent, TQListViewItem* after, LinktqStatus const* linkstatus) - : KListViewItem(tqparent, after), - last_child_(0), root_(tqparent) + : KListViewItem(parent, after), + last_child_(0), root_(parent) { init(linkstatus); } diff --git a/klinkstatus/src/ui/treeview.h b/klinkstatus/src/ui/treeview.h index dc3e62e8..05862bd4 100644 --- a/klinkstatus/src/ui/treeview.h +++ b/klinkstatus/src/ui/treeview.h @@ -32,7 +32,7 @@ class TreeView : public KListView, public ResultView TQ_OBJECT public: - TreeView(TQWidget *tqparent = 0, const char *name = 0); + TreeView(TQWidget *parent = 0, const char *name = 0); ~TreeView(); virtual void setColumns(TQStringList const& columns); @@ -91,7 +91,7 @@ class TreeViewItem: public KListViewItem { public: - TreeViewItem(TreeView* tqparent, TQListViewItem* after, + TreeViewItem(TreeView* parent, TQListViewItem* after, LinktqStatus const* linkstatus); TreeViewItem(TreeView* root, TQListViewItem* parent_item, TQListViewItem* after, LinktqStatus const* linkstatus); diff --git a/klinkstatus/src/utils/xsl.cpp b/klinkstatus/src/utils/xsl.cpp index 541c0498..fc3c8f31 100644 --- a/klinkstatus/src/utils/xsl.cpp +++ b/klinkstatus/src/utils/xsl.cpp @@ -196,8 +196,8 @@ public: unsigned int flags; }; -XSLT::XSLT( const TQString &document, TQObject *tqparent ) - : TQObject( tqparent ), d(new XSLTPrivate) +XSLT::XSLT( const TQString &document, TQObject *parent ) + : TQObject( parent ), d(new XSLTPrivate) { d->flags = 0; d->xslDoc = 0; diff --git a/klinkstatus/src/utils/xsl.h b/klinkstatus/src/utils/xsl.h index 93d6a74b..0760ae1b 100644 --- a/klinkstatus/src/utils/xsl.h +++ b/klinkstatus/src/utils/xsl.h @@ -57,7 +57,7 @@ public: * * Constructs a new XSLT parser using the provided XSLT document */ - XSLT( const TQString &xsltDocument, TQObject *tqparent = 0L ); + XSLT( const TQString &xsltDocument, TQObject *parent = 0L ); virtual ~XSLT(); diff --git a/kommander/Kommander-TODO.kno b/kommander/Kommander-TODO.kno index 824c9063..52ab92a5 100644 --- a/kommander/Kommander-TODO.kno +++ b/kommander/Kommander-TODO.kno @@ -284,7 +284,7 @@ <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Georgia"> <li type="disc"><span style="font-weight:600">ChangeLog of Kommander</span></li> <li type="disc"><span style="font-style:italic">See ChangeLog file for details and dates</span></li> -<ul type="disc"><li>added @parentPid evaluated to tqparent process pid</li> +<ul type="disc"><li>added @parentPid evaluated to parent process pid</li> <li>added @pid evaluated to current process pid</li> <li>added @dcopid evaluated to current process DCOP id</li> <li>significantly improved Kommander Text editor usability</li> diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp index a9437ad7..7207da73 100644 --- a/kommander/editor/actiondnd.cpp +++ b/kommander/editor/actiondnd.cpp @@ -72,14 +72,14 @@ void QDesignerAction::remove() widgetToInsert->reparent( 0, TQPoint( 0, 0 ), false ); } -QDesignerToolBarSeparator::QDesignerToolBarSeparator(Qt::Orientation o , TQToolBar *tqparent, +QDesignerToolBarSeparator::QDesignerToolBarSeparator(Qt::Orientation o , TQToolBar *parent, const char* name ) - : TQWidget( tqparent, name ) + : TQWidget( parent, name ) { - connect( tqparent, TQT_SIGNAL(orientationChanged(Qt::Orientation)), + connect( parent, TQT_SIGNAL(orientationChanged(Qt::Orientation)), this, TQT_SLOT(setOrientation(Qt::Orientation)) ); setOrientation( o ); - setBackgroundMode( tqparent->backgroundMode() ); + setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); } @@ -118,8 +118,8 @@ void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * ) -QSeparatorAction::QSeparatorAction( TQObject *tqparent ) - : TQAction( tqparent, "qt_designer_separator" ), wid( 0 ) +QSeparatorAction::QSeparatorAction( TQObject *parent ) + : TQAction( parent, "qt_designer_separator" ), wid( 0 ) { } @@ -216,8 +216,8 @@ void QDesignerToolBar::addAction( TQAction *a ) static void fixObject( TQObject *&o ) { - while ( o && o->tqparent() && !o->tqparent()->inherits( "QDesignerToolBar" ) ) - o = o->tqparent(); + while ( o && o->parent() && !o->parent()->inherits( "QDesignerToolBar" ) ) + o = o->parent(); } bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e ) @@ -664,7 +664,7 @@ void QDesignerToolBar::doInsertWidget( const TQPoint &p ) TQWidget *w = WidgetFactory::create( MainWindow::self->currentTool(), this, 0, true ); installEventFilters( w ); MainWindow::self->formWindow()->insertWidget( w, true ); - QDesignerAction *a = new QDesignerAction( w, tqparent() ); + QDesignerAction *a = new QDesignerAction( w, parent() ); int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; diff --git a/kommander/editor/actiondnd.h b/kommander/editor/actiondnd.h index c041f9db..a47992cd 100644 --- a/kommander/editor/actiondnd.h +++ b/kommander/editor/actiondnd.h @@ -40,8 +40,8 @@ class QDesignerActionGroup : public TQActionGroup TQ_OBJECT public: - QDesignerActionGroup( TQObject *tqparent ) - : TQActionGroup( !tqparent || tqparent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? tqparent : 0 ), wid( 0 ), idx( -1 ) {} + QDesignerActionGroup( TQObject *parent ) + : TQActionGroup( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ) {} TQWidget *widget() const { return wid; } TQWidget *widget( TQAction *a ) const { return *widgets.find( a ); } @@ -71,10 +71,10 @@ class QDesignerAction : public TQAction TQ_OBJECT public: - QDesignerAction( TQObject *tqparent ) - : TQAction( !tqparent || tqparent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) {} - QDesignerAction( TQWidget *w, TQObject *tqparent ) - : TQAction( !tqparent || tqparent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) {} + QDesignerAction( TQObject *parent ) + : TQAction( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) {} + QDesignerAction( TQWidget *w, TQObject *parent ) + : TQAction( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) {} TQWidget *widget() const { return wid; } int index() const { return idx; } @@ -106,7 +106,7 @@ class QDesignerToolBarSeparator : public TQWidget TQ_OBJECT public: - QDesignerToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 ); + QDesignerToolBarSeparator( Qt::Orientation, TQToolBar *parent, const char* name=0 ); TQSize tqsizeHint() const; Qt::Orientation orientation() const { return orient; } @@ -126,7 +126,7 @@ class QSeparatorAction : public TQAction TQ_OBJECT public: - QSeparatorAction( TQObject *tqparent ); + QSeparatorAction( TQObject *parent ); bool addTo( TQWidget *w ); bool removeFrom( TQWidget *w ); diff --git a/kommander/editor/actioneditorimpl.cpp b/kommander/editor/actioneditorimpl.cpp index 0e4d2a8f..ededd8a7 100644 --- a/kommander/editor/actioneditorimpl.cpp +++ b/kommander/editor/actioneditorimpl.cpp @@ -37,8 +37,8 @@ #include <klocale.h> -ActionEditor::ActionEditor( TQWidget* tqparent, const char* name, WFlags fl ) - : ActionEditorBase( tqparent, name, fl ), currentAction( 0 ), formWindow( 0 ) +ActionEditor::ActionEditor( TQWidget* parent, const char* name, WFlags fl ) + : ActionEditorBase( parent, name, fl ), currentAction( 0 ), formWindow( 0 ) { listActions->addColumn( i18n("Actions" ) ); setEnabled( false ); @@ -119,7 +119,7 @@ void ActionEditor::newAction() if ( actionParent ) { if ( !actionParent->actionGroup() || !actionParent->actionGroup()->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) - actionParent = (ActionItem*)actionParent->tqparent(); + actionParent = (ActionItem*)actionParent->parent(); } ActionItem *i = 0; @@ -151,7 +151,7 @@ void ActionEditor::newActionGroup() if ( actionParent ) { if ( !actionParent->actionGroup() || !actionParent->actionGroup()->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) - actionParent = (ActionItem*)actionParent->tqparent(); + actionParent = (ActionItem*)actionParent->parent(); } ActionItem *i = 0; @@ -193,7 +193,7 @@ void ActionEditor::setFormWindow( FormWindow *fw ) setEnabled( true ); for ( TQAction *a = formWindow->actionList().first(); a; a = formWindow->actionList().next() ) { ActionItem *i = 0; - if ( a->tqparent() && a->tqparent()->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( a->parent() && a->parent()->inherits( TQACTION_OBJECT_NAME_STRING ) ) continue; i = new ActionItem( listActions, a ); i->setText( 0, a->name() ); diff --git a/kommander/editor/actioneditorimpl.h b/kommander/editor/actioneditorimpl.h index 40ed78ac..177b5af8 100644 --- a/kommander/editor/actioneditorimpl.h +++ b/kommander/editor/actioneditorimpl.h @@ -33,7 +33,7 @@ class ActionEditor : public ActionEditorBase TQ_OBJECT public: - ActionEditor( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + ActionEditor( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); void setFormWindow( FormWindow *fw ); void updateActionName( TQAction *a ); void updateActionIcon( TQAction *a ); diff --git a/kommander/editor/actionlistview.cpp b/kommander/editor/actionlistview.cpp index 70b9edbe..3193d24c 100644 --- a/kommander/editor/actionlistview.cpp +++ b/kommander/editor/actionlistview.cpp @@ -24,8 +24,8 @@ #include <klocale.h> -ActionListView::ActionListView( TQWidget *tqparent, const char *name ) - : TQListView( tqparent, name ) +ActionListView::ActionListView( TQWidget *parent, const char *name ) + : TQListView( parent, name ) { header()->setStretchEnabled( true ); setRootIsDecorated( true ); diff --git a/kommander/editor/actionlistview.h b/kommander/editor/actionlistview.h index 3b9deca7..9559c262 100644 --- a/kommander/editor/actionlistview.h +++ b/kommander/editor/actionlistview.h @@ -33,10 +33,10 @@ public: g( group ? new QDesignerActionGroup( 0 ) : 0 ) { setDragEnabled( TRUE ); } ActionItem( TQListView *lv, TQAction *ac ); ActionItem( TQListViewItem *i, TQAction *ac ); - ActionItem( ActionItem *tqparent, bool group = FALSE ) - : TQListViewItem( tqparent ), - a( group ? 0 : new QDesignerAction( tqparent->actionGroup() ) ), - g( group ? new QDesignerActionGroup( tqparent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); } + ActionItem( ActionItem *parent, bool group = FALSE ) + : TQListViewItem( parent ), + a( group ? 0 : new QDesignerAction( parent->actionGroup() ) ), + g( group ? new QDesignerActionGroup( parent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); } QDesignerAction *action() const { return a; } QDesignerActionGroup *actionGroup() const { return g; } @@ -56,7 +56,7 @@ class ActionListView : public TQListView TQ_OBJECT public: - ActionListView( TQWidget *tqparent = 0, const char *name = 0 ); + ActionListView( TQWidget *parent = 0, const char *name = 0 ); protected: TQDragObject *dragObject(); diff --git a/kommander/editor/asciivalidator.cpp b/kommander/editor/asciivalidator.cpp index 33381e0b..eb1dd4f1 100644 --- a/kommander/editor/asciivalidator.cpp +++ b/kommander/editor/asciivalidator.cpp @@ -22,18 +22,18 @@ #include <tqstring.h> -AsciiValidator::AsciiValidator( TQObject * tqparent, const char *name ) - : TQValidator( tqparent, name ), functionName( false ) +AsciiValidator::AsciiValidator( TQObject * parent, const char *name ) + : TQValidator( parent, name ), functionName( false ) { } -AsciiValidator::AsciiValidator( bool funcName, TQObject * tqparent, const char *name ) - : TQValidator( tqparent, name ), functionName( funcName ) +AsciiValidator::AsciiValidator( bool funcName, TQObject * parent, const char *name ) + : TQValidator( parent, name ), functionName( funcName ) { } -AsciiValidator::AsciiValidator( const TQString &allow, TQObject * tqparent, const char *name ) - : TQValidator( tqparent, name ), functionName( false ), allowedChars( allow ) +AsciiValidator::AsciiValidator( const TQString &allow, TQObject * parent, const char *name ) + : TQValidator( parent, name ), functionName( false ), allowedChars( allow ) { } diff --git a/kommander/editor/asciivalidator.h b/kommander/editor/asciivalidator.h index 1c1d6c2c..d0b388a8 100644 --- a/kommander/editor/asciivalidator.h +++ b/kommander/editor/asciivalidator.h @@ -30,9 +30,9 @@ class AsciiValidator: public TQValidator Q_OBJECT TQ_OBJECT public: - AsciiValidator( TQObject * tqparent, const char *name = 0 ); - AsciiValidator( bool funcName, TQObject * tqparent, const char *name = 0 ); - AsciiValidator( const TQString &allow, TQObject * tqparent, const char *name = 0 ); + AsciiValidator( TQObject * parent, const char *name = 0 ); + AsciiValidator( bool funcName, TQObject * parent, const char *name = 0 ); + AsciiValidator( const TQString &allow, TQObject * parent, const char *name = 0 ); ~AsciiValidator(); TQValidator::State validate( TQString &, int & ) const; diff --git a/kommander/editor/assistproc.cpp b/kommander/editor/assistproc.cpp index bfe67544..c13f8b86 100644 --- a/kommander/editor/assistproc.cpp +++ b/kommander/editor/assistproc.cpp @@ -19,8 +19,8 @@ **********************************************************************/ #include "assistproc.h" -AssistProc::AssistProc( TQObject *tqparent, const char *name, const TQString &path ) - : TQProcess( tqparent, name ) +AssistProc::AssistProc( TQObject *parent, const char *name, const TQString &path ) + : TQProcess( parent, name ) { assistantPath = path; connect( this, TQT_SIGNAL(readyReadStdout()), this, TQT_SLOT(processOutput()) ); diff --git a/kommander/editor/assistproc.h b/kommander/editor/assistproc.h index 93986cef..fabc71cf 100644 --- a/kommander/editor/assistproc.h +++ b/kommander/editor/assistproc.h @@ -30,7 +30,7 @@ class AssistProc : public TQProcess Q_OBJECT TQ_OBJECT public: - AssistProc( TQObject *tqparent=0, const char * name = 0, const TQString &path = TQString() ); + AssistProc( TQObject *parent=0, const char * name = 0, const TQString &path = TQString() ); ~AssistProc(); bool run( const TQString &path = TQString() ); diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp index 40a1c088..c1b8db31 100644 --- a/kommander/editor/command.cpp +++ b/kommander/editor/command.cpp @@ -516,7 +516,7 @@ bool SetPropertyCommand::checkProperty() return false; } - if ( widget->tqparent() && widget->tqparent()->inherits( "FormWindow" ) ) + if ( widget->parent() && widget->parent()->inherits( "FormWindow" ) ) formWindow()->mainWindow()->formNameChanged( (FormWindow*)( (TQWidget*)widget )->parentWidget() ); } return true; @@ -628,9 +628,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ // ------------------------------------------------------------ LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase ) + : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase ) { } @@ -651,9 +651,9 @@ void LayoutHorizontalCommand::unexecute() // ------------------------------------------------------------ LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, true, true ) + : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, true, true ) { } @@ -674,9 +674,9 @@ void LayoutHorizontalSplitCommand::unexecute() // ------------------------------------------------------------ LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase ) + : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase ) { } @@ -697,9 +697,9 @@ void LayoutVerticalCommand::unexecute() // ------------------------------------------------------------ LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, true, true ) + : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, true, true ) { } @@ -720,9 +720,9 @@ void LayoutVerticalSplitCommand::unexecute() // ------------------------------------------------------------ LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl, int xres, int yres ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) ) + : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) ) { } @@ -1417,7 +1417,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to ) from->setSorting( -1 ); for ( ; it.current(); ++it ) { TQListViewItem *i = it.current(); - if ( i->tqparent() == fromParents.top() ) { + if ( i->parent() == fromParents.top() ) { TQListViewItem *pi = toParents.top(); TQListViewItem *ni = 0; if ( pi ) @@ -1434,7 +1434,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to ) if ( pi ) pi->setOpen( true ); } else { - if ( i->tqparent() == fromLast ) { + if ( i->parent() == fromLast ) { fromParents.push( fromLast ); toParents.push( toLasts.top() ); toLasts.push( 0 ); @@ -1454,7 +1454,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to ) if ( pi ) pi->setOpen( true ); } else { - while ( fromParents.top() != i->tqparent() ) { + while ( fromParents.top() != i->parent() ) { fromParents.pop(); toParents.pop(); toLasts.pop(); diff --git a/kommander/editor/command.h b/kommander/editor/command.h index d288564e..4d1a3aa5 100644 --- a/kommander/editor/command.h +++ b/kommander/editor/command.h @@ -255,7 +255,7 @@ class LayoutHorizontalCommand : public Command { public: LayoutHorizontalCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ); void execute(); @@ -271,7 +271,7 @@ class LayoutHorizontalSplitCommand : public Command { public: LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ); void execute(); @@ -287,7 +287,7 @@ class LayoutVerticalCommand : public Command { public: LayoutVerticalCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ); void execute(); @@ -303,7 +303,7 @@ class LayoutVerticalSplitCommand : public Command { public: LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ); void execute(); @@ -319,7 +319,7 @@ class LayoutGridCommand : public Command { public: LayoutGridCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl, int xres, int yres ); void execute(); diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp index 62110d73..c87b9d51 100644 --- a/kommander/editor/connectioneditorimpl.cpp +++ b/kommander/editor/connectioneditorimpl.cpp @@ -89,8 +89,8 @@ static const char *const ignore_signals[] = { }; -ConnectionEditor::ConnectionEditor(TQWidget* tqparent, TQObject* sndr, TQObject* rcvr, FormWindow* fw) - : ConnectionEditorBase(tqparent, 0, true), m_formWindow(fw) +ConnectionEditor::ConnectionEditor(TQWidget* parent, TQObject* sndr, TQObject* rcvr, FormWindow* fw) + : ConnectionEditorBase(parent, 0, true), m_formWindow(fw) { if (!rcvr || TQT_BASE_OBJECT(rcvr) == TQT_BASE_OBJECT(m_formWindow)) rcvr = TQT_TQOBJECT(m_formWindow->mainContainer()); diff --git a/kommander/editor/connectioneditorimpl.h b/kommander/editor/connectioneditorimpl.h index 35e3f2e0..7887fa0d 100644 --- a/kommander/editor/connectioneditorimpl.h +++ b/kommander/editor/connectioneditorimpl.h @@ -34,7 +34,7 @@ class ConnectionEditor : public ConnectionEditorBase Q_OBJECT TQ_OBJECT public: - ConnectionEditor(TQWidget* tqparent, TQObject* sender, TQObject* receiver, FormWindow* fw); + ConnectionEditor(TQWidget* parent, TQObject* sender, TQObject* receiver, FormWindow* fw); ~ConnectionEditor(); protected slots: diff --git a/kommander/editor/filechooser.cpp b/kommander/editor/filechooser.cpp index 0133974a..39b3d9ca 100644 --- a/kommander/editor/filechooser.cpp +++ b/kommander/editor/filechooser.cpp @@ -4,8 +4,8 @@ #include <kfiledialog.h> #include <tqlayout.h> -FileChooser::FileChooser( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), md( File ) +FileChooser::FileChooser( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), md( File ) { TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); tqlayout->setMargin( 0 ); diff --git a/kommander/editor/filechooser.h b/kommander/editor/filechooser.h index df518db6..4ce2fe40 100644 --- a/kommander/editor/filechooser.h +++ b/kommander/editor/filechooser.h @@ -16,7 +16,7 @@ class FileChooser : public TQWidget TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName ) public: - FileChooser( TQWidget *tqparent = 0, const char *name = 0); + FileChooser( TQWidget *parent = 0, const char *name = 0); enum Mode { File, Directory }; diff --git a/kommander/editor/formsettingsimpl.cpp b/kommander/editor/formsettingsimpl.cpp index dc292102..ddfa8345 100644 --- a/kommander/editor/formsettingsimpl.cpp +++ b/kommander/editor/formsettingsimpl.cpp @@ -27,8 +27,8 @@ #include <klineedit.h> #include <tqspinbox.h> -FormSettings::FormSettings( TQWidget *tqparent, FormWindow *fw ) - : FormSettingsBase( tqparent, 0, true ), formwindow( fw ) +FormSettings::FormSettings( TQWidget *parent, FormWindow *fw ) + : FormSettingsBase( parent, 0, true ), formwindow( fw ) { MetaDataBase::MetaInfo info = MetaDataBase::metaInfo(TQT_TQOBJECT(fw)); editAuthor->setText(info.author); diff --git a/kommander/editor/formsettingsimpl.h b/kommander/editor/formsettingsimpl.h index e8940b9d..d94a59ba 100644 --- a/kommander/editor/formsettingsimpl.h +++ b/kommander/editor/formsettingsimpl.h @@ -31,7 +31,7 @@ class FormSettings : public FormSettingsBase TQ_OBJECT public: - FormSettings( TQWidget *tqparent, FormWindow *fw ); + FormSettings( TQWidget *parent, FormWindow *fw ); protected slots: void okClicked(); diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp index 55c1b142..7e9a3b39 100644 --- a/kommander/editor/formwindow.cpp +++ b/kommander/editor/formwindow.cpp @@ -110,8 +110,8 @@ static void restoreCursors(TQWidget *start, FormWindow *fw) event filter which is implemented in MainWindow::eventFilter(). */ -FormWindow::FormWindow(FormFile *f, MainWindow *mw, TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name, WDestructiveClose), mainwindow(mw), +FormWindow::FormWindow(FormFile *f, MainWindow *mw, TQWidget *parent, const char *name) + : TQWidget(parent, name, WDestructiveClose), mainwindow(mw), commands(100), pixInline(true) { ff = f; @@ -119,8 +119,8 @@ FormWindow::FormWindow(FormFile *f, MainWindow *mw, TQWidget *tqparent, const ch initSlots(); } -FormWindow::FormWindow(FormFile *f, TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name, WDestructiveClose), mainwindow(0), +FormWindow::FormWindow(FormFile *f, TQWidget *parent, const char *name) + : TQWidget(parent, name, WDestructiveClose), mainwindow(0), commands(100), pixInline(true) { ff = f; @@ -213,14 +213,14 @@ void FormWindow::paintGrid(TQWidget *w, TQPaintEvent *e) if(!TQPixmapCache::find(grid_name, grid)) { grid = TQPixmap(350 + (350 % mainWindow()->grid().x()), 350 + (350 % mainWindow()->grid().y())); grid.fill(tqcolorGroup().color(TQColorGroup::Foreground)); - TQBitmap tqmask(grid.width(), grid.height()); - tqmask.fill(color0); - TQPainter p(&tqmask); + TQBitmap mask(grid.width(), grid.height()); + mask.fill(color0); + TQPainter p(&mask); p.setPen(color1); for (int y = 0; y < grid.width(); y += mainWindow()->grid().y()) for (int x = 0; x < grid.height(); x += mainWindow()->grid().x()) p.drawPoint(x, y); - grid.setMask(tqmask); + grid.setMask(mask); TQPixmapCache::insert(grid_name, grid); } TQPainter p(w); @@ -381,7 +381,7 @@ void FormWindow::insertWidget() pos -= r.topLeft(); np.append(pos); } - MoveCommand *mv = new MoveCommand(i18n("Retqparent Widgets"), this, lst, op, np, insertParent, pw); + MoveCommand *mv = new MoveCommand(i18n("Reparent Widgets"), this, lst, op, np, insertParent, pw); if (!toolFixed) mainwindow->resetTool(); else @@ -628,9 +628,9 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) if (e->button() == Qt::LeftButton) { insertParent = WidgetFactory::containerOfWidget(mainContainer()); - // default tqparent for new widget is the formwindow + // default parent for new widget is the formwindow if (!isMainContainer(TQT_TQOBJECT(w))) - { // press was not on formwindow, check if we can find another tqparent + { // press was not on formwindow, check if we can find another parent TQWidget *wid = w; for (;;) { @@ -638,7 +638,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) if ((WidgetDatabase::isContainer(id) || wid == mainContainer()) && !wid->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) && !wid->inherits(TQSPLITTER_OBJECT_NAME_STRING)) { - insertParent = WidgetFactory::containerOfWidget(wid); // found another tqparent, store it + insertParent = WidgetFactory::containerOfWidget(wid); // found another parent, store it break; } else @@ -733,7 +733,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) checkSelectionsForMove(w); } // check whether we would have to reparent the selection and - // highlight the possible new tqparent container + // highlight the possible new parent container TQMapConstIterator<ulong, TQPoint> it = moving.begin(); TQWidget* wa = containerAt(e->globalPos(), ((TQWidget*)it.key())); if (wa && !isMainContainer(TQT_TQOBJECT(wa)) && !isCentralWidget(TQT_TQOBJECT(wa))) @@ -1553,7 +1553,7 @@ TQWidget *FormWindow::designerWidget(TQObject * o) const return 0; TQWidget *w = (TQWidget *) o; while (w && !isMainContainer(TQT_TQOBJECT(w)) && !insertedWidgets[(void *) w] || isCentralWidget(TQT_TQOBJECT(w))) - w = (TQWidget *) w->tqparent(); + w = (TQWidget *) w->parent(); return w; } @@ -1872,11 +1872,11 @@ void FormWindow::raiseWidgets() commandHistory()->addCommand(cmd); } -void FormWindow::paste(const TQString & cb, TQWidget * tqparent) +void FormWindow::paste(const TQString & cb, TQWidget * parent) { Resource resource(mainWindow()); resource.setWidget(this); - resource.paste(cb, tqparent); + resource.paste(cb, parent); } void FormWindow::selectAll() diff --git a/kommander/editor/formwindow.h b/kommander/editor/formwindow.h index 5674c46d..71fc8280 100644 --- a/kommander/editor/formwindow.h +++ b/kommander/editor/formwindow.h @@ -62,8 +62,8 @@ class FormWindow : public TQWidget TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName ) public: - FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const char *name = 0 ); - FormWindow( FormFile *f, TQWidget *tqparent, const char *name = 0 ); + FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const char *name = 0 ); + FormWindow( FormFile *f, TQWidget *parent, const char *name = 0 ); ~FormWindow(); void init(); @@ -80,7 +80,7 @@ public: virtual void undo(); virtual void redo(); virtual TQString copy(); - virtual void paste( const TQString &cb, TQWidget *tqparent ); + virtual void paste( const TQString &cb, TQWidget *parent ); virtual void lowerWidgets(); virtual void raiseWidgets(); virtual void checkAccels(); diff --git a/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp index ee5c6642..9ec77020 100644 --- a/kommander/editor/hierarchyview.cpp +++ b/kommander/editor/hierarchyview.cpp @@ -74,15 +74,15 @@ static const char * const folder_xpm[]={ TQListViewItem *newItem = 0; -HierarchyItem::HierarchyItem( Type type, TQListViewItem *tqparent, +HierarchyItem::HierarchyItem( Type type, TQListViewItem *parent, const TQString &txt1, const TQString &txt2, const TQString &txt3 ) - : TQListViewItem( tqparent, txt1, txt2, txt3 ), typ( type ) + : TQListViewItem( parent, txt1, txt2, txt3 ), typ( type ) { } -HierarchyItem::HierarchyItem( Type type, TQListView *tqparent, +HierarchyItem::HierarchyItem( Type type, TQListView *parent, const TQString &txt1, const TQString &txt2, const TQString &txt3 ) - : TQListViewItem( tqparent, txt1, txt2, txt3 ), typ( type ) + : TQListViewItem( parent, txt1, txt2, txt3 ), typ( type ) { } @@ -177,8 +177,8 @@ void HierarchyItem::cancelRename( int col ) -HierarchyList::HierarchyList( TQWidget *tqparent, FormWindow *fw, bool doConnects ) - : TQListView( tqparent ), formWindow( fw ) +HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects ) + : TQListView( parent ), formWindow( fw ) { init_colors(); @@ -255,15 +255,15 @@ void HierarchyList::objectClicked( TQListViewItem *i ) } if ( !formWindow->widgets()->find( w ) ) { - if ( w->tqparent() && w->tqparent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) && - w->tqparent()->tqparent() && - ( w->tqparent()->tqparent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || - w->tqparent()->tqparent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) { - if ( w->tqparent()->tqparent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) - ( (TQTabWidget*)w->tqparent()->tqparent() )->showPage( w ); + if ( w->parent() && w->parent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) && + w->parent()->parent() && + ( w->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || + w->parent()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) { + if ( w->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + ( (TQTabWidget*)w->parent()->parent() )->showPage( w ); else - ( (QDesignerWizard*)w->tqparent()->tqparent() )->setCurrentPage( ( (QDesignerWizard*)w->tqparent()->tqparent() )->pageNum( w ) ); - w = (TQWidget*)w->tqparent()->tqparent(); + ( (QDesignerWizard*)w->parent()->parent() )->setCurrentPage( ( (QDesignerWizard*)w->parent()->parent() )->pageNum( w ) ); + w = (TQWidget*)w->parent()->parent(); formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) ); } else { return; @@ -353,7 +353,7 @@ void HierarchyList::setOpen( TQListViewItem *i, bool b ) TQListView::setOpen( i, b ); } -void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) +void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) { bool fakeMainWindow = false; if ( o && o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { @@ -387,30 +387,30 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) #endif TQString name = o->name(); - if ( o->tqparent() && o->tqparent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) && - o->tqparent()->tqparent() ) { - if ( o->tqparent()->tqparent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) - name = ( (TQTabWidget*)o->tqparent()->tqparent() )->tabLabel( (TQWidget*)o ); - else if ( o->tqparent()->tqparent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) - name = ( (TQWizard*)o->tqparent()->tqparent() )->title( (TQWidget*)o ); + if ( o->parent() && o->parent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) && + o->parent()->parent() ) { + if ( o->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + name = ( (TQTabWidget*)o->parent()->parent() )->tabLabel( (TQWidget*)o ); + else if ( o->parent()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + name = ( (TQWizard*)o->parent()->parent() )->title( (TQWidget*)o ); } TQToolBox *tb; - if ( o->tqparent() && o->tqparent()->tqparent() && - (tb = ::tqqt_cast<TQToolBox*>(o->tqparent()->tqparent()->tqparent())) ) + if ( o->parent() && o->parent()->parent() && + (tb = ::tqqt_cast<TQToolBox*>(o->parent()->parent()->parent())) ) name = tb->itemLabel( tb->indexOf((TQWidget*)o) ); if ( fakeMainWindow ) { - name = o->tqparent()->name(); + name = o->parent()->name(); className = TQMAINWINDOW_OBJECT_NAME_STRING; } - if ( !tqparent ) + if ( !parent ) item = new HierarchyItem( HierarchyItem::Widget, this, name, className, dbInfo ); else - item = new HierarchyItem( HierarchyItem::Widget, tqparent, name, className, dbInfo ); - if ( !tqparent ) + item = new HierarchyItem( HierarchyItem::Widget, parent, name, className, dbInfo ); + if ( !parent ) item->setPixmap( 0, PixmapChooser::loadPixmap( "form.xpm", PixmapChooser::Mini ) ); else if ( o->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING) ) item->setPixmap( 0, PixmapChooser::loadPixmap( "tqlayout.xpm", PixmapChooser::Small ) ); @@ -428,18 +428,18 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) if ( !it.current()->isWidgetType() || ( (TQWidget*)it.current() )->isHidden() ) continue; if ( !formWindow->widgets()->find( (TQWidget*)it.current() ) ) { - if ( it.current()->tqparent() && - ( it.current()->tqparent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || - it.current()->tqparent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) && + if ( it.current()->parent() && + ( it.current()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || + it.current()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) && it.current()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) { TQObject *obj = it.current(); TQObjectList *l2 = obj->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, true, false ); QDesignerTabWidget *tw = 0; QDesignerWizard *dw = 0; - if ( it.current()->tqparent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) - tw = (QDesignerTabWidget*)it.current()->tqparent(); - if ( it.current()->tqparent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) - dw = (QDesignerWizard*)it.current()->tqparent(); + if ( it.current()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + tw = (QDesignerTabWidget*)it.current()->parent(); + if ( it.current()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + dw = (QDesignerWizard*)it.current()->parent(); TQWidgetStack *stack = (TQWidgetStack*)obj; for ( obj = l2->last(); obj; obj = l2->prev() ) { if ( qstrcmp( obj->className(), "TQWidgetStackPrivate::Invisible" ) == 0 || @@ -449,10 +449,10 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) insertObject( obj, item ); } delete l2; - } else if ( ::tqqt_cast<TQToolBox*>(it.current()->tqparent()) ) { + } else if ( ::tqqt_cast<TQToolBox*>(it.current()->parent()) ) { if ( !::tqqt_cast<TQScrollView*>(it.current()) ) continue; - TQToolBox *tb = (TQToolBox*)it.current()->tqparent(); + TQToolBox *tb = (TQToolBox*)it.current()->parent(); for ( int i = tb->count() - 1; i >= 0; --i ) insertObject( TQT_TQOBJECT(tb->item( i )), item ); } @@ -598,8 +598,8 @@ void HierarchyList::insertEntry( TQListViewItem *i, const TQPixmap &pix, const T item->startRename( 0 ); } -HierarchyView::HierarchyView( TQWidget *tqparent ) - : TQTabWidget( tqparent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | +HierarchyView::HierarchyView( TQWidget *parent ) + : TQTabWidget( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_Tool |WStyle_MinMax | WStyle_SysMenu ) { formwindow = 0; diff --git a/kommander/editor/hierarchyview.h b/kommander/editor/hierarchyview.h index 68215bda..007f2d38 100644 --- a/kommander/editor/hierarchyview.h +++ b/kommander/editor/hierarchyview.h @@ -52,9 +52,9 @@ public: EventFunction }; - HierarchyItem(Type type, TQListViewItem * tqparent, + HierarchyItem(Type type, TQListViewItem * parent, const TQString & txt1, const TQString & txt2, const TQString & txt3); - HierarchyItem(Type type, TQListView * tqparent, + HierarchyItem(Type type, TQListView * parent, const TQString & txt1, const TQString & txt2, const TQString & txt3); void paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align); @@ -82,7 +82,7 @@ class HierarchyList:public TQListView Q_OBJECT TQ_OBJECT public: - HierarchyList(TQWidget * tqparent, FormWindow * fw, bool doConnects = TRUE); + HierarchyList(TQWidget * parent, FormWindow * fw, bool doConnects = TRUE); virtual void setup(); virtual void setCurrent(TQWidget * w); @@ -107,7 +107,7 @@ public slots: void removeTabPage(); private: - void insertObject(TQObject * o, TQListViewItem * tqparent); + void insertObject(TQObject * o, TQListViewItem * parent); TQWidget *findWidget(TQListViewItem * i); TQListViewItem *findItem(TQWidget * w); TQWidget *current() const; @@ -127,7 +127,7 @@ class HierarchyView : public TQTabWidget TQ_OBJECT public: - HierarchyView( TQWidget *tqparent ); + HierarchyView( TQWidget *parent ); ~HierarchyView(); void setFormWindow( FormWindow *fw, TQWidget *w ); diff --git a/kommander/editor/iconvieweditorimpl.cpp b/kommander/editor/iconvieweditorimpl.cpp index 549e5c96..911f6ec8 100644 --- a/kommander/editor/iconvieweditorimpl.cpp +++ b/kommander/editor/iconvieweditorimpl.cpp @@ -31,8 +31,8 @@ #include <klocale.h> -IconViewEditor::IconViewEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ) - : IconViewEditorBase( tqparent, 0, true ), formwindow( fw ) +IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) + : IconViewEditorBase( parent, 0, true ), formwindow( fw ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); iconview = (TQIconView*)editWidget; diff --git a/kommander/editor/iconvieweditorimpl.h b/kommander/editor/iconvieweditorimpl.h index 4e3972ff..2b145c8f 100644 --- a/kommander/editor/iconvieweditorimpl.h +++ b/kommander/editor/iconvieweditorimpl.h @@ -31,7 +31,7 @@ class IconViewEditor : public IconViewEditorBase TQ_OBJECT public: - IconViewEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ); + IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ); protected slots: void insertNewItem(); diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp index 152548b2..dca00c38 100644 --- a/kommander/editor/layout.cpp +++ b/kommander/editor/layout.cpp @@ -44,17 +44,17 @@ bool operator<( const TQGuardedPtr<TQWidget> &p1, const TQGuardedPtr<TQWidget> & */ -/*! \a p specifies the tqparent of the layoutBase \a lb. The tqparent +/*! \a p specifies the parent of the layoutBase \a lb. The parent might be changed in setup(). If the layoutBase is a - container, the tqparent and the layoutBase are the same. Also they + container, the parent and the layoutBase are the same. Also they always have to be a widget known to the designer (e.g. in the case - of the tabwidget tqparent and layoutBase are the tabwidget and not the + of the tabwidget parent and layoutBase are the tabwidget and not the page which actually gets laid out. For actual usage the correct widget is found later by Layout.) */ Layout::Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup, bool splitter ) - : widgets( wl ), tqparent( p ), formWindow( fw ), isBreak( !doSetup ), useSplitter( splitter ) + : widgets( wl ), parent( p ), formWindow( fw ), isBreak( !doSetup ), useSplitter( splitter ) { widgets.setAutoDelete( false ); layoutBase = lb; @@ -77,8 +77,8 @@ void Layout::setup() TQWidget *w = 0; // Go through all widgets of the list we got. As we can only - // tqlayout widgets which have the same tqparent, we first do some - // sorting which means create a list for each tqparent containing + // tqlayout widgets which have the same parent, we first do some + // sorting which means create a list for each parent containing // its child here. After that we keep working on the list of // childs which has the most entries. // Widgets which are already laid out are thrown away here too @@ -127,8 +127,8 @@ void Layout::setup() // Now we have a new and clean widget list, which makes sense // to tqlayout widgets = *lastList; - // Also use the only correct tqparent later, so store it - tqparent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() ); + // Also use the only correct parent later, so store it + parent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() ); // Now calculate the position where the tqlayout-meta-widget should // be placed and connect to widgetDestroyed() signals of the // widgets to get informed if one gets deleted to be able to @@ -152,21 +152,21 @@ void Layout::widgetDestroyed() widgets.removeRef( (TQWidget*)sender() ); } -bool Layout::prepareLayout( bool &needMove, bool &needRetqparent ) +bool Layout::prepareLayout( bool &needMove, bool &needReparent ) { if ( !widgets.count() ) return false; for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) w->raise(); needMove = !layoutBase; - needRetqparent = needMove || layoutBase->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ); + needReparent = needMove || layoutBase->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ); if ( !layoutBase ) { if ( !useSplitter ) layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ), - WidgetFactory::containerOfWidget( tqparent ) ); + WidgetFactory::containerOfWidget( parent ) ); else layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ), - WidgetFactory::containerOfWidget( tqparent ) ); + WidgetFactory::containerOfWidget( parent ) ); } else { WidgetFactory::deleteLayout( layoutBase ); } @@ -203,12 +203,12 @@ void Layout::undoLayout() for ( ; it != geometries.end(); ++it ) { if ( !it.key() ) continue; - it.key()->reparent( WidgetFactory::containerOfWidget( tqparent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) ); + it.key()->reparent( WidgetFactory::containerOfWidget( parent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) ); it.key()->resize( ( *it ).size() ); } formWindow->selectWidget( TQT_TQOBJECT(layoutBase), false ); WidgetFactory::deleteLayout( layoutBase ); - if ( tqparent != layoutBase && !layoutBase->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + if ( parent != layoutBase && !layoutBase->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { layoutBase->hide(); TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); @@ -231,14 +231,14 @@ void Layout::breakLayout() rects.insert( w, w->tqgeometry() ); } WidgetFactory::deleteLayout( layoutBase ); - bool needRetqparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 || + bool needReparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 || qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 || ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( layoutBase )) ) ) && layoutBase != formWindow->mainContainer() ); bool needResize = qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0; bool add = geometries.isEmpty(); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - if ( needRetqparent ) + if ( needReparent ) w->reparent( layoutBase->parentWidget(), 0, layoutBase->pos() + w->pos(), true ); if ( needResize ) { @@ -249,14 +249,14 @@ void Layout::breakLayout() if ( add ) geometries.insert( w, TQRect( w->pos(), w->size() ) ); } - if ( needRetqparent ) { + if ( needReparent ) { layoutBase->hide(); - tqparent = layoutBase->parentWidget(); + parent = layoutBase->parentWidget(); TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); layoutBase->setName( n ); } else { - tqparent = layoutBase; + parent = layoutBase; } if ( widgets.first() && widgets.first()->isVisibleTo( formWindow ) ) formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) ); @@ -299,14 +299,14 @@ void HorizontalLayout::setup() void HorizontalLayout::doLayout() { - bool needMove, needRetqparent; - if ( !prepareLayout( needMove, needRetqparent ) ) + bool needMove, needReparent; + if ( !prepareLayout( needMove, needReparent ) ) return; TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(layoutBase) ) + if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) @@ -363,14 +363,14 @@ void VerticalLayout::setup() void VerticalLayout::doLayout() { - bool needMove, needRetqparent; - if ( !prepareLayout( needMove, needRetqparent ) ) + bool needMove, needReparent; + if ( !prepareLayout( needMove, needReparent ) ) return; TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(layoutBase) ) + if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) @@ -729,8 +729,8 @@ GridLayout::~GridLayout() void GridLayout::doLayout() { - bool needMove, needRetqparent; - if ( !prepareLayout( needMove, needRetqparent ) ) + bool needMove, needReparent; + if ( !prepareLayout( needMove, needReparent ) ) return; QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid ); @@ -742,7 +742,7 @@ void GridLayout::doLayout() int r, c, rs, cs; for ( w = widgets.first(); w; w = widgets.next() ) { if ( grid->locateWidget( w, r, c, rs, cs) ) { - if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(layoutBase) ) + if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false ); if ( rs * cs == 1 ) { tqlayout->addWidget( w, r, c, w->inherits( "Spacer" ) ? ( (Spacer*)w )->tqalignment() : 0 ); @@ -801,8 +801,8 @@ void GridLayout::buildGrid() -Spacer::Spacer( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, WMouseNoMask ), +Spacer::Spacer( TQWidget *parent, const char *name ) + : TQWidget( parent, name, WMouseNoMask ), orient(Qt::Vertical ), interactive(true), sh( TQSize(20,20) ) { setSizeType( Expanding ); diff --git a/kommander/editor/layout.h b/kommander/editor/layout.h index cd89ba41..14104bf7 100644 --- a/kommander/editor/layout.h +++ b/kommander/editor/layout.h @@ -43,12 +43,12 @@ public: virtual void doLayout() = 0; virtual void undoLayout(); virtual void breakLayout(); - virtual bool prepareLayout( bool &needMove, bool &needRetqparent ); + virtual bool prepareLayout( bool &needMove, bool &needReparent ); virtual void finishLayout( bool needMove, TQLayout *tqlayout ); protected: TQWidgetList widgets; - TQWidget *tqparent; + TQWidget *parent; TQPoint startPoint; TQMap<TQGuardedPtr<TQWidget>, TQRect> geometries; TQWidget *layoutBase; @@ -133,7 +133,7 @@ public: MinimumExpanding = Minimum|ExpMask, Expanding = MinimumExpanding|MayShrink }; - Spacer( TQWidget *tqparent, const char *name ); + Spacer( TQWidget *parent, const char *name ); TQSize tqminimumSize() const; TQSize tqsizeHint() const; @@ -159,7 +159,7 @@ class QDesignerGridLayout : public TQGridLayout Q_OBJECT TQ_OBJECT public: - QDesignerGridLayout( TQWidget *tqparent ) : TQGridLayout( tqparent ){}; + QDesignerGridLayout( TQWidget *parent ) : TQGridLayout( parent ){}; QDesignerGridLayout( TQLayout *parentLayout ) : TQGridLayout( parentLayout ){}; void addWidget( TQWidget *, int row, int col, int align = 0 ); diff --git a/kommander/editor/listboxeditorimpl.cpp b/kommander/editor/listboxeditorimpl.cpp index 80382c95..b9ec7fee 100644 --- a/kommander/editor/listboxeditorimpl.cpp +++ b/kommander/editor/listboxeditorimpl.cpp @@ -32,8 +32,8 @@ #include <klocale.h> -ListBoxEditor::ListBoxEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ) - : ListBoxEditorBase( tqparent, 0, true ), formwindow( fw ) +ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) + : ListBoxEditorBase( parent, 0, true ), formwindow( fw ) { connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); listbox = (TQListBox*)editWidget; diff --git a/kommander/editor/listboxeditorimpl.h b/kommander/editor/listboxeditorimpl.h index 07e18f1f..1872646e 100644 --- a/kommander/editor/listboxeditorimpl.h +++ b/kommander/editor/listboxeditorimpl.h @@ -32,7 +32,7 @@ class ListBoxEditor : public ListBoxEditorBase TQ_OBJECT public: - ListBoxEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ); + ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ); protected slots: void insertNewItem(); diff --git a/kommander/editor/listvieweditorimpl.cpp b/kommander/editor/listvieweditorimpl.cpp index abed8458..d7baba57 100644 --- a/kommander/editor/listvieweditorimpl.cpp +++ b/kommander/editor/listvieweditorimpl.cpp @@ -37,8 +37,8 @@ #include <klocale.h> -ListViewEditor::ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow *fw ) - : ListViewEditorBase( tqparent, 0, true ), listview( lv ), formwindow( fw ) +ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ) + : ListViewEditorBase( parent, 0, true ), listview( lv ), formwindow( fw ) { connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); itemText->setEnabled( false ); @@ -321,10 +321,10 @@ void ListViewEditor::itemDownClicked() return; TQListViewItemIterator it( i ); - TQListViewItem *tqparent = i->tqparent(); + TQListViewItem *parent = i->parent(); it++; while ( it.current() ) { - if ( it.current()->tqparent() == tqparent ) + if ( it.current()->parent() == parent ) break; it++; } @@ -346,11 +346,11 @@ void ListViewEditor::itemNewClicked() void ListViewEditor::itemNewSubClicked() { - TQListViewItem *tqparent = itemsPreview->currentItem(); + TQListViewItem *parent = itemsPreview->currentItem(); TQListViewItem *item = 0; - if ( tqparent ) { - item = new TQListViewItem( tqparent ); - tqparent->setOpen( true ); + if ( parent ) { + item = new TQListViewItem( parent ); + parent->setOpen( true ); } else { item = new TQListViewItem( itemsPreview ); } @@ -405,10 +405,10 @@ void ListViewEditor::itemUpClicked() return; TQListViewItemIterator it( i ); - TQListViewItem *tqparent = i->tqparent(); + TQListViewItem *parent = i->parent(); --it; while ( it.current() ) { - if ( it.current()->tqparent() == tqparent ) + if ( it.current()->parent() == parent ) break; --it; } @@ -427,13 +427,13 @@ void ListViewEditor::itemRightClicked() return; TQListViewItemIterator it( i ); - TQListViewItem *tqparent = i->tqparent(); - tqparent = tqparent ? tqparent->firstChild() : itemsPreview->firstChild(); - if ( !tqparent ) + TQListViewItem *parent = i->parent(); + parent = parent ? parent->firstChild() : itemsPreview->firstChild(); + if ( !parent ) return; it++; while ( it.current() ) { - if ( it.current()->tqparent() == tqparent ) + if ( it.current()->parent() == parent ) break; it++; } @@ -467,13 +467,13 @@ void ListViewEditor::itemLeftClicked() return; TQListViewItemIterator it( i ); - TQListViewItem *tqparent = i->tqparent(); - if ( !tqparent ) + TQListViewItem *parent = i->parent(); + if ( !parent ) return; - tqparent = tqparent->tqparent(); + parent = parent->parent(); --it; while ( it.current() ) { - if ( it.current()->tqparent() == tqparent ) + if ( it.current()->parent() == parent ) break; --it; } diff --git a/kommander/editor/listvieweditorimpl.h b/kommander/editor/listvieweditorimpl.h index 9a7d7457..f5efe0cd 100644 --- a/kommander/editor/listvieweditorimpl.h +++ b/kommander/editor/listvieweditorimpl.h @@ -35,7 +35,7 @@ class ListViewEditor : public ListViewEditorBase TQ_OBJECT public: - ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow *fw ); + ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ); protected slots: void applyClicked(); diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index 8290fbda..601d98a8 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -631,7 +631,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) if (o && currentTool() == POINTER_TOOL && (o->inherits("QDesignerMenuBar") || o->inherits("QDesignerToolBar") || (o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || o->inherits("QDesignerToolBarSeparator")) && - o->tqparent() && o->tqparent()->inherits("QDesignerToolBar"))) { + o->parent() && o->parent()->inherits("QDesignerToolBar"))) { TQWidget *w = (TQWidget*)o; if (w->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || w->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || w->inherits("QDesignerToolBarSeparator")) w = w->parentWidget(); @@ -719,7 +719,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) case TQEvent::MouseButtonDblClick: if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) { if (o && o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) && ((TQToolButton*)o)->isOn() && - o->tqparent() && o->tqparent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING) && formWindow()) + o->parent() && o->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING) && formWindow()) formWindow()->setToolFixed(); break; } @@ -752,7 +752,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) case TQEvent::Move: if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) break; - if (WidgetFactory::layoutType((TQWidget*)o->tqparent()) != WidgetFactory::NoLayout) { + if (WidgetFactory::layoutType((TQWidget*)o->parent()) != WidgetFactory::NoLayout) { ((FormWindow*)w)->updateSelection((TQWidget*)o); if (e->type() != TQEvent::Resize) ((FormWindow*)w)->updateChildSelections((TQWidget*)o); @@ -808,12 +808,12 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) TQWidget *MainWindow::isAFormWindowChild(TQObject *o) const { - if (o->tqparent() && o->tqparent()->inherits(TQWIZARD_OBJECT_NAME_STRING) && !o->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) + if (o->parent() && o->parent()->inherits(TQWIZARD_OBJECT_NAME_STRING) && !o->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) return 0; while (o) { if (o->inherits("FormWindow")) return (TQWidget*)o; - o = o->tqparent(); + o = o->parent(); } return 0; } @@ -825,7 +825,7 @@ TQWidget *MainWindow::isAToolBarChild(TQObject *o) const return (TQWidget*)o; if (o->inherits("FormWindow")) return 0; - o = o->tqparent(); + o = o->parent(); } return 0; } @@ -1541,9 +1541,9 @@ HierarchyView *MainWindow::objectHierarchy() const return hierarchyView; } -TQPopupMenu *MainWindow::setupNormalHierarchyMenu(TQWidget *tqparent) +TQPopupMenu *MainWindow::setupNormalHierarchyMenu(TQWidget *parent) { - TQPopupMenu *menu = new TQPopupMenu(tqparent); + TQPopupMenu *menu = new TQPopupMenu(parent); actionEditCut->plug(menu); actionEditCopy->plug(menu); @@ -1553,12 +1553,12 @@ TQPopupMenu *MainWindow::setupNormalHierarchyMenu(TQWidget *tqparent) return menu; } -TQPopupMenu *MainWindow::setupTabWidgetHierarchyMenu(TQWidget *tqparent, const char *addSlot, const char *removeSlot) +TQPopupMenu *MainWindow::setupTabWidgetHierarchyMenu(TQWidget *parent, const char *addSlot, const char *removeSlot) { - TQPopupMenu *menu = new TQPopupMenu(tqparent); + TQPopupMenu *menu = new TQPopupMenu(parent); - menu->insertItem(i18n("Add Page"), tqparent, addSlot); - menu->insertItem(i18n("Delete Page"), tqparent, removeSlot); + menu->insertItem(i18n("Add Page"), parent, addSlot); + menu->insertItem(i18n("Delete Page"), parent, removeSlot); menu->insertSeparator(); actionEditCut->plug(menu); actionEditCopy->plug(menu); diff --git a/kommander/editor/mainwindow.h b/kommander/editor/mainwindow.h index 1e0d3b79..a670ea00 100644 --- a/kommander/editor/mainwindow.h +++ b/kommander/editor/mainwindow.h @@ -94,8 +94,8 @@ public: void popupFormWindowMenu( const TQPoint &gp, FormWindow *fw ); void popupWidgetMenu( const TQPoint &gp, FormWindow *fw, TQWidget *w ); - TQPopupMenu *setupNormalHierarchyMenu( TQWidget *tqparent ); - TQPopupMenu *setupTabWidgetHierarchyMenu( TQWidget *tqparent, const char *addSlot, const char *removeSlot ); + TQPopupMenu *setupNormalHierarchyMenu( TQWidget *parent ); + TQPopupMenu *setupTabWidgetHierarchyMenu( TQWidget *parent, const char *addSlot, const char *removeSlot ); FormWindow *openFormWindow( const TQString &fn, bool validFileName = TRUE, FormFile *ff = 0 ); diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp index 356b4804..efb7d166 100644 --- a/kommander/editor/mainwindowactions.cpp +++ b/kommander/editor/mainwindowactions.cpp @@ -798,7 +798,7 @@ void MainWindow::fileCreateTemplate() void MainWindow::createNewTemplate() { - CreateTemplate *dia = (CreateTemplate *) TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->tqparent(); + CreateTemplate *dia = (CreateTemplate *) TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->parent(); TQString fn = dia->editName->text(); TQString cn = dia->listClass->currentText(); if (fn.isEmpty() || cn.isEmpty()) diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp index aeddb1e1..0968eafd 100644 --- a/kommander/editor/messagelog.cpp +++ b/kommander/editor/messagelog.cpp @@ -28,7 +28,7 @@ #include <tqfile.h> #include <tqtextstream.h> -MessageLog::MessageLog(TQWidget* tqparent, const char* name) : TQTabWidget(tqparent, name) +MessageLog::MessageLog(TQWidget* parent, const char* name) : TQTabWidget(parent, name) { m_popupMenu = new KPopupMenu(this); m_popupMenu->insertItem(SmallIconSet("editcopy"), i18n("Copy Current &Line"), this, TQT_SLOT(copyLine())); diff --git a/kommander/editor/messagelog.h b/kommander/editor/messagelog.h index bf1508b6..634c7c7b 100644 --- a/kommander/editor/messagelog.h +++ b/kommander/editor/messagelog.h @@ -32,7 +32,7 @@ class MessageLog : public TQTabWidget TQ_OBJECT public: enum InfoType {Stdout, Stderr, All}; - MessageLog(TQWidget* tqparent = 0, const char* name = 0); + MessageLog(TQWidget* parent = 0, const char* name = 0); ~MessageLog(); virtual void insertItem(InfoType i, TQString text); virtual void clear(InfoType i = All); diff --git a/kommander/editor/multilineeditorimpl.cpp b/kommander/editor/multilineeditorimpl.cpp index 98ad65d6..074a8471 100644 --- a/kommander/editor/multilineeditorimpl.cpp +++ b/kommander/editor/multilineeditorimpl.cpp @@ -28,8 +28,8 @@ #include <klocale.h> -MultiLineEditor::MultiLineEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ) - : MultiLineEditorBase( tqparent, 0, true ), formwindow( fw ) +MultiLineEditor::MultiLineEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) + : MultiLineEditorBase( parent, 0, true ), formwindow( fw ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); mlined = (TQMultiLineEdit*)editWidget; @@ -61,8 +61,8 @@ void MultiLineEditor::applyClicked() } -TextEditor::TextEditor( TQWidget *tqparent, const TQString &text ) - : MultiLineEditorBase( tqparent, 0, true ) +TextEditor::TextEditor( TQWidget *parent, const TQString &text ) + : MultiLineEditorBase( parent, 0, true ) { buttonApply->hide(); setCaption( i18n("Text" ) ); @@ -71,9 +71,9 @@ TextEditor::TextEditor( TQWidget *tqparent, const TQString &text ) preview->selectAll(); } -TQString TextEditor::getText( TQWidget *tqparent, const TQString &text ) +TQString TextEditor::getText( TQWidget *parent, const TQString &text ) { - TextEditor dlg( tqparent, text ); + TextEditor dlg( parent, text ); if ( dlg.exec() == TQDialog::Accepted ) { TQString txt = dlg.preview->text(); int i = txt.length() - 1; diff --git a/kommander/editor/multilineeditorimpl.h b/kommander/editor/multilineeditorimpl.h index a5d48479..6881283c 100644 --- a/kommander/editor/multilineeditorimpl.h +++ b/kommander/editor/multilineeditorimpl.h @@ -32,7 +32,7 @@ class MultiLineEditor : public MultiLineEditorBase TQ_OBJECT public: - MultiLineEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ); + MultiLineEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ); protected slots: void okClicked(); @@ -50,9 +50,9 @@ class TextEditor : public MultiLineEditorBase TQ_OBJECT public: - TextEditor( TQWidget *tqparent, const TQString &text ); + TextEditor( TQWidget *parent, const TQString &text ); - static TQString getText( TQWidget *tqparent, const TQString &text ); + static TQString getText( TQWidget *parent, const TQString &text ); protected slots: void okClicked(); diff --git a/kommander/editor/newformimpl.cpp b/kommander/editor/newformimpl.cpp index 37e47e6a..ca029d48 100644 --- a/kommander/editor/newformimpl.cpp +++ b/kommander/editor/newformimpl.cpp @@ -135,8 +135,8 @@ void CustomFormItem::insert() } -NewForm::NewForm(TQWidget *tqparent, const TQString &templatePath) - : NewFormBase(tqparent, 0, true) +NewForm::NewForm(TQWidget *parent, const TQString &templatePath) + : NewFormBase(parent, 0, true) { connect(helpButton, TQT_SIGNAL(clicked()), MainWindow::self, TQT_SLOT(showDialogHelp())); diff --git a/kommander/editor/newformimpl.h b/kommander/editor/newformimpl.h index 6b28a631..5f51648c 100644 --- a/kommander/editor/newformimpl.h +++ b/kommander/editor/newformimpl.h @@ -63,7 +63,7 @@ class NewForm : public NewFormBase Q_OBJECT TQ_OBJECT public: - NewForm( TQWidget *tqparent, const TQString &templatePath ); + NewForm( TQWidget *parent, const TQString &templatePath ); void accept(); protected slots: void itemChanged(TQIconViewItem *item); diff --git a/kommander/editor/paletteeditoradvancedimpl.cpp b/kommander/editor/paletteeditoradvancedimpl.cpp index 243576c2..e5480379 100644 --- a/kommander/editor/paletteeditoradvancedimpl.cpp +++ b/kommander/editor/paletteeditoradvancedimpl.cpp @@ -59,9 +59,9 @@ void BoldListBoxText::paint( TQPainter* painter ) TQListBoxText::paint( painter ); } -PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * tqparent, +PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) - : PaletteEditorAdvancedBase( tqparent, name, modal, f ), formWindow( fw ), selectedPalette(0) + : PaletteEditorAdvancedBase( parent, name, modal, f ), formWindow( fw ), selectedPalette(0) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); @@ -613,10 +613,10 @@ void PaletteEditorAdvanced::setupBackgroundMode( BackgroundMode mode ) } TQPalette PaletteEditorAdvanced::getPalette( bool *ok, const TQPalette &init, - BackgroundMode mode, TQWidget* tqparent, + BackgroundMode mode, TQWidget* parent, const char* name, FormWindow *fw ) { - PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( fw, tqparent, name, true ); + PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( fw, parent, name, true ); dlg->setupBackgroundMode( mode ); if ( init != TQPalette() ) diff --git a/kommander/editor/paletteeditoradvancedimpl.h b/kommander/editor/paletteeditoradvancedimpl.h index ed0bcc39..a9e28c9a 100644 --- a/kommander/editor/paletteeditoradvancedimpl.h +++ b/kommander/editor/paletteeditoradvancedimpl.h @@ -30,12 +30,12 @@ class PaletteEditorAdvanced : public PaletteEditorAdvancedBase Q_OBJECT TQ_OBJECT public: - PaletteEditorAdvanced( FormWindow *fw, TQWidget * tqparent=0, const char * name=0, + PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); ~PaletteEditorAdvanced(); static TQPalette getPalette( bool *ok, const TQPalette &pal, BackgroundMode mode = PaletteBackground, - TQWidget* tqparent = 0, const char* name = 0, FormWindow *fw = 0 ); + TQWidget* parent = 0, const char* name = 0, FormWindow *fw = 0 ); protected slots: void paletteSelected(int); diff --git a/kommander/editor/paletteeditorimpl.cpp b/kommander/editor/paletteeditorimpl.cpp index 89d1f624..bf68fe16 100644 --- a/kommander/editor/paletteeditorimpl.cpp +++ b/kommander/editor/paletteeditorimpl.cpp @@ -30,8 +30,8 @@ #include <tqapplication.h> #include <tqpushbutton.h> -PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * tqparent, const char * name, bool modal, WFlags f ) - : PaletteEditorBase( tqparent, name, modal, f ), formWindow( fw ) +PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) + : PaletteEditorBase( parent, name, modal, f ), formWindow( fw ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); @@ -275,9 +275,9 @@ TQPalette PaletteEditor::pal() const } TQPalette PaletteEditor::getPalette( bool *ok, const TQPalette &init, BackgroundMode mode, - TQWidget* tqparent, const char* name, FormWindow *fw ) + TQWidget* parent, const char* name, FormWindow *fw ) { - PaletteEditor* dlg = new PaletteEditor( fw, tqparent, name, true ); + PaletteEditor* dlg = new PaletteEditor( fw, parent, name, true ); dlg->setupBackgroundMode( mode ); if ( init != TQPalette() ) diff --git a/kommander/editor/paletteeditorimpl.h b/kommander/editor/paletteeditorimpl.h index 54e45612..07a3dd85 100644 --- a/kommander/editor/paletteeditorimpl.h +++ b/kommander/editor/paletteeditorimpl.h @@ -31,11 +31,11 @@ class PaletteEditor : public PaletteEditorBase TQ_OBJECT public: - PaletteEditor( FormWindow *fw, TQWidget * tqparent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); + PaletteEditor( FormWindow *fw, TQWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); ~PaletteEditor(); static TQPalette getPalette( bool *ok, const TQPalette &pal, BackgroundMode mode = PaletteBackground, - TQWidget* tqparent = 0, const char* name = 0, FormWindow *fw = 0 ); + TQWidget* parent = 0, const char* name = 0, FormWindow *fw = 0 ); protected slots: void onChooseMainColor(); diff --git a/kommander/editor/pixmapchooser.cpp b/kommander/editor/pixmapchooser.cpp index c94bf065..e536242a 100644 --- a/kommander/editor/pixmapchooser.cpp +++ b/kommander/editor/pixmapchooser.cpp @@ -876,8 +876,8 @@ static ImageIconProvider *imageIconProvider = 0; static PixmapChooser *pixmapChooser = 0; #endif -PixmapView::PixmapView( TQWidget *tqparent ) - : TQScrollView( tqparent ) +PixmapView::PixmapView( TQWidget *parent ) + : TQScrollView( parent ) { viewport()->setBackgroundMode( PaletteBase ); } @@ -907,7 +907,7 @@ void PixmapView::previewUrl( const TQUrl &u ) } } -TQStringList qChoosePixmaps( TQWidget *tqparent ) +TQStringList qChoosePixmaps( TQWidget *parent ) { if ( !imageIconProvider && !TQFileDialog::iconProvider() ) TQFileDialog::setIconProvider( ( imageIconProvider = new ImageIconProvider ) ); @@ -923,7 +923,7 @@ TQStringList qChoosePixmaps( TQWidget *tqparent ) filter.prepend( all + tqApp->translate( "qChoosePixmap", ")\n" ) ); filter += tqApp->translate( "qChoosePixmap", "All Files (*)" ); - TQFileDialog fd( TQString(), filter, tqparent, 0, true ); + TQFileDialog fd( TQString(), filter, parent, 0, true ); fd.setMode( TQFileDialog::ExistingFiles ); fd.setContentsPreviewEnabled( true ); PixmapView *pw = new PixmapView( &fd ); @@ -936,7 +936,7 @@ TQStringList qChoosePixmaps( TQWidget *tqparent ) return TQStringList(); } -TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, TQString *fn ) +TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, TQString *fn ) { #if defined(DESIGNER) if ( !fw || fw->savePixmapInline() ) { @@ -955,7 +955,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, filter.prepend( all + ")\n" ); filter += i18n( "All Files (*)" ); - TQFileDialog fd( TQString(), filter, tqparent, 0, true ); + TQFileDialog fd( TQString(), filter, parent, 0, true ); fd.setContentsPreviewEnabled( true ); PixmapView *pw = new PixmapView( &fd ); fd.setContentsPreview( pw, pw ); @@ -972,7 +972,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, } #ifndef KOMMANDER else if ( fw && fw->savePixmapInProject() ) { - PixmapCollectionEditor dia( tqparent, 0, true ); + PixmapCollectionEditor dia( parent, 0, true ); dia.setProject( fw->project() ); dia.setChooserMode( true ); dia.setCurrentItem( MetaDataBase::pixmapKey( fw, old.serialNumber() ) ); @@ -984,7 +984,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, } #endif else { - PixmapFunction dia( tqparent, 0, true ); + PixmapFunction dia( parent, 0, true ); TQObject::connect( dia.helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); dia.labelFunction->setText( fw->pixmapLoaderFunction() + "(" ); dia.editArguments->setText( MetaDataBase::pixmapArgument( TQT_TQOBJECT(fw), old.serialNumber() ) ); @@ -996,15 +996,15 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, } } #else - Q_UNUSED( tqparent ); + Q_UNUSED( parent ); Q_UNUSED( fw ); Q_UNUSED( old ); #endif return TQPixmap(); } -ImageIconProvider::ImageIconProvider( TQWidget *tqparent, const char *name ) - : TQFileIconProvider( TQT_TQOBJECT(tqparent), name ), imagepm( PixmapChooser::loadPixmap( "image.xpm", PixmapChooser::Mini ) ) +ImageIconProvider::ImageIconProvider( TQWidget *parent, const char *name ) + : TQFileIconProvider( TQT_TQOBJECT(parent), name ), imagepm( PixmapChooser::loadPixmap( "image.xpm", PixmapChooser::Mini ) ) { fmts = TQImage::inputFormats(); } diff --git a/kommander/editor/pixmapchooser.h b/kommander/editor/pixmapchooser.h index 48c947a7..fe7bfa7b 100644 --- a/kommander/editor/pixmapchooser.h +++ b/kommander/editor/pixmapchooser.h @@ -35,7 +35,7 @@ class PixmapView : public TQScrollView, TQ_OBJECT public: - PixmapView( TQWidget *tqparent ); + PixmapView( TQWidget *parent ); void setPixmap( const TQPixmap &pix ); void drawContents( TQPainter *p, int, int, int, int ); void previewUrl( const TQUrl &u ); @@ -51,7 +51,7 @@ class ImageIconProvider : public TQFileIconProvider TQ_OBJECT public: - ImageIconProvider( TQWidget *tqparent = 0, const char *name = 0 ); + ImageIconProvider( TQWidget *parent = 0, const char *name = 0 ); ~ImageIconProvider(); const TQPixmap *pixmap( const TQFileInfo &fi ); @@ -62,8 +62,8 @@ private: }; -TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw = 0, const TQPixmap &old = TQPixmap(), TQString *fn = 0 ); -TQStringList qChoosePixmaps( TQWidget *tqparent ); +TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw = 0, const TQPixmap &old = TQPixmap(), TQString *fn = 0 ); +TQStringList qChoosePixmaps( TQWidget *parent ); class PixmapChooser diff --git a/kommander/editor/previewframe.cpp b/kommander/editor/previewframe.cpp index 53f35670..b3afb58b 100644 --- a/kommander/editor/previewframe.cpp +++ b/kommander/editor/previewframe.cpp @@ -23,8 +23,8 @@ #include "previewframe.h" -PreviewFrame::PreviewFrame( TQWidget *tqparent, const char *name ) - : TQVBox( tqparent, name ) +PreviewFrame::PreviewFrame( TQWidget *parent, const char *name ) + : TQVBox( parent, name ) { setMinimumSize(200, 200); setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); diff --git a/kommander/editor/previewframe.h b/kommander/editor/previewframe.h index 6447f005..fa87a90b 100644 --- a/kommander/editor/previewframe.h +++ b/kommander/editor/previewframe.h @@ -31,8 +31,8 @@ class PreviewWorkspace : public TQWorkspace Q_OBJECT TQ_OBJECT public: - PreviewWorkspace( TQWidget* tqparent = 0, const char* name = 0 ) - : TQWorkspace( tqparent, name ) {} + PreviewWorkspace( TQWidget* parent = 0, const char* name = 0 ) + : TQWorkspace( parent, name ) {} ~PreviewWorkspace() {} protected: @@ -45,7 +45,7 @@ class PreviewFrame : public TQVBox TQ_OBJECT public: - PreviewFrame( TQWidget *tqparent = 0, const char *name = 0 ); + PreviewFrame( TQWidget *parent = 0, const char *name = 0 ); void setPreviewPalette(TQPalette); private: diff --git a/kommander/editor/previewwidgetimpl.cpp b/kommander/editor/previewwidgetimpl.cpp index 1c6ab9cd..98cfd39c 100644 --- a/kommander/editor/previewwidgetimpl.cpp +++ b/kommander/editor/previewwidgetimpl.cpp @@ -21,8 +21,8 @@ #include "tqobjectlist.h" #include "previewwidgetimpl.h" -PreviewWidget::PreviewWidget( TQWidget *tqparent, const char *name ) - : PreviewWidgetBase( tqparent, name ) +PreviewWidget::PreviewWidget( TQWidget *parent, const char *name ) + : PreviewWidgetBase( parent, name ) { // install event filter on child widgets TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING); diff --git a/kommander/editor/previewwidgetimpl.h b/kommander/editor/previewwidgetimpl.h index a2b0ef7a..a0f08043 100644 --- a/kommander/editor/previewwidgetimpl.h +++ b/kommander/editor/previewwidgetimpl.h @@ -29,7 +29,7 @@ class PreviewWidget : public PreviewWidgetBase TQ_OBJECT public: - PreviewWidget( TQWidget *tqparent = 0, const char *name = 0 ); + PreviewWidget( TQWidget *parent = 0, const char *name = 0 ); void closeEvent(TQCloseEvent *); bool eventFilter(TQObject *, TQEvent *); diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp index 9d72fe02..f99c9594 100644 --- a/kommander/editor/propertyeditor.cpp +++ b/kommander/editor/propertyeditor.cpp @@ -155,7 +155,7 @@ bool PropertyWhatsThis::clicked( const TQString& href ) */ /*! If this item should be a child of another property item, specify - \a prop as the tqparent item. + \a prop as the parent item. */ PropertyItem::PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ) @@ -296,7 +296,7 @@ bool PropertyItem::hasSubItems() const return false; } -/*! Returns the tqparent property item here if this is a child or 0 +/*! Returns the parent property item here if this is a child or 0 otherwise. */ @@ -2634,8 +2634,8 @@ void PropertyList::setupProperties() continue; if ( qstrcmp( p->name(), "buttonGroupId" ) == 0 ) { // #### remove this when designable in TQ_PROPERTY can take a function (isInButtonGroup() in this case) if ( !editor->widget()->isWidgetType() || - !editor->widget()->tqparent() || - !editor->widget()->tqparent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) + !editor->widget()->parent() || + !editor->widget()->parent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) continue; } @@ -3278,8 +3278,8 @@ void PropertyList::readPropertyDocs() // ------------------------------------------------------------ #ifndef KOMMANDER -EventList::EventList( TQWidget *tqparent, FormWindow *fw, PropertyEditor *e ) - : HierarchyList( tqparent, fw, true ), editor( e ) +EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e ) + : HierarchyList( parent, fw, true ), editor( e ) { header()->hide(); removeColumn( 1 ); @@ -3354,7 +3354,7 @@ extern TQListViewItem *newItem; void EventList::contentsMouseDoubleClickEvent( TQMouseEvent *e ) { TQListViewItem *i = itemAt( contentsToViewport( e->pos() ) ); - if ( !i || i->tqparent() ) + if ( !i || i->parent() ) return; TQString s; #ifndef KOMMANDER @@ -3380,7 +3380,7 @@ void EventList::setCurrent( TQWidget * ) void EventList::objectClicked( TQListViewItem *i ) { - if ( !i || !i->tqparent() ) + if ( !i || !i->parent() ) return; formWindow->mainWindow()->editFunction( i->text( 0 ) ); } @@ -3402,29 +3402,29 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) #else if ( MetaDataBase::hasEvents( "C++" ) ) { #endif - TQString s1 = ( i->tqparent() ? i->tqparent() : i )->text( 0 ); + TQString s1 = ( i->parent() ? i->parent() : i )->text( 0 ); int pt = s1.find( "(" ); if ( pt != -1 ) s1 = s1.left( pt ); s = TQString( editor->widget()->name() ) + "_" + s1; } else { - s = TQString( editor->widget()->name() ) + "_" + ( i->tqparent() ? i->tqparent() : i )->text( 0 ); + s = TQString( editor->widget()->name() ) + "_" + ( i->parent() ? i->parent() : i )->text( 0 ); } - insertEntry( i->tqparent() ? i->tqparent() : i, PixmapChooser::loadPixmap( "editslots.xpm" ), s ); - } else if ( res == DEL_ITEM && i->tqparent() ) { + insertEntry( i->parent() ? i->parent() : i, PixmapChooser::loadPixmap( "editslots.xpm" ), s ); + } else if ( res == DEL_ITEM && i->parent() ) { #ifndef KOMMANDER if ( MetaDataBase::hasEvents( formWindow->project()->language() ) ) { #else if ( MetaDataBase::hasEvents( "C++" ) ) { #endif - TQListViewItem *p = i->tqparent(); + TQListViewItem *p = i->parent(); delete i; save( p ); } else { MetaDataBase::Connection conn; conn.sender = editor->widget(); conn.receiver = formWindow->mainContainer(); - conn.signal = i->tqparent()->text( 0 ); + conn.signal = i->parent()->text( 0 ); conn.slot = i->text( 0 ); delete i; RemoveConnectionCommand *cmd = new RemoveConnectionCommand( i18n("Remove Connection" ), @@ -3443,9 +3443,9 @@ void EventList::renamed( TQListViewItem *i ) { if ( newItem == i ) newItem = 0; - if ( !i->tqparent() ) + if ( !i->parent() ) return; - TQListViewItem *itm = i->tqparent()->firstChild(); + TQListViewItem *itm = i->parent()->firstChild(); bool del = false; while ( itm ) { if ( itm != i && itm->text( 0 ) == i->text( 0 ) ) { @@ -3464,7 +3464,7 @@ void EventList::renamed( TQListViewItem *i ) if ( MetaDataBase::hasEvents( "C++" ) ) { #endif - save( i->tqparent() ); + save( i->parent() ); editor->formWindow()->mainWindow()-> #ifndef KOMMANDER editFunction( i->text( 0 ), editor->formWindow()->project()->language(), true ); @@ -3475,7 +3475,7 @@ void EventList::renamed( TQListViewItem *i ) MetaDataBase::Connection conn; conn.sender = editor->widget(); conn.receiver = formWindow->mainContainer(); - conn.signal = i->tqparent()->text( 0 ); + conn.signal = i->parent()->text( 0 ); conn.slot = i->text( 0 ); AddConnectionCommand *cmd = new AddConnectionCommand( i18n("Add Connection" ), formWindow, @@ -3535,8 +3535,8 @@ void EventList::save( TQListViewItem *p ) listview for editing properties. */ -PropertyEditor::PropertyEditor( TQWidget *tqparent ) - : TQTabWidget( tqparent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | +PropertyEditor::PropertyEditor( TQWidget *parent ) + : TQTabWidget( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_StaysOnTop | WStyle_Tool |WStyle_MinMax | WStyle_SysMenu ) { setCaption( i18n("Property Editor" ) ); diff --git a/kommander/editor/propertyeditor.h b/kommander/editor/propertyeditor.h index 262f0376..61d4e4dc 100644 --- a/kommander/editor/propertyeditor.h +++ b/kommander/editor/propertyeditor.h @@ -570,7 +570,7 @@ class PropertyEditor : public TQTabWidget TQ_OBJECT public: - PropertyEditor( TQWidget *tqparent ); + PropertyEditor( TQWidget *parent ); TQObject *widget() const; diff --git a/kommander/editor/qcompletionedit.cpp b/kommander/editor/qcompletionedit.cpp index 537216c5..78523a95 100644 --- a/kommander/editor/qcompletionedit.cpp +++ b/kommander/editor/qcompletionedit.cpp @@ -4,8 +4,8 @@ #include <tqapplication.h> #include <tqvbox.h> -QCompletionEdit::QCompletionEdit( TQWidget *tqparent, const char *name ) - : TQLineEdit( tqparent, name ), aAdd( false ), caseSensitive( false ) +QCompletionEdit::QCompletionEdit( TQWidget *parent, const char *name ) + : TQLineEdit( parent, name ), aAdd( false ), caseSensitive( false ) { popup = new TQVBox( 0, 0, WType_Popup ); popup->setFrameStyle( TQFrame::Box | TQFrame::Plain ); diff --git a/kommander/editor/qcompletionedit.h b/kommander/editor/qcompletionedit.h index 4dee6ba5..ceef1692 100644 --- a/kommander/editor/qcompletionedit.h +++ b/kommander/editor/qcompletionedit.h @@ -15,7 +15,7 @@ class QCompletionEdit : public TQLineEdit TQ_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive ) public: - QCompletionEdit( TQWidget *tqparent = 0, const char *name = 0 ); + QCompletionEdit( TQWidget *parent = 0, const char *name = 0 ); bool autoAdd() const; TQStringList completionList() const; diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp index c2ece48b..93f6cc9b 100644 --- a/kommander/editor/resource.cpp +++ b/kommander/editor/resource.cpp @@ -495,7 +495,7 @@ TQString Resource::copy() } -void Resource::paste( const TQString &cb, TQWidget *tqparent ) +void Resource::paste( const TQString &cb, TQWidget *parent ) { if ( !formwindow ) return; @@ -533,30 +533,30 @@ void Resource::paste( const TQString &cb, TQWidget *tqparent ) formwindow->clearSelection( false ); while ( !firstWidget.isNull() ) { if ( firstWidget.tagName() == "widget" ) { - TQWidget *w = (TQWidget*)createObject( firstWidget, tqparent, 0 ); + TQWidget *w = (TQWidget*)createObject( firstWidget, parent, 0 ); if ( !w ) continue; widgets.append( w ); int x = w->x() + formwindow->grid().x(); int y = w->y() + formwindow->grid().y(); - if ( w->x() + w->width() > tqparent->width() ) - x = TQMAX( 0, tqparent->width() - w->width() ); - if ( w->y() + w->height() > tqparent->height() ) - y = TQMAX( 0, tqparent->height() - w->height() ); + if ( w->x() + w->width() > parent->width() ) + x = TQMAX( 0, parent->width() - w->width() ); + if ( w->y() + w->height() > parent->height() ) + y = TQMAX( 0, parent->height() - w->height() ); if ( x != w->x() || y != w->y() ) w->move( x, y ); formwindow->selectWidget( TQT_TQOBJECT(w) ); } else if ( firstWidget.tagName() == "spacer" ) { - TQWidget *w = createSpacer( firstWidget, tqparent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal ); + TQWidget *w = createSpacer( firstWidget, parent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal ); if ( !w ) continue; widgets.append( w ); int x = w->x() + formwindow->grid().x(); int y = w->y() + formwindow->grid().y(); - if ( w->x() + w->width() > tqparent->width() ) - x = TQMAX( 0, tqparent->width() - w->width() ); - if ( w->y() + w->height() > tqparent->height() ) - y = TQMAX( 0, tqparent->height() - w->height() ); + if ( w->x() + w->width() > parent->width() ) + x = TQMAX( 0, parent->width() - w->width() ); + if ( w->y() + w->height() > parent->height() ) + y = TQMAX( 0, parent->height() - w->height() ); if ( x != w->x() || y != w->y() ) w->move( x, y ); formwindow->selectWidget( TQT_TQOBJECT(w) ); @@ -1316,7 +1316,7 @@ void Resource::saveColor( TQTextStream &ts, int indent, const TQColor &c ) ts << makeIndent( indent ) << "<blue>" << TQString::number( c.blue() ) << "</blue>" << endl; } -TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout ) +TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout ) { lastItem = 0; TQDomElement n = e.firstChild().toElement(); @@ -1335,7 +1335,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL TQString className = e.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ); if ( !className.isNull() ) { - obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), tqparent, 0, false )); + obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, false )); if ( !obj ) return 0; if ( !mainContainerSet ) { @@ -1368,9 +1368,9 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL tqlayout = 0; if ( w && formwindow ) { - if ( !tqparent || ( !tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) && !tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !tqparent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) + if ( !parent || ( !parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) && !parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) formwindow->insertWidget( w, pasting ); - else if ( tqparent && ( tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) || tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || tqparent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) + else if ( parent && ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) || parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) MetaDataBase::addEntry( TQT_TQOBJECT(w) ); if (w->inherits("Dialog")) dynamic_cast<Dialog*>(w)->setUseInternalParser(false); @@ -1402,16 +1402,16 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL } else if ( n.tagName() == "attribute" && w ) { TQString attrib = n.attribute( "name" ); TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); - if ( tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { + if ( parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { if ( attrib == "title" ) - ( (TQTabWidget*)tqparent )->insertTab( w, v.toString() ); + ( (TQTabWidget*)parent )->insertTab( w, v.toString() ); } else - if ( tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { + if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { if ( attrib == "label" ) - ( (TQToolBox*)tqparent )->addItem( w, v.toString() ); - } else if ( tqparent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + ( (TQToolBox*)parent )->addItem( w, v.toString() ); + } else if ( parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { if ( attrib == "title" ) - ( (TQWizard*)tqparent )->addPage( w, v.toString() ); + ( (TQWizard*)parent )->addPage( w, v.toString() ); } } else if ( n.tagName() == "item" ) { createItem( n, w ); @@ -1605,7 +1605,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt } } -TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *tqparent, TQLayout *tqlayout, Qt::Orientation o ) +TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o ) { TQDomElement n = e.firstChild().toElement(); int row = e.attribute( "row" ).toInt(); @@ -1618,7 +1618,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *tqparent, TQL colspan = 1; Spacer *spacer = (Spacer*) WidgetFactory::create( WidgetDatabase::idFromClassName("Spacer"), - tqparent, "spacer", false); + parent, "spacer", false); spacer->setOrientation( o ); spacer->setInteraciveMode( false ); while ( !n.isNull() ) { @@ -2429,12 +2429,12 @@ void Resource::saveActions( const TQPtrList<TQAction> &actions, TQTextStream &ts ts << makeIndent( indent ) << "</actions>" << endl; } -void Resource::loadChildAction( TQObject *tqparent, const TQDomElement &e ) +void Resource::loadChildAction( TQObject *parent, const TQDomElement &e ) { TQDomElement n = e; TQAction *a = 0; if ( n.tagName() == "action" ) { - a = new QDesignerAction( tqparent ); + a = new QDesignerAction( parent ); MetaDataBase::addEntry( a ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { @@ -2450,10 +2450,10 @@ void Resource::loadChildAction( TQObject *tqparent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !tqparent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) formwindow->actionList().append( a ); } else if ( n.tagName() == "actiongroup" ) { - a = new QDesignerActionGroup( tqparent ); + a = new QDesignerActionGroup( parent ); MetaDataBase::addEntry( a ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { @@ -2472,7 +2472,7 @@ void Resource::loadChildAction( TQObject *tqparent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !tqparent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) formwindow->actionList().append( a ); } } diff --git a/kommander/editor/resource.h b/kommander/editor/resource.h index 75dd6387..e35bd6b2 100644 --- a/kommander/editor/resource.h +++ b/kommander/editor/resource.h @@ -71,7 +71,7 @@ public: bool save( const TQString& filename, bool formCodeOnly = FALSE); bool save( TQIODevice* ); - void paste( const TQString &cb, TQWidget *tqparent ); + void paste( const TQString &cb, TQWidget *parent ); static void saveImageData( const TQImage &img, TQTextStream &ts, int indent ); static void loadCustomWidgets( const TQDomElement &e, Resource *r ); @@ -103,8 +103,8 @@ private: // void saveFormCode(); #endif - TQObject *createObject( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout = 0 ); - TQWidget *createSpacer( const TQDomElement &e, TQWidget *tqparent, TQLayout *tqlayout, Qt::Orientation o ); + TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout = 0 ); + TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o ); void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 ); void createColumn( const TQDomElement &e, TQWidget *widget ); void setObjectProperty( TQObject* widget, const TQString &prop, const TQDomElement &e); @@ -117,7 +117,7 @@ private: void loadTabOrder( const TQDomElement &e ); void loadItem( const TQDomElement &n, TQPixmap &pix, TQString &txt, bool &hasPixmap ); void loadActions( const TQDomElement &n ); - void loadChildAction( TQObject *tqparent, const TQDomElement &e ); + void loadChildAction( TQObject *parent, const TQDomElement &e ); void loadToolBars( const TQDomElement &n ); void loadMenuBar( const TQDomElement &n ); TQColorGroup loadColorGroup( const TQDomElement &e ); diff --git a/kommander/editor/sizehandle.cpp b/kommander/editor/sizehandle.cpp index 9a29cb31..72f7c38c 100644 --- a/kommander/editor/sizehandle.cpp +++ b/kommander/editor/sizehandle.cpp @@ -30,8 +30,8 @@ #include <klocale.h> -SizeHandle::SizeHandle( FormWindow *tqparent, Direction d, WidgetSelection *s ) - : TQWidget( tqparent ) +SizeHandle::SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s ) + : TQWidget( parent ) { active = true; setBackgroundMode( active ? PaletteText : PaletteDark ); @@ -39,7 +39,7 @@ SizeHandle::SizeHandle( FormWindow *tqparent, Direction d, WidgetSelection *s ) widget = 0; dir =d ; setMouseTracking( false ); - formWindow = tqparent; + formWindow = parent; sel = s; updateCursor(); } @@ -261,10 +261,10 @@ void SizeHandle::tryResize( TQWidget *w, int width, int height ) // ------------------------------------------------------------------------ -WidgetSelection::WidgetSelection( FormWindow *tqparent, TQPtrDict<WidgetSelection> *selDict ) +WidgetSelection::WidgetSelection( FormWindow *parent, TQPtrDict<WidgetSelection> *selDict ) : selectionDict( selDict ) { - formWindow = tqparent; + formWindow = parent; for ( int i = SizeHandle::LeftTop; i <= SizeHandle::Left; ++i ) { handles.insert( i, new SizeHandle( formWindow, (SizeHandle::Direction)i, this ) ); } diff --git a/kommander/editor/sizehandle.h b/kommander/editor/sizehandle.h index 4def5429..ac7c68a2 100644 --- a/kommander/editor/sizehandle.h +++ b/kommander/editor/sizehandle.h @@ -38,7 +38,7 @@ class SizeHandle : public TQWidget public: enum Direction { LeftTop, Top, RightTop, Right, RightBottom, Bottom, LeftBottom, Left }; - SizeHandle( FormWindow *tqparent, Direction d, WidgetSelection *s ); + SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s ); void setWidget( TQWidget *w ); void setActive( bool a ); void updateCursor(); @@ -69,7 +69,7 @@ private: class WidgetSelection { public: - WidgetSelection( FormWindow *tqparent, TQPtrDict<WidgetSelection> *selDict ); + WidgetSelection( FormWindow *parent, TQPtrDict<WidgetSelection> *selDict ); void setWidget( TQWidget *w, bool updateDict = TRUE ); bool isUsed() const; diff --git a/kommander/editor/styledbutton.cpp b/kommander/editor/styledbutton.cpp index e09fd1e8..37a28911 100644 --- a/kommander/editor/styledbutton.cpp +++ b/kommander/editor/styledbutton.cpp @@ -32,8 +32,8 @@ #include <tqdragobject.h> #include <tqstyle.h> -StyledButton::StyledButton(TQWidget* tqparent, const char* name) - : TQButton( tqparent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( false ) +StyledButton::StyledButton(TQWidget* parent, const char* name) + : TQButton( parent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( false ) { setMinimumSize( tqminimumSizeHint() ); setAcceptDrops( true ); @@ -43,8 +43,8 @@ StyledButton::StyledButton(TQWidget* tqparent, const char* name) setEditor( ColorEditor ); } -StyledButton::StyledButton( const TQBrush& b, TQWidget* tqparent, const char* name, WFlags f ) - : TQButton( tqparent, name, f ), spix( 0 ), s( 0 ), formWindow( 0 ) +StyledButton::StyledButton( const TQBrush& b, TQWidget* parent, const char* name, WFlags f ) + : TQButton( parent, name, f ), spix( 0 ), s( 0 ), formWindow( 0 ) { col = b.color(); pix = b.pixmap(); diff --git a/kommander/editor/styledbutton.h b/kommander/editor/styledbutton.h index a8daca52..883c95ad 100644 --- a/kommander/editor/styledbutton.h +++ b/kommander/editor/styledbutton.h @@ -43,8 +43,8 @@ class StyledButton : public TQButton public: enum EditorType { ColorEditor, PixmapEditor }; - StyledButton( TQWidget* tqparent = 0, const char* name = 0 ); - StyledButton( const TQBrush& b, TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0 ); + StyledButton( TQWidget* parent = 0, const char* name = 0 ); + StyledButton( const TQBrush& b, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); ~StyledButton(); void setEditor( EditorType ); diff --git a/kommander/editor/tableeditorimpl.cpp b/kommander/editor/tableeditorimpl.cpp index 777fd874..5fc56f41 100644 --- a/kommander/editor/tableeditorimpl.cpp +++ b/kommander/editor/tableeditorimpl.cpp @@ -21,8 +21,8 @@ #include <klocale.h> -TableEditor::TableEditor( TQWidget* tqparent, TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl ) - : TableEditorBase( tqparent, name, modal, fl ), +TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl ) + : TableEditorBase( parent, name, modal, fl ), #ifndef TQT_NO_TABLE editTable( (TQTable*)editWidget ), #endif diff --git a/kommander/editor/tableeditorimpl.h b/kommander/editor/tableeditorimpl.h index c0b8ce85..167f8bb7 100644 --- a/kommander/editor/tableeditorimpl.h +++ b/kommander/editor/tableeditorimpl.h @@ -14,7 +14,7 @@ class TableEditor : public TableEditorBase TQ_OBJECT public: - TableEditor( TQWidget* tqparent = 0, TQWidget *editWidget = 0, FormWindow *fw = 0, + TableEditor( TQWidget* parent = 0, TQWidget *editWidget = 0, FormWindow *fw = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~TableEditor(); diff --git a/kommander/editor/timestamp.cpp b/kommander/editor/timestamp.cpp index 62cac72d..850e7eb2 100644 --- a/kommander/editor/timestamp.cpp +++ b/kommander/editor/timestamp.cpp @@ -24,8 +24,8 @@ class TQTimer; -TimeStamp::TimeStamp( TQObject *tqparent, const TQString &f ) - : TQObject( tqparent ), filename( f ), autoCheck( false ) +TimeStamp::TimeStamp( TQObject *parent, const TQString &f ) + : TQObject( parent ), filename( f ), autoCheck( false ) { timer = new TQTimer( this ); connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoCheckTimeStamp() ) ); diff --git a/kommander/editor/timestamp.h b/kommander/editor/timestamp.h index 1df9f916..f4483e8f 100644 --- a/kommander/editor/timestamp.h +++ b/kommander/editor/timestamp.h @@ -31,7 +31,7 @@ class TimeStamp : public TQObject TQ_OBJECT public: - TimeStamp( TQObject *tqparent, const TQString &f ); + TimeStamp( TQObject *parent, const TQString &f ); void setFileName( const TQString &f ); TQString fileName() const; diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp index f33d27b3..9f619c79 100644 --- a/kommander/editor/widgetfactory.cpp +++ b/kommander/editor/widgetfactory.cpp @@ -137,8 +137,8 @@ void TQLayoutWidget::paintEvent( TQPaintEvent* ) } -QDesignerTabWidget::QDesignerTabWidget( TQWidget *tqparent, const char *name ) - : TQTabWidget( tqparent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( false ) +QDesignerTabWidget::QDesignerTabWidget( TQWidget *parent, const char *name ) + : TQTabWidget( parent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( false ) { tabBar()->setAcceptDrops( true ); tabBar()->installEventFilter( this ); @@ -417,8 +417,8 @@ static void saveChangedProperties( TQWidget *w, int id ) changedProperties->insert( id, l ); } -EditorTabWidget::EditorTabWidget( TQWidget *tqparent, const char *name ) - : TabWidget( tqparent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( false ) +EditorTabWidget::EditorTabWidget( TQWidget *parent, const char *name ) + : TabWidget( parent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( false ) { tabBar()->setAcceptDrops( true ); tabBar()->installEventFilter( this ); @@ -584,8 +584,8 @@ bool EditorTabWidget::eventFilter( TQObject *o, TQEvent *e ) } -EditorToolBox::EditorToolBox( TQWidget *tqparent, const char *name ) - : ToolBox( tqparent, name ) +EditorToolBox::EditorToolBox( TQWidget *parent, const char *name ) + : ToolBox( parent, name ) { setAcceptDrops( true ); } @@ -631,12 +631,12 @@ int EditorToolBox::count() const /*! Creates a widget of the type which is registered as \a id as - child of \a tqparent. The \a name is optional. If \a init is true, the + child of \a parent. The \a name is optional. If \a init is true, the widget is initialized with some defaults, else the plain widget is created. */ -TQWidget *WidgetFactory::create( int id, TQWidget *tqparent, const char *name, bool init, const TQRect *r, Qt::Orientation orient ) +TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, bool init, const TQRect *r, Qt::Orientation orient ) { TQString n = WidgetDatabase::className(id); //qDebug("Trying to create '%s'", n.latin1()); @@ -652,10 +652,10 @@ TQWidget *WidgetFactory::create( int id, TQWidget *tqparent, const char *name, b TQWidget *w = 0; TQString str = WidgetDatabase::createWidgetName(id); const char *s = str.latin1(); - w = createWidget(n, tqparent, name ? name : s, init, r, orient); + w = createWidget(n, parent, name ? name : s, init, r, orient); //qDebug("Trying to create '%s', widget (id=%d) - %s", s, id, w ? "successful" : "failure"); if (!w && WidgetDatabase::isCustomWidget(id)) - w = createCustomWidget(tqparent, name ? name : s, MetaDataBase::customWidget(id)); + w = createCustomWidget(parent, name ? name : s, MetaDataBase::customWidget(id)); if (!w) return 0; MetaDataBase::addEntry(TQT_TQOBJECT(w)); @@ -823,13 +823,13 @@ void WidgetFactory::deleteLayout( TQWidget *widget ) } /*! Factory functions for creating a widget of the type \a className - as child of \a tqparent with the name \a name. + as child of \a parent with the name \a name. If \a init is true, some initial default properties are set. This has to be in sync with the initChangedProperties() function! */ -TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqparent, const char *name, bool init, +TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name, bool init, const TQRect *r, Qt::Orientation orient ) { if (className == TQPUSHBUTTON_OBJECT_NAME_STRING) @@ -837,11 +837,11 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa TQPushButton *b = 0; if (init) { - b = new QDesignerPushButton(tqparent, name); + b = new QDesignerPushButton(parent, name); b->setText(TQString::tqfromLatin1(name)); } else { - b = new QDesignerPushButton(tqparent, name); + b = new QDesignerPushButton(parent, name); } TQWidget *w = find_formwindow(b); b->setAutoDefault(w && ((FormWindow *) w)->mainContainer()->inherits(TQDIALOG_OBJECT_NAME_STRING)); @@ -850,43 +850,43 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa { if (init) { - QDesignerToolButton *tb = new QDesignerToolButton(tqparent, name); + QDesignerToolButton *tb = new QDesignerToolButton(parent, name); tb->setText("..."); return tb; } - return new QDesignerToolButton(tqparent, name); + return new QDesignerToolButton(parent, name); } else if (className == TQCHECKBOX_OBJECT_NAME_STRING) { if (init) { - QDesignerCheckBox *cb = new QDesignerCheckBox(tqparent, name); + QDesignerCheckBox *cb = new QDesignerCheckBox(parent, name); cb->setText(TQString::tqfromLatin1(name)); return cb; } - return new QDesignerCheckBox(tqparent, name); + return new QDesignerCheckBox(parent, name); } else if (className == TQRADIOBUTTON_OBJECT_NAME_STRING) { if (init) { - QDesignerRadioButton *rb = new QDesignerRadioButton(tqparent, name); + QDesignerRadioButton *rb = new QDesignerRadioButton(parent, name); rb->setText(TQString::tqfromLatin1(name)); return rb; } - return new QDesignerRadioButton(tqparent, name); + return new QDesignerRadioButton(parent, name); } else if (className == TQGROUPBOX_OBJECT_NAME_STRING) { if (init) - return new TQGroupBox(TQString::tqfromLatin1(name), tqparent, name); - return new TQGroupBox(tqparent, name); + return new TQGroupBox(TQString::tqfromLatin1(name), parent, name); + return new TQGroupBox(parent, name); } else if (className == TQBUTTONGROUP_OBJECT_NAME_STRING) { if (init) - return new TQButtonGroup(TQString::tqfromLatin1(name), tqparent, name); - return new TQButtonGroup(tqparent, name); + return new TQButtonGroup(TQString::tqfromLatin1(name), parent, name); + return new TQButtonGroup(parent, name); } else if (className == TQICONVIEW_OBJECT_NAME_STRING) { #if !defined(TQT_NO_ICONVIEW) - TQIconView *iv = new TQIconView(tqparent, name); + TQIconView *iv = new TQIconView(parent, name); if (init) (void) new TQIconViewItem(iv, i18n("New Item")); return iv; @@ -897,28 +897,28 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa { #if !defined(TQT_NO_TABLE) if (init) - return new TQTable(3, 3, tqparent, name); - return new TQTable(tqparent, name); + return new TQTable(3, 3, parent, name); + return new TQTable(parent, name); #else return 0; #endif #ifndef TQT_NO_SQL } else if (className == TQDATATABLE_OBJECT_NAME_STRING) { - return new TQDataTable(tqparent, name); + return new TQDataTable(parent, name); #endif //TQT_NO_SQL } else if (className == TQDATEEDIT_OBJECT_NAME_STRING) { - return new TQDateEdit(tqparent, name); + return new TQDateEdit(parent, name); } else if (className == TQTIMEEDIT_OBJECT_NAME_STRING) { - return new TQTimeEdit(tqparent, name); + return new TQTimeEdit(parent, name); } else if (className == TQDATETIMEEDIT_OBJECT_NAME_STRING) { - return new TQDateTimeEdit(tqparent, name); + return new TQDateTimeEdit(parent, name); } else if (className == TQLISTBOX_OBJECT_NAME_STRING) { - TQListBox *lb = new TQListBox(tqparent, name); + TQListBox *lb = new TQListBox(parent, name); if (init) { lb->insertItem(i18n("New Item")); @@ -927,7 +927,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return lb; } else if (className == TQLISTVIEW_OBJECT_NAME_STRING) { - TQListView *lv = new TQListView(tqparent, name); + TQListView *lv = new TQListView(parent, name); lv->setSorting(-1); if (init) { @@ -936,18 +936,18 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return lv; } else if (className == TQLINEEDIT_OBJECT_NAME_STRING) - return new TQLineEdit(tqparent, name); + return new TQLineEdit(parent, name); else if (className == TQSPINBOX_OBJECT_NAME_STRING) - return new TQSpinBox(tqparent, name); + return new TQSpinBox(parent, name); else if (className == TQSPLITTER_OBJECT_NAME_STRING) - return new TQSplitter(tqparent, name); + return new TQSplitter(parent, name); else if (className == TQMULTILINEEDIT_OBJECT_NAME_STRING) - return new TQMultiLineEdit(tqparent, name); + return new TQMultiLineEdit(parent, name); else if (className == TQTEXTEDIT_OBJECT_NAME_STRING) - return new TQTextEdit(tqparent, name); + return new TQTextEdit(parent, name); else if (className == TQLABEL_OBJECT_NAME_STRING) { - QDesignerLabel *l = new QDesignerLabel(tqparent, name); + QDesignerLabel *l = new QDesignerLabel(parent, name); if (init) { l->setText(TQString::tqfromLatin1(name)); @@ -956,13 +956,13 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return l; } else if (className == TQLAYOUTWIDGET_OBJECT_NAME_STRING) - return new TQLayoutWidget(tqparent, name); + return new TQLayoutWidget(parent, name); else if (className == TQTABWIDGET_OBJECT_NAME_STRING) { - TQTabWidget *tw = new QDesignerTabWidget(tqparent, name); + TQTabWidget *tw = new QDesignerTabWidget(parent, name); if (init) { - FormWindow *fw = find_formwindow(tqparent); + FormWindow *fw = find_formwindow(parent); TQWidget *w = fw ? new QDesignerWidget(fw, tw, "tab") : new TQWidget(tw, "tab"); tw->addTab(w, i18n("Tab 1")); MetaDataBase::addEntry(TQT_TQOBJECT(w)); @@ -974,42 +974,42 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return tw; } else if (className == TQCOMBOBOX_OBJECT_NAME_STRING) { - return new TQComboBox(false, tqparent, name); + return new TQComboBox(false, parent, name); } else if (className == TQWIDGET_OBJECT_NAME_STRING) { - if (tqparent && - (tqparent->inherits("FormWindow") || tqparent->inherits(TQWIZARD_OBJECT_NAME_STRING) - || tqparent->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || tqparent->inherits(TQTOOLBOX_OBJECT_NAME_STRING) || tqparent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING))) + if (parent && + (parent->inherits("FormWindow") || parent->inherits(TQWIZARD_OBJECT_NAME_STRING) + || parent->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || parent->inherits(TQTOOLBOX_OBJECT_NAME_STRING) || parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING))) { - FormWindow *fw = find_formwindow(tqparent); + FormWindow *fw = find_formwindow(parent); if (fw) { - QDesignerWidget *dw = new QDesignerWidget(fw, tqparent, name); + QDesignerWidget *dw = new QDesignerWidget(fw, parent, name); MetaDataBase::addEntry(TQT_TQOBJECT(dw)); return dw; } } - return new TQWidget(tqparent, name); + return new TQWidget(parent, name); } else if (className == TQDIALOG_OBJECT_NAME_STRING) { TQDialog *dia = 0; - if (tqparent && tqparent->inherits("FormWindow")) - dia = new QDesignerDialog((FormWindow *) tqparent, tqparent, name); + if (parent && parent->inherits("FormWindow")) + dia = new QDesignerDialog((FormWindow *) parent, parent, name); else - dia = new TQDialog(tqparent, name); - if (tqparent && !tqparent->inherits("MainWindow")) - dia->reparent(tqparent, TQPoint(0, 0), true); + dia = new TQDialog(parent, name); + if (parent && !parent->inherits("MainWindow")) + dia->reparent(parent, TQPoint(0, 0), true); return dia; } else if (className == TQWIZARD_OBJECT_NAME_STRING) { - TQWizard *wiz = new QDesignerWizard(tqparent, name); - if (tqparent && !tqparent->inherits("MainWindow")) + TQWizard *wiz = new QDesignerWizard(parent, name); + if (parent && !parent->inherits("MainWindow")) { - wiz->reparent(tqparent, TQPoint(0, 0), true); + wiz->reparent(parent, TQPoint(0, 0), true); } - if (init && tqparent && tqparent->inherits("FormWindow")) + if (init && parent && parent->inherits("FormWindow")) { - QDesignerWidget *dw = new QDesignerWidget((FormWindow *) tqparent, wiz, "page"); + QDesignerWidget *dw = new QDesignerWidget((FormWindow *) parent, wiz, "page"); MetaDataBase::addEntry(TQT_TQOBJECT(dw)); wiz->addPage(dw, i18n("Page")); TQTimer::singleShot(0, wiz, TQT_SLOT(next())); @@ -1017,7 +1017,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return wiz; } else if (className == "Spacer") { - Spacer *s = new Spacer(tqparent, name); + Spacer *s = new Spacer(parent, name); MetaDataBase::addEntry(TQT_TQOBJECT(s)); MetaDataBase::setPropertyChanged(TQT_TQOBJECT(s), "orientation", true); MetaDataBase::setPropertyChanged(TQT_TQOBJECT(s), "sizeType", true); @@ -1031,18 +1031,18 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa s->setOrientation(Qt::Horizontal); return s; } else if (className == TQLCDNUMBER_OBJECT_NAME_STRING) - return new TQLCDNumber(tqparent, name); + return new TQLCDNumber(parent, name); else if (className == TQPROGRESSBAR_OBJECT_NAME_STRING) - return new TQProgressBar(tqparent, name); + return new TQProgressBar(parent, name); else if (className == TQTEXTVIEW_OBJECT_NAME_STRING) - return new TQTextView(tqparent, name); + return new TQTextView(parent, name); else if (className == TQTEXTBROWSER_OBJECT_NAME_STRING) - return new TQTextBrowser(tqparent, name); + return new TQTextBrowser(parent, name); else if (className == TQDIAL_OBJECT_NAME_STRING) - return new TQDial(tqparent, name); + return new TQDial(parent, name); else if (className == TQSLIDER_OBJECT_NAME_STRING) { - TQSlider *s = new TQSlider(tqparent, name); + TQSlider *s = new TQSlider(parent, name); if (!r) return s; if (!r->isValid() || r->width() < 2 && r->height() < 2) @@ -1054,7 +1054,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return s; } else if (className == TQSCROLLBAR_OBJECT_NAME_STRING) { - TQScrollBar *s = new TQScrollBar(tqparent, name); + TQScrollBar *s = new TQScrollBar(parent, name); if (!r) return s; if (!r->isValid() || r->width() < 2 && r->height() < 2) @@ -1067,13 +1067,13 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } else if (className == TQFRAME_OBJECT_NAME_STRING) { if (!init) - return new TQFrame(tqparent, name); - TQFrame *f = new TQFrame(tqparent, name); + return new TQFrame(parent, name); + TQFrame *f = new TQFrame(parent, name); f->setFrameStyle(TQFrame::StyledPanel | TQFrame::Raised); return f; } else if (className == "Line") { - Line *l = new Line(tqparent, name); + Line *l = new Line(parent, name); MetaDataBase::addEntry(TQT_TQOBJECT(l)); MetaDataBase::setPropertyChanged(TQT_TQOBJECT(l), "orientation", true); MetaDataBase::setPropertyChanged(TQT_TQOBJECT(l), "frameShadow", true); @@ -1087,9 +1087,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return l; } else if (className == TQMAINWINDOW_OBJECT_NAME_STRING) { - TQMainWindow *mw = new KmdrMainWindow(tqparent, name, 0); + TQMainWindow *mw = new KmdrMainWindow(parent, name, 0); mw->setDockEnabled(TQt::DockMinimized, false); - QDesignerWidget *dw = new QDesignerWidget((FormWindow *) tqparent, mw, "central widget"); + QDesignerWidget *dw = new QDesignerWidget((FormWindow *) parent, mw, "central widget"); mw->setDockMenuEnabled(false); MetaDataBase::addEntry(TQT_TQOBJECT(dw)); mw->setCentralWidget(dw); @@ -1100,25 +1100,25 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa #ifndef TQT_NO_SQL else if (className == TQDATABROWSER_OBJECT_NAME_STRING) { - TQWidget *w = new QDesignerDataBrowser(tqparent, name); - if (tqparent) - w->reparent(tqparent, TQPoint(0, 0), true); + TQWidget *w = new QDesignerDataBrowser(parent, name); + if (parent) + w->reparent(parent, TQPoint(0, 0), true); return w; } else if (className == TQDATAVIEW_OBJECT_NAME_STRING) { - TQWidget *w = new QDesignerDataView(tqparent, name); - if (tqparent) - w->reparent(tqparent, TQPoint(0, 0), true); + TQWidget *w = new QDesignerDataView(parent, name); + if (parent) + w->reparent(parent, TQPoint(0, 0), true); return w; } #endif #ifdef KOMMANDER if (className == "LineEdit") - return new LineEdit(tqparent, name); + return new LineEdit(parent, name); else if (className == "ListView") { - TQListView *lv = new TQListView(tqparent, name); + TQListView *lv = new TQListView(parent, name); lv->setSorting(-1); if (init) { @@ -1130,28 +1130,28 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa else if (className == "Dialog") { TQDialog *dia = 0; - if (tqparent && tqparent->inherits("FormWindow")) - dia = new EditorDialog((FormWindow *) tqparent, tqparent, name); + if (parent && parent->inherits("FormWindow")) + dia = new EditorDialog((FormWindow *) parent, parent, name); else - dia = new Dialog(tqparent, name, false); + dia = new Dialog(parent, name, false); - if (tqparent) - dia->reparent(tqparent, TQPoint(0, 0), true); + if (parent) + dia->reparent(parent, TQPoint(0, 0), true); return dia; } else if (className == "Wizard") { //qDebug("Creating Wizard..."); TQWizard *wiz; - if (tqparent && tqparent->inherits("FormWindow")) - wiz = new QDesignerWizard(tqparent, name); + if (parent && parent->inherits("FormWindow")) + wiz = new QDesignerWizard(parent, name); else - wiz = new Wizard(tqparent, name); - if (tqparent) - wiz->reparent(tqparent, TQPoint(0, 0), true); - if (init && tqparent && tqparent->inherits("FormWindow")) + wiz = new Wizard(parent, name); + if (parent) + wiz->reparent(parent, TQPoint(0, 0), true); + if (init && parent && parent->inherits("FormWindow")) { - QDesignerWidget *dw = new QDesignerWidget((FormWindow *) tqparent, wiz, "page"); + QDesignerWidget *dw = new QDesignerWidget((FormWindow *) parent, wiz, "page"); MetaDataBase::addEntry(TQT_TQOBJECT(dw)); wiz->addPage(dw, i18n("Page 1")); wiz->addPage(dw, i18n("Page 2")); @@ -1161,10 +1161,10 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } else if (className == "TabWidget") { - TQTabWidget *tw = new EditorTabWidget(tqparent, name); + TQTabWidget *tw = new EditorTabWidget(parent, name); if (init) { - FormWindow *fw = find_formwindow(tqparent); + FormWindow *fw = find_formwindow(parent); TQWidget *w = fw ? new QDesignerWidget(fw, tw, "tab") : new TQWidget(tw, "tab"); tw->addTab(w, i18n("Tab 1")); MetaDataBase::addEntry(TQT_TQOBJECT(w)); @@ -1176,10 +1176,10 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return tw; } else if (className == "ToolBox") { - TQToolBox *tw = new EditorToolBox(tqparent, name); + TQToolBox *tw = new EditorToolBox(parent, name); if (init) { - FormWindow *fw = find_formwindow(tqparent); + FormWindow *fw = find_formwindow(parent); TQWidget *w = fw ? new QDesignerWidget(fw, tw, "toolbox") : new TQWidget(tw, "toolbox"); tw->addItem(w, i18n("Page 1")); MetaDataBase::addEntry(TQT_TQOBJECT(w)); @@ -1191,44 +1191,44 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return tw; } else if (className == "ExecButton") - return new ExecButton(tqparent, name); + return new ExecButton(parent, name); else if (className == "CloseButton") - return new CloseButton(tqparent, name); + return new CloseButton(parent, name); else if (className == "SubDialog") - return new SubDialog(tqparent, name); + return new SubDialog(parent, name); else if (className == "FileSelector") - return new FileSelector(tqparent, name); + return new FileSelector(parent, name); else if (className == "TextEdit") - return new TextEdit(tqparent, name); + return new TextEdit(parent, name); else if (className == "RadioButton") - return new RadioButton(tqparent, name); + return new RadioButton(parent, name); else if (className == "ButtonGroup") - return new ButtonGroup(tqparent, name); + return new ButtonGroup(parent, name); else if (className == "GroupBox") - return new GroupBox(tqparent, name); + return new GroupBox(parent, name); else if (className == "CheckBox") - return new CheckBox(tqparent, name); + return new CheckBox(parent, name); else if (className == "ComboBox") - return new ComboBox(tqparent, name); + return new ComboBox(parent, name); else if (className == "SpinBoxInt") - return new SpinBoxInt(tqparent, name); + return new SpinBoxInt(parent, name); else if (className == "ListBox") - return new ListBox(tqparent, name); + return new ListBox(parent, name); else if (className == "ScriptObject") - return new ScriptObject(tqparent, name); + return new ScriptObject(parent, name); else if (className == "RichTextEditor") - return new RichTextEditor(tqparent, name); + return new RichTextEditor(parent, name); else if (className == "DatePicker") - return new DatePicker(tqparent, name); + return new DatePicker(parent, name); else if (className == "PopupMenu") - return new PopupMenu(tqparent, name); + return new PopupMenu(parent, name); else if (className == "FontDialog") - return new FontDialog(tqparent, name); + return new FontDialog(parent, name); else if (className == "AboutDialog") - return new AboutDialog(tqparent, name); + return new AboutDialog(parent, name); else if (className == "TreeWidget") { - TQListView *lv = new TreeWidget(tqparent, name); + TQListView *lv = new TreeWidget(parent, name); lv->setSorting(-1); if (init) { @@ -1238,7 +1238,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return lv; } else if (className == "Slider") { - Slider *s = new Slider(tqparent, name); + Slider *s = new Slider(parent, name); if (!r) return s; if (!r->isValid() || r->width() < 2 && r->height() < 2) @@ -1251,7 +1251,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } #endif - TQWidget *w = KommanderFactory::createWidget(className, tqparent, name); + TQWidget *w = KommanderFactory::createWidget(className, parent, name); return w; } @@ -1331,7 +1331,7 @@ TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout ) while ( o ) { if ( o->isWidgetType() ) return (TQWidget*)o; - o = o->tqparent(); + o = o->parent(); } return 0; } @@ -1363,10 +1363,10 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w ) } /*! Returns the actual designer widget of the container \a w. This is - normally \a w itself, but might be a tqparent or grand tqparent of \a w + normally \a w itself, but might be a parent or grand parent of \a w (e.g. when working with a tabwidget and \a w is the container which contains and layouts childs, but the actual widget known to the - designer is the tabwidget which is the tqparent of \a w. So this + designer is the tabwidget which is the parent of \a w. So this function returns the tabwidget then.) */ @@ -1391,15 +1391,15 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o ) if ( TQApplication::activePopupWidget() ) // if a popup is open, we have to make sure that this one is closed, else X might do funny things return true; - if ( o->inherits( TQTABBAR_OBJECT_NAME_STRING ) || ::tqqt_cast<TQToolBox*>(o->tqparent()) ) + if ( o->inherits( TQTABBAR_OBJECT_NAME_STRING ) || ::tqqt_cast<TQToolBox*>(o->parent()) ) return true; else if ( o->inherits( TQSIZEGRIP_OBJECT_NAME_STRING ) ) return true; - else if ( o->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) && o->tqparent() && o->tqparent()->inherits( TQTABBAR_OBJECT_NAME_STRING ) ) + else if ( o->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) && o->parent() && o->parent()->inherits( TQTABBAR_OBJECT_NAME_STRING ) ) return true; - else if ( o->tqparent() && o->tqparent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) && o->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) ) + else if ( o->parent() && o->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) && o->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) ) return true; - else if ( o->tqparent() && o->tqparent()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) && o->inherits( TQMENUBAR_OBJECT_NAME_STRING ) ) + else if ( o->parent() && o->parent()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) && o->inherits( TQMENUBAR_OBJECT_NAME_STRING ) ) return true; else if ( o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) ) return true; @@ -1471,7 +1471,7 @@ void WidgetFactory::initChangedProperties( TQObject *o ) if ( o->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) || o->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING) || o->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) || o->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) ) MetaDataBase::setPropertyChanged( o, "text", true ); - else if (::tqqt_cast<TQToolButton*>(o) && ::tqqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->tqparent()))) { + else if (::tqqt_cast<TQToolButton*>(o) && ::tqqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->parent()))) { MetaDataBase::setPropertyChanged( o, "usesTextLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "textLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "autoRaise", TRUE ); @@ -1550,7 +1550,7 @@ bool WidgetFactory::hasItems( int id ) return false; } -void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ) +void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) { TQString className = WidgetDatabase::className(id); @@ -1562,7 +1562,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget TQComboBox *cb = (TQComboBox *) editWidget; - ListBoxEditor *e = new ListBoxEditor(tqparent, cb->listBox(), fw); + ListBoxEditor *e = new ListBoxEditor(parent, cb->listBox(), fw); e->exec(); delete e; @@ -1572,7 +1572,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget } if (className == "TextEdit" || className == "TextBrowser") { - MultiLineEditor *e = new MultiLineEditor(tqparent, editWidget, fw); + MultiLineEditor *e = new MultiLineEditor(parent, editWidget, fw); e->exec(); delete e; return; @@ -1582,7 +1582,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget if (!editWidget->inherits(TQLISTVIEW_OBJECT_NAME_STRING)) return; TQListView *lv = (TQListView *) editWidget; - ListViewEditor *e = new ListViewEditor(tqparent, lv, fw); + ListViewEditor *e = new ListViewEditor(parent, lv, fw); e->exec(); delete e; return; @@ -1591,7 +1591,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget { if (!editWidget->inherits(TQLISTBOX_OBJECT_NAME_STRING)) return; - ListBoxEditor *e = new ListBoxEditor(tqparent, editWidget, fw); + ListBoxEditor *e = new ListBoxEditor(parent, editWidget, fw); e->exec(); delete e; return; @@ -1601,7 +1601,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget { if (!editWidget->inherits(TQLISTBOX_OBJECT_NAME_STRING)) return; - ListBoxEditor *e = new ListBoxEditor(tqparent, editWidget, fw); + ListBoxEditor *e = new ListBoxEditor(parent, editWidget, fw); e->exec(); delete e; return; @@ -1612,7 +1612,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget if (!editWidget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) return; TQComboBox *cb = (TQComboBox *) editWidget; - ListBoxEditor *e = new ListBoxEditor(tqparent, cb->listBox(), fw); + ListBoxEditor *e = new ListBoxEditor(parent, cb->listBox(), fw); e->exec(); delete e; cb->update(); @@ -1624,7 +1624,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget if (!editWidget->inherits(TQLISTVIEW_OBJECT_NAME_STRING)) return; TQListView *lv = (TQListView *) editWidget; - ListViewEditor *e = new ListViewEditor(tqparent, lv, fw); + ListViewEditor *e = new ListViewEditor(parent, lv, fw); e->exec(); delete e; return; @@ -1634,7 +1634,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget { if (!editWidget->inherits(TQICONVIEW_OBJECT_NAME_STRING)) return; - IconViewEditor *e = new IconViewEditor(tqparent, editWidget, fw); + IconViewEditor *e = new IconViewEditor(parent, editWidget, fw); e->exec(); delete e; return; @@ -1642,7 +1642,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget if (className == TQMULTILINEEDIT_OBJECT_NAME_STRING || className == TQTEXTEDIT_OBJECT_NAME_STRING) { - MultiLineEditor *e = new MultiLineEditor(tqparent, editWidget, fw); + MultiLineEditor *e = new MultiLineEditor(parent, editWidget, fw); e->exec(); delete e; return; @@ -1650,7 +1650,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget #ifndef TQT_NO_TABLE if (className.contains("Table")) { - TableEditor *e = new TableEditor(tqparent, editWidget, fw); + TableEditor *e = new TableEditor(parent, editWidget, fw); e->exec(); delete e; return; @@ -1730,11 +1730,11 @@ TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propNam return p->valueToKey( defaultValue( w, propName ).toInt() ); } -TQWidget *WidgetFactory::createCustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *w ) +TQWidget *WidgetFactory::createCustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *w ) { if ( !w ) return 0; - return new CustomWidget( tqparent, name, w ); + return new CustomWidget( parent, name, w ); } TQVariant WidgetFactory::property( TQObject *w, const char *name ) @@ -1793,7 +1793,7 @@ bool TQLayoutWidget::event( TQEvent *e ) /* This function must be called on TQLayoutWidget creation and whenever - the TQLayoutWidget's tqparent tqlayout changes (e.g., from a TQHBoxLayout + the TQLayoutWidget's parent tqlayout changes (e.g., from a TQHBoxLayout to a TQVBoxLayout), because of the (illogical) way layouting works. */ void TQLayoutWidget::updateSizePolicy() @@ -1819,12 +1819,12 @@ void TQLayoutWidget::updateSizePolicy() if ( tqlayout() ) { /* - parentLayout is set to the tqparent tqlayout if there is one and if it is + parentLayout is set to the parent tqlayout if there is one and if it is top level, in which case layouting is illogical. */ TQLayout *parentLayout = 0; - if ( tqparent() && tqparent()->isWidgetType() ) { - parentLayout = ((TQWidget *)tqparent())->tqlayout(); + if ( parent() && parent()->isWidgetType() ) { + parentLayout = ((TQWidget *)parent())->tqlayout(); if ( parentLayout && parentLayout->mainWidget()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) ) parentLayout = 0; } diff --git a/kommander/editor/widgetfactory.h b/kommander/editor/widgetfactory.h index 178c3172..9ebce67c 100644 --- a/kommander/editor/widgetfactory.h +++ b/kommander/editor/widgetfactory.h @@ -70,7 +70,7 @@ public: NoLayout }; - static TQWidget *create( int id, TQWidget *tqparent, const char *name = 0, bool init = TRUE, + static TQWidget *create( int id, TQWidget *parent, const char *name = 0, bool init = TRUE, const TQRect *rect = 0, Qt::Orientation orient = Qt::Horizontal ); static TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type ); static void deleteLayout( TQWidget *widget ); @@ -90,7 +90,7 @@ public: static bool hasSpecialEditor( int id ); static bool hasItems( int id ); - static void editWidget( int id, TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ); + static void editWidget( int id, TQWidget *parent, TQWidget *editWidget, FormWindow *fw ); static bool canResetProperty( TQObject *w, const TQString &propName ); static bool resetProperty( TQObject *w, const TQString &propName ); @@ -101,9 +101,9 @@ public: static void saveDefaultProperties( TQWidget *w, int id ); private: - static TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name, bool init, + static TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name, bool init, const TQRect *r = 0, Qt::Orientation orient = Qt::Horizontal ); - static TQWidget *createCustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *w ); + static TQWidget *createCustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *w ); }; @@ -116,7 +116,7 @@ class QDesignerTabWidget : public TQTabWidget TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) public: - QDesignerTabWidget( TQWidget *tqparent, const char *name ); + QDesignerTabWidget( TQWidget *parent, const char *name ); int currentPage() const; void setCurrentPage( int i ); @@ -146,7 +146,7 @@ class EditorTabWidget : public TabWidget TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) public: - EditorTabWidget( TQWidget *tqparent, const char *name ); + EditorTabWidget( TQWidget *parent, const char *name ); int currentPage() const; void setCurrentPage( int i ); @@ -176,7 +176,7 @@ class EditorToolBox : public ToolBox TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) public: - EditorToolBox( TQWidget *tqparent, const char *name ); + EditorToolBox( TQWidget *parent, const char *name ); int currentPage() const; void setCurrentPage( int i ); @@ -196,7 +196,7 @@ class QDesignerWizard : public TQWizard TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) public: - QDesignerWizard( TQWidget *tqparent, const char *name ) : TQWizard( tqparent, name ) {} + QDesignerWizard( TQWidget *parent, const char *name ) : TQWizard( parent, name ) {} int currentPageNum() const; void setCurrentPage( int i ); @@ -230,7 +230,7 @@ class TQLayoutWidget : public TQWidget TQ_OBJECT public: - TQLayoutWidget( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), sp( TQWidget::tqsizePolicy() ) {} + TQLayoutWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), sp( TQWidget::tqsizePolicy() ) {} TQSizePolicy sizePolicy() const; void updateSizePolicy(); @@ -249,8 +249,8 @@ class CustomWidget : public TQWidget TQ_OBJECT public: - CustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *cw ) - : TQWidget( tqparent, name ), cusw( cw ) { + CustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *cw ) + : TQWidget( parent, name ), cusw( cw ) { alwaysExpand = parentWidget() && parentWidget()->inherits( "FormWindow" ); tqsetSizePolicy( cw->sizePolicy ); if ( !alwaysExpand ) @@ -287,8 +287,8 @@ class Line : public TQFrame TQ_OVERRIDE( TQRect frameRect DESIGNABLE false ) TQ_OVERRIDE( TQRect contentsRect DESIGNABLE false ) public: - Line( TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name, WMouseNoMask ) { + Line( TQWidget *parent, const char *name ) + : TQFrame( parent, name, WMouseNoMask ) { setFrameStyle( HLine | Sunken ); } @@ -311,8 +311,8 @@ class QDesignerLabel : public TQLabel TQ_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget ) public: - QDesignerLabel( TQWidget *tqparent = 0, const char *name = 0 ) - : TQLabel( tqparent, name ) { myBuddy = 0; } + QDesignerLabel( TQWidget *parent = 0, const char *name = 0 ) + : TQLabel( parent, name ) { myBuddy = 0; } void setBuddyWidget( const TQCString &b ) { myBuddy = b; @@ -342,8 +342,8 @@ class QDesignerWidget : public TQWidget TQ_OBJECT public: - QDesignerWidget( FormWindow *fw, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, WResizeNoErase ), formwindow( fw ) {} + QDesignerWidget( FormWindow *fw, TQWidget *parent, const char *name ) + : TQWidget( parent, name, WResizeNoErase ), formwindow( fw ) {} protected: void paintEvent( TQPaintEvent *e ); @@ -359,8 +359,8 @@ class QDesignerDialog : public TQDialog TQ_OBJECT public: - QDesignerDialog( FormWindow *fw, TQWidget *tqparent, const char *name ) - : TQDialog( tqparent, name, FALSE, WResizeNoErase ), formwindow( fw ) {} + QDesignerDialog( FormWindow *fw, TQWidget *parent, const char *name ) + : TQDialog( parent, name, FALSE, WResizeNoErase ), formwindow( fw ) {} protected: void paintEvent( TQPaintEvent *e ); @@ -377,8 +377,8 @@ class QDesignerToolButton : public TQToolButton TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - QDesignerToolButton( TQWidget *tqparent, const char *name ) - : TQToolButton( tqparent, name ) {} + QDesignerToolButton( TQWidget *parent, const char *name ) + : TQToolButton( parent, name ) {} bool isInButtonGroup() const { return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); @@ -401,8 +401,8 @@ class QDesignerRadioButton : public TQRadioButton TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - QDesignerRadioButton( TQWidget *tqparent, const char *name ) - : TQRadioButton( tqparent, name ) {} + QDesignerRadioButton( TQWidget *parent, const char *name ) + : TQRadioButton( parent, name ) {} bool isInButtonGroup() const { return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); @@ -426,8 +426,8 @@ class QDesignerPushButton : public TQPushButton TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - QDesignerPushButton( TQWidget *tqparent, const char *name ) - : TQPushButton( tqparent, name ) {} + QDesignerPushButton( TQWidget *parent, const char *name ) + : TQPushButton( parent, name ) {} bool isInButtonGroup() const { return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); @@ -451,8 +451,8 @@ class QDesignerCheckBox : public TQCheckBox TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - QDesignerCheckBox( TQWidget *tqparent, const char *name ) - : TQCheckBox( tqparent, name ) {} + QDesignerCheckBox( TQWidget *parent, const char *name ) + : TQCheckBox( parent, name ) {} bool isInButtonGroup() const { return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); @@ -475,8 +475,8 @@ class EditorDialog : public Dialog TQ_OBJECT public: - EditorDialog( FormWindow *fw, TQWidget *tqparent, const char *name ) - : Dialog( tqparent, name, FALSE, WResizeNoErase ), formwindow( fw ) { } + EditorDialog( FormWindow *fw, TQWidget *parent, const char *name ) + : Dialog( parent, name, FALSE, WResizeNoErase ), formwindow( fw ) { } protected: void paintEvent( TQPaintEvent *e ); diff --git a/kommander/editor/wizardeditorimpl.cpp b/kommander/editor/wizardeditorimpl.cpp index 602f8376..56ff0028 100644 --- a/kommander/editor/wizardeditorimpl.cpp +++ b/kommander/editor/wizardeditorimpl.cpp @@ -31,8 +31,8 @@ #include <klocale.h> -WizardEditor::WizardEditor( TQWidget *tqparent, TQWizard *w, FormWindow *fw ) - : WizardEditorBase( tqparent, 0 ), formwindow( fw ), wizard( w ) +WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw ) + : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); fillListBox(); diff --git a/kommander/editor/wizardeditorimpl.h b/kommander/editor/wizardeditorimpl.h index bc5f68bf..6222c545 100644 --- a/kommander/editor/wizardeditorimpl.h +++ b/kommander/editor/wizardeditorimpl.h @@ -35,7 +35,7 @@ class WizardEditor : public WizardEditorBase TQ_OBJECT public: - WizardEditor( TQWidget *tqparent, TQWizard *wizard, FormWindow *fw ); + WizardEditor( TQWidget *parent, TQWizard *wizard, FormWindow *fw ); ~WizardEditor(); protected slots: diff --git a/kommander/editor/workspace.cpp b/kommander/editor/workspace.cpp index 971add70..99fcf474 100644 --- a/kommander/editor/workspace.cpp +++ b/kommander/editor/workspace.cpp @@ -102,11 +102,11 @@ static TQPixmap *filePixmap = 0; static TQPixmap* formPixmap = 0; #ifndef KOMMANDER -WorkspaceItem::WorkspaceItem( TQListView *tqparent, Project* p ) +WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p ) #else -WorkspaceItem::WorkspaceItem( TQListView *tqparent ) +WorkspaceItem::WorkspaceItem( TQListView *parent ) #endif - : TQListViewItem( tqparent ) + : TQListViewItem( parent ) { init(); #ifndef KOMMANDER @@ -118,8 +118,8 @@ WorkspaceItem::WorkspaceItem( TQListView *tqparent ) } #ifndef KOMMANDER -WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf ) - : TQListViewItem( tqparent ) +WorkspaceItem::WorkspaceItem( TQListViewItem *parent, SourceFile* sf ) + : TQListViewItem( parent ) { init(); sourceFile = sf; @@ -128,8 +128,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf ) } #endif -WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type type ) - : TQListViewItem( tqparent ) +WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) + : TQListViewItem( parent ) { init(); formFile = ff; @@ -146,8 +146,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type type } } -WorkspaceItem::WorkspaceItem( TQListView *tqparent, FormFile* ff, Type type ) - : TQListViewItem( tqparent ) +WorkspaceItem::WorkspaceItem( TQListView *parent, FormFile* ff, Type type ) + : TQListViewItem( parent ) { init(); formFile = ff; @@ -310,8 +310,8 @@ TQString WorkspaceItem::key( int column, bool ) const TQColor WorkspaceItem::backgroundColor() { bool b = useOddColor; - if ( t == FormSourceType && tqparent() ) - b = ( ( WorkspaceItem*)tqparent() )->useOddColor; + if ( t == FormSourceType && parent() ) + b = ( ( WorkspaceItem*)parent() )->useOddColor; return b ? *backColor2 : *backColor1; } @@ -328,8 +328,8 @@ void WorkspaceItem::setAutoOpen( bool b ) autoOpen = b; } -Workspace::Workspace( TQWidget *tqparent, MainWindow *mw ) - : TQListView( tqparent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | +Workspace::Workspace( TQWidget *parent, MainWindow *mw ) + : TQListView( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_Tool | WStyle_MinMax | WStyle_SysMenu ), mainWindow( mw ), #ifndef KOMMANDER project( 0 ), completionDirty( false ) @@ -559,7 +559,7 @@ void Workspace::closeAutoOpenItems() TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { WorkspaceItem* i = (WorkspaceItem*) it.current(); - WorkspaceItem* ip = (WorkspaceItem*) i->tqparent(); + WorkspaceItem* ip = (WorkspaceItem*) i->parent(); if ( i->type() == WorkspaceItem::FormSourceType ) { if ( !i->isSelected() && !ip->isSelected() && ip->isAutoOpen() ) { diff --git a/kommander/editor/workspace.h b/kommander/editor/workspace.h index 99470207..de5c8ccc 100644 --- a/kommander/editor/workspace.h +++ b/kommander/editor/workspace.h @@ -46,15 +46,15 @@ public: enum Type { ProjectType, FormFileType, FormSourceType, SourceFileType }; #ifndef KOMMANDER - //WorkspaceItem( TQListView *tqparent, Project* p ); + //WorkspaceItem( TQListView *parent, Project* p ); #else - WorkspaceItem(TQListView *tqparent); + WorkspaceItem(TQListView *parent); #endif #ifndef KOMMANDER -// WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf ); +// WorkspaceItem( TQListViewItem *parent, SourceFile* sf ); #endif - WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type t = FormFileType ); - WorkspaceItem( TQListView *tqparent, FormFile* ff, Type t = FormFileType ); + WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type t = FormFileType ); + WorkspaceItem( TQListView *parent, FormFile* ff, Type t = FormFileType ); void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); @@ -97,7 +97,7 @@ class Workspace : public TQListView TQ_OBJECT public: - Workspace( TQWidget *tqparent , MainWindow *mw ); + Workspace( TQWidget *parent , MainWindow *mw ); #ifndef KOMMANDER void setCurrentProject( Project *pro ); diff --git a/kommander/examples/current/kpartmwframe.kmdr b/kommander/examples/current/kpartmwframe.kmdr index cdd17f53..7d15aecf 100755 --- a/kommander/examples/current/kpartmwframe.kmdr +++ b/kommander/examples/current/kpartmwframe.kmdr @@ -95,7 +95,7 @@ _loadup = 2 <stringlist> <string>#!kommander if widgetExists("ScriptObject13") then - TextBrowser1.setText("This text was written by a script on the tqparent frame window. It could have been a dialog, but we chose to illustrate with a MainWindow for this demo.") + TextBrowser1.setText("This text was written by a script on the parent frame window. It could have been a dialog, but we chose to illustrate with a MainWindow for this demo.") ScriptObject13.execute else message_error("You do not have the KPart child dialog loaded") diff --git a/kommander/examples/current/kpartpart.kmdr b/kommander/examples/current/kpartpart.kmdr index 11b6a806..26e4171c 100755 --- a/kommander/examples/current/kpartpart.kmdr +++ b/kommander/examples/current/kpartpart.kmdr @@ -42,11 +42,11 @@ </property> <property name="text"> <string>You can click the test button to insert text -If you are loaded in the tqparent frame you can click the rocket icon on the toolbar or use the function menu to select "Talk to KPart". +If you are loaded in the parent frame you can click the rocket icon on the toolbar or use the function menu to select "Talk to KPart". -Any Kommander program can be run as a KPart. You need the KPart plugin to load KParts. Note that running Kommander programs as KParts is not without risks. For one thing you loose DCOP in the tqparent and the old parser ceases to work. Additionally since all widgets are accecssible from the tqparent and duplicate widget name can cause a Kommander lock up. +Any Kommander program can be run as a KPart. You need the KPart plugin to load KParts. Note that running Kommander programs as KParts is not without risks. For one thing you loose DCOP in the parent and the old parser ceases to work. Additionally since all widgets are accecssible from the parent and duplicate widget name can cause a Kommander lock up. -Because of all this and the fact that the Actions on the unsupported MainWindow are incompatible it is impossible for the child to talk with the tqparent. On this dialog we use a timer on the tqparent polling the child for requests every 100 ms. It's a crude hack but it does yield acceptable behavior. +Because of all this and the fact that the Actions on the unsupported MainWindow are incompatible it is impossible for the child to talk with the parent. On this dialog we use a timer on the parent polling the child for requests every 100 ms. It's a crude hack but it does yield acceptable behavior. This demo is intended to run both kpartwmframe.kmdr and kpartpart.kmdr. </string> </property> @@ -97,7 +97,7 @@ endif if _LOADED == true then kpmessage.setText("You have mail") else - message_info("this only works when loaded as a KPart in it's tqparent window") + message_info("this only works when loaded as a KPart in it's parent window") endif </string> </stringlist> @@ -122,7 +122,7 @@ endif </property> <property name="associations" stdset="0"> <stringlist> - <string>message_info("We just got a message from our tqparent frame!", "Parent called Child")</string> + <string>message_info("We just got a message from our parent frame!", "Parent called Child")</string> </stringlist> </property> </widget> diff --git a/kommander/executor/dcopkommanderif.h b/kommander/executor/dcopkommanderif.h index c756b059..3158fa6e 100644 --- a/kommander/executor/dcopkommanderif.h +++ b/kommander/executor/dcopkommanderif.h @@ -58,7 +58,7 @@ virtual void setChecked(const TQString &widgetName, bool checked) = 0; virtual void setAssociatedText(const TQString &widgetName, const TQString &text) = 0; virtual TQStringList associatedText(const TQString &widgetName) = 0; virtual TQString type(const TQString& widget) = 0; -virtual TQStringList tqchildren(const TQString& tqparent, bool recursive) = 0; +virtual TQStringList tqchildren(const TQString& parent, bool recursive) = 0; virtual TQString global(const TQString& variableName) = 0; virtual void setGlobal(const TQString& variableName, const TQString& value) = 0; virtual void setMaximum(const TQString &widgetName, int value) = 0; diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp index 88d7d7ec..44e56c21 100644 --- a/kommander/executor/instance.cpp +++ b/kommander/executor/instance.cpp @@ -101,7 +101,7 @@ bool Instance::build(const KURL& fname) KommanderFactory::loadPlugins(); if (fname.isValid()) - m_instance = KommanderFactory::create(fname.path(), 0L, dynamic_cast<TQWidget*>(tqparent())); + m_instance = KommanderFactory::create(fname.path(), 0L, dynamic_cast<TQWidget*>(parent())); else { TQFile inputFile; @@ -431,10 +431,10 @@ TQString Instance::type(const TQString& widget) return TQString(); } -TQStringList Instance::tqchildren(const TQString& tqparent, bool recursive) +TQStringList Instance::tqchildren(const TQString& parent, bool recursive) { TQStringList matching; - TQObject* child = stringToWidget(tqparent); + TQObject* child = stringToWidget(parent); TQObjectList* widgets; if (!child) child = TQT_TQOBJECT(m_instance); diff --git a/kommander/executor/instance.h b/kommander/executor/instance.h index 469d7202..c61f0c03 100644 --- a/kommander/executor/instance.h +++ b/kommander/executor/instance.h @@ -90,7 +90,7 @@ public: virtual void setAssociatedText(const TQString &widgetName, const TQString &text); virtual TQStringList associatedText(const TQString &widgetName); virtual TQString type(const TQString& widget); - virtual TQStringList tqchildren(const TQString& tqparent, bool recursive); + virtual TQStringList tqchildren(const TQString& parent, bool recursive); virtual TQString global(const TQString& variableName); virtual void setGlobal(const TQString& variableName, const TQString& value); virtual void setMaximum(const TQString &widgetName, int value); @@ -112,7 +112,7 @@ public: TQWidget *widget() { return m_instance;} public slots: - /** Sets the instance's tqparent */ + /** Sets the instance's parent */ void setParent(TQWidget*); /** Returns whether the instance is built */ bool isBuilt() const; @@ -127,7 +127,7 @@ private: TQGuardedPtr<TQWidget> m_instance; /* Associated Text Instance */ KommanderWidget *m_textInstance; - /** The tqparent widget */ + /** The parent widget */ TQWidget *m_parent; /* Get object by name */ TQObject* stringToWidget(const TQString& name); diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp index 5b1e12bc..0247a814 100644 --- a/kommander/factory/kommanderfactory.cpp +++ b/kommander/factory/kommanderfactory.cpp @@ -126,7 +126,7 @@ KommanderFactory::~KommanderFactory() qwf_currFileName = 0L; } -TQWidget *KommanderFactory::create( const TQString &uiFile, TQObject *connector, TQWidget *tqparent, const char *name ) +TQWidget *KommanderFactory::create( const TQString &uiFile, TQObject *connector, TQWidget *parent, const char *name ) { TQFile f( uiFile ); if ( !f.open( IO_ReadOnly ) ) @@ -135,14 +135,14 @@ TQWidget *KommanderFactory::create( const TQString &uiFile, TQObject *connector, if (!qwf_currFileName) qwf_currFileName = new TQString(); *qwf_currFileName = uiFile; - TQWidget *w = KommanderFactory::create( TQT_TQIODEVICE(&f), connector, tqparent, name ); + TQWidget *w = KommanderFactory::create( TQT_TQIODEVICE(&f), connector, parent, name ); if ( !qwf_forms ) qwf_forms = new TQMap<TQWidget*, TQString>; qwf_forms->insert( w, uiFile ); return w; } -TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidget *tqparent, const char *name ) +TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidget *parent, const char *name ) { TQDomDocument doc; TQString errMsg; @@ -217,7 +217,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg if ( !imageCollection.isNull() ) widgetFactory->loadImageCollection( imageCollection ); - widgetFactory->createWidgetInternal( widget, tqparent, 0, widget.attribute("class", TQWIDGET_OBJECT_NAME_STRING) ); + widgetFactory->createWidgetInternal( widget, parent, 0, widget.attribute("class", TQWIDGET_OBJECT_NAME_STRING) ); TQWidget *w = widgetFactory->toplevel; if ( !w ) { delete widgetFactory; @@ -310,110 +310,110 @@ void KommanderFactory::addPlugin( KommanderPlugin *plugin ) widgetPlugins.append( plugin ); } -TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWidget *tqparent, const char *name ) +TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWidget *parent, const char *name ) { TQString className = literalClassName; // create widgets we know if (className == TQPUSHBUTTON_OBJECT_NAME_STRING) - return new TQPushButton(tqparent, name); + return new TQPushButton(parent, name); else if (className == TQTOOLBUTTON_OBJECT_NAME_STRING) - return new TQToolButton(tqparent, name); + return new TQToolButton(parent, name); else if (className == TQCHECKBOX_OBJECT_NAME_STRING) - return new TQCheckBox(tqparent, name); + return new TQCheckBox(parent, name); else if (className == TQRADIOBUTTON_OBJECT_NAME_STRING) - return new TQRadioButton(tqparent, name); + return new TQRadioButton(parent, name); else if (className == TQGROUPBOX_OBJECT_NAME_STRING) - return new TQGroupBox(tqparent, name); + return new TQGroupBox(parent, name); else if (className == TQBUTTONGROUP_OBJECT_NAME_STRING) - return new TQButtonGroup(tqparent, name); + return new TQButtonGroup(parent, name); else if (className == TQICONVIEW_OBJECT_NAME_STRING) { #if !defined(TQT_NO_ICONVIEW) - return new TQIconView(tqparent, name); + return new TQIconView(parent, name); #endif } else if (className == TQTABLE_OBJECT_NAME_STRING) { #if !defined(TQT_NO_TABLE) - return new TQTable(tqparent, name); + return new TQTable(parent, name); #endif } else if (className == TQLISTBOX_OBJECT_NAME_STRING) - return new TQListBox(tqparent, name); + return new TQListBox(parent, name); else if (className == TQLISTVIEW_OBJECT_NAME_STRING) - return new TQListView(tqparent, name); + return new TQListView(parent, name); else if (className == TQLINEEDIT_OBJECT_NAME_STRING) - return new TQLineEdit(tqparent, name); + return new TQLineEdit(parent, name); else if (className == TQSPINBOX_OBJECT_NAME_STRING) - return new TQSpinBox(tqparent, name); + return new TQSpinBox(parent, name); else if (className == TQMULTILINEEDIT_OBJECT_NAME_STRING) - return new TQMultiLineEdit(tqparent, name); + return new TQMultiLineEdit(parent, name); else if (className == TQLABEL_OBJECT_NAME_STRING) - return new TQLabel(tqparent, name); + return new TQLabel(parent, name); else if (className == TQLAYOUTWIDGET_OBJECT_NAME_STRING) - return new TQWidget(tqparent, name); + return new TQWidget(parent, name); else if (className == TQTABWIDGET_OBJECT_NAME_STRING) - return new TQTabWidget(tqparent, name); + return new TQTabWidget(parent, name); else if (className == TQCOMBOBOX_OBJECT_NAME_STRING) - return new TQComboBox(false, tqparent, name); + return new TQComboBox(false, parent, name); else if (className == TQWIDGET_OBJECT_NAME_STRING) { if (!qwf_stays_on_top) - return new TQWidget(tqparent, name); - return new TQWidget(tqparent, name, TQt::WStyle_StaysOnTop); + return new TQWidget(parent, name); + return new TQWidget(parent, name, TQt::WStyle_StaysOnTop); } else if (className == TQDIALOG_OBJECT_NAME_STRING) { if (!qwf_stays_on_top) - return new TQDialog(tqparent, name); - return new TQDialog(tqparent, name, false, TQt::WStyle_StaysOnTop); + return new TQDialog(parent, name); + return new TQDialog(parent, name, false, TQt::WStyle_StaysOnTop); } else if (className == TQWIZARD_OBJECT_NAME_STRING) - return new TQWizard(tqparent, name); + return new TQWizard(parent, name); else if (className == TQLCDNUMBER_OBJECT_NAME_STRING) - return new TQLCDNumber(tqparent, name); + return new TQLCDNumber(parent, name); else if (className == TQPROGRESSBAR_OBJECT_NAME_STRING) - return new TQProgressBar(tqparent, name); + return new TQProgressBar(parent, name); else if (className == TQTEXTVIEW_OBJECT_NAME_STRING) - return new TQTextView(tqparent, name); + return new TQTextView(parent, name); else if (className == TQTEXTBROWSER_OBJECT_NAME_STRING) - return new TQTextBrowser(tqparent, name); + return new TQTextBrowser(parent, name); else if (className == TQDIAL_OBJECT_NAME_STRING) - return new TQDial(tqparent, name); + return new TQDial(parent, name); else if (className == TQSLIDER_OBJECT_NAME_STRING) - return new TQSlider(tqparent, name); + return new TQSlider(parent, name); else if (className == TQFRAME_OBJECT_NAME_STRING) - return new TQFrame(tqparent, name); + return new TQFrame(parent, name); else if (className == TQSPLITTER_OBJECT_NAME_STRING) - return new TQSplitter(tqparent, name); + return new TQSplitter(parent, name); else if (className == "Line") { - TQFrame *f = new TQFrame(tqparent, name); + TQFrame *f = new TQFrame(parent, name); f->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); return f; } else if (className == TQTEXTEDIT_OBJECT_NAME_STRING) - return new TQTextEdit(tqparent, name); + return new TQTextEdit(parent, name); else if (className == TQDATEEDIT_OBJECT_NAME_STRING) - return new TQDateEdit(tqparent, name); + return new TQDateEdit(parent, name); else if (className == TQTIMEEDIT_OBJECT_NAME_STRING) - return new TQTimeEdit(tqparent, name); + return new TQTimeEdit(parent, name); else if (className == TQDATETIMEEDIT_OBJECT_NAME_STRING) - return new TQDateTimeEdit(tqparent, name); + return new TQDateTimeEdit(parent, name); else if (className == TQSCROLLBAR_OBJECT_NAME_STRING) - return new TQScrollBar(tqparent, name); + return new TQScrollBar(parent, name); else if (className == TQPOPUPMENU_OBJECT_NAME_STRING) - return new TQPopupMenu(tqparent, name); + return new TQPopupMenu(parent, name); else if (className == TQWIDGETSTACK_OBJECT_NAME_STRING) - return new TQWidgetStack(tqparent, name); + return new TQWidgetStack(parent, name); else if (className == TQMAINWINDOW_OBJECT_NAME_STRING) { TQMainWindow *mw = 0; if (!qwf_stays_on_top) - mw = new KmdrMainWindow(tqparent, name); + mw = new KmdrMainWindow(parent, name); else - mw = new KmdrMainWindow(tqparent, name, TQt::WType_TopLevel | TQt::WStyle_StaysOnTop); + mw = new KmdrMainWindow(parent, name, TQt::WType_TopLevel | TQt::WStyle_StaysOnTop); mw->setCentralWidget(new TQWidget(mw, "qt_central_widget")); mw->centralWidget()->show(); (void) mw->statusBar(); @@ -421,18 +421,18 @@ TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWi } #if !defined(TQT_NO_SQL) else if (className == TQDATATABLE_OBJECT_NAME_STRING) - return new TQDataTable(tqparent, name); + return new TQDataTable(parent, name); else if (className == TQDATABROWSER_OBJECT_NAME_STRING) - return new QDesignerDataBrowser2(tqparent, name); + return new QDesignerDataBrowser2(parent, name); else if (className == TQDATAVIEW_OBJECT_NAME_STRING) - return new QDesignerDataView2(tqparent, name); + return new QDesignerDataView2(parent, name); #endif // try to create it using the loaded kommander widget plugins //find the widget plugin which can create className for (KommanderPlugin * p = widgetPlugins.first(); p; p = widgetPlugins.next()) { - TQWidget *w = p->create(className, tqparent, name); + TQWidget *w = p->create(className, parent, name); if (w) return w; } @@ -497,7 +497,7 @@ FeatureList KommanderFactory::featureList() //iterate through widgetPlugins, appending KommanderPlugin::widgets() to features } -TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout, const TQString &classNameArg ) +TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout, const TQString &classNameArg ) { lastItem = 0; TQDomElement n = e.firstChild().toElement(); @@ -519,9 +519,9 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge className = TQWIDGET_OBJECT_NAME_STRING; if ( tqlayout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) { // hide tqlayout widgets - w = tqparent; + w = parent; } else { - obj = TQT_TQOBJECT(KommanderFactory::createWidget( className, tqparent, 0 )); + obj = TQT_TQOBJECT(KommanderFactory::createWidget( className, parent, 0 )); if ( !obj ) { return 0; @@ -599,16 +599,16 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge } else if ( n.tagName() == "attribute" && w ) { TQString attrib = n.attribute( "name" ); TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); - if ( tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { + if ( parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { if ( attrib == "title" ) - ( (TQTabWidget*)tqparent )->insertTab( w, translate(v.toString()) ); + ( (TQTabWidget*)parent )->insertTab( w, translate(v.toString()) ); } else - if ( tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { + if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { if ( attrib == "label" ) - ( (TQToolBox*)tqparent )->addItem( w, translate(v.toString()) ); - }else if ( tqparent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + ( (TQToolBox*)parent )->addItem( w, translate(v.toString()) ); + }else if ( parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { if ( attrib == "title" ) - ( (TQWizard*)tqparent )->addPage( w, translate(v.toString()) ); + ( (TQWizard*)parent )->addPage( w, translate(v.toString()) ); } } else if ( n.tagName() == "item" ) { createItem( n, w ); @@ -792,8 +792,8 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T noDatabaseWidgets << obj->name(); } } else if ( prop == "buttonGroupId" ) { - if ( obj->inherits( TQBUTTON_OBJECT_NAME_STRING ) && obj->tqparent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) - ( (TQButtonGroup*)obj->tqparent() )->insert( (TQButton*)obj, v.toInt() ); + if ( obj->inherits( TQBUTTON_OBJECT_NAME_STRING ) && obj->parent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) + ( (TQButtonGroup*)obj->parent() )->insert( (TQButton*)obj, v.toInt() ); } return; @@ -1344,13 +1344,13 @@ void KommanderFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLi -void KommanderFactory::loadChildAction( TQObject *tqparent, const TQDomElement &e ) +void KommanderFactory::loadChildAction( TQObject *parent, const TQDomElement &e ) { TQDomElement n = e; TQAction *a = 0; EventFunction ef; if ( n.tagName() == "action" ) { - a = new TQAction( tqparent ); + a = new TQAction( parent ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "property" ) { @@ -1361,10 +1361,10 @@ void KommanderFactory::loadChildAction( TQObject *tqparent, const TQDomElement & } n2 = n2.nextSibling().toElement(); } - if ( !tqparent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) actionList.append( a ); } else if ( n.tagName() == "actiongroup" ) { - a = new TQActionGroup( tqparent ); + a = new TQActionGroup( parent ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "property" ) { @@ -1378,7 +1378,7 @@ void KommanderFactory::loadChildAction( TQObject *tqparent, const TQDomElement & } n2 = n2.nextSibling().toElement(); } - if ( !tqparent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) actionList.append( a ); } if ( a ) diff --git a/kommander/factory/kommanderfactory.h b/kommander/factory/kommanderfactory.h index 8098f877..9b38ae9e 100644 --- a/kommander/factory/kommanderfactory.h +++ b/kommander/factory/kommanderfactory.h @@ -60,13 +60,13 @@ public: KommanderFactory(); virtual ~KommanderFactory(); - static TQWidget *create( const TQString &uiFile, TQObject *connector = 0, TQWidget *tqparent = 0, const char *name = 0 ); - static TQWidget *create( TQIODevice *dev, TQObject *connector = 0, TQWidget *tqparent = 0, const char *name = 0 ); + static TQWidget *create( const TQString &uiFile, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 ); + static TQWidget *create( TQIODevice *dev, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 ); static int loadPlugins( bool force = FALSE ); static void addPlugin( KommanderPlugin *plugin ); static void loadImages( const TQString &dir ); - static TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name ); + static TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name ); static FeatureList featureList(); private: @@ -74,7 +74,7 @@ private: void loadImageCollection( const TQDomElement &e ); void loadConnections( const TQDomElement &e, TQObject *connector ); void loadTabOrder( const TQDomElement &e ); - TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout, const TQString &classNameArg ); + TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout, const TQString &classNameArg ); TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type ); LayoutType layoutType( TQLayout *l ) const; void setProperty( TQObject* widget, const TQString &prop, const TQDomElement &e ); @@ -85,7 +85,7 @@ private: void createColumn( const TQDomElement &e, TQWidget *widget ); void loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bool &hasPixmap ); void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 ); - void loadChildAction( TQObject *tqparent, const TQDomElement &e ); + void loadChildAction( TQObject *parent, const TQDomElement &e ); void loadActions( const TQDomElement &e ); void loadToolBars( const TQDomElement &e ); void loadMenuBar( const TQDomElement &e ); diff --git a/kommander/kmdrtools/dcoptool-oldparser.kmdr b/kommander/kmdrtools/dcoptool-oldparser.kmdr index a5c2f55e..21a13ae7 100755 --- a/kommander/kmdrtools/dcoptool-oldparser.kmdr +++ b/kommander/kmdrtools/dcoptool-oldparser.kmdr @@ -796,7 +796,7 @@ fi @setGlobal(PARM3,"") @setGlobal(PARM4,"") @setGlobal(short,tqchildren) - @setGlobal(DESC,"Returns the list of child widgets contained in the tqparent widget. Set the <i>recursive</i> parameter to <i>true</i> to include widgets contained by child widgets.") + @setGlobal(DESC,"Returns the list of child widgets contained in the parent widget. Set the <i>recursive</i> parameter to <i>true</i> to include widgets contained by child widgets.") @case(DCOP::clear(QString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @@ -1124,7 +1124,7 @@ fi @setGlobal(PARM3,"") @setGlobal(PARM4,"") @setGlobal(short,parentPid) - @setGlobal(DESC,"Returns the pid of the tqparent Kommander window.") + @setGlobal(DESC,"Returns the pid of the parent Kommander window.") @case(Kommander::debug(QString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"text") @@ -1276,7 +1276,7 @@ fi @setGlobal(PARM3,"function") @setGlobal(PARM4,"args") @setGlobal(short,dcop) - @setGlobal(DESC,"Creates a new widget with the specified type and as the child of tqparent.") + @setGlobal(DESC,"Creates a new widget with the specified type and as the child of parent.") @case(Kommander::dcop(QString,QString,QString,QString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") diff --git a/kommander/part/kommander_part.cpp b/kommander/part/kommander_part.cpp index 1d9a1393..d8645bc9 100644 --- a/kommander/part/kommander_part.cpp +++ b/kommander/part/kommander_part.cpp @@ -34,8 +34,8 @@ typedef KParts::GenericFactory<KommanderPart> KommanderPartFactory; K_EXPORT_COMPONENT_FACTORY( libkommander_part, KommanderPartFactory ) KommanderPart::KommanderPart( TQWidget *parentWidget, const char * /*widgetName*/, - TQObject *tqparent, const char *name, const TQStringList & /*args*/ ) - : KParts::ReadOnlyPart(tqparent, name) + TQObject *parent, const char *name, const TQStringList & /*args*/ ) + : KParts::ReadOnlyPart(parent, name) { setInstance( KommanderPartFactory::instance() ); m_instance = 0L; @@ -79,7 +79,7 @@ void KommanderPart::slotRun() { w->reparent(m_widget, 0, TQPoint(0,0)); m_layout->addWidget(w, 0, 0); - w->show(); //show, not execute, so it doesn't block the tqparent + w->show(); //show, not execute, so it doesn't block the parent } } diff --git a/kommander/part/kommander_part.h b/kommander/part/kommander_part.h index 9000195c..b3bad9d7 100644 --- a/kommander/part/kommander_part.h +++ b/kommander/part/kommander_part.h @@ -27,7 +27,7 @@ class KommanderPart : public KParts::ReadOnlyPart TQ_OBJECT public: KommanderPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, const TQStringList &args); + TQObject *parent, const char *name, const TQStringList &args); virtual ~KommanderPart(); diff --git a/kommander/plugin/kommanderplugin.h b/kommander/plugin/kommanderplugin.h index ae06fdc0..16846013 100644 --- a/kommander/plugin/kommanderplugin.h +++ b/kommander/plugin/kommanderplugin.h @@ -54,7 +54,7 @@ class KOMMANDER_EXPORT KommanderPlugin : public TQObject virtual void removeWidget( const TQString &name ); virtual TQStringList widgets() const; - virtual TQWidget *create( const TQString &key, TQWidget *tqparent = 0, const char *name = 0 ) = 0; + virtual TQWidget *create( const TQString &key, TQWidget *parent = 0, const char *name = 0 ) = 0; virtual TQString group( const TQString &key ) const; virtual TQString toolTip( const TQString &key ) const; virtual TQString whatsThis( const TQString &key ) const; diff --git a/kommander/plugin/specialinformation.cpp b/kommander/plugin/specialinformation.cpp index a653dfd6..bb248dda 100644 --- a/kommander/plugin/specialinformation.cpp +++ b/kommander/plugin/specialinformation.cpp @@ -292,7 +292,7 @@ void SpecialInformation::registerSpecials() insert(DCOP::checked, "checked(TQString widget)", i18n("Returns 1 for checked boxes, 0 for unchecked."), 1); insert(DCOP::tqchildren, "tqchildren(TQString widget, bool recursive)", - i18n("Returns the list of child widgets contained in the tqparent widget. Set the <i>recursive</i> parameter to <i>true</i> to include widgets contained by child widgets."), 2); + i18n("Returns the list of child widgets contained in the parent widget. Set the <i>recursive</i> parameter to <i>true</i> to include widgets contained by child widgets."), 2); insert(DCOP::clear, "clear(TQString widget)", i18n("Removes all content from the widget."), 1); insertAlias(DCOP::clear, "clearList"); @@ -401,7 +401,7 @@ void SpecialInformation::registerSpecials() i18n("Returns DCOP identifier of current process. This is shorthand for <i>kmdr-executor-@pid</i>."), 0); insert(Kommander::parentPid, "parentPid", - i18n("Returns the pid of the tqparent Kommander window."), 0); + i18n("Returns the pid of the parent Kommander window."), 0); insert(Kommander::debug, "debug(TQString text)", i18n("Writes <i>text</i> on stderr."), 1); insert(Kommander::echo, "echo(TQString text)", @@ -440,8 +440,8 @@ void SpecialInformation::registerSpecials() i18n("Executes an external DCOP call."), 3, 9); insertMacro(Kommander::comment, "#", i18n("Adds a comment to EOL that Kommander will not parse"), 0); - insertInternal(Kommander::createWidget, "createWidget(TQString widgetName, TQString widgetType, TQString tqparent)", - i18n("Creates a new widget with the specified type and as the child of tqparent."), 3); + insertInternal(Kommander::createWidget, "createWidget(TQString widgetName, TQString widgetType, TQString parent)", + i18n("Creates a new widget with the specified type and as the child of parent."), 3); insertInternal(Kommander::widgetExists, "widgetExists(TQString widgetName)", i18n("Returns true if there is a widget with the passed name, false otherwise."), 1); insertInternal(Kommander::connect, "connect(TQString sender, TQString signal, TQString receiver, TQString slot)", diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp index c2947c5b..6148296b 100644 --- a/kommander/pluginmanager/mainwindow.cpp +++ b/kommander/pluginmanager/mainwindow.cpp @@ -28,8 +28,8 @@ #include <kglobal.h> #include <kstandarddirs.h> -MainWindow::MainWindow( TQWidget* tqparent, const char *name, WFlags f ) - : KMainWindow( tqparent, name, f ) +MainWindow::MainWindow( TQWidget* parent, const char *name, WFlags f ) + : KMainWindow( parent, name, f ) { KToolBar *toolBar = new KToolBar( this ); toolBar->insertButton("fileopen", Add, true, i18n("Add") ); diff --git a/kommander/pluginmanager/mainwindow.h b/kommander/pluginmanager/mainwindow.h index ffc59ace..51c02a5e 100644 --- a/kommander/pluginmanager/mainwindow.h +++ b/kommander/pluginmanager/mainwindow.h @@ -28,7 +28,7 @@ class MainWindow : public KMainWindow Q_OBJECT TQ_OBJECT public: - MainWindow( TQWidget* tqparent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose ); + MainWindow( TQWidget* parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose ); ~MainWindow(); protected slots: diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp index da699bd2..8886acab 100644 --- a/kommander/widget/functionlib.cpp +++ b/kommander/widget/functionlib.cpp @@ -411,8 +411,8 @@ static ParseNode f_createWidget(Parser* p, const ParameterList& params) KommanderWidget *widget = p->currentWidget()->widgetByName(parentName); if (!widget) return ParseNode::error("unknown widget"); - TQWidget *tqparent = dynamic_cast<TQWidget*>(widget->object()); - TQWidget *w = KommanderFactory::createWidget(widgetType, tqparent, widgetName.latin1()); + TQWidget *parent = dynamic_cast<TQWidget*>(widget->object()); + TQWidget *w = KommanderFactory::createWidget(widgetType, parent, widgetName.latin1()); if (w) w->adjustSize(); return ParseNode(); diff --git a/kommander/widget/invokeclass.cpp b/kommander/widget/invokeclass.cpp index a82a5305..ec360d69 100644 --- a/kommander/widget/invokeclass.cpp +++ b/kommander/widget/invokeclass.cpp @@ -15,7 +15,7 @@ #include <tqcolor.h> #include <tqregexp.h> -InvokeClass::InvokeClass(TQObject *tqparent):TQObject(tqparent) +InvokeClass::InvokeClass(TQObject *parent):TQObject(parent) { m_acceptedSlots = acceptedSlots(); } diff --git a/kommander/widget/invokeclass.h b/kommander/widget/invokeclass.h index 043ba73b..19001f9e 100644 --- a/kommander/widget/invokeclass.h +++ b/kommander/widget/invokeclass.h @@ -20,7 +20,7 @@ class InvokeClass : public TQObject { Q_OBJECT TQ_OBJECT public: - InvokeClass(TQObject *tqparent); + InvokeClass(TQObject *parent); void invokeSlot(TQObject *object, const TQString& slot, TQStringList args); static TQStringList acceptedSlots() diff --git a/kommander/widget/kmdrmainwindow.cpp b/kommander/widget/kmdrmainwindow.cpp index 603c1326..e123a035 100644 --- a/kommander/widget/kmdrmainwindow.cpp +++ b/kommander/widget/kmdrmainwindow.cpp @@ -13,8 +13,8 @@ #include <tqtimer.h> -KmdrMainWindow::KmdrMainWindow(TQWidget *tqparent, const char *name, WFlags f) - : KMainWindow(tqparent, name, f) +KmdrMainWindow::KmdrMainWindow(TQWidget *parent, const char *name, WFlags f) + : KMainWindow(parent, name, f) { TQTimer::singleShot(10, this, TQT_SIGNAL(initialize())); } diff --git a/kommander/widget/kmdrmainwindow.h b/kommander/widget/kmdrmainwindow.h index 4896db2b..0d1a415b 100644 --- a/kommander/widget/kmdrmainwindow.h +++ b/kommander/widget/kmdrmainwindow.h @@ -22,7 +22,7 @@ class KmdrMainWindow : public KMainWindow Q_OBJECT TQ_OBJECT public: - KmdrMainWindow(TQWidget *tqparent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose); + KmdrMainWindow(TQWidget *parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose); ~KmdrMainWindow(); diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp index 793be627..d0f9e885 100644 --- a/kommander/widget/kommanderwidget.cpp +++ b/kommander/widget/kommanderwidget.cpp @@ -652,9 +652,9 @@ TQString KommanderWidget::substituteVariable(TQString text, TQString variable, T TQWidget* KommanderWidget::parentDialog() const { TQObject *superParent = m_thisObject; - while (superParent->tqparent()) + while (superParent->parent()) { - superParent = superParent->tqparent(); + superParent = superParent->parent(); if (superParent->inherits(TQDIALOG_OBJECT_NAME_STRING) || superParent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) break; } diff --git a/kommander/widget/kommanderwidget.h b/kommander/widget/kommanderwidget.h index bb223f3d..d3116c80 100644 --- a/kommander/widget/kommanderwidget.h +++ b/kommander/widget/kommanderwidget.h @@ -140,7 +140,7 @@ protected: // Parse given identifier as widget name KommanderWidget* parseWidget(const TQString& name) const; - // Return tqparent dialog of this widget + // Return parent dialog of this widget TQWidget* parentDialog() const; TQString substituteVariable(TQString text, TQString variable, TQString value) const; diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp index 4425412c..287302c8 100644 --- a/kommander/widgets/aboutdialog.cpp +++ b/kommander/widgets/aboutdialog.cpp @@ -36,8 +36,8 @@ enum Functions { LastFunction }; -AboutDialog::AboutDialog(TQWidget *tqparent, const char *name) - : TQLabel(tqparent, name), KommanderWidget(TQT_TQOBJECT(this)) +AboutDialog::AboutDialog(TQWidget *parent, const char *name) + : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this)) { TQStringList states; states << "default"; diff --git a/kommander/widgets/aboutdialog.h b/kommander/widgets/aboutdialog.h index 5837f355..0afa9fc4 100644 --- a/kommander/widgets/aboutdialog.h +++ b/kommander/widgets/aboutdialog.h @@ -29,7 +29,7 @@ class AboutDialog : public TQLabel, public KommanderWidget TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) public: - AboutDialog(TQWidget *tqparent = 0, const char *name = 0); + AboutDialog(TQWidget *parent = 0, const char *name = 0); ~AboutDialog(); diff --git a/kommander/widgets/closebutton.cpp b/kommander/widgets/closebutton.cpp index a8892d13..af6c5561 100644 --- a/kommander/widgets/closebutton.cpp +++ b/kommander/widgets/closebutton.cpp @@ -41,14 +41,14 @@ CloseButton::CloseButton(TQWidget* a_parent, const char* a_name) connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(startProcess())); - TQObject *tqparent = TQT_TQOBJECT(this); - while (tqparent->tqparent() != 0) + TQObject *parent = TQT_TQOBJECT(this); + while (parent->parent() != 0) { - tqparent = tqparent->tqparent(); - if (tqparent->inherits(TQDIALOG_OBJECT_NAME_STRING)) + parent = parent->parent(); + if (parent->inherits(TQDIALOG_OBJECT_NAME_STRING)) break; } - connect(this, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(reject())); + connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(reject())); } CloseButton::~CloseButton() diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp index 3efde0f4..b2f0fdba 100644 --- a/kommander/widgets/fontdialog.cpp +++ b/kommander/widgets/fontdialog.cpp @@ -28,8 +28,8 @@ enum Functions { LastFunction }; -FontDialog::FontDialog(TQWidget *tqparent, const char *name) - : TQLabel(tqparent, name), KommanderWidget(TQT_TQOBJECT(this)) +FontDialog::FontDialog(TQWidget *parent, const char *name) + : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this)) { TQStringList states; states << "default"; diff --git a/kommander/widgets/fontdialog.h b/kommander/widgets/fontdialog.h index 46c828e2..d81f15fa 100644 --- a/kommander/widgets/fontdialog.h +++ b/kommander/widgets/fontdialog.h @@ -28,7 +28,7 @@ class FontDialog : public TQLabel, public KommanderWidget TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - FontDialog(TQWidget *tqparent = 0, const char *name = 0); + FontDialog(TQWidget *parent = 0, const char *name = 0); ~FontDialog(); diff --git a/kommander/widgets/plugin.cpp b/kommander/widgets/plugin.cpp index 009da398..020ae6da 100644 --- a/kommander/widgets/plugin.cpp +++ b/kommander/widgets/plugin.cpp @@ -57,7 +57,7 @@ class KomStdPlugin : public KommanderPlugin { public: KomStdPlugin(); - virtual TQWidget *create( const TQString &key, TQWidget *tqparent = 0, const char *name = 0 ); + virtual TQWidget *create( const TQString &key, TQWidget *parent = 0, const char *name = 0 ); }; KomStdPlugin::KomStdPlugin() @@ -97,41 +97,41 @@ KomStdPlugin::KomStdPlugin() addWidget("AboutDialog", group, "", new TQIconSet(KGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium))); } -TQWidget *KomStdPlugin::create( const TQString &key, TQWidget *tqparent, const char *name ) +TQWidget *KomStdPlugin::create( const TQString &key, TQWidget *parent, const char *name ) { - if (key == "ButtonGroup") return new ButtonGroup(tqparent, name); - else if (key == "CheckBox") return new CheckBox(tqparent, name); - else if (key == "CloseButton") return new CloseButton(tqparent, name); - else if (key == "ComboBox") return new ComboBox(tqparent, name); - else if (key == "Dialog") return new Dialog(tqparent, name); - else if (key == "ExecButton") return new ExecButton(tqparent, name); - else if (key == "FileSelector") return new FileSelector(tqparent, name); - else if (key == "GroupBox") return new GroupBox(tqparent, name); - else if (key == "Konsole") return new Konsole(tqparent, name); - else if (key == "Label") return new Label(tqparent, name); - else if (key == "LineEdit") return new LineEdit(tqparent, name); - else if (key == "ListBox") return new ListBox(tqparent, name); - else if (key == "PixmapLabel") return new PixmapLabel(tqparent, name); - else if (key == "ProgressBar") return new ProgressBar(tqparent, name); - else if (key == "RadioButton") return new RadioButton(tqparent, name); - else if (key == "RichTextEditor") return new RichTextEditor(tqparent, name); - else if (key == "ScriptObject") return new ScriptObject(tqparent, name); - else if (key == "Slider") return new Slider(tqparent, name); - else if (key == "SpinBoxInt") return new SpinBoxInt(tqparent, name); - else if (key == "StatusBar") return new StatusBar(tqparent, name); - else if (key == "SubDialog") return new SubDialog(tqparent, name); - else if (key == "Table") return new Table(tqparent, name); - else if (key == "TabWidget") return new TabWidget(tqparent, name); - else if (key == "ToolBox") return new ToolBox(tqparent, name); - else if (key == "TextBrowser") return new TextBrowser(tqparent, name); - else if (key == "TextEdit") return new TextEdit(tqparent, name); - else if (key == "Timer") return new Timer(tqparent, name); - else if (key == "TreeWidget") return new TreeWidget(tqparent, name); - else if (key == "Wizard") return new Wizard(tqparent, name); - else if (key == "DatePicker") return new DatePicker(tqparent, name); - else if (key == "PopupMenu") return new PopupMenu(tqparent, name); - else if (key == "FontDialog") return new FontDialog(tqparent, name); - else if (key == "AboutDialog") return new AboutDialog(tqparent, name); + if (key == "ButtonGroup") return new ButtonGroup(parent, name); + else if (key == "CheckBox") return new CheckBox(parent, name); + else if (key == "CloseButton") return new CloseButton(parent, name); + else if (key == "ComboBox") return new ComboBox(parent, name); + else if (key == "Dialog") return new Dialog(parent, name); + else if (key == "ExecButton") return new ExecButton(parent, name); + else if (key == "FileSelector") return new FileSelector(parent, name); + else if (key == "GroupBox") return new GroupBox(parent, name); + else if (key == "Konsole") return new Konsole(parent, name); + else if (key == "Label") return new Label(parent, name); + else if (key == "LineEdit") return new LineEdit(parent, name); + else if (key == "ListBox") return new ListBox(parent, name); + else if (key == "PixmapLabel") return new PixmapLabel(parent, name); + else if (key == "ProgressBar") return new ProgressBar(parent, name); + else if (key == "RadioButton") return new RadioButton(parent, name); + else if (key == "RichTextEditor") return new RichTextEditor(parent, name); + else if (key == "ScriptObject") return new ScriptObject(parent, name); + else if (key == "Slider") return new Slider(parent, name); + else if (key == "SpinBoxInt") return new SpinBoxInt(parent, name); + else if (key == "StatusBar") return new StatusBar(parent, name); + else if (key == "SubDialog") return new SubDialog(parent, name); + else if (key == "Table") return new Table(parent, name); + else if (key == "TabWidget") return new TabWidget(parent, name); + else if (key == "ToolBox") return new ToolBox(parent, name); + else if (key == "TextBrowser") return new TextBrowser(parent, name); + else if (key == "TextEdit") return new TextEdit(parent, name); + else if (key == "Timer") return new Timer(parent, name); + else if (key == "TreeWidget") return new TreeWidget(parent, name); + else if (key == "Wizard") return new Wizard(parent, name); + else if (key == "DatePicker") return new DatePicker(parent, name); + else if (key == "PopupMenu") return new PopupMenu(parent, name); + else if (key == "FontDialog") return new FontDialog(parent, name); + else if (key == "AboutDialog") return new AboutDialog(parent, name); else return 0; } diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp index e00ee485..7bf77c27 100644 --- a/kommander/widgets/popupmenu.cpp +++ b/kommander/widgets/popupmenu.cpp @@ -32,8 +32,8 @@ #define INSERTSUBMENU 109 #define LAST_FUNCTION INSERTSUBMENU -PopupMenu::PopupMenu(TQWidget *tqparent, const char *name) - : TQLabel(tqparent, name), KommanderWidget(TQT_TQOBJECT(this)) +PopupMenu::PopupMenu(TQWidget *parent, const char *name) + : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this)) { TQStringList states; states << "default"; diff --git a/kommander/widgets/popupmenu.h b/kommander/widgets/popupmenu.h index 9a0dc925..e9e6c638 100644 --- a/kommander/widgets/popupmenu.h +++ b/kommander/widgets/popupmenu.h @@ -30,7 +30,7 @@ class PopupMenu : public TQLabel, public KommanderWidget TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - PopupMenu(TQWidget *tqparent = 0, const char *name = 0); + PopupMenu(TQWidget *parent = 0, const char *name = 0); ~PopupMenu(); virtual bool isKommanderWidget() const; diff --git a/kommander/widgets/toolbox.cpp b/kommander/widgets/toolbox.cpp index b2b57748..fad8ca38 100644 --- a/kommander/widgets/toolbox.cpp +++ b/kommander/widgets/toolbox.cpp @@ -27,8 +27,8 @@ #define FIRST_FUNCTION ADDWIDGET #define LAST_FUNCTION INDEXOF -ToolBox::ToolBox(TQWidget *tqparent, const char *name) - : TQToolBox(tqparent, name), KommanderWidget(TQT_TQOBJECT(this)) +ToolBox::ToolBox(TQWidget *parent, const char *name) + : TQToolBox(parent, name), KommanderWidget(TQT_TQOBJECT(this)) { TQStringList states; states << "default"; diff --git a/kommander/widgets/toolbox.h b/kommander/widgets/toolbox.h index ab5375b0..a7245889 100644 --- a/kommander/widgets/toolbox.h +++ b/kommander/widgets/toolbox.h @@ -26,7 +26,7 @@ class ToolBox : public TQToolBox, public KommanderWidget TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - ToolBox(TQWidget *tqparent = 0, const char *name = 0); + ToolBox(TQWidget *parent = 0, const char *name = 0); ~ToolBox(); diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp index d9f6b0c8..9a19d2b0 100644 --- a/kommander/widgets/treewidget.cpp +++ b/kommander/widgets/treewidget.cpp @@ -95,7 +95,7 @@ void TreeWidget::addItemFromString(const TQString& s) TQStringList elements = TQStringList::split(m_pathSeparator, s, true); if (elements.count() > 1) setRootIsDecorated(true); - TQListViewItem* tqparent = 0; + TQListViewItem* parent = 0; if (m_lastPath.size() < elements.count()) m_lastPath.resize(elements.count()); uint i = 0; @@ -103,13 +103,13 @@ void TreeWidget::addItemFromString(const TQString& s) { if (m_lastPath[i] && m_lastPath[i]->text(0) == elements[i]) { - tqparent = m_lastPath[i]; + parent = m_lastPath[i]; i++; continue; } else { - TQListViewItem* item = (i>0) ? tqparent->firstChild() : firstChild(); + TQListViewItem* item = (i>0) ? parent->firstChild() : firstChild(); while (item) { if (item->text(0) == *it) @@ -117,16 +117,16 @@ void TreeWidget::addItemFromString(const TQString& s) item = item->nextSibling(); } if (item) - tqparent = item; + parent = item; else - tqparent = itemFromString(tqparent, *it); - m_lastPath.insert(i, tqparent); + parent = itemFromString(parent, *it); + m_lastPath.insert(i, parent); i++; } } } -TQListViewItem* TreeWidget::itemFromString(TQListViewItem* tqparent, const TQString& s) +TQListViewItem* TreeWidget::itemFromString(TQListViewItem* parent, const TQString& s) { TQStringList elements; if (s.contains("\t")) @@ -137,8 +137,8 @@ TQListViewItem* TreeWidget::itemFromString(TQListViewItem* tqparent, const TQStr if (cols >= columns()) cols = columns(); TQListViewItem* item; - if (tqparent) - item = new TQListViewItem(tqparent); + if (parent) + item = new TQListViewItem(parent); else item = new TQListViewItem(this); int i = 0; @@ -219,14 +219,14 @@ TQString TreeWidget::itemPath(TQListViewItem* item) const { if (!item) return TQString(); - item = item->tqparent(); + item = item->parent(); if (!item) return TQString(); TQStringList path; while (item) { path.prepend(item->text(0)); - item = item->tqparent(); + item = item->parent(); } return path.join(m_pathSeparator); } diff --git a/kommander/widgets/treewidget.h b/kommander/widgets/treewidget.h index df7440b1..8cdbeb10 100644 --- a/kommander/widgets/treewidget.h +++ b/kommander/widgets/treewidget.h @@ -76,7 +76,7 @@ protected: TQString itemPath(TQListViewItem* item) const; private: void addItemFromString(const TQString& s); - TQListViewItem* itemFromString(TQListViewItem* tqparent, const TQString& s); + TQListViewItem* itemFromString(TQListViewItem* parent, const TQString& s); TQPtrVector<TQListViewItem> m_lastPath; TQString m_pathSeparator; int addColumnTree(const TQString & label, int width = -1 ); diff --git a/kommander/working/plugintemplate/plugin.cpp b/kommander/working/plugintemplate/plugin.cpp index bad414aa..b6e1a0a0 100644 --- a/kommander/working/plugintemplate/plugin.cpp +++ b/kommander/working/plugintemplate/plugin.cpp @@ -11,7 +11,7 @@ class %{APPNAME}Plugin : public KommanderPlugin { public: %{APPNAME}Plugin(); - virtual TQWidget *create( const TQString &className, TQWidget *tqparent = 0, const char *name = 0); + virtual TQWidget *create( const TQString &className, TQWidget *parent = 0, const char *name = 0); }; %{APPNAME}Plugin::%{APPNAME}Plugin() @@ -19,10 +19,10 @@ public: addWidget( "%{APPNAME}", "Custom", i18n("Kommander %{APPNAME} plugin."), new TQIconSet(KGlobal::iconLoader()->loadIcon("%{APPNAMELC}", KIcon::NoGroup, KIcon::SizeMedium)) ); } -TQWidget *%{APPNAME}Plugin::create( const TQString &className, TQWidget *tqparent, const char *name) +TQWidget *%{APPNAME}Plugin::create( const TQString &className, TQWidget *parent, const char *name) { if (className == "%{APPNAME}") - return new %{APPNAME}(tqparent, name); + return new %{APPNAME}(parent, name); return 0; } diff --git a/kommander/working/plugintemplate/widget.cpp b/kommander/working/plugintemplate/widget.cpp index 7efd8526..0b768911 100644 --- a/kommander/working/plugintemplate/widget.cpp +++ b/kommander/working/plugintemplate/widget.cpp @@ -16,8 +16,8 @@ enum Functions { LastFunction }; -%{APPNAME}::%{APPNAME}(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name), KommanderWidget(this) +%{APPNAME}::%{APPNAME}(TQWidget *parent, const char *name) + : TQWidget(parent, name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/working/plugintemplate/widget.h b/kommander/working/plugintemplate/widget.h index ab6f042f..2d88f61b 100644 --- a/kommander/working/plugintemplate/widget.h +++ b/kommander/working/plugintemplate/widget.h @@ -22,7 +22,7 @@ class %{APPNAME}: public TQWidget, public KommanderWidget TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - %{APPNAME}(TQWidget *tqparent, const char* name); + %{APPNAME}(TQWidget *parent, const char* name); ~%{APPNAME}(); virtual bool isKommanderWidget() const; diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp index 8d156990..e62666eb 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp @@ -68,9 +68,9 @@ typedef KParts::GenericFactory<KXsldbgPart> KXsldbgPartFactory; K_EXPORT_COMPONENT_FACTORY( libkxsldbgpart, KXsldbgPartFactory ) KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const TQStringList & /*args*/ ) - : DCOPObject("KXsldbgPart"), KParts::ReadOnlyPart(tqparent, name) + : DCOPObject("KXsldbgPart"), KParts::ReadOnlyPart(parent, name) { currentLineNo = 0; currentColumnNo = 0; diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.h b/kxsldbg/kxsldbgpart/kxsldbg_part.h index e01055a7..aae9c109 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.h +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.h @@ -55,7 +55,7 @@ public: * Default constructor */ KXsldbgPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, const TQStringList &args); + TQObject *parent, const char *name, const TQStringList &args); /** * Destructor diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp index 857848c3..a47e4aae 100644 --- a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp +++ b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp @@ -678,8 +678,8 @@ void XsldbgEvent::handleIncludedSourceItem(XsldbgEventData *eventData, const vo }else{ /* emit the event data via debugger*/ emit debugger->sourceItem(eventData->getText(0), /* file name*/ - eventData->getText(1), /* tqparent file name*/ - eventData->getInt(0) /* tqparent line number*/); + eventData->getText(1), /* parent file name*/ + eventData->getInt(0) /* parent line number*/); } } } @@ -709,8 +709,8 @@ void XsldbgEvent::handleSourceItem(XsldbgEventData *eventData, const void *msgD }else{ /* emit the event data via debugger*/ emit debugger->sourceItem(eventData->getText(0), /* name*/ - eventData->getText(1), /* tqparent file name*/ - eventData->getInt(0) /* tqparent line number*/); + eventData->getText(1), /* parent file name*/ + eventData->getInt(0) /* parent line number*/); } } } diff --git a/kxsldbg/kxsldbgpart/libxsldbg/files.cpp b/kxsldbg/kxsldbgpart/libxsldbg/files.cpp index df764b0b..e803b1a4 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/files.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/files.cpp @@ -939,7 +939,7 @@ filesEntityRef(xmlEntityPtr ent, xmlNodePtr firstNode, xmlNodePtr lastNode) /** * filesSetBaseUri: - * @node : Is valid and has a doc tqparent + * @node : Is valid and has a doc parent * @uri : Is Valid * * Set the base uri for this node. Function is used when xml file @@ -972,7 +972,7 @@ filesSetBaseUri(xmlNodePtr node, const xmlChar * uri) /** * filesGetBaseUri: - * @node : Is valid and has a doc tqparent + * @node : Is valid and has a doc parent * * Get a copy of the base uri for this node. Function is most usefull * used when xml file has external entities in its DTD diff --git a/kxsldbg/kxsldbgpart/libxsldbg/files.h b/kxsldbg/kxsldbgpart/libxsldbg/files.h index 0dd9a3e1..05e49828 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/files.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/files.h @@ -138,7 +138,7 @@ extern "C" { /** * filesSetBaseUri: - * @node : Is valid and has a doc tqparent + * @node : Is valid and has a doc parent * @uri : Is Valid * * Set the base uri for this node. Function is used when xml file @@ -154,7 +154,7 @@ extern "C" { * Set the base uri for this node. Function is used when xml file * has external entities in its DTD * - * @param node Is valid and has a doc tqparent + * @param node Is valid and has a doc parent * @param uri Is Valid * * @returns 1 if successful, @@ -169,7 +169,7 @@ extern "C" { /** * filesGetBaseUri: - * @node : Is valid and has a doc tqparent + * @node : Is valid and has a doc parent * * Get a copy of the base uri for this node. Function is most usefull * used when xml file has external entities in its DTD @@ -184,7 +184,7 @@ extern "C" { * Get a copy of the base uri for this node. Function is most usefull * used when xml file has external entities in its DTD * - * @param node : Is valid and has a doc tqparent + * @param node : Is valid and has a doc parent * * @returns The a copy of the base uri for this node, * NULL otherwise diff --git a/kxsldbg/kxsldbgpart/libxsldbg/search.cpp b/kxsldbg/kxsldbgpart/libxsldbg/search.cpp index 90cc9a10..dabf1d7e 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/search.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/search.cpp @@ -1334,16 +1334,16 @@ searchLocalNode(xmlNodePtr variable) xmlNodePtr node = NULL; int result = 1; xmlChar *value; - xmlNodePtr tqparent; + xmlNodePtr parent; if (variable) { node = searchGlobalNode(variable); if (node) { /* if unable to create any property failed then result will be equal to 0 */ - tqparent = variable->parent; + parent = variable->parent; /* try to find out what template this variable belongs to */ - if (tqparent && IS_XSLT_NAME(tqparent, "template")) { - value = xmlGetProp(tqparent, (xmlChar *) "name"); + if (parent && IS_XSLT_NAME(parent, "template")) { + value = xmlGetProp(parent, (xmlChar *) "name"); if (value) { result = result && @@ -1351,7 +1351,7 @@ searchLocalNode(xmlNodePtr variable) != NULL); xmlFree(value); } - value = xmlGetProp(tqparent, (xmlChar *) "match"); + value = xmlGetProp(parent, (xmlChar *) "match"); if (value) { result = result && @@ -1398,7 +1398,7 @@ searchSourceNode(xsltStylesheetPtr style) != NULL); if (style->parent && style->parent->doc) { result = result && - (xmlNewProp(node, (xmlChar *) "tqparent", + (xmlNewProp(node, (xmlChar *) "parent", style->parent->doc->URL) != NULL); } if (result) { diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp index 1cdb0293..1b8d2df3 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp @@ -14,14 +14,14 @@ #include <tqptrlist.h> -QXsldbgDoc::QXsldbgDoc(TQWidget *tqparent, KURL url) +QXsldbgDoc::QXsldbgDoc(TQWidget *parent, KURL url) : TQObject(0L, "QXsldbgDoc"), kDoc(0L),kView(0L), locked(false) { kDoc = KTextEditor::createDocument("libkatepart", 0L,"KTextEditor::Document"); connect(kDoc, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(lockDoc())); connect(kDoc, TQT_SIGNAL(completed()), this, TQT_SLOT(unlockDoc())); if (kDoc){ - kView = kDoc->createView(tqparent, "QXsldbgDocView"); + kView = kDoc->createView(parent, "QXsldbgDocView"); KURL cleanUrl; // convert paths relative to PWD into a absolute path TQString relUrl = url.prettyURL(); diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.h b/kxsldbg/kxsldbgpart/qxsldbgdoc.h index 07f5e4fc..ff808866 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.h +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.h @@ -22,7 +22,7 @@ Q_OBJECT TQ_OBJECT public: - QXsldbgDoc(TQWidget *tqparent=0, KURL url=TQString()); + QXsldbgDoc(TQWidget *parent=0, KURL url=TQString()); ~QXsldbgDoc(); void enableBreakPoint(uint lineNumber, bool state); diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp index 80acb012..a94e3a0f 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp @@ -18,11 +18,11 @@ #include <klocale.h> #include "xsldbgbreakpointlistitem.h" -XsldbgBreakpointListItem::XsldbgBreakpointListItem(TQListView *tqparent, +XsldbgBreakpointListItem::XsldbgBreakpointListItem(TQListView *parent, TQString fileName, int lineNumber, TQString templateName, TQString modeName, bool enabled, int id) - : XsldbgListItem(tqparent, 3, fileName, lineNumber) + : XsldbgListItem(parent, 3, fileName, lineNumber) { this->id = id; setText(0, TQString::number(id)); diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.h b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.h index c74cd3dc..b54d888a 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.h +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.h @@ -26,7 +26,7 @@ class XsldbgBreakpointListItem : public XsldbgListItem { public: - XsldbgBreakpointListItem(TQListView *tqparent, + XsldbgBreakpointListItem(TQListView *parent, TQString fileName, int lineNumber, TQString templateName, TQString modeName, bool enabled, int id); diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp index f38f1480..ba14d115 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp @@ -26,8 +26,8 @@ XsldbgBreakpointsImpl::XsldbgBreakpointsImpl(XsldbgDebugger *debugger, - TQWidget *tqparent /*=0*/, const char *name /*=0*/) - : XsldbgBreakpoints(tqparent, name), XsldbgDialogBase() + TQWidget *parent /*=0*/, const char *name /*=0*/) + : XsldbgBreakpoints(parent, name), XsldbgDialogBase() { this->debugger = debugger; connect(debugger, TQT_SIGNAL(breakpointItem(TQString /* file*/, diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h index 52bbaf6c..d934fae2 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h @@ -33,7 +33,7 @@ class XsldbgBreakpointsImpl : public XsldbgBreakpoints, public XsldbgDialogBase TQ_OBJECT public: - XsldbgBreakpointsImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); + XsldbgBreakpointsImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); ~XsldbgBreakpointsImpl(); /* Return >= 0 if line number entered is valid */ diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp index ceadc76e..9a500b6c 100644 --- a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp @@ -22,8 +22,8 @@ #include "xsldbggloballistitem.h" /* reuse global list item variable as a template list item */ XsldbgCallStackImpl::XsldbgCallStackImpl(XsldbgDebugger *debugger, - TQWidget *tqparent /*=0*/, const char *name /*=0*/) - : XsldbgCallStack(tqparent, name), XsldbgDialogBase() + TQWidget *parent /*=0*/, const char *name /*=0*/) + : XsldbgCallStack(parent, name), XsldbgDialogBase() { this->debugger = debugger; diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h index 94e5eed6..11d24547 100644 --- a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h @@ -32,7 +32,7 @@ class XsldbgCallStackImpl : public XsldbgCallStack, public XsldbgDialogBase { TQ_OBJECT public: - XsldbgCallStackImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); + XsldbgCallStackImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); ~XsldbgCallStackImpl(); public slots: diff --git a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp index dfbcdfe5..a7fa7a83 100644 --- a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp @@ -74,8 +74,8 @@ bool LibxsltParam::isValid() const XsldbgConfigImpl::XsldbgConfigImpl(XsldbgDebugger *debugger, - TQWidget *tqparent /*=0*/, const char *name /*=0*/) - : XsldbgConfig(tqparent, name) + TQWidget *parent /*=0*/, const char *name /*=0*/) + : XsldbgConfig(parent, name) { this->debugger = debugger; connect(debugger, TQT_SIGNAL(parameterItem(TQString /* name*/, TQString /* value */)), diff --git a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h index ce475d45..5624be81 100644 --- a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h @@ -52,7 +52,7 @@ class XsldbgConfigImpl : public XsldbgConfig, public XsldbgDialogBase { TQ_OBJECT public: - XsldbgConfigImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); + XsldbgConfigImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); ~XsldbgConfigImpl(); LibxsltParam *getParam(int paramNumber); diff --git a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp index 627db58b..03f21618 100644 --- a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp @@ -24,8 +24,8 @@ XsldbgEntitiesImpl::XsldbgEntitiesImpl(XsldbgDebugger *debugger, - TQWidget *tqparent /*=0*/, const char *name /*=0*/) - : XsldbgEntities(tqparent, name), XsldbgDialogBase() + TQWidget *parent /*=0*/, const char *name /*=0*/) + : XsldbgEntities(parent, name), XsldbgDialogBase() { this->debugger = debugger; connect(debugger, diff --git a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h index 4000dc0c..899621ea 100644 --- a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h @@ -32,7 +32,7 @@ class XsldbgEntitiesImpl : public XsldbgEntities, public XsldbgDialogBase { TQ_OBJECT public: - XsldbgEntitiesImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); + XsldbgEntitiesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); ~XsldbgEntitiesImpl(); public slots: diff --git a/kxsldbg/kxsldbgpart/xsldbggloballistitem.cpp b/kxsldbg/kxsldbgpart/xsldbggloballistitem.cpp index 8628f8d0..3ad3ed81 100644 --- a/kxsldbg/kxsldbgpart/xsldbggloballistitem.cpp +++ b/kxsldbg/kxsldbgpart/xsldbggloballistitem.cpp @@ -17,9 +17,9 @@ #include "xsldbggloballistitem.h" -XsldbgGlobalListItem::XsldbgGlobalListItem(TQListView *tqparent, +XsldbgGlobalListItem::XsldbgGlobalListItem(TQListView *parent, TQString fileName, int lineNumber, TQString globalName) - : XsldbgListItem(tqparent, 1, fileName, lineNumber) + : XsldbgListItem(parent, 1, fileName, lineNumber) { varName = globalName; setText(0, globalName); diff --git a/kxsldbg/kxsldbgpart/xsldbggloballistitem.h b/kxsldbg/kxsldbgpart/xsldbggloballistitem.h index 9488d50e..fe3cd47f 100644 --- a/kxsldbg/kxsldbgpart/xsldbggloballistitem.h +++ b/kxsldbg/kxsldbgpart/xsldbggloballistitem.h @@ -27,7 +27,7 @@ class XsldbgGlobalListItem : public XsldbgListItem { public: - XsldbgGlobalListItem(TQListView *tqparent, + XsldbgGlobalListItem(TQListView *parent, TQString fileName, int lineNumber, TQString globalName); ~XsldbgGlobalListItem(); diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp index b860d358..235c564a 100644 --- a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp @@ -24,8 +24,8 @@ XsldbgGlobalVariablesImpl::XsldbgGlobalVariablesImpl(XsldbgDebugger *debugger, - TQWidget *tqparent /*=0*/, const char *name /*=0*/) - : XsldbgGlobalVariables(tqparent, name), XsldbgDialogBase() + TQWidget *parent /*=0*/, const char *name /*=0*/) + : XsldbgGlobalVariables(parent, name), XsldbgDialogBase() { this->debugger = debugger; connect(debugger, TQT_SIGNAL(globalVariableItem(TQString /*name */, TQString /* fileName */, int /*lineNumber */)), diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h index f0e3b2c0..ad8db2e9 100644 --- a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h @@ -32,7 +32,7 @@ class XsldbgGlobalVariablesImpl : public XsldbgGlobalVariables, public XsldbgDia TQ_OBJECT public: - XsldbgGlobalVariablesImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); + XsldbgGlobalVariablesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); ~XsldbgGlobalVariablesImpl(); public slots: diff --git a/kxsldbg/kxsldbgpart/xsldbginspector.cpp b/kxsldbg/kxsldbgpart/xsldbginspector.cpp index db6fcb58..9503eeae 100644 --- a/kxsldbg/kxsldbgpart/xsldbginspector.cpp +++ b/kxsldbg/kxsldbgpart/xsldbginspector.cpp @@ -44,15 +44,15 @@ static TQPixmap uic_load_pixmap_XsldbgInspector( const TQString &name ) return pix; } /* - * Constructs a XsldbgInspector which is a child of 'tqparent', with the + * Constructs a XsldbgInspector which is a child of 'parent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * true to construct a modal dialog. */ -XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, TQWidget* tqparent, +XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, TQWidget* parent, const char* name, bool modal, WFlags fl ) - : TQDialog( tqparent, name, modal, fl ) + : TQDialog( parent, name, modal, fl ) { Q_CHECK_PTR(debugger); this->debugger = debugger; diff --git a/kxsldbg/kxsldbgpart/xsldbginspector.h b/kxsldbg/kxsldbgpart/xsldbginspector.h index c96e1091..e27d2c13 100644 --- a/kxsldbg/kxsldbgpart/xsldbginspector.h +++ b/kxsldbg/kxsldbgpart/xsldbginspector.h @@ -34,7 +34,7 @@ class XsldbgInspector : public TQDialog TQ_OBJECT public: - XsldbgInspector( XsldbgDebugger *debugger, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + XsldbgInspector( XsldbgDebugger *debugger, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~XsldbgInspector(); TQTabWidget* tabWidget; diff --git a/kxsldbg/kxsldbgpart/xsldbglistitem.cpp b/kxsldbg/kxsldbgpart/xsldbglistitem.cpp index 9c4d0ea4..c04bc7b4 100644 --- a/kxsldbg/kxsldbgpart/xsldbglistitem.cpp +++ b/kxsldbg/kxsldbgpart/xsldbglistitem.cpp @@ -17,9 +17,9 @@ #include "xsldbglistitem.h" -XsldbgListItem::XsldbgListItem(TQListView *tqparent, int columnOffset, +XsldbgListItem::XsldbgListItem(TQListView *parent, int columnOffset, const TQString & fileName, int lineNumber) - : TQListViewItem(tqparent) + : TQListViewItem(parent) { this->fileName = fileName; this->lineNumber = lineNumber; diff --git a/kxsldbg/kxsldbgpart/xsldbglistitem.h b/kxsldbg/kxsldbgpart/xsldbglistitem.h index 0eb72f85..0d8ac6a7 100644 --- a/kxsldbg/kxsldbgpart/xsldbglistitem.h +++ b/kxsldbg/kxsldbgpart/xsldbglistitem.h @@ -29,7 +29,7 @@ class XsldbgListItem : public TQListViewItem { public: /** column offset is the index of the fileName column */ - XsldbgListItem(TQListView *tqparent, int columnOffset, + XsldbgListItem(TQListView *parent, int columnOffset, const TQString &fileName, int lineNumber); ~XsldbgListItem(); diff --git a/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp b/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp index 0b8125bd..0d27f916 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp +++ b/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp @@ -18,9 +18,9 @@ #include "xsldbglocallistitem.h" #include <klocale.h> -XsldbgLocalListItem::XsldbgLocalListItem(TQListView *tqparent, TQString fileName, int lineNumber, +XsldbgLocalListItem::XsldbgLocalListItem(TQListView *parent, TQString fileName, int lineNumber, TQString localName, TQString templateContext, TQString selectXPath, bool localVariable) -: XsldbgListItem(tqparent, 3, fileName, lineNumber) +: XsldbgListItem(parent, 3, fileName, lineNumber) { varName = localName; contextName = templateContext; diff --git a/kxsldbg/kxsldbgpart/xsldbglocallistitem.h b/kxsldbg/kxsldbgpart/xsldbglocallistitem.h index 15401887..81c815e1 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocallistitem.h +++ b/kxsldbg/kxsldbgpart/xsldbglocallistitem.h @@ -26,7 +26,7 @@ class XsldbgLocalListItem : public XsldbgListItem { public: - XsldbgLocalListItem(TQListView *tqparent, TQString fileName, int lineNumber, + XsldbgLocalListItem(TQListView *parent, TQString fileName, int lineNumber, TQString localName, TQString templateContext, TQString selectXPath, bool localVariable); ~XsldbgLocalListItem(); diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp index 3a1f68d3..fa8c756b 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp @@ -27,8 +27,8 @@ XsldbgLocalVariablesImpl::XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, - TQWidget *tqparent /*=0*/, const char *name /*=0*/) - : XsldbgLocalVariables(tqparent, name), XsldbgDialogBase() + TQWidget *parent /*=0*/, const char *name /*=0*/) + : XsldbgLocalVariables(parent, name), XsldbgDialogBase() { this->debugger = debugger; connect(debugger, TQT_SIGNAL(variableItem(TQString /*name */, TQString /* templateContext*/, diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h index b8456226..fde0c060 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h @@ -32,7 +32,7 @@ class XsldbgLocalVariablesImpl : public XsldbgLocalVariables, public XsldbgDialo TQ_OBJECT public: - XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); + XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); ~XsldbgLocalVariablesImpl(); public slots: diff --git a/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h b/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h index 7d5f5f92..1c605e7e 100644 --- a/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h @@ -21,7 +21,7 @@ class XsldbgMsgDialogImpl : public XsldbgMsgDialog { public: - XsldbgMsgDialogImpl(TQWidget *tqparent, + XsldbgMsgDialogImpl(TQWidget *parent, TQMessageBox::Icon icon, const TQString & title, const TQString &msg); diff --git a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp index db15bc1d..03584163 100644 --- a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp @@ -30,10 +30,10 @@ #include "xsldbgmsgdialogimpl.h" -XsldbgMsgDialogImpl::XsldbgMsgDialogImpl(TQWidget *tqparent, +XsldbgMsgDialogImpl::XsldbgMsgDialogImpl(TQWidget *parent, TQMessageBox::Icon icon, const TQString &title, const TQString &msg) - : XsldbgMsgDialog(tqparent, "XsldbgMsgDialogImpl" , TRUE ) + : XsldbgMsgDialog(parent, "XsldbgMsgDialogImpl" , TRUE ) { setCaption(title); @@ -52,8 +52,8 @@ void XsldbgMsgDialogImpl::append(const TQString &text) #include "xsldbgoutputview.h" -XsldbgOutputView::XsldbgOutputView(TQWidget * tqparent) - : TQTextEdit(tqparent, "outputview") +XsldbgOutputView::XsldbgOutputView(TQWidget * parent) + : TQTextEdit(parent, "outputview") { new TQBoxLayout(this, TQBoxLayout::TopToBottom); tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred)); diff --git a/kxsldbg/kxsldbgpart/xsldbgoutputview.h b/kxsldbg/kxsldbgpart/xsldbgoutputview.h index 20fafdd5..caae76be 100644 --- a/kxsldbg/kxsldbgpart/xsldbgoutputview.h +++ b/kxsldbg/kxsldbgpart/xsldbgoutputview.h @@ -32,7 +32,7 @@ class XsldbgOutputView : public TQTextEdit { TQ_OBJECT public : - XsldbgOutputView(TQWidget *tqparent = 0); + XsldbgOutputView(TQWidget *parent = 0); void showDialog(TQMessageBox::Icon icon, TQString title, TQString msg); diff --git a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp index 624b4880..f291ab6d 100644 --- a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp @@ -24,8 +24,8 @@ XsldbgSourcesImpl::XsldbgSourcesImpl(XsldbgDebugger *debugger, - TQWidget *tqparent /*=0*/, const char *name /*=0*/) - : XsldbgSources(tqparent, name), XsldbgDialogBase() + TQWidget *parent /*=0*/, const char *name /*=0*/) + : XsldbgSources(parent, name), XsldbgDialogBase() { this->debugger = debugger; connect(debugger, TQT_SIGNAL(sourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */)), diff --git a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h index 0f8eeeb0..1fb07417 100644 --- a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h @@ -32,7 +32,7 @@ class XsldbgSourcesImpl : public XsldbgSources, public XsldbgDialogBase { TQ_OBJECT public: - XsldbgSourcesImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); + XsldbgSourcesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); ~XsldbgSourcesImpl(); public slots: diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.cpp b/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.cpp index 3df077c1..cd07e89e 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.cpp @@ -17,9 +17,9 @@ #include "xsldbgtemplatelistitem.h" -XsldbgTemplateListItem::XsldbgTemplateListItem(TQListView *tqparent, +XsldbgTemplateListItem::XsldbgTemplateListItem(TQListView *parent, TQString fileName, int lineNumber, TQString templateName, TQString modeName) - : XsldbgListItem(tqparent, 2, fileName, lineNumber) + : XsldbgListItem(parent, 2, fileName, lineNumber) { this->templateName = templateName; setText(0, templateName); diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.h b/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.h index e9f6637a..e1c0a8b6 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.h +++ b/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.h @@ -25,7 +25,7 @@ class XsldbgTemplateListItem : public XsldbgListItem { public: - XsldbgTemplateListItem(TQListView *tqparent, + XsldbgTemplateListItem(TQListView *parent, TQString fileName, int lineNumber, TQString templateName, TQString modeName); ~XsldbgTemplateListItem(); diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp index 6b467baf..66cb9227 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp @@ -22,8 +22,8 @@ #include "xsldbgtemplatelistitem.h" XsldbgTemplatesImpl::XsldbgTemplatesImpl(XsldbgDebugger *debugger, - TQWidget *tqparent /*=0*/, const char *name /*=0*/) - : XsldbgTemplates(tqparent, name), XsldbgDialogBase() + TQWidget *parent /*=0*/, const char *name /*=0*/) + : XsldbgTemplates(parent, name), XsldbgDialogBase() { this->debugger = debugger; diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h index acf60c25..49fbcacc 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h @@ -34,7 +34,7 @@ class XsldbgTemplatesImpl : public XsldbgTemplates, public XsldbgDialogBase { TQ_OBJECT public: - XsldbgTemplatesImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); + XsldbgTemplatesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); ~XsldbgTemplatesImpl(); public slots: diff --git a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.cpp index 1c8a18e1..58497cea 100644 --- a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.cpp @@ -21,8 +21,8 @@ #include "xsldbgwalkspeedimpl.h" XsldbgWalkSpeedImpl::XsldbgWalkSpeedImpl(XsldbgDebugger *debugger, - TQWidget *tqparent /*=0 */, const char *name /*=0*/ ) - : XsldbgWalkSpeed(tqparent, name, false) + TQWidget *parent /*=0 */, const char *name /*=0*/ ) + : XsldbgWalkSpeed(parent, name, false) { this->debugger = debugger; } diff --git a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h index f8a2e3f5..ba4cdd02 100644 --- a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h @@ -31,7 +31,7 @@ class XsldbgWalkSpeedImpl : public XsldbgWalkSpeed { TQ_OBJECT public: - XsldbgWalkSpeedImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); + XsldbgWalkSpeedImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); ~XsldbgWalkSpeedImpl(); public slots: diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp index 0e63ed8a..b233202f 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp @@ -99,8 +99,8 @@ static const char* const not_close_xpm[]={ * * @author Max Judin. */ -KDockMainWindow::KDockMainWindow( TQWidget* tqparent, const char *name, WFlags f) -:KMainWindow( tqparent, name, f ) +KDockMainWindow::KDockMainWindow( TQWidget* parent, const char *name, WFlags f) +:KMainWindow( parent, name, f ) { TQString new_name = TQString(name) + TQString("_DockManager"); dockManager = new KDockManager( this, new_name.latin1() ); @@ -122,7 +122,7 @@ void KDockMainWindow::setMainDockWidget( KDockWidget* mdw ) void KDockMainWindow::setView( TQWidget *view ) { if ( view->isA("KDockWidget") ){ - if ( TQT_BASE_OBJECT(view->tqparent()) != TQT_BASE_OBJECT(this) ) ((KDockWidget*)view)->applyToWidget( this ); + if ( TQT_BASE_OBJECT(view->parent()) != TQT_BASE_OBJECT(this) ) ((KDockWidget*)view)->applyToWidget( this ); } #ifndef NO_KDE2 @@ -132,9 +132,9 @@ void KDockMainWindow::setView( TQWidget *view ) #endif } -KDockWidget* KDockMainWindow::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel) +KDockWidget* KDockMainWindow::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel) { - return new KDockWidget( dockManager, name.latin1(), pixmap, tqparent, strCaption, strTabPageLabel ); + return new KDockWidget( dockManager, name.latin1(), pixmap, parent, strCaption, strTabPageLabel ); } void KDockMainWindow::makeDockVisible( KDockWidget* dock ) @@ -185,15 +185,15 @@ void KDockMainWindow::slotDockWidgetUndocked() } /*************************************************************************/ -KDockWidgetAbstractHeaderDrag::KDockWidgetAbstractHeaderDrag( KDockWidgetAbstractHeader* tqparent, KDockWidget* dock, const char* name ) -:TQFrame( tqparent, name ) +KDockWidgetAbstractHeaderDrag::KDockWidgetAbstractHeaderDrag( KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name ) +:TQFrame( parent, name ) { dw = dock; installEventFilter( dock->dockManager() ); } /*************************************************************************/ -KDockWidgetHeaderDrag::KDockWidgetHeaderDrag( KDockWidgetAbstractHeader* tqparent, KDockWidget* dock, const char* name ) -:KDockWidgetAbstractHeaderDrag( tqparent, dock, name ) +KDockWidgetHeaderDrag::KDockWidgetHeaderDrag( KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name ) +:KDockWidgetAbstractHeaderDrag( parent, dock, name ) { } @@ -208,13 +208,13 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* ) paint.end(); } /*************************************************************************/ -KDockWidgetAbstractHeader::KDockWidgetAbstractHeader( KDockWidget* tqparent, const char* name ) -:TQFrame( tqparent, name ) +KDockWidgetAbstractHeader::KDockWidgetAbstractHeader( KDockWidget* parent, const char* name ) +:TQFrame( parent, name ) { } /*************************************************************************/ -KDockWidgetHeader::KDockWidgetHeader( KDockWidget* tqparent, const char* name ) -:KDockWidgetAbstractHeader( tqparent, name ) +KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) +:KDockWidgetAbstractHeader( parent, name ) { #ifdef BORDERLESS_WINDOWS setCursor(TQCursor(ArrowCursor)); @@ -224,14 +224,14 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* tqparent, const char* name ) tqlayout = new TQHBoxLayout( this ); tqlayout->setResizeMode( TQLayout::Minimum ); - drag = new KDockWidgetHeaderDrag( this, tqparent ); + drag = new KDockWidgetHeaderDrag( this, parent ); closeButton = new KDockButton_Private( this, "DockCloseButton" ); TQToolTip::add( closeButton, i18n("Close") ); closeButton->setPixmap( tqstyle().stylePixmap (TQStyle::SP_TitleBarCloseButton , this)); closeButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( closeButton, TQT_SIGNAL(clicked()), tqparent, TQT_SIGNAL(headerCloseButtonClicked())); - connect( closeButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(undock())); + connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked())); + connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock())); stayButton = new KDockButton_Private( this, "DockStayButton" ); TQToolTip::add( stayButton, i18n("Freeze the window tqgeometry", "Freeze") ); @@ -244,14 +244,14 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* tqparent, const char* name ) TQToolTip::add( dockbackButton, i18n("Dock this window", "Dock") ); dockbackButton->setPixmap( const_cast< const char** >(dockback_xpm)); dockbackButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( dockbackButton, TQT_SIGNAL(clicked()), tqparent, TQT_SIGNAL(headerDockbackButtonClicked())); - connect( dockbackButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(dockBack())); + connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerDockbackButtonClicked())); + connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(dockBack())); d->toDesktopButton = new KDockButton_Private( this, "ToDesktopButton" ); TQToolTip::add( d->toDesktopButton, i18n("Detach") ); d->toDesktopButton->setPixmap( const_cast< const char** >(todesktop_xpm)); d->toDesktopButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( d->toDesktopButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(toDesktop())); + connect( d->toDesktopButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(toDesktop())); stayButton->hide(); d->dummy = new TQWidget( this ); @@ -273,7 +273,7 @@ void KDockWidgetHeader::setTopLevel( bool isTopLevel ) { d->topLevel = isTopLevel; if ( isTopLevel ){ - KDockWidget* par = (KDockWidget*)tqparent(); + KDockWidget* par = (KDockWidget*)parent(); if( par) { if( par->isDockBackPossible()) dockbackButton->show(); @@ -425,12 +425,12 @@ void KDockWidgetHeader::setDragEnabled(bool b) #ifndef NO_KDE2 void KDockWidgetHeader::saveConfig( KConfig* c ) { - c->writeEntry( TQString("%1%2").tqarg(tqparent()->name()).tqarg(":stayButton"), stayButton->isOn() ); + c->writeEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), stayButton->isOn() ); } void KDockWidgetHeader::loadConfig( KConfig* c ) { - setDragEnabled( !c->readBoolEntry( TQString("%1%2").tqarg(tqparent()->name()).tqarg(":stayButton"), false ) ); + setDragEnabled( !c->readBoolEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), false ) ); } #endif @@ -479,11 +479,11 @@ public: /*************************************************************************/ -KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel, WFlags f) +KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel, WFlags f) #ifdef BORDERLESS_WINDOWS -: TQWidget( tqparent, name, f )//| WType_Dialog | WStyle_Customize | WStyle_NoBorder ) +: TQWidget( parent, name, f )//| WType_Dialog | WStyle_Customize | WStyle_NoBorder ) #else -: TQWidget( tqparent, name, f ) +: TQWidget( parent, name, f ) #endif ,formerBrotherDockWidget(0L) ,currentDockPos(DockNone) @@ -495,7 +495,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP { d = new KDockWidgetPrivate(); // create private data - d->_parent = tqparent; + d->_parent = parent; tqlayout = new TQVBoxLayout( this ); tqlayout->setResizeMode( TQLayout::Minimum ); @@ -526,7 +526,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP widget = 0L; TQObject::connect(this, TQT_SIGNAL(hasUndocked()), manager->main, TQT_SLOT(slotDockWidgetUndocked()) ); - applyToWidget( tqparent, TQPoint(0,0) ); + applyToWidget( parent, TQPoint(0,0) ); } void KDockWidget::setPixmap(const TQPixmap& pixmap) { @@ -585,7 +585,7 @@ void KDockWidget::leaveEvent(TQEvent *e) { TQWidget::leaveEvent(e); #ifdef BORDERLESS_WINDOWS - if (tqparent()) return; + if (parent()) return; // setCursor(TQCursor(ArrowCursor)); #endif } @@ -593,7 +593,7 @@ void KDockWidget::leaveEvent(TQEvent *e) void KDockWidget::mousePressEvent(TQMouseEvent* mme) { #ifdef BORDERLESS_WINDOWS - if (!tqparent()) + if (!parent()) { kdDebug(282)<<"KDockWidget::mousePressEvent"<<endl; @@ -663,7 +663,7 @@ void KDockWidget::mouseMoveEvent(TQMouseEvent* mme) { TQWidget::mouseMoveEvent(mme); #ifdef BORDERLESS_WINDOWS - if (tqparent()) return; + if (parent()) return; if (d->resizing) { @@ -772,14 +772,14 @@ void KDockWidget::setEnableDocking( int pos ) void KDockWidget::updateHeader() { - if ( tqparent() ){ + if ( parent() ){ #ifdef BORDERLESS_WINDOWS tqlayout->setMargin(0); setMouseTracking(false); setCursor(TQCursor(ArrowCursor)); #endif - if ( (TQT_BASE_OBJECT(tqparent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == KDockWidget::DockNone) ){ + if ( (TQT_BASE_OBJECT(parent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == KDockWidget::DockNone) ){ header->hide(); } else { header->setTopLevel( false ); @@ -800,7 +800,7 @@ void KDockWidget::updateHeader() void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p ) { - if ( TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(s) ) + if ( TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(s) ) { hide(); reparent(s, 0, TQPoint(0,0), false); @@ -840,11 +840,11 @@ void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p ) void KDockWidget::show() { - if ( tqparent() || manager->main->isVisible() ) - if ( !tqparent() ){ + if ( parent() || manager->main->isVisible() ) + if ( !parent() ){ emit manager->setDockDefaultPos( this ); emit setDockDefaultPos(); - if ( tqparent() ){ + if ( parent() ){ makeDockVisible(); } else { TQWidget::show(); @@ -864,9 +864,9 @@ void KDockWidget::setDockWindowType (NET::WindowType windowType) #endif -void KDockWidget::setDockWindowTransient (TQWidget *tqparent, bool transientEnabled) +void KDockWidget::setDockWindowTransient (TQWidget *parent, bool transientEnabled) { - d->_parent = tqparent; + d->_parent = parent; d->transient = transientEnabled; applyToWidget( parentWidget(), TQPoint(0,0) ); } @@ -900,8 +900,8 @@ bool KDockWidget::event( TQEvent *event ) break; case TQEvent::CaptionChange: if ( parentWidget() ){ - if ( tqparent()->inherits("KDockSplitter") ){ - ((KDockSplitter*)(tqparent()))->updateName(); + if ( parent()->inherits("KDockSplitter") ){ + ((KDockSplitter*)(parent()))->updateName(); } if ( parentDockTabGroup() ){ setDockTabName( parentDockTabGroup() ); @@ -920,18 +920,18 @@ bool KDockWidget::event( TQEvent *event ) KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) { - if (!tqparent()) return 0; - if (!tqparent()->inherits("KDockSplitter")) return 0; + if (!parent()) return 0; + if (!parent()->inherits("KDockSplitter")) return 0; Qt::Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ?Qt::Vertical:Qt::Horizontal; - if (((KDockSplitter*)(tqparent()))->orientation()==orientation) + if (((KDockSplitter*)(parent()))->orientation()==orientation) { KDockWidget *neighbor= ((pos==DockLeft)||(pos==DockTop))? - static_cast<KDockWidget*>(((KDockSplitter*)(tqparent()))->getFirst()): - static_cast<KDockWidget*>(((KDockSplitter*)(tqparent()))->getLast()); + static_cast<KDockWidget*>(((KDockSplitter*)(parent()))->getFirst()): + static_cast<KDockWidget*>(((KDockSplitter*)(parent()))->getLast()); if (neighbor==this) - return (static_cast<KDockWidget*>(TQT_TQWIDGET(tqparent()->tqparent()))->findNearestDockWidget(pos)); + return (static_cast<KDockWidget*>(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos)); else if (neighbor->getWidget() && (neighbor->getWidget()->qt_cast("KDockTabGroup"))) return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0)); @@ -939,7 +939,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) return neighbor; } else - return (static_cast<KDockWidget*>(TQT_TQWIDGET(tqparent()->tqparent()))->findNearestDockWidget(pos)); + return (static_cast<KDockWidget*>(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos)); return 0; } @@ -983,10 +983,10 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, // kdDebug(282)<<"KDockWidget::manualDock(): success = false (2)"<<endl; } - if ( tqparent() && !tqparent()->inherits("KDockSplitter") && !parentDockTabGroup() && - !(dynamic_cast<KDockContainer*>(tqparent())) && !parentDockContainer()){ + if ( parent() && !parent()->inherits("KDockSplitter") && !parentDockTabGroup() && + !(dynamic_cast<KDockContainer*>(parent())) && !parentDockContainer()){ // kdDebug(282)<<"KDockWidget::manualDock(): success = false (3)"<<endl; -// kdDebug(282)<<tqparent()->name()<<endl; +// kdDebug(282)<<parent()->name()<<endl; succes = false; } @@ -1037,7 +1037,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, currentDockPos = KDockWidget::DockCenter; emit manager->change(); - return (KDockWidget*)parentTab->tqparent(); + return (KDockWidget*)parentTab->parent(); } else { @@ -1199,7 +1199,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, KDockTabGroup* KDockWidget::parentDockTabGroup() const { - if ( !tqparent() ) return 0L; + if ( !parent() ) return 0L; TQWidget* candidate = parentWidget()->parentWidget(); if ( candidate && candidate->inherits("KDockTabGroup") ) return (KDockTabGroup*)candidate; return 0L; @@ -1207,7 +1207,7 @@ KDockTabGroup* KDockWidget::parentDockTabGroup() const TQWidget *KDockWidget::parentDockContainer() const { - if (!tqparent()) return 0L; + if (!parent()) return 0L; TQWidget* candidate = parentWidget()->parentWidget(); if (candidate && dynamic_cast<KDockContainer*>(candidate)) return candidate; return 0L; @@ -1218,18 +1218,18 @@ void KDockWidget::setForcedFixedWidth(int w) { d->forcedWidth=w; setFixedWidth(w); - if (!tqparent()) return; - if (tqparent()->inherits("KDockSplitter")) - static_cast<KDockSplitter*>(tqparent()->qt_cast("KDockSplitter"))->setForcedFixedWidth(this,w); + if (!parent()) return; + if (parent()->inherits("KDockSplitter")) + static_cast<KDockSplitter*>(parent()->qt_cast("KDockSplitter"))->setForcedFixedWidth(this,w); } void KDockWidget::setForcedFixedHeight(int h) { d->forcedHeight=h; setFixedHeight(h); - if (!tqparent()) return; - if (tqparent()->inherits("KDockSplitter")) - static_cast<KDockSplitter*>(tqparent()->qt_cast("KDockSplitter"))->setForcedFixedHeight(this,h); + if (!parent()) return; + if (parent()->inherits("KDockSplitter")) + static_cast<KDockSplitter*>(parent()->qt_cast("KDockSplitter"))->setForcedFixedHeight(this,h); } int KDockWidget::forcedFixedWidth() @@ -1249,9 +1249,9 @@ void KDockWidget::restoreFromForcedFixedSize() setMaximumWidth(32000); setMinimumHeight(0); setMaximumHeight(32000); - if (!tqparent()) return; - if (tqparent()->inherits("KDockSplitter")) - static_cast<KDockSplitter*>(tqparent()->qt_cast("KDockSplitter"))->restoreFromForcedFixedSize(this); + if (!parent()) return; + if (parent()->inherits("KDockSplitter")) + static_cast<KDockSplitter*>(parent()->qt_cast("KDockSplitter"))->restoreFromForcedFixedSize(this); } void KDockWidget::toDesktop() @@ -1314,8 +1314,8 @@ void KDockWidget::undock() lastTab->applyToWidget( 0L ); lastTab->move( parentTab->mapToGlobal(parentTab->frameGeometry().topLeft()) ); - // KDockTabGroup always have a tqparent that is a KDockWidget - KDockWidget* parentOfTab = (KDockWidget*)parentTab->tqparent(); + // KDockTabGroup always have a parent that is a KDockWidget + KDockWidget* parentOfTab = (KDockWidget*)parentTab->parent(); delete parentTab; // KDockTabGroup TQWidget* parentOfDockWidget = parentOfTab->parentWidget(); @@ -1328,13 +1328,13 @@ void KDockWidget::undock() split->deactivate(); if ( split->getFirst() == parentOfTab ){ split->activate( lastTab ); - if ( ((KDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical ) + if ( ((KDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical ) emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockLeft ); else emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockTop ); } else { split->activate( 0L, lastTab ); - if ( ((KDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical ) + if ( ((KDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical ) emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockRight ); else emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockBottom ); @@ -1357,7 +1357,7 @@ void KDockWidget::undock() } } else { /*********************************************************************************************/ - //TQWidget* containerWidget = (TQWidget*)tqparent(); + //TQWidget* containerWidget = (TQWidget*)parent(); bool undockedFromContainer=false; if (d->container) { @@ -1430,7 +1430,7 @@ void KDockWidget::setWidget( TQWidget* mw ) { if ( !mw ) return; - if ( TQT_BASE_OBJECT(mw->tqparent()) != TQT_BASE_OBJECT(this) ){ + if ( TQT_BASE_OBJECT(mw->parent()) != TQT_BASE_OBJECT(this) ){ mw->reparent(this, 0, TQPoint(0,0), false); } @@ -1479,20 +1479,20 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab ) tab->parentWidget()->setCaption( listOfCaption ); tab->parentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint - if ( tab->parentWidget()->tqparent() ) - if ( tab->parentWidget()->tqparent()->inherits("KDockSplitter") ) - ((KDockSplitter*)(tab->parentWidget()->tqparent()))->updateName(); + if ( tab->parentWidget()->parent() ) + if ( tab->parentWidget()->parent()->inherits("KDockSplitter") ) + ((KDockSplitter*)(tab->parentWidget()->parent()))->updateName(); } bool KDockWidget::mayBeHide() const { - bool f = (TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(manager->main)); + bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main)); return ( !isGroup && !isTabGroup && f && isVisible() && ( eDocking != (int)KDockWidget::DockNone ) ); } bool KDockWidget::mayBeShow() const { - bool f = (TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(manager->main)); + bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main)); return ( !isGroup && !isTabGroup && f && !isVisible() ); } @@ -1532,7 +1532,7 @@ void KDockWidget::makeDockVisible() p->show(); p = p->parentWidget(); } - if( !tqparent() ) // is undocked + if( !parent() ) // is undocked dockBack(); show(); } @@ -1582,7 +1582,7 @@ void KDockWidget::dockBack() // else dockback to the dockmainwindow (default behavior) manualDock( ((KDockMainWindow*)manager->main)->getMainDockWidget(), formerDockPos, d->splitPosInPercent, TQPoint(0,0), false, d->index); formerBrotherDockWidget = 0L; - if (tqparent()) + if (parent()) makeDockVisible(); } @@ -1753,7 +1753,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) #ifdef BORDERLESS_WINDOWS //BEGIN TEST KDockWidget *oldMoveWidget; - if (!curdw->tqparent()) + if (!curdw->parent()) { curdw->move(TQCursor::pos()-d->dragOffset); pDockWdgAtCursor = findDockWidgetAt( TQCursor::pos()-TQPoint(0,d->dragOffset.y()+3) ); @@ -2019,7 +2019,7 @@ void KDockManager::drop() drawDragRectangle(); // only the old rect will be deleted return; } - if ( !currentMoveWidget && !currentDragWidget->tqparent() ) { + if ( !currentMoveWidget && !currentDragWidget->parent() ) { currentDragWidget->move( TQCursor::pos() - d->dragOffset ); } else { @@ -2159,7 +2159,7 @@ void KDockManager::writeConfig(TQDomElement &base) TQObjectListIt it(*childDock); KDockWidget *obj1; while ( (obj1=(KDockWidget*)it.current()) ) { - if ( TQT_BASE_OBJECT(obj1->tqparent()) == TQT_BASE_OBJECT(main) ) + if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) ) mainWidgetStr = TQString::tqfromLatin1(obj1->name()); nList.append(obj1->name()); ++it; @@ -2210,7 +2210,7 @@ void KDockManager::writeConfig(TQDomElement &base) list.append( ((KDockTabGroup*)obj->widget)->page( i )->name() ); groupEl.appendChild(createListEntry(doc, "tabs", "tab", list)); groupEl.appendChild(createNumberEntry(doc, "currentTab", ((KDockTabGroup*)obj->widget)->currentPageIndex())); - if (!obj->tqparent()) { + if (!obj->parent()) { groupEl.appendChild(createStringEntry(doc, "dockBackTo", obj->formerBrotherDockWidget ? obj->formerBrotherDockWidget->name() : "")); groupEl.appendChild(createNumberEntry(doc, "dockBackToPos", obj->formerDockPos)); } @@ -2219,15 +2219,15 @@ void KDockManager::writeConfig(TQDomElement &base) groupEl = doc.createElement("dock"); groupEl.appendChild(createStringEntry(doc, "tabCaption", obj->tabPageLabel())); groupEl.appendChild(createStringEntry(doc, "tabToolTip", obj->toolTipString())); - if (!obj->tqparent()) { + if (!obj->parent()) { groupEl.appendChild(createStringEntry(doc, "dockBackTo", obj->formerBrotherDockWidget ? obj->formerBrotherDockWidget->name() : "")); groupEl.appendChild(createNumberEntry(doc, "dockBackToPos", obj->formerDockPos)); } } groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name()))); - groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->tqparent())); - if ( !obj->tqparent() ) { + groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent())); + if ( !obj->parent() ) { groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size()))); groupEl.appendChild(createBoolEntry(doc, "visible", obj->isVisible())); } @@ -2276,7 +2276,7 @@ void KDockManager::readConfig(TQDomElement &base) KDockWidget *obj1; while ( (obj1=(KDockWidget*)it.current()) ) { if ( !obj1->isGroup && !obj1->isTabGroup ) { - if ( obj1->tqparent() ) + if ( obj1->parent() ) obj1->undock(); else obj1->hide(); @@ -2494,7 +2494,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) ++it; //debug(" +Add subdock %s", obj->name()); nList.append( obj->name() ); - if ( TQT_BASE_OBJECT(obj->tqparent()) == TQT_BASE_OBJECT(main) ) + if ( TQT_BASE_OBJECT(obj->parent()) == TQT_BASE_OBJECT(main) ) c->writeEntry( "Main:view", obj->name() ); } @@ -2527,12 +2527,12 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) if ( (findList.find( obj->firstName ) != findList.end()) && (findList.find( obj->lastName ) != findList.end() )){ c->writeEntry( cname+":type", "GROUP"); - if ( !obj->tqparent() ){ - c->writeEntry( cname+":tqparent", "___null___"); + if ( !obj->parent() ){ + c->writeEntry( cname+":parent", "___null___"); c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); c->writeEntry( cname+":visible", obj->isVisible()); } else { - c->writeEntry( cname+":tqparent", "yes"); + c->writeEntry( cname+":parent", "yes"); } c->writeEntry( cname+":first_name", obj->firstName ); c->writeEntry( cname+":last_name", obj->lastName ); @@ -2559,14 +2559,14 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) /*************************************************************************************************/ if ( obj->isTabGroup){ c->writeEntry( cname+":type", "TAB_GROUP"); - if ( !obj->tqparent() ){ - c->writeEntry( cname+":tqparent", "___null___"); + if ( !obj->parent() ){ + c->writeEntry( cname+":parent", "___null___"); c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); c->writeEntry( cname+":visible", obj->isVisible()); c->writeEntry( cname+":dockBackTo", obj->formerBrotherDockWidget ? obj->formerBrotherDockWidget->name() : ""); c->writeEntry( cname+":dockBackToPos", obj->formerDockPos); } else { - c->writeEntry( cname+":tqparent", "yes"); + c->writeEntry( cname+":parent", "yes"); } TQStrList list; for ( int i = 0; i < ((KDockTabGroup*)obj->widget)->count(); ++i ) @@ -2583,7 +2583,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) /*************************************************************************************************/ c->writeEntry( cname+":tabCaption", obj->tabPageLabel()); c->writeEntry( cname+":tabToolTip", obj->toolTipString()); - if ( !obj->tqparent() ){ + if ( !obj->parent() ){ c->writeEntry( cname+":type", "NULL_DOCK"); c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); c->writeEntry( cname+":visible", obj->isVisible()); @@ -2646,7 +2646,7 @@ void KDockManager::readConfig( KConfig* c, TQString group ) ++it; if ( !obj->isGroup && !obj->isTabGroup ) { - if ( obj->tqparent() ) obj->undock(); else obj->hide(); + if ( obj->parent() ) obj->undock(); else obj->hide(); } } @@ -2659,7 +2659,7 @@ void KDockManager::readConfig( KConfig* c, TQString group ) TQString type = c->readEntry( oname + ":type" ); obj = 0L; - if ( type == "NULL_DOCK" || c->readEntry( oname + ":tqparent") == "___null___" ){ + if ( type == "NULL_DOCK" || c->readEntry( oname + ":parent") == "___null___" ){ TQRect r = c->readRectEntry( oname + ":tqgeometry" ); obj = getDockWidgetFromName( oname ); obj->applyToWidget( 0L ); @@ -2753,7 +2753,7 @@ void KDockManager::readConfig( KConfig* c, TQString group ) TQString type = c->readEntry( oname + ":type" ); obj = 0L; - if ( type == "NULL_DOCK" || c->readEntry( oname + ":tqparent") == "___null___" ){ + if ( type == "NULL_DOCK" || c->readEntry( oname + ":parent") == "___null___" ){ obj = getDockWidgetFromName( oname ); c->setGroup( group ); TQString name = c->readEntry( oname + ":dockBackTo" ); @@ -2986,8 +2986,8 @@ void KDockManager::setSpecialBottomDockContainer(KDockWidget* container) { } -KDockArea::KDockArea( TQWidget* tqparent, const char *name) -:TQWidget( tqparent, name) +KDockArea::KDockArea( TQWidget* parent, const char *name) +:TQWidget( parent, name) { TQString new_name = TQString(name) + TQString("_DockManager"); dockManager = new KDockManager( this, new_name.latin1() ); @@ -2999,9 +2999,9 @@ KDockArea::~KDockArea() delete dockManager; } -KDockWidget* KDockArea::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel) +KDockWidget* KDockArea::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel) { - return new KDockWidget( dockManager, name.latin1(), pixmap, tqparent, strCaption, strTabPageLabel ); + return new KDockWidget( dockManager, name.latin1(), pixmap, parent, strCaption, strTabPageLabel ); } void KDockArea::makeDockVisible( KDockWidget* dock ) @@ -3119,10 +3119,10 @@ void KDockContainer::activateOverlapMode(int nonOverlapSize) { m_nonOverlapSize=nonOverlapSize; m_overlapMode=true; if (parentDockWidget()) { - if (parentDockWidget()->tqparent()) { + if (parentDockWidget()->parent()) { kdDebug(282)<<"KDockContainer::activateOverlapMode: recalculating sizes"<<endl; KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()-> - tqparent()->qt_cast("KDockSplitter")); + parent()->qt_cast("KDockSplitter")); if (sp) sp->resizeEvent(0); } } @@ -3132,10 +3132,10 @@ void KDockContainer::deactivateOverlapMode() { if (!m_overlapMode) return; m_overlapMode=false; if (parentDockWidget()) { - if (parentDockWidget()->tqparent()) { + if (parentDockWidget()->parent()) { kdDebug(282)<<"KDockContainer::deactivateOverlapMode: recalculating sizes"<<endl; KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()-> - tqparent()->qt_cast("KDockSplitter")); + parent()->qt_cast("KDockSplitter")); if (sp) sp->resizeEvent(0); } } diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.h b/lib/compatibility/kmdi/qextmdi/kdockwidget.h index 5d0bbe86..9e0e43d5 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.h +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.h @@ -111,10 +111,10 @@ public: /** * Constructs this. * - * @param tqparent the tqparent widget (usually a dockwidget) + * @param parent the parent widget (usually a dockwidget) * @param name the object instance name */ - KDockWidgetAbstractHeader( KDockWidget* tqparent, const char* name = 0L ); + KDockWidgetAbstractHeader( KDockWidget* parent, const char* name = 0L ); /** * Destructs this. @@ -161,11 +161,11 @@ public: /** * Constructs this. * - * @param tqparent the tqparent widget (usually a dockwidget header) + * @param parent the parent widget (usually a dockwidget header) * @param dock the dockwidget where it belongs to * @param name the object instance name */ - KDockWidgetAbstractHeaderDrag( KDockWidgetAbstractHeader* tqparent, + KDockWidgetAbstractHeaderDrag( KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name = 0L ); /** @@ -207,11 +207,11 @@ public: /** * Constructs this. * - * @param tqparent the tqparent widget (usually a dockwidget header) + * @param parent the parent widget (usually a dockwidget header) * @param dock the dockwidget where it belongs to * @param name the object instance name */ - KDockWidgetHeaderDrag( KDockWidgetAbstractHeader* tqparent, KDockWidget* dock, + KDockWidgetHeaderDrag( KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name = 0L ); /** @@ -249,10 +249,10 @@ public: /** * Constructs this. * - * @param tqparent the tqparent widget (usually a dockwidget) + * @param parent the parent widget (usually a dockwidget) * @param name the object instance name */ - KDockWidgetHeader( KDockWidget* tqparent, const char* name = 0L ); + KDockWidgetHeader( KDockWidget* parent, const char* name = 0L ); /** * Destructs this. @@ -374,8 +374,8 @@ public: /** * Constructs this. It just calls the method of the base class. */ - KDockTabGroup( TQWidget *tqparent = 0, const char *name = 0 ) - :TQTabWidget( tqparent, name ){}; + KDockTabGroup( TQWidget *parent = 0, const char *name = 0 ) + :TQTabWidget( parent, name ){}; /** * Destructs a KDockTabGroup. @@ -396,7 +396,7 @@ private: * encapsulate the actual widgets (and member of the dockwidget class * set). * - * You just grip the double-lined panel, tear it off its tqparent + * You just grip the double-lined panel, tear it off its parent * widget, drag it somewhere and let it loose. Depending on the * position where you leave it, the dockwidget becomes a toplevel * window on the desktop (floating mode) or docks to a new widget @@ -415,7 +415,7 @@ private: * KDockMainWindow* mainWidget; * ... * KDockWidget* dock = 0L; - * dock = mainWidget->createDockWidget( "Any window caption", nicePixmap, 0L, i18n("window caption")); // 0L==no tqparent + * dock = mainWidget->createDockWidget( "Any window caption", nicePixmap, 0L, i18n("window caption")); // 0L==no parent * TQWidget* actualWidget = new TQWidget( dock); * dock->setWidget( actualWidget); // embed it * dock->setToolTipString(i18n("That's me")); // available when appearing as tab page @@ -447,13 +447,13 @@ public: * @param dockManager The responsible manager (dock helper) * @param name Object instance name * @param pixmap An icon (for instance shown when docked centered) - * @param tqparent Parent widget + * @param parent Parent widget * @param strCaption Title of the dockwidget window (shown when toplevel) * @param strTabPageLabel The title of the tab page (shown when in tab page mode), if it is "", only the icon will be shown, if it is 0L, the label is set to strCaption * @param f TQt::WidgetFlags widget flags */ KDockWidget( KDockManager* dockManager, const char* name, - const TQPixmap &pixmap, TQWidget* tqparent = 0L, const TQString& strCaption = TQString(), + const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ), WFlags f = 0); /** @@ -487,8 +487,8 @@ public: * * If the target is null, it will become a toplevel dockwidget at position pos; * Note: Docking to another dockwidget means exactly: - * A new tqparent dockwidget will be created, that replaces the target dockwidget and contains another single helper widget (tab widget or panner) - * which contains both dockwidgets, this and the target dockwidget. So consider tqparent<->child relationships change completely during such actions. + * A new parent dockwidget will be created, that replaces the target dockwidget and contains another single helper widget (tab widget or panner) + * which contains both dockwidgets, this and the target dockwidget. So consider parent<->child relationships change completely during such actions. * * @param target The dockwidget to dock to * @param dockPos One of the DockPositions this is going to dock to @@ -496,7 +496,7 @@ public: * @param pos The dock position, mainly of interest for docking to the desktop (as toplevel dockwidget) * @param check Only for internal use; * @param tabIndex The position index of the tab widget (when in tab page mode), -1 (default) means append - * @return result The group dockwidget that replaces the target dockwidget and will be grandtqparent of target and @p this. + * @return result The group dockwidget that replaces the target dockwidget and will be grandparent of target and @p this. */ KDockWidget* manualDock( KDockWidget* target, DockPosition dockPos, int spliPos = 50, TQPoint pos = TQPoint(0,0), bool check = false, int tabIndex = -1); @@ -568,7 +568,7 @@ public: * There are reasons that it's impossible: * @li It is a (tab) group. * @li It is already invisible ;-) - * @li The tqparent of this is the KDockMainWindow. + * @li The parent of this is the KDockMainWindow. * @li It isn't able to dock to another widget. */ bool mayBeHide() const; @@ -578,7 +578,7 @@ public: * There are reasons that it's impossible: * @li It is a (tab) group. * @li It is already visible ;-) - * @li The tqparent of this is the @p KDockMainWindow. + * @li The parent of this is the @p KDockMainWindow. */ bool mayBeShow() const; @@ -630,7 +630,7 @@ public: */ virtual void show(); /** - * @return the tqparent widget of this if it inherits class KDockTabGroup + * @return the parent widget of this if it inherits class KDockTabGroup */ KDockTabGroup* parentDockTabGroup() const; @@ -648,7 +648,7 @@ public: #endif - void setDockWindowTransient (TQWidget *tqparent, bool transientEnabled); + void setDockWindowTransient (TQWidget *parent, bool transientEnabled); /** * Returns the widget this dockwidget is set transient to, otherwise 0 @@ -738,7 +738,7 @@ protected: /** * Checks some conditions and shows or hides the dockwidget header (drag panel). * The header is hidden if: - * @li the tqparent widget is the KDockMainWindow + * @li the parent widget is the KDockMainWindow * @li this is a (tab) group dockwidget * @li it is not able to dock to another dockwidget */ @@ -837,7 +837,7 @@ private: void setDockTabName( KDockTabGroup* g); /** - * Retqparent to s or set this to the KDockMainWindow's view if s is that dockmainwindow. + * Reparent to s or set this to the KDockMainWindow's view if s is that dockmainwindow. * If s is O, simply move the widget. * * @param s the target widget to reparent to @@ -988,7 +988,7 @@ public: /** * Shows all encapsulated widgets of all controlled dockwidgets and shows all dockwidgets which are - * tqparent of a dockwidget tab group. + * parent of a dockwidget tab group. */ void activate(); @@ -1090,7 +1090,7 @@ signals: void replaceDock( KDockWidget* oldDock, KDockWidget* newDock ); /** - * Signals a dockwidget without tqparent (toplevel) is shown. + * Signals a dockwidget without parent (toplevel) is shown. */ void setDockDefaultPos( KDockWidget* ); @@ -1144,7 +1144,7 @@ private: * Finds the TQWidget recursively at the position given as parameter * * @param w a variable where the method puts the TQWidget at that position (instead of a return value) - * @param p the tqparent widget where the recursive search should start from + * @param p the parent widget where the recursive search should start from * @param pos global (desktop) position of the wanted dockwidget */ void findChildDockWidget( TQWidget*& w, const TQWidget* p, const TQPoint& pos ); @@ -1152,7 +1152,7 @@ private: /** * Finds all dockwidgets which are child, grandchild and so on of p. * - * @param p the tqparent widget where the recursive search starts from + * @param p the parent widget where the recursive search starts from * @param l the widget list that contains the search result after the return of this method */ void findChildDockWidget( const TQWidget* p, TQWidgetList*& l); @@ -1323,11 +1323,11 @@ public: * @li ...and gets initialized * @li the main dockwidget is set to 0 * - * @param tqparent Parent widget for the dock main widget + * @param parent Parent widget for the dock main widget * @param name internal object name * @param f TQt::WidgetFlags widget flags */ - KDockMainWindow( TQWidget* tqparent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose ); + KDockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose ); /** * Destructs a dockmainwindow. @@ -1362,12 +1362,12 @@ public: * * @param name TQObject name (default dockwidget caption) * @param pixmap window icon (for instance shown when docked as tabwidget entry) - * @param tqparent tqparent widget for the new dockwidget + * @param parent parent widget for the new dockwidget * @param strCaption window title (shown when toplevel) * @param strTabPageLabel title of the tab page (visible when in tab page mode), if it is "", only the icon will be shown; if it is 0L, the label is set to strCaption * @return a pointer to the new created dockwidget */ - KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent = 0L, + KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) ); /** @@ -1483,7 +1483,7 @@ friend class KDockManager; public: - KDockArea( TQWidget* tqparent = 0L, const char *name = 0L); + KDockArea( TQWidget* parent = 0L, const char *name = 0L); virtual ~KDockArea(); @@ -1493,7 +1493,7 @@ public: void setMainDockWidget( KDockWidget* ); KDockWidget* getMainDockWidget(){ return mainDockWidget; } - KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent = 0L, + KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) ); void writeDockConfig(TQDomElement &base); diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp index 19a88368..331b9082 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp @@ -26,8 +26,8 @@ #include <tqtimer.h> #include <tqapplication.h> -KDockSplitter::KDockSplitter(TQWidget *tqparent, const char *name, Qt::Orientation orient, int pos, bool highResolution) -: TQWidget(tqparent, name) +KDockSplitter::KDockSplitter(TQWidget *parent, const char *name, Qt::Orientation orient, int pos, bool highResolution) +: TQWidget(parent, name) { m_dontRecalc=false; divider = 0L; @@ -540,8 +540,8 @@ bool KDockSplitter::highResolution() const /*************************************************************************/ -KDockButton_Private::KDockButton_Private( TQWidget *tqparent, const char * name ) -:TQPushButton( tqparent, name ) +KDockButton_Private::KDockButton_Private( TQWidget *parent, const char * name ) +:TQPushButton( parent, name ) { moveMouse = false; setFocusPolicy( TQ_NoFocus ); diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h index 4f9c119f..7d131111 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h @@ -45,7 +45,7 @@ class KDEUI_EXPORT KDockSplitter : public TQWidget Q_OBJECT TQ_OBJECT public: - KDockSplitter(TQWidget *tqparent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50, bool highResolution=false); + KDockSplitter(TQWidget *parent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50, bool highResolution=false); virtual ~KDockSplitter(){}; void activate(TQWidget *c0, TQWidget *c1 = 0L); @@ -120,7 +120,7 @@ class KDEUI_EXPORT KDockButton_Private : public TQPushButton Q_OBJECT TQ_OBJECT public: - KDockButton_Private( TQWidget *tqparent=0, const char *name=0 ); + KDockButton_Private( TQWidget *parent=0, const char *name=0 ); ~KDockButton_Private(); protected: @@ -186,8 +186,8 @@ class KDEUI_EXPORT KDockWidgetHeaderPrivate : public TQObject { public: - KDockWidgetHeaderPrivate( TQObject* tqparent ) - : TQObject( tqparent ) + KDockWidgetHeaderPrivate( TQObject* parent ) + : TQObject( parent ) { forceCloseButtonHidden=false; toDesktopButton = 0; diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp index 63a860e7..1951118f 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp @@ -45,8 +45,8 @@ //============ KMdiChildArea ============// -KMdiChildArea::KMdiChildArea( TQWidget *tqparent ) - : TQFrame( tqparent, "kmdi_childarea" ) +KMdiChildArea::KMdiChildArea( TQWidget *parent ) + : TQFrame( parent, "kmdi_childarea" ) { setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); m_captionFont = TQFont(); diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h b/lib/compatibility/kmdi/qextmdi/kmdichildarea.h index 45df1eff..2ab456b7 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h +++ b/lib/compatibility/kmdi/qextmdi/kmdichildarea.h @@ -102,7 +102,7 @@ public: /** * Consruction. Note: This class needn't to know about KMdiMainFrm . */ - KMdiChildArea( TQWidget *tqparent ); + KMdiChildArea( TQWidget *parent ); /** * Destructor : THERE should be no child windows anymore... diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp index b57b93a8..9667518a 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp @@ -85,8 +85,8 @@ #include "kde2laptop_undockbutton.xpm" -KMdiWin32IconButton::KMdiWin32IconButton( TQWidget* tqparent, const char* name ) - : TQLabel( tqparent, name ) +KMdiWin32IconButton::KMdiWin32IconButton( TQWidget* parent, const char* name ) + : TQLabel( parent, name ) {} //============ mousePressEvent ============// @@ -98,8 +98,8 @@ void KMdiWin32IconButton::mousePressEvent( TQMouseEvent* ) //============ KMdiChildFrm ============// -KMdiChildFrm::KMdiChildFrm( KMdiChildArea *tqparent ) - : TQFrame( tqparent, "kmdi_childfrm" ) +KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent ) + : TQFrame( parent, "kmdi_childfrm" ) , m_pClient( 0L ) , m_pManager( 0L ) , m_pCaption( 0L ) @@ -129,7 +129,7 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *tqparent ) { m_pCaption = new KMdiChildFrmCaption( this ); - m_pManager = tqparent; + m_pManager = parent; m_pWinIcon = new KMdiWin32IconButton( m_pCaption, "kmdi_iconbutton_icon" ); m_pUnixIcon = new TQToolButton( m_pCaption, "kmdi_toolbutton_icon" ); @@ -774,8 +774,8 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) } delete list; // delete the list, not the objects - //Retqparent if needed - if ( TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(this) ) + //Reparent if needed + if ( TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(this) ) { //reparent to this widget , no flags , point , show it TQPoint pnt2( KMDI_CHILDFRM_BORDER, clientYPos ); @@ -1068,7 +1068,7 @@ void KMdiChildFrm::doResize( bool captionOnly ) static bool hasParent( TQObject* par, TQObject* o ) { while ( o && o != par ) - o = o->tqparent(); + o = o->parent(); return o == par; } @@ -1086,7 +1086,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) while ( ( pObj != 0L ) && !bIsChild ) { bIsChild = ( TQT_BASE_OBJECT(pObj) == TQT_BASE_OBJECT(this) ); - pObj = pObj->tqparent(); + pObj = pObj->parent(); } // unset the resize cursor if the cursor moved from the frame into a inner widget if ( bIsChild ) @@ -1112,7 +1112,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) m_pClient->activate(); } - if ( ( TQT_BASE_OBJECT(obj->tqparent()) != TQT_BASE_OBJECT(m_pCaption) ) && ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(m_pCaption) ) ) + if ( ( TQT_BASE_OBJECT(obj->parent()) != TQT_BASE_OBJECT(m_pCaption) ) && ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(m_pCaption) ) ) { TQWidget* w = ( TQWidget* ) obj; if ( ( w->focusPolicy() == TQ_ClickFocus ) || ( w->focusPolicy() == TQ_StrongFocus ) ) diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h index c808e088..9569094a 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h +++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h @@ -54,7 +54,7 @@ class KMDI_EXPORT KMdiWin32IconButton : public TQLabel Q_OBJECT TQ_OBJECT public: - KMdiWin32IconButton( TQWidget* tqparent, const char* name = 0 ); + KMdiWin32IconButton( TQWidget* parent, const char* name = 0 ); virtual void mousePressEvent( TQMouseEvent* ); signals: @@ -185,7 +185,7 @@ public: /** * Creates a new KMdiChildFrm class. */ - KMdiChildFrm( KMdiChildArea *tqparent ); + KMdiChildFrm( KMdiChildArea *parent ); /** * Destroys this KMdiChildFrm @@ -242,7 +242,7 @@ public: inline MdiWindowState state() const { return m_state; } /** - * Returns the inner client area of the tqparent of this (which is KMdiChildArea). + * Returns the inner client area of the parent of this (which is KMdiChildArea). */ TQRect mdiAreaContentsRect() const; diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp index 3bebc235..396d6d9d 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp @@ -65,12 +65,12 @@ //============== KMdiChildFrmCaption =============// -KMdiChildFrmCaption::KMdiChildFrmCaption( KMdiChildFrm *tqparent ) - : TQWidget( tqparent, "kmdi_childfrmcaption" ) +KMdiChildFrmCaption::KMdiChildFrmCaption( KMdiChildFrm *parent ) + : TQWidget( parent, "kmdi_childfrmcaption" ) { m_szCaption = i18n( "Unnamed" ); m_bActive = false; - m_pParent = tqparent; + m_pParent = parent; setBackgroundMode( NoBackground ); setFocusPolicy( TQ_NoFocus ); m_bChildInDrag = false; diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h index fde6d3b7..4a6bb0a4 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h +++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h @@ -49,7 +49,7 @@ public: /** * Constructor */ - KMdiChildFrmCaption( KMdiChildFrm *tqparent ); + KMdiChildFrmCaption( KMdiChildFrm *parent ); /** * Destructor @@ -89,7 +89,7 @@ protected: virtual void mousePressEvent( TQMouseEvent * ); /** - * Calls maximizePressed of the tqparent widget ( KMdiChildFrm ) + * Calls maximizePressed of the parent widget ( KMdiChildFrm ) */ virtual void mouseDoubleClickEvent( TQMouseEvent * ); @@ -118,7 +118,7 @@ public: protected: // Protected attributes /** - * tqparent widget + * parent widget */ KMdiChildFrm *m_pParent; @@ -128,7 +128,7 @@ protected: // Protected attributes bool m_bActive; /** - * the position offset related to its tqparent widget (internally used for translating mouse move positions + * the position offset related to its parent widget (internally used for translating mouse move positions */ TQPoint m_offset; diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp index 94670ce8..7189b571 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp @@ -115,7 +115,7 @@ TQRect KMdiChildView::internalGeometry() const { // is attached // get the client area coordinates inside the MDI child frame TQRect posInFrame = tqgeometry(); - // map these values to the tqparent of the MDI child frame + // map these values to the parent of the MDI child frame // (this usually is the MDI child area) and return TQPoint ptTopLeft = mdiParent() ->mapToParent( posInFrame.topLeft() ); TQSize sz = size(); @@ -375,7 +375,7 @@ void KMdiChildView::setCaption( const TQString& szCaption ) m_szCaption = szCaption; if ( mdiParent() ) mdiParent() ->setCaption( m_szCaption ); - else //have to call the tqparent one + else //have to call the parent one TQWidget::setCaption( m_szCaption ); emit windowCaptionChanged( m_szCaption ); diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.h b/lib/compatibility/kmdi/qextmdi/kmdichildview.h index 1530a155..e735e445 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildview.h +++ b/lib/compatibility/kmdi/qextmdi/kmdichildview.h @@ -49,7 +49,7 @@ class KMdiChildViewPrivate; * * All such windows 'lives' attached to a KMdiChildFrm widget * managed by KMdiChildArea, or detached (managed by the window manager.) - * So remember that the KMdiChildView::tqparent pointer may change, and may be 0L, too. + * So remember that the KMdiChildView::parent pointer may change, and may be 0L, too. * * There are 2 possibilities for you to put your widgets under MDI control: * @@ -254,7 +254,7 @@ public: virtual void setMDICaption( const TQString &caption ); /** - * Returns the KMdiChildFrm tqparent widget (or 0 if the window is not attached) + * Returns the KMdiChildFrm parent widget (or 0 if the window is not attached) */ KMdiChildFrm *mdiParent() const; @@ -278,21 +278,21 @@ public: /** * Sets the tqgeometry of the client area of this MDI child window. The * top left position of the argument is the position of the top left point - * of the client area in its tqparent coordinates and the arguments width + * of the client area in its parent coordinates and the arguments width * and height is the width and height of the client area. Please note: This * differs from the behavior of TQWidget::setGeometry()! */ void setInternalGeometry( const TQRect& newGeomety ); /** - * Returns the frame tqgeometry of this window or of the tqparent if there is any... + * Returns the frame tqgeometry of this window or of the parent if there is any... */ TQRect externalGeometry() const; /** * Sets the tqgeometry of the frame of this MDI child window. The top left * position of the argument is the position of the top left point of the - * frame in its tqparent coordinates and the arguments width and height is + * frame in its parent coordinates and the arguments width and height is * the width and height of the widget frame. Please note: This differs * from the behavior of TQWidget::setGeometry()! */ @@ -425,17 +425,17 @@ public slots: virtual void slot_clickedInDockMenu(); /** - * Calls TQWidget::show but also for it's tqparent widget if attached + * Calls TQWidget::show but also for it's parent widget if attached */ virtual void show(); /** - * Calls TQWidget::hide() or it's tqparent widget hide() if attached + * Calls TQWidget::hide() or it's parent widget hide() if attached */ virtual void hide(); /** - * Calls TQWidget::raise() or it's tqparent widget raise() if attached + * Calls TQWidget::raise() or it's parent widget raise() if attached */ virtual void raise(); diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp index 3041834e..f196d1a0 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp @@ -49,8 +49,8 @@ static const char* const kmdi_not_close_xpm[] = "#####" }; -KMdiDockContainer::KMdiDockContainer( TQWidget *tqparent, TQWidget *win, int position, int flags ) - : TQWidget( tqparent ), KDockContainer() +KMdiDockContainer::KMdiDockContainer( TQWidget *parent, TQWidget *win, int position, int flags ) + : TQWidget( parent ), KDockContainer() { m_tabSwitching = false; m_block = false; @@ -167,9 +167,9 @@ void KMdiDockContainer::init() } // try to restore splitter size - if ( parentDockWidget() && parentDockWidget()->tqparent() ) + if ( parentDockWidget() && parentDockWidget()->parent() ) { - KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) ); + KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->qt_cast( "KDockSplitter" ) ); if ( sp ) sp->setSeparatorPosX( m_separatorPos ); } @@ -177,7 +177,7 @@ void KMdiDockContainer::init() KDockWidget* KMdiDockContainer::parentDockWidget() { - return ( ( KDockWidget* ) tqparent() ); + return ( ( KDockWidget* ) parent() ); } void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const TQString &text, int & ) @@ -462,9 +462,9 @@ void KMdiDockContainer::tabClicked( int t ) { kdDebug( 760 ) << k_funcinfo << "Tab " << t << " was just deactiviated" << endl; // try save splitter position - if ( parentDockWidget() && parentDockWidget()->tqparent() ) + if ( parentDockWidget() && parentDockWidget()->parent() ) { - KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) ); + KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->qt_cast( "KDockSplitter" ) ); if ( sp ) m_separatorPos = sp->separatorPos(); } @@ -514,7 +514,7 @@ void KMdiDockContainer::save( TQDomElement& dockEl ) TQDomDocument doc = dockEl.ownerDocument(); TQDomElement el; el = doc.createElement( "name" ); - el.appendChild( doc.createTextNode( TQString( "%1" ).tqarg( tqparent() ->name() ) ) ); + el.appendChild( doc.createTextNode( TQString( "%1" ).tqarg( parent() ->name() ) ) ); dockEl.appendChild( el ); el = doc.createElement( "overlapMode" ); el.appendChild( doc.createTextNode( isOverlapMode() ? "true" : "false" ) ); @@ -569,7 +569,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl ) } else if ( el.tagName() == "child" ) { - KDockWidget * dw = ( ( KDockWidget* ) tqparent() ) ->dockManager() ->getDockWidgetFromName( el.text() ); + KDockWidget * dw = ( ( KDockWidget* ) parent() ) ->dockManager() ->getDockWidgetFromName( el.text() ); if ( dw ) { if ( el.hasAttribute( "tabCaption" ) ) @@ -580,7 +580,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl ) { dw->setToolTipString( el.attribute( "tabTooltip" ) ); } - dw->manualDock( ( KDockWidget* ) tqparent(), KDockWidget::DockCenter ); + dw->manualDock( ( KDockWidget* ) parent(), KDockWidget::DockCenter ); } } } @@ -624,8 +624,8 @@ void KMdiDockContainer::load( TQDomElement& dockEl ) void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix ) { TQString grp = cfg->group(); - cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).tqarg( tqparent() ->name() ) ); - cfg->setGroup( group_or_prefix + TQString( "::%1" ).tqarg( tqparent() ->name() ) ); + cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).tqarg( parent() ->name() ) ); + cfg->setGroup( group_or_prefix + TQString( "::%1" ).tqarg( parent() ->name() ) ); if ( isOverlapMode() ) cfg->writeEntry( "overlapMode", "true" ); @@ -633,10 +633,10 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix ) cfg->writeEntry( "overlapMode", "false" ); // try to save the splitter position - if ( parentDockWidget() && parentDockWidget() ->tqparent() ) + if ( parentDockWidget() && parentDockWidget() ->parent() ) { KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget() -> - tqparent() ->qt_cast( "KDockSplitter" ) ); + parent() ->qt_cast( "KDockSplitter" ) ); if ( sp ) cfg->writeEntry( "separatorPos", m_separatorPos ); } @@ -672,7 +672,7 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix ) void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix ) { TQString grp = cfg->group(); - cfg->setGroup( group_or_prefix + TQString( "::%1" ).tqarg( tqparent() ->name() ) ); + cfg->setGroup( group_or_prefix + TQString( "::%1" ).tqarg( parent() ->name() ) ); if ( cfg->readEntry( "overlapMode" ) != "false" ) activateOverlapMode( m_tb->width() ); @@ -689,7 +689,7 @@ void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix ) if ( dwn.isEmpty() ) break; kdDebug( 760 ) << k_funcinfo << "configuring dockwidget :" << dwn << endl; - KDockWidget *dw = ( ( KDockWidget* ) tqparent() ) ->dockManager() ->getDockWidgetFromName( dwn ); + KDockWidget *dw = ( ( KDockWidget* ) parent() ) ->dockManager() ->getDockWidgetFromName( dwn ); if ( dw ) { TQString s = cfg->readEntry( TQString( "widget%1-tabCaption" ).tqarg( i ) ); @@ -702,7 +702,7 @@ void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix ) { dw->setToolTipString( s ); } - dw->manualDock( ( KDockWidget* ) tqparent(), KDockWidget::DockCenter ); + dw->manualDock( ( KDockWidget* ) parent(), KDockWidget::DockCenter ); } if ( cfg->readBoolEntry( dwn, false ) ) raise = dwn; diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h index 1767922c..22c58732 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h +++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h @@ -40,10 +40,10 @@ class KMDI_EXPORT KMdiDockContainer: public TQWidget, public KDockContainer TQ_OBJECT public: - KMdiDockContainer( TQWidget *tqparent, TQWidget *win, int position, int flags ); + KMdiDockContainer( TQWidget *parent, TQWidget *win, int position, int flags ); virtual ~KMdiDockContainer(); - /** Get the KDockWidget that is our tqparent */ + /** Get the KDockWidget that is our parent */ KDockWidget *parentDockWidget(); /** @@ -91,18 +91,18 @@ public: /** * Save the config using a KConfig object * - * The combination of the group_or_prefix variable and the tqparent + * The combination of the group_or_prefix variable and the parent * dockwidget's name will be the group the configuration is saved in - * \param group_or_prefix the prefix to append to the tqparent dockwidget's name + * \param group_or_prefix the prefix to append to the parent dockwidget's name */ virtual void save( KConfig *, const TQString& group_or_prefix ); /** * Load the config using a KConfig object * - * The combination of the group_or_prefix variable and the tqparent + * The combination of the group_or_prefix variable and the parent * dockwidget's name will be the group the configuration is loaded from - * \param group_or_prefix the prefix to append to the tqparent dockwidget's name + * \param group_or_prefix the prefix to append to the parent dockwidget's name */ virtual void load( KConfig *, const TQString& group_or_prefix ); diff --git a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp index 9259a34b..fb5ed357 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp @@ -11,7 +11,7 @@ #include <kpopupmenu.h> #include "kmdidocumentviewtabwidget.h" -KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* tqparent, const char* name ) : KTabWidget( tqparent, name ) +KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* parent, const char* name ) : KTabWidget( parent, name ) { m_visibility = KMdi::ShowWhenMoreThanOneTab; tabBar() ->hide(); diff --git a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h index 10a9a182..0bde5891 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h +++ b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h @@ -25,7 +25,7 @@ class KMDI_EXPORT KMdiDocumentViewTabWidget: Q_OBJECT TQ_OBJECT public: - KMdiDocumentViewTabWidget( TQWidget* tqparent, const char* name = 0 ); + KMdiDocumentViewTabWidget( TQWidget* parent, const char* name = 0 ); ~KMdiDocumentViewTabWidget(); /** diff --git a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp index cc6b8535..e8f71ff2 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp @@ -21,7 +21,7 @@ #include <tqobjectlist.h> #include <kdebug.h> -KMdiFocusList::KMdiFocusList( TQObject *tqparent ) : TQObject( tqparent ) +KMdiFocusList::KMdiFocusList( TQObject *parent ) : TQObject( parent ) {} KMdiFocusList::~KMdiFocusList() diff --git a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h index 68db1656..5b5c24f4 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h +++ b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h @@ -28,7 +28,7 @@ class KMDI_EXPORT KMdiFocusList: public TQObject Q_OBJECT TQ_OBJECT public: - KMdiFocusList( TQObject *tqparent ); + KMdiFocusList( TQObject *parent ); ~KMdiFocusList(); void addWidgetTree( TQWidget* ); void restore(); diff --git a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp index 54b885d5..cb40a909 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp @@ -58,8 +58,8 @@ using namespace KMDIPrivate; ToggleToolViewAction::ToggleToolViewAction( const TQString& text, const KShortcut& cut, KDockWidget *dw, KMdiMainFrm *mdiMainFrm, - TQObject* tqparent, const char* name ) - : KToggleAction( text, cut, tqparent, name ), m_dw( dw ), m_mdiMainFrm( mdiMainFrm ) + TQObject* parent, const char* name ) + : KToggleAction( text, cut, parent, name ), m_dw( dw ), m_mdiMainFrm( mdiMainFrm ) { if ( m_dw ) { @@ -84,7 +84,7 @@ void ToggleToolViewAction::anDWChanged() setChecked( true ); else if ( isChecked() && ( m_dw->parentDockTabGroup() && ( ( static_cast<KDockWidget*>( m_dw->parentDockTabGroup() -> - tqparent() ->qt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) ) + parent() ->qt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) ) setChecked( false ); } diff --git a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h index 6f784992..db3c84f6 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h +++ b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h @@ -126,7 +126,7 @@ class KMDI_EXPORT ToggleToolViewAction: public KToggleAction public: ToggleToolViewAction( const TQString& text, const KShortcut& cut = KShortcut(), KDockWidget *dw = 0, KMdiMainFrm *mdiMainFrm = 0, - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); virtual ~ToggleToolViewAction(); diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp index 92624120..89bdb44e 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp @@ -345,7 +345,7 @@ void KMdiMainFrm::applyOptions() TQWidget* childFrame = 0L; if ( ( *it )->mdiParent() ) { - kdDebug(760) << k_funcinfo << "using child view's mdi tqparent for resize hack" << endl; + kdDebug(760) << k_funcinfo << "using child view's mdi parent for resize hack" << endl; childFrame = ( *it )->mdiParent(); } else @@ -421,7 +421,7 @@ KMdiChildView* KMdiMainFrm::createWrapper( TQWidget *view, const TQString& name, { Q_ASSERT( view ); // if this assert fails, then some part didn't return a widget. Fix the part ;) - KMdiChildView* pMDICover = new KMdiChildView( name /*caption*/, 0L /*tqparent*/, + KMdiChildView* pMDICover = new KMdiChildView( name /*caption*/, 0L /*parent*/, name.latin1() ); TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "tqlayout" ); view->reparent( pMDICover, TQPoint( 0, 0 ) ); @@ -670,7 +670,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow ) pWnd->removeEventFilter( this ); pWnd->youAreDetached(); // this is only if it was attached and you want to detach it - if ( pWnd->tqparent() ) + if ( pWnd->parent() ) { KMdiChildFrm * lpC = pWnd->mdiParent(); if ( lpC ) @@ -1401,7 +1401,7 @@ void KMdiMainFrm::switchToToplevelMode() // TQApplication::sendPostedEvents(); //why do we need to empty the event queue? if ( !parentWidget() ) { - //if we don't have a tqparent widget ( which i expect we wouldn't ) + //if we don't have a parent widget ( which i expect we wouldn't ) //make sure we take into account the size of the docks provided by //TQMainWindow int topDockHeight = topDock() ? topDock()->height() : 0; @@ -1875,9 +1875,9 @@ void KMdiMainFrm::switchToIDEAlMode() } -void KMdiMainFrm::dockToolViewsIntoContainers( TQPtrList<KDockWidget>& widgetsToRetqparent, KDockWidget *container ) +void KMdiMainFrm::dockToolViewsIntoContainers( TQPtrList<KDockWidget>& widgetsToReparent, KDockWidget *container ) { - TQPtrListIterator<KDockWidget> it( widgetsToRetqparent ); + TQPtrListIterator<KDockWidget> it( widgetsToReparent ); for ( ; ( *it ); ++it ) { ( *it )->manualDock( container, KDockWidget::DockCenter, 20 ); @@ -1890,7 +1890,7 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock KDockWidget* mainDock = getMainDockWidget(); if ( mainDock->parentDockTabGroup() ) { - mainDock = dynamic_cast<KDockWidget*>( mainDock->parentDockTabGroup()->tqparent() ); + mainDock = dynamic_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() ); // FIXME: will likely crash below due to unchecked cast } @@ -1903,7 +1903,7 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock KDockWidget* widget = mainDock->findNearestDockWidget( dprtmw ); if ( widget && widget->parentDockTabGroup() ) { - widget = static_cast<KDockWidget*>( TQT_TQWIDGET(widget->parentDockTabGroup() ->tqparent()) ); + widget = static_cast<KDockWidget*>( TQT_TQWIDGET(widget->parentDockTabGroup() ->parent()) ); if ( widget ) { @@ -1935,7 +1935,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() KDockWidget *mainDock = getMainDockWidget(); KDockWidget *w = mainDock; if ( mainDock->parentDockTabGroup() ) - w = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup()->tqparent()) ); + w = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent()) ); TQPtrList<KDockWidget> leftReparentWidgets; TQPtrList<KDockWidget> rightReparentWidgets; @@ -1943,7 +1943,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() TQPtrList<KDockWidget> topReparentWidgets; if ( mainDock->parentDockTabGroup() ) - mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->tqparent()) ); + mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) ); findToolViewsDockedToMain( &leftReparentWidgets, KDockWidget::DockLeft ); findToolViewsDockedToMain( &rightReparentWidgets, KDockWidget::DockRight ); @@ -2141,7 +2141,7 @@ void KMdiMainFrm::idealToolViewsToStandardTabs( TQStringList widgetNames, KDockW KDockWidget * mainDock = getMainDockWidget(); if ( mainDock->parentDockTabGroup() ) { - mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->tqparent()) ); + mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) ); } if ( widgetNames.count() > 0 ) diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h index 1d4842d7..4e0403aa 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h +++ b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h @@ -549,7 +549,7 @@ public slots: /** * Using this method you have to use the setWidget method of the access object, and it is very recommendet, that you use - * the widgetContainer() method for the tqparent of your newly created widget + * the widgetContainer() method for the parent of your newly created widget */ KMdiToolViewAccessor *createToolWindow(); @@ -758,7 +758,7 @@ protected: void blockClearingOfWindowMenu( bool bBlocked ) { m_bClearingOfWindowMenuBlocked = bBlocked; } void findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDockWidget::DockPosition dprtmw ); - void dockToolViewsIntoContainers( TQPtrList<KDockWidget>& widgetsToRetqparent, KDockWidget *container ); + void dockToolViewsIntoContainers( TQPtrList<KDockWidget>& widgetsToReparent, KDockWidget *container ); TQStringList prepareIdealToTabs( KDockWidget* container ); void idealToolViewsToStandardTabs( TQStringList widgetNames, KDockWidget::DockPosition pos, int sizee ); diff --git a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp b/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp index eaf15892..bbf6ccb6 100644 --- a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp @@ -140,20 +140,20 @@ TQString KMdiTaskBarButton::actualText() const // //#################################################################### -KMdiTaskBar::KMdiTaskBar( KMdiMainFrm *tqparent, TQMainWindow::ToolBarDock dock ) - : KToolBar( tqparent, "KMdiTaskBar", /*honor_style*/ false, /*readConfig*/ true ) +KMdiTaskBar::KMdiTaskBar( KMdiMainFrm *parent, TQMainWindow::ToolBarDock dock ) + : KToolBar( parent, "KMdiTaskBar", /*honor_style*/ false, /*readConfig*/ true ) , m_pCurrentFocusedWindow( 0 ) , m_pStretchSpace( 0 ) , m_layoutIsPending( false ) , m_bSwitchedOn( false ) { - m_pFrm = tqparent; + m_pFrm = parent; m_pButtonList = new TQPtrList<KMdiTaskBarButton>; m_pButtonList->setAutoDelete( true ); //QT30 setFontPropagation(TQWidget::SameFont); setMinimumWidth( 1 ); setFocusPolicy( TQ_NoFocus ); - tqparent->moveToolBar( this, dock ); //XXX obsolete! + parent->moveToolBar( this, dock ); //XXX obsolete! } KMdiTaskBar::~KMdiTaskBar() diff --git a/lib/compatibility/kmdi/qextmdi/kmditaskbar.h b/lib/compatibility/kmdi/qextmdi/kmditaskbar.h index 7c7891a0..3bf827a3 100644 --- a/lib/compatibility/kmdi/qextmdi/kmditaskbar.h +++ b/lib/compatibility/kmdi/qextmdi/kmditaskbar.h @@ -135,7 +135,7 @@ public: /** * Constructor (NoFocus, minimum width = 1, an internal TQPtrList of taskbar buttons (autodelete)) */ - KMdiTaskBar( KMdiMainFrm *tqparent, TQMainWindow::ToolBarDock dock ); + KMdiTaskBar( KMdiMainFrm *parent, TQMainWindow::ToolBarDock dock ); /** * Destructor (deletes the taskbar button list) */ @@ -198,7 +198,7 @@ protected: */ TQPtrList<KMdiTaskBarButton>* m_pButtonList; /** - * The belonging MDI mainframe (tqparent widget of this) + * The belonging MDI mainframe (parent widget of this) */ KMdiMainFrm* m_pFrm; /** diff --git a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp b/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp index c43fdf53..02f3f5d8 100644 --- a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp @@ -29,10 +29,10 @@ #include "kmditoolviewaccessor.h" #include "kmditoolviewaccessor_p.h" -KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *tqparent, TQWidget *widgetToWrap, const TQString& tabToolTip, const TQString& tabCaption ) - : TQObject( tqparent ) +KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *parent, TQWidget *widgetToWrap, const TQString& tabToolTip, const TQString& tabCaption ) + : TQObject( parent ) { - mdiMainFrm = tqparent; + mdiMainFrm = parent; d = new KMdiToolViewAccessorPrivate(); if ( widgetToWrap->inherits( "KDockWidget" ) ) { @@ -55,9 +55,9 @@ KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *tqparent, TQWidget *wid { finalTabCaption = tabCaption; } - d->widgetContainer = tqparent->createDockWidget( widgetToWrap->name(), + d->widgetContainer = parent->createDockWidget( widgetToWrap->name(), ( widgetToWrap->icon() ? ( *( widgetToWrap->icon() ) ) : TQPixmap() ), - 0L, // tqparent + 0L, // parent widgetToWrap->caption(), finalTabCaption ); d->widgetContainer->setWidget( widgetToWrap ); @@ -75,9 +75,9 @@ KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *tqparent, TQWidget *wid d->widget->installEventFilter( this ); } -KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *tqparent ) +KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *parent ) { - mdiMainFrm = tqparent; + mdiMainFrm = parent; d = new KMdiToolViewAccessorPrivate(); } @@ -133,7 +133,7 @@ void KMdiToolViewAccessor::setWidgetToWrap( TQWidget *widgetToWrap, const TQStri { tmp = mdiMainFrm->createDockWidget( widgetToWrap->name(), widgetToWrap->icon() ? ( *( widgetToWrap->icon() ) ) : TQPixmap(), - 0L, // tqparent + 0L, // parent widgetToWrap->caption(), finalTabCaption ); d->widgetContainer = tmp; diff --git a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h b/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h index f4dd40d9..34812b0e 100644 --- a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h +++ b/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h @@ -61,8 +61,8 @@ private: bool m_bFocusInEventIsPending; private: - KMdiToolViewAccessor( class KMdiMainFrm *tqparent , TQWidget *widgetToWrap, const TQString& tabToolTip = 0, const TQString& tabCaption = 0 ); - KMdiToolViewAccessor( class KMdiMainFrm *tqparent ); + KMdiToolViewAccessor( class KMdiMainFrm *parent , TQWidget *widgetToWrap, const TQString& tabToolTip = 0, const TQString& tabCaption = 0 ); + KMdiToolViewAccessor( class KMdiMainFrm *parent ); public: ~KMdiToolViewAccessor(); TQWidget *wrapperWidget(); diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp b/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp index dcff6236..3e69c674 100644 --- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp @@ -47,7 +47,7 @@ public: }; -KMultiTabBarInternal::KMultiTabBarInternal(TQWidget *tqparent, KMultiTabBar::KMultiTabBarMode bm):TQScrollView(tqparent) +KMultiTabBarInternal::KMultiTabBarInternal(TQWidget *parent, KMultiTabBar::KMultiTabBarMode bm):TQScrollView(parent) { m_expandedTabSize=-1; m_showActiveTabTexts=false; @@ -383,8 +383,8 @@ void KMultiTabBarInternal::setPosition(enum KMultiTabBar::KMultiTabBarPosition p KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text, TQPopupMenu *popup, - int id,TQWidget *tqparent,KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style) - :TQPushButton(TQIconSet(),text,tqparent),m_style(style) + int id,TQWidget *parent,KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style) + :TQPushButton(TQIconSet(),text,parent),m_style(style) { setIconSet(pic); setText(text); @@ -399,8 +399,8 @@ KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text, } KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup, - int id,TQWidget *tqparent,KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style) - :TQPushButton(TQIconSet(),text,tqparent),m_style(style) + int id,TQWidget *parent,KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style) + :TQPushButton(TQIconSet(),text,parent),m_style(style) { setText(text); m_position=pos; @@ -498,9 +498,9 @@ TQSize KMultiTabBarButton::tqsizeHint() const KMultiTabBarTab::KMultiTabBarTab(const TQPixmap& pic, const TQString& text, - int id,TQWidget *tqparent,KMultiTabBar::KMultiTabBarPosition pos, + int id,TQWidget *parent,KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style) - :KMultiTabBarButton(text,0,id,tqparent,pos,style), + :KMultiTabBarButton(text,0,id,parent,pos,style), m_showActiveTabText(false) { d=new KMultiTabBarTabPrivate(); @@ -833,7 +833,7 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) -KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *tqparent,const char *name):TQWidget(tqparent,name) +KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *parent,const char *name):TQWidget(parent,name) { m_buttons.setAutoDelete(false); if (bm==Vertical) diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar.h b/lib/compatibility/kmdi/qextmdi/kmultitabbar.h index 39f701af..0b48bc8b 100644 --- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.h +++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar.h @@ -67,7 +67,7 @@ public: */ enum KMultiTabBarStyle{VSNET=0, KDEV3=1, KONTQSBC=2, KDEV3ICON=3,STYLELAST=0xffff}; - KMultiTabBar(KMultiTabBarMode bm,TQWidget *tqparent=0,const char *name=0); + KMultiTabBar(KMultiTabBarMode bm,TQWidget *parent=0,const char *name=0); virtual ~KMultiTabBar(); /** @@ -158,9 +158,9 @@ class KUTILS_EXPORT KMultiTabBarButton: public TQPushButton TQ_OBJECT public: KMultiTabBarButton(const TQPixmap& pic,const TQString&, TQPopupMenu *popup, - int id,TQWidget *tqparent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style); + int id,TQWidget *parent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style); KMultiTabBarButton(const TQString&, TQPopupMenu *popup, - int id,TQWidget *tqparent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style); + int id,TQWidget *parent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style); virtual ~KMultiTabBarButton(); int id() const; @@ -210,7 +210,7 @@ class KUTILS_EXPORT KMultiTabBarTab: public KMultiTabBarButton Q_OBJECT TQ_OBJECT public: - KMultiTabBarTab(const TQPixmap& pic,const TQString&,int id,TQWidget *tqparent, + KMultiTabBarTab(const TQPixmap& pic,const TQString&,int id,TQWidget *parent, KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style); virtual ~KMultiTabBarTab(); /** diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar_p.h b/lib/compatibility/kmdi/qextmdi/kmultitabbar_p.h index 28ae5171..90f0d922 100644 --- a/lib/compatibility/kmdi/qextmdi/kmultitabbar_p.h +++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar_p.h @@ -32,7 +32,7 @@ class KMultiTabBarInternal: public TQScrollView Q_OBJECT TQ_OBJECT public: - KMultiTabBarInternal(TQWidget *tqparent,KMultiTabBar::KMultiTabBarMode bm); + KMultiTabBarInternal(TQWidget *parent,KMultiTabBar::KMultiTabBarMode bm); int appendTab(const TQPixmap &,int=-1,const TQString& =TQString()); KMultiTabBarTab *tab(int) const; void removeTab(int); @@ -58,7 +58,7 @@ protected: /** * [contentsM|m]ousePressEvent are reimplemented from TQScrollView * in order to ignore all mouseEvents on the viewport, so that the - * tqparent can handle them. + * parent can handle them. */ virtual void contentsMousePressEvent(TQMouseEvent *); virtual void mousePressEvent(TQMouseEvent *); diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp index 87701e9c..26a1c5e4 100644 --- a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp +++ b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp @@ -33,8 +33,8 @@ #include "ktabbar.h" #include "ktabwidget.h" -KTabBar::KTabBar( TQWidget *tqparent, const char *name ) - : TQTabBar( tqparent, name ), mReorderStartTab( -1 ), mReorderPreviousTab( -1 ), +KTabBar::KTabBar( TQWidget *parent, const char *name ) + : TQTabBar( parent, name ), mReorderStartTab( -1 ), mReorderPreviousTab( -1 ), mHoverCloseButtonTab( 0 ), mDragSwitchTab( 0 ), mHoverCloseButton( 0 ), mHoverCloseButtonEnabled( false ), mHoverCloseButtonDelayed( true ), mTabReorderingEnabled( false ), mTabCloseActivatePrevious( false ) diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.h b/lib/compatibility/kmdi/qextmdi/ktabbar.h index 44deca5e..c2167a86 100644 --- a/lib/compatibility/kmdi/qextmdi/ktabbar.h +++ b/lib/compatibility/kmdi/qextmdi/ktabbar.h @@ -38,7 +38,7 @@ class KDEUI_EXPORT KTabBar: public TQTabBar TQ_OBJECT public: - KTabBar( TQWidget* tqparent=0, const char* name=0 ); + KTabBar( TQWidget* parent=0, const char* name=0 ); virtual ~KTabBar(); virtual void setTabEnabled( int, bool ); diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp index b12152b4..55fdcaf8 100644 --- a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp @@ -48,8 +48,8 @@ public: } }; -KTabWidget::KTabWidget( TQWidget *tqparent, const char *name, WFlags f ) - : TQTabWidget( tqparent, name, f ) +KTabWidget::KTabWidget( TQWidget *parent, const char *name, WFlags f ) + : TQTabWidget( parent, name, f ) { d = new KTabWidgetPrivate; setTabBar( new KTabBar(this, "tabbar") ); diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.h b/lib/compatibility/kmdi/qextmdi/ktabwidget.h index 4db91b1e..cd3c5c86 100644 --- a/lib/compatibility/kmdi/qextmdi/ktabwidget.h +++ b/lib/compatibility/kmdi/qextmdi/ktabwidget.h @@ -44,7 +44,7 @@ class KDEUI_EXPORT KTabWidget : public TQTabWidget TQ_PROPERTY( bool automaticResizeTabs READ automaticResizeTabs WRITE setAutomaticResizeTabs ) public: - KTabWidget( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 ); + KTabWidget( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); /** * Destructor. */ diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp index 581263e2..ec008059 100644 --- a/lib/compatibility/knewstuff/downloaddialog.cpp +++ b/lib/compatibility/knewstuff/downloaddialog.cpp @@ -49,8 +49,8 @@ using namespace KNS; class NumSortListViewItem : public KListViewItem { public: - NumSortListViewItem( TQListView * tqparent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString() ) : - KListViewItem( tqparent, label1, label2, label3, label4, label5, label6, label7, label8 ) + NumSortListViewItem( TQListView * parent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString() ) : + KListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 ) { } diff --git a/lib/compatibility/knewstuff/downloaddialog.h b/lib/compatibility/knewstuff/downloaddialog.h index eea67f6e..b5c1de0a 100644 --- a/lib/compatibility/knewstuff/downloaddialog.h +++ b/lib/compatibility/knewstuff/downloaddialog.h @@ -64,19 +64,19 @@ class KDE_EXPORT DownloadDialog : public KDialogBase @param engine a pre-built engine object, or NULL if the download dialog should create an engine on its own - @param tqparent the tqparent window + @param parent the parent window @param caption the dialog caption */ - DownloadDialog(Engine *engine, TQWidget *tqparent, const TQString& caption); + DownloadDialog(Engine *engine, TQWidget *parent, const TQString& caption); /** Alternative constructor. Always uses an internal engine. - @param tqparent the tqparent window + @param parent the parent window @param caption the dialog caption */ - DownloadDialog(TQWidget *tqparent, const TQString& caption); + DownloadDialog(TQWidget *parent, const TQString& caption); /** Destructor. @@ -155,19 +155,19 @@ class KDE_EXPORT DownloadDialog : public KDialogBase @param engine a pre-built engine object, or NULL if the download dialog should create an engine on its own - @param tqparent the tqparent window + @param parent the parent window */ - DownloadDialog(Engine *engine, TQWidget *tqparent = 0); - // ### KDE 4.0: remove and make caption/tqparent argument optional + DownloadDialog(Engine *engine, TQWidget *parent = 0); + // ### KDE 4.0: remove and make caption/parent argument optional /** Alternative constructor. Always uses an internal engine. - @param tqparent the tqparent window + @param parent the parent window */ - DownloadDialog(TQWidget *tqparent = 0); - // ### KDE 4.0: remove and make caption/tqparent argument optional + DownloadDialog(TQWidget *parent = 0); + // ### KDE 4.0: remove and make caption/parent argument optional /** Opens the download dialog. @@ -178,7 +178,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase @param type a data type such as "korganizer/calendar" */ static void open(TQString type); - // ### KDE 4.0: remove and make caption/tqparent argument optional + // ### KDE 4.0: remove and make caption/parent argument optional public slots: /** diff --git a/lib/compatibility/knewstuff/engine.h b/lib/compatibility/knewstuff/engine.h index 4f77daa5..31be3f9f 100644 --- a/lib/compatibility/knewstuff/engine.h +++ b/lib/compatibility/knewstuff/engine.h @@ -58,7 +58,7 @@ class Engine : public TQObject @param newStuff a KNewStuff object @param type the Hotstuff data type such as "korganizer/calendar" - @param parentWidget the tqparent window + @param parentWidget the parent window */ Engine( KNewStuff *newStuff, const TQString &type, TQWidget *parentWidget = 0 ); /** @@ -67,7 +67,7 @@ class Engine : public TQObject @param newStuff a KNewStuff object @param type the Hotstuff data type such as "korganizer/calendar" @param providerList the URL of the provider list - @param parentWidget the tqparent window + @param parentWidget the parent window */ Engine( KNewStuff *newStuff, const TQString &type, const TQString &providerList, TQWidget *parentWidget = 0 ); @@ -84,9 +84,9 @@ class Engine : public TQObject TQString type() const { return mType; } /** - Returns the previously set tqparent widget. + Returns the previously set parent widget. - @return tqparent widget + @return parent widget */ TQWidget *parentWidget() const { return mParentWidget; } diff --git a/lib/compatibility/knewstuff/entry.cpp b/lib/compatibility/knewstuff/entry.cpp index ba08f345..0f3b98b4 100644 --- a/lib/compatibility/knewstuff/entry.cpp +++ b/lib/compatibility/knewstuff/entry.cpp @@ -252,11 +252,11 @@ void Entry::parseDomElement( const TQDomElement &element ) } TQDomElement Entry::createDomElement( TQDomDocument &doc, - TQDomElement &tqparent ) + TQDomElement &parent ) { TQDomElement entry = doc.createElement( "stuff" ); entry.setAttribute("type", mType); - tqparent.appendChild( entry ); + parent.appendChild( entry ); addElement( doc, entry, "name", name() ); addElement( doc, entry, "author", author() ); @@ -283,12 +283,12 @@ TQDomElement Entry::createDomElement( TQDomDocument &doc, return entry; } -TQDomElement Entry::addElement( TQDomDocument &doc, TQDomElement &tqparent, +TQDomElement Entry::addElement( TQDomDocument &doc, TQDomElement &parent, const TQString &tag, const TQString &value ) { TQDomElement n = doc.createElement( tag ); n.appendChild( doc.createTextNode( value ) ); - tqparent.appendChild( n ); + parent.appendChild( n ); return n; } diff --git a/lib/compatibility/knewstuff/entry.h b/lib/compatibility/knewstuff/entry.h index 3de9982c..8f583ecc 100644 --- a/lib/compatibility/knewstuff/entry.h +++ b/lib/compatibility/knewstuff/entry.h @@ -229,10 +229,10 @@ class KDE_EXPORT Entry /** * @internal */ - TQDomElement createDomElement( TQDomDocument &, TQDomElement &tqparent ); + TQDomElement createDomElement( TQDomDocument &, TQDomElement &parent ); protected: - TQDomElement addElement( TQDomDocument &doc, TQDomElement &tqparent, + TQDomElement addElement( TQDomDocument &doc, TQDomElement &parent, const TQString &tag, const TQString &value ); private: diff --git a/lib/compatibility/knewstuff/knewstuff.cpp b/lib/compatibility/knewstuff/knewstuff.cpp index 0dfad89e..7fa15372 100644 --- a/lib/compatibility/knewstuff/knewstuff.cpp +++ b/lib/compatibility/knewstuff/knewstuff.cpp @@ -32,11 +32,11 @@ using namespace KNS; KAction* KNS::standardAction(const TQString& what, const TQObject *recvr, - const char *slot, KActionCollection* tqparent, + const char *slot, KActionCollection* parent, const char *name) { return new KAction(i18n("Download New %1").tqarg(what), "knewstuff", - 0, recvr, slot, tqparent, name); + 0, recvr, slot, parent, name); } KNewStuff::KNewStuff( const TQString &type, TQWidget *parentWidget ) diff --git a/lib/compatibility/knewstuff/knewstuff.h b/lib/compatibility/knewstuff/knewstuff.h index 392f90f0..455063a3 100644 --- a/lib/compatibility/knewstuff/knewstuff.h +++ b/lib/compatibility/knewstuff/knewstuff.h @@ -36,7 +36,7 @@ class Entry; KAction* standardAction(const TQString& what, const TQObject *recvr, const char *slot, - KActionCollection* tqparent, + KActionCollection* parent, const char *name = 0); } @@ -74,7 +74,7 @@ class KDE_EXPORT KNewStuff @param type type of data to be handled, should be something like korganizer/calendar, kword/template, kdesktop/wallpaper - @param parentWidget tqparent widget of dialogs opened by the KNewStuff + @param parentWidget parent widget of dialogs opened by the KNewStuff engine */ KNewStuff( const TQString &type, TQWidget *parentWidget = 0 ); @@ -85,7 +85,7 @@ class KDE_EXPORT KNewStuff @param type type of data to be handled, should be something like korganizer/calendar, kword/template, kdesktop/wallpaper @param providerList the URL of the provider list - @param parentWidget tqparent widget of dialogs opened by the KNewStuff + @param parentWidget parent widget of dialogs opened by the KNewStuff engine */ KNewStuff( const TQString &type, const TQString &providerList, TQWidget *parentWidget = 0 ); @@ -97,7 +97,7 @@ class KDE_EXPORT KNewStuff TQString type() const; /** - Return tqparent widget. + Return parent widget. */ TQWidget *parentWidget() const; diff --git a/lib/compatibility/knewstuff/knewstuffgeneric.cpp b/lib/compatibility/knewstuff/knewstuffgeneric.cpp index 66878137..c7b4b855 100644 --- a/lib/compatibility/knewstuff/knewstuffgeneric.cpp +++ b/lib/compatibility/knewstuff/knewstuffgeneric.cpp @@ -37,8 +37,8 @@ using namespace std; -KNewStuffGeneric::KNewStuffGeneric( const TQString &type, TQWidget *tqparent ) - : KNewStuff( type, tqparent ) +KNewStuffGeneric::KNewStuffGeneric( const TQString &type, TQWidget *parent ) + : KNewStuff( type, parent ) { mConfig = KGlobal::config(); } diff --git a/lib/compatibility/knewstuff/knewstuffgeneric.h b/lib/compatibility/knewstuff/knewstuffgeneric.h index fb75323f..6347bf53 100644 --- a/lib/compatibility/knewstuff/knewstuffgeneric.h +++ b/lib/compatibility/knewstuff/knewstuffgeneric.h @@ -46,9 +46,9 @@ class KDE_EXPORT KNewStuffGeneric : public KNewStuff Constructor. @param type a Hotstuff data type such as "korganizer/calendar" - @param tqparent the tqparent window. + @param parent the parent window. */ - KNewStuffGeneric( const TQString &type, TQWidget *tqparent = 0 ); + KNewStuffGeneric( const TQString &type, TQWidget *parent = 0 ); ~KNewStuffGeneric(); /** diff --git a/lib/compatibility/knewstuff/knewstuffsecure.h b/lib/compatibility/knewstuff/knewstuffsecure.h index 9e725e0b..4195139c 100644 --- a/lib/compatibility/knewstuff/knewstuffsecure.h +++ b/lib/compatibility/knewstuff/knewstuffsecure.h @@ -47,7 +47,7 @@ public: @param type type of data to be handled, should be something like korganizer/calendar, kword/template, kdesktop/wallpaper - @param parentWidget tqparent widget of dialogs opened by the KNewStuff + @param parentWidget parent widget of dialogs opened by the KNewStuff engine */ KNewStuffSecure(const TQString &type, TQWidget *parentWidget=0); @@ -79,7 +79,7 @@ private slots: /** Called when the upload has finished. @param result the result of the upload Be careful if you reimplement it, as it deletes the temporary directory - m_tempDir used for upload. You must also delete it (call the tqparent's method) + m_tempDir used for upload. You must also delete it (call the parent's method) if you reimplement it. */ void slotUploadFinished(bool result); diff --git a/lib/compatibility/knewstuff/provider.cpp b/lib/compatibility/knewstuff/provider.cpp index 65660cc4..ca7767e0 100644 --- a/lib/compatibility/knewstuff/provider.cpp +++ b/lib/compatibility/knewstuff/provider.cpp @@ -128,10 +128,10 @@ void Provider::parseDomElement( const TQDomElement &element ) } } -TQDomElement Provider::createDomElement( TQDomDocument &doc, TQDomElement &tqparent ) +TQDomElement Provider::createDomElement( TQDomDocument &doc, TQDomElement &parent ) { TQDomElement entry = doc.createElement( "stuff" ); - tqparent.appendChild( entry ); + parent.appendChild( entry ); TQDomElement n = doc.createElement( "name" ); n.appendChild( doc.createTextNode( name() ) ); diff --git a/lib/compatibility/knewstuff/provider.h b/lib/compatibility/knewstuff/provider.h index c41a9afb..680cec4e 100644 --- a/lib/compatibility/knewstuff/provider.h +++ b/lib/compatibility/knewstuff/provider.h @@ -144,7 +144,7 @@ class Provider protected: void parseDomElement( const TQDomElement & ); - TQDomElement createDomElement( TQDomDocument &, TQDomElement &tqparent ); + TQDomElement createDomElement( TQDomDocument &, TQDomElement &parent ); private: TQString mName; @@ -169,7 +169,7 @@ class ProviderLoader : public TQObject /** * Constructor. * - * @param parentWidget the tqparent widget + * @param parentWidget the parent widget */ ProviderLoader( TQWidget *parentWidget ); diff --git a/lib/compatibility/knewstuff/providerdialog.cpp b/lib/compatibility/knewstuff/providerdialog.cpp index 97694a34..a6625870 100644 --- a/lib/compatibility/knewstuff/providerdialog.cpp +++ b/lib/compatibility/knewstuff/providerdialog.cpp @@ -37,8 +37,8 @@ using namespace KNS; class ProviderItem : public KListViewItem { public: - ProviderItem( KListView *tqparent, Provider *provider ) : - KListViewItem( tqparent ), mProvider( provider ) + ProviderItem( KListView *parent, Provider *provider ) : + KListViewItem( parent ), mProvider( provider ) { setText( 0, provider->name() ); } @@ -49,9 +49,9 @@ class ProviderItem : public KListViewItem Provider *mProvider; }; -ProviderDialog::ProviderDialog( Engine *engine, TQWidget *tqparent ) : +ProviderDialog::ProviderDialog( Engine *engine, TQWidget *parent ) : KDialogBase( Plain, i18n("Hot New Stuff Providers"), Ok | Cancel, Cancel, - tqparent, 0, false, true ), + parent, 0, false, true ), mEngine( engine ) { TQFrame *topPage = plainPage(); diff --git a/lib/compatibility/knewstuff/providerdialog.h b/lib/compatibility/knewstuff/providerdialog.h index 7a9f8884..6ab903bd 100644 --- a/lib/compatibility/knewstuff/providerdialog.h +++ b/lib/compatibility/knewstuff/providerdialog.h @@ -49,9 +49,9 @@ class ProviderDialog : public KDialogBase Constructor. @param engine a KNewStuff engine object - @param tqparent the tqparent window + @param parent the parent window */ - ProviderDialog( Engine *engine, TQWidget *tqparent ); + ProviderDialog( Engine *engine, TQWidget *parent ); /** Clears the list of providers. diff --git a/lib/compatibility/knewstuff/uploaddialog.cpp b/lib/compatibility/knewstuff/uploaddialog.cpp index 9e63386b..4eaed4aa 100644 --- a/lib/compatibility/knewstuff/uploaddialog.cpp +++ b/lib/compatibility/knewstuff/uploaddialog.cpp @@ -42,9 +42,9 @@ using namespace KNS; -UploadDialog::UploadDialog( Engine *engine, TQWidget *tqparent ) : +UploadDialog::UploadDialog( Engine *engine, TQWidget *parent ) : KDialogBase( Plain, i18n("Share Hot New Stuff"), Ok | Cancel, Cancel, - tqparent, 0, false, true ), + parent, 0, false, true ), mEngine( engine ) { mEntryList.setAutoDelete( true ); diff --git a/lib/compatibility/knewstuff/uploaddialog.h b/lib/compatibility/knewstuff/uploaddialog.h index 5d7f0e68..623f689c 100644 --- a/lib/compatibility/knewstuff/uploaddialog.h +++ b/lib/compatibility/knewstuff/uploaddialog.h @@ -53,9 +53,9 @@ class UploadDialog : public KDialogBase Constructor. @param engine a KNewStuff engine object to be used for uploads - @param tqparent the tqparent window + @param parent the parent window */ - UploadDialog( Engine *engine, TQWidget *tqparent ); + UploadDialog( Engine *engine, TQWidget *parent ); /** Destructor. diff --git a/lib/ksavealldialog.cpp b/lib/ksavealldialog.cpp index d0c072ba..4a3aad3c 100644 --- a/lib/ksavealldialog.cpp +++ b/lib/ksavealldialog.cpp @@ -49,8 +49,8 @@ private: } -KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * tqparent ) : - KDialogBase( tqparent, "SaveAllDialog", true, i18n("Save Modified Files?"), +KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * parent ) : + KDialogBase( parent, "SaveAllDialog", true, i18n("Save Modified Files?"), Ok | User1 | Close ) { TQVBox *top = makeVBoxMainWidget(); @@ -140,8 +140,8 @@ KURL::List KSaveSelectDialog::filesNotToSave( ) } -KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* tqparent ) : - KDialogBase( tqparent, "SaveAllDialog", true, i18n("Save Modified Files?"), +KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* parent ) : + KDialogBase( parent, "SaveAllDialog", true, i18n("Save Modified Files?"), Ok | User1 | Close ) { m_result = Cancel; diff --git a/lib/ksavealldialog.h b/lib/ksavealldialog.h index 091a3ae0..8aee6870 100644 --- a/lib/ksavealldialog.h +++ b/lib/ksavealldialog.h @@ -39,7 +39,7 @@ class KSaveSelectDialog : public KDialogBase TQ_OBJECT public: - KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * tqparent ); + KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * parent ); virtual ~KSaveSelectDialog(); KURL::List filesToSave(); @@ -67,7 +67,7 @@ class KSaveAllDialog : public KDialogBase public: enum SaveAllResult{ SaveAll, Cancel, Revert }; - KSaveAllDialog( const TQStringList& filenames, TQWidget* tqparent ); + KSaveAllDialog( const TQStringList& filenames, TQWidget* parent ); virtual ~KSaveAllDialog(); SaveAllResult result() const { return m_result; } diff --git a/lib/qextfileinfo.cpp b/lib/qextfileinfo.cpp index a50455f4..3f002ada 100644 --- a/lib/qextfileinfo.cpp +++ b/lib/qextfileinfo.cpp @@ -161,16 +161,16 @@ KURL QExtFileInfo::toAbsolute(const KURL& _urlToConvert,const KURL& _baseURL) This is needed for empty directory adding/handling. (Andras) Currently works only for local directories */ -KURL::List QExtFileInfo::allFiles( const KURL& path, const TQString& tqmask, TQWidget *window) +KURL::List QExtFileInfo::allFiles( const KURL& path, const TQString& mask, TQWidget *window) { QExtFileInfo internalFileInfo; - return internalFileInfo.allFilesInternal(path, tqmask, window); + return internalFileInfo.allFilesInternal(path, mask, window); } -KURL::List QExtFileInfo::allFilesRelative( const KURL& path, const TQString& tqmask, TQWidget *window, bool resolveSymlinks) +KURL::List QExtFileInfo::allFilesRelative( const KURL& path, const TQString& mask, TQWidget *window, bool resolveSymlinks) { QExtFileInfo internalFileInfo; - KURL::List r = internalFileInfo.allFilesInternal(path, tqmask, window); + KURL::List r = internalFileInfo.allFilesInternal(path, mask, window); KURL::List::Iterator it; for ( it = r.begin(); it != r.end(); ++it ) @@ -181,10 +181,10 @@ KURL::List QExtFileInfo::allFilesRelative( const KURL& path, const TQString& tqm return r; } -TQDict<KFileItem> QExtFileInfo::allFilesDetailed(const KURL& path, const TQString& tqmask, TQWidget *window) +TQDict<KFileItem> QExtFileInfo::allFilesDetailed(const KURL& path, const TQString& mask, TQWidget *window) { QExtFileInfo internalFileInfo; - return internalFileInfo.allFilesDetailedInternal(path, tqmask, window); + return internalFileInfo.allFilesDetailedInternal(path, mask, window); } @@ -281,10 +281,10 @@ bool QExtFileInfo::copy( const KURL& src, const KURL& target, int permissions, } /** No descriptions */ -KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& tqmask, TQWidget *window) +KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& mask, TQWidget *window) { if (startURL.isLocalFile()) - return allLocalFiles(startURL.path(-1), tqmask); + return allLocalFiles(startURL.path(-1), mask); dirListItems.clear(); if (internalExists(startURL, true, window)) @@ -292,7 +292,7 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& lstFilters.setAutoDelete(true); lstFilters.clear(); // Split on white space - TQStringList list = TQStringList::split( ' ', tqmask ); + TQStringList list = TQStringList::split( ' ', mask ); for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) lstFilters.append( new TQRegExp(*it, false, true ) ); @@ -320,7 +320,7 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& } /** No descriptions */ -TQDict<KFileItem> QExtFileInfo::allFilesDetailedInternal(const KURL& startURL, const TQString& tqmask, TQWidget *window) +TQDict<KFileItem> QExtFileInfo::allFilesDetailedInternal(const KURL& startURL, const TQString& mask, TQWidget *window) { detailedDirListItems.setAutoDelete(true); detailedDirListItems.clear(); @@ -330,7 +330,7 @@ TQDict<KFileItem> QExtFileInfo::allFilesDetailedInternal(const KURL& startURL, c lstFilters.setAutoDelete(true); lstFilters.clear(); // Split on white space - TQStringList list = TQStringList::split( ' ', tqmask ); + TQStringList list = TQStringList::split( ' ', mask ); for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) lstFilters.append( new TQRegExp(*it, false, true ) ); @@ -356,10 +356,10 @@ TQDict<KFileItem> QExtFileInfo::allFilesDetailedInternal(const KURL& startURL, c return detailedDirListItems; } -KURL::List QExtFileInfo::allLocalFiles(const TQString& startPath, const TQString& tqmask) +KURL::List QExtFileInfo::allLocalFiles(const TQString& startPath, const TQString& mask) { KURL::List list; - TQDir d(startPath, tqmask); + TQDir d(startPath, mask); TQStringList l = d.entryList(); TQStringList::ConstIterator end = l.constEnd(); TQString path; @@ -379,7 +379,7 @@ KURL::List QExtFileInfo::allLocalFiles(const TQString& startPath, const TQString for (TQStringList::ConstIterator it = l.constBegin(); it != end; ++it) { if ((*it) != "." && (*it) != "..") - list += allLocalFiles(startPath + "/" + (*it), tqmask); + list += allLocalFiles(startPath + "/" + (*it), mask); } return list; } diff --git a/lib/qextfileinfo.h b/lib/qextfileinfo.h index 6a9e52c7..a223438e 100644 --- a/lib/qextfileinfo.h +++ b/lib/qextfileinfo.h @@ -55,21 +55,21 @@ public: static KURL toRelative(const KURL& urlToConvert, const KURL& baseURL, bool resolveSymlinks = true); /** Convert relative url to absolute, based on baseURL. */ static KURL toAbsolute(const KURL& urlToConvert, const KURL& baseURL); - /** Returns a recursive list of files under path, matching the specified file tqmask. */ - static KURL::List allFiles( const KURL& path, const TQString &tqmask, TQWidget *window); - /** Returns a recursive list of files under path, matching the specified file tqmask. + /** Returns a recursive list of files under path, matching the specified file mask. */ + static KURL::List allFiles( const KURL& path, const TQString &mask, TQWidget *window); + /** Returns a recursive list of files under path, matching the specified file mask. The returned urls are relative to path. */ - static KURL::List allFilesRelative( const KURL& path, const TQString &tqmask, TQWidget *window, bool resolveSymlinks = true); - /** Returns a recursive list of files under path, matching the specified file tqmask. + static KURL::List allFilesRelative( const KURL& path, const TQString &mask, TQWidget *window, bool resolveSymlinks = true); + /** Returns a recursive list of files under path, matching the specified file mask. The returned list contains detailed information about each url. The user should delete the KFileItems and clear the dict after they are not needed. */ - static TQDict<KFileItem> allFilesDetailed(const KURL& path, const TQString &tqmask, TQWidget *window); + static TQDict<KFileItem> allFilesDetailed(const KURL& path, const TQString &mask, TQWidget *window); /** Creates a dir if don't exists. */ static bool createDir(const KURL & path, TQWidget *window); - /** Returns the tqparent directory of dir. */ + /** Returns the parent directory of dir. */ static KURL cdUp(const KURL &dir); /** Returns the filename from a path string. */ static TQString shortName(const TQString &fname ); @@ -93,9 +93,9 @@ private: bool internalExists(const KURL& url, bool readingOnly, TQWidget *window); bool internalCopy(const KURL& src, const KURL& target, int permissions, bool overwrite, bool resume, TQWidget* window); - KURL::List allFilesInternal(const KURL& startURL, const TQString& tqmask, TQWidget *window); - TQDict<KFileItem> allFilesDetailedInternal(const KURL& startURL, const TQString& tqmask, TQWidget *window); - KURL::List allLocalFiles(const TQString& startPath, const TQString& tqmask); + KURL::List allFilesInternal(const KURL& startURL, const TQString& mask, TQWidget *window); + TQDict<KFileItem> allFilesDetailedInternal(const KURL& startURL, const TQString& mask, TQWidget *window); + KURL::List allLocalFiles(const TQString& startPath, const TQString& mask); bool bJobOK; static TQString lastErrorMsg; 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<myCheckListItem*>(tqparent()); + if(parent()){ + myCheckListItem *p = static_cast<myCheckListItem*>(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<myCheckListItem*>(p->tqparent()); + p = static_cast<myCheckListItem*>(p->parent()); } } else { @@ -109,7 +109,7 @@ void myCheckListItem::stateChange (bool b){ } } else { - if(tqparent()) static_cast<myCheckListItem*>(tqparent())->addCheckedChild(); + if(parent()) static_cast<myCheckListItem*>(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<myCheckListItem*>(m_currentProp->tqparent()); + myCheckListItem *p = static_cast<myCheckListItem*>(m_currentProp->parent()); while(p) { p->setOn(true); - p=static_cast<myCheckListItem*>(p->tqparent()); + p=static_cast<myCheckListItem*>(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<myCheckListItem*>(m_currentProp->tqparent()); + myCheckListItem *p = static_cast<myCheckListItem*>(m_currentProp->parent()); while(p){ p->setOn(true); - p=static_cast<myCheckListItem*>(p->tqparent()); + p=static_cast<myCheckListItem*>(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 <tqlineedit.h> #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<kdebug.h> -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 <klineedit.h> -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<DebuggerInterface*>( tqparent()->child( 0, "DebuggerInterface" ) ); + return static_cast<DebuggerInterface*>( 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 <qextfileinfo.h> #include <tqdom.h> -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<DebuggerManager*>(tqparent()); + m_manager = static_cast<DebuggerManager*>(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 <kdebug.h> #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<TQString, TQValueList< int > > 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("<frameset")) { if(line.contains("rows")) { - split(tqparent,(line.contains(",")+1),HORIZONTAL); + split(parent,(line.contains(",")+1),HORIZONTAL); TQRegExp pattern("rows\\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.height()); int dummyDimension=dummy.height()-cancelledPixels(line.contains(",")+1); - TQPtrList<treeNode> list=m_internalTree->findNode(tqparent)->tqchildrenList(); + TQPtrList<treeNode> list=m_internalTree->findNode(parent)->tqchildrenList(); TQPtrListIterator<treeNode> 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<treeNode> list=m_internalTree->findNode(tqparent)->tqchildrenList(); + TQPtrList<treeNode> list=m_internalTree->findNode(parent)->tqchildrenList(); TQPtrListIterator<treeNode> 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<TQSplitter *>(tqparent)->setResizeMode(sa->view(),TQSplitter::KeepSize ); + SelectableArea *sa=new SelectableArea(parent,n->label().ascii()); + if(parent->isA(TQSPLITTER_OBJECT_NAME_STRING)) dynamic_cast<TQSplitter *>(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<ToolbarEntry> &toolbarList, KMainWindow* tqparent, const char* name, bool modal, WFlags fl, const TQString& defaultAction ) - :ActionConfigDialogS( tqparent, name, modal, fl ) +ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &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<ToolbarEntry> &toolbarList, KMainWindow* tqparent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 , const TQString& defaultAction = TQString()); + ActionConfigDialog(const TQDict<ToolbarEntry> &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 <string>Tags and attributes defining this DTEP</string> </property> <property name="whatsThis" stdset="0"> - <string>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 + <string>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> <string>Tags and attributes defining this DTEP</string> </property> <property name="whatsThis" stdset="0"> - <string>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 + <string>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> <string>Parent group:</string> </property> <property name="toolTip" stdset="0"> - <string>The name of the group that may be the tqparent of this</string> + <string>The name of the group that may be the parent of this</string> </property> <property name="whatsThis" stdset="0"> - <string>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.</string> + <string>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.</string> </property> </widget> <widget class="KLineEdit" row="0" column="1" rowspan="1" colspan="4"> @@ -361,10 +361,10 @@ Example 3:<br> <cstring>parentGroupEdit</cstring> </property> <property name="toolTip" stdset="0"> - <string>The name of the group that may be the tqparent of this</string> + <string>The name of the group that may be the parent of this</string> </property> <property name="whatsThis" stdset="0"> - <string>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.</string> + <string>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.</string> </property> </widget> <widget class="TQLabel" row="1" column="0"> 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 <pdima@mail.univ.kiev.ua> @@ -23,8 +23,8 @@ //kde includes #include <kmimetype.h> -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 <pdima@mail.univ.kiev.ua> @@ -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 <kconfig.h> /* - * 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 <klocale.h> #include <kmessagebox.h> -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 <espensa@online.no> // 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 <tqdict.h> #include <tqlineedit.h> -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 <tqstring.h> #include <tqstringlist.h> -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 <tqimage.h> -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 <tqregexp.h> -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 <tqlineedit.h> #include <tqcheckbox.h> -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 <tqradiobutton.h> #include <tqgroupbox.h> -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<TQString> *) {}; 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<ui void AnnotationOutput::allAnnotationsItemExecuted(TQListViewItem *item) { - if (dynamic_cast<KListView*> (item->tqparent()) != m_allAnnotations) + if (dynamic_cast<KListView*> (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<KListView*> (item->tqparent()) != m_yourAnnotations) + if (dynamic_cast<KListView*> (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("<qt>Cannot create the <br><b>%1</b> file.<br>Check that you have write permission in the tqparent folder.</qt>") + KMessageBox::error(0L, i18n("<qt>Cannot create the <br><b>%1</b> file.<br>Check that you have write permission in the parent folder.</qt>") .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 << "</tqchildren>" << 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<GroupElement*> GroupElementList; typedef TQMap<TQString, GroupElementList> 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<TQString, GroupElementList> 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.: <a href="<? foo ?>""></a><input size="<? foo ?>" > + if (node->parent && node->prev == node->parent) //some strange cases, but it's possible, eg.: <a href="<? foo ?>""></a><input size="<? foo ?>" > { 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 <ul><li></ul> 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 <ul><li></ul> 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; ///<the group contains filename(s) TQRegExp fileNameRx; ///<delete the matches of this regexp to obtain a filename (eg. linked, included file name) bool appendToTags; ///<true if the group elements must be used as normal tags in autocompletion - TQString parentGroup; ///<if the group element can be a child of another group (eg. member function of a class), holds the tqparent name. Makes sense only if appentToTags is true + TQString parentGroup; ///<if the group element can be a child of another group (eg. member function of a class), holds the parent name. Makes sense only if appentToTags is true }; @@ -247,7 +247,7 @@ public: bool isChild(const TQString& tag, bool trueIfNoChildsDefined = true); //prefer using this variant, it handle Text, Empty, XmlTagEnd nodes! bool isChild(Node *node, bool trueIfNoChildsDefined = true, bool treatEmptyNodesAsText = false); - /*** Returns the list of tqparent of this tag. */ + /*** Returns the list of parent of this tag. */ TQPtrList<TQTag> 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. <?) //and it should always exist - Node *node = new Node(s_parentNode->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); //<TEMPORARY> (*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<int> 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<int>& commonParentStartChildLocation, TQValueList<int>& 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<int>& 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<int> * 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. * </TEMPORARY> - * @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. * <a href="<? boo ?>" > : 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<int> 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: * <body> @@ -1120,14 +1120,14 @@ private: * </b> * </body> * @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<int>& commonParentStartChildLocation, NodeModifsSet* modifs); /** - * Split the last valid start tqparent (commonParentStartChild) into two. + * Split the last valid start parent (commonParentStartChild) into two. * The following tree: * <body> * <b> --> commonParent @@ -1162,9 +1162,9 @@ private: * </b> * </body> * @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<int> 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. <a href="<? PHP stuff here ?>">, 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. <a href="<? PHP stuff here ?>">, 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. <a <? echo boo; ?> > //We must regenerate the <a> 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<TQString, TQString> decodedChars; TQMap<TQString, TQString> 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<SubProject> *subprojects = Project::ref()->subprojects(); for (TQValueList<SubProject>::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 @@ <cstring>checkInsertWithMask</cstring> </property> <property name="text"> - <string>Insert files with the following &tqmask:</string> + <string>Insert files with the following &mask:</string> </property> </widget> <widget class="TQLineEdit" row="1" column="1"> <property name="name"> - <cstring>tqmask</cstring> + <cstring>mask</cstring> </property> <property name="enabled"> <bool>false</bool> @@ -319,7 +319,7 @@ <connection> <sender>checkInsertWithMask</sender> <signal>toggled(bool)</signal> - <receiver>tqmask</receiver> + <receiver>mask</receiver> <slot>setEnabled(bool)</slot> </connection> <connection> @@ -332,7 +332,7 @@ <tabstops> <tabstop>checkInsert</tabstop> <tabstop>checkInsertWeb</tabstop> - <tabstop>tqmask</tabstop> + <tabstop>mask</tabstop> <tabstop>addFiles</tabstop> <tabstop>addFolder</tabstop> <tabstop>clearList</tabstop> 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("<qt>Cannot open file <b>%1</b> for writing.</qt>").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("<qt>Cannot open the file <b>%1</b> for writing.</qt>").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("<qt>Cannot open the file <b>%1</b> for reading.</qt>").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("<qt>Malformed URL: <b>%1</b></qt>").tqarg(url.prettyURL())); return false; } if ( projectAlreadyOpen(url.url()) ) { - tqparent->hideSplash(); + parent->hideSplash(); if (KMessageBox::warningContinueCancel(m_mainWindow, i18n("<qt>The project<br><b>%1</b><br> seems to be used by another Quanta instance.<br>You may end up with data loss if you open the same project in two instances, modify and save them in both.<br><br>Do you want to proceed with open?</qt>").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("<qt>Cannot access the project file <b>%1</b>.</qt>").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("<qt>Unable to load the debugger plugin, error code %1 was returned: <b>%2</b>.</qt>").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<TQString, int>::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 @@ <umlobjects> <UML:Class stereotype="" package="" xmi.id="74" abstract="0" documentation="This should contain a "view" of the document. This is not clearly implemented. The class contains a set of tabs, and each tab can hold one Document object. I think the tab (and such the MDI) handling should go to the QuantaApp class and here only the document view related things should be. Just as the Document/View model requests." name="QuantaView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="86" type="" abstract="0" documentation="" name="QuantaView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="87" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="87" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="88" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="89" type="void" abstract="0" documentation="" name="addWrite" static="0" scope="200" > @@ -62,7 +62,7 @@ <UML:Operation stereotype="" package="" xmi.id="206" type="QDomDocument *" abstract="0" documentation="" name="actions" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="207" type="bool" abstract="0" documentation="Returns true if the current DTD does not have any toolbars, or if all of the toolbars are removed or if the "Shov DTD Toolbar" is unchecked." name="allToolbarsHidden" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="208" type="QWidget *" abstract="0" documentation="" name="createContainer" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="209" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="209" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="210" value="" type="int" abstract="0" documentation="" name="index" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="211" value="" type="const QDomElement &" abstract="0" documentation="" name="element" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="212" value="" type="int &" abstract="0" documentation="" name="id" static="0" scope="200" /> @@ -109,7 +109,7 @@ </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="247" type="void" abstract="0" documentation="" name="removeContainer" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="248" value="" type="QWidget *" abstract="0" documentation="" name="container" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="249" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="249" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="250" value="" type="QDomElement &" abstract="0" documentation="" name="element" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="251" value="" type="int" abstract="0" documentation="" name="id" static="0" scope="200" /> </UML:Operation> @@ -238,7 +238,7 @@ <UML:Class stereotype="" package="" xmi.id="274" abstract="0" documentation="The document handling class. This is somewhat weird, as the Document class should handle all the document related things. The job is distrivute now between this the QuantaView and the QuantaApp class. This must be clearly seperated... See the operations in order to get a picture what's here." name="QuantaDoc" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="276" type="" abstract="0" documentation="" name="QuantaDoc" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="277" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="277" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="278" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="279" type="void" abstract="0" documentation="" name="changeFileTabName" static="0" scope="200" > @@ -420,7 +420,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="428" value="" type="KTextEditor :: Document *" abstract="0" documentation="" name="doc" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="429" value="" type="Project *" abstract="0" documentation="" name="project" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="430" value="" type="QuantaPluginInterface *" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="431" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="431" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="432" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="433" value="" type="WFlags" abstract="0" documentation="" name="f" static="0" scope="200" /> </UML:Operation> @@ -621,14 +621,14 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="574" abstract="0" documentation="" name="Node" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="583" type="" abstract="0" documentation="" name="Node" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="584" value="" type="Node *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="584" value="" type="Node *" abstract="0" documentation="" name="parent" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="585" type="" abstract="0" documentation="" name="~Node" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="575" value="" type="Node *" abstract="0" documentation="" name="child" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="576" value="" type="QListViewItem *" abstract="0" documentation="" name="listItem" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="577" value="" type="Node *" abstract="0" documentation="" name="next" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="578" value="" type="bool" abstract="0" documentation="" name="opened" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="579" value="" type="Node *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="579" value="" type="Node *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="580" value="" type="Node *" abstract="0" documentation="" name="prev" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="581" value="" type="bool" abstract="0" documentation="" name="removeAll" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="582" value="" type="Tag *" abstract="0" documentation="" name="tag" static="0" scope="200" /> @@ -866,7 +866,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="767" abstract="0" documentation="This class handles the spellchecking. It should work with all KTextEditor's, not only Kate. This is not a real plugin. The code is based on SpellPlugin for Kate." name="SpellChecker" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="771" type="" abstract="0" documentation="" name="SpellChecker" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="772" value="" type="QObject *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="772" value="" type="QObject *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="773" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="774" type="void" abstract="0" documentation="" name="locatePosition" static="0" scope="202" > @@ -1001,7 +1001,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="876" abstract="0" documentation="" name="Project" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="907" type="" abstract="0" documentation="" name="Project" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="908" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="908" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="909" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="910" type="bool" abstract="0" documentation="" name="createEmptyDom" static="0" scope="200" /> @@ -1017,7 +1017,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="919" type="void" abstract="0" documentation="" name="insertFiles" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="920" value="" type="const KURL &" abstract="0" documentation="" name="pathURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="921" value="" type="const QString &" abstract="0" documentation="" name="tqmask" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="921" value="" type="const QString &" abstract="0" documentation="" name="mask" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="922" type="bool" abstract="0" documentation="" name="isModified" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="923" type="void" abstract="0" documentation="" name="loadProjectXML" static="0" scope="200" /> @@ -1074,7 +1074,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="940" type="" abstract="0" documentation="" name="FilesListView" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="941" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dir" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="942" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="topList" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="943" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="943" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="944" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="945" type="virtual QString" abstract="0" documentation="" name="currentFileName" static="0" scope="202" /> @@ -1089,7 +1089,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="950" abstract="0" documentation="An extended KListViewItem for folders." name="FilesTreeFolder" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="955" type="" abstract="0" documentation="" name="FilesTreeFolder" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="956" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="957" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="957" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="958" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="959" type="" abstract="0" documentation="" name="FilesTreeFolder" static="0" scope="200" > @@ -1128,12 +1128,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="981" abstract="0" documentation="An extended KLIstViewItem for files." name="FilesTreeFile" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="984" type="" abstract="0" documentation="" name="FilesTreeFile" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="985" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="985" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="986" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="987" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="988" type="" abstract="0" documentation="" name="FilesTreeFile" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="989" value="" type="QListView *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="989" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="990" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="991" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> @@ -1151,12 +1151,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="999" abstract="0" documentation="" name="DocItem" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1002" type="" abstract="0" documentation="" name="DocItem" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1003" value="" type="QListView *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1003" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1004" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1005" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1006" type="" abstract="0" documentation="" name="DocItem" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1007" value="" type="QListViewItem *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1007" value="" type="QListViewItem *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1008" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1009" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_url" static="0" scope="200" /> </UML:Operation> @@ -1169,13 +1169,13 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1013" abstract="0" documentation="" name="DocFolder" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1017" type="" abstract="0" documentation="" name="DocFolder" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1018" value="" type="QListView *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1018" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1019" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1020" value="" type="KConfig *" abstract="0" documentation="" name="config" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1021" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="basePath" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1022" type="" abstract="0" documentation="" name="DocFolder" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1023" value="" type="QListViewItem *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1023" value="" type="QListViewItem *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1024" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1025" value="" type="KConfig *" abstract="0" documentation="" name="config" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1026" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="basePath" static="0" scope="200" /> @@ -1195,12 +1195,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1033" abstract="0" documentation="" name="UploadTreeFolder" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1036" type="" abstract="0" documentation="" name="UploadTreeFolder" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1037" value="" type="const KURL &" abstract="0" documentation="" name="a_url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1038" value="" type="QListView *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1038" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1039" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1040" type="" abstract="0" documentation="" name="UploadTreeFolder" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1041" value="" type="const KURL &" abstract="0" documentation="" name="a_url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1042" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1042" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1043" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1044" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="fullName" static="0" scope="200" /> @@ -1223,7 +1223,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1055" abstract="0" documentation="Item for project folders." name="ProjectTreeFolder" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1059" type="" abstract="0" documentation="" name="ProjectTreeFolder" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1060" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1061" value="" type="ProjectTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1061" value="" type="ProjectTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1062" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1063" type="" abstract="0" documentation="" name="ProjectTreeFolder" static="0" scope="200" > @@ -1256,7 +1256,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1082" abstract="0" documentation="Item for project files. It's different from a standard file as the project files are basically XML tag elements." name="ProjectTreeFile" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1084" type="" abstract="0" documentation="" name="ProjectTreeFile" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1085" value="" type="ProjectTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1085" value="" type="ProjectTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1086" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1087" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> @@ -1265,7 +1265,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1089" abstract="0" documentation="" name="DocTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1091" type="" abstract="0" documentation="" name="DocTreeView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1092" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1092" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1093" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1094" type="QString *" abstract="0" documentation="" name="contextHelp" static="0" scope="200" > @@ -1276,7 +1276,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1097" abstract="0" documentation="A tree view used to display a set of files/directories explicitly added to it. It is used in several dialogs, e.g in Project Upload dialog, Rescan Project dialog, add files/folders to project dialogs." name="UploadTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1098" type="" abstract="0" documentation="" name="UploadTreeView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1099" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1099" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1100" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1101" type="UploadTreeFile *" abstract="0" documentation="" name="addItem" static="0" scope="200" > @@ -1319,7 +1319,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1144" type="" abstract="0" documentation="" name="StructTreeView" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1145" value="" type="Parser *" abstract="0" documentation="" name="parser" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1146" value="" type="KConfig *" abstract="0" documentation="" name="config" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1147" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1147" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1148" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1149" type="void" abstract="0" documentation="" name="buildTree" static="0" scope="202" > @@ -1366,13 +1366,13 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1167" abstract="0" documentation="" name="UploadTreeFile" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1170" type="" abstract="0" documentation="" name="UploadTreeFile" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1171" value="" type="QListView *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1171" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1172" value="" type="const KURL &" abstract="0" documentation="" name="a_url" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1173" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1174" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1175" type="" abstract="0" documentation="" name="UploadTreeFile" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1176" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1176" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1177" value="" type="const KURL &" abstract="0" documentation="" name="a_url" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1178" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1179" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> @@ -1392,7 +1392,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1187" abstract="0" documentation="TreeView for templates. As the templates are standard directories, it inherits from FilesTreeView." name="TemplatesTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1195" type="" abstract="0" documentation="" name="TemplatesTreeView" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1196" value="" type="const KURL &" abstract="0" documentation="" name="projectBaseURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1197" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1197" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1198" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1199" type="void" abstract="0" documentation="" name="contentsDropEvent" static="0" scope="202" > @@ -1420,17 +1420,17 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1211" abstract="0" documentation="KListViewItem specific for the structure tree." name="StructTreeTag" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1213" type="" abstract="0" documentation="" name="StructTreeTag" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1214" value="" type="QListView *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1214" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1215" value="" type="const QString" abstract="0" documentation="" name="a_title" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1216" type="" abstract="0" documentation="" name="StructTreeTag" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1217" value="" type="StructTreeTag *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1217" value="" type="StructTreeTag *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1218" value="" type="Node *" abstract="0" documentation="" name="a_node" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1219" value="" type="const QString" abstract="0" documentation="" name="a_title" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1220" value="" type="QListViewItem *" abstract="0" documentation="" name="after" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1221" type="" abstract="0" documentation="" name="StructTreeTag" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1222" value="" type="StructTreeTag *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1222" value="" type="StructTreeTag *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1223" value="" type="const QString" abstract="0" documentation="" name="a_title" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1224" type="" abstract="0" documentation="" name="~StructTreeTag" static="0" scope="200" /> @@ -1438,7 +1438,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1225" abstract="0" documentation="A project specific KListView." name="ProjectTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1231" type="" abstract="0" documentation="" name="ProjectTreeView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1232" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1232" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1233" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1234" type="virtual KURL" abstract="0" documentation="" name="currentURL" static="0" scope="202" /> @@ -1459,11 +1459,11 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1241" abstract="0" documentation="Extended FileManage to handle remote and local directory structures in a tree." name="FilesTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1242" type="" abstract="0" documentation="" name="FilesTreeView" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1243" value="" type="KURL :: List" abstract="0" documentation="" name="topList" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1244" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1244" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1245" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1246" type="" abstract="0" documentation="" name="FilesTreeView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1247" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1247" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1248" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1249" type="void" abstract="0" documentation="" name="addFileInfoPage" static="0" scope="202" > @@ -1494,7 +1494,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1267" abstract="0" documentation="A treeview which has some common file managing methods. It inherits from KListView." name="FileManage" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1272" type="" abstract="0" documentation="" name="FileManage" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1273" type="" abstract="0" documentation="" name="FileManage" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1274" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1274" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1275" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1276" type="virtual KURL" abstract="0" documentation="" name="currentURL" static="0" scope="202" /> @@ -1537,7 +1537,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1326" type="" abstract="0" documentation="" name="ProjectUpload" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1327" value="" type="Project *" abstract="0" documentation="" name="p" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1328" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1329" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1329" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1330" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1331" value="" type="bool" abstract="0" documentation="" name="modal" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1332" value="" type="WFlags" abstract="0" documentation="" name="fl" static="0" scope="200" /> @@ -1561,7 +1561,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1340" abstract="0" documentation="Create a new project from kio accessible files and folders." name="ProjectNewLocal" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1342" type="" abstract="0" documentation="" name="ProjectNewLocal" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1343" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1343" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1344" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1345" type="virtual void" abstract="0" documentation="" name="resizeEvent" static="0" scope="200" > @@ -1574,7 +1574,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1351" type="" abstract="0" documentation="" name="RescanPrj" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1352" value="" type="KURL :: List" abstract="0" documentation="" name="p_prjFileList" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1353" value="" type="const KURL &" abstract="0" documentation="" name="p_baseURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1354" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1354" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1355" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1356" value="" type="bool" abstract="0" documentation="" name="modal" static="0" scope="200" /> </UML:Operation> @@ -1587,7 +1587,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1360" abstract="0" documentation="" name="ProjectNewFinal" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1361" type="" abstract="0" documentation="" name="ProjectNewFinal" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1362" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1362" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1363" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1364" type="void" abstract="0" documentation="" name="setMargin" static="0" scope="200" > @@ -1597,7 +1597,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1367" abstract="0" documentation="Create a new project with the help of wget." name="ProjectNewWeb" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1372" type="" abstract="0" documentation="" name="ProjectNewWeb" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1373" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1373" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1374" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1375" type="virtual void" abstract="0" documentation="" name="resizeEvent" static="0" scope="200" > @@ -1611,7 +1611,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1378" abstract="0" documentation="" name="ProjectNewGeneral" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1379" type="" abstract="0" documentation="" name="ProjectNewGeneral" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1380" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1380" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1381" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1382" type="void" abstract="0" documentation="" name="setMargin" static="0" scope="200" > @@ -1628,7 +1628,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1391" type="" abstract="0" documentation="" name="CSSSelectorEditor" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1392" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="code" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1393" value="" type="bool" abstract="0" documentation="" name="editSelector" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1394" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1394" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1395" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1396" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="code" static="0" scope="200" /> @@ -1690,7 +1690,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Association nameb="" stereotype="" assoctype="dependency" rolea="1407" roleb="307" multia="" multib="" package="" xmi.id="1441" abstract="0" documentation="" name="" static="0" scope="200" namea="" /> <UML:Class stereotype="" package="" xmi.id="1442" abstract="0" documentation="" name="TagImgDlg" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1465" type="" abstract="0" documentation="" name="TagImgDlg" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1466" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1466" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1467" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1468" type="void" abstract="0" documentation="" name="initDialog" static="0" scope="200" /> @@ -1721,7 +1721,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1470" abstract="0" documentation="" name="TagQuickTable" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1472" type="" abstract="0" documentation="" name="TagQuickTable" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1473" value="" type="Document *" abstract="0" documentation="" name="write" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1474" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1474" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1475" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1476" type="" abstract="0" documentation="" name="~TagQuickTable" static="0" scope="200" /> @@ -1769,7 +1769,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1512" abstract="0" documentation="" name="CopyTo" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1515" type="" abstract="0" documentation="" name="CopyTo" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1516" value="" type="const KURL &" abstract="0" documentation="" name="dirURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1517" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1517" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1518" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1519" type="KURL" abstract="0" documentation="" name="copy" static="0" scope="200" > @@ -1790,7 +1790,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1530" abstract="0" documentation="" name="TagQuickStart" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1532" type="" abstract="0" documentation="" name="TagQuickStart" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1533" value="" type="const KURL &" abstract="0" documentation="" name="a_baseURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1534" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1534" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1535" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1536" type="" abstract="0" documentation="" name="~TagQuickStart" static="0" scope="200" /> @@ -1798,12 +1798,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1537" abstract="0" documentation="" name="FileCombo" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1542" type="" abstract="0" documentation="" name="FileCombo" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1543" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1543" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1544" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1545" type="" abstract="0" documentation="" name="FileCombo" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1546" value="" type="const KURL &" abstract="0" documentation="" name="a_baseURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1547" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1547" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1548" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1549" type="void" abstract="0" documentation="" name="setBaseURL" static="0" scope="200" > @@ -2689,7 +2689,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <listitem open="0" type="814" id="576" label="listItem" /> <listitem open="0" type="814" id="577" label="next" /> <listitem open="0" type="814" id="578" label="opened" /> - <listitem open="0" type="814" id="579" label="tqparent" /> + <listitem open="0" type="814" id="579" label="parent" /> <listitem open="0" type="814" id="580" label="prev" /> <listitem open="0" type="814" id="581" label="removeAll" /> <listitem open="0" type="814" id="582" label="tag" /> 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("</") && tagName.isEmpty()) { Node *node = parser->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<KTextEditor::CompletionEntry>* 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<KTextEditor::CompletionEntry>* 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<KTextEditor::CompletionEntry>* 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<DTDStruct>(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<TQTag> tag_it(*(tqparent->tagsList)); + DTDStruct *parent = (DTDStruct *) find(dtd->inheritsTagsFrom); // this loads the dtd, if not present in memory + TQDictIterator<TQTag> 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<KDockWidget*>(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<QuantaToolBar*>(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<Node*> 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<KFileTreeViewItem *>(item->tqparent()); + item = dynamic_cast<KFileTreeViewItem *>(item->parent()); } } if (item == root()) @@ -276,7 +276,7 @@ void BaseTreeBranch::updateOpenFolder() }; // go up if no sibling available if (! item->nextSibling()) - item = dynamic_cast<KFileTreeViewItem *>(item->tqparent()); + item = dynamic_cast<KFileTreeViewItem *>(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<TQString>( 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<TQString, TQString> 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 @@ <cstring>parentAttr</cstring> </property> <property name="text"> - <string>&Inherit type from tqparent (nothing)</string> + <string>&Inherit type from parent (nothing)</string> </property> </widget> <widget class="TQLabel" row="0" column="0"> 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<StructTreeView*>(tqparent); + parentTree = static_cast<StructTreeView*>(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<StructTreeTag*>(parentItem->tqparent()); - if (currentNode->tqparent && currentNode->tqparent->next) + //parentItem = dynamic_cast<StructTreeTag*>(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<StructTreeTag*>(currentNode->prev->mainListItem); - if (currentNode->tqparent) + if (currentNode->parent) { - parentItem = static_cast<StructTreeTag*>(currentNode->tqparent->mainListItem); + parentItem = static_cast<StructTreeTag*>(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<StructTreeTag*> (tqparent); + StructTreeTag* parent_item = dynamic_cast<StructTreeTag*> (parent); StructTreeTag* after_item = dynamic_cast<StructTreeTag*> (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<StructTreeTag*> (tqparent); + StructTreeTag* parent_item = dynamic_cast<StructTreeTag*> (parent); StructTreeTag* after_item = dynamic_cast<StructTreeTag*> (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 @@ <cstring>parentAttr</cstring> </property> <property name="text"> - <string>&Inherit tqparent attribute</string> + <string>&Inherit parent attribute</string> </property> </widget> <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> 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<TQString, TQString> 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<BaseTreeViewItem*>(tqparent)->url(); + url = static_cast<BaseTreeViewItem*>(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<KFileTreeViewItem *>(item->tqparent()); + item = static_cast<KFileTreeViewItem *>(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<KFileTreeViewItem *>(item->firstChild()); while (curItem && curItem != static_cast<KFileTreeViewItem *>(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<uint> &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("<qt>Cannot create folder<br><b>%1</b>.<br>Check that you have write permission in the tqparent folder or that the connection to<br><b>%2</b><br> is valid.</qt>") + KMessageBox::error(widget, i18n("<qt>Cannot create folder<br><b>%1</b>.<br>Check that you have write permission in the parent folder or that the connection to<br><b>%2</b><br> is valid.</qt>") .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<TQString, TQWidget*>::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<ToolbarTabWidget*>(tqparent->parentWidget()); + m_toolbarTab = dynamic_cast<ToolbarTabWidget*>(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<TQString, TQWidget*> 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: |