diff --git a/kiosktool/componentPage.cpp b/kiosktool/componentPage.cpp
index 105a606..e4b666f 100644
--- a/kiosktool/componentPage.cpp
+++ b/kiosktool/componentPage.cpp
@@ -44,8 +44,8 @@ ComponentPage::ComponentPage( ComponentData *data, Component *component, TQWidge
  : ComponentPageUI(parent, name, fl), PageWidget(this), m_data(data), m_component(component)
 {
   m_process = 0;
-  connect(pbSetup, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSetup()));
-  connect(pbPreview, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPreview()));
+  connect(pbSetup, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSetup()));
+  connect(pbPreview, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPreview()));
 
   pbSetup->setText(i18n("&Setup %1").arg(m_data->caption));
   pbPreview->setText(i18n("&Preview %1").arg(m_data->caption));
@@ -63,14 +63,14 @@ ComponentPage::ComponentPage( ComponentData *data, Component *component, TQWidge
      if (firstTime)
      {
         firstTime = false;
-        TQTimer::singleShot(0, this, TQT_SLOT(slotShowNotice()));
+        TQTimer::singleShot(0, this, TQ_SLOT(slotShowNotice()));
      }
   }
 
   fillActionList(listComponentConfig, m_data);
   
-  connect(listComponentConfig, TQT_SIGNAL(currentChanged(TQListViewItem *)),
-          this, TQT_SLOT(slotShowAction(TQListViewItem *)));
+  connect(listComponentConfig, TQ_SIGNAL(currentChanged(TQListViewItem *)),
+          this, TQ_SLOT(slotShowAction(TQListViewItem *)));
   slotShowAction(listComponentConfig->currentItem());          
 }
 
@@ -140,8 +140,8 @@ void ComponentPage::slotSetup()
    if (!dcopApp.isEmpty())
    {
       KioskRun::self()->dcopClient()->setNotifications(true);
-      connect(KioskRun::self()->dcopClient(), TQT_SIGNAL(applicationRegistered( const TQCString& )),
-           this, TQT_SLOT(slotSetupAppRegistered( const TQCString& )));
+      connect(KioskRun::self()->dcopClient(), TQ_SIGNAL(applicationRegistered( const TQCString& )),
+           this, TQ_SLOT(slotSetupAppRegistered( const TQCString& )));
    }
 
    TQStringList args;
