Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

12 files changed, 99 insertions, 99 deletions

diff --git a/kig/filters/drgeo-filter-chooser.cpp b/kig/filters/drgeo-filter-chooser.cpp
index 89250235..4ec6db88 100644
--- a/kig/filters/drgeo-filter-chooser.cpp
+++ b/kig/filters/drgeo-filter-chooser.cpp
@@ -33,9 +33,9 @@ KigFilterDrgeoChooser::KigFilterDrgeoChooser( const TQStringList& l )
 
   FigureListBox->insertStringList( l );
 
-  connect( OKButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOKPressed() ) );
-  connect( CancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCancelPressed() ) );
-  connect( FigureListBox, TQT_SIGNAL( executed( TQListBoxItem* ) ), TQT_SLOT( slotExecuted( TQListBoxItem* ) ) );
+  connect( OKButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOKPressed() ) );
+  connect( CancelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCancelPressed() ) );
+  connect( FigureListBox, TQ_SIGNAL( executed( TQListBoxItem* ) ), TQ_SLOT( slotExecuted( TQListBoxItem* ) ) );
 }
 
 void KigFilterDrgeoChooser::slotOKPressed()
diff --git a/kig/filters/imageexporteroptions.cpp b/kig/filters/imageexporteroptions.cpp
index cd68a0af..a72b0ae7 100644
--- a/kig/filters/imageexporteroptions.cpp
+++ b/kig/filters/imageexporteroptions.cpp
@@ -28,8 +28,8 @@ ImageExporterOptions::ImageExporterOptions( TQWidget* parent, const TQSize& s )
     minternallysettingstuff( false )
 {
   keepAspectRatio->setChecked( true );
-  connect( WidthInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotWidthChanged( int ) ) );
-  connect( HeightInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotHeightChanged( int ) ) );
+  connect( WidthInput, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotWidthChanged( int ) ) );
+  connect( HeightInput, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotHeightChanged( int ) ) );
 }
 
 ImageExporterOptions::~ImageExporterOptions()
diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp
index 667ddc97..4dd41cc3 100644
--- a/kig/kig/kig.cpp
+++ b/kig/kig/kig.cpp
@@ -78,7 +78,7 @@ Kig::Kig()
 	  // and integrate the part's GUI with the shell's
 	  createGUI(m_part);
 	  // finally show tip-of-day ( if the user wants it :) )
-	  TQTimer::singleShot( 0, this, TQT_SLOT( startupTipOfDay() ) );
+	  TQTimer::singleShot( 0, this, TQ_SLOT( startupTipOfDay() ) );
       }
   }
   else
@@ -105,30 +105,30 @@ Kig::~Kig()
 
 void Kig::setupActions()
 {
-  KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
-  KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
-  KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+  KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection());
+  KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+  KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
 
 #ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES
-  m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection());
-  m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection());
+  m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection());
+  m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection());
 #else
   createStandardStatusBarAction();
   setStandardToolBarMenuEnabled(true);
 #endif
 
   // FIXME: this (recent files) should be app-wide, not specific to each window...
-  m_recentFilesAction = KStdAction::openRecent(this, TQT_SLOT(openURL(const KURL&)), actionCollection());
+  m_recentFilesAction = KStdAction::openRecent(this, TQ_SLOT(openURL(const KURL&)), actionCollection());
   m_recentFilesAction->loadEntries(config);
 
 #if KDE_IS_VERSION( 3, 2, 90 )
-  KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() );
+  KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() );
 #else
-  KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
+  KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
 #endif
-  KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+  KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
 
-  KStdAction::tipOfDay( this, TQT_SLOT( tipOfDay() ), actionCollection(), "help_tipofday" );
+  KStdAction::tipOfDay( this, TQ_SLOT( tipOfDay() ), actionCollection(), "help_tipofday" );
 }
 
 void Kig::saveProperties(TDEConfig* config)
@@ -203,8 +203,8 @@ void Kig::optionsConfigureToolbars()
 
   // use the standard toolbar editor
   KEditToolbar dlg(factory());
