Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

33 files changed, 197 insertions, 197 deletions

diff --git a/lib/kofficeui/KoCharSelectDia.cpp b/lib/kofficeui/KoCharSelectDia.cpp
index 5a4a288d..f35eafc6 100644
--- a/lib/kofficeui/KoCharSelectDia.cpp
+++ b/lib/kofficeui/KoCharSelectDia.cpp
@@ -57,7 +57,7 @@ void KoCharSelectDia::initDialog(const TQChar &_chr, const TQString &_font, bool
     grid = new TQGridLayout( page, 1, 1, 0, KDialog::spacingHint() );
 
     charSelect = new KCharSelect( page, "", _font, _chr );
-    connect(charSelect, TQT_SIGNAL(doubleClicked()),this, TQT_SLOT(slotDoubleClicked()));
+    connect(charSelect, TQ_SIGNAL(doubleClicked()),this, TQ_SLOT(slotDoubleClicked()));
     charSelect->resize( charSelect->sizeHint() );
     charSelect->enableFontCombo( true );
     grid->addWidget( charSelect, 0, 0 );
diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp
index 4f81388c..f7da0119 100644
--- a/lib/kofficeui/KoCommandHistory.cpp
+++ b/lib/kofficeui/KoCommandHistory.cpp
@@ -91,10 +91,10 @@ KoCommandHistory::KoCommandHistory(TDEActionCollection * actionCollection, bool
     if (withMenus)
     {
         TDEToolBarPopupAction * undo = new TDEToolBarPopupAction( i18n("&Undo"), "edit-undo",
-                                                              TDEStdAccel::undo(), this, TQT_SLOT( undo() ),
+                                                              TDEStdAccel::undo(), this, TQ_SLOT( undo() ),
                                                               actionCollection, /*KStdAction::stdName( KStdAction::Undo )*/"koffice_undo" );
-        connect( undo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUndoAboutToShow() ) );
-        connect( undo->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUndoActivated( int ) ) );
+        connect( undo->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotUndoAboutToShow() ) );
+        connect( undo->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotUndoActivated( int ) ) );
         m_undo = undo;
         m_undoPopup = undo->popupMenu();
         d->m_undoListBox = new KoListBox( m_undoPopup );
@@ -104,17 +104,17 @@ KoCommandHistory::KoCommandHistory(TDEActionCollection * actionCollection, bool
         d->m_undoLabel = new TQLabel( m_undoPopup);
         m_undoPopup->insertItem(d->m_undoLabel);
 
-        connect( d->m_undoListBox, TQT_SIGNAL( selected( int ) ), this, TQT_SLOT( slotUndoActivated( int ) ) );
-        connect( d->m_undoListBox, TQT_SIGNAL(clicked ( TQListBoxItem *)), this, TQT_SLOT( slotUndoActivated( TQListBoxItem * ) ) );
+        connect( d->m_undoListBox, TQ_SIGNAL( selected( int ) ), this, TQ_SLOT( slotUndoActivated( int ) ) );
+        connect( d->m_undoListBox, TQ_SIGNAL(clicked ( TQListBoxItem *)), this, TQ_SLOT( slotUndoActivated( TQListBoxItem * ) ) );
 
-        connect( d->m_undoListBox, TQT_SIGNAL( changeNumberOfSelectedItem( int )), this, TQT_SLOT( slotChangeUndoNumberOfSelectedItem( int )));
+        connect( d->m_undoListBox, TQ_SIGNAL( changeNumberOfSelectedItem( int )), this, TQ_SLOT( slotChangeUndoNumberOfSelectedItem( int )));
 
         TDEToolBarPopupAction * redo = new TDEToolBarPopupAction( i18n("&Redo"), "edit-redo",
-                                                              TDEStdAccel::redo(), this, TQT_SLOT( redo() ),
+                                                              TDEStdAccel::redo(), this, TQ_SLOT( redo() ),
                                                               actionCollection, /*KStdAction::stdName( KStdAction::Redo )*/
                                                               "koffice_redo");
-        connect( redo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotRedoAboutToShow() ) );
-        connect( redo->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotRedoActivated( int ) ) );
+        connect( redo->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotRedoAboutToShow() ) );
+        connect( redo->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotRedoActivated( int ) ) );
         m_redo = redo;
         m_redoPopup = redo->popupMenu();
         d->m_redoListBox = new KoListBox( m_redoPopup );
@@ -125,15 +125,15 @@ KoCommandHistory::KoCommandHistory(TDEActionCollection * actionCollection, bool
         m_redoPopup->insertItem(d->m_redoLabel);
 
 
-        connect( d->m_redoListBox, TQT_SIGNAL( selected( int ) ), this, TQT_SLOT( slotRedoActivated( int ) ) );
-        connect( d->m_redoListBox, TQT_SIGNAL(clicked ( TQListBoxItem *)), this, TQT_SLOT( slotRedoActivated( TQListBoxItem * ) ) );
-        connect( d->m_redoListBox, TQT_SIGNAL( changeNumberOfSelectedItem( int )), this, TQT_SLOT( slotChangeRedoNumberOfSelectedItem( int )));
+        connect( d->m_redoListBox, TQ_SIGNAL( selected( int ) ), this, TQ_SLOT( slotRedoActivated( int ) ) );
+        connect( d->m_redoListBox, TQ_SIGNAL(clicked ( TQListBoxItem *)), this, TQ_SLOT( slotRedoActivated( TQListBoxItem * ) ) );
+        connect( d->m_redoListBox, TQ_SIGNAL( changeNumberOfSelectedItem( int )), this, TQ_SLOT( slotChangeRedoNumberOfSelectedItem( int )));
 
     }
     else
     {
-        m_undo = KStdAction::undo( this, TQT_SLOT( undo() ), actionCollection, "koffice_undo");
-        m_redo = KStdAction::redo( this, TQT_SLOT( redo() ), actionCollection, "koffice_redo");
+        m_undo = KStdAction::undo( this, TQ_SLOT( undo() ), actionCollection, "koffice_undo");
+        m_redo = KStdAction::redo( this, TQ_SLOT( redo() ), actionCollection, "koffice_redo");
         m_undoPopup = 0L;
         m_redoPopup = 0L;
         d->m_redoListBox = 0L;
diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp
index 2db2bd31..8d200c08 100644
--- a/lib/kofficeui/KoContextCelp.cpp
+++ b/lib/kofficeui/KoContextCelp.cpp
@@ -286,11 +286,11 @@ KoHelpWidget::KoHelpWidget( TQString help, TQWidget* parent )
 
 	setBackgroundMode( PaletteLight );
 
-	connect( m_upButton, TQT_SIGNAL( pressed() ), this, TQT_SLOT( startScrollingUp() ) );
-	connect( m_downButton, TQT_SIGNAL( pressed() ), this, TQT_SLOT( startScrollingDown() ) );
-	connect( m_upButton, TQT_SIGNAL( released() ), this, TQT_SLOT( stopScrolling() ) );
-	connect( m_downButton, TQT_SIGNAL( released() ), this, TQT_SLOT( stopScrolling() ) );
-	connect( m_helpView, TQT_SIGNAL( linkClicked( const TQString& ) ), this, TQT_SIGNAL( linkClicked( const TQString& ) ) );
+	connect( m_upButton, TQ_SIGNAL( pressed() ), this, TQ_SLOT( startScrollingUp() ) );
+	connect( m_downButton, TQ_SIGNAL( pressed() ), this, TQ_SLOT( startScrollingDown() ) );
+	connect( m_upButton, TQ_SIGNAL( released() ), this, TQ_SLOT( stopScrolling() ) );
+	connect( m_downButton, TQ_SIGNAL( released() ), this, TQ_SLOT( stopScrolling() ) );
+	connect( m_helpView, TQ_SIGNAL( linkClicked( const TQString& ) ), this, TQ_SIGNAL( linkClicked( const TQString& ) ) );
 } // KoHelpWidget::KoHelpWidget
 
 void KoHelpWidget::updateButtons()
@@ -390,9 +390,9 @@ KoContextHelpPopup::KoContextHelpPopup( TQWidget* parent )
 	m_isSticky = false;
 	setFocusPolicy( TQWidget::StrongFocus );
 
-	connect( m_close, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( wantsToBeClosed() ) );
-	connect( m_sticky, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( setSticky( bool ) ) );
-	connect( m_helpViewer, TQT_SIGNAL( linkClicked( const TQString& ) ), this, TQT_SIGNAL( linkClicked( const TQString& ) ) );
+	connect( m_close, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( wantsToBeClosed() ) );
+	connect( m_sticky, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( setSticky( bool ) ) );
+	connect( m_helpViewer, TQ_SIGNAL( linkClicked( const TQString& ) ), this, TQ_SIGNAL( linkClicked( const TQString& ) ) );
 } // KoContextHelpPopup::KoContextHelpPopup
 
 KoContextHelpPopup::~KoContextHelpPopup()