@@ -162,7 +162,7 @@ void ComponentPage::slotSetup()
 
    if (m_process->isRunning())
    {
-      connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotPreviewDone()));
+      connect(m_process, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotPreviewDone()));
    }
    else
    {
@@ -176,8 +176,8 @@ void ComponentPage::slotSetupDone()
    m_process = 0;
 
    KioskRun::self()->dcopClient()->setNotifications(false);
-   disconnect(KioskRun::self()->dcopClient(), TQT_SIGNAL(applicationRegistered( const TQCString& )),
-              this, TQT_SLOT(slotSetupAppRegistered( const TQCString& )));
+   disconnect(KioskRun::self()->dcopClient(), TQ_SIGNAL(applicationRegistered( const TQCString& )),
+              this, TQ_SLOT(slotSetupAppRegistered( const TQCString& )));
 
    KioskRun::self()->makeMutable(false);
    if (m_saveSettings)
@@ -239,8 +239,8 @@ void ComponentPage::slotPreview()
    if (!dcopApp.isEmpty())
    {
       KioskRun::self()->dcopClient()->setNotifications(true);
-      connect(KioskRun::self()->dcopClient(), TQT_SIGNAL(applicationRegistered( const TQCString& )),
-           this, TQT_SLOT(slotPreviewAppRegistered( const TQCString& )));
+      connect(KioskRun::self()->dcopClient(), TQ_SIGNAL(applicationRegistered( const TQCString& )),
+           this, TQ_SLOT(slotPreviewAppRegistered( const TQCString& )));
    }
 
    TQStringList args;
@@ -260,7 +260,7 @@ void ComponentPage::slotPreview()
 
    if (m_process->isRunning())
    {
-      connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotPreviewDone()));
+      connect(m_process, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotPreviewDone()));
    }
    else
    {
@@ -282,8 +282,8 @@ void ComponentPage::slotPreviewAppRegistered( const TQCString &appid)
 void ComponentPage::slotPreviewDone()
 {
    KioskRun::self()->dcopClient()->setNotifications(false);
-   disconnect(KioskRun::self()->dcopClient(), TQT_SIGNAL(applicationRegistered( const TQCString& )),
-              this, TQT_SLOT(slotPreviewAppRegistered( const TQCString& )));
+   disconnect(KioskRun::self()->dcopClient(), TQ_SIGNAL(applicationRegistered( const TQCString& )),
+              this, TQ_SLOT(slotPreviewAppRegistered( const TQCString& )));
 
    delete m_process;
    m_process = 0;
diff --git a/kiosktool/componentSelectionPage.cpp b/kiosktool/componentSelectionPage.cpp
index b047b13..dfc58ed 100644
--- a/kiosktool/componentSelectionPage.cpp
+++ b/kiosktool/componentSelectionPage.cpp
@@ -49,9 +49,9 @@ ComponentSelectionPage::ComponentSelectionPage( KioskData *data, TQWidget* paren
    listComponent->setGridX(110);
    listComponent->setGridY(75);
    loadComponentList();
-   connect(listComponent, TQT_SIGNAL(clicked(TQIconViewItem *)), this, TQT_SLOT(slotComponentActivated(TQIconViewItem *)));
-   connect(listComponent, TQT_SIGNAL(returnPressed (TQIconViewItem *)), this, TQT_SLOT(slotComponentActivated(TQIconViewItem *)));
-   connect(pbSetup, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotComponentActivated()));
+   connect(listComponent, TQ_SIGNAL(clicked(TQIconViewItem *)), this, TQ_SLOT(slotComponentActivated(TQIconViewItem *)));
+   connect(listComponent, TQ_SIGNAL(returnPressed (TQIconViewItem *)), this, TQ_SLOT(slotComponentActivated(TQIconViewItem *)));
+   connect(pbSetup, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotComponentActivated()));
 }
 
 ComponentSelectionPage::~ComponentSelectionPage()
diff --git a/kiosktool/desktopComponent.cpp b/kiosktool/desktopComponent.cpp
index 5dea814..15b3b76 100644
--- a/kiosktool/desktopComponent.cpp
+++ b/kiosktool/desktopComponent.cpp
@@ -46,7 +46,7 @@ DesktopComponent::slotSetupPrepare()
 {
    m_iconPositionsFile = KioskRun::self()->locateLocal("data", "kdesktop/IconPositions");
    ::unlink(TQFile::encodeName(m_iconPositionsFile));
-   connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSetupStarted()));
+   connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSetupStarted()));
 }
 
 void
@@ -56,8 +56,8 @@ DesktopComponent::slotSetupStarted()
    TQFileInfo info(desktop);
    if (info.exists())
    {
-      disconnect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSetupStarted()));
-      connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSetupReady()));
+      disconnect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSetupStarted()));
+      connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSetupReady()));
       m_timer.start(1000, true);
    }
    else
@@ -113,8 +113,8 @@ DesktopComponent::setupFinished()
 {
    bool result = true;
    
-   disconnect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSetupStarted()));
-   disconnect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSetupReady()));
+   disconnect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSetupStarted()));
+   disconnect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSetupReady()));
    m_timer.stop();
    
    KSimpleConfig newCfg(m_iconPositionsFile, true);
diff --git a/kiosktool/kcms/autostart/kcmautostart.cpp b/kiosktool/kcms/autostart/kcmautostart.cpp
index e8bb8aa..113d160 100644
--- a/kiosktool/kcms/autostart/kcmautostart.cpp
+++ b/kiosktool/kcms/autostart/kcmautostart.cpp
@@ -117,7 +117,7 @@ void AutoStartConfig::load() {
             if ( !name.isEmpty() )
             {
                 CheckListItem *clitem = new CheckListItem( _lvStartup, TQString() );
-                connect( clitem, TQT_SIGNAL( changed( TQCheckListItem * ) ), TQT_SLOT( slotItemChecked( TQCheckListItem * ) ) );
+                connect( clitem, TQ_SIGNAL( changed( TQCheckListItem * ) ), TQ_SLOT( slotItemChecked( TQCheckListItem * ) ) );
                 clitem->setText( 1, name );
                 clitem->setText( 2, file.readComment() );
                 clitem->setText( 3, *it );
@@ -150,7 +150,7 @@ void AutoStartConfig::save()
         ++it;
     }
 
-    //TQTimer::singleShot(0, this, TQT_SLOT(slotServiceRunningToggled()));
+    //TQTimer::singleShot(0, this, TQ_SLOT(slotServiceRunningToggled()));
 }
 
 void AutoStartConfig::defaults()