-  connect(&dlg, TQT_SIGNAL(newToolbarConfig()),
-	  this, TQT_SLOT(applyNewToolbarConfig()));
+  connect(&dlg, TQ_SIGNAL(newToolbarConfig()),
+	  this, TQ_SLOT(applyNewToolbarConfig()));
   dlg.exec();
 }
 
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index 853f7527..fa7a9f6b 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -193,7 +193,7 @@ KigPart::KigPart( TQWidget *parentWidget, const char *,
   // construct our command history
   mhistory = new KCommandHistory(actionCollection());
   mhistory->documentSaved();
-  connect( mhistory, TQT_SIGNAL( documentRestored() ), this, TQT_SLOT( setUnmodified() ) );
+  connect( mhistory, TQ_SIGNAL( documentRestored() ), this, TQ_SLOT( setUnmodified() ) );
 
   // we are read-write by default
   setReadWrite(true);
@@ -206,21 +206,21 @@ KigPart::KigPart( TQWidget *parentWidget, const char *,
 void KigPart::setupActions()
 {
   // save actions..
-  (void) KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
-  (void) KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection());
+  (void) KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection());
+  (void) KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection());
 
   // print actions
-  (void) KStdAction::print( this, TQT_SLOT( filePrint() ), actionCollection() );
-  (void) KStdAction::printPreview( this, TQT_SLOT( filePrintPreview() ), actionCollection() );
+  (void) KStdAction::print( this, TQ_SLOT( filePrint() ), actionCollection() );
+  (void) KStdAction::printPreview( this, TQ_SLOT( filePrintPreview() ), actionCollection() );
 
   // selection actions
   aSelectAll = KStdAction::selectAll(
-    this, TQT_SLOT( slotSelectAll() ), actionCollection() );
+    this, TQ_SLOT( slotSelectAll() ), actionCollection() );
   aDeselectAll = KStdAction::deselect(
-    this, TQT_SLOT( slotDeselectAll() ), actionCollection() );
+    this, TQ_SLOT( slotDeselectAll() ), actionCollection() );
   aInvertSelection = new TDEAction(
     i18n( "Invert Selection" ), "", 0, this,
-    TQT_SLOT( slotInvertSelection() ), actionCollection(),
+    TQ_SLOT( slotInvertSelection() ), actionCollection(),
     "edit_invert_selection" );
 
   // we need icons...
@@ -229,46 +229,46 @@ void KigPart::setupActions()
 
   aDeleteObjects = new TDEAction(
       i18n("&Delete Objects"), "edit-delete", Key_Delete, this,
-      TQT_SLOT(deleteObjects()), actionCollection(), "delete_objects");
+      TQ_SLOT(deleteObjects()), actionCollection(), "delete_objects");
   aDeleteObjects->setToolTip(i18n("Delete the selected objects"));
 
   aCancelConstruction = new TDEAction(
       i18n("Cancel Construction"), "process-stop", Key_Escape, this,
-      TQT_SLOT(cancelConstruction()), actionCollection(), "cancel_construction");
+      TQ_SLOT(cancelConstruction()), actionCollection(), "cancel_construction");
   aCancelConstruction->setToolTip(
       i18n("Cancel the construction of the object being constructed"));
   aCancelConstruction->setEnabled(false);
 
   aShowHidden = new TDEAction(
-    i18n("U&nhide All"), 0, this, TQT_SLOT( showHidden() ),
+    i18n("U&nhide All"), 0, this, TQ_SLOT( showHidden() ),
     actionCollection(), "edit_unhide_all");
   aShowHidden->setToolTip(i18n("Show all hidden objects"));
   aShowHidden->setEnabled( true );
 
   aNewMacro = new TDEAction(
-    i18n("&New Macro..."), "gear", 0, this, TQT_SLOT(newMacro()),
+    i18n("&New Macro..."), "gear", 0, this, TQ_SLOT(newMacro()),
     actionCollection(), "macro_action");
   aNewMacro->setToolTip(i18n("Define a new macro"));
 
   aConfigureTypes = new TDEAction(
-    i18n("Manage &Types..."), 0, this, TQT_SLOT(editTypes()),
+    i18n("Manage &Types..."), 0, this, TQ_SLOT(editTypes()),
     actionCollection(), "types_edit");
   aConfigureTypes->setToolTip(i18n("Manage macro types."));
 
   KigExportManager::instance()->addMenuAction( this, m_widget->realWidget(),
                                                actionCollection() );
 
