1 files changed, 32 insertions, 32 deletions

diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp
index 051ef6d0..5e327d20 100644
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
@@ -115,9 +115,9 @@ static void popupSubMenuLater( int msec, TQPopupMenu * receiver ) {
 	tqAddPostRoutine( cleanup );
     }
 
-    singleSingleShot->disconnect( SIGNAL(timeout()) );
-    TQObject::connect( singleSingleShot, SIGNAL(timeout()),
-		      receiver, SLOT(subMenuTimer()) );
+    singleSingleShot->disconnect( TQ_SIGNAL(timeout()) );
+    TQObject::connect( singleSingleShot, TQ_SIGNAL(timeout()),
+		      receiver, TQ_SLOT(subMenuTimer()) );
     singleSingleShot->start( msec, TRUE );
 }
 
@@ -380,7 +380,7 @@ void TQPopupMenu::menuContentsChanged()
         return;
     pendingDelayedContentsChanges = 1;
     if( !pendingDelayedStateChanges ) // if the timer hasn't been started yet
-	TQTimer::singleShot( 0, this, SLOT(performDelayedChanges()));
+	TQTimer::singleShot( 0, this, TQ_SLOT(performDelayedChanges()));
 }
 
 void TQPopupMenu::performDelayedContentsChanged()
@@ -417,7 +417,7 @@ void TQPopupMenu::menuStateChanged()
 	return;
     pendingDelayedStateChanges = 1;
     if( !pendingDelayedContentsChanges ) // if the timer hasn't been started yet
-	TQTimer::singleShot( 0, this, SLOT(performDelayedChanges()));
+	TQTimer::singleShot( 0, this, TQ_SLOT(performDelayedChanges()));
 }
 
 void TQPopupMenu::performDelayedStateChanged()
@@ -443,20 +443,20 @@ void TQPopupMenu::performDelayedChanges()
 
 void TQPopupMenu::menuInsPopup( TQPopupMenu *popup )
 {
-    connect( popup, SIGNAL(activatedRedirect(int)),
-	     SLOT(subActivated(int)) );
-    connect( popup, SIGNAL(highlightedRedirect(int)),
-	     SLOT(subHighlighted(int)) );
-    connect( popup, SIGNAL(destroyed(TQObject*)),
-	     this, SLOT(popupDestroyed(TQObject*)) );
+    connect( popup, TQ_SIGNAL(activatedRedirect(int)),
+	     TQ_SLOT(subActivated(int)) );
+    connect( popup, TQ_SIGNAL(highlightedRedirect(int)),
+	     TQ_SLOT(subHighlighted(int)) );
+    connect( popup, TQ_SIGNAL(destroyed(TQObject*)),
+	     this, TQ_SLOT(popupDestroyed(TQObject*)) );
 }
 
 void TQPopupMenu::menuDelPopup( TQPopupMenu *popup )
 {
-    popup->disconnect( SIGNAL(activatedRedirect(int)) );
-    popup->disconnect( SIGNAL(highlightedRedirect(int)) );
-    disconnect( popup, SIGNAL(destroyed(TQObject*)),
-		this, SLOT(popupDestroyed(TQObject*)) );
+    popup->disconnect( TQ_SIGNAL(activatedRedirect(int)) );
+    popup->disconnect( TQ_SIGNAL(highlightedRedirect(int)) );
+    disconnect( popup, TQ_SIGNAL(destroyed(TQObject*)),
+		this, TQ_SLOT(popupDestroyed(TQObject*)) );
 }
 
 