@@ -511,9 +511,9 @@ KoContextHelpAction::KoContextHelpAction( TDEActionCollection* parent, TQWidget*
 		: TDEToggleAction( i18n( "Context Help" ), BarIcon( "help" ), TDEShortcut( "CTRL+SHIFT+F1" ), 0, 0, parent, "help_context" )
 {
 	m_popup = new KoContextHelpPopup( 0L );
-	connect( m_popup, TQT_SIGNAL( wantsToBeClosed() ), this, TQT_SLOT( closePopup() ) );
-	connect( this, TQT_SIGNAL( toggled( bool ) ), m_popup, TQT_SLOT( setShown( bool ) ) );
-	connect( m_popup, TQT_SIGNAL( linkClicked( const TQString& ) ), this, TQT_SIGNAL( linkClicked( const TQString& ) ) );
+	connect( m_popup, TQ_SIGNAL( wantsToBeClosed() ), this, TQ_SLOT( closePopup() ) );
+	connect( this, TQ_SIGNAL( toggled( bool ) ), m_popup, TQ_SLOT( setShown( bool ) ) );
+	connect( m_popup, TQ_SIGNAL( linkClicked( const TQString& ) ), this, TQ_SIGNAL( linkClicked( const TQString& ) ) );
 } // KoContextHelpAction::KoContextHelpAction
 
 KoContextHelpAction::~KoContextHelpAction()
@@ -547,7 +547,7 @@ KoContextHelpWidget::KoContextHelpWidget( TQWidget* parent, const char* name )
 	this->setMinimumSize( 180, 120 );
 	this->show();
 	setContextHelp( i18n( "Context Help" ), i18n( "Here will be shown help according to your actions" ), 0 );
-	connect( m_helpViewer, TQT_SIGNAL( linkClicked( const TQString& ) ), this, TQT_SIGNAL( linkClicked( const TQString& ) ) );
+	connect( m_helpViewer, TQ_SIGNAL( linkClicked( const TQString& ) ), this, TQ_SIGNAL( linkClicked( const TQString& ) ) );
 } // KoContextHelpWidget::KoContextHelpWidget
 
 KoContextHelpWidget::~KoContextHelpWidget()
@@ -578,7 +578,7 @@ KoContextHelpDocker::KoContextHelpDocker( TQWidget* parent, const char* name )
 	mainWidget->show();
 	setWidget( mainWidget );
 	setContextHelp( i18n( "Context Help" ), i18n( "Here will be shown help according to your actions" ), 0 );
-	connect( m_helpViewer, TQT_SIGNAL( linkClicked( const TQString& ) ), this, TQT_SIGNAL( linkClicked( const TQString& ) ) );
+	connect( m_helpViewer, TQ_SIGNAL( linkClicked( const TQString& ) ), this, TQ_SIGNAL( linkClicked( const TQString& ) ) );
 } // KoContextHelpDocker::KoContextHelpDocker
 
 KoContextHelpDocker::~KoContextHelpDocker()
diff --git a/lib/kofficeui/KoEditPath.cpp b/lib/kofficeui/KoEditPath.cpp
index bb937a7f..0ae29083 100644
--- a/lib/kofficeui/KoEditPath.cpp
+++ b/lib/kofficeui/KoEditPath.cpp
@@ -80,7 +80,7 @@ KoChangePathDia::KoChangePathDia( const TQString & _path, TQWidget *parent, cons
     m_urlReq->lineEdit()->setText( _path );
     m_urlReq->fileDialog()->setMode(KFile::Directory | KFile::LocalOnly);
     m_defaultPath = new TQCheckBox( i18n("Default path"), page );
-    connect( m_defaultPath, TQT_SIGNAL(toggled ( bool )), this, TQT_SLOT( slotChangeDefaultValue( bool )));
+    connect( m_defaultPath, TQ_SIGNAL(toggled ( bool )), this, TQ_SLOT( slotChangeDefaultValue( bool )));
     slotChangeDefaultValue( _path.isEmpty() );
     m_defaultPath->setChecked( _path.isEmpty() );
 }
diff --git a/lib/kofficeui/KoGuideLineDia.cpp b/lib/kofficeui/KoGuideLineDia.cpp
index 740a7191..fc5e3f96 100644
--- a/lib/kofficeui/KoGuideLineDia.cpp
+++ b/lib/kofficeui/KoGuideLineDia.cpp
@@ -63,7 +63,7 @@ KoGuideLineDia::KoGuideLineDia( TQWidget *parent, KoPoint &pos, KoRect &rect,
     m_hButton = new TQRadioButton( i18n( "Horizontal" ), group );
     m_vButton = new TQRadioButton( i18n( "Vertical" ), group );
 
-    connect( group, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotOrientationChanged() ) );
+    connect( group, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotOrientationChanged() ) );
 
     m_vButton->setChecked( true );;
 
@@ -73,7 +73,7 @@ KoGuideLineDia::KoGuideLineDia( TQWidget *parent, KoPoint &pos, KoRect &rect,
     m_position->setFocus();
     label->setBuddy( m_position );
 
-    connect( m_position, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotPositionChanged() ) );
+    connect( m_position, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotPositionChanged() ) );
 }
 
 
@@ -104,9 +104,9 @@ void KoGuideLineDia::slotOrientationChanged()
             m_position->setMaxValue( TQMAX( 0.0, m_rect.bottom() ) );
             if ( ! m_positionChanged )
             {
-                disconnect( m_position, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotPositionChanged() ) );
+                disconnect( m_position, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotPositionChanged() ) );
                 m_position->changeValue( m_pos.y() );
-                connect( m_position, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotPositionChanged() ) );
+                connect( m_position, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotPositionChanged() ) );
             }
         }
         else if ( m_vButton->isChecked() )
@@ -115,9 +115,9 @@ void KoGuideLineDia::slotOrientationChanged()
             m_position->setMaxValue( TQMAX( 0.0, m_rect.right() ) );
             if ( ! m_positionChanged )
             {
-                disconnect( m_position, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotPositionChanged() ) );
+                disconnect( m_position, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotPositionChanged() ) );
                 m_position->changeValue( m_pos.x() );
-                connect( m_position, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotPositionChanged() ) );
+                connect( m_position, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotPositionChanged() ) );
             }
         }
     }
diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp
index cb25ace9..f0c1bb73 100644
--- a/lib/kofficeui/KoGuides.cpp
+++ b/lib/kofficeui/KoGuides.cpp
@@ -41,9 +41,9 @@ public:
     Popup( KoGuides * guides )
     {
         m_title = insertTitle( i18n( "Guide Line" ) );
-        m_delete = insertItem( i18n( "&Delete" ), guides, TQT_SLOT( slotRemove() ) );
+        m_delete = insertItem( i18n( "&Delete" ), guides, TQ_SLOT( slotRemove() ) );
         m_seperator = insertSeparator();
-        m_pos = insertItem( i18n( "&Set Position..." ), guides, TQT_SLOT( slotChangePosition() ) );
+        m_pos = insertItem( i18n( "&Set Position..." ), guides, TQ_SLOT( slotChangePosition() ) );
     }
 
     void update( int count )
diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp
index c0866e3d..f0ff9ff1 100644
--- a/lib/kofficeui/KoInsertLink.cpp
+++ b/lib/kofficeui/KoInsertLink.cpp
@@ -44,24 +44,24 @@ KoInsertLinkDia::KoInsertLinkDia( TQWidget *parent, const char *name, bool displ
   bookmarkLink = 0L;
   TQVBox *page=addVBoxPage(i18n("Internet"), TQString(),BarIcon("text-html",TDEIcon::SizeMedium));
   internetLink = new  internetLinkPage(page );
-  connect(internetLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged (  )));
+  connect(internetLink,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged (  )));
 
   page=addVBoxPage(i18n("Mail & News"), TQString(),BarIcon("mail_generic",TDEIcon::SizeMedium));
   mailLink = new  mailLinkPage(page );
-  connect(mailLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ()));
+  connect(mailLink,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged ()));
 
   page=addVBoxPage(i18n("File"), TQString(),BarIcon("document-new",TDEIcon::SizeMedium));
   fileLink = new  fileLinkPage(page );
-  connect(fileLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ()));
+  connect(fileLink,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged ()));
 
   if ( displayBookmarkLink)
   {
       page=addVBoxPage(i18n("Bookmark"), TQString(),BarIcon("bookmark",TDEIcon::SizeMedium));
       bookmarkLink = new  bookmarkLinkPage(page );
-      connect(bookmarkLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ()));
+      connect(bookmarkLink,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged ()));
   }
 
-  connect( this, TQT_SIGNAL( aboutToShowPage(TQWidget *) ), this, TQT_SLOT( tabChanged(TQWidget *) ) );
+  connect( this, TQ_SIGNAL( aboutToShowPage(TQWidget *) ), this, TQ_SLOT( tabChanged(TQWidget *) ) );
 
   slotTextChanged ( );
   resize(400,300);