-  TDEAction* a = KStdAction::zoomIn( m_widget, TQT_SLOT( slotZoomIn() ),
+  TDEAction* a = KStdAction::zoomIn( m_widget, TQ_SLOT( slotZoomIn() ),
                                    actionCollection() );
   a->setToolTip( i18n( "Zoom in on the document" ) );
   a->setWhatsThis( i18n( "Zoom in on the document" ) );
 
-  a = KStdAction::zoomOut( m_widget, TQT_SLOT( slotZoomOut() ),
+  a = KStdAction::zoomOut( m_widget, TQ_SLOT( slotZoomOut() ),
                            actionCollection() );
   a->setToolTip( i18n( "Zoom out of the document" ) );
   a->setWhatsThis( i18n( "Zoom out of the document" ) );
 
-  a = KStdAction::fitToPage( m_widget, TQT_SLOT( slotRecenterScreen() ),
+  a = KStdAction::fitToPage( m_widget, TQ_SLOT( slotRecenterScreen() ),
                              actionCollection() );
   // grr.. why isn't there an icon for this..
   a->setIconSet( TQIconSet( l->loadIcon( "view_fit_to_page", TDEIcon::Toolbar ) ) );
@@ -281,12 +281,12 @@ void KigPart::setupActions()
 #endif
 #endif
 #ifdef KIG_PART_CPP_STD_FULLSCREEN_ACTION
-  a = KStdAction::fullScreen( m_widget, TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->parent()),"fullscreen" );
+  a = KStdAction::fullScreen( m_widget, TQ_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->parent()),"fullscreen" );
 #else
   tmp = l->loadIcon( "view-fullscreen", TDEIcon::Toolbar );
   a = new TDEAction(
     i18n( "Full Screen" ), tmp, CTRL+SHIFT+Key_F,
-    m_widget, TQT_SLOT( toggleFullScreen() ),
+    m_widget, TQ_SLOT( toggleFullScreen() ),
     actionCollection(), "fullscreen" );
 #endif
   a->setToolTip( i18n( "View this document full-screen." ) );
@@ -294,31 +294,31 @@ void KigPart::setupActions()
 
   // TODO: an icon for this..
   a = new TDEAction(
-    i18n( "&Select Shown Area" ), "zoom-fit-best", 0, m_widget, TQT_SLOT( zoomRect() ),
+    i18n( "&Select Shown Area" ), "zoom-fit-best", 0, m_widget, TQ_SLOT( zoomRect() ),
     actionCollection(), "view_select_shown_rect" );
   a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) );
   a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) );
 
   a = new TDEAction(
-    i18n( "S&elect Zoom Area" ), "viewmag", 0, m_widget, TQT_SLOT( zoomArea() ),
+    i18n( "S&elect Zoom Area" ), "viewmag", 0, m_widget, TQ_SLOT( zoomArea() ),
     actionCollection(), "view_zoom_area" );
 //  a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) );
 //  a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) );
 
   aToggleGrid = new TDEToggleAction(
-    i18n( "Show &Grid" ), 0, this, TQT_SLOT( toggleGrid() ),
+    i18n( "Show &Grid" ), 0, this, TQ_SLOT( toggleGrid() ),
     actionCollection(), "settings_show_grid" );
   aToggleGrid->setToolTip( i18n( "Show or hide the grid." ) );
   aToggleGrid->setChecked( true );
 
   aToggleAxes = new TDEToggleAction(
-    i18n( "Show &Axes" ), 0, this, TQT_SLOT( toggleAxes() ),
+    i18n( "Show &Axes" ), 0, this, TQ_SLOT( toggleAxes() ),
     actionCollection(), "settings_show_axes" );
   aToggleAxes->setToolTip( i18n( "Show or hide the axes." ) );
   aToggleAxes->setChecked( true );
 
   aToggleNightVision = new TDEToggleAction(
-    i18n( "Wear Infrared Glasses" ), 0, this, TQT_SLOT( toggleNightVision() ),
+    i18n( "Wear Infrared Glasses" ), 0, this, TQ_SLOT( toggleNightVision() ),
     actionCollection(), "settings_toggle_nightvision" );
   aToggleNightVision->setToolTip( i18n( "Enable/Disable hidden objects visibility." ) );
   aToggleNightVision->setChecked( false );
