diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
| commit | 99a2774ca6f1cab334de5d43fe36fc44ae889a4c (patch) | |
| tree | eff34cf0762227f6baf2a93e8fef48d4bed2651c /umbrello | |
| parent | 1c104292188541106338d4940b0f04beeb4301a0 (diff) | |
| download | tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.tar.gz tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.zip | |
TQt4 convert kdesdk
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'umbrello')
432 files changed, 3172 insertions, 3014 deletions
diff --git a/umbrello/THANKS b/umbrello/THANKS index ab1462c5..33ab7791 100644 --- a/umbrello/THANKS +++ b/umbrello/THANKS @@ -61,7 +61,7 @@ Lutz Mueller <lutz.mueller @gmx.de> Heiko Nardmann <heiko.nardmann @onlinehome.de> Dimitri Ognibene <ognibened @yahoo.it> Michael Palomas <mpalomas @gmail.com> -Anthony Parent <anthony.parent @intel.com> +Anthony Parent <anthony.tqparent @intel.com> Carsten Pfeiffer <pfeiffer @kde.org> Ivan Porres <iporres @abo.fi> Maciej Puzio <maciek @work.swmed.edu> diff --git a/umbrello/umbrello/activitywidget.cpp b/umbrello/umbrello/activitywidget.cpp index c0f0c836..3f9355f7 100644 --- a/umbrello/umbrello/activitywidget.cpp +++ b/umbrello/umbrello/activitywidget.cpp @@ -54,10 +54,10 @@ void ActivityWidget::draw(TQPainter & p, int offsetX, int offsetY) { //int middleX = w / 2; int textStartY = (h / 2) - (fontHeight / 2); p.drawRoundRect(offsetX, offsetY, w, h, (h * 60) / w, 60); - p.setPen(Qt::black); + p.setPen(TQt::black); p.setFont( UMLWidget::getFont() ); p.drawText(offsetX + ACTIVITY_MARGIN, offsetY + textStartY, - w - ACTIVITY_MARGIN * 2, fontHeight, Qt::AlignCenter, getName()); + w - ACTIVITY_MARGIN * 2, fontHeight, TQt::AlignCenter, getName()); } UMLWidget::setPen(p); break; @@ -70,7 +70,7 @@ void ActivityWidget::draw(TQPainter & p, int offsetX, int offsetY) { p.setPen( TQPen(m_LineColour, 1) ); p.setBrush( WidgetBase::getLineColor() ); p.drawEllipse( offsetX, offsetY, w, h ); - p.setBrush( Qt::white ); + p.setBrush( TQt::white ); p.drawEllipse( offsetX + 1, offsetY + 1, w - 2, h - 2 ); p.setBrush( WidgetBase::getLineColor() ); p.drawEllipse( offsetX + 3, offsetY + 3, w - 6, h - 6 ); diff --git a/umbrello/umbrello/activitywidget.h b/umbrello/umbrello/activitywidget.h index 8e40838c..86e494e1 100644 --- a/umbrello/umbrello/activitywidget.h +++ b/umbrello/umbrello/activitywidget.h @@ -33,6 +33,7 @@ */ class ActivityWidget : public UMLWidget { Q_OBJECT + TQ_OBJECT public: enum ActivityType @@ -46,7 +47,7 @@ public: /** * Creates a Activity widget. * - * @param view The parent of the widget. + * @param view The tqparent of the widget. * @param activityType The type of activity. * @param id The ID to assign (-1 will prompt a new ID.) */ diff --git a/umbrello/umbrello/actor.h b/umbrello/umbrello/actor.h index a3bff4c3..f09f3c71 100644 --- a/umbrello/umbrello/actor.h +++ b/umbrello/umbrello/actor.h @@ -27,6 +27,7 @@ */ class UMLActor : public UMLCanvasObject { Q_OBJECT + TQ_OBJECT public: /** * Constructs an Actor. diff --git a/umbrello/umbrello/actorwidget.cpp b/umbrello/umbrello/actorwidget.cpp index 38ddb4f5..ec997b4d 100644 --- a/umbrello/umbrello/actorwidget.cpp +++ b/umbrello/umbrello/actorwidget.cpp @@ -54,9 +54,9 @@ void ActorWidget::draw(TQPainter & p, int offsetX, int offsetY) { p.drawLine(offsetX + middleX - a_width / 2, offsetY + thirdY + thirdY / 2, offsetX + middleX + a_width / 2, offsetY + thirdY + thirdY / 2); //arms //draw text - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); p.drawText(offsetX + A_MARGIN, offsetY + h - fontHeight, - w - A_MARGIN * 2, fontHeight, Qt::AlignCenter, getName()); + w - A_MARGIN * 2, fontHeight, TQt::AlignCenter, getName()); if(m_bSelected) drawSelected(&p, offsetX, offsetY); } diff --git a/umbrello/umbrello/actorwidget.h b/umbrello/umbrello/actorwidget.h index 6b62bc98..7555bf77 100644 --- a/umbrello/umbrello/actorwidget.h +++ b/umbrello/umbrello/actorwidget.h @@ -46,7 +46,7 @@ public: /** * Constructs an ActorWidget. * - * @param view The parent of this ActorWidget. + * @param view The tqparent of this ActorWidget. * @param o The Actor class this ActorWidget will display. */ ActorWidget(UMLView * view, UMLActor *o); @@ -64,7 +64,7 @@ public: /** * Saves the widget to the "actorwidget" XMI element. - * Note: For loading from XMI, the inherited parent method is used. + * Note: For loading from XMI, the inherited tqparent method is used. */ void saveToXMI( TQDomDocument & qDoc, TQDomElement & qElement ); diff --git a/umbrello/umbrello/aligntoolbar.cpp b/umbrello/umbrello/aligntoolbar.cpp index 1e41eee7..aa62f500 100644 --- a/umbrello/umbrello/aligntoolbar.cpp +++ b/umbrello/umbrello/aligntoolbar.cpp @@ -31,8 +31,8 @@ #include "umlwidget.h" #include "umlwidgetlist.h" -AlignToolBar::AlignToolBar(TQMainWindow* parentWindow, const char* ) - : KToolBar(parentWindow,Qt::DockRight,false) { +AlignToolBar::AlignToolBar(TQMainWindow* tqparentWindow, const char* ) + : KToolBar(tqparentWindow,TQt::DockRight,false) { // load images for the buttons loadPixmaps(); @@ -41,10 +41,10 @@ AlignToolBar::AlignToolBar(TQMainWindow* parentWindow, const char* ) insertButton(m_Pixmaps[alac_align_right], alac_align_right, true, i18n("Align Right")); insertButton(m_Pixmaps[alac_align_top], alac_align_top, true, i18n("Align Top")); insertButton(m_Pixmaps[alac_align_bottom], alac_align_bottom, true, i18n("Align Bottom")); - insertButton(m_Pixmaps[alac_align_vertical_middle], alac_align_vertical_middle, true, i18n("Align Vertical Middle")); - insertButton(m_Pixmaps[alac_align_horizontal_middle], alac_align_horizontal_middle, true, i18n("Align Horizontal Middle")); - insertButton(m_Pixmaps[alac_align_vertical_distribute], alac_align_vertical_distribute, true, i18n("Align Vertical Distribute")); - insertButton(m_Pixmaps[alac_align_horizontal_distribute], alac_align_horizontal_distribute, true, i18n("Align Horizontal Distribute")); + insertButton(m_Pixmaps[alac_align_vertical_middle], alac_align_vertical_middle, true, i18n("AlignQt::Vertical Middle")); + insertButton(m_Pixmaps[alac_align_horizontal_middle], alac_align_horizontal_middle, true, i18n("AlignQt::Horizontal Middle")); + insertButton(m_Pixmaps[alac_align_vertical_distribute], alac_align_vertical_distribute, true, i18n("AlignQt::Vertical Distribute")); + insertButton(m_Pixmaps[alac_align_horizontal_distribute], alac_align_horizontal_distribute, true, i18n("AlignQt::Horizontal Distribute")); setOrientation( Qt::Vertical ); setVerticalStretchable( true ); @@ -335,7 +335,7 @@ void AlignToolBar::slotButtonChanged(int btn) { // at least 2 widgets must be selected if (widgetList.count() > 1) { - // now perform alignment according to the clicked button + // now perform tqalignment according to the clicked button switch (btn) { case alac_align_left: alignLeft(widgetList); @@ -380,7 +380,7 @@ void AlignToolBar::slotButtonChanged(int btn) { UMLApp::app()->getDocument()->setModified(); } else { KMessageBox::messageBox(0, KMessageBox::Information, - i18n("For alignment you have to select at least 2 objects like classes or actors. You can not align associations."), + i18n("For tqalignment you have to select at least 2 objects like classes or actors. You can not align associations."), i18n("Information"), i18n("&OK"), TQString(""), "showAlignInformation"); } // if (widgetList.count() > 1) diff --git a/umbrello/umbrello/aligntoolbar.h b/umbrello/umbrello/aligntoolbar.h index bfc94d16..297b0a8a 100644 --- a/umbrello/umbrello/aligntoolbar.h +++ b/umbrello/umbrello/aligntoolbar.h @@ -21,24 +21,25 @@ class TQMainWindow; class UMLWidget; /** - * This toolbar provides tools for alignment. Widgets can only be aligned, when + * This toolbar provides tools for tqalignment. Widgets can only be aligned, when * there are at least 2 widgets (not associations) are selected * - * @short Toolbar providing alignment tools. + * @short Toolbar providing tqalignment tools. * @author Sebastian Stein <seb.kde@hpfsc.de> * Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org */ class AlignToolBar : public KToolBar { Q_OBJECT + TQ_OBJECT public: /** - * Creates a bar with tools for alignment. + * Creates a bar with tools for tqalignment. * - * @param parentWindow The parent of the toolbar. + * @param tqparentWindow The tqparent of the toolbar. * @param name The name of the toolbar. */ - AlignToolBar(TQMainWindow* parentWindow, const char* name); + AlignToolBar(TQMainWindow* tqparentWindow, const char* name); /** * Standard deconstructor. @@ -214,7 +215,7 @@ private: private slots: /** - * Performs the alignment when a button was clicked. + * Performs the tqalignment when a button was clicked. * * @param btn The clicked button. */ diff --git a/umbrello/umbrello/artifact.h b/umbrello/umbrello/artifact.h index d5087545..98a3fb71 100644 --- a/umbrello/umbrello/artifact.h +++ b/umbrello/umbrello/artifact.h @@ -28,6 +28,7 @@ */ class UMLArtifact : public UMLCanvasObject { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/artifactwidget.cpp b/umbrello/umbrello/artifactwidget.cpp index 7356f260..118fc76a 100644 --- a/umbrello/umbrello/artifactwidget.cpp +++ b/umbrello/umbrello/artifactwidget.cpp @@ -48,12 +48,12 @@ void ArtifactWidget::drawAsNormal(TQPainter& p, int offsetX, int offsetY) { p.drawRect(offsetX, offsetY, w, h); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); p.setFont(font); if (!stereotype.isEmpty()) { p.drawText(offsetX + ARTIFACT_MARGIN, offsetY + (h/2) - fontHeight, - w, fontHeight, Qt::AlignCenter, m_pObject->getStereotype(true)); + w, fontHeight, TQt::AlignCenter, m_pObject->getStereotype(true)); } int lines; @@ -65,10 +65,10 @@ void ArtifactWidget::drawAsNormal(TQPainter& p, int offsetX, int offsetY) { if (lines == 1) { p.drawText(offsetX, offsetY + (h/2) - (fontHeight/2), - w, fontHeight, Qt::AlignCenter, name); + w, fontHeight, TQt::AlignCenter, name); } else { p.drawText(offsetX, offsetY + (h/2), - w, fontHeight, Qt::AlignCenter, name); + w, fontHeight, TQt::AlignCenter, name); } if(m_bSelected) { @@ -98,11 +98,11 @@ void ArtifactWidget::drawAsFile(TQPainter& p, int offsetX, int offsetY) { p.drawLine(startX + 40, offsetY + 10, startX + 50, offsetY + 10); p.drawLine(startX + 40, offsetY, startX + 50, offsetY + 10); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); p.setFont(font); p.drawText(offsetX, offsetY + h - fontHeight, - w, fontHeight, Qt::AlignCenter, name); + w, fontHeight, TQt::AlignCenter, name); if(m_bSelected) { drawSelected(&p, offsetX, offsetY); @@ -132,11 +132,11 @@ void ArtifactWidget::drawAsLibrary(TQPainter& p, int offsetX, int offsetY) { p.drawLine(startX + 40, offsetY + 10, startX + 50, offsetY + 10); p.drawLine(startX + 40, offsetY, startX + 50, offsetY + 10); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); p.setFont(font); p.drawText(offsetX, offsetY + h - fontHeight, - w, fontHeight, Qt::AlignCenter, name); + w, fontHeight, TQt::AlignCenter, name); if(m_bSelected) { drawSelected(&p, offsetX, offsetY); @@ -168,11 +168,11 @@ void ArtifactWidget::drawAsTable(TQPainter& p, int offsetX, int offsetY) { p.drawLine(startX + 10, offsetY, startX + 10, offsetY + iconHeight); p.drawLine(startX, offsetY + (iconHeight/4), startX + 50, offsetY + (iconHeight/4)); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); p.setFont(font); p.drawText(offsetX, offsetY + h - fontHeight, - w, fontHeight, Qt::AlignCenter, name); + w, fontHeight, TQt::AlignCenter, name); if(m_bSelected) { drawSelected(&p, offsetX, offsetY); diff --git a/umbrello/umbrello/artifactwidget.h b/umbrello/umbrello/artifactwidget.h index 3fdd26c2..68ca425a 100644 --- a/umbrello/umbrello/artifactwidget.h +++ b/umbrello/umbrello/artifactwidget.h @@ -35,7 +35,7 @@ public: /** * Constructs a ArtifactWidget. * - * @param view The parent of this ArtifactWidget. + * @param view The tqparent of this ArtifactWidget. * @param a The Artifact this widget will be representing. */ ArtifactWidget(UMLView *view, UMLArtifact *a); @@ -52,7 +52,7 @@ public: /** * Saves the widget to the "artifactwidget" XMI element. - * Note: For loading from XMI, the inherited parent method is used. + * Note: For loading from XMI, the inherited tqparent method is used. */ void saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement); diff --git a/umbrello/umbrello/association.cpp b/umbrello/umbrello/association.cpp index 62f47a43..a4c9d9d5 100644 --- a/umbrello/umbrello/association.cpp +++ b/umbrello/umbrello/association.cpp @@ -164,7 +164,7 @@ void UMLAssociation::saveToXMI( TQDomDocument & qDoc, TQDomElement & qElement ) TQDomElement assocElement = UMLObject::save("UML:Generalization", qDoc); assocElement.setAttribute( "discriminator", "" ); assocElement.setAttribute( "child", ID2STR(getObjectId(A)) ); - assocElement.setAttribute( "parent", ID2STR(getObjectId(B)) ); + assocElement.setAttribute( "tqparent", ID2STR(getObjectId(B)) ); qElement.appendChild( assocElement ); return; } @@ -201,7 +201,7 @@ bool UMLAssociation::load( TQDomElement & element ) { m_AssocType == Uml::at_Dependency) { for (unsigned r = Uml::A; r <= Uml::B; r++) { const TQString fetch = (m_AssocType == Uml::at_Generalization ? - r == Uml::A ? "child" : "parent" + r == Uml::A ? "child" : "tqparent" : r == Uml::A ? "client" : "supplier"); TQString roleIdStr = element.attribute(fetch, ""); if (roleIdStr.isEmpty()) { @@ -235,7 +235,7 @@ bool UMLAssociation::load( TQDomElement & element ) { continue; // Permitted tag names: // roleA: "child" "subtype" "client" - // roleB: "parent" "supertype" "supplier" + // roleB: "tqparent" "supertype" "supplier" TQString idStr = tempElement.attribute( "xmi.id", "" ); if (idStr.isEmpty()) idStr = tempElement.attribute( "xmi.idref", "" ); @@ -335,7 +335,7 @@ bool UMLAssociation::load( TQDomElement & element ) { // In the old days, we could just record this on the association, // and be done with it. But thats not how the UML13.dtd does things. // As a result, we are checking roleA for information about the - // parent association (!) which by this point in the parse, should + // tqparent association (!) which by this point in the parse, should // be set. However, the information that the roles are allowed to have // is not complete, so we need to finish the analysis here. diff --git a/umbrello/umbrello/association.h b/umbrello/umbrello/association.h index 01fb357e..f3cb5a6f 100644 --- a/umbrello/umbrello/association.h +++ b/umbrello/umbrello/association.h @@ -31,6 +31,7 @@ class UMLRole; class UMLAssociation : public UMLObject { Q_OBJECT + TQ_OBJECT friend class AssociationWidget; public: /** @@ -257,7 +258,7 @@ protected: */ bool load(TQDomElement& element); - // keep track of number of parent widgets + // keep track of number of tqparent widgets int nrof_parent_widgets; /** diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp index 825308a9..a385f7da 100644 --- a/umbrello/umbrello/associationwidget.cpp +++ b/umbrello/umbrello/associationwidget.cpp @@ -771,11 +771,11 @@ void AssociationWidget::setUMLAssociation (UMLAssociation * assoc) if (assoc && umla == assoc) return; - //umla->disconnect(this); //Qt does disconnect automatically upon destruction. + //umla->disconnect(this); //TQt does disconnect automatically upon destruction. umla->nrof_parent_widgets--; // we are the last "owner" of this association, so delete it - // from the parent UMLDoc, and as a stand-alone + // from the tqparent UMLDoc, and as a stand-alone //DISCUSS: Should we really do this? // It implies that an association's existence is ONLY // governed by its existence on at least one diagram. @@ -785,19 +785,19 @@ void AssociationWidget::setUMLAssociation (UMLAssociation * assoc) // relies on (at least the way it's implemented now) // ANSWER: yes, we *should* do this. // This only implies that IF an association once 'belonged' - // to one or more parent associationwidgets, then it must 'die' when the - // last widget does. UMLAssociations which never had a parent + // to one or more tqparent associationwidgets, then it must 'die' when the + // last widget does. UMLAssociations which never had a tqparent // in the first place wont be affected by this code, and can happily - // live on without a parent. + // live on without a tqparent. //DISCUSS: Sorry Brian, but this breaks cut/paste. // In particular, cut/paste means that the UMLAssociation _does_ - // have the assocwidget parent - the only means of doing a cut/paste + // have the assocwidget tqparent - the only means of doing a cut/paste // on the diagram is via the widgets. I.e. in practice there is no // such thing as an "orphan" UMLAssociation. - // BTW, IMHO the concept of a widget being the parent of a UML object + // BTW, IMHO the concept of a widget being the tqparent of a UML object // is fundamentally flawed. Widgets are pure presentation - they can // come and go at a whim. If at all, the widgets could be considered - // children of the corresponding UML object. + // tqchildren of the corresponding UML object. // // ANSWER: This is the wrong treatment of cut and paste. Associations that // are being cut/n pasted should be serialized to XMI, then reconstituted @@ -826,7 +826,7 @@ void AssociationWidget::setUMLAssociation (UMLAssociation * assoc) /** Returns true if the Widget is either at the starting or ending side of the association */ -bool AssociationWidget::contains(UMLWidget* widget) { +bool AssociationWidget::tqcontains(UMLWidget* widget) { return (widget == m_role[A].m_pWidget || widget == m_role[B].m_pWidget); } @@ -1896,7 +1896,7 @@ void AssociationWidget::constrainTextPos(int &textX, int &textY, double r = sqrt((x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0)) / 2; if (textWidth > r) r = textWidth; - // swap textCenter{X,Y} to convert from Qt coord.system. + // swap textCenter{X,Y} to convert from TQt coord.system. const TQPoint origTextCenter(textCenterY, textCenterX); const int relX = abs(origTextCenter.x() - midP.x()); const int relY = abs(origTextCenter.y() - midP.y()); @@ -1907,8 +1907,8 @@ void AssociationWidget::constrainTextPos(int &textX, int &textY, /* The original constraint was to snap the text position to the midpoint but that creates unpleasant visual jitter: - textX = midP.y() - textWidth / 2; // go back to Qt coord.sys. - textY = midP.x() - textHeight / 2; // go back to Qt coord.sys. + textX = midP.y() - textWidth / 2; // go back to TQt coord.sys. + textY = midP.x() - textHeight / 2; // go back to TQt coord.sys. Rather, we project the text position onto the closest point on the circle: @@ -1938,9 +1938,9 @@ void AssociationWidget::constrainTextPos(int &textX, int &textY, // Handle the special case, relX = 0. if (relX == 0) { if (origTextCenter.y() > midP.y()) - textX = midP.y() + (int)r; // go back to Qt coord.sys. + textX = midP.y() + (int)r; // go back to TQt coord.sys. else - textX = midP.y() - (int)r; // go back to Qt coord.sys. + textX = midP.y() - (int)r; // go back to TQt coord.sys. textX -= textWidth / 2; return; } @@ -1948,14 +1948,14 @@ void AssociationWidget::constrainTextPos(int &textX, int &textY, const double x = sqrt(r*r / (a*a + 1)); const double y = a * x; if (origTextCenter.x() > midP.x()) - textY = midP.x() + (int)x; // go back to Qt coord.sys. + textY = midP.x() + (int)x; // go back to TQt coord.sys. else - textY = midP.x() - (int)x; // go back to Qt coord.sys. + textY = midP.x() - (int)x; // go back to TQt coord.sys. textY -= textHeight / 2; if (origTextCenter.y() > midP.y()) - textX = midP.y() + (int)y; // go back to Qt coord.sys. + textX = midP.y() + (int)y; // go back to TQt coord.sys. else - textX = midP.y() - (int)y; // go back to Qt coord.sys. + textX = midP.y() - (int)y; // go back to TQt coord.sys. textX -= textWidth / 2; } @@ -2099,9 +2099,9 @@ void AssociationWidget::createAssocClassLine() { if (m_pAssocClassLine == NULL) m_pAssocClassLine = new TQCanvasLine(m_pView->canvas()); computeAssocClassLine(); - TQPen pen(getLineColor(), getLineWidth(), Qt::DashLine); + TQPen pen(getLineColor(), getLineWidth(), TQt::DashLine); m_pAssocClassLine->setPen(pen); - m_pAssocClassLine->setVisible(true); + m_pAssocClassLine->tqsetVisible(true); } void AssociationWidget::createAssocClassLine(ClassifierWidget* classifier, @@ -2181,7 +2181,7 @@ void AssociationWidget::mousePressEvent(TQMouseEvent * me) { // See if the user has clicked on a point to start moving the line segment // from that point checkPoints(mep); - if( me -> state() != Qt::ShiftButton ) + if( me -> state() != TQt::ShiftButton ) m_pView -> clearSelected(); setSelected( !m_bSelected ); } @@ -2629,7 +2629,7 @@ TQPoint AssociationWidget::findIntercept(const TQRect &rect, const TQPoint &poin default: break; } - // The Qt coordinate system has (0,0) in the top left corner. + // The TQt coordinate system has (0,0) in the top left corner. // In order to go to the regular XY coordinate system with (0,0) // in the bottom left corner, we swap the X and Y axis. // That's why the following assignments look twisted. @@ -2699,7 +2699,7 @@ int AssociationWidget::findInterceptOnEdge(const TQRect &rect, AssociationWidget::Region region, const TQPoint &point) { - // The Qt coordinate system has (0,0) in the top left corner. + // The TQt coordinate system has (0,0) in the top left corner. // In order to go to the regular XY coordinate system with (0,0) // in the bottom left corner, we swap the X and Y axis. // That's why the following assignments look twisted. @@ -2730,7 +2730,7 @@ int AssociationWidget::findInterceptOnEdge(const TQRect &rect, if (region == North || region == South) { if (dX == 0) return rectMidY; - // should be rectMidX, but we go back to Qt coord.sys. + // should be rectMidX, but we go back to TQt coord.sys. if (dY == 0) { kError() << "AssociationWidget::findInterceptOnEdge usage error: " << "North/South (dY == 0)" << endl; @@ -2743,11 +2743,11 @@ int AssociationWidget::findInterceptOnEdge(const TQRect &rect, else relativeX = -(float)rectHalfHeight / m; return (rectMidY + (int)relativeX); - // should be rectMidX, but we go back to Qt coord.sys. + // should be rectMidX, but we go back to TQt coord.sys. } else { if (dY == 0) return rectMidX; - // should be rectMidY, but we go back to Qt coord.sys. + // should be rectMidY, but we go back to TQt coord.sys. if (dX == 0) { kError() << "AssociationWidget::findInterceptOnEdge usage error: " << "East/West (dX == 0)" << endl; @@ -2758,7 +2758,7 @@ int AssociationWidget::findInterceptOnEdge(const TQRect &rect, if (region == West) relativeY = -relativeY; return (rectMidX + (int)relativeY); - // should be rectMidY, but we go back to Qt coord.sys. + // should be rectMidY, but we go back to TQt coord.sys. } } @@ -3121,14 +3121,14 @@ void AssociationWidget::setUMLObject(UMLObject *obj) { setOperation(dynamic_cast<UMLOperation *>(obj)); break; case Uml::ot_Attribute: - klass = static_cast<UMLClassifier*>(obj->parent()); + klass = static_cast<UMLClassifier*>(obj->tqparent()); connect(klass, TQT_SIGNAL(attributeRemoved(UMLClassifierListItem*)), this, TQT_SLOT(slotAttributeRemoved(UMLClassifierListItem*))); attr = static_cast<UMLAttribute*>(obj); connect(attr, TQT_SIGNAL(attributeChanged()), this, TQT_SLOT(slotAttributeChanged())); break; case Uml::ot_EntityAttribute: - ent = static_cast<UMLEntity*>(obj->parent()); + ent = static_cast<UMLEntity*>(obj->tqparent()); connect(ent, TQT_SIGNAL(entityAttributeRemoved(UMLClassifierListItem*)), this, TQT_SLOT(slotAttributeRemoved(UMLClassifierListItem*))); break; diff --git a/umbrello/umbrello/associationwidget.h b/umbrello/umbrello/associationwidget.h index f562983c..0227274d 100644 --- a/umbrello/umbrello/associationwidget.h +++ b/umbrello/umbrello/associationwidget.h @@ -54,6 +54,7 @@ class UMLOperation; */ class AssociationWidget : public WidgetBase, public LinkWidget { Q_OBJECT + TQ_OBJECT public: /** * Enumeration used for stating where a line is on a widget. @@ -68,14 +69,14 @@ public: /** * Constructor. * - * @param view The parent view of this widget. + * @param view The tqparent view of this widget. */ AssociationWidget(UMLView *view); /** * Constructor. * - * @param view The parent view of this widget. + * @param view The tqparent view of this widget. * @param WidgetA Pointer to the role A widget for the association. * @param Type The Association_Type for this association. * @param WidgetB Pointer to the role B widget for the association. @@ -243,7 +244,7 @@ public: * * @return True if widget plays role A or B in this assoc. */ - bool contains(UMLWidget* widget); + bool tqcontains(UMLWidget* widget); /** * Returns true if this AssociationWidget represents a collaboration message. @@ -1011,7 +1012,7 @@ public slots: /** * This slot is entered when an event has occurred on the views display, * most likely a mouse event. Before it sends out that mouse event all - * children should make sure that they don't have a menu active or there + * tqchildren should make sure that they don't have a menu active or there * could be more than one popup menu displayed. */ void slotRemovePopupMenu(); diff --git a/umbrello/umbrello/attribute.cpp b/umbrello/umbrello/attribute.cpp index 9266c1f4..fa71c865 100644 --- a/umbrello/umbrello/attribute.cpp +++ b/umbrello/umbrello/attribute.cpp @@ -23,11 +23,11 @@ #include "dialogs/umlattributedialog.h" #include "object_factory.h" -UMLAttribute::UMLAttribute( const UMLObject *parent, +UMLAttribute::UMLAttribute( const UMLObject *tqparent, const TQString& name, Uml::IDType id, Uml::Visibility s, UMLObject *type, const TQString& iv ) - : UMLClassifierListItem(parent, name, id) { + : UMLClassifierListItem(tqparent, name, id) { m_InitialValue = iv; m_BaseType = Uml::ot_Attribute; m_Vis = s; @@ -40,7 +40,7 @@ UMLAttribute::UMLAttribute( const UMLObject *parent, m_pSecondary = type; } -UMLAttribute::UMLAttribute(const UMLObject *parent) : UMLClassifierListItem(parent) { +UMLAttribute::UMLAttribute(const UMLObject *tqparent) : UMLClassifierListItem(tqparent) { m_BaseType = Uml::ot_Attribute; m_Vis = Uml::Visibility::Private; m_ParmKind = Uml::pd_In; @@ -88,15 +88,15 @@ TQString UMLAttribute::toString(Uml::Signature_Type sig) { if(sig == Uml::st_ShowSig || sig == Uml::st_SigNoVis) { // Determine whether the type name needs to be scoped. - UMLObject *owningObject = static_cast<UMLObject*>(parent()); + UMLObject *owningObject = static_cast<UMLObject*>(tqparent()); if (owningObject->getBaseType() == Uml::ot_Operation) { - // The immediate parent() is the UMLOperation but we want + // The immediate tqparent() is the UMLOperation but we want // the UMLClassifier: - owningObject = static_cast<UMLObject*>(owningObject->parent()); + owningObject = static_cast<UMLObject*>(owningObject->tqparent()); } UMLClassifier *ownParent = dynamic_cast<UMLClassifier*>(owningObject); if (ownParent == NULL) { - kError() << "UMLAttribute::toString: parent " + kError() << "UMLAttribute::toString: tqparent " << owningObject->getName() << " is not a UMLClassifier" << endl; return ""; @@ -129,15 +129,15 @@ TQString UMLAttribute::toString(Uml::Signature_Type sig) { TQString UMLAttribute::getFullyQualifiedName( const TQString& separator, bool includeRoot /* = false */) const { UMLOperation *op = NULL; - UMLObject *owningObject = static_cast<UMLObject*>(parent()); + UMLObject *owningObject = static_cast<UMLObject*>(tqparent()); if (owningObject->getBaseType() == Uml::ot_Operation) { op = static_cast<UMLOperation*>(owningObject); - owningObject = static_cast<UMLObject*>(owningObject->parent()); + owningObject = static_cast<UMLObject*>(owningObject->tqparent()); } UMLClassifier *ownParent = dynamic_cast<UMLClassifier*>(owningObject); if (ownParent == NULL) { kError() << "UMLAttribute::getFullyQualifiedName(" << m_Name - << "): parent " << owningObject->getName() + << "): tqparent " << owningObject->getName() << " is not a UMLClassifier" << endl; return ""; } @@ -168,7 +168,7 @@ bool UMLAttribute::operator==( UMLAttribute &rhs) { void UMLAttribute::copyInto(UMLAttribute *rhs) const { - // call the parent first. + // call the tqparent first. UMLClassifierListItem::copyInto(rhs); // Copy all datamembers @@ -180,8 +180,8 @@ void UMLAttribute::copyInto(UMLAttribute *rhs) const UMLObject* UMLAttribute::clone() const { - //FIXME: The new attribute should be slaved to the NEW parent not the old. - UMLAttribute *clone = new UMLAttribute( static_cast<UMLObject*>(parent()) ); + //FIXME: The new attribute should be slaved to the NEW tqparent not the old. + UMLAttribute *clone = new UMLAttribute( static_cast<UMLObject*>(tqparent()) ); copyInto(clone); return clone; @@ -249,8 +249,8 @@ bool UMLAttribute::load( TQDomElement & element ) { return true; } -bool UMLAttribute::showPropertiesDialog(TQWidget* parent) { - UMLAttributeDialog dialog(parent, this); +bool UMLAttribute::showPropertiesDialog(TQWidget* tqparent) { + UMLAttributeDialog dialog(tqparent, this); return dialog.exec(); } @@ -260,7 +260,7 @@ void UMLAttribute::setTemplateParams(const TQString& templateParam, UMLClassifie return; TQString type = templateParam.simplifyWhiteSpace(); - int start = type.find(TQChar('<')); + int start = type.tqfind(TQChar('<')); if (start >= 0 ) { int end = start; int count = 1; @@ -294,7 +294,7 @@ void UMLAttribute::setTemplateParams(const TQString& templateParam, UMLClassifie //We want to list only the params that already exist in this document //If the param doesnt't already exist, we couldn't draw an association anyway UMLClassifier* tmpClassifier = static_cast<UMLClassifier*>(obj); - if (templateParamList.findRef(tmpClassifier) == -1) { + if (templateParamList.tqfindRef(tmpClassifier) == -1) { templateParamList.append(tmpClassifier); } } @@ -311,9 +311,9 @@ UMLClassifierList UMLAttribute::getTemplateParams() { // Handle C++/D/Java template/generic parameters const Uml::Programming_Language pl = UMLApp::app()->getActiveLanguage(); if (pl == Uml::pl_Cpp || pl == Uml::pl_Java || pl == Uml::pl_D) { - int start = type.find(TQChar('<')); + int start = type.tqfind(TQChar('<')); if (start >= 0 ) { - int end = type.findRev(TQChar('>')); + int end = type.tqfindRev(TQChar('>')); if (end > start) { templateParam = type.mid(start + 1, end - start - 1); setTemplateParams(templateParam, templateParamList); diff --git a/umbrello/umbrello/attribute.h b/umbrello/umbrello/attribute.h index 7749b3e4..ab904874 100644 --- a/umbrello/umbrello/attribute.h +++ b/umbrello/umbrello/attribute.h @@ -27,18 +27,19 @@ */ class UMLAttribute : public UMLClassifierListItem { Q_OBJECT + TQ_OBJECT public: /** * Sets up an attribute. * - * @param parent The parent of this UMLAttribute. + * @param tqparent The tqparent of this UMLAttribute. * @param name The name of this UMLAttribute. * @param id The unique id given to this UMLAttribute. * @param s The visibility of the UMLAttribute. * @param type The type of this UMLAttribute. * @param iv The initial value of the attribute. */ - UMLAttribute(const UMLObject *parent, const TQString& name, + UMLAttribute(const UMLObject *tqparent, const TQString& name, Uml::IDType id = Uml::id_None, Uml::Visibility s = Uml::Visibility::Private, UMLObject *type = 0, const TQString& iv = 0); @@ -46,9 +47,9 @@ public: /** * Sets up an attribute. * - * @param parent The parent of this UMLAttribute. + * @param tqparent The tqparent of this UMLAttribute. */ - UMLAttribute(const UMLObject *parent); + UMLAttribute(const UMLObject *tqparent); /** * Overloaded '==' operator @@ -109,7 +110,7 @@ public: /** * Reimplement method from UMLObject. */ - TQString getFullyQualifiedName(const TQString& separator = TQString::null, + TQString getFullyQualifiedName(const TQString& separator = TQString(), bool includeRoot = false) const; /** @@ -120,7 +121,7 @@ public: /** * Display the properties configuration dialog for the attribute. */ - virtual bool showPropertiesDialog(TQWidget* parent); + virtual bool showPropertiesDialog(TQWidget* tqparent); void setParmKind (Uml::Parameter_Direction pk); Uml::Parameter_Direction getParmKind () const; diff --git a/umbrello/umbrello/autolayout/_graph.h b/umbrello/umbrello/autolayout/_graph.h index 179a9471..b3c42f30 100644 --- a/umbrello/umbrello/autolayout/_graph.h +++ b/umbrello/umbrello/autolayout/_graph.h @@ -15,7 +15,7 @@ #ifndef AUTOLAYOUTGRAPH_H #define AUTOLAYOUTGRAPH_H #include "baseinclude.h" -namespace Autolayout { +namespace Autotqlayout { /** @author Dimitri Ognibene <ognibened @yahoo.it> diff --git a/umbrello/umbrello/autolayout/autolayout.h b/umbrello/umbrello/autolayout/autolayout.h index 9f34a1d8..fecb2c6f 100644 --- a/umbrello/umbrello/autolayout/autolayout.h +++ b/umbrello/umbrello/autolayout/autolayout.h @@ -31,12 +31,12 @@ -#include "autolayouter.h" -#include "autolayouteradapter.h" -#include "graphvizautolayouter.h" -#include "dotautolayouter.h" -#include "circoautolayouter.h" -#include "neatoautolayouter.h" +#include "autotqlayouter.h" +#include "autotqlayouteradapter.h" +#include "graphvizautotqlayouter.h" +#include "dotautotqlayouter.h" +#include "circoautotqlayouter.h" +#include "neatoautotqlayouter.h" diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp index 894dddbc..61bf16b6 100644 --- a/umbrello/umbrello/autolayout/autolayoutdlg.cpp +++ b/umbrello/umbrello/autolayout/autolayoutdlg.cpp @@ -9,100 +9,100 @@ * * ***************************************************************************/ -#include "autolayoutdlg.h" +#include "autotqlayoutdlg.h" #include "../associationwidget.h" #include "../umlwidget.h" -#include "autolayout.h" -#include "newautolayoutdialog.h" +#include "autotqlayout.h" +#include "newautotqlayoutdialog.h" #include <tqcheckbox.h> #include <tqspinbox.h> #include <tqslider.h> #include <kdebug.h> -AutolayoutDlg::AutolayoutDlg(KConfig* c,UMLView* v,TQWidget *parent, const char *name) - :MyDialog1(parent, name) +AutotqlayoutDlg::AutotqlayoutDlg(KConfig* c,UMLView* v,TQWidget *tqparent, const char *name) + :MyDialog1(tqparent, name) { view=v; readConfig(c); config=c; } -void AutolayoutDlg::slotSetAssociationWeight(int i) +void AutotqlayoutDlg::slotSetAssociationWeight(int i) { associationWeight=i; } -void AutolayoutDlg::slotSetDependenciesWeight(int i) +void AutotqlayoutDlg::slotSetDependenciesWeight(int i) { dependenciesWeight=i; } -void AutolayoutDlg::slotSetGeneralizationWeight(int i) +void AutotqlayoutDlg::slotSetGeneralizationWeight(int i) { generalizationWeight=i; } -void AutolayoutDlg::slotSetGenralizationAsEdges(bool b) +void AutotqlayoutDlg::slotSetGenralizationAsEdges(bool b) { genralizationAsEdges=b; } -void AutolayoutDlg::slotSetDependenciesAsEdges(bool b) +void AutotqlayoutDlg::slotSetDependenciesAsEdges(bool b) { dependenciesAsEdges=b; } -void AutolayoutDlg::slotSetAssociationAsEdges(bool b) +void AutotqlayoutDlg::slotSetAssociationAsEdges(bool b) { associationAsEdges=b; } -void AutolayoutDlg::slotSetCompressShapes(bool b) +void AutotqlayoutDlg::slotSetCompressShapes(bool b) { compressShapes=b; } -void AutolayoutDlg::slotSetCenterDiagram(bool b) +void AutotqlayoutDlg::slotSetCenterDiagram(bool b) { centerDiagram=b; } -void AutolayoutDlg::slotSetClusterizeHierarchies(bool b) +void AutotqlayoutDlg::slotSetClusterizeHierarchies(bool b) { clusterizeHierarchies=b; } -void AutolayoutDlg::slotSetShapeSeparation(int i) +void AutotqlayoutDlg::slotSetShapeSeparation(int i) { - shapeSeparation=i; + tqshapeSeparation=i; } -void AutolayoutDlg::slotReloadSettings() +void AutotqlayoutDlg::slotReloadSettings() { readConfig(config); } -void AutolayoutDlg::slotSaveSettings() +void AutotqlayoutDlg::slotSaveSettings() { writeConfig(config); } -void AutolayoutDlg::slotDoAutolayout() +void AutotqlayoutDlg::slotDoAutotqlayout() { - Autolayout::Autolayouter* a=getAutolayouter();; + Autotqlayout::Autotqlayouter* a=getAutotqlayouter();; a->setAssociationAsEdges( associationAsEdges); a->setAssociationWeight( associationWeight ); @@ -115,16 +115,16 @@ void AutolayoutDlg::slotDoAutolayout() a->setGeneralizationWeight( generalizationWeight); a->setNoteConnectionWeight( 1); a->setNoteConnectionsAsEdges(true); - a->setShapeSeparation( shapeSeparation); - a->autolayout( view); + a->setShapeSeparation( tqshapeSeparation); + a->autotqlayout( view); delete a; a=0; accept(); } -void AutolayoutDlg::readConfig( KConfig * conf) +void AutotqlayoutDlg::readConfig( KConfig * conf) { - conf->setGroup("AutolayoutDlg"); + conf->setGroup("AutotqlayoutDlg"); associationEdgesCB->setChecked((bool)(conf->readBoolEntry( "associationAsEdges",false))); centerDiagramCB->setChecked((bool)(conf->readBoolEntry( "centerDiagram",true))); dependenciesEdgesCB->setChecked((bool)(conf->readBoolEntry( "dependenciesAsEdges",false))); @@ -134,14 +134,14 @@ void AutolayoutDlg::readConfig( KConfig * conf) generalizationCB->setChecked((bool)(conf->readBoolEntry( "genralizationAsEdges",true))); generalizationEdgessSL->setValue((int)(conf->readNumEntry( "generalizationWeight",1))); associationEdgesSL->setValue((int)(conf->readNumEntry( "associationWeight",0))); - shapeSeparationSB->setValue((int)(conf->readNumEntry( "shapeSeparation",0))); + tqshapeSeparationSB->setValue((int)(conf->readNumEntry( "tqshapeSeparation",0))); algorithmCOB->setCurrentItem((int)(conf->readNumEntry( "algorithm",0))); } -void AutolayoutDlg::writeConfig( KConfig * conf) +void AutotqlayoutDlg::writeConfig( KConfig * conf) { // conf=kapp->config(); - conf->setGroup("AutolayoutDlg"); + conf->setGroup("AutotqlayoutDlg"); conf->writeEntry( "associationAsEdges",associationEdgesCB->isChecked()); conf->writeEntry( "centerDiagram", centerDiagramCB->isChecked()); conf->writeEntry("dependenciesAsEdges",dependenciesEdgesCB->isChecked()); @@ -151,7 +151,7 @@ void AutolayoutDlg::writeConfig( KConfig * conf) conf->writeEntry("generalizationWeight",generalizationEdgessSL->value()); conf->writeEntry("associationWeight",associationEdgesSL->value()); - conf->writeEntry("shapeSeparation",shapeSeparationSB->value()); + conf->writeEntry("tqshapeSeparation",tqshapeSeparationSB->value()); //conf->writeEntry("al @@ -159,26 +159,26 @@ void AutolayoutDlg::writeConfig( KConfig * conf) } -void AutolayoutDlg::slotSelectAlgorithm( const TQString& _algname) +void AutotqlayoutDlg::slotSelectAlgorithm( const TQString& _algname) { algname=_algname; } -Autolayout::Autolayouter * AutolayoutDlg::getAutolayouter( ) +Autotqlayout::Autotqlayouter * AutotqlayoutDlg::getAutotqlayouter( ) { const TQString text = algorithmCOB->currentText(); - kDebug() << "Autolayout Algorithm " << algname << " found " << text << endl; + kDebug() << "Autotqlayout Algorithm " << algname << " found " << text << endl; if (text == "dot") - return new Autolayout::DotAutolayouter(); + return new Autotqlayout::DotAutotqlayouter(); if (text == "circo") - return new Autolayout::CircoAutolayouter(); + return new Autotqlayout::CircoAutotqlayouter(); if (text == "neato") - return new Autolayout::NeatoAutolayouter(); - kError() << "Autolayout Algorithm not found" << endl; - return new Autolayout::DotAutolayouter(); + return new Autotqlayout::NeatoAutotqlayouter(); + kError() << "Autotqlayout Algorithm not found" << endl; + return new Autotqlayout::DotAutotqlayouter(); } -#include "autolayoutdlg.moc" +#include "autotqlayoutdlg.moc" diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h index 126c4a08..a664a7b7 100644 --- a/umbrello/umbrello/autolayout/autolayoutdlg.h +++ b/umbrello/umbrello/autolayout/autolayoutdlg.h @@ -12,17 +12,18 @@ #ifndef AUTOLAYOUTDLG_H #define AUTOLAYOUTDLG_H -#include "newautolayoutdialog.h" +#include "newautotqlayoutdialog.h" #include "../umlview.h" #include <tqobject.h> #include <kconfig.h> -#include "autolayout.h" +#include "autotqlayout.h" -class AutolayoutDlg : public MyDialog1 +class AutotqlayoutDlg : public MyDialog1 { Q_OBJECT + TQ_OBJECT public: - AutolayoutDlg(KConfig* c,UMLView* v, TQWidget *parent = 0, const char *name = 0); + AutotqlayoutDlg(KConfig* c,UMLView* v, TQWidget *tqparent = 0, const char *name = 0); public slots: virtual void slotSetAssociationWeight(int i); virtual void slotSetDependenciesWeight(int i); @@ -36,7 +37,7 @@ class AutolayoutDlg : public MyDialog1 virtual void slotSetShapeSeparation(int i); virtual void slotReloadSettings(); virtual void slotSaveSettings(); - virtual void slotDoAutolayout(); + virtual void slotDoAutotqlayout(); void readConfig(KConfig*); void writeConfig(KConfig*); virtual void slotSelectAlgorithm(const TQString&); @@ -53,10 +54,10 @@ class AutolayoutDlg : public MyDialog1 bool compressShapes; bool centerDiagram; bool clusterizeHierarchies; - int shapeSeparation; + int tqshapeSeparation; KConfig* config; TQString algname; - Autolayout::Autolayouter* getAutolayouter(); + Autotqlayout::Autotqlayouter* getAutotqlayouter(); }; diff --git a/umbrello/umbrello/autolayout/autolayouter.cpp b/umbrello/umbrello/autolayout/autolayouter.cpp index f70fd195..caf852b7 100644 --- a/umbrello/umbrello/autolayout/autolayouter.cpp +++ b/umbrello/umbrello/autolayout/autolayouter.cpp @@ -11,13 +11,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "autolayouter.h" +#include "autotqlayouter.h" -namespace Autolayout { +namespace Autotqlayout { -void Autolayouter::autolayout( UMLView * v ) +void Autotqlayouter::autotqlayout( UMLView * v ) { setCanvas(v); setGraph(v); @@ -25,5 +25,5 @@ void Autolayouter::autolayout( UMLView * v ) updateView(v); } -} // end namespace Autolayout +} // end namespace Autotqlayout diff --git a/umbrello/umbrello/autolayout/autolayouter.h b/umbrello/umbrello/autolayout/autolayouter.h index a56b1ce3..40a24235 100644 --- a/umbrello/umbrello/autolayout/autolayouter.h +++ b/umbrello/umbrello/autolayout/autolayouter.h @@ -13,17 +13,17 @@ #define AUTOLAYOUTAUTOLAYOUTER_H #include "baseinclude.h" -namespace Autolayout { +namespace Autotqlayout { /** -This is the super class of any class which encapsulate an autolayout algorithm +This is the super class of any class which encapsulate an autotqlayout algorithm @author Dimitri Ognibene <ognibened @yahoo.it> */ -class Autolayouter { +class Autotqlayouter { public: - virtual ~Autolayouter() {} + virtual ~Autotqlayouter() {} virtual void setNoteConnectionWeight(int i)=0; virtual void setNoteConnectionsAsEdges(bool b)=0; @@ -47,14 +47,14 @@ public: virtual void setShapeSeparation(int i)=0; - virtual void autolayout(UMLView* v); + virtual void autotqlayout(UMLView* v); protected: virtual void run()=0; virtual void updateView(UMLView*)=0; - virtual Autolayout::Canvas* getCanvas()=0; - virtual Autolayout::Graph* getGraph()=0; - virtual Autolayout::Graph* setGraph(UMLView* view)=0; - virtual Autolayout::Canvas* setCanvas(UMLView* view)=0; + virtual Autotqlayout::Canvas* getCanvas()=0; + virtual Autotqlayout::Graph* getGraph()=0; + virtual Autotqlayout::Graph* setGraph(UMLView* view)=0; + virtual Autotqlayout::Canvas* setCanvas(UMLView* view)=0; }; diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.cpp b/umbrello/umbrello/autolayout/autolayouteradapter.cpp index 0673fde1..0bba19c7 100644 --- a/umbrello/umbrello/autolayout/autolayouteradapter.cpp +++ b/umbrello/umbrello/autolayout/autolayouteradapter.cpp @@ -9,21 +9,21 @@ * * ***************************************************************************/ -#include "autolayouteradapter.h" +#include "autotqlayouteradapter.h" -namespace Autolayout +namespace Autotqlayout { - AutolayouterAdapter::AutolayouterAdapter() - : Autolayout::Autolayouter() + AutotqlayouterAdapter::AutotqlayouterAdapter() + : Autotqlayout::Autotqlayouter() {} - AutolayouterAdapter::~AutolayouterAdapter() + AutotqlayouterAdapter::~AutotqlayouterAdapter() {}} -void Autolayout::AutolayouterAdapter::addRelationship( AssociationWidget * a ) +void Autotqlayout::AutotqlayouterAdapter::addRelationship( AssociationWidget * a ) { int weight; switch (a->getAssocType()) @@ -71,60 +71,60 @@ void Autolayout::AutolayouterAdapter::addRelationship( AssociationWidget * a ) getGraph()->addEdge(a->getWidgetID(Uml::A).c_str(),a->getWidgetID(Uml::B).c_str(),weight); } -void Autolayout::AutolayouterAdapter::setAssociationWeight( int i ) +void Autotqlayout::AutotqlayouterAdapter::setAssociationWeight( int i ) { associationWeight=i; } -void Autolayout::AutolayouterAdapter::setDependenciesWeight( int i ) +void Autotqlayout::AutotqlayouterAdapter::setDependenciesWeight( int i ) { dependenciesWeight=i; } -void Autolayout::AutolayouterAdapter::setGeneralizationWeight( int i ) +void Autotqlayout::AutotqlayouterAdapter::setGeneralizationWeight( int i ) { generalizationWeight=i; } -void Autolayout::AutolayouterAdapter::setGeneralizationAsEdges( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setGeneralizationAsEdges( bool b ) { genralizationAsEdges=b; } -void Autolayout::AutolayouterAdapter::setDependenciesAsEdges( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setDependenciesAsEdges( bool b ) { dependenciesAsEdges=b; } -void Autolayout::AutolayouterAdapter::setAssociationAsEdges( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setAssociationAsEdges( bool b ) { associationAsEdges=b; } -void Autolayout::AutolayouterAdapter::setCompressShapes( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setCompressShapes( bool b ) { compressShapes=b; } -void Autolayout::AutolayouterAdapter::setCenterDiagram( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setCenterDiagram( bool b ) { centerDiagram=b; } -void Autolayout::AutolayouterAdapter::setClusterizeHierarchies( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setClusterizeHierarchies( bool b ) { clusterizeHierarchies=b; } -void Autolayout::AutolayouterAdapter::setShapeSeparation( int i ) +void Autotqlayout::AutotqlayouterAdapter::setShapeSeparation( int i ) { - shapeSeparation=i; + tqshapeSeparation=i; } -Autolayout::Graph * Autolayout::AutolayouterAdapter::setGraph( UMLView * view ) +Autotqlayout::Graph * Autotqlayout::AutotqlayouterAdapter::setGraph( UMLView * view ) { if (! view) return 0; - Autolayout::Graph * g=getGraph(); + Autotqlayout::Graph * g=getGraph(); if (g&&g->empty()) { UMLWidgetList list = view->getWidgetList(); @@ -151,7 +151,7 @@ Autolayout::Graph * Autolayout::AutolayouterAdapter::setGraph( UMLView * view ) return g; } -void Autolayout::AutolayouterAdapter::updateView( UMLView* view ) +void Autotqlayout::AutotqlayouterAdapter::updateView( UMLView* view ) { if (! view) return ; UMLWidgetList list = view->getWidgetList(); @@ -175,17 +175,17 @@ UMLWidgetList list = view->getWidgetList(); } } -Autolayout::Canvas * Autolayout::AutolayouterAdapter::setCanvas( UMLView* view ) +Autotqlayout::Canvas * Autotqlayout::AutotqlayouterAdapter::setCanvas( UMLView* view ) { - return canvas=new Autolayout::SimpleCanvas(view->getCanvasWidth(),view->getCanvasHeight()); + return canvas=new Autotqlayout::SimpleCanvas(view->getCanvasWidth(),view->getCanvasHeight()); } -void Autolayout::AutolayouterAdapter::setNoteConnectionWeight( int i ) +void Autotqlayout::AutotqlayouterAdapter::setNoteConnectionWeight( int i ) { noteConnectionWeight=i; } -void Autolayout::AutolayouterAdapter::setNoteConnectionsAsEdges( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setNoteConnectionsAsEdges( bool b ) { noteConnectionAsEdges=b; } diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.h b/umbrello/umbrello/autolayout/autolayouteradapter.h index 7c52e742..0d8e9021 100644 --- a/umbrello/umbrello/autolayout/autolayouteradapter.h +++ b/umbrello/umbrello/autolayout/autolayouteradapter.h @@ -11,24 +11,24 @@ #ifndef AUTOLAYOUTAUTOLAYOUTERADAPTER_H #define AUTOLAYOUTAUTOLAYOUTERADAPTER_H -//#include "autolayout.h" +//#include "autotqlayout.h" #include "baseinclude.h" -#include "autolayouter.h" +#include "autotqlayouter.h" #include "../umlnamespace.h" -namespace Autolayout +namespace Autotqlayout { /** @author Dimitri Ognibene <ognibened @yahoo.it> */ -class AutolayouterAdapter : virtual public Autolayout::Autolayouter +class AutotqlayouterAdapter : virtual public Autotqlayout::Autotqlayouter { public: - AutolayouterAdapter(); + AutotqlayouterAdapter(); - virtual ~AutolayouterAdapter(); + virtual ~AutotqlayouterAdapter(); virtual void setAssociationWeight(int i); virtual void setDependenciesWeight(int i); @@ -70,7 +70,7 @@ protected: bool compressShapes; bool centerDiagram; bool clusterizeHierarchies; - int shapeSeparation; + int tqshapeSeparation; int noteConnectionWeight; bool noteConnectionAsEdges; bool anchorsAsEdges; diff --git a/umbrello/umbrello/autolayout/canvas.h b/umbrello/umbrello/autolayout/canvas.h index 246df8a7..210b1353 100644 --- a/umbrello/umbrello/autolayout/canvas.h +++ b/umbrello/umbrello/autolayout/canvas.h @@ -15,7 +15,7 @@ #ifndef AUTOLAYOUTCANVAS_H #define AUTOLAYOUTCANVAS_H -namespace Autolayout { +namespace Autotqlayout { /** @author Dimitri Ognibene <ognibened @yahoo.it> diff --git a/umbrello/umbrello/autolayout/diagram.h b/umbrello/umbrello/autolayout/diagram.h index 33bda398..43f35f51 100644 --- a/umbrello/umbrello/autolayout/diagram.h +++ b/umbrello/umbrello/autolayout/diagram.h @@ -16,12 +16,12 @@ #define AUTOLAYOUTABLEDIAGRAM_H #include <dotneato.h> #define internal_renderizer -#include "autolayout.h" +#include "autotqlayout.h" /** @author Dimitri Ognibene <ognibened @yahoo.it> Umbrello UML Modeller Authors */ -namespace Autolayout{ +namespace Autotqlayout{ class Diagram//: public virtual Graph, public virtual Canvas{ { private: @@ -39,7 +39,7 @@ public: void addNode(const char *name, int width,int heigt); void addEdge(const char* nodea,const char*nodeb); - void autolayout(); + void autotqlayout(); void save(); Node getNode(const char*); diff --git a/umbrello/umbrello/autolayout/dotautolayouter.cpp b/umbrello/umbrello/autolayout/dotautolayouter.cpp index 5d197845..20d5d34c 100644 --- a/umbrello/umbrello/autolayout/dotautolayouter.cpp +++ b/umbrello/umbrello/autolayout/dotautolayouter.cpp @@ -11,31 +11,31 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "dotautolayouter.h" +#include "dotautotqlayouter.h" #include <graphviz/dotprocs.h> -namespace Autolayout { +namespace Autotqlayout { -DotAutolayouter::DotAutolayouter() - : Autolayout::GraphvizAutolayouter() +DotAutotqlayouter::DotAutotqlayouter() + : Autotqlayout::GraphvizAutotqlayouter() { } -DotAutolayouter::~DotAutolayouter() +DotAutotqlayouter::~DotAutotqlayouter() { dot_cleanup(gg->_agraph); } -void DotAutolayouter::run() +void DotAutotqlayouter::run() { //#ifndef internal_renderizer - /* bind graph to GV context - currently must be done before layout */ + /* bind graph to GV context - currently must be done before tqlayout */ // gvBindContext(gvc,g); //#endif - // do layout + // do tqlayout //dot_layout(); dot_layout( gg->_agraph ); } diff --git a/umbrello/umbrello/autolayout/dotautolayouter.h b/umbrello/umbrello/autolayout/dotautolayouter.h index 5c6530ba..1ccb4bcc 100644 --- a/umbrello/umbrello/autolayout/dotautolayouter.h +++ b/umbrello/umbrello/autolayout/dotautolayouter.h @@ -15,19 +15,19 @@ #ifndef AUTOLAYOUTDOTAUTOLAYOUTER_H #define AUTOLAYOUTDOTAUTOLAYOUTER_H #include "baseinclude.h" -#include "graphvizautolayouter.h" +#include "graphvizautotqlayouter.h" -namespace Autolayout { +namespace Autotqlayout { /** @author Dimitri Ognibene <ognibened @yahoo.it> */ -class DotAutolayouter : virtual public Autolayout::GraphvizAutolayouter +class DotAutotqlayouter : virtual public Autotqlayout::GraphvizAutotqlayouter { public: - DotAutolayouter(); + DotAutotqlayouter(); - virtual ~DotAutolayouter(); + virtual ~DotAutotqlayouter(); virtual void run(); diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp index 8defc5ef..b8fe49d1 100644 --- a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp +++ b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp @@ -11,42 +11,42 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "graphvizautolayouter.h" +#include "graphvizautotqlayouter.h" #include <graphviz/graph.h> -namespace Autolayout { +namespace Autotqlayout { -GraphvizAutolayouter::GraphvizAutolayouter() - : Autolayout::AutolayouterAdapter() +GraphvizAutotqlayouter::GraphvizAutotqlayouter() + : Autotqlayout::AutotqlayouterAdapter() { gg = new GraphvizGraph(); } -GraphvizAutolayouter::~GraphvizAutolayouter() +GraphvizAutotqlayouter::~GraphvizAutotqlayouter() { agclose(gg->_agraph); delete gg; } -void GraphvizAutolayouter::setCompressShapes( bool b ) +void GraphvizAutotqlayouter::setCompressShapes( bool b ) { gg->setCompressShapes(b); } -void GraphvizAutolayouter::setCenterDiagram( bool b ) +void GraphvizAutotqlayouter::setCenterDiagram( bool b ) { gg->setCenterDiagram(b); } -void GraphvizAutolayouter::setShapeSeparation( int i ) +void GraphvizAutotqlayouter::setShapeSeparation( int i ) { gg->setShapeSeparation(i); } -Autolayout::Canvas * GraphvizAutolayouter::setCanvas( UMLView * view ) +Autotqlayout::Canvas * GraphvizAutotqlayouter::setCanvas( UMLView * view ) { - Canvas* canvas= AutolayouterAdapter::setCanvas(view); + Canvas* canvas= AutotqlayouterAdapter::setCanvas(view); gg->setCanvas(canvas); } diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.h b/umbrello/umbrello/autolayout/graphvizautolayouter.h index 114ae63f..a2036749 100644 --- a/umbrello/umbrello/autolayout/graphvizautolayouter.h +++ b/umbrello/umbrello/autolayout/graphvizautolayouter.h @@ -12,19 +12,19 @@ #ifndef AUTOLAYOUTGRAPHVIZAUTOLAYOUTER_H #define AUTOLAYOUTGRAPHVIZAUTOLAYOUTER_H #include "baseinclude.h" -#include "autolayouteradapter.h" +#include "autotqlayouteradapter.h" #include "graphvizgraph.h" -namespace Autolayout +namespace Autotqlayout { /** @author Dimitri Ognibene <ognibened @yahoo.it> */ -class GraphvizAutolayouter : virtual public Autolayout::AutolayouterAdapter +class GraphvizAutotqlayouter : virtual public Autotqlayout::AutotqlayouterAdapter { public: - GraphvizAutolayouter(); + GraphvizAutotqlayouter(); virtual void setCompressShapes(bool b); @@ -35,7 +35,7 @@ public: virtual Canvas* setCanvas(UMLView* view); - virtual ~GraphvizAutolayouter(); + virtual ~GraphvizAutotqlayouter(); protected: virtual Graph* getGraph(){if (!gg) gg=new GraphvizGraph(); return gg;} diff --git a/umbrello/umbrello/autolayout/graphvizgraph.cpp b/umbrello/umbrello/autolayout/graphvizgraph.cpp index 716f9223..a3b4ea8a 100644 --- a/umbrello/umbrello/autolayout/graphvizgraph.cpp +++ b/umbrello/umbrello/autolayout/graphvizgraph.cpp @@ -23,7 +23,7 @@ char* _strcpy(const char* name) a=strcpy(a,name); return a; } -namespace Autolayout +namespace Autotqlayout { /** @@ -31,7 +31,7 @@ namespace Autolayout * @return */ GraphvizGraph::GraphvizGraph() - : Autolayout::Graph() + : Autotqlayout::Graph() { aginit(); empty_flag=true; @@ -42,7 +42,7 @@ GraphvizGraph::GraphvizGraph() a_weight= agedgeattr(_agraph,"weight",""); agnodeattr(_agraph, "fixedsize", "true"); agnodeattr(_agraph, "margin", "0.01,0.01"); - agnodeattr(_agraph, "shape", "box"); + agnodeattr(_agraph, "tqshape", "box"); agraphattr(_agraph, "dpi", "DPI/0"); @@ -96,7 +96,7 @@ void GraphvizGraph::addNode(const char* name, int width, int height) } -void Autolayout::GraphvizGraph::setCompressShapes( bool b ) +void Autotqlayout::GraphvizGraph::setCompressShapes( bool b ) { if (empty()) { @@ -105,7 +105,7 @@ void Autolayout::GraphvizGraph::setCompressShapes( bool b ) } } -void Autolayout::GraphvizGraph::setCenterDiagram( bool b ) +void Autotqlayout::GraphvizGraph::setCenterDiagram( bool b ) { if (empty()) { @@ -114,7 +114,7 @@ void Autolayout::GraphvizGraph::setCenterDiagram( bool b ) } } -void Autolayout::GraphvizGraph::setShapeSeparation( int i ) +void Autotqlayout::GraphvizGraph::setShapeSeparation( int i ) { char* a; asprintf(&a,"%f",((float) i)/10.0); @@ -122,22 +122,22 @@ void Autolayout::GraphvizGraph::setShapeSeparation( int i ) free (a); } -bool Autolayout::GraphvizGraph::empty( ) +bool Autotqlayout::GraphvizGraph::empty( ) { return empty_flag; } -Autolayout::Node* Autolayout::GraphvizGraph::getNode( const char * arg1 ) +Autotqlayout::Node* Autotqlayout::GraphvizGraph::getNode( const char * arg1 ) { char *a = _strcpy(arg1); - Autolayout::GraphvizNode* b= - new Autolayout::GraphvizNode(agnode(_agraph,a)); + Autotqlayout::GraphvizNode* b= + new Autotqlayout::GraphvizNode(agnode(_agraph,a)); delete[](a); nodelist.push_back(b); return b; } -void GraphvizGraph::setCanvas( Autolayout::Canvas * canvas) +void GraphvizGraph::setCanvas( Autotqlayout::Canvas * canvas) { char buf[100]; sprintf(buf,"%f,%f",((float)canvas->getMaxX()/DPI),((float)canvas->getMaxY()/DPI)); @@ -146,5 +146,5 @@ void GraphvizGraph::setCanvas( Autolayout::Canvas * canvas) agraphattr(_agraph, "page", buf); } -} // end namespace Autolayout +} // end namespace Autotqlayout diff --git a/umbrello/umbrello/autolayout/graphvizgraph.h b/umbrello/umbrello/autolayout/graphvizgraph.h index dfbf323d..96ae6c31 100644 --- a/umbrello/umbrello/autolayout/graphvizgraph.h +++ b/umbrello/umbrello/autolayout/graphvizgraph.h @@ -21,13 +21,13 @@ #include <deque> #include <graphviz/types.h> -namespace Autolayout +namespace Autotqlayout { /** @author Dimitri Ognibene <ognibened @yahoo.it> */ -class GraphvizGraph : virtual public Autolayout::Graph +class GraphvizGraph : virtual public Autotqlayout::Graph { public: GraphvizGraph(); @@ -50,7 +50,7 @@ public: std::deque<Node*> nodelist; GVC_t* gvc; bool empty_flag; - friend class GraphvizAutolayouter; + friend class GraphvizAutotqlayouter; }; } diff --git a/umbrello/umbrello/autolayout/graphviznode.cpp b/umbrello/umbrello/autolayout/graphviznode.cpp index ea3510cf..430e176c 100644 --- a/umbrello/umbrello/autolayout/graphviznode.cpp +++ b/umbrello/umbrello/autolayout/graphviznode.cpp @@ -17,7 +17,7 @@ #include <graphviz/types.h> #include <graphviz/graph.h> -namespace Autolayout { +namespace Autotqlayout { @@ -40,7 +40,7 @@ int GraphvizNode::getY() } -Autolayout::GraphvizNode::GraphvizNode( Agnode_t * node ) +Autotqlayout::GraphvizNode::GraphvizNode( Agnode_t * node ) { n=node; } diff --git a/umbrello/umbrello/autolayout/graphviznode.h b/umbrello/umbrello/autolayout/graphviznode.h index 0efcb6d8..1190f5af 100644 --- a/umbrello/umbrello/autolayout/graphviznode.h +++ b/umbrello/umbrello/autolayout/graphviznode.h @@ -18,12 +18,12 @@ class Agnode_t; -namespace Autolayout { +namespace Autotqlayout { /** @author Dimitri Ognibene <ognibened @yahoo.it> */ -class GraphvizNode : virtual public Autolayout::Node +class GraphvizNode : virtual public Autotqlayout::Node { GraphvizNode (Agnode_t* n); diff --git a/umbrello/umbrello/autolayout/newautolayoutdialog.ui b/umbrello/umbrello/autolayout/newautolayoutdialog.ui index e6407a5c..de9477e8 100644 --- a/umbrello/umbrello/autolayout/newautolayoutdialog.ui +++ b/umbrello/umbrello/autolayout/newautolayoutdialog.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MyDialog1</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>MyDialog1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame12</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -44,7 +44,7 @@ <cstring>comboBox1</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>dot</string> @@ -66,7 +66,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -80,7 +80,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -88,12 +88,12 @@ <string>Shape separation</string> </property> <property name="buddy" stdset="0"> - <cstring>shapeSeparationSB</cstring> + <cstring>tqshapeSeparationSB</cstring> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> - <cstring>shapeSeparationSB</cstring> + <cstring>tqshapeSeparationSB</cstring> </property> <property name="prefix"> <string></string> @@ -107,7 +107,7 @@ </widget> </hbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame3</cstring> </property> @@ -121,7 +121,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>clusterizeHierarchiesCB</cstring> </property> @@ -129,7 +129,7 @@ <string>Clusteri&ze Hierarchies</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>centerDiagramCB</cstring> </property> @@ -137,7 +137,7 @@ <string>Ce&nter Diagram</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>compressShapesCB</cstring> </property> @@ -147,14 +147,14 @@ </widget> </hbox> </widget> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter14</cstring> </property> <property name="orientation"> <enum>Horizontal</enum> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame5_2_2</cstring> </property> @@ -168,14 +168,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter7_4</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>generalizationCB</cstring> </property> @@ -186,7 +186,7 @@ <bool>true</bool> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>generalizationEdgessSL</cstring> </property> @@ -203,13 +203,13 @@ <string>Weight</string> </property> <property name="whatsThis" stdset="0"> - <string>Select the weight that the autolayout algoritm must use to compare association with other relationships like Generalization and Dependence</string> + <string>Select the weight that the autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence</string> </property> </widget> </widget> </vbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame5_2</cstring> </property> @@ -223,14 +223,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter7</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>associationEdgesCB</cstring> </property> @@ -238,7 +238,7 @@ <string>Association as Ed&ges</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>associationEdgesSL</cstring> </property> @@ -258,13 +258,13 @@ <string>Weight</string> </property> <property name="whatsThis" stdset="0"> - <string>Select the weight that the autolayout algoritm must use to compare association with other relationships like Generalization and Dependence</string> + <string>Select the weight that the autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence</string> </property> </widget> </widget> </vbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame5</cstring> </property> @@ -278,14 +278,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter6</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>dependenciesEdgesCB</cstring> </property> @@ -293,7 +293,7 @@ <string>Dependencies &as Edges</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>dependenciedEdgesSL</cstring> </property> @@ -313,7 +313,7 @@ <string>Weight</string> </property> <property name="whatsThis" stdset="0"> - <string>Select the weight that the autolayout algoritm must use to compare association with other relationships like Generalization and Dependence</string> + <string>Select the weight that the autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence</string> </property> </widget> </widget> @@ -330,22 +330,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>1</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -366,14 +366,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>277</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -390,7 +390,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -404,7 +404,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>restoreDefaultsBTN</cstring> </property> @@ -412,7 +412,7 @@ <string>&Restore Default</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>saveDefaultsBTN</cstring> </property> @@ -450,7 +450,7 @@ <slot>setEnabled(bool)</slot> </connection> <connection> - <sender>shapeSeparationSB</sender> + <sender>tqshapeSeparationSB</sender> <signal>valueChanged(int)</signal> <receiver>MyDialog1</receiver> <slot>slotSetShapeSeparation(int)</slot> @@ -513,7 +513,7 @@ <sender>buttonOk</sender> <signal>clicked()</signal> <receiver>MyDialog1</receiver> - <slot>slotDoAutolayout()</slot> + <slot>slotDoAutotqlayout()</slot> </connection> <connection> <sender>restoreDefaultsBTN</sender> @@ -534,8 +534,8 @@ <slot>slotSelectAlgorithm(const QString&)</slot> </connection> </connections> -<slots> - <slot>slotDoAutolayout()</slot> +<Q_SLOTS> + <slot>slotDoAutotqlayout()</slot> <slot>slotSaveSettings()</slot> <slot>slotReloadSettings()</slot> <slot>slotSetClusterizeHierarchies(bool b)</slot> @@ -549,6 +549,6 @@ <slot>slotSetCenterDiagram(bool b)</slot> <slot>slotSetShapeSeparation(int i)</slot> <slot specifier="pure virtual">slotSelectAlgorithm(const QString&)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/autolayout/node.h b/umbrello/umbrello/autolayout/node.h index c2532b8b..74259233 100644 --- a/umbrello/umbrello/autolayout/node.h +++ b/umbrello/umbrello/autolayout/node.h @@ -15,7 +15,7 @@ #ifndef AUTOLAYOUTNODE_H #define AUTOLAYOUTNODE_H -namespace Autolayout { +namespace Autotqlayout { /** @author Umbrello UML Modeller Authors diff --git a/umbrello/umbrello/autolayout/simplecanvas.cpp b/umbrello/umbrello/autolayout/simplecanvas.cpp index 0598c15e..38832962 100644 --- a/umbrello/umbrello/autolayout/simplecanvas.cpp +++ b/umbrello/umbrello/autolayout/simplecanvas.cpp @@ -13,7 +13,7 @@ ***************************************************************************/ #include "simplecanvas.h" -namespace Autolayout { +namespace Autotqlayout { diff --git a/umbrello/umbrello/autolayout/simplecanvas.h b/umbrello/umbrello/autolayout/simplecanvas.h index 29712b9e..90cecea5 100644 --- a/umbrello/umbrello/autolayout/simplecanvas.h +++ b/umbrello/umbrello/autolayout/simplecanvas.h @@ -17,7 +17,7 @@ #include "canvas.h" #include <tqrect.h> -namespace Autolayout { +namespace Autotqlayout { /** @author Dimitri Ognibene <ognibened @yahoo.it> diff --git a/umbrello/umbrello/boxwidget.h b/umbrello/umbrello/boxwidget.h index 13f7e480..02e56eb8 100644 --- a/umbrello/umbrello/boxwidget.h +++ b/umbrello/umbrello/boxwidget.h @@ -35,7 +35,7 @@ public: /** * Constructs a BoxWidget. * - * @param view The parent to this widget. + * @param view The tqparent to this widget. * @param id The ID to assign (-1 will prompt a new ID.) */ explicit BoxWidget(UMLView * view, Uml::IDType id = Uml::id_None); @@ -52,7 +52,7 @@ public: /** * Saves the widget to the "boxwidget" XMI element. - * Note: For loading from XMI, the inherited parent method is used. + * Note: For loading from XMI, the inherited tqparent method is used. */ void saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement); }; diff --git a/umbrello/umbrello/classifier.cpp b/umbrello/umbrello/classifier.cpp index 4b8e0bc0..b994097a 100644 --- a/umbrello/umbrello/classifier.cpp +++ b/umbrello/umbrello/classifier.cpp @@ -218,8 +218,8 @@ UMLOperation* UMLClassifier::createOperation(const TQString &name /*=null*/, bool UMLClassifier::addOperation(UMLOperation* op, int position ) { - if (m_List.findRef(op) != -1) { - kDebug() << "UMLClassifier::addOperation: findRef(" + if (m_List.tqfindRef(op) != -1) { + kDebug() << "UMLClassifier::addOperation: tqfindRef(" << op->getName() << ") finds op (bad)" << endl; return false; @@ -380,7 +380,7 @@ UMLClassifierList UMLClassifier::findSubClassConcepts (ClassifierType type) { UMLClassifier *concept = dynamic_cast<UMLClassifier*>(obj); if (concept && (type == ALL || (!concept->isInterface() && type == CLASS) || (concept->isInterface() && type == INTERFACE)) - && (inheritingConcepts.findRef(concept) == -1)) + && (inheritingConcepts.tqfindRef(concept) == -1)) inheritingConcepts.append(concept); } } @@ -392,13 +392,13 @@ UMLClassifierList UMLClassifier::findSuperClassConcepts (ClassifierType type) { UMLClassifierList list = getSuperClasses(); UMLAssociationList rlist = getRealizations(); - UMLClassifierList parentConcepts; + UMLClassifierList tqparentConcepts; Uml::IDType myID = getID(); for (UMLClassifier *concept = list.first(); concept; concept = list.next()) { if (type == ALL || (!concept->isInterface() && type == CLASS) || (concept->isInterface() && type == INTERFACE)) - parentConcepts.append(concept); + tqparentConcepts.append(concept); } for (UMLAssociation *a = rlist.first(); a; a = rlist.next()) @@ -409,12 +409,12 @@ UMLClassifierList UMLClassifier::findSuperClassConcepts (ClassifierType type) { UMLClassifier *concept = dynamic_cast<UMLClassifier*>(obj); if (concept && (type == ALL || (!concept->isInterface() && type == CLASS) || (concept->isInterface() && type == INTERFACE)) - && (parentConcepts.findRef(concept) == -1)) - parentConcepts.append(concept); + && (tqparentConcepts.tqfindRef(concept) == -1)) + tqparentConcepts.append(concept); } } - return parentConcepts; + return tqparentConcepts; } bool UMLClassifier::operator==( UMLClassifier & rhs ) { @@ -571,7 +571,7 @@ UMLAttribute* UMLClassifier::addAttribute(const TQString &name, UMLObject *type, bool UMLClassifier::addAttribute(UMLAttribute* att, IDChangeLog* Log /* = 0 */, int position /* = -1 */) { if (findChildObject(att->getName()) == NULL) { - att->parent()->removeChild( att ); + att->tqparent()->removeChild( att ); this->insertChild( att ); if (position >= 0 && position < (int)m_List.count()) m_List.insert(position, att); @@ -631,15 +631,15 @@ UMLOperationList UMLClassifier::getOpList(bool includeInherited) { ops.append(static_cast<UMLOperation*>(li)); } if (includeInherited) { - UMLClassifierList parents = findSuperClassConcepts(); + UMLClassifierList tqparents = findSuperClassConcepts(); UMLClassifier *c; - for (UMLClassifierListIt pit(parents); (c = pit.current()) != NULL; ++pit) { + for (UMLClassifierListIt pit(tqparents); (c = pit.current()) != NULL; ++pit) { if (c == this) { kError() << "UMLClassifier::getOpList: class " << c->getName() - << " is parent of itself ?!?" << endl; + << " is tqparent of itself ?!?" << endl; continue; } - // get operations for each parent by recursive call + // get operations for each tqparent by recursive call UMLOperationList pops = c->getOpList(true); // add these operations to operation list, but only if unique. for (UMLOperation *po = pops.first(); po; po = pops.next()) { @@ -684,7 +684,7 @@ UMLTemplate* UMLClassifier::addTemplate(const TQString &name, Uml::IDType id) { bool UMLClassifier::addTemplate(UMLTemplate* newTemplate, IDChangeLog* log /* = 0*/) { TQString name = newTemplate->getName(); if (findChildObject(name) == NULL) { - newTemplate->parent()->removeChild(newTemplate); + newTemplate->tqparent()->removeChild(newTemplate); this->insertChild(newTemplate); m_List.append(newTemplate); emit templateAdded(newTemplate); @@ -702,7 +702,7 @@ bool UMLClassifier::addTemplate(UMLTemplate* Template, int position) { TQString name = Template->getName(); if (findChildObject(name) == NULL) { - Template->parent()->removeChild(Template); + Template->tqparent()->removeChild(Template); this->insertChild(Template); if( position >= 0 && position <= (int)m_List.count() ) m_List.insert(position,Template); @@ -765,7 +765,7 @@ int UMLClassifier::takeItem(UMLClassifierListItem *item) { buf.append(' ' + currentAtt->getName()); } kDebug() << " UMLClassifier::takeItem (before): m_List is " << buf << endl; - int index = m_List.findRef(item); + int index = m_List.tqfindRef(item); if (index == -1) return -1; switch (item->getBaseType()) { diff --git a/umbrello/umbrello/classifier.h b/umbrello/umbrello/classifier.h index 9bec4917..56dde52c 100644 --- a/umbrello/umbrello/classifier.h +++ b/umbrello/umbrello/classifier.h @@ -37,6 +37,7 @@ class IDChangeLog; class UMLClassifier : public UMLPackage { Q_OBJECT + TQ_OBJECT public: /** @@ -83,10 +84,10 @@ public: * @param init An optional initial value, used by when creating through UMLListView * @return The UMLAttribute created */ - virtual UMLAttribute* createAttribute(const TQString &name = TQString::null, + virtual UMLAttribute* createAttribute(const TQString &name = TQString(), UMLObject *type = 0, Uml::Visibility vis = Uml::Visibility::Private, - const TQString &init = TQString::null); + const TQString &init = TQString()); /** * Adds an attribute to the class. @@ -151,7 +152,7 @@ public: * no new method is created and the existing operation is returned. * If no name is provided, or if the params are NULL, an Operation * Dialog is shown to ask the user for a name and parameters. - * The operation's signature is checked for validity within the parent + * The operation's signature is checked for validity within the tqparent * classifier. * * @param name The operation name (will be chosen internally if @@ -165,7 +166,7 @@ public: * created because for example, the user canceled the dialog * or no appropriate name can be found. */ - UMLOperation* createOperation( const TQString &name = TQString::null, + UMLOperation* createOperation( const TQString &name = TQString(), bool *isExistingOp = NULL, Model_Utils::NameAndType_List *params = NULL); @@ -239,7 +240,7 @@ public: * * @return The UMLTemplate created */ - UMLObject* createTemplate(const TQString& name = TQString::null); + UMLObject* createTemplate(const TQString& name = TQString()); /** * Adds a template to the class if it is not there yet. @@ -324,7 +325,7 @@ public: /** * Needs to be called after all UML objects are loaded from file. - * Calls the parent resolveRef(), and calls resolveRef() on all + * Calls the tqparent resolveRef(), and calls resolveRef() on all * UMLClassifierListItems. * Overrides the method from UMLObject. * diff --git a/umbrello/umbrello/classifiercodedocument.cpp b/umbrello/umbrello/classifiercodedocument.cpp index 29e4bd88..4f92dede 100644 --- a/umbrello/umbrello/classifiercodedocument.cpp +++ b/umbrello/umbrello/classifiercodedocument.cpp @@ -38,9 +38,9 @@ // Constructors/Destructors // -ClassifierCodeDocument::ClassifierCodeDocument ( UMLClassifier * parent ) +ClassifierCodeDocument::ClassifierCodeDocument ( UMLClassifier * tqparent ) { - init (parent); + init (tqparent); } ClassifierCodeDocument::~ClassifierCodeDocument ( ) @@ -131,8 +131,8 @@ bool ClassifierCodeDocument::hasObjectVectorClassFields() { UMLRole * role = dynamic_cast<UMLRole*>(cf->getParentObject()); TQString multi = role->getMultiplicity(); if ( - multi.contains(TQRegExp("[23456789\\*]")) || - multi.contains(TQRegExp("1\\d")) + multi.tqcontains(TQRegExp("[23456789\\*]")) || + multi.tqcontains(TQRegExp("1\\d")) ) return true; } @@ -170,7 +170,7 @@ bool ClassifierCodeDocument::hasAttributeClassFields() { // the codegenerator writer the liberty to organize their document as they desire. bool ClassifierCodeDocument::addCodeClassField ( CodeClassField * add_object ) { UMLObject * umlobj = add_object->getParentObject(); - if(!(m_classFieldMap.contains(umlobj))) + if(!(m_classFieldMap.tqcontains(umlobj))) { m_classfieldVector.append(add_object); m_classFieldMap.insert(umlobj,add_object); @@ -194,7 +194,7 @@ void ClassifierCodeDocument::addAttributeClassField (UMLClassifierListItem *obj, */ bool ClassifierCodeDocument::removeCodeClassField ( CodeClassField * remove_object ) { UMLObject * umlobj = remove_object->getParentObject(); - if(m_classFieldMap.contains(umlobj)) + if(m_classFieldMap.tqcontains(umlobj)) { if (m_classfieldVector.removeRef(remove_object)) { @@ -344,7 +344,7 @@ void ClassifierCodeDocument::addCodeClassFieldMethods(CodeClassFieldList &list ) // add declaration blocks for the passed classfields void ClassifierCodeDocument::declareClassFields (CodeClassFieldList & list , - CodeGenObjectWithTextBlocks * parent ) + CodeGenObjectWithTextBlocks * tqparent ) { for (CodeClassFieldListIt ccflit(list); ccflit.current(); ++ccflit) @@ -356,27 +356,27 @@ void ClassifierCodeDocument::declareClassFields (CodeClassFieldList & list , // if it has a tag, check if(!declBlock->getTag().isEmpty()) { - // In C++, because we may shift the declaration to a different parent + // In C++, because we may shift the declaration to a different tqparent // block for a change in scope, we need to track down any pre-existing - // location, and remove FIRST before adding to new parent + // location, and remove FIRST before adding to new tqparent CodeGenObjectWithTextBlocks * oldParent = findParentObjectForTaggedTextBlock (declBlock->getTag()); if(oldParent) { - if(oldParent != parent) + if(oldParent != tqparent) oldParent->removeTextBlock(declBlock); } } */ - parent->addTextBlock(declBlock); // wont add it IF its already present. Will give it a tag if missing + tqparent->addTextBlock(declBlock); // wont add it IF its already present. Will give it a tag if missing } } -bool ClassifierCodeDocument::parentIsClass() { +bool ClassifierCodeDocument::tqparentIsClass() { return (m_parentclassifier->getBaseType() == Uml::ot_Class); } -bool ClassifierCodeDocument::parentIsInterface() { +bool ClassifierCodeDocument::tqparentIsInterface() { return (m_parentclassifier->getBaseType() == Uml::ot_Interface); } @@ -396,7 +396,7 @@ void ClassifierCodeDocument::init (UMLClassifier * c ) // initCodeClassFields(); // cant call here?..newCodeClassField is pure virtual // slots - if (parentIsClass()) { + if (tqparentIsClass()) { connect(c,TQT_SIGNAL(attributeAdded(UMLClassifierListItem*)),this,TQT_SLOT(addAttributeClassField(UMLClassifierListItem*))); connect(c,TQT_SIGNAL(attributeRemoved(UMLClassifierListItem*)),this,TQT_SLOT(removeAttributeClassField(UMLClassifierListItem*))); } @@ -494,7 +494,7 @@ void ClassifierCodeDocument::initCodeClassFields ( ) { UMLClassifier * c = getParentClassifier(); // first, do the code classifields that arise from attributes - if (parentIsClass()) { + if (tqparentIsClass()) { UMLAttributeList alist = c->getAttributeList(); for(UMLAttribute * at = alist.first(); at; at = alist.next()) { @@ -542,7 +542,7 @@ void ClassifierCodeDocument::addAssociationClassField (UMLAssociation * a, bool { UMLRole * role = a->getUMLRole(Uml::B); - if(!m_classFieldMap.contains((UMLObject*)role)) + if(!m_classFieldMap.tqcontains((UMLObject*)role)) { CodeClassField * classfield = CodeGenFactory::newCodeClassField(this, role); if( addCodeClassField(classfield)) @@ -554,7 +554,7 @@ void ClassifierCodeDocument::addAssociationClassField (UMLAssociation * a, bool if (printRoleA) { UMLRole * role = a->getUMLRole(Uml::A); - if(!m_classFieldMap.contains((UMLObject*)role)) + if(!m_classFieldMap.tqcontains((UMLObject*)role)) { CodeClassField * classfield = CodeGenFactory::newCodeClassField(this, role); if( addCodeClassField(classfield)) @@ -573,8 +573,8 @@ void ClassifierCodeDocument::addAssociationClassField (UMLAssociation * a, bool void ClassifierCodeDocument::setAttributesFromNode ( TQDomElement & elem ) { - // NOTE: we DON'T set the parent here as we ONLY get to this point - // IF the parent codegenerator could find a matching parent classifier + // NOTE: we DON'T set the tqparent here as we ONLY get to this point + // IF the tqparent codegenerator could find a matching tqparent classifier // that already has a code document. // We FIRST set code class field stuff..check re-linnking with @@ -599,7 +599,7 @@ void ClassifierCodeDocument::setAttributesFromNode ( TQDomElement & elem ) } // look at all classfields currently in document.. match up -// by parent object ID and Role ID (needed for self-association CF's) +// by tqparent object ID and Role ID (needed for self-association CF's) CodeClassField * ClassifierCodeDocument::findCodeClassFieldFromParentID (Uml::IDType id, int role_id) @@ -619,7 +619,7 @@ ClassifierCodeDocument::findCodeClassFieldFromParentID (Uml::IDType id, } // shouldn't happen.. - kError() << "Failed to find codeclassfield for parent uml id:" + kError() << "Failed to find codeclassfield for tqparent uml id:" << ID2STR(id) << " (role id:" << role_id << ") Do you have a corrupt classifier code document?" << endl; @@ -635,12 +635,12 @@ void ClassifierCodeDocument::loadClassFieldsFromXMI( TQDomElement & elem) { TQString nodeName = childElem.tagName(); if( nodeName == "codeclassfield") { - TQString id = childElem.attribute("parent_id","-1"); + TQString id = childElem.attribute("tqparent_id","-1"); int role_id = childElem.attribute("role_id","-1").toInt(); CodeClassField * cf = findCodeClassFieldFromParentID(STR2ID(id), role_id); if(cf) { - // Because we just may change the parent object here, + // Because we just may change the tqparent object here, // we need to yank it from the map of umlobjects m_classFieldMap.remove(cf->getParentObject()); @@ -651,7 +651,7 @@ void ClassifierCodeDocument::loadClassFieldsFromXMI( TQDomElement & elem) { m_classFieldMap.insert(cf->getParentObject(),cf); } else - kError()<<" LoadFromXMI: can't load classfield parent_id:"<<id<<" do you have a corrupt savefile?"<<endl; + kError()<<" LoadFromXMI: can't load classfield tqparent_id:"<<id<<" do you have a corrupt savefile?"<<endl; } node = childElem.nextSibling(); childElem= node.toElement(); @@ -702,7 +702,7 @@ void ClassifierCodeDocument::setAttributesOnNode ( TQDomDocument & doc, TQDomEle CodeDocument::setAttributesOnNode(doc, docElement); // cache local attributes/fields - docElement.setAttribute("parent_class", ID2STR(getParentClassifier()->getID())); + docElement.setAttribute("tqparent_class", ID2STR(getParentClassifier()->getID())); // (code) class fields // which we will store in its own separate child node block diff --git a/umbrello/umbrello/classifiercodedocument.h b/umbrello/umbrello/classifiercodedocument.h index 2c847c35..f142cade 100644 --- a/umbrello/umbrello/classifiercodedocument.h +++ b/umbrello/umbrello/classifiercodedocument.h @@ -42,6 +42,7 @@ class ClassifierCodeDocument : public CodeDocument { friend class HierarchicalCodeBlock; Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -51,7 +52,7 @@ public: /** * Empty Constructor */ - ClassifierCodeDocument ( UMLClassifier * parent ); + ClassifierCodeDocument ( UMLClassifier * tqparent ); /** * Empty Destructor @@ -78,14 +79,14 @@ public: // some Utility methods /** - * Return if the parent classifier is an interface + * Return if the tqparent classifier is an interface */ - bool parentIsInterface(); + bool tqparentIsInterface(); /** - * Return if the parent classifier is a class + * Return if the tqparent classifier is a class */ - bool parentIsClass(); + bool tqparentIsClass(); /** * Tell if one or more codeclassfields are derived from any kind of association. @@ -132,11 +133,11 @@ public: */ CodeClassFieldList getSpecificClassFields (CodeClassField::ClassFieldType cfType, bool isStatic, Uml::Visibility visibility); - /** Using the parent object's UML ID, find the corresponding + /** Using the tqparent object's UML ID, find the corresponding * codeclassfield object in this classifiercodedocument. Returns * NULL if no such codeclassfield object exists in this document. * - * @param id ID of the parent object + * @param id ID of the tqparent object * @param role_id 0 for role A of the asssociation * 1 for role B of the asssociation * -1 if this is an attribute. @@ -197,11 +198,11 @@ protected: TextBlock * findCodeClassFieldTextBlockByTag (const TQString &tag); // add the declaration text blocks for various classfields - void declareClassFields (CodeClassFieldList & list , CodeGenObjectWithTextBlocks * parent); + void declareClassFields (CodeClassFieldList & list , CodeGenObjectWithTextBlocks * tqparent); virtual void updateContent( ) = 0; - // force syncronization of child classfields to their parent objects + // force syncronization of child classfields to their tqparent objects void syncClassFields( ); // IF the classifier object is modified, this will get called. @@ -218,7 +219,7 @@ private: // based on UMLRoles (e.g. derived from associations with other classifiers). void updateAssociationClassFields ( UMLAssociationList &assocList ); - // update code operations in this document using the parent classifier + // update code operations in this document using the tqparent classifier void updateOperations( ); /** @@ -236,7 +237,7 @@ private: public slots: /** - * Synchronize this document to the attributes/associations of the parent classifier. + * Synchronize this document to the attributes/associations of the tqparent classifier. */ void addAttributeClassField(UMLClassifierListItem *at, bool syncToParentIfAdded = true); void addAssociationClassField (UMLAssociation * assoc, bool syncToParentIfAdded = true); diff --git a/umbrello/umbrello/classifierlistitem.cpp b/umbrello/umbrello/classifierlistitem.cpp index 60e5b7bf..933d9d59 100644 --- a/umbrello/umbrello/classifierlistitem.cpp +++ b/umbrello/umbrello/classifierlistitem.cpp @@ -23,19 +23,19 @@ #include "model_utils.h" #include "object_factory.h" -UMLClassifierListItem::UMLClassifierListItem(const UMLObject *parent, +UMLClassifierListItem::UMLClassifierListItem(const UMLObject *tqparent, const TQString& name, Uml::IDType id) - : UMLObject(parent, name, id) { - UMLObject *parentObj = const_cast<UMLObject*>(parent); - UMLClassifier *pc = dynamic_cast<UMLClassifier*>(parentObj); + : UMLObject(tqparent, name, id) { + UMLObject *tqparentObj = const_cast<UMLObject*>(tqparent); + UMLClassifier *pc = dynamic_cast<UMLClassifier*>(tqparentObj); if (pc) UMLObject::setUMLPackage(pc); } -UMLClassifierListItem::UMLClassifierListItem(const UMLObject *parent) - : UMLObject(parent) { - UMLObject *parentObj = const_cast<UMLObject*>(parent); - UMLClassifier *pc = dynamic_cast<UMLClassifier*>(parentObj); +UMLClassifierListItem::UMLClassifierListItem(const UMLObject *tqparent) + : UMLObject(tqparent) { + UMLObject *tqparentObj = const_cast<UMLObject*>(tqparent); + UMLClassifier *pc = dynamic_cast<UMLClassifier*>(tqparentObj); if (pc) UMLObject::setUMLPackage(pc); } @@ -45,7 +45,7 @@ UMLClassifierListItem::~UMLClassifierListItem() { void UMLClassifierListItem::copyInto(UMLClassifierListItem *rhs) const { - // Call the parent. + // Call the tqparent. UMLObject::copyInto(rhs); } @@ -83,7 +83,7 @@ void UMLClassifierListItem::setTypeName(const TQString &type) { m_pSecondary = pDoc->findUMLObject(type); if (m_pSecondary == NULL) { // Make data type for easily identified cases - if (Model_Utils::isCommonDataType(type) || type.contains('*')) { + if (Model_Utils::isCommonDataType(type) || type.tqcontains('*')) { m_pSecondary = Object_Factory::createUMLObject(Uml::ot_Datatype, type); kDebug() << "UMLClassifierListItem::setTypeName: " << "created datatype for " << type << endl; diff --git a/umbrello/umbrello/classifierlistitem.h b/umbrello/umbrello/classifierlistitem.h index ceac48cc..aba5dd86 100644 --- a/umbrello/umbrello/classifierlistitem.h +++ b/umbrello/umbrello/classifierlistitem.h @@ -30,34 +30,35 @@ class UMLClassifier; class UMLClassifierListItem : public UMLObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor. Empty. * - * @param parent The parent to this operation. + * @param tqparent The tqparent to this operation. * At first sight it would appear that the type of the - * parent should be UMLClassifier. However, the class + * tqparent should be UMLClassifier. However, the class * UMLAttribute is also used for the parameters of * operations, and in this case the UMLOperation is the - * parent. + * tqparent. * @param name The name of the operation. * @param id The id of the operation. */ - UMLClassifierListItem(const UMLObject *parent, + UMLClassifierListItem(const UMLObject *tqparent, const TQString& name, Uml::IDType id = Uml::id_None); /** * Constructor. Empty. * - * @param parent The parent to this operation. + * @param tqparent The tqparent to this operation. * At first sight it would appear that the type of the - * parent should be UMLClassifier. However, the class + * tqparent should be UMLClassifier. However, the class * UMLAttribute is also used for the parameters of * operations, and in this case the UMLOperation is the - * parent. + * tqparent. */ - UMLClassifierListItem(const UMLObject *parent); + UMLClassifierListItem(const UMLObject *tqparent); /** * Destructor. Empty. @@ -104,10 +105,10 @@ public: /** * Display the properties configuration dialog for the list item. * - * @param parent The parent widget. + * @param tqparent The tqparent widget. * @return True for success of this operation. */ - virtual bool showPropertiesDialog(TQWidget* parent) = 0; + virtual bool showPropertiesDialog(TQWidget* tqparent) = 0; /** * Copy the internal presentation of this object into the new diff --git a/umbrello/umbrello/classifierwidget.cpp b/umbrello/umbrello/classifierwidget.cpp index 8105818f..24da6833 100644 --- a/umbrello/umbrello/classifierwidget.cpp +++ b/umbrello/umbrello/classifierwidget.cpp @@ -558,14 +558,14 @@ void ClassifierWidget::draw(TQPainter & p, int offsetX, int offsetY) { p.setPen(pen); p.drawRect( offsetX + width() - templatesBoxSize.width(), offsetY, templatesBoxSize.width(), templatesBoxSize.height() ); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); font.setBold(false); p.setFont(font); const int x = offsetX + width() - templatesBoxSize.width() + MARGIN; int y = offsetY + MARGIN; for ( UMLTemplate *t = tlist.first(); t; t = tlist.next() ) { TQString text = t->toString(); - p.drawText(x, y, fm.size(0,text).width(), fontHeight, Qt::AlignVCenter, text); + p.drawText(x, y, fm.size(0,text).width(), fontHeight, TQt::AlignVCenter, text); y += fontHeight; } } @@ -573,7 +573,7 @@ void ClassifierWidget::draw(TQPainter & p, int offsetX, int offsetY) { const int textX = offsetX + MARGIN; const int textWidth = w - MARGIN * 2; - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); // draw stereotype font.setBold(true); @@ -587,7 +587,7 @@ void ClassifierWidget::draw(TQPainter & p, int offsetX, int offsetY) { } else if (showStereotype) { p.setFont(font); stereo = m_pObject->getStereotype(true); - p.drawText(textX, m_bodyOffsetY, textWidth, fontHeight, Qt::AlignCenter, stereo); + p.drawText(textX, m_bodyOffsetY, textWidth, fontHeight, TQt::AlignCenter, stereo); m_bodyOffsetY += fontHeight; } @@ -600,12 +600,12 @@ void ClassifierWidget::draw(TQPainter & p, int offsetX, int offsetY) { } font.setItalic( m_pObject->getAbstract() ); p.setFont(font); - p.drawText(textX, m_bodyOffsetY, textWidth, nameHeight, Qt::AlignCenter, name); + p.drawText(textX, m_bodyOffsetY, textWidth, nameHeight, TQt::AlignCenter, name); if (!showNameOnly) { m_bodyOffsetY += fontHeight; UMLWidget::setPen(p); p.drawLine(offsetX, m_bodyOffsetY, offsetX + w - 1, m_bodyOffsetY); - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); } font.setBold(false); font.setItalic(false); @@ -626,7 +626,7 @@ void ClassifierWidget::draw(TQPainter & p, int offsetX, int offsetY) { m_bodyOffsetY += fontHeight * numAtts; UMLWidget::setPen(p); p.drawLine(offsetX, m_bodyOffsetY, offsetX + w - 1, m_bodyOffsetY); - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); } // draw operations @@ -652,11 +652,11 @@ void ClassifierWidget::drawAsCircle(TQPainter& p, int offsetX, int offsetY) { } p.drawEllipse(offsetX + w/2 - CIRCLE_SIZE/2, offsetY, CIRCLE_SIZE, CIRCLE_SIZE); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); TQFont font = UMLWidget::getFont(); p.setFont(font); - p.drawText(offsetX, offsetY + CIRCLE_SIZE, w, fontHeight, Qt::AlignCenter, name); + p.drawText(offsetX, offsetY + CIRCLE_SIZE, w, fontHeight, TQt::AlignCenter, name); if (m_bSelected) { drawSelected(&p, offsetX, offsetY); @@ -697,7 +697,7 @@ void ClassifierWidget::drawMembers(TQPainter & p, Uml::Object_Type ot, Uml::Sign f.setUnderline( obj->getStatic() ); p.setFont( f ); TQFontMetrics fontMetrics(f); - p.drawText(x, y, fontMetrics.size(0,text).width(), fontHeight, Qt::AlignVCenter, text); + p.drawText(x, y, fontMetrics.size(0,text).width(), fontHeight, TQt::AlignVCenter, text); f.setItalic(false); f.setUnderline(false); p.setFont(f); diff --git a/umbrello/umbrello/classifierwidget.h b/umbrello/umbrello/classifierwidget.h index f80f1289..4fa1041d 100644 --- a/umbrello/umbrello/classifierwidget.h +++ b/umbrello/umbrello/classifierwidget.h @@ -30,7 +30,7 @@ public: /** * Constructs a ClassifierWidget. * - * @param view The parent of this ClassifierWidget. + * @param view The tqparent of this ClassifierWidget. * @param o The UMLObject to represent. */ ClassifierWidget(UMLView * view, UMLClassifier * o); @@ -101,7 +101,7 @@ public: /** * Return the status of showing operation signatures. * - * @return Status of showing operation signatures. + * @return tqStatus of showing operation signatures. */ Uml::Signature_Type getShowOpSigs() const; @@ -173,7 +173,7 @@ public: * Returns whether to show attribute signatures. * Only applies when m_pObject->getBaseType() is ot_Class. * - * @return Status of how attribute signatures are shown. + * @return tqStatus of how attribute signatures are shown. */ Uml::Signature_Type getShowAttSigs() { return m_ShowAttSigs; diff --git a/umbrello/umbrello/clipboard/umlclipboard.cpp b/umbrello/umbrello/clipboard/umlclipboard.cpp index 069ba84b..357f97f7 100644 --- a/umbrello/umbrello/clipboard/umlclipboard.cpp +++ b/umbrello/umbrello/clipboard/umlclipboard.cpp @@ -267,7 +267,7 @@ void UMLClipboard::checkItemForCopyType(UMLListViewItem* Item, bool & WithDiagra } } -/** Adds the children of a UMLListViewItem to m_ItemList */ +/** Adds the tqchildren of a UMLListViewItem to m_ItemList */ bool UMLClipboard::insertItemChildren(UMLListViewItem * Item, UMLListViewItemList& SelectedItems) { if(Item->childCount()) { UMLListViewItem * child = (UMLListViewItem*)Item->firstChild(); @@ -281,7 +281,7 @@ bool UMLClipboard::insertItemChildren(UMLListViewItem * Item, UMLListViewItemLis // If the child is selected, remove it from the list of selected items // otherwise it will be inserted twice in m_ObjectList. if(child->isSelected()) { - SelectedItems.remove(SelectedItems.find(child) ); + SelectedItems.remove(SelectedItems.tqfind(child) ); } insertItemChildren(child, SelectedItems); child = (UMLListViewItem*)child->nextSibling(); @@ -290,14 +290,14 @@ bool UMLClipboard::insertItemChildren(UMLListViewItem * Item, UMLListViewItemLis return true; } -bool UMLClipboard::pasteChildren(UMLListViewItem *parent, IDChangeLog *chgLog) { - if (!parent) { - kWarning() << "Paste Children Error, parent missing" << endl; +bool UMLClipboard::pasteChildren(UMLListViewItem *tqparent, IDChangeLog *chgLog) { + if (!tqparent) { + kWarning() << "Paste Children Error, tqparent missing" << endl; return false; } UMLDoc *doc = UMLApp::app()->getDocument(); UMLListView *listView = UMLApp::app()->getListView(); - UMLListViewItem *childItem = static_cast<UMLListViewItem*>(parent->firstChild()); + UMLListViewItem *childItem = static_cast<UMLListViewItem*>(tqparent->firstChild()); while (childItem) { Uml::IDType oldID = childItem->getID(); Uml::IDType newID = chgLog->findNewID(oldID); @@ -347,7 +347,7 @@ bool UMLClipboard::pasteClip1(TQMimeSource* data) { return true; lv->setStartedCopy(false); /* If we get here we are pasting after a Copy and need to - // paste possible children. + // paste possible tqchildren. UMLListViewItem* itemdata = 0; UMLListViewItemListIt it(itemdatalist); while ( (itemdata=it.current()) != 0 ) { @@ -571,9 +571,9 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) { (lvitem->getType() != Uml::lvt_Class && lvitem->getType() != Uml::lvt_Interface)) { return false; } - UMLClassifier *parent = dynamic_cast<UMLClassifier *>(lvitem->getUMLObject()); - if (parent == NULL) { - kError() << "UMLClipboard::pasteClip5: parent is not a UMLClassifier" + UMLClassifier *tqparent = dynamic_cast<UMLClassifier *>(lvitem->getUMLObject()); + if (tqparent == NULL) { + kError() << "UMLClipboard::pasteClip5: tqparent is not a UMLClassifier" << endl; return false; } @@ -581,7 +581,7 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) { UMLObjectList objects; objects.setAutoDelete(false); IDChangeLog* idchanges = 0; - bool result = UMLDrag::decodeClip5(data, objects, parent); + bool result = UMLDrag::decodeClip5(data, objects, tqparent); if(!result) { return false; @@ -599,16 +599,16 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) { switch(obj->getBaseType()) { case Uml::ot_Attribute : { - UMLObject *exist = parent->findChildObject(obj->getName(), Uml::ot_Attribute); + UMLObject *exist = tqparent->findChildObject(obj->getName(), Uml::ot_Attribute); if (exist) { - TQString newName = parent->uniqChildName(Uml::ot_Attribute, obj->getName()); + TQString newName = tqparent->uniqChildName(Uml::ot_Attribute, obj->getName()); obj->setName(newName); } UMLAttribute *att = static_cast<UMLAttribute*>(obj); - if (parent->addAttribute(att, idchanges)) { + if (tqparent->addAttribute(att, idchanges)) { result = true; } else { - kError() << "UMLClipboard::pasteClip5: " << parent->getName() + kError() << "UMLClipboard::pasteClip5: " << tqparent->getName() << "->addAttribute(" << att->getName() << ") failed" << endl; } break; @@ -616,21 +616,21 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) { case Uml::ot_Operation : { UMLOperation *op = static_cast<UMLOperation*>(obj); - UMLOperation *exist = parent->checkOperationSignature(op->getName(), op->getParmList()); + UMLOperation *exist = tqparent->checkOperationSignature(op->getName(), op->getParmList()); if (exist) { - TQString newName = parent->uniqChildName(Uml::ot_Operation, obj->getName()); + TQString newName = tqparent->uniqChildName(Uml::ot_Operation, obj->getName()); op->setName(newName); } - if (parent->addOperation(op, idchanges)) { + if (tqparent->addOperation(op, idchanges)) { result = true; } else { - kError() << "UMLClipboard::pasteClip5: " << parent->getName() + kError() << "UMLClipboard::pasteClip5: " << tqparent->getName() << "->addOperation(" << op->getName() << ") failed" << endl; } break; } default : - kWarning() << "pasting unknown children type in clip type 5" << endl; + kWarning() << "pasting unknown tqchildren type in clip type 5" << endl; return false; } } diff --git a/umbrello/umbrello/clipboard/umlclipboard.h b/umbrello/umbrello/clipboard/umlclipboard.h index ef3bbc02..b7a42e2e 100644 --- a/umbrello/umbrello/clipboard/umlclipboard.h +++ b/umbrello/umbrello/clipboard/umlclipboard.h @@ -33,6 +33,7 @@ class TQMimeSource; */ class UMLClipboard : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor. @@ -166,13 +167,13 @@ private: bool& OnlyAttsOps); /** - * Adds the children of a UMLListViewItem to m_ItemList. + * Adds the tqchildren of a UMLListViewItem to m_ItemList. */ bool insertItemChildren(UMLListViewItem* Item, UMLListViewItemList& SelectedItems); /** - * Inserts the data of the children of the given item + * Inserts the data of the tqchildren of the given item * into the item data list. Used for clip type 4. Used * to make * sure classes have all the attributes and * operations saved. @@ -180,9 +181,9 @@ private: bool insertItemChildren(UMLListViewItem* item); /** - * Pastes the children of a UMLListViewItem (The Parent) + * Pastes the tqchildren of a UMLListViewItem (The Parent) */ - bool pasteChildren(UMLListViewItem* parent, IDChangeLog *chgLog); + bool pasteChildren(UMLListViewItem* tqparent, IDChangeLog *chgLog); /** * Gives a `sorry' message box if you're pasting an item which diff --git a/umbrello/umbrello/clipboard/umldrag.cpp b/umbrello/umbrello/clipboard/umldrag.cpp index 27f8dde2..e7bd5d90 100644 --- a/umbrello/umbrello/clipboard/umldrag.cpp +++ b/umbrello/umbrello/clipboard/umldrag.cpp @@ -108,11 +108,11 @@ void UMLDrag::setSubType(const TQCString& string, int index) { data->setSubType(string, index); } -void UMLDrag::setEncodedData(const TQByteArray& encodedData, int index) { - data->enc[index] = encodedData.copy(); +void UMLDrag::setEncodedData(const TQByteArray& tqencodedData, int index) { + data->enc[index] = tqencodedData.copy(); } -TQByteArray UMLDrag::encodedData(const char* dataName) const { +TQByteArray UMLDrag::tqencodedData(const char* dataName) const { TQString str(dataName); for (int i = 0; i < 4; i++) { if ( !qstricmp(dataName,data->fmt[i]) ) { @@ -286,7 +286,7 @@ bool UMLDrag::decodeClip1(const TQMimeSource* mimeSource, UMLObjectList& objects if ( !mimeSource->provides("application/x-uml-clip1") ) { return false; } - TQByteArray payload = mimeSource->encodedData("application/x-uml-clip1"); + TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip1"); if ( !payload.size() ) { return false; } @@ -376,7 +376,7 @@ bool UMLDrag::decodeClip2(const TQMimeSource* mimeSource, UMLObjectList& objects if ( !mimeSource->provides("application/x-uml-clip2") ) { return false; } - TQByteArray payload = mimeSource->encodedData("application/x-uml-clip2"); + TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip2"); if ( !payload.size() ) { return false; } @@ -439,12 +439,12 @@ bool UMLDrag::decodeClip2(const TQMimeSource* mimeSource, UMLObjectList& objects while ( !diagramElement.isNull() ) { TQString type = diagramElement.attribute("type", "0"); Uml::Diagram_Type dt = (Uml::Diagram_Type)type.toInt(); - UMLListViewItem *parent = listView->findFolderForDiagram(dt); - if (parent == NULL) + UMLListViewItem *tqparent = listView->findFolderForDiagram(dt); + if (tqparent == NULL) return false; - UMLObject *po = parent->getUMLObject(); + UMLObject *po = tqparent->getUMLObject(); if (po == NULL || po->getBaseType() != Uml::ot_Folder) { - kError() << "UMLDrag::decodeClip2: bad parent for view" << endl; + kError() << "UMLDrag::decodeClip2: bad tqparent for view" << endl; return false; } UMLFolder *f = static_cast<UMLFolder*>(po); @@ -486,7 +486,7 @@ bool UMLDrag::getClip3TypeAndID(const TQMimeSource* mimeSource, if ( !mimeSource->provides("application/x-uml-clip3") ) { return false; } - TQByteArray payload = mimeSource->encodedData("application/x-uml-clip3"); + TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip3"); if ( !payload.size() ) { return false; } @@ -539,11 +539,11 @@ bool UMLDrag::getClip3TypeAndID(const TQMimeSource* mimeSource, } bool UMLDrag::decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& umlListViewItems, - const UMLListView* parentListView){ + const UMLListView* tqparentListView){ if ( !mimeSource->provides("application/x-uml-clip3") ) { return false; } - TQByteArray payload = mimeSource->encodedData("application/x-uml-clip3"); + TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip3"); if ( !payload.size() ) { return false; } @@ -584,8 +584,8 @@ bool UMLDrag::decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& u continue; } Uml::ListView_Type t = (Uml::ListView_Type)(type.toInt()); - UMLListViewItem* parent = parentListView->determineParentItem(t); - UMLListViewItem* itemData = new UMLListViewItem(parent); + UMLListViewItem* tqparent = tqparentListView->determineParentItem(t); + UMLListViewItem* itemData = new UMLListViewItem(tqparent); if ( itemData->loadFromXMI(listItemElement) ) umlListViewItems.append(itemData); else @@ -602,7 +602,7 @@ bool UMLDrag::decodeClip4(const TQMimeSource* mimeSource, UMLObjectList& objects if ( !mimeSource->provides("application/x-uml-clip4") ) { return false; } - TQByteArray payload = mimeSource->encodedData("application/x-uml-clip4"); + TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip4"); if ( !payload.size() ) { return false; } @@ -699,7 +699,7 @@ bool UMLDrag::decodeClip5(const TQMimeSource* mimeSource, UMLObjectList& objects if ( !mimeSource->provides("application/x-uml-clip5") ) { return false; } - TQByteArray payload = mimeSource->encodedData("application/x-uml-clip5"); + TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip5"); if ( !payload.size() ) { return false; } diff --git a/umbrello/umbrello/clipboard/umldrag.h b/umbrello/umbrello/clipboard/umldrag.h index 97cbffb5..315e3c98 100644 --- a/umbrello/umbrello/clipboard/umldrag.h +++ b/umbrello/umbrello/clipboard/umldrag.h @@ -35,8 +35,9 @@ class UMLListView; class UMLDragPrivate; class UMLClassifier; -class Q_EXPORT UMLDrag : public TQDragObject { +class TQ_EXPORT UMLDrag : public TQDragObject { Q_OBJECT + TQ_OBJECT UMLDragPrivate* data; public: @@ -148,7 +149,7 @@ public: * * @param dataName the name of the data type to return */ - virtual TQByteArray encodedData(const char* dataName) const; + virtual TQByteArray tqencodedData(const char* dataName) const; /** * For use when the user selects only UML Objects @@ -174,7 +175,7 @@ public: */ static bool decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& umlListViewItems, - const UMLListView* parentListView=0); + const UMLListView* tqparentListView=0); struct LvTypeAndID { Uml::ListView_Type type; diff --git a/umbrello/umbrello/codeaccessormethod.cpp b/umbrello/umbrello/codeaccessormethod.cpp index e7890865..fab32f7c 100644 --- a/umbrello/umbrello/codeaccessormethod.cpp +++ b/umbrello/umbrello/codeaccessormethod.cpp @@ -30,10 +30,10 @@ // Constructors/Destructors // -CodeAccessorMethod::CodeAccessorMethod ( CodeClassField * parentCF ) - : CodeMethodBlock ( parentCF->getParentDocument(), parentCF->getParentObject() ) +CodeAccessorMethod::CodeAccessorMethod ( CodeClassField * tqparentCF ) + : CodeMethodBlock ( tqparentCF->getParentDocument(), tqparentCF->getParentObject() ) { - initFields(parentCF); + initFields(tqparentCF); } CodeAccessorMethod::~CodeAccessorMethod ( ) { } @@ -54,13 +54,13 @@ CodeClassField * CodeAccessorMethod::getParentClassField ( ) { return m_parentclassfield; } -bool CodeAccessorMethod::parentIsAttribute( ) { - return getParentClassField()->parentIsAttribute(); +bool CodeAccessorMethod::tqparentIsAttribute( ) { + return getParentClassField()->tqparentIsAttribute(); } /** - * Utility method to get the value of the parent object of the parent classifield. - * @return the value of the parent of the parent classfield + * Utility method to get the value of the tqparent object of the tqparent classifield. + * @return the value of the tqparent of the tqparent classfield */ /* UMLObject * CodeAccessorMethod::getParentObject ( ) { @@ -92,7 +92,7 @@ void CodeAccessorMethod::release () { // do nothing } -// ok, a method so the parent can force it to release +// ok, a method so the tqparent can force it to release void CodeAccessorMethod::forceRelease () { if(m_parentclassfield) m_parentclassfield->disconnect(this); @@ -142,8 +142,8 @@ void CodeAccessorMethod::setAttributesFromNode ( TQDomElement & root) { /* // I don't believe this is needed for a load from XMI. We never delete - // accessor methods from the parent classfield.. they are essentially - // in composition with the parent class and are arent meant to be out + // accessor methods from the tqparent classfield.. they are essentially + // in composition with the tqparent class and are arent meant to be out // on their own. Well, this is fine for now, but IF we start allowing // clipping and pasting of these methods between classes/ classfields // then we may have problems (ugh.. I cant imagine allowing this, but @@ -158,7 +158,7 @@ void CodeAccessorMethod::setAttributesFromNode ( TQDomElement & root) { if(newCF) initFields(newCF); else - kError()<<"ERROR: code accessor method cant load parent codeclassfield, corrupt file?"<<endl; + kError()<<"ERROR: code accessor method cant load tqparent codeclassfield, corrupt file?"<<endl; */ // now load/set other local attributes @@ -183,9 +183,9 @@ void CodeAccessorMethod::setAttributesFromObject(TextBlock * obj) } -void CodeAccessorMethod::initFields(CodeClassField * parentClassField ) { +void CodeAccessorMethod::initFields(CodeClassField * tqparentClassField ) { - m_parentclassfield = parentClassField; + m_parentclassfield = tqparentClassField; m_accessorType = GET; m_canDelete = false; // we cant delete these with the codeeditor, delete the UML operation instead. diff --git a/umbrello/umbrello/codeaccessormethod.h b/umbrello/umbrello/codeaccessormethod.h index b03d1524..b144c068 100644 --- a/umbrello/umbrello/codeaccessormethod.h +++ b/umbrello/umbrello/codeaccessormethod.h @@ -27,6 +27,7 @@ class CodeAccessorMethod : public CodeMethodBlock { friend class CodeClassField; Q_OBJECT + TQ_OBJECT public: // some types of accessor methods that are possible: @@ -65,11 +66,11 @@ public: */ void setType ( AccessorType type); - /** Utility method to get the value of the parent object of the parent classifield. + /** Utility method to get the value of the tqparent object of the tqparent classifield. */ // virtual UMLObject * getParentObject(); - bool parentIsAttribute(); + bool tqparentIsAttribute(); /** * Save the XMI representation of this object @@ -103,7 +104,7 @@ protected: virtual void updateContent() = 0; - // a method so the parent code classfield can force code block to release + // a method so the tqparent code classfield can force code block to release void forceRelease (); private: @@ -111,7 +112,7 @@ private: CodeClassField * m_parentclassfield; AccessorType m_accessorType; - void initFields(CodeClassField * parentCF ); + void initFields(CodeClassField * tqparentCF ); }; diff --git a/umbrello/umbrello/codeblock.h b/umbrello/umbrello/codeblock.h index 6575d932..49ad0fe1 100644 --- a/umbrello/umbrello/codeblock.h +++ b/umbrello/umbrello/codeblock.h @@ -33,6 +33,7 @@ class HierarchicalCodeBlock; class CodeBlock : public TextBlock { Q_OBJECT + TQ_OBJECT public: enum ContentType {AutoGenerated=0, UserGenerated }; @@ -43,8 +44,8 @@ public: /** constructor with TQString so we can create & populate it in * one step. */ - explicit CodeBlock ( CodeDocument * parent, const TQString & body = ""); - explicit CodeBlock ( HierarchicalCodeBlock * parent, const TQString & body = "" ); + explicit CodeBlock ( CodeDocument * tqparent, const TQString & body = ""); + explicit CodeBlock ( HierarchicalCodeBlock * tqparent, const TQString & body = "" ); /** * Empty Destructor diff --git a/umbrello/umbrello/codeblockwithcomments.cpp b/umbrello/umbrello/codeblockwithcomments.cpp index 3538f2c2..b4a92825 100644 --- a/umbrello/umbrello/codeblockwithcomments.cpp +++ b/umbrello/umbrello/codeblockwithcomments.cpp @@ -34,10 +34,10 @@ CodeBlockWithComments::CodeBlockWithComments ( HierarchicalCodeBlock * hb, const initFields(hb->getParentDocument(), comment); } -CodeBlockWithComments::CodeBlockWithComments ( CodeDocument * parent , const TQString & body, const TQString & comment) - : CodeBlock (parent, body) +CodeBlockWithComments::CodeBlockWithComments ( CodeDocument * tqparent , const TQString & body, const TQString & comment) + : CodeBlock (tqparent, body) { - initFields(parent, comment); + initFields(tqparent, comment); } CodeBlockWithComments::~CodeBlockWithComments ( ) { } @@ -143,7 +143,7 @@ void CodeBlockWithComments::setAttributesFromNode( TQDomElement & root) } /** - * @return QString + * @return TQString */ TQString CodeBlockWithComments::toString ( ) { @@ -171,9 +171,9 @@ void CodeBlockWithComments::setOverallIndentationLevel ( int level ) m_comment->setIndentationLevel(level); } -void CodeBlockWithComments::initFields(CodeDocument *parent, const TQString& comment) +void CodeBlockWithComments::initFields(CodeDocument *tqparent, const TQString& comment) { - CodeComment * codecomment = CodeGenFactory::newCodeComment(parent); + CodeComment * codecomment = CodeGenFactory::newCodeComment(tqparent); codecomment->setText(comment); m_comment = codecomment; } diff --git a/umbrello/umbrello/codeblockwithcomments.h b/umbrello/umbrello/codeblockwithcomments.h index 2ebb4676..ee7b88eb 100644 --- a/umbrello/umbrello/codeblockwithcomments.h +++ b/umbrello/umbrello/codeblockwithcomments.h @@ -32,6 +32,7 @@ class HierarchicalCodeBlock; class CodeBlockWithComments : public CodeBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -61,7 +62,7 @@ public: CodeComment * getComment ( ); /** - * @return QString + * @return TQString */ virtual TQString toString ( ); @@ -100,7 +101,7 @@ private: CodeComment * m_comment; - void initFields(CodeDocument *parent, const TQString& comment); + void initFields(CodeDocument *tqparent, const TQString& comment); }; diff --git a/umbrello/umbrello/codeclassfield.cpp b/umbrello/umbrello/codeclassfield.cpp index 85686a3b..0a108a18 100644 --- a/umbrello/umbrello/codeclassfield.cpp +++ b/umbrello/umbrello/codeclassfield.cpp @@ -52,7 +52,7 @@ CodeClassField::CodeClassField ( ClassifierCodeDocument * doc , UMLAttribute * a CodeClassField::~CodeClassField ( ) { - // remove methods from parent document + // remove methods from tqparent document CodeAccessorMethodList list = m_methodVector; for(CodeAccessorMethod * m = list.first(); m ; m=list.next()) { @@ -61,7 +61,7 @@ CodeClassField::~CodeClassField ( ) { } list.clear(); - // clear the decl block from parent text block list too + // clear the decl block from tqparent text block list too if(m_declCodeBlock) { getParentDocument()->removeTextBlock(m_declCodeBlock); @@ -82,8 +82,8 @@ CodeClassField::~CodeClassField ( ) { void CodeClassField::setParentUMLObject (UMLObject * obj) { UMLRole *role = dynamic_cast<UMLRole*>(obj); if(role) { - UMLAssociation * parentAssoc = role->getParentAssociation(); - Uml::Association_Type atype = parentAssoc->getAssocType(); + UMLAssociation * tqparentAssoc = role->getParentAssociation(); + Uml::Association_Type atype = tqparentAssoc->getAssocType(); m_parentIsAttribute = false; if ( atype == Uml::at_Association || atype == Uml::at_Association_Self) @@ -103,7 +103,7 @@ void CodeClassField::setParentUMLObject (UMLObject * obj) { TQString CodeClassField::getTypeName ( ) { - if (parentIsAttribute()) + if (tqparentIsAttribute()) { UMLAttribute * at = (UMLAttribute*) getParentObject(); return at->getTypeName(); @@ -121,7 +121,7 @@ TQString CodeClassField::getTypeName ( ) { // of objects (as per specification of associations) TQString CodeClassField::getListObjectType() { TQString type = TQString (""); - if (!parentIsAttribute()) + if (!tqparentIsAttribute()) { UMLRole * role = dynamic_cast<UMLRole*>(getParentObject()); type = getUMLObjectName(role->getObject()); @@ -133,7 +133,7 @@ TQString CodeClassField::getListObjectType() { * Get the value of m_isAbstract * @return the value of m_isAbstract */ -bool CodeClassField::parentIsAttribute ( ) { +bool CodeClassField::tqparentIsAttribute ( ) { return m_parentIsAttribute; // return (m_classFieldType == Attribute) ? true : false; } @@ -171,8 +171,8 @@ bool CodeClassField::addMethod ( CodeAccessorMethod * add_object ) { if(findMethodByType(type)) return false; /* - // this wont work as the key for TQMap needs to inherit from QObject - if(m_methodMap->contains(type)) + // this wont work as the key for TQMap needs to inherit from TQObject + if(m_methodMap->tqcontains(type)) return false; // return false, we already have some object with this tag in the list else m_methodMap->insert(type, add_object); @@ -270,10 +270,10 @@ void CodeClassField::setAttributesFromNode ( TQDomElement & root) { // always disconnect getParentObject()->disconnect(this); - // superclass call.. may reset the parent object + // superclass call.. may reset the tqparent object CodeParameter::setAttributesFromNode(root); - // make AFTER super-class call. This will reconnect to the parent + // make AFTER super-class call. This will reconnect to the tqparent // and re-check we have all needed child accessor methods and decl blocks initFields( ); @@ -301,7 +301,7 @@ void CodeClassField::setAttributesFromNode ( TQDomElement & root) { } else if( tag == "header" ) { - // this is treated in parent.. skip over here + // this is treated in tqparent.. skip over here } else kWarning()<<"ERROR: bad savefile? code classfield loadFromXMI got child element with unknown tag:"<<tag<<" ignoring node."<<endl; @@ -323,7 +323,7 @@ void CodeClassField::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) { } int CodeClassField::minimumListOccurances( ) { - if (!parentIsAttribute()) + if (!tqparentIsAttribute()) { UMLRole * role = dynamic_cast<UMLRole*>(getParentObject()); TQString multi = role->getMultiplicity(); @@ -331,7 +331,7 @@ int CodeClassField::minimumListOccurances( ) { if(!multi.isEmpty()) { TQString lowerBoundString = multi.remove(TQRegExp("\\.\\.\\d+$")); - if(!lowerBoundString.isEmpty() &&lowerBoundString.contains(TQRegExp("^\\d+$"))) + if(!lowerBoundString.isEmpty() &&lowerBoundString.tqcontains(TQRegExp("^\\d+$"))) return lowerBoundString.toInt(); } @@ -340,7 +340,7 @@ int CodeClassField::minimumListOccurances( ) { } int CodeClassField::maximumListOccurances( ) { - if (!parentIsAttribute()) + if (!tqparentIsAttribute()) { UMLRole * role = dynamic_cast<UMLRole*>(getParentObject()); TQString multi = role->getMultiplicity(); @@ -348,7 +348,7 @@ int CodeClassField::maximumListOccurances( ) { if(!multi.isEmpty()) { TQString upperBoundString = multi.section(TQRegExp("(\\.\\.)"),1); - if(!upperBoundString.isEmpty() && upperBoundString.contains(TQRegExp("^\\d+$"))) + if(!upperBoundString.isEmpty() && upperBoundString.tqcontains(TQRegExp("^\\d+$"))) return upperBoundString.toInt(); else return -1; // unbounded @@ -392,7 +392,7 @@ CodeAccessorMethod * CodeClassField::findMethodByType ( CodeAccessorMethod::Acce //if we already know to which file this class was written/should be written, just return it. /* // argh. this wont work because "accessorType' doesn't inherit from TQObject. - if(m_methodMap->contains(type)) + if(m_methodMap->tqcontains(type)) return ((*m_methodMap)[type]); CodeAccessorMethod * obj = NULL; */ @@ -422,7 +422,7 @@ void CodeClassField::initAccessorMethods() { // everything gets potential get/set method - //if(!m_methodMap->contains(CodeAccessorMethod::GET)) + //if(!m_methodMap->tqcontains(CodeAccessorMethod::GET)) if(!findMethodByType(CodeAccessorMethod::GET)) { CodeAccessorMethod * method = CodeGenFactory::newCodeAccessorMethod (getParentDocument(), this, CodeAccessorMethod::GET); @@ -444,7 +444,7 @@ void CodeClassField::initAccessorMethods() // add in the add,remove and list methods for things which are role based. // (and only used if the role specifies a 'list' type object - if (!parentIsAttribute()) { + if (!tqparentIsAttribute()) { if(!findMethodByType(CodeAccessorMethod::ADD)) { @@ -482,10 +482,10 @@ void CodeClassField::updateContent() { // Set properties for writing out the various methods derived from UMLRoles. - // I suppose this could be supported under individual accessor method synctoparent + // I suppose this could be supported under individual accessor method synctotqparent // calls, but its going to happen again and again for many languages. Why not a catch // all here? -b.t. - if (parentIsAttribute()) + if (tqparentIsAttribute()) { for ( CodeAccessorMethod *method = m_methodVector.first(); method; method = m_methodVector.next() ) @@ -569,14 +569,14 @@ void CodeClassField::updateContent() } } -// determine whether the parent object in this classfield indicates that it is +// determine whether the tqparent object in this classfield indicates that it is // a single variable or a List (Vector). One day this will be done correctly with special // multiplicity object that we don't have to figure out what it means via regex. bool CodeClassField::fieldIsSingleValue ( ) { // For the time being, all attributes ARE single values (yes, // I know this isnt always true, but we have to start somewhere.) - if(parentIsAttribute()) + if(tqparentIsAttribute()) return true; UMLRole * role = dynamic_cast<UMLRole*>(getParentObject()); @@ -585,8 +585,8 @@ bool CodeClassField::fieldIsSingleValue ( ) TQString multi = role->getMultiplicity(); - if(multi.isEmpty() || multi.contains(TQRegExp("^(0|1)$")) - || multi.contains(TQRegExp("^0\\.\\.1$"))) + if(multi.isEmpty() || multi.tqcontains(TQRegExp("^(0|1)$")) + || multi.tqcontains(TQRegExp("^0\\.\\.1$"))) return true; return false; diff --git a/umbrello/umbrello/codeclassfield.h b/umbrello/umbrello/codeclassfield.h index d5542bd3..10efbbae 100644 --- a/umbrello/umbrello/codeclassfield.h +++ b/umbrello/umbrello/codeclassfield.h @@ -40,6 +40,7 @@ class UMLRole; class CodeClassField : public CodeParameter { Q_OBJECT + TQ_OBJECT public: enum ClassFieldType { Attribute, PlainAssociation, Self, Aggregation, Composition, Unknown_Assoc }; @@ -50,8 +51,8 @@ public: /** * Constructors */ - CodeClassField ( ClassifierCodeDocument * parentDoc , UMLAttribute * attrib ); - CodeClassField ( ClassifierCodeDocument * parentDoc , UMLRole * role); + CodeClassField ( ClassifierCodeDocument * tqparentDoc , UMLAttribute * attrib ); + CodeClassField ( ClassifierCodeDocument * tqparentDoc , UMLRole * role); /** * Finish off initializations of the object. @@ -102,7 +103,7 @@ public: */ CodeAccessorMethod * findMethodByType(CodeAccessorMethod::AccessorType type, int role_id = -1); - /** Determine whether the parent object in this classfield indicates that it is + /** Determine whether the tqparent object in this classfield indicates that it is * a single variable or a List (Vector). One day this will be done correctly with special * multiplicity object. */ @@ -113,8 +114,8 @@ public: */ ClassFieldType getClassFieldType(); - // quick utility call to figure out if parent is an attribute or not - bool parentIsAttribute ( ); + // quick utility call to figure out if tqparent is an attribute or not + bool tqparentIsAttribute ( ); // get the type of object that will be added/removed from lists // of objects (as per specification of associations) @@ -163,7 +164,7 @@ public: protected: - /** Set the parent UMLobject appropriately. + /** Set the tqparent UMLobject appropriately. */ void setParentUMLObject (UMLObject * obj); diff --git a/umbrello/umbrello/codeclassfielddeclarationblock.cpp b/umbrello/umbrello/codeclassfielddeclarationblock.cpp index ba7c6878..5283cb38 100644 --- a/umbrello/umbrello/codeclassfielddeclarationblock.cpp +++ b/umbrello/umbrello/codeclassfielddeclarationblock.cpp @@ -14,7 +14,7 @@ */ /** basicially a class to allow for syncronization of the contents based on the - * values of the parentClassField's parentObject + * values of the tqparentClassField's tqparentObject */ #include "codeclassfielddeclarationblock.h" @@ -24,11 +24,11 @@ // Constructors/Destructors // -CodeClassFieldDeclarationBlock::CodeClassFieldDeclarationBlock ( CodeClassField * parentCF ) - : CodeBlockWithComments ( (CodeDocument*) parentCF->getParentDocument() ), - OwnedCodeBlock ((UMLObject*) parentCF->getParentObject()) +CodeClassFieldDeclarationBlock::CodeClassFieldDeclarationBlock ( CodeClassField * tqparentCF ) + : CodeBlockWithComments ( (CodeDocument*) tqparentCF->getParentDocument() ), + OwnedCodeBlock ((UMLObject*) tqparentCF->getParentObject()) { - init(parentCF); + init(tqparentCF); } CodeClassFieldDeclarationBlock::~CodeClassFieldDeclarationBlock ( ) { @@ -51,7 +51,7 @@ CodeClassField * CodeClassFieldDeclarationBlock::getParentClassField ( ) { return m_parentclassfield; } -/** Get the parent object of the parentCodeClassfield +/** Get the tqparent object of the tqparentCodeClassfield */ UMLObject * CodeClassFieldDeclarationBlock::getParentObject ( ) { return m_parentclassfield->getParentObject(); @@ -141,12 +141,12 @@ void CodeClassFieldDeclarationBlock::syncToParent () { // for role-based accessors, we DONT write ourselves out when // the name of the role is not defined. - if(!(getParentClassField()->parentIsAttribute())) + if(!(getParentClassField()->tqparentIsAttribute())) { - UMLRole * parent = dynamic_cast<UMLRole*>(getParentObject()); - if (parent == NULL) + UMLRole * tqparent = dynamic_cast<UMLRole*>(getParentObject()); + if (tqparent == NULL) return; - if(parent->getName().isEmpty()) + if(tqparent->getName().isEmpty()) { getComment()->setWriteOutText(false); setWriteOutText(false); @@ -164,9 +164,9 @@ void CodeClassFieldDeclarationBlock::syncToParent () { } -void CodeClassFieldDeclarationBlock::init (CodeClassField * parentCF) +void CodeClassFieldDeclarationBlock::init (CodeClassField * tqparentCF) { - m_parentclassfield = parentCF; + m_parentclassfield = tqparentCF; m_canDelete = false; connect(m_parentclassfield,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent())); } diff --git a/umbrello/umbrello/codeclassfielddeclarationblock.h b/umbrello/umbrello/codeclassfielddeclarationblock.h index 62bfb031..285416e3 100644 --- a/umbrello/umbrello/codeclassfielddeclarationblock.h +++ b/umbrello/umbrello/codeclassfielddeclarationblock.h @@ -28,13 +28,14 @@ class CodeClassField; * class CodeClassFieldDeclarationBlock * Used to declare classifier fields (e.g. either class attributes or classifier * associations) in the code document for any given code classfield. This is a - * special CodeBlockWithComments which is "sync'd" to the parent CodeClassField. + * special CodeBlockWithComments which is "sync'd" to the tqparent CodeClassField. */ class CodeClassFieldDeclarationBlock : public CodeBlockWithComments, public OwnedCodeBlock { friend class CodeClassField; Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -43,7 +44,7 @@ public: /** * Constructor */ - CodeClassFieldDeclarationBlock (CodeClassField * parent); + CodeClassFieldDeclarationBlock (CodeClassField * tqparent); /** * Empty Destructor @@ -56,11 +57,11 @@ public: */ CodeClassField * getParentClassField ( ); - /** A Utility method to get the parent object of the parentCodeClassfield + /** A Utility method to get the tqparent object of the tqparentCodeClassfield */ UMLObject * getParentObject ( ); - // get the parent document + // get the tqparent document CodeDocument * getParentDocument ( ); /** @@ -95,13 +96,13 @@ protected: */ virtual void updateContent() = 0; - // so parent can actually release this block + // so tqparent can actually release this block void forceRelease (); private: CodeClassField * m_parentclassfield; - void init(CodeClassField * parent); + void init(CodeClassField * tqparent); public slots: diff --git a/umbrello/umbrello/codecomment.cpp b/umbrello/umbrello/codecomment.cpp index 78873e3d..b172c3c2 100644 --- a/umbrello/umbrello/codecomment.cpp +++ b/umbrello/umbrello/codecomment.cpp @@ -47,7 +47,7 @@ void CodeComment::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) { kDebug() << "CodeComment::saveToXMI is called!" << endl; TQDomElement blockElement = doc.createElement( "codecomment" ); setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may - // just use parent TextBlock method + // just use tqparent TextBlock method root.appendChild( blockElement ); } diff --git a/umbrello/umbrello/codecomment.h b/umbrello/umbrello/codecomment.h index 6f8c7ceb..b8c10127 100644 --- a/umbrello/umbrello/codecomment.h +++ b/umbrello/umbrello/codecomment.h @@ -31,6 +31,7 @@ class CodeComment : public TextBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codedocument.cpp b/umbrello/umbrello/codedocument.cpp index f6092f09..0a183a93 100644 --- a/umbrello/umbrello/codedocument.cpp +++ b/umbrello/umbrello/codedocument.cpp @@ -112,11 +112,11 @@ TQString CodeDocument::getPath ( ) { path = path.simplifyWhiteSpace(); // Replace all blanks with underscore - path.replace(TQRegExp(" "), "_"); + path.tqreplace(TQRegExp(" "), "_"); // this allows multiple directory paths (ala Java, some other languages) // in from the package specification - path.replace(TQRegExp("\\."),"/"); // Simple hack!.. but this is more or less language + path.tqreplace(TQRegExp("\\."),"/"); // Simple hack!.. but this is more or less language // dependant and should probably be commented out. // Still, as a general default it may be useful -b.t. return path; @@ -215,7 +215,7 @@ bool CodeDocument::insertTextBlock(TextBlock * newBlock, TextBlock * existingBlo if(!findTextBlockByTag(tag, true)) return false; - int index = m_textblockVector.findRef(existingBlock); + int index = m_textblockVector.tqfindRef(existingBlock); if(index < 0) { // may be hiding in child hierarchical codeblock @@ -242,7 +242,7 @@ bool CodeDocument::insertTextBlock(TextBlock * newBlock, TextBlock * existingBlo newBlock->setTag(new_tag); } - if(m_textBlockTagMap.contains(new_tag)) + if(m_textBlockTagMap.tqcontains(new_tag)) return false; // return false, we already have some object with this tag in the list else m_textBlockTagMap.insert(new_tag, newBlock); @@ -278,10 +278,10 @@ void CodeDocument::updateHeader () { //try to find a heading file (license, coments, etc) then extract its text TQString headingText = UMLApp::app()->getCommonPolicy()->getHeadingFile(getFileExtension()); - headingText.replace(TQRegExp("%filename%"),getFileName()+getFileExtension()); - headingText.replace(TQRegExp("%filepath%"),getPath()); - headingText.replace( TQRegExp("%time%"), TQTime::currentTime().toString()); - headingText.replace( TQRegExp("%date%"), TQDate::currentDate().toString()); + headingText.tqreplace(TQRegExp("%filename%"),getFileName()+getFileExtension()); + headingText.tqreplace(TQRegExp("%filepath%"),getPath()); + headingText.tqreplace( TQRegExp("%time%"), TQTime::currentTime().toString()); + headingText.tqreplace( TQRegExp("%date%"), TQDate::tqcurrentDate().toString()); getHeader()->setText(headingText); @@ -295,7 +295,7 @@ void CodeDocument::updateHeader () { /** * create the string representation of this object. - * @return QString + * @return TQString */ TQString CodeDocument::toString ( ) { @@ -364,7 +364,7 @@ void CodeDocument::setAttributesOnNode ( TQDomDocument & doc, TQDomElement & doc docElement.appendChild( commElement); // doc codePolicy? - // FIX: store ONLY if different from the parent generator + // FIX: store ONLY if different from the tqparent generator // policy.. something which is not possible right now. -b.t. } @@ -380,7 +380,7 @@ void CodeDocument::setAttributesFromNode ( TQDomElement & root) { TQString pkgStr = root.attribute("package",""); if (!pkgStr.isEmpty() && pkgStr != "-1") { UMLDoc *umldoc = UMLApp::app()->getDocument(); - if (pkgStr.contains( TQRegExp("\\D") )) { + if (pkgStr.tqcontains( TQRegExp("\\D") )) { // suspecting pre-1.5.3 file format where the package name was // saved instead of the package ID. UMLObject *o = umldoc->findUMLObject(pkgStr); @@ -467,11 +467,11 @@ void CodeDocument::addChildTagToMap ( const TQString &tag, TextBlock * tb) TextBlock * CodeDocument::findTextBlockByTag( const TQString &tag , bool descendIntoChildren) { //if we already know to which file this class was written/should be written, just return it. - if(m_textBlockTagMap.contains(tag)) + if(m_textBlockTagMap.tqcontains(tag)) return m_textBlockTagMap[tag]; if (descendIntoChildren) - if(m_childTextBlockTagMap.contains(tag)) + if(m_childTextBlockTagMap.tqcontains(tag)) return m_childTextBlockTagMap[tag]; return (TextBlock*) NULL; diff --git a/umbrello/umbrello/codedocument.h b/umbrello/umbrello/codedocument.h index 18c26d01..a3ea7f36 100644 --- a/umbrello/umbrello/codedocument.h +++ b/umbrello/umbrello/codedocument.h @@ -46,6 +46,7 @@ class CodeDocument : public TQObject, public CodeGenObjectWithTextBlocks { friend class HierarchicalCodeBlock; Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -167,7 +168,7 @@ public: /** * create the string representation of this object. - * @return QString + * @return TQString */ virtual TQString toString ( ); diff --git a/umbrello/umbrello/codegenerationpolicy.cpp b/umbrello/umbrello/codegenerationpolicy.cpp index 5f7b9824..12db5f5e 100644 --- a/umbrello/umbrello/codegenerationpolicy.cpp +++ b/umbrello/umbrello/codegenerationpolicy.cpp @@ -514,7 +514,7 @@ TQString CodeGenerationPolicy::getHeadingFile(const TQString& str) { if(!getIncludeHeadings() || str.isEmpty()) return TQString(""); - if(str.contains(" ") ||str.contains(";")) { + if(str.tqcontains(" ") ||str.tqcontains(";")) { kWarning() << "File folder must not have spaces or semi colons!" << endl; return TQString(""); } @@ -549,10 +549,10 @@ TQString CodeGenerationPolicy::getHeadingFile(const TQString& str) { retstr += ts.readLine()+endLine; //do variable substitution - retstr.replace( TQRegExp("%author%"),TQString(getenv("USER"))); //get the user name from some where else - retstr.replace( TQRegExp("%headingpath%"),filename ); - retstr.replace( TQRegExp("%time%"), TQTime::currentTime().toString()); - retstr.replace( TQRegExp("%date%"), TQDate::currentDate().toString()); + retstr.tqreplace( TQRegExp("%author%"),TQString(getenv("USER"))); //get the user name from some where else + retstr.tqreplace( TQRegExp("%headingpath%"),filename ); + retstr.tqreplace( TQRegExp("%time%"), TQTime::currentTime().toString()); + retstr.tqreplace( TQRegExp("%date%"), TQDate::tqcurrentDate().toString()); // the replace filepath, time parts are also in the code document updateHeader method // (which is not a virtual function)... diff --git a/umbrello/umbrello/codegenerationpolicy.h b/umbrello/umbrello/codegenerationpolicy.h index 87925bb4..1876fced 100644 --- a/umbrello/umbrello/codegenerationpolicy.h +++ b/umbrello/umbrello/codegenerationpolicy.h @@ -34,6 +34,7 @@ class CodeGenerationPolicyPage; class CodeGenerationPolicy : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -289,7 +290,7 @@ public: * Create a new dialog interface for this object. * @return dialog object */ - virtual CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0); + virtual CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0); /** * Gets the heading file (as a string) to be inserted at the diff --git a/umbrello/umbrello/codegenerator.cpp b/umbrello/umbrello/codegenerator.cpp index a5b24cee..010c4e92 100644 --- a/umbrello/umbrello/codegenerator.cpp +++ b/umbrello/umbrello/codegenerator.cpp @@ -116,7 +116,7 @@ TQString CodeGenerator::getUniqueID(CodeDocument * codeDoc) CodeDocument * CodeGenerator::findCodeDocumentByID( const TQString &tag ) { //if we already know to which file this class was written/should be written, just return it. CodeDocument * doc = (CodeDocument*)NULL; - if((doc = m_codeDocumentDictionary.find(tag))) + if((doc = m_codeDocumentDictionary.tqfind(tag))) return doc; return doc; @@ -133,7 +133,7 @@ bool CodeGenerator::addCodeDocument ( CodeDocument * doc ) doc->setID(tag); } - if(m_codeDocumentDictionary.find(tag)) + if(m_codeDocumentDictionary.tqfind(tag)) return false; // return false, we already have some object with this tag in the list else m_codeDocumentDictionary.insert(tag, doc); @@ -166,10 +166,10 @@ CodeDocumentList * CodeGenerator::getCodeDocumentList ( ) { } // the vanilla version -CodeViewerDialog * CodeGenerator::getCodeViewerDialog ( TQWidget* parent, CodeDocument *doc, +CodeViewerDialog * CodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc, Settings::CodeViewerState state) { - return new CodeViewerDialog(parent, doc, state); + return new CodeViewerDialog(tqparent, doc, state); } // Other methods @@ -227,7 +227,7 @@ void CodeGenerator::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) { } /** - * Initialize this code generator from its parent UMLDoc. When this is called, it will + * Initialize this code generator from its tqparent UMLDoc. When this is called, it will * (re-)generate the list of code documents for this project (generator) by checking * for new objects/attributes which have been added or changed in the documnet. One or more * CodeDocuments will be created/overwritten/amended as is appropriate for the given language. @@ -261,7 +261,7 @@ void CodeGenerator::initFromParentDocument( ) { } /** - * Force a synchronize of this code generator, and its present contents, to that of the parent UMLDocument. + * Force a synchronize of this code generator, and its present contents, to that of the tqparent UMLDocument. * "UserGenerated" code will be preserved, but Autogenerated contents will be updated/replaced * or removed as is apppropriate. */ @@ -373,7 +373,7 @@ CodeDocument * CodeGenerator::newCodeDocument ( ) { } /** - * @return QString + * @return TQString * @param file */ @@ -382,7 +382,7 @@ TQString CodeGenerator::getHeadingFile( const TQString &file ) { } /** - * @return QString + * @return TQString * @param codeDoc * @param name */ @@ -470,7 +470,7 @@ bool CodeGenerator::openFile (TQFile & file, const TQString &fileName ) { TQDir outputDirectory = UMLApp::app()->getCommonPolicy()->getOutputDirectory(); file.setName(outputDirectory.absFilePath(fileName)); if(!file.open(IO_WriteOnly)) { - KMessageBox::sorry(0,i18n("Cannot open file %1 for writing. Please make sure the folder exists and you have permissions to write to it.").arg(file.name()),i18n("Cannot Open File")); + KMessageBox::sorry(0,i18n("Cannot open file %1 for writing. Please make sure the folder exists and you have permissions to write to it.").tqarg(file.name()),i18n("Cannot Open File")); return false; } return true; @@ -480,12 +480,12 @@ bool CodeGenerator::openFile (TQFile & file, const TQString &fileName ) { /** - * @return QString + * @return TQString * @param name */ TQString CodeGenerator::cleanName ( const TQString &name ) { TQString retval = name; - retval.replace(TQRegExp("\\W"), "_"); + retval.tqreplace(TQRegExp("\\W"), "_"); return retval; } @@ -499,7 +499,7 @@ TQString CodeGenerator::findFileName ( CodeDocument * codeDocument ) { // if path is given add this as a directory to the file name if (!path.isEmpty()) { - path.replace(TQRegExp("::"), "/"); // Simple hack! + path.tqreplace(TQRegExp("::"), "/"); // Simple hack! name = path + '/' + codeDocument->getFileName(); path = '/' + path; } else { @@ -507,7 +507,7 @@ TQString CodeGenerator::findFileName ( CodeDocument * codeDocument ) { } // Convert all "::" to "/" : Platform-specific path separator - name.replace(TQRegExp("::"), "/"); // Simple hack! + name.tqreplace(TQRegExp("::"), "/"); // Simple hack! // if a path name exists check the existence of the path directory if (!path.isEmpty()) { @@ -539,7 +539,7 @@ TQString CodeGenerator::findFileName ( CodeDocument * codeDocument ) { } name.simplifyWhiteSpace(); - name.replace(TQRegExp(" "),"_"); + name.tqreplace(TQRegExp(" "),"_"); return overwritableName( name, codeDocument->getFileExtension() ); } @@ -584,7 +584,7 @@ void CodeGenerator::findObjectsRelated(UMLClassifier *c, UMLPackageList &cList) } // now add in list ONLY if its not already there - if(temp && !cList.containsRef(temp)) + if(temp && !cList.tqcontainsRef(temp)) cList.append(temp); } @@ -594,13 +594,13 @@ void CodeGenerator::findObjectsRelated(UMLClassifier *c, UMLPackageList &cList) temp =0; //check return value temp =(UMLClassifier*) op->getType(); - if (temp && temp->getBaseType() != Uml::ot_Datatype && !cList.containsRef(temp)) + if (temp && temp->getBaseType() != Uml::ot_Datatype && !cList.tqcontainsRef(temp)) cList.append(temp); //check parameters UMLAttributeList atl = op->getParmList(); for (UMLAttribute *at = atl.first(); at; at = atl.next()) { temp = (UMLClassifier*)at->getType(); - if (temp && temp->getBaseType() != Uml::ot_Datatype && !cList.containsRef(temp)) + if (temp && temp->getBaseType() != Uml::ot_Datatype && !cList.tqcontainsRef(temp)) cList.append(temp); } @@ -612,7 +612,7 @@ void CodeGenerator::findObjectsRelated(UMLClassifier *c, UMLPackageList &cList) for (UMLAttribute *at = atl.first(); at; at = atl.next()) { temp=0; temp = (UMLClassifier*) at->getType(); - if (temp && temp->getBaseType() != Uml::ot_Datatype && !cList.containsRef(temp)) + if (temp && temp->getBaseType() != Uml::ot_Datatype && !cList.tqcontainsRef(temp)) cList.append(temp); } } @@ -622,7 +622,7 @@ void CodeGenerator::findObjectsRelated(UMLClassifier *c, UMLPackageList &cList) /** * Format an output document. - * @return QString + * @return TQString * @param text * @param lineprefix * @param linewidth @@ -640,7 +640,7 @@ TQString CodeGenerator::formatDoc(const TQString &text, const TQString &linePref continue; } int index; - while ((index = input.findRev(" ", lineWidth)) >= 0) { + while ((index = input.tqfindRev(" ", lineWidth)) >= 0) { output += linePrefix + input.left(index) + endLine; // add line input.remove(0, index + 1); //and remove processed string, including // white space @@ -706,7 +706,7 @@ bool CodeGenerator::isReservedKeyword(const TQString & keyword) { const TQStringList keywords = reservedKeywords(); - return keywords.contains(keyword); + return keywords.tqcontains(keyword); } const TQStringList CodeGenerator::reservedKeywords() const { diff --git a/umbrello/umbrello/codegenerator.h b/umbrello/umbrello/codegenerator.h index d47fd73f..eedec15d 100644 --- a/umbrello/umbrello/codegenerator.h +++ b/umbrello/umbrello/codegenerator.h @@ -81,6 +81,7 @@ class KConfig; class CodeGenerator : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -200,7 +201,7 @@ public: * %time% * %filepath% * - * @return QString + * @return TQString * @param file */ virtual TQString getHeadingFile (const TQString &file ); @@ -218,7 +219,7 @@ public: /** * Replaces spaces with underscores and capitalises as defined in m_modname - * @return QString + * @return TQString * @param name */ static TQString cleanName ( const TQString &name ); @@ -280,7 +281,7 @@ public: /** Get the editing dialog for this code document */ - virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc, + virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc, Settings::CodeViewerState state); /** @@ -303,7 +304,7 @@ public: virtual void createDefaultStereotypes (); /** - * Initialize this code generator from its parent UMLDoc. When this is called, + * Initialize this code generator from its tqparent UMLDoc. When this is called, * it will (re-)generate the list of code documents for this project (generator) * by checking for new objects/attributes which have been added or changed in the * document. One or more CodeDocuments will be created/overwritten/amended as is @@ -339,7 +340,7 @@ protected: * @param name the proposed output file name * @param extension the extension to use * @return the real file name that should be used (including extension) or - * TQString::null if none to be used + * TQString() if none to be used */ TQString overwritableName (const TQString& name, const TQString &extension ); @@ -393,7 +394,7 @@ public slots: virtual void checkRemoveUMLObject (UMLObject * obj); /** - * Force a synchronize of this code generator, and its present contents, to that of the parent UMLDocument. + * Force a synchronize of this code generator, and its present contents, to that of the tqparent UMLDocument. * "UserGenerated" code will be preserved, but Autogenerated contents will be updated/replaced * or removed as is apppropriate. */ diff --git a/umbrello/umbrello/codegenerators/adawriter.cpp b/umbrello/umbrello/codegenerators/adawriter.cpp index ec2bf59a..475be180 100644 --- a/umbrello/umbrello/codegenerators/adawriter.cpp +++ b/umbrello/umbrello/codegenerators/adawriter.cpp @@ -124,7 +124,7 @@ void AdaWriter::computeAssocTypeAndRole(UMLClassifier *c, return; const TQString multi = a->getMulti(Uml::B); bool hasNonUnityMultiplicity = (!multi.isEmpty() && multi != "1"); - hasNonUnityMultiplicity &= !multi.contains(TQRegExp("^1 *\\.\\. *1$")); + hasNonUnityMultiplicity &= !multi.tqcontains(TQRegExp("^1 *\\.\\. *1$")); roleName = cleanName(a->getRoleName(Uml::B)); if (roleName.isEmpty()) roleName = cleanName(a->getName()); @@ -154,7 +154,7 @@ void AdaWriter::writeClass(UMLClassifier *c) { const bool isClass = !c->isInterface(); TQString classname = cleanName(c->getName()); TQString fileName = packageName(c).lower(); - fileName.replace('.', '-'); + fileName.tqreplace('.', '-'); //find an appropriate name for our file fileName = overwritableName(c, fileName, ".ads"); @@ -176,8 +176,8 @@ void AdaWriter::writeClass(UMLClassifier *c) { TQString str; str = getHeadingFile(".ads"); if (!str.isEmpty()) { - str.replace(TQRegExp("%filename%"), fileName); - str.replace(TQRegExp("%filepath%"), file.name()); + str.tqreplace(TQRegExp("%filename%"), fileName); + str.tqreplace(TQRegExp("%filepath%"), file.name()); ada << str << endl; } @@ -298,8 +298,8 @@ void AdaWriter::writeClass(UMLClassifier *c) { ada << "tagged "; } else { // FIXME: Multiple inheritance is not yet supported - UMLClassifier* parent = superclasses.first(); - ada << "new " << className(parent, false) << " with "; + UMLClassifier* tqparent = superclasses.first(); + ada << "new " << className(tqparent, false) << " with "; } ada << "private;" << m_endl << m_endl; ada << getIndent() << "type " << name << "_Ptr is access all " << name << "'Class;" << m_endl << m_endl; @@ -363,8 +363,8 @@ void AdaWriter::writeClass(UMLClassifier *c) { ada << "tagged "; } else { // FIXME: Multiple inheritance is not yet supported - UMLClassifier* parent = superclasses.first(); - ada << "new " << className(parent, false) << " with "; + UMLClassifier* tqparent = superclasses.first(); + ada << "new " << className(tqparent, false) << " with "; } ada << "record" << m_endl; m_indentLevel++; @@ -483,9 +483,9 @@ void AdaWriter::writeOperation(UMLOperation *op, TQTextStream &ada, bool is_comm ada << cleanName(op->getName()) << " "; if (! (op->getStatic() && atl.count() == 0)) ada << "("; - UMLClassifier *parentClassifier = static_cast<UMLClassifier*>(op->getUMLPackage()); + UMLClassifier *tqparentClassifier = static_cast<UMLClassifier*>(op->getUMLPackage()); if (! op->getStatic()) { - ada << "Self : access " << className(parentClassifier); + ada << "Self : access " << className(tqparentClassifier); if (atl.count()) ada << ";" << m_endl; } diff --git a/umbrello/umbrello/codegenerators/adawriter.h b/umbrello/umbrello/codegenerators/adawriter.h index 779fc7d5..09e2e543 100644 --- a/umbrello/umbrello/codegenerators/adawriter.h +++ b/umbrello/umbrello/codegenerators/adawriter.h @@ -32,6 +32,7 @@ class UMLOperation; */ class AdaWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/codegenerators/aswriter.cpp b/umbrello/umbrello/codegenerators/aswriter.cpp index e973a55e..e99559f2 100644 --- a/umbrello/umbrello/codegenerators/aswriter.cpp +++ b/umbrello/umbrello/codegenerators/aswriter.cpp @@ -67,8 +67,8 @@ void ASWriter::writeClass(UMLClassifier *c) str = getHeadingFile(".as"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),fileName+".as"); - str.replace(TQRegExp("%filepath%"),fileas.name()); + str.tqreplace(TQRegExp("%filename%"),fileName+".as"); + str.tqreplace(TQRegExp("%filepath%"),fileas.name()); as << str << m_endl; } @@ -602,7 +602,7 @@ const TQStringList ASWriter::reservedKeywords() const { << "or" << "ord" << "_parent" - << "parentNode" + << "tqparentNode" << "parseFloat" << "parseInt" << "parseXML" diff --git a/umbrello/umbrello/codegenerators/aswriter.h b/umbrello/umbrello/codegenerators/aswriter.h index 75399f13..8156a04b 100644 --- a/umbrello/umbrello/codegenerators/aswriter.h +++ b/umbrello/umbrello/codegenerators/aswriter.h @@ -28,6 +28,7 @@ */ class ASWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: ASWriter(); diff --git a/umbrello/umbrello/codegenerators/codegenfactory.cpp b/umbrello/umbrello/codegenerators/codegenfactory.cpp index 00401653..471d8f4c 100644 --- a/umbrello/umbrello/codegenerators/codegenfactory.cpp +++ b/umbrello/umbrello/codegenerators/codegenfactory.cpp @@ -161,7 +161,7 @@ CodeGenerator* createObject(Uml::Programming_Language pl) { obj = new RubyWriter(); break; case Uml::pl_SQL: - obj = new SQLWriter(); + obj = new STQLWriter(); break; case Uml::pl_Tcl: obj = new TclWriter(); diff --git a/umbrello/umbrello/codegenerators/codegenfactory.h b/umbrello/umbrello/codegenerators/codegenfactory.h index 27a0f293..0930f43d 100644 --- a/umbrello/umbrello/codegenerators/codegenfactory.h +++ b/umbrello/umbrello/codegenerators/codegenfactory.h @@ -46,7 +46,7 @@ namespace CodeGenFactory { * Create a CodeOperation belonging to the given ClassifierCodeDocument. * Only applies to the advanced generators. * - * @param cd the parent ClassifierCodeDocument. + * @param cd the tqparent ClassifierCodeDocument. * @param op the related UMLOperation * @return CodeOperation which is specific to the current language */ @@ -57,8 +57,8 @@ namespace CodeGenFactory { * ClassifierCodeDocument. * Only applies to the advanced generators. * - * @param cd the parent ClassifierCodeDocument - * @param at attribute which is parent of this class field + * @param cd the tqparent ClassifierCodeDocument + * @param at attribute which is tqparent of this class field * @return CodeClassField which is specific to the current language */ CodeClassField * newCodeClassField (ClassifierCodeDocument *cd, UMLAttribute * at); @@ -68,8 +68,8 @@ namespace CodeGenFactory { * ClassifierCodeDocument. * Only applies to the advanced generators. * - * @param cd the parent ClassifierCodeDocument - * @param role association role which is parent of this class field + * @param cd the tqparent ClassifierCodeDocument + * @param role association role which is tqparent of this class field * @return CodeClassField which is specific to the current language */ CodeClassField * newCodeClassField(ClassifierCodeDocument *cd, UMLRole *role); @@ -78,8 +78,8 @@ namespace CodeGenFactory { * Create a CodeAccessorMethod object belonging to the given ClassifierCodeDocument. * Only applies to the advanced generators. * - * @param cd the parent ClassifierCodeDocument - * @param cf CodeClassField which is parent of this object + * @param cd the tqparent ClassifierCodeDocument + * @param cf CodeClassField which is tqparent of this object * @param type CodeAccessorMethod::AccessorType to create * * @return CodeAccessorMethod which is specific to the current language @@ -93,8 +93,8 @@ namespace CodeGenFactory { * ClassifierCodeDocument. * Only applies to the advanced generators. * - * @param cd the parent ClassifierCodeDocument - * @param cf CodeClassField which is parent of this object + * @param cd the tqparent ClassifierCodeDocument + * @param cf CodeClassField which is tqparent of this object * * @return CodeClassFieldDeclarationBlock which is specific to the current language */ @@ -105,7 +105,7 @@ namespace CodeGenFactory { * Create a new CodeComment object belonging to the given CodeDocument. * Only applies to the advanced generators. * - * @param cd the parent CodeDocument + * @param cd the tqparent CodeDocument * @return CodeBlockWithComments */ CodeComment * newCodeComment (CodeDocument *cd); diff --git a/umbrello/umbrello/codegenerators/codegenpolicyext.h b/umbrello/umbrello/codegenerators/codegenpolicyext.h index 29e358a1..ea792388 100644 --- a/umbrello/umbrello/codegenerators/codegenpolicyext.h +++ b/umbrello/umbrello/codegenerators/codegenpolicyext.h @@ -36,7 +36,7 @@ public: * Create a new dialog interface for this object. * @return dialog object */ - virtual CodeGenerationPolicyPage * createPage(TQWidget *parent = 0, const char *name = 0) = 0; + virtual CodeGenerationPolicyPage * createPage(TQWidget *tqparent = 0, const char *name = 0) = 0; /** * set the defaults from a config file for this code generator from the passed KConfig pointer. diff --git a/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp b/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp index 4742cd6d..7c8f0ff3 100644 --- a/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp +++ b/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp @@ -33,14 +33,14 @@ // Constructors/Destructors // -CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role) - : CodeClassField(parentDoc, role) +CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role) + : CodeClassField(tqparentDoc, role) { } -CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib) - : CodeClassField(parentDoc, attrib) +CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib) + : CodeClassField(tqparentDoc, attrib) { } @@ -55,7 +55,7 @@ CPPCodeClassField::~CPPCodeClassField ( ) { } // TQString CPPCodeClassField::getFieldName() { - if (parentIsAttribute()) + if (tqparentIsAttribute()) { UMLAttribute * at = (UMLAttribute*) getParentObject(); return cleanName(at->getName()); @@ -65,7 +65,7 @@ TQString CPPCodeClassField::getFieldName() { UMLRole * role = (UMLRole*) getParentObject(); TQString roleName = role->getName(); if(fieldIsSingleValue()) { - return roleName.replace(0, 1, roleName.left(1).lower()); + return roleName.tqreplace(0, 1, roleName.left(1).lower()); } else { return roleName.lower() + "Vector"; } @@ -80,13 +80,13 @@ TQString CPPCodeClassField::getListFieldClassName () { TQString CPPCodeClassField::getInitialValue() { - if (parentIsAttribute()) + if (tqparentIsAttribute()) { UMLAttribute * at = dynamic_cast<UMLAttribute*>( getParentObject() ); if (at) { return fixInitialStringDeclValue(at->getInitialValue(), getTypeName()); } else { - kError() << "CPPCodeClassField::getInitialValue: parent object is not a UMLAttribute" + kError() << "CPPCodeClassField::getInitialValue: tqparent object is not a UMLAttribute" << endl; return ""; } diff --git a/umbrello/umbrello/codegenerators/cppcodeclassfield.h b/umbrello/umbrello/codegenerators/cppcodeclassfield.h index 929e5178..0b714b16 100644 --- a/umbrello/umbrello/codegenerators/cppcodeclassfield.h +++ b/umbrello/umbrello/codegenerators/cppcodeclassfield.h @@ -28,6 +28,7 @@ class ClassifierCodeDocument; class CPPCodeClassField : public CodeClassField { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -36,8 +37,8 @@ public: /** * Constructors */ - CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role); - CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib); + CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role); + CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib); /** * Empty Destructor @@ -47,7 +48,7 @@ public: TQString getFieldType(); TQString getFieldName(); TQString getInitialValue(); - /** get the name of the class which holds lists, e.g. "QPtrlist" or + /** get the name of the class which holds lists, e.g. "TQPtrlist" or * "Vector" or "List" and so on. */ TQString getListFieldClassName(); diff --git a/umbrello/umbrello/codegenerators/cppcodecomment.cpp b/umbrello/umbrello/codegenerators/cppcodecomment.cpp index d0e386c0..dada5357 100644 --- a/umbrello/umbrello/codegenerators/cppcodecomment.cpp +++ b/umbrello/umbrello/codegenerators/cppcodecomment.cpp @@ -53,12 +53,12 @@ CPPCodeComment::~CPPCodeComment ( ) { } void CPPCodeComment::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) { TQDomElement blockElement = doc.createElement( "cppcodecomment" ); setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may - // just use parent TextBlock method + // just use tqparent TextBlock method root.appendChild( blockElement ); } /** - * @return QString + * @return TQString */ TQString CPPCodeComment::toString ( ) { diff --git a/umbrello/umbrello/codegenerators/cppcodecomment.h b/umbrello/umbrello/codegenerators/cppcodecomment.h index 28fb4004..4d7e7e6e 100644 --- a/umbrello/umbrello/codegenerators/cppcodecomment.h +++ b/umbrello/umbrello/codegenerators/cppcodecomment.h @@ -31,6 +31,7 @@ class CPPCodeComment : virtual public CodeComment { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -59,7 +60,7 @@ public: virtual void saveToXMI ( TQDomDocument & doc, TQDomElement & root ); /** - * @return QString + * @return TQString */ TQString toString ( ); diff --git a/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp b/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp index 6328fd3b..c8e68f4c 100644 --- a/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp +++ b/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp @@ -53,12 +53,12 @@ CPPCodeDocumentation::~CPPCodeDocumentation ( ) { } void CPPCodeDocumentation::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) { TQDomElement blockElement = doc.createElement( "cppcodedocumentation" ); setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may - // just use parent TextBlock method + // just use tqparent TextBlock method root.appendChild( blockElement ); } /** - * @return QString + * @return TQString */ TQString CPPCodeDocumentation::toString ( ) { diff --git a/umbrello/umbrello/codegenerators/cppcodedocumentation.h b/umbrello/umbrello/codegenerators/cppcodedocumentation.h index 505fc8bb..b5ec87df 100644 --- a/umbrello/umbrello/codegenerators/cppcodedocumentation.h +++ b/umbrello/umbrello/codegenerators/cppcodedocumentation.h @@ -61,7 +61,7 @@ public: virtual void saveToXMI ( TQDomDocument & doc, TQDomElement & root ); /** - * @return QString + * @return TQString */ TQString toString ( ); diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp index f5d8ec42..563a86ee 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp +++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp @@ -28,8 +28,8 @@ #include <kmessagebox.h> -CPPCodeGenerationForm::CPPCodeGenerationForm( TQWidget *parent, const char *name ) - : CPPCodeGenerationFormBase (parent,name) +CPPCodeGenerationForm::CPPCodeGenerationForm( TQWidget *tqparent, const char *name ) + : CPPCodeGenerationFormBase (tqparent,name) { init(); @@ -70,8 +70,8 @@ CPPCodeGenerationForm::~CPPCodeGenerationForm() void CPPCodeGenerationForm::browseClicked() { - TQString button = sender()->name(); - TQString file = KFileDialog::getOpenFileName( TQString::null, "*.h", this, "Get Header File"); + TQString button = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(); + TQString file = KFileDialog::getOpenFileName( TQString(), "*.h", this, "Get Header File"); if(file.isEmpty()) return; diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.h b/umbrello/umbrello/codegenerators/cppcodegenerationform.h index 5c35760c..7a98ef91 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationform.h +++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.h @@ -25,12 +25,13 @@ class TQCheckListItem; class CPPCodeGenerationForm : public CPPCodeGenerationFormBase { Q_OBJECT + TQ_OBJECT public: /** * std ctor */ - explicit CPPCodeGenerationForm (TQWidget *parent=0, const char *name=0); + explicit CPPCodeGenerationForm (TQWidget *tqparent=0, const char *name=0); /** * std dtor diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui index 2599ae35..455d4a2e 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui +++ b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>CPPCodeGenerationFormBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CPPCodeGenerationFormBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -12,11 +12,11 @@ <height>549</height> </rect> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>11</x> <y>44</y> @@ -39,15 +39,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Slash-Slash (//)</string> @@ -62,7 +62,7 @@ <cstring>m_SelectCommentStyle</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -74,11 +74,11 @@ </widget> </grid> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>11</x> <y>11</y> @@ -98,11 +98,11 @@ <string><p align="center">C++ Code Generation</p></string> </property> </widget> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>120</y> @@ -110,7 +110,7 @@ <height>305</height> </rect> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -121,14 +121,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <property name="name"> <cstring>GeneralOptionsListView</cstring> </property> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -149,14 +149,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>410</width> <height>113</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_2_2_2</cstring> </property> @@ -164,9 +164,9 @@ <string>Use following for classes in generated code:</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <grid> <property name="name"> @@ -203,7 +203,7 @@ </stringlist> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_3_2_2_2</cstring> </property> @@ -211,7 +211,7 @@ <string><b>Variable</b></string> </property> </widget> - <widget class="QPushButton" row="2" column="4" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="2" column="4" rowspan="1" colspan="2"> <property name="name"> <cstring>m_browseStringButton</cstring> </property> @@ -223,7 +223,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32767</height> @@ -233,7 +233,7 @@ <string>...</string> </property> </widget> - <widget class="QCheckBox" row="2" column="7"> + <widget class="TQCheckBox" row="2" column="7"> <property name="name"> <cstring>m_globalStringCheckBox</cstring> </property> @@ -285,7 +285,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -302,14 +302,14 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>stringClassTextLabel</cstring> </property> @@ -325,7 +325,7 @@ <string><p align="center">String</p></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>listClassTextLabel</cstring> </property> @@ -366,7 +366,7 @@ </stringlist> </property> </widget> - <widget class="QLabel" row="0" column="5" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="5" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel4_2_2_2</cstring> </property> @@ -399,7 +399,7 @@ </stringlist> </property> </widget> - <widget class="QCheckBox" row="1" column="7"> + <widget class="TQCheckBox" row="1" column="7"> <property name="name"> <cstring>m_globalListCheckBox</cstring> </property> @@ -410,7 +410,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel3_2_2</cstring> </property> @@ -418,7 +418,7 @@ <string>Class name</string> </property> </widget> - <widget class="QPushButton" row="1" column="4" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="1" column="4" rowspan="1" colspan="2"> <property name="name"> <cstring>m_browseListButton</cstring> </property> @@ -430,7 +430,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32767</height> @@ -440,7 +440,7 @@ <string>...</string> </property> </widget> - <widget class="QLabel" row="0" column="3" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="3" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel5_2_2_2</cstring> </property> @@ -470,10 +470,10 @@ <slot>browseClicked()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>browseClicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp index 8aec0351..8fa473cb 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp +++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp @@ -224,40 +224,40 @@ void CPPCodeGenerationPolicy::setVectorIncludeIsGlobal(bool value) { TQString CPPCodeGenerationPolicy::getVectorMethodAppend(const TQString & variableName, const TQString & itemClassName) { TQString value = m_vectorMethodAppendBase; if(!variableName.isEmpty()) - value.replace(TQRegExp("%VARNAME%"),variableName); - value.replace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName); + value.tqreplace(TQRegExp("%VARNAME%"),variableName); + value.tqreplace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName); if(!itemClassName.isEmpty()) - value.replace(TQRegExp("%ITEMCLASS%"),itemClassName); + value.tqreplace(TQRegExp("%ITEMCLASS%"),itemClassName); return value; } TQString CPPCodeGenerationPolicy::getVectorMethodRemove(const TQString & variableName, const TQString & itemClassName) { TQString value = m_vectorMethodRemoveBase; if(!variableName.isEmpty()) - value.replace(TQRegExp("%VARNAME%"),variableName); - value.replace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName); + value.tqreplace(TQRegExp("%VARNAME%"),variableName); + value.tqreplace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName); if(!itemClassName.isEmpty()) - value.replace(TQRegExp("%ITEMCLASS%"),itemClassName); + value.tqreplace(TQRegExp("%ITEMCLASS%"),itemClassName); return value; } TQString CPPCodeGenerationPolicy::getVectorMethodInit(const TQString & variableName, const TQString & itemClassName) { TQString value = m_vectorMethodInitBase; if(!variableName.isEmpty()) - value.replace(TQRegExp("%VARNAME%"),variableName); - value.replace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName); + value.tqreplace(TQRegExp("%VARNAME%"),variableName); + value.tqreplace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName); if(!itemClassName.isEmpty()) - value.replace(TQRegExp("%ITEMCLASS%"),itemClassName); + value.tqreplace(TQRegExp("%ITEMCLASS%"),itemClassName); return value; } TQString CPPCodeGenerationPolicy::getObjectMethodInit(const TQString & variableName, const TQString & itemClassName) { TQString value = m_objectMethodInitBase; if(!variableName.isEmpty()) - value.replace(TQRegExp("%VARNAME%"),variableName); - value.replace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName); + value.tqreplace(TQRegExp("%VARNAME%"),variableName); + value.tqreplace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName); if(!itemClassName.isEmpty()) - value.replace(TQRegExp("%ITEMCLASS%"),itemClassName); + value.tqreplace(TQRegExp("%ITEMCLASS%"),itemClassName); return value; } @@ -359,8 +359,8 @@ void CPPCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSign * Create a new dialog interface for this object. * @return dialog object */ -CodeGenerationPolicyPage * CPPCodeGenerationPolicy::createPage ( TQWidget *parent, const char *name ) { - return new CPPCodeGenerationPolicyPage ( parent, name, this ); +CodeGenerationPolicyPage * CPPCodeGenerationPolicy::createPage ( TQWidget *tqparent, const char *name ) { + return new CPPCodeGenerationPolicyPage ( tqparent, name, this ); } void CPPCodeGenerationPolicy::init() { diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h index 69d3490f..949b451c 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h +++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h @@ -27,6 +27,7 @@ class CodeGenerationPolicyPage; class CPPCodeGenerationPolicy : public CodeGenPolicyExt { Q_OBJECT + TQ_OBJECT public: static const bool DEFAULT_AUTO_GEN_EMPTY_CONSTRUCTORS; @@ -192,7 +193,7 @@ public: * Create a new dialog interface for this object. * @return dialog object */ - CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0); + CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0); protected: diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp index 60d37bac..a008daab 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp +++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp @@ -26,8 +26,8 @@ #include "cppcodegenerationformbase.h" #include "../uml.h" -CPPCodeGenerationPolicyPage::CPPCodeGenerationPolicyPage( TQWidget *parent, const char *name, CPPCodeGenerationPolicy * policy ) - : CodeGenerationPolicyPage(parent, name, policy) +CPPCodeGenerationPolicyPage::CPPCodeGenerationPolicyPage( TQWidget *tqparent, const char *name, CPPCodeGenerationPolicy * policy ) + : CodeGenerationPolicyPage(tqparent, name, policy) { CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy(); form = new CPPCodeGenerationForm(this); @@ -59,31 +59,31 @@ void CPPCodeGenerationPolicyPage::apply() CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy(); // now do our cpp-specific configs - CPPCodeGenerationPolicy * parent = (CPPCodeGenerationPolicy*) m_parentPolicy; + CPPCodeGenerationPolicy * tqparent = (CPPCodeGenerationPolicy*) m_parentPolicy; // block signals so that we don't generate too many sync signals for child code // documents - parent->blockSignals(true); + tqparent->blockSignals(true); common->setCommentStyle((CodeGenerationPolicy::CommentStyle ) form->m_SelectCommentStyle->currentItem()); common->setAutoGenerateConstructors(form->getGenerateEmptyConstructors()); - parent->setAutoGenerateAccessors(form->getGenerateAccessorMethods()); + tqparent->setAutoGenerateAccessors(form->getGenerateAccessorMethods()); - parent->setDestructorsAreVirtual(form->getVirtualDestructors()); - parent->setPackageIsNamespace(form->getPackageIsANamespace()); - parent->setAccessorsAreInline(form->getAccessorsAreInline()); - parent->setOperationsAreInline(form->getOperationsAreInline()); - parent->setAccessorsArePublic(form->getAccessorsArePublic()); + tqparent->setDestructorsAreVirtual(form->getVirtualDestructors()); + tqparent->setPackageIsNamespace(form->getPackageIsANamespace()); + tqparent->setAccessorsAreInline(form->getAccessorsAreInline()); + tqparent->setOperationsAreInline(form->getOperationsAreInline()); + tqparent->setAccessorsArePublic(form->getAccessorsArePublic()); - parent->setStringClassName(form->m_stringClassHCombo->currentText()); - parent->setStringClassNameInclude(form->m_stringIncludeFileHistoryCombo->currentText()); - parent->setStringIncludeIsGlobal(form->m_globalStringCheckBox->isChecked()); + tqparent->setStringClassName(form->m_stringClassHCombo->currentText()); + tqparent->setStringClassNameInclude(form->m_stringIncludeFileHistoryCombo->currentText()); + tqparent->setStringIncludeIsGlobal(form->m_globalStringCheckBox->isChecked()); - parent->setVectorClassName(form->m_listClassHCombo->currentText()); - parent->setVectorClassNameInclude(form->m_listIncludeFileHistoryCombo->currentText()); - parent->setVectorIncludeIsGlobal(form->m_globalListCheckBox->isChecked()); + tqparent->setVectorClassName(form->m_listClassHCombo->currentText()); + tqparent->setVectorClassNameInclude(form->m_listIncludeFileHistoryCombo->currentText()); + tqparent->setVectorIncludeIsGlobal(form->m_globalListCheckBox->isChecked()); - parent->blockSignals(false); + tqparent->blockSignals(false); // now send out modified code content signal common->emitModifiedCodeContentSig(); diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h index eb7aa9ce..6e32c62d 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h +++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h @@ -28,9 +28,10 @@ class CPPCodeGenerationPolicyPage : public CodeGenerationPolicyPage { Q_OBJECT + TQ_OBJECT public: - explicit CPPCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, CPPCodeGenerationPolicy * policy = 0); + explicit CPPCodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, CPPCodeGenerationPolicy * policy = 0); virtual ~CPPCodeGenerationPolicyPage(); diff --git a/umbrello/umbrello/codegenerators/cppcodegenerator.cpp b/umbrello/umbrello/codegenerators/cppcodegenerator.cpp index b5c12dd6..1893ce65 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerator.cpp +++ b/umbrello/umbrello/codegenerators/cppcodegenerator.cpp @@ -95,7 +95,7 @@ bool CPPCodeGenerator::addHeaderCodeDocument ( CPPHeaderCodeDocument * doc ) doc->setID(tag); } - if(m_codeDocumentDictionary.find(tag)) + if(m_codeDocumentDictionary.tqfind(tag)) return false; // return false, we already have some object with this tag in the list else m_codeDocumentDictionary.insert(tag, doc); @@ -120,14 +120,14 @@ bool CPPCodeGenerator::removeHeaderCodeDocument ( CPPHeaderCodeDocument * remove // In the C++ version, we need to make both source and header files as well // as the makefile available. -CodeViewerDialog * CPPCodeGenerator::getCodeViewerDialog ( TQWidget* parent, CodeDocument *doc, +CodeViewerDialog * CPPCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc, Settings::CodeViewerState state) { ClassifierCodeDocument * cdoc = dynamic_cast<ClassifierCodeDocument*>(doc); if(!cdoc) // bah..not a classcode document?? then just use vanilla version - return CodeGenerator::getCodeViewerDialog(parent,doc,state); + return CodeGenerator::getCodeViewerDialog(tqparent,doc,state); else { // build with passed (source) code document CodeViewerDialog *dialog; @@ -138,11 +138,11 @@ CodeViewerDialog * CPPCodeGenerator::getCodeViewerDialog ( TQWidget* parent, Cod if(hdoc) { // if we have a header document..build with that - dialog = new CodeViewerDialog(parent, hdoc, state); + dialog = new CodeViewerDialog(tqparent, hdoc, state); dialog->addCodeDocument(doc); } else // shouldn't happen, but lets try to gracefully deliver something. - dialog = new CodeViewerDialog(parent, doc, state); + dialog = new CodeViewerDialog(tqparent, doc, state); // add in makefile if available and desired if(getCreateProjectMakefile()) @@ -178,8 +178,8 @@ void CPPCodeGenerator::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) { } /** - * Force a synchronize of this code generator, and its present contents, to that of the parent UMLDocument. - * Need to override parent method because we have header documents to consider too. + * Force a synchronize of this code generator, and its present contents, to that of the tqparent UMLDocument. + * Need to override tqparent method because we have header documents to consider too. */ void CPPCodeGenerator::syncCodeToDocument ( ) { @@ -347,7 +347,7 @@ void CPPCodeGenerator::initAttributes ( ) UMLApp::app()->setPolicyExt ( new CPPCodeGenerationPolicy(UMLApp::app()->getConfig()) ); - // load Classifier documents from parent document + // load Classifier documents from tqparent document //initFromParentDocument(); } diff --git a/umbrello/umbrello/codegenerators/cppcodegenerator.h b/umbrello/umbrello/codegenerators/cppcodegenerator.h index 2290c6e3..90b0c3f2 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerator.h +++ b/umbrello/umbrello/codegenerators/cppcodegenerator.h @@ -33,6 +33,7 @@ class KConfig; class CPPCodeGenerator : public CodeGenerator { Q_OBJECT + TQ_OBJECT public: static const bool DEFAULT_BUILD_MAKEFILE; @@ -88,7 +89,7 @@ public: /** Get the editing dialog for this code document */ - virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc, + virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc, Settings::CodeViewerState state); /** @@ -157,7 +158,7 @@ public slots: virtual void checkRemoveUMLObject (UMLObject * obj); /** - * Force a synchronize of this code generator, and its present contents, to that of the parent UMLDocument. + * Force a synchronize of this code generator, and its present contents, to that of the tqparent UMLDocument. * "UserGenerated" code will be preserved, but Autogenerated contents will be updated/replaced * or removed as is apppropriate. */ diff --git a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp index 868dea41..57ae0172 100644 --- a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp @@ -25,10 +25,10 @@ // CPPHeaderClassDeclarationBlock::CPPHeaderClassDeclarationBlock - ( CPPHeaderCodeDocument * parentDoc, const TQString &startText, const TQString &endText, const TQString &comment) - : OwnedHierarchicalCodeBlock(parentDoc->getParentClassifier(), parentDoc, startText, endText, comment) + ( CPPHeaderCodeDocument * tqparentDoc, const TQString &startText, const TQString &endText, const TQString &comment) + : OwnedHierarchicalCodeBlock(tqparentDoc->getParentClassifier(), tqparentDoc, startText, endText, comment) { - init(parentDoc, comment); + init(tqparentDoc, comment); } CPPHeaderClassDeclarationBlock::~CPPHeaderClassDeclarationBlock ( ) { } @@ -75,10 +75,10 @@ void CPPHeaderClassDeclarationBlock::saveToXMI ( TQDomDocument & doc, TQDomEleme void CPPHeaderClassDeclarationBlock::updateContent ( ) { - CPPHeaderCodeDocument *parentDoc = dynamic_cast<CPPHeaderCodeDocument*>(getParentDocument()); - UMLClassifier *c = parentDoc->getParentClassifier(); + CPPHeaderCodeDocument *tqparentDoc = dynamic_cast<CPPHeaderCodeDocument*>(getParentDocument()); + UMLClassifier *c = tqparentDoc->getParentClassifier(); TQString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars(); - bool isInterface = parentDoc->parentIsInterface(); // a little shortcut + bool isInterface = tqparentDoc->tqparentIsInterface(); // a little shortcut TQString CPPHeaderClassName = CodeGenerator::cleanName(c->getName()); bool forceDoc = UMLApp::app()->getCommonPolicy()->getCodeVerboseDocumentComments(); @@ -112,7 +112,7 @@ void CPPHeaderClassDeclarationBlock::updateContent ( ) */ /* - if(parentDoc->parentIsInterface()) + if(tqparentDoc->tqparentIsInterface()) startText.append("interface "); else */ @@ -144,10 +144,10 @@ void CPPHeaderClassDeclarationBlock::updateContent ( ) } -void CPPHeaderClassDeclarationBlock::init (CPPHeaderCodeDocument *parentDoc, const TQString &comment) +void CPPHeaderClassDeclarationBlock::init (CPPHeaderCodeDocument *tqparentDoc, const TQString &comment) { - setComment(new CPPCodeDocumentation(parentDoc)); + setComment(new CPPCodeDocumentation(tqparentDoc)); getComment()->setText(comment); setEndText("};"); diff --git a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h index 0710560f..b6eb68c7 100644 --- a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h +++ b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h @@ -25,6 +25,7 @@ class CPPHeaderClassDeclarationBlock : public OwnedHierarchicalCodeBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -33,7 +34,7 @@ public: /** * Empty Constructor */ - explicit CPPHeaderClassDeclarationBlock ( CPPHeaderCodeDocument * parentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = ""); + explicit CPPHeaderClassDeclarationBlock ( CPPHeaderCodeDocument * tqparentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = ""); /** * Empty Destructor @@ -60,7 +61,7 @@ protected: private: - void init (CPPHeaderCodeDocument * parent, const TQString &comment); + void init (CPPHeaderCodeDocument * tqparent, const TQString &comment); }; diff --git a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp index d96ad398..2c983a15 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp +++ b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp @@ -56,12 +56,12 @@ CPPHeaderCodeAccessorMethod::~CPPHeaderCodeAccessorMethod ( ) { } // we basically want to update the body of this method void CPPHeaderCodeAccessorMethod::updateContent( ) { - CodeClassField * parentField = getParentClassField(); - CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField); + CodeClassField * tqparentField = getParentClassField(); + CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); bool isInlineMethod = policy->getAccessorsAreInline( ); - Uml::Visibility scope = parentField->getVisibility(); + Uml::Visibility scope = tqparentField->getVisibility(); TQString variableName = cppfield->getFieldName(); TQString itemClassName = cppfield->getTypeName(); TQString text; @@ -92,11 +92,11 @@ void CPPHeaderCodeAccessorMethod::updateContent( ) void CPPHeaderCodeAccessorMethod::updateMethodDeclaration() { - CodeClassField * parentField = getParentClassField(); - ClassifierCodeDocument * doc = parentField->getParentDocument(); + CodeClassField * tqparentField = getParentClassField(); + ClassifierCodeDocument * doc = tqparentField->getParentDocument(); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); - CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField); + CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField); bool isInlineMethod = policy->getAccessorsAreInline( ); diff --git a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h index dea417fc..021436fa 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h +++ b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h @@ -25,6 +25,7 @@ class CodeClassField; class CPPHeaderCodeAccessorMethod : public CodeAccessorMethod { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp index 3f15d05b..d2dba95d 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp @@ -21,8 +21,8 @@ // Constructors/Destructors // -CPPHeaderCodeClassFieldDeclarationBlock::CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * parent ) - : CodeClassFieldDeclarationBlock ( parent ) +CPPHeaderCodeClassFieldDeclarationBlock::CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * tqparent ) + : CodeClassFieldDeclarationBlock ( tqparent ) { setOverallIndentationLevel(1); updateContent(); @@ -41,8 +41,8 @@ CPPHeaderCodeClassFieldDeclarationBlock::~CPPHeaderCodeClassFieldDeclarationBloc */ void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( ) { - UMLObject *umlparent = CodeClassFieldDeclarationBlock::getParentObject(); - if (umlparent == NULL) { + UMLObject *umltqparent = CodeClassFieldDeclarationBlock::getParentObject(); + if (umltqparent == NULL) { return; } @@ -50,7 +50,7 @@ void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( ) CPPCodeClassField * hcppcf = dynamic_cast<CPPCodeClassField*>(cf); // Set the comment - TQString notes = umlparent->getDoc(); + TQString notes = umltqparent->getDoc(); getComment()->setText(notes); if(notes.isEmpty()) getComment()->setWriteOutText(false); @@ -59,12 +59,12 @@ void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( ) // Set the body - TQString staticValue = umlparent->getStatic() ? "static " : ""; + TQString staticValue = umltqparent->getStatic() ? "static " : ""; TQString typeName = hcppcf->getTypeName(); TQString fieldName = hcppcf->getFieldName(); // Ugh. Sloppy exception. - if (!cf->parentIsAttribute() && !cf->fieldIsSingleValue()) + if (!cf->tqparentIsAttribute() && !cf->fieldIsSingleValue()) typeName = hcppcf->getListFieldClassName(); TQString body = staticValue + ' ' + typeName + ' ' + fieldName + ';'; diff --git a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h index 6a77047c..dc3a4c29 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h +++ b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h @@ -23,6 +23,7 @@ class CPPHeaderCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -31,7 +32,7 @@ public: /** * Constructor */ - CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * parent ); + CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * tqparent ); /** * Empty Destructor @@ -40,7 +41,7 @@ public: protected: - // this will be called by syncToParent whenever the parent object is "modified" + // this will be called by syncToParent whenever the tqparent object is "modified" void updateContent ( ); private: diff --git a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp index 2c471667..92bafba1 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp +++ b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp @@ -185,7 +185,7 @@ void CPPHeaderCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & root) } else if( name == "codeoperation" ) { // find the code operation by id - TQString id = element.attribute("parent_id","-1"); + TQString id = element.attribute("tqparent_id","-1"); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id)); UMLOperation * op = dynamic_cast<UMLOperation*>(obj); if(op) { @@ -206,7 +206,7 @@ void CPPHeaderCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & root) { CPPHeaderClassDeclarationBlock * block = getClassDecl(); block->loadFromXMI(element); - // normally this would be populated by the following syncToparent + // normally this would be populated by the following syncTotqparent // call, but we cant wait for it, so lets just do it now. namespaceBlock = getHierarchicalCodeBlock("namespace", "Namespace", 0); @@ -326,7 +326,7 @@ void CPPHeaderCodeDocument::saveToXMI ( TQDomDocument & doc, TQDomElement & root */ // This method will cause the class to rebuild its text representation. -// based on the parent classifier object. +// based on the tqparent classifier object. // For any situation in which this is called, we are either building the code // document up, or replacing/regenerating the existing auto-generated parts. As // such, we will want to insert everything we resonablely will want @@ -334,7 +334,7 @@ void CPPHeaderCodeDocument::saveToXMI ( TQDomDocument & doc, TQDomElement & root // comments) to appear or not, as needed. void CPPHeaderCodeDocument::updateContent( ) { - // Gather info on the various fields and parent objects of this class... + // Gather info on the various fields and tqparent objects of this class... UMLClassifier * c = getParentClassifier(); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); @@ -370,7 +370,7 @@ void CPPHeaderCodeDocument::updateContent( ) bool hasOperationMethods = c->getOpList().last() ? true : false; bool hasNamespace = false; bool isEnumeration = false; - bool isInterface = parentIsInterface(); + bool isInterface = tqparentIsInterface(); bool hasclassFields = hasClassFields(); bool forcedoc = UMLApp::app()->getCommonPolicy()->getCodeVerboseDocumentComments(); TQString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars(); @@ -412,14 +412,14 @@ void CPPHeaderCodeDocument::updateContent( ) CodeGenerator::findObjectsRelated(c,includes); for(UMLPackage *con = includes.first(); con ; con = includes.next()) - if (con->getBaseType() != Uml::ot_Datatype && !packageMap.contains(con)) + if (con->getBaseType() != Uml::ot_Datatype && !packageMap.tqcontains(con)) { packageMap.insert(con,con->getPackage()); if(con != getParentClassifier()) includeStatement.append("#include \""+CodeGenerator::cleanName(con->getName().lower())+".h\""+endLine); } // now, add/update the includes codeblock - CodeBlockWithComments * inclBlock = addOrUpdateTaggedCodeBlockWithComments("includes", includeStatement, TQString::null, 0, false); + CodeBlockWithComments * inclBlock = addOrUpdateTaggedCodeBlockWithComments("includes", includeStatement, TQString(), 0, false); if(includeStatement.isEmpty() && inclBlock->getContentType() == CodeBlock::AutoGenerated) inclBlock->setWriteOutText(false); else @@ -800,7 +800,7 @@ void CPPHeaderCodeDocument::updateContent( ) // Operations // - // nothing to do here.. "updateOperations" in parent class puts things + // nothing to do here.. "updateOperations" in tqparent class puts things // in the right place using the "addCodeOperation" method we defined in this class // FINISH up with hash def block close diff --git a/umbrello/umbrello/codegenerators/cppheadercodedocument.h b/umbrello/umbrello/codegenerators/cppheadercodedocument.h index ed7723d0..59cc9c8d 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodedocument.h +++ b/umbrello/umbrello/codegenerators/cppheadercodedocument.h @@ -34,6 +34,7 @@ class CPPHeaderClassDeclarationBlock; class CPPHeaderCodeDocument : public ClassifierCodeDocument { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp b/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp index 471c7734..c4ec5145 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp +++ b/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp @@ -26,8 +26,8 @@ // CPPHeaderCodeOperation::CPPHeaderCodeOperation - ( CPPHeaderCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment ) - : CodeOperation (doc, parent, body, comment) + ( CPPHeaderCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment ) + : CodeOperation (doc, tqparent, body, comment) { // lets not go with the default comment and instead use // full-blown cpp documentation object instead @@ -68,7 +68,7 @@ void CPPHeaderCodeOperation::updateContent( ) void CPPHeaderCodeOperation::updateMethodDeclaration() { ClassifierCodeDocument *ccd = dynamic_cast<ClassifierCodeDocument*>(getParentDocument()); - bool isInterface = ccd->parentIsInterface(); + bool isInterface = ccd->tqparentIsInterface(); UMLOperation * o = getParentOperation(); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); @@ -134,7 +134,7 @@ void CPPHeaderCodeOperation::updateMethodDeclaration() int CPPHeaderCodeOperation::lastEditableLine() { ClassifierCodeDocument * doc = dynamic_cast<ClassifierCodeDocument*>(getParentDocument()); UMLOperation * o = getParentOperation(); - if(doc->parentIsInterface() || o->getAbstract()) + if(doc->tqparentIsInterface() || o->getAbstract()) return -1; // very last line is NOT editable as its a one-line declaration w/ no body in // an interface. return 0; diff --git a/umbrello/umbrello/codegenerators/cppheadercodeoperation.h b/umbrello/umbrello/codegenerators/cppheadercodeoperation.h index 18b7f33f..915c4ac1 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodeoperation.h +++ b/umbrello/umbrello/codegenerators/cppheadercodeoperation.h @@ -26,6 +26,7 @@ class CPPHeaderCodeDocument; class CPPHeaderCodeOperation : virtual public CodeOperation { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/cppmakecodedocument.cpp b/umbrello/umbrello/codegenerators/cppmakecodedocument.cpp index 33f945ae..873cd8c8 100644 --- a/umbrello/umbrello/codegenerators/cppmakecodedocument.cpp +++ b/umbrello/umbrello/codegenerators/cppmakecodedocument.cpp @@ -47,7 +47,7 @@ void CPPMakefileCodeDocument::updateContent( ) { } /** - * @return QString + * @return TQString */ TQString CPPMakefileCodeDocument::toString ( ) { return "# cpp make build document"; @@ -63,10 +63,10 @@ TQString CPPMakefileCodeDocument::getPath ( ) path.simplifyWhiteSpace(); // Replace all blanks with underscore - path.replace(TQRegExp(" "), "_"); + path.tqreplace(TQRegExp(" "), "_"); - path.replace(TQRegExp("\\."),"/"); - path.replace(TQRegExp("::"),"/"); + path.tqreplace(TQRegExp("\\."),"/"); + path.tqreplace(TQRegExp("::"),"/"); path.lower(); diff --git a/umbrello/umbrello/codegenerators/cppmakecodedocument.h b/umbrello/umbrello/codegenerators/cppmakecodedocument.h index 1b1c109b..18f97707 100644 --- a/umbrello/umbrello/codegenerators/cppmakecodedocument.h +++ b/umbrello/umbrello/codegenerators/cppmakecodedocument.h @@ -30,6 +30,7 @@ class CPPMakefileCodeDocument : public CodeDocument { Q_OBJECT + TQ_OBJECT public: static const char * DOCUMENT_ID_VALUE; @@ -48,7 +49,7 @@ public: virtual ~CPPMakefileCodeDocument ( ); /** - * @return QString + * @return TQString */ TQString toString ( ); diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp index c71f6d2a..2ff19637 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp +++ b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp @@ -56,8 +56,8 @@ CPPSourceCodeAccessorMethod::~CPPSourceCodeAccessorMethod ( ) { } // we basically want to update the body of this method void CPPSourceCodeAccessorMethod::updateContent( ) { - CodeClassField * parentField = getParentClassField(); - CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField); + CodeClassField * tqparentField = getParentClassField(); + CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); bool isInlineMethod = policy->getAccessorsAreInline( ); @@ -92,11 +92,11 @@ void CPPSourceCodeAccessorMethod::updateContent( ) void CPPSourceCodeAccessorMethod::updateMethodDeclaration() { - CodeClassField * parentField = getParentClassField(); - ClassifierCodeDocument * doc = parentField->getParentDocument(); + CodeClassField * tqparentField = getParentClassField(); + ClassifierCodeDocument * doc = tqparentField->getParentDocument(); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); - CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField); + CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField); UMLClassifier * c = doc->getParentClassifier(); bool isInlineMethod = policy->getAccessorsAreInline( ); diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h index 7c4088e9..f1565f2b 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h +++ b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h @@ -25,6 +25,7 @@ class CodeClassField; class CPPSourceCodeAccessorMethod : public CodeAccessorMethod { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp index 016249e5..2e55e92a 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp @@ -20,8 +20,8 @@ // Constructors/Destructors // -CPPSourceCodeClassFieldDeclarationBlock::CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * parent ) - : CodeClassFieldDeclarationBlock ( parent ) +CPPSourceCodeClassFieldDeclarationBlock::CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * tqparent ) + : CodeClassFieldDeclarationBlock ( tqparent ) { setOverallIndentationLevel(1); updateContent(); diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h index a27c0684..00b6135f 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h +++ b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h @@ -23,6 +23,7 @@ class CPPSourceCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -31,7 +32,7 @@ public: /** * Constructor */ - CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * parent ); + CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * tqparent ); /** * Empty Destructor @@ -40,7 +41,7 @@ public: protected: - // this will be called by syncToParent whenever the parent object is "modified" + // this will be called by syncToParent whenever the tqparent object is "modified" void updateContent ( ); private: diff --git a/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp b/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp index 3caefe82..53ee06f7 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp +++ b/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp @@ -106,7 +106,7 @@ void CPPSourceCodeDocument::resetTextBlocks() } // This method will cause the class to rebuild its text representation. -// based on the parent classifier object. +// based on the tqparent classifier object. // For any situation in which this is called, we are either building the code // document up, or replacing/regenerating the existing auto-generated parts. As // such, we will want to insert everything we reasonably will want @@ -115,7 +115,7 @@ void CPPSourceCodeDocument::resetTextBlocks() void CPPSourceCodeDocument::updateContent( ) { - // Gather info on the various fields and parent objects of this class... + // Gather info on the various fields and tqparent objects of this class... //UMLClassifier * c = getParentClassifier(); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); @@ -144,7 +144,7 @@ void CPPSourceCodeDocument::updateContent( ) // Include own header file TQString myOwnName( getParentClassifier()->getName() ); includeStatement.append("#include \""+CodeGenerator::cleanName(myOwnName.lower())+".h\""+endLine); - CodeBlockWithComments * iblock = addOrUpdateTaggedCodeBlockWithComments("includes", includeStatement, TQString::null, 0, false); + CodeBlockWithComments * iblock = addOrUpdateTaggedCodeBlockWithComments("includes", includeStatement, TQString(), 0, false); iblock->setWriteOutText(true); // After the includes we have just 2 big blocks basically, the "constructor" block and the diff --git a/umbrello/umbrello/codegenerators/cppsourcecodedocument.h b/umbrello/umbrello/codegenerators/cppsourcecodedocument.h index 09ee93e6..c820d5a4 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodedocument.h +++ b/umbrello/umbrello/codegenerators/cppsourcecodedocument.h @@ -31,6 +31,7 @@ class CPPSourceCodeDocument : public ClassifierCodeDocument { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp index 61b1950e..5c3d0a74 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp +++ b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp @@ -25,8 +25,8 @@ // Constructors/Destructors // -CPPSourceCodeOperation::CPPSourceCodeOperation ( CPPSourceCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment ) - : CodeOperation (doc, parent, body, comment) +CPPSourceCodeOperation::CPPSourceCodeOperation ( CPPSourceCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment ) + : CodeOperation (doc, tqparent, body, comment) { // lets not go with the default comment and instead use // full-blown cpp documentation object instead @@ -41,7 +41,7 @@ CPPSourceCodeOperation::CPPSourceCodeOperation ( CPPSourceCodeDocument * doc, UM CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); UMLClassifier * c = doc->getParentClassifier(); UMLOperation * o = getParentOperation(); - bool isInterface = doc->parentIsInterface(); + bool isInterface = doc->tqparentIsInterface(); bool isInlineMethod = policy->getOperationsAreInline( ); // first, the comment on the operation @@ -131,7 +131,7 @@ void CPPSourceCodeOperation::updateMethodDeclaration() CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); UMLClassifier * c = doc->getParentClassifier(); UMLOperation * o = getParentOperation(); - bool isInterface = doc->parentIsInterface(); + bool isInterface = doc->tqparentIsInterface(); bool isInlineMethod = policy->getOperationsAreInline( ); // first, the comment on the operation diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h index 95073eea..86e5ff35 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h +++ b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h @@ -26,6 +26,7 @@ class CPPSourceCodeDocument; class CPPSourceCodeOperation : virtual public CodeOperation { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/cppwriter.cpp b/umbrello/umbrello/codegenerators/cppwriter.cpp index ab2b8fcb..3f22a300 100644 --- a/umbrello/umbrello/codegenerators/cppwriter.cpp +++ b/umbrello/umbrello/codegenerators/cppwriter.cpp @@ -52,12 +52,12 @@ CppWriter::CppWriter() VECTOR_METHOD_REMOVE = "int i, size = %VARNAME%.size();\nfor ( i = 0; i < size; i++) {\n\t%ITEMCLASS% item = %VARNAME%.at(i);\n\tif(item == remove_object) {\n\t\tvector<%ITEMCLASS%>::iterator it = %VARNAME%.begin() + i;\n\t\t%VARNAME%.erase(it);\n\t\treturn;\n\t}\n }"; // for std::vector VECTOR_METHOD_INIT = TQString(); // nothing to be done /* - VECTOR_METHOD_APPEND = "%VARNAME%.append(&add_object);"; // Qt lib implementation - VECTOR_METHOD_REMOVE = "%VARNAME%.removeRef(&remove_object);"; // Qt lib implementation - VECTOR_METHOD_INIT = "%VARNAME%.setAutoDelete(false);"; // Qt library + VECTOR_METHOD_APPEND = "%VARNAME%.append(&add_object);"; // TQt lib implementation + VECTOR_METHOD_REMOVE = "%VARNAME%.removeRef(&remove_object);"; // TQt lib implementation + VECTOR_METHOD_INIT = "%VARNAME%.setAutoDelete(false);"; // TQt library */ - OBJECT_METHOD_INIT = "%VARNAME% = new %ITEMCLASS%( );"; // Qt library + OBJECT_METHOD_INIT = "%VARNAME% = new %ITEMCLASS%( );"; // TQt library // boolean config params INLINE_ASSOCIATION_METHODS = false; @@ -113,7 +113,7 @@ void CppWriter::writeClass(UMLClassifier *c) need_impl = false; } if (need_impl) { - fileName.replace( TQRegExp(".h$"), ".cpp"); + fileName.tqreplace( TQRegExp(".h$"), ".cpp"); if( !openFile(filecpp, fileName)) { emit codeGenerated(c, false); return; @@ -141,13 +141,13 @@ void CppWriter::writeHeaderFile (UMLClassifier *c, TQFile &fileh) { // write header blurb TQString str = getHeadingFile(".h"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),m_classifierInfo->fileName + ".h"); - str.replace(TQRegExp("%filepath%"),fileh.name()); + str.tqreplace(TQRegExp("%filename%"),m_classifierInfo->fileName + ".h"); + str.tqreplace(TQRegExp("%filepath%"),fileh.name()); h << str<< m_endl; } // Write the hash define stuff to prevent multiple parsing/inclusion of header - TQString hashDefine = m_classifierInfo->className.upper().simplifyWhiteSpace().replace(TQRegExp(" "), "_"); + TQString hashDefine = m_classifierInfo->className.upper().simplifyWhiteSpace().tqreplace(TQRegExp(" "), "_"); writeBlankLine(h); h << "#ifndef "<< hashDefine + "_H" << m_endl; h << "#define "<< hashDefine + "_H" << m_endl; @@ -206,8 +206,8 @@ void CppWriter::writeSourceFile (UMLClassifier *c, TQFile &filecpp ) { TQString str; str = getHeadingFile(".cpp"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),m_classifierInfo->fileName + ".cpp"); - str.replace(TQRegExp("%filepath%"),filecpp.name()); + str.tqreplace(TQRegExp("%filename%"),m_classifierInfo->fileName + ".cpp"); + str.tqreplace(TQRegExp("%filepath%"),filecpp.name()); cpp << str << m_endl; } @@ -627,7 +627,7 @@ void CppWriter::writeAttributeMethods(UMLAttributeList *attribs, // from what I can tell, this IS the default behavior for // cleanName. I dunno why its not working -b.t. methodBaseName = methodBaseName.stripWhiteSpace(); - methodBaseName.replace(0,1,methodBaseName.at(0).upper()); + methodBaseName.tqreplace(0,1,methodBaseName.tqat(0).upper()); writeSingleAttributeAccessorMethods(at->getTypeName(), varName, methodBaseName, at->getDoc(), Uml::chg_Changeable, isHeaderMethod, @@ -641,7 +641,7 @@ void CppWriter::writeComment(const TQString &comment, const TQString &myIndent, // in the case we have several line comment.. // NOTE: this part of the method has the problem of adopting UNIX newline, // need to resolve for using with MAC/WinDoze eventually I assume - if (comment.contains(TQRegExp("\n"))) { + if (comment.tqcontains(TQRegExp("\n"))) { TQStringList lines = TQStringList::split( "\n", comment); for(uint i= 0; i < lines.count(); i++) @@ -736,14 +736,14 @@ void CppWriter::writeAssociationRoleDecl(TQString fieldClassName, TQString roleN // declare the association based on whether it is this a single variable // or a List (Vector). One day this will be done correctly with special // multiplicity object that we don't have to figure out what it means via regex. - if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) + if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) { TQString fieldVarName = "m_" + roleName.lower(); // record this for later consideration of initialization IF the // multi value requires 1 of these objects - if(ObjectFieldVariables.findIndex(fieldVarName) == -1 && - multi.contains(TQRegExp("^1$")) + if(ObjectFieldVariables.tqfindIndex(fieldVarName) == -1 && + multi.tqcontains(TQRegExp("^1$")) ) { // ugh. UGLY. Storing variable name and its class in pairs. @@ -759,7 +759,7 @@ void CppWriter::writeAssociationRoleDecl(TQString fieldClassName, TQString roleN // record unique occurrences for later when we want to check // for initialization of this vector - if(VectorFieldVariables.findIndex(fieldVarName) == -1) + if(VectorFieldVariables.tqfindIndex(fieldVarName) == -1) VectorFieldVariables.append(fieldVarName); stream << indent << policyExt()->getVectorClassName() <<"<" << fieldClassName << "*"; @@ -823,7 +823,7 @@ void CppWriter::writeAssociationRoleMethod (const TQString &fieldClassName, const TQString &description, Uml::Changeability_Type change, TQTextStream &stream) { - if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) + if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) { TQString fieldVarName = "m_" + roleName.lower(); writeSingleAttributeAccessorMethods(fieldClassName, fieldVarName, roleName, @@ -860,9 +860,9 @@ void CppWriter::writeVectorAttributeAccessorMethods ( stream << "add" << fldName << " ( " << className << " add_object )"; if (writeMethodBody) { TQString method = VECTOR_METHOD_APPEND; - method.replace(TQRegExp("%VARNAME%"),fieldVarName); - method.replace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName()); - method.replace(TQRegExp("%ITEMCLASS%"),className); + method.tqreplace(TQRegExp("%VARNAME%"),fieldVarName); + method.tqreplace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName()); + method.tqreplace(TQRegExp("%ITEMCLASS%"),className); stream << indent << " {" << m_endl; m_indentLevel++; printTextAsSeparateLinesWithIndent(method,getIndent(),stream); @@ -883,9 +883,9 @@ void CppWriter::writeVectorAttributeAccessorMethods ( stream << "remove" << fldName << " ( " << className << " remove_object )"; if (writeMethodBody) { TQString method = VECTOR_METHOD_REMOVE; - method.replace(TQRegExp("%VARNAME%"),fieldVarName); - method.replace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName()); - method.replace(TQRegExp("%ITEMCLASS%"),className); + method.tqreplace(TQRegExp("%VARNAME%"),fieldVarName); + method.tqreplace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName()); + method.tqreplace(TQRegExp("%ITEMCLASS%"),className); stream << indent << " {" << m_endl; m_indentLevel++; printTextAsSeparateLinesWithIndent(method,getIndent(),stream); @@ -1034,8 +1034,8 @@ void CppWriter::writeInitAttibuteMethod (TQTextStream &stream) for( it = VectorFieldVariables.begin(); it != VectorFieldVariables.end(); ++it ) { TQString fieldVarName = *it; TQString method = VECTOR_METHOD_INIT; - method.replace(TQRegExp("%VARNAME%"),fieldVarName); - method.replace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName()); + method.tqreplace(TQRegExp("%VARNAME%"),fieldVarName); + method.tqreplace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName()); stream << getIndent() << method << m_endl; } } @@ -1047,8 +1047,8 @@ void CppWriter::writeInitAttibuteMethod (TQTextStream &stream) it++; TQString fieldClassName = *it; TQString method = OBJECT_METHOD_INIT; - method.replace(TQRegExp("%VARNAME%"),fieldVarName); - method.replace(TQRegExp("%ITEMCLASS%"),fieldClassName); + method.tqreplace(TQRegExp("%VARNAME%"),fieldVarName); + method.tqreplace(TQRegExp("%ITEMCLASS%"),fieldClassName); stream << getIndent() << method << m_endl; } } diff --git a/umbrello/umbrello/codegenerators/csharpwriter.cpp b/umbrello/umbrello/codegenerators/csharpwriter.cpp index 42b055e5..a6c64db4 100644 --- a/umbrello/umbrello/codegenerators/csharpwriter.cpp +++ b/umbrello/umbrello/codegenerators/csharpwriter.cpp @@ -169,8 +169,8 @@ void CSharpWriter::writeClass(UMLClassifier *c) { TQString str; str = getHeadingFile(".cs"); if (!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),fileName); - str.replace(TQRegExp("%filepath%"),filecs.name()); + str.tqreplace(TQRegExp("%filename%"),fileName); + str.tqreplace(TQRegExp("%filepath%"),filecs.name()); cs<<str<<m_endl; } @@ -199,7 +199,7 @@ void CSharpWriter::writeClass(UMLClassifier *c) { UMLClassifier *cl = dynamic_cast<UMLClassifier*>(p); if (cl) p = cl->getUMLPackage(); - if (p != logicalView && m_seenIncludes.findRef(p) == -1 && p != container) { + if (p != logicalView && m_seenIncludes.tqfindRef(p) == -1 && p != container) { cs << "using " << p->getFullyQualifiedName(".") << ";" << m_endl; m_seenIncludes.append(p); } @@ -405,7 +405,7 @@ void CSharpWriter::writeOverridesRecursive(UMLClassifierList *superclasses, TQTe opabstract.clear(); } - // Recurse to parent superclasses + // Recurse to tqparent superclasses UMLClassifierList superRecursive = obj->getSuperClasses(); UMLClassifierList *superRecursivePtr =& superRecursive; if (superRecursivePtr->count() > 0) { @@ -433,10 +433,10 @@ void CSharpWriter::writeRealizationsRecursive(UMLClassifier *currentClass, UMLAs writeOperations(opreal,cs,false,false,true); cs << m_container_indent << m_indentation << "#endregion" << m_endl << m_endl; - // Recurse to parent realizations - UMLAssociationList parentReal = real->getRealizations(); - if (!parentReal.isEmpty()) { - writeRealizationsRecursive(real, &parentReal, cs); + // Recurse to tqparent realizations + UMLAssociationList tqparentReal = real->getRealizations(); + if (!tqparentReal.isEmpty()) { + writeRealizationsRecursive(real, &tqparentReal, cs); } } } @@ -470,7 +470,7 @@ void CSharpWriter::writeOperations(UMLOperationList opList, if (forceDoc() || !at->getDoc().isEmpty()) { cs << m_container_indent << m_indentation << "/// <param name=\"" << cleanName(at->getName()) << "\">"; //removing newlines from parameter doc - cs << formatDoc(at->getDoc(), "").replace("\n", " ").remove('\r').replace(TQRegExp(" $"), ""); + cs << formatDoc(at->getDoc(), "").tqreplace("\n", " ").remove('\r').tqreplace(TQRegExp(" $"), ""); cs << "</param>" << m_endl; } } @@ -493,7 +493,7 @@ void CSharpWriter::writeOperations(UMLOperationList opList, if (op->getStatic()) cs << "static "; } else { - // method overriding an abstract parent + // method overriding an abstract tqparent cs << op->getVisibility().toString() << " override "; if (op->getStatic()) cs << "static "; } @@ -629,7 +629,7 @@ void CSharpWriter::writeAssociatedAttributes(UMLAssociationList &associated, UML TQString roleName = cleanName(a->getRoleName(Uml::B)); TQString typeName = cleanName(o->getName()); if (roleName.isEmpty()) { - roleName = TQString("UnnamedRoleB_%1").arg(m_unnamedRoles++); + roleName = TQString("UnnamedRoleB_%1").tqarg(m_unnamedRoles++); } TQString roleDoc = a->getRoleDoc(Uml::B); @@ -693,7 +693,7 @@ void CSharpWriter::writeAttribute(TQString doc, Uml::Visibility visibility, bool TQString CSharpWriter::makeLocalTypeName(UMLClassifierListItem *cl) { UMLPackage *p = cl->getType()->getUMLPackage(); - if (m_seenIncludes.findRef(p) != -1) { + if (m_seenIncludes.tqfindRef(p) != -1) { return cl->getType()->getName(); } else { diff --git a/umbrello/umbrello/codegenerators/csharpwriter.h b/umbrello/umbrello/codegenerators/csharpwriter.h index ef09bac5..6cf4d3f6 100644 --- a/umbrello/umbrello/codegenerators/csharpwriter.h +++ b/umbrello/umbrello/codegenerators/csharpwriter.h @@ -31,6 +31,7 @@ class CSharpWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: CSharpWriter(); @@ -79,7 +80,7 @@ private: int m_unnamedRoles; /** - * write realizations of a class and recurse to parent classes + * write realizations of a class and recurse to tqparent classes * @param currentClass class to start with * @param realizations realizations of this class diff --git a/umbrello/umbrello/codegenerators/dwriter.cpp b/umbrello/umbrello/codegenerators/dwriter.cpp index 088ab9c1..60bc2abb 100644 --- a/umbrello/umbrello/codegenerators/dwriter.cpp +++ b/umbrello/umbrello/codegenerators/dwriter.cpp @@ -114,8 +114,8 @@ void DWriter::writeClass(UMLClassifier *c) { TQString str; str = getHeadingFile(".d"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),fileName); - str.replace(TQRegExp("%filepath%"),file.name()); + str.tqreplace(TQRegExp("%filename%"),fileName); + str.tqreplace(TQRegExp("%filepath%"),file.name()); d<<str<<m_endl; } @@ -442,8 +442,8 @@ void DWriter::writeComment(const TQString &comment, const TQString &myIndent, TQString tmp = lines[i]; while (tmp.length() > 77) { - uint l = tmp.left(77).findRev(' '); - if (l < 1) l = tmp.find(' ', 77); + uint l = tmp.left(77).tqfindRev(' '); + if (l < 1) l = tmp.tqfind(' ', 77); if (l < 1 || l > tmp.length()) { d << myIndent << (dDocStyle ? " * " : "// ") << tmp << m_endl; break; @@ -527,7 +527,7 @@ void DWriter::writeAssociationRoleDecl(TQString fieldClassName, // declare the association based on whether it is this a single variable // or a List (Vector). One day this will be done correctly with special // multiplicity object that we don't have to figure out what it means via regex. - if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) { + if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) { d << m_indentation << fieldClassName << " "; if (hasAccessors) d << "m_"; @@ -584,7 +584,7 @@ void DWriter::writeAssociationMethods (UMLAssociationList associations, UMLClass void DWriter::writeAssociationRoleMethod (TQString fieldClassName, TQString roleName, TQString multi, TQString description, Uml::Visibility visib, Uml::Changeability_Type change, TQTextStream &d) { - if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) { + if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) { TQString fieldVarName = "m_" + deCapitaliseFirstLetter(roleName); writeSingleAttributeAccessorMethods( @@ -942,7 +942,7 @@ TQString DWriter::getUMLObjectName(UMLObject *obj) { } TQString DWriter::deCapitaliseFirstLetter(TQString string) { - string.replace( 0, 1, string[0].lower()); + string.tqreplace( 0, 1, string[0].lower()); return string; } diff --git a/umbrello/umbrello/codegenerators/idlwriter.cpp b/umbrello/umbrello/codegenerators/idlwriter.cpp index dc367f50..8e5688ac 100644 --- a/umbrello/umbrello/codegenerators/idlwriter.cpp +++ b/umbrello/umbrello/codegenerators/idlwriter.cpp @@ -70,7 +70,7 @@ void IDLWriter::computeAssocTypeAndRole at == Uml::at_UniAssociation) { // Assuming unidirectional association, and we are // at the "wrong" side. - // Returning roleName = TQString::null tells caller to + // Returning roleName = TQString() tells caller to // skip this association at this side. roleName = TQString(); return; @@ -129,8 +129,8 @@ void IDLWriter::writeClass(UMLClassifier *c) { TQString str; str = getHeadingFile(".idl"); if (!str.isEmpty()) { - str.replace(TQRegExp("%filename%"), fileName); - str.replace(TQRegExp("%filepath%"), file.name()); + str.tqreplace(TQRegExp("%filename%"), fileName); + str.tqreplace(TQRegExp("%filepath%"), file.name()); idl << str << m_endl; } @@ -275,13 +275,13 @@ void IDLWriter::writeClass(UMLClassifier *c) { UMLClassifierList superclasses = c->getSuperClasses(); if (! superclasses.isEmpty()) { idl << " : "; - UMLClassifier *parent = superclasses.first(); + UMLClassifier *tqparent = superclasses.first(); int n_parents = superclasses.count(); while (n_parents--) { - idl << parent->getFullyQualifiedName("::"); + idl << tqparent->getFullyQualifiedName("::"); if (n_parents) idl << ", "; - parent = superclasses.next(); + tqparent = superclasses.next(); } } idl << " {" << m_endl << m_endl; diff --git a/umbrello/umbrello/codegenerators/javaantcodedocument.cpp b/umbrello/umbrello/codegenerators/javaantcodedocument.cpp index cc9e394b..1fd6fd69 100644 --- a/umbrello/umbrello/codegenerators/javaantcodedocument.cpp +++ b/umbrello/umbrello/codegenerators/javaantcodedocument.cpp @@ -146,7 +146,7 @@ void JavaANTCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & root) } else if( name == "codeoperation" ) { // find the code operation by id - TQString id = element.attribute("parent_id","-1"); + TQString id = element.attribute("tqparent_id","-1"); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id)); UMLOperation * op = dynamic_cast<UMLOperation*>(obj); if(op) { @@ -297,10 +297,10 @@ TQString JavaANTCodeDocument::getPath ( ) path.simplifyWhiteSpace(); // Replace all blanks with underscore - path.replace(TQRegExp(" "), "_"); + path.tqreplace(TQRegExp(" "), "_"); - path.replace(TQRegExp("\\."),"/"); - path.replace(TQRegExp("::"), "/"); + path.tqreplace(TQRegExp("\\."),"/"); + path.tqreplace(TQRegExp("::"), "/"); path.lower(); diff --git a/umbrello/umbrello/codegenerators/javaantcodedocument.h b/umbrello/umbrello/codegenerators/javaantcodedocument.h index 97d19c50..27c8e7c5 100644 --- a/umbrello/umbrello/codegenerators/javaantcodedocument.h +++ b/umbrello/umbrello/codegenerators/javaantcodedocument.h @@ -32,6 +32,7 @@ class JavaANTCodeDocument : public CodeDocument { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp index e1966001..babc04a9 100644 --- a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp @@ -23,10 +23,10 @@ // JavaClassDeclarationBlock::JavaClassDeclarationBlock - ( JavaClassifierCodeDocument * parentDoc, const TQString &startText, const TQString &endText, const TQString &comment) - : OwnedHierarchicalCodeBlock(parentDoc->getParentClassifier(), parentDoc, startText, endText, comment) + ( JavaClassifierCodeDocument * tqparentDoc, const TQString &startText, const TQString &endText, const TQString &comment) + : OwnedHierarchicalCodeBlock(tqparentDoc->getParentClassifier(), tqparentDoc, startText, endText, comment) { - init(parentDoc, comment); + init(tqparentDoc, comment); } JavaClassDeclarationBlock::~JavaClassDeclarationBlock ( ) { } @@ -66,12 +66,12 @@ void JavaClassDeclarationBlock::loadFromXMI ( TQDomElement & root ) void JavaClassDeclarationBlock::updateContent ( ) { - JavaClassifierCodeDocument *parentDoc = dynamic_cast<JavaClassifierCodeDocument*>(getParentDocument()); - UMLClassifier *c = parentDoc->getParentClassifier(); + JavaClassifierCodeDocument *tqparentDoc = dynamic_cast<JavaClassifierCodeDocument*>(getParentDocument()); + UMLClassifier *c = tqparentDoc->getParentClassifier(); CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy(); TQString endLine = commonPolicy->getNewLineEndingChars(); - bool isInterface = parentDoc->parentIsInterface(); // a little shortcut - TQString JavaClassName = parentDoc->getJavaClassName(c->getName()); + bool isInterface = tqparentDoc->tqparentIsInterface(); // a little shortcut + TQString JavaClassName = tqparentDoc->getJavaClassName(c->getName()); // COMMENT if(isInterface) @@ -101,7 +101,7 @@ void JavaClassDeclarationBlock::updateContent ( ) } else startText.append("public "); - if(parentDoc->parentIsInterface()) + if(tqparentDoc->tqparentIsInterface()) startText.append("interface "); else startText.append("class "); @@ -122,7 +122,7 @@ void JavaClassDeclarationBlock::updateContent ( ) startText.append(" extends "); for (UMLClassifier * concept= superclasses.first(); concept; concept = superclasses.next()) { - startText.append(parentDoc->cleanName(concept->getName())); + startText.append(tqparentDoc->cleanName(concept->getName())); if(i != (nrof_superclasses-1)) startText.append(", "); i++; @@ -140,7 +140,7 @@ void JavaClassDeclarationBlock::updateContent ( ) } for (UMLClassifier * concept= superinterfaces.first(); concept; concept = superinterfaces.next()) { - startText.append(parentDoc->cleanName(concept->getName())); + startText.append(tqparentDoc->cleanName(concept->getName())); if(i != (nrof_superinterfaces-1)) startText.append(", "); i++; @@ -153,10 +153,10 @@ void JavaClassDeclarationBlock::updateContent ( ) } -void JavaClassDeclarationBlock::init (JavaClassifierCodeDocument *parentDoc, const TQString &comment) +void JavaClassDeclarationBlock::init (JavaClassifierCodeDocument *tqparentDoc, const TQString &comment) { - setComment(new JavaCodeDocumentation(parentDoc)); + setComment(new JavaCodeDocumentation(tqparentDoc)); getComment()->setText(comment); setEndText("}"); diff --git a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h index 08e639c7..caa07074 100644 --- a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h +++ b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h @@ -25,6 +25,7 @@ class JavaClassDeclarationBlock : public OwnedHierarchicalCodeBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -33,7 +34,7 @@ public: /** * Empty Constructor */ - explicit JavaClassDeclarationBlock ( JavaClassifierCodeDocument * parentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = ""); + explicit JavaClassDeclarationBlock ( JavaClassifierCodeDocument * tqparentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = ""); /** * Empty Destructor @@ -59,7 +60,7 @@ protected: private: - void init (JavaClassifierCodeDocument * parent, const TQString &comment); + void init (JavaClassifierCodeDocument * tqparent, const TQString &comment); }; diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp index 426c6d9a..bcf46bb6 100644 --- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp +++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp @@ -89,10 +89,10 @@ TQString JavaClassifierCodeDocument::getPath ( ) path.simplifyWhiteSpace(); // Replace all blanks with underscore - path.replace(TQRegExp(" "), "_"); + path.tqreplace(TQRegExp(" "), "_"); - path.replace(TQRegExp("\\."),"/"); - path.replace(TQRegExp("::"), "/"); + path.tqreplace(TQRegExp("\\."),"/"); + path.tqreplace(TQRegExp("::"), "/"); path.lower(); @@ -222,7 +222,7 @@ void JavaClassifierCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & ro } else if( name == "codeoperation" ) { // find the code operation by id - TQString id = element.attribute("parent_id","-1"); + TQString id = element.attribute("tqparent_id","-1"); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id)); UMLOperation * op = dynamic_cast<UMLOperation*>(obj); if(op) { @@ -326,7 +326,7 @@ void JavaClassifierCodeDocument::resetTextBlocks() } // This method will cause the class to rebuild its text representation. -// based on the parent classifier object. +// based on the tqparent classifier object. // For any situation in which this is called, we are either building the code // document up, or replacing/regenerating the existing auto-generated parts. As // such, we will want to insert everything we resonablely will want @@ -334,7 +334,7 @@ void JavaClassifierCodeDocument::resetTextBlocks() // comments) to appear or not, as needed. void JavaClassifierCodeDocument::updateContent( ) { - // Gather info on the various fields and parent objects of this class... + // Gather info on the various fields and tqparent objects of this class... UMLClassifier * c = getParentClassifier(); CodeGenerationPolicy * commonPolicy = UMLApp::app()->getCommonPolicy(); CodeGenPolicyExt * pe = UMLApp::app()->getPolicyExt(); @@ -344,7 +344,7 @@ void JavaClassifierCodeDocument::updateContent( ) // This depends on whether or not we have attribute/association classes CodeClassFieldList * cfList = getCodeClassFieldList(); for(CodeClassField * field = cfList->first(); field; field = cfList->next()) - if(field->parentIsAttribute()) + if(field->tqparentIsAttribute()) field->setWriteOutMethods(policy->getAutoGenerateAttribAccessors()); else field->setWriteOutMethods(policy->getAutoGenerateAssocAccessors()); @@ -359,7 +359,7 @@ void JavaClassifierCodeDocument::updateContent( ) CodeClassFieldList aggregationClassFields = getSpecificClassFields ( CodeClassField::Aggregation ); CodeClassFieldList compositionClassFields = getSpecificClassFields ( CodeClassField::Composition ); - bool isInterface = parentIsInterface(); + bool isInterface = tqparentIsInterface(); bool hasOperationMethods = c->getOpList().last() ? true : false; TQString endLine = commonPolicy->getNewLineEndingChars(); // a shortcut..so we don't have to call this all the time @@ -371,7 +371,7 @@ void JavaClassifierCodeDocument::updateContent( ) // PACKAGE CODE BLOCK // TQString pkgs = getPackage(); - pkgs.replace(TQRegExp("::"), "."); + pkgs.tqreplace(TQRegExp("::"), "."); TQString packageText = getPackage().isEmpty() ? "" : "package "+pkgs+';'+endLine; CodeBlockWithComments * pblock = addOrUpdateTaggedCodeBlockWithComments("packages", packageText, "", 0, false); if(packageText.isEmpty() && pblock->getContentType() == CodeBlock::AutoGenerated) @@ -397,7 +397,7 @@ void JavaClassifierCodeDocument::updateContent( ) // NO (default) datatypes in the import statement.. use defined // ones whould be possible, but no idea how to do that...at least for now. // Dynamic casting is slow..not an optimal way to do this. - if (!packageMap.contains(con) && con->getBaseType() != Uml::ot_Datatype) + if (!packageMap.tqcontains(con) && con->getBaseType() != Uml::ot_Datatype) { packageMap.insert(con, con->getPackage()); @@ -428,7 +428,7 @@ void JavaClassifierCodeDocument::updateContent( ) // NOW create document in sections.. // now we want to populate the body of our class - // our layout is the following general groupings of code blocks: + // our tqlayout is the following general groupings of code blocks: // start java classifier document @@ -532,7 +532,7 @@ void JavaClassifierCodeDocument::updateContent( ) constBlock->addOrUpdateTaggedCodeBlockWithComments("emptyconstructor", emptyConstStatement, "Empty Constructor", 1, false); // Now, as an additional condition we only show the empty constructor block // IF it was desired to be shown - if(parentIsClass() && pol->getAutoGenerateConstructors()) + if(tqparentIsClass() && pol->getAutoGenerateConstructors()) emptyConstBlock->setWriteOutText(true); else emptyConstBlock->setWriteOutText(false); diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h index 831e0555..5813609f 100644 --- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h +++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h @@ -40,6 +40,7 @@ class JavaCodeGenerationPolicy; class JavaClassifierCodeDocument : public ClassifierCodeDocument { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp index 6c883952..dde0ca31 100644 --- a/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp +++ b/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp @@ -74,8 +74,8 @@ void JavaCodeAccessorMethod::setAttributesFromNode( TQDomElement & root) void JavaCodeAccessorMethod::updateContent( ) { - CodeClassField * parentField = getParentClassField(); - JavaCodeClassField * javafield = dynamic_cast<JavaCodeClassField*>(parentField); + CodeClassField * tqparentField = getParentClassField(); + JavaCodeClassField * javafield = dynamic_cast<JavaCodeClassField*>(tqparentField); TQString fieldName = javafield->getFieldName(); TQString text = ""; @@ -150,7 +150,7 @@ void JavaCodeAccessorMethod::updateMethodDeclaration() // set scope of this accessor appropriately..if its an attribute, // we need to be more sophisticated - if(javafield->parentIsAttribute()) + if(javafield->tqparentIsAttribute()) switch (scopePolicy) { case CodeGenerationPolicy::Public: case CodeGenerationPolicy::Private: @@ -159,7 +159,7 @@ void JavaCodeAccessorMethod::updateMethodDeclaration() break; default: case CodeGenerationPolicy::FromParent: - // do nothing..already have taken parent value + // do nothing..already have taken tqparent value break; } diff --git a/umbrello/umbrello/codegenerators/javacodeaccessormethod.h b/umbrello/umbrello/codegenerators/javacodeaccessormethod.h index e26ef033..902b37c4 100644 --- a/umbrello/umbrello/codegenerators/javacodeaccessormethod.h +++ b/umbrello/umbrello/codegenerators/javacodeaccessormethod.h @@ -25,6 +25,7 @@ class CodeClassField; class JavaCodeAccessorMethod : public CodeAccessorMethod { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp index 0777cf1d..c168ac35 100644 --- a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp +++ b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp @@ -36,14 +36,14 @@ // Constructors/Destructors // -JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role) - : CodeClassField(parentDoc, role) +JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role) + : CodeClassField(tqparentDoc, role) { } -JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib) - : CodeClassField(parentDoc, attrib) +JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib) + : CodeClassField(tqparentDoc, attrib) { } @@ -58,7 +58,7 @@ JavaCodeClassField::~JavaCodeClassField ( ) { } // TQString JavaCodeClassField::getFieldName() { - if (parentIsAttribute()) + if (tqparentIsAttribute()) { UMLAttribute * at = (UMLAttribute*) getParentObject(); return cleanName(at->getName()); @@ -68,7 +68,7 @@ TQString JavaCodeClassField::getFieldName() { UMLRole * role = (UMLRole*) getParentObject(); TQString roleName = role->getName(); if(fieldIsSingleValue()) { - return roleName.replace(0, 1, roleName.left(1).lower()); + return roleName.tqreplace(0, 1, roleName.left(1).lower()); } else { return roleName.lower() + "Vector"; } @@ -78,13 +78,13 @@ TQString JavaCodeClassField::getFieldName() { TQString JavaCodeClassField::getInitialValue() { - if (parentIsAttribute()) + if (tqparentIsAttribute()) { UMLAttribute * at = dynamic_cast<UMLAttribute*>( getParentObject() ); if (at) { return fixInitialStringDeclValue(at->getInitialValue(), getTypeName()); } else { - kError() << "JavaodeClassField::getInitialValue: parent object is not a UMLAttribute" + kError() << "JavaodeClassField::getInitialValue: tqparent object is not a UMLAttribute" << endl; return ""; } diff --git a/umbrello/umbrello/codegenerators/javacodeclassfield.h b/umbrello/umbrello/codegenerators/javacodeclassfield.h index b381796c..0cad977b 100644 --- a/umbrello/umbrello/codegenerators/javacodeclassfield.h +++ b/umbrello/umbrello/codegenerators/javacodeclassfield.h @@ -27,6 +27,7 @@ class ClassifierCodeDocument; class JavaCodeClassField : public CodeClassField { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -35,8 +36,8 @@ public: /** * Constructors */ - JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role); - JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib); + JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role); + JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib); /** * Empty Destructor diff --git a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp index 5507c314..6f6eb5ec 100644 --- a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp @@ -27,8 +27,8 @@ // Constructors/Destructors // -JavaCodeClassFieldDeclarationBlock::JavaCodeClassFieldDeclarationBlock ( CodeClassField * parent ) - : CodeClassFieldDeclarationBlock ( parent ) +JavaCodeClassFieldDeclarationBlock::JavaCodeClassFieldDeclarationBlock ( CodeClassField * tqparent ) + : CodeClassFieldDeclarationBlock ( tqparent ) { setOverallIndentationLevel(1); updateContent(); @@ -67,7 +67,7 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( ) TQString scopeStr = jdoc->scopeToJavaDecl(getParentObject()->getVisibility()); // IF this is from an association, then scope taken as appropriate to policy - if(!jcf->parentIsAttribute()) + if(!jcf->tqparentIsAttribute()) { switch (scopePolicy) { case CodeGenerationPolicy::Public: @@ -77,7 +77,7 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( ) break; default: case CodeGenerationPolicy::FromParent: - // do nothing here... will leave as from parent object + // do nothing here... will leave as from tqparent object break; } } @@ -86,13 +86,13 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( ) TQString fieldName = jcf->getFieldName(); TQString initialV = jcf->getInitialValue(); - if (!cf->parentIsAttribute() && !cf->fieldIsSingleValue()) + if (!cf->tqparentIsAttribute() && !cf->fieldIsSingleValue()) typeName = "List"; TQString body = staticValue+scopeStr+' '+typeName+' '+fieldName; if (!initialV.isEmpty()) body.append(" = " + initialV); - else if (!cf->parentIsAttribute()) + else if (!cf->tqparentIsAttribute()) { UMLRole * role = dynamic_cast<UMLRole*>(cf->getParentObject()); if (role->getObject()->getBaseType() == Uml::ot_Interface) @@ -101,7 +101,7 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( ) } else { // FIX?: IF a constructor method exists in the classifiercodedoc - // of the parent Object, then we can use that instead (if its empty). + // of the tqparent Object, then we can use that instead (if its empty). if(cf->fieldIsSingleValue()) { if(!typeName.isEmpty()) diff --git a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h index 1ed37a43..d7f3c2f5 100644 --- a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h +++ b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h @@ -23,6 +23,7 @@ class JavaCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -31,7 +32,7 @@ public: /** * Constructor */ - JavaCodeClassFieldDeclarationBlock ( CodeClassField * parent ); + JavaCodeClassFieldDeclarationBlock ( CodeClassField * tqparent ); /** * Empty Destructor @@ -40,7 +41,7 @@ public: protected: - // this will be called by syncToParent whenever the parent object is "modified" + // this will be called by syncToParent whenever the tqparent object is "modified" void updateContent ( ); private: diff --git a/umbrello/umbrello/codegenerators/javacodecomment.cpp b/umbrello/umbrello/codegenerators/javacodecomment.cpp index 588a0acc..38794003 100644 --- a/umbrello/umbrello/codegenerators/javacodecomment.cpp +++ b/umbrello/umbrello/codegenerators/javacodecomment.cpp @@ -62,7 +62,7 @@ TQString JavaCodeComment::unformatText ( const TQString & text , const TQString } /** - * @return QString + * @return TQString */ TQString JavaCodeComment::toString ( ) { diff --git a/umbrello/umbrello/codegenerators/javacodecomment.h b/umbrello/umbrello/codegenerators/javacodecomment.h index 468b2a7c..2d756d70 100644 --- a/umbrello/umbrello/codegenerators/javacodecomment.h +++ b/umbrello/umbrello/codegenerators/javacodecomment.h @@ -31,6 +31,7 @@ class JavaCodeComment : virtual public CodeComment { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -54,7 +55,7 @@ public: // other /** - * @return QString + * @return TQString */ TQString toString ( ); diff --git a/umbrello/umbrello/codegenerators/javacodedocumentation.cpp b/umbrello/umbrello/codegenerators/javacodedocumentation.cpp index 662b88c9..a04a3cd1 100644 --- a/umbrello/umbrello/codegenerators/javacodedocumentation.cpp +++ b/umbrello/umbrello/codegenerators/javacodedocumentation.cpp @@ -54,12 +54,12 @@ JavaCodeDocumentation::~JavaCodeDocumentation ( ) { } void JavaCodeDocumentation::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) { TQDomElement blockElement = doc.createElement( "javacodedocumentation" ); setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may - // just use parent TextBlock method + // just use tqparent TextBlock method root.appendChild( blockElement ); } /** - * @return QString + * @return TQString */ TQString JavaCodeDocumentation::toString ( ) { diff --git a/umbrello/umbrello/codegenerators/javacodedocumentation.h b/umbrello/umbrello/codegenerators/javacodedocumentation.h index acc386c1..dff2da00 100644 --- a/umbrello/umbrello/codegenerators/javacodedocumentation.h +++ b/umbrello/umbrello/codegenerators/javacodedocumentation.h @@ -33,6 +33,7 @@ class JavaClassifierCodeDocument; class JavaCodeDocumentation : virtual public CodeComment { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -61,7 +62,7 @@ public: virtual void saveToXMI ( TQDomDocument & doc, TQDomElement & root ); /** - * @return QString + * @return TQString */ TQString toString ( ); diff --git a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui index cd39611a..e756333c 100644 --- a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui +++ b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>JavaCodeGenerationFormBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,15 +16,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="3" column="0"> + <widget class="TQGroupBox" row="3" column="0"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -43,7 +43,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_makeANTDocumentCheckBox</cstring> </property> @@ -53,7 +53,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -72,15 +72,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>m_generateConstructors</cstring> </property> @@ -91,7 +91,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>m_generateAssocAccessors</cstring> </property> @@ -102,7 +102,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>m_generateAttribAccessors</cstring> </property> @@ -115,15 +115,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Public</string> @@ -151,7 +151,7 @@ <number>3</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -161,15 +161,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_3_2</cstring> </property> @@ -177,7 +177,7 @@ <string>Default association field scope:</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Public</string> @@ -209,7 +209,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -228,7 +228,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -236,7 +236,7 @@ <string>Style:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Slash-Slash (//)</string> @@ -253,7 +253,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -273,5 +273,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp index 6225485f..aeee86e0 100644 --- a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp +++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp @@ -174,8 +174,8 @@ void JavaCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSig * Create a new dialog interface for this object. * @return dialog object */ -CodeGenerationPolicyPage * JavaCodeGenerationPolicy::createPage ( TQWidget *parent, const char *name ) { - return new JavaCodeGenerationPolicyPage ( parent, name, this ); +CodeGenerationPolicyPage * JavaCodeGenerationPolicy::createPage ( TQWidget *tqparent, const char *name ) { + return new JavaCodeGenerationPolicyPage ( tqparent, name, this ); } void JavaCodeGenerationPolicy::init() { diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h index e72c5161..cb9171f4 100644 --- a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h +++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h @@ -27,6 +27,7 @@ class CodeGenerationPolicyPage; class JavaCodeGenerationPolicy : public CodeGenPolicyExt { Q_OBJECT + TQ_OBJECT public: static const bool DEFAULT_AUTO_GEN_ATTRIB_ACCESSORS; @@ -96,7 +97,7 @@ public: * Create a new dialog interface for this object. * @return dialog object */ - CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0); + CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0); protected: diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp index c7bfbf0b..c802024a 100644 --- a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp +++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp @@ -26,8 +26,8 @@ #include "javacodegenerationformbase.h" #include "../uml.h" -JavaCodeGenerationPolicyPage::JavaCodeGenerationPolicyPage( TQWidget *parent, const char *name, JavaCodeGenerationPolicy * policy ) - : CodeGenerationPolicyPage(parent, name, policy) +JavaCodeGenerationPolicyPage::JavaCodeGenerationPolicyPage( TQWidget *tqparent, const char *name, JavaCodeGenerationPolicy * policy ) + : CodeGenerationPolicyPage(tqparent, name, policy) { CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy(); form = new JavaCodeGenerationFormBase(this); @@ -54,7 +54,7 @@ JavaCodeGenerationPolicyPage::~JavaCodeGenerationPolicyPage() void JavaCodeGenerationPolicyPage::apply() { CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy(); - JavaCodeGenerationPolicy * parent = (JavaCodeGenerationPolicy*) m_parentPolicy; + JavaCodeGenerationPolicy * tqparent = (JavaCodeGenerationPolicy*) m_parentPolicy; // block signals so we don't cause too many update content calls to code documents commonPolicy->blockSignals(true); @@ -63,8 +63,8 @@ void JavaCodeGenerationPolicyPage::apply() commonPolicy->setAttributeAccessorScope((CodeGenerationPolicy::ScopePolicy) (form->m_accessorScopeCB->currentItem()+200)); commonPolicy->setAssociationFieldScope((CodeGenerationPolicy::ScopePolicy) (form->m_assocFieldScopeCB->currentItem()+200)); commonPolicy->setAutoGenerateConstructors(form->m_generateConstructors->isChecked()); - parent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked()); - parent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked()); + tqparent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked()); + tqparent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked()); /** * @todo unclean - CreateANTBuildFile attribute should be in java policy diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h index 01b739b9..2ace585e 100644 --- a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h +++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h @@ -28,9 +28,10 @@ class JavaCodeGenerationPolicyPage : public CodeGenerationPolicyPage { Q_OBJECT + TQ_OBJECT public: - explicit JavaCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, JavaCodeGenerationPolicy * policy = 0); + explicit JavaCodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, JavaCodeGenerationPolicy * policy = 0); virtual ~JavaCodeGenerationPolicyPage(); diff --git a/umbrello/umbrello/codegenerators/javacodegenerator.cpp b/umbrello/umbrello/codegenerators/javacodegenerator.cpp index 0f78a0fb..12462784 100644 --- a/umbrello/umbrello/codegenerators/javacodegenerator.cpp +++ b/umbrello/umbrello/codegenerators/javacodegenerator.cpp @@ -79,10 +79,10 @@ bool JavaCodeGenerator::getCreateANTBuildFile ( ) { } // In the Java version, we make the ANT build file also available. -CodeViewerDialog * JavaCodeGenerator::getCodeViewerDialog ( TQWidget* parent, CodeDocument *doc, +CodeViewerDialog * JavaCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc, Settings::CodeViewerState state) { - CodeViewerDialog *dialog = new CodeViewerDialog(parent, doc, state); + CodeViewerDialog *dialog = new CodeViewerDialog(tqparent, doc, state); if(getCreateANTBuildFile()) dialog->addCodeDocument(findCodeDocumentByID("ANTDOC")); return dialog; @@ -115,7 +115,7 @@ TQString JavaCodeGenerator::getListFieldClassName () { // Same thing again for "bool" to "boolean" TQString JavaCodeGenerator::fixTypeName(const TQString &string) { - if (string.isEmpty() || string.contains(TQRegExp("^\\s+$"))) + if (string.isEmpty() || string.tqcontains(TQRegExp("^\\s+$"))) return "void"; if (string == "string") return "String"; @@ -143,7 +143,7 @@ CodeDocument * JavaCodeGenerator::newClassifierCodeDocument ( UMLClassifier * c) } void JavaCodeGenerator::init() { - // load Classifier documents from parent document + // load Classifier documents from tqparent document //initFromParentDocument(); // add in an ANT document diff --git a/umbrello/umbrello/codegenerators/javacodegenerator.h b/umbrello/umbrello/codegenerators/javacodegenerator.h index 3d94ad5f..c9fc49e7 100644 --- a/umbrello/umbrello/codegenerators/javacodegenerator.h +++ b/umbrello/umbrello/codegenerators/javacodegenerator.h @@ -36,6 +36,7 @@ class CodeViewerDialog; class JavaCodeGenerator : public CodeGenerator { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -91,7 +92,7 @@ public: /** Get the editing dialog for this code document */ - virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc, + virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc, Settings::CodeViewerState state); // Other methods diff --git a/umbrello/umbrello/codegenerators/javacodeoperation.cpp b/umbrello/umbrello/codegenerators/javacodeoperation.cpp index c7e7d162..a788b215 100644 --- a/umbrello/umbrello/codegenerators/javacodeoperation.cpp +++ b/umbrello/umbrello/codegenerators/javacodeoperation.cpp @@ -25,8 +25,8 @@ // JavaCodeOperation::JavaCodeOperation - ( JavaClassifierCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment ) - : CodeOperation (doc, parent, body, comment) + ( JavaClassifierCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment ) + : CodeOperation (doc, tqparent, body, comment) { // lets not go with the default comment and instead use // full-blown java documentation object instead @@ -81,7 +81,7 @@ void JavaCodeOperation::updateMethodDeclaration() maybeStatic = "static "; TQString startText = strVis + ' ' + maybeStatic + returnType + methodName + " (" + paramStr + ')'; - // IF the parent is an interface, our operations look different + // IF the tqparent is an interface, our operations look different // e.g. they have no body if(isInterface) { startText += ';'; @@ -123,7 +123,7 @@ void JavaCodeOperation::updateMethodDeclaration() int JavaCodeOperation::lastEditableLine() { ClassifierCodeDocument * doc = dynamic_cast<ClassifierCodeDocument*>(getParentDocument()); - if(doc->parentIsInterface()) + if(doc->tqparentIsInterface()) return -1; // very last line is NOT editable as its a one-line declaration w/ no body in // an interface. return 0; diff --git a/umbrello/umbrello/codegenerators/javacodeoperation.h b/umbrello/umbrello/codegenerators/javacodeoperation.h index 50087fd7..51b7f48a 100644 --- a/umbrello/umbrello/codegenerators/javacodeoperation.h +++ b/umbrello/umbrello/codegenerators/javacodeoperation.h @@ -26,6 +26,7 @@ class JavaClassifierCodeDocument; class JavaCodeOperation : virtual public CodeOperation { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/javawriter.cpp b/umbrello/umbrello/codegenerators/javawriter.cpp index db6d6515..9c351555 100644 --- a/umbrello/umbrello/codegenerators/javawriter.cpp +++ b/umbrello/umbrello/codegenerators/javawriter.cpp @@ -137,8 +137,8 @@ void JavaWriter::writeClass(UMLClassifier *c) TQString str; str = getHeadingFile(".java"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),fileName); - str.replace(TQRegExp("%filepath%"),file.name()); + str.tqreplace(TQRegExp("%filename%"),fileName); + str.tqreplace(TQRegExp("%filepath%"),file.name()); java<<str<<m_endl; } @@ -408,7 +408,7 @@ void JavaWriter::writeAttributeMethods(UMLAttributeList &atpub, Uml::Visibility // from what I can tell, this IS the default behavior for // cleanName. I dunno why its not working -b.t. fieldName.stripWhiteSpace(); - fieldName.replace(0,1,fieldName.at(0).upper()); + fieldName.tqreplace(0,1,fieldName.tqat(0).upper()); writeSingleAttributeAccessorMethods(at->getTypeName(), cleanName(at->getName()), @@ -425,7 +425,7 @@ void JavaWriter::writeComment(const TQString &comment, const TQString &myIndent, // in the case we have several line comment.. // NOTE: this part of the method has the problem of adopting UNIX newline, // need to resolve for using with MAC/WinDoze eventually I assume - if (comment.contains(TQRegExp("\n"))) { + if (comment.tqcontains(TQRegExp("\n"))) { if(javaDocStyle) java << myIndent << "/**" << m_endl; @@ -530,9 +530,9 @@ void JavaWriter::writeAssociationRoleDecl(TQString fieldClassName, // declare the association based on whether it is this a single variable // or a List (Vector). One day this will be done correctly with special // multiplicity object that we don't have to figure out what it means via regex. - if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) + if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) { - TQString fieldVarName = "m_" + roleName.replace(0, 1, roleName.left(1).lower()); + TQString fieldVarName = "m_" + roleName.tqreplace(0, 1, roleName.left(1).lower()); java<<startline<<scope<<" "<<fieldClassName<<" "<<fieldVarName<<";"; } else @@ -589,9 +589,9 @@ void JavaWriter::writeAssociationRoleMethod (TQString fieldClassName, TQString r TQString description, Uml::Visibility visib, Uml::Changeability_Type change, TQTextStream &java) { - if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) + if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) { - TQString fieldVarName = "m_" + roleName.replace(0, 1, roleName.left(1).lower()); + TQString fieldVarName = "m_" + roleName.tqreplace(0, 1, roleName.left(1).lower()); writeSingleAttributeAccessorMethods(fieldClassName, fieldVarName, roleName, description, visib, change, false, java); } diff --git a/umbrello/umbrello/codegenerators/jswriter.cpp b/umbrello/umbrello/codegenerators/jswriter.cpp index ea4cc2e1..b53cd9f6 100644 --- a/umbrello/umbrello/codegenerators/jswriter.cpp +++ b/umbrello/umbrello/codegenerators/jswriter.cpp @@ -68,8 +68,8 @@ void JSWriter::writeClass(UMLClassifier *c) str = getHeadingFile(".js"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),fileName); - str.replace(TQRegExp("%filepath%"),filejs.name()); + str.tqreplace(TQRegExp("%filename%"),fileName); + str.tqreplace(TQRegExp("%filepath%"),filejs.name()); js << str << m_endl; } diff --git a/umbrello/umbrello/codegenerators/jswriter.h b/umbrello/umbrello/codegenerators/jswriter.h index 679222b3..3f54101e 100644 --- a/umbrello/umbrello/codegenerators/jswriter.h +++ b/umbrello/umbrello/codegenerators/jswriter.h @@ -28,6 +28,7 @@ */ class JSWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: JSWriter(); diff --git a/umbrello/umbrello/codegenerators/pascalwriter.cpp b/umbrello/umbrello/codegenerators/pascalwriter.cpp index 766ea6df..2a42bef7 100644 --- a/umbrello/umbrello/codegenerators/pascalwriter.cpp +++ b/umbrello/umbrello/codegenerators/pascalwriter.cpp @@ -129,7 +129,7 @@ void PascalWriter::writeClass(UMLClassifier *c) { const bool isClass = !c->isInterface(); TQString classname = cleanName(c->getName()); TQString fileName = qualifiedName(c).lower(); - fileName.replace('.', '-'); + fileName.tqreplace('.', '-'); //find an appropriate name for our file fileName = overwritableName(c, fileName, ".pas"); @@ -151,8 +151,8 @@ void PascalWriter::writeClass(UMLClassifier *c) { TQString str; str = getHeadingFile(".pas"); if (!str.isEmpty()) { - str.replace(TQRegExp("%filename%"), fileName); - str.replace(TQRegExp("%filepath%"), file.name()); + str.tqreplace(TQRegExp("%filename%"), fileName); + str.tqreplace(TQRegExp("%filepath%"), file.name()); pas << str << endl; } @@ -244,8 +244,8 @@ void PascalWriter::writeClass(UMLClassifier *c) { pas << getIndent() << classname << " = object"; if (!superclasses.isEmpty()) { // FIXME: Multiple inheritance is not yet supported - UMLClassifier* parent = superclasses.first(); - pas << "(" << qualifiedName(parent) << ")"; + UMLClassifier* tqparent = superclasses.first(); + pas << "(" << qualifiedName(tqparent) << ")"; } pas << m_endl; @@ -382,7 +382,7 @@ TQStringList PascalWriter::defaultDatatypes() { l.append("Longint"); l.append("LongBool"); l.append("Longword"); - l.append("QWord"); + l.append("TQWord"); l.append("Real"); l.append("Shortint"); l.append("ShortString"); @@ -434,7 +434,7 @@ const TQStringList PascalWriter::reservedKeywords() const { keywords.append( "class" ); keywords.append( "const" ); keywords.append( "constructor" ); - keywords.append( "contains" ); + keywords.append( "tqcontains" ); keywords.append( "default" ); keywords.append( "deprecated" ); keywords.append( "destructor" ); diff --git a/umbrello/umbrello/codegenerators/pascalwriter.h b/umbrello/umbrello/codegenerators/pascalwriter.h index 0e1f93ca..e8db48ba 100644 --- a/umbrello/umbrello/codegenerators/pascalwriter.h +++ b/umbrello/umbrello/codegenerators/pascalwriter.h @@ -24,6 +24,7 @@ class UMLOperation; */ class PascalWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/codegenerators/perlwriter.cpp b/umbrello/umbrello/codegenerators/perlwriter.cpp index 42563ec4..93195090 100644 --- a/umbrello/umbrello/codegenerators/perlwriter.cpp +++ b/umbrello/umbrello/codegenerators/perlwriter.cpp @@ -54,7 +54,7 @@ bool PerlWriter::GetUseStatements(UMLClassifier *c, TQString &Ret, TQString neatName = cleanName(conc->getName()); if (neatName != AV && neatName != SV && neatName != HV) { TQString OtherPkgName = conc->getPackage("."); - OtherPkgName.replace(TQRegExp("\\."),"::"); + OtherPkgName.tqreplace(TQRegExp("\\."),"::"); TQString OtherName = OtherPkgName + "::" + cleanName(conc->getName()); // Only print out the use statement if the other package isn't the @@ -75,7 +75,7 @@ bool PerlWriter::GetUseStatements(UMLClassifier *c, TQString &Ret, for (UMLClassifier *obj = superclasses.first(); obj; obj = superclasses.next()) { TQString packageName = obj->getPackage("."); - packageName.replace(TQRegExp("\\."),"::"); + packageName.tqreplace(TQRegExp("\\."),"::"); Ret += packageName + "::" + cleanName(obj->getName()) + ' '; } @@ -100,11 +100,11 @@ void PerlWriter::writeClass(UMLClassifier *c) { packageName.simplifyWhiteSpace(); // Replace all blanks with underscore - packageName.replace(TQRegExp(" "), "_"); + packageName.tqreplace(TQRegExp(" "), "_"); // Replace all dots (".") with double colon scope resolution operators // ("::") - packageName.replace(TQRegExp("\\."),"::"); + packageName.tqreplace(TQRegExp("\\."),"::"); // Store complete package name TQString ThisPkgName = packageName + "::" + classname; @@ -118,7 +118,7 @@ void PerlWriter::writeClass(UMLClassifier *c) { CodeGenerationPolicy *pol = UMLApp::app()->getCommonPolicy(); TQString curDir = pol->getOutputDirectory().absPath(); - if (fileName.contains("::")) { + if (fileName.tqcontains("::")) { // create new directories for each level TQString newDir; newDir = curDir; @@ -166,14 +166,14 @@ void PerlWriter::writeClass(UMLClassifier *c) { str = getHeadingFile(".pm"); // what this mean? if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),fileName); - str.replace(TQRegExp("%filepath%"),fileperl.name()); - str.replace(TQRegExp("%year%"),TQDate::currentDate().toString("yyyy")); - str.replace(TQRegExp("%date%"),TQDate::currentDate().toString()); - str.replace(TQRegExp("%time%"),TQTime::currentTime().toString()); - str.replace(TQRegExp("%package-name%"),ThisPkgName); - if(str.find(TQRegExp("%PACKAGE-DECLARE%"))){ - str.replace(TQRegExp("%PACKAGE-DECLARE%"), + str.tqreplace(TQRegExp("%filename%"),fileName); + str.tqreplace(TQRegExp("%filepath%"),fileperl.name()); + str.tqreplace(TQRegExp("%year%"),TQDate::tqcurrentDate().toString("yyyy")); + str.tqreplace(TQRegExp("%date%"),TQDate::tqcurrentDate().toString()); + str.tqreplace(TQRegExp("%time%"),TQTime::currentTime().toString()); + str.tqreplace(TQRegExp("%package-name%"),ThisPkgName); + if(str.tqfind(TQRegExp("%PACKAGE-DECLARE%"))){ + str.tqreplace(TQRegExp("%PACKAGE-DECLARE%"), "package " + ThisPkgName + ';' + m_endl + m_endl + "#UML_MODELER_BEGIN_PERSONAL_VARS_" + classname @@ -184,10 +184,10 @@ void PerlWriter::writeClass(UMLClassifier *c) { bPackageDeclared = true; } - if(str.find(TQRegExp("%USE-STATEMENTS%"))){ + if(str.tqfind(TQRegExp("%USE-STATEMENTS%"))){ TQString UseStms; if(GetUseStatements(c,UseStms,ThisPkgName)){ - str.replace(TQRegExp("%USE-STATEMENTS%"), UseStms); + str.tqreplace(TQRegExp("%USE-STATEMENTS%"), UseStms); bUseStmsWritten = true; } } diff --git a/umbrello/umbrello/codegenerators/perlwriter.h b/umbrello/umbrello/codegenerators/perlwriter.h index 4d5fdabd..99e39bb1 100644 --- a/umbrello/umbrello/codegenerators/perlwriter.h +++ b/umbrello/umbrello/codegenerators/perlwriter.h @@ -32,6 +32,7 @@ class UMLClassifier; */ class PerlWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: PerlWriter(); diff --git a/umbrello/umbrello/codegenerators/php5writer.cpp b/umbrello/umbrello/codegenerators/php5writer.cpp index 64a01b47..d1eadb0b 100644 --- a/umbrello/umbrello/codegenerators/php5writer.cpp +++ b/umbrello/umbrello/codegenerators/php5writer.cpp @@ -173,7 +173,7 @@ static const char *php5words[] = "checkout", "chgrp", "child_nodes", - "children", + "tqchildren", "chmod", "chop", "chown", @@ -345,7 +345,7 @@ static const char *php5words[] = "dba_open", "dba_optimize", "dba_popen", - "dba_replace", + "dba_tqreplace", "dbase_add_record", "dbase_close", "dbase_create", @@ -367,7 +367,7 @@ static const char *php5words[] = "dbminsert", "dbmnextkey", "dbmopen", - "dbmreplace", + "dbmtqreplace", "dbplus_add", "dbplus_aql", "dbplus_chdir", @@ -375,7 +375,7 @@ static const char *php5words[] = "dbplus_curr", "dbplus_errcode", "dbplus_errno", - "dbplus_find", + "dbplus_tqfind", "dbplus_first", "dbplus_flush", "dbplus_freealllocks", @@ -511,8 +511,8 @@ static const char *php5words[] = "E_PARSE", "ereg", "eregi", - "eregi_replace", - "ereg_replace", + "eregi_tqreplace", + "ereg_tqreplace", "error_log", "error_reporting", "escapeshellarg", @@ -646,7 +646,7 @@ static const char *php5words[] = "_FILES", "filesize", "filetype", - "find", + "tqfind", "first_child", "floatval", "flock", @@ -760,8 +760,8 @@ static const char *php5words[] = "getrusage", "getservbyname", "getservbyport", - "getshape1", - "getshape2", + "gettqshape1", + "gettqshape2", "gettext", "gettimeofday", "gettype", @@ -1293,7 +1293,7 @@ static const char *php5words[] = "ldap_mod_add", "ldap_mod_del", "ldap_modify", - "ldap_mod_replace", + "ldap_mod_tqreplace", "ldap_next_attribute", "ldap_next_entry", "ldap_next_reference", @@ -1350,9 +1350,9 @@ static const char *php5words[] = "mb_encode_numericentity", "mb_ereg", "mb_eregi", - "mb_eregi_replace", + "mb_eregi_tqreplace", "mb_ereg_match", - "mb_ereg_replace", + "mb_ereg_tqreplace", "mb_ereg_search", "mb_ereg_search_getpos", "mb_ereg_search_getregs", @@ -1565,7 +1565,7 @@ static const char *php5words[] = "msession_create", "msession_destroy", "msession_disconnect", - "msession_find", + "msession_tqfind", "msession_get", "msession_get_array", "msession_getdata", @@ -1776,7 +1776,7 @@ static const char *php5words[] = "ncurses_killchar", "ncurses_longname", "ncurses_mouseinterval", - "ncurses_mousemask", + "ncurses_mousetqmask", "ncurses_move", "ncurses_mvaddch", "ncurses_mvaddchnstr", @@ -2051,8 +2051,8 @@ static const char *php5words[] = "ovrimos_rollback", "owner_document", "pack", - "parent_node", - "parents", + "tqparent_node", + "tqparents", "parse_ini_file", "parse_str", "parse_url", @@ -2323,7 +2323,7 @@ static const char *php5words[] = "preg_match", "preg_match_all", "preg_quote", - "preg_replace", + "preg_tqreplace", "preg_replace_callback", "preg_split", "prev", @@ -2389,7 +2389,7 @@ static const char *php5words[] = "putenv", "qdom_error", "qdom_tree", - "QUERY_STRING", + "TQUERY_STRING", "quoted_printable_decode", "quotemeta", "rad2deg", @@ -2424,7 +2424,7 @@ static const char *php5words[] = "remove_attribute", "remove_child", "rename", - "replace", + "tqreplace", "replace_child", "replace_node", "_REQUEST", @@ -2661,7 +2661,7 @@ static const char *php5words[] = "strpos", "strrchr", "str_repeat", - "str_replace", + "str_tqreplace", "strrev", "str_rot13", "strrpos", @@ -2677,7 +2677,7 @@ static const char *php5words[] = "str_word_count", "substr", "substr_count", - "substr_replace", + "substr_tqreplace", "SWFAction", "swf_actiongeturl", "swf_actiongotoframe", @@ -2704,7 +2704,7 @@ static const char *php5words[] = "SWFDisplayItem", "swf_endbutton", "swf_enddoaction", - "swf_endshape", + "swf_endtqshape", "swf_endsymbol", "SWFFill", "SWFFont", @@ -2738,21 +2738,21 @@ static const char *php5words[] = "swf_setfont", "swf_setframe", "SWFShape", - "swf_shapearc", - "swf_shapecurveto", - "swf_shapecurveto3", - "swf_shapefillbitmapclip", - "swf_shapefillbitmaptile", - "swf_shapefilloff", - "swf_shapefillsolid", - "swf_shapelinesolid", - "swf_shapelineto", - "swf_shapemoveto", + "swf_tqshapearc", + "swf_tqshapecurveto", + "swf_tqshapecurveto3", + "swf_tqshapefillbitmapclip", + "swf_tqshapefillbitmaptile", + "swf_tqshapefilloff", + "swf_tqshapefillsolid", + "swf_tqshapelinesolid", + "swf_tqshapelineto", + "swf_tqshapemoveto", "swf_showframe", "SWFSprite", "swf_startbutton", "swf_startdoaction", - "swf_startshape", + "swf_starttqshape", "swf_startsymbol", "SWFText", "SWFTextField", @@ -2816,7 +2816,7 @@ static const char *php5words[] = "udm_crc32", "udm_errno", "udm_error", - "udm_find", + "udm_tqfind", "udm_free_agent", "udm_free_ispell_data", "udm_free_res", @@ -3024,8 +3024,8 @@ void Php5Writer::writeClass(UMLClassifier *c) { TQString str; str = getHeadingFile(".php"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),fileName); - str.replace(TQRegExp("%filepath%"),filephp.name()); + str.tqreplace(TQRegExp("%filename%"),fileName); + str.tqreplace(TQRegExp("%filepath%"),filephp.name()); php<<str<<m_endl; } diff --git a/umbrello/umbrello/codegenerators/php5writer.h b/umbrello/umbrello/codegenerators/php5writer.h index ea2a7862..726cf09b 100644 --- a/umbrello/umbrello/codegenerators/php5writer.h +++ b/umbrello/umbrello/codegenerators/php5writer.h @@ -30,6 +30,7 @@ */ class Php5Writer : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: Php5Writer(); diff --git a/umbrello/umbrello/codegenerators/phpwriter.cpp b/umbrello/umbrello/codegenerators/phpwriter.cpp index e9dba103..5536c2c9 100644 --- a/umbrello/umbrello/codegenerators/phpwriter.cpp +++ b/umbrello/umbrello/codegenerators/phpwriter.cpp @@ -171,7 +171,7 @@ static const char *words[] = "checkout", "chgrp", "child_nodes", - "children", + "tqchildren", "chmod", "chop", "chown", @@ -343,7 +343,7 @@ static const char *words[] = "dba_open", "dba_optimize", "dba_popen", - "dba_replace", + "dba_tqreplace", "dbase_add_record", "dbase_close", "dbase_create", @@ -365,7 +365,7 @@ static const char *words[] = "dbminsert", "dbmnextkey", "dbmopen", - "dbmreplace", + "dbmtqreplace", "dbplus_add", "dbplus_aql", "dbplus_chdir", @@ -373,7 +373,7 @@ static const char *words[] = "dbplus_curr", "dbplus_errcode", "dbplus_errno", - "dbplus_find", + "dbplus_tqfind", "dbplus_first", "dbplus_flush", "dbplus_freealllocks", @@ -509,8 +509,8 @@ static const char *words[] = "E_PARSE", "ereg", "eregi", - "eregi_replace", - "ereg_replace", + "eregi_tqreplace", + "ereg_tqreplace", "error_log", "error_reporting", "escapeshellarg", @@ -644,7 +644,7 @@ static const char *words[] = "_FILES", "filesize", "filetype", - "find", + "tqfind", "first_child", "floatval", "flock", @@ -758,8 +758,8 @@ static const char *words[] = "getrusage", "getservbyname", "getservbyport", - "getshape1", - "getshape2", + "gettqshape1", + "gettqshape2", "gettext", "gettimeofday", "gettype", @@ -1289,7 +1289,7 @@ static const char *words[] = "ldap_mod_add", "ldap_mod_del", "ldap_modify", - "ldap_mod_replace", + "ldap_mod_tqreplace", "ldap_next_attribute", "ldap_next_entry", "ldap_next_reference", @@ -1346,9 +1346,9 @@ static const char *words[] = "mb_encode_numericentity", "mb_ereg", "mb_eregi", - "mb_eregi_replace", + "mb_eregi_tqreplace", "mb_ereg_match", - "mb_ereg_replace", + "mb_ereg_tqreplace", "mb_ereg_search", "mb_ereg_search_getpos", "mb_ereg_search_getregs", @@ -1561,7 +1561,7 @@ static const char *words[] = "msession_create", "msession_destroy", "msession_disconnect", - "msession_find", + "msession_tqfind", "msession_get", "msession_get_array", "msession_getdata", @@ -1772,7 +1772,7 @@ static const char *words[] = "ncurses_killchar", "ncurses_longname", "ncurses_mouseinterval", - "ncurses_mousemask", + "ncurses_mousetqmask", "ncurses_move", "ncurses_mvaddch", "ncurses_mvaddchnstr", @@ -2047,8 +2047,8 @@ static const char *words[] = "ovrimos_rollback", "owner_document", "pack", - "parent_node", - "parents", + "tqparent_node", + "tqparents", "parse_ini_file", "parse_str", "parse_url", @@ -2319,7 +2319,7 @@ static const char *words[] = "preg_match", "preg_match_all", "preg_quote", - "preg_replace", + "preg_tqreplace", "preg_replace_callback", "preg_split", "prev", @@ -2385,7 +2385,7 @@ static const char *words[] = "putenv", "qdom_error", "qdom_tree", - "QUERY_STRING", + "TQUERY_STRING", "quoted_printable_decode", "quotemeta", "rad2deg", @@ -2420,7 +2420,7 @@ static const char *words[] = "remove_attribute", "remove_child", "rename", - "replace", + "tqreplace", "replace_child", "replace_node", "_REQUEST", @@ -2657,7 +2657,7 @@ static const char *words[] = "strpos", "strrchr", "str_repeat", - "str_replace", + "str_tqreplace", "strrev", "str_rot13", "strrpos", @@ -2673,7 +2673,7 @@ static const char *words[] = "str_word_count", "substr", "substr_count", - "substr_replace", + "substr_tqreplace", "SWFAction", "swf_actiongeturl", "swf_actiongotoframe", @@ -2700,7 +2700,7 @@ static const char *words[] = "SWFDisplayItem", "swf_endbutton", "swf_enddoaction", - "swf_endshape", + "swf_endtqshape", "swf_endsymbol", "SWFFill", "SWFFont", @@ -2734,21 +2734,21 @@ static const char *words[] = "swf_setfont", "swf_setframe", "SWFShape", - "swf_shapearc", - "swf_shapecurveto", - "swf_shapecurveto3", - "swf_shapefillbitmapclip", - "swf_shapefillbitmaptile", - "swf_shapefilloff", - "swf_shapefillsolid", - "swf_shapelinesolid", - "swf_shapelineto", - "swf_shapemoveto", + "swf_tqshapearc", + "swf_tqshapecurveto", + "swf_tqshapecurveto3", + "swf_tqshapefillbitmapclip", + "swf_tqshapefillbitmaptile", + "swf_tqshapefilloff", + "swf_tqshapefillsolid", + "swf_tqshapelinesolid", + "swf_tqshapelineto", + "swf_tqshapemoveto", "swf_showframe", "SWFSprite", "swf_startbutton", "swf_startdoaction", - "swf_startshape", + "swf_starttqshape", "swf_startsymbol", "SWFText", "SWFTextField", @@ -2812,7 +2812,7 @@ static const char *words[] = "udm_crc32", "udm_errno", "udm_error", - "udm_find", + "udm_tqfind", "udm_free_agent", "udm_free_ispell_data", "udm_free_res", @@ -3020,8 +3020,8 @@ void PhpWriter::writeClass(UMLClassifier *c) { TQString str; str = getHeadingFile(".php"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),fileName); - str.replace(TQRegExp("%filepath%"),filephp.name()); + str.tqreplace(TQRegExp("%filename%"),fileName); + str.tqreplace(TQRegExp("%filepath%"),filephp.name()); php<<str<<m_endl; } diff --git a/umbrello/umbrello/codegenerators/phpwriter.h b/umbrello/umbrello/codegenerators/phpwriter.h index e03699f1..b7b9affa 100644 --- a/umbrello/umbrello/codegenerators/phpwriter.h +++ b/umbrello/umbrello/codegenerators/phpwriter.h @@ -28,6 +28,7 @@ */ class PhpWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: PhpWriter(); diff --git a/umbrello/umbrello/codegenerators/pythonwriter.cpp b/umbrello/umbrello/codegenerators/pythonwriter.cpp index f243ab2c..ba1a636e 100644 --- a/umbrello/umbrello/codegenerators/pythonwriter.cpp +++ b/umbrello/umbrello/codegenerators/pythonwriter.cpp @@ -64,7 +64,7 @@ void PythonWriter::writeClass(UMLClassifier *c) { //Replace the first letter of the filename because //python class begin with an upper caracter (convention) first = first.upper(); - fileName = fileName.replace(0, 1, first); + fileName = fileName.tqreplace(0, 1, first); TQFile fileh; if( !openFile(fileh, fileName) ) { @@ -83,8 +83,8 @@ void PythonWriter::writeClass(UMLClassifier *c) { str = getHeadingFile(".py"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"), fileName); - str.replace(TQRegExp("%filepath%"), fileh.name()); + str.tqreplace(TQRegExp("%filename%"), fileName); + str.tqreplace(TQRegExp("%filepath%"), fileh.name()); h<<str<<m_endl; } @@ -115,9 +115,9 @@ void PythonWriter::writeClass(UMLClassifier *c) { headerName.remove(TQRegExp(".py$")); first = headerName.at(0); first = first.upper(); - headerName = headerName.replace(0, 1, first); - str = headerName.replace(TQChar('/'),TQChar('.')); - if (includesList.findIndex(str) < 0) // not yet imported + headerName = headerName.tqreplace(0, 1, first); + str = headerName.tqreplace(TQChar('/'),TQChar('.')); + if (includesList.tqfindIndex(str) < 0) // not yet imported h << "from " << str << " import *" << m_endl; } } @@ -418,7 +418,7 @@ const TQStringList PythonWriter::reservedKeywords() const { << "TypeError" << "UnboundLocalError" << "unichr" - << "unicode" + << "tqunicode" << "UnicodeError" << "UserWarning" << "ValueError" diff --git a/umbrello/umbrello/codegenerators/pythonwriter.h b/umbrello/umbrello/codegenerators/pythonwriter.h index c9dddc23..b7f324e7 100644 --- a/umbrello/umbrello/codegenerators/pythonwriter.h +++ b/umbrello/umbrello/codegenerators/pythonwriter.h @@ -31,6 +31,7 @@ enum Access {PRIVATE, PUBLIC, PROTECTED}; */ class PythonWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: PythonWriter(); diff --git a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp index f75ff165..294175d5 100644 --- a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp @@ -26,10 +26,10 @@ // RubyClassDeclarationBlock::RubyClassDeclarationBlock - ( RubyClassifierCodeDocument * parentDoc, const TQString &startText, const TQString &endText, const TQString &comment) - : OwnedHierarchicalCodeBlock(parentDoc->getParentClassifier(), parentDoc, startText, endText, comment) + ( RubyClassifierCodeDocument * tqparentDoc, const TQString &startText, const TQString &endText, const TQString &comment) + : OwnedHierarchicalCodeBlock(tqparentDoc->getParentClassifier(), tqparentDoc, startText, endText, comment) { - init(parentDoc, comment); + init(tqparentDoc, comment); } RubyClassDeclarationBlock::~RubyClassDeclarationBlock ( ) { } @@ -69,20 +69,20 @@ void RubyClassDeclarationBlock::loadFromXMI ( TQDomElement & root ) void RubyClassDeclarationBlock::updateContent ( ) { - RubyClassifierCodeDocument *parentDoc = dynamic_cast<RubyClassifierCodeDocument*>(getParentDocument()); - UMLClassifier *c = parentDoc->getParentClassifier(); + RubyClassifierCodeDocument *tqparentDoc = dynamic_cast<RubyClassifierCodeDocument*>(getParentDocument()); + UMLClassifier *c = tqparentDoc->getParentClassifier(); CodeGenerationPolicy * p = UMLApp::app()->getCommonPolicy(); TQString endLine = p->getNewLineEndingChars(); - bool isInterface = parentDoc->parentIsInterface(); // a little shortcut - TQString RubyClassName = parentDoc->getRubyClassName(c->getName()); + bool isInterface = tqparentDoc->tqparentIsInterface(); // a little shortcut + TQString RubyClassName = tqparentDoc->getRubyClassName(c->getName()); bool forceDoc = p->getCodeVerboseDocumentComments(); // COMMENT TQString comment = c->getDoc(); - comment.replace("@ref ", ""); - comment.replace("@see", "_See_"); - comment.replace("@short", "_Summary_"); - comment.replace("@author", "_Author_"); + comment.tqreplace("@ref ", ""); + comment.tqreplace("@see", "_See_"); + comment.tqreplace("@short", "_Summary_"); + comment.tqreplace("@author", "_Author_"); if (isInterface) getComment()->setText("Module " + RubyClassName + endLine + comment); @@ -98,7 +98,7 @@ void RubyClassDeclarationBlock::updateContent ( ) // Now set START/ENDING Text TQString startText = ""; - if (parentDoc->parentIsInterface()) { + if (tqparentDoc->tqparentIsInterface()) { startText.append("module "); } else { startText.append("class "); @@ -131,10 +131,10 @@ void RubyClassDeclarationBlock::updateContent ( ) setStartText(startText); } -void RubyClassDeclarationBlock::init (RubyClassifierCodeDocument *parentDoc, const TQString &comment) +void RubyClassDeclarationBlock::init (RubyClassifierCodeDocument *tqparentDoc, const TQString &comment) { - setComment(new RubyCodeDocumentation(parentDoc)); + setComment(new RubyCodeDocumentation(tqparentDoc)); getComment()->setText(comment); setEndText("end"); diff --git a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h index 63e43702..10b7f5bd 100644 --- a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h +++ b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h @@ -33,6 +33,7 @@ class RubyClassDeclarationBlock : public OwnedHierarchicalCodeBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -41,7 +42,7 @@ public: /** * Empty Constructor */ - explicit RubyClassDeclarationBlock ( RubyClassifierCodeDocument * parentDoc, const TQString &start = "", const TQString &endText = "end", const TQString &comment = ""); + explicit RubyClassDeclarationBlock ( RubyClassifierCodeDocument * tqparentDoc, const TQString &start = "", const TQString &endText = "end", const TQString &comment = ""); /** * Empty Destructor @@ -67,7 +68,7 @@ protected: private: - void init (RubyClassifierCodeDocument * parent, const TQString &comment); + void init (RubyClassifierCodeDocument * tqparent, const TQString &comment); }; diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp index ada4b0bb..ecd5523b 100644 --- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp +++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp @@ -86,10 +86,10 @@ TQString RubyClassifierCodeDocument::getPath ( ) path.simplifyWhiteSpace(); // Replace all blanks with underscore - path.replace(TQRegExp(" "), "_"); + path.tqreplace(TQRegExp(" "), "_"); - path.replace(TQRegExp("\\."),"/"); - path.replace(TQRegExp("::"), "/"); + path.tqreplace(TQRegExp("\\."),"/"); + path.tqreplace(TQRegExp("::"), "/"); path.lower(); @@ -252,7 +252,7 @@ void RubyClassifierCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & ro } else if( name == "codeoperation" ) { // find the code operation by id - TQString id = element.attribute("parent_id","-1"); + TQString id = element.attribute("tqparent_id","-1"); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id)); UMLOperation * op = dynamic_cast<UMLOperation*>(obj); if(op) { @@ -355,7 +355,7 @@ void RubyClassifierCodeDocument::resetTextBlocks() } // This method will cause the class to rebuild its text representation. -// based on the parent classifier object. +// based on the tqparent classifier object. // For any situation in which this is called, we are either building the code // document up, or replacing/regenerating the existing auto-generated parts. As // such, we will want to insert everything we resonablely will want @@ -363,7 +363,7 @@ void RubyClassifierCodeDocument::resetTextBlocks() // comments) to appear or not, as needed. void RubyClassifierCodeDocument::updateContent( ) { - // Gather info on the various fields and parent objects of this class... + // Gather info on the various fields and tqparent objects of this class... UMLClassifier * c = getParentClassifier(); RubyCodeGenerator * gen = dynamic_cast<RubyCodeGenerator*>(UMLApp::app()->getGenerator()); @@ -371,7 +371,7 @@ void RubyClassifierCodeDocument::updateContent( ) // This depends on whether or not we have attribute/association classes CodeClassFieldList * cfList = getCodeClassFieldList(); for(CodeClassField * field = cfList->first(); field; field = cfList->next()) - if(field->parentIsAttribute()) + if(field->tqparentIsAttribute()) field->setWriteOutMethods(gen->getAutoGenerateAttribAccessors()); else field->setWriteOutMethods(gen->getAutoGenerateAssocAccessors()); @@ -399,7 +399,7 @@ void RubyClassifierCodeDocument::updateContent( ) CodeClassFieldList privAggregationClassFields = getSpecificClassFields ( CodeClassField::Aggregation, Uml::Visibility::Private); CodeClassFieldList privCompositionClassFields = getSpecificClassFields ( CodeClassField::Composition, Uml::Visibility::Private); - bool isInterface = parentIsInterface(); + bool isInterface = tqparentIsInterface(); bool hasOperationMethods = c->getOpList().last() ? true : false; CodeGenerationPolicy *pol = UMLApp::app()->getCommonPolicy(); TQString endLine = pol->getNewLineEndingChars(); // a shortcut..so we don't have to call this all the time @@ -435,7 +435,7 @@ void RubyClassifierCodeDocument::updateContent( ) // NOW create document in sections.. // now we want to populate the body of our class - // our layout is the following general groupings of code blocks: + // our tqlayout is the following general groupings of code blocks: // start ruby classifier document diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h index cfaa66fe..05f73e14 100644 --- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h +++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h @@ -42,6 +42,7 @@ class RubyCodeGenerationPolicy; class RubyClassifierCodeDocument : public ClassifierCodeDocument { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp index 43986061..8a4fd7bd 100644 --- a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp +++ b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp @@ -78,8 +78,8 @@ void RubyCodeAccessorMethod::setAttributesFromNode( TQDomElement & root) void RubyCodeAccessorMethod::updateContent( ) { - CodeClassField * parentField = getParentClassField(); - RubyCodeClassField * rubyfield = dynamic_cast<RubyCodeClassField*>(parentField); + CodeClassField * tqparentField = getParentClassField(); + RubyCodeClassField * rubyfield = dynamic_cast<RubyCodeClassField*>(tqparentField); TQString fieldName = rubyfield->getFieldName(); TQString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars(); @@ -153,13 +153,13 @@ void RubyCodeAccessorMethod::updateMethodDeclaration() TQString endLine = p->getNewLineEndingChars(); TQString description = getParentObject()->getDoc(); - description.replace(TQRegExp("m_[npb](?=[A-Z])"), ""); - description.replace("m_", ""); - description.replace(TQRegExp("[\\n\\r]+[\\t ]*"), endLine); + description.tqreplace(TQRegExp("m_[npb](?=[A-Z])"), ""); + description.tqreplace("m_", ""); + description.tqreplace(TQRegExp("[\\n\\r]+[\\t ]*"), endLine); // set scope of this accessor appropriately..if its an attribute, // we need to be more sophisticated - if(rubyfield->parentIsAttribute()) + if(rubyfield->tqparentIsAttribute()) switch (scopePolicy) { case CodeGenerationPolicy::Public: case CodeGenerationPolicy::Private: @@ -168,7 +168,7 @@ void RubyCodeAccessorMethod::updateMethodDeclaration() break; default: case CodeGenerationPolicy::FromParent: - // do nothing..already have taken parent value + // do nothing..already have taken tqparent value break; } diff --git a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h index 0e61a978..cc58ce2e 100644 --- a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h +++ b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h @@ -31,6 +31,7 @@ class RubyCodeAccessorMethod : public CodeAccessorMethod { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp index b3b723b9..e04d189a 100644 --- a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp +++ b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp @@ -38,14 +38,14 @@ // Constructors/Destructors // -RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role) - : CodeClassField(parentDoc, role) +RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role) + : CodeClassField(tqparentDoc, role) { } -RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib) - : CodeClassField(parentDoc, attrib) +RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib) + : CodeClassField(tqparentDoc, attrib) { } @@ -60,7 +60,7 @@ RubyCodeClassField::~RubyCodeClassField ( ) { } // TQString RubyCodeClassField::getFieldName() { - if (parentIsAttribute()) + if (tqparentIsAttribute()) { UMLAttribute * at = (UMLAttribute*) getParentObject(); return cleanName(at->getName()); @@ -70,7 +70,7 @@ TQString RubyCodeClassField::getFieldName() { UMLRole * role = (UMLRole*) getParentObject(); TQString roleName = role->getName(); if(fieldIsSingleValue()) { - return roleName.replace(0, 1, roleName.left(1).lower()); + return roleName.tqreplace(0, 1, roleName.left(1).lower()); } else { return roleName.lower() + "Array"; } @@ -80,13 +80,13 @@ TQString RubyCodeClassField::getFieldName() { TQString RubyCodeClassField::getInitialValue() { - if (parentIsAttribute()) + if (tqparentIsAttribute()) { UMLAttribute * at = dynamic_cast<UMLAttribute*>( getParentObject() ); if (at) { return fixInitialStringDeclValue(at->getInitialValue(), getTypeName()); } else { - kError() << "RubyodeClassField::getInitialValue: parent object is not a UMLAttribute" + kError() << "RubyodeClassField::getInitialValue: tqparent object is not a UMLAttribute" << endl; return ""; } diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfield.h b/umbrello/umbrello/codegenerators/rubycodeclassfield.h index 50269729..28e96b74 100644 --- a/umbrello/umbrello/codegenerators/rubycodeclassfield.h +++ b/umbrello/umbrello/codegenerators/rubycodeclassfield.h @@ -29,6 +29,7 @@ class ClassifierCodeDocument; class RubyCodeClassField : public CodeClassField { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -37,8 +38,8 @@ public: /** * Constructors */ - RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role); - RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib); + RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role); + RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib); /** * Empty Destructor diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp index e99ca774..2171bb28 100644 --- a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp @@ -22,8 +22,8 @@ // Constructors/Destructors // -RubyCodeClassFieldDeclarationBlock::RubyCodeClassFieldDeclarationBlock ( CodeClassField * parent ) - : CodeClassFieldDeclarationBlock ( parent ) +RubyCodeClassFieldDeclarationBlock::RubyCodeClassFieldDeclarationBlock ( CodeClassField * tqparent ) + : CodeClassFieldDeclarationBlock ( tqparent ) { setOverallIndentationLevel(1); updateContent(); @@ -61,7 +61,7 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( ) TQString scopeStr = rdoc->scopeToRubyDecl(getParentObject()->getVisibility()); // IF this is from an association, then scope taken as appropriate to policy - if(!rcf->parentIsAttribute()) + if(!rcf->tqparentIsAttribute()) { switch (scopePolicy) { case CodeGenerationPolicy::Public: @@ -71,7 +71,7 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( ) break; default: case CodeGenerationPolicy::FromParent: - // do nothing here... will leave as from parent object + // do nothing here... will leave as from tqparent object break; } } @@ -80,13 +80,13 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( ) TQString fieldName = rcf->getFieldName(); TQString initialV = rcf->getInitialValue(); - if (!cf->parentIsAttribute() && !cf->fieldIsSingleValue()) + if (!cf->tqparentIsAttribute() && !cf->fieldIsSingleValue()) typeName = "Array"; TQString body = staticValue+scopeStr+' '+typeName+' '+fieldName; if (!initialV.isEmpty()) body.append(" = " + initialV); - else if (!cf->parentIsAttribute()) + else if (!cf->tqparentIsAttribute()) { UMLRole * role = dynamic_cast<UMLRole*>(cf->getParentObject()); if (role->getObject()->getBaseType() == Uml::ot_Interface) @@ -95,7 +95,7 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( ) } else { // FIX?: IF a constructor method exists in the classifiercodedoc - // of the parent Object, then we can use that instead (if its empty). + // of the tqparent Object, then we can use that instead (if its empty). if(cf->fieldIsSingleValue()) { if(!typeName.isEmpty()) diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h index beba96c2..1dd6b342 100644 --- a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h +++ b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h @@ -27,6 +27,7 @@ class RubyCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -35,7 +36,7 @@ public: /** * Constructor */ - RubyCodeClassFieldDeclarationBlock ( CodeClassField * parent ); + RubyCodeClassFieldDeclarationBlock ( CodeClassField * tqparent ); /** * Empty Destructor @@ -44,7 +45,7 @@ public: protected: - // this will be called by syncToParent whenever the parent object is "modified" + // this will be called by syncToParent whenever the tqparent object is "modified" void updateContent ( ); private: diff --git a/umbrello/umbrello/codegenerators/rubycodecomment.cpp b/umbrello/umbrello/codegenerators/rubycodecomment.cpp index 89508b63..bf85df1a 100644 --- a/umbrello/umbrello/codegenerators/rubycodecomment.cpp +++ b/umbrello/umbrello/codegenerators/rubycodecomment.cpp @@ -65,7 +65,7 @@ TQString RubyCodeComment::unformatText(const TQString & text, const TQString & i } /** - * @return QString + * @return TQString */ TQString RubyCodeComment::toString( ) { diff --git a/umbrello/umbrello/codegenerators/rubycodecomment.h b/umbrello/umbrello/codegenerators/rubycodecomment.h index 0646cd33..8c7cec59 100644 --- a/umbrello/umbrello/codegenerators/rubycodecomment.h +++ b/umbrello/umbrello/codegenerators/rubycodecomment.h @@ -34,6 +34,7 @@ class RubyCodeComment : virtual public CodeComment { Q_OBJECT + TQ_OBJECT public: /** * Constructors @@ -46,7 +47,7 @@ public: virtual ~RubyCodeComment ( ); /** - * @return QString + * @return TQString */ TQString toString ( ); diff --git a/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp b/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp index e19f4daa..9afee3f1 100644 --- a/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp +++ b/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp @@ -57,12 +57,12 @@ RubyCodeDocumentation::~RubyCodeDocumentation ( ) { } void RubyCodeDocumentation::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) { TQDomElement blockElement = doc.createElement( "rubycodedocumentation" ); setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may - // just use parent TextBlock method + // just use tqparent TextBlock method root.appendChild( blockElement ); } /** - * @return QString + * @return TQString */ TQString RubyCodeDocumentation::toString ( ) { diff --git a/umbrello/umbrello/codegenerators/rubycodedocumentation.h b/umbrello/umbrello/codegenerators/rubycodedocumentation.h index 0d210419..a4db50ab 100644 --- a/umbrello/umbrello/codegenerators/rubycodedocumentation.h +++ b/umbrello/umbrello/codegenerators/rubycodedocumentation.h @@ -35,6 +35,7 @@ class RubyClassifierCodeDocument; class RubyCodeDocumentation : virtual public CodeComment { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -63,7 +64,7 @@ public: virtual void saveToXMI ( TQDomDocument & doc, TQDomElement & root ); /** - * @return QString + * @return TQString */ TQString toString ( ); diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui index 14bcf0f2..39d29328 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui +++ b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>RubyCodeGenerationFormBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,15 +16,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -43,15 +43,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>m_generateConstructors</cstring> </property> @@ -62,7 +62,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>m_generateAssocAccessors</cstring> </property> @@ -73,7 +73,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>m_generateAttribAccessors</cstring> </property> @@ -86,15 +86,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Public</string> @@ -122,7 +122,7 @@ <number>3</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -132,15 +132,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_3_2</cstring> </property> @@ -148,7 +148,7 @@ <string>Default association field scope:</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Public</string> @@ -180,7 +180,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -199,7 +199,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -207,7 +207,7 @@ <string>Style:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Hash (#)</string> @@ -224,7 +224,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -244,5 +244,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp index 8e58fdf0..62df797d 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp +++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp @@ -156,8 +156,8 @@ void RubyCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSig * Create a new dialog interface for this object. * @return dialog object */ -CodeGenerationPolicyPage * RubyCodeGenerationPolicy::createPage ( TQWidget *parent, const char *name ) { - return new RubyCodeGenerationPolicyPage ( parent, name, this ); +CodeGenerationPolicyPage * RubyCodeGenerationPolicy::createPage ( TQWidget *tqparent, const char *name ) { + return new RubyCodeGenerationPolicyPage ( tqparent, name, this ); } void RubyCodeGenerationPolicy::init() { diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h index 56c051e2..459e80d0 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h +++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h @@ -30,6 +30,7 @@ class CodeGenerationPolicyPage; class RubyCodeGenerationPolicy : public CodeGenPolicyExt { Q_OBJECT + TQ_OBJECT public: static const bool DEFAULT_AUTO_GEN_ATTRIB_ACCESSORS; @@ -98,7 +99,7 @@ public: * Create a new dialog interface for this object. * @return dialog object */ - CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0); + CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0); protected: diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp index 5c890b4f..c6153448 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp +++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp @@ -30,8 +30,8 @@ #include "../codegenerationpolicy.h" #include "../uml.h" -RubyCodeGenerationPolicyPage::RubyCodeGenerationPolicyPage( TQWidget *parent, const char *name, RubyCodeGenerationPolicy * policy ) - : CodeGenerationPolicyPage(parent, name, policy) +RubyCodeGenerationPolicyPage::RubyCodeGenerationPolicyPage( TQWidget *tqparent, const char *name, RubyCodeGenerationPolicy * policy ) + : CodeGenerationPolicyPage(tqparent, name, policy) { CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy(); form = new RubyCodeGenerationFormBase(this); @@ -52,19 +52,19 @@ void RubyCodeGenerationPolicyPage::apply() CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy(); // now do our ruby-specific configs - RubyCodeGenerationPolicy * parent = (RubyCodeGenerationPolicy*) m_parentPolicy; + RubyCodeGenerationPolicy * tqparent = (RubyCodeGenerationPolicy*) m_parentPolicy; // block signals so we don't cause too many update content calls to code documents - parent->blockSignals(true); + tqparent->blockSignals(true); common->setCommentStyle((CodeGenerationPolicy::CommentStyle) form->m_SelectCommentStyle->currentItem()); common->setAttributeAccessorScope((CodeGenerationPolicy::ScopePolicy) (form->m_accessorScopeCB->currentItem()+200)); common->setAssociationFieldScope((CodeGenerationPolicy::ScopePolicy) (form->m_assocFieldScopeCB->currentItem()+200)); common->setAutoGenerateConstructors(form->m_generateConstructors->isChecked()); - parent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked()); - parent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked()); + tqparent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked()); + tqparent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked()); - parent->blockSignals(false); + tqparent->blockSignals(false); // now send out modified code content signal common->emitModifiedCodeContentSig(); diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h index 1637843b..c994dff8 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h +++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h @@ -31,9 +31,10 @@ class RubyCodeGenerationPolicyPage : public CodeGenerationPolicyPage { Q_OBJECT + TQ_OBJECT public: - explicit RubyCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, RubyCodeGenerationPolicy * policy = 0); + explicit RubyCodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, RubyCodeGenerationPolicy * policy = 0); virtual ~RubyCodeGenerationPolicyPage(); diff --git a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp index 4acfd65a..e0732773 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp +++ b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp @@ -59,10 +59,10 @@ Uml::Programming_Language RubyCodeGenerator::getLanguage() { } // In the Java version, we make the ANT build file also available. -CodeViewerDialog * RubyCodeGenerator::getCodeViewerDialog ( TQWidget* parent, CodeDocument *doc, +CodeViewerDialog * RubyCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc, Settings::CodeViewerState state) { - CodeViewerDialog *dialog = new CodeViewerDialog(parent, doc, state); + CodeViewerDialog *dialog = new CodeViewerDialog(tqparent, doc, state); return dialog; } @@ -90,25 +90,25 @@ TQString RubyCodeGenerator::getListFieldClassName () { TQString RubyCodeGenerator::cppToRubyType(const TQString &typeStr) { TQString type = cleanName(typeStr); - type.replace("const ", ""); - type.replace(TQRegExp("[*&\\s]"), ""); - type.replace(TQRegExp("[<>]"), "_"); - type.replace("TQStringList", "Array"); - type.replace(TQRegExp("^string$"),"String"); - type.replace("TQString", "String"); - type.replace("bool", "true|false"); - type.replace(TQRegExp("^(uint|int|ushort|short|ulong|long)$"), "Integer"); - type.replace(TQRegExp("^(float|double)$"), "Float"); - type.replace(TQRegExp("^Q(?=[A-Z])"), "Qt::"); - type.replace(TQRegExp("^K(?!(DE|Parts|IO)"), "KDE::"); + type.tqreplace("const ", ""); + type.tqreplace(TQRegExp("[*&\\s]"), ""); + type.tqreplace(TQRegExp("[<>]"), "_"); + type.tqreplace(TQSTRINGLIST_OBJECT_NAME_STRING, "Array"); + type.tqreplace(TQRegExp("^string$"),"String"); + type.tqreplace(TQSTRING_OBJECT_NAME_STRING, "String"); + type.tqreplace("bool", "true|false"); + type.tqreplace(TQRegExp("^(uint|int|ushort|short|ulong|long)$"), "Integer"); + type.tqreplace(TQRegExp("^(float|double)$"), "Float"); + type.tqreplace(TQRegExp("^Q(?=[A-Z])"), "TQt::"); + type.tqreplace(TQRegExp("^K(?!(DE|Parts|IO)"), "KDE::"); return type; } TQString RubyCodeGenerator::cppToRubyName(const TQString &nameStr) { TQString name = cleanName(nameStr); - name.replace(TQRegExp("^m_"), ""); - name.replace(TQRegExp("^[pbn](?=[A-Z])"), ""); + name.tqreplace(TQRegExp("^m_"), ""); + name.tqreplace(TQRegExp("^[pbn](?=[A-Z])"), ""); name = name.mid(0, 1).lower() + name.mid(1); return name; } @@ -127,7 +127,7 @@ CodeDocument * RubyCodeGenerator::newClassifierCodeDocument ( UMLClassifier * c) /* These initializations are done in CodeGenFactory::createObject() void RubyCodeGenerator::initFields() { UMLApp::app()->setPolicyExt ( new RubyCodeGenerationPolicy(UMLApp::app()->getConfig()) ); - // load Classifier documents from parent document + // load Classifier documents from tqparent document initFromParentDocument(); } */ diff --git a/umbrello/umbrello/codegenerators/rubycodegenerator.h b/umbrello/umbrello/codegenerators/rubycodegenerator.h index 611338ca..4be5e7e8 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerator.h +++ b/umbrello/umbrello/codegenerators/rubycodegenerator.h @@ -36,6 +36,7 @@ class CodeViewerDialog; class RubyCodeGenerator : public CodeGenerator { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -76,7 +77,7 @@ public: /** Get the editing dialog for this code document */ - virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc, + virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc, Settings::CodeViewerState state); // Other methods @@ -97,8 +98,8 @@ public: Uml::Programming_Language getLanguage(); /** - * Convert a C++ type such as 'int' or 'QWidget' to - * ruby types Integer and Qt::Widget + * Convert a C++ type such as 'int' or 'TQWidget' to + * ruby types Integer and TQt::Widget * * @param cppType the C++ type to be converted */ diff --git a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp index 7354281b..bba8b462 100644 --- a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp +++ b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp @@ -32,8 +32,8 @@ // Constructors/Destructors // -RubyCodeOperation::RubyCodeOperation ( RubyClassifierCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment ) - : CodeOperation (doc, parent, body, comment) +RubyCodeOperation::RubyCodeOperation ( RubyClassifierCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment ) + : CodeOperation (doc, tqparent, body, comment) { // lets not go with the default comment and instead use // full-blown ruby documentation object instead @@ -85,7 +85,7 @@ void RubyCodeOperation::updateMethodDeclaration() methodName = "initialize"; } - methodName.replace(TQRegExp("operator\\s*"), ""); + methodName.tqreplace(TQRegExp("operator\\s*"), ""); methodName = methodName.mid(0, 1).lower() + methodName.mid(1); TQString paramStr = TQString(""); @@ -131,7 +131,7 @@ void RubyCodeOperation::updateMethodDeclaration() UMLAttributeList parameters = o->getParmList(); for(UMLAttributeListIt iterator(parameters); iterator.current(); ++iterator) { comment += endLine + "* _" + iterator.current()->getName() + "_ "; - comment += (' ' + iterator.current()->getDoc().replace( TQRegExp("[\\n\\r]+[\\t ]*"), + comment += (' ' + iterator.current()->getDoc().tqreplace( TQRegExp("[\\n\\r]+[\\t ]*"), endLine + " " ) ); } // add a returns statement too @@ -140,15 +140,15 @@ void RubyCodeOperation::updateMethodDeclaration() getComment()->setText(comment); } } else { - comment.replace(TQRegExp("[\\n\\r]+ *"), endLine); - comment.replace(TQRegExp("[\\n\\r]+\\t*"), endLine); + comment.tqreplace(TQRegExp("[\\n\\r]+ *"), endLine); + comment.tqreplace(TQRegExp("[\\n\\r]+\\t*"), endLine); - comment.replace(" m_", " "); - comment.replace(TQRegExp("\\s[npb](?=[A-Z])"), " "); + comment.tqreplace(" m_", " "); + comment.tqreplace(TQRegExp("\\s[npb](?=[A-Z])"), " "); TQRegExp re_params("@param (\\w)(\\w*)"); int pos = re_params.search(comment); while (pos != -1) { - comment.replace( re_params.cap(0), + comment.tqreplace( re_params.cap(0), TQString("@param _") + re_params.cap(1).lower() + re_params.cap(2) + '_' ); commentedParams.append(re_params.cap(1).lower() + re_params.cap(2)); @@ -160,28 +160,28 @@ void RubyCodeOperation::updateMethodDeclaration() for (UMLAttributeListIt iterator(parameters); iterator.current(); ++iterator) { // Only write an individual @param entry if one hasn't been found already // in the main doc comment - if (commentedParams.contains(RubyCodeGenerator::cppToRubyName(iterator.current()->getName())) == 0) { + if (commentedParams.tqcontains(RubyCodeGenerator::cppToRubyName(iterator.current()->getName())) == 0) { comment += (endLine + "@param _" + RubyCodeGenerator::cppToRubyName(iterator.current()->getName()) + '_'); if (iterator.current()->getDoc().isEmpty()) { comment += (' ' + RubyCodeGenerator::cppToRubyType(iterator.current()->getTypeName())); } else { - comment += (' ' + iterator.current()->getDoc().replace(TQRegExp("[\\n\\r]+[\\t ]*"), endLine + " ")); + comment += (' ' + iterator.current()->getDoc().tqreplace(TQRegExp("[\\n\\r]+[\\t ]*"), endLine + " ")); } } } - comment.replace("@ref ", ""); - comment.replace("@param", "*"); - comment.replace("@return", "* _returns_"); + comment.tqreplace("@ref ", ""); + comment.tqreplace("@param", "*"); + comment.tqreplace("@return", "* _returns_"); // All lines after the first one starting with '*' in the doc comment // must be indented correctly. If they aren't a list // item starting with '*', then indent the text with // two spaces, ' ', to line up with the list item. - pos = comment.find(endLine + '*'); + pos = comment.tqfind(endLine + '*'); if (pos != -1) { pos += endLine.length() + 1; - pos = comment.find(endLine, pos); + pos = comment.tqfind(endLine, pos); } while (pos > 0) { @@ -191,13 +191,13 @@ void RubyCodeOperation::updateMethodDeclaration() pos += 2; } - pos = comment.find(endLine, pos); + pos = comment.tqfind(endLine, pos); } TQString typeStr = RubyCodeGenerator::cppToRubyType(o->getTypeName()); if ( !typeStr.isEmpty() && !TQRegExp("^void\\s*$").exactMatch(typeStr) - && comment.contains("_returns_") == 0 ) + && comment.tqcontains("_returns_") == 0 ) { comment += endLine + "* _returns_ " + typeStr; } @@ -217,7 +217,7 @@ void RubyCodeOperation::updateMethodDeclaration() int RubyCodeOperation::lastEditableLine() { ClassifierCodeDocument * doc = dynamic_cast<ClassifierCodeDocument*>(getParentDocument()); - if(doc->parentIsInterface()) + if(doc->tqparentIsInterface()) return -1; // very last line is NOT editable as its a one-line declaration w/ no body in // an interface. return 0; diff --git a/umbrello/umbrello/codegenerators/rubycodeoperation.h b/umbrello/umbrello/codegenerators/rubycodeoperation.h index fab1d239..1bdc4556 100644 --- a/umbrello/umbrello/codegenerators/rubycodeoperation.h +++ b/umbrello/umbrello/codegenerators/rubycodeoperation.h @@ -28,6 +28,7 @@ class RubyClassifierCodeDocument; class RubyCodeOperation : virtual public CodeOperation { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/rubywriter.cpp b/umbrello/umbrello/codegenerators/rubywriter.cpp index 571634a5..5b193220 100644 --- a/umbrello/umbrello/codegenerators/rubywriter.cpp +++ b/umbrello/umbrello/codegenerators/rubywriter.cpp @@ -80,18 +80,18 @@ void RubyWriter::writeClass(UMLClassifier *c) { str = getHeadingFile(".rb"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"), fileName); - str.replace(TQRegExp("%filepath%"), fileh.name()); + str.tqreplace(TQRegExp("%filename%"), fileName); + str.tqreplace(TQRegExp("%filepath%"), fileh.name()); h<<str<<m_endl; } if(forceDoc() || !c->getDoc().isEmpty()) { TQString docStr = c->getDoc(); - docStr.replace(TQRegExp("\\n"), "\n# "); - docStr.replace("@ref ", ""); - docStr.replace("@see", "_See_"); - docStr.replace("@short", "_Summary_"); - docStr.replace("@author", "_Author_"); + docStr.tqreplace(TQRegExp("\\n"), "\n# "); + docStr.tqreplace("@ref ", ""); + docStr.tqreplace("@see", "_See_"); + docStr.tqreplace("@short", "_Summary_"); + docStr.tqreplace("@author", "_Author_"); h<<"#"<<m_endl; h<<"# "<<docStr<<m_endl; h<<"#"<<m_endl<<m_endl; @@ -146,24 +146,24 @@ void RubyWriter::writeClass(UMLClassifier *c) { TQString RubyWriter::cppToRubyType(const TQString &typeStr) { TQString type = cleanName(typeStr); - type.replace("const ", ""); - type.replace(TQRegExp("[*&\\s]"), ""); - type.replace(TQRegExp("[<>]"), "_"); - type.replace("TQStringList", "Array"); - type.replace("TQString", "String"); - type.replace("bool", "true|false"); - type.replace(TQRegExp("^(uint|int|ushort|short|ulong|long)$"), "Integer"); - type.replace(TQRegExp("^(float|double)$"), "Float"); - type.replace(TQRegExp("^Q(?=[A-Z])"), "Qt::"); - type.replace(TQRegExp("^K(?!(DE|Parts|IO)"), "KDE::"); + type.tqreplace("const ", ""); + type.tqreplace(TQRegExp("[*&\\s]"), ""); + type.tqreplace(TQRegExp("[<>]"), "_"); + type.tqreplace(TQSTRINGLIST_OBJECT_NAME_STRING, "Array"); + type.tqreplace(TQSTRING_OBJECT_NAME_STRING, "String"); + type.tqreplace("bool", "true|false"); + type.tqreplace(TQRegExp("^(uint|int|ushort|short|ulong|long)$"), "Integer"); + type.tqreplace(TQRegExp("^(float|double)$"), "Float"); + type.tqreplace(TQRegExp("^Q(?=[A-Z])"), "TQt::"); + type.tqreplace(TQRegExp("^K(?!(DE|Parts|IO)"), "KDE::"); return type; } TQString RubyWriter::cppToRubyName(const TQString &nameStr) { TQString name = cleanName(nameStr); - name.replace(TQRegExp("^m_"), ""); - name.replace(TQRegExp("^[pbn](?=[A-Z])"), ""); + name.tqreplace(TQRegExp("^m_"), ""); + name.tqreplace(TQRegExp("^[pbn](?=[A-Z])"), ""); name = name.mid(0, 1).lower() + name.mid(1); return name; } @@ -251,7 +251,7 @@ void RubyWriter::writeOperations(const TQString &classname, UMLOperationList &op methodName = "initialize"; } - methodName.replace("operator ", ""); + methodName.tqreplace("operator ", ""); methodName = methodName.mid(0, 1).lower() + methodName.mid(1); UMLAttributeList atl = op->getParmList(); @@ -267,15 +267,15 @@ void RubyWriter::writeOperations(const TQString &classname, UMLOperationList &op h << m_indentation << "#" << m_endl; TQString docStr = op->getDoc(); - docStr.replace(TQRegExp("[\\n\\r]+ *"), m_endl); - docStr.replace(TQRegExp("[\\n\\r]+\\t*"), m_endl); + docStr.tqreplace(TQRegExp("[\\n\\r]+ *"), m_endl); + docStr.tqreplace(TQRegExp("[\\n\\r]+\\t*"), m_endl); - docStr.replace(" m_", " "); - docStr.replace(TQRegExp("\\s[npb](?=[A-Z])"), " "); + docStr.tqreplace(" m_", " "); + docStr.tqreplace(TQRegExp("\\s[npb](?=[A-Z])"), " "); TQRegExp re_params("@param (\\w)(\\w*)"); int pos = re_params.search(docStr); while (pos != -1) { - docStr.replace( re_params.cap(0), + docStr.tqreplace( re_params.cap(0), TQString("@param _") + re_params.cap(1).lower() + re_params.cap(2) + '_' ); commentedParams.append(re_params.cap(1).lower() + re_params.cap(2)); @@ -283,31 +283,31 @@ void RubyWriter::writeOperations(const TQString &classname, UMLOperationList &op pos = re_params.search(docStr, pos); } - docStr.replace("\n", TQString("\n") + m_indentation + "# "); + docStr.tqreplace("\n", TQString("\n") + m_indentation + "# "); // Write parameter documentation for (at = atl.first(); at ; at = atl.next()) { // Only write an individual @param entry if one hasn't been found already // in the main doc comment - if (commentedParams.contains(cppToRubyName(at->getName())) == 0) { + if (commentedParams.tqcontains(cppToRubyName(at->getName())) == 0) { docStr += (m_endl + m_indentation + "# @param _" + cppToRubyName(at->getName()) + '_'); if (at->getDoc().isEmpty()) { docStr += (' ' + cppToRubyType(at->getTypeName())); } else { - docStr += (' ' + at->getDoc().replace(TQRegExp("[\\n\\r]+[\\t ]*"), m_endl + " ")); + docStr += (' ' + at->getDoc().tqreplace(TQRegExp("[\\n\\r]+[\\t ]*"), m_endl + " ")); } } } - docStr.replace("@ref ", ""); - docStr.replace("@param", "*"); - docStr.replace("@return", "* _returns_"); + docStr.tqreplace("@ref ", ""); + docStr.tqreplace("@param", "*"); + docStr.tqreplace("@return", "* _returns_"); // All lines after the first '# *' in the doc comment // must be indented correctly. If they aren't a list // item starting with '# *', then indent the text with // three spaces, '# ', to line up with the list item. - pos = docStr.find("# *"); + pos = docStr.tqfind("# *"); TQRegExp re_linestart("# (?!\\*)"); pos = re_linestart.search(docStr, pos); while (pos > 0) { @@ -320,7 +320,7 @@ void RubyWriter::writeOperations(const TQString &classname, UMLOperationList &op h << m_indentation << "# "<< docStr << m_endl; TQString typeStr = cppToRubyType(op->getTypeName()); - if (!typeStr.isEmpty() && typeStr != "void" && docStr.contains("_returns_") == 0) { + if (!typeStr.isEmpty() && typeStr != "void" && docStr.tqcontains("_returns_") == 0) { h << m_indentation << "# * _returns_ " << typeStr << m_endl; } } @@ -375,9 +375,9 @@ void RubyWriter::writeSingleAttributeAccessorMethods( TQTextStream &h) { TQString description = descr; - description.replace(TQRegExp("m_[npb](?=[A-Z])"), ""); - description.replace("m_", ""); - description.replace("\n", TQString("\n") + m_indentation + "# "); + description.tqreplace(TQRegExp("m_[npb](?=[A-Z])"), ""); + description.tqreplace("m_", ""); + description.tqreplace("\n", TQString("\n") + m_indentation + "# "); if (!description.isEmpty()) { h << m_indentation << "# " << description << m_endl; diff --git a/umbrello/umbrello/codegenerators/rubywriter.h b/umbrello/umbrello/codegenerators/rubywriter.h index c1a69775..929a7306 100644 --- a/umbrello/umbrello/codegenerators/rubywriter.h +++ b/umbrello/umbrello/codegenerators/rubywriter.h @@ -33,6 +33,7 @@ class ClassifierInfo; */ class RubyWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: RubyWriter(); @@ -56,8 +57,8 @@ public: private: /** - * Convert a C++ type such as 'int' or 'QWidget' to - * ruby types Integer and Qt::Widget + * Convert a C++ type such as 'int' or 'TQWidget' to + * ruby types Integer and TQt::Widget * * @param cppType the C++ type to be converted */ diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp index 6b7ac992..d4f62cc3 100644 --- a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp +++ b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp @@ -47,10 +47,10 @@ SimpleCodeGenerator::SimpleCodeGenerator (bool createDirHierarchyForPackages /* =true */) { m_indentLevel = 0; - UMLDoc * parentDoc = UMLApp::app()->getDocument(); - parentDoc->disconnect(this); // disconnect from UMLDoc.. we arent planning to be synced at all + UMLDoc * tqparentDoc = UMLApp::app()->getDocument(); + tqparentDoc->disconnect(this); // disconnect from UMLDoc.. we arent planning to be synced at all m_createDirHierarchyForPackages = createDirHierarchyForPackages; - initFields(parentDoc); + initFields(tqparentDoc); } SimpleCodeGenerator::~SimpleCodeGenerator ( ) { } @@ -77,7 +77,7 @@ TQString SimpleCodeGenerator::getIndent () TQString SimpleCodeGenerator::findFileName(UMLPackage* concept, const TQString &ext) { //if we already know to which file this class was written/should be written, just return it. - if (m_fileMap.contains(concept)) + if (m_fileMap.tqcontains(concept)) return m_fileMap[concept]; //else, determine the "natural" file name @@ -89,16 +89,16 @@ TQString SimpleCodeGenerator::findFileName(UMLPackage* concept, const TQString & package.simplifyWhiteSpace(); // Replace all blanks with underscore - package.replace(TQRegExp(" "), "_"); + package.tqreplace(TQRegExp(" "), "_"); // Convert all "::" to "/" : Platform-specific path separator - // package.replace(TQRegExp("::"), "/"); + // package.tqreplace(TQRegExp("::"), "/"); // if package is given add this as a directory to the file name if (!package.isEmpty() && m_createDirHierarchyForPackages) { name = package + '.' + concept->getName(); - name.replace(TQRegExp("\\."),"/"); - package.replace(TQRegExp("\\."), "/"); + name.tqreplace(TQRegExp("\\."),"/"); + package.tqreplace(TQRegExp("\\."), "/"); package = '/' + package; } else { name = concept->getFullyQualifiedName("-"); @@ -136,10 +136,10 @@ TQString SimpleCodeGenerator::findFileName(UMLPackage* concept, const TQString & name.simplifyWhiteSpace(); - name.replace(TQRegExp(" "),"_"); + name.tqreplace(TQRegExp(" "),"_"); TQString extension = ext.simplifyWhiteSpace(); - extension.replace(' ', '_'); + extension.tqreplace(' ', '_'); return overwritableName(concept, name, extension); } @@ -256,14 +256,14 @@ void SimpleCodeGenerator::writeCodeToFile ( UMLClassifierList & concepts) { this->writeClass(c); // call the writer for each class. } -void SimpleCodeGenerator::initFields ( UMLDoc * parentDoc ) { +void SimpleCodeGenerator::initFields ( UMLDoc * tqparentDoc ) { - // load Classifier documents from parent document + // load Classifier documents from tqparent document // initFromParentDocument(); m_fileMap.clear(); m_applyToAllRemaining = true; - m_doc = parentDoc; + m_doc = tqparentDoc; // this really is just being used to sync the internal params // to the codegenpolicy as there are no code documents to really sync. @@ -282,7 +282,7 @@ void SimpleCodeGenerator::syncCodeToDocument() { } -// override parent method +// override tqparent method void SimpleCodeGenerator::initFromParentDocument( ) { // Do nothing diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.h b/umbrello/umbrello/codegenerators/simplecodegenerator.h index c9d4a32d..301dc780 100644 --- a/umbrello/umbrello/codegenerators/simplecodegenerator.h +++ b/umbrello/umbrello/codegenerators/simplecodegenerator.h @@ -35,6 +35,7 @@ class UMLDoc; class SimpleCodeGenerator : public CodeGenerator { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -88,7 +89,7 @@ protected: */ TQMap<UMLPackage*,TQString> m_fileMap; - // the parent document + // the tqparent document UMLDoc *m_doc; /** @@ -104,7 +105,7 @@ protected: int m_indentLevel; TQString m_endl; - // override parent method..we need special handling + // override tqparent method..we need special handling void initFromParentDocument( ); private: diff --git a/umbrello/umbrello/codegenerators/sqlwriter.cpp b/umbrello/umbrello/codegenerators/sqlwriter.cpp index 8582ec93..d08ea1fe 100644 --- a/umbrello/umbrello/codegenerators/sqlwriter.cpp +++ b/umbrello/umbrello/codegenerators/sqlwriter.cpp @@ -30,12 +30,12 @@ #include "../association.h" #include "../attribute.h" -SQLWriter::SQLWriter() { +STQLWriter::STQLWriter() { } -SQLWriter::~SQLWriter() {} +STQLWriter::~STQLWriter() {} -void SQLWriter::writeClass(UMLClassifier *c) { +void STQLWriter::writeClass(UMLClassifier *c) { if(!c) { kDebug()<<"Cannot write class of NULL concept!" << endl; @@ -65,8 +65,8 @@ void SQLWriter::writeClass(UMLClassifier *c) { TQString str; str = getHeadingFile(".sql"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),fileName); - str.replace(TQRegExp("%filepath%"),file.name()); + str.tqreplace(TQRegExp("%filename%"),fileName); + str.tqreplace(TQRegExp("%filepath%"),file.name()); sql<<str<<m_endl; } @@ -113,7 +113,7 @@ void SQLWriter::writeClass(UMLClassifier *c) { } -void SQLWriter::writeAttributes(UMLClassifier *c, TQTextStream &sql) { +void STQLWriter::writeAttributes(UMLClassifier *c, TQTextStream &sql) { UMLAttributeList atpub, atprot, atpriv, atimp; atpub.setAutoDelete(false); atprot.setAutoDelete(false); @@ -140,7 +140,7 @@ void SQLWriter::writeAttributes(UMLClassifier *c, TQTextStream &sql) { } // now print the attributes; they are sorted by there scope - // in front of the first attribute shouldn't be a , -> so we need to find + // in front of the first attribute shouldn't be a , -> so we need to tqfind // out, when the first attribute was added bool first = true; @@ -171,7 +171,7 @@ void SQLWriter::writeAttributes(UMLClassifier *c, TQTextStream &sql) { return; } -void SQLWriter::printAttributes(TQTextStream& sql, UMLAttributeList attributeList, bool first) { +void STQLWriter::printAttributes(TQTextStream& sql, UMLAttributeList attributeList, bool first) { TQString attrDoc = ""; UMLAttribute* at; @@ -211,11 +211,11 @@ void SQLWriter::printAttributes(TQTextStream& sql, UMLAttributeList attributeLis return; } -Uml::Programming_Language SQLWriter::getLanguage() { +Uml::Programming_Language STQLWriter::getLanguage() { return Uml::pl_SQL; } -TQStringList SQLWriter::defaultDatatypes() { +TQStringList STQLWriter::defaultDatatypes() { TQStringList l; l.append("varchar"); l.append("tinyint"); @@ -244,7 +244,7 @@ TQStringList SQLWriter::defaultDatatypes() { return l; } -const TQStringList SQLWriter::reservedKeywords() const { +const TQStringList STQLWriter::reservedKeywords() const { static TQStringList keywords; diff --git a/umbrello/umbrello/codegenerators/sqlwriter.h b/umbrello/umbrello/codegenerators/sqlwriter.h index 42271af0..e4df5e2b 100644 --- a/umbrello/umbrello/codegenerators/sqlwriter.h +++ b/umbrello/umbrello/codegenerators/sqlwriter.h @@ -15,24 +15,25 @@ * * ***************************************************************************/ -#ifndef SQLWRITER_H -#define SQLWRITER_H +#ifndef STQLWRITER_H +#define STQLWRITER_H #include "simplecodegenerator.h" #include "../umlattributelist.h" /** - * class SQLWriter is a code generator for UMLClassifier objects. + * class STQLWriter is a code generator for UMLClassifier objects. * Create an instance of this class, and feed it a UMLClassifier when * calling writeClass and it will generate a sql source file for * that concept */ -class SQLWriter : public SimpleCodeGenerator { +class STQLWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: - SQLWriter(); - virtual ~SQLWriter(); + STQLWriter(); + virtual ~STQLWriter(); /** * call this method to generate sql code for a UMLClassifier @@ -74,4 +75,4 @@ private: void printAttributes(TQTextStream& sql, UMLAttributeList attributeList, bool first); }; -#endif // SQLWRITER_H +#endif // STQLWRITER_H diff --git a/umbrello/umbrello/codegenerators/tclwriter.cpp b/umbrello/umbrello/codegenerators/tclwriter.cpp index f443e8f1..913211c4 100644 --- a/umbrello/umbrello/codegenerators/tclwriter.cpp +++ b/umbrello/umbrello/codegenerators/tclwriter.cpp @@ -58,7 +58,7 @@ static const char *tclwords[] = { "llength", "load", "lrange", - "lreplace", + "ltqreplace", "method", "namespace", "private", @@ -165,8 +165,8 @@ TclWriter::writeHeaderFile(UMLClassifier * c, TQFile & fileh) // write header blurb TQString str = getHeadingFile(".tcl"); if (!str.isEmpty()) { - str.replace(TQRegExp("%filename%"), classifierInfo->fileName); - str.replace(TQRegExp("%filepath%"), fileh.name()); + str.tqreplace(TQRegExp("%filename%"), classifierInfo->fileName); + str.tqreplace(TQRegExp("%filepath%"), fileh.name()); writeCode(str); } // set current namespace @@ -337,8 +337,8 @@ TclWriter::writeSourceFile(UMLClassifier * c, TQFile & filetcl) TQString str; str = getHeadingFile(".tclbody"); if (!str.isEmpty()) { - str.replace(TQRegExp("%filename%"), classifierInfo->fileName + "body"); - str.replace(TQRegExp("%filepath%"), filetcl.name()); + str.tqreplace(TQRegExp("%filename%"), classifierInfo->fileName + "body"); + str.tqreplace(TQRegExp("%filepath%"), filetcl.name()); writeCode(str); } // Start body of class @@ -599,13 +599,13 @@ TclWriter::writeAssociationRoleDecl(const TQString &fieldClassName, const TQStri // declare the association based on whether it is this a single variable // or a List (Vector). One day this will be done correctly with special // multiplicity object that we don't have to figure out what it means via regex. - if (multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) { + if (multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) { TQString fieldVarName = roleName.lower(); // record this for later consideration of initialization IF the // multi value requires 1 of these objects - if (ObjectFieldVariables.findIndex(fieldVarName) == -1 && - multi.contains(TQRegExp("^1$")) + if (ObjectFieldVariables.tqfindIndex(fieldVarName) == -1 && + multi.tqcontains(TQRegExp("^1$")) ) { // ugh. UGLY. Storing variable name and its class in pairs. ObjectFieldVariables.append(fieldVarName); @@ -619,7 +619,7 @@ TclWriter::writeAssociationRoleDecl(const TQString &fieldClassName, const TQStri // record unique occurrences for later when we want to check // for initialization of this vector - if (VectorFieldVariables.findIndex(fieldVarName) == -1) + if (VectorFieldVariables.tqfindIndex(fieldVarName) == -1) VectorFieldVariables.append(fieldVarName); writeDocu(m_endl + "@var" + scope + " variable <" + fieldClassName + "*> " + fieldVarName + m_endl + doc); @@ -888,7 +888,7 @@ TclWriter::writeAssociationRoleSource(const TQString &fieldClassName, // declare the association based on whether it is this a single variable // or a List (Vector). One day this will be done correctly with special // multiplicity object that we don't have to figure out what it means via regex. - if (multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) { + if (multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) { TQString fieldVarName = roleName.lower(); writeCode("configbody " + mClassGlobal + "::" + fieldVarName + " {} {"); @@ -921,7 +921,7 @@ TclWriter::writeAssociationRoleSource(const TQString &fieldClassName, writeCode('}' + m_endl); } -QString +TQString TclWriter::fixTypeName(const TQString &string) { if (string.isEmpty()) @@ -930,13 +930,13 @@ TclWriter::fixTypeName(const TQString &string) } // methods like this _shouldn't_ be needed IF we properly did things thruought the code. -QString +TQString TclWriter::getUMLObjectName(UMLObject * obj) { return (obj != 0) ? obj->getName() : TQString("NULL"); } -const QStringList +const TQStringList TclWriter::reservedKeywords() const { static TQStringList keywords; diff --git a/umbrello/umbrello/codegenerators/xmlcodecomment.cpp b/umbrello/umbrello/codegenerators/xmlcodecomment.cpp index 8d3a6893..01e79399 100644 --- a/umbrello/umbrello/codegenerators/xmlcodecomment.cpp +++ b/umbrello/umbrello/codegenerators/xmlcodecomment.cpp @@ -41,7 +41,7 @@ XMLCodeComment::~XMLCodeComment ( ) { } // /** - * @return QString + * @return TQString */ TQString XMLCodeComment::toString ( ) { diff --git a/umbrello/umbrello/codegenerators/xmlcodecomment.h b/umbrello/umbrello/codegenerators/xmlcodecomment.h index e3f55ccc..688ade91 100644 --- a/umbrello/umbrello/codegenerators/xmlcodecomment.h +++ b/umbrello/umbrello/codegenerators/xmlcodecomment.h @@ -31,6 +31,7 @@ class CodeDocument; class XMLCodeComment: virtual public CodeComment { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -54,7 +55,7 @@ public: // /** - * @return QString + * @return TQString */ TQString toString ( ); diff --git a/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp b/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp index 6a068113..21dd5230 100644 --- a/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp +++ b/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp @@ -29,10 +29,10 @@ // Constructors/Destructors // -XMLElementCodeBlock::XMLElementCodeBlock ( CodeDocument * parentDoc, const TQString & nodeName, const TQString & comment) - : HierarchicalCodeBlock(parentDoc) +XMLElementCodeBlock::XMLElementCodeBlock ( CodeDocument * tqparentDoc, const TQString & nodeName, const TQString & comment) + : HierarchicalCodeBlock(tqparentDoc) { - init(parentDoc, nodeName, comment); + init(tqparentDoc, nodeName, comment); } XMLElementCodeBlock::~XMLElementCodeBlock ( ) { } @@ -150,10 +150,10 @@ void XMLElementCodeBlock::updateContent ( ) } -void XMLElementCodeBlock::init (CodeDocument *parentDoc, const TQString &nodeName, const TQString &comment) +void XMLElementCodeBlock::init (CodeDocument *tqparentDoc, const TQString &nodeName, const TQString &comment) { - setComment(new XMLCodeComment(parentDoc)); + setComment(new XMLCodeComment(tqparentDoc)); getComment()->setText(comment); m_nodeName = nodeName; diff --git a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h index 334cac17..21427df0 100644 --- a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h +++ b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h @@ -28,6 +28,7 @@ class UMLAttribute; class XMLElementCodeBlock : public HierarchicalCodeBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -36,7 +37,7 @@ public: /** * Empty Constructor */ - XMLElementCodeBlock ( CodeDocument * parentDoc, const TQString & nodeName, const TQString & comment = ""); + XMLElementCodeBlock ( CodeDocument * tqparentDoc, const TQString & nodeName, const TQString & comment = ""); /** * Empty Destructor @@ -81,7 +82,7 @@ private: UMLAttributeList m_attList; TQString m_nodeName; - void init (CodeDocument * parent, const TQString &nodeName, const TQString &comment); + void init (CodeDocument * tqparent, const TQString &nodeName, const TQString &comment); }; diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp index 8c043a3e..00753349 100644 --- a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp +++ b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp @@ -87,8 +87,8 @@ void XMLSchemaWriter::writeClass(UMLClassifier *c) // 1. create the header TQString headerText = getHeadingFile(".xsd"); if(!headerText.isEmpty()) { - headerText.replace(TQRegExp("%filename%"),fileName); - headerText.replace(TQRegExp("%filepath%"),file.name()); + headerText.tqreplace(TQRegExp("%filename%"),fileName); + headerText.tqreplace(TQRegExp("%filepath%"),file.name()); } if(!headerText.isEmpty()) XMLschema<<headerText<<m_endl; @@ -445,7 +445,7 @@ void XMLSchemaWriter::writeChildObjsInAssociation (UMLClassifier *c, } bool XMLSchemaWriter::hasBeenWritten(UMLClassifier *c) { - if (writtenClassifiers.contains(c)) + if (writtenClassifiers.tqcontains(c)) return true; else return false; @@ -529,7 +529,7 @@ void XMLSchemaWriter::writeComment( const TQString &comment, TQTextStream &XMLsc // need to resolve for using with MAC/WinDoze eventually I assume TQString indent = getIndent(); XMLschema<<indent<<"<!-- "; - if (comment.contains(TQRegExp("\n"))) { + if (comment.tqcontains(TQRegExp("\n"))) { XMLschema<<m_endl; TQStringList lines = TQStringList::split( "\n", comment); for(uint i= 0; i < lines.count(); i++) @@ -543,7 +543,7 @@ void XMLSchemaWriter::writeComment( const TQString &comment, TQTextStream &XMLsc } } -// all that matters here is roleA, the role served by the children of this class +// all that matters here is roleA, the role served by the tqchildren of this class // in any composition or aggregation association. In full associations, I have only // considered the case of "self" association, so it shouldn't matter if we use role A or // B to find the child class as long as we don't use BOTH roles. I bet this will fail @@ -673,10 +673,10 @@ void XMLSchemaWriter::writeAssociationRoleDecl( UMLClassifier *c, const TQString { // populate both with the actual value as long as our value isnt an asterix // In that case, use special value (from above) - if(values[0].contains(TQRegExp("\\d{1,}"))) + if(values[0].tqcontains(TQRegExp("\\d{1,}"))) minOccurs = values[0]; // use first number in sequence - if(values[values.count()-1].contains(TQRegExp("\\d{1,}"))) + if(values[values.count()-1].tqcontains(TQRegExp("\\d{1,}"))) maxOccurs = values[values.count()-1]; // use only last number in sequence } } @@ -690,13 +690,13 @@ void XMLSchemaWriter::writeAssociationRoleDecl( UMLClassifier *c, const TQString // class (err. node) is inherit from it with a "concrete" element. Therefore, // in this manner, we need a group node for abstract classes to lay out the child // element choices so that the child, concrete class may be plugged into whatever spot - // it parent could go. The tradeoff is that "group" nodes may not be extended, so the + // it tqparent could go. The tradeoff is that "group" nodes may not be extended, so the // choices that you lay out here are it (e.g. no more nodes may inherit" from this group) // // The flipside for concrete classes is that we want to use them as elements in our document. // Unfortunately, about all you can do with complexTypes in terms of inheritance, is to // use these as the basis for a new node type. This is NOT full inheritence because the new - // class (err. element node) wont be able to go into the document where it parent went without + // class (err. element node) wont be able to go into the document where it tqparent went without // you heavily editing the schema. // // Therefore, IF a group is abstract, but has no inheriting sub-classes, there are no choices, and its nigh @@ -736,8 +736,8 @@ void XMLSchemaWriter::writeAssociationRoleDecl( UMLClassifier *c, const TQString // Same thing again for "bool" to "boolean" TQString XMLSchemaWriter::fixTypeName(const TQString& string) { - // string.replace(TQRegExp("^string$"),schemaNamespaceTag+":string"); - // string.replace(TQRegExp("^bool$"),schemaNamespaceTag+":boolean"); + // string.tqreplace(TQRegExp("^string$"),schemaNamespaceTag+":string"); + // string.tqreplace(TQRegExp("^bool$"),schemaNamespaceTag+":boolean"); return schemaNamespaceTag + ':' + string; } diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.h b/umbrello/umbrello/codegenerators/xmlschemawriter.h index 95210078..cc4372a2 100644 --- a/umbrello/umbrello/codegenerators/xmlschemawriter.h +++ b/umbrello/umbrello/codegenerators/xmlschemawriter.h @@ -38,6 +38,7 @@ class XMLSchemaWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: /** @@ -87,7 +88,7 @@ private: /** * write a <group> declaration for this classifier. Used for interfaces to classes with - * inheriting children. + * inheriting tqchildren. */ void writeGroupClassifierDecl(UMLClassifier *c, UMLClassifierList superclassifiers, diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.cpp b/umbrello/umbrello/codegenobjectwithtextblocks.cpp index c3fb2fd6..99bbbf58 100644 --- a/umbrello/umbrello/codegenobjectwithtextblocks.cpp +++ b/umbrello/umbrello/codegenobjectwithtextblocks.cpp @@ -32,8 +32,8 @@ // Constructors/Destructors // -CodeGenObjectWithTextBlocks::CodeGenObjectWithTextBlocks ( CodeDocument *parent ) - : m_pCodeDoc(parent) +CodeGenObjectWithTextBlocks::CodeGenObjectWithTextBlocks ( CodeDocument *tqparent ) + : m_pCodeDoc(tqparent) { initFields(); } @@ -85,18 +85,18 @@ bool CodeGenObjectWithTextBlocks::addTextBlock(TextBlock* add_object ) { else { - // if it has a tag, check to see that its not in some other parent object - // IF it is then we will need to remove it FIRST before adding to new parent - CodeDocument * parentDoc = add_object->getParentDocument(); - if(parentDoc) { + // if it has a tag, check to see that its not in some other tqparent object + // IF it is then we will need to remove it FIRST before adding to new tqparent + CodeDocument * tqparentDoc = add_object->getParentDocument(); + if(tqparentDoc) { - CodeGenObjectWithTextBlocks * oldParent = parentDoc->findParentObjectForTaggedTextBlock (tag); + CodeGenObjectWithTextBlocks * oldParent = tqparentDoc->findParentObjectForTaggedTextBlock (tag); if(oldParent && oldParent != this) oldParent->removeTextBlock(add_object); } } - if(m_textBlockTagMap.contains(tag)) + if(m_textBlockTagMap.tqcontains(tag)) return false; // return false, we already have some object with this tag in the list // if we get here, then the object is a "fresh" one, we havent @@ -136,15 +136,15 @@ bool CodeGenObjectWithTextBlocks::removeTextBlock ( TextBlock * remove_object ) TextBlock * CodeGenObjectWithTextBlocks::findTextBlockByTag( const TQString &tag ) { //if we already know to which file this class was written/should be written, just return it. - if(m_textBlockTagMap.contains(tag)) + if(m_textBlockTagMap.tqcontains(tag)) return m_textBlockTagMap[tag]; return (TextBlock*) NULL; } -// IMPORTANT: this will only search for a parent from the viewpoint of this object +// IMPORTANT: this will only search for a tqparent from the viewpoint of this object // and down into its Hierarchical codeblocks. This means you should start any -// search from the parent document of the text block. This method NOT meant for +// search from the tqparent document of the text block. This method NOT meant for // casual usage. CodeGenObjectWithTextBlocks * CodeGenObjectWithTextBlocks::findParentObjectForTaggedTextBlock (const TQString & tag) { @@ -170,7 +170,7 @@ CodeGenObjectWithTextBlocks * CodeGenObjectWithTextBlocks::findParentObjectForTa return this; // shouldn't happen unless the textblock doesn't exist in this object - // or its children at all + // or its tqchildren at all return (CodeGenObjectWithTextBlocks*) NULL; } @@ -378,7 +378,7 @@ void CodeGenObjectWithTextBlocks::setAttributesFromNode ( TQDomElement & root) // in this vanilla version, we only load comments and codeblocks // as they are the only instanciatable (vanilla) things // this method should be overridden if this class is inherited -// by some other class that is concrete and takes children +// by some other class that is concrete and takes tqchildren // derived from codeblock/codecomment void CodeGenObjectWithTextBlocks::loadChildTextBlocksFromNode ( TQDomElement & root) { @@ -460,7 +460,7 @@ void CodeGenObjectWithTextBlocks::loadChildTextBlocksFromNode ( TQDomElement & r } else if( name == "codeoperation" ) { // find the code operation by id - TQString id = element.attribute("parent_id","-1"); + TQString id = element.attribute("tqparent_id","-1"); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id)); UMLOperation * op = dynamic_cast<UMLOperation*>(obj); if(op) { diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.h b/umbrello/umbrello/codegenobjectwithtextblocks.h index c21aacf2..0e522e83 100644 --- a/umbrello/umbrello/codegenobjectwithtextblocks.h +++ b/umbrello/umbrello/codegenobjectwithtextblocks.h @@ -45,7 +45,7 @@ public: /** * Constructor */ - CodeGenObjectWithTextBlocks ( CodeDocument *parent ); + CodeGenObjectWithTextBlocks ( CodeDocument *tqparent ); /** * Empty Destructor @@ -129,7 +129,7 @@ public: virtual TextBlock * findTextBlockByTag ( const TQString &tag ); /** - * @return QString + * @return TQString * @param prefix */ virtual TQString getUniqueTag (const TQString& prefix = "" ) = 0; @@ -140,9 +140,9 @@ public: virtual CodeBlockWithComments * newCodeBlockWithComments() = 0; virtual HierarchicalCodeBlock * newHierarchicalCodeBlock() = 0; - /** Find the direct parent for a given textblock. This + /** Find the direct tqparent for a given textblock. This * may be any object which holds text blocks, e.g. a CodeGenObjectWithTextBlocks. - * @return parent object. Could return null if the textblock is missing from the + * @return tqparent object. Could return null if the textblock is missing from the * branch of the document tree being examined. */ CodeGenObjectWithTextBlocks * findParentObjectForTaggedTextBlock (const TQString & tag); @@ -165,7 +165,7 @@ protected: * in this vanilla version, we only load comments and codeblocks * as they are the only instanciatable (vanilla) things * this method should be overridden if this class is inherited - * by some other class that is concrete and takes children + * by some other class that is concrete and takes tqchildren * derived from codeblock/codecomment/hierarchicalcb/ownedhiercodeblock */ virtual void loadChildTextBlocksFromNode ( TQDomElement & root); diff --git a/umbrello/umbrello/codeimport/adaimport.cpp b/umbrello/umbrello/codeimport/adaimport.cpp index 0cbd8d1c..c9325b36 100644 --- a/umbrello/umbrello/codeimport/adaimport.cpp +++ b/umbrello/umbrello/codeimport/adaimport.cpp @@ -132,7 +132,7 @@ TQString AdaImport::expand(const TQString& name) { return name; TQString result = name; TQString pfx = pfxRegExp.cap(1); - if (m_renaming.contains(pfx)) { + if (m_renaming.tqcontains(pfx)) { result.remove(pfxRegExp); result.prepend(m_renaming[pfx] + '.'); } @@ -146,7 +146,7 @@ void AdaImport::parseStems(const TQStringList& stems) { uint i = 0; while (1) { TQString filename = base + ".ads"; - if (! m_parsedFiles.contains(filename)) { + if (! m_parsedFiles.tqcontains(filename)) { // Save current m_source and m_srcIndex. TQStringList source(m_source); uint srcIndex = m_srcIndex; @@ -198,9 +198,9 @@ bool AdaImport::parseStmt() { } if (keyword == "package") { const TQString& name = advance(); - TQStringList parentPkgs = TQStringList::split(".", name.lower()); - parentPkgs.pop_back(); // exclude the current package - parseStems(parentPkgs); + TQStringList tqparentPkgs = TQStringList::split(".", name.lower()); + tqparentPkgs.pop_back(); // exclude the current package + parseStems(tqparentPkgs); UMLObject *ns = NULL; if (advance() == "is") { ns = Import_Utils::createUMLObject(Uml::ot_Package, name, @@ -324,15 +324,15 @@ bool AdaImport::parseStmt() { UMLClassifier *klass = static_cast<UMLClassifier*>(ns); TQString base = expand(advance()); UMLObject *p = Import_Utils::createUMLObject(Uml::ot_Interface, base, m_scope[m_scopeIndex]); - UMLClassifier *parent = static_cast<UMLClassifier*>(p); - Import_Utils::createGeneralization(klass, parent); + UMLClassifier *tqparent = static_cast<UMLClassifier*>(p); + Import_Utils::createGeneralization(klass, tqparent); } } else { ns->setAbstract(m_isAbstract); } m_isAbstract = false; if (isTaggedType) { - if (! m_classesDefinedInThisScope.contains(ns)) + if (! m_classesDefinedInThisScope.tqcontains(ns)) m_classesDefinedInThisScope.append(ns); } else { ns->setStereotype("record"); @@ -359,13 +359,13 @@ bool AdaImport::parseStmt() { t = (known ? known->getBaseType() : Uml::ot_Datatype); } UMLObject *ns = Import_Utils::createUMLObject(t, base, NULL); - UMLClassifier *parent = static_cast<UMLClassifier*>(ns); + UMLClassifier *tqparent = static_cast<UMLClassifier*>(ns); ns = Import_Utils::createUMLObject(t, name, m_scope[m_scopeIndex], m_comment); if (isExtension) { next = advance(); if (next == "null" || next == "record") { UMLClassifier *klass = static_cast<UMLClassifier*>(ns); - Import_Utils::createGeneralization(klass, parent); + Import_Utils::createGeneralization(klass, tqparent); if (next == "record") { // Set the m_klass for attributes. m_klass = klass; @@ -375,8 +375,8 @@ bool AdaImport::parseStmt() { TQStringList::Iterator end(baseInterfaces.end()); for (TQStringList::Iterator bi(baseInterfaces.begin()); bi != end; ++bi) { ns = Import_Utils::createUMLObject(t, *bi, m_scope[m_scopeIndex]); - parent = static_cast<UMLClassifier*>(ns); - Import_Utils::createGeneralization(klass, parent); + tqparent = static_cast<UMLClassifier*>(ns); + Import_Utils::createGeneralization(klass, tqparent); } } } @@ -478,7 +478,7 @@ bool AdaImport::parseStmt() { Uml::Object_Type t = type->getBaseType(); if ((t != Uml::ot_Interface && (t != Uml::ot_Class || type->getStereotype() == "record")) || - !m_classesDefinedInThisScope.contains(type)) { + !m_classesDefinedInThisScope.tqcontains(type)) { // Not an instance bound method - we cannot represent it. skipStmt(")"); break; diff --git a/umbrello/umbrello/codeimport/classimport.cpp b/umbrello/umbrello/codeimport/classimport.cpp index e32758dd..9a7cbae9 100644 --- a/umbrello/umbrello/codeimport/classimport.cpp +++ b/umbrello/umbrello/codeimport/classimport.cpp @@ -32,7 +32,7 @@ void ClassImport::importFiles(const TQStringList &fileList) { fileIT != fileList.end(); ++fileIT) { TQString fileName = (*fileIT); umldoc->writeToStatusBar(i18n("Importing file: %1 Progress: %2/%3"). - arg(fileName).arg(processedFilesCount).arg(fileList.size())); + tqarg(fileName).tqarg(processedFilesCount).tqarg(fileList.size())); parseFile(fileName); processedFilesCount++; } @@ -47,7 +47,7 @@ ClassImport *ClassImport::createImporterByFileExt(const TQString &filename) { classImporter = new PythonImport(); else if (filename.endsWith(".java")) classImporter = new JavaImport(); - else if (filename.contains( TQRegExp("\\.ad[sba]$") )) + else if (filename.tqcontains( TQRegExp("\\.ad[sba]$") )) classImporter = new AdaImport(); else if (filename.endsWith(".pas")) classImporter = new PascalImport(); diff --git a/umbrello/umbrello/codeimport/cppimport.cpp b/umbrello/umbrello/codeimport/cppimport.cpp index f97a5359..68d8f731 100644 --- a/umbrello/umbrello/codeimport/cppimport.cpp +++ b/umbrello/umbrello/codeimport/cppimport.cpp @@ -50,7 +50,7 @@ CppImport::CppImport() { CppImport::~CppImport() {} void CppImport::feedTheModel(const TQString& fileName) { - if (ms_seenFiles.find(fileName) != ms_seenFiles.end()) + if (ms_seenFiles.tqfind(fileName) != ms_seenFiles.end()) return; ms_seenFiles.append(fileName); TQMap<TQString, Dependence> deps = ms_driver->dependences(fileName); @@ -66,7 +66,7 @@ void CppImport::feedTheModel(const TQString& fileName) { continue; } kDebug() << fileName << ": " << includeFile << " => " << it.data().first << endl; - if (ms_seenFiles.find(includeFile) == ms_seenFiles.end()) + if (ms_seenFiles.tqfind(includeFile) == ms_seenFiles.end()) feedTheModel(includeFile); } } @@ -101,7 +101,7 @@ void CppImport::initialize() { } void CppImport::parseFile(const TQString& fileName) { - if (ms_seenFiles.find(fileName) != ms_seenFiles.end()) + if (ms_seenFiles.tqfind(fileName) != ms_seenFiles.end()) return; ms_driver->parseFile( fileName ); feedTheModel(fileName); diff --git a/umbrello/umbrello/codeimport/idlimport.cpp b/umbrello/umbrello/codeimport/idlimport.cpp index cd2db89d..36d8992f 100644 --- a/umbrello/umbrello/codeimport/idlimport.cpp +++ b/umbrello/umbrello/codeimport/idlimport.cpp @@ -84,7 +84,7 @@ void IDLImport::fillSource(const TQString& word) { } void IDLImport::parseFile(const TQString& filename) { - if (filename.contains('/')) { + if (filename.tqcontains('/')) { TQString path = filename; path.remove( TQRegExp("/[^/]+$") ); kDebug() << "IDLImport::parseFile: adding path " << path << endl; @@ -290,13 +290,13 @@ bool IDLImport::parseStmt() { // (of a member of struct or valuetype, or return type // of an operation.) Up next is the name of the attribute // or operation. - if (! keyword.contains( TQRegExp("^\\w") )) { + if (! keyword.tqcontains( TQRegExp("^\\w") )) { kError() << "importIDL: ignoring " << keyword << endl; return false; } TQString typeName = joinTypename(); TQString name = advance(); - if (name.contains( TQRegExp("\\W") )) { + if (name.tqcontains( TQRegExp("\\W") )) { kError() << "importIDL: expecting name in " << name << endl; return false; } diff --git a/umbrello/umbrello/codeimport/import_utils.cpp b/umbrello/umbrello/codeimport/import_utils.cpp index 87206ccb..249ed865 100644 --- a/umbrello/umbrello/codeimport/import_utils.cpp +++ b/umbrello/umbrello/codeimport/import_utils.cpp @@ -97,9 +97,9 @@ TQString formatComment(const TQString &comment) { lines.pop_front(); // nothing interesting on this line } TQString& last = lines.last(); - int endpos = last.find("*/"); + int endpos = last.tqfind("*/"); if (endpos != -1) { - if (last.contains(wordex)) + if (last.tqcontains(wordex)) last = last.mid(0, endpos - 1); // remove comment end else lines.pop_back(); // nothing interesting on this line @@ -126,40 +126,40 @@ UMLObject* findUMLObject(TQString name, UMLObject *createUMLObject(Uml::Object_Type type, const TQString& inName, - UMLPackage *parentPkg, + UMLPackage *tqparentPkg, const TQString& comment, const TQString& stereotype) { TQString name = inName; UMLDoc *umldoc = UMLApp::app()->getDocument(); UMLFolder *logicalView = umldoc->getRootFolder(Uml::mt_Logical); const Uml::Programming_Language pl = UMLApp::app()->getActiveLanguage(); - if (parentPkg == NULL) { + if (tqparentPkg == NULL) { // kDebug() << "Import_Utils::createUMLObject(" << name - // << "): parentPkg is NULL, assuming Logical View" << endl; - parentPkg = logicalView; + // << "): tqparentPkg is NULL, assuming Logical View" << endl; + tqparentPkg = logicalView; } - UMLObject * o = umldoc->findUMLObject(name, type, parentPkg); + UMLObject * o = umldoc->findUMLObject(name, type, tqparentPkg); bNewUMLObjectWasCreated = false; if (o == NULL) { // Strip possible adornments and look again. - int isConst = name.contains(TQRegExp("^const ")); + int isConst = name.tqcontains(TQRegExp("^const ")); name.remove(TQRegExp("^const\\s+")); TQString typeName(name); - const int isAdorned = typeName.contains( TQRegExp("[^\\w:\\. ]") ); - const int isPointer = typeName.contains('*'); - const int isRef = typeName.contains('&'); + const int isAdorned = typeName.tqcontains( TQRegExp("[^\\w:\\. ]") ); + const int isPointer = typeName.tqcontains('*'); + const int isRef = typeName.tqcontains('&'); typeName.remove(TQRegExp("[^\\w:\\. ].*$")); typeName = typeName.simplifyWhiteSpace(); - UMLObject *origType = umldoc->findUMLObject(typeName, Uml::ot_UMLObject, parentPkg); + UMLObject *origType = umldoc->findUMLObject(typeName, Uml::ot_UMLObject, tqparentPkg); if (origType == NULL) { // Still not found. Create the stripped down type. if (bPutAtGlobalScope) - parentPkg = logicalView; + tqparentPkg = logicalView; // Find, or create, the scopes. TQStringList components; - if (typeName.contains("::")) { + if (typeName.tqcontains("::")) { components = TQStringList::split("::", typeName); - } else if (typeName.contains(".")) { + } else if (typeName.tqcontains(".")) { components = TQStringList::split(".", typeName); } if (components.count() > 1) { @@ -168,24 +168,24 @@ UMLObject *createUMLObject(Uml::Object_Type type, while ( components.count() ) { TQString scopeName = components.front(); components.pop_front(); - o = umldoc->findUMLObject(scopeName, Uml::ot_UMLObject, parentPkg); + o = umldoc->findUMLObject(scopeName, Uml::ot_UMLObject, tqparentPkg); if (o) { - parentPkg = static_cast<UMLPackage*>(o); + tqparentPkg = static_cast<UMLPackage*>(o); continue; } int wantNamespace = KMessageBox::Yes; if (pl == Uml::pl_Cpp) { - /* We know std and Qt are namespaces */ - if (scopeName != "std" && scopeName != "Qt") { + /* We know std and TQt are namespaces */ + if (scopeName != "std" && scopeName != "TQt") { wantNamespace = KMessageBox::questionYesNo(NULL, - i18n("Is the scope %1 a namespace or a class?").arg(scopeName), + i18n("Is the scope %1 a namespace or a class?").tqarg(scopeName), i18n("C++ Import Requests Your Help"), i18n("Namespace"), i18n("Class")); } } Uml::Object_Type ot = (wantNamespace == KMessageBox::Yes ? Uml::ot_Package : Uml::ot_Class); - o = Object_Factory::createUMLObject(ot, scopeName, parentPkg); - parentPkg = static_cast<UMLPackage*>(o); + o = Object_Factory::createUMLObject(ot, scopeName, tqparentPkg); + tqparentPkg = static_cast<UMLPackage*>(o); UMLListView *listView = UMLApp::app()->getListView(); UMLListViewItem *lvitem = listView->findUMLObject(o); listView->setCurrentItem(lvitem); @@ -196,7 +196,7 @@ UMLObject *createUMLObject(Uml::Object_Type type, Uml::Object_Type t = type; if (type == Uml::ot_UMLObject || isAdorned) t = Uml::ot_Class; - origType = Object_Factory::createUMLObject(t, typeName, parentPkg, false); + origType = Object_Factory::createUMLObject(t, typeName, tqparentPkg, false); bNewUMLObjectWasCreated = true; bPutAtGlobalScope = false; } @@ -228,7 +228,7 @@ UMLObject *createUMLObject(Uml::Object_Type type, } else { o = origType; } - } else if (parentPkg && !bPutAtGlobalScope) { + } else if (tqparentPkg && !bPutAtGlobalScope) { UMLPackage *existingPkg = o->getUMLPackage(); if (existingPkg != umldoc->getDatatypeFolder()) { if (existingPkg) @@ -236,8 +236,8 @@ UMLObject *createUMLObject(Uml::Object_Type type, else kError() << "createUMLObject(" << name << "): " << "o->getUMLPackage() was NULL" << endl; - o->setUMLPackage(parentPkg); - parentPkg->addObject(o); + o->setUMLPackage(tqparentPkg); + tqparentPkg->addObject(o); } } TQString strippedComment = formatComment(comment); @@ -260,7 +260,7 @@ UMLObject *createUMLObject(Uml::Object_Type type, return o; TQStringList::Iterator end(params.end()); for (TQStringList::Iterator it(params.begin()); it != end; ++it) { - UMLObject *p = umldoc->findUMLObject(*it, Uml::ot_UMLObject, parentPkg); + UMLObject *p = umldoc->findUMLObject(*it, Uml::ot_UMLObject, tqparentPkg); if (p == NULL || p->getBaseType() == Uml::ot_Datatype) continue; const Uml::Association_Type at = Uml::at_Dependency; @@ -274,8 +274,8 @@ UMLObject *createUMLObject(Uml::Object_Type type, return o; } -UMLOperation* makeOperation(UMLClassifier *parent, const TQString &name) { - UMLOperation *op = Object_Factory::createOperation(parent, name); +UMLOperation* makeOperation(UMLClassifier *tqparent, const TQString &name) { + UMLOperation *op = Object_Factory::createOperation(tqparent, name); return op; } @@ -396,7 +396,7 @@ void insertMethod(UMLClassifier *klass, UMLOperation* &op, UMLAttribute* addMethodParameter(UMLOperation *method, const TQString& type, const TQString& name) { - UMLClassifier *owner = static_cast<UMLClassifier*>(method->parent()); + UMLClassifier *owner = static_cast<UMLClassifier*>(method->tqparent()); UMLObject *typeObj = owner->findTemplate(type); if (typeObj == NULL) { bPutAtGlobalScope = true; @@ -415,28 +415,28 @@ void addEnumLiteral(UMLEnum *enumType, const TQString &literal, const TQString & el->setDoc(comment); } -void createGeneralization(UMLClassifier *child, UMLClassifier *parent) { - // if the child is an interface, so is the parent. +void createGeneralization(UMLClassifier *child, UMLClassifier *tqparent) { + // if the child is an interface, so is the tqparent. if (child->isInterface()) - parent->setBaseType(Uml::ot_Interface); + tqparent->setBaseType(Uml::ot_Interface); Uml::Association_Type association = Uml::at_Generalization; - if (parent->isInterface() && !child->isInterface()) { - // if the parent is an interface, but the child is not, then + if (tqparent->isInterface() && !child->isInterface()) { + // if the tqparent is an interface, but the child is not, then // this is really realization. // association = Uml::at_Realization; } - UMLAssociation *assoc = new UMLAssociation(association, child, parent); + UMLAssociation *assoc = new UMLAssociation(association, child, tqparent); UMLDoc *umldoc = UMLApp::app()->getDocument(); assoc->setUMLPackage(umldoc->getRootFolder(Uml::mt_Logical)); umldoc->addAssociation(assoc); } -void createGeneralization(UMLClassifier *child, const TQString &parentName) { - UMLObject *parentObj = createUMLObject( Uml::ot_Class, parentName ); - UMLClassifier *parent = static_cast<UMLClassifier*>(parentObj); - createGeneralization(child, parent); +void createGeneralization(UMLClassifier *child, const TQString &tqparentName) { + UMLObject *tqparentObj = createUMLObject( Uml::ot_Class, tqparentName ); + UMLClassifier *tqparent = static_cast<UMLClassifier*>(tqparentObj); + createGeneralization(child, tqparent); } TQStringList includePathList() { @@ -449,14 +449,14 @@ TQStringList includePathList() { } void addIncludePath(const TQString& path) { - if (! incPathList.contains(path)) + if (! incPathList.tqcontains(path)) incPathList.append(path); } -bool isDatatype(const TQString& name, UMLPackage *parentPkg) { +bool isDatatype(const TQString& name, UMLPackage *tqparentPkg) { UMLDoc *umldoc = UMLApp::app()->getDocument(); - UMLObject * o = umldoc->findUMLObject(name, Uml::ot_Datatype, parentPkg); + UMLObject * o = umldoc->findUMLObject(name, Uml::ot_Datatype, tqparentPkg); return (o!=NULL); } diff --git a/umbrello/umbrello/codeimport/import_utils.h b/umbrello/umbrello/codeimport/import_utils.h index f04aa3be..965361f6 100644 --- a/umbrello/umbrello/codeimport/import_utils.h +++ b/umbrello/umbrello/codeimport/import_utils.h @@ -35,15 +35,15 @@ namespace Import_Utils { */ UMLObject* createUMLObject(Uml::Object_Type type, const TQString& name, - UMLPackage *parentPkg = NULL, - const TQString& comment = TQString::null, - const TQString& stereotype = TQString::null); + UMLPackage *tqparentPkg = NULL, + const TQString& comment = TQString(), + const TQString& stereotype = TQString()); /** * Control whether an object which is newly created by createUMLObject() * is put at the global scope. * * @param yesno When set to false, the object is created at the scope - * given by the parentPkg argument of createUMLObject(). + * given by the tqparentPkg argument of createUMLObject(). */ void putAtGlobalScope(bool yesno); @@ -68,7 +68,7 @@ namespace Import_Utils { UMLObject* insertAttribute(UMLClassifier *klass, Uml::Visibility scope, const TQString& name, const TQString& type, - const TQString& comment = TQString::null, + const TQString& comment = TQString(), bool isStatic = false); /** * Create a UMLAttribute and insert it into the document. @@ -81,14 +81,14 @@ namespace Import_Utils { bool isStatic /* =false */); /** * Create a UMLOperation. - * The reason for this method is to not generate any Qt signals. + * The reason for this method is to not generate any TQt signals. * Instead, these are generated by insertMethod(). * (If we generated a creation signal prematurely, i.e. without * the method parameters being known yet, then that would lead to * a conflict with a pre-existing parameterless method of the same * name.) */ - UMLOperation* makeOperation(UMLClassifier *parent, const TQString &name); + UMLOperation* makeOperation(UMLClassifier *tqparent, const TQString &name); /** * Insert the UMLOperation into the given classifier. @@ -112,11 +112,11 @@ namespace Import_Utils { Uml::Visibility scope, const TQString& type, bool isStatic, bool isAbstract, bool isFriend = false, bool isConstructor = false, - const TQString& comment = TQString::null); + const TQString& comment = TQString()); /** * Add an argument to a UMLOperation. - * The parentPkg arg is only used for resolving possible scope + * The tqparentPkg arg is only used for resolving possible scope * prefixes in the `type'. */ UMLAttribute* addMethodParameter(UMLOperation *method, @@ -131,15 +131,15 @@ namespace Import_Utils { /** * Create a generalization from the given child classifier to the given - * parent classifier. + * tqparent classifier. */ - void createGeneralization(UMLClassifier *child, UMLClassifier *parent); + void createGeneralization(UMLClassifier *child, UMLClassifier *tqparent); /** * Create a generalization from the existing child UMLObject to the given - * parent class name. + * tqparent class name. */ - void createGeneralization(UMLClassifier *child, const TQString &parentName); + void createGeneralization(UMLClassifier *child, const TQString &tqparentName); /** * Strip comment lines of leading whitespace and stars. @@ -168,7 +168,7 @@ namespace Import_Utils { /** * Returns true if a type is an actual Datatype */ - bool isDatatype(const TQString& name, UMLPackage *parentPkg = NULL); + bool isDatatype(const TQString& name, UMLPackage *tqparentPkg = NULL); } // end namespace Import_Utils diff --git a/umbrello/umbrello/codeimport/javaimport.cpp b/umbrello/umbrello/codeimport/javaimport.cpp index 7f62a1a9..f73f5586 100644 --- a/umbrello/umbrello/codeimport/javaimport.cpp +++ b/umbrello/umbrello/codeimport/javaimport.cpp @@ -86,7 +86,7 @@ void JavaImport::fillSource(const TQString& word) { void JavaImport::spawnImport( TQString file ) { // if the file is being parsed, don't bother // - if (s_filesAlreadyParsed.contains( file ) ) { + if (s_filesAlreadyParsed.tqcontains( file ) ) { return; } if (TQFile::exists(file)) { @@ -100,9 +100,9 @@ void JavaImport::spawnImport( TQString file ) { ///returns the UML Object if found, or null otherwise -UMLObject* findObject( TQString name, UMLPackage *parentPkg ) { +UMLObject* findObject( TQString name, UMLPackage *tqparentPkg ) { UMLDoc *umldoc = UMLApp::app()->getDocument(); - UMLObject * o = umldoc->findUMLObject(name, Uml::ot_UMLObject , parentPkg); + UMLObject * o = umldoc->findUMLObject(name, Uml::ot_UMLObject , tqparentPkg); return o; } @@ -112,7 +112,7 @@ UMLObject* JavaImport::resolveClass (TQString className) { kDebug() << "importJava trying to resolve " << className << endl; // keep track if we are dealing with an array // - bool isArray = className.contains('['); + bool isArray = className.tqcontains('['); // remove any [] so that the class itself can be resolved // TQString baseClassName = className; @@ -172,15 +172,15 @@ UMLObject* JavaImport::resolveClass (TQString className) { spawnImport( aFile ); // we need to set the package for the class that will be resolved // start at the root package - UMLPackage *parent = m_scope[0]; + UMLPackage *tqparent = m_scope[0]; UMLPackage *current = NULL; for (TQStringList::Iterator it = split.begin(); it != split.end(); ++it) { TQString name = (*it); UMLObject *ns = Import_Utils::createUMLObject(Uml::ot_Package, - name, parent); + name, tqparent); current = static_cast<UMLPackage*>(ns); - parent = current; + tqparent = current; } // for if ( isArray ) { // we have imported the type. For arrays we want to return @@ -271,7 +271,7 @@ bool JavaImport::parseStmt() { } while (1) { const TQString arg = m_source[++start]; - if (! arg.contains( TQRegExp("^[A-Za-z_]") )) { + if (! arg.tqcontains( TQRegExp("^[A-Za-z_]") )) { kDebug() << "importJava(" << name << "): cannot handle template syntax (" << arg << ")" << endl; break; @@ -292,11 +292,11 @@ bool JavaImport::parseStmt() { const TQString& baseName = advance(); // try to resolve the class we are extending, or if impossible // create a placeholder - UMLObject *parent = resolveClass( baseName ); - if ( parent ) { - Import_Utils::createGeneralization(m_klass, static_cast<UMLClassifier*>(parent)); + UMLObject *tqparent = resolveClass( baseName ); + if ( tqparent ) { + Import_Utils::createGeneralization(m_klass, static_cast<UMLClassifier*>(tqparent)); } else { - kDebug() << "importJava parentClass " << baseName + kDebug() << "importJava tqparentClass " << baseName << " is not resolveable. Creating placeholder" << endl; Import_Utils::createGeneralization(m_klass, baseName); } @@ -420,7 +420,7 @@ bool JavaImport::parseStmt() { // (of a member of class or interface, or return type // of an operation.) Up next is the name of the attribute // or operation. - if (! keyword.contains( TQRegExp("^\\w") )) { + if (! keyword.tqcontains( TQRegExp("^\\w") )) { kError() << "importJava: ignoring " << keyword << endl; return false; } @@ -441,7 +441,7 @@ bool JavaImport::parseStmt() { } else { nextToken = advance(); } - if (name.contains( TQRegExp("\\W") )) { + if (name.tqcontains( TQRegExp("\\W") )) { kError() << "importJava: expecting name in " << name << endl; return false; } diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp index e6a7e2b5..8e107ccf 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp @@ -117,7 +117,7 @@ TQString nodeTypeToString( int type ) return "Custom"; } - return TQString::null; + return TQString(); } @@ -128,7 +128,7 @@ AST::AST() m_endLine( 0 ), m_endColumn( 0 ) { #ifndef CPPPARSER_NO_CHILDREN - m_children.setAutoDelete( false ); + m_tqchildren.setAutoDelete( false ); #endif } @@ -170,14 +170,14 @@ void AST::getEndPosition( int* line, int* col ) const * col = m_endColumn; } -void AST::setParent( AST* parent ) +void AST::setParent( AST* tqparent ) { #ifndef CPPPARSER_NO_CHILDREN if( m_parent ) m_parent->removeChild( this ); #endif - m_parent = parent; + m_parent = tqparent; #ifndef CPPPARSER_NO_CHILDREN if( m_parent ) @@ -188,12 +188,12 @@ void AST::setParent( AST* parent ) #ifndef CPPPARSER_NO_CHILDREN void AST::appendChild( AST* child ) { - m_children.append( child ); + m_tqchildren.append( child ); } void AST::removeChild( AST* child ) { - m_children.remove( child ); + m_tqchildren.remove( child ); } #endif @@ -227,7 +227,7 @@ void NameAST::addClassOrNamespaceName( ClassOrNamespaceNameAST::Node& classOrNam TQString NameAST::text() const { if( !m_unqualifiedName.get() ) - return TQString::null; + return TQString(); TQString str; @@ -462,11 +462,11 @@ void ClassOrNamespaceNameAST::setTemplateArgumentList( TemplateArgumentListAST:: TQString ClassOrNamespaceNameAST::text() const { if( !m_name.get() ) - return TQString::null; + return TQString(); TQString str = m_name->text(); if( m_templateArgumentList.get() ) - str += TQString::fromLatin1("< ") + m_templateArgumentList->text() + TQString::fromLatin1(" >"); + str += TQString::tqfromLatin1("< ") + m_templateArgumentList->text() + TQString::tqfromLatin1(" >"); return str; } diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.h b/umbrello/umbrello/codeimport/kdevcppparser/ast.h index e2bd7835..0de3a2ed 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.h @@ -24,7 +24,7 @@ #include <tqstring.h> #include <tqptrlist.h> -#if defined( Q_OS_WIN32 ) || defined( Q_CC_SUN ) +#if defined( Q_OS_WIN32 ) || defined( TQ_CC_SUN ) #ifndef _THROW0 # define _THROW0() @@ -177,9 +177,9 @@ enum NodeType TQString nodeTypeToString( int type ); -#if defined(CPPPARSER_QUICK_ALLOCATOR) +#if defined(CPPPARSER_TQUICK_ALLOCATOR) -#include <quick_allocator.h> +#include <tquick_allocator.h> #define DECLARE_ALLOC(tp) \ void * operator new(std::size_t) \ @@ -222,8 +222,8 @@ public: int nodeType() const { return m_nodeType; } void setNodeType( int nodeType ) { m_nodeType = nodeType; } - AST* parent() { return m_parent; } - void setParent( AST* parent ); + AST* tqparent() { return m_parent; } + void setParent( AST* tqparent ); void setStartPosition( int line, int col ); void getStartPosition( int* line, int* col ) const; @@ -232,7 +232,7 @@ public: void getEndPosition( int* line, int* col ) const; #ifndef CPPPARSER_NO_CHILDREN - TQPtrList<AST> children() { return m_children; } + TQPtrList<AST> tqchildren() { return m_tqchildren; } void appendChild( AST* child ); void removeChild( AST* child ); #endif @@ -266,7 +266,7 @@ private: int m_endLine, m_endColumn; Slice m_slice; #ifndef CPPPARSER_NO_CHILDREN - TQPtrList<AST> m_children; + TQPtrList<AST> m_tqchildren; #endif TQString m_comment; @@ -830,7 +830,7 @@ public: class ParameterDeclarationClauseAST* parameterDeclarationClause() { return m_parameterDeclarationClause.get(); } void setParameterDeclarationClause( AUTO_PTR<class ParameterDeclarationClauseAST>& parameterDeclarationClause ); - // ### replace 'constant' with cvQualify + // ### tqreplace 'constant' with cvQualify AST* constant() { return m_constant.get(); } void setConstant( AST::Node& constant ); diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp index 45cfd8ed..ac33d165 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp @@ -35,8 +35,8 @@ AST* findNodeAt( AST* node, int line, int column ) if( (line > startLine || (line == startLine && column >= startColumn)) && (line < endLine || (line == endLine && column < endColumn)) ){ - TQPtrList<AST> children = node->children(); - TQPtrListIterator<AST> it( children ); + TQPtrList<AST> tqchildren = node->tqchildren(); + TQPtrListIterator<AST> it( tqchildren ); while( it.current() ){ AST* a = it.current(); ++it; @@ -57,8 +57,8 @@ void scopeOfNode( AST* ast, TQStringList& scope ) if( !ast ) return; - if( ast->parent() ) - scopeOfNode( ast->parent(), scope ); + if( ast->tqparent() ) + scopeOfNode( ast->tqparent(), scope ); TQString s; switch( ast->nodeType() ) @@ -66,7 +66,7 @@ void scopeOfNode( AST* ast, TQStringList& scope ) case NodeType_ClassSpecifier: if( ((ClassSpecifierAST*)ast)->name() ){ s = ((ClassSpecifierAST*)ast)->name()->text(); - s = s.isEmpty() ? TQString::fromLatin1("<unnamed>") : s; + s = s.isEmpty() ? TQString::tqfromLatin1("<unnamed>") : s; scope.push_back( s ); } break; @@ -74,7 +74,7 @@ void scopeOfNode( AST* ast, TQStringList& scope ) case NodeType_Namespace: { AST* namespaceName = ((NamespaceAST*)ast)->namespaceName(); - s = namespaceName ? namespaceName->text() : TQString::fromLatin1("<unnamed>"); + s = namespaceName ? namespaceName->text() : TQString::tqfromLatin1("<unnamed>"); scope.push_back( s ); } break; @@ -108,15 +108,15 @@ void scopeOfNode( AST* ast, TQStringList& scope ) TQString typeSpecToString( TypeSpecifierAST* typeSpec ) /// @todo remove { if( !typeSpec ) - return TQString::null; + return TQString(); - return typeSpec->text().replace( TQRegExp(" :: "), "::" ); + return typeSpec->text().tqreplace( TQRegExp(" :: "), "::" ); } TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, bool skipPtrOp ) { if( !declarator ) - return TQString::null; + return TQString(); TQString text; @@ -131,7 +131,7 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b text += scope; if( declarator->subDeclarator() ) - text += TQString::fromLatin1("(") + declaratorToString(declarator->subDeclarator()) + TQString::fromLatin1(")"); + text += TQString::tqfromLatin1("(") + declaratorToString(declarator->subDeclarator()) + TQString::tqfromLatin1(")"); if( declarator->declaratorId() ) text += declarator->declaratorId()->text(); @@ -171,6 +171,6 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b text += " const"; } - return text.replace( TQRegExp(" :: "), "::" ).simplifyWhiteSpace(); + return text.tqreplace( TQRegExp(" :: "), "::" ).simplifyWhiteSpace(); } diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h index 312a0c44..1f6209db 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h @@ -24,6 +24,6 @@ namespace KTextEditor{ class EditInterface; } AST* findNodeAt( AST* unit, int line, int column ); void scopeOfNode( AST* ast, TQStringList& ); TQString typeSpecToString( TypeSpecifierAST* typeSpec ); -TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope = TQString::null, bool skipPtrOp=false ); +TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope = TQString(), bool skipPtrOp=false ); #endif // __ast_utils_h diff --git a/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp b/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp index 5763ec5e..f8e6c475 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp @@ -150,7 +150,7 @@ void CppTree2Uml::parseTypedef( TypedefAST* ast ) */ bool isDatatype = Import_Utils::isDatatype(typeId, m_currentNamespace[m_nsCnt]); - if (type.contains('*') || isDatatype) { + if (type.tqcontains('*') || isDatatype) { UMLObject *inner = Import_Utils::createUMLObject( Uml::ot_Class, typeId, m_currentNamespace[m_nsCnt] ); @@ -300,7 +300,7 @@ void CppTree2Uml::parseFunctionDefinition( FunctionDefinitionAST* ast ) UMLOperation *m = Import_Utils::makeOperation(c, id); // if a class has no return type, it could be a constructor or // a destructor - if (d && returnType.isEmpty() && id.find("~") == -1) + if (d && returnType.isEmpty() && id.tqfind("~") == -1) isConstructor = true; parseFunctionArguments( d, m ); @@ -530,7 +530,7 @@ void CppTree2Uml::parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storag UMLOperation *m = Import_Utils::makeOperation(c, id); // if a class has no return type, it could be a constructor or // a destructor - if (d && returnType.isEmpty() && id.find("~") == -1) + if (d && returnType.isEmpty() && id.tqfind("~") == -1) isConstructor = true; parseFunctionArguments( d, m ); @@ -554,7 +554,7 @@ void CppTree2Uml::parseFunctionArguments(DeclaratorAST* declarator, TQString name; if (param->declarator()) - name = declaratorToString(param->declarator(), TQString::null, true ); + name = declaratorToString(param->declarator(), TQString(), true ); TQString tp = typeOfDeclaration( param->typeSpec(), param->declarator() ); @@ -567,7 +567,7 @@ void CppTree2Uml::parseFunctionArguments(DeclaratorAST* declarator, TQString CppTree2Uml::typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ) { if( !typeSpec || !declarator ) - return TQString::null; + return TQString(); TQString text; diff --git a/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.h b/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.h index 7248c782..b97c7ced 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.h @@ -33,21 +33,21 @@ public: virtual void parseTranslationUnit( TranslationUnitAST* ); // declarations - //virtual void parseDeclaration( DeclarationAST* ); // use parent method - //virtual void parseLinkageSpecification( LinkageSpecificationAST* ); // use parent method + //virtual void parseDeclaration( DeclarationAST* ); // use tqparent method + //virtual void parseLinkageSpecification( LinkageSpecificationAST* ); // use tqparent method virtual void parseNamespace( NamespaceAST* ); - //virtual void parseNamespaceAlias( NamespaceAliasAST* ); // use parent method - //virtual void parseUsing( UsingAST* ); // use parent method - //virtual void parseUsingDirective( UsingDirectiveAST* ); // use parent method + //virtual void parseNamespaceAlias( NamespaceAliasAST* ); // use tqparent method + //virtual void parseUsing( UsingAST* ); // use tqparent method + //virtual void parseUsingDirective( UsingDirectiveAST* ); // use tqparent method virtual void parseTypedef( TypedefAST* ); virtual void parseTemplateDeclaration( TemplateDeclarationAST* ); virtual void parseSimpleDeclaration( SimpleDeclarationAST* ); virtual void parseFunctionDefinition( FunctionDefinitionAST* ); - //virtual void parseLinkageBody( LinkageBodyAST* ); // use parent method + //virtual void parseLinkageBody( LinkageBodyAST* ); // use tqparent method virtual void parseAccessDeclaration( AccessDeclarationAST* ); // type-specifier - //virtual void parseTypeSpecifier( TypeSpecifierAST* ); // use parent method + //virtual void parseTypeSpecifier( TypeSpecifierAST* ); // use tqparent method virtual void parseClassSpecifier( ClassSpecifierAST* ); virtual void parseEnumSpecifier( EnumSpecifierAST* ); virtual void parseElaboratedTypeSpecifier( ElaboratedTypeSpecifierAST* ); diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp index 1a804c81..030f7f2b 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp @@ -100,7 +100,7 @@ void Driver::remove( const TQString & fileName ) m_problems.remove( fileName ); removeAllMacrosInFile( fileName ); - TQMap<TQString, TranslationUnitAST*>::Iterator it = m_parsedUnits.find( fileName ); + TQMap<TQString, TranslationUnitAST*>::Iterator it = m_parsedUnits.tqfind( fileName ); if( it != m_parsedUnits.end() ){ TranslationUnitAST* unit = *it; m_parsedUnits.remove( it ); @@ -120,7 +120,7 @@ void Driver::removeAllMacrosInFile( const TQString& fileName ) TranslationUnitAST::Node Driver::takeTranslationUnit( const TQString& fileName ) { - TQMap<TQString, TranslationUnitAST*>::Iterator it = m_parsedUnits.find( fileName ); + TQMap<TQString, TranslationUnitAST*>::Iterator it = m_parsedUnits.tqfind( fileName ); TranslationUnitAST::Node unit( *it ); //m_parsedUnits.remove( it ); m_parsedUnits[ fileName] = 0; @@ -129,7 +129,7 @@ TranslationUnitAST::Node Driver::takeTranslationUnit( const TQString& fileName ) TranslationUnitAST* Driver::translationUnit( const TQString& fileName ) const { - TQMap<TQString, TranslationUnitAST*>::ConstIterator it = m_parsedUnits.find( fileName ); + TQMap<TQString, TranslationUnitAST*>::ConstIterator it = m_parsedUnits.tqfind( fileName ); return it != m_parsedUnits.end() ? *it : 0; } @@ -146,7 +146,7 @@ void Driver::addDependence( const TQString & fileName, const Dependence & dep ) TQString file = findIncludeFile( dep ); findOrInsertDependenceList( fileName ).insert( file, dep ); - if ( m_parsedUnits.find(file) != m_parsedUnits.end() ) + if ( m_parsedUnits.tqfind(file) != m_parsedUnits.end() ) return; if ( !TQFile::exists( file ) ) { @@ -176,7 +176,7 @@ void Driver::addProblem( const TQString & fileName, const Problem & problem ) TQMap< TQString, Dependence >& Driver::findOrInsertDependenceList( const TQString & fileName ) { - TQMap<TQString, TQMap<TQString, Dependence> >::Iterator it = m_dependences.find( fileName ); + TQMap<TQString, TQMap<TQString, Dependence> >::Iterator it = m_dependences.tqfind( fileName ); if( it != m_dependences.end() ) return it.data(); @@ -187,7 +187,7 @@ TQMap< TQString, Dependence >& Driver::findOrInsertDependenceList( const TQStrin TQValueList < Problem >& Driver::findOrInsertProblemList( const TQString & fileName ) { - TQMap<TQString, TQValueList<Problem> >::Iterator it = m_problems.find( fileName ); + TQMap<TQString, TQValueList<Problem> >::Iterator it = m_problems.tqfind( fileName ); if( it != m_problems.end() ) return it.data(); @@ -198,7 +198,7 @@ TQValueList < Problem >& Driver::findOrInsertProblemList( const TQString & fileN TQMap< TQString, Dependence > Driver::dependences( const TQString & fileName ) const { - TQMap<TQString, TQMap<TQString, Dependence> >::ConstIterator it = m_dependences.find( fileName ); + TQMap<TQString, TQMap<TQString, Dependence> >::ConstIterator it = m_dependences.tqfind( fileName ); if( it != m_dependences.end() ) return it.data(); return TQMap<TQString, Dependence>(); @@ -211,7 +211,7 @@ TQMap< TQString, Macro > Driver::macros() const TQValueList < Problem > Driver::problems( const TQString & fileName ) const { - TQMap<TQString, TQValueList<Problem> >::ConstIterator it = m_problems.find( fileName ); + TQMap<TQString, TQValueList<Problem> >::ConstIterator it = m_problems.tqfind( fileName ); if( it != m_problems.end() ) return it.data(); return TQValueList<Problem>(); @@ -222,7 +222,7 @@ void Driver::parseFile( const TQString& fileName, bool onlyPreProcess, bool forc TQFileInfo fileInfo( fileName ); TQString absFilePath = fileInfo.absFilePath(); - TQMap<TQString, TranslationUnitAST*>::Iterator it = m_parsedUnits.find( absFilePath ); + TQMap<TQString, TranslationUnitAST*>::Iterator it = m_parsedUnits.tqfind( absFilePath ); if( force && it != m_parsedUnits.end() ){ takeTranslationUnit( absFilePath ); @@ -252,7 +252,7 @@ void Driver::parseFile( const TQString& fileName, bool onlyPreProcess, bool forc fileParsed( fileName ); } - m_currentFileName = TQString::null; + m_currentFileName = TQString(); lexer = 0; } @@ -325,26 +325,26 @@ void Driver::setupLexer( Lexer * lexer ) lexer->addSkipWord( "KDE_DEPRECATED" ); // qt - lexer->addSkipWord( "Q_OVERRIDE", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_OVERRIDE", SkipWordAndArguments ); lexer->addSkipWord( "Q_ENUMS", SkipWordAndArguments ); - lexer->addSkipWord( "Q_PROPERTY", SkipWordAndArguments ); - lexer->addSkipWord( "Q_CLASSINFO", SkipWordAndArguments ); - lexer->addSkipWord( "Q_SETS", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_PROPERTY", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_CLASSINFO", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_SETS", SkipWordAndArguments ); lexer->addSkipWord( "Q_UNUSED", SkipWordAndArguments ); - lexer->addSkipWord( "Q_CREATE_INSTANCE", SkipWordAndArguments ); - lexer->addSkipWord( "Q_DUMMY_COMPARISON_OPERATOR", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_CREATE_INSTANCE", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_DUMMY_COMPARISON_OPERATOR", SkipWordAndArguments ); lexer->addSkipWord( "ACTIVATE_SIGNAL_WITH_PARAM", SkipWordAndArguments ); - lexer->addSkipWord( "Q_INLINE_TEMPLATES" ); - lexer->addSkipWord( "Q_TEMPLATE_EXTERN" ); - lexer->addSkipWord( "Q_TYPENAME" ); - lexer->addSkipWord( "Q_REFCOUNT" ); - lexer->addSkipWord( "Q_EXPLICIT" ); - lexer->addSkipWord( "QMAC_PASCAL" ); + lexer->addSkipWord( "TQ_INLINE_TEMPLATES" ); + lexer->addSkipWord( "TQ_TEMPLATE_EXTERN" ); + lexer->addSkipWord( "TQ_TYPENAME" ); + lexer->addSkipWord( "TQ_REFCOUNT" ); + lexer->addSkipWord( "TQ_EXPLICIT" ); + lexer->addSkipWord( "TQMAC_PASCAL" ); lexer->addSkipWord( "QT_STATIC_CONST" ); lexer->addSkipWord( "QT_STATIC_CONST_IMPL" ); - lexer->addSkipWord( "QT_WIN_PAINTER_MEMBERS" ); - lexer->addSkipWord( "QT_NC_MSGBOX" ); - lexer->addSkipWord( "Q_VARIANT_AS", SkipWordAndArguments ); + lexer->addSkipWord( "TQT_WIN_PAINTER_MEMBERS" ); + lexer->addSkipWord( "TQT_NC_MSGBOX" ); + lexer->addSkipWord( "TQ_VARIANT_AS", SkipWordAndArguments ); lexer->addSkipWord( "CALLBACK_CALL_TYPE" ); // flex @@ -415,7 +415,7 @@ TQString Driver::findIncludeFile( const Dependence& dep ) const return fileInfo.absFilePath(); } - return TQString::null; + return TQString(); } void Driver::setResolveDependencesEnabled( bool enabled ) diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.h b/umbrello/umbrello/codeimport/kdevcppparser/driver.h index 6c53a939..5a300745 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/driver.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/driver.h @@ -81,7 +81,7 @@ enum Dep_Local }; -typedef QPair<TQString, int> Dependence; +typedef TQPair<TQString, int> Dependence; class Macro { @@ -185,7 +185,7 @@ public: TQMap<TQString, Macro> macros() const; TQValueList<Problem> problems( const TQString& fileName ) const; - bool hasMacro( const TQString& name ) const { return m_macros.contains( name ); } + bool hasMacro( const TQString& name ) const { return m_macros.tqcontains( name ); } const Macro& macro( const TQString& name ) const { return m_macros[ name ]; } Macro& macro( const TQString& name ) { return m_macros[ name ]; } diff --git a/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h b/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h index 5c276953..1969fdb7 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h @@ -15,7 +15,7 @@ static const struct HashEntry keywordEntries[] = { { "k_dcop_signals", Token_k_dcop_signals, 0, 0, &keywordEntries[104] }, { "auto", Token_auto, 0, 0, &keywordEntries[91] }, { 0, 0, 0, 0, 0 }, - { "Q_OBJECT", Token_Q_OBJECT, 0, 0, &keywordEntries[86] }, + { "TQ_OBJECT", Token_TQ_OBJECT, 0, 0, &keywordEntries[86] }, { "and_eq", Token_and_eq, 0, 0, 0 }, { 0, 0, 0, 0, 0 }, { "operator", Token_operator, 0, 0, 0 }, diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp index 11b326f6..270c3d87 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp @@ -31,7 +31,7 @@ #if defined( KDEVELOP_BGPARSER ) #include <tqthread.h> -class KDevTread: public QThread +class KDevTread: public TQThread { public: static void yield() @@ -83,7 +83,7 @@ struct LexerData const Scope& scope = *it; ++it; - if( scope.contains(name) ) + if( scope.tqcontains(name) ) return true; } @@ -97,11 +97,11 @@ struct LexerData const Scope& scope = *it; ++it; - if( scope.contains(name) ) + if( scope.tqcontains(name) ) return scope[ name ]; } - return TQString::null; + return TQString(); } }; @@ -143,7 +143,7 @@ void Lexer::reset() m_index = 0; m_size = 0; m_tokens.clear(); - m_source = TQString::null; + m_source = TQString(); m_ptr = 0; m_endPtr = 0; m_startLine = false; @@ -175,7 +175,7 @@ int Lexer::toInt( const Token& token ) int i = s[0] == 'L' ? 2 : 1; // wide char ? if( s[i] == '\\' ){ // escaped char - int c = s[i+1].unicode(); + int c = s[i+1].tqunicode(); switch( c ) { case '0': return 0; @@ -186,7 +186,7 @@ int Lexer::toInt( const Token& token ) return c; } } else { - return s[i].unicode(); + return s[i].tqunicode(); } } else { return 0; @@ -273,7 +273,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) int start = currentPosition(); readIdentifier(); TQString ide = m_source.mid( start, currentPosition() - start ); - int k = Lookup::find( &keyword, ide ); + int k = Lookup::tqfind( &keyword, ide ); if( m_preprocessorEnabled && m_driver->hasMacro(ide) && (k == -1 || !m_driver->macro(ide).body().isEmpty()) ){ @@ -374,21 +374,21 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) TQString tokText = tok.text(); TQString str = (tok == Token_identifier && d->hasBind(tokText)) ? d->apply( tokText ) : tokText; if( str == ide ){ - //Problem p( i18n("unsafe use of macro '%1'").arg(ide), m_currentLine, m_currentColumn ); + //Problem p( i18n("unsafe use of macro '%1'").tqarg(ide), m_currentLine, m_currentColumn ); //m_driver->addProblem( m_driver->currentFileName(), p ); m_driver->removeMacro( ide ); - // str = TQString::null; + // str = TQString(); } if( stringify ) { - textToInsert.append( TQString::fromLatin1("\"") + str + TQString::fromLatin1("\" ") ); + textToInsert.append( TQString::tqfromLatin1("\"") + str + TQString::tqfromLatin1("\" ") ); } else if( merge ){ textToInsert.truncate( textToInsert.length() - 1 ); textToInsert.append( str ); } else if( tok == Token_ellipsis && d->hasBind("...") ){ textToInsert.append( ellipsisArg ); } else { - textToInsert.append( str + TQString::fromLatin1(" ") ); + textToInsert.append( str + TQString::tqfromLatin1(" ") ); } } @@ -408,7 +408,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) tk.setStartPosition( startLine, startColumn ); tk.setEndPosition( m_currentLine, m_currentColumn ); } else if( m_skipWordsEnabled ){ - TQMap< TQString, QPair<SkipType, TQString> >::Iterator pos = m_words.find( ide ); + TQMap< TQString, TQPair<SkipType, TQString> >::Iterator pos = m_words.tqfind( ide ); if( pos != m_words.end() ){ if( (*pos).first == SkipWordAndArguments ){ readWhiteSpaces(); @@ -424,9 +424,9 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) } } else if( /*qt_rx.exactMatch(ide) ||*/ ide.endsWith("EXPORT") || - (ide.startsWith("Q_EXPORT") && ide != "Q_EXPORT_INTERFACE") || - ide.startsWith("QM_EXPORT") || - ide.startsWith("QM_TEMPLATE")){ + (ide.startsWith("TQ_EXPORT") && ide != "TQ_EXPORT_INTERFACE") || + ide.startsWith("TQM_EXPORT") || + ide.startsWith("TQM_TEMPLATE")){ readWhiteSpaces(); if( currentChar() == '(' ) @@ -465,7 +465,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) tk.setStartPosition( startLine, startColumn ); tk.setEndPosition( m_currentLine, m_currentColumn ); } else { - tk = CREATE_TOKEN( ch.unicode(), currentPosition(), 1 ); + tk = CREATE_TOKEN( ch.tqunicode(), currentPosition(), 1 ); nextChar(); tk.setStartPosition( startLine, startColumn ); tk.setEndPosition( m_currentLine, m_currentColumn ); @@ -504,7 +504,7 @@ void Lexer::resetSkipWords() void Lexer::addSkipWord( const TQString& word, SkipType skipType, const TQString& str ) { - m_words[ word ] = qMakePair( skipType, str ); + m_words[ word ] = tqMakePair( skipType, str ); } void Lexer::skip( int l, int r ) @@ -808,7 +808,7 @@ int Lexer::macroPrimary() { readWhiteSpaces( false ); int result = 0; - switch( currentChar().unicode() ) { + switch( currentChar().tqunicode() ) { case '(': nextChar(); result = macroExpression(); @@ -996,7 +996,7 @@ int Lexer::macroExpression() } // *IMPORTANT* -// please, don't include lexer.moc here, because Lexer isn't a TQObject class!! +// please, don't include lexer.tqmoc here, because Lexer isn't a TQObject class!! // if you have problem while recompiling try to remove cppsupport/.deps, // cppsupport/Makefile.in and rerun automake/autoconf diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.h b/umbrello/umbrello/codeimport/kdevcppparser/lexer.h index 4851c183..541626d4 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.h @@ -56,7 +56,7 @@ enum Type { Token_k_dcop, Token_k_dcop_signals, - Token_Q_OBJECT, + Token_TQ_OBJECT, Token_signals, Token_slots, Token_emit, @@ -212,7 +212,7 @@ public: void setPreprocessorEnabled( bool enabled ); void resetSkipWords(); - void addSkipWord( const TQString& word, SkipType skipType=SkipWord, const TQString& str = TQString::null ); + void addSkipWord( const TQString& word, SkipType skipType=SkipWord, const TQString& str = TQString() ); TQString source() const; void setSource( const TQString& source ); @@ -296,7 +296,7 @@ private: bool m_recordComments; bool m_recordWhiteSpaces; bool m_startLine; - TQMap< TQString, QPair<SkipType, TQString> > m_words; + TQMap< TQString, TQPair<SkipType, TQString> > m_words; int m_currentLine; int m_currentColumn; @@ -485,12 +485,12 @@ inline const Token& Lexer::nextToken() inline const Token& Lexer::tokenAt( int n ) const { - return *m_tokens[ QMIN(n, m_size-1) ]; + return *m_tokens[ TQMIN(n, m_size-1) ]; } inline const Token& Lexer::lookAhead( int n ) const { - return *m_tokens[ QMIN(m_index + n, m_size-1) ]; + return *m_tokens[ TQMIN(m_index + n, m_size-1) ]; } inline int Lexer::tokenPosition( const Token& token ) const diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp index f46b9270..fad6627a 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp @@ -71,10 +71,10 @@ const HashEntry* Lookup::findEntry( const struct HashTable *table, const HashEntry* Lookup::findEntry( const struct HashTable *table, const TQString &s ) { - return findEntry( table, s.unicode(), s.length() ); + return findEntry( table, s.tqunicode(), s.length() ); } -int Lookup::find(const struct HashTable *table, +int Lookup::tqfind(const struct HashTable *table, const TQChar *c, unsigned int len) { const HashEntry *entry = findEntry( table, c, len ); @@ -83,9 +83,9 @@ int Lookup::find(const struct HashTable *table, return -1; } -int Lookup::find(const struct HashTable *table, const TQString &s) +int Lookup::tqfind(const struct HashTable *table, const TQString &s) { - return find(table, s.unicode(), s.length()); + return tqfind(table, s.tqunicode(), s.length()); } unsigned int Lookup::hash(const TQChar *c, unsigned int len) @@ -100,7 +100,7 @@ unsigned int Lookup::hash(const TQChar *c, unsigned int len) unsigned int Lookup::hash(const TQString &key) { - return hash(key.unicode(), key.length()); + return hash(key.tqunicode(), key.length()); } unsigned int Lookup::hash(const char *s) diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.h b/umbrello/umbrello/codeimport/kdevcppparser/lookup.h index b2bad4de..c8a07dab 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.h @@ -95,8 +95,8 @@ /** * Find an entry in the table, and return its value (i.e. the value field of HashEntry) */ - static int find(const struct HashTable *table, const TQString& s); - static int find(const struct HashTable *table, const TQChar *c, unsigned int len); + static int tqfind(const struct HashTable *table, const TQString& s); + static int tqfind(const struct HashTable *table, const TQChar *c, unsigned int len); /** * Find an entry in the table, and return the entry diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp index 9b93384c..89b0852a 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp @@ -37,7 +37,7 @@ using namespace std; { \ const Token& token = lex->lookAhead( 0 ); \ if( token != tk ){ \ - reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \ + reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \ return false; \ } \ lex->nextToken(); \ @@ -47,7 +47,7 @@ using namespace std; { \ const Token& token = lex->lookAhead( 0 ); \ if( token != tk ){ \ - reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \ + reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \ } \ else \ lex->nextToken(); \ @@ -137,7 +137,7 @@ bool Parser::reportError( const Error& err ) if( s.isEmpty() ) s = i18n( "<eof>" ); - m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.arg(s), line, col) ); + m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.tqarg(s), line, col) ); } return true; @@ -213,8 +213,8 @@ bool Parser::skipUntilDeclaration() case Token_public: case Token_protected: case Token_private: - case Token_signals: // Qt - case Token_slots: // Qt + case Token_signals: // TQt + case Token_slots: // TQt return true; case '}': @@ -316,7 +316,7 @@ bool Parser::skipCommaExpression( AST::Node& node ) TQString comment; while( lex->lookAhead(0) == ',' ){ - comment = TQString::null; + comment = TQString(); advanceAndCheckTrailingComment( comment ); if( !skipExpression(expr) ){ @@ -832,7 +832,7 @@ bool Parser::parseTemplateArgumentList( TemplateArgumentListAST::Node& node, boo TQString comment; while( lex->lookAhead(0) == ',' ){ - comment = TQString::null; + comment = TQString(); advanceAndCheckTrailingComment( comment ); if( !parseTemplateArgument(templArg) ){ @@ -1474,7 +1474,7 @@ bool Parser::parseTemplateParameterList( TemplateParameterListAST::Node& node ) TQString comment; while( lex->lookAhead(0) == ',' ){ - comment = TQString::null; + comment = TQString(); advanceAndCheckTrailingComment( comment ); if( !parseTemplateParameter(param) ){ @@ -1779,7 +1779,7 @@ bool Parser::parseParameterDeclarationList( ParameterDeclarationListAST::Node& n TQString comment; while( lex->lookAhead(0) == ',' ){ - comment = TQString::null; + comment = TQString(); advanceAndCheckTrailingComment( comment ); if( lex->lookAhead(0) == Token_ellipsis ) @@ -1980,7 +1980,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node ) if ( !comment.isEmpty() ) node->setComment( comment ); return true; - } else if( lex->lookAhead(0) == Token_Q_OBJECT || lex->lookAhead(0) == Token_K_DCOP ){ + } else if( lex->lookAhead(0) == Token_TQ_OBJECT || lex->lookAhead(0) == Token_K_DCOP ){ lex->nextToken(); return true; } else if( lex->lookAhead(0) == Token_signals || lex->lookAhead(0) == Token_k_dcop || lex->lookAhead(0) == Token_k_dcop_signals ){ @@ -2228,7 +2228,7 @@ bool Parser::parseBaseClause( BaseClauseAST::Node& node ) TQString comment; while( lex->lookAhead(0) == ',' ){ - comment = TQString::null; + comment = TQString(); advanceAndCheckTrailingComment( comment ); if( !parseBaseSpecifier(baseSpec) ){ @@ -2282,7 +2282,7 @@ bool Parser::parseMemInitializerList( AST::Node& /*node*/ ) TQString comment; while( lex->lookAhead(0) == ',' ){ - comment = TQString::null; + comment = TQString(); advanceAndCheckTrailingComment( comment ); if( parseMemInitializer(init) ){ @@ -2327,7 +2327,7 @@ bool Parser::parseTypeIdList( GroupAST::Node& node ) TQString comment; while( lex->lookAhead(0) == ',' ){ - comment = TQString::null; + comment = TQString(); advanceAndCheckTrailingComment( comment ); if( parseTypeId(typeId) ){ if (!comment.isEmpty()) @@ -3904,7 +3904,7 @@ bool Parser::parseCommaExpression( AST::Node& node ) TQString comment; while( lex->lookAhead(0) == ',' ){ - comment = TQString::null; + comment = TQString(); advanceAndCheckTrailingComment( comment ); if( !parseAssignmentExpression(expr) ) @@ -4110,7 +4110,7 @@ bool Parser::parseIdentifierList( GroupAST::Node & node ) TQString comment; while( lex->lookAhead(0) == ',' ){ - comment = TQString::null; + comment = TQString(); advanceAndCheckTrailingComment( comment ); if( lex->lookAhead(0) == Token_identifier ){ AST_FROM_TOKEN( tk, lex->index() ); diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp index 5235bc3c..5cd28356 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp @@ -40,42 +40,42 @@ /////////////////////////////////////////////////////////////////////////////// TQString URLUtil::filename(const TQString & name) { - int slashPos = name.findRev("/"); + int slashPos = name.tqfindRev("/"); return slashPos<0 ? name : name.mid(slashPos+1); } /////////////////////////////////////////////////////////////////////////////// TQString URLUtil::directory(const TQString & name) { - int slashPos = name.findRev("/"); + int slashPos = name.tqfindRev("/"); return slashPos<0 ? TQString("") : name.left(slashPos); } /////////////////////////////////////////////////////////////////////////////// -TQString URLUtil::relativePath(const KURL & parent, const KURL & child, uint slashPolicy) { +TQString URLUtil::relativePath(const KURL & tqparent, const KURL & child, uint slashPolicy) { bool slashPrefix = slashPolicy & SLASH_PREFIX; bool slashSuffix = slashPolicy & SLASH_SUFFIX; - if (parent == child) + if (tqparent == child) return slashPrefix ? TQString("/") : TQString(""); - if (!parent.isParentOf(child)) return TQString(); + if (!tqparent.isParentOf(child)) return TQString(); int a=slashPrefix ? -1 : 1; int b=slashSuffix ? 1 : -1; - return child.path(b).mid(parent.path(a).length()); + return child.path(b).mid(tqparent.path(a).length()); } /////////////////////////////////////////////////////////////////////////////// -TQString URLUtil::relativePath(const TQString & parent, const TQString & child, uint slashPolicy) { - return relativePath(KURL(parent), KURL(child), slashPolicy); +TQString URLUtil::relativePath(const TQString & tqparent, const TQString & child, uint slashPolicy) { + return relativePath(KURL(tqparent), KURL(child), slashPolicy); } /////////////////////////////////////////////////////////////////////////////// TQString URLUtil::upDir(const TQString & path, bool slashSuffix) { - int slashPos = path.findRev("/"); - if (slashPos<1) return TQString::null; + int slashPos = path.tqfindRev("/"); + if (slashPos<1) return TQString(); return path.mid(0,slashPos+ (slashSuffix ? 1 : 0) ); } @@ -103,7 +103,7 @@ KURL URLUtil::mergeURL(const KURL & source, const KURL & dest, const KURL & chil /////////////////////////////////////////////////////////////////////////////// TQString URLUtil::getExtension(const TQString & path) { - int dotPos = path.findRev('.'); + int dotPos = path.tqfindRev('.'); if (dotPos<0) return TQString(""); return path.mid(dotPos+1); } @@ -114,7 +114,7 @@ TQString URLUtil::extractPathNameRelative(const KURL &baseDirUrl, const KURL &ur { TQString absBase = extractPathNameAbsolute( baseDirUrl ), absRef = extractPathNameAbsolute( url ); - int i = absRef.find( absBase, 0, true ); + int i = absRef.tqfind( absBase, 0, true ); if (i == -1) return TQString(); @@ -122,7 +122,7 @@ TQString URLUtil::extractPathNameRelative(const KURL &baseDirUrl, const KURL &ur if (absRef == absBase) return TQString( "." ); else - return absRef.replace( 0, absBase.length(), TQString() ); + return absRef.tqreplace( 0, absBase.length(), TQString() ); } /////////////////////////////////////////////////////////////////////////////// @@ -289,12 +289,12 @@ TQString URLUtil::envExpand ( const TQString& str ) if (len > 1 && str[0] == '$') { - int pos = str.find ('/'); + int pos = str.tqfind ('/'); if (pos < 0) pos = len; - char* ret = getenv( TQConstString(str.unicode()+1, pos-1).string().local8Bit().data() ); + char* ret = getenv( TQConstString(str.tqunicode()+1, pos-1).string().local8Bit().data() ); if (ret) { diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h index 75486983..d243ddbd 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h @@ -38,13 +38,13 @@ namespace URLUtil */ TQString directory(const TQString & pathName); /** - * Returns the relative path between a parent and child URL, or blank if the specified child is not a child of parent + * Returns the relative path between a tqparent and child URL, or blank if the specified child is not a child of tqparent */ - TQString relativePath(const KURL & parent, const KURL & child, uint slashPolicy = SLASH_PREFIX); + TQString relativePath(const KURL & tqparent, const KURL & child, uint slashPolicy = SLASH_PREFIX); /** - * Returns the relative path between a parent and child URL, or blank if the specified child is not a child of parent + * Returns the relative path between a tqparent and child URL, or blank if the specified child is not a child of tqparent */ - TQString relativePath(const TQString & parent, const TQString & child, uint slashPolicy = SLASH_PREFIX); + TQString relativePath(const TQString & tqparent, const TQString & child, uint slashPolicy = SLASH_PREFIX); /** * Returns the relative path between a directory and file. Should never return empty path. * Example: @@ -110,7 +110,7 @@ namespace URLUtil * Will dump the list of KURL @p urls on standard output, eventually printing @ aMessage if it * is not null. */ - void dump( const KURL::List &urls, const TQString &aMessage = TQString::null ); + void dump( const KURL::List &urls, const TQString &aMessage = TQString() ); /** * Same as TQDir::canonicalPath in later versions of QT. Earlier versions of QT diff --git a/umbrello/umbrello/codeimport/nativeimportbase.cpp b/umbrello/umbrello/codeimport/nativeimportbase.cpp index b2f7dac3..925e397a 100644 --- a/umbrello/umbrello/codeimport/nativeimportbase.cpp +++ b/umbrello/umbrello/codeimport/nativeimportbase.cpp @@ -113,10 +113,10 @@ bool NativeImportBase::preprocess(TQString& line) { // Check for end of multi line comment. if (m_inComment) { int delimiterLen = 0; - int pos = line.find(m_multiLineCommentEnd); + int pos = line.tqfind(m_multiLineCommentEnd); if (pos == -1) { if (! m_multiLineAltCommentEnd.isEmpty()) - pos = line.find(m_multiLineAltCommentEnd); + pos = line.tqfind(m_multiLineAltCommentEnd); if (pos == -1) { m_comment += line + "\n"; return true; // done @@ -142,20 +142,20 @@ bool NativeImportBase::preprocess(TQString& line) { // Check for start of multi line comment. int delimIntroLen = 0; int delimEndLen = 0; - int pos = line.find(m_multiLineCommentIntro); + int pos = line.tqfind(m_multiLineCommentIntro); if (pos != -1) { delimIntroLen = m_multiLineCommentIntro.length(); } else if (!m_multiLineAltCommentIntro.isEmpty()) { - pos = line.find(m_multiLineAltCommentIntro); + pos = line.tqfind(m_multiLineAltCommentIntro); if (pos != -1) delimIntroLen = m_multiLineAltCommentIntro.length(); } if (pos != -1) { - int endpos = line.find(m_multiLineCommentEnd); + int endpos = line.tqfind(m_multiLineCommentEnd); if (endpos != -1) { delimEndLen = m_multiLineCommentEnd.length(); } else if (!m_multiLineAltCommentEnd.isEmpty()) { - endpos = line.find(m_multiLineAltCommentEnd); + endpos = line.tqfind(m_multiLineAltCommentEnd); if (endpos != -1) delimEndLen = m_multiLineAltCommentEnd.length(); } @@ -237,7 +237,7 @@ void NativeImportBase::scan(TQString line) { if (preprocess(line)) return; // Check for single line comment. - int pos = line.find(m_singleLineCommentIntro); + int pos = line.tqfind(m_singleLineCommentIntro); if (pos != -1) { TQString cmnt = line.mid(pos); m_source.append(cmnt); @@ -245,7 +245,7 @@ void NativeImportBase::scan(TQString line) { return; line = line.left(pos); } - if (line.contains(TQRegExp("^\\s*$"))) + if (line.tqcontains(TQRegExp("^\\s*$"))) return; TQStringList words = split(line); for (TQStringList::Iterator it = words.begin(); it != words.end(); ++it) { @@ -263,12 +263,12 @@ void NativeImportBase::initVars() { void NativeImportBase::parseFile(const TQString& filename) { TQString nameWithoutPath = filename; nameWithoutPath.remove(TQRegExp("^.*/")); - if (m_parsedFiles.contains(nameWithoutPath)) + if (m_parsedFiles.tqcontains(nameWithoutPath)) return; m_parsedFiles.append(nameWithoutPath); TQString fname = filename; const TQString msgPrefix = "NativeImportBase::parseFile(" + filename + "): "; - if (filename.contains('/')) { + if (filename.tqcontains('/')) { TQString path = filename; path.remove( TQRegExp("/[^/]+$") ); kDebug() << msgPrefix << "adding path " << path << endl; diff --git a/umbrello/umbrello/codeimport/nativeimportbase.h b/umbrello/umbrello/codeimport/nativeimportbase.h index 03a78a5c..292fd5d1 100644 --- a/umbrello/umbrello/codeimport/nativeimportbase.h +++ b/umbrello/umbrello/codeimport/nativeimportbase.h @@ -153,7 +153,7 @@ protected: /** * Advance m_srcIndex until m_source[m_srcIndex] contains a non-comment. * Comments encountered during advancement are accumulated in `m_comment'. - * If m_srcIndex hits the end of m_source then TQString::null is returned. + * If m_srcIndex hits the end of m_source then TQString() is returned. */ TQString advance(); diff --git a/umbrello/umbrello/codeimport/pascalimport.cpp b/umbrello/umbrello/codeimport/pascalimport.cpp index a769571d..f2358735 100644 --- a/umbrello/umbrello/codeimport/pascalimport.cpp +++ b/umbrello/umbrello/codeimport/pascalimport.cpp @@ -104,7 +104,7 @@ bool PascalImport::parseStmt() { continue; } TQString filename = unit + ".pas"; - if (! m_parsedFiles.contains(unit)) { + if (! m_parsedFiles.tqcontains(unit)) { // Save current m_source and m_srcIndex. TQStringList source(m_source); uint srcIndex = m_srcIndex; @@ -332,9 +332,9 @@ bool PascalImport::parseStmt() { do { TQString base = advance(); UMLObject *ns = Import_Utils::createUMLObject(Uml::ot_Class, base, NULL); - UMLClassifier *parent = static_cast<UMLClassifier*>(ns); + UMLClassifier *tqparent = static_cast<UMLClassifier*>(ns); m_comment = TQString(); - Import_Utils::createGeneralization(klass, parent); + Import_Utils::createGeneralization(klass, tqparent); } while (advance() == ","); if (m_source[m_srcIndex] != ")") { kError() << "PascalImport: expecting \")\" at " diff --git a/umbrello/umbrello/codeimport/pythonimport.cpp b/umbrello/umbrello/codeimport/pythonimport.cpp index 2436699a..cf7c0dae 100644 --- a/umbrello/umbrello/codeimport/pythonimport.cpp +++ b/umbrello/umbrello/codeimport/pythonimport.cpp @@ -45,7 +45,7 @@ bool PythonImport::preprocess(TQString& line) { if (NativeImportBase::preprocess(line)) return true; // Handle single line comment - int pos = line.find(m_singleLineCommentIntro); + int pos = line.tqfind(m_singleLineCommentIntro); if (pos != -1) { TQString cmnt = line.mid(pos); m_source.append(cmnt); @@ -56,11 +56,11 @@ bool PythonImport::preprocess(TQString& line) { line.remove( TQRegExp("\\s+$") ); } // Transform changes in indentation into braces a la C++/Java/Perl/... - pos = line.find( TQRegExp("\\S") ); + pos = line.tqfind( TQRegExp("\\S") ); if (pos == -1) return true; bool isContinuation = false; - int leadingWhite = line.left(pos).contains( TQRegExp("\\s") ); + int leadingWhite = line.left(pos).tqcontains( TQRegExp("\\s") ); if (leadingWhite > m_srcIndent[m_srcIndentIndex]) { if (m_srcIndex == 0) { kError() << "PythonImport::preprocess(): internal error 1" << endl; @@ -80,7 +80,7 @@ bool PythonImport::preprocess(TQString& line) { } } if (line.endsWith(":")) { - line.replace( TQRegExp(":$"), "{" ); + line.tqreplace( TQRegExp(":$"), "{" ); m_braceWasOpened = true; } else { m_braceWasOpened = false; diff --git a/umbrello/umbrello/codeimport/pythonimport.h b/umbrello/umbrello/codeimport/pythonimport.h index d5c62a91..41de3c01 100644 --- a/umbrello/umbrello/codeimport/pythonimport.h +++ b/umbrello/umbrello/codeimport/pythonimport.h @@ -62,7 +62,7 @@ protected: int m_srcIndent[100]; /** - * Index for m_srcIndent[]. Index 0 is reserved and contains 0. + * Index for m_srcIndent[]. Index 0 is reserved and tqcontains 0. */ int m_srcIndentIndex; diff --git a/umbrello/umbrello/codemethodblock.cpp b/umbrello/umbrello/codemethodblock.cpp index c5fc22be..d4a3acc3 100644 --- a/umbrello/umbrello/codemethodblock.cpp +++ b/umbrello/umbrello/codemethodblock.cpp @@ -22,8 +22,8 @@ // Constructors/Destructors // -CodeMethodBlock::CodeMethodBlock ( ClassifierCodeDocument * doc, UMLObject * parentObj, const TQString & body, const TQString & comment) - : CodeBlockWithComments ((CodeDocument*)doc, body, comment), OwnedCodeBlock (parentObj) +CodeMethodBlock::CodeMethodBlock ( ClassifierCodeDocument * doc, UMLObject * tqparentObj, const TQString & body, const TQString & comment) + : CodeBlockWithComments ((CodeDocument*)doc, body, comment), OwnedCodeBlock (tqparentObj) { initFields(); } @@ -133,7 +133,7 @@ void CodeMethodBlock::setAttributesFromObject(TextBlock * obj) } /** - * @return QString + * @return TQString */ TQString CodeMethodBlock::toString ( ) { diff --git a/umbrello/umbrello/codemethodblock.h b/umbrello/umbrello/codemethodblock.h index 41555627..a10a676c 100644 --- a/umbrello/umbrello/codemethodblock.h +++ b/umbrello/umbrello/codemethodblock.h @@ -35,6 +35,7 @@ class CodeMethodBlock : public CodeBlockWithComments, public OwnedCodeBlock { friend class CodeGenObjectWithTextBlocks; Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -44,7 +45,7 @@ public: /** * Constructors */ - CodeMethodBlock ( ClassifierCodeDocument * doc, UMLObject * parentObj, + CodeMethodBlock ( ClassifierCodeDocument * doc, UMLObject * tqparentObj, const TQString & body = "", const TQString & comment = ""); /** @@ -56,7 +57,7 @@ public: // /** - * @return QString + * @return TQString */ virtual TQString toString ( ); @@ -70,7 +71,7 @@ public: */ TQString getEndMethodText () const; - // get the parent code document + // get the tqparent code document CodeDocument * getParentDocument(); protected: @@ -92,13 +93,13 @@ protected: */ void setEndMethodText (const TQString &value); - /** this is the method called from within syncToparent(). + /** this is the method called from within syncTotqparent(). * to update the start and end Method text. It is called * whether or not the method is Auto or User generated. */ virtual void updateMethodDeclaration ( ) = 0; - /** this is the method called from within syncToparent(). + /** this is the method called from within syncTotqparent(). * to update the *body* of the method * It is only called if the method is Auto-generated. */ diff --git a/umbrello/umbrello/codeoperation.cpp b/umbrello/umbrello/codeoperation.cpp index 13f5121b..5c8228d5 100644 --- a/umbrello/umbrello/codeoperation.cpp +++ b/umbrello/umbrello/codeoperation.cpp @@ -32,10 +32,10 @@ // Constructors/Destructors // -CodeOperation::CodeOperation ( ClassifierCodeDocument * doc , UMLOperation * parentOp, const TQString & body, const TQString & comment) - : CodeMethodBlock ( doc, parentOp, body, comment) +CodeOperation::CodeOperation ( ClassifierCodeDocument * doc , UMLOperation * tqparentOp, const TQString & body, const TQString & comment) + : CodeMethodBlock ( doc, tqparentOp, body, comment) { - init(parentOp); + init(tqparentOp); } CodeOperation::~CodeOperation ( ) { } @@ -77,7 +77,7 @@ TQPtrList<CodeParameter> CodeOperation::getParameterList ( ) { */ /** - * Get the parent UMLOperation of this codeoperation. + * Get the tqparent UMLOperation of this codeoperation. */ UMLOperation * CodeOperation::getParentOperation( ) { return dynamic_cast<UMLOperation*>(getParentObject()); @@ -129,11 +129,11 @@ void CodeOperation::setAttributesFromNode ( TQDomElement & element) // now set local attributes - // oops..this is done in the parent class "ownedcodeblock". - // we simply need to record the parent operation here - // m_parentOperation->disconnect(this); // always disconnect from current parent + // oops..this is done in the tqparent class "ownedcodeblock". + // we simply need to record the tqparent operation here + // m_parentOperation->disconnect(this); // always disconnect from current tqparent - TQString idStr = element.attribute("parent_id","-1"); + TQString idStr = element.attribute("tqparent_id","-1"); Uml::IDType id = STR2ID(idStr); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(id); UMLOperation * op = dynamic_cast<UMLOperation*>(obj); @@ -156,14 +156,14 @@ void CodeOperation::setAttributesFromObject(TextBlock * obj) } -void CodeOperation::init (UMLOperation * parentOp) +void CodeOperation::init (UMLOperation * tqparentOp) { m_canDelete = false; // we cant delete these with the codeeditor, delete the UML operation instead. - setTag(CodeOperation::findTag(parentOp)); + setTag(CodeOperation::findTag(tqparentOp)); - // not needed.. done by parent "ownedcodeblock" class - // connect(parentOp,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent())); + // not needed.. done by tqparent "ownedcodeblock" class + // connect(tqparentOp,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent())); } diff --git a/umbrello/umbrello/codeoperation.h b/umbrello/umbrello/codeoperation.h index 7ac63dd3..a0d8b693 100644 --- a/umbrello/umbrello/codeoperation.h +++ b/umbrello/umbrello/codeoperation.h @@ -27,6 +27,7 @@ class CodeOperation : public CodeMethodBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -35,7 +36,7 @@ public: /** * Constructors */ - CodeOperation ( ClassifierCodeDocument * doc , UMLOperation * parent, + CodeOperation ( ClassifierCodeDocument * doc , UMLOperation * tqparent, const TQString & body = "", const TQString & comment = ""); /** @@ -44,7 +45,7 @@ public: virtual ~CodeOperation ( ); /** - * Get the parent UMLOperation of this codeoperation. + * Get the tqparent UMLOperation of this codeoperation. */ UMLOperation * getParentOperation( ); @@ -87,7 +88,7 @@ protected: private: UMLOperation * m_parentOperation; - void init (UMLOperation * parentOp); + void init (UMLOperation * tqparentOp); }; diff --git a/umbrello/umbrello/codeparameter.cpp b/umbrello/umbrello/codeparameter.cpp index 5ee7345c..1ca714fc 100644 --- a/umbrello/umbrello/codeparameter.cpp +++ b/umbrello/umbrello/codeparameter.cpp @@ -33,10 +33,10 @@ // Constructors/Destructors // -CodeParameter::CodeParameter ( ClassifierCodeDocument * parentDoc, UMLObject * parentObject ) - : TQObject ( (TQObject*) parentObject, "ACodeParam") +CodeParameter::CodeParameter ( ClassifierCodeDocument * tqparentDoc, UMLObject * tqparentObject ) + : TQObject ( (TQObject*) tqparentObject, "ACodeParam") { - initFields( parentDoc, parentObject ); + initFields( tqparentDoc, tqparentObject ); } CodeParameter::~CodeParameter ( ) { } @@ -50,15 +50,15 @@ CodeParameter::~CodeParameter ( ) { } // /** - * Utility method to get the value of parent object abstract value - * @return the value of parent object abstrtact + * Utility method to get the value of tqparent object abstract value + * @return the value of tqparent object abstrtact */ bool CodeParameter::getAbstract ( ) { return m_parentObject->getAbstract(); } /** - * Utility method to get the value of parent object static + * Utility method to get the value of tqparent object static * Whether or not this is static. * @return the value of static */ @@ -67,7 +67,7 @@ bool CodeParameter::getStatic ( ) { } /** - * Utility method to get the value of parent object name + * Utility method to get the value of tqparent object name * The name of this code parameter. * @return the value */ @@ -76,7 +76,7 @@ TQString CodeParameter::getName ( ) const { } /** - * Utility method to get the value of parent object type. + * Utility method to get the value of tqparent object type. * the typeName of this parameters (e.g. boolean, int, etc or perhaps Class name of * an object) * @return the value of type @@ -87,9 +87,9 @@ TQString CodeParameter::getTypeName ( ) { } /** - * Utility method to get the value of parent object scope. + * Utility method to get the value of tqparent object scope. * The visibility of this code parameter. - * @return the value of parent object scope + * @return the value of tqparent object scope */ Uml::Visibility CodeParameter::getVisibility ( ) const { return m_parentObject->getVisibility(); @@ -139,7 +139,7 @@ UMLObject * CodeParameter::getParentObject ( ) { return m_parentObject; } -// need to get the ID of the parent object +// need to get the ID of the tqparent object // this is kind of broken for UMLRoles. TQString CodeParameter::getID () { UMLRole * role = dynamic_cast<UMLRole*>(m_parentObject); @@ -162,7 +162,7 @@ void CodeParameter::setAttributesOnNode ( TQDomDocument & doc, TQDomElement & bl // set local attributes - blockElement.setAttribute("parent_id",getID()); + blockElement.setAttribute("tqparent_id",getID()); // setting ID's takes special treatment // as UMLRoles arent properly stored in the XMI right now. @@ -187,8 +187,8 @@ void CodeParameter::setAttributesOnNode ( TQDomDocument & doc, TQDomElement & bl */ void CodeParameter::setAttributesFromNode ( TQDomElement & root) { - // set local attributes, parent object first - TQString idStr = root.attribute("parent_id","-1"); + // set local attributes, tqparent object first + TQString idStr = root.attribute("tqparent_id","-1"); Uml::IDType id = STR2ID(idStr); // always disconnect @@ -202,7 +202,7 @@ void CodeParameter::setAttributesFromNode ( TQDomElement & root) { // FIX..one day. // Ugh. This is UGLY, but we have to do it this way because UMLRoles // don't go into the document list of UMLobjects, and have the same - // ID as their parent UMLAssociations. So..the drill is then special + // ID as their tqparent UMLAssociations. So..the drill is then special // for Associations..in that case we need to find out which role will // serve as the parameter here. The REAL fix, of course, would be to // treat UMLRoles on a more even footing, but im not sure how that change @@ -230,7 +230,7 @@ void CodeParameter::setAttributesFromNode ( TQDomElement & root) { initFields ( m_parentDocument, obj); // just the regular approach } else - kError() << "Cant load CodeParam: parentUMLObject w/id:" + kError() << "Cant load CodeParam: tqparentUMLObject w/id:" << ID2STR(id) << " not found, corrupt save file?" << endl; // other attribs now @@ -262,7 +262,7 @@ void CodeParameter::setAttributesFromNode ( TQDomElement & root) { /** * create the string representation of this code parameter. - * @return QString + * @return TQString */ void CodeParameter::syncToParent( ) { diff --git a/umbrello/umbrello/codeparameter.h b/umbrello/umbrello/codeparameter.h index 05fa96f8..8b3f8ef6 100644 --- a/umbrello/umbrello/codeparameter.h +++ b/umbrello/umbrello/codeparameter.h @@ -31,9 +31,10 @@ class ClassifierCodeDocument; class UMLObject; -class CodeParameter : public QObject +class CodeParameter : public TQObject { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -42,7 +43,7 @@ public: /** * Empty Constructor */ - CodeParameter ( ClassifierCodeDocument * doc, UMLObject * parentObj ); + CodeParameter ( ClassifierCodeDocument * doc, UMLObject * tqparentObj ); /** * Empty Destructor @@ -56,23 +57,23 @@ public: // /** - * Get the parent Code Document + * Get the tqparent Code Document */ ClassifierCodeDocument * getParentDocument ( ); /** - * Get the parent UMLObject + * Get the tqparent UMLObject */ UMLObject * getParentObject ( ); /** - * Utility method. Get the value of parent abstract value. + * Utility method. Get the value of tqparent abstract value. * @return the value */ bool getAbstract ( ); /** - * Utility method. Get the value of parent Static + * Utility method. Get the value of tqparent Static * Whether or not this is static. * @return the value */ @@ -123,7 +124,7 @@ public: */ CodeComment * getComment ( ); - // the id of this parameter is the same as the parent UMLObject id. + // the id of this parameter is the same as the tqparent UMLObject id. TQString getID (); protected: diff --git a/umbrello/umbrello/component.h b/umbrello/umbrello/component.h index c67495ab..4012d4bf 100644 --- a/umbrello/umbrello/component.h +++ b/umbrello/umbrello/component.h @@ -29,6 +29,7 @@ class UMLComponent : public UMLPackage { Q_OBJECT + TQ_OBJECT public: /** * Sets up a Component. diff --git a/umbrello/umbrello/componentwidget.cpp b/umbrello/umbrello/componentwidget.cpp index 84bae8b0..7e8b1fd5 100644 --- a/umbrello/umbrello/componentwidget.cpp +++ b/umbrello/umbrello/componentwidget.cpp @@ -74,14 +74,14 @@ void ComponentWidget::draw(TQPainter & p, int offsetX, int offsetY) { p.drawRect(offsetX, offsetY + h/2 - fontHeight/2 - fontHeight, COMPONENT_MARGIN*4, fontHeight); p.drawRect(offsetX, offsetY + h/2 + fontHeight/2, COMPONENT_MARGIN*4, fontHeight); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); p.setFont(font); int lines = 1; if (!stereotype.isEmpty()) { p.drawText(offsetX + (COMPONENT_MARGIN*4), offsetY + (h/2) - fontHeight, - w - (COMPONENT_MARGIN*4), fontHeight, Qt::AlignCenter, + w - (COMPONENT_MARGIN*4), fontHeight, TQt::AlignCenter, m_pObject->getStereotype(true)); lines = 2; } @@ -94,10 +94,10 @@ void ComponentWidget::draw(TQPainter & p, int offsetX, int offsetY) { if (lines == 1) { p.drawText(offsetX + (COMPONENT_MARGIN*4), offsetY + (h/2) - (fontHeight/2), - w - (COMPONENT_MARGIN*4), fontHeight, Qt::AlignCenter, name ); + w - (COMPONENT_MARGIN*4), fontHeight, TQt::AlignCenter, name ); } else { p.drawText(offsetX + (COMPONENT_MARGIN*4), offsetY + (h/2), - w - (COMPONENT_MARGIN*4), fontHeight, Qt::AlignCenter, name ); + w - (COMPONENT_MARGIN*4), fontHeight, TQt::AlignCenter, name ); } if(m_bSelected) { diff --git a/umbrello/umbrello/componentwidget.h b/umbrello/umbrello/componentwidget.h index d07b0536..4f0a3a05 100644 --- a/umbrello/umbrello/componentwidget.h +++ b/umbrello/umbrello/componentwidget.h @@ -33,7 +33,7 @@ public: /** * Constructs a ComponentWidget. * - * @param view The parent of this ComponentWidget. + * @param view The tqparent of this ComponentWidget. * @param c The UMLComponent this will be representing. */ ComponentWidget(UMLView * view, UMLComponent *c); diff --git a/umbrello/umbrello/configurable.cpp b/umbrello/umbrello/configurable.cpp index 2b2447b3..96bef270 100644 --- a/umbrello/umbrello/configurable.cpp +++ b/umbrello/umbrello/configurable.cpp @@ -18,7 +18,7 @@ // own header #include "configurable.h" -// Qt includes +// TQt includes #include <tqstringlist.h> // KDE includes diff --git a/umbrello/umbrello/datatypewidget.cpp b/umbrello/umbrello/datatypewidget.cpp index 4e8aef78..636aa4a1 100644 --- a/umbrello/umbrello/datatypewidget.cpp +++ b/umbrello/umbrello/datatypewidget.cpp @@ -55,19 +55,19 @@ void DatatypeWidget::draw(TQPainter& p, int offsetX, int offsetY) { TQString name = getName(); p.drawRect(offsetX, offsetY, w, h); - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); TQFont font = UMLWidget::getFont(); font.setBold(true); p.setFont(font); p.drawText(offsetX + DATATYPE_MARGIN, offsetY, w - DATATYPE_MARGIN* 2,fontHeight, - Qt::AlignCenter, m_pObject->getStereotype(true)); + TQt::AlignCenter, m_pObject->getStereotype(true)); font.setItalic( m_pObject->getAbstract() ); p.setFont(font); p.drawText(offsetX + DATATYPE_MARGIN, offsetY + fontHeight, - w - DATATYPE_MARGIN * 2, fontHeight, Qt::AlignCenter, name); + w - DATATYPE_MARGIN * 2, fontHeight, TQt::AlignCenter, name); if (m_bSelected) { drawSelected(&p, offsetX, offsetY); diff --git a/umbrello/umbrello/datatypewidget.h b/umbrello/umbrello/datatypewidget.h index 81a53ca6..81dbe0f9 100644 --- a/umbrello/umbrello/datatypewidget.h +++ b/umbrello/umbrello/datatypewidget.h @@ -33,7 +33,7 @@ public: /** * Constructs an DatatypeWidget. * - * @param view The parent of this DatatypeWidget. + * @param view The tqparent of this DatatypeWidget. * @param d The UMLClassifier this will be representing. */ DatatypeWidget(UMLView* view, UMLClassifier *d); diff --git a/umbrello/umbrello/dialog_utils.cpp b/umbrello/umbrello/dialog_utils.cpp index 43e92a93..0e114082 100644 --- a/umbrello/umbrello/dialog_utils.cpp +++ b/umbrello/umbrello/dialog_utils.cpp @@ -25,15 +25,15 @@ namespace Dialog_Utils { -TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *layout, int row, +TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *tqlayout, int row, TQLabel * &label, const TQString& labelText, TQLineEdit * &editField, - const TQString& editFieldText /* = TQString::null */) + const TQString& editFieldText /* = TQString() */) { label = new TQLabel(labelText, containingBox); - layout->addWidget(label, row, 0); + tqlayout->addWidget(label, row, 0); editField = new TQLineEdit(editFieldText, containingBox); - layout->addWidget(editField, row, 1 ); + tqlayout->addWidget(editField, row, 1 ); label->setBuddy(editField); return editField; } diff --git a/umbrello/umbrello/dialog_utils.h b/umbrello/umbrello/dialog_utils.h index dfcd9ea5..5588049e 100644 --- a/umbrello/umbrello/dialog_utils.h +++ b/umbrello/umbrello/dialog_utils.h @@ -31,7 +31,7 @@ namespace Dialog_Utils { * Create a labeled text lineedit widget. * * @param containingBox The containing TQGroupBox. - * @param layout The TQGridLayout to use. + * @param tqlayout The TQGridLayout to use. * @param row The row number within the TQGridLayout. * @param label The TQLabel object allocated (return value) * @param labelText The label text. @@ -39,10 +39,10 @@ namespace Dialog_Utils { * @param editFieldText Initialization text in the editField (optional.) * @return a pointer to the TQLineEdit so you can setFocus() if necessary */ -TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *layout, int row, +TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *tqlayout, int row, TQLabel * &label, const TQString& labelText, TQLineEdit * &editField, - const TQString& editFieldText = TQString::null); + const TQString& editFieldText = TQString()); /** * Helper function for requesting a name for an UMLWidget using a dialog. diff --git a/umbrello/umbrello/dialogs/activitydialog.h b/umbrello/umbrello/dialogs/activitydialog.h index ccc746c3..f8dbe366 100644 --- a/umbrello/umbrello/dialogs/activitydialog.h +++ b/umbrello/umbrello/dialogs/activitydialog.h @@ -38,6 +38,7 @@ class ActivityWidget; class ActivityDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/dialogs/activitypage.cpp b/umbrello/umbrello/dialogs/activitypage.cpp index 5a728576..10ccb04b 100644 --- a/umbrello/umbrello/dialogs/activitypage.cpp +++ b/umbrello/umbrello/dialogs/activitypage.cpp @@ -37,7 +37,7 @@ void ActivityPage::setupPage() { m_pActivityGB = new TQGroupBox(i18n("Activities"), this ); - // vertical box layout for the activity lists, arrow buttons and the button box + // vertical box tqlayout for the activity lists, arrow buttons and the button box TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pActivityGB ); listVBoxLayout -> setMargin(margin); listVBoxLayout -> setSpacing ( 10 ); @@ -69,10 +69,10 @@ void ActivityPage::setupPage() { KButtonBox* buttonBox = new KButtonBox(m_pActivityGB); - buttonBox->addButton( i18n("New Activity..."), this, TQT_SLOT(slotNewActivity()) ); + buttonBox->addButton( i18n("New Activity..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewActivity()) ); m_pDeleteActivityButton = buttonBox->addButton( i18n("Delete"), - this, TQT_SLOT(slotDelete()) ); - m_pRenameButton = buttonBox->addButton( i18n("Rename"), this, TQT_SLOT(slotRename()) ); + TQT_TQOBJECT(this), TQT_SLOT(slotDelete()) ); + m_pRenameButton = buttonBox->addButton( i18n("Rename"), TQT_TQOBJECT(this), TQT_SLOT(slotRename()) ); listVBoxLayout->addWidget(buttonBox); mainLayout -> addWidget( m_pActivityGB ); diff --git a/umbrello/umbrello/dialogs/activitypage.h b/umbrello/umbrello/dialogs/activitypage.h index 57a079e6..a6165a8a 100644 --- a/umbrello/umbrello/dialogs/activitypage.h +++ b/umbrello/umbrello/dialogs/activitypage.h @@ -28,6 +28,7 @@ class ListPopupMenu; */ class ActivityPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructor diff --git a/umbrello/umbrello/dialogs/assocgenpage.cpp b/umbrello/umbrello/dialogs/assocgenpage.cpp index b093cae0..07c9e3af 100644 --- a/umbrello/umbrello/dialogs/assocgenpage.cpp +++ b/umbrello/umbrello/dialogs/assocgenpage.cpp @@ -25,8 +25,8 @@ #include "../association.h" #include "../dialog_utils.h" -AssocGenPage::AssocGenPage (UMLDoc *d, TQWidget *parent, AssociationWidget *assoc) - : TQWidget(parent) +AssocGenPage::AssocGenPage (UMLDoc *d, TQWidget *tqparent, AssociationWidget *assoc) + : TQWidget(tqparent) { m_pAssociationWidget = assoc; diff --git a/umbrello/umbrello/dialogs/assocgenpage.h b/umbrello/umbrello/dialogs/assocgenpage.h index 4cd34421..06c32c05 100644 --- a/umbrello/umbrello/dialogs/assocgenpage.h +++ b/umbrello/umbrello/dialogs/assocgenpage.h @@ -42,16 +42,17 @@ class KComboBox; */ class AssocGenPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Sets up the AssocGenPage. * * @param d The UMLDoc which controls controls object creation. - * @param parent The parent to the AssocGenPage. + * @param tqparent The tqparent to the AssocGenPage. * @param a The AssociationWidget to display the properties of. */ - AssocGenPage(UMLDoc *d, TQWidget *parent, AssociationWidget *a); + AssocGenPage(UMLDoc *d, TQWidget *tqparent, AssociationWidget *a); /** * Standard deconstructor. diff --git a/umbrello/umbrello/dialogs/assocpage.cpp b/umbrello/umbrello/dialogs/assocpage.cpp index feb193eb..425f01fe 100644 --- a/umbrello/umbrello/dialogs/assocpage.cpp +++ b/umbrello/umbrello/dialogs/assocpage.cpp @@ -14,7 +14,7 @@ #include <klocale.h> #include "assocpropdlg.h" -AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(parent) { +AssocPage::AssocPage(TQWidget *tqparent, UMLView * v, UMLObject * o) : TQWidget(tqparent) { m_pObject = o; m_pView = v; int margin = fontMetrics().height(); @@ -25,12 +25,12 @@ AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(pa m_pAssocGB = new TQGroupBox(i18n("Associations"), this); mainLayout -> addWidget(m_pAssocGB); - TQHBoxLayout * layout = new TQHBoxLayout(m_pAssocGB); - layout -> setSpacing(10); - layout -> setMargin(margin); + TQHBoxLayout * tqlayout = new TQHBoxLayout(m_pAssocGB); + tqlayout -> setSpacing(10); + tqlayout -> setMargin(margin); m_pAssocLB = new TQListBox(m_pAssocGB); - layout -> addWidget(m_pAssocLB); + tqlayout -> addWidget(m_pAssocLB); setMinimumSize(310, 330); fillListBox(); m_pMenu = 0; diff --git a/umbrello/umbrello/dialogs/assocpage.h b/umbrello/umbrello/dialogs/assocpage.h index a38aa2ac..469dd35d 100644 --- a/umbrello/umbrello/dialogs/assocpage.h +++ b/umbrello/umbrello/dialogs/assocpage.h @@ -40,15 +40,16 @@ */ class AssocPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructs an instance of AssocPage. * - * @param parent The parent of the page + * @param tqparent The tqparent of the page * @param v The view the UMLObject being represented. * @param o The UMLObject being represented */ - AssocPage(TQWidget *parent, UMLView * v, UMLObject * o); + AssocPage(TQWidget *tqparent, UMLView * v, UMLObject * o); /** * Standard deconstructor. diff --git a/umbrello/umbrello/dialogs/assocpropdlg.cpp b/umbrello/umbrello/dialogs/assocpropdlg.cpp index 1d5b9c77..cf4f5b21 100644 --- a/umbrello/umbrello/dialogs/assocpropdlg.cpp +++ b/umbrello/umbrello/dialogs/assocpropdlg.cpp @@ -35,14 +35,14 @@ #include "../umlview.h" -AssocPropDlg::AssocPropDlg (TQWidget *parent, AssociationWidget * assocWidget, int pageNum) +AssocPropDlg::AssocPropDlg (TQWidget *tqparent, AssociationWidget * assocWidget, int pageNum) : KDialogBase(IconList, i18n("Association Properties"), Ok | Apply | Cancel | Help, - Ok, parent, "_ASSOCPROPDLG_", true, true) + Ok, tqparent, "_ASSOCPROPDLG_", true, true) { init(); m_pAssoc = assocWidget; - m_pDoc = ((UMLApp *)parent) -> getDocument(); // needed? + m_pDoc = ((UMLApp *)tqparent) -> getDocument(); // needed? setupPages(assocWidget); showPage(pageNum); diff --git a/umbrello/umbrello/dialogs/assocpropdlg.h b/umbrello/umbrello/dialogs/assocpropdlg.h index 8fbbebe8..359add61 100644 --- a/umbrello/umbrello/dialogs/assocpropdlg.h +++ b/umbrello/umbrello/dialogs/assocpropdlg.h @@ -31,16 +31,17 @@ class UMLDoc; */ class AssocPropDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Sets up a Association Properties Dialog. - * @param parent The parent of the AssocPropDlg + * @param tqparent The tqparent of the AssocPropDlg * @param a The Association Widget to display properties of. * @param pageNum The page to show first. */ - AssocPropDlg(TQWidget *parent, AssociationWidget *a, int pageNum = 0); + AssocPropDlg(TQWidget *tqparent, AssociationWidget *a, int pageNum = 0); /** * Standard deconstructor diff --git a/umbrello/umbrello/dialogs/assocrolepage.cpp b/umbrello/umbrello/dialogs/assocrolepage.cpp index adb7dcc3..f603abee 100644 --- a/umbrello/umbrello/dialogs/assocrolepage.cpp +++ b/umbrello/umbrello/dialogs/assocrolepage.cpp @@ -23,8 +23,8 @@ // local includes #include "../dialog_utils.h" -AssocRolePage::AssocRolePage (UMLDoc *d, TQWidget *parent, AssociationWidget *assoc) - : TQWidget(parent) +AssocRolePage::AssocRolePage (UMLDoc *d, TQWidget *tqparent, AssociationWidget *assoc) + : TQWidget(tqparent) { m_pAssociationWidget = assoc; @@ -228,7 +228,7 @@ void AssocRolePage::constructWidget() { // m_pDocB-> setEnabled(false); m_pDocB->setWordWrap(TQMultiLineEdit::WidgetWidth); - // add group boxes to main layout + // add group boxes to main tqlayout mainLayout -> addWidget( propsAGB, 0, 0); mainLayout -> addWidget( scopeABG, 1, 0); mainLayout -> addWidget(changeABG, 2, 0); diff --git a/umbrello/umbrello/dialogs/assocrolepage.h b/umbrello/umbrello/dialogs/assocrolepage.h index 440707cc..ada69b4f 100644 --- a/umbrello/umbrello/dialogs/assocrolepage.h +++ b/umbrello/umbrello/dialogs/assocrolepage.h @@ -38,16 +38,17 @@ */ class AssocRolePage : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Sets up the AssocRolePage. * * @param d The UMLDoc which controls controls object creation. - * @param parent The parent to the AssocRolePage. + * @param tqparent The tqparent to the AssocRolePage. * @param a The AssociationWidget to display the properties of. */ - AssocRolePage(UMLDoc *d, TQWidget *parent, AssociationWidget *a); + AssocRolePage(UMLDoc *d, TQWidget *tqparent, AssociationWidget *a); /** * Standard deconstructor. diff --git a/umbrello/umbrello/dialogs/classgenpage.cpp b/umbrello/umbrello/dialogs/classgenpage.cpp index d633b6ae..7757b2d8 100644 --- a/umbrello/umbrello/dialogs/classgenpage.cpp +++ b/umbrello/umbrello/dialogs/classgenpage.cpp @@ -38,7 +38,7 @@ #include "../umlview.h" #include "../stereotype.h" -ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLObject* o) : TQWidget(parent) { +ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLObject* o) : TQWidget(tqparent) { m_pWidget = 0; m_pObject = 0; m_pInstanceWidget = 0; @@ -236,7 +236,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLObject* o) : TQWidget ////////// } -ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, ObjectWidget* o) : TQWidget(parent) { +ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, ObjectWidget* o) : TQWidget(tqparent) { m_pObject = 0; m_pInstanceWidget = 0; m_pWidget = o; @@ -301,7 +301,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, ObjectWidget* o) : TQWid connect( m_pDrawActorCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotActorToggled( bool ) ) ); } -ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLWidget* widget) : TQWidget(parent) { +ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLWidget* widget) : TQWidget(tqparent) { m_pWidget = 0; m_pObject = 0; m_pInstanceWidget = widget; diff --git a/umbrello/umbrello/dialogs/classgenpage.h b/umbrello/umbrello/dialogs/classgenpage.h index 4d661ae1..d6d06a50 100644 --- a/umbrello/umbrello/dialogs/classgenpage.h +++ b/umbrello/umbrello/dialogs/classgenpage.h @@ -38,35 +38,36 @@ class UMLDoc; */ class ClassGenPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Sets up the ClassGenPage. * * @param d The UMLDoc which controls controls object creation. - * @param parent The parent to the ClassGenPage. + * @param tqparent The tqparent to the ClassGenPage. * @param o The UMLObject to display the properties of. */ - ClassGenPage(UMLDoc *d, TQWidget *parent, UMLObject * o); + ClassGenPage(UMLDoc *d, TQWidget *tqparent, UMLObject * o); /** * Sets up the ClassGenPage for an ObjectWidget * * @param d The UMLDoc which controls controls object creation. - * @param parent The parent to the ClassGenPage. + * @param tqparent The tqparent to the ClassGenPage. * @param o The ObjectWidget to display the properties of. */ - ClassGenPage(UMLDoc *d, TQWidget *parent, ObjectWidget * o); + ClassGenPage(UMLDoc *d, TQWidget *tqparent, ObjectWidget * o); /** * Sets up the ClassGenPage for a UMLWidget instance (used * for component instances on deployment diagrams) * * @param d The UMLDoc which controls controls object creation. - * @param parent The parent to the ClassGenPage. + * @param tqparent The tqparent to the ClassGenPage. * @param widget The UMLWidget to display the properties of. */ - ClassGenPage(UMLDoc* d, TQWidget* parent, UMLWidget* widget); + ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLWidget* widget); /** * Standard deconstructor. diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp index e59956bc..df0efb41 100644 --- a/umbrello/umbrello/dialogs/classifierlistpage.cpp +++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp @@ -29,8 +29,8 @@ using namespace Uml; -ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifier, - UMLDoc* doc, Uml::Object_Type type) : TQWidget(parent) { +ClassifierListPage::ClassifierListPage(TQWidget* tqparent, UMLClassifier* classifier, + UMLDoc* doc, Uml::Object_Type type) : TQWidget(tqparent) { m_itemType = type; TQString typeName(""); TQString newItemType(""); @@ -60,11 +60,11 @@ ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifi int margin = fontMetrics().height(); setMinimumSize(310,330); - //main layout contains our two group boxes, the list and the documentation + //main tqlayout contains our two group boxes, the list and the documentation TQVBoxLayout* mainLayout = new TQVBoxLayout( this ); mainLayout->setSpacing(10); - //top group box, contains a vertical layout with list box above and buttons below + //top group box, contains a vertical tqlayout with list box above and buttons below m_pItemListGB = new TQGroupBox(typeName, this ); TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pItemListGB ); listVBoxLayout->setMargin(margin); @@ -95,10 +95,10 @@ ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifi //the action buttons KButtonBox* buttonBox = new KButtonBox(m_pItemListGB); - buttonBox->addButton( newItemType, this, TQT_SLOT(slotNewListItem()) ); + buttonBox->addButton( newItemType, TQT_TQOBJECT(this), TQT_SLOT(slotNewListItem()) ); m_pDeleteListItemButton = buttonBox->addButton( i18n("&Delete"), - this, TQT_SLOT(slotDelete()) ); - m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), this, TQT_SLOT(slotProperties()) ); + TQT_TQOBJECT(this), TQT_SLOT(slotDelete()) ); + m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()) ); listVBoxLayout->addWidget(buttonBox); mainLayout->addWidget(m_pItemListGB); @@ -201,7 +201,7 @@ void ClassifierListPage::slotClicked(TQListBoxItem*item) { // focus and so at least one item is always selected; this doesn't happen, if // there are no items of course; // - // for more information see Qt doc for void TQListBox::clearSelection() + // for more information see TQt doc for void TQListBox::clearSelection() UMLClassifierListItem* listItem; if (item == NULL) { if (m_pItemListLB->count() == 0) { diff --git a/umbrello/umbrello/dialogs/classifierlistpage.h b/umbrello/umbrello/dialogs/classifierlistpage.h index 1dba8297..7f0e298f 100644 --- a/umbrello/umbrello/dialogs/classifierlistpage.h +++ b/umbrello/umbrello/dialogs/classifierlistpage.h @@ -38,16 +38,17 @@ class UMLDoc; */ class ClassifierListPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Sets up the ClassifierListPage * - * @param parent The parent to the ClassAttPage. + * @param tqparent The tqparent to the ClassAttPage. * @param classifier The Concept to display the properties of. * @param doc The UMLDoc document * @param type The type of listItem this handles */ - ClassifierListPage(TQWidget* parent, UMLClassifier* classifier, UMLDoc* doc, Uml::Object_Type type); + ClassifierListPage(TQWidget* tqparent, UMLClassifier* classifier, UMLDoc* doc, Uml::Object_Type type); /** * Standard deconstructor. diff --git a/umbrello/umbrello/dialogs/classoptionspage.h b/umbrello/umbrello/dialogs/classoptionspage.h index 718944cc..e9c81525 100644 --- a/umbrello/umbrello/dialogs/classoptionspage.h +++ b/umbrello/umbrello/dialogs/classoptionspage.h @@ -23,7 +23,7 @@ class ClassifierWidget; /** * A dialog page to display options for a @ref UMLWidget and its - * children. This is not normally called by you. It is used by + * tqchildren. This is not normally called by you. It is used by * the @ref ClassPropDlg. * * @short A dialog page to display the options for a UMLWidget. diff --git a/umbrello/umbrello/dialogs/classpropdlg.cpp b/umbrello/umbrello/dialogs/classpropdlg.cpp index 169de20e..1b744ca0 100644 --- a/umbrello/umbrello/dialogs/classpropdlg.cpp +++ b/umbrello/umbrello/dialogs/classpropdlg.cpp @@ -33,9 +33,9 @@ #include "../uml.h" #include "../umlview.h" -ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLObject * c, int pageNum, bool assoc) +ClassPropDlg::ClassPropDlg(TQWidget *tqparent, UMLObject * c, int pageNum, bool assoc) : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help, - Ok, parent, "_CLASSDLG_", true, true) { + Ok, tqparent, "_CLASSDLG_", true, true) { m_pWidget = 0; m_pGenPage = 0; m_pAttPage = 0; @@ -52,9 +52,9 @@ ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLObject * c, int pageNum, bool as showPage(pageNum); } -ClassPropDlg::ClassPropDlg(TQWidget *parent, ObjectWidget * o) +ClassPropDlg::ClassPropDlg(TQWidget *tqparent, ObjectWidget * o) : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help, - Ok, parent, "_CLASSDLG_", true, true) { + Ok, tqparent, "_CLASSDLG_", true, true) { m_pWidget = o; m_pGenPage = 0; m_pAttPage = 0; @@ -82,9 +82,9 @@ ClassPropDlg::ClassPropDlg(TQWidget *parent, ObjectWidget * o) setMinimumSize(340,420); } -ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLWidget * w) +ClassPropDlg::ClassPropDlg(TQWidget *tqparent, UMLWidget * w) : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help, - Ok, parent, "_CLASSDLG_", true, true) { + Ok, tqparent, "_CLASSDLG_", true, true) { m_pWidget = w; m_pGenPage = 0; m_pAttPage = 0; @@ -95,7 +95,7 @@ ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLWidget * w) m_pOptionsPage = 0; m_Type = pt_Widget; m_pObject = w -> getUMLObject(); - m_pDoc = ((UMLApp *)parent) -> getDocument(); + m_pDoc = ((UMLApp *)tqparent) -> getDocument(); if (w->getBaseType() == Uml::wt_Class || w->getBaseType() == Uml::wt_Interface diff --git a/umbrello/umbrello/dialogs/classpropdlg.h b/umbrello/umbrello/dialogs/classpropdlg.h index 6a107ad7..afb89f46 100644 --- a/umbrello/umbrello/dialogs/classpropdlg.h +++ b/umbrello/umbrello/dialogs/classpropdlg.h @@ -40,32 +40,33 @@ class UMLWidget; */ class ClassPropDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Sets up a ClassPropDlg. * - * @param parent The parent of the ClassPropDlg + * @param tqparent The tqparent of the ClassPropDlg * @param c The UMLObject to display properties of. * @param pageNum The page to show first. * @param assoc Determines whether to display associations */ - ClassPropDlg(TQWidget *parent, UMLObject *c, int pageNum = 0, bool assoc = false); + ClassPropDlg(TQWidget *tqparent, UMLObject *c, int pageNum = 0, bool assoc = false); /** * Sets up a ClassPropDlg. * - * @param parent The parent of the ClassPropDlg + * @param tqparent The tqparent of the ClassPropDlg * @param o The ObjectWidget to display properties of. */ - ClassPropDlg(TQWidget *parent, ObjectWidget * o); + ClassPropDlg(TQWidget *tqparent, ObjectWidget * o); /** * Sets up a ClassPropDlg. * - * @param parent The parent of the ClassPropDlg + * @param tqparent The tqparent of the ClassPropDlg * @param o The UMLWidget to display properties of. */ - ClassPropDlg(TQWidget *parent, UMLWidget * o); + ClassPropDlg(TQWidget *tqparent, UMLWidget * o); /** diff --git a/umbrello/umbrello/dialogs/classwizard.cpp b/umbrello/umbrello/dialogs/classwizard.cpp index c49e418f..1cabe1b2 100644 --- a/umbrello/umbrello/dialogs/classwizard.cpp +++ b/umbrello/umbrello/dialogs/classwizard.cpp @@ -26,7 +26,7 @@ #include "../umlclassifierlistitemlist.h" #include "../classifierlistitem.h" -ClassWizard::ClassWizard( UMLDoc * pDoc ) : KWizard( (TQWidget*)pDoc -> parent(), "_CLASSWIZARD_", true) { +ClassWizard::ClassWizard( UMLDoc * pDoc ) : KWizard( (TQWidget*)pDoc -> tqparent(), "_CLASSWIZARD_", true) { m_pDoc = pDoc; //create a unique class to start with UMLObject * pTemp = 0; diff --git a/umbrello/umbrello/dialogs/codeeditor.cpp b/umbrello/umbrello/dialogs/codeeditor.cpp index 9fe17afc..b4533d83 100644 --- a/umbrello/umbrello/dialogs/codeeditor.cpp +++ b/umbrello/umbrello/dialogs/codeeditor.cpp @@ -55,16 +55,16 @@ #include "umlroledialog.h" #include "umloperationdialog.h" -CodeEditor::CodeEditor ( const TQString & text, const TQString & context, CodeViewerDialog * parent, const char * name , CodeDocument * doc) - : TQTextEdit ( text, context, parent, name) +CodeEditor::CodeEditor ( const TQString & text, const TQString & context, CodeViewerDialog * tqparent, const char * name , CodeDocument * doc) + : TQTextEdit ( text, context, tqparent, name) { - init(parent, doc); + init(tqparent, doc); } -CodeEditor::CodeEditor ( CodeViewerDialog * parent, const char* name, CodeDocument * doc ) - : TQTextEdit ( parent, name ) +CodeEditor::CodeEditor ( CodeViewerDialog * tqparent, const char* name, CodeDocument * doc ) + : TQTextEdit ( tqparent, name ) { - init(parent, doc); + init(tqparent, doc); } /* @@ -129,7 +129,7 @@ void CodeEditor::doubleClicked(int para, int pos) } -// allow us to edit, as appropriate, the parent UMLObject of the +// allow us to edit, as appropriate, the tqparent UMLObject of the // given text block. void CodeEditor::editTextBlock(TextBlock * tBlock, int para) { @@ -168,7 +168,7 @@ void CodeEditor::editTextBlock(TextBlock * tBlock, int para) { } else { - kError()<<" CodeViewerDlg ERROR: UNKNOWN parent for textBlock"<<endl; + kError()<<" CodeViewerDlg ERROR: UNKNOWN tqparent for textBlock"<<endl; } } @@ -223,7 +223,7 @@ void CodeEditor::loadFromDocument () } -void CodeEditor::insert (const TQString & text, TextBlock * parent, bool editable, const TQColor & fgcolor, const TQColor & bgcolor, UMLObject * umlobj, const TQString & displayName, int startLine) +void CodeEditor::insert (const TQString & text, TextBlock * tqparent, bool editable, const TQColor & fgcolor, const TQColor & bgcolor, UMLObject * umlobj, const TQString & displayName, int startLine) { // set some params @@ -247,24 +247,24 @@ void CodeEditor::insert (const TQString & text, TextBlock * parent, bool editabl // now do 'paragraph' background highlighting // int endLine = paragraphs()-2; - int endLine = text.contains(TQRegExp("\n")) + startLine -1; + int endLine = text.tqcontains(TQRegExp("\n")) + startLine -1; if(m_isHighlighted) for(int para=startLine;para<=endLine;para++) setParagraphBackgroundColor(para,bgcolor); // record paragraph information - // Did we already start recording info for this parent object? + // Did we already start recording info for this tqparent object? TextBlockInfo * tbinfo; - if(m_tbInfoMap->contains(parent)) - tbinfo = (*m_tbInfoMap)[parent]; + if(m_tbInfoMap->tqcontains(tqparent)) + tbinfo = (*m_tbInfoMap)[tqparent]; else { tbinfo = new TextBlockInfo(); tbinfo->displayName = displayName; - tbinfo->isCodeAccessorMethod = dynamic_cast<CodeAccessorMethod*>(parent) ? true : false; - m_tbInfoMap->insert(parent,tbinfo); + tbinfo->isCodeAccessorMethod = dynamic_cast<CodeAccessorMethod*>(tqparent) ? true : false; + m_tbInfoMap->insert(tqparent,tbinfo); } - // set a parent, if its not already set + // set a tqparent, if its not already set if(umlobj && !tbinfo->getParent()) { tbinfo->displayName = displayName; @@ -272,13 +272,13 @@ void CodeEditor::insert (const TQString & text, TextBlock * parent, bool editabl tbinfo->isClickable = textBlockIsClickable(umlobj); } - // now mark all lines that we just inserted as belonging to the parent + // now mark all lines that we just inserted as belonging to the tqparent for(int para=startLine;para<=endLine;para++) - m_textBlockList.insert(para,parent); + m_textBlockList.insert(para,tqparent); // lastly, update the para info - // start position is relative to the FIRST parent position - int start = startLine - m_textBlockList.findRef(parent); + // start position is relative to the FIRST tqparent position + int start = startLine - m_textBlockList.tqfindRef(tqparent); int size = endLine-startLine; // create the object that records this particular "paragraph" @@ -293,7 +293,7 @@ void CodeEditor::insert (const TQString & text, TextBlock * parent, bool editabl { // now we have to fix the 'start' value for all the para // info blocks that coorspond to textblocks that we inserted - // inside of. This means parent tblock paragraph locations + // inside of. This means tqparent tblock paragraph locations // that are greater than zero in that type of textblock int increase = size + 1; @@ -302,7 +302,7 @@ void CodeEditor::insert (const TQString & text, TextBlock * parent, bool editabl { TextBlock * tblock = it.key(); TextBlockInfo * thisTbInfo = it.data(); - int firstLoc = m_textBlockList.findRef(tblock); + int firstLoc = m_textBlockList.tqfindRef(tblock); ParaInfo * lastPi = thisTbInfo->m_paraList.last(); for(ParaInfo * pi = thisTbInfo->m_paraList.first(); pi; pi = thisTbInfo->m_paraList.next()) @@ -353,7 +353,7 @@ void CodeEditor::appendText(TextBlockList * items) appendText(cb); /* // no! shouldn't be any 'naked' comments floating about. Always - // are assocated with a parent code block + // are assocated with a tqparent code block else if ( (cm = dynamic_cast<CodeComment*>(tb)) ) appendText(cm); */ @@ -363,7 +363,7 @@ void CodeEditor::appendText(TextBlockList * items) } -void CodeEditor::appendText (CodeComment * comment, TextBlock * parent, UMLObject * umlObj , const TQString & componentName) +void CodeEditor::appendText (CodeComment * comment, TextBlock * tqparent, UMLObject * umlObj , const TQString & componentName) { if(!comment->getWriteOutText() && !m_showHiddenBlocks) @@ -376,7 +376,7 @@ void CodeEditor::appendText (CodeComment * comment, TextBlock * parent, UMLObjec TQString indent = comment->getIndentationString(); TQString text = comment->toString(); // use comment formatting, NOT formatMultiLineText(comment->toString(), indent, "\n"); if(!StringIsBlank(text)) - insert(text,parent,true,getState().fontColor, bgcolor, umlObj, componentName); + insert(text,tqparent,true,getState().fontColor, bgcolor, umlObj, componentName); } @@ -409,28 +409,28 @@ void CodeEditor::appendText (CodeClassFieldDeclarationBlock * db ) { TQString indent = db->getIndentationString(); TQString body = db->formatMultiLineText (db->getText(), indent, "\n"); - UMLObject * parentObj = db->getParentClassField()->getParentObject(); + UMLObject * tqparentObj = db->getParentClassField()->getParentObject(); TQColor bgcolor = getState().editBlockColor; TQString componentName = TQString(""); - if(parentObj) + if(tqparentObj) { - if(db->getParentClassField()->parentIsAttribute()) { - componentName = parentDocName + "::attribute_field(" + parentObj->getName() + ')'; + if(db->getParentClassField()->tqparentIsAttribute()) { + componentName = tqparentDocName + "::attribute_field(" + tqparentObj->getName() + ')'; } else { - UMLRole * role = dynamic_cast<UMLRole*>(parentObj); - componentName = parentDocName + "::association_field(" + role->getName() + ')'; + UMLRole * role = dynamic_cast<UMLRole*>(tqparentObj); + componentName = tqparentDocName + "::association_field(" + role->getName() + ')'; } bgcolor = getState().umlObjectColor; } - appendText(db->getComment(), db, parentObj,componentName); + appendText(db->getComment(), db, tqparentObj,componentName); if(!db->getWriteOutText() && m_showHiddenBlocks) bgcolor = getState().hiddenColor; if(!StringIsBlank(body)) - insert(body,db,false,getState().fontColor,bgcolor,parentObj); + insert(body,db,false,getState().fontColor,bgcolor,tqparentObj); } @@ -460,42 +460,42 @@ void CodeEditor::appendText (CodeMethodBlock * mb) { bgcolor = getState().hiddenColor; } - TQString componentName = TQString("<b>parentless method\?</b>"); + TQString componentName = TQString("<b>tqparentless method\?</b>"); - // ugly, but we need to know if there is a parent object here. + // ugly, but we need to know if there is a tqparent object here. CodeOperation * op = dynamic_cast<CodeOperation*>(mb); CodeAccessorMethod * accessor = dynamic_cast<CodeAccessorMethod*>(mb); - UMLObject * parentObj = 0; + UMLObject * tqparentObj = 0; if(op) { - parentObj = op->getParentOperation(); - if(((UMLOperation*)parentObj)->isConstructorOperation()) - componentName = parentDocName + "::operation("+ parentObj->getName()+") constructor method"; + tqparentObj = op->getParentOperation(); + if(((UMLOperation*)tqparentObj)->isConstructorOperation()) + componentName = tqparentDocName + "::operation("+ tqparentObj->getName()+") constructor method"; else - componentName = parentDocName + "::operation("+ parentObj->getName()+") method"; + componentName = tqparentDocName + "::operation("+ tqparentObj->getName()+") method"; } if(accessor) { - parentObj = accessor->getParentObject(); - if(accessor->getParentClassField()->parentIsAttribute()) { - componentName = parentDocName + "::attribute_field(" + parentObj->getName() + ") accessor method"; + tqparentObj = accessor->getParentObject(); + if(accessor->getParentClassField()->tqparentIsAttribute()) { + componentName = tqparentDocName + "::attribute_field(" + tqparentObj->getName() + ") accessor method"; } else { - UMLRole * role = dynamic_cast<UMLRole*>(parentObj); - componentName = parentDocName + "::association_field(" + role->getName() + ") accessor method"; + UMLRole * role = dynamic_cast<UMLRole*>(tqparentObj); + componentName = tqparentDocName + "::association_field(" + role->getName() + ") accessor method"; } } - //appendText(mb->getComment(), mb, parentObj, componentName); - appendText(mb->getComment(), mb->getComment(), parentObj, componentName); + //appendText(mb->getComment(), mb, tqparentObj, componentName); + appendText(mb->getComment(), mb->getComment(), tqparentObj, componentName); if(!StringIsBlank(startText)) - insert(startText,mb,false,getState().fontColor,bgcolor,parentObj); + insert(startText,mb,false,getState().fontColor,bgcolor,tqparentObj); // always insert body for methods..IF we don't, we create a // situation where the user cant edit the body (!) - insert(body,mb,true,getState().fontColor,bgcolor,parentObj); + insert(body,mb,true,getState().fontColor,bgcolor,tqparentObj); if(!StringIsBlank(endText)) - insert(endText,mb,false,getState().fontColor,bgcolor,parentObj); + insert(endText,mb,false,getState().fontColor,bgcolor,tqparentObj); } @@ -520,22 +520,22 @@ void CodeEditor::appendText(HierarchicalCodeBlock * hblock) return; OwnedHierarchicalCodeBlock * test = dynamic_cast<OwnedHierarchicalCodeBlock *>(hblock); - UMLObject * parentObj = 0; + UMLObject * tqparentObj = 0; TQString componentName = TQString(""); TQColor paperColor = getState().nonEditBlockColor; if(test) { - parentObj = test->getParentObject(); - UMLClassifier *c = dynamic_cast<UMLClassifier*>(parentObj); + tqparentObj = test->getParentObject(); + UMLClassifier *c = dynamic_cast<UMLClassifier*>(tqparentObj); if (c) { TQString typeStr; if (c->isInterface()) typeStr = "Interface"; else typeStr = "Class"; - componentName = parentDocName + "::" + typeStr + '(' + parentObj->getName() + ')'; + componentName = tqparentDocName + "::" + typeStr + '(' + tqparentObj->getName() + ')'; } else { - componentName = parentDocName + "::UNKNOWN(" + parentObj->getName() + ')'; + componentName = tqparentDocName + "::UNKNOWN(" + tqparentObj->getName() + ')'; } paperColor = getState().umlObjectColor; @@ -549,10 +549,10 @@ void CodeEditor::appendText(HierarchicalCodeBlock * hblock) TQString startText = hblock->formatMultiLineText ( hblock->getStartText(), indent, "\n"); TQString endText = hblock->formatMultiLineText( hblock->getEndText(), indent, "\n"); - appendText(hblock->getComment(), hblock, parentObj, componentName); + appendText(hblock->getComment(), hblock, tqparentObj, componentName); if(!StringIsBlank(startText)) - insert(startText,hblock,false,getState().fontColor,paperColor, parentObj); + insert(startText,hblock,false,getState().fontColor,paperColor, tqparentObj); appendText(items); if(!StringIsBlank(endText)) insert(endText,hblock,false,getState().fontColor,paperColor); @@ -621,7 +621,7 @@ void CodeEditor::slotInsertCodeBlockBeforeSelected() m_parentDoc->insertTextBlock(newBlock, tb, false); - int location = m_textBlockList.findRef(m_selectedTextBlock); // find first para of selected block + int location = m_textBlockList.tqfindRef(m_selectedTextBlock); // find first para of selected block TQString body = newBlock->formatMultiLineText (newBlock->getText(), newBlock->getIndentationString(), "\n"); @@ -643,7 +643,7 @@ void CodeEditor::slotInsertCodeBlockAfterSelected() // find last para of selected block TextBlockInfo *tbinfo = (*m_tbInfoMap)[m_selectedTextBlock]; ParaInfo * lastpi = tbinfo->m_paraList.last(); - int location = m_textBlockList.findRef(m_selectedTextBlock) + lastpi->start + lastpi->size + 1; + int location = m_textBlockList.tqfindRef(m_selectedTextBlock) + lastpi->start + lastpi->size + 1; TQString body = newBlock->formatMultiLineText (newBlock->getText(), newBlock->getIndentationString(), "\n"); @@ -659,7 +659,7 @@ TQPopupMenu * CodeEditor::createPopupMenu ( const TQPoint & pos ) m_lastPara = paragraphAt(pos); TQPopupMenu * menu = new TQPopupMenu(this); - // ugh. A bug in the Qt interaction between TQTextEdit and Menu + // ugh. A bug in the TQt interaction between TQTextEdit and Menu // can sometimes trigger a clear() call of the text area after // the popup menu is destroyed. The workaround is to disable // the behavior by blocking the destroy signal from the menu. @@ -774,13 +774,13 @@ void CodeEditor::slotRedrawText() { rebuildView(m_lastPara); } -void CodeEditor::init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc ) { +void CodeEditor::init ( CodeViewerDialog * tqparentDlg, CodeDocument * tqparentDoc ) { // safety to insure that we are up to date - parentDoc->synchronize(); + tqparentDoc->synchronize(); - m_parentDlg = parentDlg; - m_parentDoc = parentDoc; + m_parentDlg = tqparentDlg; + m_parentDoc = tqparentDoc; setUndoRedoEnabled( false ); setCursor( TQCursor( 0 ) ); @@ -798,12 +798,12 @@ void CodeEditor::init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc ) setFont( getState().font ); - // set name of parent doc + // set name of tqparent doc ClassifierCodeDocument * cdoc = dynamic_cast<ClassifierCodeDocument*>(m_parentDoc); if(cdoc) - parentDocName = cdoc->getParentClassifier()->getName(); + tqparentDocName = cdoc->getParentClassifier()->getName(); else - parentDocName = ""; + tqparentDocName = ""; // set some viewability parameters //int margin = fontMetrics().height(); @@ -832,8 +832,8 @@ void CodeEditor::updateTextBlockFromText (TextBlock * block) { TQString baseIndent = block->getIndentationString(block->getIndentationLevel()+(cmb ? 1 : 0)); TextBlockInfo *info = (*m_tbInfoMap)[block]; - UMLObject * parentObj = info->getParent(); - int pstart = m_textBlockList.findRef(block); + UMLObject * tqparentObj = info->getParent(); + int pstart = m_textBlockList.tqfindRef(block); TQString content = ""; // Assemble content from editiable paras @@ -860,10 +860,10 @@ void CodeEditor::updateTextBlockFromText (TextBlock * block) { //cerr<<"UPDATE GOT CONTENT:["<<content.latin1()<<"] to block:"<<block<<endl; block->setText(content); - // if a parent for the block, try to set its documentation + // if a tqparent for the block, try to set its documentation // as long as its NOT an accessor codeblock. - if(parentObj && !info->isCodeAccessorMethod) - parentObj->setDoc(content); + if(tqparentObj && !info->isCodeAccessorMethod) + tqparentObj->setDoc(content); // make note that its now user generated if(cmb) @@ -913,7 +913,7 @@ void CodeEditor::cursorPositionChanged(int para, int pos) int minPos = baseIndent.length(); // add indent chars to the current line, if missing - if(!m_backspacePressed && !currentParaText.contains(TQRegExp('^'+baseIndent))) + if(!m_backspacePressed && !currentParaText.tqcontains(TQRegExp('^'+baseIndent))) { insertAt(baseIndent,para,0); setCursorPosition(para,pos+minPos); @@ -957,7 +957,7 @@ void CodeEditor::cursorPositionChanged(int para, int pos) // furthermore, IF its nothing but indentation + whitespace // we switch this back to Auto-Generated. - if(cmb && contents.contains(TQRegExp('^'+baseIndent+"\\s$"))) + if(cmb && contents.tqcontains(TQRegExp('^'+baseIndent+"\\s$"))) { cmb->setContentType(CodeBlock::AutoGenerated); cmb->syncToParent(); @@ -1006,7 +1006,7 @@ bool CodeEditor::paraIsNotSingleLine (int para) TextBlock * tBlock = m_textBlockList.at(para); if(tBlock) { - int pstart = m_textBlockList.findRef(tBlock); + int pstart = m_textBlockList.tqfindRef(tBlock); TextBlockInfo *info = (*m_tbInfoMap)[tBlock]; TQPtrList<ParaInfo> list = info->m_paraList; @@ -1030,7 +1030,7 @@ bool CodeEditor::isParaEditable (int para) { int editEnd = tBlock->lastEditableLine(); bool hasEditableRange = (editStart > 0 || editEnd < 0) ? true : false; TextBlockInfo *info = (*m_tbInfoMap)[tBlock]; - int pstart = m_textBlockList.findRef(tBlock); + int pstart = m_textBlockList.tqfindRef(tBlock); int relativeLine = para - pstart; TQPtrList<ParaInfo> list = info->m_paraList; for(ParaInfo * item = list.first(); item; item=list.next()) @@ -1055,7 +1055,7 @@ void CodeEditor::changeTextBlockHighlighting(TextBlock * tBlock, bool selected) { TextBlockInfo *info = (*m_tbInfoMap)[tBlock]; TQPtrList<ParaInfo> list = info->m_paraList; - int pstart = m_textBlockList.findRef(tBlock); + int pstart = m_textBlockList.tqfindRef(tBlock); for(ParaInfo * item = list.first(); item; item=list.next()) for(int p=(item->start+pstart);p<=(item->start+pstart+item->size);p++) if(selected) @@ -1113,7 +1113,7 @@ void CodeEditor::contractSelectedParagraph( int paraToRemove ) { TextBlock * tBlock = m_textBlockList.at(paraToRemove); if(tBlock) { - int pstart = m_textBlockList.findRef(tBlock); + int pstart = m_textBlockList.tqfindRef(tBlock); TextBlockInfo *info = (*m_tbInfoMap)[tBlock]; TQPtrList<ParaInfo> list = info->m_paraList; @@ -1149,7 +1149,7 @@ void CodeEditor::expandSelectedParagraph( int priorPara ) { m_textBlockList.insert(priorPara,tBlock); TextBlockInfo *info = (*m_tbInfoMap)[tBlock]; TQPtrList<ParaInfo> list = info->m_paraList; - int pstart = m_textBlockList.findRef(tBlock); + int pstart = m_textBlockList.tqfindRef(tBlock); // now update the paragraph information bool upStartPosition = false; diff --git a/umbrello/umbrello/dialogs/codeeditor.h b/umbrello/umbrello/dialogs/codeeditor.h index 5956e3ab..b430b27d 100644 --- a/umbrello/umbrello/dialogs/codeeditor.h +++ b/umbrello/umbrello/dialogs/codeeditor.h @@ -40,13 +40,14 @@ class TextBlockInfo; class TextBlock; class ParaInfo; -class CodeEditor : public QTextEdit +class CodeEditor : public TQTextEdit { Q_OBJECT + TQ_OBJECT public: - explicit CodeEditor ( const TQString & text, const TQString & context = TQString(), CodeViewerDialog * parent = 0, const char * name = 0 , CodeDocument * doc = 0); - explicit CodeEditor ( CodeViewerDialog * parent, const char* name = 0, CodeDocument * doc = 0); + explicit CodeEditor ( const TQString & text, const TQString & context = TQString(), CodeViewerDialog * tqparent = 0, const char * name = 0 , CodeDocument * doc = 0); + explicit CodeEditor ( CodeViewerDialog * tqparent, const char* name = 0, CodeDocument * doc = 0); ~CodeEditor (); // return code viewer state @@ -62,7 +63,7 @@ protected: void appendText (CodeClassFieldDeclarationBlock * db ); void appendText (TextBlockList * items); void appendText (CodeMethodBlock * mb); - void appendText (CodeComment * comment, TextBlock * parent, UMLObject * umlObj = 0, const TQString & compName=""); + void appendText (CodeComment * comment, TextBlock * tqparent, UMLObject * umlObj = 0, const TQString & compName=""); void appendText (CodeBlockWithComments * cb ); // Rebuild our view of the document. Happens whenever we change @@ -82,7 +83,7 @@ protected: // and 'return' events. void keyPressEvent ( TQKeyEvent * e ); - // (re) load the parent code document into the editor + // (re) load the tqparent code document into the editor void loadFromDocument(); // specialized popup menu for our tool @@ -90,7 +91,7 @@ protected: private: - TQString parentDocName; + TQString tqparentDocName; CodeDocument * m_parentDoc; CodeViewerDialog * m_parentDlg; @@ -110,7 +111,7 @@ private: TextBlockList m_textBlockList; // main insert routine. Will append if startline is not supplied. - void insert (const TQString & text, TextBlock * parent, bool isEditable = false, + void insert (const TQString & text, TextBlock * tqparent, bool isEditable = false, const TQColor & fgcolor = TQColor("black"), const TQColor & bgcolor = TQColor("white"), UMLObject * umlobj = 0, const TQString & displayName = "", int startLine = -1); @@ -123,7 +124,7 @@ private: void updateTextBlockFromText (TextBlock * block); void initText ( CodeDocument * doc ); - void init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc ); + void init ( CodeViewerDialog * tqparentDlg, CodeDocument * tqparentDoc ); void changeTextBlockHighlighting(TextBlock * tb, bool selected); bool isParaEditable (int para); diff --git a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui index f0df1e17..24fea3fa 100644 --- a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui +++ b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>CodeGenerationOptionsBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CodeGenerationOptionsBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> @@ -42,7 +42,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -53,15 +53,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_SelectLanguageGroup</cstring> </property> @@ -78,14 +78,14 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>m_SelectLanguageBox</cstring> </property> </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -102,7 +102,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -110,7 +110,7 @@ <string>Write all generated files to folder:</string> </property> </widget> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>m_browseOutput</cstring> </property> @@ -118,7 +118,7 @@ <string>Bro&wse...</string> </property> </widget> - <widget class="QPushButton" row="3" column="2"> + <widget class="TQPushButton" row="3" column="2"> <property name="name"> <cstring>m_browseHeadings</cstring> </property> @@ -126,7 +126,7 @@ <string>B&rowse...</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_includeHeadings</cstring> </property> @@ -137,7 +137,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>m_outputDir</cstring> </property> @@ -145,7 +145,7 @@ <string>Files generated by Code Generator will be written to this folder</string> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>m_headingsDir</cstring> </property> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -180,7 +180,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -189,7 +189,7 @@ </spacer> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>m_overwriteGroup</cstring> </property> @@ -206,7 +206,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -215,7 +215,7 @@ generator wants to use as output file already exists:</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_overwrite</cstring> </property> @@ -226,7 +226,7 @@ generator wants to use as output file already exists:</string> <string>Overwrite existing files if they exist in the destination folder</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_ask</cstring> </property> @@ -240,7 +240,7 @@ generator wants to use as output file already exists:</string> <string>If a file with the same name already exists, ask what to do</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_changeName</cstring> </property> @@ -257,7 +257,7 @@ generator wants to use as output file already exists:</string> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -268,15 +268,15 @@ generator wants to use as output file already exists:</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -297,7 +297,7 @@ generator wants to use as output file already exists:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>30</height> @@ -314,7 +314,7 @@ generator wants to use as output file already exists:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>30</height> @@ -331,14 +331,14 @@ generator wants to use as output file already exists:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>30</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -346,7 +346,7 @@ generator wants to use as output file already exists:</string> <string>Line ending style:</string> </property> </widget> - <widget class="QLabel" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -354,7 +354,7 @@ generator wants to use as output file already exists:</string> <string>Indentation type:</string> </property> </widget> - <widget class="QLabel" row="1" column="1" rowspan="1" colspan="3"> + <widget class="TQLabel" row="1" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -362,7 +362,7 @@ generator wants to use as output file already exists:</string> <string>Indentation amount:</string> </property> </widget> - <widget class="QComboBox" row="2" column="2" rowspan="1" colspan="3"> + <widget class="TQComboBox" row="2" column="2" rowspan="1" colspan="3"> <item> <property name="text"> <string>*NIX ("\n")</string> @@ -382,7 +382,7 @@ generator wants to use as output file already exists:</string> <cstring>m_SelectEndLineCharsBox</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="3" rowspan="1" colspan="2"> + <widget class="TQComboBox" row="0" column="3" rowspan="1" colspan="2"> <item> <property name="text"> <string>No Indentation</string> @@ -409,18 +409,18 @@ generator wants to use as output file already exists:</string> </widget> </grid> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>GroupBox3</cstring> </property> <property name="title"> <string>Comment Verbosity</string> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_forceSections</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>60</y> @@ -436,11 +436,11 @@ is empty</string> <string>Writes comments to indicate the different sections (public, private etc) in a class, even if the sections are empty</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_forceDoc</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>11</x> <y>29</y> @@ -460,7 +460,7 @@ is empty</string> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -471,7 +471,7 @@ is empty</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame" row="0" column="0"> + <widget class="TQFrame" row="0" column="0"> <property name="name"> <cstring>languageOptionsFrame</cstring> </property> @@ -521,11 +521,11 @@ is empty</string> <slot>activeLanguageChanged(int)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">browseClicked()</slot> <slot access="protected">activeLanguageChanged(int id)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp index 8fdb046c..ab54eb3d 100644 --- a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp +++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp @@ -37,8 +37,8 @@ #include <tqlistview.h> #include <tqbuttongroup.h> -CodeGenerationOptionsPage::CodeGenerationOptionsPage(TQWidget *parent) - : CodeGenerationOptionsBase(parent) +CodeGenerationOptionsPage::CodeGenerationOptionsPage(TQWidget *tqparent) + : CodeGenerationOptionsBase(tqparent) { init(); } @@ -154,7 +154,7 @@ void CodeGenerationOptionsPage::apply() { m_parentPolicy->setIndentationAmount(m_SelectIndentationNumber->value()); // emit in THIS order.. the first signal triggers any sub-class to do its apply - // slot, THEN, once we are all updated, we may sync the parent generator's code + // slot, THEN, once we are all updated, we may sync the tqparent generator's code // documents emit applyClicked(); emit syncCodeDocumentsToParent(); @@ -171,7 +171,7 @@ void CodeGenerationOptionsPage::setDefaults() { void CodeGenerationOptionsPage::browseClicked() { - TQString button = sender()->name(); + TQString button = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(); TQString dir = KFileDialog::getExistingDirectory(); if(dir.isEmpty()) return; diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.h b/umbrello/umbrello/dialogs/codegenerationoptionspage.h index 6cd7a2e7..f444254e 100644 --- a/umbrello/umbrello/dialogs/codegenerationoptionspage.h +++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.h @@ -39,8 +39,9 @@ class CodeGenerationPolicyPage; class CodeGenerationOptionsPage : public CodeGenerationOptionsBase { Q_OBJECT + TQ_OBJECT public: - CodeGenerationOptionsPage(TQWidget *parent=0); + CodeGenerationOptionsPage(TQWidget *tqparent=0); ~CodeGenerationOptionsPage(); void setDefaults(); TQString getCodeGenerationLanguage(); diff --git a/umbrello/umbrello/dialogs/codegenerationpolicybase.ui b/umbrello/umbrello/dialogs/codegenerationpolicybase.ui index bbc739a7..bb48596d 100644 --- a/umbrello/umbrello/dialogs/codegenerationpolicybase.ui +++ b/umbrello/umbrello/dialogs/codegenerationpolicybase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>CodeGenerationPolicyBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CodeGenerationPolicyBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -12,11 +12,11 @@ <height>515</height> </rect> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>policyFrame</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>30</x> <y>20</y> @@ -32,8 +32,8 @@ </property> </widget> </widget> -<slots> +<Q_SLOTS> <slot access="protected">apply()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp b/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp index 0e488e75..0cdd5e08 100644 --- a/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp +++ b/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp @@ -29,8 +29,8 @@ /** This is the page which comes up IF there is no special options for the * code generator. */ -CodeGenerationPolicyPage::CodeGenerationPolicyPage( TQWidget *parent, const char *name, CodeGenPolicyExt * policy ) - :CodeGenerationPolicyBase(parent,name) +CodeGenerationPolicyPage::CodeGenerationPolicyPage( TQWidget *tqparent, const char *name, CodeGenPolicyExt * policy ) + :CodeGenerationPolicyBase(tqparent,name) { m_parentPolicy = policy; } diff --git a/umbrello/umbrello/dialogs/codegenerationpolicypage.h b/umbrello/umbrello/dialogs/codegenerationpolicypage.h index 959e34aa..54723dd3 100644 --- a/umbrello/umbrello/dialogs/codegenerationpolicypage.h +++ b/umbrello/umbrello/dialogs/codegenerationpolicypage.h @@ -31,8 +31,9 @@ class CodeGenPolicyExt; class CodeGenerationPolicyPage : public CodeGenerationPolicyBase { Q_OBJECT + TQ_OBJECT public: - explicit CodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, CodeGenPolicyExt * policy = 0); + explicit CodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, CodeGenPolicyExt * policy = 0); virtual ~CodeGenerationPolicyPage(); diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.cpp b/umbrello/umbrello/dialogs/codegenerationwizard.cpp index b64e30dc..dbd47a94 100644 --- a/umbrello/umbrello/dialogs/codegenerationwizard.cpp +++ b/umbrello/umbrello/dialogs/codegenerationwizard.cpp @@ -125,7 +125,7 @@ void CodeGenerationWizard::generateCode() { } void CodeGenerationWizard::classGenerated(UMLClassifier* concept, bool generated) { - TQListViewItem* item = m_statusList->findItem( concept->getFullyQualifiedName(), 0 ); + TQListViewItem* item = m_statusList->tqfindItem( concept->getFullyQualifiedName(), 0 ); if( !item ) { kError()<<"GenerationStatusPage::Error finding class in list view"<<endl; } else if (generated) { @@ -159,13 +159,13 @@ void CodeGenerationWizard::showPage(TQWidget *page) { if(!info.exists()) { if (KMessageBox::questionYesNo(this, - i18n("The folder %1 does not exist. Do you want to create it now?").arg(info.filePath()), + i18n("The folder %1 does not exist. Do you want to create it now?").tqarg(info.filePath()), i18n("Output Folder Does Not Exist"), i18n("Create Folder"), i18n("Do Not Create")) == KMessageBox::Yes) { TQDir dir; if(!dir.mkdir(info.filePath())) { - KMessageBox::sorry(this,i18n("The folder could not be created.\nPlease make sure you have write access to its parent folder or select another, valid, folder."), + KMessageBox::sorry(this,i18n("The folder could not be created.\nPlease make sure you have write access to its tqparent folder or select another, valid, folder."), i18n("Error Creating Folder")); return; } @@ -188,7 +188,7 @@ void CodeGenerationWizard::showPage(TQWidget *page) { // it exits and we can write... make sure it is a directory if(!info.isDir()) { - KMessageBox::sorry(this,i18n("%1 does not seem to be a folder. Please choose a valid folder.").arg(info.filePath()), + KMessageBox::sorry(this,i18n("%1 does not seem to be a folder. Please choose a valid folder.").tqarg(info.filePath()), i18n("Please Choose Valid Folder")); return; } @@ -232,7 +232,7 @@ void CodeGenerationWizard::moveSelectedItems(TQListView* fromList, TQListView* t TQListViewItem* selectedItem = it.current(); TQString name = selectedItem->text(0); - if (!toList->findItem(name, 0)) { + if (!toList->tqfindItem(name, 0)) { new TQListViewItem(toList, name); } diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.h b/umbrello/umbrello/dialogs/codegenerationwizard.h index 2fec8046..13d36927 100644 --- a/umbrello/umbrello/dialogs/codegenerationwizard.h +++ b/umbrello/umbrello/dialogs/codegenerationwizard.h @@ -39,6 +39,7 @@ class CodeGenerationOptionsPage; class CodeGenerationWizard : public CodeGenerationWizardBase { Q_OBJECT + TQ_OBJECT public: CodeGenerationWizard(UMLClassifierList *classList); ~CodeGenerationWizard(); diff --git a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui index 732aa0c7..be3de2e9 100644 --- a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui +++ b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>CodeGenerationWizardBase</class> -<widget class="QWizard"> +<widget class="TQWizard"> <property name="name"> <cstring>CodeGenerationWizardBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -15,7 +15,7 @@ <property name="caption"> <string>Code Generation Wizard</string> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>select</cstring> </property> @@ -32,7 +32,7 @@ <property name="spacing"> <number>10</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -41,7 +41,7 @@ for in the right hand side list</string> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame4</cstring> </property> @@ -64,7 +64,7 @@ for in the right hand side list</string> <property name="spacing"> <number>10</number> </property> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>m_addButton</cstring> </property> @@ -88,14 +88,14 @@ for in the right hand side list</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QListView" row="0" column="2" rowspan="5" colspan="1"> + <widget class="TQListView" row="0" column="2" rowspan="5" colspan="1"> <column> <property name="text"> <string>Classes Selected</string> @@ -122,7 +122,7 @@ for in the right hand side list</string> <enum>Extended</enum> </property> </widget> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>m_removeButton</cstring> </property> @@ -146,14 +146,14 @@ for in the right hand side list</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QListView" row="0" column="0" rowspan="5" colspan="1"> + <widget class="TQListView" row="0" column="0" rowspan="5" colspan="1"> <column> <property name="text"> <string>Classes Available</string> @@ -190,7 +190,7 @@ for in the right hand side list</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -201,12 +201,12 @@ for in the right hand side list</string> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>status</cstring> </property> <attribute name="title"> - <string>Code Generation Status</string> + <string>Code Generation tqStatus</string> </attribute> <vbox> <property name="name"> @@ -218,7 +218,7 @@ for in the right hand side list</string> <property name="spacing"> <number>10</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_label</cstring> </property> @@ -226,12 +226,12 @@ for in the right hand side list</string> <string>Press the Generation button to start the code generation</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox2</cstring> </property> <property name="title"> - <string>Generation Status</string> + <string>Generation tqStatus</string> </property> <vbox> <property name="name"> @@ -243,7 +243,7 @@ for in the right hand side list</string> <property name="spacing"> <number>10</number> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Class</string> @@ -257,7 +257,7 @@ for in the right hand side list</string> </column> <column> <property name="text"> - <string>Generation Status</string> + <string>Generation tqStatus</string> </property> <property name="clickable"> <bool>true</bool> @@ -300,10 +300,10 @@ for in the right hand side list</string> <forwards> <forward>class UMLClassifier</forward> </forwards> -<slots> +<Q_SLOTS> <slot>selectClass()</slot> <slot access="protected">deselectClass()</slot> <slot>classGenerated( UMLClassifier * /* c */ )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.cpp b/umbrello/umbrello/dialogs/codeviewerdialog.cpp index 479fcb6b..ef0091fe 100644 --- a/umbrello/umbrello/dialogs/codeviewerdialog.cpp +++ b/umbrello/umbrello/dialogs/codeviewerdialog.cpp @@ -30,10 +30,10 @@ #include "../classifiercodedocument.h" #include "codeeditor.h" -CodeViewerDialog::CodeViewerDialog ( TQWidget* parent, CodeDocument * doc, +CodeViewerDialog::CodeViewerDialog ( TQWidget* tqparent, CodeDocument * doc, Settings::CodeViewerState state, const char* name, bool modal, WFlags fl ) - : CodeViewerDialogBase ( parent, name, modal, fl ) + : CodeViewerDialogBase ( tqparent, name, modal, fl ) { m_state = state; @@ -49,7 +49,7 @@ CodeViewerDialog::CodeViewerDialog ( TQWidget* parent, CodeDocument * doc, */ CodeViewerDialog::~CodeViewerDialog() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } void CodeViewerDialog::initGUI ( const char * name) { @@ -69,7 +69,7 @@ void CodeViewerDialog::initGUI ( const char * name) { CodeViewerDialogBaseLayout->setMargin(margin); - resize( TQSize(width, height).expandedTo(minimumSizeHint()) ); + resize( TQSize(width, height).expandedTo(tqminimumSizeHint()) ); } diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.h b/umbrello/umbrello/dialogs/codeviewerdialog.h index e27607bc..0f447d3a 100644 --- a/umbrello/umbrello/dialogs/codeviewerdialog.h +++ b/umbrello/umbrello/dialogs/codeviewerdialog.h @@ -42,16 +42,17 @@ class UMLObject; class CodeViewerDialog : public CodeViewerDialogBase { Q_OBJECT + TQ_OBJECT public: - CodeViewerDialog ( TQWidget* parent, CodeDocument * doc, Settings::CodeViewerState state, + CodeViewerDialog ( TQWidget* tqparent, CodeDocument * doc, Settings::CodeViewerState state, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~CodeViewerDialog (); /** return the code viewer state */ Settings::CodeViewerState getState( ); - TQString parentDocName; + TQString tqparentDocName; /** * Adds a code document to the tabbed output diff --git a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui index 672aefdb..d8efcf93 100644 --- a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui +++ b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>CodeViewerDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>CodeViewerDialogBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -27,15 +27,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>m_showHiddenCodeCB</cstring> </property> @@ -43,7 +43,7 @@ <string>Show hidden blocks</string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>componentLabel</cstring> </property> @@ -62,7 +62,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>m_exitButton</cstring> </property> @@ -78,7 +78,7 @@ <string>Close</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>m_highlightCheckBox</cstring> </property> @@ -91,7 +91,7 @@ </widget> </grid> </widget> - <widget class="QTabWidget" row="1" column="0"> + <widget class="TQTabWidget" row="1" column="0"> <property name="name"> <cstring>m_tabWidget</cstring> </property> @@ -106,8 +106,8 @@ <slot>close()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>changeHighlighting(int)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui index 99fd198d..6845d23d 100644 --- a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui +++ b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>CodeViewerOptionsBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CodeViewerOptionsBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -29,9 +29,9 @@ </sizepolicy> </property> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> - <cstring>colorGroupBox</cstring> + <cstring>tqcolorGroupBox</cstring> </property> <property name="sizePolicy"> <sizepolicy> @@ -48,7 +48,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>colorLayout</cstring> </property> @@ -56,7 +56,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>fontLabel</cstring> </property> @@ -87,7 +87,7 @@ </color> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>paperLabel</cstring> </property> @@ -118,7 +118,7 @@ </color> </property> </widget> - <widget class="QLabel" row="0" column="4"> + <widget class="TQLabel" row="0" column="4"> <property name="name"> <cstring>selectedLabel</cstring> </property> @@ -159,9 +159,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> @@ -190,9 +190,9 @@ </color> </property> </widget> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> @@ -244,7 +244,7 @@ </color> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -260,7 +260,7 @@ <string><p align="right">UML object block:</p></string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -278,7 +278,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -317,7 +317,7 @@ </color> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -362,7 +362,7 @@ <data format="XPM.GZ" length="4462">789c9d97c76e24490e86effd1442f3d65870d2451a0ce6206f5adeb4cc620f8c34f2553225b5a4c1befb46927fe6a1d4c0ccac4287fa8a0c26834193f5dbb785b3fd9d856fbf7d799ec9ecba5ea8afe469e15bf3727ffffeeffffcf1e797af49b2d0ffc7d142f2f55f5fbe1ecc16ea85dde9a4ed81290045faa77ca49cf4ab67ba1e3953969173651ab9d4fdf1c8a27c3872ad7c3c72d3b32c2a67c3f3444636fbef23eb7e590267e68fcc4656395d8dacf6d938ef97eaef289781cddebdb2846fccff44b989ba58e3411f3dc75158e6df1d3889539517ca49bf54fe43398d1dec4f46567f685fd9c539f43fc025f80c1c3ce8d93f28e77185f8bf0c6cfae4c0b5f9c3c6e5c0542a4b5876fe13708df39d2bd7716372aa8c93c4e4723bb2f977aadc26ceec4bdb7310e6b0bfab9c2445ecd49f1370694cebca65d260ffa6711a41aef14d24e94cee6be3348e0ae5e9c8765f07ca3e8db17f0f9c825794eb3489351fe9bb7217e4969f29388bd51ee9fda5715a19730696b852fea95c6471647ca95cf64bcf43e0cef4657b647bfe6acf213d6bb32f9a9f5992b5a64f9a8f990b6cf9ecc15d6cf9acf6b2da55a8a75cb973dee4b2d1b38b5c05de02434e87e01aacfb351df5bebddea74b5c67f9c795711ea15e357e2ecde358fb87efc0a867df8cac728a074e62e527706afb59f3cf6583be5c28bb3c35f693812d1fbdc6dbe57966fec932d899ffa4f7e38adca17e34beaeca4b9c271a18f1d5fc739257b0d70d9c68be7bed7fcee7827ab91cd8e4740cf6b19d4ffb87ab07b9bf516e72d4a3ac821b9cef6e60d84f47367ded2fae1d9f7704f6163f79000ffde27660f387ed3c5dbf54dfeebb0bf6acbe6b706bfa5ef32f8f8b18f5bf0f463f20edb77956a4e68fbc80b3c4facd163847be6bfde72ec86dbeac82715fbc0286be683cf3bc081d44f7df80d344fb0b6b7de64581fb916765297263d6fccd9b7ee97e566e8b06cfdb1f59cf2bda2f8bbc2c11df0c5c41aefdb328ca22b1feb0012eedbce24736f91b18fb796d64eb87cb60817dcdafb07d906bfd14d22f659d8785ef97b2f6d7b2df6ef1d6fb2babaac6f92e8c25b27ecc1f239b7f3a5fca5a8678ea7c2d9bc0e6ef1238b3fca2c7814d5f4cbf9334b5f833384bed3c7a5f5514f4adbe2ec07962e7590457f06f6f649b977afe2a16f42f5e070bfc591e18f7a5f1a812a9e0df39d827da4fbd8c6ccfd7785569bf945f953371a9d5a3de67950bfa2d75c63eb2fb15bdcfaaf011e6c7263846bf8f4636f91618f3c7d3c0f047fb69550efab2074e12bd6fd27957553ec33c5b043bcc7f9d0795f818fdb501a3df8ae673e507ff69021eea37063bc45ffb73550736ff36c0a84f3e0317a86f8b5f139e6ffe1f821de6d9127898ff3be00a7c3ab2cd03e3d697560ff40016e47b3bb2e96bbd559d8f32bbff4b7065f193042c98873acf240af6adbf3c83c5f2954bb0c7bcd77c107d81d2fdebc63e33ff640aaecc9e1c8151df5c803dfaadc64b52dfa03ed64636ffb4ff4b2867f453ede7227586fcd3f9264ded91fffafe236d5da37fe83c91ceb7b9e5b7f6731ff92ed7f747d6fbf7e185cf58347e3e6932e47b3430fa893edf87d795c2fc3f003b67f5f902cec17abfde0dfa3c053b3c5ffb832fc2eb8fddcf233887fc195c801f46b6f3cdc02558fba72f7d2d1a7f7e321ee58fe0cad86bbff24dd3e2fe74fef836b0c6eb60d62fa6bf5e07b3419f853dd7dc70fb8bd5f1255fd90ed30f9f3c5ff30ddff21ddff384a7fcc08ffcc4cf61cdf8855ff9e79c7e1db4dff89d3f7891977899577895d7789d377893b7f83b6fcfe937bc13b477798ff7f9800ff928ac633ee11f7cca6761d7f99c7e1b3cb908da11c7413be1943376e153cc39175c72f549ff9e17c31744429e6a6aa8a58e2ee98aaee9866e7f617fc24b7417a4f734a1293dd0233dd133cd8285177aa5f9f3b63ca5377aa78f607b919668995682e62aadd17ab0b1419b9ff41f682b48bed336edd02eed05ed7d5ea3033a0cdf1ed1f127fd273ae123fa41a774a6b685cee982228a837e42e927fd47caf8985c38651eb40b2ac38e4a5842658a97fab33fd248cb87d2c9a55cc9b5dcc82d1fc99ddccb44a6f230af2f8ff224cf417f262ff22a3fe54ddee543166549966545567f617f4dd66523dc6b2c9bb225df655b7682f692ecca9eeccfe97772c09b722847722c27c1f3eb70f66bf9116c9fca999ccbc59cfe25bf4a143a5ef8992561324a78bd92522acf9ebc78efe7cf7b153276db37bef59dbff457fedadff85b7f27abfede4ffcd4cf9ff76faeff4fffefeff8c7f5fedfdfbffc0fa355c495</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/umbrello/umbrello/dialogs/codevieweroptionspage.cpp b/umbrello/umbrello/dialogs/codevieweroptionspage.cpp index f4715b0d..3950d682 100644 --- a/umbrello/umbrello/dialogs/codevieweroptionspage.cpp +++ b/umbrello/umbrello/dialogs/codevieweroptionspage.cpp @@ -26,8 +26,8 @@ #include <kcolorbutton.h> -CodeViewerOptionsPage::CodeViewerOptionsPage( Settings::CodeViewerState options, TQWidget *parent, const char *name ) - :CodeViewerOptionsBase(parent,name) +CodeViewerOptionsPage::CodeViewerOptionsPage( Settings::CodeViewerState options, TQWidget *tqparent, const char *name ) + :CodeViewerOptionsBase(tqparent,name) { init (options); } diff --git a/umbrello/umbrello/dialogs/codevieweroptionspage.h b/umbrello/umbrello/dialogs/codevieweroptionspage.h index fae3cb05..f5a21736 100644 --- a/umbrello/umbrello/dialogs/codevieweroptionspage.h +++ b/umbrello/umbrello/dialogs/codevieweroptionspage.h @@ -28,8 +28,9 @@ class CodeViewerOptionsPage : public CodeViewerOptionsBase { Q_OBJECT + TQ_OBJECT public: - CodeViewerOptionsPage (Settings::CodeViewerState options, TQWidget *parent, const char *name=0); + CodeViewerOptionsPage (Settings::CodeViewerState options, TQWidget *tqparent, const char *name=0); ~CodeViewerOptionsPage(); Settings::CodeViewerState getOptions(); diff --git a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp index 3da163b7..9732bbaf 100644 --- a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp +++ b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp @@ -29,10 +29,10 @@ /** This is the page which comes up IF there is no special options for the * code generator. */ -DefaultCodeGenPolicyPage::DefaultCodeGenPolicyPage ( TQWidget *parent, const char *name, CodeGenPolicyExt * policy ) - :CodeGenerationPolicyPage(parent,name,policy) +DefaultCodeGenPolicyPage::DefaultCodeGenPolicyPage ( TQWidget *tqparent, const char *name, CodeGenPolicyExt * policy ) + :CodeGenerationPolicyPage(tqparent,name,policy) { - textLabel = new TQLabel(parent,"textLabel"); + textLabel = new TQLabel(tqparent,"textLabel"); textLabel->setText(tr2i18n("<p align=\"center\">No Options Available.</p>")); } diff --git a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h index 68f55066..2bbf169c 100644 --- a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h +++ b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h @@ -24,10 +24,11 @@ class CodeGenePolicyExt; class DefaultCodeGenPolicyPage : public CodeGenerationPolicyPage { Q_OBJECT + TQ_OBJECT public: - explicit DefaultCodeGenPolicyPage( TQWidget* parent = 0, const char* name = 0, CodeGenPolicyExt * policy =0); + explicit DefaultCodeGenPolicyPage( TQWidget* tqparent = 0, const char* name = 0, CodeGenPolicyExt * policy =0); ~DefaultCodeGenPolicyPage(); diff --git a/umbrello/umbrello/dialogs/diagramprintpage.cpp b/umbrello/umbrello/dialogs/diagramprintpage.cpp index 8374def4..cff98397 100644 --- a/umbrello/umbrello/dialogs/diagramprintpage.cpp +++ b/umbrello/umbrello/dialogs/diagramprintpage.cpp @@ -30,7 +30,7 @@ #include "../umlnamespace.h" -DiagramPrintPage::DiagramPrintPage(TQWidget * parent, UMLDoc * m_pDoc) : KPrintDialogPage(parent), m_pDoc(m_pDoc) { +DiagramPrintPage::DiagramPrintPage(TQWidget * tqparent, UMLDoc * m_pDoc) : KPrintDialogPage(tqparent), m_pDoc(m_pDoc) { int margin = fontMetrics().height(); setTitle(i18n("&Diagrams")); TQHBoxLayout * mainLayout = new TQHBoxLayout(this); @@ -112,13 +112,13 @@ void DiagramPrintPage::getOptions( TQMap<TQString,TQString>& opts, bool /*inclde for(int i=0;i<listCount;i++) { if(m_pSelectLB -> isSelected(i)) { UMLView *view = (UMLView *)m_pDoc -> findView(m_nIdList[i]); - TQString sCount = TQString("%1").arg(count); - TQString sID = TQString("%1").arg(ID2STR(view -> getID())); + TQString sCount = TQString("%1").tqarg(count); + TQString sID = TQString("%1").tqarg(ID2STR(view -> getID())); opts.insert(diagram + sCount, sID); count++; } } - opts.insert("kde-uml-count", TQString("%1").arg(count)); + opts.insert("kde-uml-count", TQString("%1").tqarg(count)); } void DiagramPrintPage::setOptions( const TQMap<TQString,TQString>& /*opts*/ ) {} diff --git a/umbrello/umbrello/dialogs/diagramprintpage.h b/umbrello/umbrello/dialogs/diagramprintpage.h index d5f55933..94e1deb5 100644 --- a/umbrello/umbrello/dialogs/diagramprintpage.h +++ b/umbrello/umbrello/dialogs/diagramprintpage.h @@ -36,14 +36,15 @@ class TQGroupBox; class DiagramPrintPage : public KPrintDialogPage { Q_OBJECT + TQ_OBJECT public: /** * Constructs the diagram print page. * - * @param parent The parent to the page. + * @param tqparent The tqparent to the page. * @param doc The @ref UMLDoc class instance being used. */ - DiagramPrintPage(TQWidget * parent, UMLDoc *doc); + DiagramPrintPage(TQWidget * tqparent, UMLDoc *doc); /** * Stnadard deconstructor. diff --git a/umbrello/umbrello/dialogs/diagrampropertiespage.ui b/umbrello/umbrello/dialogs/diagrampropertiespage.ui index 8a8d2826..bf07ce16 100644 --- a/umbrello/umbrello/dialogs/diagrampropertiespage.ui +++ b/umbrello/umbrello/dialogs/diagrampropertiespage.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>DiagramPropertiesPage</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DiagramPropertiesPage</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -39,7 +39,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -53,7 +53,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -61,30 +61,30 @@ <string>Name:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>diagramName</cstring> </property> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout20</cstring> + <cstring>tqlayout20</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -92,7 +92,7 @@ <string>Zoom:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>zoom</cstring> </property> @@ -111,7 +111,7 @@ <number>10</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -131,14 +131,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>showOpSigs</cstring> </property> @@ -162,23 +162,23 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>showGrid</cstring> </property> @@ -186,7 +186,7 @@ <string>Show &grid</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>snapToGrid</cstring> </property> @@ -194,7 +194,7 @@ <string>Snap &to grid</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>snapComponentSizeToGrid</cstring> </property> @@ -218,7 +218,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -227,15 +227,15 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -249,7 +249,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -257,7 +257,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <string>Grid spacing: </string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabelX</cstring> </property> @@ -265,7 +265,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <string>X</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>gridSpaceX</cstring> </property> @@ -276,7 +276,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <number>5</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -284,7 +284,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <string>Y</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>gridSpaceY</cstring> </property> @@ -307,7 +307,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -316,15 +316,15 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -338,7 +338,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabe15</cstring> </property> @@ -346,7 +346,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <string>Line width: </string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>lineWidth</cstring> </property> @@ -369,7 +369,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -380,7 +380,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox2</cstring> </property> @@ -397,7 +397,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <property name="spacing"> <number>6</number> </property> - <widget class="QTextEdit" row="0" column="0"> + <widget class="TQTextEdit" row="0" column="0"> <property name="name"> <cstring>documentation</cstring> </property> @@ -406,5 +406,5 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp index b72901be..fa1e6d60 100644 --- a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp +++ b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp @@ -12,7 +12,7 @@ // own header #include "exportallviewsdialog.h" -// include files for Qt +// include files for TQt #include <tqlayout.h> #include <tqlabel.h> #include <tqtooltip.h> @@ -25,15 +25,15 @@ #include "../umlviewimageexportermodel.h" ExportAllViewsDialog::ExportAllViewsDialog( - TQWidget* parent /* = 0 */, + TQWidget* tqparent /* = 0 */, const char* name /* = 0 */, bool modal /* = false */, WFlags fl /* = 0*/, const TQString &defaultMimeType /*= "image/png"*/) - : ExportAllViewsDialogBase(parent,name, modal,fl) { + : ExportAllViewsDialogBase(tqparent,name, modal,fl) { // create and initialize m_imageType m_imageType = new KFileFilterCombo(this, "m_imageType"); - m_imageType->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth())); + m_imageType->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth())); m_imageType->setEditable(false); m_imageType->setMimeFilter(UMLViewImageExporterModel::supportedMimeTypes(), defaultMimeType); diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.h b/umbrello/umbrello/dialogs/exportallviewsdialog.h index 793f69b9..3b28037c 100644 --- a/umbrello/umbrello/dialogs/exportallviewsdialog.h +++ b/umbrello/umbrello/dialogs/exportallviewsdialog.h @@ -28,22 +28,23 @@ class KFileFilterCombo; */ class ExportAllViewsDialog : public ExportAllViewsDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor for UMLViewImageExporterModel. * - * @param parent The parent of the dialog. + * @param tqparent The tqparent of the dialog. * @param name The internal name. * @param modal If modal is true the dialog will block input to other the windows * in the application until it's closed. * @param fl Window flags. * @param defaultMimeType The default mime type that appears in the mime types list. * - * @see TQDialog::QDialog + * @see TQDialog::TQDialog */ - explicit ExportAllViewsDialog(TQWidget* parent = 0, const char* name = 0, + explicit ExportAllViewsDialog(TQWidget* tqparent = 0, const char* name = 0, bool modal = false, WFlags fl = 0, const TQString& defaultMimeType = "image/png"); diff --git a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui index c82820a3..a97e6ff0 100644 --- a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui +++ b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ExportAllViewsDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>ExportAllViewsDialogBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>mainLayout</cstring> </property> @@ -33,7 +33,7 @@ <property name="spacing"> <number>15</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>kURLRequesterLayout</cstring> </property> @@ -41,7 +41,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>kURLRequesterLabel</cstring> </property> @@ -68,7 +68,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>imageTypeLayout</cstring> </property> @@ -76,7 +76,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>imageTypeLabel</cstring> </property> @@ -92,7 +92,7 @@ </widget> </vbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_useFolders</cstring> </property> @@ -120,14 +120,14 @@ Only the folders made by the user are created in the base directory (Logical vie <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>buttonsLayout</cstring> </property> @@ -151,14 +151,14 @@ Only the folders made by the user are created in the base directory (Logical vie <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -175,7 +175,7 @@ Only the folders made by the user are created in the base directory (Logical vie <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -207,7 +207,7 @@ Only the folders made by the user are created in the base directory (Logical vie <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/umbrello/umbrello/dialogs/notedialog.cpp b/umbrello/umbrello/dialogs/notedialog.cpp index effb585d..420b425e 100644 --- a/umbrello/umbrello/dialogs/notedialog.cpp +++ b/umbrello/umbrello/dialogs/notedialog.cpp @@ -22,7 +22,7 @@ #include <kmessagebox.h> -NoteDialog::NoteDialog( TQWidget * parent, NoteWidget * pNote ) : KDialogBase(Plain, i18n("Note Documentation"), Help | Ok | Cancel , Ok, parent, "_NOTEDIALOG_", true, true) { +NoteDialog::NoteDialog( TQWidget * tqparent, NoteWidget * pNote ) : KDialogBase(Plain, i18n("Note Documentation"), Help | Ok | Cancel , Ok, tqparent, "_NOTEDIALOG_", true, true) { m_pNoteWidget = pNote; int margin = fontMetrics().height(); diff --git a/umbrello/umbrello/dialogs/notedialog.h b/umbrello/umbrello/dialogs/notedialog.h index 22f41708..6f6e2fd2 100644 --- a/umbrello/umbrello/dialogs/notedialog.h +++ b/umbrello/umbrello/dialogs/notedialog.h @@ -27,12 +27,13 @@ class TQTextEdit; class NoteDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructs an NoteDialog. */ - NoteDialog( TQWidget * parent, NoteWidget * pNote ); + NoteDialog( TQWidget * tqparent, NoteWidget * pNote ); /** * Standard deconstructor. diff --git a/umbrello/umbrello/dialogs/overwritedialogue.cpp b/umbrello/umbrello/dialogs/overwritedialogue.cpp index c9cb8b92..c7661ced 100644 --- a/umbrello/umbrello/dialogs/overwritedialogue.cpp +++ b/umbrello/umbrello/dialogs/overwritedialogue.cpp @@ -23,17 +23,17 @@ OverwriteDialogue::OverwriteDialogue( const TQString& fileName, const TQString& outputDirectory, - bool applyToAllRemaining, TQWidget* parent, const char* name) : -KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes, parent, name) { + bool applyToAllRemaining, TQWidget* tqparent, const char* name) : +KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes, tqparent, name) { - TQVBoxLayout* layout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); - TQLabel* dialogueLabel = new TQLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").arg(fileName).arg(outputDirectory), plainPage() ); - layout->addWidget(dialogueLabel); + TQLabel* dialogueLabel = new TQLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").tqarg(fileName).tqarg(outputDirectory), plainPage() ); + tqlayout->addWidget(dialogueLabel); m_applyToAllRemaining = new TQCheckBox( i18n("&Apply to all remaining files"), plainPage() ); m_applyToAllRemaining->setChecked(applyToAllRemaining); - layout->addWidget(m_applyToAllRemaining); + tqlayout->addWidget(m_applyToAllRemaining); setButtonText(KDialogBase::Ok, i18n("&Overwrite")); setButtonText(KDialogBase::Apply, i18n("&Generate Similar File Name")); diff --git a/umbrello/umbrello/dialogs/overwritedialogue.h b/umbrello/umbrello/dialogs/overwritedialogue.h index 3c49cd34..f67d7673 100644 --- a/umbrello/umbrello/dialogs/overwritedialogue.h +++ b/umbrello/umbrello/dialogs/overwritedialogue.h @@ -29,13 +29,14 @@ class TQCheckBox; */ class OverwriteDialogue: public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * constructor sets up the dialog, adding checkbox and label */ OverwriteDialogue(const TQString& fileName, const TQString& outputDirectory, - bool applyToAllRemaining, TQWidget* parent=0, const char* name=0); + bool applyToAllRemaining, TQWidget* tqparent=0, const char* name=0); /** * destrictor doesn't do anything diff --git a/umbrello/umbrello/dialogs/parmpropdlg.cpp b/umbrello/umbrello/dialogs/parmpropdlg.cpp index 38a75292..ce5b5590 100644 --- a/umbrello/umbrello/dialogs/parmpropdlg.cpp +++ b/umbrello/umbrello/dialogs/parmpropdlg.cpp @@ -31,8 +31,8 @@ #include "parmpropdlg.moc" -ParmPropDlg::ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a) - : KDialogBase(Plain, i18n("Parameter Properties"), Help | Ok | Cancel , Ok, parent, "_PARMPROPDLG_", true, true) +ParmPropDlg::ParmPropDlg(TQWidget * tqparent, UMLDoc * doc, UMLAttribute * a) + : KDialogBase(Plain, i18n("Parameter Properties"), Help | Ok | Cancel , Ok, tqparent, "_PARMPROPDLG_", true, true) { m_pUmldoc = doc; m_pAtt = a; @@ -127,9 +127,9 @@ ParmPropDlg::ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a) // m_pTypeCB->setAutoCompletion(false); //add template parameters - UMLClassifier *pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->parent()->parent() ); + UMLClassifier *pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->tqparent()->tqparent() ); if (pConcept == NULL) { - kError() << "ParmPropDlg: grandparent of " << m_pAtt->getName() + kError() << "ParmPropDlg: grandtqparent of " << m_pAtt->getName() << " is not a UMLClassifier" << endl; } else { UMLTemplateList tmplParams( pConcept->getTemplateList() ); @@ -219,9 +219,9 @@ void ParmPropDlg::slotOk() { m_pAtt->setParmKind( getParmKind() ); m_pAtt->setStereotype( m_pStereoTypeCB->currentText() ); TQString typeName = m_pTypeCB->currentText(); - UMLClassifier * pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->parent()->parent() ); + UMLClassifier * pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->tqparent()->tqparent() ); if (pConcept == NULL) { - kError() << "ParmPropDlg::slotOk: grandparent of " << m_pAtt->getName() + kError() << "ParmPropDlg::slotOk: grandtqparent of " << m_pAtt->getName() << " is not a UMLClassifier" << endl; } else { UMLTemplate *tmplParam = pConcept->findTemplate(typeName); diff --git a/umbrello/umbrello/dialogs/parmpropdlg.h b/umbrello/umbrello/dialogs/parmpropdlg.h index b8efd75b..8beca582 100644 --- a/umbrello/umbrello/dialogs/parmpropdlg.h +++ b/umbrello/umbrello/dialogs/parmpropdlg.h @@ -29,7 +29,7 @@ class UMLDoc; /** * Displays a dialog box that displays properties of a paramater. * You need to make sure that @ref UMLDoc is made to be the - * parent. + * tqparent. * * @short A properties dialog box for a parameter. * @author Paul Hensgen <phensgen@techie.com> @@ -37,14 +37,15 @@ class UMLDoc; */ class ParmPropDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructs a ParmPropDlg. * - * @param parent The parent of the dialog. + * @param tqparent The tqparent of the dialog. * @param a The parameter to represent. */ - ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a); + ParmPropDlg(TQWidget * tqparent, UMLDoc * doc, UMLAttribute * a); /** * Standard deconstructor. diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.cpp b/umbrello/umbrello/dialogs/pkgcontentspage.cpp index dce7c98b..6d9473c7 100644 --- a/umbrello/umbrello/dialogs/pkgcontentspage.cpp +++ b/umbrello/umbrello/dialogs/pkgcontentspage.cpp @@ -17,8 +17,8 @@ #include "../umldoc.h" #include "classpropdlg.h" -PkgContentsPage::PkgContentsPage(TQWidget *parent, UMLPackage *pkg) - : TQWidget(parent) +PkgContentsPage::PkgContentsPage(TQWidget *tqparent, UMLPackage *pkg) + : TQWidget(tqparent) { m_pPackage = pkg; int margin = fontMetrics().height(); @@ -29,12 +29,12 @@ PkgContentsPage::PkgContentsPage(TQWidget *parent, UMLPackage *pkg) m_pContentGB = new TQGroupBox(i18n("Contained Items"), this); mainLayout -> addWidget(m_pContentGB); - TQHBoxLayout * layout = new TQHBoxLayout(m_pContentGB); - layout -> setSpacing(10); - layout -> setMargin(margin); + TQHBoxLayout * tqlayout = new TQHBoxLayout(m_pContentGB); + tqlayout -> setSpacing(10); + tqlayout -> setMargin(margin); m_pContentLB = new TQListBox(m_pContentGB); - layout -> addWidget(m_pContentLB); + tqlayout -> addWidget(m_pContentLB); setMinimumSize(310, 330); fillListBox(); m_pMenu = 0; diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.h b/umbrello/umbrello/dialogs/pkgcontentspage.h index b95e5348..ef6faff1 100644 --- a/umbrello/umbrello/dialogs/pkgcontentspage.h +++ b/umbrello/umbrello/dialogs/pkgcontentspage.h @@ -27,14 +27,15 @@ */ class PkgContentsPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructs an instance of PkgContentsPage. * - * @param parent The parent of the page. + * @param tqparent The tqparent of the page. * @param pkg The UMLPackage being represented. */ - PkgContentsPage(TQWidget *parent, UMLPackage *pkg); + PkgContentsPage(TQWidget *tqparent, UMLPackage *pkg); /** * Standard destructor. diff --git a/umbrello/umbrello/dialogs/selectopdlg.cpp b/umbrello/umbrello/dialogs/selectopdlg.cpp index 1c175752..e49ea6d9 100644 --- a/umbrello/umbrello/dialogs/selectopdlg.cpp +++ b/umbrello/umbrello/dialogs/selectopdlg.cpp @@ -26,10 +26,10 @@ #include "../umlview.h" #include "../dialog_utils.h" -SelectOpDlg::SelectOpDlg(UMLView * parent, UMLClassifier * c) - : KDialogBase(Plain, i18n("Select Operation"), Ok | Cancel , Ok, parent, "_SELOPDLG_", true, true) +SelectOpDlg::SelectOpDlg(UMLView * tqparent, UMLClassifier * c) + : KDialogBase(Plain, i18n("Select Operation"), Ok | Cancel , Ok, tqparent, "_SELOPDLG_", true, true) { - m_pView = parent; + m_pView = tqparent; TQVBoxLayout * topLayout = new TQVBoxLayout(plainPage()); m_pOpGB = new TQGroupBox(i18n("Select Operation"), plainPage()); diff --git a/umbrello/umbrello/dialogs/selectopdlg.h b/umbrello/umbrello/dialogs/selectopdlg.h index 4bbcf52b..3c12b1b1 100644 --- a/umbrello/umbrello/dialogs/selectopdlg.h +++ b/umbrello/umbrello/dialogs/selectopdlg.h @@ -39,14 +39,15 @@ class UMLView; class SelectOpDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructs a SelectOpDlg instance. * - * @param parent The parent to this instance. + * @param tqparent The tqparent to this instance. * @param c The concept to get the operations from. */ - SelectOpDlg(UMLView * parent, UMLClassifier * c); + SelectOpDlg(UMLView * tqparent, UMLClassifier * c); /** * Standard deconstructor. diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp index 59b9ff28..f051925a 100644 --- a/umbrello/umbrello/dialogs/settingsdlg.cpp +++ b/umbrello/umbrello/dialogs/settingsdlg.cpp @@ -26,12 +26,12 @@ #include "codevieweroptionspage.h" #include "../dialog_utils.h" -SettingsDlg::SettingsDlg( TQWidget * parent, Settings::OptionState *state ) +SettingsDlg::SettingsDlg( TQWidget * tqparent, Settings::OptionState *state ) : KDialogBase( IconList, i18n("Umbrello Setup"), - Help | Default | Apply | Ok | Cancel, Ok, parent, 0, true, true ) { + Help | Default | Apply | Ok | Cancel, Ok, tqparent, 0, true, true ) { m_bChangesApplied = false; m_pOptionState = state; - setHelp( "umbrello/index.html", TQString::null ); + setHelp( "umbrello/index.html", TQString() ); setupGeneralPage(); setupFontPage(); setupUIPage(); @@ -343,13 +343,13 @@ void SettingsDlg::slotDefault() { break; case Settings::page_font: - m_FontWidgets.chooser -> setFont( parentWidget() -> font() ); + m_FontWidgets.chooser -> setFont( tqparentWidget() -> font() ); break; case Settings::page_UI: m_UiWidgets.useFillColorCB -> setChecked( true ); m_UiWidgets.fillColorB -> setColor( TQColor( 255, 255, 192 ) ); - m_UiWidgets.lineColorB -> setColor( Qt::red ); + m_UiWidgets.lineColorB -> setColor( TQt::red ); m_UiWidgets.lineWidthB -> setValue( 0 ); break; @@ -425,7 +425,7 @@ void SettingsDlg::applyPage( Settings::Page page ) { } void SettingsDlg::slotLineBClicked() { - m_UiWidgets.lineColorB -> setColor( Qt::red ); + m_UiWidgets.lineColorB -> setColor( TQt::red ); } void SettingsDlg::slotFillBClicked() { diff --git a/umbrello/umbrello/dialogs/settingsdlg.h b/umbrello/umbrello/dialogs/settingsdlg.h index c00437b2..a01696c8 100644 --- a/umbrello/umbrello/dialogs/settingsdlg.h +++ b/umbrello/umbrello/dialogs/settingsdlg.h @@ -43,9 +43,10 @@ class CodeGenerator; class SettingsDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SettingsDlg(TQWidget * parent, Settings::OptionState *state); + SettingsDlg(TQWidget * tqparent, Settings::OptionState *state); ~SettingsDlg(); //public methods diff --git a/umbrello/umbrello/dialogs/statedialog.h b/umbrello/umbrello/dialogs/statedialog.h index 9ed9b5ec..5e3c9300 100644 --- a/umbrello/umbrello/dialogs/statedialog.h +++ b/umbrello/umbrello/dialogs/statedialog.h @@ -37,6 +37,7 @@ class KFontChooser; class StateDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** @@ -51,7 +52,7 @@ public: return m_bChangesMade; } -protected slots: +protected: enum Page { @@ -61,6 +62,8 @@ protected slots: FontPage }; +protected slots: + /** * Entered when OK button pressed. */ diff --git a/umbrello/umbrello/dialogs/umlattributedialog.cpp b/umbrello/umbrello/dialogs/umlattributedialog.cpp index d6ea57ce..2568fd92 100644 --- a/umbrello/umbrello/dialogs/umlattributedialog.cpp +++ b/umbrello/umbrello/dialogs/umlattributedialog.cpp @@ -157,7 +157,7 @@ bool UMLAttributeDialog::apply() { m_pNameLE->setText( m_pAttribute->getName() ); return false; } - UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pAttribute->parent() ); + UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pAttribute->tqparent() ); UMLObject *o = pConcept->findChildObject(name); if (o && o != m_pAttribute) { KMessageBox::error(this, i18n("The attribute name you have chosen is already being used in this operation."), @@ -204,7 +204,7 @@ bool UMLAttributeDialog::apply() { } else { // If it's obviously a pointer type (C++) then create a datatype. // Else we don't know what it is so as a compromise create a class. - Uml::Object_Type ot = (typeName.contains('*') ? Uml::ot_Datatype : Uml::ot_Class); + Uml::Object_Type ot = (typeName.tqcontains('*') ? Uml::ot_Datatype : Uml::ot_Class); obj = Object_Factory::createUMLObject(ot, typeName); } if (obj == NULL) diff --git a/umbrello/umbrello/dialogs/umlattributedialog.h b/umbrello/umbrello/dialogs/umlattributedialog.h index 98d11511..d21d2834 100644 --- a/umbrello/umbrello/dialogs/umlattributedialog.h +++ b/umbrello/umbrello/dialogs/umlattributedialog.h @@ -29,6 +29,7 @@ class TQLineEdit; class UMLAttributeDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: UMLAttributeDialog( TQWidget * pParent, UMLAttribute * pAttribute ); ~UMLAttributeDialog(); diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp index 55a47857..a84d302b 100644 --- a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp +++ b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp @@ -186,7 +186,7 @@ bool UMLEntityAttributeDialog::apply() { m_pNameLE->setText( m_pEntityAttribute->getName() ); return false; } - UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pEntityAttribute->parent() ); + UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pEntityAttribute->tqparent() ); UMLObject *o = pConcept->findChildObject(name); if (o && o != m_pEntityAttribute) { KMessageBox::error(this, i18n("The entity attribute name you have chosen is already being used in this operation."), @@ -227,7 +227,7 @@ bool UMLEntityAttributeDialog::apply() { if (classifier == NULL) { // If it's obviously a pointer type (C++) then create a datatype. // Else we don't know what it is so as a compromise create a class. - Uml::Object_Type ot = (typeName.contains('*') ? Uml::ot_Datatype + Uml::Object_Type ot = (typeName.tqcontains('*') ? Uml::ot_Datatype : Uml::ot_Class); obj = Object_Factory::createUMLObject(ot, typeName); if (obj == NULL) diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.h b/umbrello/umbrello/dialogs/umlentityattributedialog.h index 7be7516f..1cd5c338 100644 --- a/umbrello/umbrello/dialogs/umlentityattributedialog.h +++ b/umbrello/umbrello/dialogs/umlentityattributedialog.h @@ -29,6 +29,7 @@ class TQLineEdit; class UMLEntityAttributeDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: UMLEntityAttributeDialog( TQWidget* pParent, UMLEntityAttribute* pEntityAttribute ); ~UMLEntityAttributeDialog(); diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp index 37e8f64c..7edb1e35 100644 --- a/umbrello/umbrello/dialogs/umloperationdialog.cpp +++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp @@ -46,8 +46,8 @@ #include "../stereotype.h" #include "../uniqueid.h" -UMLOperationDialog::UMLOperationDialog( TQWidget * parent, UMLOperation * pOperation ) - : KDialogBase( Plain, i18n("Operation Properties"), Help | Ok | Cancel , Ok, parent, "_UMLOPERATIONDLG_", true, true) { +UMLOperationDialog::UMLOperationDialog( TQWidget * tqparent, UMLOperation * pOperation ) + : KDialogBase( Plain, i18n("Operation Properties"), Help | Ok | Cancel , Ok, tqparent, "_UMLOPERATIONDLG_", true, true) { m_pOperation = pOperation; m_doc = UMLApp::app()->getDocument(); m_pMenu = 0; @@ -138,9 +138,9 @@ void UMLOperationDialog::setupDialog() { buttonLayout->addWidget( m_pDownButton ); KButtonBox* buttonBox = new KButtonBox(m_pParmsGB); - buttonBox->addButton( i18n("Ne&w Parameter..."), this, TQT_SLOT(slotNewParameter()) ); - m_pDeleteButton = buttonBox->addButton( i18n("&Delete"), this, TQT_SLOT(slotDeleteParameter()) ); - m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), this, + buttonBox->addButton( i18n("Ne&w Parameter..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewParameter()) ); + m_pDeleteButton = buttonBox->addButton( i18n("&Delete"), TQT_TQOBJECT(this), TQT_SLOT(slotDeleteParameter()) ); + m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), TQT_TQOBJECT(this), TQT_SLOT(slotParameterProperties()) ); parmsLayout->addWidget(buttonBox); @@ -162,7 +162,7 @@ void UMLOperationDialog::setupDialog() { m_pRtypeCB->setCompletionMode( KGlobalSettings::CompletionPopup ); // add template parameters - UMLClassifier *classifier = dynamic_cast<UMLClassifier*>(m_pOperation->parent()); + UMLClassifier *classifier = dynamic_cast<UMLClassifier*>(m_pOperation->tqparent()); if (classifier) { UMLClassifierListItemList tmplParams( classifier->getFilteredList(Uml::ot_Template) ); for (UMLClassifierListItem *li = tmplParams.first(); li; li = tmplParams.next()) @@ -459,11 +459,11 @@ bool UMLOperationDialog::apply() return false; } - UMLClassifier *classifier = dynamic_cast<UMLClassifier*>( m_pOperation->parent() ); + UMLClassifier *classifier = dynamic_cast<UMLClassifier*>( m_pOperation->tqparent() ); if( classifier != 0L && classifier->checkOperationSignature(name, m_pOperation->getParmList(), m_pOperation) ) { - TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).arg(classifier->getName()) + TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).tqarg(classifier->getName()) + TQString(i18n("Choose a different name or parameter list." )); KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false); diff --git a/umbrello/umbrello/dialogs/umloperationdialog.h b/umbrello/umbrello/dialogs/umloperationdialog.h index 269f41ef..2f67bfe2 100644 --- a/umbrello/umbrello/dialogs/umloperationdialog.h +++ b/umbrello/umbrello/dialogs/umloperationdialog.h @@ -37,12 +37,13 @@ class KArrowButton; class UMLOperationDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - UMLOperationDialog( TQWidget * parent, UMLOperation * pOperation ); + UMLOperationDialog( TQWidget * tqparent, UMLOperation * pOperation ); /** * Deconstructor diff --git a/umbrello/umbrello/dialogs/umlroledialog.cpp b/umbrello/umbrello/dialogs/umlroledialog.cpp index 255f4010..00f2bd1a 100644 --- a/umbrello/umbrello/dialogs/umlroledialog.cpp +++ b/umbrello/umbrello/dialogs/umlroledialog.cpp @@ -21,8 +21,8 @@ #include "../umlrole.h" #include "umlroleproperties.h" -UMLRoleDialog::UMLRoleDialog( TQWidget * parent, UMLRole * pRole ) - : KDialogBase( Plain, i18n("Role Properties"), Help | Ok | Cancel , Ok, parent, "_UMLROLEDLG_", true, true) +UMLRoleDialog::UMLRoleDialog( TQWidget * tqparent, UMLRole * pRole ) + : KDialogBase( Plain, i18n("Role Properties"), Help | Ok | Cancel , Ok, tqparent, "_UMLROLEDLG_", true, true) { m_pRole = pRole; setupDialog(); @@ -35,7 +35,7 @@ void UMLRoleDialog::setupDialog() { m_pRoleProps = new UMLRoleProperties(this, m_pRole); setMainWidget( m_pRoleProps ); - resize( TQSize(425, 620).expandedTo(minimumSizeHint()) ); + resize( TQSize(425, 620).expandedTo(tqminimumSizeHint()) ); // topLayout -> addWidget( m_pParmsGB); diff --git a/umbrello/umbrello/dialogs/umlroledialog.h b/umbrello/umbrello/dialogs/umlroledialog.h index 9f1ab218..0b41060d 100644 --- a/umbrello/umbrello/dialogs/umlroledialog.h +++ b/umbrello/umbrello/dialogs/umlroledialog.h @@ -25,11 +25,12 @@ class UMLRoleProperties; class UMLRoleDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - UMLRoleDialog( TQWidget * parent, UMLRole * pRole ); + UMLRoleDialog( TQWidget * tqparent, UMLRole * pRole ); /** * Deconstructor diff --git a/umbrello/umbrello/dialogs/umlroleproperties.cpp b/umbrello/umbrello/dialogs/umlroleproperties.cpp index fe2e2f5f..481eafb3 100644 --- a/umbrello/umbrello/dialogs/umlroleproperties.cpp +++ b/umbrello/umbrello/dialogs/umlroleproperties.cpp @@ -21,8 +21,8 @@ #include <kdebug.h> -UMLRoleProperties::UMLRoleProperties ( TQWidget *parent, UMLRole *role) - : UMLRolePropertiesBase (parent) +UMLRoleProperties::UMLRoleProperties ( TQWidget *tqparent, UMLRole *role) + : UMLRolePropertiesBase (tqparent) { m_pRole = role; diff --git a/umbrello/umbrello/dialogs/umlroleproperties.h b/umbrello/umbrello/dialogs/umlroleproperties.h index 61b7b8fe..cd3cb005 100644 --- a/umbrello/umbrello/dialogs/umlroleproperties.h +++ b/umbrello/umbrello/dialogs/umlroleproperties.h @@ -24,15 +24,16 @@ */ class UMLRoleProperties : public UMLRolePropertiesBase { Q_OBJECT + TQ_OBJECT public: /** * Sets up the UMLRoleProperties. * - * @param parent The parent widget to the UMLRoleProperties. + * @param tqparent The tqparent widget to the UMLRoleProperties. * @param role The UMLRole to display the properties of. */ - UMLRoleProperties( TQWidget *parent, UMLRole *role); + UMLRoleProperties( TQWidget *tqparent, UMLRole *role); /** * Standard deconstructor. @@ -47,7 +48,7 @@ public: protected: - // the parent role object + // the tqparent role object UMLRole * m_pRole; private: diff --git a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui index 7c35a284..18501ded 100644 --- a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui +++ b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>UMLRolePropertiesBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>UMLRolePropertiesBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -12,11 +12,11 @@ <height>545</height> </rect> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>10</y> @@ -28,18 +28,18 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>propsGroupBox</cstring> </property> <property name="title"> <string>Role Properties</string> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>30</y> @@ -51,7 +51,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>roleNameLabel</cstring> </property> @@ -59,17 +59,17 @@ <string>Rolename:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>m_pMultiLE</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>m_pRoleLE</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -80,7 +80,7 @@ </grid> </widget> </widget> - <widget class="QGroupBox" row="3" column="0"> + <widget class="TQGroupBox" row="3" column="0"> <property name="name"> <cstring>docGroupBox</cstring> </property> @@ -91,14 +91,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit" row="0" column="0"> + <widget class="TQTextEdit" row="0" column="0"> <property name="name"> <cstring>m_pDocTE</cstring> </property> </widget> </grid> </widget> - <widget class="QButtonGroup" row="2" column="0"> + <widget class="TQButtonGroup" row="2" column="0"> <property name="name"> <cstring>changeabilityButtonGroup</cstring> </property> @@ -109,15 +109,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="2"> + <widget class="TQRadioButton" row="0" column="2"> <property name="name"> <cstring>m_pAddOnlyRB</cstring> </property> @@ -125,7 +125,7 @@ <string>Add only</string> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>m_pFrozenRB</cstring> </property> @@ -133,7 +133,7 @@ <string>Frozen</string> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>m_pChangeableRB</cstring> </property> @@ -148,7 +148,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>visibilityButtonGroup</cstring> </property> @@ -159,7 +159,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>m_pPublicRB</cstring> </property> @@ -170,7 +170,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>m_pPrivateRB</cstring> </property> @@ -178,7 +178,7 @@ <string>Private</string> </property> </widget> - <widget class="QRadioButton" row="0" column="2"> + <widget class="TQRadioButton" row="0" column="2"> <property name="name"> <cstring>m_pProtectedRB</cstring> </property> @@ -186,7 +186,7 @@ <string>Protected</string> </property> </widget> - <widget class="QRadioButton" row="0" column="3"> + <widget class="TQRadioButton" row="0" column="3"> <property name="name"> <cstring>m_pImplementationRB</cstring> </property> @@ -199,5 +199,5 @@ </grid> </widget> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.cpp b/umbrello/umbrello/dialogs/umltemplatedialog.cpp index 6075fbe4..20183e3a 100644 --- a/umbrello/umbrello/dialogs/umltemplatedialog.cpp +++ b/umbrello/umbrello/dialogs/umltemplatedialog.cpp @@ -131,7 +131,7 @@ bool UMLTemplateDialog::apply() { return false; } - UMLClassifier * pClass = dynamic_cast<UMLClassifier *>( m_pTemplate->parent() ); + UMLClassifier * pClass = dynamic_cast<UMLClassifier *>( m_pTemplate->tqparent() ); if (pClass) { UMLObject *o = pClass->findChildObject(name); if (o && o != m_pTemplate) { diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.h b/umbrello/umbrello/dialogs/umltemplatedialog.h index 013eb51e..cdf8b3f1 100644 --- a/umbrello/umbrello/dialogs/umltemplatedialog.h +++ b/umbrello/umbrello/dialogs/umltemplatedialog.h @@ -31,6 +31,7 @@ class UMLTemplate; class UMLTemplateDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: UMLTemplateDialog(TQWidget* pParent, UMLTemplate* pAttribute); ~UMLTemplateDialog(); diff --git a/umbrello/umbrello/dialogs/umlviewdialog.cpp b/umbrello/umbrello/dialogs/umlviewdialog.cpp index 76ef776d..33a6a21f 100644 --- a/umbrello/umbrello/dialogs/umlviewdialog.cpp +++ b/umbrello/umbrello/dialogs/umlviewdialog.cpp @@ -135,7 +135,7 @@ void UMLViewDialog::applyPage( Page page ) { case Font: kDebug() << "UMLViewDialog::applyPage: setting font " - << m_pChooser->font().toString() << endl; + << TQString(m_pChooser->font().toString()) << endl; m_pView->setFont( m_pChooser->font(), true ); break; diff --git a/umbrello/umbrello/dialogs/umlviewdialog.h b/umbrello/umbrello/dialogs/umlviewdialog.h index f81d9869..6484aab3 100644 --- a/umbrello/umbrello/dialogs/umlviewdialog.h +++ b/umbrello/umbrello/dialogs/umlviewdialog.h @@ -37,6 +37,7 @@ class DiagramPropertiesPage; class UMLViewDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp index 824d708f..a330ad30 100644 --- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp +++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp @@ -87,12 +87,12 @@ void UMLWidgetColorPage::init() UMLWidgetColorPage::~UMLWidgetColorPage() {} void UMLWidgetColorPage::slotLineButtonClicked() { - // UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> parent() ); + // UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> tqparent() ); m_pLineColorB -> setColor( Settings::getOptionState().uiState.lineColor ); } void UMLWidgetColorPage::slotFillButtonClicked() { - // UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> parent() ); + // UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> tqparent() ); m_pFillColorB -> setColor( Settings::getOptionState().uiState.fillColor ); } diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.h b/umbrello/umbrello/dialogs/umlwidgetcolorpage.h index bc03d5b6..b5c33e2c 100644 --- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.h +++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.h @@ -29,6 +29,7 @@ class TQGroupBox; class UMLWidgetColorPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.cpp b/umbrello/umbrello/docgenerators/docbookgenerator.cpp index 87a84d14..f96b3d37 100644 --- a/umbrello/umbrello/docgenerators/docbookgenerator.cpp +++ b/umbrello/umbrello/docgenerators/docbookgenerator.cpp @@ -54,7 +54,7 @@ bool DocbookGenerator::generateDocbookForProject() UMLDoc* umlDoc = app->getDocument(); KURL url = umlDoc->URL(); TQString fileName = url.fileName(); - fileName.replace(TQRegExp(".xmi$"),""); + fileName.tqreplace(TQRegExp(".xmi$"),""); url.setFileName(fileName); kDebug() << "Exporting to directory: " << url << endl; generateDocbookForProjectInto(url); @@ -96,10 +96,10 @@ KIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir) // lets open the file for writing if( !file.open( IO_WriteOnly ) ) { - KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(tmpfile.name()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(tmpfile.name()), i18n("Save Error")); return false; } - umlDoc->saveToXMI(file); // save the xmi stuff to it + umlDoc->saveToXMI(*TQT_TQIODEVICE(&file)); // save the xmi stuff to it file.close(); tmpfile.close(); @@ -131,7 +131,7 @@ KIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir) KURL url = umlDoc->URL(); TQString fileName = url.fileName(); - fileName.replace(TQRegExp(".xmi$"),".docbook"); + fileName.tqreplace(TQRegExp(".xmi$"),".docbook"); url.setPath(destDir.path()); url.addPath(fileName); kDebug() << "Copying result to: " << url << endl; diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.h b/umbrello/umbrello/docgenerators/docbookgenerator.h index 24851380..17e89bab 100644 --- a/umbrello/umbrello/docgenerators/docbookgenerator.h +++ b/umbrello/umbrello/docgenerators/docbookgenerator.h @@ -38,9 +38,10 @@ namespace KIO * @todo allow to specify the destination and ensure that it works with distant * ones */ -class DocbookGenerator : public QObject +class DocbookGenerator : public TQObject { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp index a0555188..74aade2f 100644 --- a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp +++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp @@ -55,7 +55,7 @@ bool XhtmlGenerator::generateXhtmlForProject() UMLDoc* umlDoc = app->getDocument(); KURL url = umlDoc->URL(); TQString fileName = url.fileName(); - fileName.replace(TQRegExp(".xmi$"),""); + fileName.tqreplace(TQRegExp(".xmi$"),""); url.setFileName(fileName); kDebug() << "Exporting to directory: " << url << endl; return generateXhtmlForProjectInto(url); @@ -90,7 +90,7 @@ void XhtmlGenerator::slotDocbookToXhtml(KIO::Job * docbookJob) const KURL& url = umlDoc->URL(); TQString docbookName = url.fileName(); - docbookName.replace(TQRegExp(".xmi$"),".docbook"); + docbookName.tqreplace(TQRegExp(".xmi$"),".docbook"); // KURL docbookUrl(TQString("file://")+m_tmpDir.name()); KURL docbookUrl = m_destDir; docbookUrl.addPath(docbookName); @@ -115,7 +115,7 @@ void XhtmlGenerator::slotDocbookToXhtml(KIO::Job * docbookJob) if (!localXsl.isEmpty()) { localXsl = TQString("href=\"file://") + localXsl + "\""; - xslt.replace(TQRegExp("href=\"http://[^\"]*\""),localXsl); + xslt.tqreplace(TQRegExp("href=\"http://[^\"]*\""),localXsl); } KTempFile tmpXsl; *tmpXsl.textStream() << xslt; @@ -145,7 +145,7 @@ void XhtmlGenerator::slotDocbookToXhtml(KIO::Job * docbookJob) xmlCleanupParser(); TQString xhtmlName = url.fileName(); - xhtmlName.replace(TQRegExp(".xmi$"),".html"); + xhtmlName.tqreplace(TQRegExp(".xmi$"),".html"); KURL xhtmlUrl = m_destDir; xhtmlUrl.addPath(xhtmlName); diff --git a/umbrello/umbrello/docgenerators/xhtmlgenerator.h b/umbrello/umbrello/docgenerators/xhtmlgenerator.h index ad5076cf..0d249bbb 100644 --- a/umbrello/umbrello/docgenerators/xhtmlgenerator.h +++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.h @@ -38,9 +38,10 @@ namespace KIO * @todo allow to specify the destination and ensure that it works with distant * ones */ -class XhtmlGenerator : public QObject +class XhtmlGenerator : public TQObject { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/docgenerators/xmi2docbook.xsl b/umbrello/umbrello/docgenerators/xmi2docbook.xsl index ff10aac5..a48938f7 100644 --- a/umbrello/umbrello/docgenerators/xmi2docbook.xsl +++ b/umbrello/umbrello/docgenerators/xmi2docbook.xsl @@ -450,12 +450,12 @@ <title>Supertypes:</title> <xsl:for-each select="$generalizations"> - <!-- get the parent in the generalization --> + <!-- get the tqparent in the generalization --> <xsl:variable name="generalization" select="key('generalization', ./@xmi.idref)" /> <xsl:variable name="target" select="$generalization/ - Foundation.Core.Generalization.parent/ + Foundation.Core.Generalization.tqparent/ */@xmi.idref" /> <xsl:call-template name="classify"> <xsl:with-param name="target" select="$target"/> diff --git a/umbrello/umbrello/docwindow.cpp b/umbrello/umbrello/docwindow.cpp index ab935d00..ddd056a2 100644 --- a/umbrello/umbrello/docwindow.cpp +++ b/umbrello/umbrello/docwindow.cpp @@ -26,7 +26,7 @@ #include "umlwidget.h" -DocWindow::DocWindow( UMLDoc * doc, TQWidget *parent, const char *name ) : TQWidget( parent, name ) { +DocWindow::DocWindow( UMLDoc * doc, TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ) { //setup visual display TQHBoxLayout * mainLayout = new TQHBoxLayout( this ); diff --git a/umbrello/umbrello/docwindow.h b/umbrello/umbrello/docwindow.h index 29ff5c4e..217e7d83 100644 --- a/umbrello/umbrello/docwindow.h +++ b/umbrello/umbrello/docwindow.h @@ -29,11 +29,12 @@ class UMLWidget; class DocWindow : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - explicit DocWindow( UMLDoc * doc, TQWidget *parent = 0, const char *name = 0 ); + explicit DocWindow( UMLDoc * doc, TQWidget *tqparent = 0, const char *name = 0 ); /** * Deconstructor diff --git a/umbrello/umbrello/entity.cpp b/umbrello/umbrello/entity.cpp index 31ef1513..38c73138 100644 --- a/umbrello/umbrello/entity.cpp +++ b/umbrello/umbrello/entity.cpp @@ -107,7 +107,7 @@ UMLObject* UMLEntity::addEntityAttribute(const TQString& name, Uml::IDType id) { bool UMLEntity::addEntityAttribute(UMLEntityAttribute* attribute, IDChangeLog* Log /* = 0*/) { TQString name = (TQString)attribute->getName(); if (findChildObject(name) == NULL) { - attribute->parent()->removeChild(attribute); + attribute->tqparent()->removeChild(attribute); this->insertChild(attribute); m_List.append(attribute); emit entityAttributeAdded(attribute); @@ -124,7 +124,7 @@ bool UMLEntity::addEntityAttribute(UMLEntityAttribute* attribute, IDChangeLog* L bool UMLEntity::addEntityAttribute(UMLEntityAttribute* attribute, int position) { TQString name = (TQString)attribute->getName(); if (findChildObject(name) == NULL) { - attribute->parent()->removeChild(attribute); + attribute->tqparent()->removeChild(attribute); this->insertChild(attribute); if ( position >= 0 && position <= (int)m_List.count() ) { m_List.insert(position,attribute); diff --git a/umbrello/umbrello/entity.h b/umbrello/umbrello/entity.h index a207fbd3..9b507f00 100644 --- a/umbrello/umbrello/entity.h +++ b/umbrello/umbrello/entity.h @@ -28,6 +28,7 @@ class UMLEntityAttribute; */ class UMLEntity : public UMLClassifier { Q_OBJECT + TQ_OBJECT public: /** * Sets up an entity. @@ -59,14 +60,14 @@ public: virtual UMLObject* clone() const; /** - * Creates an entity attribute for the parent concept. + * Creates an entity attribute for the tqparent concept. * Reimplementation of method from UMLClassifier. * * @param name An optional name, used by when creating through UMLListView * @param type An optional type, used by when creating through UMLListView * @return The UMLEntityAttribute created */ - UMLAttribute* createAttribute(const TQString &name = TQString::null, + UMLAttribute* createAttribute(const TQString &name = TQString(), UMLObject *type = 0); /** diff --git a/umbrello/umbrello/entityattribute.cpp b/umbrello/umbrello/entityattribute.cpp index b8030fed..ebc2111f 100644 --- a/umbrello/umbrello/entityattribute.cpp +++ b/umbrello/umbrello/entityattribute.cpp @@ -21,17 +21,17 @@ #include "dialogs/umlentityattributedialog.h" #include "object_factory.h" -UMLEntityAttribute::UMLEntityAttribute( const UMLObject *parent, const TQString& name, +UMLEntityAttribute::UMLEntityAttribute( const UMLObject *tqparent, const TQString& name, Uml::IDType id, Uml::Visibility s, UMLObject *type, const TQString& iv ) - : UMLAttribute(parent, name, id, s, type, iv) { + : UMLAttribute(tqparent, name, id, s, type, iv) { init(); if (m_pSecondary) { m_pSecondary->setBaseType(Uml::ot_Entity); } } -UMLEntityAttribute::UMLEntityAttribute(const UMLObject *parent) : UMLAttribute(parent) { +UMLEntityAttribute::UMLEntityAttribute(const UMLObject *tqparent) : UMLAttribute(tqparent) { init(); } @@ -119,7 +119,7 @@ bool UMLEntityAttribute::operator==( UMLEntityAttribute &rhs) { void UMLEntityAttribute::copyInto(UMLEntityAttribute *rhs) const { - // call the parent first. + // call the tqparent first. UMLClassifierListItem::copyInto(rhs); // Copy all datamembers @@ -131,7 +131,7 @@ void UMLEntityAttribute::copyInto(UMLEntityAttribute *rhs) const UMLObject* UMLEntityAttribute::clone() const { - UMLEntityAttribute* clone = new UMLEntityAttribute( (UMLEntityAttribute*)parent() ); + UMLEntityAttribute* clone = new UMLEntityAttribute( (UMLEntityAttribute*)tqparent() ); copyInto(clone); return clone; @@ -169,8 +169,8 @@ bool UMLEntityAttribute::load( TQDomElement & element ) { return true; } -bool UMLEntityAttribute::showPropertiesDialog(TQWidget* parent) { - UMLEntityAttributeDialog dialog(parent, this); +bool UMLEntityAttribute::showPropertiesDialog(TQWidget* tqparent) { + UMLEntityAttributeDialog dialog(tqparent, this); return dialog.exec(); } diff --git a/umbrello/umbrello/entityattribute.h b/umbrello/umbrello/entityattribute.h index 31b3179c..4a094dfb 100644 --- a/umbrello/umbrello/entityattribute.h +++ b/umbrello/umbrello/entityattribute.h @@ -26,18 +26,19 @@ */ class UMLEntityAttribute : public UMLAttribute { Q_OBJECT + TQ_OBJECT public: /** * Sets up an entityattribute. * - * @param parent The parent of this UMLEntityAttribute. + * @param tqparent The tqparent of this UMLEntityAttribute. * @param name The name of this UMLEntityAttribute. * @param id The unique id given to this UMLEntityAttribute. * @param s The visibility of the UMLEntityAttribute. * @param type The type of this UMLEntityAttribute. * @param iv The initial value of the entityattribute. */ - UMLEntityAttribute(const UMLObject* parent, const TQString& name, + UMLEntityAttribute(const UMLObject* tqparent, const TQString& name, Uml::IDType id = Uml::id_None, Uml::Visibility s = Uml::Visibility::Private, UMLObject *type = 0, const TQString& iv = 0); @@ -45,9 +46,9 @@ public: /** * Sets up an entityattribute. * - * @param parent The parent of this UMLEntityAttribute. + * @param tqparent The tqparent of this UMLEntityAttribute. */ - UMLEntityAttribute(const UMLObject* parent); + UMLEntityAttribute(const UMLObject* tqparent); /** * Overloaded '==' operator @@ -157,7 +158,7 @@ public: /** * Display the properties configuration dialog for the entityattribute. */ - bool showPropertiesDialog(TQWidget* parent); + bool showPropertiesDialog(TQWidget* tqparent); protected: /** diff --git a/umbrello/umbrello/entitywidget.cpp b/umbrello/umbrello/entitywidget.cpp index 9dd7d7e3..8f96fb87 100644 --- a/umbrello/umbrello/entitywidget.cpp +++ b/umbrello/umbrello/entitywidget.cpp @@ -62,7 +62,7 @@ void EntityWidget::draw(TQPainter& p, int offsetX, int offsetY) { const TQString name = this->getName(); p.drawRect(offsetX, offsetY, w, h); - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); TQFont font = UMLWidget::getFont(); font.setBold(true); @@ -71,11 +71,11 @@ void EntityWidget::draw(TQPainter& p, int offsetX, int offsetY) { if ( !m_pObject->getStereotype().isEmpty() ) { p.drawText(offsetX + ENTITY_MARGIN, offsetY, w - ENTITY_MARGIN * 2,fontHeight, - Qt::AlignCenter, m_pObject->getStereotype(true)); + TQt::AlignCenter, m_pObject->getStereotype(true)); font.setItalic( m_pObject -> getAbstract() ); p.setFont(font); p.drawText(offsetX + ENTITY_MARGIN, offsetY + fontHeight, - w - ENTITY_MARGIN * 2, fontHeight, Qt::AlignCenter, name); + w - ENTITY_MARGIN * 2, fontHeight, TQt::AlignCenter, name); font.setBold(false); font.setItalic(false); p.setFont(font); @@ -84,7 +84,7 @@ void EntityWidget::draw(TQPainter& p, int offsetX, int offsetY) { font.setItalic( m_pObject -> getAbstract() ); p.setFont(font); p.drawText(offsetX + ENTITY_MARGIN, offsetY, - w - ENTITY_MARGIN * 2, fontHeight, Qt::AlignCenter, name); + w - ENTITY_MARGIN * 2, fontHeight, TQt::AlignCenter, name); font.setBold(false); font.setItalic(false); p.setFont(font); @@ -102,7 +102,7 @@ void EntityWidget::draw(TQPainter& p, int offsetX, int offsetY) { UMLClassifierListItemList list = classifier->getFilteredList(Uml::ot_EntityAttribute); for (entityattribute = list.first(); entityattribute; entityattribute = list.next()) { TQString text = entityattribute->getName(); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); UMLEntityAttribute* casted = dynamic_cast<UMLEntityAttribute*>( entityattribute ); if( casted && casted->getIndexType() == Uml::Primary ) { @@ -111,7 +111,7 @@ void EntityWidget::draw(TQPainter& p, int offsetX, int offsetY) { font.setUnderline( false ); } p.drawText(offsetX + ENTITY_MARGIN, offsetY + y, - fontMetrics.width(text), fontHeight, Qt::AlignVCenter, text); + fontMetrics.width(text), fontHeight, TQt::AlignVCenter, text); p.setFont( font ); y+=fontHeight; } diff --git a/umbrello/umbrello/entitywidget.h b/umbrello/umbrello/entitywidget.h index e99da521..55b0e625 100644 --- a/umbrello/umbrello/entitywidget.h +++ b/umbrello/umbrello/entitywidget.h @@ -33,7 +33,7 @@ public: /** * Constructs an EntityWidget. * - * @param view The parent of this EntityWidget. + * @param view The tqparent of this EntityWidget. * @param o The UMLObject this will be representing. */ EntityWidget(UMLView* view, UMLObject* o); diff --git a/umbrello/umbrello/enum.cpp b/umbrello/umbrello/enum.cpp index 93ee1bdd..491817e2 100644 --- a/umbrello/umbrello/enum.cpp +++ b/umbrello/umbrello/enum.cpp @@ -109,7 +109,7 @@ UMLObject* UMLEnum::addEnumLiteral(const TQString &name, Uml::IDType id) { bool UMLEnum::addEnumLiteral(UMLEnumLiteral* literal, IDChangeLog* Log /* = 0*/) { TQString name = (TQString)literal->getName(); if (findChildObject(name) == NULL) { - literal->parent()->removeChild(literal); + literal->tqparent()->removeChild(literal); this->insertChild(literal); m_List.append(literal); UMLObject::emitModified(); @@ -126,7 +126,7 @@ bool UMLEnum::addEnumLiteral(UMLEnumLiteral* literal, IDChangeLog* Log /* = 0*/) bool UMLEnum::addEnumLiteral(UMLEnumLiteral* literal, int position) { TQString name = (TQString)literal->getName(); if (findChildObject(name) == NULL) { - literal->parent()->removeChild(literal); + literal->tqparent()->removeChild(literal); this->insertChild(literal); if ( position >= 0 && position <= (int)m_List.count() ) { m_List.insert(position,literal); diff --git a/umbrello/umbrello/enum.h b/umbrello/umbrello/enum.h index 94532f68..edf107ae 100644 --- a/umbrello/umbrello/enum.h +++ b/umbrello/umbrello/enum.h @@ -28,6 +28,7 @@ class UMLEnumLiteral; */ class UMLEnum : public UMLClassifier { Q_OBJECT + TQ_OBJECT public: /** * Sets up an enum. diff --git a/umbrello/umbrello/enumliteral.cpp b/umbrello/umbrello/enumliteral.cpp index 8158e40e..b6efb808 100644 --- a/umbrello/umbrello/enumliteral.cpp +++ b/umbrello/umbrello/enumliteral.cpp @@ -15,13 +15,13 @@ #include <kdebug.h> #include <klocale.h> -UMLEnumLiteral::UMLEnumLiteral(const UMLObject *parent, +UMLEnumLiteral::UMLEnumLiteral(const UMLObject *tqparent, const TQString& name, Uml::IDType id) - : UMLClassifierListItem(parent, name, id) { + : UMLClassifierListItem(tqparent, name, id) { m_BaseType = Uml::ot_EnumLiteral; } -UMLEnumLiteral::UMLEnumLiteral(const UMLObject *parent) : UMLClassifierListItem(parent) { +UMLEnumLiteral::UMLEnumLiteral(const UMLObject *tqparent) : UMLClassifierListItem(tqparent) { m_BaseType = Uml::ot_EnumLiteral; } @@ -44,7 +44,7 @@ void UMLEnumLiteral::copyInto(UMLEnumLiteral *rhs) const UMLObject* UMLEnumLiteral::clone() const { - UMLEnumLiteral *clone = new UMLEnumLiteral((UMLObject *) parent()); + UMLEnumLiteral *clone = new UMLEnumLiteral((UMLObject *) tqparent()); copyInto(clone); return clone; @@ -60,9 +60,9 @@ bool UMLEnumLiteral::load(TQDomElement& ) { return true; } -bool UMLEnumLiteral::showPropertiesDialog(TQWidget* parent) { +bool UMLEnumLiteral::showPropertiesDialog(TQWidget* tqparent) { bool ok; - TQString name = KInputDialog::getText(i18n("Name"), i18n("Enter name:"), getName(), &ok, parent); + TQString name = KInputDialog::getText(i18n("Name"), i18n("Enter name:"), getName(), &ok, tqparent); if ( ok && !name.isEmpty() ) { setName(name); return true; diff --git a/umbrello/umbrello/enumliteral.h b/umbrello/umbrello/enumliteral.h index e9a63b1a..3e530c4d 100644 --- a/umbrello/umbrello/enumliteral.h +++ b/umbrello/umbrello/enumliteral.h @@ -29,19 +29,19 @@ public: /** * Sets up an enum literal. * - * @param parent The parent of this UMLEnumLiteral. + * @param tqparent The tqparent of this UMLEnumLiteral. * @param name The name of this UMLEnumLiteral. * @param id The unique id given to this UMLEnumLiteral. */ - UMLEnumLiteral(const UMLObject* parent, + UMLEnumLiteral(const UMLObject* tqparent, const TQString& name, Uml::IDType id = Uml::id_None); /** * Sets up an enum literal. * - * @param parent The parent of this UMLEnumLiteral. + * @param tqparent The tqparent of this UMLEnumLiteral. */ - UMLEnumLiteral(const UMLObject* parent); + UMLEnumLiteral(const UMLObject* tqparent); /** * Overloaded '==' operator @@ -72,7 +72,7 @@ public: /** * Display the properties configuration dialog for the enum literal. */ - bool showPropertiesDialog(TQWidget* parent); + bool showPropertiesDialog(TQWidget* tqparent); protected: /** diff --git a/umbrello/umbrello/enumwidget.cpp b/umbrello/umbrello/enumwidget.cpp index 0c03b209..de1eb522 100644 --- a/umbrello/umbrello/enumwidget.cpp +++ b/umbrello/umbrello/enumwidget.cpp @@ -72,19 +72,19 @@ void EnumWidget::draw(TQPainter& p, int offsetX, int offsetY) { } p.drawRect(offsetX, offsetY, w, h); - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); TQFont font = UMLWidget::getFont(); font.setBold(true); p.setFont(font); p.drawText(offsetX + ENUM_MARGIN, offsetY, w - ENUM_MARGIN * 2,fontHeight, - Qt::AlignCenter, m_pObject->getStereotype(true)); + TQt::AlignCenter, m_pObject->getStereotype(true)); font.setItalic( m_pObject -> getAbstract() ); p.setFont(font); p.drawText(offsetX + ENUM_MARGIN, offsetY + fontHeight, - w - ENUM_MARGIN * 2, fontHeight, Qt::AlignCenter, name); + w - ENUM_MARGIN * 2, fontHeight, TQt::AlignCenter, name); font.setBold(false); font.setItalic(false); p.setFont(font); @@ -101,9 +101,9 @@ void EnumWidget::draw(TQPainter& p, int offsetX, int offsetY) { UMLClassifierListItemList list = classifier->getFilteredList(Uml::ot_EnumLiteral); for (enumLiteral = list.first(); enumLiteral; enumLiteral = list.next()) { TQString text = enumLiteral->getName(); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); p.drawText(offsetX + ENUM_MARGIN, offsetY + y, - fontMetrics.width(text), fontHeight, Qt::AlignVCenter, text); + fontMetrics.width(text), fontHeight, TQt::AlignVCenter, text); y+=fontHeight; } diff --git a/umbrello/umbrello/enumwidget.h b/umbrello/umbrello/enumwidget.h index aa61f4ea..b5802135 100644 --- a/umbrello/umbrello/enumwidget.h +++ b/umbrello/umbrello/enumwidget.h @@ -33,7 +33,7 @@ public: /** * Constructs an EnumWidget. * - * @param view The parent of this EnumWidget. + * @param view The tqparent of this EnumWidget. * @param o The UMLObject this will be representing. */ EnumWidget(UMLView* view, UMLObject* o); diff --git a/umbrello/umbrello/floatingtextwidget.cpp b/umbrello/umbrello/floatingtextwidget.cpp index fb278399..5857ef5d 100644 --- a/umbrello/umbrello/floatingtextwidget.cpp +++ b/umbrello/umbrello/floatingtextwidget.cpp @@ -72,7 +72,7 @@ void FloatingTextWidget::draw(TQPainter & p, int offsetX, int offsetY) { p.setFont( UMLWidget::getFont() ); TQColor textColor(50, 50, 50); p.setPen(textColor); - p.drawText( offsetX , offsetY,w,h, Qt::AlignCenter, getDisplayText() ); + p.drawText( offsetX , offsetY,w,h, TQt::AlignCenter, getDisplayText() ); if(m_bSelected) drawSelected(&p, offsetX, offsetY); } @@ -225,7 +225,7 @@ void FloatingTextWidget::changeName(const TQString& newText) setText( newText ); UMLApp::app()->getDocument()->setModified(true); } - setVisible( true ); + tqsetVisible( true ); updateComponentSize(); update(); } @@ -236,7 +236,7 @@ void FloatingTextWidget::setText(const TQString &t) { m_pLink->getSeqNumAndOp(seqNum, op); if (seqNum.length() > 0 || op.length() > 0) { if (! m_pView->getShowOpSig()) - op.replace( TQRegExp("\\(.*\\)"), "()" ); + op.tqreplace( TQRegExp("\\(.*\\)"), "()" ); m_Text = seqNum.append(": ").append( op ); } else m_Text = t; @@ -265,7 +265,7 @@ void FloatingTextWidget::changeTextDlg() { if(ok && newText != getText() && isTextValid(newText)) { setText( newText ); - setVisible( ( getText().length() > 0 ) ); + tqsetVisible( ( getText().length() > 0 ) ); updateComponentSize(); update(); } @@ -302,7 +302,7 @@ void FloatingTextWidget::showOpDlg() { opText = selectDlg.getOpText(); if (selectDlg.isClassOp()) { Model_Utils::OpDescriptor od; - Model_Utils::Parse_Status st = Model_Utils::parseOperation(opText, od, c); + Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(opText, od, c); if (st == Model_Utils::PS_OK) { UMLClassifierList selfAndAncestors = c->findSuperClassConcepts(); selfAndAncestors.prepend(c); @@ -444,7 +444,7 @@ bool FloatingTextWidget::loadFromXMI( TQDomElement & qElement ) { void FloatingTextWidget::setMessageText() { if (m_pLink) m_pLink->setMessageText(this); - setVisible(getText().length() > 0); + tqsetVisible(getText().length() > 0); updateComponentSize(); } diff --git a/umbrello/umbrello/floatingtextwidget.h b/umbrello/umbrello/floatingtextwidget.h index 75e25be0..ad33e532 100644 --- a/umbrello/umbrello/floatingtextwidget.h +++ b/umbrello/umbrello/floatingtextwidget.h @@ -37,6 +37,7 @@ class FloatingTextWidgetController; class FloatingTextWidget : public UMLWidget { Q_OBJECT + TQ_OBJECT public: friend class FloatingTextWidgetController; @@ -53,7 +54,7 @@ public: /** * Constructs a FloatingTextWidget instance. * - * @param view The parent of this FloatingTextWidget. + * @param view The tqparent of this FloatingTextWidget. * @param role The role this FloatingTextWidget will take up. * @param text The main text to display. * @param id The ID to assign (-1 will prompt a new ID.) diff --git a/umbrello/umbrello/floatingtextwidgetcontroller.h b/umbrello/umbrello/floatingtextwidgetcontroller.h index bb40e778..5b89c3ad 100644 --- a/umbrello/umbrello/floatingtextwidgetcontroller.h +++ b/umbrello/umbrello/floatingtextwidgetcontroller.h @@ -55,7 +55,7 @@ protected: /** * Overridden from UMLWidgetController. * Saves the values of the widget needed for move/resize. - * Calls parent method and then saves the value of m_unconstrainedPositionX/Y + * Calls tqparent method and then saves the value of m_unconstrainedPositionX/Y * and m_movementDirectionX/Y. * * @param me The TQMouseEvent to get the offset from. @@ -67,7 +67,7 @@ protected: * FloatingTextWidgets can't be resized, so this method always returns false. * Cursor isn't changed. * - * @param me The QMouseEVent to check. + * @param me The TQMouseEVent to check. * @return true if the mouse is in resize area, false otherwise. */ virtual bool isInResizeArea(TQMouseEvent *me); diff --git a/umbrello/umbrello/folder.cpp b/umbrello/umbrello/folder.cpp index c3f97dc4..2ba73694 100644 --- a/umbrello/umbrello/folder.cpp +++ b/umbrello/umbrello/folder.cpp @@ -157,8 +157,8 @@ void UMLFolder::removeAllViews() { UMLView *v = NULL; for (UMLViewListIt vit(m_diagrams); (v = vit.current()) != NULL; ++vit) { // TODO ------------------ check this code - bad: calling back to UMLDoc::removeView() - v->removeAllAssociations(); // note : It may not be apparent, but when we remove all associations - // from a view, it also causes any UMLAssociations that lack parent + v->removeAllAssociations(); // note : It may not be aptqparent, but when we remove all associations + // from a view, it also causes any UMLAssociations that lack tqparent // association widgets (but once had them) to remove themselves from // this document. UMLApp::app()->getDocument()->removeView(v, false); @@ -223,7 +223,7 @@ void UMLFolder::saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement) { kError() << "UMLFolder::saveToXMI(" << m_folderFile << "): " << "cannot create file, contents will be saved in main model file" << endl; - m_folderFile = TQString::null; + m_folderFile = TQString(); save(qDoc, qElement); return; } @@ -248,8 +248,8 @@ void UMLFolder::saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement) { folderRoot.setAttribute("name", m_Name); folderRoot.setAttribute("filename", m_folderFile); folderRoot.setAttribute("mainModel", umldoc->URL().fileName()); - folderRoot.setAttribute("parentId", ID2STR(m_pUMLPackage->getID())); - folderRoot.setAttribute("parent", m_pUMLPackage->getFullyQualifiedName("::", true)); + folderRoot.setAttribute("tqparentId", ID2STR(m_pUMLPackage->getID())); + folderRoot.setAttribute("tqparent", m_pUMLPackage->getFullyQualifiedName("::", true)); saveContents(folderDoc, folderRoot); folderDoc.appendChild(folderRoot); TQTextStream stream(&file); @@ -286,11 +286,11 @@ bool UMLFolder::loadDiagramsFromXMI(TQDomNode& diagrams) { bool UMLFolder::loadFolderFile(const TQString& path) { TQFile file(path); if (!file.exists()) { - KMessageBox::error(0, i18n("The folderfile %1 does not exist.").arg(path), i18n("Load Error")); + KMessageBox::error(0, i18n("The folderfile %1 does not exist.").tqarg(path), i18n("Load Error")); return false; } if (!file.open(IO_ReadOnly)) { - KMessageBox::error(0, i18n("The folderfile %1 cannot be opened.").arg(path), i18n("Load Error")); + KMessageBox::error(0, i18n("The folderfile %1 cannot be opened.").tqarg(path), i18n("Load Error")); return false; } TQTextStream stream(&file); diff --git a/umbrello/umbrello/folder.h b/umbrello/umbrello/folder.h index 365795f0..42e0e586 100644 --- a/umbrello/umbrello/folder.h +++ b/umbrello/umbrello/folder.h @@ -33,6 +33,7 @@ class UMLFolder : public UMLPackage { Q_OBJECT + TQ_OBJECT public: /** * Sets up a Folder. diff --git a/umbrello/umbrello/forkjoinwidget.cpp b/umbrello/umbrello/forkjoinwidget.cpp index a720a6cd..f30ebac8 100644 --- a/umbrello/umbrello/forkjoinwidget.cpp +++ b/umbrello/umbrello/forkjoinwidget.cpp @@ -42,7 +42,7 @@ TQSize ForkJoinWidget::calculateSize() { } void ForkJoinWidget::draw(TQPainter& p, int offsetX, int offsetY) { - p.fillRect( offsetX, offsetY, width(), height(), TQBrush( Qt::black )); + p.fillRect( offsetX, offsetY, width(), height(), TQBrush( TQt::black )); if (m_bSelected) { drawSelected(&p, offsetX, offsetY); diff --git a/umbrello/umbrello/forkjoinwidget.h b/umbrello/umbrello/forkjoinwidget.h index 8ee869ea..def633b4 100644 --- a/umbrello/umbrello/forkjoinwidget.h +++ b/umbrello/umbrello/forkjoinwidget.h @@ -31,7 +31,7 @@ public: /** * Constructs a ForkJoinWidget. * - * @param view The parent to this widget. + * @param view The tqparent to this widget. * @param drawVertical Whether to draw the plate horizontally or vertically. * @param id The ID to assign (-1 will prompt a new ID.) */ diff --git a/umbrello/umbrello/hierarchicalcodeblock.cpp b/umbrello/umbrello/hierarchicalcodeblock.cpp index eff7f463..7d31bf1d 100644 --- a/umbrello/umbrello/hierarchicalcodeblock.cpp +++ b/umbrello/umbrello/hierarchicalcodeblock.cpp @@ -114,7 +114,7 @@ bool HierarchicalCodeBlock::insertTextBlock(TextBlock * newBlock, TextBlock * ex return false; TQString tag = existingBlock->getTag(); - // FIX: just do a quick check if the parent DOCUMENT has this. + // FIX: just do a quick check if the tqparent DOCUMENT has this. // IF it does, then the lack of an index will force us into // a search of any child hierarchical codeblocks we may have // Its not efficient, but works. I don't think speed is a problem @@ -123,7 +123,7 @@ bool HierarchicalCodeBlock::insertTextBlock(TextBlock * newBlock, TextBlock * ex if(!getParentDocument()->findTextBlockByTag(tag, true)) return false; - int index = m_textblockVector.findRef(existingBlock); + int index = m_textblockVector.tqfindRef(existingBlock); if(index < 0) { // may be hiding in child hierarchical codeblock @@ -149,7 +149,7 @@ bool HierarchicalCodeBlock::insertTextBlock(TextBlock * newBlock, TextBlock * ex newBlock->setTag(new_tag); } - if(m_textBlockTagMap.contains(new_tag)) + if(m_textBlockTagMap.tqcontains(new_tag)) return false; // return false, we already have some object with this tag in the list else { m_textBlockTagMap.insert(new_tag, newBlock); @@ -202,7 +202,7 @@ void HierarchicalCodeBlock::setStartText ( const TQString &text ) { } /** - * @return QString + * @return TQString */ TQString HierarchicalCodeBlock::getStartText ( ) { return m_startText; @@ -310,7 +310,7 @@ void HierarchicalCodeBlock::setAttributesFromObject (TextBlock * obj) { /** - * @return QString + * @return TQString */ TQString HierarchicalCodeBlock::toString ( ) { @@ -365,7 +365,7 @@ TextBlock * HierarchicalCodeBlock::findCodeClassFieldTextBlockByTag ( const TQSt if(cdoc) return cdoc->findCodeClassFieldTextBlockByTag(tag); else - kError()<<" HierarchicalCodeBlock: findCodeClassFieldTextBlockByTag() finds NO parent document! Badly constructed textblock?!?"<<endl; + kError()<<" HierarchicalCodeBlock: findCodeClassFieldTextBlockByTag() finds NO tqparent document! Badly constructed textblock?!?"<<endl; // if we get here, we failed. return (TextBlock*) NULL; diff --git a/umbrello/umbrello/hierarchicalcodeblock.h b/umbrello/umbrello/hierarchicalcodeblock.h index ef145753..2b37f38e 100644 --- a/umbrello/umbrello/hierarchicalcodeblock.h +++ b/umbrello/umbrello/hierarchicalcodeblock.h @@ -28,6 +28,7 @@ class HierarchicalCodeBlock : public CodeBlockWithComments, public CodeGenObjectWithTextBlocks { Q_OBJECT + TQ_OBJECT friend class CodeGenObjectWithTextBlocks; public: @@ -85,7 +86,7 @@ public: void setStartText ( const TQString &text ); /** - * @return QString + * @return TQString */ TQString getStartText ( ); @@ -100,7 +101,7 @@ public: virtual void loadFromXMI ( TQDomElement & root ); /** - * @return QString + * @return TQString */ virtual TQString toString ( ); diff --git a/umbrello/umbrello/import_rose.cpp b/umbrello/umbrello/import_rose.cpp index 3968e72a..a04dfc43 100644 --- a/umbrello/umbrello/import_rose.cpp +++ b/umbrello/umbrello/import_rose.cpp @@ -31,12 +31,12 @@ namespace Import_Rose { typedef TQPtrList<PetalNode> PetalNodeList; -uint nClosures; // Multiple closing parentheses may appear on a single +uint nClosures; // Multiple closing tqparentheses may appear on a single // line. The parsing is done line-by-line and using // recursive descent. This means that we can only handle - // _one_ closing parenthesis at a time, i.e. the closing + // _one_ closing tqparenthesis at a time, i.e. the closing // of the currently parsed node. Since we may see more - // closing parentheses than we can handle, we need a + // closing tqparentheses than we can handle, we need a // counter indicating how many additional node closings // have been seen. @@ -106,8 +106,8 @@ bool checkClosing(TQStringList& tokens) { if (tokens.count() == 0) return false; if (tokens.last() == ")") { - // For a single closing parenthesis, we just return true. - // But if there are more closing parentheses, we need to increment + // For a single closing tqparenthesis, we just return true. + // But if there are more closing tqparentheses, we need to increment // nClosures for each scope. tokens.pop_back(); while (tokens.count() && tokens.last() == ")") { @@ -125,7 +125,7 @@ bool checkClosing(TQStringList& tokens) { * or a quoted string. */ bool isImmediateValue(TQString s) { - return s.contains(TQRegExp("^[\\d\\-\"]")); + return s.tqcontains(TQRegExp("^[\\d\\-\"]")); } /** @@ -133,7 +133,7 @@ bool isImmediateValue(TQString s) { * Examples of immediate value lists: * number list: ( 123 , 456 ) * string list: ( "SomeText" 888 ) - * Any enclosing parentheses are removed. + * Any enclosing tqparentheses are removed. * All extracted items are also removed from `l'. * For the example given above the following is returned: * "123 456" @@ -236,7 +236,7 @@ TQString extractValue(TQStringList& l, TQTextStream& stream) { } else { result = shift(l); if (l.first() != ")") { - kError() << loc() << "expecting closing parenthesis" << endl; + kError() << loc() << "expecting closing tqparenthesis" << endl; return result; } l.pop_front(); @@ -286,7 +286,7 @@ PetalNode *readAttributes(TQStringList initialArgs, TQTextStream& stream) { TQStringList tokens = scan(line); TQString stringOrNodeOpener = shift(tokens); TQString name; - if (nt == PetalNode::nt_object && !stringOrNodeOpener.contains(TQRegExp("^[A-Za-z]"))) { + if (nt == PetalNode::nt_object && !stringOrNodeOpener.tqcontains(TQRegExp("^[A-Za-z]"))) { kError() << loc() << "unexpected line " << line << endl; return NULL; } @@ -301,7 +301,7 @@ PetalNode *readAttributes(TQStringList initialArgs, TQTextStream& stream) { // Decrement nClosures exactly once, namely for the own scope. // Each recursion of readAttributes() is only responsible for // its own scope. I.e. each further scope closing is handled by - // an outer recursion in case of multiple closing parentheses. + // an outer recursion in case of multiple closing tqparentheses. nClosures--; break; } @@ -339,7 +339,7 @@ PetalNode *readAttributes(TQStringList initialArgs, TQTextStream& stream) { // Decrement nClosures exactly once, namely for the own scope. // Each recursion of readAttributes() is only responsible for // its own scope. I.e. each further scope closing is handled by - // an outer recursion in case of multiple closing parentheses. + // an outer recursion in case of multiple closing tqparentheses. nClosures--; break; } @@ -365,18 +365,18 @@ bool loadFromMDL(TQIODevice& file) { linum = 0; while (!(line = stream.readLine()).isNull()) { linum++; - if (line.contains( TQRegExp("^\\s*\\(object Petal") )) { - while (!(line = stream.readLine()).isNull() && !line.contains(')')) { + if (line.tqcontains( TQRegExp("^\\s*\\(object Petal") )) { + while (!(line = stream.readLine()).isNull() && !line.tqcontains(')')) { linum++; // CHECK: do we need petal version info? } if (line.isNull()) break; } else { TQRegExp objectRx("^\\s*\\(object "); - if (line.contains(objectRx)) { + if (line.tqcontains(objectRx)) { nClosures = 0; TQStringList initialArgs = scan(line); - initialArgs.pop_front(); // remove opening parenthesis + initialArgs.pop_front(); // remove opening tqparenthesis root = readAttributes(initialArgs, stream); } } diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp index 05ce0100..e7614daf 100644 --- a/umbrello/umbrello/kplayerslideraction.cpp +++ b/umbrello/umbrello/kplayerslideraction.cpp @@ -33,11 +33,11 @@ void KPlayerPopupFrame::keyPressEvent (TQKeyEvent* ev) { switch ( ev -> key() ) { - case Qt::Key_Alt: - case Qt::Key_Tab: - case Qt::Key_Escape: - case Qt::Key_Return: - case Qt::Key_Enter: + case TQt::Key_Alt: + case TQt::Key_Tab: + case TQt::Key_Escape: + case TQt::Key_Return: + case TQt::Key_Enter: close(); } } @@ -50,7 +50,7 @@ void KPlayerPopupFrame::keyPressEvent (TQKeyEvent* ev) void KPlayerPopupFrame::mousePressEvent (TQMouseEvent* ev) { TQFrame::mousePressEvent (ev); -//if ( ! rect().contains (ev -> pos()) ) +//if ( ! rect().tqcontains (ev -> pos()) ) // m_outside_mouse_press = true; } @@ -60,21 +60,21 @@ void KPlayerPopupFrame::mouseReleaseEvent (TQMouseEvent* ev) if ( m_outside_mouse_press ) { m_outside_mouse_press = false; - if ( ! rect().contains (ev -> pos()) ) + if ( ! rect().tqcontains (ev -> pos()) ) close(); } }*/ KPlayerPopupSliderAction::KPlayerPopupSliderAction (const TQString& text, const TQString& pix, const KShortcut& shortcut, const TQObject* receiver, - const char* slot, TQObject* parent, const char* name) - : KAction (text, pix, shortcut, parent, name) + const char* slot, TQObject* tqparent, const char* name) + : KAction (text, pix, shortcut, tqparent, name) { m_frame = new KPlayerPopupFrame; m_frame -> setFrameStyle (TQFrame::PopupPanel | TQFrame::Raised); m_frame -> setLineWidth (2); m_slider = new KPlayerSlider (Qt::Vertical, m_frame); - m_frame -> resize (36, m_slider -> sizeHint().height() + 4); + m_frame -> resize (36, m_slider -> tqsizeHint().height() + 4); m_slider -> setGeometry (m_frame -> contentsRect()); //CHANGED kdDebug() << "Popup slider size " << m_slider -> width() << "x" << m_slider -> height() << "\n"; connect (m_slider, TQT_SIGNAL (changed (int)), receiver, slot); @@ -158,9 +158,9 @@ void KPlayerPopupSliderAction::slotActivated (void) } KPlayerSliderAction::KPlayerSliderAction (const TQString& text, const KShortcut& cut, - const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name) - : KWidgetAction (new KPlayerSlider (Qt::Horizontal, 0, name), text, cut, receiver, slot, parent, name) - //: KAction (text, 0, parent, name) + const TQObject* receiver, const char* slot, KActionCollection* tqparent, const char* name) + : KWidgetAction (new KPlayerSlider (Qt::Horizontal, 0, name), text, cut, receiver, slot, tqparent, name) + //: KAction (text, 0, tqparent, name) { setAutoSized (true); connect (slider(), TQT_SIGNAL (changed (int)), receiver, slot); @@ -187,7 +187,7 @@ int KPlayerSliderAction::plug (TQWidget* widget, int index) return result; KToolBar* toolbar = (KToolBar*) widget; //int id = getToolButtonID(); - //kdDebug() << "Orientation: " << toolbar -> orientation() << "\n"; + //kdDebug() << "Qt::Orientation: " << toolbar -> orientation() << "\n"; //m_slider -> reparent (toolbar, TQPoint()); //toolbar -> insertWidget (id, 0, m_slider, index); //toolbar -> setItemAutoSized (id, true); @@ -199,10 +199,10 @@ int KPlayerSliderAction::plug (TQWidget* widget, int index) //addContainer (toolbar, id); //setupToolbar (toolbar -> orientation(), toolbar); orientationChanged (toolbar -> orientation()); - connect (toolbar, TQT_SIGNAL (orientationChanged (Orientation)), this, TQT_SLOT (orientationChanged (Orientation))); + connect (toolbar, TQT_SIGNAL (orientationChanged (Qt::Orientation)), this, TQT_SLOT (orientationChanged (Qt::Orientation))); //connect (toolbar, TQT_SIGNAL (destroyed()), this, TQT_SLOT (toolbarDestroyed())); - //if ( parentCollection() ) - // parentCollection() -> connectHighlight (toolbar, this); + //if ( tqparentCollection() ) + // tqparentCollection() -> connectHighlight (toolbar, this); //return containerCount() - 1; return result; } @@ -213,10 +213,10 @@ void KPlayerSliderAction::unplug (TQWidget* widget) //Q_ASSERT (isPlugged()); //Q_ASSERT (widget -> inherits ("KToolBar")); KWidgetAction::unplug (widget); - if ( ! slider() || ! isPlugged() || widget != slider() -> parent() ) + if ( ! slider() || ! isPlugged() || TQT_BASE_OBJECT(widget) != TQT_BASE_OBJECT(slider() -> tqparent()) ) return; //KToolBar* toolbar = (KToolBar*) widget; - disconnect (widget, TQT_SIGNAL (orientationChanged (Orientation)), this, TQT_SLOT (orientationChanged (Orientation))); + disconnect (widget, TQT_SIGNAL (orientationChanged (Qt::Orientation)), this, TQT_SLOT (orientationChanged (Qt::Orientation))); //disconnect (toolbar, TQT_SIGNAL (destroyed()), this, TQT_SLOT (toolbarDestroyed())); //m_slider -> reparent (0, TQPoint()); /*int index = findContainer (toolbar); @@ -226,7 +226,7 @@ void KPlayerSliderAction::unplug (TQWidget* widget) removeContainer (index);*/ } -/*void KPlayerSliderAction::setupToolbar (Orientation orientation, KToolBar* toolbar) +/*void KPlayerSliderAction::setupToolbar (Qt::Orientation orientation, KToolBar* toolbar) { if ( orientation == Qt::Horizontal ) { @@ -264,9 +264,9 @@ void KPlayerSliderAction::orientationChanged (Qt::Orientation orientation) m_slider -> reparent (0, TQPoint()); }*/ -KPlayerSlider::KPlayerSlider (Qt::Orientation orientation, TQWidget* parent, const char* name) -//CHANGED : TQSlider (orientation, parent, name) - : TQSlider (300, 2200, 400, 1000, orientation, parent, name) +KPlayerSlider::KPlayerSlider (Qt::Orientation orientation, TQWidget* tqparent, const char* name) +//CHANGED : TQSlider (orientation, tqparent, name) + : TQSlider (300, 2200, 400, 1000, orientation, tqparent, name) { m_changing_orientation = false; setTickmarks (TQSlider::Both); @@ -278,9 +278,9 @@ KPlayerSlider::~KPlayerSlider() //CHANGED kdDebug() << "KPlayerSlider destroyed\n"; } -TQSize KPlayerSlider::sizeHint() const +TQSize KPlayerSlider::tqsizeHint() const { - TQSize hint = TQSlider::sizeHint(); + TQSize hint = TQSlider::tqsizeHint(); //CHANGED int length = kPlayerSettings() -> preferredSliderLength(); int length = 200; if ( orientation() == Qt::Horizontal ) @@ -296,10 +296,10 @@ TQSize KPlayerSlider::sizeHint() const return hint; } -TQSize KPlayerSlider::minimumSizeHint() const +TQSize KPlayerSlider::tqminimumSizeHint() const { //kdDebug() << "KPlayerSlider minimum size hint\n"; - TQSize hint = TQSlider::minimumSizeHint(); + TQSize hint = TQSlider::tqminimumSizeHint(); //CHANGED int length = kPlayerSettings() -> minimumSliderLength(); int length = 200; if ( orientation() == Qt::Horizontal ) diff --git a/umbrello/umbrello/kplayerslideraction.h b/umbrello/umbrello/kplayerslideraction.h index 076ebf22..9ffd1a3a 100644 --- a/umbrello/umbrello/kplayerslideraction.h +++ b/umbrello/umbrello/kplayerslideraction.h @@ -19,28 +19,29 @@ #include <kaction.h> #include <tqslider.h> -/**KPlayer's slider widget. Works around the Qt upside-down slider bug. +/**KPlayer's slider widget. Works around the TQt upside-down slider bug. * Taken from kplayer CVS 2003-09-21 (kplayer > 0.3.1) by Jonathan Riddell *@author kiriuja */ -class KPlayerSlider : public QSlider +class KPlayerSlider : public TQSlider { Q_OBJECT + TQ_OBJECT public: /** The KPlayerSlider constructor. Parameters are passed on to TQSlider. */ - explicit KPlayerSlider (Qt::Orientation, TQWidget* parent = 0, const char* name = 0); + explicit KPlayerSlider (Qt::Orientation, TQWidget* tqparent = 0, const char* name = 0); /** The KPlayerSlider destructor. Does nothing. */ virtual ~KPlayerSlider(); /** The size hint. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** The minimum size hint. */ - virtual TQSize minimumSizeHint() const; + virtual TQSize tqminimumSizeHint() const; /** The minimum value. */ @@ -101,15 +102,16 @@ protected: /**KPlayer popup frame. *@author kiriuja */ -class KPlayerPopupFrame : public QFrame +class KPlayerPopupFrame : public TQFrame { Q_OBJECT + TQ_OBJECT public: /** The KPlayerPopupFrame constructor. Parameters are passed on to TQFrame. */ - KPlayerPopupFrame (TQWidget* parent = 0, const char* name = 0) - : TQFrame (parent, name, Qt::WType_Popup) { } + KPlayerPopupFrame (TQWidget* tqparent = 0, const char* name = 0) + : TQFrame (tqparent, name, TQt::WType_Popup) { } /** The KPlayerPopupFrame destructor. Does nothing. */ virtual ~KPlayerPopupFrame() { } @@ -126,12 +128,13 @@ protected: class KPlayerPopupSliderAction : public KAction { Q_OBJECT + TQ_OBJECT public: /** The KPlayerPopupSliderAction constructor. Parameters are passed on to KAction. */ KPlayerPopupSliderAction (const TQString& text, const TQString& pix, const KShortcut& shortcut, - const TQObject* receiver, const char* slot, TQObject* parent = 0, const char* name = 0); + const TQObject* receiver, const char* slot, TQObject* tqparent = 0, const char* name = 0); /** The KPlayerPopupSliderAction destructor. Deletes the KPlayerPopupFrame. */ virtual ~KPlayerPopupSliderAction(); @@ -141,9 +144,9 @@ public: KPlayerSlider* slider (void) { return m_slider; } - /** Plugs the action into the toolbar. Reparents the slider into the toolbar. */ + /** Plugs the action into the toolbar. Retqparents the slider into the toolbar. */ //virtual int plug (TQWidget*, int = -1); - /** Unplugs the action from the toolbar. Reparents the slider out of the toolbar. */ + /** Unplugs the action from the toolbar. Retqparents the slider out of the toolbar. */ //virtual void unplug (TQWidget*); protected slots: @@ -166,12 +169,13 @@ protected: class KPlayerSliderAction : public KWidgetAction { Q_OBJECT + TQ_OBJECT public: /** The KPlayerSliderAction constructor. Parameters are passed on to KAction. */ KPlayerSliderAction (const TQString& text, const KShortcut&, const TQObject* receiver, - const char* slot, KActionCollection* parent = 0, const char* name = 0); + const char* slot, KActionCollection* tqparent = 0, const char* name = 0); /** The KPlayerSliderAction destructor. Does nothing. */ virtual ~KPlayerSliderAction(); diff --git a/umbrello/umbrello/kstartuplogo.cpp b/umbrello/umbrello/kstartuplogo.cpp index 7f768260..48df28a8 100644 --- a/umbrello/umbrello/kstartuplogo.cpp +++ b/umbrello/umbrello/kstartuplogo.cpp @@ -17,8 +17,8 @@ #include <kstandarddirs.h> #include <tqtimer.h> -KStartupLogo::KStartupLogo(TQWidget * parent, const char *name) - : TQWidget(parent,name, Qt::WStyle_NoBorder | Qt::WStyle_Customize | Qt::WDestructiveClose ) +KStartupLogo::KStartupLogo(TQWidget * tqparent, const char *name) + : TQWidget(tqparent,name, TQt::WStyle_NoBorder | TQt::WStyle_Customize | TQt::WDestructiveClose ) ,m_bReadyToHide(false) { //pm.load(locate("appdata", "pics/startlogo.png")); KStandardDirs * dirs = KGlobal::dirs(); diff --git a/umbrello/umbrello/kstartuplogo.h b/umbrello/umbrello/kstartuplogo.h index 71181891..07770d6c 100644 --- a/umbrello/umbrello/kstartuplogo.h +++ b/umbrello/umbrello/kstartuplogo.h @@ -26,8 +26,9 @@ */ class KStartupLogo : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KStartupLogo(TQWidget *parent=0, const char *name=0); + KStartupLogo(TQWidget *tqparent=0, const char *name=0); ~KStartupLogo(); void setHideEnabled(bool bEnabled); diff --git a/umbrello/umbrello/linepath.cpp b/umbrello/umbrello/linepath.cpp index b79ed8ac..b2dde5ab 100644 --- a/umbrello/umbrello/linepath.cpp +++ b/umbrello/umbrello/linepath.cpp @@ -84,7 +84,7 @@ void LinePath::setAssociation(AssociationWidget * association ) { createHeadLines(); if( getAssocType() == Uml::at_Coll_Message ) setupParallelLine(); - UMLView * view = (UMLView *)m_pAssociation -> parent(); + UMLView * view = (UMLView *)m_pAssociation -> tqparent(); connect( view, TQT_SIGNAL( sigColorChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineColorChanged( Uml::IDType ) ) ); connect( view, TQT_SIGNAL( sigLineWidthChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineWidthChanged( Uml::IDType ) ) ); } @@ -176,7 +176,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) { line -> setZ( -2 ); line -> setPoints( point.x(), point.y(), ep.x(), ep.y() ); line -> setPen( getPen() ); - line -> setVisible( true ); + line -> tqsetVisible( true ); m_LineList.insert( 1, line ); if (!bLoading) setupSelected(); @@ -191,7 +191,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) { line -> setPoints( point.x(), point.y(), ep.x(), ep.y() ); line -> setZ( -2 ); line -> setPen( getPen() ); - line -> setVisible( true ); + line -> tqsetVisible( true ); m_LineList.append( line ); if (!bLoading) setupSelected(); @@ -205,7 +205,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) { line -> setPoints( point.x(), point.y(), ep.x(), ep.y() ); line -> setZ( -2 ); line -> setPen( getPen() ); - line -> setVisible( true ); + line -> tqsetVisible( true ); m_LineList.insert( pointIndex, line ); if (!bLoading) setupSelected(); @@ -277,7 +277,7 @@ bool LinePath::setStartEndPoints( const TQPoint &start, const TQPoint &end ) { line -> setPoints( start.x(), start.y(), end.x(), end.y() ); line -> setZ( -2 ); line -> setPen( getPen() ); - line -> setVisible( true ); + line -> tqsetVisible( true ); m_LineList.append( line ); return true; } @@ -297,7 +297,7 @@ int LinePath::onLinePath( const TQPoint &position ) { TQCanvasItemList::iterator end(list.end()); for(TQCanvasItemList::iterator item_it(list.begin()); item_it != end; ++item_it ) { - if( ( index = m_LineList.findRef( (TQCanvasLine*)*item_it ) ) != -1 ) + if( ( index = m_LineList.tqfindRef( (TQCanvasLine*)*item_it ) ) != -1 ) break; }//end for return index; @@ -374,7 +374,7 @@ void LinePath::setLineColor( const TQColor &color ) { } if( getAssocType() == Uml::at_Aggregation ) - if (m_pClearPoly) m_pClearPoly -> setBrush( TQBrush( Qt::white ) ); + if (m_pClearPoly) m_pClearPoly -> setBrush( TQBrush( TQt::white ) ); else if( getAssocType() == Uml::at_Composition ) if (m_pClearPoly) m_pClearPoly -> setBrush( TQBrush( color ) ); @@ -467,7 +467,7 @@ void LinePath::setupSelected() { TQPen LinePath::getPen() { Uml::Association_Type type = getAssocType(); if( type == Uml::at_Dependency || type == Uml::at_Realization || type == Uml::at_Anchor ) - return TQPen( getLineColor(), getLineWidth(), Qt::DashLine ); + return TQPen( getLineColor(), getLineWidth(), TQt::DashLine ); return TQPen( getLineColor(), getLineWidth() ); } @@ -644,7 +644,7 @@ void LinePath::growList(LineList &list, int by) { TQCanvasLine * line = new TQCanvasLine( getCanvas() ); line -> setZ( 0 ); line -> setPen( pen ); - line -> setVisible( true ); + line -> tqsetVisible( true ); list.append( line ); } } @@ -665,8 +665,8 @@ void LinePath::createHeadLines() { case Uml::at_Realization: growList(m_HeadList, 3); m_pClearPoly = new TQCanvasPolygon( canvas ); - m_pClearPoly -> setVisible( true ); - m_pClearPoly -> setBrush( TQBrush( Qt::white ) ); + m_pClearPoly -> tqsetVisible( true ); + m_pClearPoly -> setBrush( TQBrush( TQt::white ) ); m_pClearPoly -> setZ( -1 ); break; @@ -674,9 +674,9 @@ void LinePath::createHeadLines() { case Uml::at_Aggregation: growList(m_HeadList, 4); m_pClearPoly = new TQCanvasPolygon( canvas ); - m_pClearPoly -> setVisible( true ); + m_pClearPoly -> tqsetVisible( true ); if( getAssocType() == Uml::at_Aggregation ) - m_pClearPoly -> setBrush( TQBrush( Qt::white ) ); + m_pClearPoly -> setBrush( TQBrush( TQt::white ) ); else m_pClearPoly -> setBrush( TQBrush( getLineColor() ) ); m_pClearPoly -> setZ( -1 ); @@ -815,7 +815,7 @@ Uml::Association_Type LinePath::getAssocType() { TQColor LinePath::getLineColor() { if( !m_pAssociation ) - return Qt::black; + return TQt::black; return m_pAssociation -> getLineColor(); } @@ -847,7 +847,7 @@ void LinePath::cleanup() { m_pClearPoly = 0; m_bHeadCreated = m_bParallelLineCreated = false; if( m_pAssociation ) { - UMLView * view = (UMLView *)m_pAssociation -> parent(); + UMLView * view = (UMLView *)m_pAssociation -> tqparent(); if(view) { disconnect( view, TQT_SIGNAL( sigColorChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineColorChanged( Uml::IDType ) ) ); disconnect( view, TQT_SIGNAL( sigLineWidthChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineWidthChanged( Uml::IDType ) ) ); diff --git a/umbrello/umbrello/linepath.h b/umbrello/umbrello/linepath.h index ea0251a9..d02714ed 100644 --- a/umbrello/umbrello/linepath.h +++ b/umbrello/umbrello/linepath.h @@ -25,7 +25,7 @@ class AssociationWidget; class UMLView; -// Qt forward declarations +// TQt forward declarations class TQDataStream; class TQDomDocument; class TQDomElement; @@ -44,6 +44,7 @@ typedef TQPtrListIterator<TQCanvasRectangle> RectListIt; */ class LinePath : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor @@ -168,7 +169,7 @@ public: * This is needed because the m_pAssociation does not yet * exist at the time of the LinePath::loadFromXMI call. * However, this means that the points in the m_LineList - * do not have a parent when they are loaded. + * do not have a tqparent when they are loaded. * They need to be reparented by calling LinePath::activate() * once the m_pAssociation exists. */ diff --git a/umbrello/umbrello/linkwidget.cpp b/umbrello/umbrello/linkwidget.cpp index 508de933..259d6567 100644 --- a/umbrello/umbrello/linkwidget.cpp +++ b/umbrello/umbrello/linkwidget.cpp @@ -30,7 +30,7 @@ UMLClassifier *LinkWidget::getOperationOwner() { UMLOperation *op = getOperation(); if (op == NULL) return NULL; - return static_cast<UMLClassifier*>(op->parent()); + return static_cast<UMLClassifier*>(op->tqparent()); } TQString LinkWidget::getOperationText(UMLView *view /* = NULL */) { diff --git a/umbrello/umbrello/listpopupmenu.cpp b/umbrello/umbrello/listpopupmenu.cpp index d94f8c18..548ded25 100644 --- a/umbrello/umbrello/listpopupmenu.cpp +++ b/umbrello/umbrello/listpopupmenu.cpp @@ -37,15 +37,15 @@ #include "objectwidget.h" //ListPopupMenu for a UMLView (diagram) -ListPopupMenu::ListPopupMenu(TQWidget *parent, Menu_Type type, UMLView * view) - : KPopupMenu(parent) { +ListPopupMenu::ListPopupMenu(TQWidget *tqparent, Menu_Type type, UMLView * view) + : KPopupMenu(tqparent) { init(); setupMenu(type, view); } //ListPopupMenu for the tree list view -ListPopupMenu::ListPopupMenu(TQWidget *parent, Uml::ListView_Type type) - : KPopupMenu(parent) { +ListPopupMenu::ListPopupMenu(TQWidget *tqparent, Uml::ListView_Type type) + : KPopupMenu(tqparent) { init(); Menu_Type mt = mt_Undefined; switch(type) @@ -205,9 +205,9 @@ ListPopupMenu::ListPopupMenu(TQWidget *parent, Uml::ListView_Type type) } //ListPopupMenu for a canvas widget -ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object, +ListPopupMenu::ListPopupMenu(TQWidget * tqparent, UMLWidget * object, bool multi, bool unique) - : KPopupMenu(parent) + : KPopupMenu(tqparent) { init(); //make the right menu for the type @@ -259,7 +259,7 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object, StateWidget *pState; ActivityWidget *pActivity; - UMLView * pView = static_cast<UMLView *>( parent ); + UMLView * pView = static_cast<UMLView *>( tqparent ); switch(type) { case Uml::wt_Actor: @@ -373,9 +373,9 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object, { ForkJoinWidget *pForkJoin = static_cast<ForkJoinWidget*>(object); if (pForkJoin->getDrawVertical()) - insertItem(i18n("Flip Horizontal"), mt_Flip); + insertItem(i18n("FlipQt::Horizontal"), mt_Flip); else - insertItem(i18n("Flip Vertical"), mt_Flip); + insertItem(i18n("FlipQt::Vertical"), mt_Flip); } break; diff --git a/umbrello/umbrello/listpopupmenu.h b/umbrello/umbrello/listpopupmenu.h index e7030090..54c7336c 100644 --- a/umbrello/umbrello/listpopupmenu.h +++ b/umbrello/umbrello/listpopupmenu.h @@ -187,30 +187,30 @@ public: /** * Constructs the popup menu for a diagram * - * @param parent The parent to ListPopupMenu. + * @param tqparent The tqparent to ListPopupMenu. * @param type The type of menu to display. * @param view The UMLView in which this ListPopupMenu is going to be displayed */ - explicit ListPopupMenu(TQWidget* parent, Menu_Type type = mt_Undefined, UMLView* view = 0); + explicit ListPopupMenu(TQWidget* tqparent, Menu_Type type = mt_Undefined, UMLView* view = 0); /** * Constructs the popup menu for a list view item. * - * @param parent The parent to ListPopupMenu. + * @param tqparent The tqparent to ListPopupMenu. * @param type The type of menu to display. */ - ListPopupMenu(TQWidget* parent, Uml::ListView_Type type); + ListPopupMenu(TQWidget* tqparent, Uml::ListView_Type type); /** * Constructs the popup menu for a canvas widget. * - * @param parent The parent to ListPopupMenu. + * @param tqparent The tqparent to ListPopupMenu. * @param object The UMLWidget to represent a menu for. * @param multi True if multiple items are selected. * @param unique True if multiple selected items all have * the same type (e.g. Class, Interface) */ - ListPopupMenu(TQWidget* parent, UMLWidget* object, bool multi = false, bool unique = false); + ListPopupMenu(TQWidget* tqparent, UMLWidget* object, bool multi = false, bool unique = false); /** * Standard deconstructor. @@ -296,7 +296,7 @@ private: * Shortcut for commonly used menu initializations. * * @param type The Menu_Type for which to set up the menu. - * @param view The UMLView parent of the menu. + * @param view The UMLView tqparent of the menu. */ void setupMenu(Menu_Type type, UMLView * view = 0); diff --git a/umbrello/umbrello/messagewidget.cpp b/umbrello/umbrello/messagewidget.cpp index 1139b58c..3e24e7f7 100644 --- a/umbrello/umbrello/messagewidget.cpp +++ b/umbrello/umbrello/messagewidget.cpp @@ -64,7 +64,7 @@ void MessageWidget::init() { m_pOw[Uml::A] = m_pOw[Uml::B] = NULL; m_pFText = NULL; m_nY = 0; - setVisible(true); + tqsetVisible(true); } MessageWidget::~MessageWidget() { @@ -94,9 +94,9 @@ void MessageWidget::draw(TQPainter& p, int offsetX, int offsetY) { } } -void MessageWidget::drawSolidArrowhead(TQPainter& p, int x, int y, Qt::ArrowType direction) { +void MessageWidget::drawSolidArrowhead(TQPainter& p, int x, int y, TQt::ArrowType direction) { int arrowheadExtentX = 4; - if (direction == Qt::RightArrow) { + if (direction == TQt::RightArrow) { arrowheadExtentX = -arrowheadExtentX; } TQPointArray points; @@ -106,10 +106,10 @@ void MessageWidget::drawSolidArrowhead(TQPainter& p, int x, int y, Qt::ArrowType } void MessageWidget::drawArrow(TQPainter& p, int x, int y, int w, - Qt::ArrowType direction, bool useDottedLine /* = false */) { + TQt::ArrowType direction, bool useDottedLine /* = false */) { int arrowheadStartX = x; int arrowheadExtentX = 4; - if (direction == Qt::RightArrow) { + if (direction == TQt::RightArrow) { arrowheadStartX += w; arrowheadExtentX = -arrowheadExtentX; } @@ -135,7 +135,7 @@ void MessageWidget::drawSynchronous(TQPainter& p, int offsetX, int offsetY) { bool messageOverlaps = m_pOw[Uml::A] -> messageOverlap( getY(), this ); if(m_pOw[Uml::A] == m_pOw[Uml::B]) { - p.fillRect( offsetX, offsetY, 17, h, TQBrush(Qt::white) ); //box + p.fillRect( offsetX, offsetY, 17, h, TQBrush(TQt::white) ); //box p.drawRect(offsetX, offsetY, 17, h); //box offsetX += 17; w -= 17; @@ -146,7 +146,7 @@ void MessageWidget::drawSynchronous(TQPainter& p, int offsetX, int offsetY) { // draw line segment parallel to (and at the right of) the life line p.drawLine(offsetX + w, offsetY, offsetX + w, lowerLineY); // draw lower line segment (back to the life line) - drawArrow(p, offsetX, lowerLineY, w, Qt::LeftArrow); + drawArrow(p, offsetX, lowerLineY, w, TQt::LeftArrow); offsetX -= 17; offsetY -= 3; } else if(x1 < x2) { @@ -156,11 +156,11 @@ void MessageWidget::drawSynchronous(TQPainter& p, int offsetX, int offsetY) { } TQPen pen = p.pen(); int startX = offsetX + w - 16; - p.fillRect(startX, offsetY, 17, h, TQBrush(Qt::white)); //box + p.fillRect(startX, offsetY, 17, h, TQBrush(TQt::white)); //box p.drawRect(startX, offsetY, 17, h); //box p.drawLine(offsetX, offsetY + 4, startX, offsetY + 4); //arrow line - drawSolidArrowhead(p, startX - 1, offsetY + 4, Qt::RightArrow); - drawArrow(p, offsetX, offsetY + h - 3, w - 16, Qt::LeftArrow, true); // return arrow + drawSolidArrowhead(p, startX - 1, offsetY + 4, TQt::RightArrow); + drawArrow(p, offsetX, offsetY + h - 3, w - 16, TQt::LeftArrow, true); // return arrow if (messageOverlaps) { offsetX -= 8; //reset for drawSelected() } @@ -169,11 +169,11 @@ void MessageWidget::drawSynchronous(TQPainter& p, int offsetX, int offsetY) { w -=8; } TQPen pen = p.pen(); - p.fillRect( offsetX, offsetY, 17, h, TQBrush(Qt::white) ); //box + p.fillRect( offsetX, offsetY, 17, h, TQBrush(TQt::white) ); //box p.drawRect(offsetX, offsetY, 17, h); //box p.drawLine(offsetX + 18, offsetY + 4, offsetX + w, offsetY + 4); //arrow line - drawSolidArrowhead(p, offsetX + 17, offsetY + 4, Qt::LeftArrow); - drawArrow(p, offsetX + 18, offsetY + h - 3, w - 18, Qt::RightArrow, true); // return arrow + drawSolidArrowhead(p, offsetX + 17, offsetY + 4, TQt::LeftArrow); + drawArrow(p, offsetX + 18, offsetY + h - 3, w - 18, TQt::RightArrow, true); // return arrow } if(m_bSelected) { @@ -200,7 +200,7 @@ void MessageWidget::drawAsynchronous(TQPainter& p, int offsetX, int offsetY) { // draw line segment parallel to (and at the right of) the life line p.drawLine(offsetX + w, offsetY, offsetX + w, lowerLineY); // draw lower line segment (back to the life line) - drawArrow(p, offsetX, lowerLineY, w, Qt::LeftArrow); + drawArrow(p, offsetX, lowerLineY, w, TQt::LeftArrow); if (messageOverlapsA) { offsetX -= 7; //reset for drawSelected() } @@ -209,7 +209,7 @@ void MessageWidget::drawAsynchronous(TQPainter& p, int offsetX, int offsetY) { offsetX += 7; w -= 7; } - drawArrow(p, offsetX, offsetY + 4, w, Qt::RightArrow); + drawArrow(p, offsetX, offsetY + 4, w, TQt::RightArrow); if (messageOverlapsA) { offsetX -= 7; } @@ -217,7 +217,7 @@ void MessageWidget::drawAsynchronous(TQPainter& p, int offsetX, int offsetY) { if (messageOverlapsA) { w -= 7; } - drawArrow(p, offsetX, offsetY + 4, w, Qt::LeftArrow); + drawArrow(p, offsetX, offsetY + 4, w, TQt::LeftArrow); } if (m_bSelected) @@ -238,7 +238,7 @@ void MessageWidget::drawCreation(TQPainter& p, int offsetX, int offsetY) { offsetX += 7; w -= 7; } - drawArrow(p, offsetX, lineY, w, Qt::RightArrow); + drawArrow(p, offsetX, lineY, w, TQt::RightArrow); if (messageOverlapsA) { offsetX -= 7; } @@ -246,7 +246,7 @@ void MessageWidget::drawCreation(TQPainter& p, int offsetX, int offsetY) { if (messageOverlapsA) { w -= 7; } - drawArrow(p, offsetX, lineY, w, Qt::LeftArrow); + drawArrow(p, offsetX, lineY, w, TQt::LeftArrow); } if (m_bSelected) @@ -353,7 +353,7 @@ void MessageWidget::calculateWidget() { setMessageText(m_pFText); calculateDimensions(); - setVisible(true); + tqsetVisible(true); setX(m_nPosX); setY(m_nY); @@ -381,7 +381,7 @@ void MessageWidget::slotWidgetMoved(Uml::IDType id) { setTextPosition(); } -bool MessageWidget::contains(ObjectWidget * w) { +bool MessageWidget::tqcontains(ObjectWidget * w) { if(m_pOw[Uml::A] == w || m_pOw[Uml::B] == w) return true; else @@ -447,7 +447,7 @@ bool MessageWidget::activate(IDChangeLog * Log /*= 0*/) { if (op) { // If the UMLOperation is set, m_CustomOp isn't used anyway. // Just setting it empty for the sake of sanity. - m_CustomOp = TQString::null; + m_CustomOp = TQString(); } } @@ -464,7 +464,7 @@ bool MessageWidget::activate(IDChangeLog * Log /*= 0*/) { m_pFText -> setText(""); m_pFText->setActivated(); TQString messageText = m_pFText->getText(); - m_pFText->setVisible( messageText.length() > 1 ); + m_pFText->tqsetVisible( messageText.length() > 1 ); connect(m_pOw[Uml::A], TQT_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQT_SLOT(slotWidgetMoved(Uml::IDType))); connect(m_pOw[Uml::B], TQT_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQT_SLOT(slotWidgetMoved(Uml::IDType))); diff --git a/umbrello/umbrello/messagewidget.h b/umbrello/umbrello/messagewidget.h index 29383405..a0828da7 100644 --- a/umbrello/umbrello/messagewidget.h +++ b/umbrello/umbrello/messagewidget.h @@ -40,13 +40,14 @@ class MessageWidgetController; */ class MessageWidget : public UMLWidget, public LinkWidget { Q_OBJECT + TQ_OBJECT public: friend class MessageWidgetController; /** * Constructs a MessageWidget. * - * @param view The parent to this class. + * @param view The tqparent to this class. * @param a The role A widget for this message. * @param b The role B widget for this message. * @param y The vertical position to display this message. @@ -61,7 +62,7 @@ public: /** * Constructs a MessageWidget. * - * @param view The parent to this class. + * @param view The tqparent to this class. * @param sequenceMessageType The Uml::Sequence_Message_Type of this message widget * @param id The ID to assign (-1 will prompt a new ID.) */ @@ -100,7 +101,7 @@ public: * @param w The ObjectWidget to check for. * @return true - if is contained, false - not contained. */ - bool contains(ObjectWidget * w); + bool tqcontains(ObjectWidget * w); /** * Returns the related widget on the given side. @@ -208,7 +209,7 @@ public: UMLClassifier * getSeqNumAndOp(TQString& seqNum, TQString& op); /** - * Calculate the geometry of the widget. + * Calculate the tqgeometry of the widget. */ void calculateWidget(); @@ -348,16 +349,16 @@ protected: * Draw an arrow pointing in the given direction. * The arrow head is not solid, i.e. it is made up of two lines * like so: ---> - * The direction can be either Qt::LeftArrow or Qt::RightArrow. + * The direction can be either TQt::LeftArrow or TQt::RightArrow. */ static void drawArrow( TQPainter& p, int x, int y, int w, - Qt::ArrowType direction, bool useDottedLine = false ); + TQt::ArrowType direction, bool useDottedLine = false ); /** * Draw a solid (triangular) arrowhead pointing in the given direction. - * The direction can be either Qt::LeftArrow or Qt::RightArrow. + * The direction can be either TQt::LeftArrow or TQt::RightArrow. */ - static void drawSolidArrowhead(TQPainter& p, int x, int y, Qt::ArrowType direction); + static void drawSolidArrowhead(TQPainter& p, int x, int y, TQt::ArrowType direction); /** * Update the UMLWidget::m_bResizable flag according to the diff --git a/umbrello/umbrello/messagewidgetcontroller.h b/umbrello/umbrello/messagewidgetcontroller.h index a691f465..6d13034b 100644 --- a/umbrello/umbrello/messagewidgetcontroller.h +++ b/umbrello/umbrello/messagewidgetcontroller.h @@ -64,7 +64,7 @@ protected: /** * Overriden from UMLWidgetController. * Saves the values of the widget needed for move/resize. - * Calls parent method and then saves the value of m_unconstrainedPositionY + * Calls tqparent method and then saves the value of m_unconstrainedPositionY * * @param me The TQMouseEvent to get the offset from. */ diff --git a/umbrello/umbrello/model_utils.cpp b/umbrello/umbrello/model_utils.cpp index f120a80c..95a93f6b 100644 --- a/umbrello/umbrello/model_utils.cpp +++ b/umbrello/umbrello/model_utils.cpp @@ -113,14 +113,14 @@ UMLObject* findUMLObject(const UMLObjectList& inList, if (UMLApp::app()->getActiveLanguage() == Uml::pl_Cpp) { if (name.endsWith("*")) name.remove("*"); - else if (name.contains("&")) + else if (name.tqcontains("&")) name.remove("&"); } #endif TQString nameWithoutFirstPrefix; - if (name.contains("::")) + if (name.tqcontains("::")) components = TQStringList::split("::", name); - else if (name.contains(".")) + else if (name.tqcontains(".")) components = TQStringList::split(".", name); if (components.size() > 1) { name = components.front(); @@ -130,7 +130,7 @@ UMLObject* findUMLObject(const UMLObjectList& inList, if (currentObj) { UMLPackage *pkg = NULL; if (dynamic_cast<UMLClassifierListItem*>(currentObj)) { - currentObj = static_cast<UMLObject*>(currentObj->parent()); + currentObj = static_cast<UMLObject*>(currentObj->tqparent()); } pkg = dynamic_cast<UMLPackage*>(currentObj); if (pkg == NULL) @@ -146,7 +146,7 @@ UMLObject* findUMLObject(const UMLObjectList& inList, return pkg; } } - if (seenPkgs.findRef(pkg) != -1) { + if (seenPkgs.tqfindRef(pkg) != -1) { kError() << "findUMLObject(" << name << "): " << "breaking out of cycle involving " << pkg->getName() << endl; @@ -235,7 +235,7 @@ UMLObject* findUMLObject(const UMLObjectList& inList, return NULL; } -TQString uniqObjectName(Uml::Object_Type type, UMLPackage *parentPkg, TQString prefix) { +TQString uniqObjectName(Uml::Object_Type type, UMLPackage *tqparentPkg, TQString prefix) { TQString currentName = prefix; if (currentName.isEmpty()) { if(type == Uml::ot_Class) @@ -271,7 +271,7 @@ TQString uniqObjectName(Uml::Object_Type type, UMLPackage *parentPkg, TQString p } UMLDoc *doc = UMLApp::app()->getDocument(); TQString name = currentName; - for (int number = 1; !doc->isUnique(name, parentPkg); number++) { + for (int number = 1; !doc->isUnique(name, tqparentPkg); number++) { name = currentName + '_' + TQString::number(number); } return name; @@ -407,7 +407,7 @@ int stringToDirection(TQString input, Uml::Parameter_Direction & result) { return dirLen; } -Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope) { +Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope) { UMLDoc *pDoc = UMLApp::app()->getDocument(); @@ -430,7 +430,7 @@ Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningS return PS_OK; } -Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope, +Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope, Uml::Visibility *vis /* = 0 */) { UMLDoc *pDoc = UMLApp::app()->getDocument(); @@ -438,7 +438,7 @@ Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owning if (a.isEmpty()) return PS_Empty; - int colonPos = a.find(':'); + int colonPos = a.tqfind(':'); if (colonPos < 0) { nmTp = NameAndType(a, NULL); return PS_OK; @@ -494,19 +494,19 @@ Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owning return PS_OK; } -Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope) { +Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope) { UMLDoc *pDoc = UMLApp::app()->getDocument(); m = m.simplifyWhiteSpace(); if (m.isEmpty()) return PS_Empty; - if (m.contains(TQRegExp("operator *()"))) { - // C++ special case: two sets of parentheses + if (m.tqcontains(TQRegExp("operator *()"))) { + // C++ special case: two sets of tqparentheses desc.m_name = "operator()"; m.remove(TQRegExp("operator *()")); } else { /** - * The search pattern includes everything up to the opening parenthesis + * The search pattern includes everything up to the opening tqparenthesis * because UML also permits non programming-language oriented designs * using narrative names, for example "check water temperature". */ @@ -532,7 +532,7 @@ Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *ownin desc.m_pReturnType = pRetType; } } - // Remove possible empty parentheses () + // Remove possible empty tqparentheses () m.remove( TQRegExp("\\s*\\(\\s*\\)") ); desc.m_args.clear(); pat = TQRegExp( "\\((.*)\\)" ); @@ -546,7 +546,7 @@ Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *ownin TQStringList args = TQStringList::split( TQRegExp("\\s*,\\s*"), arglist); for (TQStringList::Iterator lit = args.begin(); lit != args.end(); ++lit) { NameAndType nmTp; - Parse_Status ps = parseAttribute(*lit, nmTp, owningScope); + Parse_tqStatus ps = parseAttribute(*lit, nmTp, owningScope); if (ps) return ps; desc.m_args.append(nmTp); @@ -554,7 +554,7 @@ Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *ownin return PS_OK; } -TQString psText(Parse_Status value) { +TQString psText(Parse_tqStatus value) { const TQString text[] = { i18n("OK"), i18n("Empty"), i18n("Malformed argument"), i18n("Unknown argument type"), i18n("Illegal method name"), @@ -602,7 +602,7 @@ TQString progLangToString(Uml::Programming_Language pl) { default: break; } - return TQString::null; + return TQString(); } Uml::Programming_Language stringToProgLang(TQString str) { diff --git a/umbrello/umbrello/model_utils.h b/umbrello/umbrello/model_utils.h index 9e1468c0..771d6f86 100644 --- a/umbrello/umbrello/model_utils.h +++ b/umbrello/umbrello/model_utils.h @@ -56,7 +56,7 @@ UMLObject * findObjectInList(Uml::IDType id, const UMLObjectList& inList); * * @param inList List in which to seek the object. * @param name Name of the object to find. - * @param type Object_Type of the object to find (optional.) + * @param type Object_Type of the object to tqfind (optional.) * When the given type is ot_UMLObject the type is * disregarded, i.e. the given name is the only * search criterion. @@ -75,14 +75,14 @@ UMLObject* findUMLObject( const UMLObjectList& inList, * if the default name is taken e.g. new_actor, new_actor_1 * etc. * @param type The object type. - * @param parentPkg The package in which to compare the name. + * @param tqparentPkg The package in which to compare the name. * @param prefix The prefix to use (optional.) * If no prefix is given then a type related * prefix will be chosen internally. */ TQString uniqObjectName(Uml::Object_Type type, - UMLPackage *parentPkg, - TQString prefix = TQString::null); + UMLPackage *tqparentPkg, + TQString prefix = TQString()); /** * Return true if the given tag is a one of the common XMI @@ -236,7 +236,7 @@ Uml::Programming_Language stringToProgLang(TQString str); /** * Return type of parseOperation() */ -enum Parse_Status { +enum Parse_tqStatus { PS_OK, PS_Empty, PS_Malformed_Arg, PS_Unknown_ArgType, PS_Illegal_MethodName, PS_Unknown_ReturnType, PS_Unspecified_Error }; @@ -253,7 +253,7 @@ struct NameAndType { } NameAndType(TQString name, UMLObject *type, Uml::Parameter_Direction direction = Uml::pd_In, - TQString initialValue = TQString::null) + TQString initialValue = TQString()) : m_name(name), m_type(type), m_direction(direction), m_initialValue(initialValue) { } @@ -284,7 +284,7 @@ struct OpDescriptor { * @param owningScope Pointer to the owning scope of the template param. * @return Error status of the parse, PS_OK for success. */ -Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope); +Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope); /** * Parses an attribute given in UML syntax. @@ -303,7 +303,7 @@ Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningS * * @return Error status of the parse, PS_OK for success. */ -Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope, +Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope, Uml::Visibility *vis = 0); /** @@ -316,12 +316,12 @@ Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owning * @param owningScope Pointer to the owning scope of the operation. * @return Error status of the parse, PS_OK for success. */ -Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope); +Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope); /** - * Returns the Parse_Status as a text. + * Returns the Parse_tqStatus as a text. */ -TQString psText(Parse_Status value); +TQString psText(Parse_tqStatus value); } diff --git a/umbrello/umbrello/node.h b/umbrello/umbrello/node.h index 6d9df54e..88d1be8a 100644 --- a/umbrello/umbrello/node.h +++ b/umbrello/umbrello/node.h @@ -27,6 +27,7 @@ */ class UMLNode : public UMLCanvasObject { Q_OBJECT + TQ_OBJECT public: /** * Sets up a Node. diff --git a/umbrello/umbrello/nodewidget.cpp b/umbrello/umbrello/nodewidget.cpp index 8214b7b6..5379a972 100644 --- a/umbrello/umbrello/nodewidget.cpp +++ b/umbrello/umbrello/nodewidget.cpp @@ -63,7 +63,7 @@ void NodeWidget::draw(TQPainter & p, int offsetX, int offsetY) { p.drawRect(offsetX, bodyOffsetY, bodyWidth, bodyHeight); p.drawLine(offsetX + w - 1, offsetY, offsetX + bodyWidth - 2, bodyOffsetY + 1); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); p.setFont(font); int lines = 1; @@ -71,7 +71,7 @@ void NodeWidget::draw(TQPainter & p, int offsetX, int offsetY) { TQString stereotype = m_pObject->getStereotype(); if (!stereotype.isEmpty()) { p.drawText(offsetX, bodyOffsetY + (bodyHeight/2) - fontHeight, - bodyWidth, fontHeight, Qt::AlignCenter, m_pObject->getStereotype(true)); + bodyWidth, fontHeight, TQt::AlignCenter, m_pObject->getStereotype(true)); lines = 2; } } @@ -84,10 +84,10 @@ void NodeWidget::draw(TQPainter & p, int offsetX, int offsetY) { if (lines == 1) { p.drawText(offsetX, bodyOffsetY + (bodyHeight/2) - (fontHeight/2), - bodyWidth, fontHeight, Qt::AlignCenter, name); + bodyWidth, fontHeight, TQt::AlignCenter, name); } else { p.drawText(offsetX, bodyOffsetY + (bodyHeight/2), - bodyWidth, fontHeight, Qt::AlignCenter, name); + bodyWidth, fontHeight, TQt::AlignCenter, name); } if(m_bSelected) { diff --git a/umbrello/umbrello/nodewidget.h b/umbrello/umbrello/nodewidget.h index c06ea759..c1151212 100644 --- a/umbrello/umbrello/nodewidget.h +++ b/umbrello/umbrello/nodewidget.h @@ -31,7 +31,7 @@ public: /** * Constructs a NodeWidget. * - * @param view The parent of this NodeWidget. + * @param view The tqparent of this NodeWidget. * @param n The UMLNode this will be representing. */ NodeWidget(UMLView * view, UMLNode *n ); diff --git a/umbrello/umbrello/notewidget.cpp b/umbrello/umbrello/notewidget.cpp index 9badeef5..1826847b 100644 --- a/umbrello/umbrello/notewidget.cpp +++ b/umbrello/umbrello/notewidget.cpp @@ -42,7 +42,7 @@ NoteWidget::NoteWidget(UMLView * view, Uml::IDType id) m_pEditor->setFrameStyle(TQFrame::NoFrame | TQFrame::Plain); m_pEditor->setHScrollBarMode(TQScrollView::AlwaysOff); m_pEditor->setVScrollBarMode(TQScrollView::AlwaysOff); - m_pEditor->setTextFormat(Qt::RichText); + m_pEditor->setTextFormat(TQt::RichText); m_pEditor->setShown(true); setEditorGeometry(); connect(m_pView, TQT_SIGNAL(contentsMoving(int, int)), @@ -201,7 +201,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse #if defined (NOTEWIDGET_EMBED_EDITOR) m_pEditor->setText( getDoc() ); m_pEditor->setShown(true); - m_pEditor->repaint(); + m_pEditor->tqrepaint(); #else if (p == NULL) return; @@ -212,7 +212,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse if reach height exit and don't print anymore start new line on \n character */ - p->setPen( Qt::black ); + p->setPen( TQt::black ); TQFont font = UMLWidget::getFont(); p->setFont( font ); const TQFontMetrics &fm = getFontMetrics(FT_NORMAL); @@ -247,7 +247,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse // print "fullLine" in current line, update write position to next line // and decide then on following actions p->drawText(offsetX + textX, offsetY + textY, - textWidth, fontHeight, Qt::AlignLeft, fullLine ); + textWidth, fontHeight, TQt::AlignLeft, fullLine ); fullLine = word; word = ""; // update write position @@ -260,7 +260,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse if (c == returnChar) { // print "word" - which is now "fullLine" and set to next line p->drawText(offsetX + textX, offsetY + textY, - textWidth, fontHeight, Qt::AlignLeft, fullLine); + textWidth, fontHeight, TQt::AlignLeft, fullLine); fullLine = ""; textX = margin; textY += fontHeight; @@ -271,7 +271,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse // newline found and combination of "fullLine" and "word" fits // in one line p->drawText(offsetX + textX, offsetY + textY, - textWidth, fontHeight, Qt::AlignLeft, testCombineLine); + textWidth, fontHeight, TQt::AlignLeft, testCombineLine); fullLine = word = ""; textX = margin; textY += fontHeight; diff --git a/umbrello/umbrello/notewidget.h b/umbrello/umbrello/notewidget.h index d11730f1..b14dbe57 100644 --- a/umbrello/umbrello/notewidget.h +++ b/umbrello/umbrello/notewidget.h @@ -18,7 +18,7 @@ // forward declarations class NoteWidgetController; -// Qt forward declarations +// TQt forward declarations class TQPainter; class TQTextEdit; @@ -34,13 +34,14 @@ class TQTextEdit; */ class NoteWidget : public UMLWidget { Q_OBJECT + TQ_OBJECT public: friend class NoteWidgetController; /** * Constructs a NoteWidget. * - * @param view The parent to this widget. + * @param view The tqparent to this widget. * @param noteType The NoteWidget::NoteType of this NoteWidget * @param id The unique id of the widget. * The default (-1) will prompt a new ID. diff --git a/umbrello/umbrello/notewidgetcontroller.h b/umbrello/umbrello/notewidgetcontroller.h index 081556ed..7c3da48c 100644 --- a/umbrello/umbrello/notewidgetcontroller.h +++ b/umbrello/umbrello/notewidgetcontroller.h @@ -44,7 +44,7 @@ public: /** * Overriden from UMLWidgetController. * Handles a mouse move event. - * Executes base code and then sets the geometry of the editor. + * Executes base code and then sets the tqgeometry of the editor. * * @param me The TQMouseEvent event. */ diff --git a/umbrello/umbrello/object_factory.cpp b/umbrello/umbrello/object_factory.cpp index 7b8d16b2..a87ff2c3 100644 --- a/umbrello/umbrello/object_factory.cpp +++ b/umbrello/umbrello/object_factory.cpp @@ -60,10 +60,10 @@ bool assignUniqueIdOnCreation() { } UMLObject* createNewUMLObject(Uml::Object_Type type, const TQString &name, - UMLPackage *parentPkg) { - if (parentPkg == NULL) { + UMLPackage *tqparentPkg) { + if (tqparentPkg == NULL) { kError() << "Object_Factory::createNewUMLObject(" << name - << "): parentPkg is NULL" << endl; + << "): tqparentPkg is NULL" << endl; return NULL; } UMLObject *o = NULL; @@ -114,40 +114,40 @@ UMLObject* createNewUMLObject(Uml::Object_Type type, const TQString &name, kWarning() << "createNewUMLObject error unknown type: " << type << endl; return NULL; } - o->setUMLPackage(parentPkg); + o->setUMLPackage(tqparentPkg); UMLDoc *doc = UMLApp::app()->getDocument(); - parentPkg->addObject(o); + tqparentPkg->addObject(o); doc->signalUMLObjectCreated(o); kapp->processEvents(); return o; } UMLObject* createUMLObject(Uml::Object_Type type, const TQString &n, - UMLPackage *parentPkg /* = NULL */, + UMLPackage *tqparentPkg /* = NULL */, bool solicitNewName /* = true */) { UMLDoc *doc = UMLApp::app()->getDocument(); - if (parentPkg == NULL) { + if (tqparentPkg == NULL) { if (type == Uml::ot_Datatype) { - parentPkg = doc->getDatatypeFolder(); + tqparentPkg = doc->getDatatypeFolder(); } else { Uml::Model_Type mt = Model_Utils::convert_OT_MT(type); kDebug() << "Object_Factory::createUMLObject(" << n << "): " - << "parentPkg is not set, assuming Model_Type " << mt << endl; - parentPkg = doc->getRootFolder(mt); + << "tqparentPkg is not set, assuming Model_Type " << mt << endl; + tqparentPkg = doc->getRootFolder(mt); } } if (!n.isEmpty()) { - UMLObject *o = doc->findUMLObject(n, type, parentPkg); + UMLObject *o = doc->findUMLObject(n, type, tqparentPkg); if (o) { if (!solicitNewName) return o; } else { - o = createNewUMLObject(type, n, parentPkg); + o = createNewUMLObject(type, n, tqparentPkg); return o; } } bool ok = false; - TQString name = Model_Utils::uniqObjectName(type, parentPkg, n); + TQString name = Model_Utils::uniqObjectName(type, tqparentPkg, n); bool bValidNameEntered = false; do { name = KInputDialog::getText(i18n("Name"), i18n("Enter name:"), name, &ok, (TQWidget*)UMLApp::app()); @@ -165,19 +165,19 @@ UMLObject* createUMLObject(Uml::Object_Type type, const TQString &n, i18n("Reserved Keyword")); continue; } - if (! doc->isUnique(name, parentPkg)) { + if (! doc->isUnique(name, tqparentPkg)) { KMessageBox::error(0, i18n("That name is already being used."), i18n("Not a Unique Name")); continue; } bValidNameEntered = true; } while (bValidNameEntered == false); - UMLObject *o = createNewUMLObject(type, name, parentPkg); + UMLObject *o = createNewUMLObject(type, name, tqparentPkg); return o; } -UMLAttribute *createAttribute(UMLObject *parent, const TQString& name, UMLObject *type) { - UMLAttribute *attr = new UMLAttribute(parent); +UMLAttribute *createAttribute(UMLObject *tqparent, const TQString& name, UMLObject *type) { + UMLAttribute *attr = new UMLAttribute(tqparent); attr->setName(name); attr->setType(type); if (g_predefinedId == Uml::id_None) @@ -185,35 +185,35 @@ UMLAttribute *createAttribute(UMLObject *parent, const TQString& name, UMLObject return attr; } -UMLOperation *createOperation(UMLClassifier *parent, const TQString& name) { - UMLOperation *op = new UMLOperation(parent, name, g_predefinedId); +UMLOperation *createOperation(UMLClassifier *tqparent, const TQString& name) { + UMLOperation *op = new UMLOperation(tqparent, name, g_predefinedId); return op; } -UMLClassifierListItem* createChildObject(UMLClassifier* parent, Uml::Object_Type type) { +UMLClassifierListItem* createChildObject(UMLClassifier* tqparent, Uml::Object_Type type) { UMLObject* returnObject = NULL; switch (type) { case Uml::ot_Attribute: case Uml::ot_EntityAttribute: { - UMLClassifier *c = dynamic_cast<UMLClassifier*>(parent); + UMLClassifier *c = dynamic_cast<UMLClassifier*>(tqparent); if (c && !c->isInterface()) returnObject = c->createAttribute(); break; } case Uml::ot_Operation: { - UMLClassifier *c = dynamic_cast<UMLClassifier*>(parent); + UMLClassifier *c = dynamic_cast<UMLClassifier*>(tqparent); if (c) returnObject = c->createOperation(); break; } case Uml::ot_Template: { - UMLClassifier *c = dynamic_cast<UMLClassifier*>(parent); + UMLClassifier *c = dynamic_cast<UMLClassifier*>(tqparent); if (c) returnObject = c->createTemplate(); break; } case Uml::ot_EnumLiteral: { - UMLEnum* umlenum = dynamic_cast<UMLEnum*>(parent); + UMLEnum* umlenum = dynamic_cast<UMLEnum*>(tqparent); if (umlenum) { returnObject = umlenum->createEnumLiteral(); } @@ -226,7 +226,7 @@ UMLClassifierListItem* createChildObject(UMLClassifier* parent, Uml::Object_Type } UMLObject* makeObjectFromXMI(const TQString& xmiTag, - const TQString& stereoID /* = TQString::null */) { + const TQString& stereoID /* = TQString() */) { UMLObject* pObject = 0; if (Uml::tagEq(xmiTag, "UseCase")) { pObject = new UMLUseCase(); diff --git a/umbrello/umbrello/object_factory.h b/umbrello/umbrello/object_factory.h index a4007bf6..541975c0 100644 --- a/umbrello/umbrello/object_factory.h +++ b/umbrello/umbrello/object_factory.h @@ -31,7 +31,7 @@ namespace Object_Factory { * @param n A name to give to the object (optional.) * If not given then an input dialog prompts * the user to supply a name. - * @param parentPkg The object's parent package. + * @param tqparentPkg The object's tqparent package. * @param solicitNewName Ask user for a different name if an object * of the given name already exists. * If set to false and the name already exists @@ -39,24 +39,24 @@ namespace Object_Factory { * The default is to ask for the new name. */ UMLObject* createUMLObject(Uml::Object_Type type, - const TQString &n = TQString::null, - UMLPackage *parentPkg = 0, + const TQString &n = TQString(), + UMLPackage *tqparentPkg = 0, bool solicitNewName = true); /** * Creates an operation, attribute, template, or enum literal - * for the parent classifier. + * for the tqparent classifier. * - * @param parent The parent concept + * @param tqparent The tqparent concept * @param type The type to create * @return Pointer to the UMLClassifierListItem created */ -UMLClassifierListItem* createChildObject(UMLClassifier *parent, Uml::Object_Type type); +UMLClassifierListItem* createChildObject(UMLClassifier *tqparent, Uml::Object_Type type); -UMLAttribute *createAttribute(UMLObject *parent, const TQString& name, +UMLAttribute *createAttribute(UMLObject *tqparent, const TQString& name, UMLObject *type = 0); -UMLOperation *createOperation(UMLClassifier *parent, const TQString& name); +UMLOperation *createOperation(UMLClassifier *tqparent, const TQString& name); /** * Control whether the createUMLObject() solicits a new unique ID for the @@ -77,7 +77,7 @@ bool assignUniqueIdOnCreation(); * Used by loadFromXMI and clipboard paste. */ UMLObject* makeObjectFromXMI(const TQString& xmiTag, - const TQString& stereoID = TQString::null); + const TQString& stereoID = TQString()); } diff --git a/umbrello/umbrello/objectwidget.cpp b/umbrello/umbrello/objectwidget.cpp index 6ae111f0..79384852 100644 --- a/umbrello/umbrello/objectwidget.cpp +++ b/umbrello/umbrello/objectwidget.cpp @@ -197,7 +197,7 @@ void ObjectWidget::slotColorChanged(Uml::IDType /*viewID*/) { UMLWidget::setLineColor( m_pView->getLineColor() ); if( m_pLine) - m_pLine -> setPen( TQPen( UMLWidget::getLineColor(), UMLWidget::getLineWidth(), Qt::DashLine ) ); + m_pLine -> setPen( TQPen( UMLWidget::getLineColor(), UMLWidget::getLineWidth(), TQt::DashLine ) ); } void ObjectWidget::cleanup() { @@ -243,10 +243,10 @@ void ObjectWidget::drawObject(TQPainter & p, int offsetX, int offsetY) { multiInstOfst = 10; } p.drawRect(offsetX, offsetY, w - multiInstOfst, h - multiInstOfst); - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); p.drawText(offsetX + O_MARGIN, offsetY + O_MARGIN, w - O_MARGIN * 2 - multiInstOfst, h - O_MARGIN * 2 - multiInstOfst, - Qt::AlignCenter, t); + TQt::AlignCenter, t); p.setFont( oldFont ); } @@ -274,10 +274,10 @@ void ObjectWidget::drawActor(TQPainter & p, int offsetX, int offsetY) { p.drawLine(middleX - A_WIDTH / 2, offsetY + thirdH + thirdH / 2, middleX + A_WIDTH / 2, offsetY + thirdH + thirdH / 2);//arms //draw text - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); TQString t = m_InstanceName + " : " + m_pObject -> getName(); p.drawText(offsetX + A_MARGIN, offsetY + textStartY, - w - A_MARGIN * 2, fontHeight, Qt::AlignCenter, t); + w - A_MARGIN * 2, fontHeight, TQt::AlignCenter, t); } void ObjectWidget::tabUp() { @@ -322,7 +322,7 @@ int ObjectWidget::getEndLineY() { } void ObjectWidget::messageAdded(MessageWidget* message) { - if (messageWidgetList.containsRef(message) ) { + if (messageWidgetList.tqcontainsRef(message) ) { kError() << "ObjectWidget::messageAdded(" << message->getName() << ") : duplicate entry !" << endl; diff --git a/umbrello/umbrello/objectwidget.h b/umbrello/umbrello/objectwidget.h index 837c6ff1..fff23f2a 100644 --- a/umbrello/umbrello/objectwidget.h +++ b/umbrello/umbrello/objectwidget.h @@ -34,11 +34,12 @@ class SeqLineWidget; */ class ObjectWidget : public UMLWidget { Q_OBJECT + TQ_OBJECT public: /** * Creates an ObjectWidget. * - * @param view The parent to this object. + * @param view The tqparent to this object. * @param o The object it will be representing. * @param lid The local id for the object. */ @@ -120,7 +121,7 @@ public: } /** - * Activate the object after serializing it from a QDataStream + * Activate the object after serializing it from a TQDataStream */ bool activate(IDChangeLog* ChangeLog = 0); diff --git a/umbrello/umbrello/operation.cpp b/umbrello/umbrello/operation.cpp index dce9b41e..28cd1d11 100644 --- a/umbrello/umbrello/operation.cpp +++ b/umbrello/umbrello/operation.cpp @@ -25,9 +25,9 @@ #include "uniqueid.h" #include "dialogs/umloperationdialog.h" -UMLOperation::UMLOperation(const UMLClassifier *parent, const TQString& name, +UMLOperation::UMLOperation(const UMLClassifier *tqparent, const TQString& name, Uml::IDType id, Uml::Visibility s, UMLObject *rt) - : UMLClassifierListItem(parent, name, id) + : UMLClassifierListItem(tqparent, name, id) { if (rt) m_returnId = UniqueID::gen(); @@ -39,8 +39,8 @@ UMLOperation::UMLOperation(const UMLClassifier *parent, const TQString& name, m_bConst = false; } -UMLOperation::UMLOperation(const UMLClassifier * parent) - : UMLClassifierListItem (parent) +UMLOperation::UMLOperation(const UMLClassifier * tqparent) + : UMLClassifierListItem (tqparent) { m_BaseType = Uml::ot_Operation; m_bConst = false; @@ -65,7 +65,7 @@ void UMLOperation::moveParmLeft(UMLAttribute * a) { << endl; disconnect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); int idx; - if ( (idx=m_List.find( a )) == -1 ) { + if ( (idx=m_List.tqfind( a )) == -1 ) { kDebug() << "Error move parm left " << a->getName() << endl; return; } @@ -85,7 +85,7 @@ void UMLOperation::moveParmRight(UMLAttribute * a) { << endl; disconnect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); int idx; - if ( (idx=m_List.find( a )) == -1 ) { + if ( (idx=m_List.tqfind( a )) == -1 ) { kDebug() << "Error move parm right " << a->getName() << endl; return; } @@ -150,7 +150,7 @@ TQString UMLOperation::toString(Uml::Signature_Type sig) { } else if (parameterlessOpNeedsParentheses) { s.append("()"); } - UMLClassifier *ownParent = static_cast<UMLClassifier*>(parent()); + UMLClassifier *ownParent = static_cast<UMLClassifier*>(tqparent()); TQString returnType; UMLClassifier *retType = UMLClassifierListItem::getType(); if (retType) { @@ -218,8 +218,8 @@ void UMLOperation::copyInto(UMLOperation *rhs) const UMLObject* UMLOperation::clone() const { - //FIXME: The new operation should be slaved to the NEW parent not the old. - UMLOperation *clone = new UMLOperation( static_cast<UMLClassifier*>(parent()) ); + //FIXME: The new operation should be slaved to the NEW tqparent not the old. + UMLOperation *clone = new UMLOperation( static_cast<UMLClassifier*>(tqparent()) ); copyInto(clone); return clone; @@ -243,24 +243,24 @@ bool UMLOperation::isConstructorOperation() { if (getStereotype() == strConstructor) return true; - UMLClassifier * c = static_cast<UMLClassifier*>(this->parent()); + UMLClassifier * c = static_cast<UMLClassifier*>(this->tqparent()); TQString cName = c->getName(); TQString opName = getName(); // It's a constructor operation if the operation name - // matches that of the parent classifier. + // matches that of the tqparent classifier. return (cName == opName); } bool UMLOperation::isDestructorOperation() { if (getStereotype() == "destructor") return true; - UMLClassifier * c = static_cast<UMLClassifier*>(this->parent()); + UMLClassifier * c = static_cast<UMLClassifier*>(this->tqparent()); TQString cName = c->getName(); TQString opName = getName(); // Special support for C++ syntax: // It's a destructor operation if the operation name begins - // with "~" followed by the name of the parent classifier. + // with "~" followed by the name of the tqparent classifier. if (! opName.startsWith("~")) return false; opName.remove( TQRegExp("^~\\s*") ); @@ -279,8 +279,8 @@ bool UMLOperation::getConst() const { return m_bConst; } -bool UMLOperation::showPropertiesDialog(TQWidget* parent) { - UMLOperationDialog dialog(parent, this); +bool UMLOperation::showPropertiesDialog(TQWidget* tqparent) { + UMLOperationDialog dialog(tqparent, this); return dialog.exec(); } diff --git a/umbrello/umbrello/operation.h b/umbrello/umbrello/operation.h index 4ceef15a..12625ac2 100644 --- a/umbrello/umbrello/operation.h +++ b/umbrello/umbrello/operation.h @@ -24,20 +24,21 @@ class UMLClassifier; */ class UMLOperation : public UMLClassifierListItem { Q_OBJECT + TQ_OBJECT public: /** * Constructs an UMLOperation. * Not intended for general use: The operation is not tied in with - * umbrello's Qt signalling for object creation. + * umbrello's TQt signalling for object creation. * If you want to create an Operation use the method in UMLDoc instead. * - * @param parent The parent to this operation. + * @param tqparent The tqparent to this operation. * @param name The name of the operation. * @param id The id of the operation. * @param s The visibility of the operation. * @param rt The return type of the operation. */ - UMLOperation(const UMLClassifier * parent, const TQString& name, + UMLOperation(const UMLClassifier * tqparent, const TQString& name, Uml::IDType id = Uml::id_None, Uml::Visibility s = Uml::Visibility::Public, UMLObject *rt = 0); @@ -45,12 +46,12 @@ public: /** * Constructs an UMLOperation. * Not intended for general use: The operation is not tied in with - * umbrello's Qt signalling for object creation. + * umbrello's TQt signalling for object creation. * If you want to create an Operation use the method in UMLDoc instead. * - * @param parent The parent to this operation. + * @param tqparent The tqparent to this operation. */ - UMLOperation(const UMLClassifier * parent); + UMLOperation(const UMLClassifier * tqparent); public: /** @@ -156,7 +157,7 @@ public: /** * Display the properties configuration dialog for the template. */ - bool showPropertiesDialog(TQWidget* parent); + bool showPropertiesDialog(TQWidget* tqparent); /** * Returns whether this operation is a constructor. diff --git a/umbrello/umbrello/ownedcodeblock.cpp b/umbrello/umbrello/ownedcodeblock.cpp index f80fd315..22ceeed1 100644 --- a/umbrello/umbrello/ownedcodeblock.cpp +++ b/umbrello/umbrello/ownedcodeblock.cpp @@ -34,10 +34,10 @@ // Constructors/Destructors // -OwnedCodeBlock::OwnedCodeBlock ( UMLObject * parent ) - : TQObject ( (TQObject*)parent, "anOwnedCodeBlock" ) +OwnedCodeBlock::OwnedCodeBlock ( UMLObject * tqparent ) + : TQObject ( (TQObject*)tqparent, "anOwnedCodeBlock" ) { - initFields(parent); + initFields(tqparent); } OwnedCodeBlock::~OwnedCodeBlock ( ) { @@ -90,7 +90,7 @@ void OwnedCodeBlock::setAttributesOnNode(TQDomDocument& /*doc*/, TQDomElement& e UMLRole * role = dynamic_cast<UMLRole*>(m_parentObject); if(role) { - elem.setAttribute("parent_id",ID2STR(role->getParentAssociation()->getID())); + elem.setAttribute("tqparent_id",ID2STR(role->getParentAssociation()->getID())); // CAUTION: role_id here is numerically inverted wrt Uml::Role_Type, // i.e. role A is 1 and role B is 0. // I'll resist the temptation to change this - @@ -99,7 +99,7 @@ void OwnedCodeBlock::setAttributesOnNode(TQDomDocument& /*doc*/, TQDomElement& e } else { - elem.setAttribute("parent_id",ID2STR(m_parentObject->getID())); + elem.setAttribute("tqparent_id",ID2STR(m_parentObject->getID())); //elem.setAttribute("role_id","-1"); } @@ -110,11 +110,11 @@ void OwnedCodeBlock::setAttributesOnNode(TQDomDocument& /*doc*/, TQDomElement& e */ void OwnedCodeBlock::setAttributesFromNode ( TQDomElement & elem) { - // set local attributes, parent object first - TQString idStr = elem.attribute("parent_id","-1"); + // set local attributes, tqparent object first + TQString idStr = elem.attribute("tqparent_id","-1"); Uml::IDType id = STR2ID(idStr); - // always disconnect from current parent + // always disconnect from current tqparent getParentObject()->disconnect(this); // now, what is the new object we want to set? @@ -125,7 +125,7 @@ void OwnedCodeBlock::setAttributesFromNode ( TQDomElement & elem) { // FIX..one day. // Ugh. This is UGLY, but we have to do it this way because UMLRoles // don't go into the document list of UMLobjects, and have the same - // ID as their parent UMLAssociations. So..the drill is then special + // ID as their tqparent UMLAssociations. So..the drill is then special // for Associations..in that case we need to find out which role will // serve as the parametger here. The REAL fix, of course, would be to // treat UMLRoles on a more even footing, but im not sure how that change @@ -154,18 +154,18 @@ void OwnedCodeBlock::setAttributesFromNode ( TQDomElement & elem) { } else - kError() << "ERROR: can't load ownedcodeblock: parentUMLObject w/id:" + kError() << "ERROR: can't load ownedcodeblock: tqparentUMLObject w/id:" << ID2STR(id) << " not found, corrupt save file?" << endl; } -void OwnedCodeBlock::initFields(UMLObject * parent ) +void OwnedCodeBlock::initFields(UMLObject * tqparent ) { - m_parentObject = parent; + m_parentObject = tqparent; // one reason for being: set up the connection between - // this code block and the parent UMLObject..when the parent + // this code block and the tqparent UMLObject..when the tqparent // signals a change has been made, we automatically update // ourselves connect(m_parentObject, TQT_SIGNAL(modified()), this, TQT_SLOT(syncToParent())); diff --git a/umbrello/umbrello/ownedcodeblock.h b/umbrello/umbrello/ownedcodeblock.h index 0a71f50c..130bd4dd 100644 --- a/umbrello/umbrello/ownedcodeblock.h +++ b/umbrello/umbrello/ownedcodeblock.h @@ -29,12 +29,13 @@ class UMLObject; /** * class OwnedCodeBlock * Describes any codeblock which is 'owned' by a UMLobject of some sort and should - * be in sync with that parent. + * be in sync with that tqparent. */ -class OwnedCodeBlock : virtual public QObject +class OwnedCodeBlock : virtual public TQObject { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -43,7 +44,7 @@ public: /** * Constructor */ - OwnedCodeBlock ( UMLObject * parent ); + OwnedCodeBlock ( UMLObject * tqparent ); /** * Empty Destructor @@ -55,7 +56,7 @@ public: */ UMLObject * getParentObject ( ); - // get the parent code document of this code block + // get the tqparent code document of this code block virtual CodeDocument * getParentDocument ( ) = 0; protected: @@ -87,7 +88,7 @@ protected: private: - void initFields ( UMLObject * parent ); + void initFields ( UMLObject * tqparent ); UMLObject * m_parentObject; diff --git a/umbrello/umbrello/ownedhierarchicalcodeblock.cpp b/umbrello/umbrello/ownedhierarchicalcodeblock.cpp index 078a02b7..45e41875 100644 --- a/umbrello/umbrello/ownedhierarchicalcodeblock.cpp +++ b/umbrello/umbrello/ownedhierarchicalcodeblock.cpp @@ -31,8 +31,8 @@ // Constructors/Destructors // -OwnedHierarchicalCodeBlock::OwnedHierarchicalCodeBlock ( UMLObject *parent, CodeDocument * doc, const TQString &start, const TQString &end, const TQString &comment) - : HierarchicalCodeBlock ( doc, start, end, comment), OwnedCodeBlock(parent) +OwnedHierarchicalCodeBlock::OwnedHierarchicalCodeBlock ( UMLObject *tqparent, CodeDocument * doc, const TQString &start, const TQString &end, const TQString &comment) + : HierarchicalCodeBlock ( doc, start, end, comment), OwnedCodeBlock(tqparent) { } @@ -68,7 +68,7 @@ void OwnedHierarchicalCodeBlock::setAttributesOnNode (TQDomDocument & doc, TQDom OwnedCodeBlock::setAttributesOnNode(doc, elem); // set local class attributes - elem.setAttribute("parent_id",ID2STR(getParentObject()->getID())); + elem.setAttribute("tqparent_id",ID2STR(getParentObject()->getID())); // setting ID's takes special treatment // as UMLRoles arent properly stored in the XMI right now. diff --git a/umbrello/umbrello/ownedhierarchicalcodeblock.h b/umbrello/umbrello/ownedhierarchicalcodeblock.h index 04717381..7a99fe65 100644 --- a/umbrello/umbrello/ownedhierarchicalcodeblock.h +++ b/umbrello/umbrello/ownedhierarchicalcodeblock.h @@ -30,6 +30,7 @@ class CodeDocument; class OwnedHierarchicalCodeBlock : public HierarchicalCodeBlock, public OwnedCodeBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -38,7 +39,7 @@ public: /** constructor with TQString so we can create & populate it in * one step. */ - OwnedHierarchicalCodeBlock ( UMLObject * parent, CodeDocument * parentDoc, const TQString &start="", const TQString &end="", const TQString &comment="" ); + OwnedHierarchicalCodeBlock ( UMLObject * tqparent, CodeDocument * tqparentDoc, const TQString &start="", const TQString &end="", const TQString &comment="" ); /** * Empty Destructor @@ -48,7 +49,7 @@ public: // Public attributes // - // Return the parent code document + // Return the tqparent code document CodeDocument * getParentDocument(); // these next 2 methods should be supplied by inheriting classes diff --git a/umbrello/umbrello/package.cpp b/umbrello/umbrello/package.cpp index 04e8c14d..59553a9e 100644 --- a/umbrello/umbrello/package.cpp +++ b/umbrello/umbrello/package.cpp @@ -100,7 +100,7 @@ bool UMLPackage::addObject(UMLObject *pObject) { << endl; return false; } - if (m_objects.find(pObject) != -1) { + if (m_objects.tqfind(pObject) != -1) { kDebug() << "UMLPackage::addObject: " << pObject->getName() << " is already there" << endl; return false; @@ -129,7 +129,7 @@ void UMLPackage::removeObject(UMLObject *pObject) { UMLAssociation *assoc = static_cast<UMLAssociation*>(o); removeAssocFromConcepts(assoc); } - if (m_objects.findRef(pObject) == -1) + if (m_objects.tqfindRef(pObject) == -1) kDebug() << m_Name << " removeObject: object with id=" << ID2STR(pObject->getID()) << "not found." << endl; else diff --git a/umbrello/umbrello/package.h b/umbrello/umbrello/package.h index 65b0cb5c..6eef0eff 100644 --- a/umbrello/umbrello/package.h +++ b/umbrello/umbrello/package.h @@ -33,6 +33,7 @@ class UMLAssociation; class UMLPackage : public UMLCanvasObject { Q_OBJECT + TQ_OBJECT public: /** * Sets up a Package. diff --git a/umbrello/umbrello/packagewidget.cpp b/umbrello/umbrello/packagewidget.cpp index c4289b74..a6eff977 100644 --- a/umbrello/umbrello/packagewidget.cpp +++ b/umbrello/umbrello/packagewidget.cpp @@ -76,7 +76,7 @@ void PackageWidget::draw(TQPainter & p, int offsetX, int offsetY) { } p.drawRect(offsetX, offsetY + fontHeight - 1, w, h - fontHeight); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); p.setFont(font); int lines = 1; @@ -84,13 +84,13 @@ void PackageWidget::draw(TQPainter & p, int offsetX, int offsetY) { TQString stereotype = m_pObject->getStereotype(); if (!stereotype.isEmpty()) { p.drawText(offsetX, offsetY + fontHeight + PACKAGE_MARGIN, - w, fontHeight, Qt::AlignCenter, m_pObject->getStereotype(true)); + w, fontHeight, TQt::AlignCenter, m_pObject->getStereotype(true)); lines = 2; } } p.drawText(offsetX, offsetY + (fontHeight*lines) + PACKAGE_MARGIN, - w, fontHeight, Qt::AlignCenter, name ); + w, fontHeight, TQt::AlignCenter, name ); if(m_bSelected) { drawSelected(&p, offsetX, offsetY); diff --git a/umbrello/umbrello/packagewidget.h b/umbrello/umbrello/packagewidget.h index 3cff4ed6..c3fa4a8e 100644 --- a/umbrello/umbrello/packagewidget.h +++ b/umbrello/umbrello/packagewidget.h @@ -33,7 +33,7 @@ public: /** * Constructs a PackageWidget. * - * @param view The parent of this PackageWidget. + * @param view The tqparent of this PackageWidget. * @param o The UMLObject this will be representing. */ PackageWidget(UMLView * view, UMLPackage * o); diff --git a/umbrello/umbrello/petalnode.h b/umbrello/umbrello/petalnode.h index c9f52bde..8306e1d8 100644 --- a/umbrello/umbrello/petalnode.h +++ b/umbrello/umbrello/petalnode.h @@ -52,7 +52,7 @@ public: virtual ~StringOrNode() { } bool isEmpty() { return (string.isEmpty() && node == 0); } }; - typedef QPair<TQString, StringOrNode> NameValue; + typedef TQPair<TQString, StringOrNode> NameValue; typedef TQValueList<NameValue> NameValueList; enum NodeType { nt_object, nt_list }; diff --git a/umbrello/umbrello/petaltree2uml.cpp b/umbrello/umbrello/petaltree2uml.cpp index c8cccdc2..dc650a5d 100644 --- a/umbrello/umbrello/petaltree2uml.cpp +++ b/umbrello/umbrello/petaltree2uml.cpp @@ -77,7 +77,7 @@ TQString quidu(const PetalNode *node) { Uml::Object_Type typeToCreate(const TQString& name) { TQString n = name; n.remove(TQRegExp("^.*::")); // don't consider the scope prefix, it may contain spaces - Uml::Object_Type t = (n.contains(TQRegExp("\\W")) ? Uml::ot_Datatype : Uml::ot_Class); + Uml::Object_Type t = (n.tqcontains(TQRegExp("\\W")) ? Uml::ot_Datatype : Uml::ot_Class); return t; } @@ -129,12 +129,12 @@ public: } /** - * Insert the given UMLClassifierListItem at the parent Umbrello object. + * Insert the given UMLClassifierListItem at the tqparent Umbrello object. * Abstract method to be implemented by inheriting classes. - * NB the parent Umbrello object is not included in the ClassifierListReader + * NB the tqparent Umbrello object is not included in the ClassifierListReader * class - it must be added at inheriting classes. * - * @param node The PetalNode which corresponds to the parent Umbrello object. + * @param node The PetalNode which corresponds to the tqparent Umbrello object. * @param o The UMLObject to insert. */ virtual void insertAtParent(const PetalNode *node, UMLObject *o) = 0; @@ -249,7 +249,7 @@ public: return new UMLAssociation(Uml::at_Generalization); } /** - * Override parent implementation: The secondary data is not for the + * Override tqparent implementation: The secondary data is not for the * UMLAssociation itself but for its role B object. */ void setTypeReferences(UMLObject *item, @@ -282,7 +282,7 @@ public: return new UMLAssociation(Uml::at_Realization); } /** - * Override parent implementation: The secondary data is not for the + * Override tqparent implementation: The secondary data is not for the * UMLAssociation itself but for its role B object. */ void setTypeReferences(UMLObject *item, @@ -309,11 +309,11 @@ protected: * * @param node Pointer to the PetalNode which may contain a controlled unit * @param name Name of the current node - * @param id QUID of the current node - * @param parentPkg Pointer to the current parent UMLPackage. + * @param id TQUID of the current node + * @param tqparentPkg Pointer to the current tqparent UMLPackage. * @return True if the node actually contained a controlled unit. */ -bool handleControlledUnit(PetalNode *node, const TQString& name, Uml::IDType id, UMLPackage *parentPkg) { +bool handleControlledUnit(PetalNode *node, const TQString& name, Uml::IDType id, UMLPackage *tqparentPkg) { if (node->findAttribute("is_unit").string != "TRUE") return false; bool is_loaded = (node->findAttribute("is_loaded").string != "FALSE"); @@ -335,7 +335,7 @@ bool handleControlledUnit(PetalNode *node, const TQString& name, Uml::IDType id, * Given a PetalNode for which the mapping to Umbrello is not yet * implemented umbrellify() is a no-op but also returns true. */ -bool umbrellify(PetalNode *node, UMLPackage *parentPkg = NULL) { +bool umbrellify(PetalNode *node, UMLPackage *tqparentPkg = NULL) { if (node == NULL) { kError() << "umbrellify: node is NULL" << endl; return false; @@ -346,7 +346,7 @@ bool umbrellify(PetalNode *node, UMLPackage *parentPkg = NULL) { Uml::IDType id = quid(node); if (objType == "Class_Category") { - UMLObject *o = Import_Utils::createUMLObject(Uml::ot_Package, name, parentPkg); + UMLObject *o = Import_Utils::createUMLObject(Uml::ot_Package, name, tqparentPkg); o->setID(id); PetalNode *logical_models = node->findAttribute("logical_models").node; if (logical_models) { @@ -355,13 +355,13 @@ bool umbrellify(PetalNode *node, UMLPackage *parentPkg = NULL) { for (uint i = 0; i < atts.count(); i++) { umbrellify(atts[i].second.node, localParent); } - } else if (!handleControlledUnit(node, name, id, parentPkg)) { + } else if (!handleControlledUnit(node, name, id, tqparentPkg)) { kDebug() << "umbrellify: handling of " << objType << " " << name << " is not yet implemented" << endl; } } else if (objType == "Class") { - UMLObject *o = Import_Utils::createUMLObject(Uml::ot_Class, name, parentPkg); + UMLObject *o = Import_Utils::createUMLObject(Uml::ot_Class, name, tqparentPkg); o->setID(id); UMLClassifier *c = static_cast<UMLClassifier*>(o); // set stereotype @@ -455,9 +455,9 @@ bool umbrellify(PetalNode *node, UMLPackage *parentPkg = NULL) { return true; } -Uml::ListView_Type folderType(UMLListViewItem *parent) { +Uml::ListView_Type folderType(UMLListViewItem *tqparent) { Uml::ListView_Type type = Uml::lvt_Unknown; - switch (parent->getType()) { + switch (tqparent->getType()) { case Uml::lvt_Logical_View: case Uml::lvt_Logical_Folder: type = Uml::lvt_Logical_Folder; @@ -488,7 +488,7 @@ Uml::ListView_Type folderType(UMLListViewItem *parent) { * Given a PetalNode for which the mapping to Umbrello is not yet * implemented umbrellify() is a no-op but also returns true. */ -bool umbrellify(PetalNode *node, const TQString& modelsName, UMLListViewItem *parent) { +bool umbrellify(PetalNode *node, const TQString& modelsName, UMLListViewItem *tqparent) { if (node == NULL) { kError() << "umbrellify(" << modelsName << "): node is NULL" << endl; return false; @@ -501,13 +501,13 @@ bool umbrellify(PetalNode *node, const TQString& modelsName, UMLListViewItem *pa UMLListViewItem *item = NULL; if (objType == "Class_Category") { - Uml::ListView_Type lvType = folderType(parent); - item = new UMLListViewItem( parent, name, lvType, id ); + Uml::ListView_Type lvType = folderType(tqparent); + item = new UMLListViewItem( tqparent, name, lvType, id ); } else if (objType == "Class") { TQString stereotype = clean(node->findAttribute("stereotype").string); if (stereotype == "Actor") { UMLActor *act = new UMLActor(name, id); - item = new UMLListViewItem(parent, name, Uml::lvt_Actor, act); + item = new UMLListViewItem(tqparent, name, Uml::lvt_Actor, act); obj = act; } else { kDebug() << "umbrellify(" << name << "): handling of Class stereotype " @@ -515,16 +515,16 @@ bool umbrellify(PetalNode *node, const TQString& modelsName, UMLListViewItem *pa } } else if (objType == "UseCase") { UMLUseCase *uc = new UMLUseCase(name, id); - item = new UMLListViewItem(parent, name, Uml::lvt_UseCase, uc); + item = new UMLListViewItem(tqparent, name, Uml::lvt_UseCase, uc); obj = uc; } else if (objType == "SubSystem") { UMLComponent *comp = new UMLComponent(name, id); - item = new UMLListViewItem(parent, name, Uml::lvt_Component, comp); + item = new UMLListViewItem(tqparent, name, Uml::lvt_Component, comp); obj = comp; } else if (objType == "Processor" || objType == "Device") { UMLNode *un = new UMLNode(name, id); un->setStereotype(objType.lower()); - item = new UMLListViewItem(parent, name, Uml::lvt_Node, un); + item = new UMLListViewItem(tqparent, name, Uml::lvt_Node, un); obj = un; } else { kDebug() << "umbrellify: object type " << objType @@ -556,12 +556,12 @@ bool importView(PetalNode *root, const TQString& rootName, const TQString& modelsName, UMLListViewItem *lvParent) { PetalNode *viewRoot = root->findAttribute(rootName).node; if (viewRoot == NULL) { - kDebug() << "importView: cannot find " << rootName << endl; + kDebug() << "importView: cannot tqfind " << rootName << endl; return false; } PetalNode *models = viewRoot->findAttribute(modelsName).node; if (models == NULL) { - kError() << "importView: cannot find " << modelsName + kError() << "importView: cannot tqfind " << modelsName << " of " << rootName << endl; return false; } diff --git a/umbrello/umbrello/plugin.cpp b/umbrello/umbrello/plugin.cpp index 8a751374..72dc3169 100644 --- a/umbrello/umbrello/plugin.cpp +++ b/umbrello/umbrello/plugin.cpp @@ -28,10 +28,10 @@ using namespace Umbrello; -Plugin::Plugin(TQObject *parent, +Plugin::Plugin(TQObject *tqparent, const char *name, const TQStringList & /* args */) : - TQObject(parent, name), + TQObject(tqparent, name), Configurable(), _ref(0), _instanceName(name), @@ -106,7 +106,7 @@ Plugin::shutdown() return true; } -QCString +TQCString Plugin::instanceName() const { return _instanceName; @@ -158,7 +158,7 @@ Plugin::configure() return ret; } -QString +TQString Plugin::category() { return TQString("miscellaneous"); diff --git a/umbrello/umbrello/plugin.h b/umbrello/umbrello/plugin.h index ac1178f3..e566c5cc 100644 --- a/umbrello/umbrello/plugin.h +++ b/umbrello/umbrello/plugin.h @@ -19,7 +19,7 @@ #ifndef UMBRELLO_PLUGIN_H #define UMBRELLO_PLUGIN_H -// Qt includes +// TQt includes #include <tqobject.h> // KDE includes @@ -81,7 +81,7 @@ class PluginLoader; * only available within the scope of the shared library, the configuration * records must be set in the constructor of the derived plugin class. However, * because the construction name is passed to this constructor (as are the - * parent object and args), we can simply capture the name when the object + * tqparent object and args), we can simply capture the name when the object * is constructed. */ class Plugin : @@ -89,6 +89,7 @@ class Plugin : public Configurable { Q_OBJECT + TQ_OBJECT friend class PluginLoader; public: /** Destroy a plugin.*/ @@ -112,7 +113,7 @@ public: protected: /** Construct a plugin */ - Plugin(TQObject *parent, const char *name, const TQStringList &args); + Plugin(TQObject *tqparent, const char *name, const TQStringList &args); /** Can be reimplemented to define plugin specific startup behavior */ virtual bool onInit(); @@ -144,7 +145,7 @@ private: * The configure method is called by init to parse the configuration * file and load any plugins. Note that the libraries loaded depends * on the GUI state of the application. If the application is type - * Qt::Tty, then we don't use the "loadGUI" action. + * TQt::Tty, then we don't use the "loadGUI" action. * * @return True on success, false on failure. */ diff --git a/umbrello/umbrello/pluginloader.cpp b/umbrello/umbrello/pluginloader.cpp index 583b3858..9321ac15 100644 --- a/umbrello/umbrello/pluginloader.cpp +++ b/umbrello/umbrello/pluginloader.cpp @@ -16,7 +16,7 @@ // own header #include "pluginloader.h" -// Qt includes +// TQt includes #include <tqstring.h> // KDE includes @@ -63,7 +63,7 @@ PluginLoader::loadPlugin(const TQString &name) // if the plugin has already been loaded, increment // its reference and return. - if((it = _plugins.find(name)) != _plugins.end()) { + if((it = _plugins.tqfind(name)) != _plugins.end()) { plugin = it.data(); plugin->ref(); return plugin; @@ -127,7 +127,7 @@ Plugin * PluginLoader::findPlugin(const TQString &name) { Plugin *ret = NULL; - PluginMap::iterator it = _plugins.find(name); + PluginMap::iterator it = _plugins.tqfind(name); if(it != _plugins.end()) { ret = it.data(); } diff --git a/umbrello/umbrello/pluginloader.h b/umbrello/umbrello/pluginloader.h index 2841711b..12bdfba5 100644 --- a/umbrello/umbrello/pluginloader.h +++ b/umbrello/umbrello/pluginloader.h @@ -19,7 +19,7 @@ #ifndef UMBRELLO_PLUGINLOADER_H #define UMBRELLO_PLUGINLOADER_H -// Qt includes +// TQt includes #include <tqobject.h> #include <tqvaluelist.h> #include <tqmap.h> @@ -64,9 +64,10 @@ class Plugin; * method doesn't reference any local variables - it just returns * a string. */ -class PluginLoader : public QObject +class PluginLoader : public TQObject { Q_OBJECT + TQ_OBJECT public: /** Destry the plugin loader */ ~PluginLoader(); diff --git a/umbrello/umbrello/refactoring/refactoringassistant.cpp b/umbrello/umbrello/refactoring/refactoringassistant.cpp index 193f9545..ef96f5b3 100644 --- a/umbrello/umbrello/refactoring/refactoringassistant.cpp +++ b/umbrello/umbrello/refactoring/refactoringassistant.cpp @@ -35,8 +35,8 @@ using std::type_info; -RefactoringAssistant::RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj, TQWidget *parent, const char *name ): - KListView( parent, name ), m_doc( doc ) +RefactoringAssistant::RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj, TQWidget *tqparent, const char *name ): + KListView( tqparent, name ), m_doc( doc ) { loadPixmaps(); @@ -159,7 +159,7 @@ void RefactoringAssistant::umlObjectModified( const UMLObject *obj ) void RefactoringAssistant::operationAdded( UMLClassifierListItem *o ) { UMLOperation *op = static_cast<UMLOperation*>(o); - UMLClassifier *c = dynamic_cast<UMLClassifier*>(op->parent()); + UMLClassifier *c = dynamic_cast<UMLClassifier*>(op->tqparent()); if(!c) { kWarning() << "RefactoringAssistant::operationAdded(" << op->getName() @@ -201,7 +201,7 @@ void RefactoringAssistant::operationRemoved( UMLClassifierListItem *o ) void RefactoringAssistant::attributeAdded( UMLClassifierListItem *a ) { UMLAttribute *att = static_cast<UMLAttribute*>(a); - UMLClassifier *c = dynamic_cast<UMLClassifier*>(att->parent()); + UMLClassifier *c = dynamic_cast<UMLClassifier*>(att->tqparent()); if(!c) { kWarning() << "RefactoringAssistant::attributeAdded(" << att->getName() @@ -456,12 +456,12 @@ void RefactoringAssistant::createAttribute() } -void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewItem *parent, bool addSuper, bool addSub, bool recurse) +void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewItem *tqparent, bool addSuper, bool addSub, bool recurse) { TQListViewItem *classifierItem, *item; - if( parent ) + if( tqparent ) { - classifierItem = parent; + classifierItem = tqparent; } else { @@ -505,7 +505,7 @@ void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewI operationAdded( op ); } - //if add parents + //if add tqparents if(addSuper) { TQListViewItem *superFolder = new KListViewItem( classifierItem, i18n("Base Classifiers") ); @@ -558,15 +558,15 @@ bool RefactoringAssistant::acceptDrag(TQDropEvent *event) const RefactoringAssistant *me = const_cast<RefactoringAssistant*>(this); //ok, check if the move is valid - TQListViewItem *movingItem = 0, *afterme = 0, *parentItem = 0; - me->findDrop(event->pos(), parentItem, afterme); + TQListViewItem *movingItem = 0, *afterme = 0, *tqparentItem = 0; + me->findDrop(event->pos(), tqparentItem, afterme); for( movingItem = firstChild(); movingItem != 0; movingItem = movingItem->itemBelow() ) { if( movingItem->isSelected() ) break; } - if(!movingItem || !parentItem) - { kDebug()<<"moving/parent items not found - can't accept drag!"<<endl; + if(!movingItem || !tqparentItem) + { kDebug()<<"moving/tqparent items not found - can't accept drag!"<<endl; return false; } @@ -583,26 +583,26 @@ bool RefactoringAssistant::acceptDrag(TQDropEvent *event) const return false; } - kDebug()<<"parent item is "<<parentItem->text(0)<<endl; - UMLObject *parentObject = me->findUMLObject(parentItem); - if( parentObject && dynamic_cast<UMLClassifier*>(parentObject) ) + kDebug()<<"tqparent item is "<<tqparentItem->text(0)<<endl; + UMLObject *tqparentObject = me->findUMLObject(tqparentItem); + if( tqparentObject && dynamic_cast<UMLClassifier*>(tqparentObject) ) { //droping to a classifier, ok } else - {//parent is not a classifier, so maybe it's a folder.. check types - if( (parentItem->text(1) == "operations" && t == Uml::ot_Operation) - || (parentItem->text(1) == "attributes" && t == Uml::ot_Attribute)) + {//tqparent is not a classifier, so maybe it's a folder.. check types + if( (tqparentItem->text(1) == "operations" && t == Uml::ot_Operation) + || (tqparentItem->text(1) == "attributes" && t == Uml::ot_Attribute)) { - parentObject = me->findUMLObject( parentItem->parent() ); + tqparentObject = me->findUMLObject( tqparentItem->tqparent() ); } else { - kDebug()<<"moving to item "<<parentItem->text(0)<<" -- "<<parentItem->text(1)<<" not valid"<<endl; + kDebug()<<"moving to item "<<tqparentItem->text(0)<<" -- "<<tqparentItem->text(1)<<" not valid"<<endl; return false; } } - if (dynamic_cast<UMLClassifier*>(parentObject) && + if (dynamic_cast<UMLClassifier*>(tqparentObject) && (t == Uml::ot_Attribute || t == Uml::ot_Operation)) { return true; @@ -613,7 +613,7 @@ bool RefactoringAssistant::acceptDrag(TQDropEvent *event) const } -void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListViewItem* afterme) +void RefactoringAssistant::movableDropEvent (TQListViewItem* tqparentItem, TQListViewItem* afterme) { //when dropping on a class, we have to put the item in the appropriate folder! UMLObject *movingObject; @@ -631,17 +631,17 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV return; } Uml::Object_Type t = movingObject->getBaseType(); - newClassifier = dynamic_cast<UMLClassifier*>( findUMLObject( parentItem ) ); + newClassifier = dynamic_cast<UMLClassifier*>( findUMLObject( tqparentItem ) ); if(!newClassifier) { - if ((parentItem->text(1) == "operations" && t == Uml::ot_Operation) - || (parentItem->text(1) == "attributes" && t == Uml::ot_Attribute)) + if ((tqparentItem->text(1) == "operations" && t == Uml::ot_Operation) + || (tqparentItem->text(1) == "attributes" && t == Uml::ot_Attribute)) { - newClassifier = dynamic_cast<UMLClassifier*>( findUMLObject( parentItem->parent() ) ); + newClassifier = dynamic_cast<UMLClassifier*>( findUMLObject( tqparentItem->tqparent() ) ); } if(!newClassifier) { - kWarning()<<"New parent of object is not a Classifier - Drop had already been accepted - check!"<<endl; + kWarning()<<"New tqparent of object is not a Classifier - Drop had already been accepted - check!"<<endl; return; } } @@ -650,13 +650,13 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV UMLOperation *op = static_cast<UMLOperation*>(movingObject); if(newClassifier->checkOperationSignature(op->getName(), op->getParmList())) { - TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).arg(newClassifier->getName()) + TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).tqarg(newClassifier->getName()) + TQString(i18n("Choose a different name or parameter list." )); KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false); return; } - UMLClassifier *oldClassifier = dynamic_cast<UMLClassifier*>(op->parent()); + UMLClassifier *oldClassifier = dynamic_cast<UMLClassifier*>(op->tqparent()); if(oldClassifier) oldClassifier->removeOperation( op ); newClassifier->addOperation( op ); @@ -666,7 +666,7 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV // UMLAttribute *att = static_cast<UMLAttribute*>(movingObject); // if(!newClassifier->checkAttributeSignature(att)) // { - // TQString msg = TQString(i18n("An attribute with that signature already exists in %1.\n")).arg(newClassifier->getName()) + // TQString msg = TQString(i18n("An attribute with that signature already exists in %1.\n")).tqarg(newClassifier->getName()) // + // TQString(i18n("Choose a different name or parameter list." )); // KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false); diff --git a/umbrello/umbrello/refactoring/refactoringassistant.h b/umbrello/umbrello/refactoring/refactoringassistant.h index ba28fd7e..f69536ad 100644 --- a/umbrello/umbrello/refactoring/refactoringassistant.h +++ b/umbrello/umbrello/refactoring/refactoringassistant.h @@ -31,10 +31,11 @@ class TQPoint; class RefactoringAssistant : public KListView { Q_OBJECT + TQ_OBJECT public: typedef std::map<TQListViewItem*, UMLObject*> UMLObjectMap; - explicit RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj = 0, TQWidget *parent = 0, const char *name = 0 ); + explicit RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj = 0, TQWidget *tqparent = 0, const char *name = 0 ); virtual ~RefactoringAssistant(); void refactor( UMLClassifier *obj ); @@ -71,10 +72,10 @@ protected: UMLObject* findUMLObject( const TQListViewItem* ); TQListViewItem* findListViewItem( const UMLObject *obj ); void editProperties( UMLObject *obj ); - void addClassifier( UMLClassifier *classifier, TQListViewItem *parent = 0, bool addSuper = true, bool addSub = true, bool recurse = false ); + void addClassifier( UMLClassifier *classifier, TQListViewItem *tqparent = 0, bool addSuper = true, bool addSub = true, bool recurse = false ); void loadPixmaps(); virtual bool acceptDrag(TQDropEvent *event) const; - virtual void movableDropEvent (TQListViewItem* parent, TQListViewItem* afterme); + virtual void movableDropEvent (TQListViewItem* tqparent, TQListViewItem* afterme); void setVisibilityIcon( TQListViewItem *item , const UMLObject *obj ); UMLClassifier *m_umlObject; UMLDoc *m_doc; diff --git a/umbrello/umbrello/seqlinewidget.cpp b/umbrello/umbrello/seqlinewidget.cpp index 6d52834f..18d70a68 100644 --- a/umbrello/umbrello/seqlinewidget.cpp +++ b/umbrello/umbrello/seqlinewidget.cpp @@ -26,9 +26,9 @@ int const SeqLineWidget::m_nMouseDownEpsilonX = 20; SeqLineWidget::SeqLineWidget( UMLView * pView, ObjectWidget * pObject ) : TQCanvasLine( pView -> canvas() ) { m_pView = pView; m_pObject = pObject; - setPen( TQPen( m_pObject->getLineColor(), 0, Qt::DashLine ) ); + setPen( TQPen( m_pObject->getLineColor(), 0, TQt::DashLine ) ); setZ( 0 ); - setVisible( true ); + tqsetVisible( true ); m_DestructionBox.line1 = 0; m_nLengthY = 250; setupDestructionBox(); @@ -83,13 +83,13 @@ void SeqLineWidget::setupDestructionBox() { m_DestructionBox.line1 = new TQCanvasLine( m_pView->canvas() ); m_DestructionBox.setLine1Points(rect); - m_DestructionBox.line1->setVisible( true ); + m_DestructionBox.line1->tqsetVisible( true ); m_DestructionBox.line1->setPen( TQPen(m_pObject->getLineColor(), 2) ); m_DestructionBox.line1->setZ( 3 ); m_DestructionBox.line2 = new TQCanvasLine( m_pView -> canvas() ); m_DestructionBox.setLine2Points(rect); - m_DestructionBox.line2->setVisible( true ); + m_DestructionBox.line2->tqsetVisible( true ); m_DestructionBox.line2->setPen( TQPen(m_pObject->getLineColor(), 2) ); m_DestructionBox.line2->setZ( 3 ); } diff --git a/umbrello/umbrello/seqlinewidget.h b/umbrello/umbrello/seqlinewidget.h index 71ee9d73..7710038e 100644 --- a/umbrello/umbrello/seqlinewidget.h +++ b/umbrello/umbrello/seqlinewidget.h @@ -9,8 +9,8 @@ * Umbrello UML Modeller Authors <uml-devel@uml.sf.net> * ***************************************************************************/ -#ifndef SEQLINEWIDGET_H -#define SEQLINEWIDGET_H +#ifndef SETQLINEWIDGET_H +#define SETQLINEWIDGET_H #include <tqcanvas.h> diff --git a/umbrello/umbrello/statewidget.cpp b/umbrello/umbrello/statewidget.cpp index 871ab316..72ce43ea 100644 --- a/umbrello/umbrello/statewidget.cpp +++ b/umbrello/umbrello/statewidget.cpp @@ -55,23 +55,23 @@ void StateWidget::draw(TQPainter & p, int offsetX, int offsetY) { const int count = m_Activities.count(); if( count == 0 ) { p.drawRoundRect(offsetX, offsetY, w, h, (h*40)/w, (w*40)/h); - p.setPen(Qt::black); + p.setPen(TQt::black); TQFont font = UMLWidget::getFont(); font.setBold( false ); p.setFont( font ); p.drawText(offsetX + STATE_MARGIN, offsetY + textStartY, w - STATE_MARGIN * 2, fontHeight, - Qt::AlignCenter, getName()); + TQt::AlignCenter, getName()); UMLWidget::setPen(p); } else { p.drawRoundRect(offsetX, offsetY, w, h, (h*40)/w, (w*40)/h); textStartY = offsetY + STATE_MARGIN; - p.setPen(Qt::black); + p.setPen(TQt::black); TQFont font = UMLWidget::getFont(); font.setBold( true ); p.setFont( font ); p.drawText(offsetX + STATE_MARGIN, textStartY, w - STATE_MARGIN * 2, - fontHeight, Qt::AlignCenter, getName()); + fontHeight, TQt::AlignCenter, getName()); font.setBold( false ); p.setFont( font ); UMLWidget::setPen(p); @@ -81,9 +81,9 @@ void StateWidget::draw(TQPainter & p, int offsetX, int offsetY) { for( TQStringList::Iterator it(m_Activities.begin()); it != end; ++it ) { textStartY += fontHeight; p.drawLine( offsetX, linePosY, offsetX + w - 1, linePosY ); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawText(offsetX + STATE_MARGIN, textStartY, w - STATE_MARGIN * 2 - 1, - fontHeight, Qt::AlignCenter, *it); + fontHeight, TQt::AlignCenter, *it); UMLWidget::setPen(p); linePosY += fontHeight; }//end for @@ -97,7 +97,7 @@ void StateWidget::draw(TQPainter & p, int offsetX, int offsetY) { case End : p.setBrush( WidgetBase::getLineColor() ); p.drawEllipse( offsetX, offsetY, w, h ); - p.setBrush( Qt::white ); + p.setBrush( TQt::white ); p.drawEllipse( offsetX + 1, offsetY + 1, w - 2, h - 2 ); p.setBrush( WidgetBase::getLineColor() ); p.drawEllipse( offsetX + 3, offsetY + 3, w - 6, h - 6 ); @@ -192,7 +192,7 @@ bool StateWidget::addActivity( const TQString &activity ) { bool StateWidget::removeActivity( const TQString &activity ) { int index = - 1; - if( ( index = m_Activities.findIndex( activity ) ) == -1 ) + if( ( index = m_Activities.tqfindIndex( activity ) ) == -1 ) return false; m_Activities.remove( m_Activities.at( index ) ); updateComponentSize(); @@ -210,7 +210,7 @@ TQStringList & StateWidget::getActivityList() { bool StateWidget::renameActivity( const TQString &activity, const TQString &newName ) { int index = - 1; - if( ( index = m_Activities.findIndex( activity ) ) == -1 ) + if( ( index = m_Activities.tqfindIndex( activity ) ) == -1 ) return false; m_Activities[ index ] = newName; return true; diff --git a/umbrello/umbrello/statewidget.h b/umbrello/umbrello/statewidget.h index e1611c18..84471f10 100644 --- a/umbrello/umbrello/statewidget.h +++ b/umbrello/umbrello/statewidget.h @@ -37,6 +37,7 @@ */ class StateWidget : public UMLWidget { Q_OBJECT + TQ_OBJECT public: /// Enumeration that codes the different types of state. @@ -50,7 +51,7 @@ public: /** * Creates a State widget. * - * @param view The parent of the widget. + * @param view The tqparent of the widget. * @param stateType The type of state. * @param id The ID to assign (-1 will prompt a new ID.) */ diff --git a/umbrello/umbrello/stereotype.cpp b/umbrello/umbrello/stereotype.cpp index c3b912f4..e77f6c03 100644 --- a/umbrello/umbrello/stereotype.cpp +++ b/umbrello/umbrello/stereotype.cpp @@ -71,9 +71,9 @@ void UMLStereotype::saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement) { qElement.appendChild( stereotypeElement ); } -bool UMLStereotype::showPropertiesDialog(TQWidget* parent) { +bool UMLStereotype::showPropertiesDialog(TQWidget* tqparent) { bool ok; - TQString name = KInputDialog::getText(i18n("Stereotype"), i18n("Enter name:"), getName(),&ok, parent); + TQString name = KInputDialog::getText(i18n("Stereotype"), i18n("Enter name:"), getName(),&ok, tqparent); if (ok) { setName(name); } diff --git a/umbrello/umbrello/stereotype.h b/umbrello/umbrello/stereotype.h index a727fed8..e5e593cc 100644 --- a/umbrello/umbrello/stereotype.h +++ b/umbrello/umbrello/stereotype.h @@ -85,7 +85,7 @@ public: * Display the properties configuration dialog for the stereotype * (just a line edit). */ - bool showPropertiesDialog(TQWidget* parent); + bool showPropertiesDialog(TQWidget* tqparent); protected: /** diff --git a/umbrello/umbrello/template.cpp b/umbrello/umbrello/template.cpp index f02f4426..615e12de 100644 --- a/umbrello/umbrello/template.cpp +++ b/umbrello/umbrello/template.cpp @@ -21,15 +21,15 @@ #include "umldoc.h" #include "dialogs/umltemplatedialog.h" -UMLTemplate::UMLTemplate(const UMLObject *parent, const TQString& name, +UMLTemplate::UMLTemplate(const UMLObject *tqparent, const TQString& name, Uml::IDType id, const TQString& type) - : UMLClassifierListItem( parent, name, id ) { + : UMLClassifierListItem( tqparent, name, id ) { setTypeName( type ); m_BaseType = Uml::ot_Template; } -UMLTemplate::UMLTemplate(const UMLObject *parent) - : UMLClassifierListItem( parent ) { +UMLTemplate::UMLTemplate(const UMLObject *tqparent) + : UMLClassifierListItem( tqparent ) { m_BaseType = Uml::ot_Template; } @@ -69,7 +69,7 @@ void UMLTemplate::copyInto(UMLTemplate *rhs) const UMLObject* UMLTemplate::clone() const { - UMLTemplate *clone = new UMLTemplate( (UMLTemplate*) parent()); + UMLTemplate *clone = new UMLTemplate( (UMLTemplate*) tqparent()); copyInto(clone); return clone; @@ -89,7 +89,7 @@ bool UMLTemplate::load(TQDomElement& element) { return true; } -bool UMLTemplate::showPropertiesDialog(TQWidget* parent) { - UMLTemplateDialog dialog(parent, this); +bool UMLTemplate::showPropertiesDialog(TQWidget* tqparent) { + UMLTemplateDialog dialog(tqparent, this); return dialog.exec(); } diff --git a/umbrello/umbrello/template.h b/umbrello/umbrello/template.h index 6b471207..e7558010 100644 --- a/umbrello/umbrello/template.h +++ b/umbrello/umbrello/template.h @@ -30,20 +30,20 @@ public: /** * Sets up a template. * - * @param parent The parent of this UMLTemplate (i.e. its concept). + * @param tqparent The tqparent of this UMLTemplate (i.e. its concept). * @param name The name of this UMLTemplate. * @param id The unique id given to this UMLTemplate. * @param type The type of this UMLTemplate. */ - UMLTemplate(const UMLObject *parent, const TQString& name, + UMLTemplate(const UMLObject *tqparent, const TQString& name, Uml::IDType id = Uml::id_None, const TQString& type = "class"); /** * Sets up a template. * - * @param parent The parent of this UMLTemplate (i.e. its concept). + * @param tqparent The tqparent of this UMLTemplate (i.e. its concept). */ - UMLTemplate(const UMLObject *parent); + UMLTemplate(const UMLObject *tqparent); /** * Overloaded '==' operator @@ -89,7 +89,7 @@ public: * * @return Success status. */ - bool showPropertiesDialog(TQWidget* parent); + bool showPropertiesDialog(TQWidget* tqparent); /** * Writes the <UML:TemplateParameter> XMI element. diff --git a/umbrello/umbrello/textblock.cpp b/umbrello/umbrello/textblock.cpp index f3ea35fe..1beae001 100644 --- a/umbrello/umbrello/textblock.cpp +++ b/umbrello/umbrello/textblock.cpp @@ -30,10 +30,10 @@ // Constructors/Destructors // -TextBlock::TextBlock ( CodeDocument * parent, const TQString & text ) - : TQObject ( (TQObject *)parent, "textBlock") +TextBlock::TextBlock ( CodeDocument * tqparent, const TQString & text ) + : TQObject ( (TQObject *)tqparent, "textBlock") { - initFields(parent); + initFields(tqparent); setText(text); } @@ -49,7 +49,7 @@ TextBlock::~TextBlock ( ) { } /** - * Set the value of the parent code document + * Set the value of the tqparent code document * @param new_var the new value of m_parentDocument */ void TextBlock::setParentDocument ( CodeDocument * new_var ) { @@ -137,7 +137,7 @@ void TextBlock::setIndentationLevel ( int level ) { } /** Get how many times to indent this text block. - * The amount of each indenatation is determined from the parent + * The amount of each indenatation is determined from the tqparent * codedocument codegeneration policy. */ int TextBlock::getIndentationLevel ( ) { @@ -205,12 +205,12 @@ TQString TextBlock::formatMultiLineText ( const TQString &work, const TQString & TQString output = ""; TQString text = work; TQString endLine = getNewLineEndingChars(); - int matches = text.contains(TQRegExp(breakStr)); + int matches = text.tqcontains(TQRegExp(breakStr)); if(matches) { // check that last part of string matches, if not, then // we have to tack on extra match - if(!text.contains(TQRegExp(breakStr+"\\$"))) + if(!text.tqcontains(TQRegExp(breakStr+"\\$"))) matches++; for(int i=0; i < matches; i++) @@ -280,7 +280,7 @@ void TextBlock::setAttributesFromNode (TQDomElement & root ) { // entity. TQString TextBlock::encodeText(const TQString& text, const TQString &endLine) { TQString encoded = text; - encoded.replace(TQRegExp(endLine),"
"); + encoded.tqreplace(TQRegExp(endLine),"
"); return encoded; } @@ -289,12 +289,12 @@ TQString TextBlock::encodeText(const TQString& text, const TQString &endLine) { // entity. TQString TextBlock::decodeText(const TQString& text, const TQString &endLine) { TQString decoded = text; - decoded.replace(TQRegExp("
"),endLine); + decoded.tqreplace(TQRegExp("
"),endLine); return decoded; } /** - * @return QString + * @return TQString */ TQString TextBlock::toString ( ) { @@ -308,10 +308,10 @@ TQString TextBlock::toString ( ) return ""; } -void TextBlock::initFields ( CodeDocument * parent ) { +void TextBlock::initFields ( CodeDocument * tqparent ) { m_canDelete = true; m_writeOutText = true; - m_parentDocument = parent; + m_parentDocument = tqparent; m_text = ""; m_tag = ""; m_indentationLevel = 0; diff --git a/umbrello/umbrello/textblock.h b/umbrello/umbrello/textblock.h index 8a3ac9fd..3e470c7a 100644 --- a/umbrello/umbrello/textblock.h +++ b/umbrello/umbrello/textblock.h @@ -33,6 +33,7 @@ class TextBlock : virtual public TQObject { friend class CodeGenObjectWithTextBlocks; friend class ClassifierCodeDocument; Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -41,7 +42,7 @@ public: /** * Constructors */ - explicit TextBlock ( CodeDocument * parent, const TQString & text = ""); + explicit TextBlock ( CodeDocument * tqparent, const TQString & text = ""); // destructor ~TextBlock ( ); @@ -107,13 +108,13 @@ public: bool getWriteOutText ( ); /** Set how many times to indent this text block. - * The amount of each indenatation is determined from the parent + * The amount of each indenatation is determined from the tqparent * codedocument codegeneration policy. */ void setIndentationLevel ( int level ); /** Get how many times to indent this text block. - * The amount of each indenatation is determined from the parent + * The amount of each indenatation is determined from the tqparent * codedocument codegeneration policy. */ int getIndentationLevel ( ); @@ -142,7 +143,7 @@ public: virtual TQString unformatText ( const TQString & text, const TQString & indent = ""); /** - * @return QString + * @return TQString */ virtual TQString toString ( ); diff --git a/umbrello/umbrello/toolbarstate.h b/umbrello/umbrello/toolbarstate.h index 882f2137..5bcb12bf 100644 --- a/umbrello/umbrello/toolbarstate.h +++ b/umbrello/umbrello/toolbarstate.h @@ -70,6 +70,7 @@ class UMLWidget; */ class ToolBarState: public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -162,7 +163,7 @@ protected: /** * Creates a new ToolBarState. - * UMLView is set as parent of this TQObject, and name is left empty. + * UMLView is set as tqparent of this TQObject, and name is left empty. * Protected to avoid classes other than derived to create objects of this * class. * diff --git a/umbrello/umbrello/toolbarstatearrow.cpp b/umbrello/umbrello/toolbarstatearrow.cpp index ad24d753..05e98734 100644 --- a/umbrello/umbrello/toolbarstatearrow.cpp +++ b/umbrello/umbrello/toolbarstatearrow.cpp @@ -57,8 +57,8 @@ void ToolBarStateArrow::mousePressEmpty() { TQCanvasLine* line = new TQCanvasLine(m_pUMLView->canvas()); line->setPoints(m_pMouseEvent->x(), m_pMouseEvent->y(), m_pMouseEvent->x(), m_pMouseEvent->y()); - line->setPen(TQPen(TQColor("grey"), 0, Qt::DotLine)); - line->setVisible(true); + line->setPen(TQPen(TQColor("grey"), 0, TQt::DotLine)); + line->tqsetVisible(true); line->setZ(100); m_selectionRect.append(line); } diff --git a/umbrello/umbrello/toolbarstatearrow.h b/umbrello/umbrello/toolbarstatearrow.h index 265bc5d0..c098c300 100644 --- a/umbrello/umbrello/toolbarstatearrow.h +++ b/umbrello/umbrello/toolbarstatearrow.h @@ -33,6 +33,7 @@ class TQCanvasLine; */ class ToolBarStateArrow : public ToolBarState { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/toolbarstateassociation.cpp b/umbrello/umbrello/toolbarstateassociation.cpp index 64d2fbfe..340a28dc 100644 --- a/umbrello/umbrello/toolbarstateassociation.cpp +++ b/umbrello/umbrello/toolbarstateassociation.cpp @@ -130,9 +130,9 @@ void ToolBarStateAssociation::setFirstWidget() { m_associationLine = new TQCanvasLine(m_pUMLView->canvas()); m_associationLine->setPoints(pos.x(), pos.y(), pos.x(), pos.y()); - m_associationLine->setPen(TQPen(m_pUMLView->getLineColor(), m_pUMLView->getLineWidth(), Qt::DashLine)); + m_associationLine->setPen(TQPen(m_pUMLView->getLineColor(), m_pUMLView->getLineWidth(), TQt::DashLine)); - m_associationLine->setVisible(true); + m_associationLine->tqsetVisible(true); m_pUMLView->viewport()->setMouseTracking(true); } diff --git a/umbrello/umbrello/toolbarstateassociation.h b/umbrello/umbrello/toolbarstateassociation.h index 1bc8513d..734e603f 100644 --- a/umbrello/umbrello/toolbarstateassociation.h +++ b/umbrello/umbrello/toolbarstateassociation.h @@ -37,6 +37,7 @@ class TQCanvasLine; */ class ToolBarStateAssociation : public ToolBarStatePool { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/toolbarstatemessages.cpp b/umbrello/umbrello/toolbarstatemessages.cpp index cd0fac78..453c6d7c 100644 --- a/umbrello/umbrello/toolbarstatemessages.cpp +++ b/umbrello/umbrello/toolbarstatemessages.cpp @@ -116,9 +116,9 @@ void ToolBarStateMessages::setFirstWidget(ObjectWidget* firstObject) { m_messageLine = new TQCanvasLine(m_pUMLView->canvas()); m_messageLine->setPoints(m_pMouseEvent->x(), m_pMouseEvent->y(), m_pMouseEvent->x(), m_pMouseEvent->y()); - m_messageLine->setPen(TQPen(m_pUMLView->getLineColor(), m_pUMLView->getLineWidth(), Qt::DashLine)); + m_messageLine->setPen(TQPen(m_pUMLView->getLineColor(), m_pUMLView->getLineWidth(), TQt::DashLine)); - m_messageLine->setVisible(true); + m_messageLine->tqsetVisible(true); m_pUMLView->viewport()->setMouseTracking(true); } diff --git a/umbrello/umbrello/toolbarstatemessages.h b/umbrello/umbrello/toolbarstatemessages.h index 796dee30..35719581 100644 --- a/umbrello/umbrello/toolbarstatemessages.h +++ b/umbrello/umbrello/toolbarstatemessages.h @@ -49,6 +49,7 @@ class ObjectWidget; */ class ToolBarStateMessages : public ToolBarStatePool { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/toolbarstateother.h b/umbrello/umbrello/toolbarstateother.h index d5c6f412..ea94feae 100644 --- a/umbrello/umbrello/toolbarstateother.h +++ b/umbrello/umbrello/toolbarstateother.h @@ -24,6 +24,7 @@ */ class ToolBarStateOther : public ToolBarStatePool { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/toolbarstatepool.h b/umbrello/umbrello/toolbarstatepool.h index 6b33f9ea..4541911b 100644 --- a/umbrello/umbrello/toolbarstatepool.h +++ b/umbrello/umbrello/toolbarstatepool.h @@ -23,6 +23,7 @@ */ class ToolBarStatePool : public ToolBarState { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp index e6a87cfd..13608f3c 100644 --- a/umbrello/umbrello/uml.cpp +++ b/umbrello/umbrello/uml.cpp @@ -55,7 +55,7 @@ #include "umlviewlist.h" #include "worktoolbar.h" #ifdef HAVE_DOT -# include "autolayout/autolayoutdlg.h" //dimitri +# include "autotqlayout/autotqlayoutdlg.h" //dimitri #endif #include "model_utils.h" #include "clipboard/umlclipboard.h" @@ -160,43 +160,43 @@ UMLApp* UMLApp::app() } void UMLApp::initActions() { - fileNew = KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection()); - fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection()); - fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection()); - fileSaveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection()); - fileClose = KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection()); - filePrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection()); - fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); - editUndo = KStdAction::undo(this, TQT_SLOT(slotEditUndo()), actionCollection()); - editRedo = KStdAction::redo(this, TQT_SLOT(slotEditRedo()), actionCollection()); - editCut = KStdAction::cut(this, TQT_SLOT(slotEditCut()), actionCollection()); - editCopy = KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection()); - editPaste = KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection()); + fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); + fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); + fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); + fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); + fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); + filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); + fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); + editUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotEditUndo()), actionCollection()); + editRedo = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotEditRedo()), actionCollection()); + editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection()); + editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); + editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - selectAll = KStdAction::selectAll(this, TQT_SLOT( slotSelectAll() ), actionCollection()); + selectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ), actionCollection()); fileExportDocbook = new KAction(i18n("&Export model to DocBook"), 0, - this, TQT_SLOT( slotFileExportDocbook() ), + TQT_TQOBJECT(this), TQT_SLOT( slotFileExportDocbook() ), actionCollection(), "file_export_docbook"); fileExportXhtml = new KAction(i18n("&Export model to XHTML"), 0, - this, TQT_SLOT( slotFileExportXhtml() ), + TQT_TQOBJECT(this), TQT_SLOT( slotFileExportXhtml() ), actionCollection(), "file_export_xhtml"); - classWizard = new KAction(i18n("&New Class Wizard..."),0,this,TQT_SLOT(slotClassWizard()), + classWizard = new KAction(i18n("&New Class Wizard..."),0,TQT_TQOBJECT(this),TQT_SLOT(slotClassWizard()), actionCollection(),"class_wizard"); - new KAction(i18n("&Add Default Datatypes for Active Language"), 0, this, + new KAction(i18n("&Add Default Datatypes for Active Language"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddDefaultDatatypes()), actionCollection(), "create_default_datatypes"); - preferences = KStdAction::preferences(this, TQT_SLOT( slotPrefs() ), actionCollection()); + preferences = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotPrefs() ), actionCollection()); - genWizard = new KAction(i18n("&Code Generation Wizard..."),0,this,TQT_SLOT(generationWizard()), + genWizard = new KAction(i18n("&Code Generation Wizard..."),0,TQT_TQOBJECT(this),TQT_SLOT(generationWizard()), actionCollection(),"generation_wizard"); - genAll = new KAction(i18n("&Generate All Code"),0,this,TQT_SLOT(generateAllCode()), + genAll = new KAction(i18n("&Generate All Code"),0,TQT_TQOBJECT(this),TQT_SLOT(generateAllCode()), actionCollection(),"generate_all"); importClasses = new KAction(i18n("&Import Classes..."), SmallIconSet("source_cpp"), 0, - this,TQT_SLOT(slotImportClasses()), actionCollection(),"import_class"); + TQT_TQOBJECT(this),TQT_SLOT(slotImportClasses()), actionCollection(),"import_class"); fileNew->setToolTip(i18n("Creates a new document")); fileOpen->setToolTip(i18n("Opens an existing document")); @@ -215,63 +215,63 @@ void UMLApp::initActions() { deleteSelectedWidget = new KAction( i18n("Delete &Selected"), SmallIconSet("editdelete"), - KShortcut(Qt::Key_Delete), this, + KShortcut(TQt::Key_Delete), TQT_TQOBJECT(this), TQT_SLOT( slotDeleteSelectedWidget() ), actionCollection(), "delete_selected" ); // The different views newDiagram = new KActionMenu(0, SmallIconSet("filenew"), actionCollection(), "new_view"); classDiagram = new KAction( i18n( "&Class Diagram..." ), SmallIconSet("umbrello_diagram_class"), 0, - this, TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" ); + TQT_TQOBJECT(this), TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" ); #if defined (HAVE_DOT) - autolayout = new KAction(i18n("&Autolayout..."),0,0,this,TQT_SLOT(slotAutolayout()), - actionCollection(),"autolayout"); + autotqlayout = new KAction(i18n("&Autotqlayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutotqlayout()), + actionCollection(),"autotqlayout"); #endif sequenceDiagram= new KAction( i18n( "&Sequence Diagram..." ), SmallIconSet("umbrello_diagram_sequence"), 0, - this, TQT_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" ); + TQT_TQOBJECT(this), TQT_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" ); collaborationDiagram = new KAction( i18n( "C&ollaboration Diagram..." ), SmallIconSet("umbrello_diagram_collaboration"), 0, - this, TQT_SLOT( slotCollaborationDiagram() ), actionCollection(), "new_collaboration_diagram" ); + TQT_TQOBJECT(this), TQT_SLOT( slotCollaborationDiagram() ), actionCollection(), "new_collaboration_diagram" ); useCaseDiagram= new KAction( i18n( "&Use Case Diagram..." ), SmallIconSet("umbrello_diagram_usecase"), 0, - this, TQT_SLOT( slotUseCaseDiagram() ), actionCollection(), "new_use_case_diagram" ); + TQT_TQOBJECT(this), TQT_SLOT( slotUseCaseDiagram() ), actionCollection(), "new_use_case_diagram" ); stateDiagram= new KAction( i18n( "S&tate Diagram..." ), SmallIconSet("umbrello_diagram_state"), 0, - this, TQT_SLOT( slotStateDiagram() ), actionCollection(), "new_state_diagram" ); + TQT_TQOBJECT(this), TQT_SLOT( slotStateDiagram() ), actionCollection(), "new_state_diagram" ); activityDiagram= new KAction( i18n( "&Activity Diagram..." ), SmallIconSet("umbrello_diagram_activity"), 0, - this, TQT_SLOT( slotActivityDiagram() ), actionCollection(), "new_activity_diagram" ); + TQT_TQOBJECT(this), TQT_SLOT( slotActivityDiagram() ), actionCollection(), "new_activity_diagram" ); componentDiagram = new KAction( i18n("Co&mponent Diagram..."), SmallIconSet("umbrello_diagram_component"), 0, - this, TQT_SLOT( slotComponentDiagram() ), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT( slotComponentDiagram() ), actionCollection(), "new_component_diagram" ); deploymentDiagram = new KAction( i18n("&Deployment Diagram..."), SmallIconSet("umbrello_diagram_deployment"), 0, - this, TQT_SLOT( slotDeploymentDiagram() ), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT( slotDeploymentDiagram() ), actionCollection(), "new_deployment_diagram" ); entityRelationshipDiagram = new KAction( i18n("&Entity Relationship Diagram..."), SmallIconSet("umbrello_diagram_entityrelationship"), 0, - this, TQT_SLOT( slotEntityRelationshipDiagram() ), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT( slotEntityRelationshipDiagram() ), actionCollection(), "new_entityrelationship_diagram" ); viewClearDiagram = new KAction(i18n("&Clear Diagram"), SmallIconSet("editclear"), 0, - this, TQT_SLOT( slotCurrentViewClearDiagram() ), actionCollection(), "view_clear_diagram"); + TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewClearDiagram() ), actionCollection(), "view_clear_diagram"); viewSnapToGrid = new KToggleAction(i18n("&Snap to Grid"), 0, - this, TQT_SLOT( slotCurrentViewToggleSnapToGrid() ), actionCollection(), "view_snap_to_grid"); + TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewToggleSnapToGrid() ), actionCollection(), "view_snap_to_grid"); viewShowGrid = new KToggleAction(i18n("S&how Grid"), 0, - this, TQT_SLOT( slotCurrentViewToggleShowGrid() ), actionCollection(), "view_show_grid"); + TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewToggleShowGrid() ), actionCollection(), "view_show_grid"); #if (KDE_VERSION_MINOR>=3) && (KDE_VERSION_MAJOR>=3) viewShowGrid->setCheckedState(i18n("&Hide Grid")); #endif deleteDiagram = new KAction(i18n("&Delete"), SmallIconSet("editdelete"), 0, - this, TQT_SLOT( slotDeleteDiagram() ), actionCollection(), "view_delete"); + TQT_TQOBJECT(this), TQT_SLOT( slotDeleteDiagram() ), actionCollection(), "view_delete"); viewExportImage = new KAction(i18n("&Export as Picture..."), SmallIconSet("image"), 0, - this, TQT_SLOT( slotCurrentViewExportImage() ), actionCollection(), "view_export_image"); + TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewExportImage() ), actionCollection(), "view_export_image"); viewExportImageAll = new KAction(i18n("Export &All Diagrams as Pictures..."), SmallIconSet("image"), 0, - this, TQT_SLOT( slotAllViewsExportImage() ), actionCollection(), "view_export_image_all"); + TQT_TQOBJECT(this), TQT_SLOT( slotAllViewsExportImage() ), actionCollection(), "view_export_image_all"); viewProperties = new KAction(i18n("&Properties"), SmallIconSet("info"), 0, - this, TQT_SLOT( slotCurrentViewProperties() ), actionCollection(), "view_properties"); + TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewProperties() ), actionCollection(), "view_properties"); viewSnapToGrid->setChecked(false); viewShowGrid->setChecked(false); @@ -284,35 +284,35 @@ void UMLApp::initActions() { viewProperties->setEnabled(false); zoomAction = new KPlayerPopupSliderAction(i18n("&Zoom Slider"), "viewmag", Key_F9, - this, TQT_SLOT(slotZoomSliderMoved(int)), + TQT_TQOBJECT(this), TQT_SLOT(slotZoomSliderMoved(int)), actionCollection(), "popup_zoom"); zoom100Action = new KAction(i18n( "Z&oom to 100%" ), "viewmag1", 0, - this, TQT_SLOT( slotZoom100() ), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT( slotZoom100() ), actionCollection(), "zoom100"); - KStdAction::tipOfDay( this, TQT_SLOT( tipOfTheDay() ), actionCollection() ); + KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfTheDay() ), actionCollection() ); TQString moveTabLeftString = i18n("&Move Tab Left"); TQString moveTabRightString = i18n("&Move Tab Right"); moveTabLeft = new KAction(TQApplication::reverseLayout() ? moveTabRightString : moveTabLeftString, TQApplication::reverseLayout() ? "forward" : "back", - TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, - this, TQT_SLOT(slotMoveTabLeft()), actionCollection(), + TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, + TQT_TQOBJECT(this), TQT_SLOT(slotMoveTabLeft()), actionCollection(), "move_tab_left"); moveTabRight = new KAction(TQApplication::reverseLayout() ? moveTabLeftString : moveTabRightString, TQApplication::reverseLayout() ? "back" : "forward", - TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, - this, TQT_SLOT(slotMoveTabRight()), actionCollection(), + TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, + TQT_TQOBJECT(this), TQT_SLOT(slotMoveTabRight()), actionCollection(), "move_tab_right"); TQString selectTabLeftString = i18n("Select Diagram on Left"); TQString selectTabRightString = i18n("Select Diagram on Right"); changeTabLeft = new KAction(TQApplication::reverseLayout() ? selectTabRightString : selectTabLeftString, - TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Right : Qt::SHIFT+Qt::Key_Left, - this, TQT_SLOT(slotChangeTabLeft()), actionCollection(), "previous_tab"); + TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Right : TQt::SHIFT+TQt::Key_Left, + TQT_TQOBJECT(this), TQT_SLOT(slotChangeTabLeft()), actionCollection(), "previous_tab"); changeTabRight = new KAction(TQApplication::reverseLayout() ? selectTabLeftString : selectTabRightString, - TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Left : Qt::SHIFT+Qt::Key_Right, - this, TQT_SLOT(slotChangeTabRight()), actionCollection(), "next_tab"); + TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Left : TQt::SHIFT+TQt::Key_Right, + TQT_TQOBJECT(this), TQT_SLOT(slotChangeTabRight()), actionCollection(), "next_tab"); initStatusBar(); //call this here because the statusBar is shown/hidden by setupGUI() @@ -374,7 +374,7 @@ void UMLApp::setupZoomMenu() { void UMLApp::initStatusBar() { m_statusLabel = new KStatusBarLabel( i18n("Ready."), 0, statusBar() ); - m_statusLabel->setFixedHeight( m_statusLabel->sizeHint().height() ); + m_statusLabel->setFixedHeight( m_statusLabel->tqsizeHint().height() ); m_statusLabel->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain ); m_statusLabel->setMargin( 0 ); @@ -382,7 +382,7 @@ void UMLApp::initStatusBar() { statusBar()->addWidget( m_statusLabel, 1, false ); - m_statusLabel->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); + m_statusLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignVCenter); connect(m_doc, TQT_SIGNAL( sigWriteToStatusBar(const TQString &) ), this, TQT_SLOT( slotStatusMsg(const TQString &) )); } @@ -392,11 +392,11 @@ void UMLApp::initView() { m_view = NULL; toolsbar = new WorkToolBar(this, ""); toolsbar->setLabel(i18n("Diagram Toolbar")); - addToolBar(toolsbar, Qt::DockTop, false); + addToolBar(toolsbar, TQt::DockTop, false); m_alignToolBar = new AlignToolBar(this, ""); m_alignToolBar->setLabel(i18n("Alignment Toolbar")); - addToolBar(m_alignToolBar, Qt::DockTop, false); + addToolBar(m_alignToolBar, TQt::DockTop, false); m_mainDock = createDockWidget("maindock", 0L, 0L, "main dock"); m_newSessionButton = NULL; @@ -583,8 +583,8 @@ void UMLApp::readOptions() { fileOpenRecent->loadEntries(m_config,"Recent Files"); m_config->setGroup("General Options"); setImageMimeType(m_config->readEntry("imageMimeType","image/png")); - TQSize tmpQSize(630,460); - resize( m_config->readSizeEntry("Geometry", & tmpQSize) ); + TQSize tmpTQSize(630,460); + resize( m_config->readSizeEntry("Geometry", & tmpTQSize) ); } void UMLApp::saveProperties(KConfig *_config) { @@ -737,7 +737,7 @@ bool UMLApp::slotFileSaveAs() TQDir d = url.path(-1); if(TQFile::exists(d.path())) { - int want_save = KMessageBox::warningContinueCancel(this, i18n("The file %1 exists.\nDo you wish to overwrite it?").arg(url.path()), i18n("Warning"), i18n("Overwrite")); + int want_save = KMessageBox::warningContinueCancel(this, i18n("The file %1 exists.\nDo you wish to overwrite it?").tqarg(url.path()), i18n("Warning"), i18n("Overwrite")); if(want_save == KMessageBox::Continue) cont = false; } else @@ -776,7 +776,7 @@ void UMLApp::slotFilePrint() DiagramPrintPage * selectPage = new DiagramPrintPage(0, m_doc); printer.addDialogPage(selectPage); TQString msg; - if (printer.setup(this, i18n("Print %1").arg(m_doc->URL().prettyURL()))) { + if (printer.setup(this, i18n("Print %1").tqarg(m_doc->URL().prettyURL()))) { m_doc -> print(&printer); } @@ -842,7 +842,7 @@ void UMLApp::slotEditCopy() { void UMLApp::slotEditPaste() { slotStatusMsg(i18n("Inserting clipboard contents...")); - TQMimeSource* data = TQApplication::clipboard()->data(); + TQMimeSource* data = TQApplication::tqclipboard()->data(); UMLClipboard clipboard; setCursor(KCursor::waitCursor()); if(!clipboard.paste(data)) { @@ -895,7 +895,7 @@ void UMLApp::slotStatusMsg(const TQString &text) { statusBar()->clear(); m_statusLabel->setText( text ); - m_statusLabel->repaint(); + m_statusLabel->tqrepaint(); } void UMLApp::slotClassDiagram() { @@ -977,12 +977,12 @@ void UMLApp::enableRedo(bool enable) { /** initialize the QT's global clipboard support for the application */ void UMLApp::initClip() { - QClipboard* clip = TQApplication::clipboard(); + TQClipboard* clip = TQApplication::tqclipboard(); connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged())); // Don't poll the X11 clipboard every second. This is a little expensive and resulted - // in very annoying umbrello slowdowns / hangs. Qt will notify us about clipboard - // changes anyway (see dataChanged() signal above), albeit only when a Qt application + // in very annoying umbrello slowdowns / hangs. TQt will notify us about clipboard + // changes anyway (see dataChanged() signal above), albeit only when a TQt application // changes the clipboard. Work is in progress to make this work with other toolkits // as well. (pfeiffer) // m_clipTimer = new TQTimer(this, "timer"); @@ -1007,7 +1007,7 @@ bool UMLApp::canDecode(const TQMimeSource* mimeSource) { } void UMLApp::slotClipDataChanged() { - TQMimeSource * data = TQApplication::clipboard()->data(); + TQMimeSource * data = TQApplication::tqclipboard()->data(); //Pass the MimeSource to the Doc editPaste->setEnabled( data && canDecode(data) ); @@ -1075,7 +1075,7 @@ bool UMLApp::editCutCopy( bool bFromView ) { TQMimeSource * clipdata = 0; if ((clipdata = clipboard.copy(bFromView)) != 0) { - QClipboard* clip = TQApplication::clipboard(); + TQClipboard* clip = TQApplication::tqclipboard(); clip->setData(clipdata);//the global clipboard takes ownership of the clipdata memory connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged())); return true; @@ -1122,7 +1122,7 @@ void UMLApp::readOptionState() { m_config -> setGroup( "UI Options" ); optionState.uiState.useFillColor = m_config -> readBoolEntry( "useFillColor", true ); TQColor defaultYellow = TQColor( 255, 255, 192 ); - TQColor red ( Qt::red ); + TQColor red ( TQt::red ); optionState.uiState.fillColor = m_config -> readColorEntry( "fillColor", &defaultYellow ); optionState.uiState.lineColor = m_config -> readColorEntry( "lineColor", &red ); @@ -1484,12 +1484,12 @@ void UMLApp::updateLangSelectMenu(Uml::Programming_Language activeLanguage) { void UMLApp::tipOfTheDay() { - KTipDialog::showTip(this ,TQString::null, true); + KTipDialog::showTip(this ,TQString(), true); } void UMLApp::keyPressEvent(TQKeyEvent *e) { switch(e->key()) { - case Qt::Key_Shift: + case TQt::Key_Shift: //toolsbar->setOldTool(); e->accept(); break; @@ -1511,23 +1511,23 @@ void UMLApp::customEvent(TQCustomEvent* e) { void UMLApp::handleCursorKeyReleaseEvent(TQKeyEvent* e) { // in case we have selected something in the diagram, move it by one pixel // to the direction pointed by the cursor key - if (m_view == NULL || !m_view->getSelectCount() || e->state() != Qt::AltButton) { + if (m_view == NULL || !m_view->getSelectCount() || e->state() != TQt::AltButton) { e->ignore(); return; } int dx = 0; int dy = 0; switch (e->key()) { - case Qt::Key_Left: + case TQt::Key_Left: dx = -1; break; - case Qt::Key_Right: + case TQt::Key_Right: dx = 1; break; - case Qt::Key_Up: + case TQt::Key_Up: dy = -1; break; - case Qt::Key_Down: + case TQt::Key_Down: dy = 1; break; default: @@ -1546,19 +1546,19 @@ void UMLApp::handleCursorKeyReleaseEvent(TQKeyEvent* e) { void UMLApp::keyReleaseEvent(TQKeyEvent *e) { switch(e->key()) { - case Qt::Key_Backspace: + case TQt::Key_Backspace: if (!m_pDocWindow->isTyping()) toolsbar->setOldTool(); e->accept(); break; - case Qt::Key_Escape: + case TQt::Key_Escape: toolsbar->setDefaultTool(); e->accept(); break; - case Qt::Key_Left: - case Qt::Key_Right: - case Qt::Key_Up: - case Qt::Key_Down: + case TQt::Key_Left: + case TQt::Key_Right: + case TQt::Key_Up: + case TQt::Key_Down: handleCursorKeyReleaseEvent(e); break; default: @@ -1616,7 +1616,7 @@ TQPopupMenu* UMLApp::findMenu(TQMenuData* menu, const TQString &name) { for (int i=0; i<menuCount; i++) { int idAt = menu->idAt(i); - TQPopupMenu* popupMenu = menu->findItem(idAt)->popup(); + TQPopupMenu* popupMenu = menu->tqfindItem(idAt)->popup(); if (popupMenu) { TQString menuName = popupMenu->name(); if( menuName == name) { @@ -1640,7 +1640,7 @@ void UMLApp::slotChangeTabLeft() { } UMLViewList views = m_doc->getViewIterator(); UMLView *currView = m_view; - if (views.find(currView) < 0) { + if (views.tqfind(currView) < 0) { kError() << "UMLApp::slotChangeTabLeft(): currView not found in viewlist" << endl; return; } @@ -1657,7 +1657,7 @@ void UMLApp::slotChangeTabRight() { } UMLViewList views = m_doc->getViewIterator(); UMLView *currView = m_view; - if (views.find(currView) < 0) { + if (views.tqfind(currView) < 0) { kError() << "UMLApp::slotChangeTabRight(): currView not found in viewlist" << endl; return; } @@ -1679,10 +1679,10 @@ void UMLApp::slotMoveTabRight() { //m_tabWidget->moveTab( m_tabWidget->currentPageIndex(), m_tabWidget->currentPageIndex() + 1 ); } -void UMLApp::slotAutolayout(){ +void UMLApp::slotAutotqlayout(){ #ifdef HAVE_DOT /* - TQDialog* d = new AutolayoutDlg(getCurrentView()); + TQDialog* d = new AutotqlayoutDlg(getCurrentView()); d->show(); */ #endif diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h index 973f4d03..13cbce16 100644 --- a/umbrello/umbrello/uml.h +++ b/umbrello/umbrello/uml.h @@ -53,10 +53,10 @@ class KTabWidget; class KToolBarButton; class KPopupMenu; -// Qt forward declarations +// TQt forward declarations class TQWidgetStack; class TQMenuData; -class QClipboard; +class TQClipboard; class TQToolButton; class TQCustomEvent; @@ -77,11 +77,12 @@ class TQCustomEvent; class UMLApp : public KDockMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Constructor. Calls all init functions to create the application. */ - UMLApp(TQWidget* parent=0, const char* name=0); + UMLApp(TQWidget* tqparent=0, const char* name=0); /** * Standard deconstructor. @@ -246,7 +247,7 @@ public: void setDiagramMenuItemsState(bool bState); /** - * Returns the widget used as the parent for UMLViews. + * Returns the widget used as the tqparent for UMLViews. * @return The main view widget. */ TQWidget* getMainViewWidget(); @@ -339,7 +340,7 @@ protected: /** * Save general Options like all bar positions and status - * as well as the geometry and the recent file list to + * as well as the tqgeometry and the recent file list to * the configuration file. */ void saveOptions(); @@ -532,9 +533,9 @@ public slots: void slotViewStatusBar(); /** - * Autolayouts the current class diagram + * Autotqlayouts the current class diagram */ - void slotAutolayout(); + void slotAutotqlayout(); /** * Changes the statusbar contents for the standard label @@ -850,7 +851,7 @@ private: void readOptionState(); /** - * Initialize Qt's global clipboard support for the application. + * Initialize TQt's global clipboard support for the application. */ void initClip(); @@ -958,7 +959,7 @@ private: KAction* deleteSelectedWidget; KAction* deleteDiagram; #ifdef HAVE_DOT - KAction* autolayout; + KAction* autotqlayout; #endif KAction* changeTabLeft; @@ -983,13 +984,13 @@ private: bool m_loading; /** - * Shows, and is parent of, all the UMLViews (diagrams) + * Shows, and is tqparent of, all the UMLViews (diagrams) * if tabbed diagrams are not enabled. */ TQWidgetStack* m_viewStack; /** - * Shows, and is parent of, all the UMLViews (diagrams) + * Shows, and is tqparent of, all the UMLViews (diagrams) * if tabbed diagrams are enabled. */ KTabWidget* m_tabWidget; diff --git a/umbrello/umbrello/umlcanvasobject.cpp b/umbrello/umbrello/umlcanvasobject.cpp index 800336e3..8a4a30e0 100644 --- a/umbrello/umbrello/umlcanvasobject.cpp +++ b/umbrello/umbrello/umlcanvasobject.cpp @@ -80,7 +80,7 @@ bool UMLCanvasObject::addAssociationEnd(UMLAssociation* assoc) { } bool UMLCanvasObject::hasAssociation(UMLAssociation* assoc) { - if(m_List.containsRef(assoc) > 0) + if(m_List.tqcontainsRef(assoc) > 0) return true; return false; } diff --git a/umbrello/umbrello/umlcanvasobject.h b/umbrello/umbrello/umlcanvasobject.h index 8f7ccb8e..9a3ea04e 100644 --- a/umbrello/umbrello/umlcanvasobject.h +++ b/umbrello/umbrello/umlcanvasobject.h @@ -35,6 +35,7 @@ class UMLCanvasObject : public UMLObject { Q_OBJECT + TQ_OBJECT public: /** * Sets up a UMLCanvasObject. @@ -164,7 +165,7 @@ public: * Find a child object with the given name. * * @param n The name of the object to find. - * @param t The type to find (optional.) If not given then + * @param t The type to tqfind (optional.) If not given then * any object type will match. * @return Pointer to the object found; NULL if none found. */ diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp index 4862193a..acc77eee 100644 --- a/umbrello/umbrello/umldoc.cpp +++ b/umbrello/umbrello/umldoc.cpp @@ -352,7 +352,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { KIO::NetAccess::download( url, tmpfile, UMLApp::app() ); TQFile file( tmpfile ); if ( !file.exists() ) { - KMessageBox::error(0, i18n("The file %1 does not exist.").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("The file %1 does not exist.").tqarg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -365,10 +365,10 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { // check if the xmi file is a compressed archive like tar.bzip2 or tar.gz TQString filetype = m_doc_url.fileName(true); TQString mimetype = ""; - if (filetype.find(TQRegExp("\\.tgz$")) != -1) + if (filetype.tqfind(TQRegExp("\\.tgz$")) != -1) { mimetype = "application/x-gzip"; - } else if (filetype.find(TQRegExp("\\.tar.bz2$")) != -1) { + } else if (filetype.tqfind(TQRegExp("\\.tar.bz2$")) != -1) { mimetype = "application/x-bzip2"; } @@ -377,7 +377,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { KTar archive(tmpfile, mimetype); if (archive.open(IO_ReadOnly) == false) { - KMessageBox::error(0, i18n("The file %1 seems to be corrupted.").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("The file %1 seems to be corrupted.").tqarg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -419,7 +419,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { entry = const_cast<KArchiveEntry*>(rootDir->entry(*it)); if (entry == 0) { - KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -431,7 +431,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { fileEntry = dynamic_cast<KArchiveFile*>(entry); if (fileEntry == 0) { - KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -445,20 +445,20 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { TQFile xmi_file(tmp_dir.name() + *it); if( !xmi_file.open( IO_ReadOnly ) ) { - KMessageBox::error(0, i18n("There was a problem loading the extracted file: %1").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was a problem loading the extracted file: %1").tqarg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); return false; } - status = loadFromXMI( xmi_file, ENC_UNKNOWN ); + status = loadFromXMI( *TQT_TQIODEVICE(&xmi_file), ENC_UNKNOWN ); // close the extracted file and the temporary directory xmi_file.close(); tmp_dir.unlink(); } else { - KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -469,23 +469,23 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { } else { // no, it seems to be an ordinary file if( !file.open( IO_ReadOnly ) ) { - KMessageBox::error(0, i18n("There was a problem loading file: %1").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was a problem loading file: %1").tqarg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); return false; } if (filetype.endsWith(".mdl")) - status = Import_Rose::loadFromMDL(file); + status = Import_Rose::loadFromMDL(*TQT_TQIODEVICE(&file)); else - status = loadFromXMI( file, ENC_UNKNOWN ); + status = loadFromXMI( *TQT_TQIODEVICE(&file), ENC_UNKNOWN ); } file.close(); KIO::NetAccess::removeTempFile( tmpfile ); if( !status ) { - KMessageBox::error(0, i18n("There was a problem loading file: %1").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was a problem loading file: %1").tqarg(d.path()), i18n("Load Error")); m_bLoading = false; newDocument(); return false; @@ -553,7 +553,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) { // now check if we can write to the file if (archive->open(IO_WriteOnly) == false) { - KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error")); return false; } @@ -562,27 +562,27 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) { KTempFile tmp_xmi_file; file.setName(tmp_xmi_file.name()); if( !file.open( IO_WriteOnly ) ) { - KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error")); return false; } - saveToXMI(file); // save XMI to this file... + saveToXMI(*TQT_TQIODEVICE(&file)); // save XMI to this file... file.close(); // ...and close it // now add this file to the archive, but without the extension - TQString tmpQString = url.fileName(); + TQString tmpTQString = url.fileName(); if (fileFormat == "tgz") { - tmpQString.replace(TQRegExp("\\.tgz$"), ""); + tmpTQString.tqreplace(TQRegExp("\\.tgz$"), ""); } else { - tmpQString.replace(TQRegExp("\\.tar\\.bz2$"), ""); + tmpTQString.tqreplace(TQRegExp("\\.tar\\.bz2$"), ""); } - archive->addLocalFile(tmp_xmi_file.name(), tmpQString); + archive->addLocalFile(tmp_xmi_file.name(), tmpTQString); archive->close(); #if KDE_IS_VERSION(3,4,89) if (!archive->closeSucceeded()) { - KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error")); return false; } #endif @@ -617,10 +617,10 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) { // lets open the file for writing if( !file.open( IO_WriteOnly ) ) { - KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error")); return false; } - saveToXMI(file); // save the xmi stuff to it + saveToXMI(*TQT_TQIODEVICE(&file)); // save the xmi stuff to it file.close(); tmpfile.close(); @@ -630,7 +630,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) { } else { // now remove the original file if ( KIO::NetAccess::file_move( tmpfile.name(), d.path(), -1, true ) == false ) { - KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error")); m_doc_url.setFileName(i18n("Untitled")); return false; } @@ -638,7 +638,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) { } if( !uploaded ) { - KMessageBox::error(0, i18n("There was a problem uploading file: %1").arg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem uploading file: %1").tqarg(d.path()), i18n("Save Error")); m_doc_url.setFileName(i18n("Untitled")); } setModified(false); @@ -733,19 +733,19 @@ bool UMLDoc::addUMLObject(UMLObject* object) { if (pkg == NULL) { pkg = currentRoot(); kDebug() << "UMLDoc::addUMLObject(" << object->getName() - << "): no parent package set, assuming " << pkg->getName() << endl; + << "): no tqparent package set, assuming " << pkg->getName() << endl; object->setUMLPackage( pkg ); } return pkg->addObject(object); } void UMLDoc::addStereotype(const UMLStereotype *s) { - if (! m_stereoList.contains(s)) + if (! m_stereoList.tqcontains(s)) m_stereoList.append(s); } void UMLDoc::removeStereotype(const UMLStereotype *s) { - if (m_stereoList.contains(s)) + if (m_stereoList.tqcontains(s)) m_stereoList.remove(s); } @@ -759,7 +759,7 @@ void UMLDoc::slotRemoveUMLObject(UMLObject* object) { UMLPackage *pkg = object->getUMLPackage(); if (pkg == NULL) { kError() << "UMLDoc::slotRemoveUMLObject(" << object->getName() - << "): parent package is not set !" << endl; + << "): tqparent package is not set !" << endl; return; } pkg->removeObject(object); @@ -769,10 +769,10 @@ bool UMLDoc::isUnique(const TQString &name) { UMLListView *listView = UMLApp::app()->getListView(); UMLListViewItem *currentItem = (UMLListViewItem*)listView->currentItem(); - UMLListViewItem *parentItem = 0; + UMLListViewItem *tqparentItem = 0; // check for current item, if its a package, then we do a check on that - // otherwise, if current item exists, find its parent and check if thats + // otherwise, if current item exists, find its tqparent and check if thats // a package.. if(currentItem) { @@ -780,18 +780,18 @@ bool UMLDoc::isUnique(const TQString &name) // do check now if (Model_Utils::typeIsContainer(currentItem->getType())) return isUnique (name, (UMLPackage*) currentItem->getUMLObject()); - parentItem = (UMLListViewItem*)currentItem->parent(); + tqparentItem = (UMLListViewItem*)currentItem->tqparent(); } // item is in a package so do check only in that - if (parentItem != NULL && Model_Utils::typeIsContainer(parentItem->getType())) { - UMLPackage *parentPkg = static_cast<UMLPackage*>(parentItem->getUMLObject()); - return isUnique(name, parentPkg); + if (tqparentItem != NULL && Model_Utils::typeIsContainer(tqparentItem->getType())) { + UMLPackage *tqparentPkg = static_cast<UMLPackage*>(tqparentItem->getUMLObject()); + return isUnique(name, tqparentPkg); } kError() << "UMLDoc::isUnique(" << name << "): Not currently in a package" << endl; - /* Check against all objects that _don't_ have a parent package. + /* Check against all objects that _don't_ have a tqparent package. for (UMLObjectListIt oit(m_objectList); oit.current(); ++oit) { UMLObject *obj = oit.current(); if (obj->getUMLPackage() == NULL && obj->getName() == name) @@ -810,7 +810,7 @@ bool UMLDoc::isUnique(const TQString &name, UMLPackage *package) // Not currently in a package: ERROR kError() << "UMLDoc::isUnique(2)(" << name << "): Not currently in a package" << endl; - /* Check against all objects that _don't_ have a parent package. + /* Check against all objects that _don't_ have a tqparent package. for (UMLObjectListIt oit(m_objectList); oit.current(); ++oit) { UMLObject *obj = oit.current(); if (obj->getUMLPackage() == NULL && obj->getName() == name) @@ -848,7 +848,7 @@ void UMLDoc::removeAssociation (UMLAssociation * assoc, bool doSetModified /*=tr UMLPackage *pkg = assoc->getUMLPackage(); if (pkg == NULL) { kError() << "UMLDoc::removeAssociation(" << assoc->getName() - << "): parent package is not set !" << endl; + << "): tqparent package is not set !" << endl; return; } pkg->removeObject(assoc); @@ -917,7 +917,7 @@ void UMLDoc::addAssociation(UMLAssociation *Assoc) UMLPackage *pkg = Assoc->getUMLPackage(); if (pkg == NULL) { kError() << "UMLDoc::addAssociation(" << Assoc->getName() - << "): parent package is not set !" << endl; + << "): tqparent package is not set !" << endl; return; } pkg->addObject(Assoc); @@ -1048,9 +1048,9 @@ void UMLDoc::renameUMLObject(UMLObject *o) { void UMLDoc::renameChildUMLObject(UMLObject *o) { bool ok = false; - UMLClassifier* p = dynamic_cast<UMLClassifier *>(o->parent()); + UMLClassifier* p = dynamic_cast<UMLClassifier *>(o->tqparent()); if(!p) { - kDebug() << "Can't create object, no parent found" << endl; + kDebug() << "Can't create object, no tqparent found" << endl; return; } @@ -1096,7 +1096,7 @@ void UMLDoc::removeDiagram(Uml::IDType id) { kError()<<"Request to remove diagram " << ID2STR(id) << ": Diagram not found!"<<endl; return; } - if (KMessageBox::warningContinueCancel(0, i18n("Are you sure you want to delete diagram %1?").arg(umlview->getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Continue) { + if (KMessageBox::warningContinueCancel(0, i18n("Are you sure you want to delete diagram %1?").tqarg(umlview->getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Continue) { removeView(umlview); emit sigDiagramRemoved(id); setModified(true); @@ -1134,25 +1134,25 @@ void UMLDoc::removeUMLObject(UMLObject* umlobject) { umlobject->setUMLStereotype(NULL); // triggers possible cleanup of UMLStereotype if (dynamic_cast<UMLClassifierListItem*>(umlobject)) { - UMLClassifier* parent = dynamic_cast<UMLClassifier*>(umlobject->parent()); - if (parent == NULL) { - kError() << "UMLDoc::removeUMLObject: parent of umlobject is NULL" + UMLClassifier* tqparent = dynamic_cast<UMLClassifier*>(umlobject->tqparent()); + if (tqparent == NULL) { + kError() << "UMLDoc::removeUMLObject: tqparent of umlobject is NULL" << endl; return; } if (type == ot_Operation) { - parent->removeOperation(static_cast<UMLOperation*>(umlobject)); + tqparent->removeOperation(static_cast<UMLOperation*>(umlobject)); } else if (type == ot_EnumLiteral) { - UMLEnum *e = static_cast<UMLEnum*>(parent); + UMLEnum *e = static_cast<UMLEnum*>(tqparent); e->removeEnumLiteral(static_cast<UMLEnumLiteral*>(umlobject)); } else if (type == ot_EntityAttribute) { - UMLEntity *ent = static_cast<UMLEntity*>(parent); + UMLEntity *ent = static_cast<UMLEntity*>(tqparent); ent->removeEntityAttribute(static_cast<UMLClassifierListItem*>(umlobject)); } else { - UMLClassifier* pClass = dynamic_cast<UMLClassifier*>(parent); + UMLClassifier* pClass = dynamic_cast<UMLClassifier*>(tqparent); if (pClass == NULL) { - kError() << "UMLDoc::removeUMLObject: parent of umlobject has " - << "unexpected type " << parent->getBaseType() << endl; + kError() << "UMLDoc::removeUMLObject: tqparent of umlobject has " + << "unexpected type " << tqparent->getBaseType() << endl; return; } if (type == ot_Attribute) { @@ -1174,7 +1174,7 @@ void UMLDoc::removeUMLObject(UMLObject* umlobject) { pkg->removeObject(umlobject); } else { kError() << "UMLDoc::removeUMLObject(" << umlobject->getName() - << "): parent package is not set !" << endl; + << "): tqparent package is not set !" << endl; } } emit sigObjectRemoved(umlobject); @@ -1213,7 +1213,7 @@ void UMLDoc::saveToXMI(TQIODevice& file) { TQDomElement root = doc.createElement( "XMI" ); root.setAttribute( "xmi.version", "1.2" ); - TQDateTime now = TQDateTime::currentDateTime(); + TQDateTime now = TQDateTime::tqcurrentDateTime(); root.setAttribute( "timestamp", now.toString(Qt::ISODate)); root.setAttribute( "verified", "false"); root.setAttribute( "xmlns:UML", "http://schema.omg.org/spec/UML/1.3"); @@ -1298,7 +1298,7 @@ void UMLDoc::saveToXMI(TQIODevice& file) { for (UMLStereotype *s = m_stereoList.first(); s; s = m_stereoList.next() ) { TQString stName = s->getName(); Uml::IDType stID = s->getID(); - if (!stereoNames.contains(stName) && !stereoIDs.contains(stID)) { + if (!stereoNames.tqcontains(stName) && !stereoIDs.tqcontains(stID)) { s->saveToXMI(doc, ownedNS); stereoNames.append(stName); stereoIDs.append(stID); @@ -1524,8 +1524,8 @@ bool UMLDoc::loadFromXMI( TQIODevice & file, short encode ) tagEq(tag, "Interface")) { // These tests are only for foreign XMI files that // are missing the <Model> tag (e.g. NSUML) - TQDomElement parentElem = node.toElement(); - if( !loadUMLObjectsFromXMI( parentElem ) ) { + TQDomElement tqparentElem = node.toElement(); + if( !loadUMLObjectsFromXMI( tqparentElem ) ) { kWarning() << "failed load on model objects" << endl; return false; } @@ -1693,7 +1693,7 @@ bool UMLDoc::loadUMLObjectsFromXMI(TQDomElement& element) { continue; } Uml::Object_Type ot = pObject->getBaseType(); - // Set the parent root folder. + // Set the tqparent root folder. UMLPackage *pkg = NULL; if (ot == Uml::ot_Datatype) { pkg = m_datatypeRoot; @@ -1839,7 +1839,7 @@ bool UMLDoc::loadDiagramsFromXMI( TQDomNode & node ) { return false; } // Put diagram in default predefined folder. - // @todo pass in the parent folder - it might be a user defined one. + // @todo pass in the tqparent folder - it might be a user defined one. Uml::Model_Type mt = Model_Utils::convert_DT_MT(pView->getType()); pView->setFolder(m_root[mt]); pView -> hide(); @@ -1915,7 +1915,7 @@ void UMLDoc::print(KPrinter * pPrinter) { for(int i = 0;i < count;i++) { if(i>0) pPrinter -> newPage(); - TQString diagram = i18n("kde-uml-Diagram") + TQString("%1").arg(i); + TQString diagram = i18n("kde-uml-Diagram") + TQString("%1").tqarg(i); TQString sID = pPrinter -> option(diagram); Uml::IDType id = STR2ID(sID); printView = findView(id); @@ -2101,7 +2101,7 @@ void UMLDoc::slotAutoSave() { } KURL tempURL = m_doc_url; if( tempURL.fileName() == i18n("Untitled") ) { - tempURL.setPath( TQDir::homeDirPath() + i18n("/autosave%1").arg(".xmi") ); + tempURL.setPath( TQDir::homeDirPath() + i18n("/autosave%1").tqarg(".xmi") ); saveDocument( tempURL ); m_doc_url.setFileName( i18n("Untitled") ); m_modified = true; @@ -2113,7 +2113,7 @@ void UMLDoc::slotAutoSave() { // don't overwrite manually saved file with autosave content TQString fileName = tempURL.fileName(); Settings::OptionState optionState = Settings::getOptionState(); - fileName.replace( ".xmi", optionState.generalState.autosavesuffix ); + fileName.tqreplace( ".xmi", optionState.generalState.autosavesuffix ); tempURL.setFileName( fileName ); // End Achim Spangler @@ -2148,7 +2148,7 @@ void UMLDoc::addToUndoStack() { buffer->open(IO_WriteOnly); TQDataStream* undoData = new TQDataStream(); undoData->setDevice(buffer); - saveToXMI(*buffer); + saveToXMI(*TQT_TQIODEVICE(buffer)); buffer->close(); undoStack.prepend(undoData); @@ -2196,7 +2196,7 @@ void UMLDoc::loadUndoData() { TQDataStream* undoData = undoStack.getFirst(); TQBuffer* buffer = static_cast<TQBuffer*>( undoData->device() ); buffer->open(IO_ReadOnly); - loadFromXMI(*buffer); + loadFromXMI(*TQT_TQIODEVICE(buffer)); buffer->close(); setModified(true, false); @@ -2235,7 +2235,7 @@ void UMLDoc::loadRedoData() { redoStack.removeFirst(); TQBuffer* buffer = static_cast<TQBuffer*>( redoData->device() ); buffer->open(IO_ReadOnly); - loadFromXMI(*buffer); + loadFromXMI(*TQT_TQIODEVICE(buffer)); buffer->close(); setModified(true, false); diff --git a/umbrello/umbrello/umldoc.h b/umbrello/umbrello/umldoc.h index 7a982e0f..ad62c698 100644 --- a/umbrello/umbrello/umldoc.h +++ b/umbrello/umbrello/umldoc.h @@ -76,6 +76,7 @@ class UMLFolder; */ class UMLDoc : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor for the fileclass of the application @@ -212,7 +213,7 @@ public: bool isUnique(const TQString &name, UMLPackage *package); /** - * Finds or creates a stereotype for the parent object. + * Finds or creates a stereotype for the tqparent object. */ UMLStereotype* findOrCreateStereotype(const TQString &name); @@ -329,7 +330,7 @@ public: * Used to find a @ref UMLObject by its type and name. * * @param name The name of the @ref UMLObject to find. - * @param type Object_Type of the object to find (optional.) + * @param type Object_Type of the object to tqfind (optional.) * When the given type is ot_UMLObject the type is * disregarded, i.e. the given name is the only * search criterion. diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp index f213c01d..b9644aa9 100644 --- a/umbrello/umbrello/umllistview.cpp +++ b/umbrello/umbrello/umllistview.cpp @@ -63,10 +63,10 @@ #include "dialogs/umltemplatedialog.h" #ifdef WANT_LVTOOLTIP -class LVToolTip : public QToolTip +class LVToolTip : public TQToolTip { public: - LVToolTip (TQWidget* parent) : TQToolTip (parent) {} + LVToolTip (TQWidget* tqparent) : TQToolTip (tqparent) {} virtual ~LVToolTip () {} protected: /** @@ -86,26 +86,26 @@ protected: return; UMLOperation *op = static_cast<UMLOperation*>(obj); TQString text = op->toString(Uml::st_ShowSig); - TQRect rect = lv->itemRect(item); + TQRect rect = lv->tqitemRect(item); tip(rect, text); } }; #endif -UMLListView::UMLListView(TQWidget *parent, const char *name) - : KListView(parent,name), m_pMenu(0), m_doc(UMLApp::app()->getDocument()) +UMLListView::UMLListView(TQWidget *tqparent, const char *name) + : KListView(tqparent,name), m_pMenu(0), m_doc(UMLApp::app()->getDocument()) { loadPixmaps(); //setup list view - setBackgroundColor(Qt::white); + setBackgroundColor(TQt::white); setAcceptDrops(true); setDropVisualizer(false); setItemsMovable(true); setItemsRenameable( true ); setSelectionModeExt(FileManager); - setFocusPolicy(TQWidget::StrongFocus); + setFocusPolicy(TQ_StrongFocus); setDragEnabled(true); setColumnWidthMode( 0, Manual ); setDefaultRenameAction( Accept ); @@ -144,7 +144,7 @@ UMLListView::~UMLListView() {} bool UMLListView::eventFilter(TQObject *o, TQEvent *e) { if (e->type() != TQEvent::MouseButtonPress || !o->isA(TQHEADER_OBJECT_NAME_STRING)) return TQListView::eventFilter(o, e); - TQMouseEvent *me = static_cast<TQMouseEvent*>(e); + TQMouseEvent *me = TQT_TQMOUSEEVENT(e); if (me->button() == Qt::RightButton) { if (m_pMenu) { m_pMenu->hide(); @@ -163,11 +163,11 @@ void UMLListView::contentsMousePressEvent(TQMouseEvent *me) { UMLView *currentView = UMLApp::app()->getCurrentView(); if (currentView) currentView->clearSelected(); - if( me -> state() != Qt::ShiftButton ) + if( me -> state() != TQt::ShiftButton ) clearSelection(); TQPoint pt = this->TQScrollView::contentsToViewport( me->pos() ); UMLListViewItem * item = (UMLListViewItem*)itemAt(pt); - const Qt::ButtonState button = me->button(); + const TQt::ButtonState button = me->button(); if (!item || (button != Qt::RightButton && button != Qt::LeftButton)) { UMLApp::app()->getDocWindow()->updateDocumentation(true); @@ -223,7 +223,7 @@ void UMLListView::keyPressEvent(TQKeyEvent *ke) { ke->accept(); // munge and do nothing } else { const int k = ke->key(); - if (k == Qt::Key_Delete || k == Qt::Key_Backspace) { + if (k == TQt::Key_Delete || k == TQt::Key_Backspace) { // delete every selected item UMLListViewItemList selecteditems; getSelectedItemsRoot(selecteditems); @@ -232,7 +232,7 @@ void UMLListView::keyPressEvent(TQKeyEvent *ke) { deleteItem(dynamic_cast<UMLListViewItem*>(item)); } } else { - TQListView::keyPressEvent(ke); // let parent handle it + TQListView::keyPressEvent(ke); // let tqparent handle it } } } @@ -349,7 +349,7 @@ void UMLListView::popupMenuSel(int sel) { fileDialog.setOperationMode(KFileDialog::Other); // set a sensible default filename TQString defaultFilename = current->getText().lower(); - defaultFilename.replace(TQRegExp("\\W+"), "_"); + defaultFilename.tqreplace(TQRegExp("\\W+"), "_"); defaultFilename.append(".xml"); // default extension fileDialog.setSelection(defaultFilename); fileDialog.exec(); @@ -381,7 +381,7 @@ void UMLListView::popupMenuSel(int sel) { file.close(); } else { KMessageBox::error(0, - i18n("There was a problem saving file: %1").arg(fileName), + i18n("There was a problem saving file: %1").tqarg(fileName), i18n("Save Error")); return; } @@ -402,7 +402,7 @@ void UMLListView::popupMenuSel(int sel) { kError() << "UMLListView::popupMenuSel: modelFolder is NULL" << endl; return; } - modelFolder->setFolderFile(TQString::null); + modelFolder->setFolderFile(TQString()); // Recompute text of the folder TQString folderText = current->getText(); folderText.remove( TQRegExp("\\s*\\(.*$") ); @@ -573,7 +573,7 @@ void UMLListView::slotDiagramCreated( Uml::IDType id ) { } UMLListViewItem* UMLListView::determineParentItem(UMLObject* object) const { - UMLListViewItem* parentItem = NULL; + UMLListViewItem* tqparentItem = NULL; UMLListViewItem* current = (UMLListViewItem*) currentItem(); Uml::ListView_Type lvt = Uml::lvt_Unknown; if (current) @@ -600,26 +600,26 @@ UMLListViewItem* UMLListView::determineParentItem(UMLObject* object) const { if (pkg) { UMLListViewItem* pkgItem = findUMLObject(pkg); if (pkgItem == NULL) - kError() << "UMLListView::determineParentItem: could not find " - << "parent package " << pkg->getName() << endl; + kError() << "UMLListView::determineParentItem: could not tqfind " + << "tqparent package " << pkg->getName() << endl; else - parentItem = pkgItem; + tqparentItem = pkgItem; } else if ((lvt == Uml::lvt_UseCase_Folder && (t == Uml::ot_Actor || t == Uml::ot_UseCase)) || (lvt == Uml::lvt_Component_Folder && t == Uml::ot_Component) || (lvt == Uml::lvt_Deployment_Folder && t == Uml::ot_Node) || (lvt == Uml::lvt_EntityRelationship_Folder && t == Uml::ot_Entity)) { - parentItem = current; + tqparentItem = current; } else if (t == Uml::ot_Datatype) { - parentItem = m_datatypeFolder; + tqparentItem = m_datatypeFolder; } else { Uml::Model_Type guess = Model_Utils::guessContainer(object); - parentItem = m_lv[guess]; + tqparentItem = m_lv[guess]; } } break; } - return parentItem; + return tqparentItem; } bool UMLListView::mayHaveChildItems(Uml::Object_Type type) { @@ -653,8 +653,8 @@ void UMLListView::slotObjectCreated(UMLObject* object) { newItem->setIcon(icon); return; } - UMLListViewItem* parentItem = determineParentItem(object); - if (parentItem == NULL) + UMLListViewItem* tqparentItem = determineParentItem(object); + if (tqparentItem == NULL) return; Uml::Object_Type type = object->getBaseType(); @@ -667,7 +667,7 @@ void UMLListView::slotObjectCreated(UMLObject* object) { if (!folderFile.isEmpty()) name.append(" (" + folderFile + ')'); } - newItem = new UMLListViewItem(parentItem, name, lvt, object); + newItem = new UMLListViewItem(tqparentItem, name, lvt, object); if (mayHaveChildItems(type)) { UMLClassifier *c = static_cast<UMLClassifier*>(object); UMLClassifierListItemList cListItems = c->getFilteredList(Uml::ot_UMLObject); @@ -764,30 +764,30 @@ void UMLListView::slotObjectChanged() { } void UMLListView::childObjectAdded(UMLClassifierListItem* obj) { - UMLClassifier *parent = const_cast<UMLClassifier*>(dynamic_cast<const UMLClassifier*>(sender())); - childObjectAdded(obj, parent); + UMLClassifier *tqparent = const_cast<UMLClassifier*>(dynamic_cast<const UMLClassifier*>(sender())); + childObjectAdded(obj, tqparent); } -void UMLListView::childObjectAdded(UMLClassifierListItem* child, UMLClassifier* parent) { +void UMLListView::childObjectAdded(UMLClassifierListItem* child, UMLClassifier* tqparent) { if (m_bCreatingChildObject) return; const TQString text = child->toString(Uml::st_SigNoVis); UMLListViewItem *childItem = NULL; - UMLListViewItem *parentItem = findUMLObject(parent); - if (parentItem == NULL) { + UMLListViewItem *tqparentItem = findUMLObject(tqparent); + if (tqparentItem == NULL) { kDebug() << "UMLListView::childObjectAdded(" << child->getName() - << "): parent " << parent->getName() + << "): tqparent " << tqparent->getName() << " does not yet exist, creating it now." << endl; - const Uml::ListView_Type lvt = Model_Utils::convert_OT_LVT(parent); - parentItem = new UMLListViewItem(m_lv[Uml::mt_Logical], parent->getName(), lvt, parent); + const Uml::ListView_Type lvt = Model_Utils::convert_OT_LVT(tqparent); + tqparentItem = new UMLListViewItem(m_lv[Uml::mt_Logical], tqparent->getName(), lvt, tqparent); } else { - childItem = parentItem->findChildObject(child); + childItem = tqparentItem->findChildObject(child); } if (childItem) { childItem->setText(text); } else { const Uml::ListView_Type lvt = Model_Utils::convert_OT_LVT(child); - childItem = new UMLListViewItem(parentItem, text, lvt, child); + childItem = new UMLListViewItem(tqparentItem, text, lvt, child); if (! m_doc->loading()) { ensureItemVisible(childItem); clearSelection(); @@ -798,14 +798,14 @@ void UMLListView::childObjectAdded(UMLClassifierListItem* child, UMLClassifier* } void UMLListView::childObjectRemoved(UMLClassifierListItem* obj) { - UMLClassifier *parent = const_cast<UMLClassifier*>(dynamic_cast<const UMLClassifier*>(sender())); - UMLListViewItem *parentItem = findUMLObject(parent); - if (parentItem == NULL) { + UMLClassifier *tqparent = const_cast<UMLClassifier*>(dynamic_cast<const UMLClassifier*>(sender())); + UMLListViewItem *tqparentItem = findUMLObject(tqparent); + if (tqparentItem == NULL) { kError() << "UMLListView::childObjectRemoved(" << obj->getName() - << "): cannot find parent UMLListViewItem" << endl; + << "): cannot find tqparent UMLListViewItem" << endl; return; } - parentItem->deleteChildItem(obj); + tqparentItem->deleteChildItem(obj); } void UMLListView::slotDiagramRenamed(Uml::IDType id) { @@ -1065,7 +1065,7 @@ void UMLListView::contentsMouseDoubleClickEvent(TQMouseEvent * me) { Uml::Object_Type type = object -> getBaseType(); int page = ClassPropDlg::page_gen; if(type == Uml::ot_Attribute || type == Uml::ot_Operation) - object = (UMLObject *)object -> parent(); + object = (UMLObject *)object -> tqparent(); //set what page to show if(type == Uml::ot_Attribute) page = ClassPropDlg::page_att; @@ -1222,12 +1222,12 @@ bool UMLListView::acceptDrag(TQDropEvent* event) const { return accept; } -void UMLListView::addAtContainer(UMLListViewItem *item, UMLListViewItem *parent) { +void UMLListView::addAtContainer(UMLListViewItem *item, UMLListViewItem *tqparent) { UMLCanvasObject *o = static_cast<UMLCanvasObject*>(item->getUMLObject()); if (o == NULL) { kDebug() << "UMLListView::addAtContainer(" << item->getText() << "): item's UMLObject is NULL" << endl; - } else if (Model_Utils::typeIsContainer(parent->getType())) { + } else if (Model_Utils::typeIsContainer(tqparent->getType())) { /**** TBC: Do this here? If yes then remove that logic at the callers and rename this method to moveAtContainer() @@ -1235,12 +1235,12 @@ void UMLListView::addAtContainer(UMLListViewItem *item, UMLListViewItem *parent) if (oldPkg) oldPkg->removeObject(o); *********/ - UMLPackage *pkg = static_cast<UMLPackage*>(parent->getUMLObject()); + UMLPackage *pkg = static_cast<UMLPackage*>(tqparent->getUMLObject()); o->setUMLPackage(pkg); pkg->addObject(o); } else { kError() << "UMLListView::addAtContainer(" << item->getText() - << "): parent type is " << parent->getType() << endl; + << "): tqparent type is " << tqparent->getType() << endl; } UMLView *currentView = UMLApp::app()->getCurrentView(); if (currentView) @@ -1256,7 +1256,7 @@ UMLListViewItem * UMLListView::moveObject(Uml::IDType srcId, Uml::ListView_Type return NULL; UMLObject *newParentObj = NULL; - // Remove the source object at the old parent package. + // Remove the source object at the old tqparent package. UMLObject *srcObj = m_doc->findObjectById(srcId); if (srcObj) { newParentObj = newParent->getUMLObject(); @@ -1422,14 +1422,14 @@ UMLListViewItem * UMLListView::moveObject(Uml::IDType srcId, Uml::ListView_Type // update model objects m_bCreatingChildObject = true; - UMLClassifier *oldParentClassifier = dynamic_cast<UMLClassifier*>(srcObj->parent()); + UMLClassifier *oldParentClassifier = dynamic_cast<UMLClassifier*>(srcObj->tqparent()); UMLClassifier *newParentClassifier = dynamic_cast<UMLClassifier*>(newParentObj); if (srcType == Uml::lvt_Attribute) { UMLAttribute *att = dynamic_cast<UMLAttribute*>(srcObj); // We can't use the existing 'att' directly - // because its parent is fixed to the old classifier + // because its tqparent is fixed to the old classifier // and we have no way of changing that: - // TQObject does not permit changing the parent(). + // TQObject does not permit changing the tqparent(). if (att == NULL) { kError() << "moveObject internal error: srcObj " << srcObj->getName() << " is not a UMLAttribute" << endl; @@ -1454,9 +1454,9 @@ UMLListViewItem * UMLListView::moveObject(Uml::IDType srcId, Uml::ListView_Type } else { UMLOperation *op = dynamic_cast<UMLOperation*>(srcObj); // We can't use the existing 'op' directly - // because its parent is fixed to the old classifier + // because its tqparent is fixed to the old classifier // and we have no way of changing that: - // TQObject does not permit changing the parent(). + // TQObject does not permit changing the tqparent(). if (op && oldParentClassifier->takeItem(op) != -1) { bool isExistingOp; Model_Utils::NameAndType_List ntDummyList; @@ -1502,7 +1502,7 @@ UMLListViewItem * UMLListView::moveObject(Uml::IDType srcId, Uml::ListView_Type return newItem; } -void UMLListView::slotDropped(TQDropEvent* de, TQListViewItem* /* parent */, TQListViewItem* item) { +void UMLListView::slotDropped(TQDropEvent* de, TQListViewItem* /* tqparent */, TQListViewItem* item) { item = (UMLListViewItem *)currentItem(); if(!item) { kDebug() << "UMLListView::slotDropped: item is NULL - doing nothing" << endl; @@ -1545,10 +1545,10 @@ int UMLListView::getSelectedItemsRoot(UMLListViewItemList &ItemList) { for ( ; it.current(); ++it ) { if ( it.current()->isSelected() ) { UMLListViewItem *item = (UMLListViewItem*)it.current(); - // this is the trick, we select only the item with a parent unselected - // since we can't select a child and its grandfather without its parent + // this is the trick, we select only the item with a tqparent unselected + // since we can't select a child and its grandfather without its tqparent // we would be able to delete each item individually, without an invalid iterator - if (item && item->parent() && item->parent()->isSelected()==false) { + if (item && item->tqparent() && item->tqparent()->isSelected()==false) { ItemList.append(item); } } @@ -1560,37 +1560,37 @@ int UMLListView::getSelectedItemsRoot(UMLListViewItemList &ItemList) { UMLListViewItem* UMLListView::createDiagramItem(UMLView *v) { Uml::ListView_Type lvt = Model_Utils::convert_DT_LVT(v->getType()); - UMLListViewItem *parent = NULL; + UMLListViewItem *tqparent = NULL; UMLFolder *f = v->getFolder(); if (f) { - parent = findUMLObject(f); - if (parent == NULL) + tqparent = findUMLObject(f); + if (tqparent == NULL) kError() << "UMLListView::createDiagramItem(" << v->getName() << "): findUMLObject(" << f->getName() << ") returns NULL" << endl; } else { kDebug() << "UMLListView::createDiagramItem(" << v->getName() - << "): no parent folder set, using predefined folder" << endl; + << "): no tqparent folder set, using predefined folder" << endl; } - if (parent == NULL) { - parent = determineParentItem(lvt); + if (tqparent == NULL) { + tqparent = determineParentItem(lvt); lvt = Model_Utils::convert_DT_LVT(v->getType()); } - UMLListViewItem *item = new UMLListViewItem(parent, v->getName(), lvt, v->getID()); + UMLListViewItem *item = new UMLListViewItem(tqparent, v->getName(), lvt, v->getID()); return item; } /** Creates a new UMLListViewItem from a UMLListViewItem, - if parent is null the ListView Decides who is going to be - the parent */ + if tqparent is null the ListView Decides who is going to be + the tqparent */ UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDChanges, - UMLListViewItem* parent /*= 0*/) { + UMLListViewItem* tqparent /*= 0*/) { UMLObject* pObject = 0; UMLListViewItem* item = 0; Uml::ListView_Type lvt = Data.getType(); - if(!parent) { - parent = determineParentItem(lvt); - if (!parent) + if(!tqparent) { + tqparent = determineParentItem(lvt); + if (!tqparent) return 0; } @@ -1618,13 +1618,13 @@ UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDC //it could exist an Item already asocciated if the user chose to reuse an uml object if(!(item = findItem(newID))) { pObject = m_doc->findObjectById( IDChanges.findNewID(Data.getID()) ); - item = new UMLListViewItem(parent, Data.getText(), lvt, pObject); + item = new UMLListViewItem(tqparent, Data.getText(), lvt, pObject); } ***/ pObject = m_doc->findObjectById( Data.getID() ); - item = new UMLListViewItem(parent, Data.getText(), lvt, pObject); + item = new UMLListViewItem(tqparent, Data.getText(), lvt, pObject); break; case Uml::lvt_Datatype_Folder: - item = new UMLListViewItem(parent, Data.getText(), lvt); + item = new UMLListViewItem(tqparent, Data.getText(), lvt); break; case Uml::lvt_Attribute: case Uml::lvt_EntityAttribute: @@ -1632,11 +1632,11 @@ UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDC case Uml::lvt_Template: case Uml::lvt_EnumLiteral: { - UMLClassifier *pClass = static_cast<UMLClassifier*>(parent->getUMLObject()); + UMLClassifier *pClass = static_cast<UMLClassifier*>(tqparent->getUMLObject()); Uml::IDType newID = IDChanges.findNewID( Data.getID() ); pObject = pClass->findChildObjectById(newID); if (pObject) { - item = new UMLListViewItem( parent, Data.getText(), lvt, pObject ); + item = new UMLListViewItem( tqparent, Data.getText(), lvt, pObject ); } else { item = 0; } @@ -1658,7 +1658,7 @@ UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDC return NULL; } const Uml::ListView_Type lvt = Model_Utils::convert_DT_LVT(v->getType()); - item = new UMLListViewItem(parent, v->getName(), lvt, newID); + item = new UMLListViewItem(tqparent, v->getName(), lvt, newID); } break; default: @@ -1669,36 +1669,36 @@ UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDC } UMLListViewItem* UMLListView::determineParentItem(Uml::ListView_Type lvt) const { - UMLListViewItem* parent = 0; + UMLListViewItem* tqparent = 0; switch (lvt) { case Uml::lvt_Datatype: - parent = m_datatypeFolder; + tqparent = m_datatypeFolder; break; case Uml::lvt_Actor: case Uml::lvt_UseCase: case Uml::lvt_UseCase_Folder: case Uml::lvt_UseCase_Diagram: - parent = m_lv[Uml::mt_UseCase]; + tqparent = m_lv[Uml::mt_UseCase]; break; case Uml::lvt_Component_Diagram: case Uml::lvt_Component: case Uml::lvt_Artifact: - parent = m_lv[Uml::mt_Component]; + tqparent = m_lv[Uml::mt_Component]; break; case Uml::lvt_Deployment_Diagram: case Uml::lvt_Node: - parent = m_lv[Uml::mt_Deployment]; + tqparent = m_lv[Uml::mt_Deployment]; break; case Uml::lvt_EntityRelationship_Diagram: case Uml::lvt_Entity: - parent = m_lv[Uml::mt_EntityRelationship]; + tqparent = m_lv[Uml::mt_EntityRelationship]; break; default: if (Model_Utils::typeIsDiagram(lvt) || !Model_Utils::typeIsClassifierList(lvt)) - parent = m_lv[Uml::mt_Logical]; + tqparent = m_lv[Uml::mt_Logical]; break; } - return parent; + return tqparent; } int UMLListView::getSelectedCount() { @@ -1715,12 +1715,11 @@ int UMLListView::getSelectedCount() { } void UMLListView::focusOutEvent ( TQFocusEvent * fe) { - TQFocusEvent::Reason reason = fe->reason(); - if (reason != TQFocusEvent::Popup) { + if (fe->reason() != TQFocusEvent::Popup) { clearSelection(); triggerUpdate(); } - //repaint(); + //tqrepaint(); TQListView::focusOutEvent(fe); } @@ -1738,9 +1737,9 @@ Uml::ListView_Type UMLListView::rootViewType(UMLListViewItem *item) { return Uml::lvt_Deployment_View; if (item == m_lv[Uml::mt_EntityRelationship]) return Uml::lvt_EntityRelationship_Model; - UMLListViewItem *parent = dynamic_cast<UMLListViewItem*>(item->parent()); - if (parent) - return rootViewType(parent); + UMLListViewItem *tqparent = dynamic_cast<UMLListViewItem*>(item->tqparent()); + if (tqparent) + return rootViewType(tqparent); return Uml::lvt_Unknown; } @@ -1843,13 +1842,13 @@ void UMLListView::slotCutSuccessful() { } } -void UMLListView::addNewItem(UMLListViewItem *parentItem, Uml::ListView_Type type) { +void UMLListView::addNewItem(UMLListViewItem *tqparentItem, Uml::ListView_Type type) { if (type == Uml::lvt_Datatype) { - parentItem = m_datatypeFolder; + tqparentItem = m_datatypeFolder; } UMLListViewItem * newItem = NULL; - parentItem->setOpen( true ); + tqparentItem->setOpen( true ); Uml::Icon_Type icon = Model_Utils::convert_LVT_IT(type); @@ -1857,7 +1856,7 @@ void UMLListView::addNewItem(UMLListViewItem *parentItem, Uml::ListView_Type typ if (Model_Utils::typeIsDiagram(type)) { Uml::Diagram_Type dt = Model_Utils::convert_LVT_DT(type); name = getUniqueDiagramName(dt); - newItem = new UMLListViewItem(parentItem, name, type, Uml::id_None); + newItem = new UMLListViewItem(tqparentItem, name, type, Uml::id_None); } else { Uml::Object_Type ot = Model_Utils::convert_LVT_OT(type); if (ot == Uml::ot_UMLObject) { @@ -1865,20 +1864,20 @@ void UMLListView::addNewItem(UMLListViewItem *parentItem, Uml::ListView_Type typ << type << endl; return; } - UMLPackage *parentPkg = - dynamic_cast<UMLPackage*>(parentItem->getUMLObject()); - if (parentPkg == NULL) { + UMLPackage *tqparentPkg = + dynamic_cast<UMLPackage*>(tqparentItem->getUMLObject()); + if (tqparentPkg == NULL) { kError() << "UMLListView::addNewItem(type " << type - << "): parentPkg is NULL" << endl; + << "): tqparentPkg is NULL" << endl; return; } if (Model_Utils::typeIsClassifierList(type)) { - UMLClassifier *parent = static_cast<UMLClassifier*>(parentPkg); - name = parent->uniqChildName(ot); + UMLClassifier *tqparent = static_cast<UMLClassifier*>(tqparentPkg); + name = tqparent->uniqChildName(ot); } else { - name = Model_Utils::uniqObjectName(ot, parentPkg); + name = Model_Utils::uniqObjectName(ot, tqparentPkg); } - newItem = new UMLListViewItem(parentItem, name, type, (UMLObject*)0); + newItem = new UMLListViewItem(tqparentItem, name, type, (UMLObject*)0); } m_bIgnoreCancelRename = false; newItem->setIcon( icon ); @@ -1901,7 +1900,7 @@ bool UMLListView::itemRenamed( TQListViewItem * item , int /*col*/ ) { renamedItem -> setCreating( false ); // If the type is empty then delete it. - if (newText.isEmpty() || newText.contains(TQRegExp("^\\s+$"))) { + if (newText.isEmpty() || newText.tqcontains(TQRegExp("^\\s+$"))) { KMessageBox::error( kapp -> mainWidget(), i18n( "The name you entered was invalid.\nCreation process has been canceled." ), @@ -2074,15 +2073,15 @@ UMLObject *UMLListView::createUMLObject( UMLListViewItem * item, Uml::Object_Typ return NULL; } - UMLListViewItem * parentItem = static_cast<UMLListViewItem *>(item->parent()); - const Uml::ListView_Type lvt = parentItem->getType(); + UMLListViewItem * tqparentItem = static_cast<UMLListViewItem *>(item->tqparent()); + const Uml::ListView_Type lvt = tqparentItem->getType(); if (! Model_Utils::typeIsContainer(lvt)) { kError() << "UMLListView::createUMLObject(" << object->getName() - << "): parentItem (" << lvt << " is not a container" << endl; + << "): tqparentItem (" << lvt << " is not a container" << endl; delete object; return NULL; } - UMLPackage *pkg = static_cast<UMLPackage*>(parentItem->getUMLObject()); + UMLPackage *pkg = static_cast<UMLPackage*>(tqparentItem->getUMLObject()); object->setUMLPackage(pkg); pkg->addObject(object); connectNewObjectsSlots(object); @@ -2094,9 +2093,9 @@ UMLObject *UMLListView::createUMLObject( UMLListViewItem * item, Uml::Object_Typ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type type ) { m_bCreatingChildObject = true; TQString text = item->text( 0 ); - UMLObject* parent = static_cast<UMLListViewItem *>( item->parent() )->getUMLObject(); - if( !parent ) { - kError() << "UMLListView::createChildUMLObject: parent UMLObject is NULL" << endl; + UMLObject* tqparent = static_cast<UMLListViewItem *>( item->tqparent() )->getUMLObject(); + if( !tqparent ) { + kError() << "UMLListView::createChildUMLObject: tqparent UMLObject is NULL" << endl; m_bCreatingChildObject = false; return false; } @@ -2104,15 +2103,15 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type //kDebug() << "UMLListView::createChildUMLObject (" << text << ")" << endl; UMLObject* newObject = NULL; if ( type == Uml::ot_EnumLiteral ) { - UMLEnum *owningEnum = static_cast<UMLEnum*>(parent); + UMLEnum *owningEnum = static_cast<UMLEnum*>(tqparent); newObject = owningEnum->createEnumLiteral(text); UMLEnumLiteral* enumLiteral = static_cast<UMLEnumLiteral*>(newObject); text = enumLiteral->toString(Uml::st_SigNoVis); } else if ( type == Uml::ot_Template ) { - UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(parent); + UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(tqparent); Model_Utils::NameAndType nt; - Model_Utils::Parse_Status st = Model_Utils::parseTemplate(text, nt, owningClassifier); + Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(text, nt, owningClassifier); if (st) { KMessageBox::error( kapp->mainWidget(), Model_Utils::psText(st), @@ -2125,10 +2124,10 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type tmplParm->setType(nt.m_type); text = tmplParm->toString(Uml::st_SigNoVis); } else if (type == Uml::ot_Attribute || type == Uml::ot_EntityAttribute) { - UMLClassifier *owningClass = static_cast<UMLClassifier*>(parent); + UMLClassifier *owningClass = static_cast<UMLClassifier*>(tqparent); Model_Utils::NameAndType nt; Uml::Visibility vis; - Model_Utils::Parse_Status st; + Model_Utils::Parse_tqStatus st; st = Model_Utils::parseAttribute(text, nt, owningClass, &vis); if (st) { KMessageBox::error( kapp->mainWidget(), @@ -2142,9 +2141,9 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type att->setParmKind(nt.m_direction); text = att->toString(Uml::st_SigNoVis); } else if ( type == Uml::ot_Operation ) { - UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(parent); + UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(tqparent); Model_Utils::OpDescriptor od; - Model_Utils::Parse_Status st = Model_Utils::parseOperation(text, od, owningClassifier); + Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(text, od, owningClassifier); if (st) { KMessageBox::error( kapp->mainWidget(), Model_Utils::psText(st), @@ -2181,9 +2180,9 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type item->setText( text ); ensureItemVisible(item); - // as it's a ClassifierListItem add it to the childObjectMap of the parent + // as it's a ClassifierListItem add it to the childObjectMap of the tqparent UMLClassifierListItem* classifierListItem = static_cast<UMLClassifierListItem*>( newObject ); - static_cast<UMLListViewItem*>( item->parent() )->addClassifierListItem(classifierListItem, item ); + static_cast<UMLListViewItem*>( item->tqparent() )->addClassifierListItem(classifierListItem, item ); m_bCreatingChildObject = false; @@ -2199,15 +2198,15 @@ void UMLListView::createDiagram( UMLListViewItem * item, Uml::Diagram_Type type delete item; return; } - UMLListViewItem *parentItem = static_cast<UMLListViewItem*>(item->parent()); - UMLFolder *parentFolder = dynamic_cast<UMLFolder*>(parentItem->getUMLObject()); - if (parentFolder == NULL) { + UMLListViewItem *tqparentItem = static_cast<UMLListViewItem*>(item->tqparent()); + UMLFolder *tqparentFolder = dynamic_cast<UMLFolder*>(tqparentItem->getUMLObject()); + if (tqparentFolder == NULL) { kError() << "UMLListView::createDiagram(" << name - << "): parent UMLObject is not a UMLFolder" << endl; + << "): tqparent UMLObject is not a UMLFolder" << endl; delete item; return; } - view = new UMLView(parentFolder); + view = new UMLView(tqparentFolder); view->setName( name ); view->setType( type ); view->setID( UniqueID::gen() ); @@ -2224,7 +2223,7 @@ TQString UMLListView::getUniqueDiagramName(Uml::Diagram_Type type) { } bool UMLListView::isUnique( UMLListViewItem * item, const TQString &name ) { - UMLListViewItem * parentItem = static_cast<UMLListViewItem *>( item -> parent() ); + UMLListViewItem * tqparentItem = static_cast<UMLListViewItem *>( item -> tqparent() ); Uml::ListView_Type type = item -> getType(); switch( type ) { case Uml::lvt_Class_Diagram: @@ -2284,13 +2283,13 @@ bool UMLListView::isUnique( UMLListViewItem * item, const TQString &name ) { case Uml::lvt_Deployment_Folder: case Uml::lvt_EntityRelationship_Folder: { - Uml::ListView_Type lvt = parentItem->getType(); + Uml::ListView_Type lvt = tqparentItem->getType(); if (!Model_Utils::typeIsContainer(lvt)) return (m_doc->findUMLObject(name) == NULL); - UMLPackage *pkg = static_cast<UMLPackage*>(parentItem->getUMLObject()); + UMLPackage *pkg = static_cast<UMLPackage*>(tqparentItem->getUMLObject()); if (pkg == NULL) { kError() << "UMLListView::isUnique: internal error - " - << "parent listviewitem is package but has no UMLObject" << endl; + << "tqparent listviewitem is package but has no UMLObject" << endl; return true; } return (pkg->findObject(name) == NULL); @@ -2303,8 +2302,8 @@ bool UMLListView::isUnique( UMLListViewItem * item, const TQString &name ) { case Uml::lvt_Operation: case Uml::lvt_EnumLiteral: { - UMLClassifier *parent = static_cast<UMLClassifier*>(parentItem->getUMLObject()); - return (parent->findChildObject(name) == NULL); + UMLClassifier *tqparent = static_cast<UMLClassifier*>(tqparentItem->getUMLObject()); + return (tqparent->findChildObject(name) == NULL); break; } @@ -2356,7 +2355,7 @@ bool UMLListView::loadFromXMI( TQDomElement & element ) { return true; } -bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & element ) { +bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement & element ) { TQDomNode node = element.firstChild(); TQDomElement domElement = node.toElement(); const TQString pfx("UMLListView::loadChildrenFromXMI: "); @@ -2379,7 +2378,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & UMLListViewItem * item = 0; if (nID != Uml::id_None) { // The following is an ad hoc hack for the copy/paste code. - // The clip still contains the old children although new + // The clip still contains the old tqchildren although new // UMLCLassifierListItems have already been created. // If the IDChangeLog finds new IDs this means we are in // copy/paste and need to adjust the child listitems to the @@ -2401,19 +2400,19 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & label = pObject->getName(); } else if (Model_Utils::typeIsFolder(lvType)) { // Synthesize the UMLFolder here - UMLObject *umlParent = parent->getUMLObject(); - UMLPackage *parentPkg = dynamic_cast<UMLPackage*>(umlParent); - if (parentPkg == NULL) { + UMLObject *umlParent = tqparent->getUMLObject(); + UMLPackage *tqparentPkg = dynamic_cast<UMLPackage*>(umlParent); + if (tqparentPkg == NULL) { kError() << pfx << "umlParent(" << umlParent << ") is not a UMLPackage" << endl; domElement = node.toElement(); continue; } UMLFolder *f = new UMLFolder(label, nID); - f->setUMLPackage(parentPkg); - parentPkg->addObject(f); + f->setUMLPackage(tqparentPkg); + tqparentPkg->addObject(f); pObject = f; - item = new UMLListViewItem(parent, label, lvType, pObject); + item = new UMLListViewItem(tqparent, label, lvType, pObject); // Moving all relevant UMLObjects to the new UMLFolder is done below, // in the switch(lvType) } @@ -2455,7 +2454,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & << "findItem(id " << ID2STR(nID) << ") returns NULL" << endl; /* if (pObject && pObject->getUMLPackage() && - parent->getType() != Uml::lvt_Package) { + tqparent->getType() != Uml::lvt_Package) { // Pre-1.2 file format: // Objects were not nested in their packages. // Synthesize the nesting here. @@ -2464,17 +2463,17 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & if (pkgItem == NULL) { kDebug() << pfx << "synthesizing ListViewItem for package " << ID2STR(umlpkg->getID()) << endl; - pkgItem = new UMLListViewItem(parent, umlpkg->getName(), + pkgItem = new UMLListViewItem(tqparent, umlpkg->getName(), Uml::lvt_Package, umlpkg); pkgItem->setOpen(true); } item = new UMLListViewItem(pkgItem, label, lvType, pObject); } else { - item = new UMLListViewItem(parent, label, lvType, pObject); + item = new UMLListViewItem(tqparent, label, lvType, pObject); } */ } - else if (parent != item->parent()) { + else if (tqparent != item->tqparent()) { // The existing item was created by the slot event triggered // by the loading of the corresponding model object from the // XMI file. @@ -2482,23 +2481,23 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & // of foreign XMI files that do not have the umbrello specific // <listview> tag. // However, now that we encountered the real <listview> info, - // we need to delete the existing item: Its parent is always + // we need to delete the existing item: Its tqparent is always // one of the default predefined folders, but the actual // listview item might be located in a user created folder. // Thanks to Achim Spangler for spotting the problem. - UMLListViewItem *itmParent = dynamic_cast<UMLListViewItem*>(item->parent()); - kDebug() << pfx << item->getText() << " parent " - << parent->getText() << " (" << parent << ") != " + UMLListViewItem *itmParent = dynamic_cast<UMLListViewItem*>(item->tqparent()); + kDebug() << pfx << item->getText() << " tqparent " + << tqparent->getText() << " (" << tqparent << ") != " << itmParent->getText() << " (" << itmParent << ")" << endl; if (item == m_datatypeFolder && itmParent == m_lv[Uml::mt_Logical]) { - kDebug() << pfx << "Reparenting the Datatypes folder is prohibited" << endl; + kDebug() << pfx << "Retqparenting the Datatypes folder is prohibited" << endl; } else { - UMLListViewItem *newItem = moveObject(nID, lvType, parent); + UMLListViewItem *newItem = moveObject(nID, lvType, tqparent); item = newItem; if (item) { kDebug() << pfx << "Attempted reparenting of " << item->getText() - << "(current parent: " << (itmParent ? itmParent->getText() : "NULL") - << ", new parent: " << parent->getText() << ")" << endl; + << "(current tqparent: " << (itmParent ? itmParent->getText() : "NULL") + << ", new tqparent: " << tqparent->getText() << ")" << endl; } } } @@ -2512,9 +2511,9 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & if (item == NULL) { kDebug() << pfx << "item " << ID2STR(nID) << " (of type " << lvType << ") does not yet exist..." << endl; - UMLObject* umlObject = parent->getUMLObject(); + UMLObject* umlObject = tqparent->getUMLObject(); if (!umlObject) { - kDebug() << "And also the parent->getUMLObject() does not exist" << endl; + kDebug() << "And also the tqparent->getUMLObject() does not exist" << endl; return false; } if (nID == Uml::id_None) { @@ -2526,7 +2525,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & if (umlObject) { connectNewObjectsSlots(umlObject); label = umlObject->getName(); - item = new UMLListViewItem( parent, label, lvType, umlObject); + item = new UMLListViewItem( tqparent, label, lvType, umlObject); } else { kDebug() << pfx << "lvtype " << lvType << " child object " << ID2STR(nID) << " not found" << endl; @@ -2557,7 +2556,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & break; default: if (Model_Utils::typeIsDiagram(lvType)) { - item = new UMLListViewItem( parent, label, lvType, nID ); + item = new UMLListViewItem( tqparent, label, lvType, nID ); } else { kError() << pfx << "INTERNAL ERROR: unexpected listview type " << lvType << " (ID " << ID2STR(nID) << ")" << endl; @@ -2635,14 +2634,14 @@ UMLListViewItem *UMLListView::rootView(Uml::ListView_Type type) { return theView; } -void UMLListView::deleteChildrenOf(TQListViewItem* parent) { - if ( !parent ) { +void UMLListView::deleteChildrenOf(TQListViewItem* tqparent) { + if ( !tqparent ) { return; } - if (parent == m_lv[Uml::mt_Logical]) + if (tqparent == m_lv[Uml::mt_Logical]) m_datatypeFolder = NULL; - while ( parent->firstChild() ) { - delete parent->firstChild(); + while ( tqparent->firstChild() ) { + delete tqparent->firstChild(); } } @@ -2687,7 +2686,7 @@ bool UMLListView::deleteItem(UMLListViewItem *temp) { } if (object) { m_doc->removeUMLObject(object); - // Physical deletion of `temp' will be done by Qt signal, see + // Physical deletion of `temp' will be done by TQt signal, see // UMLDoc::removeUMLObject() } else { delete temp; diff --git a/umbrello/umbrello/umllistview.h b/umbrello/umbrello/umllistview.h index ae9b3172..3420c1f4 100644 --- a/umbrello/umbrello/umllistview.h +++ b/umbrello/umbrello/umllistview.h @@ -43,15 +43,16 @@ class UMLClassifierListItem; class UMLListView : public KListView { Q_OBJECT + TQ_OBJECT public: /** * Constructs the tree view. * - * @param parent The parent to this. + * @param tqparent The tqparent to this. * @param name The internal name for this class. */ - UMLListView(TQWidget *parent,const char *name); + UMLListView(TQWidget *tqparent,const char *name); /** * Standard deconstructor. @@ -87,7 +88,7 @@ public: int getSelectedItems(UMLListViewItemList &ItemList); /** - * Get selected items, but only root elements selected (without children). + * Get selected items, but only root elements selected (without tqchildren). * * @param ItemList List of UMLListViewItems returned. * @return The number of selected items. @@ -105,41 +106,41 @@ public: * CHECK - This is perhaps redundant since the * UMLListViewItemData => UMLListViewItem merge. * Creates a new UMLListViewItem from a UMLListViewItem, if - * parent is null the ListView Decides who is going to be the - * parent + * tqparent is null the ListView Decides who is going to be the + * tqparent */ UMLListViewItem* createItem(UMLListViewItem& Data, IDChangeLog& IDChanges, - UMLListViewItem* parent = 0); + UMLListViewItem* tqparent = 0); /** - * Find the parent folder for a diagram. + * Find the tqparent folder for a diagram. * If the currently selected item in the list view is a folder - * then that folder is returned as the parent. + * then that folder is returned as the tqparent. * * @param dt The Diagram_Type of the diagram. * The type will only be used if there is no currently * selected item, or if the current item is not a folder. * In that case the root folder which is suitable for the * Diagram_Type is returned. - * @return Pointer to the parent UMLListViewItem for the diagram. + * @return Pointer to the tqparent UMLListViewItem for the diagram. */ UMLListViewItem *findFolderForDiagram(Uml::Diagram_Type dt); /** - * Determine the parent ListViewItem given an UMLObject. + * Determine the tqparent ListViewItem given an UMLObject. * - * @param object Pointer to the UMLObject for which to look up the parent. - * @return Pointer to the parent UMLListViewItem chosen. - * Returns NULL on error (no parent could be determined.) + * @param object Pointer to the UMLObject for which to look up the tqparent. + * @return Pointer to the tqparent UMLListViewItem chosen. + * Returns NULL on error (no tqparent could be determined.) */ UMLListViewItem* determineParentItem(UMLObject* object) const; /** - * Determine the parent ListViewItem given a ListView_Type. - * This parent is used for creating new UMLListViewItems. + * Determine the tqparent ListViewItem given a ListView_Type. + * This tqparent is used for creating new UMLListViewItems. * - * @param lvt The ListView_Type for which to lookup the parent. - * @return Pointer to the parent UMLListViewItem chosen. + * @param lvt The ListView_Type for which to lookup the tqparent. + * @return Pointer to the tqparent UMLListViewItem chosen. */ UMLListViewItem* determineParentItem(Uml::ListView_Type lvt) const; @@ -168,11 +169,11 @@ public: } /** - * Adds a new item to the tree of the given type under the given parent. + * Adds a new item to the tree of the given type under the given tqparent. * Method will take care of signalling anyone needed on creation of new item. * e.g. UMLDoc if an UMLObject is created. */ - void addNewItem(UMLListViewItem * parent, Uml::ListView_Type type); + void addNewItem(UMLListViewItem * tqparent, Uml::ListView_Type type); /** * Find an UMLObject in the listview. @@ -259,7 +260,7 @@ public: /** * Moves an object given is unique ID and listview type to an - * other listview parent item. + * other listview tqparent item. * Also takes care of the corresponding move in the model. */ UMLListViewItem * moveObject(Uml::IDType srcId, Uml::ListView_Type srcType, @@ -285,7 +286,7 @@ public: * predefined root views (Root, Logical, UseCase, Component, * Deployment, EntityRelationship.) Returns the ListView_Type * of the matching root view; if no match then continues the - * search using the item's parent, then grandparent, and so forth. + * search using the item's tqparent, then grandtqparent, and so forth. * Returns Uml::lvt_Unknown if no match at all is found. */ Uml::ListView_Type rootViewType(UMLListViewItem *item); @@ -294,7 +295,7 @@ public: bool loadFromXMI( TQDomElement & element ); - bool loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & element ); + bool loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement & element ); protected: UMLListViewItem* m_rv; // root view (home) @@ -342,9 +343,9 @@ protected: void loadPixmaps(); /** - * Deletes all child-items of @p parent. + * Deletes all child-items of @p tqparent. */ - void deleteChildrenOf( TQListViewItem *parent ); + void deleteChildrenOf( TQListViewItem *tqparent ); /** * Delete a listview item. @@ -356,18 +357,18 @@ protected: /** * Adds a new operation, attribute or template item to a classifier, identical to - * childObjectAdded(obj) but with an explicit parent. + * childObjectAdded(obj) but with an explicit tqparent. * @param child the child object - * @param parent the parent object + * @param tqparent the tqparent object */ - void childObjectAdded(UMLClassifierListItem* child, UMLClassifier* parent); + void childObjectAdded(UMLClassifierListItem* child, UMLClassifier* tqparent); /** * Auxiliary method for moveObject(): Adds the model object at the proper * new container (package if nested, UMLDoc if at global level), and * updates the containment relationships in the model. */ - void addAtContainer(UMLListViewItem *item, UMLListViewItem *parent); + void addAtContainer(UMLListViewItem *item, UMLListViewItem *tqparent); public slots: @@ -432,7 +433,7 @@ public slots: /** * Something has been dragged and dropped onto the list view */ - void slotDropped(TQDropEvent* de, TQListViewItem* parent, TQListViewItem* item); + void slotDropped(TQDropEvent* de, TQListViewItem* tqparent, TQListViewItem* item); /** * calls updateFolder() on the item to update the icon to open diff --git a/umbrello/umbrello/umllistviewitem.cpp b/umbrello/umbrello/umllistviewitem.cpp index 89bb581c..2c81fc0f 100644 --- a/umbrello/umbrello/umllistviewitem.cpp +++ b/umbrello/umbrello/umllistviewitem.cpp @@ -39,10 +39,10 @@ UMLListView* UMLListViewItem::s_pListView = 0; -UMLListViewItem::UMLListViewItem( UMLListView * parent, const TQString &name, +UMLListViewItem::UMLListViewItem( UMLListView * tqparent, const TQString &name, Uml::ListView_Type t, UMLObject* o) - : TQListViewItem(parent, name) { - init(parent); + : TQListViewItem(tqparent, name) { + init(tqparent); m_Type = t; m_pObject = o; if (o) @@ -52,20 +52,20 @@ UMLListViewItem::UMLListViewItem( UMLListView * parent, const TQString &name, setRenameEnabled( 0, false ); } -UMLListViewItem::UMLListViewItem(UMLListView * parent) - : TQListViewItem(parent) { - init(parent); - if (parent == NULL) - kDebug() << "UMLListViewItem constructor called with a NULL listview parent" << endl; +UMLListViewItem::UMLListViewItem(UMLListView * tqparent) + : TQListViewItem(tqparent) { + init(tqparent); + if (tqparent == NULL) + kDebug() << "UMLListViewItem constructor called with a NULL listview tqparent" << endl; } -UMLListViewItem::UMLListViewItem(UMLListViewItem * parent) - : TQListViewItem(parent) { +UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent) + : TQListViewItem(tqparent) { init(); } -UMLListViewItem::UMLListViewItem(UMLListViewItem * parent, const TQString &name, Uml::ListView_Type t,UMLObject*o) - : TQListViewItem(parent, name) { +UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent, const TQString &name, Uml::ListView_Type t,UMLObject*o) + : TQListViewItem(tqparent, name) { init(); m_Type = t; m_pObject = o; @@ -75,7 +75,7 @@ UMLListViewItem::UMLListViewItem(UMLListViewItem * parent, const TQString &name, } else { UMLClassifierListItem *umlchild = dynamic_cast<UMLClassifierListItem*>(o); if (umlchild) - parent->addClassifierListItem(umlchild, this); + tqparent->addClassifierListItem(umlchild, this); updateObject(); m_nId = o->getID(); } @@ -83,8 +83,8 @@ UMLListViewItem::UMLListViewItem(UMLListViewItem * parent, const TQString &name, setText( name ); } -UMLListViewItem::UMLListViewItem(UMLListViewItem * parent, const TQString &name, Uml::ListView_Type t,Uml::IDType id) - : TQListViewItem(parent, name) { +UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent, const TQString &name, Uml::ListView_Type t,Uml::IDType id) + : TQListViewItem(tqparent, name) { init(); m_Type = t; m_nId = id; @@ -127,16 +127,16 @@ UMLListViewItem::UMLListViewItem(UMLListViewItem * parent, const TQString &name, UMLListViewItem::~UMLListViewItem() {} -void UMLListViewItem::init(UMLListView * parent) { +void UMLListViewItem::init(UMLListView * tqparent) { m_Type = Uml::lvt_Unknown; m_bCreating = false; m_pObject = NULL; m_nId = Uml::id_None; m_nChildren = 0; - if (s_pListView == NULL && parent != NULL) { + if (s_pListView == NULL && tqparent != NULL) { kDebug() << "UMLListViewItem::init: s_pListView still NULL, setting it now " << endl; - s_pListView = parent; + s_pListView = tqparent; } } @@ -182,7 +182,7 @@ bool UMLListViewItem::isOwnParent(Uml::IDType listViewItemID) { << ID2STR(listViewItemID) << ") returns NULL" << endl; return true; } - for (TQListViewItem *self = (TQListViewItem*)this; self; self = self->parent()) { + for (TQListViewItem *self = (TQListViewItem*)this; self; self = self->tqparent()) { if (lvi == self) return true; } @@ -331,9 +331,9 @@ void UMLListViewItem::okRename( int col ) { return; } UMLOperation *op = static_cast<UMLOperation*>(m_pObject); - UMLClassifier *parent = static_cast<UMLClassifier *>( op -> parent() ); + UMLClassifier *tqparent = static_cast<UMLClassifier *>( op -> tqparent() ); Model_Utils::OpDescriptor od; - Model_Utils::Parse_Status st = Model_Utils::parseOperation(newText, od, parent); + Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(newText, od, tqparent); if (st == Model_Utils::PS_OK) { // TODO: Check that no operation with the exact same profile exists. op->setName( od.m_name ); @@ -382,13 +382,13 @@ void UMLListViewItem::okRename( int col ) { cancelRenameWithMsg(); return; } - UMLClassifier *parent = static_cast<UMLClassifier*>(m_pObject->parent()); + UMLClassifier *tqparent = static_cast<UMLClassifier*>(m_pObject->tqparent()); Model_Utils::NameAndType nt; Uml::Visibility vis; - Model_Utils::Parse_Status st; - st = Model_Utils::parseAttribute(newText, nt, parent, &vis); + Model_Utils::Parse_tqStatus st; + st = Model_Utils::parseAttribute(newText, nt, tqparent, &vis); if (st == Model_Utils::PS_OK) { - UMLObject *exists = parent->findChildObject(newText); + UMLObject *exists = tqparent->findChildObject(newText); if (exists) { cancelRenameWithMsg(); return; @@ -415,11 +415,11 @@ void UMLListViewItem::okRename( int col ) { cancelRenameWithMsg(); return; } - UMLClassifier *parent = static_cast<UMLClassifier*>(m_pObject->parent()); + UMLClassifier *tqparent = static_cast<UMLClassifier*>(m_pObject->tqparent()); Model_Utils::NameAndType nt; - Model_Utils::Parse_Status st = Model_Utils::parseTemplate(newText, nt, parent); + Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(newText, nt, tqparent); if (st == Model_Utils::PS_OK) { - UMLObject *exists = parent->findChildObject(newText); + UMLObject *exists = tqparent->findChildObject(newText); if (exists) { cancelRenameWithMsg(); return; @@ -465,7 +465,7 @@ void UMLListViewItem::okRename( int col ) { } default: KMessageBox::error( kapp->mainWidget() , - i18n("Renaming an item of listview type %1 is not yet implemented.").arg(m_Type), + i18n("Renaming an item of listview type %1 is not yet implemented.").tqarg(m_Type), i18n("Function Not Implemented") ); TQListViewItem::setText(0, m_Label); break; @@ -521,8 +521,8 @@ int UMLListViewItem::compare(TQListViewItem *other, int col, bool ascending) con #endif return retval; } - UMLClassifier *ourParent = dynamic_cast<UMLClassifier*>(m_pObject->parent()); - UMLClassifier *otherParent = dynamic_cast<UMLClassifier*>(otherObj->parent()); + UMLClassifier *ourParent = dynamic_cast<UMLClassifier*>(m_pObject->tqparent()); + UMLClassifier *otherParent = dynamic_cast<UMLClassifier*>(otherObj->tqparent()); if (ourParent == NULL) { retval = (subItem ? 1 : alphaOrder); #ifdef DEBUG_LVITEM_INSERTION_ORDER @@ -561,8 +561,8 @@ int UMLListViewItem::compare(TQListViewItem *other, int col, bool ascending) con return retval; } UMLClassifierListItemList items = ourParent->getFilteredList(thisUmlItem->getBaseType()); - int myIndex = items.findRef(thisUmlItem); - int otherIndex = items.findRef(otherUmlItem); + int myIndex = items.tqfindRef(thisUmlItem); + int otherIndex = items.tqfindRef(otherUmlItem); if (myIndex < 0) { retval = (subItem ? -1 : alphaOrder); kError() << dbgPfx << retval << " because (myIndex < 0)" << endl; @@ -607,7 +607,7 @@ UMLListViewItem* UMLListViewItem::findUMLObject(const UMLObject *o) { } UMLListViewItem* UMLListViewItem::findChildObject(UMLClassifierListItem *cli) { - ChildObjectMap::iterator it = m_comap.find(cli); + ChildObjectMap::iterator it = m_comap.tqfind(cli); if (it != m_comap.end()) { return *it; } diff --git a/umbrello/umbrello/umllistviewitem.h b/umbrello/umbrello/umllistviewitem.h index 1064befc..105b751e 100644 --- a/umbrello/umbrello/umllistviewitem.h +++ b/umbrello/umbrello/umllistviewitem.h @@ -38,46 +38,46 @@ public: /** * Sets up an instance. * - * @param parent The parent to this instance. + * @param tqparent The tqparent to this instance. * @param name The name of this instance. * @param t The type of this instance. * @param o The object it represents. */ - UMLListViewItem(UMLListView * parent, const TQString &name, Uml::ListView_Type t, UMLObject*o=0); + UMLListViewItem(UMLListView * tqparent, const TQString &name, Uml::ListView_Type t, UMLObject*o=0); /** * Sets up an instance for subsequent loadFromXMI(). * - * @param parent The parent to this instance. + * @param tqparent The tqparent to this instance. */ - UMLListViewItem(UMLListView * parent); + UMLListViewItem(UMLListView * tqparent); /** * Sets up an instance for subsequent loadFromXMI(). * - * @param parent The parent to this instance. + * @param tqparent The tqparent to this instance. */ - UMLListViewItem(UMLListViewItem * parent); + UMLListViewItem(UMLListViewItem * tqparent); /** * Sets up an instance. * - * @param parent The parent to this instance. + * @param tqparent The tqparent to this instance. * @param name The name of this instance. * @param t The type of this instance. * @param o The object it represents. */ - UMLListViewItem(UMLListViewItem * parent, const TQString &name, Uml::ListView_Type t, UMLObject*o=0); + UMLListViewItem(UMLListViewItem * tqparent, const TQString &name, Uml::ListView_Type t, UMLObject*o=0); /** * Sets up an instance. * - * @param parent The parent to this instance. + * @param tqparent The tqparent to this instance. * @param name The name of this instance. * @param t The type of this instance. * @param id The id of this instance. */ - UMLListViewItem(UMLListViewItem * parent, const TQString &name, Uml::ListView_Type t, Uml::IDType id); + UMLListViewItem(UMLListViewItem * tqparent, const TQString &name, Uml::ListView_Type t, Uml::IDType id); /** * Standard deconstructor. @@ -126,7 +126,7 @@ public: } /** - * Returns true if the UMLListViewItem of the given ID is a parent of + * Returns true if the UMLListViewItem of the given ID is a tqparent of * this UMLListViewItem. */ bool isOwnParent(Uml::IDType listViewItemID); @@ -190,7 +190,7 @@ public: virtual int compare(TQListViewItem *other, int col, bool ascending) const; /** - * Returns the number of children of the UMLListViewItem + * Returns the number of tqchildren of the UMLListViewItem * containing this object */ int childCount() const { @@ -199,7 +199,7 @@ public: /** * Create a deep copy of this UMLListViewItem, but using the - * given parent instead of the parent of this UMLListViewItem. + * given tqparent instead of the tqparent of this UMLListViewItem. * Return the new UMLListViewItem created. */ UMLListViewItem* deepCopy(UMLListViewItem *newParent); @@ -213,7 +213,7 @@ public: /** * Find the UMLListViewItem that represents the given UMLClassifierListItem - * in the children of the current UMLListViewItem. (Only makes sense if + * in the tqchildren of the current UMLListViewItem. (Only makes sense if * the current UMLListViewItem represents a UMLClassifier.) * Return a pointer to the item or NULL if not found. */ @@ -243,7 +243,7 @@ protected: /** * Initializes key variables of the class. */ - void init(UMLListView * parent = 0); + void init(UMLListView * tqparent = 0); /** * This function is called if the user presses Enter during in-place renaming diff --git a/umbrello/umbrello/umlnamespace.cpp b/umbrello/umbrello/umlnamespace.cpp index 45c40de6..391b0560 100644 --- a/umbrello/umbrello/umlnamespace.cpp +++ b/umbrello/umbrello/umlnamespace.cpp @@ -18,7 +18,7 @@ bool tagEq (const TQString& inTag, const TQString& inPattern) { TQString tag = inTag; TQString pattern = inPattern; tag.remove( TQRegExp("^\\w+:") ); // remove leading "UML:" or other - int patSections = pattern.contains( '.' ) + 1; + int patSections = pattern.tqcontains( '.' ) + 1; TQString tagEnd = tag.section( '.', -patSections ); return (tagEnd.lower() == pattern.lower()); } diff --git a/umbrello/umbrello/umlobject.cpp b/umbrello/umbrello/umlobject.cpp index 85de579f..776847d4 100644 --- a/umbrello/umbrello/umlobject.cpp +++ b/umbrello/umbrello/umlobject.cpp @@ -30,8 +30,8 @@ #include "docwindow.h" #include "dialogs/classpropdlg.h" -UMLObject::UMLObject(const UMLObject * parent, const TQString &name, Uml::IDType id) - : TQObject(const_cast<UMLObject*>(parent), "UMLObject" ) { +UMLObject::UMLObject(const UMLObject * tqparent, const TQString &name, Uml::IDType id) + : TQObject(const_cast<UMLObject*>(tqparent), "UMLObject" ) { init(); if (id == Uml::id_None) m_nId = UniqueID::gen(); @@ -50,8 +50,8 @@ UMLObject::UMLObject(const TQString &name, Uml::IDType id) m_Name = name; } -UMLObject::UMLObject(const UMLObject * parent) - : TQObject(const_cast<UMLObject*>(parent)) { +UMLObject::UMLObject(const UMLObject * tqparent) + : TQObject(const_cast<UMLObject*>(tqparent)) { init(); } @@ -200,9 +200,9 @@ void UMLObject::copyInto(UMLObject *rhs) const // Create a new ID. rhs->m_nId = UniqueID::gen(); - // Hope that the parent from TQObject is okay. - if (rhs->parent() != parent()) - kDebug() << "copyInto has a wrong parent" << endl; + // Hope that the tqparent from TQObject is okay. + if (rhs->tqparent() != tqparent()) + kDebug() << "copyInto has a wrong tqparent" << endl; } @@ -343,7 +343,7 @@ TQString UMLObject::getPackage(const TQString& separator, bool includeRoot) { if (tempSeparator.isEmpty()) tempSeparator = UMLApp::app()->activeLanguageScopeSeparator(); TQString fqn = getFullyQualifiedName(tempSeparator, includeRoot); - if (!fqn.contains(tempSeparator)) + if (!fqn.tqcontains(tempSeparator)) return ""; TQString scope = fqn.left(fqn.length() - tempSeparator.length() - m_Name.length()); return scope; @@ -448,7 +448,7 @@ bool UMLObject::resolveRef() { } // Work around Object_Factory::createUMLObject()'s incapability // of on-the-fly scope creation: - if (m_SecondaryId.contains("::")) { + if (m_SecondaryId.tqcontains("::")) { // TODO: Merge Import_Utils::createUMLObject() into Object_Factory::createUMLObject() m_pSecondary = Import_Utils::createUMLObject(Uml::ot_UMLObject, m_SecondaryId, m_pUMLPackage); if (m_pSecondary) { @@ -472,8 +472,8 @@ bool UMLObject::resolveRef() { // This is very C++ specific - we rely on some '*' or // '&' to decide it's a ref type. Plus, we don't recognize // typedefs of ref types. - bool isReferenceType = ( m_SecondaryId.contains('*') || - m_SecondaryId.contains('&') ); + bool isReferenceType = ( m_SecondaryId.tqcontains('*') || + m_SecondaryId.tqcontains('&') ); Uml::Object_Type ot = Uml::ot_Class; if (isReferenceType) { ot = Uml::ot_Datatype; @@ -721,15 +721,15 @@ bool UMLObject::loadFromXMI( TQDomElement & element) { m_BaseType != Uml::ot_Template && m_BaseType != Uml::ot_Stereotype && m_BaseType != Uml::ot_Role) { if (m_bInPaste) { - m_pUMLPackage = NULL; // forget any old parent + m_pUMLPackage = NULL; // forget any old tqparent UMLListView *listView = UMLApp::app()->getListView(); - UMLListViewItem *parentItem = (UMLListViewItem*)listView->currentItem(); - if (parentItem) { - Uml::ListView_Type lvt = parentItem->getType(); + UMLListViewItem *tqparentItem = (UMLListViewItem*)listView->currentItem(); + if (tqparentItem) { + Uml::ListView_Type lvt = tqparentItem->getType(); if (Model_Utils::typeIsContainer(lvt) || lvt == Uml::lvt_Class || lvt == Uml::lvt_Interface) { - UMLObject *o = parentItem->getUMLObject(); + UMLObject *o = tqparentItem->getUMLObject(); m_pUMLPackage = static_cast<UMLPackage*>( o ); } } diff --git a/umbrello/umbrello/umlobject.h b/umbrello/umbrello/umlobject.h index 56475807..727ec1d9 100644 --- a/umbrello/umbrello/umlobject.h +++ b/umbrello/umbrello/umlobject.h @@ -35,24 +35,25 @@ class UMLObject; */ class UMLObject : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Creates a UMLObject. * - * @param parent The parent of the object. + * @param tqparent The tqparent of the object. * @param name The name of the object. * @param id The ID of the object (optional.) If omitted * then a new ID will be assigned internally. */ - UMLObject(const UMLObject * parent, const TQString &name, Uml::IDType id = Uml::id_None); + UMLObject(const UMLObject * tqparent, const TQString &name, Uml::IDType id = Uml::id_None); /** * Creates a UMLObject. * - * @param parent The parent of the object. + * @param tqparent The tqparent of the object. */ - UMLObject(const UMLObject * parent); + UMLObject(const UMLObject * tqparent); /** * Creates a UMLObject with a given name and unique ID. @@ -196,7 +197,7 @@ public: * Default: false. * @return The UMLObject's enclosing package(s) as a text. */ - TQString getPackage(const TQString& separator = TQString::null, + TQString getPackage(const TQString& separator = TQString(), bool includeRoot = false); /** @@ -242,7 +243,7 @@ public: * See UMLDoc::getRootFolder(). Default: false. * @return The fully qualified name of this UMLObject. */ - virtual TQString getFullyQualifiedName(const TQString& separator = TQString::null, + virtual TQString getFullyQualifiedName(const TQString& separator = TQString(), bool includeRoot = false) const; /** @@ -378,7 +379,7 @@ public slots: signals: /** Emitted when the UMLObject has changed. Note that some objects emit - * this signal when one of its children changes, for example, a UMLClass + * this signal when one of its tqchildren changes, for example, a UMLClass * emits a modified() signal when one of its operation changes while the Operation * itself emits the corresponding signal as well. */ diff --git a/umbrello/umbrello/umlrole.cpp b/umbrello/umbrello/umlrole.cpp index ca33dffb..5543415f 100644 --- a/umbrello/umbrello/umlrole.cpp +++ b/umbrello/umbrello/umlrole.cpp @@ -23,10 +23,10 @@ // constructor -UMLRole::UMLRole(UMLAssociation * parent, UMLObject * parentObj, Uml::Role_Type role) - : UMLObject(const_cast<UMLAssociation*>(parent)) +UMLRole::UMLRole(UMLAssociation * tqparent, UMLObject * tqparentObj, Uml::Role_Type role) + : UMLObject(const_cast<UMLAssociation*>(tqparent)) { - init(parent, parentObj, role); + init(tqparent, tqparentObj, role); } UMLRole::~UMLRole() { } @@ -59,9 +59,9 @@ TQString UMLRole::getMultiplicity() const { } void UMLRole::setObject (UMLObject *obj) { - // because we will get the id of this role from the parent + // because we will get the id of this role from the tqparent // object, we CANT allow UMLRoles to take other UMLRoles as - // parent objects. In fact, there is probably good reason + // tqparent objects. In fact, there is probably good reason // to only take UMLClassifiers here, but I'll leave it more open // for the time being. -b.t. if (obj && dynamic_cast<UMLRole*>(obj)) { @@ -88,17 +88,17 @@ Uml::Role_Type UMLRole::getRole() { return m_role; } -void UMLRole::init(UMLAssociation * parent, UMLObject * parentObj, Uml::Role_Type r) { +void UMLRole::init(UMLAssociation * tqparent, UMLObject * tqparentObj, Uml::Role_Type r) { m_BaseType = Uml::ot_Role; m_role = r; - m_pAssoc = parent; - m_pSecondary = parentObj; + m_pAssoc = tqparent; + m_pSecondary = tqparentObj; m_Multi = ""; m_Name = ""; m_Changeability = Uml::chg_Changeable; - // connect this up to parent - connect(this,TQT_SIGNAL(modified()),parent,TQT_SIGNAL(modified())); + // connect this up to tqparent + connect(this,TQT_SIGNAL(modified()),tqparent,TQT_SIGNAL(modified())); } void UMLRole::saveToXMI( TQDomDocument & qDoc, TQDomElement & qElement ) { @@ -110,7 +110,7 @@ void UMLRole::saveToXMI( TQDomDocument & qDoc, TQDomElement & qElement ) { << "): m_pSecondary is NULL" << endl; if (!m_Multi.isEmpty()) roleElement.setAttribute("multiplicity", m_Multi); - if (m_role == Uml::A) { // role aggregation based on parent type + if (m_role == Uml::A) { // role aggregation based on tqparent type // role A switch (m_pAssoc->getAssocType()) { case Uml::at_Composition: @@ -268,8 +268,8 @@ bool UMLRole::load( TQDomElement & element ) { // Here comes the handling of the association type. // This is open for discussion - I'm pretty sure there are better ways.. - // Yeah, for one, setting the *parent* object parameters from here is sucky - // as hell. Why are we using roleA to store what is essentially a parent (association) + // Yeah, for one, setting the *tqparent* object parameters from here is sucky + // as hell. Why are we using roleA to store what is essentially a tqparent (association) // parameter, eh? The UML13.dtd is pretty silly, but since that is what // is driving us to that point, we have to go with it. Some analysis of // the component roles/linked items needs to be done in order to get things diff --git a/umbrello/umbrello/umlrole.h b/umbrello/umbrello/umlrole.h index 48e18049..4d750751 100644 --- a/umbrello/umbrello/umlrole.h +++ b/umbrello/umbrello/umlrole.h @@ -25,15 +25,16 @@ class UMLAssociation; class UMLRole : public UMLObject { Q_OBJECT + TQ_OBJECT public: /** * Sets up an association. * - * @param parent The parent (association) of this UMLRole. - * @param parentUMLObject The Parent UML Object of this UMLRole + * @param tqparent The tqparent (association) of this UMLRole. + * @param tqparentUMLObject The Parent UML Object of this UMLRole * @param role The Uml::Role_Type of this UMLRole */ - UMLRole (UMLAssociation * parent, UMLObject * parentUMLObject, Uml::Role_Type role); + UMLRole (UMLAssociation * tqparent, UMLObject * tqparentUMLObject, Uml::Role_Type role); /** * Overloaded '==' operator @@ -88,7 +89,7 @@ public: UMLAssociation * getParentAssociation (); - /** get the 'id' of the role (NOT the parent object). This could be + /** get the 'id' of the role (NOT the tqparent object). This could be * either Uml::A or Uml::B. Yes, it would be better if we * could get along without this, but we need it to distinguish saved * umlrole objects in the XMI for 'self' associations where both roles @@ -117,7 +118,7 @@ protected: private: /** do some initialization at construction time */ - void init (UMLAssociation * parent, UMLObject * parentObj, Uml::Role_Type r); + void init (UMLAssociation * tqparent, UMLObject * tqparentObj, Uml::Role_Type r); UMLAssociation * m_pAssoc; Uml::Role_Type m_role; diff --git a/umbrello/umbrello/umlview.cpp b/umbrello/umbrello/umlview.cpp index 35ee3a77..c7b76087 100644 --- a/umbrello/umbrello/umlview.cpp +++ b/umbrello/umbrello/umlview.cpp @@ -16,7 +16,7 @@ #include <climits> #include <math.h> -// include files for Qt +// include files for TQt #include <tqpixmap.h> #include <tqpicture.h> #include <tqprinter.h> @@ -95,7 +95,7 @@ #include "toolbarstatefactory.h" -// control the manual DoubleBuffering of QCanvas +// control the manual DoubleBuffering of TQCanvas // with a define, so that this memory X11 effect can // be tested more easily #define MANUAL_CONTROL_DOUBLE_BUFFERING @@ -107,10 +107,10 @@ using namespace Uml; // constructor -UMLView::UMLView(UMLFolder *parentFolder) : TQCanvasView(UMLApp::app()->getMainViewWidget()) { +UMLView::UMLView(UMLFolder *tqparentFolder) : TQCanvasView(UMLApp::app()->getMainViewWidget()) { init(); m_pDoc = UMLApp::app()->getDocument(); - m_pFolder = parentFolder; + m_pFolder = tqparentFolder; } void UMLView::init() { @@ -148,7 +148,7 @@ void UMLView::init() { m_pImageExporter = new UMLViewImageExporter(this); //setup graphical items - viewport() -> setBackgroundMode( Qt::NoBackground ); + viewport() -> setBackgroundMode( TQt::NoBackground ); setCanvas( new UMLViewCanvas( this ) ); // don't set the quite frequent update rate for each // diagram, as that causes also an update of invisible @@ -188,7 +188,7 @@ UMLView::~UMLView() { // before we can delete the TQCanvas, all widgets must be explicitly // removed // otherwise the implicit remove of the contained widgets will cause - // events which would demand a valid connected QCanvas + // events which would demand a valid connected TQCanvas // ==> this causes umbrello to crash for some - larger?? - projects // first avoid all events, which would cause some update actions // on deletion of each removed widget @@ -198,7 +198,7 @@ UMLView::~UMLView() { delete m_pToolBarStateFactory; m_pToolBarStateFactory = NULL; - // Qt Doc for TQCanvasView::~TQCanvasView () states: + // TQt Doc for TQCanvasView::~TQCanvasView () states: // "Destroys the canvas view. The associated canvas is not deleted." // we should do it now delete canvas(); @@ -294,11 +294,11 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) { pPainter.translate(offsetX,offsetY); //draw foot note - TQString string = i18n("Diagram: %2 Page %1").arg(page + 1).arg(getName()); + TQString string = i18n("Diagram: %2 Page %1").tqarg(page + 1).tqarg(getName()); TQColor textColor(50, 50, 50); pPainter.setPen(textColor); pPainter.drawLine(0, height + 2, width, height + 2); - pPainter.drawText(0, height + 4, width, fontHeight, Qt::AlignLeft, string); + pPainter.drawText(0, height + 4, width, fontHeight, TQt::AlignLeft, string); if(pageX+1 < numPagesX || pageY+1 < numPagesY) { pPrinter -> newPage(); @@ -307,7 +307,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) { } } #else - // be gentle - as described in Qt-Doc "The Coordinate System" + // be gentle - as described in TQt-Doc "The Coordinate System" pPainter.save(); int diagramHeight = rect.height(); @@ -346,7 +346,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) { pPainter.setWindow( rect.x(), rect.y(), windowWidth, windowHeight ); // set viewport - the physical mapping - // --> Qt's TQPainter will map all drawed elements from diagram area ( window ) + // --> TQt's TQPainter will map all drawed elements from diagram area ( window ) // to printer area ( viewport ) pPainter.setViewport( left, top, width, height ); @@ -354,11 +354,11 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) { getDiagram(TQRect(rect.x(), rect.y(), windowWidth, diagramHeight), pPainter); //draw foot note - TQString string = i18n("Diagram: %2 Page %1").arg( 1).arg(getName()); + TQString string = i18n("Diagram: %2 Page %1").tqarg( 1).tqarg(getName()); TQColor textColor(50, 50, 50); pPainter.setPen(textColor); pPainter.drawLine(rect.x(), footTop , windowWidth, footTop); - pPainter.drawText(rect.x(), footTop + 3, windowWidth, fontHeight, Qt::AlignLeft, string); + pPainter.drawText(rect.x(), footTop + 3, windowWidth, fontHeight, TQt::AlignLeft, string); // now restore scaling pPainter.restore(); @@ -371,7 +371,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) { void UMLView::setupNewWidget(UMLWidget *w) { w->setX( m_Pos.x() ); w->setY( m_Pos.y() ); - w->setVisible( true ); + w->tqsetVisible( true ); w->setActivated(); w->setFont( getFont() ); w->slotColorChanged( getID() ); @@ -451,7 +451,7 @@ void UMLView::slotObjectCreated(UMLObject* o) { UMLWidget* newWidget = Widget_Factory::createWidget(this, o); if (newWidget == NULL) return; - newWidget->setVisible( true ); + newWidget->tqsetVisible( true ); newWidget->setActivated(); newWidget->setFont( getFont() ); newWidget->slotColorChanged( getID() ); @@ -687,7 +687,7 @@ void UMLView::checkMessages(ObjectWidget * w) { MessageWidget *obj; while ( (obj = it.current()) != 0 ) { ++it; - if(! obj -> contains(w)) + if(! obj -> tqcontains(w)) continue; //make sure message doesn't have any associations removeAssociations(obj); @@ -1149,19 +1149,19 @@ bool UMLView::isSavedInSeparateFile() { << "listView->findUMLObject(this) returns false" << endl; return false; } - UMLListViewItem *parentItem = dynamic_cast<UMLListViewItem*>( lvItem->parent() ); - if (parentItem == NULL) { + UMLListViewItem *tqparentItem = dynamic_cast<UMLListViewItem*>( lvItem->tqparent() ); + if (tqparentItem == NULL) { kError() << msgPrefix - << "parent item in listview is not a UMLListViewItem (?)" << endl; + << "tqparent item in listview is not a UMLListViewItem (?)" << endl; return false; } - const Uml::ListView_Type lvt = parentItem->getType(); + const Uml::ListView_Type lvt = tqparentItem->getType(); if (! Model_Utils::typeIsFolder(lvt)) return false; - UMLFolder *modelFolder = dynamic_cast<UMLFolder*>(parentItem->getUMLObject()); + UMLFolder *modelFolder = dynamic_cast<UMLFolder*>(tqparentItem->getUMLObject()); if (modelFolder == NULL) { kError() << msgPrefix - << "parent model object is not a UMLFolder (?)" << endl; + << "tqparent model object is not a UMLFolder (?)" << endl; return false; } TQString folderFile = modelFolder->getFolderFile(); @@ -1362,7 +1362,7 @@ void UMLView::activate() { continue; if (obj->activate()) { - obj->setVisible(true); + obj->tqsetVisible(true); } else { m_WidgetList.remove(obj); delete obj; @@ -1378,7 +1378,7 @@ void UMLView::activate() { continue; obj->activate(m_pDoc->getChangeLog()); - obj->setVisible( true ); + obj->tqsetVisible( true ); }//end while @@ -1791,7 +1791,7 @@ void UMLView::removeAssociations(UMLWidget* Widget) { AssociationWidget* assocwidget = 0; while((assocwidget=assoc_it.current())) { ++assoc_it; - if(assocwidget->contains(Widget)) { + if(assocwidget->tqcontains(Widget)) { removeAssoc(assocwidget); } } @@ -1882,7 +1882,7 @@ void UMLView::updateContainment(UMLCanvasObject *self) { if (self == NULL) return; // See if the object has a widget representation in this view. - // While we're at it, also see if the new parent has a widget here. + // While we're at it, also see if the new tqparent has a widget here. UMLWidget *selfWidget = NULL, *newParentWidget = NULL; UMLPackage *newParent = self->getUMLPackage(); for (UMLWidgetListIt wit(m_WidgetList); wit.current(); ++wit) { @@ -1955,8 +1955,8 @@ void UMLView::createAutoAssociations( UMLWidget * widget ) { // end if // end loop // end if - // if the UMLCanvasObject has a parentPackage then - // if the parentPackage has a widget representation on this view then + // if the UMLCanvasObject has a tqparentPackage then + // if the tqparentPackage has a widget representation on this view then // create the containment AssocWidget // end if // end if @@ -2060,7 +2060,7 @@ void UMLView::createAutoAssociations( UMLWidget * widget ) { if (w->getID() != id) continue; // if the containedWidget is not physically located inside this widget - if (widget->rect().contains(w->rect())) + if (widget->rect().tqcontains(w->rect())) continue; // create the containment AssocWidget AssociationWidget *a = new AssociationWidget(this, widget, @@ -2072,12 +2072,12 @@ void UMLView::createAutoAssociations( UMLWidget * widget ) { } } } - // if the UMLCanvasObject has a parentPackage then - UMLPackage *parent = umlObj->getUMLPackage(); - if (parent == NULL) + // if the UMLCanvasObject has a tqparentPackage then + UMLPackage *tqparent = umlObj->getUMLPackage(); + if (tqparent == NULL) return; - // if the parentPackage has a widget representation on this view then - Uml::IDType pkgID = parent->getID(); + // if the tqparentPackage has a widget representation on this view then + Uml::IDType pkgID = tqparent->getID(); UMLWidget *pWidget; UMLWidgetListIt wit(m_WidgetList); while ((pWidget = wit.current()) != NULL) { @@ -2085,7 +2085,7 @@ void UMLView::createAutoAssociations( UMLWidget * widget ) { if (pWidget->getID() == pkgID) break; } - if (pWidget == NULL || pWidget->rect().contains(widget->rect())) + if (pWidget == NULL || pWidget->rect().tqcontains(widget->rect())) return; // create the containment AssocWidget AssociationWidget *a = new AssociationWidget(this, pWidget, at_Containment, widget); @@ -2365,7 +2365,7 @@ void UMLView::setMenu() { if( menu != ListPopupMenu::mt_Undefined ) { m_pMenu = new ListPopupMenu(this, menu, this); connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); - m_pMenu->popup( mapToGlobal( contentsToViewport(worldMatrix().map(m_Pos)) ) ); + m_pMenu->popup( mapToGlobal( contentsToViewport(tqworldMatrix().map(m_Pos)) ) ); } } @@ -2797,17 +2797,17 @@ void UMLView::setZoom(int zoom) { } int UMLView::currentZoom() { - return (int)(worldMatrix().m11()*100.0); + return (int)(tqworldMatrix().m11()*100.0); } void UMLView::zoomIn() { - TQWMatrix wm = worldMatrix(); + TQWMatrix wm = tqworldMatrix(); wm.scale(1.5,1.5); // adjust zooming step here setZoom( (int)(wm.m11()*100.0) ); } void UMLView::zoomOut() { - TQWMatrix wm = worldMatrix(); + TQWMatrix wm = tqworldMatrix(); wm.scale(2.0/3.0, 2.0/3.0); //adjust zooming step here setZoom( (int)(wm.m11()*100.0) ); } @@ -3014,10 +3014,10 @@ bool UMLView::loadFromXMI( TQDomElement & qElement ) { TQString zoom = qElement.attribute( "zoom", "100" ); m_nZoom = zoom.toInt(); - TQString height = qElement.attribute( "canvasheight", TQString("%1").arg(UMLView::defaultCanvasSize) ); + TQString height = qElement.attribute( "canvasheight", TQString("%1").tqarg(UMLView::defaultCanvasSize) ); m_nCanvasHeight = height.toInt(); - TQString width = qElement.attribute( "canvaswidth", TQString("%1").arg(UMLView::defaultCanvasSize) ); + TQString width = qElement.attribute( "canvaswidth", TQString("%1").tqarg(UMLView::defaultCanvasSize) ); m_nCanvasWidth = width.toInt(); int nType = type.toInt(); @@ -3226,7 +3226,7 @@ bool UMLView::loadUisDiagramPresentation(TQDomElement & qElement) { while (!e.isNull()) { tag = e.tagName(); kDebug() << "Presentation: tag = " << tag << endl; - if (Uml::tagEq(tag, "Presentation.geometry")) { + if (Uml::tagEq(tag, "Presentation.tqgeometry")) { TQDomNode gnode = e.firstChild(); TQDomElement gelem = gnode.toElement(); TQString csv = gelem.text(); diff --git a/umbrello/umbrello/umlview.h b/umbrello/umbrello/umlview.h index 0a74331f..b6dad4fe 100644 --- a/umbrello/umbrello/umlview.h +++ b/umbrello/umbrello/umlview.h @@ -59,13 +59,14 @@ class ToolBarStateFactory; */ class UMLView : public TQCanvasView { Q_OBJECT + TQ_OBJECT public: friend class UMLViewImageExporterModel; /** * Constructor */ - UMLView(UMLFolder *parentFolder); + UMLView(UMLFolder *tqparentFolder); /** * Destructor @@ -705,7 +706,7 @@ public: void resetPastePoint(); /** - * Called by the view or any of its children when they start a cut + * Called by the view or any of its tqchildren when they start a cut * operation. */ void setStartedCut() { @@ -901,7 +902,7 @@ public: } /** - * Emit the sigRemovePopupMenu Qt signal. + * Emit the sigRemovePopupMenu TQt signal. */ void emitRemovePopupMenu() { emit sigRemovePopupMenu(); @@ -1119,7 +1120,7 @@ protected: UMLWidgetList m_SelectedList; /** - * Flag if view/children started cut operation. + * Flag if view/tqchildren started cut operation. */ bool m_bStartedCut; @@ -1151,7 +1152,7 @@ private: bool m_bActivated; /** - * Status of a popupmenu on view. + * tqStatus of a popupmenu on view. * true - a popup is on view */ bool m_bPopupShowing; diff --git a/umbrello/umbrello/umlviewcanvas.cpp b/umbrello/umbrello/umlviewcanvas.cpp index 134bdf47..a505b0bd 100644 --- a/umbrello/umbrello/umlviewcanvas.cpp +++ b/umbrello/umbrello/umlviewcanvas.cpp @@ -19,7 +19,7 @@ #include "umlview.h" -UMLViewCanvas::UMLViewCanvas( UMLView * pView ) : TQCanvas( pView ) { +UMLViewCanvas::UMLViewCanvas( UMLView * pView ) : TQCanvas( TQT_TQOBJECT(pView) ) { m_pView = pView; } @@ -28,7 +28,7 @@ UMLViewCanvas::~UMLViewCanvas() {} void UMLViewCanvas::drawBackground( TQPainter & painter, const TQRect & clip ) { TQCanvas::drawBackground( painter, clip ); if( m_pView -> getShowSnapGrid() ) { - painter.setPen( Qt::gray ); + painter.setPen( TQt::gray ); int gridX = m_pView -> getSnapX(); int gridY = m_pView -> getSnapY(); int numX = width() / gridX; diff --git a/umbrello/umbrello/umlviewimageexporter.cpp b/umbrello/umbrello/umlviewimageexporter.cpp index 4c474751..23164171 100644 --- a/umbrello/umbrello/umlviewimageexporter.cpp +++ b/umbrello/umbrello/umlviewimageexporter.cpp @@ -12,7 +12,7 @@ // own header #include "umlviewimageexporter.h" -// include files for Qt +// include files for TQt #include <tqstring.h> #include <tqstringlist.h> @@ -63,7 +63,7 @@ bool UMLViewImageExporter::prepareExportView() { // check if the file exists if (KIO::NetAccess::exists(m_imageURL, true, UMLApp::app())) { int wantSave = KMessageBox::warningContinueCancel(0, - i18n("The selected file %1 exists.\nDo you want to overwrite it?").arg(m_imageURL.prettyURL()), + i18n("The selected file %1 exists.\nDo you want to overwrite it?").tqarg(m_imageURL.prettyURL()), i18n("File Already Exists"), i18n("&Overwrite")); if (wantSave == KMessageBox::Continue) { exportPrepared = true; @@ -80,7 +80,7 @@ bool UMLViewImageExporter::getParametersFromUser() { UMLApp *app = UMLApp::app(); // configure & show the file dialog - KFileDialog fileDialog(TQString::null, TQString::null, m_view, + KFileDialog fileDialog(TQString(), TQString(), m_view, ":export-image", true); prepareFileDialog(fileDialog); fileDialog.exec(); diff --git a/umbrello/umbrello/umlviewimageexporterall.cpp b/umbrello/umbrello/umlviewimageexporterall.cpp index 9f80dad1..95801867 100644 --- a/umbrello/umbrello/umlviewimageexporterall.cpp +++ b/umbrello/umbrello/umlviewimageexporterall.cpp @@ -12,7 +12,7 @@ // own header #include "umlviewimageexporterall.h" -// include files for Qt +// include files for TQt #include <tqstring.h> #include <tqstringlist.h> #include <tqcheckbox.h> diff --git a/umbrello/umbrello/umlviewimageexportermodel.cpp b/umbrello/umbrello/umlviewimageexportermodel.cpp index 7f34c104..d99c85f4 100644 --- a/umbrello/umbrello/umlviewimageexportermodel.cpp +++ b/umbrello/umbrello/umlviewimageexportermodel.cpp @@ -15,7 +15,7 @@ // system includes #include <math.h> -// include files for Qt +// include files for TQt #include <tqstringlist.h> #include <tqrect.h> #include <tqimage.h> @@ -83,7 +83,7 @@ TQString UMLViewImageExporterModel::imageTypeToMimeType(const TQString& imageTyp if (TQString("xpm") == imgType) return "image/x-xpm"; if (TQString("eps") == imgType) return "image/x-eps"; if (TQString("svg") == imgType) return "image/svg+xml"; - return TQString::null; + return TQString(); } TQString UMLViewImageExporterModel::mimeTypeToImageType(const TQString& mimeType) { @@ -97,7 +97,7 @@ TQString UMLViewImageExporterModel::mimeTypeToImageType(const TQString& mimeType if (TQString("image/x-xpm") == mimeType) return "xpm"; if (TQString("image/x-eps") == mimeType) return "eps"; if (TQString("image/svg+xml") == mimeType) return "svg"; - return TQString::null; + return TQString(); } TQStringList UMLViewImageExporterModel::exportAllViews(const TQString &imageType, const KURL &directory, bool useFolders) const { @@ -123,7 +123,7 @@ TQStringList UMLViewImageExporterModel::exportAllViews(const TQString &imageType TQString UMLViewImageExporterModel::exportView(UMLView* view, const TQString &imageType, const KURL &url) const { // create the needed directories if (!prepareDirectory(url)) { - return i18n("Can not create directory: %1").arg(url.directory()); + return i18n("Can not create directory: %1").tqarg(url.directory()); } // The fileName will be used when exporting the image. If the url isn't local, @@ -148,19 +148,19 @@ TQString UMLViewImageExporterModel::exportView(UMLView* view, const TQString &im // exporting the view to the file if (!exportViewTo(view, imageType, fileName)) { tmpFile.unlink(); - return i18n("A problem occured while saving diagram in %1").arg(fileName); + return i18n("A problem occured while saving diagram in %1").tqarg(fileName); } // if the file wasn't local, upload the temp file to the target if (!url.isLocalFile()) { if (!KIO::NetAccess::upload(tmpFile.name(), url, UMLApp::app())) { tmpFile.unlink(); - return i18n("There was a problem saving file: %1").arg(url.path()); + return i18n("There was a problem saving file: %1").tqarg(url.path()); } } //!isLocalFile tmpFile.unlink(); - return TQString::null; + return TQString(); } TQString UMLViewImageExporterModel::getDiagramFileName(UMLView *view, const TQString &imageType, bool useFolders /* = false */) const { @@ -174,14 +174,14 @@ TQString UMLViewImageExporterModel::getDiagramFileName(UMLView *view, const TQSt UMLListView *listView = UMLApp::app()->getListView(); UMLListViewItem* listViewItem = listView->findItem(view->getID()); // skip the name of the first item because it's the View - listViewItem = static_cast<UMLListViewItem*>(listViewItem->parent()); + listViewItem = static_cast<UMLListViewItem*>(listViewItem->tqparent()); // Relies on the tree structure of the UMLListView. There are a base "Views" folder - // and five children, one for each view type (Logical, use case, components, deployment + // and five tqchildren, one for each view type (Logical, use case, components, deployment // and entity relationship) while (listView->rootView(listViewItem->getType()) == NULL) { name.insert(0, listViewItem->getText() + '/'); - listViewItem = static_cast<UMLListViewItem*>(listViewItem->parent()); + listViewItem = static_cast<UMLListViewItem*>(listViewItem->tqparent()); if (listViewItem == NULL) break; } @@ -193,7 +193,7 @@ bool UMLViewImageExporterModel::prepareDirectory(const KURL &url) const { KURL directory = url; directory.setPath(""); - // creates the directory and any needed parent directories + // creates the directory and any needed tqparent directories TQStringList dirs = TQStringList::split(TQDir::separator(), url.directory()); for (TQStringList::ConstIterator it = dirs.begin() ; it != dirs.end(); ++it ) { directory.addPath(*it); @@ -298,7 +298,7 @@ bool UMLViewImageExporterModel::fixEPS(const TQString &fileName, const TQRect& r const int pos = rx.search(fileContent); if (pos < 0) { kError() << "UMLViewImageExporterModel::fixEPS(" << fileName - << "): cannot find %%BoundingBox" << endl; + << "): cannot tqfind %%BoundingBox" << endl; return false; } @@ -319,8 +319,8 @@ bool UMLViewImageExporterModel::fixEPS(const TQString &fileName, const TQRect& r const int bottom = int(floor(epstop)) - rect.height() + 1; // modify content - fileContent.replace(pos,rx.cap(0).length(), - TQString("%%BoundingBox: %1 %2 %3 %4").arg(left).arg(bottom).arg(right).arg(top)); + fileContent.tqreplace(pos,rx.cap(0).length(), + TQString("%%BoundingBox: %1 %2 %3 %4").tqarg(left).tqarg(bottom).tqarg(right).tqarg(top)); ts << fileContent; epsfile.close(); diff --git a/umbrello/umbrello/umlviewimageexportermodel.h b/umbrello/umbrello/umlviewimageexportermodel.h index 1517d2d0..a7f0193d 100644 --- a/umbrello/umbrello/umlviewimageexportermodel.h +++ b/umbrello/umbrello/umlviewimageexportermodel.h @@ -56,7 +56,7 @@ public: * The supported image types are those that the diagrams can be exported to. * * @param imageType The type of the image. - * @return A TQString with the equivalent mime type, or TQString::null if + * @return A TQString with the equivalent mime type, or TQString() if * it's unknown. */ static TQString imageTypeToMimeType(const TQString& imageType); @@ -66,7 +66,7 @@ public: * The supported image types are those that the diagrams can be exported to. * * @param mimeType The mime type. - * @return A lowercase TQString with the equivalent image type, or TQString::null + * @return A lowercase TQString with the equivalent image type, or TQString() * if it's unknown. */ static TQString mimeTypeToImageType(const TQString& mimeType); @@ -120,7 +120,7 @@ public: * @param imageType The type of the image the view will be exported to. * @param url The url where the image will be saved. * @return The message error if some problem occurred when exporting, or - * TQString::null if all went fine. + * TQString() if all went fine. */ TQString exportView(UMLView* view, const TQString &imageType, const KURL &url) const; @@ -129,11 +129,11 @@ private: /** * Returns the name of the file where the view will be exported to. * The name of the exported images will be like their view's name and using the - * 'imageType' as extension. It can also include the parent folders of the view. + * 'imageType' as extension. It can also include the tqparent folders of the view. * * The views are stored in folders in the document. The same tree structure used * in the document to store the views can be created with 'useFolders', so the file name - * will include recursively also its parent folders. Only the folders made by the user + * will include recursively also its tqparent folders. Only the folders made by the user * are included in the file name (Logical view, use case view and so on aren't created). * * @param view The view to export. @@ -146,7 +146,7 @@ private: /** * Creates, if it doesn't exist, the directory to save the file. - * It also creates all the needed parent directories. + * It also creates all the needed tqparent directories. * * @param url The url where the image will be saved. * @return True if the operation was successful, diff --git a/umbrello/umbrello/umlwidget.cpp b/umbrello/umbrello/umlwidget.cpp index 29dc2a86..c9733df2 100644 --- a/umbrello/umbrello/umlwidget.cpp +++ b/umbrello/umbrello/umlwidget.cpp @@ -450,14 +450,14 @@ void UMLWidget::drawSelected(TQPainter * p, int offsetX, int offsetY) { int w = width(); int h = height(); int s = 4; - TQBrush brush(Qt::blue); + TQBrush brush(TQt::blue); p -> fillRect(offsetX, offsetY, s, s, brush); p -> fillRect(offsetX, offsetY + h - s, s, s, brush); p -> fillRect(offsetX + w - s, offsetY, s, s, brush); // Draw the resize anchor in the lower right corner. if (m_bResizable) { - brush.setColor(Qt::red); + brush.setColor(TQt::red); const int right = offsetX + w; const int bottom = offsetY + h; p->drawLine(right - s, offsetY + h - 1, offsetX + w - 1, offsetY + h - s); @@ -537,7 +537,7 @@ void UMLWidget::setActivated(bool Active /*=true*/) { } void UMLWidget::addAssoc(AssociationWidget* pAssoc) { - if (pAssoc && !m_Assocs.contains(pAssoc)) { + if (pAssoc && !m_Assocs.tqcontains(pAssoc)) { m_Assocs.append(pAssoc); } } @@ -656,7 +656,7 @@ int UMLWidget::onWidget(const TQPoint & p) { const int top = getY(); const int bottom = top + h; if (p.x() < left || p.x() > right || - p.y() < top || p.y() > bottom) // Qt coord.sys. origin in top left corner + p.y() < top || p.y() > bottom) // TQt coord.sys. origin in top left corner return 0; return (w + h) / 2; } @@ -997,7 +997,7 @@ bool UMLWidget::loadFromXMI( TQDomElement & qElement ) { m_Font.fromString(font); //setFont(newFont); } else { - kWarning() << "Using default font " << m_Font.toString() + kWarning() << "Using default font " << TQString(m_Font.toString()) << " for widget with xmi.id " << ID2STR(m_nId) << endl; //setFont( m_Font ); } diff --git a/umbrello/umbrello/umlwidget.h b/umbrello/umbrello/umlwidget.h index 46bdfcb3..0cebb9d8 100644 --- a/umbrello/umbrello/umlwidget.h +++ b/umbrello/umbrello/umlwidget.h @@ -42,6 +42,7 @@ class TQFontMetrics; */ class UMLWidget : public WidgetBase, public TQCanvasRectangle { Q_OBJECT + TQ_OBJECT public: friend class UMLWidgetController; @@ -184,7 +185,7 @@ public: void setView(UMLView * v); /** - * Activate the object after serializing it from a QDataStream + * Activate the object after serializing it from a TQDataStream * * @param ChangeLog * @return true for success @@ -465,7 +466,7 @@ public: /** * Set the m_bActivated flag of a widget but does not perform the Activate method * - * @param Active Status of activation is to be set. + * @param Active tqStatus of activation is to be set. */ void setActivated(bool Active = true); @@ -542,7 +543,7 @@ protected: /** * Overrides default method. * - * @param p Device on which the shape has to be drawn. + * @param p Device on which the shape.has to be drawn. */ virtual void drawShape(TQPainter &p ); @@ -666,7 +667,7 @@ public slots: /** * This slot is entered when an event has occurred on the views display, * most likely a mouse event. Before it sends out that mouse event all - * children should make sure that they don't have a menu active or there + * tqchildren should make sure that they don't have a menu active or there * could be more than one popup menu displayed. */ virtual void slotRemovePopupMenu(); diff --git a/umbrello/umbrello/umlwidgetcontroller.cpp b/umbrello/umbrello/umlwidgetcontroller.cpp index 9764e74f..c7b9ce94 100644 --- a/umbrello/umbrello/umlwidgetcontroller.cpp +++ b/umbrello/umbrello/umlwidgetcontroller.cpp @@ -74,7 +74,7 @@ void UMLWidgetController::mousePressEvent(TQMouseEvent *me) { m_oldStatusBarMsg = UMLApp::app()->getStatusBarMsg(); - if (me->state() == Qt::ShiftButton || me->state() == Qt::ControlButton) { + if (me->state() == TQt::ShiftButton || me->state() == TQt::ControlButton) { m_shiftPressed = true; if (me->button() == Qt::LeftButton) { @@ -138,10 +138,10 @@ void UMLWidgetController::mouseMoveEvent(TQMouseEvent* me) { int diffX = position.x() - m_widget->getX(); int diffY = position.y() - m_widget->getY(); - if ((me->state() & Qt::ShiftButton) && (me->state() & Qt::ControlButton)) { + if ((me->state() & TQt::ShiftButton) && (me->state() & TQt::ControlButton)) { //Move in Y axis diffX = 0; - } else if ((me->state() & Qt::ShiftButton) || (me->state() & Qt::ControlButton)) { + } else if ((me->state() & TQt::ShiftButton) || (me->state() & TQt::ControlButton)) { //Move in X axis diffY = 0; } @@ -383,10 +383,10 @@ void UMLWidgetController::resize(TQMouseEvent *me) { int newW = m_oldW + me->x() - m_widget->getX() - m_pressOffsetX; int newH = m_oldH + me->y() - m_widget->getY() - m_pressOffsetY; - if ((me->state() & Qt::ShiftButton) && (me->state() & Qt::ControlButton)) { + if ((me->state() & TQt::ShiftButton) && (me->state() & TQt::ControlButton)) { //Move in Y axis newW = m_oldW; - } else if ((me->state() & Qt::ShiftButton) || (me->state() & Qt::ControlButton)) { + } else if ((me->state() & TQt::ShiftButton) || (me->state() & TQt::ControlButton)) { //Move in X axis newH = m_oldH; } diff --git a/umbrello/umbrello/umlwidgetcontroller.h b/umbrello/umbrello/umlwidgetcontroller.h index 54d42e55..032b3fbd 100644 --- a/umbrello/umbrello/umlwidgetcontroller.h +++ b/umbrello/umbrello/umlwidgetcontroller.h @@ -186,7 +186,7 @@ protected: * size in m_oldW/H. * * It can be overridden to save subclass specific values whenever a move or - * resize begins. However, parent method (that is, this method) must be + * resize begins. However, tqparent method (that is, this method) must be * called in the overridden method. * * @param me The TQMouseEvent to get the offset from. @@ -198,7 +198,7 @@ protected: * the cursor depending on that. * The cursor used when resizing is gotten from getResizeCursor(). * - * @param me The QMouseEVent to check. + * @param me The TQMouseEVent to check. * @return true if the mouse is in resize area, false otherwise. */ virtual bool isInResizeArea(TQMouseEvent *me); diff --git a/umbrello/umbrello/uniqueid.h b/umbrello/umbrello/uniqueid.h index 7dcbd4bb..56cedb56 100644 --- a/umbrello/umbrello/uniqueid.h +++ b/umbrello/umbrello/uniqueid.h @@ -9,8 +9,8 @@ * Umbrello UML Modeller Authors <uml-devel@uml.sf.net> * ***************************************************************************/ -#ifndef UNIQUEID_H -#define UNIQUEID_H +#ifndef UNITQUEID_H +#define UNITQUEID_H #include "umlnamespace.h" diff --git a/umbrello/umbrello/usecasewidget.cpp b/umbrello/umbrello/usecasewidget.cpp index 7eb8590a..79352e9a 100644 --- a/umbrello/umbrello/usecasewidget.cpp +++ b/umbrello/umbrello/usecasewidget.cpp @@ -44,8 +44,8 @@ void UseCaseWidget::draw(TQPainter & p, int offsetX, int offsetY) { const int textStartY = (h / 2) - (fontHeight / 2); p.drawEllipse(offsetX, offsetY, w, h); - p.setPen(Qt::black); - p.drawText(offsetX + UC_MARGIN, offsetY + textStartY, w - UC_MARGIN * 2, fontHeight, Qt::AlignCenter, getName()); + p.setPen(TQt::black); + p.drawText(offsetX + UC_MARGIN, offsetY + textStartY, w - UC_MARGIN * 2, fontHeight, TQt::AlignCenter, getName()); UMLWidget::setPen(p); if(m_bSelected) drawSelected(&p, offsetX, offsetY); diff --git a/umbrello/umbrello/usecasewidget.h b/umbrello/umbrello/usecasewidget.h index 65613d1e..de330b62 100644 --- a/umbrello/umbrello/usecasewidget.h +++ b/umbrello/umbrello/usecasewidget.h @@ -41,7 +41,7 @@ public: /** * Creates a UseCase widget. * - * @param view The parent of the widget. + * @param view The tqparent of the widget. * @param o The UMLObject to represent. */ UseCaseWidget(UMLView * view, UMLUseCase *o); diff --git a/umbrello/umbrello/widget_factory.cpp b/umbrello/umbrello/widget_factory.cpp index ea58e128..5b068aa5 100644 --- a/umbrello/umbrello/widget_factory.cpp +++ b/umbrello/umbrello/widget_factory.cpp @@ -148,8 +148,8 @@ bool validateObjType(Uml::Object_Type expected, UMLObject* &o, Uml::IDType id) { if (o == NULL) return false; o->setID(id); - UMLPackage *parentPkg = o->getUMLPackage(); - parentPkg->addObject(o); + UMLPackage *tqparentPkg = o->getUMLPackage(); + tqparentPkg->addObject(o); return true; } Uml::Object_Type actual = o->getBaseType(); diff --git a/umbrello/umbrello/widget_utils.cpp b/umbrello/umbrello/widget_utils.cpp index 9f363a62..eeb51956 100644 --- a/umbrello/umbrello/widget_utils.cpp +++ b/umbrello/umbrello/widget_utils.cpp @@ -99,9 +99,9 @@ TQCanvasRectangle *decoratePoint(const TQPoint& p) { rect = new TQCanvasRectangle(p.x() - SIZE / 2, p.y() - SIZE / 2, SIZE, SIZE, currentView->canvas()); - rect->setBrush( TQBrush(Qt::blue) ); - rect->setPen( TQPen(Qt::blue) ); - rect->setVisible(true); + rect->setBrush( TQBrush(TQt::blue) ); + rect->setPen( TQPen(TQt::blue) ); + rect->tqsetVisible(true); return rect; } diff --git a/umbrello/umbrello/widgetbase.h b/umbrello/umbrello/widgetbase.h index d9487964..5dd863f8 100644 --- a/umbrello/umbrello/widgetbase.h +++ b/umbrello/umbrello/widgetbase.h @@ -29,6 +29,7 @@ class UMLObject; */ class WidgetBase : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Creates a WidgetBase object. diff --git a/umbrello/umbrello/worktoolbar.cpp b/umbrello/umbrello/worktoolbar.cpp index ef648a49..a60c67de 100644 --- a/umbrello/umbrello/worktoolbar.cpp +++ b/umbrello/umbrello/worktoolbar.cpp @@ -26,8 +26,8 @@ #include "worktoolbar.h" -WorkToolBar::WorkToolBar(TQMainWindow *parentWindow, const char*name) - : KToolBar(parentWindow,Qt::DockRight,false,name) { +WorkToolBar::WorkToolBar(TQMainWindow *tqparentWindow, const char*name) + : KToolBar(tqparentWindow,TQt::DockRight,false,name) { m_CurrentButtonID = tbb_Undefined; loadPixmaps(); m_Type = Uml::dt_Class; /* first time in just want it to load arrow, diff --git a/umbrello/umbrello/worktoolbar.h b/umbrello/umbrello/worktoolbar.h index 1570b567..01b7c9a3 100644 --- a/umbrello/umbrello/worktoolbar.h +++ b/umbrello/umbrello/worktoolbar.h @@ -41,14 +41,15 @@ class TQMainWindow; class WorkToolBar : public KToolBar { Q_OBJECT + TQ_OBJECT public: /** * Creates a work tool bar. * - * @param parentWindow The parent of the toolbar. + * @param tqparentWindow The tqparent of the toolbar. */ - WorkToolBar(TQMainWindow *parentWindow, const char *name); + WorkToolBar(TQMainWindow *tqparentWindow, const char *name); /** * Standard deconstructor. |