@@ -245,8 +245,8 @@ internetLinkPage::internetLinkPage( TQWidget *parent , char *name  )
   
   m_linkName->setFocus();
 
-  connect(m_linkName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & )));
-  connect(m_hrefName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & )));
+  connect(m_linkName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & )));
+  connect(m_hrefName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & )));
   KSeparator* bar1 = new KSeparator( KSeparator::HLine, this);
   bar1->setFixedHeight( 10 );
   lay2->addWidget( bar1 );
@@ -318,8 +318,8 @@ bookmarkLinkPage::bookmarkLinkPage( TQWidget *parent , char *name  )
   
   m_linkName->setFocus();
 
-  connect(m_linkName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & )));
-  connect(m_hrefName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & )));
+  connect(m_linkName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & )));
+  connect(m_hrefName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & )));
   KSeparator* bar1 = new KSeparator( KSeparator::HLine, this);
   bar1->setFixedHeight( 10 );
   lay2->addWidget( bar1 );
@@ -397,8 +397,8 @@ mailLinkPage::mailLinkPage( TQWidget *parent , char *name  )
   lay2->addWidget(m_hrefName);
   lay2->addStretch( 1 );
   
-  connect(m_linkName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & )));
-  connect(m_hrefName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & )));
+  connect(m_linkName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & )));
+  connect(m_hrefName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & )));
   KSeparator* bar1 = new KSeparator( KSeparator::HLine, this);
   bar1->setFixedHeight( 10 );
   lay2->addWidget( bar1 );
@@ -486,7 +486,7 @@ fileLinkPage::fileLinkPage( TQWidget *parent , char *name  )
   
   recentFile->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
   
-  connect( recentFile , TQT_SIGNAL(highlighted ( const TQString &)), this,  TQT_SLOT( slotSelectRecentFile( const TQString & )));
+  connect( recentFile , TQ_SIGNAL(highlighted ( const TQString &)), this,  TQ_SLOT( slotSelectRecentFile( const TQString & )));
 
   tmpTQLabel = new TQLabel( this);
   lay2->addWidget(tmpTQLabel);
@@ -497,8 +497,8 @@ fileLinkPage::fileLinkPage( TQWidget *parent , char *name  )
   lay2->addWidget(m_hrefName);
   lay2->addStretch( 1 );
 
-  connect(m_linkName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & )));
-  connect(m_hrefName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & )));
+  connect(m_linkName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & )));
+  connect(m_hrefName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & )));
 
   KSeparator* bar1 = new KSeparator( KSeparator::HLine, this);
   bar1->setFixedHeight( 10 );
diff --git a/lib/kofficeui/KoKoolBar.cpp b/lib/kofficeui/KoKoolBar.cpp
index ce848874..997c6801 100644
--- a/lib/kofficeui/KoKoolBar.cpp
+++ b/lib/kofficeui/KoKoolBar.cpp
@@ -53,7 +53,7 @@ int KoKoolBar::insertItem( int _grp, const TQPixmap& _pix, const TQString& _text
   KoKoolBarItem *item = new KoKoolBarItem( g, _pix, _text );
 
   if ( _obj != 0L && _slot != 0L )
-    connect( item, TQT_SIGNAL( pressed( int, int ) ), _obj, _slot );
+    connect( item, TQ_SIGNAL( pressed( int, int ) ), _obj, _slot );
   g->append( item );
 
   if ( g->id() == m_iActiveGroup )
@@ -245,13 +245,13 @@ void KoKoolBarBox::resizeEvent( TQResizeEvent * )
     {
       m_pButtonUp = new TQPushButton( this );
       m_pButtonUp->setPixmap( TQPixmap( UserIcon( "koKoolBarUp" ) ) );
-      connect( m_pButtonUp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( scrollUp() ) );
+      connect( m_pButtonUp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( scrollUp() ) );
     }
     if ( m_pButtonDown == 0L )
     {
       m_pButtonDown = new TQPushButton( this );
       m_pButtonDown->setPixmap( TQPixmap( UserIcon( "koKoolBarDown" ) ) );
-      connect( m_pButtonDown, TQT_SIGNAL( clicked() ), this, TQT_SLOT( scrollDown() ) );
+      connect( m_pButtonDown, TQ_SIGNAL( clicked() ), this, TQ_SLOT( scrollDown() ) );
     }
     m_pButtonUp->show();
     m_pButtonUp->raise();
@@ -415,7 +415,7 @@ KoKoolBarGroup::KoKoolBarGroup( KoKoolBar *_bar, const TQString& _text ) :
 
   m_bEnabled = true;
 
-  connect( m_pButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( pressed() ) );
+  connect( m_pButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( pressed() ) );
   m_id = g_koKoolBarId++;
 }
 
diff --git a/lib/kofficeui/KoPageLayoutColumns.cpp b/lib/kofficeui/KoPageLayoutColumns.cpp
index 2d1e6b77..7cea44c1 100644
--- a/lib/kofficeui/KoPageLayoutColumns.cpp
+++ b/lib/kofficeui/KoPageLayoutColumns.cpp
@@ -42,8 +42,8 @@ KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& colu
     nColumns->setValue( m_columns.columns );
     m_preview->setPageColumns( m_columns );
 
