Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

15 files changed, 89 insertions, 89 deletions

diff --git a/src/komposedesktopwidget.cpp b/src/komposedesktopwidget.cpp
index 0f3c567..7618701 100644
--- a/src/komposedesktopwidget.cpp
+++ b/src/komposedesktopwidget.cpp
@@ -74,7 +74,7 @@ KomposeDesktopWidget::KomposeDesktopWidget(int desktop, TQWidget *parent, Kompos
 
   createTaskWidgets();
 
-  connect( KomposeTaskManager::instance(), SIGNAL( newTask( KomposeTask* ) ), this, SLOT( createTaskWidget( KomposeTask* ) ) );
+  connect( KomposeTaskManager::instance(), TQ_SIGNAL( newTask( KomposeTask* ) ), this, TQ_SLOT( createTaskWidget( KomposeTask* ) ) );
 
   setFocusPolicy(TQWidget::ClickFocus);
 
@@ -83,7 +83,7 @@ KomposeDesktopWidget::KomposeDesktopWidget(int desktop, TQWidget *parent, Kompos
 
 KomposeDesktopWidget::~KomposeDesktopWidget()
 {
-  disconnect( KomposeTaskManager::instance(), SIGNAL( newTask( KomposeTask* ) ), this, SLOT( createTaskWidget( KomposeTask* ) ) );
+  disconnect( KomposeTaskManager::instance(), TQ_SIGNAL( newTask( KomposeTask* ) ), this, TQ_SLOT( createTaskWidget( KomposeTask* ) ) );
 }
 
 void KomposeDesktopWidget::initFonts()
diff --git a/src/komposefullscreenwidget.cpp b/src/komposefullscreenwidget.cpp
index 1d0b7e1..1e66ad1 100644
--- a/src/komposefullscreenwidget.cpp
+++ b/src/komposefullscreenwidget.cpp
@@ -126,7 +126,7 @@ void KomposeFullscreenWidget::initView()
 
   if ( type == KOMPOSEDISPLAY_VIRTUALDESKS )
   {
-    disconnect( KomposeTaskManager::instance(), SIGNAL( newTask( KomposeTask* ) ), this, SLOT( createTaskWidget( KomposeTask* ) ) );
+    disconnect( KomposeTaskManager::instance(), TQ_SIGNAL( newTask( KomposeTask* ) ), this, TQ_SLOT( createTaskWidget( KomposeTask* ) ) );
     layout->setType( TLAYOUT_TASKCONTAINERS );
     setDesktop( -2 );
     createDesktopWidgets();
@@ -136,14 +136,14 @@ void KomposeFullscreenWidget::initView()
     layout->setType( TLAYOUT_GENERIC );
     setDesktop( -1 );
     createTaskWidgets();
-    connect( KomposeTaskManager::instance(), SIGNAL( newTask( KomposeTask* ) ), this, SLOT( createTaskWidget( KomposeTask* ) ) );
+    connect( KomposeTaskManager::instance(), TQ_SIGNAL( newTask( KomposeTask* ) ), this, TQ_SLOT( createTaskWidget( KomposeTask* ) ) );
   }
   else if ( type == KOMPOSEDISPLAY_CURRENTDESK )
   {
     layout->setType( TLAYOUT_GENERIC );
     setDesktop( KomposeViewManager::instance()->getDesktopBeforeSnaps() );
     createTaskWidgets();
-    connect( KomposeTaskManager::instance(), SIGNAL( newTask( KomposeTask* ) ), this, SLOT( createTaskWidget( KomposeTask* ) ) );
+    connect( KomposeTaskManager::instance(), TQ_SIGNAL( newTask( KomposeTask* ) ), this, TQ_SLOT( createTaskWidget( KomposeTask* ) ) );
   }
 
   unsetCursor();
@@ -159,8 +159,8 @@ void KomposeFullscreenWidget::createDesktopWidgets()
     //int col = i % 2;
     //kdDebug() << "rc %d %d", row, col);
     KomposeDesktopWidget *desktop = new KomposeDesktopWidget(i, this );
-    connect( desktop, SIGNAL(contentsChanged()), layout, SLOT(arrangeLayout()) );
-    connect( desktop, SIGNAL(activated(KomposeDesktopWidget*)), this, SLOT(desktopChanged(KomposeDesktopWidget*)) );
+    connect( desktop, TQ_SIGNAL(contentsChanged()), layout, TQ_SLOT(arrangeLayout()) );
+    connect( desktop, TQ_SIGNAL(activated(KomposeDesktopWidget*)), this, TQ_SLOT(desktopChanged(KomposeDesktopWidget*)) );
     desktop->show();
   }
 }
diff --git a/src/komposegl/komposegldesktopwidget.cpp b/src/komposegl/komposegldesktopwidget.cpp
index 6b8d857..42689a4 100644
--- a/src/komposegl/komposegldesktopwidget.cpp
+++ b/src/komposegl/komposegldesktopwidget.cpp
@@ -32,7 +32,7 @@ KomposeGLDesktopWidget::KomposeGLDesktopWidget(int desktop, TQObject *parent, co
 
   createTaskWidgets();
 
-  //connect( KomposeTaskManager::instance(), SIGNAL( newTask( KomposeTask* ) ), this, SLOT( createTaskWidget( KomposeTask* ) ) );
+  //connect( KomposeTaskManager::instance(), TQ_SIGNAL( newTask( KomposeTask* ) ), this, TQ_SLOT( createTaskWidget( KomposeTask* ) ) );
 }
 
 
