Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit ba3b5b77e1a430dc7197df20872ba46ce2fb6fa7)

1 files changed, 22 insertions, 22 deletions

diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp
index 73d9ec2b8..817af5007 100644
--- a/tdeui/tdetoolbar.cpp
+++ b/tdeui/tdetoolbar.cpp
@@ -149,8 +149,8 @@ TDEToolBarSeparator::TDEToolBarSeparator(Orientation o , bool l, TQToolBar *pare
                                      const char* name )
     :TQFrame( parent, name ), line( l )
 {
-    connect( parent, TQT_SIGNAL(orientationChanged(Orientation)),
-             this, TQT_SLOT(setOrientation(Orientation)) );
+    connect( parent, TQ_SIGNAL(orientationChanged(Orientation)),
+             this, TQ_SLOT(setOrientation(Orientation)) );
     setOrientation( o );
     setBackgroundMode( parent->backgroundMode() );
     setBackgroundOrigin( ParentOrigin );
@@ -232,16 +232,16 @@ void TDEToolBar::init( bool readConfig, bool honorStyle )
     d->m_honorStyle = honorStyle;
     context = 0;
     layoutTimer = new TQTimer( this );
-    connect( layoutTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( rebuildLayout() ) );
-    connect( &(d->repaintTimer), TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( slotRepaint() ) );
+    connect( layoutTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( rebuildLayout() ) );
+    connect( &(d->repaintTimer), TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( slotRepaint() ) );
 
     if ( kapp ) { // may be null when started inside designer
-        connect(kapp, TQT_SIGNAL(toolbarAppearanceChanged(int)), this, TQT_SLOT(slotAppearanceChanged()));
+        connect(kapp, TQ_SIGNAL(toolbarAppearanceChanged(int)), this, TQ_SLOT(slotAppearanceChanged()));
         // request notification of changes in icon style
         kapp->addKipcEventMask(KIPC::IconChanged);
-        connect(kapp, TQT_SIGNAL(iconChanged(int)), this, TQT_SLOT(slotIconChanged(int)));
+        connect(kapp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged(int)));
     }
 
     // finally, read in our configurable settings
@@ -249,11 +249,11 @@ void TDEToolBar::init( bool readConfig, bool honorStyle )
         slotReadConfig();
 
     if ( mainWindow() )
-        connect( mainWindow(), TQT_SIGNAL( toolBarPositionChanged( TQToolBar * ) ),
-                 this, TQT_SLOT( toolBarPosChanged( TQToolBar * ) ) );
+        connect( mainWindow(), TQ_SIGNAL( toolBarPositionChanged( TQToolBar * ) ),
+                 this, TQ_SLOT( toolBarPosChanged( TQToolBar * ) ) );
 
     // Hack to make sure we recalculate our size when we dock.
-    connect( this, TQT_SIGNAL(placeChanged(TQDockWindow::Place)), TQT_SLOT(rebuildLayout()) );
+    connect( this, TQ_SIGNAL(placeChanged(TQDockWindow::Place)), TQ_SLOT(rebuildLayout()) );
 }
 
 int TDEToolBar::insertButton(const TQString& icon, int id, bool enabled,
@@ -422,7 +422,7 @@ int TDEToolBar::insertAnimatedWidget(int id, TQObject *receiver, const char *slo
     insertWidgetInternal( anim, index, id );
 
     if ( receiver )
-        connect( anim, TQT_SIGNAL(clicked()), receiver, slot);
+        connect( anim, TQ_SIGNAL(clicked()), receiver, slot);
 
     return index;
 }
@@ -1145,12 +1145,12 @@ TQString TDEToolBar::text() const
 
 void TDEToolBar::doConnections( TDEToolBarButton *button )
 {
-    connect(button, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL( clicked( int ) ) );
-    connect(button, TQT_SIGNAL(doubleClicked(int)), this, TQT_SIGNAL( doubleClicked( int ) ) );
-    connect(button, TQT_SIGNAL(released(int)), this, TQT_SIGNAL( released( int ) ) );
-    connect(button, TQT_SIGNAL(pressed(int)), this, TQT_SIGNAL( pressed( int ) ) );
-    connect(button, TQT_SIGNAL(toggled(int)), this, TQT_SIGNAL( toggled( int ) ) );
-    connect(button, TQT_SIGNAL(highlighted(int, bool)), this, TQT_SIGNAL( highlighted( int, bool ) ) );
+    connect(button, TQ_SIGNAL(clicked(int)), this, TQ_SIGNAL( clicked( int ) ) );
+    connect(button, TQ_SIGNAL(doubleClicked(int)), this, TQ_SIGNAL( doubleClicked( int ) ) );
+    connect(button, TQ_SIGNAL(released(int)), this, TQ_SIGNAL( released( int ) ) );
+    connect(button, TQ_SIGNAL(pressed(int)), this, TQ_SIGNAL( pressed( int ) ) );
+    connect(button, TQ_SIGNAL(toggled(int)), this, TQ_SIGNAL( toggled( int ) ) );
+    connect(button, TQ_SIGNAL(highlighted(int, bool)), this, TQ_SIGNAL( highlighted( int, bool ) ) );
 }
 
 void TDEToolBar::mousePressEvent ( TQMouseEvent *m )
@@ -1309,8 +1309,8 @@ void TDEToolBar::insertWidgetInternal( TQWidget *w, int &index, int id )
     // we can't have it in widgets, or something is really wrong
     //widgets.removeRef( w );
 
-    connect( w, TQT_SIGNAL( destroyed() ),
-             this, TQT_SLOT( widgetDestroyed() ) );
+    connect( w, TQ_SIGNAL( destroyed() ),
+             this, TQ_SLOT( widgetDestroyed() ) );
     if ( index == -1 || index > (int)widgets.count() ) {
         index = (int)widgets.count();
         widgets.append( w );
@@ -2125,10 +2125,10 @@ TDEPopupMenu *TDEToolBar::contextMenu()
   context->setItemChecked(CONTEXT_ICONS, true);
   context->insertItem( i18n("Icon Size"), size );
 
-  connect( context, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotContextAboutToShow() ) );
+  connect( context, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotContextAboutToShow() ) );
   // Unplugging a submenu from abouttohide leads to the popupmenu floating around
   // So better simply call that code from after exec() returns (DF)
-  //connect( context, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotContextAboutToHide() ) );
+  //connect( context, TQ_SIGNAL( aboutToHide() ), this, TQ_SLOT( slotContextAboutToHide() ) );
   return context;
 }