-    connect( nColumns, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( nColChanged( int ) ) );
-    connect( m_spacing, TQT_SIGNAL( valueChangedPt(double) ), this, TQT_SLOT( nSpaceChanged( double ) ) );
+    connect( nColumns, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( nColChanged( int ) ) );
+    connect( m_spacing, TQ_SIGNAL( valueChangedPt(double) ), this, TQ_SLOT( nSpaceChanged( double ) ) );
 }
 
 void KoPageLayoutColumns::setEnableColumns(bool on) {
diff --git a/lib/kofficeui/KoPageLayoutDia.cpp b/lib/kofficeui/KoPageLayoutDia.cpp
index 3c0678cc..ffb0bd25 100644
--- a/lib/kofficeui/KoPageLayoutDia.cpp
+++ b/lib/kofficeui/KoPageLayoutDia.cpp
@@ -257,8 +257,8 @@ void KoPageLayoutDia::setupTab1( bool enableBorders )
     m_pageSizeTab = new KoPageLayoutSize(tab1, m_layout, m_unit, m_column, !(flags & DISABLE_UNIT), enableBorders );
     lay->addWidget(m_pageSizeTab);
     m_pageSizeTab->show();
-    connect (m_pageSizeTab, TQT_SIGNAL( propertyChange(KoPageLayout&)),
-            this, TQT_SLOT (sizeUpdated( KoPageLayout&)));
+    connect (m_pageSizeTab, TQ_SIGNAL( propertyChange(KoPageLayout&)),
+            this, TQ_SLOT (sizeUpdated( KoPageLayout&)));
 }
 
 void KoPageLayoutDia::sizeUpdated(KoPageLayout &layout) {
@@ -365,8 +365,8 @@ void KoPageLayoutDia::setupTab3()
     m_columnsTab->layout()->setMargin(0);
     lay->addWidget(m_columnsTab);
     m_columnsTab->show();
-    connect (m_columnsTab, TQT_SIGNAL( propertyChange(KoColumns&)),
-            this, TQT_SLOT (columnsUpdated( KoColumns&)));
+    connect (m_columnsTab, TQ_SIGNAL( propertyChange(KoColumns&)),
+            this, TQ_SLOT (columnsUpdated( KoColumns&)));
 }
 
 void KoPageLayoutDia::columnsUpdated(KoColumns &columns) {
diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp
index 7cc70ca5..aaeadaa9 100644
--- a/lib/kofficeui/KoPageLayoutSize.cpp
+++ b/lib/kofficeui/KoPageLayoutSize.cpp
@@ -56,7 +56,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
         cpgUnit->insertStringList( KoUnit::listOfUnitName() );
         cpgUnit->setCurrentItem( unit );
         unitLayout->addWidget( cpgUnit, 0, TQt::AlignLeft | TQt::AlignVCenter );
-        connect( cpgUnit, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( setUnitInt( int ) ) );
+        connect( cpgUnit, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( setUnitInt( int ) ) );
     }
     else {
         TQString str=KoUnit::unitDescription(unit);
@@ -79,7 +79,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
     cpgFormat = new TQComboBox( false, formatPageSize, "cpgFormat" );
     cpgFormat->insertStringList( KoPageFormat::allFormats() );
     lpgFormat->setBuddy( cpgFormat );
-    connect( cpgFormat, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( formatChanged( int ) ) );
+    connect( cpgFormat, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( formatChanged( int ) ) );
 
     // spacer
     formatPageSize->setStretchFactor( new TQWidget( formatPageSize ), 10 );
@@ -95,7 +95,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
     lpgWidth->setBuddy( epgWidth );
     if ( m_layout.format != PG_CUSTOM )
         epgWidth->setEnabled( false );
-    connect( epgWidth, TQT_SIGNAL( valueChangedPt(double) ), this, TQT_SLOT( widthChanged(double) ) );
+    connect( epgWidth, TQ_SIGNAL( valueChangedPt(double) ), this, TQ_SLOT( widthChanged(double) ) );
 
     // label height
     TQLabel *lpgHeight = new TQLabel( i18n( "&Height:" ), formatCustomSize );
@@ -105,7 +105,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
     lpgHeight->setBuddy( epgHeight );
     if ( m_layout.format != PG_CUSTOM )
         epgHeight->setEnabled( false );
-    connect( epgHeight, TQT_SIGNAL( valueChangedPt(double ) ), this, TQT_SLOT( heightChanged(double) ) );
+    connect( epgHeight, TQ_SIGNAL( valueChangedPt(double ) ), this, TQ_SLOT( heightChanged(double) ) );
 
     // --------------- orientation ---------------
     m_orientGroup = new TQHButtonGroup( i18n( "Orientation" ), this );
@@ -122,7 +122,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
     lbLandscape->setMaximumWidth( lbLandscape->pixmap()->width() );
     new TQRadioButton( i18n("La&ndscape"), m_orientGroup );
 
-    connect( m_orientGroup, TQT_SIGNAL (clicked (int)), this, TQT_SLOT( orientationChanged(int) ));
+    connect( m_orientGroup, TQ_SIGNAL (clicked (int)), this, TQ_SLOT( orientationChanged(int) ));
 
     // --------------- page margins ---------------
     TQVGroupBox *marginsFrame = new TQVGroupBox( i18n( "Margins" ), this );
@@ -136,22 +136,22 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
     // left margin
     ebrLeft = new KoUnitDoubleSpinBox( marginsFrame, "Left" );
     marginsLayout->addWidget( ebrLeft, 1, 0 );
-    connect( ebrLeft, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( leftChanged( double ) ) );
+    connect( ebrLeft, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( leftChanged( double ) ) );
 
     // right margin
     ebrRight = new KoUnitDoubleSpinBox( marginsFrame, "Right" );
     marginsLayout->addWidget( ebrRight, 1, 2 );
-    connect( ebrRight, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( rightChanged( double ) ) );
+    connect( ebrRight, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( rightChanged( double ) ) );
 
     // top margin
     ebrTop = new KoUnitDoubleSpinBox( marginsFrame, "Top" );
     marginsLayout->addWidget( ebrTop, 0, 1 , TQt::AlignCenter );
-    connect( ebrTop, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( topChanged( double ) ) );
+    connect( ebrTop, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( topChanged( double ) ) );
 
     // bottom margin
     ebrBottom = new KoUnitDoubleSpinBox( marginsFrame, "Bottom" );
     marginsLayout->addWidget( ebrBottom, 2, 1, TQt::AlignCenter );
-    connect( ebrBottom, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( bottomChanged( double ) ) );
+    connect( ebrBottom, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( bottomChanged( double ) ) );
 
     // ------------- preview -----------
     pgPreview = new KoPagePreview( this, "Preview", m_layout );
diff --git a/lib/kofficeui/KoPartSelectAction.cpp b/lib/kofficeui/KoPartSelectAction.cpp
index e5aaf73c..3e1d013e 100644
--- a/lib/kofficeui/KoPartSelectAction.cpp
+++ b/lib/kofficeui/KoPartSelectAction.cpp
@@ -40,7 +40,7 @@ KoPartSelectAction::KoPartSelectAction( const TQString& text, const TQString& ic
     : TDEActionMenu( text, icon, parent, name )
 {
     if (receiver)
-        connect( this, TQT_SIGNAL( activated() ), receiver, slot );
+        connect( this, TQ_SIGNAL( activated() ), receiver, slot );
     init();
 }
 
@@ -53,7 +53,7 @@ void KoPartSelectAction::init()
         KService::Ptr serv = (*it).service();
 	if (!serv->genericName().isEmpty()) {
 	    TDEAction *action = new TDEAction( serv->genericName().replace('&',"&&"), serv->icon(), 0,
-                                       this, TQT_SLOT( slotActionActivated() ),
+                                       this, TQ_SLOT( slotActionActivated() ),
                                        parentCollection(), serv->name().latin1() );
     	    insert( action );
 	}
diff --git a/lib/kofficeui/KoPartSelectDia.cpp b/lib/kofficeui/KoPartSelectDia.cpp
index 897aba8d..8119ade3 100644
--- a/lib/kofficeui/KoPartSelectDia.cpp
+++ b/lib/kofficeui/KoPartSelectDia.cpp
@@ -38,10 +38,10 @@ KoPartSelectDia::KoPartSelectDia( TQWidget* parent, const char* name ) :
     listview->setAllColumnsShowFocus( TRUE );
     listview->setShowSortIndicator( TRUE );
     setMainWidget( listview );
-    connect( listview, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
-	     this, TQT_SLOT( slotOk() ) );
-    connect( listview, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
-	     this, TQT_SLOT( selectionChanged( TQListViewItem * ) ) );
+    connect( listview, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+	     this, TQ_SLOT( slotOk() ) );
+    connect( listview, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ),
+	     this, TQ_SLOT( selectionChanged( TQListViewItem * ) ) );
 
     // Query for documents
     m_lstEntries = KoDocumentEntry::query();
diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp
index b5ab6ec9..500496d6 100644
--- a/lib/kofficeui/KoRuler.cpp
+++ b/lib/kofficeui/KoRuler.cpp
@@ -136,7 +136,7 @@ KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, TQt::Orientation _orient
     setupMenu();
 
     // For compatibility, emitting doubleClicked shall emit openPageLayoutDia
-    connect( this, TQT_SIGNAL( doubleClicked() ), this, TQT_SIGNAL( openPageLayoutDia() ) );
+    connect( this, TQ_SIGNAL( doubleClicked() ), this, TQ_SIGNAL( openPageLayoutDia() ) );
 }
 
 /*================================================================*/
@@ -1014,12 +1014,12 @@ void KoRuler::setupMenu()
         if ( m_unit == unit )
             d->rb_menu->setItemChecked( i, true );
     }
-    connect( d->rb_menu, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotMenuActivated( int ) ) );
+    connect( d->rb_menu, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotMenuActivated( int ) ) );
 
     d->rb_menu->insertSeparator();
-    d->mPageLayout=d->rb_menu->insertItem(i18n("Page Layout..."), this, TQT_SLOT(pageLayoutDia()));
+    d->mPageLayout=d->rb_menu->insertItem(i18n("Page Layout..."), this, TQ_SLOT(pageLayoutDia()));
     d->rb_menu->insertSeparator();
-    d->mRemoveTab=d->rb_menu->insertItem(i18n("Remove Tabulator"), this, TQT_SLOT(rbRemoveTab()));
+    d->mRemoveTab=d->rb_menu->insertItem(i18n("Remove Tabulator"), this, TQ_SLOT(rbRemoveTab()));
     d->rb_menu->setItemEnabled( d->mRemoveTab, false );
 }
 
diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp
index 0558c512..e8840c0b 100644
--- a/lib/kofficeui/KoSelectAction.cpp
+++ b/lib/kofficeui/KoSelectAction.cpp
@@ -57,7 +57,7 @@ KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon,
   d = new KoSelectActionPrivate;
   setShowCurrentSelection(true);
   
-  connect(popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(execute(int)));
+  connect(popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(execute(int)));
 }
 
 KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon, const TQObject* receiver,
@@ -65,8 +65,8 @@ KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon, const
 {
   d = new KoSelectActionPrivate;
   
-  connect(this, TQT_SIGNAL(selectionChanged(int)), receiver, slot);
-  connect(popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(execute(int)));
+  connect(this, TQ_SIGNAL(selectionChanged(int)), receiver, slot);
+  connect(popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(execute(int)));
 }
 
 KoSelectAction::~KoSelectAction()
@@ -105,7 +105,7 @@ int KoSelectAction::plug(TQWidget* widget, int index)
       menu->setItemEnabled( id, false );
 
     addContainer( menu, id );
-    connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
@@ -116,8 +116,8 @@ int KoSelectAction::plug(TQWidget* widget, int index)
     int id_ = TDEAction::getToolButtonID();
 
     if ( icon().isEmpty() && !iconSet().isNull() ) {
-      bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( clicked() ), this,
-                          TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
+      bar->insertButton( iconSet().pixmap(), id_, TQ_SIGNAL( clicked() ), this,
+                          TQ_SLOT( slotActivated() ), isEnabled(), plainText(),
                           index );
     } else {
       TDEInstance *instance;
@@ -128,8 +128,8 @@ int KoSelectAction::plug(TQWidget* widget, int index)
         instance = TDEGlobal::instance();
       }
 
-      bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
-                          TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
+      bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this,
+                          TQ_SLOT( slotActivated() ), isEnabled(), plainText(),
                           index, instance );
     }
 