diff --git a/kiosktool/kioskConfigDialog.cpp b/kiosktool/kioskConfigDialog.cpp
index 2580894..30eb3ed 100644
--- a/kiosktool/kioskConfigDialog.cpp
+++ b/kiosktool/kioskConfigDialog.cpp
@@ -45,9 +45,9 @@ KioskConfigDialog::KioskConfigDialog(TQWidget *parent)
   setMainWidget(w);
   
   init();
-  connect(w->lineProfilePrefix, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(updateExample()));
-  connect(w->lineUpload, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(updateExample()));
-  connect(w->lineUploadPrefix, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(updateExample()));
+  connect(w->lineProfilePrefix, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(updateExample()));
+  connect(w->lineUpload, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(updateExample()));
+  connect(w->lineUploadPrefix, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(updateExample()));
 }
 
 KioskConfigDialog::~KioskConfigDialog()
diff --git a/kiosktool/kioskgui.cpp b/kiosktool/kioskgui.cpp
index b5982af..f59e471 100644
--- a/kiosktool/kioskgui.cpp
+++ b/kiosktool/kioskgui.cpp
@@ -88,8 +88,8 @@ KioskGui::KioskGui()
 
     m_view->pbHelp->hide(); // TODO, write help :)
 
-    connect(m_view->pbDiscard, TQT_SIGNAL(clicked()), this, TQT_SLOT(discardPage()));
-    connect(m_view->pbFinished, TQT_SIGNAL(clicked()), this, TQT_SLOT(finishedPage()));
+    connect(m_view->pbDiscard, TQ_SIGNAL(clicked()), this, TQ_SLOT(discardPage()));
+    connect(m_view->pbFinished, TQ_SIGNAL(clicked()), this, TQ_SLOT(finishedPage()));
 
     TDEConfig *config = kapp->config();
     config->setGroup("General");
@@ -98,7 +98,7 @@ KioskGui::KioskGui()
 
     selectPage(PAGE_PROFILE_SELECTION, true);
     
-    TQTimer::singleShot(0, this, TQT_SLOT(slotCheckEtcSkel()));
+    TQTimer::singleShot(0, this, TQ_SLOT(slotCheckEtcSkel()));
 }
 
 KioskGui::~KioskGui()
@@ -154,21 +154,21 @@ void KioskGui::setSubCaption(const TQString &subCaption)
 
 void KioskGui::setupActions()
 {
-//    KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
-//    KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection());
-//    KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
-    KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
-//    KStdAction::back(this, TQT_SLOT(previousPage()), actionCollection(), "previousPage");
-//    KStdAction::forward(this, TQT_SLOT(nextPage()), actionCollection(), "nextPage");
+//    KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+//    KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection());
+//    KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection());
+    KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
+//    KStdAction::back(this, TQ_SLOT(previousPage()), actionCollection(), "previousPage");
+//    KStdAction::forward(this, TQ_SLOT(nextPage()), actionCollection(), "nextPage");
 
 //    createStandardStatusBarAction();
 //    setStandardToolBarMenuEnabled(true);
 
-//    KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
-//    KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
-    KStdAction::preferences(this, TQT_SLOT(slotConfig()), actionCollection());
-    m_uploadAction = new TDEAction(i18n("Upload &All Profiles"), TQString(), 0, this, TQT_SLOT(uploadAllProfiles()), actionCollection(), "upload_all");
-    m_backgroundAction = new TDEToggleAction(i18n("Background Graphics"), TQString(), 0, this, TQT_SLOT(slotUpdateBackground()), actionCollection(), "show_background");
+//    KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
+//    KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
+    KStdAction::preferences(this, TQ_SLOT(slotConfig()), actionCollection());
+    m_uploadAction = new TDEAction(i18n("Upload &All Profiles"), TQString(), 0, this, TQ_SLOT(uploadAllProfiles()), actionCollection(), "upload_all");
+    m_backgroundAction = new TDEToggleAction(i18n("Background Graphics"), TQString(), 0, this, TQ_SLOT(slotUpdateBackground()), actionCollection(), "show_background");
 
     updateActions();
 }
