1 files changed, 23 insertions, 23 deletions

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;
     }