@@ -138,7 +138,7 @@ int KoSelectAction::plug(TQWidget* widget, int index)
     if (!whatsThis().isEmpty())
       TQWhatsThis::add( bar->getButton(id_), whatsThis() );
 
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     bar->getButton(id_)->setPopup(popupMenu(), true );
 
@@ -156,7 +156,7 @@ int KoSelectAction::plug(TQWidget* widget, int index)
       bar->setItemEnabled( id, false );
 
     addContainer( bar, id );
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
diff --git a/lib/kofficeui/KoSelectAction.h b/lib/kofficeui/KoSelectAction.h
index 8ee0799e..fb6074bc 100644
--- a/lib/kofficeui/KoSelectAction.h
+++ b/lib/kofficeui/KoSelectAction.h
@@ -43,8 +43,8 @@ class KOFFICEUI_EXPORT KoSelectAction : public TDEAction
     /** Same as above, but it also connects a slot to the selectionChanged(int) signal.
      * @param text The text that will be displayed.
      * @param icon The dynamically loaded icon that goes with this action.
-     * @param receiver The SLOT's parent.
-     * @param slot The TQT_SLOT to invoke when a selectionChanged(int) signal is emited.
+     * @param receiver The slot's parent.
+     * @param slot The slot to invoke when a selectionChanged(int) signal is emited.
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp
index 4e7c3931..bb90c7b9 100644
--- a/lib/kofficeui/KoTabBar.cpp
+++ b/lib/kofficeui/KoTabBar.cpp
@@ -363,17 +363,17 @@ KoTabBar::KoTabBar( TQWidget* parent, const char* name )
 
     // initialize the scroll buttons
     d->scrollFirstButton = new TQToolButton( this );
-    connect( d->scrollFirstButton, TQT_SIGNAL( clicked() ),
-      this, TQT_SLOT( scrollFirst() ) );
+    connect( d->scrollFirstButton, TQ_SIGNAL( clicked() ),
+      this, TQ_SLOT( scrollFirst() ) );
     d->scrollLastButton = new TQToolButton( this );
-    connect( d->scrollLastButton, TQT_SIGNAL( clicked() ),
-      this, TQT_SLOT( scrollLast() ) );
+    connect( d->scrollLastButton, TQ_SIGNAL( clicked() ),
+      this, TQ_SLOT( scrollLast() ) );
     d->scrollBackButton = new TQToolButton( this );
-    connect( d->scrollBackButton, TQT_SIGNAL( clicked() ),
-      this, TQT_SLOT( scrollBack() ) );
+    connect( d->scrollBackButton, TQ_SIGNAL( clicked() ),
+      this, TQ_SLOT( scrollBack() ) );
     d->scrollForwardButton = new TQToolButton( this );
-    connect( d->scrollForwardButton, TQT_SIGNAL( clicked() ),
-      this, TQT_SLOT( scrollForward() ) );
+    connect( d->scrollForwardButton, TQ_SIGNAL( clicked() ),
+      this, TQ_SLOT( scrollForward() ) );
     d->layoutButtons();
     d->updateButtons();
 }
@@ -634,7 +634,7 @@ void KoTabBar::autoScrollBack()
     if( !canScrollBack() )
         d->autoScroll = false;
     else
-        TQTimer::singleShot( 400, this, TQT_SLOT( autoScrollBack() ) );
+        TQTimer::singleShot( 400, this, TQ_SLOT( autoScrollBack() ) );
 }
 
 void KoTabBar::autoScrollForward()
@@ -646,7 +646,7 @@ void KoTabBar::autoScrollForward()
     if( !canScrollForward() )
         d->autoScroll = false;
     else
-        TQTimer::singleShot( 400, this, TQT_SLOT( autoScrollForward() ) );
+        TQTimer::singleShot( 400, this, TQ_SLOT( autoScrollForward() ) );
 }
 
 void KoTabBar::paintEvent( TQPaintEvent* )
diff --git a/lib/kofficeui/KoTabChooser.cpp b/lib/kofficeui/KoTabChooser.cpp
index 8fc563c7..ed02ebea 100644
--- a/lib/kofficeui/KoTabChooser.cpp
+++ b/lib/kofficeui/KoTabChooser.cpp
@@ -155,10 +155,10 @@ void KoTabChooser::setupMenu()
 {
     rb_menu = new TQPopupMenu();
     TQ_CHECK_PTR( rb_menu );
-    mLeft = rb_menu->insertItem( i18n( "Tabulator &Left" ), this, TQT_SLOT( rbLeft() ) );
-    mCenter = rb_menu->insertItem( i18n( "Tabulator &Center" ), this, TQT_SLOT( rbCenter() ) );
-    mRight = rb_menu->insertItem( i18n( "Tabulator &Right" ), this, TQT_SLOT( rbRight() ) );
-    mDecPoint =  rb_menu->insertItem( i18n( "Tabulator &Decimal Point" ), this, TQT_SLOT( rbDecPoint() ) );
+    mLeft = rb_menu->insertItem( i18n( "Tabulator &Left" ), this, TQ_SLOT( rbLeft() ) );
+    mCenter = rb_menu->insertItem( i18n( "Tabulator &Center" ), this, TQ_SLOT( rbCenter() ) );
+    mRight = rb_menu->insertItem( i18n( "Tabulator &Right" ), this, TQ_SLOT( rbRight() ) );
+    mDecPoint =  rb_menu->insertItem( i18n( "Tabulator &Decimal Point" ), this, TQ_SLOT( rbDecPoint() ) );
     rb_menu->setCheckable( false );
 }
 
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index c42ff001..fa9b52cd 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -335,8 +335,8 @@ void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout
         d->m_instance->config()->setGroup( oldGroup );
         d->m_recent->showPreviews();
 
-	connect(d->m_recent, TQT_SIGNAL( doubleClicked ( TQIconViewItem * ) ),
-			this, TQT_SLOT( recentSelected( TQIconViewItem * ) ) );
+	connect(d->m_recent, TQ_SIGNAL( doubleClicked ( TQIconViewItem * ) ),
+			this, TQ_SLOT( recentSelected( TQIconViewItem * ) ) );
 
 }
 
@@ -377,11 +377,11 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout *
     }
     d->m_filedialog->setMimeFilter( mimeFilter );
 
-    connect(d->m_filedialog, TQT_SIGNAL(  okClicked() ),
-	    this, TQT_SLOT (  slotOk() ));
+    connect(d->m_filedialog, TQ_SIGNAL(  okClicked() ),
+	    this, TQ_SLOT (  slotOk() ));
 
-    connect(d->m_filedialog, TQT_SIGNAL( cancelClicked() ),
-	    this, TQT_SLOT (  slotCancel() ));
+    connect(d->m_filedialog, TQ_SIGNAL( cancelClicked() ),
+	    this, TQ_SLOT (  slotCancel() ));
 
 }
 
@@ -445,11 +445,11 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou
 	canvas->sort();
 	canvas->setSelectionMode(TQIconView::Single);
 
-	connect( canvas, TQT_SIGNAL( clicked ( TQIconViewItem * ) ),
-		this, TQT_SLOT( currentChanged( TQIconViewItem * ) ) );
+	connect( canvas, TQ_SIGNAL( clicked ( TQIconViewItem * ) ),
+		this, TQ_SLOT( currentChanged( TQIconViewItem * ) ) );
 
-	connect( canvas, TQT_SIGNAL( doubleClicked( TQIconViewItem * ) ),
-		this, TQT_SLOT( chosen(TQIconViewItem *) ) );
+	connect( canvas, TQ_SIGNAL( doubleClicked( TQIconViewItem * ) ),
+		this, TQ_SLOT( chosen(TQIconViewItem *) ) );
 
 	entriesnumber++;
     }
diff --git a/lib/kofficeui/KoTemplateChooseDia.h b/lib/kofficeui/KoTemplateChooseDia.h
index b2dd4df5..0295da1a 100644
--- a/lib/kofficeui/KoTemplateChooseDia.h
+++ b/lib/kofficeui/KoTemplateChooseDia.h
@@ -99,10 +99,10 @@ class KoTCDRecentFilesIconView : public KFileIconView {
 	KoTCDRecentFilesIconView( TQWidget* parent, const char* name ) :
 		KFileIconView( parent, name ), toolTip(0)
 	{
-	    connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ),
-                     TQT_SLOT( showToolTip( TQIconViewItem * ) ) );
-	    connect( this, TQT_SIGNAL( onViewport() ),
-                     TQT_SLOT( removeToolTip() ) );
+	    connect( this, TQ_SIGNAL( onItem( TQIconViewItem * ) ),
+                     TQ_SLOT( showToolTip( TQIconViewItem * ) ) );
+	    connect( this, TQ_SIGNAL( onViewport() ),
+                     TQ_SLOT( removeToolTip() ) );
 	}
         virtual ~KoTCDRecentFilesIconView();
     protected:
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index cb418650..ae827d75 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -114,8 +114,8 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, TDEInst
     namefield->addWidget(label);
     d->m_name=new KLineEdit(mainwidget);
     d->m_name->setFocus();
-    connect(d->m_name, TQT_SIGNAL(textChanged(const TQString &)),
-            this, TQT_SLOT(slotNameChanged(const TQString &)));
+    connect(d->m_name, TQ_SIGNAL(textChanged(const TQString &)),
+            this, TQ_SLOT(slotNameChanged(const TQString &)));
     namefield->addWidget(d->m_name);
 
     label=new TQLabel(i18n("Group:"), mainwidget);
@@ -133,10 +133,10 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, TDEInst
 
     TQHBoxLayout *bbox=new TQHBoxLayout(leftbox);
     d->m_add=new TQPushButton(i18n("&Add Group..."), mainwidget);
-    connect(d->m_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddGroup()));
+    connect(d->m_add, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddGroup()));
     bbox->addWidget(d->m_add);
     d->m_remove=new TQPushButton(i18n("&Remove"), mainwidget);
-    connect(d->m_remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemove()));
+    connect(d->m_remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemove()));
     bbox->addWidget(d->m_remove);
 
     TQVBoxLayout *rightbox=new TQVBoxLayout(mbox);
@@ -148,15 +148,15 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, TDEInst
     pixlayout->addStretch(1);
     d->m_default=new TQRadioButton(i18n("&Default"), pixbox);
     d->m_default->setChecked(true);
-    connect(d->m_default, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDefault()));
+    connect(d->m_default, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDefault()));
     pixlayout->addWidget(d->m_default);
     TQHBoxLayout *custombox=new TQHBoxLayout(pixlayout);
     d->m_custom=new TQRadioButton(i18n("Custom"), pixbox);
     d->m_custom->setChecked(false);
-    connect(d->m_custom, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustom()));
+    connect(d->m_custom, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCustom()));
     custombox->addWidget(d->m_custom);
     d->m_select=new TQPushButton(i18n("&Select..."), pixbox);
-    connect(d->m_select, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelect()));
+    connect(d->m_select, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelect()));
     custombox->addWidget(d->m_select, 1);
     custombox->addStretch(1);
     pixlayout->addStretch(1);
@@ -178,7 +178,7 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, TDEInst
     d->m_changed=false;
     updatePixmap();
 
-    connect(d->m_groups,TQT_SIGNAL( selectionChanged()),this,TQT_SLOT(slotSelectionChanged()));
+    connect(d->m_groups,TQ_SIGNAL( selectionChanged()),this,TQ_SLOT(slotSelectionChanged()));
 
     d->m_remove->setEnabled(d->m_groups->currentItem());
 }
diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp
index 86d2ad88..ceba3d71 100644
--- a/lib/kofficeui/KoToolBox.cpp
+++ b/lib/kofficeui/KoToolBox.cpp
@@ -52,7 +52,7 @@ KoToolBox::KoToolBox( TDEMainWindow *mainWin, const char* name, TDEInstance* ins
 
     m_buttonGroup = new TQButtonGroup( 0L );
     m_buttonGroup->setExclusive( true );
-    connect( m_buttonGroup, TQT_SIGNAL( pressed( int ) ), this, TQT_SLOT( slotButtonPressed( int ) ) );
+    connect( m_buttonGroup, TQ_SIGNAL( pressed( int ) ), this, TQ_SLOT( slotButtonPressed( int ) ) );
 
     m_tools.setAutoDelete( true );
     // Create separate lists for the various sorts of tools
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index f202177c..7e03f0bf 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -76,29 +76,29 @@ TQPopupMenu* KoColorPanel::createColorPopup( KoColorPanel::MenuStyle style, cons
         p.fillRect( 0, 0, 12, 12, defaultColor );
         p.end();
         proxy = new KoColorPopupProxy( defaultColor, 0, menu, "color proxy" );
-        connect( proxy, TQT_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot );
-        menu->insertItem( TQIconSet( pixmap ), i18n( "Default Color" ), proxy, TQT_SLOT( slotDefaultColor() ) );
+        connect( proxy, TQ_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot );
+        menu->insertItem( TQIconSet( pixmap ), i18n( "Default Color" ), proxy, TQ_SLOT( slotDefaultColor() ) );
         menu->insertSeparator();
     }
 
     KoColorPanel* panel = new KoColorPanel( menu, "default colors" );
     panel->insertDefaultColors();
-    connect( panel, TQT_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot );
+    connect( panel, TQ_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot );
     menu->insertItem( panel );
 
     if ( style == CustomColors ) {
         menu->insertSeparator();
         panel = new KoColorPanel( menu, "custom panel" );
-        connect( panel, TQT_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot );
+        connect( panel, TQ_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot );
         menu->insertItem( panel );
         if ( !proxy ) {
             proxy = new KoColorPopupProxy( TQColor(), panel, menu, "color proxy" );
-            connect( proxy, TQT_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot );
+            connect( proxy, TQ_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot );
         }
         else
             proxy->setRecentColorPanel( panel );
         menu->insertSeparator();
-        menu->insertItem( i18n( "More Colors..." ), proxy, TQT_SLOT( slotMoreColors() ) );
+        menu->insertItem( i18n( "More Colors..." ), proxy, TQ_SLOT( slotMoreColors() ) );
     }
 
     return menu;
@@ -833,7 +833,7 @@ bool KoToolButton::eventFilter( TQObject* o, TQEvent* e )
 void KoToolButton::init()
 {
     m_popup = KoColorPanel::createColorPopup( KoColorPanel::CustomColors, TQt::yellow, this,
-                                              TQT_SLOT( colorSelected( const TQColor& ) ),
+                                              TQ_SLOT( colorSelected( const TQColor& ) ),
                                               this, "no-name" );
     // We are interested in the mouse clicks on the arrow button
     m_popup->installEventFilter( this );
diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp
index 5c5bdbd9..7bf6d308 100644
--- a/lib/kofficeui/KoUnitWidgets.cpp
+++ b/lib/kofficeui/KoUnitWidgets.cpp
@@ -129,7 +129,7 @@ KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent, const char *name )
     setAcceptLocalizedNumbers( true );
     setUnit( KoUnit::U_PT );
 
-    connect(this, TQT_SIGNAL(valueChanged( double )), TQT_SLOT(privateValueChanged()));
+    connect(this, TQ_SIGNAL(valueChanged( double )), TQ_SLOT(privateValueChanged()));
 }
 
 
@@ -152,7 +152,7 @@ KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent,
     changeValue( value );
     setLineStep( 0.5 );
 
-    connect(this, TQT_SIGNAL(valueChanged( double )), TQT_SLOT(privateValueChanged()));
+    connect(this, TQ_SIGNAL(valueChanged( double )), TQ_SLOT(privateValueChanged()));
 }
 
 void
@@ -292,7 +292,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, const char *name )
     lineEdit()->setValidator( m_validator );
     setUnit( KoUnit::U_PT );
     changeValue(  KoUnit::ptToUnit( 0.0, KoUnit::U_PT ) );
-    connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) );
+    connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivated( int ) ) );
 }
 
 KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, double upper, double value, KoUnit::Unit unit,
@@ -305,7 +305,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, doub
     lineEdit()->setValidator( m_validator );
     setUnit( unit );
     changeValue(  KoUnit::ptToUnit( value, unit ) );
-    connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) );
+    connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivated( int ) ) );
 }
 
 void
@@ -386,16 +386,16 @@ KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char
     up->setMaximumHeight( 15 );
     up->setMaximumWidth( 15 );
     layout->addWidget( up, 0, 0 );
-    connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
+    connect( up, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpClicked() ) );
 
     TQPushButton *down = new TQPushButton( "-", this );
     down->setMaximumHeight( 15 );
     down->setMaximumWidth( 15 );
     layout->addWidget( down, 1, 0 );
-    connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) );
+    connect( down, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDownClicked() ) );
 
     m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( 0.0, KoUnit::U_PT ), KoUnit::ptToUnit( 9999.99, KoUnit::U_PT ), 0.0, KoUnit::U_PT, 2, name );
-    connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) );
+    connect( m_combo, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SIGNAL( valueChanged( double ) ) );
     layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
@@ -410,16 +410,16 @@ KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double low
     up->setMaximumHeight( 15 );
     up->setMaximumWidth( 15 );
     layout->addWidget( up, 0, 0 );
-    connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
+    connect( up, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpClicked() ) );
 
     TQPushButton *down = new TQPushButton( "-", this );
     down->setMaximumHeight( 15 );
     down->setMaximumWidth( 15 );
     layout->addWidget( down, 1, 0 );
-    connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) );
+    connect( down, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDownClicked() ) );
 
     m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( lower, unit ), KoUnit::ptToUnit( upper, unit ), value, unit, precision, name );
-    connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) );
+    connect( m_combo, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SIGNAL( valueChanged( double ) ) );
     layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
diff --git a/lib/kofficeui/KoZoomAction.cpp b/lib/kofficeui/KoZoomAction.cpp
index 78a4fc20..c3e37a32 100644
--- a/lib/kofficeui/KoZoomAction.cpp
+++ b/lib/kofficeui/KoZoomAction.cpp
@@ -108,8 +108,8 @@ void KoZoomAction::init()
   
   setCurrentItem( values.findIndex( i18n("%1%").arg( 100 ) ) );
   
-  connect( this, TQT_SIGNAL( activated( const TQString& ) ), 
-    TQT_SLOT( activated( const TQString& ) ) );
+  connect( this, TQ_SIGNAL( activated( const TQString& ) ), 
+    TQ_SLOT( activated( const TQString& ) ) );
 }
 
 #include "KoZoomAction.moc"
diff --git a/lib/kofficeui/Kolinestyleaction.h b/lib/kofficeui/Kolinestyleaction.h
index e310c226..e67afa4f 100644
--- a/lib/kofficeui/Kolinestyleaction.h
+++ b/lib/kofficeui/Kolinestyleaction.h
@@ -38,8 +38,8 @@ class KOFFICEUI_EXPORT KoLineStyleAction : public KoSelectAction
     /** Same as above, but it also connects a slot to the selectionChanged(int) signal.
      * @param text The text that will be displayed.
      * @param icon The dynamically loaded icon that goes with this action.
-     * @param receiver The SLOT's parent.
-     * @param slot The TQT_SLOT to invoke when a selectionChanged(int) signal is emited.
+     * @param receiver The slot's parent.
+     * @param slot The slot to invoke when a selectionChanged(int) signal is emited.
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
diff --git a/lib/kofficeui/Kolinewidthaction.cpp b/lib/kofficeui/Kolinewidthaction.cpp
index a000ca56..0abb5247 100644
--- a/lib/kofficeui/Kolinewidthaction.cpp
+++ b/lib/kofficeui/Kolinewidthaction.cpp
@@ -70,7 +70,7 @@ KoLineWidthAction::KoLineWidthAction(const TQString &text, const TQString& icon,
 
   createMenu();
 
-  connect(this, TQT_SIGNAL(lineWidthChanged(double)), receiver, slot);
+  connect(this, TQ_SIGNAL(lineWidthChanged(double)), receiver, slot);
 }
 
 KoLineWidthAction::~KoLineWidthAction()
diff --git a/lib/kofficeui/Kolinewidthaction.h b/lib/kofficeui/Kolinewidthaction.h
index 4adc9266..737cea1c 100644
--- a/lib/kofficeui/Kolinewidthaction.h
+++ b/lib/kofficeui/Kolinewidthaction.h
@@ -42,8 +42,8 @@ class KOFFICEUI_EXPORT KoLineWidthAction : public KoSelectAction
     /** Same as above, but it also connects a slot to the selectionChanged(int) signal.
      * @param text The text that will be displayed.
      * @param icon The dynamically loaded icon that goes with this action.
-     * @param receiver The SLOT's parent.
-     * @param slot The TQT_SLOT to invoke when a lineWidthChanged(double) signal is emited.
+     * @param receiver The slot's parent.
+     * @param slot The slot to invoke when a lineWidthChanged(double) signal is emited.
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index d34c2392..a27d7f23 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -252,10 +252,10 @@ int TDESelectColorAction::plug( TQWidget* w, int index )
                 instance = TDEGlobal::instance();
             */
             id = menu->insertItem( iconSet( TDEIcon::Small, 0 ), text(), this,//dsweet
-                                   TQT_SLOT( slotActivated() ), 0, -1, index );
+                                   TQ_SLOT( slotActivated() ), 0, -1, index );
         }
         else
