diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-14 13:10:18 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-14 13:34:26 +0900 |
| commit | b0c86264e0cd10a0d3a47de3b05be453d9417bcd (patch) | |
| tree | 7ae4535306d69dc4b55f68eae0a65298330ee610 /umbrello | |
| parent | d859a5c1f439fe432dedde763e40b2dad9875354 (diff) | |
| download | tdesdk-b0c86264e0cd10a0d3a47de3b05be453d9417bcd.tar.gz tdesdk-b0c86264e0cd10a0d3a47de3b05be453d9417bcd.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'umbrello')
48 files changed, 414 insertions, 414 deletions
diff --git a/umbrello/umbrello/aligntoolbar.cpp b/umbrello/umbrello/aligntoolbar.cpp index 756283d4..32a7d56e 100644 --- a/umbrello/umbrello/aligntoolbar.cpp +++ b/umbrello/umbrello/aligntoolbar.cpp @@ -50,7 +50,7 @@ AlignToolBar::AlignToolBar(TQMainWindow* parentWindow, const char* ) setVerticalStretchable( true ); // gets called whenever a button in the toolbar is clicked - connect( this, TQT_SIGNAL( released( int ) ), this, TQT_SLOT( slotButtonChanged (int ) ) ); + connect( this, TQ_SIGNAL( released( int ) ), this, TQ_SLOT( slotButtonChanged (int ) ) ); } AlignToolBar::~AlignToolBar() { diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp index c0ef19e5..3e565cb6 100644 --- a/umbrello/umbrello/associationwidget.cpp +++ b/umbrello/umbrello/associationwidget.cpp @@ -819,7 +819,7 @@ void AssociationWidget::setUMLAssociation (UMLAssociation * assoc) assoc->nrof_parent_widgets = 0; assoc->nrof_parent_widgets++; - connect(assoc, TQT_SIGNAL(modified()), this, TQT_SLOT(syncToModel())); + connect(assoc, TQ_SIGNAL(modified()), this, TQ_SLOT(syncToModel())); } } @@ -2248,7 +2248,7 @@ void AssociationWidget::mouseReleaseEvent(TQMouseEvent * me) { } m_pMenu = new ListPopupMenu(m_pView, menuType); m_pMenu->popup(me -> globalPos()); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuSelection(int))); setSelected(); }//end method mouseReleaseEvent @@ -3032,7 +3032,7 @@ bool AssociationWidget::onAssociation(const TQPoint & point) { void AssociationWidget::slotRemovePopupMenu() { if(m_pMenu) { - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuSelection(int))); delete m_pMenu; m_pMenu = 0; } @@ -3122,15 +3122,15 @@ void AssociationWidget::setUMLObject(UMLObject *obj) { break; case Uml::ot_Attribute: klass = static_cast<UMLClassifier*>(obj->parent()); - connect(klass, TQT_SIGNAL(attributeRemoved(UMLClassifierListItem*)), - this, TQT_SLOT(slotAttributeRemoved(UMLClassifierListItem*))); + connect(klass, TQ_SIGNAL(attributeRemoved(UMLClassifierListItem*)), + this, TQ_SLOT(slotAttributeRemoved(UMLClassifierListItem*))); attr = static_cast<UMLAttribute*>(obj); - connect(attr, TQT_SIGNAL(attributeChanged()), this, TQT_SLOT(slotAttributeChanged())); + connect(attr, TQ_SIGNAL(attributeChanged()), this, TQ_SLOT(slotAttributeChanged())); break; case Uml::ot_EntityAttribute: ent = static_cast<UMLEntity*>(obj->parent()); - connect(ent, TQT_SIGNAL(entityAttributeRemoved(UMLClassifierListItem*)), - this, TQT_SLOT(slotAttributeRemoved(UMLClassifierListItem*))); + connect(ent, TQ_SIGNAL(entityAttributeRemoved(UMLClassifierListItem*)), + this, TQ_SLOT(slotAttributeRemoved(UMLClassifierListItem*))); break; default: kError() << "UMLAssociation constructor: cannot associate UMLObject of type " @@ -3200,8 +3200,8 @@ void AssociationWidget::init (UMLView *view) m_umldoc = UMLApp::app()->getDocument(); m_LinePath.setAssociation( this ); - connect(m_pView, TQT_SIGNAL(sigRemovePopupMenu()), this, TQT_SLOT(slotRemovePopupMenu())); - connect(m_pView, TQT_SIGNAL( sigClearAllSelected() ), this, TQT_SLOT( slotClearAllSelected() ) ); + connect(m_pView, TQ_SIGNAL(sigRemovePopupMenu()), this, TQ_SLOT(slotRemovePopupMenu())); + connect(m_pView, TQ_SIGNAL( sigClearAllSelected() ), this, TQ_SLOT( slotClearAllSelected() ) ); } void AssociationWidget::resetTextPositions() { @@ -3250,10 +3250,10 @@ UMLOperation *AssociationWidget::getOperation() { void AssociationWidget::setOperation(UMLOperation *op) { if (m_pObject) - disconnect(m_pObject, TQT_SIGNAL(modified()), m_pName, TQT_SLOT(setMessageText())); + disconnect(m_pObject, TQ_SIGNAL(modified()), m_pName, TQ_SLOT(setMessageText())); m_pObject = op; if (m_pObject) - connect(m_pObject, TQT_SIGNAL(modified()), m_pName, TQT_SLOT(setMessageText())); + connect(m_pObject, TQ_SIGNAL(modified()), m_pName, TQ_SLOT(setMessageText())); } UMLClassifier *AssociationWidget::getOperationOwner() { diff --git a/umbrello/umbrello/classifier.cpp b/umbrello/umbrello/classifier.cpp index 7aa94806..ae18fec1 100644 --- a/umbrello/umbrello/classifier.cpp +++ b/umbrello/umbrello/classifier.cpp @@ -244,7 +244,7 @@ bool UMLClassifier::addOperation(UMLOperation* op, int position ) m_List.append( op ); emit operationAdded(op); UMLObject::emitModified(); - connect(op,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(op,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return true; } @@ -270,7 +270,7 @@ int UMLClassifier::removeOperation(UMLOperation *op) { } // disconnection needed. // note that we don't delete the operation, just remove it from the Classifier - disconnect(op,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + disconnect(op,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); emit operationRemoved(op); UMLObject::emitModified(); return m_List.count(); @@ -550,7 +550,7 @@ UMLAttribute* UMLClassifier::addAttribute(const TQString &name, Uml::IDType id / m_List.append(a); emit attributeAdded(a); UMLObject::emitModified(); - connect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(a,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return a; } @@ -564,7 +564,7 @@ UMLAttribute* UMLClassifier::addAttribute(const TQString &name, UMLObject *type, m_List.append(a); emit attributeAdded(a); UMLObject::emitModified(); - connect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(a,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return a; } @@ -579,7 +579,7 @@ bool UMLClassifier::addAttribute(UMLAttribute* att, IDChangeLog* Log /* = 0 */, m_List.append(att); emit attributeAdded(att); UMLObject::emitModified(); - connect(att, TQT_SIGNAL(modified()), this, TQT_SIGNAL(modified())); + connect(att, TQ_SIGNAL(modified()), this, TQ_SIGNAL(modified())); return true; } else if (Log) { Log->removeChangeByNewID(att->getID()); @@ -597,7 +597,7 @@ int UMLClassifier::removeAttribute(UMLAttribute* a) { UMLObject::emitModified(); // If we are deleting the object, then we don't need to disconnect..this is done auto-magically // for us by TQObject. -b.t. - // disconnect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + // disconnect(a,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); delete a; return m_List.count(); } @@ -677,7 +677,7 @@ UMLTemplate* UMLClassifier::addTemplate(const TQString &name, Uml::IDType id) { m_List.append(t); emit templateAdded(t); UMLObject::emitModified(); - connect(t, TQT_SIGNAL(modified()), this, TQT_SIGNAL(modified())); + connect(t, TQ_SIGNAL(modified()), this, TQ_SIGNAL(modified())); return t; } @@ -689,7 +689,7 @@ bool UMLClassifier::addTemplate(UMLTemplate* newTemplate, IDChangeLog* log /* = m_List.append(newTemplate); emit templateAdded(newTemplate); UMLObject::emitModified(); - connect(newTemplate,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(newTemplate,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return true; } else if (log) { log->removeChangeByNewID( newTemplate->getID() ); @@ -710,7 +710,7 @@ bool UMLClassifier::addTemplate(UMLTemplate* Template, int position) m_List.append(Template); emit templateAdded(Template); UMLObject::emitModified(); - connect(Template,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(Template,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return true; } //else @@ -724,7 +724,7 @@ int UMLClassifier::removeTemplate(UMLTemplate* umltemplate) { } emit templateRemoved(umltemplate); UMLObject::emitModified(); - disconnect(umltemplate,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + disconnect(umltemplate,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return m_List.count(); } diff --git a/umbrello/umbrello/classifiercodedocument.cpp b/umbrello/umbrello/classifiercodedocument.cpp index 29e4bd88..e6691f82 100644 --- a/umbrello/umbrello/classifiercodedocument.cpp +++ b/umbrello/umbrello/classifiercodedocument.cpp @@ -397,15 +397,15 @@ void ClassifierCodeDocument::init (UMLClassifier * c ) // slots if (parentIsClass()) { - connect(c,TQT_SIGNAL(attributeAdded(UMLClassifierListItem*)),this,TQT_SLOT(addAttributeClassField(UMLClassifierListItem*))); - connect(c,TQT_SIGNAL(attributeRemoved(UMLClassifierListItem*)),this,TQT_SLOT(removeAttributeClassField(UMLClassifierListItem*))); + connect(c,TQ_SIGNAL(attributeAdded(UMLClassifierListItem*)),this,TQ_SLOT(addAttributeClassField(UMLClassifierListItem*))); + connect(c,TQ_SIGNAL(attributeRemoved(UMLClassifierListItem*)),this,TQ_SLOT(removeAttributeClassField(UMLClassifierListItem*))); } - connect(c,TQT_SIGNAL(sigAssociationEndAdded(UMLAssociation*)),this,TQT_SLOT(addAssociationClassField(UMLAssociation*))); - connect(c,TQT_SIGNAL(sigAssociationEndRemoved(UMLAssociation*)),this,TQT_SLOT(removeAssociationClassField(UMLAssociation*))); - connect(c,TQT_SIGNAL(operationAdded(UMLClassifierListItem*)),this,TQT_SLOT(addOperation(UMLClassifierListItem*))); - connect(c,TQT_SIGNAL(operationRemoved(UMLClassifierListItem*)),this,TQT_SLOT(removeOperation(UMLClassifierListItem*))); - connect(c,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent())); + connect(c,TQ_SIGNAL(sigAssociationEndAdded(UMLAssociation*)),this,TQ_SLOT(addAssociationClassField(UMLAssociation*))); + connect(c,TQ_SIGNAL(sigAssociationEndRemoved(UMLAssociation*)),this,TQ_SLOT(removeAssociationClassField(UMLAssociation*))); + connect(c,TQ_SIGNAL(operationAdded(UMLClassifierListItem*)),this,TQ_SLOT(addOperation(UMLClassifierListItem*))); + connect(c,TQ_SIGNAL(operationRemoved(UMLClassifierListItem*)),this,TQ_SLOT(removeOperation(UMLClassifierListItem*))); + connect(c,TQ_SIGNAL(modified()),this,TQ_SLOT(syncToParent())); } diff --git a/umbrello/umbrello/codeaccessormethod.cpp b/umbrello/umbrello/codeaccessormethod.cpp index e7890865..435e575f 100644 --- a/umbrello/umbrello/codeaccessormethod.cpp +++ b/umbrello/umbrello/codeaccessormethod.cpp @@ -189,7 +189,7 @@ void CodeAccessorMethod::initFields(CodeClassField * parentClassField ) { m_accessorType = GET; m_canDelete = false; // we cant delete these with the codeeditor, delete the UML operation instead. - connect(m_parentclassfield,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent())); + connect(m_parentclassfield,TQ_SIGNAL(modified()),this,TQ_SLOT(syncToParent())); } #include "codeaccessormethod.moc" diff --git a/umbrello/umbrello/codeclassfield.cpp b/umbrello/umbrello/codeclassfield.cpp index 60e97c77..e32efed0 100644 --- a/umbrello/umbrello/codeclassfield.cpp +++ b/umbrello/umbrello/codeclassfield.cpp @@ -610,7 +610,7 @@ void CodeClassField::finishInitialization() { initAccessorMethods(); updateContent(); - connect(getParentObject(),TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); // child objects will trigger off this signal + connect(getParentObject(),TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); // child objects will trigger off this signal } diff --git a/umbrello/umbrello/codeclassfielddeclarationblock.cpp b/umbrello/umbrello/codeclassfielddeclarationblock.cpp index ba7c6878..b7a00091 100644 --- a/umbrello/umbrello/codeclassfielddeclarationblock.cpp +++ b/umbrello/umbrello/codeclassfielddeclarationblock.cpp @@ -168,7 +168,7 @@ void CodeClassFieldDeclarationBlock::init (CodeClassField * parentCF) { m_parentclassfield = parentCF; m_canDelete = false; - connect(m_parentclassfield,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent())); + connect(m_parentclassfield,TQ_SIGNAL(modified()),this,TQ_SLOT(syncToParent())); } #include "codeclassfielddeclarationblock.moc" diff --git a/umbrello/umbrello/codegenerator.cpp b/umbrello/umbrello/codegenerator.cpp index ea9bea43..2517f805 100644 --- a/umbrello/umbrello/codegenerator.cpp +++ b/umbrello/umbrello/codegenerator.cpp @@ -669,13 +669,13 @@ void CodeGenerator::initFields() { void CodeGenerator::connect_newcodegen_slots() { UMLDoc *doc = UMLApp::app()->getDocument(); - connect(doc, TQT_SIGNAL(sigObjectCreated(UMLObject*)), - this, TQT_SLOT(checkAddUMLObject(UMLObject*))); - connect(doc, TQT_SIGNAL(sigObjectRemoved(UMLObject*)), - this, TQT_SLOT(checkRemoveUMLObject(UMLObject*))); + connect(doc, TQ_SIGNAL(sigObjectCreated(UMLObject*)), + this, TQ_SLOT(checkAddUMLObject(UMLObject*))); + connect(doc, TQ_SIGNAL(sigObjectRemoved(UMLObject*)), + this, TQ_SLOT(checkRemoveUMLObject(UMLObject*))); CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy(); - connect(commonPolicy, TQT_SIGNAL(modifiedCodeContent()), - this, TQT_SLOT(syncCodeToDocument())); + connect(commonPolicy, TQ_SIGNAL(modifiedCodeContent()), + this, TQ_SLOT(syncCodeToDocument())); } // these are utility methods for accessing the default diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp index 3a251802..0fbd3bb9 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp +++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp @@ -58,8 +58,8 @@ CPPCodeGenerationForm::CPPCodeGenerationForm( TQWidget *parent, const char *name TQCheckListItem::CheckBox ); connect(GeneralOptionsListView, - TQT_SIGNAL(clicked(TQListViewItem *)), this, - TQT_SLOT(generalOptionsListViewClicked(TQListViewItem *)) + TQ_SIGNAL(clicked(TQListViewItem *)), this, + TQ_SLOT(generalOptionsListViewClicked(TQListViewItem *)) ); } diff --git a/umbrello/umbrello/codeoperation.cpp b/umbrello/umbrello/codeoperation.cpp index 13f5121b..da403739 100644 --- a/umbrello/umbrello/codeoperation.cpp +++ b/umbrello/umbrello/codeoperation.cpp @@ -163,7 +163,7 @@ void CodeOperation::init (UMLOperation * parentOp) setTag(CodeOperation::findTag(parentOp)); // not needed.. done by parent "ownedcodeblock" class - // connect(parentOp,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent())); + // connect(parentOp,TQ_SIGNAL(modified()),this,TQ_SLOT(syncToParent())); } diff --git a/umbrello/umbrello/codeparameter.cpp b/umbrello/umbrello/codeparameter.cpp index cd10e438..f6dc9d48 100644 --- a/umbrello/umbrello/codeparameter.cpp +++ b/umbrello/umbrello/codeparameter.cpp @@ -281,7 +281,7 @@ void CodeParameter::initFields ( ClassifierCodeDocument * doc, UMLObject * obj) m_comment = CodeGenFactory::newCodeComment(m_parentDocument); m_comment->setText(getParentObject()->getDoc()); - connect(m_parentObject,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent())); + connect(m_parentObject,TQ_SIGNAL(modified()),this,TQ_SLOT(syncToParent())); } #include "codeparameter.moc" diff --git a/umbrello/umbrello/dialogs/activitypage.cpp b/umbrello/umbrello/dialogs/activitypage.cpp index f3036a94..92f8f60a 100644 --- a/umbrello/umbrello/dialogs/activitypage.cpp +++ b/umbrello/umbrello/dialogs/activitypage.cpp @@ -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..."), this, TQ_SLOT(slotNewActivity()) ); m_pDeleteActivityButton = buttonBox->addButton( i18n("Delete"), - this, TQT_SLOT(slotDelete()) ); - m_pRenameButton = buttonBox->addButton( i18n("Rename"), this, TQT_SLOT(slotRename()) ); + this, TQ_SLOT(slotDelete()) ); + m_pRenameButton = buttonBox->addButton( i18n("Rename"), this, TQ_SLOT(slotRename()) ); listVBoxLayout->addWidget(buttonBox); mainLayout -> addWidget( m_pActivityGB ); @@ -86,19 +86,19 @@ void ActivityPage::setupPage() { } //now setup the signals - connect(m_pActivityLB, TQT_SIGNAL(clicked(TQListBoxItem *)), this, TQT_SLOT(slotClicked(TQListBoxItem *))); - connect(m_pActivityLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); + connect(m_pActivityLB, TQ_SIGNAL(clicked(TQListBoxItem *)), this, TQ_SLOT(slotClicked(TQListBoxItem *))); + connect(m_pActivityLB, TQ_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); - connect(m_pActivityLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); + connect(m_pActivityLB, TQ_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); - connect( m_pTopArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTopClicked() ) ); - connect( m_pUpArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); - connect( m_pDownArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); - connect( m_pBottomArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBottomClicked() ) ); + connect( m_pTopArrowB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTopClicked() ) ); + connect( m_pUpArrowB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpClicked() ) ); + connect( m_pDownArrowB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDownClicked() ) ); + connect( m_pBottomArrowB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBottomClicked() ) ); - connect( m_pActivityLB, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ), this, TQT_SLOT( slotDoubleClicked( TQListBoxItem* ) ) ); + connect( m_pActivityLB, TQ_SIGNAL( doubleClicked( TQListBoxItem* ) ), this, TQ_SLOT( slotDoubleClicked( TQListBoxItem* ) ) ); enableWidgets(false); } @@ -160,7 +160,7 @@ void ActivityPage::slotRename() { void ActivityPage::slotRightButtonClicked(TQListBoxItem * /*item*/, const TQPoint &/* p*/) { if(m_pMenu) { m_pMenu->hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuSelection(int))); delete m_pMenu; m_pMenu = 0; } @@ -177,13 +177,13 @@ void ActivityPage::slotRightButtonPressed(TQListBoxItem * item, const TQPoint & if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuSelection(int))); delete m_pMenu; m_pMenu = 0; } m_pMenu = new ListPopupMenu(this, type); m_pMenu->popup(p); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuSelection(int))); } diff --git a/umbrello/umbrello/dialogs/assocpage.cpp b/umbrello/umbrello/dialogs/assocpage.cpp index 63617a7d..6950998f 100644 --- a/umbrello/umbrello/dialogs/assocpage.cpp +++ b/umbrello/umbrello/dialogs/assocpage.cpp @@ -35,25 +35,25 @@ AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(pa fillListBox(); m_pMenu = 0; - connect(m_pAssocLB, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), - this, TQT_SLOT(slotDoubleClick(TQListBoxItem *))); + connect(m_pAssocLB, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), + this, TQ_SLOT(slotDoubleClick(TQListBoxItem *))); - connect(m_pAssocLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); + connect(m_pAssocLB, TQ_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); - connect(m_pAssocLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); + connect(m_pAssocLB, TQ_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); } AssocPage::~AssocPage() { - disconnect(m_pAssocLB, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), - this, TQT_SLOT(slotDoubleClick(TQListBoxItem *))); + disconnect(m_pAssocLB, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), + this, TQ_SLOT(slotDoubleClick(TQListBoxItem *))); - disconnect(m_pAssocLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); + disconnect(m_pAssocLB, TQ_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); - disconnect(m_pAssocLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); + disconnect(m_pAssocLB, TQ_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); } void AssocPage::slotDoubleClick(TQListBoxItem * i) { @@ -87,7 +87,7 @@ void AssocPage::fillListBox() { void AssocPage::slotRightButtonClicked(TQListBoxItem */* item*/, const TQPoint &/* p*/) { if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } @@ -98,13 +98,13 @@ void AssocPage::slotRightButtonPressed(TQListBoxItem * item, const TQPoint & p) return; if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } m_pMenu = new ListPopupMenu(this, ListPopupMenu::mt_Association_Selected); m_pMenu->popup(p); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPopupMenuSel(int))); } void AssocPage::slotPopupMenuSel(int id) { diff --git a/umbrello/umbrello/dialogs/classgenpage.cpp b/umbrello/umbrello/dialogs/classgenpage.cpp index 145148a5..fb881a91 100644 --- a/umbrello/umbrello/dialogs/classgenpage.cpp +++ b/umbrello/umbrello/dialogs/classgenpage.cpp @@ -298,7 +298,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, ObjectWidget* o) : TQWid docLayout -> addWidget(m_pDoc); m_pObject = 0;//needs to be set to zero if( m_pMultiCB ) - connect( m_pDrawActorCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotActorToggled( bool ) ) ); + connect( m_pDrawActorCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotActorToggled( bool ) ) ); } ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLWidget* widget) : TQWidget(parent) { diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp index a86273a5..dd2afe6c 100644 --- a/umbrello/umbrello/dialogs/classifierlistpage.cpp +++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp @@ -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, this, TQ_SLOT(slotNewListItem()) ); m_pDeleteListItemButton = buttonBox->addButton( i18n("&Delete"), - this, TQT_SLOT(slotDelete()) ); - m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), this, TQT_SLOT(slotProperties()) ); + this, TQ_SLOT(slotDelete()) ); + m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), this, TQ_SLOT(slotProperties()) ); listVBoxLayout->addWidget(buttonBox); mainLayout->addWidget(m_pItemListGB); @@ -117,27 +117,27 @@ ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifi // to the ListItemModified slot in this class for (UMLClassifierListItem* listItem = itemList.first(); listItem != 0; listItem = itemList.next() ) { m_pItemListLB->insertItem(listItem->toString(Uml::st_SigNoVis)); - connect( listItem, TQT_SIGNAL(modified()),this,TQT_SLOT(slotListItemModified()) ); + connect( listItem, TQ_SIGNAL(modified()),this,TQ_SLOT(slotListItemModified()) ); } enableWidgets(false);//disable widgets until an att is chosen m_pOldListItem = 0; - connect(m_pItemListLB, TQT_SIGNAL(clicked(TQListBoxItem*)), this, TQT_SLOT(slotClicked(TQListBoxItem*))); - connect(m_pItemListLB, TQT_SIGNAL(selectionChanged(TQListBoxItem*)), this, TQT_SLOT(slotClicked(TQListBoxItem*))); - - connect(m_pItemListLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem*, const TQPoint&)), - this, TQT_SLOT(slotRightButtonPressed(TQListBoxItem*, const TQPoint&))); - - connect(m_pItemListLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem*, const TQPoint&)), - this, TQT_SLOT(slotRightButtonClicked(TQListBoxItem*, const TQPoint&))); - connect(m_pDoc, TQT_SIGNAL(sigObjectCreated(UMLObject*)), this, TQT_SLOT(slotListItemCreated(UMLObject*))); - - connect( m_pTopArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTopClicked() ) ); - connect( m_pUpArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); - connect( m_pDownArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); - connect( m_pBottomArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBottomClicked() ) ); - connect( m_pItemListLB, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ), - this, TQT_SLOT( slotDoubleClick( TQListBoxItem* ) ) ); + connect(m_pItemListLB, TQ_SIGNAL(clicked(TQListBoxItem*)), this, TQ_SLOT(slotClicked(TQListBoxItem*))); + connect(m_pItemListLB, TQ_SIGNAL(selectionChanged(TQListBoxItem*)), this, TQ_SLOT(slotClicked(TQListBoxItem*))); + + connect(m_pItemListLB, TQ_SIGNAL(rightButtonPressed(TQListBoxItem*, const TQPoint&)), + this, TQ_SLOT(slotRightButtonPressed(TQListBoxItem*, const TQPoint&))); + + connect(m_pItemListLB, TQ_SIGNAL(rightButtonClicked(TQListBoxItem*, const TQPoint&)), + this, TQ_SLOT(slotRightButtonClicked(TQListBoxItem*, const TQPoint&))); + connect(m_pDoc, TQ_SIGNAL(sigObjectCreated(UMLObject*)), this, TQ_SLOT(slotListItemCreated(UMLObject*))); + + connect( m_pTopArrowB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTopClicked() ) ); + connect( m_pUpArrowB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpClicked() ) ); + connect( m_pDownArrowB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDownClicked() ) ); + connect( m_pBottomArrowB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBottomClicked() ) ); + connect( m_pItemListLB, TQ_SIGNAL( doubleClicked( TQListBoxItem* ) ), + this, TQ_SLOT( slotDoubleClick( TQListBoxItem* ) ) ); } ClassifierListPage::~ClassifierListPage() { @@ -270,7 +270,7 @@ void ClassifierListPage::slotListItemModified() { void ClassifierListPage::slotRightButtonClicked(TQListBoxItem* /*item*/, const TQPoint& /* p*/) { if (m_pMenu) { m_pMenu->hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } @@ -309,14 +309,14 @@ void ClassifierListPage::slotRightButtonPressed(TQListBoxItem* item, const TQPoi } if(m_pMenu) { m_pMenu->hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } m_pMenu = new ListPopupMenu(this, type); m_pMenu->popup(p); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPopupMenuSel(int))); } void ClassifierListPage::slotPopupMenuSel(int id) { diff --git a/umbrello/umbrello/dialogs/codeeditor.cpp b/umbrello/umbrello/dialogs/codeeditor.cpp index 2bae53d0..ce14dba3 100644 --- a/umbrello/umbrello/dialogs/codeeditor.cpp +++ b/umbrello/umbrello/dialogs/codeeditor.cpp @@ -668,26 +668,26 @@ TQPopupMenu * CodeEditor::createPopupMenu ( const TQPoint & pos ) if (m_selectedTextBlock) { if(tb->getWriteOutText()) - menu->insertItem("Hide",this,TQT_SLOT(slotChangeSelectedBlockView()), Key_H, 0); + menu->insertItem("Hide",this,TQ_SLOT(slotChangeSelectedBlockView()), Key_H, 0); else - menu->insertItem("Show",this,TQT_SLOT(slotChangeSelectedBlockView()), Key_S, 0); + menu->insertItem("Show",this,TQ_SLOT(slotChangeSelectedBlockView()), Key_S, 0); CodeBlockWithComments * cb = dynamic_cast<CodeBlockWithComments*>(tb); if(cb) if(cb->getComment()->getWriteOutText()) - menu->insertItem("Hide Comment",this,TQT_SLOT(slotChangeSelectedBlockCommentView()), CTRL+Key_H, 1); + menu->insertItem("Hide Comment",this,TQ_SLOT(slotChangeSelectedBlockCommentView()), CTRL+Key_H, 1); else - menu->insertItem("Show Comment",this,TQT_SLOT(slotChangeSelectedBlockCommentView()), CTRL+Key_S, 1); + menu->insertItem("Show Comment",this,TQ_SLOT(slotChangeSelectedBlockCommentView()), CTRL+Key_S, 1); menu->insertSeparator(); - menu->insertItem("Insert Code Block Before",this,TQT_SLOT(slotInsertCodeBlockBeforeSelected()), CTRL+Key_B, 2); - menu->insertItem("Insert Code Block After",this,TQT_SLOT(slotInsertCodeBlockAfterSelected()), CTRL+Key_A, 3); + menu->insertItem("Insert Code Block Before",this,TQ_SLOT(slotInsertCodeBlockBeforeSelected()), CTRL+Key_B, 2); + menu->insertItem("Insert Code Block After",this,TQ_SLOT(slotInsertCodeBlockAfterSelected()), CTRL+Key_A, 3); menu->insertSeparator(); - menu->insertItem("Copy",this,TQT_SLOT(slotCopyTextBlock()), CTRL+Key_C, 4); - menu->insertItem("Paste",this,TQT_SLOT(slotPasteTextBlock()), CTRL+Key_V, 5); - menu->insertItem("Cut",this,TQT_SLOT(slotCutTextBlock()), CTRL+Key_X, 6); + menu->insertItem("Copy",this,TQ_SLOT(slotCopyTextBlock()), CTRL+Key_C, 4); + menu->insertItem("Paste",this,TQ_SLOT(slotPasteTextBlock()), CTRL+Key_V, 5); + menu->insertItem("Cut",this,TQ_SLOT(slotCutTextBlock()), CTRL+Key_X, 6); // enable/disable based on conditions if(m_selectedTextBlock == m_parentDoc->getHeader()) @@ -813,10 +813,10 @@ void CodeEditor::init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc ) // setMargin(margin); - // connect(this,TQT_SIGNAL(newLinePressed()),this,TQT_SLOT(newLinePressed())); - // connect(this,TQT_SIGNAL(backspacePressed()),this,TQT_SLOT(backspacePressed())); - connect(this,TQT_SIGNAL(doubleClicked(int,int)),this,TQT_SLOT(doubleClicked(int,int))); - connect(this,TQT_SIGNAL(cursorPositionChanged(int,int)),this,TQT_SLOT(cursorPositionChanged(int,int))); + // connect(this,TQ_SIGNAL(newLinePressed()),this,TQ_SLOT(newLinePressed())); + // connect(this,TQ_SIGNAL(backspacePressed()),this,TQ_SLOT(backspacePressed())); + connect(this,TQ_SIGNAL(doubleClicked(int,int)),this,TQ_SLOT(doubleClicked(int,int))); + connect(this,TQ_SIGNAL(cursorPositionChanged(int,int)),this,TQ_SLOT(cursorPositionChanged(int,int))); // do this last loadFromDocument(); diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp index 6aff2b8f..38d44465 100644 --- a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp +++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp @@ -65,7 +65,7 @@ void CodeGenerationOptionsPage::init() m_SelectIndentationTypeBox->setCurrentItem(indentTypeToInteger(policy->getIndentationType())); m_SelectIndentationNumber->setValue(policy->getIndentationAmount()); - connect(this,TQT_SIGNAL(syncCodeDocumentsToParent()),gen,TQT_SLOT(syncCodeToDocument())); + connect(this,TQ_SIGNAL(syncCodeDocumentsToParent()),gen,TQ_SLOT(syncCodeToDocument())); // now insert the language-dependant page, should there be one updateCodeGenerationPolicyTab(); @@ -135,7 +135,7 @@ void CodeGenerationOptionsPage::updateCodeGenerationPolicyTab() { else m_pCodePolicyPage = new DefaultCodeGenPolicyPage(languageOptionsFrame, "codelangpolicypage"); - connect(this,TQT_SIGNAL(applyClicked()),m_pCodePolicyPage,TQT_SLOT(apply())); + connect(this,TQ_SIGNAL(applyClicked()),m_pCodePolicyPage,TQ_SLOT(apply())); } diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.cpp b/umbrello/umbrello/dialogs/codegenerationwizard.cpp index 11130864..a4016bd3 100644 --- a/umbrello/umbrello/dialogs/codegenerationwizard.cpp +++ b/umbrello/umbrello/dialogs/codegenerationwizard.cpp @@ -49,7 +49,7 @@ CodeGenerationWizard::CodeGenerationWizard(UMLClassifierList *classList) m_statusList -> setResizeMode(TQListView::AllColumns); m_CodeGenerationOptionsPage = new CodeGenerationOptionsPage(this); - connect( m_CodeGenerationOptionsPage, TQT_SIGNAL(languageChanged()), this, TQT_SLOT(changeLanguage()) ); + connect( m_CodeGenerationOptionsPage, TQ_SIGNAL(languageChanged()), this, TQ_SLOT(changeLanguage()) ); insertPage(m_CodeGenerationOptionsPage, i18n("Code Generation Options"), 1); @@ -68,7 +68,7 @@ CodeGenerationWizard::CodeGenerationWizard(UMLClassifierList *classList) setFinishEnabled(page(2),true); finishButton()->disconnect(); finishButton()->setText(i18n("&Generate")); - connect(finishButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(generateCode())); + connect(finishButton(),TQ_SIGNAL(clicked()),this,TQ_SLOT(generateCode())); if ( TQApplication::reverseLayout() ) { TQPixmap tmpPixmap( *m_addButton->pixmap() ); @@ -105,8 +105,8 @@ void CodeGenerationWizard::generateCode() { cancelButton()->setEnabled(false); - connect( codeGenerator, TQT_SIGNAL(codeGenerated(UMLClassifier*, bool)), - this, TQT_SLOT(classGenerated(UMLClassifier*, bool)) ); + connect( codeGenerator, TQ_SIGNAL(codeGenerated(UMLClassifier*, bool)), + this, TQ_SLOT(classGenerated(UMLClassifier*, bool)) ); UMLClassifierList cList; cList.setAutoDelete(false); @@ -119,7 +119,7 @@ void CodeGenerationWizard::generateCode() { codeGenerator->writeCodeToFile(cList); finishButton()->setText(i18n("Finish")); finishButton()->disconnect(); - connect(finishButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(accept())); + connect(finishButton(),TQ_SIGNAL(clicked()),this,TQ_SLOT(accept())); } } diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.cpp b/umbrello/umbrello/dialogs/codeviewerdialog.cpp index 37f8f53e..bbe13119 100644 --- a/umbrello/umbrello/dialogs/codeviewerdialog.cpp +++ b/umbrello/umbrello/dialogs/codeviewerdialog.cpp @@ -83,8 +83,8 @@ void CodeViewerDialog::addCodeDocument( CodeDocument * doc) TQString ext = doc->getFileExtension(); m_tabWidget->insertTab(page, (fname + (ext.isEmpty()? "" : ext))); - connect( m_highlightCheckBox, TQT_SIGNAL( stateChanged(int) ), page, TQT_SLOT( changeHighlighting(int) ) ); - connect( m_showHiddenCodeCB, TQT_SIGNAL( stateChanged(int) ), page, TQT_SLOT( changeShowHidden(int) ) ); + connect( m_highlightCheckBox, TQ_SIGNAL( stateChanged(int) ), page, TQ_SLOT( changeHighlighting(int) ) ); + connect( m_showHiddenCodeCB, TQ_SIGNAL( stateChanged(int) ), page, TQ_SLOT( changeShowHidden(int) ) ); } diff --git a/umbrello/umbrello/dialogs/diagramprintpage.cpp b/umbrello/umbrello/dialogs/diagramprintpage.cpp index 56390d0c..aba02237 100644 --- a/umbrello/umbrello/dialogs/diagramprintpage.cpp +++ b/umbrello/umbrello/dialogs/diagramprintpage.cpp @@ -85,8 +85,8 @@ DiagramPrintPage::DiagramPrintPage(TQWidget * parent, UMLDoc * m_pDoc) : KPrintD m_ViewType = Uml::dt_Class; - connect(m_pFilterBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotClicked(int))); - connect(m_pTypeCB, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotActivated(const TQString&))); + connect(m_pFilterBG, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotClicked(int))); + connect(m_pTypeCB, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(slotActivated(const TQString&))); m_pTypeCB -> insertItem(i18n("Class")); m_pTypeCB -> insertItem(i18n("Use Case")); @@ -100,8 +100,8 @@ DiagramPrintPage::DiagramPrintPage(TQWidget * parent, UMLDoc * m_pDoc) : KPrintD DiagramPrintPage::~DiagramPrintPage() { - disconnect(m_pFilterBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotClicked(int))); - disconnect(m_pTypeCB, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotActivated(const TQString&))); + disconnect(m_pFilterBG, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotClicked(int))); + disconnect(m_pTypeCB, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(slotActivated(const TQString&))); } void DiagramPrintPage::getOptions( TQMap<TQString,TQString>& opts, bool /*incldef = false*/ ) { diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.cpp b/umbrello/umbrello/dialogs/pkgcontentspage.cpp index 84bb95b6..7db17fe3 100644 --- a/umbrello/umbrello/dialogs/pkgcontentspage.cpp +++ b/umbrello/umbrello/dialogs/pkgcontentspage.cpp @@ -39,25 +39,25 @@ PkgContentsPage::PkgContentsPage(TQWidget *parent, UMLPackage *pkg) fillListBox(); m_pMenu = 0; - connect(m_pContentLB, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), - this, TQT_SLOT(slotDoubleClick(TQListBoxItem *))); + connect(m_pContentLB, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), + this, TQ_SLOT(slotDoubleClick(TQListBoxItem *))); - connect(m_pContentLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); + connect(m_pContentLB, TQ_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); - connect(m_pContentLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); + connect(m_pContentLB, TQ_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); } PkgContentsPage::~PkgContentsPage() { - disconnect(m_pContentLB, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), - this, TQT_SLOT(slotDoubleClick(TQListBoxItem *))); + disconnect(m_pContentLB, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), + this, TQ_SLOT(slotDoubleClick(TQListBoxItem *))); - disconnect(m_pContentLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); + disconnect(m_pContentLB, TQ_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); - disconnect(m_pContentLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); + disconnect(m_pContentLB, TQ_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); } void PkgContentsPage::slotDoubleClick(TQListBoxItem * i) { @@ -85,7 +85,7 @@ void PkgContentsPage::fillListBox() { void PkgContentsPage::slotRightButtonClicked(TQListBoxItem */* item*/, const TQPoint &/* p*/) { if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } @@ -96,13 +96,13 @@ void PkgContentsPage::slotRightButtonPressed(TQListBoxItem * item, const TQPoint return; if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } m_pMenu = new ListPopupMenu(this, ListPopupMenu::mt_Association_Selected); m_pMenu->popup(p); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPopupMenuSel(int))); } void PkgContentsPage::slotPopupMenuSel(int id) { diff --git a/umbrello/umbrello/dialogs/selectopdlg.cpp b/umbrello/umbrello/dialogs/selectopdlg.cpp index 03aaed56..9fc94cf8 100644 --- a/umbrello/umbrello/dialogs/selectopdlg.cpp +++ b/umbrello/umbrello/dialogs/selectopdlg.cpp @@ -68,13 +68,13 @@ SelectOpDlg::SelectOpDlg(UMLView * parent, UMLClassifier * c) insertOperation( obj->toString(Uml::st_SigNoVis) ); } //disableResize(); - connect(m_pOpBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotSelected(int))); + connect(m_pOpBG, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotSelected(int))); m_nOpCount = c -> operations(); slotSelected(OP); } SelectOpDlg::~SelectOpDlg() { - disconnect(m_pOpBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotSelected(int))); + disconnect(m_pOpBG, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotSelected(int))); delete m_pOpBG; } diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp index 74b37c69..fd9e7995 100644 --- a/umbrello/umbrello/dialogs/settingsdlg.cpp +++ b/umbrello/umbrello/dialogs/settingsdlg.cpp @@ -89,8 +89,8 @@ void SettingsDlg::setupUIPage() { m_UiWidgets.useFillColorCB -> setChecked( m_pOptionState->uiState.useFillColor ); //connect button signals up - connect( m_UiWidgets.lineDefaultB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLineBClicked()) ); - connect( m_UiWidgets.fillDefaultB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFillBClicked()) ); + connect( m_UiWidgets.lineDefaultB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLineBClicked()) ); + connect( m_UiWidgets.fillDefaultB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFillBClicked()) ); } void SettingsDlg::setupGeneralPage() { @@ -192,7 +192,7 @@ void SettingsDlg::setupGeneralPage() { } m_GeneralWidgets.diagramKB->setCurrentItem( (int)m_pOptionState->generalState.diagram-1 ); - connect( m_GeneralWidgets.autosaveCB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAutosaveCBClicked()) ); + connect( m_GeneralWidgets.autosaveCB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAutosaveCBClicked()) ); } /** @@ -293,7 +293,7 @@ void SettingsDlg::setupCodeGenPage() { //setup code generation settings page TQVBox * page = addVBoxPage( i18n("Code Generation"), i18n("Code Generation Settings"), DesktopIcon( "source") ); m_pCodeGenPage = new CodeGenerationOptionsPage(page); - connect( m_pCodeGenPage, TQT_SIGNAL(languageChanged()), this, TQT_SLOT(slotApply()) ); + connect( m_pCodeGenPage, TQ_SIGNAL(languageChanged()), this, TQ_SLOT(slotApply()) ); } void SettingsDlg::setupCodeViewerPage(Settings::CodeViewerState options) { diff --git a/umbrello/umbrello/dialogs/umlattributedialog.cpp b/umbrello/umbrello/dialogs/umlattributedialog.cpp index 9adb17a4..6acfa2df 100644 --- a/umbrello/umbrello/dialogs/umlattributedialog.cpp +++ b/umbrello/umbrello/dialogs/umlattributedialog.cpp @@ -140,7 +140,7 @@ void UMLAttributeDialog::setupDialog() { } m_pNameLE->setFocus(); - connect( m_pNameLE, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotNameChanged( const TQString & ) ) ); + connect( m_pNameLE, TQ_SIGNAL( textChanged ( const TQString & ) ), TQ_SLOT( slotNameChanged( const TQString & ) ) ); slotNameChanged(m_pNameLE->text() ); } diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp index 39ba3c6e..5043b8c4 100644 --- a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp +++ b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp @@ -169,7 +169,7 @@ void UMLEntityAttributeDialog::setupDialog() { } m_pNameLE->setFocus(); - connect( m_pNameLE, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotNameChanged( const TQString & ) ) ); + connect( m_pNameLE, TQ_SIGNAL( textChanged ( const TQString & ) ), TQ_SLOT( slotNameChanged( const TQString & ) ) ); slotNameChanged(m_pNameLE->text() ); } diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp index cedee6b6..728ae675 100644 --- a/umbrello/umbrello/dialogs/umloperationdialog.cpp +++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp @@ -138,10 +138,10 @@ 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()) ); + buttonBox->addButton( i18n("Ne&w Parameter..."), this, TQ_SLOT(slotNewParameter()) ); + m_pDeleteButton = buttonBox->addButton( i18n("&Delete"), this, TQ_SLOT(slotDeleteParameter()) ); m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), this, - TQT_SLOT(slotParameterProperties()) ); + TQ_SLOT(slotParameterProperties()) ); parmsLayout->addWidget(buttonBox); topLayout -> addWidget(m_pParmsGB); @@ -232,24 +232,24 @@ void UMLOperationDialog::setupDialog() { m_pStereoTypeCB->setCurrentItem(-1); //setup parm list box signals - connect( m_pUpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotParameterUp() ) ); - connect( m_pDownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotParameterDown() ) ); + connect( m_pUpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotParameterUp() ) ); + connect( m_pDownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotParameterDown() ) ); - connect(m_pParmsLB, TQT_SIGNAL(clicked(TQListBoxItem*)), - this, TQT_SLOT(slotParamsBoxClicked(TQListBoxItem*))); + connect(m_pParmsLB, TQ_SIGNAL(clicked(TQListBoxItem*)), + this, TQ_SLOT(slotParamsBoxClicked(TQListBoxItem*))); - connect(m_pParmsLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotParmRightButtonPressed(TQListBoxItem *, const TQPoint &))); + connect(m_pParmsLB, TQ_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotParmRightButtonPressed(TQListBoxItem *, const TQPoint &))); - connect(m_pParmsLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotParmRightButtonClicked(TQListBoxItem *, const TQPoint &))); + connect(m_pParmsLB, TQ_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotParmRightButtonClicked(TQListBoxItem *, const TQPoint &))); - connect(m_pParmsLB, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), - this, TQT_SLOT(slotParmDoubleClick(TQListBoxItem *))); + connect(m_pParmsLB, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), + this, TQ_SLOT(slotParmDoubleClick(TQListBoxItem *))); m_pNameLE->setFocus(); - connect( m_pNameLE, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotNameChanged( const TQString & ) ) ); + connect( m_pNameLE, TQ_SIGNAL( textChanged ( const TQString & ) ), TQ_SLOT( slotNameChanged( const TQString & ) ) ); slotNameChanged(m_pNameLE->text() ); } @@ -271,20 +271,20 @@ void UMLOperationDialog::slotParmRightButtonPressed(TQListBoxItem *item, const T } if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotParmPopupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotParmPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } m_pMenu = new ListPopupMenu(this, type); m_pMenu->popup(p); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotParmPopupMenuSel(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotParmPopupMenuSel(int))); } void UMLOperationDialog::slotParmRightButtonClicked(TQListBoxItem */*item*/, const TQPoint &/*p*/) { if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotParmPopupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotParmPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp index 7c1df12d..5ee46782 100644 --- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp +++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp @@ -80,8 +80,8 @@ void UMLWidgetColorPage::init() colorLayout -> addWidget( m_pUseFillColorCB, 2, 0 ); //connect button signals up - connect( m_pLineDefaultB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotLineButtonClicked() )) ; - connect( m_pFillDefaultB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotFillButtonClicked() ) ); + connect( m_pLineDefaultB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotLineButtonClicked() )) ; + connect( m_pFillDefaultB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotFillButtonClicked() ) ); } UMLWidgetColorPage::~UMLWidgetColorPage() {} diff --git a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp index c57dad97..925aa03f 100644 --- a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp +++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp @@ -72,7 +72,7 @@ bool XhtmlGenerator::generateXhtmlForProjectInto(const KURL& destDir) return false; } kDebug() << "Connecting..." << endl; - connect(docbookJob, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotDocbookToXhtml( TDEIO::Job *))); + connect(docbookJob, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotDocbookToXhtml( TDEIO::Job *))); return true; } @@ -152,7 +152,7 @@ void XhtmlGenerator::slotDocbookToXhtml(TDEIO::Job * docbookJob) kDebug() << "Copying HTML result to: " << xhtmlUrl << endl; TDEIO::Job* job = TDEIO::file_copy(tmpXhtml.file()->name(),xhtmlUrl,-1,true,false,false); job->setAutoErrorHandlingEnabled(true); - connect (job, TQT_SIGNAL(result( TDEIO::Job* )), this, TQT_SLOT(slotHtmlCopyFinished( TDEIO::Job* ))); + connect (job, TQ_SIGNAL(result( TDEIO::Job* )), this, TQ_SLOT(slotHtmlCopyFinished( TDEIO::Job* ))); TQString cssFileName(TDEGlobal::dirs()->findResource("appdata","xmi.css")); kDebug() << "CSS file is'"<<cssFileName<<"'" << endl; diff --git a/umbrello/umbrello/entity.cpp b/umbrello/umbrello/entity.cpp index 2df53283..09a99572 100644 --- a/umbrello/umbrello/entity.cpp +++ b/umbrello/umbrello/entity.cpp @@ -100,7 +100,7 @@ UMLObject* UMLEntity::addEntityAttribute(const TQString& name, Uml::IDType id) { m_List.append(literal); emit entityAttributeAdded(literal); UMLObject::emitModified(); - connect(literal,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(literal,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return literal; } @@ -112,7 +112,7 @@ bool UMLEntity::addEntityAttribute(UMLEntityAttribute* attribute, IDChangeLog* L m_List.append(attribute); emit entityAttributeAdded(attribute); UMLObject::emitModified(); - connect(attribute,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(attribute,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return true; } else if (Log) { Log->removeChangeByNewID( attribute->getID() ); @@ -133,7 +133,7 @@ bool UMLEntity::addEntityAttribute(UMLEntityAttribute* attribute, int position) } emit entityAttributeAdded(attribute); UMLObject::emitModified(); - connect(attribute,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(attribute,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return true; } return false; @@ -148,7 +148,7 @@ int UMLEntity::removeEntityAttribute(UMLClassifierListItem* literal) { UMLObject::emitModified(); // If we are deleting the object, then we don't need to disconnect..this is done auto-magically // for us by TQObject. -b.t. - // disconnect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + // disconnect(a,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); delete literal; return m_List.count(); } diff --git a/umbrello/umbrello/enum.cpp b/umbrello/umbrello/enum.cpp index 90682d51..fefdf808 100644 --- a/umbrello/umbrello/enum.cpp +++ b/umbrello/umbrello/enum.cpp @@ -102,7 +102,7 @@ UMLObject* UMLEnum::addEnumLiteral(const TQString &name, Uml::IDType id) { m_List.append(literal); UMLObject::emitModified(); emit enumLiteralAdded(literal); - connect(literal,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(literal,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return literal; } @@ -114,7 +114,7 @@ bool UMLEnum::addEnumLiteral(UMLEnumLiteral* literal, IDChangeLog* Log /* = 0*/) m_List.append(literal); UMLObject::emitModified(); emit enumLiteralAdded(literal); - connect(literal,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(literal,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return true; } else if (Log) { Log->removeChangeByNewID( literal->getID() ); @@ -135,7 +135,7 @@ bool UMLEnum::addEnumLiteral(UMLEnumLiteral* literal, int position) { } UMLObject::emitModified(); emit enumLiteralAdded(literal); - connect(literal,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(literal,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return true; } return false; @@ -150,7 +150,7 @@ int UMLEnum::removeEnumLiteral(UMLEnumLiteral* literal) { UMLObject::emitModified(); // If we are deleting the object, then we don't need to disconnect..this is done auto-magically // for us by TQObject. -b.t. - // disconnect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + // disconnect(a,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); delete literal; return m_List.count(); } diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp index 9df37596..e09180da 100644 --- a/umbrello/umbrello/kplayerslideraction.cpp +++ b/umbrello/umbrello/kplayerslideraction.cpp @@ -77,7 +77,7 @@ KPlayerPopupSliderAction::KPlayerPopupSliderAction (const TQString& text, m_frame -> resize (36, m_slider -> sizeHint().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); + connect (m_slider, TQ_SIGNAL (changed (int)), receiver, slot); } KPlayerPopupSliderAction::~KPlayerPopupSliderAction() @@ -163,7 +163,7 @@ KPlayerSliderAction::KPlayerSliderAction (const TQString& text, const TDEShortcu //: TDEAction (text, 0, parent, name) { setAutoSized (true); - connect (slider(), TQT_SIGNAL (changed (int)), receiver, slot); + connect (slider(), TQ_SIGNAL (changed (int)), receiver, slot); } KPlayerSliderAction::~KPlayerSliderAction() @@ -199,8 +199,8 @@ int KPlayerSliderAction::plug (TQWidget* widget, int index) //addContainer (toolbar, id); //setupToolbar (toolbar -> orientation(), toolbar); orientationChanged (toolbar -> orientation()); - connect (toolbar, TQT_SIGNAL (orientationChanged (TQt::Orientation)), this, TQT_SLOT (orientationChanged (TQt::Orientation))); - //connect (toolbar, TQT_SIGNAL (destroyed()), this, TQT_SLOT (toolbarDestroyed())); + connect (toolbar, TQ_SIGNAL (orientationChanged (TQt::Orientation)), this, TQ_SLOT (orientationChanged (TQt::Orientation))); + //connect (toolbar, TQ_SIGNAL (destroyed()), this, TQ_SLOT (toolbarDestroyed())); //if ( parentCollection() ) // parentCollection() -> connectHighlight (toolbar, this); //return containerCount() - 1; @@ -216,8 +216,8 @@ void KPlayerSliderAction::unplug (TQWidget* widget) if ( ! slider() || ! isPlugged() || widget != slider() -> parent() ) return; //TDEToolBar* toolbar = (TDEToolBar*) widget; - disconnect (widget, TQT_SIGNAL (orientationChanged (TQt::Orientation)), this, TQT_SLOT (orientationChanged (TQt::Orientation))); - //disconnect (toolbar, TQT_SIGNAL (destroyed()), this, TQT_SLOT (toolbarDestroyed())); + disconnect (widget, TQ_SIGNAL (orientationChanged (TQt::Orientation)), this, TQ_SLOT (orientationChanged (TQt::Orientation))); + //disconnect (toolbar, TQ_SIGNAL (destroyed()), this, TQ_SLOT (toolbarDestroyed())); //m_slider -> reparent (0, TQPoint()); /*int index = findContainer (toolbar); if ( index == -1 ) @@ -270,7 +270,7 @@ KPlayerSlider::KPlayerSlider (TQt::Orientation orientation, TQWidget* parent, co { m_changing_orientation = false; setTickmarks (TQSlider::Both); - connect (this, TQT_SIGNAL (valueChanged (int)), this, TQT_SLOT (sliderValueChanged (int))); + connect (this, TQ_SIGNAL (valueChanged (int)), this, TQ_SLOT (sliderValueChanged (int))); } KPlayerSlider::~KPlayerSlider() diff --git a/umbrello/umbrello/kstartuplogo.cpp b/umbrello/umbrello/kstartuplogo.cpp index 49d4d0f2..b330ef05 100644 --- a/umbrello/umbrello/kstartuplogo.cpp +++ b/umbrello/umbrello/kstartuplogo.cpp @@ -31,7 +31,7 @@ TDEStartupLogo::TDEStartupLogo(TQWidget * parent, const char *name) pm.width(),pm.height()); timer = new TQTimer(this); - connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) ); + connect( timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerDone()) ); timer->start(2000, true); } diff --git a/umbrello/umbrello/linepath.cpp b/umbrello/umbrello/linepath.cpp index df3f614d..f37e43bf 100644 --- a/umbrello/umbrello/linepath.cpp +++ b/umbrello/umbrello/linepath.cpp @@ -85,8 +85,8 @@ void LinePath::setAssociation(AssociationWidget * association ) { if( getAssocType() == Uml::at_Coll_Message ) setupParallelLine(); UMLView * view = (UMLView *)m_pAssociation -> parent(); - 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 ) ) ); + connect( view, TQ_SIGNAL( sigColorChanged( Uml::IDType ) ), this, TQ_SLOT( slotLineColorChanged( Uml::IDType ) ) ); + connect( view, TQ_SIGNAL( sigLineWidthChanged( Uml::IDType ) ), this, TQ_SLOT( slotLineWidthChanged( Uml::IDType ) ) ); } TQPoint LinePath::getPoint( int pointIndex ) { @@ -849,8 +849,8 @@ void LinePath::cleanup() { if( m_pAssociation ) { UMLView * view = (UMLView *)m_pAssociation -> parent(); 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 ) ) ); + disconnect( view, TQ_SIGNAL( sigColorChanged( Uml::IDType ) ), this, TQ_SLOT( slotLineColorChanged( Uml::IDType ) ) ); + disconnect( view, TQ_SIGNAL( sigLineWidthChanged( Uml::IDType ) ), this, TQ_SLOT( slotLineWidthChanged( Uml::IDType ) ) ); } m_pAssociation = NULL; } diff --git a/umbrello/umbrello/listpopupmenu.cpp b/umbrello/umbrello/listpopupmenu.cpp index dedf4352..7eae2846 100644 --- a/umbrello/umbrello/listpopupmenu.cpp +++ b/umbrello/umbrello/listpopupmenu.cpp @@ -249,11 +249,11 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object, } if(m_pInsert) - connect(m_pInsert, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated(int))); + connect(m_pInsert, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated(int))); if(m_pShow) - connect(m_pShow, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated(int))); + connect(m_pShow, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated(int))); if(m_pColor) - connect(m_pColor, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated(int))); + connect(m_pColor, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated(int))); return; } @@ -437,11 +437,11 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object, }//end switch if(m_pInsert) - connect(m_pInsert, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated(int))); + connect(m_pInsert, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated(int))); if(m_pShow) - connect(m_pShow, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated(int))); + connect(m_pShow, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated(int))); if(m_pColor) - connect(m_pColor, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated(int))); + connect(m_pColor, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated(int))); bool bCutState = UMLApp::app() -> getCutCopyState(); setItemEnabled( mt_Cut, bCutState ); @@ -1321,11 +1321,11 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { setItemEnabled( mt_Paste, UMLApp::app() -> getPasteState() ); } if(m_pInsert) - connect(m_pInsert, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated(int))); + connect(m_pInsert, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated(int))); if(m_pShow) - connect(m_pShow, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated(int))); + connect(m_pShow, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated(int))); if(m_pColor) - connect(m_pColor, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated(int))); + connect(m_pColor, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated(int))); } void ListPopupMenu::setupDiagramMenu(UMLView* view) { diff --git a/umbrello/umbrello/messagewidget.cpp b/umbrello/umbrello/messagewidget.cpp index 09906491..a43effda 100644 --- a/umbrello/umbrello/messagewidget.cpp +++ b/umbrello/umbrello/messagewidget.cpp @@ -466,11 +466,11 @@ bool MessageWidget::activate(IDChangeLog * Log /*= 0*/) { TQString messageText = m_pFText->getText(); m_pFText->setVisible( 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))); + connect(m_pOw[Uml::A], TQ_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQ_SLOT(slotWidgetMoved(Uml::IDType))); + connect(m_pOw[Uml::B], TQ_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQ_SLOT(slotWidgetMoved(Uml::IDType))); - connect(this, TQT_SIGNAL(sigMessageMoved()), m_pOw[Uml::A], TQT_SLOT(slotMessageMoved()) ); - connect(this, TQT_SIGNAL(sigMessageMoved()), m_pOw[Uml::B], TQT_SLOT(slotMessageMoved()) ); + connect(this, TQ_SIGNAL(sigMessageMoved()), m_pOw[Uml::A], TQ_SLOT(slotMessageMoved()) ); + connect(this, TQ_SIGNAL(sigMessageMoved()), m_pOw[Uml::B], TQ_SLOT(slotMessageMoved()) ); m_pOw[Uml::A] -> messageAdded(this); m_pOw[Uml::B] -> messageAdded(this); calculateDimensions(); @@ -523,10 +523,10 @@ UMLOperation *MessageWidget::getOperation() { void MessageWidget::setOperation(UMLOperation *op) { if (m_pObject && m_pFText) - disconnect(m_pObject, TQT_SIGNAL(modified()), m_pFText, TQT_SLOT(setMessageText())); + disconnect(m_pObject, TQ_SIGNAL(modified()), m_pFText, TQ_SLOT(setMessageText())); m_pObject = op; if (m_pObject && m_pFText) - connect(m_pObject, TQT_SIGNAL(modified()), m_pFText, TQT_SLOT(setMessageText())); + connect(m_pObject, TQ_SIGNAL(modified()), m_pFText, TQ_SLOT(setMessageText())); } TQString MessageWidget::getCustomOpText() { @@ -661,11 +661,11 @@ void MessageWidget::calculateDimensionsCreation() { void MessageWidget::cleanup() { if (m_pOw[Uml::A]) { - disconnect(this, TQT_SIGNAL(sigMessageMoved()), m_pOw[Uml::A], TQT_SLOT(slotMessageMoved()) ); + disconnect(this, TQ_SIGNAL(sigMessageMoved()), m_pOw[Uml::A], TQ_SLOT(slotMessageMoved()) ); m_pOw[Uml::A]->messageRemoved(this); } if (m_pOw[Uml::B]) { - disconnect(this, TQT_SIGNAL(sigMessageMoved()), m_pOw[Uml::B], TQT_SLOT(slotMessageMoved()) ); + disconnect(this, TQ_SIGNAL(sigMessageMoved()), m_pOw[Uml::B], TQ_SLOT(slotMessageMoved()) ); m_pOw[Uml::B]->messageRemoved(this); } diff --git a/umbrello/umbrello/notewidget.cpp b/umbrello/umbrello/notewidget.cpp index 29ba1906..e2124fb1 100644 --- a/umbrello/umbrello/notewidget.cpp +++ b/umbrello/umbrello/notewidget.cpp @@ -45,8 +45,8 @@ NoteWidget::NoteWidget(UMLView * view, Uml::IDType id) m_pEditor->setTextFormat(TQt::RichText); m_pEditor->setShown(true); setEditorGeometry(); - connect(m_pView, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotViewScrolled(int, int))); + connect(m_pView, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotViewScrolled(int, int))); #endif } diff --git a/umbrello/umbrello/operation.cpp b/umbrello/umbrello/operation.cpp index 18b1b3ba..563c67be 100644 --- a/umbrello/umbrello/operation.cpp +++ b/umbrello/umbrello/operation.cpp @@ -63,7 +63,7 @@ void UMLOperation::moveParmLeft(UMLAttribute * a) { } kDebug() << "UMLOperation::moveParmLeft(" << a->getName() << ") called" << endl; - disconnect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + disconnect(a,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); int idx; if ( (idx=m_List.find( a )) == -1 ) { kDebug() << "Error move parm left " << a->getName() << endl; @@ -83,7 +83,7 @@ void UMLOperation::moveParmRight(UMLAttribute * a) { } kDebug() << "UMLOperation::moveParmRight(" << a->getName() << ") called" << endl; - disconnect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + disconnect(a,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); int idx; if ( (idx=m_List.find( a )) == -1 ) { kDebug() << "Error move parm right " << a->getName() << endl; @@ -104,7 +104,7 @@ void UMLOperation::removeParm(UMLAttribute * a, bool emitModifiedSignal /* =true } kDebug() << "UMLOperation::removeParm(" << a->getName() << ") called" << endl; - disconnect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + disconnect(a,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); if(!m_List.remove(a)) kDebug() << "Error removing parm " << a->getName() << endl; @@ -178,7 +178,7 @@ void UMLOperation::addParm(UMLAttribute *parameter, int position) { else m_List.append( parameter ); UMLObject::emitModified(); - connect(parameter,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(parameter,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); } TQString UMLOperation::getUniqueParameterName() { diff --git a/umbrello/umbrello/ownedcodeblock.cpp b/umbrello/umbrello/ownedcodeblock.cpp index f80fd315..d26ac6f1 100644 --- a/umbrello/umbrello/ownedcodeblock.cpp +++ b/umbrello/umbrello/ownedcodeblock.cpp @@ -168,7 +168,7 @@ void OwnedCodeBlock::initFields(UMLObject * parent ) // this code block and the parent UMLObject..when the parent // signals a change has been made, we automatically update // ourselves - connect(m_parentObject, TQT_SIGNAL(modified()), this, TQT_SLOT(syncToParent())); + connect(m_parentObject, TQ_SIGNAL(modified()), this, TQ_SLOT(syncToParent())); } /** diff --git a/umbrello/umbrello/pluginloader.cpp b/umbrello/umbrello/pluginloader.cpp index eb3fd1e0..88fe47cd 100644 --- a/umbrello/umbrello/pluginloader.cpp +++ b/umbrello/umbrello/pluginloader.cpp @@ -117,7 +117,7 @@ PluginLoader::loadPlugin(const TQString &name) // reference to it if(success) { plugin->ref(); - connect(plugin, TQT_SIGNAL(destroyed(TQObject *)), TQT_SLOT(slotDestroyed(TQObject *))); + connect(plugin, TQ_SIGNAL(destroyed(TQObject *)), TQ_SLOT(slotDestroyed(TQObject *))); } return plugin; diff --git a/umbrello/umbrello/refactoring/refactoringassistant.cpp b/umbrello/umbrello/refactoring/refactoringassistant.cpp index bd55cf5d..dbaf73e5 100644 --- a/umbrello/umbrello/refactoring/refactoringassistant.cpp +++ b/umbrello/umbrello/refactoring/refactoringassistant.cpp @@ -56,9 +56,9 @@ RefactoringAssistant::RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj, TQW m_menu = new TQPopupMenu(this); - connect(this,TQT_SIGNAL(doubleClicked(TQListViewItem*)),this,TQT_SLOT(itemExecuted(TQListViewItem*))); - connect(this,TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this,TQT_SLOT(showContextMenu(TDEListView*,TQListViewItem*,const TQPoint&))); + connect(this,TQ_SIGNAL(doubleClicked(TQListViewItem*)),this,TQ_SLOT(itemExecuted(TQListViewItem*))); + connect(this,TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this,TQ_SLOT(showContextMenu(TDEListView*,TQListViewItem*,const TQPoint&))); resize(300,400); @@ -177,7 +177,7 @@ void RefactoringAssistant::operationAdded( UMLClassifierListItem *o ) { item = new TDEListViewItem( folder, op->getName() ); m_umlObjectMap[item] = op; - connect( op, TQT_SIGNAL( modified() ), this, TQT_SLOT( umlObjectModified() ) ); + connect( op, TQ_SIGNAL( modified() ), this, TQ_SLOT( umlObjectModified() ) ); setVisibilityIcon( item, op ); break; } @@ -192,7 +192,7 @@ void RefactoringAssistant::operationRemoved( UMLClassifierListItem *o ) { return; } - disconnect( op, TQT_SIGNAL( modified() ), this, TQT_SLOT( umlObjectModified() ) ); + disconnect( op, TQ_SIGNAL( modified() ), this, TQ_SLOT( umlObjectModified() ) ); m_umlObjectMap.erase(item); delete item; } @@ -219,7 +219,7 @@ void RefactoringAssistant::attributeAdded( UMLClassifierListItem *a ) { item = new TDEListViewItem( folder, att->getName() ); m_umlObjectMap[item] = att; - connect( att, TQT_SIGNAL( modified() ), this, TQT_SLOT( umlObjectModified() ) ); + connect( att, TQ_SIGNAL( modified() ), this, TQ_SLOT( umlObjectModified() ) ); setVisibilityIcon( item, att ); break; } @@ -234,7 +234,7 @@ void RefactoringAssistant::attributeRemoved( UMLClassifierListItem *a ) { return; } - disconnect( att, TQT_SIGNAL( modified() ), this, TQT_SLOT( umlObjectModified() ) ); + disconnect( att, TQ_SIGNAL( modified() ), this, TQ_SLOT( umlObjectModified() ) ); m_umlObjectMap.erase(item); delete item; } @@ -286,17 +286,17 @@ void RefactoringAssistant::showContextMenu(TDEListView* ,TQListViewItem *item, c Uml::Object_Type t = obj->getBaseType(); if (t == Uml::ot_Class) { - m_menu->insertItem(i18n("Add Base Class"),this,TQT_SLOT(addBaseClassifier())); - m_menu->insertItem(i18n("Add Derived Class"),this,TQT_SLOT(addDerivedClassifier())); - // m_menu->insertItem(i18n("Add Interface Implementation"),this,TQT_SLOT(addInterfaceImplementation())); - m_menu->insertItem(i18n("Add Operation"),this,TQT_SLOT(createOperation())); - m_menu->insertItem(i18n("Add Attribute"),this,TQT_SLOT(createAttribute())); + m_menu->insertItem(i18n("Add Base Class"),this,TQ_SLOT(addBaseClassifier())); + m_menu->insertItem(i18n("Add Derived Class"),this,TQ_SLOT(addDerivedClassifier())); + // m_menu->insertItem(i18n("Add Interface Implementation"),this,TQ_SLOT(addInterfaceImplementation())); + m_menu->insertItem(i18n("Add Operation"),this,TQ_SLOT(createOperation())); + m_menu->insertItem(i18n("Add Attribute"),this,TQ_SLOT(createAttribute())); } else if (t == Uml::ot_Interface) { - m_menu->insertItem(i18n("Add Base Interface"),this,TQT_SLOT(addSuperClassifier())); - m_menu->insertItem(i18n("Add Derived Interface"),this,TQT_SLOT(addDerivedClassifier())); - m_menu->insertItem(i18n("Add Operation"),this,TQT_SLOT(createOperation())); + m_menu->insertItem(i18n("Add Base Interface"),this,TQ_SLOT(addSuperClassifier())); + m_menu->insertItem(i18n("Add Derived Interface"),this,TQ_SLOT(addDerivedClassifier())); + m_menu->insertItem(i18n("Add Operation"),this,TQ_SLOT(createOperation())); } // else // { @@ -304,17 +304,17 @@ void RefactoringAssistant::showContextMenu(TDEListView* ,TQListViewItem *item, c // return; // } m_menu->insertSeparator(); - m_menu->insertItem(i18n("Properties"),this,TQT_SLOT(editProperties())); + m_menu->insertItem(i18n("Properties"),this,TQ_SLOT(editProperties())); } else {//menu for other ViewItems if( item->text(1) == "operations" ) { - m_menu->insertItem(i18n("Add Operation"),this,TQT_SLOT(createOperation())); + m_menu->insertItem(i18n("Add Operation"),this,TQ_SLOT(createOperation())); } else if( item->text(1) == "attributes" ) { - m_menu->insertItem(i18n("Add Attribute"),this,TQT_SLOT(createAttribute())); + m_menu->insertItem(i18n("Add Attribute"),this,TQ_SLOT(createAttribute())); } else { @@ -469,15 +469,15 @@ void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewI m_umlObjectMap[classifierItem] = classifier; } - connect( classifier, TQT_SIGNAL( modified() ), this, TQT_SLOT( umlObjectModified() ) ); + connect( classifier, TQ_SIGNAL( modified() ), this, TQ_SLOT( umlObjectModified() ) ); UMLClassifier *klass = dynamic_cast<UMLClassifier*>(classifier); if( klass ) {// only Classes have attributes... - connect( classifier, TQT_SIGNAL(attributeAdded(UMLClassifierListItem*)), - this, TQT_SLOT(attributeAdded(UMLClassifierListItem*))); - connect( classifier, TQT_SIGNAL(attributeRemoved(UMLClassifierListItem*)), - this, TQT_SLOT(attributeRemoved(UMLClassifierListItem*))); + connect( classifier, TQ_SIGNAL(attributeAdded(UMLClassifierListItem*)), + this, TQ_SLOT(attributeAdded(UMLClassifierListItem*))); + connect( classifier, TQ_SIGNAL(attributeRemoved(UMLClassifierListItem*)), + this, TQ_SLOT(attributeRemoved(UMLClassifierListItem*))); TQListViewItem *attsFolder = new TDEListViewItem( classifierItem, i18n("Attributes"), "attributes" ); attsFolder->setPixmap(0,SmallIcon("folder_green_open")); @@ -491,10 +491,10 @@ void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewI } // add operations - connect( classifier, TQT_SIGNAL(operationAdded(UMLClassifierListItem*)), - this, TQT_SLOT(operationAdded(UMLClassifierListItem*))); - connect( classifier, TQT_SIGNAL(operationRemoved(UMLClassifierListItem*)), - this, TQT_SLOT(operationRemoved(UMLClassifierListItem*))); + connect( classifier, TQ_SIGNAL(operationAdded(UMLClassifierListItem*)), + this, TQ_SLOT(operationAdded(UMLClassifierListItem*))); + connect( classifier, TQ_SIGNAL(operationRemoved(UMLClassifierListItem*)), + this, TQ_SLOT(operationRemoved(UMLClassifierListItem*))); TQListViewItem *opsFolder = new TDEListViewItem( classifierItem, i18n("Operations"), "operations" ); opsFolder->setPixmap(0,SmallIcon("folder_blue_open")); diff --git a/umbrello/umbrello/toolbarstate.cpp b/umbrello/umbrello/toolbarstate.cpp index cae6acf8..d539c512 100644 --- a/umbrello/umbrello/toolbarstate.cpp +++ b/umbrello/umbrello/toolbarstate.cpp @@ -32,17 +32,17 @@ void ToolBarState::init() { m_currentWidget = 0; m_currentAssociation = 0; - connect(m_pUMLView, TQT_SIGNAL(sigAssociationRemoved(AssociationWidget*)), - this, TQT_SLOT(slotAssociationRemoved(AssociationWidget*))); - connect(m_pUMLView, TQT_SIGNAL(sigWidgetRemoved(UMLWidget*)), - this, TQT_SLOT(slotWidgetRemoved(UMLWidget*))); + connect(m_pUMLView, TQ_SIGNAL(sigAssociationRemoved(AssociationWidget*)), + this, TQ_SLOT(slotAssociationRemoved(AssociationWidget*))); + connect(m_pUMLView, TQ_SIGNAL(sigWidgetRemoved(UMLWidget*)), + this, TQ_SLOT(slotWidgetRemoved(UMLWidget*))); } void ToolBarState::cleanBeforeChange() { - disconnect(m_pUMLView, TQT_SIGNAL(sigAssociationRemoved(AssociationWidget*)), - this, TQT_SLOT(slotAssociationRemoved(AssociationWidget*))); - disconnect(m_pUMLView, TQT_SIGNAL(sigWidgetRemoved(UMLWidget*)), - this, TQT_SLOT(slotWidgetRemoved(UMLWidget*))); + disconnect(m_pUMLView, TQ_SIGNAL(sigAssociationRemoved(AssociationWidget*)), + this, TQ_SLOT(slotAssociationRemoved(AssociationWidget*))); + disconnect(m_pUMLView, TQ_SIGNAL(sigWidgetRemoved(UMLWidget*)), + this, TQ_SLOT(slotWidgetRemoved(UMLWidget*))); } void ToolBarState::mousePress(TQMouseEvent* ome) { diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp index 961a66d5..7f103cb4 100644 --- a/umbrello/umbrello/uml.cpp +++ b/umbrello/umbrello/uml.cpp @@ -134,8 +134,8 @@ UMLApp::UMLApp(TQWidget* , const char* name):KDockMainWindow(0, name) { //connect zoomSelect menu m_zoomSelect->setCheckable(true); - connect(m_zoomSelect,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupZoomMenu())); - connect(m_zoomSelect,TQT_SIGNAL(activated(int)),this,TQT_SLOT(setZoom(int))); + connect(m_zoomSelect,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(setupZoomMenu())); + connect(m_zoomSelect,TQ_SIGNAL(activated(int)),this,TQ_SLOT(setZoom(int))); m_refactoringAssist = 0L; @@ -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(this, TQ_SLOT(slotFileNew()), actionCollection()); + fileOpen = KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection()); + fileOpenRecent = KStdAction::openRecent(this, TQ_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + fileSave = KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection()); + fileSaveAs = KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection()); + fileClose = KStdAction::close(this, TQ_SLOT(slotFileClose()), actionCollection()); + filePrint = KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection()); + fileQuit = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); + editUndo = KStdAction::undo(this, TQ_SLOT(slotEditUndo()), actionCollection()); + editRedo = KStdAction::redo(this, TQ_SLOT(slotEditRedo()), actionCollection()); + editCut = KStdAction::cut(this, TQ_SLOT(slotEditCut()), actionCollection()); + editCopy = KStdAction::copy(this, TQ_SLOT(slotEditCopy()), actionCollection()); + editPaste = KStdAction::paste(this, TQ_SLOT(slotEditPaste()), actionCollection()); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - selectAll = KStdAction::selectAll(this, TQT_SLOT( slotSelectAll() ), actionCollection()); + selectAll = KStdAction::selectAll(this, TQ_SLOT( slotSelectAll() ), actionCollection()); fileExportDocbook = new TDEAction(i18n("&Export model to DocBook"), 0, - this, TQT_SLOT( slotFileExportDocbook() ), + this, TQ_SLOT( slotFileExportDocbook() ), actionCollection(), "file_export_docbook"); fileExportXhtml = new TDEAction(i18n("&Export model to XHTML"), 0, - this, TQT_SLOT( slotFileExportXhtml() ), + this, TQ_SLOT( slotFileExportXhtml() ), actionCollection(), "file_export_xhtml"); - classWizard = new TDEAction(i18n("&New Class Wizard..."),0,this,TQT_SLOT(slotClassWizard()), + classWizard = new TDEAction(i18n("&New Class Wizard..."),0,this,TQ_SLOT(slotClassWizard()), actionCollection(),"class_wizard"); new TDEAction(i18n("&Add Default Datatypes for Active Language"), 0, this, - TQT_SLOT(slotAddDefaultDatatypes()), actionCollection(), "create_default_datatypes"); + TQ_SLOT(slotAddDefaultDatatypes()), actionCollection(), "create_default_datatypes"); - preferences = KStdAction::preferences(this, TQT_SLOT( slotPrefs() ), actionCollection()); + preferences = KStdAction::preferences(this, TQ_SLOT( slotPrefs() ), actionCollection()); - genWizard = new TDEAction(i18n("&Code Generation Wizard..."),0,this,TQT_SLOT(generationWizard()), + genWizard = new TDEAction(i18n("&Code Generation Wizard..."),0,this,TQ_SLOT(generationWizard()), actionCollection(),"generation_wizard"); - genAll = new TDEAction(i18n("&Generate All Code"),0,this,TQT_SLOT(generateAllCode()), + genAll = new TDEAction(i18n("&Generate All Code"),0,this,TQ_SLOT(generateAllCode()), actionCollection(),"generate_all"); importClasses = new TDEAction(i18n("&Import Classes..."), SmallIconSet("text-x-c++src"), 0, - this,TQT_SLOT(slotImportClasses()), actionCollection(),"import_class"); + this,TQ_SLOT(slotImportClasses()), actionCollection(),"import_class"); fileNew->setToolTip(i18n("Creates a new document")); fileOpen->setToolTip(i18n("Opens an existing document")); @@ -216,62 +216,62 @@ void UMLApp::initActions() { deleteSelectedWidget = new TDEAction( i18n("Delete &Selected"), SmallIconSet("edit-delete"), TDEShortcut(TQt::Key_Delete), this, - TQT_SLOT( slotDeleteSelectedWidget() ), actionCollection(), + TQ_SLOT( slotDeleteSelectedWidget() ), actionCollection(), "delete_selected" ); // The different views newDiagram = new TDEActionMenu(0, SmallIconSet("document-new"), actionCollection(), "new_view"); classDiagram = new TDEAction( i18n( "&Class Diagram..." ), SmallIconSet("umbrello_diagram_class"), 0, - this, TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" ); + this, TQ_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" ); #if defined (HAVE_DOT) - autolayout = new TDEAction(i18n("&Autolayout..."),0,0,this,TQT_SLOT(slotAutolayout()), + autolayout = new TDEAction(i18n("&Autolayout..."),0,0,this,TQ_SLOT(slotAutolayout()), actionCollection(),"autolayout"); #endif sequenceDiagram= new TDEAction( i18n( "&Sequence Diagram..." ), SmallIconSet("umbrello_diagram_sequence"), 0, - this, TQT_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" ); + this, TQ_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" ); collaborationDiagram = new TDEAction( i18n( "C&ollaboration Diagram..." ), SmallIconSet("umbrello_diagram_collaboration"), 0, - this, TQT_SLOT( slotCollaborationDiagram() ), actionCollection(), "new_collaboration_diagram" ); + this, TQ_SLOT( slotCollaborationDiagram() ), actionCollection(), "new_collaboration_diagram" ); useCaseDiagram= new TDEAction( i18n( "&Use Case Diagram..." ), SmallIconSet("umbrello_diagram_usecase"), 0, - this, TQT_SLOT( slotUseCaseDiagram() ), actionCollection(), "new_use_case_diagram" ); + this, TQ_SLOT( slotUseCaseDiagram() ), actionCollection(), "new_use_case_diagram" ); stateDiagram= new TDEAction( i18n( "S&tate Diagram..." ), SmallIconSet("umbrello_diagram_state"), 0, - this, TQT_SLOT( slotStateDiagram() ), actionCollection(), "new_state_diagram" ); + this, TQ_SLOT( slotStateDiagram() ), actionCollection(), "new_state_diagram" ); activityDiagram= new TDEAction( i18n( "&Activity Diagram..." ), SmallIconSet("umbrello_diagram_activity"), 0, - this, TQT_SLOT( slotActivityDiagram() ), actionCollection(), "new_activity_diagram" ); + this, TQ_SLOT( slotActivityDiagram() ), actionCollection(), "new_activity_diagram" ); componentDiagram = new TDEAction( i18n("Co&mponent Diagram..."), SmallIconSet("umbrello_diagram_component"), 0, - this, TQT_SLOT( slotComponentDiagram() ), actionCollection(), + this, TQ_SLOT( slotComponentDiagram() ), actionCollection(), "new_component_diagram" ); deploymentDiagram = new TDEAction( i18n("&Deployment Diagram..."), SmallIconSet("umbrello_diagram_deployment"), 0, - this, TQT_SLOT( slotDeploymentDiagram() ), actionCollection(), + this, TQ_SLOT( slotDeploymentDiagram() ), actionCollection(), "new_deployment_diagram" ); entityRelationshipDiagram = new TDEAction( i18n("&Entity Relationship Diagram..."), SmallIconSet("umbrello_diagram_entityrelationship"), 0, - this, TQT_SLOT( slotEntityRelationshipDiagram() ), actionCollection(), + this, TQ_SLOT( slotEntityRelationshipDiagram() ), actionCollection(), "new_entityrelationship_diagram" ); viewClearDiagram = new TDEAction(i18n("&Clear Diagram"), SmallIconSet("edit-clear"), 0, - this, TQT_SLOT( slotCurrentViewClearDiagram() ), actionCollection(), "view_clear_diagram"); + this, TQ_SLOT( slotCurrentViewClearDiagram() ), actionCollection(), "view_clear_diagram"); viewSnapToGrid = new TDEToggleAction(i18n("&Snap to Grid"), 0, - this, TQT_SLOT( slotCurrentViewToggleSnapToGrid() ), actionCollection(), "view_snap_to_grid"); + this, TQ_SLOT( slotCurrentViewToggleSnapToGrid() ), actionCollection(), "view_snap_to_grid"); viewShowGrid = new TDEToggleAction(i18n("S&how Grid"), 0, - this, TQT_SLOT( slotCurrentViewToggleShowGrid() ), actionCollection(), "view_show_grid"); + this, TQ_SLOT( slotCurrentViewToggleShowGrid() ), actionCollection(), "view_show_grid"); #if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3) viewShowGrid->setCheckedState(i18n("&Hide Grid")); #endif deleteDiagram = new TDEAction(i18n("&Delete"), SmallIconSet("edit-delete"), 0, - this, TQT_SLOT( slotDeleteDiagram() ), actionCollection(), "view_delete"); + this, TQ_SLOT( slotDeleteDiagram() ), actionCollection(), "view_delete"); viewExportImage = new TDEAction(i18n("&Export as Picture..."), SmallIconSet("image-x-generic"), 0, - this, TQT_SLOT( slotCurrentViewExportImage() ), actionCollection(), "view_export_image"); + this, TQ_SLOT( slotCurrentViewExportImage() ), actionCollection(), "view_export_image"); viewExportImageAll = new TDEAction(i18n("Export &All Diagrams as Pictures..."), SmallIconSet("image-x-generic"), 0, - this, TQT_SLOT( slotAllViewsExportImage() ), actionCollection(), "view_export_image_all"); + this, TQ_SLOT( slotAllViewsExportImage() ), actionCollection(), "view_export_image_all"); viewProperties = new TDEAction(i18n("&Properties"), SmallIconSet("application-vnd.tde.info"), 0, - this, TQT_SLOT( slotCurrentViewProperties() ), actionCollection(), "view_properties"); + this, TQ_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)), + this, TQ_SLOT(slotZoomSliderMoved(int)), actionCollection(), "popup_zoom"); zoom100Action = new TDEAction(i18n( "Z&oom to 100%" ), "zoom-original", 0, - this, TQT_SLOT( slotZoom100() ), actionCollection(), + this, TQ_SLOT( slotZoom100() ), actionCollection(), "zoom100"); - KStdAction::tipOfDay( this, TQT_SLOT( tipOfTheDay() ), actionCollection() ); + KStdAction::tipOfDay( this, TQ_SLOT( tipOfTheDay() ), actionCollection() ); TQString moveTabLeftString = i18n("&Move Tab Left"); TQString moveTabRightString = i18n("&Move Tab Right"); moveTabLeft = new TDEAction(TQApplication::reverseLayout() ? moveTabRightString : moveTabLeftString, TQApplication::reverseLayout() ? "forward" : "back", TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, - this, TQT_SLOT(slotMoveTabLeft()), actionCollection(), + this, TQ_SLOT(slotMoveTabLeft()), actionCollection(), "move_tab_left"); moveTabRight = new TDEAction(TQApplication::reverseLayout() ? moveTabLeftString : moveTabRightString, TQApplication::reverseLayout() ? "back" : "forward", TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, - this, TQT_SLOT(slotMoveTabRight()), actionCollection(), + this, TQ_SLOT(slotMoveTabRight()), actionCollection(), "move_tab_right"); TQString selectTabLeftString = i18n("Select Diagram on Left"); TQString selectTabRightString = i18n("Select Diagram on Right"); changeTabLeft = new TDEAction(TQApplication::reverseLayout() ? selectTabRightString : selectTabLeftString, TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Right : TQt::SHIFT+TQt::Key_Left, - this, TQT_SLOT(slotChangeTabLeft()), actionCollection(), "previous_tab"); + this, TQ_SLOT(slotChangeTabLeft()), actionCollection(), "previous_tab"); changeTabRight = new TDEAction(TQApplication::reverseLayout() ? selectTabLeftString : selectTabRightString, TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Left : TQt::SHIFT+TQt::Key_Right, - this, TQT_SLOT(slotChangeTabRight()), actionCollection(), "next_tab"); + this, TQ_SLOT(slotChangeTabRight()), actionCollection(), "next_tab"); initStatusBar(); //call this here because the statusBar is shown/hidden by setupGUI() @@ -384,7 +384,7 @@ void UMLApp::initStatusBar() { m_statusLabel->setAlignment(TQt::AlignLeft|TQt::AlignVCenter); - connect(m_doc, TQT_SIGNAL( sigWriteToStatusBar(const TQString &) ), this, TQT_SLOT( slotStatusMsg(const TQString &) )); + connect(m_doc, TQ_SIGNAL( sigWriteToStatusBar(const TQString &) ), this, TQ_SLOT( slotStatusMsg(const TQString &) )); } void UMLApp::initView() { @@ -417,15 +417,15 @@ void UMLApp::initView() { m_newSessionButton->setAutoRaise(true); m_diagramMenu = new TDEPopupMenu(m_newSessionButton); - m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Class), i18n("Class Diagram..."), this, TQT_SLOT(slotClassDiagram()) ); - m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Sequence), i18n("Sequence Diagram..."), this, TQT_SLOT(slotSequenceDiagram()) ); - m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Collaboration), i18n("Collaboration Diagram..."), this, TQT_SLOT(slotCollaborationDiagram()) ); - m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_UseCase), i18n("Use Case Diagram..."), this, TQT_SLOT(slotUseCaseDiagram()) ); - m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_State), i18n("State Diagram..."), this, TQT_SLOT(slotStateDiagram()) ); - m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Activity), i18n("Activity Diagram..."), this, TQT_SLOT(slotActivityDiagram()) ); - m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Component), i18n("Component Diagram..."), this, TQT_SLOT(slotComponentDiagram()) ); - m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Deployment), i18n("Deployment Diagram..."), this, TQT_SLOT(slotDeploymentDiagram()) ); - m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_EntityRelationship), i18n("Entity Relationship Diagram..."), this, TQT_SLOT(slotEntityRelationshipDiagram()) ); + m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Class), i18n("Class Diagram..."), this, TQ_SLOT(slotClassDiagram()) ); + m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Sequence), i18n("Sequence Diagram..."), this, TQ_SLOT(slotSequenceDiagram()) ); + m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Collaboration), i18n("Collaboration Diagram..."), this, TQ_SLOT(slotCollaborationDiagram()) ); + m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_UseCase), i18n("Use Case Diagram..."), this, TQ_SLOT(slotUseCaseDiagram()) ); + m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_State), i18n("State Diagram..."), this, TQ_SLOT(slotStateDiagram()) ); + m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Activity), i18n("Activity Diagram..."), this, TQ_SLOT(slotActivityDiagram()) ); + m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Component), i18n("Component Diagram..."), this, TQ_SLOT(slotComponentDiagram()) ); + m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Deployment), i18n("Deployment Diagram..."), this, TQ_SLOT(slotDeploymentDiagram()) ); + m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_EntityRelationship), i18n("Entity Relationship Diagram..."), this, TQ_SLOT(slotEntityRelationshipDiagram()) ); m_newSessionButton->setPopup(m_diagramMenu); //FIXME why doesn't this work? //m_newSessionButton->setPopup(newDiagram->popupMenu()); @@ -435,9 +435,9 @@ void UMLApp::initView() { m_closeDiagramButton->setIconSet( SmallIcon("tab_remove") ); m_closeDiagramButton->adjustSize(); - connect(m_closeDiagramButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteDiagram())); - connect(m_tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(slotTabChanged(TQWidget*))); - connect(m_tabWidget, TQT_SIGNAL(contextMenu(TQWidget*,const TQPoint&)), m_doc, TQT_SLOT(slotDiagramPopupMenu(TQWidget*,const TQPoint&))); + connect(m_closeDiagramButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteDiagram())); + connect(m_tabWidget, TQ_SIGNAL(currentChanged(TQWidget*)), TQ_SLOT(slotTabChanged(TQWidget*))); + connect(m_tabWidget, TQ_SIGNAL(contextMenu(TQWidget*,const TQPoint&)), m_doc, TQ_SLOT(slotDiagramPopupMenu(TQWidget*,const TQPoint&))); m_tabWidget->setCornerWidget( m_newSessionButton, TopLeft ); m_tabWidget->setCornerWidget( m_closeDiagramButton, TopRight ); m_newSessionButton->installEventFilter(this); @@ -806,7 +806,7 @@ void UMLApp::slotFileExportXhtml() } m_xhtmlGenerator = new XhtmlGenerator(); m_xhtmlGenerator->generateXhtmlForProject(); - connect(m_xhtmlGenerator,TQT_SIGNAL(finished()),this,TQT_SLOT(slotXhtmlDocGenerationFinished())); + connect(m_xhtmlGenerator,TQ_SIGNAL(finished()),this,TQ_SLOT(slotXhtmlDocGenerationFinished())); } void UMLApp::slotEditUndo() { @@ -978,7 +978,7 @@ void UMLApp::enableRedo(bool enable) { /** initialize the QT's global clipboard support for the application */ void UMLApp::initClip() { TQClipboard* clip = TQApplication::clipboard(); - connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged())); + connect(clip, TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipDataChanged())); // Don't poll the X11 clipboard every second. This is a little expensive and resulted // in very annoying umbrello slowdowns / hangs. TQt will notify us about clipboard @@ -987,11 +987,11 @@ void UMLApp::initClip() { // as well. (pfeiffer) // m_clipTimer = new TQTimer(this, "timer"); // m_clipTimer->start(1000, false); - // connect(m_clipTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotClipDataChanged())); + // connect(m_clipTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotClipDataChanged())); m_copyTimer = new TQTimer(this, "copytimer"); m_copyTimer->start(500, false); - connect(m_copyTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCopyChanged())); + connect(m_copyTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCopyChanged())); } bool UMLApp::canDecode(const TQMimeSource* mimeSource) { @@ -1030,7 +1030,7 @@ void UMLApp::slotPrefs() { optionState.generalState.tip = m_config->readBoolEntry( "RunOnStart", true ); m_dlg = new SettingsDlg(this, &optionState); - connect(m_dlg, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApplyPrefs() ) ); + connect(m_dlg, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( slotApplyPrefs() ) ); if ( m_dlg->exec() == TQDialog::Accepted && m_dlg->getChangesApplied() ) { slotApplyPrefs(); @@ -1077,7 +1077,7 @@ bool UMLApp::editCutCopy( bool bFromView ) { if ((clipdata = clipboard.copy(bFromView)) != 0) { TQClipboard* clip = TQApplication::clipboard(); clip->setData(clipdata);//the global clipboard takes ownership of the clipdata memory - connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged())); + connect(clip, TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipDataChanged())); return true; } return false; @@ -1371,7 +1371,7 @@ void UMLApp::slotUpdateViews() { UMLViewList views = getDocument()->getViewIterator(); for(UMLView *view = views.first(); view; view = views.next()) { - menu->insertItem( view->getName(), view, TQT_SLOT( slotShowView() ) ); + menu->insertItem( view->getName(), view, TQ_SLOT( slotShowView() ) ); view->fileLoaded(); } } @@ -1423,10 +1423,10 @@ void UMLApp::slotAddDefaultDatatypes() { void UMLApp::slotCurrentViewChanged() { UMLView *view = getCurrentView(); if (view) { - connect(view, TQT_SIGNAL( sigShowGridToggled(bool) ), - this, TQT_SLOT( slotShowGridToggled(bool) ) ); - connect(view, TQT_SIGNAL( sigSnapToGridToggled(bool) ), - this, TQT_SLOT( slotSnapToGridToggled(bool) ) ); + connect(view, TQ_SIGNAL( sigShowGridToggled(bool) ), + this, TQ_SLOT( slotShowGridToggled(bool) ) ); + connect(view, TQ_SIGNAL( sigSnapToGridToggled(bool) ), + this, TQ_SLOT( slotSnapToGridToggled(bool) ) ); } } void UMLApp::slotSnapToGridToggled(bool gridOn) { @@ -1476,7 +1476,7 @@ void UMLApp::updateLangSelectMenu(Uml::Programming_Language activeLanguage) { m_langSelect->setCheckable(true); for (int i = 0; i < Uml::pl_Reserved; i++) { TQString language = Model_Utils::progLangToString((Uml::Programming_Language) i); - int id = m_langSelect->insertItem(language,this,TQT_SLOT(setActiveLanguage(int))); + int id = m_langSelect->insertItem(language,this,TQ_SLOT(setActiveLanguage(int))); const bool isActiveLanguage = (activeLanguage == i); m_langSelect->setItemChecked(id, isActiveLanguage); } diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp index fd9eedb9..6c50e64e 100644 --- a/umbrello/umbrello/umldoc.cpp +++ b/umbrello/umbrello/umldoc.cpp @@ -120,10 +120,10 @@ void UMLDoc::init() { // Connect signals. UMLApp * pApp = UMLApp::app(); - connect(this, TQT_SIGNAL(sigDiagramCreated(Uml::IDType)), pApp, TQT_SLOT(slotUpdateViews())); - connect(this, TQT_SIGNAL(sigDiagramRemoved(Uml::IDType)), pApp, TQT_SLOT(slotUpdateViews())); - connect(this, TQT_SIGNAL(sigDiagramRenamed(Uml::IDType)), pApp, TQT_SLOT(slotUpdateViews())); - connect(this, TQT_SIGNAL( sigCurrentViewChanged() ), pApp, TQT_SLOT( slotCurrentViewChanged() ) ); + connect(this, TQ_SIGNAL(sigDiagramCreated(Uml::IDType)), pApp, TQ_SLOT(slotUpdateViews())); + connect(this, TQ_SIGNAL(sigDiagramRemoved(Uml::IDType)), pApp, TQ_SLOT(slotUpdateViews())); + connect(this, TQ_SIGNAL(sigDiagramRenamed(Uml::IDType)), pApp, TQ_SLOT(slotUpdateViews())); + connect(this, TQ_SIGNAL( sigCurrentViewChanged() ), pApp, TQ_SLOT( slotCurrentViewChanged() ) ); } UMLDoc::~UMLDoc() { @@ -145,7 +145,7 @@ void UMLDoc::addView(UMLView *view) { UMLApp * pApp = UMLApp::app(); if ( pApp->getListView() ) - connect(this, TQT_SIGNAL(sigObjectRemoved(UMLObject *)), view, TQT_SLOT(slotObjectRemoved(UMLObject *))); + connect(this, TQ_SIGNAL(sigObjectRemoved(UMLObject *)), view, TQ_SLOT(slotObjectRemoved(UMLObject *))); pApp->setCurrentView(view); if ( ! m_bLoading ) { @@ -176,7 +176,7 @@ void UMLDoc::removeView(UMLView *view , bool enforceCurrentView ) { return; } if ( UMLApp::app()->getListView() ) { - disconnect(this,TQT_SIGNAL(sigObjectRemoved(UMLObject *)), view,TQT_SLOT(slotObjectRemoved(UMLObject *))); + disconnect(this,TQ_SIGNAL(sigObjectRemoved(UMLObject *)), view,TQ_SLOT(slotObjectRemoved(UMLObject *))); } view->hide(); //remove all widgets before deleting view @@ -649,7 +649,7 @@ void UMLDoc::setupSignals() { WorkToolBar *tb = UMLApp::app() -> getWorkToolBar(); - connect(this, TQT_SIGNAL(sigDiagramChanged(Uml::Diagram_Type)), tb, TQT_SLOT(slotCheckToolBar(Uml::Diagram_Type))); + connect(this, TQ_SIGNAL(sigDiagramChanged(Uml::Diagram_Type)), tb, TQ_SLOT(slotCheckToolBar(Uml::Diagram_Type))); //new signals below return; @@ -2081,14 +2081,14 @@ void UMLDoc::settingsChanged(Settings::OptionState optionState) { void UMLDoc::initSaveTimer() { if( m_pAutoSaveTimer ) { m_pAutoSaveTimer -> stop(); - disconnect( m_pAutoSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoSave() ) ); + disconnect( m_pAutoSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoSave() ) ); delete m_pAutoSaveTimer; m_pAutoSaveTimer = 0; } Settings::OptionState optionState = Settings::getOptionState(); if( optionState.generalState.autosave ) { m_pAutoSaveTimer = new TQTimer(this, "_AUTOSAVETIMER_" ); - connect( m_pAutoSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoSave() ) ); + connect( m_pAutoSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoSave() ) ); m_pAutoSaveTimer->start( optionState.generalState.autosavetime * 60000, false ); } return; @@ -2338,7 +2338,7 @@ void UMLDoc::slotDiagramPopupMenu(TQWidget* umlview, const TQPoint& point) { m_pTabPopupMenu = new ListPopupMenu(UMLApp::app()->getMainViewWidget(), type); m_pTabPopupMenu->popup(point); - connect(m_pTabPopupMenu, TQT_SIGNAL(activated(int)), view, TQT_SLOT(slotMenuSelection(int))); + connect(m_pTabPopupMenu, TQ_SIGNAL(activated(int)), view, TQ_SLOT(slotMenuSelection(int))); } void UMLDoc::addDefaultStereotypes() { diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp index 0a7b1183..fd40e1a0 100644 --- a/umbrello/umbrello/umllistview.cpp +++ b/umbrello/umbrello/umllistview.cpp @@ -131,12 +131,12 @@ UMLListView::UMLListView(TQWidget *parent, const char *name) m_lv[i] = NULL; m_datatypeFolder = NULL; //setup slots/signals - connect(this, TQT_SIGNAL(dropped(TQDropEvent *, TQListViewItem *, TQListViewItem *)), - this, TQT_SLOT(slotDropped(TQDropEvent *, TQListViewItem *, TQListViewItem *))); - connect( this, TQT_SIGNAL( collapsed( TQListViewItem * ) ), - this, TQT_SLOT( slotCollapsed( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( expanded( TQListViewItem * ) ), this, TQT_SLOT( slotExpanded( TQListViewItem * ) ) ); - connect( UMLApp::app(), TQT_SIGNAL( sigCutSuccessful() ), this, TQT_SLOT( slotCutSuccessful() ) ); + connect(this, TQ_SIGNAL(dropped(TQDropEvent *, TQListViewItem *, TQListViewItem *)), + this, TQ_SLOT(slotDropped(TQDropEvent *, TQListViewItem *, TQListViewItem *))); + connect( this, TQ_SIGNAL( collapsed( TQListViewItem * ) ), + this, TQ_SLOT( slotCollapsed( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( expanded( TQListViewItem * ) ), this, TQ_SLOT( slotExpanded( TQListViewItem * ) ) ); + connect( UMLApp::app(), TQ_SIGNAL( sigCutSuccessful() ), this, TQ_SLOT( slotCutSuccessful() ) ); } UMLListView::~UMLListView() {} @@ -148,12 +148,12 @@ bool UMLListView::eventFilter(TQObject *o, TQEvent *e) { if (me->button() == TQt::RightButton) { if (m_pMenu) { m_pMenu->hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(popupMenuSel(int))); delete m_pMenu; } m_pMenu = new ListPopupMenu(this, Uml::lvt_Model); m_pMenu->popup(me->globalPos()); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupMenuSel(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(popupMenuSel(int))); return true; } return TQListView::eventFilter(o, e); @@ -184,14 +184,14 @@ void UMLListView::contentsMousePressEvent(TQMouseEvent *me) { if (button == TQt::RightButton) { if(m_pMenu != 0) { m_pMenu->hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(popupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } const Uml::ListView_Type type = item->getType(); m_pMenu = new ListPopupMenu(this, type); m_pMenu->popup(me->globalPos()); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupMenuSel(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(popupMenuSel(int))); }//end if right button this->TDEListView::contentsMousePressEvent(me); @@ -692,40 +692,40 @@ void UMLListView::connectNewObjectsSlots(UMLObject* object) { case Uml::ot_Interface: { UMLClassifier *c = static_cast<UMLClassifier*>(object); - connect(c, TQT_SIGNAL(attributeAdded(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectAdded(UMLClassifierListItem*))); - connect(c, TQT_SIGNAL(attributeRemoved(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectRemoved(UMLClassifierListItem*))); - connect(c, TQT_SIGNAL(operationAdded(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectAdded(UMLClassifierListItem*))); - connect(c, TQT_SIGNAL(operationRemoved(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectRemoved(UMLClassifierListItem*))); - connect(c, TQT_SIGNAL(templateAdded(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectAdded(UMLClassifierListItem*))); - connect(c, TQT_SIGNAL(templateRemoved(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectRemoved(UMLClassifierListItem*))); - connect(object,TQT_SIGNAL(modified()),this,TQT_SLOT(slotObjectChanged())); + connect(c, TQ_SIGNAL(attributeAdded(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectAdded(UMLClassifierListItem*))); + connect(c, TQ_SIGNAL(attributeRemoved(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectRemoved(UMLClassifierListItem*))); + connect(c, TQ_SIGNAL(operationAdded(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectAdded(UMLClassifierListItem*))); + connect(c, TQ_SIGNAL(operationRemoved(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectRemoved(UMLClassifierListItem*))); + connect(c, TQ_SIGNAL(templateAdded(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectAdded(UMLClassifierListItem*))); + connect(c, TQ_SIGNAL(templateRemoved(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectRemoved(UMLClassifierListItem*))); + connect(object,TQ_SIGNAL(modified()),this,TQ_SLOT(slotObjectChanged())); } break; case Uml::ot_Enum: { UMLEnum *e = static_cast<UMLEnum*>(object); - connect(e, TQT_SIGNAL(enumLiteralAdded(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectAdded(UMLClassifierListItem*))); - connect(e, TQT_SIGNAL(enumLiteralRemoved(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectRemoved(UMLClassifierListItem*))); + connect(e, TQ_SIGNAL(enumLiteralAdded(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectAdded(UMLClassifierListItem*))); + connect(e, TQ_SIGNAL(enumLiteralRemoved(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectRemoved(UMLClassifierListItem*))); } - connect(object,TQT_SIGNAL(modified()),this,TQT_SLOT(slotObjectChanged())); + connect(object,TQ_SIGNAL(modified()),this,TQ_SLOT(slotObjectChanged())); break; case Uml::ot_Entity: { UMLEntity *ent = static_cast<UMLEntity*>(object); - connect(ent, TQT_SIGNAL(entityAttributeAdded(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectAdded(UMLClassifierListItem*))); - connect(ent, TQT_SIGNAL(entityAttributeRemoved(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectRemoved(UMLClassifierListItem*))); + connect(ent, TQ_SIGNAL(entityAttributeAdded(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectAdded(UMLClassifierListItem*))); + connect(ent, TQ_SIGNAL(entityAttributeRemoved(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectRemoved(UMLClassifierListItem*))); } - connect(object,TQT_SIGNAL(modified()),this,TQT_SLOT(slotObjectChanged())); + connect(object,TQ_SIGNAL(modified()),this,TQ_SLOT(slotObjectChanged())); break; case Uml::ot_Datatype: case Uml::ot_Attribute: @@ -740,7 +740,7 @@ void UMLListView::connectNewObjectsSlots(UMLObject* object) { case Uml::ot_Artifact: case Uml::ot_Node: case Uml::ot_Folder: - connect(object,TQT_SIGNAL(modified()),this,TQT_SLOT(slotObjectChanged())); + connect(object,TQ_SIGNAL(modified()),this,TQ_SLOT(slotObjectChanged())); break; case Uml::ot_UMLObject: case Uml::ot_Association: @@ -826,18 +826,18 @@ void UMLListView::setDocument(UMLDoc *d) { } m_doc = d; - connect(m_doc, TQT_SIGNAL(sigDiagramCreated(Uml::IDType)), this, TQT_SLOT(slotDiagramCreated(Uml::IDType))); - connect(m_doc, TQT_SIGNAL(sigDiagramRemoved(Uml::IDType)), this, TQT_SLOT(slotDiagramRemoved(Uml::IDType))); - connect(m_doc, TQT_SIGNAL(sigDiagramRenamed(Uml::IDType)), this, TQT_SLOT(slotDiagramRenamed(Uml::IDType))); - connect(m_doc, TQT_SIGNAL(sigObjectCreated(UMLObject *)), this, TQT_SLOT(slotObjectCreated(UMLObject *))); - connect(m_doc, TQT_SIGNAL(sigObjectRemoved(UMLObject *)), this, TQT_SLOT(slotObjectRemoved(UMLObject *))); + connect(m_doc, TQ_SIGNAL(sigDiagramCreated(Uml::IDType)), this, TQ_SLOT(slotDiagramCreated(Uml::IDType))); + connect(m_doc, TQ_SIGNAL(sigDiagramRemoved(Uml::IDType)), this, TQ_SLOT(slotDiagramRemoved(Uml::IDType))); + connect(m_doc, TQ_SIGNAL(sigDiagramRenamed(Uml::IDType)), this, TQ_SLOT(slotDiagramRenamed(Uml::IDType))); + connect(m_doc, TQ_SIGNAL(sigObjectCreated(UMLObject *)), this, TQ_SLOT(slotObjectCreated(UMLObject *))); + connect(m_doc, TQ_SIGNAL(sigObjectRemoved(UMLObject *)), this, TQ_SLOT(slotObjectRemoved(UMLObject *))); } void UMLListView::slotObjectRemoved(UMLObject* object) { if (m_doc->loading()) { //needed for class wizard return; } - disconnect(object,TQT_SIGNAL(modified()),this,TQT_SLOT(slotObjectChanged())); + disconnect(object,TQ_SIGNAL(modified()),this,TQ_SLOT(slotObjectChanged())); UMLListViewItem* item = findItem(object->getID()); delete item; UMLApp::app()->getDocWindow()->updateDocumentation(true); diff --git a/umbrello/umbrello/umlrole.cpp b/umbrello/umbrello/umlrole.cpp index ca33dffb..e21bf458 100644 --- a/umbrello/umbrello/umlrole.cpp +++ b/umbrello/umbrello/umlrole.cpp @@ -98,7 +98,7 @@ void UMLRole::init(UMLAssociation * parent, UMLObject * parentObj, Uml::Role_Typ m_Changeability = Uml::chg_Changeable; // connect this up to parent - connect(this,TQT_SIGNAL(modified()),parent,TQT_SIGNAL(modified())); + connect(this,TQ_SIGNAL(modified()),parent,TQ_SIGNAL(modified())); } void UMLRole::saveToXMI( TQDomDocument & qDoc, TQDomElement & qElement ) { diff --git a/umbrello/umbrello/umlview.cpp b/umbrello/umbrello/umlview.cpp index b6118424..c8a20982 100644 --- a/umbrello/umbrello/umlview.cpp +++ b/umbrello/umbrello/umlview.cpp @@ -166,9 +166,9 @@ void UMLView::init() { viewport() -> setMouseTracking(false); //setup signals - connect( this, TQT_SIGNAL(sigRemovePopupMenu()), this, TQT_SLOT(slotRemovePopupMenu() ) ); - connect( UMLApp::app(), TQT_SIGNAL( sigCutSuccessful() ), - this, TQT_SLOT( slotCutSuccessful() ) ); + connect( this, TQ_SIGNAL(sigRemovePopupMenu()), this, TQ_SLOT(slotRemovePopupMenu() ) ); + connect( UMLApp::app(), TQ_SIGNAL( sigCutSuccessful() ), + this, TQ_SLOT( slotCutSuccessful() ) ); // Create the ToolBarState factory. This class is not a singleton, because it // needs a pointer to this object. @@ -406,14 +406,14 @@ void UMLView::showEvent(TQShowEvent* /*se*/) { UMLApp* theApp = UMLApp::app(); WorkToolBar* tb = theApp->getWorkToolBar(); - connect(tb,TQT_SIGNAL(sigButtonChanged(int)), this, TQT_SLOT(slotToolBarChanged(int))); - connect(this,TQT_SIGNAL(sigResetToolBar()), tb, TQT_SLOT(slotResetToolBar())); - connect(m_pDoc, TQT_SIGNAL(sigObjectCreated(UMLObject *)), - this, TQT_SLOT(slotObjectCreated(UMLObject *))); - connect(this, TQT_SIGNAL(sigAssociationRemoved(AssociationWidget*)), - UMLApp::app()->getDocWindow(), TQT_SLOT(slotAssociationRemoved(AssociationWidget*))); - connect(this, TQT_SIGNAL(sigWidgetRemoved(UMLWidget*)), - UMLApp::app()->getDocWindow(), TQT_SLOT(slotWidgetRemoved(UMLWidget*))); + connect(tb,TQ_SIGNAL(sigButtonChanged(int)), this, TQ_SLOT(slotToolBarChanged(int))); + connect(this,TQ_SIGNAL(sigResetToolBar()), tb, TQ_SLOT(slotResetToolBar())); + connect(m_pDoc, TQ_SIGNAL(sigObjectCreated(UMLObject *)), + this, TQ_SLOT(slotObjectCreated(UMLObject *))); + connect(this, TQ_SIGNAL(sigAssociationRemoved(AssociationWidget*)), + UMLApp::app()->getDocWindow(), TQ_SLOT(slotAssociationRemoved(AssociationWidget*))); + connect(this, TQ_SIGNAL(sigWidgetRemoved(UMLWidget*)), + UMLApp::app()->getDocWindow(), TQ_SLOT(slotWidgetRemoved(UMLWidget*))); resetToolbar(); } @@ -421,13 +421,13 @@ void UMLView::showEvent(TQShowEvent* /*se*/) { void UMLView::hideEvent(TQHideEvent* /*he*/) { UMLApp* theApp = UMLApp::app(); WorkToolBar* tb = theApp->getWorkToolBar(); - disconnect(tb,TQT_SIGNAL(sigButtonChanged(int)), this, TQT_SLOT(slotToolBarChanged(int))); - disconnect(this,TQT_SIGNAL(sigResetToolBar()), tb, TQT_SLOT(slotResetToolBar())); - disconnect(m_pDoc, TQT_SIGNAL(sigObjectCreated(UMLObject *)), this, TQT_SLOT(slotObjectCreated(UMLObject *))); - disconnect(this, TQT_SIGNAL(sigAssociationRemoved(AssociationWidget*)), - UMLApp::app()->getDocWindow(), TQT_SLOT(slotAssociationRemoved(AssociationWidget*))); - disconnect(this, TQT_SIGNAL(sigWidgetRemoved(UMLWidget*)), - UMLApp::app()->getDocWindow(), TQT_SLOT(slotWidgetRemoved(UMLWidget*))); + disconnect(tb,TQ_SIGNAL(sigButtonChanged(int)), this, TQ_SLOT(slotToolBarChanged(int))); + disconnect(this,TQ_SIGNAL(sigResetToolBar()), tb, TQ_SLOT(slotResetToolBar())); + disconnect(m_pDoc, TQ_SIGNAL(sigObjectCreated(UMLObject *)), this, TQ_SLOT(slotObjectCreated(UMLObject *))); + disconnect(this, TQ_SIGNAL(sigAssociationRemoved(AssociationWidget*)), + UMLApp::app()->getDocWindow(), TQ_SLOT(slotAssociationRemoved(AssociationWidget*))); + disconnect(this, TQ_SIGNAL(sigWidgetRemoved(UMLWidget*)), + UMLApp::app()->getDocWindow(), TQ_SLOT(slotWidgetRemoved(UMLWidget*))); # ifdef MANUAL_CONTROL_DOUBLE_BUFFERING //kWarning() << "Hide Event for " << getName() << endl; @@ -815,9 +815,9 @@ void UMLView::removeWidget(UMLWidget * o) { o -> cleanup(); m_SelectedList.remove(o); - disconnect( this, TQT_SIGNAL( sigRemovePopupMenu() ), o, TQT_SLOT( slotRemovePopupMenu() ) ); - disconnect( this, TQT_SIGNAL( sigClearAllSelected() ), o, TQT_SLOT( slotClearAllSelected() ) ); - disconnect( this, TQT_SIGNAL(sigColorChanged(Uml::IDType)), o, TQT_SLOT(slotColorChanged(Uml::IDType))); + disconnect( this, TQ_SIGNAL( sigRemovePopupMenu() ), o, TQ_SLOT( slotRemovePopupMenu() ) ); + disconnect( this, TQ_SIGNAL( sigClearAllSelected() ), o, TQ_SLOT( slotClearAllSelected() ) ); + disconnect( this, TQ_SIGNAL(sigColorChanged(Uml::IDType)), o, TQ_SLOT(slotColorChanged(Uml::IDType))); if (t == wt_Message) m_MessageList.remove(static_cast<MessageWidget*>(o)); else @@ -2364,14 +2364,14 @@ void UMLView::setMenu() { }//end switch if( menu != ListPopupMenu::mt_Undefined ) { m_pMenu = new ListPopupMenu(this, menu, this); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuSelection(int))); m_pMenu->popup( mapToGlobal( contentsToViewport(worldMatrix().map(m_Pos)) ) ); } } void UMLView::slotRemovePopupMenu() { if(m_pMenu) { - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuSelection(int))); delete m_pMenu; m_pMenu = 0; } diff --git a/umbrello/umbrello/umlwidget.cpp b/umbrello/umbrello/umlwidget.cpp index 6d69fb1d..3f77a6ec 100644 --- a/umbrello/umbrello/umlwidget.cpp +++ b/umbrello/umbrello/umlwidget.cpp @@ -53,7 +53,7 @@ UMLWidget::UMLWidget( UMLView * view, UMLObject * o, UMLWidgetController *widget init(); m_pObject = o; if(m_pObject) { - connect( m_pObject, TQT_SIGNAL(modified()), this, TQT_SLOT(updateWidget()) ); + connect( m_pObject, TQ_SIGNAL(modified()), this, TQ_SLOT(updateWidget()) ); m_nId = m_pObject->getID(); } } @@ -234,14 +234,14 @@ void UMLWidget::init() { m_pMenu = 0; m_pDoc = UMLApp::app()->getDocument(); m_nPosX = 0; - connect( m_pView, TQT_SIGNAL( sigRemovePopupMenu() ), this, TQT_SLOT( slotRemovePopupMenu() ) ); - connect( m_pView, TQT_SIGNAL( sigClearAllSelected() ), this, TQT_SLOT( slotClearAllSelected() ) ); + connect( m_pView, TQ_SIGNAL( sigRemovePopupMenu() ), this, TQ_SLOT( slotRemovePopupMenu() ) ); + connect( m_pView, TQ_SIGNAL( sigClearAllSelected() ), this, TQ_SLOT( slotClearAllSelected() ) ); - connect( m_pView, TQT_SIGNAL(sigColorChanged(Uml::IDType)), this, TQT_SLOT(slotColorChanged(Uml::IDType))); - connect( m_pView, TQT_SIGNAL(sigLineWidthChanged(Uml::IDType)), this, TQT_SLOT(slotLineWidthChanged(Uml::IDType))); + connect( m_pView, TQ_SIGNAL(sigColorChanged(Uml::IDType)), this, TQ_SLOT(slotColorChanged(Uml::IDType))); + connect( m_pView, TQ_SIGNAL(sigLineWidthChanged(Uml::IDType)), this, TQ_SLOT(slotLineWidthChanged(Uml::IDType))); - // connect( m_pView, TQT_SIGNAL(sigColorChanged(int)), this, TQT_SLOT(slotColorChanged(int))); + // connect( m_pView, TQ_SIGNAL(sigColorChanged(int)), this, TQ_SLOT(slotColorChanged(int))); m_pObject = NULL; setZ(m_origZ = 2); // default for most widgets } @@ -637,12 +637,12 @@ void UMLWidget::startPopupMenu( const TQPoint &At) { m_pMenu->popup(At); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuSelection(int))); } void UMLWidget::slotRemovePopupMenu() { if(m_pMenu) { - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuSelection(int))); delete m_pMenu; m_pMenu = 0; } @@ -723,15 +723,15 @@ void UMLWidget::slotClearAllSelected() void UMLWidget::setView(UMLView * v) { //remove signals from old view - was probably 0 anyway - disconnect( m_pView, TQT_SIGNAL( sigRemovePopupMenu() ), this, TQT_SLOT( slotRemovePopupMenu() ) ); - disconnect( m_pView, TQT_SIGNAL( sigClearAllSelected() ), this, TQT_SLOT( slotClearAllSelected() ) ); - disconnect( m_pView, TQT_SIGNAL(sigColorChanged(Uml::IDType)), this, TQT_SLOT(slotColorChanged(Uml::IDType))); - disconnect( m_pView, TQT_SIGNAL(sigLineWidthChanged(Uml::IDType)), this, TQT_SLOT(slotLineWidthChanged(Uml::IDType))); + disconnect( m_pView, TQ_SIGNAL( sigRemovePopupMenu() ), this, TQ_SLOT( slotRemovePopupMenu() ) ); + disconnect( m_pView, TQ_SIGNAL( sigClearAllSelected() ), this, TQ_SLOT( slotClearAllSelected() ) ); + disconnect( m_pView, TQ_SIGNAL(sigColorChanged(Uml::IDType)), this, TQ_SLOT(slotColorChanged(Uml::IDType))); + disconnect( m_pView, TQ_SIGNAL(sigLineWidthChanged(Uml::IDType)), this, TQ_SLOT(slotLineWidthChanged(Uml::IDType))); m_pView = v; - connect( m_pView, TQT_SIGNAL( sigRemovePopupMenu() ), this, TQT_SLOT( slotRemovePopupMenu() ) ); - connect( m_pView, TQT_SIGNAL( sigClearAllSelected() ), this, TQT_SLOT( slotClearAllSelected() ) ); - connect( m_pView, TQT_SIGNAL(sigColorChanged(Uml::IDType)), this, TQT_SLOT(slotColorChanged(Uml::IDType))); - connect( m_pView, TQT_SIGNAL(sigLineWidthChanged(Uml::IDType)), this, TQT_SLOT(slotLineWidthChanged(Uml::IDType))); + connect( m_pView, TQ_SIGNAL( sigRemovePopupMenu() ), this, TQ_SLOT( slotRemovePopupMenu() ) ); + connect( m_pView, TQ_SIGNAL( sigClearAllSelected() ), this, TQ_SLOT( slotClearAllSelected() ) ); + connect( m_pView, TQ_SIGNAL(sigColorChanged(Uml::IDType)), this, TQ_SLOT(slotColorChanged(Uml::IDType))); + connect( m_pView, TQ_SIGNAL(sigLineWidthChanged(Uml::IDType)), this, TQ_SLOT(slotLineWidthChanged(Uml::IDType))); } void UMLWidget::setX( int x ) { diff --git a/umbrello/umbrello/worktoolbar.cpp b/umbrello/umbrello/worktoolbar.cpp index 66cc931a..4d7f4be6 100644 --- a/umbrello/umbrello/worktoolbar.cpp +++ b/umbrello/umbrello/worktoolbar.cpp @@ -44,11 +44,11 @@ WorkToolBar::WorkToolBar(TQMainWindow *parentWindow, const char*name) m_map.insert(Uml::dt_Undefined,tbb_Arrow); slotCheckToolBar( Uml::dt_Undefined ); - connect( this, TQT_SIGNAL( released( int ) ), this, TQT_SLOT( buttonChanged (int ) ) ); + connect( this, TQ_SIGNAL( released( int ) ), this, TQ_SLOT( buttonChanged (int ) ) ); } WorkToolBar::~WorkToolBar() { - disconnect(this, TQT_SIGNAL(released(int)),this,TQT_SLOT(buttonChanged(int))); + disconnect(this, TQ_SIGNAL(released(int)),this,TQ_SLOT(buttonChanged(int))); } void WorkToolBar::insertHotBtn(ToolBar_Buttons tbb) { |