@@ -716,7 +716,7 @@ void KigPart::setupMacroTypes()
   };
   // hack: we need to plug the action lists _after_ the gui is
   // built.. i can't find a better solution than this...
-  TQTimer::singleShot( 0, this, TQT_SLOT( plugActionLists() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( plugActionLists() ) );
 }
 
 void KigPart::setupBuiltinMacros()
diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp
index c642a84f..b9f64590 100644
--- a/kig/kig/kig_view.cpp
+++ b/kig/kig/kig_view.cpp
@@ -294,21 +294,21 @@ KigView::KigView( KigPart* part,
     mupdatingscrollbars( false ),
     mrealwidget( 0 ), mpart( part )
 {
-  connect( part, TQT_SIGNAL( recenterScreen() ), this, TQT_SLOT( slotInternalRecenterScreen() ) );
+  connect( part, TQ_SIGNAL( recenterScreen() ), this, TQ_SLOT( slotInternalRecenterScreen() ) );
 
   mlayout = new TQGridLayout( this, 2, 2 );
   mrightscroll = new TQScrollBar(TQt::Vertical, this, "Right Scrollbar" );
   // TODO: make this configurable...
   mrightscroll->setTracking( true );
-  connect( mrightscroll, TQT_SIGNAL( valueChanged( int ) ),
-           this, TQT_SLOT( slotRightScrollValueChanged( int ) ) );
-  connect( mrightscroll, TQT_SIGNAL( sliderReleased() ),
-           this, TQT_SLOT( updateScrollBars() ) );
+  connect( mrightscroll, TQ_SIGNAL( valueChanged( int ) ),
+           this, TQ_SLOT( slotRightScrollValueChanged( int ) ) );
+  connect( mrightscroll, TQ_SIGNAL( sliderReleased() ),
+           this, TQ_SLOT( updateScrollBars() ) );
   mbottomscroll = new TQScrollBar(TQt::Horizontal, this, "Bottom Scrollbar" );
-  connect( mbottomscroll, TQT_SIGNAL( valueChanged( int ) ),
-           this, TQT_SLOT( slotBottomScrollValueChanged( int ) ) );
-  connect( mbottomscroll, TQT_SIGNAL( sliderReleased() ),
-           this, TQT_SLOT( updateScrollBars() ) );
+  connect( mbottomscroll, TQ_SIGNAL( valueChanged( int ) ),
+           this, TQ_SLOT( slotBottomScrollValueChanged( int ) ) );
+  connect( mbottomscroll, TQ_SIGNAL( sliderReleased() ),
+           this, TQ_SLOT( updateScrollBars() ) );
   mrealwidget = new KigWidget( part, this, this, "Kig Widget", fullscreen );
   mlayout->addWidget( mbottomscroll, 1, 0 );
   mlayout->addWidget( mrealwidget, 0, 0 );
diff --git a/kig/misc/kiginputdialog.cpp b/kig/misc/kiginputdialog.cpp
index 0462cb10..24c659cf 100644
--- a/kig/misc/kiginputdialog.cpp
+++ b/kig/misc/kiginputdialog.cpp
@@ -98,8 +98,8 @@ KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label,
   }
   mainlay->addWidget( d->m_lineEditFirst );
 
-  connect( d->m_lineEditFirst, TQT_SIGNAL(textChanged(const TQString&)),
-           this, TQT_SLOT(slotCoordsChanged(const TQString&)) );
+  connect( d->m_lineEditFirst, TQ_SIGNAL(textChanged(const TQString&)),
+           this, TQ_SLOT(slotCoordsChanged(const TQString&)) );
 
   if ( d->m_coord2.valid() )
   {
@@ -108,8 +108,8 @@ KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label,
     d->m_lineEditSecond->setText( d->m_doc.coordinateSystem().fromScreen( d->m_coord2, d->m_doc ) );
     mainlay->addWidget( d->m_lineEditSecond );
 
-    connect( d->m_lineEditSecond, TQT_SIGNAL(textChanged(const TQString&)),
-             this, TQT_SLOT(slotCoordsChanged(const TQString&)) );
+    connect( d->m_lineEditSecond, TQ_SIGNAL(textChanged(const TQString&)),
+             this, TQ_SLOT(slotCoordsChanged(const TQString&)) );
 
     deltay += d->m_lineEditSecond->height() + spacingHint();
   }
@@ -159,10 +159,10 @@ KigInputDialog::KigInputDialog( TQWidget* parent, const Goniometry& g )
 
   mainlay->addLayout( horlay );
 
-  connect( d->m_lineEditFirst, TQT_SIGNAL(textChanged(const TQString&)),
-           this, TQT_SLOT(slotGonioTextChanged(const TQString&)) );
-  connect( d->m_comboBox, TQT_SIGNAL(activated(int)),
-           this, TQT_SLOT(slotGonioSystemChanged(int)) );
+  connect( d->m_lineEditFirst, TQ_SIGNAL(textChanged(const TQString&)),
+           this, TQ_SLOT(slotGonioTextChanged(const TQString&)) );
+  connect( d->m_comboBox, TQ_SIGNAL(activated(int)),
+           this, TQ_SLOT(slotGonioSystemChanged(int)) );
 
   resize( 350, 100 );
 
diff --git a/kig/modes/linkslabel.cpp b/kig/modes/linkslabel.cpp
index 6d9c2f2f..a9d0fa59 100644
--- a/kig/modes/linkslabel.cpp
+++ b/kig/modes/linkslabel.cpp
@@ -112,7 +112,7 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf )
                                     i->second, this );
       p->urllabels.push_back( l );
       p->layout->addWidget( l );
