1 files changed, 24 insertions, 24 deletions

diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp
index 379a17cd..6febb6aa 100644
--- a/kmobile/kmobile.cpp
+++ b/kmobile/kmobile.cpp
@@ -74,8 +74,8 @@ KMobile::KMobile()
     setAutoSaveSettings();
 
     // allow the view to change the statusbar and caption
-    connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)),
-            this,   TQT_SLOT(changeStatusbar(const TQString&)));
+    connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)),
+            this,   TQ_SLOT(changeStatusbar(const TQString&)));
 
     // restore all configured devices
     restoreAll();
@@ -83,7 +83,7 @@ KMobile::KMobile()
     // setup the system tray
     m_systemTray = new SystemTray(this, "systemTray");
     m_systemTray->show();
-    connect(m_systemTray, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotQuit()));
+    connect(m_systemTray, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotQuit()));
 }
 
 KMobile::~KMobile()
@@ -93,29 +93,29 @@ KMobile::~KMobile()
 
 void KMobile::setupActions()
 {
-    KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(dockApplication()), actionCollection());
-    KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
+    KStdAction::close(this, TQ_SLOT(dockApplication()), actionCollection());
+    KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
 
-    m_toolbarAction = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowToolbar()), actionCollection());
+    m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection());
     optionsShowToolbar();
-    m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection());
+    m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection());
 
-    KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
-    KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
-    KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection());
+    KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
+    KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
+    KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
 
     new TDEAction(i18n("&Add Device..."), "folder-new", 0,
-		TQT_TQOBJECT(this), TQT_SLOT(addDevice()), actionCollection(), "device_add");
+		this, TQ_SLOT(addDevice()), actionCollection(), "device_add");
     new TDEAction( KGuiItem( i18n("&Remove Device"), "edittrash", i18n("Remove this device") ),
-		"Delete", TQT_TQOBJECT(this),  TQT_SLOT(removeDevice()), actionCollection(), "device_remove");
+		"Delete", this,  TQ_SLOT(removeDevice()), actionCollection(), "device_remove");
     new TDEAction(i18n("Re&name Device..."), 0, Key_F2,
-		TQT_TQOBJECT(this), TQT_SLOT(renameDevice()), actionCollection(), "device_rename");
+		this, TQ_SLOT(renameDevice()), actionCollection(), "device_rename");
     new TDEAction(i18n("&Configure Device..."), "configure", 0,
-		TQT_TQOBJECT(this), TQT_SLOT(configDevice()), actionCollection(), "device_configure");
+		this, TQ_SLOT(configDevice()), actionCollection(), "device_configure");
 
     createGUI();
 
-    connect( kapp, TQT_SIGNAL(aboutToQuit()), TQT_TQOBJECT(this), TQT_SLOT(saveAll()) );
+    connect( kapp, TQ_SIGNAL(aboutToQuit()), this, TQ_SLOT(saveAll()) );
 }
 
 
@@ -261,11 +261,11 @@ void KMobile::addDevice()
   dialog->helpText->setText( i18n("Please select the category to which your new device belongs:") );
   dialog->addButton->setText( i18n("&Scan for New Devices...") );
   dialog->addButton->setDisabled(true);
-  dialog->iconView->connect( dialog->iconView, TQT_SIGNAL(doubleClicked(TQIconViewItem*)),
-			dialog, TQT_SLOT(accept()) );
+  dialog->iconView->connect( dialog->iconView, TQ_SIGNAL(doubleClicked(TQIconViewItem*)),
+			dialog, TQ_SLOT(accept()) );
   dialog->selectButton->setText( i18n("&Add") );
-  dialog->selectButton->connect( dialog->selectButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(accept()) );
-  dialog->cancelButton->connect( dialog->cancelButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(reject()) );
+  dialog->selectButton->connect( dialog->selectButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(accept()) );
+  dialog->cancelButton->connect( dialog->cancelButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(reject()) );
 
   TDETrader::OfferList list = KMobileItem::getMobileDevicesList();
   TDETrader::OfferListIterator it;
@@ -344,11 +344,11 @@ KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent,
   if (!dialog)
     return 0L;
 
-  dialog->addButton->connect( dialog->addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddDevice()) );
-  dialog->iconView->connect( dialog->iconView, TQT_SIGNAL(doubleClicked(TQIconViewItem*)),
-			dialog, TQT_SLOT(accept()) );
-  dialog->selectButton->connect( dialog->selectButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(accept()) );
-  dialog->cancelButton->connect( dialog->cancelButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(reject()) );
+  dialog->addButton->connect( dialog->addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddDevice()) );
+  dialog->iconView->connect( dialog->iconView, TQ_SIGNAL(doubleClicked(TQIconViewItem*)),
+			dialog, TQ_SLOT(accept()) );
+  dialog->selectButton->connect( dialog->selectButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(accept()) );
+  dialog->cancelButton->connect( dialog->cancelButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(reject()) );
 
   for (int i=0; i<countDevices(); i++) {
     KService::Ptr ptr;