-            id = menu->insertItem( text(), this, TQT_SLOT( slotActivated() ),  //dsweet
+            id = menu->insertItem( text(), this, TQ_SLOT( slotActivated() ),  //dsweet
                                    0, -1, index );
 
         updateShortcut( menu, id );
@@ -269,7 +269,7 @@ int TDESelectColorAction::plug( TQWidget* w, int index )
             menu->setWhatsThis( id, whatsThisWithIcon() );
 
         addContainer( menu, id );
-        connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+        connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
         if ( parentCollection() )
             parentCollection()->connectHighlight( menu, this );
@@ -289,13 +289,13 @@ int TDESelectColorAction::plug( TQWidget* w, int index )
 
         if ( icon().isEmpty() ) // old code using TQIconSet directly
         {
-            bar->insertButton( iconSet( TDEIcon::Small ).pixmap(), id_, TQT_SIGNAL( clicked() ), this,
-                               TQT_SLOT( slotActivated() ),
+            bar->insertButton( iconSet( TDEIcon::Small ).pixmap(), id_, TQ_SIGNAL( clicked() ), this,
+                               TQ_SLOT( slotActivated() ),
                                isEnabled(), plainText(), index );
         }
         else
-            bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
-                               TQT_SLOT( slotActivated() ),
+            bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this,
+                               TQ_SLOT( slotActivated() ),
                                isEnabled(), plainText(), index, instance );
 
         bar->getButton( id_ )->setName( TQCString("toolbutton_")+name() );
@@ -308,7 +308,7 @@ int TDESelectColorAction::plug( TQWidget* w, int index )
 
         addContainer( bar, id_ );
 
-        connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+        connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
         if ( parentCollection() )
             parentCollection()->connectHighlight( bar, this );
diff --git a/lib/kofficeui/tests/coloraction_test.cpp b/lib/kofficeui/tests/coloraction_test.cpp
index c7287a72..5e38c950 100644
--- a/lib/kofficeui/tests/coloraction_test.cpp
+++ b/lib/kofficeui/tests/coloraction_test.cpp
@@ -44,7 +44,7 @@ TopLevel::TopLevel( TQWidget* parent, const char* name) : TQMainWindow( parent,
     TQBoxLayout* l = new TQHBoxLayout( w, KDialog::marginHint(), KDialog::spacingHint() );
     TQGroupBox* b1 = new TQVGroupBox( TQString::fromLatin1( "KoColorPanel 1" ), w );
     panel = new KoColorPanel( b1, "panel1" );
-    connect( panel, TQT_SIGNAL( colorSelected( const TQColor& ) ), TQT_SLOT( slotColorSelected( const TQColor& ) ) );
+    connect( panel, TQ_SIGNAL( colorSelected( const TQColor& ) ), TQ_SLOT( slotColorSelected( const TQColor& ) ) );
     //panel->insertDefaultColors();
     l->addWidget( b1 );
 
@@ -57,20 +57,20 @@ TopLevel::TopLevel( TQWidget* parent, const char* name) : TQMainWindow( parent,
     menuBar()->insertItem( "&File", file );
 
     file->insertItem( "Custom + Default", KoColorPanel::createColorPopup( KoColorPanel::CustomColors, TQt::red, this,
-                                                                          TQT_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) );
+                                                                          TQ_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) );
     file->insertItem( "Custom", KoColorPanel::createColorPopup( KoColorPanel::CustomColors, TQColor(), this,
-                                                                TQT_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) );
+                                                                TQ_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) );
     file->insertItem( "Plain + Default", KoColorPanel::createColorPopup( KoColorPanel::Plain, TQt::green, this,
-                                                                         TQT_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) );
+                                                                         TQ_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) );
     file->insertItem( "Plain", KoColorPanel::createColorPopup( KoColorPanel::Plain, TQColor(), this,
-                                                               TQT_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) );
+                                                               TQ_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) );
     file->insertSeparator();