-      connect( l, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( urlClicked() ) );
+      connect( l, TQ_SIGNAL( leftClickedURL() ), TQ_SLOT( urlClicked() ) );
     }
     else
     {
diff --git a/kig/modes/macrowizard.cpp b/kig/modes/macrowizard.cpp
index c6b8f36c..e4c02aa0 100644
--- a/kig/modes/macrowizard.cpp
+++ b/kig/modes/macrowizard.cpp
@@ -27,10 +27,10 @@
 MacroWizard::MacroWizard( TQWidget* parent, DefineMacroMode* m )
   : MacroWizardBase( parent, "Define Macro Wizard", false ), mmode( m )
 {
-  connect( KLineEdit2, TQT_SIGNAL( textChanged( const TQString& ) ),
-           this, TQT_SLOT( nameTextChanged( const TQString& ) ) );
-  connect( this, TQT_SIGNAL( helpClicked() ), this,
-           TQT_SLOT( slotHelpClicked() ) );
+  connect( KLineEdit2, TQ_SIGNAL( textChanged( const TQString& ) ),
+           this, TQ_SLOT( nameTextChanged( const TQString& ) ) );
+  connect( this, TQ_SIGNAL( helpClicked() ), this,
+           TQ_SLOT( slotHelpClicked() ) );
 }
 
 MacroWizard::~MacroWizard()
diff --git a/kig/modes/popup.cpp b/kig/modes/popup.cpp
index a9c74915..0a7e0265 100644
--- a/kig/modes/popup.cpp
+++ b/kig/modes/popup.cpp
@@ -190,7 +190,7 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part,
 {
   bool empty = objs.empty();
   bool single = objs.size() == 1;
-  connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( toplevelMenuSlot( int ) ) );
+  connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( toplevelMenuSlot( int ) ) );
 
   TQString title;
   if ( empty )
@@ -246,24 +246,24 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part,
   for ( uint i = 0; i < NumberOfMenus; ++i )
     mmenus[i] = new TQPopupMenu( this );
 