diff --git a/src/komposegl/komposegltaskwidget.cpp b/src/komposegl/komposegltaskwidget.cpp
index a2a7217..8265e53 100644
--- a/src/komposegl/komposegltaskwidget.cpp
+++ b/src/komposegl/komposegltaskwidget.cpp
@@ -45,8 +45,8 @@ KomposeGLTaskWidget::KomposeGLTaskWidget(KomposeTask *t, TQObject *parent, Kompo
                 
 
   
-  connect( t, SIGNAL( closed() ), this, SLOT( slotTaskDestroyed() ) );
-  connect( t, SIGNAL( stateChanged() ), this, SLOT( draw() ) );
+  connect( t, TQ_SIGNAL( closed() ), this, TQ_SLOT( slotTaskDestroyed() ) );
+  connect( t, TQ_SIGNAL( stateChanged() ), this, TQ_SLOT( draw() ) );
 }
 
 
@@ -55,8 +55,8 @@ KomposeGLTaskWidget::~KomposeGLTaskWidget()
 
 void KomposeGLTaskWidget::slotTaskDestroyed()
 {
-  disconnect( task, SIGNAL( closed() ), this, SLOT( slotTaskDestroyed() ) );
-  disconnect( task, SIGNAL( stateChanged() ), this, SLOT( draw() ) );
+  disconnect( task, TQ_SIGNAL( closed() ), this, TQ_SLOT( slotTaskDestroyed() ) );
+  disconnect( task, TQ_SIGNAL( stateChanged() ), this, TQ_SLOT( draw() ) );
   if (KomposeTaskManager::instance()->hasActiveView())
   {
     this->parent()->removeChild( this );
diff --git a/src/komposegl/komposeglwidget.cpp b/src/komposegl/komposeglwidget.cpp
index 14c6d5d..5d39917 100644
--- a/src/komposegl/komposeglwidget.cpp
+++ b/src/komposegl/komposeglwidget.cpp
@@ -65,7 +65,7 @@ void KomposeGLWidget::childEvent ( TQChildEvent * ce )
 
   // Whenever a child is added/removed: rearrange layout
   // FIXME: sometimes widget's aren't added in time, so we have to add a short delay:
-  TQTimer::singleShot( 200, layout, SLOT( arrangeLayout() ) );
+  TQTimer::singleShot( 200, layout, TQ_SLOT( arrangeLayout() ) );
 }
 
 /*
diff --git a/src/komposeglobal.cpp b/src/komposeglobal.cpp
index 7d7dbe3..78735ed 100644
--- a/src/komposeglobal.cpp
+++ b/src/komposeglobal.cpp
@@ -82,12 +82,12 @@ KomposeGlobal::KomposeGlobal(TQObject *parent, const char *name)
   currentDesktop = twin_module->currentDesktop();
 
   desktopBgPixmap = new TDESharedPixmap;
-  connect(desktopBgPixmap, SIGNAL(done(bool)), SLOT(slotDone(bool)));
+  connect(desktopBgPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool)));
   initSharedPixmaps();
   initCompositeExt();
   initImlib();
 
-  connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(slotConfigChanged()) );
+  connect( KomposeSettings::instance(), TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotConfigChanged()) );
 }
 
 KomposeGlobal::~KomposeGlobal()
@@ -154,37 +154,37 @@ void KomposeGlobal::initActions()
   actionCollection = new TDEActionCollection( (TQWidget*)0 );
 
   // Actions
-  actQuit = KStdAction::quit( kapp, SLOT(quit()), actionCollection );
+  actQuit = KStdAction::quit( kapp, TQ_SLOT(quit()), actionCollection );
   actShowWorldView = new TDEAction(i18n("Komposé (ungrouped)"), "kompose_ungrouped",
                                  0,
-                                 KomposeViewManager::instance(), SLOT(createWorldView()),
+                                 KomposeViewManager::instance(), TQ_SLOT(createWorldView()),
                                  actionCollection, "showWorldView");
   actShowVirtualDesktopView = new TDEAction(i18n("Komposé (grouped by virtual desktops)"), "kompose_grouped_by_virtual_desktop",
                                           0,
-                                          KomposeViewManager::instance(), SLOT(createVirtualDesktopView()),
+                                          KomposeViewManager::instance(), TQ_SLOT(createVirtualDesktopView()),
                                           actionCollection, "showVirtualDesktopView");
   actShowCurrentDesktopView = new TDEAction(i18n("Komposé (current virtual desktop)"), "kompose_current_virtual_desktop",
                                           0,
-                                          KomposeViewManager::instance(), SLOT(createCurrentDesktopView()),
+                                          KomposeViewManager::instance(), TQ_SLOT(createCurrentDesktopView()),
                                           actionCollection, "showCurrentDesktopView");
 
-  actPreferencesDialog      = KStdAction::preferences( KomposeSettings::instance(), SLOT(showPreferencesDlg()), actionCollection );
+  actPreferencesDialog      = KStdAction::preferences( KomposeSettings::instance(), TQ_SLOT(showPreferencesDlg()), actionCollection );
 
-  actConfigGlobalShortcuts  = KStdAction::keyBindings(this, SLOT(showGlobalShortcutsSettingsDialog()),
+  actConfigGlobalShortcuts  = KStdAction::keyBindings(this, TQ_SLOT(showGlobalShortcutsSettingsDialog()),
                               actionCollection, "options_configure_global_keybinding");
   actConfigGlobalShortcuts->setText(i18n("Configure &Global Shortcuts..."));
   actAboutDlg      = new TDEAction(i18n("About Komposé"), "kompose",
                                  0,
-                                 this, SLOT(showAboutDlg()),
+                                 this, TQ_SLOT(showAboutDlg()),
                                  actionCollection, "showAboutDlg");
 }
 
 void KomposeGlobal::initSharedPixmaps()
 {
   // Whenever the background pixmap changes we'll have to reload it:
-  //connect(twin_module, SIGNAL(windowChanged(WId, unsigned int)), SLOT(desktopChanged(WId, unsigned int)));
-  connect(twin_module, SIGNAL(currentDesktopChanged(int)), SLOT(slotDesktopChanged(int)));
-  connect(kapp, SIGNAL(backgroundChanged(int)), SLOT(slotBackgroundChanged(int)));
+  //connect(twin_module, TQ_SIGNAL(windowChanged(WId, unsigned int)), TQ_SLOT(desktopChanged(WId, unsigned int)));
+  connect(twin_module, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(slotDesktopChanged(int)));
+  connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)));
 
   enablePixmapExports();
   // When Kompose is started by session management the bg shared pixmap may not be available yet
@@ -192,7 +192,7 @@ void KomposeGlobal::initSharedPixmaps()
   {
     tqWarning("KomposeGlobal::initSharedPixmaps() - Pixmap not available");
     //enablePixmapExports();
-    TQTimer::singleShot( 1000, this, SLOT( initSharedPixmaps() ) );
+    TQTimer::singleShot( 1000, this, TQ_SLOT( initSharedPixmaps() ) );
     //initSharedPixmaps();
     //return;
   }
@@ -246,7 +246,7 @@ void KomposeGlobal::slotDone(bool success)
   if (!success)
   {
     kdDebug() << "KomposeGlobal::slotDone() - loading of desktop background failed.\n" << endl;
-    //TQTimer::singleShot( 1000, this, SLOT( initSharedPixmaps() ) );
+    //TQTimer::singleShot( 1000, this, TQ_SLOT( initSharedPixmaps() ) );
   }
 }
 
diff --git a/src/komposepreferences.cpp b/src/komposepreferences.cpp
index a66156c..46ee318 100644
--- a/src/komposepreferences.cpp
+++ b/src/komposepreferences.cpp
@@ -77,7 +77,7 @@ KomposePreferences::KomposePreferences()
     TQHBox *hLayXineramaGrabDelay = new TQHBox(xineramaGroupBox);
     TQLabel *xineramaLabel = new TQLabel(i18n("Use screen:"), hLayXineramaGrabDelay);
     m_viewScreen = new TQSpinBox(0, deskwidget.numScreens()-1, 1, hLayXineramaGrabDelay);
-    connect( m_viewScreenAll, SIGNAL(toggled(bool)), m_viewScreen, SLOT(setDisabled(bool)) );
+    connect( m_viewScreenAll, TQ_SIGNAL(toggled(bool)), m_viewScreen, TQ_SLOT(setDisabled(bool)) );
     xineramaLabel->setBuddy(m_viewScreen);
     TQString xineramaHelp = i18n("Specify the screen where Komposé should appear." );
     TQWhatsThis::add( m_viewScreen, xineramaHelp );
@@ -95,7 +95,7 @@ KomposePreferences::KomposePreferences()
   TQString useCompositeHelp = i18n("Making use of the Composite extension of newer X Servers makes the grabbing of screenshots obsolete.\nThe contents of all windows are drawn in back buffers that will be accessed by Komposé\nNote that the Composite implementation of even modern graphic card drivers is still very slow and may make your system pretty unusable.");
   TQWhatsThis::add( useComposite, useCompositeHelp );
   TQToolTip::add( useComposite, useCompositeHelp );
-  connect( useComposite, SIGNAL(toggled(bool)), SLOT(setUseCompositeToggled(bool)) );
+  connect( useComposite, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setUseCompositeToggled(bool)) );
 #else
   TQGroupBox *screenshotsGroupBox = new TQGroupBox( 3, Vertical, i18n("Screenshots"), page1 );
 #endif
@@ -189,20 +189,20 @@ KomposePreferences::KomposePreferences()
   TQString showWindowTitlesHelp = i18n( "Display the name of every window in Komposé" );
   TQWhatsThis::add( showWindowTitles, showWindowTitlesHelp );
   TQToolTip::add( showWindowTitles, showWindowTitlesHelp );
-  connect( showWindowTitles, SIGNAL(toggled(bool)), windowTitleFontBtn, SLOT(setEnabled(bool)) );
-  connect( windowTitleFontBtn, SIGNAL(clicked()), this, SLOT(showWindowTitleFontDialog()) );
+  connect( showWindowTitles, TQ_SIGNAL(toggled(bool)), windowTitleFontBtn, TQ_SLOT(setEnabled(bool)) );
+  connect( windowTitleFontBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(showWindowTitleFontDialog()) );
 
   TQGrid *gridWindowTitlesColor = new TQGrid(2, windowTitleGroupBox);
   // windowTitleFontColorLabel = new TQLabel(windowTitleFontColor, i18n("Text color: "), gridWindowTitlesColor); // FIXME: How to link to a buddy that doesn't yet exist?
   windowTitleFontColorLabel = new TQLabel(i18n("Text color:"), gridWindowTitlesColor);
   windowTitleFontColor = new KColorButton(TQt::black, gridWindowTitlesColor);
-  connect( showWindowTitles, SIGNAL(toggled(bool)), windowTitleFontColorLabel, SLOT(setEnabled(bool)) );
-  connect( showWindowTitles, SIGNAL(toggled(bool)), windowTitleFontColor, SLOT(setEnabled(bool)) );
+  connect( showWindowTitles, TQ_SIGNAL(toggled(bool)), windowTitleFontColorLabel, TQ_SLOT(setEnabled(bool)) );
+  connect( showWindowTitles, TQ_SIGNAL(toggled(bool)), windowTitleFontColor, TQ_SLOT(setEnabled(bool)) );
   showWindowTitleShadow = new TQCheckBox(i18n("Shadow color:"), gridWindowTitlesColor);
   windowTitleFontShadowColor = new KColorButton(TQt::lightGray, gridWindowTitlesColor);
-  connect( showWindowTitles, SIGNAL(toggled(bool)), showWindowTitleShadow, SLOT(setEnabled(bool)) );
-  connect( showWindowTitles, SIGNAL(toggled(bool)), windowTitleFontShadowColor, SLOT(setEnabled(bool)) );
-  connect( showWindowTitleShadow, SIGNAL(toggled(bool)), windowTitleFontShadowColor, SLOT(setEnabled(bool)) );
+  connect( showWindowTitles, TQ_SIGNAL(toggled(bool)), showWindowTitleShadow, TQ_SLOT(setEnabled(bool)) );
+  connect( showWindowTitles, TQ_SIGNAL(toggled(bool)), windowTitleFontShadowColor, TQ_SLOT(setEnabled(bool)) );
+  connect( showWindowTitleShadow, TQ_SIGNAL(toggled(bool)), windowTitleFontShadowColor, TQ_SLOT(setEnabled(bool)) );
 
   page2Layout->addWidget(windowTitleGroupBox);
 
@@ -245,10 +245,10 @@ KomposePreferences::KomposePreferences()
   showIcons = new TQCheckBox(i18n("Show icons"), iconGroupBox);
   iconSize = new TQSlider(0, 3, 1, 0, TQt::Horizontal, iconGroupBox);
   iconSizeDescription = new TQLabel( iconSize, "", iconGroupBox);
-  connect( iconSize, SIGNAL( sliderMoved(int) ), this, SLOT( updateIconSliderDesc(int) ) );
-  connect( iconSize, SIGNAL( valueChanged(int) ), this, SLOT( updateIconSliderDesc(int) ) );
-  connect( showIcons, SIGNAL( toggled(bool) ), iconSize, SLOT( setEnabled(bool) ) );
-  connect( showIcons, SIGNAL( toggled(bool) ), iconSizeDescription, SLOT( setEnabled(bool) ) );
+  connect( iconSize, TQ_SIGNAL( sliderMoved(int) ), this, TQ_SLOT( updateIconSliderDesc(int) ) );
+  connect( iconSize, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( updateIconSliderDesc(int) ) );
+  connect( showIcons, TQ_SIGNAL( toggled(bool) ), iconSize, TQ_SLOT( setEnabled(bool) ) );
+  connect( showIcons, TQ_SIGNAL( toggled(bool) ), iconSizeDescription, TQ_SLOT( setEnabled(bool) ) );
   page2Layout->addWidget(iconGroupBox);
 
   page2Layout->insertStretch(-1);
@@ -275,7 +275,7 @@ KomposePreferences::KomposePreferences()
   page3Layout->addWidget(virtDesksLayoutGroupBox);
 
   desktopTitleFontBtn = new TQPushButton(i18n("Select Desktop Names Font..."), virtDesksLayoutGroupBox);
-  connect( desktopTitleFontBtn, SIGNAL(clicked()), this, SLOT(showDesktopTitleFontDialog()) );
+  connect( desktopTitleFontBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(showDesktopTitleFontDialog()) );
 
   page3Layout->insertStretch(-1);
 
diff --git a/src/komposesettings.cpp b/src/komposesettings.cpp
index 8aebaac..5a844dd 100644
--- a/src/komposesettings.cpp
+++ b/src/komposesettings.cpp
@@ -52,19 +52,19 @@ KomposeSettings::KomposeSettings(TQObject *parent, const char *name)
   globalAccel->insert( "showDefaultView", i18n("Show Komposé (default view)"),
                        i18n("Displays the view you have configured as default"),
                        KKey::QtWIN+Key_Tab, KKey::QtWIN+CTRL+SHIFT+Key_Tab,
-                       KomposeViewManager::instance(), SLOT(createDefaultView()) );
+                       KomposeViewManager::instance(), TQ_SLOT(createDefaultView()) );
   globalAccel->insert( "showWorldView", i18n("Show Komposé (ungrouped)"),
                        i18n("Displays all windows unsorted"),
                        CTRL+SHIFT+Key_J, KKey::QtWIN+CTRL+SHIFT+Key_J,
-                       KomposeViewManager::instance(), SLOT(createWorldView()) );
+                       KomposeViewManager::instance(), TQ_SLOT(createWorldView()) );
   globalAccel->insert( "showVirtualDesktopView", i18n("Show Komposé (grouped by virtual desktops)"),
                        i18n("Displays all windows sorted by virtual desktops"),
                        CTRL+SHIFT+Key_I, KKey::QtWIN+CTRL+SHIFT+Key_I,
-                       KomposeViewManager::instance(), SLOT(createVirtualDesktopView()) );
+                       KomposeViewManager::instance(), TQ_SLOT(createVirtualDesktopView()) );
   globalAccel->insert( "showCurrentDesktopView", i18n("Show Komposé (current virtual desktop)"),
                        i18n("Displays all windows on the current desktop"),
                        CTRL+SHIFT+Key_K, KKey::QtWIN+CTRL+SHIFT+Key_K,
-                       KomposeViewManager::instance(), SLOT(createCurrentDesktopView()) );
+                       KomposeViewManager::instance(), TQ_SLOT(createCurrentDesktopView()) );
 
   // read Settings from cfg file
   readConfig();
diff --git a/src/komposesystray.cpp b/src/komposesystray.cpp
index 2747bd6..5e8277f 100644
--- a/src/komposesystray.cpp
+++ b/src/komposesystray.cpp
@@ -43,7 +43,7 @@ KomposeSysTray::KomposeSysTray(TQWidget *parent, const char *name)
   KomposeGlobal::instance()->getActAboutDlg()->plug(menu);
 
   slotConfigChanged();
-  connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(slotConfigChanged()) );
+  connect( KomposeSettings::instance(), TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotConfigChanged()) );
 }
 
 
diff --git a/src/komposetask.cpp b/src/komposetask.cpp
index f95f820..1e3d966 100644
--- a/src/komposetask.cpp
+++ b/src/komposetask.cpp
@@ -317,7 +317,7 @@ void KomposeTask::slotX11DamageNotify()
   
   blockDamageEvents = true;
   emit x11DamageNotify();
-  TQTimer::singleShot( 1000, this, SLOT( unBlockDamageEvents() ) );
+  TQTimer::singleShot( 1000, this, TQ_SLOT( unBlockDamageEvents() ) );
 }
 
 int KomposeTask::getHeightForWidth ( int w ) const
diff --git a/src/komposetaskcontainerwidget.cpp b/src/komposetaskcontainerwidget.cpp
index ccf3767..ade9b5d 100644
--- a/src/komposetaskcontainerwidget.cpp
+++ b/src/komposetaskcontainerwidget.cpp
@@ -27,8 +27,8 @@ KomposeTaskContainerWidget::KomposeTaskContainerWidget( int desk, TQWidget *pare
     : KomposeWidget(parent, l, name),
     desktop( desk )
 {
-  connect(KomposeTaskManager::instance(), SIGNAL(taskDesktopChanged(KomposeTask*, int, int )),
-          SLOT(reparentTaskWidget(KomposeTask*, int, int )) );
+  connect(KomposeTaskManager::instance(), TQ_SIGNAL(taskDesktopChanged(KomposeTask*, int, int )),
+          TQ_SLOT(reparentTaskWidget(KomposeTask*, int, int )) );
 }
 
 
@@ -66,7 +66,7 @@ void KomposeTaskContainerWidget::reparentTaskWidget( KomposeTask* task, int from
   if ( desktop == toDesktop -1 || (toDesktop == -1 && fromDesktop-1!=desktop) )
   {
     createTaskWidget( task, true );
-    //TQTimer::singleShot( 200, layout, SLOT( arrangeLayout() ) );
+    //TQTimer::singleShot( 200, layout, TQ_SLOT( arrangeLayout() ) );
     //        layout->arrangeLayout();
   }
 }
@@ -199,7 +199,7 @@ void KomposeTaskContainerWidget::createTaskWidget( KomposeTask* task, bool manua
     KomposeTaskWidget *taskwidget = new KomposeTaskWidget( task, this );
     if (manualShow)
       taskwidget->show();
-    connect( taskwidget, SIGNAL(requestRemoval(KomposeWidget*)), SLOT(requestRemoval(KomposeWidget*)) );
+    connect( taskwidget, TQ_SIGNAL(requestRemoval(KomposeWidget*)), TQ_SLOT(requestRemoval(KomposeWidget*)) );
   }
 }
 
diff --git a/src/komposetaskmanager.cpp b/src/komposetaskmanager.cpp
index fa8b1bb..4830e1d 100644
--- a/src/komposetaskmanager.cpp
+++ b/src/komposetaskmanager.cpp
@@ -75,20 +75,20 @@ KomposeTaskManager::KomposeTaskManager()
   callCompositeRedirect();
 
   // Listeners for KWinmodule signals
-  connect( twin_module, SIGNAL(windowAdded(WId)), this, SLOT(slotWindowAdded(WId)) );
-  connect( twin_module, SIGNAL(windowRemoved(WId)), this, SLOT(slotWindowRemoved(WId)) );
-  connect( twin_module, SIGNAL(numberOfDesktopsChanged(int)), this, SLOT(slotDesktopCountChanged(int)) );
-  connect( twin_module, SIGNAL(currentDesktopChanged(int)), this, SLOT(slotCurrentDesktopChanged(int)) );
+  connect( twin_module, TQ_SIGNAL(windowAdded(WId)), this, TQ_SLOT(slotWindowAdded(WId)) );
+  connect( twin_module, TQ_SIGNAL(windowRemoved(WId)), this, TQ_SLOT(slotWindowRemoved(WId)) );
+  connect( twin_module, TQ_SIGNAL(numberOfDesktopsChanged(int)), this, TQ_SLOT(slotDesktopCountChanged(int)) );
+  connect( twin_module, TQ_SIGNAL(currentDesktopChanged(int)), this, TQ_SLOT(slotCurrentDesktopChanged(int)) );
 
-  connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(slotStartWindowListeners()) );
-  connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(callCompositeRedirect()) );
+  connect( KomposeSettings::instance(), TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotStartWindowListeners()) );
+  connect( KomposeSettings::instance(), TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(callCompositeRedirect()) );
 
   // register existing windows
   const TQValueList<WId> windows = twin_module->windows();
   for (TQValueList<WId>::ConstIterator it = windows.begin(); it != windows.end(); ++it )
     slotWindowAdded(*it);
 
-  connect( twin_module, SIGNAL(activeWindowChanged(WId)), this, SLOT(slotTaskActivated(WId)) );
+  connect( twin_module, TQ_SIGNAL(activeWindowChanged(WId)), this, TQ_SLOT(slotTaskActivated(WId)) );
   slotStartWindowListeners();
 }
 
@@ -137,10 +137,10 @@ KomposeTask* KomposeTaskManager::findTask(WId w, bool wmFrameIds )
 
 void KomposeTaskManager::slotStartWindowListeners()
 {
-  disconnect( twin_module, SIGNAL(windowChanged( WId, unsigned int )), this,
-              SLOT(slotWindowChanged( WId, unsigned int )) );
-  connect( twin_module, SIGNAL(windowChanged( WId, unsigned int )), this,
-           SLOT(slotWindowChanged( WId, unsigned int )) );
+  disconnect( twin_module, TQ_SIGNAL(windowChanged( WId, unsigned int )), this,
+              TQ_SLOT(slotWindowChanged( WId, unsigned int )) );
+  connect( twin_module, TQ_SIGNAL(windowChanged( WId, unsigned int )), this,
+           TQ_SLOT(slotWindowChanged( WId, unsigned int )) );
 }
 
 
diff --git a/src/komposetaskvisualizer.cpp b/src/komposetaskvisualizer.cpp
index 9e21eaf..7a73619 100644
--- a/src/komposetaskvisualizer.cpp
+++ b/src/komposetaskvisualizer.cpp
@@ -56,11 +56,11 @@ KomposeTaskVisualizer::KomposeTaskVisualizer(KomposeTask *parent, const char *na
   if ( !KomposeSettings::instance()->getCacheScaledPixmaps() )
   {
       // clear cached pixmaps on viewclose
-      connect( KomposeViewManager::instance(), SIGNAL(viewClosed()), this, SLOT(clearCached()) );
+      connect( KomposeViewManager::instance(), TQ_SIGNAL(viewClosed()), this, TQ_SLOT(clearCached()) );
   }
 
   initXComposite();
-  connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(initXComposite()) );
+  connect( KomposeSettings::instance(), TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(initXComposite()) );
 }
 
 KomposeTaskVisualizer::~KomposeTaskVisualizer()
@@ -197,7 +197,7 @@ void KomposeTaskVisualizer::slotTaskActivated()
   {
     // Retry 1 sec later
     screenshotSuspended = true;
-    TQTimer::singleShot( 500, this, SLOT( slotTaskActivated() ) );
+    TQTimer::singleShot( 500, this, TQ_SLOT( slotTaskActivated() ) );
   }
   screenshotSuspended = false;
 
@@ -208,7 +208,7 @@ void KomposeTaskVisualizer::slotTaskActivated()
   {
     kdDebug() << "KomposeTaskVisualizer::slotTaskActivated() (WId " << task->window() << ") - Screenshot already exists, but passive mode on - Grabbing new one." << endl;
     // Use a timer to make task switching feel more responsive
-    TQTimer::singleShot( 300, this, SLOT( captureScreenshot_GrabWindow() ) );
+    TQTimer::singleShot( 300, this, TQ_SLOT( captureScreenshot_GrabWindow() ) );
     //captureScreenshot_GrabWindow();
   }
 }
@@ -266,7 +266,7 @@ void KomposeTaskVisualizer::slotUpdateScreenshot()
 
     // Restore if formerly iconified
     if ( iconifyLater )
-      TQTimer::singleShot( 1000, task, SLOT( iconify() ) );
+      TQTimer::singleShot( 1000, task, TQ_SLOT( iconify() ) );
 
     scaledScreenshotDirty = true;
   }
@@ -312,9 +312,9 @@ void KomposeTaskVisualizer::initXComposite()
   {
     dpy = TQPaintDevice::x11AppDisplay();
 
-    connect( task, SIGNAL(x11ConfigureNotify()), this, SLOT(updateXCompositeNamedPixmap()));
+    connect( task, TQ_SIGNAL(x11ConfigureNotify()), this, TQ_SLOT(updateXCompositeNamedPixmap()));
     XSelectInput( dpy, task->wmFrame(), StructureNotifyMask );
-    connect( task, SIGNAL( x11DamageNotify() ), SLOT( setScaledScreenshotDirty() ) );
+    connect( task, TQ_SIGNAL( x11DamageNotify() ), TQ_SLOT( setScaledScreenshotDirty() ) );
 
     XWindowAttributes attr;
     XGetWindowAttributes( dpy, task->wmFrame(), &attr );
@@ -335,8 +335,8 @@ void KomposeTaskVisualizer::initXComposite()
   }
   else
   {
-    disconnect( task, SIGNAL(x11ConfigureNotify()), this, SLOT(updateXCompositeNamedPixmap()));
-    disconnect( task, SIGNAL( x11DamageNotify() ), this, SLOT( setScaledScreenshotDirty() ) );
+    disconnect( task, TQ_SIGNAL(x11ConfigureNotify()), this, TQ_SLOT(updateXCompositeNamedPixmap()));
+    disconnect( task, TQ_SIGNAL( x11DamageNotify() ), this, TQ_SLOT( setScaledScreenshotDirty() ) );
     if ( compositeInit )
     {
       XDamageDestroy( dpy, damage);
@@ -368,7 +368,7 @@ void KomposeTaskVisualizer::captureScreenshot_GrabWindow()
 
   // We've just grabbed a screenshot and don't want this to happen again in the next 3?! seconds
   screenshotBlocked = true;
-  TQTimer::singleShot( 3000, this, SLOT( enablePasvScreenshots() ) );
+  TQTimer::singleShot( 3000, this, TQ_SLOT( enablePasvScreenshots() ) );
 
   kdDebug() << "KomposeTaskVisualizer::captureScreenshot_GrabWindow() (WId " << task->window() << ") - Grabbed screenshot." << endl;
 
diff --git a/src/komposetaskwidget.cpp b/src/komposetaskwidget.cpp
index d8f92f4..1dd2557 100644
--- a/src/komposetaskwidget.cpp
+++ b/src/komposetaskwidget.cpp
@@ -70,15 +70,15 @@ KomposeTaskWidget::KomposeTaskWidget(KomposeTask *t, TQWidget *parent, KomposeLa
   prefWidget->hide();
   setActionIcons();
 
-  //connect( t, SIGNAL( destroyed() ), this, SLOT( slotTaskDestroyed() ) );
-  connect( t, SIGNAL( closed() ), this, SLOT( slotTaskDestroyed() ) );
-  connect( t, SIGNAL( stateChanged() ), this, SLOT( drawWidgetAndRepaint() ) );
-  connect( t, SIGNAL( stateChanged() ), this, SLOT( reInitMenu() ) );
+  //connect( t, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotTaskDestroyed() ) );
+  connect( t, TQ_SIGNAL( closed() ), this, TQ_SLOT( slotTaskDestroyed() ) );
+  connect( t, TQ_SIGNAL( stateChanged() ), this, TQ_SLOT( drawWidgetAndRepaint() ) );
+  connect( t, TQ_SIGNAL( stateChanged() ), this, TQ_SLOT( reInitMenu() ) );
 
 #ifdef COMPOSITE
   if ( KomposeGlobal::instance()->hasXcomposite() && KomposeSettings::instance()->getUseComposite() )
   {
-    connect( t, SIGNAL( x11DamageNotify() ), this, SLOT( drawWidgetAndRepaint() ) );
+    connect( t, TQ_SIGNAL( x11DamageNotify() ), this, TQ_SLOT( drawWidgetAndRepaint() ) );
   }
 #endif
   //setFocusPolicy(TQWidget::ClickFocus);
@@ -111,8 +111,8 @@ void KomposeTaskWidget::initFonts()
 
 void KomposeTaskWidget::slotTaskDestroyed()
 {
-  disconnect( task, SIGNAL( closed() ), this, SLOT( slotTaskDestroyed() ) );
-  disconnect( task, SIGNAL( stateChanged() ), this, SLOT( drawWidgetAndRepaint() ) );
+  disconnect( task, TQ_SIGNAL( closed() ), this, TQ_SLOT( slotTaskDestroyed() ) );
+  disconnect( task, TQ_SIGNAL( stateChanged() ), this, TQ_SLOT( drawWidgetAndRepaint() ) );
   
   //if (KomposeViewManager::instance()->hasActiveView())
   emit requestRemoval(this);
@@ -355,10 +355,10 @@ void KomposeTaskWidget::initActions()
   taskActionCollection = new TDEActionCollection( this );
 
   actCloseTask = new TDEAction( i18n("Close"), "window-close", Key_Delete , task,
-                              SLOT( close() ), taskActionCollection, "closeTask" );
+                              TQ_SLOT( close() ), taskActionCollection, "closeTask" );
   actCloseTask->setToolTip(i18n("Close"));
   actMinimizeRestoreTask = new TDEAction( i18n("Minimize/Restore"), "", TDEShortcut() , this,
-                                        SLOT( slotMinimizeRestoreToggled() ), taskActionCollection, "minimizeRestoreTask" );
+                                        TQ_SLOT( slotMinimizeRestoreToggled() ), taskActionCollection, "minimizeRestoreTask" );
 }
 
 void KomposeTaskWidget::initMenu()
@@ -371,7 +371,7 @@ void KomposeTaskWidget::initMenu()
   TQPopupMenu* m = new TQPopupMenu( this );
   m->setCheckable( true );
 
-  int id = m->insertItem( i18n("&All Desktops"), task, SLOT( toDesktop(int) ) );
+  int id = m->insertItem( i18n("&All Desktops"), task, TQ_SLOT( toDesktop(int) ) );
   m->setItemParameter( id, 0 ); // 0 means all desktops
   m->setItemChecked( id, task->isOnAllDesktops() );
 
@@ -380,7 +380,7 @@ void KomposeTaskWidget::initMenu()
   for( int i = 1; i <= KomposeTaskManager::instance()->getNumDesktops(); i++ )
   {
     TQString name = TQString( "&%1 %2" ).arg( i ).arg( KomposeTaskManager::instance()->getDesktopName( i ).replace( '&', "&&" ) );
-    id = m->insertItem( name, task, SLOT( toDesktop(int) ) );
+    id = m->insertItem( name, task, TQ_SLOT( toDesktop(int) ) );
     m->setItemParameter( id, i );
     m->setItemChecked( id, !task->isOnAllDesktops() && task->onDesktop() == i );
   }
diff --git a/src/komposeviewmanager.cpp b/src/komposeviewmanager.cpp
index 9b4da6e..0be6f5a 100644
--- a/src/komposeviewmanager.cpp
+++ b/src/komposeviewmanager.cpp
@@ -57,7 +57,7 @@ KomposeViewManager::KomposeViewManager():
   slotStartCursorUpdateTimer();
 
   // dirty hack. see uglyTQtHackInitFunction()
-  TQTimer::singleShot( 500, this, SLOT( uglyTQtHackInitFunction() ) );
+  TQTimer::singleShot( 500, this, TQ_SLOT( uglyTQtHackInitFunction() ) );
 }
 
 
@@ -72,7 +72,7 @@ KomposeViewManager::~KomposeViewManager()
  */
 void KomposeViewManager::uglyTQtHackInitFunction()
 {
-  connect( KomposeSettings::instance(), SIGNAL( settingsChanged() ), SLOT( slotStartCursorUpdateTimer() ) );
+  connect( KomposeSettings::instance(), TQ_SIGNAL( settingsChanged() ), TQ_SLOT( slotStartCursorUpdateTimer() ) );
 }
 
 /**
@@ -81,7 +81,7 @@ void KomposeViewManager::uglyTQtHackInitFunction()
  */
 void KomposeViewManager::slotStartCursorUpdateTimer()
 {
-  disconnect( cursorUpdateTimer, SIGNAL( timeout() ), this, SLOT( checkCursorPos() ) );
+  disconnect( cursorUpdateTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( checkCursorPos() ) );
 
   if ( KomposeSettings::instance()->getActivateOnBottomLeftCorner() ||
        KomposeSettings::instance()->getActivateOnBottomRightCorner() ||
@@ -100,7 +100,7 @@ void KomposeViewManager::slotStartCursorUpdateTimer()
     bottomLeftCorner = deskRect.bottomLeft();
     bottomRightCorner = deskRect.bottomRight();
 
-    connect( cursorUpdateTimer, SIGNAL( timeout() ), SLOT( checkCursorPos() ) );
+    connect( cursorUpdateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkCursorPos() ) );
     cursorUpdateTimer->start( 200, false ); // TODO: Find out why even an interval of 1ms doesn't hit performance!
   }
 }
@@ -131,7 +131,7 @@ void KomposeViewManager::checkCursorPos()
   )
   {
     //cursorUpdateTimer->stop();
-    TQTimer::singleShot( KomposeSettings::instance()->getAutoLockDelay(), this, SLOT( reCheckCursorPos() ) );
+    TQTimer::singleShot( KomposeSettings::instance()->getAutoLockDelay(), this, TQ_SLOT( reCheckCursorPos() ) );
   }
 }
 
@@ -230,7 +230,7 @@ void KomposeViewManager::closeCurrentView()
   KWin::setCurrentDesktop( deskBeforeSnaps );
 
   // A short delay until we allow screenshots again (would cause overlapping else
-  TQTimer::singleShot( 400, this, SLOT( toggleBlockScreenshots() ) );
+  TQTimer::singleShot( 400, this, TQ_SLOT( toggleBlockScreenshots() ) );
 
   // Restart Timer for corner checks
   slotStartCursorUpdateTimer();