@@ -803,7 +803,7 @@ void TQPopupMenu::hideAllPopups()
 {
     TQMenuData *top = this;		// find top level popup
     if ( !preventAnimation )
-	TQTimer::singleShot( 10, this, SLOT(allowAnimation()) );
+	TQTimer::singleShot( 10, this, TQ_SLOT(allowAnimation()) );
     preventAnimation = TRUE;
 
     if ( !isPopup() )
@@ -831,7 +831,7 @@ void TQPopupMenu::hideAllPopups()
 void TQPopupMenu::hidePopups()
 {
     if ( !preventAnimation )
-	TQTimer::singleShot( 10, this, SLOT(allowAnimation()) );
+	TQTimer::singleShot( 10, this, TQ_SLOT(allowAnimation()) );
     preventAnimation = TRUE;
 
     TQMenuItemListIt it(*mitems);
@@ -1270,12 +1270,12 @@ void TQPopupMenu::updateAccel( TQWidget *parent )
 	// create an autoaccel in any case, even if we might not use
 	// it immediately. Maybe the user needs it later.
 	autoaccel = new TQAccel( parent, this );
-	connect( autoaccel, SIGNAL(activated(int)),
-		 SLOT(accelActivated(int)) );
-	connect( autoaccel, SIGNAL(activatedAmbiguously(int)),
-		 SLOT(accelActivated(int)) );
-	connect( autoaccel, SIGNAL(destroyed()),
-		 SLOT(accelDestroyed()) );
+	connect( autoaccel, TQ_SIGNAL(activated(int)),
+		 TQ_SLOT(accelActivated(int)) );
+	connect( autoaccel, TQ_SIGNAL(activatedAmbiguously(int)),
+		 TQ_SLOT(accelActivated(int)) );
+	connect( autoaccel, TQ_SIGNAL(destroyed()),
+		 TQ_SLOT(accelDestroyed()) );
 	if ( accelDisabled )
 	    autoaccel->setEnabled( FALSE );
     }
@@ -1768,8 +1768,8 @@ void TQPopupMenu::mouseMoveEvent( TQMouseEvent *e )
            (d->scroll.scrollable & TQPopupMenuPrivate::Scroll::ScrollDown && e->pos().y() >= height()-sh)) {
             if(!d->scroll.scrolltimer) {
                 d->scroll.scrolltimer = new TQTimer(this, "popup scroll timer");
-                TQObject::connect( d->scroll.scrolltimer, SIGNAL(timeout()),
-                                  this, SLOT(subScrollTimer()) );
+                TQObject::connect( d->scroll.scrolltimer, TQ_SIGNAL(timeout()),
+                                  this, TQ_SLOT(subScrollTimer()) );
             }
             if(!d->scroll.scrolltimer->isActive())
                 d->scroll.scrolltimer->start(40);
@@ -2497,11 +2497,11 @@ void TQPopupMenu::connectModal( TQPopupMenu* receiver, bool doConnect )
     connectModalRecursionSafety = doConnect;
 
     if ( doConnect )
-	connect( this, SIGNAL(activated(int)),
-		 receiver, SLOT(modalActivation(int)) );
+	connect( this, TQ_SIGNAL(activated(int)),
+		 receiver, TQ_SLOT(modalActivation(int)) );
     else
-	disconnect( this, SIGNAL(activated(int)),
-		    receiver, SLOT(modalActivation(int)) );
+	disconnect( this, TQ_SIGNAL(activated(int)),
+		    receiver, TQ_SLOT(modalActivation(int)) );
 
     TQMenuItemListIt it(*mitems);
     TQMenuItem *mi;
@@ -2716,7 +2716,7 @@ public:
 int TQPopupMenu::insertTearOffHandle( int id, int index )
 {
     int myid = insertItem( new TQTearOffMenuItem, id, index );
-    connectItem( myid, this, SLOT( toggleTearOff() ) );
+    connectItem( myid, this, TQ_SLOT( toggleTearOff() ) );
     TQMenuData::d->aInt = myid;
     return myid;
 }
@@ -2735,8 +2735,8 @@ void TQPopupMenu::toggleTearOff()
     } else {
 	// create a tear off menu
 	TQPopupMenu* p = new TQPopupMenu( parentWidget(), "tear off menu" );
-	connect( p, SIGNAL( activated(int) ), this, SIGNAL( activated(int) ) );
-        connect( p, SIGNAL( highlighted(int) ), this, SIGNAL( highlighted(int) ) );
+	connect( p, TQ_SIGNAL( activated(int) ), this, TQ_SIGNAL( activated(int) ) );
+        connect( p, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( highlighted(int) ) );
 #ifndef TQT_NO_WIDGET_TOPEXTRA
 	p->setCaption( caption() );
 #endif