-  connect( mmenus[TransformMenu], TQT_SIGNAL( activated( int ) ),
-           this, TQT_SLOT( transformMenuSlot( int ) ) );
-  connect( mmenus[TestMenu], TQT_SIGNAL( activated( int ) ),
-           this, TQT_SLOT( testMenuSlot( int ) ) );
-  connect( mmenus[ConstructMenu], TQT_SIGNAL( activated( int ) ),
-           this, TQT_SLOT( constructMenuSlot( int ) ) );
-  connect( mmenus[StartMenu], TQT_SIGNAL( activated( int ) ),
-           this, TQT_SLOT( startMenuSlot( int ) ) );
-  connect( mmenus[ShowMenu], TQT_SIGNAL( activated( int ) ),
-           this, TQT_SLOT( showMenuSlot( int ) ) );
-  connect( mmenus[SetColorMenu], TQT_SIGNAL( activated( int ) ),
-           this, TQT_SLOT( setColorMenuSlot( int ) ) );
-  connect( mmenus[SetSizeMenu], TQT_SIGNAL( activated( int ) ),
-           this, TQT_SLOT( setSizeMenuSlot( int ) ) );
-  connect( mmenus[SetStyleMenu], TQT_SIGNAL( activated( int ) ),
-           this, TQT_SLOT( setStyleMenuSlot( int ) ) );
-  connect( mmenus[SetCoordinateSystemMenu], TQT_SIGNAL( activated( int ) ),
-           this, TQT_SLOT( setCoordinateSystemMenuSlot( int ) ) );
+  connect( mmenus[TransformMenu], TQ_SIGNAL( activated( int ) ),
+           this, TQ_SLOT( transformMenuSlot( int ) ) );
+  connect( mmenus[TestMenu], TQ_SIGNAL( activated( int ) ),
+           this, TQ_SLOT( testMenuSlot( int ) ) );
+  connect( mmenus[ConstructMenu], TQ_SIGNAL( activated( int ) ),
+           this, TQ_SLOT( constructMenuSlot( int ) ) );
+  connect( mmenus[StartMenu], TQ_SIGNAL( activated( int ) ),
+           this, TQ_SLOT( startMenuSlot( int ) ) );
+  connect( mmenus[ShowMenu], TQ_SIGNAL( activated( int ) ),
+           this, TQ_SLOT( showMenuSlot( int ) ) );
+  connect( mmenus[SetColorMenu], TQ_SIGNAL( activated( int ) ),
+           this, TQ_SLOT( setColorMenuSlot( int ) ) );
+  connect( mmenus[SetSizeMenu], TQ_SIGNAL( activated( int ) ),
+           this, TQ_SLOT( setSizeMenuSlot( int ) ) );
+  connect( mmenus[SetStyleMenu], TQ_SIGNAL( activated( int ) ),
+           this, TQ_SLOT( setStyleMenuSlot( int ) ) );
+  connect( mmenus[SetCoordinateSystemMenu], TQ_SIGNAL( activated( int ) ),
+           this, TQ_SLOT( setCoordinateSystemMenuSlot( int ) ) );
 
   for ( int i = 0; i <= NumberOfMenus; ++i )
   {
@@ -1187,7 +1187,7 @@ ObjectChooserPopup::ObjectChooserPopup( const TQPoint& p, KigWidget& view,
                 i );
   }
 
-  connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( actionActivatedSlot( int ) ) );
+  connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( actionActivatedSlot( int ) ) );
 }
 
 ObjectChooserPopup::~ObjectChooserPopup()
diff --git a/kig/modes/textlabelwizard.cpp b/kig/modes/textlabelwizard.cpp
index c92068de..84d86adb 100644
--- a/kig/modes/textlabelwizard.cpp
+++ b/kig/modes/textlabelwizard.cpp
@@ -29,12 +29,12 @@
 TextLabelWizard::TextLabelWizard( TQWidget* parent, TextLabelModeBase* mode )
   : TextLabelWizardBase( parent, "TextLabelWizard", false ), mmode( mode )
 {
-  connect( labelTextInput, TQT_SIGNAL( textChanged() ),
-           TQT_SLOT( textChanged() ) );
-  connect( myCustomWidget1, TQT_SIGNAL( linkClicked( int ) ),
-           TQT_SLOT( linkClicked( int ) ) );
-  connect( this, TQT_SIGNAL( helpClicked() ),
-           this, TQT_SLOT( slotHelpClicked() ) );
+  connect( labelTextInput, TQ_SIGNAL( textChanged() ),
+           TQ_SLOT( textChanged() ) );
+  connect( myCustomWidget1, TQ_SIGNAL( linkClicked( int ) ),
+           TQ_SLOT( linkClicked( int ) ) );
+  connect( this, TQ_SIGNAL( helpClicked() ),
+           this, TQ_SLOT( slotHelpClicked() ) );
   labelTextInput->setFocus();
 }
 
diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp
index d8219308..2c1235df 100644
--- a/kig/modes/typesdialog.cpp
+++ b/kig/modes/typesdialog.cpp
@@ -81,10 +81,10 @@ TypesDialog::TypesDialog( TQWidget* parent, KigPart& part )
   loadAllMacros();
 
   popup = new TQPopupMenu( this );
-  popup->insertItem( SmallIcon( "edit" ), i18n( "&Edit..." ), this, TQT_SLOT( editType() ) );
-  popup->insertItem( SmallIcon( "edit-delete" ), i18n( "&Delete" ), this, TQT_SLOT( deleteType() ) );
+  popup->insertItem( SmallIcon( "edit" ), i18n( "&Edit..." ), this, TQ_SLOT( editType() ) );
+  popup->insertItem( SmallIcon( "edit-delete" ), i18n( "&Delete" ), this, TQ_SLOT( deleteType() ) );
   popup->insertSeparator();
-  popup->insertItem( SmallIcon( "fileexport" ), i18n( "E&xport..." ), this, TQT_SLOT( exportType() ) );
+  popup->insertItem( SmallIcon( "fileexport" ), i18n( "E&xport..." ), this, TQ_SLOT( exportType() ) );
 
   // saving types
   part.saveTypes();
diff --git a/kig/scripting/newscriptwizard.cpp b/kig/scripting/newscriptwizard.cpp
index ecc157ba..12c27e51 100644
--- a/kig/scripting/newscriptwizard.cpp
+++ b/kig/scripting/newscriptwizard.cpp
@@ -97,11 +97,11 @@ NewScriptWizard::NewScriptWizard( TQWidget* parent, ScriptModeBase* mode )
     TDEPopupMenu* pm = new TDEPopupMenu( editor );
     // creating the actions for the code editor...
     TDEActionCollection* ac = new TDEActionCollection( editor );
-    TDEAction* undoAction = KStdAction::undo( this, TQT_SLOT( slotUndo() ), ac );
-    TDEAction* redoAction = KStdAction::redo( this, TQT_SLOT( slotRedo() ), ac );
-    TDEAction* cutAction = KStdAction::cut( this, TQT_SLOT( slotCut() ), ac );
-    TDEAction* copyAction = KStdAction::copy( this, TQT_SLOT( slotCopy() ), ac );
-    TDEAction* pasteAction = KStdAction::paste( this, TQT_SLOT( slotPaste() ), ac );
+    TDEAction* undoAction = KStdAction::undo( this, TQ_SLOT( slotUndo() ), ac );
+    TDEAction* redoAction = KStdAction::redo( this, TQ_SLOT( slotRedo() ), ac );
+    TDEAction* cutAction = KStdAction::cut( this, TQ_SLOT( slotCut() ), ac );
+    TDEAction* copyAction = KStdAction::copy( this, TQ_SLOT( slotCopy() ), ac );
+    TDEAction* pasteAction = KStdAction::paste( this, TQ_SLOT( slotPaste() ), ac );
     // ... and plugging them into the popup menu (to build it, of course :) )
     undoAction->plug( pm );
     redoAction->plug( pm );
@@ -114,7 +114,7 @@ NewScriptWizard::NewScriptWizard( TQWidget* parent, ScriptModeBase* mode )
     dynamic_cast<KTextEditor::PopupMenuInterface*>( editor )->installPopup( pm );
   }
 
-  connect( this, TQT_SIGNAL( helpClicked() ), this, TQT_SLOT( slotHelpClicked() ) );
+  connect( this, TQ_SIGNAL( helpClicked() ), this, TQ_SLOT( slotHelpClicked() ) );
 }
 
 void NewScriptWizard::back()