@@ -277,21 +277,21 @@ void KioskGui::selectPage(int page, bool save)
        setWidgetBackground(m_profileSelectionPage);
 
        connect(m_profileSelectionPage->listProfile,
-               TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
-               this, TQT_SLOT(slotProfileContextMenu(TQListViewItem *, const TQPoint &)));
+               TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
+               this, TQ_SLOT(slotProfileContextMenu(TQListViewItem *, const TQPoint &)));
        connect(m_profileSelectionPage->listProfile,
-               TQT_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int )),
-               this, TQT_SLOT(nextPage()));
-       connect(m_profileSelectionPage->buttonDelete, TQT_SIGNAL(clicked()),
-               this, TQT_SLOT(slotDeleteProfile()));
-       connect(m_profileSelectionPage->buttonAdd, TQT_SIGNAL(clicked()),
-               this, TQT_SLOT(slotAddProfile()));
-       connect(m_profileSelectionPage->buttonProperty, TQT_SIGNAL(clicked()),
-               this, TQT_SLOT(slotProfileProperties()));
-       connect(m_profileSelectionPage->buttonSetup, TQT_SIGNAL(clicked()),
-               this, TQT_SLOT(slotProfileSetup()));
-       connect(m_profileSelectionPage->buttonUsers, TQT_SIGNAL(clicked()),
-               this, TQT_SLOT(slotManageUsers()));
+               TQ_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int )),
+               this, TQ_SLOT(nextPage()));
+       connect(m_profileSelectionPage->buttonDelete, TQ_SIGNAL(clicked()),
+               this, TQ_SLOT(slotDeleteProfile()));
+       connect(m_profileSelectionPage->buttonAdd, TQ_SIGNAL(clicked()),
+               this, TQ_SLOT(slotAddProfile()));
+       connect(m_profileSelectionPage->buttonProperty, TQ_SIGNAL(clicked()),
+               this, TQ_SLOT(slotProfileProperties()));
+       connect(m_profileSelectionPage->buttonSetup, TQ_SIGNAL(clicked()),
+               this, TQ_SLOT(slotProfileSetup()));
+       connect(m_profileSelectionPage->buttonUsers, TQ_SIGNAL(clicked()),
+               this, TQ_SLOT(slotManageUsers()));
 
        m_view->widgetStack->addWidget(m_profileSelectionPage, PAGE_PROFILE_SELECTION);
        m_profileSelectionPage->listProfile->setFocus();
@@ -305,7 +305,7 @@ void KioskGui::selectPage(int page, bool save)
        }
 
        m_componentSelectionPage = new ComponentSelectionPage(m_data, this);
-       connect(m_componentSelectionPage, TQT_SIGNAL(componentActivated()), this, TQT_SLOT(nextPage()));
+       connect(m_componentSelectionPage, TQ_SIGNAL(componentActivated()), this, TQ_SLOT(nextPage()));
        m_componentSelectionPage->setCurrentComponent(m_component);
        setWidgetBackground(m_componentSelectionPage);
 
diff --git a/kiosktool/kioskrun.cpp b/kiosktool/kioskrun.cpp
index e4eede9..5242749 100644
--- a/kiosktool/kioskrun.cpp
+++ b/kiosktool/kioskrun.cpp
@@ -778,7 +778,7 @@ KioskRun::setupRuntimeEnv()
    
    tdeinit << "tdeinit";
    
-   connect(&tdeinit, TQT_SIGNAL(processExited(TDEProcess *)), &dlg, TQT_SLOT(slotFinished()));
+   connect(&tdeinit, TQ_SIGNAL(processExited(TDEProcess *)), &dlg, TQ_SLOT(slotFinished()));
    
    tdeinit.start(TDEProcess::NotifyOnExit);
 