-    file->insertItem( "Default Colors", this, TQT_SLOT( defaultColors() ), CTRL+Key_D );
-    file->insertItem( "Insert Random Color", this, TQT_SLOT( insertRandomColor() ), CTRL+Key_R );
+    file->insertItem( "Default Colors", this, TQ_SLOT( defaultColors() ), CTRL+Key_D );
+    file->insertItem( "Insert Random Color", this, TQ_SLOT( insertRandomColor() ), CTRL+Key_R );
     file->insertSeparator();
-    file->insertItem( "Clear", this, TQT_SLOT( clearColors() ), CTRL+Key_C );
+    file->insertItem( "Clear", this, TQ_SLOT( clearColors() ), CTRL+Key_C );
     file->insertSeparator();
-    file->insertItem( "&Quit", tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q );
+    file->insertItem( "&Quit", tqApp, TQ_SLOT( closeAllWindows() ), CTRL+Key_Q );
 
     TDEToolBar* toolBar = new TDEToolBar( this );
     addDockWindow( toolBar );
diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp
index 8eaf1d9d..3328b474 100644
--- a/lib/kofficeui/tkcoloractions.cpp
+++ b/lib/kofficeui/tkcoloractions.cpp
@@ -78,7 +78,7 @@ TTDESelectColorAction::TTDESelectColorAction( const TQString& text, Type type,
     d->defaultColor=TQColor();
     setText(text);
     m_type = type;
-    connect( this, TQT_SIGNAL( activated() ), receiver, slot );
+    connect( this, TQ_SIGNAL( activated() ), receiver, slot );
     init();
 }
 