@@ -1663,7 +1663,7 @@ KioskRunProgressDialog::KioskRunProgressDialog(TQWidget *parent, const char *nam
                           const TQString &caption, const TQString &text)
  : KProgressDialog(parent, name, caption, text, true)
 {
-  connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotProgress()));
+  connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotProgress()));
   progressBar()->setTotalSteps(20);
   m_timeStep = 700;
   m_timer.start(m_timeStep);
@@ -1692,7 +1692,7 @@ KioskRunProgressDialog::slotFinished()
 {
   progressBar()->setProgress(20);
   m_timer.stop();
-  TQTimer::singleShot(1000, this, TQT_SLOT(close()));
+  TQTimer::singleShot(1000, this, TQ_SLOT(close()));
 }
 
 
diff --git a/kiosktool/profilePropsPage.cpp b/kiosktool/profilePropsPage.cpp
index 4c59ffe..7767660 100644
--- a/kiosktool/profilePropsPage.cpp
+++ b/kiosktool/profilePropsPage.cpp
@@ -93,12 +93,12 @@ void ProfilePropsPage::load()
 
   TQString profilePrefix = KioskRun::self()->getProfilePrefix();
   m_fixedProfileDir = !profilePrefix.isEmpty();
-  connect(editProfileName, TQT_SIGNAL(textChanged(const TQString&)),
-          this, TQT_SLOT(slotProfileNameChanged()));
+  connect(editProfileName, TQ_SIGNAL(textChanged(const TQString&)),
+          this, TQ_SLOT(slotProfileNameChanged()));
   
 #if 0
-  connect(kurlInstallDir, TQT_SIGNAL(textChanged(const TQString&)),
-          this, TQT_SLOT(updateButtons()));
+  connect(kurlInstallDir, TQ_SIGNAL(textChanged(const TQString&)),
+          this, TQ_SLOT(updateButtons()));
 #endif
 
   comboUser->setEditable(true);
diff --git a/kiosktool/screensaverComponent.cpp b/kiosktool/screensaverComponent.cpp
index 73a99c0..1ae6bee 100644
--- a/kiosktool/screensaverComponent.cpp
+++ b/kiosktool/screensaverComponent.cpp
@@ -25,7 +25,7 @@ ScreenSaverComponent::ScreenSaverComponent( TQObject *parent)
  : Component(parent)
 {
 tqWarning("ScreenSaverComponent::ScreenSaverComponent");
-    connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotPreviewStarted()));
+    connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotPreviewStarted()));
 }
 
 ScreenSaverComponent::~ScreenSaverComponent()
diff --git a/kiosktool/userManagement.cpp b/kiosktool/userManagement.cpp
index f69288a..0285d09 100644
--- a/kiosktool/userManagement.cpp
+++ b/kiosktool/userManagement.cpp
@@ -52,13 +52,13 @@ UserManagementPage::UserManagementPage(TQWidget* parent, const char* name, WFlag
   
 //  actionButton(KDialogBase::Ok)->setFocus();
   
-  connect(buttonAddGroup, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddGroup()));
-  connect(buttonDeleteGroup, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteGroup()));
-  connect(buttonAddUser, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddUser()));
-  connect(buttonDeleteUser, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteUser()));
+  connect(buttonAddGroup, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddGroup()));
+  connect(buttonDeleteGroup, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteGroup()));
+  connect(buttonAddUser, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddUser()));
+  connect(buttonDeleteUser, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteUser()));
 
-  connect(listGroups, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateButtons()));
-  connect(listUsers, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateButtons()));
+  connect(listGroups, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotUpdateButtons()));
+  connect(listUsers, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotUpdateButtons()));
   
 //  init();
   static bool firstTime = true;
@@ -66,7 +66,7 @@ UserManagementPage::UserManagementPage(TQWidget* parent, const char* name, WFlag
   if (firstTime)
   {
      firstTime = false;
-     TQTimer::singleShot(0, this, TQT_SLOT(slotShowNotice()));
+     TQTimer::singleShot(0, this, TQ_SLOT(slotShowNotice()));
   }
 }