@@ -87,10 +87,10 @@ void TTDESelectColorAction::init()
   m_pStandardColor = new TKColorPanel();
   m_pRecentColor = new TKColorPanel();
 
-  connect(m_pStandardColor,TQT_SIGNAL(colorSelected(const TQColor&)),TQT_SLOT(panelColorSelected(const TQColor&)));
-  connect(m_pStandardColor,TQT_SIGNAL(reject()),TQT_SLOT(panelReject()));
-  connect(m_pRecentColor,TQT_SIGNAL(colorSelected(const TQColor&)),TQT_SLOT(panelColorSelected(const TQColor&)));
-  connect(m_pRecentColor,TQT_SIGNAL(reject()),TQT_SLOT(panelReject()));
+  connect(m_pStandardColor,TQ_SIGNAL(colorSelected(const TQColor&)),TQ_SLOT(panelColorSelected(const TQColor&)));
+  connect(m_pStandardColor,TQ_SIGNAL(reject()),TQ_SLOT(panelReject()));
+  connect(m_pRecentColor,TQ_SIGNAL(colorSelected(const TQColor&)),TQ_SLOT(panelColorSelected(const TQColor&)));
+  connect(m_pRecentColor,TQ_SIGNAL(reject()),TQ_SLOT(panelReject()));
 
   m_pRecentColor->clear();
 
@@ -102,17 +102,17 @@ void TTDESelectColorAction::init()
 
   switch (m_type) {
     case TextColor:
-      m_pMenu->insertItem(i18n("More Text Colors..."),this,TQT_SLOT(selectColorDialog()));
+      m_pMenu->insertItem(i18n("More Text Colors..."),this,TQ_SLOT(selectColorDialog()));
       setCurrentColor(black);
       setIcon("textcolor");
       break;
     case LineColor:
-      m_pMenu->insertItem(i18n("More Line Colors..."),this,TQT_SLOT(selectColorDialog()));
+      m_pMenu->insertItem(i18n("More Line Colors..."),this,TQ_SLOT(selectColorDialog()));
       setCurrentColor(black);
       setIcon("color_line");
       break;
     case FillColor:
-      m_pMenu->insertItem(i18n("More Fill Colors..."),this,TQT_SLOT(selectColorDialog()));
+      m_pMenu->insertItem(i18n("More Fill Colors..."),this,TQ_SLOT(selectColorDialog()));
       setCurrentColor(white);
       setIcon("color_fill");
       break;
@@ -122,11 +122,11 @@ void TTDESelectColorAction::init()
   if(d->defaultColorMenu)
   {
       m_pMenu->insertSeparator();
-      m_pMenu->insertItem(i18n("Default Color"),this,TQT_SLOT(defaultColor()));
+      m_pMenu->insertItem(i18n("Default Color"),this,TQ_SLOT(defaultColor()));
   }
 
-  connect(m_pStandardColor,TQT_SIGNAL(sizeChanged()),m_pMenu,TQT_SLOT(updateItemSize()));
-  connect(m_pRecentColor,TQT_SIGNAL(sizeChanged()),m_pMenu,TQT_SLOT(updateItemSize()));
+  connect(m_pStandardColor,TQ_SIGNAL(sizeChanged()),m_pMenu,TQ_SLOT(updateItemSize()));
+  connect(m_pRecentColor,TQ_SIGNAL(sizeChanged()),m_pMenu,TQ_SLOT(updateItemSize()));
 }
 
 TTDESelectColorAction::~TTDESelectColorAction()
@@ -368,7 +368,7 @@ void TKColorPanel::insertColor( const TQColor& color )
   if ( m_activeColor == color )
       f->setActive(true);
 
-  connect(f,TQT_SIGNAL(selected(const TQColor&)),TQT_SLOT(selected(const TQColor&)));
+  connect(f,TQ_SIGNAL(selected(const TQColor&)),TQ_SLOT(selected(const TQColor&)));
 
   addToGrid(f);
 }
diff --git a/lib/kofficeui/ttdeaction.cpp b/lib/kofficeui/ttdeaction.cpp
index 6725812a..17ca8c29 100644
--- a/lib/kofficeui/ttdeaction.cpp
+++ b/lib/kofficeui/ttdeaction.cpp
@@ -65,13 +65,13 @@ int TTDEAction::plug(TQWidget* widget, int index)
 
     TTDEToolBarButton* b = new TTDEToolBarButton(icon(),plainText(),bar,name(),instance);
     // we don't need clicked() and buttonClicked(), do we?
-    // connect(b,TQT_SIGNAL(clicked()),TQT_SLOT(slotActivated()));
+    // connect(b,TQ_SIGNAL(clicked()),TQ_SLOT(slotActivated()));
     b->setIconMode(m_imode);
     initToolBarButton(b);
 
     bar->insertWidget( id_, 100, b, index );
     addContainer(bar,id_);
-    connect( bar, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) );
+    connect( bar, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) );
 
     return containerCount() - 1;
   }
@@ -80,7 +80,7 @@ int TTDEAction::plug(TQWidget* widget, int index)
 
 void TTDEAction::initToolBarButton(TTDEToolBarButton* button)
 {
-  connect(button,TQT_SIGNAL(buttonClicked()),TQT_SLOT(slotActivated()));
+  connect(button,TQ_SIGNAL(buttonClicked()),TQ_SLOT(slotActivated()));
 }
 
 TK::IconMode TTDEAction::iconMode()
@@ -197,7 +197,7 @@ int TKBaseSelectAction::plug(TQWidget* widget, int index)
     bar->insertWidget( id_, 100, base, index );
     addContainer( bar, id_ );
 
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     setCurrentItem(currentItem());
 
@@ -213,7 +213,7 @@ int TKBaseSelectAction::currentItem()
 
 void TKBaseSelectAction::initComboBox(TKComboBox* cb)
 {
-  connect(cb,TQT_SIGNAL(activated(int)),TQT_SLOT(slotActivated(int)));
+  connect(cb,TQ_SIGNAL(activated(int)),TQ_SLOT(slotActivated(int)));
 }
 
 void TKBaseSelectAction::setEditable(bool editable)
@@ -260,7 +260,7 @@ TTDESelectAction::~TTDESelectAction()
 void TTDESelectAction::initComboBox(TKComboBox* cb)
 {
   TKBaseSelectAction::initComboBox(cb);
-  connect(cb,TQT_SIGNAL(activated(const TQString&)),TQT_SLOT(slotActivated(const TQString&)));
+  connect(cb,TQ_SIGNAL(activated(const TQString&)),TQ_SLOT(slotActivated(const TQString&)));
   cb->insertStringList(items());
 }
 
diff --git a/lib/kofficeui/ttdetoolbarbutton.cpp b/lib/kofficeui/ttdetoolbarbutton.cpp
index 8188919e..16b36d35 100644
--- a/lib/kofficeui/ttdetoolbarbutton.cpp
+++ b/lib/kofficeui/ttdetoolbarbutton.cpp
@@ -99,9 +99,9 @@ TTDEToolBarButton::TTDEToolBarButton( const TQString& icon, const TQString& txt,
 
   setFocusPolicy( TQWidget::NoFocus );
 
-  connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked()) );
-  connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotPressed()) );
-  connect(this, TQT_SIGNAL(released()), TQT_SLOT(slotReleased()) );
+  connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked()) );
+  connect(this, TQ_SIGNAL(pressed()), TQ_SLOT(slotPressed()) );
+  connect(this, TQ_SIGNAL(released()), TQ_SLOT(slotReleased()) );
 
   installEventFilter(this);
 
@@ -117,9 +117,9 @@ TTDEToolBarButton::TTDEToolBarButton( const TQPixmap& pixmap, const TQString& tx
 
   setFocusPolicy( TQWidget::NoFocus );
 
-  connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked()) );
-  connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotPressed()) );
-  connect(this, TQT_SIGNAL(released()), TQT_SLOT(slotReleased()) );
+  connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked()) );
+  connect(this, TQ_SIGNAL(pressed()), TQ_SLOT(slotPressed()) );
+  connect(this, TQ_SIGNAL(released()), TQ_SLOT(slotReleased()) );
 
   installEventFilter(this);
 
@@ -272,7 +272,7 @@ void TTDEToolBarButton::setDelayedPopup (TQPopupMenu *p, bool toggle )
 
   if (!d->m_delayTimer) {
     d->m_delayTimer = new TQTimer(this);
-    connect(d->m_delayTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDelayTimeout()));
+    connect(d->m_delayTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDelayTimeout()));
   }
 
   setPopup(p);
@@ -514,9 +514,9 @@ void TTDEToolBarButton::setToggle(bool flag)
 {
   d->m_isToggle = flag;
   if (flag == true)
-    connect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled()));
+    connect(this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled()));
   else
-    disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled()));
+    disconnect(this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled()));
 
   modeChange();
   repaint();